355 files changed, 597 insertions, 597 deletions

diff --git a/graphics/event_objects/palettes/event_object_palette_00.pal b/graphics/object_events/palettes/event_object_palette_00.pal
index 7bb5bd9ed..7bb5bd9ed 100644
--- a/graphics/event_objects/palettes/event_object_palette_00.pal
+++ b/graphics/object_events/palettes/event_object_palette_00.pal
diff --git a/graphics/event_objects/palettes/event_object_palette_01.pal b/graphics/object_events/palettes/event_object_palette_01.pal
index 558095bda..558095bda 100644
--- a/graphics/event_objects/palettes/event_object_palette_01.pal
+++ b/graphics/object_events/palettes/event_object_palette_01.pal
diff --git a/graphics/event_objects/palettes/event_object_palette_02.pal b/graphics/object_events/palettes/event_object_palette_02.pal
index b84930395..b84930395 100644
--- a/graphics/event_objects/palettes/event_object_palette_02.pal
+++ b/graphics/object_events/palettes/event_object_palette_02.pal
diff --git a/graphics/event_objects/palettes/event_object_palette_03.pal b/graphics/object_events/palettes/event_object_palette_03.pal
index 6c53450ba..6c53450ba 100644
--- a/graphics/event_objects/palettes/event_object_palette_03.pal
+++ b/graphics/object_events/palettes/event_object_palette_03.pal
diff --git a/graphics/event_objects/palettes/event_object_palette_04.pal b/graphics/object_events/palettes/event_object_palette_04.pal
index 82c5ff3a1..82c5ff3a1 100644
--- a/graphics/event_objects/palettes/event_object_palette_04.pal
+++ b/graphics/object_events/palettes/event_object_palette_04.pal
diff --git a/graphics/event_objects/palettes/event_object_palette_05.pal b/graphics/object_events/palettes/event_object_palette_05.pal
index 72ae3cefb..72ae3cefb 100644
--- a/graphics/event_objects/palettes/event_object_palette_05.pal
+++ b/graphics/object_events/palettes/event_object_palette_05.pal
diff --git a/graphics/event_objects/palettes/event_object_palette_06.pal b/graphics/object_events/palettes/event_object_palette_06.pal
index 168a1329d..168a1329d 100644
--- a/graphics/event_objects/palettes/event_object_palette_06.pal
+++ b/graphics/object_events/palettes/event_object_palette_06.pal
diff --git a/graphics/event_objects/palettes/event_object_palette_07.pal b/graphics/object_events/palettes/event_object_palette_07.pal
index 0e604b73c..0e604b73c 100644
--- a/graphics/event_objects/palettes/event_object_palette_07.pal
+++ b/graphics/object_events/palettes/event_object_palette_07.pal
diff --git a/graphics/event_objects/palettes/event_object_palette_08.pal b/graphics/object_events/palettes/event_object_palette_08.pal
index a83ed903f..a83ed903f 100644
--- a/graphics/event_objects/palettes/event_object_palette_08.pal
+++ b/graphics/object_events/palettes/event_object_palette_08.pal
diff --git a/graphics/event_objects/palettes/event_object_palette_09.pal b/graphics/object_events/palettes/event_object_palette_09.pal
index 6a6bf4d12..6a6bf4d12 100644
--- a/graphics/event_objects/palettes/event_object_palette_09.pal
+++ b/graphics/object_events/palettes/event_object_palette_09.pal
diff --git a/graphics/event_objects/palettes/event_object_palette_10.pal b/graphics/object_events/palettes/event_object_palette_10.pal
index 0cebd6c4d..0cebd6c4d 100644
--- a/graphics/event_objects/palettes/event_object_palette_10.pal
+++ b/graphics/object_events/palettes/event_object_palette_10.pal
diff --git a/graphics/event_objects/palettes/event_object_palette_11.pal b/graphics/object_events/palettes/event_object_palette_11.pal
index b28799ed8..b28799ed8 100644
--- a/graphics/event_objects/palettes/event_object_palette_11.pal
+++ b/graphics/object_events/palettes/event_object_palette_11.pal
diff --git a/graphics/event_objects/palettes/event_object_palette_12.pal b/graphics/object_events/palettes/event_object_palette_12.pal
index b36c29ab1..b36c29ab1 100644
--- a/graphics/event_objects/palettes/event_object_palette_12.pal
+++ b/graphics/object_events/palettes/event_object_palette_12.pal
diff --git a/graphics/event_objects/palettes/event_object_palette_13.pal b/graphics/object_events/palettes/event_object_palette_13.pal
index b69e9ac0a..b69e9ac0a 100644
--- a/graphics/event_objects/palettes/event_object_palette_13.pal
+++ b/graphics/object_events/palettes/event_object_palette_13.pal
diff --git a/graphics/event_objects/palettes/event_object_palette_14.pal b/graphics/object_events/palettes/event_object_palette_14.pal
index c53a4d815..c53a4d815 100644
--- a/graphics/event_objects/palettes/event_object_palette_14.pal
+++ b/graphics/object_events/palettes/event_object_palette_14.pal
diff --git a/graphics/event_objects/palettes/event_object_palette_15.pal b/graphics/object_events/palettes/event_object_palette_15.pal
index 0026c6f69..0026c6f69 100644
--- a/graphics/event_objects/palettes/event_object_palette_15.pal
+++ b/graphics/object_events/palettes/event_object_palette_15.pal
diff --git a/graphics/event_objects/palettes/event_object_palette_16.pal b/graphics/object_events/palettes/event_object_palette_16.pal
index ec3c07f20..ec3c07f20 100644
--- a/graphics/event_objects/palettes/event_object_palette_16.pal
+++ b/graphics/object_events/palettes/event_object_palette_16.pal
diff --git a/graphics/event_objects/palettes/event_object_palette_17.pal b/graphics/object_events/palettes/event_object_palette_17.pal
index 2833b2613..2833b2613 100644
--- a/graphics/event_objects/palettes/event_object_palette_17.pal
+++ b/graphics/object_events/palettes/event_object_palette_17.pal
diff --git a/graphics/event_objects/palettes/event_object_palette_18.pal b/graphics/object_events/palettes/event_object_palette_18.pal
index 78b1c89b6..78b1c89b6 100644
--- a/graphics/event_objects/palettes/event_object_palette_18.pal
+++ b/graphics/object_events/palettes/event_object_palette_18.pal
diff --git a/graphics/event_objects/palettes/event_object_palette_19.pal b/graphics/object_events/palettes/event_object_palette_19.pal
index 53de0c383..53de0c383 100644
--- a/graphics/event_objects/palettes/event_object_palette_19.pal
+++ b/graphics/object_events/palettes/event_object_palette_19.pal
diff --git a/graphics/event_objects/palettes/event_object_palette_20.pal b/graphics/object_events/palettes/event_object_palette_20.pal
index 64985f6da..64985f6da 100644
--- a/graphics/event_objects/palettes/event_object_palette_20.pal
+++ b/graphics/object_events/palettes/event_object_palette_20.pal
diff --git a/graphics/event_objects/palettes/event_object_palette_21.pal b/graphics/object_events/palettes/event_object_palette_21.pal
index 5e68e105d..5e68e105d 100644
--- a/graphics/event_objects/palettes/event_object_palette_21.pal
+++ b/graphics/object_events/palettes/event_object_palette_21.pal
diff --git a/graphics/event_objects/palettes/event_object_palette_22.pal b/graphics/object_events/palettes/event_object_palette_22.pal
index 21fa9999d..21fa9999d 100644
--- a/graphics/event_objects/palettes/event_object_palette_22.pal
+++ b/graphics/object_events/palettes/event_object_palette_22.pal
diff --git a/graphics/event_objects/palettes/event_object_palette_23.pal b/graphics/object_events/palettes/event_object_palette_23.pal
index 73b0b1d41..73b0b1d41 100644
--- a/graphics/event_objects/palettes/event_object_palette_23.pal
+++ b/graphics/object_events/palettes/event_object_palette_23.pal
diff --git a/graphics/event_objects/palettes/event_object_palette_24.pal b/graphics/object_events/palettes/event_object_palette_24.pal
index d710b6830..d710b6830 100644
--- a/graphics/event_objects/palettes/event_object_palette_24.pal
+++ b/graphics/object_events/palettes/event_object_palette_24.pal
diff --git a/graphics/event_objects/palettes/event_object_palette_25.pal b/graphics/object_events/palettes/event_object_palette_25.pal
index f48038d41..f48038d41 100644
--- a/graphics/event_objects/palettes/event_object_palette_25.pal
+++ b/graphics/object_events/palettes/event_object_palette_25.pal
diff --git a/graphics/event_objects/palettes/event_object_palette_26.pal b/graphics/object_events/palettes/event_object_palette_26.pal
index fe4c1c112..fe4c1c112 100644
--- a/graphics/event_objects/palettes/event_object_palette_26.pal
+++ b/graphics/object_events/palettes/event_object_palette_26.pal
diff --git a/graphics/event_objects/palettes/event_object_palette_27.pal b/graphics/object_events/palettes/event_object_palette_27.pal
index 5ce2f4728..5ce2f4728 100644
--- a/graphics/event_objects/palettes/event_object_palette_27.pal
+++ b/graphics/object_events/palettes/event_object_palette_27.pal
diff --git a/graphics/event_objects/palettes/event_object_palette_28.pal b/graphics/object_events/palettes/event_object_palette_28.pal
index eb9930c05..eb9930c05 100644
--- a/graphics/event_objects/palettes/event_object_palette_28.pal
+++ b/graphics/object_events/palettes/event_object_palette_28.pal
diff --git a/graphics/event_objects/palettes/event_object_palette_29.pal b/graphics/object_events/palettes/event_object_palette_29.pal
index a69caf9df..a69caf9df 100644
--- a/graphics/event_objects/palettes/event_object_palette_29.pal
+++ b/graphics/object_events/palettes/event_object_palette_29.pal
diff --git a/graphics/event_objects/palettes/event_object_palette_30.pal b/graphics/object_events/palettes/event_object_palette_30.pal
index d90c4cb38..d90c4cb38 100644
--- a/graphics/event_objects/palettes/event_object_palette_30.pal
+++ b/graphics/object_events/palettes/event_object_palette_30.pal
diff --git a/graphics/event_objects/palettes/event_object_palette_31.pal b/graphics/object_events/palettes/event_object_palette_31.pal
index c62e8ce06..c62e8ce06 100644
--- a/graphics/event_objects/palettes/event_object_palette_31.pal
+++ b/graphics/object_events/palettes/event_object_palette_31.pal
diff --git a/graphics/event_objects/palettes/event_object_palette_32.pal b/graphics/object_events/palettes/event_object_palette_32.pal
index e245ba013..e245ba013 100644
--- a/graphics/event_objects/palettes/event_object_palette_32.pal
+++ b/graphics/object_events/palettes/event_object_palette_32.pal
diff --git a/graphics/event_objects/palettes/event_object_palette_33.pal b/graphics/object_events/palettes/event_object_palette_33.pal
index e7717d74e..e7717d74e 100644
--- a/graphics/event_objects/palettes/event_object_palette_33.pal
+++ b/graphics/object_events/palettes/event_object_palette_33.pal
diff --git a/graphics/event_objects/palettes/event_object_palette_34.pal b/graphics/object_events/palettes/event_object_palette_34.pal
index e106ce693..e106ce693 100644
--- a/graphics/event_objects/palettes/event_object_palette_34.pal
+++ b/graphics/object_events/palettes/event_object_palette_34.pal
diff --git a/graphics/event_objects/palettes/field_effect_object_palette_00.pal b/graphics/object_events/palettes/field_effect_object_palette_00.pal
index bbc9c778b..bbc9c778b 100644
--- a/graphics/event_objects/palettes/field_effect_object_palette_00.pal
+++ b/graphics/object_events/palettes/field_effect_object_palette_00.pal
diff --git a/graphics/event_objects/palettes/field_effect_object_palette_01.pal b/graphics/object_events/palettes/field_effect_object_palette_01.pal
index 044e1c987..044e1c987 100644
--- a/graphics/event_objects/palettes/field_effect_object_palette_01.pal
+++ b/graphics/object_events/palettes/field_effect_object_palette_01.pal
diff --git a/graphics/event_objects/palettes/field_effect_object_palette_02.pal b/graphics/object_events/palettes/field_effect_object_palette_02.pal
index e3a76c035..e3a76c035 100644
--- a/graphics/event_objects/palettes/field_effect_object_palette_02.pal
+++ b/graphics/object_events/palettes/field_effect_object_palette_02.pal
diff --git a/graphics/event_objects/palettes/field_effect_object_palette_03.pal b/graphics/object_events/palettes/field_effect_object_palette_03.pal
index b170eb1f5..b170eb1f5 100644
--- a/graphics/event_objects/palettes/field_effect_object_palette_03.pal
+++ b/graphics/object_events/palettes/field_effect_object_palette_03.pal
diff --git a/graphics/event_objects/palettes/field_effect_object_palette_04.pal b/graphics/object_events/palettes/field_effect_object_palette_04.pal
index 2dddefa5f..2dddefa5f 100644
--- a/graphics/event_objects/palettes/field_effect_object_palette_04.pal
+++ b/graphics/object_events/palettes/field_effect_object_palette_04.pal
diff --git a/graphics/event_objects/palettes/field_effect_object_palette_05.pal b/graphics/object_events/palettes/field_effect_object_palette_05.pal
index 468d7212c..468d7212c 100644
--- a/graphics/event_objects/palettes/field_effect_object_palette_05.pal
+++ b/graphics/object_events/palettes/field_effect_object_palette_05.pal
diff --git a/graphics/event_objects/palettes/field_effect_object_palette_06.pal b/graphics/object_events/palettes/field_effect_object_palette_06.pal
index e4a49a4b9..e4a49a4b9 100644
--- a/graphics/event_objects/palettes/field_effect_object_palette_06.pal
+++ b/graphics/object_events/palettes/field_effect_object_palette_06.pal
diff --git a/graphics/event_objects/palettes/field_effect_object_palette_07.pal b/graphics/object_events/palettes/field_effect_object_palette_07.pal
index 6d9e03c67..6d9e03c67 100644
--- a/graphics/event_objects/palettes/field_effect_object_palette_07.pal
+++ b/graphics/object_events/palettes/field_effect_object_palette_07.pal
diff --git a/graphics/event_objects/palettes/field_effect_object_palette_08.pal b/graphics/object_events/palettes/field_effect_object_palette_08.pal
index 4c41030f6..4c41030f6 100644
--- a/graphics/event_objects/palettes/field_effect_object_palette_08.pal
+++ b/graphics/object_events/palettes/field_effect_object_palette_08.pal
diff --git a/graphics/event_objects/palettes/field_effect_object_palette_10.pal b/graphics/object_events/palettes/field_effect_object_palette_10.pal
index 6190709ed..6190709ed 100644
--- a/graphics/event_objects/palettes/field_effect_object_palette_10.pal
+++ b/graphics/object_events/palettes/field_effect_object_palette_10.pal
diff --git a/graphics/event_objects/palettes/unused_palette.pal b/graphics/object_events/palettes/unused_palette.pal
index aeb04ccf8..aeb04ccf8 100644
--- a/graphics/event_objects/palettes/unused_palette.pal
+++ b/graphics/object_events/palettes/unused_palette.pal
diff --git a/graphics/event_objects/pics/berry_trees/aguav.png b/graphics/object_events/pics/berry_trees/aguav.png
index fca4b0dd5..fca4b0dd5 100644
--- a/graphics/event_objects/pics/berry_trees/aguav.png
+++ b/graphics/object_events/pics/berry_trees/aguav.png
diff --git a/graphics/event_objects/pics/berry_trees/aspear.png b/graphics/object_events/pics/berry_trees/aspear.png
index d0782166e..d0782166e 100644
--- a/graphics/event_objects/pics/berry_trees/aspear.png
+++ b/graphics/object_events/pics/berry_trees/aspear.png
diff --git a/graphics/event_objects/pics/berry_trees/cheri.png b/graphics/object_events/pics/berry_trees/cheri.png
index ec2db0ae3..ec2db0ae3 100644
--- a/graphics/event_objects/pics/berry_trees/cheri.png
+++ b/graphics/object_events/pics/berry_trees/cheri.png
diff --git a/graphics/event_objects/pics/berry_trees/chesto.png b/graphics/object_events/pics/berry_trees/chesto.png
index 3087de2b2..3087de2b2 100644
--- a/graphics/event_objects/pics/berry_trees/chesto.png
+++ b/graphics/object_events/pics/berry_trees/chesto.png
diff --git a/graphics/event_objects/pics/berry_trees/cornn.png b/graphics/object_events/pics/berry_trees/cornn.png
index de3ba7003..de3ba7003 100644
--- a/graphics/event_objects/pics/berry_trees/cornn.png
+++ b/graphics/object_events/pics/berry_trees/cornn.png
diff --git a/graphics/event_objects/pics/berry_trees/dirt_pile.png b/graphics/object_events/pics/berry_trees/dirt_pile.png
index ed2a38b3f..ed2a38b3f 100644
--- a/graphics/event_objects/pics/berry_trees/dirt_pile.png
+++ b/graphics/object_events/pics/berry_trees/dirt_pile.png
diff --git a/graphics/event_objects/pics/berry_trees/durin.png b/graphics/object_events/pics/berry_trees/durin.png
index c0caf166f..c0caf166f 100644
--- a/graphics/event_objects/pics/berry_trees/durin.png
+++ b/graphics/object_events/pics/berry_trees/durin.png
diff --git a/graphics/event_objects/pics/berry_trees/figy.png b/graphics/object_events/pics/berry_trees/figy.png
index 6ca366296..6ca366296 100644
--- a/graphics/event_objects/pics/berry_trees/figy.png
+++ b/graphics/object_events/pics/berry_trees/figy.png
diff --git a/graphics/event_objects/pics/berry_trees/grepa.png b/graphics/object_events/pics/berry_trees/grepa.png
index 33788c4a4..33788c4a4 100644
--- a/graphics/event_objects/pics/berry_trees/grepa.png
+++ b/graphics/object_events/pics/berry_trees/grepa.png
diff --git a/graphics/event_objects/pics/berry_trees/hondew.png b/graphics/object_events/pics/berry_trees/hondew.png
index c07bc17f7..c07bc17f7 100644
--- a/graphics/event_objects/pics/berry_trees/hondew.png
+++ b/graphics/object_events/pics/berry_trees/hondew.png
diff --git a/graphics/event_objects/pics/berry_trees/iapapa.png b/graphics/object_events/pics/berry_trees/iapapa.png
index 98eb27c1d..98eb27c1d 100644
--- a/graphics/event_objects/pics/berry_trees/iapapa.png
+++ b/graphics/object_events/pics/berry_trees/iapapa.png
diff --git a/graphics/event_objects/pics/berry_trees/kelpsy.png b/graphics/object_events/pics/berry_trees/kelpsy.png
index 7fdf1d8bd..7fdf1d8bd 100644
--- a/graphics/event_objects/pics/berry_trees/kelpsy.png
+++ b/graphics/object_events/pics/berry_trees/kelpsy.png
diff --git a/graphics/event_objects/pics/berry_trees/lansat.png b/graphics/object_events/pics/berry_trees/lansat.png
index 3271c1ceb..3271c1ceb 100644
--- a/graphics/event_objects/pics/berry_trees/lansat.png
+++ b/graphics/object_events/pics/berry_trees/lansat.png
diff --git a/graphics/event_objects/pics/berry_trees/leppa.png b/graphics/object_events/pics/berry_trees/leppa.png
index 601945e43..601945e43 100644
--- a/graphics/event_objects/pics/berry_trees/leppa.png
+++ b/graphics/object_events/pics/berry_trees/leppa.png
diff --git a/graphics/event_objects/pics/berry_trees/liechi.png b/graphics/object_events/pics/berry_trees/liechi.png
index b65074c80..b65074c80 100644
--- a/graphics/event_objects/pics/berry_trees/liechi.png
+++ b/graphics/object_events/pics/berry_trees/liechi.png
diff --git a/graphics/event_objects/pics/berry_trees/lum.png b/graphics/object_events/pics/berry_trees/lum.png
index a2e156ddd..a2e156ddd 100644
--- a/graphics/event_objects/pics/berry_trees/lum.png
+++ b/graphics/object_events/pics/berry_trees/lum.png
diff --git a/graphics/event_objects/pics/berry_trees/mago.png b/graphics/object_events/pics/berry_trees/mago.png
index 182a3dea8..182a3dea8 100644
--- a/graphics/event_objects/pics/berry_trees/mago.png
+++ b/graphics/object_events/pics/berry_trees/mago.png
diff --git a/graphics/event_objects/pics/berry_trees/nomel.png b/graphics/object_events/pics/berry_trees/nomel.png
index fa60688b8..fa60688b8 100644
--- a/graphics/event_objects/pics/berry_trees/nomel.png
+++ b/graphics/object_events/pics/berry_trees/nomel.png
diff --git a/graphics/event_objects/pics/berry_trees/oran.png b/graphics/object_events/pics/berry_trees/oran.png
index 484fb7eb2..484fb7eb2 100644
--- a/graphics/event_objects/pics/berry_trees/oran.png
+++ b/graphics/object_events/pics/berry_trees/oran.png
diff --git a/graphics/event_objects/pics/berry_trees/pamtre.png b/graphics/object_events/pics/berry_trees/pamtre.png
index a9f306012..a9f306012 100644
--- a/graphics/event_objects/pics/berry_trees/pamtre.png
+++ b/graphics/object_events/pics/berry_trees/pamtre.png
diff --git a/graphics/event_objects/pics/berry_trees/pecha.png b/graphics/object_events/pics/berry_trees/pecha.png
index 3bfec5753..3bfec5753 100644
--- a/graphics/event_objects/pics/berry_trees/pecha.png
+++ b/graphics/object_events/pics/berry_trees/pecha.png
diff --git a/graphics/event_objects/pics/berry_trees/persim.png b/graphics/object_events/pics/berry_trees/persim.png
index eb5450b8b..eb5450b8b 100644
--- a/graphics/event_objects/pics/berry_trees/persim.png
+++ b/graphics/object_events/pics/berry_trees/persim.png
diff --git a/graphics/event_objects/pics/berry_trees/pomeg.png b/graphics/object_events/pics/berry_trees/pomeg.png
index cd0e5e6c3..cd0e5e6c3 100644
--- a/graphics/event_objects/pics/berry_trees/pomeg.png
+++ b/graphics/object_events/pics/berry_trees/pomeg.png
diff --git a/graphics/event_objects/pics/berry_trees/rabuta.png b/graphics/object_events/pics/berry_trees/rabuta.png
index 59f9baff2..59f9baff2 100644
--- a/graphics/event_objects/pics/berry_trees/rabuta.png
+++ b/graphics/object_events/pics/berry_trees/rabuta.png
diff --git a/graphics/event_objects/pics/berry_trees/rawst.png b/graphics/object_events/pics/berry_trees/rawst.png
index aad761f5b..aad761f5b 100644
--- a/graphics/event_objects/pics/berry_trees/rawst.png
+++ b/graphics/object_events/pics/berry_trees/rawst.png
diff --git a/graphics/event_objects/pics/berry_trees/razz.png b/graphics/object_events/pics/berry_trees/razz.png
index dc2dd1723..dc2dd1723 100644
--- a/graphics/event_objects/pics/berry_trees/razz.png
+++ b/graphics/object_events/pics/berry_trees/razz.png
diff --git a/graphics/event_objects/pics/berry_trees/sitrus.png b/graphics/object_events/pics/berry_trees/sitrus.png
index c5392e3ad..c5392e3ad 100644
--- a/graphics/event_objects/pics/berry_trees/sitrus.png
+++ b/graphics/object_events/pics/berry_trees/sitrus.png
diff --git a/graphics/event_objects/pics/berry_trees/spelon.png b/graphics/object_events/pics/berry_trees/spelon.png
index 572b4d4f9..572b4d4f9 100644
--- a/graphics/event_objects/pics/berry_trees/spelon.png
+++ b/graphics/object_events/pics/berry_trees/spelon.png
diff --git a/graphics/event_objects/pics/berry_trees/sprout.png b/graphics/object_events/pics/berry_trees/sprout.png
index e34359627..e34359627 100644
--- a/graphics/event_objects/pics/berry_trees/sprout.png
+++ b/graphics/object_events/pics/berry_trees/sprout.png
diff --git a/graphics/event_objects/pics/berry_trees/tamato.png b/graphics/object_events/pics/berry_trees/tamato.png
index d12af1922..d12af1922 100644
--- a/graphics/event_objects/pics/berry_trees/tamato.png
+++ b/graphics/object_events/pics/berry_trees/tamato.png
diff --git a/graphics/event_objects/pics/berry_trees/wepear.png b/graphics/object_events/pics/berry_trees/wepear.png
index 63e5ae53d..63e5ae53d 100644
--- a/graphics/event_objects/pics/berry_trees/wepear.png
+++ b/graphics/object_events/pics/berry_trees/wepear.png
diff --git a/graphics/event_objects/pics/berry_trees/wiki.png b/graphics/object_events/pics/berry_trees/wiki.png
index 2fa0c0b01..2fa0c0b01 100644
--- a/graphics/event_objects/pics/berry_trees/wiki.png
+++ b/graphics/object_events/pics/berry_trees/wiki.png
diff --git a/graphics/event_objects/pics/cushions/ball_cushion.png b/graphics/object_events/pics/cushions/ball_cushion.png
index 2b45f8fd2..2b45f8fd2 100644
--- a/graphics/event_objects/pics/cushions/ball_cushion.png
+++ b/graphics/object_events/pics/cushions/ball_cushion.png
diff --git a/graphics/event_objects/pics/cushions/diamond_cushion.png b/graphics/object_events/pics/cushions/diamond_cushion.png
index c6c7bc761..c6c7bc761 100644
--- a/graphics/event_objects/pics/cushions/diamond_cushion.png
+++ b/graphics/object_events/pics/cushions/diamond_cushion.png
diff --git a/graphics/event_objects/pics/cushions/fire_cushion.png b/graphics/object_events/pics/cushions/fire_cushion.png
index ee6715037..ee6715037 100644
--- a/graphics/event_objects/pics/cushions/fire_cushion.png
+++ b/graphics/object_events/pics/cushions/fire_cushion.png
diff --git a/graphics/event_objects/pics/cushions/grass_cushion.png b/graphics/object_events/pics/cushions/grass_cushion.png
index 44862882e..44862882e 100644
--- a/graphics/event_objects/pics/cushions/grass_cushion.png
+++ b/graphics/object_events/pics/cushions/grass_cushion.png
diff --git a/graphics/event_objects/pics/cushions/kiss_cushion.png b/graphics/object_events/pics/cushions/kiss_cushion.png
index e24bd9dea..e24bd9dea 100644
--- a/graphics/event_objects/pics/cushions/kiss_cushion.png
+++ b/graphics/object_events/pics/cushions/kiss_cushion.png
diff --git a/graphics/event_objects/pics/cushions/pika_cushion.png b/graphics/object_events/pics/cushions/pika_cushion.png
index 16661bc01..16661bc01 100644
--- a/graphics/event_objects/pics/cushions/pika_cushion.png
+++ b/graphics/object_events/pics/cushions/pika_cushion.png
diff --git a/graphics/event_objects/pics/cushions/round_cushion.png b/graphics/object_events/pics/cushions/round_cushion.png
index 2a2c6d9d9..2a2c6d9d9 100644
--- a/graphics/event_objects/pics/cushions/round_cushion.png
+++ b/graphics/object_events/pics/cushions/round_cushion.png
diff --git a/graphics/event_objects/pics/cushions/spin_cushion.png b/graphics/object_events/pics/cushions/spin_cushion.png
index cfac6c811..cfac6c811 100644
--- a/graphics/event_objects/pics/cushions/spin_cushion.png
+++ b/graphics/object_events/pics/cushions/spin_cushion.png
diff --git a/graphics/event_objects/pics/cushions/water_cushion.png b/graphics/object_events/pics/cushions/water_cushion.png
index 848b0cd35..848b0cd35 100644
--- a/graphics/event_objects/pics/cushions/water_cushion.png
+++ b/graphics/object_events/pics/cushions/water_cushion.png
diff --git a/graphics/event_objects/pics/cushions/zigzag_cushion.png b/graphics/object_events/pics/cushions/zigzag_cushion.png
index 88bb74868..88bb74868 100644
--- a/graphics/event_objects/pics/cushions/zigzag_cushion.png
+++ b/graphics/object_events/pics/cushions/zigzag_cushion.png
diff --git a/graphics/event_objects/pics/dolls/azurill_doll.png b/graphics/object_events/pics/dolls/azurill_doll.png
index 2c2a49639..2c2a49639 100644
--- a/graphics/event_objects/pics/dolls/azurill_doll.png
+++ b/graphics/object_events/pics/dolls/azurill_doll.png
diff --git a/graphics/event_objects/pics/dolls/baltoy_doll.png b/graphics/object_events/pics/dolls/baltoy_doll.png
index c64d26033..c64d26033 100644
--- a/graphics/event_objects/pics/dolls/baltoy_doll.png
+++ b/graphics/object_events/pics/dolls/baltoy_doll.png
diff --git a/graphics/event_objects/pics/dolls/big_blastoise_doll.png b/graphics/object_events/pics/dolls/big_blastoise_doll.png
index 0873117d8..0873117d8 100644
--- a/graphics/event_objects/pics/dolls/big_blastoise_doll.png
+++ b/graphics/object_events/pics/dolls/big_blastoise_doll.png
diff --git a/graphics/event_objects/pics/dolls/big_charizard_doll.png b/graphics/object_events/pics/dolls/big_charizard_doll.png
index 8bf206e5b..8bf206e5b 100644
--- a/graphics/event_objects/pics/dolls/big_charizard_doll.png
+++ b/graphics/object_events/pics/dolls/big_charizard_doll.png
diff --git a/graphics/event_objects/pics/dolls/big_lapras_doll.png b/graphics/object_events/pics/dolls/big_lapras_doll.png
index 9695a0ea5..9695a0ea5 100644
--- a/graphics/event_objects/pics/dolls/big_lapras_doll.png
+++ b/graphics/object_events/pics/dolls/big_lapras_doll.png
diff --git a/graphics/event_objects/pics/dolls/big_regice_doll.png b/graphics/object_events/pics/dolls/big_regice_doll.png
index eff1de492..eff1de492 100644
--- a/graphics/event_objects/pics/dolls/big_regice_doll.png
+++ b/graphics/object_events/pics/dolls/big_regice_doll.png
diff --git a/graphics/event_objects/pics/dolls/big_regirock_doll.png b/graphics/object_events/pics/dolls/big_regirock_doll.png
index 63ed27236..63ed27236 100644
--- a/graphics/event_objects/pics/dolls/big_regirock_doll.png
+++ b/graphics/object_events/pics/dolls/big_regirock_doll.png
diff --git a/graphics/event_objects/pics/dolls/big_registeel_doll.png b/graphics/object_events/pics/dolls/big_registeel_doll.png
index b7ab0821a..b7ab0821a 100644
--- a/graphics/event_objects/pics/dolls/big_registeel_doll.png
+++ b/graphics/object_events/pics/dolls/big_registeel_doll.png
diff --git a/graphics/event_objects/pics/dolls/big_rhydon_doll.png b/graphics/object_events/pics/dolls/big_rhydon_doll.png
index 4e439330a..4e439330a 100644
--- a/graphics/event_objects/pics/dolls/big_rhydon_doll.png
+++ b/graphics/object_events/pics/dolls/big_rhydon_doll.png
diff --git a/graphics/event_objects/pics/dolls/big_snorlax_doll.png b/graphics/object_events/pics/dolls/big_snorlax_doll.png
index dcb1699bf..dcb1699bf 100644
--- a/graphics/event_objects/pics/dolls/big_snorlax_doll.png
+++ b/graphics/object_events/pics/dolls/big_snorlax_doll.png
diff --git a/graphics/event_objects/pics/dolls/big_venusaur_doll.png b/graphics/object_events/pics/dolls/big_venusaur_doll.png
index 1910d1c6e..1910d1c6e 100644
--- a/graphics/event_objects/pics/dolls/big_venusaur_doll.png
+++ b/graphics/object_events/pics/dolls/big_venusaur_doll.png
diff --git a/graphics/event_objects/pics/dolls/big_wailmer_doll.png b/graphics/object_events/pics/dolls/big_wailmer_doll.png
index 13cbbccf3..13cbbccf3 100644
--- a/graphics/event_objects/pics/dolls/big_wailmer_doll.png
+++ b/graphics/object_events/pics/dolls/big_wailmer_doll.png
diff --git a/graphics/event_objects/pics/dolls/chikorita_doll.png b/graphics/object_events/pics/dolls/chikorita_doll.png
index 9942fc9dc..9942fc9dc 100644
--- a/graphics/event_objects/pics/dolls/chikorita_doll.png
+++ b/graphics/object_events/pics/dolls/chikorita_doll.png
diff --git a/graphics/event_objects/pics/dolls/clefairy_doll.png b/graphics/object_events/pics/dolls/clefairy_doll.png
index 3aed333ad..3aed333ad 100644
--- a/graphics/event_objects/pics/dolls/clefairy_doll.png
+++ b/graphics/object_events/pics/dolls/clefairy_doll.png
diff --git a/graphics/event_objects/pics/dolls/cyndaquil_doll.png b/graphics/object_events/pics/dolls/cyndaquil_doll.png
index 2f026816e..2f026816e 100644
--- a/graphics/event_objects/pics/dolls/cyndaquil_doll.png
+++ b/graphics/object_events/pics/dolls/cyndaquil_doll.png
diff --git a/graphics/event_objects/pics/dolls/ditto_doll.png b/graphics/object_events/pics/dolls/ditto_doll.png
index 7b8cb48ae..7b8cb48ae 100644
--- a/graphics/event_objects/pics/dolls/ditto_doll.png
+++ b/graphics/object_events/pics/dolls/ditto_doll.png
diff --git a/graphics/event_objects/pics/dolls/duskull_doll.png b/graphics/object_events/pics/dolls/duskull_doll.png
index 6e69796d7..6e69796d7 100644
--- a/graphics/event_objects/pics/dolls/duskull_doll.png
+++ b/graphics/object_events/pics/dolls/duskull_doll.png
diff --git a/graphics/event_objects/pics/dolls/gulpin_doll.png b/graphics/object_events/pics/dolls/gulpin_doll.png
index 5ffdefb0c..5ffdefb0c 100644
--- a/graphics/event_objects/pics/dolls/gulpin_doll.png
+++ b/graphics/object_events/pics/dolls/gulpin_doll.png
diff --git a/graphics/event_objects/pics/dolls/jigglypuff_doll.png b/graphics/object_events/pics/dolls/jigglypuff_doll.png
index 75dcbe1eb..75dcbe1eb 100644
--- a/graphics/event_objects/pics/dolls/jigglypuff_doll.png
+++ b/graphics/object_events/pics/dolls/jigglypuff_doll.png
diff --git a/graphics/event_objects/pics/dolls/kecleon_doll.png b/graphics/object_events/pics/dolls/kecleon_doll.png
index a70feb67c..a70feb67c 100644
--- a/graphics/event_objects/pics/dolls/kecleon_doll.png
+++ b/graphics/object_events/pics/dolls/kecleon_doll.png
diff --git a/graphics/event_objects/pics/dolls/lotad_doll.png b/graphics/object_events/pics/dolls/lotad_doll.png
index 69065a424..69065a424 100644
--- a/graphics/event_objects/pics/dolls/lotad_doll.png
+++ b/graphics/object_events/pics/dolls/lotad_doll.png
diff --git a/graphics/event_objects/pics/dolls/marill_doll.png b/graphics/object_events/pics/dolls/marill_doll.png
index d90c0cee1..d90c0cee1 100644
--- a/graphics/event_objects/pics/dolls/marill_doll.png
+++ b/graphics/object_events/pics/dolls/marill_doll.png
diff --git a/graphics/event_objects/pics/dolls/meowth_doll.png b/graphics/object_events/pics/dolls/meowth_doll.png
index cb093acfa..cb093acfa 100644
--- a/graphics/event_objects/pics/dolls/meowth_doll.png
+++ b/graphics/object_events/pics/dolls/meowth_doll.png
diff --git a/graphics/event_objects/pics/dolls/mudkip_doll.png b/graphics/object_events/pics/dolls/mudkip_doll.png
index 440fde84b..440fde84b 100644
--- a/graphics/event_objects/pics/dolls/mudkip_doll.png
+++ b/graphics/object_events/pics/dolls/mudkip_doll.png
diff --git a/graphics/event_objects/pics/dolls/pichu_doll.png b/graphics/object_events/pics/dolls/pichu_doll.png
index 69bcc64ae..69bcc64ae 100644
--- a/graphics/event_objects/pics/dolls/pichu_doll.png
+++ b/graphics/object_events/pics/dolls/pichu_doll.png
diff --git a/graphics/event_objects/pics/dolls/pikachu_doll.png b/graphics/object_events/pics/dolls/pikachu_doll.png
index 1c9342ad1..1c9342ad1 100644
--- a/graphics/event_objects/pics/dolls/pikachu_doll.png
+++ b/graphics/object_events/pics/dolls/pikachu_doll.png
diff --git a/graphics/event_objects/pics/dolls/seedot_doll.png b/graphics/object_events/pics/dolls/seedot_doll.png
index 255b4c55d..255b4c55d 100644
--- a/graphics/event_objects/pics/dolls/seedot_doll.png
+++ b/graphics/object_events/pics/dolls/seedot_doll.png
diff --git a/graphics/event_objects/pics/dolls/skitty_doll.png b/graphics/object_events/pics/dolls/skitty_doll.png
index 6e04a9cb1..6e04a9cb1 100644
--- a/graphics/event_objects/pics/dolls/skitty_doll.png
+++ b/graphics/object_events/pics/dolls/skitty_doll.png
diff --git a/graphics/event_objects/pics/dolls/smoochum_doll.png b/graphics/object_events/pics/dolls/smoochum_doll.png
index 7dc1180fd..7dc1180fd 100644
--- a/graphics/event_objects/pics/dolls/smoochum_doll.png
+++ b/graphics/object_events/pics/dolls/smoochum_doll.png
diff --git a/graphics/event_objects/pics/dolls/swablu_doll.png b/graphics/object_events/pics/dolls/swablu_doll.png
index 271576db8..271576db8 100644
--- a/graphics/event_objects/pics/dolls/swablu_doll.png
+++ b/graphics/object_events/pics/dolls/swablu_doll.png
diff --git a/graphics/event_objects/pics/dolls/togepi_doll.png b/graphics/object_events/pics/dolls/togepi_doll.png
index aa527b44b..aa527b44b 100644
--- a/graphics/event_objects/pics/dolls/togepi_doll.png
+++ b/graphics/object_events/pics/dolls/togepi_doll.png
diff --git a/graphics/event_objects/pics/dolls/torchic_doll.png b/graphics/object_events/pics/dolls/torchic_doll.png
index 80969c424..80969c424 100644
--- a/graphics/event_objects/pics/dolls/torchic_doll.png
+++ b/graphics/object_events/pics/dolls/torchic_doll.png
diff --git a/graphics/event_objects/pics/dolls/totodile_doll.png b/graphics/object_events/pics/dolls/totodile_doll.png
index 46324159e..46324159e 100644
--- a/graphics/event_objects/pics/dolls/totodile_doll.png
+++ b/graphics/object_events/pics/dolls/totodile_doll.png
diff --git a/graphics/event_objects/pics/dolls/treecko_doll.png b/graphics/object_events/pics/dolls/treecko_doll.png
index 6487fe805..6487fe805 100644
--- a/graphics/event_objects/pics/dolls/treecko_doll.png
+++ b/graphics/object_events/pics/dolls/treecko_doll.png
diff --git a/graphics/event_objects/pics/dolls/unused_magnemite_doll.png b/graphics/object_events/pics/dolls/unused_magnemite_doll.png
index 2c9ef10c7..2c9ef10c7 100644
--- a/graphics/event_objects/pics/dolls/unused_magnemite_doll.png
+++ b/graphics/object_events/pics/dolls/unused_magnemite_doll.png
diff --git a/graphics/event_objects/pics/dolls/unused_natu_doll.png b/graphics/object_events/pics/dolls/unused_natu_doll.png
index 8087db81d..8087db81d 100644
--- a/graphics/event_objects/pics/dolls/unused_natu_doll.png
+++ b/graphics/object_events/pics/dolls/unused_natu_doll.png
diff --git a/graphics/event_objects/pics/dolls/unused_pikachu_doll.png b/graphics/object_events/pics/dolls/unused_pikachu_doll.png
index 2e5181977..2e5181977 100644
--- a/graphics/event_objects/pics/dolls/unused_pikachu_doll.png
+++ b/graphics/object_events/pics/dolls/unused_pikachu_doll.png
diff --git a/graphics/event_objects/pics/dolls/unused_porygon2_doll.png b/graphics/object_events/pics/dolls/unused_porygon2_doll.png
index f68182762..f68182762 100644
--- a/graphics/event_objects/pics/dolls/unused_porygon2_doll.png
+++ b/graphics/object_events/pics/dolls/unused_porygon2_doll.png
diff --git a/graphics/event_objects/pics/dolls/unused_squirtle_doll.png b/graphics/object_events/pics/dolls/unused_squirtle_doll.png
index 0480227d0..0480227d0 100644
--- a/graphics/event_objects/pics/dolls/unused_squirtle_doll.png
+++ b/graphics/object_events/pics/dolls/unused_squirtle_doll.png
diff --git a/graphics/event_objects/pics/dolls/unused_wooper_doll.png b/graphics/object_events/pics/dolls/unused_wooper_doll.png
index 69d73eada..69d73eada 100644
--- a/graphics/event_objects/pics/dolls/unused_wooper_doll.png
+++ b/graphics/object_events/pics/dolls/unused_wooper_doll.png
diff --git a/graphics/event_objects/pics/dolls/wynaut_doll.png b/graphics/object_events/pics/dolls/wynaut_doll.png
index 543328178..543328178 100644
--- a/graphics/event_objects/pics/dolls/wynaut_doll.png
+++ b/graphics/object_events/pics/dolls/wynaut_doll.png
diff --git a/graphics/event_objects/pics/effects/arrow.png b/graphics/object_events/pics/effects/arrow.png
index 85ebdf514..85ebdf514 100644
--- a/graphics/event_objects/pics/effects/arrow.png
+++ b/graphics/object_events/pics/effects/arrow.png
diff --git a/graphics/event_objects/pics/effects/ash.png b/graphics/object_events/pics/effects/ash.png
index 8890d5ab8..8890d5ab8 100644
--- a/graphics/event_objects/pics/effects/ash.png
+++ b/graphics/object_events/pics/effects/ash.png
diff --git a/graphics/event_objects/pics/effects/berry_tree_growth_sparkle.png b/graphics/object_events/pics/effects/berry_tree_growth_sparkle.png
index 2910c2a49..2910c2a49 100644
--- a/graphics/event_objects/pics/effects/berry_tree_growth_sparkle.png
+++ b/graphics/object_events/pics/effects/berry_tree_growth_sparkle.png
diff --git a/graphics/event_objects/pics/effects/bike_hop_big_splash.png b/graphics/object_events/pics/effects/bike_hop_big_splash.png
index 171d23457..171d23457 100644
--- a/graphics/event_objects/pics/effects/bike_hop_big_splash.png
+++ b/graphics/object_events/pics/effects/bike_hop_big_splash.png
diff --git a/graphics/event_objects/pics/effects/bike_hop_small_splash.png b/graphics/object_events/pics/effects/bike_hop_small_splash.png
index e98ded025..e98ded025 100644
--- a/graphics/event_objects/pics/effects/bike_hop_small_splash.png
+++ b/graphics/object_events/pics/effects/bike_hop_small_splash.png
diff --git a/graphics/event_objects/pics/effects/bike_hop_tall_grass.png b/graphics/object_events/pics/effects/bike_hop_tall_grass.png
index c43da9f28..c43da9f28 100755
--- a/graphics/event_objects/pics/effects/bike_hop_tall_grass.png
+++ b/graphics/object_events/pics/effects/bike_hop_tall_grass.png
diff --git a/graphics/event_objects/pics/effects/bike_tire_tracks.png b/graphics/object_events/pics/effects/bike_tire_tracks.png
index 2d989d28c..2d989d28c 100644
--- a/graphics/event_objects/pics/effects/bike_tire_tracks.png
+++ b/graphics/object_events/pics/effects/bike_tire_tracks.png
diff --git a/graphics/event_objects/pics/effects/bird.png b/graphics/object_events/pics/effects/bird.png
index e9d9798fd..e9d9798fd 100644
--- a/graphics/event_objects/pics/effects/bird.png
+++ b/graphics/object_events/pics/effects/bird.png
diff --git a/graphics/event_objects/pics/effects/bubbles.png b/graphics/object_events/pics/effects/bubbles.png
index b04ceaf09..b04ceaf09 100644
--- a/graphics/event_objects/pics/effects/bubbles.png
+++ b/graphics/object_events/pics/effects/bubbles.png
diff --git a/graphics/event_objects/pics/effects/cut_grass.png b/graphics/object_events/pics/effects/cut_grass.png
index 3c41d28b3..3c41d28b3 100644
--- a/graphics/event_objects/pics/effects/cut_grass.png
+++ b/graphics/object_events/pics/effects/cut_grass.png
diff --git a/graphics/event_objects/pics/effects/deep_sand_footprints.png b/graphics/object_events/pics/effects/deep_sand_footprints.png
index ea7484b23..ea7484b23 100644
--- a/graphics/event_objects/pics/effects/deep_sand_footprints.png
+++ b/graphics/object_events/pics/effects/deep_sand_footprints.png
diff --git a/graphics/event_objects/pics/effects/ground_impact_dust.png b/graphics/object_events/pics/effects/ground_impact_dust.png
index d4562fe57..d4562fe57 100644
--- a/graphics/event_objects/pics/effects/ground_impact_dust.png
+++ b/graphics/object_events/pics/effects/ground_impact_dust.png
diff --git a/graphics/event_objects/pics/effects/hot_springs_water.png b/graphics/object_events/pics/effects/hot_springs_water.png
index 18892239e..18892239e 100644
--- a/graphics/event_objects/pics/effects/hot_springs_water.png
+++ b/graphics/object_events/pics/effects/hot_springs_water.png
diff --git a/graphics/event_objects/pics/effects/jump_out_of_ash.png b/graphics/object_events/pics/effects/jump_out_of_ash.png
index 3247b8169..3247b8169 100644
--- a/graphics/event_objects/pics/effects/jump_out_of_ash.png
+++ b/graphics/object_events/pics/effects/jump_out_of_ash.png
diff --git a/graphics/event_objects/pics/effects/long_grass.png b/graphics/object_events/pics/effects/long_grass.png
index 265e45056..265e45056 100644
--- a/graphics/event_objects/pics/effects/long_grass.png
+++ b/graphics/object_events/pics/effects/long_grass.png
diff --git a/graphics/event_objects/pics/effects/mountain_disguise.png b/graphics/object_events/pics/effects/mountain_disguise.png
index c394855e6..c394855e6 100644
--- a/graphics/event_objects/pics/effects/mountain_disguise.png
+++ b/graphics/object_events/pics/effects/mountain_disguise.png
diff --git a/graphics/event_objects/pics/effects/ripple.png b/graphics/object_events/pics/effects/ripple.png
index 87e6dd617..87e6dd617 100644
--- a/graphics/event_objects/pics/effects/ripple.png
+++ b/graphics/object_events/pics/effects/ripple.png
diff --git a/graphics/event_objects/pics/effects/sand_disguise_placeholder.png b/graphics/object_events/pics/effects/sand_disguise_placeholder.png
index 76808a53b..76808a53b 100755
--- a/graphics/event_objects/pics/effects/sand_disguise_placeholder.png
+++ b/graphics/object_events/pics/effects/sand_disguise_placeholder.png
diff --git a/graphics/event_objects/pics/effects/sand_footprints.png b/graphics/object_events/pics/effects/sand_footprints.png
index 71c54f787..71c54f787 100644
--- a/graphics/event_objects/pics/effects/sand_footprints.png
+++ b/graphics/object_events/pics/effects/sand_footprints.png
diff --git a/graphics/event_objects/pics/effects/shadow_extra_large.png b/graphics/object_events/pics/effects/shadow_extra_large.png
index 765a5291a..765a5291a 100644
--- a/graphics/event_objects/pics/effects/shadow_extra_large.png
+++ b/graphics/object_events/pics/effects/shadow_extra_large.png
diff --git a/graphics/event_objects/pics/effects/shadow_large.png b/graphics/object_events/pics/effects/shadow_large.png
index e917823b0..e917823b0 100644
--- a/graphics/event_objects/pics/effects/shadow_large.png
+++ b/graphics/object_events/pics/effects/shadow_large.png
diff --git a/graphics/event_objects/pics/effects/shadow_medium.png b/graphics/object_events/pics/effects/shadow_medium.png
index 83ab6e1f6..83ab6e1f6 100644
--- a/graphics/event_objects/pics/effects/shadow_medium.png
+++ b/graphics/object_events/pics/effects/shadow_medium.png
diff --git a/graphics/event_objects/pics/effects/shadow_small.png b/graphics/object_events/pics/effects/shadow_small.png
index f5feada2b..f5feada2b 100644
--- a/graphics/event_objects/pics/effects/shadow_small.png
+++ b/graphics/object_events/pics/effects/shadow_small.png
diff --git a/graphics/event_objects/pics/effects/short_grass.png b/graphics/object_events/pics/effects/short_grass.png
index dc477e29f..dc477e29f 100644
--- a/graphics/event_objects/pics/effects/short_grass.png
+++ b/graphics/object_events/pics/effects/short_grass.png
diff --git a/graphics/event_objects/pics/effects/splash.png b/graphics/object_events/pics/effects/splash.png
index 6e55ffae0..6e55ffae0 100644
--- a/graphics/event_objects/pics/effects/splash.png
+++ b/graphics/object_events/pics/effects/splash.png
diff --git a/graphics/event_objects/pics/effects/surf_blob.png b/graphics/object_events/pics/effects/surf_blob.png
index b5656cf16..b5656cf16 100644
--- a/graphics/event_objects/pics/effects/surf_blob.png
+++ b/graphics/object_events/pics/effects/surf_blob.png
diff --git a/graphics/event_objects/pics/effects/tall_grass.png b/graphics/object_events/pics/effects/tall_grass.png
index 919fc6f8a..919fc6f8a 100644
--- a/graphics/event_objects/pics/effects/tall_grass.png
+++ b/graphics/object_events/pics/effects/tall_grass.png
diff --git a/graphics/event_objects/pics/effects/tree_disguise.png b/graphics/object_events/pics/effects/tree_disguise.png
index 8acbfbd5d..8acbfbd5d 100644
--- a/graphics/event_objects/pics/effects/tree_disguise.png
+++ b/graphics/object_events/pics/effects/tree_disguise.png
diff --git a/graphics/event_objects/pics/effects/unknown_16.png b/graphics/object_events/pics/effects/unknown_16.png
index bb4789f9f..bb4789f9f 100755
--- a/graphics/event_objects/pics/effects/unknown_16.png
+++ b/graphics/object_events/pics/effects/unknown_16.png
diff --git a/graphics/event_objects/pics/effects/unknown_17.png b/graphics/object_events/pics/effects/unknown_17.png
index f158bebc8..f158bebc8 100644
--- a/graphics/event_objects/pics/effects/unknown_17.png
+++ b/graphics/object_events/pics/effects/unknown_17.png
diff --git a/graphics/event_objects/pics/effects/unknown_18.png b/graphics/object_events/pics/effects/unknown_18.png
index 65f4d97e2..65f4d97e2 100644
--- a/graphics/event_objects/pics/effects/unknown_18.png
+++ b/graphics/object_events/pics/effects/unknown_18.png
diff --git a/graphics/event_objects/pics/effects/unknown_19.png b/graphics/object_events/pics/effects/unknown_19.png
index 4ae851e58..4ae851e58 100644
--- a/graphics/event_objects/pics/effects/unknown_19.png
+++ b/graphics/object_events/pics/effects/unknown_19.png
diff --git a/graphics/event_objects/pics/effects/unknown_20.png b/graphics/object_events/pics/effects/unknown_20.png
index 7d6af5e0c..7d6af5e0c 100644
--- a/graphics/event_objects/pics/effects/unknown_20.png
+++ b/graphics/object_events/pics/effects/unknown_20.png
diff --git a/graphics/event_objects/pics/effects/unknown_29.png b/graphics/object_events/pics/effects/unknown_29.png
index 03f89a5f5..03f89a5f5 100644
--- a/graphics/event_objects/pics/effects/unknown_29.png
+++ b/graphics/object_events/pics/effects/unknown_29.png
diff --git a/graphics/event_objects/pics/effects/unknown_33.png b/graphics/object_events/pics/effects/unknown_33.png
index 26b852200..26b852200 100644
--- a/graphics/event_objects/pics/effects/unknown_33.png
+++ b/graphics/object_events/pics/effects/unknown_33.png
diff --git a/graphics/event_objects/pics/effects/unknown_35.png b/graphics/object_events/pics/effects/unknown_35.png
index b2072bd26..b2072bd26 100644
--- a/graphics/event_objects/pics/effects/unknown_35.png
+++ b/graphics/object_events/pics/effects/unknown_35.png
diff --git a/graphics/event_objects/pics/effects/unused_grass.png b/graphics/object_events/pics/effects/unused_grass.png
index ffd68ec1d..ffd68ec1d 100644
--- a/graphics/event_objects/pics/effects/unused_grass.png
+++ b/graphics/object_events/pics/effects/unused_grass.png
diff --git a/graphics/event_objects/pics/misc/birchs_bag.png b/graphics/object_events/pics/misc/birchs_bag.png
index 21f463b71..21f463b71 100644
--- a/graphics/event_objects/pics/misc/birchs_bag.png
+++ b/graphics/object_events/pics/misc/birchs_bag.png
diff --git a/graphics/event_objects/pics/misc/birth_island_stone.png b/graphics/object_events/pics/misc/birth_island_stone.png
index 3c5d82c11..3c5d82c11 100644
--- a/graphics/event_objects/pics/misc/birth_island_stone.png
+++ b/graphics/object_events/pics/misc/birth_island_stone.png
diff --git a/graphics/event_objects/pics/misc/breakable_rock.png b/graphics/object_events/pics/misc/breakable_rock.png
index c5054da41..c5054da41 100644
--- a/graphics/event_objects/pics/misc/breakable_rock.png
+++ b/graphics/object_events/pics/misc/breakable_rock.png
diff --git a/graphics/event_objects/pics/misc/cable_car.png b/graphics/object_events/pics/misc/cable_car.png
index 67f581fb9..67f581fb9 100644
--- a/graphics/event_objects/pics/misc/cable_car.png
+++ b/graphics/object_events/pics/misc/cable_car.png
diff --git a/graphics/event_objects/pics/misc/cuttable_tree.png b/graphics/object_events/pics/misc/cuttable_tree.png
index fba4ced1a..fba4ced1a 100644
--- a/graphics/event_objects/pics/misc/cuttable_tree.png
+++ b/graphics/object_events/pics/misc/cuttable_tree.png
diff --git a/graphics/event_objects/pics/misc/fossil.png b/graphics/object_events/pics/misc/fossil.png
index 3e070a6c9..3e070a6c9 100644
--- a/graphics/event_objects/pics/misc/fossil.png
+++ b/graphics/object_events/pics/misc/fossil.png
diff --git a/graphics/event_objects/pics/misc/item_ball.png b/graphics/object_events/pics/misc/item_ball.png
index ef02e158c..ef02e158c 100644
--- a/graphics/event_objects/pics/misc/item_ball.png
+++ b/graphics/object_events/pics/misc/item_ball.png
diff --git a/graphics/event_objects/pics/misc/moving_box.png b/graphics/object_events/pics/misc/moving_box.png
index 43b65c2c1..43b65c2c1 100644
--- a/graphics/event_objects/pics/misc/moving_box.png
+++ b/graphics/object_events/pics/misc/moving_box.png
diff --git a/graphics/event_objects/pics/misc/mr_brineys_boat.png b/graphics/object_events/pics/misc/mr_brineys_boat.png
index 249f25b51..249f25b51 100644
--- a/graphics/event_objects/pics/misc/mr_brineys_boat.png
+++ b/graphics/object_events/pics/misc/mr_brineys_boat.png
diff --git a/graphics/event_objects/pics/misc/pushable_boulder.png b/graphics/object_events/pics/misc/pushable_boulder.png
index eba6a116f..eba6a116f 100644
--- a/graphics/event_objects/pics/misc/pushable_boulder.png
+++ b/graphics/object_events/pics/misc/pushable_boulder.png
diff --git a/graphics/event_objects/pics/misc/ss_tidal.png b/graphics/object_events/pics/misc/ss_tidal.png
index 44510d25a..44510d25a 100644
--- a/graphics/event_objects/pics/misc/ss_tidal.png
+++ b/graphics/object_events/pics/misc/ss_tidal.png
diff --git a/graphics/event_objects/pics/misc/statue.png b/graphics/object_events/pics/misc/statue.png
index 7b4b13cd7..7b4b13cd7 100644
--- a/graphics/event_objects/pics/misc/statue.png
+++ b/graphics/object_events/pics/misc/statue.png
diff --git a/graphics/event_objects/pics/misc/submarine_shadow.png b/graphics/object_events/pics/misc/submarine_shadow.png
index d43bc98dc..d43bc98dc 100644
--- a/graphics/event_objects/pics/misc/submarine_shadow.png
+++ b/graphics/object_events/pics/misc/submarine_shadow.png
diff --git a/graphics/event_objects/pics/misc/truck.png b/graphics/object_events/pics/misc/truck.png
index 46940a9a3..46940a9a3 100644
--- a/graphics/event_objects/pics/misc/truck.png
+++ b/graphics/object_events/pics/misc/truck.png
diff --git a/graphics/event_objects/pics/people/artist.png b/graphics/object_events/pics/people/artist.png
index 1a98032a7..1a98032a7 100644
--- a/graphics/event_objects/pics/people/artist.png
+++ b/graphics/object_events/pics/people/artist.png
diff --git a/graphics/event_objects/pics/people/beauty.png b/graphics/object_events/pics/people/beauty.png
index dd3a3d76b..dd3a3d76b 100644
--- a/graphics/event_objects/pics/people/beauty.png
+++ b/graphics/object_events/pics/people/beauty.png
diff --git a/graphics/event_objects/pics/people/black_belt.png b/graphics/object_events/pics/people/black_belt.png
index e6c901933..e6c901933 100644
--- a/graphics/event_objects/pics/people/black_belt.png
+++ b/graphics/object_events/pics/people/black_belt.png
diff --git a/graphics/event_objects/pics/people/boy_1.png b/graphics/object_events/pics/people/boy_1.png
index cd7507c9b..cd7507c9b 100644
--- a/graphics/event_objects/pics/people/boy_1.png
+++ b/graphics/object_events/pics/people/boy_1.png
diff --git a/graphics/event_objects/pics/people/boy_2.png b/graphics/object_events/pics/people/boy_2.png
index ff57b602b..ff57b602b 100644
--- a/graphics/event_objects/pics/people/boy_2.png
+++ b/graphics/object_events/pics/people/boy_2.png
diff --git a/graphics/event_objects/pics/people/boy_3.png b/graphics/object_events/pics/people/boy_3.png
index b6dba7944..b6dba7944 100644
--- a/graphics/event_objects/pics/people/boy_3.png
+++ b/graphics/object_events/pics/people/boy_3.png
diff --git a/graphics/event_objects/pics/people/brendan/acro_bike.png b/graphics/object_events/pics/people/brendan/acro_bike.png
index 183e2b7c9..183e2b7c9 100644
--- a/graphics/event_objects/pics/people/brendan/acro_bike.png
+++ b/graphics/object_events/pics/people/brendan/acro_bike.png
diff --git a/graphics/event_objects/pics/people/brendan/decorating.png b/graphics/object_events/pics/people/brendan/decorating.png
index f3771e60e..f3771e60e 100644
--- a/graphics/event_objects/pics/people/brendan/decorating.png
+++ b/graphics/object_events/pics/people/brendan/decorating.png
diff --git a/graphics/event_objects/pics/people/brendan/field_move.png b/graphics/object_events/pics/people/brendan/field_move.png
index 26ef74749..26ef74749 100644
--- a/graphics/event_objects/pics/people/brendan/field_move.png
+++ b/graphics/object_events/pics/people/brendan/field_move.png
diff --git a/graphics/event_objects/pics/people/brendan/fishing.png b/graphics/object_events/pics/people/brendan/fishing.png
index bb2a8f747..bb2a8f747 100644
--- a/graphics/event_objects/pics/people/brendan/fishing.png
+++ b/graphics/object_events/pics/people/brendan/fishing.png
diff --git a/graphics/event_objects/pics/people/brendan/mach_bike.png b/graphics/object_events/pics/people/brendan/mach_bike.png
index 661ebb733..661ebb733 100644
--- a/graphics/event_objects/pics/people/brendan/mach_bike.png
+++ b/graphics/object_events/pics/people/brendan/mach_bike.png
diff --git a/graphics/event_objects/pics/people/brendan/running.png b/graphics/object_events/pics/people/brendan/running.png
index a66dbf8d3..a66dbf8d3 100644
--- a/graphics/event_objects/pics/people/brendan/running.png
+++ b/graphics/object_events/pics/people/brendan/running.png
diff --git a/graphics/event_objects/pics/people/brendan/surfing.png b/graphics/object_events/pics/people/brendan/surfing.png
index 1baa4afc6..1baa4afc6 100644
--- a/graphics/event_objects/pics/people/brendan/surfing.png
+++ b/graphics/object_events/pics/people/brendan/surfing.png
diff --git a/graphics/event_objects/pics/people/brendan/underwater.png b/graphics/object_events/pics/people/brendan/underwater.png
index 47f926b61..47f926b61 100644
--- a/graphics/event_objects/pics/people/brendan/underwater.png
+++ b/graphics/object_events/pics/people/brendan/underwater.png
diff --git a/graphics/event_objects/pics/people/brendan/walking.png b/graphics/object_events/pics/people/brendan/walking.png
index 0560881fa..0560881fa 100644
--- a/graphics/event_objects/pics/people/brendan/walking.png
+++ b/graphics/object_events/pics/people/brendan/walking.png
diff --git a/graphics/event_objects/pics/people/brendan/watering.png b/graphics/object_events/pics/people/brendan/watering.png
index 999608437..999608437 100644
--- a/graphics/event_objects/pics/people/brendan/watering.png
+++ b/graphics/object_events/pics/people/brendan/watering.png
diff --git a/graphics/event_objects/pics/people/bug_catcher.png b/graphics/object_events/pics/people/bug_catcher.png
index 7f733b936..7f733b936 100644
--- a/graphics/event_objects/pics/people/bug_catcher.png
+++ b/graphics/object_events/pics/people/bug_catcher.png
diff --git a/graphics/event_objects/pics/people/cameraman.png b/graphics/object_events/pics/people/cameraman.png
index b1f972438..b1f972438 100644
--- a/graphics/event_objects/pics/people/cameraman.png
+++ b/graphics/object_events/pics/people/cameraman.png
diff --git a/graphics/event_objects/pics/people/camper.png b/graphics/object_events/pics/people/camper.png
index 3719d64f3..3719d64f3 100644
--- a/graphics/event_objects/pics/people/camper.png
+++ b/graphics/object_events/pics/people/camper.png
diff --git a/graphics/event_objects/pics/people/contest_judge.png b/graphics/object_events/pics/people/contest_judge.png
index 919230cb7..919230cb7 100644
--- a/graphics/event_objects/pics/people/contest_judge.png
+++ b/graphics/object_events/pics/people/contest_judge.png
diff --git a/graphics/event_objects/pics/people/cook.png b/graphics/object_events/pics/people/cook.png
index 9ac187130..9ac187130 100644
--- a/graphics/event_objects/pics/people/cook.png
+++ b/graphics/object_events/pics/people/cook.png
diff --git a/graphics/event_objects/pics/people/cycling_triathlete_f.png b/graphics/object_events/pics/people/cycling_triathlete_f.png
index a291b79c5..a291b79c5 100644
--- a/graphics/event_objects/pics/people/cycling_triathlete_f.png
+++ b/graphics/object_events/pics/people/cycling_triathlete_f.png
diff --git a/graphics/event_objects/pics/people/cycling_triathlete_m.png b/graphics/object_events/pics/people/cycling_triathlete_m.png
index 08a848d27..08a848d27 100644
--- a/graphics/event_objects/pics/people/cycling_triathlete_m.png
+++ b/graphics/object_events/pics/people/cycling_triathlete_m.png
diff --git a/graphics/event_objects/pics/people/devon_employee.png b/graphics/object_events/pics/people/devon_employee.png
index 106bc58b3..106bc58b3 100644
--- a/graphics/event_objects/pics/people/devon_employee.png
+++ b/graphics/object_events/pics/people/devon_employee.png
diff --git a/graphics/event_objects/pics/people/elite_four/drake.png b/graphics/object_events/pics/people/elite_four/drake.png
index 9fde008ff..9fde008ff 100644
--- a/graphics/event_objects/pics/people/elite_four/drake.png
+++ b/graphics/object_events/pics/people/elite_four/drake.png
diff --git a/graphics/event_objects/pics/people/elite_four/glacia.png b/graphics/object_events/pics/people/elite_four/glacia.png
index fcf6dbde2..fcf6dbde2 100644
--- a/graphics/event_objects/pics/people/elite_four/glacia.png
+++ b/graphics/object_events/pics/people/elite_four/glacia.png
diff --git a/graphics/event_objects/pics/people/elite_four/phoebe.png b/graphics/object_events/pics/people/elite_four/phoebe.png
index 243057ae2..243057ae2 100644
--- a/graphics/event_objects/pics/people/elite_four/phoebe.png
+++ b/graphics/object_events/pics/people/elite_four/phoebe.png
diff --git a/graphics/event_objects/pics/people/elite_four/sidney.png b/graphics/object_events/pics/people/elite_four/sidney.png
index de9d08719..de9d08719 100644
--- a/graphics/event_objects/pics/people/elite_four/sidney.png
+++ b/graphics/object_events/pics/people/elite_four/sidney.png
diff --git a/graphics/event_objects/pics/people/expert_f.png b/graphics/object_events/pics/people/expert_f.png
index a0d852cd4..a0d852cd4 100644
--- a/graphics/event_objects/pics/people/expert_f.png
+++ b/graphics/object_events/pics/people/expert_f.png
diff --git a/graphics/event_objects/pics/people/expert_m.png b/graphics/object_events/pics/people/expert_m.png
index 6bd5afc44..6bd5afc44 100644
--- a/graphics/event_objects/pics/people/expert_m.png
+++ b/graphics/object_events/pics/people/expert_m.png
diff --git a/graphics/event_objects/pics/people/fat_man.png b/graphics/object_events/pics/people/fat_man.png
index 392f0446e..392f0446e 100644
--- a/graphics/event_objects/pics/people/fat_man.png
+++ b/graphics/object_events/pics/people/fat_man.png
diff --git a/graphics/event_objects/pics/people/fisherman.png b/graphics/object_events/pics/people/fisherman.png
index 486fc36ed..486fc36ed 100644
--- a/graphics/event_objects/pics/people/fisherman.png
+++ b/graphics/object_events/pics/people/fisherman.png
diff --git a/graphics/event_objects/pics/people/frontier_brains/anabel.png b/graphics/object_events/pics/people/frontier_brains/anabel.png
index fce97a5e3..fce97a5e3 100644
--- a/graphics/event_objects/pics/people/frontier_brains/anabel.png
+++ b/graphics/object_events/pics/people/frontier_brains/anabel.png
diff --git a/graphics/event_objects/pics/people/frontier_brains/brandon.png b/graphics/object_events/pics/people/frontier_brains/brandon.png
index a6cfcbbcb..a6cfcbbcb 100644
--- a/graphics/event_objects/pics/people/frontier_brains/brandon.png
+++ b/graphics/object_events/pics/people/frontier_brains/brandon.png
diff --git a/graphics/event_objects/pics/people/frontier_brains/greta.png b/graphics/object_events/pics/people/frontier_brains/greta.png
index d8d577774..d8d577774 100644
--- a/graphics/event_objects/pics/people/frontier_brains/greta.png
+++ b/graphics/object_events/pics/people/frontier_brains/greta.png
diff --git a/graphics/event_objects/pics/people/frontier_brains/lucy.png b/graphics/object_events/pics/people/frontier_brains/lucy.png
index 7f935612c..7f935612c 100644
--- a/graphics/event_objects/pics/people/frontier_brains/lucy.png
+++ b/graphics/object_events/pics/people/frontier_brains/lucy.png
diff --git a/graphics/event_objects/pics/people/frontier_brains/noland.png b/graphics/object_events/pics/people/frontier_brains/noland.png
index b71430bd1..b71430bd1 100644
--- a/graphics/event_objects/pics/people/frontier_brains/noland.png
+++ b/graphics/object_events/pics/people/frontier_brains/noland.png
diff --git a/graphics/event_objects/pics/people/frontier_brains/spenser.png b/graphics/object_events/pics/people/frontier_brains/spenser.png
index cd8563d5e..cd8563d5e 100644
--- a/graphics/event_objects/pics/people/frontier_brains/spenser.png
+++ b/graphics/object_events/pics/people/frontier_brains/spenser.png
diff --git a/graphics/event_objects/pics/people/frontier_brains/tucker.png b/graphics/object_events/pics/people/frontier_brains/tucker.png
index d9daa0838..d9daa0838 100644
--- a/graphics/event_objects/pics/people/frontier_brains/tucker.png
+++ b/graphics/object_events/pics/people/frontier_brains/tucker.png
diff --git a/graphics/event_objects/pics/people/gameboy_kid.png b/graphics/object_events/pics/people/gameboy_kid.png
index b0b742651..b0b742651 100644
--- a/graphics/event_objects/pics/people/gameboy_kid.png
+++ b/graphics/object_events/pics/people/gameboy_kid.png
diff --git a/graphics/event_objects/pics/people/gentleman.png b/graphics/object_events/pics/people/gentleman.png
index 409c593e2..409c593e2 100644
--- a/graphics/event_objects/pics/people/gentleman.png
+++ b/graphics/object_events/pics/people/gentleman.png
diff --git a/graphics/event_objects/pics/people/girl_1.png b/graphics/object_events/pics/people/girl_1.png
index d0666c1c3..d0666c1c3 100644
--- a/graphics/event_objects/pics/people/girl_1.png
+++ b/graphics/object_events/pics/people/girl_1.png
diff --git a/graphics/event_objects/pics/people/girl_2.png b/graphics/object_events/pics/people/girl_2.png
index fa54bd715..fa54bd715 100644
--- a/graphics/event_objects/pics/people/girl_2.png
+++ b/graphics/object_events/pics/people/girl_2.png
diff --git a/graphics/event_objects/pics/people/girl_3.png b/graphics/object_events/pics/people/girl_3.png
index 7e329f628..7e329f628 100644
--- a/graphics/event_objects/pics/people/girl_3.png
+++ b/graphics/object_events/pics/people/girl_3.png
diff --git a/graphics/event_objects/pics/people/gym_leaders/brawly.png b/graphics/object_events/pics/people/gym_leaders/brawly.png
index 1fdd98b04..1fdd98b04 100644
--- a/graphics/event_objects/pics/people/gym_leaders/brawly.png
+++ b/graphics/object_events/pics/people/gym_leaders/brawly.png
diff --git a/graphics/event_objects/pics/people/gym_leaders/flannery.png b/graphics/object_events/pics/people/gym_leaders/flannery.png
index 3339f2c4b..3339f2c4b 100644
--- a/graphics/event_objects/pics/people/gym_leaders/flannery.png
+++ b/graphics/object_events/pics/people/gym_leaders/flannery.png
diff --git a/graphics/event_objects/pics/people/gym_leaders/juan.png b/graphics/object_events/pics/people/gym_leaders/juan.png
index aa246861a..aa246861a 100644
--- a/graphics/event_objects/pics/people/gym_leaders/juan.png
+++ b/graphics/object_events/pics/people/gym_leaders/juan.png
diff --git a/graphics/event_objects/pics/people/gym_leaders/liza.png b/graphics/object_events/pics/people/gym_leaders/liza.png
index 6a1eec536..6a1eec536 100644
--- a/graphics/event_objects/pics/people/gym_leaders/liza.png
+++ b/graphics/object_events/pics/people/gym_leaders/liza.png
diff --git a/graphics/event_objects/pics/people/gym_leaders/norman.png b/graphics/object_events/pics/people/gym_leaders/norman.png
index 48755d3bd..48755d3bd 100644
--- a/graphics/event_objects/pics/people/gym_leaders/norman.png
+++ b/graphics/object_events/pics/people/gym_leaders/norman.png
diff --git a/graphics/event_objects/pics/people/gym_leaders/roxanne.png b/graphics/object_events/pics/people/gym_leaders/roxanne.png
index c1a1421a0..c1a1421a0 100644
--- a/graphics/event_objects/pics/people/gym_leaders/roxanne.png
+++ b/graphics/object_events/pics/people/gym_leaders/roxanne.png
diff --git a/graphics/event_objects/pics/people/gym_leaders/tate.png b/graphics/object_events/pics/people/gym_leaders/tate.png
index f73ee136b..f73ee136b 100644
--- a/graphics/event_objects/pics/people/gym_leaders/tate.png
+++ b/graphics/object_events/pics/people/gym_leaders/tate.png
diff --git a/graphics/event_objects/pics/people/gym_leaders/wattson.png b/graphics/object_events/pics/people/gym_leaders/wattson.png
index 73ab5e8fc..73ab5e8fc 100644
--- a/graphics/event_objects/pics/people/gym_leaders/wattson.png
+++ b/graphics/object_events/pics/people/gym_leaders/wattson.png
diff --git a/graphics/event_objects/pics/people/gym_leaders/winona.png b/graphics/object_events/pics/people/gym_leaders/winona.png
index 9a1ce83eb..9a1ce83eb 100644
--- a/graphics/event_objects/pics/people/gym_leaders/winona.png
+++ b/graphics/object_events/pics/people/gym_leaders/winona.png
diff --git a/graphics/event_objects/pics/people/hex_maniac.png b/graphics/object_events/pics/people/hex_maniac.png
index b0e3b22a0..b0e3b22a0 100644
--- a/graphics/event_objects/pics/people/hex_maniac.png
+++ b/graphics/object_events/pics/people/hex_maniac.png
diff --git a/graphics/event_objects/pics/people/hiker.png b/graphics/object_events/pics/people/hiker.png
index 8c7b026a1..8c7b026a1 100644
--- a/graphics/event_objects/pics/people/hiker.png
+++ b/graphics/object_events/pics/people/hiker.png
diff --git a/graphics/event_objects/pics/people/hot_springs_old_woman.png b/graphics/object_events/pics/people/hot_springs_old_woman.png
index 874ba8a45..874ba8a45 100644
--- a/graphics/event_objects/pics/people/hot_springs_old_woman.png
+++ b/graphics/object_events/pics/people/hot_springs_old_woman.png
diff --git a/graphics/event_objects/pics/people/lass.png b/graphics/object_events/pics/people/lass.png
index 9e27f70dd..9e27f70dd 100644
--- a/graphics/event_objects/pics/people/lass.png
+++ b/graphics/object_events/pics/people/lass.png
diff --git a/graphics/event_objects/pics/people/leaf.png b/graphics/object_events/pics/people/leaf.png
index d96dd2663..d96dd2663 100644
--- a/graphics/event_objects/pics/people/leaf.png
+++ b/graphics/object_events/pics/people/leaf.png
diff --git a/graphics/event_objects/pics/people/link_receptionist.png b/graphics/object_events/pics/people/link_receptionist.png
index 2ffdd5af6..2ffdd5af6 100644
--- a/graphics/event_objects/pics/people/link_receptionist.png
+++ b/graphics/object_events/pics/people/link_receptionist.png
diff --git a/graphics/event_objects/pics/people/little_boy.png b/graphics/object_events/pics/people/little_boy.png
index 1b62a36d0..1b62a36d0 100644
--- a/graphics/event_objects/pics/people/little_boy.png
+++ b/graphics/object_events/pics/people/little_boy.png
diff --git a/graphics/event_objects/pics/people/little_girl.png b/graphics/object_events/pics/people/little_girl.png
index 2540d84af..2540d84af 100644
--- a/graphics/event_objects/pics/people/little_girl.png
+++ b/graphics/object_events/pics/people/little_girl.png
diff --git a/graphics/event_objects/pics/people/man_1.png b/graphics/object_events/pics/people/man_1.png
index 069cb3ed7..069cb3ed7 100644
--- a/graphics/event_objects/pics/people/man_1.png
+++ b/graphics/object_events/pics/people/man_1.png
diff --git a/graphics/event_objects/pics/people/man_2.png b/graphics/object_events/pics/people/man_2.png
index 6c29797ec..6c29797ec 100644
--- a/graphics/event_objects/pics/people/man_2.png
+++ b/graphics/object_events/pics/people/man_2.png
diff --git a/graphics/event_objects/pics/people/man_3.png b/graphics/object_events/pics/people/man_3.png
index 05a87d4dd..05a87d4dd 100644
--- a/graphics/event_objects/pics/people/man_3.png
+++ b/graphics/object_events/pics/people/man_3.png
diff --git a/graphics/event_objects/pics/people/man_4.png b/graphics/object_events/pics/people/man_4.png
index 234d67924..234d67924 100644
--- a/graphics/event_objects/pics/people/man_4.png
+++ b/graphics/object_events/pics/people/man_4.png
diff --git a/graphics/event_objects/pics/people/man_5.png b/graphics/object_events/pics/people/man_5.png
index f86aff0e4..f86aff0e4 100644
--- a/graphics/event_objects/pics/people/man_5.png
+++ b/graphics/object_events/pics/people/man_5.png
diff --git a/graphics/event_objects/pics/people/maniac.png b/graphics/object_events/pics/people/maniac.png
index 29829c309..29829c309 100644
--- a/graphics/event_objects/pics/people/maniac.png
+++ b/graphics/object_events/pics/people/maniac.png
diff --git a/graphics/event_objects/pics/people/mart_employee.png b/graphics/object_events/pics/people/mart_employee.png
index 43bdfef79..43bdfef79 100644
--- a/graphics/event_objects/pics/people/mart_employee.png
+++ b/graphics/object_events/pics/people/mart_employee.png
diff --git a/graphics/event_objects/pics/people/mauville_old_man_1.png b/graphics/object_events/pics/people/mauville_old_man_1.png
index 200f733b6..200f733b6 100644
--- a/graphics/event_objects/pics/people/mauville_old_man_1.png
+++ b/graphics/object_events/pics/people/mauville_old_man_1.png
diff --git a/graphics/event_objects/pics/people/mauville_old_man_2.png b/graphics/object_events/pics/people/mauville_old_man_2.png
index 6da0c24c4..6da0c24c4 100644
--- a/graphics/event_objects/pics/people/mauville_old_man_2.png
+++ b/graphics/object_events/pics/people/mauville_old_man_2.png
diff --git a/graphics/event_objects/pics/people/may/acro_bike.png b/graphics/object_events/pics/people/may/acro_bike.png
index 81a35b75a..81a35b75a 100644
--- a/graphics/event_objects/pics/people/may/acro_bike.png
+++ b/graphics/object_events/pics/people/may/acro_bike.png
diff --git a/graphics/event_objects/pics/people/may/decorating.png b/graphics/object_events/pics/people/may/decorating.png
index 8e8e34655..8e8e34655 100644
--- a/graphics/event_objects/pics/people/may/decorating.png
+++ b/graphics/object_events/pics/people/may/decorating.png
diff --git a/graphics/event_objects/pics/people/may/field_move.png b/graphics/object_events/pics/people/may/field_move.png
index 7882009d5..7882009d5 100644
--- a/graphics/event_objects/pics/people/may/field_move.png
+++ b/graphics/object_events/pics/people/may/field_move.png
diff --git a/graphics/event_objects/pics/people/may/fishing.png b/graphics/object_events/pics/people/may/fishing.png
index 69c57f12d..69c57f12d 100644
--- a/graphics/event_objects/pics/people/may/fishing.png
+++ b/graphics/object_events/pics/people/may/fishing.png
diff --git a/graphics/event_objects/pics/people/may/mach_bike.png b/graphics/object_events/pics/people/may/mach_bike.png
index 14eaf36ea..14eaf36ea 100644
--- a/graphics/event_objects/pics/people/may/mach_bike.png
+++ b/graphics/object_events/pics/people/may/mach_bike.png
diff --git a/graphics/event_objects/pics/people/may/running.png b/graphics/object_events/pics/people/may/running.png
index 54fa079a0..54fa079a0 100644
--- a/graphics/event_objects/pics/people/may/running.png
+++ b/graphics/object_events/pics/people/may/running.png
diff --git a/graphics/event_objects/pics/people/may/surfing.png b/graphics/object_events/pics/people/may/surfing.png
index 758063ab8..758063ab8 100644
--- a/graphics/event_objects/pics/people/may/surfing.png
+++ b/graphics/object_events/pics/people/may/surfing.png
diff --git a/graphics/event_objects/pics/people/may/underwater.png b/graphics/object_events/pics/people/may/underwater.png
index 8c260d932..8c260d932 100644
--- a/graphics/event_objects/pics/people/may/underwater.png
+++ b/graphics/object_events/pics/people/may/underwater.png
diff --git a/graphics/event_objects/pics/people/may/walking.png b/graphics/object_events/pics/people/may/walking.png
index 4b71d1a55..4b71d1a55 100644
--- a/graphics/event_objects/pics/people/may/walking.png
+++ b/graphics/object_events/pics/people/may/walking.png
diff --git a/graphics/event_objects/pics/people/may/watering.png b/graphics/object_events/pics/people/may/watering.png
index 368b6a462..368b6a462 100644
--- a/graphics/event_objects/pics/people/may/watering.png
+++ b/graphics/object_events/pics/people/may/watering.png
diff --git a/graphics/event_objects/pics/people/mom.png b/graphics/object_events/pics/people/mom.png
index 252eccf48..252eccf48 100644
--- a/graphics/event_objects/pics/people/mom.png
+++ b/graphics/object_events/pics/people/mom.png
diff --git a/graphics/event_objects/pics/people/mystery_event_deliveryman.png b/graphics/object_events/pics/people/mystery_event_deliveryman.png
index 8c1cbbc6e..8c1cbbc6e 100644
--- a/graphics/event_objects/pics/people/mystery_event_deliveryman.png
+++ b/graphics/object_events/pics/people/mystery_event_deliveryman.png
diff --git a/graphics/event_objects/pics/people/ninja_boy.png b/graphics/object_events/pics/people/ninja_boy.png
index ce4f3e92c..ce4f3e92c 100644
--- a/graphics/event_objects/pics/people/ninja_boy.png
+++ b/graphics/object_events/pics/people/ninja_boy.png
diff --git a/graphics/event_objects/pics/people/nurse.png b/graphics/object_events/pics/people/nurse.png
index 6e094f9f1..6e094f9f1 100644
--- a/graphics/event_objects/pics/people/nurse.png
+++ b/graphics/object_events/pics/people/nurse.png
diff --git a/graphics/event_objects/pics/people/old_man.png b/graphics/object_events/pics/people/old_man.png
index fe2a77c6e..fe2a77c6e 100644
--- a/graphics/event_objects/pics/people/old_man.png
+++ b/graphics/object_events/pics/people/old_man.png
diff --git a/graphics/event_objects/pics/people/old_woman.png b/graphics/object_events/pics/people/old_woman.png
index 84a5ba801..84a5ba801 100644
--- a/graphics/event_objects/pics/people/old_woman.png
+++ b/graphics/object_events/pics/people/old_woman.png
diff --git a/graphics/event_objects/pics/people/picnicker.png b/graphics/object_events/pics/people/picnicker.png
index a15eeb644..a15eeb644 100644
--- a/graphics/event_objects/pics/people/picnicker.png
+++ b/graphics/object_events/pics/people/picnicker.png
diff --git a/graphics/event_objects/pics/people/pokefan_f.png b/graphics/object_events/pics/people/pokefan_f.png
index c97fc3507..c97fc3507 100644
--- a/graphics/event_objects/pics/people/pokefan_f.png
+++ b/graphics/object_events/pics/people/pokefan_f.png
diff --git a/graphics/event_objects/pics/people/pokefan_m.png b/graphics/object_events/pics/people/pokefan_m.png
index a41a1ee9b..a41a1ee9b 100644
--- a/graphics/event_objects/pics/people/pokefan_m.png
+++ b/graphics/object_events/pics/people/pokefan_m.png
diff --git a/graphics/event_objects/pics/people/prof_birch.png b/graphics/object_events/pics/people/prof_birch.png
index d3ea18c31..d3ea18c31 100644
--- a/graphics/event_objects/pics/people/prof_birch.png
+++ b/graphics/object_events/pics/people/prof_birch.png
diff --git a/graphics/event_objects/pics/people/psychic_m.png b/graphics/object_events/pics/people/psychic_m.png
index 3efe5c0af..3efe5c0af 100644
--- a/graphics/event_objects/pics/people/psychic_m.png
+++ b/graphics/object_events/pics/people/psychic_m.png
diff --git a/graphics/event_objects/pics/people/quinty_plump.png b/graphics/object_events/pics/people/quinty_plump.png
index 49d4c7038..49d4c7038 100644
--- a/graphics/event_objects/pics/people/quinty_plump.png
+++ b/graphics/object_events/pics/people/quinty_plump.png
diff --git a/graphics/event_objects/pics/people/red.png b/graphics/object_events/pics/people/red.png
index 7215156c1..7215156c1 100644
--- a/graphics/event_objects/pics/people/red.png
+++ b/graphics/object_events/pics/people/red.png
diff --git a/graphics/event_objects/pics/people/reporter_f.png b/graphics/object_events/pics/people/reporter_f.png
index 289aef6d9..289aef6d9 100644
--- a/graphics/event_objects/pics/people/reporter_f.png
+++ b/graphics/object_events/pics/people/reporter_f.png
diff --git a/graphics/event_objects/pics/people/reporter_m.png b/graphics/object_events/pics/people/reporter_m.png
index 09b2b964e..09b2b964e 100644
--- a/graphics/event_objects/pics/people/reporter_m.png
+++ b/graphics/object_events/pics/people/reporter_m.png
diff --git a/graphics/event_objects/pics/people/rich_boy.png b/graphics/object_events/pics/people/rich_boy.png
index 6536d2c23..6536d2c23 100644
--- a/graphics/event_objects/pics/people/rich_boy.png
+++ b/graphics/object_events/pics/people/rich_boy.png
diff --git a/graphics/event_objects/pics/people/rooftop_sale_woman.png b/graphics/object_events/pics/people/rooftop_sale_woman.png
index f1f9bc72b..f1f9bc72b 100644
--- a/graphics/event_objects/pics/people/rooftop_sale_woman.png
+++ b/graphics/object_events/pics/people/rooftop_sale_woman.png
diff --git a/graphics/event_objects/pics/people/rs_little_boy.png b/graphics/object_events/pics/people/rs_little_boy.png
index 41bc20afb..41bc20afb 100644
--- a/graphics/event_objects/pics/people/rs_little_boy.png
+++ b/graphics/object_events/pics/people/rs_little_boy.png
diff --git a/graphics/event_objects/pics/people/ruby_sapphire_brendan/running.png b/graphics/object_events/pics/people/ruby_sapphire_brendan/running.png
index 3a4e710f3..3a4e710f3 100644
--- a/graphics/event_objects/pics/people/ruby_sapphire_brendan/running.png
+++ b/graphics/object_events/pics/people/ruby_sapphire_brendan/running.png
diff --git a/graphics/event_objects/pics/people/ruby_sapphire_brendan/walking.png b/graphics/object_events/pics/people/ruby_sapphire_brendan/walking.png
index 7f3d4bde7..7f3d4bde7 100644
--- a/graphics/event_objects/pics/people/ruby_sapphire_brendan/walking.png
+++ b/graphics/object_events/pics/people/ruby_sapphire_brendan/walking.png
diff --git a/graphics/event_objects/pics/people/ruby_sapphire_may/running.png b/graphics/object_events/pics/people/ruby_sapphire_may/running.png
index 7c546a286..7c546a286 100644
--- a/graphics/event_objects/pics/people/ruby_sapphire_may/running.png
+++ b/graphics/object_events/pics/people/ruby_sapphire_may/running.png
diff --git a/graphics/event_objects/pics/people/ruby_sapphire_may/walking.png b/graphics/object_events/pics/people/ruby_sapphire_may/walking.png
index 7c600a003..7c600a003 100644
--- a/graphics/event_objects/pics/people/ruby_sapphire_may/walking.png
+++ b/graphics/object_events/pics/people/ruby_sapphire_may/walking.png
diff --git a/graphics/event_objects/pics/people/running_triathlete_f.png b/graphics/object_events/pics/people/running_triathlete_f.png
index f95eb2be2..f95eb2be2 100644
--- a/graphics/event_objects/pics/people/running_triathlete_f.png
+++ b/graphics/object_events/pics/people/running_triathlete_f.png
diff --git a/graphics/event_objects/pics/people/running_triathlete_m.png b/graphics/object_events/pics/people/running_triathlete_m.png
index b2b681201..b2b681201 100644
--- a/graphics/event_objects/pics/people/running_triathlete_m.png
+++ b/graphics/object_events/pics/people/running_triathlete_m.png
diff --git a/graphics/event_objects/pics/people/sailor.png b/graphics/object_events/pics/people/sailor.png
index 6c8a867f4..6c8a867f4 100644
--- a/graphics/event_objects/pics/people/sailor.png
+++ b/graphics/object_events/pics/people/sailor.png
diff --git a/graphics/event_objects/pics/people/school_kid_m.png b/graphics/object_events/pics/people/school_kid_m.png
index ddfc28b10..ddfc28b10 100644
--- a/graphics/event_objects/pics/people/school_kid_m.png
+++ b/graphics/object_events/pics/people/school_kid_m.png
diff --git a/graphics/event_objects/pics/people/scientist_1.png b/graphics/object_events/pics/people/scientist_1.png
index 2b1f6605d..2b1f6605d 100644
--- a/graphics/event_objects/pics/people/scientist_1.png
+++ b/graphics/object_events/pics/people/scientist_1.png
diff --git a/graphics/event_objects/pics/people/scientist_2.png b/graphics/object_events/pics/people/scientist_2.png
index ba4759a71..ba4759a71 100644
--- a/graphics/event_objects/pics/people/scientist_2.png
+++ b/graphics/object_events/pics/people/scientist_2.png
diff --git a/graphics/event_objects/pics/people/scott.png b/graphics/object_events/pics/people/scott.png
index 113614f5f..113614f5f 100644
--- a/graphics/event_objects/pics/people/scott.png
+++ b/graphics/object_events/pics/people/scott.png
diff --git a/graphics/event_objects/pics/people/steven.png b/graphics/object_events/pics/people/steven.png
index da692f51d..da692f51d 100644
--- a/graphics/event_objects/pics/people/steven.png
+++ b/graphics/object_events/pics/people/steven.png
diff --git a/graphics/event_objects/pics/people/swimmer_f.png b/graphics/object_events/pics/people/swimmer_f.png
index 962e60a9c..962e60a9c 100644
--- a/graphics/event_objects/pics/people/swimmer_f.png
+++ b/graphics/object_events/pics/people/swimmer_f.png
diff --git a/graphics/event_objects/pics/people/swimmer_m.png b/graphics/object_events/pics/people/swimmer_m.png
index eb1733da8..eb1733da8 100644
--- a/graphics/event_objects/pics/people/swimmer_m.png
+++ b/graphics/object_events/pics/people/swimmer_m.png
diff --git a/graphics/event_objects/pics/people/teala.png b/graphics/object_events/pics/people/teala.png
index cfc47b112..cfc47b112 100644
--- a/graphics/event_objects/pics/people/teala.png
+++ b/graphics/object_events/pics/people/teala.png
diff --git a/graphics/event_objects/pics/people/team_aqua/aqua_member_f.png b/graphics/object_events/pics/people/team_aqua/aqua_member_f.png
index fab673878..fab673878 100644
--- a/graphics/event_objects/pics/people/team_aqua/aqua_member_f.png
+++ b/graphics/object_events/pics/people/team_aqua/aqua_member_f.png
diff --git a/graphics/event_objects/pics/people/team_aqua/aqua_member_m.png b/graphics/object_events/pics/people/team_aqua/aqua_member_m.png
index 434085954..434085954 100644
--- a/graphics/event_objects/pics/people/team_aqua/aqua_member_m.png
+++ b/graphics/object_events/pics/people/team_aqua/aqua_member_m.png
diff --git a/graphics/event_objects/pics/people/team_aqua/archie.png b/graphics/object_events/pics/people/team_aqua/archie.png
index 6ece66e06..6ece66e06 100644
--- a/graphics/event_objects/pics/people/team_aqua/archie.png
+++ b/graphics/object_events/pics/people/team_aqua/archie.png
diff --git a/graphics/event_objects/pics/people/team_magma/magma_member_f.png b/graphics/object_events/pics/people/team_magma/magma_member_f.png
index 60bd8494e..60bd8494e 100644
--- a/graphics/event_objects/pics/people/team_magma/magma_member_f.png
+++ b/graphics/object_events/pics/people/team_magma/magma_member_f.png
diff --git a/graphics/event_objects/pics/people/team_magma/magma_member_m.png b/graphics/object_events/pics/people/team_magma/magma_member_m.png
index f7581bb39..f7581bb39 100644
--- a/graphics/event_objects/pics/people/team_magma/magma_member_m.png
+++ b/graphics/object_events/pics/people/team_magma/magma_member_m.png
diff --git a/graphics/event_objects/pics/people/team_magma/maxie.png b/graphics/object_events/pics/people/team_magma/maxie.png
index cc8b180ed..cc8b180ed 100644
--- a/graphics/event_objects/pics/people/team_magma/maxie.png
+++ b/graphics/object_events/pics/people/team_magma/maxie.png
diff --git a/graphics/event_objects/pics/people/tuber_f.png b/graphics/object_events/pics/people/tuber_f.png
index bfcab635a..bfcab635a 100644
--- a/graphics/event_objects/pics/people/tuber_f.png
+++ b/graphics/object_events/pics/people/tuber_f.png
diff --git a/graphics/event_objects/pics/people/tuber_m.png b/graphics/object_events/pics/people/tuber_m.png
index 48bc3b3b4..48bc3b3b4 100644
--- a/graphics/event_objects/pics/people/tuber_m.png
+++ b/graphics/object_events/pics/people/tuber_m.png
diff --git a/graphics/event_objects/pics/people/tuber_m_swimming.png b/graphics/object_events/pics/people/tuber_m_swimming.png
index 15dedb259..15dedb259 100644
--- a/graphics/event_objects/pics/people/tuber_m_swimming.png
+++ b/graphics/object_events/pics/people/tuber_m_swimming.png
diff --git a/graphics/event_objects/pics/people/twin.png b/graphics/object_events/pics/people/twin.png
index 5ce59ea1b..5ce59ea1b 100644
--- a/graphics/event_objects/pics/people/twin.png
+++ b/graphics/object_events/pics/people/twin.png
diff --git a/graphics/event_objects/pics/people/union_room_attendant.png b/graphics/object_events/pics/people/union_room_attendant.png
index 8e8c3851c..8e8c3851c 100644
--- a/graphics/event_objects/pics/people/union_room_attendant.png
+++ b/graphics/object_events/pics/people/union_room_attendant.png
diff --git a/graphics/event_objects/pics/people/unused_woman.png b/graphics/object_events/pics/people/unused_woman.png
index 395ed1c09..395ed1c09 100644
--- a/graphics/event_objects/pics/people/unused_woman.png
+++ b/graphics/object_events/pics/people/unused_woman.png
diff --git a/graphics/event_objects/pics/people/wallace.png b/graphics/object_events/pics/people/wallace.png
index 2ef1d6050..2ef1d6050 100644
--- a/graphics/event_objects/pics/people/wallace.png
+++ b/graphics/object_events/pics/people/wallace.png
diff --git a/graphics/event_objects/pics/people/wally.png b/graphics/object_events/pics/people/wally.png
index 190ee6713..190ee6713 100644
--- a/graphics/event_objects/pics/people/wally.png
+++ b/graphics/object_events/pics/people/wally.png
diff --git a/graphics/event_objects/pics/people/woman_1.png b/graphics/object_events/pics/people/woman_1.png
index 2207993f7..2207993f7 100644
--- a/graphics/event_objects/pics/people/woman_1.png
+++ b/graphics/object_events/pics/people/woman_1.png
diff --git a/graphics/event_objects/pics/people/woman_2.png b/graphics/object_events/pics/people/woman_2.png
index 8d35b1653..8d35b1653 100644
--- a/graphics/event_objects/pics/people/woman_2.png
+++ b/graphics/object_events/pics/people/woman_2.png
diff --git a/graphics/event_objects/pics/people/woman_3.png b/graphics/object_events/pics/people/woman_3.png
index 2a29acae3..2a29acae3 100644
--- a/graphics/event_objects/pics/people/woman_3.png
+++ b/graphics/object_events/pics/people/woman_3.png
diff --git a/graphics/event_objects/pics/people/woman_4.png b/graphics/object_events/pics/people/woman_4.png
index 95dfc76da..95dfc76da 100644
--- a/graphics/event_objects/pics/people/woman_4.png
+++ b/graphics/object_events/pics/people/woman_4.png
diff --git a/graphics/event_objects/pics/people/woman_5.png b/graphics/object_events/pics/people/woman_5.png
index a7750dc4c..a7750dc4c 100644
--- a/graphics/event_objects/pics/people/woman_5.png
+++ b/graphics/object_events/pics/people/woman_5.png
diff --git a/graphics/event_objects/pics/people/youngster.png b/graphics/object_events/pics/people/youngster.png
index c17e7c6cf..c17e7c6cf 100644
--- a/graphics/event_objects/pics/people/youngster.png
+++ b/graphics/object_events/pics/people/youngster.png
diff --git a/graphics/event_objects/pics/pokemon/azumarill.png b/graphics/object_events/pics/pokemon/azumarill.png
index 84b07ea5b..84b07ea5b 100644
--- a/graphics/event_objects/pics/pokemon/azumarill.png
+++ b/graphics/object_events/pics/pokemon/azumarill.png
diff --git a/graphics/event_objects/pics/pokemon/azurill.png b/graphics/object_events/pics/pokemon/azurill.png
index 99cd25fe5..99cd25fe5 100644
--- a/graphics/event_objects/pics/pokemon/azurill.png
+++ b/graphics/object_events/pics/pokemon/azurill.png
diff --git a/graphics/event_objects/pics/pokemon/deoxys.png b/graphics/object_events/pics/pokemon/deoxys.png
index 9aa8dc218..9aa8dc218 100644
--- a/graphics/event_objects/pics/pokemon/deoxys.png
+++ b/graphics/object_events/pics/pokemon/deoxys.png
diff --git a/graphics/event_objects/pics/pokemon/dusclops.png b/graphics/object_events/pics/pokemon/dusclops.png
index fb2c85576..fb2c85576 100644
--- a/graphics/event_objects/pics/pokemon/dusclops.png
+++ b/graphics/object_events/pics/pokemon/dusclops.png
diff --git a/graphics/event_objects/pics/pokemon/enemy_zigzagoon.png b/graphics/object_events/pics/pokemon/enemy_zigzagoon.png
index 2684ad130..2684ad130 100644
--- a/graphics/event_objects/pics/pokemon/enemy_zigzagoon.png
+++ b/graphics/object_events/pics/pokemon/enemy_zigzagoon.png
diff --git a/graphics/event_objects/pics/pokemon/groudon.png b/graphics/object_events/pics/pokemon/groudon.png
index 3d14c5ac9..3d14c5ac9 100644
--- a/graphics/event_objects/pics/pokemon/groudon.png
+++ b/graphics/object_events/pics/pokemon/groudon.png
diff --git a/graphics/event_objects/pics/pokemon/ho_oh.png b/graphics/object_events/pics/pokemon/ho_oh.png
index e6c7374e0..e6c7374e0 100644
--- a/graphics/event_objects/pics/pokemon/ho_oh.png
+++ b/graphics/object_events/pics/pokemon/ho_oh.png
diff --git a/graphics/event_objects/pics/pokemon/kecleon.png b/graphics/object_events/pics/pokemon/kecleon.png
index 47ae584b7..47ae584b7 100644
--- a/graphics/event_objects/pics/pokemon/kecleon.png
+++ b/graphics/object_events/pics/pokemon/kecleon.png
diff --git a/graphics/event_objects/pics/pokemon/kirlia.png b/graphics/object_events/pics/pokemon/kirlia.png
index bac74a9cc..bac74a9cc 100644
--- a/graphics/event_objects/pics/pokemon/kirlia.png
+++ b/graphics/object_events/pics/pokemon/kirlia.png
diff --git a/graphics/event_objects/pics/pokemon/kyogre.png b/graphics/object_events/pics/pokemon/kyogre.png
index 32f67aafa..32f67aafa 100644
--- a/graphics/event_objects/pics/pokemon/kyogre.png
+++ b/graphics/object_events/pics/pokemon/kyogre.png
diff --git a/graphics/event_objects/pics/pokemon/latias_latios.png b/graphics/object_events/pics/pokemon/latias_latios.png
index 4030d413c..4030d413c 100644
--- a/graphics/event_objects/pics/pokemon/latias_latios.png
+++ b/graphics/object_events/pics/pokemon/latias_latios.png
diff --git a/graphics/event_objects/pics/pokemon/lugia.png b/graphics/object_events/pics/pokemon/lugia.png
index 1dfc6858b..1dfc6858b 100644
--- a/graphics/event_objects/pics/pokemon/lugia.png
+++ b/graphics/object_events/pics/pokemon/lugia.png
diff --git a/graphics/event_objects/pics/pokemon/mew.png b/graphics/object_events/pics/pokemon/mew.png
index 00cbd2779..00cbd2779 100644
--- a/graphics/event_objects/pics/pokemon/mew.png
+++ b/graphics/object_events/pics/pokemon/mew.png
diff --git a/graphics/event_objects/pics/pokemon/pikachu.png b/graphics/object_events/pics/pokemon/pikachu.png
index b2d15ef17..b2d15ef17 100644
--- a/graphics/event_objects/pics/pokemon/pikachu.png
+++ b/graphics/object_events/pics/pokemon/pikachu.png
diff --git a/graphics/event_objects/pics/pokemon/poochyena.png b/graphics/object_events/pics/pokemon/poochyena.png
index 171a551d3..171a551d3 100644
--- a/graphics/event_objects/pics/pokemon/poochyena.png
+++ b/graphics/object_events/pics/pokemon/poochyena.png
diff --git a/graphics/event_objects/pics/pokemon/rayquaza.png b/graphics/object_events/pics/pokemon/rayquaza.png
index 9a74dc64f..9a74dc64f 100644
--- a/graphics/event_objects/pics/pokemon/rayquaza.png
+++ b/graphics/object_events/pics/pokemon/rayquaza.png
diff --git a/graphics/event_objects/pics/pokemon/rayquaza_still.png b/graphics/object_events/pics/pokemon/rayquaza_still.png
index 55d638f29..55d638f29 100644
--- a/graphics/event_objects/pics/pokemon/rayquaza_still.png
+++ b/graphics/object_events/pics/pokemon/rayquaza_still.png
diff --git a/graphics/event_objects/pics/pokemon/regi.png b/graphics/object_events/pics/pokemon/regi.png
index c3bb15e57..c3bb15e57 100644
--- a/graphics/event_objects/pics/pokemon/regi.png
+++ b/graphics/object_events/pics/pokemon/regi.png
diff --git a/graphics/event_objects/pics/pokemon/skitty.png b/graphics/object_events/pics/pokemon/skitty.png
index 2b7810412..2b7810412 100644
--- a/graphics/event_objects/pics/pokemon/skitty.png
+++ b/graphics/object_events/pics/pokemon/skitty.png
diff --git a/graphics/event_objects/pics/pokemon/sudowoodo.png b/graphics/object_events/pics/pokemon/sudowoodo.png
index 0e084dcc0..0e084dcc0 100644
--- a/graphics/event_objects/pics/pokemon/sudowoodo.png
+++ b/graphics/object_events/pics/pokemon/sudowoodo.png
diff --git a/graphics/event_objects/pics/pokemon/vigoroth.png b/graphics/object_events/pics/pokemon/vigoroth.png
index d9ea6dbed..d9ea6dbed 100644
--- a/graphics/event_objects/pics/pokemon/vigoroth.png
+++ b/graphics/object_events/pics/pokemon/vigoroth.png
diff --git a/graphics/event_objects/pics/pokemon/wingull.png b/graphics/object_events/pics/pokemon/wingull.png
index 9401d77f8..9401d77f8 100644
--- a/graphics/event_objects/pics/pokemon/wingull.png
+++ b/graphics/object_events/pics/pokemon/wingull.png
diff --git a/graphics/event_objects/pics/pokemon/zigzagoon.png b/graphics/object_events/pics/pokemon/zigzagoon.png
index 2eaf2403d..2eaf2403d 100644
--- a/graphics/event_objects/pics/pokemon/zigzagoon.png
+++ b/graphics/object_events/pics/pokemon/zigzagoon.png
diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk
index fbdb6348c..28351aa90 100644
--- a/graphics_file_rules.mk
+++ b/graphics_file_rules.mk
@@ -15,7 +15,7 @@ SLOTMACHINEGFXDIR := graphics/slot_machine
 PKNAVGFXDIR := graphics/pokenav
 PKNAVOPTIONSGFXDIR := graphics/pokenav/options
 PSSGFXDIR := graphics/pokemon_storage
