Rename trainer pics to use names instead of ids.

gfx/pics.asm

@@ -233,23 +233,23 @@ MagbyFrontpic:       INCBIN "gfx/pics/magby/front.6x6.2bpp.lz"
 WeepinbellFrontpic:  INCBIN "gfx/pics/weepinbell/front.6x6.2bpp.lz"
 TotodileFrontpic:    INCBIN "gfx/pics/totodile/front.5x5.2bpp.lz"
 CorsolaFrontpic:     INCBIN "gfx/pics/corsola/front.6x6.2bpp.lz"
-FirebreatherPic:     INCBIN "gfx/trainers/047.7x7.2bpp.lz"
+FirebreatherPic:     INCBIN "gfx/trainers/firebreather.7x7.2bpp.lz"
 MachopFrontpic:      INCBIN "gfx/pics/machop/front.5x5.2bpp.lz"
 ChinchouFrontpic:    INCBIN "gfx/pics/chinchou/front.6x6.2bpp.lz"
 RattataFrontpic:     INCBIN "gfx/pics/rattata/front.5x5.2bpp.lz"
-ChampionPic:         INCBIN "gfx/trainers/015.7x7.2bpp.lz"
+ChampionPic:         INCBIN "gfx/trainers/champion.7x7.2bpp.lz"
 SpearowFrontpic:     INCBIN "gfx/pics/spearow/front.5x5.2bpp.lz"
 MagikarpFrontpic:    INCBIN "gfx/pics/magikarp/front.6x6.2bpp.lz"
 CharmanderFrontpic:  INCBIN "gfx/pics/charmander/front.5x5.2bpp.lz"
 CuboneFrontpic:      INCBIN "gfx/pics/cubone/front.5x5.2bpp.lz"
-BlackbeltTPic:       INCBIN "gfx/trainers/049.7x7.2bpp.lz"
-BikerPic:            INCBIN "gfx/trainers/044.7x7.2bpp.lz"
+BlackbeltTPic:       INCBIN "gfx/trainers/blackbelt_t.7x7.2bpp.lz"
+BikerPic:            INCBIN "gfx/trainers/biker.7x7.2bpp.lz"
 NidoranMFrontpic:    INCBIN "gfx/pics/nidoran_m/front.5x5.2bpp.lz"
 PorygonFrontpic:     INCBIN "gfx/pics/porygon/front.6x6.2bpp.lz"
-BrunoPic:            INCBIN "gfx/trainers/012.7x7.2bpp.lz"
+BrunoPic:            INCBIN "gfx/trainers/bruno.7x7.2bpp.lz"
 GrimerFrontpic:      INCBIN "gfx/pics/grimer/front.5x5.2bpp.lz"
 StaryuFrontpic:      INCBIN "gfx/pics/staryu/front.6x6.2bpp.lz"
-HikerPic:            INCBIN "gfx/trainers/043.7x7.2bpp.lz"
+HikerPic:            INCBIN "gfx/trainers/hiker.7x7.2bpp.lz"
 MeowthFrontpic:      INCBIN "gfx/pics/meowth/front.5x5.2bpp.lz"
 Porygon2Frontpic:    INCBIN "gfx/pics/porygon2/front.6x6.2bpp.lz"
 SandshrewFrontpic:   INCBIN "gfx/pics/sandshrew/front.5x5.2bpp.lz"
@@ -265,15 +265,15 @@ MisdreavusFrontpic:  INCBIN "gfx/pics/misdreavus/front.6x6.2bpp.lz"
 HoundourFrontpic:    INCBIN "gfx/pics/houndour/front.6x6.2bpp.lz"
 MankeyFrontpic:      INCBIN "gfx/pics/mankey/front.5x5.2bpp.lz"
 CelebiFrontpic:      INCBIN "gfx/pics/celebi/front.5x5.2bpp.lz"
-MediumPic:           INCBIN "gfx/trainers/056.7x7.2bpp.lz"
+MediumPic:           INCBIN "gfx/trainers/medium.7x7.2bpp.lz"
 PinecoFrontpic:      INCBIN "gfx/pics/pineco/front.5x5.2bpp.lz"
 KrabbyFrontpic:      INCBIN "gfx/pics/krabby/front.5x5.2bpp.lz"
-FisherPic:           INCBIN "gfx/trainers/036.7x7.2bpp.lz"
+FisherPic:           INCBIN "gfx/trainers/fisher.7x7.2bpp.lz"
 JigglypuffFrontpic:  INCBIN "gfx/pics/jigglypuff/front.5x5.2bpp.lz"
 ParasFrontpic:       INCBIN "gfx/pics/paras/front.5x5.2bpp.lz"
 NidokingBackpic:     INCBIN "gfx/pics/nidoking/back.6x6.2bpp.lz"
