diff --git a/graphics/pokemon/abra/anim_front.png b/graphics/pokemon/abra/anim_front.png
index f7ba7165e2..a87da90e0f 100644
Binary files a/graphics/pokemon/abra/anim_front.png and b/graphics/pokemon/abra/anim_front.png differ
diff --git a/graphics/pokemon/abra/back.png b/graphics/pokemon/abra/back.png
index cd8b84dfdf..7468d8f80e 100644
Binary files a/graphics/pokemon/abra/back.png and b/graphics/pokemon/abra/back.png differ
diff --git a/graphics/pokemon/abra/normal.pal b/graphics/pokemon/abra/normal.pal
index 8c4d72e5cd..b8ef761d35 100644
--- a/graphics/pokemon/abra/normal.pal
+++ b/graphics/pokemon/abra/normal.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-88 56 8
-120 96 24
-255 230 41
-90 57 8
-205 189 32
-246 246 164
-168 136 24
+255 0 255
+255 0 255
+255 0 255
+213 180 82
 172 131 41
-16 16 16
 131 98 8
-208 176 80
-176 160 152
-0 0 0
-0 0 0
-0 0 0
+90 57 0
+255 0 255
+246 246 164
+255 230 41
+205 189 32
+172 139 24
+131 90 16
+90 57 8
+16 16 16
diff --git a/graphics/pokemon/abra/shiny.pal b/graphics/pokemon/abra/shiny.pal
index e8c79eea1d..e72eec2b44 100644
--- a/graphics/pokemon/abra/shiny.pal
+++ b/graphics/pokemon/abra/shiny.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-136 80 24
-168 104 40
-248 240 128
-88 48 56
-232 200 48
-248 240 216
-200 152 32
-184 136 144
+255 0 255
+255 0 255
+255 0 255
+222 180 189
+189 139 148
+139 98 106
+90 49 57
+255 0 255
+255 246 222
+255 246 131
+238 205 49
+205 156 32
+172 106 41
+139 82 24
 16 16 16
-136 96 104
-208 176 80
-216 176 184
-0 0 0
-0 0 0
-0 0 0
diff --git a/graphics/pokemon/alakazam/anim_front.png b/graphics/pokemon/alakazam/anim_front.png
index 44322880c9..0bbc07a982 100644
Binary files a/graphics/pokemon/alakazam/anim_front.png and b/graphics/pokemon/alakazam/anim_front.png differ
diff --git a/graphics/pokemon/alakazam/anim_frontf.png b/graphics/pokemon/alakazam/anim_frontf.png
index f7de540512..d89386990e 100644
Binary files a/graphics/pokemon/alakazam/anim_frontf.png and b/graphics/pokemon/alakazam/anim_frontf.png differ
diff --git a/graphics/pokemon/alakazam/back.png b/graphics/pokemon/alakazam/back.png
index 1bc44a4edb..a26d52b3c1 100644
Binary files a/graphics/pokemon/alakazam/back.png and b/graphics/pokemon/alakazam/back.png differ
diff --git a/graphics/pokemon/alakazam/backf.png b/graphics/pokemon/alakazam/backf.png
index c52471aeae..9e727e6520 100644
Binary files a/graphics/pokemon/alakazam/backf.png and b/graphics/pokemon/alakazam/backf.png differ
diff --git a/graphics/pokemon/alakazam/normal.pal b/graphics/pokemon/alakazam/normal.pal
index de1ad1131d..3ec4f421c7 100644
--- a/graphics/pokemon/alakazam/normal.pal
+++ b/graphics/pokemon/alakazam/normal.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-112 88 8
-255 238 41
-213 189 16
-16 16 16
-255 246 172
-131 98 8
-82 49 8
+255 255 255
+222 222 222
+180 180 180
+90 90 90
 213 180 82
 180 131 41
-88 88 88
-248 248 248
-176 176 168
-216 216 216
-96 96 88
-80 48 8
+120 88 8
+82 49 8
+104 80 8
+152 112 0
+255 246 172
+255 238 24
+200 176 16
+112 88 8
+16 16 16
diff --git a/graphics/pokemon/alakazam/shiny.pal b/graphics/pokemon/alakazam/shiny.pal
index e6518d1169..9fcc9ad865 100644
--- a/graphics/pokemon/alakazam/shiny.pal
+++ b/graphics/pokemon/alakazam/shiny.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-160 104 0
-240 208 32
-200 144 24
+255 255 255
+222 222 222
+180 180 180
+90 90 90
+255 148 230
+222 74 172
+172 41 115
+115 16 82
+104 64 8
+152 104 0
+255 238 131
+255 213 0
+213 148 8
+164 106 0
 16 16 16
-248 232 128
-152 48 112
-112 16 80
-248 144 224
-200 88 160
-88 88 88
-248 248 248
-176 176 176
-216 216 216
-88 88 88
-112 88 8
diff --git a/graphics/pokemon/arbok/anim_front.png b/graphics/pokemon/arbok/anim_front.png
index e52d480169..ba158f8641 100644
Binary files a/graphics/pokemon/arbok/anim_front.png and b/graphics/pokemon/arbok/anim_front.png differ
diff --git a/graphics/pokemon/arbok/back.png b/graphics/pokemon/arbok/back.png
index 6d53b683ff..b0da328c65 100644
Binary files a/graphics/pokemon/arbok/back.png and b/graphics/pokemon/arbok/back.png differ
diff --git a/graphics/pokemon/arbok/normal.pal b/graphics/pokemon/arbok/normal.pal
index 8ef9ad3150..6a516dc3df 100644
--- a/graphics/pokemon/arbok/normal.pal
+++ b/graphics/pokemon/arbok/normal.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-16 16 16
-164 131 197
-197 164 238
-123 98 172
-82 57 123
-197 197 197
-255 255 255
-156 16 0
-197 65 24
-156 16 0
+255 172 131
+197 180 0
+246 115 74
 197 65 24
 246 115 74
-197 180 0
-120 96 168
-0 0 0
+197 65 24
+156 16 0
+16 16 16
+197 164 238
+164 131 197
+123 98 172
+82 57 123
+156 16 0
+197 197 197
+255 255 255
diff --git a/graphics/pokemon/arbok/shiny.pal b/graphics/pokemon/arbok/shiny.pal
index 7498bf4b2e..df9c4848a0 100644
--- a/graphics/pokemon/arbok/shiny.pal
+++ b/graphics/pokemon/arbok/shiny.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
+255 172 131
+238 222 24
+240 112 72
+192 64 24
+90 164 255
+24 98 197
+0 49 148
 16 16 16
-208 184 56
-224 224 144
-160 120 56
-104 80 24
-192 192 192
-248 248 248
-56 104 160
-120 160 208
-32 64 128
-48 112 184
-152 184 224
-232 216 56
-160 120 48
-0 0 0
+222 222 90
+213 180 32
+164 123 32
+131 90 0
+152 16 0
+197 197 197
+255 255 255
diff --git a/graphics/pokemon/arcanine/anim_front.png b/graphics/pokemon/arcanine/anim_front.png
index 9bdc7826d0..b1643339d7 100644
Binary files a/graphics/pokemon/arcanine/anim_front.png and b/graphics/pokemon/arcanine/anim_front.png differ
diff --git a/graphics/pokemon/arcanine/back.png b/graphics/pokemon/arcanine/back.png
index 9578cd4a12..98291f4044 100644
Binary files a/graphics/pokemon/arcanine/back.png and b/graphics/pokemon/arcanine/back.png differ
diff --git a/graphics/pokemon/arcanine/normal.pal b/graphics/pokemon/arcanine/normal.pal
index 0d552ffc3b..621362d93b 100644
--- a/graphics/pokemon/arcanine/normal.pal
+++ b/graphics/pokemon/arcanine/normal.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-148 98 32
-16 16 16
+255 255 246
+222 222 213
+131 106 98
+255 98 65
+197 49 32
+193 147 73
+255 255 197
 255 246 148
 238 197 115
-98 16 0
+148 98 32
+255 156 106
 238 115 49
 197 82 90
-216 216 208
-248 248 240
-88 104 112
-255 156 106
-168 48 16
-148 98 32
-0 0 0
-0 0 0
+98 16 0
+16 16 16
diff --git a/graphics/pokemon/arcanine/shiny.pal b/graphics/pokemon/arcanine/shiny.pal
index e6ce73d7f1..b557f4e96c 100644
--- a/graphics/pokemon/arcanine/shiny.pal
+++ b/graphics/pokemon/arcanine/shiny.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-120 112 56
+255 255 246
+222 222 213
+131 106 98
+255 98 65
+197 49 32
+160 136 112
+255 238 230
+246 230 189
+213 189 148
+104 88 80
+246 255 123
+230 213 41
+180 156 0
+88 72 16
 16 16 16
-240 240 176
-208 192 120
-88 72 32
-216 200 56
-168 152 32
-216 216 208
-248 248 240
-128 104 96
-240 240 144
-181 78 66
-176 144 64
-0 0 0
-0 0 0
diff --git a/graphics/pokemon/beedrill/anim_front.png b/graphics/pokemon/beedrill/anim_front.png
index 3927c4e844..b8b8eacbe3 100644
Binary files a/graphics/pokemon/beedrill/anim_front.png and b/graphics/pokemon/beedrill/anim_front.png differ
diff --git a/graphics/pokemon/beedrill/back.png b/graphics/pokemon/beedrill/back.png
index e00dc91446..e3ef11dce4 100644
Binary files a/graphics/pokemon/beedrill/back.png and b/graphics/pokemon/beedrill/back.png differ
diff --git a/graphics/pokemon/beedrill/normal.pal b/graphics/pokemon/beedrill/normal.pal
index 5dcebed760..c04b1878fc 100644
--- a/graphics/pokemon/beedrill/normal.pal
+++ b/graphics/pokemon/beedrill/normal.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-139 123 148
-189 172 197
 255 255 255
-24 24 24
-222 205 246
-82 90 123
-131 74 0
-230 148 32
 255 246 164
 255 205 74
-156 0 8
-213 24 49
-255 148 106
+230 148 32
 180 98 16
-232 224 248
+131 74 0
+238 230 255
+222 205 246
+189 172 197
+139 123 148
+255 148 106
+213 24 49
+156 0 8
+82 90 123
+24 24 24
diff --git a/graphics/pokemon/beedrill/shiny.pal b/graphics/pokemon/beedrill/shiny.pal
index 01f97d3854..7d03a33c12 100644
--- a/graphics/pokemon/beedrill/shiny.pal
+++ b/graphics/pokemon/beedrill/shiny.pal
@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-152 208 160
-136 128 144
-184 176 192
-248 248 248
+208 152 160
+255 255 255
+230 255 189
+189 238 0
+131 197 41
+90 164 0
+57 115 0
+238 238 255
+222 213 246
+189 180 197
+139 131 148
+123 148 255
+49 98 213
+16 32 164
+82 90 123
 24 24 24
-216 208 240
-80 88 120
-56 112 0
-128 192 40
-224 248 184
-184 232 0
-16 32 160
-48 96 208
-120 144 248
-88 160 0
-232 224 248
diff --git a/graphics/pokemon/bellsprout/anim_front.png b/graphics/pokemon/bellsprout/anim_front.png
index 09a48b67ec..b6309f008c 100644
Binary files a/graphics/pokemon/bellsprout/anim_front.png and b/graphics/pokemon/bellsprout/anim_front.png differ
diff --git a/graphics/pokemon/bellsprout/back.png b/graphics/pokemon/bellsprout/back.png
index 3357a68a88..8385882c2b 100644
Binary files a/graphics/pokemon/bellsprout/back.png and b/graphics/pokemon/bellsprout/back.png differ
diff --git a/graphics/pokemon/bellsprout/normal.pal b/graphics/pokemon/bellsprout/normal.pal
index 3a2a60032c..cb766b2a0b 100644
--- a/graphics/pokemon/bellsprout/normal.pal
+++ b/graphics/pokemon/bellsprout/normal.pal
@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-152 208 160
-148 106 65
-255 255 255
-255 238 164
+152 160 208
+0 0 0
 90 57 0
-230 189 131
-248 248 248
-16 16 16
-144 104 64
+148 106 65
+172 123 65
 115 32 0
+180 65 49
+213 98 106
 230 139 148
 65 106 16
-213 98 106
-123 197 82
-180 65 49
 98 164 65
+123 197 82
+172 238 148
+208 189 96
+240 224 112
+255 255 255
diff --git a/graphics/pokemon/bellsprout/shiny.pal b/graphics/pokemon/bellsprout/shiny.pal
index 89668940d3..366527e0c8 100644
--- a/graphics/pokemon/bellsprout/shiny.pal
+++ b/graphics/pokemon/bellsprout/shiny.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-168 120 64
-248 248 216
-248 240 136
-88 56 0
-216 200 88
-248 248 248
-16 16 16
-144 104 64
-128 88 112
-240 192 224
-152 112 40
-208 168 192
-216 208 72
-168 128 160
-192 168 48
+0 0 0
+90 57 0
+148 106 65
+172 123 65
+131 90 115
+172 131 164
+213 172 197
+246 197 230
+156 106 8
+197 164 8
+222 213 57
+246 255 82
+222 197 24
+255 246 139
+255 255 255
diff --git a/graphics/pokemon/blastoise/anim_front.png b/graphics/pokemon/blastoise/anim_front.png
index a5ba90e182..7b5d21f783 100644
Binary files a/graphics/pokemon/blastoise/anim_front.png and b/graphics/pokemon/blastoise/anim_front.png differ
diff --git a/graphics/pokemon/blastoise/back.png b/graphics/pokemon/blastoise/back.png
index 18275be68c..02b52f3db7 100644
Binary files a/graphics/pokemon/blastoise/back.png and b/graphics/pokemon/blastoise/back.png differ
diff --git a/graphics/pokemon/blastoise/normal.pal b/graphics/pokemon/blastoise/normal.pal
index 08c1997369..b8bd089396 100644
--- a/graphics/pokemon/blastoise/normal.pal
+++ b/graphics/pokemon/blastoise/normal.pal
@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-248 192 248
-32 98 172
-8 57 98
+152 208 160
+16 16 16
+255 255 255
+205 205 213
+148 148 148
+74 74 74
 148 172 230
 90 139 205
-74 74 74
-0 0 0
-205 205 213
-90 57 24
-148 148 148
-139 98 65
-255 255 255
-213 172 74
+32 98 172
+8 57 98
+152 48 40
 246 213 156
+224 192 112
 213 172 74
-156 136 80
+139 98 65
+90 57 24
diff --git a/graphics/pokemon/blastoise/shiny.pal b/graphics/pokemon/blastoise/shiny.pal
index ff27dbbdc5..07c6360f4d 100644
--- a/graphics/pokemon/blastoise/shiny.pal
+++ b/graphics/pokemon/blastoise/shiny.pal
@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-152 208 160
-160 120 184
-112 72 144
-232 216 248
-208 176 240
-72 72 72
-16 16 16
-200 200 208
-40 88 32
-144 144 144
-112 144 72
-248 248 248
-184 176 96
-240 224 192
-189 180 90
-112 144 72
+208 160 152
+0 0 0
+255 255 255
+205 205 213
+148 148 148
+74 74 74
+238 222 255
+213 180 246
+164 123 189
+115 82 148
+152 48 40
+240 208 152
+224 192 112
+184 176 88
+112 144 64
+32 90 24
diff --git a/graphics/pokemon/bulbasaur/anim_front.png b/graphics/pokemon/bulbasaur/anim_front.png
index 07fb0509df..3ab471ea61 100644
Binary files a/graphics/pokemon/bulbasaur/anim_front.png and b/graphics/pokemon/bulbasaur/anim_front.png differ
diff --git a/graphics/pokemon/bulbasaur/back.png b/graphics/pokemon/bulbasaur/back.png
index 73cf623a8b..bbca57feac 100644
Binary files a/graphics/pokemon/bulbasaur/back.png and b/graphics/pokemon/bulbasaur/back.png differ
diff --git a/graphics/pokemon/bulbasaur/normal.pal b/graphics/pokemon/bulbasaur/normal.pal
index 2df2358d9e..f18ccb7055 100644
--- a/graphics/pokemon/bulbasaur/normal.pal
+++ b/graphics/pokemon/bulbasaur/normal.pal
@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-248 192 248
-40 96 48
-96 192 112
-16 16 16
-56 144 72
-144 216 144
-24 72 72
-56 144 144
-128 232 192
-48 112 112
-96 208 176
+152 160 208
+255 255 255
+131 238 197
+98 213 180
+57 148 148
+24 74 74
+255 106 98
+232 32 56
 168 0 48
-248 248 248
-248 104 96
-160 48 16
-200 200 200
+205 205 205
+16 16 16
+189 255 115
+164 213 65
+115 172 49
+82 98 41
+48 112 112
diff --git a/graphics/pokemon/bulbasaur/shiny.pal b/graphics/pokemon/bulbasaur/shiny.pal
index 30895158bd..696f091f4b 100644
--- a/graphics/pokemon/bulbasaur/shiny.pal
+++ b/graphics/pokemon/bulbasaur/shiny.pal
@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-208 248 184
-8 88 8
-56 168 32
+152 160 208
+255 255 255
+197 246 82
+156 213 74
+115 164 49
+49 98 32
+255 106 98
+222 74 65
+189 41 32
+205 205 205
 16 16 16
-8 128 40
-112 216 72
-56 96 40
-120 160 64
-200 240 104
+98 222 57
+41 172 16
+0 131 32
+0 90 0
 80 128 40
-160 208 88
-184 56 48
-248 248 248
-248 128 120
-184 56 48
-200 200 200
diff --git a/graphics/pokemon/butterfree/anim_front.png b/graphics/pokemon/butterfree/anim_front.png
index 991249f0f9..3b4e35d613 100644
Binary files a/graphics/pokemon/butterfree/anim_front.png and b/graphics/pokemon/butterfree/anim_front.png differ
diff --git a/graphics/pokemon/butterfree/anim_frontf.png b/graphics/pokemon/butterfree/anim_frontf.png
index 94768a4e62..4421e6bf2c 100644
Binary files a/graphics/pokemon/butterfree/anim_frontf.png and b/graphics/pokemon/butterfree/anim_frontf.png differ
diff --git a/graphics/pokemon/butterfree/back.png b/graphics/pokemon/butterfree/back.png
index f543025db1..96fbf7300e 100644
Binary files a/graphics/pokemon/butterfree/back.png and b/graphics/pokemon/butterfree/back.png differ
diff --git a/graphics/pokemon/butterfree/backf.png b/graphics/pokemon/butterfree/backf.png
index 5d5236cd4b..a68e2c0395 100644
Binary files a/graphics/pokemon/butterfree/backf.png and b/graphics/pokemon/butterfree/backf.png differ
diff --git a/graphics/pokemon/butterfree/normal.pal b/graphics/pokemon/butterfree/normal.pal
index ab84ea0099..bb638bf60c 100644
--- a/graphics/pokemon/butterfree/normal.pal
+++ b/graphics/pokemon/butterfree/normal.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-0 0 0
 49 49 82
 90 74 115
-131 131 189
-238 238 255
 115 98 172
-189 189 230
-230 98 131
-98 49 57
-255 156 180
-48 48 80
-222 49 49
+131 131 189
 82 123 197
 106 189 205
-240 248 248
+98 49 57
+222 49 49
+230 98 131
+255 156 180
+139 131 172
+156 156 180
+189 189 230
+238 238 255
+0 0 0
diff --git a/graphics/pokemon/butterfree/shiny.pal b/graphics/pokemon/butterfree/shiny.pal
index 32264265b0..0c9ae12cce 100644
--- a/graphics/pokemon/butterfree/shiny.pal
+++ b/graphics/pokemon/butterfree/shiny.pal
@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-152 208 160
-16 16 16
-48 48 80
-88 72 112
-128 128 184
-232 232 248
-112 96 168
-224 184 192
-112 232 112
-48 96 56
-176 248 176
-48 48 80
-32 208 24
-216 80 96
-240 136 128
-240 248 248
+208 208 160
+49 49 82
+90 74 115
+115 98 172
+131 131 189
+222 82 98
+246 139 131
+49 98 57
+32 213 24
+115 238 115
+156 255 156
+180 123 131
+189 139 148
+230 180 189
+255 238 238
+0 0 0
diff --git a/graphics/pokemon/caterpie/anim_front.png b/graphics/pokemon/caterpie/anim_front.png
index 73939253f4..eab11dc995 100644
Binary files a/graphics/pokemon/caterpie/anim_front.png and b/graphics/pokemon/caterpie/anim_front.png differ
diff --git a/graphics/pokemon/caterpie/back.png b/graphics/pokemon/caterpie/back.png
index aca0c0e98c..8160f3cac6 100644
Binary files a/graphics/pokemon/caterpie/back.png and b/graphics/pokemon/caterpie/back.png differ
diff --git a/graphics/pokemon/caterpie/normal.pal b/graphics/pokemon/caterpie/normal.pal
index 76bf98f547..1caf753e7e 100644
--- a/graphics/pokemon/caterpie/normal.pal
+++ b/graphics/pokemon/caterpie/normal.pal
@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-152 208 160
+152 160 208
+24 90 65
+32 123 74
+49 172 65
+74 197 41
+106 213 49
+172 246 65
+82 98 74
+123 131 74
+213 189 131
+246 238 139
 123 57 74
+255 65 65
 255 123 65
 255 180 57
-255 65 65
-32 123 74
-172 246 65
 0 0 0
-24 90 65
-106 213 49
-49 172 65
-246 238 139
-213 189 131
-123 131 74
-72 200 40
-240 232 136
diff --git a/graphics/pokemon/caterpie/shiny.pal b/graphics/pokemon/caterpie/shiny.pal
index 3a5ff2866d..0b489c9684 100644
--- a/graphics/pokemon/caterpie/shiny.pal
+++ b/graphics/pokemon/caterpie/shiny.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-120 40 24
-240 80 16
-248 152 40
-224 32 16
-176 120 16
-248 248 112
-16 16 16
-144 80 32
-248 224 32
-232 168 40
-240 232 168
-232 208 128
-168 128 56
-240 192 24
-240 232 120
+148 82 32
+180 123 16
+238 172 41
+246 197 24
+255 230 32
+255 255 65
+123 98 57
+172 131 57
+238 213 131
+246 238 123
+123 41 24
+230 16 0
+246 82 16
+255 156 41
+0 0 0
diff --git a/graphics/pokemon/charizard/anim_front.png b/graphics/pokemon/charizard/anim_front.png
index 5615646182..9e9efadea9 100644
Binary files a/graphics/pokemon/charizard/anim_front.png and b/graphics/pokemon/charizard/anim_front.png differ
diff --git a/graphics/pokemon/charizard/back.png b/graphics/pokemon/charizard/back.png
index 9f60ee638b..dac2fa87c1 100644
Binary files a/graphics/pokemon/charizard/back.png and b/graphics/pokemon/charizard/back.png differ
diff --git a/graphics/pokemon/charizard/normal.pal b/graphics/pokemon/charizard/normal.pal
index db32d4324c..45a645d2d4 100644
--- a/graphics/pokemon/charizard/normal.pal
+++ b/graphics/pokemon/charizard/normal.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-232 64 32
-128 48 24
-240 160 16
-232 176 88
-248 224 104
-205 82 65
-16 16 16
-238 131 41
-8 64 80
-32 112 144
-200 200 200
-248 248 248
-0 128 248
+0 0 0
+255 255 255
+205 205 205
+98 98 98
 238 222 123
 238 180 90
+238 131 41
+205 82 65
+131 49 24
+32 156 197
+32 115 148
+8 65 82
+255 213 16
+246 164 16
+230 65 16
diff --git a/graphics/pokemon/charizard/shiny.pal b/graphics/pokemon/charizard/shiny.pal
index dce3f7832a..a5c9dfcac2 100644
--- a/graphics/pokemon/charizard/shiny.pal
+++ b/graphics/pokemon/charizard/shiny.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-208 80 16
-32 40 48
-224 176 16
-168 160 176
-224 224 80
-80 80 96
 0 0 0
-128 120 144
-128 16 40
-184 32 64
-200 200 200
-248 248 248
-192 0 0
-216 216 184
-184 184 168
+255 255 255
+205 205 205
+98 98 98
+222 222 172
+189 189 172
+131 123 148
+90 90 106
+49 57 65
+246 65 74
+189 32 65
+131 16 41
+230 230 16
+230 180 16
+213 82 16
diff --git a/graphics/pokemon/charmander/anim_front.png b/graphics/pokemon/charmander/anim_front.png
index ded552567e..2126c56dce 100644
Binary files a/graphics/pokemon/charmander/anim_front.png and b/graphics/pokemon/charmander/anim_front.png differ
diff --git a/graphics/pokemon/charmander/back.png b/graphics/pokemon/charmander/back.png
index 347c5e8215..5415e18ed1 100644
Binary files a/graphics/pokemon/charmander/back.png and b/graphics/pokemon/charmander/back.png differ
diff --git a/graphics/pokemon/charmander/normal.pal b/graphics/pokemon/charmander/normal.pal
index d365db8308..9a006c855c 100644
--- a/graphics/pokemon/charmander/normal.pal
+++ b/graphics/pokemon/charmander/normal.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-216 80 56
-136 40 0
-248 144 64
-248 192 96
 16 16 16
