Finish labeling all movement actions

3 files changed, 147 insertions, 65 deletions

diff --git a/include/constants/field_effects.h b/include/constants/field_effects.h
index 3b2117d3a..86fd6718f 100755
--- a/include/constants/field_effects.h
+++ b/include/constants/field_effects.h
@@ -1,7 +1,7 @@
 #ifndef GUARD_FIELD_EFFECT_CONSTANTS_H
 #define GUARD_FIELD_EFFECT_CONSTANTS_H
 
-#define FLDEFF_EXCLAMATION_MARK_ICON_1   0
+#define FLDEFF_EXCLAMATION_MARK_ICON     0
 #define FLDEFF_USE_CUT_ON_GRASS          1
 #define FLDEFF_USE_CUT_ON_TREE           2
 #define FLDEFF_SHADOW                    3
@@ -34,7 +34,7 @@
 #define FLDEFF_NPCFLY_OUT                30
 #define FLDEFF_USE_FLY                   31
 #define FLDEFF_FLY_IN                    32
-#define FLDEFF_EXCLAMATION_MARK_ICON_2   33
+#define FLDEFF_QUESTION_MARK_ICON        33
 #define FLDEFF_FEET_IN_FLOWING_WATER     34
 #define FLDEFF_BIKE_TIRE_TRACKS          35
 #define FLDEFF_SAND_DISGUISE             36
diff --git a/include/event_object_movement.h b/include/event_object_movement.h
index 23635e5ed..177ebfdaf 100644
--- a/include/event_object_movement.h
+++ b/include/event_object_movement.h
@@ -84,55 +84,144 @@ enum {
 };
 
 enum {
-    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_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_UNKNOWN,                    // 0x39 // todo:
+    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_BUMP_FACE_DOWN,        // 0x6A
+    MOVEMENT_ACTION_ACRO_BUMP_FACE_UP,          // 0x6B
+    MOVEMENT_ACTION_ACRO_BUMP_FACE_LEFT,        // 0x6C
+    MOVEMENT_ACTION_ACRO_BUMP_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_BUMP_MOVE_DOWN,        // 0x86
+    MOVEMENT_ACTION_ACRO_BUMP_MOVE_UP,          // 0x87
+    MOVEMENT_ACTION_ACRO_BUMP_MOVE_LEFT,        // 0x88
+    MOVEMENT_ACTION_ACRO_BUMP_MOVE_RIGHT,       // 0x89
 };
 
 #define GROUND_EFFECT_FLAG_TALL_GRASS_ON_SPAWN   (1 << 0)
@@ -217,7 +306,7 @@ u8 CopyablePlayerMovement_FaceDirection(struct MapObject *, struct Sprite *, u8,
 u8 CopyablePlayerMovement_GoSpeed0(struct MapObject *, struct Sprite *, u8, bool8(u8));
 u8 CopyablePlayerMovement_GoSpeed1(struct MapObject *, struct Sprite *, u8, bool8(u8));
 u8 CopyablePlayerMovement_GoSpeed2(struct MapObject *, struct Sprite *, u8, bool8(u8));
-u8 CopyablePlayerMovement_GoSpeed3(struct MapObject *, struct Sprite *, u8, bool8(u8));
+u8 CopyablePlayerMovement_Slide(struct MapObject *, struct Sprite *, u8, bool8(u8));
 u8 cph_IM_DIFFERENT(struct MapObject *, struct Sprite *, u8, bool8(u8));
 u8 CopyablePlayerMovement_GoSpeed4(struct MapObject *, struct Sprite *, u8, bool8(u8));
 u8 CopyablePlayerMovement_Jump(struct MapObject *, struct Sprite *, u8, bool8(u8));
@@ -557,13 +646,13 @@ u8 GetWalkNormalMovementAction(u32);
 u8 GetWalkFastMovementAction(u32);
 u8 GetRideWaterCurrentMovementAction(u32);
 u8 GetWalkFastestMovementAction(u32);
-u8 sub_80607C8(u32);
-u8 sub_80607F4(u32);
+u8 GetSlideMovementAction(u32);
+u8 GetPlayerRunMovementAction(u32);
 u8 GetJump2MovementAction(u32);
-u8 sub_806084C(u32);
-u8 sub_8060878(u32);
+u8 GetJumpInPlaceMovementAction(u32);
+u8 GetJumpInPlaceTurnAroundMovementAction(u32);
 u8 sub_80608A4(u32);
-u8 sub_80608D0(u32);
+u8 GetJumpSpecialMovementAction(u32);
 u8 GetWalkInPlaceSlowMovementAction(u32);
 u8 GetWalkInPlaceNormalMovementAction(u32);
 u8 GetWalkInPlaceFastMovementAction(u32);
@@ -602,7 +691,7 @@ void sub_80646E4(struct Sprite *sprite, u8 a2, u8 a3, u8 a4);
 void DoShadowFieldEffect(struct MapObject *mapObject);
 u8 sub_8064704(struct Sprite *);
 u8 sub_806478C(struct Sprite *);
-void obj_anim_image_set_and_seek(struct Sprite *sprite, u8 a2, u8 a3);
+void SetAndStartSpriteAnim(struct Sprite *sprite, u8 a2, u8 a3);
 void DoRippleFieldEffect(struct MapObject *mapObj, struct Sprite *sprite);
 bool8 IsZCoordMismatchAt(u8 z, s16 x, s16 y);
 bool8 AreZCoordsCompatible(u8 z1, u8 z2);
diff --git a/include/macros/movement.inc b/include/macros/movement.inc
index 674ce7169..a4bba7a17 100644
--- a/include/macros/movement.inc
+++ b/include/macros/movement.inc
@@ -105,12 +105,5 @@
 	create_movement step_60
 	create_movement step_61
 
-	enum_start 0x91
-	create_movement step_91
-	create_movement step_92
-
-	enum_start 0x96
-	create_movement step_96
-
 	enum_start 0xfe
 	create_movement step_end