68 files changed, 67 insertions, 67 deletions
diff --git a/gfx/trainers/lz/000.lz b/gfx/trainers/000.lz
index 323587e3a..323587e3a 100644
--- a/gfx/trainers/lz/000.lz
+++ b/gfx/trainers/000.lz
diff --git a/gfx/trainers/lz/001.lz b/gfx/trainers/001.lz
index 9564767a8..9564767a8 100644
--- a/gfx/trainers/lz/001.lz
+++ b/gfx/trainers/001.lz
diff --git a/gfx/trainers/lz/002.lz b/gfx/trainers/002.lz
index 7910628aa..7910628aa 100644
--- a/gfx/trainers/lz/002.lz
+++ b/gfx/trainers/002.lz
diff --git a/gfx/trainers/lz/003.lz b/gfx/trainers/003.lz
index 67999aeb8..67999aeb8 100644
--- a/gfx/trainers/lz/003.lz
+++ b/gfx/trainers/003.lz
diff --git a/gfx/trainers/lz/004.lz b/gfx/trainers/004.lz
index ca69273e0..ca69273e0 100644
--- a/gfx/trainers/lz/004.lz
+++ b/gfx/trainers/004.lz
diff --git a/gfx/trainers/lz/005.lz b/gfx/trainers/005.lz
index 7c08ded94..7c08ded94 100644
--- a/gfx/trainers/lz/005.lz
+++ b/gfx/trainers/005.lz
diff --git a/gfx/trainers/lz/006.lz b/gfx/trainers/006.lz
index 0a92c7074..0a92c7074 100644
--- a/gfx/trainers/lz/006.lz
+++ b/gfx/trainers/006.lz
diff --git a/gfx/trainers/lz/007.lz b/gfx/trainers/007.lz
index bbc463594..bbc463594 100644
--- a/gfx/trainers/lz/007.lz
+++ b/gfx/trainers/007.lz
diff --git a/gfx/trainers/lz/008.lz b/gfx/trainers/008.lz
index 9a5b99abc..9a5b99abc 100644
--- a/gfx/trainers/lz/008.lz
+++ b/gfx/trainers/008.lz
diff --git a/gfx/trainers/lz/009.lz b/gfx/trainers/009.lz
index 276f7c533..276f7c533 100644
--- a/gfx/trainers/lz/009.lz
+++ b/gfx/trainers/009.lz
diff --git a/gfx/trainers/lz/010.lz b/gfx/trainers/010.lz
index 3de211cd4..3de211cd4 100644
--- a/gfx/trainers/lz/010.lz
+++ b/gfx/trainers/010.lz
diff --git a/gfx/trainers/lz/011.lz b/gfx/trainers/011.lz
index f7d3570ae..f7d3570ae 100644
--- a/gfx/trainers/lz/011.lz
+++ b/gfx/trainers/011.lz
diff --git a/gfx/trainers/lz/012.lz b/gfx/trainers/012.lz
index 69406d11d..69406d11d 100644
--- a/gfx/trainers/lz/012.lz
+++ b/gfx/trainers/012.lz
diff --git a/gfx/trainers/lz/013.lz b/gfx/trainers/013.lz
index a0bd871f7..a0bd871f7 100644
--- a/gfx/trainers/lz/013.lz
+++ b/gfx/trainers/013.lz
diff --git a/gfx/trainers/lz/014.lz b/gfx/trainers/014.lz
index bc4501f08..bc4501f08 100644
--- a/gfx/trainers/lz/014.lz
+++ b/gfx/trainers/014.lz
diff --git a/gfx/trainers/lz/015.lz b/gfx/trainers/015.lz
index c5840a676..c5840a676 100644
--- a/gfx/trainers/lz/015.lz
+++ b/gfx/trainers/015.lz
diff --git a/gfx/trainers/lz/016.lz b/gfx/trainers/016.lz
index d7a4e29bf..d7a4e29bf 100644
--- a/gfx/trainers/lz/016.lz
+++ b/gfx/trainers/016.lz
diff --git a/gfx/trainers/lz/017.lz b/gfx/trainers/017.lz
index 1a96cdddd..1a96cdddd 100644
--- a/gfx/trainers/lz/017.lz
+++ b/gfx/trainers/017.lz
diff --git a/gfx/trainers/lz/018.lz b/gfx/trainers/018.lz
index 9a3df5d3f..9a3df5d3f 100644
--- a/gfx/trainers/lz/018.lz
+++ b/gfx/trainers/018.lz
diff --git a/gfx/trainers/lz/019.lz b/gfx/trainers/019.lz
index 033f421b5..033f421b5 100644
--- a/gfx/trainers/lz/019.lz
+++ b/gfx/trainers/019.lz
diff --git a/gfx/trainers/lz/020.lz b/gfx/trainers/020.lz
index 963363d26..963363d26 100644
--- a/gfx/trainers/lz/020.lz
+++ b/gfx/trainers/020.lz
diff --git a/gfx/trainers/lz/021.lz b/gfx/trainers/021.lz
index ec742f9f3..ec742f9f3 100644
--- a/gfx/trainers/lz/021.lz
+++ b/gfx/trainers/021.lz
diff --git a/gfx/trainers/lz/022.lz b/gfx/trainers/022.lz
index 7d9bd00a3..7d9bd00a3 100644
--- a/gfx/trainers/lz/022.lz
+++ b/gfx/trainers/022.lz
diff --git a/gfx/trainers/lz/023.lz b/gfx/trainers/023.lz
index 48b505847..48b505847 100644
--- a/gfx/trainers/lz/023.lz
+++ b/gfx/trainers/023.lz
diff --git a/gfx/trainers/lz/024.lz b/gfx/trainers/024.lz
index 0c7cffa79..0c7cffa79 100644
--- a/gfx/trainers/lz/024.lz
+++ b/gfx/trainers/024.lz
diff --git a/gfx/trainers/lz/025.lz b/gfx/trainers/025.lz
index d6249eba3..d6249eba3 100644
--- a/gfx/trainers/lz/025.lz
+++ b/gfx/trainers/025.lz
diff --git a/gfx/trainers/lz/026.lz b/gfx/trainers/026.lz
index 93dad0319..93dad0319 100644
--- a/gfx/trainers/lz/026.lz
+++ b/gfx/trainers/026.lz
diff --git a/gfx/trainers/lz/027.lz b/gfx/trainers/027.lz
index cb41d74ee..cb41d74ee 100644
--- a/gfx/trainers/lz/027.lz
+++ b/gfx/trainers/027.lz
diff --git a/gfx/trainers/lz/028.lz b/gfx/trainers/028.lz
index 8c5d30ee6..8c5d30ee6 100644
--- a/gfx/trainers/lz/028.lz
+++ b/gfx/trainers/028.lz
diff --git a/gfx/trainers/lz/029.lz b/gfx/trainers/029.lz
index 78fb417f4..78fb417f4 100644
--- a/gfx/trainers/lz/029.lz
+++ b/gfx/trainers/029.lz
diff --git a/gfx/trainers/lz/030.lz b/gfx/trainers/030.lz
index 5ac5597b0..5ac5597b0 100644
--- a/gfx/trainers/lz/030.lz
+++ b/gfx/trainers/030.lz
diff --git a/gfx/trainers/lz/031.lz b/gfx/trainers/031.lz
index 153720e71..153720e71 100644
--- a/gfx/trainers/lz/031.lz
+++ b/gfx/trainers/031.lz
diff --git a/gfx/trainers/lz/032.lz b/gfx/trainers/032.lz
index 42be70abe..42be70abe 100644
--- a/gfx/trainers/lz/032.lz
+++ b/gfx/trainers/032.lz
diff --git a/gfx/trainers/lz/033.lz b/gfx/trainers/033.lz
index 92151f891..92151f891 100644
--- a/gfx/trainers/lz/033.lz
+++ b/gfx/trainers/033.lz
diff --git a/gfx/trainers/lz/034.lz b/gfx/trainers/034.lz
index bee6dd0e9..bee6dd0e9 100644
--- a/gfx/trainers/lz/034.lz
+++ b/gfx/trainers/034.lz
diff --git a/gfx/trainers/lz/035.lz b/gfx/trainers/035.lz
index cea17dbac..cea17dbac 100644
--- a/gfx/trainers/lz/035.lz
+++ b/gfx/trainers/035.lz
diff --git a/gfx/trainers/lz/036.lz b/gfx/trainers/036.lz
index b210aeda1..b210aeda1 100644
--- a/gfx/trainers/lz/036.lz
+++ b/gfx/trainers/036.lz
diff --git a/gfx/trainers/lz/037.lz b/gfx/trainers/037.lz
index b162cadca..b162cadca 100644
--- a/gfx/trainers/lz/037.lz
+++ b/gfx/trainers/037.lz
diff --git a/gfx/trainers/lz/038.lz b/gfx/trainers/038.lz
index 3f27a6d42..3f27a6d42 100644
--- a/gfx/trainers/lz/038.lz
+++ b/gfx/trainers/038.lz
diff --git a/gfx/trainers/lz/039.lz b/gfx/trainers/039.lz
index 425667a73..425667a73 100644
--- a/gfx/trainers/lz/039.lz
+++ b/gfx/trainers/039.lz
diff --git a/gfx/trainers/lz/040.lz b/gfx/trainers/040.lz
index dbdb4ca46..dbdb4ca46 100644
--- a/gfx/trainers/lz/040.lz
+++ b/gfx/trainers/040.lz
diff --git a/gfx/trainers/lz/041.lz b/gfx/trainers/041.lz
index 683ec66bb..683ec66bb 100644
--- a/gfx/trainers/lz/041.lz
+++ b/gfx/trainers/041.lz
diff --git a/gfx/trainers/lz/042.lz b/gfx/trainers/042.lz
index d67e6ea98..d67e6ea98 100644
--- a/gfx/trainers/lz/042.lz
+++ b/gfx/trainers/042.lz
diff --git a/gfx/trainers/lz/043.lz b/gfx/trainers/043.lz
index c7cecda28..c7cecda28 100644
--- a/gfx/trainers/lz/043.lz
+++ b/gfx/trainers/043.lz
diff --git a/gfx/trainers/lz/044.lz b/gfx/trainers/044.lz
index 07ad8621b..07ad8621b 100644
--- a/gfx/trainers/lz/044.lz
+++ b/gfx/trainers/044.lz
diff --git a/gfx/trainers/lz/045.lz b/gfx/trainers/045.lz
index d967bb3ba..d967bb3ba 100644
--- a/gfx/trainers/lz/045.lz
+++ b/gfx/trainers/045.lz
diff --git a/gfx/trainers/lz/046.lz b/gfx/trainers/046.lz
index 45da954d9..45da954d9 100644
--- a/gfx/trainers/lz/046.lz
+++ b/gfx/trainers/046.lz
diff --git a/gfx/trainers/lz/047.lz b/gfx/trainers/047.lz
index a0f853a9d..a0f853a9d 100644
--- a/gfx/trainers/lz/047.lz
+++ b/gfx/trainers/047.lz
diff --git a/gfx/trainers/lz/048.lz b/gfx/trainers/048.lz
index d64ed1f0b..d64ed1f0b 100644
--- a/gfx/trainers/lz/048.lz
+++ b/gfx/trainers/048.lz
diff --git a/gfx/trainers/lz/049.lz b/gfx/trainers/049.lz
index 086b8fc02..086b8fc02 100644
--- a/gfx/trainers/lz/049.lz
+++ b/gfx/trainers/049.lz
diff --git a/gfx/trainers/lz/050.lz b/gfx/trainers/050.lz
index e10b588cc..e10b588cc 100644
--- a/gfx/trainers/lz/050.lz
+++ b/gfx/trainers/050.lz
diff --git a/gfx/trainers/lz/051.lz b/gfx/trainers/051.lz
index c1123a84e..c1123a84e 100644
--- a/gfx/trainers/lz/051.lz
+++ b/gfx/trainers/051.lz
diff --git a/gfx/trainers/lz/052.lz b/gfx/trainers/052.lz
index 81ee09ab7..81ee09ab7 100644
--- a/gfx/trainers/lz/052.lz
+++ b/gfx/trainers/052.lz
diff --git a/gfx/trainers/lz/053.lz b/gfx/trainers/053.lz
index a8963bae7..a8963bae7 100644
--- a/gfx/trainers/lz/053.lz
+++ b/gfx/trainers/053.lz
diff --git a/gfx/trainers/lz/054.lz b/gfx/trainers/054.lz
index b823ddaab..b823ddaab 100644
--- a/gfx/trainers/lz/054.lz
+++ b/gfx/trainers/054.lz
diff --git a/gfx/trainers/lz/055.lz b/gfx/trainers/055.lz
index aff9d4589..aff9d4589 100644
--- a/gfx/trainers/lz/055.lz
+++ b/gfx/trainers/055.lz
diff --git a/gfx/trainers/lz/056.lz b/gfx/trainers/056.lz
index 4aaa71326..4aaa71326 100644
--- a/gfx/trainers/lz/056.lz
+++ b/gfx/trainers/056.lz
diff --git a/gfx/trainers/lz/057.lz b/gfx/trainers/057.lz
index a6dc315d8..a6dc315d8 100644
--- a/gfx/trainers/lz/057.lz
+++ b/gfx/trainers/057.lz
diff --git a/gfx/trainers/lz/058.lz b/gfx/trainers/058.lz
index 25b4a9ff7..25b4a9ff7 100644
--- a/gfx/trainers/lz/058.lz
+++ b/gfx/trainers/058.lz
diff --git a/gfx/trainers/lz/059.lz b/gfx/trainers/059.lz
index 465ccb111..465ccb111 100644
--- a/gfx/trainers/lz/059.lz
+++ b/gfx/trainers/059.lz
diff --git a/gfx/trainers/lz/060.lz b/gfx/trainers/060.lz
index 1bdf29c7d..1bdf29c7d 100644
--- a/gfx/trainers/lz/060.lz
+++ b/gfx/trainers/060.lz
diff --git a/gfx/trainers/lz/061.lz b/gfx/trainers/061.lz
index 2ab555a85..2ab555a85 100644
--- a/gfx/trainers/lz/061.lz
+++ b/gfx/trainers/061.lz
diff --git a/gfx/trainers/lz/062.lz b/gfx/trainers/062.lz
index 15a8dcf88..15a8dcf88 100644
--- a/gfx/trainers/lz/062.lz
+++ b/gfx/trainers/062.lz
diff --git a/gfx/trainers/lz/063.lz b/gfx/trainers/063.lz
index 9d4cb50c6..9d4cb50c6 100644
--- a/gfx/trainers/lz/063.lz
+++ b/gfx/trainers/063.lz
diff --git a/gfx/trainers/lz/064.lz b/gfx/trainers/064.lz
index e3e22f870..e3e22f870 100644
--- a/gfx/trainers/lz/064.lz
+++ b/gfx/trainers/064.lz
diff --git a/gfx/trainers/lz/065.lz b/gfx/trainers/065.lz
index beee0721b..beee0721b 100644
--- a/gfx/trainers/lz/065.lz
+++ b/gfx/trainers/065.lz
diff --git a/gfx/trainers/lz/066.lz b/gfx/trainers/066.lz
index 38296bc91..38296bc91 100644
--- a/gfx/trainers/lz/066.lz
+++ b/gfx/trainers/066.lz
diff --git a/main.asm b/main.asm
index 63a7e00e8..302a5a6ea 100644
--- a/main.asm
+++ b/main.asm
@@ -68259,23 +68259,23 @@ MagbyFrontpic:       INCBIN "gfx/pics/240/front.lz"
 WeepinbellFrontpic:  INCBIN "gfx/pics/070/front.lz"
 TotodileFrontpic:    INCBIN "gfx/pics/158/front.lz"
 CorsolaFrontpic:     INCBIN "gfx/pics/222/front.lz"