-PokefanmPic:         INCBIN "gfx/trainers/058.7x7.2bpp.lz"
-BoarderPic:          INCBIN "gfx/trainers/057.7x7.2bpp.lz"
+PokefanmPic:         INCBIN "gfx/trainers/pokefan_m.7x7.2bpp.lz"
+BoarderPic:          INCBIN "gfx/trainers/boarder.7x7.2bpp.lz"
 PsyduckFrontpic:     INCBIN "gfx/pics/psyduck/front.5x5.2bpp.lz"
 SquirtleFrontpic:    INCBIN "gfx/pics/squirtle/front.5x5.2bpp.lz"
 MachampBackpic:      INCBIN "gfx/pics/machamp/back.6x6.2bpp.lz"
@@ -284,11 +284,11 @@ LanturnFrontpic:     INCBIN "gfx/pics/lanturn/front.6x6.2bpp.lz"
 TyrogueFrontpic:     INCBIN "gfx/pics/tyrogue/front.5x5.2bpp.lz"
 SkiploomFrontpic:    INCBIN "gfx/pics/skiploom/front.6x6.2bpp.lz"
 MareepFrontpic:      INCBIN "gfx/pics/mareep/front.5x5.2bpp.lz"
-ChuckPic:            INCBIN "gfx/trainers/006.7x7.2bpp.lz"
+ChuckPic:            INCBIN "gfx/trainers/chuck.7x7.2bpp.lz"
 EeveeFrontpic:       INCBIN "gfx/pics/eevee/front.5x5.2bpp.lz"
 ButterfreeBackpic:   INCBIN "gfx/pics/butterfree/back.6x6.2bpp.lz"
 ZubatFrontpic:       INCBIN "gfx/pics/zubat/front.5x5.2bpp.lz"
-KimonoGirlPic:       INCBIN "gfx/trainers/059.7x7.2bpp.lz"
+KimonoGirlPic:       INCBIN "gfx/trainers/kimono_girl.7x7.2bpp.lz"
 AlakazamBackpic:     INCBIN "gfx/pics/alakazam/back.6x6.2bpp.lz"
 AipomFrontpic:       INCBIN "gfx/pics/aipom/front.5x5.2bpp.lz"
 AbraFrontpic:        INCBIN "gfx/pics/abra/front.5x5.2bpp.lz"
@@ -307,15 +307,15 @@ SlugmaFrontpic:      INCBIN "gfx/pics/slugma/front.5x5.2bpp.lz"
 GrowlitheFrontpic:   INCBIN "gfx/pics/growlithe/front.5x5.2bpp.lz"
 SlowpokeFrontpic:    INCBIN "gfx/pics/slowpoke/front.5x5.2bpp.lz"
 SmoochumFrontpic:    INCBIN "gfx/pics/smoochum/front.5x5.2bpp.lz"
-JugglerPic:          INCBIN "gfx/trainers/048.7x7.2bpp.lz"
+JugglerPic:          INCBIN "gfx/trainers/juggler.7x7.2bpp.lz"
 MarillFrontpic:      INCBIN "gfx/pics/marill/front.5x5.2bpp.lz"
-GuitaristPic:        INCBIN "gfx/trainers/042.7x7.2bpp.lz"
-PokefanfPic:         INCBIN "gfx/trainers/061.7x7.2bpp.lz"
+GuitaristPic:        INCBIN "gfx/trainers/guitarist.7x7.2bpp.lz"
+PokefanfPic:         INCBIN "gfx/trainers/pokefan_f.7x7.2bpp.lz"
 VenomothBackpic:     INCBIN "gfx/pics/venomoth/back.6x6.2bpp.lz"
-ClairPic:            INCBIN "gfx/trainers/007.7x7.2bpp.lz"
-PokemaniacPic:       INCBIN "gfx/trainers/029.7x7.2bpp.lz"
+ClairPic:            INCBIN "gfx/trainers/clair.7x7.2bpp.lz"
+PokemaniacPic:       INCBIN "gfx/trainers/pokemaniac.7x7.2bpp.lz"
 OmanyteFrontpic:     INCBIN "gfx/pics/omanyte/front.5x5.2bpp.lz"
-SkierPic:            INCBIN "gfx/trainers/032.7x7.2bpp.lz"
+SkierPic:            INCBIN "gfx/trainers/skier.7x7.2bpp.lz"
 PupitarFrontpic:     INCBIN "gfx/pics/pupitar/front.6x6.2bpp.lz"
 BellsproutFrontpic:  INCBIN "gfx/pics/bellsprout/front.5x5.2bpp.lz"
 ShellderFrontpic:    INCBIN "gfx/pics/shellder/front.5x5.2bpp.lz"
