diff --git a/public/images/pokemon/658-ash.png b/public/images/pokemon/658-ash.png
index 6bda921f169..a122df859bd 100644
Binary files a/public/images/pokemon/658-ash.png and b/public/images/pokemon/658-ash.png differ
diff --git a/public/images/pokemon/658.png b/public/images/pokemon/658.png
index 095b8c0039d..ed730c8b81c 100644
Binary files a/public/images/pokemon/658.png and b/public/images/pokemon/658.png differ
diff --git a/public/images/pokemon/back/658-ash.png b/public/images/pokemon/back/658-ash.png
index e574e888fac..382b06fd6cb 100644
Binary files a/public/images/pokemon/back/658-ash.png and b/public/images/pokemon/back/658-ash.png differ
diff --git a/public/images/pokemon/back/658.png b/public/images/pokemon/back/658.png
index a8128e1c73f..ea24d9a6336 100644
Binary files a/public/images/pokemon/back/658.png and b/public/images/pokemon/back/658.png differ
diff --git a/public/images/pokemon/back/shiny/658-ash.png b/public/images/pokemon/back/shiny/658-ash.png
index e41efb2c7ad..6e10e834731 100644
Binary files a/public/images/pokemon/back/shiny/658-ash.png and b/public/images/pokemon/back/shiny/658-ash.png differ
diff --git a/public/images/pokemon/back/shiny/658.png b/public/images/pokemon/back/shiny/658.png
index 8b7f9c7e4fb..21519b6a145 100644
Binary files a/public/images/pokemon/back/shiny/658.png and b/public/images/pokemon/back/shiny/658.png differ
diff --git a/public/images/pokemon/exp/658-ash.json b/public/images/pokemon/exp/658-ash.json
index f3a02cb1774..52dbac8366a 100644
--- a/public/images/pokemon/exp/658-ash.json
+++ b/public/images/pokemon/exp/658-ash.json
@@ -1,671 +1,299 @@
-{
-	"textures": [
-		{
-			"image": "658-ash.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 150,
-				"h": 150
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 75,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 75,
-						"h": 66
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 75,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 75,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 75,
-						"h": 66
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 75,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 75,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 75,
-						"h": 66
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 75,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 75,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 75,
-						"h": 66
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 75,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0017.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 75,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 75,
-						"h": 66
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 75,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0018.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 75,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 75,
-						"h": 66
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 75,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0019.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 75,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 75,
-						"h": 66
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 75,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0020.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 75,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 75,
-						"h": 66
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 75,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 75,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 75,
-						"h": 66
-					},
-					"frame": {
-						"x": 75,
-						"y": 0,
-						"w": 75,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 75,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 75,
-						"h": 66
-					},
-					"frame": {
-						"x": 75,
-						"y": 0,
-						"w": 75,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 75,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 75,
-						"h": 66
-					},
-					"frame": {
-						"x": 75,
-						"y": 0,
-						"w": 75,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 75,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 75,
-						"h": 66
-					},
-					"frame": {
-						"x": 75,
-						"y": 0,
-						"w": 75,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 75,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 75,
-						"h": 66
-					},
-					"frame": {
-						"x": 75,
-						"y": 0,
-						"w": 75,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 75,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 75,
-						"h": 66
-					},
-					"frame": {
-						"x": 75,
-						"y": 0,
-						"w": 75,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 75,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 75,
-						"h": 66
-					},
-					"frame": {
-						"x": 75,
-						"y": 0,
-						"w": 75,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 75,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 75,
-						"h": 66
-					},
-					"frame": {
-						"x": 75,
-						"y": 0,
-						"w": 75,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0029.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 75,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 75,
-						"h": 66
-					},
-					"frame": {
-						"x": 75,
-						"y": 0,
-						"w": 75,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0030.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 75,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 75,
-						"h": 66
-					},
-					"frame": {
-						"x": 75,
-						"y": 0,
-						"w": 75,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0031.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 75,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 75,
-						"h": 66
-					},
-					"frame": {
-						"x": 75,
-						"y": 0,
-						"w": 75,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0021.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 75,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 75,
-						"h": 66
-					},
-					"frame": {
-						"x": 0,
-						"y": 66,
-						"w": 75,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0022.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 75,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 75,
-						"h": 66
-					},
-					"frame": {
-						"x": 0,
-						"y": 66,
-						"w": 75,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0023.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 75,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 75,
-						"h": 66
-					},
-					"frame": {
-						"x": 0,
-						"y": 66,
-						"w": 75,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0024.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 75,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 75,
-						"h": 66
-					},
-					"frame": {
-						"x": 0,
-						"y": 66,
-						"w": 75,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 75,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 75,
-						"h": 65
-					},
-					"frame": {
-						"x": 75,
-						"y": 66,
-						"w": 75,
-						"h": 65
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 75,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 75,
-						"h": 65
-					},
-					"frame": {
-						"x": 75,
-						"y": 66,
-						"w": 75,
-						"h": 65
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 75,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 75,
-						"h": 65
-					},
-					"frame": {
-						"x": 75,
-						"y": 66,
-						"w": 75,
-						"h": 65
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 75,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 75,
-						"h": 65
-					},
-					"frame": {
-						"x": 75,
-						"y": 66,
-						"w": 75,
-						"h": 65
-					}
-				},
-				{
-					"filename": "0025.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 75,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 75,
-						"h": 65
-					},
-					"frame": {
-						"x": 75,
-						"y": 66,
-						"w": 75,
-						"h": 65
-					}
-				},
-				{
-					"filename": "0026.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 75,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 75,
-						"h": 65
-					},
-					"frame": {
-						"x": 75,
-						"y": 66,
-						"w": 75,
-						"h": 65
-					}
-				},
-				{
-					"filename": "0027.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 75,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 75,
-						"h": 65
-					},
-					"frame": {
-						"x": 75,
-						"y": 66,
-						"w": 75,
-						"h": 65
-					}
-				},
-				{
-					"filename": "0028.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 75,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 75,
-						"h": 65
-					},
-					"frame": {
-						"x": 75,
-						"y": 66,
-						"w": 75,
-						"h": 65
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:cfb009f1af61ea752bdb3266bffd0fd0:e1abe8d09d1fe3c1ec758293b0a4bed5:f09eeed5adc5ec50aec50218e03662c2$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 0, "y": 0, "w": 79, "h": 74 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 79, "h": 74 },
+    "sourceSize": { "w": 79, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 0, "y": 0, "w": 79, "h": 74 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 79, "h": 74 },
+    "sourceSize": { "w": 79, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 0, "y": 0, "w": 79, "h": 74 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 79, "h": 74 },
+    "sourceSize": { "w": 79, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 0, "y": 0, "w": 79, "h": 74 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 79, "h": 74 },
+    "sourceSize": { "w": 79, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 79, "y": 0, "w": 79, "h": 74 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 79, "h": 74 },
+    "sourceSize": { "w": 79, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 79, "y": 0, "w": 79, "h": 74 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 79, "h": 74 },
+    "sourceSize": { "w": 79, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 79, "y": 0, "w": 79, "h": 74 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 79, "h": 74 },
+    "sourceSize": { "w": 79, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 79, "y": 0, "w": 79, "h": 74 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 79, "h": 74 },
+    "sourceSize": { "w": 79, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 158, "y": 0, "w": 79, "h": 74 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 79, "h": 74 },
+    "sourceSize": { "w": 79, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 158, "y": 0, "w": 79, "h": 74 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 79, "h": 74 },
+    "sourceSize": { "w": 79, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 158, "y": 0, "w": 79, "h": 74 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 79, "h": 74 },
+    "sourceSize": { "w": 79, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 158, "y": 0, "w": 79, "h": 74 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 79, "h": 74 },
+    "sourceSize": { "w": 79, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 0, "y": 74, "w": 79, "h": 74 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 79, "h": 74 },
+    "sourceSize": { "w": 79, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 0, "y": 74, "w": 79, "h": 74 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 79, "h": 74 },
+    "sourceSize": { "w": 79, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 0, "y": 74, "w": 79, "h": 74 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 79, "h": 74 },
+    "sourceSize": { "w": 79, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 0, "y": 74, "w": 79, "h": 74 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 79, "h": 74 },
+    "sourceSize": { "w": 79, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 0, "y": 0, "w": 79, "h": 74 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 79, "h": 74 },
+    "sourceSize": { "w": 79, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 0, "y": 0, "w": 79, "h": 74 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 79, "h": 74 },
+    "sourceSize": { "w": 79, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 0, "y": 0, "w": 79, "h": 74 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 79, "h": 74 },
+    "sourceSize": { "w": 79, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 0, "y": 0, "w": 79, "h": 74 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 79, "h": 74 },
+    "sourceSize": { "w": 79, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 79, "y": 74, "w": 79, "h": 74 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 79, "h": 74 },
+    "sourceSize": { "w": 79, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 79, "y": 74, "w": 79, "h": 74 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 79, "h": 74 },
+    "sourceSize": { "w": 79, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 79, "y": 74, "w": 79, "h": 74 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 79, "h": 74 },
+    "sourceSize": { "w": 79, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 79, "y": 74, "w": 79, "h": 74 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 79, "h": 74 },
+    "sourceSize": { "w": 79, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 158, "y": 0, "w": 79, "h": 74 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 79, "h": 74 },
+    "sourceSize": { "w": 79, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 158, "y": 0, "w": 79, "h": 74 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 79, "h": 74 },
+    "sourceSize": { "w": 79, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 158, "y": 0, "w": 79, "h": 74 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 79, "h": 74 },
+    "sourceSize": { "w": 79, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 158, "y": 0, "w": 79, "h": 74 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 79, "h": 74 },
+    "sourceSize": { "w": 79, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 0, "y": 74, "w": 79, "h": 74 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 79, "h": 74 },
+    "sourceSize": { "w": 79, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 0, "y": 74, "w": 79, "h": 74 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 79, "h": 74 },
+    "sourceSize": { "w": 79, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 0, "y": 74, "w": 79, "h": 74 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 79, "h": 74 },
+    "sourceSize": { "w": 79, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 0, "y": 74, "w": 79, "h": 74 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 79, "h": 74 },
+    "sourceSize": { "w": 79, "h": 74 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.7-x64",
+  "image": "658-ash.png",
+  "format": "I8",
+  "size": { "w": 237, "h": 148 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/658-ash.png b/public/images/pokemon/exp/658-ash.png
index 5d80ca1ad0e..6bb84f3e4fd 100644
Binary files a/public/images/pokemon/exp/658-ash.png and b/public/images/pokemon/exp/658-ash.png differ
diff --git a/public/images/pokemon/exp/658.png b/public/images/pokemon/exp/658.png
index ab2e30592f6..34c992424dd 100644
Binary files a/public/images/pokemon/exp/658.png and b/public/images/pokemon/exp/658.png differ
diff --git a/public/images/pokemon/exp/back/658-ash.json b/public/images/pokemon/exp/back/658-ash.json
index 9c2e394a89d..8e360497b8d 100644
--- a/public/images/pokemon/exp/back/658-ash.json
+++ b/public/images/pokemon/exp/back/658-ash.json
@@ -1,188 +1,155 @@
-{
-	"textures": [
-		{
-			"image": "658-ash.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 150,
-				"h": 150
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 75,
-						"h": 62
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 75,
-						"h": 62
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 75,
-						"h": 62
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 75,
-						"h": 62
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 75,
-						"h": 62
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 75,
-						"h": 62
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 75,
-						"h": 62
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 75,
-						"h": 62
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 75,
-						"h": 62
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 75,
-						"h": 62
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 75,
-						"h": 62
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 75,
-						"h": 62
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 75,
-						"h": 62
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 75,
-						"h": 62
-					},
-					"frame": {
-						"x": 75,
-						"y": 0,
-						"w": 75,
-						"h": 62
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 75,
-						"h": 62
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 75,
-						"h": 62
-					},
-					"frame": {
-						"x": 75,
-						"y": 0,
-						"w": 75,
-						"h": 62
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 75,
-						"h": 62
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 75,
-						"h": 61
-					},
-					"frame": {
-						"x": 0,
-						"y": 62,
-						"w": 75,
-						"h": 61
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 75,
-						"h": 62
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 75,
-						"h": 61
-					},
-					"frame": {
-						"x": 75,
-						"y": 62,
-						"w": 75,
-						"h": 61
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:0121f3850f8a57a4a046524a1a5974dd:168ffc856b6fea872641e8672304766c:f09eeed5adc5ec50aec50218e03662c2$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 0, "y": 0, "w": 73, "h": 73 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 73, "h": 73 },
+    "sourceSize": { "w": 73, "h": 73 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 0, "y": 0, "w": 73, "h": 73 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 73, "h": 73 },
+    "sourceSize": { "w": 73, "h": 73 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 0, "y": 0, "w": 73, "h": 73 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 73, "h": 73 },
+    "sourceSize": { "w": 73, "h": 73 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 0, "y": 0, "w": 73, "h": 73 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 73, "h": 73 },
+    "sourceSize": { "w": 73, "h": 73 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 73, "y": 0, "w": 73, "h": 73 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 73, "h": 73 },
+    "sourceSize": { "w": 73, "h": 73 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 73, "y": 0, "w": 73, "h": 73 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 73, "h": 73 },
+    "sourceSize": { "w": 73, "h": 73 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 73, "y": 0, "w": 73, "h": 73 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 73, "h": 73 },
+    "sourceSize": { "w": 73, "h": 73 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 73, "y": 0, "w": 73, "h": 73 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 73, "h": 73 },
+    "sourceSize": { "w": 73, "h": 73 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 0, "y": 73, "w": 73, "h": 73 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 73, "h": 73 },
+    "sourceSize": { "w": 73, "h": 73 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 0, "y": 73, "w": 73, "h": 73 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 73, "h": 73 },
+    "sourceSize": { "w": 73, "h": 73 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 0, "y": 73, "w": 73, "h": 73 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 73, "h": 73 },
+    "sourceSize": { "w": 73, "h": 73 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 0, "y": 73, "w": 73, "h": 73 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 73, "h": 73 },
+    "sourceSize": { "w": 73, "h": 73 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 73, "y": 0, "w": 73, "h": 73 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 73, "h": 73 },
+    "sourceSize": { "w": 73, "h": 73 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 73, "y": 0, "w": 73, "h": 73 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 73, "h": 73 },
+    "sourceSize": { "w": 73, "h": 73 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 73, "y": 0, "w": 73, "h": 73 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 73, "h": 73 },
+    "sourceSize": { "w": 73, "h": 73 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 73, "y": 0, "w": 73, "h": 73 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 73, "h": 73 },
+    "sourceSize": { "w": 73, "h": 73 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.7-x64",
+  "image": "658-ash.png",
+  "format": "I8",
+  "size": { "w": 146, "h": 146 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/back/658-ash.png b/public/images/pokemon/exp/back/658-ash.png
index 8921ea65270..5d8794a1c0f 100644
Binary files a/public/images/pokemon/exp/back/658-ash.png and b/public/images/pokemon/exp/back/658-ash.png differ
diff --git a/public/images/pokemon/exp/back/658.json b/public/images/pokemon/exp/back/658.json
index 2fa50a7d23f..453f6c16dc6 100644
--- a/public/images/pokemon/exp/back/658.json
+++ b/public/images/pokemon/exp/back/658.json
@@ -1,188 +1,92 @@
-{
-	"textures": [
-		{
-			"image": "658.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 150,
-				"h": 150
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 75,
-						"h": 62
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 75,
-						"h": 62
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 75,
-						"h": 62
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 75,
-						"h": 62
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 75,
-						"h": 62
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 75,
-						"h": 62
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 75,
-						"h": 62
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 75,
-						"h": 62
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 75,
-						"h": 62
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 75,
-						"h": 62
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 75,
-						"h": 62
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 75,
-						"h": 62
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 75,
-						"h": 62
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 75,
-						"h": 62
-					},
-					"frame": {
-						"x": 75,
-						"y": 0,
-						"w": 75,
-						"h": 62
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 75,
-						"h": 62
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 75,
-						"h": 62
-					},
-					"frame": {
-						"x": 75,
-						"y": 0,
-						"w": 75,
-						"h": 62
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 75,
-						"h": 62
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 75,
-						"h": 61
-					},
-					"frame": {
-						"x": 0,
-						"y": 62,
-						"w": 75,
-						"h": 61
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 75,
-						"h": 62
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 75,
-						"h": 61
-					},
-					"frame": {
-						"x": 0,
-						"y": 62,
-						"w": 75,
-						"h": 61
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:63845d55db2350ed7cd6956836dc9510:7129df11a518cdd74572c2016d5f8ed8:5affcab976148657d36bf4ff3410f92d$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 0, "y": 0, "w": 77, "h": 77 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 77, "h": 77 },
+    "sourceSize": { "w": 77, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 0, "y": 0, "w": 77, "h": 77 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 77, "h": 77 },
+    "sourceSize": { "w": 77, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 0, "y": 0, "w": 77, "h": 77 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 77, "h": 77 },
+    "sourceSize": { "w": 77, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 77, "y": 0, "w": 77, "h": 77 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 77, "h": 77 },
+    "sourceSize": { "w": 77, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 77, "y": 0, "w": 77, "h": 77 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 77, "h": 77 },
+    "sourceSize": { "w": 77, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 0, "y": 77, "w": 77, "h": 77 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 77, "h": 77 },
+    "sourceSize": { "w": 77, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 0, "y": 77, "w": 77, "h": 77 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 77, "h": 77 },
+    "sourceSize": { "w": 77, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 77, "y": 0, "w": 77, "h": 77 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 77, "h": 77 },
+    "sourceSize": { "w": 77, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 77, "y": 0, "w": 77, "h": 77 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 77, "h": 77 },
+    "sourceSize": { "w": 77, "h": 77 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.7-x64",
+  "image": "658.png",
+  "format": "I8",
+  "size": { "w": 154, "h": 154 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/back/658.png b/public/images/pokemon/exp/back/658.png
index edcfa15b9f3..07b9084c43e 100644
Binary files a/public/images/pokemon/exp/back/658.png and b/public/images/pokemon/exp/back/658.png differ
diff --git a/public/images/pokemon/exp/back/shiny/658-ash.json b/public/images/pokemon/exp/back/shiny/658-ash.json
index db9e546af7f..8e360497b8d 100644
--- a/public/images/pokemon/exp/back/shiny/658-ash.json
+++ b/public/images/pokemon/exp/back/shiny/658-ash.json
@@ -1,188 +1,155 @@
-{
-	"textures": [
-		{
-			"image": "658-ash.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 150,
-				"h": 150
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 75,
-						"h": 62
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 75,
-						"h": 62
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 75,
-						"h": 62
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 75,
-						"h": 62
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 75,
-						"h": 62
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 75,
-						"h": 62
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 75,
-						"h": 62
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 75,
-						"h": 62
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 75,
-						"h": 62
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 75,
-						"h": 62
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 75,
-						"h": 62
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 75,
-						"h": 62
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 75,
-						"h": 62
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 75,
-						"h": 62
-					},
-					"frame": {
-						"x": 75,
-						"y": 0,
-						"w": 75,
-						"h": 62
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 75,
-						"h": 62
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 75,
-						"h": 62
-					},
-					"frame": {
-						"x": 75,
-						"y": 0,
-						"w": 75,
-						"h": 62
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 75,
-						"h": 62
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 75,
-						"h": 61
-					},
-					"frame": {
-						"x": 0,
-						"y": 62,
-						"w": 75,
-						"h": 61
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 75,
-						"h": 62
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 75,
-						"h": 61
-					},
-					"frame": {
-						"x": 75,
-						"y": 62,
-						"w": 75,
-						"h": 61
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:d9855568004fd93bcd73aa782894b172:d7e4656a720ccca08a26ed4485129bb3:f09eeed5adc5ec50aec50218e03662c2$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 0, "y": 0, "w": 73, "h": 73 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 73, "h": 73 },
+    "sourceSize": { "w": 73, "h": 73 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 0, "y": 0, "w": 73, "h": 73 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 73, "h": 73 },
+    "sourceSize": { "w": 73, "h": 73 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 0, "y": 0, "w": 73, "h": 73 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 73, "h": 73 },
+    "sourceSize": { "w": 73, "h": 73 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 0, "y": 0, "w": 73, "h": 73 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 73, "h": 73 },
+    "sourceSize": { "w": 73, "h": 73 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 73, "y": 0, "w": 73, "h": 73 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 73, "h": 73 },
+    "sourceSize": { "w": 73, "h": 73 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 73, "y": 0, "w": 73, "h": 73 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 73, "h": 73 },
+    "sourceSize": { "w": 73, "h": 73 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 73, "y": 0, "w": 73, "h": 73 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 73, "h": 73 },
+    "sourceSize": { "w": 73, "h": 73 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 73, "y": 0, "w": 73, "h": 73 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 73, "h": 73 },
+    "sourceSize": { "w": 73, "h": 73 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 0, "y": 73, "w": 73, "h": 73 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 73, "h": 73 },
+    "sourceSize": { "w": 73, "h": 73 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 0, "y": 73, "w": 73, "h": 73 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 73, "h": 73 },
+    "sourceSize": { "w": 73, "h": 73 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 0, "y": 73, "w": 73, "h": 73 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 73, "h": 73 },
+    "sourceSize": { "w": 73, "h": 73 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 0, "y": 73, "w": 73, "h": 73 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 73, "h": 73 },
+    "sourceSize": { "w": 73, "h": 73 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 73, "y": 0, "w": 73, "h": 73 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 73, "h": 73 },
+    "sourceSize": { "w": 73, "h": 73 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 73, "y": 0, "w": 73, "h": 73 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 73, "h": 73 },
+    "sourceSize": { "w": 73, "h": 73 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 73, "y": 0, "w": 73, "h": 73 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 73, "h": 73 },
+    "sourceSize": { "w": 73, "h": 73 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 73, "y": 0, "w": 73, "h": 73 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 73, "h": 73 },
+    "sourceSize": { "w": 73, "h": 73 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.7-x64",
+  "image": "658-ash.png",
+  "format": "I8",
+  "size": { "w": 146, "h": 146 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/back/shiny/658-ash.png b/public/images/pokemon/exp/back/shiny/658-ash.png
index a2a53dbdbc7..3269d435c94 100644
Binary files a/public/images/pokemon/exp/back/shiny/658-ash.png and b/public/images/pokemon/exp/back/shiny/658-ash.png differ
diff --git a/public/images/pokemon/exp/back/shiny/658.json b/public/images/pokemon/exp/back/shiny/658.json
index 8dc315c768e..453f6c16dc6 100644
--- a/public/images/pokemon/exp/back/shiny/658.json
+++ b/public/images/pokemon/exp/back/shiny/658.json
@@ -1,188 +1,92 @@
-{
-	"textures": [
-		{
-			"image": "658.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 150,
-				"h": 150
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 75,
-						"h": 62
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 75,
-						"h": 62
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 75,
-						"h": 62
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 75,
-						"h": 62
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 75,
-						"h": 62
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 75,
-						"h": 62
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 75,
-						"h": 62
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 75,
-						"h": 62
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 75,
-						"h": 62
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 75,
-						"h": 62
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 75,
-						"h": 62
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 75,
-						"h": 62
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 75,
-						"h": 62
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 75,
-						"h": 62
-					},
-					"frame": {
-						"x": 75,
-						"y": 0,
-						"w": 75,
-						"h": 62
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 75,
-						"h": 62
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 75,
-						"h": 62
-					},
-					"frame": {
-						"x": 75,
-						"y": 0,
-						"w": 75,
-						"h": 62
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 75,
-						"h": 62
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 75,
-						"h": 61
-					},
-					"frame": {
-						"x": 0,
-						"y": 62,
-						"w": 75,
-						"h": 61
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 75,
-						"h": 62
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 75,
-						"h": 61
-					},
-					"frame": {
-						"x": 0,
-						"y": 62,
-						"w": 75,
-						"h": 61
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:661efcc0c742bc0d4b4e26900a59332f:d0aa0f579971d046660bf77b4044aa35:5affcab976148657d36bf4ff3410f92d$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 0, "y": 0, "w": 77, "h": 77 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 77, "h": 77 },
+    "sourceSize": { "w": 77, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 0, "y": 0, "w": 77, "h": 77 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 77, "h": 77 },
+    "sourceSize": { "w": 77, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 0, "y": 0, "w": 77, "h": 77 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 77, "h": 77 },
+    "sourceSize": { "w": 77, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 77, "y": 0, "w": 77, "h": 77 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 77, "h": 77 },
+    "sourceSize": { "w": 77, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 77, "y": 0, "w": 77, "h": 77 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 77, "h": 77 },
+    "sourceSize": { "w": 77, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 0, "y": 77, "w": 77, "h": 77 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 77, "h": 77 },
+    "sourceSize": { "w": 77, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 0, "y": 77, "w": 77, "h": 77 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 77, "h": 77 },
+    "sourceSize": { "w": 77, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 77, "y": 0, "w": 77, "h": 77 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 77, "h": 77 },
+    "sourceSize": { "w": 77, "h": 77 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 77, "y": 0, "w": 77, "h": 77 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 77, "h": 77 },
+    "sourceSize": { "w": 77, "h": 77 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.7-x64",
+  "image": "658.png",
+  "format": "I8",
+  "size": { "w": 154, "h": 154 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/back/shiny/658.png b/public/images/pokemon/exp/back/shiny/658.png
index 416f1145463..bb0ee7accdf 100644
Binary files a/public/images/pokemon/exp/back/shiny/658.png and b/public/images/pokemon/exp/back/shiny/658.png differ
diff --git a/public/images/pokemon/exp/shiny/658-ash.json b/public/images/pokemon/exp/shiny/658-ash.json
index 5101079ce90..52dbac8366a 100644
--- a/public/images/pokemon/exp/shiny/658-ash.json
+++ b/public/images/pokemon/exp/shiny/658-ash.json
@@ -1,671 +1,299 @@
-{
-	"textures": [
-		{
-			"image": "658-ash.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 150,
-				"h": 150
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 75,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 75,
-						"h": 66
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 75,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 75,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 75,
-						"h": 66
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 75,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 75,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 75,
-						"h": 66
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 75,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 75,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 75,
-						"h": 66
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 75,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0017.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 75,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 75,
-						"h": 66
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 75,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0018.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 75,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 75,
-						"h": 66
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 75,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0019.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 75,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 75,
-						"h": 66
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 75,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0020.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 75,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 75,
-						"h": 66
-					},
-					"frame": {
-						"x": 0,
-						"y": 0,
-						"w": 75,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 75,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 75,
-						"h": 66
-					},
-					"frame": {
-						"x": 75,
-						"y": 0,
-						"w": 75,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 75,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 75,
-						"h": 66
-					},
-					"frame": {
-						"x": 75,
-						"y": 0,
-						"w": 75,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 75,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 75,
-						"h": 66
-					},
-					"frame": {
-						"x": 75,
-						"y": 0,
-						"w": 75,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 75,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 75,
-						"h": 66
-					},
-					"frame": {
-						"x": 75,
-						"y": 0,
-						"w": 75,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 75,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 75,
-						"h": 66
-					},
-					"frame": {
-						"x": 75,
-						"y": 0,
-						"w": 75,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 75,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 75,
-						"h": 66
-					},
-					"frame": {
-						"x": 75,
-						"y": 0,
-						"w": 75,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 75,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 75,
-						"h": 66
-					},
-					"frame": {
-						"x": 75,
-						"y": 0,
-						"w": 75,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 75,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 75,
-						"h": 66
-					},
-					"frame": {
-						"x": 75,
-						"y": 0,
-						"w": 75,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0029.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 75,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 75,
-						"h": 66
-					},
-					"frame": {
-						"x": 75,
-						"y": 0,
-						"w": 75,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0030.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 75,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 75,
-						"h": 66
-					},
-					"frame": {
-						"x": 75,
-						"y": 0,
-						"w": 75,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0031.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 75,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 75,
-						"h": 66
-					},
-					"frame": {
-						"x": 75,
-						"y": 0,
-						"w": 75,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0021.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 75,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 75,
-						"h": 66
-					},
-					"frame": {
-						"x": 0,
-						"y": 66,
-						"w": 75,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0022.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 75,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 75,
-						"h": 66
-					},
-					"frame": {
-						"x": 0,
-						"y": 66,
-						"w": 75,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0023.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 75,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 75,
-						"h": 66
-					},
-					"frame": {
-						"x": 0,
-						"y": 66,
-						"w": 75,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0024.png",
-					"rotated": false,
-					"trimmed": false,
-					"sourceSize": {
-						"w": 75,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 0,
-						"w": 75,
-						"h": 66
-					},
-					"frame": {
-						"x": 0,
-						"y": 66,
-						"w": 75,
-						"h": 66
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 75,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 75,
-						"h": 65
-					},
-					"frame": {
-						"x": 75,
-						"y": 66,
-						"w": 75,
-						"h": 65
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 75,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 75,
-						"h": 65
-					},
-					"frame": {
-						"x": 75,
-						"y": 66,
-						"w": 75,
-						"h": 65
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 75,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 75,
-						"h": 65
-					},
-					"frame": {
-						"x": 75,
-						"y": 66,
-						"w": 75,
-						"h": 65
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 75,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 75,
-						"h": 65
-					},
-					"frame": {
-						"x": 75,
-						"y": 66,
-						"w": 75,
-						"h": 65
-					}
-				},
-				{
-					"filename": "0025.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 75,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 75,
-						"h": 65
-					},
-					"frame": {
-						"x": 75,
-						"y": 66,
-						"w": 75,
-						"h": 65
-					}
-				},
-				{
-					"filename": "0026.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 75,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 75,
-						"h": 65
-					},
-					"frame": {
-						"x": 75,
-						"y": 66,
-						"w": 75,
-						"h": 65
-					}
-				},
-				{
-					"filename": "0027.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 75,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 75,
-						"h": 65
-					},
-					"frame": {
-						"x": 75,
-						"y": 66,
-						"w": 75,
-						"h": 65
-					}
-				},
-				{
-					"filename": "0028.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 75,
-						"h": 66
-					},
-					"spriteSourceSize": {
-						"x": 0,
-						"y": 1,
-						"w": 75,
-						"h": 65
-					},
-					"frame": {
-						"x": 75,
-						"y": 66,
-						"w": 75,
-						"h": 65
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:0875c2204eeabc96bd1f034bcc69210b:e1abe8d09d1fe3c1ec758293b0a4bed5:f09eeed5adc5ec50aec50218e03662c2$"
-	}
+{ "frames": [
+   {
+    "filename": "0001.png",
+    "frame": { "x": 0, "y": 0, "w": 79, "h": 74 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 79, "h": 74 },
+    "sourceSize": { "w": 79, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 0, "y": 0, "w": 79, "h": 74 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 79, "h": 74 },
+    "sourceSize": { "w": 79, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 0, "y": 0, "w": 79, "h": 74 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 79, "h": 74 },
+    "sourceSize": { "w": 79, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 0, "y": 0, "w": 79, "h": 74 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 79, "h": 74 },
+    "sourceSize": { "w": 79, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 79, "y": 0, "w": 79, "h": 74 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 79, "h": 74 },
+    "sourceSize": { "w": 79, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 79, "y": 0, "w": 79, "h": 74 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 79, "h": 74 },
+    "sourceSize": { "w": 79, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 79, "y": 0, "w": 79, "h": 74 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 79, "h": 74 },
+    "sourceSize": { "w": 79, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 79, "y": 0, "w": 79, "h": 74 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 79, "h": 74 },
+    "sourceSize": { "w": 79, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 158, "y": 0, "w": 79, "h": 74 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 79, "h": 74 },
+    "sourceSize": { "w": 79, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 158, "y": 0, "w": 79, "h": 74 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 79, "h": 74 },
+    "sourceSize": { "w": 79, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 158, "y": 0, "w": 79, "h": 74 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 79, "h": 74 },
+    "sourceSize": { "w": 79, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 158, "y": 0, "w": 79, "h": 74 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 79, "h": 74 },
+    "sourceSize": { "w": 79, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 0, "y": 74, "w": 79, "h": 74 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 79, "h": 74 },
+    "sourceSize": { "w": 79, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 0, "y": 74, "w": 79, "h": 74 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 79, "h": 74 },
+    "sourceSize": { "w": 79, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 0, "y": 74, "w": 79, "h": 74 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 79, "h": 74 },
+    "sourceSize": { "w": 79, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 0, "y": 74, "w": 79, "h": 74 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 79, "h": 74 },
+    "sourceSize": { "w": 79, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 0, "y": 0, "w": 79, "h": 74 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 79, "h": 74 },
+    "sourceSize": { "w": 79, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 0, "y": 0, "w": 79, "h": 74 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 79, "h": 74 },
+    "sourceSize": { "w": 79, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 0, "y": 0, "w": 79, "h": 74 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 79, "h": 74 },
+    "sourceSize": { "w": 79, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 0, "y": 0, "w": 79, "h": 74 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 79, "h": 74 },
+    "sourceSize": { "w": 79, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 79, "y": 74, "w": 79, "h": 74 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 79, "h": 74 },
+    "sourceSize": { "w": 79, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0022.png",
+    "frame": { "x": 79, "y": 74, "w": 79, "h": 74 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 79, "h": 74 },
+    "sourceSize": { "w": 79, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0023.png",
+    "frame": { "x": 79, "y": 74, "w": 79, "h": 74 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 79, "h": 74 },
+    "sourceSize": { "w": 79, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0024.png",
+    "frame": { "x": 79, "y": 74, "w": 79, "h": 74 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 79, "h": 74 },
+    "sourceSize": { "w": 79, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0025.png",
+    "frame": { "x": 158, "y": 0, "w": 79, "h": 74 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 79, "h": 74 },
+    "sourceSize": { "w": 79, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0026.png",
+    "frame": { "x": 158, "y": 0, "w": 79, "h": 74 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 79, "h": 74 },
+    "sourceSize": { "w": 79, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0027.png",
+    "frame": { "x": 158, "y": 0, "w": 79, "h": 74 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 79, "h": 74 },
+    "sourceSize": { "w": 79, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0028.png",
+    "frame": { "x": 158, "y": 0, "w": 79, "h": 74 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 79, "h": 74 },
+    "sourceSize": { "w": 79, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0029.png",
+    "frame": { "x": 0, "y": 74, "w": 79, "h": 74 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 79, "h": 74 },
+    "sourceSize": { "w": 79, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0030.png",
+    "frame": { "x": 0, "y": 74, "w": 79, "h": 74 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 79, "h": 74 },
+    "sourceSize": { "w": 79, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0031.png",
+    "frame": { "x": 0, "y": 74, "w": 79, "h": 74 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 79, "h": 74 },
+    "sourceSize": { "w": 79, "h": 74 },
+    "duration": 100
+   },
+   {
+    "filename": "0032.png",
+    "frame": { "x": 0, "y": 74, "w": 79, "h": 74 },
+    "rotated": false,
+    "trimmed": false,
+    "spriteSourceSize": { "x": 0, "y": 0, "w": 79, "h": 74 },
+    "sourceSize": { "w": 79, "h": 74 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.7-x64",
+  "image": "658-ash.png",
+  "format": "I8",
+  "size": { "w": 237, "h": 148 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/pokemon/exp/shiny/658-ash.png b/public/images/pokemon/exp/shiny/658-ash.png
index 5d80ca1ad0e..5b25ec9e021 100644
Binary files a/public/images/pokemon/exp/shiny/658-ash.png and b/public/images/pokemon/exp/shiny/658-ash.png differ
diff --git a/public/images/pokemon/exp/shiny/658.png b/public/images/pokemon/exp/shiny/658.png
index 999bc74c659..7a5909e4756 100644
Binary files a/public/images/pokemon/exp/shiny/658.png and b/public/images/pokemon/exp/shiny/658.png differ
diff --git a/public/images/pokemon/icons/variant/6/658-ash_2.png b/public/images/pokemon/icons/variant/6/658-ash_2.png
new file mode 100644
index 00000000000..b788b336efe
Binary files /dev/null and b/public/images/pokemon/icons/variant/6/658-ash_2.png differ
diff --git a/public/images/pokemon/icons/variant/6/658-ash_3.png b/public/images/pokemon/icons/variant/6/658-ash_3.png
new file mode 100644
index 00000000000..52ac4fe0ede
Binary files /dev/null and b/public/images/pokemon/icons/variant/6/658-ash_3.png differ
diff --git a/public/images/pokemon/icons/variant/6/658_2.png b/public/images/pokemon/icons/variant/6/658_2.png
new file mode 100644
index 00000000000..eaf9da8a9ce
Binary files /dev/null and b/public/images/pokemon/icons/variant/6/658_2.png differ
diff --git a/public/images/pokemon/icons/variant/6/658_3.png b/public/images/pokemon/icons/variant/6/658_3.png
new file mode 100644
index 00000000000..027dda592f0
Binary files /dev/null and b/public/images/pokemon/icons/variant/6/658_3.png differ
diff --git a/public/images/pokemon/shiny/658-ash.png b/public/images/pokemon/shiny/658-ash.png
index 0d65f0bb900..f5de608708e 100644
Binary files a/public/images/pokemon/shiny/658-ash.png and b/public/images/pokemon/shiny/658-ash.png differ
diff --git a/public/images/pokemon/shiny/658.png b/public/images/pokemon/shiny/658.png
index 6fb80fd57cc..100d2a02f4a 100644
Binary files a/public/images/pokemon/shiny/658.png and b/public/images/pokemon/shiny/658.png differ
diff --git a/public/images/pokemon/variant/658-ash.json b/public/images/pokemon/variant/658-ash.json
index 0aa5c214bb3..29b5bd2560b 100644
--- a/public/images/pokemon/variant/658-ash.json
+++ b/public/images/pokemon/variant/658-ash.json
@@ -1,48 +1,44 @@
 {
 	"1": {
-		"18335c": "170738",
-		"66d9ff": "7ddcd6",
-		"6b1d1d": "206d74",
-		"f01818": "1fa67b",
-		"bfb169": "165e78",
-		"ffffff": "a1e9f0",
-		"f8f8f8": "d7eff4",
-		"ffb2bf": "b7e9ff",
-		"37b1de": "41a7b0",
-		"3f4447": "466698",
-		"bf4c60": "4386df",
-		"7b282e": "0e3e81",
-		"f2798d": "8dcfff",
-		"bfbfbf": "89c7ca",
-		"de3431": "3fca9f",
-		"3e7acc": "6b4592",
 		"265595": "432b6c",
-		"1a5778": "062e3c",
-		"282c35": "271f4c",
-		"0b3659": "062e3c",
-		"fff0a6": "208698"
+		"3f4447": "466698",
+		"de3431": "3fca9f",
+		"f8f8f8": "a1e9f0",
+		"7b282e": "0e3e81",
+		"6b1d1d": "206d74",
+		"4ebdd9": "41a7b0",
+		"bfb169": "165e78",
+		"bfbfbf": "8cc7d4",
+		"ffb2bf": "b7e9ff",
+		"bf4c60": "4386df",
+		"fff0a6": "271f4c",
+		"3e7acc": "6b4592",
+		"18335c": "170738",
+		"f2798d": "8dcfff",
+		"f01818": "39b88f",
+		"7ddeff": "7ddcd6",
+		"268794": "1c3e58",
+		"282c35": "271f4c"
 	},
 	"2": {
-		"18335c": "9f2727",
-		"66d9ff": "489c90",
-		"6b1d1d": "356e8d",
-		"f01818": "ffe88d",
-		"bfb169": "431022",
-		"ffffff": "89d2b8",
-		"f8f8f8": "d7eff4",
-		"ffb2bf": "86d6b6",
-		"37b1de": "38838a",
-		"3f4447": "466698",
-		"bf4c60": "32738b",
-		"7b282e": "152a5c",
-		"f2798d": "5eb4a9",
-		"bfbfbf": "8cc7d4",
-		"de3431": "3fca9f",
-		"3e7acc": "ecbb7a",
 		"265595": "cc7251",
-		"1a5778": "062e3c",
-		"282c35": "4d2637",
-		"0b3659": "0d1e3e",
-		"fff0a6": "652240"
+		"3f4447": "466698",
+		"de3431": "9ceec6",
+		"f8f8f8": "89d2b8",
+		"7b282e": "152a5c",
+		"6b1d1d": "356e8d",
+		"4ebdd9": "2f6e74",
+		"bfb169": "431022",
+		"bfbfbf": "8cc7d4",
+		"ffb2bf": "86d6b6",
+		"bf4c60": "32738b",
+		"fff0a6": "4d2637",
+		"3e7acc": "ecbb7a",
+		"18335c": "9f2727",
+		"f2798d": "5eb4a9",
+		"f01818": "ffe88d",
+		"7ddeff": "46988d",
+		"268794": "1c3e58",
+		"282c35": "4d2637"
 	}
 }
\ No newline at end of file
diff --git a/public/images/pokemon/variant/658.json b/public/images/pokemon/variant/658.json
new file mode 100644
index 00000000000..25a6dad359d
--- /dev/null
+++ b/public/images/pokemon/variant/658.json
@@ -0,0 +1,34 @@
+{
+	"1": {
+		"ffb2bf": "b7e9ff",
+		"bf4c60": "4386df",
+		"66d9ff": "7ddcd6",
+		"3d61cc": "6b4592",
+		"fff0a6": "208698",
+		"c92e2e": "73c5ff",
+		"937f69": "406695",
+		"c2c1bc": "89b0d7",
+		"f2798d": "8dcfff",
+		"f7f7f7": "d8ffff",
+		"2e4999": "432b6c",
+		"bfb169": "165e78",
+		"803340": "0e3e81",
+		"1b2a59": "170738"
+	},
+	"2": {
+		"ffb2bf": "86d6b6",
+		"bf4c60": "32738b",
+		"66d9ff": "48968c",
+		"3d61cc": "ecbb7a",
+		"fff0a6": "652240",
+		"c92e2e": "63bf9b",
+		"937f69": "466698",
+		"c2c1bc": "8cc7d4",
+		"f2798d": "5eb4a9",
+		"f7f7f7": "d7eff4",
+		"2e4999": "cc7251",
+		"bfb169": "431022",
+		"803340": "152a5c",
+		"1b2a59": "9f2727"
+	}
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/_masterlist.json b/public/images/pokemon/variant/_masterlist.json
index a2db1e95cc2..11f8e9cb7ec 100644
--- a/public/images/pokemon/variant/_masterlist.json
+++ b/public/images/pokemon/variant/_masterlist.json
@@ -521,6 +521,8 @@
 	"655": [0, 1, 1],
 	"656": [0, 1, 1],
 	"657": [0, 1, 1],
+	"658": [0, 1, 1],
+	"658-ash": [0, 1, 1],
 	"664": [0, 1, 1],
 	"665": [0, 1, 1],
 	"666-archipelago": [0, 1, 1],
@@ -1428,6 +1430,8 @@
 		"655": [0, 1, 1],
 		"656": [0, 1, 1],
 		"657": [0, 1, 1],
+		"658": [0, 1, 1],
+		"658-ash": [0, 1, 1],
 		"664": [0, 1, 1],
 		"665": [0, 1, 1],
 		"666-archipelago": [0, 1, 1],
@@ -1851,6 +1855,8 @@
 		"655": [0, 1, 1],
 		"656": [0, 1, 1],
 		"657": [0, 1, 1],
+		"658": [0, 1, 1],
+		"658-ash": [0, 1, 1],
 		"664": [0, 1, 1],
 		"665": [0, 1, 1],
 		"666-archipelago": [0, 1, 1],
@@ -2179,6 +2185,8 @@
 			"655": [0, 1, 1],
 			"656": [0, 1, 1],
 			"657": [0, 1, 1],
+			"658": [0, 1, 1],
+			"658-ash": [0, 1, 1],
 			"664": [0, 1, 1],
 			"665": [0, 2, 1],
 			"666-archipelago": [0, 2, 2],
diff --git a/public/images/pokemon/variant/back/658-ash.json b/public/images/pokemon/variant/back/658-ash.json
new file mode 100644
index 00000000000..370d5df8081
--- /dev/null
+++ b/public/images/pokemon/variant/back/658-ash.json
@@ -0,0 +1,38 @@
+{
+	"1": {
+		"265595": "432b6c",
+		"de3431": "3fca9f",
+		"f8f8f8": "a1e9f0",
+		"7b282e": "0e3e81",
+		"6b1d1d": "206d74",
+		"134e52": "062e3c",
+		"bfb169": "165e78",
+		"ffb2bf": "b7e9ff",
+		"bf4c60": "4386df",
+		"282c35": "271f4c",
+		"f2798d": "8dcfff",
+		"268794": "1c3e58",
+		"3e7acc": "6b4592",
+		"7ddeff": "7ddcd6",
+		"4ebdd9": "41a7b0",
+		"18335c": "170738"
+	},
+	"2": {
+		"265595": "cc7251",
+		"de3431": "9ceec6",
+		"f8f8f8": "89d2b8",
+		"7b282e": "152a5c",
+		"6b1d1d": "356e8d",
+		"134e52": "0d1e3e",
+		"bfb169": "4d2637",
+		"ffb2bf": "86d6b6",
+		"bf4c60": "32738b",
+		"282c35": "4d2637",
+		"f2798d": "5eb4a9",
+		"268794": "1c3e58",
+		"3e7acc": "ecbb7a",
+		"7ddeff": "46988d",
+		"4ebdd9": "2f6e74",
+		"18335c": "9f2727"
+	}
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/back/658.json b/public/images/pokemon/variant/back/658.json
new file mode 100644
index 00000000000..c1bb4222ce4
--- /dev/null
+++ b/public/images/pokemon/variant/back/658.json
@@ -0,0 +1,26 @@
+{
+	"1": {
+		"ffb2bf": "b7e9ff",
+		"bf4c60": "4386df",
+		"3d61cc": "6b4592",
+		"fff0a6": "208698",
+		"2e4999": "432b6c",
+		"f2798d": "8dcfff",
+		"803340": "0e3e81",
+		"1b2a59": "170738",
+		"66d9ff": "7ddcd6",
+		"bfb169": "165e78"
+	},
+	"2": {
+		"ffb2bf": "86d6b6",
+		"bf4c60": "32738b",
+		"3d61cc": "ecbb7a",
+		"fff0a6": "652240",
+		"2e4999": "cc7251",
+		"f2798d": "5eb4a9",
+		"803340": "152a5c",
+		"1b2a59": "9f2727",
+		"66d9ff": "48968c",
+		"bfb169": "431022"
+	}
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/658-ash.json b/public/images/pokemon/variant/exp/658-ash.json
new file mode 100644
index 00000000000..96b60b02adf
--- /dev/null
+++ b/public/images/pokemon/variant/exp/658-ash.json
@@ -0,0 +1,44 @@
+{
+	"1": {
+		"265595": "432b6c",
+		"3f4447": "466698",
+		"de3431": "3fca9f",
+		"f8f8f8": "a1e9f0",
+		"7b282e": "0e3e81",
+		"6b1d1d": "206d74",
+		"4ebdd9": "41a7b0",
+		"bfb169": "165e78",
+		"bfbfbf": "8cc7d4",
+		"ffb2bf": "b7e9ff",
+		"bf4c60": "4386df",
+		"fff0a6": "208698",
+		"3e7acc": "6b4592",
+		"18335c": "170738",
+		"f2798d": "8dcfff",
+		"f01818": "39b88f",
+		"7ddeff": "7ddcd6",
+		"268794": "1c3e58",
+		"282c35": "271f4c"
+	},
+	"2": {
+		"265595": "cc7251",
+		"3f4447": "466698",
+		"de3431": "9ceec6",
+		"f8f8f8": "89d2b8",
+		"7b282e": "152a5c",
+		"6b1d1d": "356e8d",
+		"4ebdd9": "2f6e74",
+		"bfb169": "431022",
+		"bfbfbf": "8cc7d4",
+		"ffb2bf": "86d6b6",
+		"bf4c60": "32738b",
+		"fff0a6": "472333",
+		"3e7acc": "ecbb7a",
+		"18335c": "9f2727",
+		"f2798d": "5eb4a9",
+		"f01818": "ffe88d",
+		"7ddeff": "46988d",
+		"268794": "1c3e58",
+		"282c35": "4d2637"
+	}
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/658.json b/public/images/pokemon/variant/exp/658.json
new file mode 100644
index 00000000000..826e31b4e21
--- /dev/null
+++ b/public/images/pokemon/variant/exp/658.json
@@ -0,0 +1,34 @@
+{
+	"1": {
+		"ffb2bf": "b7e9ff",
+		"bf4c60": "4386df",
+		"66d9ff": "7ddcd6",
+		"3d61cc": "6b4592",
+		"fff0a6": "208698",
+		"c92e2e": "73c5ff",
+		"937f69": "406695",
+		"c2c1bc": "89b0d7",
+		"f2798d": "8dcfff",
+		"f7f7f7": "d8ffff",
+		"bfb169": "165e78",
+		"1b2a59": "170738",
+		"803340": "0e3e81",
+		"2e4999": "432b6c"
+	},
+	"2": {
+		"ffb2bf": "86d6b6",
+		"bf4c60": "32738b",
+		"66d9ff": "48968c",
+		"3d61cc": "ecbb7a",
+		"fff0a6": "652240",
+		"c92e2e": "63bf9b",
+		"937f69": "466698",
+		"c2c1bc": "8cc7d4",
+		"f2798d": "5eb4a9",
+		"f7f7f7": "d7eff4",
+		"bfb169": "431022",
+		"1b2a59": "9f2727",
+		"803340": "152a5c",
+		"2e4999": "cc7251"
+	}
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/back/658-ash.json b/public/images/pokemon/variant/exp/back/658-ash.json
new file mode 100644
index 00000000000..370d5df8081
--- /dev/null
+++ b/public/images/pokemon/variant/exp/back/658-ash.json
@@ -0,0 +1,38 @@
+{
+	"1": {
+		"265595": "432b6c",
+		"de3431": "3fca9f",
+		"f8f8f8": "a1e9f0",
+		"7b282e": "0e3e81",
+		"6b1d1d": "206d74",
+		"134e52": "062e3c",
+		"bfb169": "165e78",
+		"ffb2bf": "b7e9ff",
+		"bf4c60": "4386df",
+		"282c35": "271f4c",
+		"f2798d": "8dcfff",
+		"268794": "1c3e58",
+		"3e7acc": "6b4592",
+		"7ddeff": "7ddcd6",
+		"4ebdd9": "41a7b0",
+		"18335c": "170738"
+	},
+	"2": {
+		"265595": "cc7251",
+		"de3431": "9ceec6",
+		"f8f8f8": "89d2b8",
+		"7b282e": "152a5c",
+		"6b1d1d": "356e8d",
+		"134e52": "0d1e3e",
+		"bfb169": "4d2637",
+		"ffb2bf": "86d6b6",
+		"bf4c60": "32738b",
+		"282c35": "4d2637",
+		"f2798d": "5eb4a9",
+		"268794": "1c3e58",
+		"3e7acc": "ecbb7a",
+		"7ddeff": "46988d",
+		"4ebdd9": "2f6e74",
+		"18335c": "9f2727"
+	}
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/exp/back/658.json b/public/images/pokemon/variant/exp/back/658.json
new file mode 100644
index 00000000000..c1bb4222ce4
--- /dev/null
+++ b/public/images/pokemon/variant/exp/back/658.json
@@ -0,0 +1,26 @@
+{
+	"1": {
+		"ffb2bf": "b7e9ff",
+		"bf4c60": "4386df",
+		"3d61cc": "6b4592",
+		"fff0a6": "208698",
+		"2e4999": "432b6c",
+		"f2798d": "8dcfff",
+		"803340": "0e3e81",
+		"1b2a59": "170738",
+		"66d9ff": "7ddcd6",
+		"bfb169": "165e78"
+	},
+	"2": {
+		"ffb2bf": "86d6b6",
+		"bf4c60": "32738b",
+		"3d61cc": "ecbb7a",
+		"fff0a6": "652240",
+		"2e4999": "cc7251",
+		"f2798d": "5eb4a9",
+		"803340": "152a5c",
+		"1b2a59": "9f2727",
+		"66d9ff": "48968c",
+		"bfb169": "431022"
+	}
+}
\ No newline at end of file