-FirebreatherPic:     INCBIN "gfx/trainers/lz/047.lz"
+FirebreatherPic:     INCBIN "gfx/trainers/047.lz"
 MachopFrontpic:      INCBIN "gfx/pics/066/front.lz"
 ChinchouFrontpic:    INCBIN "gfx/pics/170/front.lz"
 RattataFrontpic:     INCBIN "gfx/pics/019/front.lz"
-ChampionPic:         INCBIN "gfx/trainers/lz/015.lz"
+ChampionPic:         INCBIN "gfx/trainers/015.lz"
 SpearowFrontpic:     INCBIN "gfx/pics/021/front.lz"
 MagikarpFrontpic:    INCBIN "gfx/pics/129/front.lz"
 CharmanderFrontpic:  INCBIN "gfx/pics/004/front.lz"
 CuboneFrontpic:      INCBIN "gfx/pics/104/front.lz"
-BlackbeltTPic:       INCBIN "gfx/trainers/lz/049.lz"
-BikerPic:            INCBIN "gfx/trainers/lz/044.lz"
+BlackbeltTPic:       INCBIN "gfx/trainers/049.lz"
+BikerPic:            INCBIN "gfx/trainers/044.lz"
 NidoranMFrontpic:    INCBIN "gfx/pics/032/front.lz"
 PorygonFrontpic:     INCBIN "gfx/pics/137/front.lz"
