diff --git a/graphics/pokemon/abomasnow/anim_front.png b/graphics/pokemon/abomasnow/anim_front.png
index b7b43b1fd..3ba7033b8 100644
Binary files a/graphics/pokemon/abomasnow/anim_front.png and b/graphics/pokemon/abomasnow/anim_front.png differ
diff --git a/graphics/pokemon/abomasnow/front.png b/graphics/pokemon/abomasnow/front.png
index 49a9d0649..eec72b647 100644
Binary files a/graphics/pokemon/abomasnow/front.png and b/graphics/pokemon/abomasnow/front.png differ
diff --git a/graphics/pokemon/abomasnow/normal.pal b/graphics/pokemon/abomasnow/normal.pal
index 4408f90cd..764cb356c 100644
--- a/graphics/pokemon/abomasnow/normal.pal
+++ b/graphics/pokemon/abomasnow/normal.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-48 80 88
-112 160 144
-16 16 16
-64 120 112
-88 104 136
+32 96 88
+80 160 144
+32 40 48
+40 128 112
+96 112 128
 248 248 248
-200 200 224
-168 168 192
-168 104 192
-128 72 144
-216 168 208
-152 144 176
-16 16 16
+192 208 216
+168 184 200
+152 112 224
+96 64 184
+216 160 240
+144 152 176
+0 0 0
 0 0 0
 0 0 0
diff --git a/graphics/pokemon/ambipom/anim_front.png b/graphics/pokemon/ambipom/anim_front.png
index b037e445a..0cfc58439 100644
Binary files a/graphics/pokemon/ambipom/anim_front.png and b/graphics/pokemon/ambipom/anim_front.png differ
diff --git a/graphics/pokemon/ambipom/front.png b/graphics/pokemon/ambipom/front.png
index fac8c0cad..064cbb4e6 100644
Binary files a/graphics/pokemon/ambipom/front.png and b/graphics/pokemon/ambipom/front.png differ
diff --git a/graphics/pokemon/ambipom/normal.pal b/graphics/pokemon/ambipom/normal.pal
index 5da71c6f2..86a9c3948 100644
--- a/graphics/pokemon/ambipom/normal.pal
+++ b/graphics/pokemon/ambipom/normal.pal
@@ -2,17 +2,17 @@ JASC-PAL
 0100
 16
 152 208 160
-128 56 56
-168 72 72
-240 104 104
+112 72 64
+168 80 64
+248 112 88
 16 16 16
-208 176 120
-248 224 160
-120 104 64
-56 40 88
-112 72 136
-168 120 184
-136 96 160
+216 184 112
+248 232 160
+136 104 64
+80 32 104
+128 56 168
+176 96 224
+152 72 192
 168 144 96
 248 248 248
 168 168 160
diff --git a/graphics/pokemon/arceus/anim_front.png b/graphics/pokemon/arceus/anim_front.png
index 8e1f8a538..867c4730c 100644
Binary files a/graphics/pokemon/arceus/anim_front.png and b/graphics/pokemon/arceus/anim_front.png differ
diff --git a/graphics/pokemon/arceus/bug/normal.pal b/graphics/pokemon/arceus/bug/normal.pal
index c4d61c164..052761abc 100644
--- a/graphics/pokemon/arceus/bug/normal.pal
+++ b/graphics/pokemon/arceus/bug/normal.pal
@@ -3,17 +3,17 @@ JASC-PAL
 16
 152 208 160
 112 112 152
-224 224 216
+232 232 240
 16 16 16
-160 168 192
+184 184 192
 72 72 96
-72 116 40
-136 208 112
-80 72 88
-48 40 56
-40 76 32
-48 100 56
-232 160 232
-192 116 192
-112 164 56
+80 128 48
+144 224 120
+96 96 112
+56 64 80
+48 96 40
+48 112 56
+248 168 248
+200 112 208
+112 168 56
 248 248 248
diff --git a/graphics/pokemon/arceus/dark/normal.pal b/graphics/pokemon/arceus/dark/normal.pal
index 8adb3fa6f..12401f0ad 100644
--- a/graphics/pokemon/arceus/dark/normal.pal
+++ b/graphics/pokemon/arceus/dark/normal.pal
@@ -3,17 +3,17 @@ JASC-PAL
 16
 152 208 160
 112 112 152
-224 224 216
+232 232 240
 16 16 16
-160 168 192
+184 184 192
 72 72 96
-68 78 92
-160 164 176
-88 72 80
-64 44 56
-32 44 56
-24 28 24
-232 84 64
-160 56 32
-104 112 128
+72 88 104
+144 152 176
+104 80 96
+72 48 64
+56 64 80
+32 40 40
+248 104 0
+200 0 56
+96 104 120
 248 248 248
diff --git a/graphics/pokemon/arceus/dragon/normal.pal b/graphics/pokemon/arceus/dragon/normal.pal
index 7c0332135..1020ebdbc 100644
--- a/graphics/pokemon/arceus/dragon/normal.pal
+++ b/graphics/pokemon/arceus/dragon/normal.pal
@@ -3,17 +3,17 @@ JASC-PAL
 16
 152 208 160
 112 112 152
-224 224 216
+232 232 240
 16 16 16
-160 168 192
+184 184 192
 72 72 96
-96 6 124
-192 108 232
-56 116 88
-16 84 40
-96 6 124
-160 32 32
-72 192 72
-56 128 56
-152 44 192
+128 16 160
+184 80 224
+64 104 88
+32 80 56
+104 0 144
+200 0 56
+0 224 0
+0 160 0
+144 32 184
 248 248 248
diff --git a/graphics/pokemon/arceus/electric/normal.pal b/graphics/pokemon/arceus/electric/normal.pal
index 37cec5e5b..396375181 100644
--- a/graphics/pokemon/arceus/electric/normal.pal
+++ b/graphics/pokemon/arceus/electric/normal.pal
@@ -3,17 +3,17 @@ JASC-PAL
 16
 152 208 160
 112 112 152
-224 224 216
+232 232 240
 16 16 16
-160 168 192
+184 184 192
 72 72 96
-160 156 56
-240 236 136
-92 90 40
-56 48 16
-92 90 40
-160 32 32
-224 180 40
-168 120 32
-208 200 80
+184 160 24
+248 240 88
+112 96 56
+80 64 32
+128 112 0
+192 0 0
+240 128 0
+208 96 0
+224 200 56
 248 248 248
diff --git a/graphics/pokemon/arceus/fairy/normal.pal b/graphics/pokemon/arceus/fairy/normal.pal
index 89bedb760..c81dfb067 100644
--- a/graphics/pokemon/arceus/fairy/normal.pal
+++ b/graphics/pokemon/arceus/fairy/normal.pal
@@ -3,17 +3,17 @@ JASC-PAL
 16
 152 208 160
 112 112 152
-224 224 216
+232 232 240
 16 16 16
-160 168 192
+184 184 192
 72 72 96
-160 92 112
-248 188 208
-136 52 88
-104 16 64
-96 60 72
-32 60 192
-232 160 208
-192 116 160
-216 140 160
+216 112 144
+248 200 248
+184 112 144
+120 72 96
+136 72 104
+96 56 96
+248 64 144
+200 64 120
+240 144 176
 248 248 248
diff --git a/graphics/pokemon/arceus/fighting/normal.pal b/graphics/pokemon/arceus/fighting/normal.pal
index 37faf20e9..c093262bb 100644
--- a/graphics/pokemon/arceus/fighting/normal.pal
+++ b/graphics/pokemon/arceus/fighting/normal.pal
@@ -3,17 +3,17 @@ JASC-PAL
 16
 152 208 160
 112 112 152
-224 224 216
+232 232 240
 16 16 16
-160 168 192
+184 184 192
 72 72 96
-112 48 32
-192 116 80
-80 72 88
-48 40 56
-80 24 16
-160 32 32
-224 180 40
-168 120 32
-160 72 48
+104 24 8
+184 80 32
+96 96 112
+56 64 80
+88 16 0
+200 0 56
+240 184 0
+176 112 0
+152 56 32
 248 248 248
diff --git a/graphics/pokemon/arceus/fire/normal.pal b/graphics/pokemon/arceus/fire/normal.pal
index d351203fc..05cba4390 100644
--- a/graphics/pokemon/arceus/fire/normal.pal
+++ b/graphics/pokemon/arceus/fire/normal.pal
@@ -3,17 +3,17 @@ JASC-PAL
 16
 152 208 160
 112 112 152
-224 224 216
+232 232 240
 16 16 16
-160 168 192
+184 184 192
 72 72 96
-172 38 20
-248 148 32
-112 60 56
-80 28 24
-120 16 8
-172 38 20
-224 208 40
-168 136 32
-216 84 8
+216 48 16
+248 144 32
+128 32 32
+80 16 0
+160 24 16
+200 0 0
+248 232 0
+208 120 0
+248 96 16
 248 248 248
diff --git a/graphics/pokemon/arceus/flying/normal.pal b/graphics/pokemon/arceus/flying/normal.pal
index 233059fe5..3d62c829b 100644
--- a/graphics/pokemon/arceus/flying/normal.pal
+++ b/graphics/pokemon/arceus/flying/normal.pal
@@ -3,17 +3,17 @@ JASC-PAL
 16
 152 208 160
 112 112 152
-224 224 216
+232 232 240
 16 16 16
-160 168 192
+184 184 192
 72 72 96
-104 112 168
-184 196 248
-80 72 88
-48 40 56
-64 72 120
-48 148 176
-208 244 240
-144 144 168
-144 156 208
+104 112 176
+192 200 248
+96 96 112
+56 64 80
+72 80 144
+48 144 184
+232 232 248
+168 168 176
+144 152 216
 248 248 248
diff --git a/graphics/pokemon/arceus/front.png b/graphics/pokemon/arceus/front.png
index 72349052d..c143e4e69 100644
Binary files a/graphics/pokemon/arceus/front.png and b/graphics/pokemon/arceus/front.png differ
diff --git a/graphics/pokemon/arceus/ghost/normal.pal b/graphics/pokemon/arceus/ghost/normal.pal
index 307884148..92061f25c 100644
--- a/graphics/pokemon/arceus/ghost/normal.pal
+++ b/graphics/pokemon/arceus/ghost/normal.pal
@@ -3,17 +3,17 @@ JASC-PAL
 16
 152 208 160
 112 112 152
-224 224 216
+232 232 240
 16 16 16
-160 168 192
+184 184 192
 72 72 96
-80 46 128
-176 120 224
-80 46 128
-48 32 80
-48 16 104
-184 188 88
-232 84 64
-160 56 32
-120 80 184
+88 40 144
+168 96 232
+80 48 136
+64 24 120
+72 32 128
+248 248 0
+240 64 0
+168 32 0
+120 80 192
 248 248 248
diff --git a/graphics/pokemon/arceus/grass/normal.pal b/graphics/pokemon/arceus/grass/normal.pal
index d62d422dd..898495631 100644
--- a/graphics/pokemon/arceus/grass/normal.pal
+++ b/graphics/pokemon/arceus/grass/normal.pal
@@ -3,17 +3,17 @@ JASC-PAL
 16
 152 208 160
 112 112 152
-224 224 216
+232 232 240
 16 16 16
-160 168 192
+184 184 192
 72 72 96
-64 144 40
-160 252 112
-56 120 64
-28 90 32
-28 90 32
-208 40 48
-224 208 40
-168 136 32
-88 196 56
+64 152 48
+120 248 56
+56 112 80
+24 80 48
+40 104 48
+200 0 64
+248 232 0
+200 176 0
+88 208 56
 248 248 248
diff --git a/graphics/pokemon/arceus/ground/normal.pal b/graphics/pokemon/arceus/ground/normal.pal
index 832180a3a..b0ffc9a02 100644
--- a/graphics/pokemon/arceus/ground/normal.pal
+++ b/graphics/pokemon/arceus/ground/normal.pal
@@ -3,17 +3,17 @@ JASC-PAL
 16
 152 208 160
 112 112 152
-224 224 216
+232 232 240
 16 16 16
-160 168 192
+184 184 192
 72 72 96
-152 104 32
-216 180 88
-88 84 48
-56 48 16
-112 64 16
-160 32 32
-164 172 200
-128 128 160
-192 140 56
+176 104 24
+224 184 88
+104 88 56
+72 64 32
+144 64 0
+192 0 0
+184 184 200
+128 128 144
+200 144 56
 248 248 248
diff --git a/graphics/pokemon/arceus/ice/normal.pal b/graphics/pokemon/arceus/ice/normal.pal
index 06f187980..f74dbc1fa 100644
--- a/graphics/pokemon/arceus/ice/normal.pal
+++ b/graphics/pokemon/arceus/ice/normal.pal
@@ -3,17 +3,17 @@ JASC-PAL
 16
 152 208 160
 112 112 152
-224 224 216
+232 232 240
 16 16 16
-160 168 192
+184 184 192
 72 72 96
 80 144 184
-176 252 248
-88 136 160
-36 76 96
-36 76 96
-160 32 32
-192 192 232
-136 136 168
-112 184 232
+168 248 248
+72 144 168
+40 96 128
+40 80 96
+200 0 56
+232 232 248
+192 192 200
+128 200 248
 248 248 248
diff --git a/graphics/pokemon/arceus/normal.pal b/graphics/pokemon/arceus/normal.pal
index f602de85c..7c2734893 100644
--- a/graphics/pokemon/arceus/normal.pal
+++ b/graphics/pokemon/arceus/normal.pal
@@ -3,17 +3,17 @@ JASC-PAL
 16
 152 208 160
 112 112 152
-224 224 216
+232 232 240
 16 16 16
-160 168 192
+184 184 192
 72 72 96
-160 144 56
-248 216 144
-80 72 88
-48 40 56
-104 88 32
-160 32 32
-72 192 72
-56 128 56
-208 176 80
+184 160 24
+248 240 88
+96 96 112
+56 64 80
+128 112 0
+200 0 56
+0 224 0
+0 160 0
+224 200 56
 248 248 248
diff --git a/graphics/pokemon/arceus/poison/normal.pal b/graphics/pokemon/arceus/poison/normal.pal
index 7f7a066cc..ce8edcc00 100644
--- a/graphics/pokemon/arceus/poison/normal.pal
+++ b/graphics/pokemon/arceus/poison/normal.pal
@@ -3,17 +3,17 @@ JASC-PAL
 16
 152 208 160
 112 112 152
-224 224 216
+232 232 240
 16 16 16
-160 168 192
+184 184 192
 72 72 96
-136 60 152
-216 132 224
-80 72 88
-48 40 56
-88 32 112
-160 32 32
-224 156 216
-184 108 192
+128 48 144
+224 128 232
+96 96 112
+56 64 80
+80 24 96
+200 0 56
+248 160 248
+200 96 216
 176 96 184
 248 248 248
diff --git a/graphics/pokemon/arceus/psychic/normal.pal b/graphics/pokemon/arceus/psychic/normal.pal
index fbb92c93b..0c330517a 100644
--- a/graphics/pokemon/arceus/psychic/normal.pal
+++ b/graphics/pokemon/arceus/psychic/normal.pal
@@ -3,17 +3,17 @@ JASC-PAL
 16
 152 208 160
 112 112 152
-224 224 216
+232 232 240
 16 16 16
-160 168 192
+184 184 192
 72 72 96
-192 44 88
-248 132 168
-80 72 88
-48 40 56
-112 20 48
-160 32 32
-72 192 72
-56 128 56
-232 92 128
+200 24 72
+248 128 176
+96 96 112
+56 64 80
+152 0 48
+200 0 56
+0 224 0
+0 160 0
+240 72 112
 248 248 248
diff --git a/graphics/pokemon/arceus/rock/normal.pal b/graphics/pokemon/arceus/rock/normal.pal
index ec5fd85f4..60f8739e8 100644
--- a/graphics/pokemon/arceus/rock/normal.pal
+++ b/graphics/pokemon/arceus/rock/normal.pal
@@ -3,17 +3,17 @@ JASC-PAL
 16
 152 208 160
 112 112 152
-224 224 216
+232 232 240
 16 16 16
-160 168 192
+184 184 192
 72 72 96
-104 96 56
-176 172 128
-80 72 88
-48 40 56
-72 64 24
-64 108 64
-208 188 136
-160 144 88
-144 140 96
+112 104 64
+184 176 136
+96 96 112
+56 64 80
+96 88 48
+96 96 96
+224 200 120
+184 152 80
+144 144 96
 248 248 248
diff --git a/graphics/pokemon/arceus/steel/normal.pal b/graphics/pokemon/arceus/steel/normal.pal
index 703f66ffc..b1c145182 100644
--- a/graphics/pokemon/arceus/steel/normal.pal
+++ b/graphics/pokemon/arceus/steel/normal.pal
@@ -3,17 +3,17 @@ JASC-PAL
 16
 152 208 160
 112 112 152
-224 224 216
+232 232 240
 16 16 16
-160 168 192
+184 184 192
 72 72 96
-128 132 136
-224 228 224
-80 72 88
-48 40 56
-72 76 80
-48 100 56
-224 220 40
-160 152 32
-176 180 184
+128 128 136
+232 232 248
+96 96 112
+56 64 80
+88 88 96
+96 96 96
+240 240 0
+168 168 0
+184 184 192
 248 248 248
diff --git a/graphics/pokemon/arceus/water/normal.pal b/graphics/pokemon/arceus/water/normal.pal
index b3be4a519..61cd5c15b 100644
--- a/graphics/pokemon/arceus/water/normal.pal
+++ b/graphics/pokemon/arceus/water/normal.pal
@@ -3,17 +3,17 @@ JASC-PAL
 16
 152 208 160
 112 112 152
-224 224 216
+232 232 240
 16 16 16
-160 168 192
+184 184 192
 72 72 96
-8 92 176
-72 204 248
-64 80 108
-24 56 88
+8 96 200
+24 176 248
+0 56 168
+0 40 136
 16 48 120
-208 40 48
-40 204 216
-32 148 160
-24 144 224
+200 0 56
+0 232 248
+0 168 208
+8 144 248
 248 248 248
diff --git a/graphics/pokemon/azelf/anim_front.png b/graphics/pokemon/azelf/anim_front.png
index 6a1f9aba2..36dc5a992 100644
Binary files a/graphics/pokemon/azelf/anim_front.png and b/graphics/pokemon/azelf/anim_front.png differ
diff --git a/graphics/pokemon/azelf/front.png b/graphics/pokemon/azelf/front.png
index 82646121b..67d155bbf 100644
Binary files a/graphics/pokemon/azelf/front.png and b/graphics/pokemon/azelf/front.png differ
diff --git a/graphics/pokemon/azelf/normal.pal b/graphics/pokemon/azelf/normal.pal
index ad64742b0..bee2e3d8b 100644
--- a/graphics/pokemon/azelf/normal.pal
+++ b/graphics/pokemon/azelf/normal.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-32 72 88
-56 112 128
-80 160 176
+56 72 112
+64 96 144
+88 144 192
 16 16 16
-96 56 56
-224 104 96
+88 56 64
+232 64 64
 168 64 64
 248 248 248
-112 184 200
-128 160 184
-176 216 248
-240 200 32
-80 112 128
+112 168 224
+144 152 192
+176 200 240
+248 176 32
+120 112 144
 168 136 64
-48 64 72
+64 64 64
diff --git a/graphics/pokemon/bastiodon/anim_front.png b/graphics/pokemon/bastiodon/anim_front.png
index c887532c0..3a36e62a3 100644
Binary files a/graphics/pokemon/bastiodon/anim_front.png and b/graphics/pokemon/bastiodon/anim_front.png differ
diff --git a/graphics/pokemon/bastiodon/front.png b/graphics/pokemon/bastiodon/front.png
index 5d78b4080..c662e853c 100644
Binary files a/graphics/pokemon/bastiodon/front.png and b/graphics/pokemon/bastiodon/front.png differ
diff --git a/graphics/pokemon/bastiodon/normal.pal b/graphics/pokemon/bastiodon/normal.pal
index 9a404744a..cd8635b50 100644
--- a/graphics/pokemon/bastiodon/normal.pal
+++ b/graphics/pokemon/bastiodon/normal.pal
@@ -12,7 +12,7 @@ JASC-PAL
 248 208 120
 104 96 64
 32 32 32
-168 96 104
+176 56 72
 248 248 248
 0 0 0
 0 0 0
diff --git a/graphics/pokemon/bibarel/anim_front.png b/graphics/pokemon/bibarel/anim_front.png
index 6b826dfa3..c9a7d4031 100644
Binary files a/graphics/pokemon/bibarel/anim_front.png and b/graphics/pokemon/bibarel/anim_front.png differ
diff --git a/graphics/pokemon/bibarel/front.png b/graphics/pokemon/bibarel/front.png
index 648ce53af..1963eb81a 100644
Binary files a/graphics/pokemon/bibarel/front.png and b/graphics/pokemon/bibarel/front.png differ
diff --git a/graphics/pokemon/bibarel/normal.pal b/graphics/pokemon/bibarel/normal.pal
index c8f3547b5..71a5f280a 100644
--- a/graphics/pokemon/bibarel/normal.pal
+++ b/graphics/pokemon/bibarel/normal.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-80 56 32
-192 136 64
+88 56 48
+184 128 72
 16 16 16
-136 88 40
-240 208 136
-176 160 104
-192 176 176
+136 88 48
+224 208 152
+168 144 120
+192 192 176
 248 248 248
-88 72 64
-232 136 128
-240 64 64
 56 48 40
+232 64 32
+176 24 16
+64 56 48
 0 0 0
 0 0 0
 0 0 0
diff --git a/graphics/pokemon/bidoof/anim_front.png b/graphics/pokemon/bidoof/anim_front.png
index 31677a01f..23c318781 100644
Binary files a/graphics/pokemon/bidoof/anim_front.png and b/graphics/pokemon/bidoof/anim_front.png differ
diff --git a/graphics/pokemon/bidoof/front.png b/graphics/pokemon/bidoof/front.png
index ef0db513d..299e48749 100644
Binary files a/graphics/pokemon/bidoof/front.png and b/graphics/pokemon/bidoof/front.png differ
diff --git a/graphics/pokemon/bidoof/normal.pal b/graphics/pokemon/bidoof/normal.pal
index df2d84a3e..018af6413 100644
--- a/graphics/pokemon/bidoof/normal.pal
+++ b/graphics/pokemon/bidoof/normal.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-64 48 24
-136 88 40
-184 128 80
-112 80 32
+64 48 16
+152 96 48
+192 136 64
+96 72 48
 16 16 16
-184 184 120
-248 224 168
+200 184 128
+248 232 184
 248 248 248
-80 64 56
-224 80 80
-160 48 48
-192 192 184
+88 64 40
+232 88 72
+200 184 128
+200 192 192
 128 128 128
 0 0 0
 0 0 0
