Move field effect graphics resources, 2

74 files changed, 23 insertions, 20 deletions

diff --git a/graphics/field_effects/pics/arrow.png b/graphics/field_effects/pics/arrow.png
new file mode 100644
index 000000000..7a294019d
--- /dev/null
+++ b/graphics/field_effects/pics/arrow.png
diff --git a/graphics/field_effects/pics/ash.png b/graphics/field_effects/pics/ash.png
new file mode 100644
index 000000000..d38792ca3
--- /dev/null
+++ b/graphics/field_effects/pics/ash.png
diff --git a/graphics/field_effects/pics/ground_impact_dust.png b/graphics/field_effects/pics/ground_impact_dust.png
new file mode 100644
index 000000000..7c6e2d348
--- /dev/null
+++ b/graphics/field_effects/pics/ground_impact_dust.png
diff --git a/graphics/field_effects/pics/jump_long_grass.png b/graphics/field_effects/pics/jump_long_grass.png
new file mode 100644
index 000000000..b83277f1d
--- /dev/null
+++ b/graphics/field_effects/pics/jump_long_grass.png
diff --git a/graphics/field_effects/pics/jump_tall_grass.png b/graphics/field_effects/pics/jump_tall_grass.png
new file mode 100644
index 000000000..571c6f0d9
--- /dev/null
+++ b/graphics/field_effects/pics/jump_tall_grass.png
diff --git a/graphics/object_events/pics/unknown/839B708.png b/graphics/field_effects/pics/mountain_disguise.png
index cde53348c..cde53348c 100644
--- a/graphics/object_events/pics/unknown/839B708.png
+++ b/graphics/field_effects/pics/mountain_disguise.png
diff --git a/graphics/field_effects/pics/ripple.png b/graphics/field_effects/pics/ripple.png
new file mode 100644
index 000000000..67316d3cb
--- /dev/null
+++ b/graphics/field_effects/pics/ripple.png
diff --git a/graphics/object_events/pics/unknown/839BE08.png b/graphics/field_effects/pics/sand_disguise.png
index 1e88e9c28..1e88e9c28 100644
--- a/graphics/object_events/pics/unknown/839BE08.png
+++ b/graphics/field_effects/pics/sand_disguise.png
diff --git a/graphics/object_events/pics/unknown/839A988.png b/graphics/field_effects/pics/sand_pile.png
index 9f86e194b..9f86e194b 100644
--- a/graphics/object_events/pics/unknown/839A988.png
+++ b/graphics/field_effects/pics/sand_pile.png
diff --git a/graphics/object_events/pics/unknown/839A288.png b/graphics/field_effects/pics/short_grass.png
index cf20349ee..cf20349ee 100644
--- a/graphics/object_events/pics/unknown/839A288.png
+++ b/graphics/field_effects/pics/short_grass.png
diff --git a/graphics/field_effects/pics/tall_grass.png b/graphics/field_effects/pics/tall_grass.png
new file mode 100644
index 000000000..850e92c21
--- /dev/null
+++ b/graphics/field_effects/pics/tall_grass.png
diff --git a/graphics/field_effects/pics/tree_disguise.png b/graphics/field_effects/pics/tree_disguise.png
new file mode 100644
index 000000000..9bf3e7b32
--- /dev/null
+++ b/graphics/field_effects/pics/tree_disguise.png
diff --git a/graphics/object_events/pics/unknown/8399788.png b/graphics/field_effects/pics/unused_grass.png
index 1f918a0d0..1f918a0d0 100644
--- a/graphics/object_events/pics/unknown/8399788.png
+++ b/graphics/field_effects/pics/unused_grass.png
diff --git a/graphics/object_events/pics/unknown/8399C08.png b/graphics/field_effects/pics/unused_grass_2.png
index aff184fe8..aff184fe8 100644
--- a/graphics/object_events/pics/unknown/8399C08.png
+++ b/graphics/field_effects/pics/unused_grass_2.png
diff --git a/graphics/field_effects/pics/unused_grass_3.png b/graphics/field_effects/pics/unused_grass_3.png
new file mode 100644
index 000000000..ed70516c9
--- /dev/null
+++ b/graphics/field_effects/pics/unused_grass_3.png
diff --git a/graphics/field_effects/pics/unused_grass_4.png b/graphics/field_effects/pics/unused_grass_4.png
new file mode 100644
index 000000000..3f3c79a25
--- /dev/null
+++ b/graphics/field_effects/pics/unused_grass_4.png
diff --git a/graphics/field_effects/pics/unused_sand.png b/graphics/field_effects/pics/unused_sand.png
new file mode 100644
index 000000000..605862952
--- /dev/null
+++ b/graphics/field_effects/pics/unused_sand.png
diff --git a/graphics/field_effects/pics/water_surfacing.png b/graphics/field_effects/pics/water_surfacing.png
new file mode 100644
index 000000000..d7c2156eb
--- /dev/null
+++ b/graphics/field_effects/pics/water_surfacing.png
diff --git a/graphics/object_events/pics/unknown/83986A8.png b/graphics/object_events/pics/unknown/83986A8.png
deleted file mode 100644
index d05031f54..000000000
--- a/graphics/object_events/pics/unknown/83986A8.png
+++ /dev/null
diff --git a/graphics/object_events/pics/unknown/8398928.png b/graphics/object_events/pics/unknown/8398928.png
deleted file mode 100644
index a80b8680b..000000000
--- a/graphics/object_events/pics/unknown/8398928.png
+++ /dev/null
diff --git a/graphics/object_events/pics/unknown/8398BA8.png b/graphics/object_events/pics/unknown/8398BA8.png
deleted file mode 100644
index d77d0dfbb..000000000
--- a/graphics/object_events/pics/unknown/8398BA8.png
+++ /dev/null
diff --git a/graphics/object_events/pics/unknown/8399008.png b/graphics/object_events/pics/unknown/8399008.png
deleted file mode 100644
index 95b472557..000000000
--- a/graphics/object_events/pics/unknown/8399008.png
+++ /dev/null
diff --git a/graphics/object_events/pics/unknown/83990C8.png b/graphics/object_events/pics/unknown/83990C8.png
deleted file mode 100644
index 931eba7d6..000000000
--- a/graphics/object_events/pics/unknown/83990C8.png
+++ /dev/null
diff --git a/graphics/object_events/pics/unknown/8399188.png b/graphics/object_events/pics/unknown/8399188.png
deleted file mode 100644
index 215d422ec..000000000
--- a/graphics/object_events/pics/unknown/8399188.png
+++ /dev/null
diff --git a/graphics/object_events/pics/unknown/8399288.png b/graphics/object_events/pics/unknown/8399288.png
deleted file mode 100644
index 43765df43..000000000
--- a/graphics/object_events/pics/unknown/8399288.png
+++ /dev/null
diff --git a/graphics/object_events/pics/unknown/8399488.png b/graphics/object_events/pics/unknown/8399488.png
deleted file mode 100644
index 5ee8decee..000000000
--- a/graphics/object_events/pics/unknown/8399488.png
+++ /dev/null
diff --git a/graphics/object_events/pics/unknown/8399E08.png b/graphics/object_events/pics/unknown/8399E08.png
deleted file mode 100644
index dc862d6b7..000000000
--- a/graphics/object_events/pics/unknown/8399E08.png
+++ /dev/null
diff --git a/graphics/object_events/pics/unknown/8399E88.png b/graphics/object_events/pics/unknown/8399E88.png
deleted file mode 100644
index d0cc84b83..000000000
--- a/graphics/object_events/pics/unknown/8399E88.png
+++ /dev/null
diff --git a/graphics/object_events/pics/unknown/8399F08.png b/graphics/object_events/pics/unknown/8399F08.png
deleted file mode 100644
index adb1a1fba..000000000
--- a/graphics/object_events/pics/unknown/8399F08.png
+++ /dev/null
diff --git a/graphics/object_events/pics/unknown/8399F88.png b/graphics/object_events/pics/unknown/8399F88.png
deleted file mode 100644
index 0209125e8..000000000
--- a/graphics/object_events/pics/unknown/8399F88.png
+++ /dev/null
diff --git a/graphics/object_events/pics/unknown/839A008.png b/graphics/object_events/pics/unknown/839A008.png
deleted file mode 100644
index 3b79059b1..000000000
--- a/graphics/object_events/pics/unknown/839A008.png
+++ /dev/null
diff --git a/graphics/object_events/pics/unknown/839A388.png b/graphics/object_events/pics/unknown/839A388.png
deleted file mode 100644
index 3b7170512..000000000
--- a/graphics/object_events/pics/unknown/839A388.png
+++ /dev/null
diff --git a/graphics/object_events/pics/unknown/839A408.png b/graphics/object_events/pics/unknown/839A408.png
deleted file mode 100644
index 5f260a6fb..000000000
--- a/graphics/object_events/pics/unknown/839A408.png
+++ /dev/null
diff --git a/graphics/object_events/pics/unknown/839A488.png b/graphics/object_events/pics/unknown/839A488.png
deleted file mode 100644
index ff782e7a8..000000000
--- a/graphics/object_events/pics/unknown/839A488.png
+++ /dev/null
diff --git a/graphics/object_events/pics/unknown/839A508.png b/graphics/object_events/pics/unknown/839A508.png
deleted file mode 100644
index c4f247a8c..000000000
--- a/graphics/object_events/pics/unknown/839A508.png
+++ /dev/null
diff --git a/graphics/object_events/pics/unknown/839A588.png b/graphics/object_events/pics/unknown/839A588.png
deleted file mode 100644
index 63edde656..000000000
--- a/graphics/object_events/pics/unknown/839A588.png
+++ /dev/null
diff --git a/graphics/object_events/pics/unknown/839A608.png b/graphics/object_events/pics/unknown/839A608.png
deleted file mode 100644
index 60008b509..000000000
--- a/graphics/object_events/pics/unknown/839A608.png
+++ /dev/null
diff --git a/graphics/object_events/pics/unknown/839A688.png b/graphics/object_events/pics/unknown/839A688.png
deleted file mode 100644
index 9ede2749b..000000000
--- a/graphics/object_events/pics/unknown/839A688.png
+++ /dev/null
diff --git a/graphics/object_events/pics/unknown/839A708.png b/graphics/object_events/pics/unknown/839A708.png
deleted file mode 100644
index e8c55ddfb..000000000
--- a/graphics/object_events/pics/unknown/839A708.png
+++ /dev/null
diff --git a/graphics/object_events/pics/unknown/839A788.png b/graphics/object_events/pics/unknown/839A788.png
deleted file mode 100644
index a16d93402..000000000
--- a/graphics/object_events/pics/unknown/839A788.png
+++ /dev/null
diff --git a/graphics/object_events/pics/unknown/839AA48.png b/graphics/object_events/pics/unknown/839AA48.png
deleted file mode 100644
index 369e522ba..000000000
--- a/graphics/object_events/pics/unknown/839AA48.png
+++ /dev/null
diff --git a/graphics/object_events/pics/unknown/839AAC8.png b/graphics/object_events/pics/unknown/839AAC8.png
deleted file mode 100644
index 1e21258d7..000000000
--- a/graphics/object_events/pics/unknown/839AAC8.png
+++ /dev/null
diff --git a/graphics/object_events/pics/unknown/839AB48.png b/graphics/object_events/pics/unknown/839AB48.png
deleted file mode 100644
index 272bb1319..000000000
--- a/graphics/object_events/pics/unknown/839AB48.png
+++ /dev/null
diff --git a/graphics/object_events/pics/unknown/839ABC8.png b/graphics/object_events/pics/unknown/839ABC8.png
deleted file mode 100644
index 2a748583f..000000000
--- a/graphics/object_events/pics/unknown/839ABC8.png
+++ /dev/null
diff --git a/graphics/object_events/pics/unknown/839AC48.png b/graphics/object_events/pics/unknown/839AC48.png
deleted file mode 100644
index 4900af580..000000000
--- a/graphics/object_events/pics/unknown/839AC48.png
+++ /dev/null
diff --git a/graphics/object_events/pics/unknown/839AC88.png b/graphics/object_events/pics/unknown/839AC88.png
deleted file mode 100644
index b0194c78f..000000000
--- a/graphics/object_events/pics/unknown/839AC88.png
+++ /dev/null
diff --git a/graphics/object_events/pics/unknown/839ACC8.png b/graphics/object_events/pics/unknown/839ACC8.png
deleted file mode 100644
index adb52f29b..000000000
--- a/graphics/object_events/pics/unknown/839ACC8.png
+++ /dev/null
diff --git a/graphics/object_events/pics/unknown/839AD08.png b/graphics/object_events/pics/unknown/839AD08.png
deleted file mode 100644
index 890068ec3..000000000
--- a/graphics/object_events/pics/unknown/839AD08.png
+++ /dev/null
diff --git a/graphics/object_events/pics/unknown/839AD48.png b/graphics/object_events/pics/unknown/839AD48.png
deleted file mode 100644
index 8b2fbb553..000000000
--- a/graphics/object_events/pics/unknown/839AD48.png
+++ /dev/null
diff --git a/graphics/object_events/pics/unknown/839AD88.png b/graphics/object_events/pics/unknown/839AD88.png
deleted file mode 100644
index 7c3fbb7ca..000000000
--- a/graphics/object_events/pics/unknown/839AD88.png
+++ /dev/null
diff --git a/graphics/object_events/pics/unknown/839B008.png b/graphics/object_events/pics/unknown/839B008.png
deleted file mode 100644
index 196adbba4..000000000
--- a/graphics/object_events/pics/unknown/839B008.png
+++ /dev/null
diff --git a/graphics/object_events/pics/unknown/839C5A8.png b/graphics/object_events/pics/unknown/839C5A8.png
deleted file mode 100644
index 53dc362af..000000000
--- a/graphics/object_events/pics/unknown/839C5A8.png
+++ /dev/null
diff --git a/graphics/object_events/pics/unknown/839C628.png b/graphics/object_events/pics/unknown/839C628.png
deleted file mode 100644
index 0217e5a7c..000000000
--- a/graphics/object_events/pics/unknown/839C628.png
+++ /dev/null
diff --git a/graphics/object_events/pics/unknown/839C6A8.png b/graphics/object_events/pics/unknown/839C6A8.png
deleted file mode 100644
index 830497ee8..000000000
--- a/graphics/object_events/pics/unknown/839C6A8.png
+++ /dev/null
diff --git a/graphics/object_events/pics/unknown/839C728.png b/graphics/object_events/pics/unknown/839C728.png
deleted file mode 100644
index bea1171fc..000000000
--- a/graphics/object_events/pics/unknown/839C728.png
+++ /dev/null
diff --git a/graphics/object_events/pics/unknown/839C7A8.png b/graphics/object_events/pics/unknown/839C7A8.png
deleted file mode 100644
index ecc4aae1a..000000000
--- a/graphics/object_events/pics/unknown/839C7A8.png
+++ /dev/null
diff --git a/graphics/object_events/pics/unknown/839C828.png b/graphics/object_events/pics/unknown/839C828.png
deleted file mode 100644
index daf690bc6..000000000
--- a/graphics/object_events/pics/unknown/839C828.png
+++ /dev/null
diff --git a/graphics/object_events/pics/unknown/839C8A8.png b/graphics/object_events/pics/unknown/839C8A8.png
deleted file mode 100644
index e6e4495d9..000000000
--- a/graphics/object_events/pics/unknown/839C8A8.png
+++ /dev/null
diff --git a/graphics/object_events/pics/unknown/839C928.png b/graphics/object_events/pics/unknown/839C928.png
deleted file mode 100644
index 3252c12f8..000000000
--- a/graphics/object_events/pics/unknown/839C928.png
+++ /dev/null
diff --git a/graphics/object_events/pics/unknown/839C9A8.png b/graphics/object_events/pics/unknown/839C9A8.png
deleted file mode 100644
index 8461222d3..000000000
--- a/graphics/object_events/pics/unknown/839C9A8.png
+++ /dev/null
diff --git a/graphics/object_events/pics/unknown/839CA28.png b/graphics/object_events/pics/unknown/839CA28.png
deleted file mode 100644
index 691427c8f..000000000
--- a/graphics/object_events/pics/unknown/839CA28.png
+++ /dev/null
diff --git a/graphics/object_events/pics/unknown/839CAA8.png b/graphics/object_events/pics/unknown/839CAA8.png
deleted file mode 100644
index c0abb16b7..000000000
--- a/graphics/object_events/pics/unknown/839CAA8.png
+++ /dev/null
diff --git a/graphics/object_events/pics/unknown/839CBA8.png b/graphics/object_events/pics/unknown/839CBA8.png
deleted file mode 100644
index e7dc7746e..000000000
--- a/graphics/object_events/pics/unknown/839CBA8.png
+++ /dev/null
diff --git a/graphics/object_events/pics/unknown/839CCA8.png b/graphics/object_events/pics/unknown/839CCA8.png
deleted file mode 100644
index d702ef9cd..000000000
--- a/graphics/object_events/pics/unknown/839CCA8.png
+++ /dev/null
diff --git a/graphics/object_events/pics/unknown/839CDA8.png b/graphics/object_events/pics/unknown/839CDA8.png
deleted file mode 100644
index e0c2c531f..000000000
--- a/graphics/object_events/pics/unknown/839CDA8.png
+++ /dev/null
diff --git a/graphics/object_events/pics/unknown/839CEA8.png b/graphics/object_events/pics/unknown/839CEA8.png
deleted file mode 100644
index 778a4ee24..000000000
--- a/graphics/object_events/pics/unknown/839CEA8.png
+++ /dev/null
diff --git a/graphics/object_events/pics/unknown/839CFA8.png b/graphics/object_events/pics/unknown/839CFA8.png
deleted file mode 100644
index 14b409734..000000000
--- a/graphics/object_events/pics/unknown/839CFA8.png
+++ /dev/null
diff --git a/graphics/object_events/pics/unknown/839D0A8.png b/graphics/object_events/pics/unknown/839D0A8.png
deleted file mode 100644
index 5691f1333..000000000
--- a/graphics/object_events/pics/unknown/839D0A8.png
+++ /dev/null
diff --git a/graphics/object_events/pics/unknown/839D1A8.png b/graphics/object_events/pics/unknown/839D1A8.png
deleted file mode 100644
index 8f2ddd84c..000000000
--- a/graphics/object_events/pics/unknown/839D1A8.png
+++ /dev/null
diff --git a/graphics/object_events/pics/unknown/839D2A8.png b/graphics/object_events/pics/unknown/839D2A8.png
deleted file mode 100644
index b46950eb0..000000000
--- a/graphics/object_events/pics/unknown/839D2A8.png
+++ /dev/null
diff --git a/graphics/object_events/pics/unknown/839D328.png b/graphics/object_events/pics/unknown/839D328.png
deleted file mode 100644
index d0afd946b..000000000
--- a/graphics/object_events/pics/unknown/839D328.png
+++ /dev/null
diff --git a/graphics/object_events/pics/unknown/839D3C8.png b/graphics/object_events/pics/unknown/839D3C8.png
deleted file mode 100644
index 1e9a0bbc2..000000000
--- a/graphics/object_events/pics/unknown/839D3C8.png
+++ /dev/null
diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk
index 8e39e0a91..59e2be4ee 100644
--- a/graphics_file_rules.mk
+++ b/graphics_file_rules.mk
@@ -436,10 +436,13 @@ $(FIELDEFFECTSGFXDIR)/pics/underwater_bubbles.4bpp: %.4bpp: %.png
 $(FIELDEFFECTSGFXDIR)/pics/bike_tire_tracks.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 2
 
-$(EVENTOBJGFXDIR)/pics/unknown/839BE08.4bpp: %.4bpp: %.png
+$(FIELDEFFECTSGFXDIR)/pics/sand_disguise.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/pics/unknown/839B708.4bpp: %.4bpp: %.png
+$(FIELDEFFECTSGFXDIR)/pics/mountain_disguise.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(FIELDEFFECTSGFXDIR)/pics/tree_disguise.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
 $(INTERFACEGFXDIR)/selector_outline.4bpp: %.4bpp: %.png
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");