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

This commit is contained in:
sceptillion
2017-12-22 00:17:34 -08:00
98 changed files with 12920 additions and 14984 deletions
@@ -88,7 +88,7 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_2023C8:: @ 82023C8
special sub_81A1780
playfanfare MUS_ME_ASA
waitfanfare
special sp000_heal_pokemon
special HealPlayerParty
VerdanturfTown_BattleTentBattleRoom_EventScript_20243C:: @ 820243C
setvar VAR_0x8004, 1