@@ -325,7 +325,7 @@ GyaradosBackpic:     INCBIN "gfx/pics/gyarados/back.6x6.2bpp.lz"
 NinetalesBackpic:    INCBIN "gfx/pics/ninetales/back.6x6.2bpp.lz"
 YanmaBackpic:        INCBIN "gfx/pics/yanma/back.6x6.2bpp.lz"
 PinsirBackpic:       INCBIN "gfx/pics/pinsir/back.6x6.2bpp.lz"
-LassPic:             INCBIN "gfx/trainers/024.7x7.2bpp.lz"
+LassPic:             INCBIN "gfx/trainers/lass.7x7.2bpp.lz"
 ClefableBackpic:     INCBIN "gfx/pics/clefable/back.6x6.2bpp.lz"
 DoduoFrontpic:       INCBIN "gfx/pics/doduo/front.5x5.2bpp.lz"
 FeraligatrBackpic:   INCBIN "gfx/pics/feraligatr/back.6x6.2bpp.lz"
@@ -337,7 +337,7 @@ SlowkingBackpic:     INCBIN "gfx/pics/slowking/back.6x6.2bpp.lz"
 ElekidBackpic:       INCBIN "gfx/pics/elekid/back.6x6.2bpp.lz"
 CelebiBackpic:       INCBIN "gfx/pics/celebi/back.6x6.2bpp.lz"
 KrabbyBackpic:       INCBIN "gfx/pics/krabby/back.6x6.2bpp.lz"
-BugCatcherPic:       INCBIN "gfx/trainers/035.7x7.2bpp.lz"
+BugCatcherPic:       INCBIN "gfx/trainers/bug_catcher.7x7.2bpp.lz"
 SnorlaxBackpic:      INCBIN "gfx/pics/snorlax/back.6x6.2bpp.lz"
 ; 14bffb
 
@@ -353,7 +353,7 @@ LarvitarFrontpic:    INCBIN "gfx/pics/larvitar/front.5x5.2bpp.lz"
 TyranitarBackpic:    INCBIN "gfx/pics/tyranitar/back.6x6.2bpp.lz"
 SandslashBackpic:    INCBIN "gfx/pics/sandslash/back.6x6.2bpp.lz"
 SeadraBackpic:       INCBIN "gfx/pics/seadra/back.6x6.2bpp.lz"
-TwinsPic:            INCBIN "gfx/trainers/060.7x7.2bpp.lz"
+TwinsPic:            INCBIN "gfx/trainers/twins.7x7.2bpp.lz"
 FarfetchDBackpic:    INCBIN "gfx/pics/farfetch_d/back.6x6.2bpp.lz"
 NidoranMBackpic:     INCBIN "gfx/pics/nidoran_m/back.6x6.2bpp.lz"
 LedybaBackpic:       INCBIN "gfx/pics/ledyba/back.6x6.2bpp.lz"
@@ -369,13 +369,13 @@ HypnoBackpic:        INCBIN "gfx/pics/hypno/back.6x6.2bpp.lz"
 QuilavaBackpic:      INCBIN "gfx/pics/quilava/back.6x6.2bpp.lz"
 CroconawBackpic:     INCBIN "gfx/pics/croconaw/back.6x6.2bpp.lz"
 SandshrewBackpic:    INCBIN "gfx/pics/sandshrew/back.6x6.2bpp.lz"
-SailorPic:           INCBIN "gfx/trainers/039.7x7.2bpp.lz"
-BeautyPic:           INCBIN "gfx/trainers/028.7x7.2bpp.lz"
+SailorPic:           INCBIN "gfx/trainers/sailor.7x7.2bpp.lz"
+BeautyPic:           INCBIN "gfx/trainers/beauty.7x7.2bpp.lz"
 ShellderBackpic:     INCBIN "gfx/pics/shellder/back.6x6.2bpp.lz"
 ZubatBackpic:        INCBIN "gfx/pics/zubat/back.6x6.2bpp.lz"
 TeddiursaFrontpic:   INCBIN "gfx/pics/teddiursa/front.5x5.2bpp.lz"
 CuboneBackpic:       INCBIN "gfx/pics/cubone/back.6x6.2bpp.lz"
-GruntmPic:           INCBIN "gfx/trainers/030.7x7.2bpp.lz"
+GruntmPic:           INCBIN "gfx/trainers/grunt_m.7x7.2bpp.lz"
 GloomBackpic:        INCBIN "gfx/pics/gloom/back.6x6.2bpp.lz"
 MagcargoBackpic:     INCBIN "gfx/pics/magcargo/back.6x6.2bpp.lz"
 KabutopsBackpic:     INCBIN "gfx/pics/kabutops/back.6x6.2bpp.lz"
@@ -392,7 +392,7 @@ SECTION "Pics 13", ROMX, BANK[PICS_13]
 
 OmanyteBackpic:      INCBIN "gfx/pics/omanyte/back.6x6.2bpp.lz"
 PidgeyBackpic:       INCBIN "gfx/pics/pidgey/back.6x6.2bpp.lz"