diff --git a/graphics/pokemon/bonsly/anim_front.png b/graphics/pokemon/bonsly/anim_front.png
index c44a6eebe..074473680 100644
Binary files a/graphics/pokemon/bonsly/anim_front.png and b/graphics/pokemon/bonsly/anim_front.png differ
diff --git a/graphics/pokemon/bonsly/front.png b/graphics/pokemon/bonsly/front.png
index e038a994e..328a0b031 100644
Binary files a/graphics/pokemon/bonsly/front.png and b/graphics/pokemon/bonsly/front.png differ
diff --git a/graphics/pokemon/bonsly/normal.pal b/graphics/pokemon/bonsly/normal.pal
index 26e43311e..86c2976eb 100644
--- a/graphics/pokemon/bonsly/normal.pal
+++ b/graphics/pokemon/bonsly/normal.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-56 88 56
-72 128 80
-184 208 128
-72 184 112
+48 88 24
+88 136 88
+152 216 120
+72 192 64
 0 0 0
-120 88 72
-64 48 32
-168 120 80
-200 160 104
-240 216 120
-216 184 48
-200 112 120
+128 104 64
+80 64 48
+168 128 88
+192 160 72
+248 232 120
+240 200 56
+160 64 72
 0 0 0
 0 0 0
 0 0 0
diff --git a/graphics/pokemon/bronzong/anim_front.png b/graphics/pokemon/bronzong/anim_front.png
index 1eaf22900..6ac7575ed 100644
Binary files a/graphics/pokemon/bronzong/anim_front.png and b/graphics/pokemon/bronzong/anim_front.png differ
diff --git a/graphics/pokemon/bronzong/front.png b/graphics/pokemon/bronzong/front.png
index 3d27ef4e5..8ede6d683 100644
Binary files a/graphics/pokemon/bronzong/front.png and b/graphics/pokemon/bronzong/front.png differ
diff --git a/graphics/pokemon/bronzong/normal.pal b/graphics/pokemon/bronzong/normal.pal
index d61b8f8c3..68fd123fb 100644
--- a/graphics/pokemon/bronzong/normal.pal
+++ b/graphics/pokemon/bronzong/normal.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-56 120 120
-32 64 72
-136 216 200
-88 184 168
+32 112 128
+32 72 88
+112 208 232
+64 168 200
 16 16 16
-80 152 144
-136 168 152
-152 208 192
-192 240 224
-56 96 96
-136 88 88
-224 96 88
+48 144 176
+136 168 176
+160 192 200
+184 208 216
+24 88 112
+152 104 120
+248 72 72
 0 0 0
 0 0 0
 0 0 0
diff --git a/graphics/pokemon/bronzor/anim_front.png b/graphics/pokemon/bronzor/anim_front.png
index bdefc0d5a..e9d219a38 100644
Binary files a/graphics/pokemon/bronzor/anim_front.png and b/graphics/pokemon/bronzor/anim_front.png differ
diff --git a/graphics/pokemon/bronzor/front.png b/graphics/pokemon/bronzor/front.png
index 15b9a8372..71a928cc3 100644
Binary files a/graphics/pokemon/bronzor/front.png and b/graphics/pokemon/bronzor/front.png differ
diff --git a/graphics/pokemon/bronzor/normal.pal b/graphics/pokemon/bronzor/normal.pal
index 770eb182a..3bc74c7f7 100644
--- a/graphics/pokemon/bronzor/normal.pal
+++ b/graphics/pokemon/bronzor/normal.pal
@@ -2,14 +2,14 @@ JASC-PAL
 0100
 16
 152 208 160
-24 56 64
-48 136 152
-32 88 112
-88 176 184
+16 56 72
+40 128 160
+24 88 120
+64 160 192
 16 16 16
-240 184 96
+248 216 112
 144 176 136
-128 200 200
+96 192 224
 0 0 0
 0 0 0
 0 0 0
diff --git a/graphics/pokemon/budew/anim_front.png b/graphics/pokemon/budew/anim_front.png
index 089eddb32..1c8e447f5 100644
Binary files a/graphics/pokemon/budew/anim_front.png and b/graphics/pokemon/budew/anim_front.png differ
diff --git a/graphics/pokemon/budew/front.png b/graphics/pokemon/budew/front.png
index 3b232c4b1..09a81838a 100644
Binary files a/graphics/pokemon/budew/front.png and b/graphics/pokemon/budew/front.png differ
diff --git a/graphics/pokemon/budew/normal.pal b/graphics/pokemon/budew/normal.pal
index 8db24b7b6..0e710e61d 100644
--- a/graphics/pokemon/budew/normal.pal
+++ b/graphics/pokemon/budew/normal.pal
@@ -2,17 +2,17 @@ JASC-PAL
 0100
 16
 152 208 160
-112 160 56
+112 160 72
 192 224 144
 16 16 16
 56 88 40
-128 200 80
-120 120 48
-232 232 104
-152 168 64
-40 72 32
-64 112 48
-80 144 64
+120 208 88
+144 128 0
+248 232 104
+224 184 56
+32 80 72
+48 120 96
+72 144 112
 160 200 120
 216 120 128
 0 0 0
diff --git a/graphics/pokemon/buizel/anim_front.png b/graphics/pokemon/buizel/anim_front.png
index 2cca44ba6..3cdc6e327 100644
Binary files a/graphics/pokemon/buizel/anim_front.png and b/graphics/pokemon/buizel/anim_front.png differ
diff --git a/graphics/pokemon/buizel/front.png b/graphics/pokemon/buizel/front.png
index 4794f1d58..e52b77c57 100644
Binary files a/graphics/pokemon/buizel/front.png and b/graphics/pokemon/buizel/front.png differ
diff --git a/graphics/pokemon/buizel/normal.pal b/graphics/pokemon/buizel/normal.pal
index dfab66d4b..592c4dd20 100644
--- a/graphics/pokemon/buizel/normal.pal
+++ b/graphics/pokemon/buizel/normal.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-168 80 40
-232 128 56
+168 88 32
+232 120 24
 96 56 32
 24 24 24
-64 112 128
-208 176 104
-104 192 232
-248 232 176
+32 96 160
+216 192 128
+96 184 224
+240 240 176
 248 248 248
 96 88 88
 216 216 232
-248 208 56
-192 152 48
+248 216 0
+224 160 48
 200 104 40
 0 0 0
diff --git a/graphics/pokemon/buneary/anim_front.png b/graphics/pokemon/buneary/anim_front.png
index 927b92507..5d6bb799d 100644
Binary files a/graphics/pokemon/buneary/anim_front.png and b/graphics/pokemon/buneary/anim_front.png differ
diff --git a/graphics/pokemon/buneary/front.png b/graphics/pokemon/buneary/front.png
index f204cb020..efb01359d 100644
Binary files a/graphics/pokemon/buneary/front.png and b/graphics/pokemon/buneary/front.png differ
diff --git a/graphics/pokemon/buneary/normal.pal b/graphics/pokemon/buneary/normal.pal
index 3bab71a53..499f3a9ac 100644
--- a/graphics/pokemon/buneary/normal.pal
+++ b/graphics/pokemon/buneary/normal.pal
@@ -10,8 +10,8 @@ JASC-PAL
 16 16 16
 136 88 56
 112 64 72
-216 144 152
-168 96 112
+248 136 160
+192 88 120
 248 248 248
 56 40 24
 0 0 0
diff --git a/graphics/pokemon/burmy/trash_cloak/anim_front.png b/graphics/pokemon/burmy/trash_cloak/anim_front.png
index d24fb3427..ec25c45f3 100644
Binary files a/graphics/pokemon/burmy/trash_cloak/anim_front.png and b/graphics/pokemon/burmy/trash_cloak/anim_front.png differ
diff --git a/graphics/pokemon/burmy/trash_cloak/front.png b/graphics/pokemon/burmy/trash_cloak/front.png
index 585d07238..39004627d 100644
Binary files a/graphics/pokemon/burmy/trash_cloak/front.png and b/graphics/pokemon/burmy/trash_cloak/front.png differ
diff --git a/graphics/pokemon/burmy/trash_cloak/normal.pal b/graphics/pokemon/burmy/trash_cloak/normal.pal
index 68533a009..3be75e1e9 100644
--- a/graphics/pokemon/burmy/trash_cloak/normal.pal
+++ b/graphics/pokemon/burmy/trash_cloak/normal.pal
@@ -9,8 +9,8 @@ JASC-PAL
 16 16 16
 136 80 88
 96 64 72
-192 104 112
-232 160 144
+176 104 120
+240 144 152
 248 200 48
 160 128 24
 120 120 128
diff --git a/graphics/pokemon/carnivine/anim_front.png b/graphics/pokemon/carnivine/anim_front.png
index fabccf9ac..ef9f5a154 100644
Binary files a/graphics/pokemon/carnivine/anim_front.png and b/graphics/pokemon/carnivine/anim_front.png differ
diff --git a/graphics/pokemon/carnivine/front.png b/graphics/pokemon/carnivine/front.png
index eb977bbaa..2d26ac904 100644
Binary files a/graphics/pokemon/carnivine/front.png and b/graphics/pokemon/carnivine/front.png differ
diff --git a/graphics/pokemon/carnivine/normal.pal b/graphics/pokemon/carnivine/normal.pal
index b6bd7da6d..6330295d7 100644
--- a/graphics/pokemon/carnivine/normal.pal
+++ b/graphics/pokemon/carnivine/normal.pal
@@ -8,12 +8,12 @@ JASC-PAL
 136 160 88
 16 16 16
 248 248 248
-128 48 48
+152 32 72
 56 24 16
 32 56 24
-224 80 80
+224 40 24
 64 104 48
-184 152 56
+192 152 48
 112 104 40
-240 200 72
+240 200 48
 96 104 72
diff --git a/graphics/pokemon/cherrim/anim_front.png b/graphics/pokemon/cherrim/anim_front.png
index 8f6fb3d30..591396454 100644
Binary files a/graphics/pokemon/cherrim/anim_front.png and b/graphics/pokemon/cherrim/anim_front.png differ
diff --git a/graphics/pokemon/cherrim/front.png b/graphics/pokemon/cherrim/front.png
index 5b10c48d1..bcedd50c0 100644
Binary files a/graphics/pokemon/cherrim/front.png and b/graphics/pokemon/cherrim/front.png differ
diff --git a/graphics/pokemon/cherrim/normal.pal b/graphics/pokemon/cherrim/normal.pal
index b04e7c0e6..1a91fdc24 100644
--- a/graphics/pokemon/cherrim/normal.pal
+++ b/graphics/pokemon/cherrim/normal.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-96 48 64
-200 88 112
-216 136 136
+120 40 72
+200 80 120
+216 112 144
 16 16 16
-152 64 80
+160 56 96
 16 80 16
 48 120 48
 56 168 56
-96 192 96
-96 56 112
-152 120 176
-120 88 152
-56 32 72
+88 192 88
+104 64 120
+152 120 184
+128 88 168
+72 40 64
 0 0 0
 0 0 0
diff --git a/graphics/pokemon/cherrim/sunshine/front.png b/graphics/pokemon/cherrim/sunshine/front.png
index 42c789389..8c65c561c 100644
Binary files a/graphics/pokemon/cherrim/sunshine/front.png and b/graphics/pokemon/cherrim/sunshine/front.png differ
diff --git a/graphics/pokemon/cherrim/sunshine/normal.pal b/graphics/pokemon/cherrim/sunshine/normal.pal
index 434b8ec78..a90df8210 100644
--- a/graphics/pokemon/cherrim/sunshine/normal.pal
+++ b/graphics/pokemon/cherrim/sunshine/normal.pal
@@ -2,17 +2,17 @@ JASC-PAL
 0100
 16
 152 208 160
-88 48 56
-152 80 88
-248 192 184
+144 32 64
+200 56 104
+248 192 224
 16 16 16
-192 120 128
-248 168 160
+224 128 168
+248 160 200
 248 96 128
 248 224 240
-120 104 40
-208 176 80
-248 224 136
+152 104 16
+216 176 88
+248 224 112
 40 112 48
 48 160 56
 200 56 104
diff --git a/graphics/pokemon/chimchar/anim_front.png b/graphics/pokemon/chimchar/anim_front.png
index 86c266d0d..4e6879f52 100644
Binary files a/graphics/pokemon/chimchar/anim_front.png and b/graphics/pokemon/chimchar/anim_front.png differ
diff --git a/graphics/pokemon/chimchar/front.png b/graphics/pokemon/chimchar/front.png
index 7d09db465..1a0e606a8 100644
Binary files a/graphics/pokemon/chimchar/front.png and b/graphics/pokemon/chimchar/front.png differ
diff --git a/graphics/pokemon/chimchar/normal.pal b/graphics/pokemon/chimchar/normal.pal
index 8a65f6fa1..ce3579f42 100644
--- a/graphics/pokemon/chimchar/normal.pal
+++ b/graphics/pokemon/chimchar/normal.pal
@@ -1,11 +1,11 @@
 JASC-PAL
 0100
-16
+256
 152 208 160
-152 88 40
-208 120 40
-104 56 8
-240 152 56
+176 104 40
+216 128 0
+120 64 16
+248 168 80
 16 16 16
 144 120 80
 208 176 120
@@ -17,3 +17,243 @@ JASC-PAL
 96 96 112
 224 72 32
 232 216 80
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/pokemon/combee/anim_front.png b/graphics/pokemon/combee/anim_front.png
index 2c07de339..cc85ef4c9 100644
Binary files a/graphics/pokemon/combee/anim_front.png and b/graphics/pokemon/combee/anim_front.png differ
diff --git a/graphics/pokemon/combee/anim_frontf.png b/graphics/pokemon/combee/anim_frontf.png
deleted file mode 100644
index 45acd64e3..000000000
Binary files a/graphics/pokemon/combee/anim_frontf.png and /dev/null differ
diff --git a/graphics/pokemon/combee/back.png b/graphics/pokemon/combee/back.png
index 1366cb1f8..89dfa4f0c 100644
Binary files a/graphics/pokemon/combee/back.png and b/graphics/pokemon/combee/back.png differ
diff --git a/graphics/pokemon/combee/front.png b/graphics/pokemon/combee/front.png
index ab591053b..4c1368df4 100644
Binary files a/graphics/pokemon/combee/front.png and b/graphics/pokemon/combee/front.png differ
diff --git a/graphics/pokemon/combee/normal.pal b/graphics/pokemon/combee/normal.pal
deleted file mode 100644
index badc68861..000000000
--- a/graphics/pokemon/combee/normal.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-152 208 160
-16 16 16
-56 56 56
-96 112 120
-168 192 216
-216 224 232
-232 128 64
-112 80 16
-248 184 64
-160 120 40
-232 72 64
-176 88 32
-200 144 40
-0 0 0
-0 0 0
-0 0 0
diff --git a/graphics/pokemon/combee/normal_f.pal b/graphics/pokemon/combee/normal_f.pal
new file mode 100644
index 000000000..045177137
--- /dev/null
+++ b/graphics/pokemon/combee/normal_f.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+16 16 16
+56 56 64
+80 88 112
+192 192 216
+240 240 248
+240 112 0
+104 88 0
+248 208 8
+168 128 0
+224 56 56
+176 88 32
+200 144 40
+240 112 136
+0 0 0
+0 0 0
diff --git a/graphics/pokemon/combee/normal_m.pal b/graphics/pokemon/combee/normal_m.pal
new file mode 100644
index 000000000..ae331aac6
--- /dev/null
+++ b/graphics/pokemon/combee/normal_m.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+16 16 16
+56 56 64
+80 88 112
+192 192 216
+240 240 248
+240 112 0
+104 88 0
+248 208 8
+168 128 0
+248 208 0
+176 88 32
+200 144 40
+248 208 0
+0 0 0
+0 0 0
diff --git a/graphics/pokemon/combee/shiny.pal b/graphics/pokemon/combee/shiny_f.pal
similarity index 90%
rename from graphics/pokemon/combee/shiny.pal
rename to graphics/pokemon/combee/shiny_f.pal
index 91e9abeee..54b0e92cf 100644
--- a/graphics/pokemon/combee/shiny.pal
+++ b/graphics/pokemon/combee/shiny_f.pal
@@ -11,9 +11,9 @@ JASC-PAL
 104 56 0
 248 136 88
 160 56 32
-152 40 40
+248 0 0
 176 40 16
 200 88 48
-0 0 0
+192 0 0
 0 0 0
 0 0 0
diff --git a/graphics/pokemon/combee/shiny_m.pal b/graphics/pokemon/combee/shiny_m.pal
new file mode 100644
index 000000000..8fe9e48ce
--- /dev/null
+++ b/graphics/pokemon/combee/shiny_m.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+16 16 16
+56 56 64
+80 88 112
+184 184 208
+232 232 248
+232 88 32
+104 56 0
+248 136 88
+160 56 32
+248 136 88
+176 40 16
+200 88 48
+248 136 88
+0 0 0
+0 0 0
diff --git a/graphics/pokemon/cranidos/anim_front.png b/graphics/pokemon/cranidos/anim_front.png
index 4c40d1e27..4cfea0dd4 100644
Binary files a/graphics/pokemon/cranidos/anim_front.png and b/graphics/pokemon/cranidos/anim_front.png differ
diff --git a/graphics/pokemon/cranidos/front.png b/graphics/pokemon/cranidos/front.png
index f0d534a60..000533a92 100644
Binary files a/graphics/pokemon/cranidos/front.png and b/graphics/pokemon/cranidos/front.png differ
diff --git a/graphics/pokemon/cranidos/normal.pal b/graphics/pokemon/cranidos/normal.pal
index 8cac83fe8..73f9d7b45 100644
--- a/graphics/pokemon/cranidos/normal.pal
+++ b/graphics/pokemon/cranidos/normal.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-120 136 144
+112 120 136
 248 248 248
-208 208 216
-40 72 96
+208 216 224
+40 72 112
 16 16 16
-64 104 136
-72 136 184
-64 80 96
-168 184 192
-128 144 160
-120 184 216
-104 112 128
-240 120 112
-176 56 48
-178 103 103
+56 96 152
+72 128 184
+72 88 104
+160 176 184
+128 144 152
+112 168 232
+96 112 128
+200 96 96
+168 64 64
+168 16 0
diff --git a/graphics/pokemon/cresselia/anim_front.png b/graphics/pokemon/cresselia/anim_front.png
index 8e84b970e..23e1a2ab9 100644
Binary files a/graphics/pokemon/cresselia/anim_front.png and b/graphics/pokemon/cresselia/anim_front.png differ
diff --git a/graphics/pokemon/cresselia/front.png b/graphics/pokemon/cresselia/front.png
index 88b7dba06..56a6f004f 100644
Binary files a/graphics/pokemon/cresselia/front.png and b/graphics/pokemon/cresselia/front.png differ
diff --git a/graphics/pokemon/cresselia/normal.pal b/graphics/pokemon/cresselia/normal.pal
index 187fdee2b..190705d9b 100644
--- a/graphics/pokemon/cresselia/normal.pal
+++ b/graphics/pokemon/cresselia/normal.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-104 88 64
+104 80 48
 16 16 16
-240 224 208
-184 144 88
-240 200 136
-136 72 104
-184 104 144
-216 160 184
-88 48 80
-240 216 208
+248 232 184
+168 144 88
+248 208 112
+136 64 120
+192 88 152
+208 136 200
+80 56 88
+224 192 232
 248 248 248
-136 168 208
-104 128 160
-64 88 112
+128 144 240
+80 104 176
+56 64 120
 192 176 176
diff --git a/graphics/pokemon/croagunk/anim_front.png b/graphics/pokemon/croagunk/anim_front.png
index 3d4d81f7c..84c7edb09 100644
Binary files a/graphics/pokemon/croagunk/anim_front.png and b/graphics/pokemon/croagunk/anim_front.png differ
diff --git a/graphics/pokemon/croagunk/front.png b/graphics/pokemon/croagunk/front.png
index 1c34d1791..6725ae39e 100644
Binary files a/graphics/pokemon/croagunk/front.png and b/graphics/pokemon/croagunk/front.png differ
diff --git a/graphics/pokemon/croagunk/normal.pal b/graphics/pokemon/croagunk/normal.pal
index 5ebbaf6e1..d978984e2 100644
--- a/graphics/pokemon/croagunk/normal.pal
+++ b/graphics/pokemon/croagunk/normal.pal
@@ -1,19 +1,259 @@
 JASC-PAL
 0100
-16
+256
 152 208 160
-56 72 120
+72 72 136
 16 16 16
 128 152 248
-72 120 192
-88 80 80
-56 48 48
-248 192 72
-168 128 32
-128 72 32
-232 136 80
-232 192 136
+104 112 208
+80 80 80
+48 48 64
+248 208 24
+176 136 24
+152 56 56
+232 128 64
+240 200 160
 248 248 248
-184 176 168
-136 120 120
+176 176 192
+120 120 136
 56 56 80
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/pokemon/darkrai/anim_front.png b/graphics/pokemon/darkrai/anim_front.png
index 81cf1e35b..741c69af0 100644
Binary files a/graphics/pokemon/darkrai/anim_front.png and b/graphics/pokemon/darkrai/anim_front.png differ
diff --git a/graphics/pokemon/darkrai/front.png b/graphics/pokemon/darkrai/front.png
index 29f627df0..e3f284abd 100644
Binary files a/graphics/pokemon/darkrai/front.png and b/graphics/pokemon/darkrai/front.png differ
diff --git a/graphics/pokemon/darkrai/normal.pal b/graphics/pokemon/darkrai/normal.pal
index 66020cc4b..7edcd825d 100644
--- a/graphics/pokemon/darkrai/normal.pal
+++ b/graphics/pokemon/darkrai/normal.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-120 112 112
-192 176 176
-88 80 80
+128 128 128
+192 200 208
+64 64 88
 16 16 16
-48 40 48
-224 224 216
-80 24 24
-152 56 48
-40 112 120
-40 200 192
+48 40 56
+224 232 240
+96 0 0
+144 40 64
+16 136 168
+40 232 248
 248 248 248
-208 104 96
+232 16 24
 0 0 0
 0 0 0
 0 0 0
diff --git a/graphics/pokemon/dialga/anim_front.png b/graphics/pokemon/dialga/anim_front.png
index cfb10e9c5..c4234913b 100644
Binary files a/graphics/pokemon/dialga/anim_front.png and b/graphics/pokemon/dialga/anim_front.png differ
diff --git a/graphics/pokemon/dialga/front.png b/graphics/pokemon/dialga/front.png
index b1c79e98b..e4a6172ac 100644
Binary files a/graphics/pokemon/dialga/front.png and b/graphics/pokemon/dialga/front.png differ
diff --git a/graphics/pokemon/dialga/normal.pal b/graphics/pokemon/dialga/normal.pal
index 71226dfeb..102e0ff12 100644
--- a/graphics/pokemon/dialga/normal.pal
+++ b/graphics/pokemon/dialga/normal.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-128 136 176
-16 16 16
-72 72 96
-176 200 216
-48 56 104
-32 24 72
-232 240 240
-96 160 184
-160 216 224
-56 88 136
-248 88 88
+136 160 176
+8 8 8
+64 64 80
+192 208 224
+32 88 144
+32 64 104
+232 240 248
+96 160 200
+152 216 248
+56 120 176
+248 80 64
 88 96 112
