Standardize Event Object to Object Event

19 files changed, 251 insertions, 251 deletions

diff --git a/include/battle_pyramid.h b/include/battle_pyramid.h
index d77172d0b..b22854ed5 100644
--- a/include/battle_pyramid.h
+++ b/include/battle_pyramid.h
@@ -16,9 +16,9 @@ void CopyPyramidTrainerWinSpeech(u16 trainerId);
 void CopyPyramidTrainerLoseSpeech(u16 trainerId);
 u8 GetBattlePyramindTrainerEncounterMusicId(u16 trainerId);
 void GenerateBattlePyramidFloorLayout(u16 *mapArg, bool8 setPlayerPosition);
-void LoadBattlePyramidEventObjectTemplates(void);
-void LoadBattlePyramidFloorEventObjectScripts(void);
-u8 GetNumBattlePyramidEventObjects(void);
+void LoadBattlePyramidObjectEventTemplates(void);
+void LoadBattlePyramidFloorObjectEventScripts(void);
+u8 GetNumBattlePyramidObjectEvents(void);
 u16 GetBattlePyramidPickupItemId(void);
 
 #endif // GUARD_BATTLE_PYRAMID_H
diff --git a/include/berry.h b/include/berry.h
index ebe1e9a38..afd1bc499 100644
--- a/include/berry.h
+++ b/include/berry.h
@@ -6,7 +6,7 @@ void SetEnigmaBerry(u8 *src);
 bool32 IsEnigmaBerryValid(void);
 const struct Berry *GetBerryInfo(u8 berry);
 struct BerryTree *GetBerryTreeInfo(u8 id);
-bool32 EventObjectInteractionWaterBerryTree(void);
+bool32 ObjectEventInteractionWaterBerryTree(void);
 bool8 IsPlayerFacingEmptyBerryTreePatch(void);
 bool8 TryToWaterBerryTree(void);
 void ClearBerryTrees(void);
@@ -19,10 +19,10 @@ u8 ItemIdToBerryType(u16 item);
 void GetBerryNameByBerryType(u8 berry, u8 *string);
 void ResetBerryTreeSparkleFlag(u8 id);
 void Bag_ChooseBerry(void);
-void EventObjectInteractionGetBerryTreeData(void);
-void EventObjectInteractionPlantBerryTree(void);
-void EventObjectInteractionPickBerryTree(void);
-void EventObjectInteractionRemoveBerryTree(void);
+void ObjectEventInteractionGetBerryTreeData(void);
+void ObjectEventInteractionPlantBerryTree(void);
+void ObjectEventInteractionPickBerryTree(void);
+void ObjectEventInteractionRemoveBerryTree(void);
 bool8 PlayerHasBerries(void);
 void ResetBerryTreeSparkleFlags(void);
 
diff --git a/include/constants/coins.h b/include/constants/coins.h
index fd68f3f9e..3ae3bb23f 100644
--- a/include/constants/coins.h
+++ b/include/constants/coins.h
@@ -3,4 +3,4 @@
 
 #define MAX_COINS 9999
 
-#endif // GUARD_CONSTANTS_COINS_H
\ No newline at end of file
+#endif // GUARD_CONSTANTS_COINS_H
diff --git a/include/constants/vars.h b/include/constants/vars.h
index d39323831..690173044 100644
--- a/include/constants/vars.h
+++ b/include/constants/vars.h
@@ -25,7 +25,7 @@
 // object gfx id vars
 // These 0x10 vars are used to dynamically control a map object's sprite.
 // For example, the rival's sprite id is dynamically set based on the player's gender.
-// See VarGetEventObjectGraphicsId().
+// See VarGetObjectEventGraphicsId().
 #define VAR_OBJ_GFX_ID_0           0x4010
 #define VAR_OBJ_GFX_ID_1           0x4011
 #define VAR_OBJ_GFX_ID_2           0x4012
diff --git a/include/event_data.h b/include/event_data.h
index 11289c1ab..4c1d4a046 100644
--- a/include/event_data.h
+++ b/include/event_data.h
@@ -24,7 +24,7 @@ bool32 CanResetRTC(void);
 u16 *GetVarPointer(u16 id);
 u16 VarGet(u16 id);
 bool8 VarSet(u16 id, u16 value);
-u8 VarGetEventObjectGraphicsId(u8 id);
+u8 VarGetObjectEventGraphicsId(u8 id);
 u8 *GetFlagPointer(u16 id);
 u8 FlagSet(u16 id);
 u8 FlagClear(u16 id);
diff --git a/include/event_obj_lock.h b/include/event_obj_lock.h
index 037c0080d..f9ca40199 100644
--- a/include/event_obj_lock.h
+++ b/include/event_obj_lock.h
@@ -2,12 +2,12 @@
 #define GUARD_EVENT_OBJ_LOCK_H
 
 bool8 sub_80983C4(void);
-void ScriptFreezeEventObjects(void);
+void ScriptFreezeObjectEvents(void);
 bool8 sub_809847C(void);
-void LockSelectedEventObject(void);
+void LockSelectedObjectEvent(void);
 void sub_8098630(void);
 bool8 sub_8098734(void);
-void ScriptUnfreezeEventObjects(void);
+void ScriptUnfreezeObjectEvents(void);
 void sub_8098524(void);
 
 #endif // GUARD_EVENT_OBJ_LOCK_H
diff --git a/include/event_object_movement.h b/include/event_object_movement.h
index 93f73e635..956f888f9 100644
--- a/include/event_object_movement.h
+++ b/include/event_object_movement.h
@@ -52,80 +52,80 @@ struct PairedPalettes
     const u16 *data;
 };
 
-struct LockedAnimEventObjects
+struct LockedAnimObjectEvents
 {
-    u8 eventObjectIds[EVENT_OBJECTS_COUNT];
+    u8 objectEventIds[EVENT_OBJECTS_COUNT];
     u8 count;
 };
 
-extern const struct SpriteFrameImage gEventObjectPicTable_PechaBerryTree[];
-extern const struct OamData gEventObjectBaseOam_32x8;
-extern const struct OamData gEventObjectBaseOam_32x32;
+extern const struct SpriteFrameImage gObjectEventPicTable_PechaBerryTree[];
+extern const struct OamData gObjectEventBaseOam_32x8;
+extern const struct OamData gObjectEventBaseOam_32x32;
 extern const struct SpriteTemplate *const gFieldEffectObjectTemplatePointers[];
 extern const u8 gReflectionEffectPaletteMap[];
 
-extern const u8 *const gBerryTreeEventObjectGraphicsIdTablePointers[];
+extern const u8 *const gBerryTreeObjectEventGraphicsIdTablePointers[];
 extern const struct SpriteFrameImage *const gBerryTreePicTablePointers[];
 extern const u8 *const gBerryTreePaletteSlotTablePointers[];
 
-void ResetEventObjects(void);
+void ResetObjectEvents(void);
 u8 GetMoveDirectionAnimNum(u8);