-ScientistPic:        INCBIN "gfx/trainers/019.7x7.2bpp.lz"
+ScientistPic:        INCBIN "gfx/trainers/scientist.7x7.2bpp.lz"
 QwilfishBackpic:     INCBIN "gfx/pics/qwilfish/back.6x6.2bpp.lz"
 GligarBackpic:       INCBIN "gfx/pics/gligar/back.6x6.2bpp.lz"
 TyphlosionBackpic:   INCBIN "gfx/pics/typhlosion/back.6x6.2bpp.lz"
@@ -407,8 +407,8 @@ UnownDFrontpic:      INCBIN "gfx/pics/unown_d/front.5x5.2bpp.lz"
 MiltankBackpic:      INCBIN "gfx/pics/miltank/back.6x6.2bpp.lz"
 SteelixBackpic:      INCBIN "gfx/pics/steelix/back.6x6.2bpp.lz"
 PersianBackpic:      INCBIN "gfx/pics/persian/back.6x6.2bpp.lz"
-LtSurgePic:          INCBIN "gfx/trainers/018.7x7.2bpp.lz"
-TeacherPic:          INCBIN "gfx/trainers/033.7x7.2bpp.lz"
+LtSurgePic:          INCBIN "gfx/trainers/lt_surge.7x7.2bpp.lz"
+TeacherPic:          INCBIN "gfx/trainers/teacher.7x7.2bpp.lz"
 EggPic:              INCBIN "gfx/pics/egg/front.5x5.2bpp.lz"
 EeveeBackpic:        INCBIN "gfx/pics/eevee/back.6x6.2bpp.lz"
 ShuckleFrontpic:     INCBIN "gfx/pics/shuckle/front.5x5.2bpp.lz"
@@ -417,21 +417,21 @@ RemoraidFrontpic:    INCBIN "gfx/pics/remoraid/front.5x5.2bpp.lz"
 PoliwagFrontpic:     INCBIN "gfx/pics/poliwag/front.5x5.2bpp.lz"
 OnixBackpic:         INCBIN "gfx/pics/onix/back.6x6.2bpp.lz"
 KoffingBackpic:      INCBIN "gfx/pics/koffing/back.6x6.2bpp.lz"
-BirdKeeperPic:       INCBIN "gfx/trainers/023.7x7.2bpp.lz"
-FalknerPic:          INCBIN "gfx/trainers/000.7x7.2bpp.lz"
-KarenPic:            INCBIN "gfx/trainers/013.7x7.2bpp.lz"
+BirdKeeperPic:       INCBIN "gfx/trainers/bird_keeper.7x7.2bpp.lz"
+FalknerPic:          INCBIN "gfx/trainers/falkner.7x7.2bpp.lz"
+KarenPic:            INCBIN "gfx/trainers/karen.7x7.2bpp.lz"
 NidorinaBackpic:     INCBIN "gfx/pics/nidorina/back.6x6.2bpp.lz"
 TentacruelBackpic:   INCBIN "gfx/pics/tentacruel/back.6x6.2bpp.lz"
 GrowlitheBackpic:    INCBIN "gfx/pics/growlithe/back.6x6.2bpp.lz"
-KogaPic:             INCBIN "gfx/trainers/014.7x7.2bpp.lz"
+KogaPic:             INCBIN "gfx/trainers/koga.7x7.2bpp.lz"
 MachokeBackpic:      INCBIN "gfx/pics/machoke/back.6x6.2bpp.lz"
 RaichuBackpic:       INCBIN "gfx/pics/raichu/back.6x6.2bpp.lz"
 PoliwrathBackpic:    INCBIN "gfx/pics/poliwrath/back.6x6.2bpp.lz"
-SwimmermPic:         INCBIN "gfx/trainers/037.7x7.2bpp.lz"
+SwimmermPic:         INCBIN "gfx/trainers/swimmer_m.7x7.2bpp.lz"
 SunkernFrontpic:     INCBIN "gfx/pics/sunkern/front.5x5.2bpp.lz"
 NidorinoBackpic:     INCBIN "gfx/pics/nidorino/back.6x6.2bpp.lz"
-MysticalmanPic:      INCBIN "gfx/trainers/066.7x7.2bpp.lz"
-CooltrainerfPic:     INCBIN "gfx/trainers/027.7x7.2bpp.lz"
+MysticalmanPic:      INCBIN "gfx/trainers/mysticalman.7x7.2bpp.lz"
+CooltrainerfPic:     INCBIN "gfx/trainers/cooltrainer_f.7x7.2bpp.lz"
 ElectrodeFrontpic:   INCBIN "gfx/pics/electrode/front.5x5.2bpp.lz"
 ; 153fe3
 