-16 64 136
+180 180 180
+255 255 255
+255 213 123
+230 172 90
+255 197 98
+255 148 65
+222 82 57
+139 41 0
 48 168 232
-248 248 248
-248 208 80
-232 56 24
-240 160 0
-192 96 104
-224 200 136
-248 232 200
-176 176 176
+24 136 176
+8 56 136
+255 213 8
+246 164 0
+230 57 0
diff --git a/graphics/pokemon/charmander/shiny.pal b/graphics/pokemon/charmander/shiny.pal
index 934438a047..40ce4eb574 100644
--- a/graphics/pokemon/charmander/shiny.pal
+++ b/graphics/pokemon/charmander/shiny.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-232 160 16
-144 80 8
-248 216 64
-248 248 184
 16 16 16
-56 120 128
-128 168 200
-248 248 248
-248 216 16
-248 88 32
-248 176 16
-248 88 32
-224 200 104
-248 240 136
-176 176 176
+180 180 180
+255 255 255
+255 246 115
+230 205 82
+255 246 164
+255 222 41
+238 156 0
+148 74 0
+148 197 230
+65 139 148
+24 49 74
+255 222 16
+255 180 16
+255 90 32
diff --git a/graphics/pokemon/charmeleon/anim_front.png b/graphics/pokemon/charmeleon/anim_front.png
index eda3059dfd..7432ebfda1 100644
Binary files a/graphics/pokemon/charmeleon/anim_front.png and b/graphics/pokemon/charmeleon/anim_front.png differ
diff --git a/graphics/pokemon/charmeleon/back.png b/graphics/pokemon/charmeleon/back.png
index ab21e518c4..0eddbd1cfd 100644
Binary files a/graphics/pokemon/charmeleon/back.png and b/graphics/pokemon/charmeleon/back.png differ
diff --git a/graphics/pokemon/charmeleon/normal.pal b/graphics/pokemon/charmeleon/normal.pal
index c72de3517e..c0a7a8bfe3 100644
--- a/graphics/pokemon/charmeleon/normal.pal
+++ b/graphics/pokemon/charmeleon/normal.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-248 208 80
-248 160 0
-232 56 24
-144 32 16
-208 56 56
-248 80 72
-16 16 16
-104 104 104
-248 248 248
-176 176 176
-0 88 248
+255 255 255
+180 180 180
+106 106 106
 248 128 104
-232 200 176
-200 168 120
-184 152 104
+255 82 74
+200 56 56
+148 32 16
+224 200 168
+192 160 112
+16 16 16
+0 88 248
+208 176 136
+255 222 41
+255 164 0
+255 65 0
diff --git a/graphics/pokemon/charmeleon/shiny.pal b/graphics/pokemon/charmeleon/shiny.pal
index ba180ab6d1..bbeaa1bf6e 100644
--- a/graphics/pokemon/charmeleon/shiny.pal
+++ b/graphics/pokemon/charmeleon/shiny.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-248 224 48
-248 176 16
-248 96 32
-144 88 8
-216 160 40
-248 232 48
+255 255 255
+180 180 180
+106 106 106
+255 238 139
+255 230 0
+222 164 41
+148 82 0
+255 246 172
+238 222 90
 16 16 16
-104 104 104
-248 248 248
-176 176 176
-72 136 72
-248 240 184
-248 248 192
-240 232 152
-232 216 112
+40 112 40
+240 232 128
+255 230 49
+255 180 16
+255 98 32
diff --git a/graphics/pokemon/clefable/anim_front.png b/graphics/pokemon/clefable/anim_front.png
index 29bf9d45bb..4c550c5753 100644
Binary files a/graphics/pokemon/clefable/anim_front.png and b/graphics/pokemon/clefable/anim_front.png differ
diff --git a/graphics/pokemon/clefable/back.png b/graphics/pokemon/clefable/back.png
index 48b83f3130..3363cf0c10 100644
Binary files a/graphics/pokemon/clefable/back.png and b/graphics/pokemon/clefable/back.png differ
diff --git a/graphics/pokemon/clefable/normal.pal b/graphics/pokemon/clefable/normal.pal
index 242352f053..5787db59f6 100644
--- a/graphics/pokemon/clefable/normal.pal
+++ b/graphics/pokemon/clefable/normal.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-82 65 57
-16 16 16
-123 106 98
-139 74 82
-222 98 98
-255 197 180
-238 148 148
-189 90 123
-82 49 74
-213 123 164
-248 248 248
+255 255 255
+197 197 197
 131 131 131
-213 123 139
+255 197 180
+208 120 160
+238 148 148
+222 98 98
+139 74 82
+80 48 72
+184 88 120
 222 57 90
-104 72 80
+123 106 98
+82 65 57
+208 120 136
+16 16 16
diff --git a/graphics/pokemon/clefable/shiny.pal b/graphics/pokemon/clefable/shiny.pal
index 0ab423cdcb..dab1b12e78 100644
--- a/graphics/pokemon/clefable/shiny.pal
+++ b/graphics/pokemon/clefable/shiny.pal
@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-152 208 160
-32 120 72
+152 160 208
+255 255 255
+197 197 197
+131 131 131
+255 222 222
+238 156 156
+246 181 181
+222 123 123
+205 90 90
 16 16 16
-80 184 112
-184 96 96
-216 120 120
-248 216 216
-232 184 184
 216 120 120
+216 112 144
+57 189 98
+8 131 65
+216 136 136
 16 16 16
-232 152 152
-248 248 248
-128 128 128
-208 136 152
-222 57 90
-80 48 72
diff --git a/graphics/pokemon/clefairy/anim_front.png b/graphics/pokemon/clefairy/anim_front.png
index 81a77b9ff3..97d36a186c 100644
Binary files a/graphics/pokemon/clefairy/anim_front.png and b/graphics/pokemon/clefairy/anim_front.png differ
diff --git a/graphics/pokemon/clefairy/back.png b/graphics/pokemon/clefairy/back.png
index f27aa6d927..f02582cd8f 100644
Binary files a/graphics/pokemon/clefairy/back.png and b/graphics/pokemon/clefairy/back.png differ
diff --git a/graphics/pokemon/clefairy/normal.pal b/graphics/pokemon/clefairy/normal.pal
index ac2d66f749..43177b7d1e 100644
--- a/graphics/pokemon/clefairy/normal.pal
+++ b/graphics/pokemon/clefairy/normal.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-156 82 82
-230 123 123
-255 213 189
-115 74 57
-90 49 32
-156 131 115
-16 16 16
-255 172 172
-148 148 148
 255 255 255
-238 65 57
+197 197 197
 148 148 148
-176 56 40
-0 0 0
-0 0 0
+238 65 57
+180 57 41
+152 128 112
+112 72 56
+88 48 32
+112 40 8
+255 0 255
+248 208 184
+248 168 168
+230 123 123
+156 82 82
+16 16 16
diff --git a/graphics/pokemon/clefairy/shiny.pal b/graphics/pokemon/clefairy/shiny.pal
index b6d39c3bc5..ef617d1ca9 100644
--- a/graphics/pokemon/clefairy/shiny.pal
+++ b/graphics/pokemon/clefairy/shiny.pal
@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-152 208 160
-136 64 64
-216 136 136
-248 216 216
-96 184 80
-56 128 32
-128 224 96
+152 160 208
+255 255 255
+197 197 197
+148 148 148
+238 65 57
+180 57 41
+96 224 56
+64 184 48
+41 131 8
+0 82 0
+255 0 255
+255 222 222
+246 172 172
+216 112 112
+160 64 64
 16 16 16
-240 176 176
-144 144 144
-248 248 248
-216 120 112
-144 144 144
-176 80 72
-0 0 0
-0 0 0
diff --git a/graphics/pokemon/diglett/anim_front.png b/graphics/pokemon/diglett/anim_front.png
index f7a8edcde2..202a2a1788 100644
Binary files a/graphics/pokemon/diglett/anim_front.png and b/graphics/pokemon/diglett/anim_front.png differ
diff --git a/graphics/pokemon/diglett/back.png b/graphics/pokemon/diglett/back.png
index 558892d456..b4f98c8d80 100644
Binary files a/graphics/pokemon/diglett/back.png and b/graphics/pokemon/diglett/back.png differ
diff --git a/graphics/pokemon/diglett/normal.pal b/graphics/pokemon/diglett/normal.pal
index 0e0e4694ce..1eff24bb31 100644
--- a/graphics/pokemon/diglett/normal.pal
+++ b/graphics/pokemon/diglett/normal.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-164 90 90
-222 156 90
-197 115 65
-90 49 24
 255 255 255
-16 16 16
-213 57 74
-115 0 24
 255 172 148
 255 106 90
-131 123 74
-180 172 115
-90 82 32
+213 57 74
+115 0 24
 230 230 180
-0 0 0
+180 172 115
+131 123 74
+90 82 32
+123 123 123
+16 16 16
+222 156 90
+197 115 65
+164 90 90
+90 49 24
diff --git a/graphics/pokemon/diglett/shiny.pal b/graphics/pokemon/diglett/shiny.pal
index b86a59ff4b..8fef662bbf 100644
--- a/graphics/pokemon/diglett/shiny.pal
+++ b/graphics/pokemon/diglett/shiny.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-152 88 104
-208 152 104
-184 112 80
-88 48 24
-248 248 248
+255 255 255
+131 148 246
+90 106 205
+49 82 164
+8 41 123
+230 230 180
+180 172 115
+131 123 74
+90 82 32
+123 123 123
 16 16 16
-48 80 160
-8 40 120
-128 144 240
-88 104 200
-128 120 72
-176 168 112
-88 80 32
-224 224 176
-0 0 0
+213 156 106
+189 115 82
+156 90 106
+82 49 41
diff --git a/graphics/pokemon/dugtrio/anim_front.png b/graphics/pokemon/dugtrio/anim_front.png
index 55129fa47b..0119b370c4 100644
Binary files a/graphics/pokemon/dugtrio/anim_front.png and b/graphics/pokemon/dugtrio/anim_front.png differ
diff --git a/graphics/pokemon/dugtrio/back.png b/graphics/pokemon/dugtrio/back.png
index 5beb1643f5..bc74c0c979 100644
Binary files a/graphics/pokemon/dugtrio/back.png and b/graphics/pokemon/dugtrio/back.png differ
diff --git a/graphics/pokemon/dugtrio/normal.pal b/graphics/pokemon/dugtrio/normal.pal
index 834d6d4db2..1eff24bb31 100644
--- a/graphics/pokemon/dugtrio/normal.pal
+++ b/graphics/pokemon/dugtrio/normal.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-164 90 90
-222 156 90
-90 49 24
-197 115 65
 255 255 255
-16 16 16
-115 0 24
 255 172 148
 255 106 90
 213 57 74
-131 123 74
-180 172 115
-90 82 32
+115 0 24
 230 230 180
-0 0 0
+180 172 115
+131 123 74
+90 82 32
+123 123 123
+16 16 16
+222 156 90
+197 115 65
+164 90 90
+90 49 24
diff --git a/graphics/pokemon/dugtrio/shiny.pal b/graphics/pokemon/dugtrio/shiny.pal
index eeda85d9a1..8fef662bbf 100644
--- a/graphics/pokemon/dugtrio/shiny.pal
+++ b/graphics/pokemon/dugtrio/shiny.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-152 88 104
-208 152 104
-80 48 40
-184 112 80
-248 248 248
+255 255 255
+131 148 246
+90 106 205
+49 82 164
+8 41 123
+230 230 180
+180 172 115
+131 123 74
+90 82 32
+123 123 123
 16 16 16
-8 40 120
-128 144 240
-88 104 200
-48 80 160
-128 120 72
-176 168 112
-88 80 32
-224 224 176
-0 0 0
+213 156 106
+189 115 82
+156 90 106
+82 49 41
diff --git a/graphics/pokemon/ekans/anim_front.png b/graphics/pokemon/ekans/anim_front.png
index bcd520eb07..15ad69a160 100644
Binary files a/graphics/pokemon/ekans/anim_front.png and b/graphics/pokemon/ekans/anim_front.png differ
diff --git a/graphics/pokemon/ekans/back.png b/graphics/pokemon/ekans/back.png
index 7792edd9f4..9b2c3b9deb 100644
Binary files a/graphics/pokemon/ekans/back.png and b/graphics/pokemon/ekans/back.png differ
diff --git a/graphics/pokemon/ekans/normal.pal b/graphics/pokemon/ekans/normal.pal
index 54db617b6d..ecc9977f60 100644
--- a/graphics/pokemon/ekans/normal.pal
+++ b/graphics/pokemon/ekans/normal.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-90 16 74
-164 74 139
+255 255 255
+246 115 74
+197 65 24
+156 16 0
+255 230 156
+255 213 106
+230 172 90
+180 123 49
+131 82 16
+16 16 16
 238 164 213
 205 98 180
+164 74 139
 123 49 106
-180 123 49
-255 213 106
-16 16 16
-230 172 90
-156 16 0
-88 72 48
-197 65 24
-246 115 74
-248 224 152
-0 0 0
+90 16 74
diff --git a/graphics/pokemon/ekans/shiny.pal b/graphics/pokemon/ekans/shiny.pal
index d094cd0b84..b3e1a7e962 100644
--- a/graphics/pokemon/ekans/shiny.pal
+++ b/graphics/pokemon/ekans/shiny.pal
@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-152 208 160
-56 56 8
-128 136 56
-216 216 144
-176 176 88
-88 96 24
-176 120 48
-240 216 136
+152 160 208
+255 255 255
+246 115 74
+197 65 24
+156 16 0
+255 230 156
+255 213 106
+230 172 90
+180 123 49
+131 82 16
 16 16 16
-208 160 80
-152 24 16
-128 80 16
-192 80 40
-240 144 120
-248 224 152
-0 0 0
+238 238 156
+172 172 57
+131 139 32
+106 115 16
+90 90 0
diff --git a/graphics/pokemon/fearow/anim_front.png b/graphics/pokemon/fearow/anim_front.png
index e891c121b0..036efc2428 100644
Binary files a/graphics/pokemon/fearow/anim_front.png and b/graphics/pokemon/fearow/anim_front.png differ
diff --git a/graphics/pokemon/fearow/back.png b/graphics/pokemon/fearow/back.png
index 6c0f29e86b..a9c5d7d072 100644
Binary files a/graphics/pokemon/fearow/back.png and b/graphics/pokemon/fearow/back.png differ
diff --git a/graphics/pokemon/fearow/normal.pal b/graphics/pokemon/fearow/normal.pal
index 43c311727d..b183d51537 100644
--- a/graphics/pokemon/fearow/normal.pal
+++ b/graphics/pokemon/fearow/normal.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
+0 0 0
+238 213 180
+213 164 90
+180 115 32
 139 82 49
 98 57 32
-213 164 90
-0 0 0
-180 115 32
-123 32 32
+255 213 189
+255 131 106
 230 65 65
 180 32 32
-255 131 106
-98 90 57
-230 213 180
+123 32 32
 255 255 255
-238 213 180
+230 213 180
 172 164 106
-208 128 128
+98 90 57
diff --git a/graphics/pokemon/fearow/shiny.pal b/graphics/pokemon/fearow/shiny.pal
index 7b60073d71..c60a6e80db 100644
--- a/graphics/pokemon/fearow/shiny.pal
+++ b/graphics/pokemon/fearow/shiny.pal
@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-152 208 160
+152 160 208
+0 0 0
+238 246 197
+213 222 90
+180 189 32
 139 139 49
 98 57 32
-213 222 90
-0 0 0
-180 189 32
-139 49 0
+255 255 164
+255 238 65
 255 164 0
 213 123 0
-255 238 65
-98 98 57
-230 222 180
+139 49 0
 255 255 255
-238 246 197
+230 222 180
 172 172 106
-208 128 128
+98 98 57
diff --git a/graphics/pokemon/geodude/anim_front.png b/graphics/pokemon/geodude/anim_front.png
index 233ace81dc..bec411d1e2 100644
Binary files a/graphics/pokemon/geodude/anim_front.png and b/graphics/pokemon/geodude/anim_front.png differ
diff --git a/graphics/pokemon/geodude/back.png b/graphics/pokemon/geodude/back.png
index d24ae825c2..6aba658f6c 100644
Binary files a/graphics/pokemon/geodude/back.png and b/graphics/pokemon/geodude/back.png differ
diff --git a/graphics/pokemon/geodude/normal.pal b/graphics/pokemon/geodude/normal.pal
index 29e9e74095..e484e96953 100644
--- a/graphics/pokemon/geodude/normal.pal
+++ b/graphics/pokemon/geodude/normal.pal
@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-152 208 160
-106 106 82
-65 57 49
-197 213 172
-180 180 156
-156 148 131
+152 160 208
 16 16 16
-205 222 205
+65 57 49
+106 106 82
+156 148 131
+180 180 156
+197 213 172
+123 24 32
+197 49 49
+230 74 65
 255 255 255
-56 40 56
-136 16 16
-232 128 120
-0 0 0
+205 222 205
+148 156 156
 0 0 0
 0 0 0
 0 0 0
diff --git a/graphics/pokemon/geodude/shiny.pal b/graphics/pokemon/geodude/shiny.pal
index be09a9dc1a..0e259715a4 100644
--- a/graphics/pokemon/geodude/shiny.pal
+++ b/graphics/pokemon/geodude/shiny.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-176 120 32
-136 72 24
-248 240 96
-240 200 56
-208 152 40
 16 16 16
-200 216 200
-248 248 248
-56 40 56
-122 36 43
-229 96 89
-0 0 0
+156 65 0
+189 115 0
+213 148 0
+246 197 8
+255 238 49
+123 24 32
+197 49 49
+230 74 65
+255 255 255
+205 222 205
+148 156 156
 0 0 0
 0 0 0
 0 0 0
diff --git a/graphics/pokemon/gloom/anim_front.png b/graphics/pokemon/gloom/anim_front.png
index eae8b8e89f..4ad5cb643d 100644
Binary files a/graphics/pokemon/gloom/anim_front.png and b/graphics/pokemon/gloom/anim_front.png differ
diff --git a/graphics/pokemon/gloom/anim_frontf.png b/graphics/pokemon/gloom/anim_frontf.png
index 00203a3923..c2cfc55517 100644
Binary files a/graphics/pokemon/gloom/anim_frontf.png and b/graphics/pokemon/gloom/anim_frontf.png differ
diff --git a/graphics/pokemon/gloom/back.png b/graphics/pokemon/gloom/back.png
index 52d9ccf997..e1d47e9b16 100644
Binary files a/graphics/pokemon/gloom/back.png and b/graphics/pokemon/gloom/back.png differ
diff --git a/graphics/pokemon/gloom/backf.png b/graphics/pokemon/gloom/backf.png
index 6f6bb3bcf4..8b57986c90 100644
Binary files a/graphics/pokemon/gloom/backf.png and b/graphics/pokemon/gloom/backf.png differ
diff --git a/graphics/pokemon/gloom/normal.pal b/graphics/pokemon/gloom/normal.pal
index 6d66df35ca..0400114f39 100644
--- a/graphics/pokemon/gloom/normal.pal
+++ b/graphics/pokemon/gloom/normal.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-88 40 0
-131 57 24
-205 115 74
-172 82 57
-16 16 16
+246 238 189
 255 189 65
 255 115 0
-240 232 184
 197 115 41
 139 57 24
-74 106 123
-16 49 74
-123 131 164
+205 115 74
+172 82 57
+131 57 24
+90 41 0
 180 90 197
 156 164 205
+123 131 164
+74 106 123
+16 49 74
+16 16 16
diff --git a/graphics/pokemon/gloom/shiny.pal b/graphics/pokemon/gloom/shiny.pal
index d9714b7bad..50af6341d2 100644
--- a/graphics/pokemon/gloom/shiny.pal
+++ b/graphics/pokemon/gloom/shiny.pal
@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-152 208 160
-112 64 0
-136 104 32
-240 216 128
-184 136 64
+152 160 208
+246 238 189
+246 213 106
+230 172 65
+164 123 24
+123 74 0
+230 180 106
+189 139 65
+139 106 24
+115 65 0
+222 123 32
+180 222 139
+148 180 82
+82 123 32
+41 82 8
 16 16 16
-240 216 128
-216 168 80
-240 232 184
-160 120 40
-120 72 0
-80 112 40
-48 80 24
-144 168 88
-216 136 64
-176 216 136
diff --git a/graphics/pokemon/golbat/anim_front.png b/graphics/pokemon/golbat/anim_front.png
index 411cafc615..73d663e826 100644
Binary files a/graphics/pokemon/golbat/anim_front.png and b/graphics/pokemon/golbat/anim_front.png differ
diff --git a/graphics/pokemon/golbat/anim_frontf.png b/graphics/pokemon/golbat/anim_frontf.png
index b90cc8e7cd..a4e223a122 100644
Binary files a/graphics/pokemon/golbat/anim_frontf.png and b/graphics/pokemon/golbat/anim_frontf.png differ
diff --git a/graphics/pokemon/golbat/back.png b/graphics/pokemon/golbat/back.png
index 192fc0409d..78275bb278 100644
Binary files a/graphics/pokemon/golbat/back.png and b/graphics/pokemon/golbat/back.png differ
diff --git a/graphics/pokemon/golbat/backf.png b/graphics/pokemon/golbat/backf.png
index 2518aca816..56b0d7a9f8 100644
Binary files a/graphics/pokemon/golbat/backf.png and b/graphics/pokemon/golbat/backf.png differ
diff --git a/graphics/pokemon/golbat/normal.pal b/graphics/pokemon/golbat/normal.pal
index 048e118a79..d10763584b 100644
--- a/graphics/pokemon/golbat/normal.pal
+++ b/graphics/pokemon/golbat/normal.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-98 131 205
-57 57 123
+255 255 255
+213 213 213
+98 98 98
 0 0 0
 172 205 255
 90 172 238
+98 131 205
+57 57 123
+205 106 180
 172 82 172
 148 57 123
 98 16 82
-205 106 180
-98 98 98
-213 213 213
-255 255 255
-0 0 0
-0 0 0
-0 0 0
+255 0 255
+255 0 255
+255 0 255
diff --git a/graphics/pokemon/golbat/shiny.pal b/graphics/pokemon/golbat/shiny.pal
index 78263a17a6..8260295cfe 100644
--- a/graphics/pokemon/golbat/shiny.pal
+++ b/graphics/pokemon/golbat/shiny.pal
@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-152 208 160
-56 112 16
-16 72 8
-16 16 16
-136 208 88
-112 152 56
-200 120 128
-184 88 96
-168 48 56
-224 176 168
-96 96 96
-208 208 208
-248 248 248
-96 96 96
-0 0 0
+152 160 208
+255 255 255
+213 213 213
+98 98 98
 0 0 0
+131 213 74
+106 156 41
+49 115 0
+8 74 0
+255 172 164
+230 115 123
+213 82 90
+197 41 49
+255 0 255
+255 0 255
+255 0 255
diff --git a/graphics/pokemon/golduck/anim_front.png b/graphics/pokemon/golduck/anim_front.png
index 9274e4ff6e..4490ae1847 100644
Binary files a/graphics/pokemon/golduck/anim_front.png and b/graphics/pokemon/golduck/anim_front.png differ
diff --git a/graphics/pokemon/golduck/back.png b/graphics/pokemon/golduck/back.png
index 1e1b774cb2..79c8b611bc 100644
Binary files a/graphics/pokemon/golduck/back.png and b/graphics/pokemon/golduck/back.png differ
diff --git a/graphics/pokemon/golduck/normal.pal b/graphics/pokemon/golduck/normal.pal
index 9caf6c3b4d..63a96f8cf3 100644
--- a/graphics/pokemon/golduck/normal.pal
+++ b/graphics/pokemon/golduck/normal.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-49 82 106
-139 172 213
-16 16 16
-123 123 180
-222 24 24
 255 255 255
-139 0 0
-255 172 172
 213 213 213
-115 106 16
-255 255 164
-164 164 57
-213 213 106
+240 104 104
+222 24 24
 139 0 0
-160 216 248
+255 255 164
+213 213 106
+164 164 57
+115 106 16
+255 0 255
+164 197 255
+139 172 213
+123 123 180
+49 82 106
+16 16 16
diff --git a/graphics/pokemon/golduck/shiny.pal b/graphics/pokemon/golduck/shiny.pal
index 34873747f1..ee2de391e7 100644
--- a/graphics/pokemon/golduck/shiny.pal
+++ b/graphics/pokemon/golduck/shiny.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-48 80 136
-112 184 248
+255 255 255
+213 213 213
+255 172 172
+222 24 24
+139 0 0
+255 197 197
+246 148 148
+230 115 123
+152 64 64
+255 0 255
+148 222 255
+106 180 255
+98 123 213
+56 80 104
 16 16 16
