diff --git a/public/images/trainer/player.json b/public/images/trainer/player.json
deleted file mode 100644
index cb65f57d909..00000000000
--- a/public/images/trainer/player.json
+++ /dev/null
@@ -1,1721 +0,0 @@
-{
-	"textures": [
-		{
-			"image": "player.png",
-			"format": "RGBA8888",
-			"size": {
-				"w": 196,
-				"h": 196
-			},
-			"scale": 1,
-			"frames": [
-				{
-					"filename": "0001.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 21,
-						"y": 9,
-						"w": 38,
-						"h": 71
-					},
-					"frame": {
-						"x": 1,
-						"y": 1,
-						"w": 38,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0038.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 21,
-						"y": 9,
-						"w": 38,
-						"h": 71
-					},
-					"frame": {
-						"x": 1,
-						"y": 1,
-						"w": 38,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0039.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 21,
-						"y": 9,
-						"w": 38,
-						"h": 71
-					},
-					"frame": {
-						"x": 1,
-						"y": 1,
-						"w": 38,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0040.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 21,
-						"y": 9,
-						"w": 38,
-						"h": 71
-					},
-					"frame": {
-						"x": 1,
-						"y": 1,
-						"w": 38,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0041.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 21,
-						"y": 9,
-						"w": 38,
-						"h": 71
-					},
-					"frame": {
-						"x": 1,
-						"y": 1,
-						"w": 38,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0042.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 21,
-						"y": 9,
-						"w": 38,
-						"h": 71
-					},
-					"frame": {
-						"x": 1,
-						"y": 1,
-						"w": 38,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0043.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 21,
-						"y": 9,
-						"w": 38,
-						"h": 71
-					},
-					"frame": {
-						"x": 1,
-						"y": 1,
-						"w": 38,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0044.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 21,
-						"y": 9,
-						"w": 38,
-						"h": 71
-					},
-					"frame": {
-						"x": 1,
-						"y": 1,
-						"w": 38,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0045.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 21,
-						"y": 9,
-						"w": 38,
-						"h": 71
-					},
-					"frame": {
-						"x": 1,
-						"y": 1,
-						"w": 38,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0046.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 21,
-						"y": 9,
-						"w": 38,
-						"h": 71
-					},
-					"frame": {
-						"x": 1,
-						"y": 1,
-						"w": 38,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0047.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 21,
-						"y": 9,
-						"w": 38,
-						"h": 71
-					},
-					"frame": {
-						"x": 1,
-						"y": 1,
-						"w": 38,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0048.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 21,
-						"y": 9,
-						"w": 38,
-						"h": 71
-					},
-					"frame": {
-						"x": 1,
-						"y": 1,
-						"w": 38,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0049.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 21,
-						"y": 9,
-						"w": 38,
-						"h": 71
-					},
-					"frame": {
-						"x": 1,
-						"y": 1,
-						"w": 38,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0050.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 21,
-						"y": 9,
-						"w": 38,
-						"h": 71
-					},
-					"frame": {
-						"x": 1,
-						"y": 1,
-						"w": 38,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0051.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 21,
-						"y": 9,
-						"w": 38,
-						"h": 71
-					},
-					"frame": {
-						"x": 1,
-						"y": 1,
-						"w": 38,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0052.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 21,
-						"y": 9,
-						"w": 38,
-						"h": 71
-					},
-					"frame": {
-						"x": 1,
-						"y": 1,
-						"w": 38,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0053.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 21,
-						"y": 9,
-						"w": 38,
-						"h": 71
-					},
-					"frame": {
-						"x": 1,
-						"y": 1,
-						"w": 38,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0054.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 21,
-						"y": 9,
-						"w": 38,
-						"h": 71
-					},
-					"frame": {
-						"x": 1,
-						"y": 1,
-						"w": 38,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0055.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 21,
-						"y": 9,
-						"w": 38,
-						"h": 71
-					},
-					"frame": {
-						"x": 1,
-						"y": 1,
-						"w": 38,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0056.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 21,
-						"y": 9,
-						"w": 38,
-						"h": 71
-					},
-					"frame": {
-						"x": 1,
-						"y": 1,
-						"w": 38,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0057.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 21,
-						"y": 9,
-						"w": 38,
-						"h": 71
-					},
-					"frame": {
-						"x": 1,
-						"y": 1,
-						"w": 38,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0058.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 21,
-						"y": 9,
-						"w": 38,
-						"h": 71
-					},
-					"frame": {
-						"x": 1,
-						"y": 1,
-						"w": 38,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0059.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 21,
-						"y": 9,
-						"w": 38,
-						"h": 71
-					},
-					"frame": {
-						"x": 1,
-						"y": 1,
-						"w": 38,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0060.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 21,
-						"y": 9,
-						"w": 38,
-						"h": 71
-					},
-					"frame": {
-						"x": 1,
-						"y": 1,
-						"w": 38,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0061.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 21,
-						"y": 9,
-						"w": 38,
-						"h": 71
-					},
-					"frame": {
-						"x": 1,
-						"y": 1,
-						"w": 38,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0062.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 21,
-						"y": 9,
-						"w": 38,
-						"h": 71
-					},
-					"frame": {
-						"x": 1,
-						"y": 1,
-						"w": 38,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0063.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 21,
-						"y": 9,
-						"w": 38,
-						"h": 71
-					},
-					"frame": {
-						"x": 1,
-						"y": 1,
-						"w": 38,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0064.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 21,
-						"y": 9,
-						"w": 38,
-						"h": 71
-					},
-					"frame": {
-						"x": 1,
-						"y": 1,
-						"w": 38,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0065.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 21,
-						"y": 9,
-						"w": 38,
-						"h": 71
-					},
-					"frame": {
-						"x": 1,
-						"y": 1,
-						"w": 38,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0066.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 21,
-						"y": 9,
-						"w": 38,
-						"h": 71
-					},
-					"frame": {
-						"x": 1,
-						"y": 1,
-						"w": 38,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0067.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 21,
-						"y": 9,
-						"w": 38,
-						"h": 71
-					},
-					"frame": {
-						"x": 1,
-						"y": 1,
-						"w": 38,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0068.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 21,
-						"y": 9,
-						"w": 38,
-						"h": 71
-					},
-					"frame": {
-						"x": 1,
-						"y": 1,
-						"w": 38,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0069.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 21,
-						"y": 9,
-						"w": 38,
-						"h": 71
-					},
-					"frame": {
-						"x": 1,
-						"y": 1,
-						"w": 38,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0070.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 21,
-						"y": 9,
-						"w": 38,
-						"h": 71
-					},
-					"frame": {
-						"x": 1,
-						"y": 1,
-						"w": 38,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0071.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 21,
-						"y": 9,
-						"w": 38,
-						"h": 71
-					},
-					"frame": {
-						"x": 1,
-						"y": 1,
-						"w": 38,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0072.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 21,
-						"y": 9,
-						"w": 38,
-						"h": 71
-					},
-					"frame": {
-						"x": 1,
-						"y": 1,
-						"w": 38,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0073.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 21,
-						"y": 9,
-						"w": 38,
-						"h": 71
-					},
-					"frame": {
-						"x": 1,
-						"y": 1,
-						"w": 38,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0074.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 21,
-						"y": 9,
-						"w": 38,
-						"h": 71
-					},
-					"frame": {
-						"x": 1,
-						"y": 1,
-						"w": 38,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0075.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 21,
-						"y": 9,
-						"w": 38,
-						"h": 71
-					},
-					"frame": {
-						"x": 1,
-						"y": 1,
-						"w": 38,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0076.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 21,
-						"y": 9,
-						"w": 38,
-						"h": 71
-					},
-					"frame": {
-						"x": 1,
-						"y": 1,
-						"w": 38,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0077.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 21,
-						"y": 9,
-						"w": 38,
-						"h": 71
-					},
-					"frame": {
-						"x": 1,
-						"y": 1,
-						"w": 38,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0078.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 21,
-						"y": 9,
-						"w": 38,
-						"h": 71
-					},
-					"frame": {
-						"x": 1,
-						"y": 1,
-						"w": 38,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0079.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 21,
-						"y": 9,
-						"w": 38,
-						"h": 71
-					},
-					"frame": {
-						"x": 1,
-						"y": 1,
-						"w": 38,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0080.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 21,
-						"y": 9,
-						"w": 38,
-						"h": 71
-					},
-					"frame": {
-						"x": 1,
-						"y": 1,
-						"w": 38,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0081.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 21,
-						"y": 9,
-						"w": 38,
-						"h": 71
-					},
-					"frame": {
-						"x": 1,
-						"y": 1,
-						"w": 38,
-						"h": 71
-					}
-				},
-				{
-					"filename": "0034.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 19,
-						"y": 12,
-						"w": 40,
-						"h": 68
-					},
-					"frame": {
-						"x": 41,
-						"y": 1,
-						"w": 40,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0035.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 19,
-						"y": 12,
-						"w": 40,
-						"h": 68
-					},
-					"frame": {
-						"x": 41,
-						"y": 1,
-						"w": 40,
-						"h": 68
-					}
-				},
-				{
-					"filename": "0036.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 21,
-						"y": 10,
-						"w": 38,
-						"h": 70
-					},
-					"frame": {
-						"x": 1,
-						"y": 74,
-						"w": 38,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0033.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 21,
-						"y": 31,
-						"w": 37,
-						"h": 49
-					},
-					"frame": {
-						"x": 1,
-						"y": 146,
-						"w": 37,
-						"h": 49
-					}
-				},
-				{
-					"filename": "0037.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 21,
-						"y": 10,
-						"w": 38,
-						"h": 70
-					},
-					"frame": {
-						"x": 41,
-						"y": 71,
-						"w": 38,
-						"h": 70
-					}
-				},
-				{
-					"filename": "0002.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 19,
-						"y": 23,
-						"w": 41,
-						"h": 57
-					},
-					"frame": {
-						"x": 83,
-						"y": 1,
-						"w": 41,
-						"h": 57
-					}
-				},
-				{
-					"filename": "0003.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 19,
-						"y": 23,
-						"w": 41,
-						"h": 57
-					},
-					"frame": {
-						"x": 83,
-						"y": 1,
-						"w": 41,
-						"h": 57
-					}
-				},
-				{
-					"filename": "0004.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 19,
-						"y": 23,
-						"w": 41,
-						"h": 57
-					},
-					"frame": {
-						"x": 83,
-						"y": 1,
-						"w": 41,
-						"h": 57
-					}
-				},
-				{
-					"filename": "0005.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 19,
-						"y": 23,
-						"w": 41,
-						"h": 57
-					},
-					"frame": {
-						"x": 83,
-						"y": 1,
-						"w": 41,
-						"h": 57
-					}
-				},
-				{
-					"filename": "0006.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 19,
-						"y": 23,
-						"w": 41,
-						"h": 57
-					},
-					"frame": {
-						"x": 83,
-						"y": 1,
-						"w": 41,
-						"h": 57
-					}
-				},
-				{
-					"filename": "0007.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 19,
-						"y": 23,
-						"w": 41,
-						"h": 57
-					},
-					"frame": {
-						"x": 83,
-						"y": 1,
-						"w": 41,
-						"h": 57
-					}
-				},
-				{
-					"filename": "0008.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 19,
-						"y": 23,
-						"w": 41,
-						"h": 57
-					},
-					"frame": {
-						"x": 83,
-						"y": 1,
-						"w": 41,
-						"h": 57
-					}
-				},
-				{
-					"filename": "0009.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 19,
-						"y": 25,
-						"w": 41,
-						"h": 55
-					},
-					"frame": {
-						"x": 126,
-						"y": 1,
-						"w": 41,
-						"h": 55
-					}
-				},
-				{
-					"filename": "0010.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 20,
-						"y": 28,
-						"w": 39,
-						"h": 52
-					},
-					"frame": {
-						"x": 41,
-						"y": 143,
-						"w": 39,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0011.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 20,
-						"y": 28,
-						"w": 39,
-						"h": 52
-					},
-					"frame": {
-						"x": 41,
-						"y": 143,
-						"w": 39,
-						"h": 52
-					}
-				},
-				{
-					"filename": "0012.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 20,
-						"y": 36,
-						"w": 38,
-						"h": 44
-					},
-					"frame": {
-						"x": 83,
-						"y": 60,
-						"w": 38,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0018.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 20,
-						"y": 36,
-						"w": 38,
-						"h": 44
-					},
-					"frame": {
-						"x": 123,
-						"y": 60,
-						"w": 38,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0019.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 20,
-						"y": 36,
-						"w": 38,
-						"h": 44
-					},
-					"frame": {
-						"x": 123,
-						"y": 60,
-						"w": 38,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0020.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 20,
-						"y": 36,
-						"w": 38,
-						"h": 44
-					},
-					"frame": {
-						"x": 123,
-						"y": 60,
-						"w": 38,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0032.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 20,
-						"y": 36,
-						"w": 38,
-						"h": 44
-					},
-					"frame": {
-						"x": 123,
-						"y": 60,
-						"w": 38,
-						"h": 44
-					}
-				},
-				{
-					"filename": "0021.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 20,
-						"y": 37,
-						"w": 38,
-						"h": 43
-					},
-					"frame": {
-						"x": 82,
-						"y": 106,
-						"w": 38,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0022.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 20,
-						"y": 37,
-						"w": 38,
-						"h": 43
-					},
-					"frame": {
-						"x": 82,
-						"y": 106,
-						"w": 38,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0023.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 20,
-						"y": 37,
-						"w": 38,
-						"h": 43
-					},
-					"frame": {
-						"x": 82,
-						"y": 106,
-						"w": 38,
-						"h": 43
-					}
-				},
-				{
-					"filename": "0013.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 20,
-						"y": 38,
-						"w": 38,
-						"h": 42
-					},
-					"frame": {
-						"x": 82,
-						"y": 151,
-						"w": 38,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0014.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 20,
-						"y": 38,
-						"w": 38,
-						"h": 42
-					},
-					"frame": {
-						"x": 82,
-						"y": 151,
-						"w": 38,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0015.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 20,
-						"y": 38,
-						"w": 38,
-						"h": 42
-					},
-					"frame": {
-						"x": 82,
-						"y": 151,
-						"w": 38,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0016.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 20,
-						"y": 38,
-						"w": 38,
-						"h": 42
-					},
-					"frame": {
-						"x": 82,
-						"y": 151,
-						"w": 38,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0017.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 20,
-						"y": 38,
-						"w": 38,
-						"h": 42
-					},
-					"frame": {
-						"x": 82,
-						"y": 151,
-						"w": 38,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0024.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 20,
-						"y": 38,
-						"w": 38,
-						"h": 42
-					},
-					"frame": {
-						"x": 82,
-						"y": 151,
-						"w": 38,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0025.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 20,
-						"y": 38,
-						"w": 38,
-						"h": 42
-					},
-					"frame": {
-						"x": 82,
-						"y": 151,
-						"w": 38,
-						"h": 42
-					}
-				},
-				{
-					"filename": "0026.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 20,
-						"y": 39,
-						"w": 38,
-						"h": 41
-					},
-					"frame": {
-						"x": 122,
-						"y": 106,
-						"w": 38,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0027.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 20,
-						"y": 39,
-						"w": 38,
-						"h": 41
-					},
-					"frame": {
-						"x": 122,
-						"y": 106,
-						"w": 38,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0028.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 20,
-						"y": 39,
-						"w": 38,
-						"h": 41
-					},
-					"frame": {
-						"x": 122,
-						"y": 106,
-						"w": 38,
-						"h": 41
-					}
-				},
-				{
-					"filename": "0029.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 20,
-						"y": 40,
-						"w": 38,
-						"h": 40
-					},
-					"frame": {
-						"x": 122,
-						"y": 149,
-						"w": 38,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0030.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 20,
-						"y": 40,
-						"w": 38,
-						"h": 40
-					},
-					"frame": {
-						"x": 122,
-						"y": 149,
-						"w": 38,
-						"h": 40
-					}
-				},
-				{
-					"filename": "0031.png",
-					"rotated": false,
-					"trimmed": true,
-					"sourceSize": {
-						"w": 80,
-						"h": 80
-					},
-					"spriteSourceSize": {
-						"x": 20,
-						"y": 40,
-						"w": 38,
-						"h": 40
-					},
-					"frame": {
-						"x": 122,
-						"y": 149,
-						"w": 38,
-						"h": 40
-					}
-				}
-			]
-		}
-	],
-	"meta": {
-		"app": "https://www.codeandweb.com/texturepacker",
-		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:8385e0bf69d49cb5e3ad99cf4ef0e225:60b8782eae5473a51463d8d1db7eb054:45390a50848154ae0c2f7992c949cf52$"
-	}
-}
diff --git a/public/images/trainer/player.png b/public/images/trainer/player.png
deleted file mode 100644
index aebbe7a2da9..00000000000
Binary files a/public/images/trainer/player.png and /dev/null differ
diff --git a/public/images/trainer/player_alt_f.json b/public/images/trainer/player_alt_f.json
new file mode 100644
index 00000000000..2403d2852f8
--- /dev/null
+++ b/public/images/trainer/player_alt_f.json
@@ -0,0 +1,41 @@
+{
+	"textures": [
+		{
+			"image": "player_alt_f.png",
+			"format": "RGBA8888",
+			"size": {
+				"w": 69,
+				"h": 69
+			},
+			"scale": 1,
+			"frames": [
+				{
+					"filename": "0001.png",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 27,
+						"h": 69
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 27,
+						"h": 69
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 27,
+						"h": 69
+					}
+				}
+			]
+		}
+	],
+	"meta": {
+		"app": "https://www.codeandweb.com/texturepacker",
+		"version": "3.0",
+		"smartupdate": "$TexturePacker:SmartUpdate:5f971489695d808dd4a75244472baa7a:5390e2006b9312c8b6d7c2f5a93a3dad:0aaa288a75ecf87b6647cbb7fd0d2ecc$"
+	}
+}
diff --git a/public/images/trainer/player_alt_f.png b/public/images/trainer/player_alt_f.png
new file mode 100644
index 00000000000..b244076da83
Binary files /dev/null and b/public/images/trainer/player_alt_f.png differ
diff --git a/public/images/trainer/player_alt_m.json b/public/images/trainer/player_alt_m.json
new file mode 100644
index 00000000000..1209116b5bb
--- /dev/null
+++ b/public/images/trainer/player_alt_m.json
@@ -0,0 +1,41 @@
+{
+	"textures": [
+		{
+			"image": "player_alt_m.png",
+			"format": "RGBA8888",
+			"size": {
+				"w": 73,
+				"h": 73
+			},
+			"scale": 1,
+			"frames": [
+				{
+					"filename": "0001.png",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 34,
+						"h": 73
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 34,
+						"h": 73
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 34,
+						"h": 73
+					}
+				}
+			]
+		}
+	],
+	"meta": {
+		"app": "https://www.codeandweb.com/texturepacker",
+		"version": "3.0",
+		"smartupdate": "$TexturePacker:SmartUpdate:4c2a08a8a0acbbe63d0adb2453b1990b:81d51f69c08909cd8d28932a6c1b4f71:7ef6104245066e3b4078d0f6ef5e5edf$"
+	}
+}
diff --git a/public/images/trainer/player_alt_m.png b/public/images/trainer/player_alt_m.png
new file mode 100644
index 00000000000..935c7b8ba1b
Binary files /dev/null and b/public/images/trainer/player_alt_m.png differ
diff --git a/public/images/trainer/rival_f.json b/public/images/trainer/rival_f.json
index a0bcbc1f053..b769a43775f 100644
--- a/public/images/trainer/rival_f.json
+++ b/public/images/trainer/rival_f.json
@@ -4,8 +4,8 @@
 			"image": "rival_f.png",
 			"format": "RGBA8888",
 			"size": {
-				"w": 69,
-				"h": 69
+				"w": 70,
+				"h": 70
 			},
 			"scale": 1,
 			"frames": [
@@ -14,20 +14,20 @@
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
-						"w": 27,
-						"h": 69
+						"w": 34,
+						"h": 70
 					},
 					"spriteSourceSize": {
 						"x": 0,
 						"y": 0,
-						"w": 27,
-						"h": 69
+						"w": 34,
+						"h": 70
 					},
 					"frame": {
 						"x": 0,
 						"y": 0,
-						"w": 27,
-						"h": 69
+						"w": 34,
+						"h": 70
 					}
 				}
 			]
