292 files changed, 343 insertions, 191 deletions

diff --git a/graphics/interface/unk_8D2FBB4.pal b/graphics/interface/unk_8D2FBB4.pal
new file mode 100644
index 000000000..46860b414
--- /dev/null
+++ b/graphics/interface/unk_8D2FBB4.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+238 222 0
+255 246 139
+255 148 0
+255 238 115
+238 0 0
+246 222 156
+32 32 32
+222 222 222
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/interface/unk_8E8362C.png b/graphics/interface/unk_8E8362C.png
new file mode 100644
index 000000000..104c26c84
--- /dev/null
+++ b/graphics/interface/unk_8E8362C.png
diff --git a/graphics/interface/unk_8E83DBC.png b/graphics/interface/unk_8E83DBC.png
new file mode 100644
index 000000000..2024de528
--- /dev/null
+++ b/graphics/interface/unk_8E83DBC.png
diff --git a/graphics/interface/unk_8E84560.pal b/graphics/interface/unk_8E84560.pal
new file mode 100644
index 000000000..6c36252b6
--- /dev/null
+++ b/graphics/interface/unk_8E84560.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+82 205 180
+255 246 180
+255 230 123
+238 205 98
+213 172 98
+65 74 106
+123 123 123
+90 90 90
+172 172 172
+164 123 65
+255 255 255
+222 106 0
+189 74 0
+131 41 0
+213 222 230
+230 238 246
diff --git a/graphics/trainers/palettes/emerald_red_back_pic.pal b/graphics/map_objects/0.pal
index 3097a6556..3097a6556 100644
--- a/graphics/trainers/palettes/emerald_red_back_pic.pal
+++ b/graphics/map_objects/0.pal
diff --git a/graphics/map_objects/000.png b/graphics/map_objects/000.png
new file mode 100644
index 000000000..8b72a852f
--- /dev/null
+++ b/graphics/map_objects/000.png
diff --git a/graphics/map_objects/001.png b/graphics/map_objects/001.png
new file mode 100644
index 000000000..ee7d0a1d3
--- /dev/null
+++ b/graphics/map_objects/001.png
diff --git a/graphics/map_objects/002.png b/graphics/map_objects/002.png
new file mode 100644
index 000000000..961bff7a8
--- /dev/null
+++ b/graphics/map_objects/002.png
diff --git a/graphics/map_objects/004.png b/graphics/map_objects/004.png
new file mode 100644
index 000000000..a5ae8b3d1
--- /dev/null
+++ b/graphics/map_objects/004.png
diff --git a/graphics/map_objects/005.png b/graphics/map_objects/005.png
new file mode 100644
index 000000000..66d53ea88
--- /dev/null
+++ b/graphics/map_objects/005.png
diff --git a/graphics/map_objects/006.png b/graphics/map_objects/006.png
new file mode 100644
index 000000000..90b198edb
--- /dev/null
+++ b/graphics/map_objects/006.png
diff --git a/graphics/map_objects/007.png b/graphics/map_objects/007.png
new file mode 100644
index 000000000..c65b97a5c
--- /dev/null
+++ b/graphics/map_objects/007.png
diff --git a/graphics/map_objects/008.png b/graphics/map_objects/008.png
new file mode 100644
index 000000000..b1e1ede7a
--- /dev/null
+++ b/graphics/map_objects/008.png
diff --git a/graphics/map_objects/009.png b/graphics/map_objects/009.png
new file mode 100644
index 000000000..7246e388d
--- /dev/null
+++ b/graphics/map_objects/009.png
diff --git a/graphics/map_objects/011.png b/graphics/map_objects/011.png
new file mode 100644
index 000000000..61446035c
--- /dev/null
+++ b/graphics/map_objects/011.png
diff --git a/graphics/map_objects/012.png b/graphics/map_objects/012.png
new file mode 100644
index 000000000..c1cd5c574
--- /dev/null
+++ b/graphics/map_objects/012.png
diff --git a/graphics/map_objects/013.png b/graphics/map_objects/013.png
new file mode 100644
index 000000000..f4140b8d0
--- /dev/null
+++ b/graphics/map_objects/013.png
diff --git a/graphics/map_objects/014.png b/graphics/map_objects/014.png
new file mode 100644
index 000000000..b79967c4b
--- /dev/null
+++ b/graphics/map_objects/014.png
diff --git a/graphics/map_objects/015.png b/graphics/map_objects/015.png
new file mode 100644
index 000000000..6cc84665c
--- /dev/null
+++ b/graphics/map_objects/015.png
diff --git a/graphics/map_objects/016.png b/graphics/map_objects/016.png
new file mode 100644
index 000000000..e53418256
--- /dev/null
+++ b/graphics/map_objects/016.png
diff --git a/graphics/map_objects/017.png b/graphics/map_objects/017.png
new file mode 100644
index 000000000..2ce6d6355
--- /dev/null
+++ b/graphics/map_objects/017.png
diff --git a/graphics/map_objects/018.png b/graphics/map_objects/018.png
new file mode 100644
index 000000000..13f4ee1f2
--- /dev/null
+++ b/graphics/map_objects/018.png
diff --git a/graphics/map_objects/019.png b/graphics/map_objects/019.png
new file mode 100644
index 000000000..749051218
--- /dev/null
+++ b/graphics/map_objects/019.png
diff --git a/graphics/map_objects/020.png b/graphics/map_objects/020.png
new file mode 100644
index 000000000..dd33a7921
--- /dev/null
+++ b/graphics/map_objects/020.png
diff --git a/graphics/map_objects/021.png b/graphics/map_objects/021.png
new file mode 100644
index 000000000..15eabb0b3
--- /dev/null
+++ b/graphics/map_objects/021.png
diff --git a/graphics/map_objects/022.png b/graphics/map_objects/022.png
new file mode 100644
index 000000000..82d08630c
--- /dev/null
+++ b/graphics/map_objects/022.png
diff --git a/graphics/map_objects/023.png b/graphics/map_objects/023.png
new file mode 100644
index 000000000..b3922d5f8
--- /dev/null
+++ b/graphics/map_objects/023.png
diff --git a/graphics/map_objects/024.png b/graphics/map_objects/024.png
new file mode 100644
index 000000000..20125262a
--- /dev/null
+++ b/graphics/map_objects/024.png
diff --git a/graphics/map_objects/025.png b/graphics/map_objects/025.png
new file mode 100644
index 000000000..d3c38275a
--- /dev/null
+++ b/graphics/map_objects/025.png
diff --git a/graphics/map_objects/026.png b/graphics/map_objects/026.png
new file mode 100644
index 000000000..44b8b5c50
--- /dev/null
+++ b/graphics/map_objects/026.png
diff --git a/graphics/map_objects/027.png b/graphics/map_objects/027.png
new file mode 100644
index 000000000..b5ed884fd
--- /dev/null
+++ b/graphics/map_objects/027.png
diff --git a/graphics/map_objects/028.png b/graphics/map_objects/028.png
new file mode 100644
index 000000000..95d3c5e0f
--- /dev/null
+++ b/graphics/map_objects/028.png
diff --git a/graphics/map_objects/029.png b/graphics/map_objects/029.png
new file mode 100644
index 000000000..006b67036
--- /dev/null
+++ b/graphics/map_objects/029.png
diff --git a/graphics/map_objects/030.png b/graphics/map_objects/030.png
new file mode 100644
index 000000000..1c2d8eb63
--- /dev/null
+++ b/graphics/map_objects/030.png
diff --git a/graphics/map_objects/031.png b/graphics/map_objects/031.png
new file mode 100644
index 000000000..fc278b97e
--- /dev/null
+++ b/graphics/map_objects/031.png
diff --git a/graphics/map_objects/032.png b/graphics/map_objects/032.png
new file mode 100644
index 000000000..87d1e4ce4
--- /dev/null
+++ b/graphics/map_objects/032.png
diff --git a/graphics/map_objects/033.png b/graphics/map_objects/033.png
new file mode 100644
index 000000000..f6913ed9b
--- /dev/null
+++ b/graphics/map_objects/033.png
diff --git a/graphics/map_objects/034.png b/graphics/map_objects/034.png
new file mode 100644
index 000000000..05a775388
--- /dev/null
+++ b/graphics/map_objects/034.png
diff --git a/graphics/map_objects/035.png b/graphics/map_objects/035.png
new file mode 100644
index 000000000..a99ab0238
--- /dev/null
+++ b/graphics/map_objects/035.png
diff --git a/graphics/map_objects/036.png b/graphics/map_objects/036.png
new file mode 100644
index 000000000..23fe7c6e3
--- /dev/null
+++ b/graphics/map_objects/036.png
diff --git a/graphics/map_objects/037.png b/graphics/map_objects/037.png
new file mode 100644
index 000000000..c4f962acb
--- /dev/null
+++ b/graphics/map_objects/037.png
diff --git a/graphics/map_objects/038.png b/graphics/map_objects/038.png
new file mode 100644
index 000000000..b53913af7
--- /dev/null
+++ b/graphics/map_objects/038.png
diff --git a/graphics/map_objects/039.png b/graphics/map_objects/039.png
new file mode 100644
index 000000000..45d4400d8
--- /dev/null
+++ b/graphics/map_objects/039.png
diff --git a/graphics/map_objects/040.png b/graphics/map_objects/040.png
new file mode 100644
index 000000000..8bff4d72e
--- /dev/null
+++ b/graphics/map_objects/040.png
diff --git a/graphics/map_objects/041.png b/graphics/map_objects/041.png
new file mode 100644
index 000000000..df48acad0
--- /dev/null
+++ b/graphics/map_objects/041.png
diff --git a/graphics/map_objects/042.png b/graphics/map_objects/042.png
new file mode 100644
index 000000000..63a47e95b
--- /dev/null
+++ b/graphics/map_objects/042.png
diff --git a/graphics/map_objects/043.png b/graphics/map_objects/043.png
new file mode 100644
index 000000000..ded67966a
--- /dev/null
+++ b/graphics/map_objects/043.png
diff --git a/graphics/map_objects/044.png b/graphics/map_objects/044.png
new file mode 100644
index 000000000..a76e9bd47
--- /dev/null
+++ b/graphics/map_objects/044.png
diff --git a/graphics/map_objects/045.png b/graphics/map_objects/045.png
new file mode 100644
index 000000000..9e862173a
--- /dev/null
+++ b/graphics/map_objects/045.png
diff --git a/graphics/map_objects/046.png b/graphics/map_objects/046.png
new file mode 100644
index 000000000..2f7a5f796
--- /dev/null
+++ b/graphics/map_objects/046.png
diff --git a/graphics/map_objects/047.png b/graphics/map_objects/047.png
new file mode 100644
index 000000000..361e028c4
--- /dev/null
+++ b/graphics/map_objects/047.png
diff --git a/graphics/map_objects/048.png b/graphics/map_objects/048.png
new file mode 100644
index 000000000..20a4e3a15
--- /dev/null
+++ b/graphics/map_objects/048.png
diff --git a/graphics/map_objects/049.png b/graphics/map_objects/049.png
new file mode 100644
index 000000000..07222b9ba
--- /dev/null
+++ b/graphics/map_objects/049.png
diff --git a/graphics/map_objects/050.png b/graphics/map_objects/050.png
new file mode 100644
index 000000000..8c3817c82
--- /dev/null
+++ b/graphics/map_objects/050.png
diff --git a/graphics/map_objects/051.png b/graphics/map_objects/051.png
new file mode 100644
index 000000000..358a4dd1b
--- /dev/null
+++ b/graphics/map_objects/051.png
diff --git a/graphics/map_objects/052.png b/graphics/map_objects/052.png
new file mode 100644
index 000000000..95089c7ee
--- /dev/null
+++ b/graphics/map_objects/052.png
diff --git a/graphics/map_objects/053.png b/graphics/map_objects/053.png
new file mode 100644
index 000000000..6671943dd
--- /dev/null
+++ b/graphics/map_objects/053.png
diff --git a/graphics/map_objects/054.png b/graphics/map_objects/054.png
new file mode 100644
index 000000000..7717ce43b
--- /dev/null
+++ b/graphics/map_objects/054.png
diff --git a/graphics/map_objects/055.png b/graphics/map_objects/055.png
new file mode 100644
index 000000000..b85011c3c
--- /dev/null
+++ b/graphics/map_objects/055.png
diff --git a/graphics/map_objects/056.png b/graphics/map_objects/056.png
new file mode 100644
index 000000000..7c4d443a2
--- /dev/null
+++ b/graphics/map_objects/056.png
diff --git a/graphics/map_objects/057.png b/graphics/map_objects/057.png
new file mode 100644
index 000000000..8961c0765
--- /dev/null
+++ b/graphics/map_objects/057.png
diff --git a/graphics/map_objects/058.png b/graphics/map_objects/058.png
new file mode 100644
index 000000000..f6925577d
--- /dev/null
+++ b/graphics/map_objects/058.png
diff --git a/graphics/map_objects/059.png b/graphics/map_objects/059.png
new file mode 100644
index 000000000..a251297b6
--- /dev/null
+++ b/graphics/map_objects/059.png
diff --git a/graphics/map_objects/060.png b/graphics/map_objects/060.png
new file mode 100644
index 000000000..aedee9f67
--- /dev/null
+++ b/graphics/map_objects/060.png
diff --git a/graphics/map_objects/061.png b/graphics/map_objects/061.png
new file mode 100644
index 000000000..de57e641f
--- /dev/null
+++ b/graphics/map_objects/061.png
diff --git a/graphics/map_objects/062.png b/graphics/map_objects/062.png
new file mode 100644
index 000000000..175e14e47
--- /dev/null
+++ b/graphics/map_objects/062.png
diff --git a/graphics/map_objects/063.png b/graphics/map_objects/063.png
new file mode 100644
index 000000000..fbf6aa689
--- /dev/null
+++ b/graphics/map_objects/063.png
diff --git a/graphics/map_objects/064.png b/graphics/map_objects/064.png
new file mode 100644
index 000000000..328d1f6b7
--- /dev/null
+++ b/graphics/map_objects/064.png
diff --git a/graphics/map_objects/065.png b/graphics/map_objects/065.png
new file mode 100644
index 000000000..74e081153
--- /dev/null
+++ b/graphics/map_objects/065.png
diff --git a/graphics/map_objects/066.png b/graphics/map_objects/066.png
new file mode 100644
index 000000000..ef0ecdba4
--- /dev/null
+++ b/graphics/map_objects/066.png
diff --git a/graphics/map_objects/067.png b/graphics/map_objects/067.png
new file mode 100644
index 000000000..d1c20e818
--- /dev/null
+++ b/graphics/map_objects/067.png
diff --git a/graphics/map_objects/068.png b/graphics/map_objects/068.png
new file mode 100644
index 000000000..485678492
--- /dev/null
+++ b/graphics/map_objects/068.png
diff --git a/graphics/map_objects/069.png b/graphics/map_objects/069.png
new file mode 100644
index 000000000..f503cf0c9
--- /dev/null
+++ b/graphics/map_objects/069.png
diff --git a/graphics/map_objects/070.png b/graphics/map_objects/070.png
new file mode 100644
index 000000000..a3f994a83
--- /dev/null
+++ b/graphics/map_objects/070.png
diff --git a/graphics/map_objects/071.png b/graphics/map_objects/071.png
new file mode 100644
index 000000000..fab2b23ac
--- /dev/null
+++ b/graphics/map_objects/071.png
diff --git a/graphics/map_objects/072.png b/graphics/map_objects/072.png
new file mode 100644
index 000000000..a66593653
--- /dev/null
+++ b/graphics/map_objects/072.png
diff --git a/graphics/map_objects/073.png b/graphics/map_objects/073.png
new file mode 100644
index 000000000..85b82a47f
--- /dev/null
+++ b/graphics/map_objects/073.png
diff --git a/graphics/map_objects/074.png b/graphics/map_objects/074.png
new file mode 100644
index 000000000..b7426b280
--- /dev/null
+++ b/graphics/map_objects/074.png
diff --git a/graphics/map_objects/075.png b/graphics/map_objects/075.png
new file mode 100644
index 000000000..b8bf3ede6
--- /dev/null
+++ b/graphics/map_objects/075.png
diff --git a/graphics/map_objects/076.png b/graphics/map_objects/076.png
new file mode 100644
index 000000000..5ba2f26f8
--- /dev/null
+++ b/graphics/map_objects/076.png
diff --git a/graphics/map_objects/077.png b/graphics/map_objects/077.png
new file mode 100644
index 000000000..0b535572e
--- /dev/null
+++ b/graphics/map_objects/077.png
diff --git a/graphics/map_objects/078.png b/graphics/map_objects/078.png
new file mode 100644
index 000000000..4b6983de6
--- /dev/null
+++ b/graphics/map_objects/078.png
diff --git a/graphics/map_objects/079.png b/graphics/map_objects/079.png
new file mode 100644
index 000000000..ac5ee5e9f
--- /dev/null
+++ b/graphics/map_objects/079.png
diff --git a/graphics/map_objects/080.png b/graphics/map_objects/080.png
new file mode 100644
index 000000000..bf48c8dd7
--- /dev/null
+++ b/graphics/map_objects/080.png
diff --git a/graphics/map_objects/081.png b/graphics/map_objects/081.png
new file mode 100644
index 000000000..0e4a837b5
--- /dev/null
+++ b/graphics/map_objects/081.png
diff --git a/graphics/map_objects/082.png b/graphics/map_objects/082.png
new file mode 100644
index 000000000..07435e777
--- /dev/null
+++ b/graphics/map_objects/082.png
diff --git a/graphics/map_objects/083.png b/graphics/map_objects/083.png
new file mode 100644
index 000000000..015b6bbe3
--- /dev/null
+++ b/graphics/map_objects/083.png
diff --git a/graphics/map_objects/084.png b/graphics/map_objects/084.png
new file mode 100644
index 000000000..b45ec3f25
--- /dev/null
+++ b/graphics/map_objects/084.png
diff --git a/graphics/map_objects/085.png b/graphics/map_objects/085.png
new file mode 100644
index 000000000..101dfb0e0
--- /dev/null
+++ b/graphics/map_objects/085.png
diff --git a/graphics/map_objects/086.png b/graphics/map_objects/086.png
new file mode 100644
index 000000000..19ccb8fcc
--- /dev/null
+++ b/graphics/map_objects/086.png
diff --git a/graphics/map_objects/087.png b/graphics/map_objects/087.png
new file mode 100644
index 000000000..5f9585a61
--- /dev/null
+++ b/graphics/map_objects/087.png
diff --git a/graphics/map_objects/088.png b/graphics/map_objects/088.png
new file mode 100644
index 000000000..c7e79eefd
--- /dev/null
+++ b/graphics/map_objects/088.png
diff --git a/graphics/map_objects/089.png b/graphics/map_objects/089.png
new file mode 100644
index 000000000..1dc91873d
--- /dev/null
+++ b/graphics/map_objects/089.png
diff --git a/graphics/map_objects/090.png b/graphics/map_objects/090.png
new file mode 100644
index 000000000..320da6daa
--- /dev/null
+++ b/graphics/map_objects/090.png
diff --git a/graphics/map_objects/091.png b/graphics/map_objects/091.png
new file mode 100644
index 000000000..8a55cd3d3
--- /dev/null
+++ b/graphics/map_objects/091.png
diff --git a/graphics/map_objects/092.png b/graphics/map_objects/092.png
new file mode 100644
index 000000000..5b91624c7
--- /dev/null
+++ b/graphics/map_objects/092.png
diff --git a/graphics/map_objects/093.png b/graphics/map_objects/093.png
new file mode 100644
index 000000000..1092e5695
--- /dev/null
+++ b/graphics/map_objects/093.png
diff --git a/graphics/map_objects/094.png b/graphics/map_objects/094.png
new file mode 100644
index 000000000..9089df959
--- /dev/null
+++ b/graphics/map_objects/094.png
diff --git a/graphics/map_objects/095.png b/graphics/map_objects/095.png
new file mode 100644
index 000000000..ce110cd9e
--- /dev/null
+++ b/graphics/map_objects/095.png
diff --git a/graphics/map_objects/096.png b/graphics/map_objects/096.png
new file mode 100644
index 000000000..315fb0089
--- /dev/null
+++ b/graphics/map_objects/096.png
diff --git a/graphics/map_objects/097.png b/graphics/map_objects/097.png
new file mode 100644
index 000000000..2f594708f
--- /dev/null
+++ b/graphics/map_objects/097.png
diff --git a/graphics/map_objects/098.png b/graphics/map_objects/098.png
new file mode 100644
index 000000000..2e87e553a
--- /dev/null
+++ b/graphics/map_objects/098.png
diff --git a/graphics/map_objects/099.png b/graphics/map_objects/099.png
new file mode 100644
index 000000000..099670aa3
--- /dev/null
+++ b/graphics/map_objects/099.png
diff --git a/graphics/map_objects/1.pal b/graphics/map_objects/1.pal
new file mode 100644
index 000000000..5537faa0f
--- /dev/null
+++ b/graphics/map_objects/1.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+197 255 246
+238 189 180
+255 255 230
+255 230 197
+205 148 148
+123 164 238
+115 131 197
+172 213 255
+172 123 98
+255 255 255
+222 222 255
+255 230 172
+255 172 172
+255 255 172
+230 205 115
+82 82 82
diff --git a/graphics/map_objects/10.pal b/graphics/map_objects/10.pal
new file mode 100644
index 000000000..ae8272ec4
--- /dev/null
+++ b/graphics/map_objects/10.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+98 172 238
+255 255 255
+255 255 230
+255 230 197
+205 148 148
+230 205 131
+205 180 106
+164 139 65
+255 197 139
+246 156 106
+205 115 90
+222 222 230
+180 180 180
+139 139 148
+255 255 255
+82 82 82
diff --git a/graphics/map_objects/100.png b/graphics/map_objects/100.png
new file mode 100644
index 000000000..97a278aa5
--- /dev/null
+++ b/graphics/map_objects/100.png
diff --git a/graphics/map_objects/101.png b/graphics/map_objects/101.png
new file mode 100644
index 000000000..82d7d9424
--- /dev/null
+++ b/graphics/map_objects/101.png
diff --git a/graphics/map_objects/102.png b/graphics/map_objects/102.png
new file mode 100644
index 000000000..537e9b718
--- /dev/null
+++ b/graphics/map_objects/102.png
diff --git a/graphics/map_objects/103.png b/graphics/map_objects/103.png
new file mode 100644
index 000000000..c255ad15a
--- /dev/null
+++ b/graphics/map_objects/103.png
diff --git a/graphics/map_objects/104.png b/graphics/map_objects/104.png
new file mode 100644
index 000000000..2717cf7a9
--- /dev/null
+++ b/graphics/map_objects/104.png
diff --git a/graphics/map_objects/105.png b/graphics/map_objects/105.png
new file mode 100644
index 000000000..d5cef50ea
--- /dev/null
+++ b/graphics/map_objects/105.png
diff --git a/graphics/map_objects/106.png b/graphics/map_objects/106.png
new file mode 100644
index 000000000..706049ee0
--- /dev/null
+++ b/graphics/map_objects/106.png
diff --git a/graphics/map_objects/107.png b/graphics/map_objects/107.png
new file mode 100644
index 000000000..e0d216fb3
--- /dev/null
+++ b/graphics/map_objects/107.png
diff --git a/graphics/map_objects/108.png b/graphics/map_objects/108.png
new file mode 100644
index 000000000..a28a5ab9a
--- /dev/null
+++ b/graphics/map_objects/108.png
diff --git a/graphics/map_objects/109.png b/graphics/map_objects/109.png
new file mode 100644
index 000000000..b8affc19b
--- /dev/null
+++ b/graphics/map_objects/109.png
diff --git a/graphics/map_objects/11.pal b/graphics/map_objects/11.pal
new file mode 100644
index 000000000..b36c29ab1
--- /dev/null
+++ b/graphics/map_objects/11.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+41 41 32
+41 41 41
+90 90 82
+139 139 115
+180 180 164
+213 156 16
+238 197 16
+255 222 98
+0 90 197
+0 131 238
+156 180 205
+213 230 238
+255 255 255
+0 139 0
+0 205 0
diff --git a/graphics/map_objects/110.png b/graphics/map_objects/110.png
new file mode 100644
index 000000000..499f51e8c
--- /dev/null
+++ b/graphics/map_objects/110.png
diff --git a/graphics/map_objects/111.png b/graphics/map_objects/111.png
new file mode 100644
index 000000000..ba51eaddc
--- /dev/null
+++ b/graphics/map_objects/111.png
diff --git a/graphics/map_objects/112.png b/graphics/map_objects/112.png
new file mode 100644
index 000000000..0c8428fd3
--- /dev/null
+++ b/graphics/map_objects/112.png
diff --git a/graphics/map_objects/113.png b/graphics/map_objects/113.png
new file mode 100644
index 000000000..e5817bac8
--- /dev/null
+++ b/graphics/map_objects/113.png
diff --git a/graphics/map_objects/114.png b/graphics/map_objects/114.png
new file mode 100644
index 000000000..55748d9a0
--- /dev/null
+++ b/graphics/map_objects/114.png
diff --git a/graphics/map_objects/115.png b/graphics/map_objects/115.png
new file mode 100644
index 000000000..ccd46b1f8
--- /dev/null
+++ b/graphics/map_objects/115.png
diff --git a/graphics/map_objects/116.png b/graphics/map_objects/116.png
new file mode 100644
index 000000000..a109eb2c6
--- /dev/null
+++ b/graphics/map_objects/116.png
diff --git a/graphics/map_objects/117.png b/graphics/map_objects/117.png
new file mode 100644
index 000000000..550a58260
--- /dev/null
+++ b/graphics/map_objects/117.png
diff --git a/graphics/map_objects/118.png b/graphics/map_objects/118.png
new file mode 100644
index 000000000..083897483
--- /dev/null
+++ b/graphics/map_objects/118.png
diff --git a/graphics/map_objects/119.png b/graphics/map_objects/119.png
new file mode 100644
index 000000000..ed82e390e
--- /dev/null
+++ b/graphics/map_objects/119.png
diff --git a/graphics/map_objects/12.pal b/graphics/map_objects/12.pal
new file mode 100644
index 000000000..b69e9ac0a
--- /dev/null
+++ b/graphics/map_objects/12.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 255 255
+139 139 131
+139 139 139
+189 189 180
+238 238 213
+255 255 255
+255 255 115
+255 255 115
+255 255 197
+98 189 255
+98 230 255
+255 255 255
+255 255 255
+255 255 255
+98 238 98
+98 255 98
diff --git a/graphics/map_objects/120.png b/graphics/map_objects/120.png
new file mode 100644
index 000000000..7b837e11b
--- /dev/null
+++ b/graphics/map_objects/120.png
diff --git a/graphics/map_objects/121.png b/graphics/map_objects/121.png
new file mode 100644
index 000000000..1f0dd24e0
--- /dev/null
+++ b/graphics/map_objects/121.png
diff --git a/graphics/map_objects/122.png b/graphics/map_objects/122.png
new file mode 100644
index 000000000..b25ee75f4
--- /dev/null
+++ b/graphics/map_objects/122.png
diff --git a/graphics/map_objects/123.png b/graphics/map_objects/123.png
new file mode 100644
index 000000000..4a2768475
--- /dev/null
+++ b/graphics/map_objects/123.png
diff --git a/graphics/map_objects/124.png b/graphics/map_objects/124.png
new file mode 100644
index 000000000..8cdfa0ef2
--- /dev/null
+++ b/graphics/map_objects/124.png
diff --git a/graphics/map_objects/125.png b/graphics/map_objects/125.png
new file mode 100644
index 000000000..31203db01
--- /dev/null
+++ b/graphics/map_objects/125.png
diff --git a/graphics/map_objects/126.png b/graphics/map_objects/126.png
new file mode 100644
index 000000000..2cd14040c
--- /dev/null
+++ b/graphics/map_objects/126.png
diff --git a/graphics/map_objects/127.png b/graphics/map_objects/127.png
new file mode 100644
index 000000000..973306673
--- /dev/null
+++ b/graphics/map_objects/127.png
diff --git a/graphics/map_objects/128.png b/graphics/map_objects/128.png
new file mode 100644
index 000000000..9baab0bbe
--- /dev/null
+++ b/graphics/map_objects/128.png
diff --git a/graphics/map_objects/129.png b/graphics/map_objects/129.png
new file mode 100644
index 000000000..1cd63f1eb
--- /dev/null
+++ b/graphics/map_objects/129.png
diff --git a/graphics/map_objects/130.png b/graphics/map_objects/130.png
new file mode 100644
index 000000000..db791455b
--- /dev/null
+++ b/graphics/map_objects/130.png
diff --git a/graphics/map_objects/131.png b/graphics/map_objects/131.png
new file mode 100644
index 000000000..c8252a957
--- /dev/null
+++ b/graphics/map_objects/131.png
diff --git a/graphics/map_objects/132.png b/graphics/map_objects/132.png
new file mode 100644
index 000000000..9a63cab7e
--- /dev/null
+++ b/graphics/map_objects/132.png
diff --git a/graphics/map_objects/133.png b/graphics/map_objects/133.png
new file mode 100644
index 000000000..c26ced826
--- /dev/null
+++ b/graphics/map_objects/133.png
diff --git a/graphics/map_objects/134.png b/graphics/map_objects/134.png
new file mode 100644
index 000000000..74a29680c
--- /dev/null
+++ b/graphics/map_objects/134.png
diff --git a/graphics/map_objects/135.png b/graphics/map_objects/135.png
new file mode 100644
index 000000000..3fd66ec1d
--- /dev/null
+++ b/graphics/map_objects/135.png
diff --git a/graphics/map_objects/136.png b/graphics/map_objects/136.png
new file mode 100644
index 000000000..58dfd65fa
--- /dev/null
+++ b/graphics/map_objects/136.png
diff --git a/graphics/map_objects/137.png b/graphics/map_objects/137.png
new file mode 100644
index 000000000..d9b6a0b68
--- /dev/null
+++ b/graphics/map_objects/137.png
diff --git a/graphics/map_objects/138.png b/graphics/map_objects/138.png
new file mode 100644
index 000000000..c062c6022
--- /dev/null
+++ b/graphics/map_objects/138.png
diff --git a/graphics/map_objects/139.png b/graphics/map_objects/139.png
new file mode 100644
index 000000000..a587d78a9
--- /dev/null
+++ b/graphics/map_objects/139.png
diff --git a/graphics/map_objects/140.png b/graphics/map_objects/140.png
new file mode 100644
index 000000000..934aec110
--- /dev/null
+++ b/graphics/map_objects/140.png
diff --git a/graphics/map_objects/141.png b/graphics/map_objects/141.png
new file mode 100644
index 000000000..c646f7bce
--- /dev/null
+++ b/graphics/map_objects/141.png
diff --git a/graphics/map_objects/142.png b/graphics/map_objects/142.png
new file mode 100644
index 000000000..f471416e6
--- /dev/null
+++ b/graphics/map_objects/142.png
diff --git a/graphics/map_objects/143.png b/graphics/map_objects/143.png
new file mode 100644
index 000000000..727d674e8
--- /dev/null
+++ b/graphics/map_objects/143.png
diff --git a/graphics/map_objects/144.png b/graphics/map_objects/144.png
new file mode 100644
index 000000000..22794f5c6
--- /dev/null
+++ b/graphics/map_objects/144.png
diff --git a/graphics/map_objects/145.png b/graphics/map_objects/145.png
new file mode 100644
index 000000000..3d2a7f11b
--- /dev/null
+++ b/graphics/map_objects/145.png
diff --git a/graphics/map_objects/146.png b/graphics/map_objects/146.png
new file mode 100644
index 000000000..743a072d2
--- /dev/null
+++ b/graphics/map_objects/146.png
diff --git a/graphics/map_objects/147.png b/graphics/map_objects/147.png
new file mode 100644
index 000000000..50339fbc0
--- /dev/null
+++ b/graphics/map_objects/147.png
diff --git a/graphics/map_objects/148.png b/graphics/map_objects/148.png
new file mode 100644
index 000000000..9079690f0
--- /dev/null
+++ b/graphics/map_objects/148.png
diff --git a/graphics/map_objects/149.png b/graphics/map_objects/149.png
new file mode 100644
index 000000000..84c160d61
--- /dev/null
+++ b/graphics/map_objects/149.png
diff --git a/graphics/map_objects/150.png b/graphics/map_objects/150.png
new file mode 100644
index 000000000..48695b960
--- /dev/null
+++ b/graphics/map_objects/150.png
diff --git a/graphics/map_objects/151.png b/graphics/map_objects/151.png
new file mode 100644
index 000000000..0331e4440
--- /dev/null
+++ b/graphics/map_objects/151.png
diff --git a/graphics/map_objects/152.png b/graphics/map_objects/152.png
new file mode 100644
index 000000000..d39504689
--- /dev/null
+++ b/graphics/map_objects/152.png
diff --git a/graphics/trainers/palettes/emerald_leaf_back_pic.pal b/graphics/map_objects/16.pal
index 27436be92..3097a6556 100644
--- a/graphics/trainers/palettes/emerald_leaf_back_pic.pal
+++ b/graphics/map_objects/16.pal
@@ -1,7 +1,7 @@
 JASC-PAL
 0100
 16
