Merge pull request #265 from GriffinRichards/sync-objgfx

Sync object event gfx constants

9 files changed, 229 insertions, 231 deletions

diff --git a/src/battle_tower.c b/src/battle_tower.c
index cecc05e29..82d3c4d85 100644
--- a/src/battle_tower.c
+++ b/src/battle_tower.c
@@ -24,7 +24,7 @@
 #include "constants/moves.h"
 #include "constants/pokemon.h"
 #include "constants/vars.h"
-#include "constants/object_events.h"
+#include "constants/event_objects.h"
 
 static EWRAM_DATA u16 sSpecialVar_0x8004_Copy = 0;
 
@@ -389,7 +389,7 @@ void ChooseNextBattleTowerTrainer(void)
 
 static void SetBattleTowerTrainerGfxId(u8 trainerClass)
 {
-    VarSet(VAR_OBJ_GFX_ID_0, OBJECT_EVENT_GFX_YOUNGSTER);
+    VarSet(VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_YOUNGSTER);
 }
 
 void SetEReaderTrainerGfxId(void)
diff --git a/src/dynamic_placeholder_text_util.c b/src/dynamic_placeholder_text_util.c
index 20e7258d3..921612cfc 100644
--- a/src/dynamic_placeholder_text_util.c
+++ b/src/dynamic_placeholder_text_util.c
@@ -1,89 +1,89 @@
 #include "global.h"
 #include "text.h"
 #include "string_util.h"