-184 96 104
-40 72 160
-80 112 144
+168 16 0
+32 72 248
+64 112 152
diff --git a/graphics/pokemon/drifblim/anim_front.png b/graphics/pokemon/drifblim/anim_front.png
index 177cce55d..9ed62c859 100644
Binary files a/graphics/pokemon/drifblim/anim_front.png and b/graphics/pokemon/drifblim/anim_front.png differ
diff --git a/graphics/pokemon/drifblim/front.png b/graphics/pokemon/drifblim/front.png
index eb766375e..f6cf9d5f9 100644
Binary files a/graphics/pokemon/drifblim/front.png and b/graphics/pokemon/drifblim/front.png differ
diff --git a/graphics/pokemon/drifblim/normal.pal b/graphics/pokemon/drifblim/normal.pal
index 8c3533930..9da52a587 100644
--- a/graphics/pokemon/drifblim/normal.pal
+++ b/graphics/pokemon/drifblim/normal.pal
@@ -1,19 +1,259 @@
 JASC-PAL
 0100
-16
+256
 152 208 160
-200 184 176
+192 192 224
 248 248 248
-96 88 88
+88 88 96
 16 16 16
-88 72 104
-120 96 152
-64 48 72
-160 136 168
-224 80 80
+88 64 120
+128 80 168
+64 56 88
+152 112 216
+224 72 80
 96 80 56
-184 152 56
-232 200 96
-168 144 176
-216 192 224
-136 48 48
+184 152 0
+248 216 8
+160 128 192
+208 176 248
+144 56 88
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/pokemon/drifloon/anim_front.png b/graphics/pokemon/drifloon/anim_front.png
index f7bd5aa4f..feb7b51fa 100644
Binary files a/graphics/pokemon/drifloon/anim_front.png and b/graphics/pokemon/drifloon/anim_front.png differ
diff --git a/graphics/pokemon/drifloon/front.png b/graphics/pokemon/drifloon/front.png
index 76536179d..dea6e8871 100644
Binary files a/graphics/pokemon/drifloon/front.png and b/graphics/pokemon/drifloon/front.png differ
diff --git a/graphics/pokemon/drifloon/normal.pal b/graphics/pokemon/drifloon/normal.pal
index 8d6797178..a13591932 100644
--- a/graphics/pokemon/drifloon/normal.pal
+++ b/graphics/pokemon/drifloon/normal.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-176 200 216
+192 208 224
 248 248 248
-72 96 112
+88 88 96
 16 16 16
-112 80 120
-152 112 176
-80 64 96
-200 160 208
-56 40 72
-208 168 64
-128 104 40
-240 208 96
+120 64 160
+144 104 224
+96 48 128
+192 176 248
+72 48 104
+200 176 0
+136 104 32
+248 216 8
 0 0 0
 0 0 0
 0 0 0
diff --git a/graphics/pokemon/dusknoir/anim_front.png b/graphics/pokemon/dusknoir/anim_front.png
index 59c490a6d..abbef6aac 100644
Binary files a/graphics/pokemon/dusknoir/anim_front.png and b/graphics/pokemon/dusknoir/anim_front.png differ
diff --git a/graphics/pokemon/dusknoir/front.png b/graphics/pokemon/dusknoir/front.png
index ad418e102..95a5ccea9 100644
Binary files a/graphics/pokemon/dusknoir/front.png and b/graphics/pokemon/dusknoir/front.png differ
diff --git a/graphics/pokemon/dusknoir/normal.pal b/graphics/pokemon/dusknoir/normal.pal
index 65731923d..ce4803194 100644
--- a/graphics/pokemon/dusknoir/normal.pal
+++ b/graphics/pokemon/dusknoir/normal.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-96 72 40
-160 120 72
-216 184 120
+96 72 48
+152 120 40
+224 176 48
 64 56 56
 16 16 16
-104 96 88
-168 176 160
-128 128 112
+96 88 96
+168 160 152
+128 112 112
 88 88 72
 176 144 56
 224 192 56
-208 208 184
+200 200 168
 232 64 64
 40 40 32
 0 0 0
diff --git a/graphics/pokemon/electivire/anim_front.png b/graphics/pokemon/electivire/anim_front.png
index 78bc8c048..a5f05a7e8 100644
Binary files a/graphics/pokemon/electivire/anim_front.png and b/graphics/pokemon/electivire/anim_front.png differ
diff --git a/graphics/pokemon/electivire/front.png b/graphics/pokemon/electivire/front.png
index 42f378b60..41bf884b5 100644
Binary files a/graphics/pokemon/electivire/front.png and b/graphics/pokemon/electivire/front.png differ
diff --git a/graphics/pokemon/electivire/normal.pal b/graphics/pokemon/electivire/normal.pal
index 03836274f..e751bd37e 100644
--- a/graphics/pokemon/electivire/normal.pal
+++ b/graphics/pokemon/electivire/normal.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-136 24 24
-8 8 8
-200 72 72
-216 120 104
-40 32 40
-128 120 72
-240 200 104
-80 72 64
-248 232 192
-176 144 80
-248 248 248
-80 72 72
-104 104 104
-192 176 184
+112 24 0
+0 0 0
+176 56 24
+240 80 56
+48 40 40
+152 128 72
+248 216 32
+88 72 64
+248 232 144
+192 168 64
+248 248 248
+104 104 104
+176 176 192
+0 0 0
 0 0 0
diff --git a/graphics/pokemon/empoleon/anim_front.png b/graphics/pokemon/empoleon/anim_front.png
index 85d41c602..697609916 100644
Binary files a/graphics/pokemon/empoleon/anim_front.png and b/graphics/pokemon/empoleon/anim_front.png differ
diff --git a/graphics/pokemon/empoleon/front.png b/graphics/pokemon/empoleon/front.png
index 8cf43c938..3b3dff0bc 100644
Binary files a/graphics/pokemon/empoleon/front.png and b/graphics/pokemon/empoleon/front.png differ
diff --git a/graphics/pokemon/empoleon/normal.pal b/graphics/pokemon/empoleon/normal.pal
index 0b49c0a5e..b026b6f74 100644
--- a/graphics/pokemon/empoleon/normal.pal
+++ b/graphics/pokemon/empoleon/normal.pal
@@ -2,17 +2,17 @@ JASC-PAL
 0100
 16
 152 208 160
-184 128 56
-248 200 128
-96 80 32
-240 176 96
+184 136 104
+248 224 128
+120 80 64
+232 200 96
 16 16 16
-56 64 72
-40 72 120
-64 112 184
-32 32 40
-120 176 232
-232 232 232
+40 64 80
+40 88 144
+80 136 224
+32 40 48
+152 200 248
+232 232 248
 216 232 248
 32 32 40
 0 0 0
diff --git a/graphics/pokemon/finneon/anim_front.png b/graphics/pokemon/finneon/anim_front.png
index 7e8e99a0e..c18dd41cf 100644
Binary files a/graphics/pokemon/finneon/anim_front.png and b/graphics/pokemon/finneon/anim_front.png differ
diff --git a/graphics/pokemon/finneon/front.png b/graphics/pokemon/finneon/front.png
index 063d58973..635dcfc7e 100644
Binary files a/graphics/pokemon/finneon/front.png and b/graphics/pokemon/finneon/front.png differ
diff --git a/graphics/pokemon/finneon/normal.pal b/graphics/pokemon/finneon/normal.pal
index 3cb0afe37..cc4af552a 100644
--- a/graphics/pokemon/finneon/normal.pal
+++ b/graphics/pokemon/finneon/normal.pal
@@ -2,17 +2,17 @@ JASC-PAL
 0100
 16
 152 208 160
-80 120 120
-144 216 208
-32 40 48
-200 232 224
+80 104 136
+144 208 224
+40 40 56
+192 224 240
 16 16 8
 112 160 160
-144 64 104
-224 136 152
-200 88 136
-80 112 112
-48 72 80
+112 64 120
+168 136 184
+192 72 144
+64 104 128
+48 64 88
 232 248 248
 16 16 16
 0 0 0
diff --git a/graphics/pokemon/floatzel/anim_front.png b/graphics/pokemon/floatzel/anim_front.png
index 1b66fe15d..d5dd3a61f 100644
Binary files a/graphics/pokemon/floatzel/anim_front.png and b/graphics/pokemon/floatzel/anim_front.png differ
diff --git a/graphics/pokemon/floatzel/front.png b/graphics/pokemon/floatzel/front.png
index 64759500b..6ff6ec136 100644
Binary files a/graphics/pokemon/floatzel/front.png and b/graphics/pokemon/floatzel/front.png differ
diff --git a/graphics/pokemon/floatzel/normal.pal b/graphics/pokemon/floatzel/normal.pal
index 7494e2886..c92f189e8 100644
--- a/graphics/pokemon/floatzel/normal.pal
+++ b/graphics/pokemon/floatzel/normal.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-88 48 24
-232 128 80
-168 80 40
+120 64 32
+232 120 24
+168 88 32
 24 24 24
-248 224 168
-192 168 112
+240 240 176
+200 184 128
 120 104 40
 248 248 248
-200 160 40
+224 160 48
 96 96 80
-248 216 80
-56 120 152
-96 200 224
-200 96 48
+248 216 0
+32 96 160
+96 184 224
+200 104 24
 248 248 248
diff --git a/graphics/pokemon/froslass/anim_front.png b/graphics/pokemon/froslass/anim_front.png
index ea5207baa..b6ef59fd4 100644
Binary files a/graphics/pokemon/froslass/anim_front.png and b/graphics/pokemon/froslass/anim_front.png differ
diff --git a/graphics/pokemon/froslass/front.png b/graphics/pokemon/froslass/front.png
index 3ad383321..28597b428 100644
Binary files a/graphics/pokemon/froslass/front.png and b/graphics/pokemon/froslass/front.png differ
diff --git a/graphics/pokemon/froslass/normal.pal b/graphics/pokemon/froslass/normal.pal
index 7d4fd3b87..eba1feb42 100644
--- a/graphics/pokemon/froslass/normal.pal
+++ b/graphics/pokemon/froslass/normal.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-104 152 160
-152 200 184
-72 80 88
-160 152 136
-72 104 120
-248 248 240
-216 208 200
-128 80 160
-96 56 112
+80 120 176
+112 176 208
+64 64 104
+136 136 168
+64 80 136
+248 248 248
+192 200 216
+112 48 160
+72 48 112
 16 16 16
-192 168 48
-248 224 104
-104 56 48
-176 72 40
-208 128 96
+216 144 56
+248 208 88
+104 48 48
+192 40 32
+224 120 72
diff --git a/graphics/pokemon/gabite/anim_front.png b/graphics/pokemon/gabite/anim_front.png
index 64dd7fd42..da2701ab0 100644
Binary files a/graphics/pokemon/gabite/anim_front.png and b/graphics/pokemon/gabite/anim_front.png differ
diff --git a/graphics/pokemon/gabite/front.png b/graphics/pokemon/gabite/front.png
index 59ab36b06..3495a5f18 100644
Binary files a/graphics/pokemon/gabite/front.png and b/graphics/pokemon/gabite/front.png differ
diff --git a/graphics/pokemon/gabite/normal.pal b/graphics/pokemon/gabite/normal.pal
index 300521aa6..9541ab306 100644
--- a/graphics/pokemon/gabite/normal.pal
+++ b/graphics/pokemon/gabite/normal.pal
@@ -1,19 +1,259 @@
 JASC-PAL
 0100
-16
+256
 152 208 160
-72 80 120
-40 48 80
-88 112 168
-128 120 176
-168 168 232
-128 144 184
-16 16 16
-248 200 56
-160 128 32
-80 24 16
-160 56 40
+56 72 136
+16 40 80
+88 104 184
+136 136 184
+176 184 240
+112 136 200
+16 24 32
+248 248 24
+216 152 24
+88 16 0
+168 48 72
 248 248 248
-216 96 72
-136 128 120
-200 192 184
+216 88 40
+112 120 128
+192 200 208
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/pokemon/gallade/anim_front.png b/graphics/pokemon/gallade/anim_front.png
index dd3d07c4e..b2da036ff 100644
Binary files a/graphics/pokemon/gallade/anim_front.png and b/graphics/pokemon/gallade/anim_front.png differ
diff --git a/graphics/pokemon/gallade/front.png b/graphics/pokemon/gallade/front.png
index 958215914..93f200159 100644
Binary files a/graphics/pokemon/gallade/front.png and b/graphics/pokemon/gallade/front.png differ
diff --git a/graphics/pokemon/gallade/normal.pal b/graphics/pokemon/gallade/normal.pal
index 0514a63f3..53ca20eb1 100644
--- a/graphics/pokemon/gallade/normal.pal
+++ b/graphics/pokemon/gallade/normal.pal
@@ -1,19 +1,259 @@
 JASC-PAL
 0100
-16
+256
 152 208 160
-40 80 56
+56 80 80
 16 16 16
-56 128 72
-96 152 152
-112 200 192
-56 112 104
-80 176 120
-152 128 128
-224 216 216
+64 128 88
+112 144 160
+120 192 176
+80 120 128
+88 176 104
+112 128 168
+200 200 224
 248 248 248
-200 184 184
-112 40 64
-248 144 152
-208 72 96
+160 176 200
+128 40 72
+248 120 144
+208 72 112
 248 248 248
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/pokemon/garchomp/anim_front.png b/graphics/pokemon/garchomp/anim_front.png
index 240708b95..de7f101ea 100644
Binary files a/graphics/pokemon/garchomp/anim_front.png and b/graphics/pokemon/garchomp/anim_front.png differ
diff --git a/graphics/pokemon/garchomp/front.png b/graphics/pokemon/garchomp/front.png
index 285c1b42e..e84e0270f 100644
Binary files a/graphics/pokemon/garchomp/front.png and b/graphics/pokemon/garchomp/front.png differ
diff --git a/graphics/pokemon/garchomp/normal.pal b/graphics/pokemon/garchomp/normal.pal
index 679803423..ab29e0642 100644
--- a/graphics/pokemon/garchomp/normal.pal
+++ b/graphics/pokemon/garchomp/normal.pal
@@ -1,19 +1,259 @@
 JASC-PAL
 0100
-16
+256
 152 208 160
-64 72 104
-184 144 32
-32 40 64
-128 136 168
-248 200 72
-88 104 152
+64 64 136
+192 144 16
+40 40 80
+120 120 200
+248 208 24
+88 96 168
 16 16 16
 248 248 248
-120 112 112
-200 184 184
-104 64 72
-224 88 64
-184 104 112
-88 24 8
-160 56 32
+112 120 128
+192 200 208
+104 56 88
+224 72 48
+184 112 120
+88 16 0
+184 56 64
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/pokemon/gastrodon/anim_front.png b/graphics/pokemon/gastrodon/anim_front.png
index fa48c288c..c47a0e86b 100644
Binary files a/graphics/pokemon/gastrodon/anim_front.png and b/graphics/pokemon/gastrodon/anim_front.png differ
diff --git a/graphics/pokemon/gastrodon/back.png b/graphics/pokemon/gastrodon/back.png
index d16eab76f..a20c30c77 100644
Binary files a/graphics/pokemon/gastrodon/back.png and b/graphics/pokemon/gastrodon/back.png differ
diff --git a/graphics/pokemon/gastrodon/east_sea/anim_front.png b/graphics/pokemon/gastrodon/east_sea/anim_front.png
index a71fed66f..6e8ab451b 100644
Binary files a/graphics/pokemon/gastrodon/east_sea/anim_front.png and b/graphics/pokemon/gastrodon/east_sea/anim_front.png differ
diff --git a/graphics/pokemon/gastrodon/east_sea/back.png b/graphics/pokemon/gastrodon/east_sea/back.png
index 3cf071733..f200a3997 100644
Binary files a/graphics/pokemon/gastrodon/east_sea/back.png and b/graphics/pokemon/gastrodon/east_sea/back.png differ
diff --git a/graphics/pokemon/gastrodon/east_sea/front.png b/graphics/pokemon/gastrodon/east_sea/front.png
index f156301b6..ca68f56d3 100644
Binary files a/graphics/pokemon/gastrodon/east_sea/front.png and b/graphics/pokemon/gastrodon/east_sea/front.png differ
diff --git a/graphics/pokemon/gastrodon/east_sea/normal.pal b/graphics/pokemon/gastrodon/east_sea/normal.pal
index 1bf21b13c..2f2405e45 100644
--- a/graphics/pokemon/gastrodon/east_sea/normal.pal
+++ b/graphics/pokemon/gastrodon/east_sea/normal.pal
@@ -8,12 +8,12 @@ JASC-PAL
 51 104 47
 115 186 126
 49 49 41
-160 140 59
-252 231 95
-84 79 53
+160 144 56
+248 224 112
+80 72 56
 115 98 98
 255 255 255
-50 145 158
-65 206 219
-35 94 102
-0 0 0
+104 120 168
+104 176 248
+88 80 120
+168 56 80
diff --git a/graphics/pokemon/gastrodon/east_sea/shiny.pal b/graphics/pokemon/gastrodon/east_sea/shiny.pal
index 68e4a6d27..e5d9166a7 100644
--- a/graphics/pokemon/gastrodon/east_sea/shiny.pal
+++ b/graphics/pokemon/gastrodon/east_sea/shiny.pal
@@ -16,4 +16,4 @@ JASC-PAL
 101 145 155
 131 222 222
 81 94 119
-0 0 0
+168 56 80
diff --git a/graphics/pokemon/gastrodon/front.png b/graphics/pokemon/gastrodon/front.png
index 97f5c4d69..b28352aed 100644
Binary files a/graphics/pokemon/gastrodon/front.png and b/graphics/pokemon/gastrodon/front.png differ
diff --git a/graphics/pokemon/gastrodon/normal.pal b/graphics/pokemon/gastrodon/normal.pal
index 13b545944..c9428d8bd 100644
--- a/graphics/pokemon/gastrodon/normal.pal
+++ b/graphics/pokemon/gastrodon/normal.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-72 48 32
+72 56 56
 16 16 16
-152 112 64
-112 80 40
-184 152 104
+160 104 56
+104 72 56
+192 144 72
 48 48 40
-152 136 64
-248 224 88
-80 72 48
+160 136 56
+248 216 112
+80 72 56
 112 96 96
 248 248 248
-184 96 128
-240 152 192
-96 48 64
-0 0 0
+168 96 144
+248 136 192
+104 56 80
+168 56 80
diff --git a/graphics/pokemon/gastrodon/shiny.pal b/graphics/pokemon/gastrodon/shiny.pal
index 8e8be79ea..8b58c4c87 100644
--- a/graphics/pokemon/gastrodon/shiny.pal
+++ b/graphics/pokemon/gastrodon/shiny.pal
@@ -16,4 +16,4 @@ JASC-PAL
 216 112 104
 248 168 160
 104 48 48
-0 0 0
+168 56 80
diff --git a/graphics/pokemon/gible/anim_front.png b/graphics/pokemon/gible/anim_front.png
index 3c268714e..459d543f2 100644
Binary files a/graphics/pokemon/gible/anim_front.png and b/graphics/pokemon/gible/anim_front.png differ
diff --git a/graphics/pokemon/gible/front.png b/graphics/pokemon/gible/front.png
index eea25b497..d3d5b4873 100644
Binary files a/graphics/pokemon/gible/front.png and b/graphics/pokemon/gible/front.png differ
diff --git a/graphics/pokemon/gible/normal.pal b/graphics/pokemon/gible/normal.pal
index f5668f01d..602482b45 100644
--- a/graphics/pokemon/gible/normal.pal
+++ b/graphics/pokemon/gible/normal.pal
@@ -3,17 +3,17 @@ JASC-PAL
 16
 152 208 160
 40 64 80
-104 152 168
-168 192 192
-80 104 120
+80 144 168
+136 192 208
+64 104 128
 16 16 16
-96 192 216
+64 208 216
 248 248 248
 208 200 192
-80 152 160
-96 56 64
+56 168 192
+120 32 24
 112 24 16
-184 120 144
-224 88 64
-160 56 32
+200 104 120
+216 88 40
+168 56 16
 96 88 88
diff --git a/graphics/pokemon/giratina/anim_front.png b/graphics/pokemon/giratina/anim_front.png
index 7bf2e97f8..af1332ed5 100644
Binary files a/graphics/pokemon/giratina/anim_front.png and b/graphics/pokemon/giratina/anim_front.png differ
diff --git a/graphics/pokemon/giratina/front.png b/graphics/pokemon/giratina/front.png
index 33ed6ece9..d0004746a 100644
Binary files a/graphics/pokemon/giratina/front.png and b/graphics/pokemon/giratina/front.png differ
diff --git a/graphics/pokemon/giratina/normal.pal b/graphics/pokemon/giratina/normal.pal
index be4ff55cd..6aa922c8e 100644
--- a/graphics/pokemon/giratina/normal.pal
+++ b/graphics/pokemon/giratina/normal.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-72 24 8
-40 48 56
-80 72 24
-184 80 80
-240 224 176
-136 48 48
-168 136 56
-96 88 104
-224 192 88
-144 136 144
-192 192 184
+80 16 0
+56 56 72
+112 80 0
+248 64 80
+248 248 208
+160 32 56
+200 152 0
+104 104 120
+248 208 0
+144 144 160
+192 200 208
 16 16 16
-120 96 48
-64 64 80
+168 120 0
+72 72 88
 0 0 0