-96 120 200
-216 64 64
-248 248 248
-136 40 24
-248 168 168
-208 208 208
-184 104 104
-248 200 200
-216 112 120
-232 152 152
-136 40 24
-144 216 248
diff --git a/graphics/pokemon/golem/anim_front.png b/graphics/pokemon/golem/anim_front.png
index d9aebe6124..b40b3edff8 100644
Binary files a/graphics/pokemon/golem/anim_front.png and b/graphics/pokemon/golem/anim_front.png differ
diff --git a/graphics/pokemon/golem/back.png b/graphics/pokemon/golem/back.png
index 0dadea5aac..febc2ab3dc 100644
Binary files a/graphics/pokemon/golem/back.png and b/graphics/pokemon/golem/back.png differ
diff --git a/graphics/pokemon/golem/normal.pal b/graphics/pokemon/golem/normal.pal
index 0006a7dca5..afe12d63b8 100644
--- a/graphics/pokemon/golem/normal.pal
+++ b/graphics/pokemon/golem/normal.pal
@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-152 208 160
-65 74 16
+152 160 208
+255 255 255
+205 205 205
+115 115 115
+255 82 82
+180 0 0
+180 189 98
 139 148 65
 98 106 32
-180 189 98
-16 16 16
-115 115 115
-255 255 255
-90 74 16
-205 205 205
+65 74 16
+246 222 139
 213 180 90
 156 139 82
-246 222 139
-180 0 0
-255 82 82
-168 32 0
+90 74 16
+255 0 255
+16 16 16
diff --git a/graphics/pokemon/golem/shiny.pal b/graphics/pokemon/golem/shiny.pal
index f9556290dd..ebc6e44a22 100644
--- a/graphics/pokemon/golem/shiny.pal
+++ b/graphics/pokemon/golem/shiny.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-104 56 8
-176 136 48
-144 96 16
-208 168 80
+255 255 255
+205 205 205
+115 115 115
+255 82 82
+180 0 0
+213 172 82
+180 139 49
+148 98 8
+115 57 0
+238 222 197
+230 205 164
+197 156 123
+139 98 74
+255 0 255
 16 16 16
-112 112 112
-248 248 248
-136 96 72
-200 200 200
-224 200 160
-192 152 120
-232 216 192
-176 32 32
-248 104 104
-176 32 32
diff --git a/graphics/pokemon/graveler/anim_front.png b/graphics/pokemon/graveler/anim_front.png
index 8a1d432f75..d00a529496 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/back.png b/graphics/pokemon/graveler/back.png
index 9154bfe38a..b6cfed49af 100644
Binary files a/graphics/pokemon/graveler/back.png and b/graphics/pokemon/graveler/back.png differ
diff --git a/graphics/pokemon/graveler/normal.pal b/graphics/pokemon/graveler/normal.pal
index 7a0929c16f..c8a0885b4c 100644
--- a/graphics/pokemon/graveler/normal.pal
+++ b/graphics/pokemon/graveler/normal.pal
@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-152 208 160
-74 65 49
-213 213 172
-180 180 156
-148 139 123
-106 106 82
+152 160 208
 0 0 0
+74 65 49
+106 106 82
+148 139 123
+180 180 156
+213 213 172
+131 123 131
+222 213 222
 255 255 255
+0 0 0
+0 0 0
 189 74 57
 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/graveler/shiny.pal b/graphics/pokemon/graveler/shiny.pal
index b00659cb79..ee926f5178 100644
--- a/graphics/pokemon/graveler/shiny.pal
+++ b/graphics/pokemon/graveler/shiny.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-80 24 16
-200 176 64
-184 136 32
-152 96 24
-112 56 16
-16 16 16
-248 248 248
-184 72 56
-0 0 0
-0 0 0
-0 0 0
-0 0 0
+0 0 0
+90 16 0
+123 57 0
+156 90 0
+189 131 0
+197 172 32
+131 123 131
+222 213 222
+255 255 255
+0 0 0
+0 0 0
+189 74 57
 0 0 0
 0 0 0
 0 0 0
diff --git a/graphics/pokemon/growlithe/anim_front.png b/graphics/pokemon/growlithe/anim_front.png
index 8017e15177..d0f170ea84 100644
Binary files a/graphics/pokemon/growlithe/anim_front.png and b/graphics/pokemon/growlithe/anim_front.png differ
diff --git a/graphics/pokemon/growlithe/back.png b/graphics/pokemon/growlithe/back.png
index 30be0614f7..835d9d88a2 100644
Binary files a/graphics/pokemon/growlithe/back.png and b/graphics/pokemon/growlithe/back.png differ
diff --git a/graphics/pokemon/growlithe/normal.pal b/graphics/pokemon/growlithe/normal.pal
index 7517c29290..49e3d09b20 100644
--- a/graphics/pokemon/growlithe/normal.pal
+++ b/graphics/pokemon/growlithe/normal.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-115 98 32
+255 255 246
+222 222 213
+106 106 106
+246 123 65
+205 74 74
+123 49 8
 255 246 164
-197 172 98
-16 16 16
 222 205 123
+192 168 96
+115 98 32
+248 176 80
+238 139 74
 197 82 82
 115 57 16
-255 180 82
-238 139 74
-115 98 32
-106 106 106
-88 88 120
-248 248 240
-216 216 208
-168 48 16
+16 16 16
diff --git a/graphics/pokemon/growlithe/shiny.pal b/graphics/pokemon/growlithe/shiny.pal
index d59ffd9502..97fda151db 100644
--- a/graphics/pokemon/growlithe/shiny.pal
+++ b/graphics/pokemon/growlithe/shiny.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-104 96 48
-240 240 176
-192 176 112
-16 16 16
-208 200 136
-184 168 64
-120 88 24
-248 248 168
-232 224 64
-136 128 72
-80 80 80
-88 88 120
-248 248 240
-216 216 208
+255 255 246
+222 222 213
+106 106 106
 246 123 65
+205 74 74
+123 49 8
+246 246 180
+213 205 139
+197 180 115
+106 98 49
+255 255 156
+246 238 49
+197 180 49
+139 98 8
+16 16 16
diff --git a/graphics/pokemon/ivysaur/anim_front.png b/graphics/pokemon/ivysaur/anim_front.png
index 5a040c4155..1fe645853a 100644
Binary files a/graphics/pokemon/ivysaur/anim_front.png and b/graphics/pokemon/ivysaur/anim_front.png differ
diff --git a/graphics/pokemon/ivysaur/back.png b/graphics/pokemon/ivysaur/back.png
index 22b7464c0b..004cf339b4 100644
Binary files a/graphics/pokemon/ivysaur/back.png and b/graphics/pokemon/ivysaur/back.png differ
diff --git a/graphics/pokemon/ivysaur/normal.pal b/graphics/pokemon/ivysaur/normal.pal
index 8ce5c7c845..30f8e8be5a 100644
--- a/graphics/pokemon/ivysaur/normal.pal
+++ b/graphics/pokemon/ivysaur/normal.pal
@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-152 208 160
-120 48 40
-216 64 88
-248 176 168
-248 120 120
-16 16 16
-16 64 72
-120 216 112
-48 128 80
-96 176 88
-128 232 216
-88 208 184
+152 160 208
+255 255 255
+255 172 164
+255 123 123
+213 65 90
+128 224 208
+88 200 184
 32 144 128
-248 248 248
-160 48 16
-224 80 56
+16 65 74
+120 208 112
+96 168 88
+48 120 80
+16 72 56
+197 115 57
+123 49 41
+16 16 16
diff --git a/graphics/pokemon/ivysaur/shiny.pal b/graphics/pokemon/ivysaur/shiny.pal
index 27e7a2bed7..cf39cdcf64 100644
--- a/graphics/pokemon/ivysaur/shiny.pal
+++ b/graphics/pokemon/ivysaur/shiny.pal
@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-153 210 164
-107 77 48
-205 139 16
+152 160 208
+255 255 255
 255 255 156
 255 213 0
-16 16 16
-49 90 16
-139 222 74
-49 131 49
-90 172 32
+205 139 16
 205 246 82
 164 213 74
 123 164 49
-255 255 255
-160 48 16
-224 80 56
+57 98 32
+139 222 74
+90 172 32
+49 131 49
+49 90 16
+213 98 57
+139 32 41
+16 16 16
diff --git a/graphics/pokemon/jigglypuff/anim_front.png b/graphics/pokemon/jigglypuff/anim_front.png
index e7d76e1c06..17173331d8 100644
Binary files a/graphics/pokemon/jigglypuff/anim_front.png and b/graphics/pokemon/jigglypuff/anim_front.png differ
diff --git a/graphics/pokemon/jigglypuff/back.png b/graphics/pokemon/jigglypuff/back.png
index 4eac977a9b..0c12a83007 100644
Binary files a/graphics/pokemon/jigglypuff/back.png and b/graphics/pokemon/jigglypuff/back.png differ
diff --git a/graphics/pokemon/jigglypuff/normal.pal b/graphics/pokemon/jigglypuff/normal.pal
index 6f4d96e9d2..5ab3f90797 100644
--- a/graphics/pokemon/jigglypuff/normal.pal
+++ b/graphics/pokemon/jigglypuff/normal.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-164 16 32
+255 255 255
+200 232 248
+16 176 232
+24 112 192
+16 72 136
+104 80 96
+72 56 88
+230 230 230
+164 49 0
+213 57 49
+16 16 16
+255 205 197
 255 172 164
 230 115 131
-16 16 16
-115 65 24
-255 255 255
-115 98 222
-65 49 156
-148 131 255
-205 189 255
-168 16 0
-232 64 48
-0 0 0
-0 0 0
-0 0 0
+164 16 32
diff --git a/graphics/pokemon/jigglypuff/shiny.pal b/graphics/pokemon/jigglypuff/shiny.pal
index 36b8d0ce56..3bfdb77e58 100644
--- a/graphics/pokemon/jigglypuff/shiny.pal
+++ b/graphics/pokemon/jigglypuff/shiny.pal
@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-153 210 164
-123 90 115
-246 205 238
-222 156 197
-16 16 16
-140 99 43
+152 160 208
 255 255 255
-24 172 74
-41 123 49
-24 222 164
-212 213 216
-163 69 32
-211 97 93
-0 0 0
-0 0 0
-0 0 0
+205 255 189
+24 216 160
+24 168 72
+40 120 48
+156 106 32
+115 65 24
+230 230 230
+164 49 0
+213 57 49
+16 16 16
+255 230 255
+240 200 232
+216 152 192
+120 88 112
diff --git a/graphics/pokemon/kadabra/anim_front.png b/graphics/pokemon/kadabra/anim_front.png
index e45979f239..2096f22335 100644
Binary files a/graphics/pokemon/kadabra/anim_front.png and b/graphics/pokemon/kadabra/anim_front.png differ
diff --git a/graphics/pokemon/kadabra/anim_frontf.png b/graphics/pokemon/kadabra/anim_frontf.png
index 4e2c40e41d..e78ff9e706 100644
Binary files a/graphics/pokemon/kadabra/anim_frontf.png and b/graphics/pokemon/kadabra/anim_frontf.png differ
diff --git a/graphics/pokemon/kadabra/back.png b/graphics/pokemon/kadabra/back.png
index a3e025f8f0..4ea3df19dd 100644
Binary files a/graphics/pokemon/kadabra/back.png and b/graphics/pokemon/kadabra/back.png differ
diff --git a/graphics/pokemon/kadabra/backf.png b/graphics/pokemon/kadabra/backf.png
index 6e4d57eff0..45a60bf7db 100644
Binary files a/graphics/pokemon/kadabra/backf.png and b/graphics/pokemon/kadabra/backf.png differ
diff --git a/graphics/pokemon/kadabra/normal.pal b/graphics/pokemon/kadabra/normal.pal
index a69a8d21ce..c607508da9 100644
--- a/graphics/pokemon/kadabra/normal.pal
+++ b/graphics/pokemon/kadabra/normal.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-139 115 16
-98 74 8
+255 255 255
+222 222 222
+180 180 180
+90 90 90
+230 57 41
+197 164 82
+164 115 41
+123 82 8
+90 57 8
+255 255 189
 255 238 41
 213 189 8
+139 115 16
+98 74 8
 16 16 16
-230 57 41
-90 57 8
-164 115 41
-216 216 216
-248 248 248
-88 88 88
-123 82 8
-176 176 176
-248 248 184
-200 168 168
diff --git a/graphics/pokemon/kadabra/shiny.pal b/graphics/pokemon/kadabra/shiny.pal
index 1d0d44c74e..f0c824094d 100644
--- a/graphics/pokemon/kadabra/shiny.pal
+++ b/graphics/pokemon/kadabra/shiny.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-176 112 16
-128 88 24
-248 240 128
-224 176 64
+255 255 255
+222 222 222
+180 180 180
+90 90 90
+222 49 41
+222 180 189
+180 123 131
+131 82 90
+90 49 57
+255 246 230
+255 246 131
+230 180 65
+180 115 16
+131 90 24
 16 16 16
-224 72 64
-88 48 56
-176 120 128
-216 216 216
-248 248 248
-88 88 88
-128 80 88
-176 176 176
-248 240 224
-216 176 184
diff --git a/graphics/pokemon/kakuna/anim_front.png b/graphics/pokemon/kakuna/anim_front.png
index f588b64e00..78f7fd2696 100644
Binary files a/graphics/pokemon/kakuna/anim_front.png and b/graphics/pokemon/kakuna/anim_front.png differ
diff --git a/graphics/pokemon/kakuna/back.png b/graphics/pokemon/kakuna/back.png
index 68d6c76111..ef55df0be0 100644
Binary files a/graphics/pokemon/kakuna/back.png and b/graphics/pokemon/kakuna/back.png differ
diff --git a/graphics/pokemon/kakuna/normal.pal b/graphics/pokemon/kakuna/normal.pal
index 91ff072e55..3dd39c3ee6 100644
--- a/graphics/pokemon/kakuna/normal.pal
+++ b/graphics/pokemon/kakuna/normal.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-222 164 82
-180 123 0
-246 213 74
-255 246 205
-139 90 0
-90 57 0
-57 57 57
-106 106 106
-16 16 16
 255 255 255
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
+255 246 205
+240 200 48
+200 152 16
+152 120 0
+120 88 0
+72 56 0
+255 0 255
+255 0 255
+106 106 106
+57 57 57
+16 16 16
+255 0 255
+255 0 255
+255 0 255
diff --git a/graphics/pokemon/kakuna/shiny.pal b/graphics/pokemon/kakuna/shiny.pal
index 970c6af701..5a6bb2de01 100644
--- a/graphics/pokemon/kakuna/shiny.pal
+++ b/graphics/pokemon/kakuna/shiny.pal
@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-152 208 160
-128 184 40
-80 136 0
-168 248 0
-208 248 152
-48 104 16
-24 64 0
-56 56 56
-104 104 104
+152 160 208
+255 255 255
+213 255 156
+172 255 0
+131 189 41
+82 139 0
+49 106 16
+24 65 0
+255 0 255
+255 0 255
+106 106 106
+57 57 57
 16 16 16
-248 248 248
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
+255 0 255
+255 0 255
+255 0 255
diff --git a/graphics/pokemon/machamp/anim_front.png b/graphics/pokemon/machamp/anim_front.png
index 914f620c7d..4b4c47e885 100644
Binary files a/graphics/pokemon/machamp/anim_front.png and b/graphics/pokemon/machamp/anim_front.png differ
diff --git a/graphics/pokemon/machamp/back.png b/graphics/pokemon/machamp/back.png
index 88b043558f..7b9f905cf2 100644
Binary files a/graphics/pokemon/machamp/back.png and b/graphics/pokemon/machamp/back.png differ
diff --git a/graphics/pokemon/machamp/normal.pal b/graphics/pokemon/machamp/normal.pal
index b08105e308..c913230827 100644
--- a/graphics/pokemon/machamp/normal.pal
+++ b/graphics/pokemon/machamp/normal.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
+0 0 0
+74 74 98
 65 82 98
 131 139 148
 164 180 180
-0 0 0
-112 96 72
-74 74 98
+197 213 222
+82 65 0
+131 115 41
 172 156 65
-184 0 0
-248 248 248
-128 112 40
-240 232 152
-80 64 0
-200 192 96
-224 80 56
-168 48 16
+205 197 98
+246 238 156
+255 74 57
+189 0 0
+205 222 238
+255 255 255
diff --git a/graphics/pokemon/machamp/shiny.pal b/graphics/pokemon/machamp/shiny.pal
index 3bbeb67226..20887b0aae 100644
--- a/graphics/pokemon/machamp/shiny.pal
+++ b/graphics/pokemon/machamp/shiny.pal
@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-152 208 160
-56 80 24
-104 136 56
-152 184 88
-8 8 8
-80 64 24
+152 160 208
+0 0 0
 49 74 0
-160 152 80
-184 32 32
-248 248 248
-128 112 40
-216 208 144
-80 64 24
-200 192 96
-248 104 88
-184 32 32
+74 106 16
+106 139 41
+148 189 74
+172 222 106
+82 65 0
+131 115 41
+172 156 65
+205 197 98
+246 238 156
+255 74 57
+189 0 0
+205 222 238
+255 255 255
diff --git a/graphics/pokemon/machoke/anim_front.png b/graphics/pokemon/machoke/anim_front.png
index 0698723bb3..d770f9910c 100644
Binary files a/graphics/pokemon/machoke/anim_front.png and b/graphics/pokemon/machoke/anim_front.png differ
diff --git a/graphics/pokemon/machoke/back.png b/graphics/pokemon/machoke/back.png
index 8d0c231691..0403e37ada 100644
Binary files a/graphics/pokemon/machoke/back.png and b/graphics/pokemon/machoke/back.png differ
diff --git a/graphics/pokemon/machoke/normal.pal b/graphics/pokemon/machoke/normal.pal
index 1dab6bec2d..60348197e4 100644
--- a/graphics/pokemon/machoke/normal.pal
+++ b/graphics/pokemon/machoke/normal.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-82 57 0
-16 16 16
-238 230 139
-205 189 98
-139 115 180
-189 156 230
+0 0 0
+74 74 98
 106 49 131
+139 115 180
+164 139 205
+189 156 230
 205 189 230
-197 0 0
-248 248 248
-156 57 123
-240 224 120
-72 72 96
-200 176 96
+82 57 0
 131 115 41
+205 189 98
+238 230 139
+156 57 123
+197 0 0
+205 222 238
+255 255 255
diff --git a/graphics/pokemon/machoke/shiny.pal b/graphics/pokemon/machoke/shiny.pal
index 0a5c93d312..640441c223 100644
--- a/graphics/pokemon/machoke/shiny.pal
+++ b/graphics/pokemon/machoke/shiny.pal
@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-248 160 176
-96 72 24
-16 16 16
-232 224 136
-200 184 96
-104 136 56
-144 184 112
-40 88 0
-176 216 144
-32 120 176
-248 248 248
-24 96 136
-232 224 136
-72 72 96
-200 184 96
-128 112 40
+208 152 160
+0 0 0
+16 65 0
+41 90 0
+82 115 41
+123 156 90
+148 189 115
+180 222 148
+82 57 0
+131 115 41
+205 189 98
+238 230 139
+0 98 156
+0 115 197
+205 222 238
+255 255 255
diff --git a/graphics/pokemon/machop/anim_front.png b/graphics/pokemon/machop/anim_front.png
index 805d96efb9..3cd8f12105 100644
Binary files a/graphics/pokemon/machop/anim_front.png and b/graphics/pokemon/machop/anim_front.png differ
diff --git a/graphics/pokemon/machop/back.png b/graphics/pokemon/machop/back.png
index 8c8a28c8d9..2d4cdb6074 100644
Binary files a/graphics/pokemon/machop/back.png and b/graphics/pokemon/machop/back.png differ
diff --git a/graphics/pokemon/machop/normal.pal b/graphics/pokemon/machop/normal.pal
index 7274f6250e..8a8b66f913 100644
--- a/graphics/pokemon/machop/normal.pal
+++ b/graphics/pokemon/machop/normal.pal
@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-152 208 160
-107 82 33
-239 230 140
-173 156 90
-206 189 99
+160 152 208
 0 0 0
-148 189 189
-90 123 107
-173 214 197
 41 74 82
+90 123 106
+115 164 164
+148 189 189
+172 213 197
+255 0 255
+106 82 32
+172 156 90
+205 189 98
+238 230 139
 255 255 255
-239 82 82
-181 0 0
-115 165 165
-240 80 80
-255 132 140
+180 0 0
+238 82 82
+255 131 139
diff --git a/graphics/pokemon/machop/shiny.pal b/graphics/pokemon/machop/shiny.pal
index 620971b69a..10b8e11c7a 100644
--- a/graphics/pokemon/machop/shiny.pal
+++ b/graphics/pokemon/machop/shiny.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-104 80 32
-232 224 136
-168 152 88
-200 184 96
-16 16 16
-176 168 120
-96 88 56
-208 208 152
-64 56 16
-248 248 248
-224 96 88
-160 40 40
-136 128 88
-224 96 88
-248 128 136
+0 0 0
+65 57 16
+106 98 57
+148 139 90
+189 180 123
+222 222 156
+255 0 255
+106 82 32
+172 156 90
+205 189 98
+238 230 139
+255 255 255
+180 0 0
+238 82 82
+255 131 139
diff --git a/graphics/pokemon/mankey/anim_front.png b/graphics/pokemon/mankey/anim_front.png
index afd2815e30..435869073d 100644
Binary files a/graphics/pokemon/mankey/anim_front.png and b/graphics/pokemon/mankey/anim_front.png differ
diff --git a/graphics/pokemon/mankey/back.png b/graphics/pokemon/mankey/back.png
index c10eefa254..283dac52d1 100644
Binary files a/graphics/pokemon/mankey/back.png and b/graphics/pokemon/mankey/back.png differ
diff --git a/graphics/pokemon/mankey/normal.pal b/graphics/pokemon/mankey/normal.pal
index b0b0e0fbf5..c25dd02a67 100644
--- a/graphics/pokemon/mankey/normal.pal
+++ b/graphics/pokemon/mankey/normal.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-115 65 0
-222 164 115
+255 255 255
+222 222 222
+255 230 189
+238 180 139
+238 115 98
+180 65 49
 16 16 16
+255 197 131
+222 164 115
 197 115 74
+115 65 0
+255 246 205
 246 222 180
 213 172 156
-248 248 248
-248 120 104
-180 65 49
-238 115 98
-238 115 98
-238 180 139
-248 192 168
-248 232 224
-104 72 48
+106 74 41
diff --git a/graphics/pokemon/mankey/shiny.pal b/graphics/pokemon/mankey/shiny.pal
index 6daaf349af..d4ad43c9c8 100644
--- a/graphics/pokemon/mankey/shiny.pal
+++ b/graphics/pokemon/mankey/shiny.pal
@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-152 208 160
-104 88 32
-200 176 112
+152 160 208
+255 255 255
+222 222 222
+255 230 189
+238 180 139
+238 115 98
+180 65 49
 16 16 16
-176 128 72
-192 224 160
-152 168 112
-248 248 248
-248 120 104
-152 80 72
-200 88 64
-224 128 112
-232 176 136
-216 208 128
-224 248 200
-80 104 48
+222 213 131
+205 180 115
+180 131 74
+106 82 0
+230 255 205
+197 238 156
+164 180 115
+90 123 41
diff --git a/graphics/pokemon/meowth/anim_front.png b/graphics/pokemon/meowth/anim_front.png
index 22a12d4f54..ff750a7cb6 100644
Binary files a/graphics/pokemon/meowth/anim_front.png and b/graphics/pokemon/meowth/anim_front.png differ
diff --git a/graphics/pokemon/meowth/back.png b/graphics/pokemon/meowth/back.png
index af728214fc..acf5ae7c20 100644
Binary files a/graphics/pokemon/meowth/back.png and b/graphics/pokemon/meowth/back.png differ
diff --git a/graphics/pokemon/meowth/normal.pal b/graphics/pokemon/meowth/normal.pal
index 1333494701..f49558023e 100644
--- a/graphics/pokemon/meowth/normal.pal
+++ b/graphics/pokemon/meowth/normal.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-152 104 0
-248 224 128
-16 16 16
+255 255 255
+230 230 230
+255 213 0
+205 164 0
 148 90 0
-248 248 248
-248 208 0
-200 160 0
-192 120 8
-216 184 56
-216 216 216
 255 115 82
-232 152 48
-148 65 0
 213 90 57
-0 0 0
+16 16 16
+238 156 49
+197 123 8
+148 65 0
+255 255 180
+255 230 131
+222 189 57
+136 104 0
diff --git a/graphics/pokemon/meowth/shiny.pal b/graphics/pokemon/meowth/shiny.pal
index 0aba58a228..4c6c84229a 100644
--- a/graphics/pokemon/meowth/shiny.pal
+++ b/graphics/pokemon/meowth/shiny.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-144 72 24
-255 205 131
-16 16 16
-136 72 24
-248 248 248
-248 208 0
-200 160 0
-208 88 112
-216 160 64
-224 224 224
-248 112 80
-248 128 144
-172 41 57
+255 255 255
+230 230 230
+255 213 0
+205 164 0
+148 90 0
+255 115 82
 213 90 57