@@ -442,14 +442,14 @@ SudowoodoBackpic:    INCBIN "gfx/pics/sudowoodo/back.6x6.2bpp.lz"
 FlaaffyBackpic:      INCBIN "gfx/pics/flaaffy/back.6x6.2bpp.lz"
 SentretFrontpic:     INCBIN "gfx/pics/sentret/front.6x6.2bpp.lz"
 TogeticBackpic:      INCBIN "gfx/pics/togetic/back.6x6.2bpp.lz"
-BugsyPic:            INCBIN "gfx/trainers/002.7x7.2bpp.lz"
+BugsyPic:            INCBIN "gfx/trainers/bugsy.7x7.2bpp.lz"
 MarowakBackpic:      INCBIN "gfx/pics/marowak/back.6x6.2bpp.lz"
 GeodudeBackpic:      INCBIN "gfx/pics/geodude/back.6x6.2bpp.lz"
 ScytherBackpic:      INCBIN "gfx/pics/scyther/back.6x6.2bpp.lz"
 VileplumeBackpic:    INCBIN "gfx/pics/vileplume/back.6x6.2bpp.lz"
 HitmonchanBackpic:   INCBIN "gfx/pics/hitmonchan/back.6x6.2bpp.lz"
 JumpluffBackpic:     INCBIN "gfx/pics/jumpluff/back.6x6.2bpp.lz"
-CooltrainermPic:     INCBIN "gfx/trainers/026.7x7.2bpp.lz"
+CooltrainermPic:     INCBIN "gfx/trainers/cooltrainer_m.7x7.2bpp.lz"
 BlastoiseBackpic:    INCBIN "gfx/pics/blastoise/back.6x6.2bpp.lz"
 MisdreavusBackpic:   INCBIN "gfx/pics/misdreavus/back.6x6.2bpp.lz"
 TyrogueBackpic:      INCBIN "gfx/pics/tyrogue/back.6x6.2bpp.lz"
@@ -469,7 +469,7 @@ RaticateBackpic:     INCBIN "gfx/pics/raticate/back.6x6.2bpp.lz"
 VulpixBackpic:       INCBIN "gfx/pics/vulpix/back.6x6.2bpp.lz"
 EkansBackpic:        INCBIN "gfx/pics/ekans/back.6x6.2bpp.lz"
 SeakingBackpic:      INCBIN "gfx/pics/seaking/back.6x6.2bpp.lz"
-BurglarPic:          INCBIN "gfx/trainers/046.7x7.2bpp.lz"
+BurglarPic:          INCBIN "gfx/trainers/burglar.7x7.2bpp.lz"
 PsyduckBackpic:      INCBIN "gfx/pics/psyduck/back.6x6.2bpp.lz"
 PikachuBackpic:      INCBIN "gfx/pics/pikachu/back.6x6.2bpp.lz"
 KabutoFrontpic:      INCBIN "gfx/pics/kabuto/front.5x5.2bpp.lz"
@@ -477,12 +477,12 @@ MareepBackpic:       INCBIN "gfx/pics/mareep/back.6x6.2bpp.lz"
 RemoraidBackpic:     INCBIN "gfx/pics/remoraid/back.6x6.2bpp.lz"
 DittoFrontpic:       INCBIN "gfx/pics/ditto/front.5x5.2bpp.lz"
 KingdraBackpic:      INCBIN "gfx/pics/kingdra/back.6x6.2bpp.lz"
-CamperPic:           INCBIN "gfx/trainers/053.7x7.2bpp.lz"
+CamperPic:           INCBIN "gfx/trainers/camper.7x7.2bpp.lz"
 WooperFrontpic:      INCBIN "gfx/pics/wooper/front.5x5.2bpp.lz"
 ClefairyBackpic:     INCBIN "gfx/pics/clefairy/back.6x6.2bpp.lz"
 VenonatBackpic:      INCBIN "gfx/pics/venonat/back.6x6.2bpp.lz"
 BellossomBackpic:    INCBIN "gfx/pics/bellossom/back.6x6.2bpp.lz"
-Rival1Pic:           INCBIN "gfx/trainers/008.7x7.2bpp.lz"
+Rival1Pic:           INCBIN "gfx/trainers/rival1.7x7.2bpp.lz"
 SwinubBackpic:       INCBIN "gfx/pics/swinub/back.6x6.2bpp.lz"
 ; 158000
 
@@ -490,14 +490,14 @@ SwinubBackpic:       INCBIN "gfx/pics/swinub/back.6x6.2bpp.lz"
 SECTION "Pics 15", ROMX, BANK[PICS_15]
 
 MewtwoBackpic:       INCBIN "gfx/pics/mewtwo/back.6x6.2bpp.lz"