-BrunoPic:            INCBIN "gfx/trainers/lz/012.lz"
+BrunoPic:            INCBIN "gfx/trainers/012.lz"
 GrimerFrontpic:      INCBIN "gfx/pics/088/front.lz"
 StaryuFrontpic:      INCBIN "gfx/pics/120/front.lz"
-HikerPic:            INCBIN "gfx/trainers/lz/043.lz"
+HikerPic:            INCBIN "gfx/trainers/043.lz"
 MeowthFrontpic:      INCBIN "gfx/pics/052/front.lz"
 Porygon2Frontpic:    INCBIN "gfx/pics/233/front.lz"
 SandshrewFrontpic:   INCBIN "gfx/pics/027/front.lz"
@@ -68293,15 +68293,15 @@ MisdreavusFrontpic:  INCBIN "gfx/pics/200/front.lz"
 HoundourFrontpic:    INCBIN "gfx/pics/228/front.lz"
 MankeyFrontpic:      INCBIN "gfx/pics/056/front.lz"
 CelebiFrontpic:      INCBIN "gfx/pics/251/front.lz"
-MediumPic:           INCBIN "gfx/trainers/lz/056.lz"
+MediumPic:           INCBIN "gfx/trainers/056.lz"
 PinecoFrontpic:      INCBIN "gfx/pics/204/front.lz"
 KrabbyFrontpic:      INCBIN "gfx/pics/098/front.lz"
