Rename EventObj to ObjEvent

4 files changed, 9 insertions, 9 deletions

diff --git a/include/battle_setup.h b/include/battle_setup.h
index 984c820bb..08fa60155 100644
--- a/include/battle_setup.h
+++ b/include/battle_setup.h
@@ -34,8 +34,8 @@ void ChooseStarter(void);
 void ResetTrainerOpponentIds(void);
 void SetMapVarsToTrainer(void);
 const u8 *BattleSetup_ConfigureTrainerBattle(const u8 *data);
-void ConfigureAndSetUpOneTrainerBattle(u8 trainerEventObjId, const u8 *trainerScript);
-void ConfigureTwoTrainersBattle(u8 trainerEventObjId, const u8 *trainerScript);
+void ConfigureAndSetUpOneTrainerBattle(u8 trainerObjEventId, const u8 *trainerScript);
+void ConfigureTwoTrainersBattle(u8 trainerObjEventId, const u8 *trainerScript);
 void SetUpTwoTrainersBattle(void);
 bool32 GetTrainerFlagFromScriptPointer(const u8 *data);
 void SetUpTrainerMovement(void);
diff --git a/include/frontier_util.h b/include/frontier_util.h
index 627b5bef5..273c4cc20 100644
--- a/include/frontier_util.h
+++ b/include/frontier_util.h
@@ -16,10 +16,10 @@ u8 GetFrontierBrainTrainerPicIndex(void);
 u8 GetFrontierBrainTrainerClass(void);
 void CopyFrontierBrainTrainerName(u8 *dst);
 bool8 IsFrontierBrainFemale(void);
-void SetFrontierBrainEventObjGfx_2(void);
+void SetFrontierBrainObjEventGfx_2(void);
 void CreateFrontierBrainPokemon(void);
 u16 GetFrontierBrainMonSpecies(u8 monId);
-void SetFrontierBrainEventObjGfx(u8 facility);
+void SetFrontierBrainObjEventGfx(u8 facility);
 u16 GetFrontierBrainMonMove(u8 monId, u8 moveSlotId);
 u8 GetFrontierBrainMonNature(u8 monId);
 u8 GetFrontierBrainMonEvs(u8 monId, u8 evStatId);
diff --git a/include/mauville_old_man.h b/include/mauville_old_man.h
index 3845ac290..29c66a992 100644
--- a/include/mauville_old_man.h
+++ b/include/mauville_old_man.h
@@ -5,7 +5,7 @@ extern struct BardSong gBardSong;
 
 void SetMauvilleOldMan(void);
 u8 GetCurrentMauvilleOldMan(void);
-void ScrSpecial_SetMauvilleOldManEventObjGfx(void);
+void ScrSpecial_SetMauvilleOldManObjEventGfx(void);
 u8 sub_81201C8(void);
 void sub_8120B70(OldMan *dest);
 void sub_8120670(void);
diff --git a/include/overworld.h b/include/overworld.h
index dced95007..0e3c7e006 100644
--- a/include/overworld.h
+++ b/include/overworld.h
@@ -63,10 +63,10 @@ void IncrementGameStat(u8 index);
 u32 GetGameStat(u8 index);
 void SetGameStat(u8 index, u32 value);
 void ApplyNewEncryptionKeyToGameStats(u32 newKey);
-void LoadEventObjTemplatesFromHeader(void);
-void LoadSaveblockEventObjScripts(void);
-void Overworld_SetEventObjTemplateCoords(u8 localId, s16 x, s16 y);
-void Overworld_SetEventObjTemplateMovementType(u8 localId, u8 movementType);
+void LoadObjEventTemplatesFromHeader(void);
+void LoadSaveblockObjEventScripts(void);
+void Overworld_SetObjEventTemplateCoords(u8 localId, s16 x, s16 y);
+void Overworld_SetObjEventTemplateMovementType(u8 localId, u8 movementType);
 const struct MapLayout *GetMapLayout(void);
 void ApplyCurrentWarp(void);
 struct MapHeader const *const Overworld_GetMapHeaderByGroupAndId(u16 mapGroup, u16 mapNum);