Unify 'map object' and 'field object' terms into 'event object'

1 files changed, 279 insertions, 279 deletions

diff --git a/include/event_object_movement.h b/include/event_object_movement.h
index 4945d132c..790437f54 100644
--- a/include/event_object_movement.h
+++ b/include/event_object_movement.h
@@ -248,23 +248,23 @@ enum {
 extern const u8 gUnknown_0830FD14[];
 
 #define movement_type_def(setup, table) \
-static u8 setup##_callback(struct MapObject *, struct Sprite *);\
+static u8 setup##_callback(struct EventObject *, struct Sprite *);\
 void setup(struct Sprite *sprite)\
 {\
-    meta_step(&gMapObjects[sprite->data[0]], sprite, setup##_callback);\
+    UpdateEventObjectCurrentMovement(&gEventObjects[sprite->data[0]], sprite, setup##_callback);\
 }\
-static u8 setup##_callback(struct MapObject *mapObject, struct Sprite *sprite)\
+static u8 setup##_callback(struct EventObject *eventObject, struct Sprite *sprite)\
 {\
-    return table[sprite->data[1]](mapObject, sprite);\
+    return table[sprite->data[1]](eventObject, sprite);\
 }
 
 #define movement_type_empty_callback(setup) \
-static u8 setup##_callback(struct MapObject *, struct Sprite *);\
+static u8 setup##_callback(struct EventObject *, struct Sprite *);\
 void setup(struct Sprite *sprite)\
 {\
-    meta_step(&gMapObjects[sprite->data[0]], sprite, setup##_callback);\
+    UpdateEventObjectCurrentMovement(&gEventObjects[sprite->data[0]], sprite, setup##_callback);\
 }\
-static u8 setup##_callback(struct MapObject *mapObject, struct Sprite *sprite)\
+static u8 setup##_callback(struct EventObject *eventObject, struct Sprite *sprite)\
 {\
     return 0;\
 }
@@ -275,18 +275,18 @@ struct PairedPalettes
     const u16 *data;
 };
 
-extern const u16 gMapObjectPalette19[];
+extern const u16 gEventObjectPalette19[];
 
-extern const u32 gMapObjectPic_MovingBox[32];
-extern const struct SpriteFrameImage gMapObjectPicTable_PechaBerryTree[];
+extern const u32 gEventObjectPic_MovingBox[32];
+extern const struct SpriteFrameImage gEventObjectPicTable_PechaBerryTree[];
 
 extern const u8 gFieldEffectPic_CutGrass[];
 extern const u16 gFieldEffectObjectPalette6[];
 
-void sub_805C058(struct MapObject *mapObject, s16 a, s16 b);
-void SetFieldObjectDirection(struct MapObject *pObject, u8 unk_18);
+void sub_805C058(struct EventObject *eventObject, s16 a, s16 b);
+void SetEventObjectDirection(struct EventObject *pObject, u8 unk_18);
 void MoveCoords(u8 direction, s16 *x, s16 *y);
-void meta_step(struct MapObject *pObject,  struct Sprite *pSprite,  u8 (*d8)(struct MapObject *, struct Sprite *));
+void UpdateEventObjectCurrentMovement(struct EventObject *pObject,  struct Sprite *pSprite,  u8 (*d8)(struct EventObject *, struct Sprite *));
 
 u8 GetVectorDirection(s16 a0, s16 a1, s16 a2, s16 a3);
 u8 GetLimitedVectorDirection_SouthNorth(s16 a0, s16 a1, s16 a2, s16 a3);
@@ -300,15 +300,15 @@ u8 GetLimitedVectorDirection_SouthNorthEast(s16 a0, s16 a1, s16 a2, s16 a3);
 u8 GetLimitedVectorDirection_NorthWestEast(s16 a0, s16 a1, s16 a2, s16 a3);
 u8 GetLimitedVectorDirection_SouthWestEast(s16 a0, s16 a1, s16 a2, s16 a3);
 
-u8 CopyablePlayerMovement_None(struct MapObject *, struct Sprite *, u8, bool8(u8));
-u8 CopyablePlayerMovement_FaceDirection(struct MapObject *, struct Sprite *, u8, bool8(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_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));
+u8 CopyablePlayerMovement_None(struct EventObject *, struct Sprite *, u8, bool8(u8));
+u8 CopyablePlayerMovement_FaceDirection(struct EventObject *, struct Sprite *, u8, bool8(u8));
+u8 CopyablePlayerMovement_GoSpeed0(struct EventObject *, struct Sprite *, u8, bool8(u8));
+u8 CopyablePlayerMovement_GoSpeed1(struct EventObject *, struct Sprite *, u8, bool8(u8));
+u8 CopyablePlayerMovement_GoSpeed2(struct EventObject *, struct Sprite *, u8, bool8(u8));
+u8 CopyablePlayerMovement_Slide(struct EventObject *, struct Sprite *, u8, bool8(u8));
+u8 cph_IM_DIFFERENT(struct EventObject *, struct Sprite *, u8, bool8(u8));
+u8 CopyablePlayerMovement_GoSpeed4(struct EventObject *, struct Sprite *, u8, bool8(u8));
+u8 CopyablePlayerMovement_Jump(struct EventObject *, struct Sprite *, u8, bool8(u8));
 
 extern struct CameraSomething gUnknown_03004880;
 extern u16 gUnknown_03004898;
@@ -371,189 +371,189 @@ void MovementType_JogInPlace(struct Sprite *);
 void MovementType_RunInPlace(struct Sprite *);
 void MovementType_Invisible(struct Sprite *);
 
-u8 MovementType_WanderAround_Step0(struct MapObject *, struct Sprite *);
-u8 MovementType_WanderAround_Step1(struct MapObject *, struct Sprite *);
-u8 MovementType_WanderAround_Step2(struct MapObject *, struct Sprite *);
-u8 MovementType_WanderAround_Step3(struct MapObject *, struct Sprite *);
-u8 MovementType_WanderAround_Step4(struct MapObject *, struct Sprite *);
-u8 MovementType_WanderAround_Step5(struct MapObject *, struct Sprite *);
-u8 MovementType_WanderAround_Step6(struct MapObject *, struct Sprite *);
-u8 MovementType_LookAround_Step0(struct MapObject *, struct Sprite *);
-u8 MovementType_LookAround_Step1(struct MapObject *, struct Sprite *);
-u8 MovementType_LookAround_Step2(struct MapObject *, struct Sprite *);
-u8 MovementType_LookAround_Step3(struct MapObject *, struct Sprite *);
-u8 MovementType_LookAround_Step4(struct MapObject *, struct Sprite *);
-u8 MovementType_WanderUpAndDown_Step0(struct MapObject *, struct Sprite *);
-u8 MovementType_WanderUpAndDown_Step1(struct MapObject *, struct Sprite *);
-u8 MovementType_WanderUpAndDown_Step2(struct MapObject *, struct Sprite *);
-u8 MovementType_WanderUpAndDown_Step3(struct MapObject *, struct Sprite *);
-u8 MovementType_WanderUpAndDown_Step4(struct MapObject *, struct Sprite *);
-u8 MovementType_WanderUpAndDown_Step5(struct MapObject *, struct Sprite *);
-u8 MovementType_WanderUpAndDown_Step6(struct MapObject *, struct Sprite *);
-u8 MovementType_WanderLeftAndRight_Step0(struct MapObject *, struct Sprite *);
-u8 MovementType_WanderLeftAndRight_Step1(struct MapObject *, struct Sprite *);
-u8 MovementType_WanderLeftAndRight_Step2(struct MapObject *, struct Sprite *);
-u8 MovementType_WanderLeftAndRight_Step3(struct MapObject *, struct Sprite *);
-u8 MovementType_WanderLeftAndRight_Step4(struct MapObject *, struct Sprite *);
-u8 MovementType_WanderLeftAndRight_Step5(struct MapObject *, struct Sprite *);
-u8 MovementType_WanderLeftAndRight_Step6(struct MapObject *, struct Sprite *);
-u8 MovementType_FaceDirection_Step0(struct MapObject *, struct Sprite *);
-u8 MovementType_FaceDirection_Step1(struct MapObject *, struct Sprite *);
-u8 MovementType_FaceDirection_Step2(struct MapObject *, struct Sprite *);
-u8 MovementType_BerryTreeGrowth_Step0(struct MapObject *, struct Sprite *);
-u8 MovementType_BerryTreeGrowth_Step1(struct MapObject *, struct Sprite *);
-u8 MovementType_BerryTreeGrowth_Step2(struct MapObject *, struct Sprite *);
-u8 MovementType_BerryTreeGrowth_Step3(struct MapObject *, struct Sprite *);
-u8 MovementType_BerryTreeGrowth_Step4(struct MapObject *, struct Sprite *);
-u8 MovementType_FaceDownAndUp_Step0(struct MapObject *, struct Sprite *);
-u8 MovementType_FaceDownAndUp_Step1(struct MapObject *, struct Sprite *);
-u8 MovementType_FaceDownAndUp_Step2(struct MapObject *, struct Sprite *);
-u8 MovementType_FaceDownAndUp_Step3(struct MapObject *, struct Sprite *);
-u8 MovementType_FaceDownAndUp_Step4(struct MapObject *, struct Sprite *);
-u8 MovementType_FaceLeftAndRight_Step0(struct MapObject *, struct Sprite *);
-u8 MovementType_FaceLeftAndRight_Step1(struct MapObject *, struct Sprite *);
-u8 MovementType_FaceLeftAndRight_Step2(struct MapObject *, struct Sprite *);
-u8 MovementType_FaceLeftAndRight_Step3(struct MapObject *, struct Sprite *);
-u8 MovementType_FaceLeftAndRight_Step4(struct MapObject *, struct Sprite *);
-u8 MovementType_FaceUpAndLeft_Step0(struct MapObject *, struct Sprite *);
-u8 MovementType_FaceUpAndLeft_Step1(struct MapObject *, struct Sprite *);
-u8 MovementType_FaceUpAndLeft_Step2(struct MapObject *, struct Sprite *);
-u8 MovementType_FaceUpAndLeft_Step3(struct MapObject *, struct Sprite *);
-u8 MovementType_FaceUpAndLeft_Step4(struct MapObject *, struct Sprite *);
-u8 MovementType_FaceUpAndRight_Step0(struct MapObject *, struct Sprite *);
-u8 MovementType_FaceUpAndRight_Step1(struct MapObject *, struct Sprite *);
-u8 MovementType_FaceUpAndRight_Step2(struct MapObject *, struct Sprite *);
-u8 MovementType_FaceUpAndRight_Step3(struct MapObject *, struct Sprite *);
-u8 MovementType_FaceUpAndRight_Step4(struct MapObject *, struct Sprite *);
-u8 MovementType_FaceDownAndLeft_Step0(struct MapObject *, struct Sprite *);
-u8 MovementType_FaceDownAndLeft_Step1(struct MapObject *, struct Sprite *);
-u8 MovementType_FaceDownAndLeft_Step2(struct MapObject *, struct Sprite *);
-u8 MovementType_FaceDownAndLeft_Step3(struct MapObject *, struct Sprite *);
-u8 MovementType_FaceDownAndLeft_Step4(struct MapObject *, struct Sprite *);
-u8 MovementType_FaceDownAndRight_Step0(struct MapObject *, struct Sprite *);
-u8 MovementType_FaceDownAndRight_Step1(struct MapObject *, struct Sprite *);
-u8 MovementType_FaceDownAndRight_Step2(struct MapObject *, struct Sprite *);
-u8 MovementType_FaceDownAndRight_Step3(struct MapObject *, struct Sprite *);
-u8 MovementType_FaceDownAndRight_Step4(struct MapObject *, struct Sprite *);
-u8 MovementType_FaceDownUpAndLeft_Step0(struct MapObject *, struct Sprite *);
-u8 MovementType_FaceDownUpAndLeft_Step1(struct MapObject *, struct Sprite *);
-u8 MovementType_FaceDownUpAndLeft_Step2(struct MapObject *, struct Sprite *);
-u8 MovementType_FaceDownUpAndLeft_Step3(struct MapObject *, struct Sprite *);
-u8 MovementType_FaceDownUpAndLeft_Step4(struct MapObject *, struct Sprite *);
-u8 MovementType_FaceDownUpAndRight_Step0(struct MapObject *, struct Sprite *);
-u8 MovementType_FaceDownUpAndRight_Step1(struct MapObject *, struct Sprite *);
-u8 MovementType_FaceDownUpAndRight_Step2(struct MapObject *, struct Sprite *);
-u8 MovementType_FaceDownUpAndRight_Step3(struct MapObject *, struct Sprite *);
-u8 MovementType_FaceDownUpAndRight_Step4(struct MapObject *, struct Sprite *);
-u8 MovementType_FaceUpLeftAndRight_Step0(struct MapObject *, struct Sprite *);
-u8 MovementType_FaceUpLeftAndRight_Step1(struct MapObject *, struct Sprite *);
-u8 MovementType_FaceUpLeftAndRight_Step2(struct MapObject *, struct Sprite *);
-u8 MovementType_FaceUpLeftAndRight_Step3(struct MapObject *, struct Sprite *);
-u8 MovementType_FaceUpLeftAndRight_Step4(struct MapObject *, struct Sprite *);
-u8 MovementType_FaceDownLeftAndRight_Step0(struct MapObject *, struct Sprite *);
-u8 MovementType_FaceDownLeftAndRight_Step1(struct MapObject *, struct Sprite *);
-u8 MovementType_FaceDownLeftAndRight_Step2(struct MapObject *, struct Sprite *);
-u8 MovementType_FaceDownLeftAndRight_Step3(struct MapObject *, struct Sprite *);
-u8 MovementType_FaceDownLeftAndRight_Step4(struct MapObject *, struct Sprite *);
-u8 MovementType_RotateCounterclockwise_Step0(struct MapObject *, struct Sprite *);
-u8 MovementType_RotateCounterclockwise_Step1(struct MapObject *, struct Sprite *);
-u8 MovementType_RotateCounterclockwise_Step2(struct MapObject *, struct Sprite *);
-u8 MovementType_RotateCounterclockwise_Step3(struct MapObject *, struct Sprite *);
-u8 MovementType_RotateClockwise_Step0(struct MapObject *, struct Sprite *);
-u8 MovementType_RotateClockwise_Step1(struct MapObject *, struct Sprite *);
-u8 MovementType_RotateClockwise_Step2(struct MapObject *, struct Sprite *);
-u8 MovementType_RotateClockwise_Step3(struct MapObject *, struct Sprite *);
-u8 MovementType_WalkBackAndForth_Step0(struct MapObject *, struct Sprite *);
-u8 MovementType_WalkBackAndForth_Step1(struct MapObject *, struct Sprite *);
-u8 MovementType_WalkBackAndForth_Step2(struct MapObject *, struct Sprite *);
-u8 MovementType_WalkBackAndForth_Step3(struct MapObject *, struct Sprite *);
-u8 MovementType_WalkSequence_Step0(struct MapObject *, struct Sprite *);
-u8 MovementType_WalkSequenceUpRightLeftDown_Step1(struct MapObject *, struct Sprite *);
-u8 MovementType_WalkSequence_Step2(struct MapObject *, struct Sprite *);
-u8 MovementType_WalkSequence_Step0(struct MapObject *, struct Sprite *);
-u8 MovementType_WalkSequenceRightLeftDownUp_Step1(struct MapObject *, struct Sprite *);
-u8 MovementType_WalkSequence_Step2(struct MapObject *, struct Sprite *);
-u8 MovementType_WalkSequence_Step0(struct MapObject *, struct Sprite *);
-u8 MovementType_WalkSequenceDownUpRightLeft_Step1(struct MapObject *, struct Sprite *);
-u8 MovementType_WalkSequence_Step2(struct MapObject *, struct Sprite *);
-u8 MovementType_WalkSequence_Step0(struct MapObject *, struct Sprite *);
-u8 MovementType_WalkSequenceLeftDownUpRight_Step1(struct MapObject *, struct Sprite *);
-u8 MovementType_WalkSequence_Step2(struct MapObject *, struct Sprite *);
-u8 MovementType_WalkSequence_Step0(struct MapObject *, struct Sprite *);
-u8 MovementType_WalkSequenceUpLeftRightDown_Step1(struct MapObject *, struct Sprite *);
-u8 MovementType_WalkSequence_Step2(struct MapObject *, struct Sprite *);
-u8 MovementType_WalkSequence_Step0(struct MapObject *, struct Sprite *);
-u8 MovementType_WalkSequenceLeftRightDownUp_Step1(struct MapObject *, struct Sprite *);
-u8 MovementType_WalkSequence_Step2(struct MapObject *, struct Sprite *);
-u8 MovementType_WalkSequence_Step0(struct MapObject *, struct Sprite *);
-u8 MovementType_WalkSequenceDownUpLeftRight_Step1(struct MapObject *, struct Sprite *);
-u8 MovementType_WalkSequence_Step2(struct MapObject *, struct Sprite *);
-u8 MovementType_WalkSequence_Step0(struct MapObject *, struct Sprite *);
-u8 MovementType_WalkSequenceRightDownUpLeft_Step1(struct MapObject *, struct Sprite *);
-u8 MovementType_WalkSequence_Step2(struct MapObject *, struct Sprite *);
-u8 MovementType_WalkSequence_Step0(struct MapObject *, struct Sprite *);
-u8 MovementType_WalkSequenceLeftUpDownRight_Step1(struct MapObject *, struct Sprite *);
-u8 MovementType_WalkSequence_Step2(struct MapObject *, struct Sprite *);
-u8 MovementType_WalkSequence_Step0(struct MapObject *, struct Sprite *);
-u8 MovementType_WalkSequenceUpDownRightLeft_Step1(struct MapObject *, struct Sprite *);
-u8 MovementType_WalkSequence_Step2(struct MapObject *, struct Sprite *);
-u8 MovementType_WalkSequence_Step0(struct MapObject *, struct Sprite *);
-u8 MovementType_WalkSequenceRightLeftUpDown_Step1(struct MapObject *, struct Sprite *);
-u8 MovementType_WalkSequence_Step2(struct MapObject *, struct Sprite *);
-u8 MovementType_WalkSequence_Step0(struct MapObject *, struct Sprite *);
-u8 MovementType_WalkSequenceDownRightLeftUp_Step1(struct MapObject *, struct Sprite *);
-u8 MovementType_WalkSequence_Step2(struct MapObject *, struct Sprite *);
-u8 MovementType_WalkSequence_Step0(struct MapObject *, struct Sprite *);
-u8 MovementType_WalkSequenceRightUpDownLeft_Step1(struct MapObject *, struct Sprite *);
-u8 MovementType_WalkSequence_Step2(struct MapObject *, struct Sprite *);
-u8 MovementType_WalkSequence_Step0(struct MapObject *, struct Sprite *);
-u8 MovementType_WalkSequenceUpDownLeftRight_Step1(struct MapObject *, struct Sprite *);
-u8 MovementType_WalkSequence_Step2(struct MapObject *, struct Sprite *);
-u8 MovementType_WalkSequence_Step0(struct MapObject *, struct Sprite *);
-u8 MovementType_WalkSequenceLeftRightUpDown_Step1(struct MapObject *, struct Sprite *);
-u8 MovementType_WalkSequence_Step2(struct MapObject *, struct Sprite *);
-u8 MovementType_WalkSequence_Step0(struct MapObject *, struct Sprite *);
-u8 MovementType_WalkSequenceDownLeftRightUp_Step1(struct MapObject *, struct Sprite *);
-u8 MovementType_WalkSequence_Step2(struct MapObject *, struct Sprite *);
-u8 MovementType_WalkSequence_Step0(struct MapObject *, struct Sprite *);
-u8 MovementType_WalkSequenceUpLeftDownRight_Step1(struct MapObject *, struct Sprite *);
-u8 MovementType_WalkSequence_Step2(struct MapObject *, struct Sprite *);
-u8 MovementType_WalkSequence_Step0(struct MapObject *, struct Sprite *);
-u8 MovementType_WalkSequenceDownRightUpLeft_Step1(struct MapObject *, struct Sprite *);
-u8 MovementType_WalkSequence_Step2(struct MapObject *, struct Sprite *);
-u8 MovementType_WalkSequence_Step0(struct MapObject *, struct Sprite *);
-u8 MovementType_WalkSequenceLeftDownRightUp_Step1(struct MapObject *, struct Sprite *);
-u8 MovementType_WalkSequence_Step2(struct MapObject *, struct Sprite *);
-u8 MovementType_WalkSequence_Step0(struct MapObject *, struct Sprite *);
-u8 MovementType_WalkSequenceRightUpLeftDown_Step1(struct MapObject *, struct Sprite *);
-u8 MovementType_WalkSequence_Step2(struct MapObject *, struct Sprite *);
-u8 MovementType_WalkSequence_Step0(struct MapObject *, struct Sprite *);
-u8 MovementType_WalkSequenceUpRightDownLeft_Step1(struct MapObject *, struct Sprite *);
-u8 MovementType_WalkSequence_Step2(struct MapObject *, struct Sprite *);
-u8 MovementType_WalkSequence_Step0(struct MapObject *, struct Sprite *);
-u8 MovementType_WalkSequenceDownLeftUpRight_Step1(struct MapObject *, struct Sprite *);
-u8 MovementType_WalkSequence_Step2(struct MapObject *, struct Sprite *);
-u8 MovementType_WalkSequence_Step0(struct MapObject *, struct Sprite *);
-u8 MovementType_WalkSequenceLeftUpRightDown_Step1(struct MapObject *, struct Sprite *);
-u8 MovementType_WalkSequence_Step2(struct MapObject *, struct Sprite *);
-u8 MovementType_WalkSequence_Step0(struct MapObject *, struct Sprite *);
-u8 MovementType_WalkSequenceRightDownLeftUp_Step1(struct MapObject *, struct Sprite *);
-u8 MovementType_WalkSequence_Step2(struct MapObject *, struct Sprite *);
-u8 MovementType_CopyPlayer_Step0(struct MapObject *, struct Sprite *);
-u8 MovementType_CopyPlayer_Step1(struct MapObject *, struct Sprite *);
-u8 MovementType_CopyPlayer_Step2(struct MapObject *, struct Sprite *);
-u8 MovementType_CopyPlayerInGrass_Step1(struct MapObject *, struct Sprite *);
-u8 MovementType_CopyPlayer_Step2(struct MapObject *, struct Sprite *);
-u8 MovementType_Hidden_Step0(struct MapObject *, struct Sprite *);
-u8 MovementType_WalkInPlace_Step0(struct MapObject *, struct Sprite *);
-u8 MovementType_WalkInPlace_Step1(struct MapObject *, struct Sprite *);
-u8 MovementType_JogInPlace_Step0(struct MapObject *, struct Sprite *);
-u8 MovementType_WalkInPlace_Step1(struct MapObject *, struct Sprite *);
-u8 MovementType_RunInPlace_Step0(struct MapObject *, struct Sprite *);
-u8 MovementType_WalkInPlace_Step1(struct MapObject *, struct Sprite *);
-u8 MovementType_Invisible_Step0(struct MapObject *, struct Sprite *);
-u8 MovementType_Invisible_Step1(struct MapObject *, struct Sprite *);
-u8 MovementType_Invisible_Step2(struct MapObject *, struct Sprite *);
+u8 MovementType_WanderAround_Step0(struct EventObject *, struct Sprite *);
+u8 MovementType_WanderAround_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_WanderAround_Step2(struct EventObject *, struct Sprite *);
+u8 MovementType_WanderAround_Step3(struct EventObject *, struct Sprite *);
+u8 MovementType_WanderAround_Step4(struct EventObject *, struct Sprite *);
+u8 MovementType_WanderAround_Step5(struct EventObject *, struct Sprite *);
+u8 MovementType_WanderAround_Step6(struct EventObject *, struct Sprite *);
+u8 MovementType_LookAround_Step0(struct EventObject *, struct Sprite *);
+u8 MovementType_LookAround_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_LookAround_Step2(struct EventObject *, struct Sprite *);
+u8 MovementType_LookAround_Step3(struct EventObject *, struct Sprite *);
+u8 MovementType_LookAround_Step4(struct EventObject *, struct Sprite *);
+u8 MovementType_WanderUpAndDown_Step0(struct EventObject *, struct Sprite *);
+u8 MovementType_WanderUpAndDown_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_WanderUpAndDown_Step2(struct EventObject *, struct Sprite *);
+u8 MovementType_WanderUpAndDown_Step3(struct EventObject *, struct Sprite *);
+u8 MovementType_WanderUpAndDown_Step4(struct EventObject *, struct Sprite *);
+u8 MovementType_WanderUpAndDown_Step5(struct EventObject *, struct Sprite *);
+u8 MovementType_WanderUpAndDown_Step6(struct EventObject *, struct Sprite *);
+u8 MovementType_WanderLeftAndRight_Step0(struct EventObject *, struct Sprite *);
+u8 MovementType_WanderLeftAndRight_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_WanderLeftAndRight_Step2(struct EventObject *, struct Sprite *);
+u8 MovementType_WanderLeftAndRight_Step3(struct EventObject *, struct Sprite *);
+u8 MovementType_WanderLeftAndRight_Step4(struct EventObject *, struct Sprite *);
+u8 MovementType_WanderLeftAndRight_Step5(struct EventObject *, struct Sprite *);
+u8 MovementType_WanderLeftAndRight_Step6(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceDirection_Step0(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceDirection_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceDirection_Step2(struct EventObject *, struct Sprite *);
+u8 MovementType_BerryTreeGrowth_Step0(struct EventObject *, struct Sprite *);
+u8 MovementType_BerryTreeGrowth_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_BerryTreeGrowth_Step2(struct EventObject *, struct Sprite *);
+u8 MovementType_BerryTreeGrowth_Step3(struct EventObject *, struct Sprite *);
+u8 MovementType_BerryTreeGrowth_Step4(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceDownAndUp_Step0(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceDownAndUp_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceDownAndUp_Step2(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceDownAndUp_Step3(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceDownAndUp_Step4(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceLeftAndRight_Step0(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceLeftAndRight_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceLeftAndRight_Step2(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceLeftAndRight_Step3(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceLeftAndRight_Step4(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceUpAndLeft_Step0(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceUpAndLeft_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceUpAndLeft_Step2(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceUpAndLeft_Step3(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceUpAndLeft_Step4(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceUpAndRight_Step0(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceUpAndRight_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceUpAndRight_Step2(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceUpAndRight_Step3(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceUpAndRight_Step4(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceDownAndLeft_Step0(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceDownAndLeft_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceDownAndLeft_Step2(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceDownAndLeft_Step3(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceDownAndLeft_Step4(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceDownAndRight_Step0(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceDownAndRight_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceDownAndRight_Step2(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceDownAndRight_Step3(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceDownAndRight_Step4(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceDownUpAndLeft_Step0(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceDownUpAndLeft_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceDownUpAndLeft_Step2(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceDownUpAndLeft_Step3(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceDownUpAndLeft_Step4(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceDownUpAndRight_Step0(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceDownUpAndRight_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceDownUpAndRight_Step2(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceDownUpAndRight_Step3(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceDownUpAndRight_Step4(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceUpLeftAndRight_Step0(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceUpLeftAndRight_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceUpLeftAndRight_Step2(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceUpLeftAndRight_Step3(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceUpLeftAndRight_Step4(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceDownLeftAndRight_Step0(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceDownLeftAndRight_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceDownLeftAndRight_Step2(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceDownLeftAndRight_Step3(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceDownLeftAndRight_Step4(struct EventObject *, struct Sprite *);
+u8 MovementType_RotateCounterclockwise_Step0(struct EventObject *, struct Sprite *);
+u8 MovementType_RotateCounterclockwise_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_RotateCounterclockwise_Step2(struct EventObject *, struct Sprite *);
+u8 MovementType_RotateCounterclockwise_Step3(struct EventObject *, struct Sprite *);
+u8 MovementType_RotateClockwise_Step0(struct EventObject *, struct Sprite *);
+u8 MovementType_RotateClockwise_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_RotateClockwise_Step2(struct EventObject *, struct Sprite *);
+u8 MovementType_RotateClockwise_Step3(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkBackAndForth_Step0(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkBackAndForth_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkBackAndForth_Step2(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkBackAndForth_Step3(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step0(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequenceUpRightLeftDown_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step2(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step0(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequenceRightLeftDownUp_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step2(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step0(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequenceDownUpRightLeft_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step2(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step0(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequenceLeftDownUpRight_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step2(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step0(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequenceUpLeftRightDown_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step2(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step0(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequenceLeftRightDownUp_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step2(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step0(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequenceDownUpLeftRight_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step2(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step0(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequenceRightDownUpLeft_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step2(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step0(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequenceLeftUpDownRight_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step2(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step0(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequenceUpDownRightLeft_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step2(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step0(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequenceRightLeftUpDown_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step2(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step0(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequenceDownRightLeftUp_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step2(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step0(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequenceRightUpDownLeft_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step2(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step0(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequenceUpDownLeftRight_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step2(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step0(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequenceLeftRightUpDown_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step2(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step0(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequenceDownLeftRightUp_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step2(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step0(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequenceUpLeftDownRight_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step2(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step0(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequenceDownRightUpLeft_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step2(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step0(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequenceLeftDownRightUp_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step2(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step0(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequenceRightUpLeftDown_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step2(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step0(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequenceUpRightDownLeft_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step2(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step0(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequenceDownLeftUpRight_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step2(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step0(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequenceLeftUpRightDown_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step2(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step0(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequenceRightDownLeftUp_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step2(struct EventObject *, struct Sprite *);
+u8 MovementType_CopyPlayer_Step0(struct EventObject *, struct Sprite *);
+u8 MovementType_CopyPlayer_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_CopyPlayer_Step2(struct EventObject *, struct Sprite *);
+u8 MovementType_CopyPlayerInGrass_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_CopyPlayer_Step2(struct EventObject *, struct Sprite *);
+u8 MovementType_Hidden_Step0(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkInPlace_Step0(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkInPlace_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_JogInPlace_Step0(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkInPlace_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_RunInPlace_Step0(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkInPlace_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_Invisible_Step0(struct EventObject *, struct Sprite *);
+u8 MovementType_Invisible_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_Invisible_Step2(struct EventObject *, struct Sprite *);
 
 u8 GetMoveDirectionAnimNum(u8);
 u8 GetMoveDirectionFastAnimNum(u8);
@@ -565,29 +565,29 @@ u32 state_to_direction(u8, u32, u32);
 
 void sub_805AA98();
 void sub_805AAB0(void);
-u8 GetFirstInactiveMapObjectId(void);
-u8 GetFieldObjectIdByLocalIdAndMap(u8, u8, u8);
-bool8 TryGetFieldObjectIdByLocalIdAndMap(u8, u8, u8, u8 *);
-u8 GetFieldObjectIdByXY(s16, s16);
-u8 GetFieldObjectIdByLocalIdAndMapInternal(u8, u8, u8);
-u8 GetFieldObjectIdByLocalId(u8);
-u8 GetAvailableMapObjectId(u16, u8, u8, u8 *);
-void RemoveFieldObjectByLocalIdAndMap(u8, u8, u8);
-void RemoveFieldObjectInternal(struct MapObject *);
-u8 SpawnSpecialFieldObject(struct MapObjectTemplate *);
+u8 GetFirstInactiveEventObjectId(void);
+u8 GetEventObjectIdByLocalIdAndMap(u8, u8, u8);
+bool8 TryGetEventObjectIdByLocalIdAndMap(u8, u8, u8, u8 *);
+u8 GetEventObjectIdByXY(s16, s16);
+u8 GetEventObjectIdByLocalIdAndMapInternal(u8, u8, u8);
+u8 GetEventObjectIdByLocalId(u8);
+u8 GetAvailableEventObjectId(u16, u8, u8, u8 *);
+void RemoveEventObjectByLocalIdAndMap(u8, u8, u8);
+void RemoveEventObjectInternal(struct EventObject *);
+u8 SpawnSpecialEventObject(struct EventObjectTemplate *);
 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);
+void MakeObjectTemplateFromEventObjectTemplate(struct EventObjectTemplate *eventObjTemplate, struct SpriteTemplate *sprTemplate, const struct SubspriteTable **subspriteTables);
+u8 AddPseudoEventObject(u16 graphicsId, void (*callback)(struct Sprite *), s16 x, s16 y, u8 subpriority);
 u8 sub_805B410(u8, u8, s16, s16, u8, u8);
-void TrySpawnFieldObjects(s16, s16);
+void TrySpawnEventObjects(s16, s16);
 void sub_805B710(u16 i, u16 i1);
-void sub_805B980(struct MapObject *, u8);
-void FieldObjectTurn(struct MapObject *, u8);
-void FieldObjectTurnByLocalIdAndMap(u8, u8, u8, u8);
-const struct MapObjectGraphicsInfo *GetFieldObjectGraphicsInfo(u8);
-void SetFieldObjectDynamicGraphicsId(struct MapObject *);
+void sub_805B980(struct EventObject *, u8);
+void EventObjectTurn(struct EventObject *, u8);
+void EventObjectTurnByLocalIdAndMap(u8, u8, u8, u8);
+const struct EventObjectGraphicsInfo *GetEventObjectGraphicsInfo(u8);
+void SetEventObjectDynamicGraphicsId(struct EventObject *);
 void npc_by_local_id_and_map_set_field_1_bit_x20(u8, u8, u8, u8);
-void FieldObjectGetLocalIdAndMap(struct MapObject *, void *, void *, void *);
+void EventObjectGetLocalIdAndMap(struct EventObject *, void *, void *, void *);
 void sub_805BCC0(s16 x, s16 y);
 void sub_805BCF0(u8, u8, u8, u8);
 void sub_805BD48(u8, u8, u8);
@@ -596,23 +596,23 @@ void gpu_pal_allocator_reset__manage_upper_four(void);
 void sub_805BDF8(u16);
 u8 sub_805BE58(const struct SpritePalette *);
 void pal_patch_for_npc(u16, u16);
-u8 FindFieldObjectPaletteIndexByTag(u16);
+u8 FindEventObjectPaletteIndexByTag(u16);
 void npc_load_two_palettes__no_record(u16, u8);
 void npc_load_two_palettes__and_record(u16, u8);
-void ShiftMapObjectCoords(struct MapObject *pObject, s16 x, s16 y);
+void ShiftEventObjectCoords(struct EventObject *pObject, s16 x, s16 y);
 void sub_805C0F8(u8, u8, u8, s16, s16);
-void ShiftStillMapObjectCoords(struct MapObject *pObject);
-u8 GetFieldObjectIdByXYZ(u16, u16, u8);
-void UpdateMapObjectsForCameraUpdate(s16, s16);
+void ShiftStillEventObjectCoords(struct EventObject *pObject);
+u8 GetEventObjectIdByXYZ(u16, u16, u8);
+void UpdateEventObjectsForCameraUpdate(s16, s16);
 u8 AddCameraObject(u8);
 void CameraObjectReset1(void);
-u8 * GetFieldObjectScriptPointerByFieldObjectId(u8);
-u16 GetFieldObjectFlagIdByFieldObjectId(u8);
-u8 FieldObjectGetBerryTreeId(u8);
-struct MapObjectTemplate *GetFieldObjectTemplateByLocalIdAndMap(u8, u8, u8);
-void OverrideTemplateCoordsForMapObject(struct MapObject *pObject);
-void OverrideMovementTypeForMapObject(struct MapObject *, u8);
-void TryOverrideTemplateCoordsForMapObject(u8, u8, u8);
+u8 * GetEventObjectScriptPointerByEventObjectId(u8);
+u16 GetEventObjectFlagIdByEventObjectId(u8);
+u8 EventObjectGetBerryTreeId(u8);
+struct EventObjectTemplate *GetEventObjectTemplateByLocalIdAndMap(u8, u8, u8);
+void OverrideTemplateCoordsForEventObject(struct EventObject *pObject);
+void OverrideMovementTypeForEventObject(struct EventObject *, u8);
+void TryOverrideTemplateCoordsForEventObject(u8, u8, u8);
 void sub_805C7C4(u8 i);
 u8 GetFaceDirectionAnimNum(u8);
 u8 GetMoveDirectionAnimNum(u8 unk_19);
@@ -620,25 +620,25 @@ u8 GetAcroWheelieDirectionAnimNum(u8);
 u8 GetFishingDirectionAnimNum(u8);
 u8 GetFishingNoCatchDirectionAnimNum(u8);
 u8 GetFishingBiteDirectionAnimNum(u8);
-void SetTrainerMovementType(struct MapObject *, u8);
+void SetTrainerMovementType(struct EventObject *, u8);
 u8 GetTrainerFacingDirectionMovementType(u8);
-u8 GetCollisionAtCoords(struct MapObject *, s16, s16, u32);
-u8 GetCollisionFlagsAtCoords(struct MapObject *, s16, s16, u8);
+u8 GetCollisionAtCoords(struct EventObject *, s16, s16, u32);
+u8 GetCollisionFlagsAtCoords(struct EventObject *, s16, s16, u8);
 bool8 IsBerryTreeSparkling(u8, u8, u8);
 void sub_8060288(u8, u8, u8);
 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 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 *);
+void GetEventObjectMovingCameraOffset(s16 *, s16 *);
+void EventObjectMoveDestCoords(struct EventObject *pObject, u32 unk_19, s16 *pInt, s16 *pInt1);
+bool8 EventObjectIsMovementOverridden(struct EventObject *);
+bool8 EventObjectIsHeldMovementActive(struct EventObject *);
+bool8 EventObjectSetHeldMovement(struct EventObject *, u8);
+void EventObjectForceSetHeldMovement(struct EventObject *pObject, u8 a);
+void EventObjectClearHeldMovementIfActive(struct EventObject *);
+void EventObjectClearHeldMovement(struct EventObject *);
+bool8 EventObjectCheckHeldMovementStatus(struct EventObject *);
+u8 EventObjectClearHeldMovementIfFinished(struct EventObject *);
+u8 EventObjectGetHeldMovementActionId(struct EventObject *);
 u8 GetFaceDirectionMovementAction(u32);
 u8 GetWalkSlowMovementAction(u32);
 u8 GetWalkNormalMovementAction(u32);
@@ -656,7 +656,7 @@ u8 GetWalkInPlaceSlowMovementAction(u32);
 u8 GetWalkInPlaceNormalMovementAction(u32);
 u8 GetWalkInPlaceFastMovementAction(u32);
 u8 GetWalkInPlaceFastestMovementAction(u32);
-u8 FieldObjectFaceOppositeDirection(struct MapObject *, u8);
+u8 EventObjectFaceOppositeDirection(struct EventObject *, u8);
 u8 GetAcroWheelieFaceDirectionMovementAction(u8);
 u8 GetAcroPopWheelieFaceDirectionMovementAction(u8);
 u8 GetAcroEndWheelieFaceDirectionMovementAction(u8);
@@ -668,48 +668,48 @@ u8 GetAcroPopWheelieMoveDirectionMovementAction(u8);
 u8 GetAcroWheelieMoveDirectionMovementAction(u8);
 u8 GetAcroEndWheelieMoveDirectionMovementAction(u8);
 u8 GetOppositeDirection(u8);
-u8 SpawnSpecialFieldObjectParametrized(u8, u8, u8, s16, s16, u8);
+u8 SpawnSpecialEventObjectParametrized(u8, u8, u8, s16, s16, u8);
 void CameraObjectSetFollowedObjectId(u8);
-u8 TryInitLocalFieldObject(u8);
+u8 TryInitLocalEventObject(u8);
 u8 obj_unfreeze(struct Sprite *, s16, s16, u8);
 u16 npc_paltag_by_palslot(u8);
 void sub_8060470(s16 *, s16 *, s16, s16);
-bool8 FreezeMapObject(struct MapObject *);
-void FreezeMapObjects(void);
-void FreezeMapObjectsExceptOne(u8);
-void UnfreezeMapObjects(void);
-void UpdateFieldSpriteVisibility(struct Sprite *sprite, bool8 invisible);
-void TurnMapObject(u8, u8);
-void UnfreezeMapObject(struct MapObject *mapObject);
+bool8 FreezeEventObject(struct EventObject *);
+void FreezeEventObjects(void);
+void FreezeEventObjectsExceptOne(u8);
+void UnfreezeEventObjects(void);
+void UpdateEventObjectSpriteVisibility(struct Sprite *sprite, bool8 invisible);
+void TurnEventObject(u8, u8);
+void UnfreezeEventObject(struct EventObject *eventObject);
 void sub_806467C(struct Sprite *sprite, u8 direction);
 bool8 sub_806468C(struct Sprite *sprite);
 void sub_80646E4(struct Sprite *sprite, u8 a2, u8 a3, u8 a4);
-void DoShadowFieldEffect(struct MapObject *mapObject);
+void DoShadowFieldEffect(struct EventObject *eventObject);
 u8 sub_8064704(struct Sprite *);
 u8 sub_806478C(struct Sprite *);
 void SetAndStartSpriteAnim(struct Sprite *sprite, u8 a2, u8 a3);
-void DoRippleFieldEffect(struct MapObject *mapObj, struct Sprite *sprite);
+void DoRippleFieldEffect(struct EventObject *eventObj, struct Sprite *sprite);
 bool8 IsZCoordMismatchAt(u8 z, s16 x, s16 y);
 bool8 AreZCoordsCompatible(u8 z1, u8 z2);
-void FieldObjectUpdateMetatileBehaviors(struct MapObject *);
-void GetGroundEffectFlags_Reflection(struct MapObject *, u32 *);
-void GetGroundEffectFlags_TallGrassOnSpawn(struct MapObject *, u32 *);
-void GetGroundEffectFlags_TallGrassOnBeginStep(struct MapObject *, u32 *);
-void GetGroundEffectFlags_LongGrassOnSpawn(struct MapObject *, u32 *);
-void GetGroundEffectFlags_LongGrassOnBeginStep(struct MapObject *, u32 *);
-void GetGroundEffectFlags_Tracks(struct MapObject *, u32 *);
-void GetGroundEffectFlags_SandPile(struct MapObject *, u32 *);
-void GetGroundEffectFlags_ShallowFlowingWater(struct MapObject *, u32 *);
-void GetGroundEffectFlags_Puddle(struct MapObject *, u32 *);
-void GetGroundEffectFlags_Ripple(struct MapObject *, u32 *);
-void GetGroundEffectFlags_ShortGrass(struct MapObject *, u32 *);
-void GetGroundEffectFlags_HotSprings(struct MapObject *, u32 *);
-void GetGroundEffectFlags_Seaweed(struct MapObject *, u32 *);
-void GetGroundEffectFlags_JumpLanding(struct MapObject *, u32 *);
-u8 FieldObjectCheckForReflectiveSurface(struct MapObject *);
+void EventObjectUpdateMetatileBehaviors(struct EventObject *);
+void GetGroundEffectFlags_Reflection(struct EventObject *, u32 *);
+void GetGroundEffectFlags_TallGrassOnSpawn(struct EventObject *, u32 *);
+void GetGroundEffectFlags_TallGrassOnBeginStep(struct EventObject *, u32 *);
+void GetGroundEffectFlags_LongGrassOnSpawn(struct EventObject *, u32 *);
+void GetGroundEffectFlags_LongGrassOnBeginStep(struct EventObject *, u32 *);
+void GetGroundEffectFlags_Tracks(struct EventObject *, u32 *);
+void GetGroundEffectFlags_SandPile(struct EventObject *, u32 *);
+void GetGroundEffectFlags_ShallowFlowingWater(struct EventObject *, u32 *);
+void GetGroundEffectFlags_Puddle(struct EventObject *, u32 *);
+void GetGroundEffectFlags_Ripple(struct EventObject *, u32 *);
+void GetGroundEffectFlags_ShortGrass(struct EventObject *, u32 *);
+void GetGroundEffectFlags_HotSprings(struct EventObject *, u32 *);
+void GetGroundEffectFlags_Seaweed(struct EventObject *, u32 *);
+void GetGroundEffectFlags_JumpLanding(struct EventObject *, u32 *);
+u8 EventObjectCheckForReflectiveSurface(struct EventObject *);
 u8 GetLedgeJumpDirection(s16, s16, u8);
 u8 ZCoordToPriority(u8);
-void FieldObjectUpdateZCoord(struct MapObject *pObject);
+void EventObjectUpdateZCoord(struct EventObject *pObject);
 void SetObjectSubpriorityByZCoord(u8, struct Sprite *, u8);
 
 #endif // GUARD_EVENTOBJMV_H