@@ -36,6 +36,6 @@
 	"meta": {
 		"app": "https://www.codeandweb.com/texturepacker",
 		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:5f971489695d808dd4a75244472baa7a:5390e2006b9312c8b6d7c2f5a93a3dad:0aaa288a75ecf87b6647cbb7fd0d2ecc$"
+		"smartupdate": "$TexturePacker:SmartUpdate:a07691f467812936b78163f5b41ce7b0:aa607acae9b3e07917a4a3ac767ee1d6:0aaa288a75ecf87b6647cbb7fd0d2ecc$"
 	}
 }
diff --git a/public/images/trainer/rival_f.png b/public/images/trainer/rival_f.png
index b244076da83..2495192d1fc 100644
Binary files a/public/images/trainer/rival_f.png and b/public/images/trainer/rival_f.png differ
diff --git a/public/images/trainer/rival_m.json b/public/images/trainer/rival_m.json
index db9e53a2582..9e6f48eaa14 100644
--- a/public/images/trainer/rival_m.json
+++ b/public/images/trainer/rival_m.json
@@ -4,8 +4,8 @@
 			"image": "rival_m.png",
 			"format": "RGBA8888",
 			"size": {
-				"w": 73,
-				"h": 73
+				"w": 69,
+				"h": 69
 			},
 			"scale": 1,
 			"frames": [
@@ -14,20 +14,20 @@
 					"rotated": false,
 					"trimmed": false,
 					"sourceSize": {
-						"w": 34,
-						"h": 73
+						"w": 41,
+						"h": 69
 					},
 					"spriteSourceSize": {
 						"x": 0,
 						"y": 0,
-						"w": 34,
-						"h": 73
+						"w": 41,
+						"h": 69
 					},
 					"frame": {
 						"x": 0,
 						"y": 0,
-						"w": 34,
-						"h": 73
+						"w": 41,
+						"h": 69
 					}
 				}
 			]