-FisherPic:           INCBIN "gfx/trainers/lz/036.lz"
+FisherPic:           INCBIN "gfx/trainers/036.lz"
 JigglypuffFrontpic:  INCBIN "gfx/pics/039/front.lz"
 ParasFrontpic:       INCBIN "gfx/pics/046/front.lz"
 NidokingBackpic:     INCBIN "gfx/pics/034/back.lz"
-PokefanmPic:         INCBIN "gfx/trainers/lz/058.lz"
-BoarderPic:          INCBIN "gfx/trainers/lz/057.lz"
+PokefanmPic:         INCBIN "gfx/trainers/058.lz"
+BoarderPic:          INCBIN "gfx/trainers/057.lz"
 PsyduckFrontpic:     INCBIN "gfx/pics/054/front.lz"
 SquirtleFrontpic:    INCBIN "gfx/pics/007/front.lz"
 MachampBackpic:      INCBIN "gfx/pics/068/back.lz"
@@ -68312,11 +68312,11 @@ LanturnFrontpic:     INCBIN "gfx/pics/171/front.lz"
 TyrogueFrontpic:     INCBIN "gfx/pics/236/front.lz"
 SkiploomFrontpic:    INCBIN "gfx/pics/188/front.lz"
 MareepFrontpic:      INCBIN "gfx/pics/179/front.lz"
-ChuckPic:            INCBIN "gfx/trainers/lz/006.lz"
+ChuckPic:            INCBIN "gfx/trainers/006.lz"
 EeveeFrontpic:       INCBIN "gfx/pics/133/front.lz"
 ButterfreeBackpic:   INCBIN "gfx/pics/012/back.lz"
 ZubatFrontpic:       INCBIN "gfx/pics/041/front.lz"
-KimonoGirlPic:       INCBIN "gfx/trainers/lz/059.lz"
+KimonoGirlPic:       INCBIN "gfx/trainers/059.lz"
 AlakazamBackpic:     INCBIN "gfx/pics/065/back.lz"
 AipomFrontpic:       INCBIN "gfx/pics/190/front.lz"
 AbraFrontpic:        INCBIN "gfx/pics/063/front.lz"
@@ -68337,15 +68337,15 @@ SlugmaFrontpic:      INCBIN "gfx/pics/218/front.lz"
 GrowlitheFrontpic:   INCBIN "gfx/pics/058/front.lz"
 SlowpokeFrontpic:    INCBIN "gfx/pics/079/front.lz"
 SmoochumFrontpic:    INCBIN "gfx/pics/238/front.lz"
-JugglerPic:          INCBIN "gfx/trainers/lz/048.lz"
+JugglerPic:          INCBIN "gfx/trainers/048.lz"
 MarillFrontpic:      INCBIN "gfx/pics/183/front.lz"
-GuitaristPic:        INCBIN "gfx/trainers/lz/042.lz"
-PokefanfPic:         INCBIN "gfx/trainers/lz/061.lz"
+GuitaristPic:        INCBIN "gfx/trainers/042.lz"
+PokefanfPic:         INCBIN "gfx/trainers/061.lz"
 VenomothBackpic:     INCBIN "gfx/pics/049/back.lz"
-ClairPic:            INCBIN "gfx/trainers/lz/007.lz"
-PokemaniacPic:       INCBIN "gfx/trainers/lz/029.lz"
+ClairPic:            INCBIN "gfx/trainers/007.lz"
+PokemaniacPic:       INCBIN "gfx/trainers/029.lz"
 OmanyteFrontpic:     INCBIN "gfx/pics/138/front.lz"