-0 0 0
+16 16 16
+246 123 139
+213 82 106
+172 41 57
+255 238 180
+255 205 131
+222 156 57
+156 65 0
diff --git a/graphics/pokemon/metapod/anim_front.png b/graphics/pokemon/metapod/anim_front.png
index 6640f3cbc7..d5ebef9a6e 100644
Binary files a/graphics/pokemon/metapod/anim_front.png and b/graphics/pokemon/metapod/anim_front.png differ
diff --git a/graphics/pokemon/metapod/back.png b/graphics/pokemon/metapod/back.png
index 59657b7f1e..7649fae75d 100644
Binary files a/graphics/pokemon/metapod/back.png and b/graphics/pokemon/metapod/back.png differ
diff --git a/graphics/pokemon/metapod/normal.pal b/graphics/pokemon/metapod/normal.pal
index 8bdd97c5e6..8147ad3289 100644
--- a/graphics/pokemon/metapod/normal.pal
+++ b/graphics/pokemon/metapod/normal.pal
@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-152 208 160
-72 104 80
-176 224 80
-56 80 56
-128 192 72
-104 136 88
-0 0 0
-104 160 72
-248 248 248
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
+152 160 208
+57 74 65
+74 106 82
+106 139 90
+106 164 74
+131 197 74
+180 230 82
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 255 255
 0 0 0
diff --git a/graphics/pokemon/metapod/shiny.pal b/graphics/pokemon/metapod/shiny.pal
index bf33e8df69..900c80de0e 100644
--- a/graphics/pokemon/metapod/shiny.pal
+++ b/graphics/pokemon/metapod/shiny.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-144 56 24
-248 168 120
-96 24 0
-248 112 56
-192 88 24
-16 16 16
-224 104 48
-248 248 248
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
+98 24 0
+148 57 24
+197 90 24
+230 106 49
+255 115 57
+255 172 123
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+255 255 255
 0 0 0
diff --git a/graphics/pokemon/nidoking/anim_front.png b/graphics/pokemon/nidoking/anim_front.png
index 2615b43a62..a085144749 100644
Binary files a/graphics/pokemon/nidoking/anim_front.png and b/graphics/pokemon/nidoking/anim_front.png differ
diff --git a/graphics/pokemon/nidoking/back.png b/graphics/pokemon/nidoking/back.png
index 093f5c13e5..6291e963e1 100644
Binary files a/graphics/pokemon/nidoking/back.png and b/graphics/pokemon/nidoking/back.png differ
diff --git a/graphics/pokemon/nidoking/normal.pal b/graphics/pokemon/nidoking/normal.pal
index 84b8d0f6c6..e78c26819f 100644
--- a/graphics/pokemon/nidoking/normal.pal
+++ b/graphics/pokemon/nidoking/normal.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-90 41 106
-222 148 246
-16 16 16
-213 115 238
-164 82 148
-41 123 148
-0 74 98
-65 148 197
 255 255 255
+230 230 213
 197 197 164
-172 16 0
 115 115 90
 230 65 49
-230 230 213
-232 232 216
+172 16 0
+197 115 189
+64 144 192
+40 120 144
+0 72 96
+216 144 240
+213 115 238
+164 82 148
+90 41 106
+16 16 16
diff --git a/graphics/pokemon/nidoking/shiny.pal b/graphics/pokemon/nidoking/shiny.pal
index e4d7cdea6f..201c7fcc70 100644
--- a/graphics/pokemon/nidoking/shiny.pal
+++ b/graphics/pokemon/nidoking/shiny.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-40 80 128
-160 240 248
+255 255 255
+230 213 213
+197 180 164
+115 98 90
+230 65 49
+172 16 0
+197 115 189
+189 148 74
+148 98 32
+115 74 0
+139 238 255
+90 189 255
+56 136 200
+24 82 156
 16 16 16
-112 192 248
-72 144 200
-144 104 40
-96 72 16
-184 152 88
-248 248 248
-192 176 160
-168 40 32
-112 96 88
-224 80 72
-248 232 232
-224 208 208
diff --git a/graphics/pokemon/nidoqueen/anim_front.png b/graphics/pokemon/nidoqueen/anim_front.png
index 0a8f23915b..58c6901a7b 100644
Binary files a/graphics/pokemon/nidoqueen/anim_front.png and b/graphics/pokemon/nidoqueen/anim_front.png differ
diff --git a/graphics/pokemon/nidoqueen/back.png b/graphics/pokemon/nidoqueen/back.png
index 7271e6d9c6..243b801a00 100644
Binary files a/graphics/pokemon/nidoqueen/back.png and b/graphics/pokemon/nidoqueen/back.png differ
diff --git a/graphics/pokemon/nidoqueen/normal.pal b/graphics/pokemon/nidoqueen/normal.pal
index 3901338e37..fbc98e54c5 100644
--- a/graphics/pokemon/nidoqueen/normal.pal
+++ b/graphics/pokemon/nidoqueen/normal.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-98 139 172
+255 255 255
+208 200 200
+238 230 164
+230 205 139
+192 168 88
+115 90 41
+255 156 139
+200 104 104
+160 40 64
+222 255 255
+156 213 222
 90 180 205
+98 139 172
 49 74 74
 16 16 16
-189 172 90
-115 90 41
-115 90 41
-156 213 222
-208 208 208
-248 248 248
-189 172 90
-230 205 139
-238 230 164
-112 40 40
-232 128 120
diff --git a/graphics/pokemon/nidoqueen/shiny.pal b/graphics/pokemon/nidoqueen/shiny.pal
index 08199f12a2..3af2e0347d 100644
--- a/graphics/pokemon/nidoqueen/shiny.pal
+++ b/graphics/pokemon/nidoqueen/shiny.pal
@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-152 208 160
-104 120 48
-136 160 80
-56 72 8
+152 160 208
+255 255 255
+213 213 213
+246 205 213
+255 172 180
+230 131 148
+189 90 98
+255 156 139
+230 65 49
+172 16 0
+222 246 172
+197 222 123
+131 164 65
+106 123 41
+57 74 0
 16 16 16
-224 128 144
-136 64 72
-184 88 96
-200 216 144
-208 208 208
-248 248 248
-224 136 152
-248 168 176
-240 200 208
-168 44 32
-240 124 112
diff --git a/graphics/pokemon/nidoran_f/anim_front.png b/graphics/pokemon/nidoran_f/anim_front.png
index 4f35d52180..a097c3a49e 100644
Binary files a/graphics/pokemon/nidoran_f/anim_front.png and b/graphics/pokemon/nidoran_f/anim_front.png differ
diff --git a/graphics/pokemon/nidoran_f/back.png b/graphics/pokemon/nidoran_f/back.png
index eb6b3a1370..95e0c30e58 100644
Binary files a/graphics/pokemon/nidoran_f/back.png and b/graphics/pokemon/nidoran_f/back.png differ
diff --git a/graphics/pokemon/nidoran_f/normal.pal b/graphics/pokemon/nidoran_f/normal.pal
index 6f2e8898b3..b90fb5570f 100644
--- a/graphics/pokemon/nidoran_f/normal.pal
+++ b/graphics/pokemon/nidoran_f/normal.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-115 131 172
-90 65 131
-172 172 205
-213 213 255
-52 109 179
-65 139 230
-16 16 16
-248 248 248
-189 49 74
 238 238 255
+213 213 255
+172 172 205
+115 131 172
+64 64 128
 255 82 65
+189 49 74
+24 152 144
+82 139 180
+57 106 148
+255 0 255
+255 0 255
+255 255 255
 222 222 222
-0 0 0
-0 0 0
-0 0 0
+16 16 16
diff --git a/graphics/pokemon/nidoran_f/shiny.pal b/graphics/pokemon/nidoran_f/shiny.pal
index 7c10b617d0..722554334a 100644
--- a/graphics/pokemon/nidoran_f/shiny.pal
+++ b/graphics/pokemon/nidoran_f/shiny.pal
@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-152 208 160
-152 104 168
-112 40 128
-184 144 192
-224 184 232
-64 96 0
-112 144 16
+208 208 160
+238 222 255
+230 189 238
+189 148 197
+156 106 172
+115 41 131
+255 82 65
+189 49 74
+115 148 16
+90 123 8
+65 98 0
+255 0 255
+255 0 255
+255 255 255
+222 222 222
 16 16 16
-248 248 248
-160 40 32
-232 232 248
-248 80 64
-216 216 216
-0 0 0
-0 0 0
-0 0 0
diff --git a/graphics/pokemon/nidoran_m/anim_front.png b/graphics/pokemon/nidoran_m/anim_front.png
index dd3539ce42..6dea62a971 100644
Binary files a/graphics/pokemon/nidoran_m/anim_front.png and b/graphics/pokemon/nidoran_m/anim_front.png differ
diff --git a/graphics/pokemon/nidoran_m/back.png b/graphics/pokemon/nidoran_m/back.png
index 0fc9a65094..0b72bd73da 100644
Binary files a/graphics/pokemon/nidoran_m/back.png and b/graphics/pokemon/nidoran_m/back.png differ
diff --git a/graphics/pokemon/nidoran_m/normal.pal b/graphics/pokemon/nidoran_m/normal.pal
index 711acdb79f..3261195bac 100644
--- a/graphics/pokemon/nidoran_m/normal.pal
+++ b/graphics/pokemon/nidoran_m/normal.pal
@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-152 208 160
-189 98 197
-230 156 213
-98 65 106
-16 16 16
-238 189 238
-0 98 65
-0 164 115
-205 205 205
-255 106 82
+152 160 208
 255 255 255
+16 16 16
+255 106 82
 222 65 41
-176 24 0
-0 0 0
-0 0 0
-0 0 0
+180 24 0
+24 205 156
+0 164 115
+0 98 65
+152 72 168
+238 189 238
+230 156 213
+189 98 197
+98 65 106
+205 205 205
+131 131 131
diff --git a/graphics/pokemon/nidoran_m/shiny.pal b/graphics/pokemon/nidoran_m/shiny.pal
index 843ad1eaf8..da856f827d 100644
--- a/graphics/pokemon/nidoran_m/shiny.pal
+++ b/graphics/pokemon/nidoran_m/shiny.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-144 160 200
-176 200 248
-72 88 152
+255 255 255
 16 16 16
-208 224 248
-120 56 40
-144 104 64
-200 200 200
-248 104 80
-248 248 248
-216 40 56
-0 0 0
-0 0 0
-0 0 0
-0 0 0
+255 106 82
+222 65 41
+180 24 0
+180 123 90
+139 90 49
+123 49 32
+120 136 200
+213 230 255
+180 205 255
+148 164 205
+74 90 156
+205 205 205
+131 131 131
diff --git a/graphics/pokemon/nidorina/anim_front.png b/graphics/pokemon/nidorina/anim_front.png
index f5a23ddaca..2759f85b5e 100644
Binary files a/graphics/pokemon/nidorina/anim_front.png and b/graphics/pokemon/nidorina/anim_front.png differ
diff --git a/graphics/pokemon/nidorina/back.png b/graphics/pokemon/nidorina/back.png
index 1d96a737d9..c17843af53 100644
Binary files a/graphics/pokemon/nidorina/back.png and b/graphics/pokemon/nidorina/back.png differ
diff --git a/graphics/pokemon/nidorina/normal.pal b/graphics/pokemon/nidorina/normal.pal
index bab15d82f2..e49d1f4514 100644
--- a/graphics/pokemon/nidorina/normal.pal
+++ b/graphics/pokemon/nidorina/normal.pal
@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-153 210 164
-90 148 180
-197 230 238
-57 90 98
-16 16 16
-139 197 205
-24 57 115
-55 95 176
-72 128 240
+152 208 160
 255 255 255
-214 214 214
-197 32 16
+213 213 213
+131 131 131
+74 131 246
+16 98 180
+24 57 115
 255 156 139
 238 74 57
-131 131 131
-0 0 0
+197 32 16
+222 255 255
+197 230 238
+139 197 205
+90 148 180
+57 90 98
+16 16 16
diff --git a/graphics/pokemon/nidorina/shiny.pal b/graphics/pokemon/nidorina/shiny.pal
index ee67585e03..d259eff81a 100644
--- a/graphics/pokemon/nidorina/shiny.pal
+++ b/graphics/pokemon/nidorina/shiny.pal
@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-153 210 164
-178 116 166
-255 198 247
+152 160 208
+255 255 255
+213 213 213
+131 131 131
+90 131 32
+65 106 16
+32 74 0
+255 156 139
+238 74 57
+197 32 16
+255 238 246
+238 222 230
+205 148 197
+180 106 164
 98 82 90
 16 16 16
-204 157 197
-40 73 14
-65 106 16
-93 131 40
-255 255 255
-214 214 214
-197 32 16
-255 156 140
-238 74 57
-131 131 131
-0 0 0
diff --git a/graphics/pokemon/nidorino/anim_front.png b/graphics/pokemon/nidorino/anim_front.png
index 8aece1ef78..94847a3c93 100644
Binary files a/graphics/pokemon/nidorino/anim_front.png and b/graphics/pokemon/nidorino/anim_front.png differ
diff --git a/graphics/pokemon/nidorino/back.png b/graphics/pokemon/nidorino/back.png
index 3ee49e0aee..1b1a13d47e 100644
Binary files a/graphics/pokemon/nidorino/back.png and b/graphics/pokemon/nidorino/back.png differ
diff --git a/graphics/pokemon/nidorino/normal.pal b/graphics/pokemon/nidorino/normal.pal
index a668ac118c..b6d01ea679 100644
--- a/graphics/pokemon/nidorino/normal.pal
+++ b/graphics/pokemon/nidorino/normal.pal
@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-152 208 160
-90 57 98
-205 131 222
+152 160 208
+255 255 255
+255 106 82
+222 65 41
+180 24 0
+57 238 189
+74 205 164
+0 148 98
+128 88 80
 16 16 16
 230 172 238
+205 131 222
 148 90 180
-0 148 98
-74 205 164
-248 248 248
-128 128 128
-192 192 192
-144 88 176
-168 40 40
-232 128 120
-0 0 0
-0 0 0
+90 57 98
+197 197 197
+131 131 131
diff --git a/graphics/pokemon/nidorino/shiny.pal b/graphics/pokemon/nidorino/shiny.pal
index 4c4ca0cc25..aaa9beee95 100644
--- a/graphics/pokemon/nidorino/shiny.pal
+++ b/graphics/pokemon/nidorino/shiny.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-64 72 136
-168 176 240
-16 16 16
-208 208 248
-128 120 176
-104 56 80
+255 255 255
+255 106 82
+222 65 41
+180 24 0
+180 131 156
+148 98 123
+106 57 82
 144 96 120
-248 248 248
-128 128 128
-192 192 192
-64 72 136
-178 70 53
-247 127 111
-0 0 0
-0 0 0
+16 16 16
+213 213 255
+172 180 246
+131 123 189
+65 74 139
+197 197 197
+131 131 131
diff --git a/graphics/pokemon/ninetales/anim_front.png b/graphics/pokemon/ninetales/anim_front.png
index 06ef7fc492..3cc6d2db5d 100644
Binary files a/graphics/pokemon/ninetales/anim_front.png and b/graphics/pokemon/ninetales/anim_front.png differ
diff --git a/graphics/pokemon/ninetales/back.png b/graphics/pokemon/ninetales/back.png
index f1031e7208..247f7ad87c 100644
Binary files a/graphics/pokemon/ninetales/back.png and b/graphics/pokemon/ninetales/back.png differ
diff --git a/graphics/pokemon/ninetales/normal.pal b/graphics/pokemon/ninetales/normal.pal
index 021c157753..0153dceb73 100644
--- a/graphics/pokemon/ninetales/normal.pal
+++ b/graphics/pokemon/ninetales/normal.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-205 156 74
-131 98 24
-246 230 123
-16 16 16
-230 197 82
-180 16 0
 255 255 255
 255 106 41
-255 172 49
-255 148 16
-168 16 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
+222 32 16
+180 16 0
+255 0 255
+248 160 56
+232 128 40
+238 222 115
+205 156 98
+255 238 180
+246 230 123
+230 197 82
+205 156 74
+131 98 24
+16 16 16
diff --git a/graphics/pokemon/ninetales/shiny.pal b/graphics/pokemon/ninetales/shiny.pal
index dc02c553bc..7a30db18a2 100644
--- a/graphics/pokemon/ninetales/shiny.pal
+++ b/graphics/pokemon/ninetales/shiny.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-152 128 168
-120 88 128
-216 216 224
+255 255 255
+255 106 41
+222 32 16
+180 16 0
+255 0 255
+148 172 230
+98 156 255
+238 222 115
+205 156 98
+246 238 255
+222 222 230
+189 180 205
+156 131 172
+123 90 131
 16 16 16
-184 176 200
-176 40 32
-248 248 248
-248 120 64
-144 168 224
-96 152 248
-175 79 70
-0 0 0
-0 0 0
-0 0 0
-0 0 0
diff --git a/graphics/pokemon/oddish/anim_front.png b/graphics/pokemon/oddish/anim_front.png
index 71db276f7c..8b82826b84 100644
Binary files a/graphics/pokemon/oddish/anim_front.png and b/graphics/pokemon/oddish/anim_front.png differ
diff --git a/graphics/pokemon/oddish/back.png b/graphics/pokemon/oddish/back.png
index 5ddfa0bebb..63e8d68512 100644
Binary files a/graphics/pokemon/oddish/back.png and b/graphics/pokemon/oddish/back.png differ
diff --git a/graphics/pokemon/oddish/normal.pal b/graphics/pokemon/oddish/normal.pal
index 30c3a26452..7458d45c1f 100644
--- a/graphics/pokemon/oddish/normal.pal
+++ b/graphics/pokemon/oddish/normal.pal
@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-248 192 192
+208 208 160
+255 255 255
+180 41 49
+238 57 49
+197 230 123
+156 213 74
 139 172 49
 74 90 32
-156 213 74
-197 230 123
-16 16 16
-90 106 131
-115 148 164
+255 0 255
+255 0 255
+255 0 255
 148 180 197
-238 57 49
+115 148 164
+90 106 131
 41 57 74
-178 92 121
-214 149 172
-0 0 0
-0 0 0
-0 0 0
+16 16 16
diff --git a/graphics/pokemon/oddish/shiny.pal b/graphics/pokemon/oddish/shiny.pal
index f62a3b4a40..a524e2b16c 100644
--- a/graphics/pokemon/oddish/shiny.pal
+++ b/graphics/pokemon/oddish/shiny.pal
@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-153 210 164
-146 188 56
-104 130 26
-191 229 78
-219 244 144
+152 160 208
+255 255 255
+180 41 49
+238 57 49
+222 255 123
+197 246 57
+148 197 49
+98 131 0
+255 0 255
+255 0 255
+255 0 255
+139 246 65
+90 197 0
+57 148 0
+16 98 0
 16 16 16
-76 147 29
-112 196 39
-154 226 81
-224 72 64
-32 96 19
-234 72 60
-255 136 132
-0 0 0
-0 0 0
-0 0 0
diff --git a/graphics/pokemon/paras/anim_front.png b/graphics/pokemon/paras/anim_front.png
index ff5d42fc2b..b22fccb148 100644
Binary files a/graphics/pokemon/paras/anim_front.png and b/graphics/pokemon/paras/anim_front.png differ
diff --git a/graphics/pokemon/paras/back.png b/graphics/pokemon/paras/back.png
index ca19353cf4..34c882480f 100644
Binary files a/graphics/pokemon/paras/back.png and b/graphics/pokemon/paras/back.png differ
diff --git a/graphics/pokemon/paras/normal.pal b/graphics/pokemon/paras/normal.pal
index 08c060f7a1..731359747e 100644
--- a/graphics/pokemon/paras/normal.pal
+++ b/graphics/pokemon/paras/normal.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-189 65 65
-98 41 41
-246 106 106
-197 180 32
-255 213 82
-16 16 16
-112 72 24
-57 41 16
-230 131 41
-255 246 255
-180 98 32
-255 172 98
+255 247 255
+206 206 206
 90 90 90
-205 205 205
-164 164 205
+255 214 82
+197 181 33
+247 107 107
+189 66 66
+99 41 41
+165 165 206
+255 173 99
+230 132 41
+181 99 33
+115 74 25
+58 41 16
+16 16 16
diff --git a/graphics/pokemon/paras/shiny.pal b/graphics/pokemon/paras/shiny.pal
index d5b733479a..9a99b14b80 100644
--- a/graphics/pokemon/paras/shiny.pal
+++ b/graphics/pokemon/paras/shiny.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-224 56 80
-152 16 40
-248 120 144
-192 176 32
-248 208 80
+255 247 255
+206 206 206
+90 90 90
+255 247 90
+206 189 33
+255 123 148
+230 58 82
+156 0 25
+165 165 206
+255 132 58
+239 82 25
+197 49 33
+107 41 16
+58 33 8
 16 16 16
-104 40 16
-56 32 8
-224 96 48
-255 246 255
-176 48 40
-240 144 96
-88 88 88
-248 240 248
-200 200 200
diff --git a/graphics/pokemon/parasect/anim_front.png b/graphics/pokemon/parasect/anim_front.png
index 3feef164b5..963b1485a1 100644
Binary files a/graphics/pokemon/parasect/anim_front.png and b/graphics/pokemon/parasect/anim_front.png differ
diff --git a/graphics/pokemon/parasect/back.png b/graphics/pokemon/parasect/back.png
index bc8802b1af..3a5d5a8069 100644
Binary files a/graphics/pokemon/parasect/back.png and b/graphics/pokemon/parasect/back.png differ
diff --git a/graphics/pokemon/parasect/normal.pal b/graphics/pokemon/parasect/normal.pal
index 0d82fc25c7..9aec34687b 100644
--- a/graphics/pokemon/parasect/normal.pal
+++ b/graphics/pokemon/parasect/normal.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-120 8 8
-248 104 104
-240 48 48
-248 208 80
+255 246 255
+213 213 213
+156 139 164
+255 213 82
+213 205 49
+255 106 106
+238 49 49
+189 49 65
+123 8 8
+255 0 255
+255 131 82
+222 106 49
+180 65 57
+98 16 0
 16 16 16
-240 152 152
-208 200 48
-192 48 64
-96 16 0
-176 64 56
-248 240 248
-216 104 48
-208 208 208
-152 136 160
-0 0 0
diff --git a/graphics/pokemon/parasect/shiny.pal b/graphics/pokemon/parasect/shiny.pal
index ef2a4d63f7..a2ea6ecd90 100644
--- a/graphics/pokemon/parasect/shiny.pal
+++ b/graphics/pokemon/parasect/shiny.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-120 64 8
-248 168 96
-232 136 48
-248 208 80
+255 246 255
+213 213 213
+156 139 164
+255 213 82
+213 205 49
+255 172 98
+238 139 49
+180 98 49
+123 65 8
+255 0 255
+255 197 82
+222 164 49
+172 106 65
+98 57 0
 16 16 16
-248 192 80
-208 200 48
-176 96 48
-96 56 16
-168 112 80
-248 240 248
-216 168 72
-208 208 208
-152 136 160
-0 0 0
diff --git a/graphics/pokemon/persian/anim_front.png b/graphics/pokemon/persian/anim_front.png
index c805f3204f..72e34fad13 100644
Binary files a/graphics/pokemon/persian/anim_front.png and b/graphics/pokemon/persian/anim_front.png differ
diff --git a/graphics/pokemon/persian/back.png b/graphics/pokemon/persian/back.png
index 90ff463731..9dc29f554b 100644
Binary files a/graphics/pokemon/persian/back.png and b/graphics/pokemon/persian/back.png differ
diff --git a/graphics/pokemon/persian/normal.pal b/graphics/pokemon/persian/normal.pal
index 073415db2d..02c30235ba 100644
--- a/graphics/pokemon/persian/normal.pal
+++ b/graphics/pokemon/persian/normal.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
+255 255 255
+222 222 222
 16 16 16
-128 80 0
-144 120 32
-216 176 104
-184 160 72
-176 128 40
-248 224 128
-240 80 64
-248 248 248
-248 184 152
-160 16 0
-216 216 216
-248 248 168
-136 0 0
-232 64 48
+255 189 156
+246 82 65
+164 16 0
+189 164 74
+148 123 32
+115 90 16
+255 0 255
+255 255 172
+255 230 131
+222 180 106
+180 131 41
+131 82 0
diff --git a/graphics/pokemon/persian/shiny.pal b/graphics/pokemon/persian/shiny.pal
index ba2fdc3fec..0fe2913277 100644
--- a/graphics/pokemon/persian/shiny.pal
+++ b/graphics/pokemon/persian/shiny.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
+255 255 255
+222 222 222
 16 16 16
