diff --git a/Makefile b/Makefile
index ce3a6ec18d..3c2c333b0a 100644
--- a/Makefile
+++ b/Makefile
@@ -90,6 +90,7 @@ tidy:
 	rm -r build/*
 
 include graphics_file_rules.mk
+include event_obj_graphics_makefile_rules.mk
 
 %.s: ;
 %.png: ;
diff --git a/event_obj_graphics_makefile_rules.mk b/event_obj_graphics_makefile_rules.mk
new file mode 100644
index 0000000000..c7b4ccba46
--- /dev/null
+++ b/event_obj_graphics_makefile_rules.mk
@@ -0,0 +1,618 @@
+OVERWORLDGFXDIR := graphics/event_objects/pics
+
+$(OVERWORLDGFXDIR)/people/brendan/walking.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/people/brendan/running.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/people/brendan/field_move.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(OVERWORLDGFXDIR)/people/brendan/surfing.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(OVERWORLDGFXDIR)/people/brendan/mach_bike.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(OVERWORLDGFXDIR)/people/brendan/acro_bike.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(OVERWORLDGFXDIR)/people/brendan/fishing.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(OVERWORLDGFXDIR)/people/brendan/watering.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(OVERWORLDGFXDIR)/people/brendan/underwater.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+
+$(OVERWORLDGFXDIR)/people/elite_four/drake.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/people/elite_four/glacia.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/people/elite_four/phoebe.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/people/elite_four/sidney.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+
+$(OVERWORLDGFXDIR)/people/frontier_brains/anabel.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/people/frontier_brains/brandon.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/people/frontier_brains/greta.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/people/frontier_brains/lucy.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/people/frontier_brains/noland.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/people/frontier_brains/spenser.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/people/frontier_brains/tucker.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+
+$(OVERWORLDGFXDIR)/people/gym_leaders/brawly.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/people/gym_leaders/flannery.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/people/gym_leaders/juan.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/people/gym_leaders/liza.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/people/gym_leaders/norman.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/people/gym_leaders/roxanne.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/people/gym_leaders/tate.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/people/gym_leaders/wattson.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/people/gym_leaders/winona.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+
+$(OVERWORLDGFXDIR)/people/may/walking.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/people/may/running.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/people/may/field_move.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(OVERWORLDGFXDIR)/people/may/surfing.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(OVERWORLDGFXDIR)/people/may/mach_bike.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(OVERWORLDGFXDIR)/people/may/acro_bike.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(OVERWORLDGFXDIR)/people/may/fishing.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(OVERWORLDGFXDIR)/people/may/watering.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(OVERWORLDGFXDIR)/people/may/underwater.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+
+$(OVERWORLDGFXDIR)/people/ruby_sapphire_brendan/walking.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/people/ruby_sapphire_brendan/running.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+
+$(OVERWORLDGFXDIR)/people/ruby_sapphire_may/walking.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/people/ruby_sapphire_may/running.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+
+$(OVERWORLDGFXDIR)/people/team_aqua/aqua_member_f.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/people/team_aqua/aqua_member_m.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/people/team_aqua/archie.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+
+$(OVERWORLDGFXDIR)/people/team_magma/magma_member_f.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/people/team_magma/magma_member_m.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/people/team_magma/maxie.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+
+$(OVERWORLDGFXDIR)/people/artist.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/people/beauty.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/people/black_belt.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/people/boy_1.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/people/boy_2.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/people/boy_3.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/people/boy_4.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/people/boy_5.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/people/bug_catcher.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/people/cameraman.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/people/camper.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/people/contest_old_man.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/people/cook.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/people/cycling_triathlete_f.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(OVERWORLDGFXDIR)/people/cycling_triathlete_m.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(OVERWORLDGFXDIR)/people/fat_man.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/people/fisherman.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/people/gentleman.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/people/girl_1.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/people/girl_2.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/people/girl_3.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/people/hex_maniac.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/people/hiker.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/people/hot_springs_old_woman.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/people/lass.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/people/leaf.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/people/little_boy_1.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 2
+
+$(OVERWORLDGFXDIR)/people/little_boy_2.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 2
+
+$(OVERWORLDGFXDIR)/people/little_girl_1.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/people/little_girl_2.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 2
+
+$(OVERWORLDGFXDIR)/people/man_1.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/people/man_2.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/people/man_3.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/people/man_4.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/people/man_5.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/people/man_6.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/people/man_7.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/people/maniac.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/people/mart_employee.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/people/mauville_old_man_1.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/people/mauville_old_man_2.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/people/mom.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/people/mystery_event_deliveryman.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/people/nurse.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/people/old_man_1.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/people/old_man_2.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/people/old_woman_1.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/people/old_woman_2.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/people/picnicker.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/people/prof_birch.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/people/psychic_m.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/people/quinty_plump.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(OVERWORLDGFXDIR)/people/red.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/people/reporter_f.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/people/reporter_m.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/people/rooftop_sale_woman.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/people/rs_little_boy.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 2
+
+$(OVERWORLDGFXDIR)/people/running_triathlete_f.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/people/running_triathlete_m.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/people/sailor.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/people/school_kid_m.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/people/scientist_1.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/people/scientist_2.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/people/scott.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/people/steven.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/people/swimmer_f.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/people/swimmer_m.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/people/teala.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/people/tuber_f.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 2
+
+$(OVERWORLDGFXDIR)/people/tuber_m.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 2
+
+$(OVERWORLDGFXDIR)/people/tuber_m_swimming.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 2
+
+$(OVERWORLDGFXDIR)/people/union_room_attendant.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/people/unused_woman.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/people/wallace.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/people/wally.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/people/woman_1.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/people/woman_2.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/people/woman_3.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/people/woman_4.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/people/woman_5.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/people/woman_6.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/people/woman_7.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/people/youngster.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+
+
+$(OVERWORLDGFXDIR)/pokemon/azumarill.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 2
+
+$(OVERWORLDGFXDIR)/pokemon/azurill.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 2
+
+$(OVERWORLDGFXDIR)/pokemon/deoxys.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(OVERWORLDGFXDIR)/pokemon/dusclops.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/pokemon/enemy_zigzagoon.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(OVERWORLDGFXDIR)/pokemon/groudon.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(OVERWORLDGFXDIR)/pokemon/ho_oh.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(OVERWORLDGFXDIR)/pokemon/kecleon.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 2
+
+$(OVERWORLDGFXDIR)/pokemon/kirlia.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/pokemon/kyogre.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(OVERWORLDGFXDIR)/pokemon/latias_latios.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(OVERWORLDGFXDIR)/pokemon/lugia.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(OVERWORLDGFXDIR)/pokemon/mew.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/pokemon/pikachu.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 2
+
+$(OVERWORLDGFXDIR)/pokemon/poochyena.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(OVERWORLDGFXDIR)/pokemon/rayquaza.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 8 -mheight 8
+
+$(OVERWORLDGFXDIR)/pokemon/skitty.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 2
+
+$(OVERWORLDGFXDIR)/pokemon/sudowoodo.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/pokemon/vigoroth.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(OVERWORLDGFXDIR)/pokemon/wingull.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 2
+
+$(OVERWORLDGFXDIR)/pokemon/zigzagoon.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 2
+
+
+
+$(OVERWORLDGFXDIR)/berry_trees/aguav.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/berry_trees/aspear.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/berry_trees/cheri.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/berry_trees/chesto.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/berry_trees/cornn.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/berry_trees/durin.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/berry_trees/figy.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/berry_trees/grepa.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/berry_trees/hondew.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/berry_trees/iapapa.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/berry_trees/kelpsy.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/berry_trees/lansat.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/berry_trees/leppa.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/berry_trees/liechi.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/berry_trees/lum.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/berry_trees/mago.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/berry_trees/nomel.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/berry_trees/oran.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/berry_trees/pamtre.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/berry_trees/pecha.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/berry_trees/persim.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/berry_trees/pomeg.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/berry_trees/rabuta.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/berry_trees/rawst.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/berry_trees/razz.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/berry_trees/sitrus.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/berry_trees/spelon.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/berry_trees/sprout.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 2
+
+$(OVERWORLDGFXDIR)/berry_trees/tamato.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/berry_trees/wepear.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/berry_trees/wiki.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+
+
+$(OVERWORLDGFXDIR)/misc/breakable_rock.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 2
+
+$(OVERWORLDGFXDIR)/misc/cuttable_tree.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 2
+
+$(OVERWORLDGFXDIR)/misc/mr_brineys_boat.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+
+
+$(OVERWORLDGFXDIR)/effects/arrow.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 2
+
+$(OVERWORLDGFXDIR)/effects/ash.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 2
+
+$(OVERWORLDGFXDIR)/effects/bike_hop_big_splash.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 2
+
+$(OVERWORLDGFXDIR)/effects/bike_hop_small_splash.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 1
+
+$(OVERWORLDGFXDIR)/effects/bubbles.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/effects/jump_out_of_ash.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 2
+
+$(OVERWORLDGFXDIR)/effects/mountain_disguise.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/effects/ripple.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 2
+
+$(OVERWORLDGFXDIR)/effects/sand_disguise_placeholder.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/effects/short_grass.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 2
+
+$(OVERWORLDGFXDIR)/effects/surf_blob.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 4 -mheight 4
+
+$(OVERWORLDGFXDIR)/effects/tall_grass.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 2
+
+$(OVERWORLDGFXDIR)/effects/tree_disguise.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 4
+
+$(OVERWORLDGFXDIR)/effects/unknown_17.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -mwidth 2 -mheight 2
diff --git a/graphics/event_objects/pics/berry_trees/aguav.png b/graphics/event_objects/pics/berry_trees/aguav.png
new file mode 100644
index 0000000000..13321eb42e
Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/aguav.png differ
diff --git a/graphics/event_objects/pics/berry_trees/aguav/0.png b/graphics/event_objects/pics/berry_trees/aguav/0.png
deleted file mode 100644
index 0463d51db3..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/aguav/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/aguav/1.png b/graphics/event_objects/pics/berry_trees/aguav/1.png
deleted file mode 100644
index a5f4b8bee8..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/aguav/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/aguav/2.png b/graphics/event_objects/pics/berry_trees/aguav/2.png
deleted file mode 100644
index 7af57fd977..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/aguav/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/aguav/3.png b/graphics/event_objects/pics/berry_trees/aguav/3.png
deleted file mode 100644
index 0fdd3f9949..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/aguav/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/aguav/4.png b/graphics/event_objects/pics/berry_trees/aguav/4.png
deleted file mode 100644
index f3fc700768..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/aguav/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/aguav/5.png b/graphics/event_objects/pics/berry_trees/aguav/5.png
deleted file mode 100644
index b437940bf9..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/aguav/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/aspear.png b/graphics/event_objects/pics/berry_trees/aspear.png
new file mode 100644
index 0000000000..984e598ea0
Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/aspear.png differ
diff --git a/graphics/event_objects/pics/berry_trees/aspear/0.png b/graphics/event_objects/pics/berry_trees/aspear/0.png
deleted file mode 100644
index 9339574139..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/aspear/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/aspear/1.png b/graphics/event_objects/pics/berry_trees/aspear/1.png
deleted file mode 100644
index ee750e7f37..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/aspear/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/aspear/2.png b/graphics/event_objects/pics/berry_trees/aspear/2.png
deleted file mode 100644
index e3a4e47bb3..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/aspear/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/aspear/3.png b/graphics/event_objects/pics/berry_trees/aspear/3.png
deleted file mode 100644
index df16ae330c..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/aspear/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/aspear/4.png b/graphics/event_objects/pics/berry_trees/aspear/4.png
deleted file mode 100644
index 8d9bd38fbf..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/aspear/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/aspear/5.png b/graphics/event_objects/pics/berry_trees/aspear/5.png
deleted file mode 100644
index 495119480b..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/aspear/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/cheri.png b/graphics/event_objects/pics/berry_trees/cheri.png
new file mode 100644
index 0000000000..527ef9dfee
Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/cheri.png differ
diff --git a/graphics/event_objects/pics/berry_trees/cheri/0.png b/graphics/event_objects/pics/berry_trees/cheri/0.png
deleted file mode 100644
index 18588dc6c1..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/cheri/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/cheri/1.png b/graphics/event_objects/pics/berry_trees/cheri/1.png
deleted file mode 100644
index e9419d0fe3..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/cheri/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/cheri/2.png b/graphics/event_objects/pics/berry_trees/cheri/2.png
deleted file mode 100644
index 4022a7e5e7..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/cheri/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/cheri/3.png b/graphics/event_objects/pics/berry_trees/cheri/3.png
deleted file mode 100644
index c2572383cf..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/cheri/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/cheri/4.png b/graphics/event_objects/pics/berry_trees/cheri/4.png
deleted file mode 100644
index 462596c51c..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/cheri/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/cheri/5.png b/graphics/event_objects/pics/berry_trees/cheri/5.png
deleted file mode 100644
index 447f1d8655..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/cheri/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/chesto.png b/graphics/event_objects/pics/berry_trees/chesto.png
new file mode 100644
index 0000000000..36b4520cef
Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/chesto.png differ
diff --git a/graphics/event_objects/pics/berry_trees/chesto/0.png b/graphics/event_objects/pics/berry_trees/chesto/0.png
deleted file mode 100644
index 516a334c1d..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/chesto/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/chesto/1.png b/graphics/event_objects/pics/berry_trees/chesto/1.png
deleted file mode 100644
index dacc90fb31..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/chesto/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/chesto/2.png b/graphics/event_objects/pics/berry_trees/chesto/2.png
deleted file mode 100644
index c0a2ec30d0..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/chesto/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/chesto/3.png b/graphics/event_objects/pics/berry_trees/chesto/3.png
deleted file mode 100644
index 328fee834c..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/chesto/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/chesto/4.png b/graphics/event_objects/pics/berry_trees/chesto/4.png
deleted file mode 100644
index d40a393a23..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/chesto/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/chesto/5.png b/graphics/event_objects/pics/berry_trees/chesto/5.png
deleted file mode 100644
index 3d3d03d644..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/chesto/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/cornn.png b/graphics/event_objects/pics/berry_trees/cornn.png
new file mode 100644
index 0000000000..60ac7da8b3
Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/cornn.png differ
diff --git a/graphics/event_objects/pics/berry_trees/cornn/0.png b/graphics/event_objects/pics/berry_trees/cornn/0.png
deleted file mode 100644
index 8388b030ce..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/cornn/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/cornn/1.png b/graphics/event_objects/pics/berry_trees/cornn/1.png
deleted file mode 100644
index 23d5297961..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/cornn/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/cornn/2.png b/graphics/event_objects/pics/berry_trees/cornn/2.png
deleted file mode 100644
index 969020d393..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/cornn/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/cornn/3.png b/graphics/event_objects/pics/berry_trees/cornn/3.png
deleted file mode 100644
index 88d136547b..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/cornn/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/cornn/4.png b/graphics/event_objects/pics/berry_trees/cornn/4.png
deleted file mode 100644
index c507896451..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/cornn/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/cornn/5.png b/graphics/event_objects/pics/berry_trees/cornn/5.png
deleted file mode 100644
index de7b7f4ad5..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/cornn/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/durin.png b/graphics/event_objects/pics/berry_trees/durin.png
new file mode 100644
index 0000000000..250cea0311
Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/durin.png differ
diff --git a/graphics/event_objects/pics/berry_trees/durin/0.png b/graphics/event_objects/pics/berry_trees/durin/0.png
deleted file mode 100644
index eefe4ba78e..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/durin/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/durin/1.png b/graphics/event_objects/pics/berry_trees/durin/1.png
deleted file mode 100644
index d5b75b3b30..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/durin/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/durin/2.png b/graphics/event_objects/pics/berry_trees/durin/2.png
deleted file mode 100644
index cf854194dc..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/durin/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/durin/3.png b/graphics/event_objects/pics/berry_trees/durin/3.png
deleted file mode 100644
index 41425502f2..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/durin/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/durin/4.png b/graphics/event_objects/pics/berry_trees/durin/4.png
deleted file mode 100644
index 66337024c1..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/durin/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/durin/5.png b/graphics/event_objects/pics/berry_trees/durin/5.png
deleted file mode 100644
index 22c672fac1..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/durin/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/figy.png b/graphics/event_objects/pics/berry_trees/figy.png
new file mode 100644
index 0000000000..2f26d13812
Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/figy.png differ
diff --git a/graphics/event_objects/pics/berry_trees/figy/0.png b/graphics/event_objects/pics/berry_trees/figy/0.png
deleted file mode 100644
index 0eea8f98ca..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/figy/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/figy/1.png b/graphics/event_objects/pics/berry_trees/figy/1.png
deleted file mode 100644
index 018e0ae3f1..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/figy/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/figy/2.png b/graphics/event_objects/pics/berry_trees/figy/2.png
deleted file mode 100644
index df10bb5263..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/figy/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/figy/3.png b/graphics/event_objects/pics/berry_trees/figy/3.png
deleted file mode 100644
index bf1785f873..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/figy/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/figy/4.png b/graphics/event_objects/pics/berry_trees/figy/4.png
deleted file mode 100644
index 46d794635f..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/figy/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/figy/5.png b/graphics/event_objects/pics/berry_trees/figy/5.png
deleted file mode 100644
index 945773fda1..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/figy/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/grepa.png b/graphics/event_objects/pics/berry_trees/grepa.png
new file mode 100644
index 0000000000..07c8554ce4
Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/grepa.png differ
diff --git a/graphics/event_objects/pics/berry_trees/grepa/0.png b/graphics/event_objects/pics/berry_trees/grepa/0.png
deleted file mode 100644
index abd265e0bc..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/grepa/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/grepa/1.png b/graphics/event_objects/pics/berry_trees/grepa/1.png
deleted file mode 100644
index 27e90c9bd3..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/grepa/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/grepa/2.png b/graphics/event_objects/pics/berry_trees/grepa/2.png
deleted file mode 100644
index 22e354eb09..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/grepa/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/grepa/3.png b/graphics/event_objects/pics/berry_trees/grepa/3.png
deleted file mode 100644
index e23824dd38..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/grepa/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/grepa/4.png b/graphics/event_objects/pics/berry_trees/grepa/4.png
deleted file mode 100644
index 4b8ad19a01..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/grepa/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/grepa/5.png b/graphics/event_objects/pics/berry_trees/grepa/5.png
deleted file mode 100644
index 9bf54a3e0f..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/grepa/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/hondew.png b/graphics/event_objects/pics/berry_trees/hondew.png
new file mode 100644
index 0000000000..45f5605eec
Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/hondew.png differ
diff --git a/graphics/event_objects/pics/berry_trees/hondew/0.png b/graphics/event_objects/pics/berry_trees/hondew/0.png
deleted file mode 100644
index ab1cffe553..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/hondew/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/hondew/1.png b/graphics/event_objects/pics/berry_trees/hondew/1.png
deleted file mode 100644
index e24fd5b959..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/hondew/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/hondew/2.png b/graphics/event_objects/pics/berry_trees/hondew/2.png
deleted file mode 100644
index dc7938958b..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/hondew/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/hondew/3.png b/graphics/event_objects/pics/berry_trees/hondew/3.png
deleted file mode 100644
index 5c9536e877..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/hondew/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/hondew/4.png b/graphics/event_objects/pics/berry_trees/hondew/4.png
deleted file mode 100644
index 2419d058b6..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/hondew/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/hondew/5.png b/graphics/event_objects/pics/berry_trees/hondew/5.png
deleted file mode 100644
index 76aa9a8e36..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/hondew/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/iapapa.png b/graphics/event_objects/pics/berry_trees/iapapa.png
new file mode 100644
index 0000000000..2a8d9b7606
Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/iapapa.png differ
diff --git a/graphics/event_objects/pics/berry_trees/iapapa/0.png b/graphics/event_objects/pics/berry_trees/iapapa/0.png
deleted file mode 100644
index 506c8bb4b2..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/iapapa/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/iapapa/1.png b/graphics/event_objects/pics/berry_trees/iapapa/1.png
deleted file mode 100644
index 6eae7f4ba6..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/iapapa/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/iapapa/2.png b/graphics/event_objects/pics/berry_trees/iapapa/2.png
deleted file mode 100644
index d779ca7fb3..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/iapapa/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/iapapa/3.png b/graphics/event_objects/pics/berry_trees/iapapa/3.png
deleted file mode 100644
index 4bbd498e3f..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/iapapa/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/iapapa/4.png b/graphics/event_objects/pics/berry_trees/iapapa/4.png
deleted file mode 100644
index 36cde62544..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/iapapa/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/iapapa/5.png b/graphics/event_objects/pics/berry_trees/iapapa/5.png
deleted file mode 100644
index b6a39d3184..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/iapapa/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/kelpsy.png b/graphics/event_objects/pics/berry_trees/kelpsy.png
new file mode 100644
index 0000000000..bad257fce7
Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/kelpsy.png differ
diff --git a/graphics/event_objects/pics/berry_trees/kelpsy/0.png b/graphics/event_objects/pics/berry_trees/kelpsy/0.png
deleted file mode 100644
index bb794552aa..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/kelpsy/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/kelpsy/1.png b/graphics/event_objects/pics/berry_trees/kelpsy/1.png
deleted file mode 100644
index 90257b2618..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/kelpsy/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/kelpsy/2.png b/graphics/event_objects/pics/berry_trees/kelpsy/2.png
deleted file mode 100644
index 2f3fec1ecb..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/kelpsy/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/kelpsy/3.png b/graphics/event_objects/pics/berry_trees/kelpsy/3.png
deleted file mode 100644
index 2efd0d160f..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/kelpsy/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/kelpsy/4.png b/graphics/event_objects/pics/berry_trees/kelpsy/4.png
deleted file mode 100644
index cf0c47d0a6..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/kelpsy/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/kelpsy/5.png b/graphics/event_objects/pics/berry_trees/kelpsy/5.png
deleted file mode 100644
index e31dfd23f6..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/kelpsy/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/lansat.png b/graphics/event_objects/pics/berry_trees/lansat.png
new file mode 100644
index 0000000000..8ab63c9799
Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/lansat.png differ
diff --git a/graphics/event_objects/pics/berry_trees/lansat/0.png b/graphics/event_objects/pics/berry_trees/lansat/0.png
deleted file mode 100644
index 56d59b0a70..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/lansat/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/lansat/1.png b/graphics/event_objects/pics/berry_trees/lansat/1.png
deleted file mode 100644
index 59e7edcfa8..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/lansat/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/lansat/2.png b/graphics/event_objects/pics/berry_trees/lansat/2.png
deleted file mode 100644
index f4d1145ef0..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/lansat/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/lansat/3.png b/graphics/event_objects/pics/berry_trees/lansat/3.png
deleted file mode 100644
index 32ca5e3e9d..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/lansat/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/lansat/4.png b/graphics/event_objects/pics/berry_trees/lansat/4.png
deleted file mode 100644
index bf285b8ee1..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/lansat/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/lansat/5.png b/graphics/event_objects/pics/berry_trees/lansat/5.png
deleted file mode 100644
index 3a8dae404d..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/lansat/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/leppa.png b/graphics/event_objects/pics/berry_trees/leppa.png
new file mode 100644
index 0000000000..a0b3dccc01
Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/leppa.png differ
diff --git a/graphics/event_objects/pics/berry_trees/leppa/0.png b/graphics/event_objects/pics/berry_trees/leppa/0.png
deleted file mode 100644
index cecd61e2d6..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/leppa/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/leppa/1.png b/graphics/event_objects/pics/berry_trees/leppa/1.png
deleted file mode 100644
index f3ce88199f..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/leppa/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/leppa/2.png b/graphics/event_objects/pics/berry_trees/leppa/2.png
deleted file mode 100644
index d00cf5f890..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/leppa/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/leppa/3.png b/graphics/event_objects/pics/berry_trees/leppa/3.png
deleted file mode 100644
index 8a9ed3c343..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/leppa/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/leppa/4.png b/graphics/event_objects/pics/berry_trees/leppa/4.png
deleted file mode 100644
index dd4fc6df20..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/leppa/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/leppa/5.png b/graphics/event_objects/pics/berry_trees/leppa/5.png
deleted file mode 100644
index 056518295c..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/leppa/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/liechi.png b/graphics/event_objects/pics/berry_trees/liechi.png
new file mode 100644
index 0000000000..a845c5ac29
Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/liechi.png differ
diff --git a/graphics/event_objects/pics/berry_trees/liechi/0.png b/graphics/event_objects/pics/berry_trees/liechi/0.png
deleted file mode 100644
index 51827869f6..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/liechi/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/liechi/1.png b/graphics/event_objects/pics/berry_trees/liechi/1.png
deleted file mode 100644
index 1824002606..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/liechi/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/liechi/2.png b/graphics/event_objects/pics/berry_trees/liechi/2.png
deleted file mode 100644
index a24565623e..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/liechi/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/liechi/3.png b/graphics/event_objects/pics/berry_trees/liechi/3.png
deleted file mode 100644
index b7bde2e7f8..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/liechi/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/liechi/4.png b/graphics/event_objects/pics/berry_trees/liechi/4.png
deleted file mode 100644
index 2ed774c17b..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/liechi/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/liechi/5.png b/graphics/event_objects/pics/berry_trees/liechi/5.png
deleted file mode 100644
index d8fe39b210..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/liechi/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/lum.png b/graphics/event_objects/pics/berry_trees/lum.png
new file mode 100644
index 0000000000..e108e428ff
Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/lum.png differ
diff --git a/graphics/event_objects/pics/berry_trees/lum/0.png b/graphics/event_objects/pics/berry_trees/lum/0.png
deleted file mode 100644
index 4c08ea7973..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/lum/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/lum/1.png b/graphics/event_objects/pics/berry_trees/lum/1.png
deleted file mode 100644
index b2035c5556..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/lum/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/lum/2.png b/graphics/event_objects/pics/berry_trees/lum/2.png
deleted file mode 100644
index b09991fd91..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/lum/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/lum/3.png b/graphics/event_objects/pics/berry_trees/lum/3.png
deleted file mode 100644
index e32e7b64a7..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/lum/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/lum/4.png b/graphics/event_objects/pics/berry_trees/lum/4.png
deleted file mode 100644
index 1347d66b29..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/lum/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/lum/5.png b/graphics/event_objects/pics/berry_trees/lum/5.png
deleted file mode 100644
index 1c601d09ba..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/lum/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/mago.png b/graphics/event_objects/pics/berry_trees/mago.png
new file mode 100644
index 0000000000..cc30190d20
Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/mago.png differ
diff --git a/graphics/event_objects/pics/berry_trees/mago/0.png b/graphics/event_objects/pics/berry_trees/mago/0.png
deleted file mode 100644
index b58d4aba13..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/mago/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/mago/1.png b/graphics/event_objects/pics/berry_trees/mago/1.png
deleted file mode 100644
index 0ed2ad6adc..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/mago/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/mago/2.png b/graphics/event_objects/pics/berry_trees/mago/2.png
deleted file mode 100644
index 221af28062..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/mago/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/mago/3.png b/graphics/event_objects/pics/berry_trees/mago/3.png
deleted file mode 100644
index 71a8d42945..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/mago/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/mago/4.png b/graphics/event_objects/pics/berry_trees/mago/4.png
deleted file mode 100644
index ba6bf2d00c..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/mago/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/mago/5.png b/graphics/event_objects/pics/berry_trees/mago/5.png
deleted file mode 100644
index 6271425a3c..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/mago/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/nomel.png b/graphics/event_objects/pics/berry_trees/nomel.png
new file mode 100644
index 0000000000..b1c1804652
Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/nomel.png differ
diff --git a/graphics/event_objects/pics/berry_trees/nomel/0.png b/graphics/event_objects/pics/berry_trees/nomel/0.png
deleted file mode 100644
index d504524eb4..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/nomel/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/nomel/1.png b/graphics/event_objects/pics/berry_trees/nomel/1.png
deleted file mode 100644
index 37ff4b0827..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/nomel/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/nomel/2.png b/graphics/event_objects/pics/berry_trees/nomel/2.png
deleted file mode 100644
index 4e5c03cb4f..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/nomel/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/nomel/3.png b/graphics/event_objects/pics/berry_trees/nomel/3.png
deleted file mode 100644
index 7fd46d627f..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/nomel/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/nomel/4.png b/graphics/event_objects/pics/berry_trees/nomel/4.png
deleted file mode 100644
index 913274d81b..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/nomel/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/nomel/5.png b/graphics/event_objects/pics/berry_trees/nomel/5.png
deleted file mode 100644
index 3af9a516a7..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/nomel/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/oran.png b/graphics/event_objects/pics/berry_trees/oran.png
new file mode 100644
index 0000000000..7f98da25ec
Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/oran.png differ
diff --git a/graphics/event_objects/pics/berry_trees/oran/0.png b/graphics/event_objects/pics/berry_trees/oran/0.png
deleted file mode 100644
index 8770230dea..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/oran/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/oran/1.png b/graphics/event_objects/pics/berry_trees/oran/1.png
deleted file mode 100644
index afeb286a9c..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/oran/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/oran/2.png b/graphics/event_objects/pics/berry_trees/oran/2.png
deleted file mode 100644
index 7b7dc8b1ab..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/oran/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/oran/3.png b/graphics/event_objects/pics/berry_trees/oran/3.png
deleted file mode 100644
index 81857442d4..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/oran/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/oran/4.png b/graphics/event_objects/pics/berry_trees/oran/4.png
deleted file mode 100644
index 58a197d088..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/oran/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/oran/5.png b/graphics/event_objects/pics/berry_trees/oran/5.png
deleted file mode 100644
index 8878c8550b..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/oran/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/pamtre.png b/graphics/event_objects/pics/berry_trees/pamtre.png
new file mode 100644
index 0000000000..b2d7c590da
Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/pamtre.png differ
diff --git a/graphics/event_objects/pics/berry_trees/pamtre/0.png b/graphics/event_objects/pics/berry_trees/pamtre/0.png
deleted file mode 100644
index ac56c53703..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/pamtre/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/pamtre/1.png b/graphics/event_objects/pics/berry_trees/pamtre/1.png
deleted file mode 100644
index 1059746685..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/pamtre/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/pamtre/2.png b/graphics/event_objects/pics/berry_trees/pamtre/2.png
deleted file mode 100644
index 09363b8ba4..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/pamtre/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/pamtre/3.png b/graphics/event_objects/pics/berry_trees/pamtre/3.png
deleted file mode 100644
index 2638568308..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/pamtre/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/pamtre/4.png b/graphics/event_objects/pics/berry_trees/pamtre/4.png
deleted file mode 100644
index 509057976b..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/pamtre/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/pamtre/5.png b/graphics/event_objects/pics/berry_trees/pamtre/5.png
deleted file mode 100644
index 1adf263df1..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/pamtre/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/pecha.png b/graphics/event_objects/pics/berry_trees/pecha.png
new file mode 100644
index 0000000000..7078d2bd1c
Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/pecha.png differ
diff --git a/graphics/event_objects/pics/berry_trees/pecha/0.png b/graphics/event_objects/pics/berry_trees/pecha/0.png
deleted file mode 100644
index 8a69441a4a..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/pecha/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/pecha/1.png b/graphics/event_objects/pics/berry_trees/pecha/1.png
deleted file mode 100644
index 4d19237357..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/pecha/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/pecha/2.png b/graphics/event_objects/pics/berry_trees/pecha/2.png
deleted file mode 100644
index a93a377388..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/pecha/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/pecha/3.png b/graphics/event_objects/pics/berry_trees/pecha/3.png
deleted file mode 100644
index 5cd4f5e3c6..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/pecha/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/pecha/4.png b/graphics/event_objects/pics/berry_trees/pecha/4.png
deleted file mode 100644
index 451d74260f..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/pecha/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/pecha/5.png b/graphics/event_objects/pics/berry_trees/pecha/5.png
deleted file mode 100644
index 242a9b53f0..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/pecha/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/persim.png b/graphics/event_objects/pics/berry_trees/persim.png
new file mode 100644
index 0000000000..ff4d8f808a
Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/persim.png differ
diff --git a/graphics/event_objects/pics/berry_trees/persim/0.png b/graphics/event_objects/pics/berry_trees/persim/0.png
deleted file mode 100644
index 1996615ff4..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/persim/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/persim/1.png b/graphics/event_objects/pics/berry_trees/persim/1.png
deleted file mode 100644
index eda84785fb..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/persim/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/persim/2.png b/graphics/event_objects/pics/berry_trees/persim/2.png
deleted file mode 100644
index 6e71b37867..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/persim/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/persim/3.png b/graphics/event_objects/pics/berry_trees/persim/3.png
deleted file mode 100644
index f45bf06461..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/persim/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/persim/4.png b/graphics/event_objects/pics/berry_trees/persim/4.png
deleted file mode 100644
index a5aeda4101..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/persim/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/persim/5.png b/graphics/event_objects/pics/berry_trees/persim/5.png
deleted file mode 100644
index 72c69c0688..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/persim/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/pomeg.png b/graphics/event_objects/pics/berry_trees/pomeg.png
new file mode 100644
index 0000000000..78abc73eb1
Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/pomeg.png differ
diff --git a/graphics/event_objects/pics/berry_trees/pomeg/0.png b/graphics/event_objects/pics/berry_trees/pomeg/0.png
deleted file mode 100644
index c343bc2105..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/pomeg/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/pomeg/1.png b/graphics/event_objects/pics/berry_trees/pomeg/1.png
deleted file mode 100644
index cc1c08f92b..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/pomeg/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/pomeg/2.png b/graphics/event_objects/pics/berry_trees/pomeg/2.png
deleted file mode 100644
index 46d0fb7cc7..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/pomeg/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/pomeg/3.png b/graphics/event_objects/pics/berry_trees/pomeg/3.png
deleted file mode 100644
index d2475b7483..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/pomeg/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/pomeg/4.png b/graphics/event_objects/pics/berry_trees/pomeg/4.png
deleted file mode 100644
index 4f30192130..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/pomeg/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/pomeg/5.png b/graphics/event_objects/pics/berry_trees/pomeg/5.png
deleted file mode 100644
index f519675ce7..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/pomeg/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/rabuta.png b/graphics/event_objects/pics/berry_trees/rabuta.png
new file mode 100644
index 0000000000..b7a2c85d6e
Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/rabuta.png differ
diff --git a/graphics/event_objects/pics/berry_trees/rabuta/0.png b/graphics/event_objects/pics/berry_trees/rabuta/0.png
deleted file mode 100644
index 5fe85e4e3f..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/rabuta/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/rabuta/1.png b/graphics/event_objects/pics/berry_trees/rabuta/1.png
deleted file mode 100644
index 0973e21cbf..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/rabuta/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/rabuta/2.png b/graphics/event_objects/pics/berry_trees/rabuta/2.png
deleted file mode 100644
index c2d027ebd3..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/rabuta/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/rabuta/3.png b/graphics/event_objects/pics/berry_trees/rabuta/3.png
deleted file mode 100644
index 79b2cc45f0..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/rabuta/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/rabuta/4.png b/graphics/event_objects/pics/berry_trees/rabuta/4.png
deleted file mode 100644
index 9313500422..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/rabuta/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/rabuta/5.png b/graphics/event_objects/pics/berry_trees/rabuta/5.png
deleted file mode 100644
index efa1ac89e1..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/rabuta/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/rawst.png b/graphics/event_objects/pics/berry_trees/rawst.png
new file mode 100644
index 0000000000..e0bcac5322
Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/rawst.png differ
diff --git a/graphics/event_objects/pics/berry_trees/rawst/0.png b/graphics/event_objects/pics/berry_trees/rawst/0.png
deleted file mode 100644
index ef35480028..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/rawst/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/rawst/1.png b/graphics/event_objects/pics/berry_trees/rawst/1.png
deleted file mode 100644
index dccad21b02..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/rawst/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/rawst/2.png b/graphics/event_objects/pics/berry_trees/rawst/2.png
deleted file mode 100644
index d89f7484e1..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/rawst/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/rawst/3.png b/graphics/event_objects/pics/berry_trees/rawst/3.png
deleted file mode 100644
index afd11e0f62..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/rawst/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/rawst/4.png b/graphics/event_objects/pics/berry_trees/rawst/4.png
deleted file mode 100644
index aada33789e..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/rawst/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/rawst/5.png b/graphics/event_objects/pics/berry_trees/rawst/5.png
deleted file mode 100644
index 311044bf0b..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/rawst/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/razz.png b/graphics/event_objects/pics/berry_trees/razz.png
new file mode 100644
index 0000000000..70f56bc8b6
Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/razz.png differ
diff --git a/graphics/event_objects/pics/berry_trees/razz/0.png b/graphics/event_objects/pics/berry_trees/razz/0.png
deleted file mode 100644
index 4685d0977c..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/razz/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/razz/1.png b/graphics/event_objects/pics/berry_trees/razz/1.png
deleted file mode 100644
index 396122c5b9..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/razz/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/razz/2.png b/graphics/event_objects/pics/berry_trees/razz/2.png
deleted file mode 100644
index f48a2c6e21..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/razz/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/razz/3.png b/graphics/event_objects/pics/berry_trees/razz/3.png
deleted file mode 100644
index 47e6a52c12..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/razz/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/razz/4.png b/graphics/event_objects/pics/berry_trees/razz/4.png
deleted file mode 100644
index 075c4674b2..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/razz/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/razz/5.png b/graphics/event_objects/pics/berry_trees/razz/5.png
deleted file mode 100644
index 7ae7b7bbac..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/razz/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/sitrus.png b/graphics/event_objects/pics/berry_trees/sitrus.png
new file mode 100644
index 0000000000..bdfece8608
Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/sitrus.png differ
diff --git a/graphics/event_objects/pics/berry_trees/sitrus/0.png b/graphics/event_objects/pics/berry_trees/sitrus/0.png
deleted file mode 100644
index 64671e0a1f..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/sitrus/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/sitrus/1.png b/graphics/event_objects/pics/berry_trees/sitrus/1.png
deleted file mode 100644
index 13f82d0927..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/sitrus/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/sitrus/2.png b/graphics/event_objects/pics/berry_trees/sitrus/2.png
deleted file mode 100644
index 7a382402a0..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/sitrus/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/sitrus/3.png b/graphics/event_objects/pics/berry_trees/sitrus/3.png
deleted file mode 100644
index 6bbc0dca0c..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/sitrus/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/sitrus/4.png b/graphics/event_objects/pics/berry_trees/sitrus/4.png
deleted file mode 100644
index 1e6ff68389..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/sitrus/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/sitrus/5.png b/graphics/event_objects/pics/berry_trees/sitrus/5.png
deleted file mode 100644
index cd97f552f3..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/sitrus/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/spelon.png b/graphics/event_objects/pics/berry_trees/spelon.png
new file mode 100644
index 0000000000..d9b7f41745
Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/spelon.png differ
diff --git a/graphics/event_objects/pics/berry_trees/spelon/0.png b/graphics/event_objects/pics/berry_trees/spelon/0.png
deleted file mode 100644
index 32bd06af1b..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/spelon/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/spelon/1.png b/graphics/event_objects/pics/berry_trees/spelon/1.png
deleted file mode 100644
index 37e77e391d..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/spelon/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/spelon/2.png b/graphics/event_objects/pics/berry_trees/spelon/2.png
deleted file mode 100644
index d36cf3b16f..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/spelon/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/spelon/3.png b/graphics/event_objects/pics/berry_trees/spelon/3.png
deleted file mode 100644
index 6a7099d834..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/spelon/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/spelon/4.png b/graphics/event_objects/pics/berry_trees/spelon/4.png
deleted file mode 100644
index de1c24e587..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/spelon/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/spelon/5.png b/graphics/event_objects/pics/berry_trees/spelon/5.png
deleted file mode 100644
index 578231a24e..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/spelon/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/sprout.png b/graphics/event_objects/pics/berry_trees/sprout.png
new file mode 100644
index 0000000000..8fee510bdc
Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/sprout.png differ
diff --git a/graphics/event_objects/pics/berry_trees/sprout/0.png b/graphics/event_objects/pics/berry_trees/sprout/0.png
deleted file mode 100644
index df37532a70..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/sprout/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/sprout/1.png b/graphics/event_objects/pics/berry_trees/sprout/1.png
deleted file mode 100644
index f0a67f382c..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/sprout/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/tamato.png b/graphics/event_objects/pics/berry_trees/tamato.png
new file mode 100644
index 0000000000..d0770746bd
Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/tamato.png differ
diff --git a/graphics/event_objects/pics/berry_trees/tamato/0.png b/graphics/event_objects/pics/berry_trees/tamato/0.png
deleted file mode 100644
index 499e473bc1..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/tamato/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/tamato/1.png b/graphics/event_objects/pics/berry_trees/tamato/1.png
deleted file mode 100644
index 2c45d60d8d..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/tamato/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/tamato/2.png b/graphics/event_objects/pics/berry_trees/tamato/2.png
deleted file mode 100644
index ef3ac700bc..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/tamato/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/tamato/3.png b/graphics/event_objects/pics/berry_trees/tamato/3.png
deleted file mode 100644
index 57b60904f7..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/tamato/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/tamato/4.png b/graphics/event_objects/pics/berry_trees/tamato/4.png
deleted file mode 100644
index 823ff49a7e..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/tamato/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/tamato/5.png b/graphics/event_objects/pics/berry_trees/tamato/5.png
deleted file mode 100644
index 8656cb5db3..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/tamato/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/wepear.png b/graphics/event_objects/pics/berry_trees/wepear.png
new file mode 100644
index 0000000000..133140843f
Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/wepear.png differ
diff --git a/graphics/event_objects/pics/berry_trees/wepear/0.png b/graphics/event_objects/pics/berry_trees/wepear/0.png
deleted file mode 100644
index ccf834a94e..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/wepear/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/wepear/1.png b/graphics/event_objects/pics/berry_trees/wepear/1.png
deleted file mode 100644
index d46390bdde..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/wepear/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/wepear/2.png b/graphics/event_objects/pics/berry_trees/wepear/2.png
deleted file mode 100644
index 040a70931e..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/wepear/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/wepear/3.png b/graphics/event_objects/pics/berry_trees/wepear/3.png
deleted file mode 100644
index 94918f7ff7..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/wepear/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/wepear/4.png b/graphics/event_objects/pics/berry_trees/wepear/4.png
deleted file mode 100644
index ee242d6576..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/wepear/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/wepear/5.png b/graphics/event_objects/pics/berry_trees/wepear/5.png
deleted file mode 100644
index 1b5256a9eb..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/wepear/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/wiki.png b/graphics/event_objects/pics/berry_trees/wiki.png
new file mode 100644
index 0000000000..a78d55db4f
Binary files /dev/null and b/graphics/event_objects/pics/berry_trees/wiki.png differ
diff --git a/graphics/event_objects/pics/berry_trees/wiki/0.png b/graphics/event_objects/pics/berry_trees/wiki/0.png
deleted file mode 100644
index e51325e18d..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/wiki/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/wiki/1.png b/graphics/event_objects/pics/berry_trees/wiki/1.png
deleted file mode 100644
index f7f28e44b1..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/wiki/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/wiki/2.png b/graphics/event_objects/pics/berry_trees/wiki/2.png
deleted file mode 100644
index e7d6c3824c..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/wiki/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/wiki/3.png b/graphics/event_objects/pics/berry_trees/wiki/3.png
deleted file mode 100644
index 6447302a6a..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/wiki/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/wiki/4.png b/graphics/event_objects/pics/berry_trees/wiki/4.png
deleted file mode 100644
index a494a7eaaa..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/wiki/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/berry_trees/wiki/5.png b/graphics/event_objects/pics/berry_trees/wiki/5.png
deleted file mode 100644
index 5a6b9f1934..0000000000
Binary files a/graphics/event_objects/pics/berry_trees/wiki/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/effects/arrow.png b/graphics/event_objects/pics/effects/arrow.png
new file mode 100644
index 0000000000..a530b5344a
Binary files /dev/null and b/graphics/event_objects/pics/effects/arrow.png differ
diff --git a/graphics/event_objects/pics/effects/arrow/0.png b/graphics/event_objects/pics/effects/arrow/0.png
deleted file mode 100644
index 3f06be0649..0000000000
Binary files a/graphics/event_objects/pics/effects/arrow/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/effects/arrow/1.png b/graphics/event_objects/pics/effects/arrow/1.png
deleted file mode 100644
index 87bbd99fff..0000000000
Binary files a/graphics/event_objects/pics/effects/arrow/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/effects/arrow/2.png b/graphics/event_objects/pics/effects/arrow/2.png
deleted file mode 100644
index f9abae71d4..0000000000
Binary files a/graphics/event_objects/pics/effects/arrow/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/effects/arrow/3.png b/graphics/event_objects/pics/effects/arrow/3.png
deleted file mode 100644
index 58d43a6d86..0000000000
Binary files a/graphics/event_objects/pics/effects/arrow/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/effects/arrow/4.png b/graphics/event_objects/pics/effects/arrow/4.png
deleted file mode 100644
index ef95afd9eb..0000000000
Binary files a/graphics/event_objects/pics/effects/arrow/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/effects/arrow/5.png b/graphics/event_objects/pics/effects/arrow/5.png
deleted file mode 100644
index 71b7e0c270..0000000000
Binary files a/graphics/event_objects/pics/effects/arrow/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/effects/arrow/6.png b/graphics/event_objects/pics/effects/arrow/6.png
deleted file mode 100644
index 53c33f44cb..0000000000
Binary files a/graphics/event_objects/pics/effects/arrow/6.png and /dev/null differ
diff --git a/graphics/event_objects/pics/effects/arrow/7.png b/graphics/event_objects/pics/effects/arrow/7.png
deleted file mode 100644
index bda7862da4..0000000000
Binary files a/graphics/event_objects/pics/effects/arrow/7.png and /dev/null differ
diff --git a/graphics/event_objects/pics/effects/ash.png b/graphics/event_objects/pics/effects/ash.png
new file mode 100644
index 0000000000..472583def0
Binary files /dev/null and b/graphics/event_objects/pics/effects/ash.png differ
diff --git a/graphics/event_objects/pics/effects/ash/0.png b/graphics/event_objects/pics/effects/ash/0.png
deleted file mode 100644
index 96a4b8f2af..0000000000
Binary files a/graphics/event_objects/pics/effects/ash/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/effects/ash/1.png b/graphics/event_objects/pics/effects/ash/1.png
deleted file mode 100644
index 8d973518d4..0000000000
Binary files a/graphics/event_objects/pics/effects/ash/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/effects/ash/2.png b/graphics/event_objects/pics/effects/ash/2.png
deleted file mode 100644
index eccd2e02d1..0000000000
Binary files a/graphics/event_objects/pics/effects/ash/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/effects/ash/3.png b/graphics/event_objects/pics/effects/ash/3.png
deleted file mode 100644
index 5ad0b8e5a4..0000000000
Binary files a/graphics/event_objects/pics/effects/ash/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/effects/ash/4.png b/graphics/event_objects/pics/effects/ash/4.png
deleted file mode 100644
index 7208f6a5b2..0000000000
Binary files a/graphics/event_objects/pics/effects/ash/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/effects/berry_tree_growth_sparkle/berry_tree_growth_sparkle.png b/graphics/event_objects/pics/effects/berry_tree_growth_sparkle/berry_tree_growth_sparkle.png
new file mode 100644
index 0000000000..4fd6e4d5fe
Binary files /dev/null and b/graphics/event_objects/pics/effects/berry_tree_growth_sparkle/berry_tree_growth_sparkle.png differ
diff --git a/graphics/event_objects/pics/effects/bike_hop_big_splash.png b/graphics/event_objects/pics/effects/bike_hop_big_splash.png
new file mode 100644
index 0000000000..4546340fe7
Binary files /dev/null and b/graphics/event_objects/pics/effects/bike_hop_big_splash.png differ
diff --git a/graphics/event_objects/pics/effects/bike_hop_big_splash/0.png b/graphics/event_objects/pics/effects/bike_hop_big_splash/0.png
deleted file mode 100644
index 420663da83..0000000000
Binary files a/graphics/event_objects/pics/effects/bike_hop_big_splash/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/effects/bike_hop_big_splash/1.png b/graphics/event_objects/pics/effects/bike_hop_big_splash/1.png
deleted file mode 100644
index 72ca8fa1c1..0000000000
Binary files a/graphics/event_objects/pics/effects/bike_hop_big_splash/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/effects/bike_hop_big_splash/2.png b/graphics/event_objects/pics/effects/bike_hop_big_splash/2.png
deleted file mode 100644
index 96c224cdf1..0000000000
Binary files a/graphics/event_objects/pics/effects/bike_hop_big_splash/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/effects/bike_hop_big_splash/3.png b/graphics/event_objects/pics/effects/bike_hop_big_splash/3.png
deleted file mode 100644
index b549ea78c1..0000000000
Binary files a/graphics/event_objects/pics/effects/bike_hop_big_splash/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/effects/bike_hop_small_splash.png b/graphics/event_objects/pics/effects/bike_hop_small_splash.png
new file mode 100644
index 0000000000..523238a1d4
Binary files /dev/null and b/graphics/event_objects/pics/effects/bike_hop_small_splash.png differ
diff --git a/graphics/event_objects/pics/effects/bike_hop_small_splash/0.png b/graphics/event_objects/pics/effects/bike_hop_small_splash/0.png
deleted file mode 100644
index b5cccb306d..0000000000
Binary files a/graphics/event_objects/pics/effects/bike_hop_small_splash/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/effects/bike_hop_small_splash/1.png b/graphics/event_objects/pics/effects/bike_hop_small_splash/1.png
deleted file mode 100644
index 548198c092..0000000000
Binary files a/graphics/event_objects/pics/effects/bike_hop_small_splash/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/effects/bike_hop_small_splash/2.png b/graphics/event_objects/pics/effects/bike_hop_small_splash/2.png
deleted file mode 100644
index e8b86dfcb4..0000000000
Binary files a/graphics/event_objects/pics/effects/bike_hop_small_splash/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/effects/bike_hop_tall_grass/bike_hop_tall_grass.png b/graphics/event_objects/pics/effects/bike_hop_tall_grass/bike_hop_tall_grass.png
new file mode 100644
index 0000000000..805f260235
Binary files /dev/null and b/graphics/event_objects/pics/effects/bike_hop_tall_grass/bike_hop_tall_grass.png differ
diff --git a/graphics/event_objects/pics/effects/bike_tire_tracks/bike_tire_tracks.png b/graphics/event_objects/pics/effects/bike_tire_tracks/bike_tire_tracks.png
new file mode 100644
index 0000000000..383a393c4d
Binary files /dev/null and b/graphics/event_objects/pics/effects/bike_tire_tracks/bike_tire_tracks.png differ
diff --git a/graphics/event_objects/pics/effects/bubbles.png b/graphics/event_objects/pics/effects/bubbles.png
new file mode 100644
index 0000000000..554fc8425e
Binary files /dev/null and b/graphics/event_objects/pics/effects/bubbles.png differ
diff --git a/graphics/event_objects/pics/effects/bubbles/0.png b/graphics/event_objects/pics/effects/bubbles/0.png
deleted file mode 100644
index b71b193aea..0000000000
Binary files a/graphics/event_objects/pics/effects/bubbles/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/effects/bubbles/1.png b/graphics/event_objects/pics/effects/bubbles/1.png
deleted file mode 100644
index 0bd744ef20..0000000000
Binary files a/graphics/event_objects/pics/effects/bubbles/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/effects/bubbles/2.png b/graphics/event_objects/pics/effects/bubbles/2.png
deleted file mode 100644
index 4241e8f24c..0000000000
Binary files a/graphics/event_objects/pics/effects/bubbles/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/effects/bubbles/3.png b/graphics/event_objects/pics/effects/bubbles/3.png
deleted file mode 100644
index 3b440d9a74..0000000000
Binary files a/graphics/event_objects/pics/effects/bubbles/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/effects/bubbles/4.png b/graphics/event_objects/pics/effects/bubbles/4.png
deleted file mode 100644
index de9e66a257..0000000000
Binary files a/graphics/event_objects/pics/effects/bubbles/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/effects/bubbles/5.png b/graphics/event_objects/pics/effects/bubbles/5.png
deleted file mode 100644
index 54b9d768b7..0000000000
Binary files a/graphics/event_objects/pics/effects/bubbles/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/effects/bubbles/6.png b/graphics/event_objects/pics/effects/bubbles/6.png
deleted file mode 100644
index 35c26e6339..0000000000
Binary files a/graphics/event_objects/pics/effects/bubbles/6.png and /dev/null differ
diff --git a/graphics/event_objects/pics/effects/bubbles/7.png b/graphics/event_objects/pics/effects/bubbles/7.png
deleted file mode 100644
index 6323e0cc5c..0000000000
Binary files a/graphics/event_objects/pics/effects/bubbles/7.png and /dev/null differ
diff --git a/graphics/event_objects/pics/effects/deep_sand_footprints/deep_sand_footprints.png b/graphics/event_objects/pics/effects/deep_sand_footprints/deep_sand_footprints.png
new file mode 100644
index 0000000000..8719bd7a24
Binary files /dev/null and b/graphics/event_objects/pics/effects/deep_sand_footprints/deep_sand_footprints.png differ
diff --git a/graphics/event_objects/pics/effects/ground_impact_dust/ground_impact_dust.png b/graphics/event_objects/pics/effects/ground_impact_dust/ground_impact_dust.png
new file mode 100644
index 0000000000..83b25a6057
Binary files /dev/null and b/graphics/event_objects/pics/effects/ground_impact_dust/ground_impact_dust.png differ
diff --git a/graphics/event_objects/pics/effects/jump_out_of_ash.png b/graphics/event_objects/pics/effects/jump_out_of_ash.png
new file mode 100644
index 0000000000..b5161274ab
Binary files /dev/null and b/graphics/event_objects/pics/effects/jump_out_of_ash.png differ
diff --git a/graphics/event_objects/pics/effects/jump_out_of_ash/0.png b/graphics/event_objects/pics/effects/jump_out_of_ash/0.png
deleted file mode 100644
index 50f9796b26..0000000000
Binary files a/graphics/event_objects/pics/effects/jump_out_of_ash/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/effects/jump_out_of_ash/1.png b/graphics/event_objects/pics/effects/jump_out_of_ash/1.png
deleted file mode 100644
index 685d31fac7..0000000000
Binary files a/graphics/event_objects/pics/effects/jump_out_of_ash/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/effects/jump_out_of_ash/2.png b/graphics/event_objects/pics/effects/jump_out_of_ash/2.png
deleted file mode 100644
index 9f11f176f4..0000000000
Binary files a/graphics/event_objects/pics/effects/jump_out_of_ash/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/effects/jump_out_of_ash/3.png b/graphics/event_objects/pics/effects/jump_out_of_ash/3.png
deleted file mode 100644
index 124581f755..0000000000
Binary files a/graphics/event_objects/pics/effects/jump_out_of_ash/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/effects/jump_out_of_ash/4.png b/graphics/event_objects/pics/effects/jump_out_of_ash/4.png
deleted file mode 100644
index 6e584a4dcf..0000000000
Binary files a/graphics/event_objects/pics/effects/jump_out_of_ash/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/effects/long_grass/long_grass.png b/graphics/event_objects/pics/effects/long_grass/long_grass.png
new file mode 100644
index 0000000000..5dfc3b2469
Binary files /dev/null and b/graphics/event_objects/pics/effects/long_grass/long_grass.png differ
diff --git a/graphics/event_objects/pics/effects/mountain_disguise.png b/graphics/event_objects/pics/effects/mountain_disguise.png
new file mode 100644
index 0000000000..ad592eac89
Binary files /dev/null and b/graphics/event_objects/pics/effects/mountain_disguise.png differ
diff --git a/graphics/event_objects/pics/effects/mountain_disguise/0.png b/graphics/event_objects/pics/effects/mountain_disguise/0.png
deleted file mode 100644
index 104056e469..0000000000
Binary files a/graphics/event_objects/pics/effects/mountain_disguise/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/effects/mountain_disguise/1.png b/graphics/event_objects/pics/effects/mountain_disguise/1.png
deleted file mode 100644
index 4b2d35963e..0000000000
Binary files a/graphics/event_objects/pics/effects/mountain_disguise/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/effects/mountain_disguise/2.png b/graphics/event_objects/pics/effects/mountain_disguise/2.png
deleted file mode 100644
index e2ea3b8558..0000000000
Binary files a/graphics/event_objects/pics/effects/mountain_disguise/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/effects/mountain_disguise/3.png b/graphics/event_objects/pics/effects/mountain_disguise/3.png
deleted file mode 100644
index 8f0a1be2ca..0000000000
Binary files a/graphics/event_objects/pics/effects/mountain_disguise/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/effects/mountain_disguise/4.png b/graphics/event_objects/pics/effects/mountain_disguise/4.png
deleted file mode 100644
index 8fd4df4106..0000000000
Binary files a/graphics/event_objects/pics/effects/mountain_disguise/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/effects/mountain_disguise/5.png b/graphics/event_objects/pics/effects/mountain_disguise/5.png
deleted file mode 100644
index a364b234d6..0000000000
Binary files a/graphics/event_objects/pics/effects/mountain_disguise/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/effects/mountain_disguise/6.png b/graphics/event_objects/pics/effects/mountain_disguise/6.png
deleted file mode 100644
index 2644aa9f14..0000000000
Binary files a/graphics/event_objects/pics/effects/mountain_disguise/6.png and /dev/null differ
diff --git a/graphics/event_objects/pics/effects/ripple.png b/graphics/event_objects/pics/effects/ripple.png
new file mode 100644
index 0000000000..0352ef2d8b
Binary files /dev/null and b/graphics/event_objects/pics/effects/ripple.png differ
diff --git a/graphics/event_objects/pics/effects/ripple/0.png b/graphics/event_objects/pics/effects/ripple/0.png
deleted file mode 100644
index 24055c7d29..0000000000
Binary files a/graphics/event_objects/pics/effects/ripple/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/effects/ripple/1.png b/graphics/event_objects/pics/effects/ripple/1.png
deleted file mode 100644
index a478539250..0000000000
Binary files a/graphics/event_objects/pics/effects/ripple/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/effects/ripple/2.png b/graphics/event_objects/pics/effects/ripple/2.png
deleted file mode 100644
index 6670cb7799..0000000000
Binary files a/graphics/event_objects/pics/effects/ripple/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/effects/ripple/3.png b/graphics/event_objects/pics/effects/ripple/3.png
deleted file mode 100644
index 122df1940a..0000000000
Binary files a/graphics/event_objects/pics/effects/ripple/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/effects/ripple/4.png b/graphics/event_objects/pics/effects/ripple/4.png
deleted file mode 100644
index f4f79afe20..0000000000
Binary files a/graphics/event_objects/pics/effects/ripple/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/effects/sand_disguise_placeholder.png b/graphics/event_objects/pics/effects/sand_disguise_placeholder.png
new file mode 100644
index 0000000000..66b9993e77
Binary files /dev/null and b/graphics/event_objects/pics/effects/sand_disguise_placeholder.png differ
diff --git a/graphics/event_objects/pics/effects/sand_disguise_placeholder/0.png b/graphics/event_objects/pics/effects/sand_disguise_placeholder/0.png
deleted file mode 100644
index df242de2f1..0000000000
Binary files a/graphics/event_objects/pics/effects/sand_disguise_placeholder/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/effects/sand_disguise_placeholder/1.png b/graphics/event_objects/pics/effects/sand_disguise_placeholder/1.png
deleted file mode 100644
index 2e993b30ec..0000000000
Binary files a/graphics/event_objects/pics/effects/sand_disguise_placeholder/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/effects/sand_disguise_placeholder/2.png b/graphics/event_objects/pics/effects/sand_disguise_placeholder/2.png
deleted file mode 100644
index 3d6864e417..0000000000
Binary files a/graphics/event_objects/pics/effects/sand_disguise_placeholder/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/effects/sand_disguise_placeholder/3.png b/graphics/event_objects/pics/effects/sand_disguise_placeholder/3.png
deleted file mode 100644
index 690110a8c3..0000000000
Binary files a/graphics/event_objects/pics/effects/sand_disguise_placeholder/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/effects/sand_disguise_placeholder/4.png b/graphics/event_objects/pics/effects/sand_disguise_placeholder/4.png
deleted file mode 100644
index caa568eaca..0000000000
Binary files a/graphics/event_objects/pics/effects/sand_disguise_placeholder/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/effects/sand_disguise_placeholder/5.png b/graphics/event_objects/pics/effects/sand_disguise_placeholder/5.png
deleted file mode 100644
index 0d0bd9886b..0000000000
Binary files a/graphics/event_objects/pics/effects/sand_disguise_placeholder/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/effects/sand_disguise_placeholder/6.png b/graphics/event_objects/pics/effects/sand_disguise_placeholder/6.png
deleted file mode 100644
index ed40527d0e..0000000000
Binary files a/graphics/event_objects/pics/effects/sand_disguise_placeholder/6.png and /dev/null differ
diff --git a/graphics/event_objects/pics/effects/sand_footprints/sand_footprints.png b/graphics/event_objects/pics/effects/sand_footprints/sand_footprints.png
new file mode 100644
index 0000000000..cec011d0a5
Binary files /dev/null and b/graphics/event_objects/pics/effects/sand_footprints/sand_footprints.png differ
diff --git a/graphics/event_objects/pics/effects/short_grass.png b/graphics/event_objects/pics/effects/short_grass.png
new file mode 100644
index 0000000000..53eb7924e2
Binary files /dev/null and b/graphics/event_objects/pics/effects/short_grass.png differ
diff --git a/graphics/event_objects/pics/effects/short_grass/0.png b/graphics/event_objects/pics/effects/short_grass/0.png
deleted file mode 100644
index a5d5181db3..0000000000
Binary files a/graphics/event_objects/pics/effects/short_grass/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/effects/short_grass/1.png b/graphics/event_objects/pics/effects/short_grass/1.png
deleted file mode 100644
index 17a62968a8..0000000000
Binary files a/graphics/event_objects/pics/effects/short_grass/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/effects/splash.png b/graphics/event_objects/pics/effects/splash.png
new file mode 100644
index 0000000000..a33a0c9dac
Binary files /dev/null and b/graphics/event_objects/pics/effects/splash.png differ
diff --git a/graphics/event_objects/pics/effects/splash/0.png b/graphics/event_objects/pics/effects/splash/0.png
deleted file mode 100644
index 2b29c76ae3..0000000000
Binary files a/graphics/event_objects/pics/effects/splash/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/effects/splash/1.png b/graphics/event_objects/pics/effects/splash/1.png
deleted file mode 100644
index 1807213420..0000000000
Binary files a/graphics/event_objects/pics/effects/splash/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/effects/surf_blob.png b/graphics/event_objects/pics/effects/surf_blob.png
new file mode 100644
index 0000000000..7e91e17dc1
Binary files /dev/null and b/graphics/event_objects/pics/effects/surf_blob.png differ
diff --git a/graphics/event_objects/pics/effects/surf_blob/0.png b/graphics/event_objects/pics/effects/surf_blob/0.png
deleted file mode 100644
index c4a14e052e..0000000000
Binary files a/graphics/event_objects/pics/effects/surf_blob/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/effects/surf_blob/1.png b/graphics/event_objects/pics/effects/surf_blob/1.png
deleted file mode 100644
index 25fd5ad929..0000000000
Binary files a/graphics/event_objects/pics/effects/surf_blob/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/effects/surf_blob/2.png b/graphics/event_objects/pics/effects/surf_blob/2.png
deleted file mode 100644
index 532da2611f..0000000000
Binary files a/graphics/event_objects/pics/effects/surf_blob/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/effects/tall_grass.png b/graphics/event_objects/pics/effects/tall_grass.png
new file mode 100644
index 0000000000..b6b44307a9
Binary files /dev/null and b/graphics/event_objects/pics/effects/tall_grass.png differ
diff --git a/graphics/event_objects/pics/effects/tall_grass/0.png b/graphics/event_objects/pics/effects/tall_grass/0.png
deleted file mode 100644
index 00d596b4cf..0000000000
Binary files a/graphics/event_objects/pics/effects/tall_grass/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/effects/tall_grass/1.png b/graphics/event_objects/pics/effects/tall_grass/1.png
deleted file mode 100644
index 0c8bdd84ed..0000000000
Binary files a/graphics/event_objects/pics/effects/tall_grass/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/effects/tall_grass/2.png b/graphics/event_objects/pics/effects/tall_grass/2.png
deleted file mode 100644
index 55d971758a..0000000000
Binary files a/graphics/event_objects/pics/effects/tall_grass/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/effects/tall_grass/3.png b/graphics/event_objects/pics/effects/tall_grass/3.png
deleted file mode 100644
index 0add110833..0000000000
Binary files a/graphics/event_objects/pics/effects/tall_grass/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/effects/tall_grass/4.png b/graphics/event_objects/pics/effects/tall_grass/4.png
deleted file mode 100644
index ca164d3cc2..0000000000
Binary files a/graphics/event_objects/pics/effects/tall_grass/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/effects/tree_disguise.png b/graphics/event_objects/pics/effects/tree_disguise.png
new file mode 100644
index 0000000000..77d07ef4ed
Binary files /dev/null and b/graphics/event_objects/pics/effects/tree_disguise.png differ
diff --git a/graphics/event_objects/pics/effects/tree_disguise/0.png b/graphics/event_objects/pics/effects/tree_disguise/0.png
deleted file mode 100644
index 2bce7f9edd..0000000000
Binary files a/graphics/event_objects/pics/effects/tree_disguise/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/effects/tree_disguise/1.png b/graphics/event_objects/pics/effects/tree_disguise/1.png
deleted file mode 100644
index e29336cd4a..0000000000
Binary files a/graphics/event_objects/pics/effects/tree_disguise/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/effects/tree_disguise/2.png b/graphics/event_objects/pics/effects/tree_disguise/2.png
deleted file mode 100644
index 2cca165c5f..0000000000
Binary files a/graphics/event_objects/pics/effects/tree_disguise/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/effects/tree_disguise/3.png b/graphics/event_objects/pics/effects/tree_disguise/3.png
deleted file mode 100644
index 85dd30cfd5..0000000000
Binary files a/graphics/event_objects/pics/effects/tree_disguise/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/effects/tree_disguise/4.png b/graphics/event_objects/pics/effects/tree_disguise/4.png
deleted file mode 100644
index 8c78216343..0000000000
Binary files a/graphics/event_objects/pics/effects/tree_disguise/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/effects/tree_disguise/5.png b/graphics/event_objects/pics/effects/tree_disguise/5.png
deleted file mode 100644
index 2ffd56fcc4..0000000000
Binary files a/graphics/event_objects/pics/effects/tree_disguise/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/effects/tree_disguise/6.png b/graphics/event_objects/pics/effects/tree_disguise/6.png
deleted file mode 100644
index bc93331628..0000000000
Binary files a/graphics/event_objects/pics/effects/tree_disguise/6.png and /dev/null differ
diff --git a/graphics/event_objects/pics/effects/unknown_17.png b/graphics/event_objects/pics/effects/unknown_17.png
new file mode 100644
index 0000000000..fedf86a10b
Binary files /dev/null and b/graphics/event_objects/pics/effects/unknown_17.png differ
diff --git a/graphics/event_objects/pics/effects/unknown_17/0.png b/graphics/event_objects/pics/effects/unknown_17/0.png
deleted file mode 100644
index 9c804844e5..0000000000
Binary files a/graphics/event_objects/pics/effects/unknown_17/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/effects/unknown_17/1.png b/graphics/event_objects/pics/effects/unknown_17/1.png
deleted file mode 100644
index 6628b58209..0000000000
Binary files a/graphics/event_objects/pics/effects/unknown_17/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/effects/unknown_17/2.png b/graphics/event_objects/pics/effects/unknown_17/2.png
deleted file mode 100644
index a5cdcca575..0000000000
Binary files a/graphics/event_objects/pics/effects/unknown_17/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/effects/unknown_17/3.png b/graphics/event_objects/pics/effects/unknown_17/3.png
deleted file mode 100644
index 2f9a20019a..0000000000
Binary files a/graphics/event_objects/pics/effects/unknown_17/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/effects/unknown_17/4.png b/graphics/event_objects/pics/effects/unknown_17/4.png
deleted file mode 100644
index ce0bc29aad..0000000000
Binary files a/graphics/event_objects/pics/effects/unknown_17/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/effects/unknown_17/5.png b/graphics/event_objects/pics/effects/unknown_17/5.png
deleted file mode 100644
index f92888a3a5..0000000000
Binary files a/graphics/event_objects/pics/effects/unknown_17/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/effects/unknown_17/6.png b/graphics/event_objects/pics/effects/unknown_17/6.png
deleted file mode 100644
index 7e740a9569..0000000000
Binary files a/graphics/event_objects/pics/effects/unknown_17/6.png and /dev/null differ
diff --git a/graphics/event_objects/pics/effects/unknown_17/7.png b/graphics/event_objects/pics/effects/unknown_17/7.png
deleted file mode 100644
index 25d90e16c1..0000000000
Binary files a/graphics/event_objects/pics/effects/unknown_17/7.png and /dev/null differ
diff --git a/graphics/event_objects/pics/effects/unknown_18/unknown_18.png b/graphics/event_objects/pics/effects/unknown_18/unknown_18.png
new file mode 100644
index 0000000000..19f08ac537
Binary files /dev/null and b/graphics/event_objects/pics/effects/unknown_18/unknown_18.png differ
diff --git a/graphics/event_objects/pics/effects/unknown_19/unknown_19.png b/graphics/event_objects/pics/effects/unknown_19/unknown_19.png
new file mode 100644
index 0000000000..d670cde5fc
Binary files /dev/null and b/graphics/event_objects/pics/effects/unknown_19/unknown_19.png differ
diff --git a/graphics/event_objects/pics/effects/unknown_20/unknown_20.png b/graphics/event_objects/pics/effects/unknown_20/unknown_20.png
new file mode 100644
index 0000000000..83e35467a1
Binary files /dev/null and b/graphics/event_objects/pics/effects/unknown_20/unknown_20.png differ
diff --git a/graphics/event_objects/pics/effects/unknown_29/unknown_29.png b/graphics/event_objects/pics/effects/unknown_29/unknown_29.png
new file mode 100644
index 0000000000..2da55f179d
Binary files /dev/null and b/graphics/event_objects/pics/effects/unknown_29/unknown_29.png differ
diff --git a/graphics/event_objects/pics/effects/unknown_33/unknown_33.png b/graphics/event_objects/pics/effects/unknown_33/unknown_33.png
new file mode 100644
index 0000000000..67f589ece3
Binary files /dev/null and b/graphics/event_objects/pics/effects/unknown_33/unknown_33.png differ
diff --git a/graphics/event_objects/pics/effects/unknown_35/unknown_35.png b/graphics/event_objects/pics/effects/unknown_35/unknown_35.png
new file mode 100644
index 0000000000..8dbffe36ca
Binary files /dev/null and b/graphics/event_objects/pics/effects/unknown_35/unknown_35.png differ
diff --git a/graphics/event_objects/pics/effects/unused_grass/unused_grass.png b/graphics/event_objects/pics/effects/unused_grass/unused_grass.png
new file mode 100644
index 0000000000..0c573b4aa4
Binary files /dev/null and b/graphics/event_objects/pics/effects/unused_grass/unused_grass.png differ
diff --git a/graphics/event_objects/pics/misc/breakable_rock.png b/graphics/event_objects/pics/misc/breakable_rock.png
new file mode 100644
index 0000000000..db9926804d
Binary files /dev/null and b/graphics/event_objects/pics/misc/breakable_rock.png differ
diff --git a/graphics/event_objects/pics/misc/breakable_rock/0.png b/graphics/event_objects/pics/misc/breakable_rock/0.png
deleted file mode 100644
index 058324c86d..0000000000
Binary files a/graphics/event_objects/pics/misc/breakable_rock/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/misc/breakable_rock/1.png b/graphics/event_objects/pics/misc/breakable_rock/1.png
deleted file mode 100644
index 6c8b3133a1..0000000000
Binary files a/graphics/event_objects/pics/misc/breakable_rock/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/misc/breakable_rock/2.png b/graphics/event_objects/pics/misc/breakable_rock/2.png
deleted file mode 100644
index 737148d66e..0000000000
Binary files a/graphics/event_objects/pics/misc/breakable_rock/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/misc/breakable_rock/3.png b/graphics/event_objects/pics/misc/breakable_rock/3.png
deleted file mode 100644
index 89eedd1aa5..0000000000
Binary files a/graphics/event_objects/pics/misc/breakable_rock/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/misc/cuttable_tree.png b/graphics/event_objects/pics/misc/cuttable_tree.png
new file mode 100644
index 0000000000..6071f4a61e
Binary files /dev/null and b/graphics/event_objects/pics/misc/cuttable_tree.png differ
diff --git a/graphics/event_objects/pics/misc/cuttable_tree/0.png b/graphics/event_objects/pics/misc/cuttable_tree/0.png
deleted file mode 100644
index 509d8b03cf..0000000000
Binary files a/graphics/event_objects/pics/misc/cuttable_tree/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/misc/cuttable_tree/1.png b/graphics/event_objects/pics/misc/cuttable_tree/1.png
deleted file mode 100644
index afa42cf162..0000000000
Binary files a/graphics/event_objects/pics/misc/cuttable_tree/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/misc/cuttable_tree/2.png b/graphics/event_objects/pics/misc/cuttable_tree/2.png
deleted file mode 100644
index f222ece436..0000000000
Binary files a/graphics/event_objects/pics/misc/cuttable_tree/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/misc/cuttable_tree/3.png b/graphics/event_objects/pics/misc/cuttable_tree/3.png
deleted file mode 100644
index 09ffefd29e..0000000000
Binary files a/graphics/event_objects/pics/misc/cuttable_tree/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/misc/mr_brineys_boat.png b/graphics/event_objects/pics/misc/mr_brineys_boat.png
new file mode 100644
index 0000000000..e790eb172d
Binary files /dev/null and b/graphics/event_objects/pics/misc/mr_brineys_boat.png differ
diff --git a/graphics/event_objects/pics/misc/mr_brineys_boat/0.png b/graphics/event_objects/pics/misc/mr_brineys_boat/0.png
deleted file mode 100644
index 593ed07c86..0000000000
Binary files a/graphics/event_objects/pics/misc/mr_brineys_boat/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/misc/mr_brineys_boat/1.png b/graphics/event_objects/pics/misc/mr_brineys_boat/1.png
deleted file mode 100644
index 39b75fd734..0000000000
Binary files a/graphics/event_objects/pics/misc/mr_brineys_boat/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/misc/mr_brineys_boat/2.png b/graphics/event_objects/pics/misc/mr_brineys_boat/2.png
deleted file mode 100644
index 9db6b11fee..0000000000
Binary files a/graphics/event_objects/pics/misc/mr_brineys_boat/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/anabel/0.png b/graphics/event_objects/pics/people/anabel/0.png
deleted file mode 100644
index 94add04bbf..0000000000
Binary files a/graphics/event_objects/pics/people/anabel/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/anabel/1.png b/graphics/event_objects/pics/people/anabel/1.png
deleted file mode 100644
index 644510063b..0000000000
Binary files a/graphics/event_objects/pics/people/anabel/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/anabel/2.png b/graphics/event_objects/pics/people/anabel/2.png
deleted file mode 100644
index 92d365c9ea..0000000000
Binary files a/graphics/event_objects/pics/people/anabel/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/anabel/3.png b/graphics/event_objects/pics/people/anabel/3.png
deleted file mode 100644
index 34a07e500b..0000000000
Binary files a/graphics/event_objects/pics/people/anabel/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/anabel/4.png b/graphics/event_objects/pics/people/anabel/4.png
deleted file mode 100644
index 78a3f64132..0000000000
Binary files a/graphics/event_objects/pics/people/anabel/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/anabel/5.png b/graphics/event_objects/pics/people/anabel/5.png
deleted file mode 100644
index df1f31dbb9..0000000000
Binary files a/graphics/event_objects/pics/people/anabel/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/anabel/6.png b/graphics/event_objects/pics/people/anabel/6.png
deleted file mode 100644
index 78914f5b2d..0000000000
Binary files a/graphics/event_objects/pics/people/anabel/6.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/anabel/7.png b/graphics/event_objects/pics/people/anabel/7.png
deleted file mode 100644
index beb27e3c0e..0000000000
Binary files a/graphics/event_objects/pics/people/anabel/7.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/anabel/8.png b/graphics/event_objects/pics/people/anabel/8.png
deleted file mode 100644
index 2d41a5e115..0000000000
Binary files a/graphics/event_objects/pics/people/anabel/8.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/aqua_member_f/0.png b/graphics/event_objects/pics/people/aqua_member_f/0.png
deleted file mode 100644
index 1f8c75cb38..0000000000
Binary files a/graphics/event_objects/pics/people/aqua_member_f/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/aqua_member_f/1.png b/graphics/event_objects/pics/people/aqua_member_f/1.png
deleted file mode 100644
index 16bc28e20a..0000000000
Binary files a/graphics/event_objects/pics/people/aqua_member_f/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/aqua_member_f/2.png b/graphics/event_objects/pics/people/aqua_member_f/2.png
deleted file mode 100644
index 3e95c8ba2d..0000000000
Binary files a/graphics/event_objects/pics/people/aqua_member_f/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/aqua_member_f/3.png b/graphics/event_objects/pics/people/aqua_member_f/3.png
deleted file mode 100644
index 8d17c85fdc..0000000000
Binary files a/graphics/event_objects/pics/people/aqua_member_f/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/aqua_member_f/4.png b/graphics/event_objects/pics/people/aqua_member_f/4.png
deleted file mode 100644
index f62fdb1002..0000000000
Binary files a/graphics/event_objects/pics/people/aqua_member_f/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/aqua_member_f/5.png b/graphics/event_objects/pics/people/aqua_member_f/5.png
deleted file mode 100644
index 6ec1ea5156..0000000000
Binary files a/graphics/event_objects/pics/people/aqua_member_f/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/aqua_member_f/6.png b/graphics/event_objects/pics/people/aqua_member_f/6.png
deleted file mode 100644
index 0d74cf4d1f..0000000000
Binary files a/graphics/event_objects/pics/people/aqua_member_f/6.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/aqua_member_f/7.png b/graphics/event_objects/pics/people/aqua_member_f/7.png
deleted file mode 100644
index fe5894e5f3..0000000000
Binary files a/graphics/event_objects/pics/people/aqua_member_f/7.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/aqua_member_f/8.png b/graphics/event_objects/pics/people/aqua_member_f/8.png
deleted file mode 100644
index 3b3f736cbe..0000000000
Binary files a/graphics/event_objects/pics/people/aqua_member_f/8.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/aqua_member_m/0.png b/graphics/event_objects/pics/people/aqua_member_m/0.png
deleted file mode 100644
index 60a2b8aceb..0000000000
Binary files a/graphics/event_objects/pics/people/aqua_member_m/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/aqua_member_m/1.png b/graphics/event_objects/pics/people/aqua_member_m/1.png
deleted file mode 100644
index d87426a187..0000000000
Binary files a/graphics/event_objects/pics/people/aqua_member_m/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/aqua_member_m/2.png b/graphics/event_objects/pics/people/aqua_member_m/2.png
deleted file mode 100644
index c75f633961..0000000000
Binary files a/graphics/event_objects/pics/people/aqua_member_m/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/aqua_member_m/3.png b/graphics/event_objects/pics/people/aqua_member_m/3.png
deleted file mode 100644
index aaba2d9a1e..0000000000
Binary files a/graphics/event_objects/pics/people/aqua_member_m/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/aqua_member_m/4.png b/graphics/event_objects/pics/people/aqua_member_m/4.png
deleted file mode 100644
index 326628fd08..0000000000
Binary files a/graphics/event_objects/pics/people/aqua_member_m/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/aqua_member_m/5.png b/graphics/event_objects/pics/people/aqua_member_m/5.png
deleted file mode 100644
index 647cfb95cc..0000000000
Binary files a/graphics/event_objects/pics/people/aqua_member_m/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/aqua_member_m/6.png b/graphics/event_objects/pics/people/aqua_member_m/6.png
deleted file mode 100644
index 3918e64e93..0000000000
Binary files a/graphics/event_objects/pics/people/aqua_member_m/6.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/aqua_member_m/7.png b/graphics/event_objects/pics/people/aqua_member_m/7.png
deleted file mode 100644
index 57064088e3..0000000000
Binary files a/graphics/event_objects/pics/people/aqua_member_m/7.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/aqua_member_m/8.png b/graphics/event_objects/pics/people/aqua_member_m/8.png
deleted file mode 100644
index 1e59c0cae6..0000000000
Binary files a/graphics/event_objects/pics/people/aqua_member_m/8.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/archie/0.png b/graphics/event_objects/pics/people/archie/0.png
deleted file mode 100644
index dd091bd165..0000000000
Binary files a/graphics/event_objects/pics/people/archie/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/archie/1.png b/graphics/event_objects/pics/people/archie/1.png
deleted file mode 100644
index 1d278db6df..0000000000
Binary files a/graphics/event_objects/pics/people/archie/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/archie/2.png b/graphics/event_objects/pics/people/archie/2.png
deleted file mode 100644
index 2e1b7a1cef..0000000000
Binary files a/graphics/event_objects/pics/people/archie/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/archie/3.png b/graphics/event_objects/pics/people/archie/3.png
deleted file mode 100644
index 576abb99d8..0000000000
Binary files a/graphics/event_objects/pics/people/archie/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/archie/4.png b/graphics/event_objects/pics/people/archie/4.png
deleted file mode 100644
index f486873184..0000000000
Binary files a/graphics/event_objects/pics/people/archie/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/archie/5.png b/graphics/event_objects/pics/people/archie/5.png
deleted file mode 100644
index f21490b7b3..0000000000
Binary files a/graphics/event_objects/pics/people/archie/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/archie/6.png b/graphics/event_objects/pics/people/archie/6.png
deleted file mode 100644
index 29305a9524..0000000000
Binary files a/graphics/event_objects/pics/people/archie/6.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/archie/7.png b/graphics/event_objects/pics/people/archie/7.png
deleted file mode 100644
index 778a7e9648..0000000000
Binary files a/graphics/event_objects/pics/people/archie/7.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/archie/8.png b/graphics/event_objects/pics/people/archie/8.png
deleted file mode 100644
index 237101046e..0000000000
Binary files a/graphics/event_objects/pics/people/archie/8.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/artist.png b/graphics/event_objects/pics/people/artist.png
new file mode 100644
index 0000000000..7a40a2e38f
Binary files /dev/null and b/graphics/event_objects/pics/people/artist.png differ
diff --git a/graphics/event_objects/pics/people/artist/0.png b/graphics/event_objects/pics/people/artist/0.png
deleted file mode 100644
index 9f25f9ea02..0000000000
Binary files a/graphics/event_objects/pics/people/artist/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/artist/1.png b/graphics/event_objects/pics/people/artist/1.png
deleted file mode 100644
index 6056f77a59..0000000000
Binary files a/graphics/event_objects/pics/people/artist/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/artist/2.png b/graphics/event_objects/pics/people/artist/2.png
deleted file mode 100644
index f1908e6648..0000000000
Binary files a/graphics/event_objects/pics/people/artist/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/artist/3.png b/graphics/event_objects/pics/people/artist/3.png
deleted file mode 100644
index 62cafaa79d..0000000000
Binary files a/graphics/event_objects/pics/people/artist/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/artist/4.png b/graphics/event_objects/pics/people/artist/4.png
deleted file mode 100644
index 718ad2d3b8..0000000000
Binary files a/graphics/event_objects/pics/people/artist/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/artist/5.png b/graphics/event_objects/pics/people/artist/5.png
deleted file mode 100644
index cb37c0138f..0000000000
Binary files a/graphics/event_objects/pics/people/artist/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/artist/6.png b/graphics/event_objects/pics/people/artist/6.png
deleted file mode 100644
index 281724e3dc..0000000000
Binary files a/graphics/event_objects/pics/people/artist/6.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/artist/7.png b/graphics/event_objects/pics/people/artist/7.png
deleted file mode 100644
index 36157c6ee0..0000000000
Binary files a/graphics/event_objects/pics/people/artist/7.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/artist/8.png b/graphics/event_objects/pics/people/artist/8.png
deleted file mode 100644
index df7afa65ee..0000000000
Binary files a/graphics/event_objects/pics/people/artist/8.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/beauty.png b/graphics/event_objects/pics/people/beauty.png
new file mode 100644
index 0000000000..ac07e8e9b9
Binary files /dev/null and b/graphics/event_objects/pics/people/beauty.png differ
diff --git a/graphics/event_objects/pics/people/beauty/0.png b/graphics/event_objects/pics/people/beauty/0.png
deleted file mode 100644
index 50e0ece373..0000000000
Binary files a/graphics/event_objects/pics/people/beauty/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/beauty/1.png b/graphics/event_objects/pics/people/beauty/1.png
deleted file mode 100644
index 3a1ba51e98..0000000000
Binary files a/graphics/event_objects/pics/people/beauty/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/beauty/2.png b/graphics/event_objects/pics/people/beauty/2.png
deleted file mode 100644
index 5787f360f4..0000000000
Binary files a/graphics/event_objects/pics/people/beauty/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/beauty/3.png b/graphics/event_objects/pics/people/beauty/3.png
deleted file mode 100644
index cc200158f0..0000000000
Binary files a/graphics/event_objects/pics/people/beauty/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/beauty/4.png b/graphics/event_objects/pics/people/beauty/4.png
deleted file mode 100644
index f49ef45c6f..0000000000
Binary files a/graphics/event_objects/pics/people/beauty/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/beauty/5.png b/graphics/event_objects/pics/people/beauty/5.png
deleted file mode 100644
index c8eed61d1a..0000000000
Binary files a/graphics/event_objects/pics/people/beauty/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/beauty/6.png b/graphics/event_objects/pics/people/beauty/6.png
deleted file mode 100644
index fb298aa741..0000000000
Binary files a/graphics/event_objects/pics/people/beauty/6.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/beauty/7.png b/graphics/event_objects/pics/people/beauty/7.png
deleted file mode 100644
index 0b576e71ac..0000000000
Binary files a/graphics/event_objects/pics/people/beauty/7.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/beauty/8.png b/graphics/event_objects/pics/people/beauty/8.png
deleted file mode 100644
index 77de6d5c5a..0000000000
Binary files a/graphics/event_objects/pics/people/beauty/8.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/black_belt.png b/graphics/event_objects/pics/people/black_belt.png
new file mode 100644
index 0000000000..88043e0c0f
Binary files /dev/null and b/graphics/event_objects/pics/people/black_belt.png differ
diff --git a/graphics/event_objects/pics/people/black_belt/0.png b/graphics/event_objects/pics/people/black_belt/0.png
deleted file mode 100644
index 0003a1a887..0000000000
Binary files a/graphics/event_objects/pics/people/black_belt/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/black_belt/1.png b/graphics/event_objects/pics/people/black_belt/1.png
deleted file mode 100644
index c3e3b8a1d8..0000000000
Binary files a/graphics/event_objects/pics/people/black_belt/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/black_belt/2.png b/graphics/event_objects/pics/people/black_belt/2.png
deleted file mode 100644
index 0cb8f30bf1..0000000000
Binary files a/graphics/event_objects/pics/people/black_belt/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/black_belt/3.png b/graphics/event_objects/pics/people/black_belt/3.png
deleted file mode 100644
index 8bae80b476..0000000000
Binary files a/graphics/event_objects/pics/people/black_belt/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/black_belt/4.png b/graphics/event_objects/pics/people/black_belt/4.png
deleted file mode 100644
index aacf9c3f7b..0000000000
Binary files a/graphics/event_objects/pics/people/black_belt/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/black_belt/5.png b/graphics/event_objects/pics/people/black_belt/5.png
deleted file mode 100644
index 41c60075ce..0000000000
Binary files a/graphics/event_objects/pics/people/black_belt/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/black_belt/6.png b/graphics/event_objects/pics/people/black_belt/6.png
deleted file mode 100644
index fa1c426a13..0000000000
Binary files a/graphics/event_objects/pics/people/black_belt/6.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/black_belt/7.png b/graphics/event_objects/pics/people/black_belt/7.png
deleted file mode 100644
index 013986add1..0000000000
Binary files a/graphics/event_objects/pics/people/black_belt/7.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/black_belt/8.png b/graphics/event_objects/pics/people/black_belt/8.png
deleted file mode 100644
index 5efef483a1..0000000000
Binary files a/graphics/event_objects/pics/people/black_belt/8.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/boy_1.png b/graphics/event_objects/pics/people/boy_1.png
new file mode 100644
index 0000000000..72cb2c2b51
Binary files /dev/null and b/graphics/event_objects/pics/people/boy_1.png differ
diff --git a/graphics/event_objects/pics/people/boy_1/0.png b/graphics/event_objects/pics/people/boy_1/0.png
deleted file mode 100644
index ddb78aa81a..0000000000
Binary files a/graphics/event_objects/pics/people/boy_1/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/boy_1/1.png b/graphics/event_objects/pics/people/boy_1/1.png
deleted file mode 100644
index 57c6245b26..0000000000
Binary files a/graphics/event_objects/pics/people/boy_1/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/boy_1/2.png b/graphics/event_objects/pics/people/boy_1/2.png
deleted file mode 100644
index cc0797ac81..0000000000
Binary files a/graphics/event_objects/pics/people/boy_1/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/boy_1/3.png b/graphics/event_objects/pics/people/boy_1/3.png
deleted file mode 100644
index aa08c63025..0000000000
Binary files a/graphics/event_objects/pics/people/boy_1/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/boy_1/4.png b/graphics/event_objects/pics/people/boy_1/4.png
deleted file mode 100644
index d60c49f7ea..0000000000
Binary files a/graphics/event_objects/pics/people/boy_1/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/boy_1/5.png b/graphics/event_objects/pics/people/boy_1/5.png
deleted file mode 100644
index e60d62e060..0000000000
Binary files a/graphics/event_objects/pics/people/boy_1/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/boy_1/6.png b/graphics/event_objects/pics/people/boy_1/6.png
deleted file mode 100644
index 9c515fb2a8..0000000000
Binary files a/graphics/event_objects/pics/people/boy_1/6.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/boy_1/7.png b/graphics/event_objects/pics/people/boy_1/7.png
deleted file mode 100644
index 422ce9d9ce..0000000000
Binary files a/graphics/event_objects/pics/people/boy_1/7.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/boy_1/8.png b/graphics/event_objects/pics/people/boy_1/8.png
deleted file mode 100644
index 1fcff31137..0000000000
Binary files a/graphics/event_objects/pics/people/boy_1/8.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/boy_2.png b/graphics/event_objects/pics/people/boy_2.png
new file mode 100644
index 0000000000..c8d6db12e7
Binary files /dev/null and b/graphics/event_objects/pics/people/boy_2.png differ
diff --git a/graphics/event_objects/pics/people/boy_2/0.png b/graphics/event_objects/pics/people/boy_2/0.png
deleted file mode 100644
index aefd58a968..0000000000
Binary files a/graphics/event_objects/pics/people/boy_2/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/boy_2/1.png b/graphics/event_objects/pics/people/boy_2/1.png
deleted file mode 100644
index 8b0d448cbe..0000000000
Binary files a/graphics/event_objects/pics/people/boy_2/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/boy_2/2.png b/graphics/event_objects/pics/people/boy_2/2.png
deleted file mode 100644
index cad6a6cda9..0000000000
Binary files a/graphics/event_objects/pics/people/boy_2/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/boy_2/3.png b/graphics/event_objects/pics/people/boy_2/3.png
deleted file mode 100644
index 11dea03b81..0000000000
Binary files a/graphics/event_objects/pics/people/boy_2/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/boy_2/4.png b/graphics/event_objects/pics/people/boy_2/4.png
deleted file mode 100644
index 7aa11f526a..0000000000
Binary files a/graphics/event_objects/pics/people/boy_2/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/boy_2/5.png b/graphics/event_objects/pics/people/boy_2/5.png
deleted file mode 100644
index 0ff4cc6228..0000000000
Binary files a/graphics/event_objects/pics/people/boy_2/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/boy_2/6.png b/graphics/event_objects/pics/people/boy_2/6.png
deleted file mode 100644
index 5e7e98f4d7..0000000000
Binary files a/graphics/event_objects/pics/people/boy_2/6.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/boy_2/7.png b/graphics/event_objects/pics/people/boy_2/7.png
deleted file mode 100644
index 3b7188f3a2..0000000000
Binary files a/graphics/event_objects/pics/people/boy_2/7.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/boy_2/8.png b/graphics/event_objects/pics/people/boy_2/8.png
deleted file mode 100644
index aea1fee46e..0000000000
Binary files a/graphics/event_objects/pics/people/boy_2/8.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/boy_3.png b/graphics/event_objects/pics/people/boy_3.png
new file mode 100644
index 0000000000..dd8f2e51d9
Binary files /dev/null and b/graphics/event_objects/pics/people/boy_3.png differ
diff --git a/graphics/event_objects/pics/people/boy_3/0.png b/graphics/event_objects/pics/people/boy_3/0.png
deleted file mode 100644
index 6ac8b18c2a..0000000000
Binary files a/graphics/event_objects/pics/people/boy_3/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/boy_3/1.png b/graphics/event_objects/pics/people/boy_3/1.png
deleted file mode 100644
index e42abeb9fd..0000000000
Binary files a/graphics/event_objects/pics/people/boy_3/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/boy_3/2.png b/graphics/event_objects/pics/people/boy_3/2.png
deleted file mode 100644
index f6fdc1f835..0000000000
Binary files a/graphics/event_objects/pics/people/boy_3/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/boy_3/3.png b/graphics/event_objects/pics/people/boy_3/3.png
deleted file mode 100644
index 8edb25b0c8..0000000000
Binary files a/graphics/event_objects/pics/people/boy_3/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/boy_3/4.png b/graphics/event_objects/pics/people/boy_3/4.png
deleted file mode 100644
index 016f12fd41..0000000000
Binary files a/graphics/event_objects/pics/people/boy_3/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/boy_3/5.png b/graphics/event_objects/pics/people/boy_3/5.png
deleted file mode 100644
index b5d5bda851..0000000000
Binary files a/graphics/event_objects/pics/people/boy_3/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/boy_3/6.png b/graphics/event_objects/pics/people/boy_3/6.png
deleted file mode 100644
index 703bcdbbc7..0000000000
Binary files a/graphics/event_objects/pics/people/boy_3/6.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/boy_3/7.png b/graphics/event_objects/pics/people/boy_3/7.png
deleted file mode 100644
index aeaf299429..0000000000
Binary files a/graphics/event_objects/pics/people/boy_3/7.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/boy_3/8.png b/graphics/event_objects/pics/people/boy_3/8.png
deleted file mode 100644
index 26ef82fc3d..0000000000
Binary files a/graphics/event_objects/pics/people/boy_3/8.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/boy_4.png b/graphics/event_objects/pics/people/boy_4.png
new file mode 100644
index 0000000000..2e2fd0412a
Binary files /dev/null and b/graphics/event_objects/pics/people/boy_4.png differ
diff --git a/graphics/event_objects/pics/people/boy_4/0.png b/graphics/event_objects/pics/people/boy_4/0.png
deleted file mode 100644
index a0b93b2f4a..0000000000
Binary files a/graphics/event_objects/pics/people/boy_4/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/boy_4/1.png b/graphics/event_objects/pics/people/boy_4/1.png
deleted file mode 100644
index 9c287e39dc..0000000000
Binary files a/graphics/event_objects/pics/people/boy_4/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/boy_4/2.png b/graphics/event_objects/pics/people/boy_4/2.png
deleted file mode 100644
index e1cead5ad6..0000000000
Binary files a/graphics/event_objects/pics/people/boy_4/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/boy_4/3.png b/graphics/event_objects/pics/people/boy_4/3.png
deleted file mode 100644
index d64420afdb..0000000000
Binary files a/graphics/event_objects/pics/people/boy_4/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/boy_4/4.png b/graphics/event_objects/pics/people/boy_4/4.png
deleted file mode 100644
index f7779a135f..0000000000
Binary files a/graphics/event_objects/pics/people/boy_4/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/boy_4/5.png b/graphics/event_objects/pics/people/boy_4/5.png
deleted file mode 100644
index 76485893d4..0000000000
Binary files a/graphics/event_objects/pics/people/boy_4/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/boy_4/6.png b/graphics/event_objects/pics/people/boy_4/6.png
deleted file mode 100644
index 9f63aba4e3..0000000000
Binary files a/graphics/event_objects/pics/people/boy_4/6.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/boy_4/7.png b/graphics/event_objects/pics/people/boy_4/7.png
deleted file mode 100644
index 40d19f455e..0000000000
Binary files a/graphics/event_objects/pics/people/boy_4/7.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/boy_4/8.png b/graphics/event_objects/pics/people/boy_4/8.png
deleted file mode 100644
index 1ed4d0da0c..0000000000
Binary files a/graphics/event_objects/pics/people/boy_4/8.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/boy_5.png b/graphics/event_objects/pics/people/boy_5.png
new file mode 100644
index 0000000000..19fff5b36e
Binary files /dev/null and b/graphics/event_objects/pics/people/boy_5.png differ
diff --git a/graphics/event_objects/pics/people/boy_5/0.png b/graphics/event_objects/pics/people/boy_5/0.png
deleted file mode 100644
index 2a0ab6a078..0000000000
Binary files a/graphics/event_objects/pics/people/boy_5/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/boy_5/1.png b/graphics/event_objects/pics/people/boy_5/1.png
deleted file mode 100644
index 65f7f1dcfb..0000000000
Binary files a/graphics/event_objects/pics/people/boy_5/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/boy_5/2.png b/graphics/event_objects/pics/people/boy_5/2.png
deleted file mode 100644
index ece405a282..0000000000
Binary files a/graphics/event_objects/pics/people/boy_5/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/brandon/0.png b/graphics/event_objects/pics/people/brandon/0.png
deleted file mode 100644
index 85d567a955..0000000000
Binary files a/graphics/event_objects/pics/people/brandon/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/brandon/1.png b/graphics/event_objects/pics/people/brandon/1.png
deleted file mode 100644
index 90a67c8799..0000000000
Binary files a/graphics/event_objects/pics/people/brandon/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/brandon/2.png b/graphics/event_objects/pics/people/brandon/2.png
deleted file mode 100644
index 914c842d40..0000000000
Binary files a/graphics/event_objects/pics/people/brandon/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/brandon/3.png b/graphics/event_objects/pics/people/brandon/3.png
deleted file mode 100644
index dea5249157..0000000000
Binary files a/graphics/event_objects/pics/people/brandon/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/brandon/4.png b/graphics/event_objects/pics/people/brandon/4.png
deleted file mode 100644
index 60588dd0c8..0000000000
Binary files a/graphics/event_objects/pics/people/brandon/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/brandon/5.png b/graphics/event_objects/pics/people/brandon/5.png
deleted file mode 100644
index d1f8ee2422..0000000000
Binary files a/graphics/event_objects/pics/people/brandon/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/brandon/6.png b/graphics/event_objects/pics/people/brandon/6.png
deleted file mode 100644
index 68564a2a33..0000000000
Binary files a/graphics/event_objects/pics/people/brandon/6.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/brandon/7.png b/graphics/event_objects/pics/people/brandon/7.png
deleted file mode 100644
index 5fdb88f6ba..0000000000
Binary files a/graphics/event_objects/pics/people/brandon/7.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/brandon/8.png b/graphics/event_objects/pics/people/brandon/8.png
deleted file mode 100644
index 529114e458..0000000000
Binary files a/graphics/event_objects/pics/people/brandon/8.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/brawly/0.png b/graphics/event_objects/pics/people/brawly/0.png
deleted file mode 100644
index f22faad599..0000000000
Binary files a/graphics/event_objects/pics/people/brawly/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/brawly/1.png b/graphics/event_objects/pics/people/brawly/1.png
deleted file mode 100644
index 38ab1f090c..0000000000
Binary files a/graphics/event_objects/pics/people/brawly/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/brawly/2.png b/graphics/event_objects/pics/people/brawly/2.png
deleted file mode 100644
index 0f9289d0b1..0000000000
Binary files a/graphics/event_objects/pics/people/brawly/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/brendan/acro_bike.png b/graphics/event_objects/pics/people/brendan/acro_bike.png
new file mode 100644
index 0000000000..367fa1bd5a
Binary files /dev/null and b/graphics/event_objects/pics/people/brendan/acro_bike.png differ
diff --git a/graphics/event_objects/pics/people/brendan/acro_bike/00.png b/graphics/event_objects/pics/people/brendan/acro_bike/00.png
deleted file mode 100644
index d0c556042b..0000000000
Binary files a/graphics/event_objects/pics/people/brendan/acro_bike/00.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/brendan/acro_bike/01.png b/graphics/event_objects/pics/people/brendan/acro_bike/01.png
deleted file mode 100644
index 4a4fbb0c9b..0000000000
Binary files a/graphics/event_objects/pics/people/brendan/acro_bike/01.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/brendan/acro_bike/02.png b/graphics/event_objects/pics/people/brendan/acro_bike/02.png
deleted file mode 100644
index c657e8b375..0000000000
Binary files a/graphics/event_objects/pics/people/brendan/acro_bike/02.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/brendan/acro_bike/03.png b/graphics/event_objects/pics/people/brendan/acro_bike/03.png
deleted file mode 100644
index 38f3a08a76..0000000000
Binary files a/graphics/event_objects/pics/people/brendan/acro_bike/03.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/brendan/acro_bike/04.png b/graphics/event_objects/pics/people/brendan/acro_bike/04.png
deleted file mode 100644
index 1fa84a8465..0000000000
Binary files a/graphics/event_objects/pics/people/brendan/acro_bike/04.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/brendan/acro_bike/05.png b/graphics/event_objects/pics/people/brendan/acro_bike/05.png
deleted file mode 100644
index cb9788e695..0000000000
Binary files a/graphics/event_objects/pics/people/brendan/acro_bike/05.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/brendan/acro_bike/06.png b/graphics/event_objects/pics/people/brendan/acro_bike/06.png
deleted file mode 100644
index 345a2277ec..0000000000
Binary files a/graphics/event_objects/pics/people/brendan/acro_bike/06.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/brendan/acro_bike/07.png b/graphics/event_objects/pics/people/brendan/acro_bike/07.png
deleted file mode 100644
index 0677027b04..0000000000
Binary files a/graphics/event_objects/pics/people/brendan/acro_bike/07.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/brendan/acro_bike/08.png b/graphics/event_objects/pics/people/brendan/acro_bike/08.png
deleted file mode 100644
index a24484281b..0000000000
Binary files a/graphics/event_objects/pics/people/brendan/acro_bike/08.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/brendan/acro_bike/09.png b/graphics/event_objects/pics/people/brendan/acro_bike/09.png
deleted file mode 100644
index b209676f5e..0000000000
Binary files a/graphics/event_objects/pics/people/brendan/acro_bike/09.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/brendan/acro_bike/10.png b/graphics/event_objects/pics/people/brendan/acro_bike/10.png
deleted file mode 100644
index b472a680d6..0000000000
Binary files a/graphics/event_objects/pics/people/brendan/acro_bike/10.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/brendan/acro_bike/11.png b/graphics/event_objects/pics/people/brendan/acro_bike/11.png
deleted file mode 100644
index 7a8110dd5d..0000000000
Binary files a/graphics/event_objects/pics/people/brendan/acro_bike/11.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/brendan/acro_bike/12.png b/graphics/event_objects/pics/people/brendan/acro_bike/12.png
deleted file mode 100644
index 7195161615..0000000000
Binary files a/graphics/event_objects/pics/people/brendan/acro_bike/12.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/brendan/acro_bike/13.png b/graphics/event_objects/pics/people/brendan/acro_bike/13.png
deleted file mode 100644
index 7b24c24f40..0000000000
Binary files a/graphics/event_objects/pics/people/brendan/acro_bike/13.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/brendan/acro_bike/14.png b/graphics/event_objects/pics/people/brendan/acro_bike/14.png
deleted file mode 100644
index bbb91d7512..0000000000
Binary files a/graphics/event_objects/pics/people/brendan/acro_bike/14.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/brendan/acro_bike/15.png b/graphics/event_objects/pics/people/brendan/acro_bike/15.png
deleted file mode 100644
index 3caacb23eb..0000000000
Binary files a/graphics/event_objects/pics/people/brendan/acro_bike/15.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/brendan/acro_bike/16.png b/graphics/event_objects/pics/people/brendan/acro_bike/16.png
deleted file mode 100644
index aa26f59ccc..0000000000
Binary files a/graphics/event_objects/pics/people/brendan/acro_bike/16.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/brendan/acro_bike/17.png b/graphics/event_objects/pics/people/brendan/acro_bike/17.png
deleted file mode 100644
index 0a3d0c1a7e..0000000000
Binary files a/graphics/event_objects/pics/people/brendan/acro_bike/17.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/brendan/acro_bike/18.png b/graphics/event_objects/pics/people/brendan/acro_bike/18.png
deleted file mode 100644
index dd442bb2e5..0000000000
Binary files a/graphics/event_objects/pics/people/brendan/acro_bike/18.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/brendan/acro_bike/19.png b/graphics/event_objects/pics/people/brendan/acro_bike/19.png
deleted file mode 100644
index 705c0668e2..0000000000
Binary files a/graphics/event_objects/pics/people/brendan/acro_bike/19.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/brendan/acro_bike/20.png b/graphics/event_objects/pics/people/brendan/acro_bike/20.png
deleted file mode 100644
index 665d699aae..0000000000
Binary files a/graphics/event_objects/pics/people/brendan/acro_bike/20.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/brendan/acro_bike/21.png b/graphics/event_objects/pics/people/brendan/acro_bike/21.png
deleted file mode 100644
index 3ea90bb2b0..0000000000
Binary files a/graphics/event_objects/pics/people/brendan/acro_bike/21.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/brendan/acro_bike/22.png b/graphics/event_objects/pics/people/brendan/acro_bike/22.png
deleted file mode 100644
index b69f0e052c..0000000000
Binary files a/graphics/event_objects/pics/people/brendan/acro_bike/22.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/brendan/acro_bike/23.png b/graphics/event_objects/pics/people/brendan/acro_bike/23.png
deleted file mode 100644
index df87a84425..0000000000
Binary files a/graphics/event_objects/pics/people/brendan/acro_bike/23.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/brendan/acro_bike/24.png b/graphics/event_objects/pics/people/brendan/acro_bike/24.png
deleted file mode 100644
index 0e301734de..0000000000
Binary files a/graphics/event_objects/pics/people/brendan/acro_bike/24.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/brendan/acro_bike/25.png b/graphics/event_objects/pics/people/brendan/acro_bike/25.png
deleted file mode 100644
index 1cf49c09ac..0000000000
Binary files a/graphics/event_objects/pics/people/brendan/acro_bike/25.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/brendan/acro_bike/26.png b/graphics/event_objects/pics/people/brendan/acro_bike/26.png
deleted file mode 100644
index 54e150a3c8..0000000000
Binary files a/graphics/event_objects/pics/people/brendan/acro_bike/26.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/brendan/field_move.png b/graphics/event_objects/pics/people/brendan/field_move.png
new file mode 100644
index 0000000000..7f85137a4c
Binary files /dev/null and b/graphics/event_objects/pics/people/brendan/field_move.png differ
diff --git a/graphics/event_objects/pics/people/brendan/field_move/0.png b/graphics/event_objects/pics/people/brendan/field_move/0.png
deleted file mode 100644
index d8cd793d8e..0000000000
Binary files a/graphics/event_objects/pics/people/brendan/field_move/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/brendan/field_move/1.png b/graphics/event_objects/pics/people/brendan/field_move/1.png
deleted file mode 100644
index 25550176e7..0000000000
Binary files a/graphics/event_objects/pics/people/brendan/field_move/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/brendan/field_move/2.png b/graphics/event_objects/pics/people/brendan/field_move/2.png
deleted file mode 100644
index a817426f9e..0000000000
Binary files a/graphics/event_objects/pics/people/brendan/field_move/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/brendan/field_move/3.png b/graphics/event_objects/pics/people/brendan/field_move/3.png
deleted file mode 100644
index 5271893775..0000000000
Binary files a/graphics/event_objects/pics/people/brendan/field_move/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/brendan/field_move/4.png b/graphics/event_objects/pics/people/brendan/field_move/4.png
deleted file mode 100644
index 05ac7919d8..0000000000
Binary files a/graphics/event_objects/pics/people/brendan/field_move/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/brendan/fishing.png b/graphics/event_objects/pics/people/brendan/fishing.png
new file mode 100644
index 0000000000..8ebe7ae4d9
Binary files /dev/null and b/graphics/event_objects/pics/people/brendan/fishing.png differ
diff --git a/graphics/event_objects/pics/people/brendan/fishing/00.png b/graphics/event_objects/pics/people/brendan/fishing/00.png
deleted file mode 100644
index db6b3d2ff3..0000000000
Binary files a/graphics/event_objects/pics/people/brendan/fishing/00.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/brendan/fishing/01.png b/graphics/event_objects/pics/people/brendan/fishing/01.png
deleted file mode 100644
index cca89997dd..0000000000
Binary files a/graphics/event_objects/pics/people/brendan/fishing/01.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/brendan/fishing/02.png b/graphics/event_objects/pics/people/brendan/fishing/02.png
deleted file mode 100644
index 6adbb9f55b..0000000000
Binary files a/graphics/event_objects/pics/people/brendan/fishing/02.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/brendan/fishing/03.png b/graphics/event_objects/pics/people/brendan/fishing/03.png
deleted file mode 100644
index 22101c8b68..0000000000
Binary files a/graphics/event_objects/pics/people/brendan/fishing/03.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/brendan/fishing/04.png b/graphics/event_objects/pics/people/brendan/fishing/04.png
deleted file mode 100644
index e8fec65a25..0000000000
Binary files a/graphics/event_objects/pics/people/brendan/fishing/04.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/brendan/fishing/05.png b/graphics/event_objects/pics/people/brendan/fishing/05.png
deleted file mode 100644
index c9ee2fa4ce..0000000000
Binary files a/graphics/event_objects/pics/people/brendan/fishing/05.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/brendan/fishing/06.png b/graphics/event_objects/pics/people/brendan/fishing/06.png
deleted file mode 100644
index caaeee0780..0000000000
Binary files a/graphics/event_objects/pics/people/brendan/fishing/06.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/brendan/fishing/07.png b/graphics/event_objects/pics/people/brendan/fishing/07.png
deleted file mode 100644
index c39110e1cd..0000000000
Binary files a/graphics/event_objects/pics/people/brendan/fishing/07.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/brendan/fishing/08.png b/graphics/event_objects/pics/people/brendan/fishing/08.png
deleted file mode 100644
index 3b1b1728c9..0000000000
Binary files a/graphics/event_objects/pics/people/brendan/fishing/08.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/brendan/fishing/09.png b/graphics/event_objects/pics/people/brendan/fishing/09.png
deleted file mode 100644
index f21c37d603..0000000000
Binary files a/graphics/event_objects/pics/people/brendan/fishing/09.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/brendan/fishing/10.png b/graphics/event_objects/pics/people/brendan/fishing/10.png
deleted file mode 100644
index f80186d1fb..0000000000
Binary files a/graphics/event_objects/pics/people/brendan/fishing/10.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/brendan/fishing/11.png b/graphics/event_objects/pics/people/brendan/fishing/11.png
deleted file mode 100644
index 66b2b59177..0000000000
Binary files a/graphics/event_objects/pics/people/brendan/fishing/11.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/brendan/mach_bike.png b/graphics/event_objects/pics/people/brendan/mach_bike.png
new file mode 100644
index 0000000000..a1518cf9a7
Binary files /dev/null and b/graphics/event_objects/pics/people/brendan/mach_bike.png differ
diff --git a/graphics/event_objects/pics/people/brendan/mach_bike/0.png b/graphics/event_objects/pics/people/brendan/mach_bike/0.png
deleted file mode 100644
index d0c556042b..0000000000
Binary files a/graphics/event_objects/pics/people/brendan/mach_bike/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/brendan/mach_bike/1.png b/graphics/event_objects/pics/people/brendan/mach_bike/1.png
deleted file mode 100644
index 4a4fbb0c9b..0000000000
Binary files a/graphics/event_objects/pics/people/brendan/mach_bike/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/brendan/mach_bike/2.png b/graphics/event_objects/pics/people/brendan/mach_bike/2.png
deleted file mode 100644
index c657e8b375..0000000000
Binary files a/graphics/event_objects/pics/people/brendan/mach_bike/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/brendan/mach_bike/3.png b/graphics/event_objects/pics/people/brendan/mach_bike/3.png
deleted file mode 100644
index bbe4038179..0000000000
Binary files a/graphics/event_objects/pics/people/brendan/mach_bike/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/brendan/mach_bike/4.png b/graphics/event_objects/pics/people/brendan/mach_bike/4.png
deleted file mode 100644
index 9fe91dd46b..0000000000
Binary files a/graphics/event_objects/pics/people/brendan/mach_bike/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/brendan/mach_bike/5.png b/graphics/event_objects/pics/people/brendan/mach_bike/5.png
deleted file mode 100644
index cb9788e695..0000000000
Binary files a/graphics/event_objects/pics/people/brendan/mach_bike/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/brendan/mach_bike/6.png b/graphics/event_objects/pics/people/brendan/mach_bike/6.png
deleted file mode 100644
index 345a2277ec..0000000000
Binary files a/graphics/event_objects/pics/people/brendan/mach_bike/6.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/brendan/mach_bike/7.png b/graphics/event_objects/pics/people/brendan/mach_bike/7.png
deleted file mode 100644
index 0677027b04..0000000000
Binary files a/graphics/event_objects/pics/people/brendan/mach_bike/7.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/brendan/mach_bike/8.png b/graphics/event_objects/pics/people/brendan/mach_bike/8.png
deleted file mode 100644
index a24484281b..0000000000
Binary files a/graphics/event_objects/pics/people/brendan/mach_bike/8.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/brendan/normal/00.png b/graphics/event_objects/pics/people/brendan/normal/00.png
deleted file mode 100644
index 3d0f4c8d53..0000000000
Binary files a/graphics/event_objects/pics/people/brendan/normal/00.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/brendan/normal/01.png b/graphics/event_objects/pics/people/brendan/normal/01.png
deleted file mode 100644
index b364125130..0000000000
Binary files a/graphics/event_objects/pics/people/brendan/normal/01.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/brendan/normal/02.png b/graphics/event_objects/pics/people/brendan/normal/02.png
deleted file mode 100644
index 0f3c3775e8..0000000000
Binary files a/graphics/event_objects/pics/people/brendan/normal/02.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/brendan/normal/03.png b/graphics/event_objects/pics/people/brendan/normal/03.png
deleted file mode 100644
index b415377c74..0000000000
Binary files a/graphics/event_objects/pics/people/brendan/normal/03.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/brendan/normal/04.png b/graphics/event_objects/pics/people/brendan/normal/04.png
deleted file mode 100644
index fb92c09cd1..0000000000
Binary files a/graphics/event_objects/pics/people/brendan/normal/04.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/brendan/normal/05.png b/graphics/event_objects/pics/people/brendan/normal/05.png
deleted file mode 100644
index a5d0518a4b..0000000000
Binary files a/graphics/event_objects/pics/people/brendan/normal/05.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/brendan/normal/06.png b/graphics/event_objects/pics/people/brendan/normal/06.png
deleted file mode 100644
index 66a4293b2a..0000000000
Binary files a/graphics/event_objects/pics/people/brendan/normal/06.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/brendan/normal/07.png b/graphics/event_objects/pics/people/brendan/normal/07.png
deleted file mode 100644
index 7710ce994e..0000000000
Binary files a/graphics/event_objects/pics/people/brendan/normal/07.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/brendan/normal/08.png b/graphics/event_objects/pics/people/brendan/normal/08.png
deleted file mode 100644
index 12e9f07b31..0000000000
Binary files a/graphics/event_objects/pics/people/brendan/normal/08.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/brendan/normal/09.png b/graphics/event_objects/pics/people/brendan/normal/09.png
deleted file mode 100644
index 3c7aebbf41..0000000000
Binary files a/graphics/event_objects/pics/people/brendan/normal/09.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/brendan/normal/10.png b/graphics/event_objects/pics/people/brendan/normal/10.png
deleted file mode 100644
index ed928914fb..0000000000
Binary files a/graphics/event_objects/pics/people/brendan/normal/10.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/brendan/normal/11.png b/graphics/event_objects/pics/people/brendan/normal/11.png
deleted file mode 100644
index 754b05a789..0000000000
Binary files a/graphics/event_objects/pics/people/brendan/normal/11.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/brendan/normal/12.png b/graphics/event_objects/pics/people/brendan/normal/12.png
deleted file mode 100644
index 6f707e7249..0000000000
Binary files a/graphics/event_objects/pics/people/brendan/normal/12.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/brendan/normal/13.png b/graphics/event_objects/pics/people/brendan/normal/13.png
deleted file mode 100644
index 10ec747203..0000000000
Binary files a/graphics/event_objects/pics/people/brendan/normal/13.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/brendan/normal/14.png b/graphics/event_objects/pics/people/brendan/normal/14.png
deleted file mode 100644
index 5cf30bfb93..0000000000
Binary files a/graphics/event_objects/pics/people/brendan/normal/14.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/brendan/normal/15.png b/graphics/event_objects/pics/people/brendan/normal/15.png
deleted file mode 100644
index a1e8132d50..0000000000
Binary files a/graphics/event_objects/pics/people/brendan/normal/15.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/brendan/normal/16.png b/graphics/event_objects/pics/people/brendan/normal/16.png
deleted file mode 100644
index 6a0b229924..0000000000
Binary files a/graphics/event_objects/pics/people/brendan/normal/16.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/brendan/normal/17.png b/graphics/event_objects/pics/people/brendan/normal/17.png
deleted file mode 100644
index cbf76035a6..0000000000
Binary files a/graphics/event_objects/pics/people/brendan/normal/17.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/brendan/running.png b/graphics/event_objects/pics/people/brendan/running.png
new file mode 100644
index 0000000000..cf5a6b61e6
Binary files /dev/null and b/graphics/event_objects/pics/people/brendan/running.png differ
diff --git a/graphics/event_objects/pics/people/brendan/surfing.png b/graphics/event_objects/pics/people/brendan/surfing.png
new file mode 100644
index 0000000000..c0ddb14f6a
Binary files /dev/null and b/graphics/event_objects/pics/people/brendan/surfing.png differ
diff --git a/graphics/event_objects/pics/people/brendan/surfing/0.png b/graphics/event_objects/pics/people/brendan/surfing/0.png
deleted file mode 100644
index 67f4377bdd..0000000000
Binary files a/graphics/event_objects/pics/people/brendan/surfing/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/brendan/surfing/1.png b/graphics/event_objects/pics/people/brendan/surfing/1.png
deleted file mode 100644
index cfec0e0859..0000000000
Binary files a/graphics/event_objects/pics/people/brendan/surfing/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/brendan/surfing/2.png b/graphics/event_objects/pics/people/brendan/surfing/2.png
deleted file mode 100644
index 2d0fd5b79b..0000000000
Binary files a/graphics/event_objects/pics/people/brendan/surfing/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/brendan/surfing/3.png b/graphics/event_objects/pics/people/brendan/surfing/3.png
deleted file mode 100644
index 0c25179018..0000000000
Binary files a/graphics/event_objects/pics/people/brendan/surfing/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/brendan/surfing/4.png b/graphics/event_objects/pics/people/brendan/surfing/4.png
deleted file mode 100644
index abe894a456..0000000000
Binary files a/graphics/event_objects/pics/people/brendan/surfing/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/brendan/surfing/5.png b/graphics/event_objects/pics/people/brendan/surfing/5.png
deleted file mode 100644
index 613114c390..0000000000
Binary files a/graphics/event_objects/pics/people/brendan/surfing/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/brendan/underwater.png b/graphics/event_objects/pics/people/brendan/underwater.png
new file mode 100644
index 0000000000..86e436e55d
Binary files /dev/null and b/graphics/event_objects/pics/people/brendan/underwater.png differ
diff --git a/graphics/event_objects/pics/people/brendan/underwater/0.png b/graphics/event_objects/pics/people/brendan/underwater/0.png
deleted file mode 100644
index 79951c29c9..0000000000
Binary files a/graphics/event_objects/pics/people/brendan/underwater/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/brendan/underwater/1.png b/graphics/event_objects/pics/people/brendan/underwater/1.png
deleted file mode 100644
index d7c3f0783f..0000000000
Binary files a/graphics/event_objects/pics/people/brendan/underwater/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/brendan/underwater/2.png b/graphics/event_objects/pics/people/brendan/underwater/2.png
deleted file mode 100644
index 628a2ac880..0000000000
Binary files a/graphics/event_objects/pics/people/brendan/underwater/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/brendan/underwater/3.png b/graphics/event_objects/pics/people/brendan/underwater/3.png
deleted file mode 100644
index 7756a96db9..0000000000
Binary files a/graphics/event_objects/pics/people/brendan/underwater/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/brendan/walking.png b/graphics/event_objects/pics/people/brendan/walking.png
new file mode 100644
index 0000000000..31b64a1af6
Binary files /dev/null and b/graphics/event_objects/pics/people/brendan/walking.png differ
diff --git a/graphics/event_objects/pics/people/brendan/watering.png b/graphics/event_objects/pics/people/brendan/watering.png
new file mode 100644
index 0000000000..e348d8994d
Binary files /dev/null and b/graphics/event_objects/pics/people/brendan/watering.png differ
diff --git a/graphics/event_objects/pics/people/brendan/watering/0.png b/graphics/event_objects/pics/people/brendan/watering/0.png
deleted file mode 100644
index 0f8d95430e..0000000000
Binary files a/graphics/event_objects/pics/people/brendan/watering/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/brendan/watering/1.png b/graphics/event_objects/pics/people/brendan/watering/1.png
deleted file mode 100644
index 7b5ddc9963..0000000000
Binary files a/graphics/event_objects/pics/people/brendan/watering/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/brendan/watering/2.png b/graphics/event_objects/pics/people/brendan/watering/2.png
deleted file mode 100644
index 3441131fa3..0000000000
Binary files a/graphics/event_objects/pics/people/brendan/watering/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/brendan/watering/3.png b/graphics/event_objects/pics/people/brendan/watering/3.png
deleted file mode 100644
index 06baf24fc9..0000000000
Binary files a/graphics/event_objects/pics/people/brendan/watering/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/brendan/watering/4.png b/graphics/event_objects/pics/people/brendan/watering/4.png
deleted file mode 100644
index 40dbbacabb..0000000000
Binary files a/graphics/event_objects/pics/people/brendan/watering/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/brendan/watering/5.png b/graphics/event_objects/pics/people/brendan/watering/5.png
deleted file mode 100644
index a72edf1440..0000000000
Binary files a/graphics/event_objects/pics/people/brendan/watering/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/bug_catcher.png b/graphics/event_objects/pics/people/bug_catcher.png
new file mode 100644
index 0000000000..4890502514
Binary files /dev/null and b/graphics/event_objects/pics/people/bug_catcher.png differ
diff --git a/graphics/event_objects/pics/people/bug_catcher/0.png b/graphics/event_objects/pics/people/bug_catcher/0.png
deleted file mode 100644
index 860449379f..0000000000
Binary files a/graphics/event_objects/pics/people/bug_catcher/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/bug_catcher/1.png b/graphics/event_objects/pics/people/bug_catcher/1.png
deleted file mode 100644
index a0a3b3df18..0000000000
Binary files a/graphics/event_objects/pics/people/bug_catcher/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/bug_catcher/2.png b/graphics/event_objects/pics/people/bug_catcher/2.png
deleted file mode 100644
index 96363e4a81..0000000000
Binary files a/graphics/event_objects/pics/people/bug_catcher/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/bug_catcher/3.png b/graphics/event_objects/pics/people/bug_catcher/3.png
deleted file mode 100644
index 472fa42cb4..0000000000
Binary files a/graphics/event_objects/pics/people/bug_catcher/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/bug_catcher/4.png b/graphics/event_objects/pics/people/bug_catcher/4.png
deleted file mode 100644
index f6da1bb978..0000000000
Binary files a/graphics/event_objects/pics/people/bug_catcher/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/bug_catcher/5.png b/graphics/event_objects/pics/people/bug_catcher/5.png
deleted file mode 100644
index bd5aea560d..0000000000
Binary files a/graphics/event_objects/pics/people/bug_catcher/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/bug_catcher/6.png b/graphics/event_objects/pics/people/bug_catcher/6.png
deleted file mode 100644
index 2a93fc6b73..0000000000
Binary files a/graphics/event_objects/pics/people/bug_catcher/6.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/bug_catcher/7.png b/graphics/event_objects/pics/people/bug_catcher/7.png
deleted file mode 100644
index fded025e3e..0000000000
Binary files a/graphics/event_objects/pics/people/bug_catcher/7.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/bug_catcher/8.png b/graphics/event_objects/pics/people/bug_catcher/8.png
deleted file mode 100644
index df561597b8..0000000000
Binary files a/graphics/event_objects/pics/people/bug_catcher/8.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/cameraman.png b/graphics/event_objects/pics/people/cameraman.png
new file mode 100644
index 0000000000..23addbab1d
Binary files /dev/null and b/graphics/event_objects/pics/people/cameraman.png differ
diff --git a/graphics/event_objects/pics/people/cameraman/0.png b/graphics/event_objects/pics/people/cameraman/0.png
deleted file mode 100644
index af6ad28783..0000000000
Binary files a/graphics/event_objects/pics/people/cameraman/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/cameraman/1.png b/graphics/event_objects/pics/people/cameraman/1.png
deleted file mode 100644
index 112ee86b4b..0000000000
Binary files a/graphics/event_objects/pics/people/cameraman/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/cameraman/2.png b/graphics/event_objects/pics/people/cameraman/2.png
deleted file mode 100644
index 6eaca82661..0000000000
Binary files a/graphics/event_objects/pics/people/cameraman/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/cameraman/3.png b/graphics/event_objects/pics/people/cameraman/3.png
deleted file mode 100644
index 6091fb3506..0000000000
Binary files a/graphics/event_objects/pics/people/cameraman/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/cameraman/4.png b/graphics/event_objects/pics/people/cameraman/4.png
deleted file mode 100644
index ffacefa387..0000000000
Binary files a/graphics/event_objects/pics/people/cameraman/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/cameraman/5.png b/graphics/event_objects/pics/people/cameraman/5.png
deleted file mode 100644
index 44c1a768c4..0000000000
Binary files a/graphics/event_objects/pics/people/cameraman/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/cameraman/6.png b/graphics/event_objects/pics/people/cameraman/6.png
deleted file mode 100644
index e8c41883d7..0000000000
Binary files a/graphics/event_objects/pics/people/cameraman/6.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/cameraman/7.png b/graphics/event_objects/pics/people/cameraman/7.png
deleted file mode 100644
index 2ccfeae843..0000000000
Binary files a/graphics/event_objects/pics/people/cameraman/7.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/cameraman/8.png b/graphics/event_objects/pics/people/cameraman/8.png
deleted file mode 100644
index e2af57df17..0000000000
Binary files a/graphics/event_objects/pics/people/cameraman/8.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/camper.png b/graphics/event_objects/pics/people/camper.png
new file mode 100644
index 0000000000..c931d478d9
Binary files /dev/null and b/graphics/event_objects/pics/people/camper.png differ
diff --git a/graphics/event_objects/pics/people/camper/0.png b/graphics/event_objects/pics/people/camper/0.png
deleted file mode 100644
index ffdea18b63..0000000000
Binary files a/graphics/event_objects/pics/people/camper/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/camper/1.png b/graphics/event_objects/pics/people/camper/1.png
deleted file mode 100644
index ea5ef4d869..0000000000
Binary files a/graphics/event_objects/pics/people/camper/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/camper/2.png b/graphics/event_objects/pics/people/camper/2.png
deleted file mode 100644
index c25c51a785..0000000000
Binary files a/graphics/event_objects/pics/people/camper/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/camper/3.png b/graphics/event_objects/pics/people/camper/3.png
deleted file mode 100644
index 451f9c4699..0000000000
Binary files a/graphics/event_objects/pics/people/camper/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/camper/4.png b/graphics/event_objects/pics/people/camper/4.png
deleted file mode 100644
index b17781df40..0000000000
Binary files a/graphics/event_objects/pics/people/camper/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/camper/5.png b/graphics/event_objects/pics/people/camper/5.png
deleted file mode 100644
index ea79ad5d2e..0000000000
Binary files a/graphics/event_objects/pics/people/camper/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/camper/6.png b/graphics/event_objects/pics/people/camper/6.png
deleted file mode 100644
index 7f003b53f5..0000000000
Binary files a/graphics/event_objects/pics/people/camper/6.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/camper/7.png b/graphics/event_objects/pics/people/camper/7.png
deleted file mode 100644
index 4dcb217b38..0000000000
Binary files a/graphics/event_objects/pics/people/camper/7.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/camper/8.png b/graphics/event_objects/pics/people/camper/8.png
deleted file mode 100644
index 888a0d17f5..0000000000
Binary files a/graphics/event_objects/pics/people/camper/8.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/contest_old_man.png b/graphics/event_objects/pics/people/contest_old_man.png
new file mode 100644
index 0000000000..b5e9e5cde6
Binary files /dev/null and b/graphics/event_objects/pics/people/contest_old_man.png differ
diff --git a/graphics/event_objects/pics/people/contest_old_man/0.png b/graphics/event_objects/pics/people/contest_old_man/0.png
deleted file mode 100644
index 118a34463f..0000000000
Binary files a/graphics/event_objects/pics/people/contest_old_man/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/contest_old_man/1.png b/graphics/event_objects/pics/people/contest_old_man/1.png
deleted file mode 100644
index 75f9010ddf..0000000000
Binary files a/graphics/event_objects/pics/people/contest_old_man/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/contest_old_man/2.png b/graphics/event_objects/pics/people/contest_old_man/2.png
deleted file mode 100644
index 8ca543cef1..0000000000
Binary files a/graphics/event_objects/pics/people/contest_old_man/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/contest_old_man/3.png b/graphics/event_objects/pics/people/contest_old_man/3.png
deleted file mode 100644
index 16015e53cd..0000000000
Binary files a/graphics/event_objects/pics/people/contest_old_man/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/contest_old_man/4.png b/graphics/event_objects/pics/people/contest_old_man/4.png
deleted file mode 100644
index e4fdfcc134..0000000000
Binary files a/graphics/event_objects/pics/people/contest_old_man/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/contest_old_man/5.png b/graphics/event_objects/pics/people/contest_old_man/5.png
deleted file mode 100644
index 5de4a6b80b..0000000000
Binary files a/graphics/event_objects/pics/people/contest_old_man/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/contest_old_man/6.png b/graphics/event_objects/pics/people/contest_old_man/6.png
deleted file mode 100644
index ebcb577d45..0000000000
Binary files a/graphics/event_objects/pics/people/contest_old_man/6.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/contest_old_man/7.png b/graphics/event_objects/pics/people/contest_old_man/7.png
deleted file mode 100644
index d01f156c1f..0000000000
Binary files a/graphics/event_objects/pics/people/contest_old_man/7.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/contest_old_man/8.png b/graphics/event_objects/pics/people/contest_old_man/8.png
deleted file mode 100644
index 84e5690b7e..0000000000
Binary files a/graphics/event_objects/pics/people/contest_old_man/8.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/cook.png b/graphics/event_objects/pics/people/cook.png
new file mode 100644
index 0000000000..66d77802cb
Binary files /dev/null and b/graphics/event_objects/pics/people/cook.png differ
diff --git a/graphics/event_objects/pics/people/cook/0.png b/graphics/event_objects/pics/people/cook/0.png
deleted file mode 100644
index 1413ce869d..0000000000
Binary files a/graphics/event_objects/pics/people/cook/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/cook/1.png b/graphics/event_objects/pics/people/cook/1.png
deleted file mode 100644
index 622e2b2d2d..0000000000
Binary files a/graphics/event_objects/pics/people/cook/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/cook/2.png b/graphics/event_objects/pics/people/cook/2.png
deleted file mode 100644
index b2c2231a22..0000000000
Binary files a/graphics/event_objects/pics/people/cook/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/cycling_triathlete_f.png b/graphics/event_objects/pics/people/cycling_triathlete_f.png
new file mode 100644
index 0000000000..42be9a608a
Binary files /dev/null and b/graphics/event_objects/pics/people/cycling_triathlete_f.png differ
diff --git a/graphics/event_objects/pics/people/cycling_triathlete_f/0.png b/graphics/event_objects/pics/people/cycling_triathlete_f/0.png
deleted file mode 100644
index 452ba3daff..0000000000
Binary files a/graphics/event_objects/pics/people/cycling_triathlete_f/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/cycling_triathlete_f/1.png b/graphics/event_objects/pics/people/cycling_triathlete_f/1.png
deleted file mode 100644
index e4c8c78cbc..0000000000
Binary files a/graphics/event_objects/pics/people/cycling_triathlete_f/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/cycling_triathlete_f/2.png b/graphics/event_objects/pics/people/cycling_triathlete_f/2.png
deleted file mode 100644
index 20986da62a..0000000000
Binary files a/graphics/event_objects/pics/people/cycling_triathlete_f/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/cycling_triathlete_f/3.png b/graphics/event_objects/pics/people/cycling_triathlete_f/3.png
deleted file mode 100644
index 5cfda5ff60..0000000000
Binary files a/graphics/event_objects/pics/people/cycling_triathlete_f/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/cycling_triathlete_f/4.png b/graphics/event_objects/pics/people/cycling_triathlete_f/4.png
deleted file mode 100644
index e52cac84ee..0000000000
Binary files a/graphics/event_objects/pics/people/cycling_triathlete_f/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/cycling_triathlete_f/5.png b/graphics/event_objects/pics/people/cycling_triathlete_f/5.png
deleted file mode 100644
index 8376cc00ea..0000000000
Binary files a/graphics/event_objects/pics/people/cycling_triathlete_f/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/cycling_triathlete_f/6.png b/graphics/event_objects/pics/people/cycling_triathlete_f/6.png
deleted file mode 100644
index d99951529f..0000000000
Binary files a/graphics/event_objects/pics/people/cycling_triathlete_f/6.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/cycling_triathlete_f/7.png b/graphics/event_objects/pics/people/cycling_triathlete_f/7.png
deleted file mode 100644
index a1c953c83b..0000000000
Binary files a/graphics/event_objects/pics/people/cycling_triathlete_f/7.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/cycling_triathlete_f/8.png b/graphics/event_objects/pics/people/cycling_triathlete_f/8.png
deleted file mode 100644
index 63a6ebb0c3..0000000000
Binary files a/graphics/event_objects/pics/people/cycling_triathlete_f/8.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/cycling_triathlete_m.png b/graphics/event_objects/pics/people/cycling_triathlete_m.png
new file mode 100644
index 0000000000..e2ae09033d
Binary files /dev/null and b/graphics/event_objects/pics/people/cycling_triathlete_m.png differ
diff --git a/graphics/event_objects/pics/people/cycling_triathlete_m/0.png b/graphics/event_objects/pics/people/cycling_triathlete_m/0.png
deleted file mode 100644
index 107589cbc4..0000000000
Binary files a/graphics/event_objects/pics/people/cycling_triathlete_m/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/cycling_triathlete_m/1.png b/graphics/event_objects/pics/people/cycling_triathlete_m/1.png
deleted file mode 100644
index 39cf99a21d..0000000000
Binary files a/graphics/event_objects/pics/people/cycling_triathlete_m/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/cycling_triathlete_m/2.png b/graphics/event_objects/pics/people/cycling_triathlete_m/2.png
deleted file mode 100644
index f5ab76d103..0000000000
Binary files a/graphics/event_objects/pics/people/cycling_triathlete_m/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/cycling_triathlete_m/3.png b/graphics/event_objects/pics/people/cycling_triathlete_m/3.png
deleted file mode 100644
index d54d3fcdb7..0000000000
Binary files a/graphics/event_objects/pics/people/cycling_triathlete_m/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/cycling_triathlete_m/4.png b/graphics/event_objects/pics/people/cycling_triathlete_m/4.png
deleted file mode 100644
index b065a12945..0000000000
Binary files a/graphics/event_objects/pics/people/cycling_triathlete_m/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/cycling_triathlete_m/5.png b/graphics/event_objects/pics/people/cycling_triathlete_m/5.png
deleted file mode 100644
index bbb47a8695..0000000000
Binary files a/graphics/event_objects/pics/people/cycling_triathlete_m/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/cycling_triathlete_m/6.png b/graphics/event_objects/pics/people/cycling_triathlete_m/6.png
deleted file mode 100644
index 7f126858fe..0000000000
Binary files a/graphics/event_objects/pics/people/cycling_triathlete_m/6.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/cycling_triathlete_m/7.png b/graphics/event_objects/pics/people/cycling_triathlete_m/7.png
deleted file mode 100644
index 43f2e27396..0000000000
Binary files a/graphics/event_objects/pics/people/cycling_triathlete_m/7.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/cycling_triathlete_m/8.png b/graphics/event_objects/pics/people/cycling_triathlete_m/8.png
deleted file mode 100644
index 1168c440bc..0000000000
Binary files a/graphics/event_objects/pics/people/cycling_triathlete_m/8.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/drake/0.png b/graphics/event_objects/pics/people/drake/0.png
deleted file mode 100644
index 8c12cbe40e..0000000000
Binary files a/graphics/event_objects/pics/people/drake/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/drake/1.png b/graphics/event_objects/pics/people/drake/1.png
deleted file mode 100644
index b401c3b14b..0000000000
Binary files a/graphics/event_objects/pics/people/drake/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/drake/2.png b/graphics/event_objects/pics/people/drake/2.png
deleted file mode 100644
index c116a283e5..0000000000
Binary files a/graphics/event_objects/pics/people/drake/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/elite_four/drake.png b/graphics/event_objects/pics/people/elite_four/drake.png
new file mode 100644
index 0000000000..74328006e9
Binary files /dev/null and b/graphics/event_objects/pics/people/elite_four/drake.png differ
diff --git a/graphics/event_objects/pics/people/elite_four/glacia.png b/graphics/event_objects/pics/people/elite_four/glacia.png
new file mode 100644
index 0000000000..978d87db02
Binary files /dev/null and b/graphics/event_objects/pics/people/elite_four/glacia.png differ
diff --git a/graphics/event_objects/pics/people/elite_four/phoebe.png b/graphics/event_objects/pics/people/elite_four/phoebe.png
new file mode 100644
index 0000000000..e5d54ed779
Binary files /dev/null and b/graphics/event_objects/pics/people/elite_four/phoebe.png differ
diff --git a/graphics/event_objects/pics/people/elite_four/sidney.png b/graphics/event_objects/pics/people/elite_four/sidney.png
new file mode 100644
index 0000000000..15892f926c
Binary files /dev/null and b/graphics/event_objects/pics/people/elite_four/sidney.png differ
diff --git a/graphics/event_objects/pics/people/fat_man.png b/graphics/event_objects/pics/people/fat_man.png
new file mode 100644
index 0000000000..74d71191bc
Binary files /dev/null and b/graphics/event_objects/pics/people/fat_man.png differ
diff --git a/graphics/event_objects/pics/people/fat_man/0.png b/graphics/event_objects/pics/people/fat_man/0.png
deleted file mode 100644
index 290a7f9eda..0000000000
Binary files a/graphics/event_objects/pics/people/fat_man/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/fat_man/1.png b/graphics/event_objects/pics/people/fat_man/1.png
deleted file mode 100644
index d5d81dcdb2..0000000000
Binary files a/graphics/event_objects/pics/people/fat_man/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/fat_man/2.png b/graphics/event_objects/pics/people/fat_man/2.png
deleted file mode 100644
index 5b99f60daf..0000000000
Binary files a/graphics/event_objects/pics/people/fat_man/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/fat_man/3.png b/graphics/event_objects/pics/people/fat_man/3.png
deleted file mode 100644
index 2c6b5f0d11..0000000000
Binary files a/graphics/event_objects/pics/people/fat_man/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/fat_man/4.png b/graphics/event_objects/pics/people/fat_man/4.png
deleted file mode 100644
index 846d52b998..0000000000
Binary files a/graphics/event_objects/pics/people/fat_man/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/fat_man/5.png b/graphics/event_objects/pics/people/fat_man/5.png
deleted file mode 100644
index ee751217ff..0000000000
Binary files a/graphics/event_objects/pics/people/fat_man/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/fat_man/6.png b/graphics/event_objects/pics/people/fat_man/6.png
deleted file mode 100644
index 8eb76d8095..0000000000
Binary files a/graphics/event_objects/pics/people/fat_man/6.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/fat_man/7.png b/graphics/event_objects/pics/people/fat_man/7.png
deleted file mode 100644
index 5694df27bc..0000000000
Binary files a/graphics/event_objects/pics/people/fat_man/7.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/fat_man/8.png b/graphics/event_objects/pics/people/fat_man/8.png
deleted file mode 100644
index f3528f3323..0000000000
Binary files a/graphics/event_objects/pics/people/fat_man/8.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/fisherman.png b/graphics/event_objects/pics/people/fisherman.png
new file mode 100644
index 0000000000..ab31a44add
Binary files /dev/null and b/graphics/event_objects/pics/people/fisherman.png differ
diff --git a/graphics/event_objects/pics/people/fisherman/0.png b/graphics/event_objects/pics/people/fisherman/0.png
deleted file mode 100644
index 5e963f8890..0000000000
Binary files a/graphics/event_objects/pics/people/fisherman/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/fisherman/1.png b/graphics/event_objects/pics/people/fisherman/1.png
deleted file mode 100644
index 5bd83e7e16..0000000000
Binary files a/graphics/event_objects/pics/people/fisherman/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/fisherman/2.png b/graphics/event_objects/pics/people/fisherman/2.png
deleted file mode 100644
index f587de8d97..0000000000
Binary files a/graphics/event_objects/pics/people/fisherman/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/fisherman/3.png b/graphics/event_objects/pics/people/fisherman/3.png
deleted file mode 100644
index 5d79a1da84..0000000000
Binary files a/graphics/event_objects/pics/people/fisherman/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/fisherman/4.png b/graphics/event_objects/pics/people/fisherman/4.png
deleted file mode 100644
index dd31044366..0000000000
Binary files a/graphics/event_objects/pics/people/fisherman/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/fisherman/5.png b/graphics/event_objects/pics/people/fisherman/5.png
deleted file mode 100644
index 515f9c6385..0000000000
Binary files a/graphics/event_objects/pics/people/fisherman/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/fisherman/6.png b/graphics/event_objects/pics/people/fisherman/6.png
deleted file mode 100644
index 83ea1ff57f..0000000000
Binary files a/graphics/event_objects/pics/people/fisherman/6.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/fisherman/7.png b/graphics/event_objects/pics/people/fisherman/7.png
deleted file mode 100644
index 6f886b92e7..0000000000
Binary files a/graphics/event_objects/pics/people/fisherman/7.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/fisherman/8.png b/graphics/event_objects/pics/people/fisherman/8.png
deleted file mode 100644
index 26826b5e20..0000000000
Binary files a/graphics/event_objects/pics/people/fisherman/8.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/flannery/0.png b/graphics/event_objects/pics/people/flannery/0.png
deleted file mode 100644
index 5dc2e2afe8..0000000000
Binary files a/graphics/event_objects/pics/people/flannery/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/flannery/1.png b/graphics/event_objects/pics/people/flannery/1.png
deleted file mode 100644
index 83f1d9c9c7..0000000000
Binary files a/graphics/event_objects/pics/people/flannery/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/flannery/2.png b/graphics/event_objects/pics/people/flannery/2.png
deleted file mode 100644
index 8c96c873ec..0000000000
Binary files a/graphics/event_objects/pics/people/flannery/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/frontier_brains/anabel.png b/graphics/event_objects/pics/people/frontier_brains/anabel.png
new file mode 100644
index 0000000000..0b6bc0eb96
Binary files /dev/null and b/graphics/event_objects/pics/people/frontier_brains/anabel.png differ
diff --git a/graphics/event_objects/pics/people/frontier_brains/brandon.png b/graphics/event_objects/pics/people/frontier_brains/brandon.png
new file mode 100644
index 0000000000..74b8ff3f9f
Binary files /dev/null and b/graphics/event_objects/pics/people/frontier_brains/brandon.png differ
diff --git a/graphics/event_objects/pics/people/frontier_brains/greta.png b/graphics/event_objects/pics/people/frontier_brains/greta.png
new file mode 100644
index 0000000000..441a193b5c
Binary files /dev/null and b/graphics/event_objects/pics/people/frontier_brains/greta.png differ
diff --git a/graphics/event_objects/pics/people/frontier_brains/lucy.png b/graphics/event_objects/pics/people/frontier_brains/lucy.png
new file mode 100644
index 0000000000..ebb93ad8cb
Binary files /dev/null and b/graphics/event_objects/pics/people/frontier_brains/lucy.png differ
diff --git a/graphics/event_objects/pics/people/frontier_brains/noland.png b/graphics/event_objects/pics/people/frontier_brains/noland.png
new file mode 100644
index 0000000000..aa03eb7bd4
Binary files /dev/null and b/graphics/event_objects/pics/people/frontier_brains/noland.png differ
diff --git a/graphics/event_objects/pics/people/frontier_brains/spenser.png b/graphics/event_objects/pics/people/frontier_brains/spenser.png
new file mode 100644
index 0000000000..f27b643f08
Binary files /dev/null and b/graphics/event_objects/pics/people/frontier_brains/spenser.png differ
diff --git a/graphics/event_objects/pics/people/frontier_brains/tucker.png b/graphics/event_objects/pics/people/frontier_brains/tucker.png
new file mode 100644
index 0000000000..71ae23fa60
Binary files /dev/null and b/graphics/event_objects/pics/people/frontier_brains/tucker.png differ
diff --git a/graphics/event_objects/pics/people/gentleman.png b/graphics/event_objects/pics/people/gentleman.png
new file mode 100644
index 0000000000..5ae953c5e0
Binary files /dev/null and b/graphics/event_objects/pics/people/gentleman.png differ
diff --git a/graphics/event_objects/pics/people/gentleman/0.png b/graphics/event_objects/pics/people/gentleman/0.png
deleted file mode 100644
index 9c46f8aafc..0000000000
Binary files a/graphics/event_objects/pics/people/gentleman/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/gentleman/1.png b/graphics/event_objects/pics/people/gentleman/1.png
deleted file mode 100644
index 03eaf55708..0000000000
Binary files a/graphics/event_objects/pics/people/gentleman/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/gentleman/2.png b/graphics/event_objects/pics/people/gentleman/2.png
deleted file mode 100644
index 3956a93d65..0000000000
Binary files a/graphics/event_objects/pics/people/gentleman/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/gentleman/3.png b/graphics/event_objects/pics/people/gentleman/3.png
deleted file mode 100644
index a023cf3e4d..0000000000
Binary files a/graphics/event_objects/pics/people/gentleman/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/gentleman/4.png b/graphics/event_objects/pics/people/gentleman/4.png
deleted file mode 100644
index 18e9bc6c32..0000000000
Binary files a/graphics/event_objects/pics/people/gentleman/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/gentleman/5.png b/graphics/event_objects/pics/people/gentleman/5.png
deleted file mode 100644
index d9203cc9f0..0000000000
Binary files a/graphics/event_objects/pics/people/gentleman/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/gentleman/6.png b/graphics/event_objects/pics/people/gentleman/6.png
deleted file mode 100644
index 963b88d61d..0000000000
Binary files a/graphics/event_objects/pics/people/gentleman/6.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/gentleman/7.png b/graphics/event_objects/pics/people/gentleman/7.png
deleted file mode 100644
index 904e79189b..0000000000
Binary files a/graphics/event_objects/pics/people/gentleman/7.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/gentleman/8.png b/graphics/event_objects/pics/people/gentleman/8.png
deleted file mode 100644
index 85163c9ca6..0000000000
Binary files a/graphics/event_objects/pics/people/gentleman/8.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/girl_1.png b/graphics/event_objects/pics/people/girl_1.png
new file mode 100644
index 0000000000..6a3a1cf327
Binary files /dev/null and b/graphics/event_objects/pics/people/girl_1.png differ
diff --git a/graphics/event_objects/pics/people/girl_1/0.png b/graphics/event_objects/pics/people/girl_1/0.png
deleted file mode 100644
index 4b812ef41f..0000000000
Binary files a/graphics/event_objects/pics/people/girl_1/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/girl_1/1.png b/graphics/event_objects/pics/people/girl_1/1.png
deleted file mode 100644
index 3ec86b337c..0000000000
Binary files a/graphics/event_objects/pics/people/girl_1/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/girl_1/2.png b/graphics/event_objects/pics/people/girl_1/2.png
deleted file mode 100644
index 4bea7b7ca9..0000000000
Binary files a/graphics/event_objects/pics/people/girl_1/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/girl_1/3.png b/graphics/event_objects/pics/people/girl_1/3.png
deleted file mode 100644
index 06425c9eb6..0000000000
Binary files a/graphics/event_objects/pics/people/girl_1/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/girl_1/4.png b/graphics/event_objects/pics/people/girl_1/4.png
deleted file mode 100644
index fb940eadbc..0000000000
Binary files a/graphics/event_objects/pics/people/girl_1/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/girl_1/5.png b/graphics/event_objects/pics/people/girl_1/5.png
deleted file mode 100644
index 1bf4c2dc8c..0000000000
Binary files a/graphics/event_objects/pics/people/girl_1/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/girl_1/6.png b/graphics/event_objects/pics/people/girl_1/6.png
deleted file mode 100644
index 256567cbf3..0000000000
Binary files a/graphics/event_objects/pics/people/girl_1/6.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/girl_1/7.png b/graphics/event_objects/pics/people/girl_1/7.png
deleted file mode 100644
index 13bfe2af39..0000000000
Binary files a/graphics/event_objects/pics/people/girl_1/7.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/girl_1/8.png b/graphics/event_objects/pics/people/girl_1/8.png
deleted file mode 100644
index 5675d705d0..0000000000
Binary files a/graphics/event_objects/pics/people/girl_1/8.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/girl_2.png b/graphics/event_objects/pics/people/girl_2.png
new file mode 100644
index 0000000000..dc04a5f5ed
Binary files /dev/null and b/graphics/event_objects/pics/people/girl_2.png differ
diff --git a/graphics/event_objects/pics/people/girl_2/0.png b/graphics/event_objects/pics/people/girl_2/0.png
deleted file mode 100644
index 5f336f20fa..0000000000
Binary files a/graphics/event_objects/pics/people/girl_2/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/girl_2/1.png b/graphics/event_objects/pics/people/girl_2/1.png
deleted file mode 100644
index 3009e228c4..0000000000
Binary files a/graphics/event_objects/pics/people/girl_2/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/girl_2/2.png b/graphics/event_objects/pics/people/girl_2/2.png
deleted file mode 100644
index 3f1c04b4b7..0000000000
Binary files a/graphics/event_objects/pics/people/girl_2/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/girl_2/3.png b/graphics/event_objects/pics/people/girl_2/3.png
deleted file mode 100644
index 4713b70dd8..0000000000
Binary files a/graphics/event_objects/pics/people/girl_2/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/girl_2/4.png b/graphics/event_objects/pics/people/girl_2/4.png
deleted file mode 100644
index 3a12aa48e1..0000000000
Binary files a/graphics/event_objects/pics/people/girl_2/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/girl_2/5.png b/graphics/event_objects/pics/people/girl_2/5.png
deleted file mode 100644
index 885ee2de9a..0000000000
Binary files a/graphics/event_objects/pics/people/girl_2/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/girl_2/6.png b/graphics/event_objects/pics/people/girl_2/6.png
deleted file mode 100644
index 5ce6445000..0000000000
Binary files a/graphics/event_objects/pics/people/girl_2/6.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/girl_2/7.png b/graphics/event_objects/pics/people/girl_2/7.png
deleted file mode 100644
index 28e8ed5a8a..0000000000
Binary files a/graphics/event_objects/pics/people/girl_2/7.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/girl_2/8.png b/graphics/event_objects/pics/people/girl_2/8.png
deleted file mode 100644
index e9b5e587eb..0000000000
Binary files a/graphics/event_objects/pics/people/girl_2/8.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/girl_3.png b/graphics/event_objects/pics/people/girl_3.png
new file mode 100644
index 0000000000..73fae17f34
Binary files /dev/null and b/graphics/event_objects/pics/people/girl_3.png differ
diff --git a/graphics/event_objects/pics/people/girl_3/0.png b/graphics/event_objects/pics/people/girl_3/0.png
deleted file mode 100644
index 5927a264af..0000000000
Binary files a/graphics/event_objects/pics/people/girl_3/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/girl_3/1.png b/graphics/event_objects/pics/people/girl_3/1.png
deleted file mode 100644
index 6f3f32180d..0000000000
Binary files a/graphics/event_objects/pics/people/girl_3/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/girl_3/2.png b/graphics/event_objects/pics/people/girl_3/2.png
deleted file mode 100644
index 1a01b00315..0000000000
Binary files a/graphics/event_objects/pics/people/girl_3/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/girl_3/3.png b/graphics/event_objects/pics/people/girl_3/3.png
deleted file mode 100644
index 2fb3db97b5..0000000000
Binary files a/graphics/event_objects/pics/people/girl_3/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/girl_3/4.png b/graphics/event_objects/pics/people/girl_3/4.png
deleted file mode 100644
index 03287ab271..0000000000
Binary files a/graphics/event_objects/pics/people/girl_3/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/girl_3/5.png b/graphics/event_objects/pics/people/girl_3/5.png
deleted file mode 100644
index c30ead4997..0000000000
Binary files a/graphics/event_objects/pics/people/girl_3/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/girl_3/6.png b/graphics/event_objects/pics/people/girl_3/6.png
deleted file mode 100644
index 10eb415adf..0000000000
Binary files a/graphics/event_objects/pics/people/girl_3/6.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/girl_3/7.png b/graphics/event_objects/pics/people/girl_3/7.png
deleted file mode 100644
index 28fa0238b9..0000000000
Binary files a/graphics/event_objects/pics/people/girl_3/7.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/girl_3/8.png b/graphics/event_objects/pics/people/girl_3/8.png
deleted file mode 100644
index 8dc1a2fbc3..0000000000
Binary files a/graphics/event_objects/pics/people/girl_3/8.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/glacia/0.png b/graphics/event_objects/pics/people/glacia/0.png
deleted file mode 100644
index 4ee3c3b3e0..0000000000
Binary files a/graphics/event_objects/pics/people/glacia/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/glacia/1.png b/graphics/event_objects/pics/people/glacia/1.png
deleted file mode 100644
index 866937df35..0000000000
Binary files a/graphics/event_objects/pics/people/glacia/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/glacia/2.png b/graphics/event_objects/pics/people/glacia/2.png
deleted file mode 100644
index 5d66ef03e0..0000000000
Binary files a/graphics/event_objects/pics/people/glacia/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/greta/0.png b/graphics/event_objects/pics/people/greta/0.png
deleted file mode 100644
index 033bb28e96..0000000000
Binary files a/graphics/event_objects/pics/people/greta/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/greta/1.png b/graphics/event_objects/pics/people/greta/1.png
deleted file mode 100644
index 7035c50f30..0000000000
Binary files a/graphics/event_objects/pics/people/greta/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/greta/2.png b/graphics/event_objects/pics/people/greta/2.png
deleted file mode 100644
index a40dda6ac8..0000000000
Binary files a/graphics/event_objects/pics/people/greta/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/greta/3.png b/graphics/event_objects/pics/people/greta/3.png
deleted file mode 100644
index d7f33bd636..0000000000
Binary files a/graphics/event_objects/pics/people/greta/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/greta/4.png b/graphics/event_objects/pics/people/greta/4.png
deleted file mode 100644
index 2e1331a282..0000000000
Binary files a/graphics/event_objects/pics/people/greta/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/greta/5.png b/graphics/event_objects/pics/people/greta/5.png
deleted file mode 100644
index 3596eea6d6..0000000000
Binary files a/graphics/event_objects/pics/people/greta/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/greta/6.png b/graphics/event_objects/pics/people/greta/6.png
deleted file mode 100644
index 71bbf717b4..0000000000
Binary files a/graphics/event_objects/pics/people/greta/6.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/greta/7.png b/graphics/event_objects/pics/people/greta/7.png
deleted file mode 100644
index 5e08c3774d..0000000000
Binary files a/graphics/event_objects/pics/people/greta/7.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/greta/8.png b/graphics/event_objects/pics/people/greta/8.png
deleted file mode 100644
index bc9cefcadf..0000000000
Binary files a/graphics/event_objects/pics/people/greta/8.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/gym_leaders/brawly.png b/graphics/event_objects/pics/people/gym_leaders/brawly.png
new file mode 100644
index 0000000000..77553369bb
Binary files /dev/null and b/graphics/event_objects/pics/people/gym_leaders/brawly.png differ
diff --git a/graphics/event_objects/pics/people/gym_leaders/flannery.png b/graphics/event_objects/pics/people/gym_leaders/flannery.png
new file mode 100644
index 0000000000..9673941ec8
Binary files /dev/null and b/graphics/event_objects/pics/people/gym_leaders/flannery.png differ
diff --git a/graphics/event_objects/pics/people/gym_leaders/juan.png b/graphics/event_objects/pics/people/gym_leaders/juan.png
new file mode 100644
index 0000000000..d3320f0e13
Binary files /dev/null and b/graphics/event_objects/pics/people/gym_leaders/juan.png differ
diff --git a/graphics/event_objects/pics/people/gym_leaders/liza.png b/graphics/event_objects/pics/people/gym_leaders/liza.png
new file mode 100644
index 0000000000..9d3f302e7b
Binary files /dev/null and b/graphics/event_objects/pics/people/gym_leaders/liza.png differ
diff --git a/graphics/event_objects/pics/people/gym_leaders/norman.png b/graphics/event_objects/pics/people/gym_leaders/norman.png
new file mode 100644
index 0000000000..91c6189e3e
Binary files /dev/null and b/graphics/event_objects/pics/people/gym_leaders/norman.png differ
diff --git a/graphics/event_objects/pics/people/gym_leaders/roxanne.png b/graphics/event_objects/pics/people/gym_leaders/roxanne.png
new file mode 100644
index 0000000000..9a3f34cbe9
Binary files /dev/null and b/graphics/event_objects/pics/people/gym_leaders/roxanne.png differ
diff --git a/graphics/event_objects/pics/people/gym_leaders/tate.png b/graphics/event_objects/pics/people/gym_leaders/tate.png
new file mode 100644
index 0000000000..5e8a770398
Binary files /dev/null and b/graphics/event_objects/pics/people/gym_leaders/tate.png differ
diff --git a/graphics/event_objects/pics/people/gym_leaders/wattson.png b/graphics/event_objects/pics/people/gym_leaders/wattson.png
new file mode 100644
index 0000000000..ac4368679b
Binary files /dev/null and b/graphics/event_objects/pics/people/gym_leaders/wattson.png differ
diff --git a/graphics/event_objects/pics/people/gym_leaders/winona.png b/graphics/event_objects/pics/people/gym_leaders/winona.png
new file mode 100644
index 0000000000..bffaeba3d4
Binary files /dev/null and b/graphics/event_objects/pics/people/gym_leaders/winona.png differ
diff --git a/graphics/event_objects/pics/people/hex_maniac.png b/graphics/event_objects/pics/people/hex_maniac.png
new file mode 100644
index 0000000000..caee0bd224
Binary files /dev/null and b/graphics/event_objects/pics/people/hex_maniac.png differ
diff --git a/graphics/event_objects/pics/people/hex_maniac/0.png b/graphics/event_objects/pics/people/hex_maniac/0.png
deleted file mode 100644
index da93178a09..0000000000
Binary files a/graphics/event_objects/pics/people/hex_maniac/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/hex_maniac/1.png b/graphics/event_objects/pics/people/hex_maniac/1.png
deleted file mode 100644
index 7925ac221b..0000000000
Binary files a/graphics/event_objects/pics/people/hex_maniac/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/hex_maniac/2.png b/graphics/event_objects/pics/people/hex_maniac/2.png
deleted file mode 100644
index 24598f0b0e..0000000000
Binary files a/graphics/event_objects/pics/people/hex_maniac/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/hex_maniac/3.png b/graphics/event_objects/pics/people/hex_maniac/3.png
deleted file mode 100644
index c3544aac1d..0000000000
Binary files a/graphics/event_objects/pics/people/hex_maniac/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/hex_maniac/4.png b/graphics/event_objects/pics/people/hex_maniac/4.png
deleted file mode 100644
index f07338c7a2..0000000000
Binary files a/graphics/event_objects/pics/people/hex_maniac/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/hex_maniac/5.png b/graphics/event_objects/pics/people/hex_maniac/5.png
deleted file mode 100644
index 925d6ccf99..0000000000
Binary files a/graphics/event_objects/pics/people/hex_maniac/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/hex_maniac/6.png b/graphics/event_objects/pics/people/hex_maniac/6.png
deleted file mode 100644
index a41a7a72bf..0000000000
Binary files a/graphics/event_objects/pics/people/hex_maniac/6.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/hex_maniac/7.png b/graphics/event_objects/pics/people/hex_maniac/7.png
deleted file mode 100644
index 06bfa10d04..0000000000
Binary files a/graphics/event_objects/pics/people/hex_maniac/7.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/hex_maniac/8.png b/graphics/event_objects/pics/people/hex_maniac/8.png
deleted file mode 100644
index 1c3a57faf4..0000000000
Binary files a/graphics/event_objects/pics/people/hex_maniac/8.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/hiker.png b/graphics/event_objects/pics/people/hiker.png
new file mode 100644
index 0000000000..f52467492f
Binary files /dev/null and b/graphics/event_objects/pics/people/hiker.png differ
diff --git a/graphics/event_objects/pics/people/hiker/0.png b/graphics/event_objects/pics/people/hiker/0.png
deleted file mode 100644
index 715cdc4f9a..0000000000
Binary files a/graphics/event_objects/pics/people/hiker/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/hiker/1.png b/graphics/event_objects/pics/people/hiker/1.png
deleted file mode 100644
index 7af8fb7364..0000000000
Binary files a/graphics/event_objects/pics/people/hiker/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/hiker/2.png b/graphics/event_objects/pics/people/hiker/2.png
deleted file mode 100644
index 2b74ec3db0..0000000000
Binary files a/graphics/event_objects/pics/people/hiker/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/hiker/3.png b/graphics/event_objects/pics/people/hiker/3.png
deleted file mode 100644
index a7e0d91d51..0000000000
Binary files a/graphics/event_objects/pics/people/hiker/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/hiker/4.png b/graphics/event_objects/pics/people/hiker/4.png
deleted file mode 100644
index d0bb9fa9db..0000000000
Binary files a/graphics/event_objects/pics/people/hiker/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/hiker/5.png b/graphics/event_objects/pics/people/hiker/5.png
deleted file mode 100644
index b405de51bd..0000000000
Binary files a/graphics/event_objects/pics/people/hiker/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/hiker/6.png b/graphics/event_objects/pics/people/hiker/6.png
deleted file mode 100644
index 7271f7d4db..0000000000
Binary files a/graphics/event_objects/pics/people/hiker/6.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/hiker/7.png b/graphics/event_objects/pics/people/hiker/7.png
deleted file mode 100644
index 36db0a3704..0000000000
Binary files a/graphics/event_objects/pics/people/hiker/7.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/hiker/8.png b/graphics/event_objects/pics/people/hiker/8.png
deleted file mode 100644
index dbcfd8c41e..0000000000
Binary files a/graphics/event_objects/pics/people/hiker/8.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/hot_springs_old_woman.png b/graphics/event_objects/pics/people/hot_springs_old_woman.png
new file mode 100644
index 0000000000..82fbc489b8
Binary files /dev/null and b/graphics/event_objects/pics/people/hot_springs_old_woman.png differ
diff --git a/graphics/event_objects/pics/people/hot_springs_old_woman/0.png b/graphics/event_objects/pics/people/hot_springs_old_woman/0.png
deleted file mode 100644
index abb6cca16c..0000000000
Binary files a/graphics/event_objects/pics/people/hot_springs_old_woman/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/hot_springs_old_woman/1.png b/graphics/event_objects/pics/people/hot_springs_old_woman/1.png
deleted file mode 100644
index e45ab1ac4f..0000000000
Binary files a/graphics/event_objects/pics/people/hot_springs_old_woman/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/hot_springs_old_woman/2.png b/graphics/event_objects/pics/people/hot_springs_old_woman/2.png
deleted file mode 100644
index f5b9364b13..0000000000
Binary files a/graphics/event_objects/pics/people/hot_springs_old_woman/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/hot_springs_old_woman/3.png b/graphics/event_objects/pics/people/hot_springs_old_woman/3.png
deleted file mode 100644
index 8bd8dc9fb0..0000000000
Binary files a/graphics/event_objects/pics/people/hot_springs_old_woman/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/hot_springs_old_woman/4.png b/graphics/event_objects/pics/people/hot_springs_old_woman/4.png
deleted file mode 100644
index 8bd8dc9fb0..0000000000
Binary files a/graphics/event_objects/pics/people/hot_springs_old_woman/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/hot_springs_old_woman/5.png b/graphics/event_objects/pics/people/hot_springs_old_woman/5.png
deleted file mode 100644
index ee043baeb8..0000000000
Binary files a/graphics/event_objects/pics/people/hot_springs_old_woman/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/hot_springs_old_woman/6.png b/graphics/event_objects/pics/people/hot_springs_old_woman/6.png
deleted file mode 100644
index ee043baeb8..0000000000
Binary files a/graphics/event_objects/pics/people/hot_springs_old_woman/6.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/hot_springs_old_woman/7.png b/graphics/event_objects/pics/people/hot_springs_old_woman/7.png
deleted file mode 100644
index f1498d71f9..0000000000
Binary files a/graphics/event_objects/pics/people/hot_springs_old_woman/7.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/hot_springs_old_woman/8.png b/graphics/event_objects/pics/people/hot_springs_old_woman/8.png
deleted file mode 100644
index f1498d71f9..0000000000
Binary files a/graphics/event_objects/pics/people/hot_springs_old_woman/8.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/juan/0.png b/graphics/event_objects/pics/people/juan/0.png
deleted file mode 100644
index e9528a067f..0000000000
Binary files a/graphics/event_objects/pics/people/juan/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/juan/1.png b/graphics/event_objects/pics/people/juan/1.png
deleted file mode 100644
index 0d42485545..0000000000
Binary files a/graphics/event_objects/pics/people/juan/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/juan/2.png b/graphics/event_objects/pics/people/juan/2.png
deleted file mode 100644
index c86967d23a..0000000000
Binary files a/graphics/event_objects/pics/people/juan/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/juan/3.png b/graphics/event_objects/pics/people/juan/3.png
deleted file mode 100644
index 5d593a7ee3..0000000000
Binary files a/graphics/event_objects/pics/people/juan/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/juan/4.png b/graphics/event_objects/pics/people/juan/4.png
deleted file mode 100644
index 4abb8aeec2..0000000000
Binary files a/graphics/event_objects/pics/people/juan/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/juan/5.png b/graphics/event_objects/pics/people/juan/5.png
deleted file mode 100644
index b3f28869b8..0000000000
Binary files a/graphics/event_objects/pics/people/juan/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/juan/6.png b/graphics/event_objects/pics/people/juan/6.png
deleted file mode 100644
index c46584d34b..0000000000
Binary files a/graphics/event_objects/pics/people/juan/6.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/juan/7.png b/graphics/event_objects/pics/people/juan/7.png
deleted file mode 100644
index 10ca59cd64..0000000000
Binary files a/graphics/event_objects/pics/people/juan/7.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/juan/8.png b/graphics/event_objects/pics/people/juan/8.png
deleted file mode 100644
index 24ef412c17..0000000000
Binary files a/graphics/event_objects/pics/people/juan/8.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/lass.png b/graphics/event_objects/pics/people/lass.png
new file mode 100644
index 0000000000..a47f9ee3dd
Binary files /dev/null and b/graphics/event_objects/pics/people/lass.png differ
diff --git a/graphics/event_objects/pics/people/lass/0.png b/graphics/event_objects/pics/people/lass/0.png
deleted file mode 100644
index 602f557c7d..0000000000
Binary files a/graphics/event_objects/pics/people/lass/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/lass/1.png b/graphics/event_objects/pics/people/lass/1.png
deleted file mode 100644
index c11380b4a9..0000000000
Binary files a/graphics/event_objects/pics/people/lass/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/lass/2.png b/graphics/event_objects/pics/people/lass/2.png
deleted file mode 100644
index 887cc834b5..0000000000
Binary files a/graphics/event_objects/pics/people/lass/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/lass/3.png b/graphics/event_objects/pics/people/lass/3.png
deleted file mode 100644
index 510d0812c6..0000000000
Binary files a/graphics/event_objects/pics/people/lass/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/lass/4.png b/graphics/event_objects/pics/people/lass/4.png
deleted file mode 100644
index 8929a426b3..0000000000
Binary files a/graphics/event_objects/pics/people/lass/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/lass/5.png b/graphics/event_objects/pics/people/lass/5.png
deleted file mode 100644
index da422040c8..0000000000
Binary files a/graphics/event_objects/pics/people/lass/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/lass/6.png b/graphics/event_objects/pics/people/lass/6.png
deleted file mode 100644
index c9235c9aaf..0000000000
Binary files a/graphics/event_objects/pics/people/lass/6.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/lass/7.png b/graphics/event_objects/pics/people/lass/7.png
deleted file mode 100644
index 1adfcd0baf..0000000000
Binary files a/graphics/event_objects/pics/people/lass/7.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/lass/8.png b/graphics/event_objects/pics/people/lass/8.png
deleted file mode 100644
index 392d65f93e..0000000000
Binary files a/graphics/event_objects/pics/people/lass/8.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/leaf.png b/graphics/event_objects/pics/people/leaf.png
new file mode 100644
index 0000000000..fb110cd0d6
Binary files /dev/null and b/graphics/event_objects/pics/people/leaf.png differ
diff --git a/graphics/event_objects/pics/people/leaf/0.png b/graphics/event_objects/pics/people/leaf/0.png
deleted file mode 100644
index d21024a8ac..0000000000
Binary files a/graphics/event_objects/pics/people/leaf/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/leaf/1.png b/graphics/event_objects/pics/people/leaf/1.png
deleted file mode 100644
index d14f4e29e1..0000000000
Binary files a/graphics/event_objects/pics/people/leaf/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/leaf/2.png b/graphics/event_objects/pics/people/leaf/2.png
deleted file mode 100644
index b8f8d7b6b1..0000000000
Binary files a/graphics/event_objects/pics/people/leaf/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/leaf/3.png b/graphics/event_objects/pics/people/leaf/3.png
deleted file mode 100644
index 50a63ed30a..0000000000
Binary files a/graphics/event_objects/pics/people/leaf/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/leaf/4.png b/graphics/event_objects/pics/people/leaf/4.png
deleted file mode 100644
index fdb21f0b3b..0000000000
Binary files a/graphics/event_objects/pics/people/leaf/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/leaf/5.png b/graphics/event_objects/pics/people/leaf/5.png
deleted file mode 100644
index a90ac7c22f..0000000000
Binary files a/graphics/event_objects/pics/people/leaf/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/leaf/6.png b/graphics/event_objects/pics/people/leaf/6.png
deleted file mode 100644
index ac69d167c4..0000000000
Binary files a/graphics/event_objects/pics/people/leaf/6.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/leaf/7.png b/graphics/event_objects/pics/people/leaf/7.png
deleted file mode 100644
index 215fab8e8e..0000000000
Binary files a/graphics/event_objects/pics/people/leaf/7.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/leaf/8.png b/graphics/event_objects/pics/people/leaf/8.png
deleted file mode 100644
index 39dd27af1b..0000000000
Binary files a/graphics/event_objects/pics/people/leaf/8.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/little_boy_1.png b/graphics/event_objects/pics/people/little_boy_1.png
new file mode 100644
index 0000000000..dc6dd8a5de
Binary files /dev/null and b/graphics/event_objects/pics/people/little_boy_1.png differ
diff --git a/graphics/event_objects/pics/people/little_boy_1/0.png b/graphics/event_objects/pics/people/little_boy_1/0.png
deleted file mode 100644
index b96c644fb3..0000000000
Binary files a/graphics/event_objects/pics/people/little_boy_1/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/little_boy_1/1.png b/graphics/event_objects/pics/people/little_boy_1/1.png
deleted file mode 100644
index 01f7f13d0e..0000000000
Binary files a/graphics/event_objects/pics/people/little_boy_1/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/little_boy_1/2.png b/graphics/event_objects/pics/people/little_boy_1/2.png
deleted file mode 100644
index e080899f63..0000000000
Binary files a/graphics/event_objects/pics/people/little_boy_1/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/little_boy_1/3.png b/graphics/event_objects/pics/people/little_boy_1/3.png
deleted file mode 100644
index 08dbedbff6..0000000000
Binary files a/graphics/event_objects/pics/people/little_boy_1/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/little_boy_1/4.png b/graphics/event_objects/pics/people/little_boy_1/4.png
deleted file mode 100644
index ed0f1c7914..0000000000
Binary files a/graphics/event_objects/pics/people/little_boy_1/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/little_boy_1/5.png b/graphics/event_objects/pics/people/little_boy_1/5.png
deleted file mode 100644
index 7612633929..0000000000
Binary files a/graphics/event_objects/pics/people/little_boy_1/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/little_boy_1/6.png b/graphics/event_objects/pics/people/little_boy_1/6.png
deleted file mode 100644
index f8d72807fb..0000000000
Binary files a/graphics/event_objects/pics/people/little_boy_1/6.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/little_boy_1/7.png b/graphics/event_objects/pics/people/little_boy_1/7.png
deleted file mode 100644
index 0f7c16ebb9..0000000000
Binary files a/graphics/event_objects/pics/people/little_boy_1/7.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/little_boy_1/8.png b/graphics/event_objects/pics/people/little_boy_1/8.png
deleted file mode 100644
index b3df6d38a0..0000000000
Binary files a/graphics/event_objects/pics/people/little_boy_1/8.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/little_boy_2.png b/graphics/event_objects/pics/people/little_boy_2.png
new file mode 100644
index 0000000000..0982c0e1e7
Binary files /dev/null and b/graphics/event_objects/pics/people/little_boy_2.png differ
diff --git a/graphics/event_objects/pics/people/little_boy_2/0.png b/graphics/event_objects/pics/people/little_boy_2/0.png
deleted file mode 100644
index 1cb5472fc8..0000000000
Binary files a/graphics/event_objects/pics/people/little_boy_2/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/little_boy_2/1.png b/graphics/event_objects/pics/people/little_boy_2/1.png
deleted file mode 100644
index 235933d0a6..0000000000
Binary files a/graphics/event_objects/pics/people/little_boy_2/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/little_boy_2/2.png b/graphics/event_objects/pics/people/little_boy_2/2.png
deleted file mode 100644
index ced6889563..0000000000
Binary files a/graphics/event_objects/pics/people/little_boy_2/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/little_boy_2/3.png b/graphics/event_objects/pics/people/little_boy_2/3.png
deleted file mode 100644
index 8c743b2a37..0000000000
Binary files a/graphics/event_objects/pics/people/little_boy_2/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/little_boy_2/4.png b/graphics/event_objects/pics/people/little_boy_2/4.png
deleted file mode 100644
index 7af7cdbaa0..0000000000
Binary files a/graphics/event_objects/pics/people/little_boy_2/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/little_boy_2/5.png b/graphics/event_objects/pics/people/little_boy_2/5.png
deleted file mode 100644
index 1db5b13bad..0000000000
Binary files a/graphics/event_objects/pics/people/little_boy_2/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/little_boy_2/6.png b/graphics/event_objects/pics/people/little_boy_2/6.png
deleted file mode 100644
index 00633ff855..0000000000
Binary files a/graphics/event_objects/pics/people/little_boy_2/6.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/little_boy_2/7.png b/graphics/event_objects/pics/people/little_boy_2/7.png
deleted file mode 100644
index ac2697065e..0000000000
Binary files a/graphics/event_objects/pics/people/little_boy_2/7.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/little_boy_2/8.png b/graphics/event_objects/pics/people/little_boy_2/8.png
deleted file mode 100644
index fd02ff7a61..0000000000
Binary files a/graphics/event_objects/pics/people/little_boy_2/8.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/little_girl_1.png b/graphics/event_objects/pics/people/little_girl_1.png
new file mode 100644
index 0000000000..6cd04a4e9b
Binary files /dev/null and b/graphics/event_objects/pics/people/little_girl_1.png differ
diff --git a/graphics/event_objects/pics/people/little_girl_1/0.png b/graphics/event_objects/pics/people/little_girl_1/0.png
deleted file mode 100644
index a4954285bf..0000000000
Binary files a/graphics/event_objects/pics/people/little_girl_1/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/little_girl_1/1.png b/graphics/event_objects/pics/people/little_girl_1/1.png
deleted file mode 100644
index 0c6b9d4113..0000000000
Binary files a/graphics/event_objects/pics/people/little_girl_1/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/little_girl_1/2.png b/graphics/event_objects/pics/people/little_girl_1/2.png
deleted file mode 100644
index 6e3b1e77d8..0000000000
Binary files a/graphics/event_objects/pics/people/little_girl_1/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/little_girl_1/3.png b/graphics/event_objects/pics/people/little_girl_1/3.png
deleted file mode 100644
index b680b277aa..0000000000
Binary files a/graphics/event_objects/pics/people/little_girl_1/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/little_girl_1/4.png b/graphics/event_objects/pics/people/little_girl_1/4.png
deleted file mode 100644
index 3211eecbb5..0000000000
Binary files a/graphics/event_objects/pics/people/little_girl_1/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/little_girl_1/5.png b/graphics/event_objects/pics/people/little_girl_1/5.png
deleted file mode 100644
index 182a1a4160..0000000000
Binary files a/graphics/event_objects/pics/people/little_girl_1/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/little_girl_1/6.png b/graphics/event_objects/pics/people/little_girl_1/6.png
deleted file mode 100644
index 1b0daa6378..0000000000
Binary files a/graphics/event_objects/pics/people/little_girl_1/6.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/little_girl_1/7.png b/graphics/event_objects/pics/people/little_girl_1/7.png
deleted file mode 100644
index f914066540..0000000000
Binary files a/graphics/event_objects/pics/people/little_girl_1/7.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/little_girl_1/8.png b/graphics/event_objects/pics/people/little_girl_1/8.png
deleted file mode 100644
index 5c5bcbc2a1..0000000000
Binary files a/graphics/event_objects/pics/people/little_girl_1/8.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/little_girl_2.png b/graphics/event_objects/pics/people/little_girl_2.png
new file mode 100644
index 0000000000..ee82a5659e
Binary files /dev/null and b/graphics/event_objects/pics/people/little_girl_2.png differ
diff --git a/graphics/event_objects/pics/people/little_girl_2/0.png b/graphics/event_objects/pics/people/little_girl_2/0.png
deleted file mode 100644
index fadfdad57c..0000000000
Binary files a/graphics/event_objects/pics/people/little_girl_2/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/little_girl_2/1.png b/graphics/event_objects/pics/people/little_girl_2/1.png
deleted file mode 100644
index df2b66187e..0000000000
Binary files a/graphics/event_objects/pics/people/little_girl_2/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/little_girl_2/2.png b/graphics/event_objects/pics/people/little_girl_2/2.png
deleted file mode 100644
index ac49cae9ff..0000000000
Binary files a/graphics/event_objects/pics/people/little_girl_2/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/little_girl_2/3.png b/graphics/event_objects/pics/people/little_girl_2/3.png
deleted file mode 100644
index 869c4a1b35..0000000000
Binary files a/graphics/event_objects/pics/people/little_girl_2/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/little_girl_2/4.png b/graphics/event_objects/pics/people/little_girl_2/4.png
deleted file mode 100644
index b92551f18e..0000000000
Binary files a/graphics/event_objects/pics/people/little_girl_2/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/little_girl_2/5.png b/graphics/event_objects/pics/people/little_girl_2/5.png
deleted file mode 100644
index 778a644f2f..0000000000
Binary files a/graphics/event_objects/pics/people/little_girl_2/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/little_girl_2/6.png b/graphics/event_objects/pics/people/little_girl_2/6.png
deleted file mode 100644
index 1ca2421769..0000000000
Binary files a/graphics/event_objects/pics/people/little_girl_2/6.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/little_girl_2/7.png b/graphics/event_objects/pics/people/little_girl_2/7.png
deleted file mode 100644
index d71a37cec2..0000000000
Binary files a/graphics/event_objects/pics/people/little_girl_2/7.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/little_girl_2/8.png b/graphics/event_objects/pics/people/little_girl_2/8.png
deleted file mode 100644
index dd76b53e0d..0000000000
Binary files a/graphics/event_objects/pics/people/little_girl_2/8.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/liza/0.png b/graphics/event_objects/pics/people/liza/0.png
deleted file mode 100644
index e85ea4c5b9..0000000000
Binary files a/graphics/event_objects/pics/people/liza/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/liza/1.png b/graphics/event_objects/pics/people/liza/1.png
deleted file mode 100644
index dd7c4b2a6a..0000000000
Binary files a/graphics/event_objects/pics/people/liza/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/liza/2.png b/graphics/event_objects/pics/people/liza/2.png
deleted file mode 100644
index 96b4628fa4..0000000000
Binary files a/graphics/event_objects/pics/people/liza/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/lucy/0.png b/graphics/event_objects/pics/people/lucy/0.png
deleted file mode 100644
index 4229385055..0000000000
Binary files a/graphics/event_objects/pics/people/lucy/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/lucy/1.png b/graphics/event_objects/pics/people/lucy/1.png
deleted file mode 100644
index 78eda0819f..0000000000
Binary files a/graphics/event_objects/pics/people/lucy/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/lucy/2.png b/graphics/event_objects/pics/people/lucy/2.png
deleted file mode 100644
index db2579c623..0000000000
Binary files a/graphics/event_objects/pics/people/lucy/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/lucy/3.png b/graphics/event_objects/pics/people/lucy/3.png
deleted file mode 100644
index 4f06bbb4d9..0000000000
Binary files a/graphics/event_objects/pics/people/lucy/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/lucy/4.png b/graphics/event_objects/pics/people/lucy/4.png
deleted file mode 100644
index ba42e7832d..0000000000
Binary files a/graphics/event_objects/pics/people/lucy/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/lucy/5.png b/graphics/event_objects/pics/people/lucy/5.png
deleted file mode 100644
index 980c55dd12..0000000000
Binary files a/graphics/event_objects/pics/people/lucy/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/lucy/6.png b/graphics/event_objects/pics/people/lucy/6.png
deleted file mode 100644
index b5d4c74cb9..0000000000
Binary files a/graphics/event_objects/pics/people/lucy/6.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/lucy/7.png b/graphics/event_objects/pics/people/lucy/7.png
deleted file mode 100644
index 1dd07b5ecb..0000000000
Binary files a/graphics/event_objects/pics/people/lucy/7.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/lucy/8.png b/graphics/event_objects/pics/people/lucy/8.png
deleted file mode 100644
index 2cface4e41..0000000000
Binary files a/graphics/event_objects/pics/people/lucy/8.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/magma_member_f/0.png b/graphics/event_objects/pics/people/magma_member_f/0.png
deleted file mode 100644
index ae467df026..0000000000
Binary files a/graphics/event_objects/pics/people/magma_member_f/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/magma_member_f/1.png b/graphics/event_objects/pics/people/magma_member_f/1.png
deleted file mode 100644
index 22f8d32421..0000000000
Binary files a/graphics/event_objects/pics/people/magma_member_f/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/magma_member_f/2.png b/graphics/event_objects/pics/people/magma_member_f/2.png
deleted file mode 100644
index 6820fc60e5..0000000000
Binary files a/graphics/event_objects/pics/people/magma_member_f/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/magma_member_f/3.png b/graphics/event_objects/pics/people/magma_member_f/3.png
deleted file mode 100644
index 759d312ccd..0000000000
Binary files a/graphics/event_objects/pics/people/magma_member_f/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/magma_member_f/4.png b/graphics/event_objects/pics/people/magma_member_f/4.png
deleted file mode 100644
index 5e653b4712..0000000000
Binary files a/graphics/event_objects/pics/people/magma_member_f/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/magma_member_f/5.png b/graphics/event_objects/pics/people/magma_member_f/5.png
deleted file mode 100644
index 872aaa5aef..0000000000
Binary files a/graphics/event_objects/pics/people/magma_member_f/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/magma_member_f/6.png b/graphics/event_objects/pics/people/magma_member_f/6.png
deleted file mode 100644
index b6f96e1e10..0000000000
Binary files a/graphics/event_objects/pics/people/magma_member_f/6.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/magma_member_f/7.png b/graphics/event_objects/pics/people/magma_member_f/7.png
deleted file mode 100644
index 2d7ee69806..0000000000
Binary files a/graphics/event_objects/pics/people/magma_member_f/7.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/magma_member_f/8.png b/graphics/event_objects/pics/people/magma_member_f/8.png
deleted file mode 100644
index 09a2a36c7f..0000000000
Binary files a/graphics/event_objects/pics/people/magma_member_f/8.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/magma_member_m/0.png b/graphics/event_objects/pics/people/magma_member_m/0.png
deleted file mode 100644
index a1886e9a14..0000000000
Binary files a/graphics/event_objects/pics/people/magma_member_m/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/magma_member_m/1.png b/graphics/event_objects/pics/people/magma_member_m/1.png
deleted file mode 100644
index f09d412da2..0000000000
Binary files a/graphics/event_objects/pics/people/magma_member_m/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/magma_member_m/2.png b/graphics/event_objects/pics/people/magma_member_m/2.png
deleted file mode 100644
index 2b1cb90ac3..0000000000
Binary files a/graphics/event_objects/pics/people/magma_member_m/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/magma_member_m/3.png b/graphics/event_objects/pics/people/magma_member_m/3.png
deleted file mode 100644
index edfcf78504..0000000000
Binary files a/graphics/event_objects/pics/people/magma_member_m/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/magma_member_m/4.png b/graphics/event_objects/pics/people/magma_member_m/4.png
deleted file mode 100644
index 6c8a2d2b01..0000000000
Binary files a/graphics/event_objects/pics/people/magma_member_m/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/magma_member_m/5.png b/graphics/event_objects/pics/people/magma_member_m/5.png
deleted file mode 100644
index 4f0068f21d..0000000000
Binary files a/graphics/event_objects/pics/people/magma_member_m/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/magma_member_m/6.png b/graphics/event_objects/pics/people/magma_member_m/6.png
deleted file mode 100644
index 758bcddb1c..0000000000
Binary files a/graphics/event_objects/pics/people/magma_member_m/6.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/magma_member_m/7.png b/graphics/event_objects/pics/people/magma_member_m/7.png
deleted file mode 100644
index 3b4a1be193..0000000000
Binary files a/graphics/event_objects/pics/people/magma_member_m/7.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/magma_member_m/8.png b/graphics/event_objects/pics/people/magma_member_m/8.png
deleted file mode 100644
index fc5c7b53cc..0000000000
Binary files a/graphics/event_objects/pics/people/magma_member_m/8.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/man_1.png b/graphics/event_objects/pics/people/man_1.png
new file mode 100644
index 0000000000..b83cd0367c
Binary files /dev/null and b/graphics/event_objects/pics/people/man_1.png differ
diff --git a/graphics/event_objects/pics/people/man_1/0.png b/graphics/event_objects/pics/people/man_1/0.png
deleted file mode 100644
index 83a226b7a8..0000000000
Binary files a/graphics/event_objects/pics/people/man_1/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/man_1/1.png b/graphics/event_objects/pics/people/man_1/1.png
deleted file mode 100644
index 7eba03e270..0000000000
Binary files a/graphics/event_objects/pics/people/man_1/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/man_1/2.png b/graphics/event_objects/pics/people/man_1/2.png
deleted file mode 100644
index 675851b987..0000000000
Binary files a/graphics/event_objects/pics/people/man_1/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/man_1/3.png b/graphics/event_objects/pics/people/man_1/3.png
deleted file mode 100644
index d29b03948b..0000000000
Binary files a/graphics/event_objects/pics/people/man_1/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/man_1/4.png b/graphics/event_objects/pics/people/man_1/4.png
deleted file mode 100644
index a328a22f39..0000000000
Binary files a/graphics/event_objects/pics/people/man_1/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/man_1/5.png b/graphics/event_objects/pics/people/man_1/5.png
deleted file mode 100644
index cf993dcd41..0000000000
Binary files a/graphics/event_objects/pics/people/man_1/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/man_1/6.png b/graphics/event_objects/pics/people/man_1/6.png
deleted file mode 100644
index 04ff3e1e88..0000000000
Binary files a/graphics/event_objects/pics/people/man_1/6.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/man_1/7.png b/graphics/event_objects/pics/people/man_1/7.png
deleted file mode 100644
index cce9462854..0000000000
Binary files a/graphics/event_objects/pics/people/man_1/7.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/man_1/8.png b/graphics/event_objects/pics/people/man_1/8.png
deleted file mode 100644
index 8176b427d0..0000000000
Binary files a/graphics/event_objects/pics/people/man_1/8.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/man_2.png b/graphics/event_objects/pics/people/man_2.png
new file mode 100644
index 0000000000..0cf7164ec2
Binary files /dev/null and b/graphics/event_objects/pics/people/man_2.png differ
diff --git a/graphics/event_objects/pics/people/man_2/0.png b/graphics/event_objects/pics/people/man_2/0.png
deleted file mode 100644
index e0f0ff01b7..0000000000
Binary files a/graphics/event_objects/pics/people/man_2/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/man_2/1.png b/graphics/event_objects/pics/people/man_2/1.png
deleted file mode 100644
index e1a38fd4ae..0000000000
Binary files a/graphics/event_objects/pics/people/man_2/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/man_2/2.png b/graphics/event_objects/pics/people/man_2/2.png
deleted file mode 100644
index e05a000ef9..0000000000
Binary files a/graphics/event_objects/pics/people/man_2/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/man_2/3.png b/graphics/event_objects/pics/people/man_2/3.png
deleted file mode 100644
index 946a6941b1..0000000000
Binary files a/graphics/event_objects/pics/people/man_2/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/man_2/4.png b/graphics/event_objects/pics/people/man_2/4.png
deleted file mode 100644
index eee58063f8..0000000000
Binary files a/graphics/event_objects/pics/people/man_2/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/man_2/5.png b/graphics/event_objects/pics/people/man_2/5.png
deleted file mode 100644
index c328001188..0000000000
Binary files a/graphics/event_objects/pics/people/man_2/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/man_2/6.png b/graphics/event_objects/pics/people/man_2/6.png
deleted file mode 100644
index f8e3eb88ad..0000000000
Binary files a/graphics/event_objects/pics/people/man_2/6.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/man_2/7.png b/graphics/event_objects/pics/people/man_2/7.png
deleted file mode 100644
index 43fffd1d78..0000000000
Binary files a/graphics/event_objects/pics/people/man_2/7.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/man_2/8.png b/graphics/event_objects/pics/people/man_2/8.png
deleted file mode 100644
index 8897d2fd30..0000000000
Binary files a/graphics/event_objects/pics/people/man_2/8.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/man_3.png b/graphics/event_objects/pics/people/man_3.png
new file mode 100644
index 0000000000..efa81c2c4b
Binary files /dev/null and b/graphics/event_objects/pics/people/man_3.png differ
diff --git a/graphics/event_objects/pics/people/man_3/0.png b/graphics/event_objects/pics/people/man_3/0.png
deleted file mode 100644
index 073e015f7e..0000000000
Binary files a/graphics/event_objects/pics/people/man_3/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/man_3/1.png b/graphics/event_objects/pics/people/man_3/1.png
deleted file mode 100644
index c0762c7ff6..0000000000
Binary files a/graphics/event_objects/pics/people/man_3/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/man_3/2.png b/graphics/event_objects/pics/people/man_3/2.png
deleted file mode 100644
index 21608c48a4..0000000000
Binary files a/graphics/event_objects/pics/people/man_3/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/man_3/3.png b/graphics/event_objects/pics/people/man_3/3.png
deleted file mode 100644
index 85b6765b0e..0000000000
Binary files a/graphics/event_objects/pics/people/man_3/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/man_3/4.png b/graphics/event_objects/pics/people/man_3/4.png
deleted file mode 100644
index e47dbe0fea..0000000000
Binary files a/graphics/event_objects/pics/people/man_3/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/man_3/5.png b/graphics/event_objects/pics/people/man_3/5.png
deleted file mode 100644
index 9f30a6dad9..0000000000
Binary files a/graphics/event_objects/pics/people/man_3/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/man_3/6.png b/graphics/event_objects/pics/people/man_3/6.png
deleted file mode 100644
index 3f6144f1a0..0000000000
Binary files a/graphics/event_objects/pics/people/man_3/6.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/man_3/7.png b/graphics/event_objects/pics/people/man_3/7.png
deleted file mode 100644
index e70347dcee..0000000000
Binary files a/graphics/event_objects/pics/people/man_3/7.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/man_3/8.png b/graphics/event_objects/pics/people/man_3/8.png
deleted file mode 100644
index 274a022800..0000000000
Binary files a/graphics/event_objects/pics/people/man_3/8.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/man_4.png b/graphics/event_objects/pics/people/man_4.png
new file mode 100644
index 0000000000..4419e4c957
Binary files /dev/null and b/graphics/event_objects/pics/people/man_4.png differ
diff --git a/graphics/event_objects/pics/people/man_4/0.png b/graphics/event_objects/pics/people/man_4/0.png
deleted file mode 100644
index 0297b592c5..0000000000
Binary files a/graphics/event_objects/pics/people/man_4/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/man_4/1.png b/graphics/event_objects/pics/people/man_4/1.png
deleted file mode 100644
index d73e6ed5c7..0000000000
Binary files a/graphics/event_objects/pics/people/man_4/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/man_4/2.png b/graphics/event_objects/pics/people/man_4/2.png
deleted file mode 100644
index 6cd7f57981..0000000000
Binary files a/graphics/event_objects/pics/people/man_4/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/man_4/3.png b/graphics/event_objects/pics/people/man_4/3.png
deleted file mode 100644
index 2486efd7f3..0000000000
Binary files a/graphics/event_objects/pics/people/man_4/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/man_4/4.png b/graphics/event_objects/pics/people/man_4/4.png
deleted file mode 100644
index 732ff9c8df..0000000000
Binary files a/graphics/event_objects/pics/people/man_4/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/man_4/5.png b/graphics/event_objects/pics/people/man_4/5.png
deleted file mode 100644
index 7e20d5af9a..0000000000
Binary files a/graphics/event_objects/pics/people/man_4/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/man_4/6.png b/graphics/event_objects/pics/people/man_4/6.png
deleted file mode 100644
index 3d4ae58f01..0000000000
Binary files a/graphics/event_objects/pics/people/man_4/6.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/man_4/7.png b/graphics/event_objects/pics/people/man_4/7.png
deleted file mode 100644
index 12a9d1fa84..0000000000
Binary files a/graphics/event_objects/pics/people/man_4/7.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/man_4/8.png b/graphics/event_objects/pics/people/man_4/8.png
deleted file mode 100644
index 43bea13cec..0000000000
Binary files a/graphics/event_objects/pics/people/man_4/8.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/man_5.png b/graphics/event_objects/pics/people/man_5.png
new file mode 100644
index 0000000000..3ab97efd31
Binary files /dev/null and b/graphics/event_objects/pics/people/man_5.png differ
diff --git a/graphics/event_objects/pics/people/man_5/0.png b/graphics/event_objects/pics/people/man_5/0.png
deleted file mode 100644
index f1da52790e..0000000000
Binary files a/graphics/event_objects/pics/people/man_5/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/man_5/1.png b/graphics/event_objects/pics/people/man_5/1.png
deleted file mode 100644
index 80dde6ec6b..0000000000
Binary files a/graphics/event_objects/pics/people/man_5/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/man_5/2.png b/graphics/event_objects/pics/people/man_5/2.png
deleted file mode 100644
index 95ee60f02a..0000000000
Binary files a/graphics/event_objects/pics/people/man_5/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/man_5/3.png b/graphics/event_objects/pics/people/man_5/3.png
deleted file mode 100644
index 52d4e65f03..0000000000
Binary files a/graphics/event_objects/pics/people/man_5/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/man_5/4.png b/graphics/event_objects/pics/people/man_5/4.png
deleted file mode 100644
index 23e440b883..0000000000
Binary files a/graphics/event_objects/pics/people/man_5/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/man_5/5.png b/graphics/event_objects/pics/people/man_5/5.png
deleted file mode 100644
index c587b37626..0000000000
Binary files a/graphics/event_objects/pics/people/man_5/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/man_5/6.png b/graphics/event_objects/pics/people/man_5/6.png
deleted file mode 100644
index 7ee45b6dbd..0000000000
Binary files a/graphics/event_objects/pics/people/man_5/6.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/man_5/7.png b/graphics/event_objects/pics/people/man_5/7.png
deleted file mode 100644
index 24a578a345..0000000000
Binary files a/graphics/event_objects/pics/people/man_5/7.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/man_5/8.png b/graphics/event_objects/pics/people/man_5/8.png
deleted file mode 100644
index 6040f6f4dd..0000000000
Binary files a/graphics/event_objects/pics/people/man_5/8.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/man_6.png b/graphics/event_objects/pics/people/man_6.png
new file mode 100644
index 0000000000..7832e9f2a9
Binary files /dev/null and b/graphics/event_objects/pics/people/man_6.png differ
diff --git a/graphics/event_objects/pics/people/man_6/0.png b/graphics/event_objects/pics/people/man_6/0.png
deleted file mode 100644
index ddcd545aa5..0000000000
Binary files a/graphics/event_objects/pics/people/man_6/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/man_6/1.png b/graphics/event_objects/pics/people/man_6/1.png
deleted file mode 100644
index 0d7007e105..0000000000
Binary files a/graphics/event_objects/pics/people/man_6/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/man_6/2.png b/graphics/event_objects/pics/people/man_6/2.png
deleted file mode 100644
index 4daabc15d5..0000000000
Binary files a/graphics/event_objects/pics/people/man_6/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/man_6/3.png b/graphics/event_objects/pics/people/man_6/3.png
deleted file mode 100644
index 0373f371df..0000000000
Binary files a/graphics/event_objects/pics/people/man_6/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/man_6/4.png b/graphics/event_objects/pics/people/man_6/4.png
deleted file mode 100644
index b0d8ee8148..0000000000
Binary files a/graphics/event_objects/pics/people/man_6/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/man_6/5.png b/graphics/event_objects/pics/people/man_6/5.png
deleted file mode 100644
index 3f95859a1c..0000000000
Binary files a/graphics/event_objects/pics/people/man_6/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/man_6/6.png b/graphics/event_objects/pics/people/man_6/6.png
deleted file mode 100644
index 5a89dfc330..0000000000
Binary files a/graphics/event_objects/pics/people/man_6/6.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/man_6/7.png b/graphics/event_objects/pics/people/man_6/7.png
deleted file mode 100644
index 6c2e07884d..0000000000
Binary files a/graphics/event_objects/pics/people/man_6/7.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/man_6/8.png b/graphics/event_objects/pics/people/man_6/8.png
deleted file mode 100644
index 3db124eab4..0000000000
Binary files a/graphics/event_objects/pics/people/man_6/8.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/man_7.png b/graphics/event_objects/pics/people/man_7.png
new file mode 100644
index 0000000000..5a43e62e07
Binary files /dev/null and b/graphics/event_objects/pics/people/man_7.png differ
diff --git a/graphics/event_objects/pics/people/man_7/0.png b/graphics/event_objects/pics/people/man_7/0.png
deleted file mode 100644
index ce99c5a53f..0000000000
Binary files a/graphics/event_objects/pics/people/man_7/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/man_7/1.png b/graphics/event_objects/pics/people/man_7/1.png
deleted file mode 100644
index 4339d24811..0000000000
Binary files a/graphics/event_objects/pics/people/man_7/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/man_7/2.png b/graphics/event_objects/pics/people/man_7/2.png
deleted file mode 100644
index 24390d9f99..0000000000
Binary files a/graphics/event_objects/pics/people/man_7/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/man_7/3.png b/graphics/event_objects/pics/people/man_7/3.png
deleted file mode 100644
index 39051b7953..0000000000
Binary files a/graphics/event_objects/pics/people/man_7/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/man_7/4.png b/graphics/event_objects/pics/people/man_7/4.png
deleted file mode 100644
index a72a839319..0000000000
Binary files a/graphics/event_objects/pics/people/man_7/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/man_7/5.png b/graphics/event_objects/pics/people/man_7/5.png
deleted file mode 100644
index 3de7bd28bc..0000000000
Binary files a/graphics/event_objects/pics/people/man_7/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/man_7/6.png b/graphics/event_objects/pics/people/man_7/6.png
deleted file mode 100644
index 2c9c2ee8f6..0000000000
Binary files a/graphics/event_objects/pics/people/man_7/6.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/man_7/7.png b/graphics/event_objects/pics/people/man_7/7.png
deleted file mode 100644
index 068dc873da..0000000000
Binary files a/graphics/event_objects/pics/people/man_7/7.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/man_7/8.png b/graphics/event_objects/pics/people/man_7/8.png
deleted file mode 100644
index 81e41d5c41..0000000000
Binary files a/graphics/event_objects/pics/people/man_7/8.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/maniac.png b/graphics/event_objects/pics/people/maniac.png
new file mode 100644
index 0000000000..9b38462793
Binary files /dev/null and b/graphics/event_objects/pics/people/maniac.png differ
diff --git a/graphics/event_objects/pics/people/maniac/0.png b/graphics/event_objects/pics/people/maniac/0.png
deleted file mode 100644
index 01f0669105..0000000000
Binary files a/graphics/event_objects/pics/people/maniac/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/maniac/1.png b/graphics/event_objects/pics/people/maniac/1.png
deleted file mode 100644
index fc8efb1d46..0000000000
Binary files a/graphics/event_objects/pics/people/maniac/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/maniac/2.png b/graphics/event_objects/pics/people/maniac/2.png
deleted file mode 100644
index ea211288fc..0000000000
Binary files a/graphics/event_objects/pics/people/maniac/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/maniac/3.png b/graphics/event_objects/pics/people/maniac/3.png
deleted file mode 100644
index 7a0ab0ba1a..0000000000
Binary files a/graphics/event_objects/pics/people/maniac/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/maniac/4.png b/graphics/event_objects/pics/people/maniac/4.png
deleted file mode 100644
index 93083333da..0000000000
Binary files a/graphics/event_objects/pics/people/maniac/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/maniac/5.png b/graphics/event_objects/pics/people/maniac/5.png
deleted file mode 100644
index ac18fea6e4..0000000000
Binary files a/graphics/event_objects/pics/people/maniac/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/maniac/6.png b/graphics/event_objects/pics/people/maniac/6.png
deleted file mode 100644
index d8db270388..0000000000
Binary files a/graphics/event_objects/pics/people/maniac/6.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/maniac/7.png b/graphics/event_objects/pics/people/maniac/7.png
deleted file mode 100644
index 647c698380..0000000000
Binary files a/graphics/event_objects/pics/people/maniac/7.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/maniac/8.png b/graphics/event_objects/pics/people/maniac/8.png
deleted file mode 100644
index 5d37c6d404..0000000000
Binary files a/graphics/event_objects/pics/people/maniac/8.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/mart_employee.png b/graphics/event_objects/pics/people/mart_employee.png
new file mode 100644
index 0000000000..7688c86eef
Binary files /dev/null and b/graphics/event_objects/pics/people/mart_employee.png differ
diff --git a/graphics/event_objects/pics/people/mart_employee/0.png b/graphics/event_objects/pics/people/mart_employee/0.png
deleted file mode 100644
index 4dfc880b77..0000000000
Binary files a/graphics/event_objects/pics/people/mart_employee/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/mart_employee/1.png b/graphics/event_objects/pics/people/mart_employee/1.png
deleted file mode 100644
index 25320fff02..0000000000
Binary files a/graphics/event_objects/pics/people/mart_employee/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/mart_employee/2.png b/graphics/event_objects/pics/people/mart_employee/2.png
deleted file mode 100644
index 31ad7d75b6..0000000000
Binary files a/graphics/event_objects/pics/people/mart_employee/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/mart_employee/3.png b/graphics/event_objects/pics/people/mart_employee/3.png
deleted file mode 100644
index 4e7e389d8f..0000000000
Binary files a/graphics/event_objects/pics/people/mart_employee/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/mart_employee/4.png b/graphics/event_objects/pics/people/mart_employee/4.png
deleted file mode 100644
index 4357a59468..0000000000
Binary files a/graphics/event_objects/pics/people/mart_employee/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/mart_employee/5.png b/graphics/event_objects/pics/people/mart_employee/5.png
deleted file mode 100644
index 46ae73fd23..0000000000
Binary files a/graphics/event_objects/pics/people/mart_employee/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/mart_employee/6.png b/graphics/event_objects/pics/people/mart_employee/6.png
deleted file mode 100644
index 9eb51a482d..0000000000
Binary files a/graphics/event_objects/pics/people/mart_employee/6.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/mart_employee/7.png b/graphics/event_objects/pics/people/mart_employee/7.png
deleted file mode 100644
index b3ffb8036f..0000000000
Binary files a/graphics/event_objects/pics/people/mart_employee/7.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/mart_employee/8.png b/graphics/event_objects/pics/people/mart_employee/8.png
deleted file mode 100644
index b2268286cb..0000000000
Binary files a/graphics/event_objects/pics/people/mart_employee/8.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/mauville_old_man_1.png b/graphics/event_objects/pics/people/mauville_old_man_1.png
new file mode 100644
index 0000000000..2c06a8f734
Binary files /dev/null and b/graphics/event_objects/pics/people/mauville_old_man_1.png differ
diff --git a/graphics/event_objects/pics/people/mauville_old_man_1/0.png b/graphics/event_objects/pics/people/mauville_old_man_1/0.png
deleted file mode 100644
index 3c10d0abf3..0000000000
Binary files a/graphics/event_objects/pics/people/mauville_old_man_1/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/mauville_old_man_1/1.png b/graphics/event_objects/pics/people/mauville_old_man_1/1.png
deleted file mode 100644
index 6f4226ccbc..0000000000
Binary files a/graphics/event_objects/pics/people/mauville_old_man_1/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/mauville_old_man_1/2.png b/graphics/event_objects/pics/people/mauville_old_man_1/2.png
deleted file mode 100644
index adf126f155..0000000000
Binary files a/graphics/event_objects/pics/people/mauville_old_man_1/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/mauville_old_man_1/3.png b/graphics/event_objects/pics/people/mauville_old_man_1/3.png
deleted file mode 100644
index e199433fb7..0000000000
Binary files a/graphics/event_objects/pics/people/mauville_old_man_1/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/mauville_old_man_1/4.png b/graphics/event_objects/pics/people/mauville_old_man_1/4.png
deleted file mode 100644
index 359e930162..0000000000
Binary files a/graphics/event_objects/pics/people/mauville_old_man_1/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/mauville_old_man_1/5.png b/graphics/event_objects/pics/people/mauville_old_man_1/5.png
deleted file mode 100644
index 34f15abffd..0000000000
Binary files a/graphics/event_objects/pics/people/mauville_old_man_1/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/mauville_old_man_1/6.png b/graphics/event_objects/pics/people/mauville_old_man_1/6.png
deleted file mode 100644
index 07af2fb1da..0000000000
Binary files a/graphics/event_objects/pics/people/mauville_old_man_1/6.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/mauville_old_man_1/7.png b/graphics/event_objects/pics/people/mauville_old_man_1/7.png
deleted file mode 100644
index a4d759a262..0000000000
Binary files a/graphics/event_objects/pics/people/mauville_old_man_1/7.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/mauville_old_man_1/8.png b/graphics/event_objects/pics/people/mauville_old_man_1/8.png
deleted file mode 100644
index 8816c61aaf..0000000000
Binary files a/graphics/event_objects/pics/people/mauville_old_man_1/8.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/mauville_old_man_2.png b/graphics/event_objects/pics/people/mauville_old_man_2.png
new file mode 100644
index 0000000000..c70175be3d
Binary files /dev/null and b/graphics/event_objects/pics/people/mauville_old_man_2.png differ
diff --git a/graphics/event_objects/pics/people/mauville_old_man_2/0.png b/graphics/event_objects/pics/people/mauville_old_man_2/0.png
deleted file mode 100644
index d913bcbdb3..0000000000
Binary files a/graphics/event_objects/pics/people/mauville_old_man_2/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/mauville_old_man_2/1.png b/graphics/event_objects/pics/people/mauville_old_man_2/1.png
deleted file mode 100644
index f98c0ecde1..0000000000
Binary files a/graphics/event_objects/pics/people/mauville_old_man_2/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/mauville_old_man_2/2.png b/graphics/event_objects/pics/people/mauville_old_man_2/2.png
deleted file mode 100644
index abe9050a0a..0000000000
Binary files a/graphics/event_objects/pics/people/mauville_old_man_2/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/mauville_old_man_2/3.png b/graphics/event_objects/pics/people/mauville_old_man_2/3.png
deleted file mode 100644
index 4d71ce7204..0000000000
Binary files a/graphics/event_objects/pics/people/mauville_old_man_2/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/mauville_old_man_2/4.png b/graphics/event_objects/pics/people/mauville_old_man_2/4.png
deleted file mode 100644
index 9e0330a616..0000000000
Binary files a/graphics/event_objects/pics/people/mauville_old_man_2/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/mauville_old_man_2/5.png b/graphics/event_objects/pics/people/mauville_old_man_2/5.png
deleted file mode 100644
index 92135f48ad..0000000000
Binary files a/graphics/event_objects/pics/people/mauville_old_man_2/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/mauville_old_man_2/6.png b/graphics/event_objects/pics/people/mauville_old_man_2/6.png
deleted file mode 100644
index 3a328ba047..0000000000
Binary files a/graphics/event_objects/pics/people/mauville_old_man_2/6.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/mauville_old_man_2/7.png b/graphics/event_objects/pics/people/mauville_old_man_2/7.png
deleted file mode 100644
index ea1b4d95bb..0000000000
Binary files a/graphics/event_objects/pics/people/mauville_old_man_2/7.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/mauville_old_man_2/8.png b/graphics/event_objects/pics/people/mauville_old_man_2/8.png
deleted file mode 100644
index ac7a5e12da..0000000000
Binary files a/graphics/event_objects/pics/people/mauville_old_man_2/8.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/maxie/0.png b/graphics/event_objects/pics/people/maxie/0.png
deleted file mode 100644
index 21ca72fd2d..0000000000
Binary files a/graphics/event_objects/pics/people/maxie/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/maxie/1.png b/graphics/event_objects/pics/people/maxie/1.png
deleted file mode 100644
index d7347de17f..0000000000
Binary files a/graphics/event_objects/pics/people/maxie/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/maxie/2.png b/graphics/event_objects/pics/people/maxie/2.png
deleted file mode 100644
index f80bb07a5a..0000000000
Binary files a/graphics/event_objects/pics/people/maxie/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/maxie/3.png b/graphics/event_objects/pics/people/maxie/3.png
deleted file mode 100644
index 6cb101536a..0000000000
Binary files a/graphics/event_objects/pics/people/maxie/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/maxie/4.png b/graphics/event_objects/pics/people/maxie/4.png
deleted file mode 100644
index c513206a69..0000000000
Binary files a/graphics/event_objects/pics/people/maxie/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/maxie/5.png b/graphics/event_objects/pics/people/maxie/5.png
deleted file mode 100644
index fd6a81dc51..0000000000
Binary files a/graphics/event_objects/pics/people/maxie/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/maxie/6.png b/graphics/event_objects/pics/people/maxie/6.png
deleted file mode 100644
index ac15642048..0000000000
Binary files a/graphics/event_objects/pics/people/maxie/6.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/maxie/7.png b/graphics/event_objects/pics/people/maxie/7.png
deleted file mode 100644
index adb1aa2350..0000000000
Binary files a/graphics/event_objects/pics/people/maxie/7.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/maxie/8.png b/graphics/event_objects/pics/people/maxie/8.png
deleted file mode 100644
index 765803561f..0000000000
Binary files a/graphics/event_objects/pics/people/maxie/8.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/may/acro_bike.png b/graphics/event_objects/pics/people/may/acro_bike.png
new file mode 100644
index 0000000000..37e8811069
Binary files /dev/null and b/graphics/event_objects/pics/people/may/acro_bike.png differ
diff --git a/graphics/event_objects/pics/people/may/acro_bike/00.png b/graphics/event_objects/pics/people/may/acro_bike/00.png
deleted file mode 100644
index 389f29985c..0000000000
Binary files a/graphics/event_objects/pics/people/may/acro_bike/00.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/may/acro_bike/01.png b/graphics/event_objects/pics/people/may/acro_bike/01.png
deleted file mode 100644
index d6b698965d..0000000000
Binary files a/graphics/event_objects/pics/people/may/acro_bike/01.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/may/acro_bike/02.png b/graphics/event_objects/pics/people/may/acro_bike/02.png
deleted file mode 100644
index ecb59b54f4..0000000000
Binary files a/graphics/event_objects/pics/people/may/acro_bike/02.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/may/acro_bike/03.png b/graphics/event_objects/pics/people/may/acro_bike/03.png
deleted file mode 100644
index dfdd7a56a8..0000000000
Binary files a/graphics/event_objects/pics/people/may/acro_bike/03.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/may/acro_bike/04.png b/graphics/event_objects/pics/people/may/acro_bike/04.png
deleted file mode 100644
index 6a6fa22fd2..0000000000
Binary files a/graphics/event_objects/pics/people/may/acro_bike/04.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/may/acro_bike/05.png b/graphics/event_objects/pics/people/may/acro_bike/05.png
deleted file mode 100644
index 3b73f3367f..0000000000
Binary files a/graphics/event_objects/pics/people/may/acro_bike/05.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/may/acro_bike/06.png b/graphics/event_objects/pics/people/may/acro_bike/06.png
deleted file mode 100644
index 368f0a05b3..0000000000
Binary files a/graphics/event_objects/pics/people/may/acro_bike/06.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/may/acro_bike/07.png b/graphics/event_objects/pics/people/may/acro_bike/07.png
deleted file mode 100644
index e43d75556c..0000000000
Binary files a/graphics/event_objects/pics/people/may/acro_bike/07.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/may/acro_bike/08.png b/graphics/event_objects/pics/people/may/acro_bike/08.png
deleted file mode 100644
index ec9ef52e6f..0000000000
Binary files a/graphics/event_objects/pics/people/may/acro_bike/08.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/may/acro_bike/09.png b/graphics/event_objects/pics/people/may/acro_bike/09.png
deleted file mode 100644
index 55522bd5b9..0000000000
Binary files a/graphics/event_objects/pics/people/may/acro_bike/09.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/may/acro_bike/10.png b/graphics/event_objects/pics/people/may/acro_bike/10.png
deleted file mode 100644
index eff73287ff..0000000000
Binary files a/graphics/event_objects/pics/people/may/acro_bike/10.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/may/acro_bike/11.png b/graphics/event_objects/pics/people/may/acro_bike/11.png
deleted file mode 100644
index 092fffddb1..0000000000
Binary files a/graphics/event_objects/pics/people/may/acro_bike/11.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/may/acro_bike/12.png b/graphics/event_objects/pics/people/may/acro_bike/12.png
deleted file mode 100644
index 233a032665..0000000000
Binary files a/graphics/event_objects/pics/people/may/acro_bike/12.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/may/acro_bike/13.png b/graphics/event_objects/pics/people/may/acro_bike/13.png
deleted file mode 100644
index f1736a0ec4..0000000000
Binary files a/graphics/event_objects/pics/people/may/acro_bike/13.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/may/acro_bike/14.png b/graphics/event_objects/pics/people/may/acro_bike/14.png
deleted file mode 100644
index bf4ade7f03..0000000000
Binary files a/graphics/event_objects/pics/people/may/acro_bike/14.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/may/acro_bike/15.png b/graphics/event_objects/pics/people/may/acro_bike/15.png
deleted file mode 100644
index 9fccb50268..0000000000
Binary files a/graphics/event_objects/pics/people/may/acro_bike/15.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/may/acro_bike/16.png b/graphics/event_objects/pics/people/may/acro_bike/16.png
deleted file mode 100644
index 6d34e41bf3..0000000000
Binary files a/graphics/event_objects/pics/people/may/acro_bike/16.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/may/acro_bike/17.png b/graphics/event_objects/pics/people/may/acro_bike/17.png
deleted file mode 100644
index e01484497f..0000000000
Binary files a/graphics/event_objects/pics/people/may/acro_bike/17.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/may/acro_bike/18.png b/graphics/event_objects/pics/people/may/acro_bike/18.png
deleted file mode 100644
index a4bee4772e..0000000000
Binary files a/graphics/event_objects/pics/people/may/acro_bike/18.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/may/acro_bike/19.png b/graphics/event_objects/pics/people/may/acro_bike/19.png
deleted file mode 100644
index f7e10f1325..0000000000
Binary files a/graphics/event_objects/pics/people/may/acro_bike/19.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/may/acro_bike/20.png b/graphics/event_objects/pics/people/may/acro_bike/20.png
deleted file mode 100644
index f9f34e4ae4..0000000000
Binary files a/graphics/event_objects/pics/people/may/acro_bike/20.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/may/acro_bike/21.png b/graphics/event_objects/pics/people/may/acro_bike/21.png
deleted file mode 100644
index 8784ce762d..0000000000
Binary files a/graphics/event_objects/pics/people/may/acro_bike/21.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/may/acro_bike/22.png b/graphics/event_objects/pics/people/may/acro_bike/22.png
deleted file mode 100644
index 8753ad9c98..0000000000
Binary files a/graphics/event_objects/pics/people/may/acro_bike/22.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/may/acro_bike/23.png b/graphics/event_objects/pics/people/may/acro_bike/23.png
deleted file mode 100644
index c2d8a60cbe..0000000000
Binary files a/graphics/event_objects/pics/people/may/acro_bike/23.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/may/acro_bike/24.png b/graphics/event_objects/pics/people/may/acro_bike/24.png
deleted file mode 100644
index 1836e5fed5..0000000000
Binary files a/graphics/event_objects/pics/people/may/acro_bike/24.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/may/acro_bike/25.png b/graphics/event_objects/pics/people/may/acro_bike/25.png
deleted file mode 100644
index d939701710..0000000000
Binary files a/graphics/event_objects/pics/people/may/acro_bike/25.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/may/acro_bike/26.png b/graphics/event_objects/pics/people/may/acro_bike/26.png
deleted file mode 100644
index 8a5ba8ef66..0000000000
Binary files a/graphics/event_objects/pics/people/may/acro_bike/26.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/may/field_move.png b/graphics/event_objects/pics/people/may/field_move.png
new file mode 100644
index 0000000000..41aa13627f
Binary files /dev/null and b/graphics/event_objects/pics/people/may/field_move.png differ
diff --git a/graphics/event_objects/pics/people/may/field_move/0.png b/graphics/event_objects/pics/people/may/field_move/0.png
deleted file mode 100644
index 9fecaa3d4f..0000000000
Binary files a/graphics/event_objects/pics/people/may/field_move/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/may/field_move/1.png b/graphics/event_objects/pics/people/may/field_move/1.png
deleted file mode 100644
index 47341322bb..0000000000
Binary files a/graphics/event_objects/pics/people/may/field_move/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/may/field_move/2.png b/graphics/event_objects/pics/people/may/field_move/2.png
deleted file mode 100644
index bdd23f0cfd..0000000000
Binary files a/graphics/event_objects/pics/people/may/field_move/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/may/field_move/3.png b/graphics/event_objects/pics/people/may/field_move/3.png
deleted file mode 100644
index c72277f745..0000000000
Binary files a/graphics/event_objects/pics/people/may/field_move/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/may/field_move/4.png b/graphics/event_objects/pics/people/may/field_move/4.png
deleted file mode 100644
index 9e62b6869d..0000000000
Binary files a/graphics/event_objects/pics/people/may/field_move/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/may/fishing.png b/graphics/event_objects/pics/people/may/fishing.png
new file mode 100644
index 0000000000..e8d3533f35
Binary files /dev/null and b/graphics/event_objects/pics/people/may/fishing.png differ
diff --git a/graphics/event_objects/pics/people/may/fishing/00.png b/graphics/event_objects/pics/people/may/fishing/00.png
deleted file mode 100644
index 24d435e84d..0000000000
Binary files a/graphics/event_objects/pics/people/may/fishing/00.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/may/fishing/01.png b/graphics/event_objects/pics/people/may/fishing/01.png
deleted file mode 100644
index f4ec1ccdd1..0000000000
Binary files a/graphics/event_objects/pics/people/may/fishing/01.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/may/fishing/02.png b/graphics/event_objects/pics/people/may/fishing/02.png
deleted file mode 100644
index 9d2e66b4f8..0000000000
Binary files a/graphics/event_objects/pics/people/may/fishing/02.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/may/fishing/03.png b/graphics/event_objects/pics/people/may/fishing/03.png
deleted file mode 100644
index a7078e584d..0000000000
Binary files a/graphics/event_objects/pics/people/may/fishing/03.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/may/fishing/04.png b/graphics/event_objects/pics/people/may/fishing/04.png
deleted file mode 100644
index f135404bc4..0000000000
Binary files a/graphics/event_objects/pics/people/may/fishing/04.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/may/fishing/05.png b/graphics/event_objects/pics/people/may/fishing/05.png
deleted file mode 100644
index cb45778ac2..0000000000
Binary files a/graphics/event_objects/pics/people/may/fishing/05.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/may/fishing/06.png b/graphics/event_objects/pics/people/may/fishing/06.png
deleted file mode 100644
index 910e2f780a..0000000000
Binary files a/graphics/event_objects/pics/people/may/fishing/06.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/may/fishing/07.png b/graphics/event_objects/pics/people/may/fishing/07.png
deleted file mode 100644
index a13b1cad5f..0000000000
Binary files a/graphics/event_objects/pics/people/may/fishing/07.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/may/fishing/08.png b/graphics/event_objects/pics/people/may/fishing/08.png
deleted file mode 100644
index 2976434818..0000000000
Binary files a/graphics/event_objects/pics/people/may/fishing/08.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/may/fishing/09.png b/graphics/event_objects/pics/people/may/fishing/09.png
deleted file mode 100644
index 069eb2b205..0000000000
Binary files a/graphics/event_objects/pics/people/may/fishing/09.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/may/fishing/10.png b/graphics/event_objects/pics/people/may/fishing/10.png
deleted file mode 100644
index 5eca2728d0..0000000000
Binary files a/graphics/event_objects/pics/people/may/fishing/10.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/may/fishing/11.png b/graphics/event_objects/pics/people/may/fishing/11.png
deleted file mode 100644
index 9895c388a2..0000000000
Binary files a/graphics/event_objects/pics/people/may/fishing/11.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/may/mach_bike.png b/graphics/event_objects/pics/people/may/mach_bike.png
new file mode 100644
index 0000000000..4e199b84a8
Binary files /dev/null and b/graphics/event_objects/pics/people/may/mach_bike.png differ
diff --git a/graphics/event_objects/pics/people/may/mach_bike/0.png b/graphics/event_objects/pics/people/may/mach_bike/0.png
deleted file mode 100644
index 389f29985c..0000000000
Binary files a/graphics/event_objects/pics/people/may/mach_bike/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/may/mach_bike/1.png b/graphics/event_objects/pics/people/may/mach_bike/1.png
deleted file mode 100644
index d6b698965d..0000000000
Binary files a/graphics/event_objects/pics/people/may/mach_bike/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/may/mach_bike/2.png b/graphics/event_objects/pics/people/may/mach_bike/2.png
deleted file mode 100644
index ecb59b54f4..0000000000
Binary files a/graphics/event_objects/pics/people/may/mach_bike/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/may/mach_bike/3.png b/graphics/event_objects/pics/people/may/mach_bike/3.png
deleted file mode 100644
index dfdd7a56a8..0000000000
Binary files a/graphics/event_objects/pics/people/may/mach_bike/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/may/mach_bike/4.png b/graphics/event_objects/pics/people/may/mach_bike/4.png
deleted file mode 100644
index 6a6fa22fd2..0000000000
Binary files a/graphics/event_objects/pics/people/may/mach_bike/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/may/mach_bike/5.png b/graphics/event_objects/pics/people/may/mach_bike/5.png
deleted file mode 100644
index 3b73f3367f..0000000000
Binary files a/graphics/event_objects/pics/people/may/mach_bike/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/may/mach_bike/6.png b/graphics/event_objects/pics/people/may/mach_bike/6.png
deleted file mode 100644
index 368f0a05b3..0000000000
Binary files a/graphics/event_objects/pics/people/may/mach_bike/6.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/may/mach_bike/7.png b/graphics/event_objects/pics/people/may/mach_bike/7.png
deleted file mode 100644
index e43d75556c..0000000000
Binary files a/graphics/event_objects/pics/people/may/mach_bike/7.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/may/mach_bike/8.png b/graphics/event_objects/pics/people/may/mach_bike/8.png
deleted file mode 100644
index ec9ef52e6f..0000000000
Binary files a/graphics/event_objects/pics/people/may/mach_bike/8.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/may/normal/00.png b/graphics/event_objects/pics/people/may/normal/00.png
deleted file mode 100644
index 58aac207f1..0000000000
Binary files a/graphics/event_objects/pics/people/may/normal/00.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/may/normal/01.png b/graphics/event_objects/pics/people/may/normal/01.png
deleted file mode 100644
index 2c3641e0ad..0000000000
Binary files a/graphics/event_objects/pics/people/may/normal/01.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/may/normal/02.png b/graphics/event_objects/pics/people/may/normal/02.png
deleted file mode 100644
index 32b7120a5c..0000000000
Binary files a/graphics/event_objects/pics/people/may/normal/02.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/may/normal/03.png b/graphics/event_objects/pics/people/may/normal/03.png
deleted file mode 100644
index d1047dff89..0000000000
Binary files a/graphics/event_objects/pics/people/may/normal/03.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/may/normal/04.png b/graphics/event_objects/pics/people/may/normal/04.png
deleted file mode 100644
index 848166557e..0000000000
Binary files a/graphics/event_objects/pics/people/may/normal/04.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/may/normal/05.png b/graphics/event_objects/pics/people/may/normal/05.png
deleted file mode 100644
index 5e6ec70ffc..0000000000
Binary files a/graphics/event_objects/pics/people/may/normal/05.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/may/normal/06.png b/graphics/event_objects/pics/people/may/normal/06.png
deleted file mode 100644
index 0e318b4667..0000000000
Binary files a/graphics/event_objects/pics/people/may/normal/06.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/may/normal/07.png b/graphics/event_objects/pics/people/may/normal/07.png
deleted file mode 100644
index e11b30b65a..0000000000
Binary files a/graphics/event_objects/pics/people/may/normal/07.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/may/normal/08.png b/graphics/event_objects/pics/people/may/normal/08.png
deleted file mode 100644
index 4aae3e9d66..0000000000
Binary files a/graphics/event_objects/pics/people/may/normal/08.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/may/normal/09.png b/graphics/event_objects/pics/people/may/normal/09.png
deleted file mode 100644
index eae4c02ee9..0000000000
Binary files a/graphics/event_objects/pics/people/may/normal/09.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/may/normal/10.png b/graphics/event_objects/pics/people/may/normal/10.png
deleted file mode 100644
index 2a678208e0..0000000000
Binary files a/graphics/event_objects/pics/people/may/normal/10.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/may/normal/11.png b/graphics/event_objects/pics/people/may/normal/11.png
deleted file mode 100644
index 7ca7d3e6f4..0000000000
Binary files a/graphics/event_objects/pics/people/may/normal/11.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/may/normal/12.png b/graphics/event_objects/pics/people/may/normal/12.png
deleted file mode 100644
index 1e2d408949..0000000000
Binary files a/graphics/event_objects/pics/people/may/normal/12.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/may/normal/13.png b/graphics/event_objects/pics/people/may/normal/13.png
deleted file mode 100644
index ca020591c1..0000000000
Binary files a/graphics/event_objects/pics/people/may/normal/13.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/may/normal/14.png b/graphics/event_objects/pics/people/may/normal/14.png
deleted file mode 100644
index 6a5a2e3e52..0000000000
Binary files a/graphics/event_objects/pics/people/may/normal/14.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/may/normal/15.png b/graphics/event_objects/pics/people/may/normal/15.png
deleted file mode 100644
index 06d8131673..0000000000
Binary files a/graphics/event_objects/pics/people/may/normal/15.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/may/normal/16.png b/graphics/event_objects/pics/people/may/normal/16.png
deleted file mode 100644
index c1fe3d367d..0000000000
Binary files a/graphics/event_objects/pics/people/may/normal/16.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/may/normal/17.png b/graphics/event_objects/pics/people/may/normal/17.png
deleted file mode 100644
index 334c70cf14..0000000000
Binary files a/graphics/event_objects/pics/people/may/normal/17.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/may/running.png b/graphics/event_objects/pics/people/may/running.png
new file mode 100644
index 0000000000..40808c9650
Binary files /dev/null and b/graphics/event_objects/pics/people/may/running.png differ
diff --git a/graphics/event_objects/pics/people/may/surfing.png b/graphics/event_objects/pics/people/may/surfing.png
new file mode 100644
index 0000000000..5b783f4991
Binary files /dev/null and b/graphics/event_objects/pics/people/may/surfing.png differ
diff --git a/graphics/event_objects/pics/people/may/surfing/0.png b/graphics/event_objects/pics/people/may/surfing/0.png
deleted file mode 100644
index 98b152f5f3..0000000000
Binary files a/graphics/event_objects/pics/people/may/surfing/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/may/surfing/1.png b/graphics/event_objects/pics/people/may/surfing/1.png
deleted file mode 100644
index 45ae647056..0000000000
Binary files a/graphics/event_objects/pics/people/may/surfing/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/may/surfing/2.png b/graphics/event_objects/pics/people/may/surfing/2.png
deleted file mode 100644
index eb6f7675ef..0000000000
Binary files a/graphics/event_objects/pics/people/may/surfing/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/may/surfing/3.png b/graphics/event_objects/pics/people/may/surfing/3.png
deleted file mode 100644
index 18756fe1b5..0000000000
Binary files a/graphics/event_objects/pics/people/may/surfing/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/may/surfing/4.png b/graphics/event_objects/pics/people/may/surfing/4.png
deleted file mode 100644
index ac89a2672b..0000000000
Binary files a/graphics/event_objects/pics/people/may/surfing/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/may/surfing/5.png b/graphics/event_objects/pics/people/may/surfing/5.png
deleted file mode 100644
index 2569df0083..0000000000
Binary files a/graphics/event_objects/pics/people/may/surfing/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/may/underwater.png b/graphics/event_objects/pics/people/may/underwater.png
new file mode 100644
index 0000000000..8a2d654656
Binary files /dev/null and b/graphics/event_objects/pics/people/may/underwater.png differ
diff --git a/graphics/event_objects/pics/people/may/underwater/0.png b/graphics/event_objects/pics/people/may/underwater/0.png
deleted file mode 100644
index 678dc4bb6e..0000000000
Binary files a/graphics/event_objects/pics/people/may/underwater/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/may/underwater/1.png b/graphics/event_objects/pics/people/may/underwater/1.png
deleted file mode 100644
index 697cec2d13..0000000000
Binary files a/graphics/event_objects/pics/people/may/underwater/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/may/underwater/2.png b/graphics/event_objects/pics/people/may/underwater/2.png
deleted file mode 100644
index 423f01f88e..0000000000
Binary files a/graphics/event_objects/pics/people/may/underwater/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/may/underwater/3.png b/graphics/event_objects/pics/people/may/underwater/3.png
deleted file mode 100644
index 4118573a37..0000000000
Binary files a/graphics/event_objects/pics/people/may/underwater/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/may/walking.png b/graphics/event_objects/pics/people/may/walking.png
new file mode 100644
index 0000000000..b50bf12295
Binary files /dev/null and b/graphics/event_objects/pics/people/may/walking.png differ
diff --git a/graphics/event_objects/pics/people/may/watering.png b/graphics/event_objects/pics/people/may/watering.png
new file mode 100644
index 0000000000..28c5b41beb
Binary files /dev/null and b/graphics/event_objects/pics/people/may/watering.png differ
diff --git a/graphics/event_objects/pics/people/may/watering/0.png b/graphics/event_objects/pics/people/may/watering/0.png
deleted file mode 100644
index 11e8944a18..0000000000
Binary files a/graphics/event_objects/pics/people/may/watering/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/may/watering/1.png b/graphics/event_objects/pics/people/may/watering/1.png
deleted file mode 100644
index 84aa555022..0000000000
Binary files a/graphics/event_objects/pics/people/may/watering/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/may/watering/2.png b/graphics/event_objects/pics/people/may/watering/2.png
deleted file mode 100644
index 5d68e49940..0000000000
Binary files a/graphics/event_objects/pics/people/may/watering/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/may/watering/3.png b/graphics/event_objects/pics/people/may/watering/3.png
deleted file mode 100644
index c0f732d725..0000000000
Binary files a/graphics/event_objects/pics/people/may/watering/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/may/watering/4.png b/graphics/event_objects/pics/people/may/watering/4.png
deleted file mode 100644
index 85657cc6c6..0000000000
Binary files a/graphics/event_objects/pics/people/may/watering/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/may/watering/5.png b/graphics/event_objects/pics/people/may/watering/5.png
deleted file mode 100644
index 939671a315..0000000000
Binary files a/graphics/event_objects/pics/people/may/watering/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/mom.png b/graphics/event_objects/pics/people/mom.png
new file mode 100644
index 0000000000..8b78515ff6
Binary files /dev/null and b/graphics/event_objects/pics/people/mom.png differ
diff --git a/graphics/event_objects/pics/people/mom/0.png b/graphics/event_objects/pics/people/mom/0.png
deleted file mode 100644
index c2b592c9f0..0000000000
Binary files a/graphics/event_objects/pics/people/mom/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/mom/1.png b/graphics/event_objects/pics/people/mom/1.png
deleted file mode 100644
index e1d1797cb8..0000000000
Binary files a/graphics/event_objects/pics/people/mom/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/mom/2.png b/graphics/event_objects/pics/people/mom/2.png
deleted file mode 100644
index 8cd0c1d72c..0000000000
Binary files a/graphics/event_objects/pics/people/mom/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/mom/3.png b/graphics/event_objects/pics/people/mom/3.png
deleted file mode 100644
index 3a682f892b..0000000000
Binary files a/graphics/event_objects/pics/people/mom/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/mom/4.png b/graphics/event_objects/pics/people/mom/4.png
deleted file mode 100644
index 96de53b7b7..0000000000
Binary files a/graphics/event_objects/pics/people/mom/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/mom/5.png b/graphics/event_objects/pics/people/mom/5.png
deleted file mode 100644
index 567e8fb537..0000000000
Binary files a/graphics/event_objects/pics/people/mom/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/mom/6.png b/graphics/event_objects/pics/people/mom/6.png
deleted file mode 100644
index 4dfaed4925..0000000000
Binary files a/graphics/event_objects/pics/people/mom/6.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/mom/7.png b/graphics/event_objects/pics/people/mom/7.png
deleted file mode 100644
index 3ce984e75d..0000000000
Binary files a/graphics/event_objects/pics/people/mom/7.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/mom/8.png b/graphics/event_objects/pics/people/mom/8.png
deleted file mode 100644
index 6a3da67d12..0000000000
Binary files a/graphics/event_objects/pics/people/mom/8.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/mystery_event_deliveryman.png b/graphics/event_objects/pics/people/mystery_event_deliveryman.png
new file mode 100644
index 0000000000..2181de2f12
Binary files /dev/null and b/graphics/event_objects/pics/people/mystery_event_deliveryman.png differ
diff --git a/graphics/event_objects/pics/people/mystery_event_deliveryman/0.png b/graphics/event_objects/pics/people/mystery_event_deliveryman/0.png
deleted file mode 100644
index ec3e0ac82f..0000000000
Binary files a/graphics/event_objects/pics/people/mystery_event_deliveryman/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/mystery_event_deliveryman/1.png b/graphics/event_objects/pics/people/mystery_event_deliveryman/1.png
deleted file mode 100644
index 8be9890451..0000000000
Binary files a/graphics/event_objects/pics/people/mystery_event_deliveryman/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/mystery_event_deliveryman/2.png b/graphics/event_objects/pics/people/mystery_event_deliveryman/2.png
deleted file mode 100644
index afff0cc5e2..0000000000
Binary files a/graphics/event_objects/pics/people/mystery_event_deliveryman/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/noland/0.png b/graphics/event_objects/pics/people/noland/0.png
deleted file mode 100644
index 76fb7bdf14..0000000000
Binary files a/graphics/event_objects/pics/people/noland/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/noland/1.png b/graphics/event_objects/pics/people/noland/1.png
deleted file mode 100644
index 4eeceffedf..0000000000
Binary files a/graphics/event_objects/pics/people/noland/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/noland/2.png b/graphics/event_objects/pics/people/noland/2.png
deleted file mode 100644
index daeff06412..0000000000
Binary files a/graphics/event_objects/pics/people/noland/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/noland/3.png b/graphics/event_objects/pics/people/noland/3.png
deleted file mode 100644
index e54596be65..0000000000
Binary files a/graphics/event_objects/pics/people/noland/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/noland/4.png b/graphics/event_objects/pics/people/noland/4.png
deleted file mode 100644
index 35763f56fe..0000000000
Binary files a/graphics/event_objects/pics/people/noland/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/noland/5.png b/graphics/event_objects/pics/people/noland/5.png
deleted file mode 100644
index ef0ac5d92b..0000000000
Binary files a/graphics/event_objects/pics/people/noland/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/noland/6.png b/graphics/event_objects/pics/people/noland/6.png
deleted file mode 100644
index dc6fa2a259..0000000000
Binary files a/graphics/event_objects/pics/people/noland/6.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/noland/7.png b/graphics/event_objects/pics/people/noland/7.png
deleted file mode 100644
index ee98201067..0000000000
Binary files a/graphics/event_objects/pics/people/noland/7.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/noland/8.png b/graphics/event_objects/pics/people/noland/8.png
deleted file mode 100644
index e8d40a08de..0000000000
Binary files a/graphics/event_objects/pics/people/noland/8.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/norman/0.png b/graphics/event_objects/pics/people/norman/0.png
deleted file mode 100644
index 5f0bd16861..0000000000
Binary files a/graphics/event_objects/pics/people/norman/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/norman/1.png b/graphics/event_objects/pics/people/norman/1.png
deleted file mode 100644
index 88ea12ada6..0000000000
Binary files a/graphics/event_objects/pics/people/norman/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/norman/2.png b/graphics/event_objects/pics/people/norman/2.png
deleted file mode 100644
index 04d8694efe..0000000000
Binary files a/graphics/event_objects/pics/people/norman/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/norman/3.png b/graphics/event_objects/pics/people/norman/3.png
deleted file mode 100644
index 90d16f6756..0000000000
Binary files a/graphics/event_objects/pics/people/norman/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/norman/4.png b/graphics/event_objects/pics/people/norman/4.png
deleted file mode 100644
index 0df4412fbd..0000000000
Binary files a/graphics/event_objects/pics/people/norman/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/norman/5.png b/graphics/event_objects/pics/people/norman/5.png
deleted file mode 100644
index ea68e09524..0000000000
Binary files a/graphics/event_objects/pics/people/norman/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/norman/6.png b/graphics/event_objects/pics/people/norman/6.png
deleted file mode 100644
index 45f8e51190..0000000000
Binary files a/graphics/event_objects/pics/people/norman/6.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/norman/7.png b/graphics/event_objects/pics/people/norman/7.png
deleted file mode 100644
index 27ff65ec08..0000000000
Binary files a/graphics/event_objects/pics/people/norman/7.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/norman/8.png b/graphics/event_objects/pics/people/norman/8.png
deleted file mode 100644
index aa18f3d734..0000000000
Binary files a/graphics/event_objects/pics/people/norman/8.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/nurse.png b/graphics/event_objects/pics/people/nurse.png
new file mode 100644
index 0000000000..d202f3c16b
Binary files /dev/null and b/graphics/event_objects/pics/people/nurse.png differ
diff --git a/graphics/event_objects/pics/people/nurse/0.png b/graphics/event_objects/pics/people/nurse/0.png
deleted file mode 100644
index 3c6b147171..0000000000
Binary files a/graphics/event_objects/pics/people/nurse/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/nurse/1.png b/graphics/event_objects/pics/people/nurse/1.png
deleted file mode 100644
index a20bfc5218..0000000000
Binary files a/graphics/event_objects/pics/people/nurse/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/nurse/2.png b/graphics/event_objects/pics/people/nurse/2.png
deleted file mode 100644
index ec048a0402..0000000000
Binary files a/graphics/event_objects/pics/people/nurse/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/nurse/3.png b/graphics/event_objects/pics/people/nurse/3.png
deleted file mode 100644
index ae306ff491..0000000000
Binary files a/graphics/event_objects/pics/people/nurse/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/old_man_1.png b/graphics/event_objects/pics/people/old_man_1.png
new file mode 100644
index 0000000000..2249869904
Binary files /dev/null and b/graphics/event_objects/pics/people/old_man_1.png differ
diff --git a/graphics/event_objects/pics/people/old_man_1/0.png b/graphics/event_objects/pics/people/old_man_1/0.png
deleted file mode 100644
index f593b13e09..0000000000
Binary files a/graphics/event_objects/pics/people/old_man_1/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/old_man_1/1.png b/graphics/event_objects/pics/people/old_man_1/1.png
deleted file mode 100644
index 2479299b15..0000000000
Binary files a/graphics/event_objects/pics/people/old_man_1/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/old_man_1/2.png b/graphics/event_objects/pics/people/old_man_1/2.png
deleted file mode 100644
index e24126007e..0000000000
Binary files a/graphics/event_objects/pics/people/old_man_1/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/old_man_1/3.png b/graphics/event_objects/pics/people/old_man_1/3.png
deleted file mode 100644
index 058b699b33..0000000000
Binary files a/graphics/event_objects/pics/people/old_man_1/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/old_man_1/4.png b/graphics/event_objects/pics/people/old_man_1/4.png
deleted file mode 100644
index 3f68a34c16..0000000000
Binary files a/graphics/event_objects/pics/people/old_man_1/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/old_man_1/5.png b/graphics/event_objects/pics/people/old_man_1/5.png
deleted file mode 100644
index f0eb2a0ade..0000000000
Binary files a/graphics/event_objects/pics/people/old_man_1/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/old_man_1/6.png b/graphics/event_objects/pics/people/old_man_1/6.png
deleted file mode 100644
index 3e4570a9ce..0000000000
Binary files a/graphics/event_objects/pics/people/old_man_1/6.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/old_man_1/7.png b/graphics/event_objects/pics/people/old_man_1/7.png
deleted file mode 100644
index 2066c1170a..0000000000
Binary files a/graphics/event_objects/pics/people/old_man_1/7.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/old_man_1/8.png b/graphics/event_objects/pics/people/old_man_1/8.png
deleted file mode 100644
index 10af5d1e77..0000000000
Binary files a/graphics/event_objects/pics/people/old_man_1/8.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/old_man_2.png b/graphics/event_objects/pics/people/old_man_2.png
new file mode 100644
index 0000000000..82bb66f8a9
Binary files /dev/null and b/graphics/event_objects/pics/people/old_man_2.png differ
diff --git a/graphics/event_objects/pics/people/old_man_2/0.png b/graphics/event_objects/pics/people/old_man_2/0.png
deleted file mode 100644
index 0f3537c269..0000000000
Binary files a/graphics/event_objects/pics/people/old_man_2/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/old_man_2/1.png b/graphics/event_objects/pics/people/old_man_2/1.png
deleted file mode 100644
index d47c1bd70b..0000000000
Binary files a/graphics/event_objects/pics/people/old_man_2/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/old_man_2/2.png b/graphics/event_objects/pics/people/old_man_2/2.png
deleted file mode 100644
index 43fdd98497..0000000000
Binary files a/graphics/event_objects/pics/people/old_man_2/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/old_woman_1.png b/graphics/event_objects/pics/people/old_woman_1.png
new file mode 100644
index 0000000000..d928b8ae6c
Binary files /dev/null and b/graphics/event_objects/pics/people/old_woman_1.png differ
diff --git a/graphics/event_objects/pics/people/old_woman_1/0.png b/graphics/event_objects/pics/people/old_woman_1/0.png
deleted file mode 100644
index 86eb3b8876..0000000000
Binary files a/graphics/event_objects/pics/people/old_woman_1/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/old_woman_1/1.png b/graphics/event_objects/pics/people/old_woman_1/1.png
deleted file mode 100644
index fcab35b2ed..0000000000
Binary files a/graphics/event_objects/pics/people/old_woman_1/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/old_woman_1/2.png b/graphics/event_objects/pics/people/old_woman_1/2.png
deleted file mode 100644
index cdee1f84af..0000000000
Binary files a/graphics/event_objects/pics/people/old_woman_1/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/old_woman_1/3.png b/graphics/event_objects/pics/people/old_woman_1/3.png
deleted file mode 100644
index 40fc7f909a..0000000000
Binary files a/graphics/event_objects/pics/people/old_woman_1/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/old_woman_1/4.png b/graphics/event_objects/pics/people/old_woman_1/4.png
deleted file mode 100644
index 6b0df84d63..0000000000
Binary files a/graphics/event_objects/pics/people/old_woman_1/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/old_woman_1/5.png b/graphics/event_objects/pics/people/old_woman_1/5.png
deleted file mode 100644
index 6490ca64ae..0000000000
Binary files a/graphics/event_objects/pics/people/old_woman_1/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/old_woman_1/6.png b/graphics/event_objects/pics/people/old_woman_1/6.png
deleted file mode 100644
index d3cc6dd56c..0000000000
Binary files a/graphics/event_objects/pics/people/old_woman_1/6.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/old_woman_1/7.png b/graphics/event_objects/pics/people/old_woman_1/7.png
deleted file mode 100644
index fd63c293c6..0000000000
Binary files a/graphics/event_objects/pics/people/old_woman_1/7.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/old_woman_1/8.png b/graphics/event_objects/pics/people/old_woman_1/8.png
deleted file mode 100644
index 955bcf3dbe..0000000000
Binary files a/graphics/event_objects/pics/people/old_woman_1/8.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/old_woman_2.png b/graphics/event_objects/pics/people/old_woman_2.png
new file mode 100644
index 0000000000..0a6f5ebd3f
Binary files /dev/null and b/graphics/event_objects/pics/people/old_woman_2.png differ
diff --git a/graphics/event_objects/pics/people/old_woman_2/0.png b/graphics/event_objects/pics/people/old_woman_2/0.png
deleted file mode 100644
index 2bccb0fb13..0000000000
Binary files a/graphics/event_objects/pics/people/old_woman_2/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/old_woman_2/1.png b/graphics/event_objects/pics/people/old_woman_2/1.png
deleted file mode 100644
index 159e277d9f..0000000000
Binary files a/graphics/event_objects/pics/people/old_woman_2/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/old_woman_2/2.png b/graphics/event_objects/pics/people/old_woman_2/2.png
deleted file mode 100644
index 6c2cb0fbea..0000000000
Binary files a/graphics/event_objects/pics/people/old_woman_2/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/old_woman_2/3.png b/graphics/event_objects/pics/people/old_woman_2/3.png
deleted file mode 100644
index 956af24a1f..0000000000
Binary files a/graphics/event_objects/pics/people/old_woman_2/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/old_woman_2/4.png b/graphics/event_objects/pics/people/old_woman_2/4.png
deleted file mode 100644
index f3acfbc554..0000000000
Binary files a/graphics/event_objects/pics/people/old_woman_2/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/old_woman_2/5.png b/graphics/event_objects/pics/people/old_woman_2/5.png
deleted file mode 100644
index b07ff25e5e..0000000000
Binary files a/graphics/event_objects/pics/people/old_woman_2/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/old_woman_2/6.png b/graphics/event_objects/pics/people/old_woman_2/6.png
deleted file mode 100644
index 7fe9b97e1b..0000000000
Binary files a/graphics/event_objects/pics/people/old_woman_2/6.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/old_woman_2/7.png b/graphics/event_objects/pics/people/old_woman_2/7.png
deleted file mode 100644
index 681aab7cc5..0000000000
Binary files a/graphics/event_objects/pics/people/old_woman_2/7.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/old_woman_2/8.png b/graphics/event_objects/pics/people/old_woman_2/8.png
deleted file mode 100644
index 87d5c464d8..0000000000
Binary files a/graphics/event_objects/pics/people/old_woman_2/8.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/phoebe/0.png b/graphics/event_objects/pics/people/phoebe/0.png
deleted file mode 100644
index 06188b539f..0000000000
Binary files a/graphics/event_objects/pics/people/phoebe/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/phoebe/1.png b/graphics/event_objects/pics/people/phoebe/1.png
deleted file mode 100644
index 505190902e..0000000000
Binary files a/graphics/event_objects/pics/people/phoebe/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/phoebe/2.png b/graphics/event_objects/pics/people/phoebe/2.png
deleted file mode 100644
index a5f66cdbf2..0000000000
Binary files a/graphics/event_objects/pics/people/phoebe/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/picnicker.png b/graphics/event_objects/pics/people/picnicker.png
new file mode 100644
index 0000000000..207c422006
Binary files /dev/null and b/graphics/event_objects/pics/people/picnicker.png differ
diff --git a/graphics/event_objects/pics/people/picnicker/0.png b/graphics/event_objects/pics/people/picnicker/0.png
deleted file mode 100644
index 310170def6..0000000000
Binary files a/graphics/event_objects/pics/people/picnicker/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/picnicker/1.png b/graphics/event_objects/pics/people/picnicker/1.png
deleted file mode 100644
index 9caeb6de22..0000000000
Binary files a/graphics/event_objects/pics/people/picnicker/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/picnicker/2.png b/graphics/event_objects/pics/people/picnicker/2.png
deleted file mode 100644
index 17ca910445..0000000000
Binary files a/graphics/event_objects/pics/people/picnicker/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/picnicker/3.png b/graphics/event_objects/pics/people/picnicker/3.png
deleted file mode 100644
index e80ca4b4e2..0000000000
Binary files a/graphics/event_objects/pics/people/picnicker/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/picnicker/4.png b/graphics/event_objects/pics/people/picnicker/4.png
deleted file mode 100644
index 1c2ad07097..0000000000
Binary files a/graphics/event_objects/pics/people/picnicker/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/picnicker/5.png b/graphics/event_objects/pics/people/picnicker/5.png
deleted file mode 100644
index a5dce80dd1..0000000000
Binary files a/graphics/event_objects/pics/people/picnicker/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/picnicker/6.png b/graphics/event_objects/pics/people/picnicker/6.png
deleted file mode 100644
index 1895ff667e..0000000000
Binary files a/graphics/event_objects/pics/people/picnicker/6.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/picnicker/7.png b/graphics/event_objects/pics/people/picnicker/7.png
deleted file mode 100644
index 62d0c2f68c..0000000000
Binary files a/graphics/event_objects/pics/people/picnicker/7.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/picnicker/8.png b/graphics/event_objects/pics/people/picnicker/8.png
deleted file mode 100644
index 076c2c32b7..0000000000
Binary files a/graphics/event_objects/pics/people/picnicker/8.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/prof_birch.png b/graphics/event_objects/pics/people/prof_birch.png
new file mode 100644
index 0000000000..5c3fda9f9e
Binary files /dev/null and b/graphics/event_objects/pics/people/prof_birch.png differ
diff --git a/graphics/event_objects/pics/people/prof_birch/0.png b/graphics/event_objects/pics/people/prof_birch/0.png
deleted file mode 100644
index 2dbe3bef5b..0000000000
Binary files a/graphics/event_objects/pics/people/prof_birch/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/prof_birch/1.png b/graphics/event_objects/pics/people/prof_birch/1.png
deleted file mode 100644
index b27c2174ad..0000000000
Binary files a/graphics/event_objects/pics/people/prof_birch/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/prof_birch/2.png b/graphics/event_objects/pics/people/prof_birch/2.png
deleted file mode 100644
index 195a3da01d..0000000000
Binary files a/graphics/event_objects/pics/people/prof_birch/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/prof_birch/3.png b/graphics/event_objects/pics/people/prof_birch/3.png
deleted file mode 100644
index 5f9d2750e5..0000000000
Binary files a/graphics/event_objects/pics/people/prof_birch/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/prof_birch/4.png b/graphics/event_objects/pics/people/prof_birch/4.png
deleted file mode 100644
index a44244f15f..0000000000
Binary files a/graphics/event_objects/pics/people/prof_birch/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/prof_birch/5.png b/graphics/event_objects/pics/people/prof_birch/5.png
deleted file mode 100644
index 3c6c16ff15..0000000000
Binary files a/graphics/event_objects/pics/people/prof_birch/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/prof_birch/6.png b/graphics/event_objects/pics/people/prof_birch/6.png
deleted file mode 100644
index 802b89fd60..0000000000
Binary files a/graphics/event_objects/pics/people/prof_birch/6.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/prof_birch/7.png b/graphics/event_objects/pics/people/prof_birch/7.png
deleted file mode 100644
index 59af318a2c..0000000000
Binary files a/graphics/event_objects/pics/people/prof_birch/7.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/prof_birch/8.png b/graphics/event_objects/pics/people/prof_birch/8.png
deleted file mode 100644
index 0a936308a3..0000000000
Binary files a/graphics/event_objects/pics/people/prof_birch/8.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/psychic_m.png b/graphics/event_objects/pics/people/psychic_m.png
new file mode 100644
index 0000000000..74e8503294
Binary files /dev/null and b/graphics/event_objects/pics/people/psychic_m.png differ
diff --git a/graphics/event_objects/pics/people/psychic_m/0.png b/graphics/event_objects/pics/people/psychic_m/0.png
deleted file mode 100644
index 099e65aa18..0000000000
Binary files a/graphics/event_objects/pics/people/psychic_m/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/psychic_m/1.png b/graphics/event_objects/pics/people/psychic_m/1.png
deleted file mode 100644
index 6203b8f3a4..0000000000
Binary files a/graphics/event_objects/pics/people/psychic_m/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/psychic_m/2.png b/graphics/event_objects/pics/people/psychic_m/2.png
deleted file mode 100644
index 00f19c8c3f..0000000000
Binary files a/graphics/event_objects/pics/people/psychic_m/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/psychic_m/3.png b/graphics/event_objects/pics/people/psychic_m/3.png
deleted file mode 100644
index ec8733d454..0000000000
Binary files a/graphics/event_objects/pics/people/psychic_m/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/psychic_m/4.png b/graphics/event_objects/pics/people/psychic_m/4.png
deleted file mode 100644
index 7a2f069470..0000000000
Binary files a/graphics/event_objects/pics/people/psychic_m/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/psychic_m/5.png b/graphics/event_objects/pics/people/psychic_m/5.png
deleted file mode 100644
index 64133327d7..0000000000
Binary files a/graphics/event_objects/pics/people/psychic_m/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/psychic_m/6.png b/graphics/event_objects/pics/people/psychic_m/6.png
deleted file mode 100644
index 7c55b4f4da..0000000000
Binary files a/graphics/event_objects/pics/people/psychic_m/6.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/psychic_m/7.png b/graphics/event_objects/pics/people/psychic_m/7.png
deleted file mode 100644
index 134953f5c3..0000000000
Binary files a/graphics/event_objects/pics/people/psychic_m/7.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/psychic_m/8.png b/graphics/event_objects/pics/people/psychic_m/8.png
deleted file mode 100644
index 79ea167fe9..0000000000
Binary files a/graphics/event_objects/pics/people/psychic_m/8.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/quinty_plump.png b/graphics/event_objects/pics/people/quinty_plump.png
new file mode 100644
index 0000000000..8b08ba7d72
Binary files /dev/null and b/graphics/event_objects/pics/people/quinty_plump.png differ
diff --git a/graphics/event_objects/pics/people/quinty_plump/0.png b/graphics/event_objects/pics/people/quinty_plump/0.png
deleted file mode 100644
index 7a29230f4e..0000000000
Binary files a/graphics/event_objects/pics/people/quinty_plump/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/quinty_plump/1.png b/graphics/event_objects/pics/people/quinty_plump/1.png
deleted file mode 100644
index 6fbd85a267..0000000000
Binary files a/graphics/event_objects/pics/people/quinty_plump/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/quinty_plump/2.png b/graphics/event_objects/pics/people/quinty_plump/2.png
deleted file mode 100644
index 238f0a55c0..0000000000
Binary files a/graphics/event_objects/pics/people/quinty_plump/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/quinty_plump/3.png b/graphics/event_objects/pics/people/quinty_plump/3.png
deleted file mode 100644
index d1cb5d7e7e..0000000000
Binary files a/graphics/event_objects/pics/people/quinty_plump/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/quinty_plump/4.png b/graphics/event_objects/pics/people/quinty_plump/4.png
deleted file mode 100644
index 4afac2056d..0000000000
Binary files a/graphics/event_objects/pics/people/quinty_plump/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/quinty_plump/5.png b/graphics/event_objects/pics/people/quinty_plump/5.png
deleted file mode 100644
index 9f9404aef8..0000000000
Binary files a/graphics/event_objects/pics/people/quinty_plump/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/quinty_plump/6.png b/graphics/event_objects/pics/people/quinty_plump/6.png
deleted file mode 100644
index 11316499cc..0000000000
Binary files a/graphics/event_objects/pics/people/quinty_plump/6.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/red.png b/graphics/event_objects/pics/people/red.png
new file mode 100644
index 0000000000..b233aeaebf
Binary files /dev/null and b/graphics/event_objects/pics/people/red.png differ
diff --git a/graphics/event_objects/pics/people/red/0.png b/graphics/event_objects/pics/people/red/0.png
deleted file mode 100644
index d6cf06ece4..0000000000
Binary files a/graphics/event_objects/pics/people/red/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/red/1.png b/graphics/event_objects/pics/people/red/1.png
deleted file mode 100644
index 597001dfd4..0000000000
Binary files a/graphics/event_objects/pics/people/red/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/red/2.png b/graphics/event_objects/pics/people/red/2.png
deleted file mode 100644
index 854948ceea..0000000000
Binary files a/graphics/event_objects/pics/people/red/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/red/3.png b/graphics/event_objects/pics/people/red/3.png
deleted file mode 100644
index 6a533d4e44..0000000000
Binary files a/graphics/event_objects/pics/people/red/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/red/4.png b/graphics/event_objects/pics/people/red/4.png
deleted file mode 100644
index aaedd94112..0000000000
Binary files a/graphics/event_objects/pics/people/red/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/red/5.png b/graphics/event_objects/pics/people/red/5.png
deleted file mode 100644
index adc0335303..0000000000
Binary files a/graphics/event_objects/pics/people/red/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/red/6.png b/graphics/event_objects/pics/people/red/6.png
deleted file mode 100644
index 5a5ac80e01..0000000000
Binary files a/graphics/event_objects/pics/people/red/6.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/red/7.png b/graphics/event_objects/pics/people/red/7.png
deleted file mode 100644
index 22bea3f24f..0000000000
Binary files a/graphics/event_objects/pics/people/red/7.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/red/8.png b/graphics/event_objects/pics/people/red/8.png
deleted file mode 100644
index d0d544d164..0000000000
Binary files a/graphics/event_objects/pics/people/red/8.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/reporter_f.png b/graphics/event_objects/pics/people/reporter_f.png
new file mode 100644
index 0000000000..781b07fc69
Binary files /dev/null and b/graphics/event_objects/pics/people/reporter_f.png differ
diff --git a/graphics/event_objects/pics/people/reporter_f/0.png b/graphics/event_objects/pics/people/reporter_f/0.png
deleted file mode 100644
index d22968ddd6..0000000000
Binary files a/graphics/event_objects/pics/people/reporter_f/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/reporter_f/1.png b/graphics/event_objects/pics/people/reporter_f/1.png
deleted file mode 100644
index fb29ac66f3..0000000000
Binary files a/graphics/event_objects/pics/people/reporter_f/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/reporter_f/2.png b/graphics/event_objects/pics/people/reporter_f/2.png
deleted file mode 100644
index 4ac6333680..0000000000
Binary files a/graphics/event_objects/pics/people/reporter_f/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/reporter_f/3.png b/graphics/event_objects/pics/people/reporter_f/3.png
deleted file mode 100644
index 3fc93ee7fd..0000000000
Binary files a/graphics/event_objects/pics/people/reporter_f/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/reporter_f/4.png b/graphics/event_objects/pics/people/reporter_f/4.png
deleted file mode 100644
index fa20a54c82..0000000000
Binary files a/graphics/event_objects/pics/people/reporter_f/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/reporter_f/5.png b/graphics/event_objects/pics/people/reporter_f/5.png
deleted file mode 100644
index 0155754830..0000000000
Binary files a/graphics/event_objects/pics/people/reporter_f/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/reporter_f/6.png b/graphics/event_objects/pics/people/reporter_f/6.png
deleted file mode 100644
index e2c9d3d114..0000000000
Binary files a/graphics/event_objects/pics/people/reporter_f/6.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/reporter_f/7.png b/graphics/event_objects/pics/people/reporter_f/7.png
deleted file mode 100644
index 1b986e6162..0000000000
Binary files a/graphics/event_objects/pics/people/reporter_f/7.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/reporter_f/8.png b/graphics/event_objects/pics/people/reporter_f/8.png
deleted file mode 100644
index d1dfc31a64..0000000000
Binary files a/graphics/event_objects/pics/people/reporter_f/8.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/reporter_m.png b/graphics/event_objects/pics/people/reporter_m.png
new file mode 100644
index 0000000000..0992b12ea2
Binary files /dev/null and b/graphics/event_objects/pics/people/reporter_m.png differ
diff --git a/graphics/event_objects/pics/people/reporter_m/0.png b/graphics/event_objects/pics/people/reporter_m/0.png
deleted file mode 100644
index b052abfeef..0000000000
Binary files a/graphics/event_objects/pics/people/reporter_m/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/reporter_m/1.png b/graphics/event_objects/pics/people/reporter_m/1.png
deleted file mode 100644
index 0a273f5aa1..0000000000
Binary files a/graphics/event_objects/pics/people/reporter_m/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/reporter_m/2.png b/graphics/event_objects/pics/people/reporter_m/2.png
deleted file mode 100644
index a47cef17b3..0000000000
Binary files a/graphics/event_objects/pics/people/reporter_m/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/reporter_m/3.png b/graphics/event_objects/pics/people/reporter_m/3.png
deleted file mode 100644
index 780f128b3c..0000000000
Binary files a/graphics/event_objects/pics/people/reporter_m/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/reporter_m/4.png b/graphics/event_objects/pics/people/reporter_m/4.png
deleted file mode 100644
index cb57002ab2..0000000000
Binary files a/graphics/event_objects/pics/people/reporter_m/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/reporter_m/5.png b/graphics/event_objects/pics/people/reporter_m/5.png
deleted file mode 100644
index 6f488296c0..0000000000
Binary files a/graphics/event_objects/pics/people/reporter_m/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/reporter_m/6.png b/graphics/event_objects/pics/people/reporter_m/6.png
deleted file mode 100644
index 4aad5d2c68..0000000000
Binary files a/graphics/event_objects/pics/people/reporter_m/6.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/reporter_m/7.png b/graphics/event_objects/pics/people/reporter_m/7.png
deleted file mode 100644
index 7ac1d360d2..0000000000
Binary files a/graphics/event_objects/pics/people/reporter_m/7.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/reporter_m/8.png b/graphics/event_objects/pics/people/reporter_m/8.png
deleted file mode 100644
index 25b07efb41..0000000000
Binary files a/graphics/event_objects/pics/people/reporter_m/8.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/rooftop_sale_woman.png b/graphics/event_objects/pics/people/rooftop_sale_woman.png
new file mode 100644
index 0000000000..d55d961f4c
Binary files /dev/null and b/graphics/event_objects/pics/people/rooftop_sale_woman.png differ
diff --git a/graphics/event_objects/pics/people/rooftop_sale_woman/0.png b/graphics/event_objects/pics/people/rooftop_sale_woman/0.png
deleted file mode 100644
index f73f91631b..0000000000
Binary files a/graphics/event_objects/pics/people/rooftop_sale_woman/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/rooftop_sale_woman/1.png b/graphics/event_objects/pics/people/rooftop_sale_woman/1.png
deleted file mode 100644
index 8550799884..0000000000
Binary files a/graphics/event_objects/pics/people/rooftop_sale_woman/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/rooftop_sale_woman/2.png b/graphics/event_objects/pics/people/rooftop_sale_woman/2.png
deleted file mode 100644
index 643eb4eb23..0000000000
Binary files a/graphics/event_objects/pics/people/rooftop_sale_woman/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/rooftop_sale_woman/3.png b/graphics/event_objects/pics/people/rooftop_sale_woman/3.png
deleted file mode 100644
index dbea9b53c0..0000000000
Binary files a/graphics/event_objects/pics/people/rooftop_sale_woman/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/rooftop_sale_woman/4.png b/graphics/event_objects/pics/people/rooftop_sale_woman/4.png
deleted file mode 100644
index d6bbc98b8d..0000000000
Binary files a/graphics/event_objects/pics/people/rooftop_sale_woman/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/rooftop_sale_woman/5.png b/graphics/event_objects/pics/people/rooftop_sale_woman/5.png
deleted file mode 100644
index bd99cf10fb..0000000000
Binary files a/graphics/event_objects/pics/people/rooftop_sale_woman/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/rooftop_sale_woman/6.png b/graphics/event_objects/pics/people/rooftop_sale_woman/6.png
deleted file mode 100644
index c5c4479977..0000000000
Binary files a/graphics/event_objects/pics/people/rooftop_sale_woman/6.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/rooftop_sale_woman/7.png b/graphics/event_objects/pics/people/rooftop_sale_woman/7.png
deleted file mode 100644
index 64b7691c4d..0000000000
Binary files a/graphics/event_objects/pics/people/rooftop_sale_woman/7.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/rooftop_sale_woman/8.png b/graphics/event_objects/pics/people/rooftop_sale_woman/8.png
deleted file mode 100644
index b588d2b26a..0000000000
Binary files a/graphics/event_objects/pics/people/rooftop_sale_woman/8.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/roxanne/0.png b/graphics/event_objects/pics/people/roxanne/0.png
deleted file mode 100644
index 0a73a07233..0000000000
Binary files a/graphics/event_objects/pics/people/roxanne/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/roxanne/1.png b/graphics/event_objects/pics/people/roxanne/1.png
deleted file mode 100644
index 133f097bff..0000000000
Binary files a/graphics/event_objects/pics/people/roxanne/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/roxanne/2.png b/graphics/event_objects/pics/people/roxanne/2.png
deleted file mode 100644
index 946765eb22..0000000000
Binary files a/graphics/event_objects/pics/people/roxanne/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/rs_little_boy.png b/graphics/event_objects/pics/people/rs_little_boy.png
new file mode 100644
index 0000000000..6e8b4bdaba
Binary files /dev/null and b/graphics/event_objects/pics/people/rs_little_boy.png differ
diff --git a/graphics/event_objects/pics/people/ruby_sapphire_brendan/00.png b/graphics/event_objects/pics/people/ruby_sapphire_brendan/00.png
deleted file mode 100644
index 780360c4f1..0000000000
Binary files a/graphics/event_objects/pics/people/ruby_sapphire_brendan/00.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/ruby_sapphire_brendan/01.png b/graphics/event_objects/pics/people/ruby_sapphire_brendan/01.png
deleted file mode 100644
index f83064047f..0000000000
Binary files a/graphics/event_objects/pics/people/ruby_sapphire_brendan/01.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/ruby_sapphire_brendan/02.png b/graphics/event_objects/pics/people/ruby_sapphire_brendan/02.png
deleted file mode 100644
index ffb8ad34b1..0000000000
Binary files a/graphics/event_objects/pics/people/ruby_sapphire_brendan/02.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/ruby_sapphire_brendan/03.png b/graphics/event_objects/pics/people/ruby_sapphire_brendan/03.png
deleted file mode 100644
index d0721bbb40..0000000000
Binary files a/graphics/event_objects/pics/people/ruby_sapphire_brendan/03.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/ruby_sapphire_brendan/04.png b/graphics/event_objects/pics/people/ruby_sapphire_brendan/04.png
deleted file mode 100644
index 07817e55f4..0000000000
Binary files a/graphics/event_objects/pics/people/ruby_sapphire_brendan/04.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/ruby_sapphire_brendan/05.png b/graphics/event_objects/pics/people/ruby_sapphire_brendan/05.png
deleted file mode 100644
index afc322129d..0000000000
Binary files a/graphics/event_objects/pics/people/ruby_sapphire_brendan/05.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/ruby_sapphire_brendan/06.png b/graphics/event_objects/pics/people/ruby_sapphire_brendan/06.png
deleted file mode 100644
index 84a8cceb17..0000000000
Binary files a/graphics/event_objects/pics/people/ruby_sapphire_brendan/06.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/ruby_sapphire_brendan/07.png b/graphics/event_objects/pics/people/ruby_sapphire_brendan/07.png
deleted file mode 100644
index ca518d8a06..0000000000
Binary files a/graphics/event_objects/pics/people/ruby_sapphire_brendan/07.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/ruby_sapphire_brendan/08.png b/graphics/event_objects/pics/people/ruby_sapphire_brendan/08.png
deleted file mode 100644
index 3430ff2431..0000000000
Binary files a/graphics/event_objects/pics/people/ruby_sapphire_brendan/08.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/ruby_sapphire_brendan/09.png b/graphics/event_objects/pics/people/ruby_sapphire_brendan/09.png
deleted file mode 100644
index 392f019e76..0000000000
Binary files a/graphics/event_objects/pics/people/ruby_sapphire_brendan/09.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/ruby_sapphire_brendan/10.png b/graphics/event_objects/pics/people/ruby_sapphire_brendan/10.png
deleted file mode 100644
index 722f2d04d1..0000000000
Binary files a/graphics/event_objects/pics/people/ruby_sapphire_brendan/10.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/ruby_sapphire_brendan/11.png b/graphics/event_objects/pics/people/ruby_sapphire_brendan/11.png
deleted file mode 100644
index eff0cbc5fe..0000000000
Binary files a/graphics/event_objects/pics/people/ruby_sapphire_brendan/11.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/ruby_sapphire_brendan/12.png b/graphics/event_objects/pics/people/ruby_sapphire_brendan/12.png
deleted file mode 100644
index 0a5037d43f..0000000000
Binary files a/graphics/event_objects/pics/people/ruby_sapphire_brendan/12.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/ruby_sapphire_brendan/13.png b/graphics/event_objects/pics/people/ruby_sapphire_brendan/13.png
deleted file mode 100644
index 8dc245c0e5..0000000000
Binary files a/graphics/event_objects/pics/people/ruby_sapphire_brendan/13.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/ruby_sapphire_brendan/14.png b/graphics/event_objects/pics/people/ruby_sapphire_brendan/14.png
deleted file mode 100644
index 53844c0c14..0000000000
Binary files a/graphics/event_objects/pics/people/ruby_sapphire_brendan/14.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/ruby_sapphire_brendan/15.png b/graphics/event_objects/pics/people/ruby_sapphire_brendan/15.png
deleted file mode 100644
index 34d73e7f60..0000000000
Binary files a/graphics/event_objects/pics/people/ruby_sapphire_brendan/15.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/ruby_sapphire_brendan/16.png b/graphics/event_objects/pics/people/ruby_sapphire_brendan/16.png
deleted file mode 100644
index b324f55380..0000000000
Binary files a/graphics/event_objects/pics/people/ruby_sapphire_brendan/16.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/ruby_sapphire_brendan/17.png b/graphics/event_objects/pics/people/ruby_sapphire_brendan/17.png
deleted file mode 100644
index 9a736dc02a..0000000000
Binary files a/graphics/event_objects/pics/people/ruby_sapphire_brendan/17.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/ruby_sapphire_brendan/running.png b/graphics/event_objects/pics/people/ruby_sapphire_brendan/running.png
new file mode 100644
index 0000000000..d7a1c22242
Binary files /dev/null and b/graphics/event_objects/pics/people/ruby_sapphire_brendan/running.png differ
diff --git a/graphics/event_objects/pics/people/ruby_sapphire_brendan/walking.png b/graphics/event_objects/pics/people/ruby_sapphire_brendan/walking.png
new file mode 100644
index 0000000000..833e635d52
Binary files /dev/null and b/graphics/event_objects/pics/people/ruby_sapphire_brendan/walking.png differ
diff --git a/graphics/event_objects/pics/people/ruby_sapphire_little_boy/0.png b/graphics/event_objects/pics/people/ruby_sapphire_little_boy/0.png
deleted file mode 100644
index fb4365f0ef..0000000000
Binary files a/graphics/event_objects/pics/people/ruby_sapphire_little_boy/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/ruby_sapphire_little_boy/1.png b/graphics/event_objects/pics/people/ruby_sapphire_little_boy/1.png
deleted file mode 100644
index f681154dd0..0000000000
Binary files a/graphics/event_objects/pics/people/ruby_sapphire_little_boy/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/ruby_sapphire_little_boy/2.png b/graphics/event_objects/pics/people/ruby_sapphire_little_boy/2.png
deleted file mode 100644
index 20f838bb25..0000000000
Binary files a/graphics/event_objects/pics/people/ruby_sapphire_little_boy/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/ruby_sapphire_little_boy/3.png b/graphics/event_objects/pics/people/ruby_sapphire_little_boy/3.png
deleted file mode 100644
index 4a83b0c977..0000000000
Binary files a/graphics/event_objects/pics/people/ruby_sapphire_little_boy/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/ruby_sapphire_little_boy/4.png b/graphics/event_objects/pics/people/ruby_sapphire_little_boy/4.png
deleted file mode 100644
index b6573d454b..0000000000
Binary files a/graphics/event_objects/pics/people/ruby_sapphire_little_boy/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/ruby_sapphire_little_boy/5.png b/graphics/event_objects/pics/people/ruby_sapphire_little_boy/5.png
deleted file mode 100644
index a1a9b08cfd..0000000000
Binary files a/graphics/event_objects/pics/people/ruby_sapphire_little_boy/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/ruby_sapphire_little_boy/6.png b/graphics/event_objects/pics/people/ruby_sapphire_little_boy/6.png
deleted file mode 100644
index 8f34c74e47..0000000000
Binary files a/graphics/event_objects/pics/people/ruby_sapphire_little_boy/6.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/ruby_sapphire_little_boy/7.png b/graphics/event_objects/pics/people/ruby_sapphire_little_boy/7.png
deleted file mode 100644
index 7d8d2c23c5..0000000000
Binary files a/graphics/event_objects/pics/people/ruby_sapphire_little_boy/7.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/ruby_sapphire_little_boy/8.png b/graphics/event_objects/pics/people/ruby_sapphire_little_boy/8.png
deleted file mode 100644
index 4799db90c0..0000000000
Binary files a/graphics/event_objects/pics/people/ruby_sapphire_little_boy/8.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/ruby_sapphire_may/00.png b/graphics/event_objects/pics/people/ruby_sapphire_may/00.png
deleted file mode 100644
index 2ccd3399ae..0000000000
Binary files a/graphics/event_objects/pics/people/ruby_sapphire_may/00.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/ruby_sapphire_may/01.png b/graphics/event_objects/pics/people/ruby_sapphire_may/01.png
deleted file mode 100644
index 94aad9ac76..0000000000
Binary files a/graphics/event_objects/pics/people/ruby_sapphire_may/01.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/ruby_sapphire_may/02.png b/graphics/event_objects/pics/people/ruby_sapphire_may/02.png
deleted file mode 100644
index e61943fbb5..0000000000
Binary files a/graphics/event_objects/pics/people/ruby_sapphire_may/02.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/ruby_sapphire_may/03.png b/graphics/event_objects/pics/people/ruby_sapphire_may/03.png
deleted file mode 100644
index b8d1255d57..0000000000
Binary files a/graphics/event_objects/pics/people/ruby_sapphire_may/03.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/ruby_sapphire_may/04.png b/graphics/event_objects/pics/people/ruby_sapphire_may/04.png
deleted file mode 100644
index 7d3cac7653..0000000000
Binary files a/graphics/event_objects/pics/people/ruby_sapphire_may/04.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/ruby_sapphire_may/05.png b/graphics/event_objects/pics/people/ruby_sapphire_may/05.png
deleted file mode 100644
index d5a4ab94e8..0000000000
Binary files a/graphics/event_objects/pics/people/ruby_sapphire_may/05.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/ruby_sapphire_may/06.png b/graphics/event_objects/pics/people/ruby_sapphire_may/06.png
deleted file mode 100644
index d22684057f..0000000000
Binary files a/graphics/event_objects/pics/people/ruby_sapphire_may/06.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/ruby_sapphire_may/07.png b/graphics/event_objects/pics/people/ruby_sapphire_may/07.png
deleted file mode 100644
index d0f0c3716f..0000000000
Binary files a/graphics/event_objects/pics/people/ruby_sapphire_may/07.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/ruby_sapphire_may/08.png b/graphics/event_objects/pics/people/ruby_sapphire_may/08.png
deleted file mode 100644
index dbb26c4e71..0000000000
Binary files a/graphics/event_objects/pics/people/ruby_sapphire_may/08.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/ruby_sapphire_may/09.png b/graphics/event_objects/pics/people/ruby_sapphire_may/09.png
deleted file mode 100644
index 7143164859..0000000000
Binary files a/graphics/event_objects/pics/people/ruby_sapphire_may/09.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/ruby_sapphire_may/10.png b/graphics/event_objects/pics/people/ruby_sapphire_may/10.png
deleted file mode 100644
index 07897594f8..0000000000
Binary files a/graphics/event_objects/pics/people/ruby_sapphire_may/10.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/ruby_sapphire_may/11.png b/graphics/event_objects/pics/people/ruby_sapphire_may/11.png
deleted file mode 100644
index e4583aa918..0000000000
Binary files a/graphics/event_objects/pics/people/ruby_sapphire_may/11.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/ruby_sapphire_may/12.png b/graphics/event_objects/pics/people/ruby_sapphire_may/12.png
deleted file mode 100644
index 34405b8372..0000000000
Binary files a/graphics/event_objects/pics/people/ruby_sapphire_may/12.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/ruby_sapphire_may/13.png b/graphics/event_objects/pics/people/ruby_sapphire_may/13.png
deleted file mode 100644
index 3b0ec86b35..0000000000
Binary files a/graphics/event_objects/pics/people/ruby_sapphire_may/13.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/ruby_sapphire_may/14.png b/graphics/event_objects/pics/people/ruby_sapphire_may/14.png
deleted file mode 100644
index 18ee35cb93..0000000000
Binary files a/graphics/event_objects/pics/people/ruby_sapphire_may/14.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/ruby_sapphire_may/15.png b/graphics/event_objects/pics/people/ruby_sapphire_may/15.png
deleted file mode 100644
index ea5e0fd5f6..0000000000
Binary files a/graphics/event_objects/pics/people/ruby_sapphire_may/15.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/ruby_sapphire_may/16.png b/graphics/event_objects/pics/people/ruby_sapphire_may/16.png
deleted file mode 100644
index c7e9dd58b0..0000000000
Binary files a/graphics/event_objects/pics/people/ruby_sapphire_may/16.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/ruby_sapphire_may/17.png b/graphics/event_objects/pics/people/ruby_sapphire_may/17.png
deleted file mode 100644
index e79de81522..0000000000
Binary files a/graphics/event_objects/pics/people/ruby_sapphire_may/17.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/ruby_sapphire_may/running.png b/graphics/event_objects/pics/people/ruby_sapphire_may/running.png
new file mode 100644
index 0000000000..dbde4aa307
Binary files /dev/null and b/graphics/event_objects/pics/people/ruby_sapphire_may/running.png differ
diff --git a/graphics/event_objects/pics/people/ruby_sapphire_may/walking.png b/graphics/event_objects/pics/people/ruby_sapphire_may/walking.png
new file mode 100644
index 0000000000..c48b04cb20
Binary files /dev/null and b/graphics/event_objects/pics/people/ruby_sapphire_may/walking.png differ
diff --git a/graphics/event_objects/pics/people/running_triathlete_f.png b/graphics/event_objects/pics/people/running_triathlete_f.png
new file mode 100644
index 0000000000..85494110d7
Binary files /dev/null and b/graphics/event_objects/pics/people/running_triathlete_f.png differ
diff --git a/graphics/event_objects/pics/people/running_triathlete_f/0.png b/graphics/event_objects/pics/people/running_triathlete_f/0.png
deleted file mode 100644
index 195edef7b9..0000000000
Binary files a/graphics/event_objects/pics/people/running_triathlete_f/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/running_triathlete_f/1.png b/graphics/event_objects/pics/people/running_triathlete_f/1.png
deleted file mode 100644
index 1a7069621d..0000000000
Binary files a/graphics/event_objects/pics/people/running_triathlete_f/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/running_triathlete_f/2.png b/graphics/event_objects/pics/people/running_triathlete_f/2.png
deleted file mode 100644
index aab9ca24bf..0000000000
Binary files a/graphics/event_objects/pics/people/running_triathlete_f/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/running_triathlete_f/3.png b/graphics/event_objects/pics/people/running_triathlete_f/3.png
deleted file mode 100644
index 909fc0f609..0000000000
Binary files a/graphics/event_objects/pics/people/running_triathlete_f/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/running_triathlete_f/4.png b/graphics/event_objects/pics/people/running_triathlete_f/4.png
deleted file mode 100644
index 301d13d092..0000000000
Binary files a/graphics/event_objects/pics/people/running_triathlete_f/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/running_triathlete_f/5.png b/graphics/event_objects/pics/people/running_triathlete_f/5.png
deleted file mode 100644
index 84914d6191..0000000000
Binary files a/graphics/event_objects/pics/people/running_triathlete_f/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/running_triathlete_f/6.png b/graphics/event_objects/pics/people/running_triathlete_f/6.png
deleted file mode 100644
index 9ee690631c..0000000000
Binary files a/graphics/event_objects/pics/people/running_triathlete_f/6.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/running_triathlete_f/7.png b/graphics/event_objects/pics/people/running_triathlete_f/7.png
deleted file mode 100644
index 2441def637..0000000000
Binary files a/graphics/event_objects/pics/people/running_triathlete_f/7.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/running_triathlete_f/8.png b/graphics/event_objects/pics/people/running_triathlete_f/8.png
deleted file mode 100644
index a96d1e221b..0000000000
Binary files a/graphics/event_objects/pics/people/running_triathlete_f/8.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/running_triathlete_m.png b/graphics/event_objects/pics/people/running_triathlete_m.png
new file mode 100644
index 0000000000..97e5d0e85e
Binary files /dev/null and b/graphics/event_objects/pics/people/running_triathlete_m.png differ
diff --git a/graphics/event_objects/pics/people/running_triathlete_m/0.png b/graphics/event_objects/pics/people/running_triathlete_m/0.png
deleted file mode 100644
index 0d02be87e3..0000000000
Binary files a/graphics/event_objects/pics/people/running_triathlete_m/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/running_triathlete_m/1.png b/graphics/event_objects/pics/people/running_triathlete_m/1.png
deleted file mode 100644
index 21e2fdf110..0000000000
Binary files a/graphics/event_objects/pics/people/running_triathlete_m/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/running_triathlete_m/2.png b/graphics/event_objects/pics/people/running_triathlete_m/2.png
deleted file mode 100644
index d571938e3c..0000000000
Binary files a/graphics/event_objects/pics/people/running_triathlete_m/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/running_triathlete_m/3.png b/graphics/event_objects/pics/people/running_triathlete_m/3.png
deleted file mode 100644
index f60cc6b5b7..0000000000
Binary files a/graphics/event_objects/pics/people/running_triathlete_m/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/running_triathlete_m/4.png b/graphics/event_objects/pics/people/running_triathlete_m/4.png
deleted file mode 100644
index 6ec60997a0..0000000000
Binary files a/graphics/event_objects/pics/people/running_triathlete_m/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/running_triathlete_m/5.png b/graphics/event_objects/pics/people/running_triathlete_m/5.png
deleted file mode 100644
index 4f5742f1aa..0000000000
Binary files a/graphics/event_objects/pics/people/running_triathlete_m/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/running_triathlete_m/6.png b/graphics/event_objects/pics/people/running_triathlete_m/6.png
deleted file mode 100644
index be048ac7ea..0000000000
Binary files a/graphics/event_objects/pics/people/running_triathlete_m/6.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/running_triathlete_m/7.png b/graphics/event_objects/pics/people/running_triathlete_m/7.png
deleted file mode 100644
index 9a972be671..0000000000
Binary files a/graphics/event_objects/pics/people/running_triathlete_m/7.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/running_triathlete_m/8.png b/graphics/event_objects/pics/people/running_triathlete_m/8.png
deleted file mode 100644
index 18ea0d178d..0000000000
Binary files a/graphics/event_objects/pics/people/running_triathlete_m/8.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/sailor.png b/graphics/event_objects/pics/people/sailor.png
new file mode 100644
index 0000000000..b84eac22cc
Binary files /dev/null and b/graphics/event_objects/pics/people/sailor.png differ
diff --git a/graphics/event_objects/pics/people/sailor/0.png b/graphics/event_objects/pics/people/sailor/0.png
deleted file mode 100644
index 8dc44669a3..0000000000
Binary files a/graphics/event_objects/pics/people/sailor/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/sailor/1.png b/graphics/event_objects/pics/people/sailor/1.png
deleted file mode 100644
index 8cb9ba6202..0000000000
Binary files a/graphics/event_objects/pics/people/sailor/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/sailor/2.png b/graphics/event_objects/pics/people/sailor/2.png
deleted file mode 100644
index 34a832cbfb..0000000000
Binary files a/graphics/event_objects/pics/people/sailor/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/sailor/3.png b/graphics/event_objects/pics/people/sailor/3.png
deleted file mode 100644
index 1ad0918a8f..0000000000
Binary files a/graphics/event_objects/pics/people/sailor/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/sailor/4.png b/graphics/event_objects/pics/people/sailor/4.png
deleted file mode 100644
index 623c422112..0000000000
Binary files a/graphics/event_objects/pics/people/sailor/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/sailor/5.png b/graphics/event_objects/pics/people/sailor/5.png
deleted file mode 100644
index 01795d75f2..0000000000
Binary files a/graphics/event_objects/pics/people/sailor/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/sailor/6.png b/graphics/event_objects/pics/people/sailor/6.png
deleted file mode 100644
index a3babaa426..0000000000
Binary files a/graphics/event_objects/pics/people/sailor/6.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/sailor/7.png b/graphics/event_objects/pics/people/sailor/7.png
deleted file mode 100644
index 08abf8a71a..0000000000
Binary files a/graphics/event_objects/pics/people/sailor/7.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/sailor/8.png b/graphics/event_objects/pics/people/sailor/8.png
deleted file mode 100644
index f7d2ec6556..0000000000
Binary files a/graphics/event_objects/pics/people/sailor/8.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/school_kid_m.png b/graphics/event_objects/pics/people/school_kid_m.png
new file mode 100644
index 0000000000..e9e8e48899
Binary files /dev/null and b/graphics/event_objects/pics/people/school_kid_m.png differ
diff --git a/graphics/event_objects/pics/people/school_kid_m/0.png b/graphics/event_objects/pics/people/school_kid_m/0.png
deleted file mode 100644
index 3f700ffaf2..0000000000
Binary files a/graphics/event_objects/pics/people/school_kid_m/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/school_kid_m/1.png b/graphics/event_objects/pics/people/school_kid_m/1.png
deleted file mode 100644
index c47d69d34a..0000000000
Binary files a/graphics/event_objects/pics/people/school_kid_m/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/school_kid_m/2.png b/graphics/event_objects/pics/people/school_kid_m/2.png
deleted file mode 100644
index b4116862b5..0000000000
Binary files a/graphics/event_objects/pics/people/school_kid_m/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/school_kid_m/3.png b/graphics/event_objects/pics/people/school_kid_m/3.png
deleted file mode 100644
index 078ce5bc4d..0000000000
Binary files a/graphics/event_objects/pics/people/school_kid_m/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/school_kid_m/4.png b/graphics/event_objects/pics/people/school_kid_m/4.png
deleted file mode 100644
index 3309791287..0000000000
Binary files a/graphics/event_objects/pics/people/school_kid_m/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/school_kid_m/5.png b/graphics/event_objects/pics/people/school_kid_m/5.png
deleted file mode 100644
index 44ab9e8aa1..0000000000
Binary files a/graphics/event_objects/pics/people/school_kid_m/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/school_kid_m/6.png b/graphics/event_objects/pics/people/school_kid_m/6.png
deleted file mode 100644
index ba20fc1138..0000000000
Binary files a/graphics/event_objects/pics/people/school_kid_m/6.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/school_kid_m/7.png b/graphics/event_objects/pics/people/school_kid_m/7.png
deleted file mode 100644
index c4a5444e0c..0000000000
Binary files a/graphics/event_objects/pics/people/school_kid_m/7.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/school_kid_m/8.png b/graphics/event_objects/pics/people/school_kid_m/8.png
deleted file mode 100644
index 047b340fba..0000000000
Binary files a/graphics/event_objects/pics/people/school_kid_m/8.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/scientist_1.png b/graphics/event_objects/pics/people/scientist_1.png
new file mode 100644
index 0000000000..f6e79660c7
Binary files /dev/null and b/graphics/event_objects/pics/people/scientist_1.png differ
diff --git a/graphics/event_objects/pics/people/scientist_1/0.png b/graphics/event_objects/pics/people/scientist_1/0.png
deleted file mode 100644
index ef85b59859..0000000000
Binary files a/graphics/event_objects/pics/people/scientist_1/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/scientist_1/1.png b/graphics/event_objects/pics/people/scientist_1/1.png
deleted file mode 100644
index 2a2ade3709..0000000000
Binary files a/graphics/event_objects/pics/people/scientist_1/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/scientist_1/2.png b/graphics/event_objects/pics/people/scientist_1/2.png
deleted file mode 100644
index 6d3e31618f..0000000000
Binary files a/graphics/event_objects/pics/people/scientist_1/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/scientist_1/3.png b/graphics/event_objects/pics/people/scientist_1/3.png
deleted file mode 100644
index 433dd879d3..0000000000
Binary files a/graphics/event_objects/pics/people/scientist_1/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/scientist_1/4.png b/graphics/event_objects/pics/people/scientist_1/4.png
deleted file mode 100644
index 3c0594e4f7..0000000000
Binary files a/graphics/event_objects/pics/people/scientist_1/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/scientist_1/5.png b/graphics/event_objects/pics/people/scientist_1/5.png
deleted file mode 100644
index 12fdc5c845..0000000000
Binary files a/graphics/event_objects/pics/people/scientist_1/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/scientist_1/6.png b/graphics/event_objects/pics/people/scientist_1/6.png
deleted file mode 100644
index 6ea4c55774..0000000000
Binary files a/graphics/event_objects/pics/people/scientist_1/6.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/scientist_1/7.png b/graphics/event_objects/pics/people/scientist_1/7.png
deleted file mode 100644
index 7496fcc988..0000000000
Binary files a/graphics/event_objects/pics/people/scientist_1/7.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/scientist_1/8.png b/graphics/event_objects/pics/people/scientist_1/8.png
deleted file mode 100644
index 7487b1b460..0000000000
Binary files a/graphics/event_objects/pics/people/scientist_1/8.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/scientist_2.png b/graphics/event_objects/pics/people/scientist_2.png
new file mode 100644
index 0000000000..20ce638f6e
Binary files /dev/null and b/graphics/event_objects/pics/people/scientist_2.png differ
diff --git a/graphics/event_objects/pics/people/scientist_2/0.png b/graphics/event_objects/pics/people/scientist_2/0.png
deleted file mode 100644
index 0a2f65a81e..0000000000
Binary files a/graphics/event_objects/pics/people/scientist_2/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/scientist_2/1.png b/graphics/event_objects/pics/people/scientist_2/1.png
deleted file mode 100644
index c7ef46ca11..0000000000
Binary files a/graphics/event_objects/pics/people/scientist_2/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/scientist_2/2.png b/graphics/event_objects/pics/people/scientist_2/2.png
deleted file mode 100644
index 3e8d2f530c..0000000000
Binary files a/graphics/event_objects/pics/people/scientist_2/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/scientist_2/3.png b/graphics/event_objects/pics/people/scientist_2/3.png
deleted file mode 100644
index 9c3f70989b..0000000000
Binary files a/graphics/event_objects/pics/people/scientist_2/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/scientist_2/4.png b/graphics/event_objects/pics/people/scientist_2/4.png
deleted file mode 100644
index 28ac9b4cb5..0000000000
Binary files a/graphics/event_objects/pics/people/scientist_2/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/scientist_2/5.png b/graphics/event_objects/pics/people/scientist_2/5.png
deleted file mode 100644
index 836241dc96..0000000000
Binary files a/graphics/event_objects/pics/people/scientist_2/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/scientist_2/6.png b/graphics/event_objects/pics/people/scientist_2/6.png
deleted file mode 100644
index 894ba989e9..0000000000
Binary files a/graphics/event_objects/pics/people/scientist_2/6.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/scientist_2/7.png b/graphics/event_objects/pics/people/scientist_2/7.png
deleted file mode 100644
index b3176d10ef..0000000000
Binary files a/graphics/event_objects/pics/people/scientist_2/7.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/scientist_2/8.png b/graphics/event_objects/pics/people/scientist_2/8.png
deleted file mode 100644
index 4666c2f9a9..0000000000
Binary files a/graphics/event_objects/pics/people/scientist_2/8.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/scott.png b/graphics/event_objects/pics/people/scott.png
new file mode 100644
index 0000000000..41c7100c49
Binary files /dev/null and b/graphics/event_objects/pics/people/scott.png differ
diff --git a/graphics/event_objects/pics/people/scott/0.png b/graphics/event_objects/pics/people/scott/0.png
deleted file mode 100644
index 44a9f0dc2c..0000000000
Binary files a/graphics/event_objects/pics/people/scott/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/scott/1.png b/graphics/event_objects/pics/people/scott/1.png
deleted file mode 100644
index 63510a3137..0000000000
Binary files a/graphics/event_objects/pics/people/scott/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/scott/2.png b/graphics/event_objects/pics/people/scott/2.png
deleted file mode 100644
index ef11e8e1fd..0000000000
Binary files a/graphics/event_objects/pics/people/scott/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/scott/3.png b/graphics/event_objects/pics/people/scott/3.png
deleted file mode 100644
index 8e087335f7..0000000000
Binary files a/graphics/event_objects/pics/people/scott/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/scott/4.png b/graphics/event_objects/pics/people/scott/4.png
deleted file mode 100644
index 1ab051fc0f..0000000000
Binary files a/graphics/event_objects/pics/people/scott/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/scott/5.png b/graphics/event_objects/pics/people/scott/5.png
deleted file mode 100644
index 167ada21dc..0000000000
Binary files a/graphics/event_objects/pics/people/scott/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/scott/6.png b/graphics/event_objects/pics/people/scott/6.png
deleted file mode 100644
index e3c489f994..0000000000
Binary files a/graphics/event_objects/pics/people/scott/6.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/scott/7.png b/graphics/event_objects/pics/people/scott/7.png
deleted file mode 100644
index 3d2b77b1b8..0000000000
Binary files a/graphics/event_objects/pics/people/scott/7.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/scott/8.png b/graphics/event_objects/pics/people/scott/8.png
deleted file mode 100644
index 5ac07720c2..0000000000
Binary files a/graphics/event_objects/pics/people/scott/8.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/sidney/0.png b/graphics/event_objects/pics/people/sidney/0.png
deleted file mode 100644
index abbbcd3fbf..0000000000
Binary files a/graphics/event_objects/pics/people/sidney/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/sidney/1.png b/graphics/event_objects/pics/people/sidney/1.png
deleted file mode 100644
index e13e8ef327..0000000000
Binary files a/graphics/event_objects/pics/people/sidney/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/sidney/2.png b/graphics/event_objects/pics/people/sidney/2.png
deleted file mode 100644
index 8c6d514344..0000000000
Binary files a/graphics/event_objects/pics/people/sidney/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/spenser/0.png b/graphics/event_objects/pics/people/spenser/0.png
deleted file mode 100644
index 526e77c75b..0000000000
Binary files a/graphics/event_objects/pics/people/spenser/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/spenser/1.png b/graphics/event_objects/pics/people/spenser/1.png
deleted file mode 100644
index 1009f4344e..0000000000
Binary files a/graphics/event_objects/pics/people/spenser/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/spenser/2.png b/graphics/event_objects/pics/people/spenser/2.png
deleted file mode 100644
index 2b6eb8fa94..0000000000
Binary files a/graphics/event_objects/pics/people/spenser/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/spenser/3.png b/graphics/event_objects/pics/people/spenser/3.png
deleted file mode 100644
index 5fbc2044de..0000000000
Binary files a/graphics/event_objects/pics/people/spenser/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/spenser/4.png b/graphics/event_objects/pics/people/spenser/4.png
deleted file mode 100644
index 64a194e363..0000000000
Binary files a/graphics/event_objects/pics/people/spenser/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/spenser/5.png b/graphics/event_objects/pics/people/spenser/5.png
deleted file mode 100644
index 4e024fac09..0000000000
Binary files a/graphics/event_objects/pics/people/spenser/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/spenser/6.png b/graphics/event_objects/pics/people/spenser/6.png
deleted file mode 100644
index 2f6fefd88b..0000000000
Binary files a/graphics/event_objects/pics/people/spenser/6.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/spenser/7.png b/graphics/event_objects/pics/people/spenser/7.png
deleted file mode 100644
index 23be07f56f..0000000000
Binary files a/graphics/event_objects/pics/people/spenser/7.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/spenser/8.png b/graphics/event_objects/pics/people/spenser/8.png
deleted file mode 100644
index 71fff631bc..0000000000
Binary files a/graphics/event_objects/pics/people/spenser/8.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/steven.png b/graphics/event_objects/pics/people/steven.png
new file mode 100644
index 0000000000..ab113d3506
Binary files /dev/null and b/graphics/event_objects/pics/people/steven.png differ
diff --git a/graphics/event_objects/pics/people/steven/0.png b/graphics/event_objects/pics/people/steven/0.png
deleted file mode 100644
index 35cc4d404f..0000000000
Binary files a/graphics/event_objects/pics/people/steven/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/steven/1.png b/graphics/event_objects/pics/people/steven/1.png
deleted file mode 100644
index 37a8367ea1..0000000000
Binary files a/graphics/event_objects/pics/people/steven/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/steven/2.png b/graphics/event_objects/pics/people/steven/2.png
deleted file mode 100644
index 4d04475298..0000000000
Binary files a/graphics/event_objects/pics/people/steven/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/steven/3.png b/graphics/event_objects/pics/people/steven/3.png
deleted file mode 100644
index b2094c8b6e..0000000000
Binary files a/graphics/event_objects/pics/people/steven/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/steven/4.png b/graphics/event_objects/pics/people/steven/4.png
deleted file mode 100644
index d47448bc8c..0000000000
Binary files a/graphics/event_objects/pics/people/steven/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/steven/5.png b/graphics/event_objects/pics/people/steven/5.png
deleted file mode 100644
index e023078ee1..0000000000
Binary files a/graphics/event_objects/pics/people/steven/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/steven/6.png b/graphics/event_objects/pics/people/steven/6.png
deleted file mode 100644
index fb885a1bdc..0000000000
Binary files a/graphics/event_objects/pics/people/steven/6.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/steven/7.png b/graphics/event_objects/pics/people/steven/7.png
deleted file mode 100644
index ee2fbbb5f1..0000000000
Binary files a/graphics/event_objects/pics/people/steven/7.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/steven/8.png b/graphics/event_objects/pics/people/steven/8.png
deleted file mode 100644
index e140731cd0..0000000000
Binary files a/graphics/event_objects/pics/people/steven/8.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/swimmer_f.png b/graphics/event_objects/pics/people/swimmer_f.png
new file mode 100644
index 0000000000..d9fd2e39d0
Binary files /dev/null and b/graphics/event_objects/pics/people/swimmer_f.png differ
diff --git a/graphics/event_objects/pics/people/swimmer_f/0.png b/graphics/event_objects/pics/people/swimmer_f/0.png
deleted file mode 100644
index e34972cc7f..0000000000
Binary files a/graphics/event_objects/pics/people/swimmer_f/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/swimmer_f/1.png b/graphics/event_objects/pics/people/swimmer_f/1.png
deleted file mode 100644
index 64c3c79e53..0000000000
Binary files a/graphics/event_objects/pics/people/swimmer_f/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/swimmer_f/2.png b/graphics/event_objects/pics/people/swimmer_f/2.png
deleted file mode 100644
index cf4d17d5dd..0000000000
Binary files a/graphics/event_objects/pics/people/swimmer_f/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/swimmer_f/3.png b/graphics/event_objects/pics/people/swimmer_f/3.png
deleted file mode 100644
index e8edbc9a64..0000000000
Binary files a/graphics/event_objects/pics/people/swimmer_f/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/swimmer_f/4.png b/graphics/event_objects/pics/people/swimmer_f/4.png
deleted file mode 100644
index 1f5abf77eb..0000000000
Binary files a/graphics/event_objects/pics/people/swimmer_f/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/swimmer_f/5.png b/graphics/event_objects/pics/people/swimmer_f/5.png
deleted file mode 100644
index 5e19861cb7..0000000000
Binary files a/graphics/event_objects/pics/people/swimmer_f/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/swimmer_f/6.png b/graphics/event_objects/pics/people/swimmer_f/6.png
deleted file mode 100644
index c4b6023911..0000000000
Binary files a/graphics/event_objects/pics/people/swimmer_f/6.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/swimmer_f/7.png b/graphics/event_objects/pics/people/swimmer_f/7.png
deleted file mode 100644
index beb17704a3..0000000000
Binary files a/graphics/event_objects/pics/people/swimmer_f/7.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/swimmer_f/8.png b/graphics/event_objects/pics/people/swimmer_f/8.png
deleted file mode 100644
index db5588f7c1..0000000000
Binary files a/graphics/event_objects/pics/people/swimmer_f/8.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/swimmer_m.png b/graphics/event_objects/pics/people/swimmer_m.png
new file mode 100644
index 0000000000..25068830e1
Binary files /dev/null and b/graphics/event_objects/pics/people/swimmer_m.png differ
diff --git a/graphics/event_objects/pics/people/swimmer_m/0.png b/graphics/event_objects/pics/people/swimmer_m/0.png
deleted file mode 100644
index 51d63bb26c..0000000000
Binary files a/graphics/event_objects/pics/people/swimmer_m/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/swimmer_m/1.png b/graphics/event_objects/pics/people/swimmer_m/1.png
deleted file mode 100644
index d1f9765582..0000000000
Binary files a/graphics/event_objects/pics/people/swimmer_m/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/swimmer_m/2.png b/graphics/event_objects/pics/people/swimmer_m/2.png
deleted file mode 100644
index b4087efb5f..0000000000
Binary files a/graphics/event_objects/pics/people/swimmer_m/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/swimmer_m/3.png b/graphics/event_objects/pics/people/swimmer_m/3.png
deleted file mode 100644
index 4f445b8a86..0000000000
Binary files a/graphics/event_objects/pics/people/swimmer_m/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/swimmer_m/4.png b/graphics/event_objects/pics/people/swimmer_m/4.png
deleted file mode 100644
index 940e8cf5d6..0000000000
Binary files a/graphics/event_objects/pics/people/swimmer_m/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/swimmer_m/5.png b/graphics/event_objects/pics/people/swimmer_m/5.png
deleted file mode 100644
index d6be697b0e..0000000000
Binary files a/graphics/event_objects/pics/people/swimmer_m/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/swimmer_m/6.png b/graphics/event_objects/pics/people/swimmer_m/6.png
deleted file mode 100644
index cb2de823b8..0000000000
Binary files a/graphics/event_objects/pics/people/swimmer_m/6.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/swimmer_m/7.png b/graphics/event_objects/pics/people/swimmer_m/7.png
deleted file mode 100644
index b17892261f..0000000000
Binary files a/graphics/event_objects/pics/people/swimmer_m/7.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/swimmer_m/8.png b/graphics/event_objects/pics/people/swimmer_m/8.png
deleted file mode 100644
index 1f3fd48d00..0000000000
Binary files a/graphics/event_objects/pics/people/swimmer_m/8.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/tate/0.png b/graphics/event_objects/pics/people/tate/0.png
deleted file mode 100644
index f2481f1e2b..0000000000
Binary files a/graphics/event_objects/pics/people/tate/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/tate/1.png b/graphics/event_objects/pics/people/tate/1.png
deleted file mode 100644
index ff1608cf2c..0000000000
Binary files a/graphics/event_objects/pics/people/tate/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/tate/2.png b/graphics/event_objects/pics/people/tate/2.png
deleted file mode 100644
index 9fba8459da..0000000000
Binary files a/graphics/event_objects/pics/people/tate/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/teala.png b/graphics/event_objects/pics/people/teala.png
new file mode 100644
index 0000000000..f38bc479ec
Binary files /dev/null and b/graphics/event_objects/pics/people/teala.png differ
diff --git a/graphics/event_objects/pics/people/teala/0.png b/graphics/event_objects/pics/people/teala/0.png
deleted file mode 100644
index 1731523068..0000000000
Binary files a/graphics/event_objects/pics/people/teala/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/teala/1.png b/graphics/event_objects/pics/people/teala/1.png
deleted file mode 100644
index 2340f3262f..0000000000
Binary files a/graphics/event_objects/pics/people/teala/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/teala/2.png b/graphics/event_objects/pics/people/teala/2.png
deleted file mode 100644
index 1900d9e8d2..0000000000
Binary files a/graphics/event_objects/pics/people/teala/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/teala/3.png b/graphics/event_objects/pics/people/teala/3.png
deleted file mode 100644
index f3d46c9206..0000000000
Binary files a/graphics/event_objects/pics/people/teala/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/teala/4.png b/graphics/event_objects/pics/people/teala/4.png
deleted file mode 100644
index 5b70939b2e..0000000000
Binary files a/graphics/event_objects/pics/people/teala/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/teala/5.png b/graphics/event_objects/pics/people/teala/5.png
deleted file mode 100644
index fcba357927..0000000000
Binary files a/graphics/event_objects/pics/people/teala/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/teala/6.png b/graphics/event_objects/pics/people/teala/6.png
deleted file mode 100644
index 85a574bb88..0000000000
Binary files a/graphics/event_objects/pics/people/teala/6.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/teala/7.png b/graphics/event_objects/pics/people/teala/7.png
deleted file mode 100644
index 882d7adcae..0000000000
Binary files a/graphics/event_objects/pics/people/teala/7.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/teala/8.png b/graphics/event_objects/pics/people/teala/8.png
deleted file mode 100644
index 4366d38f95..0000000000
Binary files a/graphics/event_objects/pics/people/teala/8.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/team_aqua/aqua_member_f.png b/graphics/event_objects/pics/people/team_aqua/aqua_member_f.png
new file mode 100644
index 0000000000..0afbfb3008
Binary files /dev/null and b/graphics/event_objects/pics/people/team_aqua/aqua_member_f.png differ
diff --git a/graphics/event_objects/pics/people/team_aqua/aqua_member_m.png b/graphics/event_objects/pics/people/team_aqua/aqua_member_m.png
new file mode 100644
index 0000000000..eba838305f
Binary files /dev/null and b/graphics/event_objects/pics/people/team_aqua/aqua_member_m.png differ
diff --git a/graphics/event_objects/pics/people/team_aqua/archie.png b/graphics/event_objects/pics/people/team_aqua/archie.png
new file mode 100644
index 0000000000..2117d52ad2
Binary files /dev/null and b/graphics/event_objects/pics/people/team_aqua/archie.png differ
diff --git a/graphics/event_objects/pics/people/team_magma/magma_member_f.png b/graphics/event_objects/pics/people/team_magma/magma_member_f.png
new file mode 100644
index 0000000000..fe74beeec4
Binary files /dev/null and b/graphics/event_objects/pics/people/team_magma/magma_member_f.png differ
diff --git a/graphics/event_objects/pics/people/team_magma/magma_member_m.png b/graphics/event_objects/pics/people/team_magma/magma_member_m.png
new file mode 100644
index 0000000000..1a174b5a28
Binary files /dev/null and b/graphics/event_objects/pics/people/team_magma/magma_member_m.png differ
diff --git a/graphics/event_objects/pics/people/team_magma/maxie.png b/graphics/event_objects/pics/people/team_magma/maxie.png
new file mode 100644
index 0000000000..16b35d2fa2
Binary files /dev/null and b/graphics/event_objects/pics/people/team_magma/maxie.png differ
diff --git a/graphics/event_objects/pics/people/tuber_f.png b/graphics/event_objects/pics/people/tuber_f.png
new file mode 100644
index 0000000000..1fa7fa4217
Binary files /dev/null and b/graphics/event_objects/pics/people/tuber_f.png differ
diff --git a/graphics/event_objects/pics/people/tuber_f/0.png b/graphics/event_objects/pics/people/tuber_f/0.png
deleted file mode 100644
index 34081dbadf..0000000000
Binary files a/graphics/event_objects/pics/people/tuber_f/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/tuber_f/1.png b/graphics/event_objects/pics/people/tuber_f/1.png
deleted file mode 100644
index 5ad154c385..0000000000
Binary files a/graphics/event_objects/pics/people/tuber_f/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/tuber_f/2.png b/graphics/event_objects/pics/people/tuber_f/2.png
deleted file mode 100644
index d87de13071..0000000000
Binary files a/graphics/event_objects/pics/people/tuber_f/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/tuber_f/3.png b/graphics/event_objects/pics/people/tuber_f/3.png
deleted file mode 100644
index 17ffb88452..0000000000
Binary files a/graphics/event_objects/pics/people/tuber_f/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/tuber_f/4.png b/graphics/event_objects/pics/people/tuber_f/4.png
deleted file mode 100644
index 9de7aa0ab2..0000000000
Binary files a/graphics/event_objects/pics/people/tuber_f/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/tuber_f/5.png b/graphics/event_objects/pics/people/tuber_f/5.png
deleted file mode 100644
index 16bd9c6858..0000000000
Binary files a/graphics/event_objects/pics/people/tuber_f/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/tuber_f/6.png b/graphics/event_objects/pics/people/tuber_f/6.png
deleted file mode 100644
index e026ea45d1..0000000000
Binary files a/graphics/event_objects/pics/people/tuber_f/6.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/tuber_f/7.png b/graphics/event_objects/pics/people/tuber_f/7.png
deleted file mode 100644
index fbabc200d3..0000000000
Binary files a/graphics/event_objects/pics/people/tuber_f/7.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/tuber_f/8.png b/graphics/event_objects/pics/people/tuber_f/8.png
deleted file mode 100644
index ad08f016b5..0000000000
Binary files a/graphics/event_objects/pics/people/tuber_f/8.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/tuber_m.png b/graphics/event_objects/pics/people/tuber_m.png
new file mode 100644
index 0000000000..04a5b698ef
Binary files /dev/null and b/graphics/event_objects/pics/people/tuber_m.png differ
diff --git a/graphics/event_objects/pics/people/tuber_m/0.png b/graphics/event_objects/pics/people/tuber_m/0.png
deleted file mode 100644
index 3234397030..0000000000
Binary files a/graphics/event_objects/pics/people/tuber_m/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/tuber_m/1.png b/graphics/event_objects/pics/people/tuber_m/1.png
deleted file mode 100644
index dfce73bbcf..0000000000
Binary files a/graphics/event_objects/pics/people/tuber_m/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/tuber_m/2.png b/graphics/event_objects/pics/people/tuber_m/2.png
deleted file mode 100644
index 1b1de564f7..0000000000
Binary files a/graphics/event_objects/pics/people/tuber_m/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/tuber_m/3.png b/graphics/event_objects/pics/people/tuber_m/3.png
deleted file mode 100644
index 39f37a19b0..0000000000
Binary files a/graphics/event_objects/pics/people/tuber_m/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/tuber_m/4.png b/graphics/event_objects/pics/people/tuber_m/4.png
deleted file mode 100644
index 78fae11600..0000000000
Binary files a/graphics/event_objects/pics/people/tuber_m/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/tuber_m/5.png b/graphics/event_objects/pics/people/tuber_m/5.png
deleted file mode 100644
index 690add8ad0..0000000000
Binary files a/graphics/event_objects/pics/people/tuber_m/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/tuber_m/6.png b/graphics/event_objects/pics/people/tuber_m/6.png
deleted file mode 100644
index ff61406b9b..0000000000
Binary files a/graphics/event_objects/pics/people/tuber_m/6.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/tuber_m/7.png b/graphics/event_objects/pics/people/tuber_m/7.png
deleted file mode 100644
index d8c7b98cf7..0000000000
Binary files a/graphics/event_objects/pics/people/tuber_m/7.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/tuber_m/8.png b/graphics/event_objects/pics/people/tuber_m/8.png
deleted file mode 100644
index 4ec4b55996..0000000000
Binary files a/graphics/event_objects/pics/people/tuber_m/8.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/tuber_m_swimming.png b/graphics/event_objects/pics/people/tuber_m_swimming.png
new file mode 100644
index 0000000000..6cdeded89e
Binary files /dev/null and b/graphics/event_objects/pics/people/tuber_m_swimming.png differ
diff --git a/graphics/event_objects/pics/people/tuber_m_swimming/0.png b/graphics/event_objects/pics/people/tuber_m_swimming/0.png
deleted file mode 100644
index c6ba83d875..0000000000
Binary files a/graphics/event_objects/pics/people/tuber_m_swimming/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/tuber_m_swimming/1.png b/graphics/event_objects/pics/people/tuber_m_swimming/1.png
deleted file mode 100644
index 85eb426507..0000000000
Binary files a/graphics/event_objects/pics/people/tuber_m_swimming/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/tuber_m_swimming/2.png b/graphics/event_objects/pics/people/tuber_m_swimming/2.png
deleted file mode 100644
index 1cca717b01..0000000000
Binary files a/graphics/event_objects/pics/people/tuber_m_swimming/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/tuber_m_swimming/3.png b/graphics/event_objects/pics/people/tuber_m_swimming/3.png
deleted file mode 100644
index 253d75ed0e..0000000000
Binary files a/graphics/event_objects/pics/people/tuber_m_swimming/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/tuber_m_swimming/4.png b/graphics/event_objects/pics/people/tuber_m_swimming/4.png
deleted file mode 100644
index d64c9033f1..0000000000
Binary files a/graphics/event_objects/pics/people/tuber_m_swimming/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/tuber_m_swimming/5.png b/graphics/event_objects/pics/people/tuber_m_swimming/5.png
deleted file mode 100644
index 2a8e7d67de..0000000000
Binary files a/graphics/event_objects/pics/people/tuber_m_swimming/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/tuber_m_swimming/6.png b/graphics/event_objects/pics/people/tuber_m_swimming/6.png
deleted file mode 100644
index c55acdf291..0000000000
Binary files a/graphics/event_objects/pics/people/tuber_m_swimming/6.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/tuber_m_swimming/7.png b/graphics/event_objects/pics/people/tuber_m_swimming/7.png
deleted file mode 100644
index 7a203920fd..0000000000
Binary files a/graphics/event_objects/pics/people/tuber_m_swimming/7.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/tuber_m_swimming/8.png b/graphics/event_objects/pics/people/tuber_m_swimming/8.png
deleted file mode 100644
index 321f8acca3..0000000000
Binary files a/graphics/event_objects/pics/people/tuber_m_swimming/8.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/tucker/0.png b/graphics/event_objects/pics/people/tucker/0.png
deleted file mode 100644
index ec733c959a..0000000000
Binary files a/graphics/event_objects/pics/people/tucker/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/tucker/1.png b/graphics/event_objects/pics/people/tucker/1.png
deleted file mode 100644
index ad4af677cf..0000000000
Binary files a/graphics/event_objects/pics/people/tucker/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/tucker/2.png b/graphics/event_objects/pics/people/tucker/2.png
deleted file mode 100644
index 2496ded575..0000000000
Binary files a/graphics/event_objects/pics/people/tucker/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/tucker/3.png b/graphics/event_objects/pics/people/tucker/3.png
deleted file mode 100644
index 3f7b156f0d..0000000000
Binary files a/graphics/event_objects/pics/people/tucker/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/tucker/4.png b/graphics/event_objects/pics/people/tucker/4.png
deleted file mode 100644
index 4262e1be05..0000000000
Binary files a/graphics/event_objects/pics/people/tucker/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/tucker/5.png b/graphics/event_objects/pics/people/tucker/5.png
deleted file mode 100644
index 53304c2215..0000000000
Binary files a/graphics/event_objects/pics/people/tucker/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/tucker/6.png b/graphics/event_objects/pics/people/tucker/6.png
deleted file mode 100644
index 0bab43c109..0000000000
Binary files a/graphics/event_objects/pics/people/tucker/6.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/tucker/7.png b/graphics/event_objects/pics/people/tucker/7.png
deleted file mode 100644
index a98ef88190..0000000000
Binary files a/graphics/event_objects/pics/people/tucker/7.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/tucker/8.png b/graphics/event_objects/pics/people/tucker/8.png
deleted file mode 100644
index 7b6d30a228..0000000000
Binary files a/graphics/event_objects/pics/people/tucker/8.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/union_room_attendant.png b/graphics/event_objects/pics/people/union_room_attendant.png
new file mode 100644
index 0000000000..00c76cc7c9
Binary files /dev/null and b/graphics/event_objects/pics/people/union_room_attendant.png differ
diff --git a/graphics/event_objects/pics/people/union_room_attendant/0.png b/graphics/event_objects/pics/people/union_room_attendant/0.png
deleted file mode 100644
index cfccc0049a..0000000000
Binary files a/graphics/event_objects/pics/people/union_room_attendant/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/union_room_attendant/1.png b/graphics/event_objects/pics/people/union_room_attendant/1.png
deleted file mode 100644
index 6790d092e0..0000000000
Binary files a/graphics/event_objects/pics/people/union_room_attendant/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/union_room_attendant/2.png b/graphics/event_objects/pics/people/union_room_attendant/2.png
deleted file mode 100644
index 38fb1eb74a..0000000000
Binary files a/graphics/event_objects/pics/people/union_room_attendant/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/unused_woman.png b/graphics/event_objects/pics/people/unused_woman.png
new file mode 100644
index 0000000000..393d38ddc9
Binary files /dev/null and b/graphics/event_objects/pics/people/unused_woman.png differ
diff --git a/graphics/event_objects/pics/people/unused_woman/0.png b/graphics/event_objects/pics/people/unused_woman/0.png
deleted file mode 100644
index 01ba70b565..0000000000
Binary files a/graphics/event_objects/pics/people/unused_woman/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/unused_woman/1.png b/graphics/event_objects/pics/people/unused_woman/1.png
deleted file mode 100644
index 78534f0dc2..0000000000
Binary files a/graphics/event_objects/pics/people/unused_woman/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/unused_woman/2.png b/graphics/event_objects/pics/people/unused_woman/2.png
deleted file mode 100644
index b42a12532b..0000000000
Binary files a/graphics/event_objects/pics/people/unused_woman/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/unused_woman/3.png b/graphics/event_objects/pics/people/unused_woman/3.png
deleted file mode 100644
index c66653c173..0000000000
Binary files a/graphics/event_objects/pics/people/unused_woman/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/unused_woman/4.png b/graphics/event_objects/pics/people/unused_woman/4.png
deleted file mode 100644
index 75a457c2fd..0000000000
Binary files a/graphics/event_objects/pics/people/unused_woman/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/unused_woman/5.png b/graphics/event_objects/pics/people/unused_woman/5.png
deleted file mode 100644
index e27f0760f8..0000000000
Binary files a/graphics/event_objects/pics/people/unused_woman/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/unused_woman/6.png b/graphics/event_objects/pics/people/unused_woman/6.png
deleted file mode 100644
index 53102c01ee..0000000000
Binary files a/graphics/event_objects/pics/people/unused_woman/6.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/unused_woman/7.png b/graphics/event_objects/pics/people/unused_woman/7.png
deleted file mode 100644
index 3d2d436c2e..0000000000
Binary files a/graphics/event_objects/pics/people/unused_woman/7.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/unused_woman/8.png b/graphics/event_objects/pics/people/unused_woman/8.png
deleted file mode 100644
index 3773e7f48a..0000000000
Binary files a/graphics/event_objects/pics/people/unused_woman/8.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/wallace.png b/graphics/event_objects/pics/people/wallace.png
new file mode 100644
index 0000000000..aec7c5c06e
Binary files /dev/null and b/graphics/event_objects/pics/people/wallace.png differ
diff --git a/graphics/event_objects/pics/people/wallace/0.png b/graphics/event_objects/pics/people/wallace/0.png
deleted file mode 100644
index 349d650495..0000000000
Binary files a/graphics/event_objects/pics/people/wallace/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/wallace/1.png b/graphics/event_objects/pics/people/wallace/1.png
deleted file mode 100644
index 698b03fad9..0000000000
Binary files a/graphics/event_objects/pics/people/wallace/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/wallace/2.png b/graphics/event_objects/pics/people/wallace/2.png
deleted file mode 100644
index 576346bcb8..0000000000
Binary files a/graphics/event_objects/pics/people/wallace/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/wallace/3.png b/graphics/event_objects/pics/people/wallace/3.png
deleted file mode 100644
index 56773b97d8..0000000000
Binary files a/graphics/event_objects/pics/people/wallace/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/wallace/4.png b/graphics/event_objects/pics/people/wallace/4.png
deleted file mode 100644
index 6281a56eff..0000000000
Binary files a/graphics/event_objects/pics/people/wallace/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/wallace/5.png b/graphics/event_objects/pics/people/wallace/5.png
deleted file mode 100644
index 5f61598d9e..0000000000
Binary files a/graphics/event_objects/pics/people/wallace/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/wallace/6.png b/graphics/event_objects/pics/people/wallace/6.png
deleted file mode 100644
index 1abba4e1bf..0000000000
Binary files a/graphics/event_objects/pics/people/wallace/6.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/wallace/7.png b/graphics/event_objects/pics/people/wallace/7.png
deleted file mode 100644
index 477dd9e01e..0000000000
Binary files a/graphics/event_objects/pics/people/wallace/7.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/wallace/8.png b/graphics/event_objects/pics/people/wallace/8.png
deleted file mode 100644
index da5a51f763..0000000000
Binary files a/graphics/event_objects/pics/people/wallace/8.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/wally.png b/graphics/event_objects/pics/people/wally.png
new file mode 100644
index 0000000000..32276ad77c
Binary files /dev/null and b/graphics/event_objects/pics/people/wally.png differ
diff --git a/graphics/event_objects/pics/people/wally/0.png b/graphics/event_objects/pics/people/wally/0.png
deleted file mode 100644
index b185bc2942..0000000000
Binary files a/graphics/event_objects/pics/people/wally/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/wally/1.png b/graphics/event_objects/pics/people/wally/1.png
deleted file mode 100644
index 42f5a3f0a5..0000000000
Binary files a/graphics/event_objects/pics/people/wally/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/wally/2.png b/graphics/event_objects/pics/people/wally/2.png
deleted file mode 100644
index ed32f1f410..0000000000
Binary files a/graphics/event_objects/pics/people/wally/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/wally/3.png b/graphics/event_objects/pics/people/wally/3.png
deleted file mode 100644
index 5d2213b2c2..0000000000
Binary files a/graphics/event_objects/pics/people/wally/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/wally/4.png b/graphics/event_objects/pics/people/wally/4.png
deleted file mode 100644
index af996a72a8..0000000000
Binary files a/graphics/event_objects/pics/people/wally/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/wally/5.png b/graphics/event_objects/pics/people/wally/5.png
deleted file mode 100644
index de23077cee..0000000000
Binary files a/graphics/event_objects/pics/people/wally/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/wally/6.png b/graphics/event_objects/pics/people/wally/6.png
deleted file mode 100644
index 42397e95e3..0000000000
Binary files a/graphics/event_objects/pics/people/wally/6.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/wally/7.png b/graphics/event_objects/pics/people/wally/7.png
deleted file mode 100644
index 46dbdfa3b8..0000000000
Binary files a/graphics/event_objects/pics/people/wally/7.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/wally/8.png b/graphics/event_objects/pics/people/wally/8.png
deleted file mode 100644
index 5b7038b440..0000000000
Binary files a/graphics/event_objects/pics/people/wally/8.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/wattson/0.png b/graphics/event_objects/pics/people/wattson/0.png
deleted file mode 100644
index 28eaa1bf23..0000000000
Binary files a/graphics/event_objects/pics/people/wattson/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/wattson/1.png b/graphics/event_objects/pics/people/wattson/1.png
deleted file mode 100644
index b26ab83f4a..0000000000
Binary files a/graphics/event_objects/pics/people/wattson/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/wattson/2.png b/graphics/event_objects/pics/people/wattson/2.png
deleted file mode 100644
index 2d7fe024b7..0000000000
Binary files a/graphics/event_objects/pics/people/wattson/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/winona/0.png b/graphics/event_objects/pics/people/winona/0.png
deleted file mode 100644
index 4df4633631..0000000000
Binary files a/graphics/event_objects/pics/people/winona/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/winona/1.png b/graphics/event_objects/pics/people/winona/1.png
deleted file mode 100644
index 75d255c7a1..0000000000
Binary files a/graphics/event_objects/pics/people/winona/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/winona/2.png b/graphics/event_objects/pics/people/winona/2.png
deleted file mode 100644
index 569dea1054..0000000000
Binary files a/graphics/event_objects/pics/people/winona/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/woman_1.png b/graphics/event_objects/pics/people/woman_1.png
new file mode 100644
index 0000000000..285c2947c9
Binary files /dev/null and b/graphics/event_objects/pics/people/woman_1.png differ
diff --git a/graphics/event_objects/pics/people/woman_1/0.png b/graphics/event_objects/pics/people/woman_1/0.png
deleted file mode 100644
index cb29490380..0000000000
Binary files a/graphics/event_objects/pics/people/woman_1/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/woman_1/1.png b/graphics/event_objects/pics/people/woman_1/1.png
deleted file mode 100644
index ea8dc9119e..0000000000
Binary files a/graphics/event_objects/pics/people/woman_1/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/woman_1/2.png b/graphics/event_objects/pics/people/woman_1/2.png
deleted file mode 100644
index b0bd3e1b1d..0000000000
Binary files a/graphics/event_objects/pics/people/woman_1/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/woman_1/3.png b/graphics/event_objects/pics/people/woman_1/3.png
deleted file mode 100644
index e7ed6c1121..0000000000
Binary files a/graphics/event_objects/pics/people/woman_1/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/woman_1/4.png b/graphics/event_objects/pics/people/woman_1/4.png
deleted file mode 100644
index 05f7e78397..0000000000
Binary files a/graphics/event_objects/pics/people/woman_1/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/woman_1/5.png b/graphics/event_objects/pics/people/woman_1/5.png
deleted file mode 100644
index e23e364cd0..0000000000
Binary files a/graphics/event_objects/pics/people/woman_1/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/woman_1/6.png b/graphics/event_objects/pics/people/woman_1/6.png
deleted file mode 100644
index a1e6f69aba..0000000000
Binary files a/graphics/event_objects/pics/people/woman_1/6.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/woman_1/7.png b/graphics/event_objects/pics/people/woman_1/7.png
deleted file mode 100644
index 985172d52f..0000000000
Binary files a/graphics/event_objects/pics/people/woman_1/7.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/woman_1/8.png b/graphics/event_objects/pics/people/woman_1/8.png
deleted file mode 100644
index f5e560b599..0000000000
Binary files a/graphics/event_objects/pics/people/woman_1/8.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/woman_2.png b/graphics/event_objects/pics/people/woman_2.png
new file mode 100644
index 0000000000..b4381c2f43
Binary files /dev/null and b/graphics/event_objects/pics/people/woman_2.png differ
diff --git a/graphics/event_objects/pics/people/woman_2/0.png b/graphics/event_objects/pics/people/woman_2/0.png
deleted file mode 100644
index d9656ce736..0000000000
Binary files a/graphics/event_objects/pics/people/woman_2/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/woman_2/1.png b/graphics/event_objects/pics/people/woman_2/1.png
deleted file mode 100644
index 23d97812bf..0000000000
Binary files a/graphics/event_objects/pics/people/woman_2/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/woman_2/2.png b/graphics/event_objects/pics/people/woman_2/2.png
deleted file mode 100644
index f298e6eea1..0000000000
Binary files a/graphics/event_objects/pics/people/woman_2/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/woman_2/3.png b/graphics/event_objects/pics/people/woman_2/3.png
deleted file mode 100644
index 53809fd32d..0000000000
Binary files a/graphics/event_objects/pics/people/woman_2/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/woman_2/4.png b/graphics/event_objects/pics/people/woman_2/4.png
deleted file mode 100644
index 8f3fbe35f8..0000000000
Binary files a/graphics/event_objects/pics/people/woman_2/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/woman_2/5.png b/graphics/event_objects/pics/people/woman_2/5.png
deleted file mode 100644
index d026809040..0000000000
Binary files a/graphics/event_objects/pics/people/woman_2/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/woman_2/6.png b/graphics/event_objects/pics/people/woman_2/6.png
deleted file mode 100644
index 4999cf1b15..0000000000
Binary files a/graphics/event_objects/pics/people/woman_2/6.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/woman_2/7.png b/graphics/event_objects/pics/people/woman_2/7.png
deleted file mode 100644
index 17e6695317..0000000000
Binary files a/graphics/event_objects/pics/people/woman_2/7.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/woman_2/8.png b/graphics/event_objects/pics/people/woman_2/8.png
deleted file mode 100644
index f591995741..0000000000
Binary files a/graphics/event_objects/pics/people/woman_2/8.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/woman_3.png b/graphics/event_objects/pics/people/woman_3.png
new file mode 100644
index 0000000000..00579b200c
Binary files /dev/null and b/graphics/event_objects/pics/people/woman_3.png differ
diff --git a/graphics/event_objects/pics/people/woman_3/0.png b/graphics/event_objects/pics/people/woman_3/0.png
deleted file mode 100644
index ac9ed557ea..0000000000
Binary files a/graphics/event_objects/pics/people/woman_3/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/woman_3/1.png b/graphics/event_objects/pics/people/woman_3/1.png
deleted file mode 100644
index a7dbe7ec39..0000000000
Binary files a/graphics/event_objects/pics/people/woman_3/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/woman_3/2.png b/graphics/event_objects/pics/people/woman_3/2.png
deleted file mode 100644
index 23852c71ba..0000000000
Binary files a/graphics/event_objects/pics/people/woman_3/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/woman_3/3.png b/graphics/event_objects/pics/people/woman_3/3.png
deleted file mode 100644
index 525958cbb2..0000000000
Binary files a/graphics/event_objects/pics/people/woman_3/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/woman_3/4.png b/graphics/event_objects/pics/people/woman_3/4.png
deleted file mode 100644
index 6feabedd0a..0000000000
Binary files a/graphics/event_objects/pics/people/woman_3/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/woman_3/5.png b/graphics/event_objects/pics/people/woman_3/5.png
deleted file mode 100644
index f174b0184a..0000000000
Binary files a/graphics/event_objects/pics/people/woman_3/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/woman_3/6.png b/graphics/event_objects/pics/people/woman_3/6.png
deleted file mode 100644
index 1b4b6d08a9..0000000000
Binary files a/graphics/event_objects/pics/people/woman_3/6.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/woman_3/7.png b/graphics/event_objects/pics/people/woman_3/7.png
deleted file mode 100644
index d8c2bfd99b..0000000000
Binary files a/graphics/event_objects/pics/people/woman_3/7.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/woman_3/8.png b/graphics/event_objects/pics/people/woman_3/8.png
deleted file mode 100644
index 0517b99934..0000000000
Binary files a/graphics/event_objects/pics/people/woman_3/8.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/woman_4.png b/graphics/event_objects/pics/people/woman_4.png
new file mode 100644
index 0000000000..cb88cab47f
Binary files /dev/null and b/graphics/event_objects/pics/people/woman_4.png differ
diff --git a/graphics/event_objects/pics/people/woman_4/0.png b/graphics/event_objects/pics/people/woman_4/0.png
deleted file mode 100644
index 88489b6a69..0000000000
Binary files a/graphics/event_objects/pics/people/woman_4/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/woman_4/1.png b/graphics/event_objects/pics/people/woman_4/1.png
deleted file mode 100644
index 1cc24ca363..0000000000
Binary files a/graphics/event_objects/pics/people/woman_4/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/woman_4/2.png b/graphics/event_objects/pics/people/woman_4/2.png
deleted file mode 100644
index efedc4a010..0000000000
Binary files a/graphics/event_objects/pics/people/woman_4/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/woman_4/3.png b/graphics/event_objects/pics/people/woman_4/3.png
deleted file mode 100644
index a186b454eb..0000000000
Binary files a/graphics/event_objects/pics/people/woman_4/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/woman_4/4.png b/graphics/event_objects/pics/people/woman_4/4.png
deleted file mode 100644
index c5cc8670da..0000000000
Binary files a/graphics/event_objects/pics/people/woman_4/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/woman_4/5.png b/graphics/event_objects/pics/people/woman_4/5.png
deleted file mode 100644
index f08133faaf..0000000000
Binary files a/graphics/event_objects/pics/people/woman_4/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/woman_4/6.png b/graphics/event_objects/pics/people/woman_4/6.png
deleted file mode 100644
index dec6f31461..0000000000
Binary files a/graphics/event_objects/pics/people/woman_4/6.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/woman_4/7.png b/graphics/event_objects/pics/people/woman_4/7.png
deleted file mode 100644
index 4912065a5e..0000000000
Binary files a/graphics/event_objects/pics/people/woman_4/7.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/woman_4/8.png b/graphics/event_objects/pics/people/woman_4/8.png
deleted file mode 100644
index 21cd91f67c..0000000000
Binary files a/graphics/event_objects/pics/people/woman_4/8.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/woman_5.png b/graphics/event_objects/pics/people/woman_5.png
new file mode 100644
index 0000000000..cc26319804
Binary files /dev/null and b/graphics/event_objects/pics/people/woman_5.png differ
diff --git a/graphics/event_objects/pics/people/woman_5/0.png b/graphics/event_objects/pics/people/woman_5/0.png
deleted file mode 100644
index 30ff1cf1c2..0000000000
Binary files a/graphics/event_objects/pics/people/woman_5/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/woman_5/1.png b/graphics/event_objects/pics/people/woman_5/1.png
deleted file mode 100644
index 3a5cf543ea..0000000000
Binary files a/graphics/event_objects/pics/people/woman_5/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/woman_5/2.png b/graphics/event_objects/pics/people/woman_5/2.png
deleted file mode 100644
index 066d522598..0000000000
Binary files a/graphics/event_objects/pics/people/woman_5/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/woman_5/3.png b/graphics/event_objects/pics/people/woman_5/3.png
deleted file mode 100644
index 737877bb6d..0000000000
Binary files a/graphics/event_objects/pics/people/woman_5/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/woman_5/4.png b/graphics/event_objects/pics/people/woman_5/4.png
deleted file mode 100644
index 170d45929b..0000000000
Binary files a/graphics/event_objects/pics/people/woman_5/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/woman_5/5.png b/graphics/event_objects/pics/people/woman_5/5.png
deleted file mode 100644
index 2bae62ddea..0000000000
Binary files a/graphics/event_objects/pics/people/woman_5/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/woman_5/6.png b/graphics/event_objects/pics/people/woman_5/6.png
deleted file mode 100644
index 5198976443..0000000000
Binary files a/graphics/event_objects/pics/people/woman_5/6.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/woman_5/7.png b/graphics/event_objects/pics/people/woman_5/7.png
deleted file mode 100644
index c8ec75432f..0000000000
Binary files a/graphics/event_objects/pics/people/woman_5/7.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/woman_5/8.png b/graphics/event_objects/pics/people/woman_5/8.png
deleted file mode 100644
index c4c05fcd95..0000000000
Binary files a/graphics/event_objects/pics/people/woman_5/8.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/woman_6.png b/graphics/event_objects/pics/people/woman_6.png
new file mode 100644
index 0000000000..51ef095409
Binary files /dev/null and b/graphics/event_objects/pics/people/woman_6.png differ
diff --git a/graphics/event_objects/pics/people/woman_6/0.png b/graphics/event_objects/pics/people/woman_6/0.png
deleted file mode 100644
index 61cce57b0d..0000000000
Binary files a/graphics/event_objects/pics/people/woman_6/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/woman_6/1.png b/graphics/event_objects/pics/people/woman_6/1.png
deleted file mode 100644
index ea399ef74c..0000000000
Binary files a/graphics/event_objects/pics/people/woman_6/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/woman_6/2.png b/graphics/event_objects/pics/people/woman_6/2.png
deleted file mode 100644
index 5741211140..0000000000
Binary files a/graphics/event_objects/pics/people/woman_6/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/woman_6/3.png b/graphics/event_objects/pics/people/woman_6/3.png
deleted file mode 100644
index 538e60433c..0000000000
Binary files a/graphics/event_objects/pics/people/woman_6/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/woman_6/4.png b/graphics/event_objects/pics/people/woman_6/4.png
deleted file mode 100644
index 746cefd097..0000000000
Binary files a/graphics/event_objects/pics/people/woman_6/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/woman_6/5.png b/graphics/event_objects/pics/people/woman_6/5.png
deleted file mode 100644
index 4c4e2c5b08..0000000000
Binary files a/graphics/event_objects/pics/people/woman_6/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/woman_6/6.png b/graphics/event_objects/pics/people/woman_6/6.png
deleted file mode 100644
index efd7b76cad..0000000000
Binary files a/graphics/event_objects/pics/people/woman_6/6.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/woman_6/7.png b/graphics/event_objects/pics/people/woman_6/7.png
deleted file mode 100644
index 2009f5e9a0..0000000000
Binary files a/graphics/event_objects/pics/people/woman_6/7.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/woman_6/8.png b/graphics/event_objects/pics/people/woman_6/8.png
deleted file mode 100644
index 9dd33b6438..0000000000
Binary files a/graphics/event_objects/pics/people/woman_6/8.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/woman_7.png b/graphics/event_objects/pics/people/woman_7.png
new file mode 100644
index 0000000000..522c5254d7
Binary files /dev/null and b/graphics/event_objects/pics/people/woman_7.png differ
diff --git a/graphics/event_objects/pics/people/woman_7/0.png b/graphics/event_objects/pics/people/woman_7/0.png
deleted file mode 100644
index a235d670e6..0000000000
Binary files a/graphics/event_objects/pics/people/woman_7/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/woman_7/1.png b/graphics/event_objects/pics/people/woman_7/1.png
deleted file mode 100644
index 62de3d528c..0000000000
Binary files a/graphics/event_objects/pics/people/woman_7/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/woman_7/2.png b/graphics/event_objects/pics/people/woman_7/2.png
deleted file mode 100644
index 3893cd2927..0000000000
Binary files a/graphics/event_objects/pics/people/woman_7/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/woman_7/3.png b/graphics/event_objects/pics/people/woman_7/3.png
deleted file mode 100644
index b893b95748..0000000000
Binary files a/graphics/event_objects/pics/people/woman_7/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/woman_7/4.png b/graphics/event_objects/pics/people/woman_7/4.png
deleted file mode 100644
index 4f04931241..0000000000
Binary files a/graphics/event_objects/pics/people/woman_7/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/woman_7/5.png b/graphics/event_objects/pics/people/woman_7/5.png
deleted file mode 100644
index 6a1e56d2c5..0000000000
Binary files a/graphics/event_objects/pics/people/woman_7/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/woman_7/6.png b/graphics/event_objects/pics/people/woman_7/6.png
deleted file mode 100644
index 8a34881576..0000000000
Binary files a/graphics/event_objects/pics/people/woman_7/6.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/woman_7/7.png b/graphics/event_objects/pics/people/woman_7/7.png
deleted file mode 100644
index fe1dbe7356..0000000000
Binary files a/graphics/event_objects/pics/people/woman_7/7.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/woman_7/8.png b/graphics/event_objects/pics/people/woman_7/8.png
deleted file mode 100644
index 08a1fad826..0000000000
Binary files a/graphics/event_objects/pics/people/woman_7/8.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/youngster.png b/graphics/event_objects/pics/people/youngster.png
new file mode 100644
index 0000000000..1d26290866
Binary files /dev/null and b/graphics/event_objects/pics/people/youngster.png differ
diff --git a/graphics/event_objects/pics/people/youngster/0.png b/graphics/event_objects/pics/people/youngster/0.png
deleted file mode 100644
index b370f81412..0000000000
Binary files a/graphics/event_objects/pics/people/youngster/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/youngster/1.png b/graphics/event_objects/pics/people/youngster/1.png
deleted file mode 100644
index 1c1f15b897..0000000000
Binary files a/graphics/event_objects/pics/people/youngster/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/youngster/2.png b/graphics/event_objects/pics/people/youngster/2.png
deleted file mode 100644
index c8a936dd24..0000000000
Binary files a/graphics/event_objects/pics/people/youngster/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/youngster/3.png b/graphics/event_objects/pics/people/youngster/3.png
deleted file mode 100644
index c9fa72ddbc..0000000000
Binary files a/graphics/event_objects/pics/people/youngster/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/youngster/4.png b/graphics/event_objects/pics/people/youngster/4.png
deleted file mode 100644
index ba17f34ac9..0000000000
Binary files a/graphics/event_objects/pics/people/youngster/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/youngster/5.png b/graphics/event_objects/pics/people/youngster/5.png
deleted file mode 100644
index fcd2f196a0..0000000000
Binary files a/graphics/event_objects/pics/people/youngster/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/youngster/6.png b/graphics/event_objects/pics/people/youngster/6.png
deleted file mode 100644
index fd12b99ea8..0000000000
Binary files a/graphics/event_objects/pics/people/youngster/6.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/youngster/7.png b/graphics/event_objects/pics/people/youngster/7.png
deleted file mode 100644
index 626716b8dd..0000000000
Binary files a/graphics/event_objects/pics/people/youngster/7.png and /dev/null differ
diff --git a/graphics/event_objects/pics/people/youngster/8.png b/graphics/event_objects/pics/people/youngster/8.png
deleted file mode 100644
index 3c9662746f..0000000000
Binary files a/graphics/event_objects/pics/people/youngster/8.png and /dev/null differ
diff --git a/graphics/event_objects/pics/pokemon/azumarill.png b/graphics/event_objects/pics/pokemon/azumarill.png
new file mode 100644
index 0000000000..0a03fd3d4d
Binary files /dev/null and b/graphics/event_objects/pics/pokemon/azumarill.png differ
diff --git a/graphics/event_objects/pics/pokemon/azumarill/0.png b/graphics/event_objects/pics/pokemon/azumarill/0.png
deleted file mode 100644
index 9b219e5521..0000000000
Binary files a/graphics/event_objects/pics/pokemon/azumarill/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/pokemon/azumarill/1.png b/graphics/event_objects/pics/pokemon/azumarill/1.png
deleted file mode 100644
index 16e493f8bf..0000000000
Binary files a/graphics/event_objects/pics/pokemon/azumarill/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/pokemon/azumarill/2.png b/graphics/event_objects/pics/pokemon/azumarill/2.png
deleted file mode 100644
index b10e6a2832..0000000000
Binary files a/graphics/event_objects/pics/pokemon/azumarill/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/pokemon/azurill.png b/graphics/event_objects/pics/pokemon/azurill.png
new file mode 100644
index 0000000000..d6050257b7
Binary files /dev/null and b/graphics/event_objects/pics/pokemon/azurill.png differ
diff --git a/graphics/event_objects/pics/pokemon/azurill/0.png b/graphics/event_objects/pics/pokemon/azurill/0.png
deleted file mode 100644
index efbcea03fa..0000000000
Binary files a/graphics/event_objects/pics/pokemon/azurill/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/pokemon/azurill/1.png b/graphics/event_objects/pics/pokemon/azurill/1.png
deleted file mode 100644
index 4e00acdc62..0000000000
Binary files a/graphics/event_objects/pics/pokemon/azurill/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/pokemon/azurill/2.png b/graphics/event_objects/pics/pokemon/azurill/2.png
deleted file mode 100644
index 08bf43c5bf..0000000000
Binary files a/graphics/event_objects/pics/pokemon/azurill/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/pokemon/deoxys.png b/graphics/event_objects/pics/pokemon/deoxys.png
new file mode 100644
index 0000000000..2e892f0da0
Binary files /dev/null and b/graphics/event_objects/pics/pokemon/deoxys.png differ
diff --git a/graphics/event_objects/pics/pokemon/deoxys/0.png b/graphics/event_objects/pics/pokemon/deoxys/0.png
deleted file mode 100644
index 37b90dbfe2..0000000000
Binary files a/graphics/event_objects/pics/pokemon/deoxys/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/pokemon/deoxys/1.png b/graphics/event_objects/pics/pokemon/deoxys/1.png
deleted file mode 100644
index 4d38cb9468..0000000000
Binary files a/graphics/event_objects/pics/pokemon/deoxys/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/pokemon/dusclops.png b/graphics/event_objects/pics/pokemon/dusclops.png
new file mode 100644
index 0000000000..faf183ff43
Binary files /dev/null and b/graphics/event_objects/pics/pokemon/dusclops.png differ
diff --git a/graphics/event_objects/pics/pokemon/dusclops/0.png b/graphics/event_objects/pics/pokemon/dusclops/0.png
deleted file mode 100644
index b738a9ef1d..0000000000
Binary files a/graphics/event_objects/pics/pokemon/dusclops/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/pokemon/dusclops/1.png b/graphics/event_objects/pics/pokemon/dusclops/1.png
deleted file mode 100644
index 70ec671c87..0000000000
Binary files a/graphics/event_objects/pics/pokemon/dusclops/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/pokemon/dusclops/2.png b/graphics/event_objects/pics/pokemon/dusclops/2.png
deleted file mode 100644
index 0cbb7c6209..0000000000
Binary files a/graphics/event_objects/pics/pokemon/dusclops/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/pokemon/dusclops/3.png b/graphics/event_objects/pics/pokemon/dusclops/3.png
deleted file mode 100644
index 3d5858ff61..0000000000
Binary files a/graphics/event_objects/pics/pokemon/dusclops/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/pokemon/dusclops/4.png b/graphics/event_objects/pics/pokemon/dusclops/4.png
deleted file mode 100644
index f99269afaf..0000000000
Binary files a/graphics/event_objects/pics/pokemon/dusclops/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/pokemon/dusclops/5.png b/graphics/event_objects/pics/pokemon/dusclops/5.png
deleted file mode 100644
index 6b496be3cb..0000000000
Binary files a/graphics/event_objects/pics/pokemon/dusclops/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/pokemon/dusclops/6.png b/graphics/event_objects/pics/pokemon/dusclops/6.png
deleted file mode 100644
index 3ff10d7abd..0000000000
Binary files a/graphics/event_objects/pics/pokemon/dusclops/6.png and /dev/null differ
diff --git a/graphics/event_objects/pics/pokemon/dusclops/7.png b/graphics/event_objects/pics/pokemon/dusclops/7.png
deleted file mode 100644
index 925080a4fd..0000000000
Binary files a/graphics/event_objects/pics/pokemon/dusclops/7.png and /dev/null differ
diff --git a/graphics/event_objects/pics/pokemon/dusclops/8.png b/graphics/event_objects/pics/pokemon/dusclops/8.png
deleted file mode 100644
index 57dcef5967..0000000000
Binary files a/graphics/event_objects/pics/pokemon/dusclops/8.png and /dev/null differ
diff --git a/graphics/event_objects/pics/pokemon/enemy_zigzagoon.png b/graphics/event_objects/pics/pokemon/enemy_zigzagoon.png
new file mode 100644
index 0000000000..5c75f647f5
Binary files /dev/null and b/graphics/event_objects/pics/pokemon/enemy_zigzagoon.png differ
diff --git a/graphics/event_objects/pics/pokemon/enemy_zigzagoon/0.png b/graphics/event_objects/pics/pokemon/enemy_zigzagoon/0.png
deleted file mode 100644
index 9fa5da9c11..0000000000
Binary files a/graphics/event_objects/pics/pokemon/enemy_zigzagoon/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/pokemon/enemy_zigzagoon/1.png b/graphics/event_objects/pics/pokemon/enemy_zigzagoon/1.png
deleted file mode 100644
index b328fc8449..0000000000
Binary files a/graphics/event_objects/pics/pokemon/enemy_zigzagoon/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/pokemon/enemy_zigzagoon/2.png b/graphics/event_objects/pics/pokemon/enemy_zigzagoon/2.png
deleted file mode 100644
index e4935a1cd6..0000000000
Binary files a/graphics/event_objects/pics/pokemon/enemy_zigzagoon/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/pokemon/enemy_zigzagoon/3.png b/graphics/event_objects/pics/pokemon/enemy_zigzagoon/3.png
deleted file mode 100644
index 3ea74a6ea3..0000000000
Binary files a/graphics/event_objects/pics/pokemon/enemy_zigzagoon/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/pokemon/enemy_zigzagoon/4.png b/graphics/event_objects/pics/pokemon/enemy_zigzagoon/4.png
deleted file mode 100644
index ab2dbf891c..0000000000
Binary files a/graphics/event_objects/pics/pokemon/enemy_zigzagoon/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/pokemon/enemy_zigzagoon/5.png b/graphics/event_objects/pics/pokemon/enemy_zigzagoon/5.png
deleted file mode 100644
index a16efcb6ea..0000000000
Binary files a/graphics/event_objects/pics/pokemon/enemy_zigzagoon/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/pokemon/enemy_zigzagoon/6.png b/graphics/event_objects/pics/pokemon/enemy_zigzagoon/6.png
deleted file mode 100644
index 38fec7b469..0000000000
Binary files a/graphics/event_objects/pics/pokemon/enemy_zigzagoon/6.png and /dev/null differ
diff --git a/graphics/event_objects/pics/pokemon/enemy_zigzagoon/7.png b/graphics/event_objects/pics/pokemon/enemy_zigzagoon/7.png
deleted file mode 100644
index a5a8c034de..0000000000
Binary files a/graphics/event_objects/pics/pokemon/enemy_zigzagoon/7.png and /dev/null differ
diff --git a/graphics/event_objects/pics/pokemon/enemy_zigzagoon/8.png b/graphics/event_objects/pics/pokemon/enemy_zigzagoon/8.png
deleted file mode 100644
index 727908cf9e..0000000000
Binary files a/graphics/event_objects/pics/pokemon/enemy_zigzagoon/8.png and /dev/null differ
diff --git a/graphics/event_objects/pics/pokemon/groudon.png b/graphics/event_objects/pics/pokemon/groudon.png
new file mode 100644
index 0000000000..de569261c5
Binary files /dev/null and b/graphics/event_objects/pics/pokemon/groudon.png differ
diff --git a/graphics/event_objects/pics/pokemon/groudon_front/0.png b/graphics/event_objects/pics/pokemon/groudon_front/0.png
deleted file mode 100644
index 05cb164339..0000000000
Binary files a/graphics/event_objects/pics/pokemon/groudon_front/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/pokemon/groudon_front/1.png b/graphics/event_objects/pics/pokemon/groudon_front/1.png
deleted file mode 100644
index fcafab2a02..0000000000
Binary files a/graphics/event_objects/pics/pokemon/groudon_front/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/pokemon/groudon_side/0.png b/graphics/event_objects/pics/pokemon/groudon_side/0.png
deleted file mode 100644
index 76bd8a11c6..0000000000
Binary files a/graphics/event_objects/pics/pokemon/groudon_side/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/pokemon/groudon_side/1.png b/graphics/event_objects/pics/pokemon/groudon_side/1.png
deleted file mode 100644
index 2ecf098223..0000000000
Binary files a/graphics/event_objects/pics/pokemon/groudon_side/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/pokemon/ho_oh.png b/graphics/event_objects/pics/pokemon/ho_oh.png
new file mode 100644
index 0000000000..883bf65773
Binary files /dev/null and b/graphics/event_objects/pics/pokemon/ho_oh.png differ
diff --git a/graphics/event_objects/pics/pokemon/ho_oh/0.png b/graphics/event_objects/pics/pokemon/ho_oh/0.png
deleted file mode 100644
index 0d8ef71e15..0000000000
Binary files a/graphics/event_objects/pics/pokemon/ho_oh/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/pokemon/ho_oh/1.png b/graphics/event_objects/pics/pokemon/ho_oh/1.png
deleted file mode 100644
index 03d3b0874d..0000000000
Binary files a/graphics/event_objects/pics/pokemon/ho_oh/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/pokemon/kecleon.png b/graphics/event_objects/pics/pokemon/kecleon.png
new file mode 100644
index 0000000000..460d3acc47
Binary files /dev/null and b/graphics/event_objects/pics/pokemon/kecleon.png differ
diff --git a/graphics/event_objects/pics/pokemon/kecleon/0.png b/graphics/event_objects/pics/pokemon/kecleon/0.png
deleted file mode 100644
index 691797af01..0000000000
Binary files a/graphics/event_objects/pics/pokemon/kecleon/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/pokemon/kecleon/1.png b/graphics/event_objects/pics/pokemon/kecleon/1.png
deleted file mode 100644
index 0d82cc66d9..0000000000
Binary files a/graphics/event_objects/pics/pokemon/kecleon/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/pokemon/kecleon/2.png b/graphics/event_objects/pics/pokemon/kecleon/2.png
deleted file mode 100644
index 2713ce0571..0000000000
Binary files a/graphics/event_objects/pics/pokemon/kecleon/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/pokemon/kirlia.png b/graphics/event_objects/pics/pokemon/kirlia.png
new file mode 100644
index 0000000000..b71b575ebf
Binary files /dev/null and b/graphics/event_objects/pics/pokemon/kirlia.png differ
diff --git a/graphics/event_objects/pics/pokemon/kirlia/0.png b/graphics/event_objects/pics/pokemon/kirlia/0.png
deleted file mode 100644
index e069df4899..0000000000
Binary files a/graphics/event_objects/pics/pokemon/kirlia/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/pokemon/kirlia/1.png b/graphics/event_objects/pics/pokemon/kirlia/1.png
deleted file mode 100644
index d158bd3351..0000000000
Binary files a/graphics/event_objects/pics/pokemon/kirlia/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/pokemon/kirlia/2.png b/graphics/event_objects/pics/pokemon/kirlia/2.png
deleted file mode 100644
index 388077d93e..0000000000
Binary files a/graphics/event_objects/pics/pokemon/kirlia/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/pokemon/kirlia/3.png b/graphics/event_objects/pics/pokemon/kirlia/3.png
deleted file mode 100644
index 4887b16534..0000000000
Binary files a/graphics/event_objects/pics/pokemon/kirlia/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/pokemon/kirlia/4.png b/graphics/event_objects/pics/pokemon/kirlia/4.png
deleted file mode 100644
index e734a8f60e..0000000000
Binary files a/graphics/event_objects/pics/pokemon/kirlia/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/pokemon/kirlia/5.png b/graphics/event_objects/pics/pokemon/kirlia/5.png
deleted file mode 100644
index e2e36561bb..0000000000
Binary files a/graphics/event_objects/pics/pokemon/kirlia/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/pokemon/kirlia/6.png b/graphics/event_objects/pics/pokemon/kirlia/6.png
deleted file mode 100644
index 0731cb711b..0000000000
Binary files a/graphics/event_objects/pics/pokemon/kirlia/6.png and /dev/null differ
diff --git a/graphics/event_objects/pics/pokemon/kirlia/7.png b/graphics/event_objects/pics/pokemon/kirlia/7.png
deleted file mode 100644
index c4f33879cd..0000000000
Binary files a/graphics/event_objects/pics/pokemon/kirlia/7.png and /dev/null differ
diff --git a/graphics/event_objects/pics/pokemon/kirlia/8.png b/graphics/event_objects/pics/pokemon/kirlia/8.png
deleted file mode 100644
index 87fe530c5d..0000000000
Binary files a/graphics/event_objects/pics/pokemon/kirlia/8.png and /dev/null differ
diff --git a/graphics/event_objects/pics/pokemon/kyogre.png b/graphics/event_objects/pics/pokemon/kyogre.png
new file mode 100644
index 0000000000..b67f3b15fc
Binary files /dev/null and b/graphics/event_objects/pics/pokemon/kyogre.png differ
diff --git a/graphics/event_objects/pics/pokemon/kyogre_front/0.png b/graphics/event_objects/pics/pokemon/kyogre_front/0.png
deleted file mode 100644
index 2cfea8e010..0000000000
Binary files a/graphics/event_objects/pics/pokemon/kyogre_front/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/pokemon/kyogre_front/1.png b/graphics/event_objects/pics/pokemon/kyogre_front/1.png
deleted file mode 100644
index 8f2dcd7afa..0000000000
Binary files a/graphics/event_objects/pics/pokemon/kyogre_front/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/pokemon/kyogre_side/0.png b/graphics/event_objects/pics/pokemon/kyogre_side/0.png
deleted file mode 100644
index f60199f77b..0000000000
Binary files a/graphics/event_objects/pics/pokemon/kyogre_side/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/pokemon/kyogre_side/1.png b/graphics/event_objects/pics/pokemon/kyogre_side/1.png
deleted file mode 100644
index 00d53d563c..0000000000
Binary files a/graphics/event_objects/pics/pokemon/kyogre_side/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/pokemon/latias_latios.png b/graphics/event_objects/pics/pokemon/latias_latios.png
new file mode 100644
index 0000000000..e9355d4a60
Binary files /dev/null and b/graphics/event_objects/pics/pokemon/latias_latios.png differ
diff --git a/graphics/event_objects/pics/pokemon/latias_latios/0.png b/graphics/event_objects/pics/pokemon/latias_latios/0.png
deleted file mode 100644
index 5338fc55ac..0000000000
Binary files a/graphics/event_objects/pics/pokemon/latias_latios/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/pokemon/latias_latios/1.png b/graphics/event_objects/pics/pokemon/latias_latios/1.png
deleted file mode 100644
index 57cde71a98..0000000000
Binary files a/graphics/event_objects/pics/pokemon/latias_latios/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/pokemon/latias_latios/2.png b/graphics/event_objects/pics/pokemon/latias_latios/2.png
deleted file mode 100644
index c8812bec0f..0000000000
Binary files a/graphics/event_objects/pics/pokemon/latias_latios/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/pokemon/lugia.png b/graphics/event_objects/pics/pokemon/lugia.png
new file mode 100644
index 0000000000..d38e374b38
Binary files /dev/null and b/graphics/event_objects/pics/pokemon/lugia.png differ
diff --git a/graphics/event_objects/pics/pokemon/lugia/0.png b/graphics/event_objects/pics/pokemon/lugia/0.png
deleted file mode 100644
index 4e50209fe1..0000000000
Binary files a/graphics/event_objects/pics/pokemon/lugia/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/pokemon/lugia/1.png b/graphics/event_objects/pics/pokemon/lugia/1.png
deleted file mode 100644
index 6f36abc919..0000000000
Binary files a/graphics/event_objects/pics/pokemon/lugia/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/pokemon/mew.png b/graphics/event_objects/pics/pokemon/mew.png
new file mode 100644
index 0000000000..152bdabce2
Binary files /dev/null and b/graphics/event_objects/pics/pokemon/mew.png differ
diff --git a/graphics/event_objects/pics/pokemon/mew/0.png b/graphics/event_objects/pics/pokemon/mew/0.png
deleted file mode 100644
index 55955453cb..0000000000
Binary files a/graphics/event_objects/pics/pokemon/mew/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/pokemon/mew/1.png b/graphics/event_objects/pics/pokemon/mew/1.png
deleted file mode 100644
index 3c6062bd75..0000000000
Binary files a/graphics/event_objects/pics/pokemon/mew/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/pokemon/mew/2.png b/graphics/event_objects/pics/pokemon/mew/2.png
deleted file mode 100644
index 1c3c6e52d8..0000000000
Binary files a/graphics/event_objects/pics/pokemon/mew/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/pokemon/mew/3.png b/graphics/event_objects/pics/pokemon/mew/3.png
deleted file mode 100644
index be04a769bd..0000000000
Binary files a/graphics/event_objects/pics/pokemon/mew/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/pokemon/mew/4.png b/graphics/event_objects/pics/pokemon/mew/4.png
deleted file mode 100644
index 3ddbfa03a1..0000000000
Binary files a/graphics/event_objects/pics/pokemon/mew/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/pokemon/mew/5.png b/graphics/event_objects/pics/pokemon/mew/5.png
deleted file mode 100644
index 44b7bd56bc..0000000000
Binary files a/graphics/event_objects/pics/pokemon/mew/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/pokemon/mew/6.png b/graphics/event_objects/pics/pokemon/mew/6.png
deleted file mode 100644
index c6abc021af..0000000000
Binary files a/graphics/event_objects/pics/pokemon/mew/6.png and /dev/null differ
diff --git a/graphics/event_objects/pics/pokemon/mew/7.png b/graphics/event_objects/pics/pokemon/mew/7.png
deleted file mode 100644
index f22f4072ab..0000000000
Binary files a/graphics/event_objects/pics/pokemon/mew/7.png and /dev/null differ
diff --git a/graphics/event_objects/pics/pokemon/mew/8.png b/graphics/event_objects/pics/pokemon/mew/8.png
deleted file mode 100644
index c603d7ced2..0000000000
Binary files a/graphics/event_objects/pics/pokemon/mew/8.png and /dev/null differ
diff --git a/graphics/event_objects/pics/pokemon/pikachu.png b/graphics/event_objects/pics/pokemon/pikachu.png
new file mode 100644
index 0000000000..bd70269555
Binary files /dev/null and b/graphics/event_objects/pics/pokemon/pikachu.png differ
diff --git a/graphics/event_objects/pics/pokemon/pikachu/0.png b/graphics/event_objects/pics/pokemon/pikachu/0.png
deleted file mode 100644
index 1a08b623c3..0000000000
Binary files a/graphics/event_objects/pics/pokemon/pikachu/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/pokemon/pikachu/1.png b/graphics/event_objects/pics/pokemon/pikachu/1.png
deleted file mode 100644
index f1640a1e54..0000000000
Binary files a/graphics/event_objects/pics/pokemon/pikachu/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/pokemon/pikachu/2.png b/graphics/event_objects/pics/pokemon/pikachu/2.png
deleted file mode 100644
index 68836768bc..0000000000
Binary files a/graphics/event_objects/pics/pokemon/pikachu/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/pokemon/poochyena.png b/graphics/event_objects/pics/pokemon/poochyena.png
new file mode 100644
index 0000000000..86fd9b3acb
Binary files /dev/null and b/graphics/event_objects/pics/pokemon/poochyena.png differ
diff --git a/graphics/event_objects/pics/pokemon/poochyena/0.png b/graphics/event_objects/pics/pokemon/poochyena/0.png
deleted file mode 100644
index 1ee0425729..0000000000
Binary files a/graphics/event_objects/pics/pokemon/poochyena/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/pokemon/poochyena/1.png b/graphics/event_objects/pics/pokemon/poochyena/1.png
deleted file mode 100644
index 3dbdb383cd..0000000000
Binary files a/graphics/event_objects/pics/pokemon/poochyena/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/pokemon/poochyena/2.png b/graphics/event_objects/pics/pokemon/poochyena/2.png
deleted file mode 100644
index bda367b940..0000000000
Binary files a/graphics/event_objects/pics/pokemon/poochyena/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/pokemon/poochyena/3.png b/graphics/event_objects/pics/pokemon/poochyena/3.png
deleted file mode 100644
index 8b7d8f8033..0000000000
Binary files a/graphics/event_objects/pics/pokemon/poochyena/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/pokemon/poochyena/4.png b/graphics/event_objects/pics/pokemon/poochyena/4.png
deleted file mode 100644
index 47012ad543..0000000000
Binary files a/graphics/event_objects/pics/pokemon/poochyena/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/pokemon/poochyena/5.png b/graphics/event_objects/pics/pokemon/poochyena/5.png
deleted file mode 100644
index e256e8a07c..0000000000
Binary files a/graphics/event_objects/pics/pokemon/poochyena/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/pokemon/poochyena/6.png b/graphics/event_objects/pics/pokemon/poochyena/6.png
deleted file mode 100644
index 173b9fe5ef..0000000000
Binary files a/graphics/event_objects/pics/pokemon/poochyena/6.png and /dev/null differ
diff --git a/graphics/event_objects/pics/pokemon/poochyena/7.png b/graphics/event_objects/pics/pokemon/poochyena/7.png
deleted file mode 100644
index 8fdc28209c..0000000000
Binary files a/graphics/event_objects/pics/pokemon/poochyena/7.png and /dev/null differ
diff --git a/graphics/event_objects/pics/pokemon/poochyena/8.png b/graphics/event_objects/pics/pokemon/poochyena/8.png
deleted file mode 100644
index 911619f6a1..0000000000
Binary files a/graphics/event_objects/pics/pokemon/poochyena/8.png and /dev/null differ
diff --git a/graphics/event_objects/pics/pokemon/rayquaza.png b/graphics/event_objects/pics/pokemon/rayquaza.png
new file mode 100644
index 0000000000..aec6616d9a
Binary files /dev/null and b/graphics/event_objects/pics/pokemon/rayquaza.png differ
diff --git a/graphics/event_objects/pics/pokemon/rayquaza/0.png b/graphics/event_objects/pics/pokemon/rayquaza/0.png
deleted file mode 100644
index 9f5db910f5..0000000000
Binary files a/graphics/event_objects/pics/pokemon/rayquaza/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/pokemon/rayquaza/1.png b/graphics/event_objects/pics/pokemon/rayquaza/1.png
deleted file mode 100644
index e770b65497..0000000000
Binary files a/graphics/event_objects/pics/pokemon/rayquaza/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/pokemon/rayquaza/2.png b/graphics/event_objects/pics/pokemon/rayquaza/2.png
deleted file mode 100644
index e72c17b079..0000000000
Binary files a/graphics/event_objects/pics/pokemon/rayquaza/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/pokemon/rayquaza/3.png b/graphics/event_objects/pics/pokemon/rayquaza/3.png
deleted file mode 100644
index edcfe94ba8..0000000000
Binary files a/graphics/event_objects/pics/pokemon/rayquaza/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/pokemon/rayquaza/4.png b/graphics/event_objects/pics/pokemon/rayquaza/4.png
deleted file mode 100644
index d34cb5d58a..0000000000
Binary files a/graphics/event_objects/pics/pokemon/rayquaza/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/pokemon/skitty.png b/graphics/event_objects/pics/pokemon/skitty.png
new file mode 100644
index 0000000000..2b40113207
Binary files /dev/null and b/graphics/event_objects/pics/pokemon/skitty.png differ
diff --git a/graphics/event_objects/pics/pokemon/skitty/0.png b/graphics/event_objects/pics/pokemon/skitty/0.png
deleted file mode 100644
index 105611a10a..0000000000
Binary files a/graphics/event_objects/pics/pokemon/skitty/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/pokemon/skitty/1.png b/graphics/event_objects/pics/pokemon/skitty/1.png
deleted file mode 100644
index 66a9640e0c..0000000000
Binary files a/graphics/event_objects/pics/pokemon/skitty/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/pokemon/skitty/2.png b/graphics/event_objects/pics/pokemon/skitty/2.png
deleted file mode 100644
index 2ab6cabfab..0000000000
Binary files a/graphics/event_objects/pics/pokemon/skitty/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/pokemon/sudowoodo.png b/graphics/event_objects/pics/pokemon/sudowoodo.png
new file mode 100644
index 0000000000..ff2cc385b6
Binary files /dev/null and b/graphics/event_objects/pics/pokemon/sudowoodo.png differ
diff --git a/graphics/event_objects/pics/pokemon/sudowoodo/0.png b/graphics/event_objects/pics/pokemon/sudowoodo/0.png
deleted file mode 100644
index 20584b1a69..0000000000
Binary files a/graphics/event_objects/pics/pokemon/sudowoodo/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/pokemon/sudowoodo/1.png b/graphics/event_objects/pics/pokemon/sudowoodo/1.png
deleted file mode 100644
index 1d865c43a0..0000000000
Binary files a/graphics/event_objects/pics/pokemon/sudowoodo/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/pokemon/sudowoodo/2.png b/graphics/event_objects/pics/pokemon/sudowoodo/2.png
deleted file mode 100644
index 319220edfb..0000000000
Binary files a/graphics/event_objects/pics/pokemon/sudowoodo/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/pokemon/vigoroth.png b/graphics/event_objects/pics/pokemon/vigoroth.png
new file mode 100644
index 0000000000..b90c5fddde
Binary files /dev/null and b/graphics/event_objects/pics/pokemon/vigoroth.png differ
diff --git a/graphics/event_objects/pics/pokemon/vigoroth_carrying_box/0.png b/graphics/event_objects/pics/pokemon/vigoroth_carrying_box/0.png
deleted file mode 100644
index 088986e807..0000000000
Binary files a/graphics/event_objects/pics/pokemon/vigoroth_carrying_box/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/pokemon/vigoroth_carrying_box/1.png b/graphics/event_objects/pics/pokemon/vigoroth_carrying_box/1.png
deleted file mode 100644
index 79d269e55e..0000000000
Binary files a/graphics/event_objects/pics/pokemon/vigoroth_carrying_box/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/pokemon/vigoroth_carrying_box/2.png b/graphics/event_objects/pics/pokemon/vigoroth_carrying_box/2.png
deleted file mode 100644
index 2918caf224..0000000000
Binary files a/graphics/event_objects/pics/pokemon/vigoroth_carrying_box/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/pokemon/vigoroth_facing_away/0.png b/graphics/event_objects/pics/pokemon/vigoroth_facing_away/0.png
deleted file mode 100644
index 30f989ca50..0000000000
Binary files a/graphics/event_objects/pics/pokemon/vigoroth_facing_away/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/pokemon/vigoroth_facing_away/1.png b/graphics/event_objects/pics/pokemon/vigoroth_facing_away/1.png
deleted file mode 100644
index f0edeb876b..0000000000
Binary files a/graphics/event_objects/pics/pokemon/vigoroth_facing_away/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/pokemon/wingull.png b/graphics/event_objects/pics/pokemon/wingull.png
new file mode 100644
index 0000000000..4ebb0039e7
Binary files /dev/null and b/graphics/event_objects/pics/pokemon/wingull.png differ
diff --git a/graphics/event_objects/pics/pokemon/wingull/0.png b/graphics/event_objects/pics/pokemon/wingull/0.png
deleted file mode 100644
index 2e83a4b4ee..0000000000
Binary files a/graphics/event_objects/pics/pokemon/wingull/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/pokemon/wingull/1.png b/graphics/event_objects/pics/pokemon/wingull/1.png
deleted file mode 100644
index 22dadf0aeb..0000000000
Binary files a/graphics/event_objects/pics/pokemon/wingull/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/pokemon/wingull/2.png b/graphics/event_objects/pics/pokemon/wingull/2.png
deleted file mode 100644
index 9758aff0a0..0000000000
Binary files a/graphics/event_objects/pics/pokemon/wingull/2.png and /dev/null differ
diff --git a/graphics/event_objects/pics/pokemon/wingull/3.png b/graphics/event_objects/pics/pokemon/wingull/3.png
deleted file mode 100644
index c3404d20d6..0000000000
Binary files a/graphics/event_objects/pics/pokemon/wingull/3.png and /dev/null differ
diff --git a/graphics/event_objects/pics/pokemon/wingull/4.png b/graphics/event_objects/pics/pokemon/wingull/4.png
deleted file mode 100644
index 11052fe994..0000000000
Binary files a/graphics/event_objects/pics/pokemon/wingull/4.png and /dev/null differ
diff --git a/graphics/event_objects/pics/pokemon/wingull/5.png b/graphics/event_objects/pics/pokemon/wingull/5.png
deleted file mode 100644
index af5505e31c..0000000000
Binary files a/graphics/event_objects/pics/pokemon/wingull/5.png and /dev/null differ
diff --git a/graphics/event_objects/pics/pokemon/zigzagoon.png b/graphics/event_objects/pics/pokemon/zigzagoon.png
new file mode 100644
index 0000000000..2312d4f97a
Binary files /dev/null and b/graphics/event_objects/pics/pokemon/zigzagoon.png differ
diff --git a/graphics/event_objects/pics/pokemon/zigzagoon/0.png b/graphics/event_objects/pics/pokemon/zigzagoon/0.png
deleted file mode 100644
index 0601efadeb..0000000000
Binary files a/graphics/event_objects/pics/pokemon/zigzagoon/0.png and /dev/null differ
diff --git a/graphics/event_objects/pics/pokemon/zigzagoon/1.png b/graphics/event_objects/pics/pokemon/zigzagoon/1.png
deleted file mode 100644
index c7e067a6de..0000000000
Binary files a/graphics/event_objects/pics/pokemon/zigzagoon/1.png and /dev/null differ
diff --git a/graphics/event_objects/pics/pokemon/zigzagoon/2.png b/graphics/event_objects/pics/pokemon/zigzagoon/2.png
deleted file mode 100644
index d44a71b8d8..0000000000
Binary files a/graphics/event_objects/pics/pokemon/zigzagoon/2.png and /dev/null differ
diff --git a/include/sprite.h b/include/sprite.h
index f972d09cc9..6270511c90 100644
--- a/include/sprite.h
+++ b/include/sprite.h
@@ -26,6 +26,8 @@ struct SpriteFrameImage
 
 #define obj_frame_tiles(ptr) {.data = (u8 *)ptr, .size = sizeof ptr}
 
+#define overworld_frame(ptr, width, height, frame) {.data = (u8 *)ptr + (width * height * frame)/2, .size = (width * height)/2}
+
 struct SpritePalette
 {
     const u16 *data;  // Raw uncompressed palette data
diff --git a/src/data/field_event_obj/berry_tree_graphics_tables.h b/src/data/field_event_obj/berry_tree_graphics_tables.h
index 31d515a82f..679a0e5a57 100755
--- a/src/data/field_event_obj/berry_tree_graphics_tables.h
+++ b/src/data/field_event_obj/berry_tree_graphics_tables.h
@@ -2,421 +2,421 @@
 #define GUARD_BERRY_TREE_GRAPHICS_TABLES_H
 
 const struct SpriteFrameImage gEventObjectPicTable_PechaBerryTree[] = {
-    obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile),
-    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0),
-    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1),
-    obj_frame_tiles(gEventObjectPic_PechaBerryTree_0),
-    obj_frame_tiles(gEventObjectPic_PechaBerryTree_1),
-    obj_frame_tiles(gEventObjectPic_PechaBerryTree_2),
-    obj_frame_tiles(gEventObjectPic_PechaBerryTree_3),
-    obj_frame_tiles(gEventObjectPic_PechaBerryTree_4),
-    obj_frame_tiles(gEventObjectPic_PechaBerryTree_5),
+    overworld_frame(gEventObjectPic_BerryTreeDirtPile, 16, 16, 0),
+    overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 0),
+    overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 1),
+    overworld_frame(gEventObjectPic_PechaBerryTree, 16, 32, 0),
+    overworld_frame(gEventObjectPic_PechaBerryTree, 16, 32, 1),
+    overworld_frame(gEventObjectPic_PechaBerryTree, 16, 32, 2),
+    overworld_frame(gEventObjectPic_PechaBerryTree, 16, 32, 3),
+    overworld_frame(gEventObjectPic_PechaBerryTree, 16, 32, 4),
+    overworld_frame(gEventObjectPic_PechaBerryTree, 16, 32, 5),
 };
 
 const u8 gBerryTreePaletteSlotTable_Pecha[] = {3, 4, 4, 4, 4};
 
 const struct SpriteFrameImage gEventObjectPicTable_KelpsyBerryTree[] = {
-    obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile),
-    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0),
-    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1),
-    obj_frame_tiles(gEventObjectPic_KelpsyBerryTree_0),
-    obj_frame_tiles(gEventObjectPic_KelpsyBerryTree_1),
-    obj_frame_tiles(gEventObjectPic_KelpsyBerryTree_2),
-    obj_frame_tiles(gEventObjectPic_KelpsyBerryTree_3),
-    obj_frame_tiles(gEventObjectPic_KelpsyBerryTree_4),
-    obj_frame_tiles(gEventObjectPic_KelpsyBerryTree_5),
+    overworld_frame(gEventObjectPic_BerryTreeDirtPile, 16, 16, 0),
+    overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 0),
+    overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 1),
+    overworld_frame(gEventObjectPic_KelpsyBerryTree, 16, 32, 0),
+    overworld_frame(gEventObjectPic_KelpsyBerryTree, 16, 32, 1),
+    overworld_frame(gEventObjectPic_KelpsyBerryTree, 16, 32, 2),
+    overworld_frame(gEventObjectPic_KelpsyBerryTree, 16, 32, 3),
+    overworld_frame(gEventObjectPic_KelpsyBerryTree, 16, 32, 4),
+    overworld_frame(gEventObjectPic_KelpsyBerryTree, 16, 32, 5),
 };
 
 const u8 gBerryTreePaletteSlotTable_Kelpsy[] = {3, 4, 2, 2, 2};
 
 const struct SpriteFrameImage gEventObjectPicTable_WepearBerryTree[] = {
-    obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile),
-    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0),
-    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1),
-    obj_frame_tiles(gEventObjectPic_WepearBerryTree_0),
-    obj_frame_tiles(gEventObjectPic_WepearBerryTree_1),
-    obj_frame_tiles(gEventObjectPic_WepearBerryTree_2),
-    obj_frame_tiles(gEventObjectPic_WepearBerryTree_3),
-    obj_frame_tiles(gEventObjectPic_WepearBerryTree_4),
-    obj_frame_tiles(gEventObjectPic_WepearBerryTree_5),
+    overworld_frame(gEventObjectPic_BerryTreeDirtPile, 16, 16, 0),
+    overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 0),
+    overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 1),
+    overworld_frame(gEventObjectPic_WepearBerryTree, 16, 32, 0),
+    overworld_frame(gEventObjectPic_WepearBerryTree, 16, 32, 1),
+    overworld_frame(gEventObjectPic_WepearBerryTree, 16, 32, 2),
+    overworld_frame(gEventObjectPic_WepearBerryTree, 16, 32, 3),
+    overworld_frame(gEventObjectPic_WepearBerryTree, 16, 32, 4),
+    overworld_frame(gEventObjectPic_WepearBerryTree, 16, 32, 5),
 };
 
 const u8 gBerryTreePaletteSlotTable_Wepear[] = {3, 4, 2, 2, 2};
 
 const struct SpriteFrameImage gEventObjectPicTable_IapapaBerryTree[] = {
-    obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile),
-    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0),
-    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1),
-    obj_frame_tiles(gEventObjectPic_IapapaBerryTree_0),
-    obj_frame_tiles(gEventObjectPic_IapapaBerryTree_1),
-    obj_frame_tiles(gEventObjectPic_IapapaBerryTree_2),
-    obj_frame_tiles(gEventObjectPic_IapapaBerryTree_3),
-    obj_frame_tiles(gEventObjectPic_IapapaBerryTree_4),
-    obj_frame_tiles(gEventObjectPic_IapapaBerryTree_5),
+    overworld_frame(gEventObjectPic_BerryTreeDirtPile, 16, 16, 0),
+    overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 0),
+    overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 1),
+    overworld_frame(gEventObjectPic_IapapaBerryTree, 16, 32, 0),
+    overworld_frame(gEventObjectPic_IapapaBerryTree, 16, 32, 1),
+    overworld_frame(gEventObjectPic_IapapaBerryTree, 16, 32, 2),
+    overworld_frame(gEventObjectPic_IapapaBerryTree, 16, 32, 3),
+    overworld_frame(gEventObjectPic_IapapaBerryTree, 16, 32, 4),
+    overworld_frame(gEventObjectPic_IapapaBerryTree, 16, 32, 5),
 };
 
 const u8 gBerryTreePaletteSlotTable_Iapapa[] = {3, 4, 3, 3, 3};
 
 const struct SpriteFrameImage gEventObjectPicTable_CheriBerryTree[] = {
-    obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile),
-    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0),
-    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1),
-    obj_frame_tiles(gEventObjectPic_CheriBerryTree_0),
-    obj_frame_tiles(gEventObjectPic_CheriBerryTree_1),
-    obj_frame_tiles(gEventObjectPic_CheriBerryTree_2),
-    obj_frame_tiles(gEventObjectPic_CheriBerryTree_3),
-    obj_frame_tiles(gEventObjectPic_CheriBerryTree_4),
-    obj_frame_tiles(gEventObjectPic_CheriBerryTree_5),
+    overworld_frame(gEventObjectPic_BerryTreeDirtPile, 16, 16, 0),
+    overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 0),
+    overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 1),
+    overworld_frame(gEventObjectPic_CheriBerryTree, 16, 32, 0),
+    overworld_frame(gEventObjectPic_CheriBerryTree, 16, 32, 1),
+    overworld_frame(gEventObjectPic_CheriBerryTree, 16, 32, 2),
+    overworld_frame(gEventObjectPic_CheriBerryTree, 16, 32, 3),
+    overworld_frame(gEventObjectPic_CheriBerryTree, 16, 32, 4),
+    overworld_frame(gEventObjectPic_CheriBerryTree, 16, 32, 5),
 };
 
 const u8 gBerryTreePaletteSlotTable_Cheri[] = {3, 4, 4, 4, 4};
 
 const struct SpriteFrameImage gEventObjectPicTable_FigyBerryTree[] = {
-    obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile),
-    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0),
-    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1),
-    obj_frame_tiles(gEventObjectPic_FigyBerryTree_0),
-    obj_frame_tiles(gEventObjectPic_FigyBerryTree_1),
-    obj_frame_tiles(gEventObjectPic_FigyBerryTree_2),
-    obj_frame_tiles(gEventObjectPic_FigyBerryTree_3),
-    obj_frame_tiles(gEventObjectPic_FigyBerryTree_4),
-    obj_frame_tiles(gEventObjectPic_FigyBerryTree_5),
+    overworld_frame(gEventObjectPic_BerryTreeDirtPile, 16, 16, 0),
+    overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 0),
+    overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 1),
+    overworld_frame(gEventObjectPic_FigyBerryTree, 16, 32, 0),
+    overworld_frame(gEventObjectPic_FigyBerryTree, 16, 32, 1),
+    overworld_frame(gEventObjectPic_FigyBerryTree, 16, 32, 2),
+    overworld_frame(gEventObjectPic_FigyBerryTree, 16, 32, 3),
+    overworld_frame(gEventObjectPic_FigyBerryTree, 16, 32, 4),
+    overworld_frame(gEventObjectPic_FigyBerryTree, 16, 32, 5),
 };
 
 const u8 gBerryTreePaletteSlotTable_Figy[] = {3, 4, 3, 3, 3};
 
 const struct SpriteFrameImage gEventObjectPicTable_MagoBerryTree[] = {
-    obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile),
-    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0),
-    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1),
-    obj_frame_tiles(gEventObjectPic_MagoBerryTree_0),
-    obj_frame_tiles(gEventObjectPic_MagoBerryTree_1),
-    obj_frame_tiles(gEventObjectPic_MagoBerryTree_2),
-    obj_frame_tiles(gEventObjectPic_MagoBerryTree_3),
-    obj_frame_tiles(gEventObjectPic_MagoBerryTree_4),
-    obj_frame_tiles(gEventObjectPic_MagoBerryTree_5),
+    overworld_frame(gEventObjectPic_BerryTreeDirtPile, 16, 16, 0),
+    overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 0),
+    overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 1),
+    overworld_frame(gEventObjectPic_MagoBerryTree, 16, 32, 0),
+    overworld_frame(gEventObjectPic_MagoBerryTree, 16, 32, 1),
+    overworld_frame(gEventObjectPic_MagoBerryTree, 16, 32, 2),
+    overworld_frame(gEventObjectPic_MagoBerryTree, 16, 32, 3),
+    overworld_frame(gEventObjectPic_MagoBerryTree, 16, 32, 4),
+    overworld_frame(gEventObjectPic_MagoBerryTree, 16, 32, 5),
 };
 
 const u8 gBerryTreePaletteSlotTable_Mago[] = {3, 4, 3, 3, 3};
 
 const struct SpriteFrameImage gEventObjectPicTable_LumBerryTree[] = {
-    obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile),
-    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0),
-    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1),
-    obj_frame_tiles(gEventObjectPic_LumBerryTree_0),
-    obj_frame_tiles(gEventObjectPic_LumBerryTree_1),
-    obj_frame_tiles(gEventObjectPic_LumBerryTree_2),
-    obj_frame_tiles(gEventObjectPic_LumBerryTree_3),
-    obj_frame_tiles(gEventObjectPic_LumBerryTree_4),
-    obj_frame_tiles(gEventObjectPic_LumBerryTree_5),
+    overworld_frame(gEventObjectPic_BerryTreeDirtPile, 16, 16, 0),
+    overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 0),
+    overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 1),
+    overworld_frame(gEventObjectPic_LumBerryTree, 16, 32, 0),
+    overworld_frame(gEventObjectPic_LumBerryTree, 16, 32, 1),
+    overworld_frame(gEventObjectPic_LumBerryTree, 16, 32, 2),
+    overworld_frame(gEventObjectPic_LumBerryTree, 16, 32, 3),
+    overworld_frame(gEventObjectPic_LumBerryTree, 16, 32, 4),
+    overworld_frame(gEventObjectPic_LumBerryTree, 16, 32, 5),
 };
 
 const u8 gBerryTreePaletteSlotTable_Lum[] = {3, 4, 4, 4, 4};
 
 const struct SpriteFrameImage gEventObjectPicTable_RazzBerryTree[] = {
-    obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile),
-    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0),
-    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1),
-    obj_frame_tiles(gEventObjectPic_RazzBerryTree_0),
-    obj_frame_tiles(gEventObjectPic_RazzBerryTree_1),
-    obj_frame_tiles(gEventObjectPic_RazzBerryTree_2),
-    obj_frame_tiles(gEventObjectPic_RazzBerryTree_3),
-    obj_frame_tiles(gEventObjectPic_RazzBerryTree_4),
-    obj_frame_tiles(gEventObjectPic_RazzBerryTree_5),
+    overworld_frame(gEventObjectPic_BerryTreeDirtPile, 16, 16, 0),
+    overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 0),
+    overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 1),
+    overworld_frame(gEventObjectPic_RazzBerryTree, 16, 32, 0),
+    overworld_frame(gEventObjectPic_RazzBerryTree, 16, 32, 1),
+    overworld_frame(gEventObjectPic_RazzBerryTree, 16, 32, 2),
+    overworld_frame(gEventObjectPic_RazzBerryTree, 16, 32, 3),
+    overworld_frame(gEventObjectPic_RazzBerryTree, 16, 32, 4),
+    overworld_frame(gEventObjectPic_RazzBerryTree, 16, 32, 5),
 };
 
 const u8 gBerryTreePaletteSlotTable_Razz[] = {3, 4, 4, 4, 4};
 
 const struct SpriteFrameImage gEventObjectPicTable_GrepaBerryTree[] = {
-    obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile),
-    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0),
-    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1),
-    obj_frame_tiles(gEventObjectPic_GrepaBerryTree_0),
-    obj_frame_tiles(gEventObjectPic_GrepaBerryTree_1),
-    obj_frame_tiles(gEventObjectPic_GrepaBerryTree_2),
-    obj_frame_tiles(gEventObjectPic_GrepaBerryTree_3),
-    obj_frame_tiles(gEventObjectPic_GrepaBerryTree_4),
-    obj_frame_tiles(gEventObjectPic_GrepaBerryTree_5),
+    overworld_frame(gEventObjectPic_BerryTreeDirtPile, 16, 16, 0),
+    overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 0),
+    overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 1),
+    overworld_frame(gEventObjectPic_GrepaBerryTree, 16, 32, 0),
+    overworld_frame(gEventObjectPic_GrepaBerryTree, 16, 32, 1),
+    overworld_frame(gEventObjectPic_GrepaBerryTree, 16, 32, 2),
+    overworld_frame(gEventObjectPic_GrepaBerryTree, 16, 32, 3),
+    overworld_frame(gEventObjectPic_GrepaBerryTree, 16, 32, 4),
+    overworld_frame(gEventObjectPic_GrepaBerryTree, 16, 32, 5),
 };
 
 const u8 gBerryTreePaletteSlotTable_Grepa[] = {3, 4, 3, 3, 3};
 
 const struct SpriteFrameImage gEventObjectPicTable_RabutaBerryTree[] = {
-    obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile),
-    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0),
-    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1),
-    obj_frame_tiles(gEventObjectPic_RabutaBerryTree_0),
-    obj_frame_tiles(gEventObjectPic_RabutaBerryTree_1),
-    obj_frame_tiles(gEventObjectPic_RabutaBerryTree_2),
-    obj_frame_tiles(gEventObjectPic_RabutaBerryTree_3),
-    obj_frame_tiles(gEventObjectPic_RabutaBerryTree_4),
-    obj_frame_tiles(gEventObjectPic_RabutaBerryTree_5),
+    overworld_frame(gEventObjectPic_BerryTreeDirtPile, 16, 16, 0),
+    overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 0),
+    overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 1),
+    overworld_frame(gEventObjectPic_RabutaBerryTree, 16, 32, 0),
+    overworld_frame(gEventObjectPic_RabutaBerryTree, 16, 32, 1),
+    overworld_frame(gEventObjectPic_RabutaBerryTree, 16, 32, 2),
+    overworld_frame(gEventObjectPic_RabutaBerryTree, 16, 32, 3),
+    overworld_frame(gEventObjectPic_RabutaBerryTree, 16, 32, 4),
+    overworld_frame(gEventObjectPic_RabutaBerryTree, 16, 32, 5),
 };
 
 const u8 gBerryTreePaletteSlotTable_Rabuta[] = {3, 4, 4, 4, 4};
 
 const struct SpriteFrameImage gEventObjectPicTable_NomelBerryTree[] = {
-    obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile),
-    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0),
-    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1),
-    obj_frame_tiles(gEventObjectPic_NomelBerryTree_0),
-    obj_frame_tiles(gEventObjectPic_NomelBerryTree_1),
-    obj_frame_tiles(gEventObjectPic_NomelBerryTree_2),
-    obj_frame_tiles(gEventObjectPic_NomelBerryTree_3),
-    obj_frame_tiles(gEventObjectPic_NomelBerryTree_4),
-    obj_frame_tiles(gEventObjectPic_NomelBerryTree_5),
+    overworld_frame(gEventObjectPic_BerryTreeDirtPile, 16, 16, 0),
+    overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 0),
+    overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 1),
+    overworld_frame(gEventObjectPic_NomelBerryTree, 16, 32, 0),
+    overworld_frame(gEventObjectPic_NomelBerryTree, 16, 32, 1),
+    overworld_frame(gEventObjectPic_NomelBerryTree, 16, 32, 2),
+    overworld_frame(gEventObjectPic_NomelBerryTree, 16, 32, 3),
+    overworld_frame(gEventObjectPic_NomelBerryTree, 16, 32, 4),
+    overworld_frame(gEventObjectPic_NomelBerryTree, 16, 32, 5),
 };
 
 const u8 gBerryTreePaletteSlotTable_Nomel[] = {3, 4, 3, 3, 3};
 
 const struct SpriteFrameImage gEventObjectPicTable_LeppaBerryTree[] = {
-    obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile),
-    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0),
-    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1),
-    obj_frame_tiles(gEventObjectPic_LeppaBerryTree_0),
-    obj_frame_tiles(gEventObjectPic_LeppaBerryTree_1),
-    obj_frame_tiles(gEventObjectPic_LeppaBerryTree_2),
-    obj_frame_tiles(gEventObjectPic_LeppaBerryTree_3),
-    obj_frame_tiles(gEventObjectPic_LeppaBerryTree_4),
-    obj_frame_tiles(gEventObjectPic_LeppaBerryTree_5),
+    overworld_frame(gEventObjectPic_BerryTreeDirtPile, 16, 16, 0),
+    overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 0),
+    overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 1),
+    overworld_frame(gEventObjectPic_LeppaBerryTree, 16, 32, 0),
+    overworld_frame(gEventObjectPic_LeppaBerryTree, 16, 32, 1),
+    overworld_frame(gEventObjectPic_LeppaBerryTree, 16, 32, 2),
+    overworld_frame(gEventObjectPic_LeppaBerryTree, 16, 32, 3),
+    overworld_frame(gEventObjectPic_LeppaBerryTree, 16, 32, 4),
+    overworld_frame(gEventObjectPic_LeppaBerryTree, 16, 32, 5),
 };
 
 const u8 gBerryTreePaletteSlotTable_Leppa[] = {3, 4, 3, 3, 3};
 
 const struct SpriteFrameImage gEventObjectPicTable_LiechiBerryTree[] = {
-    obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile),
-    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0),
-    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1),
-    obj_frame_tiles(gEventObjectPic_LiechiBerryTree_0),
-    obj_frame_tiles(gEventObjectPic_LiechiBerryTree_1),
-    obj_frame_tiles(gEventObjectPic_LiechiBerryTree_2),
-    obj_frame_tiles(gEventObjectPic_LiechiBerryTree_3),
-    obj_frame_tiles(gEventObjectPic_LiechiBerryTree_4),
-    obj_frame_tiles(gEventObjectPic_LiechiBerryTree_5),
+    overworld_frame(gEventObjectPic_BerryTreeDirtPile, 16, 16, 0),
+    overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 0),
+    overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 1),
+    overworld_frame(gEventObjectPic_LiechiBerryTree, 16, 32, 0),
+    overworld_frame(gEventObjectPic_LiechiBerryTree, 16, 32, 1),
+    overworld_frame(gEventObjectPic_LiechiBerryTree, 16, 32, 2),
+    overworld_frame(gEventObjectPic_LiechiBerryTree, 16, 32, 3),
+    overworld_frame(gEventObjectPic_LiechiBerryTree, 16, 32, 4),
+    overworld_frame(gEventObjectPic_LiechiBerryTree, 16, 32, 5),
 };
 
 const u8 gBerryTreePaletteSlotTable_Liechi[] = {3, 4, 4, 4, 4};
 
 const struct SpriteFrameImage gEventObjectPicTable_HondewBerryTree[] = {
-    obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile),
-    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0),
-    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1),
-    obj_frame_tiles(gEventObjectPic_HondewBerryTree_0),
-    obj_frame_tiles(gEventObjectPic_HondewBerryTree_1),
-    obj_frame_tiles(gEventObjectPic_HondewBerryTree_2),
-    obj_frame_tiles(gEventObjectPic_HondewBerryTree_3),
-    obj_frame_tiles(gEventObjectPic_HondewBerryTree_4),
-    obj_frame_tiles(gEventObjectPic_HondewBerryTree_5),
+    overworld_frame(gEventObjectPic_BerryTreeDirtPile, 16, 16, 0),
+    overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 0),
+    overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 1),
+    overworld_frame(gEventObjectPic_HondewBerryTree, 16, 32, 0),
+    overworld_frame(gEventObjectPic_HondewBerryTree, 16, 32, 1),
+    overworld_frame(gEventObjectPic_HondewBerryTree, 16, 32, 2),
+    overworld_frame(gEventObjectPic_HondewBerryTree, 16, 32, 3),
+    overworld_frame(gEventObjectPic_HondewBerryTree, 16, 32, 4),
+    overworld_frame(gEventObjectPic_HondewBerryTree, 16, 32, 5),
 };
 
 const u8 gBerryTreePaletteSlotTable_Hondew[] = {3, 4, 5, 5, 5};
 
 const struct SpriteFrameImage gEventObjectPicTable_AguavBerryTree[] = {
-    obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile),
-    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0),
-    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1),
-    obj_frame_tiles(gEventObjectPic_AguavBerryTree_0),
-    obj_frame_tiles(gEventObjectPic_AguavBerryTree_1),
-    obj_frame_tiles(gEventObjectPic_AguavBerryTree_2),
-    obj_frame_tiles(gEventObjectPic_AguavBerryTree_3),
-    obj_frame_tiles(gEventObjectPic_AguavBerryTree_4),
-    obj_frame_tiles(gEventObjectPic_AguavBerryTree_5),
+    overworld_frame(gEventObjectPic_BerryTreeDirtPile, 16, 16, 0),
+    overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 0),
+    overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 1),
+    overworld_frame(gEventObjectPic_AguavBerryTree, 16, 32, 0),
+    overworld_frame(gEventObjectPic_AguavBerryTree, 16, 32, 1),
+    overworld_frame(gEventObjectPic_AguavBerryTree, 16, 32, 2),
+    overworld_frame(gEventObjectPic_AguavBerryTree, 16, 32, 3),
+    overworld_frame(gEventObjectPic_AguavBerryTree, 16, 32, 4),
+    overworld_frame(gEventObjectPic_AguavBerryTree, 16, 32, 5),
 };
 
 const u8 gBerryTreePaletteSlotTable_Aguav[] = {3, 4, 4, 4, 4};
 
 const struct SpriteFrameImage gEventObjectPicTable_WikiBerryTree[] = {
-    obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile),
-    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0),
-    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1),
-    obj_frame_tiles(gEventObjectPic_WikiBerryTree_0),
-    obj_frame_tiles(gEventObjectPic_WikiBerryTree_1),
-    obj_frame_tiles(gEventObjectPic_WikiBerryTree_2),
-    obj_frame_tiles(gEventObjectPic_WikiBerryTree_3),
-    obj_frame_tiles(gEventObjectPic_WikiBerryTree_4),
-    obj_frame_tiles(gEventObjectPic_WikiBerryTree_5),
+    overworld_frame(gEventObjectPic_BerryTreeDirtPile, 16, 16, 0),
+    overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 0),
+    overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 1),
+    overworld_frame(gEventObjectPic_WikiBerryTree, 16, 32, 0),
+    overworld_frame(gEventObjectPic_WikiBerryTree, 16, 32, 1),
+    overworld_frame(gEventObjectPic_WikiBerryTree, 16, 32, 2),
+    overworld_frame(gEventObjectPic_WikiBerryTree, 16, 32, 3),
+    overworld_frame(gEventObjectPic_WikiBerryTree, 16, 32, 4),
+    overworld_frame(gEventObjectPic_WikiBerryTree, 16, 32, 5),
 };
 
 const u8 gBerryTreePaletteSlotTable_Wiki[] = {3, 4, 3, 3, 3};
 
 const struct SpriteFrameImage gEventObjectPicTable_PomegBerryTree[] = {
-    obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile),
-    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0),
-    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1),
-    obj_frame_tiles(gEventObjectPic_PomegBerryTree_0),
-    obj_frame_tiles(gEventObjectPic_PomegBerryTree_1),
-    obj_frame_tiles(gEventObjectPic_PomegBerryTree_2),
-    obj_frame_tiles(gEventObjectPic_PomegBerryTree_3),
-    obj_frame_tiles(gEventObjectPic_PomegBerryTree_4),
-    obj_frame_tiles(gEventObjectPic_PomegBerryTree_5),
+    overworld_frame(gEventObjectPic_BerryTreeDirtPile, 16, 16, 0),
+    overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 0),
+    overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 1),
+    overworld_frame(gEventObjectPic_PomegBerryTree, 16, 32, 0),
+    overworld_frame(gEventObjectPic_PomegBerryTree, 16, 32, 1),
+    overworld_frame(gEventObjectPic_PomegBerryTree, 16, 32, 2),
+    overworld_frame(gEventObjectPic_PomegBerryTree, 16, 32, 3),
+    overworld_frame(gEventObjectPic_PomegBerryTree, 16, 32, 4),
+    overworld_frame(gEventObjectPic_PomegBerryTree, 16, 32, 5),
 };
 
 const u8 gBerryTreePaletteSlotTable_Pomeg[] = {3, 4, 3, 3, 3};
 
 const struct SpriteFrameImage gEventObjectPicTable_RawstBerryTree[] = {
-    obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile),
-    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0),
-    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1),
-    obj_frame_tiles(gEventObjectPic_RawstBerryTree_0),
-    obj_frame_tiles(gEventObjectPic_RawstBerryTree_1),
-    obj_frame_tiles(gEventObjectPic_RawstBerryTree_2),
-    obj_frame_tiles(gEventObjectPic_RawstBerryTree_3),
-    obj_frame_tiles(gEventObjectPic_RawstBerryTree_4),
-    obj_frame_tiles(gEventObjectPic_RawstBerryTree_5),
+    overworld_frame(gEventObjectPic_BerryTreeDirtPile, 16, 16, 0),
+    overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 0),
+    overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 1),
+    overworld_frame(gEventObjectPic_RawstBerryTree, 16, 32, 0),
+    overworld_frame(gEventObjectPic_RawstBerryTree, 16, 32, 1),
+    overworld_frame(gEventObjectPic_RawstBerryTree, 16, 32, 2),
+    overworld_frame(gEventObjectPic_RawstBerryTree, 16, 32, 3),
+    overworld_frame(gEventObjectPic_RawstBerryTree, 16, 32, 4),
+    overworld_frame(gEventObjectPic_RawstBerryTree, 16, 32, 5),
 };
 
 const u8 gBerryTreePaletteSlotTable_Rawst[] = {3, 4, 4, 4, 4};
 
 const struct SpriteFrameImage gEventObjectPicTable_SpelonBerryTree[] = {
-    obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile),
-    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0),
-    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1),
-    obj_frame_tiles(gEventObjectPic_SpelonBerryTree_0),
-    obj_frame_tiles(gEventObjectPic_SpelonBerryTree_1),
-    obj_frame_tiles(gEventObjectPic_SpelonBerryTree_2),
-    obj_frame_tiles(gEventObjectPic_SpelonBerryTree_3),
-    obj_frame_tiles(gEventObjectPic_SpelonBerryTree_4),
-    obj_frame_tiles(gEventObjectPic_SpelonBerryTree_5),
+    overworld_frame(gEventObjectPic_BerryTreeDirtPile, 16, 16, 0),
+    overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 0),
+    overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 1),
+    overworld_frame(gEventObjectPic_SpelonBerryTree, 16, 32, 0),
+    overworld_frame(gEventObjectPic_SpelonBerryTree, 16, 32, 1),
+    overworld_frame(gEventObjectPic_SpelonBerryTree, 16, 32, 2),
+    overworld_frame(gEventObjectPic_SpelonBerryTree, 16, 32, 3),
+    overworld_frame(gEventObjectPic_SpelonBerryTree, 16, 32, 4),
+    overworld_frame(gEventObjectPic_SpelonBerryTree, 16, 32, 5),
 };
 
 const u8 gBerryTreePaletteSlotTable_Spelon[] = {3, 4, 3, 3, 3};
 
 const struct SpriteFrameImage gEventObjectPicTable_ChestoBerryTree[] = {
-    obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile),
-    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0),
-    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1),
-    obj_frame_tiles(gEventObjectPic_ChestoBerryTree_0),
-    obj_frame_tiles(gEventObjectPic_ChestoBerryTree_1),
-    obj_frame_tiles(gEventObjectPic_ChestoBerryTree_2),
-    obj_frame_tiles(gEventObjectPic_ChestoBerryTree_3),
-    obj_frame_tiles(gEventObjectPic_ChestoBerryTree_4),
-    obj_frame_tiles(gEventObjectPic_ChestoBerryTree_5),
+    overworld_frame(gEventObjectPic_BerryTreeDirtPile, 16, 16, 0),
+    overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 0),
+    overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 1),
+    overworld_frame(gEventObjectPic_ChestoBerryTree, 16, 32, 0),
+    overworld_frame(gEventObjectPic_ChestoBerryTree, 16, 32, 1),
+    overworld_frame(gEventObjectPic_ChestoBerryTree, 16, 32, 2),
+    overworld_frame(gEventObjectPic_ChestoBerryTree, 16, 32, 3),
+    overworld_frame(gEventObjectPic_ChestoBerryTree, 16, 32, 4),
+    overworld_frame(gEventObjectPic_ChestoBerryTree, 16, 32, 5),
 };
 
 const u8 gBerryTreePaletteSlotTable_Chesto[] = {3, 4, 2, 2, 2};
 
 const struct SpriteFrameImage gEventObjectPicTable_OranBerryTree[] = {
-    obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile),
-    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0),
-    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1),
-    obj_frame_tiles(gEventObjectPic_OranBerryTree_0),
-    obj_frame_tiles(gEventObjectPic_OranBerryTree_1),
-    obj_frame_tiles(gEventObjectPic_OranBerryTree_2),
-    obj_frame_tiles(gEventObjectPic_OranBerryTree_3),
-    obj_frame_tiles(gEventObjectPic_OranBerryTree_4),
-    obj_frame_tiles(gEventObjectPic_OranBerryTree_5),
+    overworld_frame(gEventObjectPic_BerryTreeDirtPile, 16, 16, 0),
+    overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 0),
+    overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 1),
+    overworld_frame(gEventObjectPic_OranBerryTree, 16, 32, 0),
+    overworld_frame(gEventObjectPic_OranBerryTree, 16, 32, 1),
+    overworld_frame(gEventObjectPic_OranBerryTree, 16, 32, 2),
+    overworld_frame(gEventObjectPic_OranBerryTree, 16, 32, 3),
+    overworld_frame(gEventObjectPic_OranBerryTree, 16, 32, 4),
+    overworld_frame(gEventObjectPic_OranBerryTree, 16, 32, 5),
 };
 
 const u8 gBerryTreePaletteSlotTable_Oran[] = {3, 4, 2, 2, 2};
 
 const struct SpriteFrameImage gEventObjectPicTable_PersimBerryTree[] = {
-    obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile),
-    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0),
-    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1),
-    obj_frame_tiles(gEventObjectPic_PersimBerryTree_0),
-    obj_frame_tiles(gEventObjectPic_PersimBerryTree_1),
-    obj_frame_tiles(gEventObjectPic_PersimBerryTree_2),
-    obj_frame_tiles(gEventObjectPic_PersimBerryTree_3),
-    obj_frame_tiles(gEventObjectPic_PersimBerryTree_4),
-    obj_frame_tiles(gEventObjectPic_PersimBerryTree_5),
+    overworld_frame(gEventObjectPic_BerryTreeDirtPile, 16, 16, 0),
+    overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 0),
+    overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 1),
+    overworld_frame(gEventObjectPic_PersimBerryTree, 16, 32, 0),
+    overworld_frame(gEventObjectPic_PersimBerryTree, 16, 32, 1),
+    overworld_frame(gEventObjectPic_PersimBerryTree, 16, 32, 2),
+    overworld_frame(gEventObjectPic_PersimBerryTree, 16, 32, 3),
+    overworld_frame(gEventObjectPic_PersimBerryTree, 16, 32, 4),
+    overworld_frame(gEventObjectPic_PersimBerryTree, 16, 32, 5),
 };
 
 const u8 gBerryTreePaletteSlotTable_Persim[] = {3, 4, 2, 2, 2};
 
 const struct SpriteFrameImage gEventObjectPicTable_SitrusBerryTree[] = {
-    obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile),
-    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0),
-    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1),
-    obj_frame_tiles(gEventObjectPic_SitrusBerryTree_0),
-    obj_frame_tiles(gEventObjectPic_SitrusBerryTree_1),
-    obj_frame_tiles(gEventObjectPic_SitrusBerryTree_2),
-    obj_frame_tiles(gEventObjectPic_SitrusBerryTree_3),
-    obj_frame_tiles(gEventObjectPic_SitrusBerryTree_4),
-    obj_frame_tiles(gEventObjectPic_SitrusBerryTree_5),
+    overworld_frame(gEventObjectPic_BerryTreeDirtPile, 16, 16, 0),
+    overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 0),
+    overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 1),
+    overworld_frame(gEventObjectPic_SitrusBerryTree, 16, 32, 0),
+    overworld_frame(gEventObjectPic_SitrusBerryTree, 16, 32, 1),
+    overworld_frame(gEventObjectPic_SitrusBerryTree, 16, 32, 2),
+    overworld_frame(gEventObjectPic_SitrusBerryTree, 16, 32, 3),
+    overworld_frame(gEventObjectPic_SitrusBerryTree, 16, 32, 4),
+    overworld_frame(gEventObjectPic_SitrusBerryTree, 16, 32, 5),
 };
 
 const u8 gBerryTreePaletteSlotTable_Sitrus[] = {3, 4, 4, 4, 4};
 
 const struct SpriteFrameImage gEventObjectPicTable_AspearBerryTree[] = {
-    obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile),
-    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0),
-    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1),
-    obj_frame_tiles(gEventObjectPic_AspearBerryTree_0),
-    obj_frame_tiles(gEventObjectPic_AspearBerryTree_1),
-    obj_frame_tiles(gEventObjectPic_AspearBerryTree_2),
-    obj_frame_tiles(gEventObjectPic_AspearBerryTree_3),
-    obj_frame_tiles(gEventObjectPic_AspearBerryTree_4),
-    obj_frame_tiles(gEventObjectPic_AspearBerryTree_5),
+    overworld_frame(gEventObjectPic_BerryTreeDirtPile, 16, 16, 0),
+    overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 0),
+    overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 1),
+    overworld_frame(gEventObjectPic_AspearBerryTree, 16, 32, 0),
+    overworld_frame(gEventObjectPic_AspearBerryTree, 16, 32, 1),
+    overworld_frame(gEventObjectPic_AspearBerryTree, 16, 32, 2),
+    overworld_frame(gEventObjectPic_AspearBerryTree, 16, 32, 3),
+    overworld_frame(gEventObjectPic_AspearBerryTree, 16, 32, 4),
+    overworld_frame(gEventObjectPic_AspearBerryTree, 16, 32, 5),
 };
 
 const u8 gBerryTreePaletteSlotTable_Aspear[] = {3, 4, 3, 3, 3};
 
 const struct SpriteFrameImage gEventObjectPicTable_PamtreBerryTree[] = {
-    obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile),
-    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0),
-    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1),
-    obj_frame_tiles(gEventObjectPic_PamtreBerryTree_0),
-    obj_frame_tiles(gEventObjectPic_PamtreBerryTree_1),
-    obj_frame_tiles(gEventObjectPic_PamtreBerryTree_2),
-    obj_frame_tiles(gEventObjectPic_PamtreBerryTree_3),
-    obj_frame_tiles(gEventObjectPic_PamtreBerryTree_4),
-    obj_frame_tiles(gEventObjectPic_PamtreBerryTree_5),
+    overworld_frame(gEventObjectPic_BerryTreeDirtPile, 16, 16, 0),
+    overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 0),
+    overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 1),
+    overworld_frame(gEventObjectPic_PamtreBerryTree, 16, 32, 0),
+    overworld_frame(gEventObjectPic_PamtreBerryTree, 16, 32, 1),
+    overworld_frame(gEventObjectPic_PamtreBerryTree, 16, 32, 2),
+    overworld_frame(gEventObjectPic_PamtreBerryTree, 16, 32, 3),
+    overworld_frame(gEventObjectPic_PamtreBerryTree, 16, 32, 4),
+    overworld_frame(gEventObjectPic_PamtreBerryTree, 16, 32, 5),
 };
 
 const u8 gBerryTreePaletteSlotTable_Pamtre[] = {3, 4, 2, 2, 2};
 
 const struct SpriteFrameImage gEventObjectPicTable_CornnBerryTree[] = {
-    obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile),
-    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0),
-    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1),
-    obj_frame_tiles(gEventObjectPic_CornnBerryTree_0),
-    obj_frame_tiles(gEventObjectPic_CornnBerryTree_1),
-    obj_frame_tiles(gEventObjectPic_CornnBerryTree_2),
-    obj_frame_tiles(gEventObjectPic_CornnBerryTree_3),
-    obj_frame_tiles(gEventObjectPic_CornnBerryTree_4),
-    obj_frame_tiles(gEventObjectPic_CornnBerryTree_5),
+    overworld_frame(gEventObjectPic_BerryTreeDirtPile, 16, 16, 0),
+    overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 0),
+    overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 1),
+    overworld_frame(gEventObjectPic_CornnBerryTree, 16, 32, 0),
+    overworld_frame(gEventObjectPic_CornnBerryTree, 16, 32, 1),
+    overworld_frame(gEventObjectPic_CornnBerryTree, 16, 32, 2),
+    overworld_frame(gEventObjectPic_CornnBerryTree, 16, 32, 3),
+    overworld_frame(gEventObjectPic_CornnBerryTree, 16, 32, 4),
+    overworld_frame(gEventObjectPic_CornnBerryTree, 16, 32, 5),
 };
 
 const u8 gBerryTreePaletteSlotTable_Cornn[] = {3, 4, 2, 2, 2};
 
 const struct SpriteFrameImage gEventObjectPicTable_LansatBerryTree[] = {
-    obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile),
-    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0),
-    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1),
-    obj_frame_tiles(gEventObjectPic_LansatBerryTree_0),
-    obj_frame_tiles(gEventObjectPic_LansatBerryTree_1),
-    obj_frame_tiles(gEventObjectPic_LansatBerryTree_2),
-    obj_frame_tiles(gEventObjectPic_LansatBerryTree_3),
-    obj_frame_tiles(gEventObjectPic_LansatBerryTree_4),
-    obj_frame_tiles(gEventObjectPic_LansatBerryTree_5),
+    overworld_frame(gEventObjectPic_BerryTreeDirtPile, 16, 16, 0),
+    overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 0),
+    overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 1),
+    overworld_frame(gEventObjectPic_LansatBerryTree, 16, 32, 0),
+    overworld_frame(gEventObjectPic_LansatBerryTree, 16, 32, 1),
+    overworld_frame(gEventObjectPic_LansatBerryTree, 16, 32, 2),
+    overworld_frame(gEventObjectPic_LansatBerryTree, 16, 32, 3),
+    overworld_frame(gEventObjectPic_LansatBerryTree, 16, 32, 4),
+    overworld_frame(gEventObjectPic_LansatBerryTree, 16, 32, 5),
 };
 
 const u8 gBerryTreePaletteSlotTable_Lansat[] = {3, 4, 2, 2, 2};
 
 const struct SpriteFrameImage gEventObjectPicTable_DurinBerryTree[] = {
-    obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile),
-    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0),
-    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1),
-    obj_frame_tiles(gEventObjectPic_DurinBerryTree_0),
-    obj_frame_tiles(gEventObjectPic_DurinBerryTree_1),
-    obj_frame_tiles(gEventObjectPic_DurinBerryTree_2),
-    obj_frame_tiles(gEventObjectPic_DurinBerryTree_3),
-    obj_frame_tiles(gEventObjectPic_DurinBerryTree_4),
-    obj_frame_tiles(gEventObjectPic_DurinBerryTree_5),
+    overworld_frame(gEventObjectPic_BerryTreeDirtPile, 16, 16, 0),
+    overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 0),
+    overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 1),
+    overworld_frame(gEventObjectPic_DurinBerryTree, 16, 32, 0),
+    overworld_frame(gEventObjectPic_DurinBerryTree, 16, 32, 1),
+    overworld_frame(gEventObjectPic_DurinBerryTree, 16, 32, 2),
+    overworld_frame(gEventObjectPic_DurinBerryTree, 16, 32, 3),
+    overworld_frame(gEventObjectPic_DurinBerryTree, 16, 32, 4),
+    overworld_frame(gEventObjectPic_DurinBerryTree, 16, 32, 5),
 };
 
 const u8 gBerryTreePaletteSlotTable_Durin[] = {3, 4, 4, 4, 4};
 
 const struct SpriteFrameImage gEventObjectPicTable_TamatoBerryTree[] = {
-    obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile),
-    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0),
-    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1),
-    obj_frame_tiles(gEventObjectPic_TamatoBerryTree_0),
-    obj_frame_tiles(gEventObjectPic_TamatoBerryTree_1),
-    obj_frame_tiles(gEventObjectPic_TamatoBerryTree_2),
-    obj_frame_tiles(gEventObjectPic_TamatoBerryTree_3),
-    obj_frame_tiles(gEventObjectPic_TamatoBerryTree_4),
-    obj_frame_tiles(gEventObjectPic_TamatoBerryTree_5),
+    overworld_frame(gEventObjectPic_BerryTreeDirtPile, 16, 16, 0),
+    overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 0),
+    overworld_frame(gEventObjectPic_BerryTreeSprout, 16, 16, 1),
+    overworld_frame(gEventObjectPic_TamatoBerryTree, 16, 32, 0),
+    overworld_frame(gEventObjectPic_TamatoBerryTree, 16, 32, 1),
+    overworld_frame(gEventObjectPic_TamatoBerryTree, 16, 32, 2),
+    overworld_frame(gEventObjectPic_TamatoBerryTree, 16, 32, 3),
+    overworld_frame(gEventObjectPic_TamatoBerryTree, 16, 32, 4),
+    overworld_frame(gEventObjectPic_TamatoBerryTree, 16, 32, 5),
 };
 
 const u8 gBerryTreePaletteSlotTable_Tamato[] = {3, 4, 2, 2, 2};
diff --git a/src/data/field_event_obj/event_object_graphics.h b/src/data/field_event_obj/event_object_graphics.h
index b226b066af..522f14db40 100755
--- a/src/data/field_event_obj/event_object_graphics.h
+++ b/src/data/field_event_obj/event_object_graphics.h
@@ -1,43 +1,11 @@
 #ifndef GUARD_EVENT_OBJECT_GFX_H
 #define GUARD_EVENT_OBJECT_GFX_H
 
-const u32 gEventObjectPic_BrendanNormal_0[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/normal/00.4bpp");
-const u32 gEventObjectPic_BrendanNormal_1[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/normal/01.4bpp");
-const u32 gEventObjectPic_BrendanNormal_2[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/normal/02.4bpp");
-const u32 gEventObjectPic_BrendanNormal_3[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/normal/03.4bpp");
-const u32 gEventObjectPic_BrendanNormal_4[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/normal/04.4bpp");
-const u32 gEventObjectPic_BrendanNormal_5[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/normal/05.4bpp");
-const u32 gEventObjectPic_BrendanNormal_6[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/normal/06.4bpp");
-const u32 gEventObjectPic_BrendanNormal_7[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/normal/07.4bpp");
-const u32 gEventObjectPic_BrendanNormal_8[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/normal/08.4bpp");
-const u32 gEventObjectPic_BrendanNormal_9[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/normal/09.4bpp");
-const u32 gEventObjectPic_BrendanNormal_10[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/normal/10.4bpp");
-const u32 gEventObjectPic_BrendanNormal_11[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/normal/11.4bpp");
-const u32 gEventObjectPic_BrendanNormal_12[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/normal/12.4bpp");
-const u32 gEventObjectPic_BrendanNormal_13[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/normal/13.4bpp");
-const u32 gEventObjectPic_BrendanNormal_14[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/normal/14.4bpp");
-const u32 gEventObjectPic_BrendanNormal_15[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/normal/15.4bpp");
-const u32 gEventObjectPic_BrendanNormal_16[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/normal/16.4bpp");
-const u32 gEventObjectPic_BrendanNormal_17[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/normal/17.4bpp");
+const u32 gEventObjectPic_BrendanNormal[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/walking.4bpp");
+const u32 gEventObjectPic_BrendanRunning[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/running.4bpp");
 const u16 gEventObjectPalette8[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_08.gbapal");
-const u32 gEventObjectPic_RubySapphireBrendan_0[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_brendan/00.4bpp");
-const u32 gEventObjectPic_RubySapphireBrendan_1[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_brendan/01.4bpp");
-const u32 gEventObjectPic_RubySapphireBrendan_2[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_brendan/02.4bpp");
-const u32 gEventObjectPic_RubySapphireBrendan_3[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_brendan/03.4bpp");
-const u32 gEventObjectPic_RubySapphireBrendan_4[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_brendan/04.4bpp");
-const u32 gEventObjectPic_RubySapphireBrendan_5[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_brendan/05.4bpp");
-const u32 gEventObjectPic_RubySapphireBrendan_6[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_brendan/06.4bpp");
-const u32 gEventObjectPic_RubySapphireBrendan_7[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_brendan/07.4bpp");
-const u32 gEventObjectPic_RubySapphireBrendan_8[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_brendan/08.4bpp");
-const u32 gEventObjectPic_RubySapphireBrendan_9[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_brendan/09.4bpp");
-const u32 gEventObjectPic_RubySapphireBrendan_10[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_brendan/10.4bpp");
-const u32 gEventObjectPic_RubySapphireBrendan_11[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_brendan/11.4bpp");
-const u32 gEventObjectPic_RubySapphireBrendan_12[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_brendan/12.4bpp");
-const u32 gEventObjectPic_RubySapphireBrendan_13[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_brendan/13.4bpp");
-const u32 gEventObjectPic_RubySapphireBrendan_14[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_brendan/14.4bpp");
-const u32 gEventObjectPic_RubySapphireBrendan_15[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_brendan/15.4bpp");
-const u32 gEventObjectPic_RubySapphireBrendan_16[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_brendan/16.4bpp");
-const u32 gEventObjectPic_RubySapphireBrendan_17[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_brendan/17.4bpp");
+const u32 gEventObjectPic_RubySapphireBrendanNormal[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_brendan/walking.4bpp");
+const u32 gEventObjectPic_RubySapphireBrendanRunning[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_brendan/running.4bpp");
 const u16 gEventObjectPalette33[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_33.gbapal");
 const u16 NullPalette_8499A38[16] = {};
 const u16 NullPalette_8499A58[16] = {};
@@ -56,120 +24,23 @@ const u16 NullPalette_8499BD8[16] = {};
 const u16 NullPalette_8499BF8[16] = {};
 const u16 gEventObjectPalette9[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_09.gbapal");
 const u16 gEventObjectPalette10[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_10.gbapal");
-const u32 gEventObjectPic_BrendanFieldMove_0[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/field_move/0.4bpp");
-const u32 gEventObjectPic_BrendanFieldMove_1[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/field_move/1.4bpp");
-const u32 gEventObjectPic_BrendanFieldMove_2[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/field_move/2.4bpp");
-const u32 gEventObjectPic_BrendanFieldMove_3[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/field_move/3.4bpp");
-const u32 gEventObjectPic_BrendanFieldMove_4[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/field_move/4.4bpp");
-const u32 gEventObjectPic_BrendanSurfing_0[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/surfing/0.4bpp");
-const u32 gEventObjectPic_BrendanSurfing_3[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/surfing/3.4bpp");
-const u32 gEventObjectPic_BrendanSurfing_1[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/surfing/1.4bpp");
-const u32 gEventObjectPic_BrendanSurfing_4[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/surfing/4.4bpp");
-const u32 gEventObjectPic_BrendanSurfing_2[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/surfing/2.4bpp");
-const u32 gEventObjectPic_BrendanSurfing_5[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/surfing/5.4bpp");
-const u32 gEventObjectPic_BrendanMachBike_0[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/mach_bike/0.4bpp");
-const u32 gEventObjectPic_BrendanMachBike_1[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/mach_bike/1.4bpp");
-const u32 gEventObjectPic_BrendanMachBike_2[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/mach_bike/2.4bpp");
-const u32 gEventObjectPic_BrendanMachBike_3[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/mach_bike/3.4bpp");
-const u32 gEventObjectPic_BrendanMachBike_4[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/mach_bike/4.4bpp");
-const u32 gEventObjectPic_BrendanMachBike_5[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/mach_bike/5.4bpp");
-const u32 gEventObjectPic_BrendanMachBike_6[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/mach_bike/6.4bpp");
-const u32 gEventObjectPic_BrendanMachBike_7[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/mach_bike/7.4bpp");
-const u32 gEventObjectPic_BrendanMachBike_8[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/mach_bike/8.4bpp");
-const u32 gEventObjectPic_BrendanAcroBike_0[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/00.4bpp");
-const u32 gEventObjectPic_BrendanAcroBike_1[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/01.4bpp");
-const u32 gEventObjectPic_BrendanAcroBike_2[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/02.4bpp");
-const u32 gEventObjectPic_BrendanAcroBike_3[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/03.4bpp");
-const u32 gEventObjectPic_BrendanAcroBike_4[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/04.4bpp");
-const u32 gEventObjectPic_BrendanAcroBike_5[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/05.4bpp");
-const u32 gEventObjectPic_BrendanAcroBike_6[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/06.4bpp");
-const u32 gEventObjectPic_BrendanAcroBike_7[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/07.4bpp");
-const u32 gEventObjectPic_BrendanAcroBike_8[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/08.4bpp");
-const u32 gEventObjectPic_BrendanAcroBike_9[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/09.4bpp");
-const u32 gEventObjectPic_BrendanAcroBike_10[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/10.4bpp");
-const u32 gEventObjectPic_BrendanAcroBike_11[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/11.4bpp");
-const u32 gEventObjectPic_BrendanAcroBike_12[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/12.4bpp");
-const u32 gEventObjectPic_BrendanAcroBike_13[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/13.4bpp");
-const u32 gEventObjectPic_BrendanAcroBike_14[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/14.4bpp");
-const u32 gEventObjectPic_BrendanAcroBike_15[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/15.4bpp");
-const u32 gEventObjectPic_BrendanAcroBike_16[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/16.4bpp");
-const u32 gEventObjectPic_BrendanAcroBike_17[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/17.4bpp");
-const u32 gEventObjectPic_BrendanAcroBike_18[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/18.4bpp");
-const u32 gEventObjectPic_BrendanAcroBike_19[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/19.4bpp");
-const u32 gEventObjectPic_BrendanAcroBike_20[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/20.4bpp");
-const u32 gEventObjectPic_BrendanAcroBike_21[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/21.4bpp");
-const u32 gEventObjectPic_BrendanAcroBike_22[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/22.4bpp");
-const u32 gEventObjectPic_BrendanAcroBike_23[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/23.4bpp");
-const u32 gEventObjectPic_BrendanAcroBike_24[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/24.4bpp");
-const u32 gEventObjectPic_BrendanAcroBike_25[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/25.4bpp");
-const u32 gEventObjectPic_BrendanAcroBike_26[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/26.4bpp");
-const u32 gEventObjectPic_BrendanFishing_0[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/fishing/00.4bpp");
-const u32 gEventObjectPic_BrendanFishing_1[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/fishing/01.4bpp");
-const u32 gEventObjectPic_BrendanFishing_2[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/fishing/02.4bpp");
-const u32 gEventObjectPic_BrendanFishing_3[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/fishing/03.4bpp");
-const u32 gEventObjectPic_BrendanFishing_4[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/fishing/04.4bpp");
-const u32 gEventObjectPic_BrendanFishing_5[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/fishing/05.4bpp");
-const u32 gEventObjectPic_BrendanFishing_6[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/fishing/06.4bpp");
-const u32 gEventObjectPic_BrendanFishing_7[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/fishing/07.4bpp");
-const u32 gEventObjectPic_BrendanFishing_8[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/fishing/08.4bpp");
-const u32 gEventObjectPic_BrendanFishing_9[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/fishing/09.4bpp");
-const u32 gEventObjectPic_BrendanFishing_10[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/fishing/10.4bpp");
-const u32 gEventObjectPic_BrendanFishing_11[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/fishing/11.4bpp");
-const u32 gEventObjectPic_BrendanWatering_0[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/watering/0.4bpp");
-const u32 gEventObjectPic_BrendanWatering_3[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/watering/3.4bpp");
-const u32 gEventObjectPic_BrendanWatering_1[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/watering/1.4bpp");
-const u32 gEventObjectPic_BrendanWatering_4[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/watering/4.4bpp");
-const u32 gEventObjectPic_BrendanWatering_2[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/watering/2.4bpp");
-const u32 gEventObjectPic_BrendanWatering_5[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/watering/5.4bpp");
+const u32 gEventObjectPic_BrendanFieldMove[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/field_move.4bpp");
+const u32 gEventObjectPic_BrendanSurfing[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/surfing.4bpp");
+const u32 gEventObjectPic_BrendanMachBike[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/mach_bike.4bpp");
+const u32 gEventObjectPic_BrendanAcroBike[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike.4bpp");
+const u32 gEventObjectPic_BrendanFishing[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/fishing.4bpp");
+const u32 gEventObjectPic_BrendanWatering[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/watering.4bpp");
 const u32 gEventObjectPic_BrendanDecorating[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/decorating.4bpp");
 const u32 gEventObjectPic_MayDecorating[] = INCBIN_U32("graphics/event_objects/pics/people/may/decorating.4bpp");
-const u32 gEventObjectPic_BrendanUnderwater_0[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/underwater/0.4bpp");
-const u32 gEventObjectPic_BrendanUnderwater_1[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/underwater/1.4bpp");
-const u32 gEventObjectPic_BrendanUnderwater_2[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/underwater/2.4bpp");
-const u32 gEventObjectPic_BrendanUnderwater_3[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/underwater/3.4bpp");
-const u32 gEventObjectPic_MayUnderwater_0[] = INCBIN_U32("graphics/event_objects/pics/people/may/underwater/0.4bpp");
-const u32 gEventObjectPic_MayUnderwater_1[] = INCBIN_U32("graphics/event_objects/pics/people/may/underwater/1.4bpp");
-const u32 gEventObjectPic_MayUnderwater_2[] = INCBIN_U32("graphics/event_objects/pics/people/may/underwater/2.4bpp");
-const u32 gEventObjectPic_MayUnderwater_3[] = INCBIN_U32("graphics/event_objects/pics/people/may/underwater/3.4bpp");
+const u32 gEventObjectPic_BrendanUnderwater[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/underwater.4bpp");
+const u32 gEventObjectPic_MayUnderwater[] = INCBIN_U32("graphics/event_objects/pics/people/may/underwater.4bpp");
 const u16 gEventObjectPalette11[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_11.gbapal");
-const u32 gEventObjectPic_MayNormal_0[] = INCBIN_U32("graphics/event_objects/pics/people/may/normal/00.4bpp");
-const u32 gEventObjectPic_MayNormal_1[] = INCBIN_U32("graphics/event_objects/pics/people/may/normal/01.4bpp");
-const u32 gEventObjectPic_MayNormal_2[] = INCBIN_U32("graphics/event_objects/pics/people/may/normal/02.4bpp");
-const u32 gEventObjectPic_MayNormal_3[] = INCBIN_U32("graphics/event_objects/pics/people/may/normal/03.4bpp");
-const u32 gEventObjectPic_MayNormal_4[] = INCBIN_U32("graphics/event_objects/pics/people/may/normal/04.4bpp");
-const u32 gEventObjectPic_MayNormal_5[] = INCBIN_U32("graphics/event_objects/pics/people/may/normal/05.4bpp");
-const u32 gEventObjectPic_MayNormal_6[] = INCBIN_U32("graphics/event_objects/pics/people/may/normal/06.4bpp");
-const u32 gEventObjectPic_MayNormal_7[] = INCBIN_U32("graphics/event_objects/pics/people/may/normal/07.4bpp");
-const u32 gEventObjectPic_MayNormal_8[] = INCBIN_U32("graphics/event_objects/pics/people/may/normal/08.4bpp");
-const u32 gEventObjectPic_MayNormal_9[] = INCBIN_U32("graphics/event_objects/pics/people/may/normal/09.4bpp");
-const u32 gEventObjectPic_MayNormal_10[] = INCBIN_U32("graphics/event_objects/pics/people/may/normal/10.4bpp");
-const u32 gEventObjectPic_MayNormal_11[] = INCBIN_U32("graphics/event_objects/pics/people/may/normal/11.4bpp");
-const u32 gEventObjectPic_MayNormal_12[] = INCBIN_U32("graphics/event_objects/pics/people/may/normal/12.4bpp");
-const u32 gEventObjectPic_MayNormal_13[] = INCBIN_U32("graphics/event_objects/pics/people/may/normal/13.4bpp");
-const u32 gEventObjectPic_MayNormal_14[] = INCBIN_U32("graphics/event_objects/pics/people/may/normal/14.4bpp");
-const u32 gEventObjectPic_MayNormal_15[] = INCBIN_U32("graphics/event_objects/pics/people/may/normal/15.4bpp");
-const u32 gEventObjectPic_MayNormal_16[] = INCBIN_U32("graphics/event_objects/pics/people/may/normal/16.4bpp");
-const u32 gEventObjectPic_MayNormal_17[] = INCBIN_U32("graphics/event_objects/pics/people/may/normal/17.4bpp");
+const u32 gEventObjectPic_MayNormal[] = INCBIN_U32("graphics/event_objects/pics/people/may/walking.4bpp");
+const u32 gEventObjectPic_MayRunning[] = INCBIN_U32("graphics/event_objects/pics/people/may/running.4bpp");
 const u16 gEventObjectPalette17[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_17.gbapal");
 const u16 gEventObjectPalette18[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_18.gbapal");
-const u32 gEventObjectPic_RubySapphireMay_0[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_may/00.4bpp");
-const u32 gEventObjectPic_RubySapphireMay_1[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_may/01.4bpp");
-const u32 gEventObjectPic_RubySapphireMay_2[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_may/02.4bpp");
-const u32 gEventObjectPic_RubySapphireMay_3[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_may/03.4bpp");
-const u32 gEventObjectPic_RubySapphireMay_4[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_may/04.4bpp");
-const u32 gEventObjectPic_RubySapphireMay_5[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_may/05.4bpp");
-const u32 gEventObjectPic_RubySapphireMay_6[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_may/06.4bpp");
-const u32 gEventObjectPic_RubySapphireMay_7[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_may/07.4bpp");
-const u32 gEventObjectPic_RubySapphireMay_8[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_may/08.4bpp");
-const u32 gEventObjectPic_RubySapphireMay_9[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_may/09.4bpp");
-const u32 gEventObjectPic_RubySapphireMay_10[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_may/10.4bpp");
-const u32 gEventObjectPic_RubySapphireMay_11[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_may/11.4bpp");
-const u32 gEventObjectPic_RubySapphireMay_12[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_may/12.4bpp");
-const u32 gEventObjectPic_RubySapphireMay_13[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_may/13.4bpp");
-const u32 gEventObjectPic_RubySapphireMay_14[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_may/14.4bpp");
-const u32 gEventObjectPic_RubySapphireMay_15[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_may/15.4bpp");
-const u32 gEventObjectPic_RubySapphireMay_16[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_may/16.4bpp");
-const u32 gEventObjectPic_RubySapphireMay_17[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_may/17.4bpp");
+const u32 gEventObjectPic_RubySapphireMayNormal[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_may/walking.4bpp");
+const u32 gEventObjectPic_RubySapphireMayRunning[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_may/running.4bpp");
 const u16 gEventObjectPalette34[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_34.gbapal");
 const u16 gUnusedEventObjectPalette[] = INCBIN_U16("graphics/event_objects/palettes/unused_palette.gbapal");
 const u16 NullPalette_84A54F8[16] = {};
@@ -186,71 +57,12 @@ const u16 NullPalette_84A5638[16] = {};
 const u16 NullPalette_84A5658[16] = {};
 const u16 NullPalette_84A5678[16] = {};
 const u16 NullPalette_84A5698[16] = {};
-const u32 gEventObjectPic_MayMachBike_0[] = INCBIN_U32("graphics/event_objects/pics/people/may/mach_bike/0.4bpp");
-const u32 gEventObjectPic_MayMachBike_1[] = INCBIN_U32("graphics/event_objects/pics/people/may/mach_bike/1.4bpp");
-const u32 gEventObjectPic_MayMachBike_2[] = INCBIN_U32("graphics/event_objects/pics/people/may/mach_bike/2.4bpp");
-const u32 gEventObjectPic_MayMachBike_3[] = INCBIN_U32("graphics/event_objects/pics/people/may/mach_bike/3.4bpp");
-const u32 gEventObjectPic_MayMachBike_4[] = INCBIN_U32("graphics/event_objects/pics/people/may/mach_bike/4.4bpp");
-const u32 gEventObjectPic_MayMachBike_5[] = INCBIN_U32("graphics/event_objects/pics/people/may/mach_bike/5.4bpp");
-const u32 gEventObjectPic_MayMachBike_6[] = INCBIN_U32("graphics/event_objects/pics/people/may/mach_bike/6.4bpp");
-const u32 gEventObjectPic_MayMachBike_7[] = INCBIN_U32("graphics/event_objects/pics/people/may/mach_bike/7.4bpp");
-const u32 gEventObjectPic_MayMachBike_8[] = INCBIN_U32("graphics/event_objects/pics/people/may/mach_bike/8.4bpp");
-const u32 gEventObjectPic_MayAcroBike_0[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/00.4bpp");
-const u32 gEventObjectPic_MayAcroBike_1[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/01.4bpp");
-const u32 gEventObjectPic_MayAcroBike_2[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/02.4bpp");
-const u32 gEventObjectPic_MayAcroBike_3[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/03.4bpp");
-const u32 gEventObjectPic_MayAcroBike_4[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/04.4bpp");
-const u32 gEventObjectPic_MayAcroBike_5[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/05.4bpp");
-const u32 gEventObjectPic_MayAcroBike_6[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/06.4bpp");
-const u32 gEventObjectPic_MayAcroBike_7[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/07.4bpp");
-const u32 gEventObjectPic_MayAcroBike_8[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/08.4bpp");
-const u32 gEventObjectPic_MayAcroBike_9[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/09.4bpp");
-const u32 gEventObjectPic_MayAcroBike_10[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/10.4bpp");
-const u32 gEventObjectPic_MayAcroBike_11[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/11.4bpp");
-const u32 gEventObjectPic_MayAcroBike_12[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/12.4bpp");
-const u32 gEventObjectPic_MayAcroBike_13[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/13.4bpp");
-const u32 gEventObjectPic_MayAcroBike_14[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/14.4bpp");
-const u32 gEventObjectPic_MayAcroBike_15[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/15.4bpp");
-const u32 gEventObjectPic_MayAcroBike_16[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/16.4bpp");
-const u32 gEventObjectPic_MayAcroBike_17[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/17.4bpp");
-const u32 gEventObjectPic_MayAcroBike_18[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/18.4bpp");
-const u32 gEventObjectPic_MayAcroBike_19[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/19.4bpp");
-const u32 gEventObjectPic_MayAcroBike_20[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/20.4bpp");
-const u32 gEventObjectPic_MayAcroBike_21[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/21.4bpp");
-const u32 gEventObjectPic_MayAcroBike_22[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/22.4bpp");
-const u32 gEventObjectPic_MayAcroBike_23[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/23.4bpp");
-const u32 gEventObjectPic_MayAcroBike_24[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/24.4bpp");
-const u32 gEventObjectPic_MayAcroBike_25[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/25.4bpp");
-const u32 gEventObjectPic_MayAcroBike_26[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/26.4bpp");
-const u32 gEventObjectPic_MaySurfing_0[] = INCBIN_U32("graphics/event_objects/pics/people/may/surfing/0.4bpp");
-const u32 gEventObjectPic_MaySurfing_3[] = INCBIN_U32("graphics/event_objects/pics/people/may/surfing/3.4bpp");
-const u32 gEventObjectPic_MaySurfing_1[] = INCBIN_U32("graphics/event_objects/pics/people/may/surfing/1.4bpp");
-const u32 gEventObjectPic_MaySurfing_4[] = INCBIN_U32("graphics/event_objects/pics/people/may/surfing/4.4bpp");
-const u32 gEventObjectPic_MaySurfing_2[] = INCBIN_U32("graphics/event_objects/pics/people/may/surfing/2.4bpp");
-const u32 gEventObjectPic_MaySurfing_5[] = INCBIN_U32("graphics/event_objects/pics/people/may/surfing/5.4bpp");
-const u32 gEventObjectPic_MayFieldMove_0[] = INCBIN_U32("graphics/event_objects/pics/people/may/field_move/0.4bpp");
-const u32 gEventObjectPic_MayFieldMove_1[] = INCBIN_U32("graphics/event_objects/pics/people/may/field_move/1.4bpp");
-const u32 gEventObjectPic_MayFieldMove_2[] = INCBIN_U32("graphics/event_objects/pics/people/may/field_move/2.4bpp");
-const u32 gEventObjectPic_MayFieldMove_3[] = INCBIN_U32("graphics/event_objects/pics/people/may/field_move/3.4bpp");
-const u32 gEventObjectPic_MayFieldMove_4[] = INCBIN_U32("graphics/event_objects/pics/people/may/field_move/4.4bpp");
-const u32 gEventObjectPic_MayFishing_0[] = INCBIN_U32("graphics/event_objects/pics/people/may/fishing/00.4bpp");
-const u32 gEventObjectPic_MayFishing_1[] = INCBIN_U32("graphics/event_objects/pics/people/may/fishing/01.4bpp");
-const u32 gEventObjectPic_MayFishing_2[] = INCBIN_U32("graphics/event_objects/pics/people/may/fishing/02.4bpp");
-const u32 gEventObjectPic_MayFishing_3[] = INCBIN_U32("graphics/event_objects/pics/people/may/fishing/03.4bpp");
-const u32 gEventObjectPic_MayFishing_4[] = INCBIN_U32("graphics/event_objects/pics/people/may/fishing/04.4bpp");
-const u32 gEventObjectPic_MayFishing_5[] = INCBIN_U32("graphics/event_objects/pics/people/may/fishing/05.4bpp");
-const u32 gEventObjectPic_MayFishing_6[] = INCBIN_U32("graphics/event_objects/pics/people/may/fishing/06.4bpp");
-const u32 gEventObjectPic_MayFishing_7[] = INCBIN_U32("graphics/event_objects/pics/people/may/fishing/07.4bpp");
-const u32 gEventObjectPic_MayFishing_8[] = INCBIN_U32("graphics/event_objects/pics/people/may/fishing/08.4bpp");
-const u32 gEventObjectPic_MayFishing_9[] = INCBIN_U32("graphics/event_objects/pics/people/may/fishing/09.4bpp");
-const u32 gEventObjectPic_MayFishing_10[] = INCBIN_U32("graphics/event_objects/pics/people/may/fishing/10.4bpp");
-const u32 gEventObjectPic_MayFishing_11[] = INCBIN_U32("graphics/event_objects/pics/people/may/fishing/11.4bpp");
-const u32 gEventObjectPic_MayWatering_0[] = INCBIN_U32("graphics/event_objects/pics/people/may/watering/0.4bpp");
-const u32 gEventObjectPic_MayWatering_3[] = INCBIN_U32("graphics/event_objects/pics/people/may/watering/3.4bpp");
-const u32 gEventObjectPic_MayWatering_1[] = INCBIN_U32("graphics/event_objects/pics/people/may/watering/1.4bpp");
-const u32 gEventObjectPic_MayWatering_4[] = INCBIN_U32("graphics/event_objects/pics/people/may/watering/4.4bpp");
-const u32 gEventObjectPic_MayWatering_2[] = INCBIN_U32("graphics/event_objects/pics/people/may/watering/2.4bpp");
-const u32 gEventObjectPic_MayWatering_5[] = INCBIN_U32("graphics/event_objects/pics/people/may/watering/5.4bpp");
+const u32 gEventObjectPic_MayMachBike[] = INCBIN_U32("graphics/event_objects/pics/people/may/mach_bike.4bpp");
+const u32 gEventObjectPic_MayAcroBike[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike.4bpp");
+const u32 gEventObjectPic_MaySurfing[] = INCBIN_U32("graphics/event_objects/pics/people/may/surfing.4bpp");
+const u32 gEventObjectPic_MayFieldMove[] = INCBIN_U32("graphics/event_objects/pics/people/may/field_move.4bpp");
+const u32 gEventObjectPic_MayFishing[] = INCBIN_U32("graphics/event_objects/pics/people/may/fishing.4bpp");
+const u32 gEventObjectPic_MayWatering[] = INCBIN_U32("graphics/event_objects/pics/people/may/watering.4bpp");
 const u16 gEventObjectPalette0[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_00.gbapal");
 const u16 gEventObjectPalette1[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_01.gbapal");
 const u16 gEventObjectPalette2[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_02.gbapal");
@@ -259,815 +71,115 @@ const u16 gEventObjectPalette4[] = INCBIN_U16("graphics/event_objects/palettes/f
 const u16 gEventObjectPalette5[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_05.gbapal");
 const u16 gEventObjectPalette6[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_06.gbapal");
 const u16 gEventObjectPalette7[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_07.gbapal");
-const u32 gEventObjectPic_LittleBoy1_0[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_1/0.4bpp");
-const u32 gEventObjectPic_LittleBoy1_1[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_1/1.4bpp");
-const u32 gEventObjectPic_LittleBoy1_2[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_1/2.4bpp");
-const u32 gEventObjectPic_LittleBoy1_3[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_1/3.4bpp");
-const u32 gEventObjectPic_LittleBoy1_4[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_1/4.4bpp");
-const u32 gEventObjectPic_LittleBoy1_5[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_1/5.4bpp");
-const u32 gEventObjectPic_LittleBoy1_6[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_1/6.4bpp");
-const u32 gEventObjectPic_LittleBoy1_7[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_1/7.4bpp");
-const u32 gEventObjectPic_LittleBoy1_8[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_1/8.4bpp");
-const u32 gEventObjectPic_LittleGirl1_0[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl_1/0.4bpp");
-const u32 gEventObjectPic_LittleGirl1_1[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl_1/1.4bpp");
-const u32 gEventObjectPic_LittleGirl1_2[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl_1/2.4bpp");
-const u32 gEventObjectPic_LittleGirl1_3[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl_1/3.4bpp");
-const u32 gEventObjectPic_LittleGirl1_4[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl_1/4.4bpp");
-const u32 gEventObjectPic_LittleGirl1_5[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl_1/5.4bpp");
-const u32 gEventObjectPic_LittleGirl1_6[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl_1/6.4bpp");
-const u32 gEventObjectPic_LittleGirl1_7[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl_1/7.4bpp");
-const u32 gEventObjectPic_LittleGirl1_8[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl_1/8.4bpp");
-const u32 gEventObjectPic_Boy1_0[] = INCBIN_U32("graphics/event_objects/pics/people/boy_1/0.4bpp");
-const u32 gEventObjectPic_Boy1_1[] = INCBIN_U32("graphics/event_objects/pics/people/boy_1/1.4bpp");
-const u32 gEventObjectPic_Boy1_2[] = INCBIN_U32("graphics/event_objects/pics/people/boy_1/2.4bpp");
-const u32 gEventObjectPic_Boy1_3[] = INCBIN_U32("graphics/event_objects/pics/people/boy_1/3.4bpp");
-const u32 gEventObjectPic_Boy1_4[] = INCBIN_U32("graphics/event_objects/pics/people/boy_1/4.4bpp");
-const u32 gEventObjectPic_Boy1_5[] = INCBIN_U32("graphics/event_objects/pics/people/boy_1/5.4bpp");
-const u32 gEventObjectPic_Boy1_6[] = INCBIN_U32("graphics/event_objects/pics/people/boy_1/6.4bpp");
-const u32 gEventObjectPic_Boy1_7[] = INCBIN_U32("graphics/event_objects/pics/people/boy_1/7.4bpp");
-const u32 gEventObjectPic_Boy1_8[] = INCBIN_U32("graphics/event_objects/pics/people/boy_1/8.4bpp");
-const u32 gEventObjectPic_Girl1_0[] = INCBIN_U32("graphics/event_objects/pics/people/girl_1/0.4bpp");
-const u32 gEventObjectPic_Girl1_1[] = INCBIN_U32("graphics/event_objects/pics/people/girl_1/1.4bpp");
-const u32 gEventObjectPic_Girl1_2[] = INCBIN_U32("graphics/event_objects/pics/people/girl_1/2.4bpp");
-const u32 gEventObjectPic_Girl1_3[] = INCBIN_U32("graphics/event_objects/pics/people/girl_1/3.4bpp");
-const u32 gEventObjectPic_Girl1_4[] = INCBIN_U32("graphics/event_objects/pics/people/girl_1/4.4bpp");
-const u32 gEventObjectPic_Girl1_5[] = INCBIN_U32("graphics/event_objects/pics/people/girl_1/5.4bpp");
-const u32 gEventObjectPic_Girl1_6[] = INCBIN_U32("graphics/event_objects/pics/people/girl_1/6.4bpp");
-const u32 gEventObjectPic_Girl1_7[] = INCBIN_U32("graphics/event_objects/pics/people/girl_1/7.4bpp");
-const u32 gEventObjectPic_Girl1_8[] = INCBIN_U32("graphics/event_objects/pics/people/girl_1/8.4bpp");
-const u32 gEventObjectPic_Boy2_0[] = INCBIN_U32("graphics/event_objects/pics/people/boy_2/0.4bpp");
-const u32 gEventObjectPic_Boy2_1[] = INCBIN_U32("graphics/event_objects/pics/people/boy_2/1.4bpp");
-const u32 gEventObjectPic_Boy2_2[] = INCBIN_U32("graphics/event_objects/pics/people/boy_2/2.4bpp");
-const u32 gEventObjectPic_Boy2_3[] = INCBIN_U32("graphics/event_objects/pics/people/boy_2/3.4bpp");
-const u32 gEventObjectPic_Boy2_4[] = INCBIN_U32("graphics/event_objects/pics/people/boy_2/4.4bpp");
-const u32 gEventObjectPic_Boy2_5[] = INCBIN_U32("graphics/event_objects/pics/people/boy_2/5.4bpp");
-const u32 gEventObjectPic_Boy2_6[] = INCBIN_U32("graphics/event_objects/pics/people/boy_2/6.4bpp");
-const u32 gEventObjectPic_Boy2_7[] = INCBIN_U32("graphics/event_objects/pics/people/boy_2/7.4bpp");
-const u32 gEventObjectPic_Boy2_8[] = INCBIN_U32("graphics/event_objects/pics/people/boy_2/8.4bpp");
-const u32 gEventObjectPic_Girl2_0[] = INCBIN_U32("graphics/event_objects/pics/people/girl_2/0.4bpp");
-const u32 gEventObjectPic_Girl2_1[] = INCBIN_U32("graphics/event_objects/pics/people/girl_2/1.4bpp");
-const u32 gEventObjectPic_Girl2_2[] = INCBIN_U32("graphics/event_objects/pics/people/girl_2/2.4bpp");
-const u32 gEventObjectPic_Girl2_3[] = INCBIN_U32("graphics/event_objects/pics/people/girl_2/3.4bpp");
-const u32 gEventObjectPic_Girl2_4[] = INCBIN_U32("graphics/event_objects/pics/people/girl_2/4.4bpp");
-const u32 gEventObjectPic_Girl2_5[] = INCBIN_U32("graphics/event_objects/pics/people/girl_2/5.4bpp");
-const u32 gEventObjectPic_Girl2_6[] = INCBIN_U32("graphics/event_objects/pics/people/girl_2/6.4bpp");
-const u32 gEventObjectPic_Girl2_7[] = INCBIN_U32("graphics/event_objects/pics/people/girl_2/7.4bpp");
-const u32 gEventObjectPic_Girl2_8[] = INCBIN_U32("graphics/event_objects/pics/people/girl_2/8.4bpp");
-const u32 gEventObjectPic_LittleBoy2_0[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_2/0.4bpp");
-const u32 gEventObjectPic_LittleBoy2_1[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_2/1.4bpp");
-const u32 gEventObjectPic_LittleBoy2_2[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_2/2.4bpp");
-const u32 gEventObjectPic_LittleBoy2_3[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_2/3.4bpp");
-const u32 gEventObjectPic_LittleBoy2_4[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_2/4.4bpp");
-const u32 gEventObjectPic_LittleBoy2_5[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_2/5.4bpp");
-const u32 gEventObjectPic_LittleBoy2_6[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_2/6.4bpp");
-const u32 gEventObjectPic_LittleBoy2_7[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_2/7.4bpp");
-const u32 gEventObjectPic_LittleBoy2_8[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_2/8.4bpp");
-const u32 gEventObjectPic_LittleGirl2_0[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl_2/0.4bpp");
-const u32 gEventObjectPic_LittleGirl2_1[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl_2/1.4bpp");
-const u32 gEventObjectPic_LittleGirl2_2[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl_2/2.4bpp");
-const u32 gEventObjectPic_LittleGirl2_3[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl_2/3.4bpp");
-const u32 gEventObjectPic_LittleGirl2_4[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl_2/4.4bpp");
-const u32 gEventObjectPic_LittleGirl2_5[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl_2/5.4bpp");
-const u32 gEventObjectPic_LittleGirl2_6[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl_2/6.4bpp");
-const u32 gEventObjectPic_LittleGirl2_7[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl_2/7.4bpp");
-const u32 gEventObjectPic_LittleGirl2_8[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl_2/8.4bpp");
-const u32 gEventObjectPic_Boy3_0[] = INCBIN_U32("graphics/event_objects/pics/people/boy_3/0.4bpp");
-const u32 gEventObjectPic_Boy3_1[] = INCBIN_U32("graphics/event_objects/pics/people/boy_3/1.4bpp");
-const u32 gEventObjectPic_Boy3_2[] = INCBIN_U32("graphics/event_objects/pics/people/boy_3/2.4bpp");
-const u32 gEventObjectPic_Boy3_3[] = INCBIN_U32("graphics/event_objects/pics/people/boy_3/3.4bpp");
-const u32 gEventObjectPic_Boy3_4[] = INCBIN_U32("graphics/event_objects/pics/people/boy_3/4.4bpp");
-const u32 gEventObjectPic_Boy3_5[] = INCBIN_U32("graphics/event_objects/pics/people/boy_3/5.4bpp");
-const u32 gEventObjectPic_Boy3_6[] = INCBIN_U32("graphics/event_objects/pics/people/boy_3/6.4bpp");
-const u32 gEventObjectPic_Boy3_7[] = INCBIN_U32("graphics/event_objects/pics/people/boy_3/7.4bpp");
-const u32 gEventObjectPic_Boy3_8[] = INCBIN_U32("graphics/event_objects/pics/people/boy_3/8.4bpp");
-const u32 gEventObjectPic_Girl3_0[] = INCBIN_U32("graphics/event_objects/pics/people/girl_3/0.4bpp");
-const u32 gEventObjectPic_Girl3_1[] = INCBIN_U32("graphics/event_objects/pics/people/girl_3/1.4bpp");
-const u32 gEventObjectPic_Girl3_2[] = INCBIN_U32("graphics/event_objects/pics/people/girl_3/2.4bpp");
-const u32 gEventObjectPic_Girl3_3[] = INCBIN_U32("graphics/event_objects/pics/people/girl_3/3.4bpp");
-const u32 gEventObjectPic_Girl3_4[] = INCBIN_U32("graphics/event_objects/pics/people/girl_3/4.4bpp");
-const u32 gEventObjectPic_Girl3_5[] = INCBIN_U32("graphics/event_objects/pics/people/girl_3/5.4bpp");
-const u32 gEventObjectPic_Girl3_6[] = INCBIN_U32("graphics/event_objects/pics/people/girl_3/6.4bpp");
-const u32 gEventObjectPic_Girl3_7[] = INCBIN_U32("graphics/event_objects/pics/people/girl_3/7.4bpp");
-const u32 gEventObjectPic_Girl3_8[] = INCBIN_U32("graphics/event_objects/pics/people/girl_3/8.4bpp");
-const u32 gEventObjectPic_Boy4_0[] = INCBIN_U32("graphics/event_objects/pics/people/boy_4/0.4bpp");
-const u32 gEventObjectPic_Boy4_1[] = INCBIN_U32("graphics/event_objects/pics/people/boy_4/1.4bpp");
-const u32 gEventObjectPic_Boy4_2[] = INCBIN_U32("graphics/event_objects/pics/people/boy_4/2.4bpp");
-const u32 gEventObjectPic_Boy4_3[] = INCBIN_U32("graphics/event_objects/pics/people/boy_4/3.4bpp");
-const u32 gEventObjectPic_Boy4_4[] = INCBIN_U32("graphics/event_objects/pics/people/boy_4/4.4bpp");
-const u32 gEventObjectPic_Boy4_5[] = INCBIN_U32("graphics/event_objects/pics/people/boy_4/5.4bpp");
-const u32 gEventObjectPic_Boy4_6[] = INCBIN_U32("graphics/event_objects/pics/people/boy_4/6.4bpp");
-const u32 gEventObjectPic_Boy4_7[] = INCBIN_U32("graphics/event_objects/pics/people/boy_4/7.4bpp");
-const u32 gEventObjectPic_Boy4_8[] = INCBIN_U32("graphics/event_objects/pics/people/boy_4/8.4bpp");
-const u32 gEventObjectPic_Woman1_0[] = INCBIN_U32("graphics/event_objects/pics/people/woman_1/0.4bpp");
-const u32 gEventObjectPic_Woman1_1[] = INCBIN_U32("graphics/event_objects/pics/people/woman_1/1.4bpp");
-const u32 gEventObjectPic_Woman1_2[] = INCBIN_U32("graphics/event_objects/pics/people/woman_1/2.4bpp");
-const u32 gEventObjectPic_Woman1_3[] = INCBIN_U32("graphics/event_objects/pics/people/woman_1/3.4bpp");
-const u32 gEventObjectPic_Woman1_4[] = INCBIN_U32("graphics/event_objects/pics/people/woman_1/4.4bpp");
-const u32 gEventObjectPic_Woman1_5[] = INCBIN_U32("graphics/event_objects/pics/people/woman_1/5.4bpp");
-const u32 gEventObjectPic_Woman1_6[] = INCBIN_U32("graphics/event_objects/pics/people/woman_1/6.4bpp");
-const u32 gEventObjectPic_Woman1_7[] = INCBIN_U32("graphics/event_objects/pics/people/woman_1/7.4bpp");
-const u32 gEventObjectPic_Woman1_8[] = INCBIN_U32("graphics/event_objects/pics/people/woman_1/8.4bpp");
-const u32 gEventObjectPic_FatMan_0[] = INCBIN_U32("graphics/event_objects/pics/people/fat_man/0.4bpp");
-const u32 gEventObjectPic_FatMan_1[] = INCBIN_U32("graphics/event_objects/pics/people/fat_man/1.4bpp");
-const u32 gEventObjectPic_FatMan_2[] = INCBIN_U32("graphics/event_objects/pics/people/fat_man/2.4bpp");
-const u32 gEventObjectPic_FatMan_3[] = INCBIN_U32("graphics/event_objects/pics/people/fat_man/3.4bpp");
-const u32 gEventObjectPic_FatMan_4[] = INCBIN_U32("graphics/event_objects/pics/people/fat_man/4.4bpp");
-const u32 gEventObjectPic_FatMan_5[] = INCBIN_U32("graphics/event_objects/pics/people/fat_man/5.4bpp");
-const u32 gEventObjectPic_FatMan_6[] = INCBIN_U32("graphics/event_objects/pics/people/fat_man/6.4bpp");
-const u32 gEventObjectPic_FatMan_7[] = INCBIN_U32("graphics/event_objects/pics/people/fat_man/7.4bpp");
-const u32 gEventObjectPic_FatMan_8[] = INCBIN_U32("graphics/event_objects/pics/people/fat_man/8.4bpp");
-const u32 gEventObjectPic_Woman2_0[] = INCBIN_U32("graphics/event_objects/pics/people/woman_2/0.4bpp");
-const u32 gEventObjectPic_Woman2_1[] = INCBIN_U32("graphics/event_objects/pics/people/woman_2/1.4bpp");
-const u32 gEventObjectPic_Woman2_2[] = INCBIN_U32("graphics/event_objects/pics/people/woman_2/2.4bpp");
-const u32 gEventObjectPic_Woman2_3[] = INCBIN_U32("graphics/event_objects/pics/people/woman_2/3.4bpp");
-const u32 gEventObjectPic_Woman2_4[] = INCBIN_U32("graphics/event_objects/pics/people/woman_2/4.4bpp");
-const u32 gEventObjectPic_Woman2_5[] = INCBIN_U32("graphics/event_objects/pics/people/woman_2/5.4bpp");
-const u32 gEventObjectPic_Woman2_6[] = INCBIN_U32("graphics/event_objects/pics/people/woman_2/6.4bpp");
-const u32 gEventObjectPic_Woman2_7[] = INCBIN_U32("graphics/event_objects/pics/people/woman_2/7.4bpp");
-const u32 gEventObjectPic_Woman2_8[] = INCBIN_U32("graphics/event_objects/pics/people/woman_2/8.4bpp");
-const u32 gEventObjectPic_Man1_0[] = INCBIN_U32("graphics/event_objects/pics/people/man_1/0.4bpp");
-const u32 gEventObjectPic_Man1_1[] = INCBIN_U32("graphics/event_objects/pics/people/man_1/1.4bpp");
-const u32 gEventObjectPic_Man1_2[] = INCBIN_U32("graphics/event_objects/pics/people/man_1/2.4bpp");
-const u32 gEventObjectPic_Man1_3[] = INCBIN_U32("graphics/event_objects/pics/people/man_1/3.4bpp");
-const u32 gEventObjectPic_Man1_4[] = INCBIN_U32("graphics/event_objects/pics/people/man_1/4.4bpp");
-const u32 gEventObjectPic_Man1_5[] = INCBIN_U32("graphics/event_objects/pics/people/man_1/5.4bpp");
-const u32 gEventObjectPic_Man1_6[] = INCBIN_U32("graphics/event_objects/pics/people/man_1/6.4bpp");
-const u32 gEventObjectPic_Man1_7[] = INCBIN_U32("graphics/event_objects/pics/people/man_1/7.4bpp");
-const u32 gEventObjectPic_Man1_8[] = INCBIN_U32("graphics/event_objects/pics/people/man_1/8.4bpp");
-const u32 gEventObjectPic_Woman3_0[] = INCBIN_U32("graphics/event_objects/pics/people/woman_3/0.4bpp");
-const u32 gEventObjectPic_Woman3_1[] = INCBIN_U32("graphics/event_objects/pics/people/woman_3/1.4bpp");
-const u32 gEventObjectPic_Woman3_2[] = INCBIN_U32("graphics/event_objects/pics/people/woman_3/2.4bpp");
-const u32 gEventObjectPic_Woman3_3[] = INCBIN_U32("graphics/event_objects/pics/people/woman_3/3.4bpp");
-const u32 gEventObjectPic_Woman3_4[] = INCBIN_U32("graphics/event_objects/pics/people/woman_3/4.4bpp");
-const u32 gEventObjectPic_Woman3_5[] = INCBIN_U32("graphics/event_objects/pics/people/woman_3/5.4bpp");
-const u32 gEventObjectPic_Woman3_6[] = INCBIN_U32("graphics/event_objects/pics/people/woman_3/6.4bpp");
-const u32 gEventObjectPic_Woman3_7[] = INCBIN_U32("graphics/event_objects/pics/people/woman_3/7.4bpp");
-const u32 gEventObjectPic_Woman3_8[] = INCBIN_U32("graphics/event_objects/pics/people/woman_3/8.4bpp");
-const u32 gEventObjectPic_OldMan1_0[] = INCBIN_U32("graphics/event_objects/pics/people/old_man_1/0.4bpp");
-const u32 gEventObjectPic_OldMan1_1[] = INCBIN_U32("graphics/event_objects/pics/people/old_man_1/1.4bpp");
-const u32 gEventObjectPic_OldMan1_2[] = INCBIN_U32("graphics/event_objects/pics/people/old_man_1/2.4bpp");
-const u32 gEventObjectPic_OldMan1_3[] = INCBIN_U32("graphics/event_objects/pics/people/old_man_1/3.4bpp");
-const u32 gEventObjectPic_OldMan1_4[] = INCBIN_U32("graphics/event_objects/pics/people/old_man_1/4.4bpp");
-const u32 gEventObjectPic_OldMan1_5[] = INCBIN_U32("graphics/event_objects/pics/people/old_man_1/5.4bpp");
-const u32 gEventObjectPic_OldMan1_6[] = INCBIN_U32("graphics/event_objects/pics/people/old_man_1/6.4bpp");
-const u32 gEventObjectPic_OldMan1_7[] = INCBIN_U32("graphics/event_objects/pics/people/old_man_1/7.4bpp");
-const u32 gEventObjectPic_OldMan1_8[] = INCBIN_U32("graphics/event_objects/pics/people/old_man_1/8.4bpp");
-const u32 gEventObjectPic_OldWoman1_0[] = INCBIN_U32("graphics/event_objects/pics/people/old_woman_1/0.4bpp");
-const u32 gEventObjectPic_OldWoman1_1[] = INCBIN_U32("graphics/event_objects/pics/people/old_woman_1/1.4bpp");
-const u32 gEventObjectPic_OldWoman1_2[] = INCBIN_U32("graphics/event_objects/pics/people/old_woman_1/2.4bpp");
-const u32 gEventObjectPic_OldWoman1_3[] = INCBIN_U32("graphics/event_objects/pics/people/old_woman_1/3.4bpp");
-const u32 gEventObjectPic_OldWoman1_4[] = INCBIN_U32("graphics/event_objects/pics/people/old_woman_1/4.4bpp");
-const u32 gEventObjectPic_OldWoman1_5[] = INCBIN_U32("graphics/event_objects/pics/people/old_woman_1/5.4bpp");
-const u32 gEventObjectPic_OldWoman1_6[] = INCBIN_U32("graphics/event_objects/pics/people/old_woman_1/6.4bpp");
-const u32 gEventObjectPic_OldWoman1_7[] = INCBIN_U32("graphics/event_objects/pics/people/old_woman_1/7.4bpp");
-const u32 gEventObjectPic_OldWoman1_8[] = INCBIN_U32("graphics/event_objects/pics/people/old_woman_1/8.4bpp");
-const u32 gEventObjectPic_Man2_0[] = INCBIN_U32("graphics/event_objects/pics/people/man_2/0.4bpp");
-const u32 gEventObjectPic_Man2_1[] = INCBIN_U32("graphics/event_objects/pics/people/man_2/1.4bpp");
-const u32 gEventObjectPic_Man2_2[] = INCBIN_U32("graphics/event_objects/pics/people/man_2/2.4bpp");
-const u32 gEventObjectPic_Man2_3[] = INCBIN_U32("graphics/event_objects/pics/people/man_2/3.4bpp");
-const u32 gEventObjectPic_Man2_4[] = INCBIN_U32("graphics/event_objects/pics/people/man_2/4.4bpp");
-const u32 gEventObjectPic_Man2_5[] = INCBIN_U32("graphics/event_objects/pics/people/man_2/5.4bpp");
-const u32 gEventObjectPic_Man2_6[] = INCBIN_U32("graphics/event_objects/pics/people/man_2/6.4bpp");
-const u32 gEventObjectPic_Man2_7[] = INCBIN_U32("graphics/event_objects/pics/people/man_2/7.4bpp");
-const u32 gEventObjectPic_Man2_8[] = INCBIN_U32("graphics/event_objects/pics/people/man_2/8.4bpp");
-const u32 gEventObjectPic_Woman4_0[] = INCBIN_U32("graphics/event_objects/pics/people/woman_4/0.4bpp");
-const u32 gEventObjectPic_Woman4_1[] = INCBIN_U32("graphics/event_objects/pics/people/woman_4/1.4bpp");
-const u32 gEventObjectPic_Woman4_2[] = INCBIN_U32("graphics/event_objects/pics/people/woman_4/2.4bpp");
-const u32 gEventObjectPic_Woman4_3[] = INCBIN_U32("graphics/event_objects/pics/people/woman_4/3.4bpp");
-const u32 gEventObjectPic_Woman4_4[] = INCBIN_U32("graphics/event_objects/pics/people/woman_4/4.4bpp");
-const u32 gEventObjectPic_Woman4_5[] = INCBIN_U32("graphics/event_objects/pics/people/woman_4/5.4bpp");
-const u32 gEventObjectPic_Woman4_6[] = INCBIN_U32("graphics/event_objects/pics/people/woman_4/6.4bpp");
-const u32 gEventObjectPic_Woman4_7[] = INCBIN_U32("graphics/event_objects/pics/people/woman_4/7.4bpp");
-const u32 gEventObjectPic_Woman4_8[] = INCBIN_U32("graphics/event_objects/pics/people/woman_4/8.4bpp");
-const u32 gEventObjectPic_Man3_0[] = INCBIN_U32("graphics/event_objects/pics/people/man_3/0.4bpp");
-const u32 gEventObjectPic_Man3_1[] = INCBIN_U32("graphics/event_objects/pics/people/man_3/1.4bpp");
-const u32 gEventObjectPic_Man3_2[] = INCBIN_U32("graphics/event_objects/pics/people/man_3/2.4bpp");
-const u32 gEventObjectPic_Man3_3[] = INCBIN_U32("graphics/event_objects/pics/people/man_3/3.4bpp");
-const u32 gEventObjectPic_Man3_4[] = INCBIN_U32("graphics/event_objects/pics/people/man_3/4.4bpp");
-const u32 gEventObjectPic_Man3_5[] = INCBIN_U32("graphics/event_objects/pics/people/man_3/5.4bpp");
-const u32 gEventObjectPic_Man3_6[] = INCBIN_U32("graphics/event_objects/pics/people/man_3/6.4bpp");
-const u32 gEventObjectPic_Man3_7[] = INCBIN_U32("graphics/event_objects/pics/people/man_3/7.4bpp");
-const u32 gEventObjectPic_Man3_8[] = INCBIN_U32("graphics/event_objects/pics/people/man_3/8.4bpp");
-const u32 gEventObjectPic_Woman5_0[] = INCBIN_U32("graphics/event_objects/pics/people/woman_5/0.4bpp");
-const u32 gEventObjectPic_Woman5_1[] = INCBIN_U32("graphics/event_objects/pics/people/woman_5/1.4bpp");
-const u32 gEventObjectPic_Woman5_2[] = INCBIN_U32("graphics/event_objects/pics/people/woman_5/2.4bpp");
-const u32 gEventObjectPic_Woman5_3[] = INCBIN_U32("graphics/event_objects/pics/people/woman_5/3.4bpp");
-const u32 gEventObjectPic_Woman5_4[] = INCBIN_U32("graphics/event_objects/pics/people/woman_5/4.4bpp");
-const u32 gEventObjectPic_Woman5_5[] = INCBIN_U32("graphics/event_objects/pics/people/woman_5/5.4bpp");
-const u32 gEventObjectPic_Woman5_6[] = INCBIN_U32("graphics/event_objects/pics/people/woman_5/6.4bpp");
-const u32 gEventObjectPic_Woman5_7[] = INCBIN_U32("graphics/event_objects/pics/people/woman_5/7.4bpp");
-const u32 gEventObjectPic_Woman5_8[] = INCBIN_U32("graphics/event_objects/pics/people/woman_5/8.4bpp");
-const u32 gEventObjectPic_Cook_0[] = INCBIN_U32("graphics/event_objects/pics/people/cook/0.4bpp");
-const u32 gEventObjectPic_Cook_1[] = INCBIN_U32("graphics/event_objects/pics/people/cook/1.4bpp");
-const u32 gEventObjectPic_Cook_2[] = INCBIN_U32("graphics/event_objects/pics/people/cook/2.4bpp");
-const u32 gEventObjectPic_Woman6_0[] = INCBIN_U32("graphics/event_objects/pics/people/woman_6/0.4bpp");
-const u32 gEventObjectPic_Woman6_1[] = INCBIN_U32("graphics/event_objects/pics/people/woman_6/1.4bpp");
-const u32 gEventObjectPic_Woman6_2[] = INCBIN_U32("graphics/event_objects/pics/people/woman_6/2.4bpp");
-const u32 gEventObjectPic_Woman6_3[] = INCBIN_U32("graphics/event_objects/pics/people/woman_6/3.4bpp");
-const u32 gEventObjectPic_Woman6_4[] = INCBIN_U32("graphics/event_objects/pics/people/woman_6/4.4bpp");
-const u32 gEventObjectPic_Woman6_5[] = INCBIN_U32("graphics/event_objects/pics/people/woman_6/5.4bpp");
-const u32 gEventObjectPic_Woman6_6[] = INCBIN_U32("graphics/event_objects/pics/people/woman_6/6.4bpp");
-const u32 gEventObjectPic_Woman6_7[] = INCBIN_U32("graphics/event_objects/pics/people/woman_6/7.4bpp");
-const u32 gEventObjectPic_Woman6_8[] = INCBIN_U32("graphics/event_objects/pics/people/woman_6/8.4bpp");
-const u32 gEventObjectPic_OldMan2_0[] = INCBIN_U32("graphics/event_objects/pics/people/old_man_2/0.4bpp");
-const u32 gEventObjectPic_OldMan2_1[] = INCBIN_U32("graphics/event_objects/pics/people/old_man_2/1.4bpp");
-const u32 gEventObjectPic_OldMan2_2[] = INCBIN_U32("graphics/event_objects/pics/people/old_man_2/2.4bpp");
-const u32 gEventObjectPic_OldWoman2_0[] = INCBIN_U32("graphics/event_objects/pics/people/old_woman_2/0.4bpp");
-const u32 gEventObjectPic_OldWoman2_1[] = INCBIN_U32("graphics/event_objects/pics/people/old_woman_2/1.4bpp");
-const u32 gEventObjectPic_OldWoman2_2[] = INCBIN_U32("graphics/event_objects/pics/people/old_woman_2/2.4bpp");
-const u32 gEventObjectPic_OldWoman2_3[] = INCBIN_U32("graphics/event_objects/pics/people/old_woman_2/3.4bpp");
-const u32 gEventObjectPic_OldWoman2_4[] = INCBIN_U32("graphics/event_objects/pics/people/old_woman_2/4.4bpp");
-const u32 gEventObjectPic_OldWoman2_5[] = INCBIN_U32("graphics/event_objects/pics/people/old_woman_2/5.4bpp");
-const u32 gEventObjectPic_OldWoman2_6[] = INCBIN_U32("graphics/event_objects/pics/people/old_woman_2/6.4bpp");
-const u32 gEventObjectPic_OldWoman2_7[] = INCBIN_U32("graphics/event_objects/pics/people/old_woman_2/7.4bpp");
-const u32 gEventObjectPic_OldWoman2_8[] = INCBIN_U32("graphics/event_objects/pics/people/old_woman_2/8.4bpp");
-const u32 gEventObjectPic_Camper_0[] = INCBIN_U32("graphics/event_objects/pics/people/camper/0.4bpp");
-const u32 gEventObjectPic_Camper_1[] = INCBIN_U32("graphics/event_objects/pics/people/camper/1.4bpp");
-const u32 gEventObjectPic_Camper_2[] = INCBIN_U32("graphics/event_objects/pics/people/camper/2.4bpp");
-const u32 gEventObjectPic_Camper_3[] = INCBIN_U32("graphics/event_objects/pics/people/camper/3.4bpp");
-const u32 gEventObjectPic_Camper_4[] = INCBIN_U32("graphics/event_objects/pics/people/camper/4.4bpp");
-const u32 gEventObjectPic_Camper_5[] = INCBIN_U32("graphics/event_objects/pics/people/camper/5.4bpp");
-const u32 gEventObjectPic_Camper_6[] = INCBIN_U32("graphics/event_objects/pics/people/camper/6.4bpp");
-const u32 gEventObjectPic_Camper_7[] = INCBIN_U32("graphics/event_objects/pics/people/camper/7.4bpp");
-const u32 gEventObjectPic_Camper_8[] = INCBIN_U32("graphics/event_objects/pics/people/camper/8.4bpp");
-const u32 gEventObjectPic_Picnicker_0[] = INCBIN_U32("graphics/event_objects/pics/people/picnicker/0.4bpp");
-const u32 gEventObjectPic_Picnicker_1[] = INCBIN_U32("graphics/event_objects/pics/people/picnicker/1.4bpp");
-const u32 gEventObjectPic_Picnicker_2[] = INCBIN_U32("graphics/event_objects/pics/people/picnicker/2.4bpp");
-const u32 gEventObjectPic_Picnicker_3[] = INCBIN_U32("graphics/event_objects/pics/people/picnicker/3.4bpp");
-const u32 gEventObjectPic_Picnicker_4[] = INCBIN_U32("graphics/event_objects/pics/people/picnicker/4.4bpp");
-const u32 gEventObjectPic_Picnicker_5[] = INCBIN_U32("graphics/event_objects/pics/people/picnicker/5.4bpp");
-const u32 gEventObjectPic_Picnicker_6[] = INCBIN_U32("graphics/event_objects/pics/people/picnicker/6.4bpp");
-const u32 gEventObjectPic_Picnicker_7[] = INCBIN_U32("graphics/event_objects/pics/people/picnicker/7.4bpp");
-const u32 gEventObjectPic_Picnicker_8[] = INCBIN_U32("graphics/event_objects/pics/people/picnicker/8.4bpp");
-const u32 gEventObjectPic_Man4_0[] = INCBIN_U32("graphics/event_objects/pics/people/man_4/0.4bpp");
-const u32 gEventObjectPic_Man4_1[] = INCBIN_U32("graphics/event_objects/pics/people/man_4/1.4bpp");
-const u32 gEventObjectPic_Man4_2[] = INCBIN_U32("graphics/event_objects/pics/people/man_4/2.4bpp");
-const u32 gEventObjectPic_Man4_3[] = INCBIN_U32("graphics/event_objects/pics/people/man_4/3.4bpp");
-const u32 gEventObjectPic_Man4_4[] = INCBIN_U32("graphics/event_objects/pics/people/man_4/4.4bpp");
-const u32 gEventObjectPic_Man4_5[] = INCBIN_U32("graphics/event_objects/pics/people/man_4/5.4bpp");
-const u32 gEventObjectPic_Man4_6[] = INCBIN_U32("graphics/event_objects/pics/people/man_4/6.4bpp");
-const u32 gEventObjectPic_Man4_7[] = INCBIN_U32("graphics/event_objects/pics/people/man_4/7.4bpp");
-const u32 gEventObjectPic_Man4_8[] = INCBIN_U32("graphics/event_objects/pics/people/man_4/8.4bpp");
-const u32 gEventObjectPic_Woman7_0[] = INCBIN_U32("graphics/event_objects/pics/people/woman_7/0.4bpp");
-const u32 gEventObjectPic_Woman7_1[] = INCBIN_U32("graphics/event_objects/pics/people/woman_7/1.4bpp");
-const u32 gEventObjectPic_Woman7_2[] = INCBIN_U32("graphics/event_objects/pics/people/woman_7/2.4bpp");
-const u32 gEventObjectPic_Woman7_3[] = INCBIN_U32("graphics/event_objects/pics/people/woman_7/3.4bpp");
-const u32 gEventObjectPic_Woman7_4[] = INCBIN_U32("graphics/event_objects/pics/people/woman_7/4.4bpp");
-const u32 gEventObjectPic_Woman7_5[] = INCBIN_U32("graphics/event_objects/pics/people/woman_7/5.4bpp");
-const u32 gEventObjectPic_Woman7_6[] = INCBIN_U32("graphics/event_objects/pics/people/woman_7/6.4bpp");
-const u32 gEventObjectPic_Woman7_7[] = INCBIN_U32("graphics/event_objects/pics/people/woman_7/7.4bpp");
-const u32 gEventObjectPic_Woman7_8[] = INCBIN_U32("graphics/event_objects/pics/people/woman_7/8.4bpp");
-const u32 gEventObjectPic_Youngster_0[] = INCBIN_U32("graphics/event_objects/pics/people/youngster/0.4bpp");
-const u32 gEventObjectPic_Youngster_1[] = INCBIN_U32("graphics/event_objects/pics/people/youngster/1.4bpp");
-const u32 gEventObjectPic_Youngster_2[] = INCBIN_U32("graphics/event_objects/pics/people/youngster/2.4bpp");
-const u32 gEventObjectPic_Youngster_3[] = INCBIN_U32("graphics/event_objects/pics/people/youngster/3.4bpp");
-const u32 gEventObjectPic_Youngster_4[] = INCBIN_U32("graphics/event_objects/pics/people/youngster/4.4bpp");
-const u32 gEventObjectPic_Youngster_5[] = INCBIN_U32("graphics/event_objects/pics/people/youngster/5.4bpp");
-const u32 gEventObjectPic_Youngster_6[] = INCBIN_U32("graphics/event_objects/pics/people/youngster/6.4bpp");
-const u32 gEventObjectPic_Youngster_7[] = INCBIN_U32("graphics/event_objects/pics/people/youngster/7.4bpp");
-const u32 gEventObjectPic_Youngster_8[] = INCBIN_U32("graphics/event_objects/pics/people/youngster/8.4bpp");
-const u32 gEventObjectPic_BugCatcher_0[] = INCBIN_U32("graphics/event_objects/pics/people/bug_catcher/0.4bpp");
-const u32 gEventObjectPic_BugCatcher_1[] = INCBIN_U32("graphics/event_objects/pics/people/bug_catcher/1.4bpp");
-const u32 gEventObjectPic_BugCatcher_2[] = INCBIN_U32("graphics/event_objects/pics/people/bug_catcher/2.4bpp");
-const u32 gEventObjectPic_BugCatcher_3[] = INCBIN_U32("graphics/event_objects/pics/people/bug_catcher/3.4bpp");
-const u32 gEventObjectPic_BugCatcher_4[] = INCBIN_U32("graphics/event_objects/pics/people/bug_catcher/4.4bpp");
-const u32 gEventObjectPic_BugCatcher_5[] = INCBIN_U32("graphics/event_objects/pics/people/bug_catcher/5.4bpp");
-const u32 gEventObjectPic_BugCatcher_6[] = INCBIN_U32("graphics/event_objects/pics/people/bug_catcher/6.4bpp");
-const u32 gEventObjectPic_BugCatcher_7[] = INCBIN_U32("graphics/event_objects/pics/people/bug_catcher/7.4bpp");
-const u32 gEventObjectPic_BugCatcher_8[] = INCBIN_U32("graphics/event_objects/pics/people/bug_catcher/8.4bpp");
-const u32 gEventObjectPic_PsychicM_0[] = INCBIN_U32("graphics/event_objects/pics/people/psychic_m/0.4bpp");
-const u32 gEventObjectPic_PsychicM_1[] = INCBIN_U32("graphics/event_objects/pics/people/psychic_m/1.4bpp");
-const u32 gEventObjectPic_PsychicM_2[] = INCBIN_U32("graphics/event_objects/pics/people/psychic_m/2.4bpp");
-const u32 gEventObjectPic_PsychicM_3[] = INCBIN_U32("graphics/event_objects/pics/people/psychic_m/3.4bpp");
-const u32 gEventObjectPic_PsychicM_4[] = INCBIN_U32("graphics/event_objects/pics/people/psychic_m/4.4bpp");
-const u32 gEventObjectPic_PsychicM_5[] = INCBIN_U32("graphics/event_objects/pics/people/psychic_m/5.4bpp");
-const u32 gEventObjectPic_PsychicM_6[] = INCBIN_U32("graphics/event_objects/pics/people/psychic_m/6.4bpp");
-const u32 gEventObjectPic_PsychicM_7[] = INCBIN_U32("graphics/event_objects/pics/people/psychic_m/7.4bpp");
-const u32 gEventObjectPic_PsychicM_8[] = INCBIN_U32("graphics/event_objects/pics/people/psychic_m/8.4bpp");
-const u32 gEventObjectPic_SchoolKidM_0[] = INCBIN_U32("graphics/event_objects/pics/people/school_kid_m/0.4bpp");
-const u32 gEventObjectPic_SchoolKidM_1[] = INCBIN_U32("graphics/event_objects/pics/people/school_kid_m/1.4bpp");
-const u32 gEventObjectPic_SchoolKidM_2[] = INCBIN_U32("graphics/event_objects/pics/people/school_kid_m/2.4bpp");
-const u32 gEventObjectPic_SchoolKidM_3[] = INCBIN_U32("graphics/event_objects/pics/people/school_kid_m/3.4bpp");
-const u32 gEventObjectPic_SchoolKidM_4[] = INCBIN_U32("graphics/event_objects/pics/people/school_kid_m/4.4bpp");
-const u32 gEventObjectPic_SchoolKidM_5[] = INCBIN_U32("graphics/event_objects/pics/people/school_kid_m/5.4bpp");
-const u32 gEventObjectPic_SchoolKidM_6[] = INCBIN_U32("graphics/event_objects/pics/people/school_kid_m/6.4bpp");
-const u32 gEventObjectPic_SchoolKidM_7[] = INCBIN_U32("graphics/event_objects/pics/people/school_kid_m/7.4bpp");
-const u32 gEventObjectPic_SchoolKidM_8[] = INCBIN_U32("graphics/event_objects/pics/people/school_kid_m/8.4bpp");
-const u32 gEventObjectPic_Maniac_0[] = INCBIN_U32("graphics/event_objects/pics/people/maniac/0.4bpp");
-const u32 gEventObjectPic_Maniac_1[] = INCBIN_U32("graphics/event_objects/pics/people/maniac/1.4bpp");
-const u32 gEventObjectPic_Maniac_2[] = INCBIN_U32("graphics/event_objects/pics/people/maniac/2.4bpp");
-const u32 gEventObjectPic_Maniac_3[] = INCBIN_U32("graphics/event_objects/pics/people/maniac/3.4bpp");
-const u32 gEventObjectPic_Maniac_4[] = INCBIN_U32("graphics/event_objects/pics/people/maniac/4.4bpp");
-const u32 gEventObjectPic_Maniac_5[] = INCBIN_U32("graphics/event_objects/pics/people/maniac/5.4bpp");
-const u32 gEventObjectPic_Maniac_6[] = INCBIN_U32("graphics/event_objects/pics/people/maniac/6.4bpp");
-const u32 gEventObjectPic_Maniac_7[] = INCBIN_U32("graphics/event_objects/pics/people/maniac/7.4bpp");
-const u32 gEventObjectPic_Maniac_8[] = INCBIN_U32("graphics/event_objects/pics/people/maniac/8.4bpp");
-const u32 gEventObjectPic_HexManiac_0[] = INCBIN_U32("graphics/event_objects/pics/people/hex_maniac/0.4bpp");
-const u32 gEventObjectPic_HexManiac_1[] = INCBIN_U32("graphics/event_objects/pics/people/hex_maniac/1.4bpp");
-const u32 gEventObjectPic_HexManiac_2[] = INCBIN_U32("graphics/event_objects/pics/people/hex_maniac/2.4bpp");
-const u32 gEventObjectPic_HexManiac_3[] = INCBIN_U32("graphics/event_objects/pics/people/hex_maniac/3.4bpp");
-const u32 gEventObjectPic_HexManiac_4[] = INCBIN_U32("graphics/event_objects/pics/people/hex_maniac/4.4bpp");
-const u32 gEventObjectPic_HexManiac_5[] = INCBIN_U32("graphics/event_objects/pics/people/hex_maniac/5.4bpp");
-const u32 gEventObjectPic_HexManiac_6[] = INCBIN_U32("graphics/event_objects/pics/people/hex_maniac/6.4bpp");
-const u32 gEventObjectPic_HexManiac_7[] = INCBIN_U32("graphics/event_objects/pics/people/hex_maniac/7.4bpp");
-const u32 gEventObjectPic_HexManiac_8[] = INCBIN_U32("graphics/event_objects/pics/people/hex_maniac/8.4bpp");
-const u32 gEventObjectPic_UnusedWoman_0[] = INCBIN_U32("graphics/event_objects/pics/people/unused_woman/0.4bpp");
-const u32 gEventObjectPic_UnusedWoman_1[] = INCBIN_U32("graphics/event_objects/pics/people/unused_woman/1.4bpp");
-const u32 gEventObjectPic_UnusedWoman_2[] = INCBIN_U32("graphics/event_objects/pics/people/unused_woman/2.4bpp");
-const u32 gEventObjectPic_UnusedWoman_3[] = INCBIN_U32("graphics/event_objects/pics/people/unused_woman/3.4bpp");
-const u32 gEventObjectPic_UnusedWoman_4[] = INCBIN_U32("graphics/event_objects/pics/people/unused_woman/4.4bpp");
-const u32 gEventObjectPic_UnusedWoman_5[] = INCBIN_U32("graphics/event_objects/pics/people/unused_woman/5.4bpp");
-const u32 gEventObjectPic_UnusedWoman_6[] = INCBIN_U32("graphics/event_objects/pics/people/unused_woman/6.4bpp");
-const u32 gEventObjectPic_UnusedWoman_7[] = INCBIN_U32("graphics/event_objects/pics/people/unused_woman/7.4bpp");
-const u32 gEventObjectPic_UnusedWoman_8[] = INCBIN_U32("graphics/event_objects/pics/people/unused_woman/8.4bpp");
-const u32 gEventObjectPic_SwimmerM_0[] = INCBIN_U32("graphics/event_objects/pics/people/swimmer_m/0.4bpp");
-const u32 gEventObjectPic_SwimmerM_1[] = INCBIN_U32("graphics/event_objects/pics/people/swimmer_m/1.4bpp");
-const u32 gEventObjectPic_SwimmerM_2[] = INCBIN_U32("graphics/event_objects/pics/people/swimmer_m/2.4bpp");
-const u32 gEventObjectPic_SwimmerM_3[] = INCBIN_U32("graphics/event_objects/pics/people/swimmer_m/3.4bpp");
-const u32 gEventObjectPic_SwimmerM_4[] = INCBIN_U32("graphics/event_objects/pics/people/swimmer_m/4.4bpp");
-const u32 gEventObjectPic_SwimmerM_5[] = INCBIN_U32("graphics/event_objects/pics/people/swimmer_m/5.4bpp");
-const u32 gEventObjectPic_SwimmerM_6[] = INCBIN_U32("graphics/event_objects/pics/people/swimmer_m/6.4bpp");
-const u32 gEventObjectPic_SwimmerM_7[] = INCBIN_U32("graphics/event_objects/pics/people/swimmer_m/7.4bpp");
-const u32 gEventObjectPic_SwimmerM_8[] = INCBIN_U32("graphics/event_objects/pics/people/swimmer_m/8.4bpp");
-const u32 gEventObjectPic_SwimmerF_0[] = INCBIN_U32("graphics/event_objects/pics/people/swimmer_f/0.4bpp");
-const u32 gEventObjectPic_SwimmerF_1[] = INCBIN_U32("graphics/event_objects/pics/people/swimmer_f/1.4bpp");
-const u32 gEventObjectPic_SwimmerF_2[] = INCBIN_U32("graphics/event_objects/pics/people/swimmer_f/2.4bpp");
-const u32 gEventObjectPic_SwimmerF_3[] = INCBIN_U32("graphics/event_objects/pics/people/swimmer_f/3.4bpp");
-const u32 gEventObjectPic_SwimmerF_4[] = INCBIN_U32("graphics/event_objects/pics/people/swimmer_f/4.4bpp");
-const u32 gEventObjectPic_SwimmerF_5[] = INCBIN_U32("graphics/event_objects/pics/people/swimmer_f/5.4bpp");
-const u32 gEventObjectPic_SwimmerF_6[] = INCBIN_U32("graphics/event_objects/pics/people/swimmer_f/6.4bpp");
-const u32 gEventObjectPic_SwimmerF_7[] = INCBIN_U32("graphics/event_objects/pics/people/swimmer_f/7.4bpp");
-const u32 gEventObjectPic_SwimmerF_8[] = INCBIN_U32("graphics/event_objects/pics/people/swimmer_f/8.4bpp");
-const u32 gEventObjectPic_BlackBelt_0[] = INCBIN_U32("graphics/event_objects/pics/people/black_belt/0.4bpp");
-const u32 gEventObjectPic_BlackBelt_1[] = INCBIN_U32("graphics/event_objects/pics/people/black_belt/1.4bpp");
-const u32 gEventObjectPic_BlackBelt_2[] = INCBIN_U32("graphics/event_objects/pics/people/black_belt/2.4bpp");
-const u32 gEventObjectPic_BlackBelt_3[] = INCBIN_U32("graphics/event_objects/pics/people/black_belt/3.4bpp");
-const u32 gEventObjectPic_BlackBelt_4[] = INCBIN_U32("graphics/event_objects/pics/people/black_belt/4.4bpp");
-const u32 gEventObjectPic_BlackBelt_5[] = INCBIN_U32("graphics/event_objects/pics/people/black_belt/5.4bpp");
-const u32 gEventObjectPic_BlackBelt_6[] = INCBIN_U32("graphics/event_objects/pics/people/black_belt/6.4bpp");
-const u32 gEventObjectPic_BlackBelt_7[] = INCBIN_U32("graphics/event_objects/pics/people/black_belt/7.4bpp");
-const u32 gEventObjectPic_BlackBelt_8[] = INCBIN_U32("graphics/event_objects/pics/people/black_belt/8.4bpp");
-const u32 gEventObjectPic_Beauty_0[] = INCBIN_U32("graphics/event_objects/pics/people/beauty/0.4bpp");
-const u32 gEventObjectPic_Beauty_1[] = INCBIN_U32("graphics/event_objects/pics/people/beauty/1.4bpp");
-const u32 gEventObjectPic_Beauty_2[] = INCBIN_U32("graphics/event_objects/pics/people/beauty/2.4bpp");
-const u32 gEventObjectPic_Beauty_3[] = INCBIN_U32("graphics/event_objects/pics/people/beauty/3.4bpp");
-const u32 gEventObjectPic_Beauty_4[] = INCBIN_U32("graphics/event_objects/pics/people/beauty/4.4bpp");
-const u32 gEventObjectPic_Beauty_5[] = INCBIN_U32("graphics/event_objects/pics/people/beauty/5.4bpp");
-const u32 gEventObjectPic_Beauty_6[] = INCBIN_U32("graphics/event_objects/pics/people/beauty/6.4bpp");
-const u32 gEventObjectPic_Beauty_7[] = INCBIN_U32("graphics/event_objects/pics/people/beauty/7.4bpp");
-const u32 gEventObjectPic_Beauty_8[] = INCBIN_U32("graphics/event_objects/pics/people/beauty/8.4bpp");
-const u32 gEventObjectPic_Scientist1_0[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_1/0.4bpp");
-const u32 gEventObjectPic_Scientist1_1[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_1/1.4bpp");
-const u32 gEventObjectPic_Scientist1_2[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_1/2.4bpp");
-const u32 gEventObjectPic_Scientist1_3[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_1/3.4bpp");
-const u32 gEventObjectPic_Scientist1_4[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_1/4.4bpp");
-const u32 gEventObjectPic_Scientist1_5[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_1/5.4bpp");
-const u32 gEventObjectPic_Scientist1_6[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_1/6.4bpp");
-const u32 gEventObjectPic_Scientist1_7[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_1/7.4bpp");
-const u32 gEventObjectPic_Scientist1_8[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_1/8.4bpp");
-const u32 gEventObjectPic_Lass_0[] = INCBIN_U32("graphics/event_objects/pics/people/lass/0.4bpp");
-const u32 gEventObjectPic_Lass_1[] = INCBIN_U32("graphics/event_objects/pics/people/lass/1.4bpp");
-const u32 gEventObjectPic_Lass_2[] = INCBIN_U32("graphics/event_objects/pics/people/lass/2.4bpp");
-const u32 gEventObjectPic_Lass_3[] = INCBIN_U32("graphics/event_objects/pics/people/lass/3.4bpp");
-const u32 gEventObjectPic_Lass_4[] = INCBIN_U32("graphics/event_objects/pics/people/lass/4.4bpp");
-const u32 gEventObjectPic_Lass_5[] = INCBIN_U32("graphics/event_objects/pics/people/lass/5.4bpp");
-const u32 gEventObjectPic_Lass_6[] = INCBIN_U32("graphics/event_objects/pics/people/lass/6.4bpp");
-const u32 gEventObjectPic_Lass_7[] = INCBIN_U32("graphics/event_objects/pics/people/lass/7.4bpp");
-const u32 gEventObjectPic_Lass_8[] = INCBIN_U32("graphics/event_objects/pics/people/lass/8.4bpp");
-const u32 gEventObjectPic_Gentleman_0[] = INCBIN_U32("graphics/event_objects/pics/people/gentleman/0.4bpp");
-const u32 gEventObjectPic_Gentleman_1[] = INCBIN_U32("graphics/event_objects/pics/people/gentleman/1.4bpp");
-const u32 gEventObjectPic_Gentleman_2[] = INCBIN_U32("graphics/event_objects/pics/people/gentleman/2.4bpp");
-const u32 gEventObjectPic_Gentleman_3[] = INCBIN_U32("graphics/event_objects/pics/people/gentleman/3.4bpp");
-const u32 gEventObjectPic_Gentleman_4[] = INCBIN_U32("graphics/event_objects/pics/people/gentleman/4.4bpp");
-const u32 gEventObjectPic_Gentleman_5[] = INCBIN_U32("graphics/event_objects/pics/people/gentleman/5.4bpp");
-const u32 gEventObjectPic_Gentleman_6[] = INCBIN_U32("graphics/event_objects/pics/people/gentleman/6.4bpp");
-const u32 gEventObjectPic_Gentleman_7[] = INCBIN_U32("graphics/event_objects/pics/people/gentleman/7.4bpp");
-const u32 gEventObjectPic_Gentleman_8[] = INCBIN_U32("graphics/event_objects/pics/people/gentleman/8.4bpp");
-const u32 gEventObjectPic_Sailor_0[] = INCBIN_U32("graphics/event_objects/pics/people/sailor/0.4bpp");
-const u32 gEventObjectPic_Sailor_1[] = INCBIN_U32("graphics/event_objects/pics/people/sailor/1.4bpp");
-const u32 gEventObjectPic_Sailor_2[] = INCBIN_U32("graphics/event_objects/pics/people/sailor/2.4bpp");
-const u32 gEventObjectPic_Sailor_3[] = INCBIN_U32("graphics/event_objects/pics/people/sailor/3.4bpp");
-const u32 gEventObjectPic_Sailor_4[] = INCBIN_U32("graphics/event_objects/pics/people/sailor/4.4bpp");
-const u32 gEventObjectPic_Sailor_5[] = INCBIN_U32("graphics/event_objects/pics/people/sailor/5.4bpp");
-const u32 gEventObjectPic_Sailor_6[] = INCBIN_U32("graphics/event_objects/pics/people/sailor/6.4bpp");
-const u32 gEventObjectPic_Sailor_7[] = INCBIN_U32("graphics/event_objects/pics/people/sailor/7.4bpp");
-const u32 gEventObjectPic_Sailor_8[] = INCBIN_U32("graphics/event_objects/pics/people/sailor/8.4bpp");
-const u32 gEventObjectPic_Fisherman_0[] = INCBIN_U32("graphics/event_objects/pics/people/fisherman/0.4bpp");
-const u32 gEventObjectPic_Fisherman_1[] = INCBIN_U32("graphics/event_objects/pics/people/fisherman/1.4bpp");
-const u32 gEventObjectPic_Fisherman_2[] = INCBIN_U32("graphics/event_objects/pics/people/fisherman/2.4bpp");
-const u32 gEventObjectPic_Fisherman_3[] = INCBIN_U32("graphics/event_objects/pics/people/fisherman/3.4bpp");
-const u32 gEventObjectPic_Fisherman_4[] = INCBIN_U32("graphics/event_objects/pics/people/fisherman/4.4bpp");
-const u32 gEventObjectPic_Fisherman_5[] = INCBIN_U32("graphics/event_objects/pics/people/fisherman/5.4bpp");
-const u32 gEventObjectPic_Fisherman_6[] = INCBIN_U32("graphics/event_objects/pics/people/fisherman/6.4bpp");
-const u32 gEventObjectPic_Fisherman_7[] = INCBIN_U32("graphics/event_objects/pics/people/fisherman/7.4bpp");
-const u32 gEventObjectPic_Fisherman_8[] = INCBIN_U32("graphics/event_objects/pics/people/fisherman/8.4bpp");
-const u32 gEventObjectPic_RunningTriathleteM_0[] = INCBIN_U32("graphics/event_objects/pics/people/running_triathlete_m/0.4bpp");
-const u32 gEventObjectPic_RunningTriathleteM_1[] = INCBIN_U32("graphics/event_objects/pics/people/running_triathlete_m/1.4bpp");
-const u32 gEventObjectPic_RunningTriathleteM_2[] = INCBIN_U32("graphics/event_objects/pics/people/running_triathlete_m/2.4bpp");
-const u32 gEventObjectPic_RunningTriathleteM_3[] = INCBIN_U32("graphics/event_objects/pics/people/running_triathlete_m/3.4bpp");
-const u32 gEventObjectPic_RunningTriathleteM_4[] = INCBIN_U32("graphics/event_objects/pics/people/running_triathlete_m/4.4bpp");
-const u32 gEventObjectPic_RunningTriathleteM_5[] = INCBIN_U32("graphics/event_objects/pics/people/running_triathlete_m/5.4bpp");
-const u32 gEventObjectPic_RunningTriathleteM_6[] = INCBIN_U32("graphics/event_objects/pics/people/running_triathlete_m/6.4bpp");
-const u32 gEventObjectPic_RunningTriathleteM_7[] = INCBIN_U32("graphics/event_objects/pics/people/running_triathlete_m/7.4bpp");
-const u32 gEventObjectPic_RunningTriathleteM_8[] = INCBIN_U32("graphics/event_objects/pics/people/running_triathlete_m/8.4bpp");
-const u32 gEventObjectPic_RunningTriathleteF_0[] = INCBIN_U32("graphics/event_objects/pics/people/running_triathlete_f/0.4bpp");
-const u32 gEventObjectPic_RunningTriathleteF_1[] = INCBIN_U32("graphics/event_objects/pics/people/running_triathlete_f/1.4bpp");
-const u32 gEventObjectPic_RunningTriathleteF_2[] = INCBIN_U32("graphics/event_objects/pics/people/running_triathlete_f/2.4bpp");
-const u32 gEventObjectPic_RunningTriathleteF_3[] = INCBIN_U32("graphics/event_objects/pics/people/running_triathlete_f/3.4bpp");
-const u32 gEventObjectPic_RunningTriathleteF_4[] = INCBIN_U32("graphics/event_objects/pics/people/running_triathlete_f/4.4bpp");
-const u32 gEventObjectPic_RunningTriathleteF_5[] = INCBIN_U32("graphics/event_objects/pics/people/running_triathlete_f/5.4bpp");
-const u32 gEventObjectPic_RunningTriathleteF_6[] = INCBIN_U32("graphics/event_objects/pics/people/running_triathlete_f/6.4bpp");
-const u32 gEventObjectPic_RunningTriathleteF_7[] = INCBIN_U32("graphics/event_objects/pics/people/running_triathlete_f/7.4bpp");
-const u32 gEventObjectPic_RunningTriathleteF_8[] = INCBIN_U32("graphics/event_objects/pics/people/running_triathlete_f/8.4bpp");
-const u32 gEventObjectPic_TuberF_0[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_f/0.4bpp");
-const u32 gEventObjectPic_TuberF_1[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_f/1.4bpp");
-const u32 gEventObjectPic_TuberF_2[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_f/2.4bpp");
-const u32 gEventObjectPic_TuberF_3[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_f/3.4bpp");
-const u32 gEventObjectPic_TuberF_4[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_f/4.4bpp");
-const u32 gEventObjectPic_TuberF_5[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_f/5.4bpp");
-const u32 gEventObjectPic_TuberF_6[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_f/6.4bpp");
-const u32 gEventObjectPic_TuberF_7[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_f/7.4bpp");
-const u32 gEventObjectPic_TuberF_8[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_f/8.4bpp");
-const u32 gEventObjectPic_TuberM_0[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m/0.4bpp");
-const u32 gEventObjectPic_TuberM_1[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m/1.4bpp");
-const u32 gEventObjectPic_TuberM_2[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m/2.4bpp");
-const u32 gEventObjectPic_TuberM_3[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m/3.4bpp");
-const u32 gEventObjectPic_TuberM_4[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m/4.4bpp");
-const u32 gEventObjectPic_TuberM_5[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m/5.4bpp");
-const u32 gEventObjectPic_TuberM_6[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m/6.4bpp");
-const u32 gEventObjectPic_TuberM_7[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m/7.4bpp");
-const u32 gEventObjectPic_TuberM_8[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m/8.4bpp");
-const u32 gEventObjectPic_Hiker_0[] = INCBIN_U32("graphics/event_objects/pics/people/hiker/0.4bpp");
-const u32 gEventObjectPic_Hiker_1[] = INCBIN_U32("graphics/event_objects/pics/people/hiker/1.4bpp");
-const u32 gEventObjectPic_Hiker_2[] = INCBIN_U32("graphics/event_objects/pics/people/hiker/2.4bpp");
-const u32 gEventObjectPic_Hiker_3[] = INCBIN_U32("graphics/event_objects/pics/people/hiker/3.4bpp");
-const u32 gEventObjectPic_Hiker_4[] = INCBIN_U32("graphics/event_objects/pics/people/hiker/4.4bpp");
-const u32 gEventObjectPic_Hiker_5[] = INCBIN_U32("graphics/event_objects/pics/people/hiker/5.4bpp");
-const u32 gEventObjectPic_Hiker_6[] = INCBIN_U32("graphics/event_objects/pics/people/hiker/6.4bpp");
-const u32 gEventObjectPic_Hiker_7[] = INCBIN_U32("graphics/event_objects/pics/people/hiker/7.4bpp");
-const u32 gEventObjectPic_Hiker_8[] = INCBIN_U32("graphics/event_objects/pics/people/hiker/8.4bpp");
-const u32 gEventObjectPic_CyclingTriathleteM_0[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_m/0.4bpp");
-const u32 gEventObjectPic_CyclingTriathleteM_1[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_m/1.4bpp");
-const u32 gEventObjectPic_CyclingTriathleteM_2[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_m/2.4bpp");
-const u32 gEventObjectPic_CyclingTriathleteM_3[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_m/3.4bpp");
-const u32 gEventObjectPic_CyclingTriathleteM_4[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_m/4.4bpp");
-const u32 gEventObjectPic_CyclingTriathleteM_5[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_m/5.4bpp");
-const u32 gEventObjectPic_CyclingTriathleteM_6[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_m/6.4bpp");
-const u32 gEventObjectPic_CyclingTriathleteM_7[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_m/7.4bpp");
-const u32 gEventObjectPic_CyclingTriathleteM_8[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_m/8.4bpp");
-const u32 gEventObjectPic_CyclingTriathleteF_0[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_f/0.4bpp");
-const u32 gEventObjectPic_CyclingTriathleteF_1[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_f/1.4bpp");
-const u32 gEventObjectPic_CyclingTriathleteF_2[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_f/2.4bpp");
-const u32 gEventObjectPic_CyclingTriathleteF_3[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_f/3.4bpp");
-const u32 gEventObjectPic_CyclingTriathleteF_4[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_f/4.4bpp");
-const u32 gEventObjectPic_CyclingTriathleteF_5[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_f/5.4bpp");
-const u32 gEventObjectPic_CyclingTriathleteF_6[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_f/6.4bpp");
-const u32 gEventObjectPic_CyclingTriathleteF_7[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_f/7.4bpp");
-const u32 gEventObjectPic_CyclingTriathleteF_8[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_f/8.4bpp");
-const u32 gEventObjectPic_Man5_0[] = INCBIN_U32("graphics/event_objects/pics/people/man_5/0.4bpp");
-const u32 gEventObjectPic_Man5_1[] = INCBIN_U32("graphics/event_objects/pics/people/man_5/1.4bpp");
-const u32 gEventObjectPic_Man5_2[] = INCBIN_U32("graphics/event_objects/pics/people/man_5/2.4bpp");
-const u32 gEventObjectPic_Man5_3[] = INCBIN_U32("graphics/event_objects/pics/people/man_5/3.4bpp");
-const u32 gEventObjectPic_Man5_4[] = INCBIN_U32("graphics/event_objects/pics/people/man_5/4.4bpp");
-const u32 gEventObjectPic_Man5_5[] = INCBIN_U32("graphics/event_objects/pics/people/man_5/5.4bpp");
-const u32 gEventObjectPic_Man5_6[] = INCBIN_U32("graphics/event_objects/pics/people/man_5/6.4bpp");
-const u32 gEventObjectPic_Man5_7[] = INCBIN_U32("graphics/event_objects/pics/people/man_5/7.4bpp");
-const u32 gEventObjectPic_Man5_8[] = INCBIN_U32("graphics/event_objects/pics/people/man_5/8.4bpp");
-const u32 gEventObjectPic_Man6_0[] = INCBIN_U32("graphics/event_objects/pics/people/man_6/0.4bpp");
-const u32 gEventObjectPic_Man6_1[] = INCBIN_U32("graphics/event_objects/pics/people/man_6/1.4bpp");
-const u32 gEventObjectPic_Man6_2[] = INCBIN_U32("graphics/event_objects/pics/people/man_6/2.4bpp");
-const u32 gEventObjectPic_Man6_3[] = INCBIN_U32("graphics/event_objects/pics/people/man_6/3.4bpp");
-const u32 gEventObjectPic_Man6_4[] = INCBIN_U32("graphics/event_objects/pics/people/man_6/4.4bpp");
-const u32 gEventObjectPic_Man6_5[] = INCBIN_U32("graphics/event_objects/pics/people/man_6/5.4bpp");
-const u32 gEventObjectPic_Man6_6[] = INCBIN_U32("graphics/event_objects/pics/people/man_6/6.4bpp");
-const u32 gEventObjectPic_Man6_7[] = INCBIN_U32("graphics/event_objects/pics/people/man_6/7.4bpp");
-const u32 gEventObjectPic_Man6_8[] = INCBIN_U32("graphics/event_objects/pics/people/man_6/8.4bpp");
-const u32 gEventObjectPic_Nurse_0[] = INCBIN_U32("graphics/event_objects/pics/people/nurse/0.4bpp");
-const u32 gEventObjectPic_Nurse_1[] = INCBIN_U32("graphics/event_objects/pics/people/nurse/1.4bpp");
-const u32 gEventObjectPic_Nurse_2[] = INCBIN_U32("graphics/event_objects/pics/people/nurse/2.4bpp");
-const u32 gEventObjectPic_Nurse_3[] = INCBIN_U32("graphics/event_objects/pics/people/nurse/3.4bpp");
+const u32 gEventObjectPic_LittleBoy1[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_1.4bpp");
+const u32 gEventObjectPic_LittleGirl1[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl_1.4bpp");
+const u32 gEventObjectPic_Boy1[] = INCBIN_U32("graphics/event_objects/pics/people/boy_1.4bpp");
+const u32 gEventObjectPic_Girl1[] = INCBIN_U32("graphics/event_objects/pics/people/girl_1.4bpp");
+const u32 gEventObjectPic_Boy2[] = INCBIN_U32("graphics/event_objects/pics/people/boy_2.4bpp");
+const u32 gEventObjectPic_Girl2[] = INCBIN_U32("graphics/event_objects/pics/people/girl_2.4bpp");
+const u32 gEventObjectPic_LittleBoy2[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_2.4bpp");
+const u32 gEventObjectPic_LittleGirl2[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl_2.4bpp");
+const u32 gEventObjectPic_Boy3[] = INCBIN_U32("graphics/event_objects/pics/people/boy_3.4bpp");
+const u32 gEventObjectPic_Girl3[] = INCBIN_U32("graphics/event_objects/pics/people/girl_3.4bpp");
+const u32 gEventObjectPic_Boy4[] = INCBIN_U32("graphics/event_objects/pics/people/boy_4.4bpp");
+const u32 gEventObjectPic_Woman1[] = INCBIN_U32("graphics/event_objects/pics/people/woman_1.4bpp");
+const u32 gEventObjectPic_FatMan[] = INCBIN_U32("graphics/event_objects/pics/people/fat_man.4bpp");
+const u32 gEventObjectPic_Woman2[] = INCBIN_U32("graphics/event_objects/pics/people/woman_2.4bpp");
+const u32 gEventObjectPic_Man1[] = INCBIN_U32("graphics/event_objects/pics/people/man_1.4bpp");
+const u32 gEventObjectPic_Woman3[] = INCBIN_U32("graphics/event_objects/pics/people/woman_3.4bpp");
+const u32 gEventObjectPic_OldMan1[] = INCBIN_U32("graphics/event_objects/pics/people/old_man_1.4bpp");
+const u32 gEventObjectPic_OldWoman1[] = INCBIN_U32("graphics/event_objects/pics/people/old_woman_1.4bpp");
+const u32 gEventObjectPic_Man2[] = INCBIN_U32("graphics/event_objects/pics/people/man_2.4bpp");
+const u32 gEventObjectPic_Woman4[] = INCBIN_U32("graphics/event_objects/pics/people/woman_4.4bpp");
+const u32 gEventObjectPic_Man3[] = INCBIN_U32("graphics/event_objects/pics/people/man_3.4bpp");
+const u32 gEventObjectPic_Woman5[] = INCBIN_U32("graphics/event_objects/pics/people/woman_5.4bpp");
+const u32 gEventObjectPic_Cook[] = INCBIN_U32("graphics/event_objects/pics/people/cook.4bpp");
+const u32 gEventObjectPic_Woman6[] = INCBIN_U32("graphics/event_objects/pics/people/woman_6.4bpp");
+const u32 gEventObjectPic_OldMan2[] = INCBIN_U32("graphics/event_objects/pics/people/old_man_2.4bpp");
+const u32 gEventObjectPic_OldWoman2[] = INCBIN_U32("graphics/event_objects/pics/people/old_woman_2.4bpp");
+const u32 gEventObjectPic_Camper[] = INCBIN_U32("graphics/event_objects/pics/people/camper.4bpp");
+const u32 gEventObjectPic_Picnicker[] = INCBIN_U32("graphics/event_objects/pics/people/picnicker.4bpp");
+const u32 gEventObjectPic_Man4[] = INCBIN_U32("graphics/event_objects/pics/people/man_4.4bpp");
+const u32 gEventObjectPic_Woman7[] = INCBIN_U32("graphics/event_objects/pics/people/woman_7.4bpp");
+const u32 gEventObjectPic_Youngster[] = INCBIN_U32("graphics/event_objects/pics/people/youngster.4bpp");
+const u32 gEventObjectPic_BugCatcher[] = INCBIN_U32("graphics/event_objects/pics/people/bug_catcher.4bpp");
+const u32 gEventObjectPic_PsychicM[] = INCBIN_U32("graphics/event_objects/pics/people/psychic_m.4bpp");
+const u32 gEventObjectPic_SchoolKidM[] = INCBIN_U32("graphics/event_objects/pics/people/school_kid_m.4bpp");
+const u32 gEventObjectPic_Maniac[] = INCBIN_U32("graphics/event_objects/pics/people/maniac.4bpp");
+const u32 gEventObjectPic_HexManiac[] = INCBIN_U32("graphics/event_objects/pics/people/hex_maniac.4bpp");
+const u32 gEventObjectPic_UnusedWoman[] = INCBIN_U32("graphics/event_objects/pics/people/unused_woman.4bpp");
+const u32 gEventObjectPic_SwimmerM[] = INCBIN_U32("graphics/event_objects/pics/people/swimmer_m.4bpp");
+const u32 gEventObjectPic_SwimmerF[] = INCBIN_U32("graphics/event_objects/pics/people/swimmer_f.4bpp");
+const u32 gEventObjectPic_BlackBelt[] = INCBIN_U32("graphics/event_objects/pics/people/black_belt.4bpp");
+const u32 gEventObjectPic_Beauty[] = INCBIN_U32("graphics/event_objects/pics/people/beauty.4bpp");
+const u32 gEventObjectPic_Scientist1[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_1.4bpp");
+const u32 gEventObjectPic_Lass[] = INCBIN_U32("graphics/event_objects/pics/people/lass.4bpp");
+const u32 gEventObjectPic_Gentleman[] = INCBIN_U32("graphics/event_objects/pics/people/gentleman.4bpp");
+const u32 gEventObjectPic_Sailor[] = INCBIN_U32("graphics/event_objects/pics/people/sailor.4bpp");
+const u32 gEventObjectPic_Fisherman[] = INCBIN_U32("graphics/event_objects/pics/people/fisherman.4bpp");
+const u32 gEventObjectPic_RunningTriathleteM[] = INCBIN_U32("graphics/event_objects/pics/people/running_triathlete_m.4bpp");
+const u32 gEventObjectPic_RunningTriathleteF[] = INCBIN_U32("graphics/event_objects/pics/people/running_triathlete_f.4bpp");
+const u32 gEventObjectPic_TuberF[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_f.4bpp");
+const u32 gEventObjectPic_TuberM[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m.4bpp");
+const u32 gEventObjectPic_Hiker[] = INCBIN_U32("graphics/event_objects/pics/people/hiker.4bpp");
+const u32 gEventObjectPic_CyclingTriathleteM[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_m.4bpp");
+const u32 gEventObjectPic_CyclingTriathleteF[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_f.4bpp");
+const u32 gEventObjectPic_Man5[] = INCBIN_U32("graphics/event_objects/pics/people/man_5.4bpp");
+const u32 gEventObjectPic_Man6[] = INCBIN_U32("graphics/event_objects/pics/people/man_6.4bpp");
+const u32 gEventObjectPic_Nurse[] = INCBIN_U32("graphics/event_objects/pics/people/nurse.4bpp");
 const u32 gEventObjectPic_ItemBall[] = INCBIN_U32("graphics/event_objects/pics/misc/item_ball.4bpp");
-const u32 gEventObjectPic_ProfBirch_0[] = INCBIN_U32("graphics/event_objects/pics/people/prof_birch/0.4bpp");
-const u32 gEventObjectPic_ProfBirch_1[] = INCBIN_U32("graphics/event_objects/pics/people/prof_birch/1.4bpp");
-const u32 gEventObjectPic_ProfBirch_2[] = INCBIN_U32("graphics/event_objects/pics/people/prof_birch/2.4bpp");
-const u32 gEventObjectPic_ProfBirch_3[] = INCBIN_U32("graphics/event_objects/pics/people/prof_birch/3.4bpp");
-const u32 gEventObjectPic_ProfBirch_4[] = INCBIN_U32("graphics/event_objects/pics/people/prof_birch/4.4bpp");
-const u32 gEventObjectPic_ProfBirch_5[] = INCBIN_U32("graphics/event_objects/pics/people/prof_birch/5.4bpp");
-const u32 gEventObjectPic_ProfBirch_6[] = INCBIN_U32("graphics/event_objects/pics/people/prof_birch/6.4bpp");
-const u32 gEventObjectPic_ProfBirch_7[] = INCBIN_U32("graphics/event_objects/pics/people/prof_birch/7.4bpp");
-const u32 gEventObjectPic_ProfBirch_8[] = INCBIN_U32("graphics/event_objects/pics/people/prof_birch/8.4bpp");
-const u32 gEventObjectPic_ReporterM_0[] = INCBIN_U32("graphics/event_objects/pics/people/reporter_m/0.4bpp");
-const u32 gEventObjectPic_ReporterM_1[] = INCBIN_U32("graphics/event_objects/pics/people/reporter_m/1.4bpp");
-const u32 gEventObjectPic_ReporterM_2[] = INCBIN_U32("graphics/event_objects/pics/people/reporter_m/2.4bpp");
-const u32 gEventObjectPic_ReporterM_3[] = INCBIN_U32("graphics/event_objects/pics/people/reporter_m/3.4bpp");
-const u32 gEventObjectPic_ReporterM_4[] = INCBIN_U32("graphics/event_objects/pics/people/reporter_m/4.4bpp");
-const u32 gEventObjectPic_ReporterM_5[] = INCBIN_U32("graphics/event_objects/pics/people/reporter_m/5.4bpp");
-const u32 gEventObjectPic_ReporterM_6[] = INCBIN_U32("graphics/event_objects/pics/people/reporter_m/6.4bpp");
-const u32 gEventObjectPic_ReporterM_7[] = INCBIN_U32("graphics/event_objects/pics/people/reporter_m/7.4bpp");
-const u32 gEventObjectPic_ReporterM_8[] = INCBIN_U32("graphics/event_objects/pics/people/reporter_m/8.4bpp");
-const u32 gEventObjectPic_ReporterF_0[] = INCBIN_U32("graphics/event_objects/pics/people/reporter_f/0.4bpp");
-const u32 gEventObjectPic_ReporterF_1[] = INCBIN_U32("graphics/event_objects/pics/people/reporter_f/1.4bpp");
-const u32 gEventObjectPic_ReporterF_2[] = INCBIN_U32("graphics/event_objects/pics/people/reporter_f/2.4bpp");
-const u32 gEventObjectPic_ReporterF_3[] = INCBIN_U32("graphics/event_objects/pics/people/reporter_f/3.4bpp");
-const u32 gEventObjectPic_ReporterF_4[] = INCBIN_U32("graphics/event_objects/pics/people/reporter_f/4.4bpp");
-const u32 gEventObjectPic_ReporterF_5[] = INCBIN_U32("graphics/event_objects/pics/people/reporter_f/5.4bpp");
-const u32 gEventObjectPic_ReporterF_6[] = INCBIN_U32("graphics/event_objects/pics/people/reporter_f/6.4bpp");
-const u32 gEventObjectPic_ReporterF_7[] = INCBIN_U32("graphics/event_objects/pics/people/reporter_f/7.4bpp");
-const u32 gEventObjectPic_ReporterF_8[] = INCBIN_U32("graphics/event_objects/pics/people/reporter_f/8.4bpp");
-const u32 gEventObjectPic_MauvilleOldMan1_0[] = INCBIN_U32("graphics/event_objects/pics/people/mauville_old_man_1/0.4bpp");
-const u32 gEventObjectPic_MauvilleOldMan1_1[] = INCBIN_U32("graphics/event_objects/pics/people/mauville_old_man_1/1.4bpp");
-const u32 gEventObjectPic_MauvilleOldMan1_2[] = INCBIN_U32("graphics/event_objects/pics/people/mauville_old_man_1/2.4bpp");
-const u32 gEventObjectPic_MauvilleOldMan1_3[] = INCBIN_U32("graphics/event_objects/pics/people/mauville_old_man_1/3.4bpp");
-const u32 gEventObjectPic_MauvilleOldMan1_4[] = INCBIN_U32("graphics/event_objects/pics/people/mauville_old_man_1/4.4bpp");
-const u32 gEventObjectPic_MauvilleOldMan1_5[] = INCBIN_U32("graphics/event_objects/pics/people/mauville_old_man_1/5.4bpp");
-const u32 gEventObjectPic_MauvilleOldMan1_6[] = INCBIN_U32("graphics/event_objects/pics/people/mauville_old_man_1/6.4bpp");
-const u32 gEventObjectPic_MauvilleOldMan1_7[] = INCBIN_U32("graphics/event_objects/pics/people/mauville_old_man_1/7.4bpp");
-const u32 gEventObjectPic_MauvilleOldMan1_8[] = INCBIN_U32("graphics/event_objects/pics/people/mauville_old_man_1/8.4bpp");
-const u32 gEventObjectPic_MauvilleOldMan2_0[] = INCBIN_U32("graphics/event_objects/pics/people/mauville_old_man_2/0.4bpp");
-const u32 gEventObjectPic_MauvilleOldMan2_1[] = INCBIN_U32("graphics/event_objects/pics/people/mauville_old_man_2/1.4bpp");
-const u32 gEventObjectPic_MauvilleOldMan2_2[] = INCBIN_U32("graphics/event_objects/pics/people/mauville_old_man_2/2.4bpp");
-const u32 gEventObjectPic_MauvilleOldMan2_3[] = INCBIN_U32("graphics/event_objects/pics/people/mauville_old_man_2/3.4bpp");
-const u32 gEventObjectPic_MauvilleOldMan2_4[] = INCBIN_U32("graphics/event_objects/pics/people/mauville_old_man_2/4.4bpp");
-const u32 gEventObjectPic_MauvilleOldMan2_5[] = INCBIN_U32("graphics/event_objects/pics/people/mauville_old_man_2/5.4bpp");
-const u32 gEventObjectPic_MauvilleOldMan2_6[] = INCBIN_U32("graphics/event_objects/pics/people/mauville_old_man_2/6.4bpp");
-const u32 gEventObjectPic_MauvilleOldMan2_7[] = INCBIN_U32("graphics/event_objects/pics/people/mauville_old_man_2/7.4bpp");
-const u32 gEventObjectPic_MauvilleOldMan2_8[] = INCBIN_U32("graphics/event_objects/pics/people/mauville_old_man_2/8.4bpp");
-const u32 gEventObjectPic_MartEmployee_0[] = INCBIN_U32("graphics/event_objects/pics/people/mart_employee/0.4bpp");
-const u32 gEventObjectPic_MartEmployee_1[] = INCBIN_U32("graphics/event_objects/pics/people/mart_employee/1.4bpp");
-const u32 gEventObjectPic_MartEmployee_2[] = INCBIN_U32("graphics/event_objects/pics/people/mart_employee/2.4bpp");
-const u32 gEventObjectPic_MartEmployee_3[] = INCBIN_U32("graphics/event_objects/pics/people/mart_employee/3.4bpp");
-const u32 gEventObjectPic_MartEmployee_4[] = INCBIN_U32("graphics/event_objects/pics/people/mart_employee/4.4bpp");
-const u32 gEventObjectPic_MartEmployee_5[] = INCBIN_U32("graphics/event_objects/pics/people/mart_employee/5.4bpp");
-const u32 gEventObjectPic_MartEmployee_6[] = INCBIN_U32("graphics/event_objects/pics/people/mart_employee/6.4bpp");
-const u32 gEventObjectPic_MartEmployee_7[] = INCBIN_U32("graphics/event_objects/pics/people/mart_employee/7.4bpp");
-const u32 gEventObjectPic_MartEmployee_8[] = INCBIN_U32("graphics/event_objects/pics/people/mart_employee/8.4bpp");
-const u32 gEventObjectPic_RooftopSaleWoman_0[] = INCBIN_U32("graphics/event_objects/pics/people/rooftop_sale_woman/0.4bpp");
-const u32 gEventObjectPic_RooftopSaleWoman_1[] = INCBIN_U32("graphics/event_objects/pics/people/rooftop_sale_woman/1.4bpp");
-const u32 gEventObjectPic_RooftopSaleWoman_2[] = INCBIN_U32("graphics/event_objects/pics/people/rooftop_sale_woman/2.4bpp");
-const u32 gEventObjectPic_RooftopSaleWoman_3[] = INCBIN_U32("graphics/event_objects/pics/people/rooftop_sale_woman/3.4bpp");
-const u32 gEventObjectPic_RooftopSaleWoman_4[] = INCBIN_U32("graphics/event_objects/pics/people/rooftop_sale_woman/4.4bpp");
-const u32 gEventObjectPic_RooftopSaleWoman_5[] = INCBIN_U32("graphics/event_objects/pics/people/rooftop_sale_woman/5.4bpp");
-const u32 gEventObjectPic_RooftopSaleWoman_6[] = INCBIN_U32("graphics/event_objects/pics/people/rooftop_sale_woman/6.4bpp");
-const u32 gEventObjectPic_RooftopSaleWoman_7[] = INCBIN_U32("graphics/event_objects/pics/people/rooftop_sale_woman/7.4bpp");
-const u32 gEventObjectPic_RooftopSaleWoman_8[] = INCBIN_U32("graphics/event_objects/pics/people/rooftop_sale_woman/8.4bpp");
-const u32 gEventObjectPic_Teala_0[] = INCBIN_U32("graphics/event_objects/pics/people/teala/0.4bpp");
-const u32 gEventObjectPic_Teala_1[] = INCBIN_U32("graphics/event_objects/pics/people/teala/1.4bpp");
-const u32 gEventObjectPic_Teala_2[] = INCBIN_U32("graphics/event_objects/pics/people/teala/2.4bpp");
-const u32 gEventObjectPic_Teala_3[] = INCBIN_U32("graphics/event_objects/pics/people/teala/3.4bpp");
-const u32 gEventObjectPic_Teala_4[] = INCBIN_U32("graphics/event_objects/pics/people/teala/4.4bpp");
-const u32 gEventObjectPic_Teala_5[] = INCBIN_U32("graphics/event_objects/pics/people/teala/5.4bpp");
-const u32 gEventObjectPic_Teala_6[] = INCBIN_U32("graphics/event_objects/pics/people/teala/6.4bpp");
-const u32 gEventObjectPic_Teala_7[] = INCBIN_U32("graphics/event_objects/pics/people/teala/7.4bpp");
-const u32 gEventObjectPic_Teala_8[] = INCBIN_U32("graphics/event_objects/pics/people/teala/8.4bpp");
-const u32 gEventObjectPic_Artist_0[] = INCBIN_U32("graphics/event_objects/pics/people/artist/0.4bpp");
-const u32 gEventObjectPic_Artist_1[] = INCBIN_U32("graphics/event_objects/pics/people/artist/1.4bpp");
-const u32 gEventObjectPic_Artist_2[] = INCBIN_U32("graphics/event_objects/pics/people/artist/2.4bpp");
-const u32 gEventObjectPic_Artist_3[] = INCBIN_U32("graphics/event_objects/pics/people/artist/3.4bpp");
-const u32 gEventObjectPic_Artist_4[] = INCBIN_U32("graphics/event_objects/pics/people/artist/4.4bpp");
-const u32 gEventObjectPic_Artist_5[] = INCBIN_U32("graphics/event_objects/pics/people/artist/5.4bpp");
-const u32 gEventObjectPic_Artist_6[] = INCBIN_U32("graphics/event_objects/pics/people/artist/6.4bpp");
-const u32 gEventObjectPic_Artist_7[] = INCBIN_U32("graphics/event_objects/pics/people/artist/7.4bpp");
-const u32 gEventObjectPic_Artist_8[] = INCBIN_U32("graphics/event_objects/pics/people/artist/8.4bpp");
-const u32 gEventObjectPic_Cameraman_0[] = INCBIN_U32("graphics/event_objects/pics/people/cameraman/0.4bpp");
-const u32 gEventObjectPic_Cameraman_1[] = INCBIN_U32("graphics/event_objects/pics/people/cameraman/1.4bpp");
-const u32 gEventObjectPic_Cameraman_2[] = INCBIN_U32("graphics/event_objects/pics/people/cameraman/2.4bpp");
-const u32 gEventObjectPic_Cameraman_3[] = INCBIN_U32("graphics/event_objects/pics/people/cameraman/3.4bpp");
-const u32 gEventObjectPic_Cameraman_4[] = INCBIN_U32("graphics/event_objects/pics/people/cameraman/4.4bpp");
-const u32 gEventObjectPic_Cameraman_5[] = INCBIN_U32("graphics/event_objects/pics/people/cameraman/5.4bpp");
-const u32 gEventObjectPic_Cameraman_6[] = INCBIN_U32("graphics/event_objects/pics/people/cameraman/6.4bpp");
-const u32 gEventObjectPic_Cameraman_7[] = INCBIN_U32("graphics/event_objects/pics/people/cameraman/7.4bpp");
-const u32 gEventObjectPic_Cameraman_8[] = INCBIN_U32("graphics/event_objects/pics/people/cameraman/8.4bpp");
-const u32 gEventObjectPic_Scientist2_0[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_2/0.4bpp");
-const u32 gEventObjectPic_Scientist2_1[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_2/1.4bpp");
-const u32 gEventObjectPic_Scientist2_2[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_2/2.4bpp");
-const u32 gEventObjectPic_Scientist2_3[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_2/3.4bpp");
-const u32 gEventObjectPic_Scientist2_4[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_2/4.4bpp");
-const u32 gEventObjectPic_Scientist2_5[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_2/5.4bpp");
-const u32 gEventObjectPic_Scientist2_6[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_2/6.4bpp");
-const u32 gEventObjectPic_Scientist2_7[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_2/7.4bpp");
-const u32 gEventObjectPic_Scientist2_8[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_2/8.4bpp");
-const u32 gEventObjectPic_Man7_0[] = INCBIN_U32("graphics/event_objects/pics/people/man_7/0.4bpp");
-const u32 gEventObjectPic_Man7_1[] = INCBIN_U32("graphics/event_objects/pics/people/man_7/1.4bpp");
-const u32 gEventObjectPic_Man7_2[] = INCBIN_U32("graphics/event_objects/pics/people/man_7/2.4bpp");
-const u32 gEventObjectPic_Man7_3[] = INCBIN_U32("graphics/event_objects/pics/people/man_7/3.4bpp");
-const u32 gEventObjectPic_Man7_4[] = INCBIN_U32("graphics/event_objects/pics/people/man_7/4.4bpp");
-const u32 gEventObjectPic_Man7_5[] = INCBIN_U32("graphics/event_objects/pics/people/man_7/5.4bpp");
-const u32 gEventObjectPic_Man7_6[] = INCBIN_U32("graphics/event_objects/pics/people/man_7/6.4bpp");
-const u32 gEventObjectPic_Man7_7[] = INCBIN_U32("graphics/event_objects/pics/people/man_7/7.4bpp");
-const u32 gEventObjectPic_Man7_8[] = INCBIN_U32("graphics/event_objects/pics/people/man_7/8.4bpp");
-const u32 gEventObjectPic_AquaMemberM_0[] = INCBIN_U32("graphics/event_objects/pics/people/aqua_member_m/0.4bpp");
-const u32 gEventObjectPic_AquaMemberM_1[] = INCBIN_U32("graphics/event_objects/pics/people/aqua_member_m/1.4bpp");
-const u32 gEventObjectPic_AquaMemberM_2[] = INCBIN_U32("graphics/event_objects/pics/people/aqua_member_m/2.4bpp");
-const u32 gEventObjectPic_AquaMemberM_3[] = INCBIN_U32("graphics/event_objects/pics/people/aqua_member_m/3.4bpp");
-const u32 gEventObjectPic_AquaMemberM_4[] = INCBIN_U32("graphics/event_objects/pics/people/aqua_member_m/4.4bpp");
-const u32 gEventObjectPic_AquaMemberM_5[] = INCBIN_U32("graphics/event_objects/pics/people/aqua_member_m/5.4bpp");
-const u32 gEventObjectPic_AquaMemberM_6[] = INCBIN_U32("graphics/event_objects/pics/people/aqua_member_m/6.4bpp");
-const u32 gEventObjectPic_AquaMemberM_7[] = INCBIN_U32("graphics/event_objects/pics/people/aqua_member_m/7.4bpp");
-const u32 gEventObjectPic_AquaMemberM_8[] = INCBIN_U32("graphics/event_objects/pics/people/aqua_member_m/8.4bpp");
-const u32 gEventObjectPic_AquaMemberF_0[] = INCBIN_U32("graphics/event_objects/pics/people/aqua_member_f/0.4bpp");
-const u32 gEventObjectPic_AquaMemberF_1[] = INCBIN_U32("graphics/event_objects/pics/people/aqua_member_f/1.4bpp");
-const u32 gEventObjectPic_AquaMemberF_2[] = INCBIN_U32("graphics/event_objects/pics/people/aqua_member_f/2.4bpp");
-const u32 gEventObjectPic_AquaMemberF_3[] = INCBIN_U32("graphics/event_objects/pics/people/aqua_member_f/3.4bpp");
-const u32 gEventObjectPic_AquaMemberF_4[] = INCBIN_U32("graphics/event_objects/pics/people/aqua_member_f/4.4bpp");
-const u32 gEventObjectPic_AquaMemberF_5[] = INCBIN_U32("graphics/event_objects/pics/people/aqua_member_f/5.4bpp");
-const u32 gEventObjectPic_AquaMemberF_6[] = INCBIN_U32("graphics/event_objects/pics/people/aqua_member_f/6.4bpp");
-const u32 gEventObjectPic_AquaMemberF_7[] = INCBIN_U32("graphics/event_objects/pics/people/aqua_member_f/7.4bpp");
-const u32 gEventObjectPic_AquaMemberF_8[] = INCBIN_U32("graphics/event_objects/pics/people/aqua_member_f/8.4bpp");
-const u32 gEventObjectPic_MagmaMemberM_0[] = INCBIN_U32("graphics/event_objects/pics/people/magma_member_m/0.4bpp");
-const u32 gEventObjectPic_MagmaMemberM_1[] = INCBIN_U32("graphics/event_objects/pics/people/magma_member_m/1.4bpp");
-const u32 gEventObjectPic_MagmaMemberM_2[] = INCBIN_U32("graphics/event_objects/pics/people/magma_member_m/2.4bpp");
-const u32 gEventObjectPic_MagmaMemberM_3[] = INCBIN_U32("graphics/event_objects/pics/people/magma_member_m/3.4bpp");
-const u32 gEventObjectPic_MagmaMemberM_4[] = INCBIN_U32("graphics/event_objects/pics/people/magma_member_m/4.4bpp");
-const u32 gEventObjectPic_MagmaMemberM_5[] = INCBIN_U32("graphics/event_objects/pics/people/magma_member_m/5.4bpp");
-const u32 gEventObjectPic_MagmaMemberM_6[] = INCBIN_U32("graphics/event_objects/pics/people/magma_member_m/6.4bpp");
-const u32 gEventObjectPic_MagmaMemberM_7[] = INCBIN_U32("graphics/event_objects/pics/people/magma_member_m/7.4bpp");
-const u32 gEventObjectPic_MagmaMemberM_8[] = INCBIN_U32("graphics/event_objects/pics/people/magma_member_m/8.4bpp");
-const u32 gEventObjectPic_MagmaMemberF_0[] = INCBIN_U32("graphics/event_objects/pics/people/magma_member_f/0.4bpp");
-const u32 gEventObjectPic_MagmaMemberF_1[] = INCBIN_U32("graphics/event_objects/pics/people/magma_member_f/1.4bpp");
-const u32 gEventObjectPic_MagmaMemberF_2[] = INCBIN_U32("graphics/event_objects/pics/people/magma_member_f/2.4bpp");
-const u32 gEventObjectPic_MagmaMemberF_3[] = INCBIN_U32("graphics/event_objects/pics/people/magma_member_f/3.4bpp");
-const u32 gEventObjectPic_MagmaMemberF_4[] = INCBIN_U32("graphics/event_objects/pics/people/magma_member_f/4.4bpp");
-const u32 gEventObjectPic_MagmaMemberF_5[] = INCBIN_U32("graphics/event_objects/pics/people/magma_member_f/5.4bpp");
-const u32 gEventObjectPic_MagmaMemberF_6[] = INCBIN_U32("graphics/event_objects/pics/people/magma_member_f/6.4bpp");
-const u32 gEventObjectPic_MagmaMemberF_7[] = INCBIN_U32("graphics/event_objects/pics/people/magma_member_f/7.4bpp");
-const u32 gEventObjectPic_MagmaMemberF_8[] = INCBIN_U32("graphics/event_objects/pics/people/magma_member_f/8.4bpp");
-const u32 gEventObjectPic_Sidney_0[] = INCBIN_U32("graphics/event_objects/pics/people/sidney/0.4bpp");
-const u32 gEventObjectPic_Sidney_1[] = INCBIN_U32("graphics/event_objects/pics/people/sidney/1.4bpp");
-const u32 gEventObjectPic_Sidney_2[] = INCBIN_U32("graphics/event_objects/pics/people/sidney/2.4bpp");
-const u32 gEventObjectPic_Phoebe_0[] = INCBIN_U32("graphics/event_objects/pics/people/phoebe/0.4bpp");
-const u32 gEventObjectPic_Phoebe_1[] = INCBIN_U32("graphics/event_objects/pics/people/phoebe/1.4bpp");
-const u32 gEventObjectPic_Phoebe_2[] = INCBIN_U32("graphics/event_objects/pics/people/phoebe/2.4bpp");
-const u32 gEventObjectPic_Glacia_0[] = INCBIN_U32("graphics/event_objects/pics/people/glacia/0.4bpp");
-const u32 gEventObjectPic_Glacia_1[] = INCBIN_U32("graphics/event_objects/pics/people/glacia/1.4bpp");
-const u32 gEventObjectPic_Glacia_2[] = INCBIN_U32("graphics/event_objects/pics/people/glacia/2.4bpp");
-const u32 gEventObjectPic_Drake_0[] = INCBIN_U32("graphics/event_objects/pics/people/drake/0.4bpp");
-const u32 gEventObjectPic_Drake_1[] = INCBIN_U32("graphics/event_objects/pics/people/drake/1.4bpp");
-const u32 gEventObjectPic_Drake_2[] = INCBIN_U32("graphics/event_objects/pics/people/drake/2.4bpp");
-const u32 gEventObjectPic_Roxanne_0[] = INCBIN_U32("graphics/event_objects/pics/people/roxanne/0.4bpp");
-const u32 gEventObjectPic_Roxanne_1[] = INCBIN_U32("graphics/event_objects/pics/people/roxanne/1.4bpp");
-const u32 gEventObjectPic_Roxanne_2[] = INCBIN_U32("graphics/event_objects/pics/people/roxanne/2.4bpp");
-const u32 gEventObjectPic_Brawly_0[] = INCBIN_U32("graphics/event_objects/pics/people/brawly/0.4bpp");
-const u32 gEventObjectPic_Brawly_1[] = INCBIN_U32("graphics/event_objects/pics/people/brawly/1.4bpp");
-const u32 gEventObjectPic_Brawly_2[] = INCBIN_U32("graphics/event_objects/pics/people/brawly/2.4bpp");
-const u32 gEventObjectPic_Wattson_0[] = INCBIN_U32("graphics/event_objects/pics/people/wattson/0.4bpp");
-const u32 gEventObjectPic_Wattson_1[] = INCBIN_U32("graphics/event_objects/pics/people/wattson/1.4bpp");
-const u32 gEventObjectPic_Wattson_2[] = INCBIN_U32("graphics/event_objects/pics/people/wattson/2.4bpp");
-const u32 gEventObjectPic_Flannery_0[] = INCBIN_U32("graphics/event_objects/pics/people/flannery/0.4bpp");
-const u32 gEventObjectPic_Flannery_1[] = INCBIN_U32("graphics/event_objects/pics/people/flannery/1.4bpp");
-const u32 gEventObjectPic_Flannery_2[] = INCBIN_U32("graphics/event_objects/pics/people/flannery/2.4bpp");
-const u32 gEventObjectPic_Norman_0[] = INCBIN_U32("graphics/event_objects/pics/people/norman/0.4bpp");
-const u32 gEventObjectPic_Norman_1[] = INCBIN_U32("graphics/event_objects/pics/people/norman/1.4bpp");
-const u32 gEventObjectPic_Norman_2[] = INCBIN_U32("graphics/event_objects/pics/people/norman/2.4bpp");
-const u32 gEventObjectPic_Norman_3[] = INCBIN_U32("graphics/event_objects/pics/people/norman/3.4bpp");
-const u32 gEventObjectPic_Norman_4[] = INCBIN_U32("graphics/event_objects/pics/people/norman/4.4bpp");
-const u32 gEventObjectPic_Norman_5[] = INCBIN_U32("graphics/event_objects/pics/people/norman/5.4bpp");
-const u32 gEventObjectPic_Norman_6[] = INCBIN_U32("graphics/event_objects/pics/people/norman/6.4bpp");
-const u32 gEventObjectPic_Norman_7[] = INCBIN_U32("graphics/event_objects/pics/people/norman/7.4bpp");
-const u32 gEventObjectPic_Norman_8[] = INCBIN_U32("graphics/event_objects/pics/people/norman/8.4bpp");
-const u32 gEventObjectPic_Winona_0[] = INCBIN_U32("graphics/event_objects/pics/people/winona/0.4bpp");
-const u32 gEventObjectPic_Winona_1[] = INCBIN_U32("graphics/event_objects/pics/people/winona/1.4bpp");
-const u32 gEventObjectPic_Winona_2[] = INCBIN_U32("graphics/event_objects/pics/people/winona/2.4bpp");
-const u32 gEventObjectPic_Liza_0[] = INCBIN_U32("graphics/event_objects/pics/people/liza/0.4bpp");
-const u32 gEventObjectPic_Liza_1[] = INCBIN_U32("graphics/event_objects/pics/people/liza/1.4bpp");
-const u32 gEventObjectPic_Liza_2[] = INCBIN_U32("graphics/event_objects/pics/people/liza/2.4bpp");
-const u32 gEventObjectPic_Tate_0[] = INCBIN_U32("graphics/event_objects/pics/people/tate/0.4bpp");
-const u32 gEventObjectPic_Tate_1[] = INCBIN_U32("graphics/event_objects/pics/people/tate/1.4bpp");
-const u32 gEventObjectPic_Tate_2[] = INCBIN_U32("graphics/event_objects/pics/people/tate/2.4bpp");
-const u32 gEventObjectPic_Wallace_0[] = INCBIN_U32("graphics/event_objects/pics/people/wallace/0.4bpp");
-const u32 gEventObjectPic_Wallace_1[] = INCBIN_U32("graphics/event_objects/pics/people/wallace/1.4bpp");
-const u32 gEventObjectPic_Wallace_2[] = INCBIN_U32("graphics/event_objects/pics/people/wallace/2.4bpp");
-const u32 gEventObjectPic_Wallace_3[] = INCBIN_U32("graphics/event_objects/pics/people/wallace/3.4bpp");
-const u32 gEventObjectPic_Wallace_4[] = INCBIN_U32("graphics/event_objects/pics/people/wallace/4.4bpp");
-const u32 gEventObjectPic_Wallace_5[] = INCBIN_U32("graphics/event_objects/pics/people/wallace/5.4bpp");
-const u32 gEventObjectPic_Wallace_6[] = INCBIN_U32("graphics/event_objects/pics/people/wallace/6.4bpp");
-const u32 gEventObjectPic_Wallace_7[] = INCBIN_U32("graphics/event_objects/pics/people/wallace/7.4bpp");
-const u32 gEventObjectPic_Wallace_8[] = INCBIN_U32("graphics/event_objects/pics/people/wallace/8.4bpp");
-const u32 gEventObjectPic_Steven_0[] = INCBIN_U32("graphics/event_objects/pics/people/steven/0.4bpp");
-const u32 gEventObjectPic_Steven_1[] = INCBIN_U32("graphics/event_objects/pics/people/steven/1.4bpp");
-const u32 gEventObjectPic_Steven_2[] = INCBIN_U32("graphics/event_objects/pics/people/steven/2.4bpp");
-const u32 gEventObjectPic_Steven_3[] = INCBIN_U32("graphics/event_objects/pics/people/steven/3.4bpp");
-const u32 gEventObjectPic_Steven_4[] = INCBIN_U32("graphics/event_objects/pics/people/steven/4.4bpp");
-const u32 gEventObjectPic_Steven_5[] = INCBIN_U32("graphics/event_objects/pics/people/steven/5.4bpp");
-const u32 gEventObjectPic_Steven_6[] = INCBIN_U32("graphics/event_objects/pics/people/steven/6.4bpp");
-const u32 gEventObjectPic_Steven_7[] = INCBIN_U32("graphics/event_objects/pics/people/steven/7.4bpp");
-const u32 gEventObjectPic_Steven_8[] = INCBIN_U32("graphics/event_objects/pics/people/steven/8.4bpp");
-const u32 gEventObjectPic_Wally_0[] = INCBIN_U32("graphics/event_objects/pics/people/wally/0.4bpp");
-const u32 gEventObjectPic_Wally_1[] = INCBIN_U32("graphics/event_objects/pics/people/wally/1.4bpp");
-const u32 gEventObjectPic_Wally_2[] = INCBIN_U32("graphics/event_objects/pics/people/wally/2.4bpp");
-const u32 gEventObjectPic_Wally_3[] = INCBIN_U32("graphics/event_objects/pics/people/wally/3.4bpp");
-const u32 gEventObjectPic_Wally_4[] = INCBIN_U32("graphics/event_objects/pics/people/wally/4.4bpp");
-const u32 gEventObjectPic_Wally_5[] = INCBIN_U32("graphics/event_objects/pics/people/wally/5.4bpp");
-const u32 gEventObjectPic_Wally_6[] = INCBIN_U32("graphics/event_objects/pics/people/wally/6.4bpp");
-const u32 gEventObjectPic_Wally_7[] = INCBIN_U32("graphics/event_objects/pics/people/wally/7.4bpp");
-const u32 gEventObjectPic_Wally_8[] = INCBIN_U32("graphics/event_objects/pics/people/wally/8.4bpp");
-const u32 gEventObjectPic_RubySapphireLittleBoy_0[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_little_boy/0.4bpp");
-const u32 gEventObjectPic_RubySapphireLittleBoy_1[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_little_boy/1.4bpp");
-const u32 gEventObjectPic_RubySapphireLittleBoy_2[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_little_boy/2.4bpp");
-const u32 gEventObjectPic_RubySapphireLittleBoy_3[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_little_boy/3.4bpp");
-const u32 gEventObjectPic_RubySapphireLittleBoy_4[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_little_boy/4.4bpp");
-const u32 gEventObjectPic_RubySapphireLittleBoy_5[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_little_boy/5.4bpp");
-const u32 gEventObjectPic_RubySapphireLittleBoy_6[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_little_boy/6.4bpp");
-const u32 gEventObjectPic_RubySapphireLittleBoy_7[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_little_boy/7.4bpp");
-const u32 gEventObjectPic_RubySapphireLittleBoy_8[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_little_boy/8.4bpp");
-const u32 gEventObjectPic_HotSpringsOldWoman_0[] = INCBIN_U32("graphics/event_objects/pics/people/hot_springs_old_woman/0.4bpp");
-const u32 gEventObjectPic_HotSpringsOldWoman_1[] = INCBIN_U32("graphics/event_objects/pics/people/hot_springs_old_woman/1.4bpp");
-const u32 gEventObjectPic_HotSpringsOldWoman_2[] = INCBIN_U32("graphics/event_objects/pics/people/hot_springs_old_woman/2.4bpp");
-const u32 gEventObjectPic_HotSpringsOldWoman_3[] = INCBIN_U32("graphics/event_objects/pics/people/hot_springs_old_woman/3.4bpp");
-const u32 gEventObjectPic_HotSpringsOldWoman_4[] = INCBIN_U32("graphics/event_objects/pics/people/hot_springs_old_woman/4.4bpp");
-const u32 gEventObjectPic_HotSpringsOldWoman_5[] = INCBIN_U32("graphics/event_objects/pics/people/hot_springs_old_woman/5.4bpp");
-const u32 gEventObjectPic_HotSpringsOldWoman_6[] = INCBIN_U32("graphics/event_objects/pics/people/hot_springs_old_woman/6.4bpp");
-const u32 gEventObjectPic_HotSpringsOldWoman_7[] = INCBIN_U32("graphics/event_objects/pics/people/hot_springs_old_woman/7.4bpp");
-const u32 gEventObjectPic_HotSpringsOldWoman_8[] = INCBIN_U32("graphics/event_objects/pics/people/hot_springs_old_woman/8.4bpp");
-const u32 gEventObjectPic_LatiasLatios_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/latias_latios/0.4bpp");
-const u32 gEventObjectPic_LatiasLatios_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/latias_latios/1.4bpp");
-const u32 gEventObjectPic_LatiasLatios_2[] = INCBIN_U32("graphics/event_objects/pics/pokemon/latias_latios/2.4bpp");
-const u32 gEventObjectPic_Boy5_0[] = INCBIN_U32("graphics/event_objects/pics/people/boy_5/0.4bpp");
-const u32 gEventObjectPic_Boy5_1[] = INCBIN_U32("graphics/event_objects/pics/people/boy_5/1.4bpp");
-const u32 gEventObjectPic_Boy5_2[] = INCBIN_U32("graphics/event_objects/pics/people/boy_5/2.4bpp");
-const u32 gEventObjectPic_ContestOldMan_0[] = INCBIN_U32("graphics/event_objects/pics/people/contest_old_man/0.4bpp");
-const u32 gEventObjectPic_ContestOldMan_1[] = INCBIN_U32("graphics/event_objects/pics/people/contest_old_man/1.4bpp");
-const u32 gEventObjectPic_ContestOldMan_2[] = INCBIN_U32("graphics/event_objects/pics/people/contest_old_man/2.4bpp");
-const u32 gEventObjectPic_ContestOldMan_3[] = INCBIN_U32("graphics/event_objects/pics/people/contest_old_man/3.4bpp");
-const u32 gEventObjectPic_ContestOldMan_4[] = INCBIN_U32("graphics/event_objects/pics/people/contest_old_man/4.4bpp");
-const u32 gEventObjectPic_ContestOldMan_5[] = INCBIN_U32("graphics/event_objects/pics/people/contest_old_man/5.4bpp");
-const u32 gEventObjectPic_ContestOldMan_6[] = INCBIN_U32("graphics/event_objects/pics/people/contest_old_man/6.4bpp");
-const u32 gEventObjectPic_ContestOldMan_7[] = INCBIN_U32("graphics/event_objects/pics/people/contest_old_man/7.4bpp");
-const u32 gEventObjectPic_ContestOldMan_8[] = INCBIN_U32("graphics/event_objects/pics/people/contest_old_man/8.4bpp");
-const u32 gEventObjectPic_Archie_0[] = INCBIN_U32("graphics/event_objects/pics/people/archie/0.4bpp");
-const u32 gEventObjectPic_Archie_1[] = INCBIN_U32("graphics/event_objects/pics/people/archie/1.4bpp");
-const u32 gEventObjectPic_Archie_2[] = INCBIN_U32("graphics/event_objects/pics/people/archie/2.4bpp");
-const u32 gEventObjectPic_Archie_3[] = INCBIN_U32("graphics/event_objects/pics/people/archie/3.4bpp");
-const u32 gEventObjectPic_Archie_4[] = INCBIN_U32("graphics/event_objects/pics/people/archie/4.4bpp");
-const u32 gEventObjectPic_Archie_5[] = INCBIN_U32("graphics/event_objects/pics/people/archie/5.4bpp");
-const u32 gEventObjectPic_Archie_6[] = INCBIN_U32("graphics/event_objects/pics/people/archie/6.4bpp");
-const u32 gEventObjectPic_Archie_7[] = INCBIN_U32("graphics/event_objects/pics/people/archie/7.4bpp");
-const u32 gEventObjectPic_Archie_8[] = INCBIN_U32("graphics/event_objects/pics/people/archie/8.4bpp");
-const u32 gEventObjectPic_Maxie_0[] = INCBIN_U32("graphics/event_objects/pics/people/maxie/0.4bpp");
-const u32 gEventObjectPic_Maxie_1[] = INCBIN_U32("graphics/event_objects/pics/people/maxie/1.4bpp");
-const u32 gEventObjectPic_Maxie_2[] = INCBIN_U32("graphics/event_objects/pics/people/maxie/2.4bpp");
-const u32 gEventObjectPic_Maxie_3[] = INCBIN_U32("graphics/event_objects/pics/people/maxie/3.4bpp");
-const u32 gEventObjectPic_Maxie_4[] = INCBIN_U32("graphics/event_objects/pics/people/maxie/4.4bpp");
-const u32 gEventObjectPic_Maxie_5[] = INCBIN_U32("graphics/event_objects/pics/people/maxie/5.4bpp");
-const u32 gEventObjectPic_Maxie_6[] = INCBIN_U32("graphics/event_objects/pics/people/maxie/6.4bpp");
-const u32 gEventObjectPic_Maxie_7[] = INCBIN_U32("graphics/event_objects/pics/people/maxie/7.4bpp");
-const u32 gEventObjectPic_Maxie_8[] = INCBIN_U32("graphics/event_objects/pics/people/maxie/8.4bpp");
-const u32 gEventObjectPic_KyogreFront_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/kyogre_front/0.4bpp");
-const u32 gEventObjectPic_KyogreFront_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/kyogre_front/1.4bpp");
-const u32 gEventObjectPic_KyogreSide_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/kyogre_side/0.4bpp");
-const u32 gEventObjectPic_KyogreSide_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/kyogre_side/1.4bpp");
-const u32 gEventObjectPic_GroudonFront_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/groudon_front/0.4bpp");
-const u32 gEventObjectPic_GroudonFront_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/groudon_front/1.4bpp");
-const u32 gEventObjectPic_GroudonSide_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/groudon_side/0.4bpp");
-const u32 gEventObjectPic_GroudonSide_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/groudon_side/1.4bpp");
+const u32 gEventObjectPic_ProfBirch[] = INCBIN_U32("graphics/event_objects/pics/people/prof_birch.4bpp");
+const u32 gEventObjectPic_ReporterM[] = INCBIN_U32("graphics/event_objects/pics/people/reporter_m.4bpp");
+const u32 gEventObjectPic_ReporterF[] = INCBIN_U32("graphics/event_objects/pics/people/reporter_f.4bpp");
+const u32 gEventObjectPic_MauvilleOldMan1[] = INCBIN_U32("graphics/event_objects/pics/people/mauville_old_man_1.4bpp");
+const u32 gEventObjectPic_MauvilleOldMan2[] = INCBIN_U32("graphics/event_objects/pics/people/mauville_old_man_2.4bpp");
+const u32 gEventObjectPic_MartEmployee[] = INCBIN_U32("graphics/event_objects/pics/people/mart_employee.4bpp");
+const u32 gEventObjectPic_RooftopSaleWoman[] = INCBIN_U32("graphics/event_objects/pics/people/rooftop_sale_woman.4bpp");
+const u32 gEventObjectPic_Teala[] = INCBIN_U32("graphics/event_objects/pics/people/teala.4bpp");
+const u32 gEventObjectPic_Artist[] = INCBIN_U32("graphics/event_objects/pics/people/artist.4bpp");
+const u32 gEventObjectPic_Cameraman[] = INCBIN_U32("graphics/event_objects/pics/people/cameraman.4bpp");
+const u32 gEventObjectPic_Scientist2[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_2.4bpp");
+const u32 gEventObjectPic_Man7[] = INCBIN_U32("graphics/event_objects/pics/people/man_7.4bpp");
+const u32 gEventObjectPic_AquaMemberM[] = INCBIN_U32("graphics/event_objects/pics/people/team_aqua/aqua_member_m.4bpp");
+const u32 gEventObjectPic_AquaMemberF[] = INCBIN_U32("graphics/event_objects/pics/people/team_aqua/aqua_member_f.4bpp");
+const u32 gEventObjectPic_MagmaMemberM[] = INCBIN_U32("graphics/event_objects/pics/people/team_magma/magma_member_m.4bpp");
+const u32 gEventObjectPic_MagmaMemberF[] = INCBIN_U32("graphics/event_objects/pics/people/team_magma/magma_member_f.4bpp");
+const u32 gEventObjectPic_Sidney[] = INCBIN_U32("graphics/event_objects/pics/people/elite_four/sidney.4bpp");
+const u32 gEventObjectPic_Phoebe[] = INCBIN_U32("graphics/event_objects/pics/people/elite_four/phoebe.4bpp");
+const u32 gEventObjectPic_Glacia[] = INCBIN_U32("graphics/event_objects/pics/people/elite_four/glacia.4bpp");
+const u32 gEventObjectPic_Drake[] = INCBIN_U32("graphics/event_objects/pics/people/elite_four/drake.4bpp");
+const u32 gEventObjectPic_Roxanne[] = INCBIN_U32("graphics/event_objects/pics/people/gym_leaders/roxanne.4bpp");
+const u32 gEventObjectPic_Brawly[] = INCBIN_U32("graphics/event_objects/pics/people/gym_leaders/brawly.4bpp");
+const u32 gEventObjectPic_Wattson[] = INCBIN_U32("graphics/event_objects/pics/people/gym_leaders/wattson.4bpp");
+const u32 gEventObjectPic_Flannery[] = INCBIN_U32("graphics/event_objects/pics/people/gym_leaders/flannery.4bpp");
+const u32 gEventObjectPic_Norman[] = INCBIN_U32("graphics/event_objects/pics/people/gym_leaders/norman.4bpp");
+const u32 gEventObjectPic_Winona[] = INCBIN_U32("graphics/event_objects/pics/people/gym_leaders/winona.4bpp");
+const u32 gEventObjectPic_Liza[] = INCBIN_U32("graphics/event_objects/pics/people/gym_leaders/liza.4bpp");
+const u32 gEventObjectPic_Tate[] = INCBIN_U32("graphics/event_objects/pics/people/gym_leaders/tate.4bpp");
+const u32 gEventObjectPic_Wallace[] = INCBIN_U32("graphics/event_objects/pics/people/wallace.4bpp");
+const u32 gEventObjectPic_Steven[] = INCBIN_U32("graphics/event_objects/pics/people/steven.4bpp");
+const u32 gEventObjectPic_Wally[] = INCBIN_U32("graphics/event_objects/pics/people/wally.4bpp");
+const u32 gEventObjectPic_RubySapphireLittleBoy[] = INCBIN_U32("graphics/event_objects/pics/people/rs_little_boy.4bpp");
+const u32 gEventObjectPic_HotSpringsOldWoman[] = INCBIN_U32("graphics/event_objects/pics/people/hot_springs_old_woman.4bpp");
+const u32 gEventObjectPic_LatiasLatios[] = INCBIN_U32("graphics/event_objects/pics/pokemon/latias_latios.4bpp");
+const u32 gEventObjectPic_Boy5[] = INCBIN_U32("graphics/event_objects/pics/people/boy_5.4bpp");
+const u32 gEventObjectPic_ContestOldMan[] = INCBIN_U32("graphics/event_objects/pics/people/contest_old_man.4bpp");
+const u32 gEventObjectPic_Archie[] = INCBIN_U32("graphics/event_objects/pics/people/team_aqua/archie.4bpp");
+const u32 gEventObjectPic_Maxie[] = INCBIN_U32("graphics/event_objects/pics/people/team_magma/maxie.4bpp");
+const u32 gEventObjectPic_Kyogre[] = INCBIN_U32("graphics/event_objects/pics/pokemon/kyogre.4bpp");
+const u32 gEventObjectPic_Groudon[] = INCBIN_U32("graphics/event_objects/pics/pokemon/groudon.4bpp");
 const u32 gEventObjectPic_Regi[] = INCBIN_U32("graphics/event_objects/pics/pokemon/regi.4bpp");
-const u32 gEventObjectPic_Skitty_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/skitty/0.4bpp");
-const u32 gEventObjectPic_Skitty_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/skitty/1.4bpp");
-const u32 gEventObjectPic_Skitty_2[] = INCBIN_U32("graphics/event_objects/pics/pokemon/skitty/2.4bpp");
-const u32 gEventObjectPic_Kecleon_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/kecleon/0.4bpp");
-const u32 gEventObjectPic_Kecleon_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/kecleon/1.4bpp");
-const u32 gEventObjectPic_Kecleon_2[] = INCBIN_U32("graphics/event_objects/pics/pokemon/kecleon/2.4bpp");
-const u32 gEventObjectPic_Rayquaza_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/rayquaza/0.4bpp");
-const u32 gEventObjectPic_Rayquaza_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/rayquaza/1.4bpp");
-const u32 gEventObjectPic_Rayquaza_2[] = INCBIN_U32("graphics/event_objects/pics/pokemon/rayquaza/2.4bpp");
-const u32 gEventObjectPic_Rayquaza_3[] = INCBIN_U32("graphics/event_objects/pics/pokemon/rayquaza/3.4bpp");
-const u32 gEventObjectPic_Rayquaza_4[] = INCBIN_U32("graphics/event_objects/pics/pokemon/rayquaza/4.4bpp");
+const u32 gEventObjectPic_Skitty[] = INCBIN_U32("graphics/event_objects/pics/pokemon/skitty.4bpp");
+const u32 gEventObjectPic_Kecleon[] = INCBIN_U32("graphics/event_objects/pics/pokemon/kecleon.4bpp");
+const u32 gEventObjectPic_Rayquaza[] = INCBIN_U32("graphics/event_objects/pics/pokemon/rayquaza.4bpp");
 const u32 gEventObjectPic_RayquazaStill[] = INCBIN_U32("graphics/event_objects/pics/pokemon/rayquaza_still.4bpp");
-const u32 gEventObjectPic_Zigzagoon_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/zigzagoon/0.4bpp");
-const u32 gEventObjectPic_Zigzagoon_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/zigzagoon/1.4bpp");
-const u32 gEventObjectPic_Zigzagoon_2[] = INCBIN_U32("graphics/event_objects/pics/pokemon/zigzagoon/2.4bpp");
-const u32 gEventObjectPic_Pikachu_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/pikachu/0.4bpp");
-const u32 gEventObjectPic_Pikachu_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/pikachu/1.4bpp");
-const u32 gEventObjectPic_Pikachu_2[] = INCBIN_U32("graphics/event_objects/pics/pokemon/pikachu/2.4bpp");
-const u32 gEventObjectPic_Azumarill_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/azumarill/0.4bpp");
-const u32 gEventObjectPic_Azumarill_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/azumarill/1.4bpp");
-const u32 gEventObjectPic_Azumarill_2[] = INCBIN_U32("graphics/event_objects/pics/pokemon/azumarill/2.4bpp");
-const u32 gEventObjectPic_Wingull_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/wingull/0.4bpp");
-const u32 gEventObjectPic_Wingull_3[] = INCBIN_U32("graphics/event_objects/pics/pokemon/wingull/3.4bpp");
-const u32 gEventObjectPic_Wingull_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/wingull/1.4bpp");
-const u32 gEventObjectPic_Wingull_4[] = INCBIN_U32("graphics/event_objects/pics/pokemon/wingull/4.4bpp");
-const u32 gEventObjectPic_Wingull_2[] = INCBIN_U32("graphics/event_objects/pics/pokemon/wingull/2.4bpp");
-const u32 gEventObjectPic_Wingull_5[] = INCBIN_U32("graphics/event_objects/pics/pokemon/wingull/5.4bpp");
-const u32 gEventObjectPic_TuberMSwimming_0[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m_swimming/0.4bpp");
-const u32 gEventObjectPic_TuberMSwimming_1[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m_swimming/1.4bpp");
-const u32 gEventObjectPic_TuberMSwimming_2[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m_swimming/2.4bpp");
-const u32 gEventObjectPic_TuberMSwimming_3[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m_swimming/3.4bpp");
-const u32 gEventObjectPic_TuberMSwimming_4[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m_swimming/4.4bpp");
-const u32 gEventObjectPic_TuberMSwimming_5[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m_swimming/5.4bpp");
-const u32 gEventObjectPic_TuberMSwimming_6[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m_swimming/6.4bpp");
-const u32 gEventObjectPic_TuberMSwimming_7[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m_swimming/7.4bpp");
-const u32 gEventObjectPic_TuberMSwimming_8[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m_swimming/8.4bpp");
-const u32 gEventObjectPic_Azurill_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/azurill/0.4bpp");
-const u32 gEventObjectPic_Azurill_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/azurill/1.4bpp");
-const u32 gEventObjectPic_Azurill_2[] = INCBIN_U32("graphics/event_objects/pics/pokemon/azurill/2.4bpp");
-const u32 gEventObjectPic_Mom_0[] = INCBIN_U32("graphics/event_objects/pics/people/mom/0.4bpp");
-const u32 gEventObjectPic_Mom_1[] = INCBIN_U32("graphics/event_objects/pics/people/mom/1.4bpp");
-const u32 gEventObjectPic_Mom_2[] = INCBIN_U32("graphics/event_objects/pics/people/mom/2.4bpp");
-const u32 gEventObjectPic_Mom_3[] = INCBIN_U32("graphics/event_objects/pics/people/mom/3.4bpp");
-const u32 gEventObjectPic_Mom_4[] = INCBIN_U32("graphics/event_objects/pics/people/mom/4.4bpp");
-const u32 gEventObjectPic_Mom_5[] = INCBIN_U32("graphics/event_objects/pics/people/mom/5.4bpp");
-const u32 gEventObjectPic_Mom_6[] = INCBIN_U32("graphics/event_objects/pics/people/mom/6.4bpp");
-const u32 gEventObjectPic_Mom_7[] = INCBIN_U32("graphics/event_objects/pics/people/mom/7.4bpp");
-const u32 gEventObjectPic_Mom_8[] = INCBIN_U32("graphics/event_objects/pics/people/mom/8.4bpp");
+const u32 gEventObjectPic_Zigzagoon[] = INCBIN_U32("graphics/event_objects/pics/pokemon/zigzagoon.4bpp");
+const u32 gEventObjectPic_Pikachu[] = INCBIN_U32("graphics/event_objects/pics/pokemon/pikachu.4bpp");
+const u32 gEventObjectPic_Azumarill[] = INCBIN_U32("graphics/event_objects/pics/pokemon/azumarill.4bpp");
+const u32 gEventObjectPic_Wingull[] = INCBIN_U32("graphics/event_objects/pics/pokemon/wingull.4bpp");
+const u32 gEventObjectPic_TuberMSwimming[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m_swimming.4bpp");
+const u32 gEventObjectPic_Azurill[] = INCBIN_U32("graphics/event_objects/pics/pokemon/azurill.4bpp");
+const u32 gEventObjectPic_Mom[] = INCBIN_U32("graphics/event_objects/pics/people/mom.4bpp");
 const u16 gEventObjectPalette22[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_22.gbapal");
 const u16 gEventObjectPalette23[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_23.gbapal");
 const u16 gEventObjectPalette24[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_24.gbapal");
@@ -1123,49 +235,21 @@ const u32 gEventObjectPic_BigWailmerDoll[] = INCBIN_U32("graphics/event_objects/
 const u32 gEventObjectPic_BigRegirockDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_regirock_doll.4bpp");
 const u32 gEventObjectPic_BigRegiceDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_regice_doll.4bpp");
 const u32 gEventObjectPic_BigRegisteelDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_registeel_doll.4bpp");
-const u32 gEventObjectPic_CuttableTree_0[] = INCBIN_U32("graphics/event_objects/pics/misc/cuttable_tree/0.4bpp");
-const u32 gEventObjectPic_CuttableTree_1[] = INCBIN_U32("graphics/event_objects/pics/misc/cuttable_tree/1.4bpp");
-const u32 gEventObjectPic_CuttableTree_2[] = INCBIN_U32("graphics/event_objects/pics/misc/cuttable_tree/2.4bpp");
-const u32 gEventObjectPic_CuttableTree_3[] = INCBIN_U32("graphics/event_objects/pics/misc/cuttable_tree/3.4bpp");
-const u32 gEventObjectPic_BreakableRock_0[] = INCBIN_U32("graphics/event_objects/pics/misc/breakable_rock/0.4bpp");
-const u32 gEventObjectPic_BreakableRock_1[] = INCBIN_U32("graphics/event_objects/pics/misc/breakable_rock/1.4bpp");
-const u32 gEventObjectPic_BreakableRock_2[] = INCBIN_U32("graphics/event_objects/pics/misc/breakable_rock/2.4bpp");
-const u32 gEventObjectPic_BreakableRock_3[] = INCBIN_U32("graphics/event_objects/pics/misc/breakable_rock/3.4bpp");
+const u32 gEventObjectPic_CuttableTree[] = INCBIN_U32("graphics/event_objects/pics/misc/cuttable_tree.4bpp");
+const u32 gEventObjectPic_BreakableRock[] = INCBIN_U32("graphics/event_objects/pics/misc/breakable_rock.4bpp");
 const u32 gEventObjectPic_PushableBoulder[] = INCBIN_U32("graphics/event_objects/pics/misc/pushable_boulder.4bpp");
-const u32 gEventObjectPic_MrBrineysBoat_0[] = INCBIN_U32("graphics/event_objects/pics/misc/mr_brineys_boat/0.4bpp");
-const u32 gEventObjectPic_MrBrineysBoat_1[] = INCBIN_U32("graphics/event_objects/pics/misc/mr_brineys_boat/1.4bpp");
-const u32 gEventObjectPic_MrBrineysBoat_2[] = INCBIN_U32("graphics/event_objects/pics/misc/mr_brineys_boat/2.4bpp");
+const u32 gEventObjectPic_MrBrineysBoat[] = INCBIN_U32("graphics/event_objects/pics/misc/mr_brineys_boat.4bpp");
 const u32 gEventObjectPic_Fossil[] = INCBIN_U32("graphics/event_objects/pics/misc/fossil.4bpp");
 const u32 gEventObjectPic_SubmarineShadow[] = INCBIN_U32("graphics/event_objects/pics/misc/submarine_shadow.4bpp");
 const u16 gEventObjectPalette26[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_26.gbapal");
 const u32 gEventObjectPic_Truck[] = INCBIN_U32("graphics/event_objects/pics/misc/truck.4bpp");
 const u16 gEventObjectPalette14[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_14.gbapal");
-const u32 gEventObjectPic_VigorothCarryingBox_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/vigoroth_carrying_box/0.4bpp");
-const u32 gEventObjectPic_VigorothCarryingBox_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/vigoroth_carrying_box/1.4bpp");
-const u32 gEventObjectPic_VigorothCarryingBox_2[] = INCBIN_U32("graphics/event_objects/pics/pokemon/vigoroth_carrying_box/2.4bpp");
-const u32 gEventObjectPic_VigorothFacingAway_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/vigoroth_facing_away/0.4bpp");
-const u32 gEventObjectPic_VigorothFacingAway_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/vigoroth_facing_away/1.4bpp");
+const u32 gEventObjectPic_Vigoroth[] = INCBIN_U32("graphics/event_objects/pics/pokemon/vigoroth.4bpp");
 const u16 gEventObjectPalette15[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_15.gbapal");
 const u32 gEventObjectPic_BirchsBag[] = INCBIN_U32("graphics/event_objects/pics/misc/birchs_bag.4bpp");
-const u32 gEventObjectPic_EnemyZigzagoon_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/enemy_zigzagoon/0.4bpp");
-const u32 gEventObjectPic_EnemyZigzagoon_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/enemy_zigzagoon/1.4bpp");
-const u32 gEventObjectPic_EnemyZigzagoon_2[] = INCBIN_U32("graphics/event_objects/pics/pokemon/enemy_zigzagoon/2.4bpp");
-const u32 gEventObjectPic_EnemyZigzagoon_3[] = INCBIN_U32("graphics/event_objects/pics/pokemon/enemy_zigzagoon/3.4bpp");
-const u32 gEventObjectPic_EnemyZigzagoon_4[] = INCBIN_U32("graphics/event_objects/pics/pokemon/enemy_zigzagoon/4.4bpp");
-const u32 gEventObjectPic_EnemyZigzagoon_5[] = INCBIN_U32("graphics/event_objects/pics/pokemon/enemy_zigzagoon/5.4bpp");
-const u32 gEventObjectPic_EnemyZigzagoon_6[] = INCBIN_U32("graphics/event_objects/pics/pokemon/enemy_zigzagoon/6.4bpp");
-const u32 gEventObjectPic_EnemyZigzagoon_7[] = INCBIN_U32("graphics/event_objects/pics/pokemon/enemy_zigzagoon/7.4bpp");
-const u32 gEventObjectPic_EnemyZigzagoon_8[] = INCBIN_U32("graphics/event_objects/pics/pokemon/enemy_zigzagoon/8.4bpp");
+const u32 gEventObjectPic_EnemyZigzagoon[] = INCBIN_U32("graphics/event_objects/pics/pokemon/enemy_zigzagoon.4bpp");
 const u16 gEventObjectPalette16[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_16.gbapal");
-const u32 gEventObjectPic_Poochyena_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/poochyena/0.4bpp");
-const u32 gEventObjectPic_Poochyena_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/poochyena/1.4bpp");
-const u32 gEventObjectPic_Poochyena_2[] = INCBIN_U32("graphics/event_objects/pics/pokemon/poochyena/2.4bpp");
-const u32 gEventObjectPic_Poochyena_3[] = INCBIN_U32("graphics/event_objects/pics/pokemon/poochyena/3.4bpp");
-const u32 gEventObjectPic_Poochyena_4[] = INCBIN_U32("graphics/event_objects/pics/pokemon/poochyena/4.4bpp");
-const u32 gEventObjectPic_Poochyena_5[] = INCBIN_U32("graphics/event_objects/pics/pokemon/poochyena/5.4bpp");
-const u32 gEventObjectPic_Poochyena_6[] = INCBIN_U32("graphics/event_objects/pics/pokemon/poochyena/6.4bpp");
-const u32 gEventObjectPic_Poochyena_7[] = INCBIN_U32("graphics/event_objects/pics/pokemon/poochyena/7.4bpp");
-const u32 gEventObjectPic_Poochyena_8[] = INCBIN_U32("graphics/event_objects/pics/pokemon/poochyena/8.4bpp");
+const u32 gEventObjectPic_Poochyena[] = INCBIN_U32("graphics/event_objects/pics/pokemon/poochyena.4bpp");
 const u16 gEventObjectPalette27[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_27.gbapal");
 const u32 gEventObjectPic_CableCar[] = INCBIN_U32("graphics/event_objects/pics/misc/cable_car.4bpp");
 const u16 gEventObjectPalette20[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_20.gbapal");
@@ -1178,198 +262,39 @@ const u32 gFieldEffectObjectPic_BerryTreeGrowthSparkle_3[] = INCBIN_U32("graphic
 const u32 gFieldEffectObjectPic_BerryTreeGrowthSparkle_4[] = INCBIN_U32("graphics/event_objects/pics/effects/berry_tree_growth_sparkle/4.4bpp");
 const u32 gFieldEffectObjectPic_BerryTreeGrowthSparkle_5[] = INCBIN_U32("graphics/event_objects/pics/effects/berry_tree_growth_sparkle/5.4bpp");
 const u32 gEventObjectPic_BerryTreeDirtPile[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/dirt_pile.4bpp");
-const u32 gEventObjectPic_BerryTreeSprout_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/sprout/0.4bpp");
-const u32 gEventObjectPic_BerryTreeSprout_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/sprout/1.4bpp");
-const u32 gEventObjectPic_PechaBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pecha/0.4bpp");
-const u32 gEventObjectPic_PechaBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pecha/1.4bpp");
-const u32 gEventObjectPic_PechaBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pecha/2.4bpp");
-const u32 gEventObjectPic_PechaBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pecha/3.4bpp");
-const u32 gEventObjectPic_PechaBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pecha/4.4bpp");
-const u32 gEventObjectPic_PechaBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pecha/5.4bpp");
-const u32 gEventObjectPic_KelpsyBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/kelpsy/0.4bpp");
-const u32 gEventObjectPic_KelpsyBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/kelpsy/1.4bpp");
-const u32 gEventObjectPic_KelpsyBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/kelpsy/2.4bpp");
-const u32 gEventObjectPic_KelpsyBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/kelpsy/3.4bpp");
-const u32 gEventObjectPic_KelpsyBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/kelpsy/4.4bpp");
-const u32 gEventObjectPic_KelpsyBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/kelpsy/5.4bpp");
-const u32 gEventObjectPic_WepearBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/wepear/0.4bpp");
-const u32 gEventObjectPic_WepearBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/wepear/1.4bpp");
-const u32 gEventObjectPic_WepearBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/wepear/2.4bpp");
-const u32 gEventObjectPic_WepearBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/wepear/3.4bpp");
-const u32 gEventObjectPic_WepearBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/wepear/4.4bpp");
-const u32 gEventObjectPic_WepearBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/wepear/5.4bpp");
-const u32 gEventObjectPic_IapapaBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/iapapa/0.4bpp");
-const u32 gEventObjectPic_IapapaBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/iapapa/1.4bpp");
-const u32 gEventObjectPic_IapapaBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/iapapa/2.4bpp");
-const u32 gEventObjectPic_IapapaBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/iapapa/3.4bpp");
-const u32 gEventObjectPic_IapapaBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/iapapa/4.4bpp");
-const u32 gEventObjectPic_IapapaBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/iapapa/5.4bpp");
-const u32 gEventObjectPic_CheriBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/cheri/0.4bpp");
-const u32 gEventObjectPic_CheriBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/cheri/1.4bpp");
-const u32 gEventObjectPic_CheriBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/cheri/2.4bpp");
-const u32 gEventObjectPic_CheriBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/cheri/3.4bpp");
-const u32 gEventObjectPic_CheriBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/cheri/4.4bpp");
-const u32 gEventObjectPic_CheriBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/cheri/5.4bpp");
-const u32 gEventObjectPic_FigyBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/figy/0.4bpp");
-const u32 gEventObjectPic_FigyBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/figy/1.4bpp");
-const u32 gEventObjectPic_FigyBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/figy/2.4bpp");
-const u32 gEventObjectPic_FigyBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/figy/3.4bpp");
-const u32 gEventObjectPic_FigyBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/figy/4.4bpp");
-const u32 gEventObjectPic_FigyBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/figy/5.4bpp");
-const u32 gEventObjectPic_MagoBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/mago/0.4bpp");
-const u32 gEventObjectPic_MagoBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/mago/1.4bpp");
-const u32 gEventObjectPic_MagoBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/mago/2.4bpp");
-const u32 gEventObjectPic_MagoBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/mago/3.4bpp");
-const u32 gEventObjectPic_MagoBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/mago/4.4bpp");
-const u32 gEventObjectPic_MagoBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/mago/5.4bpp");
-const u32 gEventObjectPic_LumBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/lum/0.4bpp");
-const u32 gEventObjectPic_LumBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/lum/1.4bpp");
-const u32 gEventObjectPic_LumBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/lum/2.4bpp");
-const u32 gEventObjectPic_LumBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/lum/3.4bpp");
-const u32 gEventObjectPic_LumBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/lum/4.4bpp");
-const u32 gEventObjectPic_LumBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/lum/5.4bpp");
-const u32 gEventObjectPic_RazzBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/razz/0.4bpp");
-const u32 gEventObjectPic_RazzBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/razz/1.4bpp");
-const u32 gEventObjectPic_RazzBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/razz/2.4bpp");
-const u32 gEventObjectPic_RazzBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/razz/3.4bpp");
-const u32 gEventObjectPic_RazzBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/razz/4.4bpp");
-const u32 gEventObjectPic_RazzBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/razz/5.4bpp");
-const u32 gEventObjectPic_GrepaBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/grepa/0.4bpp");
-const u32 gEventObjectPic_GrepaBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/grepa/1.4bpp");
-const u32 gEventObjectPic_GrepaBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/grepa/2.4bpp");
-const u32 gEventObjectPic_GrepaBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/grepa/3.4bpp");
-const u32 gEventObjectPic_GrepaBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/grepa/4.4bpp");
-const u32 gEventObjectPic_GrepaBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/grepa/5.4bpp");
-const u32 gEventObjectPic_RabutaBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/rabuta/0.4bpp");
-const u32 gEventObjectPic_RabutaBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/rabuta/1.4bpp");
-const u32 gEventObjectPic_RabutaBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/rabuta/2.4bpp");
-const u32 gEventObjectPic_RabutaBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/rabuta/3.4bpp");
-const u32 gEventObjectPic_RabutaBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/rabuta/4.4bpp");
-const u32 gEventObjectPic_RabutaBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/rabuta/5.4bpp");
-const u32 gEventObjectPic_NomelBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/nomel/0.4bpp");
-const u32 gEventObjectPic_NomelBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/nomel/1.4bpp");
-const u32 gEventObjectPic_NomelBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/nomel/2.4bpp");
-const u32 gEventObjectPic_NomelBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/nomel/3.4bpp");
-const u32 gEventObjectPic_NomelBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/nomel/4.4bpp");
-const u32 gEventObjectPic_NomelBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/nomel/5.4bpp");
-const u32 gEventObjectPic_LeppaBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/leppa/0.4bpp");
-const u32 gEventObjectPic_LeppaBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/leppa/1.4bpp");
-const u32 gEventObjectPic_LeppaBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/leppa/2.4bpp");
-const u32 gEventObjectPic_LeppaBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/leppa/3.4bpp");
-const u32 gEventObjectPic_LeppaBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/leppa/4.4bpp");
-const u32 gEventObjectPic_LeppaBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/leppa/5.4bpp");
-const u32 gEventObjectPic_LiechiBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/liechi/0.4bpp");
-const u32 gEventObjectPic_LiechiBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/liechi/1.4bpp");
-const u32 gEventObjectPic_LiechiBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/liechi/2.4bpp");
-const u32 gEventObjectPic_LiechiBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/liechi/3.4bpp");
-const u32 gEventObjectPic_LiechiBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/liechi/4.4bpp");
-const u32 gEventObjectPic_LiechiBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/liechi/5.4bpp");
-const u32 gEventObjectPic_HondewBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/hondew/0.4bpp");
-const u32 gEventObjectPic_HondewBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/hondew/1.4bpp");
-const u32 gEventObjectPic_HondewBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/hondew/2.4bpp");
-const u32 gEventObjectPic_HondewBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/hondew/3.4bpp");
-const u32 gEventObjectPic_HondewBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/hondew/4.4bpp");
-const u32 gEventObjectPic_HondewBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/hondew/5.4bpp");
-const u32 gEventObjectPic_AguavBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/aguav/0.4bpp");
-const u32 gEventObjectPic_AguavBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/aguav/1.4bpp");
-const u32 gEventObjectPic_AguavBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/aguav/2.4bpp");
-const u32 gEventObjectPic_AguavBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/aguav/3.4bpp");
-const u32 gEventObjectPic_AguavBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/aguav/4.4bpp");
-const u32 gEventObjectPic_AguavBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/aguav/5.4bpp");
-const u32 gEventObjectPic_WikiBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/wiki/0.4bpp");
-const u32 gEventObjectPic_WikiBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/wiki/1.4bpp");
-const u32 gEventObjectPic_WikiBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/wiki/2.4bpp");
-const u32 gEventObjectPic_WikiBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/wiki/3.4bpp");
-const u32 gEventObjectPic_WikiBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/wiki/4.4bpp");
-const u32 gEventObjectPic_WikiBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/wiki/5.4bpp");
-const u32 gEventObjectPic_PomegBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pomeg/0.4bpp");
-const u32 gEventObjectPic_PomegBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pomeg/1.4bpp");
-const u32 gEventObjectPic_PomegBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pomeg/2.4bpp");
-const u32 gEventObjectPic_PomegBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pomeg/3.4bpp");
-const u32 gEventObjectPic_PomegBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pomeg/4.4bpp");
-const u32 gEventObjectPic_PomegBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pomeg/5.4bpp");
-const u32 gEventObjectPic_RawstBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/rawst/0.4bpp");
-const u32 gEventObjectPic_RawstBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/rawst/1.4bpp");
-const u32 gEventObjectPic_RawstBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/rawst/2.4bpp");
-const u32 gEventObjectPic_RawstBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/rawst/3.4bpp");
-const u32 gEventObjectPic_RawstBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/rawst/4.4bpp");
-const u32 gEventObjectPic_RawstBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/rawst/5.4bpp");
-const u32 gEventObjectPic_SpelonBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/spelon/0.4bpp");
-const u32 gEventObjectPic_SpelonBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/spelon/1.4bpp");
-const u32 gEventObjectPic_SpelonBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/spelon/2.4bpp");
-const u32 gEventObjectPic_SpelonBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/spelon/3.4bpp");
-const u32 gEventObjectPic_SpelonBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/spelon/4.4bpp");
-const u32 gEventObjectPic_SpelonBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/spelon/5.4bpp");
-const u32 gEventObjectPic_ChestoBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/chesto/0.4bpp");
-const u32 gEventObjectPic_ChestoBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/chesto/1.4bpp");
-const u32 gEventObjectPic_ChestoBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/chesto/2.4bpp");
-const u32 gEventObjectPic_ChestoBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/chesto/3.4bpp");
-const u32 gEventObjectPic_ChestoBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/chesto/4.4bpp");
-const u32 gEventObjectPic_ChestoBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/chesto/5.4bpp");
-const u32 gEventObjectPic_OranBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/oran/0.4bpp");
-const u32 gEventObjectPic_OranBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/oran/1.4bpp");
-const u32 gEventObjectPic_OranBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/oran/2.4bpp");
-const u32 gEventObjectPic_OranBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/oran/3.4bpp");
-const u32 gEventObjectPic_OranBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/oran/4.4bpp");
-const u32 gEventObjectPic_OranBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/oran/5.4bpp");
-const u32 gEventObjectPic_PersimBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/persim/0.4bpp");
-const u32 gEventObjectPic_PersimBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/persim/1.4bpp");
-const u32 gEventObjectPic_PersimBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/persim/2.4bpp");
-const u32 gEventObjectPic_PersimBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/persim/3.4bpp");
-const u32 gEventObjectPic_PersimBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/persim/4.4bpp");
-const u32 gEventObjectPic_PersimBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/persim/5.4bpp");
-const u32 gEventObjectPic_SitrusBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/sitrus/0.4bpp");
-const u32 gEventObjectPic_SitrusBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/sitrus/1.4bpp");
-const u32 gEventObjectPic_SitrusBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/sitrus/2.4bpp");
-const u32 gEventObjectPic_SitrusBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/sitrus/3.4bpp");
-const u32 gEventObjectPic_SitrusBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/sitrus/4.4bpp");
-const u32 gEventObjectPic_SitrusBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/sitrus/5.4bpp");
-const u32 gEventObjectPic_AspearBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/aspear/0.4bpp");
-const u32 gEventObjectPic_AspearBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/aspear/1.4bpp");
-const u32 gEventObjectPic_AspearBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/aspear/2.4bpp");
-const u32 gEventObjectPic_AspearBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/aspear/3.4bpp");
-const u32 gEventObjectPic_AspearBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/aspear/4.4bpp");
-const u32 gEventObjectPic_AspearBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/aspear/5.4bpp");
-const u32 gEventObjectPic_PamtreBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pamtre/0.4bpp");
-const u32 gEventObjectPic_PamtreBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pamtre/1.4bpp");
-const u32 gEventObjectPic_PamtreBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pamtre/2.4bpp");
-const u32 gEventObjectPic_PamtreBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pamtre/3.4bpp");
-const u32 gEventObjectPic_PamtreBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pamtre/4.4bpp");
-const u32 gEventObjectPic_PamtreBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pamtre/5.4bpp");
-const u32 gEventObjectPic_CornnBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/cornn/0.4bpp");
-const u32 gEventObjectPic_CornnBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/cornn/1.4bpp");
-const u32 gEventObjectPic_CornnBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/cornn/2.4bpp");
-const u32 gEventObjectPic_CornnBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/cornn/3.4bpp");
-const u32 gEventObjectPic_CornnBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/cornn/4.4bpp");
-const u32 gEventObjectPic_CornnBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/cornn/5.4bpp");
-const u32 gEventObjectPic_LansatBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/lansat/0.4bpp");
-const u32 gEventObjectPic_LansatBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/lansat/1.4bpp");
-const u32 gEventObjectPic_LansatBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/lansat/2.4bpp");
-const u32 gEventObjectPic_LansatBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/lansat/3.4bpp");
-const u32 gEventObjectPic_LansatBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/lansat/4.4bpp");
-const u32 gEventObjectPic_LansatBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/lansat/5.4bpp");
-const u32 gEventObjectPic_DurinBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/durin/0.4bpp");
-const u32 gEventObjectPic_DurinBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/durin/1.4bpp");
-const u32 gEventObjectPic_DurinBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/durin/2.4bpp");
-const u32 gEventObjectPic_DurinBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/durin/3.4bpp");
-const u32 gEventObjectPic_DurinBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/durin/4.4bpp");
-const u32 gEventObjectPic_DurinBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/durin/5.4bpp");
-const u32 gEventObjectPic_TamatoBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/tamato/0.4bpp");
-const u32 gEventObjectPic_TamatoBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/tamato/1.4bpp");
-const u32 gEventObjectPic_TamatoBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/tamato/2.4bpp");
-const u32 gEventObjectPic_TamatoBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/tamato/3.4bpp");
-const u32 gEventObjectPic_TamatoBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/tamato/4.4bpp");
-const u32 gEventObjectPic_TamatoBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/tamato/5.4bpp");
-const u32 gFieldEffectObjectPic_SurfBlob_0[] = INCBIN_U32("graphics/event_objects/pics/effects/surf_blob/0.4bpp");
-const u32 gFieldEffectObjectPic_SurfBlob_1[] = INCBIN_U32("graphics/event_objects/pics/effects/surf_blob/1.4bpp");
-const u32 gFieldEffectObjectPic_SurfBlob_2[] = INCBIN_U32("graphics/event_objects/pics/effects/surf_blob/2.4bpp");
-const u32 gEventObjectPic_QuintyPlump_0[] = INCBIN_U32("graphics/event_objects/pics/people/quinty_plump/0.4bpp");
-const u32 gEventObjectPic_QuintyPlump_1[] = INCBIN_U32("graphics/event_objects/pics/people/quinty_plump/1.4bpp");
-const u32 gEventObjectPic_QuintyPlump_2[] = INCBIN_U32("graphics/event_objects/pics/people/quinty_plump/2.4bpp");
-const u32 gEventObjectPic_QuintyPlump_3[] = INCBIN_U32("graphics/event_objects/pics/people/quinty_plump/3.4bpp");
-const u32 gEventObjectPic_QuintyPlump_4[] = INCBIN_U32("graphics/event_objects/pics/people/quinty_plump/4.4bpp");
-const u32 gEventObjectPic_QuintyPlump_5[] = INCBIN_U32("graphics/event_objects/pics/people/quinty_plump/5.4bpp");
-const u32 gEventObjectPic_QuintyPlump_6[] = INCBIN_U32("graphics/event_objects/pics/people/quinty_plump/6.4bpp");
+const u32 gEventObjectPic_BerryTreeSprout[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/sprout.4bpp");
+const u32 gEventObjectPic_PechaBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pecha.4bpp");
+const u32 gEventObjectPic_KelpsyBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/kelpsy.4bpp");
+const u32 gEventObjectPic_WepearBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/wepear.4bpp");
+const u32 gEventObjectPic_IapapaBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/iapapa.4bpp");
+const u32 gEventObjectPic_CheriBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/cheri.4bpp");
+const u32 gEventObjectPic_FigyBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/figy.4bpp");
+const u32 gEventObjectPic_MagoBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/mago.4bpp");
+const u32 gEventObjectPic_LumBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/lum.4bpp");
+const u32 gEventObjectPic_RazzBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/razz.4bpp");
+const u32 gEventObjectPic_GrepaBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/grepa.4bpp");
+const u32 gEventObjectPic_RabutaBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/rabuta.4bpp");
+const u32 gEventObjectPic_NomelBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/nomel.4bpp");
+const u32 gEventObjectPic_LeppaBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/leppa.4bpp");
+const u32 gEventObjectPic_LiechiBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/liechi.4bpp");
+const u32 gEventObjectPic_HondewBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/hondew.4bpp");
+const u32 gEventObjectPic_AguavBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/aguav.4bpp");
+const u32 gEventObjectPic_WikiBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/wiki.4bpp");
+const u32 gEventObjectPic_PomegBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pomeg.4bpp");
+const u32 gEventObjectPic_RawstBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/rawst.4bpp");
+const u32 gEventObjectPic_SpelonBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/spelon.4bpp");
+const u32 gEventObjectPic_ChestoBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/chesto.4bpp");
+const u32 gEventObjectPic_OranBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/oran.4bpp");
+const u32 gEventObjectPic_PersimBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/persim.4bpp");
+const u32 gEventObjectPic_SitrusBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/sitrus.4bpp");
+const u32 gEventObjectPic_AspearBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/aspear.4bpp");
+const u32 gEventObjectPic_PamtreBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pamtre.4bpp");
+const u32 gEventObjectPic_CornnBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/cornn.4bpp");
+const u32 gEventObjectPic_LansatBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/lansat.4bpp");
+const u32 gEventObjectPic_DurinBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/durin.4bpp");
+const u32 gEventObjectPic_TamatoBerryTree[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/tamato.4bpp");
+const u32 gFieldEffectObjectPic_SurfBlob[] = INCBIN_U32("graphics/event_objects/pics/effects/surf_blob.4bpp");
+const u32 gEventObjectPic_QuintyPlump[] = INCBIN_U32("graphics/event_objects/pics/people/quinty_plump.4bpp");
 const u16 gEventObjectPalette12[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_12.gbapal");
 const u16 gEventObjectPalette13[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_13.gbapal");
 const u32 gFieldEffectObjectPic_ShadowSmall[] = INCBIN_U32("graphics/event_objects/pics/effects/shadow_small.4bpp");
@@ -1380,24 +305,9 @@ const u32 filler_8368A08[0x48] = {};
 const u8 gFieldEffectPic_CutGrass[] = INCBIN_U8("graphics/event_objects/pics/effects/cut_grass.4bpp");
 const u32 gFieldEffectPic_CutGrass_Copy[] = INCBIN_U32("graphics/event_objects/pics/effects/cut_grass.4bpp");
 const u16 gFieldEffectObjectPalette6[] = INCBIN_U16("graphics/event_objects/palettes/field_effect_object_palette_06.gbapal");
-const u32 gFieldEffectObjectPic_Ripple_0[] = INCBIN_U32("graphics/event_objects/pics/effects/ripple/0.4bpp");
-const u32 gFieldEffectObjectPic_Ripple_1[] = INCBIN_U32("graphics/event_objects/pics/effects/ripple/1.4bpp");
-const u32 gFieldEffectObjectPic_Ripple_2[] = INCBIN_U32("graphics/event_objects/pics/effects/ripple/2.4bpp");
-const u32 gFieldEffectObjectPic_Ripple_3[] = INCBIN_U32("graphics/event_objects/pics/effects/ripple/3.4bpp");
-const u32 gFieldEffectObjectPic_Ripple_4[] = INCBIN_U32("graphics/event_objects/pics/effects/ripple/4.4bpp");
-const u32 gFieldEffectObjectPic_Ash_0[] = INCBIN_U32("graphics/event_objects/pics/effects/ash/0.4bpp");
-const u32 gFieldEffectObjectPic_Ash_1[] = INCBIN_U32("graphics/event_objects/pics/effects/ash/1.4bpp");
-const u32 gFieldEffectObjectPic_Ash_2[] = INCBIN_U32("graphics/event_objects/pics/effects/ash/2.4bpp");
-const u32 gFieldEffectObjectPic_Ash_3[] = INCBIN_U32("graphics/event_objects/pics/effects/ash/3.4bpp");
-const u32 gFieldEffectObjectPic_Ash_4[] = INCBIN_U32("graphics/event_objects/pics/effects/ash/4.4bpp");
-const u32 gFieldEffectObjectPic_Arrow_0[] = INCBIN_U32("graphics/event_objects/pics/effects/arrow/0.4bpp");
-const u32 gFieldEffectObjectPic_Arrow_1[] = INCBIN_U32("graphics/event_objects/pics/effects/arrow/1.4bpp");
-const u32 gFieldEffectObjectPic_Arrow_2[] = INCBIN_U32("graphics/event_objects/pics/effects/arrow/2.4bpp");
-const u32 gFieldEffectObjectPic_Arrow_3[] = INCBIN_U32("graphics/event_objects/pics/effects/arrow/3.4bpp");
-const u32 gFieldEffectObjectPic_Arrow_4[] = INCBIN_U32("graphics/event_objects/pics/effects/arrow/4.4bpp");
-const u32 gFieldEffectObjectPic_Arrow_5[] = INCBIN_U32("graphics/event_objects/pics/effects/arrow/5.4bpp");
-const u32 gFieldEffectObjectPic_Arrow_6[] = INCBIN_U32("graphics/event_objects/pics/effects/arrow/6.4bpp");
-const u32 gFieldEffectObjectPic_Arrow_7[] = INCBIN_U32("graphics/event_objects/pics/effects/arrow/7.4bpp");
+const u32 gFieldEffectObjectPic_Ripple[] = INCBIN_U32("graphics/event_objects/pics/effects/ripple.4bpp");
+const u32 gFieldEffectObjectPic_Ash[] = INCBIN_U32("graphics/event_objects/pics/effects/ash.4bpp");
+const u32 gFieldEffectObjectPic_Arrow[] = INCBIN_U32("graphics/event_objects/pics/effects/arrow.4bpp");
 const u16 gFieldEffectObjectPalette0[] = INCBIN_U16("graphics/event_objects/palettes/field_effect_object_palette_00.gbapal");
 const u16 gFieldEffectObjectPalette1[] = INCBIN_U16("graphics/event_objects/palettes/field_effect_object_palette_01.gbapal");
 const u32 gFieldEffectObjectPic_GroundImpactDust_0[] = INCBIN_U32("graphics/event_objects/pics/effects/ground_impact_dust/0.4bpp");
@@ -1418,14 +328,7 @@ const u32 gFieldEffectObjectPic_Unknown16_3[] = INCBIN_U32("graphics/event_objec
 const u32 gFieldEffectObjectPic_Unknown16_4[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_16/4.4bpp");
 const u32 gUnknown_084F7E38[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_4F7E38/0.4bpp");
 const u32 gFieldEffectObjectPic_Unknown16_5[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_16/5.4bpp");
-const u32 gFieldEffectObjectPic_Unknown17_0[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_17/0.4bpp");
-const u32 gFieldEffectObjectPic_Unknown17_1[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_17/1.4bpp");
-const u32 gFieldEffectObjectPic_Unknown17_2[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_17/2.4bpp");
-const u32 gFieldEffectObjectPic_Unknown17_3[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_17/3.4bpp");
-const u32 gFieldEffectObjectPic_Unknown17_4[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_17/4.4bpp");
-const u32 gFieldEffectObjectPic_Unknown17_5[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_17/5.4bpp");
-const u32 gFieldEffectObjectPic_Unknown17_6[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_17/6.4bpp");
-const u32 gFieldEffectObjectPic_Unknown17_7[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_17/7.4bpp");
+const u32 gFieldEffectObjectPic_Unknown17[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_17.4bpp");
 const u32 gFieldEffectObjectPic_Unknown18_0[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_18/0.4bpp");
 const u32 gFieldEffectObjectPic_Unknown18_1[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_18/1.4bpp");
 const u32 gFieldEffectObjectPic_Unknown18_2[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_18/2.4bpp");
@@ -1434,13 +337,8 @@ const u32 gFieldEffectObjectPic_LongGrass_0[] = INCBIN_U32("graphics/event_objec
 const u32 gFieldEffectObjectPic_LongGrass_1[] = INCBIN_U32("graphics/event_objects/pics/effects/long_grass/1.4bpp");
 const u32 gFieldEffectObjectPic_LongGrass_2[] = INCBIN_U32("graphics/event_objects/pics/effects/long_grass/2.4bpp");
 const u32 gFieldEffectObjectPic_LongGrass_3[] = INCBIN_U32("graphics/event_objects/pics/effects/long_grass/3.4bpp");
-const u32 gFieldEffectObjectPic_TallGrass_0[] = INCBIN_U32("graphics/event_objects/pics/effects/tall_grass/0.4bpp");
-const u32 gFieldEffectObjectPic_TallGrass_1[] = INCBIN_U32("graphics/event_objects/pics/effects/tall_grass/1.4bpp");
-const u32 gFieldEffectObjectPic_TallGrass_2[] = INCBIN_U32("graphics/event_objects/pics/effects/tall_grass/2.4bpp");
-const u32 gFieldEffectObjectPic_TallGrass_3[] = INCBIN_U32("graphics/event_objects/pics/effects/tall_grass/3.4bpp");
-const u32 gFieldEffectObjectPic_TallGrass_4[] = INCBIN_U32("graphics/event_objects/pics/effects/tall_grass/4.4bpp");
-const u32 gFieldEffectObjectPic_ShortGrass_0[] = INCBIN_U32("graphics/event_objects/pics/effects/short_grass/0.4bpp");
-const u32 gFieldEffectObjectPic_ShortGrass_1[] = INCBIN_U32("graphics/event_objects/pics/effects/short_grass/1.4bpp");
+const u32 gFieldEffectObjectPic_TallGrass[] = INCBIN_U32("graphics/event_objects/pics/effects/tall_grass.4bpp");
+const u32 gFieldEffectObjectPic_ShortGrass[] = INCBIN_U32("graphics/event_objects/pics/effects/short_grass.4bpp");
 const u32 gFieldEffectObjectPic_SandFootprints_0[] = INCBIN_U32("graphics/event_objects/pics/effects/sand_footprints/0.4bpp");
 const u32 gFieldEffectObjectPic_SandFootprints_1[] = INCBIN_U32("graphics/event_objects/pics/effects/sand_footprints/1.4bpp");
 const u32 gFieldEffectObjectPic_DeepSandFootprints_0[] = INCBIN_U32("graphics/event_objects/pics/effects/deep_sand_footprints/0.4bpp");
@@ -1456,214 +354,58 @@ const u32 gFieldEffectObjectPic_Unknown19_3[] = INCBIN_U32("graphics/event_objec
 const u32 gFieldEffectObjectPic_Unknown29_0[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_29/0.4bpp");
 const u32 gFieldEffectObjectPic_Unknown29_1[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_29/1.4bpp");
 const u32 gFieldEffectObjectPic_Unknown29_2[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_29/2.4bpp");
-const u32 gFieldEffectObjectPic_BikeHopBigSplash_0[] = INCBIN_U32("graphics/event_objects/pics/effects/bike_hop_big_splash/0.4bpp");
-const u32 gFieldEffectObjectPic_BikeHopBigSplash_1[] = INCBIN_U32("graphics/event_objects/pics/effects/bike_hop_big_splash/1.4bpp");
-const u32 gFieldEffectObjectPic_BikeHopBigSplash_2[] = INCBIN_U32("graphics/event_objects/pics/effects/bike_hop_big_splash/2.4bpp");
-const u32 gFieldEffectObjectPic_BikeHopBigSplash_3[] = INCBIN_U32("graphics/event_objects/pics/effects/bike_hop_big_splash/3.4bpp");
-const u32 gFieldEffectObjectPic_Splash_0[] = INCBIN_U32("graphics/event_objects/pics/effects/splash/0.4bpp");
-const u32 gFieldEffectObjectPic_Splash_1[] = INCBIN_U32("graphics/event_objects/pics/effects/splash/1.4bpp");
-const u32 gFieldEffectObjectPic_BikeHopSmallSplash_0[] = INCBIN_U32("graphics/event_objects/pics/effects/bike_hop_small_splash/0.4bpp");
-const u32 gFieldEffectObjectPic_BikeHopSmallSplash_1[] = INCBIN_U32("graphics/event_objects/pics/effects/bike_hop_small_splash/1.4bpp");
-const u32 gFieldEffectObjectPic_BikeHopSmallSplash_2[] = INCBIN_U32("graphics/event_objects/pics/effects/bike_hop_small_splash/2.4bpp");
+const u32 gFieldEffectObjectPic_BikeHopBigSplash[] = INCBIN_U32("graphics/event_objects/pics/effects/bike_hop_big_splash.4bpp");
+const u32 gFieldEffectObjectPic_Splash[] = INCBIN_U32("graphics/event_objects/pics/effects/splash.4bpp");
+const u32 gFieldEffectObjectPic_BikeHopSmallSplash[] = INCBIN_U32("graphics/event_objects/pics/effects/bike_hop_small_splash.4bpp");
 const u32 gFieldEffectObjectPic_Unknown20_0[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_20/0.4bpp");
 const u32 gFieldEffectObjectPic_Unknown20_1[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_20/1.4bpp");
 const u32 gFieldEffectObjectPic_Unknown20_2[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_20/2.4bpp");
 const u32 gFieldEffectObjectPic_Unknown20_3[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_20/3.4bpp");
 const u32 gFieldEffectObjectPic_Unknown20_4[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_20/4.4bpp");
-const u32 gFieldEffectObjectPic_TreeDisguise_0[] = INCBIN_U32("graphics/event_objects/pics/effects/tree_disguise/0.4bpp");
-const u32 gFieldEffectObjectPic_TreeDisguise_1[] = INCBIN_U32("graphics/event_objects/pics/effects/tree_disguise/1.4bpp");
-const u32 gFieldEffectObjectPic_TreeDisguise_2[] = INCBIN_U32("graphics/event_objects/pics/effects/tree_disguise/2.4bpp");
-const u32 gFieldEffectObjectPic_TreeDisguise_3[] = INCBIN_U32("graphics/event_objects/pics/effects/tree_disguise/3.4bpp");
-const u32 gFieldEffectObjectPic_TreeDisguise_4[] = INCBIN_U32("graphics/event_objects/pics/effects/tree_disguise/4.4bpp");
-const u32 gFieldEffectObjectPic_TreeDisguise_5[] = INCBIN_U32("graphics/event_objects/pics/effects/tree_disguise/5.4bpp");
-const u32 gFieldEffectObjectPic_TreeDisguise_6[] = INCBIN_U32("graphics/event_objects/pics/effects/tree_disguise/6.4bpp");
-const u32 gFieldEffectObjectPic_MountainDisguise_0[] = INCBIN_U32("graphics/event_objects/pics/effects/mountain_disguise/0.4bpp");
-const u32 gFieldEffectObjectPic_MountainDisguise_1[] = INCBIN_U32("graphics/event_objects/pics/effects/mountain_disguise/1.4bpp");
-const u32 gFieldEffectObjectPic_MountainDisguise_2[] = INCBIN_U32("graphics/event_objects/pics/effects/mountain_disguise/2.4bpp");
-const u32 gFieldEffectObjectPic_MountainDisguise_3[] = INCBIN_U32("graphics/event_objects/pics/effects/mountain_disguise/3.4bpp");
-const u32 gFieldEffectObjectPic_MountainDisguise_4[] = INCBIN_U32("graphics/event_objects/pics/effects/mountain_disguise/4.4bpp");
-const u32 gFieldEffectObjectPic_MountainDisguise_5[] = INCBIN_U32("graphics/event_objects/pics/effects/mountain_disguise/5.4bpp");
-const u32 gFieldEffectObjectPic_MountainDisguise_6[] = INCBIN_U32("graphics/event_objects/pics/effects/mountain_disguise/6.4bpp");
-const u32 gFieldEffectObjectPic_SandDisguisePlaceholder_0[] = INCBIN_U32("graphics/event_objects/pics/effects/sand_disguise_placeholder/0.4bpp");
-const u32 gFieldEffectObjectPic_SandDisguisePlaceholder_1[] = INCBIN_U32("graphics/event_objects/pics/effects/sand_disguise_placeholder/1.4bpp");
-const u32 gFieldEffectObjectPic_SandDisguisePlaceholder_2[] = INCBIN_U32("graphics/event_objects/pics/effects/sand_disguise_placeholder/2.4bpp");
-const u32 gFieldEffectObjectPic_SandDisguisePlaceholder_3[] = INCBIN_U32("graphics/event_objects/pics/effects/sand_disguise_placeholder/3.4bpp");
-const u32 gFieldEffectObjectPic_SandDisguisePlaceholder_4[] = INCBIN_U32("graphics/event_objects/pics/effects/sand_disguise_placeholder/4.4bpp");
-const u32 gFieldEffectObjectPic_SandDisguisePlaceholder_5[] = INCBIN_U32("graphics/event_objects/pics/effects/sand_disguise_placeholder/5.4bpp");
-const u32 gFieldEffectObjectPic_SandDisguisePlaceholder_6[] = INCBIN_U32("graphics/event_objects/pics/effects/sand_disguise_placeholder/6.4bpp");
+const u32 gFieldEffectObjectPic_TreeDisguise[] = INCBIN_U32("graphics/event_objects/pics/effects/tree_disguise.4bpp");
+const u32 gFieldEffectObjectPic_MountainDisguise[] = INCBIN_U32("graphics/event_objects/pics/effects/mountain_disguise.4bpp");
+const u32 gFieldEffectObjectPic_SandDisguisePlaceholder[] = INCBIN_U32("graphics/event_objects/pics/effects/sand_disguise_placeholder.4bpp");
 const u32 gFieldEffectObjectPic_HotSpringsWater[] = INCBIN_U32("graphics/event_objects/pics/effects/hot_springs_water.4bpp");
 const u16 gFieldEffectObjectPalette2[] = INCBIN_U16("graphics/event_objects/palettes/field_effect_object_palette_02.gbapal");
-const u32 gFieldEffectObjectPic_JumpOutOfAsh_0[] = INCBIN_U32("graphics/event_objects/pics/effects/jump_out_of_ash/0.4bpp");
-const u32 gFieldEffectObjectPic_JumpOutOfAsh_1[] = INCBIN_U32("graphics/event_objects/pics/effects/jump_out_of_ash/1.4bpp");
-const u32 gFieldEffectObjectPic_JumpOutOfAsh_2[] = INCBIN_U32("graphics/event_objects/pics/effects/jump_out_of_ash/2.4bpp");
-const u32 gFieldEffectObjectPic_JumpOutOfAsh_3[] = INCBIN_U32("graphics/event_objects/pics/effects/jump_out_of_ash/3.4bpp");
-const u32 gFieldEffectObjectPic_JumpOutOfAsh_4[] = INCBIN_U32("graphics/event_objects/pics/effects/jump_out_of_ash/4.4bpp");
+const u32 gFieldEffectObjectPic_JumpOutOfAsh[] = INCBIN_U32("graphics/event_objects/pics/effects/jump_out_of_ash.4bpp");
 const u32 gFieldEffectObjectPic_Unknown33_0[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_33/0.4bpp");
 const u32 gFieldEffectObjectPic_Unknown33_1[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_33/1.4bpp");
 const u32 gFieldEffectObjectPic_Unknown33_2[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_33/2.4bpp");
 const u32 gFieldEffectObjectPic_Unknown33_3[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_33/3.4bpp");
 const u32 gFieldEffectObjectPic_Unknown33_4[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_33/4.4bpp");
-const u32 gFieldEffectObjectPic_Bubbles_0[] = INCBIN_U32("graphics/event_objects/pics/effects/bubbles/0.4bpp");
-const u32 gFieldEffectObjectPic_Bubbles_1[] = INCBIN_U32("graphics/event_objects/pics/effects/bubbles/1.4bpp");
-const u32 gFieldEffectObjectPic_Bubbles_2[] = INCBIN_U32("graphics/event_objects/pics/effects/bubbles/2.4bpp");
-const u32 gFieldEffectObjectPic_Bubbles_3[] = INCBIN_U32("graphics/event_objects/pics/effects/bubbles/3.4bpp");
-const u32 gFieldEffectObjectPic_Bubbles_4[] = INCBIN_U32("graphics/event_objects/pics/effects/bubbles/4.4bpp");
-const u32 gFieldEffectObjectPic_Bubbles_5[] = INCBIN_U32("graphics/event_objects/pics/effects/bubbles/5.4bpp");
-const u32 gFieldEffectObjectPic_Bubbles_6[] = INCBIN_U32("graphics/event_objects/pics/effects/bubbles/6.4bpp");
-const u32 gFieldEffectObjectPic_Bubbles_7[] = INCBIN_U32("graphics/event_objects/pics/effects/bubbles/7.4bpp");
+const u32 gFieldEffectObjectPic_Bubbles[] = INCBIN_U32("graphics/event_objects/pics/effects/bubbles.4bpp");
 const u32 gFieldEffectObjectPic_Unknown35_0[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_35/0.4bpp");
 const u32 gFieldEffectObjectPic_Unknown35_1[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_35/1.4bpp");
 const u16 gFieldEffectObjectPalette3[] = INCBIN_U16("graphics/event_objects/palettes/field_effect_object_palette_03.gbapal");
 const u32 gFieldEffectObjectPic_Bird[] = INCBIN_U32("graphics/event_objects/pics/effects/bird.4bpp");
-const u32 gEventObjectPic_Juan_0[] = INCBIN_U32("graphics/event_objects/pics/people/juan/0.4bpp");
-const u32 gEventObjectPic_Juan_1[] = INCBIN_U32("graphics/event_objects/pics/people/juan/1.4bpp");
-const u32 gEventObjectPic_Juan_2[] = INCBIN_U32("graphics/event_objects/pics/people/juan/2.4bpp");
-const u32 gEventObjectPic_Juan_3[] = INCBIN_U32("graphics/event_objects/pics/people/juan/3.4bpp");
-const u32 gEventObjectPic_Juan_4[] = INCBIN_U32("graphics/event_objects/pics/people/juan/4.4bpp");
-const u32 gEventObjectPic_Juan_5[] = INCBIN_U32("graphics/event_objects/pics/people/juan/5.4bpp");
-const u32 gEventObjectPic_Juan_6[] = INCBIN_U32("graphics/event_objects/pics/people/juan/6.4bpp");
-const u32 gEventObjectPic_Juan_7[] = INCBIN_U32("graphics/event_objects/pics/people/juan/7.4bpp");
-const u32 gEventObjectPic_Juan_8[] = INCBIN_U32("graphics/event_objects/pics/people/juan/8.4bpp");
-const u32 gEventObjectPic_Scott_0[] = INCBIN_U32("graphics/event_objects/pics/people/scott/0.4bpp");
-const u32 gEventObjectPic_Scott_1[] = INCBIN_U32("graphics/event_objects/pics/people/scott/1.4bpp");
-const u32 gEventObjectPic_Scott_2[] = INCBIN_U32("graphics/event_objects/pics/people/scott/2.4bpp");
-const u32 gEventObjectPic_Scott_3[] = INCBIN_U32("graphics/event_objects/pics/people/scott/3.4bpp");
-const u32 gEventObjectPic_Scott_4[] = INCBIN_U32("graphics/event_objects/pics/people/scott/4.4bpp");
-const u32 gEventObjectPic_Scott_5[] = INCBIN_U32("graphics/event_objects/pics/people/scott/5.4bpp");
-const u32 gEventObjectPic_Scott_6[] = INCBIN_U32("graphics/event_objects/pics/people/scott/6.4bpp");
-const u32 gEventObjectPic_Scott_7[] = INCBIN_U32("graphics/event_objects/pics/people/scott/7.4bpp");
-const u32 gEventObjectPic_Scott_8[] = INCBIN_U32("graphics/event_objects/pics/people/scott/8.4bpp");
+const u32 gEventObjectPic_Juan[] = INCBIN_U32("graphics/event_objects/pics/people/gym_leaders/juan.4bpp");
+const u32 gEventObjectPic_Scott[] = INCBIN_U32("graphics/event_objects/pics/people/scott.4bpp");
 const u32 gEventObjectPic_Statue[] = INCBIN_U32("graphics/event_objects/pics/misc/statue.4bpp");
-const u32 gEventObjectPic_Kirlia_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/kirlia/0.4bpp");
-const u32 gEventObjectPic_Kirlia_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/kirlia/1.4bpp");
-const u32 gEventObjectPic_Kirlia_2[] = INCBIN_U32("graphics/event_objects/pics/pokemon/kirlia/2.4bpp");
-const u32 gEventObjectPic_Kirlia_3[] = INCBIN_U32("graphics/event_objects/pics/pokemon/kirlia/3.4bpp");
-const u32 gEventObjectPic_Kirlia_4[] = INCBIN_U32("graphics/event_objects/pics/pokemon/kirlia/4.4bpp");
-const u32 gEventObjectPic_Kirlia_5[] = INCBIN_U32("graphics/event_objects/pics/pokemon/kirlia/5.4bpp");
-const u32 gEventObjectPic_Kirlia_6[] = INCBIN_U32("graphics/event_objects/pics/pokemon/kirlia/6.4bpp");
-const u32 gEventObjectPic_Kirlia_7[] = INCBIN_U32("graphics/event_objects/pics/pokemon/kirlia/7.4bpp");
-const u32 gEventObjectPic_Kirlia_8[] = INCBIN_U32("graphics/event_objects/pics/pokemon/kirlia/8.4bpp");
-const u32 gEventObjectPic_Dusclops_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/dusclops/0.4bpp");
-const u32 gEventObjectPic_Dusclops_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/dusclops/1.4bpp");
-const u32 gEventObjectPic_Dusclops_2[] = INCBIN_U32("graphics/event_objects/pics/pokemon/dusclops/2.4bpp");
-const u32 gEventObjectPic_Dusclops_3[] = INCBIN_U32("graphics/event_objects/pics/pokemon/dusclops/3.4bpp");
-const u32 gEventObjectPic_Dusclops_4[] = INCBIN_U32("graphics/event_objects/pics/pokemon/dusclops/4.4bpp");
-const u32 gEventObjectPic_Dusclops_5[] = INCBIN_U32("graphics/event_objects/pics/pokemon/dusclops/5.4bpp");
-const u32 gEventObjectPic_Dusclops_6[] = INCBIN_U32("graphics/event_objects/pics/pokemon/dusclops/6.4bpp");
-const u32 gEventObjectPic_Dusclops_7[] = INCBIN_U32("graphics/event_objects/pics/pokemon/dusclops/7.4bpp");
-const u32 gEventObjectPic_Dusclops_8[] = INCBIN_U32("graphics/event_objects/pics/pokemon/dusclops/8.4bpp");
-const u32 gEventObjectPic_MysteryEventDeliveryman_0[] = INCBIN_U32("graphics/event_objects/pics/people/mystery_event_deliveryman/0.4bpp");
-const u32 gEventObjectPic_MysteryEventDeliveryman_1[] = INCBIN_U32("graphics/event_objects/pics/people/mystery_event_deliveryman/1.4bpp");
-const u32 gEventObjectPic_MysteryEventDeliveryman_2[] = INCBIN_U32("graphics/event_objects/pics/people/mystery_event_deliveryman/2.4bpp");
-const u32 gEventObjectPic_UnionRoomAttendant_0[] = INCBIN_U32("graphics/event_objects/pics/people/union_room_attendant/0.4bpp");
-const u32 gEventObjectPic_UnionRoomAttendant_1[] = INCBIN_U32("graphics/event_objects/pics/people/union_room_attendant/1.4bpp");
-const u32 gEventObjectPic_UnionRoomAttendant_2[] = INCBIN_U32("graphics/event_objects/pics/people/union_room_attendant/2.4bpp");
+const u32 gEventObjectPic_Kirlia[] = INCBIN_U32("graphics/event_objects/pics/pokemon/kirlia.4bpp");
+const u32 gEventObjectPic_Dusclops[] = INCBIN_U32("graphics/event_objects/pics/pokemon/dusclops.4bpp");
+const u32 gEventObjectPic_MysteryEventDeliveryman[] = INCBIN_U32("graphics/event_objects/pics/people/mystery_event_deliveryman.4bpp");
+const u32 gEventObjectPic_UnionRoomAttendant[] = INCBIN_U32("graphics/event_objects/pics/people/union_room_attendant.4bpp");
 const u32 gEventObjectPic_MovingBox[] = INCBIN_U32("graphics/event_objects/pics/misc/moving_box.4bpp");
 const u16 gEventObjectPalette19[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_19.gbapal");
-const u32 gEventObjectPic_Sudowoodo_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/sudowoodo/0.4bpp");
-const u32 gEventObjectPic_Sudowoodo_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/sudowoodo/1.4bpp");
-const u32 gEventObjectPic_Sudowoodo_2[] = INCBIN_U32("graphics/event_objects/pics/pokemon/sudowoodo/2.4bpp");
-const u32 gEventObjectPic_Mew_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/mew/0.4bpp");
-const u32 gEventObjectPic_Mew_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/mew/1.4bpp");
-const u32 gEventObjectPic_Mew_2[] = INCBIN_U32("graphics/event_objects/pics/pokemon/mew/2.4bpp");
-const u32 gEventObjectPic_Mew_3[] = INCBIN_U32("graphics/event_objects/pics/pokemon/mew/3.4bpp");
-const u32 gEventObjectPic_Mew_4[] = INCBIN_U32("graphics/event_objects/pics/pokemon/mew/4.4bpp");
-const u32 gEventObjectPic_Mew_5[] = INCBIN_U32("graphics/event_objects/pics/pokemon/mew/5.4bpp");
-const u32 gEventObjectPic_Mew_6[] = INCBIN_U32("graphics/event_objects/pics/pokemon/mew/6.4bpp");
-const u32 gEventObjectPic_Mew_7[] = INCBIN_U32("graphics/event_objects/pics/pokemon/mew/7.4bpp");
-const u32 gEventObjectPic_Mew_8[] = INCBIN_U32("graphics/event_objects/pics/pokemon/mew/8.4bpp");
+const u32 gEventObjectPic_Sudowoodo[] = INCBIN_U32("graphics/event_objects/pics/pokemon/sudowoodo.4bpp");
+const u32 gEventObjectPic_Mew[] = INCBIN_U32("graphics/event_objects/pics/pokemon/mew.4bpp");
 const u16 gEventObjectPalette28[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_28.gbapal");
-const u32 gEventObjectPic_Red_0[] = INCBIN_U32("graphics/event_objects/pics/people/red/0.4bpp");
-const u32 gEventObjectPic_Red_1[] = INCBIN_U32("graphics/event_objects/pics/people/red/1.4bpp");
-const u32 gEventObjectPic_Red_2[] = INCBIN_U32("graphics/event_objects/pics/people/red/2.4bpp");
-const u32 gEventObjectPic_Red_3[] = INCBIN_U32("graphics/event_objects/pics/people/red/3.4bpp");
-const u32 gEventObjectPic_Red_4[] = INCBIN_U32("graphics/event_objects/pics/people/red/4.4bpp");
-const u32 gEventObjectPic_Red_5[] = INCBIN_U32("graphics/event_objects/pics/people/red/5.4bpp");
-const u32 gEventObjectPic_Red_6[] = INCBIN_U32("graphics/event_objects/pics/people/red/6.4bpp");
-const u32 gEventObjectPic_Red_7[] = INCBIN_U32("graphics/event_objects/pics/people/red/7.4bpp");
-const u32 gEventObjectPic_Red_8[] = INCBIN_U32("graphics/event_objects/pics/people/red/8.4bpp");
-const u32 gEventObjectPic_Leaf_0[] = INCBIN_U32("graphics/event_objects/pics/people/leaf/0.4bpp");
-const u32 gEventObjectPic_Leaf_1[] = INCBIN_U32("graphics/event_objects/pics/people/leaf/1.4bpp");
-const u32 gEventObjectPic_Leaf_2[] = INCBIN_U32("graphics/event_objects/pics/people/leaf/2.4bpp");
-const u32 gEventObjectPic_Leaf_3[] = INCBIN_U32("graphics/event_objects/pics/people/leaf/3.4bpp");
-const u32 gEventObjectPic_Leaf_4[] = INCBIN_U32("graphics/event_objects/pics/people/leaf/4.4bpp");
-const u32 gEventObjectPic_Leaf_5[] = INCBIN_U32("graphics/event_objects/pics/people/leaf/5.4bpp");
-const u32 gEventObjectPic_Leaf_6[] = INCBIN_U32("graphics/event_objects/pics/people/leaf/6.4bpp");
-const u32 gEventObjectPic_Leaf_7[] = INCBIN_U32("graphics/event_objects/pics/people/leaf/7.4bpp");
-const u32 gEventObjectPic_Leaf_8[] = INCBIN_U32("graphics/event_objects/pics/people/leaf/8.4bpp");
+const u32 gEventObjectPic_Red[] = INCBIN_U32("graphics/event_objects/pics/people/red.4bpp");
+const u32 gEventObjectPic_Leaf[] = INCBIN_U32("graphics/event_objects/pics/people/leaf.4bpp");
 const u16 gEventObjectPalette30[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_30.gbapal");
 const u32 gEventObjectPic_BirthIslandStone[] = INCBIN_U32("graphics/event_objects/pics/misc/birth_island_stone.4bpp");
 const u16 gEventObjectPalette29[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_29.gbapal");
-const u32 gEventObjectPic_Deoxys_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/deoxys/0.4bpp");
-const u32 gEventObjectPic_Deoxys_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/deoxys/1.4bpp");
-const u32 gEventObjectPic_Anabel_0[] = INCBIN_U32("graphics/event_objects/pics/people/anabel/0.4bpp");
-const u32 gEventObjectPic_Anabel_1[] = INCBIN_U32("graphics/event_objects/pics/people/anabel/1.4bpp");
-const u32 gEventObjectPic_Anabel_2[] = INCBIN_U32("graphics/event_objects/pics/people/anabel/2.4bpp");
-const u32 gEventObjectPic_Anabel_3[] = INCBIN_U32("graphics/event_objects/pics/people/anabel/3.4bpp");
-const u32 gEventObjectPic_Anabel_4[] = INCBIN_U32("graphics/event_objects/pics/people/anabel/4.4bpp");
-const u32 gEventObjectPic_Anabel_5[] = INCBIN_U32("graphics/event_objects/pics/people/anabel/5.4bpp");
-const u32 gEventObjectPic_Anabel_6[] = INCBIN_U32("graphics/event_objects/pics/people/anabel/6.4bpp");
-const u32 gEventObjectPic_Anabel_7[] = INCBIN_U32("graphics/event_objects/pics/people/anabel/7.4bpp");
-const u32 gEventObjectPic_Anabel_8[] = INCBIN_U32("graphics/event_objects/pics/people/anabel/8.4bpp");
-const u32 gEventObjectPic_Tucker_0[] = INCBIN_U32("graphics/event_objects/pics/people/tucker/0.4bpp");
-const u32 gEventObjectPic_Tucker_1[] = INCBIN_U32("graphics/event_objects/pics/people/tucker/1.4bpp");
-const u32 gEventObjectPic_Tucker_2[] = INCBIN_U32("graphics/event_objects/pics/people/tucker/2.4bpp");
-const u32 gEventObjectPic_Tucker_3[] = INCBIN_U32("graphics/event_objects/pics/people/tucker/3.4bpp");
-const u32 gEventObjectPic_Tucker_4[] = INCBIN_U32("graphics/event_objects/pics/people/tucker/4.4bpp");
-const u32 gEventObjectPic_Tucker_5[] = INCBIN_U32("graphics/event_objects/pics/people/tucker/5.4bpp");
-const u32 gEventObjectPic_Tucker_6[] = INCBIN_U32("graphics/event_objects/pics/people/tucker/6.4bpp");
-const u32 gEventObjectPic_Tucker_7[] = INCBIN_U32("graphics/event_objects/pics/people/tucker/7.4bpp");
-const u32 gEventObjectPic_Tucker_8[] = INCBIN_U32("graphics/event_objects/pics/people/tucker/8.4bpp");
-const u32 gEventObjectPic_Spenser_0[] = INCBIN_U32("graphics/event_objects/pics/people/spenser/0.4bpp");
-const u32 gEventObjectPic_Spenser_1[] = INCBIN_U32("graphics/event_objects/pics/people/spenser/1.4bpp");
-const u32 gEventObjectPic_Spenser_2[] = INCBIN_U32("graphics/event_objects/pics/people/spenser/2.4bpp");
-const u32 gEventObjectPic_Spenser_3[] = INCBIN_U32("graphics/event_objects/pics/people/spenser/3.4bpp");
-const u32 gEventObjectPic_Spenser_4[] = INCBIN_U32("graphics/event_objects/pics/people/spenser/4.4bpp");
-const u32 gEventObjectPic_Spenser_5[] = INCBIN_U32("graphics/event_objects/pics/people/spenser/5.4bpp");
-const u32 gEventObjectPic_Spenser_6[] = INCBIN_U32("graphics/event_objects/pics/people/spenser/6.4bpp");
-const u32 gEventObjectPic_Spenser_7[] = INCBIN_U32("graphics/event_objects/pics/people/spenser/7.4bpp");
-const u32 gEventObjectPic_Spenser_8[] = INCBIN_U32("graphics/event_objects/pics/people/spenser/8.4bpp");
-const u32 gEventObjectPic_Greta_0[] = INCBIN_U32("graphics/event_objects/pics/people/greta/0.4bpp");
-const u32 gEventObjectPic_Greta_1[] = INCBIN_U32("graphics/event_objects/pics/people/greta/1.4bpp");
-const u32 gEventObjectPic_Greta_2[] = INCBIN_U32("graphics/event_objects/pics/people/greta/2.4bpp");
-const u32 gEventObjectPic_Greta_3[] = INCBIN_U32("graphics/event_objects/pics/people/greta/3.4bpp");
-const u32 gEventObjectPic_Greta_4[] = INCBIN_U32("graphics/event_objects/pics/people/greta/4.4bpp");
-const u32 gEventObjectPic_Greta_5[] = INCBIN_U32("graphics/event_objects/pics/people/greta/5.4bpp");
-const u32 gEventObjectPic_Greta_6[] = INCBIN_U32("graphics/event_objects/pics/people/greta/6.4bpp");
-const u32 gEventObjectPic_Greta_7[] = INCBIN_U32("graphics/event_objects/pics/people/greta/7.4bpp");
-const u32 gEventObjectPic_Greta_8[] = INCBIN_U32("graphics/event_objects/pics/people/greta/8.4bpp");
-const u32 gEventObjectPic_Noland_0[] = INCBIN_U32("graphics/event_objects/pics/people/noland/0.4bpp");
-const u32 gEventObjectPic_Noland_1[] = INCBIN_U32("graphics/event_objects/pics/people/noland/1.4bpp");
-const u32 gEventObjectPic_Noland_2[] = INCBIN_U32("graphics/event_objects/pics/people/noland/2.4bpp");
-const u32 gEventObjectPic_Noland_3[] = INCBIN_U32("graphics/event_objects/pics/people/noland/3.4bpp");
-const u32 gEventObjectPic_Noland_4[] = INCBIN_U32("graphics/event_objects/pics/people/noland/4.4bpp");
-const u32 gEventObjectPic_Noland_5[] = INCBIN_U32("graphics/event_objects/pics/people/noland/5.4bpp");
-const u32 gEventObjectPic_Noland_6[] = INCBIN_U32("graphics/event_objects/pics/people/noland/6.4bpp");
-const u32 gEventObjectPic_Noland_7[] = INCBIN_U32("graphics/event_objects/pics/people/noland/7.4bpp");
-const u32 gEventObjectPic_Noland_8[] = INCBIN_U32("graphics/event_objects/pics/people/noland/8.4bpp");
-const u32 gEventObjectPic_Lucy_0[] = INCBIN_U32("graphics/event_objects/pics/people/lucy/0.4bpp");
-const u32 gEventObjectPic_Lucy_1[] = INCBIN_U32("graphics/event_objects/pics/people/lucy/1.4bpp");
-const u32 gEventObjectPic_Lucy_2[] = INCBIN_U32("graphics/event_objects/pics/people/lucy/2.4bpp");
-const u32 gEventObjectPic_Lucy_3[] = INCBIN_U32("graphics/event_objects/pics/people/lucy/3.4bpp");
-const u32 gEventObjectPic_Lucy_4[] = INCBIN_U32("graphics/event_objects/pics/people/lucy/4.4bpp");
-const u32 gEventObjectPic_Lucy_5[] = INCBIN_U32("graphics/event_objects/pics/people/lucy/5.4bpp");
-const u32 gEventObjectPic_Lucy_6[] = INCBIN_U32("graphics/event_objects/pics/people/lucy/6.4bpp");
-const u32 gEventObjectPic_Lucy_7[] = INCBIN_U32("graphics/event_objects/pics/people/lucy/7.4bpp");
-const u32 gEventObjectPic_Lucy_8[] = INCBIN_U32("graphics/event_objects/pics/people/lucy/8.4bpp");
-const u32 gEventObjectPic_Brandon_0[] = INCBIN_U32("graphics/event_objects/pics/people/brandon/0.4bpp");
-const u32 gEventObjectPic_Brandon_1[] = INCBIN_U32("graphics/event_objects/pics/people/brandon/1.4bpp");
-const u32 gEventObjectPic_Brandon_2[] = INCBIN_U32("graphics/event_objects/pics/people/brandon/2.4bpp");
-const u32 gEventObjectPic_Brandon_3[] = INCBIN_U32("graphics/event_objects/pics/people/brandon/3.4bpp");
-const u32 gEventObjectPic_Brandon_4[] = INCBIN_U32("graphics/event_objects/pics/people/brandon/4.4bpp");
-const u32 gEventObjectPic_Brandon_5[] = INCBIN_U32("graphics/event_objects/pics/people/brandon/5.4bpp");
-const u32 gEventObjectPic_Brandon_6[] = INCBIN_U32("graphics/event_objects/pics/people/brandon/6.4bpp");
-const u32 gEventObjectPic_Brandon_7[] = INCBIN_U32("graphics/event_objects/pics/people/brandon/7.4bpp");
-const u32 gEventObjectPic_Brandon_8[] = INCBIN_U32("graphics/event_objects/pics/people/brandon/8.4bpp");
-const u32 gEventObjectPic_Lugia_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/lugia/0.4bpp");
-const u32 gEventObjectPic_Lugia_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/lugia/1.4bpp");
+const u32 gEventObjectPic_Deoxys[] = INCBIN_U32("graphics/event_objects/pics/pokemon/deoxys.4bpp");
+const u32 gEventObjectPic_Anabel[] = INCBIN_U32("graphics/event_objects/pics/people/frontier_brains/anabel.4bpp");
+const u32 gEventObjectPic_Tucker[] = INCBIN_U32("graphics/event_objects/pics/people/frontier_brains/tucker.4bpp");
+const u32 gEventObjectPic_Spenser[] = INCBIN_U32("graphics/event_objects/pics/people/frontier_brains/spenser.4bpp");
+const u32 gEventObjectPic_Greta[] = INCBIN_U32("graphics/event_objects/pics/people/frontier_brains/greta.4bpp");
+const u32 gEventObjectPic_Noland[] = INCBIN_U32("graphics/event_objects/pics/people/frontier_brains/noland.4bpp");
+const u32 gEventObjectPic_Lucy[] = INCBIN_U32("graphics/event_objects/pics/people/frontier_brains/lucy.4bpp");
+const u32 gEventObjectPic_Brandon[] = INCBIN_U32("graphics/event_objects/pics/people/frontier_brains/brandon.4bpp");
+const u32 gEventObjectPic_Lugia[] = INCBIN_U32("graphics/event_objects/pics/pokemon/lugia.4bpp");
 const u16 gEventObjectPalette32[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_32.gbapal");
-const u32 gEventObjectPic_HoOh_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/ho_oh/0.4bpp");
-const u32 gEventObjectPic_HoOh_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/ho_oh/1.4bpp");
+const u32 gEventObjectPic_HoOh[] = INCBIN_U32("graphics/event_objects/pics/pokemon/ho_oh.4bpp");
 const u16 gEventObjectPalette31[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_31.gbapal");
 
 #endif //GUARD_EVENT_OBJECT_GFX_H
diff --git a/src/data/field_event_obj/event_object_pic_tables.h b/src/data/field_event_obj/event_object_pic_tables.h
index 892af7e9b6..80a4e12ac4 100755
--- a/src/data/field_event_obj/event_object_pic_tables.h
+++ b/src/data/field_event_obj/event_object_pic_tables.h
@@ -2,748 +2,748 @@
 #define GUARD_EVENT_OBJECT_PIC_TABLES_H
 
 const struct SpriteFrameImage gEventObjectPicTable_BrendanNormal[] = {
-    obj_frame_tiles(gEventObjectPic_BrendanNormal_0),
-    obj_frame_tiles(gEventObjectPic_BrendanNormal_1),
-    obj_frame_tiles(gEventObjectPic_BrendanNormal_2),
-    obj_frame_tiles(gEventObjectPic_BrendanNormal_3),
-    obj_frame_tiles(gEventObjectPic_BrendanNormal_4),
-    obj_frame_tiles(gEventObjectPic_BrendanNormal_5),
-    obj_frame_tiles(gEventObjectPic_BrendanNormal_6),
-    obj_frame_tiles(gEventObjectPic_BrendanNormal_7),
-    obj_frame_tiles(gEventObjectPic_BrendanNormal_8),
-    obj_frame_tiles(gEventObjectPic_BrendanNormal_9),
-    obj_frame_tiles(gEventObjectPic_BrendanNormal_10),
-    obj_frame_tiles(gEventObjectPic_BrendanNormal_11),
-    obj_frame_tiles(gEventObjectPic_BrendanNormal_12),
-    obj_frame_tiles(gEventObjectPic_BrendanNormal_13),
-    obj_frame_tiles(gEventObjectPic_BrendanNormal_14),
-    obj_frame_tiles(gEventObjectPic_BrendanNormal_15),
-    obj_frame_tiles(gEventObjectPic_BrendanNormal_16),
-    obj_frame_tiles(gEventObjectPic_BrendanNormal_17),
+    overworld_frame(gEventObjectPic_BrendanNormal, 16, 32, 0),
+    overworld_frame(gEventObjectPic_BrendanNormal, 16, 32, 1),
+    overworld_frame(gEventObjectPic_BrendanNormal, 16, 32, 2),
+    overworld_frame(gEventObjectPic_BrendanNormal, 16, 32, 3),
+    overworld_frame(gEventObjectPic_BrendanNormal, 16, 32, 4),
+    overworld_frame(gEventObjectPic_BrendanNormal, 16, 32, 5),
+    overworld_frame(gEventObjectPic_BrendanNormal, 16, 32, 6),
+    overworld_frame(gEventObjectPic_BrendanNormal, 16, 32, 7),
+    overworld_frame(gEventObjectPic_BrendanNormal, 16, 32, 8),
+    overworld_frame(gEventObjectPic_BrendanRunning, 16, 32, 0),
+    overworld_frame(gEventObjectPic_BrendanRunning, 16, 32, 1),
+    overworld_frame(gEventObjectPic_BrendanRunning, 16, 32, 2),
+    overworld_frame(gEventObjectPic_BrendanRunning, 16, 32, 3),
+    overworld_frame(gEventObjectPic_BrendanRunning, 16, 32, 4),
+    overworld_frame(gEventObjectPic_BrendanRunning, 16, 32, 5),
+    overworld_frame(gEventObjectPic_BrendanRunning, 16, 32, 6),
+    overworld_frame(gEventObjectPic_BrendanRunning, 16, 32, 7),
+    overworld_frame(gEventObjectPic_BrendanRunning, 16, 32, 8),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_BrendanMachBike[] = {
-    obj_frame_tiles(gEventObjectPic_BrendanMachBike_0),
-    obj_frame_tiles(gEventObjectPic_BrendanMachBike_1),
-    obj_frame_tiles(gEventObjectPic_BrendanMachBike_2),
-    obj_frame_tiles(gEventObjectPic_BrendanMachBike_3),
-    obj_frame_tiles(gEventObjectPic_BrendanMachBike_4),
-    obj_frame_tiles(gEventObjectPic_BrendanMachBike_5),
-    obj_frame_tiles(gEventObjectPic_BrendanMachBike_6),
-    obj_frame_tiles(gEventObjectPic_BrendanMachBike_7),
-    obj_frame_tiles(gEventObjectPic_BrendanMachBike_8),
+    overworld_frame(gEventObjectPic_BrendanMachBike, 32, 32, 0),
+    overworld_frame(gEventObjectPic_BrendanMachBike, 32, 32, 1),
+    overworld_frame(gEventObjectPic_BrendanMachBike, 32, 32, 2),
+    overworld_frame(gEventObjectPic_BrendanMachBike, 32, 32, 3),
+    overworld_frame(gEventObjectPic_BrendanMachBike, 32, 32, 4),
+    overworld_frame(gEventObjectPic_BrendanMachBike, 32, 32, 5),
+    overworld_frame(gEventObjectPic_BrendanMachBike, 32, 32, 6),
+    overworld_frame(gEventObjectPic_BrendanMachBike, 32, 32, 7),
+    overworld_frame(gEventObjectPic_BrendanMachBike, 32, 32, 8),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_BrendanAcroBike[] = {
-    obj_frame_tiles(gEventObjectPic_BrendanAcroBike_0),
-    obj_frame_tiles(gEventObjectPic_BrendanAcroBike_1),
-    obj_frame_tiles(gEventObjectPic_BrendanAcroBike_2),
-    obj_frame_tiles(gEventObjectPic_BrendanAcroBike_3),
-    obj_frame_tiles(gEventObjectPic_BrendanAcroBike_4),
-    obj_frame_tiles(gEventObjectPic_BrendanAcroBike_5),
-    obj_frame_tiles(gEventObjectPic_BrendanAcroBike_6),
-    obj_frame_tiles(gEventObjectPic_BrendanAcroBike_7),
-    obj_frame_tiles(gEventObjectPic_BrendanAcroBike_8),
-    obj_frame_tiles(gEventObjectPic_BrendanAcroBike_9),
-    obj_frame_tiles(gEventObjectPic_BrendanAcroBike_10),
-    obj_frame_tiles(gEventObjectPic_BrendanAcroBike_11),
-    obj_frame_tiles(gEventObjectPic_BrendanAcroBike_12),
-    obj_frame_tiles(gEventObjectPic_BrendanAcroBike_13),
-    obj_frame_tiles(gEventObjectPic_BrendanAcroBike_14),
-    obj_frame_tiles(gEventObjectPic_BrendanAcroBike_15),
-    obj_frame_tiles(gEventObjectPic_BrendanAcroBike_16),
-    obj_frame_tiles(gEventObjectPic_BrendanAcroBike_17),
-    obj_frame_tiles(gEventObjectPic_BrendanAcroBike_18),
-    obj_frame_tiles(gEventObjectPic_BrendanAcroBike_19),
-    obj_frame_tiles(gEventObjectPic_BrendanAcroBike_20),
-    obj_frame_tiles(gEventObjectPic_BrendanAcroBike_21),
-    obj_frame_tiles(gEventObjectPic_BrendanAcroBike_22),
-    obj_frame_tiles(gEventObjectPic_BrendanAcroBike_23),
-    obj_frame_tiles(gEventObjectPic_BrendanAcroBike_24),
-    obj_frame_tiles(gEventObjectPic_BrendanAcroBike_25),
-    obj_frame_tiles(gEventObjectPic_BrendanAcroBike_26),
+    overworld_frame(gEventObjectPic_BrendanAcroBike, 32, 32, 0),
+    overworld_frame(gEventObjectPic_BrendanAcroBike, 32, 32, 1),
+    overworld_frame(gEventObjectPic_BrendanAcroBike, 32, 32, 2),
+    overworld_frame(gEventObjectPic_BrendanAcroBike, 32, 32, 3),
+    overworld_frame(gEventObjectPic_BrendanAcroBike, 32, 32, 4),
+    overworld_frame(gEventObjectPic_BrendanAcroBike, 32, 32, 5),
+    overworld_frame(gEventObjectPic_BrendanAcroBike, 32, 32, 6),
+    overworld_frame(gEventObjectPic_BrendanAcroBike, 32, 32, 7),
+    overworld_frame(gEventObjectPic_BrendanAcroBike, 32, 32, 8),
+    overworld_frame(gEventObjectPic_BrendanAcroBike, 32, 32, 9),
+    overworld_frame(gEventObjectPic_BrendanAcroBike, 32, 32, 10),
+    overworld_frame(gEventObjectPic_BrendanAcroBike, 32, 32, 11),
+    overworld_frame(gEventObjectPic_BrendanAcroBike, 32, 32, 12),
+    overworld_frame(gEventObjectPic_BrendanAcroBike, 32, 32, 13),
+    overworld_frame(gEventObjectPic_BrendanAcroBike, 32, 32, 14),
+    overworld_frame(gEventObjectPic_BrendanAcroBike, 32, 32, 15),
+    overworld_frame(gEventObjectPic_BrendanAcroBike, 32, 32, 16),
+    overworld_frame(gEventObjectPic_BrendanAcroBike, 32, 32, 17),
+    overworld_frame(gEventObjectPic_BrendanAcroBike, 32, 32, 18),
+    overworld_frame(gEventObjectPic_BrendanAcroBike, 32, 32, 19),
+    overworld_frame(gEventObjectPic_BrendanAcroBike, 32, 32, 20),
+    overworld_frame(gEventObjectPic_BrendanAcroBike, 32, 32, 21),
+    overworld_frame(gEventObjectPic_BrendanAcroBike, 32, 32, 22),
+    overworld_frame(gEventObjectPic_BrendanAcroBike, 32, 32, 23),
+    overworld_frame(gEventObjectPic_BrendanAcroBike, 32, 32, 24),
+    overworld_frame(gEventObjectPic_BrendanAcroBike, 32, 32, 25),
+    overworld_frame(gEventObjectPic_BrendanAcroBike, 32, 32, 26),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_BrendanSurfing[] = {
-    obj_frame_tiles(gEventObjectPic_BrendanSurfing_0),
-    obj_frame_tiles(gEventObjectPic_BrendanSurfing_1),
-    obj_frame_tiles(gEventObjectPic_BrendanSurfing_2),
-    obj_frame_tiles(gEventObjectPic_BrendanSurfing_0),
-    obj_frame_tiles(gEventObjectPic_BrendanSurfing_0),
-    obj_frame_tiles(gEventObjectPic_BrendanSurfing_1),
-    obj_frame_tiles(gEventObjectPic_BrendanSurfing_1),
-    obj_frame_tiles(gEventObjectPic_BrendanSurfing_2),
-    obj_frame_tiles(gEventObjectPic_BrendanSurfing_2),
-    obj_frame_tiles(gEventObjectPic_BrendanSurfing_3),
-    obj_frame_tiles(gEventObjectPic_BrendanSurfing_4),
-    obj_frame_tiles(gEventObjectPic_BrendanSurfing_5),
+    overworld_frame(gEventObjectPic_BrendanSurfing, 32, 32, 0),
+    overworld_frame(gEventObjectPic_BrendanSurfing, 32, 32, 2),
+    overworld_frame(gEventObjectPic_BrendanSurfing, 32, 32, 4),
+    overworld_frame(gEventObjectPic_BrendanSurfing, 32, 32, 0),
+    overworld_frame(gEventObjectPic_BrendanSurfing, 32, 32, 0),
+    overworld_frame(gEventObjectPic_BrendanSurfing, 32, 32, 2),
+    overworld_frame(gEventObjectPic_BrendanSurfing, 32, 32, 2),
+    overworld_frame(gEventObjectPic_BrendanSurfing, 32, 32, 4),
+    overworld_frame(gEventObjectPic_BrendanSurfing, 32, 32, 4),
+    overworld_frame(gEventObjectPic_BrendanSurfing, 32, 32, 1),
+    overworld_frame(gEventObjectPic_BrendanSurfing, 32, 32, 3),
+    overworld_frame(gEventObjectPic_BrendanSurfing, 32, 32, 5),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_BrendanUnderwater[] = {
-    obj_frame_tiles(gEventObjectPic_BrendanUnderwater_0),
-    obj_frame_tiles(gEventObjectPic_BrendanUnderwater_1),
-    obj_frame_tiles(gEventObjectPic_BrendanUnderwater_2),
-    obj_frame_tiles(gEventObjectPic_BrendanUnderwater_0),
-    obj_frame_tiles(gEventObjectPic_BrendanUnderwater_0),
-    obj_frame_tiles(gEventObjectPic_BrendanUnderwater_1),
-    obj_frame_tiles(gEventObjectPic_BrendanUnderwater_1),
-    obj_frame_tiles(gEventObjectPic_BrendanUnderwater_2),
-    obj_frame_tiles(gEventObjectPic_BrendanUnderwater_2),
+    overworld_frame(gEventObjectPic_BrendanUnderwater, 32, 32, 0),
+    overworld_frame(gEventObjectPic_BrendanUnderwater, 32, 32, 1),
+    overworld_frame(gEventObjectPic_BrendanUnderwater, 32, 32, 2),
+    overworld_frame(gEventObjectPic_BrendanUnderwater, 32, 32, 0),
+    overworld_frame(gEventObjectPic_BrendanUnderwater, 32, 32, 0),
+    overworld_frame(gEventObjectPic_BrendanUnderwater, 32, 32, 1),
+    overworld_frame(gEventObjectPic_BrendanUnderwater, 32, 32, 1),
+    overworld_frame(gEventObjectPic_BrendanUnderwater, 32, 32, 2),
+    overworld_frame(gEventObjectPic_BrendanUnderwater, 32, 32, 2),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_BrendanFieldMove[] = {
-    obj_frame_tiles(gEventObjectPic_BrendanFieldMove_0),
-    obj_frame_tiles(gEventObjectPic_BrendanFieldMove_1),
-    obj_frame_tiles(gEventObjectPic_BrendanFieldMove_2),
-    obj_frame_tiles(gEventObjectPic_BrendanFieldMove_3),
-    obj_frame_tiles(gEventObjectPic_BrendanFieldMove_4),
+    overworld_frame(gEventObjectPic_BrendanFieldMove, 32, 32, 0),
+    overworld_frame(gEventObjectPic_BrendanFieldMove, 32, 32, 1),
+    overworld_frame(gEventObjectPic_BrendanFieldMove, 32, 32, 2),
+    overworld_frame(gEventObjectPic_BrendanFieldMove, 32, 32, 3),
+    overworld_frame(gEventObjectPic_BrendanFieldMove, 32, 32, 4),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_QuintyPlump[] = {
-    obj_frame_tiles(gEventObjectPic_QuintyPlump_0),
-    obj_frame_tiles(gEventObjectPic_QuintyPlump_1),
-    obj_frame_tiles(gEventObjectPic_QuintyPlump_2),
-    obj_frame_tiles(gEventObjectPic_QuintyPlump_3),
-    obj_frame_tiles(gEventObjectPic_QuintyPlump_4),
-    obj_frame_tiles(gEventObjectPic_QuintyPlump_5),
-    obj_frame_tiles(gEventObjectPic_QuintyPlump_6),
+    overworld_frame(gEventObjectPic_QuintyPlump, 32, 32, 0),
+    overworld_frame(gEventObjectPic_QuintyPlump, 32, 32, 1),
+    overworld_frame(gEventObjectPic_QuintyPlump, 32, 32, 2),
+    overworld_frame(gEventObjectPic_QuintyPlump, 32, 32, 3),
+    overworld_frame(gEventObjectPic_QuintyPlump, 32, 32, 4),
+    overworld_frame(gEventObjectPic_QuintyPlump, 32, 32, 5),
+    overworld_frame(gEventObjectPic_QuintyPlump, 32, 32, 6),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_LittleBoy1[] = {
-    obj_frame_tiles(gEventObjectPic_LittleBoy1_0),
-    obj_frame_tiles(gEventObjectPic_LittleBoy1_1),
-    obj_frame_tiles(gEventObjectPic_LittleBoy1_2),
-    obj_frame_tiles(gEventObjectPic_LittleBoy1_3),
-    obj_frame_tiles(gEventObjectPic_LittleBoy1_4),
-    obj_frame_tiles(gEventObjectPic_LittleBoy1_5),
-    obj_frame_tiles(gEventObjectPic_LittleBoy1_6),
-    obj_frame_tiles(gEventObjectPic_LittleBoy1_7),
-    obj_frame_tiles(gEventObjectPic_LittleBoy1_8),
+    overworld_frame(gEventObjectPic_LittleBoy1, 16, 16, 0),
+    overworld_frame(gEventObjectPic_LittleBoy1, 16, 16, 1),
+    overworld_frame(gEventObjectPic_LittleBoy1, 16, 16, 2),
+    overworld_frame(gEventObjectPic_LittleBoy1, 16, 16, 3),
+    overworld_frame(gEventObjectPic_LittleBoy1, 16, 16, 4),
+    overworld_frame(gEventObjectPic_LittleBoy1, 16, 16, 5),
+    overworld_frame(gEventObjectPic_LittleBoy1, 16, 16, 6),
+    overworld_frame(gEventObjectPic_LittleBoy1, 16, 16, 7),
+    overworld_frame(gEventObjectPic_LittleBoy1, 16, 16, 8),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_LittleGirl1[] = {
-    obj_frame_tiles(gEventObjectPic_LittleGirl1_0),
-    obj_frame_tiles(gEventObjectPic_LittleGirl1_1),
-    obj_frame_tiles(gEventObjectPic_LittleGirl1_2),
-    obj_frame_tiles(gEventObjectPic_LittleGirl1_3),
-    obj_frame_tiles(gEventObjectPic_LittleGirl1_4),
-    obj_frame_tiles(gEventObjectPic_LittleGirl1_5),
-    obj_frame_tiles(gEventObjectPic_LittleGirl1_6),
-    obj_frame_tiles(gEventObjectPic_LittleGirl1_7),
-    obj_frame_tiles(gEventObjectPic_LittleGirl1_8),
+    overworld_frame(gEventObjectPic_LittleGirl1, 16, 32, 0),
+    overworld_frame(gEventObjectPic_LittleGirl1, 16, 32, 1),
+    overworld_frame(gEventObjectPic_LittleGirl1, 16, 32, 2),
+    overworld_frame(gEventObjectPic_LittleGirl1, 16, 32, 3),
+    overworld_frame(gEventObjectPic_LittleGirl1, 16, 32, 4),
+    overworld_frame(gEventObjectPic_LittleGirl1, 16, 32, 5),
+    overworld_frame(gEventObjectPic_LittleGirl1, 16, 32, 6),
+    overworld_frame(gEventObjectPic_LittleGirl1, 16, 32, 7),
+    overworld_frame(gEventObjectPic_LittleGirl1, 16, 32, 8),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_Boy1[] = {
-    obj_frame_tiles(gEventObjectPic_Boy1_0),
-    obj_frame_tiles(gEventObjectPic_Boy1_1),
-    obj_frame_tiles(gEventObjectPic_Boy1_2),
-    obj_frame_tiles(gEventObjectPic_Boy1_3),
-    obj_frame_tiles(gEventObjectPic_Boy1_4),
-    obj_frame_tiles(gEventObjectPic_Boy1_5),
-    obj_frame_tiles(gEventObjectPic_Boy1_6),
-    obj_frame_tiles(gEventObjectPic_Boy1_7),
-    obj_frame_tiles(gEventObjectPic_Boy1_8),
+    overworld_frame(gEventObjectPic_Boy1, 16, 32, 0),
+    overworld_frame(gEventObjectPic_Boy1, 16, 32, 1),
+    overworld_frame(gEventObjectPic_Boy1, 16, 32, 2),
+    overworld_frame(gEventObjectPic_Boy1, 16, 32, 3),
+    overworld_frame(gEventObjectPic_Boy1, 16, 32, 4),
+    overworld_frame(gEventObjectPic_Boy1, 16, 32, 5),
+    overworld_frame(gEventObjectPic_Boy1, 16, 32, 6),
+    overworld_frame(gEventObjectPic_Boy1, 16, 32, 7),
+    overworld_frame(gEventObjectPic_Boy1, 16, 32, 8),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_Girl1[] = {
-    obj_frame_tiles(gEventObjectPic_Girl1_0),
-    obj_frame_tiles(gEventObjectPic_Girl1_1),
-    obj_frame_tiles(gEventObjectPic_Girl1_2),
-    obj_frame_tiles(gEventObjectPic_Girl1_3),
-    obj_frame_tiles(gEventObjectPic_Girl1_4),
-    obj_frame_tiles(gEventObjectPic_Girl1_5),
-    obj_frame_tiles(gEventObjectPic_Girl1_6),
-    obj_frame_tiles(gEventObjectPic_Girl1_7),
-    obj_frame_tiles(gEventObjectPic_Girl1_8),
+    overworld_frame(gEventObjectPic_Girl1, 16, 32, 0),
+    overworld_frame(gEventObjectPic_Girl1, 16, 32, 1),
+    overworld_frame(gEventObjectPic_Girl1, 16, 32, 2),
+    overworld_frame(gEventObjectPic_Girl1, 16, 32, 3),
+    overworld_frame(gEventObjectPic_Girl1, 16, 32, 4),
+    overworld_frame(gEventObjectPic_Girl1, 16, 32, 5),
+    overworld_frame(gEventObjectPic_Girl1, 16, 32, 6),
+    overworld_frame(gEventObjectPic_Girl1, 16, 32, 7),
+    overworld_frame(gEventObjectPic_Girl1, 16, 32, 8),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_Boy2[] = {
-    obj_frame_tiles(gEventObjectPic_Boy2_0),
-    obj_frame_tiles(gEventObjectPic_Boy2_1),
-    obj_frame_tiles(gEventObjectPic_Boy2_2),
-    obj_frame_tiles(gEventObjectPic_Boy2_3),
-    obj_frame_tiles(gEventObjectPic_Boy2_4),
-    obj_frame_tiles(gEventObjectPic_Boy2_5),
-    obj_frame_tiles(gEventObjectPic_Boy2_6),
-    obj_frame_tiles(gEventObjectPic_Boy2_7),
-    obj_frame_tiles(gEventObjectPic_Boy2_8),
+    overworld_frame(gEventObjectPic_Boy2, 16, 32, 0),
+    overworld_frame(gEventObjectPic_Boy2, 16, 32, 1),
+    overworld_frame(gEventObjectPic_Boy2, 16, 32, 2),
+    overworld_frame(gEventObjectPic_Boy2, 16, 32, 3),
+    overworld_frame(gEventObjectPic_Boy2, 16, 32, 4),
+    overworld_frame(gEventObjectPic_Boy2, 16, 32, 5),
+    overworld_frame(gEventObjectPic_Boy2, 16, 32, 6),
+    overworld_frame(gEventObjectPic_Boy2, 16, 32, 7),
+    overworld_frame(gEventObjectPic_Boy2, 16, 32, 8),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_Girl2[] = {
-    obj_frame_tiles(gEventObjectPic_Girl2_0),
-    obj_frame_tiles(gEventObjectPic_Girl2_1),
-    obj_frame_tiles(gEventObjectPic_Girl2_2),
-    obj_frame_tiles(gEventObjectPic_Girl2_3),
-    obj_frame_tiles(gEventObjectPic_Girl2_4),
-    obj_frame_tiles(gEventObjectPic_Girl2_5),
-    obj_frame_tiles(gEventObjectPic_Girl2_6),
-    obj_frame_tiles(gEventObjectPic_Girl2_7),
-    obj_frame_tiles(gEventObjectPic_Girl2_8),
+    overworld_frame(gEventObjectPic_Girl2, 16, 32, 0),
+    overworld_frame(gEventObjectPic_Girl2, 16, 32, 1),
+    overworld_frame(gEventObjectPic_Girl2, 16, 32, 2),
+    overworld_frame(gEventObjectPic_Girl2, 16, 32, 3),
+    overworld_frame(gEventObjectPic_Girl2, 16, 32, 4),
+    overworld_frame(gEventObjectPic_Girl2, 16, 32, 5),
+    overworld_frame(gEventObjectPic_Girl2, 16, 32, 6),
+    overworld_frame(gEventObjectPic_Girl2, 16, 32, 7),
+    overworld_frame(gEventObjectPic_Girl2, 16, 32, 8),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_LittleBoy2[] = {
-    obj_frame_tiles(gEventObjectPic_LittleBoy2_0),
-    obj_frame_tiles(gEventObjectPic_LittleBoy2_1),
-    obj_frame_tiles(gEventObjectPic_LittleBoy2_2),
-    obj_frame_tiles(gEventObjectPic_LittleBoy2_3),
-    obj_frame_tiles(gEventObjectPic_LittleBoy2_4),
-    obj_frame_tiles(gEventObjectPic_LittleBoy2_5),
-    obj_frame_tiles(gEventObjectPic_LittleBoy2_6),
-    obj_frame_tiles(gEventObjectPic_LittleBoy2_7),
-    obj_frame_tiles(gEventObjectPic_LittleBoy2_8),
+    overworld_frame(gEventObjectPic_LittleBoy2, 16, 16, 0),
+    overworld_frame(gEventObjectPic_LittleBoy2, 16, 16, 1),
+    overworld_frame(gEventObjectPic_LittleBoy2, 16, 16, 2),
+    overworld_frame(gEventObjectPic_LittleBoy2, 16, 16, 3),
+    overworld_frame(gEventObjectPic_LittleBoy2, 16, 16, 4),
+    overworld_frame(gEventObjectPic_LittleBoy2, 16, 16, 5),
+    overworld_frame(gEventObjectPic_LittleBoy2, 16, 16, 6),
+    overworld_frame(gEventObjectPic_LittleBoy2, 16, 16, 7),
+    overworld_frame(gEventObjectPic_LittleBoy2, 16, 16, 8),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_LittleGirl2[] = {
-    obj_frame_tiles(gEventObjectPic_LittleGirl2_0),
-    obj_frame_tiles(gEventObjectPic_LittleGirl2_1),
-    obj_frame_tiles(gEventObjectPic_LittleGirl2_2),
-    obj_frame_tiles(gEventObjectPic_LittleGirl2_3),
-    obj_frame_tiles(gEventObjectPic_LittleGirl2_4),
-    obj_frame_tiles(gEventObjectPic_LittleGirl2_5),
-    obj_frame_tiles(gEventObjectPic_LittleGirl2_6),
-    obj_frame_tiles(gEventObjectPic_LittleGirl2_7),
-    obj_frame_tiles(gEventObjectPic_LittleGirl2_8),
+    overworld_frame(gEventObjectPic_LittleGirl2, 16, 16, 0),
+    overworld_frame(gEventObjectPic_LittleGirl2, 16, 16, 1),
+    overworld_frame(gEventObjectPic_LittleGirl2, 16, 16, 2),
+    overworld_frame(gEventObjectPic_LittleGirl2, 16, 16, 3),
+    overworld_frame(gEventObjectPic_LittleGirl2, 16, 16, 4),
+    overworld_frame(gEventObjectPic_LittleGirl2, 16, 16, 5),
+    overworld_frame(gEventObjectPic_LittleGirl2, 16, 16, 6),
+    overworld_frame(gEventObjectPic_LittleGirl2, 16, 16, 7),
+    overworld_frame(gEventObjectPic_LittleGirl2, 16, 16, 8),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_Boy3[] = {
-    obj_frame_tiles(gEventObjectPic_Boy3_0),
-    obj_frame_tiles(gEventObjectPic_Boy3_1),
-    obj_frame_tiles(gEventObjectPic_Boy3_2),
-    obj_frame_tiles(gEventObjectPic_Boy3_3),
-    obj_frame_tiles(gEventObjectPic_Boy3_4),
-    obj_frame_tiles(gEventObjectPic_Boy3_5),
-    obj_frame_tiles(gEventObjectPic_Boy3_6),
-    obj_frame_tiles(gEventObjectPic_Boy3_7),
-    obj_frame_tiles(gEventObjectPic_Boy3_8),
+    overworld_frame(gEventObjectPic_Boy3, 16, 32, 0),
+    overworld_frame(gEventObjectPic_Boy3, 16, 32, 1),
+    overworld_frame(gEventObjectPic_Boy3, 16, 32, 2),
+    overworld_frame(gEventObjectPic_Boy3, 16, 32, 3),
+    overworld_frame(gEventObjectPic_Boy3, 16, 32, 4),
+    overworld_frame(gEventObjectPic_Boy3, 16, 32, 5),
+    overworld_frame(gEventObjectPic_Boy3, 16, 32, 6),
+    overworld_frame(gEventObjectPic_Boy3, 16, 32, 7),
+    overworld_frame(gEventObjectPic_Boy3, 16, 32, 8),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_Girl3[] = {
-    obj_frame_tiles(gEventObjectPic_Girl3_0),
-    obj_frame_tiles(gEventObjectPic_Girl3_1),
-    obj_frame_tiles(gEventObjectPic_Girl3_2),
-    obj_frame_tiles(gEventObjectPic_Girl3_3),
-    obj_frame_tiles(gEventObjectPic_Girl3_4),
-    obj_frame_tiles(gEventObjectPic_Girl3_5),
-    obj_frame_tiles(gEventObjectPic_Girl3_6),
-    obj_frame_tiles(gEventObjectPic_Girl3_7),
-    obj_frame_tiles(gEventObjectPic_Girl3_8),
+    overworld_frame(gEventObjectPic_Girl3, 16, 32, 0),
+    overworld_frame(gEventObjectPic_Girl3, 16, 32, 1),
+    overworld_frame(gEventObjectPic_Girl3, 16, 32, 2),
+    overworld_frame(gEventObjectPic_Girl3, 16, 32, 3),
+    overworld_frame(gEventObjectPic_Girl3, 16, 32, 4),
+    overworld_frame(gEventObjectPic_Girl3, 16, 32, 5),
+    overworld_frame(gEventObjectPic_Girl3, 16, 32, 6),
+    overworld_frame(gEventObjectPic_Girl3, 16, 32, 7),
+    overworld_frame(gEventObjectPic_Girl3, 16, 32, 8),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_Boy4[] = {
-    obj_frame_tiles(gEventObjectPic_Boy4_0),
-    obj_frame_tiles(gEventObjectPic_Boy4_1),
-    obj_frame_tiles(gEventObjectPic_Boy4_2),
-    obj_frame_tiles(gEventObjectPic_Boy4_3),
-    obj_frame_tiles(gEventObjectPic_Boy4_4),
-    obj_frame_tiles(gEventObjectPic_Boy4_5),
-    obj_frame_tiles(gEventObjectPic_Boy4_6),
-    obj_frame_tiles(gEventObjectPic_Boy4_7),
-    obj_frame_tiles(gEventObjectPic_Boy4_8),
+    overworld_frame(gEventObjectPic_Boy4, 16, 32, 0),
+    overworld_frame(gEventObjectPic_Boy4, 16, 32, 1),
+    overworld_frame(gEventObjectPic_Boy4, 16, 32, 2),
+    overworld_frame(gEventObjectPic_Boy4, 16, 32, 3),
+    overworld_frame(gEventObjectPic_Boy4, 16, 32, 4),
+    overworld_frame(gEventObjectPic_Boy4, 16, 32, 5),
+    overworld_frame(gEventObjectPic_Boy4, 16, 32, 6),
+    overworld_frame(gEventObjectPic_Boy4, 16, 32, 7),
+    overworld_frame(gEventObjectPic_Boy4, 16, 32, 8),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_Woman1[] = {
-    obj_frame_tiles(gEventObjectPic_Woman1_0),
-    obj_frame_tiles(gEventObjectPic_Woman1_1),
-    obj_frame_tiles(gEventObjectPic_Woman1_2),
-    obj_frame_tiles(gEventObjectPic_Woman1_3),
-    obj_frame_tiles(gEventObjectPic_Woman1_4),
-    obj_frame_tiles(gEventObjectPic_Woman1_5),
-    obj_frame_tiles(gEventObjectPic_Woman1_6),
-    obj_frame_tiles(gEventObjectPic_Woman1_7),
-    obj_frame_tiles(gEventObjectPic_Woman1_8),
+    overworld_frame(gEventObjectPic_Woman1, 16, 32, 0),
+    overworld_frame(gEventObjectPic_Woman1, 16, 32, 1),
+    overworld_frame(gEventObjectPic_Woman1, 16, 32, 2),
+    overworld_frame(gEventObjectPic_Woman1, 16, 32, 3),
+    overworld_frame(gEventObjectPic_Woman1, 16, 32, 4),
+    overworld_frame(gEventObjectPic_Woman1, 16, 32, 5),
+    overworld_frame(gEventObjectPic_Woman1, 16, 32, 6),
+    overworld_frame(gEventObjectPic_Woman1, 16, 32, 7),
+    overworld_frame(gEventObjectPic_Woman1, 16, 32, 8),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_FatMan[] = {
-    obj_frame_tiles(gEventObjectPic_FatMan_0),
-    obj_frame_tiles(gEventObjectPic_FatMan_1),
-    obj_frame_tiles(gEventObjectPic_FatMan_2),
-    obj_frame_tiles(gEventObjectPic_FatMan_3),
-    obj_frame_tiles(gEventObjectPic_FatMan_4),
-    obj_frame_tiles(gEventObjectPic_FatMan_5),
-    obj_frame_tiles(gEventObjectPic_FatMan_6),
-    obj_frame_tiles(gEventObjectPic_FatMan_7),
-    obj_frame_tiles(gEventObjectPic_FatMan_8),
+    overworld_frame(gEventObjectPic_FatMan, 16, 32, 0),
+    overworld_frame(gEventObjectPic_FatMan, 16, 32, 1),
+    overworld_frame(gEventObjectPic_FatMan, 16, 32, 2),
+    overworld_frame(gEventObjectPic_FatMan, 16, 32, 3),
+    overworld_frame(gEventObjectPic_FatMan, 16, 32, 4),
+    overworld_frame(gEventObjectPic_FatMan, 16, 32, 5),
+    overworld_frame(gEventObjectPic_FatMan, 16, 32, 6),
+    overworld_frame(gEventObjectPic_FatMan, 16, 32, 7),
+    overworld_frame(gEventObjectPic_FatMan, 16, 32, 8),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_Woman2[] = {
-    obj_frame_tiles(gEventObjectPic_Woman2_0),
-    obj_frame_tiles(gEventObjectPic_Woman2_1),
-    obj_frame_tiles(gEventObjectPic_Woman2_2),
-    obj_frame_tiles(gEventObjectPic_Woman2_3),
-    obj_frame_tiles(gEventObjectPic_Woman2_4),
-    obj_frame_tiles(gEventObjectPic_Woman2_5),
-    obj_frame_tiles(gEventObjectPic_Woman2_6),
-    obj_frame_tiles(gEventObjectPic_Woman2_7),
-    obj_frame_tiles(gEventObjectPic_Woman2_8),
+    overworld_frame(gEventObjectPic_Woman2, 16, 32, 0),
+    overworld_frame(gEventObjectPic_Woman2, 16, 32, 1),
+    overworld_frame(gEventObjectPic_Woman2, 16, 32, 2),
+    overworld_frame(gEventObjectPic_Woman2, 16, 32, 3),
+    overworld_frame(gEventObjectPic_Woman2, 16, 32, 4),
+    overworld_frame(gEventObjectPic_Woman2, 16, 32, 5),
+    overworld_frame(gEventObjectPic_Woman2, 16, 32, 6),
+    overworld_frame(gEventObjectPic_Woman2, 16, 32, 7),
+    overworld_frame(gEventObjectPic_Woman2, 16, 32, 8),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_Man1[] = {
-    obj_frame_tiles(gEventObjectPic_Man1_0),
-    obj_frame_tiles(gEventObjectPic_Man1_1),
-    obj_frame_tiles(gEventObjectPic_Man1_2),
-    obj_frame_tiles(gEventObjectPic_Man1_3),
-    obj_frame_tiles(gEventObjectPic_Man1_4),
-    obj_frame_tiles(gEventObjectPic_Man1_5),
-    obj_frame_tiles(gEventObjectPic_Man1_6),
-    obj_frame_tiles(gEventObjectPic_Man1_7),
-    obj_frame_tiles(gEventObjectPic_Man1_8),
+    overworld_frame(gEventObjectPic_Man1, 16, 32, 0),
+    overworld_frame(gEventObjectPic_Man1, 16, 32, 1),
+    overworld_frame(gEventObjectPic_Man1, 16, 32, 2),
+    overworld_frame(gEventObjectPic_Man1, 16, 32, 3),
+    overworld_frame(gEventObjectPic_Man1, 16, 32, 4),
+    overworld_frame(gEventObjectPic_Man1, 16, 32, 5),
+    overworld_frame(gEventObjectPic_Man1, 16, 32, 6),
+    overworld_frame(gEventObjectPic_Man1, 16, 32, 7),
+    overworld_frame(gEventObjectPic_Man1, 16, 32, 8),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_Woman3[] = {
-    obj_frame_tiles(gEventObjectPic_Woman3_0),
-    obj_frame_tiles(gEventObjectPic_Woman3_1),
-    obj_frame_tiles(gEventObjectPic_Woman3_2),
-    obj_frame_tiles(gEventObjectPic_Woman3_3),
-    obj_frame_tiles(gEventObjectPic_Woman3_4),
-    obj_frame_tiles(gEventObjectPic_Woman3_5),
-    obj_frame_tiles(gEventObjectPic_Woman3_6),
-    obj_frame_tiles(gEventObjectPic_Woman3_7),
-    obj_frame_tiles(gEventObjectPic_Woman3_8),
+    overworld_frame(gEventObjectPic_Woman3, 16, 32, 0),
+    overworld_frame(gEventObjectPic_Woman3, 16, 32, 1),
+    overworld_frame(gEventObjectPic_Woman3, 16, 32, 2),
+    overworld_frame(gEventObjectPic_Woman3, 16, 32, 3),
+    overworld_frame(gEventObjectPic_Woman3, 16, 32, 4),
+    overworld_frame(gEventObjectPic_Woman3, 16, 32, 5),
+    overworld_frame(gEventObjectPic_Woman3, 16, 32, 6),
+    overworld_frame(gEventObjectPic_Woman3, 16, 32, 7),
+    overworld_frame(gEventObjectPic_Woman3, 16, 32, 8),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_OldMan1[] = {
-    obj_frame_tiles(gEventObjectPic_OldMan1_0),
-    obj_frame_tiles(gEventObjectPic_OldMan1_1),
-    obj_frame_tiles(gEventObjectPic_OldMan1_2),
-    obj_frame_tiles(gEventObjectPic_OldMan1_3),
-    obj_frame_tiles(gEventObjectPic_OldMan1_4),
-    obj_frame_tiles(gEventObjectPic_OldMan1_5),
-    obj_frame_tiles(gEventObjectPic_OldMan1_6),
-    obj_frame_tiles(gEventObjectPic_OldMan1_7),
-    obj_frame_tiles(gEventObjectPic_OldMan1_8),
+    overworld_frame(gEventObjectPic_OldMan1, 16, 32, 0),
+    overworld_frame(gEventObjectPic_OldMan1, 16, 32, 1),
+    overworld_frame(gEventObjectPic_OldMan1, 16, 32, 2),
+    overworld_frame(gEventObjectPic_OldMan1, 16, 32, 3),
+    overworld_frame(gEventObjectPic_OldMan1, 16, 32, 4),
+    overworld_frame(gEventObjectPic_OldMan1, 16, 32, 5),
+    overworld_frame(gEventObjectPic_OldMan1, 16, 32, 6),
+    overworld_frame(gEventObjectPic_OldMan1, 16, 32, 7),
+    overworld_frame(gEventObjectPic_OldMan1, 16, 32, 8),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_OldWoman1[] = {
-    obj_frame_tiles(gEventObjectPic_OldWoman1_0),
-    obj_frame_tiles(gEventObjectPic_OldWoman1_1),
-    obj_frame_tiles(gEventObjectPic_OldWoman1_2),
-    obj_frame_tiles(gEventObjectPic_OldWoman1_3),
-    obj_frame_tiles(gEventObjectPic_OldWoman1_4),
-    obj_frame_tiles(gEventObjectPic_OldWoman1_5),
-    obj_frame_tiles(gEventObjectPic_OldWoman1_6),
-    obj_frame_tiles(gEventObjectPic_OldWoman1_7),
-    obj_frame_tiles(gEventObjectPic_OldWoman1_8),
+    overworld_frame(gEventObjectPic_OldWoman1, 16, 32, 0),
+    overworld_frame(gEventObjectPic_OldWoman1, 16, 32, 1),
+    overworld_frame(gEventObjectPic_OldWoman1, 16, 32, 2),
+    overworld_frame(gEventObjectPic_OldWoman1, 16, 32, 3),
+    overworld_frame(gEventObjectPic_OldWoman1, 16, 32, 4),
+    overworld_frame(gEventObjectPic_OldWoman1, 16, 32, 5),
+    overworld_frame(gEventObjectPic_OldWoman1, 16, 32, 6),
+    overworld_frame(gEventObjectPic_OldWoman1, 16, 32, 7),
+    overworld_frame(gEventObjectPic_OldWoman1, 16, 32, 8),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_Man2[] = {
-    obj_frame_tiles(gEventObjectPic_Man2_0),
-    obj_frame_tiles(gEventObjectPic_Man2_1),
-    obj_frame_tiles(gEventObjectPic_Man2_2),
-    obj_frame_tiles(gEventObjectPic_Man2_3),
-    obj_frame_tiles(gEventObjectPic_Man2_4),
-    obj_frame_tiles(gEventObjectPic_Man2_5),
-    obj_frame_tiles(gEventObjectPic_Man2_6),
-    obj_frame_tiles(gEventObjectPic_Man2_7),
-    obj_frame_tiles(gEventObjectPic_Man2_8),
+    overworld_frame(gEventObjectPic_Man2, 16, 32, 0),
+    overworld_frame(gEventObjectPic_Man2, 16, 32, 1),
+    overworld_frame(gEventObjectPic_Man2, 16, 32, 2),
+    overworld_frame(gEventObjectPic_Man2, 16, 32, 3),
+    overworld_frame(gEventObjectPic_Man2, 16, 32, 4),
+    overworld_frame(gEventObjectPic_Man2, 16, 32, 5),
+    overworld_frame(gEventObjectPic_Man2, 16, 32, 6),
+    overworld_frame(gEventObjectPic_Man2, 16, 32, 7),
+    overworld_frame(gEventObjectPic_Man2, 16, 32, 8),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_Woman4[] = {
-    obj_frame_tiles(gEventObjectPic_Woman4_0),
-    obj_frame_tiles(gEventObjectPic_Woman4_1),
-    obj_frame_tiles(gEventObjectPic_Woman4_2),
-    obj_frame_tiles(gEventObjectPic_Woman4_3),
-    obj_frame_tiles(gEventObjectPic_Woman4_4),
-    obj_frame_tiles(gEventObjectPic_Woman4_5),
-    obj_frame_tiles(gEventObjectPic_Woman4_6),
-    obj_frame_tiles(gEventObjectPic_Woman4_7),
-    obj_frame_tiles(gEventObjectPic_Woman4_8),
+    overworld_frame(gEventObjectPic_Woman4, 16, 32, 0),
+    overworld_frame(gEventObjectPic_Woman4, 16, 32, 1),
+    overworld_frame(gEventObjectPic_Woman4, 16, 32, 2),
+    overworld_frame(gEventObjectPic_Woman4, 16, 32, 3),
+    overworld_frame(gEventObjectPic_Woman4, 16, 32, 4),
+    overworld_frame(gEventObjectPic_Woman4, 16, 32, 5),
+    overworld_frame(gEventObjectPic_Woman4, 16, 32, 6),
+    overworld_frame(gEventObjectPic_Woman4, 16, 32, 7),
+    overworld_frame(gEventObjectPic_Woman4, 16, 32, 8),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_Man3[] = {
-    obj_frame_tiles(gEventObjectPic_Man3_0),
-    obj_frame_tiles(gEventObjectPic_Man3_1),
-    obj_frame_tiles(gEventObjectPic_Man3_2),
-    obj_frame_tiles(gEventObjectPic_Man3_3),
-    obj_frame_tiles(gEventObjectPic_Man3_4),
-    obj_frame_tiles(gEventObjectPic_Man3_5),
-    obj_frame_tiles(gEventObjectPic_Man3_6),
-    obj_frame_tiles(gEventObjectPic_Man3_7),
-    obj_frame_tiles(gEventObjectPic_Man3_8),
+    overworld_frame(gEventObjectPic_Man3, 16, 32, 0),
+    overworld_frame(gEventObjectPic_Man3, 16, 32, 1),
+    overworld_frame(gEventObjectPic_Man3, 16, 32, 2),
+    overworld_frame(gEventObjectPic_Man3, 16, 32, 3),
+    overworld_frame(gEventObjectPic_Man3, 16, 32, 4),
+    overworld_frame(gEventObjectPic_Man3, 16, 32, 5),
+    overworld_frame(gEventObjectPic_Man3, 16, 32, 6),
+    overworld_frame(gEventObjectPic_Man3, 16, 32, 7),
+    overworld_frame(gEventObjectPic_Man3, 16, 32, 8),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_Woman5[] = {
-    obj_frame_tiles(gEventObjectPic_Woman5_0),
-    obj_frame_tiles(gEventObjectPic_Woman5_1),
-    obj_frame_tiles(gEventObjectPic_Woman5_2),
-    obj_frame_tiles(gEventObjectPic_Woman5_3),
-    obj_frame_tiles(gEventObjectPic_Woman5_4),
-    obj_frame_tiles(gEventObjectPic_Woman5_5),
-    obj_frame_tiles(gEventObjectPic_Woman5_6),
-    obj_frame_tiles(gEventObjectPic_Woman5_7),
-    obj_frame_tiles(gEventObjectPic_Woman5_8),
+    overworld_frame(gEventObjectPic_Woman5, 16, 32, 0),
+    overworld_frame(gEventObjectPic_Woman5, 16, 32, 1),
+    overworld_frame(gEventObjectPic_Woman5, 16, 32, 2),
+    overworld_frame(gEventObjectPic_Woman5, 16, 32, 3),
+    overworld_frame(gEventObjectPic_Woman5, 16, 32, 4),
+    overworld_frame(gEventObjectPic_Woman5, 16, 32, 5),
+    overworld_frame(gEventObjectPic_Woman5, 16, 32, 6),
+    overworld_frame(gEventObjectPic_Woman5, 16, 32, 7),
+    overworld_frame(gEventObjectPic_Woman5, 16, 32, 8),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_Cook[] = {
-    obj_frame_tiles(gEventObjectPic_Cook_0),
-    obj_frame_tiles(gEventObjectPic_Cook_1),
-    obj_frame_tiles(gEventObjectPic_Cook_2),
-    obj_frame_tiles(gEventObjectPic_Cook_0),
-    obj_frame_tiles(gEventObjectPic_Cook_0),
-    obj_frame_tiles(gEventObjectPic_Cook_1),
-    obj_frame_tiles(gEventObjectPic_Cook_1),
-    obj_frame_tiles(gEventObjectPic_Cook_2),
-    obj_frame_tiles(gEventObjectPic_Cook_2),
+    overworld_frame(gEventObjectPic_Cook, 16, 32, 0),
+    overworld_frame(gEventObjectPic_Cook, 16, 32, 1),
+    overworld_frame(gEventObjectPic_Cook, 16, 32, 2),
+    overworld_frame(gEventObjectPic_Cook, 16, 32, 0),
+    overworld_frame(gEventObjectPic_Cook, 16, 32, 0),
+    overworld_frame(gEventObjectPic_Cook, 16, 32, 1),
+    overworld_frame(gEventObjectPic_Cook, 16, 32, 1),
+    overworld_frame(gEventObjectPic_Cook, 16, 32, 2),
+    overworld_frame(gEventObjectPic_Cook, 16, 32, 2),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_Woman6[] = {
-    obj_frame_tiles(gEventObjectPic_Woman6_0),
-    obj_frame_tiles(gEventObjectPic_Woman6_1),
-    obj_frame_tiles(gEventObjectPic_Woman6_2),
-    obj_frame_tiles(gEventObjectPic_Woman6_3),
-    obj_frame_tiles(gEventObjectPic_Woman6_4),
-    obj_frame_tiles(gEventObjectPic_Woman6_5),
-    obj_frame_tiles(gEventObjectPic_Woman6_6),
-    obj_frame_tiles(gEventObjectPic_Woman6_7),
-    obj_frame_tiles(gEventObjectPic_Woman6_8),
+    overworld_frame(gEventObjectPic_Woman6, 16, 32, 0),
+    overworld_frame(gEventObjectPic_Woman6, 16, 32, 1),
+    overworld_frame(gEventObjectPic_Woman6, 16, 32, 2),
+    overworld_frame(gEventObjectPic_Woman6, 16, 32, 3),
+    overworld_frame(gEventObjectPic_Woman6, 16, 32, 4),
+    overworld_frame(gEventObjectPic_Woman6, 16, 32, 5),
+    overworld_frame(gEventObjectPic_Woman6, 16, 32, 6),
+    overworld_frame(gEventObjectPic_Woman6, 16, 32, 7),
+    overworld_frame(gEventObjectPic_Woman6, 16, 32, 8),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_OldMan2[] = {
-    obj_frame_tiles(gEventObjectPic_OldMan2_0),
-    obj_frame_tiles(gEventObjectPic_OldMan2_1),
-    obj_frame_tiles(gEventObjectPic_OldMan2_2),
-    obj_frame_tiles(gEventObjectPic_OldMan2_0),
-    obj_frame_tiles(gEventObjectPic_OldMan2_0),
-    obj_frame_tiles(gEventObjectPic_OldMan2_1),
-    obj_frame_tiles(gEventObjectPic_OldMan2_1),
-    obj_frame_tiles(gEventObjectPic_OldMan2_2),
-    obj_frame_tiles(gEventObjectPic_OldMan2_2),
+    overworld_frame(gEventObjectPic_OldMan2, 16, 32, 0),
+    overworld_frame(gEventObjectPic_OldMan2, 16, 32, 1),
+    overworld_frame(gEventObjectPic_OldMan2, 16, 32, 2),
+    overworld_frame(gEventObjectPic_OldMan2, 16, 32, 0),
+    overworld_frame(gEventObjectPic_OldMan2, 16, 32, 0),
+    overworld_frame(gEventObjectPic_OldMan2, 16, 32, 1),
+    overworld_frame(gEventObjectPic_OldMan2, 16, 32, 1),
+    overworld_frame(gEventObjectPic_OldMan2, 16, 32, 2),
+    overworld_frame(gEventObjectPic_OldMan2, 16, 32, 2),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_OldWoman2[] = {
-    obj_frame_tiles(gEventObjectPic_OldWoman2_0),
-    obj_frame_tiles(gEventObjectPic_OldWoman2_1),
-    obj_frame_tiles(gEventObjectPic_OldWoman2_2),
-    obj_frame_tiles(gEventObjectPic_OldWoman2_3),
-    obj_frame_tiles(gEventObjectPic_OldWoman2_4),
-    obj_frame_tiles(gEventObjectPic_OldWoman2_5),
-    obj_frame_tiles(gEventObjectPic_OldWoman2_6),
-    obj_frame_tiles(gEventObjectPic_OldWoman2_7),
-    obj_frame_tiles(gEventObjectPic_OldWoman2_8),
+    overworld_frame(gEventObjectPic_OldWoman2, 16, 32, 0),
+    overworld_frame(gEventObjectPic_OldWoman2, 16, 32, 1),
+    overworld_frame(gEventObjectPic_OldWoman2, 16, 32, 2),
+    overworld_frame(gEventObjectPic_OldWoman2, 16, 32, 3),
+    overworld_frame(gEventObjectPic_OldWoman2, 16, 32, 4),
+    overworld_frame(gEventObjectPic_OldWoman2, 16, 32, 5),
+    overworld_frame(gEventObjectPic_OldWoman2, 16, 32, 6),
+    overworld_frame(gEventObjectPic_OldWoman2, 16, 32, 7),
+    overworld_frame(gEventObjectPic_OldWoman2, 16, 32, 8),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_Camper[] = {
-    obj_frame_tiles(gEventObjectPic_Camper_0),
-    obj_frame_tiles(gEventObjectPic_Camper_1),
-    obj_frame_tiles(gEventObjectPic_Camper_2),
-    obj_frame_tiles(gEventObjectPic_Camper_3),
-    obj_frame_tiles(gEventObjectPic_Camper_4),
-    obj_frame_tiles(gEventObjectPic_Camper_5),
-    obj_frame_tiles(gEventObjectPic_Camper_6),
-    obj_frame_tiles(gEventObjectPic_Camper_7),
-    obj_frame_tiles(gEventObjectPic_Camper_8),
+    overworld_frame(gEventObjectPic_Camper, 16, 32, 0),
+    overworld_frame(gEventObjectPic_Camper, 16, 32, 1),
+    overworld_frame(gEventObjectPic_Camper, 16, 32, 2),
+    overworld_frame(gEventObjectPic_Camper, 16, 32, 3),
+    overworld_frame(gEventObjectPic_Camper, 16, 32, 4),
+    overworld_frame(gEventObjectPic_Camper, 16, 32, 5),
+    overworld_frame(gEventObjectPic_Camper, 16, 32, 6),
+    overworld_frame(gEventObjectPic_Camper, 16, 32, 7),
+    overworld_frame(gEventObjectPic_Camper, 16, 32, 8),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_Picnicker[] = {
-    obj_frame_tiles(gEventObjectPic_Picnicker_0),
-    obj_frame_tiles(gEventObjectPic_Picnicker_1),
-    obj_frame_tiles(gEventObjectPic_Picnicker_2),
-    obj_frame_tiles(gEventObjectPic_Picnicker_3),
-    obj_frame_tiles(gEventObjectPic_Picnicker_4),
-    obj_frame_tiles(gEventObjectPic_Picnicker_5),
-    obj_frame_tiles(gEventObjectPic_Picnicker_6),
-    obj_frame_tiles(gEventObjectPic_Picnicker_7),
-    obj_frame_tiles(gEventObjectPic_Picnicker_8),
+    overworld_frame(gEventObjectPic_Picnicker, 16, 32, 0),
+    overworld_frame(gEventObjectPic_Picnicker, 16, 32, 1),
+    overworld_frame(gEventObjectPic_Picnicker, 16, 32, 2),
+    overworld_frame(gEventObjectPic_Picnicker, 16, 32, 3),
+    overworld_frame(gEventObjectPic_Picnicker, 16, 32, 4),
+    overworld_frame(gEventObjectPic_Picnicker, 16, 32, 5),
+    overworld_frame(gEventObjectPic_Picnicker, 16, 32, 6),
+    overworld_frame(gEventObjectPic_Picnicker, 16, 32, 7),
+    overworld_frame(gEventObjectPic_Picnicker, 16, 32, 8),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_Man4[] = {
-    obj_frame_tiles(gEventObjectPic_Man4_0),
-    obj_frame_tiles(gEventObjectPic_Man4_1),
-    obj_frame_tiles(gEventObjectPic_Man4_2),
-    obj_frame_tiles(gEventObjectPic_Man4_3),
-    obj_frame_tiles(gEventObjectPic_Man4_4),
-    obj_frame_tiles(gEventObjectPic_Man4_5),
-    obj_frame_tiles(gEventObjectPic_Man4_6),
-    obj_frame_tiles(gEventObjectPic_Man4_7),
-    obj_frame_tiles(gEventObjectPic_Man4_8),
+    overworld_frame(gEventObjectPic_Man4, 16, 32, 0),
+    overworld_frame(gEventObjectPic_Man4, 16, 32, 1),
+    overworld_frame(gEventObjectPic_Man4, 16, 32, 2),
+    overworld_frame(gEventObjectPic_Man4, 16, 32, 3),
+    overworld_frame(gEventObjectPic_Man4, 16, 32, 4),
+    overworld_frame(gEventObjectPic_Man4, 16, 32, 5),
+    overworld_frame(gEventObjectPic_Man4, 16, 32, 6),
+    overworld_frame(gEventObjectPic_Man4, 16, 32, 7),
+    overworld_frame(gEventObjectPic_Man4, 16, 32, 8),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_Woman7[] = {
-    obj_frame_tiles(gEventObjectPic_Woman7_0),
-    obj_frame_tiles(gEventObjectPic_Woman7_1),
-    obj_frame_tiles(gEventObjectPic_Woman7_2),
-    obj_frame_tiles(gEventObjectPic_Woman7_3),
-    obj_frame_tiles(gEventObjectPic_Woman7_4),
-    obj_frame_tiles(gEventObjectPic_Woman7_5),
-    obj_frame_tiles(gEventObjectPic_Woman7_6),
-    obj_frame_tiles(gEventObjectPic_Woman7_7),
-    obj_frame_tiles(gEventObjectPic_Woman7_8),
+    overworld_frame(gEventObjectPic_Woman7, 16, 32, 0),
+    overworld_frame(gEventObjectPic_Woman7, 16, 32, 1),
+    overworld_frame(gEventObjectPic_Woman7, 16, 32, 2),
+    overworld_frame(gEventObjectPic_Woman7, 16, 32, 3),
+    overworld_frame(gEventObjectPic_Woman7, 16, 32, 4),
+    overworld_frame(gEventObjectPic_Woman7, 16, 32, 5),
+    overworld_frame(gEventObjectPic_Woman7, 16, 32, 6),
+    overworld_frame(gEventObjectPic_Woman7, 16, 32, 7),
+    overworld_frame(gEventObjectPic_Woman7, 16, 32, 8),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_Youngster[] = {
-    obj_frame_tiles(gEventObjectPic_Youngster_0),
-    obj_frame_tiles(gEventObjectPic_Youngster_1),
-    obj_frame_tiles(gEventObjectPic_Youngster_2),
-    obj_frame_tiles(gEventObjectPic_Youngster_3),
-    obj_frame_tiles(gEventObjectPic_Youngster_4),
-    obj_frame_tiles(gEventObjectPic_Youngster_5),
-    obj_frame_tiles(gEventObjectPic_Youngster_6),
-    obj_frame_tiles(gEventObjectPic_Youngster_7),
-    obj_frame_tiles(gEventObjectPic_Youngster_8),
+    overworld_frame(gEventObjectPic_Youngster, 16, 32, 0),
+    overworld_frame(gEventObjectPic_Youngster, 16, 32, 1),
+    overworld_frame(gEventObjectPic_Youngster, 16, 32, 2),
+    overworld_frame(gEventObjectPic_Youngster, 16, 32, 3),
+    overworld_frame(gEventObjectPic_Youngster, 16, 32, 4),
+    overworld_frame(gEventObjectPic_Youngster, 16, 32, 5),
+    overworld_frame(gEventObjectPic_Youngster, 16, 32, 6),
+    overworld_frame(gEventObjectPic_Youngster, 16, 32, 7),
+    overworld_frame(gEventObjectPic_Youngster, 16, 32, 8),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_BugCatcher[] = {
-    obj_frame_tiles(gEventObjectPic_BugCatcher_0),
-    obj_frame_tiles(gEventObjectPic_BugCatcher_1),
-    obj_frame_tiles(gEventObjectPic_BugCatcher_2),
-    obj_frame_tiles(gEventObjectPic_BugCatcher_3),
-    obj_frame_tiles(gEventObjectPic_BugCatcher_4),
-    obj_frame_tiles(gEventObjectPic_BugCatcher_5),
-    obj_frame_tiles(gEventObjectPic_BugCatcher_6),
-    obj_frame_tiles(gEventObjectPic_BugCatcher_7),
-    obj_frame_tiles(gEventObjectPic_BugCatcher_8),
+    overworld_frame(gEventObjectPic_BugCatcher, 16, 32, 0),
+    overworld_frame(gEventObjectPic_BugCatcher, 16, 32, 1),
+    overworld_frame(gEventObjectPic_BugCatcher, 16, 32, 2),
+    overworld_frame(gEventObjectPic_BugCatcher, 16, 32, 3),
+    overworld_frame(gEventObjectPic_BugCatcher, 16, 32, 4),
+    overworld_frame(gEventObjectPic_BugCatcher, 16, 32, 5),
+    overworld_frame(gEventObjectPic_BugCatcher, 16, 32, 6),
+    overworld_frame(gEventObjectPic_BugCatcher, 16, 32, 7),
+    overworld_frame(gEventObjectPic_BugCatcher, 16, 32, 8),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_PsychicM[] = {
-    obj_frame_tiles(gEventObjectPic_PsychicM_0),
-    obj_frame_tiles(gEventObjectPic_PsychicM_1),
-    obj_frame_tiles(gEventObjectPic_PsychicM_2),
-    obj_frame_tiles(gEventObjectPic_PsychicM_3),
-    obj_frame_tiles(gEventObjectPic_PsychicM_4),
-    obj_frame_tiles(gEventObjectPic_PsychicM_5),
-    obj_frame_tiles(gEventObjectPic_PsychicM_6),
-    obj_frame_tiles(gEventObjectPic_PsychicM_7),
-    obj_frame_tiles(gEventObjectPic_PsychicM_8),
+    overworld_frame(gEventObjectPic_PsychicM, 16, 32, 0),
+    overworld_frame(gEventObjectPic_PsychicM, 16, 32, 1),
+    overworld_frame(gEventObjectPic_PsychicM, 16, 32, 2),
+    overworld_frame(gEventObjectPic_PsychicM, 16, 32, 3),
+    overworld_frame(gEventObjectPic_PsychicM, 16, 32, 4),
+    overworld_frame(gEventObjectPic_PsychicM, 16, 32, 5),
+    overworld_frame(gEventObjectPic_PsychicM, 16, 32, 6),
+    overworld_frame(gEventObjectPic_PsychicM, 16, 32, 7),
+    overworld_frame(gEventObjectPic_PsychicM, 16, 32, 8),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_SchoolKidM[] = {
-    obj_frame_tiles(gEventObjectPic_SchoolKidM_0),
-    obj_frame_tiles(gEventObjectPic_SchoolKidM_1),
-    obj_frame_tiles(gEventObjectPic_SchoolKidM_2),
-    obj_frame_tiles(gEventObjectPic_SchoolKidM_3),
-    obj_frame_tiles(gEventObjectPic_SchoolKidM_4),
-    obj_frame_tiles(gEventObjectPic_SchoolKidM_5),
-    obj_frame_tiles(gEventObjectPic_SchoolKidM_6),
-    obj_frame_tiles(gEventObjectPic_SchoolKidM_7),
-    obj_frame_tiles(gEventObjectPic_SchoolKidM_8),
+    overworld_frame(gEventObjectPic_SchoolKidM, 16, 32, 0),
+    overworld_frame(gEventObjectPic_SchoolKidM, 16, 32, 1),
+    overworld_frame(gEventObjectPic_SchoolKidM, 16, 32, 2),
+    overworld_frame(gEventObjectPic_SchoolKidM, 16, 32, 3),
+    overworld_frame(gEventObjectPic_SchoolKidM, 16, 32, 4),
+    overworld_frame(gEventObjectPic_SchoolKidM, 16, 32, 5),
+    overworld_frame(gEventObjectPic_SchoolKidM, 16, 32, 6),
+    overworld_frame(gEventObjectPic_SchoolKidM, 16, 32, 7),
+    overworld_frame(gEventObjectPic_SchoolKidM, 16, 32, 8),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_Maniac[] = {
-    obj_frame_tiles(gEventObjectPic_Maniac_0),
-    obj_frame_tiles(gEventObjectPic_Maniac_1),
-    obj_frame_tiles(gEventObjectPic_Maniac_2),
-    obj_frame_tiles(gEventObjectPic_Maniac_3),
-    obj_frame_tiles(gEventObjectPic_Maniac_4),
-    obj_frame_tiles(gEventObjectPic_Maniac_5),
-    obj_frame_tiles(gEventObjectPic_Maniac_6),
-    obj_frame_tiles(gEventObjectPic_Maniac_7),
-    obj_frame_tiles(gEventObjectPic_Maniac_8),
+    overworld_frame(gEventObjectPic_Maniac, 16, 32, 0),
+    overworld_frame(gEventObjectPic_Maniac, 16, 32, 1),
+    overworld_frame(gEventObjectPic_Maniac, 16, 32, 2),
+    overworld_frame(gEventObjectPic_Maniac, 16, 32, 3),
+    overworld_frame(gEventObjectPic_Maniac, 16, 32, 4),
+    overworld_frame(gEventObjectPic_Maniac, 16, 32, 5),
+    overworld_frame(gEventObjectPic_Maniac, 16, 32, 6),
+    overworld_frame(gEventObjectPic_Maniac, 16, 32, 7),
+    overworld_frame(gEventObjectPic_Maniac, 16, 32, 8),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_HexManiac[] = {
-    obj_frame_tiles(gEventObjectPic_HexManiac_0),
-    obj_frame_tiles(gEventObjectPic_HexManiac_1),
-    obj_frame_tiles(gEventObjectPic_HexManiac_2),
-    obj_frame_tiles(gEventObjectPic_HexManiac_3),
-    obj_frame_tiles(gEventObjectPic_HexManiac_4),
-    obj_frame_tiles(gEventObjectPic_HexManiac_5),
-    obj_frame_tiles(gEventObjectPic_HexManiac_6),
-    obj_frame_tiles(gEventObjectPic_HexManiac_7),
-    obj_frame_tiles(gEventObjectPic_HexManiac_8),
+    overworld_frame(gEventObjectPic_HexManiac, 16, 32, 0),
+    overworld_frame(gEventObjectPic_HexManiac, 16, 32, 1),
+    overworld_frame(gEventObjectPic_HexManiac, 16, 32, 2),
+    overworld_frame(gEventObjectPic_HexManiac, 16, 32, 3),
+    overworld_frame(gEventObjectPic_HexManiac, 16, 32, 4),
+    overworld_frame(gEventObjectPic_HexManiac, 16, 32, 5),
+    overworld_frame(gEventObjectPic_HexManiac, 16, 32, 6),
+    overworld_frame(gEventObjectPic_HexManiac, 16, 32, 7),
+    overworld_frame(gEventObjectPic_HexManiac, 16, 32, 8),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_SwimmerM[] = {
-    obj_frame_tiles(gEventObjectPic_SwimmerM_0),
-    obj_frame_tiles(gEventObjectPic_SwimmerM_1),
-    obj_frame_tiles(gEventObjectPic_SwimmerM_2),
-    obj_frame_tiles(gEventObjectPic_SwimmerM_3),
-    obj_frame_tiles(gEventObjectPic_SwimmerM_4),
-    obj_frame_tiles(gEventObjectPic_SwimmerM_5),
-    obj_frame_tiles(gEventObjectPic_SwimmerM_6),
-    obj_frame_tiles(gEventObjectPic_SwimmerM_7),
-    obj_frame_tiles(gEventObjectPic_SwimmerM_8),
+    overworld_frame(gEventObjectPic_SwimmerM, 16, 32, 0),
+    overworld_frame(gEventObjectPic_SwimmerM, 16, 32, 1),
+    overworld_frame(gEventObjectPic_SwimmerM, 16, 32, 2),
+    overworld_frame(gEventObjectPic_SwimmerM, 16, 32, 3),
+    overworld_frame(gEventObjectPic_SwimmerM, 16, 32, 4),
+    overworld_frame(gEventObjectPic_SwimmerM, 16, 32, 5),
+    overworld_frame(gEventObjectPic_SwimmerM, 16, 32, 6),
+    overworld_frame(gEventObjectPic_SwimmerM, 16, 32, 7),
+    overworld_frame(gEventObjectPic_SwimmerM, 16, 32, 8),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_SwimmerF[] = {
-    obj_frame_tiles(gEventObjectPic_SwimmerF_0),
-    obj_frame_tiles(gEventObjectPic_SwimmerF_1),
-    obj_frame_tiles(gEventObjectPic_SwimmerF_2),
-    obj_frame_tiles(gEventObjectPic_SwimmerF_3),
-    obj_frame_tiles(gEventObjectPic_SwimmerF_4),
-    obj_frame_tiles(gEventObjectPic_SwimmerF_5),
-    obj_frame_tiles(gEventObjectPic_SwimmerF_6),
-    obj_frame_tiles(gEventObjectPic_SwimmerF_7),
-    obj_frame_tiles(gEventObjectPic_SwimmerF_8),
+    overworld_frame(gEventObjectPic_SwimmerF, 16, 32, 0),
+    overworld_frame(gEventObjectPic_SwimmerF, 16, 32, 1),
+    overworld_frame(gEventObjectPic_SwimmerF, 16, 32, 2),
+    overworld_frame(gEventObjectPic_SwimmerF, 16, 32, 3),
+    overworld_frame(gEventObjectPic_SwimmerF, 16, 32, 4),
+    overworld_frame(gEventObjectPic_SwimmerF, 16, 32, 5),
+    overworld_frame(gEventObjectPic_SwimmerF, 16, 32, 6),
+    overworld_frame(gEventObjectPic_SwimmerF, 16, 32, 7),
+    overworld_frame(gEventObjectPic_SwimmerF, 16, 32, 8),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_BlackBelt[] = {
-    obj_frame_tiles(gEventObjectPic_BlackBelt_0),
-    obj_frame_tiles(gEventObjectPic_BlackBelt_1),
-    obj_frame_tiles(gEventObjectPic_BlackBelt_2),
-    obj_frame_tiles(gEventObjectPic_BlackBelt_3),
-    obj_frame_tiles(gEventObjectPic_BlackBelt_4),
-    obj_frame_tiles(gEventObjectPic_BlackBelt_5),
-    obj_frame_tiles(gEventObjectPic_BlackBelt_6),
-    obj_frame_tiles(gEventObjectPic_BlackBelt_7),
-    obj_frame_tiles(gEventObjectPic_BlackBelt_8),
+    overworld_frame(gEventObjectPic_BlackBelt, 16, 32, 0),
+    overworld_frame(gEventObjectPic_BlackBelt, 16, 32, 1),
+    overworld_frame(gEventObjectPic_BlackBelt, 16, 32, 2),
+    overworld_frame(gEventObjectPic_BlackBelt, 16, 32, 3),
+    overworld_frame(gEventObjectPic_BlackBelt, 16, 32, 4),
+    overworld_frame(gEventObjectPic_BlackBelt, 16, 32, 5),
+    overworld_frame(gEventObjectPic_BlackBelt, 16, 32, 6),
+    overworld_frame(gEventObjectPic_BlackBelt, 16, 32, 7),
+    overworld_frame(gEventObjectPic_BlackBelt, 16, 32, 8),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_Beauty[] = {
-    obj_frame_tiles(gEventObjectPic_Beauty_0),
-    obj_frame_tiles(gEventObjectPic_Beauty_1),
-    obj_frame_tiles(gEventObjectPic_Beauty_2),
-    obj_frame_tiles(gEventObjectPic_Beauty_3),
-    obj_frame_tiles(gEventObjectPic_Beauty_4),
-    obj_frame_tiles(gEventObjectPic_Beauty_5),
-    obj_frame_tiles(gEventObjectPic_Beauty_6),
-    obj_frame_tiles(gEventObjectPic_Beauty_7),
-    obj_frame_tiles(gEventObjectPic_Beauty_8),
+    overworld_frame(gEventObjectPic_Beauty, 16, 32, 0),
+    overworld_frame(gEventObjectPic_Beauty, 16, 32, 1),
+    overworld_frame(gEventObjectPic_Beauty, 16, 32, 2),
+    overworld_frame(gEventObjectPic_Beauty, 16, 32, 3),
+    overworld_frame(gEventObjectPic_Beauty, 16, 32, 4),
+    overworld_frame(gEventObjectPic_Beauty, 16, 32, 5),
+    overworld_frame(gEventObjectPic_Beauty, 16, 32, 6),
+    overworld_frame(gEventObjectPic_Beauty, 16, 32, 7),
+    overworld_frame(gEventObjectPic_Beauty, 16, 32, 8),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_Scientist1[] = {
-    obj_frame_tiles(gEventObjectPic_Scientist1_0),
-    obj_frame_tiles(gEventObjectPic_Scientist1_1),
-    obj_frame_tiles(gEventObjectPic_Scientist1_2),
-    obj_frame_tiles(gEventObjectPic_Scientist1_3),
-    obj_frame_tiles(gEventObjectPic_Scientist1_4),
-    obj_frame_tiles(gEventObjectPic_Scientist1_5),
-    obj_frame_tiles(gEventObjectPic_Scientist1_6),
-    obj_frame_tiles(gEventObjectPic_Scientist1_7),
-    obj_frame_tiles(gEventObjectPic_Scientist1_8),
+    overworld_frame(gEventObjectPic_Scientist1, 16, 32, 0),
+    overworld_frame(gEventObjectPic_Scientist1, 16, 32, 1),
+    overworld_frame(gEventObjectPic_Scientist1, 16, 32, 2),
+    overworld_frame(gEventObjectPic_Scientist1, 16, 32, 3),
+    overworld_frame(gEventObjectPic_Scientist1, 16, 32, 4),
+    overworld_frame(gEventObjectPic_Scientist1, 16, 32, 5),
+    overworld_frame(gEventObjectPic_Scientist1, 16, 32, 6),
+    overworld_frame(gEventObjectPic_Scientist1, 16, 32, 7),
+    overworld_frame(gEventObjectPic_Scientist1, 16, 32, 8),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_Lass[] = {
-    obj_frame_tiles(gEventObjectPic_Lass_0),
-    obj_frame_tiles(gEventObjectPic_Lass_1),
-    obj_frame_tiles(gEventObjectPic_Lass_2),
-    obj_frame_tiles(gEventObjectPic_Lass_3),
-    obj_frame_tiles(gEventObjectPic_Lass_4),
-    obj_frame_tiles(gEventObjectPic_Lass_5),
-    obj_frame_tiles(gEventObjectPic_Lass_6),
-    obj_frame_tiles(gEventObjectPic_Lass_7),
-    obj_frame_tiles(gEventObjectPic_Lass_8),
+    overworld_frame(gEventObjectPic_Lass, 16, 32, 0),
+    overworld_frame(gEventObjectPic_Lass, 16, 32, 1),
+    overworld_frame(gEventObjectPic_Lass, 16, 32, 2),
+    overworld_frame(gEventObjectPic_Lass, 16, 32, 3),
+    overworld_frame(gEventObjectPic_Lass, 16, 32, 4),
+    overworld_frame(gEventObjectPic_Lass, 16, 32, 5),
+    overworld_frame(gEventObjectPic_Lass, 16, 32, 6),
+    overworld_frame(gEventObjectPic_Lass, 16, 32, 7),
+    overworld_frame(gEventObjectPic_Lass, 16, 32, 8),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_Gentleman[] = {
-    obj_frame_tiles(gEventObjectPic_Gentleman_0),
-    obj_frame_tiles(gEventObjectPic_Gentleman_1),
-    obj_frame_tiles(gEventObjectPic_Gentleman_2),
-    obj_frame_tiles(gEventObjectPic_Gentleman_3),
-    obj_frame_tiles(gEventObjectPic_Gentleman_4),
-    obj_frame_tiles(gEventObjectPic_Gentleman_5),
-    obj_frame_tiles(gEventObjectPic_Gentleman_6),
-    obj_frame_tiles(gEventObjectPic_Gentleman_7),
-    obj_frame_tiles(gEventObjectPic_Gentleman_8),
+    overworld_frame(gEventObjectPic_Gentleman, 16, 32, 0),
+    overworld_frame(gEventObjectPic_Gentleman, 16, 32, 1),
+    overworld_frame(gEventObjectPic_Gentleman, 16, 32, 2),
+    overworld_frame(gEventObjectPic_Gentleman, 16, 32, 3),
+    overworld_frame(gEventObjectPic_Gentleman, 16, 32, 4),
+    overworld_frame(gEventObjectPic_Gentleman, 16, 32, 5),
+    overworld_frame(gEventObjectPic_Gentleman, 16, 32, 6),
+    overworld_frame(gEventObjectPic_Gentleman, 16, 32, 7),
+    overworld_frame(gEventObjectPic_Gentleman, 16, 32, 8),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_Sailor[] = {
-    obj_frame_tiles(gEventObjectPic_Sailor_0),
-    obj_frame_tiles(gEventObjectPic_Sailor_1),
-    obj_frame_tiles(gEventObjectPic_Sailor_2),
-    obj_frame_tiles(gEventObjectPic_Sailor_3),
-    obj_frame_tiles(gEventObjectPic_Sailor_4),
-    obj_frame_tiles(gEventObjectPic_Sailor_5),
-    obj_frame_tiles(gEventObjectPic_Sailor_6),
-    obj_frame_tiles(gEventObjectPic_Sailor_7),
-    obj_frame_tiles(gEventObjectPic_Sailor_8),
+    overworld_frame(gEventObjectPic_Sailor, 16, 32, 0),
+    overworld_frame(gEventObjectPic_Sailor, 16, 32, 1),
+    overworld_frame(gEventObjectPic_Sailor, 16, 32, 2),
+    overworld_frame(gEventObjectPic_Sailor, 16, 32, 3),
+    overworld_frame(gEventObjectPic_Sailor, 16, 32, 4),
+    overworld_frame(gEventObjectPic_Sailor, 16, 32, 5),
+    overworld_frame(gEventObjectPic_Sailor, 16, 32, 6),
+    overworld_frame(gEventObjectPic_Sailor, 16, 32, 7),
+    overworld_frame(gEventObjectPic_Sailor, 16, 32, 8),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_Fisherman[] = {
-    obj_frame_tiles(gEventObjectPic_Fisherman_0),
-    obj_frame_tiles(gEventObjectPic_Fisherman_1),
-    obj_frame_tiles(gEventObjectPic_Fisherman_2),
-    obj_frame_tiles(gEventObjectPic_Fisherman_3),
-    obj_frame_tiles(gEventObjectPic_Fisherman_4),
-    obj_frame_tiles(gEventObjectPic_Fisherman_5),
-    obj_frame_tiles(gEventObjectPic_Fisherman_6),
-    obj_frame_tiles(gEventObjectPic_Fisherman_7),
-    obj_frame_tiles(gEventObjectPic_Fisherman_8),
+    overworld_frame(gEventObjectPic_Fisherman, 16, 32, 0),
+    overworld_frame(gEventObjectPic_Fisherman, 16, 32, 1),
+    overworld_frame(gEventObjectPic_Fisherman, 16, 32, 2),
+    overworld_frame(gEventObjectPic_Fisherman, 16, 32, 3),
+    overworld_frame(gEventObjectPic_Fisherman, 16, 32, 4),
+    overworld_frame(gEventObjectPic_Fisherman, 16, 32, 5),
+    overworld_frame(gEventObjectPic_Fisherman, 16, 32, 6),
+    overworld_frame(gEventObjectPic_Fisherman, 16, 32, 7),
+    overworld_frame(gEventObjectPic_Fisherman, 16, 32, 8),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_RunningTriathleteM[] = {
-    obj_frame_tiles(gEventObjectPic_RunningTriathleteM_0),
-    obj_frame_tiles(gEventObjectPic_RunningTriathleteM_1),
-    obj_frame_tiles(gEventObjectPic_RunningTriathleteM_2),
-    obj_frame_tiles(gEventObjectPic_RunningTriathleteM_3),
-    obj_frame_tiles(gEventObjectPic_RunningTriathleteM_4),
-    obj_frame_tiles(gEventObjectPic_RunningTriathleteM_5),
-    obj_frame_tiles(gEventObjectPic_RunningTriathleteM_6),
-    obj_frame_tiles(gEventObjectPic_RunningTriathleteM_7),
-    obj_frame_tiles(gEventObjectPic_RunningTriathleteM_8),
+    overworld_frame(gEventObjectPic_RunningTriathleteM, 16, 32, 0),
+    overworld_frame(gEventObjectPic_RunningTriathleteM, 16, 32, 1),
+    overworld_frame(gEventObjectPic_RunningTriathleteM, 16, 32, 2),
+    overworld_frame(gEventObjectPic_RunningTriathleteM, 16, 32, 3),
+    overworld_frame(gEventObjectPic_RunningTriathleteM, 16, 32, 4),
+    overworld_frame(gEventObjectPic_RunningTriathleteM, 16, 32, 5),
+    overworld_frame(gEventObjectPic_RunningTriathleteM, 16, 32, 6),
+    overworld_frame(gEventObjectPic_RunningTriathleteM, 16, 32, 7),
+    overworld_frame(gEventObjectPic_RunningTriathleteM, 16, 32, 8),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_RunningTriathleteF[] = {
-    obj_frame_tiles(gEventObjectPic_RunningTriathleteF_0),
-    obj_frame_tiles(gEventObjectPic_RunningTriathleteF_1),
-    obj_frame_tiles(gEventObjectPic_RunningTriathleteF_2),
-    obj_frame_tiles(gEventObjectPic_RunningTriathleteF_3),
-    obj_frame_tiles(gEventObjectPic_RunningTriathleteF_4),
-    obj_frame_tiles(gEventObjectPic_RunningTriathleteF_5),
-    obj_frame_tiles(gEventObjectPic_RunningTriathleteF_6),
-    obj_frame_tiles(gEventObjectPic_RunningTriathleteF_7),
-    obj_frame_tiles(gEventObjectPic_RunningTriathleteF_8),
+    overworld_frame(gEventObjectPic_RunningTriathleteF, 16, 32, 0),
+    overworld_frame(gEventObjectPic_RunningTriathleteF, 16, 32, 1),
+    overworld_frame(gEventObjectPic_RunningTriathleteF, 16, 32, 2),
+    overworld_frame(gEventObjectPic_RunningTriathleteF, 16, 32, 3),
+    overworld_frame(gEventObjectPic_RunningTriathleteF, 16, 32, 4),
+    overworld_frame(gEventObjectPic_RunningTriathleteF, 16, 32, 5),
+    overworld_frame(gEventObjectPic_RunningTriathleteF, 16, 32, 6),
+    overworld_frame(gEventObjectPic_RunningTriathleteF, 16, 32, 7),
+    overworld_frame(gEventObjectPic_RunningTriathleteF, 16, 32, 8),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_TuberF[] = {
-    obj_frame_tiles(gEventObjectPic_TuberF_0),
-    obj_frame_tiles(gEventObjectPic_TuberF_1),
-    obj_frame_tiles(gEventObjectPic_TuberF_2),
-    obj_frame_tiles(gEventObjectPic_TuberF_3),
-    obj_frame_tiles(gEventObjectPic_TuberF_4),
-    obj_frame_tiles(gEventObjectPic_TuberF_5),
-    obj_frame_tiles(gEventObjectPic_TuberF_6),
-    obj_frame_tiles(gEventObjectPic_TuberF_7),
-    obj_frame_tiles(gEventObjectPic_TuberF_8),
+    overworld_frame(gEventObjectPic_TuberF, 16, 16, 0),
+    overworld_frame(gEventObjectPic_TuberF, 16, 16, 1),
+    overworld_frame(gEventObjectPic_TuberF, 16, 16, 2),
+    overworld_frame(gEventObjectPic_TuberF, 16, 16, 3),
+    overworld_frame(gEventObjectPic_TuberF, 16, 16, 4),
+    overworld_frame(gEventObjectPic_TuberF, 16, 16, 5),
+    overworld_frame(gEventObjectPic_TuberF, 16, 16, 6),
+    overworld_frame(gEventObjectPic_TuberF, 16, 16, 7),
+    overworld_frame(gEventObjectPic_TuberF, 16, 16, 8),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_TuberM[] = {
-    obj_frame_tiles(gEventObjectPic_TuberM_0),
-    obj_frame_tiles(gEventObjectPic_TuberM_1),
-    obj_frame_tiles(gEventObjectPic_TuberM_2),
-    obj_frame_tiles(gEventObjectPic_TuberM_3),
-    obj_frame_tiles(gEventObjectPic_TuberM_4),
-    obj_frame_tiles(gEventObjectPic_TuberM_5),
-    obj_frame_tiles(gEventObjectPic_TuberM_6),
-    obj_frame_tiles(gEventObjectPic_TuberM_7),
-    obj_frame_tiles(gEventObjectPic_TuberM_8),
+    overworld_frame(gEventObjectPic_TuberM, 16, 16, 0),
+    overworld_frame(gEventObjectPic_TuberM, 16, 16, 1),
+    overworld_frame(gEventObjectPic_TuberM, 16, 16, 2),
+    overworld_frame(gEventObjectPic_TuberM, 16, 16, 3),
+    overworld_frame(gEventObjectPic_TuberM, 16, 16, 4),
+    overworld_frame(gEventObjectPic_TuberM, 16, 16, 5),
+    overworld_frame(gEventObjectPic_TuberM, 16, 16, 6),
+    overworld_frame(gEventObjectPic_TuberM, 16, 16, 7),
+    overworld_frame(gEventObjectPic_TuberM, 16, 16, 8),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_Hiker[] = {
-    obj_frame_tiles(gEventObjectPic_Hiker_0),
-    obj_frame_tiles(gEventObjectPic_Hiker_1),
-    obj_frame_tiles(gEventObjectPic_Hiker_2),
-    obj_frame_tiles(gEventObjectPic_Hiker_3),
-    obj_frame_tiles(gEventObjectPic_Hiker_4),
-    obj_frame_tiles(gEventObjectPic_Hiker_5),
-    obj_frame_tiles(gEventObjectPic_Hiker_6),
-    obj_frame_tiles(gEventObjectPic_Hiker_7),
-    obj_frame_tiles(gEventObjectPic_Hiker_8),
+    overworld_frame(gEventObjectPic_Hiker, 16, 32, 0),
+    overworld_frame(gEventObjectPic_Hiker, 16, 32, 1),
+    overworld_frame(gEventObjectPic_Hiker, 16, 32, 2),
+    overworld_frame(gEventObjectPic_Hiker, 16, 32, 3),
+    overworld_frame(gEventObjectPic_Hiker, 16, 32, 4),
+    overworld_frame(gEventObjectPic_Hiker, 16, 32, 5),
+    overworld_frame(gEventObjectPic_Hiker, 16, 32, 6),
+    overworld_frame(gEventObjectPic_Hiker, 16, 32, 7),
+    overworld_frame(gEventObjectPic_Hiker, 16, 32, 8),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_CyclingTriathleteM[] = {
-    obj_frame_tiles(gEventObjectPic_CyclingTriathleteM_0),
-    obj_frame_tiles(gEventObjectPic_CyclingTriathleteM_1),
-    obj_frame_tiles(gEventObjectPic_CyclingTriathleteM_2),
-    obj_frame_tiles(gEventObjectPic_CyclingTriathleteM_3),
-    obj_frame_tiles(gEventObjectPic_CyclingTriathleteM_4),
-    obj_frame_tiles(gEventObjectPic_CyclingTriathleteM_5),
-    obj_frame_tiles(gEventObjectPic_CyclingTriathleteM_6),
-    obj_frame_tiles(gEventObjectPic_CyclingTriathleteM_7),
-    obj_frame_tiles(gEventObjectPic_CyclingTriathleteM_8),
+    overworld_frame(gEventObjectPic_CyclingTriathleteM, 32, 32, 0),
+    overworld_frame(gEventObjectPic_CyclingTriathleteM, 32, 32, 1),
+    overworld_frame(gEventObjectPic_CyclingTriathleteM, 32, 32, 2),
+    overworld_frame(gEventObjectPic_CyclingTriathleteM, 32, 32, 3),
+    overworld_frame(gEventObjectPic_CyclingTriathleteM, 32, 32, 4),
+    overworld_frame(gEventObjectPic_CyclingTriathleteM, 32, 32, 5),
+    overworld_frame(gEventObjectPic_CyclingTriathleteM, 32, 32, 6),
+    overworld_frame(gEventObjectPic_CyclingTriathleteM, 32, 32, 7),
+    overworld_frame(gEventObjectPic_CyclingTriathleteM, 32, 32, 8),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_CyclingTriathleteF[] = {
-    obj_frame_tiles(gEventObjectPic_CyclingTriathleteF_0),
-    obj_frame_tiles(gEventObjectPic_CyclingTriathleteF_1),
-    obj_frame_tiles(gEventObjectPic_CyclingTriathleteF_2),
-    obj_frame_tiles(gEventObjectPic_CyclingTriathleteF_3),
-    obj_frame_tiles(gEventObjectPic_CyclingTriathleteF_4),
-    obj_frame_tiles(gEventObjectPic_CyclingTriathleteF_5),
-    obj_frame_tiles(gEventObjectPic_CyclingTriathleteF_6),
-    obj_frame_tiles(gEventObjectPic_CyclingTriathleteF_7),
-    obj_frame_tiles(gEventObjectPic_CyclingTriathleteF_8),
+    overworld_frame(gEventObjectPic_CyclingTriathleteF, 32, 32, 0),
+    overworld_frame(gEventObjectPic_CyclingTriathleteF, 32, 32, 1),
+    overworld_frame(gEventObjectPic_CyclingTriathleteF, 32, 32, 2),
+    overworld_frame(gEventObjectPic_CyclingTriathleteF, 32, 32, 3),
+    overworld_frame(gEventObjectPic_CyclingTriathleteF, 32, 32, 4),
+    overworld_frame(gEventObjectPic_CyclingTriathleteF, 32, 32, 5),
+    overworld_frame(gEventObjectPic_CyclingTriathleteF, 32, 32, 6),
+    overworld_frame(gEventObjectPic_CyclingTriathleteF, 32, 32, 7),
+    overworld_frame(gEventObjectPic_CyclingTriathleteF, 32, 32, 8),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_Nurse[] = {
-    obj_frame_tiles(gEventObjectPic_Nurse_0),
-    obj_frame_tiles(gEventObjectPic_Nurse_1),
-    obj_frame_tiles(gEventObjectPic_Nurse_2),
-    obj_frame_tiles(gEventObjectPic_Nurse_0),
-    obj_frame_tiles(gEventObjectPic_Nurse_0),
-    obj_frame_tiles(gEventObjectPic_Nurse_1),
-    obj_frame_tiles(gEventObjectPic_Nurse_1),
-    obj_frame_tiles(gEventObjectPic_Nurse_2),
-    obj_frame_tiles(gEventObjectPic_Nurse_2),
-    obj_frame_tiles(gEventObjectPic_Nurse_3),
+    overworld_frame(gEventObjectPic_Nurse, 16, 32, 0),
+    overworld_frame(gEventObjectPic_Nurse, 16, 32, 1),
+    overworld_frame(gEventObjectPic_Nurse, 16, 32, 2),
+    overworld_frame(gEventObjectPic_Nurse, 16, 32, 0),
+    overworld_frame(gEventObjectPic_Nurse, 16, 32, 0),
+    overworld_frame(gEventObjectPic_Nurse, 16, 32, 1),
+    overworld_frame(gEventObjectPic_Nurse, 16, 32, 1),
+    overworld_frame(gEventObjectPic_Nurse, 16, 32, 2),
+    overworld_frame(gEventObjectPic_Nurse, 16, 32, 2),
+    overworld_frame(gEventObjectPic_Nurse, 16, 32, 3),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_ItemBall[] = {
@@ -751,87 +751,87 @@ const struct SpriteFrameImage gEventObjectPicTable_ItemBall[] = {
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_ProfBirch[] = {
-    obj_frame_tiles(gEventObjectPic_ProfBirch_0),
-    obj_frame_tiles(gEventObjectPic_ProfBirch_1),
-    obj_frame_tiles(gEventObjectPic_ProfBirch_2),
-    obj_frame_tiles(gEventObjectPic_ProfBirch_3),
-    obj_frame_tiles(gEventObjectPic_ProfBirch_4),
-    obj_frame_tiles(gEventObjectPic_ProfBirch_5),
-    obj_frame_tiles(gEventObjectPic_ProfBirch_6),
-    obj_frame_tiles(gEventObjectPic_ProfBirch_7),
-    obj_frame_tiles(gEventObjectPic_ProfBirch_8),
+    overworld_frame(gEventObjectPic_ProfBirch, 16, 32, 0),
+    overworld_frame(gEventObjectPic_ProfBirch, 16, 32, 1),
+    overworld_frame(gEventObjectPic_ProfBirch, 16, 32, 2),
+    overworld_frame(gEventObjectPic_ProfBirch, 16, 32, 3),
+    overworld_frame(gEventObjectPic_ProfBirch, 16, 32, 4),
+    overworld_frame(gEventObjectPic_ProfBirch, 16, 32, 5),
+    overworld_frame(gEventObjectPic_ProfBirch, 16, 32, 6),
+    overworld_frame(gEventObjectPic_ProfBirch, 16, 32, 7),
+    overworld_frame(gEventObjectPic_ProfBirch, 16, 32, 8),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_Man5[] = {
-    obj_frame_tiles(gEventObjectPic_Man5_0),
-    obj_frame_tiles(gEventObjectPic_Man5_1),
-    obj_frame_tiles(gEventObjectPic_Man5_2),
-    obj_frame_tiles(gEventObjectPic_Man5_3),
-    obj_frame_tiles(gEventObjectPic_Man5_4),
-    obj_frame_tiles(gEventObjectPic_Man5_5),
-    obj_frame_tiles(gEventObjectPic_Man5_6),
-    obj_frame_tiles(gEventObjectPic_Man5_7),
-    obj_frame_tiles(gEventObjectPic_Man5_8),
+    overworld_frame(gEventObjectPic_Man5, 16, 32, 0),
+    overworld_frame(gEventObjectPic_Man5, 16, 32, 1),
+    overworld_frame(gEventObjectPic_Man5, 16, 32, 2),
+    overworld_frame(gEventObjectPic_Man5, 16, 32, 3),
+    overworld_frame(gEventObjectPic_Man5, 16, 32, 4),
+    overworld_frame(gEventObjectPic_Man5, 16, 32, 5),
+    overworld_frame(gEventObjectPic_Man5, 16, 32, 6),
+    overworld_frame(gEventObjectPic_Man5, 16, 32, 7),
+    overworld_frame(gEventObjectPic_Man5, 16, 32, 8),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_Man6[] = {
-    obj_frame_tiles(gEventObjectPic_Man6_0),
-    obj_frame_tiles(gEventObjectPic_Man6_1),
-    obj_frame_tiles(gEventObjectPic_Man6_2),
-    obj_frame_tiles(gEventObjectPic_Man6_3),
-    obj_frame_tiles(gEventObjectPic_Man6_4),
-    obj_frame_tiles(gEventObjectPic_Man6_5),
-    obj_frame_tiles(gEventObjectPic_Man6_6),
-    obj_frame_tiles(gEventObjectPic_Man6_7),
-    obj_frame_tiles(gEventObjectPic_Man6_8),
+    overworld_frame(gEventObjectPic_Man6, 16, 32, 0),
+    overworld_frame(gEventObjectPic_Man6, 16, 32, 1),
+    overworld_frame(gEventObjectPic_Man6, 16, 32, 2),
+    overworld_frame(gEventObjectPic_Man6, 16, 32, 3),
+    overworld_frame(gEventObjectPic_Man6, 16, 32, 4),
+    overworld_frame(gEventObjectPic_Man6, 16, 32, 5),
+    overworld_frame(gEventObjectPic_Man6, 16, 32, 6),
+    overworld_frame(gEventObjectPic_Man6, 16, 32, 7),
+    overworld_frame(gEventObjectPic_Man6, 16, 32, 8),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_ReporterM[] = {
-    obj_frame_tiles(gEventObjectPic_ReporterM_0),
-    obj_frame_tiles(gEventObjectPic_ReporterM_1),
-    obj_frame_tiles(gEventObjectPic_ReporterM_2),
-    obj_frame_tiles(gEventObjectPic_ReporterM_3),
-    obj_frame_tiles(gEventObjectPic_ReporterM_4),
-    obj_frame_tiles(gEventObjectPic_ReporterM_5),
-    obj_frame_tiles(gEventObjectPic_ReporterM_6),
-    obj_frame_tiles(gEventObjectPic_ReporterM_7),
-    obj_frame_tiles(gEventObjectPic_ReporterM_8),
+    overworld_frame(gEventObjectPic_ReporterM, 16, 32, 0),
+    overworld_frame(gEventObjectPic_ReporterM, 16, 32, 1),
+    overworld_frame(gEventObjectPic_ReporterM, 16, 32, 2),
+    overworld_frame(gEventObjectPic_ReporterM, 16, 32, 3),
+    overworld_frame(gEventObjectPic_ReporterM, 16, 32, 4),
+    overworld_frame(gEventObjectPic_ReporterM, 16, 32, 5),
+    overworld_frame(gEventObjectPic_ReporterM, 16, 32, 6),
+    overworld_frame(gEventObjectPic_ReporterM, 16, 32, 7),
+    overworld_frame(gEventObjectPic_ReporterM, 16, 32, 8),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_ReporterF[] = {
-    obj_frame_tiles(gEventObjectPic_ReporterF_0),
-    obj_frame_tiles(gEventObjectPic_ReporterF_1),
-    obj_frame_tiles(gEventObjectPic_ReporterF_2),
-    obj_frame_tiles(gEventObjectPic_ReporterF_3),
-    obj_frame_tiles(gEventObjectPic_ReporterF_4),
-    obj_frame_tiles(gEventObjectPic_ReporterF_5),
-    obj_frame_tiles(gEventObjectPic_ReporterF_6),
-    obj_frame_tiles(gEventObjectPic_ReporterF_7),
-    obj_frame_tiles(gEventObjectPic_ReporterF_8),
+    overworld_frame(gEventObjectPic_ReporterF, 16, 32, 0),
+    overworld_frame(gEventObjectPic_ReporterF, 16, 32, 1),
+    overworld_frame(gEventObjectPic_ReporterF, 16, 32, 2),
+    overworld_frame(gEventObjectPic_ReporterF, 16, 32, 3),
+    overworld_frame(gEventObjectPic_ReporterF, 16, 32, 4),
+    overworld_frame(gEventObjectPic_ReporterF, 16, 32, 5),
+    overworld_frame(gEventObjectPic_ReporterF, 16, 32, 6),
+    overworld_frame(gEventObjectPic_ReporterF, 16, 32, 7),
+    overworld_frame(gEventObjectPic_ReporterF, 16, 32, 8),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_MauvilleOldMan1[] = {
-    obj_frame_tiles(gEventObjectPic_MauvilleOldMan1_0),
-    obj_frame_tiles(gEventObjectPic_MauvilleOldMan1_1),
-    obj_frame_tiles(gEventObjectPic_MauvilleOldMan1_2),
-    obj_frame_tiles(gEventObjectPic_MauvilleOldMan1_3),
-    obj_frame_tiles(gEventObjectPic_MauvilleOldMan1_4),
-    obj_frame_tiles(gEventObjectPic_MauvilleOldMan1_5),
-    obj_frame_tiles(gEventObjectPic_MauvilleOldMan1_6),
-    obj_frame_tiles(gEventObjectPic_MauvilleOldMan1_7),
-    obj_frame_tiles(gEventObjectPic_MauvilleOldMan1_8),
+    overworld_frame(gEventObjectPic_MauvilleOldMan1, 16, 32, 0),
+    overworld_frame(gEventObjectPic_MauvilleOldMan1, 16, 32, 1),
+    overworld_frame(gEventObjectPic_MauvilleOldMan1, 16, 32, 2),
+    overworld_frame(gEventObjectPic_MauvilleOldMan1, 16, 32, 3),
+    overworld_frame(gEventObjectPic_MauvilleOldMan1, 16, 32, 4),
+    overworld_frame(gEventObjectPic_MauvilleOldMan1, 16, 32, 5),
+    overworld_frame(gEventObjectPic_MauvilleOldMan1, 16, 32, 6),
+    overworld_frame(gEventObjectPic_MauvilleOldMan1, 16, 32, 7),
+    overworld_frame(gEventObjectPic_MauvilleOldMan1, 16, 32, 8),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_MauvilleOldMan2[] = {
-    obj_frame_tiles(gEventObjectPic_MauvilleOldMan2_0),
-    obj_frame_tiles(gEventObjectPic_MauvilleOldMan2_1),
-    obj_frame_tiles(gEventObjectPic_MauvilleOldMan2_2),
-    obj_frame_tiles(gEventObjectPic_MauvilleOldMan2_3),
-    obj_frame_tiles(gEventObjectPic_MauvilleOldMan2_4),
-    obj_frame_tiles(gEventObjectPic_MauvilleOldMan2_5),
-    obj_frame_tiles(gEventObjectPic_MauvilleOldMan2_6),
-    obj_frame_tiles(gEventObjectPic_MauvilleOldMan2_7),
-    obj_frame_tiles(gEventObjectPic_MauvilleOldMan2_8),
+    overworld_frame(gEventObjectPic_MauvilleOldMan2, 16, 32, 0),
+    overworld_frame(gEventObjectPic_MauvilleOldMan2, 16, 32, 1),
+    overworld_frame(gEventObjectPic_MauvilleOldMan2, 16, 32, 2),
+    overworld_frame(gEventObjectPic_MauvilleOldMan2, 16, 32, 3),
+    overworld_frame(gEventObjectPic_MauvilleOldMan2, 16, 32, 4),
+    overworld_frame(gEventObjectPic_MauvilleOldMan2, 16, 32, 5),
+    overworld_frame(gEventObjectPic_MauvilleOldMan2, 16, 32, 6),
+    overworld_frame(gEventObjectPic_MauvilleOldMan2, 16, 32, 7),
+    overworld_frame(gEventObjectPic_MauvilleOldMan2, 16, 32, 8),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_UnusedNatuDoll[] = {
@@ -859,53 +859,53 @@ const struct SpriteFrameImage gEventObjectPicTable_UnusedPorygon2Doll[] = {
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_CuttableTree[] = {
-    obj_frame_tiles(gEventObjectPic_CuttableTree_0),
-    obj_frame_tiles(gEventObjectPic_CuttableTree_1),
-    obj_frame_tiles(gEventObjectPic_CuttableTree_2),
-    obj_frame_tiles(gEventObjectPic_CuttableTree_3),
+    overworld_frame(gEventObjectPic_CuttableTree, 16, 16, 0),
+    overworld_frame(gEventObjectPic_CuttableTree, 16, 16, 1),
+    overworld_frame(gEventObjectPic_CuttableTree, 16, 16, 2),
+    overworld_frame(gEventObjectPic_CuttableTree, 16, 16, 3),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_MartEmployee[] = {
-    obj_frame_tiles(gEventObjectPic_MartEmployee_0),
-    obj_frame_tiles(gEventObjectPic_MartEmployee_1),
-    obj_frame_tiles(gEventObjectPic_MartEmployee_2),
-    obj_frame_tiles(gEventObjectPic_MartEmployee_3),
-    obj_frame_tiles(gEventObjectPic_MartEmployee_4),
-    obj_frame_tiles(gEventObjectPic_MartEmployee_5),
-    obj_frame_tiles(gEventObjectPic_MartEmployee_6),
-    obj_frame_tiles(gEventObjectPic_MartEmployee_7),
-    obj_frame_tiles(gEventObjectPic_MartEmployee_8),
+    overworld_frame(gEventObjectPic_MartEmployee, 16, 32, 0),
+    overworld_frame(gEventObjectPic_MartEmployee, 16, 32, 1),
+    overworld_frame(gEventObjectPic_MartEmployee, 16, 32, 2),
+    overworld_frame(gEventObjectPic_MartEmployee, 16, 32, 3),
+    overworld_frame(gEventObjectPic_MartEmployee, 16, 32, 4),
+    overworld_frame(gEventObjectPic_MartEmployee, 16, 32, 5),
+    overworld_frame(gEventObjectPic_MartEmployee, 16, 32, 6),
+    overworld_frame(gEventObjectPic_MartEmployee, 16, 32, 7),
+    overworld_frame(gEventObjectPic_MartEmployee, 16, 32, 8),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_RooftopSaleWoman[] = {
-    obj_frame_tiles(gEventObjectPic_RooftopSaleWoman_0),
-    obj_frame_tiles(gEventObjectPic_RooftopSaleWoman_1),
-    obj_frame_tiles(gEventObjectPic_RooftopSaleWoman_2),
-    obj_frame_tiles(gEventObjectPic_RooftopSaleWoman_3),
-    obj_frame_tiles(gEventObjectPic_RooftopSaleWoman_4),
-    obj_frame_tiles(gEventObjectPic_RooftopSaleWoman_5),
-    obj_frame_tiles(gEventObjectPic_RooftopSaleWoman_6),
-    obj_frame_tiles(gEventObjectPic_RooftopSaleWoman_7),
-    obj_frame_tiles(gEventObjectPic_RooftopSaleWoman_8),
+    overworld_frame(gEventObjectPic_RooftopSaleWoman, 16, 32, 0),
+    overworld_frame(gEventObjectPic_RooftopSaleWoman, 16, 32, 1),
+    overworld_frame(gEventObjectPic_RooftopSaleWoman, 16, 32, 2),
+    overworld_frame(gEventObjectPic_RooftopSaleWoman, 16, 32, 3),
+    overworld_frame(gEventObjectPic_RooftopSaleWoman, 16, 32, 4),
+    overworld_frame(gEventObjectPic_RooftopSaleWoman, 16, 32, 5),
+    overworld_frame(gEventObjectPic_RooftopSaleWoman, 16, 32, 6),
+    overworld_frame(gEventObjectPic_RooftopSaleWoman, 16, 32, 7),
+    overworld_frame(gEventObjectPic_RooftopSaleWoman, 16, 32, 8),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_Teala[] = {
-    obj_frame_tiles(gEventObjectPic_Teala_0),
-    obj_frame_tiles(gEventObjectPic_Teala_1),
-    obj_frame_tiles(gEventObjectPic_Teala_2),
-    obj_frame_tiles(gEventObjectPic_Teala_3),
-    obj_frame_tiles(gEventObjectPic_Teala_4),
-    obj_frame_tiles(gEventObjectPic_Teala_5),
-    obj_frame_tiles(gEventObjectPic_Teala_6),
-    obj_frame_tiles(gEventObjectPic_Teala_7),
-    obj_frame_tiles(gEventObjectPic_Teala_8),
+    overworld_frame(gEventObjectPic_Teala, 16, 32, 0),
+    overworld_frame(gEventObjectPic_Teala, 16, 32, 1),
+    overworld_frame(gEventObjectPic_Teala, 16, 32, 2),
+    overworld_frame(gEventObjectPic_Teala, 16, 32, 3),
+    overworld_frame(gEventObjectPic_Teala, 16, 32, 4),
+    overworld_frame(gEventObjectPic_Teala, 16, 32, 5),
+    overworld_frame(gEventObjectPic_Teala, 16, 32, 6),
+    overworld_frame(gEventObjectPic_Teala, 16, 32, 7),
+    overworld_frame(gEventObjectPic_Teala, 16, 32, 8),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_BreakableRock[] = {
-    obj_frame_tiles(gEventObjectPic_BreakableRock_0),
-    obj_frame_tiles(gEventObjectPic_BreakableRock_1),
-    obj_frame_tiles(gEventObjectPic_BreakableRock_2),
-    obj_frame_tiles(gEventObjectPic_BreakableRock_3),
+    overworld_frame(gEventObjectPic_BreakableRock, 16, 16, 0),
+    overworld_frame(gEventObjectPic_BreakableRock, 16, 16, 1),
+    overworld_frame(gEventObjectPic_BreakableRock, 16, 16, 2),
+    overworld_frame(gEventObjectPic_BreakableRock, 16, 16, 3),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_PushableBoulder[] = {
@@ -913,15 +913,15 @@ const struct SpriteFrameImage gEventObjectPicTable_PushableBoulder[] = {
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_MrBrineysBoat[] = {
-    obj_frame_tiles(gEventObjectPic_MrBrineysBoat_0),
-    obj_frame_tiles(gEventObjectPic_MrBrineysBoat_1),
-    obj_frame_tiles(gEventObjectPic_MrBrineysBoat_2),
-    obj_frame_tiles(gEventObjectPic_MrBrineysBoat_0),
-    obj_frame_tiles(gEventObjectPic_MrBrineysBoat_0),
-    obj_frame_tiles(gEventObjectPic_MrBrineysBoat_1),
-    obj_frame_tiles(gEventObjectPic_MrBrineysBoat_1),
-    obj_frame_tiles(gEventObjectPic_MrBrineysBoat_2),
-    obj_frame_tiles(gEventObjectPic_MrBrineysBoat_2),
+    overworld_frame(gEventObjectPic_MrBrineysBoat, 32, 32, 0),
+    overworld_frame(gEventObjectPic_MrBrineysBoat, 32, 32, 1),
+    overworld_frame(gEventObjectPic_MrBrineysBoat, 32, 32, 2),
+    overworld_frame(gEventObjectPic_MrBrineysBoat, 32, 32, 0),
+    overworld_frame(gEventObjectPic_MrBrineysBoat, 32, 32, 0),
+    overworld_frame(gEventObjectPic_MrBrineysBoat, 32, 32, 1),
+    overworld_frame(gEventObjectPic_MrBrineysBoat, 32, 32, 1),
+    overworld_frame(gEventObjectPic_MrBrineysBoat, 32, 32, 2),
+    overworld_frame(gEventObjectPic_MrBrineysBoat, 32, 32, 2),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_Truck[] = {
@@ -929,27 +929,27 @@ const struct SpriteFrameImage gEventObjectPicTable_Truck[] = {
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_VigorothCarryingBox[] = {
-    obj_frame_tiles(gEventObjectPic_VigorothCarryingBox_0),
-    obj_frame_tiles(gEventObjectPic_VigorothCarryingBox_0),
-    obj_frame_tiles(gEventObjectPic_VigorothCarryingBox_0),
-    obj_frame_tiles(gEventObjectPic_VigorothCarryingBox_1),
-    obj_frame_tiles(gEventObjectPic_VigorothCarryingBox_2),
-    obj_frame_tiles(gEventObjectPic_VigorothCarryingBox_1),
-    obj_frame_tiles(gEventObjectPic_VigorothCarryingBox_2),
-    obj_frame_tiles(gEventObjectPic_VigorothCarryingBox_1),
-    obj_frame_tiles(gEventObjectPic_VigorothCarryingBox_2),
+    overworld_frame(gEventObjectPic_Vigoroth, 32, 32, 0),
+    overworld_frame(gEventObjectPic_Vigoroth, 32, 32, 0),
+    overworld_frame(gEventObjectPic_Vigoroth, 32, 32, 0),
+    overworld_frame(gEventObjectPic_Vigoroth, 32, 32, 1),
+    overworld_frame(gEventObjectPic_Vigoroth, 32, 32, 2),
+    overworld_frame(gEventObjectPic_Vigoroth, 32, 32, 1),
+    overworld_frame(gEventObjectPic_Vigoroth, 32, 32, 2),
+    overworld_frame(gEventObjectPic_Vigoroth, 32, 32, 1),
+    overworld_frame(gEventObjectPic_Vigoroth, 32, 32, 2),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_VigorothFacingAway[] = {
-    obj_frame_tiles(gEventObjectPic_VigorothFacingAway_0),
-    obj_frame_tiles(gEventObjectPic_VigorothFacingAway_0),
-    obj_frame_tiles(gEventObjectPic_VigorothFacingAway_0),
-    obj_frame_tiles(gEventObjectPic_VigorothFacingAway_1),
-    obj_frame_tiles(gEventObjectPic_VigorothFacingAway_1),
-    obj_frame_tiles(gEventObjectPic_VigorothFacingAway_1),
-    obj_frame_tiles(gEventObjectPic_VigorothFacingAway_1),
-    obj_frame_tiles(gEventObjectPic_VigorothFacingAway_1),
-    obj_frame_tiles(gEventObjectPic_VigorothFacingAway_1),
+    overworld_frame(gEventObjectPic_Vigoroth, 32, 32, 3),
+    overworld_frame(gEventObjectPic_Vigoroth, 32, 32, 3),
+    overworld_frame(gEventObjectPic_Vigoroth, 32, 32, 3),
+    overworld_frame(gEventObjectPic_Vigoroth, 32, 32, 4),
+    overworld_frame(gEventObjectPic_Vigoroth, 32, 32, 4),
+    overworld_frame(gEventObjectPic_Vigoroth, 32, 32, 4),
+    overworld_frame(gEventObjectPic_Vigoroth, 32, 32, 4),
+    overworld_frame(gEventObjectPic_Vigoroth, 32, 32, 4),
+    overworld_frame(gEventObjectPic_Vigoroth, 32, 32, 4),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_BirchsBag[] = {
@@ -957,149 +957,149 @@ const struct SpriteFrameImage gEventObjectPicTable_BirchsBag[] = {
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_EnemyZigzagoon[] = {
-    obj_frame_tiles(gEventObjectPic_EnemyZigzagoon_0),
-    obj_frame_tiles(gEventObjectPic_EnemyZigzagoon_1),
-    obj_frame_tiles(gEventObjectPic_EnemyZigzagoon_2),
-    obj_frame_tiles(gEventObjectPic_EnemyZigzagoon_3),
-    obj_frame_tiles(gEventObjectPic_EnemyZigzagoon_4),
-    obj_frame_tiles(gEventObjectPic_EnemyZigzagoon_5),
-    obj_frame_tiles(gEventObjectPic_EnemyZigzagoon_6),
-    obj_frame_tiles(gEventObjectPic_EnemyZigzagoon_7),
-    obj_frame_tiles(gEventObjectPic_EnemyZigzagoon_8),
+    overworld_frame(gEventObjectPic_EnemyZigzagoon, 32, 32, 0),
+    overworld_frame(gEventObjectPic_EnemyZigzagoon, 32, 32, 1),
+    overworld_frame(gEventObjectPic_EnemyZigzagoon, 32, 32, 2),
+    overworld_frame(gEventObjectPic_EnemyZigzagoon, 32, 32, 3),
+    overworld_frame(gEventObjectPic_EnemyZigzagoon, 32, 32, 4),
+    overworld_frame(gEventObjectPic_EnemyZigzagoon, 32, 32, 5),
+    overworld_frame(gEventObjectPic_EnemyZigzagoon, 32, 32, 6),
+    overworld_frame(gEventObjectPic_EnemyZigzagoon, 32, 32, 7),
+    overworld_frame(gEventObjectPic_EnemyZigzagoon, 32, 32, 8),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_Poochyena[] = {
-    obj_frame_tiles(gEventObjectPic_Poochyena_0),
-    obj_frame_tiles(gEventObjectPic_Poochyena_1),
-    obj_frame_tiles(gEventObjectPic_Poochyena_2),
-    obj_frame_tiles(gEventObjectPic_Poochyena_3),
-    obj_frame_tiles(gEventObjectPic_Poochyena_4),
-    obj_frame_tiles(gEventObjectPic_Poochyena_5),
-    obj_frame_tiles(gEventObjectPic_Poochyena_6),
-    obj_frame_tiles(gEventObjectPic_Poochyena_7),
-    obj_frame_tiles(gEventObjectPic_Poochyena_8),
+    overworld_frame(gEventObjectPic_Poochyena, 32, 32, 0),
+    overworld_frame(gEventObjectPic_Poochyena, 32, 32, 1),
+    overworld_frame(gEventObjectPic_Poochyena, 32, 32, 2),
+    overworld_frame(gEventObjectPic_Poochyena, 32, 32, 3),
+    overworld_frame(gEventObjectPic_Poochyena, 32, 32, 4),
+    overworld_frame(gEventObjectPic_Poochyena, 32, 32, 5),
+    overworld_frame(gEventObjectPic_Poochyena, 32, 32, 6),
+    overworld_frame(gEventObjectPic_Poochyena, 32, 32, 7),
+    overworld_frame(gEventObjectPic_Poochyena, 32, 32, 8),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_Artist[] = {
-    obj_frame_tiles(gEventObjectPic_Artist_0),
-    obj_frame_tiles(gEventObjectPic_Artist_1),
-    obj_frame_tiles(gEventObjectPic_Artist_2),
-    obj_frame_tiles(gEventObjectPic_Artist_3),
-    obj_frame_tiles(gEventObjectPic_Artist_4),
-    obj_frame_tiles(gEventObjectPic_Artist_5),
-    obj_frame_tiles(gEventObjectPic_Artist_6),
-    obj_frame_tiles(gEventObjectPic_Artist_7),
-    obj_frame_tiles(gEventObjectPic_Artist_8),
+    overworld_frame(gEventObjectPic_Artist, 16, 32, 0),
+    overworld_frame(gEventObjectPic_Artist, 16, 32, 1),
+    overworld_frame(gEventObjectPic_Artist, 16, 32, 2),
+    overworld_frame(gEventObjectPic_Artist, 16, 32, 3),
+    overworld_frame(gEventObjectPic_Artist, 16, 32, 4),
+    overworld_frame(gEventObjectPic_Artist, 16, 32, 5),
+    overworld_frame(gEventObjectPic_Artist, 16, 32, 6),
+    overworld_frame(gEventObjectPic_Artist, 16, 32, 7),
+    overworld_frame(gEventObjectPic_Artist, 16, 32, 8),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_MayNormal[] = {
-    obj_frame_tiles(gEventObjectPic_MayNormal_0),
-    obj_frame_tiles(gEventObjectPic_MayNormal_1),
-    obj_frame_tiles(gEventObjectPic_MayNormal_2),
-    obj_frame_tiles(gEventObjectPic_MayNormal_3),
-    obj_frame_tiles(gEventObjectPic_MayNormal_4),
-    obj_frame_tiles(gEventObjectPic_MayNormal_5),
-    obj_frame_tiles(gEventObjectPic_MayNormal_6),
-    obj_frame_tiles(gEventObjectPic_MayNormal_7),
-    obj_frame_tiles(gEventObjectPic_MayNormal_8),
-    obj_frame_tiles(gEventObjectPic_MayNormal_9),
-    obj_frame_tiles(gEventObjectPic_MayNormal_10),
-    obj_frame_tiles(gEventObjectPic_MayNormal_11),
-    obj_frame_tiles(gEventObjectPic_MayNormal_12),
-    obj_frame_tiles(gEventObjectPic_MayNormal_13),
-    obj_frame_tiles(gEventObjectPic_MayNormal_14),
-    obj_frame_tiles(gEventObjectPic_MayNormal_15),
-    obj_frame_tiles(gEventObjectPic_MayNormal_16),
-    obj_frame_tiles(gEventObjectPic_MayNormal_17),
+    overworld_frame(gEventObjectPic_MayNormal, 16, 32, 0),
+    overworld_frame(gEventObjectPic_MayNormal, 16, 32, 1),
+    overworld_frame(gEventObjectPic_MayNormal, 16, 32, 2),
+    overworld_frame(gEventObjectPic_MayNormal, 16, 32, 3),
+    overworld_frame(gEventObjectPic_MayNormal, 16, 32, 4),
+    overworld_frame(gEventObjectPic_MayNormal, 16, 32, 5),
+    overworld_frame(gEventObjectPic_MayNormal, 16, 32, 6),
+    overworld_frame(gEventObjectPic_MayNormal, 16, 32, 7),
+    overworld_frame(gEventObjectPic_MayNormal, 16, 32, 8),
+    overworld_frame(gEventObjectPic_MayRunning, 16, 32, 0),
+    overworld_frame(gEventObjectPic_MayRunning, 16, 32, 1),
+    overworld_frame(gEventObjectPic_MayRunning, 16, 32, 2),
+    overworld_frame(gEventObjectPic_MayRunning, 16, 32, 3),
+    overworld_frame(gEventObjectPic_MayRunning, 16, 32, 4),
+    overworld_frame(gEventObjectPic_MayRunning, 16, 32, 5),
+    overworld_frame(gEventObjectPic_MayRunning, 16, 32, 6),
+    overworld_frame(gEventObjectPic_MayRunning, 16, 32, 7),
+    overworld_frame(gEventObjectPic_MayRunning, 16, 32, 8),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_MayMachBike[] = {
-    obj_frame_tiles(gEventObjectPic_MayMachBike_0),
-    obj_frame_tiles(gEventObjectPic_MayMachBike_1),
-    obj_frame_tiles(gEventObjectPic_MayMachBike_2),
-    obj_frame_tiles(gEventObjectPic_MayMachBike_3),
-    obj_frame_tiles(gEventObjectPic_MayMachBike_4),
-    obj_frame_tiles(gEventObjectPic_MayMachBike_5),
-    obj_frame_tiles(gEventObjectPic_MayMachBike_6),
-    obj_frame_tiles(gEventObjectPic_MayMachBike_7),
-    obj_frame_tiles(gEventObjectPic_MayMachBike_8),
+    overworld_frame(gEventObjectPic_MayMachBike, 32, 32, 0),
+    overworld_frame(gEventObjectPic_MayMachBike, 32, 32, 1),
+    overworld_frame(gEventObjectPic_MayMachBike, 32, 32, 2),
+    overworld_frame(gEventObjectPic_MayMachBike, 32, 32, 3),
+    overworld_frame(gEventObjectPic_MayMachBike, 32, 32, 4),
+    overworld_frame(gEventObjectPic_MayMachBike, 32, 32, 5),
+    overworld_frame(gEventObjectPic_MayMachBike, 32, 32, 6),
+    overworld_frame(gEventObjectPic_MayMachBike, 32, 32, 7),
+    overworld_frame(gEventObjectPic_MayMachBike, 32, 32, 8),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_MayAcroBike[] = {
-    obj_frame_tiles(gEventObjectPic_MayAcroBike_0),
-    obj_frame_tiles(gEventObjectPic_MayAcroBike_1),
-    obj_frame_tiles(gEventObjectPic_MayAcroBike_2),
-    obj_frame_tiles(gEventObjectPic_MayAcroBike_3),
-    obj_frame_tiles(gEventObjectPic_MayAcroBike_4),
-    obj_frame_tiles(gEventObjectPic_MayAcroBike_5),
-    obj_frame_tiles(gEventObjectPic_MayAcroBike_6),
-    obj_frame_tiles(gEventObjectPic_MayAcroBike_7),
-    obj_frame_tiles(gEventObjectPic_MayAcroBike_8),
-    obj_frame_tiles(gEventObjectPic_MayAcroBike_9),
-    obj_frame_tiles(gEventObjectPic_MayAcroBike_10),
-    obj_frame_tiles(gEventObjectPic_MayAcroBike_11),
-    obj_frame_tiles(gEventObjectPic_MayAcroBike_12),
-    obj_frame_tiles(gEventObjectPic_MayAcroBike_13),
-    obj_frame_tiles(gEventObjectPic_MayAcroBike_14),
-    obj_frame_tiles(gEventObjectPic_MayAcroBike_15),
-    obj_frame_tiles(gEventObjectPic_MayAcroBike_16),
-    obj_frame_tiles(gEventObjectPic_MayAcroBike_17),
-    obj_frame_tiles(gEventObjectPic_MayAcroBike_18),
-    obj_frame_tiles(gEventObjectPic_MayAcroBike_19),
-    obj_frame_tiles(gEventObjectPic_MayAcroBike_20),
-    obj_frame_tiles(gEventObjectPic_MayAcroBike_21),
-    obj_frame_tiles(gEventObjectPic_MayAcroBike_22),
-    obj_frame_tiles(gEventObjectPic_MayAcroBike_23),
-    obj_frame_tiles(gEventObjectPic_MayAcroBike_24),
-    obj_frame_tiles(gEventObjectPic_MayAcroBike_25),
-    obj_frame_tiles(gEventObjectPic_MayAcroBike_26),
+    overworld_frame(gEventObjectPic_MayAcroBike, 32, 32, 0),
+    overworld_frame(gEventObjectPic_MayAcroBike, 32, 32, 1),
+    overworld_frame(gEventObjectPic_MayAcroBike, 32, 32, 2),
+    overworld_frame(gEventObjectPic_MayAcroBike, 32, 32, 3),
+    overworld_frame(gEventObjectPic_MayAcroBike, 32, 32, 4),
+    overworld_frame(gEventObjectPic_MayAcroBike, 32, 32, 5),
+    overworld_frame(gEventObjectPic_MayAcroBike, 32, 32, 6),
+    overworld_frame(gEventObjectPic_MayAcroBike, 32, 32, 7),
+    overworld_frame(gEventObjectPic_MayAcroBike, 32, 32, 8),
+    overworld_frame(gEventObjectPic_MayAcroBike, 32, 32, 9),
+    overworld_frame(gEventObjectPic_MayAcroBike, 32, 32, 10),
+    overworld_frame(gEventObjectPic_MayAcroBike, 32, 32, 11),
+    overworld_frame(gEventObjectPic_MayAcroBike, 32, 32, 12),
+    overworld_frame(gEventObjectPic_MayAcroBike, 32, 32, 13),
+    overworld_frame(gEventObjectPic_MayAcroBike, 32, 32, 14),
+    overworld_frame(gEventObjectPic_MayAcroBike, 32, 32, 15),
+    overworld_frame(gEventObjectPic_MayAcroBike, 32, 32, 16),
+    overworld_frame(gEventObjectPic_MayAcroBike, 32, 32, 17),
+    overworld_frame(gEventObjectPic_MayAcroBike, 32, 32, 18),
+    overworld_frame(gEventObjectPic_MayAcroBike, 32, 32, 19),
+    overworld_frame(gEventObjectPic_MayAcroBike, 32, 32, 20),
+    overworld_frame(gEventObjectPic_MayAcroBike, 32, 32, 21),
+    overworld_frame(gEventObjectPic_MayAcroBike, 32, 32, 22),
+    overworld_frame(gEventObjectPic_MayAcroBike, 32, 32, 23),
+    overworld_frame(gEventObjectPic_MayAcroBike, 32, 32, 24),
+    overworld_frame(gEventObjectPic_MayAcroBike, 32, 32, 25),
+    overworld_frame(gEventObjectPic_MayAcroBike, 32, 32, 26),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_MaySurfing[] = {
-    obj_frame_tiles(gEventObjectPic_MaySurfing_0),
-    obj_frame_tiles(gEventObjectPic_MaySurfing_1),
-    obj_frame_tiles(gEventObjectPic_MaySurfing_2),
-    obj_frame_tiles(gEventObjectPic_MaySurfing_0),
-    obj_frame_tiles(gEventObjectPic_MaySurfing_0),
-    obj_frame_tiles(gEventObjectPic_MaySurfing_1),
-    obj_frame_tiles(gEventObjectPic_MaySurfing_1),
-    obj_frame_tiles(gEventObjectPic_MaySurfing_2),
-    obj_frame_tiles(gEventObjectPic_MaySurfing_2),
-    obj_frame_tiles(gEventObjectPic_MaySurfing_3),
-    obj_frame_tiles(gEventObjectPic_MaySurfing_4),
-    obj_frame_tiles(gEventObjectPic_MaySurfing_5),
+    overworld_frame(gEventObjectPic_MaySurfing, 32, 32, 0),
+    overworld_frame(gEventObjectPic_MaySurfing, 32, 32, 2),
+    overworld_frame(gEventObjectPic_MaySurfing, 32, 32, 4),
+    overworld_frame(gEventObjectPic_MaySurfing, 32, 32, 0),
+    overworld_frame(gEventObjectPic_MaySurfing, 32, 32, 0),
+    overworld_frame(gEventObjectPic_MaySurfing, 32, 32, 2),
+    overworld_frame(gEventObjectPic_MaySurfing, 32, 32, 2),
+    overworld_frame(gEventObjectPic_MaySurfing, 32, 32, 4),
+    overworld_frame(gEventObjectPic_MaySurfing, 32, 32, 4),
+    overworld_frame(gEventObjectPic_MaySurfing, 32, 32, 1),
+    overworld_frame(gEventObjectPic_MaySurfing, 32, 32, 3),
+    overworld_frame(gEventObjectPic_MaySurfing, 32, 32, 5),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_MayUnderwater[] = {
-    obj_frame_tiles(gEventObjectPic_MayUnderwater_0),
-    obj_frame_tiles(gEventObjectPic_MayUnderwater_1),
-    obj_frame_tiles(gEventObjectPic_MayUnderwater_2),
-    obj_frame_tiles(gEventObjectPic_MayUnderwater_0),
-    obj_frame_tiles(gEventObjectPic_MayUnderwater_0),
-    obj_frame_tiles(gEventObjectPic_MayUnderwater_1),
-    obj_frame_tiles(gEventObjectPic_MayUnderwater_1),
-    obj_frame_tiles(gEventObjectPic_MayUnderwater_2),
-    obj_frame_tiles(gEventObjectPic_MayUnderwater_2),
+    overworld_frame(gEventObjectPic_MayUnderwater, 32, 32, 0),
+    overworld_frame(gEventObjectPic_MayUnderwater, 32, 32, 1),
+    overworld_frame(gEventObjectPic_MayUnderwater, 32, 32, 2),
+    overworld_frame(gEventObjectPic_MayUnderwater, 32, 32, 0),
+    overworld_frame(gEventObjectPic_MayUnderwater, 32, 32, 0),
+    overworld_frame(gEventObjectPic_MayUnderwater, 32, 32, 1),
+    overworld_frame(gEventObjectPic_MayUnderwater, 32, 32, 1),
+    overworld_frame(gEventObjectPic_MayUnderwater, 32, 32, 2),
+    overworld_frame(gEventObjectPic_MayUnderwater, 32, 32, 2),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_MayFieldMove[] = {
-    obj_frame_tiles(gEventObjectPic_MayFieldMove_0),
-    obj_frame_tiles(gEventObjectPic_MayFieldMove_1),
-    obj_frame_tiles(gEventObjectPic_MayFieldMove_2),
-    obj_frame_tiles(gEventObjectPic_MayFieldMove_3),
-    obj_frame_tiles(gEventObjectPic_MayFieldMove_4),
+    overworld_frame(gEventObjectPic_MayFieldMove, 32, 32, 0),
+    overworld_frame(gEventObjectPic_MayFieldMove, 32, 32, 1),
+    overworld_frame(gEventObjectPic_MayFieldMove, 32, 32, 2),
+    overworld_frame(gEventObjectPic_MayFieldMove, 32, 32, 3),
+    overworld_frame(gEventObjectPic_MayFieldMove, 32, 32, 4),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_Cameraman[] = {
-    obj_frame_tiles(gEventObjectPic_Cameraman_0),
-    obj_frame_tiles(gEventObjectPic_Cameraman_1),
-    obj_frame_tiles(gEventObjectPic_Cameraman_2),
-    obj_frame_tiles(gEventObjectPic_Cameraman_3),
-    obj_frame_tiles(gEventObjectPic_Cameraman_4),
-    obj_frame_tiles(gEventObjectPic_Cameraman_5),
-    obj_frame_tiles(gEventObjectPic_Cameraman_6),
-    obj_frame_tiles(gEventObjectPic_Cameraman_7),
-    obj_frame_tiles(gEventObjectPic_Cameraman_8),
+    overworld_frame(gEventObjectPic_Cameraman, 16, 32, 0),
+    overworld_frame(gEventObjectPic_Cameraman, 16, 32, 1),
+    overworld_frame(gEventObjectPic_Cameraman, 16, 32, 2),
+    overworld_frame(gEventObjectPic_Cameraman, 16, 32, 3),
+    overworld_frame(gEventObjectPic_Cameraman, 16, 32, 4),
+    overworld_frame(gEventObjectPic_Cameraman, 16, 32, 5),
+    overworld_frame(gEventObjectPic_Cameraman, 16, 32, 6),
+    overworld_frame(gEventObjectPic_Cameraman, 16, 32, 7),
+    overworld_frame(gEventObjectPic_Cameraman, 16, 32, 8),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_MovingBox[] = {
@@ -1111,309 +1111,309 @@ const struct SpriteFrameImage gEventObjectPicTable_CableCar[] = {
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_Scientist2[] = {
-    obj_frame_tiles(gEventObjectPic_Scientist2_0),
-    obj_frame_tiles(gEventObjectPic_Scientist2_1),
-    obj_frame_tiles(gEventObjectPic_Scientist2_2),
-    obj_frame_tiles(gEventObjectPic_Scientist2_3),
-    obj_frame_tiles(gEventObjectPic_Scientist2_4),
-    obj_frame_tiles(gEventObjectPic_Scientist2_5),
-    obj_frame_tiles(gEventObjectPic_Scientist2_6),
-    obj_frame_tiles(gEventObjectPic_Scientist2_7),
-    obj_frame_tiles(gEventObjectPic_Scientist2_8),
+    overworld_frame(gEventObjectPic_Scientist2, 16, 32, 0),
+    overworld_frame(gEventObjectPic_Scientist2, 16, 32, 1),
+    overworld_frame(gEventObjectPic_Scientist2, 16, 32, 2),
+    overworld_frame(gEventObjectPic_Scientist2, 16, 32, 3),
+    overworld_frame(gEventObjectPic_Scientist2, 16, 32, 4),
+    overworld_frame(gEventObjectPic_Scientist2, 16, 32, 5),
+    overworld_frame(gEventObjectPic_Scientist2, 16, 32, 6),
+    overworld_frame(gEventObjectPic_Scientist2, 16, 32, 7),
+    overworld_frame(gEventObjectPic_Scientist2, 16, 32, 8),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_Man7[] = {
-    obj_frame_tiles(gEventObjectPic_Man7_0),
-    obj_frame_tiles(gEventObjectPic_Man7_1),
-    obj_frame_tiles(gEventObjectPic_Man7_2),
-    obj_frame_tiles(gEventObjectPic_Man7_3),
-    obj_frame_tiles(gEventObjectPic_Man7_4),
-    obj_frame_tiles(gEventObjectPic_Man7_5),
-    obj_frame_tiles(gEventObjectPic_Man7_6),
-    obj_frame_tiles(gEventObjectPic_Man7_7),
-    obj_frame_tiles(gEventObjectPic_Man7_8),
+    overworld_frame(gEventObjectPic_Man7, 16, 32, 0),
+    overworld_frame(gEventObjectPic_Man7, 16, 32, 1),
+    overworld_frame(gEventObjectPic_Man7, 16, 32, 2),
+    overworld_frame(gEventObjectPic_Man7, 16, 32, 3),
+    overworld_frame(gEventObjectPic_Man7, 16, 32, 4),
+    overworld_frame(gEventObjectPic_Man7, 16, 32, 5),
+    overworld_frame(gEventObjectPic_Man7, 16, 32, 6),
+    overworld_frame(gEventObjectPic_Man7, 16, 32, 7),
+    overworld_frame(gEventObjectPic_Man7, 16, 32, 8),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_AquaMemberM[] = {
-    obj_frame_tiles(gEventObjectPic_AquaMemberM_0),
-    obj_frame_tiles(gEventObjectPic_AquaMemberM_1),
-    obj_frame_tiles(gEventObjectPic_AquaMemberM_2),
-    obj_frame_tiles(gEventObjectPic_AquaMemberM_3),
-    obj_frame_tiles(gEventObjectPic_AquaMemberM_4),
-    obj_frame_tiles(gEventObjectPic_AquaMemberM_5),
-    obj_frame_tiles(gEventObjectPic_AquaMemberM_6),
-    obj_frame_tiles(gEventObjectPic_AquaMemberM_7),
-    obj_frame_tiles(gEventObjectPic_AquaMemberM_8),
+    overworld_frame(gEventObjectPic_AquaMemberM, 16, 32, 0),
+    overworld_frame(gEventObjectPic_AquaMemberM, 16, 32, 1),
+    overworld_frame(gEventObjectPic_AquaMemberM, 16, 32, 2),
+    overworld_frame(gEventObjectPic_AquaMemberM, 16, 32, 3),
+    overworld_frame(gEventObjectPic_AquaMemberM, 16, 32, 4),
+    overworld_frame(gEventObjectPic_AquaMemberM, 16, 32, 5),
+    overworld_frame(gEventObjectPic_AquaMemberM, 16, 32, 6),
+    overworld_frame(gEventObjectPic_AquaMemberM, 16, 32, 7),
+    overworld_frame(gEventObjectPic_AquaMemberM, 16, 32, 8),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_AquaMemberF[] = {
-    obj_frame_tiles(gEventObjectPic_AquaMemberF_0),
-    obj_frame_tiles(gEventObjectPic_AquaMemberF_1),
-    obj_frame_tiles(gEventObjectPic_AquaMemberF_2),
-    obj_frame_tiles(gEventObjectPic_AquaMemberF_3),
-    obj_frame_tiles(gEventObjectPic_AquaMemberF_4),
-    obj_frame_tiles(gEventObjectPic_AquaMemberF_5),
-    obj_frame_tiles(gEventObjectPic_AquaMemberF_6),
-    obj_frame_tiles(gEventObjectPic_AquaMemberF_7),
-    obj_frame_tiles(gEventObjectPic_AquaMemberF_8),
+    overworld_frame(gEventObjectPic_AquaMemberF, 16, 32, 0),
+    overworld_frame(gEventObjectPic_AquaMemberF, 16, 32, 1),
+    overworld_frame(gEventObjectPic_AquaMemberF, 16, 32, 2),
+    overworld_frame(gEventObjectPic_AquaMemberF, 16, 32, 3),
+    overworld_frame(gEventObjectPic_AquaMemberF, 16, 32, 4),
+    overworld_frame(gEventObjectPic_AquaMemberF, 16, 32, 5),
+    overworld_frame(gEventObjectPic_AquaMemberF, 16, 32, 6),
+    overworld_frame(gEventObjectPic_AquaMemberF, 16, 32, 7),
+    overworld_frame(gEventObjectPic_AquaMemberF, 16, 32, 8),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_MagmaMemberM[] = {
-    obj_frame_tiles(gEventObjectPic_MagmaMemberM_0),
-    obj_frame_tiles(gEventObjectPic_MagmaMemberM_1),
-    obj_frame_tiles(gEventObjectPic_MagmaMemberM_2),
-    obj_frame_tiles(gEventObjectPic_MagmaMemberM_3),
-    obj_frame_tiles(gEventObjectPic_MagmaMemberM_4),
-    obj_frame_tiles(gEventObjectPic_MagmaMemberM_5),
-    obj_frame_tiles(gEventObjectPic_MagmaMemberM_6),
-    obj_frame_tiles(gEventObjectPic_MagmaMemberM_7),
-    obj_frame_tiles(gEventObjectPic_MagmaMemberM_8),
+    overworld_frame(gEventObjectPic_MagmaMemberM, 16, 32, 0),
+    overworld_frame(gEventObjectPic_MagmaMemberM, 16, 32, 1),
+    overworld_frame(gEventObjectPic_MagmaMemberM, 16, 32, 2),
+    overworld_frame(gEventObjectPic_MagmaMemberM, 16, 32, 3),
+    overworld_frame(gEventObjectPic_MagmaMemberM, 16, 32, 4),
+    overworld_frame(gEventObjectPic_MagmaMemberM, 16, 32, 5),
+    overworld_frame(gEventObjectPic_MagmaMemberM, 16, 32, 6),
+    overworld_frame(gEventObjectPic_MagmaMemberM, 16, 32, 7),
+    overworld_frame(gEventObjectPic_MagmaMemberM, 16, 32, 8),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_MagmaMemberF[] = {
-    obj_frame_tiles(gEventObjectPic_MagmaMemberF_0),
-    obj_frame_tiles(gEventObjectPic_MagmaMemberF_1),
-    obj_frame_tiles(gEventObjectPic_MagmaMemberF_2),
-    obj_frame_tiles(gEventObjectPic_MagmaMemberF_3),
-    obj_frame_tiles(gEventObjectPic_MagmaMemberF_4),
-    obj_frame_tiles(gEventObjectPic_MagmaMemberF_5),
-    obj_frame_tiles(gEventObjectPic_MagmaMemberF_6),
-    obj_frame_tiles(gEventObjectPic_MagmaMemberF_7),
-    obj_frame_tiles(gEventObjectPic_MagmaMemberF_8),
+    overworld_frame(gEventObjectPic_MagmaMemberF, 16, 32, 0),
+    overworld_frame(gEventObjectPic_MagmaMemberF, 16, 32, 1),
+    overworld_frame(gEventObjectPic_MagmaMemberF, 16, 32, 2),
+    overworld_frame(gEventObjectPic_MagmaMemberF, 16, 32, 3),
+    overworld_frame(gEventObjectPic_MagmaMemberF, 16, 32, 4),
+    overworld_frame(gEventObjectPic_MagmaMemberF, 16, 32, 5),
+    overworld_frame(gEventObjectPic_MagmaMemberF, 16, 32, 6),
+    overworld_frame(gEventObjectPic_MagmaMemberF, 16, 32, 7),
+    overworld_frame(gEventObjectPic_MagmaMemberF, 16, 32, 8),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_Sidney[] = {
-    obj_frame_tiles(gEventObjectPic_Sidney_0),
-    obj_frame_tiles(gEventObjectPic_Sidney_1),
-    obj_frame_tiles(gEventObjectPic_Sidney_2),
-    obj_frame_tiles(gEventObjectPic_Sidney_0),
-    obj_frame_tiles(gEventObjectPic_Sidney_0),
-    obj_frame_tiles(gEventObjectPic_Sidney_1),
-    obj_frame_tiles(gEventObjectPic_Sidney_1),
-    obj_frame_tiles(gEventObjectPic_Sidney_2),
-    obj_frame_tiles(gEventObjectPic_Sidney_2),
+    overworld_frame(gEventObjectPic_Sidney, 16, 32, 0),
+    overworld_frame(gEventObjectPic_Sidney, 16, 32, 1),
+    overworld_frame(gEventObjectPic_Sidney, 16, 32, 2),
+    overworld_frame(gEventObjectPic_Sidney, 16, 32, 0),
+    overworld_frame(gEventObjectPic_Sidney, 16, 32, 0),
+    overworld_frame(gEventObjectPic_Sidney, 16, 32, 1),
+    overworld_frame(gEventObjectPic_Sidney, 16, 32, 1),
+    overworld_frame(gEventObjectPic_Sidney, 16, 32, 2),
+    overworld_frame(gEventObjectPic_Sidney, 16, 32, 2),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_Phoebe[] = {
-    obj_frame_tiles(gEventObjectPic_Phoebe_0),
-    obj_frame_tiles(gEventObjectPic_Phoebe_1),
-    obj_frame_tiles(gEventObjectPic_Phoebe_2),
-    obj_frame_tiles(gEventObjectPic_Phoebe_0),
-    obj_frame_tiles(gEventObjectPic_Phoebe_0),
-    obj_frame_tiles(gEventObjectPic_Phoebe_1),
-    obj_frame_tiles(gEventObjectPic_Phoebe_1),
-    obj_frame_tiles(gEventObjectPic_Phoebe_2),
-    obj_frame_tiles(gEventObjectPic_Phoebe_2),
+    overworld_frame(gEventObjectPic_Phoebe, 16, 32, 0),
+    overworld_frame(gEventObjectPic_Phoebe, 16, 32, 1),
+    overworld_frame(gEventObjectPic_Phoebe, 16, 32, 2),
+    overworld_frame(gEventObjectPic_Phoebe, 16, 32, 0),
+    overworld_frame(gEventObjectPic_Phoebe, 16, 32, 0),
+    overworld_frame(gEventObjectPic_Phoebe, 16, 32, 1),
+    overworld_frame(gEventObjectPic_Phoebe, 16, 32, 1),
+    overworld_frame(gEventObjectPic_Phoebe, 16, 32, 2),
+    overworld_frame(gEventObjectPic_Phoebe, 16, 32, 2),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_Glacia[] = {
-    obj_frame_tiles(gEventObjectPic_Glacia_0),
-    obj_frame_tiles(gEventObjectPic_Glacia_1),
-    obj_frame_tiles(gEventObjectPic_Glacia_2),
-    obj_frame_tiles(gEventObjectPic_Glacia_0),
-    obj_frame_tiles(gEventObjectPic_Glacia_0),
-    obj_frame_tiles(gEventObjectPic_Glacia_1),
-    obj_frame_tiles(gEventObjectPic_Glacia_1),
-    obj_frame_tiles(gEventObjectPic_Glacia_2),
-    obj_frame_tiles(gEventObjectPic_Glacia_2),
+    overworld_frame(gEventObjectPic_Glacia, 16, 32, 0),
+    overworld_frame(gEventObjectPic_Glacia, 16, 32, 1),
+    overworld_frame(gEventObjectPic_Glacia, 16, 32, 2),
+    overworld_frame(gEventObjectPic_Glacia, 16, 32, 0),
+    overworld_frame(gEventObjectPic_Glacia, 16, 32, 0),
+    overworld_frame(gEventObjectPic_Glacia, 16, 32, 1),
+    overworld_frame(gEventObjectPic_Glacia, 16, 32, 1),
+    overworld_frame(gEventObjectPic_Glacia, 16, 32, 2),
+    overworld_frame(gEventObjectPic_Glacia, 16, 32, 2),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_Drake[] = {
-    obj_frame_tiles(gEventObjectPic_Drake_0),
-    obj_frame_tiles(gEventObjectPic_Drake_1),
-    obj_frame_tiles(gEventObjectPic_Drake_2),
-    obj_frame_tiles(gEventObjectPic_Drake_0),
-    obj_frame_tiles(gEventObjectPic_Drake_0),
-    obj_frame_tiles(gEventObjectPic_Drake_1),
-    obj_frame_tiles(gEventObjectPic_Drake_1),
-    obj_frame_tiles(gEventObjectPic_Drake_2),
-    obj_frame_tiles(gEventObjectPic_Drake_2),
+    overworld_frame(gEventObjectPic_Drake, 16, 32, 0),
+    overworld_frame(gEventObjectPic_Drake, 16, 32, 1),
+    overworld_frame(gEventObjectPic_Drake, 16, 32, 2),
+    overworld_frame(gEventObjectPic_Drake, 16, 32, 0),
+    overworld_frame(gEventObjectPic_Drake, 16, 32, 0),
+    overworld_frame(gEventObjectPic_Drake, 16, 32, 1),
+    overworld_frame(gEventObjectPic_Drake, 16, 32, 1),
+    overworld_frame(gEventObjectPic_Drake, 16, 32, 2),
+    overworld_frame(gEventObjectPic_Drake, 16, 32, 2),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_Roxanne[] = {
-    obj_frame_tiles(gEventObjectPic_Roxanne_0),
-    obj_frame_tiles(gEventObjectPic_Roxanne_1),
-    obj_frame_tiles(gEventObjectPic_Roxanne_2),
-    obj_frame_tiles(gEventObjectPic_Roxanne_0),
-    obj_frame_tiles(gEventObjectPic_Roxanne_0),
-    obj_frame_tiles(gEventObjectPic_Roxanne_1),
-    obj_frame_tiles(gEventObjectPic_Roxanne_1),
-    obj_frame_tiles(gEventObjectPic_Roxanne_2),
-    obj_frame_tiles(gEventObjectPic_Roxanne_2),
+    overworld_frame(gEventObjectPic_Roxanne, 16, 32, 0),
+    overworld_frame(gEventObjectPic_Roxanne, 16, 32, 1),
+    overworld_frame(gEventObjectPic_Roxanne, 16, 32, 2),
+    overworld_frame(gEventObjectPic_Roxanne, 16, 32, 0),
+    overworld_frame(gEventObjectPic_Roxanne, 16, 32, 0),
+    overworld_frame(gEventObjectPic_Roxanne, 16, 32, 1),
+    overworld_frame(gEventObjectPic_Roxanne, 16, 32, 1),
+    overworld_frame(gEventObjectPic_Roxanne, 16, 32, 2),
+    overworld_frame(gEventObjectPic_Roxanne, 16, 32, 2),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_Brawly[] = {
-    obj_frame_tiles(gEventObjectPic_Brawly_0),
-    obj_frame_tiles(gEventObjectPic_Brawly_1),
-    obj_frame_tiles(gEventObjectPic_Brawly_2),
-    obj_frame_tiles(gEventObjectPic_Brawly_0),
-    obj_frame_tiles(gEventObjectPic_Brawly_0),
-    obj_frame_tiles(gEventObjectPic_Brawly_1),
-    obj_frame_tiles(gEventObjectPic_Brawly_1),
-    obj_frame_tiles(gEventObjectPic_Brawly_2),
-    obj_frame_tiles(gEventObjectPic_Brawly_2),
+    overworld_frame(gEventObjectPic_Brawly, 16, 32, 0),
+    overworld_frame(gEventObjectPic_Brawly, 16, 32, 1),
+    overworld_frame(gEventObjectPic_Brawly, 16, 32, 2),
+    overworld_frame(gEventObjectPic_Brawly, 16, 32, 0),
+    overworld_frame(gEventObjectPic_Brawly, 16, 32, 0),
+    overworld_frame(gEventObjectPic_Brawly, 16, 32, 1),
+    overworld_frame(gEventObjectPic_Brawly, 16, 32, 1),
+    overworld_frame(gEventObjectPic_Brawly, 16, 32, 2),
+    overworld_frame(gEventObjectPic_Brawly, 16, 32, 2),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_Wattson[] = {
-    obj_frame_tiles(gEventObjectPic_Wattson_0),
-    obj_frame_tiles(gEventObjectPic_Wattson_1),
-    obj_frame_tiles(gEventObjectPic_Wattson_2),
-    obj_frame_tiles(gEventObjectPic_Wattson_0),
-    obj_frame_tiles(gEventObjectPic_Wattson_0),
-    obj_frame_tiles(gEventObjectPic_Wattson_1),
-    obj_frame_tiles(gEventObjectPic_Wattson_1),
-    obj_frame_tiles(gEventObjectPic_Wattson_2),
-    obj_frame_tiles(gEventObjectPic_Wattson_2),
+    overworld_frame(gEventObjectPic_Wattson, 16, 32, 0),
+    overworld_frame(gEventObjectPic_Wattson, 16, 32, 1),
+    overworld_frame(gEventObjectPic_Wattson, 16, 32, 2),
+    overworld_frame(gEventObjectPic_Wattson, 16, 32, 0),
+    overworld_frame(gEventObjectPic_Wattson, 16, 32, 0),
+    overworld_frame(gEventObjectPic_Wattson, 16, 32, 1),
+    overworld_frame(gEventObjectPic_Wattson, 16, 32, 1),
+    overworld_frame(gEventObjectPic_Wattson, 16, 32, 2),
+    overworld_frame(gEventObjectPic_Wattson, 16, 32, 2),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_Flannery[] = {
-    obj_frame_tiles(gEventObjectPic_Flannery_0),
-    obj_frame_tiles(gEventObjectPic_Flannery_1),
-    obj_frame_tiles(gEventObjectPic_Flannery_2),
-    obj_frame_tiles(gEventObjectPic_Flannery_0),
-    obj_frame_tiles(gEventObjectPic_Flannery_0),
-    obj_frame_tiles(gEventObjectPic_Flannery_1),
-    obj_frame_tiles(gEventObjectPic_Flannery_1),
-    obj_frame_tiles(gEventObjectPic_Flannery_2),
-    obj_frame_tiles(gEventObjectPic_Flannery_2),
+    overworld_frame(gEventObjectPic_Flannery, 16, 32, 0),
+    overworld_frame(gEventObjectPic_Flannery, 16, 32, 1),
+    overworld_frame(gEventObjectPic_Flannery, 16, 32, 2),
+    overworld_frame(gEventObjectPic_Flannery, 16, 32, 0),
+    overworld_frame(gEventObjectPic_Flannery, 16, 32, 0),
+    overworld_frame(gEventObjectPic_Flannery, 16, 32, 1),
+    overworld_frame(gEventObjectPic_Flannery, 16, 32, 1),
+    overworld_frame(gEventObjectPic_Flannery, 16, 32, 2),
+    overworld_frame(gEventObjectPic_Flannery, 16, 32, 2),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_Norman[] = {
-    obj_frame_tiles(gEventObjectPic_Norman_0),
-    obj_frame_tiles(gEventObjectPic_Norman_1),
-    obj_frame_tiles(gEventObjectPic_Norman_2),
-    obj_frame_tiles(gEventObjectPic_Norman_3),
-    obj_frame_tiles(gEventObjectPic_Norman_4),
-    obj_frame_tiles(gEventObjectPic_Norman_5),
-    obj_frame_tiles(gEventObjectPic_Norman_6),
-    obj_frame_tiles(gEventObjectPic_Norman_7),
-    obj_frame_tiles(gEventObjectPic_Norman_8),
+    overworld_frame(gEventObjectPic_Norman, 16, 32, 0),
+    overworld_frame(gEventObjectPic_Norman, 16, 32, 1),
+    overworld_frame(gEventObjectPic_Norman, 16, 32, 2),
+    overworld_frame(gEventObjectPic_Norman, 16, 32, 3),
+    overworld_frame(gEventObjectPic_Norman, 16, 32, 4),
+    overworld_frame(gEventObjectPic_Norman, 16, 32, 5),
+    overworld_frame(gEventObjectPic_Norman, 16, 32, 6),
+    overworld_frame(gEventObjectPic_Norman, 16, 32, 7),
+    overworld_frame(gEventObjectPic_Norman, 16, 32, 8),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_Winona[] = {
-    obj_frame_tiles(gEventObjectPic_Winona_0),
-    obj_frame_tiles(gEventObjectPic_Winona_1),
-    obj_frame_tiles(gEventObjectPic_Winona_2),
-    obj_frame_tiles(gEventObjectPic_Winona_0),
-    obj_frame_tiles(gEventObjectPic_Winona_0),
-    obj_frame_tiles(gEventObjectPic_Winona_1),
-    obj_frame_tiles(gEventObjectPic_Winona_1),
-    obj_frame_tiles(gEventObjectPic_Winona_2),
-    obj_frame_tiles(gEventObjectPic_Winona_2),
+    overworld_frame(gEventObjectPic_Winona, 16, 32, 0),
+    overworld_frame(gEventObjectPic_Winona, 16, 32, 1),
+    overworld_frame(gEventObjectPic_Winona, 16, 32, 2),
+    overworld_frame(gEventObjectPic_Winona, 16, 32, 0),
+    overworld_frame(gEventObjectPic_Winona, 16, 32, 0),
+    overworld_frame(gEventObjectPic_Winona, 16, 32, 1),
+    overworld_frame(gEventObjectPic_Winona, 16, 32, 1),
+    overworld_frame(gEventObjectPic_Winona, 16, 32, 2),
+    overworld_frame(gEventObjectPic_Winona, 16, 32, 2),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_Liza[] = {
-    obj_frame_tiles(gEventObjectPic_Liza_0),
-    obj_frame_tiles(gEventObjectPic_Liza_1),
-    obj_frame_tiles(gEventObjectPic_Liza_2),
-    obj_frame_tiles(gEventObjectPic_Liza_0),
-    obj_frame_tiles(gEventObjectPic_Liza_0),
-    obj_frame_tiles(gEventObjectPic_Liza_1),
-    obj_frame_tiles(gEventObjectPic_Liza_1),
-    obj_frame_tiles(gEventObjectPic_Liza_2),
-    obj_frame_tiles(gEventObjectPic_Liza_2),
+    overworld_frame(gEventObjectPic_Liza, 16, 32, 0),
+    overworld_frame(gEventObjectPic_Liza, 16, 32, 1),
+    overworld_frame(gEventObjectPic_Liza, 16, 32, 2),
+    overworld_frame(gEventObjectPic_Liza, 16, 32, 0),
+    overworld_frame(gEventObjectPic_Liza, 16, 32, 0),
+    overworld_frame(gEventObjectPic_Liza, 16, 32, 1),
+    overworld_frame(gEventObjectPic_Liza, 16, 32, 1),
+    overworld_frame(gEventObjectPic_Liza, 16, 32, 2),
+    overworld_frame(gEventObjectPic_Liza, 16, 32, 2),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_Tate[] = {
-    obj_frame_tiles(gEventObjectPic_Tate_0),
-    obj_frame_tiles(gEventObjectPic_Tate_1),
-    obj_frame_tiles(gEventObjectPic_Tate_2),
-    obj_frame_tiles(gEventObjectPic_Tate_0),
-    obj_frame_tiles(gEventObjectPic_Tate_0),
-    obj_frame_tiles(gEventObjectPic_Tate_1),
-    obj_frame_tiles(gEventObjectPic_Tate_1),
-    obj_frame_tiles(gEventObjectPic_Tate_2),
-    obj_frame_tiles(gEventObjectPic_Tate_2),
+    overworld_frame(gEventObjectPic_Tate, 16, 32, 0),
+    overworld_frame(gEventObjectPic_Tate, 16, 32, 1),
+    overworld_frame(gEventObjectPic_Tate, 16, 32, 2),
+    overworld_frame(gEventObjectPic_Tate, 16, 32, 0),
+    overworld_frame(gEventObjectPic_Tate, 16, 32, 0),
+    overworld_frame(gEventObjectPic_Tate, 16, 32, 1),
+    overworld_frame(gEventObjectPic_Tate, 16, 32, 1),
+    overworld_frame(gEventObjectPic_Tate, 16, 32, 2),
+    overworld_frame(gEventObjectPic_Tate, 16, 32, 2),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_Wallace[] = {
-    obj_frame_tiles(gEventObjectPic_Wallace_0),
-    obj_frame_tiles(gEventObjectPic_Wallace_1),
-    obj_frame_tiles(gEventObjectPic_Wallace_2),
-    obj_frame_tiles(gEventObjectPic_Wallace_3),
-    obj_frame_tiles(gEventObjectPic_Wallace_4),
-    obj_frame_tiles(gEventObjectPic_Wallace_5),
-    obj_frame_tiles(gEventObjectPic_Wallace_6),
-    obj_frame_tiles(gEventObjectPic_Wallace_7),
-    obj_frame_tiles(gEventObjectPic_Wallace_8),
+    overworld_frame(gEventObjectPic_Wallace, 16, 32, 0),
+    overworld_frame(gEventObjectPic_Wallace, 16, 32, 1),
+    overworld_frame(gEventObjectPic_Wallace, 16, 32, 2),
+    overworld_frame(gEventObjectPic_Wallace, 16, 32, 3),
+    overworld_frame(gEventObjectPic_Wallace, 16, 32, 4),
+    overworld_frame(gEventObjectPic_Wallace, 16, 32, 5),
+    overworld_frame(gEventObjectPic_Wallace, 16, 32, 6),
+    overworld_frame(gEventObjectPic_Wallace, 16, 32, 7),
+    overworld_frame(gEventObjectPic_Wallace, 16, 32, 8),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_Steven[] = {
-    obj_frame_tiles(gEventObjectPic_Steven_0),
-    obj_frame_tiles(gEventObjectPic_Steven_1),
-    obj_frame_tiles(gEventObjectPic_Steven_2),
-    obj_frame_tiles(gEventObjectPic_Steven_3),
-    obj_frame_tiles(gEventObjectPic_Steven_4),
-    obj_frame_tiles(gEventObjectPic_Steven_5),
-    obj_frame_tiles(gEventObjectPic_Steven_6),
-    obj_frame_tiles(gEventObjectPic_Steven_7),
-    obj_frame_tiles(gEventObjectPic_Steven_8),
+    overworld_frame(gEventObjectPic_Steven, 16, 32, 0),
+    overworld_frame(gEventObjectPic_Steven, 16, 32, 1),
+    overworld_frame(gEventObjectPic_Steven, 16, 32, 2),
+    overworld_frame(gEventObjectPic_Steven, 16, 32, 3),
+    overworld_frame(gEventObjectPic_Steven, 16, 32, 4),
+    overworld_frame(gEventObjectPic_Steven, 16, 32, 5),
+    overworld_frame(gEventObjectPic_Steven, 16, 32, 6),
+    overworld_frame(gEventObjectPic_Steven, 16, 32, 7),
+    overworld_frame(gEventObjectPic_Steven, 16, 32, 8),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_Wally[] = {
-    obj_frame_tiles(gEventObjectPic_Wally_0),
-    obj_frame_tiles(gEventObjectPic_Wally_1),
-    obj_frame_tiles(gEventObjectPic_Wally_2),
-    obj_frame_tiles(gEventObjectPic_Wally_3),
-    obj_frame_tiles(gEventObjectPic_Wally_4),
-    obj_frame_tiles(gEventObjectPic_Wally_5),
-    obj_frame_tiles(gEventObjectPic_Wally_6),
-    obj_frame_tiles(gEventObjectPic_Wally_7),
-    obj_frame_tiles(gEventObjectPic_Wally_8),
+    overworld_frame(gEventObjectPic_Wally, 16, 32, 0),
+    overworld_frame(gEventObjectPic_Wally, 16, 32, 1),
+    overworld_frame(gEventObjectPic_Wally, 16, 32, 2),
+    overworld_frame(gEventObjectPic_Wally, 16, 32, 3),
+    overworld_frame(gEventObjectPic_Wally, 16, 32, 4),
+    overworld_frame(gEventObjectPic_Wally, 16, 32, 5),
+    overworld_frame(gEventObjectPic_Wally, 16, 32, 6),
+    overworld_frame(gEventObjectPic_Wally, 16, 32, 7),
+    overworld_frame(gEventObjectPic_Wally, 16, 32, 8),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_RubySapphireLittleBoy[] = {
-    obj_frame_tiles(gEventObjectPic_RubySapphireLittleBoy_0),
-    obj_frame_tiles(gEventObjectPic_RubySapphireLittleBoy_1),
-    obj_frame_tiles(gEventObjectPic_RubySapphireLittleBoy_2),
-    obj_frame_tiles(gEventObjectPic_RubySapphireLittleBoy_3),
-    obj_frame_tiles(gEventObjectPic_RubySapphireLittleBoy_4),
-    obj_frame_tiles(gEventObjectPic_RubySapphireLittleBoy_5),
-    obj_frame_tiles(gEventObjectPic_RubySapphireLittleBoy_6),
-    obj_frame_tiles(gEventObjectPic_RubySapphireLittleBoy_7),
-    obj_frame_tiles(gEventObjectPic_RubySapphireLittleBoy_8),
+    overworld_frame(gEventObjectPic_RubySapphireLittleBoy, 16, 16, 0),
+    overworld_frame(gEventObjectPic_RubySapphireLittleBoy, 16, 16, 1),
+    overworld_frame(gEventObjectPic_RubySapphireLittleBoy, 16, 16, 2),
+    overworld_frame(gEventObjectPic_RubySapphireLittleBoy, 16, 16, 3),
+    overworld_frame(gEventObjectPic_RubySapphireLittleBoy, 16, 16, 4),
+    overworld_frame(gEventObjectPic_RubySapphireLittleBoy, 16, 16, 5),
+    overworld_frame(gEventObjectPic_RubySapphireLittleBoy, 16, 16, 6),
+    overworld_frame(gEventObjectPic_RubySapphireLittleBoy, 16, 16, 7),
+    overworld_frame(gEventObjectPic_RubySapphireLittleBoy, 16, 16, 8),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_BrendanFishing[] = {
-    obj_frame_tiles(gEventObjectPic_BrendanFishing_0),
-    obj_frame_tiles(gEventObjectPic_BrendanFishing_1),
-    obj_frame_tiles(gEventObjectPic_BrendanFishing_2),
-    obj_frame_tiles(gEventObjectPic_BrendanFishing_3),
-    obj_frame_tiles(gEventObjectPic_BrendanFishing_4),
-    obj_frame_tiles(gEventObjectPic_BrendanFishing_5),
-    obj_frame_tiles(gEventObjectPic_BrendanFishing_6),
-    obj_frame_tiles(gEventObjectPic_BrendanFishing_7),
-    obj_frame_tiles(gEventObjectPic_BrendanFishing_8),
-    obj_frame_tiles(gEventObjectPic_BrendanFishing_9),
-    obj_frame_tiles(gEventObjectPic_BrendanFishing_10),
-    obj_frame_tiles(gEventObjectPic_BrendanFishing_11),
+    overworld_frame(gEventObjectPic_BrendanFishing, 32, 32, 0),
+    overworld_frame(gEventObjectPic_BrendanFishing, 32, 32, 1),
+    overworld_frame(gEventObjectPic_BrendanFishing, 32, 32, 2),
+    overworld_frame(gEventObjectPic_BrendanFishing, 32, 32, 3),
+    overworld_frame(gEventObjectPic_BrendanFishing, 32, 32, 4),
+    overworld_frame(gEventObjectPic_BrendanFishing, 32, 32, 5),
+    overworld_frame(gEventObjectPic_BrendanFishing, 32, 32, 6),
+    overworld_frame(gEventObjectPic_BrendanFishing, 32, 32, 7),
+    overworld_frame(gEventObjectPic_BrendanFishing, 32, 32, 8),
+    overworld_frame(gEventObjectPic_BrendanFishing, 32, 32, 9),
+    overworld_frame(gEventObjectPic_BrendanFishing, 32, 32, 10),
+    overworld_frame(gEventObjectPic_BrendanFishing, 32, 32, 11),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_MayFishing[] = {
-    obj_frame_tiles(gEventObjectPic_MayFishing_0),
-    obj_frame_tiles(gEventObjectPic_MayFishing_1),
-    obj_frame_tiles(gEventObjectPic_MayFishing_2),
-    obj_frame_tiles(gEventObjectPic_MayFishing_3),
-    obj_frame_tiles(gEventObjectPic_MayFishing_4),
-    obj_frame_tiles(gEventObjectPic_MayFishing_5),
-    obj_frame_tiles(gEventObjectPic_MayFishing_6),
-    obj_frame_tiles(gEventObjectPic_MayFishing_7),
-    obj_frame_tiles(gEventObjectPic_MayFishing_8),
-    obj_frame_tiles(gEventObjectPic_MayFishing_9),
-    obj_frame_tiles(gEventObjectPic_MayFishing_10),
-    obj_frame_tiles(gEventObjectPic_MayFishing_11),
+    overworld_frame(gEventObjectPic_MayFishing, 32, 32, 0),
+    overworld_frame(gEventObjectPic_MayFishing, 32, 32, 1),
+    overworld_frame(gEventObjectPic_MayFishing, 32, 32, 2),
+    overworld_frame(gEventObjectPic_MayFishing, 32, 32, 3),
+    overworld_frame(gEventObjectPic_MayFishing, 32, 32, 4),
+    overworld_frame(gEventObjectPic_MayFishing, 32, 32, 5),
+    overworld_frame(gEventObjectPic_MayFishing, 32, 32, 6),
+    overworld_frame(gEventObjectPic_MayFishing, 32, 32, 7),
+    overworld_frame(gEventObjectPic_MayFishing, 32, 32, 8),
+    overworld_frame(gEventObjectPic_MayFishing, 32, 32, 9),
+    overworld_frame(gEventObjectPic_MayFishing, 32, 32, 10),
+    overworld_frame(gEventObjectPic_MayFishing, 32, 32, 11),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_HotSpringsOldWoman[] = {
-    obj_frame_tiles(gEventObjectPic_HotSpringsOldWoman_0),
-    obj_frame_tiles(gEventObjectPic_HotSpringsOldWoman_1),
-    obj_frame_tiles(gEventObjectPic_HotSpringsOldWoman_2),
-    obj_frame_tiles(gEventObjectPic_HotSpringsOldWoman_3),
-    obj_frame_tiles(gEventObjectPic_HotSpringsOldWoman_4),
-    obj_frame_tiles(gEventObjectPic_HotSpringsOldWoman_5),
-    obj_frame_tiles(gEventObjectPic_HotSpringsOldWoman_6),
-    obj_frame_tiles(gEventObjectPic_HotSpringsOldWoman_7),
-    obj_frame_tiles(gEventObjectPic_HotSpringsOldWoman_8),
+    overworld_frame(gEventObjectPic_HotSpringsOldWoman, 16, 32, 0),
+    overworld_frame(gEventObjectPic_HotSpringsOldWoman, 16, 32, 1),
+    overworld_frame(gEventObjectPic_HotSpringsOldWoman, 16, 32, 2),
+    overworld_frame(gEventObjectPic_HotSpringsOldWoman, 16, 32, 3),
+    overworld_frame(gEventObjectPic_HotSpringsOldWoman, 16, 32, 4),
+    overworld_frame(gEventObjectPic_HotSpringsOldWoman, 16, 32, 5),
+    overworld_frame(gEventObjectPic_HotSpringsOldWoman, 16, 32, 6),
+    overworld_frame(gEventObjectPic_HotSpringsOldWoman, 16, 32, 7),
+    overworld_frame(gEventObjectPic_HotSpringsOldWoman, 16, 32, 8),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_SSTidal[] = {
@@ -1621,63 +1621,63 @@ const struct SpriteFrameImage gEventObjectPicTable_BigRegisteelDoll[] = {
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_LatiasLatios[] = {
-    obj_frame_tiles(gEventObjectPic_LatiasLatios_0),
-    obj_frame_tiles(gEventObjectPic_LatiasLatios_0),
-    obj_frame_tiles(gEventObjectPic_LatiasLatios_0),
-    obj_frame_tiles(gEventObjectPic_LatiasLatios_1),
-    obj_frame_tiles(gEventObjectPic_LatiasLatios_2),
-    obj_frame_tiles(gEventObjectPic_LatiasLatios_1),
-    obj_frame_tiles(gEventObjectPic_LatiasLatios_2),
-    obj_frame_tiles(gEventObjectPic_LatiasLatios_1),
-    obj_frame_tiles(gEventObjectPic_LatiasLatios_2),
+    overworld_frame(gEventObjectPic_LatiasLatios, 32, 32, 0),
+    overworld_frame(gEventObjectPic_LatiasLatios, 32, 32, 0),
+    overworld_frame(gEventObjectPic_LatiasLatios, 32, 32, 0),
+    overworld_frame(gEventObjectPic_LatiasLatios, 32, 32, 1),
+    overworld_frame(gEventObjectPic_LatiasLatios, 32, 32, 2),
+    overworld_frame(gEventObjectPic_LatiasLatios, 32, 32, 1),
+    overworld_frame(gEventObjectPic_LatiasLatios, 32, 32, 2),
+    overworld_frame(gEventObjectPic_LatiasLatios, 32, 32, 1),
+    overworld_frame(gEventObjectPic_LatiasLatios, 32, 32, 2),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_Boy5[] = {
-    obj_frame_tiles(gEventObjectPic_Boy5_0),
-    obj_frame_tiles(gEventObjectPic_Boy5_1),
-    obj_frame_tiles(gEventObjectPic_Boy5_2),
-    obj_frame_tiles(gEventObjectPic_Boy5_0),
-    obj_frame_tiles(gEventObjectPic_Boy5_0),
-    obj_frame_tiles(gEventObjectPic_Boy5_1),
-    obj_frame_tiles(gEventObjectPic_Boy5_1),
-    obj_frame_tiles(gEventObjectPic_Boy5_2),
-    obj_frame_tiles(gEventObjectPic_Boy5_2),
+    overworld_frame(gEventObjectPic_Boy5, 16, 32, 0),
+    overworld_frame(gEventObjectPic_Boy5, 16, 32, 1),
+    overworld_frame(gEventObjectPic_Boy5, 16, 32, 2),
+    overworld_frame(gEventObjectPic_Boy5, 16, 32, 0),
+    overworld_frame(gEventObjectPic_Boy5, 16, 32, 0),
+    overworld_frame(gEventObjectPic_Boy5, 16, 32, 1),
+    overworld_frame(gEventObjectPic_Boy5, 16, 32, 1),
+    overworld_frame(gEventObjectPic_Boy5, 16, 32, 2),
+    overworld_frame(gEventObjectPic_Boy5, 16, 32, 2),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_ContestOldMan[] = {
-    obj_frame_tiles(gEventObjectPic_ContestOldMan_0),
-    obj_frame_tiles(gEventObjectPic_ContestOldMan_1),
-    obj_frame_tiles(gEventObjectPic_ContestOldMan_2),
-    obj_frame_tiles(gEventObjectPic_ContestOldMan_3),
-    obj_frame_tiles(gEventObjectPic_ContestOldMan_4),
-    obj_frame_tiles(gEventObjectPic_ContestOldMan_5),
-    obj_frame_tiles(gEventObjectPic_ContestOldMan_6),
-    obj_frame_tiles(gEventObjectPic_ContestOldMan_7),
-    obj_frame_tiles(gEventObjectPic_ContestOldMan_8),
+    overworld_frame(gEventObjectPic_ContestOldMan, 16, 32, 0),
+    overworld_frame(gEventObjectPic_ContestOldMan, 16, 32, 1),
+    overworld_frame(gEventObjectPic_ContestOldMan, 16, 32, 2),
+    overworld_frame(gEventObjectPic_ContestOldMan, 16, 32, 3),
+    overworld_frame(gEventObjectPic_ContestOldMan, 16, 32, 4),
+    overworld_frame(gEventObjectPic_ContestOldMan, 16, 32, 5),
+    overworld_frame(gEventObjectPic_ContestOldMan, 16, 32, 6),
+    overworld_frame(gEventObjectPic_ContestOldMan, 16, 32, 7),
+    overworld_frame(gEventObjectPic_ContestOldMan, 16, 32, 8),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_BrendanWatering[] = {
-    obj_frame_tiles(gEventObjectPic_BrendanWatering_0),
-    obj_frame_tiles(gEventObjectPic_BrendanWatering_1),
-    obj_frame_tiles(gEventObjectPic_BrendanWatering_2),
-    obj_frame_tiles(gEventObjectPic_BrendanWatering_3),
-    obj_frame_tiles(gEventObjectPic_BrendanWatering_3),
-    obj_frame_tiles(gEventObjectPic_BrendanWatering_4),
-    obj_frame_tiles(gEventObjectPic_BrendanWatering_4),
-    obj_frame_tiles(gEventObjectPic_BrendanWatering_5),
-    obj_frame_tiles(gEventObjectPic_BrendanWatering_5),
+    overworld_frame(gEventObjectPic_BrendanWatering, 32, 32, 0),
+    overworld_frame(gEventObjectPic_BrendanWatering, 32, 32, 2),
+    overworld_frame(gEventObjectPic_BrendanWatering, 32, 32, 4),
+    overworld_frame(gEventObjectPic_BrendanWatering, 32, 32, 1),
+    overworld_frame(gEventObjectPic_BrendanWatering, 32, 32, 1),
+    overworld_frame(gEventObjectPic_BrendanWatering, 32, 32, 3),
+    overworld_frame(gEventObjectPic_BrendanWatering, 32, 32, 3),
+    overworld_frame(gEventObjectPic_BrendanWatering, 32, 32, 5),
+    overworld_frame(gEventObjectPic_BrendanWatering, 32, 32, 5),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_MayWatering[] = {
-    obj_frame_tiles(gEventObjectPic_MayWatering_0),
-    obj_frame_tiles(gEventObjectPic_MayWatering_1),
-    obj_frame_tiles(gEventObjectPic_MayWatering_2),
-    obj_frame_tiles(gEventObjectPic_MayWatering_3),
-    obj_frame_tiles(gEventObjectPic_MayWatering_3),
-    obj_frame_tiles(gEventObjectPic_MayWatering_4),
-    obj_frame_tiles(gEventObjectPic_MayWatering_4),
-    obj_frame_tiles(gEventObjectPic_MayWatering_5),
-    obj_frame_tiles(gEventObjectPic_MayWatering_5),
+    overworld_frame(gEventObjectPic_MayWatering, 32, 32, 0),
+    overworld_frame(gEventObjectPic_MayWatering, 32, 32, 2),
+    overworld_frame(gEventObjectPic_MayWatering, 32, 32, 4),
+    overworld_frame(gEventObjectPic_MayWatering, 32, 32, 1),
+    overworld_frame(gEventObjectPic_MayWatering, 32, 32, 1),
+    overworld_frame(gEventObjectPic_MayWatering, 32, 32, 3),
+    overworld_frame(gEventObjectPic_MayWatering, 32, 32, 3),
+    overworld_frame(gEventObjectPic_MayWatering, 32, 32, 5),
+    overworld_frame(gEventObjectPic_MayWatering, 32, 32, 5),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_BrendanDecorating[] = {
@@ -1689,75 +1689,75 @@ const struct SpriteFrameImage gEventObjectPicTable_MayDecorating[] = {
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_Archie[] = {
-    obj_frame_tiles(gEventObjectPic_Archie_0),
-    obj_frame_tiles(gEventObjectPic_Archie_1),
-    obj_frame_tiles(gEventObjectPic_Archie_2),
-    obj_frame_tiles(gEventObjectPic_Archie_3),
-    obj_frame_tiles(gEventObjectPic_Archie_4),
-    obj_frame_tiles(gEventObjectPic_Archie_5),
-    obj_frame_tiles(gEventObjectPic_Archie_6),
-    obj_frame_tiles(gEventObjectPic_Archie_7),
-    obj_frame_tiles(gEventObjectPic_Archie_8),
+    overworld_frame(gEventObjectPic_Archie, 16, 32, 0),
+    overworld_frame(gEventObjectPic_Archie, 16, 32, 1),
+    overworld_frame(gEventObjectPic_Archie, 16, 32, 2),
+    overworld_frame(gEventObjectPic_Archie, 16, 32, 3),
+    overworld_frame(gEventObjectPic_Archie, 16, 32, 4),
+    overworld_frame(gEventObjectPic_Archie, 16, 32, 5),
+    overworld_frame(gEventObjectPic_Archie, 16, 32, 6),
+    overworld_frame(gEventObjectPic_Archie, 16, 32, 7),
+    overworld_frame(gEventObjectPic_Archie, 16, 32, 8),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_Maxie[] = {
-    obj_frame_tiles(gEventObjectPic_Maxie_0),
-    obj_frame_tiles(gEventObjectPic_Maxie_1),
-    obj_frame_tiles(gEventObjectPic_Maxie_2),
-    obj_frame_tiles(gEventObjectPic_Maxie_3),
-    obj_frame_tiles(gEventObjectPic_Maxie_4),
-    obj_frame_tiles(gEventObjectPic_Maxie_5),
-    obj_frame_tiles(gEventObjectPic_Maxie_6),
-    obj_frame_tiles(gEventObjectPic_Maxie_7),
-    obj_frame_tiles(gEventObjectPic_Maxie_8),
+    overworld_frame(gEventObjectPic_Maxie, 16, 32, 0),
+    overworld_frame(gEventObjectPic_Maxie, 16, 32, 1),
+    overworld_frame(gEventObjectPic_Maxie, 16, 32, 2),
+    overworld_frame(gEventObjectPic_Maxie, 16, 32, 3),
+    overworld_frame(gEventObjectPic_Maxie, 16, 32, 4),
+    overworld_frame(gEventObjectPic_Maxie, 16, 32, 5),
+    overworld_frame(gEventObjectPic_Maxie, 16, 32, 6),
+    overworld_frame(gEventObjectPic_Maxie, 16, 32, 7),
+    overworld_frame(gEventObjectPic_Maxie, 16, 32, 8),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_KyogreFront[] = {
-    obj_frame_tiles(gEventObjectPic_KyogreFront_0),
-    obj_frame_tiles(gEventObjectPic_KyogreFront_0),
-    obj_frame_tiles(gEventObjectPic_KyogreFront_0),
-    obj_frame_tiles(gEventObjectPic_KyogreFront_1),
-    obj_frame_tiles(gEventObjectPic_KyogreFront_1),
-    obj_frame_tiles(gEventObjectPic_KyogreFront_1),
-    obj_frame_tiles(gEventObjectPic_KyogreFront_1),
-    obj_frame_tiles(gEventObjectPic_KyogreFront_1),
-    obj_frame_tiles(gEventObjectPic_KyogreFront_1),
+    overworld_frame(gEventObjectPic_Kyogre, 32, 32, 0),
+    overworld_frame(gEventObjectPic_Kyogre, 32, 32, 0),
+    overworld_frame(gEventObjectPic_Kyogre, 32, 32, 0),
+    overworld_frame(gEventObjectPic_Kyogre, 32, 32, 1),
+    overworld_frame(gEventObjectPic_Kyogre, 32, 32, 1),
+    overworld_frame(gEventObjectPic_Kyogre, 32, 32, 1),
+    overworld_frame(gEventObjectPic_Kyogre, 32, 32, 1),
+    overworld_frame(gEventObjectPic_Kyogre, 32, 32, 1),
+    overworld_frame(gEventObjectPic_Kyogre, 32, 32, 1),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_GroudonFront[] = {
-    obj_frame_tiles(gEventObjectPic_GroudonFront_0),
-    obj_frame_tiles(gEventObjectPic_GroudonFront_0),
-    obj_frame_tiles(gEventObjectPic_GroudonFront_0),
-    obj_frame_tiles(gEventObjectPic_GroudonFront_1),
-    obj_frame_tiles(gEventObjectPic_GroudonFront_1),
-    obj_frame_tiles(gEventObjectPic_GroudonFront_1),
-    obj_frame_tiles(gEventObjectPic_GroudonFront_1),
-    obj_frame_tiles(gEventObjectPic_GroudonFront_1),
-    obj_frame_tiles(gEventObjectPic_GroudonFront_1),
+    overworld_frame(gEventObjectPic_Groudon, 32, 32, 0),
+    overworld_frame(gEventObjectPic_Groudon, 32, 32, 0),
+    overworld_frame(gEventObjectPic_Groudon, 32, 32, 0),
+    overworld_frame(gEventObjectPic_Groudon, 32, 32, 1),
+    overworld_frame(gEventObjectPic_Groudon, 32, 32, 1),
+    overworld_frame(gEventObjectPic_Groudon, 32, 32, 1),
+    overworld_frame(gEventObjectPic_Groudon, 32, 32, 1),
+    overworld_frame(gEventObjectPic_Groudon, 32, 32, 1),
+    overworld_frame(gEventObjectPic_Groudon, 32, 32, 1),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_KyogreSide[] = {
-    obj_frame_tiles(gEventObjectPic_KyogreSide_0),
-    obj_frame_tiles(gEventObjectPic_KyogreSide_0),
-    obj_frame_tiles(gEventObjectPic_KyogreSide_0),
-    obj_frame_tiles(gEventObjectPic_KyogreSide_1),
-    obj_frame_tiles(gEventObjectPic_KyogreSide_1),
-    obj_frame_tiles(gEventObjectPic_KyogreSide_1),
-    obj_frame_tiles(gEventObjectPic_KyogreSide_1),
-    obj_frame_tiles(gEventObjectPic_KyogreSide_1),
-    obj_frame_tiles(gEventObjectPic_KyogreSide_1),
+    overworld_frame(gEventObjectPic_Kyogre, 32, 32, 2),
+    overworld_frame(gEventObjectPic_Kyogre, 32, 32, 2),
+    overworld_frame(gEventObjectPic_Kyogre, 32, 32, 2),
+    overworld_frame(gEventObjectPic_Kyogre, 32, 32, 3),
+    overworld_frame(gEventObjectPic_Kyogre, 32, 32, 3),
+    overworld_frame(gEventObjectPic_Kyogre, 32, 32, 3),
+    overworld_frame(gEventObjectPic_Kyogre, 32, 32, 3),
+    overworld_frame(gEventObjectPic_Kyogre, 32, 32, 3),
+    overworld_frame(gEventObjectPic_Kyogre, 32, 32, 3),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_GroudonSide[] = {
-    obj_frame_tiles(gEventObjectPic_GroudonSide_0),
-    obj_frame_tiles(gEventObjectPic_GroudonSide_0),
-    obj_frame_tiles(gEventObjectPic_GroudonSide_0),
-    obj_frame_tiles(gEventObjectPic_GroudonSide_1),
-    obj_frame_tiles(gEventObjectPic_GroudonSide_1),
-    obj_frame_tiles(gEventObjectPic_GroudonSide_1),
-    obj_frame_tiles(gEventObjectPic_GroudonSide_1),
-    obj_frame_tiles(gEventObjectPic_GroudonSide_1),
-    obj_frame_tiles(gEventObjectPic_GroudonSide_1),
+    overworld_frame(gEventObjectPic_Groudon, 32, 32, 2),
+    overworld_frame(gEventObjectPic_Groudon, 32, 32, 2),
+    overworld_frame(gEventObjectPic_Groudon, 32, 32, 2),
+    overworld_frame(gEventObjectPic_Groudon, 32, 32, 3),
+    overworld_frame(gEventObjectPic_Groudon, 32, 32, 3),
+    overworld_frame(gEventObjectPic_Groudon, 32, 32, 3),
+    overworld_frame(gEventObjectPic_Groudon, 32, 32, 3),
+    overworld_frame(gEventObjectPic_Groudon, 32, 32, 3),
+    overworld_frame(gEventObjectPic_Groudon, 32, 32, 3),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_Fossil[] = {
@@ -1777,35 +1777,35 @@ const struct SpriteFrameImage gEventObjectPicTable_Regi[] = {
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_Skitty[] = {
-    obj_frame_tiles(gEventObjectPic_Skitty_0),
-    obj_frame_tiles(gEventObjectPic_Skitty_1),
-    obj_frame_tiles(gEventObjectPic_Skitty_2),
-    obj_frame_tiles(gEventObjectPic_Skitty_0),
-    obj_frame_tiles(gEventObjectPic_Skitty_0),
-    obj_frame_tiles(gEventObjectPic_Skitty_1),
-    obj_frame_tiles(gEventObjectPic_Skitty_1),
-    obj_frame_tiles(gEventObjectPic_Skitty_2),
-    obj_frame_tiles(gEventObjectPic_Skitty_2),
+    overworld_frame(gEventObjectPic_Skitty, 16, 16, 0),
+    overworld_frame(gEventObjectPic_Skitty, 16, 16, 1),
+    overworld_frame(gEventObjectPic_Skitty, 16, 16, 2),
+    overworld_frame(gEventObjectPic_Skitty, 16, 16, 0),
+    overworld_frame(gEventObjectPic_Skitty, 16, 16, 0),
+    overworld_frame(gEventObjectPic_Skitty, 16, 16, 1),
+    overworld_frame(gEventObjectPic_Skitty, 16, 16, 1),
+    overworld_frame(gEventObjectPic_Skitty, 16, 16, 2),
+    overworld_frame(gEventObjectPic_Skitty, 16, 16, 2),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_Kecleon[] = {
-    obj_frame_tiles(gEventObjectPic_Kecleon_0),
-    obj_frame_tiles(gEventObjectPic_Kecleon_1),
-    obj_frame_tiles(gEventObjectPic_Kecleon_2),
-    obj_frame_tiles(gEventObjectPic_Kecleon_0),
-    obj_frame_tiles(gEventObjectPic_Kecleon_0),
-    obj_frame_tiles(gEventObjectPic_Kecleon_1),
-    obj_frame_tiles(gEventObjectPic_Kecleon_1),
-    obj_frame_tiles(gEventObjectPic_Kecleon_2),
-    obj_frame_tiles(gEventObjectPic_Kecleon_2),
+    overworld_frame(gEventObjectPic_Kecleon, 16, 16, 0),
+    overworld_frame(gEventObjectPic_Kecleon, 16, 16, 1),
+    overworld_frame(gEventObjectPic_Kecleon, 16, 16, 2),
+    overworld_frame(gEventObjectPic_Kecleon, 16, 16, 0),
+    overworld_frame(gEventObjectPic_Kecleon, 16, 16, 0),
+    overworld_frame(gEventObjectPic_Kecleon, 16, 16, 1),
+    overworld_frame(gEventObjectPic_Kecleon, 16, 16, 1),
+    overworld_frame(gEventObjectPic_Kecleon, 16, 16, 2),
+    overworld_frame(gEventObjectPic_Kecleon, 16, 16, 2),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_Rayquaza[] = {
-    obj_frame_tiles(gEventObjectPic_Rayquaza_0),
-    obj_frame_tiles(gEventObjectPic_Rayquaza_1),
-    obj_frame_tiles(gEventObjectPic_Rayquaza_2),
-    obj_frame_tiles(gEventObjectPic_Rayquaza_3),
-    obj_frame_tiles(gEventObjectPic_Rayquaza_4),
+    overworld_frame(gEventObjectPic_Rayquaza, 64, 64, 0),
+    overworld_frame(gEventObjectPic_Rayquaza, 64, 64, 1),
+    overworld_frame(gEventObjectPic_Rayquaza, 64, 64, 2),
+    overworld_frame(gEventObjectPic_Rayquaza, 64, 64, 3),
+    overworld_frame(gEventObjectPic_Rayquaza, 64, 64, 4),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_RayquazaStill[] = {
@@ -1821,123 +1821,123 @@ const struct SpriteFrameImage gEventObjectPicTable_RayquazaStill[] = {
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_Zigzagoon[] = {
-    obj_frame_tiles(gEventObjectPic_Zigzagoon_0),
-    obj_frame_tiles(gEventObjectPic_Zigzagoon_1),
-    obj_frame_tiles(gEventObjectPic_Zigzagoon_2),
-    obj_frame_tiles(gEventObjectPic_Zigzagoon_0),
-    obj_frame_tiles(gEventObjectPic_Zigzagoon_0),
-    obj_frame_tiles(gEventObjectPic_Zigzagoon_1),
-    obj_frame_tiles(gEventObjectPic_Zigzagoon_1),
-    obj_frame_tiles(gEventObjectPic_Zigzagoon_2),
-    obj_frame_tiles(gEventObjectPic_Zigzagoon_2),
+    overworld_frame(gEventObjectPic_Zigzagoon, 16, 16, 0),
+    overworld_frame(gEventObjectPic_Zigzagoon, 16, 16, 1),
+    overworld_frame(gEventObjectPic_Zigzagoon, 16, 16, 2),
+    overworld_frame(gEventObjectPic_Zigzagoon, 16, 16, 0),
+    overworld_frame(gEventObjectPic_Zigzagoon, 16, 16, 0),
+    overworld_frame(gEventObjectPic_Zigzagoon, 16, 16, 1),
+    overworld_frame(gEventObjectPic_Zigzagoon, 16, 16, 1),
+    overworld_frame(gEventObjectPic_Zigzagoon, 16, 16, 2),
+    overworld_frame(gEventObjectPic_Zigzagoon, 16, 16, 2),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_Pikachu[] = {
-    obj_frame_tiles(gEventObjectPic_Pikachu_0),
-    obj_frame_tiles(gEventObjectPic_Pikachu_1),
-    obj_frame_tiles(gEventObjectPic_Pikachu_2),
-    obj_frame_tiles(gEventObjectPic_Pikachu_0),
-    obj_frame_tiles(gEventObjectPic_Pikachu_0),
-    obj_frame_tiles(gEventObjectPic_Pikachu_1),
-    obj_frame_tiles(gEventObjectPic_Pikachu_1),
-    obj_frame_tiles(gEventObjectPic_Pikachu_2),
-    obj_frame_tiles(gEventObjectPic_Pikachu_2),
+    overworld_frame(gEventObjectPic_Pikachu, 16, 16, 0),
+    overworld_frame(gEventObjectPic_Pikachu, 16, 16, 1),
+    overworld_frame(gEventObjectPic_Pikachu, 16, 16, 2),
+    overworld_frame(gEventObjectPic_Pikachu, 16, 16, 0),
+    overworld_frame(gEventObjectPic_Pikachu, 16, 16, 0),
+    overworld_frame(gEventObjectPic_Pikachu, 16, 16, 1),
+    overworld_frame(gEventObjectPic_Pikachu, 16, 16, 1),
+    overworld_frame(gEventObjectPic_Pikachu, 16, 16, 2),
+    overworld_frame(gEventObjectPic_Pikachu, 16, 16, 2),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_Azumarill[] = {
-    obj_frame_tiles(gEventObjectPic_Azumarill_0),
-    obj_frame_tiles(gEventObjectPic_Azumarill_1),
-    obj_frame_tiles(gEventObjectPic_Azumarill_2),
-    obj_frame_tiles(gEventObjectPic_Azumarill_0),
-    obj_frame_tiles(gEventObjectPic_Azumarill_0),
-    obj_frame_tiles(gEventObjectPic_Azumarill_1),
-    obj_frame_tiles(gEventObjectPic_Azumarill_1),
-    obj_frame_tiles(gEventObjectPic_Azumarill_2),
-    obj_frame_tiles(gEventObjectPic_Azumarill_2),
+    overworld_frame(gEventObjectPic_Azumarill, 16, 16, 0),
+    overworld_frame(gEventObjectPic_Azumarill, 16, 16, 1),
+    overworld_frame(gEventObjectPic_Azumarill, 16, 16, 2),
+    overworld_frame(gEventObjectPic_Azumarill, 16, 16, 0),
+    overworld_frame(gEventObjectPic_Azumarill, 16, 16, 0),
+    overworld_frame(gEventObjectPic_Azumarill, 16, 16, 1),
+    overworld_frame(gEventObjectPic_Azumarill, 16, 16, 1),
+    overworld_frame(gEventObjectPic_Azumarill, 16, 16, 2),
+    overworld_frame(gEventObjectPic_Azumarill, 16, 16, 2),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_Wingull[] = {
-    obj_frame_tiles(gEventObjectPic_Wingull_0),
-    obj_frame_tiles(gEventObjectPic_Wingull_1),
-    obj_frame_tiles(gEventObjectPic_Wingull_2),
-    obj_frame_tiles(gEventObjectPic_Wingull_3),
-    obj_frame_tiles(gEventObjectPic_Wingull_3),
-    obj_frame_tiles(gEventObjectPic_Wingull_4),
-    obj_frame_tiles(gEventObjectPic_Wingull_4),
-    obj_frame_tiles(gEventObjectPic_Wingull_5),
-    obj_frame_tiles(gEventObjectPic_Wingull_5),
+    overworld_frame(gEventObjectPic_Wingull, 16, 16, 0),
+    overworld_frame(gEventObjectPic_Wingull, 16, 16, 2),
+    overworld_frame(gEventObjectPic_Wingull, 16, 16, 4),
+    overworld_frame(gEventObjectPic_Wingull, 16, 16, 1),
+    overworld_frame(gEventObjectPic_Wingull, 16, 16, 1),
+    overworld_frame(gEventObjectPic_Wingull, 16, 16, 3),
+    overworld_frame(gEventObjectPic_Wingull, 16, 16, 3),
+    overworld_frame(gEventObjectPic_Wingull, 16, 16, 5),
+    overworld_frame(gEventObjectPic_Wingull, 16, 16, 5),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_TuberMSwimming[] = {
-    obj_frame_tiles(gEventObjectPic_TuberMSwimming_0),
-    obj_frame_tiles(gEventObjectPic_TuberMSwimming_1),
-    obj_frame_tiles(gEventObjectPic_TuberMSwimming_2),
-    obj_frame_tiles(gEventObjectPic_TuberMSwimming_3),
-    obj_frame_tiles(gEventObjectPic_TuberMSwimming_4),
-    obj_frame_tiles(gEventObjectPic_TuberMSwimming_5),
-    obj_frame_tiles(gEventObjectPic_TuberMSwimming_6),
-    obj_frame_tiles(gEventObjectPic_TuberMSwimming_7),
-    obj_frame_tiles(gEventObjectPic_TuberMSwimming_8),
+    overworld_frame(gEventObjectPic_TuberMSwimming, 16, 16, 0),
+    overworld_frame(gEventObjectPic_TuberMSwimming, 16, 16, 1),
+    overworld_frame(gEventObjectPic_TuberMSwimming, 16, 16, 2),
+    overworld_frame(gEventObjectPic_TuberMSwimming, 16, 16, 3),
+    overworld_frame(gEventObjectPic_TuberMSwimming, 16, 16, 4),
+    overworld_frame(gEventObjectPic_TuberMSwimming, 16, 16, 5),
+    overworld_frame(gEventObjectPic_TuberMSwimming, 16, 16, 6),
+    overworld_frame(gEventObjectPic_TuberMSwimming, 16, 16, 7),
+    overworld_frame(gEventObjectPic_TuberMSwimming, 16, 16, 8),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_Azurill[] = {
-    obj_frame_tiles(gEventObjectPic_Azurill_0),
-    obj_frame_tiles(gEventObjectPic_Azurill_1),
-    obj_frame_tiles(gEventObjectPic_Azurill_2),
-    obj_frame_tiles(gEventObjectPic_Azurill_0),
-    obj_frame_tiles(gEventObjectPic_Azurill_0),
-    obj_frame_tiles(gEventObjectPic_Azurill_1),
-    obj_frame_tiles(gEventObjectPic_Azurill_1),
-    obj_frame_tiles(gEventObjectPic_Azurill_2),
-    obj_frame_tiles(gEventObjectPic_Azurill_2),
+    overworld_frame(gEventObjectPic_Azurill, 16, 16, 0),
+    overworld_frame(gEventObjectPic_Azurill, 16, 16, 1),
+    overworld_frame(gEventObjectPic_Azurill, 16, 16, 2),
+    overworld_frame(gEventObjectPic_Azurill, 16, 16, 0),
+    overworld_frame(gEventObjectPic_Azurill, 16, 16, 0),
+    overworld_frame(gEventObjectPic_Azurill, 16, 16, 1),
+    overworld_frame(gEventObjectPic_Azurill, 16, 16, 1),
+    overworld_frame(gEventObjectPic_Azurill, 16, 16, 2),
+    overworld_frame(gEventObjectPic_Azurill, 16, 16, 2),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_Mom[] = {
-    obj_frame_tiles(gEventObjectPic_Mom_0),
-    obj_frame_tiles(gEventObjectPic_Mom_1),
-    obj_frame_tiles(gEventObjectPic_Mom_2),
-    obj_frame_tiles(gEventObjectPic_Mom_3),
-    obj_frame_tiles(gEventObjectPic_Mom_4),
-    obj_frame_tiles(gEventObjectPic_Mom_5),
-    obj_frame_tiles(gEventObjectPic_Mom_6),
-    obj_frame_tiles(gEventObjectPic_Mom_7),
-    obj_frame_tiles(gEventObjectPic_Mom_8),
+    overworld_frame(gEventObjectPic_Mom, 16, 32, 0),
+    overworld_frame(gEventObjectPic_Mom, 16, 32, 1),
+    overworld_frame(gEventObjectPic_Mom, 16, 32, 2),
+    overworld_frame(gEventObjectPic_Mom, 16, 32, 3),
+    overworld_frame(gEventObjectPic_Mom, 16, 32, 4),
+    overworld_frame(gEventObjectPic_Mom, 16, 32, 5),
+    overworld_frame(gEventObjectPic_Mom, 16, 32, 6),
+    overworld_frame(gEventObjectPic_Mom, 16, 32, 7),
+    overworld_frame(gEventObjectPic_Mom, 16, 32, 8),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_Scott[] = {
-    obj_frame_tiles(gEventObjectPic_Scott_0),
-    obj_frame_tiles(gEventObjectPic_Scott_1),
-    obj_frame_tiles(gEventObjectPic_Scott_2),
-    obj_frame_tiles(gEventObjectPic_Scott_3),
-    obj_frame_tiles(gEventObjectPic_Scott_4),
-    obj_frame_tiles(gEventObjectPic_Scott_5),
-    obj_frame_tiles(gEventObjectPic_Scott_6),
-    obj_frame_tiles(gEventObjectPic_Scott_7),
-    obj_frame_tiles(gEventObjectPic_Scott_8),
+    overworld_frame(gEventObjectPic_Scott, 16, 32, 0),
+    overworld_frame(gEventObjectPic_Scott, 16, 32, 1),
+    overworld_frame(gEventObjectPic_Scott, 16, 32, 2),
+    overworld_frame(gEventObjectPic_Scott, 16, 32, 3),
+    overworld_frame(gEventObjectPic_Scott, 16, 32, 4),
+    overworld_frame(gEventObjectPic_Scott, 16, 32, 5),
+    overworld_frame(gEventObjectPic_Scott, 16, 32, 6),
+    overworld_frame(gEventObjectPic_Scott, 16, 32, 7),
+    overworld_frame(gEventObjectPic_Scott, 16, 32, 8),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_Juan[] = {
-    obj_frame_tiles(gEventObjectPic_Juan_0),
-    obj_frame_tiles(gEventObjectPic_Juan_1),
-    obj_frame_tiles(gEventObjectPic_Juan_2),
-    obj_frame_tiles(gEventObjectPic_Juan_3),
-    obj_frame_tiles(gEventObjectPic_Juan_4),
-    obj_frame_tiles(gEventObjectPic_Juan_5),
-    obj_frame_tiles(gEventObjectPic_Juan_6),
-    obj_frame_tiles(gEventObjectPic_Juan_7),
-    obj_frame_tiles(gEventObjectPic_Juan_8),
+    overworld_frame(gEventObjectPic_Juan, 16, 32, 0),
+    overworld_frame(gEventObjectPic_Juan, 16, 32, 1),
+    overworld_frame(gEventObjectPic_Juan, 16, 32, 2),
+    overworld_frame(gEventObjectPic_Juan, 16, 32, 3),
+    overworld_frame(gEventObjectPic_Juan, 16, 32, 4),
+    overworld_frame(gEventObjectPic_Juan, 16, 32, 5),
+    overworld_frame(gEventObjectPic_Juan, 16, 32, 6),
+    overworld_frame(gEventObjectPic_Juan, 16, 32, 7),
+    overworld_frame(gEventObjectPic_Juan, 16, 32, 8),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_MysteryEventDeliveryman[] = {
-    obj_frame_tiles(gEventObjectPic_MysteryEventDeliveryman_0),
-    obj_frame_tiles(gEventObjectPic_MysteryEventDeliveryman_1),
-    obj_frame_tiles(gEventObjectPic_MysteryEventDeliveryman_2),
-    obj_frame_tiles(gEventObjectPic_MysteryEventDeliveryman_0),
-    obj_frame_tiles(gEventObjectPic_MysteryEventDeliveryman_0),
-    obj_frame_tiles(gEventObjectPic_MysteryEventDeliveryman_1),
-    obj_frame_tiles(gEventObjectPic_MysteryEventDeliveryman_1),
-    obj_frame_tiles(gEventObjectPic_MysteryEventDeliveryman_2),
-    obj_frame_tiles(gEventObjectPic_MysteryEventDeliveryman_2),
+    overworld_frame(gEventObjectPic_MysteryEventDeliveryman, 16, 32, 0),
+    overworld_frame(gEventObjectPic_MysteryEventDeliveryman, 16, 32, 1),
+    overworld_frame(gEventObjectPic_MysteryEventDeliveryman, 16, 32, 2),
+    overworld_frame(gEventObjectPic_MysteryEventDeliveryman, 16, 32, 0),
+    overworld_frame(gEventObjectPic_MysteryEventDeliveryman, 16, 32, 0),
+    overworld_frame(gEventObjectPic_MysteryEventDeliveryman, 16, 32, 1),
+    overworld_frame(gEventObjectPic_MysteryEventDeliveryman, 16, 32, 1),
+    overworld_frame(gEventObjectPic_MysteryEventDeliveryman, 16, 32, 2),
+    overworld_frame(gEventObjectPic_MysteryEventDeliveryman, 16, 32, 2),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_Statue[] = {
@@ -1945,99 +1945,99 @@ const struct SpriteFrameImage gEventObjectPicTable_Statue[] = {
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_Dusclops[] = {
-    obj_frame_tiles(gEventObjectPic_Dusclops_0),
-    obj_frame_tiles(gEventObjectPic_Dusclops_1),
-    obj_frame_tiles(gEventObjectPic_Dusclops_2),
-    obj_frame_tiles(gEventObjectPic_Dusclops_3),
-    obj_frame_tiles(gEventObjectPic_Dusclops_4),
-    obj_frame_tiles(gEventObjectPic_Dusclops_5),
-    obj_frame_tiles(gEventObjectPic_Dusclops_6),
-    obj_frame_tiles(gEventObjectPic_Dusclops_7),
-    obj_frame_tiles(gEventObjectPic_Dusclops_8),
+    overworld_frame(gEventObjectPic_Dusclops, 16, 32, 0),
+    overworld_frame(gEventObjectPic_Dusclops, 16, 32, 1),
+    overworld_frame(gEventObjectPic_Dusclops, 16, 32, 2),
+    overworld_frame(gEventObjectPic_Dusclops, 16, 32, 3),
+    overworld_frame(gEventObjectPic_Dusclops, 16, 32, 4),
+    overworld_frame(gEventObjectPic_Dusclops, 16, 32, 5),
+    overworld_frame(gEventObjectPic_Dusclops, 16, 32, 6),
+    overworld_frame(gEventObjectPic_Dusclops, 16, 32, 7),
+    overworld_frame(gEventObjectPic_Dusclops, 16, 32, 8),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_Kirlia[] = {
-    obj_frame_tiles(gEventObjectPic_Kirlia_0),
-    obj_frame_tiles(gEventObjectPic_Kirlia_1),
-    obj_frame_tiles(gEventObjectPic_Kirlia_2),
-    obj_frame_tiles(gEventObjectPic_Kirlia_3),
-    obj_frame_tiles(gEventObjectPic_Kirlia_4),
-    obj_frame_tiles(gEventObjectPic_Kirlia_5),
-    obj_frame_tiles(gEventObjectPic_Kirlia_6),
-    obj_frame_tiles(gEventObjectPic_Kirlia_7),
-    obj_frame_tiles(gEventObjectPic_Kirlia_8),
+    overworld_frame(gEventObjectPic_Kirlia, 16, 32, 0),
+    overworld_frame(gEventObjectPic_Kirlia, 16, 32, 1),
+    overworld_frame(gEventObjectPic_Kirlia, 16, 32, 2),
+    overworld_frame(gEventObjectPic_Kirlia, 16, 32, 3),
+    overworld_frame(gEventObjectPic_Kirlia, 16, 32, 4),
+    overworld_frame(gEventObjectPic_Kirlia, 16, 32, 5),
+    overworld_frame(gEventObjectPic_Kirlia, 16, 32, 6),
+    overworld_frame(gEventObjectPic_Kirlia, 16, 32, 7),
+    overworld_frame(gEventObjectPic_Kirlia, 16, 32, 8),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_UnionRoomAttendant[] = {
-    obj_frame_tiles(gEventObjectPic_UnionRoomAttendant_0),
-    obj_frame_tiles(gEventObjectPic_UnionRoomAttendant_1),
-    obj_frame_tiles(gEventObjectPic_UnionRoomAttendant_2),
-    obj_frame_tiles(gEventObjectPic_UnionRoomAttendant_0),
-    obj_frame_tiles(gEventObjectPic_UnionRoomAttendant_0),
-    obj_frame_tiles(gEventObjectPic_UnionRoomAttendant_1),
-    obj_frame_tiles(gEventObjectPic_UnionRoomAttendant_1),
-    obj_frame_tiles(gEventObjectPic_UnionRoomAttendant_2),
-    obj_frame_tiles(gEventObjectPic_UnionRoomAttendant_2),
+    overworld_frame(gEventObjectPic_UnionRoomAttendant, 16, 32, 0),
+    overworld_frame(gEventObjectPic_UnionRoomAttendant, 16, 32, 1),
+    overworld_frame(gEventObjectPic_UnionRoomAttendant, 16, 32, 2),
+    overworld_frame(gEventObjectPic_UnionRoomAttendant, 16, 32, 0),
+    overworld_frame(gEventObjectPic_UnionRoomAttendant, 16, 32, 0),
+    overworld_frame(gEventObjectPic_UnionRoomAttendant, 16, 32, 1),
+    overworld_frame(gEventObjectPic_UnionRoomAttendant, 16, 32, 1),
+    overworld_frame(gEventObjectPic_UnionRoomAttendant, 16, 32, 2),
+    overworld_frame(gEventObjectPic_UnionRoomAttendant, 16, 32, 2),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_Sudowoodo[] = {
-    obj_frame_tiles(gEventObjectPic_Sudowoodo_0),
-    obj_frame_tiles(gEventObjectPic_Sudowoodo_0),
-    obj_frame_tiles(gEventObjectPic_Sudowoodo_1),
-    obj_frame_tiles(gEventObjectPic_Sudowoodo_0),
-    obj_frame_tiles(gEventObjectPic_Sudowoodo_0),
-    obj_frame_tiles(gEventObjectPic_Sudowoodo_0),
-    obj_frame_tiles(gEventObjectPic_Sudowoodo_0),
-    obj_frame_tiles(gEventObjectPic_Sudowoodo_1),
-    obj_frame_tiles(gEventObjectPic_Sudowoodo_2),
+    overworld_frame(gEventObjectPic_Sudowoodo, 16, 32, 0),
+    overworld_frame(gEventObjectPic_Sudowoodo, 16, 32, 0),
+    overworld_frame(gEventObjectPic_Sudowoodo, 16, 32, 1),
+    overworld_frame(gEventObjectPic_Sudowoodo, 16, 32, 0),
+    overworld_frame(gEventObjectPic_Sudowoodo, 16, 32, 0),
+    overworld_frame(gEventObjectPic_Sudowoodo, 16, 32, 0),
+    overworld_frame(gEventObjectPic_Sudowoodo, 16, 32, 0),
+    overworld_frame(gEventObjectPic_Sudowoodo, 16, 32, 1),
+    overworld_frame(gEventObjectPic_Sudowoodo, 16, 32, 2),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_Mew[] = {
-    obj_frame_tiles(gEventObjectPic_Mew_0),
-    obj_frame_tiles(gEventObjectPic_Mew_1),
-    obj_frame_tiles(gEventObjectPic_Mew_2),
-    obj_frame_tiles(gEventObjectPic_Mew_3),
-    obj_frame_tiles(gEventObjectPic_Mew_4),
-    obj_frame_tiles(gEventObjectPic_Mew_5),
-    obj_frame_tiles(gEventObjectPic_Mew_6),
-    obj_frame_tiles(gEventObjectPic_Mew_7),
-    obj_frame_tiles(gEventObjectPic_Mew_8),
+    overworld_frame(gEventObjectPic_Mew, 16, 32, 0),
+    overworld_frame(gEventObjectPic_Mew, 16, 32, 1),
+    overworld_frame(gEventObjectPic_Mew, 16, 32, 2),
+    overworld_frame(gEventObjectPic_Mew, 16, 32, 3),
+    overworld_frame(gEventObjectPic_Mew, 16, 32, 4),
+    overworld_frame(gEventObjectPic_Mew, 16, 32, 5),
+    overworld_frame(gEventObjectPic_Mew, 16, 32, 6),
+    overworld_frame(gEventObjectPic_Mew, 16, 32, 7),
+    overworld_frame(gEventObjectPic_Mew, 16, 32, 8),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_Red[] = {
-    obj_frame_tiles(gEventObjectPic_Red_0),
-    obj_frame_tiles(gEventObjectPic_Red_1),
-    obj_frame_tiles(gEventObjectPic_Red_2),
-    obj_frame_tiles(gEventObjectPic_Red_3),
-    obj_frame_tiles(gEventObjectPic_Red_4),
-    obj_frame_tiles(gEventObjectPic_Red_5),
-    obj_frame_tiles(gEventObjectPic_Red_6),
-    obj_frame_tiles(gEventObjectPic_Red_7),
-    obj_frame_tiles(gEventObjectPic_Red_8),
+    overworld_frame(gEventObjectPic_Red, 16, 32, 0),
+    overworld_frame(gEventObjectPic_Red, 16, 32, 1),
+    overworld_frame(gEventObjectPic_Red, 16, 32, 2),
+    overworld_frame(gEventObjectPic_Red, 16, 32, 3),
+    overworld_frame(gEventObjectPic_Red, 16, 32, 4),
+    overworld_frame(gEventObjectPic_Red, 16, 32, 5),
+    overworld_frame(gEventObjectPic_Red, 16, 32, 6),
+    overworld_frame(gEventObjectPic_Red, 16, 32, 7),
+    overworld_frame(gEventObjectPic_Red, 16, 32, 8),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_Leaf[] = {
-    obj_frame_tiles(gEventObjectPic_Leaf_0),
-    obj_frame_tiles(gEventObjectPic_Leaf_1),
-    obj_frame_tiles(gEventObjectPic_Leaf_2),
-    obj_frame_tiles(gEventObjectPic_Leaf_3),
-    obj_frame_tiles(gEventObjectPic_Leaf_4),
-    obj_frame_tiles(gEventObjectPic_Leaf_5),
-    obj_frame_tiles(gEventObjectPic_Leaf_6),
-    obj_frame_tiles(gEventObjectPic_Leaf_7),
-    obj_frame_tiles(gEventObjectPic_Leaf_8),
+    overworld_frame(gEventObjectPic_Leaf, 16, 32, 0),
+    overworld_frame(gEventObjectPic_Leaf, 16, 32, 1),
+    overworld_frame(gEventObjectPic_Leaf, 16, 32, 2),
+    overworld_frame(gEventObjectPic_Leaf, 16, 32, 3),
+    overworld_frame(gEventObjectPic_Leaf, 16, 32, 4),
+    overworld_frame(gEventObjectPic_Leaf, 16, 32, 5),
+    overworld_frame(gEventObjectPic_Leaf, 16, 32, 6),
+    overworld_frame(gEventObjectPic_Leaf, 16, 32, 7),
+    overworld_frame(gEventObjectPic_Leaf, 16, 32, 8),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_Deoxys[] = {
-    obj_frame_tiles(gEventObjectPic_Deoxys_0),
-    obj_frame_tiles(gEventObjectPic_Deoxys_0),
-    obj_frame_tiles(gEventObjectPic_Deoxys_0),
-    obj_frame_tiles(gEventObjectPic_Deoxys_0),
-    obj_frame_tiles(gEventObjectPic_Deoxys_1),
-    obj_frame_tiles(gEventObjectPic_Deoxys_0),
-    obj_frame_tiles(gEventObjectPic_Deoxys_1),
-    obj_frame_tiles(gEventObjectPic_Deoxys_0),
-    obj_frame_tiles(gEventObjectPic_Deoxys_0),
+    overworld_frame(gEventObjectPic_Deoxys, 32, 32, 0),
+    overworld_frame(gEventObjectPic_Deoxys, 32, 32, 0),
+    overworld_frame(gEventObjectPic_Deoxys, 32, 32, 0),
+    overworld_frame(gEventObjectPic_Deoxys, 32, 32, 0),
+    overworld_frame(gEventObjectPic_Deoxys, 32, 32, 1),
+    overworld_frame(gEventObjectPic_Deoxys, 32, 32, 0),
+    overworld_frame(gEventObjectPic_Deoxys, 32, 32, 1),
+    overworld_frame(gEventObjectPic_Deoxys, 32, 32, 0),
+    overworld_frame(gEventObjectPic_Deoxys, 32, 32, 0),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_BirthIslandStone[] = {
@@ -2045,135 +2045,135 @@ const struct SpriteFrameImage gEventObjectPicTable_BirthIslandStone[] = {
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_Anabel[] = {
-    obj_frame_tiles(gEventObjectPic_Anabel_0),
-    obj_frame_tiles(gEventObjectPic_Anabel_1),
-    obj_frame_tiles(gEventObjectPic_Anabel_2),
-    obj_frame_tiles(gEventObjectPic_Anabel_3),
-    obj_frame_tiles(gEventObjectPic_Anabel_4),
-    obj_frame_tiles(gEventObjectPic_Anabel_5),
-    obj_frame_tiles(gEventObjectPic_Anabel_6),
-    obj_frame_tiles(gEventObjectPic_Anabel_7),
-    obj_frame_tiles(gEventObjectPic_Anabel_8),
+    overworld_frame(gEventObjectPic_Anabel, 16, 32, 0),
+    overworld_frame(gEventObjectPic_Anabel, 16, 32, 1),
+    overworld_frame(gEventObjectPic_Anabel, 16, 32, 2),
+    overworld_frame(gEventObjectPic_Anabel, 16, 32, 3),
+    overworld_frame(gEventObjectPic_Anabel, 16, 32, 4),
+    overworld_frame(gEventObjectPic_Anabel, 16, 32, 5),
+    overworld_frame(gEventObjectPic_Anabel, 16, 32, 6),
+    overworld_frame(gEventObjectPic_Anabel, 16, 32, 7),
+    overworld_frame(gEventObjectPic_Anabel, 16, 32, 8),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_Tucker[] = {
-    obj_frame_tiles(gEventObjectPic_Tucker_0),
-    obj_frame_tiles(gEventObjectPic_Tucker_1),
-    obj_frame_tiles(gEventObjectPic_Tucker_2),
-    obj_frame_tiles(gEventObjectPic_Tucker_3),
-    obj_frame_tiles(gEventObjectPic_Tucker_4),
-    obj_frame_tiles(gEventObjectPic_Tucker_5),
-    obj_frame_tiles(gEventObjectPic_Tucker_6),
-    obj_frame_tiles(gEventObjectPic_Tucker_7),
-    obj_frame_tiles(gEventObjectPic_Tucker_8),
+    overworld_frame(gEventObjectPic_Tucker, 16, 32, 0),
+    overworld_frame(gEventObjectPic_Tucker, 16, 32, 1),
+    overworld_frame(gEventObjectPic_Tucker, 16, 32, 2),
+    overworld_frame(gEventObjectPic_Tucker, 16, 32, 3),
+    overworld_frame(gEventObjectPic_Tucker, 16, 32, 4),
+    overworld_frame(gEventObjectPic_Tucker, 16, 32, 5),
+    overworld_frame(gEventObjectPic_Tucker, 16, 32, 6),
+    overworld_frame(gEventObjectPic_Tucker, 16, 32, 7),
+    overworld_frame(gEventObjectPic_Tucker, 16, 32, 8),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_Spenser[] = {
-    obj_frame_tiles(gEventObjectPic_Spenser_0),
-    obj_frame_tiles(gEventObjectPic_Spenser_1),
-    obj_frame_tiles(gEventObjectPic_Spenser_2),
-    obj_frame_tiles(gEventObjectPic_Spenser_3),
-    obj_frame_tiles(gEventObjectPic_Spenser_4),
-    obj_frame_tiles(gEventObjectPic_Spenser_5),
-    obj_frame_tiles(gEventObjectPic_Spenser_6),
-    obj_frame_tiles(gEventObjectPic_Spenser_7),
-    obj_frame_tiles(gEventObjectPic_Spenser_8),
+    overworld_frame(gEventObjectPic_Spenser, 16, 32, 0),
+    overworld_frame(gEventObjectPic_Spenser, 16, 32, 1),
+    overworld_frame(gEventObjectPic_Spenser, 16, 32, 2),
+    overworld_frame(gEventObjectPic_Spenser, 16, 32, 3),
+    overworld_frame(gEventObjectPic_Spenser, 16, 32, 4),
+    overworld_frame(gEventObjectPic_Spenser, 16, 32, 5),
+    overworld_frame(gEventObjectPic_Spenser, 16, 32, 6),
+    overworld_frame(gEventObjectPic_Spenser, 16, 32, 7),
+    overworld_frame(gEventObjectPic_Spenser, 16, 32, 8),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_Greta[] = {
-    obj_frame_tiles(gEventObjectPic_Greta_0),
-    obj_frame_tiles(gEventObjectPic_Greta_1),
-    obj_frame_tiles(gEventObjectPic_Greta_2),
-    obj_frame_tiles(gEventObjectPic_Greta_3),
-    obj_frame_tiles(gEventObjectPic_Greta_4),
-    obj_frame_tiles(gEventObjectPic_Greta_5),
-    obj_frame_tiles(gEventObjectPic_Greta_6),
-    obj_frame_tiles(gEventObjectPic_Greta_7),
-    obj_frame_tiles(gEventObjectPic_Greta_8),
+    overworld_frame(gEventObjectPic_Greta, 16, 32, 0),
+    overworld_frame(gEventObjectPic_Greta, 16, 32, 1),
+    overworld_frame(gEventObjectPic_Greta, 16, 32, 2),
+    overworld_frame(gEventObjectPic_Greta, 16, 32, 3),
+    overworld_frame(gEventObjectPic_Greta, 16, 32, 4),
+    overworld_frame(gEventObjectPic_Greta, 16, 32, 5),
+    overworld_frame(gEventObjectPic_Greta, 16, 32, 6),
+    overworld_frame(gEventObjectPic_Greta, 16, 32, 7),
+    overworld_frame(gEventObjectPic_Greta, 16, 32, 8),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_Noland[] = {
-    obj_frame_tiles(gEventObjectPic_Noland_0),
-    obj_frame_tiles(gEventObjectPic_Noland_1),
-    obj_frame_tiles(gEventObjectPic_Noland_2),
-    obj_frame_tiles(gEventObjectPic_Noland_3),
-    obj_frame_tiles(gEventObjectPic_Noland_4),
-    obj_frame_tiles(gEventObjectPic_Noland_5),
-    obj_frame_tiles(gEventObjectPic_Noland_6),
-    obj_frame_tiles(gEventObjectPic_Noland_7),
-    obj_frame_tiles(gEventObjectPic_Noland_8),
+    overworld_frame(gEventObjectPic_Noland, 16, 32, 0),
+    overworld_frame(gEventObjectPic_Noland, 16, 32, 1),
+    overworld_frame(gEventObjectPic_Noland, 16, 32, 2),
+    overworld_frame(gEventObjectPic_Noland, 16, 32, 3),
+    overworld_frame(gEventObjectPic_Noland, 16, 32, 4),
+    overworld_frame(gEventObjectPic_Noland, 16, 32, 5),
+    overworld_frame(gEventObjectPic_Noland, 16, 32, 6),
+    overworld_frame(gEventObjectPic_Noland, 16, 32, 7),
+    overworld_frame(gEventObjectPic_Noland, 16, 32, 8),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_Lucy[] = {
-    obj_frame_tiles(gEventObjectPic_Lucy_0),
-    obj_frame_tiles(gEventObjectPic_Lucy_1),
-    obj_frame_tiles(gEventObjectPic_Lucy_2),
-    obj_frame_tiles(gEventObjectPic_Lucy_3),
-    obj_frame_tiles(gEventObjectPic_Lucy_4),
-    obj_frame_tiles(gEventObjectPic_Lucy_5),
-    obj_frame_tiles(gEventObjectPic_Lucy_6),
-    obj_frame_tiles(gEventObjectPic_Lucy_7),
-    obj_frame_tiles(gEventObjectPic_Lucy_8),
+    overworld_frame(gEventObjectPic_Lucy, 16, 32, 0),
+    overworld_frame(gEventObjectPic_Lucy, 16, 32, 1),
+    overworld_frame(gEventObjectPic_Lucy, 16, 32, 2),
+    overworld_frame(gEventObjectPic_Lucy, 16, 32, 3),
+    overworld_frame(gEventObjectPic_Lucy, 16, 32, 4),
+    overworld_frame(gEventObjectPic_Lucy, 16, 32, 5),
+    overworld_frame(gEventObjectPic_Lucy, 16, 32, 6),
+    overworld_frame(gEventObjectPic_Lucy, 16, 32, 7),
+    overworld_frame(gEventObjectPic_Lucy, 16, 32, 8),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_Brandon[] = {
-    obj_frame_tiles(gEventObjectPic_Brandon_0),
-    obj_frame_tiles(gEventObjectPic_Brandon_1),
-    obj_frame_tiles(gEventObjectPic_Brandon_2),
-    obj_frame_tiles(gEventObjectPic_Brandon_3),
-    obj_frame_tiles(gEventObjectPic_Brandon_4),
-    obj_frame_tiles(gEventObjectPic_Brandon_5),
-    obj_frame_tiles(gEventObjectPic_Brandon_6),
-    obj_frame_tiles(gEventObjectPic_Brandon_7),
-    obj_frame_tiles(gEventObjectPic_Brandon_8),
+    overworld_frame(gEventObjectPic_Brandon, 16, 32, 0),
+    overworld_frame(gEventObjectPic_Brandon, 16, 32, 1),
+    overworld_frame(gEventObjectPic_Brandon, 16, 32, 2),
+    overworld_frame(gEventObjectPic_Brandon, 16, 32, 3),
+    overworld_frame(gEventObjectPic_Brandon, 16, 32, 4),
+    overworld_frame(gEventObjectPic_Brandon, 16, 32, 5),
+    overworld_frame(gEventObjectPic_Brandon, 16, 32, 6),
+    overworld_frame(gEventObjectPic_Brandon, 16, 32, 7),
+    overworld_frame(gEventObjectPic_Brandon, 16, 32, 8),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_Lugia[] = {
-    obj_frame_tiles(gEventObjectPic_Lugia_0),
-    obj_frame_tiles(gEventObjectPic_Lugia_0),
-    obj_frame_tiles(gEventObjectPic_Lugia_0),
-    obj_frame_tiles(gEventObjectPic_Lugia_0),
-    obj_frame_tiles(gEventObjectPic_Lugia_1),
-    obj_frame_tiles(gEventObjectPic_Lugia_0),
-    obj_frame_tiles(gEventObjectPic_Lugia_1),
-    obj_frame_tiles(gEventObjectPic_Lugia_0),
-    obj_frame_tiles(gEventObjectPic_Lugia_1),
+    overworld_frame(gEventObjectPic_Lugia, 32, 32, 0),
+    overworld_frame(gEventObjectPic_Lugia, 32, 32, 0),
+    overworld_frame(gEventObjectPic_Lugia, 32, 32, 0),
+    overworld_frame(gEventObjectPic_Lugia, 32, 32, 0),
+    overworld_frame(gEventObjectPic_Lugia, 32, 32, 1),
+    overworld_frame(gEventObjectPic_Lugia, 32, 32, 0),
+    overworld_frame(gEventObjectPic_Lugia, 32, 32, 1),
+    overworld_frame(gEventObjectPic_Lugia, 32, 32, 0),
+    overworld_frame(gEventObjectPic_Lugia, 32, 32, 1),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_HoOh[] = {
-    obj_frame_tiles(gEventObjectPic_HoOh_0),
-    obj_frame_tiles(gEventObjectPic_HoOh_0),
-    obj_frame_tiles(gEventObjectPic_HoOh_0),
-    obj_frame_tiles(gEventObjectPic_HoOh_0),
-    obj_frame_tiles(gEventObjectPic_HoOh_1),
-    obj_frame_tiles(gEventObjectPic_HoOh_0),
-    obj_frame_tiles(gEventObjectPic_HoOh_1),
-    obj_frame_tiles(gEventObjectPic_HoOh_0),
-    obj_frame_tiles(gEventObjectPic_HoOh_1),
+    overworld_frame(gEventObjectPic_HoOh, 32, 32, 0),
+    overworld_frame(gEventObjectPic_HoOh, 32, 32, 0),
+    overworld_frame(gEventObjectPic_HoOh, 32, 32, 0),
+    overworld_frame(gEventObjectPic_HoOh, 32, 32, 0),
+    overworld_frame(gEventObjectPic_HoOh, 32, 32, 1),
+    overworld_frame(gEventObjectPic_HoOh, 32, 32, 0),
+    overworld_frame(gEventObjectPic_HoOh, 32, 32, 1),
+    overworld_frame(gEventObjectPic_HoOh, 32, 32, 0),
+    overworld_frame(gEventObjectPic_HoOh, 32, 32, 1),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_RubySapphireBrendan[] = {
-    obj_frame_tiles(gEventObjectPic_RubySapphireBrendan_0),
-    obj_frame_tiles(gEventObjectPic_RubySapphireBrendan_1),
-    obj_frame_tiles(gEventObjectPic_RubySapphireBrendan_2),
-    obj_frame_tiles(gEventObjectPic_RubySapphireBrendan_3),
-    obj_frame_tiles(gEventObjectPic_RubySapphireBrendan_4),
-    obj_frame_tiles(gEventObjectPic_RubySapphireBrendan_5),
-    obj_frame_tiles(gEventObjectPic_RubySapphireBrendan_6),
-    obj_frame_tiles(gEventObjectPic_RubySapphireBrendan_7),
-    obj_frame_tiles(gEventObjectPic_RubySapphireBrendan_8),
+    overworld_frame(gEventObjectPic_RubySapphireBrendanNormal, 16, 32, 0),
+    overworld_frame(gEventObjectPic_RubySapphireBrendanNormal, 16, 32, 1),
+    overworld_frame(gEventObjectPic_RubySapphireBrendanNormal, 16, 32, 2),
+    overworld_frame(gEventObjectPic_RubySapphireBrendanNormal, 16, 32, 3),
+    overworld_frame(gEventObjectPic_RubySapphireBrendanNormal, 16, 32, 4),
+    overworld_frame(gEventObjectPic_RubySapphireBrendanNormal, 16, 32, 5),
+    overworld_frame(gEventObjectPic_RubySapphireBrendanNormal, 16, 32, 6),
+    overworld_frame(gEventObjectPic_RubySapphireBrendanNormal, 16, 32, 7),
+    overworld_frame(gEventObjectPic_RubySapphireBrendanNormal, 16, 32, 8),
 };
 
 const struct SpriteFrameImage gEventObjectPicTable_RubySapphireMay[] = {
-    obj_frame_tiles(gEventObjectPic_RubySapphireMay_0),
-    obj_frame_tiles(gEventObjectPic_RubySapphireMay_1),
-    obj_frame_tiles(gEventObjectPic_RubySapphireMay_2),
-    obj_frame_tiles(gEventObjectPic_RubySapphireMay_3),
-    obj_frame_tiles(gEventObjectPic_RubySapphireMay_4),
-    obj_frame_tiles(gEventObjectPic_RubySapphireMay_5),
-    obj_frame_tiles(gEventObjectPic_RubySapphireMay_6),
-    obj_frame_tiles(gEventObjectPic_RubySapphireMay_7),
-    obj_frame_tiles(gEventObjectPic_RubySapphireMay_8),
+    overworld_frame(gEventObjectPic_RubySapphireMayNormal, 16, 32, 0),
+    overworld_frame(gEventObjectPic_RubySapphireMayNormal, 16, 32, 1),
+    overworld_frame(gEventObjectPic_RubySapphireMayNormal, 16, 32, 2),
+    overworld_frame(gEventObjectPic_RubySapphireMayNormal, 16, 32, 3),
+    overworld_frame(gEventObjectPic_RubySapphireMayNormal, 16, 32, 4),
+    overworld_frame(gEventObjectPic_RubySapphireMayNormal, 16, 32, 5),
+    overworld_frame(gEventObjectPic_RubySapphireMayNormal, 16, 32, 6),
+    overworld_frame(gEventObjectPic_RubySapphireMayNormal, 16, 32, 7),
+    overworld_frame(gEventObjectPic_RubySapphireMayNormal, 16, 32, 8),
 };
 
 #endif //GUARD_EVENT_OBJECT_PIC_TABLES_H
diff --git a/src/data/field_event_obj/field_effect_objects.h b/src/data/field_event_obj/field_effect_objects.h
index c8633daa7a..e8d15918f4 100755
--- a/src/data/field_event_obj/field_effect_objects.h
+++ b/src/data/field_event_obj/field_effect_objects.h
@@ -13,23 +13,23 @@ const union AnimCmd gFieldEffectObjectImageAnim_850C9D0[] =
 
 const union AnimCmd *const gFieldEffectObjectImageAnimTable_Shadow[] =
 {
-	gFieldEffectObjectImageAnim_850C9D0,
+    gFieldEffectObjectImageAnim_850C9D0,
 };
 
 const struct SpriteFrameImage gFieldEffectObjectPicTable_ShadowSmall[] = {
-	obj_frame_tiles(gFieldEffectObjectPic_ShadowSmall),
+    obj_frame_tiles(gFieldEffectObjectPic_ShadowSmall),
 };
 
 const struct SpriteFrameImage gFieldEffectObjectPicTable_ShadowMedium[] = {
-	obj_frame_tiles(gFieldEffectObjectPic_ShadowMedium),
+    obj_frame_tiles(gFieldEffectObjectPic_ShadowMedium),
 };
 
 const struct SpriteFrameImage gFieldEffectObjectPicTable_ShadowLarge[] = {
-	obj_frame_tiles(gFieldEffectObjectPic_ShadowLarge),
+    obj_frame_tiles(gFieldEffectObjectPic_ShadowLarge),
 };
 
 const struct SpriteFrameImage gFieldEffectObjectPicTable_ShadowExtraLarge[] = {
-	obj_frame_tiles(gFieldEffectObjectPic_ShadowExtraLarge),
+    obj_frame_tiles(gFieldEffectObjectPic_ShadowExtraLarge),
 };
 
 const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowSmall = {0xFFFF, 0xFFFF, &gEventObjectBaseOam_8x8, gFieldEffectObjectImageAnimTable_Shadow, gFieldEffectObjectPicTable_ShadowSmall, gDummySpriteAffineAnimTable, oamc_shadow};
@@ -41,11 +41,11 @@ const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowLarge = {0xFFFF, 0x
 const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowExtraLarge = {0xFFFF, 0xFFFF, &gEventObjectBaseOam_64x32, gFieldEffectObjectImageAnimTable_Shadow, gFieldEffectObjectPicTable_ShadowExtraLarge, gDummySpriteAffineAnimTable, oamc_shadow};
 
 const struct SpriteFrameImage gFieldEffectObjectPicTable_TallGrass[] = {
-	obj_frame_tiles(gFieldEffectObjectPic_TallGrass_0),
-	obj_frame_tiles(gFieldEffectObjectPic_TallGrass_1),
-	obj_frame_tiles(gFieldEffectObjectPic_TallGrass_2),
-	obj_frame_tiles(gFieldEffectObjectPic_TallGrass_3),
-	obj_frame_tiles(gFieldEffectObjectPic_TallGrass_4),
+    overworld_frame(gFieldEffectObjectPic_TallGrass, 16, 16, 0),
+    overworld_frame(gFieldEffectObjectPic_TallGrass, 16, 16, 1),
+    overworld_frame(gFieldEffectObjectPic_TallGrass, 16, 16, 2),
+    overworld_frame(gFieldEffectObjectPic_TallGrass, 16, 16, 3),
+    overworld_frame(gFieldEffectObjectPic_TallGrass, 16, 16, 4),
 };
 
 const union AnimCmd gFieldEffectObjectImageAnim_850CA84[] =
@@ -66,11 +66,11 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_TallGrass[] =
 const struct SpriteTemplate gFieldEffectObjectTemplate_TallGrass = {0xFFFF, 0x1005, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_TallGrass, gFieldEffectObjectPicTable_TallGrass, gDummySpriteAffineAnimTable, unc_grass_normal};
 
 const struct SpriteFrameImage gFieldEffectObjectPicTable_Ripple[] = {
-	obj_frame_tiles(gFieldEffectObjectPic_Ripple_0),
-	obj_frame_tiles(gFieldEffectObjectPic_Ripple_1),
-	obj_frame_tiles(gFieldEffectObjectPic_Ripple_2),
-	obj_frame_tiles(gFieldEffectObjectPic_Ripple_3),
-	obj_frame_tiles(gFieldEffectObjectPic_Ripple_4),
+    overworld_frame(gFieldEffectObjectPic_Ripple, 16, 16, 0),
+    overworld_frame(gFieldEffectObjectPic_Ripple, 16, 16, 1),
+    overworld_frame(gFieldEffectObjectPic_Ripple, 16, 16, 2),
+    overworld_frame(gFieldEffectObjectPic_Ripple, 16, 16, 3),
+    overworld_frame(gFieldEffectObjectPic_Ripple, 16, 16, 4),
 };
 
 const union AnimCmd gFieldEffectObjectImageAnim_850CAE0[] =
@@ -94,11 +94,11 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_Ripple[] =
 const struct SpriteTemplate gFieldEffectObjectTemplate_Ripple = {0xFFFF, 0x1005, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_Ripple, gFieldEffectObjectPicTable_Ripple, gDummySpriteAffineAnimTable, sub_81561D0};
 
 const struct SpriteFrameImage gFieldEffectObjectPicTable_Ash[] = {
-	obj_frame_tiles(gFieldEffectObjectPic_Ash_0),
-	obj_frame_tiles(gFieldEffectObjectPic_Ash_1),
-	obj_frame_tiles(gFieldEffectObjectPic_Ash_2),
-	obj_frame_tiles(gFieldEffectObjectPic_Ash_3),
-	obj_frame_tiles(gFieldEffectObjectPic_Ash_4),
+    overworld_frame(gFieldEffectObjectPic_Ash, 16, 16, 0),
+    overworld_frame(gFieldEffectObjectPic_Ash, 16, 16, 1),
+    overworld_frame(gFieldEffectObjectPic_Ash, 16, 16, 2),
+    overworld_frame(gFieldEffectObjectPic_Ash, 16, 16, 3),
+    overworld_frame(gFieldEffectObjectPic_Ash, 16, 16, 4),
 };
 
 const union AnimCmd gFieldEffectObjectImageAnim_850CB48[] =
@@ -119,9 +119,9 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_Ash[] =
 const struct SpriteTemplate gFieldEffectObjectTemplate_Ash = {0xFFFF, 0x1005, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_Ash, gFieldEffectObjectPicTable_Ash, gDummySpriteAffineAnimTable, sub_8155460};
 
 const struct SpriteFrameImage gFieldEffectObjectPicTable_SurfBlob[] = {
-	obj_frame_tiles(gFieldEffectObjectPic_SurfBlob_0),
-	obj_frame_tiles(gFieldEffectObjectPic_SurfBlob_1),
-	obj_frame_tiles(gFieldEffectObjectPic_SurfBlob_2),
+    overworld_frame(gFieldEffectObjectPic_SurfBlob, 32, 32, 0),
+    overworld_frame(gFieldEffectObjectPic_SurfBlob, 32, 32, 1),
+    overworld_frame(gFieldEffectObjectPic_SurfBlob, 32, 32, 2),
 };
 
 const union AnimCmd gFieldEffectObjectImageAnim_850CB94[] =
@@ -159,14 +159,14 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_SurfBlob[] =
 const struct SpriteTemplate gFieldEffectObjectTemplate_SurfBlob = {0xFFFF, 0xFFFF, &gEventObjectBaseOam_32x32, gFieldEffectObjectImageAnimTable_SurfBlob, gFieldEffectObjectPicTable_SurfBlob, gDummySpriteAffineAnimTable, sub_8155658};
 
 const struct SpriteFrameImage gFieldEffectObjectPicTable_Arrow[] = {
-	obj_frame_tiles(gFieldEffectObjectPic_Arrow_0),
-	obj_frame_tiles(gFieldEffectObjectPic_Arrow_1),
-	obj_frame_tiles(gFieldEffectObjectPic_Arrow_2),
-	obj_frame_tiles(gFieldEffectObjectPic_Arrow_3),
-	obj_frame_tiles(gFieldEffectObjectPic_Arrow_4),
-	obj_frame_tiles(gFieldEffectObjectPic_Arrow_5),
-	obj_frame_tiles(gFieldEffectObjectPic_Arrow_6),
-	obj_frame_tiles(gFieldEffectObjectPic_Arrow_7),
+    overworld_frame(gFieldEffectObjectPic_Arrow, 16, 16, 0),
+    overworld_frame(gFieldEffectObjectPic_Arrow, 16, 16, 1),
+    overworld_frame(gFieldEffectObjectPic_Arrow, 16, 16, 2),
+    overworld_frame(gFieldEffectObjectPic_Arrow, 16, 16, 3),
+    overworld_frame(gFieldEffectObjectPic_Arrow, 16, 16, 4),
+    overworld_frame(gFieldEffectObjectPic_Arrow, 16, 16, 5),
+    overworld_frame(gFieldEffectObjectPic_Arrow, 16, 16, 6),
+    overworld_frame(gFieldEffectObjectPic_Arrow, 16, 16, 7),
 };
 
 const union AnimCmd gFieldEffectObjectImageAnim_850CC1C[] =
@@ -208,9 +208,9 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_Arrow[] =
 const struct SpriteTemplate gFieldEffectObjectTemplate_Arrow = {0xFFFF, 0xFFFF, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_Arrow, gFieldEffectObjectPicTable_Arrow, gDummySpriteAffineAnimTable, SpriteCallbackDummy};
 
 const struct SpriteFrameImage gFieldEffectObjectPicTable_GroundImpactDust[] = {
-	obj_frame_tiles(gFieldEffectObjectPic_GroundImpactDust_0),
-	obj_frame_tiles(gFieldEffectObjectPic_GroundImpactDust_1),
-	obj_frame_tiles(gFieldEffectObjectPic_GroundImpactDust_2),
+    obj_frame_tiles(gFieldEffectObjectPic_GroundImpactDust_0),
+    obj_frame_tiles(gFieldEffectObjectPic_GroundImpactDust_1),
+    obj_frame_tiles(gFieldEffectObjectPic_GroundImpactDust_2),
 };
 
 const union AnimCmd gFieldEffectObjectImageAnim_850CC8C[] =
@@ -229,10 +229,10 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_GroundImpactDust[] =
 const struct SpriteTemplate gFieldEffectObjectTemplate_GroundImpactDust = {0xFFFF, 0x1004, &gEventObjectBaseOam_16x8, gFieldEffectObjectImageAnimTable_GroundImpactDust, gFieldEffectObjectPicTable_GroundImpactDust, gDummySpriteAffineAnimTable, sub_8156194};
 
 const struct SpriteFrameImage gFieldEffectObjectPicTable_BikeHopTallGrass[] = {
-	obj_frame_tiles(gFieldEffectObjectPic_BikeHopTallGrass_0),
-	obj_frame_tiles(gFieldEffectObjectPic_BikeHopTallGrass_1),
-	obj_frame_tiles(gFieldEffectObjectPic_BikeHopTallGrass_2),
-	obj_frame_tiles(gFieldEffectObjectPic_BikeHopTallGrass_3),
+    obj_frame_tiles(gFieldEffectObjectPic_BikeHopTallGrass_0),
+    obj_frame_tiles(gFieldEffectObjectPic_BikeHopTallGrass_1),
+    obj_frame_tiles(gFieldEffectObjectPic_BikeHopTallGrass_2),
+    obj_frame_tiles(gFieldEffectObjectPic_BikeHopTallGrass_3),
 };
 
 const union AnimCmd gFieldEffectObjectImageAnim_850CCD8[] =
@@ -252,8 +252,8 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_BikeHopTallGrass[] =
 const struct SpriteTemplate gFieldEffectObjectTemplate_BikeHopTallGrass = {0xFFFF, 0x1005, &gEventObjectBaseOam_16x8, gFieldEffectObjectImageAnimTable_BikeHopTallGrass, gFieldEffectObjectPicTable_BikeHopTallGrass, gDummySpriteAffineAnimTable, sub_8156194};
 
 const struct SpriteFrameImage gFieldEffectObjectPicTable_SandFootprints[] = {
-	obj_frame_tiles(gFieldEffectObjectPic_SandFootprints_0),
-	obj_frame_tiles(gFieldEffectObjectPic_SandFootprints_1),
+    obj_frame_tiles(gFieldEffectObjectPic_SandFootprints_0),
+    obj_frame_tiles(gFieldEffectObjectPic_SandFootprints_1),
 };
 
 const union AnimCmd gFieldEffectObjectImageAnim_850CD18[] =
@@ -292,8 +292,8 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_SandFootprints[] =
 const struct SpriteTemplate gFieldEffectObjectTemplate_SandFootprints = {0xFFFF, 0x1004, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_SandFootprints, gFieldEffectObjectPicTable_SandFootprints, gDummySpriteAffineAnimTable, sub_8154C60};
 
 const struct SpriteFrameImage gFieldEffectObjectPicTable_DeepSandFootprints[] = {
-	obj_frame_tiles(gFieldEffectObjectPic_DeepSandFootprints_0),
-	obj_frame_tiles(gFieldEffectObjectPic_DeepSandFootprints_1),
+    obj_frame_tiles(gFieldEffectObjectPic_DeepSandFootprints_0),
+    obj_frame_tiles(gFieldEffectObjectPic_DeepSandFootprints_1),
 };
 
 const union AnimCmd gFieldEffectObjectImageAnim_850CD74[] =
@@ -332,10 +332,10 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_DeepSandFootprints[]
 const struct SpriteTemplate gFieldEffectObjectTemplate_DeepSandFootprints = {0xFFFF, 0x1004, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_DeepSandFootprints, gFieldEffectObjectPicTable_DeepSandFootprints, gDummySpriteAffineAnimTable, sub_8154C60};
 
 const struct SpriteFrameImage gFieldEffectObjectPicTable_BikeTireTracks[] = {
-	obj_frame_tiles(gFieldEffectObjectPic_BikeTireTracks_0),
-	obj_frame_tiles(gFieldEffectObjectPic_BikeTireTracks_1),
-	obj_frame_tiles(gFieldEffectObjectPic_BikeTireTracks_2),
-	obj_frame_tiles(gFieldEffectObjectPic_BikeTireTracks_3),
+    obj_frame_tiles(gFieldEffectObjectPic_BikeTireTracks_0),
+    obj_frame_tiles(gFieldEffectObjectPic_BikeTireTracks_1),
+    obj_frame_tiles(gFieldEffectObjectPic_BikeTireTracks_2),
+    obj_frame_tiles(gFieldEffectObjectPic_BikeTireTracks_3),
 };
 
 const union AnimCmd gFieldEffectObjectImageAnim_850CDE0[] =
@@ -402,10 +402,10 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_BikeTireTracks[] =
 const struct SpriteTemplate gFieldEffectObjectTemplate_BikeTireTracks = {0xFFFF, 0x1004, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_BikeTireTracks, gFieldEffectObjectPicTable_BikeTireTracks, gDummySpriteAffineAnimTable, sub_8154C60};
 
 const struct SpriteFrameImage gFieldEffectObjectPicTable_BikeHopBigSplash[] = {
-	obj_frame_tiles(gFieldEffectObjectPic_BikeHopBigSplash_0),
-	obj_frame_tiles(gFieldEffectObjectPic_BikeHopBigSplash_1),
-	obj_frame_tiles(gFieldEffectObjectPic_BikeHopBigSplash_2),
-	obj_frame_tiles(gFieldEffectObjectPic_BikeHopBigSplash_3),
+    overworld_frame(gFieldEffectObjectPic_BikeHopBigSplash, 16, 16, 0),
+    overworld_frame(gFieldEffectObjectPic_BikeHopBigSplash, 16, 16, 1),
+    overworld_frame(gFieldEffectObjectPic_BikeHopBigSplash, 16, 16, 2),
+    overworld_frame(gFieldEffectObjectPic_BikeHopBigSplash, 16, 16, 3),
 };
 
 const union AnimCmd gFieldEffectObjectImageAnim_850CE7C[] =
@@ -425,8 +425,8 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_BikeHopBigSplash[] =
 const struct SpriteTemplate gFieldEffectObjectTemplate_BikeHopBigSplash = {0xFFFF, 0x1004, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_BikeHopBigSplash, gFieldEffectObjectPicTable_BikeHopBigSplash, gDummySpriteAffineAnimTable, sub_8156194};
 
 const struct SpriteFrameImage gFieldEffectObjectPicTable_Splash[] = {
-	obj_frame_tiles(gFieldEffectObjectPic_Splash_0),
-	obj_frame_tiles(gFieldEffectObjectPic_Splash_1),
+    overworld_frame(gFieldEffectObjectPic_Splash, 16, 8, 0),
+    overworld_frame(gFieldEffectObjectPic_Splash, 16, 8, 1),
 };
 
 const union AnimCmd gFieldEffectObjectImageAnim_850CEBC[] =
@@ -458,9 +458,9 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_Splash[] =
 const struct SpriteTemplate gFieldEffectObjectTemplate_Splash = {0xFFFF, 0x1004, &gEventObjectBaseOam_16x8, gFieldEffectObjectImageAnimTable_Splash, gFieldEffectObjectPicTable_Splash, gDummySpriteAffineAnimTable, sub_8154D90};
 
 const struct SpriteFrameImage gFieldEffectObjectPicTable_BikeHopSmallSplash[] = {
-	obj_frame_tiles(gFieldEffectObjectPic_BikeHopSmallSplash_0),
-	obj_frame_tiles(gFieldEffectObjectPic_BikeHopSmallSplash_1),
-	obj_frame_tiles(gFieldEffectObjectPic_BikeHopSmallSplash_2),
+    overworld_frame(gFieldEffectObjectPic_BikeHopSmallSplash, 16, 8, 0),
+    overworld_frame(gFieldEffectObjectPic_BikeHopSmallSplash, 16, 8, 1),
+    overworld_frame(gFieldEffectObjectPic_BikeHopSmallSplash, 16, 8, 2),
 };
 
 const union AnimCmd gFieldEffectObjectImageAnim_850CF24[] =
@@ -479,10 +479,10 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_BikeHopSmallSplash[]
 const struct SpriteTemplate gFieldEffectObjectTemplate_BikeHopSmallSplash = {0xFFFF, 0x1004, &gEventObjectBaseOam_16x8, gFieldEffectObjectImageAnimTable_BikeHopSmallSplash, gFieldEffectObjectPicTable_BikeHopSmallSplash, gDummySpriteAffineAnimTable, sub_8156194};
 
 const struct SpriteFrameImage gFieldEffectObjectPicTable_LongGrass[] = {
-	obj_frame_tiles(gFieldEffectObjectPic_LongGrass_0),
-	obj_frame_tiles(gFieldEffectObjectPic_LongGrass_1),
-	obj_frame_tiles(gFieldEffectObjectPic_LongGrass_2),
-	obj_frame_tiles(gFieldEffectObjectPic_LongGrass_3),
+    obj_frame_tiles(gFieldEffectObjectPic_LongGrass_0),
+    obj_frame_tiles(gFieldEffectObjectPic_LongGrass_1),
+    obj_frame_tiles(gFieldEffectObjectPic_LongGrass_2),
+    obj_frame_tiles(gFieldEffectObjectPic_LongGrass_3),
 };
 
 const union AnimCmd gFieldEffectObjectImageAnim_850CF70[] =
@@ -505,12 +505,12 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_LongGrass[] =
 const struct SpriteTemplate gFieldEffectObjectTemplate_LongGrass = {0xFFFF, 0x1005, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_LongGrass, gFieldEffectObjectPicTable_LongGrass, gDummySpriteAffineAnimTable, unc_grass_tall};
 
 const struct SpriteFrameImage gFieldEffectObjectPicTable_Unknown16[] = {
-	obj_frame_tiles(gFieldEffectObjectPic_Unknown16_0),
-	obj_frame_tiles(gFieldEffectObjectPic_Unknown16_1),
-	obj_frame_tiles(gFieldEffectObjectPic_Unknown16_2),
-	obj_frame_tiles(gFieldEffectObjectPic_Unknown16_3),
-	obj_frame_tiles(gFieldEffectObjectPic_Unknown16_4),
-	obj_frame_tiles(gFieldEffectObjectPic_Unknown16_5),
+    obj_frame_tiles(gFieldEffectObjectPic_Unknown16_0),
+    obj_frame_tiles(gFieldEffectObjectPic_Unknown16_1),
+    obj_frame_tiles(gFieldEffectObjectPic_Unknown16_2),
+    obj_frame_tiles(gFieldEffectObjectPic_Unknown16_3),
+    obj_frame_tiles(gFieldEffectObjectPic_Unknown16_4),
+    obj_frame_tiles(gFieldEffectObjectPic_Unknown16_5),
 };
 
 const union AnimCmd gFieldEffectObjectImageAnim_850CFDC[] =
@@ -532,15 +532,15 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_Unknown16[] =
 const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown16 = {0xFFFF, 0x1005, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_Unknown16, gFieldEffectObjectPicTable_Unknown16, gDummySpriteAffineAnimTable, sub_8156194};
 
 const struct SpriteFrameImage gFieldEffectObjectPicTable_Unknown17[] = {
-	obj_frame_tiles(gFieldEffectObjectPic_Unknown16_5),
-	obj_frame_tiles(gFieldEffectObjectPic_Unknown17_0),
-	obj_frame_tiles(gFieldEffectObjectPic_Unknown17_1),
-	obj_frame_tiles(gFieldEffectObjectPic_Unknown17_2),
-	obj_frame_tiles(gFieldEffectObjectPic_Unknown17_3),
-	obj_frame_tiles(gFieldEffectObjectPic_Unknown17_4),
-	obj_frame_tiles(gFieldEffectObjectPic_Unknown17_5),
-	obj_frame_tiles(gFieldEffectObjectPic_Unknown17_6),
-	obj_frame_tiles(gFieldEffectObjectPic_Unknown17_7),
+    obj_frame_tiles(gFieldEffectObjectPic_Unknown16_5),
+    overworld_frame(gFieldEffectObjectPic_Unknown17, 16, 16, 0),
+    overworld_frame(gFieldEffectObjectPic_Unknown17, 16, 16, 1),
+    overworld_frame(gFieldEffectObjectPic_Unknown17, 16, 16, 2),
+    overworld_frame(gFieldEffectObjectPic_Unknown17, 16, 16, 3),
+    overworld_frame(gFieldEffectObjectPic_Unknown17, 16, 16, 4),
+    overworld_frame(gFieldEffectObjectPic_Unknown17, 16, 16, 5),
+    overworld_frame(gFieldEffectObjectPic_Unknown17, 16, 16, 6),
+    overworld_frame(gFieldEffectObjectPic_Unknown17, 16, 16, 7),
 };
 
 const union AnimCmd gFieldEffectObjectImageAnim_850D05C[] =
@@ -565,10 +565,10 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_Unknown17[] =
 const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown17 = {0xFFFF, 0x1005, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_Unknown17, gFieldEffectObjectPicTable_Unknown17, gDummySpriteAffineAnimTable, sub_81561D0};
 
 const struct SpriteFrameImage gFieldEffectObjectPicTable_Unknown18[] = {
-	obj_frame_tiles(gFieldEffectObjectPic_Unknown18_0),
-	obj_frame_tiles(gFieldEffectObjectPic_Unknown18_1),
-	obj_frame_tiles(gFieldEffectObjectPic_Unknown18_2),
-	obj_frame_tiles(gFieldEffectObjectPic_Unknown18_3),
+    obj_frame_tiles(gFieldEffectObjectPic_Unknown18_0),
+    obj_frame_tiles(gFieldEffectObjectPic_Unknown18_1),
+    obj_frame_tiles(gFieldEffectObjectPic_Unknown18_2),
+    obj_frame_tiles(gFieldEffectObjectPic_Unknown18_3),
 };
 
 const union AnimCmd gFieldEffectObjectImageAnim_850D0C0[] =
@@ -590,10 +590,10 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_Unknown18[] =
 const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown18 = {0xFFFF, 0x1005, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_Unknown18, gFieldEffectObjectPicTable_Unknown18, gDummySpriteAffineAnimTable, sub_81561D0};
 
 const struct SpriteFrameImage gFieldEffectObjectPicTable_Unknown19[] = {
-	obj_frame_tiles(gFieldEffectObjectPic_Unknown19_0),
-	obj_frame_tiles(gFieldEffectObjectPic_Unknown19_1),
-	obj_frame_tiles(gFieldEffectObjectPic_Unknown19_2),
-	obj_frame_tiles(gFieldEffectObjectPic_Unknown19_3),
+    obj_frame_tiles(gFieldEffectObjectPic_Unknown19_0),
+    obj_frame_tiles(gFieldEffectObjectPic_Unknown19_1),
+    obj_frame_tiles(gFieldEffectObjectPic_Unknown19_2),
+    obj_frame_tiles(gFieldEffectObjectPic_Unknown19_3),
 };
 
 const union AnimCmd gFieldEffectObjectImageAnim_850D118[] =
@@ -613,9 +613,9 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_Unknown19[] =
 const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown19 = {0xFFFF, 0x1004, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_Unknown19, gFieldEffectObjectPicTable_Unknown19, gDummySpriteAffineAnimTable, sub_81561D0};
 
 const struct SpriteFrameImage gFieldEffectObjectPicTable_Unknown29[] = {
-	obj_frame_tiles(gFieldEffectObjectPic_Unknown29_0),
-	obj_frame_tiles(gFieldEffectObjectPic_Unknown29_1),
-	obj_frame_tiles(gFieldEffectObjectPic_Unknown29_2),
+    obj_frame_tiles(gFieldEffectObjectPic_Unknown29_0),
+    obj_frame_tiles(gFieldEffectObjectPic_Unknown29_1),
+    obj_frame_tiles(gFieldEffectObjectPic_Unknown29_2),
 };
 
 const union AnimCmd gFieldEffectObjectImageAnim_850D160[] =
@@ -634,10 +634,10 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_Unknown29[] =
 const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown29 = {0xFFFF, 0x1004, &gEventObjectBaseOam_16x8, gFieldEffectObjectImageAnimTable_Unknown29, gFieldEffectObjectPicTable_Unknown29, gDummySpriteAffineAnimTable, sub_81559BC};
 
 const struct SpriteFrameImage gFieldEffectObjectPicTable_Unknown20[] = {
-	obj_frame_tiles(gFieldEffectObjectPic_Unknown20_0),
-	obj_frame_tiles(gFieldEffectObjectPic_Unknown20_1),
-	obj_frame_tiles(gFieldEffectObjectPic_Unknown20_2),
-	obj_frame_tiles(gFieldEffectObjectPic_Unknown20_3),
+    obj_frame_tiles(gFieldEffectObjectPic_Unknown20_0),
+    obj_frame_tiles(gFieldEffectObjectPic_Unknown20_1),
+    obj_frame_tiles(gFieldEffectObjectPic_Unknown20_2),
+    obj_frame_tiles(gFieldEffectObjectPic_Unknown20_3),
 };
 
 const union AnimCmd gFieldEffectObjectImageAnim_850D1AC[] =
@@ -695,12 +695,12 @@ const union AffineAnimCmd *const gFieldEffectObjectRotScalAnimTable_Unknown21[]
 const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown21 = {0x0, 0xFFFF, &gDummyOamData, gDummySpriteAnimTable, NULL, gFieldEffectObjectRotScalAnimTable_Unknown21, SpriteCallbackDummy};
 
 const struct SpriteFrameImage gFieldEffectObjectPicTable_BerryTreeGrowthSparkle[] = {
-	obj_frame_tiles(gFieldEffectObjectPic_BerryTreeGrowthSparkle_0),
-	obj_frame_tiles(gFieldEffectObjectPic_BerryTreeGrowthSparkle_1),
-	obj_frame_tiles(gFieldEffectObjectPic_BerryTreeGrowthSparkle_2),
-	obj_frame_tiles(gFieldEffectObjectPic_BerryTreeGrowthSparkle_3),
-	obj_frame_tiles(gFieldEffectObjectPic_BerryTreeGrowthSparkle_4),
-	obj_frame_tiles(gFieldEffectObjectPic_BerryTreeGrowthSparkle_5),
+    obj_frame_tiles(gFieldEffectObjectPic_BerryTreeGrowthSparkle_0),
+    obj_frame_tiles(gFieldEffectObjectPic_BerryTreeGrowthSparkle_1),
+    obj_frame_tiles(gFieldEffectObjectPic_BerryTreeGrowthSparkle_2),
+    obj_frame_tiles(gFieldEffectObjectPic_BerryTreeGrowthSparkle_3),
+    obj_frame_tiles(gFieldEffectObjectPic_BerryTreeGrowthSparkle_4),
+    obj_frame_tiles(gFieldEffectObjectPic_BerryTreeGrowthSparkle_5),
 };
 
 const union AnimCmd gFieldEffectObjectImageAnim_850D2D4[] =
@@ -736,13 +736,13 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_BerryTreeGrowthSpark
 const struct SpriteTemplate gFieldEffectObjectTemplate_BerryTreeGrowthSparkle = {0xFFFF, 0xFFFF, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_BerryTreeGrowthSparkle, gFieldEffectObjectPicTable_BerryTreeGrowthSparkle, gDummySpriteAffineAnimTable, sub_81561D0};
 
 const struct SpriteFrameImage gFieldEffectObjectPicTable_TreeDisguise[] = {
-	obj_frame_tiles(gFieldEffectObjectPic_TreeDisguise_0),
-	obj_frame_tiles(gFieldEffectObjectPic_TreeDisguise_1),
-	obj_frame_tiles(gFieldEffectObjectPic_TreeDisguise_2),
-	obj_frame_tiles(gFieldEffectObjectPic_TreeDisguise_3),
-	obj_frame_tiles(gFieldEffectObjectPic_TreeDisguise_4),
-	obj_frame_tiles(gFieldEffectObjectPic_TreeDisguise_5),
-	obj_frame_tiles(gFieldEffectObjectPic_TreeDisguise_6),
+    overworld_frame(gFieldEffectObjectPic_TreeDisguise, 16, 32, 0),
+    overworld_frame(gFieldEffectObjectPic_TreeDisguise, 16, 32, 1),
+    overworld_frame(gFieldEffectObjectPic_TreeDisguise, 16, 32, 2),
+    overworld_frame(gFieldEffectObjectPic_TreeDisguise, 16, 32, 3),
+    overworld_frame(gFieldEffectObjectPic_TreeDisguise, 16, 32, 4),
+    overworld_frame(gFieldEffectObjectPic_TreeDisguise, 16, 32, 5),
+    overworld_frame(gFieldEffectObjectPic_TreeDisguise, 16, 32, 6),
 };
 
 const union AnimCmd gFieldEffectObjectImageAnim_850D37C[] =
@@ -772,13 +772,13 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_TreeDisguise[] =
 const struct SpriteTemplate gFieldEffectObjectTemplate_TreeDisguise = {0xFFFF, 0xFFFF, &gEventObjectBaseOam_16x32, gFieldEffectObjectImageAnimTable_TreeDisguise, gFieldEffectObjectPicTable_TreeDisguise, gDummySpriteAffineAnimTable, sub_8155C88};
 
 const struct SpriteFrameImage gFieldEffectObjectPicTable_MountainDisguise[] = {
-	obj_frame_tiles(gFieldEffectObjectPic_MountainDisguise_0),
-	obj_frame_tiles(gFieldEffectObjectPic_MountainDisguise_1),
-	obj_frame_tiles(gFieldEffectObjectPic_MountainDisguise_2),
-	obj_frame_tiles(gFieldEffectObjectPic_MountainDisguise_3),
-	obj_frame_tiles(gFieldEffectObjectPic_MountainDisguise_4),
-	obj_frame_tiles(gFieldEffectObjectPic_MountainDisguise_5),
-	obj_frame_tiles(gFieldEffectObjectPic_MountainDisguise_6),
+    overworld_frame(gFieldEffectObjectPic_MountainDisguise, 16, 32, 0),
+    overworld_frame(gFieldEffectObjectPic_MountainDisguise, 16, 32, 1),
+    overworld_frame(gFieldEffectObjectPic_MountainDisguise, 16, 32, 2),
+    overworld_frame(gFieldEffectObjectPic_MountainDisguise, 16, 32, 3),
+    overworld_frame(gFieldEffectObjectPic_MountainDisguise, 16, 32, 4),
+    overworld_frame(gFieldEffectObjectPic_MountainDisguise, 16, 32, 5),
+    overworld_frame(gFieldEffectObjectPic_MountainDisguise, 16, 32, 6),
 };
 
 const union AnimCmd gFieldEffectObjectImageAnim_850D3FC[] =
@@ -808,19 +808,19 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_MountainDisguise[] =
 const struct SpriteTemplate gFieldEffectObjectTemplate_MountainDisguise = {0xFFFF, 0xFFFF, &gEventObjectBaseOam_16x32, gFieldEffectObjectImageAnimTable_MountainDisguise, gFieldEffectObjectPicTable_MountainDisguise, gDummySpriteAffineAnimTable, sub_8155C88};
 
 const struct SpriteFrameImage gFieldEffectObjectPicTable_SandDisguisePlaceholder[] = {
-	obj_frame_tiles(gFieldEffectObjectPic_SandDisguisePlaceholder_0),
-	obj_frame_tiles(gFieldEffectObjectPic_SandDisguisePlaceholder_1),
-	obj_frame_tiles(gFieldEffectObjectPic_SandDisguisePlaceholder_2),
-	obj_frame_tiles(gFieldEffectObjectPic_SandDisguisePlaceholder_3),
-	obj_frame_tiles(gFieldEffectObjectPic_SandDisguisePlaceholder_4),
-	obj_frame_tiles(gFieldEffectObjectPic_SandDisguisePlaceholder_5),
-	obj_frame_tiles(gFieldEffectObjectPic_SandDisguisePlaceholder_6),
+    overworld_frame(gFieldEffectObjectPic_SandDisguisePlaceholder, 16, 32, 0),
+    overworld_frame(gFieldEffectObjectPic_SandDisguisePlaceholder, 16, 32, 1),
+    overworld_frame(gFieldEffectObjectPic_SandDisguisePlaceholder, 16, 32, 2),
+    overworld_frame(gFieldEffectObjectPic_SandDisguisePlaceholder, 16, 32, 3),
+    overworld_frame(gFieldEffectObjectPic_SandDisguisePlaceholder, 16, 32, 4),
+    overworld_frame(gFieldEffectObjectPic_SandDisguisePlaceholder, 16, 32, 5),
+    overworld_frame(gFieldEffectObjectPic_SandDisguisePlaceholder, 16, 32, 6),
 };
 
 const struct SpriteTemplate gFieldEffectObjectTemplate_SandDisguisePlaceholder = {0xFFFF, 0xFFFF, &gEventObjectBaseOam_16x32, gFieldEffectObjectImageAnimTable_TreeDisguise, gFieldEffectObjectPicTable_SandDisguisePlaceholder, gDummySpriteAffineAnimTable, sub_8155C88};
 
 const struct SpriteFrameImage gFieldEffectObjectPicTable_Bird[] = {
-	obj_frame_tiles(gFieldEffectObjectPic_Bird),
+    obj_frame_tiles(gFieldEffectObjectPic_Bird),
 };
 
 const union AnimCmd gFieldEffectObjectImageAnim_850D49C[] =
@@ -837,8 +837,8 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_Bird[] =
 const struct SpriteTemplate gFieldEffectObjectTemplate_Bird = {0xFFFF, 0xFFFF, &gEventObjectBaseOam_32x32, gFieldEffectObjectImageAnimTable_Bird, gFieldEffectObjectPicTable_Bird, gDummySpriteAffineAnimTable, SpriteCallbackDummy};
 
 const struct SpriteFrameImage gFieldEffectObjectPicTable_ShortGrass[] = {
-	obj_frame_tiles(gFieldEffectObjectPic_ShortGrass_0),
-	obj_frame_tiles(gFieldEffectObjectPic_ShortGrass_1),
+    overworld_frame(gFieldEffectObjectPic_ShortGrass, 16, 16, 0),
+    overworld_frame(gFieldEffectObjectPic_ShortGrass, 16, 16, 1),
 };
 
 const union AnimCmd gFieldEffectObjectImageAnim_850D4D0[] =
@@ -856,7 +856,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_ShortGrass[] =
 const struct SpriteTemplate gFieldEffectObjectTemplate_ShortGrass = {0xFFFF, 0x1005, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_ShortGrass, gFieldEffectObjectPicTable_ShortGrass, gDummySpriteAffineAnimTable, sub_8154A10};
 
 const struct SpriteFrameImage gFieldEffectObjectPicTable_HotSpringsWater[] = {
-	obj_frame_tiles(gFieldEffectObjectPic_HotSpringsWater),
+    obj_frame_tiles(gFieldEffectObjectPic_HotSpringsWater),
 };
 
 const union AnimCmd gFieldEffectObjectImageAnim_850D500[] =
@@ -873,11 +873,11 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_HotSpringsWater[] =
 const struct SpriteTemplate gFieldEffectObjectTemplate_HotSpringsWater = {0xFFFF, 0x1005, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_HotSpringsWater, gFieldEffectObjectPicTable_HotSpringsWater, gDummySpriteAffineAnimTable, sub_8155158};
 
 const struct SpriteFrameImage gFieldEffectObjectPicTable_JumpOutOfAsh[] = {
-	obj_frame_tiles(gFieldEffectObjectPic_JumpOutOfAsh_0),
-	obj_frame_tiles(gFieldEffectObjectPic_JumpOutOfAsh_1),
-	obj_frame_tiles(gFieldEffectObjectPic_JumpOutOfAsh_2),
-	obj_frame_tiles(gFieldEffectObjectPic_JumpOutOfAsh_3),
-	obj_frame_tiles(gFieldEffectObjectPic_JumpOutOfAsh_4),
+    overworld_frame(gFieldEffectObjectPic_JumpOutOfAsh, 16, 16, 0),
+    overworld_frame(gFieldEffectObjectPic_JumpOutOfAsh, 16, 16, 1),
+    overworld_frame(gFieldEffectObjectPic_JumpOutOfAsh, 16, 16, 2),
+    overworld_frame(gFieldEffectObjectPic_JumpOutOfAsh, 16, 16, 3),
+    overworld_frame(gFieldEffectObjectPic_JumpOutOfAsh, 16, 16, 4),
 };
 
 const union AnimCmd gFieldEffectObjectImageAnim_850D54C[] =
@@ -900,11 +900,11 @@ const struct SpriteTemplate gFieldEffectObjectTemplate_JumpOutOfAsh = {0xFFFF, 0
 const struct SpritePalette gFieldEffectObjectPaletteInfo2 = {gFieldEffectObjectPalette2, 0x100D};
 
 const struct SpriteFrameImage gFieldEffectObjectPicTable_Unknown33[] = {
-	obj_frame_tiles(gFieldEffectObjectPic_Unknown33_0),
-	obj_frame_tiles(gFieldEffectObjectPic_Unknown33_1),
-	obj_frame_tiles(gFieldEffectObjectPic_Unknown33_2),
-	obj_frame_tiles(gFieldEffectObjectPic_Unknown33_3),
-	obj_frame_tiles(gFieldEffectObjectPic_Unknown33_4),
+    obj_frame_tiles(gFieldEffectObjectPic_Unknown33_0),
+    obj_frame_tiles(gFieldEffectObjectPic_Unknown33_1),
+    obj_frame_tiles(gFieldEffectObjectPic_Unknown33_2),
+    obj_frame_tiles(gFieldEffectObjectPic_Unknown33_3),
+    obj_frame_tiles(gFieldEffectObjectPic_Unknown33_4),
 };
 
 const union AnimCmd gFieldEffectObjectImageAnim_850D5B0[] =
@@ -925,14 +925,14 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_Unknown33[] =
 const struct SpriteTemplate gFieldEffectObjectTemplate_Unknown33 = {0xFFFF, 0x100D, &gEventObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_Unknown33, gFieldEffectObjectPicTable_Unknown33, gDummySpriteAffineAnimTable, sub_80B7A58};
 
 const struct SpriteFrameImage gFieldEffectObjectPicTable_Bubbles[] = {
-	obj_frame_tiles(gFieldEffectObjectPic_Bubbles_0),
-	obj_frame_tiles(gFieldEffectObjectPic_Bubbles_1),
-	obj_frame_tiles(gFieldEffectObjectPic_Bubbles_2),
-	obj_frame_tiles(gFieldEffectObjectPic_Bubbles_3),
-	obj_frame_tiles(gFieldEffectObjectPic_Bubbles_4),
-	obj_frame_tiles(gFieldEffectObjectPic_Bubbles_5),
-	obj_frame_tiles(gFieldEffectObjectPic_Bubbles_6),
-	obj_frame_tiles(gFieldEffectObjectPic_Bubbles_7),
+    overworld_frame(gFieldEffectObjectPic_Bubbles, 16, 32, 0),
+    overworld_frame(gFieldEffectObjectPic_Bubbles, 16, 32, 1),
+    overworld_frame(gFieldEffectObjectPic_Bubbles, 16, 32, 2),
+    overworld_frame(gFieldEffectObjectPic_Bubbles, 16, 32, 3),
+    overworld_frame(gFieldEffectObjectPic_Bubbles, 16, 32, 4),
+    overworld_frame(gFieldEffectObjectPic_Bubbles, 16, 32, 5),
+    overworld_frame(gFieldEffectObjectPic_Bubbles, 16, 32, 6),
+    overworld_frame(gFieldEffectObjectPic_Bubbles, 16, 32, 7),
 };
 
 const union AnimCmd gFieldEffectObjectImageAnim_850D624[] =
@@ -956,8 +956,8 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_Bubbles[] =
 const struct SpriteTemplate gFieldEffectObjectTemplate_Bubbles = {0xFFFF, 0x1004, &gEventObjectBaseOam_16x32, gFieldEffectObjectImageAnimTable_Bubbles, gFieldEffectObjectPicTable_Bubbles, gDummySpriteAffineAnimTable, sub_8155AEC};
 
 const struct SpriteFrameImage gFieldEffectObjectPicTable_Unknown35[] = {
-	obj_frame_tiles(gFieldEffectObjectPic_Unknown35_0),
-	obj_frame_tiles(gFieldEffectObjectPic_Unknown35_1),
+    obj_frame_tiles(gFieldEffectObjectPic_Unknown35_0),
+    obj_frame_tiles(gFieldEffectObjectPic_Unknown35_1),
 };
 
 const union AnimCmd gFieldEffectObjectImageAnim_850D674[] =
@@ -987,7 +987,7 @@ const union AnimCmd *const gFieldEffectObjectImageAnimTable_Rayquaza[] = {
 };
 
 const struct SpriteFrameImage  gFieldEffectObjectPicTable_Rayquaza[] = {
-	{.data = (u8*)gEventObjectPic_Rayquaza_0, .size = (sizeof gEventObjectPic_Rayquaza_0) / 4}
+    {.data = (u8*)gEventObjectPic_Rayquaza, .size = ((64*64)/2) /4} 
 };
 
 const struct SpriteTemplate gFieldEffectObjectTemplate_Rayquaza = {0xFFFF, 0xFFFF, &gEventObjectBaseOam_32x32, gFieldEffectObjectImageAnimTable_Rayquaza, gFieldEffectObjectPicTable_Rayquaza, gDummySpriteAffineAnimTable, sub_8155F80};
diff --git a/tools/gbagfx/options.h b/tools/gbagfx/options.h
old mode 100755
new mode 100644