diff options
| author | Phlosioneer <mattmdrr2@gmail.com> | 2019-02-26 22:34:42 -0500 |
|---|---|---|
| committer | Phlosioneer <mattmdrr2@gmail.com> | 2019-02-26 22:34:42 -0500 |
| commit | 72bb0daccbdcc4db701d05c10c8b968fe7b09c2a (patch) | |
| tree | c80c40148daa9b92dd39ba6a765b61c4fbf7214d /data/maps/SSTidalCorridor/scripts.inc | |
| parent | 6cb4c677cdf156d9d78f5f27bf3168882c1447ec (diff) | |
| parent | 231355f84dccd11329d81d074fa36135cfad4f94 (diff) | |
Merge branch 'master' into main-menu-state-machine
Diffstat (limited to 'data/maps/SSTidalCorridor/scripts.inc')
| -rw-r--r-- | data/maps/SSTidalCorridor/scripts.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/data/maps/SSTidalCorridor/scripts.inc b/data/maps/SSTidalCorridor/scripts.inc index 204d70e14..ededf1e5f 100644 --- a/data/maps/SSTidalCorridor/scripts.inc +++ b/data/maps/SSTidalCorridor/scripts.inc @@ -1,5 +1,5 @@ SSTidalCorridor_MapScripts:: @ 823BFCF - map_script 2, SSTidalCorridor_MapScript2_23BFD5 + map_script MAP_SCRIPT_ON_FRAME_TABLE, SSTidalCorridor_MapScript2_23BFD5 .byte 0 SSTidalCorridor_MapScript2_23BFD5: @ 823BFD5 @@ -201,7 +201,7 @@ SSTidalCorridor_EventScript_23C219:: @ 823C219 lockall applymovement 5, SSTidalCorridor_Movement_23C26D waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, SSTidalCorridor_Movement_2725A8 + applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight waitmovement 0 msgbox SSTidalCorridor_Text_23C28F, MSGBOX_DEFAULT closemessage |