diff options
Diffstat (limited to 'data')
| -rw-r--r-- | data/maps/MossdeepCity_Gym/scripts.inc | 30 | ||||
| -rw-r--r-- | data/maps/Route110_TrickHousePuzzle7/scripts.inc | 30 | ||||
| -rw-r--r-- | data/rotating_tile_puzzle.s | 16 | ||||
| -rw-r--r-- | data/script_cmd_table.inc | 6 |
4 files changed, 41 insertions, 41 deletions
diff --git a/data/maps/MossdeepCity_Gym/scripts.inc b/data/maps/MossdeepCity_Gym/scripts.inc index 1ce08142c..fc6a45d84 100644 --- a/data/maps/MossdeepCity_Gym/scripts.inc +++ b/data/maps/MossdeepCity_Gym/scripts.inc @@ -312,11 +312,11 @@ MossdeepCity_Gym_EventScript_YellowFloorSwitch:: @ 8220C67 waitse playse SE_TU_SAA initrotatingtilepuzzle FALSE - mossdeepgym1 0 + moverotatingtileobjects 0 waitmovement 0 - mossdeepgym2 + turnrotatingtileobjects waitmovement 0 - mossdeepgym4 + freerotatingtilepuzzle end MossdeepCity_Gym_EventScript_BlueFloorSwitch:: @ 8220C7D @@ -324,11 +324,11 @@ MossdeepCity_Gym_EventScript_BlueFloorSwitch:: @ 8220C7D waitse playse SE_TU_SAA initrotatingtilepuzzle FALSE - mossdeepgym1 1 + moverotatingtileobjects 1 waitmovement 0 - mossdeepgym2 + turnrotatingtileobjects waitmovement 0 - mossdeepgym4 + freerotatingtilepuzzle end MossdeepCity_Gym_EventScript_GreenFloorSwitch:: @ 8220C93 @@ -336,11 +336,11 @@ MossdeepCity_Gym_EventScript_GreenFloorSwitch:: @ 8220C93 waitse playse SE_TU_SAA initrotatingtilepuzzle FALSE - mossdeepgym1 2 + moverotatingtileobjects 2 waitmovement 0 - mossdeepgym2 + turnrotatingtileobjects waitmovement 0 - mossdeepgym4 + freerotatingtilepuzzle end MossdeepCity_Gym_EventScript_PurpleFloorSwitch:: @ 8220CA9 @@ -348,11 +348,11 @@ MossdeepCity_Gym_EventScript_PurpleFloorSwitch:: @ 8220CA9 waitse playse SE_TU_SAA initrotatingtilepuzzle FALSE - mossdeepgym1 3 + moverotatingtileobjects 3 waitmovement 0 - mossdeepgym2 + turnrotatingtileobjects waitmovement 0 - mossdeepgym4 + freerotatingtilepuzzle end MossdeepCity_Gym_EventScript_RedFloorSwitch:: @ 8220CBF @@ -360,11 +360,11 @@ MossdeepCity_Gym_EventScript_RedFloorSwitch:: @ 8220CBF waitse playse SE_TU_SAA initrotatingtilepuzzle FALSE - mossdeepgym1 4 + moverotatingtileobjects 4 waitmovement 0 - mossdeepgym2 + turnrotatingtileobjects waitmovement 0 - mossdeepgym4 + freerotatingtilepuzzle end MossdeepCity_Gym_Text_GymGuideAdvice: @ 8220CD5 diff --git a/data/maps/Route110_TrickHousePuzzle7/scripts.inc b/data/maps/Route110_TrickHousePuzzle7/scripts.inc index 859d6f61a..b5303bc24 100644 --- a/data/maps/Route110_TrickHousePuzzle7/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle7/scripts.inc @@ -223,11 +223,11 @@ Route110_TrickHousePuzzle7_EventScript_26E31B:: @ 826E31B waitse playse SE_TU_SAA initrotatingtilepuzzle TRUE - mossdeepgym1 0 + moverotatingtileobjects 0 waitmovement 0 - mossdeepgym2 + turnrotatingtileobjects waitmovement 0 - mossdeepgym4 + freerotatingtilepuzzle end Route110_TrickHousePuzzle7_EventScript_26E331:: @ 826E331 @@ -235,11 +235,11 @@ Route110_TrickHousePuzzle7_EventScript_26E331:: @ 826E331 waitse playse SE_TU_SAA initrotatingtilepuzzle TRUE - mossdeepgym1 1 + moverotatingtileobjects 1 waitmovement 0 - mossdeepgym2 + turnrotatingtileobjects waitmovement 0 - mossdeepgym4 + freerotatingtilepuzzle end Route110_TrickHousePuzzle7_EventScript_26E347:: @ 826E347 @@ -247,11 +247,11 @@ Route110_TrickHousePuzzle7_EventScript_26E347:: @ 826E347 waitse playse SE_TU_SAA initrotatingtilepuzzle TRUE - mossdeepgym1 2 + moverotatingtileobjects 2 waitmovement 0 - mossdeepgym2 + turnrotatingtileobjects waitmovement 0 - mossdeepgym4 + freerotatingtilepuzzle end Route110_TrickHousePuzzle7_EventScript_26E35D:: @ 826E35D @@ -259,11 +259,11 @@ Route110_TrickHousePuzzle7_EventScript_26E35D:: @ 826E35D waitse playse SE_TU_SAA initrotatingtilepuzzle TRUE - mossdeepgym1 3 + moverotatingtileobjects 3 waitmovement 0 - mossdeepgym2 + turnrotatingtileobjects waitmovement 0 - mossdeepgym4 + freerotatingtilepuzzle end Route110_TrickHousePuzzle7_EventScript_26E373:: @ 826E373 @@ -271,11 +271,11 @@ Route110_TrickHousePuzzle7_EventScript_26E373:: @ 826E373 waitse playse SE_TU_SAA initrotatingtilepuzzle TRUE - mossdeepgym1 4 + moverotatingtileobjects 4 waitmovement 0 - mossdeepgym2 + turnrotatingtileobjects waitmovement 0 - mossdeepgym4 + freerotatingtilepuzzle end Route110_TrickHousePuzzle7_EventScript_26E389:: @ 826E389 diff --git a/data/rotating_tile_puzzle.s b/data/rotating_tile_puzzle.s index c7c5169e8..f9cf208db 100644 --- a/data/rotating_tile_puzzle.s +++ b/data/rotating_tile_puzzle.s @@ -2,42 +2,42 @@ .section .rodata -gUnknown_08612698:: @ 8612698 +RotatingTilePuzzle_Movement_ShiftRight:: @ 8612698 store_lock_anim walk_right free_unlock_anim step_end -gUnknown_0861269C:: @ 861269C +RotatingTilePuzzle_Movement_ShiftDown:: @ 861269C store_lock_anim walk_down free_unlock_anim step_end -gUnknown_086126A0:: @ 86126A0 +RotatingTilePuzzle_Movement_ShiftLeft:: @ 86126A0 store_lock_anim walk_left free_unlock_anim step_end -gUnknown_086126A4:: @ 86126A4 +RotatingTilePuzzle_Movement_ShiftUp:: @ 86126A4 store_lock_anim walk_up free_unlock_anim step_end -MossdeepGym_Movement_FaceRight:: @ 86126A8 +RotatingTilePuzzle_Movement_FaceRight:: @ 86126A8 face_right step_end -MossdeepGym_Movement_FaceDown:: @ 86126AA +RotatingTilePuzzle_Movement_FaceDown:: @ 86126AA face_down step_end -MossdeepGym_Movement_FaceLeft:: @ 86126AC +RotatingTilePuzzle_Movement_FaceLeft:: @ 86126AC face_left step_end -MossdeepGym_Movement_FaceUp:: @ 86126AE +RotatingTilePuzzle_Movement_FaceUp:: @ 86126AE face_up step_end diff --git a/data/script_cmd_table.inc b/data/script_cmd_table.inc index 0b6db2fc5..5a6a1e613 100644 --- a/data/script_cmd_table.inc +++ b/data/script_cmd_table.inc @@ -211,10 +211,10 @@ gScriptCmdTable:: @ 81DB67C .4byte ScrCmd_nop1 .4byte ScrCmd_warpD1 .4byte ScrCmd_setmonmetlocation - .4byte ScrCmd_mossdeepgym1 - .4byte ScrCmd_mossdeepgym2 + .4byte ScrCmd_moverotatingtileobjects + .4byte ScrCmd_turnrotatingtileobjects .4byte ScrCmd_initrotatingtilepuzzle - .4byte ScrCmd_mossdeepgym4 + .4byte ScrCmd_freerotatingtilepuzzle .4byte ScrCmd_warpmossdeepgym .4byte ScrCmd_cmdD8 .4byte ScrCmd_cmdD9 |