-120 96 16
-208 136 136
-232 200 128
-240 184 184
-168 144 48
-248 240 144
-240 96 88
-248 248 248
-248 184 152
-160 40 32
-216 216 216
-248 248 200
-163 43 32
-244 103 90
+255 189 156
+246 82 65
+164 16 0
+255 180 180
+238 131 131
+222 98 98
+255 0 255
+255 255 205
+255 246 148
+238 205 131
+189 156 49
+139 106 8
diff --git a/graphics/pokemon/pidgeot/anim_front.png b/graphics/pokemon/pidgeot/anim_front.png
index 8ff5e6c13f..2a9f7c5887 100644
Binary files a/graphics/pokemon/pidgeot/anim_front.png and b/graphics/pokemon/pidgeot/anim_front.png differ
diff --git a/graphics/pokemon/pidgeot/back.png b/graphics/pokemon/pidgeot/back.png
index 34369db650..183b1254b3 100644
Binary files a/graphics/pokemon/pidgeot/back.png and b/graphics/pokemon/pidgeot/back.png differ
diff --git a/graphics/pokemon/pidgeot/normal.pal b/graphics/pokemon/pidgeot/normal.pal
index c387bd5b86..43afea2f11 100644
--- a/graphics/pokemon/pidgeot/normal.pal
+++ b/graphics/pokemon/pidgeot/normal.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-90 57 41
-16 16 16
-172 123 90
-115 82 74
-230 180 98
-255 230 139
-248 240 120
-248 152 112
-238 98 65
-139 57 32
-213 49 24
-197 180 197
 255 255 255
+197 180 197
+255 246 189
+255 230 139
+230 180 98
+255 172 115
+238 98 65
+213 49 24
+139 57 32
 230 164 156
 189 123 123
+172 123 90
+115 82 74
+90 57 41
+16 16 16
diff --git a/graphics/pokemon/pidgeot/shiny.pal b/graphics/pokemon/pidgeot/shiny.pal
index 5b47a0d5d2..d97921941b 100644
--- a/graphics/pokemon/pidgeot/shiny.pal
+++ b/graphics/pokemon/pidgeot/shiny.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-96 56 0
+255 255 255
+197 180 197
+255 255 164
+255 255 123
+255 213 82
+255 238 115
+255 213 0
+246 164 0
+197 98 0
+255 205 90
+205 148 57
+180 131 16
+139 98 8
+115 74 0
 16 16 16
-184 144 48
-136 96 16
-232 200 96
-248 248 144
-248 248 144
-248 248 96
-248 216 48
-192 96 0
-240 168 32
-192 176 192
-248 248 248
-248 200 88
-200 144 56
diff --git a/graphics/pokemon/pidgeotto/anim_front.png b/graphics/pokemon/pidgeotto/anim_front.png
index 6610f19da2..49fc12c0bc 100644
Binary files a/graphics/pokemon/pidgeotto/anim_front.png and b/graphics/pokemon/pidgeotto/anim_front.png differ
diff --git a/graphics/pokemon/pidgeotto/back.png b/graphics/pokemon/pidgeotto/back.png
index 739e474e03..43aaed915c 100644
Binary files a/graphics/pokemon/pidgeotto/back.png and b/graphics/pokemon/pidgeotto/back.png differ
diff --git a/graphics/pokemon/pidgeotto/normal.pal b/graphics/pokemon/pidgeotto/normal.pal
index 6c8b9ef6f0..30dbaad1b2 100644
--- a/graphics/pokemon/pidgeotto/normal.pal
+++ b/graphics/pokemon/pidgeotto/normal.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-123 49 32
-197 49 41
-238 98 65
-32 32 32
-144 64 72
-131 82 49
-248 248 248
-65 41 32
-120 120 128
-255 172 115
+255 255 255
 213 213 222
-172 123 90
-230 189 90
+123 123 131
+16 16 16
+240 152 232
 255 230 139
+230 189 90
+216 112 200
 172 123 90
+131 82 49
+65 41 32
+255 172 115
+238 98 65
+197 49 41
+123 49 32
diff --git a/graphics/pokemon/pidgeotto/shiny.pal b/graphics/pokemon/pidgeotto/shiny.pal
index 8281977d45..1af35cfe23 100644
--- a/graphics/pokemon/pidgeotto/shiny.pal
+++ b/graphics/pokemon/pidgeotto/shiny.pal
@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-152 208 160
-184 96 0
-232 152 16
-248 216 48
-16 16 16
-112 104 16
-112 128 48
-248 248 248
-48 56 16
-120 120 128
+152 160 208
+255 255 255
+213 213 222
+123 123 131
+32 32 32
 248 248 120
-224 192 40
-176 176 72
-208 208 128
-240 248 168
-144 152 80
+246 255 172
+222 222 148
+224 184 0
+148 156 82
+115 131 49
+82 98 16
+255 255 172
+255 213 0
+238 148 0
+189 98 0
diff --git a/graphics/pokemon/pidgey/anim_front.png b/graphics/pokemon/pidgey/anim_front.png
index 76890a127b..77cd7c2ba9 100644
Binary files a/graphics/pokemon/pidgey/anim_front.png and b/graphics/pokemon/pidgey/anim_front.png differ
diff --git a/graphics/pokemon/pidgey/back.png b/graphics/pokemon/pidgey/back.png
index 8fc81a972a..e5510fe080 100644
Binary files a/graphics/pokemon/pidgey/back.png and b/graphics/pokemon/pidgey/back.png differ
diff --git a/graphics/pokemon/pidgey/normal.pal b/graphics/pokemon/pidgey/normal.pal
index da639746de..4081f468a2 100644
--- a/graphics/pokemon/pidgey/normal.pal
+++ b/graphics/pokemon/pidgey/normal.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-128 72 48
-205 131 90
-164 98 90
-164 98 90
-230 189 98
+255 255 255
+189 189 189
+131 131 131
 16 16 16
-255 238 156
-128 128 128
-189 41 32
-184 184 184
 255 172 115
-248 248 248
 238 98 65
+189 41 32
+255 246 189
+255 238 156
+230 189 98
 205 131 90
-64 32 16
+164 98 90
+115 74 49
+65 41 24
+255 0 255
diff --git a/graphics/pokemon/pidgey/shiny.pal b/graphics/pokemon/pidgey/shiny.pal
index 37d1fed4b2..48ea08bf68 100644
--- a/graphics/pokemon/pidgey/shiny.pal
+++ b/graphics/pokemon/pidgey/shiny.pal
@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-152 208 160
-96 88 0
-176 160 32
-136 136 24
-136 136 24
-200 200 80
+152 160 208
+255 255 255
+189 189 189
+131 131 131
 16 16 16
-232 232 128
-128 128 128
-192 112 0
-184 184 184
-248 232 112
-248 248 248
-232 192 64
-168 160 64
-72 56 0
+255 238 115
+255 205 41
+197 115 0
+238 255 238
+230 230 131
+205 205 24
+180 164 16
+139 139 16
+115 123 0
+82 106 0
+255 0 255
diff --git a/graphics/pokemon/pikachu/anim_front.png b/graphics/pokemon/pikachu/anim_front.png
index af75b2b513..89538a8612 100644
Binary files a/graphics/pokemon/pikachu/anim_front.png and b/graphics/pokemon/pikachu/anim_front.png differ
diff --git a/graphics/pokemon/pikachu/anim_frontf.png b/graphics/pokemon/pikachu/anim_frontf.png
index c911e36cb3..27780be98a 100644
Binary files a/graphics/pokemon/pikachu/anim_frontf.png and b/graphics/pokemon/pikachu/anim_frontf.png differ
diff --git a/graphics/pokemon/pikachu/back.png b/graphics/pokemon/pikachu/back.png
index 64ed04d267..c18078cfd6 100644
Binary files a/graphics/pokemon/pikachu/back.png and b/graphics/pokemon/pikachu/back.png differ
diff --git a/graphics/pokemon/pikachu/backf.png b/graphics/pokemon/pikachu/backf.png
index f288634133..9f0166b3d3 100644
Binary files a/graphics/pokemon/pikachu/backf.png and b/graphics/pokemon/pikachu/backf.png differ
diff --git a/graphics/pokemon/pikachu/normal.pal b/graphics/pokemon/pikachu/normal.pal
index 8f402fd447..057bc45b8a 100644
--- a/graphics/pokemon/pikachu/normal.pal
+++ b/graphics/pokemon/pikachu/normal.pal
@@ -3,17 +3,17 @@ JASC-PAL
 16
 152 208 160
 0 0 0
-41 41 41
-99 49 8
-82 82 90
-247 189 33
-156 82 0
-247 230 82
+255 246 164
+246 230 82
+246 189 32
 222 148 0
-255 247 165
+156 82 0
+98 49 8
+230 148 131
+230 90 65
+197 32 24
+123 41 8
+123 123 139
+64 64 72
+41 41 41
 255 255 255
-230 90 66
-197 33 25
-168 48 16
-224 80 56
-0 0 0
diff --git a/graphics/pokemon/pikachu/shiny.pal b/graphics/pokemon/pikachu/shiny.pal
index b2149ed68d..524daf09fa 100644
--- a/graphics/pokemon/pikachu/shiny.pal
+++ b/graphics/pokemon/pikachu/shiny.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-16 16 16
-40 40 40
-112 24 8
-80 80 88
-240 160 24
-176 56 16
-248 200 72
-224 128 0
-248 232 152
-248 248 248
-224 96 64
-192 40 24
-192 40 24
-224 96 64
 0 0 0
+255 230 131
+255 197 49
+255 164 0
+230 131 0
+180 49 0
+115 16 0
+230 156 131
+230 98 65
+197 41 24
+123 49 8
+115 115 131
+82 82 90
+41 41 41
+255 255 255
diff --git a/graphics/pokemon/poliwag/anim_front.png b/graphics/pokemon/poliwag/anim_front.png
index 40d9a43b63..b0e5aac1cf 100644
Binary files a/graphics/pokemon/poliwag/anim_front.png and b/graphics/pokemon/poliwag/anim_front.png differ
diff --git a/graphics/pokemon/poliwag/back.png b/graphics/pokemon/poliwag/back.png
index 762909494f..d85f353b2f 100644
Binary files a/graphics/pokemon/poliwag/back.png and b/graphics/pokemon/poliwag/back.png differ
diff --git a/graphics/pokemon/poliwag/normal.pal b/graphics/pokemon/poliwag/normal.pal
index 09bad1cd36..3fddb21d15 100644
--- a/graphics/pokemon/poliwag/normal.pal
+++ b/graphics/pokemon/poliwag/normal.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-24 57 115
-139 164 230
-82 131 197
-57 90 131
 255 255 255
-16 16 16
-98 98 98
+200 200 200
 180 172 189
+98 98 98
+255 0 255
+255 0 255
+56 112 168
 255 189 172
 255 106 106
 189 90 74
-205 205 205
-57 115 172
-0 0 0
-0 0 0
+136 160 224
+80 128 192
+56 88 128
+24 56 112
+16 16 16
diff --git a/graphics/pokemon/poliwag/shiny.pal b/graphics/pokemon/poliwag/shiny.pal
index 9a526f806a..065f2ac3c0 100644
--- a/graphics/pokemon/poliwag/shiny.pal
+++ b/graphics/pokemon/poliwag/shiny.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-56 88 144
-160 208 232
-128 176 232
-72 104 192
-248 248 248
-16 16 16
-96 96 96
-192 184 200
-248 184 168
-248 128 128
-184 104 88
-224 224 224
+255 255 255
+222 222 222
+180 172 189
+98 98 98
+255 0 255
+255 0 255
 96 144 232
-0 0 0
-0 0 0
+255 189 172
+255 106 106
+189 90 74
+164 213 246
+115 172 255
+82 115 213
+32 74 164
+16 16 16
diff --git a/graphics/pokemon/poliwhirl/anim_front.png b/graphics/pokemon/poliwhirl/anim_front.png
index 1d5cf71805..e3dbb03ce8 100644
Binary files a/graphics/pokemon/poliwhirl/anim_front.png and b/graphics/pokemon/poliwhirl/anim_front.png differ
diff --git a/graphics/pokemon/poliwhirl/back.png b/graphics/pokemon/poliwhirl/back.png
index 74ad4ac812..b0c6138b14 100644
Binary files a/graphics/pokemon/poliwhirl/back.png and b/graphics/pokemon/poliwhirl/back.png differ
diff --git a/graphics/pokemon/poliwhirl/normal.pal b/graphics/pokemon/poliwhirl/normal.pal
index ac25d75a66..741a92a08c 100644
--- a/graphics/pokemon/poliwhirl/normal.pal
+++ b/graphics/pokemon/poliwhirl/normal.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-32 57 98
-82 90 131
-115 131 197
-248 248 248
-115 131 197
-80 80 80
-184 184 192
-15 15 15
-136 160 224
-120 120 120
-136 152 160
-240 240 248
+255 255 255
 213 213 222
-0 0 0
-0 0 0
+189 189 189
+164 164 164
+255 0 255
+255 0 255
+255 0 255
+123 123 123
+82 82 82
+56 112 168
+136 160 224
+80 128 192
+56 88 128
+24 56 112
+16 16 16
diff --git a/graphics/pokemon/poliwhirl/shiny.pal b/graphics/pokemon/poliwhirl/shiny.pal
index 46d11fec3e..0fcd67b82d 100644
--- a/graphics/pokemon/poliwhirl/shiny.pal
+++ b/graphics/pokemon/poliwhirl/shiny.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-56 88 144
-72 128 192
-104 192 240
-248 248 248
+255 255 255
+213 213 222
+189 189 189
+164 164 164
+255 0 255
+255 0 255
+255 0 255
+123 123 123
+82 82 82
 64 160 232
-80 80 80
-184 184 184
+123 222 255
+82 189 255
+57 131 213
+32 90 172
 16 16 16
-160 224 240
-120 120 120
-160 160 160
-248 248 248
-208 208 216
-0 0 0
-0 0 0
diff --git a/graphics/pokemon/poliwrath/anim_front.png b/graphics/pokemon/poliwrath/anim_front.png
index 67004c7133..5051a0445c 100644
Binary files a/graphics/pokemon/poliwrath/anim_front.png and b/graphics/pokemon/poliwrath/anim_front.png differ
diff --git a/graphics/pokemon/poliwrath/back.png b/graphics/pokemon/poliwrath/back.png
index 991318594d..0e39599c9f 100644
Binary files a/graphics/pokemon/poliwrath/back.png and b/graphics/pokemon/poliwrath/back.png differ
diff --git a/graphics/pokemon/poliwrath/normal.pal b/graphics/pokemon/poliwrath/normal.pal
index e1f44100ad..ab89bed15b 100644
--- a/graphics/pokemon/poliwrath/normal.pal
+++ b/graphics/pokemon/poliwrath/normal.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-82 90 131
-180 189 230
-32 57 90
-115 131 197
-16 16 16
 255 255 255
 213 213 222
 189 189 189
-82 82 82
-123 123 123
-232 232 248
 164 164 164
-0 0 0
-0 0 0
-0 0 0
+255 0 255
+255 0 255
+56 112 168
+123 123 123
+82 82 82
+16 16 16
+136 160 224
+80 128 192
+56 88 128
+24 57 112
+16 16 16
diff --git a/graphics/pokemon/poliwrath/shiny.pal b/graphics/pokemon/poliwrath/shiny.pal
index 3b92345e72..cbfca28177 100644
--- a/graphics/pokemon/poliwrath/shiny.pal
+++ b/graphics/pokemon/poliwrath/shiny.pal
@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-248 160 176
-104 136 72
-184 216 160
-48 80 24
-136 184 112
+152 160 208
+255 255 255
+213 213 222
+189 189 189
+164 164 164
+255 0 255
+255 0 255
+120 160 88
+123 123 123
+82 82 82
+16 16 16
+189 222 164
+139 189 115
+106 139 74
+49 82 24
 16 16 16
-248 248 248
-208 208 216
-184 184 184
-80 80 80
-120 120 120
-248 248 248
-160 160 160
-0 0 0
-0 0 0
-0 0 0
diff --git a/graphics/pokemon/ponyta/anim_front.png b/graphics/pokemon/ponyta/anim_front.png
index b32f2e0984..abb69bd7e3 100644
Binary files a/graphics/pokemon/ponyta/anim_front.png and b/graphics/pokemon/ponyta/anim_front.png differ
diff --git a/graphics/pokemon/ponyta/back.png b/graphics/pokemon/ponyta/back.png
index b999c11da7..64f3ae87ec 100644
Binary files a/graphics/pokemon/ponyta/back.png and b/graphics/pokemon/ponyta/back.png differ
diff --git a/graphics/pokemon/ponyta/normal.pal b/graphics/pokemon/ponyta/normal.pal
index d2af3d8c90..59e2afebe5 100644
--- a/graphics/pokemon/ponyta/normal.pal
+++ b/graphics/pokemon/ponyta/normal.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
+0 0 0
+255 255 255
+255 238 205
+230 205 139
+197 156 106
+139 82 49
+115 49 49
+238 49 49
 230 90 41
 255 156 24
 255 222 82
-238 49 49
-139 82 49
-115 49 49
-255 238 205
-16 16 16
-160 72 72
-230 205 139
-197 156 106
-255 255 255
-65 74 131
-115 123 164
-197 197 213
+197 197 208
+115 123 160
+65 74 128
+0 0 0
diff --git a/graphics/pokemon/ponyta/shiny.pal b/graphics/pokemon/ponyta/shiny.pal
index 99c81ff106..b778aec8ad 100644
--- a/graphics/pokemon/ponyta/shiny.pal
+++ b/graphics/pokemon/ponyta/shiny.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-72 144 232
-112 168 240
-192 216 248
-40 88 224
+0 0 0
+255 255 255
+255 255 222
+238 222 156
+205 172 123
 176 128 112
-128 80 64
-248 248 216
-16 16 16
-176 128 112
-232 216 152
-200 168 120
-248 248 248
-64 72 80
-112 120 128
-192 192 192
+131 82 65
+41 88 230
+74 148 238
+115 172 246
+197 222 255
+197 197 197
+115 123 131
+65 74 82
+0 0 0
diff --git a/graphics/pokemon/primeape/anim_front.png b/graphics/pokemon/primeape/anim_front.png
index 44e61d033d..85cec29524 100644
Binary files a/graphics/pokemon/primeape/anim_front.png and b/graphics/pokemon/primeape/anim_front.png differ
diff --git a/graphics/pokemon/primeape/back.png b/graphics/pokemon/primeape/back.png
index fd3e1c0780..e5880490d1 100644
Binary files a/graphics/pokemon/primeape/back.png and b/graphics/pokemon/primeape/back.png differ
diff --git a/graphics/pokemon/primeape/normal.pal b/graphics/pokemon/primeape/normal.pal
index 015a685081..ef74715fdc 100644
--- a/graphics/pokemon/primeape/normal.pal
+++ b/graphics/pokemon/primeape/normal.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-90 49 0
-156 106 106
-205 139 90
-0 0 0
-98 74 32
-255 230 180
-65 65 65
-230 189 156
+255 255 255
+197 197 197
 123 123 123
-255 255 213
+65 65 65
 255 148 90
-248 248 248
 189 74 49
-255 148 90
-224 176 136
+230 180 139
+205 139 90
+156 106 106
+90 49 0
+0 0 0
+255 255 213
+255 230 180
+230 189 156
+98 74 32
diff --git a/graphics/pokemon/primeape/shiny.pal b/graphics/pokemon/primeape/shiny.pal
index d1ae31aed8..1e9e677301 100644
--- a/graphics/pokemon/primeape/shiny.pal
+++ b/graphics/pokemon/primeape/shiny.pal
@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-152 208 160
-88 72 0
-128 120 40
-168 168 88
-16 16 16
-168 96 56
-248 208 152
-64 64 64
-216 160 112
-120 120 120
-248 232 184
-248 144 88
-248 248 248
-184 96 72
-248 160 112
-200 216 128
+152 160 208
+255 255 255
+197 197 197
+123 123 123
+65 65 65
+255 148 90
+189 74 49
+205 222 131
+172 172 90
+131 123 32
+90 74 0
+0 0 0
+255 230 172
+255 205 139
+222 156 106
+172 98 57
diff --git a/graphics/pokemon/psyduck/anim_front.png b/graphics/pokemon/psyduck/anim_front.png
index 00513cabe9..561b367a76 100644
Binary files a/graphics/pokemon/psyduck/anim_front.png and b/graphics/pokemon/psyduck/anim_front.png differ
diff --git a/graphics/pokemon/psyduck/back.png b/graphics/pokemon/psyduck/back.png
index 4bed36444c..855d8aa43e 100644
Binary files a/graphics/pokemon/psyduck/back.png and b/graphics/pokemon/psyduck/back.png differ
diff --git a/graphics/pokemon/psyduck/normal.pal b/graphics/pokemon/psyduck/normal.pal
index 7e2179a0b2..56e9584cf3 100644
--- a/graphics/pokemon/psyduck/normal.pal
+++ b/graphics/pokemon/psyduck/normal.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-123 123 123
-16 16 16
-148 90 16
-230 164 82
-255 213 74
-255 230 164
-222 180 82
-255 255 255
-131 90 0
 255 238 189
 246 222 139
-248 232 184
-0 0 0
-0 0 0
-0 0 0
+222 180 82
+131 90 0
+255 255 255
+222 222 222
+123 123 123
+255 0 255
+255 0 255
+255 0 255
+255 230 164
+255 213 74
+230 164 82
+148 90 16
+16 16 16
diff --git a/graphics/pokemon/psyduck/shiny.pal b/graphics/pokemon/psyduck/shiny.pal
index 5151358e52..8f51e6fa70 100644
--- a/graphics/pokemon/psyduck/shiny.pal
+++ b/graphics/pokemon/psyduck/shiny.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-120 120 120
+230 255 255
+180 222 246
+156 180 205
+123 131 156
+255 255 255
+222 222 222
+123 123 123
+255 0 255
+255 0 255
+255 0 255
+197 246 246
+156 222 230
+123 180 156
+65 106 115
 16 16 16
-64 104 112
-120 176 152
-152 216 224
-192 240 240
-152 176 200
-248 248 248
-120 128 152
-224 248 248
-176 216 240
-0 0 0
-0 0 0
-0 0 0
-0 0 0
diff --git a/graphics/pokemon/raichu/anim_front.png b/graphics/pokemon/raichu/anim_front.png
index 99d5927650..5466c93f49 100644
Binary files a/graphics/pokemon/raichu/anim_front.png and b/graphics/pokemon/raichu/anim_front.png differ
diff --git a/graphics/pokemon/raichu/anim_frontf.png b/graphics/pokemon/raichu/anim_frontf.png
index 23ddf1fa7e..59d4b43535 100644
Binary files a/graphics/pokemon/raichu/anim_frontf.png and b/graphics/pokemon/raichu/anim_frontf.png differ
diff --git a/graphics/pokemon/raichu/back.png b/graphics/pokemon/raichu/back.png
index b4d8b75a81..8cf42c3a02 100644
Binary files a/graphics/pokemon/raichu/back.png and b/graphics/pokemon/raichu/back.png differ
diff --git a/graphics/pokemon/raichu/normal.pal b/graphics/pokemon/raichu/normal.pal
index 6594ba18bb..d29868af5a 100644
--- a/graphics/pokemon/raichu/normal.pal
+++ b/graphics/pokemon/raichu/normal.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-90 41 41
-139 98 16
 0 0 0
-115 65 49
-255 189 0
-148 65 65
-255 222 90
+255 238 213
+230 205 164
 246 172 41
 222 123 49
-255 238 213
 189 90 49
+148 65 65
+90 41 41
+255 222 90
+255 189 0
+139 98 16
+115 65 49
 189 24 8
-255 213 90
 98 98 106
 57 57 65
diff --git a/graphics/pokemon/raichu/shiny.pal b/graphics/pokemon/raichu/shiny.pal
index 5177b62f93..385105d291 100644
--- a/graphics/pokemon/raichu/shiny.pal
+++ b/graphics/pokemon/raichu/shiny.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-80 16 16
-136 104 32
-16 16 16
-112 64 48
-184 160 104
-144 40 32
-216 208 152
-240 128 56
-216 88 64
-248 232 208
-176 64 48
-184 40 24
-224 184 128
-96 96 104
-56 56 64
+0 0 0
+255 230 213
+230 197 156
+246 123 32
+222 74 49
+189 57 32
+148 41 32
+82 16 16
+222 205 131
+189 164 90
+139 98 16
+115 65 49
+189 24 8
+98 98 106
+57 57 65
diff --git a/graphics/pokemon/rapidash/anim_front.png b/graphics/pokemon/rapidash/anim_front.png
index de3f07c2e4..34d8eda272 100644
Binary files a/graphics/pokemon/rapidash/anim_front.png and b/graphics/pokemon/rapidash/anim_front.png differ
diff --git a/graphics/pokemon/rapidash/back.png b/graphics/pokemon/rapidash/back.png
index 811f88d291..58330ba983 100644
Binary files a/graphics/pokemon/rapidash/back.png and b/graphics/pokemon/rapidash/back.png differ
diff --git a/graphics/pokemon/rapidash/normal.pal b/graphics/pokemon/rapidash/normal.pal
index a55c358abd..9adbea5028 100644
--- a/graphics/pokemon/rapidash/normal.pal
+++ b/graphics/pokemon/rapidash/normal.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-255 156 24
-230 98 41
-222 16 16
-255 222 82
-139 82 49
-255 230 197
-16 16 16
-197 148 106
-238 197 139
-168 72 64
-197 197 197
+0 0 0
 255 255 255
