diff --git a/graphics/event_objects/palettes/field_object_palette_00.pal b/graphics/event_objects/palettes/event_object_palette_00.pal similarity index 100% rename from graphics/event_objects/palettes/field_object_palette_00.pal rename to graphics/event_objects/palettes/event_object_palette_00.pal diff --git a/graphics/event_objects/palettes/field_object_palette_01.pal b/graphics/event_objects/palettes/event_object_palette_01.pal similarity index 100% rename from graphics/event_objects/palettes/field_object_palette_01.pal rename to graphics/event_objects/palettes/event_object_palette_01.pal diff --git a/graphics/event_objects/palettes/field_object_palette_02.pal b/graphics/event_objects/palettes/event_object_palette_02.pal similarity index 100% rename from graphics/event_objects/palettes/field_object_palette_02.pal rename to graphics/event_objects/palettes/event_object_palette_02.pal diff --git a/graphics/event_objects/palettes/field_object_palette_03.pal b/graphics/event_objects/palettes/event_object_palette_03.pal similarity index 100% rename from graphics/event_objects/palettes/field_object_palette_03.pal rename to graphics/event_objects/palettes/event_object_palette_03.pal diff --git a/graphics/event_objects/palettes/field_object_palette_04.pal b/graphics/event_objects/palettes/event_object_palette_04.pal similarity index 100% rename from graphics/event_objects/palettes/field_object_palette_04.pal rename to graphics/event_objects/palettes/event_object_palette_04.pal diff --git a/graphics/event_objects/palettes/field_object_palette_05.pal b/graphics/event_objects/palettes/event_object_palette_05.pal similarity index 100% rename from graphics/event_objects/palettes/field_object_palette_05.pal rename to graphics/event_objects/palettes/event_object_palette_05.pal diff --git a/graphics/event_objects/palettes/field_object_palette_06.pal b/graphics/event_objects/palettes/event_object_palette_06.pal similarity index 100% rename from graphics/event_objects/palettes/field_object_palette_06.pal rename to graphics/event_objects/palettes/event_object_palette_06.pal diff --git a/graphics/event_objects/palettes/field_object_palette_07.pal b/graphics/event_objects/palettes/event_object_palette_07.pal similarity index 100% rename from graphics/event_objects/palettes/field_object_palette_07.pal rename to graphics/event_objects/palettes/event_object_palette_07.pal diff --git a/graphics/event_objects/palettes/field_object_palette_08.pal b/graphics/event_objects/palettes/event_object_palette_08.pal similarity index 100% rename from graphics/event_objects/palettes/field_object_palette_08.pal rename to graphics/event_objects/palettes/event_object_palette_08.pal diff --git a/graphics/event_objects/palettes/field_object_palette_09.pal b/graphics/event_objects/palettes/event_object_palette_09.pal similarity index 100% rename from graphics/event_objects/palettes/field_object_palette_09.pal rename to graphics/event_objects/palettes/event_object_palette_09.pal diff --git a/graphics/event_objects/palettes/field_object_palette_10.pal b/graphics/event_objects/palettes/event_object_palette_10.pal similarity index 100% rename from graphics/event_objects/palettes/field_object_palette_10.pal rename to graphics/event_objects/palettes/event_object_palette_10.pal diff --git a/graphics/event_objects/palettes/field_object_palette_11.pal b/graphics/event_objects/palettes/event_object_palette_11.pal similarity index 100% rename from graphics/event_objects/palettes/field_object_palette_11.pal rename to graphics/event_objects/palettes/event_object_palette_11.pal diff --git a/graphics/event_objects/palettes/field_object_palette_12.pal b/graphics/event_objects/palettes/event_object_palette_12.pal similarity index 100% rename from graphics/event_objects/palettes/field_object_palette_12.pal rename to graphics/event_objects/palettes/event_object_palette_12.pal diff --git a/graphics/event_objects/palettes/field_object_palette_13.pal b/graphics/event_objects/palettes/event_object_palette_13.pal similarity index 100% rename from graphics/event_objects/palettes/field_object_palette_13.pal rename to graphics/event_objects/palettes/event_object_palette_13.pal diff --git a/graphics/event_objects/palettes/field_object_palette_14.pal b/graphics/event_objects/palettes/event_object_palette_14.pal similarity index 100% rename from graphics/event_objects/palettes/field_object_palette_14.pal rename to graphics/event_objects/palettes/event_object_palette_14.pal diff --git a/graphics/event_objects/palettes/field_object_palette_15.pal b/graphics/event_objects/palettes/event_object_palette_15.pal similarity index 100% rename from graphics/event_objects/palettes/field_object_palette_15.pal rename to graphics/event_objects/palettes/event_object_palette_15.pal diff --git a/graphics/event_objects/palettes/field_object_palette_16.pal b/graphics/event_objects/palettes/event_object_palette_16.pal similarity index 100% rename from graphics/event_objects/palettes/field_object_palette_16.pal rename to graphics/event_objects/palettes/event_object_palette_16.pal diff --git a/graphics/event_objects/palettes/field_object_palette_17.pal b/graphics/event_objects/palettes/event_object_palette_17.pal similarity index 100% rename from graphics/event_objects/palettes/field_object_palette_17.pal rename to graphics/event_objects/palettes/event_object_palette_17.pal diff --git a/graphics/event_objects/palettes/field_object_palette_18.pal b/graphics/event_objects/palettes/event_object_palette_18.pal similarity index 100% rename from graphics/event_objects/palettes/field_object_palette_18.pal rename to graphics/event_objects/palettes/event_object_palette_18.pal diff --git a/graphics/event_objects/palettes/field_object_palette_19.pal b/graphics/event_objects/palettes/event_object_palette_19.pal similarity index 100% rename from graphics/event_objects/palettes/field_object_palette_19.pal rename to graphics/event_objects/palettes/event_object_palette_19.pal diff --git a/graphics/event_objects/palettes/field_object_palette_20.pal b/graphics/event_objects/palettes/event_object_palette_20.pal similarity index 100% rename from graphics/event_objects/palettes/field_object_palette_20.pal rename to graphics/event_objects/palettes/event_object_palette_20.pal diff --git a/graphics/event_objects/palettes/field_object_palette_21.pal b/graphics/event_objects/palettes/event_object_palette_21.pal similarity index 100% rename from graphics/event_objects/palettes/field_object_palette_21.pal rename to graphics/event_objects/palettes/event_object_palette_21.pal diff --git a/graphics/event_objects/palettes/field_object_palette_22.pal b/graphics/event_objects/palettes/event_object_palette_22.pal similarity index 100% rename from graphics/event_objects/palettes/field_object_palette_22.pal rename to graphics/event_objects/palettes/event_object_palette_22.pal diff --git a/graphics/event_objects/palettes/field_object_palette_23.pal b/graphics/event_objects/palettes/event_object_palette_23.pal similarity index 100% rename from graphics/event_objects/palettes/field_object_palette_23.pal rename to graphics/event_objects/palettes/event_object_palette_23.pal diff --git a/graphics/event_objects/palettes/field_object_palette_24.pal b/graphics/event_objects/palettes/event_object_palette_24.pal similarity index 100% rename from graphics/event_objects/palettes/field_object_palette_24.pal rename to graphics/event_objects/palettes/event_object_palette_24.pal diff --git a/graphics/event_objects/palettes/field_object_palette_25.pal b/graphics/event_objects/palettes/event_object_palette_25.pal similarity index 100% rename from graphics/event_objects/palettes/field_object_palette_25.pal rename to graphics/event_objects/palettes/event_object_palette_25.pal diff --git a/graphics/event_objects/palettes/field_object_palette_26.pal b/graphics/event_objects/palettes/event_object_palette_26.pal similarity index 100% rename from graphics/event_objects/palettes/field_object_palette_26.pal rename to graphics/event_objects/palettes/event_object_palette_26.pal diff --git a/graphics/event_objects/palettes/field_object_palette_27.pal b/graphics/event_objects/palettes/event_object_palette_27.pal similarity index 100% rename from graphics/event_objects/palettes/field_object_palette_27.pal rename to graphics/event_objects/palettes/event_object_palette_27.pal diff --git a/graphics/event_objects/palettes/field_object_palette_28.pal b/graphics/event_objects/palettes/event_object_palette_28.pal similarity index 100% rename from graphics/event_objects/palettes/field_object_palette_28.pal rename to graphics/event_objects/palettes/event_object_palette_28.pal diff --git a/graphics/event_objects/palettes/field_object_palette_29.pal b/graphics/event_objects/palettes/event_object_palette_29.pal similarity index 100% rename from graphics/event_objects/palettes/field_object_palette_29.pal rename to graphics/event_objects/palettes/event_object_palette_29.pal diff --git a/graphics/event_objects/palettes/field_object_palette_30.pal b/graphics/event_objects/palettes/event_object_palette_30.pal similarity index 100% rename from graphics/event_objects/palettes/field_object_palette_30.pal rename to graphics/event_objects/palettes/event_object_palette_30.pal diff --git a/graphics/event_objects/palettes/field_object_palette_31.pal b/graphics/event_objects/palettes/event_object_palette_31.pal similarity index 100% rename from graphics/event_objects/palettes/field_object_palette_31.pal rename to graphics/event_objects/palettes/event_object_palette_31.pal diff --git a/graphics/event_objects/palettes/field_object_palette_32.pal b/graphics/event_objects/palettes/event_object_palette_32.pal similarity index 100% rename from graphics/event_objects/palettes/field_object_palette_32.pal rename to graphics/event_objects/palettes/event_object_palette_32.pal diff --git a/graphics/event_objects/palettes/field_object_palette_33.pal b/graphics/event_objects/palettes/event_object_palette_33.pal similarity index 100% rename from graphics/event_objects/palettes/field_object_palette_33.pal rename to graphics/event_objects/palettes/event_object_palette_33.pal diff --git a/graphics/event_objects/palettes/field_object_palette_34.pal b/graphics/event_objects/palettes/event_object_palette_34.pal similarity index 100% rename from graphics/event_objects/palettes/field_object_palette_34.pal rename to graphics/event_objects/palettes/event_object_palette_34.pal diff --git a/src/data/event_object/event_object_graphics.h b/src/data/event_object/event_object_graphics.h index 3e44e4133..28d62262d 100755 --- a/src/data/event_object/event_object_graphics.h +++ b/src/data/event_object/event_object_graphics.h @@ -1,9 +1,9 @@ const u32 gObjectEventPic_BrendanNormal[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/walking.4bpp"); const u32 gObjectEventPic_BrendanRunning[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/running.4bpp"); -const u16 gObjectEventPalette8[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_08.gbapal"); +const u16 gObjectEventPalette8[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_08.gbapal"); const u32 gObjectEventPic_RubySapphireBrendanNormal[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_brendan/walking.4bpp"); const u32 gObjectEventPic_RubySapphireBrendanRunning[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_brendan/running.4bpp"); -const u16 gObjectEventPalette33[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_33.gbapal"); +const u16 gObjectEventPalette33[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_33.gbapal"); const u16 NullPalette_8499A38[16] = {}; const u16 NullPalette_8499A58[16] = {}; const u16 NullPalette_8499A78[16] = {}; @@ -19,8 +19,8 @@ const u16 NullPalette_8499B98[16] = {}; const u16 NullPalette_8499BB8[16] = {}; const u16 NullPalette_8499BD8[16] = {}; const u16 NullPalette_8499BF8[16] = {}; -const u16 gObjectEventPalette9[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_09.gbapal"); -const u16 gObjectEventPalette10[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_10.gbapal"); +const u16 gObjectEventPalette9[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_09.gbapal"); +const u16 gObjectEventPalette10[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_10.gbapal"); const u32 gObjectEventPic_BrendanFieldMove[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/field_move.4bpp"); const u32 gObjectEventPic_BrendanSurfing[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/surfing.4bpp"); const u32 gObjectEventPic_BrendanMachBike[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/mach_bike.4bpp"); @@ -31,14 +31,14 @@ const u32 gObjectEventPic_BrendanDecorating[] = INCBIN_U32("graphics/event_objec const u32 gObjectEventPic_MayDecorating[] = INCBIN_U32("graphics/event_objects/pics/people/may/decorating.4bpp"); const u32 gObjectEventPic_BrendanUnderwater[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/underwater.4bpp"); const u32 gObjectEventPic_MayUnderwater[] = INCBIN_U32("graphics/event_objects/pics/people/may/underwater.4bpp"); -const u16 gObjectEventPalette11[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_11.gbapal"); +const u16 gObjectEventPalette11[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_11.gbapal"); const u32 gObjectEventPic_MayNormal[] = INCBIN_U32("graphics/event_objects/pics/people/may/walking.4bpp"); const u32 gObjectEventPic_MayRunning[] = INCBIN_U32("graphics/event_objects/pics/people/may/running.4bpp"); -const u16 gObjectEventPalette17[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_17.gbapal"); -const u16 gObjectEventPalette18[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_18.gbapal"); +const u16 gObjectEventPalette17[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_17.gbapal"); +const u16 gObjectEventPalette18[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_18.gbapal"); const u32 gObjectEventPic_RubySapphireMayNormal[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_may/walking.4bpp"); const u32 gObjectEventPic_RubySapphireMayRunning[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_may/running.4bpp"); -const u16 gObjectEventPalette34[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_34.gbapal"); +const u16 gObjectEventPalette34[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_34.gbapal"); const u16 gUnusedObjectEventPalette[] = INCBIN_U16("graphics/event_objects/palettes/unused_palette.gbapal"); const u16 NullPalette_84A54F8[16] = {}; const u16 NullPalette_84A5518[16] = {}; @@ -60,14 +60,14 @@ const u32 gObjectEventPic_MaySurfing[] = INCBIN_U32("graphics/event_objects/pics const u32 gObjectEventPic_MayFieldMove[] = INCBIN_U32("graphics/event_objects/pics/people/may/field_move.4bpp"); const u32 gObjectEventPic_MayFishing[] = INCBIN_U32("graphics/event_objects/pics/people/may/fishing.4bpp"); const u32 gObjectEventPic_MayWatering[] = INCBIN_U32("graphics/event_objects/pics/people/may/watering.4bpp"); -const u16 gObjectEventPalette0[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_00.gbapal"); -const u16 gObjectEventPalette1[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_01.gbapal"); -const u16 gObjectEventPalette2[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_02.gbapal"); -const u16 gObjectEventPalette3[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_03.gbapal"); -const u16 gObjectEventPalette4[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_04.gbapal"); -const u16 gObjectEventPalette5[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_05.gbapal"); -const u16 gObjectEventPalette6[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_06.gbapal"); -const u16 gObjectEventPalette7[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_07.gbapal"); +const u16 gObjectEventPalette0[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_00.gbapal"); +const u16 gObjectEventPalette1[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_01.gbapal"); +const u16 gObjectEventPalette2[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_02.gbapal"); +const u16 gObjectEventPalette3[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_03.gbapal"); +const u16 gObjectEventPalette4[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_04.gbapal"); +const u16 gObjectEventPalette5[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_05.gbapal"); +const u16 gObjectEventPalette6[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_06.gbapal"); +const u16 gObjectEventPalette7[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_07.gbapal"); const u32 gObjectEventPic_NinjaBoy[] = INCBIN_U32("graphics/event_objects/pics/people/ninja_boy.4bpp"); const u32 gObjectEventPic_Twin[] = INCBIN_U32("graphics/event_objects/pics/people/twin.4bpp"); const u32 gObjectEventPic_Boy1[] = INCBIN_U32("graphics/event_objects/pics/people/boy_1.4bpp"); @@ -177,10 +177,10 @@ const u32 gObjectEventPic_Wingull[] = INCBIN_U32("graphics/event_objects/pics/po const u32 gObjectEventPic_TuberMSwimming[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m_swimming.4bpp"); const u32 gObjectEventPic_Azurill[] = INCBIN_U32("graphics/event_objects/pics/pokemon/azurill.4bpp"); const u32 gObjectEventPic_Mom[] = INCBIN_U32("graphics/event_objects/pics/people/mom.4bpp"); -const u16 gObjectEventPalette22[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_22.gbapal"); -const u16 gObjectEventPalette23[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_23.gbapal"); -const u16 gObjectEventPalette24[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_24.gbapal"); -const u16 gObjectEventPalette25[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_25.gbapal"); +const u16 gObjectEventPalette22[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_22.gbapal"); +const u16 gObjectEventPalette23[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_23.gbapal"); +const u16 gObjectEventPalette24[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_24.gbapal"); +const u16 gObjectEventPalette25[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_25.gbapal"); const u32 gObjectEventPic_UnusedNatuDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/unused_natu_doll.4bpp"); const u32 gObjectEventPic_UnusedMagnemiteDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/unused_magnemite_doll.4bpp"); const u32 gObjectEventPic_UnusedSquirtleDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/unused_squirtle_doll.4bpp"); @@ -238,20 +238,20 @@ const u32 gObjectEventPic_PushableBoulder[] = INCBIN_U32("graphics/event_objects const u32 gObjectEventPic_MrBrineysBoat[] = INCBIN_U32("graphics/event_objects/pics/misc/mr_brineys_boat.4bpp"); const u32 gObjectEventPic_Fossil[] = INCBIN_U32("graphics/event_objects/pics/misc/fossil.4bpp"); const u32 gObjectEventPic_SubmarineShadow[] = INCBIN_U32("graphics/event_objects/pics/misc/submarine_shadow.4bpp"); -const u16 gObjectEventPalette26[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_26.gbapal"); +const u16 gObjectEventPalette26[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_26.gbapal"); const u32 gObjectEventPic_Truck[] = INCBIN_U32("graphics/event_objects/pics/misc/truck.4bpp"); -const u16 gObjectEventPalette14[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_14.gbapal"); +const u16 gObjectEventPalette14[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_14.gbapal"); const u32 gObjectEventPic_Vigoroth[] = INCBIN_U32("graphics/event_objects/pics/pokemon/vigoroth.4bpp"); -const u16 gObjectEventPalette15[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_15.gbapal"); +const u16 gObjectEventPalette15[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_15.gbapal"); const u32 gObjectEventPic_BirchsBag[] = INCBIN_U32("graphics/event_objects/pics/misc/birchs_bag.4bpp"); const u32 gObjectEventPic_EnemyZigzagoon[] = INCBIN_U32("graphics/event_objects/pics/pokemon/enemy_zigzagoon.4bpp"); -const u16 gObjectEventPalette16[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_16.gbapal"); +const u16 gObjectEventPalette16[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_16.gbapal"); const u32 gObjectEventPic_Poochyena[] = INCBIN_U32("graphics/event_objects/pics/pokemon/poochyena.4bpp"); -const u16 gObjectEventPalette27[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_27.gbapal"); +const u16 gObjectEventPalette27[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_27.gbapal"); const u32 gObjectEventPic_CableCar[] = INCBIN_U32("graphics/event_objects/pics/misc/cable_car.4bpp"); -const u16 gObjectEventPalette20[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_20.gbapal"); +const u16 gObjectEventPalette20[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_20.gbapal"); const u32 gObjectEventPic_SSTidal[] = INCBIN_U32("graphics/event_objects/pics/misc/ss_tidal.4bpp"); -const u16 gObjectEventPalette21[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_21.gbapal"); +const u16 gObjectEventPalette21[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_21.gbapal"); const u32 gFieldEffectObjectPic_BerryTreeGrowthSparkle[] = INCBIN_U32("graphics/event_objects/pics/effects/berry_tree_growth_sparkle.4bpp"); const u32 gObjectEventPic_BerryTreeDirtPile[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/dirt_pile.4bpp"); const u32 gObjectEventPic_BerryTreeSprout[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/sprout.4bpp"); @@ -287,8 +287,8 @@ const u32 gObjectEventPic_DurinBerryTree[] = INCBIN_U32("graphics/event_objects/ const u32 gObjectEventPic_TamatoBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/tamato.4bpp"); const u32 gFieldEffectObjectPic_SurfBlob[] = INCBIN_U32("graphics/event_objects/pics/effects/surf_blob.4bpp"); const u32 gObjectEventPic_QuintyPlump[] = INCBIN_U32("graphics/event_objects/pics/people/quinty_plump.4bpp"); -const u16 gObjectEventPalette12[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_12.gbapal"); -const u16 gObjectEventPalette13[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_13.gbapal"); +const u16 gObjectEventPalette12[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_12.gbapal"); +const u16 gObjectEventPalette13[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_13.gbapal"); const u32 gFieldEffectObjectPic_ShadowSmall[] = INCBIN_U32("graphics/event_objects/pics/effects/shadow_small.4bpp"); const u32 gFieldEffectObjectPic_ShadowMedium[] = INCBIN_U32("graphics/event_objects/pics/effects/shadow_medium.4bpp"); const u32 gFieldEffectObjectPic_ShadowLarge[] = INCBIN_U32("graphics/event_objects/pics/effects/shadow_large.4bpp"); @@ -339,15 +339,15 @@ const u32 gObjectEventPic_Dusclops[] = INCBIN_U32("graphics/event_objects/pics/p const u32 gObjectEventPic_MysteryEventDeliveryman[] = INCBIN_U32("graphics/event_objects/pics/people/mystery_event_deliveryman.4bpp"); const u32 gObjectEventPic_UnionRoomAttendant[] = INCBIN_U32("graphics/event_objects/pics/people/union_room_attendant.4bpp"); const u32 gObjectEventPic_MovingBox[] = INCBIN_U32("graphics/event_objects/pics/misc/moving_box.4bpp"); -const u16 gObjectEventPalette19[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_19.gbapal"); +const u16 gObjectEventPalette19[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_19.gbapal"); const u32 gObjectEventPic_Sudowoodo[] = INCBIN_U32("graphics/event_objects/pics/pokemon/sudowoodo.4bpp"); const u32 gObjectEventPic_Mew[] = INCBIN_U32("graphics/event_objects/pics/pokemon/mew.4bpp"); -const u16 gObjectEventPalette28[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_28.gbapal"); +const u16 gObjectEventPalette28[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_28.gbapal"); const u32 gObjectEventPic_Red[] = INCBIN_U32("graphics/event_objects/pics/people/red.4bpp"); const u32 gObjectEventPic_Leaf[] = INCBIN_U32("graphics/event_objects/pics/people/leaf.4bpp"); -const u16 gObjectEventPalette30[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_30.gbapal"); +const u16 gObjectEventPalette30[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_30.gbapal"); const u32 gObjectEventPic_BirthIslandStone[] = INCBIN_U32("graphics/event_objects/pics/misc/birth_island_stone.4bpp"); -const u16 gObjectEventPalette29[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_29.gbapal"); +const u16 gObjectEventPalette29[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_29.gbapal"); const u32 gObjectEventPic_Deoxys[] = INCBIN_U32("graphics/event_objects/pics/pokemon/deoxys.4bpp"); const u32 gObjectEventPic_Anabel[] = INCBIN_U32("graphics/event_objects/pics/people/frontier_brains/anabel.4bpp"); const u32 gObjectEventPic_Tucker[] = INCBIN_U32("graphics/event_objects/pics/people/frontier_brains/tucker.4bpp"); @@ -357,6 +357,6 @@ const u32 gObjectEventPic_Noland[] = INCBIN_U32("graphics/event_objects/pics/peo const u32 gObjectEventPic_Lucy[] = INCBIN_U32("graphics/event_objects/pics/people/frontier_brains/lucy.4bpp"); const u32 gObjectEventPic_Brandon[] = INCBIN_U32("graphics/event_objects/pics/people/frontier_brains/brandon.4bpp"); const u32 gObjectEventPic_Lugia[] = INCBIN_U32("graphics/event_objects/pics/pokemon/lugia.4bpp"); -const u16 gObjectEventPalette32[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_32.gbapal"); +const u16 gObjectEventPalette32[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_32.gbapal"); const u32 gObjectEventPic_HoOh[] = INCBIN_U32("graphics/event_objects/pics/pokemon/ho_oh.4bpp"); -const u16 gObjectEventPalette31[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_31.gbapal"); +const u16 gObjectEventPalette31[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_31.gbapal");