-SkierPic:            INCBIN "gfx/trainers/lz/032.lz"
+SkierPic:            INCBIN "gfx/trainers/032.lz"
 PupitarFrontpic:     INCBIN "gfx/pics/247/front.lz"
 BellsproutFrontpic:  INCBIN "gfx/pics/069/front.lz"
 ShellderFrontpic:    INCBIN "gfx/pics/090/front.lz"
@@ -68355,7 +68355,7 @@ GyaradosBackpic:     INCBIN "gfx/pics/130/back.lz"
 NinetalesBackpic:    INCBIN "gfx/pics/038/back.lz"
 YanmaBackpic:        INCBIN "gfx/pics/193/back.lz"
 PinsirBackpic:       INCBIN "gfx/pics/127/back.lz"
-LassPic:             INCBIN "gfx/trainers/lz/024.lz"
+LassPic:             INCBIN "gfx/trainers/024.lz"
 ClefableBackpic:     INCBIN "gfx/pics/036/back.lz"
 DoduoFrontpic:       INCBIN "gfx/pics/084/front.lz"
 FeraligatrBackpic:   INCBIN "gfx/pics/160/back.lz"
@@ -68367,7 +68367,7 @@ SlowkingBackpic:     INCBIN "gfx/pics/199/back.lz"
 ElekidBackpic:       INCBIN "gfx/pics/239/back.lz"
 CelebiBackpic:       INCBIN "gfx/pics/251/back.lz"
 KrabbyBackpic:       INCBIN "gfx/pics/098/back.lz"
-BugCatcherPic:       INCBIN "gfx/trainers/lz/035.lz"
+BugCatcherPic:       INCBIN "gfx/trainers/035.lz"
 SnorlaxBackpic:      INCBIN "gfx/pics/143/back.lz"
 ; 14bffb
 
@@ -68385,7 +68385,7 @@ LarvitarFrontpic:    INCBIN "gfx/pics/246/front.lz"
 TyranitarBackpic:    INCBIN "gfx/pics/248/back.lz"
 SandslashBackpic:    INCBIN "gfx/pics/028/back.lz"
 SeadraBackpic:       INCBIN "gfx/pics/117/back.lz"
-TwinsPic:            INCBIN "gfx/trainers/lz/060.lz"
+TwinsPic:            INCBIN "gfx/trainers/060.lz"
 FarfetchDBackpic:    INCBIN "gfx/pics/083/back.lz"
 NidoranMBackpic:     INCBIN "gfx/pics/032/back.lz"
 LedybaBackpic:       INCBIN "gfx/pics/165/back.lz"
@@ -68401,13 +68401,13 @@ HypnoBackpic:        INCBIN "gfx/pics/097/back.lz"
 QuilavaBackpic:      INCBIN "gfx/pics/156/back.lz"
 CroconawBackpic:     INCBIN "gfx/pics/159/back.lz"
 SandshrewBackpic:    INCBIN "gfx/pics/027/back.lz"
-SailorPic:           INCBIN "gfx/trainers/lz/039.lz"
-BeautyPic:           INCBIN "gfx/trainers/lz/028.lz"
+SailorPic:           INCBIN "gfx/trainers/039.lz"
+BeautyPic:           INCBIN "gfx/trainers/028.lz"
 ShellderBackpic:     INCBIN "gfx/pics/090/back.lz"
 ZubatBackpic:        INCBIN "gfx/pics/041/back.lz"
 TeddiursaFrontpic:   INCBIN "gfx/pics/216/front.lz"
 CuboneBackpic:       INCBIN "gfx/pics/104/back.lz"
-GruntmPic:           INCBIN "gfx/trainers/lz/030.lz"
+GruntmPic:           INCBIN "gfx/trainers/030.lz"
 GloomBackpic:        INCBIN "gfx/pics/044/back.lz"
 MagcargoBackpic:     INCBIN "gfx/pics/219/back.lz"
 KabutopsBackpic:     INCBIN "gfx/pics/141/back.lz"
@@ -68426,7 +68426,7 @@ SECTION "bank54",DATA,BANK[$54]
 
 OmanyteBackpic:      INCBIN "gfx/pics/138/back.lz"
 PidgeyBackpic:       INCBIN "gfx/pics/016/back.lz"
-ScientistPic:        INCBIN "gfx/trainers/lz/019.lz"
+ScientistPic:        INCBIN "gfx/trainers/019.lz"
 QwilfishBackpic:     INCBIN "gfx/pics/211/back.lz"
 GligarBackpic:       INCBIN "gfx/pics/207/back.lz"
 TyphlosionBackpic:   INCBIN "gfx/pics/157/back.lz"
@@ -68441,8 +68441,8 @@ UnownDFrontpic:      INCBIN "gfx/pics/201d/front.lz"
 MiltankBackpic:      INCBIN "gfx/pics/241/back.lz"
 SteelixBackpic:      INCBIN "gfx/pics/208/back.lz"
 PersianBackpic:      INCBIN "gfx/pics/053/back.lz"
-LtSurgePic:          INCBIN "gfx/trainers/lz/018.lz"
-TeacherPic:          INCBIN "gfx/trainers/lz/033.lz"
+LtSurgePic:          INCBIN "gfx/trainers/018.lz"
+TeacherPic:          INCBIN "gfx/trainers/033.lz"
 EggPic:              INCBIN "gfx/pics/egg/front.lz"
 EeveeBackpic:        INCBIN "gfx/pics/133/back.lz"
 ShuckleFrontpic:     INCBIN "gfx/pics/213/front.lz"
