diff --git a/graphics/event_objects/pics/effects/arrow.png b/graphics/event_objects/pics/effects/arrow.png new file mode 100644 index 0000000000..a530b5344a Binary files /dev/null and b/graphics/event_objects/pics/effects/arrow.png differ diff --git a/graphics/event_objects/pics/effects/arrow/0.png b/graphics/event_objects/pics/effects/arrow/0.png deleted file mode 100644 index 3f06be0649..0000000000 Binary files a/graphics/event_objects/pics/effects/arrow/0.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/arrow/1.png b/graphics/event_objects/pics/effects/arrow/1.png deleted file mode 100644 index 87bbd99fff..0000000000 Binary files a/graphics/event_objects/pics/effects/arrow/1.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/arrow/2.png b/graphics/event_objects/pics/effects/arrow/2.png deleted file mode 100644 index f9abae71d4..0000000000 Binary files a/graphics/event_objects/pics/effects/arrow/2.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/arrow/3.png b/graphics/event_objects/pics/effects/arrow/3.png deleted file mode 100644 index 58d43a6d86..0000000000 Binary files a/graphics/event_objects/pics/effects/arrow/3.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/arrow/4.png b/graphics/event_objects/pics/effects/arrow/4.png deleted file mode 100644 index ef95afd9eb..0000000000 Binary files a/graphics/event_objects/pics/effects/arrow/4.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/arrow/5.png b/graphics/event_objects/pics/effects/arrow/5.png deleted file mode 100644 index 71b7e0c270..0000000000 Binary files a/graphics/event_objects/pics/effects/arrow/5.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/arrow/6.png b/graphics/event_objects/pics/effects/arrow/6.png deleted file mode 100644 index 53c33f44cb..0000000000 Binary files a/graphics/event_objects/pics/effects/arrow/6.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/arrow/7.png b/graphics/event_objects/pics/effects/arrow/7.png deleted file mode 100644 index bda7862da4..0000000000 Binary files a/graphics/event_objects/pics/effects/arrow/7.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/ash.png b/graphics/event_objects/pics/effects/ash.png new file mode 100644 index 0000000000..472583def0 Binary files /dev/null and b/graphics/event_objects/pics/effects/ash.png differ diff --git a/graphics/event_objects/pics/effects/ash/0.png b/graphics/event_objects/pics/effects/ash/0.png deleted file mode 100644 index 96a4b8f2af..0000000000 Binary files a/graphics/event_objects/pics/effects/ash/0.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/ash/1.png b/graphics/event_objects/pics/effects/ash/1.png deleted file mode 100644 index 8d973518d4..0000000000 Binary files a/graphics/event_objects/pics/effects/ash/1.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/ash/2.png b/graphics/event_objects/pics/effects/ash/2.png deleted file mode 100644 index eccd2e02d1..0000000000 Binary files a/graphics/event_objects/pics/effects/ash/2.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/ash/3.png b/graphics/event_objects/pics/effects/ash/3.png deleted file mode 100644 index 5ad0b8e5a4..0000000000 Binary files a/graphics/event_objects/pics/effects/ash/3.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/ash/4.png b/graphics/event_objects/pics/effects/ash/4.png deleted file mode 100644 index 7208f6a5b2..0000000000 Binary files a/graphics/event_objects/pics/effects/ash/4.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/berry_tree_growth_sparkle/berry_tree_growth_sparkle.png b/graphics/event_objects/pics/effects/berry_tree_growth_sparkle/berry_tree_growth_sparkle.png new file mode 100644 index 0000000000..4fd6e4d5fe Binary files /dev/null and b/graphics/event_objects/pics/effects/berry_tree_growth_sparkle/berry_tree_growth_sparkle.png differ diff --git a/graphics/event_objects/pics/effects/bike_hop_big_splash.png b/graphics/event_objects/pics/effects/bike_hop_big_splash.png new file mode 100644 index 0000000000..4546340fe7 Binary files /dev/null and b/graphics/event_objects/pics/effects/bike_hop_big_splash.png differ diff --git a/graphics/event_objects/pics/effects/bike_hop_big_splash/0.png b/graphics/event_objects/pics/effects/bike_hop_big_splash/0.png deleted file mode 100644 index 420663da83..0000000000 Binary files a/graphics/event_objects/pics/effects/bike_hop_big_splash/0.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/bike_hop_big_splash/1.png b/graphics/event_objects/pics/effects/bike_hop_big_splash/1.png deleted file mode 100644 index 72ca8fa1c1..0000000000 Binary files a/graphics/event_objects/pics/effects/bike_hop_big_splash/1.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/bike_hop_big_splash/2.png b/graphics/event_objects/pics/effects/bike_hop_big_splash/2.png deleted file mode 100644 index 96c224cdf1..0000000000 Binary files a/graphics/event_objects/pics/effects/bike_hop_big_splash/2.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/bike_hop_big_splash/3.png b/graphics/event_objects/pics/effects/bike_hop_big_splash/3.png deleted file mode 100644 index b549ea78c1..0000000000 Binary files a/graphics/event_objects/pics/effects/bike_hop_big_splash/3.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/bike_hop_small_splash.png b/graphics/event_objects/pics/effects/bike_hop_small_splash.png new file mode 100644 index 0000000000..523238a1d4 Binary files /dev/null and b/graphics/event_objects/pics/effects/bike_hop_small_splash.png differ diff --git a/graphics/event_objects/pics/effects/bike_hop_small_splash/0.png b/graphics/event_objects/pics/effects/bike_hop_small_splash/0.png deleted file mode 100644 index b5cccb306d..0000000000 Binary files a/graphics/event_objects/pics/effects/bike_hop_small_splash/0.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/bike_hop_small_splash/1.png b/graphics/event_objects/pics/effects/bike_hop_small_splash/1.png deleted file mode 100644 index 548198c092..0000000000 Binary files a/graphics/event_objects/pics/effects/bike_hop_small_splash/1.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/bike_hop_small_splash/2.png b/graphics/event_objects/pics/effects/bike_hop_small_splash/2.png deleted file mode 100644 index e8b86dfcb4..0000000000 Binary files a/graphics/event_objects/pics/effects/bike_hop_small_splash/2.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/bike_hop_tall_grass/bike_hop_tall_grass.png b/graphics/event_objects/pics/effects/bike_hop_tall_grass/bike_hop_tall_grass.png new file mode 100644 index 0000000000..805f260235 Binary files /dev/null and b/graphics/event_objects/pics/effects/bike_hop_tall_grass/bike_hop_tall_grass.png differ diff --git a/graphics/event_objects/pics/effects/bike_tire_tracks/bike_tire_tracks.png b/graphics/event_objects/pics/effects/bike_tire_tracks/bike_tire_tracks.png new file mode 100644 index 0000000000..383a393c4d Binary files /dev/null and b/graphics/event_objects/pics/effects/bike_tire_tracks/bike_tire_tracks.png differ diff --git a/graphics/event_objects/pics/effects/bubbles.png b/graphics/event_objects/pics/effects/bubbles.png new file mode 100644 index 0000000000..554fc8425e Binary files /dev/null and b/graphics/event_objects/pics/effects/bubbles.png differ diff --git a/graphics/event_objects/pics/effects/bubbles/0.png b/graphics/event_objects/pics/effects/bubbles/0.png deleted file mode 100644 index b71b193aea..0000000000 Binary files a/graphics/event_objects/pics/effects/bubbles/0.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/bubbles/1.png b/graphics/event_objects/pics/effects/bubbles/1.png deleted file mode 100644 index 0bd744ef20..0000000000 Binary files a/graphics/event_objects/pics/effects/bubbles/1.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/bubbles/2.png b/graphics/event_objects/pics/effects/bubbles/2.png deleted file mode 100644 index 4241e8f24c..0000000000 Binary files a/graphics/event_objects/pics/effects/bubbles/2.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/bubbles/3.png b/graphics/event_objects/pics/effects/bubbles/3.png deleted file mode 100644 index 3b440d9a74..0000000000 Binary files a/graphics/event_objects/pics/effects/bubbles/3.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/bubbles/4.png b/graphics/event_objects/pics/effects/bubbles/4.png deleted file mode 100644 index de9e66a257..0000000000 Binary files a/graphics/event_objects/pics/effects/bubbles/4.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/bubbles/5.png b/graphics/event_objects/pics/effects/bubbles/5.png deleted file mode 100644 index 54b9d768b7..0000000000 Binary files a/graphics/event_objects/pics/effects/bubbles/5.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/bubbles/6.png b/graphics/event_objects/pics/effects/bubbles/6.png deleted file mode 100644 index 35c26e6339..0000000000 Binary files a/graphics/event_objects/pics/effects/bubbles/6.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/bubbles/7.png b/graphics/event_objects/pics/effects/bubbles/7.png deleted file mode 100644 index 6323e0cc5c..0000000000 Binary files a/graphics/event_objects/pics/effects/bubbles/7.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/deep_sand_footprints/deep_sand_footprints.png b/graphics/event_objects/pics/effects/deep_sand_footprints/deep_sand_footprints.png new file mode 100644 index 0000000000..8719bd7a24 Binary files /dev/null and b/graphics/event_objects/pics/effects/deep_sand_footprints/deep_sand_footprints.png differ diff --git a/graphics/event_objects/pics/effects/ground_impact_dust/ground_impact_dust.png b/graphics/event_objects/pics/effects/ground_impact_dust/ground_impact_dust.png new file mode 100644 index 0000000000..83b25a6057 Binary files /dev/null and b/graphics/event_objects/pics/effects/ground_impact_dust/ground_impact_dust.png differ diff --git a/graphics/event_objects/pics/effects/jump_out_of_ash.png b/graphics/event_objects/pics/effects/jump_out_of_ash.png new file mode 100644 index 0000000000..b5161274ab Binary files /dev/null and b/graphics/event_objects/pics/effects/jump_out_of_ash.png differ diff --git a/graphics/event_objects/pics/effects/jump_out_of_ash/0.png b/graphics/event_objects/pics/effects/jump_out_of_ash/0.png deleted file mode 100644 index 50f9796b26..0000000000 Binary files a/graphics/event_objects/pics/effects/jump_out_of_ash/0.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/jump_out_of_ash/1.png b/graphics/event_objects/pics/effects/jump_out_of_ash/1.png deleted file mode 100644 index 685d31fac7..0000000000 Binary files a/graphics/event_objects/pics/effects/jump_out_of_ash/1.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/jump_out_of_ash/2.png b/graphics/event_objects/pics/effects/jump_out_of_ash/2.png deleted file mode 100644 index 9f11f176f4..0000000000 Binary files a/graphics/event_objects/pics/effects/jump_out_of_ash/2.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/jump_out_of_ash/3.png b/graphics/event_objects/pics/effects/jump_out_of_ash/3.png deleted file mode 100644 index 124581f755..0000000000 Binary files a/graphics/event_objects/pics/effects/jump_out_of_ash/3.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/jump_out_of_ash/4.png b/graphics/event_objects/pics/effects/jump_out_of_ash/4.png deleted file mode 100644 index 6e584a4dcf..0000000000 Binary files a/graphics/event_objects/pics/effects/jump_out_of_ash/4.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/long_grass/long_grass.png b/graphics/event_objects/pics/effects/long_grass/long_grass.png new file mode 100644 index 0000000000..5dfc3b2469 Binary files /dev/null and b/graphics/event_objects/pics/effects/long_grass/long_grass.png differ diff --git a/graphics/event_objects/pics/effects/mountain_disguise.png b/graphics/event_objects/pics/effects/mountain_disguise.png new file mode 100644 index 0000000000..ad592eac89 Binary files /dev/null and b/graphics/event_objects/pics/effects/mountain_disguise.png differ diff --git a/graphics/event_objects/pics/effects/mountain_disguise/0.png b/graphics/event_objects/pics/effects/mountain_disguise/0.png deleted file mode 100644 index 104056e469..0000000000 Binary files a/graphics/event_objects/pics/effects/mountain_disguise/0.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/mountain_disguise/1.png b/graphics/event_objects/pics/effects/mountain_disguise/1.png deleted file mode 100644 index 4b2d35963e..0000000000 Binary files a/graphics/event_objects/pics/effects/mountain_disguise/1.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/mountain_disguise/2.png b/graphics/event_objects/pics/effects/mountain_disguise/2.png deleted file mode 100644 index e2ea3b8558..0000000000 Binary files a/graphics/event_objects/pics/effects/mountain_disguise/2.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/mountain_disguise/3.png b/graphics/event_objects/pics/effects/mountain_disguise/3.png deleted file mode 100644 index 8f0a1be2ca..0000000000 Binary files a/graphics/event_objects/pics/effects/mountain_disguise/3.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/mountain_disguise/4.png b/graphics/event_objects/pics/effects/mountain_disguise/4.png deleted file mode 100644 index 8fd4df4106..0000000000 Binary files a/graphics/event_objects/pics/effects/mountain_disguise/4.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/mountain_disguise/5.png b/graphics/event_objects/pics/effects/mountain_disguise/5.png deleted file mode 100644 index a364b234d6..0000000000 Binary files a/graphics/event_objects/pics/effects/mountain_disguise/5.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/mountain_disguise/6.png b/graphics/event_objects/pics/effects/mountain_disguise/6.png deleted file mode 100644 index 2644aa9f14..0000000000 Binary files a/graphics/event_objects/pics/effects/mountain_disguise/6.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/ripple.png b/graphics/event_objects/pics/effects/ripple.png new file mode 100644 index 0000000000..0352ef2d8b Binary files /dev/null and b/graphics/event_objects/pics/effects/ripple.png differ diff --git a/graphics/event_objects/pics/effects/ripple/0.png b/graphics/event_objects/pics/effects/ripple/0.png deleted file mode 100644 index 24055c7d29..0000000000 Binary files a/graphics/event_objects/pics/effects/ripple/0.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/ripple/1.png b/graphics/event_objects/pics/effects/ripple/1.png deleted file mode 100644 index a478539250..0000000000 Binary files a/graphics/event_objects/pics/effects/ripple/1.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/ripple/2.png b/graphics/event_objects/pics/effects/ripple/2.png deleted file mode 100644 index 6670cb7799..0000000000 Binary files a/graphics/event_objects/pics/effects/ripple/2.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/ripple/3.png b/graphics/event_objects/pics/effects/ripple/3.png deleted file mode 100644 index 122df1940a..0000000000 Binary files a/graphics/event_objects/pics/effects/ripple/3.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/ripple/4.png b/graphics/event_objects/pics/effects/ripple/4.png deleted file mode 100644 index f4f79afe20..0000000000 Binary files a/graphics/event_objects/pics/effects/ripple/4.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/sand_disguise_placeholder.png b/graphics/event_objects/pics/effects/sand_disguise_placeholder.png new file mode 100644 index 0000000000..66b9993e77 Binary files /dev/null and b/graphics/event_objects/pics/effects/sand_disguise_placeholder.png differ diff --git a/graphics/event_objects/pics/effects/sand_disguise_placeholder/0.png b/graphics/event_objects/pics/effects/sand_disguise_placeholder/0.png deleted file mode 100644 index df242de2f1..0000000000 Binary files a/graphics/event_objects/pics/effects/sand_disguise_placeholder/0.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/sand_disguise_placeholder/1.png b/graphics/event_objects/pics/effects/sand_disguise_placeholder/1.png deleted file mode 100644 index 2e993b30ec..0000000000 Binary files a/graphics/event_objects/pics/effects/sand_disguise_placeholder/1.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/sand_disguise_placeholder/2.png b/graphics/event_objects/pics/effects/sand_disguise_placeholder/2.png deleted file mode 100644 index 3d6864e417..0000000000 Binary files a/graphics/event_objects/pics/effects/sand_disguise_placeholder/2.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/sand_disguise_placeholder/3.png b/graphics/event_objects/pics/effects/sand_disguise_placeholder/3.png deleted file mode 100644 index 690110a8c3..0000000000 Binary files a/graphics/event_objects/pics/effects/sand_disguise_placeholder/3.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/sand_disguise_placeholder/4.png b/graphics/event_objects/pics/effects/sand_disguise_placeholder/4.png deleted file mode 100644 index caa568eaca..0000000000 Binary files a/graphics/event_objects/pics/effects/sand_disguise_placeholder/4.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/sand_disguise_placeholder/5.png b/graphics/event_objects/pics/effects/sand_disguise_placeholder/5.png deleted file mode 100644 index 0d0bd9886b..0000000000 Binary files a/graphics/event_objects/pics/effects/sand_disguise_placeholder/5.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/sand_disguise_placeholder/6.png b/graphics/event_objects/pics/effects/sand_disguise_placeholder/6.png deleted file mode 100644 index ed40527d0e..0000000000 Binary files a/graphics/event_objects/pics/effects/sand_disguise_placeholder/6.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/sand_footprints/sand_footprints.png b/graphics/event_objects/pics/effects/sand_footprints/sand_footprints.png new file mode 100644 index 0000000000..cec011d0a5 Binary files /dev/null and b/graphics/event_objects/pics/effects/sand_footprints/sand_footprints.png differ diff --git a/graphics/event_objects/pics/effects/short_grass.png b/graphics/event_objects/pics/effects/short_grass.png new file mode 100644 index 0000000000..53eb7924e2 Binary files /dev/null and b/graphics/event_objects/pics/effects/short_grass.png differ diff --git a/graphics/event_objects/pics/effects/short_grass/0.png b/graphics/event_objects/pics/effects/short_grass/0.png deleted file mode 100644 index a5d5181db3..0000000000 Binary files a/graphics/event_objects/pics/effects/short_grass/0.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/short_grass/1.png b/graphics/event_objects/pics/effects/short_grass/1.png deleted file mode 100644 index 17a62968a8..0000000000 Binary files a/graphics/event_objects/pics/effects/short_grass/1.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/splash.png b/graphics/event_objects/pics/effects/splash.png new file mode 100644 index 0000000000..a33a0c9dac Binary files /dev/null and b/graphics/event_objects/pics/effects/splash.png differ diff --git a/graphics/event_objects/pics/effects/splash/0.png b/graphics/event_objects/pics/effects/splash/0.png deleted file mode 100644 index 2b29c76ae3..0000000000 Binary files a/graphics/event_objects/pics/effects/splash/0.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/splash/1.png b/graphics/event_objects/pics/effects/splash/1.png deleted file mode 100644 index 1807213420..0000000000 Binary files a/graphics/event_objects/pics/effects/splash/1.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/surf_blob.png b/graphics/event_objects/pics/effects/surf_blob.png new file mode 100644 index 0000000000..7e91e17dc1 Binary files /dev/null and b/graphics/event_objects/pics/effects/surf_blob.png differ diff --git a/graphics/event_objects/pics/effects/surf_blob/0.png b/graphics/event_objects/pics/effects/surf_blob/0.png deleted file mode 100644 index c4a14e052e..0000000000 Binary files a/graphics/event_objects/pics/effects/surf_blob/0.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/surf_blob/1.png b/graphics/event_objects/pics/effects/surf_blob/1.png deleted file mode 100644 index 25fd5ad929..0000000000 Binary files a/graphics/event_objects/pics/effects/surf_blob/1.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/surf_blob/2.png b/graphics/event_objects/pics/effects/surf_blob/2.png deleted file mode 100644 index 532da2611f..0000000000 Binary files a/graphics/event_objects/pics/effects/surf_blob/2.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/tall_grass.png b/graphics/event_objects/pics/effects/tall_grass.png new file mode 100644 index 0000000000..b6b44307a9 Binary files /dev/null and b/graphics/event_objects/pics/effects/tall_grass.png differ diff --git a/graphics/event_objects/pics/effects/tall_grass/0.png b/graphics/event_objects/pics/effects/tall_grass/0.png deleted file mode 100644 index 00d596b4cf..0000000000 Binary files a/graphics/event_objects/pics/effects/tall_grass/0.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/tall_grass/1.png b/graphics/event_objects/pics/effects/tall_grass/1.png deleted file mode 100644 index 0c8bdd84ed..0000000000 Binary files a/graphics/event_objects/pics/effects/tall_grass/1.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/tall_grass/2.png b/graphics/event_objects/pics/effects/tall_grass/2.png deleted file mode 100644 index 55d971758a..0000000000 Binary files a/graphics/event_objects/pics/effects/tall_grass/2.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/tall_grass/3.png b/graphics/event_objects/pics/effects/tall_grass/3.png deleted file mode 100644 index 0add110833..0000000000 Binary files a/graphics/event_objects/pics/effects/tall_grass/3.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/tall_grass/4.png b/graphics/event_objects/pics/effects/tall_grass/4.png deleted file mode 100644 index ca164d3cc2..0000000000 Binary files a/graphics/event_objects/pics/effects/tall_grass/4.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/tree_disguise.png b/graphics/event_objects/pics/effects/tree_disguise.png new file mode 100644 index 0000000000..77d07ef4ed Binary files /dev/null and b/graphics/event_objects/pics/effects/tree_disguise.png differ diff --git a/graphics/event_objects/pics/effects/tree_disguise/0.png b/graphics/event_objects/pics/effects/tree_disguise/0.png deleted file mode 100644 index 2bce7f9edd..0000000000 Binary files a/graphics/event_objects/pics/effects/tree_disguise/0.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/tree_disguise/1.png b/graphics/event_objects/pics/effects/tree_disguise/1.png deleted file mode 100644 index e29336cd4a..0000000000 Binary files a/graphics/event_objects/pics/effects/tree_disguise/1.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/tree_disguise/2.png b/graphics/event_objects/pics/effects/tree_disguise/2.png deleted file mode 100644 index 2cca165c5f..0000000000 Binary files a/graphics/event_objects/pics/effects/tree_disguise/2.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/tree_disguise/3.png b/graphics/event_objects/pics/effects/tree_disguise/3.png deleted file mode 100644 index 85dd30cfd5..0000000000 Binary files a/graphics/event_objects/pics/effects/tree_disguise/3.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/tree_disguise/4.png b/graphics/event_objects/pics/effects/tree_disguise/4.png deleted file mode 100644 index 8c78216343..0000000000 Binary files a/graphics/event_objects/pics/effects/tree_disguise/4.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/tree_disguise/5.png b/graphics/event_objects/pics/effects/tree_disguise/5.png deleted file mode 100644 index 2ffd56fcc4..0000000000 Binary files a/graphics/event_objects/pics/effects/tree_disguise/5.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/tree_disguise/6.png b/graphics/event_objects/pics/effects/tree_disguise/6.png deleted file mode 100644 index bc93331628..0000000000 Binary files a/graphics/event_objects/pics/effects/tree_disguise/6.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/unknown_17.png b/graphics/event_objects/pics/effects/unknown_17.png new file mode 100644 index 0000000000..fedf86a10b Binary files /dev/null and b/graphics/event_objects/pics/effects/unknown_17.png differ diff --git a/graphics/event_objects/pics/effects/unknown_17/0.png b/graphics/event_objects/pics/effects/unknown_17/0.png deleted file mode 100644 index 9c804844e5..0000000000 Binary files a/graphics/event_objects/pics/effects/unknown_17/0.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/unknown_17/1.png b/graphics/event_objects/pics/effects/unknown_17/1.png deleted file mode 100644 index 6628b58209..0000000000 Binary files a/graphics/event_objects/pics/effects/unknown_17/1.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/unknown_17/2.png b/graphics/event_objects/pics/effects/unknown_17/2.png deleted file mode 100644 index a5cdcca575..0000000000 Binary files a/graphics/event_objects/pics/effects/unknown_17/2.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/unknown_17/3.png b/graphics/event_objects/pics/effects/unknown_17/3.png deleted file mode 100644 index 2f9a20019a..0000000000 Binary files a/graphics/event_objects/pics/effects/unknown_17/3.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/unknown_17/4.png b/graphics/event_objects/pics/effects/unknown_17/4.png deleted file mode 100644 index ce0bc29aad..0000000000 Binary files a/graphics/event_objects/pics/effects/unknown_17/4.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/unknown_17/5.png b/graphics/event_objects/pics/effects/unknown_17/5.png deleted file mode 100644 index f92888a3a5..0000000000 Binary files a/graphics/event_objects/pics/effects/unknown_17/5.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/unknown_17/6.png b/graphics/event_objects/pics/effects/unknown_17/6.png deleted file mode 100644 index 7e740a9569..0000000000 Binary files a/graphics/event_objects/pics/effects/unknown_17/6.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/unknown_17/7.png b/graphics/event_objects/pics/effects/unknown_17/7.png deleted file mode 100644 index 25d90e16c1..0000000000 Binary files a/graphics/event_objects/pics/effects/unknown_17/7.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/unknown_18/unknown_18.png b/graphics/event_objects/pics/effects/unknown_18/unknown_18.png new file mode 100644 index 0000000000..19f08ac537 Binary files /dev/null and b/graphics/event_objects/pics/effects/unknown_18/unknown_18.png differ diff --git a/graphics/event_objects/pics/effects/unknown_19/unknown_19.png b/graphics/event_objects/pics/effects/unknown_19/unknown_19.png new file mode 100644 index 0000000000..d670cde5fc Binary files /dev/null and b/graphics/event_objects/pics/effects/unknown_19/unknown_19.png differ diff --git a/graphics/event_objects/pics/effects/unknown_20/unknown_20.png b/graphics/event_objects/pics/effects/unknown_20/unknown_20.png new file mode 100644 index 0000000000..83e35467a1 Binary files /dev/null and b/graphics/event_objects/pics/effects/unknown_20/unknown_20.png differ diff --git a/graphics/event_objects/pics/effects/unknown_29/unknown_29.png b/graphics/event_objects/pics/effects/unknown_29/unknown_29.png new file mode 100644 index 0000000000..2da55f179d Binary files /dev/null and b/graphics/event_objects/pics/effects/unknown_29/unknown_29.png differ diff --git a/graphics/event_objects/pics/effects/unknown_33/unknown_33.png b/graphics/event_objects/pics/effects/unknown_33/unknown_33.png new file mode 100644 index 0000000000..67f589ece3 Binary files /dev/null and b/graphics/event_objects/pics/effects/unknown_33/unknown_33.png differ diff --git a/graphics/event_objects/pics/effects/unknown_35/unknown_35.png b/graphics/event_objects/pics/effects/unknown_35/unknown_35.png new file mode 100644 index 0000000000..8dbffe36ca Binary files /dev/null and b/graphics/event_objects/pics/effects/unknown_35/unknown_35.png differ diff --git a/graphics/event_objects/pics/effects/unused_grass/unused_grass.png b/graphics/event_objects/pics/effects/unused_grass/unused_grass.png new file mode 100644 index 0000000000..0c573b4aa4 Binary files /dev/null and b/graphics/event_objects/pics/effects/unused_grass/unused_grass.png differ diff --git a/graphics/event_objects/pics/misc/breakable_rock.png b/graphics/event_objects/pics/misc/breakable_rock.png new file mode 100644 index 0000000000..db9926804d Binary files /dev/null and b/graphics/event_objects/pics/misc/breakable_rock.png differ diff --git a/graphics/event_objects/pics/misc/breakable_rock/0.png b/graphics/event_objects/pics/misc/breakable_rock/0.png deleted file mode 100644 index 058324c86d..0000000000 Binary files a/graphics/event_objects/pics/misc/breakable_rock/0.png and /dev/null differ diff --git a/graphics/event_objects/pics/misc/breakable_rock/1.png b/graphics/event_objects/pics/misc/breakable_rock/1.png deleted file mode 100644 index 6c8b3133a1..0000000000 Binary files a/graphics/event_objects/pics/misc/breakable_rock/1.png and /dev/null differ diff --git a/graphics/event_objects/pics/misc/breakable_rock/2.png b/graphics/event_objects/pics/misc/breakable_rock/2.png deleted file mode 100644 index 737148d66e..0000000000 Binary files a/graphics/event_objects/pics/misc/breakable_rock/2.png and /dev/null differ diff --git a/graphics/event_objects/pics/misc/breakable_rock/3.png b/graphics/event_objects/pics/misc/breakable_rock/3.png deleted file mode 100644 index 89eedd1aa5..0000000000 Binary files a/graphics/event_objects/pics/misc/breakable_rock/3.png and /dev/null differ diff --git a/graphics/event_objects/pics/misc/cuttable_tree.png b/graphics/event_objects/pics/misc/cuttable_tree.png new file mode 100644 index 0000000000..6071f4a61e Binary files /dev/null and b/graphics/event_objects/pics/misc/cuttable_tree.png differ diff --git a/graphics/event_objects/pics/misc/cuttable_tree/0.png b/graphics/event_objects/pics/misc/cuttable_tree/0.png deleted file mode 100644 index 509d8b03cf..0000000000 Binary files a/graphics/event_objects/pics/misc/cuttable_tree/0.png and /dev/null differ diff --git a/graphics/event_objects/pics/misc/cuttable_tree/1.png b/graphics/event_objects/pics/misc/cuttable_tree/1.png deleted file mode 100644 index afa42cf162..0000000000 Binary files a/graphics/event_objects/pics/misc/cuttable_tree/1.png and /dev/null differ diff --git a/graphics/event_objects/pics/misc/cuttable_tree/2.png b/graphics/event_objects/pics/misc/cuttable_tree/2.png deleted file mode 100644 index f222ece436..0000000000 Binary files a/graphics/event_objects/pics/misc/cuttable_tree/2.png and /dev/null differ diff --git a/graphics/event_objects/pics/misc/cuttable_tree/3.png b/graphics/event_objects/pics/misc/cuttable_tree/3.png deleted file mode 100644 index 09ffefd29e..0000000000 Binary files a/graphics/event_objects/pics/misc/cuttable_tree/3.png and /dev/null differ diff --git a/graphics/event_objects/pics/misc/mr_brineys_boat.png b/graphics/event_objects/pics/misc/mr_brineys_boat.png new file mode 100644 index 0000000000..e790eb172d Binary files /dev/null and b/graphics/event_objects/pics/misc/mr_brineys_boat.png differ diff --git a/graphics/event_objects/pics/misc/mr_brineys_boat/0.png b/graphics/event_objects/pics/misc/mr_brineys_boat/0.png deleted file mode 100644 index 593ed07c86..0000000000 Binary files a/graphics/event_objects/pics/misc/mr_brineys_boat/0.png and /dev/null differ diff --git a/graphics/event_objects/pics/misc/mr_brineys_boat/1.png b/graphics/event_objects/pics/misc/mr_brineys_boat/1.png deleted file mode 100644 index 39b75fd734..0000000000 Binary files a/graphics/event_objects/pics/misc/mr_brineys_boat/1.png and /dev/null differ diff --git a/graphics/event_objects/pics/misc/mr_brineys_boat/2.png b/graphics/event_objects/pics/misc/mr_brineys_boat/2.png deleted file mode 100644 index 9db6b11fee..0000000000 Binary files a/graphics/event_objects/pics/misc/mr_brineys_boat/2.png and /dev/null differ diff --git a/src/data/field_event_obj/event_object_graphics.h b/src/data/field_event_obj/event_object_graphics.h index e9f700a99e..2fd1380ee2 100755 --- a/src/data/field_event_obj/event_object_graphics.h +++ b/src/data/field_event_obj/event_object_graphics.h @@ -235,18 +235,10 @@ const u32 gEventObjectPic_BigWailmerDoll[] = INCBIN_U32("graphics/event_objects/ const u32 gEventObjectPic_BigRegirockDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_regirock_doll.4bpp"); const u32 gEventObjectPic_BigRegiceDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_regice_doll.4bpp"); const u32 gEventObjectPic_BigRegisteelDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_registeel_doll.4bpp"); -const u32 gEventObjectPic_CuttableTree_0[] = INCBIN_U32("graphics/event_objects/pics/misc/cuttable_tree/0.4bpp"); -const u32 gEventObjectPic_CuttableTree_1[] = INCBIN_U32("graphics/event_objects/pics/misc/cuttable_tree/1.4bpp"); -const u32 gEventObjectPic_CuttableTree_2[] = INCBIN_U32("graphics/event_objects/pics/misc/cuttable_tree/2.4bpp"); -const u32 gEventObjectPic_CuttableTree_3[] = INCBIN_U32("graphics/event_objects/pics/misc/cuttable_tree/3.4bpp"); -const u32 gEventObjectPic_BreakableRock_0[] = INCBIN_U32("graphics/event_objects/pics/misc/breakable_rock/0.4bpp"); -const u32 gEventObjectPic_BreakableRock_1[] = INCBIN_U32("graphics/event_objects/pics/misc/breakable_rock/1.4bpp"); -const u32 gEventObjectPic_BreakableRock_2[] = INCBIN_U32("graphics/event_objects/pics/misc/breakable_rock/2.4bpp"); -const u32 gEventObjectPic_BreakableRock_3[] = INCBIN_U32("graphics/event_objects/pics/misc/breakable_rock/3.4bpp"); +const u32 gEventObjectPic_CuttableTree[] = INCBIN_U32("graphics/event_objects/pics/misc/cuttable_tree.4bpp"); +const u32 gEventObjectPic_BreakableRock[] = INCBIN_U32("graphics/event_objects/pics/misc/breakable_rock.4bpp"); const u32 gEventObjectPic_PushableBoulder[] = INCBIN_U32("graphics/event_objects/pics/misc/pushable_boulder.4bpp"); -const u32 gEventObjectPic_MrBrineysBoat_0[] = INCBIN_U32("graphics/event_objects/pics/misc/mr_brineys_boat/0.4bpp"); -const u32 gEventObjectPic_MrBrineysBoat_1[] = INCBIN_U32("graphics/event_objects/pics/misc/mr_brineys_boat/1.4bpp"); -const u32 gEventObjectPic_MrBrineysBoat_2[] = INCBIN_U32("graphics/event_objects/pics/misc/mr_brineys_boat/2.4bpp"); +const u32 gEventObjectPic_MrBrineysBoat[] = INCBIN_U32("graphics/event_objects/pics/misc/mr_brineys_boat.4bpp"); const u32 gEventObjectPic_Fossil[] = INCBIN_U32("graphics/event_objects/pics/misc/fossil.4bpp"); const u32 gEventObjectPic_SubmarineShadow[] = INCBIN_U32("graphics/event_objects/pics/misc/submarine_shadow.4bpp"); const u16 gEventObjectPalette26[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_26.gbapal"); @@ -301,9 +293,7 @@ const u32 gEventObjectPic_CornnBerryTree[] = INCBIN_U32("graphics/event_objects/ const u32 gEventObjectPic_LansatBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/lansat.4bpp"); const u32 gEventObjectPic_DurinBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/durin.4bpp"); const u32 gEventObjectPic_TamatoBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/tamato.4bpp"); -const u32 gFieldEffectObjectPic_SurfBlob_0[] = INCBIN_U32("graphics/event_objects/pics/effects/surf_blob/0.4bpp"); -const u32 gFieldEffectObjectPic_SurfBlob_1[] = INCBIN_U32("graphics/event_objects/pics/effects/surf_blob/1.4bpp"); -const u32 gFieldEffectObjectPic_SurfBlob_2[] = INCBIN_U32("graphics/event_objects/pics/effects/surf_blob/2.4bpp"); +const u32 gFieldEffectObjectPic_SurfBlob[] = INCBIN_U32("graphics/event_objects/pics/effects/surf_blob.4bpp"); const u32 gEventObjectPic_QuintyPlump[] = INCBIN_U32("graphics/event_objects/pics/people/quinty_plump.4bpp"); const u16 gEventObjectPalette12[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_12.gbapal"); const u16 gEventObjectPalette13[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_13.gbapal"); @@ -315,24 +305,9 @@ const u32 filler_8368A08[0x48] = {}; const u8 gFieldEffectPic_CutGrass[] = INCBIN_U8("graphics/event_objects/pics/effects/cut_grass.4bpp"); const u32 gFieldEffectPic_CutGrass_Copy[] = INCBIN_U32("graphics/event_objects/pics/effects/cut_grass.4bpp"); const u16 gFieldEffectObjectPalette6[] = INCBIN_U16("graphics/event_objects/palettes/field_effect_object_palette_06.gbapal"); -const u32 gFieldEffectObjectPic_Ripple_0[] = INCBIN_U32("graphics/event_objects/pics/effects/ripple/0.4bpp"); -const u32 gFieldEffectObjectPic_Ripple_1[] = INCBIN_U32("graphics/event_objects/pics/effects/ripple/1.4bpp"); -const u32 gFieldEffectObjectPic_Ripple_2[] = INCBIN_U32("graphics/event_objects/pics/effects/ripple/2.4bpp"); -const u32 gFieldEffectObjectPic_Ripple_3[] = INCBIN_U32("graphics/event_objects/pics/effects/ripple/3.4bpp"); -const u32 gFieldEffectObjectPic_Ripple_4[] = INCBIN_U32("graphics/event_objects/pics/effects/ripple/4.4bpp"); -const u32 gFieldEffectObjectPic_Ash_0[] = INCBIN_U32("graphics/event_objects/pics/effects/ash/0.4bpp"); -const u32 gFieldEffectObjectPic_Ash_1[] = INCBIN_U32("graphics/event_objects/pics/effects/ash/1.4bpp"); -const u32 gFieldEffectObjectPic_Ash_2[] = INCBIN_U32("graphics/event_objects/pics/effects/ash/2.4bpp"); -const u32 gFieldEffectObjectPic_Ash_3[] = INCBIN_U32("graphics/event_objects/pics/effects/ash/3.4bpp"); -const u32 gFieldEffectObjectPic_Ash_4[] = INCBIN_U32("graphics/event_objects/pics/effects/ash/4.4bpp"); -const u32 gFieldEffectObjectPic_Arrow_0[] = INCBIN_U32("graphics/event_objects/pics/effects/arrow/0.4bpp"); -const u32 gFieldEffectObjectPic_Arrow_1[] = INCBIN_U32("graphics/event_objects/pics/effects/arrow/1.4bpp"); -const u32 gFieldEffectObjectPic_Arrow_2[] = INCBIN_U32("graphics/event_objects/pics/effects/arrow/2.4bpp"); -const u32 gFieldEffectObjectPic_Arrow_3[] = INCBIN_U32("graphics/event_objects/pics/effects/arrow/3.4bpp"); -const u32 gFieldEffectObjectPic_Arrow_4[] = INCBIN_U32("graphics/event_objects/pics/effects/arrow/4.4bpp"); -const u32 gFieldEffectObjectPic_Arrow_5[] = INCBIN_U32("graphics/event_objects/pics/effects/arrow/5.4bpp"); -const u32 gFieldEffectObjectPic_Arrow_6[] = INCBIN_U32("graphics/event_objects/pics/effects/arrow/6.4bpp"); -const u32 gFieldEffectObjectPic_Arrow_7[] = INCBIN_U32("graphics/event_objects/pics/effects/arrow/7.4bpp"); +const u32 gFieldEffectObjectPic_Ripple[] = INCBIN_U32("graphics/event_objects/pics/effects/ripple.4bpp"); +const u32 gFieldEffectObjectPic_Ash[] = INCBIN_U32("graphics/event_objects/pics/effects/ash.4bpp"); +const u32 gFieldEffectObjectPic_Arrow[] = INCBIN_U32("graphics/event_objects/pics/effects/arrow/0.4bpp"); const u16 gFieldEffectObjectPalette0[] = INCBIN_U16("graphics/event_objects/palettes/field_effect_object_palette_00.gbapal"); const u16 gFieldEffectObjectPalette1[] = INCBIN_U16("graphics/event_objects/palettes/field_effect_object_palette_01.gbapal"); const u32 gFieldEffectObjectPic_GroundImpactDust_0[] = INCBIN_U32("graphics/event_objects/pics/effects/ground_impact_dust/0.4bpp"); @@ -353,14 +328,7 @@ const u32 gFieldEffectObjectPic_Unknown16_3[] = INCBIN_U32("graphics/event_objec const u32 gFieldEffectObjectPic_Unknown16_4[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_16/4.4bpp"); const u32 gUnknown_084F7E38[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_4F7E38/0.4bpp"); const u32 gFieldEffectObjectPic_Unknown16_5[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_16/5.4bpp"); -const u32 gFieldEffectObjectPic_Unknown17_0[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_17/0.4bpp"); -const u32 gFieldEffectObjectPic_Unknown17_1[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_17/1.4bpp"); -const u32 gFieldEffectObjectPic_Unknown17_2[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_17/2.4bpp"); -const u32 gFieldEffectObjectPic_Unknown17_3[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_17/3.4bpp"); -const u32 gFieldEffectObjectPic_Unknown17_4[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_17/4.4bpp"); -const u32 gFieldEffectObjectPic_Unknown17_5[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_17/5.4bpp"); -const u32 gFieldEffectObjectPic_Unknown17_6[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_17/6.4bpp"); -const u32 gFieldEffectObjectPic_Unknown17_7[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_17/7.4bpp"); +const u32 gFieldEffectObjectPic_Unknown17[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_17.4bpp"); const u32 gFieldEffectObjectPic_Unknown18_0[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_18/0.4bpp"); const u32 gFieldEffectObjectPic_Unknown18_1[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_18/1.4bpp"); const u32 gFieldEffectObjectPic_Unknown18_2[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_18/2.4bpp"); @@ -369,13 +337,8 @@ const u32 gFieldEffectObjectPic_LongGrass_0[] = INCBIN_U32("graphics/event_objec const u32 gFieldEffectObjectPic_LongGrass_1[] = INCBIN_U32("graphics/event_objects/pics/effects/long_grass/1.4bpp"); const u32 gFieldEffectObjectPic_LongGrass_2[] = INCBIN_U32("graphics/event_objects/pics/effects/long_grass/2.4bpp"); const u32 gFieldEffectObjectPic_LongGrass_3[] = INCBIN_U32("graphics/event_objects/pics/effects/long_grass/3.4bpp"); -const u32 gFieldEffectObjectPic_TallGrass_0[] = INCBIN_U32("graphics/event_objects/pics/effects/tall_grass/0.4bpp"); -const u32 gFieldEffectObjectPic_TallGrass_1[] = INCBIN_U32("graphics/event_objects/pics/effects/tall_grass/1.4bpp"); -const u32 gFieldEffectObjectPic_TallGrass_2[] = INCBIN_U32("graphics/event_objects/pics/effects/tall_grass/2.4bpp"); -const u32 gFieldEffectObjectPic_TallGrass_3[] = INCBIN_U32("graphics/event_objects/pics/effects/tall_grass/3.4bpp"); -const u32 gFieldEffectObjectPic_TallGrass_4[] = INCBIN_U32("graphics/event_objects/pics/effects/tall_grass/4.4bpp"); -const u32 gFieldEffectObjectPic_ShortGrass_0[] = INCBIN_U32("graphics/event_objects/pics/effects/short_grass/0.4bpp"); -const u32 gFieldEffectObjectPic_ShortGrass_1[] = INCBIN_U32("graphics/event_objects/pics/effects/short_grass/1.4bpp"); +const u32 gFieldEffectObjectPic_TallGrass[] = INCBIN_U32("graphics/event_objects/pics/effects/tall_grass.4bpp"); +const u32 gFieldEffectObjectPic_ShortGrass[] = INCBIN_U32("graphics/event_objects/pics/effects/short_grass.4bpp"); const u32 gFieldEffectObjectPic_SandFootprints_0[] = INCBIN_U32("graphics/event_objects/pics/effects/sand_footprints/0.4bpp"); const u32 gFieldEffectObjectPic_SandFootprints_1[] = INCBIN_U32("graphics/event_objects/pics/effects/sand_footprints/1.4bpp"); const u32 gFieldEffectObjectPic_DeepSandFootprints_0[] = INCBIN_U32("graphics/event_objects/pics/effects/deep_sand_footprints/0.4bpp"); @@ -391,61 +354,26 @@ const u32 gFieldEffectObjectPic_Unknown19_3[] = INCBIN_U32("graphics/event_objec const u32 gFieldEffectObjectPic_Unknown29_0[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_29/0.4bpp"); const u32 gFieldEffectObjectPic_Unknown29_1[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_29/1.4bpp"); const u32 gFieldEffectObjectPic_Unknown29_2[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_29/2.4bpp"); -const u32 gFieldEffectObjectPic_BikeHopBigSplash_0[] = INCBIN_U32("graphics/event_objects/pics/effects/bike_hop_big_splash/0.4bpp"); -const u32 gFieldEffectObjectPic_BikeHopBigSplash_1[] = INCBIN_U32("graphics/event_objects/pics/effects/bike_hop_big_splash/1.4bpp"); -const u32 gFieldEffectObjectPic_BikeHopBigSplash_2[] = INCBIN_U32("graphics/event_objects/pics/effects/bike_hop_big_splash/2.4bpp"); -const u32 gFieldEffectObjectPic_BikeHopBigSplash_3[] = INCBIN_U32("graphics/event_objects/pics/effects/bike_hop_big_splash/3.4bpp"); -const u32 gFieldEffectObjectPic_Splash_0[] = INCBIN_U32("graphics/event_objects/pics/effects/splash/0.4bpp"); -const u32 gFieldEffectObjectPic_Splash_1[] = INCBIN_U32("graphics/event_objects/pics/effects/splash/1.4bpp"); -const u32 gFieldEffectObjectPic_BikeHopSmallSplash_0[] = INCBIN_U32("graphics/event_objects/pics/effects/bike_hop_small_splash/0.4bpp"); -const u32 gFieldEffectObjectPic_BikeHopSmallSplash_1[] = INCBIN_U32("graphics/event_objects/pics/effects/bike_hop_small_splash/1.4bpp"); -const u32 gFieldEffectObjectPic_BikeHopSmallSplash_2[] = INCBIN_U32("graphics/event_objects/pics/effects/bike_hop_small_splash/2.4bpp"); +const u32 gFieldEffectObjectPic_BikeHopBigSplash[] = INCBIN_U32("graphics/event_objects/pics/effects/bike_hop_big_splash.4bpp"); +const u32 gFieldEffectObjectPic_Splash[] = INCBIN_U32("graphics/event_objects/pics/effects/splash.4bpp"); +const u32 gFieldEffectObjectPic_BikeHopSmallSplash[] = INCBIN_U32("graphics/event_objects/pics/effects/bike_hop_small_splash.4bpp"); const u32 gFieldEffectObjectPic_Unknown20_0[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_20/0.4bpp"); const u32 gFieldEffectObjectPic_Unknown20_1[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_20/1.4bpp"); const u32 gFieldEffectObjectPic_Unknown20_2[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_20/2.4bpp"); const u32 gFieldEffectObjectPic_Unknown20_3[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_20/3.4bpp"); const u32 gFieldEffectObjectPic_Unknown20_4[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_20/4.4bpp"); -const u32 gFieldEffectObjectPic_TreeDisguise_0[] = INCBIN_U32("graphics/event_objects/pics/effects/tree_disguise/0.4bpp"); -const u32 gFieldEffectObjectPic_TreeDisguise_1[] = INCBIN_U32("graphics/event_objects/pics/effects/tree_disguise/1.4bpp"); -const u32 gFieldEffectObjectPic_TreeDisguise_2[] = INCBIN_U32("graphics/event_objects/pics/effects/tree_disguise/2.4bpp"); -const u32 gFieldEffectObjectPic_TreeDisguise_3[] = INCBIN_U32("graphics/event_objects/pics/effects/tree_disguise/3.4bpp"); -const u32 gFieldEffectObjectPic_TreeDisguise_4[] = INCBIN_U32("graphics/event_objects/pics/effects/tree_disguise/4.4bpp"); -const u32 gFieldEffectObjectPic_TreeDisguise_5[] = INCBIN_U32("graphics/event_objects/pics/effects/tree_disguise/5.4bpp"); -const u32 gFieldEffectObjectPic_TreeDisguise_6[] = INCBIN_U32("graphics/event_objects/pics/effects/tree_disguise/6.4bpp"); -const u32 gFieldEffectObjectPic_MountainDisguise_0[] = INCBIN_U32("graphics/event_objects/pics/effects/mountain_disguise/0.4bpp"); -const u32 gFieldEffectObjectPic_MountainDisguise_1[] = INCBIN_U32("graphics/event_objects/pics/effects/mountain_disguise/1.4bpp"); -const u32 gFieldEffectObjectPic_MountainDisguise_2[] = INCBIN_U32("graphics/event_objects/pics/effects/mountain_disguise/2.4bpp"); -const u32 gFieldEffectObjectPic_MountainDisguise_3[] = INCBIN_U32("graphics/event_objects/pics/effects/mountain_disguise/3.4bpp"); -const u32 gFieldEffectObjectPic_MountainDisguise_4[] = INCBIN_U32("graphics/event_objects/pics/effects/mountain_disguise/4.4bpp"); -const u32 gFieldEffectObjectPic_MountainDisguise_5[] = INCBIN_U32("graphics/event_objects/pics/effects/mountain_disguise/5.4bpp"); -const u32 gFieldEffectObjectPic_MountainDisguise_6[] = INCBIN_U32("graphics/event_objects/pics/effects/mountain_disguise/6.4bpp"); -const u32 gFieldEffectObjectPic_SandDisguisePlaceholder_0[] = INCBIN_U32("graphics/event_objects/pics/effects/sand_disguise_placeholder/0.4bpp"); -const u32 gFieldEffectObjectPic_SandDisguisePlaceholder_1[] = INCBIN_U32("graphics/event_objects/pics/effects/sand_disguise_placeholder/1.4bpp"); -const u32 gFieldEffectObjectPic_SandDisguisePlaceholder_2[] = INCBIN_U32("graphics/event_objects/pics/effects/sand_disguise_placeholder/2.4bpp"); -const u32 gFieldEffectObjectPic_SandDisguisePlaceholder_3[] = INCBIN_U32("graphics/event_objects/pics/effects/sand_disguise_placeholder/3.4bpp"); -const u32 gFieldEffectObjectPic_SandDisguisePlaceholder_4[] = INCBIN_U32("graphics/event_objects/pics/effects/sand_disguise_placeholder/4.4bpp"); -const u32 gFieldEffectObjectPic_SandDisguisePlaceholder_5[] = INCBIN_U32("graphics/event_objects/pics/effects/sand_disguise_placeholder/5.4bpp"); -const u32 gFieldEffectObjectPic_SandDisguisePlaceholder_6[] = INCBIN_U32("graphics/event_objects/pics/effects/sand_disguise_placeholder/6.4bpp"); +const u32 gFieldEffectObjectPic_TreeDisguise[] = INCBIN_U32("graphics/event_objects/pics/effects/tree_disguise.4bpp"); +const u32 gFieldEffectObjectPic_MountainDisguise[] = INCBIN_U32("graphics/event_objects/pics/effects/mountain_disguise.4bpp"); +const u32 gFieldEffectObjectPic_SandDisguisePlaceholder[] = INCBIN_U32("graphics/event_objects/pics/effects/sand_disguise_placeholder.4bpp"); const u32 gFieldEffectObjectPic_HotSpringsWater[] = INCBIN_U32("graphics/event_objects/pics/effects/hot_springs_water.4bpp"); const u16 gFieldEffectObjectPalette2[] = INCBIN_U16("graphics/event_objects/palettes/field_effect_object_palette_02.gbapal"); -const u32 gFieldEffectObjectPic_JumpOutOfAsh_0[] = INCBIN_U32("graphics/event_objects/pics/effects/jump_out_of_ash/0.4bpp"); -const u32 gFieldEffectObjectPic_JumpOutOfAsh_1[] = INCBIN_U32("graphics/event_objects/pics/effects/jump_out_of_ash/1.4bpp"); -const u32 gFieldEffectObjectPic_JumpOutOfAsh_2[] = INCBIN_U32("graphics/event_objects/pics/effects/jump_out_of_ash/2.4bpp"); -const u32 gFieldEffectObjectPic_JumpOutOfAsh_3[] = INCBIN_U32("graphics/event_objects/pics/effects/jump_out_of_ash/3.4bpp"); -const u32 gFieldEffectObjectPic_JumpOutOfAsh_4[] = INCBIN_U32("graphics/event_objects/pics/effects/jump_out_of_ash/4.4bpp"); +const u32 gFieldEffectObjectPic_JumpOutOfAsh[] = INCBIN_U32("graphics/event_objects/pics/effects/jump_out_of_ash.4bpp"); const u32 gFieldEffectObjectPic_Unknown33_0[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_33/0.4bpp"); const u32 gFieldEffectObjectPic_Unknown33_1[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_33/1.4bpp"); const u32 gFieldEffectObjectPic_Unknown33_2[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_33/2.4bpp"); const u32 gFieldEffectObjectPic_Unknown33_3[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_33/3.4bpp"); const u32 gFieldEffectObjectPic_Unknown33_4[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_33/4.4bpp"); -const u32 gFieldEffectObjectPic_Bubbles_0[] = INCBIN_U32("graphics/event_objects/pics/effects/bubbles/0.4bpp"); -const u32 gFieldEffectObjectPic_Bubbles_1[] = INCBIN_U32("graphics/event_objects/pics/effects/bubbles/1.4bpp"); -const u32 gFieldEffectObjectPic_Bubbles_2[] = INCBIN_U32("graphics/event_objects/pics/effects/bubbles/2.4bpp"); -const u32 gFieldEffectObjectPic_Bubbles_3[] = INCBIN_U32("graphics/event_objects/pics/effects/bubbles/3.4bpp"); -const u32 gFieldEffectObjectPic_Bubbles_4[] = INCBIN_U32("graphics/event_objects/pics/effects/bubbles/4.4bpp"); -const u32 gFieldEffectObjectPic_Bubbles_5[] = INCBIN_U32("graphics/event_objects/pics/effects/bubbles/5.4bpp"); -const u32 gFieldEffectObjectPic_Bubbles_6[] = INCBIN_U32("graphics/event_objects/pics/effects/bubbles/6.4bpp"); -const u32 gFieldEffectObjectPic_Bubbles_7[] = INCBIN_U32("graphics/event_objects/pics/effects/bubbles/7.4bpp"); +const u32 gFieldEffectObjectPic_Bubbles[] = INCBIN_U32("graphics/event_objects/pics/effects/bubbles.4bpp"); const u32 gFieldEffectObjectPic_Unknown35_0[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_35/0.4bpp"); const u32 gFieldEffectObjectPic_Unknown35_1[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_35/1.4bpp"); const u16 gFieldEffectObjectPalette3[] = INCBIN_U16("graphics/event_objects/palettes/field_effect_object_palette_03.gbapal");