diff --git a/graphics/pokemon/giratina/origin/anim_front.png b/graphics/pokemon/giratina/origin/anim_front.png
index 788853e9d..8dd5d89a0 100644
Binary files a/graphics/pokemon/giratina/origin/anim_front.png and b/graphics/pokemon/giratina/origin/anim_front.png differ
diff --git a/graphics/pokemon/giratina/origin/front.png b/graphics/pokemon/giratina/origin/front.png
index a86079135..14f631d09 100644
Binary files a/graphics/pokemon/giratina/origin/front.png and b/graphics/pokemon/giratina/origin/front.png differ
diff --git a/graphics/pokemon/giratina/origin/normal.pal b/graphics/pokemon/giratina/origin/normal.pal
index daf42489b..9285df191 100644
--- a/graphics/pokemon/giratina/origin/normal.pal
+++ b/graphics/pokemon/giratina/origin/normal.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-24 24 32
-48 48 56
-184 80 80
-136 48 48
-72 24 8
-80 72 24
-80 72 80
-224 192 88
-120 96 48
-168 144 72
-184 192 200
-136 144 136
-240 224 176
-8 8 8
-104 104 112
+40 40 40
+56 56 72
+248 64 80
+160 32 56
+88 48 16
+112 80 0
+72 72 88
+248 208 0
+168 120 0
+200 152 0
+192 200 208
+144 144 160
+248 232 192
+0 0 0
+104 104 120
diff --git a/graphics/pokemon/glaceon/anim_front.png b/graphics/pokemon/glaceon/anim_front.png
index 06e9ac43d..a175e8a43 100644
Binary files a/graphics/pokemon/glaceon/anim_front.png and b/graphics/pokemon/glaceon/anim_front.png differ
diff --git a/graphics/pokemon/glaceon/front.png b/graphics/pokemon/glaceon/front.png
index 36dd1d595..463bd723d 100644
Binary files a/graphics/pokemon/glaceon/front.png and b/graphics/pokemon/glaceon/front.png differ
diff --git a/graphics/pokemon/glaceon/normal.pal b/graphics/pokemon/glaceon/normal.pal
index d3e2fcf42..bd4ad34a5 100644
--- a/graphics/pokemon/glaceon/normal.pal
+++ b/graphics/pokemon/glaceon/normal.pal
@@ -3,16 +3,16 @@ JASC-PAL
 16
 152 208 160
 80 112 120
-120 160 152
-160 224 224
+120 152 176
+144 224 232
 16 16 16
-16 56 64
-56 136 152
-88 184 200
-32 104 112
+56 56 80
+80 96 152
+80 152 216
+64 88 104
 232 248 248
-112 67 89
-163 107 137
+168 56 80
+224 104 120
 0 0 0
 0 0 0
 0 0 0
diff --git a/graphics/pokemon/glameow/anim_front.png b/graphics/pokemon/glameow/anim_front.png
index e2a988684..d03df5738 100644
Binary files a/graphics/pokemon/glameow/anim_front.png and b/graphics/pokemon/glameow/anim_front.png differ
diff --git a/graphics/pokemon/glameow/front.png b/graphics/pokemon/glameow/front.png
index 38d6b0688..bd72d82c1 100644
Binary files a/graphics/pokemon/glameow/front.png and b/graphics/pokemon/glameow/front.png differ
diff --git a/graphics/pokemon/glameow/normal.pal b/graphics/pokemon/glameow/normal.pal
index 3b80e4edd..82cb3f86e 100644
--- a/graphics/pokemon/glameow/normal.pal
+++ b/graphics/pokemon/glameow/normal.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-56 64 80
+64 64 80
 16 16 16
 248 248 248
 160 160 192
-184 200 216
+200 200 216
 88 112 136
-136 152 176
+136 152 184
 80 88 96
-168 88 112
-240 120 152
-168 184 192
+208 72 128
+248 120 152
+168 176 200
 104 80 112
-56 120 192
-240 192 88
+40 112 208
+248 216 112
 192 152 72
diff --git a/graphics/pokemon/gliscor/anim_front.png b/graphics/pokemon/gliscor/anim_front.png
index 136265168..8c12ed4ef 100644
Binary files a/graphics/pokemon/gliscor/anim_front.png and b/graphics/pokemon/gliscor/anim_front.png differ
diff --git a/graphics/pokemon/gliscor/front.png b/graphics/pokemon/gliscor/front.png
index fb9f0d640..24be70580 100644
Binary files a/graphics/pokemon/gliscor/front.png and b/graphics/pokemon/gliscor/front.png differ
diff --git a/graphics/pokemon/gliscor/normal.pal b/graphics/pokemon/gliscor/normal.pal
index 21465ec01..13b9917f1 100644
--- a/graphics/pokemon/gliscor/normal.pal
+++ b/graphics/pokemon/gliscor/normal.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-88 104 136
-144 152 200
-48 56 80
-176 184 208
-120 128 168
+88 96 160
+152 136 232
+40 48 96
+176 160 248
+112 120 192
 248 248 248
 16 16 16
-80 32 24
-160 48 48
-232 80 80
-152 128 24
-240 208 56
-48 56 64
-176 160 248
-152 80 112
+112 8 0
+168 32 48
+216 56 104
+168 144 0
+248 216 0
+64 64 80
+192 80 144
+104 104 120
diff --git a/graphics/pokemon/graveler/anim_front.png b/graphics/pokemon/graveler/anim_front.png
index 9f005c555..06680ed00 100644
Binary files a/graphics/pokemon/graveler/anim_front.png and b/graphics/pokemon/graveler/anim_front.png differ
diff --git a/graphics/pokemon/graveler/front.png b/graphics/pokemon/graveler/front.png
index e0c108286..359e642c4 100644
Binary files a/graphics/pokemon/graveler/front.png and b/graphics/pokemon/graveler/front.png differ
diff --git a/graphics/pokemon/graveler/normal.pal b/graphics/pokemon/graveler/normal.pal
index 5ab07fd2f..1c31789ba 100644
--- a/graphics/pokemon/graveler/normal.pal
+++ b/graphics/pokemon/graveler/normal.pal
@@ -2,14 +2,14 @@ JASC-PAL
 0100
 16
 152 208 160
-72 64 48
+72 63 48
 216 208 184
 176 176 152
 136 136 112
 104 104 80
-16 16 16
+15 15 15
 248 248 248
-192 72 64
+224 104 120
 0 0 0
 0 0 0
 0 0 0
diff --git a/graphics/pokemon/grotle/anim_front.png b/graphics/pokemon/grotle/anim_front.png
index f66f753c3..6a740b732 100644
Binary files a/graphics/pokemon/grotle/anim_front.png and b/graphics/pokemon/grotle/anim_front.png differ
diff --git a/graphics/pokemon/grotle/front.png b/graphics/pokemon/grotle/front.png
index cabbca1bb..f52ebe6d6 100644
Binary files a/graphics/pokemon/grotle/front.png and b/graphics/pokemon/grotle/front.png differ
diff --git a/graphics/pokemon/grotle/normal.pal b/graphics/pokemon/grotle/normal.pal
index 454c89615..2d4aec3e5 100644
--- a/graphics/pokemon/grotle/normal.pal
+++ b/graphics/pokemon/grotle/normal.pal
@@ -1,19 +1,259 @@
 JASC-PAL
 0100
-16
+256
 152 208 160
-64 128 64
+56 136 64
 56 88 40
-88 168 112
-16 16 16
-88 72 48
-168 120 72
-128 96 56
-208 176 56
-224 192 104
-96 128 72
-152 184 120
-120 168 96
+96 176 104
+16 16 24
+96 72 56
+176 128 80
+136 104 64
+216 176 64
+232 208 64
+104 136 72
+168 192 96
+144 168 88
 248 248 248
 208 208 208
 144 144 144
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/pokemon/happiny/anim_front.png b/graphics/pokemon/happiny/anim_front.png
index 91b987949..7ae898ab1 100644
Binary files a/graphics/pokemon/happiny/anim_front.png and b/graphics/pokemon/happiny/anim_front.png differ
diff --git a/graphics/pokemon/happiny/front.png b/graphics/pokemon/happiny/front.png
index 0d957955c..547c652ed 100644
Binary files a/graphics/pokemon/happiny/front.png and b/graphics/pokemon/happiny/front.png differ
diff --git a/graphics/pokemon/happiny/normal.pal b/graphics/pokemon/happiny/normal.pal
index 896e3ecd9..e7bbb9af5 100644
--- a/graphics/pokemon/happiny/normal.pal
+++ b/graphics/pokemon/happiny/normal.pal
@@ -2,16 +2,16 @@ JASC-PAL
 0100
 16
 152 208 160
-144 112 112
-192 136 144
-248 184 192
+160 88 120
+192 136 160
+248 192 208
 16 16 16
-104 72 80
-232 128 152
-160 96 104
+112 64 88
+216 104 152
+160 80 120
 248 248 248
-200 184 184
-224 192 192
+200 184 192
+192 192 192
 0 0 0
 0 0 0
 0 0 0
diff --git a/graphics/pokemon/heatran/anim_front.png b/graphics/pokemon/heatran/anim_front.png
index 086fc0460..afc5dbe41 100644
Binary files a/graphics/pokemon/heatran/anim_front.png and b/graphics/pokemon/heatran/anim_front.png differ
diff --git a/graphics/pokemon/heatran/front.png b/graphics/pokemon/heatran/front.png
index 5bff3348a..e446b445d 100644
Binary files a/graphics/pokemon/heatran/front.png and b/graphics/pokemon/heatran/front.png differ
diff --git a/graphics/pokemon/heatran/normal.pal b/graphics/pokemon/heatran/normal.pal
index f9a324244..fd73b92b3 100644
--- a/graphics/pokemon/heatran/normal.pal
+++ b/graphics/pokemon/heatran/normal.pal
@@ -3,17 +3,17 @@ JASC-PAL
 16
 152 208 160
 56 32 16
-96 48 24
-136 72 40
+128 64 88
+168 88 64
 24 24 24
 104 112 120
-224 224 200
-192 192 176
-192 104 32
-248 136 40
-152 136 136
+224 224 232
+192 192 192
+200 128 40
+248 160 16
+144 144 144
 248 248 248
-80 72 72
-176 80 32
-240 104 32
+80 80 80
+176 64 40
+248 80 56
 0 0 0
diff --git a/graphics/pokemon/hippopotas/anim_front.png b/graphics/pokemon/hippopotas/anim_front.png
index 8de30eae6..74eba5613 100644
Binary files a/graphics/pokemon/hippopotas/anim_front.png and b/graphics/pokemon/hippopotas/anim_front.png differ
diff --git a/graphics/pokemon/hippopotas/anim_frontf.png b/graphics/pokemon/hippopotas/anim_frontf.png
deleted file mode 100644
index 8a0b675bb..000000000
Binary files a/graphics/pokemon/hippopotas/anim_frontf.png and /dev/null differ
diff --git a/graphics/pokemon/hippopotas/back.png b/graphics/pokemon/hippopotas/back.png
index 0657cc93c..b34d3d720 100644
Binary files a/graphics/pokemon/hippopotas/back.png and b/graphics/pokemon/hippopotas/back.png differ
diff --git a/graphics/pokemon/hippopotas/backf.png b/graphics/pokemon/hippopotas/backf.png
deleted file mode 100644
index 1a7413613..000000000
Binary files a/graphics/pokemon/hippopotas/backf.png and /dev/null differ
diff --git a/graphics/pokemon/hippopotas/front.png b/graphics/pokemon/hippopotas/front.png
index 42a2b0fd4..ea6fc8584 100644
Binary files a/graphics/pokemon/hippopotas/front.png and b/graphics/pokemon/hippopotas/front.png differ
diff --git a/graphics/pokemon/hippopotas/normalf.pal b/graphics/pokemon/hippopotas/normal_f.pal
similarity index 100%
rename from graphics/pokemon/hippopotas/normalf.pal
rename to graphics/pokemon/hippopotas/normal_f.pal
diff --git a/graphics/pokemon/hippopotas/normal.pal b/graphics/pokemon/hippopotas/normal_m.pal
similarity index 100%
rename from graphics/pokemon/hippopotas/normal.pal
rename to graphics/pokemon/hippopotas/normal_m.pal
diff --git a/graphics/pokemon/hippopotas/shinyf.pal b/graphics/pokemon/hippopotas/shiny_f.pal
similarity index 100%
rename from graphics/pokemon/hippopotas/shinyf.pal
rename to graphics/pokemon/hippopotas/shiny_f.pal
diff --git a/graphics/pokemon/hippopotas/shiny.pal b/graphics/pokemon/hippopotas/shiny_m.pal
similarity index 100%
rename from graphics/pokemon/hippopotas/shiny.pal
rename to graphics/pokemon/hippopotas/shiny_m.pal
diff --git a/graphics/pokemon/hippowdon/backf.png b/graphics/pokemon/hippowdon/backf.png
deleted file mode 100644
index 1cfc725e9..000000000
Binary files a/graphics/pokemon/hippowdon/backf.png and /dev/null differ
diff --git a/graphics/pokemon/hippowdon/normalf.pal b/graphics/pokemon/hippowdon/normal_f.pal
similarity index 100%
rename from graphics/pokemon/hippowdon/normalf.pal
rename to graphics/pokemon/hippowdon/normal_f.pal
diff --git a/graphics/pokemon/hippowdon/normal.pal b/graphics/pokemon/hippowdon/normal_m.pal
similarity index 100%
rename from graphics/pokemon/hippowdon/normal.pal
rename to graphics/pokemon/hippowdon/normal_m.pal
diff --git a/graphics/pokemon/hippowdon/shinyf.pal b/graphics/pokemon/hippowdon/shiny_f.pal
similarity index 100%
rename from graphics/pokemon/hippowdon/shinyf.pal
rename to graphics/pokemon/hippowdon/shiny_f.pal
diff --git a/graphics/pokemon/hippowdon/shiny.pal b/graphics/pokemon/hippowdon/shiny_m.pal
similarity index 100%
rename from graphics/pokemon/hippowdon/shiny.pal
rename to graphics/pokemon/hippowdon/shiny_m.pal
diff --git a/graphics/pokemon/honchkrow/anim_front.png b/graphics/pokemon/honchkrow/anim_front.png
index d9047ae41..b7cff5cf2 100644
Binary files a/graphics/pokemon/honchkrow/anim_front.png and b/graphics/pokemon/honchkrow/anim_front.png differ
diff --git a/graphics/pokemon/honchkrow/front.png b/graphics/pokemon/honchkrow/front.png
index f86b5a6c5..9681f682f 100644
Binary files a/graphics/pokemon/honchkrow/front.png and b/graphics/pokemon/honchkrow/front.png differ
diff --git a/graphics/pokemon/honchkrow/normal.pal b/graphics/pokemon/honchkrow/normal.pal
index 03cfdeb00..4a46f2b32 100644
--- a/graphics/pokemon/honchkrow/normal.pal
+++ b/graphics/pokemon/honchkrow/normal.pal
@@ -1,19 +1,259 @@
 JASC-PAL
 0100
-16
+256
 152 208 160
-56 104 136
-32 64 88
-24 40 48
+64 96 152
+48 64 96
+40 40 64
 16 16 16
-72 16 16
-144 32 40
-160 136 64
-184 168 168
+72 32 32
+136 48 56
+168 144 56
+160 160 176
 248 248 248
-232 200 80
-208 48 64
-80 80 40
-240 232 224
-96 96 96
-56 56 56
+240 216 56
+216 80 88
+88 88 56
+232 232 240
+80 80 80
+48 48 56
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/pokemon/infernape/anim_front.png b/graphics/pokemon/infernape/anim_front.png
index 521883ce5..b808e3ab3 100644
Binary files a/graphics/pokemon/infernape/anim_front.png and b/graphics/pokemon/infernape/anim_front.png differ
diff --git a/graphics/pokemon/infernape/front.png b/graphics/pokemon/infernape/front.png
index 7177880c9..6bb4d332c 100644
Binary files a/graphics/pokemon/infernape/front.png and b/graphics/pokemon/infernape/front.png differ
diff --git a/graphics/pokemon/infernape/normal.pal b/graphics/pokemon/infernape/normal.pal
index e2f6bad8d..2a12ff6dc 100644
--- a/graphics/pokemon/infernape/normal.pal
+++ b/graphics/pokemon/infernape/normal.pal
@@ -1,19 +1,259 @@
 JASC-PAL
 0100
-16
+256
 152 208 160
-96 56 40
-40 64 96
+104 56 16
+24 64 120
 16 16 16
-128 96 24
-192 160 56
-224 72 56
-248 128 48
-64 112 152
-248 224 120
-168 96 64
-216 128 88
-184 184 176
-120 112 112
+128 88 8
+192 152 32
+224 56 64
+240 136 72
+56 112 160
+248 216 80
+160 96 64
+224 136 88
+184 192 216
+112 112 128
 248 248 248
 128 40 48
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/pokemon/kricketot/anim_front.png b/graphics/pokemon/kricketot/anim_front.png
index d8ea9fd56..7bf0fd397 100644
Binary files a/graphics/pokemon/kricketot/anim_front.png and b/graphics/pokemon/kricketot/anim_front.png differ
diff --git a/graphics/pokemon/kricketot/front.png b/graphics/pokemon/kricketot/front.png
index 5c7b05726..e158a0a79 100644
Binary files a/graphics/pokemon/kricketot/front.png and b/graphics/pokemon/kricketot/front.png differ
diff --git a/graphics/pokemon/kricketot/normal.pal b/graphics/pokemon/kricketot/normal.pal
index 1d3a0c765..290a5c95c 100644
--- a/graphics/pokemon/kricketot/normal.pal
+++ b/graphics/pokemon/kricketot/normal.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-64 64 72
-104 104 112
-136 144 152
+80 72 64
+120 112 96
+152 152 144
 16 16 16
-120 120 56
-248 232 176
+136 104 8
+248 232 168
 88 32 0
-176 64 40
-224 112 88
-216 184 120
-152 80 40
-128 48 24
+176 72 56
+224 104 96
+224 192 104
+144 80 24
+104 64 32
 0 0 0
 0 0 0
 0 0 0
diff --git a/graphics/pokemon/leafeon/anim_front.png b/graphics/pokemon/leafeon/anim_front.png
index d6b2958d4..b3e39fc61 100644
Binary files a/graphics/pokemon/leafeon/anim_front.png and b/graphics/pokemon/leafeon/anim_front.png differ
diff --git a/graphics/pokemon/leafeon/front.png b/graphics/pokemon/leafeon/front.png
index 9d6026250..7ea19f1b5 100644
Binary files a/graphics/pokemon/leafeon/front.png and b/graphics/pokemon/leafeon/front.png differ
diff --git a/graphics/pokemon/leafeon/normal.pal b/graphics/pokemon/leafeon/normal.pal
index d5c2bf08c..13308ab76 100644
--- a/graphics/pokemon/leafeon/normal.pal
+++ b/graphics/pokemon/leafeon/normal.pal
@@ -1,19 +1,259 @@
 JASC-PAL
 0100
-16
+256
 0 176 232
-56 112 80
-128 200 152
-80 160 112
+48 96 88
+104 184 136
+48 152 112
 16 16 16
-104 64 24
-176 104 32
+88 64 32
+144 96 48
 56 40 24
-88 88 64
-128 160 112
-248 224 160
-208 176 120
-128 104 72
-176 152 104
+96 80 64
+136 168 120
+232 208 152
+208 176 112
+128 104 64
+184 144 96
 232 248 248
+64 56 64
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
 0 0 0
diff --git a/graphics/pokemon/lickilicky/anim_front.png b/graphics/pokemon/lickilicky/anim_front.png
index 4583e6786..38f23ec49 100644
Binary files a/graphics/pokemon/lickilicky/anim_front.png and b/graphics/pokemon/lickilicky/anim_front.png differ
diff --git a/graphics/pokemon/lickilicky/front.png b/graphics/pokemon/lickilicky/front.png
index e13d04878..e9905f1a6 100644
Binary files a/graphics/pokemon/lickilicky/front.png and b/graphics/pokemon/lickilicky/front.png differ
diff --git a/graphics/pokemon/lickilicky/normal.pal b/graphics/pokemon/lickilicky/normal.pal
index f2b0888bc..4f8a5a0ce 100644
--- a/graphics/pokemon/lickilicky/normal.pal
+++ b/graphics/pokemon/lickilicky/normal.pal
@@ -1,19 +1,259 @@
 JASC-PAL
 0100
-16
+256
 152 208 160
-136 72 96
-176 96 112
+144 64 96
+184 80 112
 248 160 176
-224 120 144
+224 112 144
 16 16 16
-88 48 56
+96 40 56
 248 248 248
-128 64 64
-232 128 128
-176 96 96
-240 176 160
-200 184 176
-152 128 120
-240 208 96
-192 160 56
+144 56 64
+240 120 88
+192 88 88
+248 176 136
+208 200 216
+136 136 168
+248 224 120
+200 168 72
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/pokemon/lopunny/anim_front.png b/graphics/pokemon/lopunny/anim_front.png
index 96be9f7c1..5bef71243 100644
Binary files a/graphics/pokemon/lopunny/anim_front.png and b/graphics/pokemon/lopunny/anim_front.png differ
diff --git a/graphics/pokemon/lopunny/front.png b/graphics/pokemon/lopunny/front.png
index d039dceaf..44e188d0f 100644
Binary files a/graphics/pokemon/lopunny/front.png and b/graphics/pokemon/lopunny/front.png differ
diff --git a/graphics/pokemon/lopunny/normal.pal b/graphics/pokemon/lopunny/normal.pal
index 490c6c38d..712971742 100644
--- a/graphics/pokemon/lopunny/normal.pal
+++ b/graphics/pokemon/lopunny/normal.pal
@@ -5,15 +5,15 @@ JASC-PAL
 120 112 80
 248 224 160
 16 16 16
-80 56 48
-176 120 88
-136 88 56
+80 56 56
+176 120 72
+136 88 64
 120 56 64
 192 168 112
-176 96 104
+192 88 120
 96 72 64
 248 248 248
-224 120 136
+208 120 152
 0 0 0
 0 0 0
 0 0 0
diff --git a/graphics/pokemon/lucario/anim_front.png b/graphics/pokemon/lucario/anim_front.png
index 821008a00..3425fd37b 100644
Binary files a/graphics/pokemon/lucario/anim_front.png and b/graphics/pokemon/lucario/anim_front.png differ
diff --git a/graphics/pokemon/lucario/front.png b/graphics/pokemon/lucario/front.png
index 464c51971..c4b7a41c2 100644
Binary files a/graphics/pokemon/lucario/front.png and b/graphics/pokemon/lucario/front.png differ
diff --git a/graphics/pokemon/lucario/normal.pal b/graphics/pokemon/lucario/normal.pal
index b86db220c..87be39f7a 100644
--- a/graphics/pokemon/lucario/normal.pal
+++ b/graphics/pokemon/lucario/normal.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-40 64 80
-88 160 192
+16 72 120
+72 152 232
 16 16 16
-64 112 136
+40 112 152
 56 48 48
-80 80 80
-128 128 120
-200 200 200
-232 64 64
+88 88 88
+128 128 128
+208 208 208
+216 64 64
 248 248 248
-160 144 96
+224 224 152
 72 64 32
-248 216 144
-178 107 124
+176 176 96
+160 48 48
 0 0 0
diff --git a/graphics/pokemon/lumineon/anim_front.png b/graphics/pokemon/lumineon/anim_front.png
index b177ef90e..29ef5dd7b 100644
Binary files a/graphics/pokemon/lumineon/anim_front.png and b/graphics/pokemon/lumineon/anim_front.png differ
diff --git a/graphics/pokemon/lumineon/front.png b/graphics/pokemon/lumineon/front.png
index 9ba9095e3..3aae9837f 100644
Binary files a/graphics/pokemon/lumineon/front.png and b/graphics/pokemon/lumineon/front.png differ
diff --git a/graphics/pokemon/lumineon/normal.pal b/graphics/pokemon/lumineon/normal.pal
index cc07c568e..d7dbfc5ca 100644
--- a/graphics/pokemon/lumineon/normal.pal
+++ b/graphics/pokemon/lumineon/normal.pal
@@ -2,17 +2,17 @@ JASC-PAL
 0100
 16
 152 208 160
