From ec3e86f1d2f78bb9fece0956e246862cea3c07b9 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Wed, 20 Nov 2019 22:55:44 -0500 Subject: Standardize Event Object to Object Event --- include/overworld.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'include/overworld.h') 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 -- cgit v1.2.3