-#include "constants/object_events.h"
+#include "constants/event_objects.h"
 
 static EWRAM_DATA const u8 *sStringPointers[8] = {0};
 
 static const u8 sTextColorTable[] =
 {
  // [LOW_NYBBLE / 2]                               = 0xXY, // HIGH_NYBBLE
-    [OBJECT_EVENT_GFX_RED_NORMAL / 2]              = 0x00, // OBJECT_EVENT_GFX_RED_BIKE
-    [OBJECT_EVENT_GFX_RED_SURF / 2]                 = 0x00, // OBJECT_EVENT_GFX_RED_ITEM
-    [OBJECT_EVENT_GFX_RED_FISH / 2]                = 0x00, // OBJECT_EVENT_GFX_RED_ITEM_COPY
-    [OBJECT_EVENT_GFX_RED_VS_SEEKER / 2]           = 0x10, // OBJECT_EVENT_GFX_GREEN_NORMAL
-    [OBJECT_EVENT_GFX_GREEN_BIKE / 2]              = 0x11, // OBJECT_EVENT_GFX_GREEN_SURF
-    [OBJECT_EVENT_GFX_GREEN_ITEM / 2]              = 0x11, // OBJECT_EVENT_GFX_GREEN_FISH
-    [OBJECT_EVENT_GFX_GREEN_ITEM_COPY / 2]         = 0x11, // OBJECT_EVENT_GFX_GREEN_VS_SEEKER
-    [OBJECT_EVENT_GFX_RS_BRENDAN / 2]              = 0x10, // OBJECT_EVENT_GFX_RS_MAY
-    [OBJECT_EVENT_GFX_LITTLE_BOY / 2]              = 0x10, // OBJECT_EVENT_GFX_LITTLE_GIRL
-    [OBJECT_EVENT_GFX_YOUNGSTER / 2]               = 0x00, // OBJECT_EVENT_GFX_BOY
-    [OBJECT_EVENT_GFX_BUG_CATCHER / 2]             = 0x00, // OBJECT_EVENT_GFX_SITTING_BOY
-    [OBJECT_EVENT_GFX_LASS / 2]                    = 0x11, // OBJECT_EVENT_GFX_WOMAN_1
-    [OBJECT_EVENT_GFX_BATTLE_GIRL / 2]             = 0x01, // OBJECT_EVENT_GFX_MAN
-    [OBJECT_EVENT_GFX_ROCKER / 2]                  = 0x00, // OBJECT_EVENT_GFX_FAT_MAN
-    [OBJECT_EVENT_GFX_WOMAN_2 / 2]                 = 0x11, // OBJECT_EVENT_GFX_BEAUTY
-    [OBJECT_EVENT_GFX_BALDING_MAN / 2]             = 0x10, // OBJECT_EVENT_GFX_WOMAN_3
-    [OBJECT_EVENT_GFX_OLD_MAN_1 / 2]               = 0x00, // OBJECT_EVENT_GFX_OLD_MAN_2
-    [OBJECT_EVENT_GFX_OLD_MAN_LYING_DOWN / 2]      = 0x10, // OBJECT_EVENT_GFX_OLD_WOMAN
-    [OBJECT_EVENT_GFX_TUBER_M_1 / 2]               = 0x10, // OBJECT_EVENT_GFX_TUBER_F
-    [OBJECT_EVENT_GFX_TUBER_M_2 / 2]               = 0x00, // OBJECT_EVENT_GFX_CAMPER
-    [OBJECT_EVENT_GFX_PICNICKER / 2]               = 0x01, // OBJECT_EVENT_GFX_COOLTRAINER_M
-    [OBJECT_EVENT_GFX_COOLTRAINER_F / 2]           = 0x01, // OBJECT_EVENT_GFX_SWIMMER_M_WATER
-    [OBJECT_EVENT_GFX_SWIMMER_F_WATER / 2]         = 0x01, // OBJECT_EVENT_GFX_SWIMMER_M_LAND
-    [OBJECT_EVENT_GFX_SWIMMER_F_LAND / 2]          = 0x01, // OBJECT_EVENT_GFX_WORKER_M
-    [OBJECT_EVENT_GFX_WORKER_F / 2]                = 0x01, // OBJECT_EVENT_GFX_ROCKET_M
-    [OBJECT_EVENT_GFX_ROCKET_F / 2]                = 0x01, // OBJECT_EVENT_GFX_GBA_KID
-    [OBJECT_EVENT_GFX_SUPER_NERD / 2]              = 0x00, // OBJECT_EVENT_GFX_BIKER
-    [OBJECT_EVENT_GFX_BLACKBELT / 2]               = 0x00, // OBJECT_EVENT_GFX_SCIENTIST
-    [OBJECT_EVENT_GFX_HIKER / 2]                   = 0x00, // OBJECT_EVENT_GFX_FISHER
-    [OBJECT_EVENT_GFX_CHANNELER / 2]               = 0x01, // OBJECT_EVENT_GFX_CHEF
-    [OBJECT_EVENT_GFX_POLICEMAN / 2]               = 0x00, // OBJECT_EVENT_GFX_GENTLEMAN
-    [OBJECT_EVENT_GFX_SAILOR / 2]                  = 0x00, // OBJECT_EVENT_GFX_CAPTAIN
-    [OBJECT_EVENT_GFX_NURSE / 2]                   = 0x11, // OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST
-    [OBJECT_EVENT_GFX_UNION_ROOM_RECEPTIONIST / 2] = 0x01, // OBJECT_EVENT_GFX_UNUSED_MALE_RECEPTIONIST
-    [OBJECT_EVENT_GFX_CLERK / 2]                   = 0x00, // OBJECT_EVENT_GFX_MG_DELIVERYMAN
-    [OBJECT_EVENT_GFX_TRAINER_TOWER_DUDE / 2]      = 0x00, // OBJECT_EVENT_GFX_PROF_OAK
-    [OBJECT_EVENT_GFX_BLUE / 2]                    = 0x00, // OBJECT_EVENT_GFX_BILL
-    [OBJECT_EVENT_GFX_LANCE / 2]                   = 0x10, // OBJECT_EVENT_GFX_AGATHA
-    [OBJECT_EVENT_GFX_DAISY / 2]                   = 0x11, // OBJECT_EVENT_GFX_LORELEI
-    [OBJECT_EVENT_GFX_MR_FUJI / 2]                 = 0x00, // OBJECT_EVENT_GFX_BRUNO
-    [OBJECT_EVENT_GFX_BROCK / 2]                   = 0x10, // OBJECT_EVENT_GFX_MISTY
-    [OBJECT_EVENT_GFX_LT_SURGE / 2]                = 0x10, // OBJECT_EVENT_GFX_ERIKA
-    [OBJECT_EVENT_GFX_KOGA / 2]                    = 0x10, // OBJECT_EVENT_GFX_SABRINA
-    [OBJECT_EVENT_GFX_BLAINE / 2]                  = 0x00, // OBJECT_EVENT_GFX_GIOVANNI
-    [OBJECT_EVENT_GFX_MOM / 2]                     = 0x01, // OBJECT_EVENT_GFX_CELIO
-    [OBJECT_EVENT_GFX_TEACHY_TV_HOST / 2]          = 0x00, // OBJECT_EVENT_GFX_GYM_GUY
-    [OBJECT_EVENT_GFX_ITEM_BALL / 2]               = 0x33, // OBJECT_EVENT_GFX_TOWN_MAP
-    [OBJECT_EVENT_GFX_POKEDEX / 2]                 = 0x33, // OBJECT_EVENT_GFX_CUT_TREE
-    [OBJECT_EVENT_GFX_ROCK_SMASH_ROCK / 2]         = 0x33, // OBJECT_EVENT_GFX_STRENGTH_BOULDER
-    [OBJECT_EVENT_GFX_FOSSIL / 2]                  = 0x33, // OBJECT_EVENT_GFX_RUBY
-    [OBJECT_EVENT_GFX_SAPPHIRE / 2]                = 0x33, // OBJECT_EVENT_GFX_OLD_AMBER
-    [OBJECT_EVENT_GFX_GYM_SIGN / 2]                = 0x33, // OBJECT_EVENT_GFX_SIGN
-    [OBJECT_EVENT_GFX_TRAINER_TIPS / 2]            = 0x33, // OBJECT_EVENT_GFX_CLIPBOARD
-    [OBJECT_EVENT_GFX_METEORITE / 2]               = 0x33, // OBJECT_EVENT_GFX_LAPRAS_DOLL
-    [OBJECT_EVENT_GFX_SEAGALLOP / 2]               = 0x23, // OBJECT_EVENT_GFX_SNORLAX
-    [OBJECT_EVENT_GFX_SPEAROW / 2]                 = 0x22, // OBJECT_EVENT_GFX_CUBONE
-    [OBJECT_EVENT_GFX_POLIWRATH / 2]               = 0x22, // OBJECT_EVENT_GFX_CLEFAIRY
-    [OBJECT_EVENT_GFX_PIDGEOT / 2]                 = 0x22, // OBJECT_EVENT_GFX_JIGGLYPUFF
-    [OBJECT_EVENT_GFX_PIDGEY / 2]                  = 0x22, // OBJECT_EVENT_GFX_CHANSEY
-    [OBJECT_EVENT_GFX_OMANYTE / 2]                 = 0x22, // OBJECT_EVENT_GFX_KANGASKHAN
-    [OBJECT_EVENT_GFX_PIKACHU / 2]                 = 0x22, // OBJECT_EVENT_GFX_PSYDUCK
-    [OBJECT_EVENT_GFX_NIDORAN_F / 2]               = 0x22, // OBJECT_EVENT_GFX_NIDORAN_M
-    [OBJECT_EVENT_GFX_NIDORINO / 2]                = 0x22, // OBJECT_EVENT_GFX_MEOWTH
-    [OBJECT_EVENT_GFX_SEEL / 2]                    = 0x22, // OBJECT_EVENT_GFX_VOLTORB
-    [OBJECT_EVENT_GFX_SLOWPOKE / 2]                = 0x22, // OBJECT_EVENT_GFX_SLOWBRO
-    [OBJECT_EVENT_GFX_MACHOP / 2]                  = 0x22, // OBJECT_EVENT_GFX_WIGGLYTUFF
-    [OBJECT_EVENT_GFX_DODUO / 2]                   = 0x22, // OBJECT_EVENT_GFX_FEAROW
-    [OBJECT_EVENT_GFX_MACHOKE / 2]                 = 0x22, // OBJECT_EVENT_GFX_LAPRAS
-    [OBJECT_EVENT_GFX_ZAPDOS / 2]                  = 0x22, // OBJECT_EVENT_GFX_MOLTRES
-    [OBJECT_EVENT_GFX_ARTICUNO / 2]                = 0x22, // OBJECT_EVENT_GFX_MEWTWO
-    [OBJECT_EVENT_GFX_MEW / 2]                     = 0x22, // OBJECT_EVENT_GFX_ENTEI
-    [OBJECT_EVENT_GFX_SUICUNE / 2]                 = 0x22, // OBJECT_EVENT_GFX_RAIKOU
-    [OBJECT_EVENT_GFX_LUGIA / 2]                   = 0x22, // OBJECT_EVENT_GFX_HO_OH
-    [OBJECT_EVENT_GFX_CELEBI / 2]                  = 0x22, // OBJECT_EVENT_GFX_KABUTO
-    [OBJECT_EVENT_GFX_DEOXYS_D / 2]                = 0x22, // OBJECT_EVENT_GFX_DEOXYS_A
-    [OBJECT_EVENT_GFX_DEOXYS_N / 2]                = 0x32, // OBJECT_EVENT_GFX_SS_ANNE
+    [OBJ_EVENT_GFX_RED_NORMAL / 2]              = 0x00, // OBJ_EVENT_GFX_RED_BIKE
+    [OBJ_EVENT_GFX_RED_SURF / 2]                 = 0x00, // OBJ_EVENT_GFX_RED_ITEM
+    [OBJ_EVENT_GFX_RED_FISH / 2]                = 0x00, // OBJ_EVENT_GFX_RED_ITEM_COPY
+    [OBJ_EVENT_GFX_RED_VS_SEEKER / 2]           = 0x10, // OBJ_EVENT_GFX_GREEN_NORMAL
+    [OBJ_EVENT_GFX_GREEN_BIKE / 2]              = 0x11, // OBJ_EVENT_GFX_GREEN_SURF
+    [OBJ_EVENT_GFX_GREEN_ITEM / 2]              = 0x11, // OBJ_EVENT_GFX_GREEN_FISH
+    [OBJ_EVENT_GFX_GREEN_ITEM_COPY / 2]         = 0x11, // OBJ_EVENT_GFX_GREEN_VS_SEEKER
+    [OBJ_EVENT_GFX_RS_BRENDAN / 2]              = 0x10, // OBJ_EVENT_GFX_RS_MAY
+    [OBJ_EVENT_GFX_LITTLE_BOY / 2]              = 0x10, // OBJ_EVENT_GFX_LITTLE_GIRL
+    [OBJ_EVENT_GFX_YOUNGSTER / 2]               = 0x00, // OBJ_EVENT_GFX_BOY
+    [OBJ_EVENT_GFX_BUG_CATCHER / 2]             = 0x00, // OBJ_EVENT_GFX_SITTING_BOY
+    [OBJ_EVENT_GFX_LASS / 2]                    = 0x11, // OBJ_EVENT_GFX_WOMAN_1
+    [OBJ_EVENT_GFX_BATTLE_GIRL / 2]             = 0x01, // OBJ_EVENT_GFX_MAN
+    [OBJ_EVENT_GFX_ROCKER / 2]                  = 0x00, // OBJ_EVENT_GFX_FAT_MAN
+    [OBJ_EVENT_GFX_WOMAN_2 / 2]                 = 0x11, // OBJ_EVENT_GFX_BEAUTY
+    [OBJ_EVENT_GFX_BALDING_MAN / 2]             = 0x10, // OBJ_EVENT_GFX_WOMAN_3
+    [OBJ_EVENT_GFX_OLD_MAN_1 / 2]               = 0x00, // OBJ_EVENT_GFX_OLD_MAN_2
+    [OBJ_EVENT_GFX_OLD_MAN_LYING_DOWN / 2]      = 0x10, // OBJ_EVENT_GFX_OLD_WOMAN
+    [OBJ_EVENT_GFX_TUBER_M_1 / 2]               = 0x10, // OBJ_EVENT_GFX_TUBER_F
+    [OBJ_EVENT_GFX_TUBER_M_2 / 2]               = 0x00, // OBJ_EVENT_GFX_CAMPER
+    [OBJ_EVENT_GFX_PICNICKER / 2]               = 0x01, // OBJ_EVENT_GFX_COOLTRAINER_M
+    [OBJ_EVENT_GFX_COOLTRAINER_F / 2]           = 0x01, // OBJ_EVENT_GFX_SWIMMER_M_WATER
+    [OBJ_EVENT_GFX_SWIMMER_F_WATER / 2]         = 0x01, // OBJ_EVENT_GFX_SWIMMER_M_LAND
+    [OBJ_EVENT_GFX_SWIMMER_F_LAND / 2]          = 0x01, // OBJ_EVENT_GFX_WORKER_M
+    [OBJ_EVENT_GFX_WORKER_F / 2]                = 0x01, // OBJ_EVENT_GFX_ROCKET_M
+    [OBJ_EVENT_GFX_ROCKET_F / 2]                = 0x01, // OBJ_EVENT_GFX_GBA_KID
+    [OBJ_EVENT_GFX_SUPER_NERD / 2]              = 0x00, // OBJ_EVENT_GFX_BIKER
+    [OBJ_EVENT_GFX_BLACKBELT / 2]               = 0x00, // OBJ_EVENT_GFX_SCIENTIST
+    [OBJ_EVENT_GFX_HIKER / 2]                   = 0x00, // OBJ_EVENT_GFX_FISHER
+    [OBJ_EVENT_GFX_CHANNELER / 2]               = 0x01, // OBJ_EVENT_GFX_CHEF
+    [OBJ_EVENT_GFX_POLICEMAN / 2]               = 0x00, // OBJ_EVENT_GFX_GENTLEMAN
+    [OBJ_EVENT_GFX_SAILOR / 2]                  = 0x00, // OBJ_EVENT_GFX_CAPTAIN
+    [OBJ_EVENT_GFX_NURSE / 2]                   = 0x11, // OBJ_EVENT_GFX_CABLE_CLUB_RECEPTIONIST
+    [OBJ_EVENT_GFX_UNION_ROOM_RECEPTIONIST / 2] = 0x01, // OBJ_EVENT_GFX_UNUSED_MALE_RECEPTIONIST
+    [OBJ_EVENT_GFX_CLERK / 2]                   = 0x00, // OBJ_EVENT_GFX_MG_DELIVERYMAN
+    [OBJ_EVENT_GFX_TRAINER_TOWER_DUDE / 2]      = 0x00, // OBJ_EVENT_GFX_PROF_OAK
+    [OBJ_EVENT_GFX_BLUE / 2]                    = 0x00, // OBJ_EVENT_GFX_BILL
+    [OBJ_EVENT_GFX_LANCE / 2]                   = 0x10, // OBJ_EVENT_GFX_AGATHA
+    [OBJ_EVENT_GFX_DAISY / 2]                   = 0x11, // OBJ_EVENT_GFX_LORELEI
+    [OBJ_EVENT_GFX_MR_FUJI / 2]                 = 0x00, // OBJ_EVENT_GFX_BRUNO
+    [OBJ_EVENT_GFX_BROCK / 2]                   = 0x10, // OBJ_EVENT_GFX_MISTY
+    [OBJ_EVENT_GFX_LT_SURGE / 2]                = 0x10, // OBJ_EVENT_GFX_ERIKA
+    [OBJ_EVENT_GFX_KOGA / 2]                    = 0x10, // OBJ_EVENT_GFX_SABRINA
+    [OBJ_EVENT_GFX_BLAINE / 2]                  = 0x00, // OBJ_EVENT_GFX_GIOVANNI
+    [OBJ_EVENT_GFX_MOM / 2]                     = 0x01, // OBJ_EVENT_GFX_CELIO
+    [OBJ_EVENT_GFX_TEACHY_TV_HOST / 2]          = 0x00, // OBJ_EVENT_GFX_GYM_GUY
+    [OBJ_EVENT_GFX_ITEM_BALL / 2]               = 0x33, // OBJ_EVENT_GFX_TOWN_MAP
+    [OBJ_EVENT_GFX_POKEDEX / 2]                 = 0x33, // OBJ_EVENT_GFX_CUT_TREE
+    [OBJ_EVENT_GFX_ROCK_SMASH_ROCK / 2]         = 0x33, // OBJ_EVENT_GFX_STRENGTH_BOULDER
+    [OBJ_EVENT_GFX_FOSSIL / 2]                  = 0x33, // OBJ_EVENT_GFX_RUBY
+    [OBJ_EVENT_GFX_SAPPHIRE / 2]                = 0x33, // OBJ_EVENT_GFX_OLD_AMBER
+    [OBJ_EVENT_GFX_GYM_SIGN / 2]                = 0x33, // OBJ_EVENT_GFX_SIGN
+    [OBJ_EVENT_GFX_TRAINER_TIPS / 2]            = 0x33, // OBJ_EVENT_GFX_CLIPBOARD
+    [OBJ_EVENT_GFX_METEORITE / 2]               = 0x33, // OBJ_EVENT_GFX_LAPRAS_DOLL
+    [OBJ_EVENT_GFX_SEAGALLOP / 2]               = 0x23, // OBJ_EVENT_GFX_SNORLAX
+    [OBJ_EVENT_GFX_SPEAROW / 2]                 = 0x22, // OBJ_EVENT_GFX_CUBONE
+    [OBJ_EVENT_GFX_POLIWRATH / 2]               = 0x22, // OBJ_EVENT_GFX_CLEFAIRY
+    [OBJ_EVENT_GFX_PIDGEOT / 2]                 = 0x22, // OBJ_EVENT_GFX_JIGGLYPUFF
+    [OBJ_EVENT_GFX_PIDGEY / 2]                  = 0x22, // OBJ_EVENT_GFX_CHANSEY
+    [OBJ_EVENT_GFX_OMANYTE / 2]                 = 0x22, // OBJ_EVENT_GFX_KANGASKHAN
+    [OBJ_EVENT_GFX_PIKACHU / 2]                 = 0x22, // OBJ_EVENT_GFX_PSYDUCK
+    [OBJ_EVENT_GFX_NIDORAN_F / 2]               = 0x22, // OBJ_EVENT_GFX_NIDORAN_M
+    [OBJ_EVENT_GFX_NIDORINO / 2]                = 0x22, // OBJ_EVENT_GFX_MEOWTH
+    [OBJ_EVENT_GFX_SEEL / 2]                    = 0x22, // OBJ_EVENT_GFX_VOLTORB
+    [OBJ_EVENT_GFX_SLOWPOKE / 2]                = 0x22, // OBJ_EVENT_GFX_SLOWBRO
+    [OBJ_EVENT_GFX_MACHOP / 2]                  = 0x22, // OBJ_EVENT_GFX_WIGGLYTUFF
+    [OBJ_EVENT_GFX_DODUO / 2]                   = 0x22, // OBJ_EVENT_GFX_FEAROW
+    [OBJ_EVENT_GFX_MACHOKE / 2]                 = 0x22, // OBJ_EVENT_GFX_LAPRAS
+    [OBJ_EVENT_GFX_ZAPDOS / 2]                  = 0x22, // OBJ_EVENT_GFX_MOLTRES
+    [OBJ_EVENT_GFX_ARTICUNO / 2]                = 0x22, // OBJ_EVENT_GFX_MEWTWO
+    [OBJ_EVENT_GFX_MEW / 2]                     = 0x22, // OBJ_EVENT_GFX_ENTEI
+    [OBJ_EVENT_GFX_SUICUNE / 2]                 = 0x22, // OBJ_EVENT_GFX_RAIKOU
+    [OBJ_EVENT_GFX_LUGIA / 2]                   = 0x22, // OBJ_EVENT_GFX_HO_OH
+    [OBJ_EVENT_GFX_CELEBI / 2]                  = 0x22, // OBJ_EVENT_GFX_KABUTO
+    [OBJ_EVENT_GFX_DEOXYS_D / 2]                = 0x22, // OBJ_EVENT_GFX_DEOXYS_A
+    [OBJ_EVENT_GFX_DEOXYS_N / 2]                = 0x32, // OBJ_EVENT_GFX_SS_ANNE
 };
 
 void DynamicPlaceholderTextUtil_Reset(void)
