diff --git a/graphics/pokemon/gmax_alcremie/back.png b/graphics/pokemon/alcremie/gmax/back.png
similarity index 100%
rename from graphics/pokemon/gmax_alcremie/back.png
rename to graphics/pokemon/alcremie/gmax/back.png
diff --git a/graphics/pokemon/gmax_alcremie/front.png b/graphics/pokemon/alcremie/gmax/front.png
similarity index 100%
rename from graphics/pokemon/gmax_alcremie/front.png
rename to graphics/pokemon/alcremie/gmax/front.png
diff --git a/graphics/pokemon/gmax_alcremie/icon.png b/graphics/pokemon/alcremie/gmax/icon.png
similarity index 100%
rename from graphics/pokemon/gmax_alcremie/icon.png
rename to graphics/pokemon/alcremie/gmax/icon.png
diff --git a/graphics/pokemon/gmax_alcremie/normal.pal b/graphics/pokemon/alcremie/gmax/normal.pal
similarity index 100%
rename from graphics/pokemon/gmax_alcremie/normal.pal
rename to graphics/pokemon/alcremie/gmax/normal.pal
diff --git a/graphics/pokemon/gmax_alcremie/shiny.pal b/graphics/pokemon/alcremie/gmax/shiny.pal
similarity index 100%
rename from graphics/pokemon/gmax_alcremie/shiny.pal
rename to graphics/pokemon/alcremie/gmax/shiny.pal
diff --git a/graphics/pokemon/alolan_diglett/back.png b/graphics/pokemon/alolan_diglett/back.png
deleted file mode 100644
index 26e060dc34..0000000000
Binary files a/graphics/pokemon/alolan_diglett/back.png and /dev/null differ
diff --git a/graphics/pokemon/alolan_diglett/front.png b/graphics/pokemon/alolan_diglett/front.png
deleted file mode 100644
index a99506bf34..0000000000
Binary files a/graphics/pokemon/alolan_diglett/front.png and /dev/null differ
diff --git a/graphics/pokemon/alolan_diglett/icon.png b/graphics/pokemon/alolan_diglett/icon.png
deleted file mode 100644
index 1b575078a3..0000000000
Binary files a/graphics/pokemon/alolan_diglett/icon.png and /dev/null differ
diff --git a/graphics/pokemon/alolan_diglett/normal.pal b/graphics/pokemon/alolan_diglett/normal.pal
deleted file mode 100644
index 4f7aafe254..0000000000
--- a/graphics/pokemon/alolan_diglett/normal.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-152 208 160
-160 88 88
-248 200 0
-88 48 24
-16 16 16
-216 152 88
-192 112 64
-248 248 248
-208 56 72
-112 0 24
-248 168 144
-248 104 88
-48 32 40
-96 88 96
-144 136 144
-64 48 48
diff --git a/graphics/pokemon/alolan_diglett/shiny.pal b/graphics/pokemon/alolan_diglett/shiny.pal
deleted file mode 100644
index c0ce049798..0000000000
--- a/graphics/pokemon/alolan_diglett/shiny.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-152 208 160
-128 48 32
-248 200 0
-72 24 16
-16 16 16
-216 104 32
-176 64 32
-248 248 248
-48 80 160
-8 40 120
-128 144 240
-88 104 200
-48 32 40
-96 88 96
-144 136 144
-64 48 48
diff --git a/graphics/pokemon/alolan_dugtrio/back.png b/graphics/pokemon/alolan_dugtrio/back.png
deleted file mode 100644
index e114284819..0000000000
Binary files a/graphics/pokemon/alolan_dugtrio/back.png and /dev/null differ
diff --git a/graphics/pokemon/alolan_dugtrio/front.png b/graphics/pokemon/alolan_dugtrio/front.png
deleted file mode 100644
index 313605dc38..0000000000
Binary files a/graphics/pokemon/alolan_dugtrio/front.png and /dev/null differ
diff --git a/graphics/pokemon/alolan_dugtrio/icon.png b/graphics/pokemon/alolan_dugtrio/icon.png
deleted file mode 100644
index 2a409cb8d0..0000000000
Binary files a/graphics/pokemon/alolan_dugtrio/icon.png and /dev/null differ
diff --git a/graphics/pokemon/alolan_dugtrio/normal.pal b/graphics/pokemon/alolan_dugtrio/normal.pal
deleted file mode 100644
index 2eb41421ba..0000000000
--- a/graphics/pokemon/alolan_dugtrio/normal.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-152 208 160
-160 88 88
-248 200 0
-216 152 88
-192 112 64
-88 48 24
-248 248 248
-16 16 16
-112 0 24
-248 104 88
-208 56 72
-208 144 8
-48 32 40
-96 88 96
-144 136 144
-216 152 88
diff --git a/graphics/pokemon/alolan_dugtrio/shiny.pal b/graphics/pokemon/alolan_dugtrio/shiny.pal
deleted file mode 100644
index bd46f40bc4..0000000000
--- a/graphics/pokemon/alolan_dugtrio/shiny.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-152 208 160
-128 48 32
-248 200 0
-216 104 32
-176 64 32
-72 24 16
-248 248 248
-16 16 16
-8 40 120
-88 104 200
-48 80 160
-208 144 8
-48 32 40
-96 88 96
-144 136 144
-216 152 88
diff --git a/graphics/pokemon/alolan_exeggutor/back.png b/graphics/pokemon/alolan_exeggutor/back.png
deleted file mode 100644
index d39d09a4b6..0000000000
Binary files a/graphics/pokemon/alolan_exeggutor/back.png and /dev/null differ
diff --git a/graphics/pokemon/alolan_exeggutor/front.png b/graphics/pokemon/alolan_exeggutor/front.png
deleted file mode 100644
index 186ee8b953..0000000000
Binary files a/graphics/pokemon/alolan_exeggutor/front.png and /dev/null differ
diff --git a/graphics/pokemon/alolan_exeggutor/icon.png b/graphics/pokemon/alolan_exeggutor/icon.png
deleted file mode 100644
index 723d0a4ead..0000000000
Binary files a/graphics/pokemon/alolan_exeggutor/icon.png and /dev/null differ
diff --git a/graphics/pokemon/alolan_exeggutor/normal.pal b/graphics/pokemon/alolan_exeggutor/normal.pal
deleted file mode 100644
index dfcbbf2466..0000000000
--- a/graphics/pokemon/alolan_exeggutor/normal.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-0 176 232
-56 160 64
-40 96 48
-136 224 112
-16 16 16
-80 192 96
-80 72 56
-208 184 104
-248 240 184
-136 128 48
-248 248 248
-200 104 136
-232 160 200
-144 120 96
-192 176 152
-136 168 64
diff --git a/graphics/pokemon/alolan_exeggutor/shiny.pal b/graphics/pokemon/alolan_exeggutor/shiny.pal
deleted file mode 100644
index c55c7f5917..0000000000
--- a/graphics/pokemon/alolan_exeggutor/shiny.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-0 176 232
-192 96 56
-152 56 16
-248 184 104
-16 16 16
-224 128 72
-136 104 0
-224 168 88
-248 216 104
-160 104 32
-248 248 248
-200 104 136
-232 160 200
-192 160 0
-248 240 40
-136 168 64
diff --git a/graphics/pokemon/alolan_geodude/back.png b/graphics/pokemon/alolan_geodude/back.png
deleted file mode 100644
index b82b575e99..0000000000
Binary files a/graphics/pokemon/alolan_geodude/back.png and /dev/null differ
diff --git a/graphics/pokemon/alolan_geodude/front.png b/graphics/pokemon/alolan_geodude/front.png
deleted file mode 100644
index 2b038e3296..0000000000
Binary files a/graphics/pokemon/alolan_geodude/front.png and /dev/null differ
diff --git a/graphics/pokemon/alolan_geodude/icon.png b/graphics/pokemon/alolan_geodude/icon.png
deleted file mode 100644
index 1a5f969971..0000000000
Binary files a/graphics/pokemon/alolan_geodude/icon.png and /dev/null differ
diff --git a/graphics/pokemon/alolan_geodude/normal.pal b/graphics/pokemon/alolan_geodude/normal.pal
deleted file mode 100644
index 5eb12793fa..0000000000
--- a/graphics/pokemon/alolan_geodude/normal.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-152 208 160
-80 80 112
-160 168 192
-120 120 152
-16 16 16
-24 32 32
-72 80 80
-40 48 48
-200 216 200
-248 248 248
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
diff --git a/graphics/pokemon/alolan_geodude/shiny.pal b/graphics/pokemon/alolan_geodude/shiny.pal
deleted file mode 100644
index 58b7f7c06b..0000000000
--- a/graphics/pokemon/alolan_geodude/shiny.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-152 208 160
-144 56 24
-248 144 0
-208 88 8
-16 16 16
-24 32 32
-72 80 80
-40 48 48
-200 216 200
-248 248 248
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
diff --git a/graphics/pokemon/alolan_golem/back.png b/graphics/pokemon/alolan_golem/back.png
deleted file mode 100644
index bda1dfaa6f..0000000000
Binary files a/graphics/pokemon/alolan_golem/back.png and /dev/null differ
diff --git a/graphics/pokemon/alolan_golem/front.png b/graphics/pokemon/alolan_golem/front.png
deleted file mode 100644
index 7d9b997497..0000000000
Binary files a/graphics/pokemon/alolan_golem/front.png and /dev/null differ
diff --git a/graphics/pokemon/alolan_golem/icon.png b/graphics/pokemon/alolan_golem/icon.png
deleted file mode 100644
index e796f88842..0000000000
Binary files a/graphics/pokemon/alolan_golem/icon.png and /dev/null differ
diff --git a/graphics/pokemon/alolan_golem/normal.pal b/graphics/pokemon/alolan_golem/normal.pal
deleted file mode 100644
index ee4d66f0ea..0000000000
--- a/graphics/pokemon/alolan_golem/normal.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-152 208 160
-56 56 72
-32 40 48
-88 96 104
-16 16 16
-128 80 40
-240 168 40
-104 120 112
-64 80 72
-40 40 40
-152 160 152
-104 80 80
-184 168 168
-144 136 128
-192 40 40
-232 232 232
diff --git a/graphics/pokemon/alolan_golem/shiny.pal b/graphics/pokemon/alolan_golem/shiny.pal
deleted file mode 100644
index 41cedd78fc..0000000000
--- a/graphics/pokemon/alolan_golem/shiny.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-152 208 160
-56 56 72
-32 40 48
-88 96 104
-16 16 16
-128 80 40
-240 168 40
-144 96 40
-112 64 32
-88 40 16
-184 136 32
-128 88 72
-216 168 136
-184 136 104
-192 40 40
-232 232 232
diff --git a/graphics/pokemon/alolan_graveler/back.png b/graphics/pokemon/alolan_graveler/back.png
deleted file mode 100644
index 038e7d37bc..0000000000
Binary files a/graphics/pokemon/alolan_graveler/back.png and /dev/null differ
diff --git a/graphics/pokemon/alolan_graveler/front.png b/graphics/pokemon/alolan_graveler/front.png
deleted file mode 100644
index d2454334b5..0000000000
Binary files a/graphics/pokemon/alolan_graveler/front.png and /dev/null differ
diff --git a/graphics/pokemon/alolan_graveler/icon.png b/graphics/pokemon/alolan_graveler/icon.png
deleted file mode 100644
index c0a7557ca0..0000000000
Binary files a/graphics/pokemon/alolan_graveler/icon.png and /dev/null differ
diff --git a/graphics/pokemon/alolan_graveler/normal.pal b/graphics/pokemon/alolan_graveler/normal.pal
deleted file mode 100644
index e477581e89..0000000000
--- a/graphics/pokemon/alolan_graveler/normal.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-152 208 160
-80 88 88
-120 128 120
-152 160 160
-48 56 56
-16 16 16
-168 192 184
-40 48 40
-80 80 64
-208 128 16
-248 176 40
-120 128 104
-24 24 24
-248 248 248
-200 48 104
-0 0 0
diff --git a/graphics/pokemon/alolan_graveler/shiny.pal b/graphics/pokemon/alolan_graveler/shiny.pal
deleted file mode 100644
index ec4322ca84..0000000000
--- a/graphics/pokemon/alolan_graveler/shiny.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-152 208 160
-120 32 0
-152 56 0
-184 88 0
-88 0 0
-16 16 16
-216 144 8
-40 48 40
-80 80 64
-208 128 16
-248 176 40
-120 128 104
-24 24 24
-248 248 248
-200 48 104
-0 0 0
diff --git a/graphics/pokemon/alolan_grimer/back.png b/graphics/pokemon/alolan_grimer/back.png
deleted file mode 100644
index 41165aaa83..0000000000
Binary files a/graphics/pokemon/alolan_grimer/back.png and /dev/null differ
diff --git a/graphics/pokemon/alolan_grimer/front.png b/graphics/pokemon/alolan_grimer/front.png
deleted file mode 100644
index 42e4660fa3..0000000000
Binary files a/graphics/pokemon/alolan_grimer/front.png and /dev/null differ
diff --git a/graphics/pokemon/alolan_grimer/icon.png b/graphics/pokemon/alolan_grimer/icon.png
deleted file mode 100644
index 09d83cb95e..0000000000
Binary files a/graphics/pokemon/alolan_grimer/icon.png and /dev/null differ
diff --git a/graphics/pokemon/alolan_grimer/normal.pal b/graphics/pokemon/alolan_grimer/normal.pal
deleted file mode 100644
index d6034f72b6..0000000000
--- a/graphics/pokemon/alolan_grimer/normal.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-0 176 232
-56 120 80
-64 160 104
-16 72 40
-16 16 16
-88 192 144
-32 64 48
-248 248 248
-40 88 72
-112 72 24
-240 224 40
-192 160 16
-64 80 144
-80 136 200
-0 0 0
-0 0 0
diff --git a/graphics/pokemon/alolan_grimer/shiny.pal b/graphics/pokemon/alolan_grimer/shiny.pal
deleted file mode 100644
index 60251d8f18..0000000000
--- a/graphics/pokemon/alolan_grimer/shiny.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-0 176 232
-176 136 176
-216 168 216
-96 56 120
-16 16 16
-232 216 232
-120 72 128
-248 248 248
-152 104 152
-112 72 24
-240 224 40
-192 160 16
-64 80 144
-80 136 200
-0 0 0
-0 0 0
diff --git a/graphics/pokemon/alolan_marowak/back.png b/graphics/pokemon/alolan_marowak/back.png
deleted file mode 100644
index 69e99db6a2..0000000000
Binary files a/graphics/pokemon/alolan_marowak/back.png and /dev/null differ
diff --git a/graphics/pokemon/alolan_marowak/front.png b/graphics/pokemon/alolan_marowak/front.png
deleted file mode 100644
index cfd9e37b41..0000000000
Binary files a/graphics/pokemon/alolan_marowak/front.png and /dev/null differ
diff --git a/graphics/pokemon/alolan_marowak/icon.png b/graphics/pokemon/alolan_marowak/icon.png
deleted file mode 100644
index 3ea2a868c3..0000000000
Binary files a/graphics/pokemon/alolan_marowak/icon.png and /dev/null differ
diff --git a/graphics/pokemon/alolan_marowak/normal.pal b/graphics/pokemon/alolan_marowak/normal.pal
deleted file mode 100644
index 0c57bcfa7d..0000000000
--- a/graphics/pokemon/alolan_marowak/normal.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-152 208 160
-40 216 176
-128 224 216
-160 248 240
-24 168 136
-88 88 80
-16 16 16
-248 248 248
-192 192 184
-136 144 120
-32 24 48
-72 64 120
-80 72 136
-168 128 144
-48 48 80
-112 64 80
diff --git a/graphics/pokemon/alolan_marowak/shiny.pal b/graphics/pokemon/alolan_marowak/shiny.pal
deleted file mode 100644
index 2b7d10ef9c..0000000000
--- a/graphics/pokemon/alolan_marowak/shiny.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-152 208 160
-40 216 176
-128 224 216
-160 248 240
-24 168 136
-88 88 80
-16 16 16
-248 248 248
-192 192 184
-136 144 120
-88 24 104
-88 80 80
-136 96 192
-64 48 48
-96 64 136
-40 32 32
diff --git a/graphics/pokemon/alolan_meowth/back.png b/graphics/pokemon/alolan_meowth/back.png
deleted file mode 100644
index 84eafdae02..0000000000
Binary files a/graphics/pokemon/alolan_meowth/back.png and /dev/null differ
diff --git a/graphics/pokemon/alolan_meowth/front.png b/graphics/pokemon/alolan_meowth/front.png
deleted file mode 100644
index 9f174a5979..0000000000
Binary files a/graphics/pokemon/alolan_meowth/front.png and /dev/null differ
diff --git a/graphics/pokemon/alolan_meowth/icon.png b/graphics/pokemon/alolan_meowth/icon.png
deleted file mode 100644
index d4b80eb6b4..0000000000
Binary files a/graphics/pokemon/alolan_meowth/icon.png and /dev/null differ
diff --git a/graphics/pokemon/alolan_meowth/normal.pal b/graphics/pokemon/alolan_meowth/normal.pal
deleted file mode 100644
index 4eafb5c8d5..0000000000
--- a/graphics/pokemon/alolan_meowth/normal.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-152 208 160
-64 80 88
-16 16 16
-144 160 184
-32 40 56
-152 80 48
-96 120 128
-240 240 240
-224 200 40
-120 128 112
-200 128 56
-176 176 184
-240 240 240
-0 0 0
-0 0 0
-0 0 0
diff --git a/graphics/pokemon/alolan_meowth/shiny.pal b/graphics/pokemon/alolan_meowth/shiny.pal
deleted file mode 100644
index 6a96e4ff62..0000000000
--- a/graphics/pokemon/alolan_meowth/shiny.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-152 208 160
-40 56 104
-16 16 16
-112 144 208
-32 40 56
-152 80 48
-64 104 160
-240 240 240
-224 200 40
-48 40 88
-200 128 56
-80 56 144
-128 72 200
-0 0 0
-0 0 0
-0 0 0
diff --git a/graphics/pokemon/alolan_muk/back.png b/graphics/pokemon/alolan_muk/back.png
deleted file mode 100644
index 243561d491..0000000000
Binary files a/graphics/pokemon/alolan_muk/back.png and /dev/null differ
diff --git a/graphics/pokemon/alolan_muk/front.png b/graphics/pokemon/alolan_muk/front.png
deleted file mode 100644
index ef2c2e7674..0000000000
Binary files a/graphics/pokemon/alolan_muk/front.png and /dev/null differ
diff --git a/graphics/pokemon/alolan_muk/icon.png b/graphics/pokemon/alolan_muk/icon.png
deleted file mode 100644
index d598fd7283..0000000000
Binary files a/graphics/pokemon/alolan_muk/icon.png and /dev/null differ
diff --git a/graphics/pokemon/alolan_muk/normal.pal b/graphics/pokemon/alolan_muk/normal.pal
deleted file mode 100644
index 1d0a33ad5e..0000000000
--- a/graphics/pokemon/alolan_muk/normal.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-0 176 232
-16 72 40
-136 56 72
-248 248 248
-16 16 16
-240 144 208
-136 160 152
-224 88 152
-64 160 104
-32 48 192
-88 192 144
-48 128 224
-240 224 40
-192 160 16
-0 0 0
-0 0 0
diff --git a/graphics/pokemon/alolan_muk/shiny.pal b/graphics/pokemon/alolan_muk/shiny.pal
deleted file mode 100644
index 405bb947aa..0000000000
--- a/graphics/pokemon/alolan_muk/shiny.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-0 176 232
-120 72 128
-136 56 72
-248 248 248
-16 16 16
-240 144 208
-136 160 152
-224 88 152
-192 160 200
-32 48 192
-224 184 232
-48 128 224
-240 224 40
-192 160 16
-0 0 0
-0 0 0
diff --git a/graphics/pokemon/alolan_ninetales/back.png b/graphics/pokemon/alolan_ninetales/back.png
deleted file mode 100644
index 149d868a53..0000000000
Binary files a/graphics/pokemon/alolan_ninetales/back.png and /dev/null differ
diff --git a/graphics/pokemon/alolan_ninetales/front.png b/graphics/pokemon/alolan_ninetales/front.png
deleted file mode 100644
index 22ae9d2c93..0000000000
Binary files a/graphics/pokemon/alolan_ninetales/front.png and /dev/null differ
diff --git a/graphics/pokemon/alolan_ninetales/icon.png b/graphics/pokemon/alolan_ninetales/icon.png
deleted file mode 100644
index 71ac99d5a7..0000000000
Binary files a/graphics/pokemon/alolan_ninetales/icon.png and /dev/null differ
diff --git a/graphics/pokemon/alolan_ninetales/normal.pal b/graphics/pokemon/alolan_ninetales/normal.pal
deleted file mode 100644
index c2e7872bef..0000000000
--- a/graphics/pokemon/alolan_ninetales/normal.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-152 208 160
-88 96 112
-208 240 240
-152 192 184
-40 120 168
-72 160 200
-16 16 16
-144 144 144
-248 248 248
-16 64 112
-200 200 200
-240 240 240
-0 0 0
-0 0 0
-0 0 0
-0 0 0
diff --git a/graphics/pokemon/alolan_ninetales/shiny.pal b/graphics/pokemon/alolan_ninetales/shiny.pal
deleted file mode 100644
index 1cc0c611f5..0000000000
--- a/graphics/pokemon/alolan_ninetales/shiny.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-152 208 160
-112 80 112
-232 216 248
-176 168 200
-168 40 168
-184 80 200
-16 16 16
-136 136 136
-240 240 240
-112 16 104
-200 200 200
-248 248 248
-0 0 0
-0 0 0
-0 0 0
-0 0 0
diff --git a/graphics/pokemon/alolan_persian/back.png b/graphics/pokemon/alolan_persian/back.png
deleted file mode 100644
index cdf20d0f7f..0000000000
Binary files a/graphics/pokemon/alolan_persian/back.png and /dev/null differ
diff --git a/graphics/pokemon/alolan_persian/front.png b/graphics/pokemon/alolan_persian/front.png
deleted file mode 100644
index 83bfb2dc44..0000000000
Binary files a/graphics/pokemon/alolan_persian/front.png and /dev/null differ
diff --git a/graphics/pokemon/alolan_persian/icon.png b/graphics/pokemon/alolan_persian/icon.png
deleted file mode 100644
index 75348250d5..0000000000
Binary files a/graphics/pokemon/alolan_persian/icon.png and /dev/null differ
diff --git a/graphics/pokemon/alolan_persian/normal.pal b/graphics/pokemon/alolan_persian/normal.pal
deleted file mode 100644
index 639c9164a5..0000000000
--- a/graphics/pokemon/alolan_persian/normal.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-152 208 160
-16 16 16
-64 64 80
-32 40 56
-64 80 88
-96 120 128
-104 112 144
-152 168 176
-16 128 208
-248 248 248
-16 184 240
-16 72 168
-176 176 176
-88 88 112
-184 192 208
-0 0 0
diff --git a/graphics/pokemon/alolan_persian/shiny.pal b/graphics/pokemon/alolan_persian/shiny.pal
deleted file mode 100644
index fd0e2c259c..0000000000
--- a/graphics/pokemon/alolan_persian/shiny.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-152 208 160
-16 16 16
-48 56 120
-32 40 56
-88 40 112
-152 88 184
-80 104 168
-136 160 216
-16 128 208
-248 248 248
-16 184 240
-16 72 168
-176 176 176
-64 72 160
-168 200 232
-0 0 0
diff --git a/graphics/pokemon/alolan_raichu/back.png b/graphics/pokemon/alolan_raichu/back.png
deleted file mode 100644
index abb01054a4..0000000000
Binary files a/graphics/pokemon/alolan_raichu/back.png and /dev/null differ
diff --git a/graphics/pokemon/alolan_raichu/front.png b/graphics/pokemon/alolan_raichu/front.png
deleted file mode 100644
index 20c88523f6..0000000000
Binary files a/graphics/pokemon/alolan_raichu/front.png and /dev/null differ
diff --git a/graphics/pokemon/alolan_raichu/icon.png b/graphics/pokemon/alolan_raichu/icon.png
deleted file mode 100644
index d005cf7e1d..0000000000
Binary files a/graphics/pokemon/alolan_raichu/icon.png and /dev/null differ
diff --git a/graphics/pokemon/alolan_raichu/normal.pal b/graphics/pokemon/alolan_raichu/normal.pal
deleted file mode 100644
index 54ce683465..0000000000
--- a/graphics/pokemon/alolan_raichu/normal.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-152 208 160
-96 96 32
-248 240 64
-16 16 16
-232 184 16
-144 88 32
-152 56 32
-96 40 16
-224 136 40
-176 88 32
-16 64 128
-248 248 248
-24 112 200
-128 104 88
-232 216 176
-0 0 0
diff --git a/graphics/pokemon/alolan_raichu/shiny.pal b/graphics/pokemon/alolan_raichu/shiny.pal
deleted file mode 100644
index 97f9a0451b..0000000000
--- a/graphics/pokemon/alolan_raichu/shiny.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-152 208 160
-144 88 40
-248 176 72
-16 16 16
-216 136 32
-144 88 32
-112 40 40
-80 40 32
-168 104 64
-136 72 56
-16 64 128
-248 248 248
-24 112 200
-128 104 88
-232 216 176
-0 0 0
diff --git a/graphics/pokemon/alolan_raticate/back.png b/graphics/pokemon/alolan_raticate/back.png
deleted file mode 100644
index 7ea9895e56..0000000000
Binary files a/graphics/pokemon/alolan_raticate/back.png and /dev/null differ
diff --git a/graphics/pokemon/alolan_raticate/front.png b/graphics/pokemon/alolan_raticate/front.png
deleted file mode 100644
index 509c47662d..0000000000
Binary files a/graphics/pokemon/alolan_raticate/front.png and /dev/null differ
diff --git a/graphics/pokemon/alolan_raticate/icon.png b/graphics/pokemon/alolan_raticate/icon.png
deleted file mode 100644
index 4acd9d0404..0000000000
Binary files a/graphics/pokemon/alolan_raticate/icon.png and /dev/null differ
diff --git a/graphics/pokemon/alolan_raticate/normal.pal b/graphics/pokemon/alolan_raticate/normal.pal
deleted file mode 100644
index 4f5d144e3b..0000000000
--- a/graphics/pokemon/alolan_raticate/normal.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-152 208 160
-40 40 32
-16 16 16
-80 88 80
-112 72 72
-152 96 88
-64 64 56
-104 96 96
-232 216 200
-184 160 152
-208 40 48
-248 248 248
-176 176 184
-88 40 40
-0 0 0
-0 0 0
diff --git a/graphics/pokemon/alolan_raticate/shiny.pal b/graphics/pokemon/alolan_raticate/shiny.pal
deleted file mode 100644
index 02504c2696..0000000000
--- a/graphics/pokemon/alolan_raticate/shiny.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-152 208 160
-96 32 40
-16 16 16
-184 80 96
-112 96 80
-152 128 104
-136 56 72
-112 88 88
-232 216 200
-184 152 144
-208 40 48
-248 248 248
-176 176 184
-88 40 40
-0 0 0
-0 0 0
diff --git a/graphics/pokemon/alolan_rattata/back.png b/graphics/pokemon/alolan_rattata/back.png
deleted file mode 100644
index 3ad8eb28f2..0000000000
Binary files a/graphics/pokemon/alolan_rattata/back.png and /dev/null differ
diff --git a/graphics/pokemon/alolan_rattata/front.png b/graphics/pokemon/alolan_rattata/front.png
deleted file mode 100644
index 865c09c220..0000000000
Binary files a/graphics/pokemon/alolan_rattata/front.png and /dev/null differ
diff --git a/graphics/pokemon/alolan_rattata/icon.png b/graphics/pokemon/alolan_rattata/icon.png
deleted file mode 100644
index b13e1e9bb9..0000000000
Binary files a/graphics/pokemon/alolan_rattata/icon.png and /dev/null differ
diff --git a/graphics/pokemon/alolan_rattata/normal.pal b/graphics/pokemon/alolan_rattata/normal.pal
deleted file mode 100644
index 59134847f1..0000000000
--- a/graphics/pokemon/alolan_rattata/normal.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-152 208 160
-48 56 48
-96 104 96
-16 16 16
-72 72 72
-112 128 144
-144 168 160
-240 240 240
-184 8 8
-184 152 120
-216 200 160
-224 56 56
-128 104 72
-0 0 0
-0 0 0
-0 0 0
diff --git a/graphics/pokemon/alolan_rattata/shiny.pal b/graphics/pokemon/alolan_rattata/shiny.pal
deleted file mode 100644
index 07115520ab..0000000000
--- a/graphics/pokemon/alolan_rattata/shiny.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-152 208 160
-96 32 40
-192 80 88
-16 16 16
-136 56 72
-112 128 144
-144 168 160
-240 240 240
-184 8 8
-176 96 88
-208 160 152
-224 56 56
-136 56 48
-0 0 0
-0 0 0
-0 0 0
diff --git a/graphics/pokemon/alolan_sandshrew/back.png b/graphics/pokemon/alolan_sandshrew/back.png
deleted file mode 100644
index 1e09ba38b6..0000000000
Binary files a/graphics/pokemon/alolan_sandshrew/back.png and /dev/null differ
diff --git a/graphics/pokemon/alolan_sandshrew/front.png b/graphics/pokemon/alolan_sandshrew/front.png
deleted file mode 100644
index f3d4dc140e..0000000000
Binary files a/graphics/pokemon/alolan_sandshrew/front.png and /dev/null differ
diff --git a/graphics/pokemon/alolan_sandshrew/icon.png b/graphics/pokemon/alolan_sandshrew/icon.png
deleted file mode 100644
index a1cc049bdb..0000000000
Binary files a/graphics/pokemon/alolan_sandshrew/icon.png and /dev/null differ
diff --git a/graphics/pokemon/alolan_sandshrew/normal.pal b/graphics/pokemon/alolan_sandshrew/normal.pal
deleted file mode 100644
index 234fd3acec..0000000000
--- a/graphics/pokemon/alolan_sandshrew/normal.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-152 208 160
-80 136 152
-48 72 112
-248 248 248
-176 216 224
-128 176 200
-16 16 16
-16 56 120
-136 120 96
-40 120 200
-208 192 144
-248 248 168
-232 224 176
-200 208 216
-0 0 0
-0 0 0
diff --git a/graphics/pokemon/alolan_sandshrew/shiny.pal b/graphics/pokemon/alolan_sandshrew/shiny.pal
deleted file mode 100644
index 6aaf4d2254..0000000000
--- a/graphics/pokemon/alolan_sandshrew/shiny.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-152 208 160
-80 136 152
-48 72 112
-248 248 248
-176 216 224
-128 176 200
-16 16 16
-16 56 120
-24 80 152
-40 120 200
-56 128 224
-136 184 232
-104 160 232
-200 208 216
-0 0 0
-0 0 0
diff --git a/graphics/pokemon/alolan_sandslash/back.png b/graphics/pokemon/alolan_sandslash/back.png
deleted file mode 100644
index c64d695360..0000000000
Binary files a/graphics/pokemon/alolan_sandslash/back.png and /dev/null differ
diff --git a/graphics/pokemon/alolan_sandslash/front.png b/graphics/pokemon/alolan_sandslash/front.png
deleted file mode 100644
index fc7644cc1d..0000000000
Binary files a/graphics/pokemon/alolan_sandslash/front.png and /dev/null differ
diff --git a/graphics/pokemon/alolan_sandslash/icon.png b/graphics/pokemon/alolan_sandslash/icon.png
deleted file mode 100644
index 88cea6049b..0000000000
Binary files a/graphics/pokemon/alolan_sandslash/icon.png and /dev/null differ
diff --git a/graphics/pokemon/alolan_sandslash/normal.pal b/graphics/pokemon/alolan_sandslash/normal.pal
deleted file mode 100644
index a5e9e74efb..0000000000
--- a/graphics/pokemon/alolan_sandslash/normal.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-152 208 160
-56 72 112
-16 16 16
-168 232 240
-240 240 240
-120 200 240
-88 152 192
-80 176 200
-56 136 176
-80 168 200
-168 168 192
-184 184 208
-168 232 240
-0 0 0
-0 0 0
-0 0 0
diff --git a/graphics/pokemon/alolan_sandslash/shiny.pal b/graphics/pokemon/alolan_sandslash/shiny.pal
deleted file mode 100644
index cb4cba0589..0000000000
--- a/graphics/pokemon/alolan_sandslash/shiny.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-152 208 160
-56 72 112
-16 16 16
-168 232 240
-240 240 248
-120 200 240
-56 112 136
-80 176 200
-56 136 176
-56 112 136
-168 200 216
-192 208 224
-96 160 184
-0 0 0
-0 0 0
-0 0 0
diff --git a/graphics/pokemon/alolan_vulpix/back.png b/graphics/pokemon/alolan_vulpix/back.png
deleted file mode 100644
index f3ea2e305d..0000000000
Binary files a/graphics/pokemon/alolan_vulpix/back.png and /dev/null differ
diff --git a/graphics/pokemon/alolan_vulpix/front.png b/graphics/pokemon/alolan_vulpix/front.png
deleted file mode 100644
index 0f138a6841..0000000000
Binary files a/graphics/pokemon/alolan_vulpix/front.png and /dev/null differ
diff --git a/graphics/pokemon/alolan_vulpix/icon.png b/graphics/pokemon/alolan_vulpix/icon.png
deleted file mode 100644
index f49562751b..0000000000
Binary files a/graphics/pokemon/alolan_vulpix/icon.png and /dev/null differ
diff --git a/graphics/pokemon/alolan_vulpix/normal.pal b/graphics/pokemon/alolan_vulpix/normal.pal
deleted file mode 100644
index 728db562eb..0000000000
--- a/graphics/pokemon/alolan_vulpix/normal.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-152 208 160
-96 112 152
-168 176 208
-224 232 240
-104 104 128
-248 248 248
-16 16 16
-192 200 232
-88 136 168
-112 192 216
-64 80 112
-112 120 184
-80 120 160
-144 152 200
-0 0 0
-0 0 0
diff --git a/graphics/pokemon/alolan_vulpix/shiny.pal b/graphics/pokemon/alolan_vulpix/shiny.pal
deleted file mode 100644
index d22bf6e220..0000000000
--- a/graphics/pokemon/alolan_vulpix/shiny.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-152 208 160
-136 104 136
-176 152 184
-224 208 232
-152 104 128
-248 248 248
-16 16 16
-216 200 224
-120 112 184
-136 160 224
-72 48 104
-120 88 160
-112 104 184
-152 128 184
-0 0 0
-0 0 0
diff --git a/graphics/pokemon/gmax_appletun/back.png b/graphics/pokemon/appletun/gmax/back.png
similarity index 100%
rename from graphics/pokemon/gmax_appletun/back.png
rename to graphics/pokemon/appletun/gmax/back.png
diff --git a/graphics/pokemon/gmax_appletun/front.png b/graphics/pokemon/appletun/gmax/front.png
similarity index 100%
rename from graphics/pokemon/gmax_appletun/front.png
rename to graphics/pokemon/appletun/gmax/front.png
diff --git a/graphics/pokemon/gmax_appletun/icon.png b/graphics/pokemon/appletun/gmax/icon.png
similarity index 100%
rename from graphics/pokemon/gmax_appletun/icon.png
rename to graphics/pokemon/appletun/gmax/icon.png
diff --git a/graphics/pokemon/gmax_appletun/normal.pal b/graphics/pokemon/appletun/gmax/normal.pal
similarity index 100%
rename from graphics/pokemon/gmax_appletun/normal.pal
rename to graphics/pokemon/appletun/gmax/normal.pal
diff --git a/graphics/pokemon/gmax_appletun/shiny.pal b/graphics/pokemon/appletun/gmax/shiny.pal
similarity index 100%
rename from graphics/pokemon/gmax_appletun/shiny.pal
rename to graphics/pokemon/appletun/gmax/shiny.pal
diff --git a/graphics/pokemon/gmax_blastoise/back.png b/graphics/pokemon/blastoise/gmax/back.png
similarity index 100%
rename from graphics/pokemon/gmax_blastoise/back.png
rename to graphics/pokemon/blastoise/gmax/back.png
diff --git a/graphics/pokemon/gmax_blastoise/front.png b/graphics/pokemon/blastoise/gmax/front.png
similarity index 100%
rename from graphics/pokemon/gmax_blastoise/front.png
rename to graphics/pokemon/blastoise/gmax/front.png
diff --git a/graphics/pokemon/gmax_blastoise/icon.png b/graphics/pokemon/blastoise/gmax/icon.png
similarity index 100%
rename from graphics/pokemon/gmax_blastoise/icon.png
rename to graphics/pokemon/blastoise/gmax/icon.png
diff --git a/graphics/pokemon/gmax_blastoise/normal.pal b/graphics/pokemon/blastoise/gmax/normal.pal
similarity index 100%
rename from graphics/pokemon/gmax_blastoise/normal.pal
rename to graphics/pokemon/blastoise/gmax/normal.pal
diff --git a/graphics/pokemon/gmax_blastoise/shiny.pal b/graphics/pokemon/blastoise/gmax/shiny.pal
similarity index 100%
rename from graphics/pokemon/gmax_blastoise/shiny.pal
rename to graphics/pokemon/blastoise/gmax/shiny.pal
diff --git a/graphics/pokemon/gmax_butterfree/back.png b/graphics/pokemon/butterfree/gmax/back.png
similarity index 100%
rename from graphics/pokemon/gmax_butterfree/back.png
rename to graphics/pokemon/butterfree/gmax/back.png
diff --git a/graphics/pokemon/gmax_butterfree/front.png b/graphics/pokemon/butterfree/gmax/front.png
similarity index 100%
rename from graphics/pokemon/gmax_butterfree/front.png
rename to graphics/pokemon/butterfree/gmax/front.png
diff --git a/graphics/pokemon/gmax_butterfree/icon.png b/graphics/pokemon/butterfree/gmax/icon.png
similarity index 100%
rename from graphics/pokemon/gmax_butterfree/icon.png
rename to graphics/pokemon/butterfree/gmax/icon.png
diff --git a/graphics/pokemon/gmax_butterfree/normal.pal b/graphics/pokemon/butterfree/gmax/normal.pal
similarity index 100%
rename from graphics/pokemon/gmax_butterfree/normal.pal
rename to graphics/pokemon/butterfree/gmax/normal.pal
diff --git a/graphics/pokemon/gmax_butterfree/shiny.pal b/graphics/pokemon/butterfree/gmax/shiny.pal
similarity index 100%
rename from graphics/pokemon/gmax_butterfree/shiny.pal
rename to graphics/pokemon/butterfree/gmax/shiny.pal
diff --git a/graphics/pokemon/castform/anim_front.png b/graphics/pokemon/castform/anim_front.png
deleted file mode 100644
index 39bfaf4266..0000000000
Binary files a/graphics/pokemon/castform/anim_front.png and /dev/null differ
diff --git a/graphics/pokemon/castform/back.png b/graphics/pokemon/castform/back.png
deleted file mode 100644
index 6348a35e86..0000000000
Binary files a/graphics/pokemon/castform/back.png and /dev/null differ
diff --git a/graphics/pokemon/castform/front.png b/graphics/pokemon/castform/front.png
deleted file mode 100644
index 39bfaf4266..0000000000
Binary files a/graphics/pokemon/castform/front.png and /dev/null differ
diff --git a/graphics/pokemon/castform/normal.pal b/graphics/pokemon/castform/normal.pal
deleted file mode 100644
index 3fe2b76928..0000000000
--- a/graphics/pokemon/castform/normal.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-197 197 148
-90 82 82
-205 189 189
-230 222 222
-246 246 238
-0 0 0
-255 255 255
-222 222 246
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-148 148 148
-74 82 74
-255 255 255
-24 24 24
diff --git a/graphics/pokemon/castform/shiny.pal b/graphics/pokemon/castform/shiny.pal
deleted file mode 100644
index 2fa401dd6f..0000000000
--- a/graphics/pokemon/castform/shiny.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-197 197 148
-98 90 90
-205 164 189
-230 197 222
-255 222 255
-0 0 0
-255 246 65
-230 180 32
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-148 148 148
-74 82 74
-255 255 255
-24 24 24
diff --git a/graphics/pokemon/gmax_centiskorch/back.png b/graphics/pokemon/centiskorch/gmax/back.png
similarity index 100%
rename from graphics/pokemon/gmax_centiskorch/back.png
rename to graphics/pokemon/centiskorch/gmax/back.png
diff --git a/graphics/pokemon/gmax_centiskorch/front.png b/graphics/pokemon/centiskorch/gmax/front.png
similarity index 100%
rename from graphics/pokemon/gmax_centiskorch/front.png
rename to graphics/pokemon/centiskorch/gmax/front.png
diff --git a/graphics/pokemon/gmax_centiskorch/icon.png b/graphics/pokemon/centiskorch/gmax/icon.png
similarity index 100%
rename from graphics/pokemon/gmax_centiskorch/icon.png
rename to graphics/pokemon/centiskorch/gmax/icon.png
diff --git a/graphics/pokemon/gmax_centiskorch/normal.pal b/graphics/pokemon/centiskorch/gmax/normal.pal
similarity index 100%
rename from graphics/pokemon/gmax_centiskorch/normal.pal
rename to graphics/pokemon/centiskorch/gmax/normal.pal
diff --git a/graphics/pokemon/gmax_centiskorch/shiny.pal b/graphics/pokemon/centiskorch/gmax/shiny.pal
similarity index 100%
rename from graphics/pokemon/gmax_centiskorch/shiny.pal
rename to graphics/pokemon/centiskorch/gmax/shiny.pal
diff --git a/graphics/pokemon/gmax_charizard/back.png b/graphics/pokemon/charizard/gmax/back.png
similarity index 100%
rename from graphics/pokemon/gmax_charizard/back.png
rename to graphics/pokemon/charizard/gmax/back.png
diff --git a/graphics/pokemon/gmax_charizard/front.png b/graphics/pokemon/charizard/gmax/front.png
similarity index 100%
rename from graphics/pokemon/gmax_charizard/front.png
rename to graphics/pokemon/charizard/gmax/front.png
diff --git a/graphics/pokemon/gmax_charizard/icon.png b/graphics/pokemon/charizard/gmax/icon.png
similarity index 100%
rename from graphics/pokemon/gmax_charizard/icon.png
rename to graphics/pokemon/charizard/gmax/icon.png
diff --git a/graphics/pokemon/gmax_charizard/normal.pal b/graphics/pokemon/charizard/gmax/normal.pal
similarity index 100%
rename from graphics/pokemon/gmax_charizard/normal.pal
rename to graphics/pokemon/charizard/gmax/normal.pal
diff --git a/graphics/pokemon/gmax_charizard/shiny.pal b/graphics/pokemon/charizard/gmax/shiny.pal
similarity index 100%
rename from graphics/pokemon/gmax_charizard/shiny.pal
rename to graphics/pokemon/charizard/gmax/shiny.pal
diff --git a/graphics/pokemon/cherrim/anim_front.png b/graphics/pokemon/cherrim/anim_front.png
deleted file mode 100644
index 8f6fb3d30f..0000000000
Binary files a/graphics/pokemon/cherrim/anim_front.png and /dev/null differ
diff --git a/graphics/pokemon/cherrim/back.png b/graphics/pokemon/cherrim/back.png
deleted file mode 100644
index 5819f4dd94..0000000000
Binary files a/graphics/pokemon/cherrim/back.png and /dev/null differ
diff --git a/graphics/pokemon/cherrim/front.png b/graphics/pokemon/cherrim/front.png
deleted file mode 100644
index 5b10c48d1d..0000000000
Binary files a/graphics/pokemon/cherrim/front.png and /dev/null differ
diff --git a/graphics/pokemon/cherrim/normal.pal b/graphics/pokemon/cherrim/normal.pal
deleted file mode 100644
index b04e7c0e6d..0000000000
--- a/graphics/pokemon/cherrim/normal.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-152 208 160
-96 48 64
-200 88 112
-216 136 136
-16 16 16
-152 64 80
-16 80 16
-48 120 48
-56 168 56
-96 192 96
-96 56 112
-152 120 176
-120 88 152
-56 32 72
-0 0 0
-0 0 0
diff --git a/graphics/pokemon/cherrim/shiny.pal b/graphics/pokemon/cherrim/shiny.pal
deleted file mode 100644
index 3b56a29a9b..0000000000
--- a/graphics/pokemon/cherrim/shiny.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-152 208 160
-120 40 72
-208 88 128
-216 128 152
-16 16 16
-160 56 96
-8 80 40
-24 136 72
-32 192 88
-104 216 128
-80 104 128
-120 192 208
-72 152 184
-40 40 72
-0 0 0
-0 0 0
diff --git a/graphics/pokemon/gmax_cinderace/back.png b/graphics/pokemon/cinderace/gmax/back.png
similarity index 100%
rename from graphics/pokemon/gmax_cinderace/back.png
rename to graphics/pokemon/cinderace/gmax/back.png
diff --git a/graphics/pokemon/gmax_cinderace/front.png b/graphics/pokemon/cinderace/gmax/front.png
similarity index 100%
rename from graphics/pokemon/gmax_cinderace/front.png
rename to graphics/pokemon/cinderace/gmax/front.png
diff --git a/graphics/pokemon/gmax_cinderace/icon.png b/graphics/pokemon/cinderace/gmax/icon.png
similarity index 100%
rename from graphics/pokemon/gmax_cinderace/icon.png
rename to graphics/pokemon/cinderace/gmax/icon.png
diff --git a/graphics/pokemon/gmax_cinderace/normal.pal b/graphics/pokemon/cinderace/gmax/normal.pal
similarity index 100%
rename from graphics/pokemon/gmax_cinderace/normal.pal
rename to graphics/pokemon/cinderace/gmax/normal.pal
diff --git a/graphics/pokemon/gmax_cinderace/shiny.pal b/graphics/pokemon/cinderace/gmax/shiny.pal
similarity index 100%
rename from graphics/pokemon/gmax_cinderace/shiny.pal
rename to graphics/pokemon/cinderace/gmax/shiny.pal
diff --git a/graphics/pokemon/gmax_coalossal/back.png b/graphics/pokemon/coalossal/gmax/back.png
similarity index 100%
rename from graphics/pokemon/gmax_coalossal/back.png
rename to graphics/pokemon/coalossal/gmax/back.png
diff --git a/graphics/pokemon/gmax_coalossal/front.png b/graphics/pokemon/coalossal/gmax/front.png
similarity index 100%
rename from graphics/pokemon/gmax_coalossal/front.png
rename to graphics/pokemon/coalossal/gmax/front.png
diff --git a/graphics/pokemon/gmax_coalossal/icon.png b/graphics/pokemon/coalossal/gmax/icon.png
similarity index 100%
rename from graphics/pokemon/gmax_coalossal/icon.png
rename to graphics/pokemon/coalossal/gmax/icon.png
diff --git a/graphics/pokemon/gmax_coalossal/normal.pal b/graphics/pokemon/coalossal/gmax/normal.pal
similarity index 100%
rename from graphics/pokemon/gmax_coalossal/normal.pal
rename to graphics/pokemon/coalossal/gmax/normal.pal
diff --git a/graphics/pokemon/gmax_coalossal/shiny.pal b/graphics/pokemon/coalossal/gmax/shiny.pal
similarity index 100%
rename from graphics/pokemon/gmax_coalossal/shiny.pal
rename to graphics/pokemon/coalossal/gmax/shiny.pal
diff --git a/graphics/pokemon/gmax_copperajah/back.png b/graphics/pokemon/copperajah/gmax/back.png
similarity index 100%
rename from graphics/pokemon/gmax_copperajah/back.png
rename to graphics/pokemon/copperajah/gmax/back.png
diff --git a/graphics/pokemon/gmax_copperajah/front.png b/graphics/pokemon/copperajah/gmax/front.png
similarity index 100%
rename from graphics/pokemon/gmax_copperajah/front.png
rename to graphics/pokemon/copperajah/gmax/front.png
diff --git a/graphics/pokemon/gmax_copperajah/icon.png b/graphics/pokemon/copperajah/gmax/icon.png
similarity index 100%
rename from graphics/pokemon/gmax_copperajah/icon.png
rename to graphics/pokemon/copperajah/gmax/icon.png
diff --git a/graphics/pokemon/gmax_copperajah/normal.pal b/graphics/pokemon/copperajah/gmax/normal.pal
similarity index 100%
rename from graphics/pokemon/gmax_copperajah/normal.pal
rename to graphics/pokemon/copperajah/gmax/normal.pal
diff --git a/graphics/pokemon/gmax_copperajah/shiny.pal b/graphics/pokemon/copperajah/gmax/shiny.pal
similarity index 100%
rename from graphics/pokemon/gmax_copperajah/shiny.pal
rename to graphics/pokemon/copperajah/gmax/shiny.pal
diff --git a/graphics/pokemon/gmax_corviknight/back.png b/graphics/pokemon/corviknight/gmax/back.png
similarity index 100%
rename from graphics/pokemon/gmax_corviknight/back.png
rename to graphics/pokemon/corviknight/gmax/back.png
diff --git a/graphics/pokemon/gmax_corviknight/front.png b/graphics/pokemon/corviknight/gmax/front.png
similarity index 100%
rename from graphics/pokemon/gmax_corviknight/front.png
rename to graphics/pokemon/corviknight/gmax/front.png
diff --git a/graphics/pokemon/gmax_corviknight/icon.png b/graphics/pokemon/corviknight/gmax/icon.png
similarity index 100%
rename from graphics/pokemon/gmax_corviknight/icon.png
rename to graphics/pokemon/corviknight/gmax/icon.png
diff --git a/graphics/pokemon/gmax_corviknight/normal.pal b/graphics/pokemon/corviknight/gmax/normal.pal
similarity index 100%
rename from graphics/pokemon/gmax_corviknight/normal.pal
rename to graphics/pokemon/corviknight/gmax/normal.pal
diff --git a/graphics/pokemon/gmax_corviknight/shiny.pal b/graphics/pokemon/corviknight/gmax/shiny.pal
similarity index 100%
rename from graphics/pokemon/gmax_corviknight/shiny.pal
rename to graphics/pokemon/corviknight/gmax/shiny.pal
diff --git a/graphics/pokemon/gmax_drednaw/back.png b/graphics/pokemon/drednaw/gmax/back.png
similarity index 100%
rename from graphics/pokemon/gmax_drednaw/back.png
rename to graphics/pokemon/drednaw/gmax/back.png
diff --git a/graphics/pokemon/gmax_drednaw/front.png b/graphics/pokemon/drednaw/gmax/front.png
similarity index 100%
rename from graphics/pokemon/gmax_drednaw/front.png
rename to graphics/pokemon/drednaw/gmax/front.png
diff --git a/graphics/pokemon/gmax_drednaw/icon.png b/graphics/pokemon/drednaw/gmax/icon.png
similarity index 100%
rename from graphics/pokemon/gmax_drednaw/icon.png
rename to graphics/pokemon/drednaw/gmax/icon.png
diff --git a/graphics/pokemon/gmax_drednaw/normal.pal b/graphics/pokemon/drednaw/gmax/normal.pal
similarity index 100%
rename from graphics/pokemon/gmax_drednaw/normal.pal
rename to graphics/pokemon/drednaw/gmax/normal.pal
diff --git a/graphics/pokemon/gmax_drednaw/shiny.pal b/graphics/pokemon/drednaw/gmax/shiny.pal
similarity index 100%
rename from graphics/pokemon/gmax_drednaw/shiny.pal
rename to graphics/pokemon/drednaw/gmax/shiny.pal
diff --git a/graphics/pokemon/gmax_duraludon/back.png b/graphics/pokemon/duraludon/gmax/back.png
similarity index 100%
rename from graphics/pokemon/gmax_duraludon/back.png
rename to graphics/pokemon/duraludon/gmax/back.png
diff --git a/graphics/pokemon/gmax_duraludon/front.png b/graphics/pokemon/duraludon/gmax/front.png
similarity index 100%
rename from graphics/pokemon/gmax_duraludon/front.png
rename to graphics/pokemon/duraludon/gmax/front.png
diff --git a/graphics/pokemon/gmax_duraludon/icon.png b/graphics/pokemon/duraludon/gmax/icon.png
similarity index 100%
rename from graphics/pokemon/gmax_duraludon/icon.png
rename to graphics/pokemon/duraludon/gmax/icon.png
diff --git a/graphics/pokemon/gmax_duraludon/normal.pal b/graphics/pokemon/duraludon/gmax/normal.pal
similarity index 100%
rename from graphics/pokemon/gmax_duraludon/normal.pal
rename to graphics/pokemon/duraludon/gmax/normal.pal
diff --git a/graphics/pokemon/gmax_duraludon/shiny.pal b/graphics/pokemon/duraludon/gmax/shiny.pal
similarity index 100%
rename from graphics/pokemon/gmax_duraludon/shiny.pal
rename to graphics/pokemon/duraludon/gmax/shiny.pal
diff --git a/graphics/pokemon/gmax_eevee/back.png b/graphics/pokemon/eevee/gmax/back.png
similarity index 100%
rename from graphics/pokemon/gmax_eevee/back.png
rename to graphics/pokemon/eevee/gmax/back.png
diff --git a/graphics/pokemon/gmax_eevee/front.png b/graphics/pokemon/eevee/gmax/front.png
similarity index 100%
rename from graphics/pokemon/gmax_eevee/front.png
rename to graphics/pokemon/eevee/gmax/front.png
diff --git a/graphics/pokemon/gmax_eevee/icon.png b/graphics/pokemon/eevee/gmax/icon.png
similarity index 100%
rename from graphics/pokemon/gmax_eevee/icon.png
rename to graphics/pokemon/eevee/gmax/icon.png
diff --git a/graphics/pokemon/gmax_eevee/normal.pal b/graphics/pokemon/eevee/gmax/normal.pal
similarity index 100%
rename from graphics/pokemon/gmax_eevee/normal.pal
rename to graphics/pokemon/eevee/gmax/normal.pal
diff --git a/graphics/pokemon/gmax_eevee/shiny.pal b/graphics/pokemon/eevee/gmax/shiny.pal
similarity index 100%
rename from graphics/pokemon/gmax_eevee/shiny.pal
rename to graphics/pokemon/eevee/gmax/shiny.pal
diff --git a/graphics/pokemon/gmax_flapple/back.png b/graphics/pokemon/flapple/gmax/back.png
similarity index 100%
rename from graphics/pokemon/gmax_flapple/back.png
rename to graphics/pokemon/flapple/gmax/back.png
diff --git a/graphics/pokemon/gmax_flapple/front.png b/graphics/pokemon/flapple/gmax/front.png
similarity index 100%
rename from graphics/pokemon/gmax_flapple/front.png
rename to graphics/pokemon/flapple/gmax/front.png
diff --git a/graphics/pokemon/gmax_flapple/icon.png b/graphics/pokemon/flapple/gmax/icon.png
similarity index 100%
rename from graphics/pokemon/gmax_flapple/icon.png
rename to graphics/pokemon/flapple/gmax/icon.png
diff --git a/graphics/pokemon/gmax_flapple/normal.pal b/graphics/pokemon/flapple/gmax/normal.pal
similarity index 100%
rename from graphics/pokemon/gmax_flapple/normal.pal
rename to graphics/pokemon/flapple/gmax/normal.pal
diff --git a/graphics/pokemon/gmax_flapple/shiny.pal b/graphics/pokemon/flapple/gmax/shiny.pal
similarity index 100%
rename from graphics/pokemon/gmax_flapple/shiny.pal
rename to graphics/pokemon/flapple/gmax/shiny.pal
diff --git a/graphics/pokemon/gmax_garbodor/back.png b/graphics/pokemon/garbodor/gmax/back.png
similarity index 100%
rename from graphics/pokemon/gmax_garbodor/back.png
rename to graphics/pokemon/garbodor/gmax/back.png
diff --git a/graphics/pokemon/gmax_garbodor/front.png b/graphics/pokemon/garbodor/gmax/front.png
similarity index 100%
rename from graphics/pokemon/gmax_garbodor/front.png
rename to graphics/pokemon/garbodor/gmax/front.png
diff --git a/graphics/pokemon/gmax_garbodor/icon.png b/graphics/pokemon/garbodor/gmax/icon.png
similarity index 100%
rename from graphics/pokemon/gmax_garbodor/icon.png
rename to graphics/pokemon/garbodor/gmax/icon.png
diff --git a/graphics/pokemon/gmax_garbodor/normal.pal b/graphics/pokemon/garbodor/gmax/normal.pal
similarity index 100%
rename from graphics/pokemon/gmax_garbodor/normal.pal
rename to graphics/pokemon/garbodor/gmax/normal.pal
diff --git a/graphics/pokemon/gmax_garbodor/shiny.pal b/graphics/pokemon/garbodor/gmax/shiny.pal
similarity index 100%
rename from graphics/pokemon/gmax_garbodor/shiny.pal
rename to graphics/pokemon/garbodor/gmax/shiny.pal
diff --git a/graphics/pokemon/gmax_gengar/back.png b/graphics/pokemon/gengar/gmax/back.png
similarity index 100%
rename from graphics/pokemon/gmax_gengar/back.png
rename to graphics/pokemon/gengar/gmax/back.png
diff --git a/graphics/pokemon/gmax_gengar/front.png b/graphics/pokemon/gengar/gmax/front.png
similarity index 100%
rename from graphics/pokemon/gmax_gengar/front.png
rename to graphics/pokemon/gengar/gmax/front.png
diff --git a/graphics/pokemon/gmax_gengar/icon.png b/graphics/pokemon/gengar/gmax/icon.png
similarity index 100%
rename from graphics/pokemon/gmax_gengar/icon.png
rename to graphics/pokemon/gengar/gmax/icon.png
diff --git a/graphics/pokemon/gmax_gengar/normal.pal b/graphics/pokemon/gengar/gmax/normal.pal
similarity index 100%
rename from graphics/pokemon/gmax_gengar/normal.pal
rename to graphics/pokemon/gengar/gmax/normal.pal
diff --git a/graphics/pokemon/gmax_gengar/shiny.pal b/graphics/pokemon/gengar/gmax/shiny.pal
similarity index 100%
rename from graphics/pokemon/gmax_gengar/shiny.pal
rename to graphics/pokemon/gengar/gmax/shiny.pal
diff --git a/graphics/pokemon/gmax_grimmsnarl/back.png b/graphics/pokemon/grimmsnarl/gmax/back.png
similarity index 100%
rename from graphics/pokemon/gmax_grimmsnarl/back.png
rename to graphics/pokemon/grimmsnarl/gmax/back.png
diff --git a/graphics/pokemon/gmax_grimmsnarl/front.png b/graphics/pokemon/grimmsnarl/gmax/front.png
similarity index 100%
rename from graphics/pokemon/gmax_grimmsnarl/front.png
rename to graphics/pokemon/grimmsnarl/gmax/front.png
diff --git a/graphics/pokemon/gmax_grimmsnarl/icon.png b/graphics/pokemon/grimmsnarl/gmax/icon.png
similarity index 100%
rename from graphics/pokemon/gmax_grimmsnarl/icon.png
rename to graphics/pokemon/grimmsnarl/gmax/icon.png
diff --git a/graphics/pokemon/gmax_grimmsnarl/normal.pal b/graphics/pokemon/grimmsnarl/gmax/normal.pal
similarity index 100%
rename from graphics/pokemon/gmax_grimmsnarl/normal.pal
rename to graphics/pokemon/grimmsnarl/gmax/normal.pal
diff --git a/graphics/pokemon/gmax_grimmsnarl/shiny.pal b/graphics/pokemon/grimmsnarl/gmax/shiny.pal
similarity index 100%
rename from graphics/pokemon/gmax_grimmsnarl/shiny.pal
rename to graphics/pokemon/grimmsnarl/gmax/shiny.pal
diff --git a/graphics/pokemon/gmax_hatterene/back.png b/graphics/pokemon/hatterene/gmax/back.png
similarity index 100%
rename from graphics/pokemon/gmax_hatterene/back.png
rename to graphics/pokemon/hatterene/gmax/back.png
diff --git a/graphics/pokemon/gmax_hatterene/front.png b/graphics/pokemon/hatterene/gmax/front.png
similarity index 100%
rename from graphics/pokemon/gmax_hatterene/front.png
rename to graphics/pokemon/hatterene/gmax/front.png
diff --git a/graphics/pokemon/gmax_hatterene/icon.png b/graphics/pokemon/hatterene/gmax/icon.png
similarity index 100%
rename from graphics/pokemon/gmax_hatterene/icon.png
rename to graphics/pokemon/hatterene/gmax/icon.png
diff --git a/graphics/pokemon/gmax_hatterene/normal.pal b/graphics/pokemon/hatterene/gmax/normal.pal
similarity index 100%
rename from graphics/pokemon/gmax_hatterene/normal.pal
rename to graphics/pokemon/hatterene/gmax/normal.pal
diff --git a/graphics/pokemon/gmax_hatterene/shiny.pal b/graphics/pokemon/hatterene/gmax/shiny.pal
similarity index 100%
rename from graphics/pokemon/gmax_hatterene/shiny.pal
rename to graphics/pokemon/hatterene/gmax/shiny.pal
diff --git a/graphics/pokemon/gmax_inteleon/back.png b/graphics/pokemon/inteleon/gmax/back.png
similarity index 100%
rename from graphics/pokemon/gmax_inteleon/back.png
rename to graphics/pokemon/inteleon/gmax/back.png
diff --git a/graphics/pokemon/gmax_inteleon/front.png b/graphics/pokemon/inteleon/gmax/front.png
similarity index 100%
rename from graphics/pokemon/gmax_inteleon/front.png
rename to graphics/pokemon/inteleon/gmax/front.png
diff --git a/graphics/pokemon/gmax_inteleon/icon.png b/graphics/pokemon/inteleon/gmax/icon.png
similarity index 100%
rename from graphics/pokemon/gmax_inteleon/icon.png
rename to graphics/pokemon/inteleon/gmax/icon.png
diff --git a/graphics/pokemon/gmax_inteleon/normal.pal b/graphics/pokemon/inteleon/gmax/normal.pal
similarity index 100%
rename from graphics/pokemon/gmax_inteleon/normal.pal
rename to graphics/pokemon/inteleon/gmax/normal.pal
diff --git a/graphics/pokemon/gmax_inteleon/shiny.pal b/graphics/pokemon/inteleon/gmax/shiny.pal
similarity index 100%
rename from graphics/pokemon/gmax_inteleon/shiny.pal
rename to graphics/pokemon/inteleon/gmax/shiny.pal
diff --git a/graphics/pokemon/gmax_kingler/back.png b/graphics/pokemon/kingler/gmax/back.png
similarity index 100%
rename from graphics/pokemon/gmax_kingler/back.png
rename to graphics/pokemon/kingler/gmax/back.png
diff --git a/graphics/pokemon/gmax_kingler/front.png b/graphics/pokemon/kingler/gmax/front.png
similarity index 100%
rename from graphics/pokemon/gmax_kingler/front.png
rename to graphics/pokemon/kingler/gmax/front.png
diff --git a/graphics/pokemon/gmax_kingler/icon.png b/graphics/pokemon/kingler/gmax/icon.png
similarity index 100%
rename from graphics/pokemon/gmax_kingler/icon.png
rename to graphics/pokemon/kingler/gmax/icon.png
diff --git a/graphics/pokemon/gmax_kingler/normal.pal b/graphics/pokemon/kingler/gmax/normal.pal
similarity index 100%
rename from graphics/pokemon/gmax_kingler/normal.pal
rename to graphics/pokemon/kingler/gmax/normal.pal
diff --git a/graphics/pokemon/gmax_kingler/shiny.pal b/graphics/pokemon/kingler/gmax/shiny.pal
similarity index 100%
rename from graphics/pokemon/gmax_kingler/shiny.pal
rename to graphics/pokemon/kingler/gmax/shiny.pal
diff --git a/graphics/pokemon/gmax_lapras/back.png b/graphics/pokemon/lapras/gmax/back.png
similarity index 100%
rename from graphics/pokemon/gmax_lapras/back.png
rename to graphics/pokemon/lapras/gmax/back.png
diff --git a/graphics/pokemon/gmax_lapras/front.png b/graphics/pokemon/lapras/gmax/front.png
similarity index 100%
rename from graphics/pokemon/gmax_lapras/front.png
rename to graphics/pokemon/lapras/gmax/front.png
diff --git a/graphics/pokemon/gmax_lapras/icon.png b/graphics/pokemon/lapras/gmax/icon.png
similarity index 100%
rename from graphics/pokemon/gmax_lapras/icon.png
rename to graphics/pokemon/lapras/gmax/icon.png
diff --git a/graphics/pokemon/gmax_lapras/normal.pal b/graphics/pokemon/lapras/gmax/normal.pal
similarity index 100%
rename from graphics/pokemon/gmax_lapras/normal.pal
rename to graphics/pokemon/lapras/gmax/normal.pal
diff --git a/graphics/pokemon/gmax_lapras/shiny.pal b/graphics/pokemon/lapras/gmax/shiny.pal
similarity index 100%
rename from graphics/pokemon/gmax_lapras/shiny.pal
rename to graphics/pokemon/lapras/gmax/shiny.pal
diff --git a/graphics/pokemon/gmax_machamp/back.png b/graphics/pokemon/machamp/gmax/back.png
similarity index 100%
rename from graphics/pokemon/gmax_machamp/back.png
rename to graphics/pokemon/machamp/gmax/back.png
diff --git a/graphics/pokemon/gmax_machamp/front.png b/graphics/pokemon/machamp/gmax/front.png
similarity index 100%
rename from graphics/pokemon/gmax_machamp/front.png
rename to graphics/pokemon/machamp/gmax/front.png
diff --git a/graphics/pokemon/gmax_machamp/icon.png b/graphics/pokemon/machamp/gmax/icon.png
similarity index 100%
rename from graphics/pokemon/gmax_machamp/icon.png
rename to graphics/pokemon/machamp/gmax/icon.png
diff --git a/graphics/pokemon/gmax_machamp/normal.pal b/graphics/pokemon/machamp/gmax/normal.pal
similarity index 100%
rename from graphics/pokemon/gmax_machamp/normal.pal
rename to graphics/pokemon/machamp/gmax/normal.pal
diff --git a/graphics/pokemon/gmax_machamp/shiny.pal b/graphics/pokemon/machamp/gmax/shiny.pal
similarity index 100%
rename from graphics/pokemon/gmax_machamp/shiny.pal
rename to graphics/pokemon/machamp/gmax/shiny.pal
diff --git a/graphics/pokemon/gmax_melmetal/back.png b/graphics/pokemon/melmetal/gmax/back.png
similarity index 100%
rename from graphics/pokemon/gmax_melmetal/back.png
rename to graphics/pokemon/melmetal/gmax/back.png
diff --git a/graphics/pokemon/gmax_melmetal/front.png b/graphics/pokemon/melmetal/gmax/front.png
similarity index 100%
rename from graphics/pokemon/gmax_melmetal/front.png
rename to graphics/pokemon/melmetal/gmax/front.png
diff --git a/graphics/pokemon/gmax_melmetal/icon.png b/graphics/pokemon/melmetal/gmax/icon.png
similarity index 100%
rename from graphics/pokemon/gmax_melmetal/icon.png
rename to graphics/pokemon/melmetal/gmax/icon.png
diff --git a/graphics/pokemon/gmax_melmetal/normal.pal b/graphics/pokemon/melmetal/gmax/normal.pal
similarity index 100%
rename from graphics/pokemon/gmax_melmetal/normal.pal
rename to graphics/pokemon/melmetal/gmax/normal.pal
diff --git a/graphics/pokemon/gmax_melmetal/shiny.pal b/graphics/pokemon/melmetal/gmax/shiny.pal
similarity index 100%
rename from graphics/pokemon/gmax_melmetal/shiny.pal
rename to graphics/pokemon/melmetal/gmax/shiny.pal
diff --git a/graphics/pokemon/gmax_meowth/back.png b/graphics/pokemon/meowth/gmax/back.png
similarity index 100%
rename from graphics/pokemon/gmax_meowth/back.png
rename to graphics/pokemon/meowth/gmax/back.png
diff --git a/graphics/pokemon/gmax_meowth/front.png b/graphics/pokemon/meowth/gmax/front.png
similarity index 100%
rename from graphics/pokemon/gmax_meowth/front.png
rename to graphics/pokemon/meowth/gmax/front.png
diff --git a/graphics/pokemon/gmax_meowth/icon.png b/graphics/pokemon/meowth/gmax/icon.png
similarity index 100%
rename from graphics/pokemon/gmax_meowth/icon.png
rename to graphics/pokemon/meowth/gmax/icon.png
diff --git a/graphics/pokemon/gmax_meowth/normal.pal b/graphics/pokemon/meowth/gmax/normal.pal
similarity index 100%
rename from graphics/pokemon/gmax_meowth/normal.pal
rename to graphics/pokemon/meowth/gmax/normal.pal
diff --git a/graphics/pokemon/gmax_meowth/shiny.pal b/graphics/pokemon/meowth/gmax/shiny.pal
similarity index 100%
rename from graphics/pokemon/gmax_meowth/shiny.pal
rename to graphics/pokemon/meowth/gmax/shiny.pal
diff --git a/graphics/pokemon/gmax_orbeetle/back.png b/graphics/pokemon/orbeetle/gmax/back.png
similarity index 100%
rename from graphics/pokemon/gmax_orbeetle/back.png
rename to graphics/pokemon/orbeetle/gmax/back.png
diff --git a/graphics/pokemon/gmax_orbeetle/front.png b/graphics/pokemon/orbeetle/gmax/front.png
similarity index 100%
rename from graphics/pokemon/gmax_orbeetle/front.png
rename to graphics/pokemon/orbeetle/gmax/front.png
diff --git a/graphics/pokemon/gmax_orbeetle/icon.png b/graphics/pokemon/orbeetle/gmax/icon.png
similarity index 100%
rename from graphics/pokemon/gmax_orbeetle/icon.png
rename to graphics/pokemon/orbeetle/gmax/icon.png
diff --git a/graphics/pokemon/gmax_orbeetle/normal.pal b/graphics/pokemon/orbeetle/gmax/normal.pal
similarity index 100%
rename from graphics/pokemon/gmax_orbeetle/normal.pal
rename to graphics/pokemon/orbeetle/gmax/normal.pal
diff --git a/graphics/pokemon/gmax_orbeetle/shiny.pal b/graphics/pokemon/orbeetle/gmax/shiny.pal
similarity index 100%
rename from graphics/pokemon/gmax_orbeetle/shiny.pal
rename to graphics/pokemon/orbeetle/gmax/shiny.pal
diff --git a/graphics/pokemon/gmax_pikachu/back.png b/graphics/pokemon/pikachu/gmax/back.png
similarity index 100%
rename from graphics/pokemon/gmax_pikachu/back.png
rename to graphics/pokemon/pikachu/gmax/back.png
diff --git a/graphics/pokemon/gmax_pikachu/front.png b/graphics/pokemon/pikachu/gmax/front.png
similarity index 100%
rename from graphics/pokemon/gmax_pikachu/front.png
rename to graphics/pokemon/pikachu/gmax/front.png
diff --git a/graphics/pokemon/gmax_pikachu/icon.png b/graphics/pokemon/pikachu/gmax/icon.png
similarity index 100%
rename from graphics/pokemon/gmax_pikachu/icon.png
rename to graphics/pokemon/pikachu/gmax/icon.png
diff --git a/graphics/pokemon/gmax_pikachu/normal.pal b/graphics/pokemon/pikachu/gmax/normal.pal
similarity index 100%
rename from graphics/pokemon/gmax_pikachu/normal.pal
rename to graphics/pokemon/pikachu/gmax/normal.pal
diff --git a/graphics/pokemon/gmax_pikachu/shiny.pal b/graphics/pokemon/pikachu/gmax/shiny.pal
similarity index 100%
rename from graphics/pokemon/gmax_pikachu/shiny.pal
rename to graphics/pokemon/pikachu/gmax/shiny.pal
diff --git a/graphics/pokemon/gmax_rillaboom/back.png b/graphics/pokemon/rillaboom/gmax/back.png
similarity index 100%
rename from graphics/pokemon/gmax_rillaboom/back.png
rename to graphics/pokemon/rillaboom/gmax/back.png
diff --git a/graphics/pokemon/gmax_rillaboom/front.png b/graphics/pokemon/rillaboom/gmax/front.png
similarity index 100%
rename from graphics/pokemon/gmax_rillaboom/front.png
rename to graphics/pokemon/rillaboom/gmax/front.png
diff --git a/graphics/pokemon/gmax_rillaboom/icon.png b/graphics/pokemon/rillaboom/gmax/icon.png
similarity index 100%
rename from graphics/pokemon/gmax_rillaboom/icon.png
rename to graphics/pokemon/rillaboom/gmax/icon.png
diff --git a/graphics/pokemon/gmax_rillaboom/normal.pal b/graphics/pokemon/rillaboom/gmax/normal.pal
similarity index 100%
rename from graphics/pokemon/gmax_rillaboom/normal.pal
rename to graphics/pokemon/rillaboom/gmax/normal.pal
diff --git a/graphics/pokemon/gmax_rillaboom/shiny.pal b/graphics/pokemon/rillaboom/gmax/shiny.pal
similarity index 100%
rename from graphics/pokemon/gmax_rillaboom/shiny.pal
rename to graphics/pokemon/rillaboom/gmax/shiny.pal
diff --git a/graphics/pokemon/gmax_sandaconda/back.png b/graphics/pokemon/sandaconda/gmax/back.png
similarity index 100%
rename from graphics/pokemon/gmax_sandaconda/back.png
rename to graphics/pokemon/sandaconda/gmax/back.png
diff --git a/graphics/pokemon/gmax_sandaconda/front.png b/graphics/pokemon/sandaconda/gmax/front.png
similarity index 100%
rename from graphics/pokemon/gmax_sandaconda/front.png
rename to graphics/pokemon/sandaconda/gmax/front.png
diff --git a/graphics/pokemon/gmax_sandaconda/icon.png b/graphics/pokemon/sandaconda/gmax/icon.png
similarity index 100%
rename from graphics/pokemon/gmax_sandaconda/icon.png
rename to graphics/pokemon/sandaconda/gmax/icon.png
diff --git a/graphics/pokemon/gmax_sandaconda/normal.pal b/graphics/pokemon/sandaconda/gmax/normal.pal
similarity index 100%
rename from graphics/pokemon/gmax_sandaconda/normal.pal
rename to graphics/pokemon/sandaconda/gmax/normal.pal
diff --git a/graphics/pokemon/gmax_sandaconda/shiny.pal b/graphics/pokemon/sandaconda/gmax/shiny.pal
similarity index 100%
rename from graphics/pokemon/gmax_sandaconda/shiny.pal
rename to graphics/pokemon/sandaconda/gmax/shiny.pal
diff --git a/graphics/pokemon/gmax_snorlax/back.png b/graphics/pokemon/snorlax/gmax/back.png
similarity index 100%
rename from graphics/pokemon/gmax_snorlax/back.png
rename to graphics/pokemon/snorlax/gmax/back.png
diff --git a/graphics/pokemon/gmax_snorlax/front.png b/graphics/pokemon/snorlax/gmax/front.png
similarity index 100%
rename from graphics/pokemon/gmax_snorlax/front.png
rename to graphics/pokemon/snorlax/gmax/front.png
diff --git a/graphics/pokemon/gmax_snorlax/icon.png b/graphics/pokemon/snorlax/gmax/icon.png
similarity index 100%
rename from graphics/pokemon/gmax_snorlax/icon.png
rename to graphics/pokemon/snorlax/gmax/icon.png
diff --git a/graphics/pokemon/gmax_snorlax/normal.pal b/graphics/pokemon/snorlax/gmax/normal.pal
similarity index 100%
rename from graphics/pokemon/gmax_snorlax/normal.pal
rename to graphics/pokemon/snorlax/gmax/normal.pal
diff --git a/graphics/pokemon/gmax_snorlax/shiny.pal b/graphics/pokemon/snorlax/gmax/shiny.pal
similarity index 100%
rename from graphics/pokemon/gmax_snorlax/shiny.pal
rename to graphics/pokemon/snorlax/gmax/shiny.pal
diff --git a/graphics/pokemon/gmax_toxtricity/back.png b/graphics/pokemon/toxtricity/gmax/back.png
similarity index 100%
rename from graphics/pokemon/gmax_toxtricity/back.png
rename to graphics/pokemon/toxtricity/gmax/back.png
diff --git a/graphics/pokemon/gmax_toxtricity/front.png b/graphics/pokemon/toxtricity/gmax/front.png
similarity index 100%
rename from graphics/pokemon/gmax_toxtricity/front.png
rename to graphics/pokemon/toxtricity/gmax/front.png
diff --git a/graphics/pokemon/gmax_toxtricity/icon.png b/graphics/pokemon/toxtricity/gmax/icon.png
similarity index 100%
rename from graphics/pokemon/gmax_toxtricity/icon.png
rename to graphics/pokemon/toxtricity/gmax/icon.png
diff --git a/graphics/pokemon/gmax_toxtricity/normal.pal b/graphics/pokemon/toxtricity/gmax/normal.pal
similarity index 100%
rename from graphics/pokemon/gmax_toxtricity/normal.pal
rename to graphics/pokemon/toxtricity/gmax/normal.pal
diff --git a/graphics/pokemon/gmax_toxtricity/shiny.pal b/graphics/pokemon/toxtricity/gmax/shiny.pal
similarity index 100%
rename from graphics/pokemon/gmax_toxtricity/shiny.pal
rename to graphics/pokemon/toxtricity/gmax/shiny.pal
diff --git a/graphics/pokemon/gmax_urshifu/back.png b/graphics/pokemon/urshifu/gmax/back.png
similarity index 100%
rename from graphics/pokemon/gmax_urshifu/back.png
rename to graphics/pokemon/urshifu/gmax/back.png
diff --git a/graphics/pokemon/gmax_urshifu/front.png b/graphics/pokemon/urshifu/gmax/front.png
similarity index 100%
rename from graphics/pokemon/gmax_urshifu/front.png
rename to graphics/pokemon/urshifu/gmax/front.png
diff --git a/graphics/pokemon/gmax_urshifu/icon.png b/graphics/pokemon/urshifu/gmax/icon.png
similarity index 100%
rename from graphics/pokemon/gmax_urshifu/icon.png
rename to graphics/pokemon/urshifu/gmax/icon.png
diff --git a/graphics/pokemon/gmax_urshifu/normal.pal b/graphics/pokemon/urshifu/gmax/normal.pal
similarity index 100%
rename from graphics/pokemon/gmax_urshifu/normal.pal
rename to graphics/pokemon/urshifu/gmax/normal.pal
diff --git a/graphics/pokemon/gmax_urshifu/shiny.pal b/graphics/pokemon/urshifu/gmax/shiny.pal
similarity index 100%
rename from graphics/pokemon/gmax_urshifu/shiny.pal
rename to graphics/pokemon/urshifu/gmax/shiny.pal
diff --git a/graphics/pokemon/gmax_urshifu_rapid_strike/back.png b/graphics/pokemon/urshifu/gmax_rapid_strike_style/back.png
similarity index 100%
rename from graphics/pokemon/gmax_urshifu_rapid_strike/back.png
rename to graphics/pokemon/urshifu/gmax_rapid_strike_style/back.png
diff --git a/graphics/pokemon/gmax_urshifu_rapid_strike/front.png b/graphics/pokemon/urshifu/gmax_rapid_strike_style/front.png
similarity index 100%
rename from graphics/pokemon/gmax_urshifu_rapid_strike/front.png
rename to graphics/pokemon/urshifu/gmax_rapid_strike_style/front.png
diff --git a/graphics/pokemon/gmax_urshifu_rapid_strike/icon.png b/graphics/pokemon/urshifu/gmax_rapid_strike_style/icon.png
similarity index 100%
rename from graphics/pokemon/gmax_urshifu_rapid_strike/icon.png
rename to graphics/pokemon/urshifu/gmax_rapid_strike_style/icon.png
diff --git a/graphics/pokemon/gmax_urshifu_rapid_strike/normal.pal b/graphics/pokemon/urshifu/gmax_rapid_strike_style/normal.pal
similarity index 100%
rename from graphics/pokemon/gmax_urshifu_rapid_strike/normal.pal
rename to graphics/pokemon/urshifu/gmax_rapid_strike_style/normal.pal
diff --git a/graphics/pokemon/gmax_urshifu_rapid_strike/shiny.pal b/graphics/pokemon/urshifu/gmax_rapid_strike_style/shiny.pal
similarity index 100%
rename from graphics/pokemon/gmax_urshifu_rapid_strike/shiny.pal
rename to graphics/pokemon/urshifu/gmax_rapid_strike_style/shiny.pal
diff --git a/graphics/pokemon/gmax_venusaur/back.png b/graphics/pokemon/venusaur/gmax/back.png
similarity index 100%
rename from graphics/pokemon/gmax_venusaur/back.png
rename to graphics/pokemon/venusaur/gmax/back.png
diff --git a/graphics/pokemon/gmax_venusaur/front.png b/graphics/pokemon/venusaur/gmax/front.png
similarity index 100%
rename from graphics/pokemon/gmax_venusaur/front.png
rename to graphics/pokemon/venusaur/gmax/front.png
diff --git a/graphics/pokemon/gmax_venusaur/icon.png b/graphics/pokemon/venusaur/gmax/icon.png
similarity index 100%
rename from graphics/pokemon/gmax_venusaur/icon.png
rename to graphics/pokemon/venusaur/gmax/icon.png
diff --git a/graphics/pokemon/gmax_venusaur/normal.pal b/graphics/pokemon/venusaur/gmax/normal.pal
similarity index 100%
rename from graphics/pokemon/gmax_venusaur/normal.pal
rename to graphics/pokemon/venusaur/gmax/normal.pal
diff --git a/graphics/pokemon/gmax_venusaur/shiny.pal b/graphics/pokemon/venusaur/gmax/shiny.pal
similarity index 100%
rename from graphics/pokemon/gmax_venusaur/shiny.pal
rename to graphics/pokemon/venusaur/gmax/shiny.pal
diff --git a/src/data/graphics/pokemon.h b/src/data/graphics/pokemon.h
index 91401d0910..faf6edb6d3 100644
--- a/src/data/graphics/pokemon.h
+++ b/src/data/graphics/pokemon.h
@@ -1210,39 +1210,39 @@ const u32 gMonFrontPic_ZarudeDada[] = INCBIN_U32("graphics/pokemon/zarude/dada/f
 const u32 gMonFrontPic_CalyrexIceRider[] = INCBIN_U32("graphics/pokemon/calyrex/ice_rider/front.4bpp.lz");
 const u32 gMonFrontPic_CalyrexShadowRider[] = INCBIN_U32("graphics/pokemon/calyrex/shadow_rider/front.4bpp.lz");
 //const u32 gMonFrontPic_EnamorusTherian[] = INCBIN_U32("graphics/pokemon/enamorus/therian/front.4bpp.lz");
-const u32 gMonFrontPic_VenusaurGmax[] = INCBIN_U32("graphics/pokemon/gmax_venusaur/front.4bpp.lz");
-const u32 gMonFrontPic_CharizardGmax[] = INCBIN_U32("graphics/pokemon/gmax_charizard/front.4bpp.lz");
-const u32 gMonFrontPic_BlastoiseGmax[] = INCBIN_U32("graphics/pokemon/gmax_blastoise/front.4bpp.lz");
-const u32 gMonFrontPic_ButterfreeGmax[] = INCBIN_U32("graphics/pokemon/gmax_butterfree/front.4bpp.lz");
-const u32 gMonFrontPic_PikachuGmax[] = INCBIN_U32("graphics/pokemon/gmax_pikachu/front.4bpp.lz");
-const u32 gMonFrontPic_MeowthGmax[] = INCBIN_U32("graphics/pokemon/gmax_meowth/front.4bpp.lz");
-const u32 gMonFrontPic_MachampGmax[] = INCBIN_U32("graphics/pokemon/gmax_machamp/front.4bpp.lz");
-const u32 gMonFrontPic_GengarGmax[] = INCBIN_U32("graphics/pokemon/gmax_gengar/front.4bpp.lz");
-const u32 gMonFrontPic_KinglerGmax[] = INCBIN_U32("graphics/pokemon/gmax_kingler/front.4bpp.lz");
-const u32 gMonFrontPic_LaprasGmax[] = INCBIN_U32("graphics/pokemon/gmax_lapras/front.4bpp.lz");
-const u32 gMonFrontPic_EeveeGmax[] = INCBIN_U32("graphics/pokemon/gmax_eevee/front.4bpp.lz");
-const u32 gMonFrontPic_SnorlaxGmax[] = INCBIN_U32("graphics/pokemon/gmax_snorlax/front.4bpp.lz");
-const u32 gMonFrontPic_GarbodorGmax[] = INCBIN_U32("graphics/pokemon/gmax_garbodor/front.4bpp.lz");
-const u32 gMonFrontPic_MelmetalGmax[] = INCBIN_U32("graphics/pokemon/gmax_melmetal/front.4bpp.lz");
-const u32 gMonFrontPic_RillaboomGmax[] = INCBIN_U32("graphics/pokemon/gmax_rillaboom/front.4bpp.lz");
-const u32 gMonFrontPic_CinderaceGmax[] = INCBIN_U32("graphics/pokemon/gmax_cinderace/front.4bpp.lz");
-const u32 gMonFrontPic_InteleonGmax[] = INCBIN_U32("graphics/pokemon/gmax_inteleon/front.4bpp.lz");
-const u32 gMonFrontPic_CorviknightGmax[] = INCBIN_U32("graphics/pokemon/gmax_corviknight/front.4bpp.lz");
-const u32 gMonFrontPic_OrbeetleGmax[] = INCBIN_U32("graphics/pokemon/gmax_orbeetle/front.4bpp.lz");
-const u32 gMonFrontPic_DrednawGmax[] = INCBIN_U32("graphics/pokemon/gmax_drednaw/front.4bpp.lz");
-const u32 gMonFrontPic_CoalossalGmax[] = INCBIN_U32("graphics/pokemon/gmax_coalossal/front.4bpp.lz");
-const u32 gMonFrontPic_FlappleGmax[] = INCBIN_U32("graphics/pokemon/gmax_flapple/front.4bpp.lz");
-const u32 gMonFrontPic_AppletunGmax[] = INCBIN_U32("graphics/pokemon/gmax_appletun/front.4bpp.lz");
-const u32 gMonFrontPic_SandacondaGmax[] = INCBIN_U32("graphics/pokemon/gmax_sandaconda/front.4bpp.lz");
-const u32 gMonFrontPic_ToxtricityGmax[] = INCBIN_U32("graphics/pokemon/gmax_toxtricity/front.4bpp.lz");
-const u32 gMonFrontPic_CentiskorchGmax[] = INCBIN_U32("graphics/pokemon/gmax_centiskorch/front.4bpp.lz");
-const u32 gMonFrontPic_HattereneGmax[] = INCBIN_U32("graphics/pokemon/gmax_hatterene/front.4bpp.lz");
-const u32 gMonFrontPic_GrimmsnarlGmax[] = INCBIN_U32("graphics/pokemon/gmax_grimmsnarl/front.4bpp.lz");
-const u32 gMonFrontPic_AlcremieGmax[] = INCBIN_U32("graphics/pokemon/gmax_alcremie/front.4bpp.lz");
-const u32 gMonFrontPic_CopperajahGmax[] = INCBIN_U32("graphics/pokemon/gmax_copperajah/front.4bpp.lz");
-const u32 gMonFrontPic_DuraludonGmax[] = INCBIN_U32("graphics/pokemon/gmax_duraludon/front.4bpp.lz");
-const u32 gMonFrontPic_UrshifuGmax[] = INCBIN_U32("graphics/pokemon/gmax_urshifu/front.4bpp.lz");
-const u32 gMonFrontPic_UrshifuRapidStrikeGmax[] = INCBIN_U32("graphics/pokemon/gmax_urshifu_rapid_strike/front.4bpp.lz");
+const u32 gMonFrontPic_VenusaurGmax[] = INCBIN_U32("graphics/pokemon/venusaur/gmax/front.4bpp.lz");
+const u32 gMonFrontPic_CharizardGmax[] = INCBIN_U32("graphics/pokemon/charizard/gmax/front.4bpp.lz");
+const u32 gMonFrontPic_BlastoiseGmax[] = INCBIN_U32("graphics/pokemon/blastoise/gmax/front.4bpp.lz");
+const u32 gMonFrontPic_ButterfreeGmax[] = INCBIN_U32("graphics/pokemon/butterfree/gmax/front.4bpp.lz");
+const u32 gMonFrontPic_PikachuGmax[] = INCBIN_U32("graphics/pokemon/pikachu/gmax/front.4bpp.lz");
+const u32 gMonFrontPic_MeowthGmax[] = INCBIN_U32("graphics/pokemon/meowth/gmax/front.4bpp.lz");
+const u32 gMonFrontPic_MachampGmax[] = INCBIN_U32("graphics/pokemon/machamp/gmax/front.4bpp.lz");
+const u32 gMonFrontPic_GengarGmax[] = INCBIN_U32("graphics/pokemon/gengar/gmax/front.4bpp.lz");
+const u32 gMonFrontPic_KinglerGmax[] = INCBIN_U32("graphics/pokemon/kingler/gmax/front.4bpp.lz");
+const u32 gMonFrontPic_LaprasGmax[] = INCBIN_U32("graphics/pokemon/lapras/gmax/front.4bpp.lz");
+const u32 gMonFrontPic_EeveeGmax[] = INCBIN_U32("graphics/pokemon/eevee/gmax/front.4bpp.lz");
+const u32 gMonFrontPic_SnorlaxGmax[] = INCBIN_U32("graphics/pokemon/snorlax/gmax/front.4bpp.lz");
+const u32 gMonFrontPic_GarbodorGmax[] = INCBIN_U32("graphics/pokemon/garbodor/gmax/front.4bpp.lz");
+const u32 gMonFrontPic_MelmetalGmax[] = INCBIN_U32("graphics/pokemon/melmetal/gmax/front.4bpp.lz");
+const u32 gMonFrontPic_RillaboomGmax[] = INCBIN_U32("graphics/pokemon/rillaboom/gmax/front.4bpp.lz");
+const u32 gMonFrontPic_CinderaceGmax[] = INCBIN_U32("graphics/pokemon/cinderace/gmax/front.4bpp.lz");
+const u32 gMonFrontPic_InteleonGmax[] = INCBIN_U32("graphics/pokemon/inteleon/gmax/front.4bpp.lz");
+const u32 gMonFrontPic_CorviknightGmax[] = INCBIN_U32("graphics/pokemon/corviknight/gmax/front.4bpp.lz");
+const u32 gMonFrontPic_OrbeetleGmax[] = INCBIN_U32("graphics/pokemon/orbeetle/gmax/front.4bpp.lz");
+const u32 gMonFrontPic_DrednawGmax[] = INCBIN_U32("graphics/pokemon/drednaw/gmax/front.4bpp.lz");
+const u32 gMonFrontPic_CoalossalGmax[] = INCBIN_U32("graphics/pokemon/coalossal/gmax/front.4bpp.lz");
+const u32 gMonFrontPic_FlappleGmax[] = INCBIN_U32("graphics/pokemon/flapple/gmax/front.4bpp.lz");
+const u32 gMonFrontPic_AppletunGmax[] = INCBIN_U32("graphics/pokemon/appletun/gmax/front.4bpp.lz");
+const u32 gMonFrontPic_SandacondaGmax[] = INCBIN_U32("graphics/pokemon/sandaconda/gmax/front.4bpp.lz");
+const u32 gMonFrontPic_ToxtricityGmax[] = INCBIN_U32("graphics/pokemon/toxtricity/gmax/front.4bpp.lz");
+const u32 gMonFrontPic_CentiskorchGmax[] = INCBIN_U32("graphics/pokemon/centiskorch/gmax/front.4bpp.lz");
+const u32 gMonFrontPic_HattereneGmax[] = INCBIN_U32("graphics/pokemon/hatterene/gmax/front.4bpp.lz");
+const u32 gMonFrontPic_GrimmsnarlGmax[] = INCBIN_U32("graphics/pokemon/grimmsnarl/gmax/front.4bpp.lz");
+const u32 gMonFrontPic_AlcremieGmax[] = INCBIN_U32("graphics/pokemon/alcremie/gmax/front.4bpp.lz");
+const u32 gMonFrontPic_CopperajahGmax[] = INCBIN_U32("graphics/pokemon/copperajah/gmax/front.4bpp.lz");
+const u32 gMonFrontPic_DuraludonGmax[] = INCBIN_U32("graphics/pokemon/duraludon/gmax/front.4bpp.lz");
+const u32 gMonFrontPic_UrshifuGmax[] = INCBIN_U32("graphics/pokemon/urshifu/gmax/front.4bpp.lz");
+const u32 gMonFrontPic_UrshifuRapidStrikeGmax[] = INCBIN_U32("graphics/pokemon/urshifu/gmax_rapid_strike_style/front.4bpp.lz");
 #endif
 const u32 gMonFrontPic_Egg[] = INCBIN_U32("graphics/pokemon/egg/anim_front.4bpp.lz");
 
@@ -2457,39 +2457,39 @@ const u32 gMonBackPic_ZarudeDada[] = INCBIN_U32("graphics/pokemon/zarude/dada/ba
 const u32 gMonBackPic_CalyrexIceRider[] = INCBIN_U32("graphics/pokemon/calyrex/ice_rider/back.4bpp.lz");
 const u32 gMonBackPic_CalyrexShadowRider[] = INCBIN_U32("graphics/pokemon/calyrex/shadow_rider/back.4bpp.lz");
 //const u32 gMonBackPic_EnamorusTherian[] = INCBIN_U32("graphics/pokemon/enamorus/therian/back.4bpp.lz");
-const u32 gMonBackPic_VenusaurGmax[] = INCBIN_U32("graphics/pokemon/gmax_venusaur/back.4bpp.lz");
-const u32 gMonBackPic_CharizardGmax[] = INCBIN_U32("graphics/pokemon/gmax_charizard/back.4bpp.lz");
-const u32 gMonBackPic_BlastoiseGmax[] = INCBIN_U32("graphics/pokemon/gmax_blastoise/back.4bpp.lz");
-const u32 gMonBackPic_ButterfreeGmax[] = INCBIN_U32("graphics/pokemon/gmax_butterfree/back.4bpp.lz");
-const u32 gMonBackPic_PikachuGmax[] = INCBIN_U32("graphics/pokemon/gmax_pikachu/back.4bpp.lz");
-const u32 gMonBackPic_MeowthGmax[] = INCBIN_U32("graphics/pokemon/gmax_meowth/back.4bpp.lz");
-const u32 gMonBackPic_MachampGmax[] = INCBIN_U32("graphics/pokemon/gmax_machamp/back.4bpp.lz");
-const u32 gMonBackPic_GengarGmax[] = INCBIN_U32("graphics/pokemon/gmax_gengar/back.4bpp.lz");
-const u32 gMonBackPic_KinglerGmax[] = INCBIN_U32("graphics/pokemon/gmax_kingler/back.4bpp.lz");
-const u32 gMonBackPic_LaprasGmax[] = INCBIN_U32("graphics/pokemon/gmax_lapras/back.4bpp.lz");
-const u32 gMonBackPic_EeveeGmax[] = INCBIN_U32("graphics/pokemon/gmax_eevee/back.4bpp.lz");
-const u32 gMonBackPic_SnorlaxGmax[] = INCBIN_U32("graphics/pokemon/gmax_snorlax/back.4bpp.lz");
-const u32 gMonBackPic_GarbodorGmax[] = INCBIN_U32("graphics/pokemon/gmax_garbodor/back.4bpp.lz");
-const u32 gMonBackPic_MelmetalGmax[] = INCBIN_U32("graphics/pokemon/gmax_melmetal/back.4bpp.lz");
-const u32 gMonBackPic_RillaboomGmax[] = INCBIN_U32("graphics/pokemon/gmax_rillaboom/back.4bpp.lz");
-const u32 gMonBackPic_CinderaceGmax[] = INCBIN_U32("graphics/pokemon/gmax_cinderace/back.4bpp.lz");
-const u32 gMonBackPic_InteleonGmax[] = INCBIN_U32("graphics/pokemon/gmax_inteleon/back.4bpp.lz");
-const u32 gMonBackPic_CorviknightGmax[] = INCBIN_U32("graphics/pokemon/gmax_corviknight/back.4bpp.lz");
-const u32 gMonBackPic_OrbeetleGmax[] = INCBIN_U32("graphics/pokemon/gmax_orbeetle/back.4bpp.lz");
-const u32 gMonBackPic_DrednawGmax[] = INCBIN_U32("graphics/pokemon/gmax_drednaw/back.4bpp.lz");
-const u32 gMonBackPic_CoalossalGmax[] = INCBIN_U32("graphics/pokemon/gmax_coalossal/back.4bpp.lz");
-const u32 gMonBackPic_FlappleGmax[] = INCBIN_U32("graphics/pokemon/gmax_flapple/back.4bpp.lz");
-const u32 gMonBackPic_AppletunGmax[] = INCBIN_U32("graphics/pokemon/gmax_appletun/back.4bpp.lz");
-const u32 gMonBackPic_SandacondaGmax[] = INCBIN_U32("graphics/pokemon/gmax_sandaconda/back.4bpp.lz");
-const u32 gMonBackPic_ToxtricityGmax[] = INCBIN_U32("graphics/pokemon/gmax_toxtricity/back.4bpp.lz");
-const u32 gMonBackPic_CentiskorchGmax[] = INCBIN_U32("graphics/pokemon/gmax_centiskorch/back.4bpp.lz");
-const u32 gMonBackPic_HattereneGmax[] = INCBIN_U32("graphics/pokemon/gmax_hatterene/back.4bpp.lz");
-const u32 gMonBackPic_GrimmsnarlGmax[] = INCBIN_U32("graphics/pokemon/gmax_grimmsnarl/back.4bpp.lz");
-const u32 gMonBackPic_AlcremieGmax[] = INCBIN_U32("graphics/pokemon/gmax_alcremie/back.4bpp.lz");
-const u32 gMonBackPic_CopperajahGmax[] = INCBIN_U32("graphics/pokemon/gmax_copperajah/back.4bpp.lz");
-const u32 gMonBackPic_DuraludonGmax[] = INCBIN_U32("graphics/pokemon/gmax_duraludon/back.4bpp.lz");
-const u32 gMonBackPic_UrshifuGmax[] = INCBIN_U32("graphics/pokemon/gmax_urshifu/back.4bpp.lz");
-const u32 gMonBackPic_UrshifuRapidStrikeGmax[] = INCBIN_U32("graphics/pokemon/gmax_urshifu_rapid_strike/back.4bpp.lz");
+const u32 gMonBackPic_VenusaurGmax[] = INCBIN_U32("graphics/pokemon/venusaur/gmax/back.4bpp.lz");
+const u32 gMonBackPic_CharizardGmax[] = INCBIN_U32("graphics/pokemon/charizard/gmax/back.4bpp.lz");
+const u32 gMonBackPic_BlastoiseGmax[] = INCBIN_U32("graphics/pokemon/blastoise/gmax/back.4bpp.lz");
+const u32 gMonBackPic_ButterfreeGmax[] = INCBIN_U32("graphics/pokemon/butterfree/gmax/back.4bpp.lz");
+const u32 gMonBackPic_PikachuGmax[] = INCBIN_U32("graphics/pokemon/pikachu/gmax/back.4bpp.lz");
+const u32 gMonBackPic_MeowthGmax[] = INCBIN_U32("graphics/pokemon/meowth/gmax/back.4bpp.lz");
+const u32 gMonBackPic_MachampGmax[] = INCBIN_U32("graphics/pokemon/machamp/gmax/back.4bpp.lz");
+const u32 gMonBackPic_GengarGmax[] = INCBIN_U32("graphics/pokemon/gengar/gmax/back.4bpp.lz");
+const u32 gMonBackPic_KinglerGmax[] = INCBIN_U32("graphics/pokemon/kingler/gmax/back.4bpp.lz");
+const u32 gMonBackPic_LaprasGmax[] = INCBIN_U32("graphics/pokemon/lapras/gmax/back.4bpp.lz");
+const u32 gMonBackPic_EeveeGmax[] = INCBIN_U32("graphics/pokemon/eevee/gmax/back.4bpp.lz");
+const u32 gMonBackPic_SnorlaxGmax[] = INCBIN_U32("graphics/pokemon/snorlax/gmax/back.4bpp.lz");
+const u32 gMonBackPic_GarbodorGmax[] = INCBIN_U32("graphics/pokemon/garbodor/gmax/back.4bpp.lz");
+const u32 gMonBackPic_MelmetalGmax[] = INCBIN_U32("graphics/pokemon/melmetal/gmax/back.4bpp.lz");
+const u32 gMonBackPic_RillaboomGmax[] = INCBIN_U32("graphics/pokemon/rillaboom/gmax/back.4bpp.lz");
+const u32 gMonBackPic_CinderaceGmax[] = INCBIN_U32("graphics/pokemon/cinderace/gmax/back.4bpp.lz");
+const u32 gMonBackPic_InteleonGmax[] = INCBIN_U32("graphics/pokemon/inteleon/gmax/back.4bpp.lz");
+const u32 gMonBackPic_CorviknightGmax[] = INCBIN_U32("graphics/pokemon/corviknight/gmax/back.4bpp.lz");
+const u32 gMonBackPic_OrbeetleGmax[] = INCBIN_U32("graphics/pokemon/orbeetle/gmax/back.4bpp.lz");
+const u32 gMonBackPic_DrednawGmax[] = INCBIN_U32("graphics/pokemon/drednaw/gmax/back.4bpp.lz");
+const u32 gMonBackPic_CoalossalGmax[] = INCBIN_U32("graphics/pokemon/coalossal/gmax/back.4bpp.lz");
+const u32 gMonBackPic_FlappleGmax[] = INCBIN_U32("graphics/pokemon/flapple/gmax/back.4bpp.lz");
+const u32 gMonBackPic_AppletunGmax[] = INCBIN_U32("graphics/pokemon/appletun/gmax/back.4bpp.lz");
+const u32 gMonBackPic_SandacondaGmax[] = INCBIN_U32("graphics/pokemon/sandaconda/gmax/back.4bpp.lz");
+const u32 gMonBackPic_ToxtricityGmax[] = INCBIN_U32("graphics/pokemon/toxtricity/gmax/back.4bpp.lz");
+const u32 gMonBackPic_CentiskorchGmax[] = INCBIN_U32("graphics/pokemon/centiskorch/gmax/back.4bpp.lz");
+const u32 gMonBackPic_HattereneGmax[] = INCBIN_U32("graphics/pokemon/hatterene/gmax/back.4bpp.lz");
+const u32 gMonBackPic_GrimmsnarlGmax[] = INCBIN_U32("graphics/pokemon/grimmsnarl/gmax/back.4bpp.lz");
+const u32 gMonBackPic_AlcremieGmax[] = INCBIN_U32("graphics/pokemon/alcremie/gmax/back.4bpp.lz");
+const u32 gMonBackPic_CopperajahGmax[] = INCBIN_U32("graphics/pokemon/copperajah/gmax/back.4bpp.lz");
+const u32 gMonBackPic_DuraludonGmax[] = INCBIN_U32("graphics/pokemon/duraludon/gmax/back.4bpp.lz");
+const u32 gMonBackPic_UrshifuGmax[] = INCBIN_U32("graphics/pokemon/urshifu/gmax/back.4bpp.lz");
+const u32 gMonBackPic_UrshifuRapidStrikeGmax[] = INCBIN_U32("graphics/pokemon/urshifu/gmax_rapid_strike_style/back.4bpp.lz");
 #endif
 
 const u32 gMonPalette_CircledQuestionMark[] = INCBIN_U32("graphics/pokemon/question_mark/circled/normal.gbapal.lz");
@@ -3722,39 +3722,39 @@ const u32 gMonPalette_ZarudeDada[] = INCBIN_U32("graphics/pokemon/zarude/dada/no
 const u32 gMonPalette_CalyrexIceRider[] = INCBIN_U32("graphics/pokemon/calyrex/ice_rider/normal.gbapal.lz");
 const u32 gMonPalette_CalyrexShadowRider[] = INCBIN_U32("graphics/pokemon/calyrex/shadow_rider/normal.gbapal.lz");
 //const u32 gMonPalette_EnamorusTherian[] = INCBIN_U32("graphics/pokemon/enamorus/therian/normal.gbapal.lz");
-const u32 gMonPalette_VenusaurGmax[] = INCBIN_U32("graphics/pokemon/gmax_venusaur/normal.gbapal.lz");
-const u32 gMonPalette_CharizardGmax[] = INCBIN_U32("graphics/pokemon/gmax_charizard/normal.gbapal.lz");
-const u32 gMonPalette_BlastoiseGmax[] = INCBIN_U32("graphics/pokemon/gmax_blastoise/normal.gbapal.lz");
-const u32 gMonPalette_ButterfreeGmax[] = INCBIN_U32("graphics/pokemon/gmax_butterfree/normal.gbapal.lz");
-const u32 gMonPalette_PikachuGmax[] = INCBIN_U32("graphics/pokemon/gmax_pikachu/normal.gbapal.lz");
-const u32 gMonPalette_MeowthGmax[] = INCBIN_U32("graphics/pokemon/gmax_meowth/normal.gbapal.lz");
-const u32 gMonPalette_MachampGmax[] = INCBIN_U32("graphics/pokemon/gmax_machamp/normal.gbapal.lz");
-const u32 gMonPalette_GengarGmax[] = INCBIN_U32("graphics/pokemon/gmax_gengar/normal.gbapal.lz");
-const u32 gMonPalette_KinglerGmax[] = INCBIN_U32("graphics/pokemon/gmax_kingler/normal.gbapal.lz");
-const u32 gMonPalette_LaprasGmax[] = INCBIN_U32("graphics/pokemon/gmax_lapras/normal.gbapal.lz");
-const u32 gMonPalette_EeveeGmax[] = INCBIN_U32("graphics/pokemon/gmax_eevee/normal.gbapal.lz");
-const u32 gMonPalette_SnorlaxGmax[] = INCBIN_U32("graphics/pokemon/gmax_snorlax/normal.gbapal.lz");
-const u32 gMonPalette_GarbodorGmax[] = INCBIN_U32("graphics/pokemon/gmax_garbodor/normal.gbapal.lz");
-const u32 gMonPalette_MelmetalGmax[] = INCBIN_U32("graphics/pokemon/gmax_melmetal/normal.gbapal.lz");
-const u32 gMonPalette_RillaboomGmax[] = INCBIN_U32("graphics/pokemon/gmax_rillaboom/normal.gbapal.lz");
-const u32 gMonPalette_CinderaceGmax[] = INCBIN_U32("graphics/pokemon/gmax_cinderace/normal.gbapal.lz");
-const u32 gMonPalette_InteleonGmax[] = INCBIN_U32("graphics/pokemon/gmax_inteleon/normal.gbapal.lz");
-const u32 gMonPalette_CorviknightGmax[] = INCBIN_U32("graphics/pokemon/gmax_corviknight/normal.gbapal.lz");
-const u32 gMonPalette_OrbeetleGmax[] = INCBIN_U32("graphics/pokemon/gmax_orbeetle/normal.gbapal.lz");
-const u32 gMonPalette_DrednawGmax[] = INCBIN_U32("graphics/pokemon/gmax_drednaw/normal.gbapal.lz");
-const u32 gMonPalette_CoalossalGmax[] = INCBIN_U32("graphics/pokemon/gmax_coalossal/normal.gbapal.lz");
-const u32 gMonPalette_FlappleGmax[] = INCBIN_U32("graphics/pokemon/gmax_flapple/normal.gbapal.lz");
-const u32 gMonPalette_AppletunGmax[] = INCBIN_U32("graphics/pokemon/gmax_appletun/normal.gbapal.lz");
-const u32 gMonPalette_SandacondaGmax[] = INCBIN_U32("graphics/pokemon/gmax_sandaconda/normal.gbapal.lz");
-const u32 gMonPalette_ToxtricityGmax[] = INCBIN_U32("graphics/pokemon/gmax_toxtricity/normal.gbapal.lz");
-const u32 gMonPalette_CentiskorchGmax[] = INCBIN_U32("graphics/pokemon/gmax_centiskorch/normal.gbapal.lz");
-const u32 gMonPalette_HattereneGmax[] = INCBIN_U32("graphics/pokemon/gmax_hatterene/normal.gbapal.lz");
-const u32 gMonPalette_GrimmsnarlGmax[] = INCBIN_U32("graphics/pokemon/gmax_grimmsnarl/normal.gbapal.lz");
-const u32 gMonPalette_AlcremieGmax[] = INCBIN_U32("graphics/pokemon/gmax_alcremie/normal.gbapal.lz");
-const u32 gMonPalette_CopperajahGmax[] = INCBIN_U32("graphics/pokemon/gmax_copperajah/normal.gbapal.lz");
-const u32 gMonPalette_DuraludonGmax[] = INCBIN_U32("graphics/pokemon/gmax_duraludon/normal.gbapal.lz");
-const u32 gMonPalette_UrshifuGmax[] = INCBIN_U32("graphics/pokemon/gmax_urshifu/normal.gbapal.lz");
-const u32 gMonPalette_UrshifuRapidStrikeGmax[] = INCBIN_U32("graphics/pokemon/gmax_urshifu_rapid_strike/normal.gbapal.lz");
+const u32 gMonPalette_VenusaurGmax[] = INCBIN_U32("graphics/pokemon/venusaur/gmax/normal.gbapal.lz");
+const u32 gMonPalette_CharizardGmax[] = INCBIN_U32("graphics/pokemon/charizard/gmax/normal.gbapal.lz");
+const u32 gMonPalette_BlastoiseGmax[] = INCBIN_U32("graphics/pokemon/blastoise/gmax/normal.gbapal.lz");
+const u32 gMonPalette_ButterfreeGmax[] = INCBIN_U32("graphics/pokemon/butterfree/gmax/normal.gbapal.lz");
+const u32 gMonPalette_PikachuGmax[] = INCBIN_U32("graphics/pokemon/pikachu/gmax/normal.gbapal.lz");
+const u32 gMonPalette_MeowthGmax[] = INCBIN_U32("graphics/pokemon/meowth/gmax/normal.gbapal.lz");
+const u32 gMonPalette_MachampGmax[] = INCBIN_U32("graphics/pokemon/machamp/gmax/normal.gbapal.lz");
+const u32 gMonPalette_GengarGmax[] = INCBIN_U32("graphics/pokemon/gengar/gmax/normal.gbapal.lz");
+const u32 gMonPalette_KinglerGmax[] = INCBIN_U32("graphics/pokemon/kingler/gmax/normal.gbapal.lz");
+const u32 gMonPalette_LaprasGmax[] = INCBIN_U32("graphics/pokemon/lapras/gmax/normal.gbapal.lz");
+const u32 gMonPalette_EeveeGmax[] = INCBIN_U32("graphics/pokemon/eevee/gmax/normal.gbapal.lz");
+const u32 gMonPalette_SnorlaxGmax[] = INCBIN_U32("graphics/pokemon/snorlax/gmax/normal.gbapal.lz");
+const u32 gMonPalette_GarbodorGmax[] = INCBIN_U32("graphics/pokemon/garbodor/gmax/normal.gbapal.lz");
+const u32 gMonPalette_MelmetalGmax[] = INCBIN_U32("graphics/pokemon/melmetal/gmax/normal.gbapal.lz");
+const u32 gMonPalette_RillaboomGmax[] = INCBIN_U32("graphics/pokemon/rillaboom/gmax/normal.gbapal.lz");
+const u32 gMonPalette_CinderaceGmax[] = INCBIN_U32("graphics/pokemon/cinderace/gmax/normal.gbapal.lz");
+const u32 gMonPalette_InteleonGmax[] = INCBIN_U32("graphics/pokemon/inteleon/gmax/normal.gbapal.lz");
+const u32 gMonPalette_CorviknightGmax[] = INCBIN_U32("graphics/pokemon/corviknight/gmax/normal.gbapal.lz");
+const u32 gMonPalette_OrbeetleGmax[] = INCBIN_U32("graphics/pokemon/orbeetle/gmax/normal.gbapal.lz");
+const u32 gMonPalette_DrednawGmax[] = INCBIN_U32("graphics/pokemon/drednaw/gmax/normal.gbapal.lz");
+const u32 gMonPalette_CoalossalGmax[] = INCBIN_U32("graphics/pokemon/coalossal/gmax/normal.gbapal.lz");
+const u32 gMonPalette_FlappleGmax[] = INCBIN_U32("graphics/pokemon/flapple/gmax/normal.gbapal.lz");
+const u32 gMonPalette_AppletunGmax[] = INCBIN_U32("graphics/pokemon/appletun/gmax/normal.gbapal.lz");
+const u32 gMonPalette_SandacondaGmax[] = INCBIN_U32("graphics/pokemon/sandaconda/gmax/normal.gbapal.lz");
+const u32 gMonPalette_ToxtricityGmax[] = INCBIN_U32("graphics/pokemon/toxtricity/gmax/normal.gbapal.lz");
+const u32 gMonPalette_CentiskorchGmax[] = INCBIN_U32("graphics/pokemon/centiskorch/gmax/normal.gbapal.lz");
+const u32 gMonPalette_HattereneGmax[] = INCBIN_U32("graphics/pokemon/hatterene/gmax/normal.gbapal.lz");
+const u32 gMonPalette_GrimmsnarlGmax[] = INCBIN_U32("graphics/pokemon/grimmsnarl/gmax/normal.gbapal.lz");
+const u32 gMonPalette_AlcremieGmax[] = INCBIN_U32("graphics/pokemon/alcremie/gmax/normal.gbapal.lz");
+const u32 gMonPalette_CopperajahGmax[] = INCBIN_U32("graphics/pokemon/copperajah/gmax/normal.gbapal.lz");
+const u32 gMonPalette_DuraludonGmax[] = INCBIN_U32("graphics/pokemon/duraludon/gmax/normal.gbapal.lz");
+const u32 gMonPalette_UrshifuGmax[] = INCBIN_U32("graphics/pokemon/urshifu/gmax/normal.gbapal.lz");
+const u32 gMonPalette_UrshifuRapidStrikeGmax[] = INCBIN_U32("graphics/pokemon/urshifu/gmax_rapid_strike_style/normal.gbapal.lz");
 #endif
 const u32 gMonPalette_Egg[] = INCBIN_U32("graphics/pokemon/egg/normal.gbapal.lz");
 
@@ -4982,39 +4982,39 @@ const u32 gMonShinyPalette_ZarudeDada[] = INCBIN_U32("graphics/pokemon/zarude/da
 const u32 gMonShinyPalette_CalyrexIceRider[] = INCBIN_U32("graphics/pokemon/calyrex/ice_rider/shiny.gbapal.lz");
 const u32 gMonShinyPalette_CalyrexShadowRider[] = INCBIN_U32("graphics/pokemon/calyrex/shadow_rider/shiny.gbapal.lz");
 //const u32 gMonShinyPalette_EnamorusTherian[] = INCBIN_U32("graphics/pokemon/enamorus/therian/shiny.gbapal.lz");
-const u32 gMonShinyPalette_VenusaurGmax[] = INCBIN_U32("graphics/pokemon/gmax_venusaur/shiny.gbapal.lz");
-const u32 gMonShinyPalette_CharizardGmax[] = INCBIN_U32("graphics/pokemon/gmax_charizard/shiny.gbapal.lz");
-const u32 gMonShinyPalette_BlastoiseGmax[] = INCBIN_U32("graphics/pokemon/gmax_blastoise/shiny.gbapal.lz");
-const u32 gMonShinyPalette_ButterfreeGmax[] = INCBIN_U32("graphics/pokemon/gmax_butterfree/shiny.gbapal.lz");
-const u32 gMonShinyPalette_PikachuGmax[] = INCBIN_U32("graphics/pokemon/gmax_pikachu/shiny.gbapal.lz");
-const u32 gMonShinyPalette_MeowthGmax[] = INCBIN_U32("graphics/pokemon/gmax_meowth/shiny.gbapal.lz");
-const u32 gMonShinyPalette_MachampGmax[] = INCBIN_U32("graphics/pokemon/gmax_machamp/shiny.gbapal.lz");
-const u32 gMonShinyPalette_GengarGmax[] = INCBIN_U32("graphics/pokemon/gmax_gengar/shiny.gbapal.lz");
-const u32 gMonShinyPalette_KinglerGmax[] = INCBIN_U32("graphics/pokemon/gmax_kingler/shiny.gbapal.lz");
-const u32 gMonShinyPalette_LaprasGmax[] = INCBIN_U32("graphics/pokemon/gmax_lapras/shiny.gbapal.lz");
-const u32 gMonShinyPalette_EeveeGmax[] = INCBIN_U32("graphics/pokemon/gmax_eevee/shiny.gbapal.lz");
-const u32 gMonShinyPalette_SnorlaxGmax[] = INCBIN_U32("graphics/pokemon/gmax_snorlax/shiny.gbapal.lz");
-const u32 gMonShinyPalette_GarbodorGmax[] = INCBIN_U32("graphics/pokemon/gmax_garbodor/shiny.gbapal.lz");
-const u32 gMonShinyPalette_MelmetalGmax[] = INCBIN_U32("graphics/pokemon/gmax_melmetal/shiny.gbapal.lz");
-const u32 gMonShinyPalette_RillaboomGmax[] = INCBIN_U32("graphics/pokemon/gmax_rillaboom/shiny.gbapal.lz");
-const u32 gMonShinyPalette_CinderaceGmax[] = INCBIN_U32("graphics/pokemon/gmax_cinderace/shiny.gbapal.lz");
-const u32 gMonShinyPalette_InteleonGmax[] = INCBIN_U32("graphics/pokemon/gmax_inteleon/shiny.gbapal.lz");
-const u32 gMonShinyPalette_CorviknightGmax[] = INCBIN_U32("graphics/pokemon/gmax_corviknight/shiny.gbapal.lz");
-const u32 gMonShinyPalette_OrbeetleGmax[] = INCBIN_U32("graphics/pokemon/gmax_orbeetle/shiny.gbapal.lz");
-const u32 gMonShinyPalette_DrednawGmax[] = INCBIN_U32("graphics/pokemon/gmax_drednaw/shiny.gbapal.lz");
-const u32 gMonShinyPalette_CoalossalGmax[] = INCBIN_U32("graphics/pokemon/gmax_coalossal/shiny.gbapal.lz");
-const u32 gMonShinyPalette_FlappleGmax[] = INCBIN_U32("graphics/pokemon/gmax_flapple/shiny.gbapal.lz");
-const u32 gMonShinyPalette_AppletunGmax[] = INCBIN_U32("graphics/pokemon/gmax_appletun/shiny.gbapal.lz");
-const u32 gMonShinyPalette_SandacondaGmax[] = INCBIN_U32("graphics/pokemon/gmax_sandaconda/shiny.gbapal.lz");
-const u32 gMonShinyPalette_ToxtricityGmax[] = INCBIN_U32("graphics/pokemon/gmax_toxtricity/shiny.gbapal.lz");
-const u32 gMonShinyPalette_CentiskorchGmax[] = INCBIN_U32("graphics/pokemon/gmax_centiskorch/shiny.gbapal.lz");
-const u32 gMonShinyPalette_HattereneGmax[] = INCBIN_U32("graphics/pokemon/gmax_hatterene/shiny.gbapal.lz");
-const u32 gMonShinyPalette_GrimmsnarlGmax[] = INCBIN_U32("graphics/pokemon/gmax_grimmsnarl/shiny.gbapal.lz");
-const u32 gMonShinyPalette_AlcremieGmax[] = INCBIN_U32("graphics/pokemon/gmax_alcremie/shiny.gbapal.lz");
-const u32 gMonShinyPalette_CopperajahGmax[] = INCBIN_U32("graphics/pokemon/gmax_copperajah/shiny.gbapal.lz");
-const u32 gMonShinyPalette_DuraludonGmax[] = INCBIN_U32("graphics/pokemon/gmax_duraludon/shiny.gbapal.lz");
-const u32 gMonShinyPalette_UrshifuGmax[] = INCBIN_U32("graphics/pokemon/gmax_urshifu/shiny.gbapal.lz");
-const u32 gMonShinyPalette_UrshifuRapidStrikeGmax[] = INCBIN_U32("graphics/pokemon/gmax_urshifu_rapid_strike/shiny.gbapal.lz");
+const u32 gMonShinyPalette_VenusaurGmax[] = INCBIN_U32("graphics/pokemon/venusaur/gmax/shiny.gbapal.lz");
+const u32 gMonShinyPalette_CharizardGmax[] = INCBIN_U32("graphics/pokemon/charizard/gmax/shiny.gbapal.lz");
+const u32 gMonShinyPalette_BlastoiseGmax[] = INCBIN_U32("graphics/pokemon/blastoise/gmax/shiny.gbapal.lz");
+const u32 gMonShinyPalette_ButterfreeGmax[] = INCBIN_U32("graphics/pokemon/butterfree/gmax/shiny.gbapal.lz");
+const u32 gMonShinyPalette_PikachuGmax[] = INCBIN_U32("graphics/pokemon/pikachu/gmax/shiny.gbapal.lz");
+const u32 gMonShinyPalette_MeowthGmax[] = INCBIN_U32("graphics/pokemon/meowth/gmax/shiny.gbapal.lz");
+const u32 gMonShinyPalette_MachampGmax[] = INCBIN_U32("graphics/pokemon/machamp/gmax/shiny.gbapal.lz");
+const u32 gMonShinyPalette_GengarGmax[] = INCBIN_U32("graphics/pokemon/gengar/gmax/shiny.gbapal.lz");
+const u32 gMonShinyPalette_KinglerGmax[] = INCBIN_U32("graphics/pokemon/kingler/gmax/shiny.gbapal.lz");
+const u32 gMonShinyPalette_LaprasGmax[] = INCBIN_U32("graphics/pokemon/lapras/gmax/shiny.gbapal.lz");
+const u32 gMonShinyPalette_EeveeGmax[] = INCBIN_U32("graphics/pokemon/eevee/gmax/shiny.gbapal.lz");
+const u32 gMonShinyPalette_SnorlaxGmax[] = INCBIN_U32("graphics/pokemon/snorlax/gmax/shiny.gbapal.lz");
+const u32 gMonShinyPalette_GarbodorGmax[] = INCBIN_U32("graphics/pokemon/garbodor/gmax/shiny.gbapal.lz");
+const u32 gMonShinyPalette_MelmetalGmax[] = INCBIN_U32("graphics/pokemon/melmetal/gmax/shiny.gbapal.lz");
+const u32 gMonShinyPalette_RillaboomGmax[] = INCBIN_U32("graphics/pokemon/rillaboom/gmax/shiny.gbapal.lz");
+const u32 gMonShinyPalette_CinderaceGmax[] = INCBIN_U32("graphics/pokemon/cinderace/gmax/shiny.gbapal.lz");
+const u32 gMonShinyPalette_InteleonGmax[] = INCBIN_U32("graphics/pokemon/inteleon/gmax/shiny.gbapal.lz");
+const u32 gMonShinyPalette_CorviknightGmax[] = INCBIN_U32("graphics/pokemon/corviknight/gmax/shiny.gbapal.lz");
+const u32 gMonShinyPalette_OrbeetleGmax[] = INCBIN_U32("graphics/pokemon/orbeetle/gmax/shiny.gbapal.lz");
+const u32 gMonShinyPalette_DrednawGmax[] = INCBIN_U32("graphics/pokemon/drednaw/gmax/shiny.gbapal.lz");
+const u32 gMonShinyPalette_CoalossalGmax[] = INCBIN_U32("graphics/pokemon/coalossal/gmax/shiny.gbapal.lz");
+const u32 gMonShinyPalette_FlappleGmax[] = INCBIN_U32("graphics/pokemon/flapple/gmax/shiny.gbapal.lz");
+const u32 gMonShinyPalette_AppletunGmax[] = INCBIN_U32("graphics/pokemon/appletun/gmax/shiny.gbapal.lz");
+const u32 gMonShinyPalette_SandacondaGmax[] = INCBIN_U32("graphics/pokemon/sandaconda/gmax/shiny.gbapal.lz");
+const u32 gMonShinyPalette_ToxtricityGmax[] = INCBIN_U32("graphics/pokemon/toxtricity/gmax/shiny.gbapal.lz");
+const u32 gMonShinyPalette_CentiskorchGmax[] = INCBIN_U32("graphics/pokemon/centiskorch/gmax/shiny.gbapal.lz");
+const u32 gMonShinyPalette_HattereneGmax[] = INCBIN_U32("graphics/pokemon/hatterene/gmax/shiny.gbapal.lz");
+const u32 gMonShinyPalette_GrimmsnarlGmax[] = INCBIN_U32("graphics/pokemon/grimmsnarl/gmax/shiny.gbapal.lz");
+const u32 gMonShinyPalette_AlcremieGmax[] = INCBIN_U32("graphics/pokemon/alcremie/gmax/shiny.gbapal.lz");
+const u32 gMonShinyPalette_CopperajahGmax[] = INCBIN_U32("graphics/pokemon/copperajah/gmax/shiny.gbapal.lz");
+const u32 gMonShinyPalette_DuraludonGmax[] = INCBIN_U32("graphics/pokemon/duraludon/gmax/shiny.gbapal.lz");
+const u32 gMonShinyPalette_UrshifuGmax[] = INCBIN_U32("graphics/pokemon/urshifu/gmax/shiny.gbapal.lz");
+const u32 gMonShinyPalette_UrshifuRapidStrikeGmax[] = INCBIN_U32("graphics/pokemon/urshifu/gmax_rapid_strike_style/shiny.gbapal.lz");
 #endif
 
 const u8 gMonIcon_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mark/icon.4bpp");
@@ -6231,39 +6231,39 @@ const u8 gMonIcon_ZarudeDada[] = INCBIN_U8("graphics/pokemon/zarude/dada/icon.4b
 const u8 gMonIcon_CalyrexIceRider[] = INCBIN_U8("graphics/pokemon/calyrex/ice_rider/icon.4bpp");
 const u8 gMonIcon_CalyrexShadowRider[] = INCBIN_U8("graphics/pokemon/calyrex/shadow_rider/icon.4bpp");
 const u8 gMonIcon_EnamorusTherian[] = INCBIN_U8("graphics/pokemon/enamorus/therian/icon.4bpp");
-const u8 gMonIcon_VenusaurGmax[] = INCBIN_U8("graphics/pokemon/gmax_venusaur/icon.4bpp");
-const u8 gMonIcon_CharizardGmax[] = INCBIN_U8("graphics/pokemon/gmax_charizard/icon.4bpp");
-const u8 gMonIcon_BlastoiseGmax[] = INCBIN_U8("graphics/pokemon/gmax_blastoise/icon.4bpp");
-const u8 gMonIcon_ButterfreeGmax[] = INCBIN_U8("graphics/pokemon/gmax_butterfree/icon.4bpp");
-const u8 gMonIcon_PikachuGmax[] = INCBIN_U8("graphics/pokemon/gmax_pikachu/icon.4bpp");
-const u8 gMonIcon_MeowthGmax[] = INCBIN_U8("graphics/pokemon/gmax_meowth/icon.4bpp");
-const u8 gMonIcon_MachampGmax[] = INCBIN_U8("graphics/pokemon/gmax_machamp/icon.4bpp");
-const u8 gMonIcon_GengarGmax[] = INCBIN_U8("graphics/pokemon/gmax_gengar/icon.4bpp");
-const u8 gMonIcon_KinglerGmax[] = INCBIN_U8("graphics/pokemon/gmax_kingler/icon.4bpp");
-const u8 gMonIcon_LaprasGmax[] = INCBIN_U8("graphics/pokemon/gmax_lapras/icon.4bpp");
-const u8 gMonIcon_EeveeGmax[] = INCBIN_U8("graphics/pokemon/gmax_eevee/icon.4bpp");
-const u8 gMonIcon_SnorlaxGmax[] = INCBIN_U8("graphics/pokemon/gmax_snorlax/icon.4bpp");
-const u8 gMonIcon_GarbodorGmax[] = INCBIN_U8("graphics/pokemon/gmax_garbodor/icon.4bpp");
-const u8 gMonIcon_MelmetalGmax[] = INCBIN_U8("graphics/pokemon/gmax_melmetal/icon.4bpp");
-const u8 gMonIcon_RillaboomGmax[] = INCBIN_U8("graphics/pokemon/gmax_rillaboom/icon.4bpp");
-const u8 gMonIcon_CinderaceGmax[] = INCBIN_U8("graphics/pokemon/gmax_cinderace/icon.4bpp");
-const u8 gMonIcon_InteleonGmax[] = INCBIN_U8("graphics/pokemon/gmax_inteleon/icon.4bpp");
-const u8 gMonIcon_CorviknightGmax[] = INCBIN_U8("graphics/pokemon/gmax_corviknight/icon.4bpp");
-const u8 gMonIcon_OrbeetleGmax[] = INCBIN_U8("graphics/pokemon/gmax_orbeetle/icon.4bpp");
-const u8 gMonIcon_DrednawGmax[] = INCBIN_U8("graphics/pokemon/gmax_drednaw/icon.4bpp");
-const u8 gMonIcon_CoalossalGmax[] = INCBIN_U8("graphics/pokemon/gmax_coalossal/icon.4bpp");
-const u8 gMonIcon_FlappleGmax[] = INCBIN_U8("graphics/pokemon/gmax_flapple/icon.4bpp");
-const u8 gMonIcon_AppletunGmax[] = INCBIN_U8("graphics/pokemon/gmax_appletun/icon.4bpp");
-const u8 gMonIcon_SandacondaGmax[] = INCBIN_U8("graphics/pokemon/gmax_sandaconda/icon.4bpp");
-const u8 gMonIcon_ToxtricityGmax[] = INCBIN_U8("graphics/pokemon/gmax_toxtricity/icon.4bpp");
-const u8 gMonIcon_CentiskorchGmax[] = INCBIN_U8("graphics/pokemon/gmax_centiskorch/icon.4bpp");
-const u8 gMonIcon_HattereneGmax[] = INCBIN_U8("graphics/pokemon/gmax_hatterene/icon.4bpp");
-const u8 gMonIcon_GrimmsnarlGmax[] = INCBIN_U8("graphics/pokemon/gmax_grimmsnarl/icon.4bpp");
-const u8 gMonIcon_AlcremieGmax[] = INCBIN_U8("graphics/pokemon/gmax_alcremie/icon.4bpp");
-const u8 gMonIcon_CopperajahGmax[] = INCBIN_U8("graphics/pokemon/gmax_copperajah/icon.4bpp");
-const u8 gMonIcon_DuraludonGmax[] = INCBIN_U8("graphics/pokemon/gmax_duraludon/icon.4bpp");
-const u8 gMonIcon_UrshifuGmax[] = INCBIN_U8("graphics/pokemon/gmax_urshifu/icon.4bpp");
-const u8 gMonIcon_UrshifuRapidStrikeGmax[] = INCBIN_U8("graphics/pokemon/gmax_urshifu_rapid_strike/icon.4bpp");
+const u8 gMonIcon_VenusaurGmax[] = INCBIN_U8("graphics/pokemon/venusaur/gmax/icon.4bpp");
+const u8 gMonIcon_CharizardGmax[] = INCBIN_U8("graphics/pokemon/charizard/gmax/icon.4bpp");
+const u8 gMonIcon_BlastoiseGmax[] = INCBIN_U8("graphics/pokemon/blastoise/gmax/icon.4bpp");
+const u8 gMonIcon_ButterfreeGmax[] = INCBIN_U8("graphics/pokemon/butterfree/gmax/icon.4bpp");
+const u8 gMonIcon_PikachuGmax[] = INCBIN_U8("graphics/pokemon/pikachu/gmax/icon.4bpp");
+const u8 gMonIcon_MeowthGmax[] = INCBIN_U8("graphics/pokemon/meowth/gmax/icon.4bpp");
+const u8 gMonIcon_MachampGmax[] = INCBIN_U8("graphics/pokemon/machamp/gmax/icon.4bpp");
+const u8 gMonIcon_GengarGmax[] = INCBIN_U8("graphics/pokemon/gengar/gmax/icon.4bpp");
+const u8 gMonIcon_KinglerGmax[] = INCBIN_U8("graphics/pokemon/kingler/gmax/icon.4bpp");
+const u8 gMonIcon_LaprasGmax[] = INCBIN_U8("graphics/pokemon/lapras/gmax/icon.4bpp");
+const u8 gMonIcon_EeveeGmax[] = INCBIN_U8("graphics/pokemon/eevee/gmax/icon.4bpp");
+const u8 gMonIcon_SnorlaxGmax[] = INCBIN_U8("graphics/pokemon/snorlax/gmax/icon.4bpp");
+const u8 gMonIcon_GarbodorGmax[] = INCBIN_U8("graphics/pokemon/garbodor/gmax/icon.4bpp");
+const u8 gMonIcon_MelmetalGmax[] = INCBIN_U8("graphics/pokemon/melmetal/gmax/icon.4bpp");
+const u8 gMonIcon_RillaboomGmax[] = INCBIN_U8("graphics/pokemon/rillaboom/gmax/icon.4bpp");
+const u8 gMonIcon_CinderaceGmax[] = INCBIN_U8("graphics/pokemon/cinderace/gmax/icon.4bpp");
+const u8 gMonIcon_InteleonGmax[] = INCBIN_U8("graphics/pokemon/inteleon/gmax/icon.4bpp");
+const u8 gMonIcon_CorviknightGmax[] = INCBIN_U8("graphics/pokemon/corviknight/gmax/icon.4bpp");
+const u8 gMonIcon_OrbeetleGmax[] = INCBIN_U8("graphics/pokemon/orbeetle/gmax/icon.4bpp");
+const u8 gMonIcon_DrednawGmax[] = INCBIN_U8("graphics/pokemon/drednaw/gmax/icon.4bpp");
+const u8 gMonIcon_CoalossalGmax[] = INCBIN_U8("graphics/pokemon/coalossal/gmax/icon.4bpp");
+const u8 gMonIcon_FlappleGmax[] = INCBIN_U8("graphics/pokemon/flapple/gmax/icon.4bpp");
+const u8 gMonIcon_AppletunGmax[] = INCBIN_U8("graphics/pokemon/appletun/gmax/icon.4bpp");
+const u8 gMonIcon_SandacondaGmax[] = INCBIN_U8("graphics/pokemon/sandaconda/gmax/icon.4bpp");
+const u8 gMonIcon_ToxtricityGmax[] = INCBIN_U8("graphics/pokemon/toxtricity/gmax/icon.4bpp");
+const u8 gMonIcon_CentiskorchGmax[] = INCBIN_U8("graphics/pokemon/centiskorch/gmax/icon.4bpp");
+const u8 gMonIcon_HattereneGmax[] = INCBIN_U8("graphics/pokemon/hatterene/gmax/icon.4bpp");
+const u8 gMonIcon_GrimmsnarlGmax[] = INCBIN_U8("graphics/pokemon/grimmsnarl/gmax/icon.4bpp");
+const u8 gMonIcon_AlcremieGmax[] = INCBIN_U8("graphics/pokemon/alcremie/gmax/icon.4bpp");
+const u8 gMonIcon_CopperajahGmax[] = INCBIN_U8("graphics/pokemon/copperajah/gmax/icon.4bpp");
+const u8 gMonIcon_DuraludonGmax[] = INCBIN_U8("graphics/pokemon/duraludon/gmax/icon.4bpp");
+const u8 gMonIcon_UrshifuGmax[] = INCBIN_U8("graphics/pokemon/urshifu/gmax/icon.4bpp");
+const u8 gMonIcon_UrshifuRapidStrikeGmax[] = INCBIN_U8("graphics/pokemon/urshifu/gmax_rapid_strike_style/icon.4bpp");
 #endif
 const u8 gMonIcon_Egg[] = INCBIN_U8("graphics/pokemon/egg/icon.4bpp");