Flesh out applymovement command names

2 files changed, 238 insertions, 238 deletions

diff --git a/include/event_object_movement.h b/include/event_object_movement.h
index 790437f54..7ae04dfa6 100644
--- a/include/event_object_movement.h
+++ b/include/event_object_movement.h
@@ -84,144 +84,144 @@ enum {
 };
 
 enum {
-    MOVEMENT_ACTION_FACE_DOWN,                  // 0x0
-    MOVEMENT_ACTION_FACE_UP,                    // 0x1
-    MOVEMENT_ACTION_FACE_LEFT,                  // 0x2
-    MOVEMENT_ACTION_FACE_RIGHT,                 // 0x3
-    MOVEMENT_ACTION_WALK_SLOW_DOWN,             // 0x4
-    MOVEMENT_ACTION_WALK_SLOW_UP,               // 0x5
-    MOVEMENT_ACTION_WALK_SLOW_LEFT,             // 0x6
-    MOVEMENT_ACTION_WALK_SLOW_RIGHT,            // 0x7
-    MOVEMENT_ACTION_WALK_NORMAL_DOWN,           // 0x8
-    MOVEMENT_ACTION_WALK_NORMAL_UP,             // 0x9
-    MOVEMENT_ACTION_WALK_NORMAL_LEFT,           // 0xA
-    MOVEMENT_ACTION_WALK_NORMAL_RIGHT,          // 0xB
-    MOVEMENT_ACTION_JUMP_2_DOWN,                // 0xC
-    MOVEMENT_ACTION_JUMP_2_UP,                  // 0xD
-    MOVEMENT_ACTION_JUMP_2_LEFT,                // 0xE
-    MOVEMENT_ACTION_JUMP_2_RIGHT,               // 0xF
-    MOVEMENT_ACTION_DELAY_1,                    // 0x10
-    MOVEMENT_ACTION_DELAY_2,                    // 0x11
-    MOVEMENT_ACTION_DELAY_4,                    // 0x12
-    MOVEMENT_ACTION_DELAY_8,                    // 0x13
-    MOVEMENT_ACTION_DELAY_16,                   // 0x14
-    MOVEMENT_ACTION_WALK_FAST_DOWN,             // 0x15
-    MOVEMENT_ACTION_WALK_FAST_UP,               // 0x16
-    MOVEMENT_ACTION_WALK_FAST_LEFT,             // 0x17
-    MOVEMENT_ACTION_WALK_FAST_RIGHT,            // 0x18
-    MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_DOWN,    // 0x19
-    MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_UP,      // 0x1A
-    MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_LEFT,    // 0x1B
-    MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_RIGHT,   // 0x1C
-    MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_DOWN,  // 0x1D
-    MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_UP,    // 0x1E
-    MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_LEFT,  // 0x1F
-    MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_RIGHT, // 0x20
-    MOVEMENT_ACTION_WALK_IN_PLACE_FAST_DOWN,    // 0x21
-    MOVEMENT_ACTION_WALK_IN_PLACE_FAST_UP,      // 0x22
-    MOVEMENT_ACTION_WALK_IN_PLACE_FAST_LEFT,    // 0x23
-    MOVEMENT_ACTION_WALK_IN_PLACE_FAST_RIGHT,   // 0x24
-    MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_DOWN, // 0x25
-    MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_UP,   // 0x26
-    MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_LEFT, // 0x27
-    MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_RIGHT,// 0x28
-    MOVEMENT_ACTION_RIDE_WATER_CURRENT_DOWN,    // 0x29
-    MOVEMENT_ACTION_RIDE_WATER_CURRENT_UP,      // 0x2A
-    MOVEMENT_ACTION_RIDE_WATER_CURRENT_LEFT,    // 0x2B
-    MOVEMENT_ACTION_RIDE_WATER_CURRENT_RIGHT,   // 0x2C
-    MOVEMENT_ACTION_WALK_FASTEST_DOWN,          // 0x2D
-    MOVEMENT_ACTION_WALK_FASTEST_UP,            // 0x2E
-    MOVEMENT_ACTION_WALK_FASTEST_LEFT,          // 0x2F
-    MOVEMENT_ACTION_WALK_FASTEST_RIGHT,         // 0x30
-    MOVEMENT_ACTION_SLIDE_DOWN,                 // 0x31
-    MOVEMENT_ACTION_SLIDE_UP,                   // 0x32
-    MOVEMENT_ACTION_SLIDE_LEFT,                 // 0x33
-    MOVEMENT_ACTION_SLIDE_RIGHT,                // 0x34
-    MOVEMENT_ACTION_PLAYER_RUN_DOWN,            // 0x35
-    MOVEMENT_ACTION_PLAYER_RUN_UP,              // 0x36
-    MOVEMENT_ACTION_PLAYER_RUN_LEFT,            // 0x37
-    MOVEMENT_ACTION_PLAYER_RUN_RIGHT,           // 0x38
-    MOVEMENT_ACTION_START_ANIM_IN_DIRECTION,    // 0x39
-    MOVEMENT_ACTION_JUMP_SPECIAL_DOWN,          // 0x3A
-    MOVEMENT_ACTION_JUMP_SPECIAL_UP,            // 0x3B
-    MOVEMENT_ACTION_JUMP_SPECIAL_LEFT ,         // 0x3C
-    MOVEMENT_ACTION_JUMP_SPECIAL_RIGHT,         // 0x3D
-    MOVEMENT_ACITON_FACE_PLAYER,                // 0x3E
-    MOVEMENT_ACITON_FACE_AWAY_PLAYER,           // 0x3F
-    MOVEMENT_ACTION_LOCK_FACING_DIRECTION,      // 0x40
-    MOVEMENT_ACTION_UNLOCK_FACING_DIRECTION,    // 0x41
-    MOVEMENT_ACITON_JUMP_DOWN,                  // 0x42
-    MOVEMENT_ACITON_JUMP_UP,                    // 0x43
-    MOVEMENT_ACITON_JUMP_LEFT,                  // 0x44
-    MOVEMENT_ACITON_JUMP_RIGHT,                 // 0x45
-    MOVEMENT_ACTION_JUMP_IN_PLACE_DOWN,         // 0x46
-    MOVEMENT_ACTION_JUMP_IN_PLACE_UP,           // 0x47
-    MOVEMENT_ACTION_JUMP_IN_PLACE_LEFT,         // 0x48
-    MOVEMENT_ACTION_JUMP_IN_PLACE_RIGHT,        // 0x49
-    MOVEMENT_ACTION_JUMP_IN_PLACE_DOWN_UP,      // 0x4A
-    MOVEMENT_ACTION_JUMP_IN_PLACE_UP_DOWN,      // 0x4B
-    MOVEMENT_ACTION_JUMP_IN_PLACE_LEFT_RIGHT,   // 0x4C
-    MOVEMENT_ACTION_JUMP_IN_PLACE_RIGHT_LEFT,   // 0x4D
-    MOVEMENT_ACTION_FACE_ORIGINAL_DIRECTION,    // 0x4E
-    MOVEMENT_ACTION_NURSE_JOY_BOW_DOWN,         // 0x4F
-    MOVEMENT_ACTION_ENABLE_JUMP_LANDING_GROUND_EFFECT,  // 0x50
-    MOVEMENT_ACTION_DISABLE_JUMP_LANDING_GROUND_EFFECT, // 0x51
-    MOVEMENT_ACTION_DISABLE_ANIMATION,          // 0x52
-    MOVEMENT_ACTION_RESTORE_ANIMATION,          // 0x53
-    MOVEMENT_ACTION_SET_INVISIBLE,              // 0x54
-    MOVEMENT_ACTION_SET_VISIBLE,                // 0x55
-    MOVEMENT_ACTION_EMOTE_EXCLAMATION_MARK,     // 0x56
-    MOVEMENT_ACTION_EMOTE_QUESTION_MARK,        // 0x57
-    MOVEMENT_ACTION_EMOTE_HEART,                // 0x58
-    MOVEMENT_ACTION_REVEAL_TRAINER,             // 0x59
-    MOVEMENT_ACTION_ROCK_SMASH_BREAK,           // 0x5A
-    MOVEMENT_ACTION_CUT_TREE,                   // 0x5B
-    MOVEMENT_ACTION_SET_FIXED_PRIORITY,         // 0x5C
-    MOVEMENT_ACTION_CLEAR_FIXED_PRIORITY,       // 0x5D
-    MOVEMENT_ACTION_INIT_AFFINE_ANIM,           // 0x5E
-    MOVEMENT_ACTION_CLEAR_AFFINE_ANIM,          // 0x5F
-    MOVEMENT_ACTION_WALK_DOWN_AFFINE_0,         // 0x60
-    MOVEMENT_ACTION_WALK_DOWN_AFFINE_1,         // 0x61
-    MOVEMENT_ACTION_ACRO_WHEELIE_FACE_DOWN,     // 0x62
-    MOVEMENT_ACTION_ACRO_WHEELIE_FACE_UP,       // 0x63
-    MOVEMENT_ACTION_ACRO_WHEELIE_FACE_LEFT,     // 0x64
-    MOVEMENT_ACTION_ACRO_WHEELIE_FACE_RIGHT,    // 0x65
-    MOVEMENT_ACTION_ACRO_POP_WHEELIE_DOWN,      // 0x66
-    MOVEMENT_ACTION_ACRO_POP_WHEELIE_UP,        // 0x67
-    MOVEMENT_ACTION_ACRO_POP_WHEELIE_LEFT,      // 0x68
-    MOVEMENT_ACTION_ACRO_POP_WHEELIE_RIGHT,     // 0x69
-    MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_DOWN, // 0x6A
-    MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_UP,   // 0x6B
-    MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_LEFT, // 0x6C
-    MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_RIGHT,// 0x6D
-    MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_DOWN, // 0x6E
-    MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_UP,   // 0x6F
-    MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_LEFT, // 0x70
-    MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_RIGHT,// 0x71
-    MOVEMENT_ACTION_ACRO_WHEELIE_HOP_DOWN,      // 0x72
-    MOVEMENT_ACTION_ACRO_WHEELIE_HOP_UP,        // 0x73
-    MOVEMENT_ACTION_ACRO_WHEELIE_HOP_LEFT,      // 0x74
-    MOVEMENT_ACTION_ACRO_WHEELIE_HOP_RIGHT,     // 0x75
-    MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_DOWN,     // 0x76
-    MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_UP,       // 0x77
-    MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_LEFT,     // 0x78
-    MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_RIGHT,    // 0x79
-    MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_DOWN, // 0x7A
-    MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_UP,   // 0x7B
-    MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_LEFT, // 0x7C
-    MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_RIGHT,// 0x7D
-    MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_DOWN, // 0x7E
-    MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_UP,   // 0x7F
-    MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_LEFT, // 0x80
-    MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_RIGHT,// 0x81
-    MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_DOWN,     // 0x82
-    MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_UP,       // 0x83
-    MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_LEFT,     // 0x84
-    MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_RIGHT,    // 0x85
-    MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_DOWN, // 0x86
-    MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_UP,   // 0x87
-    MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_LEFT, // 0x88
-    MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_RIGHT,// 0x89
+    MOVEMENT_ACTION_FACE_DOWN,
+    MOVEMENT_ACTION_FACE_UP,
+    MOVEMENT_ACTION_FACE_LEFT,
+    MOVEMENT_ACTION_FACE_RIGHT,
+    MOVEMENT_ACTION_WALK_SLOW_DOWN,
+    MOVEMENT_ACTION_WALK_SLOW_UP,
+    MOVEMENT_ACTION_WALK_SLOW_LEFT,
+    MOVEMENT_ACTION_WALK_SLOW_RIGHT,
+    MOVEMENT_ACTION_WALK_NORMAL_DOWN,
+    MOVEMENT_ACTION_WALK_NORMAL_UP,
+    MOVEMENT_ACTION_WALK_NORMAL_LEFT,
+    MOVEMENT_ACTION_WALK_NORMAL_RIGHT,
+    MOVEMENT_ACTION_JUMP_2_DOWN,
+    MOVEMENT_ACTION_JUMP_2_UP,
+    MOVEMENT_ACTION_JUMP_2_LEFT,
+    MOVEMENT_ACTION_JUMP_2_RIGHT,
+    MOVEMENT_ACTION_DELAY_1,
+    MOVEMENT_ACTION_DELAY_2,
+    MOVEMENT_ACTION_DELAY_4,
+    MOVEMENT_ACTION_DELAY_8,
+    MOVEMENT_ACTION_DELAY_16,
+    MOVEMENT_ACTION_WALK_FAST_DOWN,
+    MOVEMENT_ACTION_WALK_FAST_UP,
+    MOVEMENT_ACTION_WALK_FAST_LEFT,
+    MOVEMENT_ACTION_WALK_FAST_RIGHT,
+    MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_DOWN,
+    MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_UP,
+    MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_LEFT,
+    MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_RIGHT,
+    MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_DOWN,
+    MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_UP,
+    MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_LEFT,
+    MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_RIGHT,
+    MOVEMENT_ACTION_WALK_IN_PLACE_FAST_DOWN,
+    MOVEMENT_ACTION_WALK_IN_PLACE_FAST_UP,
+    MOVEMENT_ACTION_WALK_IN_PLACE_FAST_LEFT,
+    MOVEMENT_ACTION_WALK_IN_PLACE_FAST_RIGHT,
+    MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_DOWN,
+    MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_UP,
+    MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_LEFT,
+    MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_RIGHT,
+    MOVEMENT_ACTION_RIDE_WATER_CURRENT_DOWN,
+    MOVEMENT_ACTION_RIDE_WATER_CURRENT_UP,
+    MOVEMENT_ACTION_RIDE_WATER_CURRENT_LEFT,
+    MOVEMENT_ACTION_RIDE_WATER_CURRENT_RIGHT,
+    MOVEMENT_ACTION_WALK_FASTEST_DOWN,
+    MOVEMENT_ACTION_WALK_FASTEST_UP,
+    MOVEMENT_ACTION_WALK_FASTEST_LEFT,
+    MOVEMENT_ACTION_WALK_FASTEST_RIGHT,
+    MOVEMENT_ACTION_SLIDE_DOWN,
+    MOVEMENT_ACTION_SLIDE_UP,
+    MOVEMENT_ACTION_SLIDE_LEFT,
+    MOVEMENT_ACTION_SLIDE_RIGHT,
+    MOVEMENT_ACTION_PLAYER_RUN_DOWN,
+    MOVEMENT_ACTION_PLAYER_RUN_UP,
+    MOVEMENT_ACTION_PLAYER_RUN_LEFT,
+    MOVEMENT_ACTION_PLAYER_RUN_RIGHT,
+    MOVEMENT_ACTION_START_ANIM_IN_DIRECTION,
+    MOVEMENT_ACTION_JUMP_SPECIAL_DOWN,
+    MOVEMENT_ACTION_JUMP_SPECIAL_UP,
+    MOVEMENT_ACTION_JUMP_SPECIAL_LEFT ,
+    MOVEMENT_ACTION_JUMP_SPECIAL_RIGHT,
+    MOVEMENT_ACITON_FACE_PLAYER,
+    MOVEMENT_ACITON_FACE_AWAY_PLAYER,
+    MOVEMENT_ACTION_LOCK_FACING_DIRECTION,
+    MOVEMENT_ACTION_UNLOCK_FACING_DIRECTION,
+    MOVEMENT_ACITON_JUMP_DOWN,
+    MOVEMENT_ACITON_JUMP_UP,
+    MOVEMENT_ACITON_JUMP_LEFT,
+    MOVEMENT_ACITON_JUMP_RIGHT,
+    MOVEMENT_ACTION_JUMP_IN_PLACE_DOWN,
+    MOVEMENT_ACTION_JUMP_IN_PLACE_UP,
+    MOVEMENT_ACTION_JUMP_IN_PLACE_LEFT,
+    MOVEMENT_ACTION_JUMP_IN_PLACE_RIGHT,
+    MOVEMENT_ACTION_JUMP_IN_PLACE_DOWN_UP,
+    MOVEMENT_ACTION_JUMP_IN_PLACE_UP_DOWN,
+    MOVEMENT_ACTION_JUMP_IN_PLACE_LEFT_RIGHT,
+    MOVEMENT_ACTION_JUMP_IN_PLACE_RIGHT_LEFT,
+    MOVEMENT_ACTION_FACE_ORIGINAL_DIRECTION,
+    MOVEMENT_ACTION_NURSE_JOY_BOW_DOWN,
+    MOVEMENT_ACTION_ENABLE_JUMP_LANDING_GROUND_EFFECT,
+    MOVEMENT_ACTION_DISABLE_JUMP_LANDING_GROUND_EFFECT,
+    MOVEMENT_ACTION_DISABLE_ANIMATION,
+    MOVEMENT_ACTION_RESTORE_ANIMATION,
+    MOVEMENT_ACTION_SET_INVISIBLE,
+    MOVEMENT_ACTION_SET_VISIBLE,
+    MOVEMENT_ACTION_EMOTE_EXCLAMATION_MARK,
+    MOVEMENT_ACTION_EMOTE_QUESTION_MARK,
+    MOVEMENT_ACTION_EMOTE_HEART,
+    MOVEMENT_ACTION_REVEAL_TRAINER,
+    MOVEMENT_ACTION_ROCK_SMASH_BREAK,
+    MOVEMENT_ACTION_CUT_TREE,
+    MOVEMENT_ACTION_SET_FIXED_PRIORITY,
+    MOVEMENT_ACTION_CLEAR_FIXED_PRIORITY,
+    MOVEMENT_ACTION_INIT_AFFINE_ANIM,
+    MOVEMENT_ACTION_CLEAR_AFFINE_ANIM,
+    MOVEMENT_ACTION_WALK_DOWN_AFFINE_0,
+    MOVEMENT_ACTION_WALK_DOWN_AFFINE_1,
+    MOVEMENT_ACTION_ACRO_WHEELIE_FACE_DOWN,
+    MOVEMENT_ACTION_ACRO_WHEELIE_FACE_UP,
+    MOVEMENT_ACTION_ACRO_WHEELIE_FACE_LEFT,
+    MOVEMENT_ACTION_ACRO_WHEELIE_FACE_RIGHT,
+    MOVEMENT_ACTION_ACRO_POP_WHEELIE_DOWN,
+    MOVEMENT_ACTION_ACRO_POP_WHEELIE_UP,
+    MOVEMENT_ACTION_ACRO_POP_WHEELIE_LEFT,
+    MOVEMENT_ACTION_ACRO_POP_WHEELIE_RIGHT,
+    MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_DOWN,
+    MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_UP,
+    MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_LEFT,
+    MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_RIGHT,
+    MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_DOWN,
+    MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_UP,
+    MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_LEFT,
+    MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_RIGHT,
+    MOVEMENT_ACTION_ACRO_WHEELIE_HOP_DOWN,
+    MOVEMENT_ACTION_ACRO_WHEELIE_HOP_UP,
+    MOVEMENT_ACTION_ACRO_WHEELIE_HOP_LEFT,
+    MOVEMENT_ACTION_ACRO_WHEELIE_HOP_RIGHT,
+    MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_DOWN,
+    MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_UP,
+    MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_LEFT,
+    MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_RIGHT,
+    MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_DOWN,
+    MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_UP,
+    MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_LEFT,
+    MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_RIGHT,
+    MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_DOWN,
+    MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_UP,
+    MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_LEFT,
+    MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_RIGHT,
+    MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_DOWN,
+    MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_UP,
+    MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_LEFT,
+    MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_RIGHT,
+    MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_DOWN,
+    MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_UP,
+    MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_LEFT,
+    MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_RIGHT,
 };
 
 #define GROUND_EFFECT_FLAG_TALL_GRASS_ON_SPAWN   (1 << 0)
