Merge pull request #910 from GriffinRichards/fix-eventobj

Standardize Object Event naming

1 files changed, 3 insertions, 3 deletions

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);