diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-03-29 12:30:47 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-29 12:30:47 -0400 |
| commit | 200c82e01a94dbe535e6ed8768d8afad4444d4d2 (patch) | |
| tree | f24a08bde3371b5e66d13abe203aa745c1e72e27 | |
| parent | 75ae00beff77e166c4ae573300ed5cb31175e8ac (diff) | |
| parent | 55f9028383b7effda0a5a84e2c09ef80ae9316cc (diff) | |
Merge pull request #317 from GriffinRichards/fix-spritelayout
Reorient object event sprites to horizontal
137 files changed, 401 insertions, 8 deletions
@@ -141,6 +141,7 @@ tidy: include graphics_file_rules.mk include tileset_rules.mk include map_data_rules.mk +include spritesheet_rules.mk include json_data_rules.mk include songs.mk diff --git a/graphics/object_events/pics/misc/fldeff_cut.png b/graphics/field_effects/fldeff_cut.png Binary files differindex 031d04b40..031d04b40 100644 --- a/graphics/object_events/pics/misc/fldeff_cut.png +++ b/graphics/field_effects/fldeff_cut.png diff --git a/graphics/object_events/pics/misc/cut_tree.png b/graphics/object_events/pics/misc/cut_tree.png Binary files differindex ce110cd9e..be22aeaed 100644 --- a/graphics/object_events/pics/misc/cut_tree.png +++ b/graphics/object_events/pics/misc/cut_tree.png diff --git a/graphics/object_events/pics/misc/rock_smash_rock.png b/graphics/object_events/pics/misc/rock_smash_rock.png Binary files differindex 315fb0089..2ba3a9978 100644 --- a/graphics/object_events/pics/misc/rock_smash_rock.png +++ b/graphics/object_events/pics/misc/rock_smash_rock.png diff --git a/graphics/object_events/pics/misc/surf_blob.png b/graphics/object_events/pics/misc/surf_blob.png Binary files differindex ae2222d45..82aa7a09c 100644 --- a/graphics/object_events/pics/misc/surf_blob.png +++ b/graphics/object_events/pics/misc/surf_blob.png diff --git a/graphics/object_events/pics/people/agatha.png b/graphics/object_events/pics/people/agatha.png Binary files differindex b8bf3ede6..23c3f408b 100644 --- a/graphics/object_events/pics/people/agatha.png +++ b/graphics/object_events/pics/people/agatha.png diff --git a/graphics/object_events/pics/people/balding_man.png b/graphics/object_events/pics/people/balding_man.png Binary files differindex 1c2d8eb63..1072f4c26 100644 --- a/graphics/object_events/pics/people/balding_man.png +++ b/graphics/object_events/pics/people/balding_man.png diff --git a/graphics/object_events/pics/people/battle_girl.png b/graphics/object_events/pics/people/battle_girl.png Binary files differindex 20125262a..7388424b8 100644 --- a/graphics/object_events/pics/people/battle_girl.png +++ b/graphics/object_events/pics/people/battle_girl.png diff --git a/graphics/object_events/pics/people/beauty.png b/graphics/object_events/pics/people/beauty.png Binary files differindex 006b67036..3874cf9ed 100644 --- a/graphics/object_events/pics/people/beauty.png +++ b/graphics/object_events/pics/people/beauty.png diff --git a/graphics/object_events/pics/people/biker.png b/graphics/object_events/pics/people/biker.png Binary files differindex 6671943dd..ba9ccdd70 100644 --- a/graphics/object_events/pics/people/biker.png +++ b/graphics/object_events/pics/people/biker.png diff --git a/graphics/object_events/pics/people/bill.png b/graphics/object_events/pics/people/bill.png Binary files differindex 85b82a47f..cbb0ad0c9 100644 --- a/graphics/object_events/pics/people/bill.png +++ b/graphics/object_events/pics/people/bill.png diff --git a/graphics/object_events/pics/people/blackbelt.png b/graphics/object_events/pics/people/blackbelt.png Binary files differindex 7717ce43b..7c1aa1d92 100644 --- a/graphics/object_events/pics/people/blackbelt.png +++ b/graphics/object_events/pics/people/blackbelt.png diff --git a/graphics/object_events/pics/people/blaine.png b/graphics/object_events/pics/people/blaine.png Binary files differindex 19ccb8fcc..1b54307e9 100644 --- a/graphics/object_events/pics/people/blaine.png +++ b/graphics/object_events/pics/people/blaine.png diff --git a/graphics/object_events/pics/people/blue.png b/graphics/object_events/pics/people/blue.png Binary files differindex a66593653..80cd7518a 100644 --- a/graphics/object_events/pics/people/blue.png +++ b/graphics/object_events/pics/people/blue.png diff --git a/graphics/object_events/pics/people/boy.png b/graphics/object_events/pics/people/boy.png Binary files differindex 749051218..bb13ed6c0 100644 --- a/graphics/object_events/pics/people/boy.png +++ b/graphics/object_events/pics/people/boy.png diff --git a/graphics/object_events/pics/people/brock.png b/graphics/object_events/pics/people/brock.png Binary files differindex bf48c8dd7..156f7478e 100644 --- a/graphics/object_events/pics/people/brock.png +++ b/graphics/object_events/pics/people/brock.png diff --git a/graphics/object_events/pics/people/bruno.png b/graphics/object_events/pics/people/bruno.png Binary files differindex ac5ee5e9f..c4b823c3f 100644 --- a/graphics/object_events/pics/people/bruno.png +++ b/graphics/object_events/pics/people/bruno.png diff --git a/graphics/object_events/pics/people/bug_catcher.png b/graphics/object_events/pics/people/bug_catcher.png Binary files differindex dd33a7921..329f0f9ae 100644 --- a/graphics/object_events/pics/people/bug_catcher.png +++ b/graphics/object_events/pics/people/bug_catcher.png diff --git a/graphics/object_events/pics/people/cable_club_receptionist.png b/graphics/object_events/pics/people/cable_club_receptionist.png Binary files differindex 74e081153..54f915e88 100644 --- a/graphics/object_events/pics/people/cable_club_receptionist.png +++ b/graphics/object_events/pics/people/cable_club_receptionist.png diff --git a/graphics/object_events/pics/people/cameraman.png b/graphics/object_events/pics/people/cameraman.png Binary files differindex bb0ca5d34..5c4687fa4 100644 --- a/graphics/object_events/pics/people/cameraman.png +++ b/graphics/object_events/pics/people/cameraman.png diff --git a/graphics/object_events/pics/people/camper.png b/graphics/object_events/pics/people/camper.png Binary files differindex 45d4400d8..d0a0cf5b6 100644 --- a/graphics/object_events/pics/people/camper.png +++ b/graphics/object_events/pics/people/camper.png diff --git a/graphics/object_events/pics/people/captain.png b/graphics/object_events/pics/people/captain.png Binary files differindex fbf6aa689..21e1b8f7d 100644 --- a/graphics/object_events/pics/people/captain.png +++ b/graphics/object_events/pics/people/captain.png diff --git a/graphics/object_events/pics/people/celio.png b/graphics/object_events/pics/people/celio.png Binary files differindex 1dc91873d..549546217 100644 --- a/graphics/object_events/pics/people/celio.png +++ b/graphics/object_events/pics/people/celio.png diff --git a/graphics/object_events/pics/people/channeler.png b/graphics/object_events/pics/people/channeler.png Binary files differindex f6925577d..efaa5cfc0 100644 --- a/graphics/object_events/pics/people/channeler.png +++ b/graphics/object_events/pics/people/channeler.png diff --git a/graphics/object_events/pics/people/chef.png b/graphics/object_events/pics/people/chef.png Binary files differindex a251297b6..a8e726d37 100644 --- a/graphics/object_events/pics/people/chef.png +++ b/graphics/object_events/pics/people/chef.png diff --git a/graphics/object_events/pics/people/clerk.png b/graphics/object_events/pics/people/clerk.png Binary files differindex 485678492..d883102c9 100644 --- a/graphics/object_events/pics/people/clerk.png +++ b/graphics/object_events/pics/people/clerk.png diff --git a/graphics/object_events/pics/people/cooltrainer_f.png b/graphics/object_events/pics/people/cooltrainer_f.png Binary files differindex 63a47e95b..7cddcfdc1 100644 --- a/graphics/object_events/pics/people/cooltrainer_f.png +++ b/graphics/object_events/pics/people/cooltrainer_f.png diff --git a/graphics/object_events/pics/people/cooltrainer_m.png b/graphics/object_events/pics/people/cooltrainer_m.png Binary files differindex df48acad0..6555b1c00 100644 --- a/graphics/object_events/pics/people/cooltrainer_m.png +++ b/graphics/object_events/pics/people/cooltrainer_m.png diff --git a/graphics/object_events/pics/people/daisy.png b/graphics/object_events/pics/people/daisy.png Binary files differindex 5ba2f26f8..3fad24b03 100644 --- a/graphics/object_events/pics/people/daisy.png +++ b/graphics/object_events/pics/people/daisy.png diff --git a/graphics/object_events/pics/people/erika.png b/graphics/object_events/pics/people/erika.png Binary files differindex 015b6bbe3..774f00cbb 100644 --- a/graphics/object_events/pics/people/erika.png +++ b/graphics/object_events/pics/people/erika.png diff --git a/graphics/object_events/pics/people/fat_man.png b/graphics/object_events/pics/people/fat_man.png Binary files differindex b5ed884fd..76dd07658 100644 --- a/graphics/object_events/pics/people/fat_man.png +++ b/graphics/object_events/pics/people/fat_man.png diff --git a/graphics/object_events/pics/people/female_surf.png b/graphics/object_events/pics/people/female_surf.png Binary files differdeleted file mode 100644 index 325af3f5e..000000000 --- a/graphics/object_events/pics/people/female_surf.png +++ /dev/null diff --git a/graphics/object_events/pics/people/fisher.png b/graphics/object_events/pics/people/fisher.png Binary files differindex 8961c0765..d160e85e6 100644 --- a/graphics/object_events/pics/people/fisher.png +++ b/graphics/object_events/pics/people/fisher.png diff --git a/graphics/object_events/pics/people/gba_kid.png b/graphics/object_events/pics/people/gba_kid.png Binary files differindex 358a4dd1b..1e695d120 100644 --- a/graphics/object_events/pics/people/gba_kid.png +++ b/graphics/object_events/pics/people/gba_kid.png diff --git a/graphics/object_events/pics/people/gentleman.png b/graphics/object_events/pics/people/gentleman.png Binary files differindex de57e641f..195a779b6 100644 --- a/graphics/object_events/pics/people/gentleman.png +++ b/graphics/object_events/pics/people/gentleman.png diff --git a/graphics/object_events/pics/people/giovanni.png b/graphics/object_events/pics/people/giovanni.png Binary files differindex 5f9585a61..9db59fdaf 100644 --- a/graphics/object_events/pics/people/giovanni.png +++ b/graphics/object_events/pics/people/giovanni.png diff --git a/graphics/object_events/pics/people/green_bike.png b/graphics/object_events/pics/people/green_bike.png Binary files differindex b1e1ede7a..25958e1e5 100644 --- a/graphics/object_events/pics/people/green_bike.png +++ b/graphics/object_events/pics/people/green_bike.png diff --git a/graphics/object_events/pics/people/green_fish.png b/graphics/object_events/pics/people/green_fish.png Binary files differindex 61446035c..29c142b18 100644 --- a/graphics/object_events/pics/people/green_fish.png +++ b/graphics/object_events/pics/people/green_fish.png diff --git a/graphics/object_events/pics/people/green_item.png b/graphics/object_events/pics/people/green_item.png Binary files differindex c1cd5c574..b554d0850 100644 --- a/graphics/object_events/pics/people/green_item.png +++ b/graphics/object_events/pics/people/green_item.png diff --git a/graphics/object_events/pics/people/green_normal.png b/graphics/object_events/pics/people/green_normal.png Binary files differindex c65b97a5c..31ad04085 100644 --- a/graphics/object_events/pics/people/green_normal.png +++ b/graphics/object_events/pics/people/green_normal.png diff --git a/graphics/object_events/pics/people/green_surf.png b/graphics/object_events/pics/people/green_surf.png Binary files differnew file mode 100644 index 000000000..a4042a4d2 --- /dev/null +++ b/graphics/object_events/pics/people/green_surf.png diff --git a/graphics/object_events/pics/people/green_surf_run.png b/graphics/object_events/pics/people/green_surf_run.png Binary files differindex 7246e388d..30db5b193 100644 --- a/graphics/object_events/pics/people/green_surf_run.png +++ b/graphics/object_events/pics/people/green_surf_run.png diff --git a/graphics/object_events/pics/people/green_vs_seeker_bike.png b/graphics/object_events/pics/people/green_vs_seeker_bike.png Binary files differindex f4140b8d0..c23f52081 100644 --- a/graphics/object_events/pics/people/green_vs_seeker_bike.png +++ b/graphics/object_events/pics/people/green_vs_seeker_bike.png diff --git a/graphics/object_events/pics/people/gym_guy.png b/graphics/object_events/pics/people/gym_guy.png Binary files differindex 8a55cd3d3..4a6bea315 100644 --- a/graphics/object_events/pics/people/gym_guy.png +++ b/graphics/object_events/pics/people/gym_guy.png diff --git a/graphics/object_events/pics/people/hiker.png b/graphics/object_events/pics/people/hiker.png Binary files differindex 7c4d443a2..76ba62db3 100644 --- a/graphics/object_events/pics/people/hiker.png +++ b/graphics/object_events/pics/people/hiker.png diff --git a/graphics/object_events/pics/people/koga.png b/graphics/object_events/pics/people/koga.png Binary files differindex b45ec3f25..f53968c86 100644 --- a/graphics/object_events/pics/people/koga.png +++ b/graphics/object_events/pics/people/koga.png diff --git a/graphics/object_events/pics/people/lance.png b/graphics/object_events/pics/people/lance.png Binary files differindex b7426b280..51c9508e0 100644 --- a/graphics/object_events/pics/people/lance.png +++ b/graphics/object_events/pics/people/lance.png diff --git a/graphics/object_events/pics/people/lass.png b/graphics/object_events/pics/people/lass.png Binary files differindex 82d08630c..26fac2685 100644 --- a/graphics/object_events/pics/people/lass.png +++ b/graphics/object_events/pics/people/lass.png diff --git a/graphics/object_events/pics/people/little_boy.png b/graphics/object_events/pics/people/little_boy.png Binary files differindex e53418256..c145d37ef 100644 --- a/graphics/object_events/pics/people/little_boy.png +++ b/graphics/object_events/pics/people/little_boy.png diff --git a/graphics/object_events/pics/people/little_girl.png b/graphics/object_events/pics/people/little_girl.png Binary files differindex 2ce6d6355..523d8db7d 100644 --- a/graphics/object_events/pics/people/little_girl.png +++ b/graphics/object_events/pics/people/little_girl.png diff --git a/graphics/object_events/pics/people/lorelei.png b/graphics/object_events/pics/people/lorelei.png Binary files differindex 0b535572e..e7b8f9dd9 100644 --- a/graphics/object_events/pics/people/lorelei.png +++ b/graphics/object_events/pics/people/lorelei.png diff --git a/graphics/object_events/pics/people/lt_surge.png b/graphics/object_events/pics/people/lt_surge.png Binary files differindex 07435e777..6ebb4ebb8 100644 --- a/graphics/object_events/pics/people/lt_surge.png +++ b/graphics/object_events/pics/people/lt_surge.png diff --git a/graphics/object_events/pics/people/male_surf.png b/graphics/object_events/pics/people/male_surf.png Binary files differdeleted file mode 100644 index 310e6900f..000000000 --- a/graphics/object_events/pics/people/male_surf.png +++ /dev/null diff --git a/graphics/object_events/pics/people/man.png b/graphics/object_events/pics/people/man.png Binary files differindex d3c38275a..2e39946dd 100644 --- a/graphics/object_events/pics/people/man.png +++ b/graphics/object_events/pics/people/man.png diff --git a/graphics/object_events/pics/people/mg_deliveryman.png b/graphics/object_events/pics/people/mg_deliveryman.png Binary files differindex f503cf0c9..ad5e02b57 100644 --- a/graphics/object_events/pics/people/mg_deliveryman.png +++ b/graphics/object_events/pics/people/mg_deliveryman.png diff --git a/graphics/object_events/pics/people/misty.png b/graphics/object_events/pics/people/misty.png Binary files differindex 0e4a837b5..7411bafd2 100644 --- a/graphics/object_events/pics/people/misty.png +++ b/graphics/object_events/pics/people/misty.png diff --git a/graphics/object_events/pics/people/mom.png b/graphics/object_events/pics/people/mom.png Binary files differindex c7e79eefd..b5d6c18e7 100644 --- a/graphics/object_events/pics/people/mom.png +++ b/graphics/object_events/pics/people/mom.png diff --git a/graphics/object_events/pics/people/mr_fuji.png b/graphics/object_events/pics/people/mr_fuji.png Binary files differindex 4b6983de6..37bd5500e 100644 --- a/graphics/object_events/pics/people/mr_fuji.png +++ b/graphics/object_events/pics/people/mr_fuji.png diff --git a/graphics/object_events/pics/people/nurse.png b/graphics/object_events/pics/people/nurse.png Binary files differindex 328d1f6b7..56c618828 100644 --- a/graphics/object_events/pics/people/nurse.png +++ b/graphics/object_events/pics/people/nurse.png diff --git a/graphics/object_events/pics/people/old_man_1.png b/graphics/object_events/pics/people/old_man_1.png Binary files differindex 87d1e4ce4..ca9c1f5af 100644 --- a/graphics/object_events/pics/people/old_man_1.png +++ b/graphics/object_events/pics/people/old_man_1.png diff --git a/graphics/object_events/pics/people/old_man_2.png b/graphics/object_events/pics/people/old_man_2.png Binary files differindex f6913ed9b..8ed16d9ed 100644 --- a/graphics/object_events/pics/people/old_man_2.png +++ b/graphics/object_events/pics/people/old_man_2.png diff --git a/graphics/object_events/pics/people/old_woman.png b/graphics/object_events/pics/people/old_woman.png Binary files differindex a99ab0238..454ae3c14 100644 --- a/graphics/object_events/pics/people/old_woman.png +++ b/graphics/object_events/pics/people/old_woman.png diff --git a/graphics/object_events/pics/people/picnicker.png b/graphics/object_events/pics/people/picnicker.png Binary files differindex 8bff4d72e..c04b34bb0 100644 --- a/graphics/object_events/pics/people/picnicker.png +++ b/graphics/object_events/pics/people/picnicker.png diff --git a/graphics/object_events/pics/people/policeman.png b/graphics/object_events/pics/people/policeman.png Binary files differindex aedee9f67..6515eaad7 100644 --- a/graphics/object_events/pics/people/policeman.png +++ b/graphics/object_events/pics/people/policeman.png diff --git a/graphics/object_events/pics/people/prof_oak.png b/graphics/object_events/pics/people/prof_oak.png Binary files differindex fab2b23ac..037b0f966 100644 --- a/graphics/object_events/pics/people/prof_oak.png +++ b/graphics/object_events/pics/people/prof_oak.png diff --git a/graphics/object_events/pics/people/red_bike.png b/graphics/object_events/pics/people/red_bike.png Binary files differindex ee7d0a1d3..fca60266a 100644 --- a/graphics/object_events/pics/people/red_bike.png +++ b/graphics/object_events/pics/people/red_bike.png diff --git a/graphics/object_events/pics/people/red_fish.png b/graphics/object_events/pics/people/red_fish.png Binary files differindex a5ae8b3d1..57a64d0e5 100644 --- a/graphics/object_events/pics/people/red_fish.png +++ b/graphics/object_events/pics/people/red_fish.png diff --git a/graphics/object_events/pics/people/red_item.png b/graphics/object_events/pics/people/red_item.png Binary files differindex 66d53ea88..a462ec469 100644 --- a/graphics/object_events/pics/people/red_item.png +++ b/graphics/object_events/pics/people/red_item.png diff --git a/graphics/object_events/pics/people/red_normal.png b/graphics/object_events/pics/people/red_normal.png Binary files differindex 8b72a852f..377224e2f 100644 --- a/graphics/object_events/pics/people/red_normal.png +++ b/graphics/object_events/pics/people/red_normal.png diff --git a/graphics/object_events/pics/people/red_surf.png b/graphics/object_events/pics/people/red_surf.png Binary files differnew file mode 100644 index 000000000..7686de04b --- /dev/null +++ b/graphics/object_events/pics/people/red_surf.png diff --git a/graphics/object_events/pics/people/red_surf_run.png b/graphics/object_events/pics/people/red_surf_run.png Binary files differindex 961bff7a8..f4473bbae 100644 --- a/graphics/object_events/pics/people/red_surf_run.png +++ b/graphics/object_events/pics/people/red_surf_run.png diff --git a/graphics/object_events/pics/people/red_vs_seeker_bike.png b/graphics/object_events/pics/people/red_vs_seeker_bike.png Binary files differindex 90b198edb..f0a607af3 100644 --- a/graphics/object_events/pics/people/red_vs_seeker_bike.png +++ b/graphics/object_events/pics/people/red_vs_seeker_bike.png diff --git a/graphics/object_events/pics/people/rich_boy.png b/graphics/object_events/pics/people/rich_boy.png Binary files differindex 36f112e85..0cde86738 100644 --- a/graphics/object_events/pics/people/rich_boy.png +++ b/graphics/object_events/pics/people/rich_boy.png diff --git a/graphics/object_events/pics/people/rocker.png b/graphics/object_events/pics/people/rocker.png Binary files differindex 44b8b5c50..20246423c 100644 --- a/graphics/object_events/pics/people/rocker.png +++ b/graphics/object_events/pics/people/rocker.png diff --git a/graphics/object_events/pics/people/rocket_f.png b/graphics/object_events/pics/people/rocket_f.png Binary files differindex 8c3817c82..f650d37a8 100644 --- a/graphics/object_events/pics/people/rocket_f.png +++ b/graphics/object_events/pics/people/rocket_f.png diff --git a/graphics/object_events/pics/people/rocket_m.png b/graphics/object_events/pics/people/rocket_m.png Binary files differindex 07222b9ba..7b1130802 100644 --- a/graphics/object_events/pics/people/rocket_m.png +++ b/graphics/object_events/pics/people/rocket_m.png diff --git a/graphics/object_events/pics/people/rs_brendan.png b/graphics/object_events/pics/people/rs_brendan.png Binary files differindex b79967c4b..22e4775ab 100644 --- a/graphics/object_events/pics/people/rs_brendan.png +++ b/graphics/object_events/pics/people/rs_brendan.png diff --git a/graphics/object_events/pics/people/rs_may.png b/graphics/object_events/pics/people/rs_may.png Binary files differindex 6cc84665c..e3b591b46 100644 --- a/graphics/object_events/pics/people/rs_may.png +++ b/graphics/object_events/pics/people/rs_may.png diff --git a/graphics/object_events/pics/people/sabrina.png b/graphics/object_events/pics/people/sabrina.png Binary files differindex 101dfb0e0..e9ba5b3fa 100644 --- a/graphics/object_events/pics/people/sabrina.png +++ b/graphics/object_events/pics/people/sabrina.png diff --git a/graphics/object_events/pics/people/sailor.png b/graphics/object_events/pics/people/sailor.png Binary files differindex 175e14e47..fb20f3d41 100644 --- a/graphics/object_events/pics/people/sailor.png +++ b/graphics/object_events/pics/people/sailor.png diff --git a/graphics/object_events/pics/people/scientist.png b/graphics/object_events/pics/people/scientist.png Binary files differindex b85011c3c..9ea707eea 100644 --- a/graphics/object_events/pics/people/scientist.png +++ b/graphics/object_events/pics/people/scientist.png diff --git a/graphics/object_events/pics/people/sitting_boy.png b/graphics/object_events/pics/people/sitting_boy.png Binary files differindex 15eabb0b3..00a266393 100644 --- a/graphics/object_events/pics/people/sitting_boy.png +++ b/graphics/object_events/pics/people/sitting_boy.png diff --git a/graphics/object_events/pics/people/super_nerd.png b/graphics/object_events/pics/people/super_nerd.png Binary files differindex 95089c7ee..bddfe2cc9 100644 --- a/graphics/object_events/pics/people/super_nerd.png +++ b/graphics/object_events/pics/people/super_nerd.png diff --git a/graphics/object_events/pics/people/swimmer_f_land.png b/graphics/object_events/pics/people/swimmer_f_land.png Binary files differindex 2f7a5f796..5253dc909 100644 --- a/graphics/object_events/pics/people/swimmer_f_land.png +++ b/graphics/object_events/pics/people/swimmer_f_land.png diff --git a/graphics/object_events/pics/people/swimmer_f_water.png b/graphics/object_events/pics/people/swimmer_f_water.png Binary files differindex a76e9bd47..664bfc6ff 100644 --- a/graphics/object_events/pics/people/swimmer_f_water.png +++ b/graphics/object_events/pics/people/swimmer_f_water.png diff --git a/graphics/object_events/pics/people/swimmer_m_land.png b/graphics/object_events/pics/people/swimmer_m_land.png Binary files differindex 9e862173a..b5e420822 100644 --- a/graphics/object_events/pics/people/swimmer_m_land.png +++ b/graphics/object_events/pics/people/swimmer_m_land.png diff --git a/graphics/object_events/pics/people/swimmer_m_water.png b/graphics/object_events/pics/people/swimmer_m_water.png Binary files differindex ded67966a..2a1a111ca 100644 --- a/graphics/object_events/pics/people/swimmer_m_water.png +++ b/graphics/object_events/pics/people/swimmer_m_water.png diff --git a/graphics/object_events/pics/people/teachy_tv_host.png b/graphics/object_events/pics/people/teachy_tv_host.png Binary files differindex 320da6daa..f4588e9f8 100644 --- a/graphics/object_events/pics/people/teachy_tv_host.png +++ b/graphics/object_events/pics/people/teachy_tv_host.png diff --git a/graphics/object_events/pics/people/trainer_tower_dude.png b/graphics/object_events/pics/people/trainer_tower_dude.png Binary files differindex a3f994a83..ea267aba1 100644 --- a/graphics/object_events/pics/people/trainer_tower_dude.png +++ b/graphics/object_events/pics/people/trainer_tower_dude.png diff --git a/graphics/object_events/pics/people/tuber_f.png b/graphics/object_events/pics/people/tuber_f.png Binary files differindex c4f962acb..3ba142291 100644 --- a/graphics/object_events/pics/people/tuber_f.png +++ b/graphics/object_events/pics/people/tuber_f.png diff --git a/graphics/object_events/pics/people/tuber_m_land.png b/graphics/object_events/pics/people/tuber_m_land.png Binary files differindex b53913af7..c9a903e77 100644 --- a/graphics/object_events/pics/people/tuber_m_land.png +++ b/graphics/object_events/pics/people/tuber_m_land.png diff --git a/graphics/object_events/pics/people/tuber_m_water.png b/graphics/object_events/pics/people/tuber_m_water.png Binary files differindex 23fe7c6e3..0b0adfbf4 100644 --- a/graphics/object_events/pics/people/tuber_m_water.png +++ b/graphics/object_events/pics/people/tuber_m_water.png diff --git a/graphics/object_events/pics/people/union_room_receptionist.png b/graphics/object_events/pics/people/union_room_receptionist.png Binary files differindex ef0ecdba4..78596e6f9 100644 --- a/graphics/object_events/pics/people/union_room_receptionist.png +++ b/graphics/object_events/pics/people/union_room_receptionist.png diff --git a/graphics/object_events/pics/people/unused_male_receptionist.png b/graphics/object_events/pics/people/unused_male_receptionist.png Binary files differindex d1c20e818..81a50792e 100644 --- a/graphics/object_events/pics/people/unused_male_receptionist.png +++ b/graphics/object_events/pics/people/unused_male_receptionist.png diff --git a/graphics/object_events/pics/people/unused_man.png b/graphics/object_events/pics/people/unused_man.png Binary files differindex e01e3ea8e..8af57a77b 100644 --- a/graphics/object_events/pics/people/unused_man.png +++ b/graphics/object_events/pics/people/unused_man.png diff --git a/graphics/object_events/pics/people/unused_woman.png b/graphics/object_events/pics/people/unused_woman.png Binary files differindex d39504689..7fc28d1d4 100644 --- a/graphics/object_events/pics/people/unused_woman.png +++ b/graphics/object_events/pics/people/unused_woman.png diff --git a/graphics/object_events/pics/people/woman_1.png b/graphics/object_events/pics/people/woman_1.png Binary files differindex b3922d5f8..73fef57d0 100644 --- a/graphics/object_events/pics/people/woman_1.png +++ b/graphics/object_events/pics/people/woman_1.png diff --git a/graphics/object_events/pics/people/woman_2.png b/graphics/object_events/pics/people/woman_2.png Binary files differindex 95d3c5e0f..1242f1fb9 100644 --- a/graphics/object_events/pics/people/woman_2.png +++ b/graphics/object_events/pics/people/woman_2.png diff --git a/graphics/object_events/pics/people/woman_3.png b/graphics/object_events/pics/people/woman_3.png Binary files differindex fc278b97e..753d0e7f7 100644 --- a/graphics/object_events/pics/people/woman_3.png +++ b/graphics/object_events/pics/people/woman_3.png diff --git a/graphics/object_events/pics/people/worker_f.png b/graphics/object_events/pics/people/worker_f.png Binary files differindex 20a4e3a15..d6f592e3d 100644 --- a/graphics/object_events/pics/people/worker_f.png +++ b/graphics/object_events/pics/people/worker_f.png diff --git a/graphics/object_events/pics/people/worker_m.png b/graphics/object_events/pics/people/worker_m.png Binary files differindex 361e028c4..4a9aef440 100644 --- a/graphics/object_events/pics/people/worker_m.png +++ b/graphics/object_events/pics/people/worker_m.png diff --git a/graphics/object_events/pics/people/youngster.png b/graphics/object_events/pics/people/youngster.png Binary files differindex 13f4ee1f2..6c44de413 100644 --- a/graphics/object_events/pics/people/youngster.png +++ b/graphics/object_events/pics/people/youngster.png diff --git a/graphics/object_events/pics/pokemon/chansey.png b/graphics/object_events/pics/pokemon/chansey.png Binary files differindex 550a58260..f726385e3 100644 --- a/graphics/object_events/pics/pokemon/chansey.png +++ b/graphics/object_events/pics/pokemon/chansey.png diff --git a/graphics/object_events/pics/pokemon/clefairy.png b/graphics/object_events/pics/pokemon/clefairy.png Binary files differindex e5817bac8..9d19a9651 100644 --- a/graphics/object_events/pics/pokemon/clefairy.png +++ b/graphics/object_events/pics/pokemon/clefairy.png diff --git a/graphics/object_events/pics/pokemon/cubone.png b/graphics/object_events/pics/pokemon/cubone.png Binary files differindex ba51eaddc..a545655c6 100644 --- a/graphics/object_events/pics/pokemon/cubone.png +++ b/graphics/object_events/pics/pokemon/cubone.png diff --git a/graphics/object_events/pics/pokemon/deoxys_a.png b/graphics/object_events/pics/pokemon/deoxys_a.png Binary files differindex 84c160d61..741668a57 100644 --- a/graphics/object_events/pics/pokemon/deoxys_a.png +++ b/graphics/object_events/pics/pokemon/deoxys_a.png diff --git a/graphics/object_events/pics/pokemon/deoxys_d.png b/graphics/object_events/pics/pokemon/deoxys_d.png Binary files differindex 9079690f0..236ac6b53 100644 --- a/graphics/object_events/pics/pokemon/deoxys_d.png +++ b/graphics/object_events/pics/pokemon/deoxys_d.png diff --git a/graphics/object_events/pics/pokemon/deoxys_n.png b/graphics/object_events/pics/pokemon/deoxys_n.png Binary files differindex 48695b960..2cb74e4bb 100644 --- a/graphics/object_events/pics/pokemon/deoxys_n.png +++ b/graphics/object_events/pics/pokemon/deoxys_n.png diff --git a/graphics/object_events/pics/pokemon/doduo.png b/graphics/object_events/pics/pokemon/doduo.png Binary files differindex 9a63cab7e..de751d319 100644 --- a/graphics/object_events/pics/pokemon/doduo.png +++ b/graphics/object_events/pics/pokemon/doduo.png diff --git a/graphics/object_events/pics/pokemon/fearow.png b/graphics/object_events/pics/pokemon/fearow.png Binary files differindex c26ced826..905c00904 100644 --- a/graphics/object_events/pics/pokemon/fearow.png +++ b/graphics/object_events/pics/pokemon/fearow.png diff --git a/graphics/object_events/pics/pokemon/ho_oh.png b/graphics/object_events/pics/pokemon/ho_oh.png Binary files differindex 3d2a7f11b..54f769347 100644 --- a/graphics/object_events/pics/pokemon/ho_oh.png +++ b/graphics/object_events/pics/pokemon/ho_oh.png diff --git a/graphics/object_events/pics/pokemon/jigglypuff.png b/graphics/object_events/pics/pokemon/jigglypuff.png Binary files differindex ccd46b1f8..392e6c376 100644 --- a/graphics/object_events/pics/pokemon/jigglypuff.png +++ b/graphics/object_events/pics/pokemon/jigglypuff.png diff --git a/graphics/object_events/pics/pokemon/kabuto.png b/graphics/object_events/pics/pokemon/kabuto.png Binary files differindex 50339fbc0..f0d7eea25 100644 --- a/graphics/object_events/pics/pokemon/kabuto.png +++ b/graphics/object_events/pics/pokemon/kabuto.png diff --git a/graphics/object_events/pics/pokemon/kangaskhan.png b/graphics/object_events/pics/pokemon/kangaskhan.png Binary files differindex ed82e390e..cb54d68e0 100644 --- a/graphics/object_events/pics/pokemon/kangaskhan.png +++ b/graphics/object_events/pics/pokemon/kangaskhan.png diff --git a/graphics/object_events/pics/pokemon/lapras.png b/graphics/object_events/pics/pokemon/lapras.png Binary files differindex 3fd66ec1d..382214434 100644 --- a/graphics/object_events/pics/pokemon/lapras.png +++ b/graphics/object_events/pics/pokemon/lapras.png diff --git a/graphics/object_events/pics/pokemon/lugia.png b/graphics/object_events/pics/pokemon/lugia.png Binary files differindex 22794f5c6..931827dba 100644 --- a/graphics/object_events/pics/pokemon/lugia.png +++ b/graphics/object_events/pics/pokemon/lugia.png diff --git a/graphics/object_events/pics/pokemon/machoke.png b/graphics/object_events/pics/pokemon/machoke.png Binary files differindex 74a29680c..6ca59cd29 100644 --- a/graphics/object_events/pics/pokemon/machoke.png +++ b/graphics/object_events/pics/pokemon/machoke.png diff --git a/graphics/object_events/pics/pokemon/machop.png b/graphics/object_events/pics/pokemon/machop.png Binary files differindex db791455b..c1ed7783c 100644 --- a/graphics/object_events/pics/pokemon/machop.png +++ b/graphics/object_events/pics/pokemon/machop.png diff --git a/graphics/object_events/pics/pokemon/meowth.png b/graphics/object_events/pics/pokemon/meowth.png Binary files differindex 31203db01..1bb437505 100644 --- a/graphics/object_events/pics/pokemon/meowth.png +++ b/graphics/object_events/pics/pokemon/meowth.png diff --git a/graphics/object_events/pics/pokemon/nidoran_f.png b/graphics/object_events/pics/pokemon/nidoran_f.png Binary files differindex b25ee75f4..c58f6b90d 100644 --- a/graphics/object_events/pics/pokemon/nidoran_f.png +++ b/graphics/object_events/pics/pokemon/nidoran_f.png diff --git a/graphics/object_events/pics/pokemon/nidoran_m.png b/graphics/object_events/pics/pokemon/nidoran_m.png Binary files differindex 4a2768475..ff5100acf 100644 --- a/graphics/object_events/pics/pokemon/nidoran_m.png +++ b/graphics/object_events/pics/pokemon/nidoran_m.png diff --git a/graphics/object_events/pics/pokemon/nidorino.png b/graphics/object_events/pics/pokemon/nidorino.png Binary files differindex 8cdfa0ef2..de86d7ea2 100644 --- a/graphics/object_events/pics/pokemon/nidorino.png +++ b/graphics/object_events/pics/pokemon/nidorino.png diff --git a/graphics/object_events/pics/pokemon/omanyte.png b/graphics/object_events/pics/pokemon/omanyte.png Binary files differindex 083897483..20c5ade4d 100644 --- a/graphics/object_events/pics/pokemon/omanyte.png +++ b/graphics/object_events/pics/pokemon/omanyte.png diff --git a/graphics/object_events/pics/pokemon/pidgeot.png b/graphics/object_events/pics/pokemon/pidgeot.png Binary files differindex 55748d9a0..ce69c0aab 100644 --- a/graphics/object_events/pics/pokemon/pidgeot.png +++ b/graphics/object_events/pics/pokemon/pidgeot.png diff --git a/graphics/object_events/pics/pokemon/pidgey.png b/graphics/object_events/pics/pokemon/pidgey.png Binary files differindex a109eb2c6..467115722 100644 --- a/graphics/object_events/pics/pokemon/pidgey.png +++ b/graphics/object_events/pics/pokemon/pidgey.png diff --git a/graphics/object_events/pics/pokemon/pikachu.png b/graphics/object_events/pics/pokemon/pikachu.png Binary files differindex 7b837e11b..03b4a1481 100644 --- a/graphics/object_events/pics/pokemon/pikachu.png +++ b/graphics/object_events/pics/pokemon/pikachu.png diff --git a/graphics/object_events/pics/pokemon/poliwrath.png b/graphics/object_events/pics/pokemon/poliwrath.png Binary files differindex 0c8428fd3..200922142 100644 --- a/graphics/object_events/pics/pokemon/poliwrath.png +++ b/graphics/object_events/pics/pokemon/poliwrath.png diff --git a/graphics/object_events/pics/pokemon/psyduck.png b/graphics/object_events/pics/pokemon/psyduck.png Binary files differindex 1f0dd24e0..c3d35325f 100644 --- a/graphics/object_events/pics/pokemon/psyduck.png +++ b/graphics/object_events/pics/pokemon/psyduck.png diff --git a/graphics/object_events/pics/pokemon/seel.png b/graphics/object_events/pics/pokemon/seel.png Binary files differindex 2cd14040c..23a6597f5 100644 --- a/graphics/object_events/pics/pokemon/seel.png +++ b/graphics/object_events/pics/pokemon/seel.png diff --git a/graphics/object_events/pics/pokemon/slowbro.png b/graphics/object_events/pics/pokemon/slowbro.png Binary files differindex 1cd63f1eb..221a185a2 100644 --- a/graphics/object_events/pics/pokemon/slowbro.png +++ b/graphics/object_events/pics/pokemon/slowbro.png diff --git a/graphics/object_events/pics/pokemon/slowpoke.png b/graphics/object_events/pics/pokemon/slowpoke.png Binary files differindex 9baab0bbe..fd9274f6b 100644 --- a/graphics/object_events/pics/pokemon/slowpoke.png +++ b/graphics/object_events/pics/pokemon/slowpoke.png diff --git a/graphics/object_events/pics/pokemon/spearow.png b/graphics/object_events/pics/pokemon/spearow.png Binary files differindex 499f51e8c..f27077751 100644 --- a/graphics/object_events/pics/pokemon/spearow.png +++ b/graphics/object_events/pics/pokemon/spearow.png diff --git a/graphics/object_events/pics/pokemon/voltorb.png b/graphics/object_events/pics/pokemon/voltorb.png Binary files differindex 973306673..7cc03e093 100644 --- a/graphics/object_events/pics/pokemon/voltorb.png +++ b/graphics/object_events/pics/pokemon/voltorb.png diff --git a/graphics/object_events/pics/pokemon/wigglytuff.png b/graphics/object_events/pics/pokemon/wigglytuff.png Binary files differindex c8252a957..18f4abef4 100644 --- a/graphics/object_events/pics/pokemon/wigglytuff.png +++ b/graphics/object_events/pics/pokemon/wigglytuff.png diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk index cf6563219..8c26e9a7d 100644 --- a/graphics_file_rules.mk +++ b/graphics_file_rules.mk @@ -529,9 +529,6 @@ $(POKEDEXAREAMARKERSDATADIR)/marker.4bpp: $(POKEDEXAREAMARKERFILES) graphics/pokemon/heracross/unk_icon.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 -graphics/object_events/pics/misc/ss_anne.4bpp: %.4bpp: %.png - $(GFX) $< $@ -mwidth 8 -mheight 4 - graphics/misc/emoticons.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 2 -mheight 2 diff --git a/spritesheet_rules.mk b/spritesheet_rules.mk new file mode 100644 index 000000000..7b08dd1e0 --- /dev/null +++ b/spritesheet_rules.mk @@ -0,0 +1,395 @@ +OBJEVENTGFXDIR := graphics/object_events/pics +FLDEFFGFXDIR := graphics/field_effects/pics + +$(OBJEVENTGFXDIR)/misc/cut_tree.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 2 + +$(OBJEVENTGFXDIR)/misc/rock_smash_rock.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 2 + +$(OBJEVENTGFXDIR)/misc/surf_blob.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 4 -mheight 4 + +$(OBJEVENTGFXDIR)/misc/ss_anne.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 8 -mheight 4 + +$(OBJEVENTGFXDIR)/people/agatha.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(OBJEVENTGFXDIR)/people/balding_man.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(OBJEVENTGFXDIR)/people/battle_girl.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(OBJEVENTGFXDIR)/people/beauty.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(OBJEVENTGFXDIR)/people/biker.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 4 -mheight 4 + +$(OBJEVENTGFXDIR)/people/bill.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(OBJEVENTGFXDIR)/people/blackbelt.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(OBJEVENTGFXDIR)/people/blaine.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(OBJEVENTGFXDIR)/people/blue.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(OBJEVENTGFXDIR)/people/boy.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(OBJEVENTGFXDIR)/people/brock.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(OBJEVENTGFXDIR)/people/bruno.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(OBJEVENTGFXDIR)/people/bug_catcher.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(OBJEVENTGFXDIR)/people/cable_club_receptionist.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(OBJEVENTGFXDIR)/people/cameraman.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(OBJEVENTGFXDIR)/people/camper.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(OBJEVENTGFXDIR)/people/captain.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(OBJEVENTGFXDIR)/people/celio.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(OBJEVENTGFXDIR)/people/channeler.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(OBJEVENTGFXDIR)/people/chef.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(OBJEVENTGFXDIR)/people/clerk.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(OBJEVENTGFXDIR)/people/cooltrainer_f.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(OBJEVENTGFXDIR)/people/cooltrainer_m.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(OBJEVENTGFXDIR)/people/daisy.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(OBJEVENTGFXDIR)/people/erika.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(OBJEVENTGFXDIR)/people/fat_man.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(OBJEVENTGFXDIR)/people/fisher.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(OBJEVENTGFXDIR)/people/gba_kid.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(OBJEVENTGFXDIR)/people/gentleman.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(OBJEVENTGFXDIR)/people/giovanni.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(OBJEVENTGFXDIR)/people/green_bike.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 4 -mheight 4 + +$(OBJEVENTGFXDIR)/people/green_fish.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 4 -mheight 4 + +$(OBJEVENTGFXDIR)/people/green_item.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(OBJEVENTGFXDIR)/people/green_normal.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(OBJEVENTGFXDIR)/people/green_surf_run.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(OBJEVENTGFXDIR)/people/green_surf.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 4 -mheight 4 + +$(OBJEVENTGFXDIR)/people/green_vs_seeker_bike.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 4 -mheight 4 + +$(OBJEVENTGFXDIR)/people/gym_guy.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(OBJEVENTGFXDIR)/people/hiker.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(OBJEVENTGFXDIR)/people/koga.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(OBJEVENTGFXDIR)/people/lance.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(OBJEVENTGFXDIR)/people/lass.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(OBJEVENTGFXDIR)/people/little_boy.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 2 + +$(OBJEVENTGFXDIR)/people/little_girl.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 2 + +$(OBJEVENTGFXDIR)/people/lorelei.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(OBJEVENTGFXDIR)/people/lt_surge.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(OBJEVENTGFXDIR)/people/man.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(OBJEVENTGFXDIR)/people/mg_deliveryman.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(OBJEVENTGFXDIR)/people/misty.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(OBJEVENTGFXDIR)/people/mom.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(OBJEVENTGFXDIR)/people/mr_fuji.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(OBJEVENTGFXDIR)/people/nurse.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(OBJEVENTGFXDIR)/people/old_man_1.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(OBJEVENTGFXDIR)/people/old_man_2.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(OBJEVENTGFXDIR)/people/old_woman.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(OBJEVENTGFXDIR)/people/picnicker.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(OBJEVENTGFXDIR)/people/policeman.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(OBJEVENTGFXDIR)/people/prof_oak.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(OBJEVENTGFXDIR)/people/red_bike.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 4 -mheight 4 + +$(OBJEVENTGFXDIR)/people/red_fish.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 4 -mheight 4 + +$(OBJEVENTGFXDIR)/people/red_item.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(OBJEVENTGFXDIR)/people/red_normal.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(OBJEVENTGFXDIR)/people/red_surf_run.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(OBJEVENTGFXDIR)/people/red_surf.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 4 -mheight 4 + +$(OBJEVENTGFXDIR)/people/red_vs_seeker_bike.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 4 -mheight 4 + +$(OBJEVENTGFXDIR)/people/rich_boy.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(OBJEVENTGFXDIR)/people/rocker.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(OBJEVENTGFXDIR)/people/rocket_f.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(OBJEVENTGFXDIR)/people/rocket_m.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(OBJEVENTGFXDIR)/people/rs_brendan.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(OBJEVENTGFXDIR)/people/rs_may.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(OBJEVENTGFXDIR)/people/sabrina.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(OBJEVENTGFXDIR)/people/sailor.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(OBJEVENTGFXDIR)/people/scientist.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(OBJEVENTGFXDIR)/people/sitting_boy.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(OBJEVENTGFXDIR)/people/super_nerd.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(OBJEVENTGFXDIR)/people/swimmer_f_land.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(OBJEVENTGFXDIR)/people/swimmer_f_water.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(OBJEVENTGFXDIR)/people/swimmer_m_land.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(OBJEVENTGFXDIR)/people/swimmer_m_water.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(OBJEVENTGFXDIR)/people/teachy_tv_host.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(OBJEVENTGFXDIR)/people/trainer_tower_dude.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(OBJEVENTGFXDIR)/people/tuber_f.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 2 + +$(OBJEVENTGFXDIR)/people/tuber_m_land.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 2 + +$(OBJEVENTGFXDIR)/people/tuber_m_water.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 2 + +$(OBJEVENTGFXDIR)/people/union_room_receptionist.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(OBJEVENTGFXDIR)/people/unused_male_receptionist.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(OBJEVENTGFXDIR)/people/unused_man.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(OBJEVENTGFXDIR)/people/unused_woman.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(OBJEVENTGFXDIR)/people/woman_1.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(OBJEVENTGFXDIR)/people/woman_2.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(OBJEVENTGFXDIR)/people/woman_3.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(OBJEVENTGFXDIR)/people/worker_f.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(OBJEVENTGFXDIR)/people/worker_m.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(OBJEVENTGFXDIR)/people/youngster.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 4 + +$(OBJEVENTGFXDIR)/pokemon/chansey.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 2 + +$(OBJEVENTGFXDIR)/pokemon/clefairy.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 2 + +$(OBJEVENTGFXDIR)/pokemon/cubone.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 2 + +$(OBJEVENTGFXDIR)/pokemon/deoxys_a.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 4 -mheight 4 + +$(OBJEVENTGFXDIR)/pokemon/deoxys_d.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 4 -mheight 4 + +$(OBJEVENTGFXDIR)/pokemon/deoxys_n.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 4 -mheight 4 + +$(OBJEVENTGFXDIR)/pokemon/doduo.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 2 + +$(OBJEVENTGFXDIR)/pokemon/fearow.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 2 + +$(OBJEVENTGFXDIR)/pokemon/ho_oh.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 4 -mheight 4 + +$(OBJEVENTGFXDIR)/pokemon/jigglypuff.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 2 + +$(OBJEVENTGFXDIR)/pokemon/kabuto.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 2 + +$(OBJEVENTGFXDIR)/pokemon/kangaskhan.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 2 + +$(OBJEVENTGFXDIR)/pokemon/lapras.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 2 + +$(OBJEVENTGFXDIR)/pokemon/lugia.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 4 -mheight 4 + +$(OBJEVENTGFXDIR)/pokemon/machoke.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 2 + +$(OBJEVENTGFXDIR)/pokemon/machop.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 2 + +$(OBJEVENTGFXDIR)/pokemon/meowth.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 2 + +$(OBJEVENTGFXDIR)/pokemon/nidoran_f.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 2 + +$(OBJEVENTGFXDIR)/pokemon/nidoran_m.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 2 + +$(OBJEVENTGFXDIR)/pokemon/nidorino.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 2 + +$(OBJEVENTGFXDIR)/pokemon/omanyte.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 2 + +$(OBJEVENTGFXDIR)/pokemon/pidgeot.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 2 + +$(OBJEVENTGFXDIR)/pokemon/pidgey.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 2 + +$(OBJEVENTGFXDIR)/pokemon/pikachu.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 2 + +$(OBJEVENTGFXDIR)/pokemon/poliwrath.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 2 + +$(OBJEVENTGFXDIR)/pokemon/psyduck.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 2 + +$(OBJEVENTGFXDIR)/pokemon/seel.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 2 + +$(OBJEVENTGFXDIR)/pokemon/slowbro.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 2 + +$(OBJEVENTGFXDIR)/pokemon/slowpoke.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 2 + +$(OBJEVENTGFXDIR)/pokemon/spearow.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 2 + +$(OBJEVENTGFXDIR)/pokemon/voltorb.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 2 + +$(OBJEVENTGFXDIR)/pokemon/wigglytuff.4bpp: %.4bpp: %.png + $(GFX) $< $@ -mwidth 2 -mheight 2 diff --git a/src/data/object_events/object_event_graphics.h b/src/data/object_events/object_event_graphics.h index 53490bab7..87451cae1 100644 --- a/src/data/object_events/object_event_graphics.h +++ b/src/data/object_events/object_event_graphics.h @@ -22,8 +22,8 @@ const u16 gUnknown_835E968[] = INCBIN_U16("graphics/object_events/palettes/1.gba const u16 gUnknown_835E988[] = INCBIN_U16("graphics/object_events/palettes/2.gbapal"); const u32 gObjectEventPic_RedItem[] = INCBIN_U32("graphics/object_events/pics/people/red_item.4bpp"); const u32 gObjectEventPic_GreenItem[] = INCBIN_U32("graphics/object_events/pics/people/green_item.4bpp"); -const u32 gObjectEventPic_MaleSurfing[] = INCBIN_U32("graphics/object_events/pics/people/male_surf.4bpp"); -const u32 gObjectEventPic_FemaleSurfing[] = INCBIN_U32("graphics/object_events/pics/people/female_surf.4bpp"); +const u32 gObjectEventPic_RedSurf[] = INCBIN_U32("graphics/object_events/pics/people/red_surf.4bpp"); +const u32 gObjectEventPic_GreenSurf[] = INCBIN_U32("graphics/object_events/pics/people/green_surf.4bpp"); const u32 gObjectEventPic_RedBike[] = INCBIN_U32("graphics/object_events/pics/people/red_bike.4bpp"); const u32 gObjectEventPic_RedVSSeekerBike[] = INCBIN_U32("graphics/object_events/pics/people/red_vs_seeker_bike.4bpp"); const u32 gObjectEventPic_GreenBike[] = INCBIN_U32("graphics/object_events/pics/people/green_bike.4bpp"); @@ -191,9 +191,9 @@ const u32 gUnknown_8398068[] = INCBIN_U32("graphics/object_events/pics/effects/s const u32 gUnknown_83980A8[] = INCBIN_U32("graphics/object_events/pics/effects/shadow_large.4bpp"); const u32 gUnknown_8398128[] = INCBIN_U32("graphics/object_events/pics/effects/shadow_extra_large.4bpp"); const u32 filler_8398188[0x48] = {}; -const u16 gUnknown_8398648[] = INCBIN_U16("graphics/object_events/pics/misc/fldeff_cut.4bpp"); -const u32 gUnknown_8398668[] = INCBIN_U32("graphics/object_events/pics/misc/fldeff_cut.4bpp"); -const u16 gUnknown_8398688[] = INCBIN_U16("graphics/object_events/pics/misc/fldeff_cut.gbapal"); +const u16 gUnknown_8398648[] = INCBIN_U16("graphics/field_effects/fldeff_cut.4bpp"); +const u32 gUnknown_8398668[] = INCBIN_U32("graphics/field_effects/fldeff_cut.4bpp"); +const u16 gUnknown_8398688[] = INCBIN_U16("graphics/field_effects/fldeff_cut.gbapal"); const u32 gUnknown_83986A8[] = INCBIN_U32("graphics/object_events/pics/unknown/83986A8.4bpp"); const u32 gUnknown_8398928[] = INCBIN_U32("graphics/object_events/pics/unknown/8398928.4bpp"); const u32 gUnknown_8398BA8[] = INCBIN_U32("graphics/object_events/pics/unknown/8398BA8.4bpp"); |
