diff options
| author | Phlosioneer <mattmdrr2@gmail.com> | 2019-02-25 02:30:35 -0500 |
|---|---|---|
| committer | Phlosioneer <mattmdrr2@gmail.com> | 2019-02-25 02:30:35 -0500 |
| commit | 1cd5cb09cfb434b2f688a5a6ec13e0a2d430a41a (patch) | |
| tree | cc65eb016360235949060651e98063e01a746352 /data/maps/SkyPillar_Outside/scripts.inc | |
| parent | e1b2460748dfd9d1a4b3c6eb760e86fb616a7ce6 (diff) | |
| parent | a589d4a630a130e78bdf0819b807a133562d4449 (diff) | |
Merge branch 'master' into weather-15
Diffstat (limited to 'data/maps/SkyPillar_Outside/scripts.inc')
| -rw-r--r-- | data/maps/SkyPillar_Outside/scripts.inc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/data/maps/SkyPillar_Outside/scripts.inc b/data/maps/SkyPillar_Outside/scripts.inc index abf8a6730..3ce65bbb4 100644 --- a/data/maps/SkyPillar_Outside/scripts.inc +++ b/data/maps/SkyPillar_Outside/scripts.inc @@ -16,7 +16,7 @@ SkyPillar_Outside_EventScript_2392CF:: @ 82392CF return SkyPillar_Outside_EventScript_2392D3:: @ 82392D3 - call_if_set FLAG_SYS_WEATHER_CTRL, SkyPillar_Outside_EventScript_27207A + call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15 return SkyPillar_Outside_MapScript1_2392DD: @ 82392DD @@ -36,7 +36,7 @@ SkyPillar_Outside_EventScript_239304:: @ 8239304 lockall applymovement 1, SkyPillar_Outside_Movement_2393D3 waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, SkyPillar_Outside_Movement_2725A4 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft waitmovement 0 msgbox SkyPillar_Outside_Text_239416, MSGBOX_DEFAULT closemessage @@ -60,13 +60,13 @@ SkyPillar_Outside_EventScript_239304:: @ 8239304 special sub_8139560 waitstate delay 20 - applymovement 1, SkyPillar_Outside_Movement_2725A4 + applymovement 1, Common_Movement_WalkInPlaceLeft waitmovement 0 delay 10 - applymovement 1, SkyPillar_Outside_Movement_2725A8 + applymovement 1, Common_Movement_WalkInPlaceRight waitmovement 0 delay 20 - applymovement 1, SkyPillar_Outside_Movement_2725AA + applymovement 1, Common_Movement_WalkInPlaceDown waitmovement 0 delay 30 msgbox SkyPillar_Outside_Text_23950C, MSGBOX_DEFAULT |