@@ -68451,21 +68451,21 @@ RemoraidFrontpic:    INCBIN "gfx/pics/223/front.lz"
 PoliwagFrontpic:     INCBIN "gfx/pics/060/front.lz"
 OnixBackpic:         INCBIN "gfx/pics/095/back.lz"
 KoffingBackpic:      INCBIN "gfx/pics/109/back.lz"
-BirdKeeperPic:       INCBIN "gfx/trainers/lz/023.lz"
-FalknerPic:          INCBIN "gfx/trainers/lz/000.lz"
-KarenPic:            INCBIN "gfx/trainers/lz/013.lz"
+BirdKeeperPic:       INCBIN "gfx/trainers/023.lz"
+FalknerPic:          INCBIN "gfx/trainers/000.lz"
+KarenPic:            INCBIN "gfx/trainers/013.lz"
 NidorinaBackpic:     INCBIN "gfx/pics/030/back.lz"
 TentacruelBackpic:   INCBIN "gfx/pics/073/back.lz"
 GrowlitheBackpic:    INCBIN "gfx/pics/058/back.lz"
-KogaPic:             INCBIN "gfx/trainers/lz/014.lz"
+KogaPic:             INCBIN "gfx/trainers/014.lz"
 MachokeBackpic:      INCBIN "gfx/pics/067/back.lz"
 RaichuBackpic:       INCBIN "gfx/pics/026/back.lz"
 PoliwrathBackpic:    INCBIN "gfx/pics/062/back.lz"
-SwimmermPic:         INCBIN "gfx/trainers/lz/037.lz"
+SwimmermPic:         INCBIN "gfx/trainers/037.lz"
 SunkernFrontpic:     INCBIN "gfx/pics/191/front.lz"
 NidorinoBackpic:     INCBIN "gfx/pics/033/back.lz"
-MysticalmanPic:      INCBIN "gfx/trainers/lz/066.lz"
-CooltrainerfPic:     INCBIN "gfx/trainers/lz/027.lz"
+MysticalmanPic:      INCBIN "gfx/trainers/066.lz"
+CooltrainerfPic:     INCBIN "gfx/trainers/027.lz"
 ElectrodeFrontpic:   INCBIN "gfx/pics/101/front.lz"
 ; 153fe3
 
@@ -68478,14 +68478,14 @@ SudowoodoBackpic:    INCBIN "gfx/pics/185/back.lz"
 FlaaffyBackpic:      INCBIN "gfx/pics/180/back.lz"
 SentretFrontpic:     INCBIN "gfx/pics/161/front.lz"
 TogeticBackpic:      INCBIN "gfx/pics/176/back.lz"
-BugsyPic:            INCBIN "gfx/trainers/lz/002.lz"
+BugsyPic:            INCBIN "gfx/trainers/002.lz"
 MarowakBackpic:      INCBIN "gfx/pics/105/back.lz"
 GeodudeBackpic:      INCBIN "gfx/pics/074/back.lz"
 ScytherBackpic:      INCBIN "gfx/pics/123/back.lz"
 VileplumeBackpic:    INCBIN "gfx/pics/045/back.lz"
 HitmonchanBackpic:   INCBIN "gfx/pics/107/back.lz"
 JumpluffBackpic:     INCBIN "gfx/pics/189/back.lz"
-CooltrainermPic:     INCBIN "gfx/trainers/lz/026.lz"
+CooltrainermPic:     INCBIN "gfx/trainers/026.lz"
 BlastoiseBackpic:    INCBIN "gfx/pics/009/back.lz"
 MisdreavusBackpic:   INCBIN "gfx/pics/200/back.lz"
 TyrogueBackpic:      INCBIN "gfx/pics/236/back.lz"
@@ -68505,7 +68505,7 @@ RaticateBackpic:     INCBIN "gfx/pics/020/back.lz"
 VulpixBackpic:       INCBIN "gfx/pics/037/back.lz"
 EkansBackpic:        INCBIN "gfx/pics/023/back.lz"
 SeakingBackpic:      INCBIN "gfx/pics/119/back.lz"
-BurglarPic:          INCBIN "gfx/trainers/lz/046.lz"
+BurglarPic:          INCBIN "gfx/trainers/046.lz"
 PsyduckBackpic:      INCBIN "gfx/pics/054/back.lz"
 PikachuBackpic:      INCBIN "gfx/pics/025/back.lz"
 KabutoFrontpic:      INCBIN "gfx/pics/140/front.lz"
@@ -68513,12 +68513,12 @@ MareepBackpic:       INCBIN "gfx/pics/179/back.lz"
 RemoraidBackpic:     INCBIN "gfx/pics/223/back.lz"
 DittoFrontpic:       INCBIN "gfx/pics/132/front.lz"
 KingdraBackpic:      INCBIN "gfx/pics/230/back.lz"
-CamperPic:           INCBIN "gfx/trainers/lz/053.lz"
+CamperPic:           INCBIN "gfx/trainers/053.lz"
 WooperFrontpic:      INCBIN "gfx/pics/194/front.lz"
 ClefairyBackpic:     INCBIN "gfx/pics/035/back.lz"
 VenonatBackpic:      INCBIN "gfx/pics/048/back.lz"
 BellossomBackpic:    INCBIN "gfx/pics/182/back.lz"
-Rival1Pic:           INCBIN "gfx/trainers/lz/008.lz"
+Rival1Pic:           INCBIN "gfx/trainers/008.lz"
 SwinubBackpic:       INCBIN "gfx/pics/220/back.lz"
 ; 158000
 