diff --git a/src/field_specials.c b/src/field_specials.c
index d9d15748a..6554f6116 100644
--- a/src/field_specials.c
+++ b/src/field_specials.c
@@ -41,7 +41,6 @@
 #include "constants/songs.h"
 #include "constants/species.h"
 #include "constants/items.h"
-#include "constants/object_events.h"
 #include "constants/maps.h"
 #include "constants/region_map.h"
 #include "constants/moves.h"
@@ -316,7 +315,7 @@ void Special_AnimatePcTurnOff()
 
 void SpawnCameraObject(void)
 {
-    u8 objectEventId = SpawnSpecialObjectEventParameterized(OBJECT_EVENT_GFX_YOUNGSTER, 8, OBJ_EVENT_ID_CAMERA, gSaveBlock1Ptr->pos.x + 7, gSaveBlock1Ptr->pos.y + 7, 3);
+    u8 objectEventId = SpawnSpecialObjectEventParameterized(OBJ_EVENT_GFX_YOUNGSTER, 8, OBJ_EVENT_ID_CAMERA, gSaveBlock1Ptr->pos.x + 7, gSaveBlock1Ptr->pos.y + 7, 3);
     gObjectEvents[objectEventId].invisible = TRUE;
     CameraObjectSetFollowedObjectId(gObjectEvents[objectEventId].spriteId);
 }