-EVENTOBJGFXDIR := graphics/event_objects
+OBJEVENTGFXDIR := graphics/object_events
 MISCGFXDIR := graphics/misc
 
 types := normal fight flying poison ground rock bug ghost steel mystery fire water grass electric psychic ice dragon dark
@@ -644,7 +644,7 @@ $(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
+$(OBJEVENTGFXDIR)/pics/effects/unknown_4F6D38/0.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 11
 
 $(INTERFACEGFXDIR)/selector_outline.4bpp: %.4bpp: %.png
diff --git a/spritesheet_rules.mk b/spritesheet_rules.mk
index 6e49a0a66..262d53232 100644
--- a/spritesheet_rules.mk
+++ b/spritesheet_rules.mk
@@ -1,663 +1,663 @@
-EVENTOBJGFXDIR := graphics/event_objects/pics
+OBJEVENTGFXDIR := graphics/object_events/pics
 
-$(EVENTOBJGFXDIR)/people/brendan/walking.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/people/brendan/walking.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/people/brendan/running.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/people/brendan/running.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/people/brendan/field_move.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/people/brendan/field_move.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 4 -mheight 4
 
-$(EVENTOBJGFXDIR)/people/brendan/surfing.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/people/brendan/surfing.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 4 -mheight 4
 
-$(EVENTOBJGFXDIR)/people/brendan/mach_bike.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/people/brendan/mach_bike.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 4 -mheight 4
 
-$(EVENTOBJGFXDIR)/people/brendan/acro_bike.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/people/brendan/acro_bike.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 4 -mheight 4
 
-$(EVENTOBJGFXDIR)/people/brendan/fishing.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/people/brendan/fishing.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 4 -mheight 4
 
-$(EVENTOBJGFXDIR)/people/brendan/watering.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/people/brendan/watering.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 4 -mheight 4
 
-$(EVENTOBJGFXDIR)/people/brendan/underwater.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/people/brendan/underwater.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 4 -mheight 4
 
 
-$(EVENTOBJGFXDIR)/people/elite_four/drake.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/people/elite_four/drake.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/people/elite_four/glacia.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/people/elite_four/glacia.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/people/elite_four/phoebe.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/people/elite_four/phoebe.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/people/elite_four/sidney.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/people/elite_four/sidney.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
 
-$(EVENTOBJGFXDIR)/people/frontier_brains/anabel.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/people/frontier_brains/anabel.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/people/frontier_brains/brandon.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/people/frontier_brains/brandon.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/people/frontier_brains/greta.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/people/frontier_brains/greta.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/people/frontier_brains/lucy.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/people/frontier_brains/lucy.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/people/frontier_brains/noland.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/people/frontier_brains/noland.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/people/frontier_brains/spenser.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/people/frontier_brains/spenser.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/people/frontier_brains/tucker.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/people/frontier_brains/tucker.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
 
-$(EVENTOBJGFXDIR)/people/gym_leaders/brawly.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/people/gym_leaders/brawly.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/people/gym_leaders/flannery.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/people/gym_leaders/flannery.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/people/gym_leaders/juan.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/people/gym_leaders/juan.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/people/gym_leaders/liza.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/people/gym_leaders/liza.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/people/gym_leaders/norman.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/people/gym_leaders/norman.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/people/gym_leaders/roxanne.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/people/gym_leaders/roxanne.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/people/gym_leaders/tate.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/people/gym_leaders/tate.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/people/gym_leaders/wattson.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/people/gym_leaders/wattson.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/people/gym_leaders/winona.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/people/gym_leaders/winona.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
 
-$(EVENTOBJGFXDIR)/people/may/walking.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/people/may/walking.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/people/may/running.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/people/may/running.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/people/may/field_move.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/people/may/field_move.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 4 -mheight 4
 
-$(EVENTOBJGFXDIR)/people/may/surfing.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/people/may/surfing.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 4 -mheight 4
 
-$(EVENTOBJGFXDIR)/people/may/mach_bike.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/people/may/mach_bike.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 4 -mheight 4
 
-$(EVENTOBJGFXDIR)/people/may/acro_bike.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/people/may/acro_bike.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 4 -mheight 4
 
-$(EVENTOBJGFXDIR)/people/may/fishing.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/people/may/fishing.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 4 -mheight 4
 
-$(EVENTOBJGFXDIR)/people/may/watering.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/people/may/watering.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 4 -mheight 4
 
-$(EVENTOBJGFXDIR)/people/may/underwater.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/people/may/underwater.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 4 -mheight 4
 
 
-$(EVENTOBJGFXDIR)/people/ruby_sapphire_brendan/walking.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/people/ruby_sapphire_brendan/walking.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/people/ruby_sapphire_brendan/running.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/people/ruby_sapphire_brendan/running.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
 
-$(EVENTOBJGFXDIR)/people/ruby_sapphire_may/walking.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/people/ruby_sapphire_may/walking.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/people/ruby_sapphire_may/running.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/people/ruby_sapphire_may/running.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
 
-$(EVENTOBJGFXDIR)/people/team_aqua/aqua_member_f.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/people/team_aqua/aqua_member_f.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/people/team_aqua/aqua_member_m.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/people/team_aqua/aqua_member_m.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/people/team_aqua/archie.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/people/team_aqua/archie.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
 
-$(EVENTOBJGFXDIR)/people/team_magma/magma_member_f.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/people/team_magma/magma_member_f.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/people/team_magma/magma_member_m.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/people/team_magma/magma_member_m.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/people/team_magma/maxie.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/people/team_magma/maxie.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
 
-$(EVENTOBJGFXDIR)/people/artist.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/people/artist.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/people/beauty.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/people/beauty.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/people/black_belt.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/people/black_belt.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/people/boy_1.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/people/boy_1.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/people/boy_2.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/people/boy_2.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/people/boy_3.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/people/boy_3.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/people/rich_boy.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/people/rich_boy.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/people/gameboy_kid.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/people/gameboy_kid.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/people/bug_catcher.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/people/bug_catcher.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/people/cameraman.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/people/cameraman.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/people/camper.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/people/camper.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/people/contest_judge.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/people/contest_judge.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/people/cook.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/people/cook.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/people/cycling_triathlete_f.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/people/cycling_triathlete_f.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 4 -mheight 4
 
-$(EVENTOBJGFXDIR)/people/cycling_triathlete_m.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/people/cycling_triathlete_m.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 4 -mheight 4
 
-$(EVENTOBJGFXDIR)/people/fat_man.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/people/fat_man.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/people/fisherman.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/people/fisherman.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/people/gentleman.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/people/gentleman.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/people/girl_1.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/people/girl_1.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/people/girl_2.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/people/girl_2.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/people/girl_3.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/people/girl_3.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/people/hex_maniac.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/people/hex_maniac.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/people/hiker.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/people/hiker.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/people/hot_springs_old_woman.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/people/hot_springs_old_woman.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/people/lass.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/people/lass.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/people/leaf.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/people/leaf.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/people/ninja_boy.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/people/ninja_boy.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 2
 
-$(EVENTOBJGFXDIR)/people/little_boy.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/people/little_boy.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 2
 
-$(EVENTOBJGFXDIR)/people/twin.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/people/twin.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/people/little_girl.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/people/little_girl.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 2
 
-$(EVENTOBJGFXDIR)/people/man_1.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/people/man_1.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/people/man_2.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/people/man_2.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/people/pokefan_m.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/people/pokefan_m.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/people/man_3.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/people/man_3.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/people/man_4.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/people/man_4.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/people/man_5.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/people/man_5.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/people/devon_employee.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/people/devon_employee.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/people/maniac.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/people/maniac.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/people/mart_employee.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/people/mart_employee.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/people/mauville_old_man_1.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/people/mauville_old_man_1.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/people/mauville_old_man_2.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/people/mauville_old_man_2.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/people/mom.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/people/mom.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/people/mystery_event_deliveryman.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/people/mystery_event_deliveryman.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/people/nurse.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/people/nurse.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/people/expert_m.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/people/expert_m.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/people/old_man.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/people/old_man.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/people/expert_f.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/people/expert_f.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/people/old_woman.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/people/old_woman.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/people/picnicker.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/people/picnicker.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/people/prof_birch.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/people/prof_birch.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/people/psychic_m.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/people/psychic_m.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/people/quinty_plump.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/people/quinty_plump.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 4 -mheight 4
 
-$(EVENTOBJGFXDIR)/people/red.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/people/red.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/people/reporter_f.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/people/reporter_f.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/people/reporter_m.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/people/reporter_m.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/people/rooftop_sale_woman.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/people/rooftop_sale_woman.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/people/rs_little_boy.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/people/rs_little_boy.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 2
 
-$(EVENTOBJGFXDIR)/people/running_triathlete_f.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/people/running_triathlete_f.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/people/running_triathlete_m.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/people/running_triathlete_m.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/people/sailor.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/people/sailor.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/people/school_kid_m.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/people/school_kid_m.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/people/scientist_1.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/people/scientist_1.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/people/scientist_2.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/people/scientist_2.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/people/scott.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/people/scott.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/people/steven.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/people/steven.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/people/swimmer_f.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/people/swimmer_f.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/people/swimmer_m.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/people/swimmer_m.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/people/teala.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/people/teala.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/people/tuber_f.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/people/tuber_f.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 2
 
-$(EVENTOBJGFXDIR)/people/tuber_m.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/people/tuber_m.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 2
 
-$(EVENTOBJGFXDIR)/people/tuber_m_swimming.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/people/tuber_m_swimming.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 2
 
-$(EVENTOBJGFXDIR)/people/union_room_attendant.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/people/union_room_attendant.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/people/unused_woman.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/people/unused_woman.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/people/wallace.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/people/wallace.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/people/wally.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/people/wally.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/people/woman_1.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/people/woman_1.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/people/pokefan_f.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/people/pokefan_f.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/people/woman_2.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/people/woman_2.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/people/woman_3.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/people/woman_3.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/people/woman_4.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/people/woman_4.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/people/link_receptionist.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/people/link_receptionist.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/people/woman_5.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/people/woman_5.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/people/youngster.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/people/youngster.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
 
 
-$(EVENTOBJGFXDIR)/pokemon/azumarill.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/pokemon/azumarill.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 2
 
-$(EVENTOBJGFXDIR)/pokemon/azurill.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/pokemon/azurill.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 2
 
-$(EVENTOBJGFXDIR)/pokemon/deoxys.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/pokemon/deoxys.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 4 -mheight 4
 
-$(EVENTOBJGFXDIR)/pokemon/dusclops.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/pokemon/dusclops.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/pokemon/enemy_zigzagoon.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/pokemon/enemy_zigzagoon.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 4 -mheight 4
 
-$(EVENTOBJGFXDIR)/pokemon/groudon.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/pokemon/groudon.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 4 -mheight 4
 
-$(EVENTOBJGFXDIR)/pokemon/ho_oh.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/pokemon/ho_oh.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 4 -mheight 4
 
-$(EVENTOBJGFXDIR)/pokemon/kecleon.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/pokemon/kecleon.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 2
 
-$(EVENTOBJGFXDIR)/pokemon/kirlia.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/pokemon/kirlia.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/pokemon/kyogre.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/pokemon/kyogre.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 4 -mheight 4
 
-$(EVENTOBJGFXDIR)/pokemon/latias_latios.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/pokemon/latias_latios.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 4 -mheight 4
 
-$(EVENTOBJGFXDIR)/pokemon/lugia.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/pokemon/lugia.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 4 -mheight 4
 
-$(EVENTOBJGFXDIR)/pokemon/mew.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/pokemon/mew.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/pokemon/pikachu.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/pokemon/pikachu.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 2
 
-$(EVENTOBJGFXDIR)/pokemon/poochyena.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/pokemon/poochyena.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 4 -mheight 4
 
-$(EVENTOBJGFXDIR)/pokemon/rayquaza.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/pokemon/rayquaza.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 8 -mheight 8
 
-$(EVENTOBJGFXDIR)/pokemon/skitty.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/pokemon/skitty.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 2
 
-$(EVENTOBJGFXDIR)/pokemon/sudowoodo.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/pokemon/sudowoodo.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/pokemon/vigoroth.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/pokemon/vigoroth.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 4 -mheight 4
 
-$(EVENTOBJGFXDIR)/pokemon/wingull.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/pokemon/wingull.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 2
 
-$(EVENTOBJGFXDIR)/pokemon/zigzagoon.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/pokemon/zigzagoon.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 2
 
 
 
-$(EVENTOBJGFXDIR)/berry_trees/aguav.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/berry_trees/aguav.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/berry_trees/aspear.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/berry_trees/aspear.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/berry_trees/cheri.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/berry_trees/cheri.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/berry_trees/chesto.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/berry_trees/chesto.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/berry_trees/cornn.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/berry_trees/cornn.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/berry_trees/durin.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/berry_trees/durin.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/berry_trees/figy.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/berry_trees/figy.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/berry_trees/grepa.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/berry_trees/grepa.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/berry_trees/hondew.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/berry_trees/hondew.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/berry_trees/iapapa.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/berry_trees/iapapa.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/berry_trees/kelpsy.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/berry_trees/kelpsy.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/berry_trees/lansat.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/berry_trees/lansat.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/berry_trees/leppa.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/berry_trees/leppa.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/berry_trees/liechi.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/berry_trees/liechi.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/berry_trees/lum.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/berry_trees/lum.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/berry_trees/mago.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/berry_trees/mago.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/berry_trees/nomel.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/berry_trees/nomel.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/berry_trees/oran.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/berry_trees/oran.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/berry_trees/pamtre.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/berry_trees/pamtre.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/berry_trees/pecha.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/berry_trees/pecha.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/berry_trees/persim.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/berry_trees/persim.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/berry_trees/pomeg.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/berry_trees/pomeg.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/berry_trees/rabuta.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/berry_trees/rabuta.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/berry_trees/rawst.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/berry_trees/rawst.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/berry_trees/razz.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/berry_trees/razz.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/berry_trees/sitrus.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/berry_trees/sitrus.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/berry_trees/spelon.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/berry_trees/spelon.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/berry_trees/sprout.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/berry_trees/sprout.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 2
 
-$(EVENTOBJGFXDIR)/berry_trees/tamato.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/berry_trees/tamato.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/berry_trees/wepear.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/berry_trees/wepear.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/berry_trees/wiki.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/berry_trees/wiki.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
 
 
-$(EVENTOBJGFXDIR)/misc/breakable_rock.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/misc/breakable_rock.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 2
 
-$(EVENTOBJGFXDIR)/misc/cuttable_tree.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/misc/cuttable_tree.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 2
 
-$(EVENTOBJGFXDIR)/misc/mr_brineys_boat.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/misc/mr_brineys_boat.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 4 -mheight 4
 
 
 
-$(EVENTOBJGFXDIR)/effects/arrow.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/effects/arrow.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 2
 
-$(EVENTOBJGFXDIR)/effects/ash.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/effects/ash.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 2
 
-$(EVENTOBJGFXDIR)/effects/berry_tree_growth_sparkle.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/effects/berry_tree_growth_sparkle.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 2
 
-$(EVENTOBJGFXDIR)/effects/bike_hop_big_splash.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/effects/bike_hop_big_splash.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 2
 
-$(EVENTOBJGFXDIR)/effects/bike_hop_small_splash.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/effects/bike_hop_small_splash.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 1
 
-$(EVENTOBJGFXDIR)/effects/bike_hop_tall_grass.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/effects/bike_hop_tall_grass.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 1
 
-$(EVENTOBJGFXDIR)/effects/bike_tire_tracks.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/effects/bike_tire_tracks.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 2
 
-$(EVENTOBJGFXDIR)/effects/bubbles.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/effects/bubbles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/effects/deep_sand_footprints.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/effects/deep_sand_footprints.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 2
 
-$(EVENTOBJGFXDIR)/effects/ground_impact_dust.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/effects/ground_impact_dust.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 1
 
-$(EVENTOBJGFXDIR)/effects/jump_out_of_ash.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/effects/jump_out_of_ash.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 2
 
-$(EVENTOBJGFXDIR)/effects/long_grass.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/effects/long_grass.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 2
 
-$(EVENTOBJGFXDIR)/effects/mountain_disguise.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/effects/mountain_disguise.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/effects/ripple.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/effects/ripple.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 2
 
-$(EVENTOBJGFXDIR)/effects/sand_disguise_placeholder.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/effects/sand_disguise_placeholder.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/effects/sand_footprints.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/effects/sand_footprints.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 2
 
-$(EVENTOBJGFXDIR)/effects/short_grass.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/effects/short_grass.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 2
 
-$(EVENTOBJGFXDIR)/effects/surf_blob.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/effects/surf_blob.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 4 -mheight 4
 
-$(EVENTOBJGFXDIR)/effects/tall_grass.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/effects/tall_grass.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 2
 
-$(EVENTOBJGFXDIR)/effects/tree_disguise.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/effects/tree_disguise.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(EVENTOBJGFXDIR)/effects/unknown_16.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/effects/unknown_16.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 2
 
-$(EVENTOBJGFXDIR)/effects/unknown_17.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/effects/unknown_17.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 2
 
-$(EVENTOBJGFXDIR)/effects/unknown_18.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/effects/unknown_18.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 2
 
-$(EVENTOBJGFXDIR)/effects/unknown_19.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/effects/unknown_19.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 2
 
-$(EVENTOBJGFXDIR)/effects/unknown_20.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/effects/unknown_20.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 2
 
-$(EVENTOBJGFXDIR)/effects/unknown_29.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/effects/unknown_29.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 1
 
-$(EVENTOBJGFXDIR)/effects/unknown_33.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/effects/unknown_33.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 2
 
-$(EVENTOBJGFXDIR)/effects/unknown_35.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/effects/unknown_35.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 2
 
-$(EVENTOBJGFXDIR)/effects/unused_grass.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/effects/unused_grass.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 2
diff --git a/src/battle_transition.c b/src/battle_transition.c
index df1d7b02b..0e719115f 100644
--- a/src/battle_transition.c
+++ b/src/battle_transition.c
@@ -817,7 +817,7 @@ static const struct SpriteTemplate sSpriteTemplate_85C8EBC =
     .callback = sub_8148380
 };
 
