32 files changed, 67 insertions, 67 deletions

diff --git a/gfx/sprites.asm b/gfx/sprites.asm
index 4548bbe3..bcb98c6f 100644
--- a/gfx/sprites.asm
+++ b/gfx/sprites.asm
@@ -1,73 +1,73 @@
 SECTION "NPC Sprites 1", ROMX
 
-OakAideSprite::         INCBIN "gfx/sprites/oak_aide.2bpp"
-RockerSprite::          INCBIN "gfx/sprites/rocker.2bpp"
-SwimmerSprite::         INCBIN "gfx/sprites/swimmer.2bpp"
-WhitePlayerSprite::     INCBIN "gfx/sprites/white_player.2bpp"
-GymHelperSprite::       INCBIN "gfx/sprites/gym_helper.2bpp"
-OldPersonSprite::       INCBIN "gfx/sprites/old_person.2bpp"
-MartGuySprite::         INCBIN "gfx/sprites/mart_guy.2bpp"
-FisherSprite::          INCBIN "gfx/sprites/fisher.2bpp"
-OldMediumWomanSprite::  INCBIN "gfx/sprites/old_medium_woman.2bpp"
-NurseSprite::           INCBIN "gfx/sprites/nurse.2bpp"
-CableClubWomanSprite::  INCBIN "gfx/sprites/cable_club_woman.2bpp"
-MrMasterballSprite::    INCBIN "gfx/sprites/mr_masterball.2bpp"
-LaprasGiverSprite::     INCBIN "gfx/sprites/lapras_giver.2bpp"
-WardenSprite::          INCBIN "gfx/sprites/warden.2bpp"
-SsCaptainSprite::       INCBIN "gfx/sprites/ss_captain.2bpp"
-Fisher2Sprite::         INCBIN "gfx/sprites/fisher2.2bpp"
-BlackbeltSprite::       INCBIN "gfx/sprites/blackbelt.2bpp"
-GuardSprite::           INCBIN "gfx/sprites/guard.2bpp"
-BallSprite::            INCBIN "gfx/sprites/ball.2bpp"
-OmanyteSprite::         INCBIN "gfx/sprites/omanyte.2bpp"
-BoulderSprite::         INCBIN "gfx/sprites/boulder.2bpp"
-PaperSheetSprite::      INCBIN "gfx/sprites/paper_sheet.2bpp"
-BookMapDexSprite::      INCBIN "gfx/sprites/book_map_dex.2bpp"
-ClipboardSprite::       INCBIN "gfx/sprites/clipboard.2bpp"
-SnorlaxSprite::         INCBIN "gfx/sprites/snorlax.2bpp"
-OldAmberSprite::        INCBIN "gfx/sprites/old_amber.2bpp"
-LyingOldManSprite::     INCBIN "gfx/sprites/lying_old_man.2bpp"
+ScientistSprite::        INCBIN "gfx/sprites/scientist.2bpp"
+RockerSprite::           INCBIN "gfx/sprites/rocker.2bpp"
+SwimmerSprite::          INCBIN "gfx/sprites/swimmer.2bpp"
+SafariZoneWorkerSprite:: INCBIN "gfx/sprites/safari_zone_worker.2bpp"
+GymGuideSprite::         INCBIN "gfx/sprites/gym_guide.2bpp"
+GrampsSprite::           INCBIN "gfx/sprites/gramps.2bpp"
+ClerkSprite::            INCBIN "gfx/sprites/clerk.2bpp"
+FishingGuruSprite::      INCBIN "gfx/sprites/fishing_guru.2bpp"
+GrannySprite::           INCBIN "gfx/sprites/granny.2bpp"
+NurseSprite::            INCBIN "gfx/sprites/nurse.2bpp"
+LinkReceptionistSprite:: INCBIN "gfx/sprites/link_receptionist.2bpp"
+SilphPresidentSprite::   INCBIN "gfx/sprites/silph_president.2bpp"
+SilphWorkerSprite::      INCBIN "gfx/sprites/silph_worker.2bpp"
+WardenSprite::           INCBIN "gfx/sprites/warden.2bpp"
+CaptainSprite::          INCBIN "gfx/sprites/captain.2bpp"
+FisherSprite::           INCBIN "gfx/sprites/fisher.2bpp"
+KogaSprite::             INCBIN "gfx/sprites/koga.2bpp"
+GuardSprite::            INCBIN "gfx/sprites/guard.2bpp"
+PokeBallSprite::         INCBIN "gfx/sprites/poke_ball.2bpp"
+FossilSprite::           INCBIN "gfx/sprites/fossil.2bpp"
+BoulderSprite::          INCBIN "gfx/sprites/boulder.2bpp"
+PaperSprite::            INCBIN "gfx/sprites/paper.2bpp"
+PokedexSprite::          INCBIN "gfx/sprites/pokedex.2bpp"
+ClipboardSprite::        INCBIN "gfx/sprites/clipboard.2bpp"
+SnorlaxSprite::          INCBIN "gfx/sprites/snorlax.2bpp"
+OldAmberSprite::         INCBIN "gfx/sprites/old_amber.2bpp"
+GamblerAsleepSprite::    INCBIN "gfx/sprites/gambler_asleep.2bpp"
 
 
 SECTION "NPC Sprites 2", ROMX
 
