diff --git a/public/images/mystery-encounters/safari_zone.json b/public/images/mystery-encounters/safari_zone.json
index f0c23d43f5a..fe81d1b9f53 100644
--- a/public/images/mystery-encounters/safari_zone.json
+++ b/public/images/mystery-encounters/safari_zone.json
@@ -1,33 +1,33 @@
 {
 	"textures": [
 		{
-			"image": "safarizone.png",
+			"image": "safari_zone.png",
 			"format": "RGBA8888",
 			"size": {
-				"w": 105,
-				"h": 83
+				"w": 120,
+				"h": 84
 			},
 			"scale": 1,
 			"frames": [
 				{
-					"filename": "safarizone.png",
+					"filename": "0001.png",
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
-						"w": 103,
-						"h": 81
+						"w": 118,
+						"h": 82
 					},
 					"spriteSourceSize": {
 						"x": 0,
 						"y": 0,
-						"w": 103,
-						"h": 81
+						"w": 118,
+						"h": 82
 					},
 					"frame": {
 						"x": 1,
 						"y": 1,
-						"w": 103,
-						"h": 81
+						"w": 118,
+						"h": 82
 					}
 				}
 			]
@@ -36,6 +36,6 @@
 	"meta": {
 		"app": "https://www.codeandweb.com/texturepacker",
 		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:f07e2d44900011048b658765e193a86c:3d91036b9c3943256dd1e4712042ec59:d467a15bea042bd0d310f1cce7d9791f$"
+		"smartupdate": "$TexturePacker:SmartUpdate:6fad7a61e47043b974153148b4fd3997:5ec4d0890f2f03446daf22c8ae8ba77b:87aa745cd95eef6cbf38935230f4e10f$"
 	}
 }
diff --git a/public/images/mystery-encounters/safari_zone.png b/public/images/mystery-encounters/safari_zone.png
index 03c32d1b955..375d66ebbe9 100644
Binary files a/public/images/mystery-encounters/safari_zone.png and b/public/images/mystery-encounters/safari_zone.png differ
diff --git a/public/images/trainer/buck.json b/public/images/trainer/buck.json
index 2088fa084f1..d2d215f716a 100644
--- a/public/images/trainer/buck.json
+++ b/public/images/trainer/buck.json
@@ -10,7 +10,7 @@
 			"scale": 1,
 			"frames": [
 				{
-					"filename": "0001.png",
+					"filename": "0002.png",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -52,7 +52,7 @@
 					}
 				},
 				{
-					"filename": "0005.png",
+					"filename": "0006.png",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -94,7 +94,91 @@
 					}
 				},
 				{
-					"filename": "0009.png",
+					"filename": "0010.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 80,
+						"h": 80
+					},
+					"spriteSourceSize": {
+						"x": 33,
+						"y": 4,
+						"w": 35,
+						"h": 76
+					},
+					"frame": {
+						"x": 1,
+						"y": 1,
+						"w": 35,
+						"h": 76
+					}
+				},
+				{
+					"filename": "0011.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 80,
+						"h": 80
+					},
+					"spriteSourceSize": {
+						"x": 33,
+						"y": 4,
+						"w": 35,
+						"h": 76
+					},
+					"frame": {
+						"x": 1,
+						"y": 1,
+						"w": 35,
+						"h": 76
+					}
+				},
+				{
+					"filename": "0014.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 80,
+						"h": 80
+					},
+					"spriteSourceSize": {
+						"x": 33,
+						"y": 4,
+						"w": 35,
+						"h": 76
+					},
+					"frame": {
+						"x": 1,
+						"y": 1,
+						"w": 35,
+						"h": 76
+					}
+				},
+				{
+					"filename": "0015.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 80,
+						"h": 80
+					},
+					"spriteSourceSize": {
+						"x": 33,
+						"y": 4,
+						"w": 35,
+						"h": 76
+					},
+					"frame": {
+						"x": 1,
+						"y": 1,
+						"w": 35,
+						"h": 76
+					}
+				},
+				{
+					"filename": "0018.png",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -115,7 +199,28 @@
 					}
 				},
 				{
-					"filename": "00010.png",
+					"filename": "0019.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 80,
+						"h": 80
+					},
+					"spriteSourceSize": {
+						"x": 18,
+						"y": 8,
+						"w": 44,
+						"h": 72
+					},
+					"frame": {
+						"x": 38,
+						"y": 1,
+						"w": 44,
+						"h": 72
+					}
+				},
+				{
+					"filename": "0020.png",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -136,7 +241,49 @@
 					}
 				},
 				{
-					"filename": "00011.png",
+					"filename": "0021.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 80,
+						"h": 80
+					},
+					"spriteSourceSize": {
+						"x": 15,
+						"y": 8,
+						"w": 44,
+						"h": 72
+					},
+					"frame": {
+						"x": 38,
+						"y": 1,
+						"w": 44,
+						"h": 72
+					}
+				},
+				{
+					"filename": "0022.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 80,
+						"h": 80
+					},
+					"spriteSourceSize": {
+						"x": 13,
+						"y": 8,
+						"w": 44,
+						"h": 72
+					},
+					"frame": {
+						"x": 38,
+						"y": 1,
+						"w": 44,
+						"h": 72
+					}
+				},
+				{
+					"filename": "0023.png",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -178,7 +325,7 @@
 					}
 				},
 				{
-					"filename": "0002.png",
+					"filename": "0001.png",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -220,7 +367,7 @@
 					}
 				},
 				{
-					"filename": "0006.png",
+					"filename": "0005.png",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -260,6 +407,111 @@
 						"w": 35,
 						"h": 75
 					}