-80 120 120
+80 104 136
 16 16 16
-216 240 224
-144 224 216
-104 160 160
-48 72 80
-32 48 48
-136 56 96
-208 88 144
+192 224 240
+144 208 224
+112 144 168
+48 64 88
+40 40 56
+112 64 120
+192 72 144
 232 248 248
-32 48 48
+40 40 56
 0 0 0
 0 0 0
 0 0 0
diff --git a/graphics/pokemon/luxio/anim_front.png b/graphics/pokemon/luxio/anim_front.png
index 52d080c68..8b9ffd233 100644
Binary files a/graphics/pokemon/luxio/anim_front.png and b/graphics/pokemon/luxio/anim_front.png differ
diff --git a/graphics/pokemon/luxio/front.png b/graphics/pokemon/luxio/front.png
index 262b34256..f8a883afc 100644
Binary files a/graphics/pokemon/luxio/front.png and b/graphics/pokemon/luxio/front.png differ
diff --git a/graphics/pokemon/luxio/normal.pal b/graphics/pokemon/luxio/normal.pal
index f9d318695..54698e4f4 100644
--- a/graphics/pokemon/luxio/normal.pal
+++ b/graphics/pokemon/luxio/normal.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-112 88 32
-248 184 48
-184 136 32
+112 96 80
+248 224 88
+176 152 88
 16 16 16
-40 40 40
-72 64 72
-96 96 104
-48 80 104
-120 184 208
-80 128 144
+48 48 64
+72 72 96
+96 96 120
+72 72 112
+120 168 240
+96 120 176
 248 248 248
-184 56 48
-216 96 88
-165 104 134
+144 56 80
+224 72 80
+168 56 80
 0 0 0
diff --git a/graphics/pokemon/luxray/anim_front.png b/graphics/pokemon/luxray/anim_front.png
index ba7dd2239..93a073ce4 100644
Binary files a/graphics/pokemon/luxray/anim_front.png and b/graphics/pokemon/luxray/anim_front.png differ
diff --git a/graphics/pokemon/luxray/front.png b/graphics/pokemon/luxray/front.png
index 7e097b93b..12381ea36 100644
Binary files a/graphics/pokemon/luxray/front.png and b/graphics/pokemon/luxray/front.png differ
diff --git a/graphics/pokemon/luxray/normal.pal b/graphics/pokemon/luxray/normal.pal
index c45620af9..302dceb37 100644
--- a/graphics/pokemon/luxray/normal.pal
+++ b/graphics/pokemon/luxray/normal.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-104 88 32
-248 192 40
+112 96 80
+248 224 88
 16 16 16
-48 40 40
-96 96 104
-184 136 24
-72 64 72
-88 136 152
-104 184 208
-216 64 56
-152 48 40
-48 88 96
-117 80 103
-248 248 248
+48 48 64
+96 96 120
+176 152 88
+72 72 96
+96 120 176
+120 168 240
+224 72 80
+144 56 80
+72 72 112
+168 56 80
+0 0 0
 0 0 0
diff --git a/graphics/pokemon/magmortar/anim_front.png b/graphics/pokemon/magmortar/anim_front.png
index d49fea810..3f0531e11 100644
Binary files a/graphics/pokemon/magmortar/anim_front.png and b/graphics/pokemon/magmortar/anim_front.png differ
diff --git a/graphics/pokemon/magmortar/front.png b/graphics/pokemon/magmortar/front.png
index c367b03c6..38f46e85e 100644
Binary files a/graphics/pokemon/magmortar/front.png and b/graphics/pokemon/magmortar/front.png differ
diff --git a/graphics/pokemon/magmortar/normal.pal b/graphics/pokemon/magmortar/normal.pal
index ad6821883..3008ddcb6 100644
--- a/graphics/pokemon/magmortar/normal.pal
+++ b/graphics/pokemon/magmortar/normal.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-112 96 40
-248 192 80
-208 152 48
-192 64 40
-152 64 40
-232 112 80
-88 32 16
-216 80 48
+128 96 32
+248 192 56
+200 160 56
+208 48 48
+168 56 80
+240 96 48
+104 48 40
+224 64 48
 16 16 16
-248 144 136
-72 64 64
-200 96 88
-216 200 192
-248 248 248
+248 144 160
+72 72 64
+192 88 104
 200 208 224
+248 248 248
+0 0 0
diff --git a/graphics/pokemon/manaphy/anim_front.png b/graphics/pokemon/manaphy/anim_front.png
index 91d1cf799..b9934eee7 100644
Binary files a/graphics/pokemon/manaphy/anim_front.png and b/graphics/pokemon/manaphy/anim_front.png differ
diff --git a/graphics/pokemon/manaphy/front.png b/graphics/pokemon/manaphy/front.png
index 141d5ac17..89d3e030f 100644
Binary files a/graphics/pokemon/manaphy/front.png and b/graphics/pokemon/manaphy/front.png differ
diff --git a/graphics/pokemon/manaphy/normal.pal b/graphics/pokemon/manaphy/normal.pal
index d10258796..ff28c82cc 100644
--- a/graphics/pokemon/manaphy/normal.pal
+++ b/graphics/pokemon/manaphy/normal.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-64 160 184
-96 200 224
-56 120 136
+24 152 208
+104 192 240
+48 120 168
 16 16 16
-176 224 232
-32 88 112
-248 248 232
-248 216 144
-216 176 72
+152 224 248
+40 72 128
+200 232 248
+248 216 80
+224 168 80
 248 248 248
-160 32 32
-232 128 136
-208 64 64
-160 32 32
+168 56 40
+216 128 152
+224 64 16
+0 0 0
 0 0 0
diff --git a/graphics/pokemon/mantyke/anim_front.png b/graphics/pokemon/mantyke/anim_front.png
index 37bfbc816..9a3162211 100644
Binary files a/graphics/pokemon/mantyke/anim_front.png and b/graphics/pokemon/mantyke/anim_front.png differ
diff --git a/graphics/pokemon/mantyke/front.png b/graphics/pokemon/mantyke/front.png
index bd781d22b..b06a66d0a 100644
Binary files a/graphics/pokemon/mantyke/front.png and b/graphics/pokemon/mantyke/front.png differ
diff --git a/graphics/pokemon/mantyke/normal.pal b/graphics/pokemon/mantyke/normal.pal
index eb3114cf4..6b91b55cc 100644
--- a/graphics/pokemon/mantyke/normal.pal
+++ b/graphics/pokemon/mantyke/normal.pal
@@ -13,7 +13,7 @@ JASC-PAL
 72 96 112
 128 176 192
 96 144 160
-120 72 80
-208 136 144
+168 56 80
+224 104 120
 8 48 80
 208 216 224
diff --git a/graphics/pokemon/mesprit/anim_front.png b/graphics/pokemon/mesprit/anim_front.png
index 90fc9da6d..bd48e34c8 100644
Binary files a/graphics/pokemon/mesprit/anim_front.png and b/graphics/pokemon/mesprit/anim_front.png differ
diff --git a/graphics/pokemon/mesprit/front.png b/graphics/pokemon/mesprit/front.png
index 00f88ef29..0ca08f734 100644
Binary files a/graphics/pokemon/mesprit/front.png and b/graphics/pokemon/mesprit/front.png differ
diff --git a/graphics/pokemon/mesprit/normal.pal b/graphics/pokemon/mesprit/normal.pal
index 5e261f0e6..b6d67710a 100644
--- a/graphics/pokemon/mesprit/normal.pal
+++ b/graphics/pokemon/mesprit/normal.pal
@@ -3,17 +3,17 @@ JASC-PAL
 16
 152 208 160
 16 16 16
-104 56 80
-224 120 160
-248 160 184
-168 96 136
-224 104 96
+128 64 104
+232 112 168
+248 144 200
+176 80 128
+232 64 64
 88 56 64
-88 120 144
+120 112 144
 248 248 248
-168 208 240
-128 160 184
-176 48 48
-248 208 48
-176 144 24
-48 64 72
+176 200 240
+144 152 192
+168 64 64
+248 176 32
+168 136 64
+64 64 64
diff --git a/graphics/pokemon/mime_jr/anim_front.png b/graphics/pokemon/mime_jr/anim_front.png
index cbc2640af..bd97d354d 100644
Binary files a/graphics/pokemon/mime_jr/anim_front.png and b/graphics/pokemon/mime_jr/anim_front.png differ
diff --git a/graphics/pokemon/mime_jr/front.png b/graphics/pokemon/mime_jr/front.png
index 792bb0c50..c3519f6c9 100644
Binary files a/graphics/pokemon/mime_jr/front.png and b/graphics/pokemon/mime_jr/front.png differ
diff --git a/graphics/pokemon/mime_jr/normal.pal b/graphics/pokemon/mime_jr/normal.pal
index ee536e561..bd513b08b 100644
--- a/graphics/pokemon/mime_jr/normal.pal
+++ b/graphics/pokemon/mime_jr/normal.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-104 96 96
+104 96 104
 248 248 248
-216 208 200
-176 160 152
+216 208 216
+184 168 184
+0 0 0
+16 48 72
+16 72 112
+64 112 160
+104 56 48
+248 200 200
+216 160 160
+192 96 96
+192 32 72
+232 88 56
 0 0 0
-32 40 56
-64 80 96
-104 128 160
-96 64 72
-240 208 224
-208 160 176
-168 120 128
-168 64 48
-224 112 88
-144 80 88
diff --git a/graphics/pokemon/mismagius/anim_front.png b/graphics/pokemon/mismagius/anim_front.png
index 41643309d..4d86748a1 100644
Binary files a/graphics/pokemon/mismagius/anim_front.png and b/graphics/pokemon/mismagius/anim_front.png differ
diff --git a/graphics/pokemon/mismagius/front.png b/graphics/pokemon/mismagius/front.png
index cd6a67d65..5d68e8b70 100644
Binary files a/graphics/pokemon/mismagius/front.png and b/graphics/pokemon/mismagius/front.png differ
diff --git a/graphics/pokemon/mismagius/normal.pal b/graphics/pokemon/mismagius/normal.pal
index 9f98866ae..f013bf063 100644
--- a/graphics/pokemon/mismagius/normal.pal
+++ b/graphics/pokemon/mismagius/normal.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-112 40 96
-144 72 128
-208 120 184
-32 24 56
+88 64 96
+128 80 128
+176 96 176
+48 32 56
 16 16 16
-120 88 152
-80 56 104
-160 136 48
+104 72 144
+72 56 88
+200 152 0
 248 248 248
-152 72 72
-240 216 80
-224 104 96
-32 32 56
-224 104 96
+144 56 88
+240 216 56
+232 56 16
+0 0 0
+0 0 0
 0 0 0
diff --git a/graphics/pokemon/monferno/anim_front.png b/graphics/pokemon/monferno/anim_front.png
index 2c35e3b4a..7d4167c6b 100644
Binary files a/graphics/pokemon/monferno/anim_front.png and b/graphics/pokemon/monferno/anim_front.png differ
diff --git a/graphics/pokemon/monferno/front.png b/graphics/pokemon/monferno/front.png
index cff833cd4..08ac29b53 100644
Binary files a/graphics/pokemon/monferno/front.png and b/graphics/pokemon/monferno/front.png differ
diff --git a/graphics/pokemon/monferno/normal.pal b/graphics/pokemon/monferno/normal.pal
index 3d841fd2f..1418754a8 100644
--- a/graphics/pokemon/monferno/normal.pal
+++ b/graphics/pokemon/monferno/normal.pal
@@ -1,19 +1,259 @@
 JASC-PAL
 0100
-16
+256
 152 208 160
-184 56 48
-72 48 8
-120 88 64
-224 184 152
-144 96 32
-184 144 120
-200 120 48
-224 152 80
-24 80 112
-40 136 176
-200 192 184
+216 56 8
+88 48 16
+136 112 64
+232 200 168
+152 96 64
+192 152 120
+208 136 32
+232 160 64
+16 72 152
+8 120 192
+216 224 224
 16 16 16
 248 248 248
-240 192 48
+248 200 64
 96 96 112
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/pokemon/munchlax/anim_front.png b/graphics/pokemon/munchlax/anim_front.png
index 9fd77f96d..1174fb383 100644
Binary files a/graphics/pokemon/munchlax/anim_front.png and b/graphics/pokemon/munchlax/anim_front.png differ
diff --git a/graphics/pokemon/munchlax/front.png b/graphics/pokemon/munchlax/front.png
index e1115ff57..243df8dd0 100644
Binary files a/graphics/pokemon/munchlax/front.png and b/graphics/pokemon/munchlax/front.png differ
diff --git a/graphics/pokemon/munchlax/normal.pal b/graphics/pokemon/munchlax/normal.pal
index bb75ff127..a1adae6d6 100644
--- a/graphics/pokemon/munchlax/normal.pal
+++ b/graphics/pokemon/munchlax/normal.pal
@@ -1,19 +1,259 @@
 JASC-PAL
 0100
-16
+256
 152 208 160
-56 88 104
+32 88 112
 32 56 64
-72 120 152
+48 120 152
 16 16 16
-120 152 168
+48 144 176
 200 200 200
 248 248 248
-248 216 168
-192 160 128
+240 224 184
+216 168 136
 88 64 56
 112 112 120
 128 96 72
 160 128 112
-117 76 87
-209 150 171
+168 56 80
+224 104 120
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/pokemon/pachirisu/anim_front.png b/graphics/pokemon/pachirisu/anim_front.png
index 45d9f3843..8af3f81c8 100644
Binary files a/graphics/pokemon/pachirisu/anim_front.png and b/graphics/pokemon/pachirisu/anim_front.png differ
diff --git a/graphics/pokemon/pachirisu/front.png b/graphics/pokemon/pachirisu/front.png
index 0096f3f58..7d60cf8df 100644
Binary files a/graphics/pokemon/pachirisu/front.png and b/graphics/pokemon/pachirisu/front.png differ
diff --git a/graphics/pokemon/pachirisu/normal.pal b/graphics/pokemon/pachirisu/normal.pal
index 680ae079f..c8c18447f 100644
--- a/graphics/pokemon/pachirisu/normal.pal
+++ b/graphics/pokemon/pachirisu/normal.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-40 96 112
-128 208 216
-80 160 176
-112 120 136
-232 240 248
+72 64 88
+120 176 224
+96 120 152
+120 120 128
+240 240 240
 16 16 16
-184 200 208
-72 88 96
+200 192 192
+88 80 72
 248 208 96
-128 88 120
-176 160 80
-216 152 168
+128 80 56
+192 160 96
+232 128 88
 0 0 0
 0 0 0
 0 0 0
diff --git a/graphics/pokemon/palkia/anim_front.png b/graphics/pokemon/palkia/anim_front.png
index 3b408c2a6..73c70a694 100644
Binary files a/graphics/pokemon/palkia/anim_front.png and b/graphics/pokemon/palkia/anim_front.png differ
diff --git a/graphics/pokemon/palkia/front.png b/graphics/pokemon/palkia/front.png
index 16ae684d5..4e2d3f513 100644
Binary files a/graphics/pokemon/palkia/front.png and b/graphics/pokemon/palkia/front.png differ
diff --git a/graphics/pokemon/palkia/normal.pal b/graphics/pokemon/palkia/normal.pal
index 724a400a5..6dea576dc 100644
--- a/graphics/pokemon/palkia/normal.pal
+++ b/graphics/pokemon/palkia/normal.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-88 104 120
-136 120 128
-232 224 224
-184 160 168
+112 112 120
+160 152 176
+240 232 248
+208 184 216
 216 224 248
 176 184 216
 144 144 160
-176 96 176
-120 64 128
-40 48 72
+192 104 216
+136 80 144
+56 56 56
 240 232 248
 248 248 248
-200 112 136
+248 80 64
 16 16 16
 248 176 168
diff --git a/graphics/pokemon/phione/anim_front.png b/graphics/pokemon/phione/anim_front.png
index e86b7ce3d..a2b680ab0 100644
Binary files a/graphics/pokemon/phione/anim_front.png and b/graphics/pokemon/phione/anim_front.png differ
diff --git a/graphics/pokemon/phione/front.png b/graphics/pokemon/phione/front.png
index 6241787c0..10f7d01b5 100644
Binary files a/graphics/pokemon/phione/front.png and b/graphics/pokemon/phione/front.png differ
diff --git a/graphics/pokemon/phione/normal.pal b/graphics/pokemon/phione/normal.pal
index df7697ede..54af1570d 100644
--- a/graphics/pokemon/phione/normal.pal
+++ b/graphics/pokemon/phione/normal.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-48 120 136
-40 80 112
-104 192 200
+48 120 168
+56 80 152
+104 192 240
 16 16 16
-80 152 168
-168 224 216
-224 232 224
-32 112 160
+24 152 208
+152 224 248
+200 232 248
+24 104 216
 248 248 248
 72 80 104
-144 136 128
-160 32 32
-232 136 136
-208 64 64
+144 136 152
+168 56 40
+216 128 152
+224 64 16
 0 0 0
diff --git a/graphics/pokemon/piplup/anim_front.png b/graphics/pokemon/piplup/anim_front.png
index f029f576a..1ed77ba1d 100644
Binary files a/graphics/pokemon/piplup/anim_front.png and b/graphics/pokemon/piplup/anim_front.png differ
diff --git a/graphics/pokemon/piplup/front.png b/graphics/pokemon/piplup/front.png
index ada0b7ac5..c2ce15cdc 100644
Binary files a/graphics/pokemon/piplup/front.png and b/graphics/pokemon/piplup/front.png differ
diff --git a/graphics/pokemon/piplup/normal.pal b/graphics/pokemon/piplup/normal.pal
index cae959ee2..3f2fc38e2 100644
--- a/graphics/pokemon/piplup/normal.pal
+++ b/graphics/pokemon/piplup/normal.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-40 96 144
-32 64 104
-80 152 208
-48 120 184
-144 208 216
+32 96 152
+16 72 112
+104 160 224
+48 136 208
+152 208 240
 208 208 216
 248 248 248
 128 136 152
-112 160 184
+96 160 192
 16 16 16
-168 144 40
-248 224 144
-232 192 24
-96 80 24
+168 128 56
+248 224 192
+240 200 64
+96 72 16
 56 96 112
diff --git a/graphics/pokemon/porygon_z/anim_front.png b/graphics/pokemon/porygon_z/anim_front.png
index 7d6b66fc3..6ec9f0d12 100644
Binary files a/graphics/pokemon/porygon_z/anim_front.png and b/graphics/pokemon/porygon_z/anim_front.png differ
diff --git a/graphics/pokemon/porygon_z/front.png b/graphics/pokemon/porygon_z/front.png
index 71280133f..1f39bffa5 100644
Binary files a/graphics/pokemon/porygon_z/front.png and b/graphics/pokemon/porygon_z/front.png differ
diff --git a/graphics/pokemon/porygon_z/normal.pal b/graphics/pokemon/porygon_z/normal.pal
index a4c031833..1f4f3129c 100644
--- a/graphics/pokemon/porygon_z/normal.pal
+++ b/graphics/pokemon/porygon_z/normal.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-112 32 48
-160 48 72
-224 112 120
+88 56 72
+144 64 104
+232 88 96
 16 16 16
-208 80 96
-240 160 152
+184 72 104
+248 144 176
 248 248 248
-32 80 104
-48 120 152
-248 208 112
-160 208 208
-104 176 192
-104 88 72
-184 144 64
+48 56 96
+48 112 152
+248 208 96
+136 208 248
+72 152 208
+96 96 64
+176 144 72
 0 0 0
diff --git a/graphics/pokemon/prinplup/anim_front.png b/graphics/pokemon/prinplup/anim_front.png
index fd19649e1..b4180798f 100644
Binary files a/graphics/pokemon/prinplup/anim_front.png and b/graphics/pokemon/prinplup/anim_front.png differ
diff --git a/graphics/pokemon/prinplup/front.png b/graphics/pokemon/prinplup/front.png
index 9dd05921a..a4b84554d 100644
Binary files a/graphics/pokemon/prinplup/front.png and b/graphics/pokemon/prinplup/front.png differ
diff --git a/graphics/pokemon/prinplup/normal.pal b/graphics/pokemon/prinplup/normal.pal
index 8148637dd..ce088843c 100644
--- a/graphics/pokemon/prinplup/normal.pal
+++ b/graphics/pokemon/prinplup/normal.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-176 136 40
-128 104 32
-248 216 128
-232 184 80
+184 136 104
+120 80 64
+248 224 128
+232 200 96
 16 16 16
-32 56 104
-48 88 144
-112 160 168
-144 200 208
+32 64 104
+32 88 144
+96 152 240
+152 200 248
 216 232 248
 248 248 248
 56 120 176
-224 216 208
-120 176 184
-72 104 120
+184 200 216
+128 176 248
+0 0 0
diff --git a/graphics/pokemon/probopass/anim_front.png b/graphics/pokemon/probopass/anim_front.png
index b6e8b7b80..bcca97230 100644
Binary files a/graphics/pokemon/probopass/anim_front.png and b/graphics/pokemon/probopass/anim_front.png differ
diff --git a/graphics/pokemon/probopass/front.png b/graphics/pokemon/probopass/front.png
index 78303af59..21916b376 100644
Binary files a/graphics/pokemon/probopass/front.png and b/graphics/pokemon/probopass/front.png differ
diff --git a/graphics/pokemon/probopass/normal.pal b/graphics/pokemon/probopass/normal.pal
index fa756aabe..6a4d6d266 100644
--- a/graphics/pokemon/probopass/normal.pal
+++ b/graphics/pokemon/probopass/normal.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-88 48 48
+102 48 40
 16 16 16
-224 136 136
-200 88 88
-144 64 64
-56 48 48
+232 120 136
+224 88 96
+184 48 80
+40 56 72
 192 200 216
 248 248 248
-48 72 104
-72 104 136
-144 192 224
-88 136 176
-120 160 184
-80 72 72
+24 72 128
+56 96 168
+128 176 248
+88 120 208
+112 152 232
+56 72 88
 0 0 0
diff --git a/graphics/pokemon/purugly/anim_front.png b/graphics/pokemon/purugly/anim_front.png
index 12959a417..674df91b8 100644
Binary files a/graphics/pokemon/purugly/anim_front.png and b/graphics/pokemon/purugly/anim_front.png differ
diff --git a/graphics/pokemon/purugly/front.png b/graphics/pokemon/purugly/front.png
index c611eca72..4d8a5da49 100644
Binary files a/graphics/pokemon/purugly/front.png and b/graphics/pokemon/purugly/front.png differ
diff --git a/graphics/pokemon/purugly/normal.pal b/graphics/pokemon/purugly/normal.pal
index e7c17667a..4c9f993bd 100644
--- a/graphics/pokemon/purugly/normal.pal
+++ b/graphics/pokemon/purugly/normal.pal
@@ -3,17 +3,17 @@ JASC-PAL
 16
 152 208 160
 16 16 16