-RedCyclingSprite::     INCBIN "gfx/sprites/cycling.2bpp"
-RedSprite::            INCBIN "gfx/sprites/red.2bpp"
-BlueSprite::           INCBIN "gfx/sprites/blue.2bpp"
-OakSprite::            INCBIN "gfx/sprites/oak.2bpp"
-BugCatcherSprite::     INCBIN "gfx/sprites/bug_catcher.2bpp"
-SlowbroSprite::        INCBIN "gfx/sprites/slowbro.2bpp"
-LassSprite::           INCBIN "gfx/sprites/lass.2bpp"
-BlackHairBoy1Sprite::  INCBIN "gfx/sprites/black_hair_boy_1.2bpp"
-LittleGirlSprite::     INCBIN "gfx/sprites/little_girl.2bpp"
-BirdSprite::           INCBIN "gfx/sprites/bird.2bpp"
-FatBaldGuySprite::     INCBIN "gfx/sprites/fat_bald_guy.2bpp"
-GamblerSprite::        INCBIN "gfx/sprites/gambler.2bpp"
-BlackHairBoy2Sprite::  INCBIN "gfx/sprites/black_hair_boy_2.2bpp"
-GirlSprite::           INCBIN "gfx/sprites/girl.2bpp"
-HikerSprite::          INCBIN "gfx/sprites/hiker.2bpp"
-FoulardWomanSprite::   INCBIN "gfx/sprites/foulard_woman.2bpp"
-GentlemanSprite::      INCBIN "gfx/sprites/gentleman.2bpp"
-DaisySprite::          INCBIN "gfx/sprites/daisy.2bpp"
-BikerSprite::          INCBIN "gfx/sprites/biker.2bpp"
-SailorSprite::         INCBIN "gfx/sprites/sailor.2bpp"
-CookSprite::           INCBIN "gfx/sprites/cook.2bpp"
-BikeShopGuySprite::    INCBIN "gfx/sprites/bike_shop_guy.2bpp"
-MrFujiSprite::         INCBIN "gfx/sprites/mr_fuji.2bpp"
-GiovanniSprite::       INCBIN "gfx/sprites/giovanni.2bpp"
-RocketSprite::         INCBIN "gfx/sprites/rocket.2bpp"
-MediumSprite::         INCBIN "gfx/sprites/medium.2bpp"
-WaiterSprite::         INCBIN "gfx/sprites/waiter.2bpp"
-ErikaSprite::          INCBIN "gfx/sprites/erika.2bpp"
-MomGeishaSprite::      INCBIN "gfx/sprites/mom_geisha.2bpp"
-BrunetteGirlSprite::   INCBIN "gfx/sprites/brunette_girl.2bpp"
-LanceSprite::          INCBIN "gfx/sprites/lance.2bpp"
-MomSprite::            INCBIN "gfx/sprites/mom.2bpp"
-BaldingGuySprite::     INCBIN "gfx/sprites/balding_guy.2bpp"
-YoungBoySprite::       INCBIN "gfx/sprites/young_boy.2bpp"
-GameboyKidSprite::     INCBIN "gfx/sprites/gameboy_kid.2bpp"
-ClefairySprite::       INCBIN "gfx/sprites/clefairy.2bpp"
-AgathaSprite::         INCBIN "gfx/sprites/agatha.2bpp"
-BrunoSprite::          INCBIN "gfx/sprites/bruno.2bpp"
-LoreleiSprite::        INCBIN "gfx/sprites/lorelei.2bpp"
-SeelSprite::           INCBIN "gfx/sprites/seel.2bpp"
+RedCyclingSprite::       INCBIN "gfx/sprites/cycling.2bpp"
+RedSprite::              INCBIN "gfx/sprites/red.2bpp"
+BlueSprite::             INCBIN "gfx/sprites/blue.2bpp"
+OakSprite::              INCBIN "gfx/sprites/oak.2bpp"
+YoungsterSprite::        INCBIN "gfx/sprites/youngster.2bpp"
+MonsterSprite::          INCBIN "gfx/sprites/monster.2bpp"
+CooltrainerFSprite::     INCBIN "gfx/sprites/cooltrainer_f.2bpp"
+CooltrainerMSprite::     INCBIN "gfx/sprites/cooltrainer_m.2bpp"
+LittleGirlSprite::       INCBIN "gfx/sprites/little_girl.2bpp"
+BirdSprite::             INCBIN "gfx/sprites/bird.2bpp"
+MiddleAgedManSprite::    INCBIN "gfx/sprites/middle_aged_man.2bpp"
+GamblerSprite::          INCBIN "gfx/sprites/gambler.2bpp"
+SuperNerdSprite::        INCBIN "gfx/sprites/super_nerd.2bpp"
+GirlSprite::             INCBIN "gfx/sprites/girl.2bpp"
+HikerSprite::            INCBIN "gfx/sprites/hiker.2bpp"
+BeautySprite::           INCBIN "gfx/sprites/beauty.2bpp"
+GentlemanSprite::        INCBIN "gfx/sprites/gentleman.2bpp"
+DaisySprite::            INCBIN "gfx/sprites/daisy.2bpp"
+BikerSprite::            INCBIN "gfx/sprites/biker.2bpp"
+SailorSprite::           INCBIN "gfx/sprites/sailor.2bpp"
+CookSprite::             INCBIN "gfx/sprites/cook.2bpp"
+BikeShopClerkSprite::    INCBIN "gfx/sprites/bike_shop_clerk.2bpp"
+MrFujiSprite::           INCBIN "gfx/sprites/mr_fuji.2bpp"
+GiovanniSprite::         INCBIN "gfx/sprites/giovanni.2bpp"
+RocketSprite::           INCBIN "gfx/sprites/rocket.2bpp"
+ChannelerSprite::        INCBIN "gfx/sprites/channeler.2bpp"
+WaiterSprite::           INCBIN "gfx/sprites/waiter.2bpp"
+ErikaSprite::            INCBIN "gfx/sprites/erika.2bpp"
+MiddleAgedWomanSprite::  INCBIN "gfx/sprites/middle_aged_woman.2bpp"
+BrunetteGirlSprite::     INCBIN "gfx/sprites/brunette_girl.2bpp"
+LanceSprite::            INCBIN "gfx/sprites/lance.2bpp"
+MomSprite::              INCBIN "gfx/sprites/mom.2bpp"
+BaldingGuySprite::       INCBIN "gfx/sprites/balding_guy.2bpp"
+LittleBoySprite::        INCBIN "gfx/sprites/little_boy.2bpp"
+GameboyKidSprite::       INCBIN "gfx/sprites/gameboy_kid.2bpp"
+FairySprite::            INCBIN "gfx/sprites/fairy.2bpp"
+AgathaSprite::           INCBIN "gfx/sprites/agatha.2bpp"
+BrunoSprite::            INCBIN "gfx/sprites/bruno.2bpp"
+LoreleiSprite::          INCBIN "gfx/sprites/lorelei.2bpp"
+SeelSprite::             INCBIN "gfx/sprites/seel.2bpp"
diff --git a/gfx/sprites/foulard_woman.png b/gfx/sprites/beauty.png
index 4e510400..4e510400 100644
--- a/gfx/sprites/foulard_woman.png
+++ b/gfx/sprites/beauty.png
diff --git a/gfx/sprites/bike_shop_guy.png b/gfx/sprites/bike_shop_clerk.png
index 1ea83685..1ea83685 100644
--- a/gfx/sprites/bike_shop_guy.png
+++ b/gfx/sprites/bike_shop_clerk.png
diff --git a/gfx/sprites/ss_captain.png b/gfx/sprites/captain.png
index d2967e0f..d2967e0f 100644
--- a/gfx/sprites/ss_captain.png
+++ b/gfx/sprites/captain.png
diff --git a/gfx/sprites/medium.png b/gfx/sprites/channeler.png
index 17f7603f..17f7603f 100644
--- a/gfx/sprites/medium.png
+++ b/gfx/sprites/channeler.png
diff --git a/gfx/sprites/mart_guy.png b/gfx/sprites/clerk.png
index 66448e77..66448e77 100644
--- a/gfx/sprites/mart_guy.png
+++ b/gfx/sprites/clerk.png
diff --git a/gfx/sprites/lass.png b/gfx/sprites/cooltrainer_f.png
index 53bf81b1..53bf81b1 100644
--- a/gfx/sprites/lass.png
+++ b/gfx/sprites/cooltrainer_f.png
diff --git a/gfx/sprites/black_hair_boy_1.png b/gfx/sprites/cooltrainer_m.png
index ffd94f41..ffd94f41 100644
--- a/gfx/sprites/black_hair_boy_1.png
+++ b/gfx/sprites/cooltrainer_m.png
diff --git a/gfx/sprites/clefairy.png b/gfx/sprites/fairy.png
index 06fe0076..06fe0076 100644
--- a/gfx/sprites/clefairy.png
+++ b/gfx/sprites/fairy.png
diff --git a/gfx/sprites/fisher.png b/gfx/sprites/fisher.png
index ef3f864b..a84a2e37 100644
--- a/gfx/sprites/fisher.png
+++ b/gfx/sprites/fisher.png
diff --git a/gfx/sprites/fisher2.png b/gfx/sprites/fisher2.png
deleted file mode 100644
index a84a2e37..00000000
--- a/gfx/sprites/fisher2.png
+++ /dev/null
diff --git a/gfx/sprites/fishing_guru.png b/gfx/sprites/fishing_guru.png
new file mode 100644
index 00000000..ef3f864b
--- /dev/null
+++ b/gfx/sprites/fishing_guru.png
diff --git a/gfx/sprites/omanyte.png b/gfx/sprites/fossil.png
index 9dd1e5c5..9dd1e5c5 100644
--- a/gfx/sprites/omanyte.png
+++ b/gfx/sprites/fossil.png
diff --git a/gfx/sprites/lying_old_man.png b/gfx/sprites/gambler_asleep.png
index 43a9f8df..43a9f8df 100644
--- a/gfx/sprites/lying_old_man.png
+++ b/gfx/sprites/gambler_asleep.png
diff --git a/gfx/sprites/old_person.png b/gfx/sprites/gramps.png
index 729092db..729092db 100644
--- a/gfx/sprites/old_person.png
+++ b/gfx/sprites/gramps.png
diff --git a/gfx/sprites/old_medium_woman.png b/gfx/sprites/granny.png
index fe771c0f..fe771c0f 100644
--- a/gfx/sprites/old_medium_woman.png
+++ b/gfx/sprites/granny.png
diff --git a/gfx/sprites/gym_helper.png b/gfx/sprites/gym_guide.png
index 15d83d9c..15d83d9c 100644
--- a/gfx/sprites/gym_helper.png
+++ b/gfx/sprites/gym_guide.png
diff --git a/gfx/sprites/blackbelt.png b/gfx/sprites/koga.png
index 56a64e31..56a64e31 100644
--- a/gfx/sprites/blackbelt.png
+++ b/gfx/sprites/koga.png
diff --git a/gfx/sprites/cable_club_woman.png b/gfx/sprites/link_receptionist.png
index 3858c52f..3858c52f 100644
--- a/gfx/sprites/cable_club_woman.png
+++ b/gfx/sprites/link_receptionist.png
diff --git a/gfx/sprites/young_boy.png b/gfx/sprites/little_boy.png
index 24996549..24996549 100644
--- a/gfx/sprites/young_boy.png
+++ b/gfx/sprites/little_boy.png
diff --git a/gfx/sprites/fat_bald_guy.png b/gfx/sprites/middle_aged_man.png
index fea7979d..fea7979d 100644
--- a/gfx/sprites/fat_bald_guy.png
+++ b/gfx/sprites/middle_aged_man.png
diff --git a/gfx/sprites/mom_geisha.png b/gfx/sprites/middle_aged_woman.png
index c9b556ea..c9b556ea 100644
--- a/gfx/sprites/mom_geisha.png
+++ b/gfx/sprites/middle_aged_woman.png
diff --git a/gfx/sprites/slowbro.png b/gfx/sprites/monster.png
index 80d615b2..80d615b2 100644
--- a/gfx/sprites/slowbro.png
+++ b/gfx/sprites/monster.png
diff --git a/gfx/sprites/paper_sheet.png b/gfx/sprites/paper.png
index 675183b6..675183b6 100644
--- a/gfx/sprites/paper_sheet.png
+++ b/gfx/sprites/paper.png
diff --git a/gfx/sprites/ball.png b/gfx/sprites/poke_ball.png
index dcce4700..dcce4700 100644
--- a/gfx/sprites/ball.png
+++ b/gfx/sprites/poke_ball.png
diff --git a/gfx/sprites/book_map_dex.png b/gfx/sprites/pokedex.png
index 60554979..60554979 100644
--- a/gfx/sprites/book_map_dex.png
+++ b/gfx/sprites/pokedex.png
diff --git a/gfx/sprites/white_player.png b/gfx/sprites/safari_zone_worker.png
index e55dab9d..e55dab9d 100644
--- a/gfx/sprites/white_player.png
+++ b/gfx/sprites/safari_zone_worker.png
diff --git a/gfx/sprites/oak_aide.png b/gfx/sprites/scientist.png
index a91708e6..a91708e6 100644
--- a/gfx/sprites/oak_aide.png
+++ b/gfx/sprites/scientist.png
diff --git a/gfx/sprites/mr_masterball.png b/gfx/sprites/silph_president.png
index 81818568..81818568 100644
--- a/gfx/sprites/mr_masterball.png
+++ b/gfx/sprites/silph_president.png
diff --git a/gfx/sprites/lapras_giver.png b/gfx/sprites/silph_worker.png
index 00f369fd..00f369fd 100644
--- a/gfx/sprites/lapras_giver.png
+++ b/gfx/sprites/silph_worker.png
diff --git a/gfx/sprites/black_hair_boy_2.png b/gfx/sprites/super_nerd.png
index 7d1b0ddd..7d1b0ddd 100644
--- a/gfx/sprites/black_hair_boy_2.png
+++ b/gfx/sprites/super_nerd.png
diff --git a/gfx/sprites/bug_catcher.png b/gfx/sprites/youngster.png
index da64ee1c..da64ee1c 100644
--- a/gfx/sprites/bug_catcher.png
+++ b/gfx/sprites/youngster.png