diff --git a/Makefile b/Makefile
index c28a8841e..fb9e75a42 100644
--- a/Makefile
+++ b/Makefile
@@ -113,6 +113,8 @@ gfx/pics/%/front.animated.tilemap: gfx/pics/%/front.2bpp gfx/pics/%/front.dimens
 gfx/shrink%.2bpp: rgbgfx += -h
 
 gfx/trainers/%.2bpp: rgbgfx += -h
+gfx/trainers/%.pal: gfx/trainers/%.gbcpal
+	tools/palette -p $< > $@
 
 gfx/mail/0b9b46.1bpp: tools/gfx += --remove-whitespace
 gfx/mail/0b9d46.1bpp: tools/gfx += --remove-whitespace
diff --git a/gfx/trainers/beauty.2bpp.lz b/gfx/trainers/beauty.2bpp.lz.c1c13787
similarity index 100%
rename from gfx/trainers/beauty.2bpp.lz
rename to gfx/trainers/beauty.2bpp.lz.c1c13787
diff --git a/gfx/trainers/beauty.pal b/gfx/trainers/beauty.pal
deleted file mode 100644
index 7183a0502..000000000
--- a/gfx/trainers/beauty.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 24, 17, 11
-	RGB 08, 09, 17
-
diff --git a/gfx/trainers/beauty.png b/gfx/trainers/beauty.png
new file mode 100644
index 000000000..bb4831290
Binary files /dev/null and b/gfx/trainers/beauty.png differ
diff --git a/gfx/trainers/biker.2bpp.lz b/gfx/trainers/biker.2bpp.lz.cb40f7cd
similarity index 100%
rename from gfx/trainers/biker.2bpp.lz
rename to gfx/trainers/biker.2bpp.lz.cb40f7cd
diff --git a/gfx/trainers/biker.pal b/gfx/trainers/biker.pal
deleted file mode 100644
index bfffe557d..000000000
--- a/gfx/trainers/biker.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 20, 17, 09
-	RGB 04, 03, 10
-
diff --git a/gfx/trainers/biker.png b/gfx/trainers/biker.png
new file mode 100644
index 000000000..7bd4c84a6
Binary files /dev/null and b/gfx/trainers/biker.png differ
diff --git a/gfx/trainers/bird_keeper.2bpp.lz b/gfx/trainers/bird_keeper.2bpp.lz.1e56954c
similarity index 100%
rename from gfx/trainers/bird_keeper.2bpp.lz
rename to gfx/trainers/bird_keeper.2bpp.lz.1e56954c
diff --git a/gfx/trainers/bird_keeper.pal b/gfx/trainers/bird_keeper.pal
deleted file mode 100644
index ca0407a3b..000000000
--- a/gfx/trainers/bird_keeper.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 30, 22, 17
-	RGB 06, 12, 26
-
diff --git a/gfx/trainers/bird_keeper.png b/gfx/trainers/bird_keeper.png
new file mode 100644
index 000000000..de938ad2b
Binary files /dev/null and b/gfx/trainers/bird_keeper.png differ
diff --git a/gfx/trainers/blackbelt_t.2bpp.lz b/gfx/trainers/blackbelt_t.2bpp.lz.4ef2481c
similarity index 100%
rename from gfx/trainers/blackbelt_t.2bpp.lz
rename to gfx/trainers/blackbelt_t.2bpp.lz.4ef2481c
diff --git a/gfx/trainers/blackbelt_t.pal b/gfx/trainers/blackbelt_t.pal
deleted file mode 100644
index 59ea02844..000000000
--- a/gfx/trainers/blackbelt_t.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 26, 15, 08
-	RGB 13, 10, 12
-
diff --git a/gfx/trainers/blackbelt_t.png b/gfx/trainers/blackbelt_t.png
new file mode 100644
index 000000000..5d84fa8de
Binary files /dev/null and b/gfx/trainers/blackbelt_t.png differ
diff --git a/gfx/trainers/blaine.2bpp.lz b/gfx/trainers/blaine.2bpp.lz.00a3b6f5
similarity index 100%
rename from gfx/trainers/blaine.2bpp.lz
rename to gfx/trainers/blaine.2bpp.lz.00a3b6f5
diff --git a/gfx/trainers/blaine.pal b/gfx/trainers/blaine.pal
deleted file mode 100644
index 90f3a381f..000000000
--- a/gfx/trainers/blaine.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 30, 20, 16
-	RGB 07, 11, 12
-
diff --git a/gfx/trainers/blaine.png b/gfx/trainers/blaine.png
new file mode 100644
index 000000000..1afc558fd
Binary files /dev/null and b/gfx/trainers/blaine.png differ
diff --git a/gfx/trainers/blue.2bpp.lz b/gfx/trainers/blue.2bpp.lz.9fdbab8f
similarity index 100%
rename from gfx/trainers/blue.2bpp.lz
rename to gfx/trainers/blue.2bpp.lz.9fdbab8f
diff --git a/gfx/trainers/blue.pal b/gfx/trainers/blue.pal
deleted file mode 100644
index ce6b3f1d7..000000000
--- a/gfx/trainers/blue.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 31, 24, 08
-	RGB 12, 09, 19
-
diff --git a/gfx/trainers/blue.png b/gfx/trainers/blue.png
new file mode 100644
index 000000000..76a1e81af
Binary files /dev/null and b/gfx/trainers/blue.png differ
diff --git a/gfx/trainers/boarder.2bpp.lz b/gfx/trainers/boarder.2bpp.lz.5d6881a8
similarity index 100%
rename from gfx/trainers/boarder.2bpp.lz
rename to gfx/trainers/boarder.2bpp.lz.5d6881a8
diff --git a/gfx/trainers/boarder.pal b/gfx/trainers/boarder.pal
deleted file mode 100644
index 4fb9af5e1..000000000
--- a/gfx/trainers/boarder.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 24, 19, 07
-	RGB 13, 10, 19
-
diff --git a/gfx/trainers/boarder.png b/gfx/trainers/boarder.png
new file mode 100644
index 000000000..a8174e9a5
Binary files /dev/null and b/gfx/trainers/boarder.png differ
diff --git a/gfx/trainers/brock.2bpp.lz b/gfx/trainers/brock.2bpp.lz.5bdeb7bf
similarity index 100%
rename from gfx/trainers/brock.2bpp.lz
rename to gfx/trainers/brock.2bpp.lz.5bdeb7bf
diff --git a/gfx/trainers/brock.pal b/gfx/trainers/brock.pal
deleted file mode 100644
index f5a1b0c06..000000000
--- a/gfx/trainers/brock.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 30, 18, 14
-	RGB 14, 07, 10
-
diff --git a/gfx/trainers/brock.png b/gfx/trainers/brock.png
new file mode 100644
index 000000000..0aea8a946
Binary files /dev/null and b/gfx/trainers/brock.png differ
diff --git a/gfx/trainers/bruno.2bpp.lz b/gfx/trainers/bruno.2bpp.lz.22f3c222
similarity index 100%
rename from gfx/trainers/bruno.2bpp.lz
rename to gfx/trainers/bruno.2bpp.lz.22f3c222
diff --git a/gfx/trainers/bruno.pal b/gfx/trainers/bruno.pal
deleted file mode 100644
index 41408a91d..000000000
--- a/gfx/trainers/bruno.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 25, 17, 12
-	RGB 08, 10, 12
-
diff --git a/gfx/trainers/bruno.png b/gfx/trainers/bruno.png
new file mode 100644
index 000000000..c8a003eea
Binary files /dev/null and b/gfx/trainers/bruno.png differ
diff --git a/gfx/trainers/bug_catcher.2bpp.lz b/gfx/trainers/bug_catcher.2bpp.lz.43144f97
similarity index 100%
rename from gfx/trainers/bug_catcher.2bpp.lz
rename to gfx/trainers/bug_catcher.2bpp.lz.43144f97
diff --git a/gfx/trainers/bug_catcher.pal b/gfx/trainers/bug_catcher.pal
deleted file mode 100644
index 8e4df4219..000000000
--- a/gfx/trainers/bug_catcher.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 27, 17, 10
-	RGB 06, 10, 18
-
diff --git a/gfx/trainers/bug_catcher.png b/gfx/trainers/bug_catcher.png
new file mode 100644
index 000000000..a1c065d20
Binary files /dev/null and b/gfx/trainers/bug_catcher.png differ
diff --git a/gfx/trainers/bugsy.2bpp.lz b/gfx/trainers/bugsy.2bpp.lz.c070450d
similarity index 100%
rename from gfx/trainers/bugsy.2bpp.lz
rename to gfx/trainers/bugsy.2bpp.lz.c070450d
diff --git a/gfx/trainers/bugsy.pal b/gfx/trainers/bugsy.pal
deleted file mode 100644
index 1743f663b..000000000
--- a/gfx/trainers/bugsy.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 26, 18, 15
-	RGB 13, 21, 06
-
diff --git a/gfx/trainers/bugsy.png b/gfx/trainers/bugsy.png
new file mode 100644
index 000000000..8b1f89537
Binary files /dev/null and b/gfx/trainers/bugsy.png differ
diff --git a/gfx/trainers/burglar.2bpp.lz b/gfx/trainers/burglar.2bpp.lz.e063f42e
similarity index 100%
rename from gfx/trainers/burglar.2bpp.lz
rename to gfx/trainers/burglar.2bpp.lz.e063f42e
diff --git a/gfx/trainers/burglar.pal b/gfx/trainers/burglar.pal
deleted file mode 100644
index cfcdd144f..000000000
--- a/gfx/trainers/burglar.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 28, 16, 09
-	RGB 12, 04, 23
-
diff --git a/gfx/trainers/burglar.png b/gfx/trainers/burglar.png
new file mode 100644
index 000000000..241eaa2dc
Binary files /dev/null and b/gfx/trainers/burglar.png differ
diff --git a/gfx/trainers/cal.2bpp.lz b/gfx/trainers/cal.2bpp.lz.aac54a14
similarity index 100%
rename from gfx/trainers/cal.2bpp.lz
rename to gfx/trainers/cal.2bpp.lz.aac54a14
diff --git a/gfx/trainers/cal.pal b/gfx/trainers/cal.pal
deleted file mode 100644
index 92101c5e3..000000000
--- a/gfx/trainers/cal.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 25, 18, 12
-	RGB 22, 09, 05
-
diff --git a/gfx/trainers/cal.png b/gfx/trainers/cal.png
new file mode 100644
index 000000000..31a38cc54
Binary files /dev/null and b/gfx/trainers/cal.png differ
diff --git a/gfx/trainers/camper.2bpp.lz b/gfx/trainers/camper.2bpp.lz.cc2357ea
similarity index 100%
rename from gfx/trainers/camper.2bpp.lz
rename to gfx/trainers/camper.2bpp.lz.cc2357ea
diff --git a/gfx/trainers/camper.pal b/gfx/trainers/camper.pal
deleted file mode 100644
index 13a083c68..000000000
--- a/gfx/trainers/camper.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 31, 19, 08
-	RGB 15, 25, 02
-
diff --git a/gfx/trainers/camper.png b/gfx/trainers/camper.png
new file mode 100644
index 000000000..72e043eea
Binary files /dev/null and b/gfx/trainers/camper.png differ
diff --git a/gfx/trainers/champion.2bpp.lz b/gfx/trainers/champion.2bpp.lz.0175f5ea
similarity index 100%
rename from gfx/trainers/champion.2bpp.lz
rename to gfx/trainers/champion.2bpp.lz.0175f5ea
diff --git a/gfx/trainers/champion.pal b/gfx/trainers/champion.pal
deleted file mode 100644
index 3dee1efef..000000000
--- a/gfx/trainers/champion.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 29, 19, 15
-	RGB 21, 09, 05
-
diff --git a/gfx/trainers/champion.png b/gfx/trainers/champion.png
new file mode 100644
index 000000000..02494e748
Binary files /dev/null and b/gfx/trainers/champion.png differ
diff --git a/gfx/trainers/chuck.2bpp.lz b/gfx/trainers/chuck.2bpp.lz.cab13edd
similarity index 100%
rename from gfx/trainers/chuck.2bpp.lz
rename to gfx/trainers/chuck.2bpp.lz.cab13edd
diff --git a/gfx/trainers/chuck.pal b/gfx/trainers/chuck.pal
deleted file mode 100644
index 9616829dc..000000000
--- a/gfx/trainers/chuck.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 25, 16, 12
-	RGB 12, 08, 08
-
diff --git a/gfx/trainers/chuck.png b/gfx/trainers/chuck.png
new file mode 100644
index 000000000..a7504f87a
Binary files /dev/null and b/gfx/trainers/chuck.png differ
diff --git a/gfx/trainers/clair.2bpp.lz b/gfx/trainers/clair.2bpp.lz.a1771075
similarity index 100%
rename from gfx/trainers/clair.2bpp.lz
rename to gfx/trainers/clair.2bpp.lz.a1771075
diff --git a/gfx/trainers/clair.pal b/gfx/trainers/clair.pal
deleted file mode 100644
index 616598fee..000000000
--- a/gfx/trainers/clair.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 27, 18, 12
-	RGB 08, 11, 16
-
diff --git a/gfx/trainers/clair.png b/gfx/trainers/clair.png
new file mode 100644
index 000000000..0a8ca2a58
Binary files /dev/null and b/gfx/trainers/clair.png differ
diff --git a/gfx/trainers/cooltrainer_f.2bpp.lz b/gfx/trainers/cooltrainer_f.2bpp.lz.6fb1e652
similarity index 100%
rename from gfx/trainers/cooltrainer_f.2bpp.lz
rename to gfx/trainers/cooltrainer_f.2bpp.lz.6fb1e652
diff --git a/gfx/trainers/cooltrainer_f.pal b/gfx/trainers/cooltrainer_f.pal
deleted file mode 100644
index bdeefabf8..000000000
--- a/gfx/trainers/cooltrainer_f.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 26, 18, 15
-	RGB 22, 09, 03
-
diff --git a/gfx/trainers/cooltrainer_f.png b/gfx/trainers/cooltrainer_f.png
new file mode 100644
index 000000000..9547ba377
Binary files /dev/null and b/gfx/trainers/cooltrainer_f.png differ
diff --git a/gfx/trainers/cooltrainer_m.2bpp.lz b/gfx/trainers/cooltrainer_m.2bpp.lz.0aa81882
similarity index 100%
rename from gfx/trainers/cooltrainer_m.2bpp.lz
rename to gfx/trainers/cooltrainer_m.2bpp.lz.0aa81882
diff --git a/gfx/trainers/cooltrainer_m.pal b/gfx/trainers/cooltrainer_m.pal
deleted file mode 100644
index bdeefabf8..000000000
--- a/gfx/trainers/cooltrainer_m.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 26, 18, 15
-	RGB 22, 09, 03
-
diff --git a/gfx/trainers/cooltrainer_m.png b/gfx/trainers/cooltrainer_m.png
new file mode 100644
index 000000000..9a6620b45
Binary files /dev/null and b/gfx/trainers/cooltrainer_m.png differ
diff --git a/gfx/trainers/erika.2bpp.lz b/gfx/trainers/erika.2bpp.lz.58985f01
similarity index 100%
rename from gfx/trainers/erika.2bpp.lz
rename to gfx/trainers/erika.2bpp.lz.58985f01
diff --git a/gfx/trainers/erika.pal b/gfx/trainers/erika.pal
deleted file mode 100644
index e8de9b43d..000000000
--- a/gfx/trainers/erika.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 31, 18, 13
-	RGB 07, 15, 08
-
diff --git a/gfx/trainers/erika.png b/gfx/trainers/erika.png
new file mode 100644
index 000000000..9b1c282dd
Binary files /dev/null and b/gfx/trainers/erika.png differ
diff --git a/gfx/trainers/executive_f.2bpp.lz b/gfx/trainers/executive_f.2bpp.lz.c8b5dc9c
similarity index 100%
rename from gfx/trainers/executive_f.2bpp.lz
rename to gfx/trainers/executive_f.2bpp.lz.c8b5dc9c
diff --git a/gfx/trainers/executive_f.pal b/gfx/trainers/executive_f.pal
deleted file mode 100644
index 36ec86f8e..000000000
--- a/gfx/trainers/executive_f.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 30, 22, 17
-	RGB 19, 05, 12
-
diff --git a/gfx/trainers/executive_f.png b/gfx/trainers/executive_f.png
new file mode 100644
index 000000000..ec1419758
Binary files /dev/null and b/gfx/trainers/executive_f.png differ
diff --git a/gfx/trainers/executive_m.2bpp.lz b/gfx/trainers/executive_m.2bpp.lz.211746a6
similarity index 100%
rename from gfx/trainers/executive_m.2bpp.lz
rename to gfx/trainers/executive_m.2bpp.lz.211746a6
diff --git a/gfx/trainers/executive_m.pal b/gfx/trainers/executive_m.pal
deleted file mode 100644
index 66e0a46c9..000000000
--- a/gfx/trainers/executive_m.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 25, 17, 05
-	RGB 14, 05, 14
-
diff --git a/gfx/trainers/executive_m.png b/gfx/trainers/executive_m.png
new file mode 100644
index 000000000..e88db5a78
Binary files /dev/null and b/gfx/trainers/executive_m.png differ
diff --git a/gfx/trainers/falkner.2bpp.lz b/gfx/trainers/falkner.2bpp.lz.6ec6bbaf
similarity index 100%
rename from gfx/trainers/falkner.2bpp.lz
rename to gfx/trainers/falkner.2bpp.lz.6ec6bbaf
diff --git a/gfx/trainers/falkner.pal b/gfx/trainers/falkner.pal
deleted file mode 100644
index ddc5262ba..000000000
--- a/gfx/trainers/falkner.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 27, 17, 14
-	RGB 07, 05, 31
-
diff --git a/gfx/trainers/falkner.png b/gfx/trainers/falkner.png
new file mode 100644
index 000000000..244352fd7
Binary files /dev/null and b/gfx/trainers/falkner.png differ
diff --git a/gfx/trainers/firebreather.2bpp.lz b/gfx/trainers/firebreather.2bpp.lz.a790feb1
similarity index 100%
rename from gfx/trainers/firebreather.2bpp.lz
rename to gfx/trainers/firebreather.2bpp.lz.a790feb1
diff --git a/gfx/trainers/firebreather.pal b/gfx/trainers/firebreather.pal
deleted file mode 100644
index b051224dd..000000000
--- a/gfx/trainers/firebreather.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 27, 17, 11
-	RGB 25, 05, 12
-
diff --git a/gfx/trainers/firebreather.png b/gfx/trainers/firebreather.png
new file mode 100644
index 000000000..d838c3a58
Binary files /dev/null and b/gfx/trainers/firebreather.png differ
diff --git a/gfx/trainers/fisher.2bpp.lz b/gfx/trainers/fisher.2bpp.lz.95bfbfd6
similarity index 100%
rename from gfx/trainers/fisher.2bpp.lz
rename to gfx/trainers/fisher.2bpp.lz.95bfbfd6
diff --git a/gfx/trainers/fisher.pal b/gfx/trainers/fisher.pal
deleted file mode 100644
index 9d0657111..000000000
--- a/gfx/trainers/fisher.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 30, 17, 13
-	RGB 07, 12, 15
-
diff --git a/gfx/trainers/fisher.png b/gfx/trainers/fisher.png
new file mode 100644
index 000000000..a39f10d57
Binary files /dev/null and b/gfx/trainers/fisher.png differ
diff --git a/gfx/trainers/gentleman.2bpp.lz b/gfx/trainers/gentleman.2bpp.lz.d3d78e00
similarity index 100%
rename from gfx/trainers/gentleman.2bpp.lz
rename to gfx/trainers/gentleman.2bpp.lz.d3d78e00
diff --git a/gfx/trainers/gentleman.pal b/gfx/trainers/gentleman.pal
deleted file mode 100644
index c6faa0d33..000000000
--- a/gfx/trainers/gentleman.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 25, 16, 12
-	RGB 09, 09, 15
-
diff --git a/gfx/trainers/gentleman.png b/gfx/trainers/gentleman.png
new file mode 100644
index 000000000..2ae2eaf1c
Binary files /dev/null and b/gfx/trainers/gentleman.png differ
diff --git a/gfx/trainers/grunt_f.2bpp.lz b/gfx/trainers/grunt_f.2bpp.lz.522aecd7
similarity index 100%
rename from gfx/trainers/grunt_f.2bpp.lz
rename to gfx/trainers/grunt_f.2bpp.lz.522aecd7
diff --git a/gfx/trainers/grunt_f.pal b/gfx/trainers/grunt_f.pal
deleted file mode 100644
index 746132411..000000000
--- a/gfx/trainers/grunt_f.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 31, 19, 13
-	RGB 19, 06, 08
-
diff --git a/gfx/trainers/grunt_f.png b/gfx/trainers/grunt_f.png
new file mode 100644
index 000000000..8c69953f7
Binary files /dev/null and b/gfx/trainers/grunt_f.png differ
diff --git a/gfx/trainers/grunt_m.2bpp.lz b/gfx/trainers/grunt_m.2bpp.lz.916e09d2
similarity index 100%
rename from gfx/trainers/grunt_m.2bpp.lz
rename to gfx/trainers/grunt_m.2bpp.lz.916e09d2
diff --git a/gfx/trainers/grunt_m.pal b/gfx/trainers/grunt_m.pal
deleted file mode 100644
index f7dc95d8f..000000000
--- a/gfx/trainers/grunt_m.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 29, 17, 15
-	RGB 20, 08, 05
-
diff --git a/gfx/trainers/grunt_m.png b/gfx/trainers/grunt_m.png
new file mode 100644
index 000000000..909b25225
Binary files /dev/null and b/gfx/trainers/grunt_m.png differ
diff --git a/gfx/trainers/guitarist.2bpp.lz b/gfx/trainers/guitarist.2bpp.lz.be5a9b71
similarity index 100%
rename from gfx/trainers/guitarist.2bpp.lz
rename to gfx/trainers/guitarist.2bpp.lz.be5a9b71
diff --git a/gfx/trainers/guitarist.pal b/gfx/trainers/guitarist.pal
deleted file mode 100644
index d5c88a3bd..000000000
--- a/gfx/trainers/guitarist.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 31, 22, 19
-	RGB 31, 08, 05
-
diff --git a/gfx/trainers/guitarist.png b/gfx/trainers/guitarist.png
new file mode 100644
index 000000000..2fac74bd5
Binary files /dev/null and b/gfx/trainers/guitarist.png differ
diff --git a/gfx/trainers/hiker.2bpp.lz b/gfx/trainers/hiker.2bpp.lz.07a4e386
similarity index 100%
rename from gfx/trainers/hiker.2bpp.lz
rename to gfx/trainers/hiker.2bpp.lz.07a4e386
diff --git a/gfx/trainers/hiker.pal b/gfx/trainers/hiker.pal
deleted file mode 100644
index 8d0cb5c4c..000000000
--- a/gfx/trainers/hiker.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 23, 15, 09
-	RGB 13, 08, 23
-
diff --git a/gfx/trainers/hiker.png b/gfx/trainers/hiker.png
new file mode 100644
index 000000000..ff1712cbc
Binary files /dev/null and b/gfx/trainers/hiker.png differ
diff --git a/gfx/trainers/janine.2bpp.lz b/gfx/trainers/janine.2bpp.lz.5350f3ce
similarity index 100%
rename from gfx/trainers/janine.2bpp.lz
rename to gfx/trainers/janine.2bpp.lz.5350f3ce
diff --git a/gfx/trainers/janine.pal b/gfx/trainers/janine.pal
deleted file mode 100644
index e958004cb..000000000
--- a/gfx/trainers/janine.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 30, 18, 15
-	RGB 15, 08, 23
-
diff --git a/gfx/trainers/janine.png b/gfx/trainers/janine.png
new file mode 100644
index 000000000..4e041f1aa
Binary files /dev/null and b/gfx/trainers/janine.png differ
diff --git a/gfx/trainers/jasmine.2bpp.lz b/gfx/trainers/jasmine.2bpp.lz.dcd58308
similarity index 100%
rename from gfx/trainers/jasmine.2bpp.lz
rename to gfx/trainers/jasmine.2bpp.lz.dcd58308
diff --git a/gfx/trainers/jasmine.pal b/gfx/trainers/jasmine.pal
deleted file mode 100644
index 352d95673..000000000
--- a/gfx/trainers/jasmine.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 26, 18, 10
-	RGB 16, 09, 11
-
diff --git a/gfx/trainers/jasmine.png b/gfx/trainers/jasmine.png
new file mode 100644
index 000000000..25a7a9b5e
Binary files /dev/null and b/gfx/trainers/jasmine.png differ
diff --git a/gfx/trainers/juggler.2bpp.lz b/gfx/trainers/juggler.2bpp.lz.2d7625ba
similarity index 100%
rename from gfx/trainers/juggler.2bpp.lz
rename to gfx/trainers/juggler.2bpp.lz.2d7625ba
diff --git a/gfx/trainers/juggler.pal b/gfx/trainers/juggler.pal
deleted file mode 100644
index ffee98b09..000000000
--- a/gfx/trainers/juggler.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 26, 15, 10
-	RGB 09, 06, 31
-
diff --git a/gfx/trainers/juggler.png b/gfx/trainers/juggler.png
new file mode 100644
index 000000000..90001c3ce
Binary files /dev/null and b/gfx/trainers/juggler.png differ
diff --git a/gfx/trainers/karen.2bpp.lz b/gfx/trainers/karen.2bpp.lz.7fc3d941
similarity index 100%
rename from gfx/trainers/karen.2bpp.lz
rename to gfx/trainers/karen.2bpp.lz.7fc3d941
diff --git a/gfx/trainers/karen.pal b/gfx/trainers/karen.pal
deleted file mode 100644
index 0eeb5fa2d..000000000
--- a/gfx/trainers/karen.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 30, 18, 14
-	RGB 21, 08, 07
-
diff --git a/gfx/trainers/karen.png b/gfx/trainers/karen.png
new file mode 100644
index 000000000..46081bdae
Binary files /dev/null and b/gfx/trainers/karen.png differ
diff --git a/gfx/trainers/kimono_girl.2bpp.lz b/gfx/trainers/kimono_girl.2bpp.lz.e8833d48
similarity index 100%
rename from gfx/trainers/kimono_girl.2bpp.lz
rename to gfx/trainers/kimono_girl.2bpp.lz.e8833d48
diff --git a/gfx/trainers/kimono_girl.pal b/gfx/trainers/kimono_girl.pal
deleted file mode 100644
index 334b11d21..000000000
--- a/gfx/trainers/kimono_girl.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 29, 19, 15
-	RGB 26, 09, 06
-
diff --git a/gfx/trainers/kimono_girl.png b/gfx/trainers/kimono_girl.png
new file mode 100644
index 000000000..8f55ab1b2
Binary files /dev/null and b/gfx/trainers/kimono_girl.png differ
diff --git a/gfx/trainers/koga.2bpp.lz b/gfx/trainers/koga.2bpp.lz.7a066020
similarity index 100%
rename from gfx/trainers/koga.2bpp.lz
rename to gfx/trainers/koga.2bpp.lz.7a066020
diff --git a/gfx/trainers/koga.pal b/gfx/trainers/koga.pal
deleted file mode 100644
index 096b1e131..000000000
--- a/gfx/trainers/koga.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 27, 18, 14
-	RGB 12, 07, 13
-
diff --git a/gfx/trainers/koga.png b/gfx/trainers/koga.png
new file mode 100644
index 000000000..ed77f264c
Binary files /dev/null and b/gfx/trainers/koga.png differ
diff --git a/gfx/trainers/lass.2bpp.lz b/gfx/trainers/lass.2bpp.lz.e3726508
similarity index 100%
rename from gfx/trainers/lass.2bpp.lz
rename to gfx/trainers/lass.2bpp.lz.e3726508
diff --git a/gfx/trainers/lass.pal b/gfx/trainers/lass.pal
deleted file mode 100644
index 1ca3149dc..000000000
--- a/gfx/trainers/lass.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 25, 17, 06
-	RGB 13, 08, 25
-
diff --git a/gfx/trainers/lass.png b/gfx/trainers/lass.png
new file mode 100644
index 000000000..18e375a21
Binary files /dev/null and b/gfx/trainers/lass.png differ
diff --git a/gfx/trainers/lt_surge.2bpp.lz b/gfx/trainers/lt_surge.2bpp.lz.4ac586d0
similarity index 100%
rename from gfx/trainers/lt_surge.2bpp.lz
rename to gfx/trainers/lt_surge.2bpp.lz.4ac586d0
diff --git a/gfx/trainers/lt_surge.pal b/gfx/trainers/lt_surge.pal
deleted file mode 100644
index 6243fae58..000000000
--- a/gfx/trainers/lt_surge.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 25, 17, 14
-	RGB 09, 14, 10
-
diff --git a/gfx/trainers/lt_surge.png b/gfx/trainers/lt_surge.png
new file mode 100644
index 000000000..44e7db6dc
Binary files /dev/null and b/gfx/trainers/lt_surge.png differ
diff --git a/gfx/trainers/medium.2bpp.lz b/gfx/trainers/medium.2bpp.lz.db642b9e
similarity index 100%
rename from gfx/trainers/medium.2bpp.lz
rename to gfx/trainers/medium.2bpp.lz.db642b9e
diff --git a/gfx/trainers/medium.pal b/gfx/trainers/medium.pal
deleted file mode 100644
index e06b66f39..000000000
--- a/gfx/trainers/medium.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 25, 17, 12
-	RGB 09, 09, 14
-
diff --git a/gfx/trainers/medium.png b/gfx/trainers/medium.png
new file mode 100644
index 000000000..4828a771d
Binary files /dev/null and b/gfx/trainers/medium.png differ
diff --git a/gfx/trainers/misty.2bpp.lz b/gfx/trainers/misty.2bpp.lz.2ded1a10
similarity index 100%
rename from gfx/trainers/misty.2bpp.lz
rename to gfx/trainers/misty.2bpp.lz.2ded1a10
diff --git a/gfx/trainers/misty.pal b/gfx/trainers/misty.pal
deleted file mode 100644
index aab4b0849..000000000
--- a/gfx/trainers/misty.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 29, 19, 16
-	RGB 20, 10, 05
-
diff --git a/gfx/trainers/misty.png b/gfx/trainers/misty.png
new file mode 100644
index 000000000..64768409a
Binary files /dev/null and b/gfx/trainers/misty.png differ
diff --git a/gfx/trainers/morty.2bpp.lz b/gfx/trainers/morty.2bpp.lz.aec5773b
similarity index 100%
rename from gfx/trainers/morty.2bpp.lz
rename to gfx/trainers/morty.2bpp.lz.aec5773b
diff --git a/gfx/trainers/morty.pal b/gfx/trainers/morty.pal
deleted file mode 100644
index 736d93ba7..000000000
--- a/gfx/trainers/morty.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 29, 17, 12
-	RGB 12, 07, 22
-
diff --git a/gfx/trainers/morty.png b/gfx/trainers/morty.png
new file mode 100644
index 000000000..7f817e1a2
Binary files /dev/null and b/gfx/trainers/morty.png differ
diff --git a/gfx/trainers/mysticalman.2bpp.lz b/gfx/trainers/mysticalman.2bpp.lz.35d01215
similarity index 100%
rename from gfx/trainers/mysticalman.2bpp.lz
rename to gfx/trainers/mysticalman.2bpp.lz.35d01215
diff --git a/gfx/trainers/mysticalman.pal b/gfx/trainers/mysticalman.pal
deleted file mode 100644
index 7e95414ae..000000000
--- a/gfx/trainers/mysticalman.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 28, 20, 12
-	RGB 16, 07, 16
-
diff --git a/gfx/trainers/mysticalman.png b/gfx/trainers/mysticalman.png
new file mode 100644
index 000000000..aac6bf026
Binary files /dev/null and b/gfx/trainers/mysticalman.png differ
diff --git a/gfx/trainers/oak.2bpp.lz b/gfx/trainers/oak.2bpp.lz.91a27df3
similarity index 100%
rename from gfx/trainers/oak.2bpp.lz
rename to gfx/trainers/oak.2bpp.lz.91a27df3
diff --git a/gfx/trainers/oak.pal b/gfx/trainers/oak.pal
deleted file mode 100644
index a4be7ff97..000000000
--- a/gfx/trainers/oak.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 24, 19, 11
-	RGB 13, 16, 00
-
diff --git a/gfx/trainers/oak.png b/gfx/trainers/oak.png
new file mode 100644
index 000000000..4b4fab1a3
Binary files /dev/null and b/gfx/trainers/oak.png differ
diff --git a/gfx/trainers/officer.2bpp.lz b/gfx/trainers/officer.2bpp.lz.630b057a
similarity index 100%
rename from gfx/trainers/officer.2bpp.lz
rename to gfx/trainers/officer.2bpp.lz.630b057a
diff --git a/gfx/trainers/officer.pal b/gfx/trainers/officer.pal
deleted file mode 100644
index a14a47917..000000000
--- a/gfx/trainers/officer.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 30, 24, 08
-	RGB 12, 09, 19
-
diff --git a/gfx/trainers/officer.png b/gfx/trainers/officer.png
new file mode 100644
index 000000000..a5afe293a
Binary files /dev/null and b/gfx/trainers/officer.png differ
diff --git a/gfx/trainers/picnicker.2bpp.lz b/gfx/trainers/picnicker.2bpp.lz.6842b86a
similarity index 100%
rename from gfx/trainers/picnicker.2bpp.lz
rename to gfx/trainers/picnicker.2bpp.lz.6842b86a
diff --git a/gfx/trainers/picnicker.pal b/gfx/trainers/picnicker.pal
deleted file mode 100644
index d0eec39f9..000000000
--- a/gfx/trainers/picnicker.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 31, 19, 08
-	RGB 10, 20, 02
-
diff --git a/gfx/trainers/picnicker.png b/gfx/trainers/picnicker.png
new file mode 100644
index 000000000..0721244f0
Binary files /dev/null and b/gfx/trainers/picnicker.png differ
diff --git a/gfx/trainers/pokefan_f.2bpp.lz b/gfx/trainers/pokefan_f.2bpp.lz.9cbd3f20
similarity index 100%
rename from gfx/trainers/pokefan_f.2bpp.lz
rename to gfx/trainers/pokefan_f.2bpp.lz.9cbd3f20
diff --git a/gfx/trainers/pokefan_f.pal b/gfx/trainers/pokefan_f.pal
deleted file mode 100644
index 57d1b94cf..000000000
--- a/gfx/trainers/pokefan_f.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 30, 17, 14
-	RGB 15, 04, 15
-
diff --git a/gfx/trainers/pokefan_f.png b/gfx/trainers/pokefan_f.png
new file mode 100644
index 000000000..0bf45ace6
Binary files /dev/null and b/gfx/trainers/pokefan_f.png differ
diff --git a/gfx/trainers/pokefan_m.2bpp.lz b/gfx/trainers/pokefan_m.2bpp.lz.5bc5a3e1
similarity index 100%
rename from gfx/trainers/pokefan_m.2bpp.lz
rename to gfx/trainers/pokefan_m.2bpp.lz.5bc5a3e1
diff --git a/gfx/trainers/pokefan_m.pal b/gfx/trainers/pokefan_m.pal
deleted file mode 100644
index 601ed4ae9..000000000
--- a/gfx/trainers/pokefan_m.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 29, 19, 13
-	RGB 21, 08, 08
-
diff --git a/gfx/trainers/pokefan_m.png b/gfx/trainers/pokefan_m.png
new file mode 100644
index 000000000..d8cc8fc8e
Binary files /dev/null and b/gfx/trainers/pokefan_m.png differ
diff --git a/gfx/trainers/pokemaniac.2bpp.lz b/gfx/trainers/pokemaniac.2bpp.lz.786c5fce
similarity index 100%
rename from gfx/trainers/pokemaniac.2bpp.lz
rename to gfx/trainers/pokemaniac.2bpp.lz.786c5fce
diff --git a/gfx/trainers/pokemaniac.pal b/gfx/trainers/pokemaniac.pal
deleted file mode 100644
index f8e224ab8..000000000
--- a/gfx/trainers/pokemaniac.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 28, 20, 13
-	RGB 13, 05, 18
-
diff --git a/gfx/trainers/pokemaniac.png b/gfx/trainers/pokemaniac.png
new file mode 100644
index 000000000..8ab470877
Binary files /dev/null and b/gfx/trainers/pokemaniac.png differ
diff --git a/gfx/trainers/pryce.2bpp.lz b/gfx/trainers/pryce.2bpp.lz.1a98cae8
similarity index 100%
rename from gfx/trainers/pryce.2bpp.lz
rename to gfx/trainers/pryce.2bpp.lz.1a98cae8
diff --git a/gfx/trainers/pryce.pal b/gfx/trainers/pryce.pal
deleted file mode 100644
index ca319f05a..000000000
--- a/gfx/trainers/pryce.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 31, 18, 16
-	RGB 12, 09, 08
-
diff --git a/gfx/trainers/pryce.png b/gfx/trainers/pryce.png
new file mode 100644
index 000000000..2953fe32d
Binary files /dev/null and b/gfx/trainers/pryce.png differ
diff --git a/gfx/trainers/psychic_t.2bpp.lz b/gfx/trainers/psychic_t.2bpp.lz.ecd603f4
similarity index 100%
rename from gfx/trainers/psychic_t.2bpp.lz
rename to gfx/trainers/psychic_t.2bpp.lz.ecd603f4
diff --git a/gfx/trainers/psychic_t.pal b/gfx/trainers/psychic_t.pal
deleted file mode 100644
index e19c4d817..000000000
--- a/gfx/trainers/psychic_t.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 30, 22, 17
-	RGB 10, 12, 19
-
diff --git a/gfx/trainers/psychic_t.png b/gfx/trainers/psychic_t.png
new file mode 100644
index 000000000..897c8385e
Binary files /dev/null and b/gfx/trainers/psychic_t.png differ
diff --git a/gfx/trainers/red.2bpp.lz b/gfx/trainers/red.2bpp.lz.51104ac6
similarity index 100%
rename from gfx/trainers/red.2bpp.lz
rename to gfx/trainers/red.2bpp.lz.51104ac6
diff --git a/gfx/trainers/red.pal b/gfx/trainers/red.pal
deleted file mode 100644
index 3ebf35fb7..000000000
--- a/gfx/trainers/red.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 28, 18, 17
-	RGB 22, 07, 08
-
diff --git a/gfx/trainers/red.png b/gfx/trainers/red.png
new file mode 100644
index 000000000..bd6d4a37d
Binary files /dev/null and b/gfx/trainers/red.png differ
diff --git a/gfx/trainers/rival1.2bpp.lz b/gfx/trainers/rival1.2bpp.lz.e43b32ef
similarity index 100%
rename from gfx/trainers/rival1.2bpp.lz
rename to gfx/trainers/rival1.2bpp.lz.e43b32ef
diff --git a/gfx/trainers/rival1.pal b/gfx/trainers/rival1.pal
deleted file mode 100644
index 190dc92e0..000000000
--- a/gfx/trainers/rival1.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 27, 18, 07
-	RGB 26, 04, 09
-
diff --git a/gfx/trainers/rival1.png b/gfx/trainers/rival1.png
new file mode 100644
index 000000000..60e29553d
Binary files /dev/null and b/gfx/trainers/rival1.png differ
diff --git a/gfx/trainers/rival2.2bpp.lz b/gfx/trainers/rival2.2bpp.lz.562de263
similarity index 100%
rename from gfx/trainers/rival2.2bpp.lz
rename to gfx/trainers/rival2.2bpp.lz.562de263
diff --git a/gfx/trainers/rival2.pal b/gfx/trainers/rival2.pal
deleted file mode 100644
index 190dc92e0..000000000
--- a/gfx/trainers/rival2.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 27, 18, 07
-	RGB 26, 04, 09
-
diff --git a/gfx/trainers/rival2.png b/gfx/trainers/rival2.png
new file mode 100644
index 000000000..b3f0ec48e
Binary files /dev/null and b/gfx/trainers/rival2.png differ
diff --git a/gfx/trainers/sabrina.2bpp.lz b/gfx/trainers/sabrina.2bpp.lz.d09a2b46
similarity index 100%
rename from gfx/trainers/sabrina.2bpp.lz
rename to gfx/trainers/sabrina.2bpp.lz.d09a2b46
diff --git a/gfx/trainers/sabrina.pal b/gfx/trainers/sabrina.pal
deleted file mode 100644
index 950be6902..000000000
--- a/gfx/trainers/sabrina.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 30, 22, 17
-	RGB 24, 07, 09
-
diff --git a/gfx/trainers/sabrina.png b/gfx/trainers/sabrina.png
new file mode 100644
index 000000000..815768c83
Binary files /dev/null and b/gfx/trainers/sabrina.png differ
diff --git a/gfx/trainers/sage.2bpp.lz b/gfx/trainers/sage.2bpp.lz.2038324b
similarity index 100%
rename from gfx/trainers/sage.2bpp.lz
rename to gfx/trainers/sage.2bpp.lz.2038324b
diff --git a/gfx/trainers/sage.pal b/gfx/trainers/sage.pal
deleted file mode 100644
index d61b39ec3..000000000
--- a/gfx/trainers/sage.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 30, 22, 17
-	RGB 08, 08, 20
-
diff --git a/gfx/trainers/sage.png b/gfx/trainers/sage.png
new file mode 100644
index 000000000..df7e3e4f4
Binary files /dev/null and b/gfx/trainers/sage.png differ
diff --git a/gfx/trainers/sailor.2bpp.lz b/gfx/trainers/sailor.2bpp.lz.0f7f3386
similarity index 100%
rename from gfx/trainers/sailor.2bpp.lz
rename to gfx/trainers/sailor.2bpp.lz.0f7f3386
diff --git a/gfx/trainers/sailor.pal b/gfx/trainers/sailor.pal
deleted file mode 100644
index 33b3c02b1..000000000
--- a/gfx/trainers/sailor.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 24, 14, 07
-	RGB 03, 07, 13
-
diff --git a/gfx/trainers/sailor.png b/gfx/trainers/sailor.png
new file mode 100644
index 000000000..09dee6b73
Binary files /dev/null and b/gfx/trainers/sailor.png differ
diff --git a/gfx/trainers/schoolboy.2bpp.lz b/gfx/trainers/schoolboy.2bpp.lz.6d26b31b
similarity index 100%
rename from gfx/trainers/schoolboy.2bpp.lz
rename to gfx/trainers/schoolboy.2bpp.lz.6d26b31b
diff --git a/gfx/trainers/schoolboy.pal b/gfx/trainers/schoolboy.pal
deleted file mode 100644
index 5ba665e79..000000000
--- a/gfx/trainers/schoolboy.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 25, 16, 11
-	RGB 13, 10, 24
-
diff --git a/gfx/trainers/schoolboy.png b/gfx/trainers/schoolboy.png
new file mode 100644
index 000000000..3c154e6d5
Binary files /dev/null and b/gfx/trainers/schoolboy.png differ
diff --git a/gfx/trainers/scientist.2bpp.lz b/gfx/trainers/scientist.2bpp.lz.2ef10474
similarity index 100%
rename from gfx/trainers/scientist.2bpp.lz
rename to gfx/trainers/scientist.2bpp.lz.2ef10474
diff --git a/gfx/trainers/scientist.pal b/gfx/trainers/scientist.pal
deleted file mode 100644
index 0661e50e8..000000000
--- a/gfx/trainers/scientist.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 24, 19, 11
-	RGB 10, 13, 17
-
diff --git a/gfx/trainers/scientist.png b/gfx/trainers/scientist.png
new file mode 100644
index 000000000..3ba33aef4
Binary files /dev/null and b/gfx/trainers/scientist.png differ
diff --git a/gfx/trainers/skier.2bpp.lz b/gfx/trainers/skier.2bpp.lz.399d4240
similarity index 100%
rename from gfx/trainers/skier.2bpp.lz
rename to gfx/trainers/skier.2bpp.lz.399d4240
diff --git a/gfx/trainers/skier.pal b/gfx/trainers/skier.pal
deleted file mode 100644
index 9201ca909..000000000
--- a/gfx/trainers/skier.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 28, 19, 15
-	RGB 24, 06, 14
-
diff --git a/gfx/trainers/skier.png b/gfx/trainers/skier.png
new file mode 100644
index 000000000..7f9466f1a
Binary files /dev/null and b/gfx/trainers/skier.png differ
diff --git a/gfx/trainers/super_nerd.2bpp.lz b/gfx/trainers/super_nerd.2bpp.lz.c5362664
similarity index 100%
rename from gfx/trainers/super_nerd.2bpp.lz
rename to gfx/trainers/super_nerd.2bpp.lz.c5362664
diff --git a/gfx/trainers/super_nerd.pal b/gfx/trainers/super_nerd.pal
deleted file mode 100644
index 862d4e21e..000000000
--- a/gfx/trainers/super_nerd.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 30, 22, 17
-	RGB 11, 09, 10
-
diff --git a/gfx/trainers/super_nerd.png b/gfx/trainers/super_nerd.png
new file mode 100644
index 000000000..8636f2262
Binary files /dev/null and b/gfx/trainers/super_nerd.png differ
diff --git a/gfx/trainers/swimmer_f.2bpp.lz b/gfx/trainers/swimmer_f.2bpp.lz.c60d0ad6
similarity index 100%
rename from gfx/trainers/swimmer_f.2bpp.lz
rename to gfx/trainers/swimmer_f.2bpp.lz.c60d0ad6
diff --git a/gfx/trainers/swimmer_f.pal b/gfx/trainers/swimmer_f.pal
deleted file mode 100644
index 6bddcbcc3..000000000
--- a/gfx/trainers/swimmer_f.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 25, 16, 05
-	RGB 06, 14, 04
-
diff --git a/gfx/trainers/swimmer_f.png b/gfx/trainers/swimmer_f.png
new file mode 100644
index 000000000..affef5f5e
Binary files /dev/null and b/gfx/trainers/swimmer_f.png differ
diff --git a/gfx/trainers/swimmer_m.2bpp.lz b/gfx/trainers/swimmer_m.2bpp.lz.2c1a716e
similarity index 100%
rename from gfx/trainers/swimmer_m.2bpp.lz
rename to gfx/trainers/swimmer_m.2bpp.lz.2c1a716e
diff --git a/gfx/trainers/swimmer_m.pal b/gfx/trainers/swimmer_m.pal
deleted file mode 100644
index 164d2166b..000000000
--- a/gfx/trainers/swimmer_m.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 03, 04, 09
-	RGB 21, 13, 01
-
diff --git a/gfx/trainers/swimmer_m.png b/gfx/trainers/swimmer_m.png
new file mode 100644
index 000000000..2c0442385
Binary files /dev/null and b/gfx/trainers/swimmer_m.png differ
diff --git a/gfx/trainers/teacher.2bpp.lz b/gfx/trainers/teacher.2bpp.lz.1d131210
similarity index 100%
rename from gfx/trainers/teacher.2bpp.lz
rename to gfx/trainers/teacher.2bpp.lz.1d131210
diff --git a/gfx/trainers/teacher.pal b/gfx/trainers/teacher.pal
deleted file mode 100644
index a614be34c..000000000
--- a/gfx/trainers/teacher.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 31, 20, 16
-	RGB 08, 11, 07
-
diff --git a/gfx/trainers/teacher.png b/gfx/trainers/teacher.png
new file mode 100644
index 000000000..d9e1b25cd
Binary files /dev/null and b/gfx/trainers/teacher.png differ
diff --git a/gfx/trainers/twins.2bpp.lz b/gfx/trainers/twins.2bpp.lz.462fd733
similarity index 100%
rename from gfx/trainers/twins.2bpp.lz
rename to gfx/trainers/twins.2bpp.lz.462fd733
diff --git a/gfx/trainers/twins.pal b/gfx/trainers/twins.pal
deleted file mode 100644
index 47792418b..000000000
--- a/gfx/trainers/twins.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 31, 22, 08
-	RGB 28, 03, 21
-
diff --git a/gfx/trainers/twins.png b/gfx/trainers/twins.png
new file mode 100644
index 000000000..4726f9599
Binary files /dev/null and b/gfx/trainers/twins.png differ
diff --git a/gfx/trainers/whitney.2bpp.lz b/gfx/trainers/whitney.2bpp.lz.dcb46ea6
similarity index 100%
rename from gfx/trainers/whitney.2bpp.lz
rename to gfx/trainers/whitney.2bpp.lz.dcb46ea6
diff --git a/gfx/trainers/whitney.pal b/gfx/trainers/whitney.pal
deleted file mode 100644
index a51af5fda..000000000
--- a/gfx/trainers/whitney.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 28, 18, 09
-	RGB 21, 07, 02
-
diff --git a/gfx/trainers/whitney.png b/gfx/trainers/whitney.png
new file mode 100644
index 000000000..b9b4aa497
Binary files /dev/null and b/gfx/trainers/whitney.png differ
diff --git a/gfx/trainers/will.2bpp.lz b/gfx/trainers/will.2bpp.lz.842af358
similarity index 100%
rename from gfx/trainers/will.2bpp.lz
rename to gfx/trainers/will.2bpp.lz.842af358
diff --git a/gfx/trainers/will.pal b/gfx/trainers/will.pal
deleted file mode 100644
index d27fd8069..000000000
--- a/gfx/trainers/will.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 23, 15, 09
-	RGB 26, 04, 02
-
diff --git a/gfx/trainers/will.png b/gfx/trainers/will.png
new file mode 100644
index 000000000..599f7cce8
Binary files /dev/null and b/gfx/trainers/will.png differ
diff --git a/gfx/trainers/youngster.2bpp.lz b/gfx/trainers/youngster.2bpp.lz.4bef139d
similarity index 100%
rename from gfx/trainers/youngster.2bpp.lz
rename to gfx/trainers/youngster.2bpp.lz.4bef139d
diff --git a/gfx/trainers/youngster.pal b/gfx/trainers/youngster.pal
deleted file mode 100644
index a330d692f..000000000
--- a/gfx/trainers/youngster.pal
+++ /dev/null
@@ -1,4 +0,0 @@
-
-	RGB 28, 20, 09
-	RGB 09, 12, 23
-
diff --git a/gfx/trainers/youngster.png b/gfx/trainers/youngster.png
new file mode 100644
index 000000000..9b6d96eea
Binary files /dev/null and b/gfx/trainers/youngster.png differ