-144 104 168
-96 72 112
-136 152 176
-72 80 96
-184 96 120
-104 112 136
-240 128 160
-168 184 192
-248 240 240
-48 48 80
-176 152 88
-240 200 120
-208 192 192
-176 152 144
+120 88 160
+80 56 104
+128 144 176
+80 88 96
+208 80 136
+104 112 128
+248 120 152
+160 168 192
+232 248 248
+64 64 80
+168 160 112
+248 224 96
+200 200 216
+152 152 184
diff --git a/graphics/pokemon/rampardos/anim_front.png b/graphics/pokemon/rampardos/anim_front.png
index d00352823..3c912158e 100644
Binary files a/graphics/pokemon/rampardos/anim_front.png and b/graphics/pokemon/rampardos/anim_front.png differ
diff --git a/graphics/pokemon/rampardos/front.png b/graphics/pokemon/rampardos/front.png
index e81e6f927..09fa06dfb 100644
Binary files a/graphics/pokemon/rampardos/front.png and b/graphics/pokemon/rampardos/front.png differ
diff --git a/graphics/pokemon/rampardos/normal.pal b/graphics/pokemon/rampardos/normal.pal
index b2a2910d7..44bce97ad 100644
--- a/graphics/pokemon/rampardos/normal.pal
+++ b/graphics/pokemon/rampardos/normal.pal
@@ -1,19 +1,259 @@
 JASC-PAL
 0100
-16
+256
 152 208 160
-160 144 144
+120 128 128
 248 248 248
 16 16 16
-208 208 192
-56 128 192
+184 208 216
+56 128 208
 32 64 96
-56 56 64
-48 96 144
-128 176 200
-120 120 128
-88 80 88
-160 152 152
-232 112 96
-184 56 48
-152 80 80
+64 64 64
+32 88 160
+112 168 232
+128 128 120
+96 96 88
+152 152 144
+240 80 96
+176 40 48
+168 32 32
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/pokemon/regigigas/anim_front.png b/graphics/pokemon/regigigas/anim_front.png
index e040ff3f3..125b269d1 100644
Binary files a/graphics/pokemon/regigigas/anim_front.png and b/graphics/pokemon/regigigas/anim_front.png differ
diff --git a/graphics/pokemon/regigigas/front.png b/graphics/pokemon/regigigas/front.png
index d064a5e88..7cb87a1cc 100644
Binary files a/graphics/pokemon/regigigas/front.png and b/graphics/pokemon/regigigas/front.png differ
diff --git a/graphics/pokemon/regigigas/normal.pal b/graphics/pokemon/regigigas/normal.pal
index 7137dc686..4db68a825 100644
--- a/graphics/pokemon/regigigas/normal.pal
+++ b/graphics/pokemon/regigigas/normal.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-104 88 40
-56 128 80
-184 152 64
-240 208 112
+120 96 32
+32 128 104
+200 152 80
+248 216 88
 24 24 32
-64 168 112
+72 160 96
 32 80 48
-240 240 248
-64 56 56
+248 248 248
+56 72 88
 104 120 136
-208 200 208
-168 160 176
+216 200 216
+168 168 200
 232 64 40
-32 176 168
-128 120 120
+88 200 248
+104 120 136
diff --git a/graphics/pokemon/riolu/anim_front.png b/graphics/pokemon/riolu/anim_front.png
index a9a658a6e..091e0dd92 100644
Binary files a/graphics/pokemon/riolu/anim_front.png and b/graphics/pokemon/riolu/anim_front.png differ
diff --git a/graphics/pokemon/riolu/front.png b/graphics/pokemon/riolu/front.png
index 4b3fd126a..fbba5f54b 100644
Binary files a/graphics/pokemon/riolu/front.png and b/graphics/pokemon/riolu/front.png differ
diff --git a/graphics/pokemon/riolu/normal.pal b/graphics/pokemon/riolu/normal.pal
index ce1aff2b5..e19d06c53 100644
--- a/graphics/pokemon/riolu/normal.pal
+++ b/graphics/pokemon/riolu/normal.pal
@@ -3,17 +3,17 @@ JASC-PAL
 16
 152 208 160
 16 16 16
-40 64 88
-56 112 136
-88 160 184
+16 72 120
+40 112 152
+72 152 232
 56 56 56
 88 88 88
-160 64 24
-232 88 16
+160 48 48
+216 64 64
 248 248 248
-128 120 80
-240 208 136
+136 128 56
+216 192 112
 128 128 128
 176 176 176
-112 72 80
-232 127 127
+224 104 120
+168 56 80
diff --git a/graphics/pokemon/roserade/anim_front.png b/graphics/pokemon/roserade/anim_front.png
index d83256932..b34276d0e 100644
Binary files a/graphics/pokemon/roserade/anim_front.png and b/graphics/pokemon/roserade/anim_front.png differ
diff --git a/graphics/pokemon/roserade/front.png b/graphics/pokemon/roserade/front.png
index 016046f4e..34c283b96 100644
Binary files a/graphics/pokemon/roserade/front.png and b/graphics/pokemon/roserade/front.png differ
diff --git a/graphics/pokemon/roserade/normal.pal b/graphics/pokemon/roserade/normal.pal
index 64b594ca5..329cc52ac 100644
--- a/graphics/pokemon/roserade/normal.pal
+++ b/graphics/pokemon/roserade/normal.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 120 208 240
-104 160 136
-240 240 248
-184 200 224
-40 72 48
-64 120 80
+112 152 136
+248 248 248
+208 200 216
+40 80 80
+40 120 80
 0 0 0
-88 160 104
-224 200 104
-168 64 88
-112 48 64
-240 96 120
-152 216 168
-56 80 120
-104 136 208
-64 96 176
+56 152 96
+240 208 72
+184 64 104
+120 56 88
+248 96 128
+160 224 168
+64 72 128
+80 112 232
+72 88 184
diff --git a/graphics/pokemon/rotom/anim_front.png b/graphics/pokemon/rotom/anim_front.png
index 4f680637e..1579cd386 100644
Binary files a/graphics/pokemon/rotom/anim_front.png and b/graphics/pokemon/rotom/anim_front.png differ
diff --git a/graphics/pokemon/rotom/fan/anim_front.png b/graphics/pokemon/rotom/fan/anim_front.png
index b73f33893..aea9383a6 100644
Binary files a/graphics/pokemon/rotom/fan/anim_front.png and b/graphics/pokemon/rotom/fan/anim_front.png differ
diff --git a/graphics/pokemon/rotom/fan/front.png b/graphics/pokemon/rotom/fan/front.png
index ddb10b0b8..30f58175e 100644
Binary files a/graphics/pokemon/rotom/fan/front.png and b/graphics/pokemon/rotom/fan/front.png differ
diff --git a/graphics/pokemon/rotom/fan/normal.pal b/graphics/pokemon/rotom/fan/normal.pal
index 21ca78cf3..dbeac9367 100644
--- a/graphics/pokemon/rotom/fan/normal.pal
+++ b/graphics/pokemon/rotom/fan/normal.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-200 152 80
-240 208 112
-248 232 168
+208 168 0
+248 224 88
+248 232 160
 248 248 248
-176 88 48
+192 72 24
 120 56 32
-248 112 64
-248 160 128
+232 112 40
+248 168 128
 16 16 16
-88 80 96
+72 72 80
 184 184 184
-248 192 136
-208 136 56
-48 40 40
+248 216 112
+224 112 24
+40 40 40
 0 0 0
diff --git a/graphics/pokemon/rotom/front.png b/graphics/pokemon/rotom/front.png
index 2c99d4afc..f6141a709 100644
Binary files a/graphics/pokemon/rotom/front.png and b/graphics/pokemon/rotom/front.png differ
diff --git a/graphics/pokemon/rotom/frost/anim_front.png b/graphics/pokemon/rotom/frost/anim_front.png
index 9b1266cfc..019aa481e 100644
Binary files a/graphics/pokemon/rotom/frost/anim_front.png and b/graphics/pokemon/rotom/frost/anim_front.png differ
diff --git a/graphics/pokemon/rotom/frost/front.png b/graphics/pokemon/rotom/frost/front.png
index 1e91c6915..d94fd9376 100644
Binary files a/graphics/pokemon/rotom/frost/front.png and b/graphics/pokemon/rotom/frost/front.png differ
diff --git a/graphics/pokemon/rotom/frost/normal.pal b/graphics/pokemon/rotom/frost/normal.pal
index 6e774c738..9844e99f6 100644
--- a/graphics/pokemon/rotom/frost/normal.pal
+++ b/graphics/pokemon/rotom/frost/normal.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-144 104 168
-168 136 192
-176 88 48
+176 80 200
+200 112 248
+192 72 24
 120 56 32
-248 160 128
-248 112 64
+248 168 128
+232 112 40
 16 16 16
 248 248 248
-176 152 192
-120 88 152
+144 128 216
+104 56 168
 184 184 184
-80 72 72
+72 72 80
 0 0 0
 0 0 0
 0 0 0
diff --git a/graphics/pokemon/rotom/heat/anim_front.png b/graphics/pokemon/rotom/heat/anim_front.png
index 6172556cc..5d96fda88 100644
Binary files a/graphics/pokemon/rotom/heat/anim_front.png and b/graphics/pokemon/rotom/heat/anim_front.png differ
diff --git a/graphics/pokemon/rotom/heat/front.png b/graphics/pokemon/rotom/heat/front.png
index fb519b2e5..59878b8bb 100644
Binary files a/graphics/pokemon/rotom/heat/front.png and b/graphics/pokemon/rotom/heat/front.png differ
diff --git a/graphics/pokemon/rotom/heat/normal.pal b/graphics/pokemon/rotom/heat/normal.pal
index 09854ef92..f03c9ec60 100644
--- a/graphics/pokemon/rotom/heat/normal.pal
+++ b/graphics/pokemon/rotom/heat/normal.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-168 32 64
-224 72 72
-240 136 136
+184 40 40
+248 64 48
+248 152 144
 248 248 248
-176 88 48
+192 72 24
 120 56 32
-248 112 64
-248 160 128
+232 112 40
+248 168 128
 184 184 184
-232 128 128
-200 64 56
+248 112 112
+200 48 56
 16 16 16
-56 56 56
-120 120 128
+40 40 40
+72 72 80
 0 0 0
diff --git a/graphics/pokemon/rotom/mow/anim_front.png b/graphics/pokemon/rotom/mow/anim_front.png
index 93c327839..550ddfc73 100644
Binary files a/graphics/pokemon/rotom/mow/anim_front.png and b/graphics/pokemon/rotom/mow/anim_front.png differ
diff --git a/graphics/pokemon/rotom/mow/front.png b/graphics/pokemon/rotom/mow/front.png
index 302f1af1d..41031736f 100644
Binary files a/graphics/pokemon/rotom/mow/front.png and b/graphics/pokemon/rotom/mow/front.png differ
diff --git a/graphics/pokemon/rotom/mow/normal.pal b/graphics/pokemon/rotom/mow/normal.pal
index 7d59d2267..f199d83f9 100644
--- a/graphics/pokemon/rotom/mow/normal.pal
+++ b/graphics/pokemon/rotom/mow/normal.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-64 152 56
-144 184 72
-176 88 48
+0 152 0
+0 200 0
+192 72 24
 120 56 32
-248 112 64
-248 160 128
+232 112 40
+248 168 128
 16 16 16
-80 72 80
+72 72 80
 248 248 248
-160 192 104
-192 184 176
-120 160 56
-184 216 144
+32 176 80
+184 184 184
+8 120 64
+136 240 168
 40 40 40
 0 0 0
diff --git a/graphics/pokemon/rotom/normal.pal b/graphics/pokemon/rotom/normal.pal
index 172105d9c..dc8026c5d 100644
--- a/graphics/pokemon/rotom/normal.pal
+++ b/graphics/pokemon/rotom/normal.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-104 160 176
-112 200 200
-176 88 48
+40 168 184
+88 192 184
+192 72 24
 120 56 32
-248 112 64
-248 160 128
+232 112 40
+248 168 128
 16 16 16
 248 248 248
 184 184 184
-96 152 232
-24 88 160
-176 232 232
+48 120 232
+8 64 168
+184 240 232
 72 72 80
 0 0 0
 0 0 0
diff --git a/graphics/pokemon/rotom/wash/anim_front.png b/graphics/pokemon/rotom/wash/anim_front.png
index f526b215e..d0e54071c 100644
Binary files a/graphics/pokemon/rotom/wash/anim_front.png and b/graphics/pokemon/rotom/wash/anim_front.png differ
diff --git a/graphics/pokemon/rotom/wash/front.png b/graphics/pokemon/rotom/wash/front.png
index 8c01db3c5..5313d0302 100644
Binary files a/graphics/pokemon/rotom/wash/front.png and b/graphics/pokemon/rotom/wash/front.png differ
diff --git a/graphics/pokemon/rotom/wash/normal.pal b/graphics/pokemon/rotom/wash/normal.pal
index 1070cb148..d7ae28e2b 100644
--- a/graphics/pokemon/rotom/wash/normal.pal
+++ b/graphics/pokemon/rotom/wash/normal.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-32 144 168
-48 168 192
-176 88 48
-248 112 64
+8 72 192
+72 120 248
+192 72 24
+232 112 40
 120 56 32
-248 160 128
+248 168 128
 248 248 248
 184 184 184
-104 192 216
+48 120 232
 16 16 16
-136 208 224
-80 80 72
-48 48 48
-32 144 168
-0 0 0
+136 184 240
+72 72 80
+8 64 168
+40 40 40
+8 72 192
diff --git a/graphics/pokemon/shaymin/anim_front.png b/graphics/pokemon/shaymin/anim_front.png
index e59994d74..82ae30626 100644
Binary files a/graphics/pokemon/shaymin/anim_front.png and b/graphics/pokemon/shaymin/anim_front.png differ
diff --git a/graphics/pokemon/shaymin/front.png b/graphics/pokemon/shaymin/front.png
index 069bee40d..f8e316903 100644
Binary files a/graphics/pokemon/shaymin/front.png and b/graphics/pokemon/shaymin/front.png differ
diff --git a/graphics/pokemon/shaymin/normal.pal b/graphics/pokemon/shaymin/normal.pal
index 3af83a641..53068c4d6 100644
--- a/graphics/pokemon/shaymin/normal.pal
+++ b/graphics/pokemon/shaymin/normal.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-120 152 80
-80 104 56
-168 200 96
+136 168 96
+88 112 64
+168 216 96
 248 216 96
-128 72 88
-232 144 136
+128 72 104
+232 136 160
 80 80 104
 184 192 208
 248 248 248
 16 16 16
 64 152 56
-216 112 128
+200 104 136
 32 112 48
 32 56 40
 144 144 176
diff --git a/graphics/pokemon/shaymin/sky/anim_front.png b/graphics/pokemon/shaymin/sky/anim_front.png
index 0cb7a632b..541477651 100644
Binary files a/graphics/pokemon/shaymin/sky/anim_front.png and b/graphics/pokemon/shaymin/sky/anim_front.png differ
diff --git a/graphics/pokemon/shaymin/sky/front.png b/graphics/pokemon/shaymin/sky/front.png
index 0b544105f..190c4ebf6 100644
Binary files a/graphics/pokemon/shaymin/sky/front.png and b/graphics/pokemon/shaymin/sky/front.png differ
diff --git a/graphics/pokemon/shaymin/sky/normal.pal b/graphics/pokemon/shaymin/sky/normal.pal
index 07f4e6401..2b71401c1 100644
--- a/graphics/pokemon/shaymin/sky/normal.pal
+++ b/graphics/pokemon/shaymin/sky/normal.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-136 168 80
-88 104 56
-176 200 120
-160 136 160
-72 64 56
+120 168 32
+56 104 16
+152 208 32
+144 144 168
+80 80 88
 16 16 16
-248 240 232
-216 192 184
+248 248 248
+200 200 208
 248 248 248
 56 120 48
 120 168 88
-160 64 64
-216 80 80
-112 48 40
+184 72 88
+240 72 64
+120 56 80
 0 0 0
diff --git a/graphics/pokemon/shellos/anim_front.png b/graphics/pokemon/shellos/anim_front.png
index 3d39bc795..f548e886c 100644
Binary files a/graphics/pokemon/shellos/anim_front.png and b/graphics/pokemon/shellos/anim_front.png differ
diff --git a/graphics/pokemon/shellos/east_sea/anim_front.png b/graphics/pokemon/shellos/east_sea/anim_front.png
index db306c3cd..0ba327803 100644
Binary files a/graphics/pokemon/shellos/east_sea/anim_front.png and b/graphics/pokemon/shellos/east_sea/anim_front.png differ
diff --git a/graphics/pokemon/shellos/east_sea/front.png b/graphics/pokemon/shellos/east_sea/front.png
index 4700dca46..79d1c97cc 100644
Binary files a/graphics/pokemon/shellos/east_sea/front.png and b/graphics/pokemon/shellos/east_sea/front.png differ
diff --git a/graphics/pokemon/shellos/east_sea/normal.pal b/graphics/pokemon/shellos/east_sea/normal.pal
index 64d5e8fd9..82ebd332f 100644
--- a/graphics/pokemon/shellos/east_sea/normal.pal
+++ b/graphics/pokemon/shellos/east_sea/normal.pal
@@ -6,14 +6,14 @@ JASC-PAL
 206 211 186
 255 255 255
 16 16 16
-50 185 209
-45 96 114
-123 224 207
-52 137 150
-247 223 118
-168 148 67
+104 176 240
+80 80 120
+128 224 248
+104 120 168
+248 224 112
+160 136 56
 89 82 53
 131 153 76
 76 91 41
-182 209 119
+176 208 120
 0 0 0
diff --git a/graphics/pokemon/shellos/front.png b/graphics/pokemon/shellos/front.png
index 0eab6cf86..0d1be14f6 100644
Binary files a/graphics/pokemon/shellos/front.png and b/graphics/pokemon/shellos/front.png differ
diff --git a/graphics/pokemon/shellos/normal.pal b/graphics/pokemon/shellos/normal.pal
index 55212a56b..2eee3d9bb 100644
--- a/graphics/pokemon/shellos/normal.pal
+++ b/graphics/pokemon/shellos/normal.pal
@@ -1,19 +1,259 @@
 JASC-PAL
 0100
-16
+256
 152 208 160
-120 56 96
+112 64 104
 16 16 16
-240 136 184
-216 80 144
+248 136 192
+224 80 160
 104 56 80
-168 96 128
-240 184 184
-240 216 112
-168 144 64
+168 96 144
+248 176 224
+248 216 112
+160 136 56
 248 248 248
-88 80 48
-200 176 176
-128 112 112
+80 72 56
+176 176 192
+112 112 120
 232 232 232
-160 64 120
+168 48 136
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/pokemon/shieldon/anim_front.png b/graphics/pokemon/shieldon/anim_front.png
index 5ce78d198..43e59272e 100644
Binary files a/graphics/pokemon/shieldon/anim_front.png and b/graphics/pokemon/shieldon/anim_front.png differ
diff --git a/graphics/pokemon/shinx/anim_front.png b/graphics/pokemon/shinx/anim_front.png
index 33a28bf20..c46f6c259 100644
Binary files a/graphics/pokemon/shinx/anim_front.png and b/graphics/pokemon/shinx/anim_front.png differ
diff --git a/graphics/pokemon/shinx/front.png b/graphics/pokemon/shinx/front.png
index a14872017..f6d437c6e 100644
Binary files a/graphics/pokemon/shinx/front.png and b/graphics/pokemon/shinx/front.png differ
diff --git a/graphics/pokemon/shinx/normal.pal b/graphics/pokemon/shinx/normal.pal
index 467dbc775..78ad0357e 100644
--- a/graphics/pokemon/shinx/normal.pal
+++ b/graphics/pokemon/shinx/normal.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-48 80 88
-80 128 144
-104 184 200
-96 88 48
+64 64 104
+96 120 176
+120 168 240
+112 96 80
 16 16 16
-192 144 32
-248 192 48
+176 152 88
+248 224 88
 248 248 248
-240 96 96
-144 48 48
-80 80 88
-48 48 48
-147 88 104
+224 72 80
+144 56 80
+72 72 96
+48 48 64
+224 104 120
 0 0 0
 0 0 0
diff --git a/graphics/pokemon/skorupi/anim_front.png b/graphics/pokemon/skorupi/anim_front.png
index bf20b1b24..2120db4b0 100644
Binary files a/graphics/pokemon/skorupi/anim_front.png and b/graphics/pokemon/skorupi/anim_front.png differ
diff --git a/graphics/pokemon/skorupi/front.png b/graphics/pokemon/skorupi/front.png
index 0395737ac..480051932 100644
Binary files a/graphics/pokemon/skorupi/front.png and b/graphics/pokemon/skorupi/front.png differ
diff --git a/graphics/pokemon/skorupi/normal.pal b/graphics/pokemon/skorupi/normal.pal
index 1c98bdc25..4b71afccb 100644
--- a/graphics/pokemon/skorupi/normal.pal
+++ b/graphics/pokemon/skorupi/normal.pal
@@ -2,16 +2,16 @@ JASC-PAL
 0100
 16
 152 208 160
-136 112 104
-248 248 240
+136 136 136
+248 248 248
 16 16 16
-56 64 120
-224 208 200
+64 64 112
+208 208 224
 104 120 176
-152 168 216
-200 176 168
-40 32 80
-88 104 152
+144 152 232
+176 176 208
+40 40 48
+104 104 176
 40 96 112
 48 168 184
 40 40 48
diff --git a/graphics/pokemon/skuntank/anim_front.png b/graphics/pokemon/skuntank/anim_front.png
index b9172b0f5..52caa25ad 100644
Binary files a/graphics/pokemon/skuntank/anim_front.png and b/graphics/pokemon/skuntank/anim_front.png differ
diff --git a/graphics/pokemon/skuntank/front.png b/graphics/pokemon/skuntank/front.png
index a6d0f5f8b..d188535e2 100644
Binary files a/graphics/pokemon/skuntank/front.png and b/graphics/pokemon/skuntank/front.png differ
diff --git a/graphics/pokemon/skuntank/normal.pal b/graphics/pokemon/skuntank/normal.pal
index e42858906..c76b89826 100644
--- a/graphics/pokemon/skuntank/normal.pal
+++ b/graphics/pokemon/skuntank/normal.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-72 48 72
-136 112 144
-96 72 112
+72 56 96
+136 112 176
+104 80 136
 16 16 16