@@ -1529,8 +1528,8 @@ u8 ContextNpcGetTextColor(void)
     else
     {
         gfxId = gObjectEvents[gSelectedObjectEvent].graphicsId;
-        if (gfxId >= OBJECT_EVENT_GFX_VAR_0)
-            gfxId = VarGetObjectEventGraphicsId(gfxId - OBJECT_EVENT_GFX_VAR_0);
+        if (gfxId >= OBJ_EVENT_GFX_VAR_0)
+            gfxId = VarGetObjectEventGraphicsId(gfxId - OBJ_EVENT_GFX_VAR_0);
         return GetColorFromTextColorTable(gfxId);
     }
 }
diff --git a/src/fldeff_rocksmash.c b/src/fldeff_rocksmash.c
index baa51412b..058922f06 100644
--- a/src/fldeff_rocksmash.c
+++ b/src/fldeff_rocksmash.c
@@ -11,7 +11,7 @@
 #include "overworld.h"
 #include "event_object_movement.h"
 #include "constants/songs.h"
-#include "constants/object_events.h"
+#include "constants/event_objects.h"
 #include "constants/maps.h"
 
 static void task08_080C9820(u8 taskId);
@@ -104,7 +104,7 @@ static void sub_80C99A0(u8 taskId)
 
 bool8 SetUpFieldMove_RockSmash(void)
 {
-    if (CheckObjectGraphicsInFrontOfPlayer(OBJECT_EVENT_GFX_ROCK_SMASH_ROCK) == TRUE)
+    if (CheckObjectGraphicsInFrontOfPlayer(OBJ_EVENT_GFX_ROCK_SMASH_ROCK) == TRUE)
     {
         gFieldCallback2 = FieldCallback_PrepareFadeInFromMenu;
         gPostMenuFieldCallback = sub_80C9A10;
diff --git a/src/fldeff_strength.c b/src/fldeff_strength.c
index f3ddd8212..230b9c751 100644
--- a/src/fldeff_strength.c
+++ b/src/fldeff_strength.c
@@ -6,14 +6,14 @@
 #include "script.h"
 #include "fldeff.h"
 #include "event_scripts.h"
-#include "constants/object_events.h"
+#include "constants/event_objects.h"
 
 static void FldEff_UseStrength(void);
 static void sub_80D08A8(void);
 
 bool8 SetUpFieldMove_Strength(void)
 {
-    if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_SURFING) || CheckObjectGraphicsInFrontOfPlayer(OBJECT_EVENT_GFX_STRENGTH_BOULDER) != TRUE)
+    if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_SURFING) || CheckObjectGraphicsInFrontOfPlayer(OBJ_EVENT_GFX_STRENGTH_BOULDER) != TRUE)
     {
     	return FALSE;
     }
diff --git a/src/rfu_union_tool.c b/src/rfu_union_tool.c
index 8d90da201..132ac7b85 100644
--- a/src/rfu_union_tool.c
+++ b/src/rfu_union_tool.c
@@ -9,7 +9,7 @@
 #include "constants/flags.h"
 #include "constants/event_object_movement.h"
 #include "constants/union_room.h"
-#include "constants/object_events.h"
+#include "constants/event_objects.h"
 
 static EWRAM_DATA struct UnionObj * UnionObjWork = NULL;
 static EWRAM_DATA u32 sUnionObjRefreshTimer = 0;
@@ -20,24 +20,24 @@ static void UnionPartnerObjectSetFacing(s32 member, s32 group, u8 direction);
 
 static const u8 sUnionObjectEventGfxIds[][10] = {
     [MALE]   = {
-        OBJECT_EVENT_GFX_COOLTRAINER_M,
-        OBJECT_EVENT_GFX_BLACKBELT,
-        OBJECT_EVENT_GFX_CAMPER,
-        OBJECT_EVENT_GFX_YOUNGSTER,
-        OBJECT_EVENT_GFX_BOY,
-        OBJECT_EVENT_GFX_BUG_CATCHER,
-        OBJECT_EVENT_GFX_MAN,
-        OBJECT_EVENT_GFX_ROCKER
+        OBJ_EVENT_GFX_COOLTRAINER_M,
+        OBJ_EVENT_GFX_BLACKBELT,
+        OBJ_EVENT_GFX_CAMPER,
+        OBJ_EVENT_GFX_YOUNGSTER,
+        OBJ_EVENT_GFX_BOY,
+        OBJ_EVENT_GFX_BUG_CATCHER,
+        OBJ_EVENT_GFX_MAN,
+        OBJ_EVENT_GFX_ROCKER
     },
     [FEMALE] = {
-        OBJECT_EVENT_GFX_COOLTRAINER_F,
-        OBJECT_EVENT_GFX_CHANNELER,
-        OBJECT_EVENT_GFX_PICNICKER,
-        OBJECT_EVENT_GFX_LASS,
-        OBJECT_EVENT_GFX_WOMAN_1,
-        OBJECT_EVENT_GFX_BATTLE_GIRL,
-        OBJECT_EVENT_GFX_WOMAN_2,
-        OBJECT_EVENT_GFX_BEAUTY
+        OBJ_EVENT_GFX_COOLTRAINER_F,
+        OBJ_EVENT_GFX_CHANNELER,
+        OBJ_EVENT_GFX_PICNICKER,
+        OBJ_EVENT_GFX_LASS,
+        OBJ_EVENT_GFX_WOMAN_1,
+        OBJ_EVENT_GFX_BATTLE_GIRL,
+        OBJ_EVENT_GFX_WOMAN_2,
+        OBJ_EVENT_GFX_BEAUTY
     }
 };
 
@@ -440,7 +440,7 @@ void CreateGroupMemberObjectsInvisible(u8 * sprite_ids, s32 group)
     for (i = 0; i < 5; i++)
     {
         s32 obj_id = 5 * group + i;
-        sprite_ids[obj_id] = sprite_new(OBJECT_EVENT_GFX_MAN, obj_id - 0x38, sUnionPartnerCoords[group][0] + sFacingDirectionOffsets[i][0], sUnionPartnerCoords[group][1] + sFacingDirectionOffsets[i][1], 3, 1);
+        sprite_ids[obj_id] = sprite_new(OBJ_EVENT_GFX_MAN, obj_id - 0x38, sUnionPartnerCoords[group][0] + sFacingDirectionOffsets[i][0], sUnionPartnerCoords[group][1] + sFacingDirectionOffsets[i][1], 3, 1);
         RfuUnionObjectToggleInvisibility(obj_id - 0x38, TRUE);
     }
 }
diff --git a/src/trainer_see.c b/src/trainer_see.c
index 2bf8aa504..06fd60442 100644
--- a/src/trainer_see.c
+++ b/src/trainer_see.c
@@ -10,7 +10,6 @@
 #include "constants/battle_setup.h"
 #include "constants/event_object_movement.h"
 #include "constants/event_objects.h"
-#include "constants/object_events.h"
 
 typedef u8 (*TrainerApproachFunc)(struct ObjectEvent *, s16, s16, s16);
 typedef bool8 (*TrainerSeeFunc)(u8, struct Task *, struct ObjectEvent *);