-248 160 152
+255 230 197
+238 197 139
+197 148 106
+139 82 49
+115 49 49
+222 16 16
+230 98 41
+255 156 24
+255 222 82
+197 197 197
 115 123 131
 65 74 82
+0 0 0
diff --git a/graphics/pokemon/rapidash/shiny.pal b/graphics/pokemon/rapidash/shiny.pal
index e879ee424b..0d72a91bd6 100644
--- a/graphics/pokemon/rapidash/shiny.pal
+++ b/graphics/pokemon/rapidash/shiny.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-168 168 184
-136 136 160
-104 104 120
-192 192 216
-128 80 64
-248 240 208
-16 16 16
-200 168 120
-232 216 152
-104 104 120
-192 192 192
-248 248 248
-168 168 184
-112 120 128
-64 72 80
+0 0 0
+255 255 255
+255 246 213
+238 222 164
+189 172 106
+156 115 74
+131 82 65
+106 106 123
+131 131 148
+156 156 172
+197 197 222
+197 197 197
+115 123 131
+65 74 82
+0 0 0
diff --git a/graphics/pokemon/raticate/anim_front.png b/graphics/pokemon/raticate/anim_front.png
index df0cb39482..749a46a485 100644
Binary files a/graphics/pokemon/raticate/anim_front.png and b/graphics/pokemon/raticate/anim_front.png differ
diff --git a/graphics/pokemon/raticate/anim_frontf.png b/graphics/pokemon/raticate/anim_frontf.png
index 11f8feac13..4fe3760774 100644
Binary files a/graphics/pokemon/raticate/anim_frontf.png and b/graphics/pokemon/raticate/anim_frontf.png differ
diff --git a/graphics/pokemon/raticate/back.png b/graphics/pokemon/raticate/back.png
index 002285f5a3..3131c485df 100644
Binary files a/graphics/pokemon/raticate/back.png and b/graphics/pokemon/raticate/back.png differ
diff --git a/graphics/pokemon/raticate/backf.png b/graphics/pokemon/raticate/backf.png
index 3812d02ddb..dbf7f8bef3 100644
Binary files a/graphics/pokemon/raticate/backf.png and b/graphics/pokemon/raticate/backf.png differ
diff --git a/graphics/pokemon/raticate/normal.pal b/graphics/pokemon/raticate/normal.pal
index b02c703c29..2bf8c9eba1 100644
--- a/graphics/pokemon/raticate/normal.pal
+++ b/graphics/pokemon/raticate/normal.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-148 82 16
-197 131 82
-255 205 156
-16 16 16
-106 57 0
-197 148 57
-164 115 41
-222 180 74
-180 180 180
 255 255 255
-131 90 41
+255 205 156
+197 131 82
+148 82 16
 246 246 164
 238 205 115
-115 115 115
 164 131 49
+131 90 41
+222 180 74
+197 148 57
+164 115 41
+106 57 0
+180 180 180
+115 115 115
+16 16 16
diff --git a/graphics/pokemon/raticate/shiny.pal b/graphics/pokemon/raticate/shiny.pal
index 96b6128bb8..bf3ef687ef 100644
--- a/graphics/pokemon/raticate/shiny.pal
+++ b/graphics/pokemon/raticate/shiny.pal
@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-152 208 160
-144 80 16
-192 128 80
-248 200 152
+152 160 208
+255 255 255
+255 205 156
+197 131 82
+148 82 16
+230 246 189
+213 230 139
+156 172 65
+131 131 49
+238 148 74
+213 115 57
+180 82 41
+123 24 0
+180 180 180
+115 115 115
 16 16 16
-120 24 0
-208 112 56
-176 80 40
-232 144 72
-176 176 176
-248 248 248
-128 128 48
-224 240 184
-208 224 136
-112 112 112
-152 168 64
diff --git a/graphics/pokemon/rattata/anim_front.png b/graphics/pokemon/rattata/anim_front.png
index b6f1016ec4..dd52fb08f3 100644
Binary files a/graphics/pokemon/rattata/anim_front.png and b/graphics/pokemon/rattata/anim_front.png differ
diff --git a/graphics/pokemon/rattata/anim_frontf.png b/graphics/pokemon/rattata/anim_frontf.png
index e3aef3a76a..a941ba1642 100644
Binary files a/graphics/pokemon/rattata/anim_frontf.png and b/graphics/pokemon/rattata/anim_frontf.png differ
diff --git a/graphics/pokemon/rattata/back.png b/graphics/pokemon/rattata/back.png
index 361dd43ab6..9e8c699bbc 100644
Binary files a/graphics/pokemon/rattata/back.png and b/graphics/pokemon/rattata/back.png differ
diff --git a/graphics/pokemon/rattata/backf.png b/graphics/pokemon/rattata/backf.png
index ca7c693dfe..c8d1a3de88 100644
Binary files a/graphics/pokemon/rattata/backf.png and b/graphics/pokemon/rattata/backf.png differ
diff --git a/graphics/pokemon/rattata/normal.pal b/graphics/pokemon/rattata/normal.pal
index 8c69af29f7..d36de4ac5d 100644
--- a/graphics/pokemon/rattata/normal.pal
+++ b/graphics/pokemon/rattata/normal.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-139 74 139
-180 115 189
-213 148 213
-74 41 65
-16 16 16
-205 172 98
-238 222 180
-205 205 205
-164 115 8
-230 90 115
 255 255 255
+230 90 115
 164 24 57
+208 152 208
+180 115 189
+139 74 139
+74 41 65
+238 222 180
+230 205 115
+205 172 98
+164 115 8
 98 74 8
+205 205 205
 90 90 90
-0 0 0
+16 16 16
diff --git a/graphics/pokemon/rattata/shiny.pal b/graphics/pokemon/rattata/shiny.pal
index e0d5ee48e9..fcba5ae25a 100644
--- a/graphics/pokemon/rattata/shiny.pal
+++ b/graphics/pokemon/rattata/shiny.pal
@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-152 208 160
-144 136 56
-192 192 104
-224 224 136
-104 88 16
+208 152 208
+255 255 255
+123 139 222
+65 82 164
+230 230 139
+197 197 106
+148 139 57
+106 90 16
+230 213 197
+222 197 131
+197 164 115
+156 106 32
+90 65 32
+205 205 205
+90 90 90
 16 16 16
-192 160 112
-224 208 192
-200 200 200
-152 104 32
-120 136 216
-248 248 248
-64 80 160
-88 64 32
-88 88 88
-144 136 56
diff --git a/graphics/pokemon/sandshrew/anim_front.png b/graphics/pokemon/sandshrew/anim_front.png
index 1382c8fde5..cd573e51f8 100644
Binary files a/graphics/pokemon/sandshrew/anim_front.png and b/graphics/pokemon/sandshrew/anim_front.png differ
diff --git a/graphics/pokemon/sandshrew/back.png b/graphics/pokemon/sandshrew/back.png
index 6bdc2ad331..42c6f96595 100644
Binary files a/graphics/pokemon/sandshrew/back.png and b/graphics/pokemon/sandshrew/back.png differ
diff --git a/graphics/pokemon/sandshrew/normal.pal b/graphics/pokemon/sandshrew/normal.pal
index a2d45c33be..fe0c6179e1 100644
--- a/graphics/pokemon/sandshrew/normal.pal
+++ b/graphics/pokemon/sandshrew/normal.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-131 98 16
+255 255 255
+255 0 255
 238 222 16
-205 189 180
-16 16 16
 205 180 0
-176 128 16
-232 232 200
-16 56 120
-248 248 248
-40 120 200
-232 216 200
-128 128 128
-200 200 200
+180 131 16
+131 98 16
 115 74 24
-0 0 0
+40 120 200
+16 56 120
+205 189 180
+230 213 197
+238 238 222
+131 131 131
+82 82 82
+16 16 16
diff --git a/graphics/pokemon/sandshrew/shiny.pal b/graphics/pokemon/sandshrew/shiny.pal
index 4ee0966b05..dbba31d65d 100644
--- a/graphics/pokemon/sandshrew/shiny.pal
+++ b/graphics/pokemon/sandshrew/shiny.pal
@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-152 208 160
-64 96 64
-168 216 72
-192 184 184
-16 16 16
-136 176 64
-104 128 72
-224 232 224
-24 48 88
-248 248 248
+208 152 160
+255 255 255
+255 0 255
+172 222 74
+139 180 65
+106 131 74
+65 98 65
+49 74 49
 48 96 144
-216 208 200
-128 128 128
-200 200 200
-0 0 0
-0 0 0
+24 44 88
+197 189 189
+222 213 205
+230 238 230
+131 131 131
+82 82 82
+16 16 16
diff --git a/graphics/pokemon/sandslash/anim_front.png b/graphics/pokemon/sandslash/anim_front.png
index 17ace08013..b43561b116 100644
Binary files a/graphics/pokemon/sandslash/anim_front.png and b/graphics/pokemon/sandslash/anim_front.png differ
diff --git a/graphics/pokemon/sandslash/back.png b/graphics/pokemon/sandslash/back.png
index 36116e703c..0813bc9f98 100644
Binary files a/graphics/pokemon/sandslash/back.png and b/graphics/pokemon/sandslash/back.png differ
diff --git a/graphics/pokemon/sandslash/normal.pal b/graphics/pokemon/sandslash/normal.pal
index ff473ca5e1..5ede9a6669 100644
--- a/graphics/pokemon/sandslash/normal.pal
+++ b/graphics/pokemon/sandslash/normal.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-74 57 16
-172 131 49
-16 16 16
-148 123 0
-139 98 24
-213 172 32
-90 74 0
+255 238 115
 246 213 32
+213 172 32
+148 123 0
+90 74 0
 255 255 255
-139 139 139
 222 213 180
-200 200 208
-48 48 72
+197 180 123
+139 139 139
 82 82 82
-0 0 0
+205 164 74
+172 131 49
+139 98 24
+74 57 16
+16 16 16
diff --git a/graphics/pokemon/sandslash/shiny.pal b/graphics/pokemon/sandslash/shiny.pal
index 86e888dbb7..63da4f4e71 100644
--- a/graphics/pokemon/sandslash/shiny.pal
+++ b/graphics/pokemon/sandslash/shiny.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-112 0 16
-216 48 64
+255 246 189
+213 197 123
+172 148 98
+131 115 41
+90 74 0
+255 255 255
+222 205 189
+197 172 131
+139 139 139
+82 82 82
+255 98 98
+222 49 65
+189 8 32
+74 57 16
 16 16 16
-120 104 56
-184 8 32
-168 144 96
-72 56 16
-208 192 120
-248 248 248
-136 136 136
-216 200 184
-200 200 208
-48 48 72
-80 80 80
-255 0 0
diff --git a/graphics/pokemon/slowbro/anim_front.png b/graphics/pokemon/slowbro/anim_front.png
index 582875ded1..3e05e62035 100644
Binary files a/graphics/pokemon/slowbro/anim_front.png and b/graphics/pokemon/slowbro/anim_front.png differ
diff --git a/graphics/pokemon/slowbro/back.png b/graphics/pokemon/slowbro/back.png
index 14b0abaa34..88d6cf1a83 100644
Binary files a/graphics/pokemon/slowbro/back.png and b/graphics/pokemon/slowbro/back.png differ
diff --git a/graphics/pokemon/slowbro/normal.pal b/graphics/pokemon/slowbro/normal.pal
index ae4d12a992..acd3ce77c4 100644
--- a/graphics/pokemon/slowbro/normal.pal
+++ b/graphics/pokemon/slowbro/normal.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-123 49 49
-230 106 123
-255 148 148
-24 24 24
-255 189 172
-248 248 248
-216 216 208
-82 82 90
-139 148 148
-131 90 32
-180 189 189
+255 255 255
 255 238 180
 238 213 131
 205 164 98
-232 80 40
+131 90 32
+222 222 213
+180 189 189
+139 148 148
+82 82 90
+230 82 41
+255 189 172
+255 148 148
+230 104 120
+120 48 48
+24 24 24
diff --git a/graphics/pokemon/slowbro/shiny.pal b/graphics/pokemon/slowbro/shiny.pal
index 477035fb43..e129fdff3b 100644
--- a/graphics/pokemon/slowbro/shiny.pal
+++ b/graphics/pokemon/slowbro/shiny.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-80 56 128
-136 112 184
-168 144 248
+255 255 255
+246 238 189
+230 205 139
+197 156 106
+123 90 41
+230 205 98
+205 172 74
+164 123 41
+123 82 41
+230 82 41
+205 189 255
+172 148 255
+131 106 189
+106 65 172
 24 24 24
-200 184 248
-248 248 248
-216 216 208
-96 64 40
-152 120 64
-120 88 40
-200 176 104
-240 232 184
-224 200 136
-192 152 104
-224 112 80
diff --git a/graphics/pokemon/slowpoke/anim_front.png b/graphics/pokemon/slowpoke/anim_front.png
index 5f0c1a6920..8b709c6e4e 100644
Binary files a/graphics/pokemon/slowpoke/anim_front.png and b/graphics/pokemon/slowpoke/anim_front.png differ
diff --git a/graphics/pokemon/slowpoke/back.png b/graphics/pokemon/slowpoke/back.png
index 7f1dff38f5..d355887126 100644
Binary files a/graphics/pokemon/slowpoke/back.png and b/graphics/pokemon/slowpoke/back.png differ
diff --git a/graphics/pokemon/slowpoke/normal.pal b/graphics/pokemon/slowpoke/normal.pal
index b07163f93a..402c21c4a1 100644
--- a/graphics/pokemon/slowpoke/normal.pal
+++ b/graphics/pokemon/slowpoke/normal.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-168 64 80
-216 96 120
-248 160 160
-248 128 144
-120 32 48
-104 96 96
-208 200 200
-248 248 248
 16 16 16
-216 160 96
-136 88 24
-248 224 176
-232 192 136
-248 224 176
-0 0 0
+255 255 255
+213 205 205
+106 98 98
+255 230 180
+238 197 139
+222 164 98
+139 90 24
+255 164 164
+255 131 148
+222 98 123
+172 65 82
+123 32 49
+255 131 148
+222 98 123
diff --git a/graphics/pokemon/slowpoke/shiny.pal b/graphics/pokemon/slowpoke/shiny.pal
index eba9b8ae4c..b830d71652 100644
--- a/graphics/pokemon/slowpoke/shiny.pal
+++ b/graphics/pokemon/slowpoke/shiny.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-168 112 120
-192 136 160
-248 208 224
-224 176 192
-128 72 80
-104 96 96
-208 200 200
-248 248 248
 16 16 16
-216 176 88
-136 104 16
-248 240 176
-232 208 128
-248 248 248
-232 208 224
+255 255 255
+213 205 205
+106 98 98
+255 246 180
+238 213 131
+222 180 90
+139 106 16
+255 213 230
+230 180 197
+197 139 164
+172 115 123
+131 74 82
+255 131 148
+222 98 123
diff --git a/graphics/pokemon/spearow/anim_front.png b/graphics/pokemon/spearow/anim_front.png
index dcdd7072ba..5b45394456 100644
Binary files a/graphics/pokemon/spearow/anim_front.png and b/graphics/pokemon/spearow/anim_front.png differ
diff --git a/graphics/pokemon/spearow/back.png b/graphics/pokemon/spearow/back.png
index 8564bd7188..6e456b4da3 100644
Binary files a/graphics/pokemon/spearow/back.png and b/graphics/pokemon/spearow/back.png differ
diff --git a/graphics/pokemon/spearow/normal.pal b/graphics/pokemon/spearow/normal.pal
index 8eda920f04..157c5d2f44 100644
--- a/graphics/pokemon/spearow/normal.pal
+++ b/graphics/pokemon/spearow/normal.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-156 82 24
-197 106 32
-106 65 24
-238 172 82
 0 0 0
-238 82 74
-172 65 74
 230 213 180
-255 255 255
+197 180 156
+139 123 98
+72 64 56
+238 172 82
+197 106 32
+156 82 24
+106 65 24
 255 213 205
 255 164 139
-197 180 156
+238 82 74
+172 65 74
 123 41 41
-139 123 98
-98 82 74
+255 255 255
diff --git a/graphics/pokemon/spearow/shiny.pal b/graphics/pokemon/spearow/shiny.pal
index 9f44b1ba5b..beaad33da1 100644
--- a/graphics/pokemon/spearow/shiny.pal
+++ b/graphics/pokemon/spearow/shiny.pal
@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-152 208 160
-144 160 24
-184 168 32
-128 120 16
-224 232 80
-16 16 16
-248 216 24
-224 160 40
-224 208 176
-248 248 248
-248 248 160
-240 232 96
-201 191 147
-160 104 32
-144 136 104
-80 72 56
+152 160 208
+0 0 0
+230 222 180
+197 189 156
+139 131 98
+98 90 74
+230 238 82
+189 172 32
+148 164 24
+131 123 16
+255 255 197
+255 246 115
+255 213 0
+238 164 0
+189 106 0
+255 255 255
diff --git a/graphics/pokemon/squirtle/anim_front.png b/graphics/pokemon/squirtle/anim_front.png
index fae3743a09..fb84be176f 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/back.png b/graphics/pokemon/squirtle/back.png
index 75f4e4df3d..6158ad5076 100644
Binary files a/graphics/pokemon/squirtle/back.png and b/graphics/pokemon/squirtle/back.png differ
diff --git a/graphics/pokemon/squirtle/normal.pal b/graphics/pokemon/squirtle/normal.pal
index b2282cee8b..8be6934217 100644
--- a/graphics/pokemon/squirtle/normal.pal
+++ b/graphics/pokemon/squirtle/normal.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-90 156 164
-41 115 131
-180 230 238
-139 197 205
-16 16 16
-208 200 200
-248 248 248
-131 41 0
-88 64 32
-189 106 0
-205 123 41
-230 172 90
-255 213 106
-98 41 0
+255 255 255
+205 197 197
 213 148 82
+189 106 0
+98 41 0
+255 230 156
+255 213 106
+230 172 90
+205 123 41
+123 49 8
+176 224 232
+136 192 200
+88 152 160
+40 112 128
+16 16 16
diff --git a/graphics/pokemon/squirtle/shiny.pal b/graphics/pokemon/squirtle/shiny.pal
index ff20b8f515..7ae46ab43d 100644
--- a/graphics/pokemon/squirtle/shiny.pal
+++ b/graphics/pokemon/squirtle/shiny.pal
@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-152 208 160
-120 160 224
-64 96 128
-208 232 248
-176 200 248
+208 152 160
+255 255 255
+213 205 205
+156 222 123
+90 172 41
+16 90 16
+255 246 148
+255 230 98
+230 189 82
+205 139 32
+131 57 0
+230 246 255
+180 205 255
+123 164 230
+65 98 131
 16 16 16
-208 200 200
-248 248 248
-128 56 0
-128 56 0
-88 168 40
-200 136 32
-224 184 80
-248 240 144
-16 88 16
-152 216 120
diff --git a/graphics/pokemon/tentacool/anim_front.png b/graphics/pokemon/tentacool/anim_front.png
index 14c2c916f1..ad3f1fa28e 100644
Binary files a/graphics/pokemon/tentacool/anim_front.png and b/graphics/pokemon/tentacool/anim_front.png differ
diff --git a/graphics/pokemon/tentacool/back.png b/graphics/pokemon/tentacool/back.png
index 7bee705686..3847409a40 100644
Binary files a/graphics/pokemon/tentacool/back.png and b/graphics/pokemon/tentacool/back.png differ
diff --git a/graphics/pokemon/tentacool/normal.pal b/graphics/pokemon/tentacool/normal.pal
index ab750d2edf..be1a6b52b9 100644
--- a/graphics/pokemon/tentacool/normal.pal
+++ b/graphics/pokemon/tentacool/normal.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-32 82 131
-106 16 16
-131 213 246
-106 180 230
-180 41 32
-255 255 255
-255 197 189
-255 82 74
-65 148 172
 0 0 0
+255 255 255
 213 213 213
+32 82 131
+65 148 172
+106 180 230
+131 213 246
+106 16 16
+180 41 32
+255 82 74
+255 197 189
 82 82 32
-213 197 148
 131 131 65
 180 172 115
+213 197 148
diff --git a/graphics/pokemon/tentacool/shiny.pal b/graphics/pokemon/tentacool/shiny.pal
index 57149a02b8..2059850de6 100644
--- a/graphics/pokemon/tentacool/shiny.pal
+++ b/graphics/pokemon/tentacool/shiny.pal
@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-0 176 232
+208 152 160
+0 0 0
+255 255 255
+213 213 213
 80 72 112
-0 96 24
-224 208 248
-192 176 224
-0 152 80
-248 248 248
-120 240 200
-24 192 136
 144 120 168
-16 16 16
-208 208 208
-80 80 48
-208 192 144
-128 128 64
-176 168 112
+197 180 230
+230 213 255
+0 98 24
+0 156 82
+24 197 139
+74 246 189
+82 82 32
+131 131 65
+180 172 115
+213 197 148
diff --git a/graphics/pokemon/tentacruel/anim_front.png b/graphics/pokemon/tentacruel/anim_front.png
index be51d3443d..b4c5ed3004 100644
Binary files a/graphics/pokemon/tentacruel/anim_front.png and b/graphics/pokemon/tentacruel/anim_front.png differ
diff --git a/graphics/pokemon/tentacruel/back.png b/graphics/pokemon/tentacruel/back.png
index 1bb5b0fffe..407e89132e 100644
Binary files a/graphics/pokemon/tentacruel/back.png and b/graphics/pokemon/tentacruel/back.png differ
diff --git a/graphics/pokemon/tentacruel/normal.pal b/graphics/pokemon/tentacruel/normal.pal
index 878043437b..1f8e690b4a 100644
--- a/graphics/pokemon/tentacruel/normal.pal
+++ b/graphics/pokemon/tentacruel/normal.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-32 82 131
-131 205 230
+255 255 255
+255 189 172
+246 65 82
+180 41 32
 131 16 16
+168 160 176
+128 120 136
+120 112 120
+96 96 104
+200 200 200
+131 205 230
 106 180 230
 65 148 172
+32 82 131
 16 16 16
-246 65 82
-255 189 172
-255 255 255
-180 41 32
-213 213 213
-82 82 32
-180 172 115
-131 131 65
-230 213 164
diff --git a/graphics/pokemon/tentacruel/shiny.pal b/graphics/pokemon/tentacruel/shiny.pal
index bfd3f50571..4849df7cd9 100644
--- a/graphics/pokemon/tentacruel/shiny.pal
+++ b/graphics/pokemon/tentacruel/shiny.pal
@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-248 160 176
-56 72 112
-192 208 248
-64 80 32
-152 168 224
-120 128 192
+208 152 160
+255 255 255
+189 230 172
+148 197 131
+98 156 90
+82 98 41
+238 213 164
+189 172 115
+139 131 65
+90 82 32
+213 213 213
+205 230 255
+156 172 230
+123 131 197
+82 98 156
 16 16 16
-144 192 128
-200 224 184
-248 248 248
-80 152 72
-208 208 208
-88 80 40
-184 168 112
-136 128 64
-232 208 160
diff --git a/graphics/pokemon/venomoth/anim_front.png b/graphics/pokemon/venomoth/anim_front.png
index 9f219239b8..aafa830fd0 100644
Binary files a/graphics/pokemon/venomoth/anim_front.png and b/graphics/pokemon/venomoth/anim_front.png differ
diff --git a/graphics/pokemon/venomoth/back.png b/graphics/pokemon/venomoth/back.png
index 9a3eff9cd5..d648e3e04a 100644
Binary files a/graphics/pokemon/venomoth/back.png and b/graphics/pokemon/venomoth/back.png differ
diff --git a/graphics/pokemon/venomoth/normal.pal b/graphics/pokemon/venomoth/normal.pal
index 92234d0a0c..56c25c37b1 100644
--- a/graphics/pokemon/venomoth/normal.pal
+++ b/graphics/pokemon/venomoth/normal.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-112 88 120
-156 139 189
-246 222 255
-213 172 222
-16 16 16
-213 172 222
-98 74 115
-238 197 255
-156 139 189
-248 248 248
+255 255 255
+230 230 230
 172 197 197
-98 82 57
-164 131 123
+230 213 172
 197 172 139
