dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

pokeblock merge conflicts

Browse Source
This commit is contained in:
DizzyEggg
2017-12-21 23:12:36 +01:00
parent df479661ff a705a863d1
commit bcffcb0c1c
51 changed files with 5037 additions and 1907 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/specials.inc
+1 -1
View File
@@ -65,7 +65,7 @@ gSpecials:: @ 81DBA64
def_special ShowTrainerIntroSpeech
def_special ShowTrainerCantBattleSpeech
def_special GetTrainerFlag
def_special sub_80B45AC
def_special EndTrainerApproach
def_special SetUpTrainerEncounterMusic
def_special ShouldTryRematchBattle
def_special IsTrainerReadyForRematch