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

@@ -4,7 +4,7 @@ Route128_MapScripts:: @ 81F6B38
.byte 0
Route128_MapScript1_1F6B43: @ 81F6B43
call_if_set FLAG_SYS_WEATHER_CTRL, Route128_EventScript_27207A
call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15
end
Route128_MapScript2_1F6B4D: @ 81F6B4D
@@ -24,18 +24,18 @@ Route128_EventScript_1F6B57:: @ 81F6B57
closemessage
applymovement 5, Route128_Movement_1F6CAD
waitmovement 0
applymovement 4, Route128_Movement_2725A6
applymovement 4, Common_Movement_WalkInPlaceUp
waitmovement 0
msgbox Route128_Text_1F6E5A, MSGBOX_DEFAULT
closemessage
applymovement 5, Route128_Movement_1F6CBB
waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, Route128_Movement_2725A6
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp
waitmovement 0
msgbox Route128_Text_1F6F1E, MSGBOX_DEFAULT
closemessage
applymovement 4, Route128_Movement_1F6C96
applymovement EVENT_OBJ_ID_PLAYER, Route128_Movement_2725A4
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft
applymovement 5, Route128_Movement_1F6CA8
waitmovement 0
msgbox Route128_Text_1F704F, MSGBOX_DEFAULT
@@ -53,19 +53,19 @@ Route128_EventScript_1F6B57:: @ 81F6B57
addobject 3
applymovement 3, Route128_Movement_1F6C87
waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, Route128_Movement_2725A8
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight
waitmovement 0
msgbox Route128_Text_1F70C9, MSGBOX_DEFAULT
closemessage
applymovement 3, Route128_Movement_1F6C85
applymovement EVENT_OBJ_ID_PLAYER, Route128_Movement_2725A6
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp
waitmovement 0
msgbox Route128_Text_1F70EA, MSGBOX_DEFAULT
applymovement 3, Route128_Movement_2725AA
applymovement 3, Common_Movement_WalkInPlaceDown
waitmovement 0
msgbox Route128_Text_1F721B, MSGBOX_DEFAULT
closemessage
applymovement 3, Route128_Movement_2725AA
applymovement 3, Common_Movement_WalkInPlaceDown
waitmovement 0
delay 50
setfieldeffectargument 0, 1