@@ -68528,14 +68528,14 @@ SECTION "bank56",DATA,BANK[$56]
 ;                            Pics XV
 
 MewtwoBackpic:       INCBIN "gfx/pics/150/back.lz"
-PokemonProfPic:      INCBIN "gfx/trainers/lz/009.lz"
-CalPic:              INCBIN "gfx/trainers/lz/011.lz"
-SwimmerfPic:         INCBIN "gfx/trainers/lz/038.lz"
+PokemonProfPic:      INCBIN "gfx/trainers/009.lz"
+CalPic:              INCBIN "gfx/trainers/011.lz"
+SwimmerfPic:         INCBIN "gfx/trainers/038.lz"
 DiglettFrontpic:     INCBIN "gfx/pics/050/front.lz"
-OfficerPic:          INCBIN "gfx/trainers/lz/064.lz"
+OfficerPic:          INCBIN "gfx/trainers/064.lz"
 MukBackpic:          INCBIN "gfx/pics/089/back.lz"
 DelibirdBackpic:     INCBIN "gfx/pics/225/back.lz"
-SabrinaPic:          INCBIN "gfx/trainers/lz/034.lz"
+SabrinaPic:          INCBIN "gfx/trainers/034.lz"
 MagikarpBackpic:     INCBIN "gfx/pics/129/back.lz"
 AriadosBackpic:      INCBIN "gfx/pics/168/back.lz"
 SneaselBackpic:      INCBIN "gfx/pics/215/back.lz"
@@ -68543,11 +68543,11 @@ UmbreonBackpic:      INCBIN "gfx/pics/197/back.lz"
 MurkrowBackpic:      INCBIN "gfx/pics/198/back.lz"
 IvysaurBackpic:      INCBIN "gfx/pics/002/back.lz"
 SlowbroBackpic:      INCBIN "gfx/pics/080/back.lz"
-PsychicTPic:         INCBIN "gfx/trainers/lz/051.lz"
+PsychicTPic:         INCBIN "gfx/trainers/051.lz"
 GolduckBackpic:      INCBIN "gfx/pics/055/back.lz"
 WeezingBackpic:      INCBIN "gfx/pics/110/back.lz"
 EnteiBackpic:        INCBIN "gfx/pics/244/back.lz"
-GruntfPic:           INCBIN "gfx/trainers/lz/065.lz"
+GruntfPic:           INCBIN "gfx/trainers/065.lz"
 HorseaFrontpic:      INCBIN "gfx/pics/116/front.lz"
 PidgeotBackpic:      INCBIN "gfx/pics/018/back.lz"
 HoOhBackpic:         INCBIN "gfx/pics/250/back.lz"
@@ -68569,12 +68569,12 @@ SnubbullBackpic:     INCBIN "gfx/pics/209/back.lz"
 KinglerBackpic:      INCBIN "gfx/pics/099/back.lz"
 GengarBackpic:       INCBIN "gfx/pics/094/back.lz"
 RattataBackpic:      INCBIN "gfx/pics/019/back.lz"
-YoungsterPic:        INCBIN "gfx/trainers/lz/021.lz"
-WillPic:             INCBIN "gfx/trainers/lz/010.lz"
-SchoolboyPic:        INCBIN "gfx/trainers/lz/022.lz"
+YoungsterPic:        INCBIN "gfx/trainers/021.lz"
+WillPic:             INCBIN "gfx/trainers/010.lz"
+SchoolboyPic:        INCBIN "gfx/trainers/022.lz"
 MagnemiteFrontpic:   INCBIN "gfx/pics/081/front.lz"
-ErikaPic:            INCBIN "gfx/trainers/lz/020.lz"
-JaninePic:           INCBIN "gfx/trainers/lz/025.lz"
+ErikaPic:            INCBIN "gfx/trainers/020.lz"
+JaninePic:           INCBIN "gfx/trainers/025.lz"
 MagnemiteBackpic:    INCBIN "gfx/pics/081/back.lz"
 ; 15bffa
 
@@ -68585,33 +68585,33 @@ SECTION "bank57",DATA,BANK[$57]
 
 HoothootBackpic:     INCBIN "gfx/pics/163/back.lz"
 NoctowlBackpic:      INCBIN "gfx/pics/164/back.lz"
-MortyPic:            INCBIN "gfx/trainers/lz/003.lz"
+MortyPic:            INCBIN "gfx/trainers/003.lz"
 SlugmaBackpic:       INCBIN "gfx/pics/218/back.lz"
 KabutoBackpic:       INCBIN "gfx/pics/140/back.lz"
 VictreebelBackpic:   INCBIN "gfx/pics/071/back.lz"
 MeowthBackpic:       INCBIN "gfx/pics/052/back.lz"
 MeganiumBackpic:     INCBIN "gfx/pics/154/back.lz"
-PicnickerPic:        INCBIN "gfx/trainers/lz/052.lz"
+PicnickerPic:        INCBIN "gfx/trainers/052.lz"
 LickitungBackpic:    INCBIN "gfx/pics/108/back.lz"
 TogepiFrontpic:      INCBIN "gfx/pics/175/front.lz"
-SuperNerdPic:        INCBIN "gfx/trainers/lz/040.lz"
+SuperNerdPic:        INCBIN "gfx/trainers/040.lz"
 HaunterBackpic:      INCBIN "gfx/pics/093/back.lz"
 XatuBackpic:         INCBIN "gfx/pics/178/back.lz"
-RedPic:              INCBIN "gfx/trainers/lz/062.lz"
+RedPic:              INCBIN "gfx/trainers/062.lz"
 Porygon2Backpic:     INCBIN "gfx/pics/233/back.lz"