-u8 GetEventObjectIdByLocalIdAndMap(u8, u8, u8);
-bool8 TryGetEventObjectIdByLocalIdAndMap(u8, u8, u8, u8 *);
-u8 GetEventObjectIdByXY(s16, s16);
-void SetEventObjectDirection(struct EventObject *, u8);
-u8 GetFirstInactiveEventObjectId(void);
-void RemoveEventObjectByLocalIdAndMap(u8, u8, u8);
+u8 GetObjectEventIdByLocalIdAndMap(u8, u8, u8);
+bool8 TryGetObjectEventIdByLocalIdAndMap(u8, u8, u8, u8 *);
+u8 GetObjectEventIdByXY(s16, s16);
+void SetObjectEventDirection(struct ObjectEvent *, u8);
+u8 GetFirstInactiveObjectEventId(void);
+void RemoveObjectEventByLocalIdAndMap(u8, u8, u8);
 void LoadPlayerObjectReflectionPalette(u16, u8);
 void LoadSpecialObjectReflectionPalette(u16, u8);
-void TryMoveEventObjectToMapCoords(u8, u8, u8, s16, s16);
+void TryMoveObjectEventToMapCoords(u8, u8, u8, s16, s16);
 void PatchObjectPalette(u16, u8);
 void sub_808E16C(s16, s16);
 void OverrideSecretBaseDecorationSpriteScript(u8 localId, u8 mapNum, u8 mapGroup, u8 decorCat);
 void sub_8092FF0(s16, s16, s16 *, s16 *);
 u8 GetFaceDirectionAnimNum(u8);
 void sub_80930E0(s16 *, s16 *, s16, s16);
-void EventObjectClearHeldMovement(struct EventObject *);
-void EventObjectClearHeldMovementIfActive(struct EventObject *);
-void TrySpawnEventObjects(s16, s16);
+void ObjectEventClearHeldMovement(struct ObjectEvent *);
+void ObjectEventClearHeldMovementIfActive(struct ObjectEvent *);
+void TrySpawnObjectEvents(s16, s16);
 u8 sprite_new(u8 graphicsId, u8 a1, s16 x, s16 y, u8 z, u8 direction);
-u8 AddPseudoEventObject(u16, void (*)(struct Sprite *), s16 x, s16 y, u8 subpriority);
-u8 TrySpawnEventObject(u8, u8, u8);
-u8 SpawnSpecialEventObjectParameterized(u8 graphicsId, u8 movementBehavior, u8 localId, s16 x, s16 y, u8 z);
-u8 SpawnSpecialEventObject(struct EventObjectTemplate *);
+u8 AddPseudoObjectEvent(u16, void (*)(struct Sprite *), s16 x, s16 y, u8 subpriority);
+u8 TrySpawnObjectEvent(u8, u8, u8);
+u8 SpawnSpecialObjectEventParameterized(u8 graphicsId, u8 movementBehavior, u8 localId, s16 x, s16 y, u8 z);
+u8 SpawnSpecialObjectEvent(struct ObjectEventTemplate *);
 void SetSpritePosToMapCoords(s16, s16, s16 *, s16 *);
 void CameraObjectReset1(void);
-void EventObjectSetGraphicsId(struct EventObject *, u8 graphicsId);
-void EventObjectTurn(struct EventObject *, u8);
-void EventObjectTurnByLocalIdAndMap(u8, u8, u8, u8);
-const struct EventObjectGraphicsInfo *GetEventObjectGraphicsInfo(u8 graphicsId);
+void ObjectEventSetGraphicsId(struct ObjectEvent *, u8 graphicsId);
+void ObjectEventTurn(struct ObjectEvent *, u8);
+void ObjectEventTurnByLocalIdAndMap(u8, u8, u8, u8);
+const struct ObjectEventGraphicsInfo *GetObjectEventGraphicsInfo(u8 graphicsId);
 void npc_by_local_id_and_map_set_field_1_bit_x20(u8, u8, u8, u8);
 void FreeAndReserveObjectSpritePalettes(void);
 void sub_808E82C(u8, u8, u8, s16, s16);
 void sub_808E7E4(u8, u8, u8);
 void sub_808E78C(u8, u8, u8, u8);
 void sub_808E75C(s16, s16);
-void EventObjectGetLocalIdAndMap(struct EventObject *eventObject, void *localId, void *mapNum, void *mapGroup);
-void ShiftEventObjectCoords(struct EventObject *, s16, s16);
-void MoveEventObjectToMapCoords(struct EventObject *, s16, s16);
-void TryOverrideEventObjectTemplateCoords(u8, u8, u8);
-void InitEventObjectPalettes(u8 palSlot);
-void UpdateEventObjectCurrentMovement(struct EventObject *, struct Sprite *, bool8(struct EventObject *, struct Sprite *));
-u8 EventObjectFaceOppositeDirection(struct EventObject *, u8);
+void ObjectEventGetLocalIdAndMap(struct ObjectEvent *objectEvent, void *localId, void *mapNum, void *mapGroup);
+void ShiftObjectEventCoords(struct ObjectEvent *, s16, s16);
+void MoveObjectEventToMapCoords(struct ObjectEvent *, s16, s16);
+void TryOverrideObjectEventTemplateCoords(u8, u8, u8);
+void InitObjectEventPalettes(u8 palSlot);
+void UpdateObjectEventCurrentMovement(struct ObjectEvent *, struct Sprite *, bool8(struct ObjectEvent *, struct Sprite *));
+u8 ObjectEventFaceOppositeDirection(struct ObjectEvent *, u8);
 u8 GetOppositeDirection(u8);
 u8 GetWalkInPlaceFastestMovementAction(u32);
 u8 GetWalkInPlaceFastMovementAction(u32);
 u8 GetWalkInPlaceNormalMovementAction(u32);
 u8 GetWalkInPlaceSlowMovementAction(u32);
-u8 GetCollisionAtCoords(struct EventObject *, s16, s16, u32);
+u8 GetCollisionAtCoords(struct ObjectEvent *, s16, s16, u32);
 void MoveCoords(u8, s16 *, s16 *);
-bool8 EventObjectIsHeldMovementActive(struct EventObject *);
-u8 EventObjectClearHeldMovementIfFinished(struct EventObject *);
-u8 GetEventObjectIdByXYZ(u16 x, u16 y, u8 z);
-void SetTrainerMovementType(struct EventObject *eventObject, u8 movementType);
+bool8 ObjectEventIsHeldMovementActive(struct ObjectEvent *);
+u8 ObjectEventClearHeldMovementIfFinished(struct ObjectEvent *);
+u8 GetObjectEventIdByXYZ(u16 x, u16 y, u8 z);
+void SetTrainerMovementType(struct ObjectEvent *objectEvent, u8 movementType);
 u8 GetTrainerFacingDirectionMovementType(u8 direction);
