1 files changed, 92 insertions, 92 deletions
diff --git a/asm/macros/movement.inc b/asm/macros/movement.inc
index 8981f2eaa..c5178be3a 100644
--- a/asm/macros/movement.inc
+++ b/asm/macros/movement.inc
@@ -6,71 +6,71 @@
 	.endm
 
 	enum_start 0
-	create_movement step_00
-	create_movement step_01
-	create_movement step_02
-	create_movement step_03
-	create_movement slow_step_down
-	create_movement slow_step_up
-	create_movement slow_step_left
-	create_movement slow_step_right
-	create_movement step_down
-	create_movement step_up
-	create_movement step_left
-	create_movement step_right
-	create_movement fast_step_down
-	create_movement fast_step_up
-	create_movement fast_step_left
-	create_movement fast_step_right
-	create_movement step_10
-	create_movement step_11
-	create_movement step_12
-	create_movement step_13
-	create_movement step_14
-	create_movement step_15
-	create_movement step_16
-	create_movement step_17
-	create_movement step_18
-	create_movement step_19
-	create_movement step_1a
-	create_movement step_1b
-	create_movement step_1c
-	create_movement step_1d
-	create_movement step_1e
-	create_movement step_1f
-	create_movement step_20
-	create_movement step_21
-	create_movement step_22
-	create_movement step_23
-	create_movement step_24
-	create_movement step_25
-	create_movement step_26
-	create_movement step_27
-	create_movement step_28
-	create_movement step_29
-	create_movement step_2a
-	create_movement step_2b
-	create_movement step_2c
-	create_movement step_2d
-	create_movement step_2e
-	create_movement step_2f
-	create_movement step_30
-	create_movement step_31
-	create_movement step_32
-	create_movement step_33
-	create_movement step_34
-	create_movement step_35
-	create_movement step_36
-	create_movement step_37
-	create_movement step_38
-	create_movement step_39
-	create_movement step_3a
-	create_movement step_3b
-	create_movement step_3c
-	create_movement step_3d
-	create_movement step_3e
-	create_movement step_3f
-	create_movement step_40
+	create_movement face_down
+	create_movement face_up
+	create_movement face_left
+	create_movement face_right
+	create_movement face_down_2 @ TODO: distinction between this and above set
+	create_movement face_up_2
+	create_movement face_left_2
+	create_movement face_right_2
+	create_movement walk_slowest_down
+	create_movement walk_slowest_up
+	create_movement walk_slowest_left
+	create_movement walk_slowest_right
+	create_movement walk_slow_down
+	create_movement walk_slow_up
+	create_movement walk_slow_left
+	create_movement walk_slow_right
+	create_movement walk_down
+	create_movement walk_up
+	create_movement walk_left
+	create_movement walk_right
+	create_movement jump_2_down
+	create_movement jump_2_up
+	create_movement jump_2_left
+	create_movement jump_2_right
+	create_movement delay_1
+	create_movement delay_2
+	create_movement delay_4
+	create_movement delay_8
+	create_movement delay_16
+	create_movement walk_fast_down
+	create_movement walk_fast_up
+	create_movement walk_fast_left
+	create_movement walk_fast_right
+	create_movement walk_in_place_slow_down
+	create_movement walk_in_place_slow_up
+	create_movement walk_in_place_slow_left
+	create_movement walk_in_place_slow_right
+	create_movement walk_in_place_down
+	create_movement walk_in_place_up
+	create_movement walk_in_place_left
+	create_movement walk_in_place_right
+	create_movement walk_in_place_fast_down
+	create_movement walk_in_place_fast_up
+	create_movement walk_in_place_fast_left
+	create_movement walk_in_place_fast_right
+	create_movement walk_in_place_fastest_down
+	create_movement walk_in_place_fastest_up
+	create_movement walk_in_place_fastest_left
+	create_movement walk_in_place_fastest_right
+	create_movement ride_water_current_down
+	create_movement ride_water_current_up
+	create_movement ride_water_current_left
+	create_movement ride_water_current_right
+	create_movement walk_fastest_down
+	create_movement walk_fastest_up
+	create_movement walk_fastest_left
+	create_movement walk_fastest_right
+	create_movement slide_down
+	create_movement slide_up
+	create_movement slide_left
+	create_movement slide_right
+	create_movement player_run_down
+	create_movement player_run_up
+	create_movement player_run_left
+	create_movement player_run_right
 	create_movement step_41
 	create_movement step_42
 	create_movement step_43
@@ -80,38 +80,38 @@
 	create_movement step_47
 	create_movement step_48
 	create_movement step_49
-	create_movement step_4a
-	create_movement step_4b
-	create_movement step_4c
-	create_movement step_4d
-	create_movement step_4e
-	create_movement step_4f
-	create_movement step_50
-	create_movement step_51
-	create_movement step_52
-	create_movement step_53
-	create_movement step_54
-	create_movement step_55
-	create_movement step_56
-	create_movement step_57
-	create_movement step_58
-	create_movement step_59
-	create_movement step_5a
-	create_movement step_5b
+	create_movement face_player
+	create_movement face_away_player
+	create_movement lock_facing_direction
+	create_movement unlock_facing_direction
+	create_movement jump_down
+	create_movement jump_up
+	create_movement jump_left
+	create_movement jump_right
+	create_movement jump_in_place_down
+	create_movement jump_in_place_up
+	create_movement jump_in_place_left
+	create_movement jump_in_place_right
+	create_movement jump_in_place_down_up
+	create_movement jump_in_place_up_down
+	create_movement jump_in_place_left_right
+	create_movement jump_in_place_right_left
+	create_movement face_original_direction
+	create_movement nurse_joy_bow
 	create_movement step_5c
 	create_movement step_5d
-	create_movement step_5e
-	create_movement step_5f
+	create_movement disable_anim
+	create_movement restore_anim
 	create_movement set_invisible
-	create_movement step_61
-	create_movement step_62
-	create_movement step_63
-	create_movement step_64
-	create_movement step_65
+	create_movement set_visible
+	create_movement emote_exclamation_mark
+	create_movement emote_question_mark
+	create_movement emote_x
+	create_movement emote_double_exclamation_mark
 	create_movement step_66
 	create_movement step_67
-	create_movement step_68
-	create_movement step_69
+	create_movement rock_smash_break
+	create_movement cut_tree
 
 	enum_start 0x91
 	create_movement step_91