@@ -36,6 +36,6 @@
 	"meta": {
 		"app": "https://www.codeandweb.com/texturepacker",
 		"version": "3.0",
-		"smartupdate": "$TexturePacker:SmartUpdate:4c2a08a8a0acbbe63d0adb2453b1990b:81d51f69c08909cd8d28932a6c1b4f71:7ef6104245066e3b4078d0f6ef5e5edf$"
+		"smartupdate": "$TexturePacker:SmartUpdate:0ce2f748ed22ae690182d71c0d1abf8c:cf0bfa9654caf4297c79dd85ad92877c:7ef6104245066e3b4078d0f6ef5e5edf$"
 	}
 }
diff --git a/public/images/trainer/rival_m.png b/public/images/trainer/rival_m.png
index 935c7b8ba1b..86e4bfac879 100644
Binary files a/public/images/trainer/rival_m.png and b/public/images/trainer/rival_m.png differ
diff --git a/src/data/trainer-config.ts b/src/data/trainer-config.ts
index a0e066f50ac..70a77b2a208 100644
--- a/src/data/trainer-config.ts
+++ b/src/data/trainer-config.ts
@@ -737,24 +737,24 @@ export const trainerConfigs: TrainerConfigs = {
   [TrainerType.NEMONA]: new TrainerConfig(++t).initForChampion([ Species.LYCANROC, Species.KORAIDON, Species.KOMMO_O, Species.PAWMOT, Species.DUSKNOIR ]),
   [TrainerType.KIERAN]: new TrainerConfig(++t).initForChampion([ Species.POLITOED, Species.TERAPAGOS, Species.HYDRAPPLE, Species.PORYGON_Z, Species.GRIMMSNARL ]),
 
-  [TrainerType.RIVAL]: new TrainerConfig((t = TrainerType.RIVAL)).setName('Kyle').setHasGenders('Amber').setTitle('Rival').setStaticParty().setEncounterBgm(TrainerType.RIVAL).setBattleBgm('battle_rival').setPartyTemplates(trainerPartyTemplates.RIVAL)
+  [TrainerType.RIVAL]: new TrainerConfig((t = TrainerType.RIVAL)).setName('Finn').setHasGenders('Ivy').setTitle('Rival').setStaticParty().setEncounterBgm(TrainerType.RIVAL).setBattleBgm('battle_rival').setPartyTemplates(trainerPartyTemplates.RIVAL)
     .setModifierRewardFuncs(() => modifierTypes.SUPER_EXP_CHARM, () => modifierTypes.EXP_SHARE).setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.BULBASAUR, Species.CHARMANDER, Species.SQUIRTLE, Species.CHIKORITA, Species.CYNDAQUIL, Species.TOTODILE, Species.TREECKO, Species.TORCHIC, Species.MUDKIP, Species.TURTWIG, Species.CHIMCHAR, Species.PIPLUP, Species.SNIVY, Species.TEPIG, Species.OSHAWOTT, Species.CHESPIN, Species.FENNEKIN, Species.FROAKIE, Species.ROWLET, Species.LITTEN, Species.POPPLIO, Species.GROOKEY, Species.SCORBUNNY, Species.SOBBLE, Species.SPRIGATITO, Species.FUECOCO, Species.QUAXLY ]))
     .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.PIDGEY, Species.HOOTHOOT, Species.TAILLOW, Species.STARLY, Species.PIDOVE, Species.FLETCHLING, Species.PIKIPEK, Species.ROOKIDEE, Species.WATTREL ])),
