Label used movement steps

5 files changed, 113 insertions, 31 deletions

diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc
index e3b5c4806..53869703e 100644
--- a/data/scripts/cable_club.inc
+++ b/data/scripts/cable_club.inc
@@ -195,7 +195,7 @@ CableClub_EventScript_PlayerExitLinkRoom:: @ 81BB40A
 CableClub_EventScript_Tutorial:: @ 81BB415
 	lockall
 	textcolor 1
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75E9
+	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	msgbox gUnknown_81BD898
 	closemessage
@@ -208,8 +208,8 @@ CableClub_EventScript_Tutorial:: @ 81BB415
 	end
 
 Movement_1BB447:: @ 81BB447
-	step_11
-	step_11
+	walk_up
+	walk_up
 	step_end
 
 EventScript_1BB44A:: @ 81BB44A
@@ -556,51 +556,51 @@ EventScript_1BB881:: @ 81BB881
 	end
 
 Movement_1BB88B:: @ 81BB88B
-	step_00
+	face_down
 	step_end
 
 Movement_1BB88D:: @ 81BB88D
-	step_03
+	face_right
 	step_end
 
 Movement_1BB88F:: @ 81BB88F
-	step_02
+	face_left
 	step_end
 
 Movement_1BB891:: @ 81BB891
-	step_10
-	step_10
+	walk_down
+	walk_down
 	step_end
 
 Movement_1BB894:: @ 81BB894
-	step_13
-	step_11
-	step_11
+	walk_right
+	walk_up
+	walk_up
 	step_end
 
 Movement_1BB898:: @ 81BB898
-	step_12
-	step_11
-	step_11
+	walk_left
+	walk_up
+	walk_up
 	step_end
 
 Movement_1BB89C:: @ 81BB89C
-	step_11
+	walk_up
 	step_end
 
 Movement_1BB89E:: @ 81BB89E
-	step_02
+	face_left
 	step_end
 
 Movement_1BB8A0:: @ 81BB8A0
-	step_03
+	face_right
 	step_end
 
 Movement_1BB8A2:: @ 81BB8A2
-	step_12
-	step_11
-	step_11
-	step_11
+	walk_left
+	walk_up
+	walk_up
+	walk_up
 	step_end
 
 gUnknown_81BB8A7:: @ 81BB8A7
diff --git a/data/scripts/field_moves.inc b/data/scripts/field_moves.inc
index d0729d900..89ef6d622 100644
--- a/data/scripts/field_moves.inc
+++ b/data/scripts/field_moves.inc
@@ -36,7 +36,7 @@ EventScript_1BDF76:: @ 81BDF76
 	end
 
 Movement_1BDF85:: @ 81BDF85
-	step_69
+	cut_tree
 	step_end
 
 EventScript_1BDF87:: @ 81BDF87
@@ -107,7 +107,7 @@ EventScript_1BE08D:: @ 81BE08D
 	end
 
 Movement_1BE08F:: @ 81BE08F
-	step_68
+	rock_smash_break
 	step_end
 
 EventScript_1BE091:: @ 81BE091
diff --git a/data/scripts/move_tutors.inc b/data/scripts/move_tutors.inc
index b0bf1dba4..d25a694be 100644
--- a/data/scripts/move_tutors.inc
+++ b/data/scripts/move_tutors.inc
@@ -582,17 +582,17 @@ EventScript_1C4F37:: @ 81C4F37
 	return
 
 Movement_1C4F4C:: @ 81C4F4C
-	step_52
+	jump_in_place_down
 	step_end
 
 Movement_1C4F4E:: @ 81C4F4E
-	step_53
+	jump_in_place_up
 	step_end
 
 Movement_1C4F50:: @ 81C4F50
-	step_54
+	jump_in_place_left
 	step_end
 
 Movement_1C4F52:: @ 81C4F52
-	step_55
+	jump_in_place_right
 	step_end
diff --git a/data/scripts/movement.inc b/data/scripts/movement.inc
new file mode 100644
index 000000000..6a411d811
--- /dev/null
+++ b/data/scripts/movement.inc
@@ -0,0 +1,82 @@
+Movement_QuestionMark:: @ 81A75D9
+	emote_question_mark
+	step_end
+
+Movement_ExclamationMark:: @ 81A75DB
+	emote_exclamation_mark
+	step_end
+
+Movement_Delay48:: @ 81A75DD
+	delay_16
+	delay_16
+	delay_16
+	step_end
+
+Movement_FacePlayer:: @ 81A75E1
+	face_player
+	step_end
+
+@ Unused
+Movement_FaceAwayPlayer:: @ 81A75E3
+	face_away_player
+	step_end
+
+Movement_FaceOriginalDirection:: @ 81A75E5
+	face_original_direction
+	step_end
+
+Movement_WalkInPlaceFastestLeft:: @ 81A75E7
+	walk_in_place_fastest_left
+	step_end
+
+Movement_WalkInPlaceFastestUp:: @ 81A75E9
+	walk_in_place_fastest_up
+	step_end
+
+Movement_WalkInPlaceFastestRight:: @ 81A75EB
+	walk_in_place_fastest_right
+	step_end
+
+Movement_WalkInPlaceFastestDown:: @ 81A75ED
+	walk_in_place_fastest_down
+	step_end
+
+Movement_FaceRight:: @ 81A75EF
+	face_right
+	step_end
+
+Movement_FaceDown:: @ 81A75F1
+	face_down
+	step_end
+
+Movement_WalkUp5:: @ 81A75F3
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	step_end
+
+@ Unused
+Movement_WalkUp4:: @ 81A75F9
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	step_end
+
+Movement_Delay32:: @ 81A75FE
+	delay_16
+	delay_16
+	step_end
+
+@ Unused
+Movement_WalkUp:: @ 81A7601
+	walk_up
+	step_end
+
+@ Unused
+Movement_WalkUp2:: @ 81A7603
+	walk_up
+	walk_up
+	step_end
diff --git a/data/scripts/pkmn_center_nurse.inc b/data/scripts/pkmn_center_nurse.inc
index adf709ee3..bad257087 100644
--- a/data/scripts/pkmn_center_nurse.inc
+++ b/data/scripts/pkmn_center_nurse.inc
@@ -21,11 +21,11 @@ EventScript_PkmnCenterNurse_HealPkmn:: @ 81A65B8
 	end
 
 EventScript_PkmnCenterNurse_TakeAndHealPkmn:: @ 81A65CE
-	applymovement VAR_LAST_TALKED, Movement_1A75E7
+	applymovement VAR_LAST_TALKED, Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	dofieldeffect FLDEFF_POKECENTER_HEAL
 	waitfieldeffect FLDEFF_POKECENTER_HEAL
-	applymovement VAR_LAST_TALKED, Movement_1A75ED
+	applymovement VAR_LAST_TALKED, Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	special sp000_heal_pokemon
 	return
@@ -67,6 +67,6 @@ EventScript_PkmnCenterNurse_Goodbye:: @ 81A6663
 	return
 
 Movement_1A666C:: @ 81A666C
-	step_5b
-	step_1a
+	nurse_joy_bow
+	delay_4
 	step_end