fix battle setup conflicts

This commit is contained in:
DizzyEggg
2017-12-17 20:26:13 +01:00
46 changed files with 1365 additions and 1826 deletions
+1 -1
View File
@@ -164,7 +164,7 @@ gSpecials:: @ 81DBA64
def_special sub_8138B8C
def_special sub_814FC9C
def_special sub_8085784
def_special Special_StartWallClock
def_special StartWallClock
def_special Special_ViewWallClock
def_special ChooseStarter
def_special StartWallyTutorialBattle