diff --git a/include/macros/movement.inc b/include/macros/movement.inc
index a4bba7a17..80a5b5dca 100644
--- a/include/macros/movement.inc
+++ b/include/macros/movement.inc
@@ -1,4 +1,4 @@
-	.macro create_movement name
+	.macro create_movement_action name
 	enum _\name
 	.macro \name
 	.byte _\name
@@ -6,104 +6,104 @@
 	.endm
 
 	enum_start
-	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 step_41
-	create_movement step_42
-	create_movement step_43
-	create_movement step_44
-	create_movement step_45
-	create_movement step_46
-	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 step_5c
-	create_movement step_5d
-	create_movement step_5e
-	create_movement step_5f
-	create_movement step_60
-	create_movement step_61
+	create_movement_action face_down
+	create_movement_action face_up
+	create_movement_action face_left
+	create_movement_action face_right
+	create_movement_action walk_slow_down
+	create_movement_action walk_slow_up
+	create_movement_action walk_slow_left
+	create_movement_action walk_slow_right
+	create_movement_action walk_down
+	create_movement_action walk_up
+	create_movement_action walk_left
+	create_movement_action walk_right
+	create_movement_action jump_2_down
+	create_movement_action jump_2_up
+	create_movement_action jump_2_left
+	create_movement_action jump_2_right
+	create_movement_action delay_1
+	create_movement_action delay_2
+	create_movement_action delay_4
+	create_movement_action delay_8
+	create_movement_action delay_16
+	create_movement_action walk_fast_down
+	create_movement_action walk_fast_up
+	create_movement_action walk_fast_left
+	create_movement_action walk_fast_right
+	create_movement_action walk_in_place_slow_down
+	create_movement_action walk_in_place_slow_up
+	create_movement_action walk_in_place_slow_left
+	create_movement_action walk_in_place_slow_right
+	create_movement_action walk_in_place_down
+	create_movement_action walk_in_place_up
+	create_movement_action walk_in_place_left
+	create_movement_action walk_in_place_right
+	create_movement_action walk_in_place_fast_down
+	create_movement_action walk_in_place_fast_up
+	create_movement_action walk_in_place_fast_left
+	create_movement_action walk_in_place_fast_right
+	create_movement_action walk_in_place_fastest_down
+	create_movement_action walk_in_place_fastest_up
+	create_movement_action walk_in_place_fastest_left
+	create_movement_action walk_in_place_fastest_right
+	create_movement_action ride_water_current_down
+	create_movement_action ride_water_current_up
+	create_movement_action ride_water_current_left
+	create_movement_action ride_water_current_right
+	create_movement_action walk_fastest_down
+	create_movement_action walk_fastest_up
+	create_movement_action walk_fastest_left
+	create_movement_action walk_fastest_right
+	create_movement_action slide_down
+	create_movement_action slide_up
+	create_movement_action slide_left
+	create_movement_action slide_right
+	create_movement_action player_run_down
+	create_movement_action player_run_up
+	create_movement_action player_run_left
+	create_movement_action player_run_right
+	create_movement_action start_anim_in_direction
+	create_movement_action jump_special_down
+	create_movement_action jump_special_up
+	create_movement_action jump_special_left
+	create_movement_action jump_special_right
+	create_movement_action face_player
+	create_movement_action face_away_player
+	create_movement_action lock_facing_direction
+	create_movement_action unlock_facing_direction
+	create_movement_action jump_down
+	create_movement_action jump_up
+	create_movement_action jump_left
+	create_movement_action jump_right
+	create_movement_action jump_in_place_down
+	create_movement_action jump_in_place_up
+	create_movement_action jump_in_place_left
+	create_movement_action jump_in_place_right
+	create_movement_action jump_in_place_down_up
+	create_movement_action jump_in_place_up_down
+	create_movement_action jump_in_place_left_right
+	create_movement_action jump_in_place_right_left
+	create_movement_action face_original_direction
+	create_movement_action nurse_joy_bow
+	create_movement_action enable_jump_landing_ground_effect
+	create_movement_action disable_jump_landing_ground_effect
+	create_movement_action disable_anim
+	create_movement_action restore_anim
+	create_movement_action set_invisible
+	create_movement_action set_visible
+	create_movement_action emote_exclamation_mark
+	create_movement_action emote_question_mark
+	create_movement_action emote_heart
+	create_movement_action reveal_trainer
+	create_movement_action rock_smash_break
+	create_movement_action cut_tree
+	create_movement_action set_fixed_priority
+	create_movement_action clear_fixed_priority
+	create_movement_action init_affine_anim
+	create_movement_action clear_affine_anim
+	create_movement_action walk_down_affine_0
+	create_movement_action walk_down_affine_1
 
 	enum_start 0xfe
-	create_movement step_end
+	create_movement_action end_movement