-  [TrainerType.RIVAL_2]: new TrainerConfig(++t).setName('Kyle').setHasGenders('Amber').setTitle('Rival').setStaticParty().setMoneyMultiplier(1.25).setEncounterBgm(TrainerType.RIVAL).setBattleBgm('battle_rival').setPartyTemplates(trainerPartyTemplates.RIVAL_2)
+  [TrainerType.RIVAL_2]: new TrainerConfig(++t).setName('Finn').setHasGenders('Ivy').setTitle('Rival').setStaticParty().setMoneyMultiplier(1.25).setEncounterBgm(TrainerType.RIVAL).setBattleBgm('battle_rival').setPartyTemplates(trainerPartyTemplates.RIVAL_2)
     .setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.IVYSAUR, Species.CHARMELEON, Species.WARTORTLE, Species.BAYLEEF, Species.QUILAVA, Species.CROCONAW, Species.GROVYLE, Species.COMBUSKEN, Species.MARSHTOMP, Species.GROTLE, Species.MONFERNO, Species.PRINPLUP, Species.SERVINE, Species.PIGNITE, Species.DEWOTT, Species.QUILLADIN, Species.BRAIXEN, Species.FROGADIER, Species.DARTRIX, Species.TORRACAT, Species.BRIONNE, Species.THWACKEY, Species.RABOOT, Species.DRIZZILE, Species.FLORAGATO, Species.CROCALOR, Species.QUAXWELL ]))
     .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.PIDGEOTTO, Species.HOOTHOOT, Species.TAILLOW, Species.STARAVIA, Species.TRANQUILL, Species.FLETCHINDER, Species.TRUMBEAK, Species.CORVISQUIRE, Species.WATTREL ]))
     .setPartyMemberFunc(2, getSpeciesFilterRandomPartyMemberFunc((species: PokemonSpecies) => !pokemonEvolutions.hasOwnProperty(species.speciesId) && !pokemonPrevolutions.hasOwnProperty(species.speciesId) && species.baseTotal >= 450)),
