fix pokeblock conflicts

This commit is contained in:
DizzyEggg
2017-12-18 16:58:14 +01:00
174 changed files with 5529 additions and 7226 deletions

View File

@@ -225,7 +225,7 @@ Route101_EventScript_1EBE16:: @ 81EBE16
setobjectxy 255, 6, 13
applymovement 255, Route101_Movement_2725A4
waitmovement 0
special sub_80B1138
special ChooseStarter
waitstate
applymovement 2, Route101_Movement_1EBE8D
waitmovement 0