diff options
author | PikalaxALT <pikalaxalt@gmail.com> | 2021-05-03 16:54:07 -0400 |
---|---|---|
committer | PikalaxALT <pikalaxalt@gmail.com> | 2021-05-03 16:54:07 -0400 |
commit | e4c733d95d7bd5559c7f0b27f7f9e1466fd867c8 (patch) | |
tree | 5ed12203ea45416708bfabcc37d86085fe769083 /src | |
parent | 9ce96141c8ac2316fca20b542be87ed7a151b4d0 (diff) |
Move field effect graphics resources, 2
Diffstat (limited to 'src')
-rw-r--r-- | src/data/object_events/object_event_graphics.h | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/src/data/object_events/object_event_graphics.h b/src/data/object_events/object_event_graphics.h index ce0315624..7863a5954 100644 --- a/src/data/object_events/object_event_graphics.h +++ b/src/data/object_events/object_event_graphics.h @@ -194,34 +194,34 @@ const u16 filler_8398188[0x90] = {}; const u16 gUnknown_8398648[] = INCBIN_U16("graphics/field_effects/fldeff_cut.4bpp"); const u16 gUnknown_8398668[] = INCBIN_U16("graphics/field_effects/fldeff_cut.4bpp"); const u16 gUnknown_8398688[] = INCBIN_U16("graphics/field_effects/fldeff_cut.gbapal"); -const u16 gFieldEffectObjectPic_Ripple[] = INCBIN_U16("graphics/object_events/pics/unknown/83986A8.4bpp"); -const u16 gFieldEffectObjectPic_Ash[] = INCBIN_U16("graphics/object_events/pics/unknown/8398928.4bpp"); -const u16 gFieldEffectObjectPic_Arrow[] = INCBIN_U16("graphics/object_events/pics/unknown/8398BA8.4bpp"); +const u16 gFieldEffectObjectPic_Ripple[] = INCBIN_U16("graphics/field_effects/pics/ripple.4bpp"); +const u16 gFieldEffectObjectPic_Ash[] = INCBIN_U16("graphics/field_effects/pics/ash.4bpp"); +const u16 gFieldEffectObjectPic_Arrow[] = INCBIN_U16("graphics/field_effects/pics/arrow.4bpp"); const u16 gFieldEffectObjectPalette0[] = INCBIN_U16("graphics/field_effects/palettes/general_0.gbapal"); const u16 gFieldEffectObjectPalette1[] = INCBIN_U16("graphics/field_effects/palettes/general_1.gbapal"); const u16 filler_8398FE8[16] = {0}; -const u16 gFieldEffectObjectPic_GroundImpactDust[] = INCBIN_U16("graphics/object_events/pics/unknown/8399008.4bpp"); -UNUSED const u16 gFieldEffectObjectPic_UnusedGrass3[] = INCBIN_U16("graphics/object_events/pics/unknown/83990C8.4bpp"); -const u16 gFieldEffectObjectPic_JumpTallGrass[] = INCBIN_U16("graphics/object_events/pics/unknown/8399188.4bpp"); -UNUSED const u16 gFieldEffectObjectPic_UnusedGrass4[] = INCBIN_U16("graphics/object_events/pics/unknown/8399288.4bpp"); -const u16 gFieldEffectObjectPic_JumpLongGrass[] = INCBIN_U16("graphics/object_events/pics/unknown/8399488.4bpp"); -const u16 gFieldEffectObjectPic_UnusedGrass[] = INCBIN_U16("graphics/object_events/pics/unknown/8399788.4bpp"); -const u16 gFieldEffectObjectPic_UnusedGrass2[] = INCBIN_U16("graphics/object_events/pics/unknown/8399C08.4bpp"); +const u16 gFieldEffectObjectPic_GroundImpactDust[] = INCBIN_U16("graphics/field_effects/pics/ground_impact_dust.4bpp"); +UNUSED const u16 gFieldEffectObjectPic_UnusedGrass3[] = INCBIN_U16("graphics/field_effects/pics/unused_grass_3.4bpp"); +const u16 gFieldEffectObjectPic_JumpTallGrass[] = INCBIN_U16("graphics/field_effects/pics/jump_tall_grass.4bpp"); +UNUSED const u16 gFieldEffectObjectPic_UnusedGrass4[] = INCBIN_U16("graphics/field_effects/pics/unused_grass_4.4bpp"); +const u16 gFieldEffectObjectPic_JumpLongGrass[] = INCBIN_U16("graphics/field_effects/pics/jump_long_grass.4bpp"); +const u16 gFieldEffectObjectPic_UnusedGrass[] = INCBIN_U16("graphics/field_effects/pics/unused_grass.4bpp"); +const u16 gFieldEffectObjectPic_UnusedGrass2[] = INCBIN_U16("graphics/field_effects/pics/unused_grass_2.4bpp"); const u16 gFieldEffectObjectPic_LongGrass[] = INCBIN_U16("graphics/field_effects/pics/long_grass.4bpp"); -const u16 gFieldEffectObjectPic_TallGrass[] = INCBIN_U16("graphics/object_events/pics/unknown/839A008.4bpp"); -const u16 gFieldEffectObjectPic_ShortGrass[] = INCBIN_U16("graphics/object_events/pics/unknown/839A288.4bpp"); +const u16 gFieldEffectObjectPic_TallGrass[] = INCBIN_U16("graphics/field_effects/pics/tall_grass.4bpp"); +const u16 gFieldEffectObjectPic_ShortGrass[] = INCBIN_U16("graphics/field_effects/pics/short_grass.4bpp"); const u16 gFieldEffectObjectPic_SandFootprints[] = INCBIN_U16("graphics/field_effects/pics/sand_footprints.4bpp"); const u16 gFieldEffectObjectPic_DeepSandFootprints[] = INCBIN_U16("graphics/field_effects/pics/deep_sand_footprints.4bpp"); const u16 gFieldEffectObjectPic_BikeTireTracks[] = INCBIN_U16("graphics/field_effects/pics/bike_tire_tracks.4bpp"); -const u16 gFieldEffectObjectPic_UnusedSand[] = INCBIN_U16("graphics/object_events/pics/unknown/839A788.4bpp"); -const u16 gFieldEffectObjectPic_SandPile[] = INCBIN_U16("graphics/object_events/pics/unknown/839A988.4bpp"); +const u16 gFieldEffectObjectPic_UnusedSand[] = INCBIN_U16("graphics/field_effects/pics/unused_sand.4bpp"); +const u16 gFieldEffectObjectPic_SandPile[] = INCBIN_U16("graphics/field_effects/pics/sand_pile.4bpp"); const u16 gFieldEffectObjectPic_JumpBigSplash[] = INCBIN_U16("graphics/field_effects/pics/jump_big_splash.4bpp"); const u16 gFieldEffectObjectPic_Splash[] = INCBIN_U16("graphics/field_effects/pics/splash.4bpp"); const u16 gFieldEffectObjectPic_JumpSmallSplash[] = INCBIN_U16("graphics/field_effects/pics/jump_small_splash.4bpp"); -const u16 gFieldEffectObjectPic_WaterSurfacing[] = INCBIN_U16("graphics/object_events/pics/unknown/839AD88.4bpp"); -const u16 gFieldEffectObjectPic_TreeDisguise[] = INCBIN_U16("graphics/object_events/pics/unknown/839B008.4bpp"); -const u16 gFieldEffectObjectPic_MountainDisguise[] = INCBIN_U16("graphics/object_events/pics/unknown/839B708.4bpp"); -const u16 gFieldEffectObjectPic_SandDisguisePlaceholder[] = INCBIN_U16("graphics/object_events/pics/unknown/839BE08.4bpp"); +const u16 gFieldEffectObjectPic_WaterSurfacing[] = INCBIN_U16("graphics/field_effects/pics/water_surfacing.4bpp"); +const u16 gFieldEffectObjectPic_TreeDisguise[] = INCBIN_U16("graphics/field_effects/pics/tree_disguise.4bpp"); +const u16 gFieldEffectObjectPic_MountainDisguise[] = INCBIN_U16("graphics/field_effects/pics/mountain_disguise.4bpp"); +const u16 gFieldEffectObjectPic_SandDisguisePlaceholder[] = INCBIN_U16("graphics/field_effects/pics/sand_disguise.4bpp"); const u16 gFieldEffectObjectPic_HotSpringsWater[] = INCBIN_U16("graphics/field_effects/pics/hot_springs_water.4bpp"); const u16 gFieldEffectPal_Ash[] = INCBIN_U16("graphics/field_effects/palettes/ash.gbapal"); const u16 gFieldEffectObjectPic_AshPuff[] = INCBIN_U16("graphics/field_effects/pics/pop_out_of_ash.4bpp"); |