-const u8 *GetEventObjectScriptPointerByEventObjectId(u8 eventObjectId);
-u8 GetCollisionFlagsAtCoords(struct EventObject *eventObject, s16 x, s16 y, u8 direction);
+const u8 *GetObjectEventScriptPointerByObjectEventId(u8 objectEventId);
+u8 GetCollisionFlagsAtCoords(struct ObjectEvent *objectEvent, s16 x, s16 y, u8 direction);
 u8 GetFaceDirectionMovementAction(u32);
 u8 GetWalkNormalMovementAction(u32);
 u8 GetWalkFastMovementAction(u32);
@@ -148,56 +148,56 @@ u8 GetFishingDirectionAnimNum(u8 direction);
 u8 GetAcroWheelieDirectionAnimNum(u8 direction);
 u8 GetFishingBiteDirectionAnimNum(u8 direction);
 u8 GetFishingNoCatchDirectionAnimNum(u8 direction);
-bool8 EventObjectSetHeldMovement(struct EventObject *eventObject, u8 specialAnimId);
-void EventObjectForceSetHeldMovement(struct EventObject *eventObject, u8 movementActionId);
-bool8 EventObjectIsMovementOverridden(struct EventObject *eventObject);
-u8 EventObjectCheckHeldMovementStatus(struct EventObject *eventObject);
-u8 EventObjectGetHeldMovementActionId(struct EventObject *eventObject);
-void TryOverrideTemplateCoordsForEventObject(const struct EventObject *eventObject, u8 movementType);
-void OverrideTemplateCoordsForEventObject(const struct EventObject *eventObject);
-void ShiftStillEventObjectCoords(struct EventObject *pObject);
-void EventObjectMoveDestCoords(struct EventObject *pObject, u32 unk_19, s16 *pInt, s16 *pInt1);
+bool8 ObjectEventSetHeldMovement(struct ObjectEvent *objectEvent, u8 specialAnimId);
+void ObjectEventForceSetHeldMovement(struct ObjectEvent *objectEvent, u8 movementActionId);
+bool8 ObjectEventIsMovementOverridden(struct ObjectEvent *objectEvent);
+u8 ObjectEventCheckHeldMovementStatus(struct ObjectEvent *objectEvent);
+u8 ObjectEventGetHeldMovementActionId(struct ObjectEvent *objectEvent);
+void TryOverrideTemplateCoordsForObjectEvent(const struct ObjectEvent *objectEvent, u8 movementType);
+void OverrideTemplateCoordsForObjectEvent(const struct ObjectEvent *objectEvent);
+void ShiftStillObjectEventCoords(struct ObjectEvent *pObject);
+void ObjectEventMoveDestCoords(struct ObjectEvent *pObject, u32 unk_19, s16 *pInt, s16 *pInt1);
 u8 AddCameraObject(u8 linkedSpriteId);
-void UpdateEventObjectsForCameraUpdate(s16 x, s16 y);
+void UpdateObjectEventsForCameraUpdate(s16 x, s16 y);
 u8 GetWalkSlowMovementAction(u32);
 u8 GetJumpMovementAction(u32);
 bool8 AreZCoordsCompatible(u8, u8);
 u8 ZCoordToPriority(u8);
-void EventObjectUpdateZCoord(struct EventObject *pObject);
+void ObjectEventUpdateZCoord(struct ObjectEvent *pObject);
 void SetObjectSubpriorityByZCoord(u8, struct Sprite *, u8);
 bool8 IsZCoordMismatchAt(u8, s16, s16);
-void UnfreezeEventObject(struct EventObject *);
-u8 FindLockedEventObjectIndex(struct EventObject *);
+void UnfreezeObjectEvent(struct ObjectEvent *);
+u8 FindLockedObjectEventIndex(struct ObjectEvent *);
 bool8 obj_npc_ministep(struct Sprite *sprite);
 bool8 sub_80976EC(struct Sprite *sprite);
 void sub_80976DC(struct Sprite *, u8);
 void sub_809783C(struct Sprite *, u8, u8, u8);
-void DoShadowFieldEffect(struct EventObject *);
+void DoShadowFieldEffect(struct ObjectEvent *);
 u8 sub_809785C(struct Sprite *);
 u8 sub_80978E4(struct Sprite *);
 void SetAndStartSpriteAnim(struct Sprite *, u8, u8);
 bool8 SpriteAnimEnded(struct Sprite *);
 void sub_8097750(struct Sprite *);
 bool8 sub_8097758(struct Sprite *);
-void CreateLevitateMovementTask(struct EventObject *);
+void CreateLevitateMovementTask(struct ObjectEvent *);
 void DestroyExtraMovementTask(u8);
-void UnfreezeEventObjects(void);
-void FreezeEventObjectsExceptOne(u8 eventObjectId);
+void UnfreezeObjectEvents(void);
+void FreezeObjectEventsExceptOne(u8 objectEventId);
 void sub_8097B78(u8, u8);
 void sub_8098074(u8 var1, u8 var2);
-void FreezeEventObjects(void);
-bool8 FreezeEventObject(struct EventObject *eventObject);
+void FreezeObjectEvents(void);
+bool8 FreezeObjectEvent(struct ObjectEvent *objectEvent);
 u8 GetMoveDirectionFastAnimNum(u8);
 u8 GetMoveDirectionFasterAnimNum(u8);
 u8 GetMoveDirectionFastestAnimNum(u8);
 u8 GetLedgeJumpDirection(s16, s16, u8);
 void CameraObjectSetFollowedObjectId(u8 objectId);
 u16 GetObjectPaletteTag(u8 palSlot);
-void UpdateEventObjectSpriteVisibility(struct Sprite *sprite, bool8 invisible);
+void UpdateObjectEventSpriteVisibility(struct Sprite *sprite, bool8 invisible);
 s16 sub_809773C(s16 a1);
 s16 sub_8097728(s16 a1);
 void CameraObjectReset2(void);
-u8 EventObjectGetBerryTreeId(u8 eventObjectId);
+u8 ObjectEventGetBerryTreeId(u8 objectEventId);
 void sub_8092EF0(u8 mapId, u8 mapNumber, u8 mapGroup);
 bool8 IsBerryTreeSparkling(u8, u8, u8);
 
@@ -262,13 +262,13 @@ u8 GetJumpMovementAction(u32);
 u8 GetJump2MovementAction(u32);
 u8 CreateCopySpriteAt(struct Sprite *sprite, s16 x, s16 y, u8 subpriority);
 
-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_WanderAround_Step0(struct ObjectEvent *, struct Sprite *);
+u8 MovementType_WanderAround_Step1(struct ObjectEvent *, struct Sprite *);
+u8 MovementType_WanderAround_Step2(struct ObjectEvent *, struct Sprite *);
+u8 MovementType_WanderAround_Step3(struct ObjectEvent *, struct Sprite *);
+u8 MovementType_WanderAround_Step4(struct ObjectEvent *, struct Sprite *);
+u8 MovementType_WanderAround_Step5(struct ObjectEvent *, struct Sprite *);
+u8 MovementType_WanderAround_Step6(struct ObjectEvent *, struct Sprite *);
 u8 GetVectorDirection(s16, s16, s16, s16);
 u8 GetLimitedVectorDirection_SouthNorth(s16, s16, s16, s16);
 u8 GetLimitedVectorDirection_WestEast(s16, s16, s16, s16);