-48 24 56
-176 152 128
-248 224 168
-88 80 64
+48 40 64
+176 152 120
+232 216 168
+96 88 64
 248 248 248
-184 200 208
-160 80 40
-232 120 72
-120 56 24
-152 88 96
-232 136 136
+176 176 208
+176 88 48
+240 136 72
+128 72 48
+104 96 112
+0 0 0
diff --git a/graphics/pokemon/snover/anim_front.png b/graphics/pokemon/snover/anim_front.png
index 6b510dcab..f666d58b3 100644
Binary files a/graphics/pokemon/snover/anim_front.png and b/graphics/pokemon/snover/anim_front.png differ
diff --git a/graphics/pokemon/snover/front.png b/graphics/pokemon/snover/front.png
index e11a3b995..9dff7b2a5 100644
Binary files a/graphics/pokemon/snover/front.png and b/graphics/pokemon/snover/front.png differ
diff --git a/graphics/pokemon/snover/normal.pal b/graphics/pokemon/snover/normal.pal
index 5a37debe8..ba3cd07ba 100644
--- a/graphics/pokemon/snover/normal.pal
+++ b/graphics/pokemon/snover/normal.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 168 224 24
-128 160 184
-88 112 136
+144 160 168
+104 120 128
 248 248 248
-16 16 16
-184 208 224
-40 72 80
-96 160 144
-64 120 112
-128 200 176
-80 72 56
-112 104 80
-152 128 104
-64 120 112
+32 32 40
+200 216 216
+40 88 88
+72 152 136
+56 112 120
+136 208 168
+88 72 64
+112 88 72
+136 112 80
+56 112 120
 0 0 0
 0 0 0
diff --git a/graphics/pokemon/spiritomb/anim_front.png b/graphics/pokemon/spiritomb/anim_front.png
index 6a70d9239..8342c4220 100644
Binary files a/graphics/pokemon/spiritomb/anim_front.png and b/graphics/pokemon/spiritomb/anim_front.png differ
diff --git a/graphics/pokemon/spiritomb/front.png b/graphics/pokemon/spiritomb/front.png
index e2ad070a8..bcfd704f6 100644
Binary files a/graphics/pokemon/spiritomb/front.png and b/graphics/pokemon/spiritomb/front.png differ
diff --git a/graphics/pokemon/spiritomb/normal.pal b/graphics/pokemon/spiritomb/normal.pal
index 4f53eb76c..dab2569fa 100644
--- a/graphics/pokemon/spiritomb/normal.pal
+++ b/graphics/pokemon/spiritomb/normal.pal
@@ -1,19 +1,259 @@
 JASC-PAL
 0100
-16
+256
 152 208 160
-208 136 168
-160 104 128
-88 184 64
-152 208 128
-240 224 120
-56 96 48
-80 120 56
+192 112 184
+160 80 152
+96 176 64
+184 208 64
+248 216 16
+48 96 72
+72 136 64
 16 16 16
 48 64 48
-120 72 96
-104 64 80
-80 72 64
-184 160 136
-152 136 112
-136 112 96
+112 72 120
+80 64 104
+80 64 80
+176 152 144
+152 128 104
+128 104 96
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/pokemon/squirtle/anim_front.png b/graphics/pokemon/squirtle/anim_front.png
index 3011a16b5..b125bbdfb 100644
Binary files a/graphics/pokemon/squirtle/anim_front.png and b/graphics/pokemon/squirtle/anim_front.png differ
diff --git a/graphics/pokemon/squirtle/front.png b/graphics/pokemon/squirtle/front.png
index d9ca675f9..f8854997d 100644
Binary files a/graphics/pokemon/squirtle/front.png and b/graphics/pokemon/squirtle/front.png differ
diff --git a/graphics/pokemon/squirtle/normal.pal b/graphics/pokemon/squirtle/normal.pal
index bca08ac41..c66f21e48 100644
--- a/graphics/pokemon/squirtle/normal.pal
+++ b/graphics/pokemon/squirtle/normal.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-88 168 208
-48 128 168
-128 232 248
-104 200 240
+72 160 200
+40 104 144
+128 216 248
+112 192 240
 16 16 16
 208 200 200
 248 248 248
 200 40 48
 88 64 32
 176 96 16
-160 144 104
-200 184 136
-232 216 176
+160 128 48
+200 168 88
+240 224 136
 80 48 40
 208 112 16
diff --git a/graphics/pokemon/staraptor/anim_front.png b/graphics/pokemon/staraptor/anim_front.png
index 33c16a688..4620e6cfd 100644
Binary files a/graphics/pokemon/staraptor/anim_front.png and b/graphics/pokemon/staraptor/anim_front.png differ
diff --git a/graphics/pokemon/staraptor/front.png b/graphics/pokemon/staraptor/front.png
index 5387fee5f..dbb5a2f95 100644
Binary files a/graphics/pokemon/staraptor/front.png and b/graphics/pokemon/staraptor/front.png differ
diff --git a/graphics/pokemon/staraptor/normal.pal b/graphics/pokemon/staraptor/normal.pal
index bbe481816..0e4196241 100644
--- a/graphics/pokemon/staraptor/normal.pal
+++ b/graphics/pokemon/staraptor/normal.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-48 40 40
-112 96 88
+56 56 56
+120 104 120
 16 16 16
-80 72 64
-168 56 40
-232 88 64
-64 48 56
-144 112 128
-104 88 88
-184 176 168
-240 232 232
-112 80 40
-248 168 88
-192 120 56
+88 80 88
+152 64 64
+240 80 64
+80 56 72
+152 128 136
+112 88 96
+176 176 176
+248 248 248
+120 64 32
+248 144 40
+184 96 0
 0 0 0
diff --git a/graphics/pokemon/staravia/anim_front.png b/graphics/pokemon/staravia/anim_front.png
index fc451c052..5f8db161d 100644
Binary files a/graphics/pokemon/staravia/anim_front.png and b/graphics/pokemon/staravia/anim_front.png differ
diff --git a/graphics/pokemon/staravia/front.png b/graphics/pokemon/staravia/front.png
index ce01062ba..bd7c8ab4f 100644
Binary files a/graphics/pokemon/staravia/front.png and b/graphics/pokemon/staravia/front.png differ
diff --git a/graphics/pokemon/staravia/normal.pal b/graphics/pokemon/staravia/normal.pal
index ec0bd1984..f57c2fd0b 100644
--- a/graphics/pokemon/staravia/normal.pal
+++ b/graphics/pokemon/staravia/normal.pal
@@ -3,17 +3,17 @@ JASC-PAL
 16
 152 208 160
 56 40 40
-88 80 72
+88 80 88
 16 16 16
-160 128 128
+152 128 136
 240 240 240
-168 184 192
-192 96 32
-224 128 72
-128 64 24
-112 88 88
-56 48 56
-147 99 111
+176 176 176
+184 96 0
+248 144 40
+120 64 32
+112 88 96
+56 56 56
+248 88 64
 0 0 0
 0 0 0
 0 0 0
diff --git a/graphics/pokemon/starly/anim_front.png b/graphics/pokemon/starly/anim_front.png
index d05ad5d57..1235ff408 100644
Binary files a/graphics/pokemon/starly/anim_front.png and b/graphics/pokemon/starly/anim_front.png differ
diff --git a/graphics/pokemon/starly/back.png b/graphics/pokemon/starly/back.png
index 96d3309ce..89148bc9f 100644
Binary files a/graphics/pokemon/starly/back.png and b/graphics/pokemon/starly/back.png differ
diff --git a/graphics/pokemon/starly/front.png b/graphics/pokemon/starly/front.png
index 28aa86e57..c188a7ff5 100644
Binary files a/graphics/pokemon/starly/front.png and b/graphics/pokemon/starly/front.png differ
diff --git a/graphics/pokemon/starly/normal.pal b/graphics/pokemon/starly/normal.pal
index ae7a09f36..2d0c723a3 100644
--- a/graphics/pokemon/starly/normal.pal
+++ b/graphics/pokemon/starly/normal.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-80 64 56
+80 72 72
 16 16 16
-112 96 96
+136 112 112
 24 24 32
 184 176 168
 248 248 248
-224 216 208
+208 216 216
 120 72 24
 240 128 56
 176 88 40
-152 128 128
+168 152 152
 112 88 88
 112 96 96
-144 96 104
+248 80 64
 0 0 0
diff --git a/graphics/pokemon/stunky/anim_front.png b/graphics/pokemon/stunky/anim_front.png
index df7adec82..2463e0b8d 100644
Binary files a/graphics/pokemon/stunky/anim_front.png and b/graphics/pokemon/stunky/anim_front.png differ
diff --git a/graphics/pokemon/stunky/front.png b/graphics/pokemon/stunky/front.png
index cf124ce6a..da228e831 100644
Binary files a/graphics/pokemon/stunky/front.png and b/graphics/pokemon/stunky/front.png differ
diff --git a/graphics/pokemon/stunky/normal.pal b/graphics/pokemon/stunky/normal.pal
index 0aa39fd8f..f33806dab 100644
--- a/graphics/pokemon/stunky/normal.pal
+++ b/graphics/pokemon/stunky/normal.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-80 48 80
+72 56 96
 16 16 16
-104 80 120
-160 144 112
-248 216 168
-96 80 56
+104 80 136
+168 136 104
+232 216 176
+96 88 64
 40 32 56
 112 64 40
-224 120 72
+240 136 72
 248 248 248
 104 96 112
 176 176 208
-168 88 48
+128 72 48
 0 0 0
 0 0 0
diff --git a/graphics/pokemon/tangrowth/anim_front.png b/graphics/pokemon/tangrowth/anim_front.png
index 170769a92..564dc5626 100644
Binary files a/graphics/pokemon/tangrowth/anim_front.png and b/graphics/pokemon/tangrowth/anim_front.png differ
diff --git a/graphics/pokemon/tangrowth/front.png b/graphics/pokemon/tangrowth/front.png
index c43652a81..ae389e74a 100644
Binary files a/graphics/pokemon/tangrowth/front.png and b/graphics/pokemon/tangrowth/front.png differ
diff --git a/graphics/pokemon/tangrowth/normal.pal b/graphics/pokemon/tangrowth/normal.pal
index 451020c4c..10fe2ebbc 100644
--- a/graphics/pokemon/tangrowth/normal.pal
+++ b/graphics/pokemon/tangrowth/normal.pal
@@ -2,17 +2,17 @@ JASC-PAL
 0100
 16
 152 208 160
-152 56 88
-208 88 128
-80 24 48
-40 56 80
-56 88 112
-112 160 192
-72 120 160
+184 32 104
+208 88 144
+88 24 56
+24 56 96
+40 88 128
+80 152 192
+56 112 168
 0 0 0
-80 80 88
+72 72 80
 248 248 248
-40 48 56
+48 48 56
 0 0 0
 0 0 0
 0 0 0
diff --git a/graphics/pokemon/togekiss/anim_front.png b/graphics/pokemon/togekiss/anim_front.png
index 10a6c63ba..f902aff3b 100644
Binary files a/graphics/pokemon/togekiss/anim_front.png and b/graphics/pokemon/togekiss/anim_front.png differ
diff --git a/graphics/pokemon/togekiss/front.png b/graphics/pokemon/togekiss/front.png
index 6509b14ac..0a699e780 100644
Binary files a/graphics/pokemon/togekiss/front.png and b/graphics/pokemon/togekiss/front.png differ
diff --git a/graphics/pokemon/togekiss/normal.pal b/graphics/pokemon/togekiss/normal.pal
index 0c770d6a4..6cce97f24 100644
--- a/graphics/pokemon/togekiss/normal.pal
+++ b/graphics/pokemon/togekiss/normal.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-168 208 200
-136 160 160
-72 96 96
-216 240 240
-16 16 16
-32 144 216
-128 32 32
-200 72 64
-88 192 232
+184 192 216
+128 152 176
+72 88 112
 232 232 248
-224 128 128
-24 104 152
+16 16 16
+64 128 232
+112 48 40
+200 72 48
+144 176 248
+248 248 248
+184 128 128
+80 88 168
 0 0 0
 0 0 0
 0 0 0
diff --git a/graphics/pokemon/torterra/anim_front.png b/graphics/pokemon/torterra/anim_front.png
index cd41f4e31..cbc7c3e52 100644
Binary files a/graphics/pokemon/torterra/anim_front.png and b/graphics/pokemon/torterra/anim_front.png differ
diff --git a/graphics/pokemon/torterra/front.png b/graphics/pokemon/torterra/front.png
index ee1e5df76..2ef06d2f0 100644
Binary files a/graphics/pokemon/torterra/front.png and b/graphics/pokemon/torterra/front.png differ
diff --git a/graphics/pokemon/torterra/normal.pal b/graphics/pokemon/torterra/normal.pal
index 82cf9dd2e..48962babc 100644
--- a/graphics/pokemon/torterra/normal.pal
+++ b/graphics/pokemon/torterra/normal.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-48 88 40
-64 136 88
-88 160 96
+24 96 24
+48 136 56
+64 168 64
 16 16 16
 160 160 160
-120 120 120
-216 216 216
-184 184 176
-80 56 32
-128 96 56
-176 128 72
+104 112 120
+224 224 224
+184 184 184
+96 72 56
+136 104 64
+176 128 80
 56 88 40
 72 80 88
-176 128 72
+176 128 80
 0 0 0
diff --git a/graphics/pokemon/toxicroak/anim_front.png b/graphics/pokemon/toxicroak/anim_front.png
index 9eaccecbc..105ad18cb 100644
Binary files a/graphics/pokemon/toxicroak/anim_front.png and b/graphics/pokemon/toxicroak/anim_front.png differ
diff --git a/graphics/pokemon/toxicroak/front.png b/graphics/pokemon/toxicroak/front.png
index d21885a99..27acc59b7 100644
Binary files a/graphics/pokemon/toxicroak/front.png and b/graphics/pokemon/toxicroak/front.png differ
diff --git a/graphics/pokemon/toxicroak/normal.pal b/graphics/pokemon/toxicroak/normal.pal
index 9b23239b3..b18a334af 100644
--- a/graphics/pokemon/toxicroak/normal.pal
+++ b/graphics/pokemon/toxicroak/normal.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-56 96 136
+72 72 136
 16 16 16
-88 144 184
-160 200 200
-48 48 40
+104 112 208
+128 152 248
+48 48 64
 80 80 80
-168 128 24
-240 184 48
-224 96 88
-160 64 56
-184 176 168
+176 136 24
+248 208 24
+224 80 88
+152 56 56
+176 176 192
 248 248 248
 56 56 80
-232 168 160
-136 120 120
+248 152 160
+120 120 136
diff --git a/graphics/pokemon/turtwig/anim_front.png b/graphics/pokemon/turtwig/anim_front.png
index 91ac3ee83..84e5fc8eb 100644
Binary files a/graphics/pokemon/turtwig/anim_front.png and b/graphics/pokemon/turtwig/anim_front.png differ
diff --git a/graphics/pokemon/turtwig/front.png b/graphics/pokemon/turtwig/front.png
index 774f44c7d..01d9c0a68 100644
Binary files a/graphics/pokemon/turtwig/front.png and b/graphics/pokemon/turtwig/front.png differ
diff --git a/graphics/pokemon/turtwig/normal.pal b/graphics/pokemon/turtwig/normal.pal
index b1325eb3c..775b018c2 100644
--- a/graphics/pokemon/turtwig/normal.pal
+++ b/graphics/pokemon/turtwig/normal.pal
@@ -2,9 +2,9 @@ JASC-PAL
 0100
 16
 152 208 160
-48 160 56
+56 160 64
 56 88 40
-88 208 112
+120 208 104
 104 80 48
 16 16 16
 168 120 64
diff --git a/graphics/pokemon/uxie/anim_front.png b/graphics/pokemon/uxie/anim_front.png
index effb33d2d..4753ea3cb 100644
Binary files a/graphics/pokemon/uxie/anim_front.png and b/graphics/pokemon/uxie/anim_front.png differ
diff --git a/graphics/pokemon/uxie/back.png b/graphics/pokemon/uxie/back.png
index d5114c262..5f6292d52 100644
Binary files a/graphics/pokemon/uxie/back.png and b/graphics/pokemon/uxie/back.png differ
diff --git a/graphics/pokemon/uxie/front.png b/graphics/pokemon/uxie/front.png
index f45ac4e5f..3d923f443 100644
Binary files a/graphics/pokemon/uxie/front.png and b/graphics/pokemon/uxie/front.png differ
diff --git a/graphics/pokemon/uxie/normal.pal b/graphics/pokemon/uxie/normal.pal
index bd46f4f88..e3783dcae 100644
--- a/graphics/pokemon/uxie/normal.pal
+++ b/graphics/pokemon/uxie/normal.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-112 96 56
-168 136 72
-240 200 104
-248 224 160
+112 88 64
+168 136 64
+240 192 112
+248 216 152
 16 16 16
-224 104 96
-72 64 48
+232 64 64
+248 208 160
 248 248 248
-176 48 48
-168 208 240
-128 160 192
-48 64 72
-96 120 152
-0 0 0
+168 64 64
+176 200 240
+144 152 192
+64 64 64
+120 112 144
+88 56 64
 0 0 0
diff --git a/graphics/pokemon/vespiquen/anim_front.png b/graphics/pokemon/vespiquen/anim_front.png
index 80e6e4e2d..abaa335c8 100644
Binary files a/graphics/pokemon/vespiquen/anim_front.png and b/graphics/pokemon/vespiquen/anim_front.png differ
diff --git a/graphics/pokemon/vespiquen/front.png b/graphics/pokemon/vespiquen/front.png
index 4ba80e4ff..b1d7ecf79 100644
Binary files a/graphics/pokemon/vespiquen/front.png and b/graphics/pokemon/vespiquen/front.png differ
diff --git a/graphics/pokemon/vespiquen/normal.pal b/graphics/pokemon/vespiquen/normal.pal
index d6c43bd44..d806da444 100644
--- a/graphics/pokemon/vespiquen/normal.pal
+++ b/graphics/pokemon/vespiquen/normal.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-88 88 104
-176 200 208
+80 88 112
+184 184 208
 16 16 16
-48 40 40
-232 248 248
-96 80 32
-72 64 72
-248 184 64
-176 128 32
-224 88 80
-72 48 24
-144 48 48
-232 128 72
-144 80 40
+40 40 40
+232 232 248
+104 88 0
+64 64 72
+248 200 8
+176 136 0
+232 56 56
+104 40 0
+120 48 56
+232 112 0
+168 80 0
 128 136 160
diff --git a/graphics/pokemon/weavile/anim_front.png b/graphics/pokemon/weavile/anim_front.png
index a09dde1ff..c98cdf564 100644
Binary files a/graphics/pokemon/weavile/anim_front.png and b/graphics/pokemon/weavile/anim_front.png differ
diff --git a/graphics/pokemon/weavile/front.png b/graphics/pokemon/weavile/front.png
index 6f8da6525..90ad62cb9 100644
Binary files a/graphics/pokemon/weavile/front.png and b/graphics/pokemon/weavile/front.png differ
diff --git a/graphics/pokemon/weavile/normal.pal b/graphics/pokemon/weavile/normal.pal
index 8e81acac3..4577a2702 100644
--- a/graphics/pokemon/weavile/normal.pal
+++ b/graphics/pokemon/weavile/normal.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-176 40 80
-112 24 40
-240 72 104
+192 40 112
+128 32 80
+240 80 112
 240 128 128
 104 96 120
 192 184 200
 16 16 16
 248 248 248
-136 128 168
-72 80 112
+112 128 184
+64 72 128
 96 112 152
-40 40 64
+40 48 80
 240 208 80
 176 136 56
 72 80 104
diff --git a/graphics/pokemon/yanmega/anim_front.png b/graphics/pokemon/yanmega/anim_front.png
index 523fb4f73..d50d34b73 100644
Binary files a/graphics/pokemon/yanmega/anim_front.png and b/graphics/pokemon/yanmega/anim_front.png differ
diff --git a/graphics/pokemon/yanmega/front.png b/graphics/pokemon/yanmega/front.png
index 11000dea1..943aa095a 100644
Binary files a/graphics/pokemon/yanmega/front.png and b/graphics/pokemon/yanmega/front.png differ
diff --git a/graphics/pokemon/yanmega/normal.pal b/graphics/pokemon/yanmega/normal.pal
index 5c85bb6ee..f7758fee8 100644
--- a/graphics/pokemon/yanmega/normal.pal
+++ b/graphics/pokemon/yanmega/normal.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-176 56 48
-224 104 96
-104 32 32
-184 184 160
-248 248 248
-72 64 64
-136 120 120
-16 16 16
-224 224 192
-32 48 24
-128 160 104
-96 120 64
-64 80 40
-40 40 48
+176 48 24
+240 88 80
+112 48 0
 160 168 192
+248 248 248
+72 72 80
+120 120 128
+16 16 16
+192 200 224
+32 56 24
+112 152 96
+80 128 72
+56 88 40
+40 40 48
+0 0 0
diff --git a/include/graphics.h b/include/graphics.h
index 8d28bef55..8f55f94b0 100644
--- a/include/graphics.h
+++ b/include/graphics.h
@@ -453,7 +453,6 @@ extern const u32 gMonFrontPic_Burmy[];
 extern const u32 gMonFrontPic_Wormadam[];
 extern const u32 gMonFrontPic_Mothim[];
 extern const u32 gMonFrontPic_Combee[];
-extern const u32 gMonFrontPic_CombeeF[];
 extern const u32 gMonFrontPic_Vespiquen[];
 extern const u32 gMonFrontPic_Pachirisu[];
 extern const u32 gMonFrontPic_Buizel[];
@@ -488,7 +487,6 @@ extern const u32 gMonFrontPic_Munchlax[];
 extern const u32 gMonFrontPic_Riolu[];
 extern const u32 gMonFrontPic_Lucario[];
 extern const u32 gMonFrontPic_Hippopotas[];
-extern const u32 gMonFrontPic_HippopotasF[];
 extern const u32 gMonFrontPic_Hippowdon[];
 extern const u32 gMonFrontPic_Skorupi[];
 extern const u32 gMonFrontPic_Drapion[];
@@ -1633,9 +1631,7 @@ extern const u32 gMonBackPic_Munchlax[];
 extern const u32 gMonBackPic_Riolu[];
 extern const u32 gMonBackPic_Lucario[];
 extern const u32 gMonBackPic_Hippopotas[];
-extern const u32 gMonBackPic_HippopotasF[];
 extern const u32 gMonBackPic_Hippowdon[];
-extern const u32 gMonBackPic_HippowdonF[];
 extern const u32 gMonBackPic_Skorupi[];
 extern const u32 gMonBackPic_Drapion[];
 extern const u32 gMonBackPic_Croagunk[];
@@ -2742,7 +2738,8 @@ extern const u32 gMonPalette_Bastiodon[];
 extern const u32 gMonPalette_Burmy[];
 extern const u32 gMonPalette_Wormadam[];
 extern const u32 gMonPalette_Mothim[];
