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
@@ -114,7 +114,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_29283F:: @ 829283F
LittlerootTown_BrendansHouse_2F_EventScript_292849:: @ 8292849
fadescreen 1
special Special_StartWallClock
special StartWallClock
waitstate
return