-static const u16 gFieldEffectObjectPalette10[] = INCBIN_U16("graphics/event_objects/palettes/field_effect_object_palette_10.gbapal");
+static const u16 gFieldEffectObjectPalette10[] = INCBIN_U16("graphics/object_events/palettes/field_effect_object_palette_10.gbapal");
 
 const struct SpritePalette gFieldEffectObjectPaletteInfo10 =
 {
diff --git a/src/data/event_object/event_object_graphics.h b/src/data/event_object/event_object_graphics.h
deleted file mode 100755
index 28d62262d..000000000
--- a/src/data/event_object/event_object_graphics.h
+++ /dev/null
@@ -1,362 +0,0 @@
-const u32 gObjectEventPic_BrendanNormal[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/walking.4bpp");
-const u32 gObjectEventPic_BrendanRunning[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/running.4bpp");
-const u16 gObjectEventPalette8[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_08.gbapal");
-const u32 gObjectEventPic_RubySapphireBrendanNormal[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_brendan/walking.4bpp");
-const u32 gObjectEventPic_RubySapphireBrendanRunning[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_brendan/running.4bpp");
-const u16 gObjectEventPalette33[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_33.gbapal");
-const u16 NullPalette_8499A38[16] = {};
-const u16 NullPalette_8499A58[16] = {};
-const u16 NullPalette_8499A78[16] = {};
-const u16 NullPalette_8499A98[16] = {};
-const u16 NullPalette_8499AB8[16] = {};
-const u16 NullPalette_8499AD8[16] = {};
-const u16 NullPalette_8499AF8[16] = {};
-const u16 NullPalette_8499B18[16] = {};
-const u16 NullPalette_8499B38[16] = {};
-const u16 NullPalette_8499B58[16] = {};
-const u16 NullPalette_8499B78[16] = {};
-const u16 NullPalette_8499B98[16] = {};
-const u16 NullPalette_8499BB8[16] = {};
-const u16 NullPalette_8499BD8[16] = {};
-const u16 NullPalette_8499BF8[16] = {};
-const u16 gObjectEventPalette9[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_09.gbapal");
-const u16 gObjectEventPalette10[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_10.gbapal");
-const u32 gObjectEventPic_BrendanFieldMove[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/field_move.4bpp");
-const u32 gObjectEventPic_BrendanSurfing[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/surfing.4bpp");
-const u32 gObjectEventPic_BrendanMachBike[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/mach_bike.4bpp");
-const u32 gObjectEventPic_BrendanAcroBike[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike.4bpp");
-const u32 gObjectEventPic_BrendanFishing[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/fishing.4bpp");
-const u32 gObjectEventPic_BrendanWatering[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/watering.4bpp");
-const u32 gObjectEventPic_BrendanDecorating[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/decorating.4bpp");
-const u32 gObjectEventPic_MayDecorating[] = INCBIN_U32("graphics/event_objects/pics/people/may/decorating.4bpp");
-const u32 gObjectEventPic_BrendanUnderwater[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/underwater.4bpp");
-const u32 gObjectEventPic_MayUnderwater[] = INCBIN_U32("graphics/event_objects/pics/people/may/underwater.4bpp");
-const u16 gObjectEventPalette11[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_11.gbapal");
-const u32 gObjectEventPic_MayNormal[] = INCBIN_U32("graphics/event_objects/pics/people/may/walking.4bpp");
-const u32 gObjectEventPic_MayRunning[] = INCBIN_U32("graphics/event_objects/pics/people/may/running.4bpp");
-const u16 gObjectEventPalette17[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_17.gbapal");
-const u16 gObjectEventPalette18[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_18.gbapal");
-const u32 gObjectEventPic_RubySapphireMayNormal[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_may/walking.4bpp");
-const u32 gObjectEventPic_RubySapphireMayRunning[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_may/running.4bpp");
-const u16 gObjectEventPalette34[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_34.gbapal");
-const u16 gUnusedObjectEventPalette[] = INCBIN_U16("graphics/event_objects/palettes/unused_palette.gbapal");
-const u16 NullPalette_84A54F8[16] = {};
-const u16 NullPalette_84A5518[16] = {};
-const u16 NullPalette_84A5538[16] = {};
-const u16 NullPalette_84A5558[16] = {};
-const u16 NullPalette_84A5578[16] = {};
-const u16 NullPalette_84A5598[16] = {};
-const u16 NullPalette_84A55B8[16] = {};
-const u16 NullPalette_84A55D8[16] = {};
-const u16 NullPalette_84A55F8[16] = {};
-const u16 NullPalette_84A5618[16] = {};
-const u16 NullPalette_84A5638[16] = {};
-const u16 NullPalette_84A5658[16] = {};
-const u16 NullPalette_84A5678[16] = {};
-const u16 NullPalette_84A5698[16] = {};
-const u32 gObjectEventPic_MayMachBike[] = INCBIN_U32("graphics/event_objects/pics/people/may/mach_bike.4bpp");
-const u32 gObjectEventPic_MayAcroBike[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike.4bpp");
-const u32 gObjectEventPic_MaySurfing[] = INCBIN_U32("graphics/event_objects/pics/people/may/surfing.4bpp");
-const u32 gObjectEventPic_MayFieldMove[] = INCBIN_U32("graphics/event_objects/pics/people/may/field_move.4bpp");
-const u32 gObjectEventPic_MayFishing[] = INCBIN_U32("graphics/event_objects/pics/people/may/fishing.4bpp");
-const u32 gObjectEventPic_MayWatering[] = INCBIN_U32("graphics/event_objects/pics/people/may/watering.4bpp");
-const u16 gObjectEventPalette0[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_00.gbapal");
-const u16 gObjectEventPalette1[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_01.gbapal");
-const u16 gObjectEventPalette2[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_02.gbapal");
-const u16 gObjectEventPalette3[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_03.gbapal");
-const u16 gObjectEventPalette4[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_04.gbapal");
-const u16 gObjectEventPalette5[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_05.gbapal");
-const u16 gObjectEventPalette6[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_06.gbapal");
-const u16 gObjectEventPalette7[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_07.gbapal");
-const u32 gObjectEventPic_NinjaBoy[] = INCBIN_U32("graphics/event_objects/pics/people/ninja_boy.4bpp");
-const u32 gObjectEventPic_Twin[] = INCBIN_U32("graphics/event_objects/pics/people/twin.4bpp");
-const u32 gObjectEventPic_Boy1[] = INCBIN_U32("graphics/event_objects/pics/people/boy_1.4bpp");
-const u32 gObjectEventPic_Girl1[] = INCBIN_U32("graphics/event_objects/pics/people/girl_1.4bpp");
-const u32 gObjectEventPic_Boy2[] = INCBIN_U32("graphics/event_objects/pics/people/boy_2.4bpp");
-const u32 gObjectEventPic_Girl2[] = INCBIN_U32("graphics/event_objects/pics/people/girl_2.4bpp");
-const u32 gObjectEventPic_LittleBoy[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy.4bpp");
-const u32 gObjectEventPic_LittleGirl[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl.4bpp");
-const u32 gObjectEventPic_Boy3[] = INCBIN_U32("graphics/event_objects/pics/people/boy_3.4bpp");
-const u32 gObjectEventPic_Girl3[] = INCBIN_U32("graphics/event_objects/pics/people/girl_3.4bpp");
-const u32 gObjectEventPic_RichBoy[] = INCBIN_U32("graphics/event_objects/pics/people/rich_boy.4bpp");
-const u32 gObjectEventPic_Woman1[] = INCBIN_U32("graphics/event_objects/pics/people/woman_1.4bpp");
-const u32 gObjectEventPic_FatMan[] = INCBIN_U32("graphics/event_objects/pics/people/fat_man.4bpp");
-const u32 gObjectEventPic_PokefanF[] = INCBIN_U32("graphics/event_objects/pics/people/pokefan_f.4bpp");
-const u32 gObjectEventPic_Man1[] = INCBIN_U32("graphics/event_objects/pics/people/man_1.4bpp");
-const u32 gObjectEventPic_Woman2[] = INCBIN_U32("graphics/event_objects/pics/people/woman_2.4bpp");
-const u32 gObjectEventPic_ExpertM[] = INCBIN_U32("graphics/event_objects/pics/people/expert_m.4bpp");
-const u32 gObjectEventPic_ExpertF[] = INCBIN_U32("graphics/event_objects/pics/people/expert_f.4bpp");
-const u32 gObjectEventPic_Man2[] = INCBIN_U32("graphics/event_objects/pics/people/man_2.4bpp");
-const u32 gObjectEventPic_Woman3[] = INCBIN_U32("graphics/event_objects/pics/people/woman_3.4bpp");
-const u32 gObjectEventPic_PokefanM[] = INCBIN_U32("graphics/event_objects/pics/people/pokefan_m.4bpp");
-const u32 gObjectEventPic_Woman4[] = INCBIN_U32("graphics/event_objects/pics/people/woman_4.4bpp");
-const u32 gObjectEventPic_Cook[] = INCBIN_U32("graphics/event_objects/pics/people/cook.4bpp");
-const u32 gObjectEventPic_LinkReceptionist[] = INCBIN_U32("graphics/event_objects/pics/people/link_receptionist.4bpp");
-const u32 gObjectEventPic_OldMan[] = INCBIN_U32("graphics/event_objects/pics/people/old_man.4bpp");
-const u32 gObjectEventPic_OldWoman[] = INCBIN_U32("graphics/event_objects/pics/people/old_woman.4bpp");
-const u32 gObjectEventPic_Camper[] = INCBIN_U32("graphics/event_objects/pics/people/camper.4bpp");
-const u32 gObjectEventPic_Picnicker[] = INCBIN_U32("graphics/event_objects/pics/people/picnicker.4bpp");
-const u32 gObjectEventPic_Man3[] = INCBIN_U32("graphics/event_objects/pics/people/man_3.4bpp");
-const u32 gObjectEventPic_Woman5[] = INCBIN_U32("graphics/event_objects/pics/people/woman_5.4bpp");
-const u32 gObjectEventPic_Youngster[] = INCBIN_U32("graphics/event_objects/pics/people/youngster.4bpp");
-const u32 gObjectEventPic_BugCatcher[] = INCBIN_U32("graphics/event_objects/pics/people/bug_catcher.4bpp");
-const u32 gObjectEventPic_PsychicM[] = INCBIN_U32("graphics/event_objects/pics/people/psychic_m.4bpp");
-const u32 gObjectEventPic_SchoolKidM[] = INCBIN_U32("graphics/event_objects/pics/people/school_kid_m.4bpp");
-const u32 gObjectEventPic_Maniac[] = INCBIN_U32("graphics/event_objects/pics/people/maniac.4bpp");
-const u32 gObjectEventPic_HexManiac[] = INCBIN_U32("graphics/event_objects/pics/people/hex_maniac.4bpp");
-const u32 gObjectEventPic_UnusedWoman[] = INCBIN_U32("graphics/event_objects/pics/people/unused_woman.4bpp");
-const u32 gObjectEventPic_SwimmerM[] = INCBIN_U32("graphics/event_objects/pics/people/swimmer_m.4bpp");
-const u32 gObjectEventPic_SwimmerF[] = INCBIN_U32("graphics/event_objects/pics/people/swimmer_f.4bpp");
-const u32 gObjectEventPic_BlackBelt[] = INCBIN_U32("graphics/event_objects/pics/people/black_belt.4bpp");
-const u32 gObjectEventPic_Beauty[] = INCBIN_U32("graphics/event_objects/pics/people/beauty.4bpp");
-const u32 gObjectEventPic_Scientist1[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_1.4bpp");
-const u32 gObjectEventPic_Lass[] = INCBIN_U32("graphics/event_objects/pics/people/lass.4bpp");
-const u32 gObjectEventPic_Gentleman[] = INCBIN_U32("graphics/event_objects/pics/people/gentleman.4bpp");
-const u32 gObjectEventPic_Sailor[] = INCBIN_U32("graphics/event_objects/pics/people/sailor.4bpp");
-const u32 gObjectEventPic_Fisherman[] = INCBIN_U32("graphics/event_objects/pics/people/fisherman.4bpp");
-const u32 gObjectEventPic_RunningTriathleteM[] = INCBIN_U32("graphics/event_objects/pics/people/running_triathlete_m.4bpp");
-const u32 gObjectEventPic_RunningTriathleteF[] = INCBIN_U32("graphics/event_objects/pics/people/running_triathlete_f.4bpp");
-const u32 gObjectEventPic_TuberF[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_f.4bpp");
-const u32 gObjectEventPic_TuberM[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m.4bpp");
-const u32 gObjectEventPic_Hiker[] = INCBIN_U32("graphics/event_objects/pics/people/hiker.4bpp");
-const u32 gObjectEventPic_CyclingTriathleteM[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_m.4bpp");
-const u32 gObjectEventPic_CyclingTriathleteF[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_f.4bpp");
-const u32 gObjectEventPic_Man4[] = INCBIN_U32("graphics/event_objects/pics/people/man_4.4bpp");
-const u32 gObjectEventPic_Man5[] = INCBIN_U32("graphics/event_objects/pics/people/man_5.4bpp");
-const u32 gObjectEventPic_Nurse[] = INCBIN_U32("graphics/event_objects/pics/people/nurse.4bpp");
-const u32 gObjectEventPic_ItemBall[] = INCBIN_U32("graphics/event_objects/pics/misc/item_ball.4bpp");
-const u32 gObjectEventPic_ProfBirch[] = INCBIN_U32("graphics/event_objects/pics/people/prof_birch.4bpp");
-const u32 gObjectEventPic_ReporterM[] = INCBIN_U32("graphics/event_objects/pics/people/reporter_m.4bpp");
-const u32 gObjectEventPic_ReporterF[] = INCBIN_U32("graphics/event_objects/pics/people/reporter_f.4bpp");
-const u32 gObjectEventPic_MauvilleOldMan1[] = INCBIN_U32("graphics/event_objects/pics/people/mauville_old_man_1.4bpp");
-const u32 gObjectEventPic_MauvilleOldMan2[] = INCBIN_U32("graphics/event_objects/pics/people/mauville_old_man_2.4bpp");
-const u32 gObjectEventPic_MartEmployee[] = INCBIN_U32("graphics/event_objects/pics/people/mart_employee.4bpp");
-const u32 gObjectEventPic_RooftopSaleWoman[] = INCBIN_U32("graphics/event_objects/pics/people/rooftop_sale_woman.4bpp");
-const u32 gObjectEventPic_Teala[] = INCBIN_U32("graphics/event_objects/pics/people/teala.4bpp");
-const u32 gObjectEventPic_Artist[] = INCBIN_U32("graphics/event_objects/pics/people/artist.4bpp");
-const u32 gObjectEventPic_Cameraman[] = INCBIN_U32("graphics/event_objects/pics/people/cameraman.4bpp");
-const u32 gObjectEventPic_Scientist2[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_2.4bpp");
-const u32 gObjectEventPic_DevonEmployee[] = INCBIN_U32("graphics/event_objects/pics/people/devon_employee.4bpp");
-const u32 gObjectEventPic_AquaMemberM[] = INCBIN_U32("graphics/event_objects/pics/people/team_aqua/aqua_member_m.4bpp");
-const u32 gObjectEventPic_AquaMemberF[] = INCBIN_U32("graphics/event_objects/pics/people/team_aqua/aqua_member_f.4bpp");
-const u32 gObjectEventPic_MagmaMemberM[] = INCBIN_U32("graphics/event_objects/pics/people/team_magma/magma_member_m.4bpp");
-const u32 gObjectEventPic_MagmaMemberF[] = INCBIN_U32("graphics/event_objects/pics/people/team_magma/magma_member_f.4bpp");
-const u32 gObjectEventPic_Sidney[] = INCBIN_U32("graphics/event_objects/pics/people/elite_four/sidney.4bpp");
-const u32 gObjectEventPic_Phoebe[] = INCBIN_U32("graphics/event_objects/pics/people/elite_four/phoebe.4bpp");
-const u32 gObjectEventPic_Glacia[] = INCBIN_U32("graphics/event_objects/pics/people/elite_four/glacia.4bpp");
-const u32 gObjectEventPic_Drake[] = INCBIN_U32("graphics/event_objects/pics/people/elite_four/drake.4bpp");
-const u32 gObjectEventPic_Roxanne[] = INCBIN_U32("graphics/event_objects/pics/people/gym_leaders/roxanne.4bpp");
-const u32 gObjectEventPic_Brawly[] = INCBIN_U32("graphics/event_objects/pics/people/gym_leaders/brawly.4bpp");
-const u32 gObjectEventPic_Wattson[] = INCBIN_U32("graphics/event_objects/pics/people/gym_leaders/wattson.4bpp");
-const u32 gObjectEventPic_Flannery[] = INCBIN_U32("graphics/event_objects/pics/people/gym_leaders/flannery.4bpp");
-const u32 gObjectEventPic_Norman[] = INCBIN_U32("graphics/event_objects/pics/people/gym_leaders/norman.4bpp");
-const u32 gObjectEventPic_Winona[] = INCBIN_U32("graphics/event_objects/pics/people/gym_leaders/winona.4bpp");
-const u32 gObjectEventPic_Liza[] = INCBIN_U32("graphics/event_objects/pics/people/gym_leaders/liza.4bpp");
-const u32 gObjectEventPic_Tate[] = INCBIN_U32("graphics/event_objects/pics/people/gym_leaders/tate.4bpp");
-const u32 gObjectEventPic_Wallace[] = INCBIN_U32("graphics/event_objects/pics/people/wallace.4bpp");
-const u32 gObjectEventPic_Steven[] = INCBIN_U32("graphics/event_objects/pics/people/steven.4bpp");
-const u32 gObjectEventPic_Wally[] = INCBIN_U32("graphics/event_objects/pics/people/wally.4bpp");
-const u32 gObjectEventPic_RubySapphireLittleBoy[] = INCBIN_U32("graphics/event_objects/pics/people/rs_little_boy.4bpp");
-const u32 gObjectEventPic_HotSpringsOldWoman[] = INCBIN_U32("graphics/event_objects/pics/people/hot_springs_old_woman.4bpp");
-const u32 gObjectEventPic_LatiasLatios[] = INCBIN_U32("graphics/event_objects/pics/pokemon/latias_latios.4bpp");
-const u32 gObjectEventPic_GameboyKid[] = INCBIN_U32("graphics/event_objects/pics/people/gameboy_kid.4bpp");
-const u32 gObjectEventPic_ContestJudge[] = INCBIN_U32("graphics/event_objects/pics/people/contest_judge.4bpp");
-const u32 gObjectEventPic_Archie[] = INCBIN_U32("graphics/event_objects/pics/people/team_aqua/archie.4bpp");
-const u32 gObjectEventPic_Maxie[] = INCBIN_U32("graphics/event_objects/pics/people/team_magma/maxie.4bpp");
-const u32 gObjectEventPic_Kyogre[] = INCBIN_U32("graphics/event_objects/pics/pokemon/kyogre.4bpp");
-const u32 gObjectEventPic_Groudon[] = INCBIN_U32("graphics/event_objects/pics/pokemon/groudon.4bpp");
-const u32 gObjectEventPic_Regi[] = INCBIN_U32("graphics/event_objects/pics/pokemon/regi.4bpp");
-const u32 gObjectEventPic_Skitty[] = INCBIN_U32("graphics/event_objects/pics/pokemon/skitty.4bpp");
-const u32 gObjectEventPic_Kecleon[] = INCBIN_U32("graphics/event_objects/pics/pokemon/kecleon.4bpp");
-const u32 gObjectEventPic_Rayquaza[] = INCBIN_U32("graphics/event_objects/pics/pokemon/rayquaza.4bpp");
-const u32 gObjectEventPic_RayquazaStill[] = INCBIN_U32("graphics/event_objects/pics/pokemon/rayquaza_still.4bpp");
-const u32 gObjectEventPic_Zigzagoon[] = INCBIN_U32("graphics/event_objects/pics/pokemon/zigzagoon.4bpp");
-const u32 gObjectEventPic_Pikachu[] = INCBIN_U32("graphics/event_objects/pics/pokemon/pikachu.4bpp");
-const u32 gObjectEventPic_Azumarill[] = INCBIN_U32("graphics/event_objects/pics/pokemon/azumarill.4bpp");
-const u32 gObjectEventPic_Wingull[] = INCBIN_U32("graphics/event_objects/pics/pokemon/wingull.4bpp");
-const u32 gObjectEventPic_TuberMSwimming[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m_swimming.4bpp");
-const u32 gObjectEventPic_Azurill[] = INCBIN_U32("graphics/event_objects/pics/pokemon/azurill.4bpp");
-const u32 gObjectEventPic_Mom[] = INCBIN_U32("graphics/event_objects/pics/people/mom.4bpp");
-const u16 gObjectEventPalette22[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_22.gbapal");
-const u16 gObjectEventPalette23[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_23.gbapal");
-const u16 gObjectEventPalette24[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_24.gbapal");
-const u16 gObjectEventPalette25[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_25.gbapal");
-const u32 gObjectEventPic_UnusedNatuDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/unused_natu_doll.4bpp");
-const u32 gObjectEventPic_UnusedMagnemiteDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/unused_magnemite_doll.4bpp");
-const u32 gObjectEventPic_UnusedSquirtleDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/unused_squirtle_doll.4bpp");
-const u32 gObjectEventPic_UnusedWooperDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/unused_wooper_doll.4bpp");
-const u32 gObjectEventPic_UnusedPikachuDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/unused_pikachu_doll.4bpp");
-const u32 gObjectEventPic_UnusedPorygon2Doll[] = INCBIN_U32("graphics/event_objects/pics/dolls/unused_porygon2_doll.4bpp");
-const u32 gObjectEventPic_PichuDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/pichu_doll.4bpp");
-const u32 gObjectEventPic_PikachuDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/pikachu_doll.4bpp");
-const u32 gObjectEventPic_MarillDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/marill_doll.4bpp");
-const u32 gObjectEventPic_TogepiDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/togepi_doll.4bpp");
-const u32 gObjectEventPic_CyndaquilDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/cyndaquil_doll.4bpp");
-const u32 gObjectEventPic_ChikoritaDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/chikorita_doll.4bpp");
-const u32 gObjectEventPic_TotodileDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/totodile_doll.4bpp");
-const u32 gObjectEventPic_JigglypuffDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/jigglypuff_doll.4bpp");
-const u32 gObjectEventPic_MeowthDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/meowth_doll.4bpp");
-const u32 gObjectEventPic_ClefairyDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/clefairy_doll.4bpp");
-const u32 gObjectEventPic_DittoDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/ditto_doll.4bpp");
-const u32 gObjectEventPic_SmoochumDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/smoochum_doll.4bpp");
-const u32 gObjectEventPic_TreeckoDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/treecko_doll.4bpp");
-const u32 gObjectEventPic_TorchicDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/torchic_doll.4bpp");
-const u32 gObjectEventPic_MudkipDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/mudkip_doll.4bpp");
-const u32 gObjectEventPic_DuskullDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/duskull_doll.4bpp");
-const u32 gObjectEventPic_WynautDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/wynaut_doll.4bpp");
-const u32 gObjectEventPic_BaltoyDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/baltoy_doll.4bpp");
-const u32 gObjectEventPic_KecleonDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/kecleon_doll.4bpp");
-const u32 gObjectEventPic_AzurillDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/azurill_doll.4bpp");
-const u32 gObjectEventPic_SkittyDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/skitty_doll.4bpp");
-const u32 gObjectEventPic_SwabluDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/swablu_doll.4bpp");
-const u32 gObjectEventPic_GulpinDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/gulpin_doll.4bpp");
-const u32 gObjectEventPic_LotadDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/lotad_doll.4bpp");
-const u32 gObjectEventPic_SeedotDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/seedot_doll.4bpp");
-const u32 gObjectEventPic_PikaCushion[] = INCBIN_U32("graphics/event_objects/pics/cushions/pika_cushion.4bpp");
-const u32 gObjectEventPic_RoundCushion[] = INCBIN_U32("graphics/event_objects/pics/cushions/round_cushion.4bpp");
-const u32 gObjectEventPic_KissCushion[] = INCBIN_U32("graphics/event_objects/pics/cushions/kiss_cushion.4bpp");
-const u32 gObjectEventPic_ZigzagCushion[] = INCBIN_U32("graphics/event_objects/pics/cushions/zigzag_cushion.4bpp");
-const u32 gObjectEventPic_SpinCushion[] = INCBIN_U32("graphics/event_objects/pics/cushions/spin_cushion.4bpp");
-const u32 gObjectEventPic_DiamondCushion[] = INCBIN_U32("graphics/event_objects/pics/cushions/diamond_cushion.4bpp");
-const u32 gObjectEventPic_BallCushion[] = INCBIN_U32("graphics/event_objects/pics/cushions/ball_cushion.4bpp");
-const u32 gObjectEventPic_GrassCushion[] = INCBIN_U32("graphics/event_objects/pics/cushions/grass_cushion.4bpp");
-const u32 gObjectEventPic_FireCushion[] = INCBIN_U32("graphics/event_objects/pics/cushions/fire_cushion.4bpp");
-const u32 gObjectEventPic_WaterCushion[] = INCBIN_U32("graphics/event_objects/pics/cushions/water_cushion.4bpp");
-const u32 gObjectEventPic_BigSnorlaxDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_snorlax_doll.4bpp");
-const u32 gObjectEventPic_BigRhydonDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_rhydon_doll.4bpp");
-const u32 gObjectEventPic_BigLaprasDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_lapras_doll.4bpp");
-const u32 gObjectEventPic_BigVenusaurDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_venusaur_doll.4bpp");
-const u32 gObjectEventPic_BigCharizardDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_charizard_doll.4bpp");
-const u32 gObjectEventPic_BigBlastoiseDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_blastoise_doll.4bpp");
-const u32 gObjectEventPic_BigWailmerDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_wailmer_doll.4bpp");
-const u32 gObjectEventPic_BigRegirockDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_regirock_doll.4bpp");
-const u32 gObjectEventPic_BigRegiceDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_regice_doll.4bpp");
-const u32 gObjectEventPic_BigRegisteelDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_registeel_doll.4bpp");
-const u32 gObjectEventPic_CuttableTree[] = INCBIN_U32("graphics/event_objects/pics/misc/cuttable_tree.4bpp");
-const u32 gObjectEventPic_BreakableRock[] = INCBIN_U32("graphics/event_objects/pics/misc/breakable_rock.4bpp");
-const u32 gObjectEventPic_PushableBoulder[] = INCBIN_U32("graphics/event_objects/pics/misc/pushable_boulder.4bpp");
-const u32 gObjectEventPic_MrBrineysBoat[] = INCBIN_U32("graphics/event_objects/pics/misc/mr_brineys_boat.4bpp");
-const u32 gObjectEventPic_Fossil[] = INCBIN_U32("graphics/event_objects/pics/misc/fossil.4bpp");
-const u32 gObjectEventPic_SubmarineShadow[] = INCBIN_U32("graphics/event_objects/pics/misc/submarine_shadow.4bpp");
-const u16 gObjectEventPalette26[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_26.gbapal");
-const u32 gObjectEventPic_Truck[] = INCBIN_U32("graphics/event_objects/pics/misc/truck.4bpp");
-const u16 gObjectEventPalette14[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_14.gbapal");
-const u32 gObjectEventPic_Vigoroth[] = INCBIN_U32("graphics/event_objects/pics/pokemon/vigoroth.4bpp");
-const u16 gObjectEventPalette15[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_15.gbapal");
-const u32 gObjectEventPic_BirchsBag[] = INCBIN_U32("graphics/event_objects/pics/misc/birchs_bag.4bpp");
-const u32 gObjectEventPic_EnemyZigzagoon[] = INCBIN_U32("graphics/event_objects/pics/pokemon/enemy_zigzagoon.4bpp");
-const u16 gObjectEventPalette16[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_16.gbapal");
-const u32 gObjectEventPic_Poochyena[] = INCBIN_U32("graphics/event_objects/pics/pokemon/poochyena.4bpp");
-const u16 gObjectEventPalette27[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_27.gbapal");
-const u32 gObjectEventPic_CableCar[] = INCBIN_U32("graphics/event_objects/pics/misc/cable_car.4bpp");
-const u16 gObjectEventPalette20[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_20.gbapal");
-const u32 gObjectEventPic_SSTidal[] = INCBIN_U32("graphics/event_objects/pics/misc/ss_tidal.4bpp");
-const u16 gObjectEventPalette21[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_21.gbapal");
-const u32 gFieldEffectObjectPic_BerryTreeGrowthSparkle[] = INCBIN_U32("graphics/event_objects/pics/effects/berry_tree_growth_sparkle.4bpp");
-const u32 gObjectEventPic_BerryTreeDirtPile[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/dirt_pile.4bpp");
-const u32 gObjectEventPic_BerryTreeSprout[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/sprout.4bpp");
-const u32 gObjectEventPic_PechaBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pecha.4bpp");
-const u32 gObjectEventPic_KelpsyBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/kelpsy.4bpp");
-const u32 gObjectEventPic_WepearBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/wepear.4bpp");
-const u32 gObjectEventPic_IapapaBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/iapapa.4bpp");
-const u32 gObjectEventPic_CheriBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/cheri.4bpp");
-const u32 gObjectEventPic_FigyBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/figy.4bpp");
-const u32 gObjectEventPic_MagoBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/mago.4bpp");
-const u32 gObjectEventPic_LumBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/lum.4bpp");
-const u32 gObjectEventPic_RazzBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/razz.4bpp");
-const u32 gObjectEventPic_GrepaBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/grepa.4bpp");
-const u32 gObjectEventPic_RabutaBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/rabuta.4bpp");
-const u32 gObjectEventPic_NomelBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/nomel.4bpp");
-const u32 gObjectEventPic_LeppaBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/leppa.4bpp");
-const u32 gObjectEventPic_LiechiBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/liechi.4bpp");
-const u32 gObjectEventPic_HondewBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/hondew.4bpp");
-const u32 gObjectEventPic_AguavBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/aguav.4bpp");
-const u32 gObjectEventPic_WikiBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/wiki.4bpp");
-const u32 gObjectEventPic_PomegBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pomeg.4bpp");
-const u32 gObjectEventPic_RawstBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/rawst.4bpp");
-const u32 gObjectEventPic_SpelonBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/spelon.4bpp");
-const u32 gObjectEventPic_ChestoBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/chesto.4bpp");
-const u32 gObjectEventPic_OranBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/oran.4bpp");
-const u32 gObjectEventPic_PersimBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/persim.4bpp");
-const u32 gObjectEventPic_SitrusBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/sitrus.4bpp");
-const u32 gObjectEventPic_AspearBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/aspear.4bpp");
-const u32 gObjectEventPic_PamtreBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pamtre.4bpp");
-const u32 gObjectEventPic_CornnBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/cornn.4bpp");
-const u32 gObjectEventPic_LansatBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/lansat.4bpp");
-const u32 gObjectEventPic_DurinBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/durin.4bpp");
-const u32 gObjectEventPic_TamatoBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/tamato.4bpp");
-const u32 gFieldEffectObjectPic_SurfBlob[] = INCBIN_U32("graphics/event_objects/pics/effects/surf_blob.4bpp");
-const u32 gObjectEventPic_QuintyPlump[] = INCBIN_U32("graphics/event_objects/pics/people/quinty_plump.4bpp");
-const u16 gObjectEventPalette12[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_12.gbapal");
-const u16 gObjectEventPalette13[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_13.gbapal");
-const u32 gFieldEffectObjectPic_ShadowSmall[] = INCBIN_U32("graphics/event_objects/pics/effects/shadow_small.4bpp");
-const u32 gFieldEffectObjectPic_ShadowMedium[] = INCBIN_U32("graphics/event_objects/pics/effects/shadow_medium.4bpp");
-const u32 gFieldEffectObjectPic_ShadowLarge[] = INCBIN_U32("graphics/event_objects/pics/effects/shadow_large.4bpp");
-const u32 gFieldEffectObjectPic_ShadowExtraLarge[] = INCBIN_U32("graphics/event_objects/pics/effects/shadow_extra_large.4bpp");
-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[] = 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.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[] = INCBIN_U32("graphics/event_objects/pics/effects/ground_impact_dust.4bpp");
-const u32 gFieldEffectObjectPic_BikeHopTallGrass[] = INCBIN_U32("graphics/event_objects/pics/effects/bike_hop_tall_grass.4bpp");
-const u32 gUnusedGrass[] = INCBIN_U32("graphics/event_objects/pics/effects/unused_grass.4bpp");
-const u32 gFieldEffectObjectPic_Unknown16[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_16.4bpp");
-const u32 gFieldEffectObjectPic_Unknown17[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_17.4bpp");
-const u32 gFieldEffectObjectPic_Unknown18[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_18.4bpp");
-const u32 gFieldEffectObjectPic_LongGrass[] = INCBIN_U32("graphics/event_objects/pics/effects/long_grass.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[] = INCBIN_U32("graphics/event_objects/pics/effects/sand_footprints.4bpp");
-const u32 gFieldEffectObjectPic_DeepSandFootprints[] = INCBIN_U32("graphics/event_objects/pics/effects/deep_sand_footprints.4bpp");
-const u32 gFieldEffectObjectPic_BikeTireTracks[] = INCBIN_U32("graphics/event_objects/pics/effects/bike_tire_tracks.4bpp");
-const u32 gFieldEffectObjectPic_Unknown19[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_19.4bpp");
-const u32 gFieldEffectObjectPic_Unknown29[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_29.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[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_20.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[] = INCBIN_U32("graphics/event_objects/pics/effects/jump_out_of_ash.4bpp");
-const u32 gFieldEffectObjectPic_Unknown33[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_33.4bpp");
-const u32 gFieldEffectObjectPic_Bubbles[] = INCBIN_U32("graphics/event_objects/pics/effects/bubbles.4bpp");
-const u32 gFieldEffectObjectPic_Unknown35[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_35.4bpp");
-const u16 gFieldEffectObjectPalette3[] = INCBIN_U16("graphics/event_objects/palettes/field_effect_object_palette_03.gbapal");
-const u32 gFieldEffectObjectPic_Bird[] = INCBIN_U32("graphics/event_objects/pics/effects/bird.4bpp");
-const u32 gObjectEventPic_Juan[] = INCBIN_U32("graphics/event_objects/pics/people/gym_leaders/juan.4bpp");
-const u32 gObjectEventPic_Scott[] = INCBIN_U32("graphics/event_objects/pics/people/scott.4bpp");
-const u32 gObjectEventPic_Statue[] = INCBIN_U32("graphics/event_objects/pics/misc/statue.4bpp");
-const u32 gObjectEventPic_Kirlia[] = INCBIN_U32("graphics/event_objects/pics/pokemon/kirlia.4bpp");
-const u32 gObjectEventPic_Dusclops[] = INCBIN_U32("graphics/event_objects/pics/pokemon/dusclops.4bpp");
-const u32 gObjectEventPic_MysteryEventDeliveryman[] = INCBIN_U32("graphics/event_objects/pics/people/mystery_event_deliveryman.4bpp");
-const u32 gObjectEventPic_UnionRoomAttendant[] = INCBIN_U32("graphics/event_objects/pics/people/union_room_attendant.4bpp");
-const u32 gObjectEventPic_MovingBox[] = INCBIN_U32("graphics/event_objects/pics/misc/moving_box.4bpp");
-const u16 gObjectEventPalette19[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_19.gbapal");
-const u32 gObjectEventPic_Sudowoodo[] = INCBIN_U32("graphics/event_objects/pics/pokemon/sudowoodo.4bpp");
-const u32 gObjectEventPic_Mew[] = INCBIN_U32("graphics/event_objects/pics/pokemon/mew.4bpp");
-const u16 gObjectEventPalette28[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_28.gbapal");
-const u32 gObjectEventPic_Red[] = INCBIN_U32("graphics/event_objects/pics/people/red.4bpp");
-const u32 gObjectEventPic_Leaf[] = INCBIN_U32("graphics/event_objects/pics/people/leaf.4bpp");
-const u16 gObjectEventPalette30[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_30.gbapal");
-const u32 gObjectEventPic_BirthIslandStone[] = INCBIN_U32("graphics/event_objects/pics/misc/birth_island_stone.4bpp");
-const u16 gObjectEventPalette29[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_29.gbapal");
-const u32 gObjectEventPic_Deoxys[] = INCBIN_U32("graphics/event_objects/pics/pokemon/deoxys.4bpp");
-const u32 gObjectEventPic_Anabel[] = INCBIN_U32("graphics/event_objects/pics/people/frontier_brains/anabel.4bpp");
-const u32 gObjectEventPic_Tucker[] = INCBIN_U32("graphics/event_objects/pics/people/frontier_brains/tucker.4bpp");
-const u32 gObjectEventPic_Spenser[] = INCBIN_U32("graphics/event_objects/pics/people/frontier_brains/spenser.4bpp");
-const u32 gObjectEventPic_Greta[] = INCBIN_U32("graphics/event_objects/pics/people/frontier_brains/greta.4bpp");
-const u32 gObjectEventPic_Noland[] = INCBIN_U32("graphics/event_objects/pics/people/frontier_brains/noland.4bpp");
-const u32 gObjectEventPic_Lucy[] = INCBIN_U32("graphics/event_objects/pics/people/frontier_brains/lucy.4bpp");
-const u32 gObjectEventPic_Brandon[] = INCBIN_U32("graphics/event_objects/pics/people/frontier_brains/brandon.4bpp");
-const u32 gObjectEventPic_Lugia[] = INCBIN_U32("graphics/event_objects/pics/pokemon/lugia.4bpp");
-const u16 gObjectEventPalette32[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_32.gbapal");
-const u32 gObjectEventPic_HoOh[] = INCBIN_U32("graphics/event_objects/pics/pokemon/ho_oh.4bpp");
-const u16 gObjectEventPalette31[] = INCBIN_U16("graphics/event_objects/palettes/event_object_palette_31.gbapal");
diff --git a/src/data/event_object/base_oam.h b/src/data/object_event/base_oam.h
index f74feca32..f74feca32 100755
--- a/src/data/event_object/base_oam.h
+++ b/src/data/object_event/base_oam.h
diff --git a/src/data/event_object/berry_tree_graphics_tables.h b/src/data/object_event/berry_tree_graphics_tables.h
index d558b583f..d558b583f 100755
--- a/src/data/event_object/berry_tree_graphics_tables.h
+++ b/src/data/object_event/berry_tree_graphics_tables.h
diff --git a/src/data/event_object/event_object_anims.h b/src/data/object_event/event_object_anims.h
index b319c2845..b319c2845 100755
--- a/src/data/event_object/event_object_anims.h
+++ b/src/data/object_event/event_object_anims.h
diff --git a/src/data/object_event/event_object_graphics.h b/src/data/object_event/event_object_graphics.h
new file mode 100755
index 000000000..764c00ea2
--- /dev/null
+++ b/src/data/object_event/event_object_graphics.h
@@ -0,0 +1,362 @@
+const u32 gObjectEventPic_BrendanNormal[] = INCBIN_U32("graphics/object_events/pics/people/brendan/walking.4bpp");
+const u32 gObjectEventPic_BrendanRunning[] = INCBIN_U32("graphics/object_events/pics/people/brendan/running.4bpp");
+const u16 gObjectEventPalette8[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_08.gbapal");
+const u32 gObjectEventPic_RubySapphireBrendanNormal[] = INCBIN_U32("graphics/object_events/pics/people/ruby_sapphire_brendan/walking.4bpp");
+const u32 gObjectEventPic_RubySapphireBrendanRunning[] = INCBIN_U32("graphics/object_events/pics/people/ruby_sapphire_brendan/running.4bpp");
+const u16 gObjectEventPalette33[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_33.gbapal");
+const u16 NullPalette_8499A38[16] = {};
+const u16 NullPalette_8499A58[16] = {};
+const u16 NullPalette_8499A78[16] = {};
+const u16 NullPalette_8499A98[16] = {};
+const u16 NullPalette_8499AB8[16] = {};
+const u16 NullPalette_8499AD8[16] = {};
+const u16 NullPalette_8499AF8[16] = {};
+const u16 NullPalette_8499B18[16] = {};
+const u16 NullPalette_8499B38[16] = {};
+const u16 NullPalette_8499B58[16] = {};
+const u16 NullPalette_8499B78[16] = {};
+const u16 NullPalette_8499B98[16] = {};
+const u16 NullPalette_8499BB8[16] = {};
+const u16 NullPalette_8499BD8[16] = {};
+const u16 NullPalette_8499BF8[16] = {};
+const u16 gObjectEventPalette9[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_09.gbapal");
+const u16 gObjectEventPalette10[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_10.gbapal");
+const u32 gObjectEventPic_BrendanFieldMove[] = INCBIN_U32("graphics/object_events/pics/people/brendan/field_move.4bpp");
+const u32 gObjectEventPic_BrendanSurfing[] = INCBIN_U32("graphics/object_events/pics/people/brendan/surfing.4bpp");
+const u32 gObjectEventPic_BrendanMachBike[] = INCBIN_U32("graphics/object_events/pics/people/brendan/mach_bike.4bpp");
+const u32 gObjectEventPic_BrendanAcroBike[] = INCBIN_U32("graphics/object_events/pics/people/brendan/acro_bike.4bpp");
+const u32 gObjectEventPic_BrendanFishing[] = INCBIN_U32("graphics/object_events/pics/people/brendan/fishing.4bpp");
+const u32 gObjectEventPic_BrendanWatering[] = INCBIN_U32("graphics/object_events/pics/people/brendan/watering.4bpp");
+const u32 gObjectEventPic_BrendanDecorating[] = INCBIN_U32("graphics/object_events/pics/people/brendan/decorating.4bpp");
+const u32 gObjectEventPic_MayDecorating[] = INCBIN_U32("graphics/object_events/pics/people/may/decorating.4bpp");
+const u32 gObjectEventPic_BrendanUnderwater[] = INCBIN_U32("graphics/object_events/pics/people/brendan/underwater.4bpp");
+const u32 gObjectEventPic_MayUnderwater[] = INCBIN_U32("graphics/object_events/pics/people/may/underwater.4bpp");
+const u16 gObjectEventPalette11[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_11.gbapal");
+const u32 gObjectEventPic_MayNormal[] = INCBIN_U32("graphics/object_events/pics/people/may/walking.4bpp");
+const u32 gObjectEventPic_MayRunning[] = INCBIN_U32("graphics/object_events/pics/people/may/running.4bpp");
+const u16 gObjectEventPalette17[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_17.gbapal");
+const u16 gObjectEventPalette18[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_18.gbapal");
+const u32 gObjectEventPic_RubySapphireMayNormal[] = INCBIN_U32("graphics/object_events/pics/people/ruby_sapphire_may/walking.4bpp");
+const u32 gObjectEventPic_RubySapphireMayRunning[] = INCBIN_U32("graphics/object_events/pics/people/ruby_sapphire_may/running.4bpp");
+const u16 gObjectEventPalette34[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_34.gbapal");
+const u16 gUnusedObjectEventPalette[] = INCBIN_U16("graphics/object_events/palettes/unused_palette.gbapal");
+const u16 NullPalette_84A54F8[16] = {};
+const u16 NullPalette_84A5518[16] = {};
+const u16 NullPalette_84A5538[16] = {};
+const u16 NullPalette_84A5558[16] = {};
+const u16 NullPalette_84A5578[16] = {};
+const u16 NullPalette_84A5598[16] = {};
+const u16 NullPalette_84A55B8[16] = {};
+const u16 NullPalette_84A55D8[16] = {};
+const u16 NullPalette_84A55F8[16] = {};
+const u16 NullPalette_84A5618[16] = {};
+const u16 NullPalette_84A5638[16] = {};
+const u16 NullPalette_84A5658[16] = {};
+const u16 NullPalette_84A5678[16] = {};
+const u16 NullPalette_84A5698[16] = {};
+const u32 gObjectEventPic_MayMachBike[] = INCBIN_U32("graphics/object_events/pics/people/may/mach_bike.4bpp");
+const u32 gObjectEventPic_MayAcroBike[] = INCBIN_U32("graphics/object_events/pics/people/may/acro_bike.4bpp");
+const u32 gObjectEventPic_MaySurfing[] = INCBIN_U32("graphics/object_events/pics/people/may/surfing.4bpp");
+const u32 gObjectEventPic_MayFieldMove[] = INCBIN_U32("graphics/object_events/pics/people/may/field_move.4bpp");
+const u32 gObjectEventPic_MayFishing[] = INCBIN_U32("graphics/object_events/pics/people/may/fishing.4bpp");
+const u32 gObjectEventPic_MayWatering[] = INCBIN_U32("graphics/object_events/pics/people/may/watering.4bpp");
+const u16 gObjectEventPalette0[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_00.gbapal");
+const u16 gObjectEventPalette1[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_01.gbapal");
+const u16 gObjectEventPalette2[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_02.gbapal");
+const u16 gObjectEventPalette3[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_03.gbapal");
+const u16 gObjectEventPalette4[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_04.gbapal");
+const u16 gObjectEventPalette5[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_05.gbapal");
+const u16 gObjectEventPalette6[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_06.gbapal");
+const u16 gObjectEventPalette7[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_07.gbapal");
+const u32 gObjectEventPic_NinjaBoy[] = INCBIN_U32("graphics/object_events/pics/people/ninja_boy.4bpp");
+const u32 gObjectEventPic_Twin[] = INCBIN_U32("graphics/object_events/pics/people/twin.4bpp");
+const u32 gObjectEventPic_Boy1[] = INCBIN_U32("graphics/object_events/pics/people/boy_1.4bpp");
+const u32 gObjectEventPic_Girl1[] = INCBIN_U32("graphics/object_events/pics/people/girl_1.4bpp");
+const u32 gObjectEventPic_Boy2[] = INCBIN_U32("graphics/object_events/pics/people/boy_2.4bpp");
+const u32 gObjectEventPic_Girl2[] = INCBIN_U32("graphics/object_events/pics/people/girl_2.4bpp");
+const u32 gObjectEventPic_LittleBoy[] = INCBIN_U32("graphics/object_events/pics/people/little_boy.4bpp");
+const u32 gObjectEventPic_LittleGirl[] = INCBIN_U32("graphics/object_events/pics/people/little_girl.4bpp");
+const u32 gObjectEventPic_Boy3[] = INCBIN_U32("graphics/object_events/pics/people/boy_3.4bpp");
+const u32 gObjectEventPic_Girl3[] = INCBIN_U32("graphics/object_events/pics/people/girl_3.4bpp");
+const u32 gObjectEventPic_RichBoy[] = INCBIN_U32("graphics/object_events/pics/people/rich_boy.4bpp");
+const u32 gObjectEventPic_Woman1[] = INCBIN_U32("graphics/object_events/pics/people/woman_1.4bpp");
+const u32 gObjectEventPic_FatMan[] = INCBIN_U32("graphics/object_events/pics/people/fat_man.4bpp");
+const u32 gObjectEventPic_PokefanF[] = INCBIN_U32("graphics/object_events/pics/people/pokefan_f.4bpp");
+const u32 gObjectEventPic_Man1[] = INCBIN_U32("graphics/object_events/pics/people/man_1.4bpp");
+const u32 gObjectEventPic_Woman2[] = INCBIN_U32("graphics/object_events/pics/people/woman_2.4bpp");
+const u32 gObjectEventPic_ExpertM[] = INCBIN_U32("graphics/object_events/pics/people/expert_m.4bpp");
+const u32 gObjectEventPic_ExpertF[] = INCBIN_U32("graphics/object_events/pics/people/expert_f.4bpp");
+const u32 gObjectEventPic_Man2[] = INCBIN_U32("graphics/object_events/pics/people/man_2.4bpp");
+const u32 gObjectEventPic_Woman3[] = INCBIN_U32("graphics/object_events/pics/people/woman_3.4bpp");
+const u32 gObjectEventPic_PokefanM[] = INCBIN_U32("graphics/object_events/pics/people/pokefan_m.4bpp");
+const u32 gObjectEventPic_Woman4[] = INCBIN_U32("graphics/object_events/pics/people/woman_4.4bpp");
+const u32 gObjectEventPic_Cook[] = INCBIN_U32("graphics/object_events/pics/people/cook.4bpp");
+const u32 gObjectEventPic_LinkReceptionist[] = INCBIN_U32("graphics/object_events/pics/people/link_receptionist.4bpp");
+const u32 gObjectEventPic_OldMan[] = INCBIN_U32("graphics/object_events/pics/people/old_man.4bpp");
+const u32 gObjectEventPic_OldWoman[] = INCBIN_U32("graphics/object_events/pics/people/old_woman.4bpp");
+const u32 gObjectEventPic_Camper[] = INCBIN_U32("graphics/object_events/pics/people/camper.4bpp");
+const u32 gObjectEventPic_Picnicker[] = INCBIN_U32("graphics/object_events/pics/people/picnicker.4bpp");
+const u32 gObjectEventPic_Man3[] = INCBIN_U32("graphics/object_events/pics/people/man_3.4bpp");
+const u32 gObjectEventPic_Woman5[] = INCBIN_U32("graphics/object_events/pics/people/woman_5.4bpp");
+const u32 gObjectEventPic_Youngster[] = INCBIN_U32("graphics/object_events/pics/people/youngster.4bpp");
+const u32 gObjectEventPic_BugCatcher[] = INCBIN_U32("graphics/object_events/pics/people/bug_catcher.4bpp");
+const u32 gObjectEventPic_PsychicM[] = INCBIN_U32("graphics/object_events/pics/people/psychic_m.4bpp");
+const u32 gObjectEventPic_SchoolKidM[] = INCBIN_U32("graphics/object_events/pics/people/school_kid_m.4bpp");
+const u32 gObjectEventPic_Maniac[] = INCBIN_U32("graphics/object_events/pics/people/maniac.4bpp");
+const u32 gObjectEventPic_HexManiac[] = INCBIN_U32("graphics/object_events/pics/people/hex_maniac.4bpp");
+const u32 gObjectEventPic_UnusedWoman[] = INCBIN_U32("graphics/object_events/pics/people/unused_woman.4bpp");
+const u32 gObjectEventPic_SwimmerM[] = INCBIN_U32("graphics/object_events/pics/people/swimmer_m.4bpp");
+const u32 gObjectEventPic_SwimmerF[] = INCBIN_U32("graphics/object_events/pics/people/swimmer_f.4bpp");
+const u32 gObjectEventPic_BlackBelt[] = INCBIN_U32("graphics/object_events/pics/people/black_belt.4bpp");
+const u32 gObjectEventPic_Beauty[] = INCBIN_U32("graphics/object_events/pics/people/beauty.4bpp");
+const u32 gObjectEventPic_Scientist1[] = INCBIN_U32("graphics/object_events/pics/people/scientist_1.4bpp");
+const u32 gObjectEventPic_Lass[] = INCBIN_U32("graphics/object_events/pics/people/lass.4bpp");
+const u32 gObjectEventPic_Gentleman[] = INCBIN_U32("graphics/object_events/pics/people/gentleman.4bpp");
+const u32 gObjectEventPic_Sailor[] = INCBIN_U32("graphics/object_events/pics/people/sailor.4bpp");
+const u32 gObjectEventPic_Fisherman[] = INCBIN_U32("graphics/object_events/pics/people/fisherman.4bpp");
+const u32 gObjectEventPic_RunningTriathleteM[] = INCBIN_U32("graphics/object_events/pics/people/running_triathlete_m.4bpp");
+const u32 gObjectEventPic_RunningTriathleteF[] = INCBIN_U32("graphics/object_events/pics/people/running_triathlete_f.4bpp");
+const u32 gObjectEventPic_TuberF[] = INCBIN_U32("graphics/object_events/pics/people/tuber_f.4bpp");
+const u32 gObjectEventPic_TuberM[] = INCBIN_U32("graphics/object_events/pics/people/tuber_m.4bpp");
+const u32 gObjectEventPic_Hiker[] = INCBIN_U32("graphics/object_events/pics/people/hiker.4bpp");
+const u32 gObjectEventPic_CyclingTriathleteM[] = INCBIN_U32("graphics/object_events/pics/people/cycling_triathlete_m.4bpp");
+const u32 gObjectEventPic_CyclingTriathleteF[] = INCBIN_U32("graphics/object_events/pics/people/cycling_triathlete_f.4bpp");
+const u32 gObjectEventPic_Man4[] = INCBIN_U32("graphics/object_events/pics/people/man_4.4bpp");
+const u32 gObjectEventPic_Man5[] = INCBIN_U32("graphics/object_events/pics/people/man_5.4bpp");
+const u32 gObjectEventPic_Nurse[] = INCBIN_U32("graphics/object_events/pics/people/nurse.4bpp");
+const u32 gObjectEventPic_ItemBall[] = INCBIN_U32("graphics/object_events/pics/misc/item_ball.4bpp");
+const u32 gObjectEventPic_ProfBirch[] = INCBIN_U32("graphics/object_events/pics/people/prof_birch.4bpp");
+const u32 gObjectEventPic_ReporterM[] = INCBIN_U32("graphics/object_events/pics/people/reporter_m.4bpp");
+const u32 gObjectEventPic_ReporterF[] = INCBIN_U32("graphics/object_events/pics/people/reporter_f.4bpp");
+const u32 gObjectEventPic_MauvilleOldMan1[] = INCBIN_U32("graphics/object_events/pics/people/mauville_old_man_1.4bpp");
+const u32 gObjectEventPic_MauvilleOldMan2[] = INCBIN_U32("graphics/object_events/pics/people/mauville_old_man_2.4bpp");
+const u32 gObjectEventPic_MartEmployee[] = INCBIN_U32("graphics/object_events/pics/people/mart_employee.4bpp");
+const u32 gObjectEventPic_RooftopSaleWoman[] = INCBIN_U32("graphics/object_events/pics/people/rooftop_sale_woman.4bpp");
+const u32 gObjectEventPic_Teala[] = INCBIN_U32("graphics/object_events/pics/people/teala.4bpp");
+const u32 gObjectEventPic_Artist[] = INCBIN_U32("graphics/object_events/pics/people/artist.4bpp");
+const u32 gObjectEventPic_Cameraman[] = INCBIN_U32("graphics/object_events/pics/people/cameraman.4bpp");
+const u32 gObjectEventPic_Scientist2[] = INCBIN_U32("graphics/object_events/pics/people/scientist_2.4bpp");
+const u32 gObjectEventPic_DevonEmployee[] = INCBIN_U32("graphics/object_events/pics/people/devon_employee.4bpp");
+const u32 gObjectEventPic_AquaMemberM[] = INCBIN_U32("graphics/object_events/pics/people/team_aqua/aqua_member_m.4bpp");
+const u32 gObjectEventPic_AquaMemberF[] = INCBIN_U32("graphics/object_events/pics/people/team_aqua/aqua_member_f.4bpp");
+const u32 gObjectEventPic_MagmaMemberM[] = INCBIN_U32("graphics/object_events/pics/people/team_magma/magma_member_m.4bpp");
+const u32 gObjectEventPic_MagmaMemberF[] = INCBIN_U32("graphics/object_events/pics/people/team_magma/magma_member_f.4bpp");
+const u32 gObjectEventPic_Sidney[] = INCBIN_U32("graphics/object_events/pics/people/elite_four/sidney.4bpp");
+const u32 gObjectEventPic_Phoebe[] = INCBIN_U32("graphics/object_events/pics/people/elite_four/phoebe.4bpp");
+const u32 gObjectEventPic_Glacia[] = INCBIN_U32("graphics/object_events/pics/people/elite_four/glacia.4bpp");
+const u32 gObjectEventPic_Drake[] = INCBIN_U32("graphics/object_events/pics/people/elite_four/drake.4bpp");
+const u32 gObjectEventPic_Roxanne[] = INCBIN_U32("graphics/object_events/pics/people/gym_leaders/roxanne.4bpp");
+const u32 gObjectEventPic_Brawly[] = INCBIN_U32("graphics/object_events/pics/people/gym_leaders/brawly.4bpp");
+const u32 gObjectEventPic_Wattson[] = INCBIN_U32("graphics/object_events/pics/people/gym_leaders/wattson.4bpp");
+const u32 gObjectEventPic_Flannery[] = INCBIN_U32("graphics/object_events/pics/people/gym_leaders/flannery.4bpp");
+const u32 gObjectEventPic_Norman[] = INCBIN_U32("graphics/object_events/pics/people/gym_leaders/norman.4bpp");
+const u32 gObjectEventPic_Winona[] = INCBIN_U32("graphics/object_events/pics/people/gym_leaders/winona.4bpp");
+const u32 gObjectEventPic_Liza[] = INCBIN_U32("graphics/object_events/pics/people/gym_leaders/liza.4bpp");
+const u32 gObjectEventPic_Tate[] = INCBIN_U32("graphics/object_events/pics/people/gym_leaders/tate.4bpp");
+const u32 gObjectEventPic_Wallace[] = INCBIN_U32("graphics/object_events/pics/people/wallace.4bpp");
+const u32 gObjectEventPic_Steven[] = INCBIN_U32("graphics/object_events/pics/people/steven.4bpp");
+const u32 gObjectEventPic_Wally[] = INCBIN_U32("graphics/object_events/pics/people/wally.4bpp");
+const u32 gObjectEventPic_RubySapphireLittleBoy[] = INCBIN_U32("graphics/object_events/pics/people/rs_little_boy.4bpp");
+const u32 gObjectEventPic_HotSpringsOldWoman[] = INCBIN_U32("graphics/object_events/pics/people/hot_springs_old_woman.4bpp");
+const u32 gObjectEventPic_LatiasLatios[] = INCBIN_U32("graphics/object_events/pics/pokemon/latias_latios.4bpp");
+const u32 gObjectEventPic_GameboyKid[] = INCBIN_U32("graphics/object_events/pics/people/gameboy_kid.4bpp");
+const u32 gObjectEventPic_ContestJudge[] = INCBIN_U32("graphics/object_events/pics/people/contest_judge.4bpp");
+const u32 gObjectEventPic_Archie[] = INCBIN_U32("graphics/object_events/pics/people/team_aqua/archie.4bpp");
+const u32 gObjectEventPic_Maxie[] = INCBIN_U32("graphics/object_events/pics/people/team_magma/maxie.4bpp");
+const u32 gObjectEventPic_Kyogre[] = INCBIN_U32("graphics/object_events/pics/pokemon/kyogre.4bpp");
+const u32 gObjectEventPic_Groudon[] = INCBIN_U32("graphics/object_events/pics/pokemon/groudon.4bpp");
+const u32 gObjectEventPic_Regi[] = INCBIN_U32("graphics/object_events/pics/pokemon/regi.4bpp");
+const u32 gObjectEventPic_Skitty[] = INCBIN_U32("graphics/object_events/pics/pokemon/skitty.4bpp");
+const u32 gObjectEventPic_Kecleon[] = INCBIN_U32("graphics/object_events/pics/pokemon/kecleon.4bpp");
+const u32 gObjectEventPic_Rayquaza[] = INCBIN_U32("graphics/object_events/pics/pokemon/rayquaza.4bpp");
+const u32 gObjectEventPic_RayquazaStill[] = INCBIN_U32("graphics/object_events/pics/pokemon/rayquaza_still.4bpp");
+const u32 gObjectEventPic_Zigzagoon[] = INCBIN_U32("graphics/object_events/pics/pokemon/zigzagoon.4bpp");
+const u32 gObjectEventPic_Pikachu[] = INCBIN_U32("graphics/object_events/pics/pokemon/pikachu.4bpp");
+const u32 gObjectEventPic_Azumarill[] = INCBIN_U32("graphics/object_events/pics/pokemon/azumarill.4bpp");
+const u32 gObjectEventPic_Wingull[] = INCBIN_U32("graphics/object_events/pics/pokemon/wingull.4bpp");
+const u32 gObjectEventPic_TuberMSwimming[] = INCBIN_U32("graphics/object_events/pics/people/tuber_m_swimming.4bpp");
+const u32 gObjectEventPic_Azurill[] = INCBIN_U32("graphics/object_events/pics/pokemon/azurill.4bpp");
+const u32 gObjectEventPic_Mom[] = INCBIN_U32("graphics/object_events/pics/people/mom.4bpp");
+const u16 gObjectEventPalette22[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_22.gbapal");
+const u16 gObjectEventPalette23[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_23.gbapal");
+const u16 gObjectEventPalette24[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_24.gbapal");
+const u16 gObjectEventPalette25[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_25.gbapal");
+const u32 gObjectEventPic_UnusedNatuDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/unused_natu_doll.4bpp");
+const u32 gObjectEventPic_UnusedMagnemiteDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/unused_magnemite_doll.4bpp");
+const u32 gObjectEventPic_UnusedSquirtleDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/unused_squirtle_doll.4bpp");
+const u32 gObjectEventPic_UnusedWooperDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/unused_wooper_doll.4bpp");
+const u32 gObjectEventPic_UnusedPikachuDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/unused_pikachu_doll.4bpp");
+const u32 gObjectEventPic_UnusedPorygon2Doll[] = INCBIN_U32("graphics/object_events/pics/dolls/unused_porygon2_doll.4bpp");
+const u32 gObjectEventPic_PichuDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/pichu_doll.4bpp");
+const u32 gObjectEventPic_PikachuDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/pikachu_doll.4bpp");
+const u32 gObjectEventPic_MarillDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/marill_doll.4bpp");
+const u32 gObjectEventPic_TogepiDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/togepi_doll.4bpp");
+const u32 gObjectEventPic_CyndaquilDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/cyndaquil_doll.4bpp");
+const u32 gObjectEventPic_ChikoritaDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/chikorita_doll.4bpp");
+const u32 gObjectEventPic_TotodileDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/totodile_doll.4bpp");
+const u32 gObjectEventPic_JigglypuffDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/jigglypuff_doll.4bpp");
+const u32 gObjectEventPic_MeowthDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/meowth_doll.4bpp");
+const u32 gObjectEventPic_ClefairyDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/clefairy_doll.4bpp");
+const u32 gObjectEventPic_DittoDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/ditto_doll.4bpp");
+const u32 gObjectEventPic_SmoochumDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/smoochum_doll.4bpp");
+const u32 gObjectEventPic_TreeckoDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/treecko_doll.4bpp");
+const u32 gObjectEventPic_TorchicDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/torchic_doll.4bpp");
+const u32 gObjectEventPic_MudkipDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/mudkip_doll.4bpp");
+const u32 gObjectEventPic_DuskullDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/duskull_doll.4bpp");
+const u32 gObjectEventPic_WynautDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/wynaut_doll.4bpp");
+const u32 gObjectEventPic_BaltoyDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/baltoy_doll.4bpp");
+const u32 gObjectEventPic_KecleonDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/kecleon_doll.4bpp");
+const u32 gObjectEventPic_AzurillDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/azurill_doll.4bpp");
+const u32 gObjectEventPic_SkittyDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/skitty_doll.4bpp");
+const u32 gObjectEventPic_SwabluDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/swablu_doll.4bpp");
+const u32 gObjectEventPic_GulpinDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/gulpin_doll.4bpp");
+const u32 gObjectEventPic_LotadDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/lotad_doll.4bpp");
+const u32 gObjectEventPic_SeedotDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/seedot_doll.4bpp");
+const u32 gObjectEventPic_PikaCushion[] = INCBIN_U32("graphics/object_events/pics/cushions/pika_cushion.4bpp");
+const u32 gObjectEventPic_RoundCushion[] = INCBIN_U32("graphics/object_events/pics/cushions/round_cushion.4bpp");
+const u32 gObjectEventPic_KissCushion[] = INCBIN_U32("graphics/object_events/pics/cushions/kiss_cushion.4bpp");
+const u32 gObjectEventPic_ZigzagCushion[] = INCBIN_U32("graphics/object_events/pics/cushions/zigzag_cushion.4bpp");
+const u32 gObjectEventPic_SpinCushion[] = INCBIN_U32("graphics/object_events/pics/cushions/spin_cushion.4bpp");
+const u32 gObjectEventPic_DiamondCushion[] = INCBIN_U32("graphics/object_events/pics/cushions/diamond_cushion.4bpp");
+const u32 gObjectEventPic_BallCushion[] = INCBIN_U32("graphics/object_events/pics/cushions/ball_cushion.4bpp");
+const u32 gObjectEventPic_GrassCushion[] = INCBIN_U32("graphics/object_events/pics/cushions/grass_cushion.4bpp");
+const u32 gObjectEventPic_FireCushion[] = INCBIN_U32("graphics/object_events/pics/cushions/fire_cushion.4bpp");
+const u32 gObjectEventPic_WaterCushion[] = INCBIN_U32("graphics/object_events/pics/cushions/water_cushion.4bpp");
+const u32 gObjectEventPic_BigSnorlaxDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/big_snorlax_doll.4bpp");
+const u32 gObjectEventPic_BigRhydonDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/big_rhydon_doll.4bpp");
+const u32 gObjectEventPic_BigLaprasDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/big_lapras_doll.4bpp");
+const u32 gObjectEventPic_BigVenusaurDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/big_venusaur_doll.4bpp");
+const u32 gObjectEventPic_BigCharizardDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/big_charizard_doll.4bpp");
+const u32 gObjectEventPic_BigBlastoiseDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/big_blastoise_doll.4bpp");
+const u32 gObjectEventPic_BigWailmerDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/big_wailmer_doll.4bpp");
+const u32 gObjectEventPic_BigRegirockDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/big_regirock_doll.4bpp");
+const u32 gObjectEventPic_BigRegiceDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/big_regice_doll.4bpp");
+const u32 gObjectEventPic_BigRegisteelDoll[] = INCBIN_U32("graphics/object_events/pics/dolls/big_registeel_doll.4bpp");
+const u32 gObjectEventPic_CuttableTree[] = INCBIN_U32("graphics/object_events/pics/misc/cuttable_tree.4bpp");
+const u32 gObjectEventPic_BreakableRock[] = INCBIN_U32("graphics/object_events/pics/misc/breakable_rock.4bpp");
+const u32 gObjectEventPic_PushableBoulder[] = INCBIN_U32("graphics/object_events/pics/misc/pushable_boulder.4bpp");
+const u32 gObjectEventPic_MrBrineysBoat[] = INCBIN_U32("graphics/object_events/pics/misc/mr_brineys_boat.4bpp");
+const u32 gObjectEventPic_Fossil[] = INCBIN_U32("graphics/object_events/pics/misc/fossil.4bpp");
+const u32 gObjectEventPic_SubmarineShadow[] = INCBIN_U32("graphics/object_events/pics/misc/submarine_shadow.4bpp");
+const u16 gObjectEventPalette26[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_26.gbapal");
+const u32 gObjectEventPic_Truck[] = INCBIN_U32("graphics/object_events/pics/misc/truck.4bpp");
+const u16 gObjectEventPalette14[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_14.gbapal");
+const u32 gObjectEventPic_Vigoroth[] = INCBIN_U32("graphics/object_events/pics/pokemon/vigoroth.4bpp");
+const u16 gObjectEventPalette15[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_15.gbapal");
+const u32 gObjectEventPic_BirchsBag[] = INCBIN_U32("graphics/object_events/pics/misc/birchs_bag.4bpp");
+const u32 gObjectEventPic_EnemyZigzagoon[] = INCBIN_U32("graphics/object_events/pics/pokemon/enemy_zigzagoon.4bpp");
+const u16 gObjectEventPalette16[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_16.gbapal");
+const u32 gObjectEventPic_Poochyena[] = INCBIN_U32("graphics/object_events/pics/pokemon/poochyena.4bpp");
+const u16 gObjectEventPalette27[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_27.gbapal");
+const u32 gObjectEventPic_CableCar[] = INCBIN_U32("graphics/object_events/pics/misc/cable_car.4bpp");
+const u16 gObjectEventPalette20[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_20.gbapal");
+const u32 gObjectEventPic_SSTidal[] = INCBIN_U32("graphics/object_events/pics/misc/ss_tidal.4bpp");
+const u16 gObjectEventPalette21[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_21.gbapal");
+const u32 gFieldEffectObjectPic_BerryTreeGrowthSparkle[] = INCBIN_U32("graphics/object_events/pics/effects/berry_tree_growth_sparkle.4bpp");
+const u32 gObjectEventPic_BerryTreeDirtPile[] = INCBIN_U32("graphics/object_events/pics/berry_trees/dirt_pile.4bpp");
+const u32 gObjectEventPic_BerryTreeSprout[] = INCBIN_U32("graphics/object_events/pics/berry_trees/sprout.4bpp");
+const u32 gObjectEventPic_PechaBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/pecha.4bpp");
+const u32 gObjectEventPic_KelpsyBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/kelpsy.4bpp");
+const u32 gObjectEventPic_WepearBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/wepear.4bpp");
+const u32 gObjectEventPic_IapapaBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/iapapa.4bpp");
+const u32 gObjectEventPic_CheriBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/cheri.4bpp");
+const u32 gObjectEventPic_FigyBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/figy.4bpp");
+const u32 gObjectEventPic_MagoBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/mago.4bpp");
+const u32 gObjectEventPic_LumBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/lum.4bpp");
+const u32 gObjectEventPic_RazzBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/razz.4bpp");
+const u32 gObjectEventPic_GrepaBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/grepa.4bpp");
+const u32 gObjectEventPic_RabutaBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/rabuta.4bpp");
+const u32 gObjectEventPic_NomelBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/nomel.4bpp");
+const u32 gObjectEventPic_LeppaBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/leppa.4bpp");
+const u32 gObjectEventPic_LiechiBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/liechi.4bpp");
+const u32 gObjectEventPic_HondewBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/hondew.4bpp");
+const u32 gObjectEventPic_AguavBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/aguav.4bpp");
+const u32 gObjectEventPic_WikiBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/wiki.4bpp");
+const u32 gObjectEventPic_PomegBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/pomeg.4bpp");
+const u32 gObjectEventPic_RawstBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/rawst.4bpp");
+const u32 gObjectEventPic_SpelonBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/spelon.4bpp");
+const u32 gObjectEventPic_ChestoBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/chesto.4bpp");
+const u32 gObjectEventPic_OranBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/oran.4bpp");
+const u32 gObjectEventPic_PersimBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/persim.4bpp");
+const u32 gObjectEventPic_SitrusBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/sitrus.4bpp");
+const u32 gObjectEventPic_AspearBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/aspear.4bpp");
+const u32 gObjectEventPic_PamtreBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/pamtre.4bpp");
+const u32 gObjectEventPic_CornnBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/cornn.4bpp");
+const u32 gObjectEventPic_LansatBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/lansat.4bpp");
+const u32 gObjectEventPic_DurinBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/durin.4bpp");
+const u32 gObjectEventPic_TamatoBerryTree[] = INCBIN_U32("graphics/object_events/pics/berry_trees/tamato.4bpp");
+const u32 gFieldEffectObjectPic_SurfBlob[] = INCBIN_U32("graphics/object_events/pics/effects/surf_blob.4bpp");
+const u32 gObjectEventPic_QuintyPlump[] = INCBIN_U32("graphics/object_events/pics/people/quinty_plump.4bpp");
+const u16 gObjectEventPalette12[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_12.gbapal");
+const u16 gObjectEventPalette13[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_13.gbapal");
+const u32 gFieldEffectObjectPic_ShadowSmall[] = INCBIN_U32("graphics/object_events/pics/effects/shadow_small.4bpp");
+const u32 gFieldEffectObjectPic_ShadowMedium[] = INCBIN_U32("graphics/object_events/pics/effects/shadow_medium.4bpp");
+const u32 gFieldEffectObjectPic_ShadowLarge[] = INCBIN_U32("graphics/object_events/pics/effects/shadow_large.4bpp");
+const u32 gFieldEffectObjectPic_ShadowExtraLarge[] = INCBIN_U32("graphics/object_events/pics/effects/shadow_extra_large.4bpp");
+const u32 filler_8368A08[0x48] = {};
+const u8 gFieldEffectPic_CutGrass[] = INCBIN_U8("graphics/object_events/pics/effects/cut_grass.4bpp");
+const u32 gFieldEffectPic_CutGrass_Copy[] = INCBIN_U32("graphics/object_events/pics/effects/cut_grass.4bpp");
+const u16 gFieldEffectObjectPalette6[] = INCBIN_U16("graphics/object_events/palettes/field_effect_object_palette_06.gbapal");
+const u32 gFieldEffectObjectPic_Ripple[] = INCBIN_U32("graphics/object_events/pics/effects/ripple.4bpp");
+const u32 gFieldEffectObjectPic_Ash[] = INCBIN_U32("graphics/object_events/pics/effects/ash.4bpp");
+const u32 gFieldEffectObjectPic_Arrow[] = INCBIN_U32("graphics/object_events/pics/effects/arrow.4bpp");
+const u16 gFieldEffectObjectPalette0[] = INCBIN_U16("graphics/object_events/palettes/field_effect_object_palette_00.gbapal");
+const u16 gFieldEffectObjectPalette1[] = INCBIN_U16("graphics/object_events/palettes/field_effect_object_palette_01.gbapal");
+const u32 gFieldEffectObjectPic_GroundImpactDust[] = INCBIN_U32("graphics/object_events/pics/effects/ground_impact_dust.4bpp");
+const u32 gFieldEffectObjectPic_BikeHopTallGrass[] = INCBIN_U32("graphics/object_events/pics/effects/bike_hop_tall_grass.4bpp");
+const u32 gUnusedGrass[] = INCBIN_U32("graphics/object_events/pics/effects/unused_grass.4bpp");
+const u32 gFieldEffectObjectPic_Unknown16[] = INCBIN_U32("graphics/object_events/pics/effects/unknown_16.4bpp");
+const u32 gFieldEffectObjectPic_Unknown17[] = INCBIN_U32("graphics/object_events/pics/effects/unknown_17.4bpp");
+const u32 gFieldEffectObjectPic_Unknown18[] = INCBIN_U32("graphics/object_events/pics/effects/unknown_18.4bpp");
+const u32 gFieldEffectObjectPic_LongGrass[] = INCBIN_U32("graphics/object_events/pics/effects/long_grass.4bpp");
+const u32 gFieldEffectObjectPic_TallGrass[] = INCBIN_U32("graphics/object_events/pics/effects/tall_grass.4bpp");
+const u32 gFieldEffectObjectPic_ShortGrass[] = INCBIN_U32("graphics/object_events/pics/effects/short_grass.4bpp");
+const u32 gFieldEffectObjectPic_SandFootprints[] = INCBIN_U32("graphics/object_events/pics/effects/sand_footprints.4bpp");
+const u32 gFieldEffectObjectPic_DeepSandFootprints[] = INCBIN_U32("graphics/object_events/pics/effects/deep_sand_footprints.4bpp");
+const u32 gFieldEffectObjectPic_BikeTireTracks[] = INCBIN_U32("graphics/object_events/pics/effects/bike_tire_tracks.4bpp");
+const u32 gFieldEffectObjectPic_Unknown19[] = INCBIN_U32("graphics/object_events/pics/effects/unknown_19.4bpp");
+const u32 gFieldEffectObjectPic_Unknown29[] = INCBIN_U32("graphics/object_events/pics/effects/unknown_29.4bpp");
+const u32 gFieldEffectObjectPic_BikeHopBigSplash[] = INCBIN_U32("graphics/object_events/pics/effects/bike_hop_big_splash.4bpp");
+const u32 gFieldEffectObjectPic_Splash[] = INCBIN_U32("graphics/object_events/pics/effects/splash.4bpp");
+const u32 gFieldEffectObjectPic_BikeHopSmallSplash[] = INCBIN_U32("graphics/object_events/pics/effects/bike_hop_small_splash.4bpp");
+const u32 gFieldEffectObjectPic_Unknown20[] = INCBIN_U32("graphics/object_events/pics/effects/unknown_20.4bpp");
+const u32 gFieldEffectObjectPic_TreeDisguise[] = INCBIN_U32("graphics/object_events/pics/effects/tree_disguise.4bpp");
+const u32 gFieldEffectObjectPic_MountainDisguise[] = INCBIN_U32("graphics/object_events/pics/effects/mountain_disguise.4bpp");
+const u32 gFieldEffectObjectPic_SandDisguisePlaceholder[] = INCBIN_U32("graphics/object_events/pics/effects/sand_disguise_placeholder.4bpp");
+const u32 gFieldEffectObjectPic_HotSpringsWater[] = INCBIN_U32("graphics/object_events/pics/effects/hot_springs_water.4bpp");
+const u16 gFieldEffectObjectPalette2[] = INCBIN_U16("graphics/object_events/palettes/field_effect_object_palette_02.gbapal");
+const u32 gFieldEffectObjectPic_JumpOutOfAsh[] = INCBIN_U32("graphics/object_events/pics/effects/jump_out_of_ash.4bpp");
+const u32 gFieldEffectObjectPic_Unknown33[] = INCBIN_U32("graphics/object_events/pics/effects/unknown_33.4bpp");
+const u32 gFieldEffectObjectPic_Bubbles[] = INCBIN_U32("graphics/object_events/pics/effects/bubbles.4bpp");
+const u32 gFieldEffectObjectPic_Unknown35[] = INCBIN_U32("graphics/object_events/pics/effects/unknown_35.4bpp");
+const u16 gFieldEffectObjectPalette3[] = INCBIN_U16("graphics/object_events/palettes/field_effect_object_palette_03.gbapal");
+const u32 gFieldEffectObjectPic_Bird[] = INCBIN_U32("graphics/object_events/pics/effects/bird.4bpp");
+const u32 gObjectEventPic_Juan[] = INCBIN_U32("graphics/object_events/pics/people/gym_leaders/juan.4bpp");
+const u32 gObjectEventPic_Scott[] = INCBIN_U32("graphics/object_events/pics/people/scott.4bpp");
+const u32 gObjectEventPic_Statue[] = INCBIN_U32("graphics/object_events/pics/misc/statue.4bpp");
+const u32 gObjectEventPic_Kirlia[] = INCBIN_U32("graphics/object_events/pics/pokemon/kirlia.4bpp");
+const u32 gObjectEventPic_Dusclops[] = INCBIN_U32("graphics/object_events/pics/pokemon/dusclops.4bpp");
+const u32 gObjectEventPic_MysteryEventDeliveryman[] = INCBIN_U32("graphics/object_events/pics/people/mystery_event_deliveryman.4bpp");
+const u32 gObjectEventPic_UnionRoomAttendant[] = INCBIN_U32("graphics/object_events/pics/people/union_room_attendant.4bpp");
+const u32 gObjectEventPic_MovingBox[] = INCBIN_U32("graphics/object_events/pics/misc/moving_box.4bpp");
+const u16 gObjectEventPalette19[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_19.gbapal");
+const u32 gObjectEventPic_Sudowoodo[] = INCBIN_U32("graphics/object_events/pics/pokemon/sudowoodo.4bpp");
+const u32 gObjectEventPic_Mew[] = INCBIN_U32("graphics/object_events/pics/pokemon/mew.4bpp");
+const u16 gObjectEventPalette28[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_28.gbapal");
+const u32 gObjectEventPic_Red[] = INCBIN_U32("graphics/object_events/pics/people/red.4bpp");
+const u32 gObjectEventPic_Leaf[] = INCBIN_U32("graphics/object_events/pics/people/leaf.4bpp");
+const u16 gObjectEventPalette30[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_30.gbapal");
+const u32 gObjectEventPic_BirthIslandStone[] = INCBIN_U32("graphics/object_events/pics/misc/birth_island_stone.4bpp");
+const u16 gObjectEventPalette29[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_29.gbapal");
+const u32 gObjectEventPic_Deoxys[] = INCBIN_U32("graphics/object_events/pics/pokemon/deoxys.4bpp");
+const u32 gObjectEventPic_Anabel[] = INCBIN_U32("graphics/object_events/pics/people/frontier_brains/anabel.4bpp");
+const u32 gObjectEventPic_Tucker[] = INCBIN_U32("graphics/object_events/pics/people/frontier_brains/tucker.4bpp");
+const u32 gObjectEventPic_Spenser[] = INCBIN_U32("graphics/object_events/pics/people/frontier_brains/spenser.4bpp");
+const u32 gObjectEventPic_Greta[] = INCBIN_U32("graphics/object_events/pics/people/frontier_brains/greta.4bpp");
+const u32 gObjectEventPic_Noland[] = INCBIN_U32("graphics/object_events/pics/people/frontier_brains/noland.4bpp");
+const u32 gObjectEventPic_Lucy[] = INCBIN_U32("graphics/object_events/pics/people/frontier_brains/lucy.4bpp");
+const u32 gObjectEventPic_Brandon[] = INCBIN_U32("graphics/object_events/pics/people/frontier_brains/brandon.4bpp");
+const u32 gObjectEventPic_Lugia[] = INCBIN_U32("graphics/object_events/pics/pokemon/lugia.4bpp");
+const u16 gObjectEventPalette32[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_32.gbapal");
+const u32 gObjectEventPic_HoOh[] = INCBIN_U32("graphics/object_events/pics/pokemon/ho_oh.4bpp");
+const u16 gObjectEventPalette31[] = INCBIN_U16("graphics/object_events/palettes/event_object_palette_31.gbapal");
diff --git a/src/data/event_object/event_object_graphics_info.h b/src/data/object_event/event_object_graphics_info.h
index cb221a30b..cb221a30b 100755
--- a/src/data/event_object/event_object_graphics_info.h
+++ b/src/data/object_event/event_object_graphics_info.h
diff --git a/src/data/event_object/event_object_graphics_info_pointers.h b/src/data/object_event/event_object_graphics_info_pointers.h
index 01c8cbde7..01c8cbde7 100755
--- a/src/data/event_object/event_object_graphics_info_pointers.h
+++ b/src/data/object_event/event_object_graphics_info_pointers.h
diff --git a/src/data/event_object/event_object_pic_tables.h b/src/data/object_event/event_object_pic_tables.h
index 9cfdca7c1..9cfdca7c1 100755
--- a/src/data/event_object/event_object_pic_tables.h
+++ b/src/data/object_event/event_object_pic_tables.h
diff --git a/src/data/event_object/event_object_subsprites.h b/src/data/object_event/event_object_subsprites.h
index 3beccb416..3beccb416 100755
--- a/src/data/event_object/event_object_subsprites.h
+++ b/src/data/object_event/event_object_subsprites.h
diff --git a/src/data/event_object/field_effect_object_template_pointers.h b/src/data/object_event/field_effect_object_template_pointers.h
index 32d2b069a..32d2b069a 100755
--- a/src/data/event_object/field_effect_object_template_pointers.h
+++ b/src/data/object_event/field_effect_object_template_pointers.h
diff --git a/src/data/event_object/field_effect_objects.h b/src/data/object_event/field_effect_objects.h
index e47973dae..e47973dae 100755
--- a/src/data/event_object/field_effect_objects.h
+++ b/src/data/object_event/field_effect_objects.h
diff --git a/src/data/event_object/movement_action_func_tables.h b/src/data/object_event/movement_action_func_tables.h
index 8cf7d1699..8cf7d1699 100755
--- a/src/data/event_object/movement_action_func_tables.h
+++ b/src/data/object_event/movement_action_func_tables.h
diff --git a/src/data/event_object/movement_type_func_tables.h b/src/data/object_event/movement_type_func_tables.h
index 7d149a628..7d149a628 100755
--- a/src/data/event_object/movement_type_func_tables.h
+++ b/src/data/object_event/movement_type_func_tables.h
diff --git a/src/event_object_movement.c b/src/event_object_movement.c
index 86999f265..6155c430a 100644
--- a/src/event_object_movement.c
+++ b/src/event_object_movement.c
@@ -140,7 +140,7 @@ void (*const gCameraObjectFuncs[])(struct Sprite *) = {
     CameraObject_2,
 };
 
-#include "data/event_object/event_object_graphics.h"
+#include "data/object_event/event_object_graphics.h"
 
 // movement type callbacks
 static void (*const sMovementTypeCallbacks[])(struct Sprite *) =
@@ -433,13 +433,13 @@ const u8 gInitialMovementTypeFacingDirections[] = {
 #define OBJ_EVENT_PAL_TAG_34 0x1123
 #define OBJ_EVENT_PAL_TAG_NONE 0x11FF
 
-#include "data/event_object/event_object_graphics_info_pointers.h"
-#include "data/event_object/field_effect_object_template_pointers.h"
-#include "data/event_object/event_object_pic_tables.h"
-#include "data/event_object/event_object_anims.h"
-#include "data/event_object/base_oam.h"
-#include "data/event_object/event_object_subsprites.h"
-#include "data/event_object/event_object_graphics_info.h"
+#include "data/object_event/event_object_graphics_info_pointers.h"
+#include "data/object_event/field_effect_object_template_pointers.h"
+#include "data/object_event/event_object_pic_tables.h"
+#include "data/object_event/event_object_anims.h"
+#include "data/object_event/base_oam.h"
+#include "data/object_event/event_object_subsprites.h"
+#include "data/object_event/event_object_graphics_info.h"
 
 const struct SpritePalette sObjectEventSpritePalettes[] = {
     {gObjectEventPalette0,  OBJ_EVENT_PAL_TAG_0},
@@ -661,14 +661,14 @@ const u16 *const gObjectPaletteTagSets[] = {
     gObjectPaletteTags3,
 };
 
-#include "data/event_object/berry_tree_graphics_tables.h"
-#include "data/event_object/field_effect_objects.h"
+#include "data/object_event/berry_tree_graphics_tables.h"
+#include "data/object_event/field_effect_objects.h"
 
 const s16 gMovementDelaysMedium[] = {32, 64,  96, 128};
 const s16 gMovementDelaysLong[] =   {32, 64, 128, 192};
 const s16 gMovementDelaysShort[] =  {32, 48,  64,  80};
 
-#include "data/event_object/movement_type_func_tables.h"
+#include "data/object_event/movement_type_func_tables.h"
 
 const u8 gFaceDirectionAnimNums[] = {
     [DIR_NONE] = 0,
@@ -1089,7 +1089,7 @@ const u8 gUnknown_0850DC3F[][4] = {
     {3, 4, 2, 1}
 };
 
-#include "data/event_object/movement_action_func_tables.h"
+#include "data/object_event/movement_action_func_tables.h"
 
 // Code
 
diff --git a/src/field_effect.c b/src/field_effect.c
index 335de89b5..982f31f06 100644
--- a/src/field_effect.c
+++ b/src/field_effect.c
@@ -246,12 +246,12 @@ const u32 gNewGameBirchPic[] = INCBIN_U32("graphics/birch_speech/birch.4bpp");
 const u32 gUnusedBirchBeauty[] = INCBIN_U32("graphics/unused/intro_birch_beauty.4bpp");
 const u16 gNewGameBirchPalette[16] = INCBIN_U16("graphics/birch_speech/birch.gbapal");
 const u32 gSpriteImage_855A970[] = INCBIN_U32("graphics/misc/pokeball_glow.4bpp");
-const u16 gFieldEffectObjectPalette4[16] = INCBIN_U16("graphics/event_objects/palettes/field_effect_object_palette_04.gbapal");
+const u16 gFieldEffectObjectPalette4[16] = INCBIN_U16("graphics/object_events/palettes/field_effect_object_palette_04.gbapal");
 const u32 gSpriteImage_855A9B0[] = INCBIN_U32("graphics/misc/pokecenter_monitor/0.4bpp");
 const u32 gSpriteImage_855AA70[] = INCBIN_U32("graphics/misc/pokecenter_monitor/1.4bpp");
 const u32 gSpriteImage_855AB30[] = INCBIN_U32("graphics/misc/big_hof_monitor.4bpp");
 const u8 gSpriteImage_855AD30[] = INCBIN_U8("graphics/misc/small_hof_monitor.4bpp");
-const u16 gFieldEffectObjectPalette5[16] = INCBIN_U16("graphics/event_objects/palettes/field_effect_object_palette_05.gbapal");
+const u16 gFieldEffectObjectPalette5[16] = INCBIN_U16("graphics/object_events/palettes/field_effect_object_palette_05.gbapal");
 
 // Graphics for the lights streaking past your Pokemon when it uses a field move.
 const u32 gFieldMoveStreaksTiles[] = INCBIN_U32("graphics/misc/field_move_streaks.4bpp");
diff --git a/src/fldeff_misc.c b/src/fldeff_misc.c
index a1f8d14fa..ab20713d2 100644
--- a/src/fldeff_misc.c
+++ b/src/fldeff_misc.c
@@ -70,7 +70,7 @@ static const u8 gSpriteImage_858DB78[] = INCBIN_U8("graphics/unknown/858E588/4.4
 
 static const u8 gUnusedEmptySpace_858DBF8[32] = {0};
 
-static const u16 gFieldEffectObjectPalette7[] = INCBIN_U16("graphics/event_objects/palettes/field_effect_object_palette_07.gbapal");
+static const u16 gFieldEffectObjectPalette7[] = INCBIN_U16("graphics/object_events/palettes/field_effect_object_palette_07.gbapal");
 static const u8 gSpriteImage_858DC38[] = INCBIN_U8("graphics/unknown/858E5D8/0.4bpp");
 static const u8 gSpriteImage_858DCB8[] = INCBIN_U8("graphics/unknown/858E5D8/1.4bpp");
 static const u8 gSpriteImage_858DD38[] = INCBIN_U8("graphics/unknown/858E5D8/2.4bpp");
@@ -82,7 +82,7 @@ static const u8 gSpriteImage_858DFB8[] = INCBIN_U8("graphics/unknown/858E5B0/2.4
 static const u8 gSpriteImage_858E038[] = INCBIN_U8("graphics/unknown/858E5B0/3.4bpp");
 static const u8 gSpriteImage_858E0B8[] = INCBIN_U8("graphics/unknown/858E5B0/4.4bpp");
 static const u8 gSpriteImage_858E138[] = INCBIN_U8("graphics/unknown/858E5B0/5.4bpp");
-static const u16 gFieldEffectObjectPalette8[] = INCBIN_U16("graphics/event_objects/palettes/field_effect_object_palette_08.gbapal");
+static const u16 gFieldEffectObjectPalette8[] = INCBIN_U16("graphics/object_events/palettes/field_effect_object_palette_08.gbapal");
 static const u8 gSpriteImage_858E1D8[] = INCBIN_U8("graphics/unknown/858E674/0.4bpp");
 static const u8 gSpriteImage_858E2D8[] = INCBIN_U8("graphics/unknown/858E674/1.4bpp");
 static const u8 gSpriteImage_858E3D8[] = INCBIN_U8("graphics/unknown/858E674/2.4bpp");