diff --git a/Makefile b/Makefile index 47bfee2a2f..a0ce6bdd12 100644 --- a/Makefile +++ b/Makefile @@ -90,7 +90,7 @@ tidy: rm -r build/* include graphics_file_rules.mk -include event_obj_graphics_makefile_rules.mk +include spritesheet_rules.mk %.s: ; %.png: ; diff --git a/event_obj_graphics_makefile_rules.mk b/event_obj_graphics_makefile_rules.mk deleted file mode 100644 index c7b4ccba46..0000000000 --- a/event_obj_graphics_makefile_rules.mk +++ /dev/null @@ -1,618 +0,0 @@ -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 index 13321eb42e..fca4b0dd51 100644 Binary files a/graphics/event_objects/pics/berry_trees/aguav.png and b/graphics/event_objects/pics/berry_trees/aguav.png differ diff --git a/graphics/event_objects/pics/berry_trees/aspear.png b/graphics/event_objects/pics/berry_trees/aspear.png index 984e598ea0..d0782166ef 100644 Binary files a/graphics/event_objects/pics/berry_trees/aspear.png and b/graphics/event_objects/pics/berry_trees/aspear.png differ diff --git a/graphics/event_objects/pics/berry_trees/cheri.png b/graphics/event_objects/pics/berry_trees/cheri.png index 527ef9dfee..ec2db0ae30 100644 Binary files a/graphics/event_objects/pics/berry_trees/cheri.png and b/graphics/event_objects/pics/berry_trees/cheri.png differ diff --git a/graphics/event_objects/pics/berry_trees/chesto.png b/graphics/event_objects/pics/berry_trees/chesto.png index 36b4520cef..3087de2b28 100644 Binary files a/graphics/event_objects/pics/berry_trees/chesto.png and b/graphics/event_objects/pics/berry_trees/chesto.png differ diff --git a/graphics/event_objects/pics/berry_trees/cornn.png b/graphics/event_objects/pics/berry_trees/cornn.png index 60ac7da8b3..de3ba7003f 100644 Binary files a/graphics/event_objects/pics/berry_trees/cornn.png and b/graphics/event_objects/pics/berry_trees/cornn.png differ diff --git a/graphics/event_objects/pics/berry_trees/dirt_pile.png b/graphics/event_objects/pics/berry_trees/dirt_pile.png index 3790fd846d..ed2a38b3f6 100644 Binary files a/graphics/event_objects/pics/berry_trees/dirt_pile.png and b/graphics/event_objects/pics/berry_trees/dirt_pile.png differ diff --git a/graphics/event_objects/pics/berry_trees/durin.png b/graphics/event_objects/pics/berry_trees/durin.png index 250cea0311..c0caf166f3 100644 Binary files a/graphics/event_objects/pics/berry_trees/durin.png and b/graphics/event_objects/pics/berry_trees/durin.png differ diff --git a/graphics/event_objects/pics/berry_trees/figy.png b/graphics/event_objects/pics/berry_trees/figy.png index 2f26d13812..6ca366296c 100644 Binary files a/graphics/event_objects/pics/berry_trees/figy.png and b/graphics/event_objects/pics/berry_trees/figy.png differ diff --git a/graphics/event_objects/pics/berry_trees/grepa.png b/graphics/event_objects/pics/berry_trees/grepa.png index 07c8554ce4..33788c4a43 100644 Binary files a/graphics/event_objects/pics/berry_trees/grepa.png and b/graphics/event_objects/pics/berry_trees/grepa.png differ diff --git a/graphics/event_objects/pics/berry_trees/hondew.png b/graphics/event_objects/pics/berry_trees/hondew.png index 45f5605eec..c07bc17f7c 100644 Binary files a/graphics/event_objects/pics/berry_trees/hondew.png and b/graphics/event_objects/pics/berry_trees/hondew.png differ diff --git a/graphics/event_objects/pics/berry_trees/iapapa.png b/graphics/event_objects/pics/berry_trees/iapapa.png index 2a8d9b7606..98eb27c1dd 100644 Binary files a/graphics/event_objects/pics/berry_trees/iapapa.png and b/graphics/event_objects/pics/berry_trees/iapapa.png differ diff --git a/graphics/event_objects/pics/berry_trees/kelpsy.png b/graphics/event_objects/pics/berry_trees/kelpsy.png index bad257fce7..7fdf1d8bd2 100644 Binary files a/graphics/event_objects/pics/berry_trees/kelpsy.png and b/graphics/event_objects/pics/berry_trees/kelpsy.png differ diff --git a/graphics/event_objects/pics/berry_trees/lansat.png b/graphics/event_objects/pics/berry_trees/lansat.png index 8ab63c9799..3271c1ceb7 100644 Binary files a/graphics/event_objects/pics/berry_trees/lansat.png and b/graphics/event_objects/pics/berry_trees/lansat.png differ diff --git a/graphics/event_objects/pics/berry_trees/leppa.png b/graphics/event_objects/pics/berry_trees/leppa.png index a0b3dccc01..601945e436 100644 Binary files a/graphics/event_objects/pics/berry_trees/leppa.png and b/graphics/event_objects/pics/berry_trees/leppa.png differ diff --git a/graphics/event_objects/pics/berry_trees/liechi.png b/graphics/event_objects/pics/berry_trees/liechi.png index a845c5ac29..b65074c80f 100644 Binary files a/graphics/event_objects/pics/berry_trees/liechi.png and b/graphics/event_objects/pics/berry_trees/liechi.png differ diff --git a/graphics/event_objects/pics/berry_trees/lum.png b/graphics/event_objects/pics/berry_trees/lum.png index e108e428ff..a2e156ddd1 100644 Binary files a/graphics/event_objects/pics/berry_trees/lum.png and b/graphics/event_objects/pics/berry_trees/lum.png differ diff --git a/graphics/event_objects/pics/berry_trees/mago.png b/graphics/event_objects/pics/berry_trees/mago.png index cc30190d20..182a3dea86 100644 Binary files a/graphics/event_objects/pics/berry_trees/mago.png and b/graphics/event_objects/pics/berry_trees/mago.png differ diff --git a/graphics/event_objects/pics/berry_trees/nomel.png b/graphics/event_objects/pics/berry_trees/nomel.png index b1c1804652..fa60688b89 100644 Binary files a/graphics/event_objects/pics/berry_trees/nomel.png and b/graphics/event_objects/pics/berry_trees/nomel.png differ diff --git a/graphics/event_objects/pics/berry_trees/oran.png b/graphics/event_objects/pics/berry_trees/oran.png index 7f98da25ec..484fb7eb23 100644 Binary files a/graphics/event_objects/pics/berry_trees/oran.png and b/graphics/event_objects/pics/berry_trees/oran.png differ diff --git a/graphics/event_objects/pics/berry_trees/pamtre.png b/graphics/event_objects/pics/berry_trees/pamtre.png index b2d7c590da..a9f3060128 100644 Binary files a/graphics/event_objects/pics/berry_trees/pamtre.png and b/graphics/event_objects/pics/berry_trees/pamtre.png differ diff --git a/graphics/event_objects/pics/berry_trees/pecha.png b/graphics/event_objects/pics/berry_trees/pecha.png index 7078d2bd1c..3bfec57534 100644 Binary files a/graphics/event_objects/pics/berry_trees/pecha.png and b/graphics/event_objects/pics/berry_trees/pecha.png differ diff --git a/graphics/event_objects/pics/berry_trees/persim.png b/graphics/event_objects/pics/berry_trees/persim.png index ff4d8f808a..eb5450b8b7 100644 Binary files a/graphics/event_objects/pics/berry_trees/persim.png and b/graphics/event_objects/pics/berry_trees/persim.png differ diff --git a/graphics/event_objects/pics/berry_trees/pomeg.png b/graphics/event_objects/pics/berry_trees/pomeg.png index 78abc73eb1..cd0e5e6c39 100644 Binary files a/graphics/event_objects/pics/berry_trees/pomeg.png and b/graphics/event_objects/pics/berry_trees/pomeg.png differ diff --git a/graphics/event_objects/pics/berry_trees/rabuta.png b/graphics/event_objects/pics/berry_trees/rabuta.png index b7a2c85d6e..59f9baff27 100644 Binary files a/graphics/event_objects/pics/berry_trees/rabuta.png and b/graphics/event_objects/pics/berry_trees/rabuta.png differ diff --git a/graphics/event_objects/pics/berry_trees/rawst.png b/graphics/event_objects/pics/berry_trees/rawst.png index e0bcac5322..aad761f5bd 100644 Binary files a/graphics/event_objects/pics/berry_trees/rawst.png and b/graphics/event_objects/pics/berry_trees/rawst.png differ diff --git a/graphics/event_objects/pics/berry_trees/razz.png b/graphics/event_objects/pics/berry_trees/razz.png index 70f56bc8b6..dc2dd1723b 100644 Binary files a/graphics/event_objects/pics/berry_trees/razz.png and b/graphics/event_objects/pics/berry_trees/razz.png differ diff --git a/graphics/event_objects/pics/berry_trees/sitrus.png b/graphics/event_objects/pics/berry_trees/sitrus.png index bdfece8608..c5392e3adb 100644 Binary files a/graphics/event_objects/pics/berry_trees/sitrus.png and b/graphics/event_objects/pics/berry_trees/sitrus.png differ diff --git a/graphics/event_objects/pics/berry_trees/spelon.png b/graphics/event_objects/pics/berry_trees/spelon.png index d9b7f41745..572b4d4f9e 100644 Binary files a/graphics/event_objects/pics/berry_trees/spelon.png and b/graphics/event_objects/pics/berry_trees/spelon.png differ diff --git a/graphics/event_objects/pics/berry_trees/sprout.png b/graphics/event_objects/pics/berry_trees/sprout.png index 8fee510bdc..e343596272 100644 Binary files a/graphics/event_objects/pics/berry_trees/sprout.png and b/graphics/event_objects/pics/berry_trees/sprout.png differ diff --git a/graphics/event_objects/pics/berry_trees/tamato.png b/graphics/event_objects/pics/berry_trees/tamato.png index d0770746bd..d12af1922c 100644 Binary files a/graphics/event_objects/pics/berry_trees/tamato.png and b/graphics/event_objects/pics/berry_trees/tamato.png differ diff --git a/graphics/event_objects/pics/berry_trees/wepear.png b/graphics/event_objects/pics/berry_trees/wepear.png index 133140843f..63e5ae53d9 100644 Binary files a/graphics/event_objects/pics/berry_trees/wepear.png and b/graphics/event_objects/pics/berry_trees/wepear.png differ diff --git a/graphics/event_objects/pics/berry_trees/wiki.png b/graphics/event_objects/pics/berry_trees/wiki.png index a78d55db4f..2fa0c0b017 100644 Binary files a/graphics/event_objects/pics/berry_trees/wiki.png and b/graphics/event_objects/pics/berry_trees/wiki.png differ diff --git a/graphics/event_objects/pics/cushions/ball_cushion.png b/graphics/event_objects/pics/cushions/ball_cushion.png index 54ecc19804..2b45f8fd2d 100644 Binary files a/graphics/event_objects/pics/cushions/ball_cushion.png and b/graphics/event_objects/pics/cushions/ball_cushion.png differ diff --git a/graphics/event_objects/pics/cushions/diamond_cushion.png b/graphics/event_objects/pics/cushions/diamond_cushion.png index 7478669413..c6c7bc7619 100644 Binary files a/graphics/event_objects/pics/cushions/diamond_cushion.png and b/graphics/event_objects/pics/cushions/diamond_cushion.png differ diff --git a/graphics/event_objects/pics/cushions/fire_cushion.png b/graphics/event_objects/pics/cushions/fire_cushion.png index aa9a70f2e8..ee67150378 100644 Binary files a/graphics/event_objects/pics/cushions/fire_cushion.png and b/graphics/event_objects/pics/cushions/fire_cushion.png differ diff --git a/graphics/event_objects/pics/cushions/grass_cushion.png b/graphics/event_objects/pics/cushions/grass_cushion.png index 8ee854f170..44862882eb 100644 Binary files a/graphics/event_objects/pics/cushions/grass_cushion.png and b/graphics/event_objects/pics/cushions/grass_cushion.png differ diff --git a/graphics/event_objects/pics/cushions/kiss_cushion.png b/graphics/event_objects/pics/cushions/kiss_cushion.png index 6a99348c90..e24bd9deaa 100644 Binary files a/graphics/event_objects/pics/cushions/kiss_cushion.png and b/graphics/event_objects/pics/cushions/kiss_cushion.png differ diff --git a/graphics/event_objects/pics/cushions/pika_cushion.png b/graphics/event_objects/pics/cushions/pika_cushion.png index 947713c399..16661bc01b 100644 Binary files a/graphics/event_objects/pics/cushions/pika_cushion.png and b/graphics/event_objects/pics/cushions/pika_cushion.png differ diff --git a/graphics/event_objects/pics/cushions/round_cushion.png b/graphics/event_objects/pics/cushions/round_cushion.png index 0e7b71ad58..2a2c6d9d97 100644 Binary files a/graphics/event_objects/pics/cushions/round_cushion.png and b/graphics/event_objects/pics/cushions/round_cushion.png differ diff --git a/graphics/event_objects/pics/cushions/spin_cushion.png b/graphics/event_objects/pics/cushions/spin_cushion.png index 81eba708c3..cfac6c811a 100644 Binary files a/graphics/event_objects/pics/cushions/spin_cushion.png and b/graphics/event_objects/pics/cushions/spin_cushion.png differ diff --git a/graphics/event_objects/pics/cushions/water_cushion.png b/graphics/event_objects/pics/cushions/water_cushion.png index 9ed16c633b..848b0cd352 100644 Binary files a/graphics/event_objects/pics/cushions/water_cushion.png and b/graphics/event_objects/pics/cushions/water_cushion.png differ diff --git a/graphics/event_objects/pics/cushions/zigzag_cushion.png b/graphics/event_objects/pics/cushions/zigzag_cushion.png index 407e6a66bc..88bb748688 100644 Binary files a/graphics/event_objects/pics/cushions/zigzag_cushion.png and b/graphics/event_objects/pics/cushions/zigzag_cushion.png differ diff --git a/graphics/event_objects/pics/dolls/azurill_doll.png b/graphics/event_objects/pics/dolls/azurill_doll.png index 1d1f7492f1..2c2a49639a 100644 Binary files a/graphics/event_objects/pics/dolls/azurill_doll.png and b/graphics/event_objects/pics/dolls/azurill_doll.png differ diff --git a/graphics/event_objects/pics/dolls/baltoy_doll.png b/graphics/event_objects/pics/dolls/baltoy_doll.png index 5205123dab..c64d260330 100644 Binary files a/graphics/event_objects/pics/dolls/baltoy_doll.png and b/graphics/event_objects/pics/dolls/baltoy_doll.png differ diff --git a/graphics/event_objects/pics/dolls/big_blastoise_doll.png b/graphics/event_objects/pics/dolls/big_blastoise_doll.png index fa295f302a..0873117d86 100644 Binary files a/graphics/event_objects/pics/dolls/big_blastoise_doll.png and b/graphics/event_objects/pics/dolls/big_blastoise_doll.png differ diff --git a/graphics/event_objects/pics/dolls/big_charizard_doll.png b/graphics/event_objects/pics/dolls/big_charizard_doll.png index 4fa5aed45f..8bf206e5ba 100644 Binary files a/graphics/event_objects/pics/dolls/big_charizard_doll.png and b/graphics/event_objects/pics/dolls/big_charizard_doll.png differ diff --git a/graphics/event_objects/pics/dolls/big_lapras_doll.png b/graphics/event_objects/pics/dolls/big_lapras_doll.png index 572d3c8106..9695a0ea52 100644 Binary files a/graphics/event_objects/pics/dolls/big_lapras_doll.png and b/graphics/event_objects/pics/dolls/big_lapras_doll.png differ diff --git a/graphics/event_objects/pics/dolls/big_regice_doll.png b/graphics/event_objects/pics/dolls/big_regice_doll.png index e437d3558a..eff1de4928 100644 Binary files a/graphics/event_objects/pics/dolls/big_regice_doll.png and b/graphics/event_objects/pics/dolls/big_regice_doll.png differ diff --git a/graphics/event_objects/pics/dolls/big_regirock_doll.png b/graphics/event_objects/pics/dolls/big_regirock_doll.png index 139abbb288..63ed272361 100644 Binary files a/graphics/event_objects/pics/dolls/big_regirock_doll.png and b/graphics/event_objects/pics/dolls/big_regirock_doll.png differ diff --git a/graphics/event_objects/pics/dolls/big_registeel_doll.png b/graphics/event_objects/pics/dolls/big_registeel_doll.png index 632a2cadd7..b7ab0821a4 100644 Binary files a/graphics/event_objects/pics/dolls/big_registeel_doll.png and b/graphics/event_objects/pics/dolls/big_registeel_doll.png differ diff --git a/graphics/event_objects/pics/dolls/big_rhydon_doll.png b/graphics/event_objects/pics/dolls/big_rhydon_doll.png index 2e059f8c94..4e439330ae 100644 Binary files a/graphics/event_objects/pics/dolls/big_rhydon_doll.png and b/graphics/event_objects/pics/dolls/big_rhydon_doll.png differ diff --git a/graphics/event_objects/pics/dolls/big_snorlax_doll.png b/graphics/event_objects/pics/dolls/big_snorlax_doll.png index 397c9baacd..dcb1699bf2 100644 Binary files a/graphics/event_objects/pics/dolls/big_snorlax_doll.png and b/graphics/event_objects/pics/dolls/big_snorlax_doll.png differ diff --git a/graphics/event_objects/pics/dolls/big_venusaur_doll.png b/graphics/event_objects/pics/dolls/big_venusaur_doll.png index 9d1961608b..1910d1c6e5 100644 Binary files a/graphics/event_objects/pics/dolls/big_venusaur_doll.png and b/graphics/event_objects/pics/dolls/big_venusaur_doll.png differ diff --git a/graphics/event_objects/pics/dolls/big_wailmer_doll.png b/graphics/event_objects/pics/dolls/big_wailmer_doll.png index a174d30f7d..13cbbccf32 100644 Binary files a/graphics/event_objects/pics/dolls/big_wailmer_doll.png and b/graphics/event_objects/pics/dolls/big_wailmer_doll.png differ diff --git a/graphics/event_objects/pics/dolls/chikorita_doll.png b/graphics/event_objects/pics/dolls/chikorita_doll.png index 6b5e6417d8..9942fc9dc0 100644 Binary files a/graphics/event_objects/pics/dolls/chikorita_doll.png and b/graphics/event_objects/pics/dolls/chikorita_doll.png differ diff --git a/graphics/event_objects/pics/dolls/clefairy_doll.png b/graphics/event_objects/pics/dolls/clefairy_doll.png index 137b202136..3aed333add 100644 Binary files a/graphics/event_objects/pics/dolls/clefairy_doll.png and b/graphics/event_objects/pics/dolls/clefairy_doll.png differ diff --git a/graphics/event_objects/pics/dolls/cyndaquil_doll.png b/graphics/event_objects/pics/dolls/cyndaquil_doll.png index b76221e1d4..2f026816ef 100644 Binary files a/graphics/event_objects/pics/dolls/cyndaquil_doll.png and b/graphics/event_objects/pics/dolls/cyndaquil_doll.png differ diff --git a/graphics/event_objects/pics/dolls/ditto_doll.png b/graphics/event_objects/pics/dolls/ditto_doll.png index da4c33018a..7b8cb48aef 100644 Binary files a/graphics/event_objects/pics/dolls/ditto_doll.png and b/graphics/event_objects/pics/dolls/ditto_doll.png differ diff --git a/graphics/event_objects/pics/dolls/duskull_doll.png b/graphics/event_objects/pics/dolls/duskull_doll.png index fdfbe3fecd..6e69796d72 100644 Binary files a/graphics/event_objects/pics/dolls/duskull_doll.png and b/graphics/event_objects/pics/dolls/duskull_doll.png differ diff --git a/graphics/event_objects/pics/dolls/gulpin_doll.png b/graphics/event_objects/pics/dolls/gulpin_doll.png index 48bf1824b3..5ffdefb0cd 100644 Binary files a/graphics/event_objects/pics/dolls/gulpin_doll.png and b/graphics/event_objects/pics/dolls/gulpin_doll.png differ diff --git a/graphics/event_objects/pics/dolls/jigglypuff_doll.png b/graphics/event_objects/pics/dolls/jigglypuff_doll.png index 1a2c8d44ac..75dcbe1eb6 100644 Binary files a/graphics/event_objects/pics/dolls/jigglypuff_doll.png and b/graphics/event_objects/pics/dolls/jigglypuff_doll.png differ diff --git a/graphics/event_objects/pics/dolls/kecleon_doll.png b/graphics/event_objects/pics/dolls/kecleon_doll.png index 92869882f1..a70feb67ce 100644 Binary files a/graphics/event_objects/pics/dolls/kecleon_doll.png and b/graphics/event_objects/pics/dolls/kecleon_doll.png differ diff --git a/graphics/event_objects/pics/dolls/lotad_doll.png b/graphics/event_objects/pics/dolls/lotad_doll.png index 9ee2182d19..69065a4240 100644 Binary files a/graphics/event_objects/pics/dolls/lotad_doll.png and b/graphics/event_objects/pics/dolls/lotad_doll.png differ diff --git a/graphics/event_objects/pics/dolls/marill_doll.png b/graphics/event_objects/pics/dolls/marill_doll.png index d5372f7ddf..d90c0cee1c 100644 Binary files a/graphics/event_objects/pics/dolls/marill_doll.png and b/graphics/event_objects/pics/dolls/marill_doll.png differ diff --git a/graphics/event_objects/pics/dolls/meowth_doll.png b/graphics/event_objects/pics/dolls/meowth_doll.png index 67ce3db4c0..cb093acfa1 100644 Binary files a/graphics/event_objects/pics/dolls/meowth_doll.png and b/graphics/event_objects/pics/dolls/meowth_doll.png differ diff --git a/graphics/event_objects/pics/dolls/mudkip_doll.png b/graphics/event_objects/pics/dolls/mudkip_doll.png index 8d6af157f2..440fde84bb 100644 Binary files a/graphics/event_objects/pics/dolls/mudkip_doll.png and b/graphics/event_objects/pics/dolls/mudkip_doll.png differ diff --git a/graphics/event_objects/pics/dolls/pichu_doll.png b/graphics/event_objects/pics/dolls/pichu_doll.png index 7a2aefc314..69bcc64ae5 100644 Binary files a/graphics/event_objects/pics/dolls/pichu_doll.png and b/graphics/event_objects/pics/dolls/pichu_doll.png differ diff --git a/graphics/event_objects/pics/dolls/pikachu_doll.png b/graphics/event_objects/pics/dolls/pikachu_doll.png index a762f1e15a..1c9342ad1c 100644 Binary files a/graphics/event_objects/pics/dolls/pikachu_doll.png and b/graphics/event_objects/pics/dolls/pikachu_doll.png differ diff --git a/graphics/event_objects/pics/dolls/seedot_doll.png b/graphics/event_objects/pics/dolls/seedot_doll.png index e00c485ae0..255b4c55d0 100644 Binary files a/graphics/event_objects/pics/dolls/seedot_doll.png and b/graphics/event_objects/pics/dolls/seedot_doll.png differ diff --git a/graphics/event_objects/pics/dolls/skitty_doll.png b/graphics/event_objects/pics/dolls/skitty_doll.png index 57ae4c5eda..6e04a9cb1d 100644 Binary files a/graphics/event_objects/pics/dolls/skitty_doll.png and b/graphics/event_objects/pics/dolls/skitty_doll.png differ diff --git a/graphics/event_objects/pics/dolls/smoochum_doll.png b/graphics/event_objects/pics/dolls/smoochum_doll.png index 4adacdfd56..7dc1180fdd 100644 Binary files a/graphics/event_objects/pics/dolls/smoochum_doll.png and b/graphics/event_objects/pics/dolls/smoochum_doll.png differ diff --git a/graphics/event_objects/pics/dolls/swablu_doll.png b/graphics/event_objects/pics/dolls/swablu_doll.png index 94e3051d7c..271576db85 100644 Binary files a/graphics/event_objects/pics/dolls/swablu_doll.png and b/graphics/event_objects/pics/dolls/swablu_doll.png differ diff --git a/graphics/event_objects/pics/dolls/togepi_doll.png b/graphics/event_objects/pics/dolls/togepi_doll.png index 4deda750c3..aa527b44bb 100644 Binary files a/graphics/event_objects/pics/dolls/togepi_doll.png and b/graphics/event_objects/pics/dolls/togepi_doll.png differ diff --git a/graphics/event_objects/pics/dolls/torchic_doll.png b/graphics/event_objects/pics/dolls/torchic_doll.png index 067eae9fb8..80969c4247 100644 Binary files a/graphics/event_objects/pics/dolls/torchic_doll.png and b/graphics/event_objects/pics/dolls/torchic_doll.png differ diff --git a/graphics/event_objects/pics/dolls/totodile_doll.png b/graphics/event_objects/pics/dolls/totodile_doll.png index b347125c94..46324159e8 100644 Binary files a/graphics/event_objects/pics/dolls/totodile_doll.png and b/graphics/event_objects/pics/dolls/totodile_doll.png differ diff --git a/graphics/event_objects/pics/dolls/treecko_doll.png b/graphics/event_objects/pics/dolls/treecko_doll.png index 3ccf44a587..6487fe8056 100644 Binary files a/graphics/event_objects/pics/dolls/treecko_doll.png and b/graphics/event_objects/pics/dolls/treecko_doll.png differ diff --git a/graphics/event_objects/pics/dolls/unused_magnemite_doll.png b/graphics/event_objects/pics/dolls/unused_magnemite_doll.png index bbf386e6ae..2c9ef10c77 100644 Binary files a/graphics/event_objects/pics/dolls/unused_magnemite_doll.png and b/graphics/event_objects/pics/dolls/unused_magnemite_doll.png differ diff --git a/graphics/event_objects/pics/dolls/unused_natu_doll.png b/graphics/event_objects/pics/dolls/unused_natu_doll.png index a2c4995e39..8087db81dd 100644 Binary files a/graphics/event_objects/pics/dolls/unused_natu_doll.png and b/graphics/event_objects/pics/dolls/unused_natu_doll.png differ diff --git a/graphics/event_objects/pics/dolls/unused_pikachu_doll.png b/graphics/event_objects/pics/dolls/unused_pikachu_doll.png index 9bf762d024..2e5181977a 100644 Binary files a/graphics/event_objects/pics/dolls/unused_pikachu_doll.png and b/graphics/event_objects/pics/dolls/unused_pikachu_doll.png differ diff --git a/graphics/event_objects/pics/dolls/unused_porygon2_doll.png b/graphics/event_objects/pics/dolls/unused_porygon2_doll.png index 465b7a0922..f68182762a 100644 Binary files a/graphics/event_objects/pics/dolls/unused_porygon2_doll.png and b/graphics/event_objects/pics/dolls/unused_porygon2_doll.png differ diff --git a/graphics/event_objects/pics/dolls/unused_squirtle_doll.png b/graphics/event_objects/pics/dolls/unused_squirtle_doll.png index ccc526aae7..0480227d0e 100644 Binary files a/graphics/event_objects/pics/dolls/unused_squirtle_doll.png and b/graphics/event_objects/pics/dolls/unused_squirtle_doll.png differ diff --git a/graphics/event_objects/pics/dolls/unused_wooper_doll.png b/graphics/event_objects/pics/dolls/unused_wooper_doll.png index 29bc8fd997..69d73eadac 100644 Binary files a/graphics/event_objects/pics/dolls/unused_wooper_doll.png and b/graphics/event_objects/pics/dolls/unused_wooper_doll.png differ diff --git a/graphics/event_objects/pics/dolls/wynaut_doll.png b/graphics/event_objects/pics/dolls/wynaut_doll.png index 3ac3d13114..5433281782 100644 Binary files a/graphics/event_objects/pics/dolls/wynaut_doll.png and b/graphics/event_objects/pics/dolls/wynaut_doll.png differ diff --git a/graphics/event_objects/pics/effects/arrow.png b/graphics/event_objects/pics/effects/arrow.png index a530b5344a..85ebdf514c 100644 Binary files a/graphics/event_objects/pics/effects/arrow.png and b/graphics/event_objects/pics/effects/arrow.png differ diff --git a/graphics/event_objects/pics/effects/ash.png b/graphics/event_objects/pics/effects/ash.png index 472583def0..8890d5ab8e 100644 Binary files a/graphics/event_objects/pics/effects/ash.png and b/graphics/event_objects/pics/effects/ash.png differ diff --git a/graphics/event_objects/pics/effects/berry_tree_growth_sparkle.png b/graphics/event_objects/pics/effects/berry_tree_growth_sparkle.png new file mode 100644 index 0000000000..2910c2a499 Binary files /dev/null and b/graphics/event_objects/pics/effects/berry_tree_growth_sparkle.png differ diff --git a/graphics/event_objects/pics/effects/berry_tree_growth_sparkle/0.png b/graphics/event_objects/pics/effects/berry_tree_growth_sparkle/0.png deleted file mode 100644 index f3e751d3af..0000000000 Binary files a/graphics/event_objects/pics/effects/berry_tree_growth_sparkle/0.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/berry_tree_growth_sparkle/1.png b/graphics/event_objects/pics/effects/berry_tree_growth_sparkle/1.png deleted file mode 100644 index d48fd12349..0000000000 Binary files a/graphics/event_objects/pics/effects/berry_tree_growth_sparkle/1.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/berry_tree_growth_sparkle/2.png b/graphics/event_objects/pics/effects/berry_tree_growth_sparkle/2.png deleted file mode 100644 index 9a9abf73e4..0000000000 Binary files a/graphics/event_objects/pics/effects/berry_tree_growth_sparkle/2.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/berry_tree_growth_sparkle/3.png b/graphics/event_objects/pics/effects/berry_tree_growth_sparkle/3.png deleted file mode 100644 index 857abfb0b4..0000000000 Binary files a/graphics/event_objects/pics/effects/berry_tree_growth_sparkle/3.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/berry_tree_growth_sparkle/4.png b/graphics/event_objects/pics/effects/berry_tree_growth_sparkle/4.png deleted file mode 100644 index bce9df4c78..0000000000 Binary files a/graphics/event_objects/pics/effects/berry_tree_growth_sparkle/4.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/berry_tree_growth_sparkle/5.png b/graphics/event_objects/pics/effects/berry_tree_growth_sparkle/5.png deleted file mode 100644 index 4c757bf6bc..0000000000 Binary files a/graphics/event_objects/pics/effects/berry_tree_growth_sparkle/5.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 deleted file mode 100644 index 4fd6e4d5fe..0000000000 Binary files a/graphics/event_objects/pics/effects/berry_tree_growth_sparkle/berry_tree_growth_sparkle.png and /dev/null 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 index 4546340fe7..171d23457e 100644 Binary files a/graphics/event_objects/pics/effects/bike_hop_big_splash.png and b/graphics/event_objects/pics/effects/bike_hop_big_splash.png 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 index 523238a1d4..e98ded0257 100644 Binary files a/graphics/event_objects/pics/effects/bike_hop_small_splash.png and b/graphics/event_objects/pics/effects/bike_hop_small_splash.png differ diff --git a/graphics/event_objects/pics/effects/bike_hop_tall_grass.png b/graphics/event_objects/pics/effects/bike_hop_tall_grass.png new file mode 100755 index 0000000000..c43da9f280 Binary files /dev/null and b/graphics/event_objects/pics/effects/bike_hop_tall_grass.png differ diff --git a/graphics/event_objects/pics/effects/bike_hop_tall_grass/0.png b/graphics/event_objects/pics/effects/bike_hop_tall_grass/0.png deleted file mode 100644 index d2768ec0ce..0000000000 Binary files a/graphics/event_objects/pics/effects/bike_hop_tall_grass/0.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/bike_hop_tall_grass/1.png b/graphics/event_objects/pics/effects/bike_hop_tall_grass/1.png deleted file mode 100644 index 7816f4d00d..0000000000 Binary files a/graphics/event_objects/pics/effects/bike_hop_tall_grass/1.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/bike_hop_tall_grass/2.png b/graphics/event_objects/pics/effects/bike_hop_tall_grass/2.png deleted file mode 100644 index 00c51d2765..0000000000 Binary files a/graphics/event_objects/pics/effects/bike_hop_tall_grass/2.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/bike_hop_tall_grass/3.png b/graphics/event_objects/pics/effects/bike_hop_tall_grass/3.png deleted file mode 100644 index 210382b933..0000000000 Binary files a/graphics/event_objects/pics/effects/bike_hop_tall_grass/3.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 deleted file mode 100644 index 805f260235..0000000000 Binary files a/graphics/event_objects/pics/effects/bike_hop_tall_grass/bike_hop_tall_grass.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/bike_tire_tracks.png b/graphics/event_objects/pics/effects/bike_tire_tracks.png new file mode 100644 index 0000000000..2d989d28cb Binary files /dev/null and b/graphics/event_objects/pics/effects/bike_tire_tracks.png differ diff --git a/graphics/event_objects/pics/effects/bike_tire_tracks/0.png b/graphics/event_objects/pics/effects/bike_tire_tracks/0.png deleted file mode 100644 index d4fd46f9ba..0000000000 Binary files a/graphics/event_objects/pics/effects/bike_tire_tracks/0.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/bike_tire_tracks/1.png b/graphics/event_objects/pics/effects/bike_tire_tracks/1.png deleted file mode 100644 index 9095cdd745..0000000000 Binary files a/graphics/event_objects/pics/effects/bike_tire_tracks/1.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/bike_tire_tracks/2.png b/graphics/event_objects/pics/effects/bike_tire_tracks/2.png deleted file mode 100644 index 56907c153a..0000000000 Binary files a/graphics/event_objects/pics/effects/bike_tire_tracks/2.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/bike_tire_tracks/3.png b/graphics/event_objects/pics/effects/bike_tire_tracks/3.png deleted file mode 100644 index 397bfb4181..0000000000 Binary files a/graphics/event_objects/pics/effects/bike_tire_tracks/3.png and /dev/null 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 deleted file mode 100644 index 383a393c4d..0000000000 Binary files a/graphics/event_objects/pics/effects/bike_tire_tracks/bike_tire_tracks.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/bird.png b/graphics/event_objects/pics/effects/bird.png index 3147f98f52..e9d9798fde 100644 Binary files a/graphics/event_objects/pics/effects/bird.png and b/graphics/event_objects/pics/effects/bird.png differ diff --git a/graphics/event_objects/pics/effects/bubbles.png b/graphics/event_objects/pics/effects/bubbles.png index 554fc8425e..b04ceaf095 100644 Binary files a/graphics/event_objects/pics/effects/bubbles.png and b/graphics/event_objects/pics/effects/bubbles.png differ diff --git a/graphics/event_objects/pics/effects/deep_sand_footprints.png b/graphics/event_objects/pics/effects/deep_sand_footprints.png new file mode 100644 index 0000000000..ea7484b23e Binary files /dev/null and b/graphics/event_objects/pics/effects/deep_sand_footprints.png differ diff --git a/graphics/event_objects/pics/effects/deep_sand_footprints/0.png b/graphics/event_objects/pics/effects/deep_sand_footprints/0.png deleted file mode 100644 index c449b223e9..0000000000 Binary files a/graphics/event_objects/pics/effects/deep_sand_footprints/0.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/deep_sand_footprints/1.png b/graphics/event_objects/pics/effects/deep_sand_footprints/1.png deleted file mode 100644 index 2a1d5cce5d..0000000000 Binary files a/graphics/event_objects/pics/effects/deep_sand_footprints/1.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 deleted file mode 100644 index 8719bd7a24..0000000000 Binary files a/graphics/event_objects/pics/effects/deep_sand_footprints/deep_sand_footprints.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/ground_impact_dust.png b/graphics/event_objects/pics/effects/ground_impact_dust.png new file mode 100644 index 0000000000..d4562fe57d Binary files /dev/null and b/graphics/event_objects/pics/effects/ground_impact_dust.png differ diff --git a/graphics/event_objects/pics/effects/ground_impact_dust/0.png b/graphics/event_objects/pics/effects/ground_impact_dust/0.png deleted file mode 100644 index 57e2e88982..0000000000 Binary files a/graphics/event_objects/pics/effects/ground_impact_dust/0.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/ground_impact_dust/1.png b/graphics/event_objects/pics/effects/ground_impact_dust/1.png deleted file mode 100644 index d91554b6ea..0000000000 Binary files a/graphics/event_objects/pics/effects/ground_impact_dust/1.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/ground_impact_dust/2.png b/graphics/event_objects/pics/effects/ground_impact_dust/2.png deleted file mode 100644 index 8d0235141a..0000000000 Binary files a/graphics/event_objects/pics/effects/ground_impact_dust/2.png and /dev/null 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 deleted file mode 100644 index 83b25a6057..0000000000 Binary files a/graphics/event_objects/pics/effects/ground_impact_dust/ground_impact_dust.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/hot_springs_water.png b/graphics/event_objects/pics/effects/hot_springs_water.png index 1b6550b196..18892239e2 100644 Binary files a/graphics/event_objects/pics/effects/hot_springs_water.png and b/graphics/event_objects/pics/effects/hot_springs_water.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 index b5161274ab..3247b81696 100644 Binary files a/graphics/event_objects/pics/effects/jump_out_of_ash.png and b/graphics/event_objects/pics/effects/jump_out_of_ash.png differ diff --git a/graphics/event_objects/pics/effects/long_grass.png b/graphics/event_objects/pics/effects/long_grass.png new file mode 100644 index 0000000000..265e45056b Binary files /dev/null and b/graphics/event_objects/pics/effects/long_grass.png differ diff --git a/graphics/event_objects/pics/effects/long_grass/0.png b/graphics/event_objects/pics/effects/long_grass/0.png deleted file mode 100644 index 4a02b3d174..0000000000 Binary files a/graphics/event_objects/pics/effects/long_grass/0.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/long_grass/1.png b/graphics/event_objects/pics/effects/long_grass/1.png deleted file mode 100644 index 97f652c6d4..0000000000 Binary files a/graphics/event_objects/pics/effects/long_grass/1.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/long_grass/2.png b/graphics/event_objects/pics/effects/long_grass/2.png deleted file mode 100644 index 313226f8bc..0000000000 Binary files a/graphics/event_objects/pics/effects/long_grass/2.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/long_grass/3.png b/graphics/event_objects/pics/effects/long_grass/3.png deleted file mode 100644 index 0565b40695..0000000000 Binary files a/graphics/event_objects/pics/effects/long_grass/3.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 deleted file mode 100644 index 5dfc3b2469..0000000000 Binary files a/graphics/event_objects/pics/effects/long_grass/long_grass.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/mountain_disguise.png b/graphics/event_objects/pics/effects/mountain_disguise.png index ad592eac89..c394855e61 100644 Binary files a/graphics/event_objects/pics/effects/mountain_disguise.png and b/graphics/event_objects/pics/effects/mountain_disguise.png differ diff --git a/graphics/event_objects/pics/effects/ripple.png b/graphics/event_objects/pics/effects/ripple.png index 0352ef2d8b..87e6dd6176 100644 Binary files a/graphics/event_objects/pics/effects/ripple.png and b/graphics/event_objects/pics/effects/ripple.png differ diff --git a/graphics/event_objects/pics/effects/sand_disguise_placeholder.png b/graphics/event_objects/pics/effects/sand_disguise_placeholder.png old mode 100644 new mode 100755 index 66b9993e77..76808a53bd Binary files a/graphics/event_objects/pics/effects/sand_disguise_placeholder.png and b/graphics/event_objects/pics/effects/sand_disguise_placeholder.png differ diff --git a/graphics/event_objects/pics/effects/sand_footprints.png b/graphics/event_objects/pics/effects/sand_footprints.png new file mode 100644 index 0000000000..71c54f7872 Binary files /dev/null and b/graphics/event_objects/pics/effects/sand_footprints.png differ diff --git a/graphics/event_objects/pics/effects/sand_footprints/0.png b/graphics/event_objects/pics/effects/sand_footprints/0.png deleted file mode 100644 index 3cc79aa184..0000000000 Binary files a/graphics/event_objects/pics/effects/sand_footprints/0.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/sand_footprints/1.png b/graphics/event_objects/pics/effects/sand_footprints/1.png deleted file mode 100644 index 80d33783b3..0000000000 Binary files a/graphics/event_objects/pics/effects/sand_footprints/1.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 deleted file mode 100644 index cec011d0a5..0000000000 Binary files a/graphics/event_objects/pics/effects/sand_footprints/sand_footprints.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/shadow_extra_large.png b/graphics/event_objects/pics/effects/shadow_extra_large.png index 41b37d8fba..765a5291a8 100644 Binary files a/graphics/event_objects/pics/effects/shadow_extra_large.png and b/graphics/event_objects/pics/effects/shadow_extra_large.png differ diff --git a/graphics/event_objects/pics/effects/shadow_large.png b/graphics/event_objects/pics/effects/shadow_large.png index f0e76cd7ff..e917823b05 100644 Binary files a/graphics/event_objects/pics/effects/shadow_large.png and b/graphics/event_objects/pics/effects/shadow_large.png differ diff --git a/graphics/event_objects/pics/effects/shadow_medium.png b/graphics/event_objects/pics/effects/shadow_medium.png index 7bf9afef71..83ab6e1f6e 100644 Binary files a/graphics/event_objects/pics/effects/shadow_medium.png and b/graphics/event_objects/pics/effects/shadow_medium.png differ diff --git a/graphics/event_objects/pics/effects/shadow_small.png b/graphics/event_objects/pics/effects/shadow_small.png index 6c13c1b862..f5feada2b9 100644 Binary files a/graphics/event_objects/pics/effects/shadow_small.png and b/graphics/event_objects/pics/effects/shadow_small.png differ diff --git a/graphics/event_objects/pics/effects/short_grass.png b/graphics/event_objects/pics/effects/short_grass.png index 53eb7924e2..dc477e29fc 100644 Binary files a/graphics/event_objects/pics/effects/short_grass.png and b/graphics/event_objects/pics/effects/short_grass.png differ diff --git a/graphics/event_objects/pics/effects/splash.png b/graphics/event_objects/pics/effects/splash.png index a33a0c9dac..6e55ffae0b 100644 Binary files a/graphics/event_objects/pics/effects/splash.png and b/graphics/event_objects/pics/effects/splash.png differ diff --git a/graphics/event_objects/pics/effects/surf_blob.png b/graphics/event_objects/pics/effects/surf_blob.png index 7e91e17dc1..b5656cf16b 100644 Binary files a/graphics/event_objects/pics/effects/surf_blob.png and b/graphics/event_objects/pics/effects/surf_blob.png differ diff --git a/graphics/event_objects/pics/effects/tall_grass.png b/graphics/event_objects/pics/effects/tall_grass.png index b6b44307a9..919fc6f8a8 100644 Binary files a/graphics/event_objects/pics/effects/tall_grass.png and b/graphics/event_objects/pics/effects/tall_grass.png differ diff --git a/graphics/event_objects/pics/effects/tree_disguise.png b/graphics/event_objects/pics/effects/tree_disguise.png index 77d07ef4ed..8acbfbd5d4 100644 Binary files a/graphics/event_objects/pics/effects/tree_disguise.png and b/graphics/event_objects/pics/effects/tree_disguise.png differ diff --git a/graphics/event_objects/pics/effects/unknown_16.png b/graphics/event_objects/pics/effects/unknown_16.png new file mode 100755 index 0000000000..bb4789f9f5 Binary files /dev/null and b/graphics/event_objects/pics/effects/unknown_16.png differ diff --git a/graphics/event_objects/pics/effects/unknown_16/0.png b/graphics/event_objects/pics/effects/unknown_16/0.png deleted file mode 100644 index 491801c325..0000000000 Binary files a/graphics/event_objects/pics/effects/unknown_16/0.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/unknown_16/1.png b/graphics/event_objects/pics/effects/unknown_16/1.png deleted file mode 100644 index f83ca15da5..0000000000 Binary files a/graphics/event_objects/pics/effects/unknown_16/1.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/unknown_16/2.png b/graphics/event_objects/pics/effects/unknown_16/2.png deleted file mode 100644 index 073aa9b7ef..0000000000 Binary files a/graphics/event_objects/pics/effects/unknown_16/2.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/unknown_16/3.png b/graphics/event_objects/pics/effects/unknown_16/3.png deleted file mode 100644 index e7b5c96cf5..0000000000 Binary files a/graphics/event_objects/pics/effects/unknown_16/3.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/unknown_16/4.png b/graphics/event_objects/pics/effects/unknown_16/4.png deleted file mode 100644 index 8972d5d810..0000000000 Binary files a/graphics/event_objects/pics/effects/unknown_16/4.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/unknown_16/5.png b/graphics/event_objects/pics/effects/unknown_16/5.png deleted file mode 100644 index d570a9a8d7..0000000000 Binary files a/graphics/event_objects/pics/effects/unknown_16/5.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 index fedf86a10b..f158bebc81 100644 Binary files a/graphics/event_objects/pics/effects/unknown_17.png and b/graphics/event_objects/pics/effects/unknown_17.png differ diff --git a/graphics/event_objects/pics/effects/unknown_18.png b/graphics/event_objects/pics/effects/unknown_18.png new file mode 100644 index 0000000000..65f4d97e29 Binary files /dev/null and b/graphics/event_objects/pics/effects/unknown_18.png differ diff --git a/graphics/event_objects/pics/effects/unknown_18/0.png b/graphics/event_objects/pics/effects/unknown_18/0.png deleted file mode 100644 index 70b39df595..0000000000 Binary files a/graphics/event_objects/pics/effects/unknown_18/0.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/unknown_18/1.png b/graphics/event_objects/pics/effects/unknown_18/1.png deleted file mode 100644 index 392298f5a7..0000000000 Binary files a/graphics/event_objects/pics/effects/unknown_18/1.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/unknown_18/2.png b/graphics/event_objects/pics/effects/unknown_18/2.png deleted file mode 100644 index ff418e940c..0000000000 Binary files a/graphics/event_objects/pics/effects/unknown_18/2.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/unknown_18/3.png b/graphics/event_objects/pics/effects/unknown_18/3.png deleted file mode 100644 index 0e1e134386..0000000000 Binary files a/graphics/event_objects/pics/effects/unknown_18/3.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 deleted file mode 100644 index 19f08ac537..0000000000 Binary files a/graphics/event_objects/pics/effects/unknown_18/unknown_18.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/unknown_19.png b/graphics/event_objects/pics/effects/unknown_19.png new file mode 100644 index 0000000000..4ae851e58b Binary files /dev/null and b/graphics/event_objects/pics/effects/unknown_19.png differ diff --git a/graphics/event_objects/pics/effects/unknown_19/0.png b/graphics/event_objects/pics/effects/unknown_19/0.png deleted file mode 100644 index ef80050661..0000000000 Binary files a/graphics/event_objects/pics/effects/unknown_19/0.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/unknown_19/1.png b/graphics/event_objects/pics/effects/unknown_19/1.png deleted file mode 100644 index 6fde1a2913..0000000000 Binary files a/graphics/event_objects/pics/effects/unknown_19/1.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/unknown_19/2.png b/graphics/event_objects/pics/effects/unknown_19/2.png deleted file mode 100644 index c385fd84cc..0000000000 Binary files a/graphics/event_objects/pics/effects/unknown_19/2.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/unknown_19/3.png b/graphics/event_objects/pics/effects/unknown_19/3.png deleted file mode 100644 index 084c20314a..0000000000 Binary files a/graphics/event_objects/pics/effects/unknown_19/3.png and /dev/null 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 deleted file mode 100644 index d670cde5fc..0000000000 Binary files a/graphics/event_objects/pics/effects/unknown_19/unknown_19.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/unknown_20.png b/graphics/event_objects/pics/effects/unknown_20.png new file mode 100644 index 0000000000..7d6af5e0cd Binary files /dev/null and b/graphics/event_objects/pics/effects/unknown_20.png differ diff --git a/graphics/event_objects/pics/effects/unknown_20/0.png b/graphics/event_objects/pics/effects/unknown_20/0.png deleted file mode 100644 index eec853d53b..0000000000 Binary files a/graphics/event_objects/pics/effects/unknown_20/0.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/unknown_20/1.png b/graphics/event_objects/pics/effects/unknown_20/1.png deleted file mode 100644 index f4782fc670..0000000000 Binary files a/graphics/event_objects/pics/effects/unknown_20/1.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/unknown_20/2.png b/graphics/event_objects/pics/effects/unknown_20/2.png deleted file mode 100644 index 416dae69db..0000000000 Binary files a/graphics/event_objects/pics/effects/unknown_20/2.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/unknown_20/3.png b/graphics/event_objects/pics/effects/unknown_20/3.png deleted file mode 100644 index 3d966e81c6..0000000000 Binary files a/graphics/event_objects/pics/effects/unknown_20/3.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/unknown_20/4.png b/graphics/event_objects/pics/effects/unknown_20/4.png deleted file mode 100644 index 6bbfbca120..0000000000 Binary files a/graphics/event_objects/pics/effects/unknown_20/4.png and /dev/null 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 deleted file mode 100644 index 83e35467a1..0000000000 Binary files a/graphics/event_objects/pics/effects/unknown_20/unknown_20.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/unknown_29.png b/graphics/event_objects/pics/effects/unknown_29.png new file mode 100644 index 0000000000..03f89a5f5b Binary files /dev/null and b/graphics/event_objects/pics/effects/unknown_29.png differ diff --git a/graphics/event_objects/pics/effects/unknown_29/0.png b/graphics/event_objects/pics/effects/unknown_29/0.png deleted file mode 100644 index 87fe91c975..0000000000 Binary files a/graphics/event_objects/pics/effects/unknown_29/0.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/unknown_29/1.png b/graphics/event_objects/pics/effects/unknown_29/1.png deleted file mode 100644 index c20fb34bbe..0000000000 Binary files a/graphics/event_objects/pics/effects/unknown_29/1.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/unknown_29/2.png b/graphics/event_objects/pics/effects/unknown_29/2.png deleted file mode 100644 index def972b20a..0000000000 Binary files a/graphics/event_objects/pics/effects/unknown_29/2.png and /dev/null 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 deleted file mode 100644 index 2da55f179d..0000000000 Binary files a/graphics/event_objects/pics/effects/unknown_29/unknown_29.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/unknown_33.png b/graphics/event_objects/pics/effects/unknown_33.png new file mode 100644 index 0000000000..26b8522003 Binary files /dev/null and b/graphics/event_objects/pics/effects/unknown_33.png differ diff --git a/graphics/event_objects/pics/effects/unknown_33/0.png b/graphics/event_objects/pics/effects/unknown_33/0.png deleted file mode 100644 index 2241eabd31..0000000000 Binary files a/graphics/event_objects/pics/effects/unknown_33/0.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/unknown_33/1.png b/graphics/event_objects/pics/effects/unknown_33/1.png deleted file mode 100644 index 5f90405d83..0000000000 Binary files a/graphics/event_objects/pics/effects/unknown_33/1.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/unknown_33/2.png b/graphics/event_objects/pics/effects/unknown_33/2.png deleted file mode 100644 index 3f1c3a76a4..0000000000 Binary files a/graphics/event_objects/pics/effects/unknown_33/2.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/unknown_33/3.png b/graphics/event_objects/pics/effects/unknown_33/3.png deleted file mode 100644 index 2696f4a5ac..0000000000 Binary files a/graphics/event_objects/pics/effects/unknown_33/3.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/unknown_33/4.png b/graphics/event_objects/pics/effects/unknown_33/4.png deleted file mode 100644 index c2d1785bf7..0000000000 Binary files a/graphics/event_objects/pics/effects/unknown_33/4.png and /dev/null 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 deleted file mode 100644 index 67f589ece3..0000000000 Binary files a/graphics/event_objects/pics/effects/unknown_33/unknown_33.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/unknown_35.png b/graphics/event_objects/pics/effects/unknown_35.png new file mode 100644 index 0000000000..b2072bd264 Binary files /dev/null and b/graphics/event_objects/pics/effects/unknown_35.png differ diff --git a/graphics/event_objects/pics/effects/unknown_35/0.png b/graphics/event_objects/pics/effects/unknown_35/0.png deleted file mode 100644 index c2ae128f7f..0000000000 Binary files a/graphics/event_objects/pics/effects/unknown_35/0.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/unknown_35/1.png b/graphics/event_objects/pics/effects/unknown_35/1.png deleted file mode 100644 index fe68b19fd0..0000000000 Binary files a/graphics/event_objects/pics/effects/unknown_35/1.png and /dev/null 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 deleted file mode 100644 index 8dbffe36ca..0000000000 Binary files a/graphics/event_objects/pics/effects/unknown_35/unknown_35.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/unknown_4F7E38/0.png b/graphics/event_objects/pics/effects/unknown_4F7E38/0.png deleted file mode 100644 index 685aee28b7..0000000000 Binary files a/graphics/event_objects/pics/effects/unknown_4F7E38/0.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/unused_grass.png b/graphics/event_objects/pics/effects/unused_grass.png new file mode 100644 index 0000000000..ffd68ec1da Binary files /dev/null and b/graphics/event_objects/pics/effects/unused_grass.png differ diff --git a/graphics/event_objects/pics/effects/unused_grass/0.png b/graphics/event_objects/pics/effects/unused_grass/0.png deleted file mode 100644 index 2e16f15cb6..0000000000 Binary files a/graphics/event_objects/pics/effects/unused_grass/0.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/unused_grass/1.png b/graphics/event_objects/pics/effects/unused_grass/1.png deleted file mode 100644 index dd33b0d883..0000000000 Binary files a/graphics/event_objects/pics/effects/unused_grass/1.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/unused_grass/2.png b/graphics/event_objects/pics/effects/unused_grass/2.png deleted file mode 100644 index 345d454cdd..0000000000 Binary files a/graphics/event_objects/pics/effects/unused_grass/2.png and /dev/null differ diff --git a/graphics/event_objects/pics/effects/unused_grass/3.png b/graphics/event_objects/pics/effects/unused_grass/3.png deleted file mode 100644 index 0876761026..0000000000 Binary files a/graphics/event_objects/pics/effects/unused_grass/3.png and /dev/null 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 deleted file mode 100644 index 0c573b4aa4..0000000000 Binary files a/graphics/event_objects/pics/effects/unused_grass/unused_grass.png and /dev/null differ diff --git a/graphics/event_objects/pics/misc/birchs_bag.png b/graphics/event_objects/pics/misc/birchs_bag.png index 045e5546c7..21f463b718 100644 Binary files a/graphics/event_objects/pics/misc/birchs_bag.png and b/graphics/event_objects/pics/misc/birchs_bag.png differ diff --git a/graphics/event_objects/pics/misc/birth_island_stone.png b/graphics/event_objects/pics/misc/birth_island_stone.png index 2ec134c229..3c5d82c119 100644 Binary files a/graphics/event_objects/pics/misc/birth_island_stone.png and b/graphics/event_objects/pics/misc/birth_island_stone.png differ diff --git a/graphics/event_objects/pics/misc/breakable_rock.png b/graphics/event_objects/pics/misc/breakable_rock.png index db9926804d..c5054da411 100644 Binary files a/graphics/event_objects/pics/misc/breakable_rock.png and b/graphics/event_objects/pics/misc/breakable_rock.png differ diff --git a/graphics/event_objects/pics/misc/cable_car.png b/graphics/event_objects/pics/misc/cable_car.png index e0bd21ddfa..67f581fb97 100644 Binary files a/graphics/event_objects/pics/misc/cable_car.png and b/graphics/event_objects/pics/misc/cable_car.png differ diff --git a/graphics/event_objects/pics/misc/cuttable_tree.png b/graphics/event_objects/pics/misc/cuttable_tree.png index 6071f4a61e..fba4ced1ac 100644 Binary files a/graphics/event_objects/pics/misc/cuttable_tree.png and b/graphics/event_objects/pics/misc/cuttable_tree.png differ diff --git a/graphics/event_objects/pics/misc/fossil.png b/graphics/event_objects/pics/misc/fossil.png index a8da0e8ff6..3e070a6c9b 100644 Binary files a/graphics/event_objects/pics/misc/fossil.png and b/graphics/event_objects/pics/misc/fossil.png differ diff --git a/graphics/event_objects/pics/misc/item_ball.png b/graphics/event_objects/pics/misc/item_ball.png index a30e02fb15..ef02e158c9 100644 Binary files a/graphics/event_objects/pics/misc/item_ball.png and b/graphics/event_objects/pics/misc/item_ball.png differ diff --git a/graphics/event_objects/pics/misc/moving_box.png b/graphics/event_objects/pics/misc/moving_box.png index 3cbc419006..43b65c2c15 100644 Binary files a/graphics/event_objects/pics/misc/moving_box.png and b/graphics/event_objects/pics/misc/moving_box.png differ diff --git a/graphics/event_objects/pics/misc/mr_brineys_boat.png b/graphics/event_objects/pics/misc/mr_brineys_boat.png index e790eb172d..249f25b51b 100644 Binary files a/graphics/event_objects/pics/misc/mr_brineys_boat.png and b/graphics/event_objects/pics/misc/mr_brineys_boat.png differ diff --git a/graphics/event_objects/pics/misc/pushable_boulder.png b/graphics/event_objects/pics/misc/pushable_boulder.png index a6962123c4..eba6a116f9 100644 Binary files a/graphics/event_objects/pics/misc/pushable_boulder.png and b/graphics/event_objects/pics/misc/pushable_boulder.png differ diff --git a/graphics/event_objects/pics/misc/ss_tidal.png b/graphics/event_objects/pics/misc/ss_tidal.png index 40ca9a3f3c..44510d25ae 100644 Binary files a/graphics/event_objects/pics/misc/ss_tidal.png and b/graphics/event_objects/pics/misc/ss_tidal.png differ diff --git a/graphics/event_objects/pics/misc/statue.png b/graphics/event_objects/pics/misc/statue.png index 725aa8a7bf..7b4b13cd73 100644 Binary files a/graphics/event_objects/pics/misc/statue.png and b/graphics/event_objects/pics/misc/statue.png differ diff --git a/graphics/event_objects/pics/misc/submarine_shadow.png b/graphics/event_objects/pics/misc/submarine_shadow.png index b9dfc4c553..d43bc98dc1 100644 Binary files a/graphics/event_objects/pics/misc/submarine_shadow.png and b/graphics/event_objects/pics/misc/submarine_shadow.png differ diff --git a/graphics/event_objects/pics/misc/truck.png b/graphics/event_objects/pics/misc/truck.png index 0d31ffbc20..46940a9a3a 100644 Binary files a/graphics/event_objects/pics/misc/truck.png and b/graphics/event_objects/pics/misc/truck.png differ diff --git a/graphics/event_objects/pics/people/artist.png b/graphics/event_objects/pics/people/artist.png index 7a40a2e38f..1a98032a7f 100644 Binary files a/graphics/event_objects/pics/people/artist.png and b/graphics/event_objects/pics/people/artist.png differ diff --git a/graphics/event_objects/pics/people/beauty.png b/graphics/event_objects/pics/people/beauty.png index ac07e8e9b9..dd3a3d76b1 100644 Binary files a/graphics/event_objects/pics/people/beauty.png and b/graphics/event_objects/pics/people/beauty.png differ diff --git a/graphics/event_objects/pics/people/black_belt.png b/graphics/event_objects/pics/people/black_belt.png index 88043e0c0f..e6c901933e 100644 Binary files a/graphics/event_objects/pics/people/black_belt.png and b/graphics/event_objects/pics/people/black_belt.png differ diff --git a/graphics/event_objects/pics/people/boy_1.png b/graphics/event_objects/pics/people/boy_1.png index 72cb2c2b51..cd7507c9b2 100644 Binary files a/graphics/event_objects/pics/people/boy_1.png and b/graphics/event_objects/pics/people/boy_1.png differ diff --git a/graphics/event_objects/pics/people/boy_2.png b/graphics/event_objects/pics/people/boy_2.png index c8d6db12e7..ff57b602bf 100644 Binary files a/graphics/event_objects/pics/people/boy_2.png and b/graphics/event_objects/pics/people/boy_2.png differ diff --git a/graphics/event_objects/pics/people/boy_3.png b/graphics/event_objects/pics/people/boy_3.png index dd8f2e51d9..b6dba79447 100644 Binary files a/graphics/event_objects/pics/people/boy_3.png and b/graphics/event_objects/pics/people/boy_3.png differ diff --git a/graphics/event_objects/pics/people/boy_4.png b/graphics/event_objects/pics/people/boy_4.png index 2e2fd0412a..6536d2c23a 100644 Binary files a/graphics/event_objects/pics/people/boy_4.png and b/graphics/event_objects/pics/people/boy_4.png differ diff --git a/graphics/event_objects/pics/people/boy_5.png b/graphics/event_objects/pics/people/boy_5.png index 19fff5b36e..b0b7426516 100644 Binary files a/graphics/event_objects/pics/people/boy_5.png and b/graphics/event_objects/pics/people/boy_5.png differ diff --git a/graphics/event_objects/pics/people/brendan/acro_bike.png b/graphics/event_objects/pics/people/brendan/acro_bike.png index 367fa1bd5a..183e2b7c95 100644 Binary files a/graphics/event_objects/pics/people/brendan/acro_bike.png and b/graphics/event_objects/pics/people/brendan/acro_bike.png differ diff --git a/graphics/event_objects/pics/people/brendan/decorating.png b/graphics/event_objects/pics/people/brendan/decorating.png index c0839120a8..f3771e60e4 100644 Binary files a/graphics/event_objects/pics/people/brendan/decorating.png and b/graphics/event_objects/pics/people/brendan/decorating.png differ diff --git a/graphics/event_objects/pics/people/brendan/field_move.png b/graphics/event_objects/pics/people/brendan/field_move.png index 7f85137a4c..26ef747494 100644 Binary files a/graphics/event_objects/pics/people/brendan/field_move.png and b/graphics/event_objects/pics/people/brendan/field_move.png differ diff --git a/graphics/event_objects/pics/people/brendan/fishing.png b/graphics/event_objects/pics/people/brendan/fishing.png index 8ebe7ae4d9..bb2a8f7472 100644 Binary files a/graphics/event_objects/pics/people/brendan/fishing.png and b/graphics/event_objects/pics/people/brendan/fishing.png differ diff --git a/graphics/event_objects/pics/people/brendan/mach_bike.png b/graphics/event_objects/pics/people/brendan/mach_bike.png index a1518cf9a7..661ebb7330 100644 Binary files a/graphics/event_objects/pics/people/brendan/mach_bike.png and b/graphics/event_objects/pics/people/brendan/mach_bike.png differ diff --git a/graphics/event_objects/pics/people/brendan/running.png b/graphics/event_objects/pics/people/brendan/running.png index cf5a6b61e6..a66dbf8d3e 100644 Binary files a/graphics/event_objects/pics/people/brendan/running.png 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 index c0ddb14f6a..1baa4afc6c 100644 Binary files a/graphics/event_objects/pics/people/brendan/surfing.png and b/graphics/event_objects/pics/people/brendan/surfing.png differ diff --git a/graphics/event_objects/pics/people/brendan/underwater.png b/graphics/event_objects/pics/people/brendan/underwater.png index 86e436e55d..47f926b612 100644 Binary files a/graphics/event_objects/pics/people/brendan/underwater.png and b/graphics/event_objects/pics/people/brendan/underwater.png differ diff --git a/graphics/event_objects/pics/people/brendan/walking.png b/graphics/event_objects/pics/people/brendan/walking.png index 31b64a1af6..0560881fa5 100644 Binary files a/graphics/event_objects/pics/people/brendan/walking.png 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 index e348d8994d..999608437b 100644 Binary files a/graphics/event_objects/pics/people/brendan/watering.png and b/graphics/event_objects/pics/people/brendan/watering.png differ diff --git a/graphics/event_objects/pics/people/bug_catcher.png b/graphics/event_objects/pics/people/bug_catcher.png index 4890502514..7f733b9361 100644 Binary files a/graphics/event_objects/pics/people/bug_catcher.png and b/graphics/event_objects/pics/people/bug_catcher.png differ diff --git a/graphics/event_objects/pics/people/cameraman.png b/graphics/event_objects/pics/people/cameraman.png index 23addbab1d..b1f972438a 100644 Binary files a/graphics/event_objects/pics/people/cameraman.png and b/graphics/event_objects/pics/people/cameraman.png differ diff --git a/graphics/event_objects/pics/people/camper.png b/graphics/event_objects/pics/people/camper.png index c931d478d9..3719d64f34 100644 Binary files a/graphics/event_objects/pics/people/camper.png and b/graphics/event_objects/pics/people/camper.png differ diff --git a/graphics/event_objects/pics/people/contest_old_man.png b/graphics/event_objects/pics/people/contest_old_man.png index b5e9e5cde6..919230cb7e 100644 Binary files a/graphics/event_objects/pics/people/contest_old_man.png and b/graphics/event_objects/pics/people/contest_old_man.png differ diff --git a/graphics/event_objects/pics/people/cook.png b/graphics/event_objects/pics/people/cook.png index 66d77802cb..9ac187130b 100644 Binary files a/graphics/event_objects/pics/people/cook.png and b/graphics/event_objects/pics/people/cook.png differ diff --git a/graphics/event_objects/pics/people/cycling_triathlete_f.png b/graphics/event_objects/pics/people/cycling_triathlete_f.png index 42be9a608a..a291b79c50 100644 Binary files a/graphics/event_objects/pics/people/cycling_triathlete_f.png and b/graphics/event_objects/pics/people/cycling_triathlete_f.png differ diff --git a/graphics/event_objects/pics/people/cycling_triathlete_m.png b/graphics/event_objects/pics/people/cycling_triathlete_m.png index e2ae09033d..08a848d27d 100644 Binary files a/graphics/event_objects/pics/people/cycling_triathlete_m.png and b/graphics/event_objects/pics/people/cycling_triathlete_m.png differ diff --git a/graphics/event_objects/pics/people/elite_four/drake.png b/graphics/event_objects/pics/people/elite_four/drake.png index 74328006e9..9fde008fff 100644 Binary files a/graphics/event_objects/pics/people/elite_four/drake.png 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 index 978d87db02..fcf6dbde24 100644 Binary files a/graphics/event_objects/pics/people/elite_four/glacia.png 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 index e5d54ed779..243057ae26 100644 Binary files a/graphics/event_objects/pics/people/elite_four/phoebe.png 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 index 15892f926c..de9d087193 100644 Binary files a/graphics/event_objects/pics/people/elite_four/sidney.png 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 index 74d71191bc..392f0446e5 100644 Binary files a/graphics/event_objects/pics/people/fat_man.png and b/graphics/event_objects/pics/people/fat_man.png differ diff --git a/graphics/event_objects/pics/people/fisherman.png b/graphics/event_objects/pics/people/fisherman.png index ab31a44add..486fc36ed9 100644 Binary files a/graphics/event_objects/pics/people/fisherman.png and b/graphics/event_objects/pics/people/fisherman.png differ diff --git a/graphics/event_objects/pics/people/frontier_brains/anabel.png b/graphics/event_objects/pics/people/frontier_brains/anabel.png index 0b6bc0eb96..fce97a5e37 100644 Binary files a/graphics/event_objects/pics/people/frontier_brains/anabel.png 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 index 74b8ff3f9f..a6cfcbbcb8 100644 Binary files a/graphics/event_objects/pics/people/frontier_brains/brandon.png 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 index 441a193b5c..d8d5777742 100644 Binary files a/graphics/event_objects/pics/people/frontier_brains/greta.png 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 index ebb93ad8cb..7f935612c8 100644 Binary files a/graphics/event_objects/pics/people/frontier_brains/lucy.png 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 index aa03eb7bd4..b71430bd16 100644 Binary files a/graphics/event_objects/pics/people/frontier_brains/noland.png 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 index f27b643f08..cd8563d5e9 100644 Binary files a/graphics/event_objects/pics/people/frontier_brains/spenser.png 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 index 71ae23fa60..d9daa08385 100644 Binary files a/graphics/event_objects/pics/people/frontier_brains/tucker.png 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 index 5ae953c5e0..409c593e22 100644 Binary files a/graphics/event_objects/pics/people/gentleman.png and b/graphics/event_objects/pics/people/gentleman.png differ diff --git a/graphics/event_objects/pics/people/girl_1.png b/graphics/event_objects/pics/people/girl_1.png index 6a3a1cf327..d0666c1c3c 100644 Binary files a/graphics/event_objects/pics/people/girl_1.png and b/graphics/event_objects/pics/people/girl_1.png differ diff --git a/graphics/event_objects/pics/people/girl_2.png b/graphics/event_objects/pics/people/girl_2.png index dc04a5f5ed..fa54bd715d 100644 Binary files a/graphics/event_objects/pics/people/girl_2.png and b/graphics/event_objects/pics/people/girl_2.png differ diff --git a/graphics/event_objects/pics/people/girl_3.png b/graphics/event_objects/pics/people/girl_3.png index 73fae17f34..7e329f6284 100644 Binary files a/graphics/event_objects/pics/people/girl_3.png and b/graphics/event_objects/pics/people/girl_3.png differ diff --git a/graphics/event_objects/pics/people/gym_leaders/brawly.png b/graphics/event_objects/pics/people/gym_leaders/brawly.png index 77553369bb..1fdd98b04e 100644 Binary files a/graphics/event_objects/pics/people/gym_leaders/brawly.png 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 index 9673941ec8..3339f2c4bb 100644 Binary files a/graphics/event_objects/pics/people/gym_leaders/flannery.png 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 index d3320f0e13..aa246861ab 100644 Binary files a/graphics/event_objects/pics/people/gym_leaders/juan.png 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 index 9d3f302e7b..6a1eec5367 100644 Binary files a/graphics/event_objects/pics/people/gym_leaders/liza.png 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 index 91c6189e3e..48755d3bdc 100644 Binary files a/graphics/event_objects/pics/people/gym_leaders/norman.png 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 index 9a3f34cbe9..c1a1421a02 100644 Binary files a/graphics/event_objects/pics/people/gym_leaders/roxanne.png 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 index 5e8a770398..f73ee136b8 100644 Binary files a/graphics/event_objects/pics/people/gym_leaders/tate.png 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 index ac4368679b..73ab5e8fca 100644 Binary files a/graphics/event_objects/pics/people/gym_leaders/wattson.png 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 index bffaeba3d4..9a1ce83eb9 100644 Binary files a/graphics/event_objects/pics/people/gym_leaders/winona.png 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 index caee0bd224..b0e3b22a06 100644 Binary files a/graphics/event_objects/pics/people/hex_maniac.png and b/graphics/event_objects/pics/people/hex_maniac.png differ diff --git a/graphics/event_objects/pics/people/hiker.png b/graphics/event_objects/pics/people/hiker.png index f52467492f..8c7b026a1c 100644 Binary files a/graphics/event_objects/pics/people/hiker.png and b/graphics/event_objects/pics/people/hiker.png 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 index 82fbc489b8..874ba8a451 100644 Binary files a/graphics/event_objects/pics/people/hot_springs_old_woman.png and b/graphics/event_objects/pics/people/hot_springs_old_woman.png differ diff --git a/graphics/event_objects/pics/people/lass.png b/graphics/event_objects/pics/people/lass.png index a47f9ee3dd..9e27f70ddf 100644 Binary files a/graphics/event_objects/pics/people/lass.png and b/graphics/event_objects/pics/people/lass.png differ diff --git a/graphics/event_objects/pics/people/leaf.png b/graphics/event_objects/pics/people/leaf.png index fb110cd0d6..d96dd26638 100644 Binary files a/graphics/event_objects/pics/people/leaf.png and b/graphics/event_objects/pics/people/leaf.png differ diff --git a/graphics/event_objects/pics/people/little_boy_1.png b/graphics/event_objects/pics/people/little_boy_1.png index dc6dd8a5de..ce4f3e92cd 100644 Binary files a/graphics/event_objects/pics/people/little_boy_1.png and b/graphics/event_objects/pics/people/little_boy_1.png differ diff --git a/graphics/event_objects/pics/people/little_boy_2.png b/graphics/event_objects/pics/people/little_boy_2.png index 0982c0e1e7..1b62a36d07 100644 Binary files a/graphics/event_objects/pics/people/little_boy_2.png and b/graphics/event_objects/pics/people/little_boy_2.png differ diff --git a/graphics/event_objects/pics/people/little_girl_1.png b/graphics/event_objects/pics/people/little_girl_1.png index 6cd04a4e9b..5ce59ea1b8 100644 Binary files a/graphics/event_objects/pics/people/little_girl_1.png and b/graphics/event_objects/pics/people/little_girl_1.png differ diff --git a/graphics/event_objects/pics/people/little_girl_2.png b/graphics/event_objects/pics/people/little_girl_2.png index ee82a5659e..2540d84af9 100644 Binary files a/graphics/event_objects/pics/people/little_girl_2.png and b/graphics/event_objects/pics/people/little_girl_2.png differ diff --git a/graphics/event_objects/pics/people/man_1.png b/graphics/event_objects/pics/people/man_1.png index b83cd0367c..069cb3ed73 100644 Binary files a/graphics/event_objects/pics/people/man_1.png and b/graphics/event_objects/pics/people/man_1.png differ diff --git a/graphics/event_objects/pics/people/man_2.png b/graphics/event_objects/pics/people/man_2.png index 0cf7164ec2..6c29797ec5 100644 Binary files a/graphics/event_objects/pics/people/man_2.png and b/graphics/event_objects/pics/people/man_2.png differ diff --git a/graphics/event_objects/pics/people/man_3.png b/graphics/event_objects/pics/people/man_3.png index efa81c2c4b..a41a1ee9b5 100644 Binary files a/graphics/event_objects/pics/people/man_3.png and b/graphics/event_objects/pics/people/man_3.png differ diff --git a/graphics/event_objects/pics/people/man_4.png b/graphics/event_objects/pics/people/man_4.png index 4419e4c957..05a87d4ddb 100644 Binary files a/graphics/event_objects/pics/people/man_4.png and b/graphics/event_objects/pics/people/man_4.png differ diff --git a/graphics/event_objects/pics/people/man_5.png b/graphics/event_objects/pics/people/man_5.png index 3ab97efd31..234d679242 100644 Binary files a/graphics/event_objects/pics/people/man_5.png and b/graphics/event_objects/pics/people/man_5.png differ diff --git a/graphics/event_objects/pics/people/man_6.png b/graphics/event_objects/pics/people/man_6.png index 7832e9f2a9..f86aff0e4c 100644 Binary files a/graphics/event_objects/pics/people/man_6.png and b/graphics/event_objects/pics/people/man_6.png differ diff --git a/graphics/event_objects/pics/people/man_7.png b/graphics/event_objects/pics/people/man_7.png index 5a43e62e07..106bc58b37 100644 Binary files a/graphics/event_objects/pics/people/man_7.png and b/graphics/event_objects/pics/people/man_7.png differ diff --git a/graphics/event_objects/pics/people/maniac.png b/graphics/event_objects/pics/people/maniac.png index 9b38462793..29829c309e 100644 Binary files a/graphics/event_objects/pics/people/maniac.png and b/graphics/event_objects/pics/people/maniac.png differ diff --git a/graphics/event_objects/pics/people/mart_employee.png b/graphics/event_objects/pics/people/mart_employee.png index 7688c86eef..43bdfef796 100644 Binary files a/graphics/event_objects/pics/people/mart_employee.png and b/graphics/event_objects/pics/people/mart_employee.png 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 index 2c06a8f734..200f733b6c 100644 Binary files a/graphics/event_objects/pics/people/mauville_old_man_1.png and b/graphics/event_objects/pics/people/mauville_old_man_1.png 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 index c70175be3d..6da0c24c4c 100644 Binary files a/graphics/event_objects/pics/people/mauville_old_man_2.png and b/graphics/event_objects/pics/people/mauville_old_man_2.png differ diff --git a/graphics/event_objects/pics/people/may/acro_bike.png b/graphics/event_objects/pics/people/may/acro_bike.png index 37e8811069..81a35b75a6 100644 Binary files a/graphics/event_objects/pics/people/may/acro_bike.png and b/graphics/event_objects/pics/people/may/acro_bike.png differ diff --git a/graphics/event_objects/pics/people/may/decorating.png b/graphics/event_objects/pics/people/may/decorating.png index 7f83dfde93..8e8e346550 100644 Binary files a/graphics/event_objects/pics/people/may/decorating.png and b/graphics/event_objects/pics/people/may/decorating.png differ diff --git a/graphics/event_objects/pics/people/may/field_move.png b/graphics/event_objects/pics/people/may/field_move.png index 41aa13627f..7882009d57 100644 Binary files a/graphics/event_objects/pics/people/may/field_move.png and b/graphics/event_objects/pics/people/may/field_move.png differ diff --git a/graphics/event_objects/pics/people/may/fishing.png b/graphics/event_objects/pics/people/may/fishing.png index e8d3533f35..69c57f12d6 100644 Binary files a/graphics/event_objects/pics/people/may/fishing.png and b/graphics/event_objects/pics/people/may/fishing.png differ diff --git a/graphics/event_objects/pics/people/may/mach_bike.png b/graphics/event_objects/pics/people/may/mach_bike.png index 4e199b84a8..14eaf36ea7 100644 Binary files a/graphics/event_objects/pics/people/may/mach_bike.png and b/graphics/event_objects/pics/people/may/mach_bike.png differ diff --git a/graphics/event_objects/pics/people/may/running.png b/graphics/event_objects/pics/people/may/running.png index 40808c9650..54fa079a0c 100644 Binary files a/graphics/event_objects/pics/people/may/running.png 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 index 5b783f4991..758063ab89 100644 Binary files a/graphics/event_objects/pics/people/may/surfing.png and b/graphics/event_objects/pics/people/may/surfing.png differ diff --git a/graphics/event_objects/pics/people/may/underwater.png b/graphics/event_objects/pics/people/may/underwater.png index 8a2d654656..8c260d9327 100644 Binary files a/graphics/event_objects/pics/people/may/underwater.png and b/graphics/event_objects/pics/people/may/underwater.png differ diff --git a/graphics/event_objects/pics/people/may/walking.png b/graphics/event_objects/pics/people/may/walking.png index b50bf12295..4b71d1a55e 100644 Binary files a/graphics/event_objects/pics/people/may/walking.png 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 index 28c5b41beb..368b6a4627 100644 Binary files a/graphics/event_objects/pics/people/may/watering.png and b/graphics/event_objects/pics/people/may/watering.png differ diff --git a/graphics/event_objects/pics/people/mom.png b/graphics/event_objects/pics/people/mom.png index 8b78515ff6..252eccf48f 100644 Binary files a/graphics/event_objects/pics/people/mom.png and b/graphics/event_objects/pics/people/mom.png differ diff --git a/graphics/event_objects/pics/people/mystery_event_deliveryman.png b/graphics/event_objects/pics/people/mystery_event_deliveryman.png index 2181de2f12..8c1cbbc6e7 100644 Binary files a/graphics/event_objects/pics/people/mystery_event_deliveryman.png and b/graphics/event_objects/pics/people/mystery_event_deliveryman.png differ diff --git a/graphics/event_objects/pics/people/nurse.png b/graphics/event_objects/pics/people/nurse.png index d202f3c16b..6e094f9f18 100644 Binary files a/graphics/event_objects/pics/people/nurse.png and b/graphics/event_objects/pics/people/nurse.png differ diff --git a/graphics/event_objects/pics/people/old_man_1.png b/graphics/event_objects/pics/people/old_man_1.png index 2249869904..6bd5afc448 100644 Binary files a/graphics/event_objects/pics/people/old_man_1.png and b/graphics/event_objects/pics/people/old_man_1.png differ diff --git a/graphics/event_objects/pics/people/old_man_2.png b/graphics/event_objects/pics/people/old_man_2.png index 82bb66f8a9..fe2a77c6e3 100644 Binary files a/graphics/event_objects/pics/people/old_man_2.png and b/graphics/event_objects/pics/people/old_man_2.png differ diff --git a/graphics/event_objects/pics/people/old_woman_1.png b/graphics/event_objects/pics/people/old_woman_1.png index d928b8ae6c..a0d852cd44 100644 Binary files a/graphics/event_objects/pics/people/old_woman_1.png and b/graphics/event_objects/pics/people/old_woman_1.png differ diff --git a/graphics/event_objects/pics/people/old_woman_2.png b/graphics/event_objects/pics/people/old_woman_2.png index 0a6f5ebd3f..84a5ba8010 100644 Binary files a/graphics/event_objects/pics/people/old_woman_2.png and b/graphics/event_objects/pics/people/old_woman_2.png differ diff --git a/graphics/event_objects/pics/people/picnicker.png b/graphics/event_objects/pics/people/picnicker.png index 207c422006..a15eeb6448 100644 Binary files a/graphics/event_objects/pics/people/picnicker.png and b/graphics/event_objects/pics/people/picnicker.png differ diff --git a/graphics/event_objects/pics/people/prof_birch.png b/graphics/event_objects/pics/people/prof_birch.png index 5c3fda9f9e..d3ea18c319 100644 Binary files a/graphics/event_objects/pics/people/prof_birch.png and b/graphics/event_objects/pics/people/prof_birch.png differ diff --git a/graphics/event_objects/pics/people/psychic_m.png b/graphics/event_objects/pics/people/psychic_m.png index 74e8503294..3efe5c0afc 100644 Binary files a/graphics/event_objects/pics/people/psychic_m.png and b/graphics/event_objects/pics/people/psychic_m.png differ diff --git a/graphics/event_objects/pics/people/quinty_plump.png b/graphics/event_objects/pics/people/quinty_plump.png index 8b08ba7d72..49d4c70382 100644 Binary files a/graphics/event_objects/pics/people/quinty_plump.png and b/graphics/event_objects/pics/people/quinty_plump.png differ diff --git a/graphics/event_objects/pics/people/red.png b/graphics/event_objects/pics/people/red.png index b233aeaebf..7215156c1d 100644 Binary files a/graphics/event_objects/pics/people/red.png and b/graphics/event_objects/pics/people/red.png differ diff --git a/graphics/event_objects/pics/people/reporter_f.png b/graphics/event_objects/pics/people/reporter_f.png index 781b07fc69..289aef6d97 100644 Binary files a/graphics/event_objects/pics/people/reporter_f.png and b/graphics/event_objects/pics/people/reporter_f.png differ diff --git a/graphics/event_objects/pics/people/reporter_m.png b/graphics/event_objects/pics/people/reporter_m.png index 0992b12ea2..09b2b964e7 100644 Binary files a/graphics/event_objects/pics/people/reporter_m.png and b/graphics/event_objects/pics/people/reporter_m.png differ diff --git a/graphics/event_objects/pics/people/rooftop_sale_woman.png b/graphics/event_objects/pics/people/rooftop_sale_woman.png index d55d961f4c..f1f9bc72bb 100644 Binary files a/graphics/event_objects/pics/people/rooftop_sale_woman.png and b/graphics/event_objects/pics/people/rooftop_sale_woman.png differ diff --git a/graphics/event_objects/pics/people/rs_little_boy.png b/graphics/event_objects/pics/people/rs_little_boy.png index 6e8b4bdaba..41bc20afbe 100644 Binary files a/graphics/event_objects/pics/people/rs_little_boy.png and b/graphics/event_objects/pics/people/rs_little_boy.png 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 index d7a1c22242..3a4e710f31 100644 Binary files a/graphics/event_objects/pics/people/ruby_sapphire_brendan/running.png 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 index 833e635d52..7f3d4bde70 100644 Binary files a/graphics/event_objects/pics/people/ruby_sapphire_brendan/walking.png and b/graphics/event_objects/pics/people/ruby_sapphire_brendan/walking.png 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 index dbde4aa307..7c546a2867 100644 Binary files a/graphics/event_objects/pics/people/ruby_sapphire_may/running.png 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 index c48b04cb20..7c600a0030 100644 Binary files a/graphics/event_objects/pics/people/ruby_sapphire_may/walking.png 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 index 85494110d7..f95eb2be26 100644 Binary files a/graphics/event_objects/pics/people/running_triathlete_f.png and b/graphics/event_objects/pics/people/running_triathlete_f.png differ diff --git a/graphics/event_objects/pics/people/running_triathlete_m.png b/graphics/event_objects/pics/people/running_triathlete_m.png index 97e5d0e85e..b2b681201d 100644 Binary files a/graphics/event_objects/pics/people/running_triathlete_m.png and b/graphics/event_objects/pics/people/running_triathlete_m.png differ diff --git a/graphics/event_objects/pics/people/sailor.png b/graphics/event_objects/pics/people/sailor.png index b84eac22cc..6c8a867f4c 100644 Binary files a/graphics/event_objects/pics/people/sailor.png and b/graphics/event_objects/pics/people/sailor.png differ diff --git a/graphics/event_objects/pics/people/school_kid_m.png b/graphics/event_objects/pics/people/school_kid_m.png index e9e8e48899..ddfc28b108 100644 Binary files a/graphics/event_objects/pics/people/school_kid_m.png and b/graphics/event_objects/pics/people/school_kid_m.png differ diff --git a/graphics/event_objects/pics/people/scientist_1.png b/graphics/event_objects/pics/people/scientist_1.png index f6e79660c7..2b1f6605dd 100644 Binary files a/graphics/event_objects/pics/people/scientist_1.png and b/graphics/event_objects/pics/people/scientist_1.png differ diff --git a/graphics/event_objects/pics/people/scientist_2.png b/graphics/event_objects/pics/people/scientist_2.png index 20ce638f6e..ba4759a712 100644 Binary files a/graphics/event_objects/pics/people/scientist_2.png and b/graphics/event_objects/pics/people/scientist_2.png differ diff --git a/graphics/event_objects/pics/people/scott.png b/graphics/event_objects/pics/people/scott.png index 41c7100c49..113614f5f1 100644 Binary files a/graphics/event_objects/pics/people/scott.png and b/graphics/event_objects/pics/people/scott.png differ diff --git a/graphics/event_objects/pics/people/steven.png b/graphics/event_objects/pics/people/steven.png index ab113d3506..da692f51db 100644 Binary files a/graphics/event_objects/pics/people/steven.png and b/graphics/event_objects/pics/people/steven.png differ diff --git a/graphics/event_objects/pics/people/swimmer_f.png b/graphics/event_objects/pics/people/swimmer_f.png index d9fd2e39d0..962e60a9c9 100644 Binary files a/graphics/event_objects/pics/people/swimmer_f.png and b/graphics/event_objects/pics/people/swimmer_f.png differ diff --git a/graphics/event_objects/pics/people/swimmer_m.png b/graphics/event_objects/pics/people/swimmer_m.png index 25068830e1..eb1733da8d 100644 Binary files a/graphics/event_objects/pics/people/swimmer_m.png and b/graphics/event_objects/pics/people/swimmer_m.png differ diff --git a/graphics/event_objects/pics/people/teala.png b/graphics/event_objects/pics/people/teala.png index f38bc479ec..cfc47b112b 100644 Binary files a/graphics/event_objects/pics/people/teala.png and b/graphics/event_objects/pics/people/teala.png 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 index 0afbfb3008..fab673878d 100644 Binary files a/graphics/event_objects/pics/people/team_aqua/aqua_member_f.png 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 index eba838305f..4340859548 100644 Binary files a/graphics/event_objects/pics/people/team_aqua/aqua_member_m.png 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 index 2117d52ad2..6ece66e060 100644 Binary files a/graphics/event_objects/pics/people/team_aqua/archie.png 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 index fe74beeec4..60bd8494ef 100644 Binary files a/graphics/event_objects/pics/people/team_magma/magma_member_f.png 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 index 1a174b5a28..f7581bb39f 100644 Binary files a/graphics/event_objects/pics/people/team_magma/magma_member_m.png 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 index 16b35d2fa2..cc8b180ed1 100644 Binary files a/graphics/event_objects/pics/people/team_magma/maxie.png 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 index 1fa7fa4217..bfcab635a3 100644 Binary files a/graphics/event_objects/pics/people/tuber_f.png and b/graphics/event_objects/pics/people/tuber_f.png differ diff --git a/graphics/event_objects/pics/people/tuber_m.png b/graphics/event_objects/pics/people/tuber_m.png index 04a5b698ef..48bc3b3b49 100644 Binary files a/graphics/event_objects/pics/people/tuber_m.png and b/graphics/event_objects/pics/people/tuber_m.png differ diff --git a/graphics/event_objects/pics/people/tuber_m_swimming.png b/graphics/event_objects/pics/people/tuber_m_swimming.png index 6cdeded89e..15dedb2590 100644 Binary files a/graphics/event_objects/pics/people/tuber_m_swimming.png and b/graphics/event_objects/pics/people/tuber_m_swimming.png differ diff --git a/graphics/event_objects/pics/people/union_room_attendant.png b/graphics/event_objects/pics/people/union_room_attendant.png index 00c76cc7c9..8e8c3851cf 100644 Binary files a/graphics/event_objects/pics/people/union_room_attendant.png and b/graphics/event_objects/pics/people/union_room_attendant.png differ diff --git a/graphics/event_objects/pics/people/unused_woman.png b/graphics/event_objects/pics/people/unused_woman.png index 393d38ddc9..395ed1c099 100644 Binary files a/graphics/event_objects/pics/people/unused_woman.png and b/graphics/event_objects/pics/people/unused_woman.png differ diff --git a/graphics/event_objects/pics/people/wallace.png b/graphics/event_objects/pics/people/wallace.png index aec7c5c06e..2ef1d60500 100644 Binary files a/graphics/event_objects/pics/people/wallace.png and b/graphics/event_objects/pics/people/wallace.png differ diff --git a/graphics/event_objects/pics/people/wally.png b/graphics/event_objects/pics/people/wally.png index 32276ad77c..190ee67132 100644 Binary files a/graphics/event_objects/pics/people/wally.png and b/graphics/event_objects/pics/people/wally.png differ diff --git a/graphics/event_objects/pics/people/woman_1.png b/graphics/event_objects/pics/people/woman_1.png index 285c2947c9..2207993f74 100644 Binary files a/graphics/event_objects/pics/people/woman_1.png and b/graphics/event_objects/pics/people/woman_1.png differ diff --git a/graphics/event_objects/pics/people/woman_2.png b/graphics/event_objects/pics/people/woman_2.png index b4381c2f43..c97fc35070 100644 Binary files a/graphics/event_objects/pics/people/woman_2.png and b/graphics/event_objects/pics/people/woman_2.png differ diff --git a/graphics/event_objects/pics/people/woman_3.png b/graphics/event_objects/pics/people/woman_3.png index 00579b200c..8d35b16537 100644 Binary files a/graphics/event_objects/pics/people/woman_3.png and b/graphics/event_objects/pics/people/woman_3.png differ diff --git a/graphics/event_objects/pics/people/woman_4.png b/graphics/event_objects/pics/people/woman_4.png index cb88cab47f..2a29acae30 100644 Binary files a/graphics/event_objects/pics/people/woman_4.png and b/graphics/event_objects/pics/people/woman_4.png differ diff --git a/graphics/event_objects/pics/people/woman_5.png b/graphics/event_objects/pics/people/woman_5.png index cc26319804..95dfc76dae 100644 Binary files a/graphics/event_objects/pics/people/woman_5.png and b/graphics/event_objects/pics/people/woman_5.png differ diff --git a/graphics/event_objects/pics/people/woman_6.png b/graphics/event_objects/pics/people/woman_6.png index 51ef095409..2ffdd5af61 100644 Binary files a/graphics/event_objects/pics/people/woman_6.png and b/graphics/event_objects/pics/people/woman_6.png differ diff --git a/graphics/event_objects/pics/people/woman_7.png b/graphics/event_objects/pics/people/woman_7.png index 522c5254d7..a7750dc4cb 100644 Binary files a/graphics/event_objects/pics/people/woman_7.png and b/graphics/event_objects/pics/people/woman_7.png differ diff --git a/graphics/event_objects/pics/people/youngster.png b/graphics/event_objects/pics/people/youngster.png index 1d26290866..c17e7c6cfa 100644 Binary files a/graphics/event_objects/pics/people/youngster.png and b/graphics/event_objects/pics/people/youngster.png differ diff --git a/graphics/event_objects/pics/pokemon/azumarill.png b/graphics/event_objects/pics/pokemon/azumarill.png index 0a03fd3d4d..84b07ea5bc 100644 Binary files a/graphics/event_objects/pics/pokemon/azumarill.png and b/graphics/event_objects/pics/pokemon/azumarill.png differ diff --git a/graphics/event_objects/pics/pokemon/azurill.png b/graphics/event_objects/pics/pokemon/azurill.png index d6050257b7..99cd25fe5c 100644 Binary files a/graphics/event_objects/pics/pokemon/azurill.png and b/graphics/event_objects/pics/pokemon/azurill.png differ diff --git a/graphics/event_objects/pics/pokemon/deoxys.png b/graphics/event_objects/pics/pokemon/deoxys.png index 2e892f0da0..9aa8dc2188 100644 Binary files a/graphics/event_objects/pics/pokemon/deoxys.png and b/graphics/event_objects/pics/pokemon/deoxys.png differ diff --git a/graphics/event_objects/pics/pokemon/dusclops.png b/graphics/event_objects/pics/pokemon/dusclops.png index faf183ff43..fb2c85576c 100644 Binary files a/graphics/event_objects/pics/pokemon/dusclops.png and b/graphics/event_objects/pics/pokemon/dusclops.png differ diff --git a/graphics/event_objects/pics/pokemon/enemy_zigzagoon.png b/graphics/event_objects/pics/pokemon/enemy_zigzagoon.png index 5c75f647f5..2684ad1302 100644 Binary files a/graphics/event_objects/pics/pokemon/enemy_zigzagoon.png and b/graphics/event_objects/pics/pokemon/enemy_zigzagoon.png differ diff --git a/graphics/event_objects/pics/pokemon/groudon.png b/graphics/event_objects/pics/pokemon/groudon.png index de569261c5..3d14c5ac9e 100644 Binary files a/graphics/event_objects/pics/pokemon/groudon.png and b/graphics/event_objects/pics/pokemon/groudon.png differ diff --git a/graphics/event_objects/pics/pokemon/ho_oh.png b/graphics/event_objects/pics/pokemon/ho_oh.png index 883bf65773..e6c7374e03 100644 Binary files a/graphics/event_objects/pics/pokemon/ho_oh.png and b/graphics/event_objects/pics/pokemon/ho_oh.png differ diff --git a/graphics/event_objects/pics/pokemon/kecleon.png b/graphics/event_objects/pics/pokemon/kecleon.png index 460d3acc47..47ae584b79 100644 Binary files a/graphics/event_objects/pics/pokemon/kecleon.png and b/graphics/event_objects/pics/pokemon/kecleon.png differ diff --git a/graphics/event_objects/pics/pokemon/kirlia.png b/graphics/event_objects/pics/pokemon/kirlia.png index b71b575ebf..bac74a9ccb 100644 Binary files a/graphics/event_objects/pics/pokemon/kirlia.png and b/graphics/event_objects/pics/pokemon/kirlia.png differ diff --git a/graphics/event_objects/pics/pokemon/kyogre.png b/graphics/event_objects/pics/pokemon/kyogre.png index b67f3b15fc..32f67aafa2 100644 Binary files a/graphics/event_objects/pics/pokemon/kyogre.png and b/graphics/event_objects/pics/pokemon/kyogre.png differ diff --git a/graphics/event_objects/pics/pokemon/latias_latios.png b/graphics/event_objects/pics/pokemon/latias_latios.png index e9355d4a60..4030d413c6 100644 Binary files a/graphics/event_objects/pics/pokemon/latias_latios.png and b/graphics/event_objects/pics/pokemon/latias_latios.png differ diff --git a/graphics/event_objects/pics/pokemon/lugia.png b/graphics/event_objects/pics/pokemon/lugia.png index d38e374b38..1dfc6858b9 100644 Binary files a/graphics/event_objects/pics/pokemon/lugia.png and b/graphics/event_objects/pics/pokemon/lugia.png differ diff --git a/graphics/event_objects/pics/pokemon/mew.png b/graphics/event_objects/pics/pokemon/mew.png index 152bdabce2..00cbd27794 100644 Binary files a/graphics/event_objects/pics/pokemon/mew.png and b/graphics/event_objects/pics/pokemon/mew.png differ diff --git a/graphics/event_objects/pics/pokemon/pikachu.png b/graphics/event_objects/pics/pokemon/pikachu.png index bd70269555..b2d15ef179 100644 Binary files a/graphics/event_objects/pics/pokemon/pikachu.png and b/graphics/event_objects/pics/pokemon/pikachu.png differ diff --git a/graphics/event_objects/pics/pokemon/poochyena.png b/graphics/event_objects/pics/pokemon/poochyena.png index 86fd9b3acb..171a551d3b 100644 Binary files a/graphics/event_objects/pics/pokemon/poochyena.png and b/graphics/event_objects/pics/pokemon/poochyena.png differ diff --git a/graphics/event_objects/pics/pokemon/rayquaza.png b/graphics/event_objects/pics/pokemon/rayquaza.png index aec6616d9a..9a74dc64f0 100644 Binary files a/graphics/event_objects/pics/pokemon/rayquaza.png and b/graphics/event_objects/pics/pokemon/rayquaza.png differ diff --git a/graphics/event_objects/pics/pokemon/rayquaza_still.png b/graphics/event_objects/pics/pokemon/rayquaza_still.png index 1c18b2ffc1..55d638f292 100644 Binary files a/graphics/event_objects/pics/pokemon/rayquaza_still.png and b/graphics/event_objects/pics/pokemon/rayquaza_still.png differ diff --git a/graphics/event_objects/pics/pokemon/regi.png b/graphics/event_objects/pics/pokemon/regi.png index 8425040dd1..c3bb15e57d 100644 Binary files a/graphics/event_objects/pics/pokemon/regi.png and b/graphics/event_objects/pics/pokemon/regi.png differ diff --git a/graphics/event_objects/pics/pokemon/skitty.png b/graphics/event_objects/pics/pokemon/skitty.png index 2b40113207..2b78104123 100644 Binary files a/graphics/event_objects/pics/pokemon/skitty.png and b/graphics/event_objects/pics/pokemon/skitty.png differ diff --git a/graphics/event_objects/pics/pokemon/sudowoodo.png b/graphics/event_objects/pics/pokemon/sudowoodo.png index ff2cc385b6..0e084dcc0e 100644 Binary files a/graphics/event_objects/pics/pokemon/sudowoodo.png and b/graphics/event_objects/pics/pokemon/sudowoodo.png differ diff --git a/graphics/event_objects/pics/pokemon/vigoroth.png b/graphics/event_objects/pics/pokemon/vigoroth.png index b90c5fddde..d9ea6dbed5 100644 Binary files a/graphics/event_objects/pics/pokemon/vigoroth.png and b/graphics/event_objects/pics/pokemon/vigoroth.png differ diff --git a/graphics/event_objects/pics/pokemon/wingull.png b/graphics/event_objects/pics/pokemon/wingull.png index 4ebb0039e7..9401d77f8a 100644 Binary files a/graphics/event_objects/pics/pokemon/wingull.png and b/graphics/event_objects/pics/pokemon/wingull.png differ diff --git a/graphics/event_objects/pics/pokemon/zigzagoon.png b/graphics/event_objects/pics/pokemon/zigzagoon.png index 2312d4f97a..2eaf2403d5 100644 Binary files a/graphics/event_objects/pics/pokemon/zigzagoon.png and b/graphics/event_objects/pics/pokemon/zigzagoon.png differ diff --git a/spritesheet_rules.mk b/spritesheet_rules.mk new file mode 100644 index 0000000000..2f5bfe608e --- /dev/null +++ b/spritesheet_rules.mk @@ -0,0 +1,663 @@ +EVENTOBJGFXDIR := graphics/event_objects/pics + +$(EVENTOBJGFXDIR)/people/brendan/walking.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/brendan/running.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/brendan/field_move.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 4 -mheight 4 + +$(EVENTOBJGFXDIR)/people/brendan/surfing.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 4 -mheight 4 + +$(EVENTOBJGFXDIR)/people/brendan/mach_bike.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 4 -mheight 4 + +$(EVENTOBJGFXDIR)/people/brendan/acro_bike.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 4 -mheight 4 + +$(EVENTOBJGFXDIR)/people/brendan/fishing.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 4 -mheight 4 + +$(EVENTOBJGFXDIR)/people/brendan/watering.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 4 -mheight 4 + +$(EVENTOBJGFXDIR)/people/brendan/underwater.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 4 -mheight 4 + + +$(EVENTOBJGFXDIR)/people/elite_four/drake.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/elite_four/glacia.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/elite_four/phoebe.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/elite_four/sidney.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + + +$(EVENTOBJGFXDIR)/people/frontier_brains/anabel.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/frontier_brains/brandon.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/frontier_brains/greta.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/frontier_brains/lucy.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/frontier_brains/noland.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/frontier_brains/spenser.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/frontier_brains/tucker.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + + +$(EVENTOBJGFXDIR)/people/gym_leaders/brawly.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/gym_leaders/flannery.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/gym_leaders/juan.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/gym_leaders/liza.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/gym_leaders/norman.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/gym_leaders/roxanne.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/gym_leaders/tate.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/gym_leaders/wattson.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/gym_leaders/winona.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + + +$(EVENTOBJGFXDIR)/people/may/walking.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/may/running.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/may/field_move.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 4 -mheight 4 + +$(EVENTOBJGFXDIR)/people/may/surfing.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 4 -mheight 4 + +$(EVENTOBJGFXDIR)/people/may/mach_bike.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 4 -mheight 4 + +$(EVENTOBJGFXDIR)/people/may/acro_bike.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 4 -mheight 4 + +$(EVENTOBJGFXDIR)/people/may/fishing.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 4 -mheight 4 + +$(EVENTOBJGFXDIR)/people/may/watering.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 4 -mheight 4 + +$(EVENTOBJGFXDIR)/people/may/underwater.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 4 -mheight 4 + + +$(EVENTOBJGFXDIR)/people/ruby_sapphire_brendan/walking.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/ruby_sapphire_brendan/running.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + + +$(EVENTOBJGFXDIR)/people/ruby_sapphire_may/walking.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/ruby_sapphire_may/running.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + + +$(EVENTOBJGFXDIR)/people/team_aqua/aqua_member_f.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/team_aqua/aqua_member_m.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/team_aqua/archie.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + + +$(EVENTOBJGFXDIR)/people/team_magma/magma_member_f.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/team_magma/magma_member_m.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/team_magma/maxie.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + + +$(EVENTOBJGFXDIR)/people/artist.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/beauty.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/black_belt.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/boy_1.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/boy_2.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/boy_3.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/boy_4.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/boy_5.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/bug_catcher.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/cameraman.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/camper.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/contest_old_man.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/cook.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/cycling_triathlete_f.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 4 -mheight 4 + +$(EVENTOBJGFXDIR)/people/cycling_triathlete_m.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 4 -mheight 4 + +$(EVENTOBJGFXDIR)/people/fat_man.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/fisherman.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/gentleman.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/girl_1.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/girl_2.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/girl_3.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/hex_maniac.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/hiker.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/hot_springs_old_woman.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/lass.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/leaf.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/little_boy_1.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 2 + +$(EVENTOBJGFXDIR)/people/little_boy_2.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 2 + +$(EVENTOBJGFXDIR)/people/little_girl_1.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/little_girl_2.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 2 + +$(EVENTOBJGFXDIR)/people/man_1.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/man_2.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/man_3.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/man_4.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/man_5.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/man_6.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/man_7.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/maniac.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/mart_employee.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/mauville_old_man_1.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/mauville_old_man_2.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/mom.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/mystery_event_deliveryman.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/nurse.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/old_man_1.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/old_man_2.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/old_woman_1.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/old_woman_2.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/picnicker.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/prof_birch.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/psychic_m.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/quinty_plump.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 4 -mheight 4 + +$(EVENTOBJGFXDIR)/people/red.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/reporter_f.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/reporter_m.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/rooftop_sale_woman.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/rs_little_boy.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 2 + +$(EVENTOBJGFXDIR)/people/running_triathlete_f.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/running_triathlete_m.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/sailor.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/school_kid_m.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/scientist_1.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/scientist_2.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/scott.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/steven.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/swimmer_f.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/swimmer_m.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/teala.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/tuber_f.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 2 + +$(EVENTOBJGFXDIR)/people/tuber_m.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 2 + +$(EVENTOBJGFXDIR)/people/tuber_m_swimming.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 2 + +$(EVENTOBJGFXDIR)/people/union_room_attendant.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/unused_woman.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/wallace.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/wally.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/woman_1.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/woman_2.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/woman_3.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/woman_4.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/woman_5.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/woman_6.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/woman_7.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/people/youngster.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + + + +$(EVENTOBJGFXDIR)/pokemon/azumarill.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 2 + +$(EVENTOBJGFXDIR)/pokemon/azurill.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 2 + +$(EVENTOBJGFXDIR)/pokemon/deoxys.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 4 -mheight 4 + +$(EVENTOBJGFXDIR)/pokemon/dusclops.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/pokemon/enemy_zigzagoon.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 4 -mheight 4 + +$(EVENTOBJGFXDIR)/pokemon/groudon.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 4 -mheight 4 + +$(EVENTOBJGFXDIR)/pokemon/ho_oh.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 4 -mheight 4 + +$(EVENTOBJGFXDIR)/pokemon/kecleon.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 2 + +$(EVENTOBJGFXDIR)/pokemon/kirlia.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/pokemon/kyogre.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 4 -mheight 4 + +$(EVENTOBJGFXDIR)/pokemon/latias_latios.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 4 -mheight 4 + +$(EVENTOBJGFXDIR)/pokemon/lugia.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 4 -mheight 4 + +$(EVENTOBJGFXDIR)/pokemon/mew.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/pokemon/pikachu.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 2 + +$(EVENTOBJGFXDIR)/pokemon/poochyena.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 4 -mheight 4 + +$(EVENTOBJGFXDIR)/pokemon/rayquaza.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 8 -mheight 8 + +$(EVENTOBJGFXDIR)/pokemon/skitty.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 2 + +$(EVENTOBJGFXDIR)/pokemon/sudowoodo.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/pokemon/vigoroth.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 4 -mheight 4 + +$(EVENTOBJGFXDIR)/pokemon/wingull.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 2 + +$(EVENTOBJGFXDIR)/pokemon/zigzagoon.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 2 + + + +$(EVENTOBJGFXDIR)/berry_trees/aguav.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/berry_trees/aspear.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/berry_trees/cheri.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/berry_trees/chesto.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/berry_trees/cornn.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/berry_trees/durin.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/berry_trees/figy.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/berry_trees/grepa.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/berry_trees/hondew.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/berry_trees/iapapa.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/berry_trees/kelpsy.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/berry_trees/lansat.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/berry_trees/leppa.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/berry_trees/liechi.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/berry_trees/lum.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/berry_trees/mago.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/berry_trees/nomel.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/berry_trees/oran.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/berry_trees/pamtre.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/berry_trees/pecha.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/berry_trees/persim.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/berry_trees/pomeg.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/berry_trees/rabuta.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/berry_trees/rawst.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/berry_trees/razz.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/berry_trees/sitrus.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/berry_trees/spelon.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/berry_trees/sprout.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 2 + +$(EVENTOBJGFXDIR)/berry_trees/tamato.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/berry_trees/wepear.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/berry_trees/wiki.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + + + +$(EVENTOBJGFXDIR)/misc/breakable_rock.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 2 + +$(EVENTOBJGFXDIR)/misc/cuttable_tree.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 2 + +$(EVENTOBJGFXDIR)/misc/mr_brineys_boat.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 4 -mheight 4 + + + +$(EVENTOBJGFXDIR)/effects/arrow.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 2 + +$(EVENTOBJGFXDIR)/effects/ash.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 2 + +$(EVENTOBJGFXDIR)/effects/berry_tree_growth_sparkle.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 2 + +$(EVENTOBJGFXDIR)/effects/bike_hop_big_splash.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 2 + +$(EVENTOBJGFXDIR)/effects/bike_hop_small_splash.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 1 + +$(EVENTOBJGFXDIR)/effects/bike_hop_tall_grass.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 1 + +$(EVENTOBJGFXDIR)/effects/bike_tire_tracks.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 2 + +$(EVENTOBJGFXDIR)/effects/bubbles.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/effects/deep_sand_footprints.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 2 + +$(EVENTOBJGFXDIR)/effects/ground_impact_dust.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 1 + +$(EVENTOBJGFXDIR)/effects/jump_out_of_ash.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 2 + +$(EVENTOBJGFXDIR)/effects/long_grass.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 2 + +$(EVENTOBJGFXDIR)/effects/mountain_disguise.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/effects/ripple.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 2 + +$(EVENTOBJGFXDIR)/effects/sand_disguise_placeholder.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/effects/sand_footprints.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 2 + +$(EVENTOBJGFXDIR)/effects/short_grass.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 2 + +$(EVENTOBJGFXDIR)/effects/surf_blob.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 4 -mheight 4 + +$(EVENTOBJGFXDIR)/effects/tall_grass.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 2 + +$(EVENTOBJGFXDIR)/effects/tree_disguise.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(EVENTOBJGFXDIR)/effects/unknown_16.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 2 + +$(EVENTOBJGFXDIR)/effects/unknown_17.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 2 + +$(EVENTOBJGFXDIR)/effects/unknown_18.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 2 + +$(EVENTOBJGFXDIR)/effects/unknown_19.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 2 + +$(EVENTOBJGFXDIR)/effects/unknown_20.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 2 + +$(EVENTOBJGFXDIR)/effects/unknown_29.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 1 + +$(EVENTOBJGFXDIR)/effects/unknown_33.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 2 + +$(EVENTOBJGFXDIR)/effects/unknown_35.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 2 + +$(EVENTOBJGFXDIR)/effects/unused_grass.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 2 diff --git a/src/data/field_event_obj/event_object_graphics.h b/src/data/field_event_obj/event_object_graphics.h index 522f14db40..a99d5a779e 100755 --- a/src/data/field_event_obj/event_object_graphics.h +++ b/src/data/field_event_obj/event_object_graphics.h @@ -255,12 +255,7 @@ const u32 gEventObjectPic_CableCar[] = INCBIN_U32("graphics/event_objects/pics/m const u16 gEventObjectPalette20[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_20.gbapal"); const u32 gEventObjectPic_SSTidal[] = INCBIN_U32("graphics/event_objects/pics/misc/ss_tidal.4bpp"); const u16 gEventObjectPalette21[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_21.gbapal"); -const u32 gFieldEffectObjectPic_BerryTreeGrowthSparkle_0[] = INCBIN_U32("graphics/event_objects/pics/effects/berry_tree_growth_sparkle/0.4bpp"); -const u32 gFieldEffectObjectPic_BerryTreeGrowthSparkle_1[] = INCBIN_U32("graphics/event_objects/pics/effects/berry_tree_growth_sparkle/1.4bpp"); -const u32 gFieldEffectObjectPic_BerryTreeGrowthSparkle_2[] = INCBIN_U32("graphics/event_objects/pics/effects/berry_tree_growth_sparkle/2.4bpp"); -const u32 gFieldEffectObjectPic_BerryTreeGrowthSparkle_3[] = INCBIN_U32("graphics/event_objects/pics/effects/berry_tree_growth_sparkle/3.4bpp"); -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 gFieldEffectObjectPic_BerryTreeGrowthSparkle[] = INCBIN_U32("graphics/event_objects/pics/effects/berry_tree_growth_sparkle.4bpp"); const u32 gEventObjectPic_BerryTreeDirtPile[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/dirt_pile.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"); @@ -310,72 +305,33 @@ const u32 gFieldEffectObjectPic_Ash[] = INCBIN_U32("graphics/event_objects/pics/ 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"); -const u32 gFieldEffectObjectPic_GroundImpactDust_1[] = INCBIN_U32("graphics/event_objects/pics/effects/ground_impact_dust/1.4bpp"); -const u32 gFieldEffectObjectPic_GroundImpactDust_2[] = INCBIN_U32("graphics/event_objects/pics/effects/ground_impact_dust/2.4bpp"); -const u32 gFieldEffectObjectPic_BikeHopTallGrass_0[] = INCBIN_U32("graphics/event_objects/pics/effects/bike_hop_tall_grass/0.4bpp"); -const u32 gFieldEffectObjectPic_BikeHopTallGrass_1[] = INCBIN_U32("graphics/event_objects/pics/effects/bike_hop_tall_grass/1.4bpp"); -const u32 gFieldEffectObjectPic_BikeHopTallGrass_2[] = INCBIN_U32("graphics/event_objects/pics/effects/bike_hop_tall_grass/2.4bpp"); -const u32 gFieldEffectObjectPic_BikeHopTallGrass_3[] = INCBIN_U32("graphics/event_objects/pics/effects/bike_hop_tall_grass/3.4bpp"); -const u32 gUnusedGrass_0[] = INCBIN_U32("graphics/event_objects/pics/effects/unused_grass/0.4bpp"); -const u32 gUnusedGrass_1[] = INCBIN_U32("graphics/event_objects/pics/effects/unused_grass/1.4bpp"); -const u32 gUnusedGrass_2[] = INCBIN_U32("graphics/event_objects/pics/effects/unused_grass/2.4bpp"); -const u32 gUnusedGrass_3[] = INCBIN_U32("graphics/event_objects/pics/effects/unused_grass/3.4bpp"); -const u32 gFieldEffectObjectPic_Unknown16_0[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_16/0.4bpp"); -const u32 gFieldEffectObjectPic_Unknown16_1[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_16/1.4bpp"); -const u32 gFieldEffectObjectPic_Unknown16_2[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_16/2.4bpp"); -const u32 gFieldEffectObjectPic_Unknown16_3[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_16/3.4bpp"); -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_GroundImpactDust[] = INCBIN_U32("graphics/event_objects/pics/effects/ground_impact_dust.4bpp"); +const u32 gFieldEffectObjectPic_BikeHopTallGrass[] = INCBIN_U32("graphics/event_objects/pics/effects/bike_hop_tall_grass.4bpp"); +const u32 gUnusedGrass[] = INCBIN_U32("graphics/event_objects/pics/effects/unused_grass.4bpp"); +const u32 gFieldEffectObjectPic_Unknown16[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_16.4bpp"); const u32 gFieldEffectObjectPic_Unknown17[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_17.4bpp"); -const u32 gFieldEffectObjectPic_Unknown18_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"); -const u32 gFieldEffectObjectPic_Unknown18_3[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_18/3.4bpp"); -const u32 gFieldEffectObjectPic_LongGrass_0[] = INCBIN_U32("graphics/event_objects/pics/effects/long_grass/0.4bpp"); -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_Unknown18[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_18.4bpp"); +const u32 gFieldEffectObjectPic_LongGrass[] = INCBIN_U32("graphics/event_objects/pics/effects/long_grass.4bpp"); const u32 gFieldEffectObjectPic_TallGrass[] = INCBIN_U32("graphics/event_objects/pics/effects/tall_grass.4bpp"); const u32 gFieldEffectObjectPic_ShortGrass[] = INCBIN_U32("graphics/event_objects/pics/effects/short_grass.4bpp"); -const u32 gFieldEffectObjectPic_SandFootprints_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"); -const u32 gFieldEffectObjectPic_DeepSandFootprints_1[] = INCBIN_U32("graphics/event_objects/pics/effects/deep_sand_footprints/1.4bpp"); -const u32 gFieldEffectObjectPic_BikeTireTracks_0[] = INCBIN_U32("graphics/event_objects/pics/effects/bike_tire_tracks/0.4bpp"); -const u32 gFieldEffectObjectPic_BikeTireTracks_1[] = INCBIN_U32("graphics/event_objects/pics/effects/bike_tire_tracks/1.4bpp"); -const u32 gFieldEffectObjectPic_BikeTireTracks_2[] = INCBIN_U32("graphics/event_objects/pics/effects/bike_tire_tracks/2.4bpp"); -const u32 gFieldEffectObjectPic_BikeTireTracks_3[] = INCBIN_U32("graphics/event_objects/pics/effects/bike_tire_tracks/3.4bpp"); -const u32 gFieldEffectObjectPic_Unknown19_0[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_19/0.4bpp"); -const u32 gFieldEffectObjectPic_Unknown19_1[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_19/1.4bpp"); -const u32 gFieldEffectObjectPic_Unknown19_2[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_19/2.4bpp"); -const u32 gFieldEffectObjectPic_Unknown19_3[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_19/3.4bpp"); -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_SandFootprints[] = INCBIN_U32("graphics/event_objects/pics/effects/sand_footprints.4bpp"); +const u32 gFieldEffectObjectPic_DeepSandFootprints[] = INCBIN_U32("graphics/event_objects/pics/effects/deep_sand_footprints.4bpp"); +const u32 gFieldEffectObjectPic_BikeTireTracks[] = INCBIN_U32("graphics/event_objects/pics/effects/bike_tire_tracks.4bpp"); +const u32 gFieldEffectObjectPic_Unknown19[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_19.4bpp"); +const u32 gFieldEffectObjectPic_Unknown29[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_29.4bpp"); const u32 gFieldEffectObjectPic_BikeHopBigSplash[] = INCBIN_U32("graphics/event_objects/pics/effects/bike_hop_big_splash.4bpp"); const u32 gFieldEffectObjectPic_Splash[] = INCBIN_U32("graphics/event_objects/pics/effects/splash.4bpp"); const u32 gFieldEffectObjectPic_BikeHopSmallSplash[] = INCBIN_U32("graphics/event_objects/pics/effects/bike_hop_small_splash.4bpp"); -const u32 gFieldEffectObjectPic_Unknown20_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_Unknown20[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_20.4bpp"); const u32 gFieldEffectObjectPic_TreeDisguise[] = INCBIN_U32("graphics/event_objects/pics/effects/tree_disguise.4bpp"); const u32 gFieldEffectObjectPic_MountainDisguise[] = INCBIN_U32("graphics/event_objects/pics/effects/mountain_disguise.4bpp"); const u32 gFieldEffectObjectPic_SandDisguisePlaceholder[] = INCBIN_U32("graphics/event_objects/pics/effects/sand_disguise_placeholder.4bpp"); const u32 gFieldEffectObjectPic_HotSpringsWater[] = INCBIN_U32("graphics/event_objects/pics/effects/hot_springs_water.4bpp"); const u16 gFieldEffectObjectPalette2[] = INCBIN_U16("graphics/event_objects/palettes/field_effect_object_palette_02.gbapal"); const u32 gFieldEffectObjectPic_JumpOutOfAsh[] = INCBIN_U32("graphics/event_objects/pics/effects/jump_out_of_ash.4bpp"); -const u32 gFieldEffectObjectPic_Unknown33_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_Unknown33[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_33.4bpp"); const u32 gFieldEffectObjectPic_Bubbles[] = INCBIN_U32("graphics/event_objects/pics/effects/bubbles.4bpp"); -const u32 gFieldEffectObjectPic_Unknown35_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 u32 gFieldEffectObjectPic_Unknown35[] = INCBIN_U32("graphics/event_objects/pics/effects/unknown_35.4bpp"); const u16 gFieldEffectObjectPalette3[] = INCBIN_U16("graphics/event_objects/palettes/field_effect_object_palette_03.gbapal"); const u32 gFieldEffectObjectPic_Bird[] = INCBIN_U32("graphics/event_objects/pics/effects/bird.4bpp"); const u32 gEventObjectPic_Juan[] = INCBIN_U32("graphics/event_objects/pics/people/gym_leaders/juan.4bpp"); diff --git a/src/data/field_event_obj/field_effect_objects.h b/src/data/field_event_obj/field_effect_objects.h index 45a498dac1..15fc733433 100755 --- a/src/data/field_event_obj/field_effect_objects.h +++ b/src/data/field_event_obj/field_effect_objects.h @@ -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), + overworld_frame(gFieldEffectObjectPic_GroundImpactDust, 2, 1, 0), + overworld_frame(gFieldEffectObjectPic_GroundImpactDust, 2, 1, 1), + overworld_frame(gFieldEffectObjectPic_GroundImpactDust, 2, 1, 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), + overworld_frame(gFieldEffectObjectPic_BikeHopTallGrass, 2, 1, 0), + overworld_frame(gFieldEffectObjectPic_BikeHopTallGrass, 2, 1, 1), + overworld_frame(gFieldEffectObjectPic_BikeHopTallGrass, 2, 1, 2), + overworld_frame(gFieldEffectObjectPic_BikeHopTallGrass, 2, 1, 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), + overworld_frame(gFieldEffectObjectPic_SandFootprints, 2, 2, 0), + overworld_frame(gFieldEffectObjectPic_SandFootprints, 2, 2, 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), + overworld_frame(gFieldEffectObjectPic_DeepSandFootprints, 2, 2, 0), + overworld_frame(gFieldEffectObjectPic_DeepSandFootprints, 2, 2, 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), + overworld_frame(gFieldEffectObjectPic_BikeTireTracks, 2, 2, 0), + overworld_frame(gFieldEffectObjectPic_BikeTireTracks, 2, 2, 1), + overworld_frame(gFieldEffectObjectPic_BikeTireTracks, 2, 2, 2), + overworld_frame(gFieldEffectObjectPic_BikeTireTracks, 2, 2, 3), }; const union AnimCmd gFieldEffectObjectImageAnim_850CDE0[] = @@ -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), + overworld_frame(gFieldEffectObjectPic_LongGrass, 2, 2, 0), + overworld_frame(gFieldEffectObjectPic_LongGrass, 2, 2, 1), + overworld_frame(gFieldEffectObjectPic_LongGrass, 2, 2, 2), + overworld_frame(gFieldEffectObjectPic_LongGrass, 2, 2, 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), + overworld_frame(gFieldEffectObjectPic_Unknown16, 2, 2, 0), + overworld_frame(gFieldEffectObjectPic_Unknown16, 2, 2, 1), + overworld_frame(gFieldEffectObjectPic_Unknown16, 2, 2, 2), + overworld_frame(gFieldEffectObjectPic_Unknown16, 2, 2, 3), + overworld_frame(gFieldEffectObjectPic_Unknown16, 2, 2, 4), + overworld_frame(gFieldEffectObjectPic_Unknown16, 2, 2, 6), }; const union AnimCmd gFieldEffectObjectImageAnim_850CFDC[] = @@ -532,7 +532,7 @@ 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), + overworld_frame(gFieldEffectObjectPic_Unknown16, 2, 2, 6), overworld_frame(gFieldEffectObjectPic_Unknown17, 2, 2, 0), overworld_frame(gFieldEffectObjectPic_Unknown17, 2, 2, 1), overworld_frame(gFieldEffectObjectPic_Unknown17, 2, 2, 2), @@ -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), + overworld_frame(gFieldEffectObjectPic_Unknown18, 2, 2, 0), + overworld_frame(gFieldEffectObjectPic_Unknown18, 2, 2, 1), + overworld_frame(gFieldEffectObjectPic_Unknown18, 2, 2, 2), + overworld_frame(gFieldEffectObjectPic_Unknown18, 2, 2, 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), + overworld_frame(gFieldEffectObjectPic_Unknown19, 2, 2, 0), + overworld_frame(gFieldEffectObjectPic_Unknown19, 2, 2, 1), + overworld_frame(gFieldEffectObjectPic_Unknown19, 2, 2, 2), + overworld_frame(gFieldEffectObjectPic_Unknown19, 2, 2, 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), + overworld_frame(gFieldEffectObjectPic_Unknown29, 2, 1, 0), + overworld_frame(gFieldEffectObjectPic_Unknown29, 2, 1, 1), + overworld_frame(gFieldEffectObjectPic_Unknown29, 2, 1, 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), + overworld_frame(gFieldEffectObjectPic_Unknown20, 2, 2, 0), + overworld_frame(gFieldEffectObjectPic_Unknown20, 2, 2, 1), + overworld_frame(gFieldEffectObjectPic_Unknown20, 2, 2, 2), + overworld_frame(gFieldEffectObjectPic_Unknown20, 2, 2, 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), + overworld_frame(gFieldEffectObjectPic_BerryTreeGrowthSparkle, 2, 2, 0), + overworld_frame(gFieldEffectObjectPic_BerryTreeGrowthSparkle, 2, 2, 1), + overworld_frame(gFieldEffectObjectPic_BerryTreeGrowthSparkle, 2, 2, 2), + overworld_frame(gFieldEffectObjectPic_BerryTreeGrowthSparkle, 2, 2, 3), + overworld_frame(gFieldEffectObjectPic_BerryTreeGrowthSparkle, 2, 2, 4), + overworld_frame(gFieldEffectObjectPic_BerryTreeGrowthSparkle, 2, 2, 5), }; const union AnimCmd gFieldEffectObjectImageAnim_850D2D4[] = @@ -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), + overworld_frame(gFieldEffectObjectPic_Unknown33, 2, 2, 0), + overworld_frame(gFieldEffectObjectPic_Unknown33, 2, 2, 1), + overworld_frame(gFieldEffectObjectPic_Unknown33, 2, 2, 2), + overworld_frame(gFieldEffectObjectPic_Unknown33, 2, 2, 3), + overworld_frame(gFieldEffectObjectPic_Unknown33, 2, 2, 4), }; const union AnimCmd gFieldEffectObjectImageAnim_850D5B0[] = @@ -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), + overworld_frame(gFieldEffectObjectPic_Unknown35, 2, 2, 0), + overworld_frame(gFieldEffectObjectPic_Unknown35, 2, 2, 1), }; const union AnimCmd gFieldEffectObjectImageAnim_850D674[] =