-  [TrainerType.RIVAL_3]: new TrainerConfig(++t).setName('Kyle').setHasGenders('Amber').setTitle('Rival').setStaticParty().setMoneyMultiplier(1.5).setEncounterBgm(TrainerType.RIVAL).setBattleBgm('battle_rival').setPartyTemplates(trainerPartyTemplates.RIVAL_3)
+  [TrainerType.RIVAL_3]: new TrainerConfig(++t).setName('Finn').setHasGenders('Ivy').setTitle('Rival').setStaticParty().setMoneyMultiplier(1.5).setEncounterBgm(TrainerType.RIVAL).setBattleBgm('battle_rival').setPartyTemplates(trainerPartyTemplates.RIVAL_3)
     .setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.VENUSAUR, Species.CHARIZARD, Species.BLASTOISE, Species.MEGANIUM, Species.TYPHLOSION, Species.FERALIGATR, Species.SCEPTILE, Species.BLAZIKEN, Species.SWAMPERT, Species.TORTERRA, Species.INFERNAPE, Species.EMPOLEON, Species.SERPERIOR, Species.EMBOAR, Species.SAMUROTT, Species.CHESNAUGHT, Species.DELPHOX, Species.GRENINJA, Species.DECIDUEYE, Species.INCINEROAR, Species.PRIMARINA, Species.RILLABOOM, Species.CINDERACE, Species.INTELEON, Species.MEOWSCARADA, Species.SKELEDIRGE, Species.QUAQUAVAL ]))
     .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.PIDGEOT, Species.NOCTOWL, Species.SWELLOW, Species.STARAPTOR, Species.UNFEZANT, Species.TALONFLAME, Species.TOUCANNON, Species.CORVIKNIGHT, Species.KILOWATTREL ]))
     .setPartyMemberFunc(2, getSpeciesFilterRandomPartyMemberFunc((species: PokemonSpecies) => !pokemonEvolutions.hasOwnProperty(species.speciesId) && !pokemonPrevolutions.hasOwnProperty(species.speciesId) && species.baseTotal >= 450))
     .setSpeciesFilter(species => species.baseTotal >= 540),