-PokemonProfPic:      INCBIN "gfx/trainers/009.7x7.2bpp.lz"
-CalPic:              INCBIN "gfx/trainers/011.7x7.2bpp.lz"
-SwimmerfPic:         INCBIN "gfx/trainers/038.7x7.2bpp.lz"
+PokemonProfPic:      INCBIN "gfx/trainers/oak.7x7.2bpp.lz"
+CalPic:              INCBIN "gfx/trainers/cal.7x7.2bpp.lz"
+SwimmerfPic:         INCBIN "gfx/trainers/swimmer_f.7x7.2bpp.lz"
 DiglettFrontpic:     INCBIN "gfx/pics/diglett/front.5x5.2bpp.lz"
-OfficerPic:          INCBIN "gfx/trainers/064.7x7.2bpp.lz"
+OfficerPic:          INCBIN "gfx/trainers/officer.7x7.2bpp.lz"
 MukBackpic:          INCBIN "gfx/pics/muk/back.6x6.2bpp.lz"
 DelibirdBackpic:     INCBIN "gfx/pics/delibird/back.6x6.2bpp.lz"
-SabrinaPic:          INCBIN "gfx/trainers/034.7x7.2bpp.lz"
+SabrinaPic:          INCBIN "gfx/trainers/sabrina.7x7.2bpp.lz"
 MagikarpBackpic:     INCBIN "gfx/pics/magikarp/back.6x6.2bpp.lz"
 AriadosBackpic:      INCBIN "gfx/pics/ariados/back.6x6.2bpp.lz"
 SneaselBackpic:      INCBIN "gfx/pics/sneasel/back.6x6.2bpp.lz"
@@ -505,11 +505,11 @@ UmbreonBackpic:      INCBIN "gfx/pics/umbreon/back.6x6.2bpp.lz"
 MurkrowBackpic:      INCBIN "gfx/pics/murkrow/back.6x6.2bpp.lz"
 IvysaurBackpic:      INCBIN "gfx/pics/ivysaur/back.6x6.2bpp.lz"
 SlowbroBackpic:      INCBIN "gfx/pics/slowbro/back.6x6.2bpp.lz"
-PsychicTPic:         INCBIN "gfx/trainers/051.7x7.2bpp.lz"
+PsychicTPic:         INCBIN "gfx/trainers/psychic_t.7x7.2bpp.lz"
 GolduckBackpic:      INCBIN "gfx/pics/golduck/back.6x6.2bpp.lz"
 WeezingBackpic:      INCBIN "gfx/pics/weezing/back.6x6.2bpp.lz"
 EnteiBackpic:        INCBIN "gfx/pics/entei/back.6x6.2bpp.lz"
-GruntfPic:           INCBIN "gfx/trainers/065.7x7.2bpp.lz"
+GruntfPic:           INCBIN "gfx/trainers/grunt_f.7x7.2bpp.lz"
 HorseaFrontpic:      INCBIN "gfx/pics/horsea/front.5x5.2bpp.lz"
 PidgeotBackpic:      INCBIN "gfx/pics/pidgeot/back.6x6.2bpp.lz"
 HoOhBackpic:         INCBIN "gfx/pics/ho_oh/back.6x6.2bpp.lz"
@@ -531,12 +531,12 @@ SnubbullBackpic:     INCBIN "gfx/pics/snubbull/back.6x6.2bpp.lz"
 KinglerBackpic:      INCBIN "gfx/pics/kingler/back.6x6.2bpp.lz"
 GengarBackpic:       INCBIN "gfx/pics/gengar/back.6x6.2bpp.lz"
 RattataBackpic:      INCBIN "gfx/pics/rattata/back.6x6.2bpp.lz"
-YoungsterPic:        INCBIN "gfx/trainers/021.7x7.2bpp.lz"
-WillPic:             INCBIN "gfx/trainers/010.7x7.2bpp.lz"
-SchoolboyPic:        INCBIN "gfx/trainers/022.7x7.2bpp.lz"
+YoungsterPic:        INCBIN "gfx/trainers/youngster.7x7.2bpp.lz"
+WillPic:             INCBIN "gfx/trainers/will.7x7.2bpp.lz"
+SchoolboyPic:        INCBIN "gfx/trainers/schoolboy.7x7.2bpp.lz"
 MagnemiteFrontpic:   INCBIN "gfx/pics/magnemite/front.5x5.2bpp.lz"
-ErikaPic:            INCBIN "gfx/trainers/020.7x7.2bpp.lz"
-JaninePic:           INCBIN "gfx/trainers/025.7x7.2bpp.lz"
+ErikaPic:            INCBIN "gfx/trainers/erika.7x7.2bpp.lz"
+JaninePic:           INCBIN "gfx/trainers/janine.7x7.2bpp.lz"
 MagnemiteBackpic:    INCBIN "gfx/pics/magnemite/back.6x6.2bpp.lz"
 ; 15bffa
 
