Merge branch 'master' into event-vars

This commit is contained in:
Phlosioneer
2019-02-25 02:24:20 -05:00
201 changed files with 4075 additions and 7997 deletions

View File

@@ -38,7 +38,7 @@ VictoryRoad_1F_EventScript_235DC8:: @ 8235DC8
end
VictoryRoad_1F_EventScript_235DE1:: @ 8235DE1
applymovement EVENT_OBJ_ID_PLAYER, VictoryRoad_1F_Movement_2725AA
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown
waitmovement 0
msgbox VictoryRoad_1F_Text_235EE6, MSGBOX_DEFAULT
trainerbattle_no_intro TRAINER_WALLY_1, VictoryRoad_1F_Text_235FFC