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
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
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
ExoryxHana
aac9a9e3ea
Fixed Jirachi, Omanyte and Shroomish's anim_front files, Reworked Xerneas.
2019-12-24 04:53:56 +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
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
GriffinR
749965d56b
Document item_use.c
2019-12-21 21:39:30 -05: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
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
jiangzhengwenjz
4d8ea3a2d9
CanSpinTradeMon
2019-12-21 06:18:20 +08:00
jiangzhengwenjz
681d929892
DrawTradeMenuPartyInfo
2019-12-21 06:09:59 +08:00
GriffinR
7628019952
Remove references to LASTRESULT
2019-12-20 08:51:58 -05:00
LOuroboros
060a3566e2
Swapped the item number ID for the actual name of the item in Lopunny-to-Mega Lopunny's evolution method.
...
Title.
Every single other Mega Evolution is defined with their item's name. Why would this be an exception?
2019-12-19 22:50:52 -03:00
Kurausukun
3a7bb65077
update instrument sample names
2019-12-19 03:42:09 -05:00
GriffinR
9e08cfe55f
Remove uses of compare_var_to
2019-12-18 19:22:39 -05:00
GriffinR
d137a1a0c1
Use constants in compare macro
2019-12-18 19:12:09 -05:00
Diegoisawesome
3b240b2ad4
Merge pull request #938 from pret/ubuntu_bionic
...
Bump travis to bionic (Ubuntu 18.04 LTS)
2019-12-18 13:32:25 -08:00
PikalaxALT
5f1c7c9e93
Bump travis to bionic (Ubuntu 18.04 LTS)
2019-12-18 13:03:00 -05:00
GriffinR
23f952b34e
Merge master into doc-tower
2019-12-17 21:17:46 -05:00
GriffinR
ddfa0c6298
Document Battle Tower scripts
2019-12-17 20:56:13 -05:00
huderlem
f8cef9a6a8
Merge pull request #932 from jiangzhengwenjz/berry_crush
...
berry crush
2019-12-17 19:35:00 -06:00
huderlem
45eefac5b9
Merge pull request #934 from GriffinRichards/constants-fade
...
Use fadescreen constants
2019-12-17 19:26:04 -06:00
GriffinR
4879c1eab2
Merge branch 'master' into constants-fade
2019-12-17 19:11:51 -05:00
huderlem
edb5df1716
Merge pull request #933 from GriffinRichards/doc-tents
...
Document Battle Tent scripts
2019-12-17 18:09:49 -06:00
jiangzhengwenjz
420b4b3fea
use STR_CONV_MODE_* constants
2019-12-18 06:42:53 +08:00
jiangzhengwenjz
5bec27aa34
nonmatch sub_8024604
2019-12-18 03:36:51 +08:00
jiangzhengwenjz
67690df65f
sub_8023CAC
2019-12-17 23:12:01 +08:00
GriffinR
d1cf9006fb
Document some warp/field screen effect
2019-12-17 05:23:07 -05:00
jiangzhengwenjz
50c48d7ef6
sub_8023BC0
2019-12-17 14:49:57 +08:00
jiangzhengwenjz
efa1ee1822
sub_8022250
2019-12-16 14:17:29 +08:00
jiangzhengwenjz
3f858c1c26
sub_8022F04
2019-12-16 14:17:29 +08:00
GriffinR
96ec5e1b84
Use fadescreen constants
2019-12-15 11:42:50 -05:00
huderlem
fee36224ed
Merge pull request #925 from GriffinRichards/doc-matchcall
...
Document some pokenav match call
2019-12-15 09:42:13 -06:00
GriffinR
a04347816f
Split PokenavMatchCallEntries from PokenavMonList
2019-12-15 10:25:47 -05:00
GriffinR
97b5560bdb
Document Battle Tent scripts
2019-12-15 01:47:01 -05:00
