diff --git a/Data/Actors.rxdata b/Data/Actors.rxdata
index 41edc8e26..7967a5432 100644
Binary files a/Data/Actors.rxdata and b/Data/Actors.rxdata differ
diff --git a/Data/Animations.rxdata b/Data/Animations.rxdata
index 71336e1f0..a900929a9 100644
Binary files a/Data/Animations.rxdata and b/Data/Animations.rxdata differ
diff --git a/Data/Armors.rxdata b/Data/Armors.rxdata
index 901f2bb2b..2249bec14 100644
Binary files a/Data/Armors.rxdata and b/Data/Armors.rxdata differ
diff --git a/Data/CommonEvents.rxdata b/Data/CommonEvents.rxdata
index ec2a2d8ef..712c0d585 100644
Binary files a/Data/CommonEvents.rxdata and b/Data/CommonEvents.rxdata differ
diff --git a/Data/Enemies.rxdata b/Data/Enemies.rxdata
index be622f513..004ee903d 100644
Binary files a/Data/Enemies.rxdata and b/Data/Enemies.rxdata differ
diff --git a/Data/Items.rxdata b/Data/Items.rxdata
index fe767fa0b..3e62ba6d2 100644
Binary files a/Data/Items.rxdata and b/Data/Items.rxdata differ
diff --git a/Data/MapInfos.rxdata b/Data/MapInfos.rxdata
index 2350d8dec..470cb8f53 100644
Binary files a/Data/MapInfos.rxdata and b/Data/MapInfos.rxdata differ
diff --git a/Data/Skills.rxdata b/Data/Skills.rxdata
index a45219f5e..61cba7ea2 100644
Binary files a/Data/Skills.rxdata and b/Data/Skills.rxdata differ
diff --git a/Data/States.rxdata b/Data/States.rxdata
index 868d49e59..0f9b4ae5d 100644
Binary files a/Data/States.rxdata and b/Data/States.rxdata differ
diff --git a/Data/System.rxdata b/Data/System.rxdata
index e0395c297..dc462805d 100644
Binary files a/Data/System.rxdata and b/Data/System.rxdata differ
diff --git a/Data/Tilesets.rxdata b/Data/Tilesets.rxdata
index 07f2aae47..4ff6a8297 100644
Binary files a/Data/Tilesets.rxdata and b/Data/Tilesets.rxdata differ
diff --git a/Data/Weapons.rxdata b/Data/Weapons.rxdata
index c7ea19a7a..d9bd35260 100644
Binary files a/Data/Weapons.rxdata and b/Data/Weapons.rxdata differ
diff --git a/Graphics/Trainers/trainer006.png b/Graphics/Trainers/AROMALADY.png
similarity index 100%
rename from Graphics/Trainers/trainer006.png
rename to Graphics/Trainers/AROMALADY.png
diff --git a/Graphics/Trainers/trainer007.png b/Graphics/Trainers/BEAUTY.png
similarity index 100%
rename from Graphics/Trainers/trainer007.png
rename to Graphics/Trainers/BEAUTY.png
diff --git a/Graphics/Trainers/trainer008.png b/Graphics/Trainers/BIKER.png
similarity index 100%
rename from Graphics/Trainers/trainer008.png
rename to Graphics/Trainers/BIKER.png
diff --git a/Graphics/Trainers/trainer009.png b/Graphics/Trainers/BIRDKEEPER.png
similarity index 100%
rename from Graphics/Trainers/trainer009.png
rename to Graphics/Trainers/BIRDKEEPER.png
diff --git a/Graphics/Trainers/trainer031.png b/Graphics/Trainers/BLACKBELT.png
similarity index 100%
rename from Graphics/Trainers/trainer031.png
rename to Graphics/Trainers/BLACKBELT.png
diff --git a/Graphics/Trainers/trainer010.png b/Graphics/Trainers/BUGCATCHER.png
similarity index 100%
rename from Graphics/Trainers/trainer010.png
rename to Graphics/Trainers/BUGCATCHER.png
diff --git a/Graphics/Trainers/trainer073.png b/Graphics/Trainers/BUGCATCHER_F.png
similarity index 100%
rename from Graphics/Trainers/trainer073.png
rename to Graphics/Trainers/BUGCATCHER_F.png
diff --git a/Graphics/Trainers/trainer011.png b/Graphics/Trainers/BURGLAR.png
similarity index 100%
rename from Graphics/Trainers/trainer011.png
rename to Graphics/Trainers/BURGLAR.png
diff --git a/Graphics/Trainers/trainer033.png b/Graphics/Trainers/CAMPER.png
similarity index 100%
rename from Graphics/Trainers/trainer033.png
rename to Graphics/Trainers/CAMPER.png
diff --git a/Graphics/Trainers/trainer071.png b/Graphics/Trainers/CHAMPION.png
similarity index 100%
rename from Graphics/Trainers/trainer071.png
rename to Graphics/Trainers/CHAMPION.png
diff --git a/Graphics/Trainers/trainer115.png b/Graphics/Trainers/CHAMPION_Sinnoh.png
similarity index 100%
rename from Graphics/Trainers/trainer115.png
rename to Graphics/Trainers/CHAMPION_Sinnoh.png
diff --git a/Graphics/Trainers/trainer012.png b/Graphics/Trainers/CHANNELER.png
similarity index 100%
rename from Graphics/Trainers/trainer012.png
rename to Graphics/Trainers/CHANNELER.png
diff --git a/Graphics/Trainers/trainer082.png b/Graphics/Trainers/CLOWN.png
similarity index 100%
rename from Graphics/Trainers/trainer082.png
rename to Graphics/Trainers/CLOWN.png
diff --git a/Graphics/Trainers/trainer051.png b/Graphics/Trainers/COOLCOUPLE.png
similarity index 100%
rename from Graphics/Trainers/trainer051.png
rename to Graphics/Trainers/COOLCOUPLE.png
diff --git a/Graphics/Trainers/trainer036.png b/Graphics/Trainers/COOLTRAINER_F.png
similarity index 100%
rename from Graphics/Trainers/trainer036.png
rename to Graphics/Trainers/COOLTRAINER_F.png
diff --git a/Graphics/Trainers/trainer092.png b/Graphics/Trainers/COOLTRAINER_F2.png
similarity index 100%
rename from Graphics/Trainers/trainer092.png
rename to Graphics/Trainers/COOLTRAINER_F2.png
diff --git a/Graphics/Trainers/trainer035.png b/Graphics/Trainers/COOLTRAINER_M.png
similarity index 100%
rename from Graphics/Trainers/trainer035.png
rename to Graphics/Trainers/COOLTRAINER_M.png
diff --git a/Graphics/Trainers/trainer079.png b/Graphics/Trainers/COOLTRAINER_M2.png
similarity index 100%
rename from Graphics/Trainers/trainer079.png
rename to Graphics/Trainers/COOLTRAINER_M2.png
diff --git a/Graphics/Trainers/trainer032.png b/Graphics/Trainers/CRUSHGIRL.png
similarity index 100%
rename from Graphics/Trainers/trainer032.png
rename to Graphics/Trainers/CRUSHGIRL.png
diff --git a/Graphics/Trainers/trainer052.png b/Graphics/Trainers/CRUSHKIN.png
similarity index 100%
rename from Graphics/Trainers/trainer052.png
rename to Graphics/Trainers/CRUSHKIN.png
diff --git a/Graphics/Trainers/trainer013.png b/Graphics/Trainers/CUEBALL.png
similarity index 100%
rename from Graphics/Trainers/trainer013.png
rename to Graphics/Trainers/CUEBALL.png
diff --git a/Graphics/Trainers/trainer135.png b/Graphics/Trainers/DELIVERYMAN.png
similarity index 100%
rename from Graphics/Trainers/trainer135.png
rename to Graphics/Trainers/DELIVERYMAN.png
diff --git a/Graphics/Trainers/DELIVERYMAN2.png b/Graphics/Trainers/DELIVERYMAN2.png
new file mode 100644
index 000000000..1c5f313cb
Binary files /dev/null and b/Graphics/Trainers/DELIVERYMAN2.png differ
diff --git a/Graphics/Trainers/trainer069.png b/Graphics/Trainers/ELITEFOUR_Agatha.png
similarity index 100%
rename from Graphics/Trainers/trainer069.png
rename to Graphics/Trainers/ELITEFOUR_Agatha.png
diff --git a/Graphics/Trainers/trainer068.png b/Graphics/Trainers/ELITEFOUR_Bruno.png
similarity index 100%
rename from Graphics/Trainers/trainer068.png
rename to Graphics/Trainers/ELITEFOUR_Bruno.png
diff --git a/Graphics/Trainers/trainer070.png b/Graphics/Trainers/ELITEFOUR_Lance.png
similarity index 100%
rename from Graphics/Trainers/trainer070.png
rename to Graphics/Trainers/ELITEFOUR_Lance.png
diff --git a/Graphics/Trainers/trainer067.png b/Graphics/Trainers/ELITEFOUR_Lorelei.png
similarity index 100%
rename from Graphics/Trainers/trainer067.png
rename to Graphics/Trainers/ELITEFOUR_Lorelei.png
diff --git a/Graphics/Trainers/trainer014.png b/Graphics/Trainers/ENGINEER.png
similarity index 100%
rename from Graphics/Trainers/trainer014.png
rename to Graphics/Trainers/ENGINEER.png
diff --git a/Graphics/Trainers/trainer094.png b/Graphics/Trainers/FARMER.png
similarity index 100%
rename from Graphics/Trainers/trainer094.png
rename to Graphics/Trainers/FARMER.png
diff --git a/Graphics/Trainers/trainer015.png b/Graphics/Trainers/FISHERMAN.png
similarity index 100%
rename from Graphics/Trainers/trainer015.png
rename to Graphics/Trainers/FISHERMAN.png
diff --git a/Graphics/Trainers/trainer016.png b/Graphics/Trainers/GAMBLER.png
similarity index 100%
rename from Graphics/Trainers/trainer016.png
rename to Graphics/Trainers/GAMBLER.png
diff --git a/Graphics/Trainers/trainer017.png b/Graphics/Trainers/GENTLEMAN.png
similarity index 100%
rename from Graphics/Trainers/trainer017.png
rename to Graphics/Trainers/GENTLEMAN.png
diff --git a/Graphics/Trainers/trainer081.png b/Graphics/Trainers/HAUNTEDGIRL.png
similarity index 100%
rename from Graphics/Trainers/trainer081.png
rename to Graphics/Trainers/HAUNTEDGIRL.png
diff --git a/Graphics/Trainers/trainer080.png b/Graphics/Trainers/HAUNTEDGIRL_YOUNG.png
similarity index 100%
rename from Graphics/Trainers/trainer080.png
rename to Graphics/Trainers/HAUNTEDGIRL_YOUNG.png
diff --git a/Graphics/Trainers/trainer018.png b/Graphics/Trainers/HIKER.png
similarity index 100%
rename from Graphics/Trainers/trainer018.png
rename to Graphics/Trainers/HIKER.png
diff --git a/Graphics/Trainers/trainer091.png b/Graphics/Trainers/HIPSTER.png
similarity index 100%
rename from Graphics/Trainers/trainer091.png
rename to Graphics/Trainers/HIPSTER.png
diff --git a/Graphics/Trainers/trainer019.png b/Graphics/Trainers/JUGGLER.png
similarity index 100%
rename from Graphics/Trainers/trainer019.png
rename to Graphics/Trainers/JUGGLER.png
diff --git a/Graphics/Trainers/trainer108.png b/Graphics/Trainers/KIMONOGIRL.png
similarity index 100%
rename from Graphics/Trainers/trainer108.png
rename to Graphics/Trainers/KIMONOGIRL.png
diff --git a/Graphics/Trainers/trainer020.png b/Graphics/Trainers/LADY.png
similarity index 100%
rename from Graphics/Trainers/trainer020.png
rename to Graphics/Trainers/LADY.png
diff --git a/Graphics/Trainers/trainer038.png b/Graphics/Trainers/LASS.png
similarity index 100%
rename from Graphics/Trainers/trainer038.png
rename to Graphics/Trainers/LASS.png
diff --git a/Graphics/Trainers/trainer138.png b/Graphics/Trainers/LASS_blue.png
similarity index 100%
rename from Graphics/Trainers/trainer138.png
rename to Graphics/Trainers/LASS_blue.png
diff --git a/Graphics/Trainers/trainer065.png b/Graphics/Trainers/LEADER_Blaine.png
similarity index 100%
rename from Graphics/Trainers/trainer065.png
rename to Graphics/Trainers/LEADER_Blaine.png
diff --git a/Graphics/Trainers/trainer059.png b/Graphics/Trainers/LEADER_Brock.png
similarity index 100%
rename from Graphics/Trainers/trainer059.png
rename to Graphics/Trainers/LEADER_Brock.png
diff --git a/Graphics/Trainers/trainer111.png b/Graphics/Trainers/LEADER_Chuck.png
similarity index 100%
rename from Graphics/Trainers/trainer111.png
rename to Graphics/Trainers/LEADER_Chuck.png
diff --git a/Graphics/Trainers/trainer101.png b/Graphics/Trainers/LEADER_Clair.png
similarity index 100%
rename from Graphics/Trainers/trainer101.png
rename to Graphics/Trainers/LEADER_Clair.png
diff --git a/Graphics/Trainers/trainer062.png b/Graphics/Trainers/LEADER_Erika.png
similarity index 100%
rename from Graphics/Trainers/trainer062.png
rename to Graphics/Trainers/LEADER_Erika.png
diff --git a/Graphics/Trainers/trainer100.png b/Graphics/Trainers/LEADER_Falkner.png
similarity index 100%
rename from Graphics/Trainers/trainer100.png
rename to Graphics/Trainers/LEADER_Falkner.png
diff --git a/Graphics/Trainers/trainer058.png b/Graphics/Trainers/LEADER_Giovanni.png
similarity index 100%
rename from Graphics/Trainers/trainer058.png
rename to Graphics/Trainers/LEADER_Giovanni.png
diff --git a/Graphics/Trainers/trainer112.png b/Graphics/Trainers/LEADER_Jasmine.png
similarity index 100%
rename from Graphics/Trainers/trainer112.png
rename to Graphics/Trainers/LEADER_Jasmine.png
diff --git a/Graphics/Trainers/trainer063.png b/Graphics/Trainers/LEADER_Koga.png
similarity index 100%
rename from Graphics/Trainers/trainer063.png
rename to Graphics/Trainers/LEADER_Koga.png
diff --git a/Graphics/Trainers/trainer099.png b/Graphics/Trainers/LEADER_Kurt.png
similarity index 100%
rename from Graphics/Trainers/trainer099.png
rename to Graphics/Trainers/LEADER_Kurt.png
diff --git a/Graphics/Trainers/trainer060.png b/Graphics/Trainers/LEADER_Misty.png
similarity index 100%
rename from Graphics/Trainers/trainer060.png
rename to Graphics/Trainers/LEADER_Misty.png
diff --git a/Graphics/Trainers/trainer103.png b/Graphics/Trainers/LEADER_Morty.png
similarity index 100%
rename from Graphics/Trainers/trainer103.png
rename to Graphics/Trainers/LEADER_Morty.png
diff --git a/Graphics/Trainers/trainer107.png b/Graphics/Trainers/LEADER_Pryce.png
similarity index 100%
rename from Graphics/Trainers/trainer107.png
rename to Graphics/Trainers/LEADER_Pryce.png
diff --git a/Graphics/Trainers/trainer064.png b/Graphics/Trainers/LEADER_Sabrina.png
similarity index 100%
rename from Graphics/Trainers/trainer064.png
rename to Graphics/Trainers/LEADER_Sabrina.png
diff --git a/Graphics/Trainers/trainer061.png b/Graphics/Trainers/LEADER_Surge.png
similarity index 100%
rename from Graphics/Trainers/trainer061.png
rename to Graphics/Trainers/LEADER_Surge.png
diff --git a/Graphics/Trainers/trainer098.png b/Graphics/Trainers/LEADER_Whitney.png
similarity index 100%
rename from Graphics/Trainers/trainer098.png
rename to Graphics/Trainers/LEADER_Whitney.png
diff --git a/Graphics/Trainers/trainer074.png b/Graphics/Trainers/MR_FUJI.png
similarity index 100%
rename from Graphics/Trainers/trainer074.png
rename to Graphics/Trainers/MR_FUJI.png
diff --git a/Graphics/Trainers/trainer102.png b/Graphics/Trainers/MYSTICALMAN.png
similarity index 100%
rename from Graphics/Trainers/trainer102.png
rename to Graphics/Trainers/MYSTICALMAN.png
diff --git a/Graphics/Trainers/trainer083.png b/Graphics/Trainers/NURSE.png
similarity index 100%
rename from Graphics/Trainers/trainer083.png
rename to Graphics/Trainers/NURSE.png
diff --git a/Graphics/Trainers/trainer021.png b/Graphics/Trainers/PAINTER.png
similarity index 100%
rename from Graphics/Trainers/trainer021.png
rename to Graphics/Trainers/PAINTER.png
diff --git a/Graphics/Trainers/trainer034.png b/Graphics/Trainers/PICNICKER.png
similarity index 100%
rename from Graphics/Trainers/trainer034.png
rename to Graphics/Trainers/PICNICKER.png
diff --git a/Graphics/Trainers/trainer110.png b/Graphics/Trainers/PLAYER.png
similarity index 100%
rename from Graphics/Trainers/trainer110.png
rename to Graphics/Trainers/PLAYER.png
diff --git a/Graphics/Trainers/trainer022.png b/Graphics/Trainers/POKEMANIAC.png
similarity index 100%
rename from Graphics/Trainers/trainer022.png
rename to Graphics/Trainers/POKEMANIAC.png
diff --git a/Graphics/Trainers/trainer023.png b/Graphics/Trainers/POKEMONBREEDER.png
similarity index 100%
rename from Graphics/Trainers/trainer023.png
rename to Graphics/Trainers/POKEMONBREEDER.png
diff --git a/Graphics/Trainers/trainer040.png b/Graphics/Trainers/POKEMONRANGER_F.png
similarity index 100%
rename from Graphics/Trainers/trainer040.png
rename to Graphics/Trainers/POKEMONRANGER_F.png
diff --git a/Graphics/Trainers/trainer039.png b/Graphics/Trainers/POKEMONRANGER_M.png
similarity index 100%
rename from Graphics/Trainers/trainer039.png
rename to Graphics/Trainers/POKEMONRANGER_M.png
diff --git a/Graphics/Trainers/trainer002.png b/Graphics/Trainers/POKEMONTRAINER_Gold.png
similarity index 100%
rename from Graphics/Trainers/trainer002.png
rename to Graphics/Trainers/POKEMONTRAINER_Gold.png
diff --git a/Graphics/Trainers/trainer003.png b/Graphics/Trainers/POKEMONTRAINER_May.png
similarity index 100%
rename from Graphics/Trainers/trainer003.png
rename to Graphics/Trainers/POKEMONTRAINER_May.png
diff --git a/Graphics/Trainers/POKEMONTRAINER_Red.png b/Graphics/Trainers/POKEMONTRAINER_Red.png
index 578c033cd..052ab0b2d 100644
Binary files a/Graphics/Trainers/POKEMONTRAINER_Red.png and b/Graphics/Trainers/POKEMONTRAINER_Red.png differ
diff --git a/Graphics/Trainers/trainer113.png b/Graphics/Trainers/POLICE.png
similarity index 100%
rename from Graphics/Trainers/trainer113.png
rename to Graphics/Trainers/POLICE.png
diff --git a/Graphics/Trainers/trainer078.png b/Graphics/Trainers/PRESCHOOLER_F.png
similarity index 100%
rename from Graphics/Trainers/trainer078.png
rename to Graphics/Trainers/PRESCHOOLER_F.png
diff --git a/Graphics/Trainers/trainer077.png b/Graphics/Trainers/PRESCHOOLER_M.png
similarity index 100%
rename from Graphics/Trainers/trainer077.png
rename to Graphics/Trainers/PRESCHOOLER_M.png
diff --git a/Graphics/Trainers/trainer024.png b/Graphics/Trainers/PROFESSOR.png
similarity index 100%
rename from Graphics/Trainers/trainer024.png
rename to Graphics/Trainers/PROFESSOR.png
diff --git a/Graphics/Trainers/trainer042.png b/Graphics/Trainers/PSYCHIC_F.png
similarity index 100%
rename from Graphics/Trainers/trainer042.png
rename to Graphics/Trainers/PSYCHIC_F.png
diff --git a/Graphics/Trainers/trainer041.png b/Graphics/Trainers/PSYCHIC_M.png
similarity index 100%
rename from Graphics/Trainers/trainer041.png
rename to Graphics/Trainers/PSYCHIC_M.png
diff --git a/Graphics/Trainers/trainer095.png b/Graphics/Trainers/PYROMANIAC.png
similarity index 100%
rename from Graphics/Trainers/trainer095.png
rename to Graphics/Trainers/PYROMANIAC.png
diff --git a/Graphics/Trainers/trainer004.png b/Graphics/Trainers/RIVAL1.png
similarity index 100%
rename from Graphics/Trainers/trainer004.png
rename to Graphics/Trainers/RIVAL1.png
diff --git a/Graphics/Trainers/trainer005.png b/Graphics/Trainers/RIVAL2.png
similarity index 100%
rename from Graphics/Trainers/trainer005.png
rename to Graphics/Trainers/RIVAL2.png
diff --git a/Graphics/Trainers/trainer093.png b/Graphics/Trainers/ROBOT.png
similarity index 100%
rename from Graphics/Trainers/trainer093.png
rename to Graphics/Trainers/ROBOT.png
diff --git a/Graphics/Trainers/trainer025.png b/Graphics/Trainers/ROCKER.png
similarity index 100%
rename from Graphics/Trainers/trainer025.png
rename to Graphics/Trainers/ROCKER.png
diff --git a/Graphics/Trainers/trainer066.png b/Graphics/Trainers/ROCKETBOSS.png
similarity index 100%
rename from Graphics/Trainers/trainer066.png
rename to Graphics/Trainers/ROCKETBOSS.png
diff --git a/Graphics/Trainers/trainer137.png b/Graphics/Trainers/ROCKETEXEC_Archer.png
similarity index 100%
rename from Graphics/Trainers/trainer137.png
rename to Graphics/Trainers/ROCKETEXEC_Archer.png
diff --git a/Graphics/Trainers/trainer136.png b/Graphics/Trainers/ROCKETEXEC_Ariana.png
similarity index 100%
rename from Graphics/Trainers/trainer136.png
rename to Graphics/Trainers/ROCKETEXEC_Ariana.png
diff --git a/Graphics/Trainers/trainer096.png b/Graphics/Trainers/ROCKETEXEC_F.png
similarity index 100%
rename from Graphics/Trainers/trainer096.png
rename to Graphics/Trainers/ROCKETEXEC_F.png
diff --git a/Graphics/Trainers/trainer056.png b/Graphics/Trainers/ROCKETEXEC_M.png
similarity index 100%
rename from Graphics/Trainers/trainer056.png
rename to Graphics/Trainers/ROCKETEXEC_M.png
diff --git a/Graphics/Trainers/trainer075.png b/Graphics/Trainers/ROUGHNECK.png
similarity index 100%
rename from Graphics/Trainers/trainer075.png
rename to Graphics/Trainers/ROUGHNECK.png
diff --git a/Graphics/Trainers/trainer026.png b/Graphics/Trainers/RUINMANIAC.png
similarity index 100%
rename from Graphics/Trainers/trainer026.png
rename to Graphics/Trainers/RUINMANIAC.png
diff --git a/Graphics/Trainers/trainer109.png b/Graphics/Trainers/SAGE.png
similarity index 100%
rename from Graphics/Trainers/trainer109.png
rename to Graphics/Trainers/SAGE.png
diff --git a/Graphics/Trainers/trainer027.png b/Graphics/Trainers/SAILOR.png
similarity index 100%
rename from Graphics/Trainers/trainer027.png
rename to Graphics/Trainers/SAILOR.png
diff --git a/Graphics/Trainers/trainer028.png b/Graphics/Trainers/SCIENTIST.png
similarity index 100%
rename from Graphics/Trainers/trainer028.png
rename to Graphics/Trainers/SCIENTIST.png
diff --git a/Graphics/Trainers/trainer106.png b/Graphics/Trainers/SCIENTIST_Colress.png
similarity index 100%
rename from Graphics/Trainers/trainer106.png
rename to Graphics/Trainers/SCIENTIST_Colress.png
diff --git a/Graphics/Trainers/trainer053.png b/Graphics/Trainers/SISANDBRO.png
similarity index 100%
rename from Graphics/Trainers/trainer053.png
rename to Graphics/Trainers/SISANDBRO.png
diff --git a/Graphics/Trainers/trainer114.png b/Graphics/Trainers/SKIER_F.png
similarity index 100%
rename from Graphics/Trainers/trainer114.png
rename to Graphics/Trainers/SKIER_F.png
diff --git a/Graphics/Trainers/trainer072.png b/Graphics/Trainers/SOCIALITE.png
similarity index 100%
rename from Graphics/Trainers/trainer072.png
rename to Graphics/Trainers/SOCIALITE.png
diff --git a/Graphics/Trainers/trainer029.png b/Graphics/Trainers/SUPERNERD.png
similarity index 100%
rename from Graphics/Trainers/trainer029.png
rename to Graphics/Trainers/SUPERNERD.png
diff --git a/Graphics/Trainers/trainer046.png b/Graphics/Trainers/SWIMMER2_F.png
similarity index 100%
rename from Graphics/Trainers/trainer046.png
rename to Graphics/Trainers/SWIMMER2_F.png
diff --git a/Graphics/Trainers/trainer043.png b/Graphics/Trainers/SWIMMER2_M.png
similarity index 100%
rename from Graphics/Trainers/trainer043.png
rename to Graphics/Trainers/SWIMMER2_M.png
diff --git a/Graphics/Trainers/trainer044.png b/Graphics/Trainers/SWIMMER_F.png
similarity index 100%
rename from Graphics/Trainers/trainer044.png
rename to Graphics/Trainers/SWIMMER_F.png
diff --git a/Graphics/Trainers/trainer045.png b/Graphics/Trainers/SWIMMER_M.png
similarity index 100%
rename from Graphics/Trainers/trainer045.png
rename to Graphics/Trainers/SWIMMER_M.png
diff --git a/Graphics/Trainers/trainer030.png b/Graphics/Trainers/TAMER.png
similarity index 100%
rename from Graphics/Trainers/trainer030.png
rename to Graphics/Trainers/TAMER.png
diff --git a/Graphics/Trainers/trainer076.png b/Graphics/Trainers/TEACHER.png
similarity index 100%
rename from Graphics/Trainers/trainer076.png
rename to Graphics/Trainers/TEACHER.png
diff --git a/Graphics/Trainers/trainer105.png b/Graphics/Trainers/TEAMPLASMA_F.png
similarity index 100%
rename from Graphics/Trainers/trainer105.png
rename to Graphics/Trainers/TEAMPLASMA_F.png
diff --git a/Graphics/Trainers/trainer104.png b/Graphics/Trainers/TEAMPLASMA_M.png
similarity index 100%
rename from Graphics/Trainers/trainer104.png
rename to Graphics/Trainers/TEAMPLASMA_M.png
diff --git a/Graphics/Trainers/trainer057.png b/Graphics/Trainers/TEAMROCKET_F.png
similarity index 100%
rename from Graphics/Trainers/trainer057.png
rename to Graphics/Trainers/TEAMROCKET_F.png
diff --git a/Graphics/Trainers/trainer097.png b/Graphics/Trainers/TEAMROCKET_M.png
similarity index 100%
rename from Graphics/Trainers/trainer097.png
rename to Graphics/Trainers/TEAMROCKET_M.png
diff --git a/Graphics/Trainers/trainer048.png b/Graphics/Trainers/TUBER2_F.png
similarity index 100%
rename from Graphics/Trainers/trainer048.png
rename to Graphics/Trainers/TUBER2_F.png
diff --git a/Graphics/Trainers/trainer049.png b/Graphics/Trainers/TUBER2_M.png
similarity index 100%
rename from Graphics/Trainers/trainer049.png
rename to Graphics/Trainers/TUBER2_M.png
diff --git a/Graphics/Trainers/trainer050.png b/Graphics/Trainers/TUBER_F.png
similarity index 100%
rename from Graphics/Trainers/trainer050.png
rename to Graphics/Trainers/TUBER_F.png
diff --git a/Graphics/Trainers/trainer047.png b/Graphics/Trainers/TUBER_M.png
similarity index 100%
rename from Graphics/Trainers/trainer047.png
rename to Graphics/Trainers/TUBER_M.png
diff --git a/Graphics/Trainers/trainer054.png b/Graphics/Trainers/TWINS.png
similarity index 100%
rename from Graphics/Trainers/trainer054.png
rename to Graphics/Trainers/TWINS.png
diff --git a/Graphics/Trainers/trainer084.png b/Graphics/Trainers/WORKER.png
similarity index 100%
rename from Graphics/Trainers/trainer084.png
rename to Graphics/Trainers/WORKER.png
diff --git a/Graphics/Trainers/trainer055.png b/Graphics/Trainers/YOUNGCOUPLE.png
similarity index 100%
rename from Graphics/Trainers/trainer055.png
rename to Graphics/Trainers/YOUNGCOUPLE.png
diff --git a/Graphics/Trainers/trainer037.png b/Graphics/Trainers/YOUNGSTER.png
similarity index 100%
rename from Graphics/Trainers/trainer037.png
rename to Graphics/Trainers/YOUNGSTER.png
diff --git a/Graphics/Trainers/trainer000.png b/Graphics/Trainers/trainer000.png
deleted file mode 100644
index 052ab0b2d..000000000
Binary files a/Graphics/Trainers/trainer000.png and /dev/null differ
diff --git a/Graphics/Trainers/trainer001.png b/Graphics/Trainers/trainer001.png
deleted file mode 100644
index ca6928d48..000000000
Binary files a/Graphics/Trainers/trainer001.png and /dev/null differ
diff --git a/Graphics/Trainers/trainer116a.png b/Graphics/Trainers/trainer116a.png
deleted file mode 100644
index c5841775b..000000000
Binary files a/Graphics/Trainers/trainer116a.png and /dev/null differ
diff --git a/Graphics/Trainers/trainer116b.png b/Graphics/Trainers/trainer116b.png
deleted file mode 100644
index 315e8fdf8..000000000
Binary files a/Graphics/Trainers/trainer116b.png and /dev/null differ
diff --git a/Graphics/Trainers/trainer116c.png b/Graphics/Trainers/trainer116c.png
deleted file mode 100644
index b0f3d7269..000000000
Binary files a/Graphics/Trainers/trainer116c.png and /dev/null differ
diff --git a/Graphics/Trainers/trainer116d.png b/Graphics/Trainers/trainer116d.png
deleted file mode 100644
index c75baee1d..000000000
Binary files a/Graphics/Trainers/trainer116d.png and /dev/null differ
diff --git a/Graphics/Trainers/trainer139.png b/Graphics/Trainers/trainer139.png
deleted file mode 100644
index b7b3b2829..000000000
Binary files a/Graphics/Trainers/trainer139.png and /dev/null differ