Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,854 Commits 1 Branch 0 Tags
Commit Graph

18854 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
DizzyEggg
b15f0b3bb3 Comatose 2019-12-31 16:36:53 +01:00
DizzyEggg
7051f261d1 Fix Queenly Majesty 2019-12-31 13:33:54 +01:00
Exory
055460449e Fixed Pokemon animations. (#223) 
* Fixed Breloom's animation and color.

* 1 pixel improvement on Breloom, Fixed Delcatty's animation.

* Fixed Turtwig

* Fixed Whirlipede.

* Fixed Ditto.

* Fixed Mewtwo.

* Fixed Surskit.
 2019-12-30 18:56:26 +01:00
DizzyEggg
4c9ea32d19 Merge with master 2019-12-30 18:52:23 +01:00
DizzyEggg
5fc298c4eb Add graphical fairy type 2019-12-30 18:34:30 +01:00
DizzyEggg
dee8f916bf EOL 2019-12-30 18:07:00 +01:00
DizzyEggg
52ae3547dd
Merge pull request #219 from ExoryxHana/pull_requests_pokemon_expansion 
Fixed Jirachi, Omanyte and Shroomish's anim_front, Reworked Xerneas.
 2019-12-30 17:29:16 +01:00
DizzyEggg
f228764545 Remove duplicate Rockruff egg moves 2019-12-30 14:07:31 +01:00
DizzyEggg
89a2ee5be6 Merge branch 'pokemon_expansion' of https://github.com/DizzyEggg/pokeemerald into pokemon_expansion 2019-12-30 13:54:25 +01:00
DizzyEggg
cd4c3b38b5 Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into pokemon_expansion 2019-12-30 13:53:59 +01:00
Pokestia
e4731b1289 Pokemon expansion (#211) 
* Define species Meltan and Melmetal

Also shifted a few other species numbers

* Define Meltan and Melmetal Sprites

* Add Meltan and Melmetal coordinates and table entries

* Set Meltan and Melmetal ingame names

* Add Meltan and Melmetal base stats

* Add Meltan and Melmetal level up learnsets

* Set Meltan and Melmetal TM learnset

It is still blank because LGPE TMs don't match USUM TMs

* Define Meltan and Melmetal sprite paths

* Add Meltan and Melmetal sprite, icon and front animation

* Fix typo in bas stats

* Add Meltan and Melmetal pokedex entries

* Tab to space learnsets

* Tab to space pokedex text

This includes all mons with tabs in their dex entries.
 2019-12-30 13:48:50 +01:00
DizzyEggg
770a57bec7 Fix some moves hitting the user 2019-12-30 13:14:20 +01:00
Marcus Huderle
ef751c8d1b Fix formatting and remove unnecessary comments 2019-12-28 12:07:02 -06:00
huderlem
3b05398975
Merge pull request #945 from Fontbane/patch-5 
Give rival and Maxie parties better names
 2019-12-28 12:06:35 -06:00
GriffinR
3efc8199d4 More battle_dome.c documentation 2019-12-25 22:27:33 -08:00
Fontbane
31b4656324 Labels better 2019-12-25 22:39:06 -05:00
Fontbane
2e8c20d72f Update trainers.h 2019-12-25 20:48:40 -05:00
huderlem
8d64bc9df8
Merge pull request #944 from GriffinRichards/doc-itemuse 
Document item_use.c
 2019-12-25 11:59:07 -06:00
huderlem
ee61726136
Merge pull request #936 from GriffinRichards/doc-tower 
Document Battle Tower scripts
 2019-12-25 11:39:20 -06:00
DizzyEggg
77842b0376 Contact moves for Aftermath and Bestow for Unburden 2019-12-25 12:19:09 +01:00
DizzyEggg
eb029d557b
Merge pull request #215 from LOuroboros/aftermath 
Implemented Aftermath's effect
 2019-12-25 12:04:09 +01:00
DizzyEggg
5e5767bb5c
Merge pull request #216 from ultima-soul/unburden 
Implement Unburden
 2019-12-25 12:01:25 +01:00
ExoryxHana
aac9a9e3ea Fixed Jirachi, Omanyte and Shroomish's anim_front files, Reworked Xerneas. 2019-12-24 04:53:56 +01:00
ultima-soul
332aa80a33 Resolve review comments and encapsulate Unburden check and set. 2019-12-23 09:25:26 -08:00
LOuroboros
3367bdaf51 Made Aftermath trigger the Ability Pop Up sign 2019-12-23 14:17:54 -03:00
ultima-soul
5786745d15 Merge branch 'battle_engine' into unburden 2019-12-23 09:01:16 -08:00
DizzyEggg
ea9109943d Aurora Veil now only works in Hail 2019-12-23 17:50:13 +01:00
DizzyEggg
63621da46c Heatproof lowers burn dmg 2019-12-23 17:41:42 +01:00
DizzyEggg
cec9e177d6 Gooey add check for not displaying ability pop up when not necessary 2019-12-23 17:26:48 +01:00
DizzyEggg
308e1594c9
Merge pull request #212 from Fontbane/gooey 
Queenly Majesty, Big Pecks, Gooey and Tangling Hair
 2019-12-23 17:23:33 +01:00
DizzyEggg
e4a9a228c5
Merge pull request #210 from ultima-soul/battle_engine 
Implement Leaf Guard.
 2019-12-23 17:15:51 +01:00
DizzyEggg
34bd81871c
Merge pull request #208 from Fontbane/patch-4 
Change move names to CamelCase
 2019-12-23 17:11:32 +01:00
DizzyEggg
15d34c3513 Fix strings coz they had the same name for some unknown to me reason 2019-12-23 17:09:13 +01:00
DizzyEggg
44687f4091
Merge pull request #213 from LOuroboros/patch-1 
Swapped the item number ID for the actual name of the item in Lopunny-to-Mega Lopunny's evolution method.
 2019-12-23 17:08:00 +01:00
DizzyEggg
9a2888fdbf Merge into master 2019-12-23 16:46:03 +01:00
AJ Fontaine
b80fa767ab
Give rivals and Maxie battles better names 
Name describes where the battle is and for rivals, which starter the player chose.
 2019-12-23 10:42:06 -05:00
DizzyEggg
a4a4132d26 Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into pokemon_expansion 2019-12-23 16:41:44 +01:00
DizzyEggg
9e3d5672e6 Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into battle_engine_v2 2019-12-23 16:40:21 +01:00
ultima-soul
1146de4561 Implement Unburden. 2019-12-21 23:09:06 -08:00
GriffinR
749965d56b Document item_use.c 2019-12-21 21:39:30 -05:00
GriffinR
68cdd7b1cb Merge master into ObjEvent rename 2019-12-21 05:19:27 -05:00
LOuroboros
c690d577a5 Implemented Aftermath's effect 2019-12-21 05:01:42 -03:00
Diegoisawesome
026e1108b2
Merge pull request #935 from GriffinRichards/doc-warp 
Document some warp/field screen effect
 2019-12-20 23:44:56 -08:00
Diegoisawesome
d42ea06dc5
Merge pull request #939 from GriffinRichards/fix-compare 
Use constants in compare macro
 2019-12-20 23:40:12 -08:00
Diegoisawesome
e4e3d439dc
Merge pull request #941 from GriffinRichards/fix-lastresult 
Remove references to LASTRESULT
 2019-12-20 23:38:56 -08:00
Diegoisawesome
4e10133545
Merge pull request #940 from Kurausukun/master 
update instrument sample names
 2019-12-20 23:38:30 -08:00
GriffinR
ff2d8a9c4e Add frontier trainer constants 2019-12-20 21:14:05 -05:00
GriffinR
324a81ed5d Reword yesnobox comment 2019-12-20 18:53:58 -05:00
Diegoisawesome
773a599bbb
Merge pull request #942 from jiangzhengwenjz/DrawTradeMenuPartyInfo 
'real' match DrawTradeMenuPartyInfo
 2019-12-20 15:49:14 -08:00
Diegoisawesome
929a093fc1
Merge pull request #943 from jiangzhengwenjz/CanSpinTradeMon 
real match CanSpinTradeMon
 2019-12-20 15:49:05 -08:00