summaryrefslogtreecommitdiff
path: root/data/scripts/movement.inc
diff options
context:
space:
mode:
Diffstat (limited to 'data/scripts/movement.inc')
-rw-r--r--data/scripts/movement.inc33
1 files changed, 16 insertions, 17 deletions
diff --git a/data/scripts/movement.inc b/data/scripts/movement.inc
index b7abceae4..3dd1a8144 100644
--- a/data/scripts/movement.inc
+++ b/data/scripts/movement.inc
@@ -1,4 +1,4 @@
-SlateportCity_Movement_272596: @ 8272596
+Common_Movement_QuestionMark: @ 8272596
emote_question_mark
step_end
@@ -24,27 +24,27 @@ Common_Movement_FaceOriginalDirection: @ 82725A2
face_original_direction
step_end
-Common_Movement_WalkInPlaceLeft: @ 82725A4
+Common_Movement_WalkInPlaceFastestLeft: @ 82725A4
walk_in_place_fastest_left
step_end
-Common_Movement_WalkInPlaceUp: @ 82725A6
+Common_Movement_WalkInPlaceFastestUp: @ 82725A6
walk_in_place_fastest_up
step_end
-Common_Movement_WalkInPlaceRight: @ 82725A8
+Common_Movement_WalkInPlaceFastestRight: @ 82725A8
walk_in_place_fastest_right
step_end
-Common_Movement_WalkInPlaceDown: @ 82725AA
+Common_Movement_WalkInPlaceFastestDown: @ 82725AA
walk_in_place_fastest_down
step_end
-RustboroCity_Movement_2725AC: @ 82725AC
+Common_Movement_FaceRight: @ 82725AC
face_right
step_end
-RustboroCity_Movement_2725AE: @ 82725AE
+Common_Movement_FaceLeft: @ 82725AE
face_left
step_end
@@ -56,21 +56,19 @@ Common_Movement_FaceUp: @ 82725B2
face_up
step_end
-BattleFrontier_BattleDomeBattleRoom_Movement_2725B4: @ 82725B4
-MeteorFalls_1F_1R_Movement_2725B4: @ 82725B4
+Common_Movement_WalkInPlaceDown: @ 82725B4
walk_in_place_down
step_end
-BattleFrontier_BattlePalaceBattleRoom_Movement_2725B6: @ 82725B6
-BattleFrontier_BattleTowerBattleRoom_Movement_2725B6: @ 82725B6
+Common_Movement_WalkInPlaceLeft: @ 82725B6
walk_in_place_left
step_end
-Route121_Movement_2725B8: @ 82725B8
+Common_Movement_WalkInPlaceRight: @ 82725B8
walk_in_place_right
step_end
-EverGrandeCity_SidneysRoom_Movement_2725BA: @ 82725BA
+Common_Movement_WalkUp6: @ 82725BA
walk_up
walk_up
walk_up
@@ -79,23 +77,24 @@ EverGrandeCity_SidneysRoom_Movement_2725BA: @ 82725BA
walk_up
step_end
-EverGrandeCity_ChampionsRoom_Movement_2725C1: @ 82725C1
+Common_Movement_WalkUp4: @ 82725C1
walk_up
walk_up
walk_up
walk_up
step_end
-EverGrandeCity_SidneysRoom_Movement_2725C6: @ 82725C6
+Common_Movement_Delay32: @ 82725C6
delay_16
delay_16
step_end
-Route110_TrickHouseEntrance_Movement_2725C9: @ 82725C9
+Common_Movement_WalkUp: @ 82725C9
walk_up
step_end
-Movement_2725CB:: @ 82725CB
+@ Unused
+Common_Movement_WalkUp2:: @ 82725CB
walk_up
walk_up
step_end