@@ -452,7 +451,7 @@ static bool8 TrainerSeeFunc_OffscreenAboveTrainerCreateCameraObj(u8 taskId, stru
 {
     int specialObjectId;
     task->tData5 = 0;
-    specialObjectId = SpawnSpecialObjectEventParameterized(OBJECT_EVENT_GFX_YOUNGSTER, 7, OBJ_EVENT_ID_CAMERA, gSaveBlock1Ptr->pos.x + 7, gSaveBlock1Ptr->pos.y + 7, 3);
+    specialObjectId = SpawnSpecialObjectEventParameterized(OBJ_EVENT_GFX_YOUNGSTER, 7, OBJ_EVENT_ID_CAMERA, gSaveBlock1Ptr->pos.x + 7, gSaveBlock1Ptr->pos.y + 7, 3);
     gObjectEvents[specialObjectId].invisible = TRUE;
     CameraObjectSetFollowedObjectId(gObjectEvents[specialObjectId].spriteId);
     task->tFuncId++;
diff --git a/src/trainer_tower.c b/src/trainer_tower.c
index f4e9689a1..0c673b5aa 100644
--- a/src/trainer_tower.c
+++ b/src/trainer_tower.c
@@ -25,7 +25,7 @@
 #include "constants/layouts.h"
 #include "constants/trainers.h"
 #include "constants/facility_trainer_classes.h"
-#include "constants/object_events.h"
+#include "constants/event_objects.h"
 #include "constants/trainer_tower.h"
 
 #define CURR_FLOOR sTrainerTowerState->unk_0004.floors[sTrainerTowerState->floorIdx]
@@ -112,102 +112,102 @@ extern const u8 gText_XMinYZSec[];
 extern const u8 *const gTrainerTowerChallengeTypeTexts[];
 
 static const struct SinglesTrainerInfo sSingleBattleTrainerInfo[] = {
-    {OBJECT_EVENT_GFX_WOMAN_2,        FACILITY_CLASS_AROMA_LADY,       FEMALE},
-    {OBJECT_EVENT_GFX_HIKER,          FACILITY_CLASS_RUIN_MANIAC,      MALE},
-    {OBJECT_EVENT_GFX_TUBER_F,        FACILITY_CLASS_TUBER,            FEMALE},
-    {OBJECT_EVENT_GFX_TUBER_M_2,      FACILITY_CLASS_TUBER_2,          MALE},
-    {OBJECT_EVENT_GFX_COOLTRAINER_M,  FACILITY_CLASS_COOLTRAINER,      MALE},
-    {OBJECT_EVENT_GFX_COOLTRAINER_F,  FACILITY_CLASS_COOLTRAINER_2,    FEMALE},
-    {OBJECT_EVENT_GFX_SUPER_NERD,     FACILITY_CLASS_HEX_MANIAC,       MALE},
-    {OBJECT_EVENT_GFX_WOMAN_2,        FACILITY_CLASS_LADY,             FEMALE},
-    {OBJECT_EVENT_GFX_BEAUTY,         FACILITY_CLASS_BEAUTY,           FEMALE},
-    {OBJECT_EVENT_GFX_BOY,            FACILITY_CLASS_RICH_BOY,         MALE},
-    {OBJECT_EVENT_GFX_SUPER_NERD,     FACILITY_CLASS_POKEMANIAC,       MALE},
-    {OBJECT_EVENT_GFX_SWIMMER_M_LAND, FACILITY_CLASS_SWIMMER_MALE,     MALE},
-    {OBJECT_EVENT_GFX_BLACKBELT,      FACILITY_CLASS_BLACK_BELT,       MALE},
-    {OBJECT_EVENT_GFX_ROCKER,         FACILITY_CLASS_GUITARIST,        MALE},
-    {OBJECT_EVENT_GFX_ROCKER,         FACILITY_CLASS_KINDLER,          MALE},
-    {OBJECT_EVENT_GFX_CAMPER,         FACILITY_CLASS_CAMPER,           MALE},
-    {OBJECT_EVENT_GFX_SUPER_NERD,     FACILITY_CLASS_BUG_MANIAC,       MALE},
-    {OBJECT_EVENT_GFX_BOY,            FACILITY_CLASS_PSYCHIC,          MALE},
-    {OBJECT_EVENT_GFX_WOMAN_1,        FACILITY_CLASS_PSYCHIC_2,        FEMALE},
-    {OBJECT_EVENT_GFX_GENTLEMAN,      FACILITY_CLASS_GENTLEMAN,        MALE},
-    {OBJECT_EVENT_GFX_BOY,            FACILITY_CLASS_SCHOOL_KID,       MALE},
-    {OBJECT_EVENT_GFX_WOMAN_1,        FACILITY_CLASS_SCHOOL_KID_2,     FEMALE},
-    {OBJECT_EVENT_GFX_BALDING_MAN,    FACILITY_CLASS_POKEFAN,          MALE},
-    {OBJECT_EVENT_GFX_WOMAN_3,        FACILITY_CLASS_POKEFAN_2,        FEMALE},
-    {OBJECT_EVENT_GFX_OLD_MAN_1,      FACILITY_CLASS_EXPERT,           MALE},
-    {OBJECT_EVENT_GFX_OLD_WOMAN,      FACILITY_CLASS_EXPERT_2,         FEMALE},
-    {OBJECT_EVENT_GFX_YOUNGSTER,      FACILITY_CLASS_YOUNGSTER,        MALE},
-    {OBJECT_EVENT_GFX_FISHER,         FACILITY_CLASS_FISHERMAN,        MALE},
-    {OBJECT_EVENT_GFX_COOLTRAINER_M,  FACILITY_CLASS_DRAGON_TAMER,     MALE},
-    {OBJECT_EVENT_GFX_ROCKER,         FACILITY_CLASS_BIRD_KEEPER,      MALE},
-    {OBJECT_EVENT_GFX_LITTLE_BOY,     FACILITY_CLASS_NINJA_BOY,        MALE},
-    {OBJECT_EVENT_GFX_BATTLE_GIRL,    FACILITY_CLASS_BATTLE_GIRL,      FEMALE},
-    {OBJECT_EVENT_GFX_BEAUTY,         FACILITY_CLASS_PARASOL_LADY,     FEMALE},
-    {OBJECT_EVENT_GFX_SWIMMER_F_LAND, FACILITY_CLASS_SWIMMER_FEMALE,   FEMALE},
-    {OBJECT_EVENT_GFX_PICNICKER,      FACILITY_CLASS_PICNICKER,        FEMALE},
-    {OBJECT_EVENT_GFX_SAILOR,         FACILITY_CLASS_SAILOR,           MALE},
-    {OBJECT_EVENT_GFX_FAT_MAN,        FACILITY_CLASS_COLLECTOR,        MALE},
-    {OBJECT_EVENT_GFX_MAN,            FACILITY_CLASS_PKMN_BREEDER,     MALE},
-    {OBJECT_EVENT_GFX_WOMAN_2,        FACILITY_CLASS_PKMN_BREEDER_2,   FEMALE},
-    {OBJECT_EVENT_GFX_CAMPER,         FACILITY_CLASS_PKMN_RANGER,      MALE},
-    {OBJECT_EVENT_GFX_PICNICKER,      FACILITY_CLASS_PKMN_RANGER_2,    FEMALE},
-    {OBJECT_EVENT_GFX_LASS,           FACILITY_CLASS_LASS,             FEMALE},
-    {OBJECT_EVENT_GFX_BUG_CATCHER,    FACILITY_CLASS_BUG_CATCHER,      MALE},
-    {OBJECT_EVENT_GFX_HIKER,          FACILITY_CLASS_HIKER,            MALE},
-    {OBJECT_EVENT_GFX_YOUNGSTER,      FACILITY_CLASS_YOUNGSTER_2,      MALE},
-    {OBJECT_EVENT_GFX_BUG_CATCHER,    FACILITY_CLASS_BUG_CATCHER_2,    MALE},
-    {OBJECT_EVENT_GFX_LASS,           FACILITY_CLASS_LASS_2,           FEMALE},
-    {OBJECT_EVENT_GFX_SAILOR,         FACILITY_CLASS_SAILOR_2,         MALE},
-    {OBJECT_EVENT_GFX_CAMPER,         FACILITY_CLASS_CAMPER_2,         MALE},
-    {OBJECT_EVENT_GFX_PICNICKER,      FACILITY_CLASS_PICNICKER_2,      FEMALE},
-    {OBJECT_EVENT_GFX_SUPER_NERD,     FACILITY_CLASS_POKEMANIAC_2,     MALE},
-    {OBJECT_EVENT_GFX_SUPER_NERD,     FACILITY_CLASS_SUPER_NERD,       MALE},
-    {OBJECT_EVENT_GFX_HIKER,          FACILITY_CLASS_HIKER_2,          MALE},
-    {OBJECT_EVENT_GFX_BIKER,          FACILITY_CLASS_BIKER,            MALE},
-    {OBJECT_EVENT_GFX_SUPER_NERD,     FACILITY_CLASS_BURGLAR,          MALE},
-    {OBJECT_EVENT_GFX_BALDING_MAN,    FACILITY_CLASS_ENGINEER,         MALE},
-    {OBJECT_EVENT_GFX_FISHER,         FACILITY_CLASS_FISHERMAN_2,      MALE},
-    {OBJECT_EVENT_GFX_SWIMMER_M_LAND, FACILITY_CLASS_SWIMMER_MALE_2,   MALE},
-    {OBJECT_EVENT_GFX_BIKER,          FACILITY_CLASS_CUE_BALL,         MALE},
-    {OBJECT_EVENT_GFX_OLD_MAN_1,      FACILITY_CLASS_GAMER,            MALE},
-    {OBJECT_EVENT_GFX_BEAUTY,         FACILITY_CLASS_BEAUTY_2,         FEMALE},
-    {OBJECT_EVENT_GFX_SWIMMER_F_LAND, FACILITY_CLASS_SWIMMER_FEMALE_2, FEMALE},
-    {OBJECT_EVENT_GFX_BOY,            FACILITY_CLASS_PSYCHIC_3,        MALE},
-    {OBJECT_EVENT_GFX_ROCKER,         FACILITY_CLASS_ROCKER,           MALE},
-    {OBJECT_EVENT_GFX_ROCKER,         FACILITY_CLASS_JUGGLER,          MALE},
-    {OBJECT_EVENT_GFX_MAN,            FACILITY_CLASS_TAMER,            MALE},
-    {OBJECT_EVENT_GFX_ROCKER,         FACILITY_CLASS_BIRD_KEEPER_2,    MALE},
-    {OBJECT_EVENT_GFX_BLACKBELT,      FACILITY_CLASS_BLACK_BELT_2,     MALE},
-    {OBJECT_EVENT_GFX_SCIENTIST,      FACILITY_CLASS_SCIENTIST,        MALE},
-    {OBJECT_EVENT_GFX_COOLTRAINER_M,  FACILITY_CLASS_COOLTRAINER_3,    MALE},
-    {OBJECT_EVENT_GFX_COOLTRAINER_F,  FACILITY_CLASS_COOLTRAINER_4,    FEMALE},
-    {OBJECT_EVENT_GFX_GENTLEMAN,      FACILITY_CLASS_GENTLEMAN_2,      MALE},
-    {OBJECT_EVENT_GFX_CHANNELER,      FACILITY_CLASS_CHANNELER,        FEMALE},
-    {OBJECT_EVENT_GFX_WOMAN_1,        FACILITY_CLASS_PSYCHIC_4,        FEMALE},
-    {OBJECT_EVENT_GFX_BATTLE_GIRL,    FACILITY_CLASS_CRUSH_GIRL,       FEMALE},
-    {OBJECT_EVENT_GFX_TUBER_F,        FACILITY_CLASS_TUBER_3,          FEMALE},
-    {OBJECT_EVENT_GFX_WOMAN_2,        FACILITY_CLASS_PKMN_BREEDER_3,   FEMALE},
-    {OBJECT_EVENT_GFX_CAMPER,         FACILITY_CLASS_PKMN_RANGER_3,    MALE},
-    {OBJECT_EVENT_GFX_PICNICKER,      FACILITY_CLASS_PKMN_RANGER_4,    FEMALE},
-    {OBJECT_EVENT_GFX_WOMAN_2,        FACILITY_CLASS_AROMA_LADY_2,     FEMALE},
-    {OBJECT_EVENT_GFX_HIKER,          FACILITY_CLASS_RUIN_MANIAC_2,    MALE},
-    {OBJECT_EVENT_GFX_WOMAN_2,        FACILITY_CLASS_LADY_2,           FEMALE},
-    {OBJECT_EVENT_GFX_LASS,           FACILITY_CLASS_PAINTER,          FEMALE}
+    {OBJ_EVENT_GFX_WOMAN_2,        FACILITY_CLASS_AROMA_LADY,       FEMALE},
+    {OBJ_EVENT_GFX_HIKER,          FACILITY_CLASS_RUIN_MANIAC,      MALE},
+    {OBJ_EVENT_GFX_TUBER_F,        FACILITY_CLASS_TUBER,            FEMALE},
+    {OBJ_EVENT_GFX_TUBER_M_2,      FACILITY_CLASS_TUBER_2,          MALE},
+    {OBJ_EVENT_GFX_COOLTRAINER_M,  FACILITY_CLASS_COOLTRAINER,      MALE},
+    {OBJ_EVENT_GFX_COOLTRAINER_F,  FACILITY_CLASS_COOLTRAINER_2,    FEMALE},
+    {OBJ_EVENT_GFX_SUPER_NERD,     FACILITY_CLASS_HEX_MANIAC,       MALE},
+    {OBJ_EVENT_GFX_WOMAN_2,        FACILITY_CLASS_LADY,             FEMALE},
+    {OBJ_EVENT_GFX_BEAUTY,         FACILITY_CLASS_BEAUTY,           FEMALE},
+    {OBJ_EVENT_GFX_BOY,            FACILITY_CLASS_RICH_BOY,         MALE},
+    {OBJ_EVENT_GFX_SUPER_NERD,     FACILITY_CLASS_POKEMANIAC,       MALE},
+    {OBJ_EVENT_GFX_SWIMMER_M_LAND, FACILITY_CLASS_SWIMMER_MALE,     MALE},
+    {OBJ_EVENT_GFX_BLACKBELT,      FACILITY_CLASS_BLACK_BELT,       MALE},
+    {OBJ_EVENT_GFX_ROCKER,         FACILITY_CLASS_GUITARIST,        MALE},
+    {OBJ_EVENT_GFX_ROCKER,         FACILITY_CLASS_KINDLER,          MALE},
+    {OBJ_EVENT_GFX_CAMPER,         FACILITY_CLASS_CAMPER,           MALE},
+    {OBJ_EVENT_GFX_SUPER_NERD,     FACILITY_CLASS_BUG_MANIAC,       MALE},
+    {OBJ_EVENT_GFX_BOY,            FACILITY_CLASS_PSYCHIC,          MALE},
+    {OBJ_EVENT_GFX_WOMAN_1,        FACILITY_CLASS_PSYCHIC_2,        FEMALE},
+    {OBJ_EVENT_GFX_GENTLEMAN,      FACILITY_CLASS_GENTLEMAN,        MALE},
+    {OBJ_EVENT_GFX_BOY,            FACILITY_CLASS_SCHOOL_KID,       MALE},
+    {OBJ_EVENT_GFX_WOMAN_1,        FACILITY_CLASS_SCHOOL_KID_2,     FEMALE},
+    {OBJ_EVENT_GFX_BALDING_MAN,    FACILITY_CLASS_POKEFAN,          MALE},
+    {OBJ_EVENT_GFX_WOMAN_3,        FACILITY_CLASS_POKEFAN_2,        FEMALE},
+    {OBJ_EVENT_GFX_OLD_MAN_1,      FACILITY_CLASS_EXPERT,           MALE},
+    {OBJ_EVENT_GFX_OLD_WOMAN,      FACILITY_CLASS_EXPERT_2,         FEMALE},
+    {OBJ_EVENT_GFX_YOUNGSTER,      FACILITY_CLASS_YOUNGSTER,        MALE},
+    {OBJ_EVENT_GFX_FISHER,         FACILITY_CLASS_FISHERMAN,        MALE},
+    {OBJ_EVENT_GFX_COOLTRAINER_M,  FACILITY_CLASS_DRAGON_TAMER,     MALE},
+    {OBJ_EVENT_GFX_ROCKER,         FACILITY_CLASS_BIRD_KEEPER,      MALE},
+    {OBJ_EVENT_GFX_LITTLE_BOY,     FACILITY_CLASS_NINJA_BOY,        MALE},
+    {OBJ_EVENT_GFX_BATTLE_GIRL,    FACILITY_CLASS_BATTLE_GIRL,      FEMALE},
+    {OBJ_EVENT_GFX_BEAUTY,         FACILITY_CLASS_PARASOL_LADY,     FEMALE},
+    {OBJ_EVENT_GFX_SWIMMER_F_LAND, FACILITY_CLASS_SWIMMER_FEMALE,   FEMALE},
+    {OBJ_EVENT_GFX_PICNICKER,      FACILITY_CLASS_PICNICKER,        FEMALE},
+    {OBJ_EVENT_GFX_SAILOR,         FACILITY_CLASS_SAILOR,           MALE},
+    {OBJ_EVENT_GFX_FAT_MAN,        FACILITY_CLASS_COLLECTOR,        MALE},
+    {OBJ_EVENT_GFX_MAN,            FACILITY_CLASS_PKMN_BREEDER,     MALE},
+    {OBJ_EVENT_GFX_WOMAN_2,        FACILITY_CLASS_PKMN_BREEDER_2,   FEMALE},
+    {OBJ_EVENT_GFX_CAMPER,         FACILITY_CLASS_PKMN_RANGER,      MALE},
+    {OBJ_EVENT_GFX_PICNICKER,      FACILITY_CLASS_PKMN_RANGER_2,    FEMALE},
+    {OBJ_EVENT_GFX_LASS,           FACILITY_CLASS_LASS,             FEMALE},
+    {OBJ_EVENT_GFX_BUG_CATCHER,    FACILITY_CLASS_BUG_CATCHER,      MALE},
+    {OBJ_EVENT_GFX_HIKER,          FACILITY_CLASS_HIKER,            MALE},
+    {OBJ_EVENT_GFX_YOUNGSTER,      FACILITY_CLASS_YOUNGSTER_2,      MALE},
+    {OBJ_EVENT_GFX_BUG_CATCHER,    FACILITY_CLASS_BUG_CATCHER_2,    MALE},
+    {OBJ_EVENT_GFX_LASS,           FACILITY_CLASS_LASS_2,           FEMALE},
+    {OBJ_EVENT_GFX_SAILOR,         FACILITY_CLASS_SAILOR_2,         MALE},
+    {OBJ_EVENT_GFX_CAMPER,         FACILITY_CLASS_CAMPER_2,         MALE},
+    {OBJ_EVENT_GFX_PICNICKER,      FACILITY_CLASS_PICNICKER_2,      FEMALE},
+    {OBJ_EVENT_GFX_SUPER_NERD,     FACILITY_CLASS_POKEMANIAC_2,     MALE},
+    {OBJ_EVENT_GFX_SUPER_NERD,     FACILITY_CLASS_SUPER_NERD,       MALE},
+    {OBJ_EVENT_GFX_HIKER,          FACILITY_CLASS_HIKER_2,          MALE},
+    {OBJ_EVENT_GFX_BIKER,          FACILITY_CLASS_BIKER,            MALE},
+    {OBJ_EVENT_GFX_SUPER_NERD,     FACILITY_CLASS_BURGLAR,          MALE},
+    {OBJ_EVENT_GFX_BALDING_MAN,    FACILITY_CLASS_ENGINEER,         MALE},
+    {OBJ_EVENT_GFX_FISHER,         FACILITY_CLASS_FISHERMAN_2,      MALE},
+    {OBJ_EVENT_GFX_SWIMMER_M_LAND, FACILITY_CLASS_SWIMMER_MALE_2,   MALE},
+    {OBJ_EVENT_GFX_BIKER,          FACILITY_CLASS_CUE_BALL,         MALE},
+    {OBJ_EVENT_GFX_OLD_MAN_1,      FACILITY_CLASS_GAMER,            MALE},
+    {OBJ_EVENT_GFX_BEAUTY,         FACILITY_CLASS_BEAUTY_2,         FEMALE},
+    {OBJ_EVENT_GFX_SWIMMER_F_LAND, FACILITY_CLASS_SWIMMER_FEMALE_2, FEMALE},
+    {OBJ_EVENT_GFX_BOY,            FACILITY_CLASS_PSYCHIC_3,        MALE},
+    {OBJ_EVENT_GFX_ROCKER,         FACILITY_CLASS_ROCKER,           MALE},
+    {OBJ_EVENT_GFX_ROCKER,         FACILITY_CLASS_JUGGLER,          MALE},
+    {OBJ_EVENT_GFX_MAN,            FACILITY_CLASS_TAMER,            MALE},
+    {OBJ_EVENT_GFX_ROCKER,         FACILITY_CLASS_BIRD_KEEPER_2,    MALE},
+    {OBJ_EVENT_GFX_BLACKBELT,      FACILITY_CLASS_BLACK_BELT_2,     MALE},
+    {OBJ_EVENT_GFX_SCIENTIST,      FACILITY_CLASS_SCIENTIST,        MALE},
+    {OBJ_EVENT_GFX_COOLTRAINER_M,  FACILITY_CLASS_COOLTRAINER_3,    MALE},
+    {OBJ_EVENT_GFX_COOLTRAINER_F,  FACILITY_CLASS_COOLTRAINER_4,    FEMALE},
+    {OBJ_EVENT_GFX_GENTLEMAN,      FACILITY_CLASS_GENTLEMAN_2,      MALE},
+    {OBJ_EVENT_GFX_CHANNELER,      FACILITY_CLASS_CHANNELER,        FEMALE},
+    {OBJ_EVENT_GFX_WOMAN_1,        FACILITY_CLASS_PSYCHIC_4,        FEMALE},
+    {OBJ_EVENT_GFX_BATTLE_GIRL,    FACILITY_CLASS_CRUSH_GIRL,       FEMALE},
+    {OBJ_EVENT_GFX_TUBER_F,        FACILITY_CLASS_TUBER_3,          FEMALE},
+    {OBJ_EVENT_GFX_WOMAN_2,        FACILITY_CLASS_PKMN_BREEDER_3,   FEMALE},
+    {OBJ_EVENT_GFX_CAMPER,         FACILITY_CLASS_PKMN_RANGER_3,    MALE},
+    {OBJ_EVENT_GFX_PICNICKER,      FACILITY_CLASS_PKMN_RANGER_4,    FEMALE},
+    {OBJ_EVENT_GFX_WOMAN_2,        FACILITY_CLASS_AROMA_LADY_2,     FEMALE},
+    {OBJ_EVENT_GFX_HIKER,          FACILITY_CLASS_RUIN_MANIAC_2,    MALE},
+    {OBJ_EVENT_GFX_WOMAN_2,        FACILITY_CLASS_LADY_2,           FEMALE},
+    {OBJ_EVENT_GFX_LASS,           FACILITY_CLASS_PAINTER,          FEMALE}
 };
 
 static const struct DoublesTrainerInfo sDoubleBattleTrainerInfo[] = {
-    {OBJECT_EVENT_GFX_BEAUTY,         OBJECT_EVENT_GFX_WOMAN_1,        FACILITY_CLASS_SR_AND_JR,      FEMALE, FEMALE},
-    {OBJECT_EVENT_GFX_LITTLE_GIRL,    OBJECT_EVENT_GFX_LITTLE_GIRL,    FACILITY_CLASS_TWINS,          FEMALE, FEMALE},
-    {OBJECT_EVENT_GFX_BEAUTY,         OBJECT_EVENT_GFX_MAN,            FACILITY_CLASS_YOUNG_COUPLE,   FEMALE, MALE},
-    {OBJECT_EVENT_GFX_OLD_MAN_1,      OBJECT_EVENT_GFX_OLD_WOMAN,      FACILITY_CLASS_OLD_COUPLE,     MALE, FEMALE},
-    {OBJECT_EVENT_GFX_TUBER_M_2,      OBJECT_EVENT_GFX_SWIMMER_F_LAND, FACILITY_CLASS_SIS_AND_BRO,    MALE, FEMALE},
-    {OBJECT_EVENT_GFX_LITTLE_GIRL,    OBJECT_EVENT_GFX_LITTLE_GIRL,    FACILITY_CLASS_TWINS_2,        FEMALE, FEMALE},
-    {OBJECT_EVENT_GFX_COOLTRAINER_M,  OBJECT_EVENT_GFX_COOLTRAINER_F,  FACILITY_CLASS_COOL_COUPLE,    MALE, FEMALE},
-    {OBJECT_EVENT_GFX_BEAUTY,         OBJECT_EVENT_GFX_MAN,            FACILITY_CLASS_YOUNG_COUPLE_2, FEMALE, MALE},
-    {OBJECT_EVENT_GFX_BATTLE_GIRL,    OBJECT_EVENT_GFX_BLACKBELT,      FACILITY_CLASS_CRUSH_KIN,      FEMALE, MALE},
-    {OBJECT_EVENT_GFX_SWIMMER_F_LAND, OBJECT_EVENT_GFX_TUBER_M_2,      FACILITY_CLASS_SIS_AND_BRO_2,  FEMALE, MALE}
+    {OBJ_EVENT_GFX_BEAUTY,         OBJ_EVENT_GFX_WOMAN_1,        FACILITY_CLASS_SR_AND_JR,      FEMALE, FEMALE},
+    {OBJ_EVENT_GFX_LITTLE_GIRL,    OBJ_EVENT_GFX_LITTLE_GIRL,    FACILITY_CLASS_TWINS,          FEMALE, FEMALE},
+    {OBJ_EVENT_GFX_BEAUTY,         OBJ_EVENT_GFX_MAN,            FACILITY_CLASS_YOUNG_COUPLE,   FEMALE, MALE},
+    {OBJ_EVENT_GFX_OLD_MAN_1,      OBJ_EVENT_GFX_OLD_WOMAN,      FACILITY_CLASS_OLD_COUPLE,     MALE, FEMALE},
+    {OBJ_EVENT_GFX_TUBER_M_2,      OBJ_EVENT_GFX_SWIMMER_F_LAND, FACILITY_CLASS_SIS_AND_BRO,    MALE, FEMALE},
+    {OBJ_EVENT_GFX_LITTLE_GIRL,    OBJ_EVENT_GFX_LITTLE_GIRL,    FACILITY_CLASS_TWINS_2,        FEMALE, FEMALE},
+    {OBJ_EVENT_GFX_COOLTRAINER_M,  OBJ_EVENT_GFX_COOLTRAINER_F,  FACILITY_CLASS_COOL_COUPLE,    MALE, FEMALE},
+    {OBJ_EVENT_GFX_BEAUTY,         OBJ_EVENT_GFX_MAN,            FACILITY_CLASS_YOUNG_COUPLE_2, FEMALE, MALE},
+    {OBJ_EVENT_GFX_BATTLE_GIRL,    OBJ_EVENT_GFX_BLACKBELT,      FACILITY_CLASS_CRUSH_KIN,      FEMALE, MALE},
+    {OBJ_EVENT_GFX_SWIMMER_F_LAND, OBJ_EVENT_GFX_TUBER_M_2,      FACILITY_CLASS_SIS_AND_BRO_2,  FEMALE, MALE}
 };
 
 static const struct TrainerEncounterMusicPairs sTrainerEncounterMusicLUT[105] = {
@@ -581,7 +581,7 @@ static void SetTrainerTowerNPCGraphics(void)
         if (i != NELEMS(sSingleBattleTrainerInfo))
             trainerGfx1 = sSingleBattleTrainerInfo[i].objGfx;
         else
-            trainerGfx1 = OBJECT_EVENT_GFX_YOUNGSTER;
+            trainerGfx1 = OBJ_EVENT_GFX_YOUNGSTER;
 
         VarSet(VAR_OBJ_GFX_ID_1, trainerGfx1);
         break;
@@ -599,8 +599,8 @@ static void SetTrainerTowerNPCGraphics(void)
         }
         else
         {
-            trainerGfx1  = OBJECT_EVENT_GFX_YOUNGSTER;
-            trainerGfx2 = OBJECT_EVENT_GFX_YOUNGSTER;
+            trainerGfx1  = OBJ_EVENT_GFX_YOUNGSTER;
+            trainerGfx2 = OBJ_EVENT_GFX_YOUNGSTER;
         }
         VarSet(VAR_OBJ_GFX_ID_0, trainerGfx1);
         VarSet(VAR_OBJ_GFX_ID_3, trainerGfx2);
@@ -618,7 +618,7 @@ static void SetTrainerTowerNPCGraphics(void)
             if (i != NELEMS(sSingleBattleTrainerInfo))
                 trainerGfx1 = sSingleBattleTrainerInfo[i].objGfx;
             else
-                trainerGfx1 = OBJECT_EVENT_GFX_YOUNGSTER;
+                trainerGfx1 = OBJ_EVENT_GFX_YOUNGSTER;
 
             switch (j)
             {
diff --git a/src/vs_seeker.c b/src/vs_seeker.c
index e79c2cf22..135a11575 100644
--- a/src/vs_seeker.c
+++ b/src/vs_seeker.c
@@ -21,7 +21,7 @@
 #include "field_player_avatar.h"
 #include "vs_seeker.h"
 #include "constants/event_object_movement.h"
-#include "constants/object_events.h"
+#include "constants/event_objects.h"
 #include "constants/trainers.h"
 #include "constants/maps.h"
 #include "constants/items.h"
@@ -1129,32 +1129,32 @@ static u8 GetRunningBehaviorFromGraphicsId(u8 graphicsId)
 {
     switch (graphicsId)
     {
-        case OBJECT_EVENT_GFX_LITTLE_GIRL:
-        case OBJECT_EVENT_GFX_YOUNGSTER:
-        case OBJECT_EVENT_GFX_BOY:
-        case OBJECT_EVENT_GFX_BUG_CATCHER:
-        case OBJECT_EVENT_GFX_LASS:
-        case OBJECT_EVENT_GFX_WOMAN_1:
-        case OBJECT_EVENT_GFX_BATTLE_GIRL:
-        case OBJECT_EVENT_GFX_MAN:
-        case OBJECT_EVENT_GFX_ROCKER:
-        case OBJECT_EVENT_GFX_WOMAN_2:
-        case OBJECT_EVENT_GFX_BEAUTY:
-        case OBJECT_EVENT_GFX_BALDING_MAN:
-        case OBJECT_EVENT_GFX_TUBER_F:
-        case OBJECT_EVENT_GFX_CAMPER:
-        case OBJECT_EVENT_GFX_PICNICKER:
-        case OBJECT_EVENT_GFX_COOLTRAINER_M:
-        case OBJECT_EVENT_GFX_COOLTRAINER_F:
-        case OBJECT_EVENT_GFX_SWIMMER_M_LAND:
-        case OBJECT_EVENT_GFX_SWIMMER_F_LAND:
-        case OBJECT_EVENT_GFX_BLACKBELT:
-        case OBJECT_EVENT_GFX_HIKER:
-        case OBJECT_EVENT_GFX_SAILOR:
+        case OBJ_EVENT_GFX_LITTLE_GIRL:
+        case OBJ_EVENT_GFX_YOUNGSTER:
+        case OBJ_EVENT_GFX_BOY:
+        case OBJ_EVENT_GFX_BUG_CATCHER:
+        case OBJ_EVENT_GFX_LASS:
+        case OBJ_EVENT_GFX_WOMAN_1:
+        case OBJ_EVENT_GFX_BATTLE_GIRL:
+        case OBJ_EVENT_GFX_MAN:
+        case OBJ_EVENT_GFX_ROCKER:
+        case OBJ_EVENT_GFX_WOMAN_2:
+        case OBJ_EVENT_GFX_BEAUTY:
+        case OBJ_EVENT_GFX_BALDING_MAN:
+        case OBJ_EVENT_GFX_TUBER_F:
+        case OBJ_EVENT_GFX_CAMPER:
+        case OBJ_EVENT_GFX_PICNICKER:
+        case OBJ_EVENT_GFX_COOLTRAINER_M:
+        case OBJ_EVENT_GFX_COOLTRAINER_F:
+        case OBJ_EVENT_GFX_SWIMMER_M_LAND:
+        case OBJ_EVENT_GFX_SWIMMER_F_LAND:
+        case OBJ_EVENT_GFX_BLACKBELT:
+        case OBJ_EVENT_GFX_HIKER:
+        case OBJ_EVENT_GFX_SAILOR:
             return 0x4e;
-        case OBJECT_EVENT_GFX_TUBER_M_1:
-        case OBJECT_EVENT_GFX_SWIMMER_M_WATER:
-        case OBJECT_EVENT_GFX_SWIMMER_F_WATER:
+        case OBJ_EVENT_GFX_TUBER_M_1:
+        case OBJ_EVENT_GFX_SWIMMER_M_WATER:
+        case OBJ_EVENT_GFX_SWIMMER_F_WATER:
             return 0x4f;
         default:
             return 0x4d;