-extern const u32 gMonPalette_Combee[];
+extern const u32 gMonPalette_Combee_M[];
+extern const u32 gMonPalette_Combee_F[];
 extern const u32 gMonPalette_Vespiquen[];
 extern const u32 gMonPalette_Pachirisu[];
 extern const u32 gMonPalette_Buizel[];
@@ -2776,10 +2773,10 @@ extern const u32 gMonPalette_Garchomp[];
 extern const u32 gMonPalette_Munchlax[];
 extern const u32 gMonPalette_Riolu[];
 extern const u32 gMonPalette_Lucario[];
-extern const u32 gMonPalette_Hippopotas[];
-extern const u32 gMonPalette_HippopotasF[];
-extern const u32 gMonPalette_Hippowdon[];
-extern const u32 gMonPalette_HippowdonF[];
+extern const u32 gMonPalette_Hippopotas_M[];
+extern const u32 gMonPalette_Hippopotas_F[];
+extern const u32 gMonPalette_Hippowdon_M[];
+extern const u32 gMonPalette_Hippowdon_F[];
 extern const u32 gMonPalette_Skorupi[];
 extern const u32 gMonPalette_Drapion[];
 extern const u32 gMonPalette_Croagunk[];
@@ -3913,7 +3910,8 @@ extern const u32 gMonShinyPalette_Bastiodon[];
 extern const u32 gMonShinyPalette_Burmy[];
 extern const u32 gMonShinyPalette_Wormadam[];
 extern const u32 gMonShinyPalette_Mothim[];
-extern const u32 gMonShinyPalette_Combee[];
+extern const u32 gMonShinyPalette_Combee_M[];
+extern const u32 gMonShinyPalette_Combee_F[];
 extern const u32 gMonShinyPalette_Vespiquen[];
 extern const u32 gMonShinyPalette_Pachirisu[];
 extern const u32 gMonShinyPalette_Buizel[];
@@ -3947,11 +3945,10 @@ extern const u32 gMonShinyPalette_Garchomp[];
 extern const u32 gMonShinyPalette_Munchlax[];
 extern const u32 gMonShinyPalette_Riolu[];
 extern const u32 gMonShinyPalette_Lucario[];
-extern const u32 gMonShinyPalette_Hippopotas[];
-extern const u32 gMonShinyPalette_HippopotasF[];
-extern const u32 gMonShinyPalette_Hippowdon[];
-extern const u32 gMonShinyPalette_HippowdonF[];
-extern const u32 gMonShinyPalette_Hippowdon[];
+extern const u32 gMonShinyPalette_Hippopotas_M[];
+extern const u32 gMonShinyPalette_Hippopotas_F[];
+extern const u32 gMonShinyPalette_Hippowdon_M[];
+extern const u32 gMonShinyPalette_Hippowdon_F[];
 extern const u32 gMonShinyPalette_Skorupi[];
 extern const u32 gMonShinyPalette_Drapion[];
 extern const u32 gMonShinyPalette_Croagunk[];
diff --git a/src/data/graphics/pokemon.h b/src/data/graphics/pokemon.h
index 7d29936eb..08d20e7f4 100644
--- a/src/data/graphics/pokemon.h
+++ b/src/data/graphics/pokemon.h
@@ -416,7 +416,6 @@ const u32 gMonFrontPic_Burmy[] = INCBIN_U32("graphics/pokemon/burmy/anim_front.4
 const u32 gMonFrontPic_Wormadam[] = INCBIN_U32("graphics/pokemon/wormadam/anim_front.4bpp.lz");
 const u32 gMonFrontPic_Mothim[] = INCBIN_U32("graphics/pokemon/mothim/anim_front.4bpp.lz");
 const u32 gMonFrontPic_Combee[] = INCBIN_U32("graphics/pokemon/combee/anim_front.4bpp.lz");
-const u32 gMonFrontPic_CombeeF[] = INCBIN_U32("graphics/pokemon/combee/anim_frontf.4bpp.lz");
 const u32 gMonFrontPic_Vespiquen[] = INCBIN_U32("graphics/pokemon/vespiquen/anim_front.4bpp.lz");
 const u32 gMonFrontPic_Pachirisu[] = INCBIN_U32("graphics/pokemon/pachirisu/anim_front.4bpp.lz");
 const u32 gMonFrontPic_Buizel[] = INCBIN_U32("graphics/pokemon/buizel/anim_front.4bpp.lz");
@@ -451,7 +450,6 @@ const u32 gMonFrontPic_Munchlax[] = INCBIN_U32("graphics/pokemon/munchlax/anim_f
 const u32 gMonFrontPic_Riolu[] = INCBIN_U32("graphics/pokemon/riolu/anim_front.4bpp.lz");
 const u32 gMonFrontPic_Lucario[] = INCBIN_U32("graphics/pokemon/lucario/anim_front.4bpp.lz");
 const u32 gMonFrontPic_Hippopotas[] = INCBIN_U32("graphics/pokemon/hippopotas/anim_front.4bpp.lz");
-const u32 gMonFrontPic_HippopotasF[] = INCBIN_U32("graphics/pokemon/hippopotas/anim_frontf.4bpp.lz");
 const u32 gMonFrontPic_Hippowdon[] = INCBIN_U32("graphics/pokemon/hippowdon/anim_front.4bpp.lz");
 const u32 gMonFrontPic_Skorupi[] = INCBIN_U32("graphics/pokemon/skorupi/anim_front.4bpp.lz");
 const u32 gMonFrontPic_Drapion[] = INCBIN_U32("graphics/pokemon/drapion/anim_front.4bpp.lz");
@@ -1596,9 +1594,7 @@ const u32 gMonBackPic_Munchlax[] = INCBIN_U32("graphics/pokemon/munchlax/back.4b
 const u32 gMonBackPic_Riolu[] = INCBIN_U32("graphics/pokemon/riolu/back.4bpp.lz");
 const u32 gMonBackPic_Lucario[] = INCBIN_U32("graphics/pokemon/lucario/back.4bpp.lz");
 const u32 gMonBackPic_Hippopotas[] = INCBIN_U32("graphics/pokemon/hippopotas/back.4bpp.lz");
-const u32 gMonBackPic_HippopotasF[] = INCBIN_U32("graphics/pokemon/hippopotas/backf.4bpp.lz");
 const u32 gMonBackPic_Hippowdon[] = INCBIN_U32("graphics/pokemon/hippowdon/back.4bpp.lz");
-const u32 gMonBackPic_HippowdonF[] = INCBIN_U32("graphics/pokemon/hippowdon/backf.4bpp.lz");
 const u32 gMonBackPic_Skorupi[] = INCBIN_U32("graphics/pokemon/skorupi/back.4bpp.lz");
 const u32 gMonBackPic_Drapion[] = INCBIN_U32("graphics/pokemon/drapion/back.4bpp.lz");
 const u32 gMonBackPic_Croagunk[] = INCBIN_U32("graphics/pokemon/croagunk/back.4bpp.lz");
@@ -2705,7 +2701,8 @@ const u32 gMonPalette_Bastiodon[] = INCBIN_U32("graphics/pokemon/bastiodon/norma
 const u32 gMonPalette_Burmy[] = INCBIN_U32("graphics/pokemon/burmy/normal.gbapal.lz");
 const u32 gMonPalette_Wormadam[] = INCBIN_U32("graphics/pokemon/wormadam/normal.gbapal.lz");
 const u32 gMonPalette_Mothim[] = INCBIN_U32("graphics/pokemon/mothim/normal.gbapal.lz");
-const u32 gMonPalette_Combee[] = INCBIN_U32("graphics/pokemon/combee/normal.gbapal.lz");
+const u32 gMonPalette_Combee_M[] = INCBIN_U32("graphics/pokemon/combee/normal_m.gbapal.lz");
+const u32 gMonPalette_Combee_F[] = INCBIN_U32("graphics/pokemon/combee/normal_f.gbapal.lz");
 const u32 gMonPalette_Vespiquen[] = INCBIN_U32("graphics/pokemon/vespiquen/normal.gbapal.lz");
 const u32 gMonPalette_Pachirisu[] = INCBIN_U32("graphics/pokemon/pachirisu/normal.gbapal.lz");
 const u32 gMonPalette_Buizel[] = INCBIN_U32("graphics/pokemon/buizel/normal.gbapal.lz");
@@ -2739,10 +2736,10 @@ const u32 gMonPalette_Garchomp[] = INCBIN_U32("graphics/pokemon/garchomp/normal.
 const u32 gMonPalette_Munchlax[] = INCBIN_U32("graphics/pokemon/munchlax/normal.gbapal.lz");
 const u32 gMonPalette_Riolu[] = INCBIN_U32("graphics/pokemon/riolu/normal.gbapal.lz");
 const u32 gMonPalette_Lucario[] = INCBIN_U32("graphics/pokemon/lucario/normal.gbapal.lz");
-const u32 gMonPalette_Hippopotas[] = INCBIN_U32("graphics/pokemon/hippopotas/normal.gbapal.lz");
-const u32 gMonPalette_HippopotasF[] = INCBIN_U32("graphics/pokemon/hippopotas/normalf.gbapal.lz");
-const u32 gMonPalette_Hippowdon[] = INCBIN_U32("graphics/pokemon/hippowdon/normal.gbapal.lz");
-const u32 gMonPalette_HippowdonF[] = INCBIN_U32("graphics/pokemon/hippowdon/normalf.gbapal.lz");
+const u32 gMonPalette_Hippopotas_M[] = INCBIN_U32("graphics/pokemon/hippopotas/normal_m.gbapal.lz");
+const u32 gMonPalette_Hippopotas_F[] = INCBIN_U32("graphics/pokemon/hippopotas/normal_f.gbapal.lz");
+const u32 gMonPalette_Hippowdon_M[] = INCBIN_U32("graphics/pokemon/hippowdon/normal_m.gbapal.lz");
+const u32 gMonPalette_Hippowdon_F[] = INCBIN_U32("graphics/pokemon/hippowdon/normal_f.gbapal.lz");
 const u32 gMonPalette_Skorupi[] = INCBIN_U32("graphics/pokemon/skorupi/normal.gbapal.lz");
 const u32 gMonPalette_Drapion[] = INCBIN_U32("graphics/pokemon/drapion/normal.gbapal.lz");
 const u32 gMonPalette_Croagunk[] = INCBIN_U32("graphics/pokemon/croagunk/normal.gbapal.lz");
@@ -3876,7 +3873,8 @@ const u32 gMonShinyPalette_Bastiodon[] = INCBIN_U32("graphics/pokemon/bastiodon/
 const u32 gMonShinyPalette_Burmy[] = INCBIN_U32("graphics/pokemon/burmy/shiny.gbapal.lz");
 const u32 gMonShinyPalette_Wormadam[] = INCBIN_U32("graphics/pokemon/wormadam/shiny.gbapal.lz");
 const u32 gMonShinyPalette_Mothim[] = INCBIN_U32("graphics/pokemon/mothim/shiny.gbapal.lz");
-const u32 gMonShinyPalette_Combee[] = INCBIN_U32("graphics/pokemon/combee/shiny.gbapal.lz");
+const u32 gMonShinyPalette_Combee_M[] = INCBIN_U32("graphics/pokemon/combee/shiny_m.gbapal.lz");
+const u32 gMonShinyPalette_Combee_F[] = INCBIN_U32("graphics/pokemon/combee/shiny_f.gbapal.lz");
 const u32 gMonShinyPalette_Vespiquen[] = INCBIN_U32("graphics/pokemon/vespiquen/shiny.gbapal.lz");
 const u32 gMonShinyPalette_Pachirisu[] = INCBIN_U32("graphics/pokemon/pachirisu/shiny.gbapal.lz");
 const u32 gMonShinyPalette_Buizel[] = INCBIN_U32("graphics/pokemon/buizel/shiny.gbapal.lz");
@@ -3910,10 +3908,10 @@ const u32 gMonShinyPalette_Garchomp[] = INCBIN_U32("graphics/pokemon/garchomp/sh
 const u32 gMonShinyPalette_Munchlax[] = INCBIN_U32("graphics/pokemon/munchlax/shiny.gbapal.lz");
 const u32 gMonShinyPalette_Riolu[] = INCBIN_U32("graphics/pokemon/riolu/shiny.gbapal.lz");
 const u32 gMonShinyPalette_Lucario[] = INCBIN_U32("graphics/pokemon/lucario/shiny.gbapal.lz");
-const u32 gMonShinyPalette_Hippopotas[] = INCBIN_U32("graphics/pokemon/hippopotas/shiny.gbapal.lz");
-const u32 gMonShinyPalette_HippopotasF[] = INCBIN_U32("graphics/pokemon/hippopotas/shinyf.gbapal.lz");
-const u32 gMonShinyPalette_Hippowdon[] = INCBIN_U32("graphics/pokemon/hippowdon/shiny.gbapal.lz");
-const u32 gMonShinyPalette_HippowdonF[] = INCBIN_U32("graphics/pokemon/hippowdon/shinyf.gbapal.lz");
+const u32 gMonShinyPalette_Hippopotas_M[] = INCBIN_U32("graphics/pokemon/hippopotas/shiny_m.gbapal.lz");
+const u32 gMonShinyPalette_Hippopotas_F[] = INCBIN_U32("graphics/pokemon/hippopotas/shiny_f.gbapal.lz");
+const u32 gMonShinyPalette_Hippowdon_M[] = INCBIN_U32("graphics/pokemon/hippowdon/shiny_m.gbapal.lz");
+const u32 gMonShinyPalette_Hippowdon_F[] = INCBIN_U32("graphics/pokemon/hippowdon/shiny_f.gbapal.lz");
 const u32 gMonShinyPalette_Skorupi[] = INCBIN_U32("graphics/pokemon/skorupi/shiny.gbapal.lz");
 const u32 gMonShinyPalette_Drapion[] = INCBIN_U32("graphics/pokemon/drapion/shiny.gbapal.lz");
 const u32 gMonShinyPalette_Croagunk[] = INCBIN_U32("graphics/pokemon/croagunk/shiny.gbapal.lz");
diff --git a/src/data/pokemon_graphics/back_pic_table.h b/src/data/pokemon_graphics/back_pic_table.h
index 9d108ce83..213e870ed 100644
--- a/src/data/pokemon_graphics/back_pic_table.h
+++ b/src/data/pokemon_graphics/back_pic_table.h
@@ -1279,8 +1279,8 @@ const struct CompressedSpriteSheet gMonBackPicTableFemale[] =
 {
     SPECIES_SPRITE(EEVEE, gMonBackPic_EeveeF),
     SPECIES_SPRITE(COMBEE, gMonBackPic_Combee),
-    SPECIES_SPRITE(HIPPOPOTAS, gMonBackPic_HippopotasF),
-    SPECIES_SPRITE(HIPPOWDON, gMonBackPic_HippowdonF),
+    SPECIES_SPRITE(HIPPOPOTAS, gMonBackPic_Hippopotas),
+    SPECIES_SPRITE(HIPPOWDON, gMonBackPic_Hippowdon),
     SPECIES_SPRITE(UNFEZANT, gMonBackPic_UnfezantF),
     SPECIES_SPRITE(FRILLISH, gMonBackPic_FrillishF),
     SPECIES_SPRITE(JELLICENT, gMonBackPic_JellicentF),
diff --git a/src/data/pokemon_graphics/front_pic_table.h b/src/data/pokemon_graphics/front_pic_table.h
index 788afc744..281ef8b94 100644
--- a/src/data/pokemon_graphics/front_pic_table.h
+++ b/src/data/pokemon_graphics/front_pic_table.h
@@ -1278,8 +1278,8 @@ const struct CompressedSpriteSheet gMonFrontPicTable[] =
 const struct CompressedSpriteSheet gMonFrontPicTableFemale[] =
 {
     SPECIES_SPRITE(EEVEE, gMonFrontPic_EeveeF),
-    SPECIES_SPRITE(COMBEE, gMonFrontPic_CombeeF),
-    SPECIES_SPRITE(HIPPOPOTAS, gMonFrontPic_HippopotasF),
+    SPECIES_SPRITE(COMBEE, gMonFrontPic_Combee),
+    SPECIES_SPRITE(HIPPOPOTAS, gMonFrontPic_Hippopotas),
     SPECIES_SPRITE(HIPPOWDON, gMonFrontPic_Hippowdon),
     SPECIES_SPRITE(UNFEZANT, gMonFrontPic_UnfezantF),
     SPECIES_SPRITE(FRILLISH, gMonFrontPic_FrillishF),
diff --git a/src/data/pokemon_graphics/palette_table.h b/src/data/pokemon_graphics/palette_table.h
index cc8717e90..bc07ebab1 100644
--- a/src/data/pokemon_graphics/palette_table.h
+++ b/src/data/pokemon_graphics/palette_table.h
@@ -415,7 +415,7 @@ const struct CompressedSpritePalette gMonPaletteTable[] =
     SPECIES_PAL(BURMY, gMonPalette_Burmy),
     SPECIES_PAL(WORMADAM, gMonPalette_Wormadam),
     SPECIES_PAL(MOTHIM, gMonPalette_Mothim),
-    SPECIES_PAL(COMBEE, gMonPalette_Combee),
+    SPECIES_PAL(COMBEE, gMonPalette_Combee_M),
     SPECIES_PAL(VESPIQUEN, gMonPalette_Vespiquen),
     SPECIES_PAL(PACHIRISU, gMonPalette_Pachirisu),
     SPECIES_PAL(BUIZEL, gMonPalette_Buizel),
@@ -449,8 +449,8 @@ const struct CompressedSpritePalette gMonPaletteTable[] =
     SPECIES_PAL(MUNCHLAX, gMonPalette_Munchlax),
     SPECIES_PAL(RIOLU, gMonPalette_Riolu),
     SPECIES_PAL(LUCARIO, gMonPalette_Lucario),
-    SPECIES_PAL(HIPPOPOTAS, gMonPalette_Hippopotas),
-    SPECIES_PAL(HIPPOWDON, gMonPalette_Hippowdon),
+    SPECIES_PAL(HIPPOPOTAS, gMonPalette_Hippopotas_M),
+    SPECIES_PAL(HIPPOWDON, gMonPalette_Hippowdon_M),
     SPECIES_PAL(SKORUPI, gMonPalette_Skorupi),
     SPECIES_PAL(DRAPION, gMonPalette_Drapion),
     SPECIES_PAL(CROAGUNK, gMonPalette_Croagunk),
@@ -1278,9 +1278,9 @@ const struct CompressedSpritePalette gMonPaletteTable[] =
 const struct CompressedSpritePalette gMonPaletteTableFemale[] =
 {
     SPECIES_PAL(EEVEE, gMonPalette_Eevee),
-    SPECIES_PAL(COMBEE, gMonPalette_Combee),
-    SPECIES_PAL(HIPPOPOTAS, gMonPalette_HippopotasF),
-    SPECIES_PAL(HIPPOWDON, gMonPalette_HippowdonF),
+    SPECIES_PAL(COMBEE, gMonPalette_Combee_F),
+    SPECIES_PAL(HIPPOPOTAS, gMonPalette_Hippopotas_F),
+    SPECIES_PAL(HIPPOWDON, gMonPalette_Hippowdon_F),
     SPECIES_PAL(UNFEZANT, gMonPalette_UnfezantF),
     SPECIES_PAL(FRILLISH, gMonPalette_FrillishF),
     SPECIES_PAL(JELLICENT, gMonPalette_JellicentF),
diff --git a/src/data/pokemon_graphics/shiny_palette_table.h b/src/data/pokemon_graphics/shiny_palette_table.h
index b8324bdd5..8aec2b5e1 100644
--- a/src/data/pokemon_graphics/shiny_palette_table.h
+++ b/src/data/pokemon_graphics/shiny_palette_table.h
@@ -415,7 +415,7 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[] =
     SPECIES_SHINY_PAL(BURMY, gMonShinyPalette_Burmy),
     SPECIES_SHINY_PAL(WORMADAM, gMonShinyPalette_Wormadam),
     SPECIES_SHINY_PAL(MOTHIM, gMonShinyPalette_Mothim),
-    SPECIES_SHINY_PAL(COMBEE, gMonShinyPalette_Combee),
+    SPECIES_SHINY_PAL(COMBEE, gMonShinyPalette_Combee_M),
     SPECIES_SHINY_PAL(VESPIQUEN, gMonShinyPalette_Vespiquen),
     SPECIES_SHINY_PAL(PACHIRISU, gMonShinyPalette_Pachirisu),
     SPECIES_SHINY_PAL(BUIZEL, gMonShinyPalette_Buizel),
@@ -449,8 +449,8 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[] =
     SPECIES_SHINY_PAL(MUNCHLAX, gMonShinyPalette_Munchlax),
     SPECIES_SHINY_PAL(RIOLU, gMonShinyPalette_Riolu),
     SPECIES_SHINY_PAL(LUCARIO, gMonShinyPalette_Lucario),
-    SPECIES_SHINY_PAL(HIPPOPOTAS, gMonShinyPalette_Hippopotas),
-    SPECIES_SHINY_PAL(HIPPOWDON, gMonShinyPalette_Hippowdon),
+    SPECIES_SHINY_PAL(HIPPOPOTAS, gMonShinyPalette_Hippopotas_M),
+    SPECIES_SHINY_PAL(HIPPOWDON, gMonShinyPalette_Hippowdon_M),
     SPECIES_SHINY_PAL(SKORUPI, gMonShinyPalette_Skorupi),
     SPECIES_SHINY_PAL(DRAPION, gMonShinyPalette_Drapion),
     SPECIES_SHINY_PAL(CROAGUNK, gMonShinyPalette_Croagunk),
@@ -1278,9 +1278,9 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[] =
 const struct CompressedSpritePalette gMonShinyPaletteTableFemale[] =
 {
     SPECIES_SHINY_PAL(EEVEE, gMonShinyPalette_Eevee),
-    SPECIES_SHINY_PAL(COMBEE, gMonShinyPalette_Combee),
-    SPECIES_SHINY_PAL(HIPPOPOTAS, gMonShinyPalette_HippopotasF),
-    SPECIES_SHINY_PAL(HIPPOWDON, gMonShinyPalette_HippowdonF),
+    SPECIES_SHINY_PAL(COMBEE, gMonShinyPalette_Combee_F),
+    SPECIES_SHINY_PAL(HIPPOPOTAS, gMonShinyPalette_Hippopotas_F),
+    SPECIES_SHINY_PAL(HIPPOWDON, gMonShinyPalette_Hippowdon_F),
     SPECIES_SHINY_PAL(UNFEZANT, gMonShinyPalette_UnfezantF),
     SPECIES_SHINY_PAL(FRILLISH, gMonShinyPalette_FrillishF),
     SPECIES_SHINY_PAL(JELLICENT, gMonShinyPalette_JellicentF),