@@ -545,33 +545,33 @@ SECTION "Pics 16", ROMX, BANK[PICS_16]
 
 HoothootBackpic:     INCBIN "gfx/pics/hoothoot/back.6x6.2bpp.lz"
 NoctowlBackpic:      INCBIN "gfx/pics/noctowl/back.6x6.2bpp.lz"
-MortyPic:            INCBIN "gfx/trainers/003.7x7.2bpp.lz"
+MortyPic:            INCBIN "gfx/trainers/morty.7x7.2bpp.lz"
 SlugmaBackpic:       INCBIN "gfx/pics/slugma/back.6x6.2bpp.lz"
 KabutoBackpic:       INCBIN "gfx/pics/kabuto/back.6x6.2bpp.lz"
 VictreebelBackpic:   INCBIN "gfx/pics/victreebel/back.6x6.2bpp.lz"
 MeowthBackpic:       INCBIN "gfx/pics/meowth/back.6x6.2bpp.lz"
 MeganiumBackpic:     INCBIN "gfx/pics/meganium/back.6x6.2bpp.lz"
-PicnickerPic:        INCBIN "gfx/trainers/052.7x7.2bpp.lz"
+PicnickerPic:        INCBIN "gfx/trainers/picnicker.7x7.2bpp.lz"
 LickitungBackpic:    INCBIN "gfx/pics/lickitung/back.6x6.2bpp.lz"
 TogepiFrontpic:      INCBIN "gfx/pics/togepi/front.5x5.2bpp.lz"
-SuperNerdPic:        INCBIN "gfx/trainers/040.7x7.2bpp.lz"
+SuperNerdPic:        INCBIN "gfx/trainers/super_nerd.7x7.2bpp.lz"
 HaunterBackpic:      INCBIN "gfx/pics/haunter/back.6x6.2bpp.lz"
 XatuBackpic:         INCBIN "gfx/pics/xatu/back.6x6.2bpp.lz"
-RedPic:              INCBIN "gfx/trainers/062.7x7.2bpp.lz"
+RedPic:              INCBIN "gfx/trainers/red.7x7.2bpp.lz"
 Porygon2Backpic:     INCBIN "gfx/pics/porygon2/back.6x6.2bpp.lz"
-JasminePic:          INCBIN "gfx/trainers/005.7x7.2bpp.lz"
+JasminePic:          INCBIN "gfx/trainers/jasmine.7x7.2bpp.lz"
 PinecoBackpic:       INCBIN "gfx/pics/pineco/back.6x6.2bpp.lz"
 MetapodFrontpic:     INCBIN "gfx/pics/metapod/front.5x5.2bpp.lz"
 SeelBackpic:         INCBIN "gfx/pics/seel/back.6x6.2bpp.lz"
 QuagsireBackpic:     INCBIN "gfx/pics/quagsire/back.6x6.2bpp.lz"
-WhitneyPic:          INCBIN "gfx/trainers/001.7x7.2bpp.lz"
+WhitneyPic:          INCBIN "gfx/trainers/whitney.7x7.2bpp.lz"
 JolteonBackpic:      INCBIN "gfx/pics/jolteon/back.6x6.2bpp.lz"
 CaterpieFrontpic:    INCBIN "gfx/pics/caterpie/front.5x5.2bpp.lz"
 HoppipBackpic:       INCBIN "gfx/pics/hoppip/back.6x6.2bpp.lz"
-BluePic:             INCBIN "gfx/trainers/063.7x7.2bpp.lz"
+BluePic:             INCBIN "gfx/trainers/blue.7x7.2bpp.lz"
 GranbullBackpic:     INCBIN "gfx/pics/granbull/back.6x6.2bpp.lz"
-GentlemanPic:        INCBIN "gfx/trainers/031.7x7.2bpp.lz"
-ExecutivemPic:       INCBIN "gfx/trainers/050.7x7.2bpp.lz"
+GentlemanPic:        INCBIN "gfx/trainers/gentleman.7x7.2bpp.lz"
+ExecutivemPic:       INCBIN "gfx/trainers/executive_m.7x7.2bpp.lz"
 SpearowBackpic:      INCBIN "gfx/pics/spearow/back.6x6.2bpp.lz"
 SunkernBackpic:      INCBIN "gfx/pics/sunkern/back.6x6.2bpp.lz"
 LaprasBackpic:       INCBIN "gfx/pics/lapras/back.6x6.2bpp.lz"
@@ -584,13 +584,13 @@ ChinchouBackpic:     INCBIN "gfx/pics/chinchou/back.6x6.2bpp.lz"
 ChanseyBackpic:      INCBIN "gfx/pics/chansey/back.6x6.2bpp.lz"
 SkiploomBackpic:     INCBIN "gfx/pics/skiploom/back.6x6.2bpp.lz"
 SpinarakFrontpic:    INCBIN "gfx/pics/spinarak/front.5x5.2bpp.lz"