+				},
+				{
+					"filename": "0009.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 80,
+						"h": 80
+					},
+					"spriteSourceSize": {
+						"x": 34,
+						"y": 5,
+						"w": 35,
+						"h": 75
+					},
+					"frame": {
+						"x": 84,
+						"y": 1,
+						"w": 35,
+						"h": 75
+					}
+				},
+				{
+					"filename": "0012.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 80,
+						"h": 80
+					},
+					"spriteSourceSize": {
+						"x": 34,
+						"y": 5,
+						"w": 35,
+						"h": 75
+					},
+					"frame": {
+						"x": 84,
+						"y": 1,
+						"w": 35,
+						"h": 75
+					}
+				},
+				{
+					"filename": "0013.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 80,
+						"h": 80
+					},
+					"spriteSourceSize": {
+						"x": 34,
+						"y": 5,
+						"w": 35,
+						"h": 75
+					},
+					"frame": {
+						"x": 84,
+						"y": 1,
+						"w": 35,
+						"h": 75
+					}
+				},
+				{
+					"filename": "0016.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 80,
+						"h": 80
+					},
+					"spriteSourceSize": {
+						"x": 34,
+						"y": 5,
+						"w": 35,
+						"h": 75
+					},
+					"frame": {
+						"x": 84,
+						"y": 1,
+						"w": 35,
+						"h": 75
+					}
+				},
+				{
+					"filename": "0017.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 80,
+						"h": 80
+					},
+					"spriteSourceSize": {
+						"x": 34,
+						"y": 5,
+						"w": 35,
+						"h": 75
+					},
+					"frame": {
+						"x": 84,
+						"y": 1,
+						"w": 35,
+						"h": 75
+					}
 				}
 			]
 		}
@@ -267,6 +519,6 @@
 	"meta": {
 		"app": "https://www.codeandweb.com/texturepacker",
 		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:bedd2f8769ba9b1430dc6479e53194f2:49cc02f839fd834c23053d7c92ce9e20:3347efe478119141b0e3e6eccdecd0f5$"
+		"smartupdate": "$TexturePacker:SmartUpdate:033f3d363b4192f64c92e02c19622c15:0d06141bef5af87ef82da967253207cb:3347efe478119141b0e3e6eccdecd0f5$"
 	}
 }
