From 55f9028383b7effda0a5a84e2c09ef80ae9316cc Mon Sep 17 00:00:00 2001 From: GriffinR Date: Sat, 28 Mar 2020 02:53:17 -0400 Subject: Reorient object event sprites to horizontal --- Makefile | 1 + graphics/field_effects/fldeff_cut.png | Bin 0 -> 173 bytes graphics/object_events/pics/misc/cut_tree.png | Bin 398 -> 389 bytes graphics/object_events/pics/misc/fldeff_cut.png | Bin 173 -> 0 bytes .../object_events/pics/misc/rock_smash_rock.png | Bin 398 -> 395 bytes graphics/object_events/pics/misc/surf_blob.png | Bin 461 -> 466 bytes graphics/object_events/pics/people/agatha.png | Bin 448 -> 439 bytes graphics/object_events/pics/people/balding_man.png | Bin 767 -> 790 bytes graphics/object_events/pics/people/battle_girl.png | Bin 760 -> 778 bytes graphics/object_events/pics/people/beauty.png | Bin 795 -> 800 bytes graphics/object_events/pics/people/biker.png | Bin 781 -> 874 bytes graphics/object_events/pics/people/bill.png | Bin 733 -> 751 bytes graphics/object_events/pics/people/blackbelt.png | Bin 861 -> 864 bytes graphics/object_events/pics/people/blaine.png | Bin 465 -> 461 bytes graphics/object_events/pics/people/blue.png | Bin 704 -> 727 bytes graphics/object_events/pics/people/boy.png | Bin 730 -> 747 bytes graphics/object_events/pics/people/brock.png | Bin 442 -> 444 bytes graphics/object_events/pics/people/bruno.png | Bin 456 -> 455 bytes graphics/object_events/pics/people/bug_catcher.png | Bin 717 -> 712 bytes .../pics/people/cable_club_receptionist.png | Bin 425 -> 424 bytes graphics/object_events/pics/people/cameraman.png | Bin 620 -> 674 bytes graphics/object_events/pics/people/camper.png | Bin 749 -> 758 bytes graphics/object_events/pics/people/captain.png | Bin 697 -> 725 bytes graphics/object_events/pics/people/celio.png | Bin 731 -> 747 bytes graphics/object_events/pics/people/channeler.png | Bin 796 -> 811 bytes graphics/object_events/pics/people/chef.png | Bin 695 -> 701 bytes graphics/object_events/pics/people/clerk.png | Bin 747 -> 769 bytes .../object_events/pics/people/cooltrainer_f.png | Bin 729 -> 758 bytes .../object_events/pics/people/cooltrainer_m.png | Bin 800 -> 815 bytes graphics/object_events/pics/people/daisy.png | Bin 676 -> 679 bytes graphics/object_events/pics/people/erika.png | Bin 415 -> 414 bytes graphics/object_events/pics/people/fat_man.png | Bin 715 -> 733 bytes graphics/object_events/pics/people/female_surf.png | Bin 1104 -> 0 bytes graphics/object_events/pics/people/fisher.png | Bin 830 -> 823 bytes graphics/object_events/pics/people/gba_kid.png | Bin 424 -> 419 bytes graphics/object_events/pics/people/gentleman.png | Bin 785 -> 810 bytes graphics/object_events/pics/people/giovanni.png | Bin 686 -> 721 bytes graphics/object_events/pics/people/green_bike.png | Bin 869 -> 901 bytes graphics/object_events/pics/people/green_fish.png | Bin 1258 -> 1402 bytes graphics/object_events/pics/people/green_item.png | Bin 743 -> 750 bytes .../object_events/pics/people/green_normal.png | Bin 670 -> 682 bytes graphics/object_events/pics/people/green_surf.png | Bin 0 -> 1136 bytes .../object_events/pics/people/green_surf_run.png | Bin 1027 -> 1055 bytes .../pics/people/green_vs_seeker_bike.png | Bin 613 -> 602 bytes graphics/object_events/pics/people/gym_guy.png | Bin 704 -> 735 bytes graphics/object_events/pics/people/hiker.png | Bin 811 -> 815 bytes graphics/object_events/pics/people/koga.png | Bin 447 -> 443 bytes graphics/object_events/pics/people/lance.png | Bin 457 -> 458 bytes graphics/object_events/pics/people/lass.png | Bin 707 -> 742 bytes graphics/object_events/pics/people/little_boy.png | Bin 510 -> 528 bytes graphics/object_events/pics/people/little_girl.png | Bin 574 -> 596 bytes graphics/object_events/pics/people/lorelei.png | Bin 694 -> 710 bytes graphics/object_events/pics/people/lt_surge.png | Bin 474 -> 469 bytes graphics/object_events/pics/people/male_surf.png | Bin 1119 -> 0 bytes graphics/object_events/pics/people/man.png | Bin 818 -> 837 bytes .../object_events/pics/people/mg_deliveryman.png | Bin 422 -> 420 bytes graphics/object_events/pics/people/misty.png | Bin 488 -> 474 bytes graphics/object_events/pics/people/mom.png | Bin 470 -> 467 bytes graphics/object_events/pics/people/mr_fuji.png | Bin 556 -> 603 bytes graphics/object_events/pics/people/nurse.png | Bin 562 -> 551 bytes graphics/object_events/pics/people/old_man_1.png | Bin 580 -> 641 bytes graphics/object_events/pics/people/old_man_2.png | Bin 596 -> 641 bytes graphics/object_events/pics/people/old_woman.png | Bin 566 -> 630 bytes graphics/object_events/pics/people/picnicker.png | Bin 689 -> 721 bytes graphics/object_events/pics/people/policeman.png | Bin 657 -> 678 bytes graphics/object_events/pics/people/prof_oak.png | Bin 763 -> 789 bytes graphics/object_events/pics/people/red_bike.png | Bin 943 -> 965 bytes graphics/object_events/pics/people/red_fish.png | Bin 1267 -> 1402 bytes graphics/object_events/pics/people/red_item.png | Bin 749 -> 761 bytes graphics/object_events/pics/people/red_normal.png | Bin 738 -> 742 bytes graphics/object_events/pics/people/red_surf.png | Bin 0 -> 1155 bytes .../object_events/pics/people/red_surf_run.png | Bin 1131 -> 1140 bytes .../pics/people/red_vs_seeker_bike.png | Bin 647 -> 641 bytes graphics/object_events/pics/people/rich_boy.png | Bin 755 -> 772 bytes graphics/object_events/pics/people/rocker.png | Bin 796 -> 806 bytes graphics/object_events/pics/people/rocket_f.png | Bin 664 -> 670 bytes graphics/object_events/pics/people/rocket_m.png | Bin 635 -> 650 bytes graphics/object_events/pics/people/rs_brendan.png | Bin 745 -> 767 bytes graphics/object_events/pics/people/rs_may.png | Bin 714 -> 738 bytes graphics/object_events/pics/people/sabrina.png | Bin 378 -> 376 bytes graphics/object_events/pics/people/sailor.png | Bin 834 -> 841 bytes graphics/object_events/pics/people/scientist.png | Bin 791 -> 821 bytes graphics/object_events/pics/people/sitting_boy.png | Bin 350 -> 365 bytes graphics/object_events/pics/people/super_nerd.png | Bin 799 -> 826 bytes .../object_events/pics/people/swimmer_f_land.png | Bin 718 -> 717 bytes .../object_events/pics/people/swimmer_f_water.png | Bin 703 -> 684 bytes .../object_events/pics/people/swimmer_m_land.png | Bin 722 -> 739 bytes .../object_events/pics/people/swimmer_m_water.png | Bin 656 -> 625 bytes .../object_events/pics/people/teachy_tv_host.png | Bin 700 -> 717 bytes .../pics/people/trainer_tower_dude.png | Bin 459 -> 457 bytes graphics/object_events/pics/people/tuber_f.png | Bin 487 -> 536 bytes .../object_events/pics/people/tuber_m_land.png | Bin 460 -> 507 bytes .../object_events/pics/people/tuber_m_water.png | Bin 511 -> 573 bytes .../pics/people/union_room_receptionist.png | Bin 445 -> 436 bytes .../pics/people/unused_male_receptionist.png | Bin 458 -> 455 bytes graphics/object_events/pics/people/unused_man.png | Bin 470 -> 472 bytes .../object_events/pics/people/unused_woman.png | Bin 761 -> 751 bytes graphics/object_events/pics/people/woman_1.png | Bin 721 -> 744 bytes graphics/object_events/pics/people/woman_2.png | Bin 735 -> 729 bytes graphics/object_events/pics/people/woman_3.png | Bin 708 -> 730 bytes graphics/object_events/pics/people/worker_f.png | Bin 630 -> 671 bytes graphics/object_events/pics/people/worker_m.png | Bin 686 -> 725 bytes graphics/object_events/pics/people/youngster.png | Bin 763 -> 769 bytes graphics/object_events/pics/pokemon/chansey.png | Bin 328 -> 327 bytes graphics/object_events/pics/pokemon/clefairy.png | Bin 330 -> 325 bytes graphics/object_events/pics/pokemon/cubone.png | Bin 385 -> 373 bytes graphics/object_events/pics/pokemon/deoxys_a.png | Bin 455 -> 447 bytes graphics/object_events/pics/pokemon/deoxys_d.png | Bin 395 -> 404 bytes graphics/object_events/pics/pokemon/deoxys_n.png | Bin 418 -> 408 bytes graphics/object_events/pics/pokemon/doduo.png | Bin 373 -> 364 bytes graphics/object_events/pics/pokemon/fearow.png | Bin 428 -> 419 bytes graphics/object_events/pics/pokemon/ho_oh.png | Bin 550 -> 542 bytes graphics/object_events/pics/pokemon/jigglypuff.png | Bin 341 -> 331 bytes graphics/object_events/pics/pokemon/kabuto.png | Bin 325 -> 322 bytes graphics/object_events/pics/pokemon/kangaskhan.png | Bin 393 -> 393 bytes graphics/object_events/pics/pokemon/lapras.png | Bin 449 -> 439 bytes graphics/object_events/pics/pokemon/lugia.png | Bin 434 -> 423 bytes graphics/object_events/pics/pokemon/machoke.png | Bin 382 -> 376 bytes graphics/object_events/pics/pokemon/machop.png | Bin 345 -> 332 bytes graphics/object_events/pics/pokemon/meowth.png | Bin 385 -> 378 bytes graphics/object_events/pics/pokemon/nidoran_f.png | Bin 349 -> 348 bytes graphics/object_events/pics/pokemon/nidoran_m.png | Bin 334 -> 334 bytes graphics/object_events/pics/pokemon/nidorino.png | Bin 352 -> 345 bytes graphics/object_events/pics/pokemon/omanyte.png | Bin 343 -> 339 bytes graphics/object_events/pics/pokemon/pidgeot.png | Bin 409 -> 404 bytes graphics/object_events/pics/pokemon/pidgey.png | Bin 348 -> 340 bytes graphics/object_events/pics/pokemon/pikachu.png | Bin 379 -> 367 bytes graphics/object_events/pics/pokemon/poliwrath.png | Bin 342 -> 339 bytes graphics/object_events/pics/pokemon/psyduck.png | Bin 367 -> 366 bytes graphics/object_events/pics/pokemon/seel.png | Bin 368 -> 362 bytes graphics/object_events/pics/pokemon/slowbro.png | Bin 445 -> 439 bytes graphics/object_events/pics/pokemon/slowpoke.png | Bin 369 -> 363 bytes graphics/object_events/pics/pokemon/spearow.png | Bin 363 -> 356 bytes graphics/object_events/pics/pokemon/voltorb.png | Bin 240 -> 239 bytes graphics/object_events/pics/pokemon/wigglytuff.png | Bin 353 -> 352 bytes graphics_file_rules.mk | 3 - spritesheet_rules.mk | 395 +++++++++++++++++++++ src/data/object_events/object_event_graphics.h | 10 +- 138 files changed, 401 insertions(+), 8 deletions(-) create mode 100644 graphics/field_effects/fldeff_cut.png delete mode 100644 graphics/object_events/pics/misc/fldeff_cut.png delete mode 100644 graphics/object_events/pics/people/female_surf.png create mode 100644 graphics/object_events/pics/people/green_surf.png delete mode 100644 graphics/object_events/pics/people/male_surf.png create mode 100644 graphics/object_events/pics/people/red_surf.png create mode 100644 spritesheet_rules.mk diff --git a/Makefile b/Makefile index 37c3d936a..3cd39fefa 100644 --- a/Makefile +++ b/Makefile @@ -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/field_effects/fldeff_cut.png b/graphics/field_effects/fldeff_cut.png new file mode 100644 index 000000000..031d04b40 Binary files /dev/null and b/graphics/field_effects/fldeff_cut.png differ diff --git a/graphics/object_events/pics/misc/cut_tree.png b/graphics/object_events/pics/misc/cut_tree.png index ce110cd9e..be22aeaed 100644 Binary files a/graphics/object_events/pics/misc/cut_tree.png and b/graphics/object_events/pics/misc/cut_tree.png differ diff --git a/graphics/object_events/pics/misc/fldeff_cut.png b/graphics/object_events/pics/misc/fldeff_cut.png deleted file mode 100644 index 031d04b40..000000000 Binary files a/graphics/object_events/pics/misc/fldeff_cut.png and /dev/null differ diff --git a/graphics/object_events/pics/misc/rock_smash_rock.png b/graphics/object_events/pics/misc/rock_smash_rock.png index 315fb0089..2ba3a9978 100644 Binary files a/graphics/object_events/pics/misc/rock_smash_rock.png and b/graphics/object_events/pics/misc/rock_smash_rock.png differ diff --git a/graphics/object_events/pics/misc/surf_blob.png b/graphics/object_events/pics/misc/surf_blob.png index ae2222d45..82aa7a09c 100644 Binary files a/graphics/object_events/pics/misc/surf_blob.png and b/graphics/object_events/pics/misc/surf_blob.png differ diff --git a/graphics/object_events/pics/people/agatha.png b/graphics/object_events/pics/people/agatha.png index b8bf3ede6..23c3f408b 100644 Binary files a/graphics/object_events/pics/people/agatha.png and b/graphics/object_events/pics/people/agatha.png differ diff --git a/graphics/object_events/pics/people/balding_man.png b/graphics/object_events/pics/people/balding_man.png index 1c2d8eb63..1072f4c26 100644 Binary files a/graphics/object_events/pics/people/balding_man.png and b/graphics/object_events/pics/people/balding_man.png differ diff --git a/graphics/object_events/pics/people/battle_girl.png b/graphics/object_events/pics/people/battle_girl.png index 20125262a..7388424b8 100644 Binary files a/graphics/object_events/pics/people/battle_girl.png and b/graphics/object_events/pics/people/battle_girl.png differ diff --git a/graphics/object_events/pics/people/beauty.png b/graphics/object_events/pics/people/beauty.png index 006b67036..3874cf9ed 100644 Binary files a/graphics/object_events/pics/people/beauty.png and b/graphics/object_events/pics/people/beauty.png differ diff --git a/graphics/object_events/pics/people/biker.png b/graphics/object_events/pics/people/biker.png index 6671943dd..ba9ccdd70 100644 Binary files a/graphics/object_events/pics/people/biker.png and b/graphics/object_events/pics/people/biker.png differ diff --git a/graphics/object_events/pics/people/bill.png b/graphics/object_events/pics/people/bill.png index 85b82a47f..cbb0ad0c9 100644 Binary files a/graphics/object_events/pics/people/bill.png and b/graphics/object_events/pics/people/bill.png differ diff --git a/graphics/object_events/pics/people/blackbelt.png b/graphics/object_events/pics/people/blackbelt.png index 7717ce43b..7c1aa1d92 100644 Binary files a/graphics/object_events/pics/people/blackbelt.png and b/graphics/object_events/pics/people/blackbelt.png differ diff --git a/graphics/object_events/pics/people/blaine.png b/graphics/object_events/pics/people/blaine.png index 19ccb8fcc..1b54307e9 100644 Binary files a/graphics/object_events/pics/people/blaine.png and b/graphics/object_events/pics/people/blaine.png differ diff --git a/graphics/object_events/pics/people/blue.png b/graphics/object_events/pics/people/blue.png index a66593653..80cd7518a 100644 Binary files a/graphics/object_events/pics/people/blue.png and b/graphics/object_events/pics/people/blue.png differ diff --git a/graphics/object_events/pics/people/boy.png b/graphics/object_events/pics/people/boy.png index 749051218..bb13ed6c0 100644 Binary files a/graphics/object_events/pics/people/boy.png and b/graphics/object_events/pics/people/boy.png differ diff --git a/graphics/object_events/pics/people/brock.png b/graphics/object_events/pics/people/brock.png index bf48c8dd7..156f7478e 100644 Binary files a/graphics/object_events/pics/people/brock.png and b/graphics/object_events/pics/people/brock.png differ diff --git a/graphics/object_events/pics/people/bruno.png b/graphics/object_events/pics/people/bruno.png index ac5ee5e9f..c4b823c3f 100644 Binary files a/graphics/object_events/pics/people/bruno.png and b/graphics/object_events/pics/people/bruno.png differ diff --git a/graphics/object_events/pics/people/bug_catcher.png b/graphics/object_events/pics/people/bug_catcher.png index dd33a7921..329f0f9ae 100644 Binary files a/graphics/object_events/pics/people/bug_catcher.png and b/graphics/object_events/pics/people/bug_catcher.png differ diff --git a/graphics/object_events/pics/people/cable_club_receptionist.png b/graphics/object_events/pics/people/cable_club_receptionist.png index 74e081153..54f915e88 100644 Binary files a/graphics/object_events/pics/people/cable_club_receptionist.png and b/graphics/object_events/pics/people/cable_club_receptionist.png differ diff --git a/graphics/object_events/pics/people/cameraman.png b/graphics/object_events/pics/people/cameraman.png index bb0ca5d34..5c4687fa4 100644 Binary files a/graphics/object_events/pics/people/cameraman.png and b/graphics/object_events/pics/people/cameraman.png differ diff --git a/graphics/object_events/pics/people/camper.png b/graphics/object_events/pics/people/camper.png index 45d4400d8..d0a0cf5b6 100644 Binary files a/graphics/object_events/pics/people/camper.png and b/graphics/object_events/pics/people/camper.png differ diff --git a/graphics/object_events/pics/people/captain.png b/graphics/object_events/pics/people/captain.png index fbf6aa689..21e1b8f7d 100644 Binary files a/graphics/object_events/pics/people/captain.png and b/graphics/object_events/pics/people/captain.png differ diff --git a/graphics/object_events/pics/people/celio.png b/graphics/object_events/pics/people/celio.png index 1dc91873d..549546217 100644 Binary files a/graphics/object_events/pics/people/celio.png and b/graphics/object_events/pics/people/celio.png differ diff --git a/graphics/object_events/pics/people/channeler.png b/graphics/object_events/pics/people/channeler.png index f6925577d..efaa5cfc0 100644 Binary files a/graphics/object_events/pics/people/channeler.png and b/graphics/object_events/pics/people/channeler.png differ diff --git a/graphics/object_events/pics/people/chef.png b/graphics/object_events/pics/people/chef.png index a251297b6..a8e726d37 100644 Binary files a/graphics/object_events/pics/people/chef.png and b/graphics/object_events/pics/people/chef.png differ diff --git a/graphics/object_events/pics/people/clerk.png b/graphics/object_events/pics/people/clerk.png index 485678492..d883102c9 100644 Binary files a/graphics/object_events/pics/people/clerk.png and b/graphics/object_events/pics/people/clerk.png differ diff --git a/graphics/object_events/pics/people/cooltrainer_f.png b/graphics/object_events/pics/people/cooltrainer_f.png index 63a47e95b..7cddcfdc1 100644 Binary files a/graphics/object_events/pics/people/cooltrainer_f.png and b/graphics/object_events/pics/people/cooltrainer_f.png differ diff --git a/graphics/object_events/pics/people/cooltrainer_m.png b/graphics/object_events/pics/people/cooltrainer_m.png index df48acad0..6555b1c00 100644 Binary files a/graphics/object_events/pics/people/cooltrainer_m.png and b/graphics/object_events/pics/people/cooltrainer_m.png differ diff --git a/graphics/object_events/pics/people/daisy.png b/graphics/object_events/pics/people/daisy.png index 5ba2f26f8..3fad24b03 100644 Binary files a/graphics/object_events/pics/people/daisy.png and b/graphics/object_events/pics/people/daisy.png differ diff --git a/graphics/object_events/pics/people/erika.png b/graphics/object_events/pics/people/erika.png index 015b6bbe3..774f00cbb 100644 Binary files a/graphics/object_events/pics/people/erika.png and b/graphics/object_events/pics/people/erika.png differ diff --git a/graphics/object_events/pics/people/fat_man.png b/graphics/object_events/pics/people/fat_man.png index b5ed884fd..76dd07658 100644 Binary files a/graphics/object_events/pics/people/fat_man.png and b/graphics/object_events/pics/people/fat_man.png differ diff --git a/graphics/object_events/pics/people/female_surf.png b/graphics/object_events/pics/people/female_surf.png deleted file mode 100644 index 325af3f5e..000000000 Binary files a/graphics/object_events/pics/people/female_surf.png and /dev/null differ diff --git a/graphics/object_events/pics/people/fisher.png b/graphics/object_events/pics/people/fisher.png index 8961c0765..d160e85e6 100644 Binary files a/graphics/object_events/pics/people/fisher.png and b/graphics/object_events/pics/people/fisher.png differ diff --git a/graphics/object_events/pics/people/gba_kid.png b/graphics/object_events/pics/people/gba_kid.png index 358a4dd1b..1e695d120 100644 Binary files a/graphics/object_events/pics/people/gba_kid.png and b/graphics/object_events/pics/people/gba_kid.png differ diff --git a/graphics/object_events/pics/people/gentleman.png b/graphics/object_events/pics/people/gentleman.png index de57e641f..195a779b6 100644 Binary files a/graphics/object_events/pics/people/gentleman.png and b/graphics/object_events/pics/people/gentleman.png differ diff --git a/graphics/object_events/pics/people/giovanni.png b/graphics/object_events/pics/people/giovanni.png index 5f9585a61..9db59fdaf 100644 Binary files a/graphics/object_events/pics/people/giovanni.png and b/graphics/object_events/pics/people/giovanni.png differ diff --git a/graphics/object_events/pics/people/green_bike.png b/graphics/object_events/pics/people/green_bike.png index b1e1ede7a..25958e1e5 100644 Binary files a/graphics/object_events/pics/people/green_bike.png and b/graphics/object_events/pics/people/green_bike.png differ diff --git a/graphics/object_events/pics/people/green_fish.png b/graphics/object_events/pics/people/green_fish.png index 61446035c..29c142b18 100644 Binary files a/graphics/object_events/pics/people/green_fish.png and b/graphics/object_events/pics/people/green_fish.png differ diff --git a/graphics/object_events/pics/people/green_item.png b/graphics/object_events/pics/people/green_item.png index c1cd5c574..b554d0850 100644 Binary files a/graphics/object_events/pics/people/green_item.png and b/graphics/object_events/pics/people/green_item.png differ diff --git a/graphics/object_events/pics/people/green_normal.png b/graphics/object_events/pics/people/green_normal.png index c65b97a5c..31ad04085 100644 Binary files a/graphics/object_events/pics/people/green_normal.png and b/graphics/object_events/pics/people/green_normal.png differ diff --git a/graphics/object_events/pics/people/green_surf.png b/graphics/object_events/pics/people/green_surf.png new file mode 100644 index 000000000..a4042a4d2 Binary files /dev/null and b/graphics/object_events/pics/people/green_surf.png differ diff --git a/graphics/object_events/pics/people/green_surf_run.png b/graphics/object_events/pics/people/green_surf_run.png index 7246e388d..30db5b193 100644 Binary files a/graphics/object_events/pics/people/green_surf_run.png and b/graphics/object_events/pics/people/green_surf_run.png differ diff --git a/graphics/object_events/pics/people/green_vs_seeker_bike.png b/graphics/object_events/pics/people/green_vs_seeker_bike.png index f4140b8d0..c23f52081 100644 Binary files a/graphics/object_events/pics/people/green_vs_seeker_bike.png and b/graphics/object_events/pics/people/green_vs_seeker_bike.png differ diff --git a/graphics/object_events/pics/people/gym_guy.png b/graphics/object_events/pics/people/gym_guy.png index 8a55cd3d3..4a6bea315 100644 Binary files a/graphics/object_events/pics/people/gym_guy.png and b/graphics/object_events/pics/people/gym_guy.png differ diff --git a/graphics/object_events/pics/people/hiker.png b/graphics/object_events/pics/people/hiker.png index 7c4d443a2..76ba62db3 100644 Binary files a/graphics/object_events/pics/people/hiker.png and b/graphics/object_events/pics/people/hiker.png differ diff --git a/graphics/object_events/pics/people/koga.png b/graphics/object_events/pics/people/koga.png index b45ec3f25..f53968c86 100644 Binary files a/graphics/object_events/pics/people/koga.png and b/graphics/object_events/pics/people/koga.png differ diff --git a/graphics/object_events/pics/people/lance.png b/graphics/object_events/pics/people/lance.png index b7426b280..51c9508e0 100644 Binary files a/graphics/object_events/pics/people/lance.png and b/graphics/object_events/pics/people/lance.png differ diff --git a/graphics/object_events/pics/people/lass.png b/graphics/object_events/pics/people/lass.png index 82d08630c..26fac2685 100644 Binary files a/graphics/object_events/pics/people/lass.png and b/graphics/object_events/pics/people/lass.png differ diff --git a/graphics/object_events/pics/people/little_boy.png b/graphics/object_events/pics/people/little_boy.png index e53418256..c145d37ef 100644 Binary files a/graphics/object_events/pics/people/little_boy.png and b/graphics/object_events/pics/people/little_boy.png differ diff --git a/graphics/object_events/pics/people/little_girl.png b/graphics/object_events/pics/people/little_girl.png index 2ce6d6355..523d8db7d 100644 Binary files a/graphics/object_events/pics/people/little_girl.png and b/graphics/object_events/pics/people/little_girl.png differ diff --git a/graphics/object_events/pics/people/lorelei.png b/graphics/object_events/pics/people/lorelei.png index 0b535572e..e7b8f9dd9 100644 Binary files a/graphics/object_events/pics/people/lorelei.png and b/graphics/object_events/pics/people/lorelei.png differ diff --git a/graphics/object_events/pics/people/lt_surge.png b/graphics/object_events/pics/people/lt_surge.png index 07435e777..6ebb4ebb8 100644 Binary files a/graphics/object_events/pics/people/lt_surge.png and b/graphics/object_events/pics/people/lt_surge.png differ diff --git a/graphics/object_events/pics/people/male_surf.png b/graphics/object_events/pics/people/male_surf.png deleted file mode 100644 index 310e6900f..000000000 Binary files a/graphics/object_events/pics/people/male_surf.png and /dev/null differ diff --git a/graphics/object_events/pics/people/man.png b/graphics/object_events/pics/people/man.png index d3c38275a..2e39946dd 100644 Binary files a/graphics/object_events/pics/people/man.png and b/graphics/object_events/pics/people/man.png differ diff --git a/graphics/object_events/pics/people/mg_deliveryman.png b/graphics/object_events/pics/people/mg_deliveryman.png index f503cf0c9..ad5e02b57 100644 Binary files a/graphics/object_events/pics/people/mg_deliveryman.png and b/graphics/object_events/pics/people/mg_deliveryman.png differ diff --git a/graphics/object_events/pics/people/misty.png b/graphics/object_events/pics/people/misty.png index 0e4a837b5..7411bafd2 100644 Binary files a/graphics/object_events/pics/people/misty.png and b/graphics/object_events/pics/people/misty.png differ diff --git a/graphics/object_events/pics/people/mom.png b/graphics/object_events/pics/people/mom.png index c7e79eefd..b5d6c18e7 100644 Binary files a/graphics/object_events/pics/people/mom.png and b/graphics/object_events/pics/people/mom.png differ diff --git a/graphics/object_events/pics/people/mr_fuji.png b/graphics/object_events/pics/people/mr_fuji.png index 4b6983de6..37bd5500e 100644 Binary files a/graphics/object_events/pics/people/mr_fuji.png and b/graphics/object_events/pics/people/mr_fuji.png differ diff --git a/graphics/object_events/pics/people/nurse.png b/graphics/object_events/pics/people/nurse.png index 328d1f6b7..56c618828 100644 Binary files a/graphics/object_events/pics/people/nurse.png and b/graphics/object_events/pics/people/nurse.png differ diff --git a/graphics/object_events/pics/people/old_man_1.png b/graphics/object_events/pics/people/old_man_1.png index 87d1e4ce4..ca9c1f5af 100644 Binary files a/graphics/object_events/pics/people/old_man_1.png and b/graphics/object_events/pics/people/old_man_1.png differ diff --git a/graphics/object_events/pics/people/old_man_2.png b/graphics/object_events/pics/people/old_man_2.png index f6913ed9b..8ed16d9ed 100644 Binary files a/graphics/object_events/pics/people/old_man_2.png and b/graphics/object_events/pics/people/old_man_2.png differ diff --git a/graphics/object_events/pics/people/old_woman.png b/graphics/object_events/pics/people/old_woman.png index a99ab0238..454ae3c14 100644 Binary files a/graphics/object_events/pics/people/old_woman.png and b/graphics/object_events/pics/people/old_woman.png differ diff --git a/graphics/object_events/pics/people/picnicker.png b/graphics/object_events/pics/people/picnicker.png index 8bff4d72e..c04b34bb0 100644 Binary files a/graphics/object_events/pics/people/picnicker.png and b/graphics/object_events/pics/people/picnicker.png differ diff --git a/graphics/object_events/pics/people/policeman.png b/graphics/object_events/pics/people/policeman.png index aedee9f67..6515eaad7 100644 Binary files a/graphics/object_events/pics/people/policeman.png and b/graphics/object_events/pics/people/policeman.png differ diff --git a/graphics/object_events/pics/people/prof_oak.png b/graphics/object_events/pics/people/prof_oak.png index fab2b23ac..037b0f966 100644 Binary files a/graphics/object_events/pics/people/prof_oak.png and b/graphics/object_events/pics/people/prof_oak.png differ diff --git a/graphics/object_events/pics/people/red_bike.png b/graphics/object_events/pics/people/red_bike.png index ee7d0a1d3..fca60266a 100644 Binary files a/graphics/object_events/pics/people/red_bike.png and b/graphics/object_events/pics/people/red_bike.png differ diff --git a/graphics/object_events/pics/people/red_fish.png b/graphics/object_events/pics/people/red_fish.png index a5ae8b3d1..57a64d0e5 100644 Binary files a/graphics/object_events/pics/people/red_fish.png and b/graphics/object_events/pics/people/red_fish.png differ diff --git a/graphics/object_events/pics/people/red_item.png b/graphics/object_events/pics/people/red_item.png index 66d53ea88..a462ec469 100644 Binary files a/graphics/object_events/pics/people/red_item.png and b/graphics/object_events/pics/people/red_item.png differ diff --git a/graphics/object_events/pics/people/red_normal.png b/graphics/object_events/pics/people/red_normal.png index 8b72a852f..377224e2f 100644 Binary files a/graphics/object_events/pics/people/red_normal.png and b/graphics/object_events/pics/people/red_normal.png differ diff --git a/graphics/object_events/pics/people/red_surf.png b/graphics/object_events/pics/people/red_surf.png new file mode 100644 index 000000000..7686de04b Binary files /dev/null and b/graphics/object_events/pics/people/red_surf.png differ diff --git a/graphics/object_events/pics/people/red_surf_run.png b/graphics/object_events/pics/people/red_surf_run.png index 961bff7a8..f4473bbae 100644 Binary files a/graphics/object_events/pics/people/red_surf_run.png and b/graphics/object_events/pics/people/red_surf_run.png differ diff --git a/graphics/object_events/pics/people/red_vs_seeker_bike.png b/graphics/object_events/pics/people/red_vs_seeker_bike.png index 90b198edb..f0a607af3 100644 Binary files a/graphics/object_events/pics/people/red_vs_seeker_bike.png and b/graphics/object_events/pics/people/red_vs_seeker_bike.png differ diff --git a/graphics/object_events/pics/people/rich_boy.png b/graphics/object_events/pics/people/rich_boy.png index 36f112e85..0cde86738 100644 Binary files a/graphics/object_events/pics/people/rich_boy.png and b/graphics/object_events/pics/people/rich_boy.png differ diff --git a/graphics/object_events/pics/people/rocker.png b/graphics/object_events/pics/people/rocker.png index 44b8b5c50..20246423c 100644 Binary files a/graphics/object_events/pics/people/rocker.png and b/graphics/object_events/pics/people/rocker.png differ diff --git a/graphics/object_events/pics/people/rocket_f.png b/graphics/object_events/pics/people/rocket_f.png index 8c3817c82..f650d37a8 100644 Binary files a/graphics/object_events/pics/people/rocket_f.png and b/graphics/object_events/pics/people/rocket_f.png differ diff --git a/graphics/object_events/pics/people/rocket_m.png b/graphics/object_events/pics/people/rocket_m.png index 07222b9ba..7b1130802 100644 Binary files a/graphics/object_events/pics/people/rocket_m.png and b/graphics/object_events/pics/people/rocket_m.png differ diff --git a/graphics/object_events/pics/people/rs_brendan.png b/graphics/object_events/pics/people/rs_brendan.png index b79967c4b..22e4775ab 100644 Binary files a/graphics/object_events/pics/people/rs_brendan.png and b/graphics/object_events/pics/people/rs_brendan.png differ diff --git a/graphics/object_events/pics/people/rs_may.png b/graphics/object_events/pics/people/rs_may.png index 6cc84665c..e3b591b46 100644 Binary files a/graphics/object_events/pics/people/rs_may.png and b/graphics/object_events/pics/people/rs_may.png differ diff --git a/graphics/object_events/pics/people/sabrina.png b/graphics/object_events/pics/people/sabrina.png index 101dfb0e0..e9ba5b3fa 100644 Binary files a/graphics/object_events/pics/people/sabrina.png and b/graphics/object_events/pics/people/sabrina.png differ diff --git a/graphics/object_events/pics/people/sailor.png b/graphics/object_events/pics/people/sailor.png index 175e14e47..fb20f3d41 100644 Binary files a/graphics/object_events/pics/people/sailor.png and b/graphics/object_events/pics/people/sailor.png differ diff --git a/graphics/object_events/pics/people/scientist.png b/graphics/object_events/pics/people/scientist.png index b85011c3c..9ea707eea 100644 Binary files a/graphics/object_events/pics/people/scientist.png and b/graphics/object_events/pics/people/scientist.png differ diff --git a/graphics/object_events/pics/people/sitting_boy.png b/graphics/object_events/pics/people/sitting_boy.png index 15eabb0b3..00a266393 100644 Binary files a/graphics/object_events/pics/people/sitting_boy.png and b/graphics/object_events/pics/people/sitting_boy.png differ diff --git a/graphics/object_events/pics/people/super_nerd.png b/graphics/object_events/pics/people/super_nerd.png index 95089c7ee..bddfe2cc9 100644 Binary files a/graphics/object_events/pics/people/super_nerd.png and b/graphics/object_events/pics/people/super_nerd.png differ diff --git a/graphics/object_events/pics/people/swimmer_f_land.png b/graphics/object_events/pics/people/swimmer_f_land.png index 2f7a5f796..5253dc909 100644 Binary files a/graphics/object_events/pics/people/swimmer_f_land.png and b/graphics/object_events/pics/people/swimmer_f_land.png differ diff --git a/graphics/object_events/pics/people/swimmer_f_water.png b/graphics/object_events/pics/people/swimmer_f_water.png index a76e9bd47..664bfc6ff 100644 Binary files a/graphics/object_events/pics/people/swimmer_f_water.png and b/graphics/object_events/pics/people/swimmer_f_water.png differ diff --git a/graphics/object_events/pics/people/swimmer_m_land.png b/graphics/object_events/pics/people/swimmer_m_land.png index 9e862173a..b5e420822 100644 Binary files a/graphics/object_events/pics/people/swimmer_m_land.png and b/graphics/object_events/pics/people/swimmer_m_land.png differ diff --git a/graphics/object_events/pics/people/swimmer_m_water.png b/graphics/object_events/pics/people/swimmer_m_water.png index ded67966a..2a1a111ca 100644 Binary files a/graphics/object_events/pics/people/swimmer_m_water.png and b/graphics/object_events/pics/people/swimmer_m_water.png differ diff --git a/graphics/object_events/pics/people/teachy_tv_host.png b/graphics/object_events/pics/people/teachy_tv_host.png index 320da6daa..f4588e9f8 100644 Binary files a/graphics/object_events/pics/people/teachy_tv_host.png and b/graphics/object_events/pics/people/teachy_tv_host.png differ diff --git a/graphics/object_events/pics/people/trainer_tower_dude.png b/graphics/object_events/pics/people/trainer_tower_dude.png index a3f994a83..ea267aba1 100644 Binary files a/graphics/object_events/pics/people/trainer_tower_dude.png and b/graphics/object_events/pics/people/trainer_tower_dude.png differ diff --git a/graphics/object_events/pics/people/tuber_f.png b/graphics/object_events/pics/people/tuber_f.png index c4f962acb..3ba142291 100644 Binary files a/graphics/object_events/pics/people/tuber_f.png and b/graphics/object_events/pics/people/tuber_f.png differ diff --git a/graphics/object_events/pics/people/tuber_m_land.png b/graphics/object_events/pics/people/tuber_m_land.png index b53913af7..c9a903e77 100644 Binary files a/graphics/object_events/pics/people/tuber_m_land.png and b/graphics/object_events/pics/people/tuber_m_land.png differ diff --git a/graphics/object_events/pics/people/tuber_m_water.png b/graphics/object_events/pics/people/tuber_m_water.png index 23fe7c6e3..0b0adfbf4 100644 Binary files a/graphics/object_events/pics/people/tuber_m_water.png and b/graphics/object_events/pics/people/tuber_m_water.png differ diff --git a/graphics/object_events/pics/people/union_room_receptionist.png b/graphics/object_events/pics/people/union_room_receptionist.png index ef0ecdba4..78596e6f9 100644 Binary files a/graphics/object_events/pics/people/union_room_receptionist.png and b/graphics/object_events/pics/people/union_room_receptionist.png differ diff --git a/graphics/object_events/pics/people/unused_male_receptionist.png b/graphics/object_events/pics/people/unused_male_receptionist.png index d1c20e818..81a50792e 100644 Binary files a/graphics/object_events/pics/people/unused_male_receptionist.png and b/graphics/object_events/pics/people/unused_male_receptionist.png differ diff --git a/graphics/object_events/pics/people/unused_man.png b/graphics/object_events/pics/people/unused_man.png index e01e3ea8e..8af57a77b 100644 Binary files a/graphics/object_events/pics/people/unused_man.png and b/graphics/object_events/pics/people/unused_man.png differ diff --git a/graphics/object_events/pics/people/unused_woman.png b/graphics/object_events/pics/people/unused_woman.png index d39504689..7fc28d1d4 100644 Binary files a/graphics/object_events/pics/people/unused_woman.png and b/graphics/object_events/pics/people/unused_woman.png differ diff --git a/graphics/object_events/pics/people/woman_1.png b/graphics/object_events/pics/people/woman_1.png index b3922d5f8..73fef57d0 100644 Binary files a/graphics/object_events/pics/people/woman_1.png and b/graphics/object_events/pics/people/woman_1.png differ diff --git a/graphics/object_events/pics/people/woman_2.png b/graphics/object_events/pics/people/woman_2.png index 95d3c5e0f..1242f1fb9 100644 Binary files a/graphics/object_events/pics/people/woman_2.png and b/graphics/object_events/pics/people/woman_2.png differ diff --git a/graphics/object_events/pics/people/woman_3.png b/graphics/object_events/pics/people/woman_3.png index fc278b97e..753d0e7f7 100644 Binary files a/graphics/object_events/pics/people/woman_3.png and b/graphics/object_events/pics/people/woman_3.png differ diff --git a/graphics/object_events/pics/people/worker_f.png b/graphics/object_events/pics/people/worker_f.png index 20a4e3a15..d6f592e3d 100644 Binary files a/graphics/object_events/pics/people/worker_f.png and b/graphics/object_events/pics/people/worker_f.png differ diff --git a/graphics/object_events/pics/people/worker_m.png b/graphics/object_events/pics/people/worker_m.png index 361e028c4..4a9aef440 100644 Binary files a/graphics/object_events/pics/people/worker_m.png and b/graphics/object_events/pics/people/worker_m.png differ diff --git a/graphics/object_events/pics/people/youngster.png b/graphics/object_events/pics/people/youngster.png index 13f4ee1f2..6c44de413 100644 Binary files a/graphics/object_events/pics/people/youngster.png and b/graphics/object_events/pics/people/youngster.png differ diff --git a/graphics/object_events/pics/pokemon/chansey.png b/graphics/object_events/pics/pokemon/chansey.png index 550a58260..f726385e3 100644 Binary files a/graphics/object_events/pics/pokemon/chansey.png and b/graphics/object_events/pics/pokemon/chansey.png differ diff --git a/graphics/object_events/pics/pokemon/clefairy.png b/graphics/object_events/pics/pokemon/clefairy.png index e5817bac8..9d19a9651 100644 Binary files a/graphics/object_events/pics/pokemon/clefairy.png and b/graphics/object_events/pics/pokemon/clefairy.png differ diff --git a/graphics/object_events/pics/pokemon/cubone.png b/graphics/object_events/pics/pokemon/cubone.png index ba51eaddc..a545655c6 100644 Binary files a/graphics/object_events/pics/pokemon/cubone.png and b/graphics/object_events/pics/pokemon/cubone.png differ diff --git a/graphics/object_events/pics/pokemon/deoxys_a.png b/graphics/object_events/pics/pokemon/deoxys_a.png index 84c160d61..741668a57 100644 Binary files a/graphics/object_events/pics/pokemon/deoxys_a.png and b/graphics/object_events/pics/pokemon/deoxys_a.png differ diff --git a/graphics/object_events/pics/pokemon/deoxys_d.png b/graphics/object_events/pics/pokemon/deoxys_d.png index 9079690f0..236ac6b53 100644 Binary files a/graphics/object_events/pics/pokemon/deoxys_d.png and b/graphics/object_events/pics/pokemon/deoxys_d.png differ diff --git a/graphics/object_events/pics/pokemon/deoxys_n.png b/graphics/object_events/pics/pokemon/deoxys_n.png index 48695b960..2cb74e4bb 100644 Binary files a/graphics/object_events/pics/pokemon/deoxys_n.png and b/graphics/object_events/pics/pokemon/deoxys_n.png differ diff --git a/graphics/object_events/pics/pokemon/doduo.png b/graphics/object_events/pics/pokemon/doduo.png index 9a63cab7e..de751d319 100644 Binary files a/graphics/object_events/pics/pokemon/doduo.png and b/graphics/object_events/pics/pokemon/doduo.png differ diff --git a/graphics/object_events/pics/pokemon/fearow.png b/graphics/object_events/pics/pokemon/fearow.png index c26ced826..905c00904 100644 Binary files a/graphics/object_events/pics/pokemon/fearow.png and b/graphics/object_events/pics/pokemon/fearow.png differ diff --git a/graphics/object_events/pics/pokemon/ho_oh.png b/graphics/object_events/pics/pokemon/ho_oh.png index 3d2a7f11b..54f769347 100644 Binary files a/graphics/object_events/pics/pokemon/ho_oh.png and b/graphics/object_events/pics/pokemon/ho_oh.png differ diff --git a/graphics/object_events/pics/pokemon/jigglypuff.png b/graphics/object_events/pics/pokemon/jigglypuff.png index ccd46b1f8..392e6c376 100644 Binary files a/graphics/object_events/pics/pokemon/jigglypuff.png and b/graphics/object_events/pics/pokemon/jigglypuff.png differ diff --git a/graphics/object_events/pics/pokemon/kabuto.png b/graphics/object_events/pics/pokemon/kabuto.png index 50339fbc0..f0d7eea25 100644 Binary files a/graphics/object_events/pics/pokemon/kabuto.png and b/graphics/object_events/pics/pokemon/kabuto.png differ diff --git a/graphics/object_events/pics/pokemon/kangaskhan.png b/graphics/object_events/pics/pokemon/kangaskhan.png index ed82e390e..cb54d68e0 100644 Binary files a/graphics/object_events/pics/pokemon/kangaskhan.png and b/graphics/object_events/pics/pokemon/kangaskhan.png differ diff --git a/graphics/object_events/pics/pokemon/lapras.png b/graphics/object_events/pics/pokemon/lapras.png index 3fd66ec1d..382214434 100644 Binary files a/graphics/object_events/pics/pokemon/lapras.png and b/graphics/object_events/pics/pokemon/lapras.png differ diff --git a/graphics/object_events/pics/pokemon/lugia.png b/graphics/object_events/pics/pokemon/lugia.png index 22794f5c6..931827dba 100644 Binary files a/graphics/object_events/pics/pokemon/lugia.png and b/graphics/object_events/pics/pokemon/lugia.png differ diff --git a/graphics/object_events/pics/pokemon/machoke.png b/graphics/object_events/pics/pokemon/machoke.png index 74a29680c..6ca59cd29 100644 Binary files a/graphics/object_events/pics/pokemon/machoke.png and b/graphics/object_events/pics/pokemon/machoke.png differ diff --git a/graphics/object_events/pics/pokemon/machop.png b/graphics/object_events/pics/pokemon/machop.png index db791455b..c1ed7783c 100644 Binary files a/graphics/object_events/pics/pokemon/machop.png and b/graphics/object_events/pics/pokemon/machop.png differ diff --git a/graphics/object_events/pics/pokemon/meowth.png b/graphics/object_events/pics/pokemon/meowth.png index 31203db01..1bb437505 100644 Binary files a/graphics/object_events/pics/pokemon/meowth.png and b/graphics/object_events/pics/pokemon/meowth.png differ diff --git a/graphics/object_events/pics/pokemon/nidoran_f.png b/graphics/object_events/pics/pokemon/nidoran_f.png index b25ee75f4..c58f6b90d 100644 Binary files a/graphics/object_events/pics/pokemon/nidoran_f.png and b/graphics/object_events/pics/pokemon/nidoran_f.png differ diff --git a/graphics/object_events/pics/pokemon/nidoran_m.png b/graphics/object_events/pics/pokemon/nidoran_m.png index 4a2768475..ff5100acf 100644 Binary files a/graphics/object_events/pics/pokemon/nidoran_m.png and b/graphics/object_events/pics/pokemon/nidoran_m.png differ diff --git a/graphics/object_events/pics/pokemon/nidorino.png b/graphics/object_events/pics/pokemon/nidorino.png index 8cdfa0ef2..de86d7ea2 100644 Binary files a/graphics/object_events/pics/pokemon/nidorino.png and b/graphics/object_events/pics/pokemon/nidorino.png differ diff --git a/graphics/object_events/pics/pokemon/omanyte.png b/graphics/object_events/pics/pokemon/omanyte.png index 083897483..20c5ade4d 100644 Binary files a/graphics/object_events/pics/pokemon/omanyte.png and b/graphics/object_events/pics/pokemon/omanyte.png differ diff --git a/graphics/object_events/pics/pokemon/pidgeot.png b/graphics/object_events/pics/pokemon/pidgeot.png index 55748d9a0..ce69c0aab 100644 Binary files a/graphics/object_events/pics/pokemon/pidgeot.png and b/graphics/object_events/pics/pokemon/pidgeot.png differ diff --git a/graphics/object_events/pics/pokemon/pidgey.png b/graphics/object_events/pics/pokemon/pidgey.png index a109eb2c6..467115722 100644 Binary files a/graphics/object_events/pics/pokemon/pidgey.png and b/graphics/object_events/pics/pokemon/pidgey.png differ diff --git a/graphics/object_events/pics/pokemon/pikachu.png b/graphics/object_events/pics/pokemon/pikachu.png index 7b837e11b..03b4a1481 100644 Binary files a/graphics/object_events/pics/pokemon/pikachu.png and b/graphics/object_events/pics/pokemon/pikachu.png differ diff --git a/graphics/object_events/pics/pokemon/poliwrath.png b/graphics/object_events/pics/pokemon/poliwrath.png index 0c8428fd3..200922142 100644 Binary files a/graphics/object_events/pics/pokemon/poliwrath.png and b/graphics/object_events/pics/pokemon/poliwrath.png differ diff --git a/graphics/object_events/pics/pokemon/psyduck.png b/graphics/object_events/pics/pokemon/psyduck.png index 1f0dd24e0..c3d35325f 100644 Binary files a/graphics/object_events/pics/pokemon/psyduck.png and b/graphics/object_events/pics/pokemon/psyduck.png differ diff --git a/graphics/object_events/pics/pokemon/seel.png b/graphics/object_events/pics/pokemon/seel.png index 2cd14040c..23a6597f5 100644 Binary files a/graphics/object_events/pics/pokemon/seel.png and b/graphics/object_events/pics/pokemon/seel.png differ diff --git a/graphics/object_events/pics/pokemon/slowbro.png b/graphics/object_events/pics/pokemon/slowbro.png index 1cd63f1eb..221a185a2 100644 Binary files a/graphics/object_events/pics/pokemon/slowbro.png and b/graphics/object_events/pics/pokemon/slowbro.png differ diff --git a/graphics/object_events/pics/pokemon/slowpoke.png b/graphics/object_events/pics/pokemon/slowpoke.png index 9baab0bbe..fd9274f6b 100644 Binary files a/graphics/object_events/pics/pokemon/slowpoke.png and b/graphics/object_events/pics/pokemon/slowpoke.png differ diff --git a/graphics/object_events/pics/pokemon/spearow.png b/graphics/object_events/pics/pokemon/spearow.png index 499f51e8c..f27077751 100644 Binary files a/graphics/object_events/pics/pokemon/spearow.png and b/graphics/object_events/pics/pokemon/spearow.png differ diff --git a/graphics/object_events/pics/pokemon/voltorb.png b/graphics/object_events/pics/pokemon/voltorb.png index 973306673..7cc03e093 100644 Binary files a/graphics/object_events/pics/pokemon/voltorb.png and b/graphics/object_events/pics/pokemon/voltorb.png differ diff --git a/graphics/object_events/pics/pokemon/wigglytuff.png b/graphics/object_events/pics/pokemon/wigglytuff.png index c8252a957..18f4abef4 100644 Binary files a/graphics/object_events/pics/pokemon/wigglytuff.png and b/graphics/object_events/pics/pokemon/wigglytuff.png differ 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"); -- cgit v1.2.3