Merge branch 'master' of https://github.com/pret/pokeemerald into dump_songs

This commit is contained in:
sceptillion committed 2017-12-22 00:17:34 -08:00
commit 3c286feec6
98 files changed
+12920 -14984

No files matched your search

@@ -249,7 +249,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5C7:: @ 824B5C7
special sub_81A1780
playfanfare MUS_ME_ASA
waitfanfare
special sp000_heal_pokemon
special HealPlayerParty
call BattleFrontier_BattleDomePreBattleRoom_EventScript_24B600
fadescreen 1
setvar VAR_0x8004, 11