-  [TrainerType.RIVAL_4]: new TrainerConfig(++t).setName('Kyle').setHasGenders('Amber').setTitle('Rival').setBoss().setStaticParty().setMoneyMultiplier(1.75).setEncounterBgm(TrainerType.RIVAL).setBattleBgm('battle_rival_2').setPartyTemplates(trainerPartyTemplates.RIVAL_4)
+  [TrainerType.RIVAL_4]: new TrainerConfig(++t).setName('Finn').setHasGenders('Ivy').setTitle('Rival').setBoss().setStaticParty().setMoneyMultiplier(1.75).setEncounterBgm(TrainerType.RIVAL).setBattleBgm('battle_rival_2').setPartyTemplates(trainerPartyTemplates.RIVAL_4)
     .setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.VENUSAUR, Species.CHARIZARD, Species.BLASTOISE, Species.MEGANIUM, Species.TYPHLOSION, Species.FERALIGATR, Species.SCEPTILE, Species.BLAZIKEN, Species.SWAMPERT, Species.TORTERRA, Species.INFERNAPE, Species.EMPOLEON, Species.SERPERIOR, Species.EMBOAR, Species.SAMUROTT, Species.CHESNAUGHT, Species.DELPHOX, Species.GRENINJA, Species.DECIDUEYE, Species.INCINEROAR, Species.PRIMARINA, Species.RILLABOOM, Species.CINDERACE, Species.INTELEON, Species.MEOWSCARADA, Species.SKELEDIRGE, Species.QUAQUAVAL ]))
     .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.PIDGEOT, Species.NOCTOWL, Species.SWELLOW, Species.STARAPTOR, Species.UNFEZANT, Species.TALONFLAME, Species.TOUCANNON, Species.CORVIKNIGHT, Species.KILOWATTREL ]))
     .setPartyMemberFunc(2, getSpeciesFilterRandomPartyMemberFunc((species: PokemonSpecies) => !pokemonEvolutions.hasOwnProperty(species.speciesId) && !pokemonPrevolutions.hasOwnProperty(species.speciesId) && species.baseTotal >= 450))
     .setSpeciesFilter(species => species.baseTotal >= 540),