-JasminePic:          INCBIN "gfx/trainers/lz/005.lz"
+JasminePic:          INCBIN "gfx/trainers/005.lz"
 PinecoBackpic:       INCBIN "gfx/pics/204/back.lz"
 MetapodFrontpic:     INCBIN "gfx/pics/011/front.lz"
 SeelBackpic:         INCBIN "gfx/pics/086/back.lz"
 QuagsireBackpic:     INCBIN "gfx/pics/195/back.lz"
-WhitneyPic:          INCBIN "gfx/trainers/lz/001.lz"
+WhitneyPic:          INCBIN "gfx/trainers/001.lz"
 JolteonBackpic:      INCBIN "gfx/pics/135/back.lz"
 CaterpieFrontpic:    INCBIN "gfx/pics/010/front.lz"
 HoppipBackpic:       INCBIN "gfx/pics/187/back.lz"
-BluePic:             INCBIN "gfx/trainers/lz/063.lz"
+BluePic:             INCBIN "gfx/trainers/063.lz"
 GranbullBackpic:     INCBIN "gfx/pics/210/back.lz"
-GentlemanPic:        INCBIN "gfx/trainers/lz/031.lz"
-ExecutivemPic:       INCBIN "gfx/trainers/lz/050.lz"
+GentlemanPic:        INCBIN "gfx/trainers/031.lz"
+ExecutivemPic:       INCBIN "gfx/trainers/050.lz"
 SpearowBackpic:      INCBIN "gfx/pics/021/back.lz"
 SunkernBackpic:      INCBIN "gfx/pics/191/back.lz"
 LaprasBackpic:       INCBIN "gfx/pics/131/back.lz"
@@ -68624,13 +68624,13 @@ ChinchouBackpic:     INCBIN "gfx/pics/170/back.lz"
 ChanseyBackpic:      INCBIN "gfx/pics/113/back.lz"
 SkiploomBackpic:     INCBIN "gfx/pics/188/back.lz"
 SpinarakFrontpic:    INCBIN "gfx/pics/167/front.lz"
-Rival2Pic:           INCBIN "gfx/trainers/lz/041.lz"
+Rival2Pic:           INCBIN "gfx/trainers/041.lz"
 UnownWFrontpic:      INCBIN "gfx/pics/201w/front.lz"
 CharmanderBackpic:   INCBIN "gfx/pics/004/back.lz"
 RhyhornBackpic:      INCBIN "gfx/pics/111/back.lz"
 UnownCFrontpic:      INCBIN "gfx/pics/201c/front.lz"
-MistyPic:            INCBIN "gfx/trainers/lz/017.lz"
-BlainePic:           INCBIN "gfx/trainers/lz/045.lz"
+MistyPic:            INCBIN "gfx/trainers/017.lz"
+BlainePic:           INCBIN "gfx/trainers/045.lz"
 UnownZFrontpic:      INCBIN "gfx/pics/201z/front.lz"
 SwinubFrontpic:      INCBIN "gfx/pics/220/front.lz"
 LarvitarBackpic:     INCBIN "gfx/pics/246/back.lz"
@@ -68646,7 +68646,7 @@ SECTION "bank58",DATA,BANK[$58]
 ParasBackpic:        INCBIN "gfx/pics/046/back.lz"
 VaporeonBackpic:     INCBIN "gfx/pics/134/back.lz"
 TentacoolBackpic:    INCBIN "gfx/pics/072/back.lz"
-ExecutivefPic:       INCBIN "gfx/trainers/lz/054.lz"
+ExecutivefPic:       INCBIN "gfx/trainers/054.lz"
 BulbasaurBackpic:    INCBIN "gfx/pics/001/back.lz"
 SmoochumBackpic:     INCBIN "gfx/pics/238/back.lz"
 PichuBackpic:        INCBIN "gfx/pics/172/back.lz"
@@ -68660,8 +68660,8 @@ MrMimeBackpic:       INCBIN "gfx/pics/122/back.lz"
 CaterpieBackpic:     INCBIN "gfx/pics/010/back.lz"
 VoltorbFrontpic:     INCBIN "gfx/pics/100/front.lz"
 LugiaBackpic:        INCBIN "gfx/pics/249/back.lz"
-PrycePic:            INCBIN "gfx/trainers/lz/004.lz"
-BrockPic:            INCBIN "gfx/trainers/lz/016.lz"
+PrycePic:            INCBIN "gfx/trainers/004.lz"
+BrockPic:            INCBIN "gfx/trainers/016.lz"
 UnownGFrontpic:      INCBIN "gfx/pics/201g/front.lz"
 ArbokBackpic:        INCBIN "gfx/pics/024/back.lz"
 PolitoedBackpic:     INCBIN "gfx/pics/186/back.lz"
@@ -68669,7 +68669,7 @@ DragoniteBackpic:    INCBIN "gfx/pics/149/back.lz"
 HitmonleeBackpic:    INCBIN "gfx/pics/106/back.lz"
 NatuFrontpic:        INCBIN "gfx/pics/177/front.lz"
 UrsaringBackpic:     INCBIN "gfx/pics/217/back.lz"
-SagePic:             INCBIN "gfx/trainers/lz/055.lz"
+SagePic:             INCBIN "gfx/trainers/055.lz"
 TeddiursaBackpic:    INCBIN "gfx/pics/216/back.lz"
 PhanpyBackpic:       INCBIN "gfx/pics/231/back.lz"
 UnownVFrontpic:      INCBIN "gfx/pics/201v/front.lz"