-115 197 164
+131 123 164
 172 123 65
 255 197 148
 222 148 115
diff --git a/graphics/map_objects/17.pal b/graphics/map_objects/17.pal
new file mode 100644
index 000000000..5537faa0f
--- /dev/null
+++ b/graphics/map_objects/17.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+197 255 246
+238 189 180
+255 255 230
+255 230 197
+205 148 148
+123 164 238
+115 131 197
+172 213 255
+172 123 98
+255 255 255
+222 222 255
+255 230 172
+255 172 172
+255 255 172
+230 205 115
+82 82 82
diff --git a/graphics/map_objects/19.pal b/graphics/map_objects/19.pal
new file mode 100644
index 000000000..c20bacb57
--- /dev/null
+++ b/graphics/map_objects/19.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+106 156 197
+32 32 32
+82 82 82
+139 139 139
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/map_objects/2.pal b/graphics/map_objects/2.pal
new file mode 100644
index 000000000..0cebd6c4d
--- /dev/null
+++ b/graphics/map_objects/2.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+74 115 172
+74 115 172
+74 115 172
+74 115 172
+74 115 172
+74 115 172
+74 115 172
+74 115 172
+74 115 172
+74 115 172
+74 115 172
+74 115 172
+74 115 172
+74 115 172
+74 115 172
+74 115 172
diff --git a/graphics/map_objects/20.pal b/graphics/map_objects/20.pal
new file mode 100644
index 000000000..c25501332
--- /dev/null
+++ b/graphics/map_objects/20.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+65 123 180
+238 246 255
+222 230 238
+189 205 230
+156 164 189
+139 139 156
+98 98 123
+57 57 106
+197 98 98
+172 65 106
+32 74 156
+197 148 0
+246 213 24
+222 238 255
+255 255 255
+74 106 139
diff --git a/graphics/map_objects/21.pal b/graphics/map_objects/21.pal
new file mode 100644
index 000000000..cf19fedfa
--- /dev/null
+++ b/graphics/map_objects/21.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+57 115 180
+49 131 197
+65 65 82
+139 106 57
+32 82 139
+189 90 32
+222 156 49
+246 205 74
+172 148 90
+82 82 106
+213 213 238
+106 106 139
+131 139 172
+205 180 123
+255 255 255
+16 16 24
diff --git a/graphics/map_objects/3.pal b/graphics/map_objects/3.pal
new file mode 100644
index 000000000..c62e8ce06
--- /dev/null
+++ b/graphics/map_objects/3.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+255 213 180
+246 189 148
+222 148 115
+123 65 65
+255 222 74
+213 172 32
+131 98 0
+164 139 238
+106 82 189
+65 57 98
+238 115 65
+172 65 57
+74 49 49
+255 255 255
+0 0 0
diff --git a/graphics/map_objects/4.pal b/graphics/map_objects/4.pal
new file mode 100644
index 000000000..e245ba013
--- /dev/null
+++ b/graphics/map_objects/4.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+255 213 180
+246 189 148
+222 148 115
+123 65 65
+255 164 180
+213 106 123
+139 65 82
+148 197 238
+98 131 205
+57 57 74
+197 197 213
+139 139 148
+74 74 90
+255 255 255
+0 0 0
diff --git a/graphics/map_objects/5.pal b/graphics/map_objects/5.pal
new file mode 100644
index 000000000..0c60b08a5
--- /dev/null
+++ b/graphics/map_objects/5.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+255 213 180
+246 189 148
+222 148 115
+123 65 65
+222 189 65
+164 131 32
+82 82 32
+131 205 49
+57 139 0
+32 65 16
+222 148 189
+164 74 131
+82 32 65
+255 255 255
+0 0 0
diff --git a/graphics/map_objects/6.pal b/graphics/map_objects/6.pal
new file mode 100644
index 000000000..1646e805e
--- /dev/null
+++ b/graphics/map_objects/6.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+255 213 180
+246 189 148
+222 148 115
+123 65 65
+205 172 98
+123 115 65
+57 57 24
+230 106 74
+148 57 41
+82 16 0
+197 197 213
+139 139 148
+74 74 90
+255 255 255
+0 0 0
diff --git a/graphics/map_objects/7.pal b/graphics/map_objects/7.pal
new file mode 100644
index 000000000..9fdd95ccc
--- /dev/null
+++ b/graphics/map_objects/7.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+98 172 238
+255 255 255
+255 255 230
+255 230 197
+205 148 148
+255 255 139
+246 230 65
+238 197 32
+197 222 238
+156 180 230
+131 148 205
+255 197 139
+246 156 106
+205 115 90
+255 255 255
+82 82 82
diff --git a/graphics/map_objects/8.pal b/graphics/map_objects/8.pal
new file mode 100644
index 000000000..d0e386c7c
--- /dev/null
+++ b/graphics/map_objects/8.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+98 172 238
+255 255 255
+255 255 230
+255 230 197
+205 148 148
+255 222 238
+255 180 205
+238 164 172
+205 255 255
+180 230 255
+123 164 213
+222 222 230
+180 180 180
+139 139 148
+255 255 255
+82 82 82
diff --git a/graphics/map_objects/9.pal b/graphics/map_objects/9.pal
new file mode 100644
index 000000000..ae24bbfe4
--- /dev/null
+++ b/graphics/map_objects/9.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+98 172 238
+255 255 255
+255 255 230
+255 230 197
+205 148 148
+238 222 98
+222 197 74
+197 172 65
+164 238 148
+131 205 123
+106 172 74
+246 156 213
+213 131 189
+189 115 148
+255 255 255
+82 82 82
diff --git a/graphics/map_objects/female_surf.png b/graphics/map_objects/female_surf.png
new file mode 100644
index 000000000..325af3f5e
--- /dev/null
+++ b/graphics/map_objects/female_surf.png
diff --git a/graphics/map_objects/male_surf.png b/graphics/map_objects/male_surf.png
new file mode 100644
index 000000000..310e6900f
--- /dev/null
+++ b/graphics/map_objects/male_surf.png
diff --git a/graphics/map_objects/unk_396B08.png b/graphics/map_objects/unk_396B08.png
new file mode 100644
index 000000000..ae2222d45
--- /dev/null
+++ b/graphics/map_objects/unk_396B08.png
diff --git a/graphics/map_objects/unk_8369F28.png b/graphics/map_objects/unk_8369F28.png
new file mode 100644
index 000000000..e01e3ea8e
--- /dev/null
+++ b/graphics/map_objects/unk_8369F28.png
diff --git a/graphics/map_objects/unk_8372AA8.png b/graphics/map_objects/unk_8372AA8.png
new file mode 100644
index 000000000..36f112e85
--- /dev/null
+++ b/graphics/map_objects/unk_8372AA8.png
diff --git a/graphics/map_objects/unk_838D5A8.png b/graphics/map_objects/unk_838D5A8.png
new file mode 100644
index 000000000..bb0ca5d34
--- /dev/null
+++ b/graphics/map_objects/unk_838D5A8.png
diff --git a/graphics/pokemon/deoxys/speed_icon.png b/graphics/pokemon/deoxys/icon_attack.png
index ae34130ee..ae34130ee 100644
--- a/graphics/pokemon/deoxys/speed_icon.png
+++ b/graphics/pokemon/deoxys/icon_attack.png
diff --git a/graphics/pokemon/heracross/unk_icon.png b/graphics/pokemon/heracross/unk_icon.png
new file mode 100644
index 000000000..362f66fd9
--- /dev/null
+++ b/graphics/pokemon/heracross/unk_icon.png
diff --git a/graphics/trainers/front_pics/arena_tycoon_greta_front_pic.png b/graphics/trainers/front_pics/arena_tycoon_greta_front_pic.png
deleted file mode 100644
index a15872c61..000000000
--- a/graphics/trainers/front_pics/arena_tycoon_greta_front_pic.png
+++ /dev/null
diff --git a/graphics/trainers/front_pics/brendan_front_pic.png b/graphics/trainers/front_pics/brendan_front_pic.png
deleted file mode 100644
index b0c65b4be..000000000
--- a/graphics/trainers/front_pics/brendan_front_pic.png
+++ /dev/null
diff --git a/graphics/trainers/front_pics/champion_blue_front_pic.png b/graphics/trainers/front_pics/champion_rival_front_pic.png
index 18f166dd5..18f166dd5 100644
--- a/graphics/trainers/front_pics/champion_blue_front_pic.png
+++ b/graphics/trainers/front_pics/champion_rival_front_pic.png
diff --git a/graphics/trainers/front_pics/steven_front_pic.png b/graphics/trainers/front_pics/champion_steven_front_pic.png
index a322cbe5a..a322cbe5a 100644
--- a/graphics/trainers/front_pics/steven_front_pic.png
+++ b/graphics/trainers/front_pics/champion_steven_front_pic.png
diff --git a/graphics/trainers/front_pics/champion_wallace_front_pic.png b/graphics/trainers/front_pics/champion_wallace_front_pic.png
deleted file mode 100644
index 24c43eca8..000000000
--- a/graphics/trainers/front_pics/champion_wallace_front_pic.png
+++ /dev/null
diff --git a/graphics/trainers/front_pics/roughneck_front_pic.png b/graphics/trainers/front_pics/cue_ball_front_pic.png
index 98a6eebaa..98a6eebaa 100644
--- a/graphics/trainers/front_pics/roughneck_front_pic.png
+++ b/graphics/trainers/front_pics/cue_ball_front_pic.png
diff --git a/graphics/trainers/front_pics/dome_ace_tucker_front_pic.png b/graphics/trainers/front_pics/dome_ace_tucker_front_pic.png
deleted file mode 100644
index 78b92b0c9..000000000
--- a/graphics/trainers/front_pics/dome_ace_tucker_front_pic.png
+++ /dev/null
diff --git a/graphics/trainers/front_pics/factory_head_noland_front_pic.png b/graphics/trainers/front_pics/factory_head_noland_front_pic.png
deleted file mode 100644
index df420adf3..000000000
--- a/graphics/trainers/front_pics/factory_head_noland_front_pic.png
+++ /dev/null
diff --git a/graphics/trainers/front_pics/giovanni_front_pic.png b/graphics/trainers/front_pics/leader_giovanni_front_pic.png
index 09f8dd334..09f8dd334 100644
--- a/graphics/trainers/front_pics/giovanni_front_pic.png
+++ b/graphics/trainers/front_pics/leader_giovanni_front_pic.png
diff --git a/graphics/trainers/front_pics/leader_juan_front_pic.png b/graphics/trainers/front_pics/leader_juan_front_pic.png
deleted file mode 100644
index ecd9f087b..000000000
--- a/graphics/trainers/front_pics/leader_juan_front_pic.png
+++ /dev/null
diff --git a/graphics/trainers/front_pics/ruby_sapphire_champion_wallace_front_pic.png b/graphics/trainers/front_pics/leader_wallace_front_pic.png
index 3f0159cdb..3f0159cdb 100644
--- a/graphics/trainers/front_pics/ruby_sapphire_champion_wallace_front_pic.png
+++ b/graphics/trainers/front_pics/leader_wallace_front_pic.png
diff --git a/graphics/trainers/front_pics/ruby_magma_admin_f_front_pic.png b/graphics/trainers/front_pics/magma_admin_f_front_pic.png
index c5890b11f..c5890b11f 100644
--- a/graphics/trainers/front_pics/ruby_magma_admin_f_front_pic.png
+++ b/graphics/trainers/front_pics/magma_admin_f_front_pic.png
diff --git a/graphics/trainers/front_pics/magma_admin_front_pic.png b/graphics/trainers/front_pics/magma_admin_m_front_pic.png
index d7b5e4fb1..d7b5e4fb1 100644
--- a/graphics/trainers/front_pics/magma_admin_front_pic.png
+++ b/graphics/trainers/front_pics/magma_admin_m_front_pic.png
diff --git a/graphics/trainers/front_pics/may_front_pic.png b/graphics/trainers/front_pics/may_front_pic.png
deleted file mode 100644
index 47ebca40f..000000000
--- a/graphics/trainers/front_pics/may_front_pic.png
+++ /dev/null
diff --git a/graphics/trainers/front_pics/palace_maven_spenser_front_pic.png b/graphics/trainers/front_pics/palace_maven_spenser_front_pic.png
deleted file mode 100644
index 0b33649a2..000000000
--- a/graphics/trainers/front_pics/palace_maven_spenser_front_pic.png
+++ /dev/null
diff --git a/graphics/trainers/front_pics/pike_queen_lucy_front_pic.png b/graphics/trainers/front_pics/pike_queen_lucy_front_pic.png
deleted file mode 100644
index e57260e28..000000000
--- a/graphics/trainers/front_pics/pike_queen_lucy_front_pic.png
+++ /dev/null
diff --git a/graphics/trainers/front_pics/winstrate_f_front_pic.png b/graphics/trainers/front_pics/pokefan_f_front_pic.png
index 4d4f9cffe..4d4f9cffe 100644
--- a/graphics/trainers/front_pics/winstrate_f_front_pic.png
+++ b/graphics/trainers/front_pics/pokefan_f_front_pic.png
diff --git a/graphics/trainers/front_pics/winstrate_m_front_pic.png b/graphics/trainers/front_pics/pokefan_m_front_pic.png
index a6dc4a18e..a6dc4a18e 100644
--- a/graphics/trainers/front_pics/winstrate_m_front_pic.png
+++ b/graphics/trainers/front_pics/pokefan_m_front_pic.png
diff --git a/graphics/trainers/front_pics/pokemon_breeder_front_pic.png b/graphics/trainers/front_pics/pokemon_breeder_f_front_pic.png
index 35ff34854..35ff34854 100644
--- a/graphics/trainers/front_pics/pokemon_breeder_front_pic.png
+++ b/graphics/trainers/front_pics/pokemon_breeder_f_front_pic.png
diff --git a/graphics/trainers/front_pics/emerald_pokemon_breeder_m_front_pic.png b/graphics/trainers/front_pics/pokemon_breeder_m_front_pic.png
index da37f87dd..da37f87dd 100644
--- a/graphics/trainers/front_pics/emerald_pokemon_breeder_m_front_pic.png
+++ b/graphics/trainers/front_pics/pokemon_breeder_m_front_pic.png
diff --git a/graphics/trainers/front_pics/oak_front_pic.png b/graphics/trainers/front_pics/professor_oak_front_pic.png
index 5e2a19aed..5e2a19aed 100644
--- a/graphics/trainers/front_pics/oak_front_pic.png
+++ b/graphics/trainers/front_pics/professor_oak_front_pic.png
diff --git a/graphics/trainers/front_pics/pyramid_king_brandon_front_pic.png b/graphics/trainers/front_pics/pyramid_king_brandon_front_pic.png
deleted file mode 100644
index 2f936092a..000000000
--- a/graphics/trainers/front_pics/pyramid_king_brandon_front_pic.png
+++ /dev/null
diff --git a/graphics/trainers/front_pics/blue_1_front_pic.png b/graphics/trainers/front_pics/rival_1_front_pic.png
index 75022cef7..75022cef7 100644
--- a/graphics/trainers/front_pics/blue_1_front_pic.png
+++ b/graphics/trainers/front_pics/rival_1_front_pic.png
diff --git a/graphics/trainers/front_pics/blue_2_front_pic.png b/graphics/trainers/front_pics/rival_2_front_pic.png
index 822ac12c4..822ac12c4 100644
--- a/graphics/trainers/front_pics/blue_2_front_pic.png
+++ b/graphics/trainers/front_pics/rival_2_front_pic.png
diff --git a/graphics/trainers/front_pics/emerald_aroma_lady_front_pic.png b/graphics/trainers/front_pics/rs_aroma_lady_front_pic.png
index 9f6eb814c..9f6eb814c 100644
--- a/graphics/trainers/front_pics/emerald_aroma_lady_front_pic.png
+++ b/graphics/trainers/front_pics/rs_aroma_lady_front_pic.png
diff --git a/graphics/trainers/front_pics/emerald_beauty_front_pic.png b/graphics/trainers/front_pics/rs_beauty_front_pic.png
index aea688176..aea688176 100644
--- a/graphics/trainers/front_pics/emerald_beauty_front_pic.png
+++ b/graphics/trainers/front_pics/rs_beauty_front_pic.png
diff --git a/graphics/trainers/front_pics/emerald_bird_keeper_front_pic.png b/graphics/trainers/front_pics/rs_bird_keeper_front_pic.png
index 7ad67c5d7..7ad67c5d7 100644
--- a/graphics/trainers/front_pics/emerald_bird_keeper_front_pic.png
+++ b/graphics/trainers/front_pics/rs_bird_keeper_front_pic.png
diff --git a/graphics/trainers/front_pics/emerald_black_belt_front_pic.png b/graphics/trainers/front_pics/rs_black_belt_front_pic.png
index fd3b51c66..fd3b51c66 100644
--- a/graphics/trainers/front_pics/emerald_black_belt_front_pic.png
+++ b/graphics/trainers/front_pics/rs_black_belt_front_pic.png
diff --git a/graphics/trainers/front_pics/emerald_bug_catcher_front_pic.png b/graphics/trainers/front_pics/rs_bug_catcher_front_pic.png
index 8fe86d40e..8fe86d40e 100644
--- a/graphics/trainers/front_pics/emerald_bug_catcher_front_pic.png
+++ b/graphics/trainers/front_pics/rs_bug_catcher_front_pic.png
diff --git a/graphics/trainers/front_pics/emerald_camper_front_pic.png b/graphics/trainers/front_pics/rs_camper_front_pic.png
index 24d173dee..24d173dee 100644
--- a/graphics/trainers/front_pics/emerald_camper_front_pic.png
+++ b/graphics/trainers/front_pics/rs_camper_front_pic.png
diff --git a/graphics/trainers/front_pics/emerald_cool_trainer_f_front_pic.png b/graphics/trainers/front_pics/rs_cool_trainer_f_front_pic.png
index 572aa811a..572aa811a 100644
--- a/graphics/trainers/front_pics/emerald_cool_trainer_f_front_pic.png
+++ b/graphics/trainers/front_pics/rs_cool_trainer_f_front_pic.png
diff --git a/graphics/trainers/front_pics/emerald_cool_trainer_m_front_pic.png b/graphics/trainers/front_pics/rs_cool_trainer_m_front_pic.png
index 6b998992e..6b998992e 100644
--- a/graphics/trainers/front_pics/emerald_cool_trainer_m_front_pic.png
+++ b/graphics/trainers/front_pics/rs_cool_trainer_m_front_pic.png
diff --git a/graphics/trainers/front_pics/emerald_fisherman_front_pic.png b/graphics/trainers/front_pics/rs_fisherman_front_pic.png
index 8e90ccb17..8e90ccb17 100644
--- a/graphics/trainers/front_pics/emerald_fisherman_front_pic.png
+++ b/graphics/trainers/front_pics/rs_fisherman_front_pic.png
diff --git a/graphics/trainers/front_pics/emerald_gentleman_front_pic.png b/graphics/trainers/front_pics/rs_gentleman_front_pic.png
index 85e4b024b..85e4b024b 100644
--- a/graphics/trainers/front_pics/emerald_gentleman_front_pic.png
+++ b/graphics/trainers/front_pics/rs_gentleman_front_pic.png
diff --git a/graphics/trainers/front_pics/emerald_hiker_front_pic.png b/graphics/trainers/front_pics/rs_hiker_front_pic.png
index 6112a5f1e..6112a5f1e 100644
--- a/graphics/trainers/front_pics/emerald_hiker_front_pic.png
+++ b/graphics/trainers/front_pics/rs_hiker_front_pic.png
diff --git a/graphics/trainers/front_pics/emerald_lady_front_pic.png b/graphics/trainers/front_pics/rs_lady_front_pic.png
index 4914eb433..4914eb433 100644
--- a/graphics/trainers/front_pics/emerald_lady_front_pic.png
+++ b/graphics/trainers/front_pics/rs_lady_front_pic.png
diff --git a/graphics/trainers/front_pics/emerald_lass_front_pic.png b/graphics/trainers/front_pics/rs_lass_front_pic.png
index 5ccf1afcd..5ccf1afcd 100644
--- a/graphics/trainers/front_pics/emerald_lass_front_pic.png
+++ b/graphics/trainers/front_pics/rs_lass_front_pic.png
diff --git a/graphics/trainers/front_pics/emerald_picnicker_front_pic.png b/graphics/trainers/front_pics/rs_picnicker_front_pic.png
index 06d4d3dea..06d4d3dea 100644
--- a/graphics/trainers/front_pics/emerald_picnicker_front_pic.png
+++ b/graphics/trainers/front_pics/rs_picnicker_front_pic.png
diff --git a/graphics/trainers/front_pics/emerald_pokemaniac_front_pic.png b/graphics/trainers/front_pics/rs_pokemaniac_front_pic.png
index f35de383d..f35de383d 100644
--- a/graphics/trainers/front_pics/emerald_pokemaniac_front_pic.png
+++ b/graphics/trainers/front_pics/rs_pokemaniac_front_pic.png
diff --git a/graphics/trainers/front_pics/emerald_pokemon_breeder_f_front_pic.png b/graphics/trainers/front_pics/rs_pokemon_breeder_f_front_pic.png
index d20122a7b..d20122a7b 100644
--- a/graphics/trainers/front_pics/emerald_pokemon_breeder_f_front_pic.png
+++ b/graphics/trainers/front_pics/rs_pokemon_breeder_f_front_pic.png
diff --git a/graphics/trainers/front_pics/emerald_pokemon_ranger_f_front_pic.png b/graphics/trainers/front_pics/rs_pokemon_ranger_f_front_pic.png
index a5e00d751..a5e00d751 100644
--- a/graphics/trainers/front_pics/emerald_pokemon_ranger_f_front_pic.png
+++ b/graphics/trainers/front_pics/rs_pokemon_ranger_f_front_pic.png
diff --git a/graphics/trainers/front_pics/emerald_pokemon_ranger_m_front_pic.png b/graphics/trainers/front_pics/rs_pokemon_ranger_m_front_pic.png
index 84f17dab1..84f17dab1 100644
--- a/graphics/trainers/front_pics/emerald_pokemon_ranger_m_front_pic.png
+++ b/graphics/trainers/front_pics/rs_pokemon_ranger_m_front_pic.png
diff --git a/graphics/trainers/front_pics/emerald_psychic_f_front_pic.png b/graphics/trainers/front_pics/rs_psychic_f_front_pic.png
index b7e3ac406..b7e3ac406 100644
--- a/graphics/trainers/front_pics/emerald_psychic_f_front_pic.png
+++ b/graphics/trainers/front_pics/rs_psychic_f_front_pic.png
diff --git a/graphics/trainers/front_pics/emerald_psychic_m_front_pic.png b/graphics/trainers/front_pics/rs_psychic_m_front_pic.png
index a0272a3a2..a0272a3a2 100644
--- a/graphics/trainers/front_pics/emerald_psychic_m_front_pic.png
+++ b/graphics/trainers/front_pics/rs_psychic_m_front_pic.png
diff --git a/graphics/trainers/front_pics/emerald_ruin_maniac_front_pic.png b/graphics/trainers/front_pics/rs_ruin_maniac_front_pic.png
index b234aabd5..b234aabd5 100644
--- a/graphics/trainers/front_pics/emerald_ruin_maniac_front_pic.png
+++ b/graphics/trainers/front_pics/rs_ruin_maniac_front_pic.png
diff --git a/graphics/trainers/front_pics/emerald_sailor_front_pic.png b/graphics/trainers/front_pics/rs_sailor_front_pic.png
index 298c2c6e1..298c2c6e1 100644
--- a/graphics/trainers/front_pics/emerald_sailor_front_pic.png
+++ b/graphics/trainers/front_pics/rs_sailor_front_pic.png
diff --git a/graphics/trainers/front_pics/emerald_sis_and_bro_front_pic.png b/graphics/trainers/front_pics/rs_sis_and_bro_front_pic.png
index ba32a26c3..ba32a26c3 100644
--- a/graphics/trainers/front_pics/emerald_sis_and_bro_front_pic.png
+++ b/graphics/trainers/front_pics/rs_sis_and_bro_front_pic.png
diff --git a/graphics/trainers/front_pics/emerald_swimmer_f_front_pic.png b/graphics/trainers/front_pics/rs_swimmer_f_front_pic.png
index 7018c85b8..7018c85b8 100644
--- a/graphics/trainers/front_pics/emerald_swimmer_f_front_pic.png
+++ b/graphics/trainers/front_pics/rs_swimmer_f_front_pic.png
diff --git a/graphics/trainers/front_pics/emerald_swimmer_m_front_pic.png b/graphics/trainers/front_pics/rs_swimmer_m_front_pic.png
index da4909deb..da4909deb 100644
--- a/graphics/trainers/front_pics/emerald_swimmer_m_front_pic.png
+++ b/graphics/trainers/front_pics/rs_swimmer_m_front_pic.png
diff --git a/graphics/trainers/front_pics/emerald_tuber_f_front_pic.png b/graphics/trainers/front_pics/rs_tuber_f_front_pic.png
index 93dc6eea2..93dc6eea2 100644
--- a/graphics/trainers/front_pics/emerald_tuber_f_front_pic.png
+++ b/graphics/trainers/front_pics/rs_tuber_f_front_pic.png
diff --git a/graphics/trainers/front_pics/emerald_twins_front_pic.png b/graphics/trainers/front_pics/rs_twins_front_pic.png
index f0c0e034e..f0c0e034e 100644
--- a/graphics/trainers/front_pics/emerald_twins_front_pic.png
+++ b/graphics/trainers/front_pics/rs_twins_front_pic.png
diff --git a/graphics/trainers/front_pics/emerald_young_couple_front_pic.png b/graphics/trainers/front_pics/rs_young_couple_front_pic.png
index 6be8b73d8..6be8b73d8 100644
--- a/graphics/trainers/front_pics/emerald_young_couple_front_pic.png
+++ b/graphics/trainers/front_pics/rs_young_couple_front_pic.png
diff --git a/graphics/trainers/front_pics/emerald_youngster_front_pic.png b/graphics/trainers/front_pics/rs_youngster_front_pic.png
index 311c49572..311c49572 100644
--- a/graphics/trainers/front_pics/emerald_youngster_front_pic.png
+++ b/graphics/trainers/front_pics/rs_youngster_front_pic.png
diff --git a/graphics/trainers/front_pics/salon_maiden_anabel_front_pic.png b/graphics/trainers/front_pics/salon_maiden_anabel_front_pic.png
deleted file mode 100644
index 28fedca38..000000000
--- a/graphics/trainers/front_pics/salon_maiden_anabel_front_pic.png
+++ /dev/null
diff --git a/graphics/trainers/front_pics/tuber_front_pic.png b/graphics/trainers/front_pics/tuber_f_front_pic.png
index 3ecd0ced3..3ecd0ced3 100644
--- a/graphics/trainers/front_pics/tuber_front_pic.png
+++ b/graphics/trainers/front_pics/tuber_f_front_pic.png
diff --git a/graphics/trainers/front_pics/emerald_tuber_m_front_pic.png b/graphics/trainers/front_pics/tuber_m_front_pic.png
index 19182aa59..19182aa59 100644
--- a/graphics/trainers/front_pics/emerald_tuber_m_front_pic.png
+++ b/graphics/trainers/front_pics/tuber_m_front_pic.png
diff --git a/graphics/trainers/palettes/arena_tycoon_greta.pal b/graphics/trainers/palettes/arena_tycoon_greta.pal
deleted file mode 100644
index 60c45e8e9..000000000
--- a/graphics/trainers/palettes/arena_tycoon_greta.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-115 197 164
-255 222 205
-238 180 148
-197 139 106
-106 74 74
-139 172 213
-90 131 189
-255 230 106
-213 189 90
-213 222 230
-65 82 123
-189 156 90
-255 115 148
-213 82 115
-255 255 255
-0 0 0
diff --git a/graphics/trainers/palettes/brendan.pal b/graphics/trainers/palettes/brendan.pal
deleted file mode 100644
index 7274e303e..000000000
--- a/graphics/trainers/palettes/brendan.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-115 197 164
-255 222 205
-222 164 148
-205 131 115
-123 90 82
-98 123 156
-74 90 131
-49 65 106
-24 41 82
-222 230 238
-139 222 115
-98 156 90
-255 98 90
-197 65 65
-255 255 255
-0 0 0
diff --git a/graphics/trainers/palettes/blue_1.pal b/graphics/trainers/palettes/champion_rival.pal
index fa9ae905b..fa9ae905b 100644
--- a/graphics/trainers/palettes/blue_1.pal
+++ b/graphics/trainers/palettes/champion_rival.pal
diff --git a/graphics/trainers/palettes/steven.pal b/graphics/trainers/palettes/champion_steven.pal
index bb2fedd5f..bb2fedd5f 100644
--- a/graphics/trainers/palettes/steven.pal
+++ b/graphics/trainers/palettes/champion_steven.pal
diff --git a/graphics/trainers/palettes/roughneck.pal b/graphics/trainers/palettes/cue_ball.pal
index ac22488a9..ac22488a9 100644
--- a/graphics/trainers/palettes/roughneck.pal
+++ b/graphics/trainers/palettes/cue_ball.pal
diff --git a/graphics/trainers/palettes/dome_ace_tucker.pal b/graphics/trainers/palettes/dome_ace_tucker.pal
deleted file mode 100644
index 33bb1aa68..000000000
--- a/graphics/trainers/palettes/dome_ace_tucker.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-115 197 164
-255 222 205
-238 180 148
-197 139 106
-106 74 74
-246 148 230
-230 115 213
-189 90 172
-139 74 115
-213 205 246
-230 213 106
-156 148 197
-238 238 139
-213 180 98
-255 255 255
-0 0 0
diff --git a/graphics/trainers/palettes/factory_head_noland.pal b/graphics/trainers/palettes/factory_head_noland.pal
deleted file mode 100644
index 03bce8c77..000000000
--- a/graphics/trainers/palettes/factory_head_noland.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-115 197 164
-255 222 205
-238 180 148
-197 139 106
-106 74 74
-172 172 189
-131 131 164
-98 98 123
-65 65 90
-222 213 246
-238 213 106
-246 131 123
-213 90 90
-180 57 65
-255 255 255
-0 0 0
diff --git a/graphics/trainers/palettes/giovanni.pal b/graphics/trainers/palettes/leader_giovanni.pal
index 3ed4f87b8..3ed4f87b8 100644
--- a/graphics/trainers/palettes/giovanni.pal
+++ b/graphics/trainers/palettes/leader_giovanni.pal
diff --git a/graphics/trainers/palettes/leader_juan.pal b/graphics/trainers/palettes/leader_juan.pal
deleted file mode 100644
index 96467bdc3..000000000
--- a/graphics/trainers/palettes/leader_juan.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-115 197 164
-255 222 205
-222 180 148
-180 131 98
-123 90 82
-213 115 222
-148 65 180
-106 148 255
-82 106 189
-74 74 148
-164 180 189
-98 115 123
-98 49 90
-213 213 222
-255 255 255
-0 0 0
diff --git a/graphics/trainers/palettes/champion_wallace.pal b/graphics/trainers/palettes/leader_wallace.pal
index eaaed070f..eaaed070f 100644
--- a/graphics/trainers/palettes/champion_wallace.pal
+++ b/graphics/trainers/palettes/leader_wallace.pal
diff --git a/graphics/trainers/palettes/magma_admin.pal b/graphics/trainers/palettes/magma_admin_f.pal
index a987cdbc1..a987cdbc1 100644
--- a/graphics/trainers/palettes/magma_admin.pal
+++ b/graphics/trainers/palettes/magma_admin_f.pal
diff --git a/graphics/trainers/palettes/ruby_magma_admin_f.pal b/graphics/trainers/palettes/magma_admin_m.pal
index a987cdbc1..a987cdbc1 100644
--- a/graphics/trainers/palettes/ruby_magma_admin_f.pal
+++ b/graphics/trainers/palettes/magma_admin_m.pal
diff --git a/graphics/trainers/palettes/may.pal b/graphics/trainers/palettes/may.pal
deleted file mode 100644
index fd706c07f..000000000
--- a/graphics/trainers/palettes/may.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-115 197 164
-255 222 205
-222 164 148
-205 131 115
-123 90 82
-98 98 115
-41 57 65
-164 106 82
-74 49 57
-205 205 222
-139 222 115
-98 156 90
-255 98 90
-197 65 65
-255 255 255
-0 0 0
diff --git a/graphics/trainers/palettes/palace_maven_spenser.pal b/graphics/trainers/palettes/palace_maven_spenser.pal
deleted file mode 100644
index 40a634974..000000000
--- a/graphics/trainers/palettes/palace_maven_spenser.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-115 197 164
-230 205 156
-189 164 115
-164 131 82
-106 74 74
-172 172 213
-123 131 189
-90 98 148
-57 65 90
-222 213 246
-238 213 106
-246 230 180
-230 115 74
-222 180 98
-255 255 255
-0 0 0
diff --git a/graphics/trainers/palettes/pike_queen_lucy.pal b/graphics/trainers/palettes/pike_queen_lucy.pal
deleted file mode 100644
index fd3b46b8b..000000000
--- a/graphics/trainers/palettes/pike_queen_lucy.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-115 197 164
-255 222 205
-238 180 148
-197 139 106
-106 74 74
-205 123 213
-148 90 148
-115 57 106
-57 57 57
-213 222 230
-172 65 65
-255 197 90
-115 106 123
-213 82 115
-255 255 255
-0 0 0
diff --git a/graphics/trainers/palettes/winstrate_f.pal b/graphics/trainers/palettes/pokefan_f.pal
index 09728f005..09728f005 100644
--- a/graphics/trainers/palettes/winstrate_f.pal
+++ b/graphics/trainers/palettes/pokefan_f.pal
diff --git a/graphics/trainers/palettes/winstrate_m.pal b/graphics/trainers/palettes/pokefan_m.pal
index 1d1f48875..1d1f48875 100644
--- a/graphics/trainers/palettes/winstrate_m.pal
+++ b/graphics/trainers/palettes/pokefan_m.pal
diff --git a/graphics/trainers/palettes/pokemon_breeder.pal b/graphics/trainers/palettes/pokemon_breeder_f.pal
index bfc59e3af..bfc59e3af 100644
--- a/graphics/trainers/palettes/pokemon_breeder.pal
+++ b/graphics/trainers/palettes/pokemon_breeder_f.pal
diff --git a/graphics/trainers/palettes/emerald_pokemon_breeder_m.pal b/graphics/trainers/palettes/pokemon_breeder_m.pal
index 6551f8482..6551f8482 100644
--- a/graphics/trainers/palettes/emerald_pokemon_breeder_m.pal
+++ b/graphics/trainers/palettes/pokemon_breeder_m.pal
diff --git a/graphics/trainers/palettes/oak.pal b/graphics/trainers/palettes/professor_oak.pal
index eb6f2f18b..eb6f2f18b 100644
--- a/graphics/trainers/palettes/oak.pal
+++ b/graphics/trainers/palettes/professor_oak.pal
diff --git a/graphics/trainers/palettes/pyramid_king_brandon.pal b/graphics/trainers/palettes/pyramid_king_brandon.pal
deleted file mode 100644
index 77b5483b8..000000000
--- a/graphics/trainers/palettes/pyramid_king_brandon.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-115 197 164
-255 222 205
-238 180 148
-197 139 106
-106 74 74
-164 213 90
-123 172 65
-82 115 41
-57 82 41
-213 205 213
-172 123 90
-139 139 123
-131 98 65
-213 106 74
-255 255 255
-0 0 0
diff --git a/graphics/trainers/palettes/blue_2.pal b/graphics/trainers/palettes/rival_1.pal
index fa9ae905b..fa9ae905b 100644
--- a/graphics/trainers/palettes/blue_2.pal
+++ b/graphics/trainers/palettes/rival_1.pal
diff --git a/graphics/trainers/palettes/champion_blue.pal b/graphics/trainers/palettes/rival_2.pal
index fa9ae905b..fa9ae905b 100644
--- a/graphics/trainers/palettes/champion_blue.pal
+++ b/graphics/trainers/palettes/rival_2.pal
diff --git a/graphics/trainers/palettes/emerald_aroma_lady.pal b/graphics/trainers/palettes/rs_aroma_lady.pal
index eb9f3dfd4..eb9f3dfd4 100644
--- a/graphics/trainers/palettes/emerald_aroma_lady.pal
+++ b/graphics/trainers/palettes/rs_aroma_lady.pal
diff --git a/graphics/trainers/palettes/emerald_beauty.pal b/graphics/trainers/palettes/rs_beauty.pal
index ab549df20..ab549df20 100644
--- a/graphics/trainers/palettes/emerald_beauty.pal
+++ b/graphics/trainers/palettes/rs_beauty.pal
diff --git a/graphics/trainers/palettes/emerald_bird_keeper.pal b/graphics/trainers/palettes/rs_bird_keeper.pal
index 87194c84a..87194c84a 100644
--- a/graphics/trainers/palettes/emerald_bird_keeper.pal
+++ b/graphics/trainers/palettes/rs_bird_keeper.pal
diff --git a/graphics/trainers/palettes/emerald_black_belt.pal b/graphics/trainers/palettes/rs_black_belt.pal
index 869e5d8df..869e5d8df 100644
--- a/graphics/trainers/palettes/emerald_black_belt.pal
+++ b/graphics/trainers/palettes/rs_black_belt.pal
diff --git a/graphics/trainers/palettes/emerald_bug_catcher.pal b/graphics/trainers/palettes/rs_bug_catcher.pal
index c68f56690..c68f56690 100644
--- a/graphics/trainers/palettes/emerald_bug_catcher.pal
+++ b/graphics/trainers/palettes/rs_bug_catcher.pal
diff --git a/graphics/trainers/palettes/emerald_camper.pal b/graphics/trainers/palettes/rs_camper.pal
index e5c224fd2..e5c224fd2 100644
--- a/graphics/trainers/palettes/emerald_camper.pal
+++ b/graphics/trainers/palettes/rs_camper.pal
diff --git a/graphics/trainers/palettes/emerald_cool_trainer_f.pal b/graphics/trainers/palettes/rs_cool_trainer_f.pal
index 292d0fc78..292d0fc78 100644
--- a/graphics/trainers/palettes/emerald_cool_trainer_f.pal
+++ b/graphics/trainers/palettes/rs_cool_trainer_f.pal
diff --git a/graphics/trainers/palettes/emerald_cool_trainer_m.pal b/graphics/trainers/palettes/rs_cool_trainer_m.pal
index 52a32e925..52a32e925 100644
--- a/graphics/trainers/palettes/emerald_cool_trainer_m.pal
+++ b/graphics/trainers/palettes/rs_cool_trainer_m.pal
diff --git a/graphics/trainers/palettes/emerald_fisherman.pal b/graphics/trainers/palettes/rs_fisherman.pal
index 3c18e8f1f..3c18e8f1f 100644
--- a/graphics/trainers/palettes/emerald_fisherman.pal
+++ b/graphics/trainers/palettes/rs_fisherman.pal
diff --git a/graphics/trainers/palettes/emerald_gentleman.pal b/graphics/trainers/palettes/rs_gentleman.pal
index ef021d026..ef021d026 100644
--- a/graphics/trainers/palettes/emerald_gentleman.pal
+++ b/graphics/trainers/palettes/rs_gentleman.pal
diff --git a/graphics/trainers/palettes/emerald_hiker.pal b/graphics/trainers/palettes/rs_hiker.pal
index cb8fce7f6..cb8fce7f6 100644
--- a/graphics/trainers/palettes/emerald_hiker.pal
+++ b/graphics/trainers/palettes/rs_hiker.pal
diff --git a/graphics/trainers/palettes/emerald_lady.pal b/graphics/trainers/palettes/rs_lady.pal
index b70873111..b70873111 100644
--- a/graphics/trainers/palettes/emerald_lady.pal
+++ b/graphics/trainers/palettes/rs_lady.pal
diff --git a/graphics/trainers/palettes/emerald_lass.pal b/graphics/trainers/palettes/rs_lass.pal
index 89e78d683..89e78d683 100644
--- a/graphics/trainers/palettes/emerald_lass.pal
+++ b/graphics/trainers/palettes/rs_lass.pal
diff --git a/graphics/trainers/palettes/emerald_picnicker.pal b/graphics/trainers/palettes/rs_picnicker.pal
index acd90e943..acd90e943 100644
--- a/graphics/trainers/palettes/emerald_picnicker.pal
+++ b/graphics/trainers/palettes/rs_picnicker.pal
diff --git a/graphics/trainers/palettes/emerald_pokemaniac.pal b/graphics/trainers/palettes/rs_pokemaniac.pal
index 3ede03b14..3ede03b14 100644
--- a/graphics/trainers/palettes/emerald_pokemaniac.pal
+++ b/graphics/trainers/palettes/rs_pokemaniac.pal
diff --git a/graphics/trainers/palettes/emerald_pokemon_breeder_f.pal b/graphics/trainers/palettes/rs_pokemon_breeder_f.pal
index b15f5db8a..b15f5db8a 100644
--- a/graphics/trainers/palettes/emerald_pokemon_breeder_f.pal
+++ b/graphics/trainers/palettes/rs_pokemon_breeder_f.pal
diff --git a/graphics/trainers/palettes/emerald_pokemon_ranger_f.pal b/graphics/trainers/palettes/rs_pokemon_ranger_f.pal
index 93220f5cb..93220f5cb 100644
--- a/graphics/trainers/palettes/emerald_pokemon_ranger_f.pal
+++ b/graphics/trainers/palettes/rs_pokemon_ranger_f.pal
diff --git a/graphics/trainers/palettes/emerald_pokemon_ranger_m.pal b/graphics/trainers/palettes/rs_pokemon_ranger_m.pal
index 2f16ca0cb..2f16ca0cb 100644
--- a/graphics/trainers/palettes/emerald_pokemon_ranger_m.pal
+++ b/graphics/trainers/palettes/rs_pokemon_ranger_m.pal
diff --git a/graphics/trainers/palettes/emerald_psychic_f.pal b/graphics/trainers/palettes/rs_psychic_f.pal
index 232cfd755..232cfd755 100644
--- a/graphics/trainers/palettes/emerald_psychic_f.pal
+++ b/graphics/trainers/palettes/rs_psychic_f.pal
diff --git a/graphics/trainers/palettes/emerald_psychic_m.pal b/graphics/trainers/palettes/rs_psychic_m.pal
index 0ddd2894b..0ddd2894b 100644
--- a/graphics/trainers/palettes/emerald_psychic_m.pal
+++ b/graphics/trainers/palettes/rs_psychic_m.pal
diff --git a/graphics/trainers/palettes/emerald_ruin_maniac.pal b/graphics/trainers/palettes/rs_ruin_maniac.pal
index bbc342a06..bbc342a06 100644
--- a/graphics/trainers/palettes/emerald_ruin_maniac.pal
+++ b/graphics/trainers/palettes/rs_ruin_maniac.pal
diff --git a/graphics/trainers/palettes/emerald_sailor.pal b/graphics/trainers/palettes/rs_sailor.pal
index 3b6248576..3b6248576 100644
--- a/graphics/trainers/palettes/emerald_sailor.pal
+++ b/graphics/trainers/palettes/rs_sailor.pal
diff --git a/graphics/trainers/palettes/emerald_sis_and_bro.pal b/graphics/trainers/palettes/rs_sis_and_bro.pal
index 823ef66ef..823ef66ef 100644
--- a/graphics/trainers/palettes/emerald_sis_and_bro.pal
+++ b/graphics/trainers/palettes/rs_sis_and_bro.pal
diff --git a/graphics/trainers/palettes/emerald_swimmer_f.pal b/graphics/trainers/palettes/rs_swimmer_f.pal
index 823ef66ef..823ef66ef 100644
--- a/graphics/trainers/palettes/emerald_swimmer_f.pal
+++ b/graphics/trainers/palettes/rs_swimmer_f.pal
diff --git a/graphics/trainers/palettes/emerald_swimmer_m.pal b/graphics/trainers/palettes/rs_swimmer_m.pal
index 259a53b9a..259a53b9a 100644
--- a/graphics/trainers/palettes/emerald_swimmer_m.pal
+++ b/graphics/trainers/palettes/rs_swimmer_m.pal
diff --git a/graphics/trainers/palettes/emerald_tuber_f.pal b/graphics/trainers/palettes/rs_tuber_f.pal
index b5cb0047a..b5cb0047a 100644
--- a/graphics/trainers/palettes/emerald_tuber_f.pal
+++ b/graphics/trainers/palettes/rs_tuber_f.pal
diff --git a/graphics/trainers/palettes/emerald_twins.pal b/graphics/trainers/palettes/rs_twins.pal
index 3b162de25..3b162de25 100644
--- a/graphics/trainers/palettes/emerald_twins.pal
+++ b/graphics/trainers/palettes/rs_twins.pal
diff --git a/graphics/trainers/palettes/emerald_young_couple.pal b/graphics/trainers/palettes/rs_young_couple.pal
index bba95c19a..bba95c19a 100644
--- a/graphics/trainers/palettes/emerald_young_couple.pal
+++ b/graphics/trainers/palettes/rs_young_couple.pal
diff --git a/graphics/trainers/palettes/emerald_youngster.pal b/graphics/trainers/palettes/rs_youngster.pal
index f91520d9b..f91520d9b 100644
--- a/graphics/trainers/palettes/emerald_youngster.pal
+++ b/graphics/trainers/palettes/rs_youngster.pal
diff --git a/graphics/trainers/palettes/salon_maiden_anabel.pal b/graphics/trainers/palettes/salon_maiden_anabel.pal
deleted file mode 100644
index 91776562f..000000000
--- a/graphics/trainers/palettes/salon_maiden_anabel.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-115 197 164
-255 222 205
-238 180 148
-197 139 106
-106 74 74
-230 139 255
-189 115 213
-148 90 172
-123 74 139
-213 205 246
-255 197 90
-156 148 197
-255 222 115
-213 106 74
-255 255 255
-0 0 0
diff --git a/graphics/trainers/palettes/tuber.pal b/graphics/trainers/palettes/tuber_f.pal
index 1c1c1e3c2..1c1c1e3c2 100644
--- a/graphics/trainers/palettes/tuber.pal
+++ b/graphics/trainers/palettes/tuber_f.pal
diff --git a/graphics/trainers/palettes/emerald_tuber_m.pal b/graphics/trainers/palettes/tuber_m.pal
index b5cb0047a..b5cb0047a 100644
--- a/graphics/trainers/palettes/emerald_tuber_m.pal
+++ b/graphics/trainers/palettes/tuber_m.pal