@@ -280,143 +280,143 @@ u8 GetLimitedVectorDirection_SouthNorthWest(s16, s16, s16, s16);
 u8 GetLimitedVectorDirection_SouthNorthEast(s16, s16, s16, s16);
 u8 GetLimitedVectorDirection_NorthWestEast(s16, s16, s16, s16);
 u8 GetLimitedVectorDirection_SouthWestEast(s16, s16, s16, s16);
-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_WalkSequence_Step2(struct EventObject *, struct Sprite *);
-u8 MovementType_WalkSequenceUpRightLeftDown_Step1(struct EventObject *, struct Sprite *);
-u8 MovementType_WalkSequenceRightLeftDownUp_Step1(struct EventObject *, struct Sprite *);
-u8 MovementType_WalkSequenceDownUpRightLeft_Step1(struct EventObject *, struct Sprite *);
-u8 MovementType_WalkSequenceLeftDownUpRight_Step1(struct EventObject *, struct Sprite *);
-u8 MovementType_WalkSequenceUpLeftRightDown_Step1(struct EventObject *, struct Sprite *);
-u8 MovementType_WalkSequenceLeftRightDownUp_Step1(struct EventObject *, struct Sprite *);
-u8 MovementType_WalkSequenceDownUpLeftRight_Step1(struct EventObject *, struct Sprite *);
-u8 MovementType_WalkSequenceRightDownUpLeft_Step1(struct EventObject *, struct Sprite *);
-u8 MovementType_WalkSequenceLeftUpDownRight_Step1(struct EventObject *, struct Sprite *);
-u8 MovementType_WalkSequenceUpDownRightLeft_Step1(struct EventObject *, struct Sprite *);
-u8 MovementType_WalkSequenceRightLeftUpDown_Step1(struct EventObject *, struct Sprite *);
-u8 MovementType_WalkSequenceDownRightLeftUp_Step1(struct EventObject *, struct Sprite *);
-u8 MovementType_WalkSequenceRightUpDownLeft_Step1(struct EventObject *, struct Sprite *);
-u8 MovementType_WalkSequenceUpDownLeftRight_Step1(struct EventObject *, struct Sprite *);
-u8 MovementType_WalkSequenceLeftRightUpDown_Step1(struct EventObject *, struct Sprite *);
-u8 MovementType_WalkSequenceDownLeftRightUp_Step1(struct EventObject *, struct Sprite *);
-u8 MovementType_WalkSequenceUpLeftDownRight_Step1(struct EventObject *, struct Sprite *);
-u8 MovementType_WalkSequenceDownRightUpLeft_Step1(struct EventObject *, struct Sprite *);
-u8 MovementType_WalkSequenceLeftDownRightUp_Step1(struct EventObject *, struct Sprite *);
-u8 MovementType_WalkSequenceRightUpLeftDown_Step1(struct EventObject *, struct Sprite *);
-u8 MovementType_WalkSequenceUpRightDownLeft_Step1(struct EventObject *, struct Sprite *);
-u8 MovementType_WalkSequenceDownLeftUpRight_Step1(struct EventObject *, struct Sprite *);
-u8 MovementType_WalkSequenceLeftUpRightDown_Step1(struct EventObject *, struct Sprite *);
-u8 MovementType_WalkSequenceRightDownLeftUp_Step1(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 *);
-bool8 CopyablePlayerMovement_None(struct EventObject *, struct Sprite *, u8, bool8(u8));
-bool8 CopyablePlayerMovement_FaceDirection(struct EventObject *, struct Sprite *, u8, bool8(u8));
-bool8 CopyablePlayerMovement_GoSpeed0(struct EventObject *, struct Sprite *, u8, bool8(u8));
-bool8 CopyablePlayerMovement_GoSpeed1(struct EventObject *, struct Sprite *, u8, bool8(u8));
-bool8 CopyablePlayerMovement_GoSpeed2(struct EventObject *, struct Sprite *, u8, bool8(u8));
-bool8 CopyablePlayerMovement_Slide(struct EventObject *, struct Sprite *, u8, bool8(u8));
-bool8 cph_IM_DIFFERENT(struct EventObject *, struct Sprite *, u8, bool8(u8));
-bool8 CopyablePlayerMovement_GoSpeed4(struct EventObject *, struct Sprite *, u8, bool8(u8));
-bool8 CopyablePlayerMovement_Jump(struct EventObject *, struct Sprite *, u8, bool8(u8));
-u8 MovementType_CopyPlayerInGrass_Step1(struct EventObject *, struct Sprite *);
-u8 MovementType_Hidden_Step0(struct EventObject *, struct Sprite *);
-u8 MovementType_WalkInPlace_Step0(struct EventObject *, struct Sprite *);
-u8 MovementType_MoveInPlace_Step1(struct EventObject *, struct Sprite *);
-u8 MovementType_WalkSlowlyInPlace_Step0(struct EventObject *, struct Sprite *);
-u8 MovementType_JogInPlace_Step0(struct EventObject *, struct Sprite *);
-u8 MovementType_RunInPlace_Step0(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 MovementType_LookAround_Step0(struct ObjectEvent *, struct Sprite *);
+u8 MovementType_LookAround_Step1(struct ObjectEvent *, struct Sprite *);
+u8 MovementType_LookAround_Step2(struct ObjectEvent *, struct Sprite *);
+u8 MovementType_LookAround_Step3(struct ObjectEvent *, struct Sprite *);
+u8 MovementType_LookAround_Step4(struct ObjectEvent *, struct Sprite *);
+u8 MovementType_WanderUpAndDown_Step0(struct ObjectEvent *, struct Sprite *);
+u8 MovementType_WanderUpAndDown_Step1(struct ObjectEvent *, struct Sprite *);
+u8 MovementType_WanderUpAndDown_Step2(struct ObjectEvent *, struct Sprite *);
+u8 MovementType_WanderUpAndDown_Step3(struct ObjectEvent *, struct Sprite *);
+u8 MovementType_WanderUpAndDown_Step4(struct ObjectEvent *, struct Sprite *);
+u8 MovementType_WanderUpAndDown_Step5(struct ObjectEvent *, struct Sprite *);
+u8 MovementType_WanderUpAndDown_Step6(struct ObjectEvent *, struct Sprite *);
+u8 MovementType_WanderLeftAndRight_Step0(struct ObjectEvent *, struct Sprite *);
+u8 MovementType_WanderLeftAndRight_Step1(struct ObjectEvent *, struct Sprite *);
+u8 MovementType_WanderLeftAndRight_Step2(struct ObjectEvent *, struct Sprite *);
+u8 MovementType_WanderLeftAndRight_Step3(struct ObjectEvent *, struct Sprite *);
+u8 MovementType_WanderLeftAndRight_Step4(struct ObjectEvent *, struct Sprite *);
+u8 MovementType_WanderLeftAndRight_Step5(struct ObjectEvent *, struct Sprite *);
+u8 MovementType_WanderLeftAndRight_Step6(struct ObjectEvent *, struct Sprite *);
+u8 MovementType_FaceDirection_Step0(struct ObjectEvent *, struct Sprite *);
+u8 MovementType_FaceDirection_Step1(struct ObjectEvent *, struct Sprite *);
+u8 MovementType_FaceDirection_Step2(struct ObjectEvent *, struct Sprite *);
+u8 MovementType_BerryTreeGrowth_Step0(struct ObjectEvent *, struct Sprite *);
+u8 MovementType_BerryTreeGrowth_Step1(struct ObjectEvent *, struct Sprite *);
+u8 MovementType_BerryTreeGrowth_Step2(struct ObjectEvent *, struct Sprite *);
+u8 MovementType_BerryTreeGrowth_Step3(struct ObjectEvent *, struct Sprite *);
+u8 MovementType_BerryTreeGrowth_Step4(struct ObjectEvent *, struct Sprite *);
+u8 MovementType_FaceDownAndUp_Step0(struct ObjectEvent *, struct Sprite *);
+u8 MovementType_FaceDownAndUp_Step1(struct ObjectEvent *, struct Sprite *);
+u8 MovementType_FaceDownAndUp_Step2(struct ObjectEvent *, struct Sprite *);
+u8 MovementType_FaceDownAndUp_Step3(struct ObjectEvent *, struct Sprite *);
+u8 MovementType_FaceDownAndUp_Step4(struct ObjectEvent *, struct Sprite *);
+u8 MovementType_FaceLeftAndRight_Step0(struct ObjectEvent *, struct Sprite *);
+u8 MovementType_FaceLeftAndRight_Step1(struct ObjectEvent *, struct Sprite *);
+u8 MovementType_FaceLeftAndRight_Step2(struct ObjectEvent *, struct Sprite *);
+u8 MovementType_FaceLeftAndRight_Step3(struct ObjectEvent *, struct Sprite *);
+u8 MovementType_FaceLeftAndRight_Step4(struct ObjectEvent *, struct Sprite *);
+u8 MovementType_FaceUpAndLeft_Step0(struct ObjectEvent *, struct Sprite *);
+u8 MovementType_FaceUpAndLeft_Step1(struct ObjectEvent *, struct Sprite *);
+u8 MovementType_FaceUpAndLeft_Step2(struct ObjectEvent *, struct Sprite *);
+u8 MovementType_FaceUpAndLeft_Step3(struct ObjectEvent *, struct Sprite *);
+u8 MovementType_FaceUpAndLeft_Step4(struct ObjectEvent *, struct Sprite *);
+u8 MovementType_FaceUpAndRight_Step0(struct ObjectEvent *, struct Sprite *);
+u8 MovementType_FaceUpAndRight_Step1(struct ObjectEvent *, struct Sprite *);
+u8 MovementType_FaceUpAndRight_Step2(struct ObjectEvent *, struct Sprite *);
+u8 MovementType_FaceUpAndRight_Step3(struct ObjectEvent *, struct Sprite *);
+u8 MovementType_FaceUpAndRight_Step4(struct ObjectEvent *, struct Sprite *);
+u8 MovementType_FaceDownAndLeft_Step0(struct ObjectEvent *, struct Sprite *);
+u8 MovementType_FaceDownAndLeft_Step1(struct ObjectEvent *, struct Sprite *);
+u8 MovementType_FaceDownAndLeft_Step2(struct ObjectEvent *, struct Sprite *);
+u8 MovementType_FaceDownAndLeft_Step3(struct ObjectEvent *, struct Sprite *);
+u8 MovementType_FaceDownAndLeft_Step4(struct ObjectEvent *, struct Sprite *);
+u8 MovementType_FaceDownAndRight_Step0(struct ObjectEvent *, struct Sprite *);
+u8 MovementType_FaceDownAndRight_Step1(struct ObjectEvent *, struct Sprite *);
+u8 MovementType_FaceDownAndRight_Step2(struct ObjectEvent *, struct Sprite *);
+u8 MovementType_FaceDownAndRight_Step3(struct ObjectEvent *, struct Sprite *);
+u8 MovementType_FaceDownAndRight_Step4(struct ObjectEvent *, struct Sprite *);
+u8 MovementType_FaceDownUpAndLeft_Step0(struct ObjectEvent *, struct Sprite *);
+u8 MovementType_FaceDownUpAndLeft_Step1(struct ObjectEvent *, struct Sprite *);
+u8 MovementType_FaceDownUpAndLeft_Step2(struct ObjectEvent *, struct Sprite *);
+u8 MovementType_FaceDownUpAndLeft_Step3(struct ObjectEvent *, struct Sprite *);
+u8 MovementType_FaceDownUpAndLeft_Step4(struct ObjectEvent *, struct Sprite *);
+u8 MovementType_FaceDownUpAndRight_Step0(struct ObjectEvent *, struct Sprite *);
+u8 MovementType_FaceDownUpAndRight_Step1(struct ObjectEvent *, struct Sprite *);
+u8 MovementType_FaceDownUpAndRight_Step2(struct ObjectEvent *, struct Sprite *);
+u8 MovementType_FaceDownUpAndRight_Step3(struct ObjectEvent *, struct Sprite *);
+u8 MovementType_FaceDownUpAndRight_Step4(struct ObjectEvent *, struct Sprite *);
+u8 MovementType_FaceUpLeftAndRight_Step0(struct ObjectEvent *, struct Sprite *);
+u8 MovementType_FaceUpLeftAndRight_Step1(struct ObjectEvent *, struct Sprite *);
+u8 MovementType_FaceUpLeftAndRight_Step2(struct ObjectEvent *, struct Sprite *);
+u8 MovementType_FaceUpLeftAndRight_Step3(struct ObjectEvent *, struct Sprite *);
+u8 MovementType_FaceUpLeftAndRight_Step4(struct ObjectEvent *, struct Sprite *);
+u8 MovementType_FaceDownLeftAndRight_Step0(struct ObjectEvent *, struct Sprite *);
+u8 MovementType_FaceDownLeftAndRight_Step1(struct ObjectEvent *, struct Sprite *);
+u8 MovementType_FaceDownLeftAndRight_Step2(struct ObjectEvent *, struct Sprite *);
+u8 MovementType_FaceDownLeftAndRight_Step3(struct ObjectEvent *, struct Sprite *);
+u8 MovementType_FaceDownLeftAndRight_Step4(struct ObjectEvent *, struct Sprite *);
+u8 MovementType_RotateCounterclockwise_Step0(struct ObjectEvent *, struct Sprite *);
+u8 MovementType_RotateCounterclockwise_Step1(struct ObjectEvent *, struct Sprite *);
+u8 MovementType_RotateCounterclockwise_Step2(struct ObjectEvent *, struct Sprite *);
+u8 MovementType_RotateCounterclockwise_Step3(struct ObjectEvent *, struct Sprite *);
+u8 MovementType_RotateClockwise_Step0(struct ObjectEvent *, struct Sprite *);
+u8 MovementType_RotateClockwise_Step1(struct ObjectEvent *, struct Sprite *);
+u8 MovementType_RotateClockwise_Step2(struct ObjectEvent *, struct Sprite *);
+u8 MovementType_RotateClockwise_Step3(struct ObjectEvent *, struct Sprite *);
+u8 MovementType_WalkBackAndForth_Step0(struct ObjectEvent *, struct Sprite *);
+u8 MovementType_WalkBackAndForth_Step1(struct ObjectEvent *, struct Sprite *);
+u8 MovementType_WalkBackAndForth_Step2(struct ObjectEvent *, struct Sprite *);
+u8 MovementType_WalkBackAndForth_Step3(struct ObjectEvent *, struct Sprite *);
+u8 MovementType_WalkSequence_Step0(struct ObjectEvent *, struct Sprite *);
+u8 MovementType_WalkSequence_Step2(struct ObjectEvent *, struct Sprite *);
+u8 MovementType_WalkSequenceUpRightLeftDown_Step1(struct ObjectEvent *, struct Sprite *);
+u8 MovementType_WalkSequenceRightLeftDownUp_Step1(struct ObjectEvent *, struct Sprite *);
+u8 MovementType_WalkSequenceDownUpRightLeft_Step1(struct ObjectEvent *, struct Sprite *);
+u8 MovementType_WalkSequenceLeftDownUpRight_Step1(struct ObjectEvent *, struct Sprite *);
+u8 MovementType_WalkSequenceUpLeftRightDown_Step1(struct ObjectEvent *, struct Sprite *);
+u8 MovementType_WalkSequenceLeftRightDownUp_Step1(struct ObjectEvent *, struct Sprite *);
+u8 MovementType_WalkSequenceDownUpLeftRight_Step1(struct ObjectEvent *, struct Sprite *);
+u8 MovementType_WalkSequenceRightDownUpLeft_Step1(struct ObjectEvent *, struct Sprite *);
+u8 MovementType_WalkSequenceLeftUpDownRight_Step1(struct ObjectEvent *, struct Sprite *);
+u8 MovementType_WalkSequenceUpDownRightLeft_Step1(struct ObjectEvent *, struct Sprite *);
+u8 MovementType_WalkSequenceRightLeftUpDown_Step1(struct ObjectEvent *, struct Sprite *);
+u8 MovementType_WalkSequenceDownRightLeftUp_Step1(struct ObjectEvent *, struct Sprite *);
+u8 MovementType_WalkSequenceRightUpDownLeft_Step1(struct ObjectEvent *, struct Sprite *);
+u8 MovementType_WalkSequenceUpDownLeftRight_Step1(struct ObjectEvent *, struct Sprite *);
+u8 MovementType_WalkSequenceLeftRightUpDown_Step1(struct ObjectEvent *, struct Sprite *);
+u8 MovementType_WalkSequenceDownLeftRightUp_Step1(struct ObjectEvent *, struct Sprite *);
+u8 MovementType_WalkSequenceUpLeftDownRight_Step1(struct ObjectEvent *, struct Sprite *);
+u8 MovementType_WalkSequenceDownRightUpLeft_Step1(struct ObjectEvent *, struct Sprite *);
+u8 MovementType_WalkSequenceLeftDownRightUp_Step1(struct ObjectEvent *, struct Sprite *);
+u8 MovementType_WalkSequenceRightUpLeftDown_Step1(struct ObjectEvent *, struct Sprite *);
+u8 MovementType_WalkSequenceUpRightDownLeft_Step1(struct ObjectEvent *, struct Sprite *);
+u8 MovementType_WalkSequenceDownLeftUpRight_Step1(struct ObjectEvent *, struct Sprite *);
+u8 MovementType_WalkSequenceLeftUpRightDown_Step1(struct ObjectEvent *, struct Sprite *);
+u8 MovementType_WalkSequenceRightDownLeftUp_Step1(struct ObjectEvent *, struct Sprite *);
+u8 MovementType_CopyPlayer_Step0(struct ObjectEvent *, struct Sprite *);
+u8 MovementType_CopyPlayer_Step1(struct ObjectEvent *, struct Sprite *);
+u8 MovementType_CopyPlayer_Step2(struct ObjectEvent *, struct Sprite *);
+bool8 CopyablePlayerMovement_None(struct ObjectEvent *, struct Sprite *, u8, bool8(u8));
+bool8 CopyablePlayerMovement_FaceDirection(struct ObjectEvent *, struct Sprite *, u8, bool8(u8));
+bool8 CopyablePlayerMovement_GoSpeed0(struct ObjectEvent *, struct Sprite *, u8, bool8(u8));
+bool8 CopyablePlayerMovement_GoSpeed1(struct ObjectEvent *, struct Sprite *, u8, bool8(u8));
+bool8 CopyablePlayerMovement_GoSpeed2(struct ObjectEvent *, struct Sprite *, u8, bool8(u8));
+bool8 CopyablePlayerMovement_Slide(struct ObjectEvent *, struct Sprite *, u8, bool8(u8));
+bool8 cph_IM_DIFFERENT(struct ObjectEvent *, struct Sprite *, u8, bool8(u8));
+bool8 CopyablePlayerMovement_GoSpeed4(struct ObjectEvent *, struct Sprite *, u8, bool8(u8));
+bool8 CopyablePlayerMovement_Jump(struct ObjectEvent *, struct Sprite *, u8, bool8(u8));
+u8 MovementType_CopyPlayerInGrass_Step1(struct ObjectEvent *, struct Sprite *);
+u8 MovementType_Hidden_Step0(struct ObjectEvent *, struct Sprite *);
+u8 MovementType_WalkInPlace_Step0(struct ObjectEvent *, struct Sprite *);
+u8 MovementType_MoveInPlace_Step1(struct ObjectEvent *, struct Sprite *);
+u8 MovementType_WalkSlowlyInPlace_Step0(struct ObjectEvent *, struct Sprite *);
+u8 MovementType_JogInPlace_Step0(struct ObjectEvent *, struct Sprite *);
+u8 MovementType_RunInPlace_Step0(struct ObjectEvent *, struct Sprite *);
+u8 MovementType_Invisible_Step0(struct ObjectEvent *, struct Sprite *);
+u8 MovementType_Invisible_Step1(struct ObjectEvent *, struct Sprite *);
+u8 MovementType_Invisible_Step2(struct ObjectEvent *, struct Sprite *);
 void sub_8097C44(u8 var, bool32 var2);
 bool32 sub_8097C8C(u8 var);
 void sub_8097BB4(u8 var1, u8 graphicsId);
diff --git a/include/faraway_island.h b/include/faraway_island.h
index 4946bda8a..084b5a277 100755
--- a/include/faraway_island.h
+++ b/include/faraway_island.h
@@ -2,9 +2,9 @@
 #define GUARD_FARAWAY_ISLAND_H
 
 u32 GetMewMoveDirection(void);
-bool8 sub_81D4A58(struct EventObject*);
+bool8 sub_81D4A58(struct ObjectEvent*);
 void UpdateFarawayIslandStepCounter(void);
-bool8 EventObjectIsFarawayIslandMew(struct EventObject *);
+bool8 ObjectEventIsFarawayIslandMew(struct ObjectEvent *);
 bool8 IsMewPlayingHideAndSeek(void);
 
 #endif // GUARD_FARAWAY_ISLAND_H
diff --git a/include/field_control_avatar.h b/include/field_control_avatar.h
index feb20cef6..f722a6063 100644
--- a/include/field_control_avatar.h
+++ b/include/field_control_avatar.h
@@ -29,7 +29,7 @@ u8 *sub_80682A8(struct MapPosition *, u8, u8);
 void overworld_poison_timer_set(void);
 void RestartWildEncounterImmunitySteps(void);
 u8 *sub_8068E24(struct MapPosition *);
-const u8 *GetEventObjectScriptPointerPlayerFacing(void);
+const u8 *GetObjectEventScriptPointerPlayerFacing(void);
 bool8 sub_8068870(u16 a);
 bool8 sub_8068894(void);
 bool8 sub_8068A64(struct MapPosition *, u16);
diff --git a/include/field_effect_helpers.h b/include/field_effect_helpers.h
index 6ea9771e6..8257bc110 100644
--- a/include/field_effect_helpers.h
+++ b/include/field_effect_helpers.h
@@ -9,11 +9,11 @@
 u8 CreateWarpArrowSprite(void);
 u8 sub_8155800(u8 oldSpriteId);
 void sub_81555AC(u8, u8);
-bool8 sub_8155DA0(struct EventObject *);
-void sub_8155D78(struct EventObject *);
+bool8 sub_8155DA0(struct ObjectEvent *);
+void sub_8155D78(struct ObjectEvent *);
 void StartAshFieldEffect(s16, s16, u16, s16);
-void SetUpReflection(struct EventObject*, struct Sprite*, u8);
-u32 StartFieldEffectForEventObject(u8, struct EventObject*);
+void SetUpReflection(struct ObjectEvent*, struct Sprite*, u8);
+u32 StartFieldEffectForObjectEvent(u8, struct ObjectEvent*);
 u8 FindTallGrassFieldEffectSpriteId(u8 localId, u8 mapNum, u8 mapGroup, s16 x, s16 y);
 void sub_8155F80(struct Sprite*);
 void UpdateShadowFieldEffect(struct Sprite*);
diff --git a/include/field_player_avatar.h b/include/field_player_avatar.h
index 8d87779e6..db045e540 100644
--- a/include/field_player_avatar.h
+++ b/include/field_player_avatar.h
@@ -29,7 +29,7 @@ void PlayerAcroTurnJump(u8 a);
 void PlayerSetAnimId(u8 a, u8 b);
 bool8 IsPlayerCollidingWithFarawayIslandMew(u8 direction);
 void PlayerOnBikeCollideWithFarawayIslandMew(u8 direction);
-u8 CheckForEventObjectCollision(struct EventObject *a, s16 b, s16 c, u8 d, u8 e);
+u8 CheckForObjectEventCollision(struct ObjectEvent *a, s16 b, s16 c, u8 d, u8 e);
 u8 PlayerGetZCoord(void);
 void SetPlayerAvatarTransitionFlags(u16 a);
 void sub_808BCE8(void);
diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h
index de08fd1ec..81f638c8d 100644
--- a/include/global.fieldmap.h
+++ b/include/global.fieldmap.h
@@ -50,7 +50,7 @@ struct BackupMapLayout
     u16 *map;
 };
 
