Move field effects data and graphics into own directory, and cleanup naming for object events
This commit is contained in:
Marcus Huderle committed
1 parent
956090b05f
commit
49421a41b2
98 files changed
+96
-96
No files matched your search
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -817,7 +817,7 @@ static const struct SpriteTemplate sSpriteTemplate_85C8EBC =
|
||||
.callback = sub_8148380
|
||||
};
|
||||
|
||||
static const u16 gFieldEffectObjectPalette10[] = INCBIN_U16("graphics/object_events/palettes/field_effect_object_palette_10.gbapal");
|
||||
static const u16 gFieldEffectObjectPalette10[] = INCBIN_U16("graphics/field_effects/palettes/10.gbapal");
|
||||
|
||||
const struct SpritePalette gFieldEffectObjectPaletteInfo10 =
|
||||
{
|
||||
|
||||
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
+78
-78
@@ -1,9 +1,9 @@
|
||||
const u32 gObjectEventPic_BrendanNormal[] = INCBIN_U32("graphics/object_events/pics/people/brendan/walking.4bpp");
|
||||
const u32 gObjectEventPic_BrendanRunning[] = INCBIN_U32("graphics/object_events/pics/people/brendan/running.4bpp");
|
||||
const u16 gObjectEventPalette8[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_08.gbapal");
|
||||
const u16 gObjectEventPalette8[] = INCBIN_U16("graphics/object_events/palettes/08.gbapal");
|
||||
const u32 gObjectEventPic_RubySapphireBrendanNormal[] = INCBIN_U32("graphics/object_events/pics/people/ruby_sapphire_brendan/walking.4bpp");
|
||||
const u32 gObjectEventPic_RubySapphireBrendanRunning[] = INCBIN_U32("graphics/object_events/pics/people/ruby_sapphire_brendan/running.4bpp");
|
||||
const u16 gObjectEventPalette33[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_33.gbapal");
|
||||
const u16 gObjectEventPalette33[] = INCBIN_U16("graphics/object_events/palettes/33.gbapal");
|
||||
const u16 gObjectEventPaletteNull1[16] = {};
|
||||
const u16 gObjectEventPaletteNull2[16] = {};
|
||||
const u16 gObjectEventPaletteNull3[16] = {};
|
||||
@@ -19,8 +19,8 @@ const u16 gObjectEventPaletteNull12[16] = {};
|
||||
const u16 gObjectEventPaletteNull13[16] = {};
|
||||
const u16 gObjectEventPaletteNull14[16] = {};
|
||||
const u16 gObjectEventPaletteNull15[16] = {};
|
||||
const u16 gObjectEventPalette9[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_09.gbapal");
|
||||
const u16 gObjectEventPalette10[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_10.gbapal");
|
||||
const u16 gObjectEventPalette9[] = INCBIN_U16("graphics/object_events/palettes/09.gbapal");
|
||||
const u16 gObjectEventPalette10[] = INCBIN_U16("graphics/object_events/palettes/10.gbapal");
|
||||
const u32 gObjectEventPic_BrendanFieldMove[] = INCBIN_U32("graphics/object_events/pics/people/brendan/field_move.4bpp");
|
||||
const u32 gObjectEventPic_BrendanSurfing[] = INCBIN_U32("graphics/object_events/pics/people/brendan/surfing.4bpp");
|
||||
const u32 gObjectEventPic_BrendanMachBike[] = INCBIN_U32("graphics/object_events/pics/people/brendan/mach_bike.4bpp");
|
||||
@@ -31,14 +31,14 @@ const u32 gObjectEventPic_BrendanDecorating[] = INCBIN_U32("graphics/object_even
|
||||
const u32 gObjectEventPic_MayDecorating[] = INCBIN_U32("graphics/object_events/pics/people/may/decorating.4bpp");
|
||||
const u32 gObjectEventPic_BrendanUnderwater[] = INCBIN_U32("graphics/object_events/pics/people/brendan/underwater.4bpp");
|
||||
const u32 gObjectEventPic_MayUnderwater[] = INCBIN_U32("graphics/object_events/pics/people/may/underwater.4bpp");
|
||||
const u16 gObjectEventPalette11[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_11.gbapal");
|
||||
const u16 gObjectEventPalette11[] = INCBIN_U16("graphics/object_events/palettes/11.gbapal");
|
||||
const u32 gObjectEventPic_MayNormal[] = INCBIN_U32("graphics/object_events/pics/people/may/walking.4bpp");
|
||||
const u32 gObjectEventPic_MayRunning[] = INCBIN_U32("graphics/object_events/pics/people/may/running.4bpp");
|
||||
const u16 gObjectEventPalette17[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_17.gbapal");
|
||||
const u16 gObjectEventPalette18[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_18.gbapal");
|
||||
const u16 gObjectEventPalette17[] = INCBIN_U16("graphics/object_events/palettes/17.gbapal");
|
||||
const u16 gObjectEventPalette18[] = INCBIN_U16("graphics/object_events/palettes/18.gbapal");
|
||||
const u32 gObjectEventPic_RubySapphireMayNormal[] = INCBIN_U32("graphics/object_events/pics/people/ruby_sapphire_may/walking.4bpp");
|
||||
const u32 gObjectEventPic_RubySapphireMayRunning[] = INCBIN_U32("graphics/object_events/pics/people/ruby_sapphire_may/running.4bpp");
|
||||
const u16 gObjectEventPalette34[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_34.gbapal");
|
||||
const u16 gObjectEventPalette34[] = INCBIN_U16("graphics/object_events/palettes/34.gbapal");
|
||||
const u16 gUnusedObjectEventPalette[] = INCBIN_U16("graphics/object_events/palettes/unused_palette.gbapal");
|
||||
const u16 gObjectEventPaletteNull16[16] = {};
|
||||
const u16 gObjectEventPaletteNull17[16] = {};
|
||||
@@ -60,14 +60,14 @@ const u32 gObjectEventPic_MaySurfing[] = INCBIN_U32("graphics/object_events/pics
|
||||
const u32 gObjectEventPic_MayFieldMove[] = INCBIN_U32("graphics/object_events/pics/people/may/field_move.4bpp");
|
||||
const u32 gObjectEventPic_MayFishing[] = INCBIN_U32("graphics/object_events/pics/people/may/fishing.4bpp");
|
||||
const u32 gObjectEventPic_MayWatering[] = INCBIN_U32("graphics/object_events/pics/people/may/watering.4bpp");
|
||||
const u16 gObjectEventPalette0[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_00.gbapal");
|
||||
const u16 gObjectEventPalette1[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_01.gbapal");
|
||||
const u16 gObjectEventPalette2[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_02.gbapal");
|
||||
const u16 gObjectEventPalette3[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_03.gbapal");
|
||||
const u16 gObjectEventPalette4[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_04.gbapal");
|
||||
const u16 gObjectEventPalette5[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_05.gbapal");
|
||||
const u16 gObjectEventPalette6[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_06.gbapal");
|
||||
const u16 gObjectEventPalette7[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_07.gbapal");
|
||||
const u16 gObjectEventPalette0[] = INCBIN_U16("graphics/object_events/palettes/00.gbapal");
|
||||
const u16 gObjectEventPalette1[] = INCBIN_U16("graphics/object_events/palettes/01.gbapal");
|
||||
const u16 gObjectEventPalette2[] = INCBIN_U16("graphics/object_events/palettes/02.gbapal");
|
||||
const u16 gObjectEventPalette3[] = INCBIN_U16("graphics/object_events/palettes/03.gbapal");
|
||||
const u16 gObjectEventPalette4[] = INCBIN_U16("graphics/object_events/palettes/04.gbapal");
|
||||
const u16 gObjectEventPalette5[] = INCBIN_U16("graphics/object_events/palettes/05.gbapal");
|
||||
const u16 gObjectEventPalette6[] = INCBIN_U16("graphics/object_events/palettes/06.gbapal");
|
||||
const u16 gObjectEventPalette7[] = INCBIN_U16("graphics/object_events/palettes/07.gbapal");
|
||||
const u32 gObjectEventPic_NinjaBoy[] = INCBIN_U32("graphics/object_events/pics/people/ninja_boy.4bpp");
|
||||
const u32 gObjectEventPic_Twin[] = INCBIN_U32("graphics/object_events/pics/people/twin.4bpp");
|
||||
const u32 gObjectEventPic_Boy1[] = INCBIN_U32("graphics/object_events/pics/people/boy_1.4bpp");
|
||||
@@ -177,10 +177,10 @@ const u32 gObjectEventPic_Wingull[] = INCBIN_U32("graphics/object_events/pics/po
|
||||
const u32 gObjectEventPic_TuberMSwimming[] = INCBIN_U32("graphics/object_events/pics/people/tuber_m_swimming.4bpp");
|
||||
const u32 gObjectEventPic_Azurill[] = INCBIN_U32("graphics/object_events/pics/pokemon/azurill.4bpp");
|
||||
const u32 gObjectEventPic_Mom[] = INCBIN_U32("graphics/object_events/pics/people/mom.4bpp");
|
||||
const u16 gObjectEventPalette22[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_22.gbapal");
|
||||
const u16 gObjectEventPalette23[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_23.gbapal");
|
||||
const u16 gObjectEventPalette24[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_24.gbapal");
|
||||
const u16 gObjectEventPalette25[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_25.gbapal");
|
||||
const u16 gObjectEventPalette22[] = INCBIN_U16("graphics/object_events/palettes/22.gbapal");
|
||||
const u16 gObjectEventPalette23[] = INCBIN_U16("graphics/object_events/palettes/23.gbapal");
|
||||
const u16 gObjectEventPalette24[] = INCBIN_U16("graphics/object_events/palettes/24.gbapal");
|
||||
const u16 gObjectEventPalette25[] = INCBIN_U16("graphics/object_events/palettes/25.gbapal");
|
||||
const u32 gObjectEventPic_UnusedNatuDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/unused_natu_doll.4bpp");
|
||||
const u32 gObjectEventPic_UnusedMagnemiteDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/unused_magnemite_doll.4bpp");
|
||||
const u32 gObjectEventPic_UnusedSquirtleDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/unused_squirtle_doll.4bpp");
|
||||
@@ -238,21 +238,21 @@ const u32 gObjectEventPic_PushableBoulder[] = INCBIN_U32("graphics/object_events
|
||||
const u32 gObjectEventPic_MrBrineysBoat[] = INCBIN_U32("graphics/object_events/pics/misc/mr_brineys_boat.4bpp");
|
||||
const u32 gObjectEventPic_Fossil[] = INCBIN_U32("graphics/object_events/pics/misc/fossil.4bpp");
|
||||
const u32 gObjectEventPic_SubmarineShadow[] = INCBIN_U32("graphics/object_events/pics/misc/submarine_shadow.4bpp");
|
||||
const u16 gObjectEventPalette26[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_26.gbapal");
|
||||
const u16 gObjectEventPalette26[] = INCBIN_U16("graphics/object_events/palettes/26.gbapal");
|
||||
const u32 gObjectEventPic_Truck[] = INCBIN_U32("graphics/object_events/pics/misc/truck.4bpp");
|
||||
const u16 gObjectEventPalette14[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_14.gbapal");
|
||||
const u16 gObjectEventPalette14[] = INCBIN_U16("graphics/object_events/palettes/14.gbapal");
|
||||
const u32 gObjectEventPic_Vigoroth[] = INCBIN_U32("graphics/object_events/pics/pokemon/vigoroth.4bpp");
|
||||
const u16 gObjectEventPalette15[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_15.gbapal");
|
||||
const u16 gObjectEventPalette15[] = INCBIN_U16("graphics/object_events/palettes/15.gbapal");
|
||||
const u32 gObjectEventPic_BirchsBag[] = INCBIN_U32("graphics/object_events/pics/misc/birchs_bag.4bpp");
|
||||
const u32 gObjectEventPic_EnemyZigzagoon[] = INCBIN_U32("graphics/object_events/pics/pokemon/enemy_zigzagoon.4bpp");
|
||||
const u16 gObjectEventPalette16[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_16.gbapal");
|
||||
const u16 gObjectEventPalette16[] = INCBIN_U16("graphics/object_events/palettes/16.gbapal");
|
||||
const u32 gObjectEventPic_Poochyena[] = INCBIN_U32("graphics/object_events/pics/pokemon/poochyena.4bpp");
|
||||
const u16 gObjectEventPalette27[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_27.gbapal");
|
||||
const u16 gObjectEventPalette27[] = INCBIN_U16("graphics/object_events/palettes/27.gbapal");
|
||||
const u32 gObjectEventPic_CableCar[] = INCBIN_U32("graphics/object_events/pics/misc/cable_car.4bpp");
|
||||
const u16 gObjectEventPalette20[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_20.gbapal");
|
||||
const u16 gObjectEventPalette20[] = INCBIN_U16("graphics/object_events/palettes/20.gbapal");
|
||||
const u32 gObjectEventPic_SSTidal[] = INCBIN_U32("graphics/object_events/pics/misc/ss_tidal.4bpp");
|
||||
const u16 gObjectEventPalette21[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_21.gbapal");
|
||||
const u32 gFieldEffectObjectPic_BerryTreeGrowthSparkle[] = INCBIN_U32("graphics/object_events/pics/effects/berry_tree_growth_sparkle.4bpp");
|
||||
const u16 gObjectEventPalette21[] = INCBIN_U16("graphics/object_events/palettes/21.gbapal");
|
||||
const u32 gFieldEffectObjectPic_BerryTreeGrowthSparkle[] = INCBIN_U32("graphics/field_effects/pics/berry_tree_growth_sparkle.4bpp");
|
||||
const u32 gObjectEventPic_BerryTreeDirtPile[] = INCBIN_U32("graphics/object_events/pics/berry_trees/dirt_pile.4bpp");
|
||||
const u32 gObjectEventPic_BerryTreeSprout[] = INCBIN_U32("graphics/object_events/pics/berry_trees/sprout.4bpp");
|
||||
const u32 gObjectEventPic_PechaBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/pecha.4bpp");
|
||||
@@ -285,52 +285,52 @@ const u32 gObjectEventPic_CornnBerryTree[] = INCBIN_U32("graphics/object_events/
|
||||
const u32 gObjectEventPic_LansatBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/lansat.4bpp");
|
||||
const u32 gObjectEventPic_DurinBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/durin.4bpp");
|
||||
const u32 gObjectEventPic_TamatoBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/tamato.4bpp");
|
||||
const u32 gFieldEffectObjectPic_SurfBlob[] = INCBIN_U32("graphics/object_events/pics/effects/surf_blob.4bpp");
|
||||
const u32 gFieldEffectObjectPic_SurfBlob[] = INCBIN_U32("graphics/field_effects/pics/surf_blob.4bpp");
|
||||
const u32 gObjectEventPic_QuintyPlump[] = INCBIN_U32("graphics/object_events/pics/people/quinty_plump.4bpp");
|
||||
const u16 gObjectEventPalette12[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_12.gbapal");
|
||||
const u16 gObjectEventPalette13[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_13.gbapal");
|
||||
const u32 gFieldEffectObjectPic_ShadowSmall[] = INCBIN_U32("graphics/object_events/pics/effects/shadow_small.4bpp");
|
||||
const u32 gFieldEffectObjectPic_ShadowMedium[] = INCBIN_U32("graphics/object_events/pics/effects/shadow_medium.4bpp");
|
||||
const u32 gFieldEffectObjectPic_ShadowLarge[] = INCBIN_U32("graphics/object_events/pics/effects/shadow_large.4bpp");
|
||||
const u32 gFieldEffectObjectPic_ShadowExtraLarge[] = INCBIN_U32("graphics/object_events/pics/effects/shadow_extra_large.4bpp");
|
||||
const u16 gObjectEventPalette12[] = INCBIN_U16("graphics/object_events/palettes/12.gbapal");
|
||||
const u16 gObjectEventPalette13[] = INCBIN_U16("graphics/object_events/palettes/13.gbapal");
|
||||
const u32 gFieldEffectObjectPic_ShadowSmall[] = INCBIN_U32("graphics/field_effects/pics/shadow_small.4bpp");
|
||||
const u32 gFieldEffectObjectPic_ShadowMedium[] = INCBIN_U32("graphics/field_effects/pics/shadow_medium.4bpp");
|
||||
const u32 gFieldEffectObjectPic_ShadowLarge[] = INCBIN_U32("graphics/field_effects/pics/shadow_large.4bpp");
|
||||
const u32 gFieldEffectObjectPic_ShadowExtraLarge[] = INCBIN_U32("graphics/field_effects/pics/shadow_extra_large.4bpp");
|
||||
const u32 filler_8368A08[0x48] = {};
|
||||
const u8 gFieldEffectPic_CutGrass[] = INCBIN_U8("graphics/object_events/pics/effects/cut_grass.4bpp");
|
||||
const u32 gFieldEffectPic_CutGrass_Copy[] = INCBIN_U32("graphics/object_events/pics/effects/cut_grass.4bpp");
|
||||
const u16 gFieldEffectObjectPalette6[] = INCBIN_U16("graphics/object_events/palettes/field_effect_object_palette_06.gbapal");
|
||||
const u32 gFieldEffectObjectPic_Ripple[] = INCBIN_U32("graphics/object_events/pics/effects/ripple.4bpp");
|
||||
const u32 gFieldEffectObjectPic_Ash[] = INCBIN_U32("graphics/object_events/pics/effects/ash.4bpp");
|
||||
const u32 gFieldEffectObjectPic_Arrow[] = INCBIN_U32("graphics/object_events/pics/effects/arrow.4bpp");
|
||||
const u16 gFieldEffectObjectPalette0[] = INCBIN_U16("graphics/object_events/palettes/field_effect_object_palette_00.gbapal");
|
||||
const u16 gFieldEffectObjectPalette1[] = INCBIN_U16("graphics/object_events/palettes/field_effect_object_palette_01.gbapal");
|
||||
const u32 gFieldEffectObjectPic_GroundImpactDust[] = INCBIN_U32("graphics/object_events/pics/effects/ground_impact_dust.4bpp");
|
||||
const u32 gFieldEffectObjectPic_BikeHopTallGrass[] = INCBIN_U32("graphics/object_events/pics/effects/bike_hop_tall_grass.4bpp");
|
||||
const u32 gUnusedGrass[] = INCBIN_U32("graphics/object_events/pics/effects/unused_grass.4bpp");
|
||||
const u32 gFieldEffectObjectPic_Unknown16[] = INCBIN_U32("graphics/object_events/pics/effects/unknown_16.4bpp");
|
||||
const u32 gFieldEffectObjectPic_Unknown17[] = INCBIN_U32("graphics/object_events/pics/effects/unknown_17.4bpp");
|
||||
const u32 gFieldEffectObjectPic_Unknown18[] = INCBIN_U32("graphics/object_events/pics/effects/unknown_18.4bpp");
|
||||
const u32 gFieldEffectObjectPic_LongGrass[] = INCBIN_U32("graphics/object_events/pics/effects/long_grass.4bpp");
|
||||
const u32 gFieldEffectObjectPic_TallGrass[] = INCBIN_U32("graphics/object_events/pics/effects/tall_grass.4bpp");
|
||||
const u32 gFieldEffectObjectPic_ShortGrass[] = INCBIN_U32("graphics/object_events/pics/effects/short_grass.4bpp");
|
||||
const u32 gFieldEffectObjectPic_SandFootprints[] = INCBIN_U32("graphics/object_events/pics/effects/sand_footprints.4bpp");
|
||||
const u32 gFieldEffectObjectPic_DeepSandFootprints[] = INCBIN_U32("graphics/object_events/pics/effects/deep_sand_footprints.4bpp");
|
||||
const u32 gFieldEffectObjectPic_BikeTireTracks[] = INCBIN_U32("graphics/object_events/pics/effects/bike_tire_tracks.4bpp");
|
||||
const u32 gFieldEffectObjectPic_Unknown19[] = INCBIN_U32("graphics/object_events/pics/effects/unknown_19.4bpp");
|
||||
const u32 gFieldEffectObjectPic_Unknown29[] = INCBIN_U32("graphics/object_events/pics/effects/unknown_29.4bpp");
|
||||
const u32 gFieldEffectObjectPic_BikeHopBigSplash[] = INCBIN_U32("graphics/object_events/pics/effects/bike_hop_big_splash.4bpp");
|
||||
const u32 gFieldEffectObjectPic_Splash[] = INCBIN_U32("graphics/object_events/pics/effects/splash.4bpp");
|
||||
const u32 gFieldEffectObjectPic_BikeHopSmallSplash[] = INCBIN_U32("graphics/object_events/pics/effects/bike_hop_small_splash.4bpp");
|
||||
const u32 gFieldEffectObjectPic_Unknown20[] = INCBIN_U32("graphics/object_events/pics/effects/unknown_20.4bpp");
|
||||
const u32 gFieldEffectObjectPic_TreeDisguise[] = INCBIN_U32("graphics/object_events/pics/effects/tree_disguise.4bpp");
|
||||
const u32 gFieldEffectObjectPic_MountainDisguise[] = INCBIN_U32("graphics/object_events/pics/effects/mountain_disguise.4bpp");
|
||||
const u32 gFieldEffectObjectPic_SandDisguisePlaceholder[] = INCBIN_U32("graphics/object_events/pics/effects/sand_disguise_placeholder.4bpp");
|
||||
const u32 gFieldEffectObjectPic_HotSpringsWater[] = INCBIN_U32("graphics/object_events/pics/effects/hot_springs_water.4bpp");
|
||||
const u16 gFieldEffectObjectPalette2[] = INCBIN_U16("graphics/object_events/palettes/field_effect_object_palette_02.gbapal");
|
||||
const u32 gFieldEffectObjectPic_JumpOutOfAsh[] = INCBIN_U32("graphics/object_events/pics/effects/jump_out_of_ash.4bpp");
|
||||
const u32 gFieldEffectObjectPic_LavaridgeGymWarp[] = INCBIN_U32("graphics/object_events/pics/effects/lavaridge_gym_warp.4bpp");
|
||||
const u32 gFieldEffectObjectPic_Bubbles[] = INCBIN_U32("graphics/object_events/pics/effects/bubbles.4bpp");
|
||||
const u32 gFieldEffectObjectPic_Unknown35[] = INCBIN_U32("graphics/object_events/pics/effects/unknown_35.4bpp");
|
||||
const u16 gFieldEffectObjectPalette3[] = INCBIN_U16("graphics/object_events/palettes/field_effect_object_palette_03.gbapal");
|
||||
const u32 gFieldEffectObjectPic_Bird[] = INCBIN_U32("graphics/object_events/pics/effects/bird.4bpp");
|
||||
const u8 gFieldEffectPic_CutGrass[] = INCBIN_U8("graphics/field_effects/pics/cut_grass.4bpp");
|
||||
const u32 gFieldEffectPic_CutGrass_Copy[] = INCBIN_U32("graphics/field_effects/pics/cut_grass.4bpp");
|
||||
const u16 gFieldEffectObjectPalette6[] = INCBIN_U16("graphics/field_effects/palettes/06.gbapal");
|
||||
const u32 gFieldEffectObjectPic_Ripple[] = INCBIN_U32("graphics/field_effects/pics/ripple.4bpp");
|
||||
const u32 gFieldEffectObjectPic_Ash[] = INCBIN_U32("graphics/field_effects/pics/ash.4bpp");
|
||||
const u32 gFieldEffectObjectPic_Arrow[] = INCBIN_U32("graphics/field_effects/pics/arrow.4bpp");
|
||||
const u16 gFieldEffectObjectPalette0[] = INCBIN_U16("graphics/field_effects/palettes/00.gbapal");
|
||||
const u16 gFieldEffectObjectPalette1[] = INCBIN_U16("graphics/field_effects/palettes/01.gbapal");
|
||||
const u32 gFieldEffectObjectPic_GroundImpactDust[] = INCBIN_U32("graphics/field_effects/pics/ground_impact_dust.4bpp");
|
||||
const u32 gFieldEffectObjectPic_BikeHopTallGrass[] = INCBIN_U32("graphics/field_effects/pics/bike_hop_tall_grass.4bpp");
|
||||
const u32 gUnusedGrass[] = INCBIN_U32("graphics/field_effects/pics/unused_grass.4bpp");
|
||||
const u32 gFieldEffectObjectPic_Unknown16[] = INCBIN_U32("graphics/field_effects/pics/unknown_16.4bpp");
|
||||
const u32 gFieldEffectObjectPic_Unknown17[] = INCBIN_U32("graphics/field_effects/pics/unknown_17.4bpp");
|
||||
const u32 gFieldEffectObjectPic_Unknown18[] = INCBIN_U32("graphics/field_effects/pics/unknown_18.4bpp");
|
||||
const u32 gFieldEffectObjectPic_LongGrass[] = INCBIN_U32("graphics/field_effects/pics/long_grass.4bpp");
|
||||
const u32 gFieldEffectObjectPic_TallGrass[] = INCBIN_U32("graphics/field_effects/pics/tall_grass.4bpp");
|
||||
const u32 gFieldEffectObjectPic_ShortGrass[] = INCBIN_U32("graphics/field_effects/pics/short_grass.4bpp");
|
||||
const u32 gFieldEffectObjectPic_SandFootprints[] = INCBIN_U32("graphics/field_effects/pics/sand_footprints.4bpp");
|
||||
const u32 gFieldEffectObjectPic_DeepSandFootprints[] = INCBIN_U32("graphics/field_effects/pics/deep_sand_footprints.4bpp");
|
||||
const u32 gFieldEffectObjectPic_BikeTireTracks[] = INCBIN_U32("graphics/field_effects/pics/bike_tire_tracks.4bpp");
|
||||
const u32 gFieldEffectObjectPic_Unknown19[] = INCBIN_U32("graphics/field_effects/pics/unknown_19.4bpp");
|
||||
const u32 gFieldEffectObjectPic_Unknown29[] = INCBIN_U32("graphics/field_effects/pics/unknown_29.4bpp");
|
||||
const u32 gFieldEffectObjectPic_BikeHopBigSplash[] = INCBIN_U32("graphics/field_effects/pics/bike_hop_big_splash.4bpp");
|
||||
const u32 gFieldEffectObjectPic_Splash[] = INCBIN_U32("graphics/field_effects/pics/splash.4bpp");
|
||||
const u32 gFieldEffectObjectPic_BikeHopSmallSplash[] = INCBIN_U32("graphics/field_effects/pics/bike_hop_small_splash.4bpp");
|
||||
const u32 gFieldEffectObjectPic_Unknown20[] = INCBIN_U32("graphics/field_effects/pics/unknown_20.4bpp");
|
||||
const u32 gFieldEffectObjectPic_TreeDisguise[] = INCBIN_U32("graphics/field_effects/pics/tree_disguise.4bpp");
|
||||
const u32 gFieldEffectObjectPic_MountainDisguise[] = INCBIN_U32("graphics/field_effects/pics/mountain_disguise.4bpp");
|
||||
const u32 gFieldEffectObjectPic_SandDisguisePlaceholder[] = INCBIN_U32("graphics/field_effects/pics/sand_disguise_placeholder.4bpp");
|
||||
const u32 gFieldEffectObjectPic_HotSpringsWater[] = INCBIN_U32("graphics/field_effects/pics/hot_springs_water.4bpp");
|
||||
const u16 gFieldEffectObjectPalette2[] = INCBIN_U16("graphics/field_effects/palettes/02.gbapal");
|
||||
const u32 gFieldEffectObjectPic_JumpOutOfAsh[] = INCBIN_U32("graphics/field_effects/pics/jump_out_of_ash.4bpp");
|
||||
const u32 gFieldEffectObjectPic_LavaridgeGymWarp[] = INCBIN_U32("graphics/field_effects/pics/lavaridge_gym_warp.4bpp");
|
||||
const u32 gFieldEffectObjectPic_Bubbles[] = INCBIN_U32("graphics/field_effects/pics/bubbles.4bpp");
|
||||
const u32 gFieldEffectObjectPic_Unknown35[] = INCBIN_U32("graphics/field_effects/pics/unknown_35.4bpp");
|
||||
const u16 gFieldEffectObjectPalette3[] = INCBIN_U16("graphics/field_effects/palettes/03.gbapal");
|
||||
const u32 gFieldEffectObjectPic_Bird[] = INCBIN_U32("graphics/field_effects/pics/bird.4bpp");
|
||||
const u32 gObjectEventPic_Juan[] = INCBIN_U32("graphics/object_events/pics/people/gym_leaders/juan.4bpp");
|
||||
const u32 gObjectEventPic_Scott[] = INCBIN_U32("graphics/object_events/pics/people/scott.4bpp");
|
||||
const u32 gObjectEventPic_Statue[] = INCBIN_U32("graphics/object_events/pics/misc/statue.4bpp");
|
||||
@@ -339,15 +339,15 @@ const u32 gObjectEventPic_Dusclops[] = INCBIN_U32("graphics/object_events/pics/p
|
||||
const u32 gObjectEventPic_MysteryEventDeliveryman[] = INCBIN_U32("graphics/object_events/pics/people/mystery_event_deliveryman.4bpp");
|
||||
const u32 gObjectEventPic_UnionRoomAttendant[] = INCBIN_U32("graphics/object_events/pics/people/union_room_attendant.4bpp");
|
||||
const u32 gObjectEventPic_MovingBox[] = INCBIN_U32("graphics/object_events/pics/misc/moving_box.4bpp");
|
||||
const u16 gObjectEventPalette19[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_19.gbapal");
|
||||
const u16 gObjectEventPalette19[] = INCBIN_U16("graphics/object_events/palettes/19.gbapal");
|
||||
const u32 gObjectEventPic_Sudowoodo[] = INCBIN_U32("graphics/object_events/pics/pokemon/sudowoodo.4bpp");
|
||||
const u32 gObjectEventPic_Mew[] = INCBIN_U32("graphics/object_events/pics/pokemon/mew.4bpp");
|
||||
const u16 gObjectEventPalette28[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_28.gbapal");
|
||||
const u16 gObjectEventPalette28[] = INCBIN_U16("graphics/object_events/palettes/28.gbapal");
|
||||
const u32 gObjectEventPic_Red[] = INCBIN_U32("graphics/object_events/pics/people/red.4bpp");
|
||||
const u32 gObjectEventPic_Leaf[] = INCBIN_U32("graphics/object_events/pics/people/leaf.4bpp");
|
||||
const u16 gObjectEventPalette30[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_30.gbapal");
|
||||
const u16 gObjectEventPalette30[] = INCBIN_U16("graphics/object_events/palettes/30.gbapal");
|
||||
const u32 gObjectEventPic_BirthIslandStone[] = INCBIN_U32("graphics/object_events/pics/misc/birth_island_stone.4bpp");
|
||||
const u16 gObjectEventPalette29[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_29.gbapal");
|
||||
const u16 gObjectEventPalette29[] = INCBIN_U16("graphics/object_events/palettes/29.gbapal");
|
||||
const u32 gObjectEventPic_Deoxys[] = INCBIN_U32("graphics/object_events/pics/pokemon/deoxys.4bpp");
|
||||
const u32 gObjectEventPic_Anabel[] = INCBIN_U32("graphics/object_events/pics/people/frontier_brains/anabel.4bpp");
|
||||
const u32 gObjectEventPic_Tucker[] = INCBIN_U32("graphics/object_events/pics/people/frontier_brains/tucker.4bpp");
|
||||
@@ -357,6 +357,6 @@ const u32 gObjectEventPic_Noland[] = INCBIN_U32("graphics/object_events/pics/peo
|
||||
const u32 gObjectEventPic_Lucy[] = INCBIN_U32("graphics/object_events/pics/people/frontier_brains/lucy.4bpp");
|
||||
const u32 gObjectEventPic_Brandon[] = INCBIN_U32("graphics/object_events/pics/people/frontier_brains/brandon.4bpp");
|
||||
const u32 gObjectEventPic_Lugia[] = INCBIN_U32("graphics/object_events/pics/pokemon/lugia.4bpp");
|
||||
const u16 gObjectEventPalette32[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_32.gbapal");
|
||||
const u16 gObjectEventPalette32[] = INCBIN_U16("graphics/object_events/palettes/32.gbapal");
|
||||
const u32 gObjectEventPic_HoOh[] = INCBIN_U32("graphics/object_events/pics/pokemon/ho_oh.4bpp");
|
||||
const u16 gObjectEventPalette31[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_31.gbapal");
|
||||
const u16 gObjectEventPalette31[] = INCBIN_U16("graphics/object_events/palettes/31.gbapal");
|
||||
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
+12
-12
@@ -140,7 +140,7 @@ void (*const gCameraObjectFuncs[])(struct Sprite *) = {
|
||||
CameraObject_2,
|
||||
};
|
||||
|
||||
#include "data/object_event/event_object_graphics.h"
|
||||
#include "data/object_events/object_event_graphics.h"
|
||||
|
||||
// movement type callbacks
|
||||
static void (*const sMovementTypeCallbacks[])(struct Sprite *) =
|
||||
@@ -433,13 +433,13 @@ const u8 gInitialMovementTypeFacingDirections[] = {
|
||||
#define OBJ_EVENT_PAL_TAG_34 0x1123
|
||||
#define OBJ_EVENT_PAL_TAG_NONE 0x11FF
|
||||
|
||||
#include "data/object_event/event_object_graphics_info_pointers.h"
|
||||
#include "data/object_event/field_effect_object_template_pointers.h"
|
||||
#include "data/object_event/event_object_pic_tables.h"
|
||||
#include "data/object_event/event_object_anims.h"
|
||||
#include "data/object_event/base_oam.h"
|
||||
#include "data/object_event/event_object_subsprites.h"
|
||||
#include "data/object_event/event_object_graphics_info.h"
|
||||
#include "data/object_events/object_event_graphics_info_pointers.h"
|
||||
#include "data/field_effects/field_effect_object_template_pointers.h"
|
||||
#include "data/object_events/object_event_pic_tables.h"
|
||||
#include "data/object_events/object_event_anims.h"
|
||||
#include "data/object_events/base_oam.h"
|
||||
#include "data/object_events/object_event_subsprites.h"
|
||||
#include "data/object_events/object_event_graphics_info.h"
|
||||
|
||||
const struct SpritePalette sObjectEventSpritePalettes[] = {
|
||||
{gObjectEventPalette0, OBJ_EVENT_PAL_TAG_0},
|
||||
@@ -661,14 +661,14 @@ const u16 *const gObjectPaletteTagSets[] = {
|
||||
gObjectPaletteTags3,
|
||||
};
|
||||
|
||||
#include "data/object_event/berry_tree_graphics_tables.h"
|
||||
#include "data/object_event/field_effect_objects.h"
|
||||
#include "data/object_events/berry_tree_graphics_tables.h"
|
||||
#include "data/field_effects/field_effect_objects.h"
|
||||
|
||||
const s16 gMovementDelaysMedium[] = {32, 64, 96, 128};
|
||||
const s16 gMovementDelaysLong[] = {32, 64, 128, 192};
|
||||
const s16 gMovementDelaysShort[] = {32, 48, 64, 80};
|
||||
|
||||
#include "data/object_event/movement_type_func_tables.h"
|
||||
#include "data/object_events/movement_type_func_tables.h"
|
||||
|
||||
const u8 gFaceDirectionAnimNums[] = {
|
||||
[DIR_NONE] = 0,
|
||||
@@ -1089,7 +1089,7 @@ const u8 gUnknown_0850DC3F[][4] = {
|
||||
{3, 4, 2, 1}
|
||||
};
|
||||
|
||||
#include "data/object_event/movement_action_func_tables.h"
|
||||
#include "data/object_events/movement_action_func_tables.h"
|
||||
|
||||
// Code
|
||||
|
||||
|
||||
+2
-2
@@ -245,12 +245,12 @@ const u32 gNewGameBirchPic[] = INCBIN_U32("graphics/birch_speech/birch.4bpp");
|
||||
const u32 gUnusedBirchBeauty[] = INCBIN_U32("graphics/unused/intro_birch_beauty.4bpp");
|
||||
const u16 gNewGameBirchPalette[16] = INCBIN_U16("graphics/birch_speech/birch.gbapal");
|
||||
const u32 gSpriteImage_855A970[] = INCBIN_U32("graphics/misc/pokeball_glow.4bpp");
|
||||
const u16 gFieldEffectObjectPalette4[16] = INCBIN_U16("graphics/object_events/palettes/field_effect_object_palette_04.gbapal");
|
||||
const u16 gFieldEffectObjectPalette4[16] = INCBIN_U16("graphics/field_effects/palettes/04.gbapal");
|
||||
const u32 gSpriteImage_855A9B0[] = INCBIN_U32("graphics/misc/pokecenter_monitor/0.4bpp");
|
||||
const u32 gSpriteImage_855AA70[] = INCBIN_U32("graphics/misc/pokecenter_monitor/1.4bpp");
|
||||
const u32 gSpriteImage_855AB30[] = INCBIN_U32("graphics/misc/big_hof_monitor.4bpp");
|
||||
const u8 gSpriteImage_855AD30[] = INCBIN_U8("graphics/misc/small_hof_monitor.4bpp");
|
||||
const u16 gFieldEffectObjectPalette5[16] = INCBIN_U16("graphics/object_events/palettes/field_effect_object_palette_05.gbapal");
|
||||
const u16 gFieldEffectObjectPalette5[16] = INCBIN_U16("graphics/field_effects/palettes/05.gbapal");
|
||||
|
||||
// Graphics for the lights streaking past your Pokemon when it uses a field move.
|
||||
const u32 gFieldMoveStreaksTiles[] = INCBIN_U32("graphics/misc/field_move_streaks.4bpp");
|
||||
|
||||
+3
-3
@@ -72,7 +72,7 @@ static const u8 gSpriteImage_858DB78[] = INCBIN_U8("graphics/unknown/858E588/4.4
|
||||
|
||||
static const u8 gUnusedEmptySpace_858DBF8[32] = {0};
|
||||
|
||||
static const u16 gFieldEffectObjectPalette7[] = INCBIN_U16("graphics/object_events/palettes/field_effect_object_palette_07.gbapal");
|
||||
static const u16 gFieldEffectObjectPalette7[] = INCBIN_U16("graphics/field_effects/palettes/07.gbapal");
|
||||
static const u8 gSpriteImage_858DC38[] = INCBIN_U8("graphics/unknown/858E5D8/0.4bpp");
|
||||
static const u8 gSpriteImage_858DCB8[] = INCBIN_U8("graphics/unknown/858E5D8/1.4bpp");
|
||||
static const u8 gSpriteImage_858DD38[] = INCBIN_U8("graphics/unknown/858E5D8/2.4bpp");
|
||||
@@ -84,7 +84,7 @@ static const u8 gSpriteImage_858DFB8[] = INCBIN_U8("graphics/unknown/858E5B0/2.4
|
||||
static const u8 gSpriteImage_858E038[] = INCBIN_U8("graphics/unknown/858E5B0/3.4bpp");
|
||||
static const u8 gSpriteImage_858E0B8[] = INCBIN_U8("graphics/unknown/858E5B0/4.4bpp");
|
||||
static const u8 gSpriteImage_858E138[] = INCBIN_U8("graphics/unknown/858E5B0/5.4bpp");
|
||||
static const u16 gFieldEffectObjectPalette8[] = INCBIN_U16("graphics/object_events/palettes/field_effect_object_palette_08.gbapal");
|
||||
static const u16 gFieldEffectObjectPalette8[] = INCBIN_U16("graphics/field_effects/palettes/08.gbapal");
|
||||
static const u8 gSpriteImage_858E1D8[] = INCBIN_U8("graphics/unknown/858E674/0.4bpp");
|
||||
static const u8 gSpriteImage_858E2D8[] = INCBIN_U8("graphics/unknown/858E674/1.4bpp");
|
||||
static const u8 gSpriteImage_858E3D8[] = INCBIN_U8("graphics/unknown/858E674/2.4bpp");
|
||||
@@ -285,7 +285,7 @@ static const struct SpriteTemplate gUnknown_0858E68C =
|
||||
.callback = SpriteCB_SandPillar_0,
|
||||
};
|
||||
|
||||
// This uses one of the secret base palettes, so there is no "field_effect_object_palette_09.pal" file.
|
||||
// This uses one of the secret base palettes, so there is no "graphics/field_effects/palettes/09.pal" file.
|
||||
const struct SpritePalette gFieldEffectObjectPaletteInfo9 = {gTilesetPalettes_SecretBase[5], 0x100E};
|
||||
|
||||
static const u8 gSpriteImage_858E6AC[] = INCBIN_U8("graphics/unknown/858E84C/0.4bpp");
|
||||
|
||||
Reference in new issue
Block a user