From 9ce96141c8ac2316fca20b542be87ed7a151b4d0 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 3 May 2021 16:23:01 -0400 Subject: Move event gfx resources, 1 --- graphics/field_effects/palettes/ash.pal | 19 ++++++++ graphics/field_effects/palettes/general_0.pal | 19 ++++++++ graphics/field_effects/palettes/general_1.pal | 19 ++++++++ graphics/field_effects/palettes/small_sparkle.pal | 19 ++++++++ graphics/field_effects/pics/bike_tire_tracks.png | Bin 0 -> 198 bytes graphics/field_effects/pics/bird.png | Bin 0 -> 1006 bytes .../field_effects/pics/deep_sand_footprints.png | Bin 0 -> 209 bytes graphics/field_effects/pics/hot_springs_water.png | Bin 0 -> 150 bytes graphics/field_effects/pics/jump_big_splash.png | Bin 0 -> 292 bytes graphics/field_effects/pics/jump_small_splash.png | Bin 0 -> 209 bytes graphics/field_effects/pics/lavaridge_warp.png | Bin 0 -> 420 bytes graphics/field_effects/pics/long_grass.png | Bin 0 -> 439 bytes graphics/field_effects/pics/pop_out_of_ash.png | Bin 0 -> 353 bytes graphics/field_effects/pics/sand_footprints.png | Bin 0 -> 189 bytes graphics/field_effects/pics/shadow_extra_large.png | Bin 0 -> 98 bytes graphics/field_effects/pics/shadow_large.png | Bin 0 -> 89 bytes graphics/field_effects/pics/shadow_medium.png | Bin 0 -> 88 bytes graphics/field_effects/pics/shadow_small.png | Bin 0 -> 86 bytes graphics/field_effects/pics/small_sparkle.png | Bin 0 -> 188 bytes graphics/field_effects/pics/splash.png | Bin 0 -> 180 bytes graphics/field_effects/pics/underwater_bubbles.png | Bin 0 -> 556 bytes graphics/object_events/palettes/8398FA8.pal | 19 -------- graphics/object_events/palettes/8398FC8.pal | 19 -------- graphics/object_events/pics/effects/fly_blob.png | Bin 1006 -> 0 bytes .../object_events/pics/effects/jump_big_splash.png | Bin 292 -> 0 bytes .../object_events/pics/effects/lavaridge_warp.png | Bin 420 -> 0 bytes graphics/object_events/pics/effects/long_grass.png | Bin 439 -> 0 bytes .../object_events/pics/effects/pop_out_of_ash.png | Bin 353 -> 0 bytes .../pics/effects/shadow_extra_large.png | Bin 98 -> 0 bytes .../object_events/pics/effects/shadow_large.png | Bin 89 -> 0 bytes .../object_events/pics/effects/shadow_medium.png | Bin 88 -> 0 bytes .../object_events/pics/effects/shadow_small.png | Bin 86 -> 0 bytes .../object_events/pics/effects/small_sparkle.png | Bin 188 -> 0 bytes .../pics/effects/underwater_bubbles.png | Bin 556 -> 0 bytes graphics/object_events/pics/unknown/839C508.png | Bin 150 -> 0 bytes graphics_file_rules.mk | 9 ++-- src/data/object_events/object_event_graphics.h | 54 +++++++++------------ 37 files changed, 104 insertions(+), 73 deletions(-) create mode 100644 graphics/field_effects/palettes/ash.pal create mode 100644 graphics/field_effects/palettes/general_0.pal create mode 100644 graphics/field_effects/palettes/general_1.pal create mode 100644 graphics/field_effects/palettes/small_sparkle.pal create mode 100644 graphics/field_effects/pics/bike_tire_tracks.png create mode 100644 graphics/field_effects/pics/bird.png create mode 100644 graphics/field_effects/pics/deep_sand_footprints.png create mode 100644 graphics/field_effects/pics/hot_springs_water.png create mode 100644 graphics/field_effects/pics/jump_big_splash.png create mode 100644 graphics/field_effects/pics/jump_small_splash.png create mode 100644 graphics/field_effects/pics/lavaridge_warp.png create mode 100644 graphics/field_effects/pics/long_grass.png create mode 100644 graphics/field_effects/pics/pop_out_of_ash.png create mode 100644 graphics/field_effects/pics/sand_footprints.png create mode 100644 graphics/field_effects/pics/shadow_extra_large.png create mode 100644 graphics/field_effects/pics/shadow_large.png create mode 100644 graphics/field_effects/pics/shadow_medium.png create mode 100644 graphics/field_effects/pics/shadow_small.png create mode 100644 graphics/field_effects/pics/small_sparkle.png create mode 100644 graphics/field_effects/pics/splash.png create mode 100644 graphics/field_effects/pics/underwater_bubbles.png delete mode 100644 graphics/object_events/palettes/8398FA8.pal delete mode 100644 graphics/object_events/palettes/8398FC8.pal delete mode 100644 graphics/object_events/pics/effects/fly_blob.png delete mode 100644 graphics/object_events/pics/effects/jump_big_splash.png delete mode 100644 graphics/object_events/pics/effects/lavaridge_warp.png delete mode 100644 graphics/object_events/pics/effects/long_grass.png delete mode 100644 graphics/object_events/pics/effects/pop_out_of_ash.png delete mode 100644 graphics/object_events/pics/effects/shadow_extra_large.png delete mode 100644 graphics/object_events/pics/effects/shadow_large.png delete mode 100644 graphics/object_events/pics/effects/shadow_medium.png delete mode 100644 graphics/object_events/pics/effects/shadow_small.png delete mode 100644 graphics/object_events/pics/effects/small_sparkle.png delete mode 100644 graphics/object_events/pics/effects/underwater_bubbles.png delete mode 100644 graphics/object_events/pics/unknown/839C508.png diff --git a/graphics/field_effects/palettes/ash.pal b/graphics/field_effects/palettes/ash.pal new file mode 100644 index 000000000..e3a76c035 --- /dev/null +++ b/graphics/field_effects/palettes/ash.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +255 255 255 +98 98 98 +213 213 139 +172 172 90 +139 139 65 +230 246 205 +189 238 180 +131 222 180 +98 172 139 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/field_effects/palettes/general_0.pal b/graphics/field_effects/palettes/general_0.pal new file mode 100644 index 000000000..40f7022bf --- /dev/null +++ b/graphics/field_effects/palettes/general_0.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 238 +246 230 197 +238 213 180 +222 180 148 +255 255 255 +222 230 238 +189 205 230 +156 180 222 +98 156 180 +0 0 0 +0 0 0 +238 230 164 +222 213 139 +213 189 115 +197 180 90 +0 0 0 diff --git a/graphics/field_effects/palettes/general_1.pal b/graphics/field_effects/palettes/general_1.pal new file mode 100644 index 000000000..ad39c8c9a --- /dev/null +++ b/graphics/field_effects/palettes/general_1.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 0 238 +189 255 139 +131 213 98 +57 139 49 +57 82 0 +49 65 0 +98 172 238 +98 172 197 +139 205 246 +148 230 255 +0 0 0 +0 0 0 +164 230 197 +115 205 164 +65 180 139 +24 164 106 diff --git a/graphics/field_effects/palettes/small_sparkle.pal b/graphics/field_effects/palettes/small_sparkle.pal new file mode 100644 index 000000000..b170eb1f5 --- /dev/null +++ b/graphics/field_effects/palettes/small_sparkle.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +131 172 74 +255 255 255 +205 246 255 +156 213 255 +74 197 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 diff --git a/graphics/field_effects/pics/bike_tire_tracks.png b/graphics/field_effects/pics/bike_tire_tracks.png new file mode 100644 index 000000000..b86f558ba Binary files /dev/null and b/graphics/field_effects/pics/bike_tire_tracks.png differ diff --git a/graphics/field_effects/pics/bird.png b/graphics/field_effects/pics/bird.png new file mode 100644 index 000000000..124d755a0 Binary files /dev/null and b/graphics/field_effects/pics/bird.png differ diff --git a/graphics/field_effects/pics/deep_sand_footprints.png b/graphics/field_effects/pics/deep_sand_footprints.png new file mode 100644 index 000000000..7068aba6c Binary files /dev/null and b/graphics/field_effects/pics/deep_sand_footprints.png differ diff --git a/graphics/field_effects/pics/hot_springs_water.png b/graphics/field_effects/pics/hot_springs_water.png new file mode 100644 index 000000000..90a3244ef Binary files /dev/null and b/graphics/field_effects/pics/hot_springs_water.png differ diff --git a/graphics/field_effects/pics/jump_big_splash.png b/graphics/field_effects/pics/jump_big_splash.png new file mode 100644 index 000000000..6c3829bfd Binary files /dev/null and b/graphics/field_effects/pics/jump_big_splash.png differ diff --git a/graphics/field_effects/pics/jump_small_splash.png b/graphics/field_effects/pics/jump_small_splash.png new file mode 100644 index 000000000..ea8e763f5 Binary files /dev/null and b/graphics/field_effects/pics/jump_small_splash.png differ diff --git a/graphics/field_effects/pics/lavaridge_warp.png b/graphics/field_effects/pics/lavaridge_warp.png new file mode 100644 index 000000000..57bb24beb Binary files /dev/null and b/graphics/field_effects/pics/lavaridge_warp.png differ diff --git a/graphics/field_effects/pics/long_grass.png b/graphics/field_effects/pics/long_grass.png new file mode 100644 index 000000000..94a9a4ae0 Binary files /dev/null and b/graphics/field_effects/pics/long_grass.png differ diff --git a/graphics/field_effects/pics/pop_out_of_ash.png b/graphics/field_effects/pics/pop_out_of_ash.png new file mode 100644 index 000000000..1a1dfc296 Binary files /dev/null and b/graphics/field_effects/pics/pop_out_of_ash.png differ diff --git a/graphics/field_effects/pics/sand_footprints.png b/graphics/field_effects/pics/sand_footprints.png new file mode 100644 index 000000000..68b5de234 Binary files /dev/null and b/graphics/field_effects/pics/sand_footprints.png differ diff --git a/graphics/field_effects/pics/shadow_extra_large.png b/graphics/field_effects/pics/shadow_extra_large.png new file mode 100644 index 000000000..567c63948 Binary files /dev/null and b/graphics/field_effects/pics/shadow_extra_large.png differ diff --git a/graphics/field_effects/pics/shadow_large.png b/graphics/field_effects/pics/shadow_large.png new file mode 100644 index 000000000..8cf80f166 Binary files /dev/null and b/graphics/field_effects/pics/shadow_large.png differ diff --git a/graphics/field_effects/pics/shadow_medium.png b/graphics/field_effects/pics/shadow_medium.png new file mode 100644 index 000000000..264230afd Binary files /dev/null and b/graphics/field_effects/pics/shadow_medium.png differ diff --git a/graphics/field_effects/pics/shadow_small.png b/graphics/field_effects/pics/shadow_small.png new file mode 100644 index 000000000..204d6afad Binary files /dev/null and b/graphics/field_effects/pics/shadow_small.png differ diff --git a/graphics/field_effects/pics/small_sparkle.png b/graphics/field_effects/pics/small_sparkle.png new file mode 100644 index 000000000..ef62dffbb Binary files /dev/null and b/graphics/field_effects/pics/small_sparkle.png differ diff --git a/graphics/field_effects/pics/splash.png b/graphics/field_effects/pics/splash.png new file mode 100644 index 000000000..060e3f4e7 Binary files /dev/null and b/graphics/field_effects/pics/splash.png differ diff --git a/graphics/field_effects/pics/underwater_bubbles.png b/graphics/field_effects/pics/underwater_bubbles.png new file mode 100644 index 000000000..7ebbf24b1 Binary files /dev/null and b/graphics/field_effects/pics/underwater_bubbles.png differ diff --git a/graphics/object_events/palettes/8398FA8.pal b/graphics/object_events/palettes/8398FA8.pal deleted file mode 100644 index 40f7022bf..000000000 --- a/graphics/object_events/palettes/8398FA8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 238 -246 230 197 -238 213 180 -222 180 148 -255 255 255 -222 230 238 -189 205 230 -156 180 222 -98 156 180 -0 0 0 -0 0 0 -238 230 164 -222 213 139 -213 189 115 -197 180 90 -0 0 0 diff --git a/graphics/object_events/palettes/8398FC8.pal b/graphics/object_events/palettes/8398FC8.pal deleted file mode 100644 index ad39c8c9a..000000000 --- a/graphics/object_events/palettes/8398FC8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 0 238 -189 255 139 -131 213 98 -57 139 49 -57 82 0 -49 65 0 -98 172 238 -98 172 197 -139 205 246 -148 230 255 -0 0 0 -0 0 0 -164 230 197 -115 205 164 -65 180 139 -24 164 106 diff --git a/graphics/object_events/pics/effects/fly_blob.png b/graphics/object_events/pics/effects/fly_blob.png deleted file mode 100644 index 124d755a0..000000000 Binary files a/graphics/object_events/pics/effects/fly_blob.png and /dev/null differ diff --git a/graphics/object_events/pics/effects/jump_big_splash.png b/graphics/object_events/pics/effects/jump_big_splash.png deleted file mode 100644 index 6c3829bfd..000000000 Binary files a/graphics/object_events/pics/effects/jump_big_splash.png and /dev/null differ diff --git a/graphics/object_events/pics/effects/lavaridge_warp.png b/graphics/object_events/pics/effects/lavaridge_warp.png deleted file mode 100644 index 57bb24beb..000000000 Binary files a/graphics/object_events/pics/effects/lavaridge_warp.png and /dev/null differ diff --git a/graphics/object_events/pics/effects/long_grass.png b/graphics/object_events/pics/effects/long_grass.png deleted file mode 100644 index 94a9a4ae0..000000000 Binary files a/graphics/object_events/pics/effects/long_grass.png and /dev/null differ diff --git a/graphics/object_events/pics/effects/pop_out_of_ash.png b/graphics/object_events/pics/effects/pop_out_of_ash.png deleted file mode 100644 index 1a1dfc296..000000000 Binary files a/graphics/object_events/pics/effects/pop_out_of_ash.png and /dev/null differ diff --git a/graphics/object_events/pics/effects/shadow_extra_large.png b/graphics/object_events/pics/effects/shadow_extra_large.png deleted file mode 100644 index 567c63948..000000000 Binary files a/graphics/object_events/pics/effects/shadow_extra_large.png and /dev/null differ diff --git a/graphics/object_events/pics/effects/shadow_large.png b/graphics/object_events/pics/effects/shadow_large.png deleted file mode 100644 index 8cf80f166..000000000 Binary files a/graphics/object_events/pics/effects/shadow_large.png and /dev/null differ diff --git a/graphics/object_events/pics/effects/shadow_medium.png b/graphics/object_events/pics/effects/shadow_medium.png deleted file mode 100644 index 264230afd..000000000 Binary files a/graphics/object_events/pics/effects/shadow_medium.png and /dev/null differ diff --git a/graphics/object_events/pics/effects/shadow_small.png b/graphics/object_events/pics/effects/shadow_small.png deleted file mode 100644 index 204d6afad..000000000 Binary files a/graphics/object_events/pics/effects/shadow_small.png and /dev/null differ diff --git a/graphics/object_events/pics/effects/small_sparkle.png b/graphics/object_events/pics/effects/small_sparkle.png deleted file mode 100644 index ef62dffbb..000000000 Binary files a/graphics/object_events/pics/effects/small_sparkle.png and /dev/null differ diff --git a/graphics/object_events/pics/effects/underwater_bubbles.png b/graphics/object_events/pics/effects/underwater_bubbles.png deleted file mode 100644 index 7ebbf24b1..000000000 Binary files a/graphics/object_events/pics/effects/underwater_bubbles.png and /dev/null differ diff --git a/graphics/object_events/pics/unknown/839C508.png b/graphics/object_events/pics/unknown/839C508.png deleted file mode 100644 index 90a3244ef..000000000 Binary files a/graphics/object_events/pics/unknown/839C508.png and /dev/null differ diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk index e87b08888..8e39e0a91 100644 --- a/graphics_file_rules.mk +++ b/graphics_file_rules.mk @@ -14,6 +14,7 @@ ROULETTEGFXDIR := graphics/roulette SLOTMACHINEGFXDIR := graphics/slot_machine PSSGFXDIR := graphics/pokemon_storage EVENTOBJGFXDIR := graphics/object_events +FIELDEFFECTSGFXDIR := graphics/field_effects MISCGFXDIR := graphics/misc TEXTWINDOWGFXDIR := graphics/text_window SLOTMACHINEGFXDIR := graphics/slot_machine @@ -429,12 +430,12 @@ $(PSSGFXDIR)/ludicolo.4bpp: $(PSSGFXDIR)/friends_frame2.4bpp $(PSSGFXDIR)/ludico $(PSSGFXDIR)/whiscash.4bpp: $(PSSGFXDIR)/friends_frame2.4bpp $(PSSGFXDIR)/whiscash_bg.4bpp @cat $^ >$@ -$(EVENTOBJGFXDIR)/pics/effects/unknown_4F6D38/0.4bpp: %.4bpp: %.png - $(GFX) $< $@ -num_tiles 11 - -$(EVENTOBJGFXDIR)/pics/effects/underwater_bubbles.4bpp: %.4bpp: %.png +$(FIELDEFFECTSGFXDIR)/pics/underwater_bubbles.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 +$(FIELDEFFECTSGFXDIR)/pics/bike_tire_tracks.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 2 + $(EVENTOBJGFXDIR)/pics/unknown/839BE08.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 4 diff --git a/src/data/object_events/object_event_graphics.h b/src/data/object_events/object_event_graphics.h index 1bf1c7df2..ce0315624 100644 --- a/src/data/object_events/object_event_graphics.h +++ b/src/data/object_events/object_event_graphics.h @@ -186,10 +186,10 @@ const u16 gObjectEventPic_SurfBlob[] = INCBIN_U16("graphics/object_events/pics/m const u16 gObjectEventPic_Policeman[] = INCBIN_U16("graphics/object_events/pics/people/policeman.4bpp"); const u16 gUnknown_8398008[] = INCBIN_U16("graphics/object_events/palettes/11.gbapal"); const u16 gUnknown_8398028[] = INCBIN_U16("graphics/object_events/palettes/12.gbapal"); -const u16 gFieldEffectObjectPic_ShadowSmall[] = INCBIN_U16("graphics/object_events/pics/effects/shadow_small.4bpp"); -const u16 gFieldEffectObjectPic_ShadowMedium[] = INCBIN_U16("graphics/object_events/pics/effects/shadow_medium.4bpp"); -const u16 gFieldEffectObjectPic_ShadowLarge[] = INCBIN_U16("graphics/object_events/pics/effects/shadow_large.4bpp"); -const u16 gFieldEffectObjectPic_ShadowExtraLarge[] = INCBIN_U16("graphics/object_events/pics/effects/shadow_extra_large.4bpp"); +const u16 gFieldEffectObjectPic_ShadowSmall[] = INCBIN_U16("graphics/field_effects/pics/shadow_small.4bpp"); +const u16 gFieldEffectObjectPic_ShadowMedium[] = INCBIN_U16("graphics/field_effects/pics/shadow_medium.4bpp"); +const u16 gFieldEffectObjectPic_ShadowLarge[] = INCBIN_U16("graphics/field_effects/pics/shadow_large.4bpp"); +const u16 gFieldEffectObjectPic_ShadowExtraLarge[] = INCBIN_U16("graphics/field_effects/pics/shadow_extra_large.4bpp"); 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"); @@ -197,44 +197,36 @@ const u16 gUnknown_8398688[] = INCBIN_U16("graphics/field_effects/fldeff_cut.gba 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 gFieldEffectObjectPalette0[] = INCBIN_U16("graphics/object_events/palettes/8398FA8.gbapal"); -const u16 gFieldEffectObjectPalette1[] = INCBIN_U16("graphics/object_events/palettes/8398FC8.gbapal"); +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"); -const u16 gUnknown_83990C8[] = INCBIN_U16("graphics/object_events/pics/unknown/83990C8.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"); -const u16 gUnknown_8399288[] = INCBIN_U16("graphics/object_events/pics/unknown/8399288.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_LongGrass[] = INCBIN_U16("graphics/object_events/pics/effects/long_grass.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_SandFootprints[] = INCBIN_U16("graphics/object_events/pics/unknown/839A388.4bpp"); -const u16 gUnknown_839A408[] = INCBIN_U16("graphics/object_events/pics/unknown/839A408.4bpp"); -const u16 gFieldEffectObjectPic_DeepSandFootprints[] = INCBIN_U16("graphics/object_events/pics/unknown/839A488.4bpp"); -const u16 gUnknown_839A508[] = INCBIN_U16("graphics/object_events/pics/unknown/839A508.4bpp"); -const u16 gFieldEffectObjectPic_BikeTireTracks[] = INCBIN_U16("graphics/object_events/pics/unknown/839A588.4bpp"); -const u16 gUnknown_839A608[] = INCBIN_U16("graphics/object_events/pics/unknown/839A608.4bpp"); -const u16 gUnknown_839A688[] = INCBIN_U16("graphics/object_events/pics/unknown/839A688.4bpp"); -const u16 gUnknown_839A708[] = INCBIN_U16("graphics/object_events/pics/unknown/839A708.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_JumpBigSplash[] = INCBIN_U16("graphics/object_events/pics/effects/jump_big_splash.4bpp"); -const u16 gFieldEffectObjectPic_Splash[] = INCBIN_U16("graphics/object_events/pics/unknown/839AC48.4bpp"); -const u16 gUnknown_839AC88[] = INCBIN_U16("graphics/object_events/pics/unknown/839AC88.4bpp"); -const u16 gFieldEffectObjectPic_JumpSmallSplash[] = INCBIN_U16("graphics/object_events/pics/unknown/839ACC8.4bpp"); -const u16 gUnknown_839AD08[] = INCBIN_U16("graphics/object_events/pics/unknown/839AD08.4bpp"); -const u16 gUnknown_839AD48[] = INCBIN_U16("graphics/object_events/pics/unknown/839AD48.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_HotSpringsWater[] = INCBIN_U16("graphics/object_events/pics/unknown/839C508.4bpp"); -const u16 gFieldEffectPal_Ash[] = INCBIN_U16("graphics/object_events/pics/effects/pop_out_of_ash.gbapal"); -const u16 gFieldEffectObjectPic_AshPuff[] = INCBIN_U16("graphics/object_events/pics/effects/pop_out_of_ash.4bpp"); -const u16 gFieldEffectObjectPic_AshLaunch[] = INCBIN_U16("graphics/object_events/pics/effects/lavaridge_warp.4bpp"); -const u16 gFieldEffectObjectPic_Bubbles[] = INCBIN_U16("graphics/object_events/pics/effects/underwater_bubbles.4bpp"); -const u16 gFieldEffectObjectPic_SmallSparkle[] = INCBIN_U16("graphics/object_events/pics/effects/small_sparkle.4bpp"); -const u16 gFieldEffectPal_SmallSparkle[] = INCBIN_U16("graphics/object_events/pics/effects/small_sparkle.gbapal"); -const u16 gFieldEffectObjectPic_Bird[] = INCBIN_U16("graphics/object_events/pics/effects/fly_blob.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"); +const u16 gFieldEffectObjectPic_AshLaunch[] = INCBIN_U16("graphics/field_effects/pics/lavaridge_warp.4bpp"); +const u16 gFieldEffectObjectPic_Bubbles[] = INCBIN_U16("graphics/field_effects/pics/underwater_bubbles.4bpp"); +const u16 gFieldEffectObjectPic_SmallSparkle[] = INCBIN_U16("graphics/field_effects/pics/small_sparkle.4bpp"); +const u16 gFieldEffectPal_SmallSparkle[] = INCBIN_U16("graphics/field_effects/palettes/small_sparkle.gbapal"); +const u16 gFieldEffectObjectPic_Bird[] = INCBIN_U16("graphics/field_effects/pics/bird.4bpp"); -- cgit v1.2.3