diff --git a/public/images/trainer/cheryl.json b/public/images/trainer/cheryl.json
index e00e6773c5c..4cac665a588 100644
--- a/public/images/trainer/cheryl.json
+++ b/public/images/trainer/cheryl.json
@@ -1,7 +1,7 @@
 {
 	"textures": [
 		{
-			"image": "cheryll.png",
+			"image": "cheryl.png",
 			"format": "RGBA8888",
 			"size": {
 				"w": 154,
@@ -94,7 +94,7 @@
 					}
 				},
 				{
-					"filename": "00010.png",
+					"filename": "0010.png",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -115,7 +115,7 @@
 					}
 				},
 				{
-					"filename": "00011.png",
+					"filename": "0011.png",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -136,7 +136,7 @@
 					}
 				},
 				{
-					"filename": "00012.png",
+					"filename": "0012.png",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -157,7 +157,7 @@
 					}
 				},
 				{
-					"filename": "00013.png",
+					"filename": "0013.png",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -178,7 +178,7 @@
 					}
 				},
 				{
-					"filename": "00014.png",
+					"filename": "0014.png",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -199,7 +199,7 @@
 					}
 				},
 				{
-					"filename": "00015.png",
+					"filename": "0015.png",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -220,7 +220,7 @@
 					}
 				},
 				{
-					"filename": "00016.png",
+					"filename": "0016.png",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
@@ -241,7 +241,7 @@
 					}
 				},
 				{
-					"filename": "00017.png",
+					"filename": "0017.png",
 					"rotated": false,
 					"trimmed": true,
 					"sourceSize": {
diff --git a/public/images/trainer/marley.json b/public/images/trainer/marley.json
index fcb94459942..92d9f1449e5 100644
--- a/public/images/trainer/marley.json
+++ b/public/images/trainer/marley.json
@@ -1,104 +1,83 @@
-{
-	"textures": [
-		{
-			"image": "marley.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 102,
-				"h": 82
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 27,
-						"y": 0,
-						"w": 30,
-						"h": 80
-					},
-					"frame": {
-						"x": 1,
-						"y": 1,
-						"w": 30,
-						"h": 80
-					}
-				},
-				{
-					"filename": "0000.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 27,
-						"y": 1,
-						"w": 33,
-						"h": 79
-					},
-					"frame": {
-						"x": 33,
-						"y": 1,
-						"w": 33,
-						"h": 79
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 27,
-						"y": 1,
-						"w": 33,
-						"h": 79
-					},
-					"frame": {
-						"x": 33,
-						"y": 1,
-						"w": 33,
-						"h": 79
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 25,
-						"y": 1,
-						"w": 33,
-						"h": 79
-					},
-					"frame": {
-						"x": 68,
-						"y": 1,
-						"w": 33,
-						"h": 79
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:4b2edf4443e93acdceffb1d86ae96a96:1019efd49d236cd477b7e9d786d99ffe:d7dbd866d03c506dac6716ab23e62168$"
-	}
+{ "frames": [
+   {
+    "filename": "0000.png",
+    "frame": { "x": 0, "y": 0, "w": 31, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 2, "w": 31, "h": 77 },
+    "sourceSize": { "w": 80, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0001.png",
+    "frame": { "x": 0, "y": 0, "w": 31, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 2, "w": 31, "h": 77 },
+    "sourceSize": { "w": 80, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 0, "y": 0, "w": 31, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 2, "w": 31, "h": 77 },
+    "sourceSize": { "w": 80, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 0, "y": 0, "w": 31, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 26, "y": 2, "w": 31, "h": 77 },
+    "sourceSize": { "w": 80, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 32, "y": 0, "w": 28, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 1, "w": 28, "h": 78 },
+    "sourceSize": { "w": 80, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 32, "y": 0, "w": 28, "h": 78 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 1, "w": 28, "h": 78 },
+    "sourceSize": { "w": 80, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 0, "y": 78, "w": 31, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 2, "w": 31, "h": 77 },
+    "sourceSize": { "w": 80, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 0, "y": 78, "w": 31, "h": 77 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 2, "w": 31, "h": 77 },
+    "sourceSize": { "w": 80, "h": 80 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.pngprite.org/",
+  "version": "1.3.7-x64",
+  "image": "marley.png",
+  "format": "I8",
+  "size": { "w": 60, "h": 155 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/trainer/marley.png b/public/images/trainer/marley.png
index 1344574a97c..8e78e11e8ad 100644
Binary files a/public/images/trainer/marley.png and b/public/images/trainer/marley.png differ
diff --git a/public/images/trainer/mira.json b/public/images/trainer/mira.json
index 79f54c49614..7bd29f53475 100644
--- a/public/images/trainer/mira.json
+++ b/public/images/trainer/mira.json
@@ -1,482 +1,209 @@
-{
-	"textures": [
-		{
-			"image": "mira.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 57,
-				"h": 205
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 20,
-						"y": 10,
-						"w": 55,
-						"h": 65
-					},
-					"frame": {
-						"x": 1,
-						"y": 1,
-						"w": 55,
-						"h": 65
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 20,
-						"y": 11,
-						"w": 55,
-						"h": 65
-					},
-					"frame": {
-						"x": 1,
-						"y": 1,
-						"w": 55,
-						"h": 65
-					}
-				},
-				{
-					"filename": "00011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 20,
-						"y": 10,
-						"w": 55,
-						"h": 65
-					},
-					"frame": {
-						"x": 1,
-						"y": 1,
-						"w": 55,
-						"h": 65
-					}
-				},
-				{
-					"filename": "00012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 20,
-						"y": 11,
-						"w": 55,
-						"h": 65
-					},
-					"frame": {
-						"x": 1,
-						"y": 1,
-						"w": 55,
-						"h": 65
-					}
-				},
-				{
-					"filename": "00018.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 20,
-						"y": 10,
-						"w": 55,
-						"h": 65
-					},
-					"frame": {
-						"x": 1,
-						"y": 1,
-						"w": 55,
-						"h": 65
-					}
-				},
-				{
-					"filename": "00019.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 20,
-						"y": 11,
-						"w": 55,
-						"h": 65
-					},
-					"frame": {
-						"x": 1,
-						"y": 1,
-						"w": 55,
-						"h": 65
-					}
-				},
-				{
-					"filename": "0000.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 22,
-						"y": 13,
-						"w": 46,
-						"h": 67
-					},
-					"frame": {
-						"x": 1,
-						"y": 68,
-						"w": 46,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 22,
-						"y": 13,
-						"w": 46,
-						"h": 67
-					},
-					"frame": {
-						"x": 1,
-						"y": 68,
-						"w": 46,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 21,
-						"y": 12,
-						"w": 46,
-						"h": 67
-					},
-					"frame": {
-						"x": 1,
-						"y": 68,
-						"w": 46,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 20,
-						"y": 10,
-						"w": 46,
-						"h": 67
-					},
-					"frame": {
-						"x": 1,
-						"y": 68,
-						"w": 46,
-						"h": 67
-					}
-				},
-				{
-					"filename": "00013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 20,
-						"y": 10,
-						"w": 46,
-						"h": 67
-					},
-					"frame": {
-						"x": 1,
-						"y": 68,
-						"w": 46,
-						"h": 67
-					}
-				},
-				{
-					"filename": "00014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 21,
-						"y": 12,
-						"w": 46,
-						"h": 67
-					},
-					"frame": {
-						"x": 1,
-						"y": 68,
-						"w": 46,
-						"h": 67
-					}
-				},
-				{
-					"filename": "00015.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 22,
-						"y": 13,
-						"w": 46,
-						"h": 67
-					},
-					"frame": {
-						"x": 1,
-						"y": 68,
-						"w": 46,
-						"h": 67
-					}
-				},
-				{
-					"filename": "00016.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 21,
-						"y": 12,
-						"w": 46,
-						"h": 67
-					},
-					"frame": {
-						"x": 1,
-						"y": 68,
-						"w": 46,
-						"h": 67
-					}
-				},
-				{
-					"filename": "00017.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 20,
-						"y": 10,
-						"w": 46,
-						"h": 67
-					},
-					"frame": {
-						"x": 1,
-						"y": 68,
-						"w": 46,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 12,
-						"y": 10,
-						"w": 46,
-						"h": 67
-					},
-					"frame": {
-						"x": 1,
-						"y": 137,
-						"w": 46,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 11,
-						"y": 12,
-						"w": 46,
-						"h": 67
-					},
-					"frame": {
-						"x": 1,
-						"y": 137,
-						"w": 46,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 10,
-						"y": 13,
-						"w": 46,
-						"h": 67
-					},
-					"frame": {
-						"x": 1,
-						"y": 137,
-						"w": 46,
-						"h": 67
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 11,
-						"y": 12,
-						"w": 46,
-						"h": 67
-					},
-					"frame": {
-						"x": 1,
-						"y": 137,
-						"w": 46,
-						"h": 67
-					}
-				},
-				{
-					"filename": "00010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 12,
-						"y": 10,
-						"w": 46,
-						"h": 67
-					},
-					"frame": {
-						"x": 1,
-						"y": 137,
-						"w": 46,
-						"h": 67
-					}
-				},
-				{
-					"filename": "00020.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 12,
-						"y": 10,
-						"w": 46,
-						"h": 67
-					},
-					"frame": {
-						"x": 1,
-						"y": 137,
-						"w": 46,
-						"h": 67
-					}
-				},
-				{
-					"filename": "00021.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 11,
-						"y": 12,
-						"w": 46,
-						"h": 67
-					},
-					"frame": {
-						"x": 1,
-						"y": 137,
-						"w": 46,
-						"h": 67
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:fa0a6e132823f8a832e4a5a4f7f22e71:0662a4931405bc13b67679afcad37bac:f9bd0c7364e7f214bd64723bef0b3fe9$"
-	}
+{ "frames": [
+   {
+    "filename": "0000.png",
+    "frame": { "x": 53, "y": 0, "w": 44, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 14, "w": 44, "h": 65 },
+    "sourceSize": { "w": 80, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0001.png",
+    "frame": { "x": 53, "y": 0, "w": 44, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 14, "w": 44, "h": 65 },
+    "sourceSize": { "w": 80, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 53, "y": 0, "w": 44, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 22, "y": 13, "w": 44, "h": 65 },
+    "sourceSize": { "w": 80, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 53, "y": 0, "w": 44, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 11, "w": 44, "h": 65 },
+    "sourceSize": { "w": 80, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 0, "y": 0, "w": 53, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 11, "w": 53, "h": 63 },
+    "sourceSize": { "w": 80, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 0, "y": 0, "w": 53, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 12, "w": 53, "h": 63 },
+    "sourceSize": { "w": 80, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 0, "y": 63, "w": 44, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 11, "w": 44, "h": 65 },
+    "sourceSize": { "w": 80, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 0, "y": 63, "w": 44, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 13, "w": 44, "h": 65 },
+    "sourceSize": { "w": 80, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 0, "y": 63, "w": 44, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 14, "w": 44, "h": 65 },
+    "sourceSize": { "w": 80, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 0, "y": 63, "w": 44, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 13, "w": 44, "h": 65 },
+    "sourceSize": { "w": 80, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 0, "y": 63, "w": 44, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 11, "w": 44, "h": 65 },
+    "sourceSize": { "w": 80, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 0, "y": 0, "w": 53, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 11, "w": 53, "h": 63 },
+    "sourceSize": { "w": 80, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 0, "y": 0, "w": 53, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 12, "w": 53, "h": 63 },
+    "sourceSize": { "w": 80, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 53, "y": 0, "w": 44, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 11, "w": 44, "h": 65 },
+    "sourceSize": { "w": 80, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 53, "y": 0, "w": 44, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 22, "y": 13, "w": 44, "h": 65 },
+    "sourceSize": { "w": 80, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 53, "y": 0, "w": 44, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 23, "y": 14, "w": 44, "h": 65 },
+    "sourceSize": { "w": 80, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 53, "y": 0, "w": 44, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 22, "y": 13, "w": 44, "h": 65 },
+    "sourceSize": { "w": 80, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 53, "y": 0, "w": 44, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 11, "w": 44, "h": 65 },
+    "sourceSize": { "w": 80, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 0, "y": 0, "w": 53, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 11, "w": 53, "h": 63 },
+    "sourceSize": { "w": 80, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 0, "y": 0, "w": 53, "h": 63 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 21, "y": 12, "w": 53, "h": 63 },
+    "sourceSize": { "w": 80, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 0, "y": 63, "w": 44, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 13, "y": 11, "w": 44, "h": 65 },
+    "sourceSize": { "w": 80, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 0, "y": 63, "w": 44, "h": 65 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 13, "w": 44, "h": 65 },
+    "sourceSize": { "w": 80, "h": 80 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.7-x64",
+  "image": "mira.png",
+  "format": "I8",
+  "size": { "w": 97, "h": 128 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/trainer/mira.png b/public/images/trainer/mira.png
index 0ddddf90e47..5c1afe5d241 100644
Binary files a/public/images/trainer/mira.png and b/public/images/trainer/mira.png differ
diff --git a/public/images/trainer/riley.json b/public/images/trainer/riley.json
index e29f6e02e24..f0f84a909db 100644
--- a/public/images/trainer/riley.json
+++ b/public/images/trainer/riley.json
@@ -1,461 +1,209 @@
-{
-	"textures": [
-		{
-			"image": "riley.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 59,
-				"h": 246
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0000.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 10,
-						"y": 0,
-						"w": 57,
-						"h": 80
-					},
-					"frame": {
-						"x": 1,
-						"y": 1,
-						"w": 57,
-						"h": 80
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 9,
-						"y": 0,
-						"w": 57,
-						"h": 80
-					},
-					"frame": {
-						"x": 1,
-						"y": 1,
-						"w": 57,
-						"h": 80
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 10,
-						"y": 0,
-						"w": 57,
-						"h": 80
-					},
-					"frame": {
-						"x": 1,
-						"y": 1,
-						"w": 57,
-						"h": 80
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 10,
-						"y": 0,
-						"w": 57,
-						"h": 80
-					},
-					"frame": {
-						"x": 1,
-						"y": 1,
-						"w": 57,
-						"h": 80
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 10,
-						"y": 0,
-						"w": 57,
-						"h": 80
-					},
-					"frame": {
-						"x": 1,
-						"y": 1,
-						"w": 57,
-						"h": 80
-					}
-				},
-				{
-					"filename": "00010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 10,
-						"y": 0,
-						"w": 57,
-						"h": 80
-					},
-					"frame": {
-						"x": 1,
-						"y": 1,
-						"w": 57,
-						"h": 80
-					}
-				},
-				{
-					"filename": "00012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 10,
-						"y": 0,
-						"w": 57,
-						"h": 80
-					},
-					"frame": {
-						"x": 1,
-						"y": 1,
-						"w": 57,
-						"h": 80
-					}
-				},
-				{
-					"filename": "00014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 10,
-						"y": 0,
-						"w": 57,
-						"h": 80
-					},
-					"frame": {
-						"x": 1,
-						"y": 1,
-						"w": 57,
-						"h": 80
-					}
-				},
-				{
-					"filename": "00016.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 10,
-						"y": 0,
-						"w": 57,
-						"h": 80
-					},
-					"frame": {
-						"x": 1,
-						"y": 1,
-						"w": 57,
-						"h": 80
-					}
-				},
-				{
-					"filename": "00018.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 10,
-						"y": 0,
-						"w": 57,
-						"h": 80
-					},
-					"frame": {
-						"x": 1,
-						"y": 1,
-						"w": 57,
-						"h": 80
-					}
-				},
-				{
-					"filename": "00020.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 10,
-						"y": 0,
-						"w": 57,
-						"h": 80
-					},
-					"frame": {
-						"x": 1,
-						"y": 1,
-						"w": 57,
-						"h": 80
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 11,
-						"y": 0,
-						"w": 56,
-						"h": 80
-					},
-					"frame": {
-						"x": 1,
-						"y": 83,
-						"w": 56,
-						"h": 80
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 11,
-						"y": 0,
-						"w": 56,
-						"h": 80
-					},
-					"frame": {
-						"x": 1,
-						"y": 83,
-						"w": 56,
-						"h": 80
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 11,
-						"y": 0,
-						"w": 56,
-						"h": 80
-					},
-					"frame": {
-						"x": 1,
-						"y": 83,
-						"w": 56,
-						"h": 80
-					}
-				},
-				{
-					"filename": "00011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 11,
-						"y": 0,
-						"w": 56,
-						"h": 80
-					},
-					"frame": {
-						"x": 1,
-						"y": 83,
-						"w": 56,
-						"h": 80
-					}
-				},
-				{
-					"filename": "00013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 11,
-						"y": 0,
-						"w": 56,
-						"h": 80
-					},
-					"frame": {
-						"x": 1,
-						"y": 83,
-						"w": 56,
-						"h": 80
-					}
-				},
-				{
-					"filename": "00015.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 11,
-						"y": 0,
-						"w": 56,
-						"h": 80
-					},
-					"frame": {
-						"x": 1,
-						"y": 83,
-						"w": 56,
-						"h": 80
-					}
-				},
-				{
-					"filename": "00017.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 11,
-						"y": 0,
-						"w": 56,
-						"h": 80
-					},
-					"frame": {
-						"x": 1,
-						"y": 83,
-						"w": 56,
-						"h": 80
-					}
-				},
-				{
-					"filename": "00019.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 11,
-						"y": 0,
-						"w": 56,
-						"h": 80
-					},
-					"frame": {
-						"x": 1,
-						"y": 83,
-						"w": 56,
-						"h": 80
-					}
-				},
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 30,
-						"y": 0,
-						"w": 39,
-						"h": 80
-					},
-					"frame": {
-						"x": 1,
-						"y": 165,
-						"w": 39,
-						"h": 80
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 29,
-						"y": 0,
-						"w": 39,
-						"h": 80
-					},
-					"frame": {
-						"x": 1,
-						"y": 165,
-						"w": 39,
-						"h": 80
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:d0f27c1a776dc776dbc730ec409fafad:7a665e1bfee26403e5d49912c4dad042:cb98d9ba5e960a1d670368dad1073434$"
-	}
+{ "frames": [
+   {
+    "filename": "0000.png",
+    "frame": { "x": 0, "y": 0, "w": 55, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 0, "w": 55, "h": 80 },
+    "sourceSize": { "w": 80, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0001.png",
+    "frame": { "x": 0, "y": 0, "w": 55, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 0, "w": 55, "h": 80 },
+    "sourceSize": { "w": 80, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0002.png",
+    "frame": { "x": 0, "y": 0, "w": 55, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 0, "w": 55, "h": 80 },
+    "sourceSize": { "w": 80, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0003.png",
+    "frame": { "x": 0, "y": 0, "w": 55, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 0, "w": 55, "h": 80 },
+    "sourceSize": { "w": 80, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0004.png",
+    "frame": { "x": 55, "y": 80, "w": 37, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 31, "y": 0, "w": 37, "h": 80 },
+    "sourceSize": { "w": 80, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0005.png",
+    "frame": { "x": 55, "y": 80, "w": 37, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 31, "y": 0, "w": 37, "h": 80 },
+    "sourceSize": { "w": 80, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0006.png",
+    "frame": { "x": 55, "y": 80, "w": 37, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 30, "y": 0, "w": 37, "h": 80 },
+    "sourceSize": { "w": 80, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0007.png",
+    "frame": { "x": 55, "y": 80, "w": 37, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 30, "y": 0, "w": 37, "h": 80 },
+    "sourceSize": { "w": 80, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0008.png",
+    "frame": { "x": 55, "y": 80, "w": 37, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 0, "w": 37, "h": 80 },
+    "sourceSize": { "w": 80, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0009.png",
+    "frame": { "x": 55, "y": 80, "w": 37, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 28, "y": 0, "w": 37, "h": 80 },
+    "sourceSize": { "w": 80, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0010.png",
+    "frame": { "x": 0, "y": 0, "w": 55, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 0, "w": 55, "h": 80 },
+    "sourceSize": { "w": 80, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0011.png",
+    "frame": { "x": 0, "y": 0, "w": 55, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 10, "y": 0, "w": 55, "h": 80 },
+    "sourceSize": { "w": 80, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0012.png",
+    "frame": { "x": 0, "y": 0, "w": 55, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 0, "w": 55, "h": 80 },
+    "sourceSize": { "w": 80, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0013.png",
+    "frame": { "x": 0, "y": 0, "w": 55, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 11, "y": 0, "w": 55, "h": 80 },
+    "sourceSize": { "w": 80, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0014.png",
+    "frame": { "x": 55, "y": 0, "w": 55, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 0, "w": 55, "h": 80 },
+    "sourceSize": { "w": 80, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0015.png",
+    "frame": { "x": 55, "y": 0, "w": 55, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 0, "w": 55, "h": 80 },
+    "sourceSize": { "w": 80, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0016.png",
+    "frame": { "x": 0, "y": 80, "w": 55, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 0, "w": 55, "h": 80 },
+    "sourceSize": { "w": 80, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0017.png",
+    "frame": { "x": 0, "y": 80, "w": 55, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 0, "w": 55, "h": 80 },
+    "sourceSize": { "w": 80, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0018.png",
+    "frame": { "x": 55, "y": 0, "w": 55, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 0, "w": 55, "h": 80 },
+    "sourceSize": { "w": 80, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0019.png",
+    "frame": { "x": 55, "y": 0, "w": 55, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 0, "w": 55, "h": 80 },
+    "sourceSize": { "w": 80, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0020.png",
+    "frame": { "x": 0, "y": 0, "w": 55, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 0, "w": 55, "h": 80 },
+    "sourceSize": { "w": 80, "h": 80 },
+    "duration": 100
+   },
+   {
+    "filename": "0021.png",
+    "frame": { "x": 0, "y": 0, "w": 55, "h": 80 },
+    "rotated": false,
+    "trimmed": true,
+    "spriteSourceSize": { "x": 12, "y": 0, "w": 55, "h": 80 },
+    "sourceSize": { "w": 80, "h": 80 },
+    "duration": 100
+   }
+ ],
+ "meta": {
+  "app": "https://www.aseprite.org/",
+  "version": "1.3.7-x64",
+  "image": "riley.png",
+  "format": "I8",
+  "size": { "w": 110, "h": 160 },
+  "scale": "1"
+ }
 }
diff --git a/public/images/trainer/riley.png b/public/images/trainer/riley.png
index dd5d3bdd8c9..a9f0e3b53a9 100644
Binary files a/public/images/trainer/riley.png and b/public/images/trainer/riley.png differ