-  [TrainerType.RIVAL_5]: new TrainerConfig(++t).setName('Kyle').setHasGenders('Amber').setTitle('Rival').setBoss().setStaticParty().setMoneyMultiplier(2.25).setEncounterBgm(TrainerType.RIVAL).setBattleBgm('battle_rival_3').setPartyTemplates(trainerPartyTemplates.RIVAL_5)
+  [TrainerType.RIVAL_5]: new TrainerConfig(++t).setName('Finn').setHasGenders('Ivy').setTitle('Rival').setBoss().setStaticParty().setMoneyMultiplier(2.25).setEncounterBgm(TrainerType.RIVAL).setBattleBgm('battle_rival_3').setPartyTemplates(trainerPartyTemplates.RIVAL_5)
     .setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.VENUSAUR, Species.CHARIZARD, Species.BLASTOISE, Species.MEGANIUM, Species.TYPHLOSION, Species.FERALIGATR, Species.SCEPTILE, Species.BLAZIKEN, Species.SWAMPERT, Species.TORTERRA, Species.INFERNAPE, Species.EMPOLEON, Species.SERPERIOR, Species.EMBOAR, Species.SAMUROTT, Species.CHESNAUGHT, Species.DELPHOX, Species.GRENINJA, Species.DECIDUEYE, Species.INCINEROAR, Species.PRIMARINA, Species.RILLABOOM, Species.CINDERACE, Species.INTELEON, Species.MEOWSCARADA, Species.SKELEDIRGE, Species.QUAQUAVAL ]))
     .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.PIDGEOT, Species.NOCTOWL, Species.SWELLOW, Species.STARAPTOR, Species.UNFEZANT, Species.TALONFLAME, Species.TOUCANNON, Species.CORVIKNIGHT, Species.KILOWATTREL ]))
     .setPartyMemberFunc(2, getSpeciesFilterRandomPartyMemberFunc((species: PokemonSpecies) => !pokemonEvolutions.hasOwnProperty(species.speciesId) && !pokemonPrevolutions.hasOwnProperty(species.speciesId) && species.baseTotal >= 450))