-struct EventObjectTemplate
+struct ObjectEventTemplate
 {
     /*0x00*/ u8 localId;
     /*0x01*/ u8 graphicsId;
@@ -102,11 +102,11 @@ struct BgEvent
 
 struct MapEvents
 {
-    u8 eventObjectCount;
+    u8 objectEventCount;
     u8 warpCount;
     u8 coordEventCount;
     u8 bgEventCount;
-    struct EventObjectTemplate *eventObjects;
+    struct ObjectEventTemplate *objectEvents;
     struct WarpEvent *warps;
     struct CoordEvent *coordEvents;
     struct BgEvent *bgEvents;
@@ -143,7 +143,7 @@ struct MapHeader
     /* 0x1B */ u8 battleType;
 };
 
-struct EventObject
+struct ObjectEvent
 {
     /*0x00*/ u32 active:1;
              u32 singleMovementActive:1;
@@ -206,7 +206,7 @@ struct EventObject
     /*size = 0x24*/
 };
 
-struct EventObjectGraphicsInfo
+struct ObjectEventGraphicsInfo
 {
     /*0x00*/ u16 tileTag;
     /*0x02*/ u16 paletteTag1;
@@ -298,7 +298,7 @@ struct PlayerAvatar
     /*0x02*/ u8 runningState; // this is a static running state. 00 is not moving, 01 is turn direction, 02 is moving.
     /*0x03*/ u8 tileTransitionState; // this is a transition running state: 00 is not moving, 01 is transition between tiles, 02 means you are on the frame in which you have centered on a tile but are about to keep moving, even if changing directions. 2 is also used for a ledge hop, since you are transitioning.
     /*0x04*/ u8 spriteId;
-    /*0x05*/ u8 eventObjectId;
+    /*0x05*/ u8 objectEventId;
     /*0x06*/ bool8 preventStep;
     /*0x07*/ u8 gender;
     /*0x08*/ u8 acroBikeState; // 00 is normal, 01 is turning, 02 is standing wheelie, 03 is hopping wheelie
@@ -320,8 +320,8 @@ struct Camera
     s32 y;
 };
 
-extern struct EventObject gEventObjects[EVENT_OBJECTS_COUNT];
-extern u8 gSelectedEventObject;
+extern struct ObjectEvent gObjectEvents[EVENT_OBJECTS_COUNT];
+extern u8 gSelectedObjectEvent;
 extern struct MapHeader gMapHeader;
 extern struct PlayerAvatar gPlayerAvatar;
 extern struct Camera gCamera;
diff --git a/include/global.h b/include/global.h
index af33f13cb..56899dc68 100644
--- a/include/global.h
+++ b/include/global.h
@@ -918,8 +918,8 @@ struct SaveBlock1
     /*0x9C2*/ u8 field_9C2[6];
     /*0x9C8*/ u16 trainerRematchStepCounter;
     /*0x9CA*/ u8 trainerRematches[100];
-    /*0xA30*/ struct EventObject eventObjects[EVENT_OBJECTS_COUNT];
-    /*0xC70*/ struct EventObjectTemplate eventObjectTemplates[EVENT_OBJECT_TEMPLATES_COUNT];
+    /*0xA30*/ struct ObjectEvent objectEvents[EVENT_OBJECTS_COUNT];
+    /*0xC70*/ struct ObjectEventTemplate objectEventTemplates[EVENT_OBJECT_TEMPLATES_COUNT];
     /*0x1270*/ u8 flags[FLAGS_COUNT];
     /*0x139C*/ u16 vars[VARS_COUNT];
     /*0x159C*/ u32 gameStats[NUM_GAME_STATS];
diff --git a/include/load_save.h b/include/load_save.h
index bf50bffd7..2f4a9ace6 100644
--- a/include/load_save.h
+++ b/include/load_save.h
@@ -22,8 +22,8 @@ void SetContinueGameWarpStatusToDynamicWarp(void);
 void ClearContinueGameWarpStatus2(void);
 void SavePlayerParty(void);
 void LoadPlayerParty(void);
-void SaveEventObjects(void);
-void LoadEventObjects(void);
+void SaveObjectEvents(void);
+void LoadObjectEvents(void);
 void SaveSerializedGame(void);
 void LoadSerializedGame(void);
 void LoadPlayerBag(void);
diff --git a/include/overworld.h b/include/overworld.h
index b86067701..dced95007 100644
--- a/include/overworld.h
+++ b/include/overworld.h
@@ -30,17 +30,17 @@ struct InitialPlayerAvatarState
     u8 direction;
 };
 