-224 224 224
+164 131 123
+98 82 57
+255 0 255
+255 0 255
+16 16 16
+246 222 255
+238 197 255
+213 172 222
+156 139 189
+98 74 115
diff --git a/graphics/pokemon/venomoth/shiny.pal b/graphics/pokemon/venomoth/shiny.pal
index 5f3aaa6986..75da213e0d 100644
--- a/graphics/pokemon/venomoth/shiny.pal
+++ b/graphics/pokemon/venomoth/shiny.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-56 72 120
-104 136 192
-192 224 248
-168 192 248
+255 255 255
+230 222 230
+180 189 197
+230 205 172
+197 164 139
+164 123 123
+98 74 57
+255 0 255
+255 0 255
 16 16 16
-168 192 248
-56 72 120
-192 224 248
-104 136 192
-248 248 248
-176 184 192
-104 80 72
-168 128 128
-208 176 152
-224 224 224
+180 222 255
+156 189 255
+131 164 230
+98 131 197
+49 65 123
diff --git a/graphics/pokemon/venonat/anim_front.png b/graphics/pokemon/venonat/anim_front.png
index bfa77a5a2a..87ff5d5261 100644
Binary files a/graphics/pokemon/venonat/anim_front.png and b/graphics/pokemon/venonat/anim_front.png differ
diff --git a/graphics/pokemon/venonat/back.png b/graphics/pokemon/venonat/back.png
index da5e27e7d4..90b1898a16 100644
Binary files a/graphics/pokemon/venonat/back.png and b/graphics/pokemon/venonat/back.png differ
diff --git a/graphics/pokemon/venonat/normal.pal b/graphics/pokemon/venonat/normal.pal
index 237a56d263..385b31ce64 100644
--- a/graphics/pokemon/venonat/normal.pal
+++ b/graphics/pokemon/venonat/normal.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-123 123 123
 255 255 255
 213 213 213
-16 16 16
-98 74 123
-139 106 164
-82 16 16
-180 65 90
-255 90 90
+123 123 123
 255 172 180
-49 41 82
-115 65 41
+255 90 90
+180 65 90
+82 16 16
 238 189 156
 189 148 106
-144 136 200
+115 65 41
+164 139 189
+139 106 164
+98 74 123
+49 41 82
+16 16 16
diff --git a/graphics/pokemon/venonat/shiny.pal b/graphics/pokemon/venonat/shiny.pal
index 7310506560..deff2ef883 100644
--- a/graphics/pokemon/venonat/shiny.pal
+++ b/graphics/pokemon/venonat/shiny.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-112 112 120
-248 248 248
-200 200 208
+255 255 255
+205 205 213
+115 115 123
+172 230 255
+90 156 255
+41 98 197
+0 41 148
+246 189 156
+197 148 106
+123 65 41
+164 139 197
+139 106 172
+98 74 131
+49 41 90
 16 16 16
-96 72 128
-136 104 168
-0 40 144
-40 96 192
-88 152 248
-168 224 248
-48 40 88
-120 64 40
-240 184 152
-192 144 104
-160 136 192
diff --git a/graphics/pokemon/venusaur/anim_front.png b/graphics/pokemon/venusaur/anim_front.png
index 90c41e5b1f..e224c3741b 100644
Binary files a/graphics/pokemon/venusaur/anim_front.png and b/graphics/pokemon/venusaur/anim_front.png differ
diff --git a/graphics/pokemon/venusaur/anim_frontf.png b/graphics/pokemon/venusaur/anim_frontf.png
index 57aec12940..b32f1dd456 100644
Binary files a/graphics/pokemon/venusaur/anim_frontf.png and b/graphics/pokemon/venusaur/anim_frontf.png differ
diff --git a/graphics/pokemon/venusaur/back.png b/graphics/pokemon/venusaur/back.png
index e5c2a3d0b6..f00ff70ae1 100644
Binary files a/graphics/pokemon/venusaur/back.png and b/graphics/pokemon/venusaur/back.png differ
diff --git a/graphics/pokemon/venusaur/backf.png b/graphics/pokemon/venusaur/backf.png
index 7c8661f8b3..ff3d450160 100644
Binary files a/graphics/pokemon/venusaur/backf.png and b/graphics/pokemon/venusaur/backf.png differ
diff --git a/graphics/pokemon/venusaur/normal.pal b/graphics/pokemon/venusaur/normal.pal
index d6751ffe01..9fef14fcea 100644
--- a/graphics/pokemon/venusaur/normal.pal
+++ b/graphics/pokemon/venusaur/normal.pal
@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-248 192 248
-128 48 0
-248 184 184
+152 160 208
+16 82 65
+16 120 104
+32 176 152
+88 208 192
+222 65 65
 248 120 112
-216 64 64
-184 104 48
-216 184 40
+131 49 0
+189 106 49
+222 189 41
+255 238 82
 16 16 16
-248 232 80
-16 80 64
+248 184 184
 88 152 56
 128 216 120
-88 208 192
-32 176 152
-16 120 104
-248 248 248
+255 255 255
diff --git a/graphics/pokemon/venusaur/shiny.pal b/graphics/pokemon/venusaur/shiny.pal
index 82c1e51676..35e0d10255 100644
--- a/graphics/pokemon/venusaur/shiny.pal
+++ b/graphics/pokemon/venusaur/shiny.pal
@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-208 248 184
-128 48 8
-248 248 216
-248 216 24
-224 144 16
-184 112 64
-216 184 40
-16 16 16
+152 160 208
+57 90 32
+120 152 40
+164 213 74
+205 238 82
+230 139 0
+255 213 0
+128 48 0
+189 106 49
+192 160 32
 248 232 80
-56 88 32
+16 16 16
+248 248 216
 88 152 56
 128 216 120
-200 232 80
-160 208 72
-120 152 40
-248 248 248
+255 255 255
diff --git a/graphics/pokemon/victreebel/anim_front.png b/graphics/pokemon/victreebel/anim_front.png
index 2d7ed01dae..b633b6f4b6 100644
Binary files a/graphics/pokemon/victreebel/anim_front.png and b/graphics/pokemon/victreebel/anim_front.png differ
diff --git a/graphics/pokemon/victreebel/back.png b/graphics/pokemon/victreebel/back.png
index 10afd1c67e..a8eaef0d0f 100644
Binary files a/graphics/pokemon/victreebel/back.png and b/graphics/pokemon/victreebel/back.png differ
diff --git a/graphics/pokemon/victreebel/normal.pal b/graphics/pokemon/victreebel/normal.pal
index ef9c409828..4e2238e77f 100644
--- a/graphics/pokemon/victreebel/normal.pal
+++ b/graphics/pokemon/victreebel/normal.pal
@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-0 176 232
-98 82 41
-16 98 57
-164 123 49
+152 160 208
 0 0 0
-139 197 123
-74 164 123
-197 90 32
-238 139 82
-248 248 248
-200 216 208
+189 197 197
+255 255 255
+98 82 41
+164 123 49
 222 189 82
-144 152 32
 238 213 106
 246 238 148
 131 24 0
+197 90 32
+238 139 82
+16 98 57
+74 164 123
+139 197 123
+180 230 156
diff --git a/graphics/pokemon/victreebel/shiny.pal b/graphics/pokemon/victreebel/shiny.pal
index 1aac75ff4b..173dbf31fe 100644
--- a/graphics/pokemon/victreebel/shiny.pal
+++ b/graphics/pokemon/victreebel/shiny.pal
@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-152 208 160
-96 80 40
-80 64 24
-160 120 48
-16 16 16
-192 176 88
-144 128 80
-72 104 176
-96 152 240
-248 248 248
-184 192 192
-176 224 72
-144 152 32
-216 248 88
-232 248 152
-0 40 152
+208 152 160
+0 0 0
+189 197 197
+255 255 255
+98 82 41
+164 123 49
+180 230 57
+222 255 90
+230 255 131
+0 41 156
+41 90 197
+74 139 246
+98 82 24
+164 148 90
+197 180 90
+230 213 123
diff --git a/graphics/pokemon/vileplume/anim_front.png b/graphics/pokemon/vileplume/anim_front.png
index f21019e3ca..ca062889d2 100644
Binary files a/graphics/pokemon/vileplume/anim_front.png and b/graphics/pokemon/vileplume/anim_front.png differ
diff --git a/graphics/pokemon/vileplume/anim_frontf.png b/graphics/pokemon/vileplume/anim_frontf.png
index b77e9aadf8..9ba0298e1d 100644
Binary files a/graphics/pokemon/vileplume/anim_frontf.png and b/graphics/pokemon/vileplume/anim_frontf.png differ
diff --git a/graphics/pokemon/vileplume/back.png b/graphics/pokemon/vileplume/back.png
index 43f520ddfe..2ddd23e8f1 100644
Binary files a/graphics/pokemon/vileplume/back.png and b/graphics/pokemon/vileplume/back.png differ
diff --git a/graphics/pokemon/vileplume/backf.png b/graphics/pokemon/vileplume/backf.png
index 0aa3c338c6..ff5be8baf7 100644
Binary files a/graphics/pokemon/vileplume/backf.png and b/graphics/pokemon/vileplume/backf.png differ
diff --git a/graphics/pokemon/vileplume/normal.pal b/graphics/pokemon/vileplume/normal.pal
index f7f01cae2a..425069bf0c 100644
--- a/graphics/pokemon/vileplume/normal.pal
+++ b/graphics/pokemon/vileplume/normal.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-189 49 74
-123 24 16
-255 98 98
+240 112 112
+248 128 40
+200 96 24
+144 72 0
+240 136 136
+152 56 64
+216 72 88
+112 24 16
 255 205 213
-238 49 49
 246 172 180
-16 16 16
-255 164 41
-180 98 32
-40 40 40
-197 139 32
-24 41 74
-57 82 82
+115 131 164
 90 98 131
-40 40 40
+56 64 96
+24 41 74
+16 16 16
diff --git a/graphics/pokemon/vileplume/shiny.pal b/graphics/pokemon/vileplume/shiny.pal
index 1480c0cb63..fd75dec7d2 100644
--- a/graphics/pokemon/vileplume/shiny.pal
+++ b/graphics/pokemon/vileplume/shiny.pal
@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-0 176 232
-184 96 40
-128 64 16
-248 184 80
-248 232 208
-232 144 64
-240 208 176
+152 160 208
+248 176 64
+255 164 41
+192 152 40
+176 104 32
+248 184 96
+197 115 57
+232 136 48
+131 65 16
+255 238 213
+246 213 180
+139 213 164
+98 172 106
+65 123 65
+32 74 24
 16 16 16
-248 184 104
-136 112 56
-16 16 16
-184 152 64
-32 72 24
-64 120 64
-104 160 112
-40 40 40
diff --git a/graphics/pokemon/vulpix/anim_front.png b/graphics/pokemon/vulpix/anim_front.png
index 97f5b0f626..53119cae2a 100644
Binary files a/graphics/pokemon/vulpix/anim_front.png and b/graphics/pokemon/vulpix/anim_front.png differ
diff --git a/graphics/pokemon/vulpix/back.png b/graphics/pokemon/vulpix/back.png
index 5562fabf68..bf02a4e498 100644
Binary files a/graphics/pokemon/vulpix/back.png and b/graphics/pokemon/vulpix/back.png differ
diff --git a/graphics/pokemon/vulpix/normal.pal b/graphics/pokemon/vulpix/normal.pal
index aefc8e87cf..4c352ac2f3 100644
--- a/graphics/pokemon/vulpix/normal.pal
+++ b/graphics/pokemon/vulpix/normal.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-115 32 0
+255 255 255
+255 230 180
+255 222 148
+16 16 16
+238 156 74
+160 112 64
+128 80 48
 255 148 90
 222 115 41
 189 74 41
-16 16 16
-115 49 0
-189 115 90
-230 148 106
-172 90 8
-205 123 41
-255 255 255
-160 120 112
-168 0 0
+115 32 0
 246 189 123
-0 0 0
+230 148 106
+189 115 90
+88 48 0
diff --git a/graphics/pokemon/vulpix/shiny.pal b/graphics/pokemon/vulpix/shiny.pal
index bf8fadc0c5..6096470d21 100644
--- a/graphics/pokemon/vulpix/shiny.pal
+++ b/graphics/pokemon/vulpix/shiny.pal
@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-152 208 160
-128 64 24
-248 232 128
-240 200 48
-208 136 40
+152 160 208
+255 255 255
+246 238 180
+246 230 148
 16 16 16
+189 205 98
+156 164 49
+104 128 24
+255 238 131
+246 197 0
+213 131 24
+131 57 0
+255 255 164
+238 238 57
+197 180 32
 80 88 48
-192 176 64
-232 232 88
-104 128 32
-152 160 48
-248 248 248
-152 136 104
-208 136 40
-240 224 144
-0 0 0
diff --git a/graphics/pokemon/wartortle/anim_front.png b/graphics/pokemon/wartortle/anim_front.png
index 9798863f17..7d01eb2577 100644
Binary files a/graphics/pokemon/wartortle/anim_front.png and b/graphics/pokemon/wartortle/anim_front.png differ
diff --git a/graphics/pokemon/wartortle/back.png b/graphics/pokemon/wartortle/back.png
index 0f47279c33..485fda6461 100644
Binary files a/graphics/pokemon/wartortle/back.png and b/graphics/pokemon/wartortle/back.png differ
diff --git a/graphics/pokemon/wartortle/normal.pal b/graphics/pokemon/wartortle/normal.pal
index c2c7c0db7e..26b0e2dc87 100644
--- a/graphics/pokemon/wartortle/normal.pal
+++ b/graphics/pokemon/wartortle/normal.pal
@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-153 210 164
-139 172 246
+152 208 160
 255 255 255
-16 16 16
-189 197 230
-41 65 106
-98 123 197
-213 238 246
-172 197 255
-106 74 24
+208 232 240
+184 192 224
+197 49 0
+205 131 32
 148 98 98
-172 139 98
-49 65 74
+90 57 8
 222 197 139
-200 48 0
+168 136 96
 139 90 32
+168 192 248
+136 168 240
+96 120 192
+40 64 104
+16 16 16
diff --git a/graphics/pokemon/wartortle/shiny.pal b/graphics/pokemon/wartortle/shiny.pal
index b8ca2cfbc1..6b16c8bb41 100644
--- a/graphics/pokemon/wartortle/shiny.pal
+++ b/graphics/pokemon/wartortle/shiny.pal
@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-153 210 164
-188 188 244
+208 152 160
 255 255 255
-16 16 16
-180 222 189
-98 82 148
-145 132 188
 213 246 197
-222 222 255
-57 90 16
+180 222 189
+197 49 0
+156 197 49
 90 139 16
-222 164 65
-65 65 82
+57 90 16
 246 213 123
-192 24 0
-136 96 24
+222 164 65
+164 98 32
+222 222 255
+180 180 246
+139 123 189
+98 82 148
+16 16 16
diff --git a/graphics/pokemon/weedle/anim_front.png b/graphics/pokemon/weedle/anim_front.png
index 4f22472074..6846775996 100644
Binary files a/graphics/pokemon/weedle/anim_front.png and b/graphics/pokemon/weedle/anim_front.png differ
diff --git a/graphics/pokemon/weedle/back.png b/graphics/pokemon/weedle/back.png
index 16d3c7f613..53a6242fc7 100644
Binary files a/graphics/pokemon/weedle/back.png and b/graphics/pokemon/weedle/back.png differ
diff --git a/graphics/pokemon/weedle/normal.pal b/graphics/pokemon/weedle/normal.pal
index b1d97250eb..ac1acc09ba 100644
--- a/graphics/pokemon/weedle/normal.pal
+++ b/graphics/pokemon/weedle/normal.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-139 139 148
 255 255 255
-90 90 98
 197 197 197
-148 90 8
+139 139 148
+90 90 98
+24 24 24
+255 213 123
 238 172 65
 205 115 16
+148 90 8
 106 57 8
-255 230 123
-24 24 24
-156 41 32
-222 90 82
-238 156 139
 255 222 205
+238 156 139
+222 90 82
+156 41 32
 0 0 0
diff --git a/graphics/pokemon/weedle/shiny.pal b/graphics/pokemon/weedle/shiny.pal
index b7150af418..060a627e5e 100644
--- a/graphics/pokemon/weedle/shiny.pal
+++ b/graphics/pokemon/weedle/shiny.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-136 136 144
-248 248 248
-88 88 96
-192 192 192
-216 136 16
-248 240 48
-240 176 48
-184 120 32
-248 248 184
+255 255 255
+197 197 197
+139 139 148
+90 90 98
 24 24 24
-168 80 120
-224 152 168
-224 200 208
-0 0 0
+255 255 172
+255 238 0
+255 180 0
+222 139 16
+189 106 0
+230 238 246
+230 205 213
+230 156 172
+172 82 123
 0 0 0
diff --git a/graphics/pokemon/weepinbell/anim_front.png b/graphics/pokemon/weepinbell/anim_front.png
index 4afac268bb..0a17971686 100644
Binary files a/graphics/pokemon/weepinbell/anim_front.png and b/graphics/pokemon/weepinbell/anim_front.png differ
diff --git a/graphics/pokemon/weepinbell/back.png b/graphics/pokemon/weepinbell/back.png
index 0d848af392..3062fb2051 100644
Binary files a/graphics/pokemon/weepinbell/back.png and b/graphics/pokemon/weepinbell/back.png differ
diff --git a/graphics/pokemon/weepinbell/normal.pal b/graphics/pokemon/weepinbell/normal.pal
index 27931063f3..8bc872b29a 100644
--- a/graphics/pokemon/weepinbell/normal.pal
+++ b/graphics/pokemon/weepinbell/normal.pal
@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-0 176 232
-8 90 49
-57 172 90
-156 222 131
+152 160 208
+0 0 0
+255 255 255
 98 74 49
 164 123 49
-0 0 0
-255 246 172
-255 230 106
-106 197 82
 213 197 82
+255 230 106
+255 246 172
 123 41 41
-255 255 255
 180 65 74
-238 156 172
 205 106 131
+238 156 172
+8 90 49
+57 152 80
+106 197 82
+156 222 131
diff --git a/graphics/pokemon/weepinbell/shiny.pal b/graphics/pokemon/weepinbell/shiny.pal
index 87c68f5b22..b64d3917ca 100644
--- a/graphics/pokemon/weepinbell/shiny.pal
+++ b/graphics/pokemon/weepinbell/shiny.pal
@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-0 176 232
-96 136 0
-144 184 24
-216 248 96
-104 80 48
-160 128 64
-16 16 16
-240 248 160
-216 248 88
-184 224 64
-184 200 56
-144 88 104
-248 248 248
-152 104 120
-232 200 208
-192 152 168
+152 160 208
+0 0 0
+255 255 255
+98 74 49
+164 123 49
+189 205 49
+222 255 90
+246 255 164
+148 90 106
+172 123 139
+197 156 172
+238 205 213
+98 139 0
+139 189 8
+189 238 49
+222 255 98
diff --git a/graphics/pokemon/wigglytuff/anim_front.png b/graphics/pokemon/wigglytuff/anim_front.png
index 7bf33d701c..43d9a2e234 100644
Binary files a/graphics/pokemon/wigglytuff/anim_front.png and b/graphics/pokemon/wigglytuff/anim_front.png differ
diff --git a/graphics/pokemon/wigglytuff/back.png b/graphics/pokemon/wigglytuff/back.png
index 7666a5fe34..d093212b97 100644
Binary files a/graphics/pokemon/wigglytuff/back.png and b/graphics/pokemon/wigglytuff/back.png differ
diff --git a/graphics/pokemon/wigglytuff/normal.pal b/graphics/pokemon/wigglytuff/normal.pal
index 9e5a199449..ef750b0d73 100644
--- a/graphics/pokemon/wigglytuff/normal.pal
+++ b/graphics/pokemon/wigglytuff/normal.pal
@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-152 208 160
-139 65 65
+152 160 208
 255 255 255
-115 115 115
 230 222 230
-16 16 16
+115 115 115
+148 222 205
+82 164 139
+32 90 98
+230 49 49
+156 106 32
+115 65 24
+255 222 205
 255 172 189
 246 123 148
 205 106 98
-255 222 205
-82 164 139
-32 90 98
-148 222 205
-115 65 24
-230 49 49
-0 0 0
+139 65 65
+16 16 16
diff --git a/graphics/pokemon/wigglytuff/shiny.pal b/graphics/pokemon/wigglytuff/shiny.pal
index d781c0acc6..a9c87f98f6 100644
--- a/graphics/pokemon/wigglytuff/shiny.pal
+++ b/graphics/pokemon/wigglytuff/shiny.pal
@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-152 208 160
-128 56 128
-248 248 248
-104 104 112
-216 216 224
+152 160 208
+255 255 255
+222 222 230
+115 115 115
+180 255 139
+139 213 98
+74 164 49
+230 49 49
+148 106 65
+106 65 57
+255 222 205
+238 180 246
+213 148 205
+164 106 172
+131 57 131
 16 16 16
-232 176 240
-208 144 200
-160 104 168
-216 216 224
-136 208 96
-72 160 48
-176 248 136
-112 72 40
-224 96 96
-0 0 0
diff --git a/graphics/pokemon/zubat/anim_front.png b/graphics/pokemon/zubat/anim_front.png
index 6060e7b77c..3ef6a453ab 100644
Binary files a/graphics/pokemon/zubat/anim_front.png and b/graphics/pokemon/zubat/anim_front.png differ
diff --git a/graphics/pokemon/zubat/anim_frontf.png b/graphics/pokemon/zubat/anim_frontf.png
index f0cd843a44..b9383adb48 100644
Binary files a/graphics/pokemon/zubat/anim_frontf.png and b/graphics/pokemon/zubat/anim_frontf.png differ
diff --git a/graphics/pokemon/zubat/back.png b/graphics/pokemon/zubat/back.png
index 64a5cf8da0..d4ab3b87ae 100644
Binary files a/graphics/pokemon/zubat/back.png and b/graphics/pokemon/zubat/back.png differ
diff --git a/graphics/pokemon/zubat/backf.png b/graphics/pokemon/zubat/backf.png
index 59ad49e138..a8bed93d0a 100644
Binary files a/graphics/pokemon/zubat/backf.png and b/graphics/pokemon/zubat/backf.png differ
diff --git a/graphics/pokemon/zubat/normal.pal b/graphics/pokemon/zubat/normal.pal
index 13f001cc13..2994d59602 100644
--- a/graphics/pokemon/zubat/normal.pal
+++ b/graphics/pokemon/zubat/normal.pal
@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-16 16 16
-99 123 181
-189 206 255
-140 181 239
-74 66 123
-99 123 181
-181 82 156
-115 33 90
-214 115 189
 255 255 255
-208 208 208
-99 99 99
-0 0 0
-0 0 0
-0 0 0
+213 213 213
+98 98 98
+16 16 16
+255 0 255
+189 205 255
+139 180 238
+98 123 180
+74 65 123
+246 131 222
+213 115 189
+180 82 156
+115 32 90
+255 0 255
+255 0 255
diff --git a/graphics/pokemon/zubat/shiny.pal b/graphics/pokemon/zubat/shiny.pal
index 290d12c52a..508d47898f 100644
--- a/graphics/pokemon/zubat/shiny.pal
+++ b/graphics/pokemon/zubat/shiny.pal
@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-152 208 160
+152 160 208
+255 255 255
+213 213 213
+98 98 98
 16 16 16
-64 120 24
-144 200 104
-112 152 56
-8 72 0
-64 120 24
-184 152 112
-120 96 48
-224 200 168
-248 248 248
-208 208 208
-96 96 96
-0 0 0
-0 0 0
-0 0 0
+255 0 255
+131 213 74
+106 156 41
+49 115 0
+8 74 0
+246 131 222
+238 213 156
+189 156 115
+139 115 57
+255 0 255
+255 0 255
diff --git a/src/data/pokemon_graphics/enemy_mon_elevation.h b/src/data/pokemon_graphics/enemy_mon_elevation.h
index 9471451ea9..007c6a90a7 100644
--- a/src/data/pokemon_graphics/enemy_mon_elevation.h
+++ b/src/data/pokemon_graphics/enemy_mon_elevation.h
@@ -9,7 +9,7 @@ const u8 gEnemyMonElevation[NUM_SPECIES + 1] =
     [SPECIES_ZUBAT] = 16,
     [SPECIES_GOLBAT] = 10,
     [SPECIES_VENOMOTH] = 16,
-    [SPECIES_GEODUDE] = 16,
+    [SPECIES_GEODUDE] = 10,
     [SPECIES_MAGNEMITE] = 17,
     [SPECIES_MAGNETON] = 9,
     [SPECIES_GASTLY] = 10,
diff --git a/src/data/pokemon_graphics/front_pic_anims.h b/src/data/pokemon_graphics/front_pic_anims.h
index 309e14e896..95ea6f9437 100644
--- a/src/data/pokemon_graphics/front_pic_anims.h
+++ b/src/data/pokemon_graphics/front_pic_anims.h
@@ -64,9 +64,10 @@ static const union AnimCmd sAnim_Charizard_1[] =
 
 static const union AnimCmd sAnim_Squirtle_1[] =
 {
-    ANIMCMD_FRAME(1, 50),
-    ANIMCMD_FRAME(1, 50),
-    ANIMCMD_FRAME(0, 10),
+    ANIMCMD_FRAME(1, 11),
+    ANIMCMD_FRAME(0, 11),
+    ANIMCMD_FRAME(1, 11),
+    ANIMCMD_FRAME(0, 1),
     ANIMCMD_END,
 };
 
