From 120fbb0578a0658789434e1f40522ed8454caad3 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Mon, 7 Aug 2023 00:44:46 -0400 Subject: [PATCH] More PALSLOT constant usage --- .../object_event_graphics_info.h | 308 +++++++++--------- src/field_effect_helpers.c | 10 +- 2 files changed, 156 insertions(+), 162 deletions(-) diff --git a/src/data/object_events/object_event_graphics_info.h b/src/data/object_events/object_event_graphics_info.h index 3b1671d5a..b4a6541f6 100644 --- a/src/data/object_events/object_event_graphics_info.h +++ b/src/data/object_events/object_event_graphics_info.h @@ -5,7 +5,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RedNormal = { .size = 512, .width = 16, .height = 32, - .paletteSlot = 0, + .paletteSlot = PALSLOT_PLAYER, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -24,7 +24,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RedBike = { .size = 512, .width = 32, .height = 32, - .paletteSlot = 0, + .paletteSlot = PALSLOT_PLAYER, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -43,7 +43,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RedSurf = { .size = 256, .width = 16, .height = 32, - .paletteSlot = 0, + .paletteSlot = PALSLOT_PLAYER, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = TRUE, @@ -62,7 +62,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RedFieldMove = { .size = 256, .width = 16, .height = 32, - .paletteSlot = 0, + .paletteSlot = PALSLOT_PLAYER, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -81,7 +81,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Policeman = { .size = 256, .width = 16, .height = 32, - .paletteSlot = 2, + .paletteSlot = PALSLOT_NPC_1, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -100,7 +100,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RSBrendan = { .size = 256, .width = 16, .height = 32, - .paletteSlot = 5, + .paletteSlot = PALSLOT_NPC_4, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -119,7 +119,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RSMay = { .size = 256, .width = 16, .height = 32, - .paletteSlot = 5, + .paletteSlot = PALSLOT_NPC_4, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -138,7 +138,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LittleBoy = { .size = 128, .width = 16, .height = 16, - .paletteSlot = 5, + .paletteSlot = PALSLOT_NPC_4, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -157,7 +157,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LittleGirl = { .size = 128, .width = 16, .height = 16, - .paletteSlot = 3, + .paletteSlot = PALSLOT_NPC_2, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -176,7 +176,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SittingBoy = { .size = 256, .width = 16, .height = 32, - .paletteSlot = 5, + .paletteSlot = PALSLOT_NPC_4, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -195,7 +195,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Lass = { .size = 256, .width = 16, .height = 32, - .paletteSlot = 2, + .paletteSlot = PALSLOT_NPC_1, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -214,7 +214,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Youngster = { .size = 256, .width = 16, .height = 32, - .paletteSlot = 2, + .paletteSlot = PALSLOT_NPC_1, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -233,7 +233,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Woman1 = { .size = 256, .width = 16, .height = 32, - .paletteSlot = 4, + .paletteSlot = PALSLOT_NPC_3, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -252,7 +252,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Woman3 = { .size = 256, .width = 16, .height = 32, - .paletteSlot = 5, + .paletteSlot = PALSLOT_NPC_4, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -271,7 +271,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Boy = { .size = 256, .width = 16, .height = 32, - .paletteSlot = 4, + .paletteSlot = PALSLOT_NPC_3, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -290,7 +290,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BattleGirl = { .size = 256, .width = 16, .height = 32, - .paletteSlot = 5, + .paletteSlot = PALSLOT_NPC_4, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -309,7 +309,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BugCatcher = { .size = 256, .width = 16, .height = 32, - .paletteSlot = 4, + .paletteSlot = PALSLOT_NPC_3, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -328,7 +328,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_FatMan = { .size = 256, .width = 16, .height = 32, - .paletteSlot = 5, + .paletteSlot = PALSLOT_NPC_4, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -347,7 +347,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BaldingMan = { .size = 256, .width = 16, .height = 32, - .paletteSlot = 5, + .paletteSlot = PALSLOT_NPC_4, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -366,7 +366,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Woman2 = { .size = 256, .width = 16, .height = 32, - .paletteSlot = 5, + .paletteSlot = PALSLOT_NPC_4, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -385,7 +385,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_OldMan1 = { .size = 256, .width = 16, .height = 32, - .paletteSlot = 3, + .paletteSlot = PALSLOT_NPC_2, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -404,7 +404,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_WorkerM = { .size = 256, .width = 16, .height = 32, - .paletteSlot = 5, + .paletteSlot = PALSLOT_NPC_4, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -423,7 +423,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_WorkerF = { .size = 256, .width = 16, .height = 32, - .paletteSlot = 4, + .paletteSlot = PALSLOT_NPC_3, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -442,7 +442,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Beauty = { .size = 256, .width = 16, .height = 32, - .paletteSlot = 2, + .paletteSlot = PALSLOT_NPC_1, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -461,7 +461,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Chef = { .size = 256, .width = 16, .height = 32, - .paletteSlot = 5, + .paletteSlot = PALSLOT_NPC_4, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -480,7 +480,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_OldMan2 = { .size = 256, .width = 16, .height = 32, - .paletteSlot = 5, + .paletteSlot = PALSLOT_NPC_4, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -499,7 +499,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_OldWoman = { .size = 256, .width = 16, .height = 32, - .paletteSlot = 3, + .paletteSlot = PALSLOT_NPC_2, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -518,7 +518,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Camper = { .size = 256, .width = 16, .height = 32, - .paletteSlot = 4, + .paletteSlot = PALSLOT_NPC_3, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -537,7 +537,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Picnicker = { .size = 256, .width = 16, .height = 32, - .paletteSlot = 4, + .paletteSlot = PALSLOT_NPC_3, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -556,7 +556,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_CooltrainerM = { .size = 256, .width = 16, .height = 32, - .paletteSlot = 2, + .paletteSlot = PALSLOT_NPC_1, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -575,7 +575,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_CooltrainerF = { .size = 256, .width = 16, .height = 32, - .paletteSlot = 2, + .paletteSlot = PALSLOT_NPC_1, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -594,7 +594,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SuperNerd = { .size = 256, .width = 16, .height = 32, - .paletteSlot = 3, + .paletteSlot = PALSLOT_NPC_2, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -613,7 +613,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Channeler = { .size = 256, .width = 16, .height = 32, - .paletteSlot = 5, + .paletteSlot = PALSLOT_NPC_4, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -632,7 +632,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RocketF = { .size = 256, .width = 16, .height = 32, - .paletteSlot = 5, + .paletteSlot = PALSLOT_NPC_4, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -651,7 +651,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SwimmerMWater = { .size = 256, .width = 16, .height = 32, - .paletteSlot = 5, + .paletteSlot = PALSLOT_NPC_4, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -670,7 +670,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SwimmerFWater = { .size = 256, .width = 16, .height = 32, - .paletteSlot = 4, + .paletteSlot = PALSLOT_NPC_3, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -689,7 +689,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SwimmerMLand = { .size = 256, .width = 16, .height = 32, - .paletteSlot = 5, + .paletteSlot = PALSLOT_NPC_4, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -708,7 +708,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SwimmerFLand = { .size = 256, .width = 16, .height = 32, - .paletteSlot = 2, + .paletteSlot = PALSLOT_NPC_1, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -727,7 +727,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Blackbelt = { .size = 256, .width = 16, .height = 32, - .paletteSlot = 5, + .paletteSlot = PALSLOT_NPC_4, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -746,7 +746,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Scientist = { .size = 256, .width = 16, .height = 32, - .paletteSlot = 5, + .paletteSlot = PALSLOT_NPC_4, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -765,7 +765,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Gentleman = { .size = 256, .width = 16, .height = 32, - .paletteSlot = 5, + .paletteSlot = PALSLOT_NPC_4, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -784,7 +784,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Sailor = { .size = 256, .width = 16, .height = 32, - .paletteSlot = 3, + .paletteSlot = PALSLOT_NPC_2, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -803,7 +803,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Captain = { .size = 256, .width = 16, .height = 32, - .paletteSlot = 5, + .paletteSlot = PALSLOT_NPC_4, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -822,7 +822,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Fisher = { .size = 256, .width = 16, .height = 32, - .paletteSlot = 5, + .paletteSlot = PALSLOT_NPC_4, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -841,7 +841,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TeachyTVHost = { .size = 256, .width = 16, .height = 32, - .paletteSlot = 5, + .paletteSlot = PALSLOT_NPC_4, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -860,7 +860,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedWoman = { .size = 256, .width = 16, .height = 32, - .paletteSlot = 3, + .paletteSlot = PALSLOT_NPC_2, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -879,7 +879,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TuberF = { .size = 128, .width = 16, .height = 16, - .paletteSlot = 5, + .paletteSlot = PALSLOT_NPC_4, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -898,7 +898,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TuberMWater = { .size = 128, .width = 16, .height = 16, - .paletteSlot = 2, + .paletteSlot = PALSLOT_NPC_1, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -917,7 +917,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TuberMLand = { .size = 128, .width = 16, .height = 16, - .paletteSlot = 2, + .paletteSlot = PALSLOT_NPC_1, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -936,7 +936,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Hiker = { .size = 256, .width = 16, .height = 32, - .paletteSlot = 5, + .paletteSlot = PALSLOT_NPC_4, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -955,7 +955,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Biker = { .size = 512, .width = 32, .height = 32, - .paletteSlot = 3, + .paletteSlot = PALSLOT_NPC_2, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -974,7 +974,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GymGuy = { .size = 256, .width = 16, .height = 32, - .paletteSlot = 3, + .paletteSlot = PALSLOT_NPC_2, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -993,7 +993,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Nurse = { .size = 256, .width = 16, .height = 32, - .paletteSlot = 3, + .paletteSlot = PALSLOT_NPC_2, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -1012,7 +1012,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedMaleReceptio .size = 256, .width = 16, .height = 32, - .paletteSlot = 5, + .paletteSlot = PALSLOT_NPC_4, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -1031,7 +1031,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ItemBall = { .size = 128, .width = 16, .height = 16, - .paletteSlot = 5, + .paletteSlot = PALSLOT_NPC_4, .shadowSize = SHADOW_SIZE_S, .inanimate = TRUE, .disableReflectionPaletteLoad = FALSE, @@ -1050,7 +1050,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ProfOak = { .size = 256, .width = 16, .height = 32, - .paletteSlot = 5, + .paletteSlot = PALSLOT_NPC_4, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -1069,7 +1069,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Man = { .size = 256, .width = 16, .height = 32, - .paletteSlot = 5, + .paletteSlot = PALSLOT_NPC_4, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -1088,7 +1088,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Rocker = { .size = 256, .width = 16, .height = 32, - .paletteSlot = 2, + .paletteSlot = PALSLOT_NPC_1, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -1107,7 +1107,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MrFuji = { .size = 256, .width = 16, .height = 32, - .paletteSlot = 5, + .paletteSlot = PALSLOT_NPC_4, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -1126,7 +1126,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Bruno = { .size = 256, .width = 16, .height = 32, - .paletteSlot = 5, + .paletteSlot = PALSLOT_NPC_4, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -1145,7 +1145,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_OldManLyingDown = .size = 512, .width = 32, .height = 32, - .paletteSlot = 3, + .paletteSlot = PALSLOT_NPC_2, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -1164,7 +1164,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_CutTree = { .size = 128, .width = 16, .height = 16, - .paletteSlot = 4, + .paletteSlot = PALSLOT_NPC_3, .shadowSize = SHADOW_SIZE_S, .inanimate = TRUE, .disableReflectionPaletteLoad = FALSE, @@ -1183,7 +1183,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Clerk = { .size = 256, .width = 16, .height = 32, - .paletteSlot = 5, + .paletteSlot = PALSLOT_NPC_4, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -1202,7 +1202,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MGDeliveryman = { .size = 256, .width = 16, .height = 32, - .paletteSlot = 4, + .paletteSlot = PALSLOT_NPC_3, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -1221,7 +1221,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TrainerTowerDude = .size = 256, .width = 16, .height = 32, - .paletteSlot = 5, + .paletteSlot = PALSLOT_NPC_4, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -1240,7 +1240,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_CableClubReception .size = 256, .width = 16, .height = 32, - .paletteSlot = 5, + .paletteSlot = PALSLOT_NPC_4, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -1259,7 +1259,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnionRoomReception .size = 256, .width = 16, .height = 32, - .paletteSlot = 5, + .paletteSlot = PALSLOT_NPC_4, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -1278,7 +1278,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RockSmashRock = { .size = 128, .width = 16, .height = 16, - .paletteSlot = 5, + .paletteSlot = PALSLOT_NPC_4, .shadowSize = SHADOW_SIZE_S, .inanimate = TRUE, .disableReflectionPaletteLoad = FALSE, @@ -1297,7 +1297,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_StrengthBoulder = .size = 128, .width = 16, .height = 16, - .paletteSlot = 5, + .paletteSlot = PALSLOT_NPC_4, .shadowSize = SHADOW_SIZE_S, .inanimate = TRUE, .disableReflectionPaletteLoad = FALSE, @@ -1316,7 +1316,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GreenNormal = { .size = 512, .width = 16, .height = 32, - .paletteSlot = 0, + .paletteSlot = PALSLOT_PLAYER, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -1335,7 +1335,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GreenBike = { .size = 512, .width = 32, .height = 32, - .paletteSlot = 0, + .paletteSlot = PALSLOT_PLAYER, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -1354,7 +1354,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GreenSurf = { .size = 256, .width = 16, .height = 32, - .paletteSlot = 0, + .paletteSlot = PALSLOT_PLAYER, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = TRUE, @@ -1373,7 +1373,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GreenFieldMove = { .size = 256, .width = 16, .height = 32, - .paletteSlot = 0, + .paletteSlot = PALSLOT_PLAYER, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -1392,7 +1392,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RedBikeAlt = { .size = 512, .width = 32, .height = 32, - .paletteSlot = 10, + .paletteSlot = PALSLOT_NPC_SPECIAL, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -1411,7 +1411,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RocketM = { .size = 256, .width = 16, .height = 32, - .paletteSlot = 5, + .paletteSlot = PALSLOT_NPC_4, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -1430,7 +1430,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Celio = { .size = 256, .width = 16, .height = 32, - .paletteSlot = 5, + .paletteSlot = PALSLOT_NPC_4, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -1449,7 +1449,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Agatha = { .size = 256, .width = 16, .height = 32, - .paletteSlot = 3, + .paletteSlot = PALSLOT_NPC_2, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -1468,7 +1468,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Brock = { .size = 256, .width = 16, .height = 32, - .paletteSlot = 4, + .paletteSlot = PALSLOT_NPC_3, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -1487,7 +1487,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Misty = { .size = 256, .width = 16, .height = 32, - .paletteSlot = 2, + .paletteSlot = PALSLOT_NPC_1, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -1506,7 +1506,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LtSurge = { .size = 256, .width = 16, .height = 32, - .paletteSlot = 4, + .paletteSlot = PALSLOT_NPC_3, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -1525,7 +1525,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Erika = { .size = 256, .width = 16, .height = 32, - .paletteSlot = 2, + .paletteSlot = PALSLOT_NPC_1, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -1544,7 +1544,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Koga = { .size = 256, .width = 16, .height = 32, - .paletteSlot = 5, + .paletteSlot = PALSLOT_NPC_4, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -1563,7 +1563,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Giovanni = { .size = 256, .width = 16, .height = 32, - .paletteSlot = 5, + .paletteSlot = PALSLOT_NPC_4, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -1582,7 +1582,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Blaine = { .size = 256, .width = 16, .height = 32, - .paletteSlot = 3, + .paletteSlot = PALSLOT_NPC_2, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -1601,7 +1601,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Sabrina = { .size = 256, .width = 16, .height = 32, - .paletteSlot = 2, + .paletteSlot = PALSLOT_NPC_1, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -1620,7 +1620,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Bill = { .size = 256, .width = 16, .height = 32, - .paletteSlot = 2, + .paletteSlot = PALSLOT_NPC_1, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -1639,7 +1639,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Daisy = { .size = 256, .width = 16, .height = 32, - .paletteSlot = 4, + .paletteSlot = PALSLOT_NPC_3, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -1658,7 +1658,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Lorelei = { .size = 256, .width = 16, .height = 32, - .paletteSlot = 5, + .paletteSlot = PALSLOT_NPC_4, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -1677,7 +1677,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Lance = { .size = 256, .width = 16, .height = 32, - .paletteSlot = 5, + .paletteSlot = PALSLOT_NPC_4, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -1696,7 +1696,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Blue = { .size = 256, .width = 16, .height = 32, - .paletteSlot = 4, + .paletteSlot = PALSLOT_NPC_3, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -1715,7 +1715,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RedFish = { .size = 512, .width = 32, .height = 32, - .paletteSlot = 0, + .paletteSlot = PALSLOT_PLAYER, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -1734,7 +1734,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GreenFish = { .size = 512, .width = 32, .height = 32, - .paletteSlot = 0, + .paletteSlot = PALSLOT_PLAYER, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -1753,7 +1753,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RedVSSeeker = { .size = 256, .width = 16, .height = 32, - .paletteSlot = 0, + .paletteSlot = PALSLOT_PLAYER, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -1772,7 +1772,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RedVSSeekerBike = .size = 512, .width = 32, .height = 32, - .paletteSlot = 0, + .paletteSlot = PALSLOT_PLAYER, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -1791,7 +1791,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GreenVSSeeker = { .size = 256, .width = 16, .height = 32, - .paletteSlot = 0, + .paletteSlot = PALSLOT_PLAYER, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -1810,7 +1810,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GreenVSSeekerBike .size = 512, .width = 32, .height = 32, - .paletteSlot = 0, + .paletteSlot = PALSLOT_PLAYER, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -1829,7 +1829,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TownMap = { .size = 256, .width = 32, .height = 16, - .paletteSlot = 2, + .paletteSlot = PALSLOT_NPC_1, .shadowSize = SHADOW_SIZE_S, .inanimate = TRUE, .disableReflectionPaletteLoad = FALSE, @@ -1848,7 +1848,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Pokedex = { .size = 128, .width = 16, .height = 16, - .paletteSlot = 2, + .paletteSlot = PALSLOT_NPC_1, .shadowSize = SHADOW_SIZE_S, .inanimate = TRUE, .disableReflectionPaletteLoad = FALSE, @@ -1867,7 +1867,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GBAKid = { .size = 256, .width = 16, .height = 32, - .paletteSlot = 3, + .paletteSlot = PALSLOT_NPC_2, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -1886,7 +1886,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Snorlax = { .size = 512, .width = 32, .height = 32, - .paletteSlot = 2, + .paletteSlot = PALSLOT_NPC_1, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -1905,7 +1905,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Fossil = { .size = 128, .width = 16, .height = 16, - .paletteSlot = 5, + .paletteSlot = PALSLOT_NPC_4, .shadowSize = SHADOW_SIZE_S, .inanimate = TRUE, .disableReflectionPaletteLoad = FALSE, @@ -1924,7 +1924,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Ruby = { .size = 128, .width = 16, .height = 16, - .paletteSlot = 2, + .paletteSlot = PALSLOT_NPC_1, .shadowSize = SHADOW_SIZE_S, .inanimate = TRUE, .disableReflectionPaletteLoad = FALSE, @@ -1943,7 +1943,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Sapphire = { .size = 128, .width = 16, .height = 16, - .paletteSlot = 2, + .paletteSlot = PALSLOT_NPC_1, .shadowSize = SHADOW_SIZE_S, .inanimate = TRUE, .disableReflectionPaletteLoad = FALSE, @@ -1962,7 +1962,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_OldAmber = { .size = 128, .width = 16, .height = 16, - .paletteSlot = 2, + .paletteSlot = PALSLOT_NPC_1, .shadowSize = SHADOW_SIZE_S, .inanimate = TRUE, .disableReflectionPaletteLoad = FALSE, @@ -1981,7 +1981,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GymSign = { .size = 256, .width = 16, .height = 32, - .paletteSlot = 5, + .paletteSlot = PALSLOT_NPC_4, .shadowSize = SHADOW_SIZE_S, .inanimate = TRUE, .disableReflectionPaletteLoad = FALSE, @@ -2000,7 +2000,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Sign = { .size = 128, .width = 16, .height = 16, - .paletteSlot = 5, + .paletteSlot = PALSLOT_NPC_4, .shadowSize = SHADOW_SIZE_S, .inanimate = TRUE, .disableReflectionPaletteLoad = FALSE, @@ -2019,7 +2019,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TrainerTips = { .size = 128, .width = 16, .height = 16, - .paletteSlot = 5, + .paletteSlot = PALSLOT_NPC_4, .shadowSize = SHADOW_SIZE_S, .inanimate = TRUE, .disableReflectionPaletteLoad = FALSE, @@ -2038,7 +2038,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Clipboard = { .size = 128, .width = 16, .height = 16, - .paletteSlot = 5, + .paletteSlot = PALSLOT_NPC_4, .shadowSize = SHADOW_SIZE_S, .inanimate = TRUE, .disableReflectionPaletteLoad = FALSE, @@ -2057,7 +2057,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Meteorite = { .size = 512, .width = 32, .height = 32, - .paletteSlot = 10, + .paletteSlot = PALSLOT_NPC_SPECIAL, .shadowSize = SHADOW_SIZE_S, .inanimate = TRUE, .disableReflectionPaletteLoad = FALSE, @@ -2076,7 +2076,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LaprasDoll = { .size = 512, .width = 32, .height = 32, - .paletteSlot = 3, + .paletteSlot = PALSLOT_NPC_2, .shadowSize = SHADOW_SIZE_S, .inanimate = TRUE, .disableReflectionPaletteLoad = FALSE, @@ -2095,7 +2095,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Spearow = { .size = 128, .width = 16, .height = 16, - .paletteSlot = 5, + .paletteSlot = PALSLOT_NPC_4, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -2114,7 +2114,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Omanyte = { .size = 128, .width = 16, .height = 16, - .paletteSlot = 2, + .paletteSlot = PALSLOT_NPC_1, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -2133,7 +2133,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Kangaskhan = { .size = 128, .width = 16, .height = 16, - .paletteSlot = 2, + .paletteSlot = PALSLOT_NPC_1, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -2152,7 +2152,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Psyduck = { .size = 128, .width = 16, .height = 16, - .paletteSlot = 2, + .paletteSlot = PALSLOT_NPC_1, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -2171,7 +2171,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_NidoranF = { .size = 128, .width = 16, .height = 16, - .paletteSlot = 3, + .paletteSlot = PALSLOT_NPC_2, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -2190,7 +2190,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_NidoranM = { .size = 128, .width = 16, .height = 16, - .paletteSlot = 4, + .paletteSlot = PALSLOT_NPC_3, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -2209,7 +2209,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Nidorino = { .size = 128, .width = 16, .height = 16, - .paletteSlot = 4, + .paletteSlot = PALSLOT_NPC_3, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -2228,7 +2228,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Meowth = { .size = 128, .width = 16, .height = 16, - .paletteSlot = 2, + .paletteSlot = PALSLOT_NPC_1, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -2247,7 +2247,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Seel = { .size = 128, .width = 16, .height = 16, - .paletteSlot = 3, + .paletteSlot = PALSLOT_NPC_2, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -2266,7 +2266,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Voltorb = { .size = 128, .width = 16, .height = 16, - .paletteSlot = 5, + .paletteSlot = PALSLOT_NPC_4, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -2285,7 +2285,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Slowpoke = { .size = 128, .width = 16, .height = 16, - .paletteSlot = 3, + .paletteSlot = PALSLOT_NPC_2, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -2304,7 +2304,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Slowbro = { .size = 128, .width = 16, .height = 16, - .paletteSlot = 3, + .paletteSlot = PALSLOT_NPC_2, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -2323,7 +2323,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Machop = { .size = 128, .width = 16, .height = 16, - .paletteSlot = 3, + .paletteSlot = PALSLOT_NPC_2, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -2342,7 +2342,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Wigglytuff = { .size = 128, .width = 16, .height = 16, - .paletteSlot = 3, + .paletteSlot = PALSLOT_NPC_2, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -2361,7 +2361,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Doduo = { .size = 128, .width = 16, .height = 16, - .paletteSlot = 2, + .paletteSlot = PALSLOT_NPC_1, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -2380,7 +2380,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Fearow = { .size = 128, .width = 16, .height = 16, - .paletteSlot = 5, + .paletteSlot = PALSLOT_NPC_4, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -2399,7 +2399,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Lapras = { .size = 128, .width = 16, .height = 16, - .paletteSlot = 3, + .paletteSlot = PALSLOT_NPC_2, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -2418,7 +2418,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Zapdos = { .size = 512, .width = 32, .height = 32, - .paletteSlot = 2, + .paletteSlot = PALSLOT_NPC_1, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -2437,7 +2437,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Moltres = { .size = 512, .width = 32, .height = 32, - .paletteSlot = 2, + .paletteSlot = PALSLOT_NPC_1, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -2456,7 +2456,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Articuno = { .size = 512, .width = 32, .height = 32, - .paletteSlot = 3, + .paletteSlot = PALSLOT_NPC_2, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -2475,7 +2475,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_DeoxysD = { .size = 512, .width = 32, .height = 32, - .paletteSlot = 2, + .paletteSlot = PALSLOT_NPC_1, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -2494,7 +2494,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_DeoxysA = { .size = 512, .width = 32, .height = 32, - .paletteSlot = 2, + .paletteSlot = PALSLOT_NPC_1, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -2513,7 +2513,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_DeoxysN = { .size = 512, .width = 32, .height = 32, - .paletteSlot = 2, + .paletteSlot = PALSLOT_NPC_1, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -2532,7 +2532,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Mewtwo = { .size = 128, .width = 16, .height = 16, - .paletteSlot = 3, + .paletteSlot = PALSLOT_NPC_2, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -2551,7 +2551,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Mew = { .size = 128, .width = 16, .height = 16, - .paletteSlot = 4, + .paletteSlot = PALSLOT_NPC_3, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -2570,7 +2570,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Entei = { .size = 128, .width = 16, .height = 16, - .paletteSlot = 2, + .paletteSlot = PALSLOT_NPC_1, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -2589,7 +2589,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Raikou = { .size = 128, .width = 16, .height = 16, - .paletteSlot = 4, + .paletteSlot = PALSLOT_NPC_3, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -2608,7 +2608,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Suicune = { .size = 128, .width = 16, .height = 16, - .paletteSlot = 3, + .paletteSlot = PALSLOT_NPC_2, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -2627,7 +2627,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Lugia = { .size = 512, .width = 32, .height = 32, - .paletteSlot = 3, + .paletteSlot = PALSLOT_NPC_2, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -2646,7 +2646,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_HoOh = { .size = 512, .width = 32, .height = 32, - .paletteSlot = 2, + .paletteSlot = PALSLOT_NPC_1, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -2665,7 +2665,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Celebi = { .size = 128, .width = 16, .height = 16, - .paletteSlot = 4, + .paletteSlot = PALSLOT_NPC_3, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -2684,7 +2684,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Cubone = { .size = 128, .width = 16, .height = 16, - .paletteSlot = 5, + .paletteSlot = PALSLOT_NPC_4, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -2703,7 +2703,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Machoke = { .size = 128, .width = 16, .height = 16, - .paletteSlot = 2, + .paletteSlot = PALSLOT_NPC_1, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -2722,7 +2722,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Kabuto = { .size = 128, .width = 16, .height = 16, - .paletteSlot = 2, + .paletteSlot = PALSLOT_NPC_1, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -2741,7 +2741,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Poliwrath = { .size = 128, .width = 16, .height = 16, - .paletteSlot = 2, + .paletteSlot = PALSLOT_NPC_1, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -2760,7 +2760,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Pidgeot = { .size = 128, .width = 16, .height = 16, - .paletteSlot = 2, + .paletteSlot = PALSLOT_NPC_1, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -2779,7 +2779,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Chansey = { .size = 128, .width = 16, .height = 16, - .paletteSlot = 3, + .paletteSlot = PALSLOT_NPC_2, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -2798,7 +2798,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Pikachu = { .size = 128, .width = 16, .height = 16, - .paletteSlot = 2, + .paletteSlot = PALSLOT_NPC_1, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -2817,7 +2817,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Jigglypuff = { .size = 128, .width = 16, .height = 16, - .paletteSlot = 3, + .paletteSlot = PALSLOT_NPC_2, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -2836,7 +2836,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Pidgey = { .size = 128, .width = 16, .height = 16, - .paletteSlot = 2, + .paletteSlot = PALSLOT_NPC_1, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -2855,7 +2855,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Clefairy = { .size = 128, .width = 16, .height = 16, - .paletteSlot = 3, + .paletteSlot = PALSLOT_NPC_2, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -2874,7 +2874,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Mom = { .size = 256, .width = 16, .height = 32, - .paletteSlot = 2, + .paletteSlot = PALSLOT_NPC_1, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -2893,7 +2893,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Seagallop = { .size = 2048, .width = 64, .height = 64, - .paletteSlot = 10, + .paletteSlot = PALSLOT_NPC_SPECIAL, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, @@ -2912,7 +2912,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SSAnne = { .size = 4096, .width = 128, .height = 64, - .paletteSlot = 10, + .paletteSlot = PALSLOT_NPC_SPECIAL, .shadowSize = SHADOW_SIZE_M, .inanimate = FALSE, .disableReflectionPaletteLoad = FALSE, diff --git a/src/field_effect_helpers.c b/src/field_effect_helpers.c index 7a9a59f66..278364803 100644 --- a/src/field_effect_helpers.c +++ b/src/field_effect_helpers.c @@ -81,18 +81,12 @@ static void LoadObjectRegularReflectionPalette(struct ObjectEvent * objectEvent, graphicsInfo = GetObjectEventGraphicsInfo(objectEvent->graphicsId); if (graphicsInfo->reflectionPaletteTag != OBJ_EVENT_PAL_TAG_NONE) { - if (graphicsInfo->paletteSlot == 0) - { + if (graphicsInfo->paletteSlot == PALSLOT_PLAYER) LoadPlayerObjectReflectionPalette(graphicsInfo->paletteTag, paletteIndex); - } - else if (graphicsInfo->paletteSlot == 10) - { + else if (graphicsInfo->paletteSlot == PALSLOT_NPC_SPECIAL) LoadSpecialObjectReflectionPalette(graphicsInfo->paletteTag, paletteIndex); - } else - { PatchObjectPalette(GetObjectPaletteTag(paletteIndex), paletteIndex); - } UpdateSpritePaletteWithWeather(paletteIndex); } }