23 files changed, 66 insertions, 35 deletions
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/object_events/palettes/8398FA8.pal b/graphics/field_effects/palettes/general_0.pal
index 40f7022bf..40f7022bf 100644
--- a/graphics/object_events/palettes/8398FA8.pal
+++ b/graphics/field_effects/palettes/general_0.pal
diff --git a/graphics/object_events/palettes/8398FC8.pal b/graphics/field_effects/palettes/general_1.pal
index ad39c8c9a..ad39c8c9a 100644
--- a/graphics/object_events/palettes/8398FC8.pal
+++ b/graphics/field_effects/palettes/general_1.pal
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
--- /dev/null
+++ b/graphics/field_effects/pics/bike_tire_tracks.png
diff --git a/graphics/object_events/pics/effects/fly_blob.png b/graphics/field_effects/pics/bird.png
index 124d755a0..124d755a0 100644
--- a/graphics/object_events/pics/effects/fly_blob.png
+++ b/graphics/field_effects/pics/bird.png
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
--- /dev/null
+++ b/graphics/field_effects/pics/deep_sand_footprints.png
diff --git a/graphics/object_events/pics/unknown/839C508.png b/graphics/field_effects/pics/hot_springs_water.png
index 90a3244ef..90a3244ef 100644
--- a/graphics/object_events/pics/unknown/839C508.png
+++ b/graphics/field_effects/pics/hot_springs_water.png
diff --git a/graphics/object_events/pics/effects/jump_big_splash.png b/graphics/field_effects/pics/jump_big_splash.png
index 6c3829bfd..6c3829bfd 100644
--- a/graphics/object_events/pics/effects/jump_big_splash.png
+++ b/graphics/field_effects/pics/jump_big_splash.png
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
--- /dev/null
+++ b/graphics/field_effects/pics/jump_small_splash.png
diff --git a/graphics/object_events/pics/effects/lavaridge_warp.png b/graphics/field_effects/pics/lavaridge_warp.png
index 57bb24beb..57bb24beb 100644
--- a/graphics/object_events/pics/effects/lavaridge_warp.png
+++ b/graphics/field_effects/pics/lavaridge_warp.png
diff --git a/graphics/object_events/pics/effects/long_grass.png b/graphics/field_effects/pics/long_grass.png
index 94a9a4ae0..94a9a4ae0 100644
--- a/graphics/object_events/pics/effects/long_grass.png
+++ b/graphics/field_effects/pics/long_grass.png
diff --git a/graphics/object_events/pics/effects/pop_out_of_ash.png b/graphics/field_effects/pics/pop_out_of_ash.png
index 1a1dfc296..1a1dfc296 100644
--- a/graphics/object_events/pics/effects/pop_out_of_ash.png
+++ b/graphics/field_effects/pics/pop_out_of_ash.png
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
--- /dev/null
+++ b/graphics/field_effects/pics/sand_footprints.png
diff --git a/graphics/object_events/pics/effects/shadow_extra_large.png b/graphics/field_effects/pics/shadow_extra_large.png
index 567c63948..567c63948 100644
--- a/graphics/object_events/pics/effects/shadow_extra_large.png
+++ b/graphics/field_effects/pics/shadow_extra_large.png
diff --git a/graphics/object_events/pics/effects/shadow_large.png b/graphics/field_effects/pics/shadow_large.png
index 8cf80f166..8cf80f166 100644
--- a/graphics/object_events/pics/effects/shadow_large.png
+++ b/graphics/field_effects/pics/shadow_large.png
diff --git a/graphics/object_events/pics/effects/shadow_medium.png b/graphics/field_effects/pics/shadow_medium.png
index 264230afd..264230afd 100644
--- a/graphics/object_events/pics/effects/shadow_medium.png
+++ b/graphics/field_effects/pics/shadow_medium.png
diff --git a/graphics/object_events/pics/effects/shadow_small.png b/graphics/field_effects/pics/shadow_small.png
index 204d6afad..204d6afad 100644
--- a/graphics/object_events/pics/effects/shadow_small.png
+++ b/graphics/field_effects/pics/shadow_small.png
diff --git a/graphics/object_events/pics/effects/small_sparkle.png b/graphics/field_effects/pics/small_sparkle.png
index ef62dffbb..ef62dffbb 100644
--- a/graphics/object_events/pics/effects/small_sparkle.png
+++ b/graphics/field_effects/pics/small_sparkle.png
diff --git a/graphics/field_effects/pics/splash.png b/graphics/field_effects/pics/splash.png
new file mode 100644
index 000000000..060e3f4e7
--- /dev/null
+++ b/graphics/field_effects/pics/splash.png
diff --git a/graphics/object_events/pics/effects/underwater_bubbles.png b/graphics/field_effects/pics/underwater_bubbles.png
index 7ebbf24b1..7ebbf24b1 100644
--- a/graphics/object_events/pics/effects/underwater_bubbles.png
+++ b/graphics/field_effects/pics/underwater_bubbles.png
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");