@@ -80,11 +81,10 @@ static const union AnimCmd sAnim_Wartortle_1[] =
 
 static const union AnimCmd sAnim_Blastoise_1[] =
 {
-    ANIMCMD_FRAME(0, 50),
-    ANIMCMD_FRAME(1, 25),
+    ANIMCMD_FRAME(1, 20),
     ANIMCMD_FRAME(0, 20),
     ANIMCMD_FRAME(1, 25),
-    ANIMCMD_FRAME(0, 1),
+    ANIMCMD_FRAME(0, 20),
     ANIMCMD_END,
 };
 
@@ -158,26 +158,19 @@ static const union AnimCmd sAnim_Beedrill_1[] =
 {
     ANIMCMD_FRAME(0, 5),
     ANIMCMD_FRAME(1, 35),
-    ANIMCMD_FRAME(0, 28),
+    ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 10),
     ANIMCMD_FRAME(0, 10),
+    ANIMCMD_FRAME(1, 20),
+    ANIMCMD_FRAME(0, 10),
     ANIMCMD_END,
 };
 
 static const union AnimCmd sAnim_Pidgey_1[] =
 {
-    ANIMCMD_FRAME(1, 5),
     ANIMCMD_FRAME(0, 5),
-    ANIMCMD_FRAME(1, 5),
-    ANIMCMD_FRAME(0, 10),
-    ANIMCMD_FRAME(1, 5),
+    ANIMCMD_FRAME(1, 25),
     ANIMCMD_FRAME(0, 5),
-    ANIMCMD_FRAME(1, 5),
-    ANIMCMD_FRAME(0, 10),
-    ANIMCMD_FRAME(1, 5),
-    ANIMCMD_FRAME(0, 5),
-    ANIMCMD_FRAME(1, 5),
-    ANIMCMD_FRAME(0, 10),
     ANIMCMD_END,
 };
 
@@ -202,10 +195,10 @@ static const union AnimCmd sAnim_Pidgeot_1[] =
 
 static const union AnimCmd sAnim_Rattata_1[] =
 {
-    ANIMCMD_FRAME(0, 3),
-    ANIMCMD_FRAME(1, 50),
-    ANIMCMD_FRAME(1, 28),
-    ANIMCMD_FRAME(0, 5),
+    ANIMCMD_FRAME(1, 11),
+    ANIMCMD_FRAME(0, 11),
+    ANIMCMD_FRAME(1, 11),
+    ANIMCMD_FRAME(0, 1),
     ANIMCMD_END,
 };
 
@@ -228,22 +221,10 @@ static const union AnimCmd sAnim_Raticate_1[] =
 
 static const union AnimCmd sAnim_Spearow_1[] =
 {
-    ANIMCMD_FRAME(0, 5),
-    ANIMCMD_FRAME(1, 5),
-    ANIMCMD_FRAME(0, 5),
-    ANIMCMD_FRAME(1, 5),
-    ANIMCMD_FRAME(0, 5),
-    ANIMCMD_FRAME(1, 5),
-    ANIMCMD_FRAME(0, 5),
-    ANIMCMD_FRAME(1, 5),
-    ANIMCMD_FRAME(0, 5),
-    ANIMCMD_FRAME(1, 5),
-    ANIMCMD_FRAME(0, 20),
-    ANIMCMD_FRAME(0, 5),
-    ANIMCMD_FRAME(1, 5),
-    ANIMCMD_FRAME(0, 5),
-    ANIMCMD_FRAME(1, 5),
-    ANIMCMD_FRAME(0, 5),
+    ANIMCMD_FRAME(1, 11),
+    ANIMCMD_FRAME(0, 11),
+    ANIMCMD_FRAME(1, 11),
+    ANIMCMD_FRAME(0, 1),
     ANIMCMD_END,
 };
 
@@ -282,10 +263,9 @@ static const union AnimCmd sAnim_Arbok_1[] =
 static const union AnimCmd sAnim_Pikachu_1[] =
 {
     ANIMCMD_FRAME(0, 15),
+    ANIMCMD_FRAME(1, 60),
     ANIMCMD_FRAME(1, 20),
-    ANIMCMD_FRAME(0, 15),
-    ANIMCMD_FRAME(1, 20),
-    ANIMCMD_FRAME(0, 15),
+    ANIMCMD_FRAME(0, 1),
     ANIMCMD_END,
 };
 
@@ -393,8 +373,8 @@ static const union AnimCmd sAnim_NidoranM_1[] =
 
 static const union AnimCmd sAnim_Nidorino_1[] =
 {
-    ANIMCMD_FRAME(0, 15),
-    ANIMCMD_FRAME(1, 15),
+    ANIMCMD_FRAME(0, 7),
+    ANIMCMD_FRAME(1, 23),
     ANIMCMD_FRAME(0, 5),
     ANIMCMD_END,
 };
@@ -418,11 +398,8 @@ static const union AnimCmd sAnim_Clefairy_1[] =
 
 static const union AnimCmd sAnim_Clefable_1[] =
 {
-    ANIMCMD_FRAME(1, 27),
-    ANIMCMD_FRAME(0, 27),
-    ANIMCMD_FRAME(1, 24),
-    ANIMCMD_FRAME(0, 25),
-    ANIMCMD_FRAME(1, 27),
+    ANIMCMD_FRAME(0, 16),
+    ANIMCMD_FRAME(1, 48),
     ANIMCMD_FRAME(0, 5),
     ANIMCMD_END,
 };
@@ -568,10 +545,7 @@ static const union AnimCmd sAnim_Gloom_1[] =
 
 static const union AnimCmd sAnim_Vileplume_1[] =
 {
-    ANIMCMD_FRAME(0, 50),
-    ANIMCMD_FRAME(1, 25),
-    ANIMCMD_FRAME(0, 20),
-    ANIMCMD_FRAME(1, 25),
+    ANIMCMD_FRAME(1, 38),
     ANIMCMD_FRAME(0, 1),
     ANIMCMD_END,
 };
@@ -738,12 +712,13 @@ static const union AnimCmd sAnim_Mankey_1[] =
 
 static const union AnimCmd sAnim_Primeape_1[] =
 {
-    ANIMCMD_FRAME(1, 15),
-    ANIMCMD_FRAME(0, 15),
-    ANIMCMD_FRAME(1, 15),
-    ANIMCMD_FRAME(0, 15),
-    ANIMCMD_FRAME(1, 15),
-    ANIMCMD_FRAME(0, 15),
+    ANIMCMD_FRAME(0, 14),
+    ANIMCMD_FRAME(1, 14),
+    ANIMCMD_FRAME(0, 14),
+    ANIMCMD_FRAME(1, 14),
+    ANIMCMD_FRAME(0, 14),
+    ANIMCMD_FRAME(1, 10),
+    ANIMCMD_FRAME(0, 1),
     ANIMCMD_END,
 };
 
@@ -760,12 +735,8 @@ static const union AnimCmd sAnim_Growlithe_1[] =
 
 static const union AnimCmd sAnim_Arcanine_1[] =
 {
-    ANIMCMD_FRAME(1, 8),
-    ANIMCMD_FRAME(0, 8),
-    ANIMCMD_FRAME(1, 8),
-    ANIMCMD_FRAME(0, 15),
-    ANIMCMD_FRAME(1, 40),
-    ANIMCMD_FRAME(0, 10),
+    ANIMCMD_FRAME(1, 38),
+    ANIMCMD_FRAME(0, 1),
     ANIMCMD_END,
 };
 
@@ -822,9 +793,7 @@ static const union AnimCmd sAnim_Alakazam_1[] =
 
 static const union AnimCmd sAnim_Machop_1[] =
 {
-    ANIMCMD_FRAME(0, 15),
-    ANIMCMD_FRAME(1, 15),
-    ANIMCMD_FRAME(0, 15),
+    ANIMCMD_FRAME(0, 6),
     ANIMCMD_FRAME(1, 15),
     ANIMCMD_FRAME(0, 15),
     ANIMCMD_FRAME(1, 15),
@@ -934,7 +903,7 @@ static const union AnimCmd sAnim_Golem_1[] =
 
 static const union AnimCmd sAnim_Ponyta_1[] =
 {
-    ANIMCMD_FRAME(1, 45),
+    ANIMCMD_FRAME(1, 30),
     ANIMCMD_FRAME(0, 5),
     ANIMCMD_END,
 };
@@ -957,7 +926,6 @@ static const union AnimCmd sAnim_Slowpoke_1[] =
 
 static const union AnimCmd sAnim_Slowbro_1[] =
 {
-    ANIMCMD_FRAME(1, 50),
     ANIMCMD_FRAME(1, 45),
     ANIMCMD_FRAME(0, 10),
     ANIMCMD_END,
diff --git a/src/data/pokemon_graphics/front_pic_coordinates.h b/src/data/pokemon_graphics/front_pic_coordinates.h
index eb2786fde0..897ce63308 100644
--- a/src/data/pokemon_graphics/front_pic_coordinates.h
+++ b/src/data/pokemon_graphics/front_pic_coordinates.h
@@ -9,11 +9,11 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] =
     [SPECIES_IVYSAUR]                      = { .size = MON_COORDS_SIZE(56, 48), .y_offset =  9 },
     [SPECIES_VENUSAUR]                     = { .size = MON_COORDS_SIZE(64, 64), .y_offset =  3 },
     [SPECIES_CHARMANDER]                   = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 10 },
-    [SPECIES_CHARMELEON]                   = { .size = MON_COORDS_SIZE(56, 56), .y_offset =  7 },
+    [SPECIES_CHARMELEON]                   = { .size = MON_COORDS_SIZE(56, 56), .y_offset =  8 },
     [SPECIES_CHARIZARD]                    = { .size = MON_COORDS_SIZE(64, 64), .y_offset =  0 },
     [SPECIES_SQUIRTLE]                     = { .size = MON_COORDS_SIZE(40, 48), .y_offset = 11 },
     [SPECIES_WARTORTLE]                    = { .size = MON_COORDS_SIZE(56, 56), .y_offset =  7 },
-    [SPECIES_BLASTOISE]                    = { .size = MON_COORDS_SIZE(64, 64), .y_offset =  3 },
+    [SPECIES_BLASTOISE]                    = { .size = MON_COORDS_SIZE(64, 64), .y_offset =  4 },
     [SPECIES_CATERPIE]                     = { .size = MON_COORDS_SIZE(40, 40), .y_offset = 12 },
     [SPECIES_METAPOD]                      = { .size = MON_COORDS_SIZE(40, 40), .y_offset = 14 },
     [SPECIES_BUTTERFREE]                   = { .size = MON_COORDS_SIZE(64, 56), .y_offset = 10 },
@@ -47,10 +47,10 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] =
     [SPECIES_WIGGLYTUFF]                   = { .size = MON_COORDS_SIZE(48, 64), .y_offset =  4 },
     [SPECIES_ZUBAT]                        = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 16 },
     [SPECIES_GOLBAT]                       = { .size = MON_COORDS_SIZE(64, 56), .y_offset =  7 },
-    [SPECIES_ODDISH]                       = { .size = MON_COORDS_SIZE(40, 40), .y_offset = 14 },
+    [SPECIES_ODDISH]                       = { .size = MON_COORDS_SIZE(40, 40), .y_offset = 15 },
     [SPECIES_GLOOM]                        = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 11 },
     [SPECIES_VILEPLUME]                    = { .size = MON_COORDS_SIZE(56, 56), .y_offset =  7 },
-    [SPECIES_PARAS]                        = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 14 },
+    [SPECIES_PARAS]                        = { .size = MON_COORDS_SIZE(48, 40), .y_offset = 15 },
     [SPECIES_PARASECT]                     = { .size = MON_COORDS_SIZE(56, 56), .y_offset =  7 },
     [SPECIES_VENONAT]                      = { .size = MON_COORDS_SIZE(40, 56), .y_offset =  8 },
     [SPECIES_VENOMOTH]                     = { .size = MON_COORDS_SIZE(64, 48), .y_offset =  9 },
@@ -59,10 +59,10 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] =
     [SPECIES_MEOWTH]                       = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 10 },
     [SPECIES_PERSIAN]                      = { .size = MON_COORDS_SIZE(64, 56), .y_offset =  4 },
     [SPECIES_PSYDUCK]                      = { .size = MON_COORDS_SIZE(40, 48), .y_offset = 11 },
-    [SPECIES_GOLDUCK]                      = { .size = MON_COORDS_SIZE(64, 64), .y_offset =  2 },
+    [SPECIES_GOLDUCK]                      = { .size = MON_COORDS_SIZE(64, 64), .y_offset =  4 },
     [SPECIES_MANKEY]                       = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 11 },
     [SPECIES_PRIMEAPE]                     = { .size = MON_COORDS_SIZE(64, 56), .y_offset =  6 },
-    [SPECIES_GROWLITHE]                    = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 11 },
+    [SPECIES_GROWLITHE]                    = { .size = MON_COORDS_SIZE(48, 48), .y_offset =  9 },
     [SPECIES_ARCANINE]                     = { .size = MON_COORDS_SIZE(64, 64), .y_offset =  2 },
     [SPECIES_POLIWAG]                      = { .size = MON_COORDS_SIZE(64, 40), .y_offset = 13 },
     [SPECIES_POLIWHIRL]                    = { .size = MON_COORDS_SIZE(64, 48), .y_offset =  9 },
@@ -70,7 +70,7 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] =
     [SPECIES_ABRA]                         = { .size = MON_COORDS_SIZE(56, 48), .y_offset = 10 },
     [SPECIES_KADABRA]                      = { .size = MON_COORDS_SIZE(64, 56), .y_offset =  5 },
     [SPECIES_ALAKAZAM]                     = { .size = MON_COORDS_SIZE(64, 64), .y_offset =  2 },
-    [SPECIES_MACHOP]                       = { .size = MON_COORDS_SIZE(48, 48), .y_offset = 10 },
+    [SPECIES_MACHOP]                       = { .size = MON_COORDS_SIZE(48, 48), .y_offset =  8 },
     [SPECIES_MACHOKE]                      = { .size = MON_COORDS_SIZE(56, 56), .y_offset =  4 },
     [SPECIES_MACHAMP]                      = { .size = MON_COORDS_SIZE(64, 64), .y_offset =  0 },
     [SPECIES_BELLSPROUT]                   = { .size = MON_COORDS_SIZE(40, 40), .y_offset = 12 },
diff --git a/src/pokemon.c b/src/pokemon.c
index a62e236627..6c00e18e9e 100644
--- a/src/pokemon.c
+++ b/src/pokemon.c
@@ -1969,7 +1969,7 @@ const u8 sMonFrontAnimIdsTable[NUM_SPECIES - 1] =
     [SPECIES_CHARMANDER - 1]    = ANIM_V_JUMPS_SMALL,
     [SPECIES_CHARMELEON - 1]    = ANIM_BACK_AND_LUNGE,
     [SPECIES_CHARIZARD - 1]     = ANIM_V_SHAKE,
-    [SPECIES_SQUIRTLE - 1]      = ANIM_V_JUMPS_SMALL,
+    [SPECIES_SQUIRTLE - 1]      = ANIM_V_JUMPS_BIG,
     [SPECIES_WARTORTLE - 1]     = ANIM_SHRINK_GROW,
     [SPECIES_BLASTOISE - 1]     = ANIM_V_SHAKE_TWICE,
     [SPECIES_CATERPIE - 1]      = ANIM_SWING_CONCAVE,
@@ -1977,13 +1977,13 @@ const u8 sMonFrontAnimIdsTable[NUM_SPECIES - 1] =
     [SPECIES_BUTTERFREE - 1]    = ANIM_H_SLIDE_WOBBLE,
     [SPECIES_WEEDLE - 1]        = ANIM_H_SLIDE_SLOW,
     [SPECIES_KAKUNA - 1]        = ANIM_GLOW_ORANGE,
-    [SPECIES_BEEDRILL - 1]      = ANIM_H_VIBRATE,
+    [SPECIES_BEEDRILL - 1]      = ANIM_ZIGZAG_SLOW,
     [SPECIES_PIDGEY - 1]        = ANIM_V_STRETCH,
     [SPECIES_PIDGEOTTO - 1]     = ANIM_V_STRETCH,
     [SPECIES_PIDGEOT - 1]       = ANIM_FRONT_FLIP,
-    [SPECIES_RATTATA - 1]       = ANIM_RAPID_H_HOPS,
-    [SPECIES_RATICATE - 1]      = ANIM_FIGURE_8,
-    [SPECIES_SPEAROW - 1]       = ANIM_H_JUMPS,
+    [SPECIES_RATTATA - 1]       = ANIM_H_JUMPS,
+    [SPECIES_RATICATE - 1]      = ANIM_BOUNCE_ROTATE_TO_SIDES_SMALL,
+    [SPECIES_SPEAROW - 1]       = ANIM_V_JUMPS_SMALL,
     [SPECIES_FEAROW - 1]        = ANIM_FIGURE_8,
     [SPECIES_EKANS - 1]         = ANIM_V_STRETCH,
     [SPECIES_ARBOK - 1]         = ANIM_V_STRETCH,
@@ -1998,16 +1998,16 @@ const u8 sMonFrontAnimIdsTable[NUM_SPECIES - 1] =
     [SPECIES_NIDORINO - 1]      = ANIM_V_STRETCH,
     [SPECIES_NIDOKING - 1]      = ANIM_H_SHAKE,
     [SPECIES_CLEFAIRY - 1]      = ANIM_V_SQUISH_AND_BOUNCE,
-    [SPECIES_CLEFABLE - 1]      = ANIM_V_STRETCH,
+    [SPECIES_CLEFABLE - 1]      = ANIM_V_SQUISH_AND_BOUNCE,
     [SPECIES_VULPIX - 1]        = ANIM_V_STRETCH,
     [SPECIES_NINETALES - 1]     = ANIM_GROW_VIBRATE,
     [SPECIES_JIGGLYPUFF - 1]    = ANIM_BOUNCE_ROTATE_TO_SIDES_SMALL,
     [SPECIES_WIGGLYTUFF - 1]    = ANIM_H_JUMPS,
     [SPECIES_ZUBAT - 1]         = ANIM_V_SQUISH_AND_BOUNCE,
     [SPECIES_GOLBAT - 1]        = ANIM_H_SLIDE_WOBBLE,
-    [SPECIES_ODDISH - 1]        = ANIM_V_SQUISH_AND_BOUNCE,
+    [SPECIES_ODDISH - 1]        = ANIM_V_JUMPS_H_JUMPS,
     [SPECIES_GLOOM - 1]         = ANIM_V_SQUISH_AND_BOUNCE_SLOW,
-    [SPECIES_VILEPLUME - 1]     = ANIM_V_SHAKE_TWICE,
+    [SPECIES_VILEPLUME - 1]     = ANIM_V_SQUISH_AND_BOUNCE_SLOW,
     [SPECIES_PARAS - 1]         = ANIM_H_SLIDE_SLOW,
     [SPECIES_PARASECT - 1]      = ANIM_H_SHAKE,
     [SPECIES_VENONAT - 1]       = ANIM_V_JUMPS_H_JUMPS,
@@ -2019,16 +2019,16 @@ const u8 sMonFrontAnimIdsTable[NUM_SPECIES - 1] =
     [SPECIES_PSYDUCK - 1]       = ANIM_V_JUMPS_H_JUMPS,
     [SPECIES_GOLDUCK - 1]       = ANIM_H_SHAKE_SLOW,
     [SPECIES_MANKEY - 1]        = ANIM_H_JUMPS_V_STRETCH,
-    [SPECIES_PRIMEAPE - 1]      = ANIM_BOUNCE_ROTATE_TO_SIDES_SMALL,
-    [SPECIES_GROWLITHE - 1]     = ANIM_BACK_AND_LUNGE,
-    [SPECIES_ARCANINE - 1]      = ANIM_H_SHAKE,
+    [SPECIES_PRIMEAPE - 1]      = ANIM_BOUNCE_ROTATE_TO_SIDES,
+    [SPECIES_GROWLITHE - 1]     = ANIM_V_STRETCH,
+    [SPECIES_ARCANINE - 1]      = ANIM_V_SHAKE,
     [SPECIES_POLIWAG - 1]       = ANIM_V_SQUISH_AND_BOUNCE,
     [SPECIES_POLIWHIRL - 1]     = ANIM_H_JUMPS_V_STRETCH,
     [SPECIES_POLIWRATH - 1]     = ANIM_V_SHAKE_TWICE,
-    [SPECIES_ABRA - 1]          = ANIM_H_JUMPS,
+    [SPECIES_ABRA - 1]          = ANIM_H_VIBRATE,
     [SPECIES_KADABRA - 1]       = ANIM_GROW_VIBRATE,
     [SPECIES_ALAKAZAM - 1]      = ANIM_GROW_VIBRATE,
-    [SPECIES_MACHOP - 1]        = ANIM_V_SQUISH_AND_BOUNCE,
+    [SPECIES_MACHOP - 1]        = ANIM_V_STRETCH,
     [SPECIES_MACHOKE - 1]       = ANIM_V_SHAKE,
     [SPECIES_MACHAMP - 1]       = ANIM_H_JUMPS,
     [SPECIES_BELLSPROUT - 1]    = ANIM_H_JUMPS,
@@ -2037,12 +2037,12 @@ const u8 sMonFrontAnimIdsTable[NUM_SPECIES - 1] =
     [SPECIES_TENTACOOL - 1]     = ANIM_V_SQUISH_AND_BOUNCE,
     [SPECIES_TENTACRUEL - 1]    = ANIM_V_SQUISH_AND_BOUNCE,
     [SPECIES_GEODUDE - 1]       = ANIM_BOUNCE_ROTATE_TO_SIDES_SMALL,
-    [SPECIES_GRAVELER - 1]      = ANIM_BOUNCE_ROTATE_TO_SIDES_SMALL,
+    [SPECIES_GRAVELER - 1]      = ANIM_V_SHAKE,
     [SPECIES_GOLEM - 1]         = ANIM_ROTATE_UP_SLAM_DOWN,
-    [SPECIES_PONYTA - 1]        = ANIM_GLOW_ORANGE,
+    [SPECIES_PONYTA - 1]        = ANIM_V_SHAKE,
     [SPECIES_RAPIDASH - 1]      = ANIM_H_SHAKE,
     [SPECIES_SLOWPOKE - 1]      = ANIM_V_SQUISH_AND_BOUNCE_SLOW,
-    [SPECIES_SLOWBRO - 1]       = ANIM_GROW_VIBRATE,
+    [SPECIES_SLOWBRO - 1]       = ANIM_H_STRETCH,
     [SPECIES_MAGNEMITE - 1]     = ANIM_TUMBLING_FRONT_FLIP_TWICE,
     [SPECIES_MAGNETON - 1]      = ANIM_FLASH_YELLOW,
     [SPECIES_FARFETCHD - 1]     = ANIM_BOUNCE_ROTATE_TO_SIDES_SMALL,
@@ -3041,13 +3041,13 @@ const u8 sMonFrontAnimIdsTable[NUM_SPECIES - 1] =
 
 static const u8 sMonAnimationDelayTable[NUM_SPECIES - 1] =
 {
-    [SPECIES_BLASTOISE - 1]  = 50,
+    [SPECIES_BLASTOISE - 1]  = 20,
     [SPECIES_WEEDLE - 1]     = 10,
     [SPECIES_KAKUNA - 1]     = 20,
-    [SPECIES_BEEDRILL - 1]   = 35,
     [SPECIES_PIDGEOTTO - 1]  = 25,
     [SPECIES_FEAROW - 1]     = 2,
     [SPECIES_EKANS - 1]      = 30,
+    [SPECIES_PIKACHU - 1]    = 25,
     [SPECIES_NIDORAN_F - 1]  = 28,
     [SPECIES_NIDOKING - 1]   = 25,
     [SPECIES_PARAS - 1]      = 10,
@@ -3059,9 +3059,10 @@ static const u8 sMonAnimationDelayTable[NUM_SPECIES - 1] =
     [SPECIES_PERSIAN - 1]    = 20,
     [SPECIES_MANKEY - 1]     = 20,
     [SPECIES_GROWLITHE - 1]  = 30,
-    [SPECIES_ARCANINE - 1]   = 40,
+    [SPECIES_ARCANINE - 1]   = 8,
     [SPECIES_POLIWHIRL - 1]  = 5,
     [SPECIES_WEEPINBELL - 1] = 3,
+    [SPECIES_PONYTA - 1]     = 10,
     [SPECIES_MUK - 1]        = 45,
     [SPECIES_SHELLDER - 1]   = 20,
     [SPECIES_HAUNTER - 1]    = 23,