Standardize Event Object to Object Event

1 files changed, 11 insertions, 11 deletions

diff --git a/src/script_pokemon_util_80F87D8.c b/src/script_pokemon_util_80F87D8.c
index 8c66be30f..a79c37d8c 100755
--- a/src/script_pokemon_util_80F87D8.c
+++ b/src/script_pokemon_util_80F87D8.c
@@ -33,10 +33,10 @@
 #include "constants/vars.h"
 #include "constants/battle_frontier.h"
 
-extern const u16 gEventObjectPalette8[];
-extern const u16 gEventObjectPalette17[];
-extern const u16 gEventObjectPalette33[];
-extern const u16 gEventObjectPalette34[];
+extern const u16 gObjectEventPalette8[];
+extern const u16 gObjectEventPalette17[];
+extern const u16 gObjectEventPalette33[];
+extern const u16 gObjectEventPalette34[];
 
 static const u8 gUnknown_0858D8EC[] = { 3, 4, 5, 14 };
 
@@ -263,7 +263,7 @@ void SetLinkContestPlayerGfx(void)
 void LoadLinkContestPlayerPalettes(void)
 {
     int i;
-    u8 eventObjectId;
+    u8 objectEventId;
     int version;
     struct Sprite *sprite;
 
@@ -272,23 +272,23 @@ void LoadLinkContestPlayerPalettes(void)
     {
         for (i = 0; i < gNumLinkContestPlayers; i++)
         {
-            eventObjectId = GetEventObjectIdByLocalIdAndMap(gUnknown_0858D8EC[i], gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup);
-            sprite = &gSprites[gEventObjects[eventObjectId].spriteId];
+            objectEventId = GetObjectEventIdByLocalIdAndMap(gUnknown_0858D8EC[i], gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup);
+            sprite = &gSprites[gObjectEvents[objectEventId].spriteId];
             sprite->oam.paletteNum = 6 + i;
             version = (u8)gLinkPlayers[i].version;
             if (version == VERSION_RUBY || version == VERSION_SAPPHIRE)
             {
                 if (gLinkPlayers[i].gender == MALE)
-                    LoadPalette(gEventObjectPalette33, 0x160 + i * 0x10, 0x20);
+                    LoadPalette(gObjectEventPalette33, 0x160 + i * 0x10, 0x20);
                 else
-                    LoadPalette(gEventObjectPalette34, 0x160 + i * 0x10, 0x20);
+                    LoadPalette(gObjectEventPalette34, 0x160 + i * 0x10, 0x20);
             }
             else
             {
                 if (gLinkPlayers[i].gender == MALE)
-                    LoadPalette(gEventObjectPalette8, 0x160 + i * 0x10, 0x20);
+                    LoadPalette(gObjectEventPalette8, 0x160 + i * 0x10, 0x20);
                 else
-                    LoadPalette(gEventObjectPalette17, 0x160 + i * 0x10, 0x20);
+                    LoadPalette(gObjectEventPalette17, 0x160 + i * 0x10, 0x20);
             }
         }
     }