Rename regularAnim and specialAnim to singleMovement and heldMovement

2 files changed, 18 insertions, 18 deletions

diff --git a/include/event_object_movement.h b/include/event_object_movement.h
index 6105d1774..d01a7bb72 100644
--- a/include/event_object_movement.h
+++ b/include/event_object_movement.h
@@ -37,7 +37,7 @@ static u8 callback(struct MapObject *mapObject, struct Sprite *sprite)\
     return table[sprite->data[1]](mapObject, sprite);\
 }
 
-#define fieldmap_object_null_cb(setup, callback) \
+#define fieldmap_object_empty_callback(setup, callback) \
 static u8 callback(struct MapObject *, struct Sprite *);\
 void setup(struct Sprite *sprite)\
 {\
@@ -101,7 +101,7 @@ void FieldObjectCB_Hidden1(struct Sprite *);
 void FieldObjectCB_MountainDisguise(struct Sprite *);
 void FieldObjectCB_TreeDisguise(struct Sprite *);
 void sub_80587B4(struct Sprite *);
-void sub_805C884(struct Sprite *);
+void MovementType_None(struct Sprite *);
 void sub_805C8AC(struct Sprite *);
 void sub_805CDE8(struct Sprite *);
 void sub_805CF28(struct Sprite *);
@@ -360,7 +360,7 @@ u8 show_sprite(u8, u8, u8);
 void MakeObjectTemplateFromFieldObjectTemplate(struct MapObjectTemplate *mapObjTemplate, struct SpriteTemplate *sprTemplate, const struct SubspriteTable **subspriteTables);
 u8 AddPseudoFieldObject(u16 graphicsId, void (*callback)(struct Sprite *), s16 x, s16 y, u8 subpriority);
 u8 sub_805B410(u8, u8, s16, s16, u8, u8);
-void sub_805B55C(s16 a, s16 b);
+void TrySpawnFieldObjects(s16, s16);
 void sub_805B710(u16 i, u16 i1);
 void sub_805B980(struct MapObject *, u8);
 void FieldObjectTurn(struct MapObject *, u8);
@@ -411,15 +411,15 @@ void sub_8060388(s16, s16, s16 *, s16 *);
 void sub_80603CC(s16 x, s16 y, s16 *pInt, s16 *pInt1);
 void GetFieldObjectMovingCameraOffset(s16 *, s16 *);
 void FieldObjectMoveDestCoords(struct MapObject *pObject, u32 unk_19, s16 *pInt, s16 *pInt1);
-bool8 FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(struct MapObject *);
-bool8 FieldObjectIsSpecialAnimActive(struct MapObject *);
-bool8 FieldObjectSetSpecialAnim(struct MapObject *, u8);
-void FieldObjectForceSetSpecialAnim(struct MapObject *pObject, u8 a);
-void FieldObjectClearAnimIfSpecialAnimActive(struct MapObject *);
-void FieldObjectClearAnim(struct MapObject *);
-bool8 FieldObjectCheckIfSpecialAnimFinishedOrInactive(struct MapObject *);
-u8 FieldObjectClearAnimIfSpecialAnimFinished(struct MapObject *);
-u8 FieldObjectGetSpecialAnim(struct MapObject *);
+bool8 FieldObjectIsMovementOverridden(struct MapObject *);
+bool8 FieldObjectIsHeldMovementActive(struct MapObject *);
+bool8 FieldObjectSetHeldMovement(struct MapObject *, u8);
+void FieldObjectForceSetHeldMovement(struct MapObject *pObject, u8 a);
+void FieldObjectClearHeldMovementIfActive(struct MapObject *);
+void FieldObjectClearHeldMovement(struct MapObject *);
+bool8 FieldObjectCheckHeldMovementStatus(struct MapObject *);
+u8 FieldObjectClearHeldMovementIfFinished(struct MapObject *);
+u8 FieldObjectGetHeldMovementActionId(struct MapObject *);
 u8 GetFaceDirectionAnimId(u32);
 u8 GetSimpleGoAnimId(u32);
 u8 GetGoSpeed0AnimId(u32);
diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h
index d87cd78f4..7408a9f9a 100644
--- a/include/global.fieldmap.h
+++ b/include/global.fieldmap.h
@@ -178,13 +178,13 @@ struct MapHeader
 struct MapObject
 {
     /*0x00*/ u32 active:1;
-             u32 regularAnimActive:1;
+             u32 singleMovementActive:1;
              u32 triggerGroundEffectsOnMove:1;
              u32 triggerGroundEffectsOnStop:1;
              u32 disableCoveringGroundEffects:1; // disables ground effects that cover parts of the object's sprite
              u32 landingJump:1;
-             u32 specialAnimActive:1;
-             u32 specialAnimFinished:1;
+             u32 heldMovementActive:1;
+             u32 heldMovementFinished:1;
     /*0x01*/ u32 frozen:1;
              u32 facingDirectionLocked:1;
              u32 disableAnim:1; // used to disable forced movement sliding animations (like on ice)
@@ -206,7 +206,7 @@ struct MapObject
              u32 fixedPriority:1;
     /*0x04*/ u8 spriteId;
     /*0x05*/ u8 graphicsId;
-    /*0x06*/ u8 animPattern;
+    /*0x06*/ u8 movementType;
     /*0x07*/ u8 trainerType;
     /*0x08*/ u8 localId;
     /*0x09*/ u8 mapNum;
@@ -227,13 +227,13 @@ struct MapObject
     }  range;
     /*0x1A*/ u8 fieldEffectSpriteId;
     /*0x1B*/ u8 warpArrowSpriteId;
-    /*0x1C*/ u8 animId;
+    /*0x1C*/ u8 movementActionId;
     /*0x1D*/ u8 trainerRange_berryTreeId;
     /*0x1E*/ u8 currentMetatileBehavior;
     /*0x1F*/ u8 previousMetatileBehavior;
     /*0x20*/ u8 previousMovementDirection;
     /*0x21*/ u8 directionSequenceIndex;
-    /*0x22*/ u8 playerAnimId;
+    /*0x22*/ u8 playerMovementActionId;
     /*size = 0x24*/
 };