-Rival2Pic:           INCBIN "gfx/trainers/041.7x7.2bpp.lz"
+Rival2Pic:           INCBIN "gfx/trainers/rival2.7x7.2bpp.lz"
 UnownWFrontpic:      INCBIN "gfx/pics/unown_w/front.5x5.2bpp.lz"
 CharmanderBackpic:   INCBIN "gfx/pics/charmander/back.6x6.2bpp.lz"
 RhyhornBackpic:      INCBIN "gfx/pics/rhyhorn/back.6x6.2bpp.lz"
 UnownCFrontpic:      INCBIN "gfx/pics/unown_c/front.5x5.2bpp.lz"
-MistyPic:            INCBIN "gfx/trainers/017.7x7.2bpp.lz"
-BlainePic:           INCBIN "gfx/trainers/045.7x7.2bpp.lz"
+MistyPic:            INCBIN "gfx/trainers/misty.7x7.2bpp.lz"
+BlainePic:           INCBIN "gfx/trainers/blaine.7x7.2bpp.lz"
 UnownZFrontpic:      INCBIN "gfx/pics/unown_z/front.5x5.2bpp.lz"
 SwinubFrontpic:      INCBIN "gfx/pics/swinub/front.5x5.2bpp.lz"
 LarvitarBackpic:     INCBIN "gfx/pics/larvitar/back.6x6.2bpp.lz"
@@ -604,7 +604,7 @@ SECTION "Pics 17", ROMX, BANK[PICS_17]
 ParasBackpic:        INCBIN "gfx/pics/paras/back.6x6.2bpp.lz"
 VaporeonBackpic:     INCBIN "gfx/pics/vaporeon/back.6x6.2bpp.lz"
 TentacoolBackpic:    INCBIN "gfx/pics/tentacool/back.6x6.2bpp.lz"
-ExecutivefPic:       INCBIN "gfx/trainers/054.7x7.2bpp.lz"
+ExecutivefPic:       INCBIN "gfx/trainers/executive_f.7x7.2bpp.lz"
 BulbasaurBackpic:    INCBIN "gfx/pics/bulbasaur/back.6x6.2bpp.lz"
 SmoochumBackpic:     INCBIN "gfx/pics/smoochum/back.6x6.2bpp.lz"
 PichuBackpic:        INCBIN "gfx/pics/pichu/back.6x6.2bpp.lz"
@@ -618,8 +618,8 @@ MrMimeBackpic:       INCBIN "gfx/pics/mr__mime/back.6x6.2bpp.lz"
 CaterpieBackpic:     INCBIN "gfx/pics/caterpie/back.6x6.2bpp.lz"
 VoltorbFrontpic:     INCBIN "gfx/pics/voltorb/front.5x5.2bpp.lz"
 LugiaBackpic:        INCBIN "gfx/pics/lugia/back.6x6.2bpp.lz"
-PrycePic:            INCBIN "gfx/trainers/004.7x7.2bpp.lz"
-BrockPic:            INCBIN "gfx/trainers/016.7x7.2bpp.lz"
+PrycePic:            INCBIN "gfx/trainers/pryce.7x7.2bpp.lz"
+BrockPic:            INCBIN "gfx/trainers/brock.7x7.2bpp.lz"
 UnownGFrontpic:      INCBIN "gfx/pics/unown_g/front.5x5.2bpp.lz"
 ArbokBackpic:        INCBIN "gfx/pics/arbok/back.6x6.2bpp.lz"
 PolitoedBackpic:     INCBIN "gfx/pics/politoed/back.6x6.2bpp.lz"
@@ -627,7 +627,7 @@ DragoniteBackpic:    INCBIN "gfx/pics/dragonite/back.6x6.2bpp.lz"
 HitmonleeBackpic:    INCBIN "gfx/pics/hitmonlee/back.6x6.2bpp.lz"
 NatuFrontpic:        INCBIN "gfx/pics/natu/front.5x5.2bpp.lz"
 UrsaringBackpic:     INCBIN "gfx/pics/ursaring/back.6x6.2bpp.lz"
-SagePic:             INCBIN "gfx/trainers/055.7x7.2bpp.lz"
+SagePic:             INCBIN "gfx/trainers/sage.7x7.2bpp.lz"
 TeddiursaBackpic:    INCBIN "gfx/pics/teddiursa/back.6x6.2bpp.lz"
 PhanpyBackpic:       INCBIN "gfx/pics/phanpy/back.6x6.2bpp.lz"
 UnownVFrontpic:      INCBIN "gfx/pics/unown_v/front.5x5.2bpp.lz"