-struct LinkPlayerEventObject
+struct LinkPlayerObjectEvent
 {
     u8 active;
     u8 linkPlayerId;
-    u8 eventObjId;
+    u8 objEventId;
     u8 movementMode;
 };
 
 // Exported RAM declarations
 extern struct WarpData gLastUsedWarp;
-extern struct LinkPlayerEventObject gLinkPlayerEventObjects[4];
+extern struct LinkPlayerObjectEvent gLinkPlayerObjectEvents[4];
 
 extern u16 *gBGTilemapBuffers1;
 extern u16 *gBGTilemapBuffers2;
@@ -157,6 +157,6 @@ bool32 sub_8087598(void);
 bool32 sub_80875C8(void);
 bool32 sub_8087634(void);
 bool32 sub_808766C(void);
-void ClearLinkPlayerEventObjects(void);
+void ClearLinkPlayerObjectEvents(void);
 
 #endif // GUARD_OVERWORLD_H
diff --git a/include/script.h b/include/script.h
index 3f92964ac..f9fb09b5d 100644
--- a/include/script.h
+++ b/include/script.h
@@ -59,7 +59,7 @@ bool8 InitRamScript(const u8 *script, u16 scriptSize, u8 mapGroup, u8 mapNum, u8
 const u8 *GetRamScript(u8 objectId, const u8 *script);
 bool32 ValidateSavedRamScript(void);
 u8 *GetSavedRamScriptIfValid(void);
-void InitRamScript_NoEventObject(u8 *script, u16 scriptSize);
+void InitRamScript_NoObjectEvent(u8 *script, u16 scriptSize);
 
 // srccmd.h
 void SetMovingNpcId(u16 npcId);
diff --git a/include/script_movement.h b/include/script_movement.h
index f9a97cf46..03f8bf0b7 100644
--- a/include/script_movement.h
+++ b/include/script_movement.h
@@ -3,6 +3,6 @@
 
 bool8 ScriptMovement_StartObjectMovementScript(u8 localId, u8 mapNum, u8 mapGroup, const u8 *movementScript);
 bool8 ScriptMovement_IsObjectMovementFinished(u8 localId, u8 mapNum, u8 mapGroup);
-void ScriptMovement_UnfreezeEventObjects(void);
+void ScriptMovement_UnfreezeObjectEvents(void);
 
 #endif // GUARD_SCRIPT_MOVEMENT_H
diff --git a/include/trainer_hill.h b/include/trainer_hill.h
index c07aeb6d7..c849bcced 100644
--- a/include/trainer_hill.h
+++ b/include/trainer_hill.h
@@ -60,15 +60,15 @@ void CopyTrainerHillTrainerText(u8 which, u16 trainerId);
 bool8 InTrainerHillChallenge(void);
 void nullsub_129(void);
 void PrintOnTrainerHillRecordsWindow(void);
-void LoadTrainerHillEventObjectTemplates(void);
-bool32 LoadTrainerHillFloorEventObjectScripts(void);
+void LoadTrainerHillObjectEventTemplates(void);
+bool32 LoadTrainerHillFloorObjectEventScripts(void);
 void GenerateTrainerHillFloorLayout(u16 *mapArg);
 bool32 InTrainerHill(void);
 u8 GetCurrentTrainerHillMapId(void);
 const struct WarpEvent* SetWarpDestinationTrainerHill4F(void);
 const struct WarpEvent* SetWarpDestinationTrainerHillFinalFloor(u8 warpEventId);
 u16 LocalIdToHillTrainerId(u8 localId);
-bool8 GetHillTrainerFlag(u8 eventObjectId);
+bool8 GetHillTrainerFlag(u8 objectEventId);
 void SetHillTrainerFlag(void);
 const u8 *GetTrainerHillTrainerScript(void);
 void FillHillTrainerParty(void);
diff --git a/include/trainer_see.h b/include/trainer_see.h
index daf9d0298..9d88e05fa 100644
--- a/include/trainer_see.h
+++ b/include/trainer_see.h
@@ -3,7 +3,7 @@
 
 struct ApproachingTrainer
 {
-    u8 eventObjectId;
+    u8 objectEventId;
     u8 radius; // plus 1
     const u8 *trainerScriptPtr;
     u8 taskId;
@@ -17,14 +17,14 @@ extern bool8 gTrainerApproachedPlayer;
 extern u8 gApproachingTrainerId;
 
 bool8 CheckForTrainersWantingBattle(void);
-void sub_80B4578(struct EventObject *var);
+void sub_80B4578(struct ObjectEvent *var);
 void EndTrainerApproach(void);
 void TryPrepareSecondApproachingTrainer(void);
 u8 FldEff_ExclamationMarkIcon(void);
 u8 FldEff_QuestionMarkIcon(void);
 u8 FldEff_HeartIcon(void);
-u8 GetCurrentApproachingTrainerEventObjectId(void);
-u8 GetChosenApproachingTrainerEventObjectId(u8 arrayId);
+u8 GetCurrentApproachingTrainerObjectEventId(void);
+u8 GetChosenApproachingTrainerObjectEventId(u8 arrayId);
 void PlayerFaceTrainerAfterBattle(void);
 
 #endif // GUARD_TRAINER_SEE_H