summaryrefslogtreecommitdiff
path: root/include/battle_pyramid.h
diff options
context:
space:
mode:
authorhuderlem <huderlem@gmail.com>2020-02-12 18:34:19 -0600
committerGitHub <noreply@github.com>2020-02-12 18:34:19 -0600
commit204c431993dad29661a9ff47326787cd0cf381e6 (patch)
treebda0c76fa20f0cc9e679985d8f7286ad95dd38c4 /include/battle_pyramid.h
parent66c6b7a38b2a071ce7029978dd0d02fe6ec05952 (diff)
parent6b966d20e5d3866117fc9f1c0616654f2dfc415e (diff)
Merge pull request #910 from GriffinRichards/fix-eventobj
Standardize Object Event naming
Diffstat (limited to 'include/battle_pyramid.h')
-rw-r--r--include/battle_pyramid.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/battle_pyramid.h b/include/battle_pyramid.h
index d0681acf3..c4a72095f 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