@@ -763,7 +763,7 @@ export const trainerConfigs: TrainerConfigs = {
       p.setBoss();
       p.pokeball = PokeballType.MASTER_BALL;
     })),
-  [TrainerType.RIVAL_6]: new TrainerConfig(++t).setName('Kyle').setHasGenders('Amber').setTitle('Rival').setBoss().setStaticParty().setMoneyMultiplier(3).setEncounterBgm('final').setBattleBgm('battle_rival_3').setPartyTemplates(trainerPartyTemplates.RIVAL_6)
+  [TrainerType.RIVAL_6]: new TrainerConfig(++t).setName('Finn').setHasGenders('Ivy').setTitle('Rival').setBoss().setStaticParty().setMoneyMultiplier(3).setEncounterBgm('final').setBattleBgm('battle_rival_3').setPartyTemplates(trainerPartyTemplates.RIVAL_6)
     .setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.VENUSAUR, Species.CHARIZARD, Species.BLASTOISE, Species.MEGANIUM, Species.TYPHLOSION, Species.FERALIGATR, Species.SCEPTILE, Species.BLAZIKEN, Species.SWAMPERT, Species.TORTERRA, Species.INFERNAPE, Species.EMPOLEON, Species.SERPERIOR, Species.EMBOAR, Species.SAMUROTT, Species.CHESNAUGHT, Species.DELPHOX, Species.GRENINJA, Species.DECIDUEYE, Species.INCINEROAR, Species.PRIMARINA, Species.RILLABOOM, Species.CINDERACE, Species.INTELEON ]))
     .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.PIDGEOT, Species.NOCTOWL, Species.SWELLOW, Species.STARAPTOR, Species.UNFEZANT, Species.TALONFLAME, Species.TOUCANNON, Species.CORVIKNIGHT ]))
     .setPartyMemberFunc(2, getSpeciesFilterRandomPartyMemberFunc((species: PokemonSpecies) => !pokemonEvolutions.hasOwnProperty(species.speciesId) && !pokemonPrevolutions.hasOwnProperty(species.speciesId) && species.baseTotal >= 450))