diff --git a/package-lock.json b/package-lock.json
index 64b62996dc8..971715d241a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "pokemon-rogue-battle",
-  "version": "1.8.2",
+  "version": "1.8.3",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "pokemon-rogue-battle",
-      "version": "1.8.2",
+      "version": "1.8.3",
       "hasInstallScript": true,
       "dependencies": {
         "@material/material-color-utilities": "^0.2.7",
diff --git a/package.json b/package.json
index e395e8d2a54..199a77449a2 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "pokemon-rogue-battle",
   "private": true,
-  "version": "1.8.2",
+  "version": "1.8.3",
   "type": "module",
   "scripts": {
     "start": "vite",
diff --git a/public/images/pokemon/890-eternamax.json b/public/images/pokemon/890-eternamax.json
index 70a327ef22c..98cb6f20446 100644
--- a/public/images/pokemon/890-eternamax.json
+++ b/public/images/pokemon/890-eternamax.json
@@ -1,20 +1,755 @@
-{ "frames": [
-   {
-    "filename": "0001.png",
-    "frame": { "x": 0, "y": 0, "w": 96, "h": 98 },
-    "rotated": false,
-    "trimmed": false,
-    "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 98 },
-    "sourceSize": { "w": 96, "h": 98 },
-    "duration": 100
-   }
- ],
- "meta": {
-  "app": "https://www.aseprite.org/",
-  "version": "1.3.13-x64",
-  "image": "890-eternamax.png",
-  "format": "RGBA8888",
-  "size": { "w": 96, "h": 98 },
-  "scale": "1"
- }
+{
+	"textures": [
+		{
+			"image": "890-eternamax.png",
+			"format": "RGBA8888",
+			"size": {
+				"w": 579,
+				"h": 579
+			},
+			"scale": 1,
+			"frames": [
+				{
+					"filename": "0035.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 9,
+						"w": 100,
+						"h": 98
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 100,
+						"h": 98
+					}
+				},
+				{
+					"filename": "0031.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 8,
+						"w": 95,
+						"h": 100
+					},
+					"frame": {
+						"x": 100,
+						"y": 0,
+						"w": 95,
+						"h": 100
+					}
+				},
+				{
+					"filename": "0029.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 11,
+						"y": 8,
+						"w": 91,
+						"h": 100
+					},
+					"frame": {
+						"x": 0,
+						"y": 98,
+						"w": 91,
+						"h": 100
+					}
+				},
+				{
+					"filename": "0001.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 9,
+						"w": 96,
+						"h": 98
+					},
+					"frame": {
+						"x": 91,
+						"y": 100,
+						"w": 96,
+						"h": 98
+					}
+				},
+				{
+					"filename": "0032.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 9,
+						"w": 95,
+						"h": 99
+					},
+					"frame": {
+						"x": 187,
+						"y": 100,
+						"w": 95,
+						"h": 99
+					}
+				},
+				{
+					"filename": "0030.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 9,
+						"y": 10,
+						"w": 91,
+						"h": 98
+					},
+					"frame": {
+						"x": 0,
+						"y": 198,
+						"w": 91,
+						"h": 98
+					}
+				},
+				{
+					"filename": "0007.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 11,
+						"y": 10,
+						"w": 88,
+						"h": 98
+					},
+					"frame": {
+						"x": 91,
+						"y": 198,
+						"w": 88,
+						"h": 98
+					}
+				},
+				{
+					"filename": "0002.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 10,
+						"w": 95,
+						"h": 97
+					},
+					"frame": {
+						"x": 195,
+						"y": 0,
+						"w": 95,
+						"h": 97
+					}
+				},
+				{
+					"filename": "0003.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 11,
+						"w": 95,
+						"h": 97
+					},
+					"frame": {
+						"x": 179,
+						"y": 199,
+						"w": 95,
+						"h": 97
+					}
+				},
+				{
+					"filename": "0004.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 11,
+						"w": 95,
+						"h": 97
+					},
+					"frame": {
+						"x": 274,
+						"y": 199,
+						"w": 95,
+						"h": 97
+					}
+				},
+				{
+					"filename": "0033.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 11,
+						"w": 95,
+						"h": 97
+					},
+					"frame": {
+						"x": 290,
+						"y": 0,
+						"w": 95,
+						"h": 97
+					}
+				},
+				{
+					"filename": "0034.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 11,
+						"w": 94,
+						"h": 96
+					},
+					"frame": {
+						"x": 282,
+						"y": 97,
+						"w": 94,
+						"h": 96
+					}
+				},
+				{
+					"filename": "0028.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 11,
+						"y": 11,
+						"w": 90,
+						"h": 97
+					},
+					"frame": {
+						"x": 369,
+						"y": 193,
+						"w": 90,
+						"h": 97
+					}
+				},
+				{
+					"filename": "0005.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 13,
+						"w": 93,
+						"h": 95
+					},
+					"frame": {
+						"x": 385,
+						"y": 0,
+						"w": 93,
+						"h": 95
+					}
+				},
+				{
+					"filename": "0017.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 13,
+						"y": 9,
+						"w": 91,
+						"h": 96
+					},
+					"frame": {
+						"x": 385,
+						"y": 95,
+						"w": 91,
+						"h": 96
+					}
+				},
+				{
+					"filename": "0008.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 12,
+						"y": 11,
+						"w": 87,
+						"h": 97
+					},
+					"frame": {
+						"x": 369,
+						"y": 290,
+						"w": 87,
+						"h": 97
+					}
+				},
+				{
+					"filename": "0009.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 11,
+						"y": 12,
+						"w": 90,
+						"h": 96
+					},
+					"frame": {
+						"x": 456,
+						"y": 290,
+						"w": 90,
+						"h": 96
+					}
+				},
+				{
+					"filename": "0015.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 12,
+						"y": 8,
+						"w": 90,
+						"h": 96
+					},
+					"frame": {
+						"x": 459,
+						"y": 191,
+						"w": 90,
+						"h": 96
+					}
+				},
+				{
+					"filename": "0016.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 13,
+						"y": 8,
+						"w": 90,
+						"h": 95
+					},
+					"frame": {
+						"x": 476,
+						"y": 95,
+						"w": 90,
+						"h": 95
+					}
+				},
+				{
+					"filename": "0014.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 12,
+						"y": 11,
+						"w": 89,
+						"h": 95
+					},
+					"frame": {
+						"x": 478,
+						"y": 0,
+						"w": 89,
+						"h": 95
+					}
+				},
+				{
+					"filename": "0027.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 11,
+						"y": 12,
+						"w": 89,
+						"h": 96
+					},
+					"frame": {
+						"x": 456,
+						"y": 386,
+						"w": 89,
+						"h": 96
+					}
+				},
+				{
+					"filename": "0025.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 11,
+						"y": 11,
+						"w": 89,
+						"h": 95
+					},
+					"frame": {
+						"x": 0,
+						"y": 296,
+						"w": 89,
+						"h": 95
+					}
+				},
+				{
+					"filename": "0006.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 9,
+						"y": 14,
+						"w": 89,
+						"h": 94
+					},
+					"frame": {
+						"x": 89,
+						"y": 296,
+						"w": 89,
+						"h": 94
+					}
+				},
+				{
+					"filename": "0011.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 12,
+						"y": 11,
+						"w": 88,
+						"h": 95
+					},
+					"frame": {
+						"x": 178,
+						"y": 296,
+						"w": 88,
+						"h": 95
+					}
+				},
+				{
+					"filename": "0023.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 12,
+						"y": 11,
+						"w": 87,
+						"h": 95
+					},
+					"frame": {
+						"x": 89,
+						"y": 390,
+						"w": 87,
+						"h": 95
+					}
+				},
+				{
+					"filename": "0013.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 11,
+						"y": 12,
+						"w": 89,
+						"h": 94
+					},
+					"frame": {
+						"x": 0,
+						"y": 391,
+						"w": 89,
+						"h": 94
+					}
+				},
+				{
+					"filename": "0012.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 11,
+						"y": 14,
+						"w": 89,
+						"h": 93
+					},
+					"frame": {
+						"x": 266,
+						"y": 387,
+						"w": 89,
+						"h": 93
+					}
+				},
+				{
+					"filename": "0019.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 16,
+						"y": 13,
+						"w": 85,
+						"h": 91
+					},
+					"frame": {
+						"x": 266,
+						"y": 296,
+						"w": 85,
+						"h": 91
+					}
+				},
+				{
+					"filename": "0024.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 11,
+						"y": 13,
+						"w": 88,
+						"h": 94
+					},
+					"frame": {
+						"x": 176,
+						"y": 391,
+						"w": 88,
+						"h": 94
+					}
+				},
+				{
+					"filename": "0010.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 12,
+						"y": 13,
+						"w": 87,
+						"h": 94
+					},
+					"frame": {
+						"x": 355,
+						"y": 387,
+						"w": 87,
+						"h": 94
+					}
+				},
+				{
+					"filename": "0018.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 16,
+						"y": 11,
+						"w": 87,
+						"h": 94
+					},
+					"frame": {
+						"x": 264,
+						"y": 480,
+						"w": 87,
+						"h": 94
+					}
+				},
+				{
+					"filename": "0026.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 11,
+						"y": 14,
+						"w": 89,
+						"h": 93
+					},
+					"frame": {
+						"x": 351,
+						"y": 481,
+						"w": 89,
+						"h": 93
+					}
+				},
+				{
+					"filename": "0022.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 12,
+						"y": 11,
+						"w": 87,
+						"h": 93
+					},
+					"frame": {
+						"x": 440,
+						"y": 482,
+						"w": 87,
+						"h": 93
+					}
+				},
+				{
+					"filename": "0021.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 13,
+						"y": 10,
+						"w": 86,
+						"h": 94
+					},
+					"frame": {
+						"x": 0,
+						"y": 485,
+						"w": 86,
+						"h": 94
+					}
+				},
+				{
+					"filename": "0020.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 13,
+						"y": 14,
+						"w": 85,
+						"h": 91
+					},
+					"frame": {
+						"x": 86,
+						"y": 485,
+						"w": 85,
+						"h": 91
+					}
+				}
+			]
+		}
+	],
+	"meta": {
+		"app": "https://www.codeandweb.com/texturepacker",
+		"version": "3.0",
+		"smartupdate": "$TexturePacker:SmartUpdate:8fd9e1830200ec8e4aac8571cc2d27a6:c966e3efce03c7bae43d7bca6d6dfa62:cedd2711a12bbacba5623505fe88bd92$"
+	}
 }
diff --git a/public/images/pokemon/890-eternamax.png b/public/images/pokemon/890-eternamax.png
index a1cf684c026..33c8f5f9631 100644
Binary files a/public/images/pokemon/890-eternamax.png and b/public/images/pokemon/890-eternamax.png differ
diff --git a/public/images/pokemon/shiny/890-eternamax.json b/public/images/pokemon/shiny/890-eternamax.json
index 39c1d175c8c..26813186ba8 100644
--- a/public/images/pokemon/shiny/890-eternamax.json
+++ b/public/images/pokemon/shiny/890-eternamax.json
@@ -1,20 +1,755 @@
-{ "frames": [
-   {
-    "filename": "0001.png",
-    "frame": { "x": 1, "y": 1, "w": 92, "h": 94 },
-    "rotated": false,
-    "trimmed": true,
-    "spriteSourceSize": { "x": 3, "y": 1, "w": 92, "h": 94 },
-    "sourceSize": { "w": 96, "h": 98 },
-    "duration": 100
-   }
- ],
- "meta": {
-  "app": "https://www.aseprite.org/",
-  "version": "1.3.13-x64",
-  "image": "890-eternamax.png",
-  "format": "RGBA8888",
-  "size": { "w": 94, "h": 96 },
-  "scale": "1"
- }
+{
+	"textures": [
+		{
+			"image": "890-eternamax.png",
+			"format": "RGBA8888",
+			"size": {
+				"w": 579,
+				"h": 579
+			},
+			"scale": 1,
+			"frames": [
+				{
+					"filename": "0035.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 9,
+						"w": 100,
+						"h": 98
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 100,
+						"h": 98
+					}
+				},
+				{
+					"filename": "0031.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 8,
+						"w": 95,
+						"h": 100
+					},
+					"frame": {
+						"x": 100,
+						"y": 0,
+						"w": 95,
+						"h": 100
+					}
+				},
+				{
+					"filename": "0029.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 11,
+						"y": 8,
+						"w": 91,
+						"h": 100
+					},
+					"frame": {
+						"x": 0,
+						"y": 98,
+						"w": 91,
+						"h": 100
+					}
+				},
+				{
+					"filename": "0001.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 9,
+						"w": 96,
+						"h": 98
+					},
+					"frame": {
+						"x": 91,
+						"y": 100,
+						"w": 96,
+						"h": 98
+					}
+				},
+				{
+					"filename": "0032.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 9,
+						"w": 95,
+						"h": 99
+					},
+					"frame": {
+						"x": 187,
+						"y": 100,
+						"w": 95,
+						"h": 99
+					}
+				},
+				{
+					"filename": "0030.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 9,
+						"y": 10,
+						"w": 91,
+						"h": 98
+					},
+					"frame": {
+						"x": 0,
+						"y": 198,
+						"w": 91,
+						"h": 98
+					}
+				},
+				{
+					"filename": "0007.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 11,
+						"y": 10,
+						"w": 88,
+						"h": 98
+					},
+					"frame": {
+						"x": 91,
+						"y": 198,
+						"w": 88,
+						"h": 98
+					}
+				},
+				{
+					"filename": "0002.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 10,
+						"w": 95,
+						"h": 97
+					},
+					"frame": {
+						"x": 195,
+						"y": 0,
+						"w": 95,
+						"h": 97
+					}
+				},
+				{
+					"filename": "0003.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 11,
+						"w": 95,
+						"h": 97
+					},
+					"frame": {
+						"x": 179,
+						"y": 199,
+						"w": 95,
+						"h": 97
+					}
+				},
+				{
+					"filename": "0004.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 11,
+						"w": 95,
+						"h": 97
+					},
+					"frame": {
+						"x": 274,
+						"y": 199,
+						"w": 95,
+						"h": 97
+					}
+				},
+				{
+					"filename": "0033.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 11,
+						"w": 95,
+						"h": 97
+					},
+					"frame": {
+						"x": 290,
+						"y": 0,
+						"w": 95,
+						"h": 97
+					}
+				},
+				{
+					"filename": "0034.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 11,
+						"w": 94,
+						"h": 96
+					},
+					"frame": {
+						"x": 282,
+						"y": 97,
+						"w": 94,
+						"h": 96
+					}
+				},
+				{
+					"filename": "0028.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 11,
+						"y": 11,
+						"w": 90,
+						"h": 97
+					},
+					"frame": {
+						"x": 369,
+						"y": 193,
+						"w": 90,
+						"h": 97
+					}
+				},
+				{
+					"filename": "0005.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 13,
+						"w": 93,
+						"h": 95
+					},
+					"frame": {
+						"x": 385,
+						"y": 0,
+						"w": 93,
+						"h": 95
+					}
+				},
+				{
+					"filename": "0017.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 13,
+						"y": 9,
+						"w": 91,
+						"h": 96
+					},
+					"frame": {
+						"x": 385,
+						"y": 95,
+						"w": 91,
+						"h": 96
+					}
+				},
+				{
+					"filename": "0008.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 12,
+						"y": 11,
+						"w": 87,
+						"h": 97
+					},
+					"frame": {
+						"x": 369,
+						"y": 290,
+						"w": 87,
+						"h": 97
+					}
+				},
+				{
+					"filename": "0009.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 11,
+						"y": 12,
+						"w": 90,
+						"h": 96
+					},
+					"frame": {
+						"x": 456,
+						"y": 290,
+						"w": 90,
+						"h": 96
+					}
+				},
+				{
+					"filename": "0015.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 12,
+						"y": 8,
+						"w": 90,
+						"h": 96
+					},
+					"frame": {
+						"x": 459,
+						"y": 191,
+						"w": 90,
+						"h": 96
+					}
+				},
+				{
+					"filename": "0016.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 13,
+						"y": 8,
+						"w": 90,
+						"h": 95
+					},
+					"frame": {
+						"x": 476,
+						"y": 95,
+						"w": 90,
+						"h": 95
+					}
+				},
+				{
+					"filename": "0014.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 12,
+						"y": 11,
+						"w": 89,
+						"h": 95
+					},
+					"frame": {
+						"x": 478,
+						"y": 0,
+						"w": 89,
+						"h": 95
+					}
+				},
+				{
+					"filename": "0027.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 11,
+						"y": 12,
+						"w": 89,
+						"h": 96
+					},
+					"frame": {
+						"x": 456,
+						"y": 386,
+						"w": 89,
+						"h": 96
+					}
+				},
+				{
+					"filename": "0025.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 11,
+						"y": 11,
+						"w": 89,
+						"h": 95
+					},
+					"frame": {
+						"x": 0,
+						"y": 296,
+						"w": 89,
+						"h": 95
+					}
+				},
+				{
+					"filename": "0006.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 9,
+						"y": 14,
+						"w": 89,
+						"h": 94
+					},
+					"frame": {
+						"x": 89,
+						"y": 296,
+						"w": 89,
+						"h": 94
+					}
+				},
+				{
+					"filename": "0011.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 12,
+						"y": 11,
+						"w": 88,
+						"h": 95
+					},
+					"frame": {
+						"x": 178,
+						"y": 296,
+						"w": 88,
+						"h": 95
+					}
+				},
+				{
+					"filename": "0023.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 12,
+						"y": 11,
+						"w": 87,
+						"h": 95
+					},
+					"frame": {
+						"x": 89,
+						"y": 390,
+						"w": 87,
+						"h": 95
+					}
+				},
+				{
+					"filename": "0013.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 11,
+						"y": 12,
+						"w": 89,
+						"h": 94
+					},
+					"frame": {
+						"x": 0,
+						"y": 391,
+						"w": 89,
+						"h": 94
+					}
+				},
+				{
+					"filename": "0012.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 11,
+						"y": 14,
+						"w": 89,
+						"h": 93
+					},
+					"frame": {
+						"x": 266,
+						"y": 387,
+						"w": 89,
+						"h": 93
+					}
+				},
+				{
+					"filename": "0019.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 16,
+						"y": 13,
+						"w": 85,
+						"h": 91
+					},
+					"frame": {
+						"x": 266,
+						"y": 296,
+						"w": 85,
+						"h": 91
+					}
+				},
+				{
+					"filename": "0024.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 11,
+						"y": 13,
+						"w": 88,
+						"h": 94
+					},
+					"frame": {
+						"x": 176,
+						"y": 391,
+						"w": 88,
+						"h": 94
+					}
+				},
+				{
+					"filename": "0010.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 12,
+						"y": 13,
+						"w": 87,
+						"h": 94
+					},
+					"frame": {
+						"x": 355,
+						"y": 387,
+						"w": 87,
+						"h": 94
+					}
+				},
+				{
+					"filename": "0018.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 16,
+						"y": 11,
+						"w": 87,
+						"h": 94
+					},
+					"frame": {
+						"x": 264,
+						"y": 480,
+						"w": 87,
+						"h": 94
+					}
+				},
+				{
+					"filename": "0026.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 11,
+						"y": 14,
+						"w": 89,
+						"h": 93
+					},
+					"frame": {
+						"x": 351,
+						"y": 481,
+						"w": 89,
+						"h": 93
+					}
+				},
+				{
+					"filename": "0022.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 12,
+						"y": 11,
+						"w": 87,
+						"h": 93
+					},
+					"frame": {
+						"x": 440,
+						"y": 482,
+						"w": 87,
+						"h": 93
+					}
+				},
+				{
+					"filename": "0021.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 13,
+						"y": 10,
+						"w": 86,
+						"h": 94
+					},
+					"frame": {
+						"x": 0,
+						"y": 485,
+						"w": 86,
+						"h": 94
+					}
+				},
+				{
+					"filename": "0020.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 13,
+						"y": 14,
+						"w": 85,
+						"h": 91
+					},
+					"frame": {
+						"x": 86,
+						"y": 485,
+						"w": 85,
+						"h": 91
+					}
+				}
+			]
+		}
+	],
+	"meta": {
+		"app": "https://www.codeandweb.com/texturepacker",
+		"version": "3.0",
+		"smartupdate": "$TexturePacker:SmartUpdate:1eb3f67ba4e434995b4589c97560f1be:539129d777c30d08fa799dcebaeb523e:cf277fd83435e8c90cd46073c543568b$"
+	}
 }
diff --git a/public/images/pokemon/shiny/890-eternamax.png b/public/images/pokemon/shiny/890-eternamax.png
index 8e493b12f3e..3e7b5c1721f 100644
Binary files a/public/images/pokemon/shiny/890-eternamax.png and b/public/images/pokemon/shiny/890-eternamax.png differ
diff --git a/public/images/pokemon/variant/890-eternamax_2.json b/public/images/pokemon/variant/890-eternamax_2.json
index de0107b9854..895a2f27841 100644
--- a/public/images/pokemon/variant/890-eternamax_2.json
+++ b/public/images/pokemon/variant/890-eternamax_2.json
@@ -1,20 +1,755 @@
-{ "frames": [
-   {
-    "filename": "0001.png",
-    "frame": { "x": 1, "y": 1, "w": 92, "h": 94 },
-    "rotated": false,
-    "trimmed": true,
-    "spriteSourceSize": { "x": 3, "y": 1, "w": 92, "h": 94 },
-    "sourceSize": { "w": 96, "h": 98 },
-    "duration": 100
-   }
- ],
- "meta": {
-  "app": "https://www.aseprite.org/",
-  "version": "1.3.13-x64",
-  "image": "890-eternamax_2.png",
-  "format": "RGBA8888",
-  "size": { "w": 94, "h": 96 },
-  "scale": "1"
- }
-}
+{
+	"textures": [
+		{
+			"image": "890-eternamax_2.png",
+			"format": "RGBA8888",
+			"size": {
+				"w": 579,
+				"h": 579
+			},
+			"scale": 1,
+			"frames": [
+				{
+					"filename": "0035.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 9,
+						"w": 100,
+						"h": 98
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 100,
+						"h": 98
+					}
+				},
+				{
+					"filename": "0031.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 8,
+						"w": 95,
+						"h": 100
+					},
+					"frame": {
+						"x": 100,
+						"y": 0,
+						"w": 95,
+						"h": 100
+					}
+				},
+				{
+					"filename": "0029.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 11,
+						"y": 8,
+						"w": 91,
+						"h": 100
+					},
+					"frame": {
+						"x": 0,
+						"y": 98,
+						"w": 91,
+						"h": 100
+					}
+				},
+				{
+					"filename": "0001.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 9,
+						"w": 96,
+						"h": 98
+					},
+					"frame": {
+						"x": 91,
+						"y": 100,
+						"w": 96,
+						"h": 98
+					}
+				},
+				{
+					"filename": "0032.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 9,
+						"w": 95,
+						"h": 99
+					},
+					"frame": {
+						"x": 187,
+						"y": 100,
+						"w": 95,
+						"h": 99
+					}
+				},
+				{
+					"filename": "0030.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 9,
+						"y": 10,
+						"w": 91,
+						"h": 98
+					},
+					"frame": {
+						"x": 0,
+						"y": 198,
+						"w": 91,
+						"h": 98
+					}
+				},
+				{
+					"filename": "0007.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 11,
+						"y": 10,
+						"w": 88,
+						"h": 98
+					},
+					"frame": {
+						"x": 91,
+						"y": 198,
+						"w": 88,
+						"h": 98
+					}
+				},
+				{
+					"filename": "0002.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 10,
+						"w": 95,
+						"h": 97
+					},
+					"frame": {
+						"x": 195,
+						"y": 0,
+						"w": 95,
+						"h": 97
+					}
+				},
+				{
+					"filename": "0003.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 11,
+						"w": 95,
+						"h": 97
+					},
+					"frame": {
+						"x": 179,
+						"y": 199,
+						"w": 95,
+						"h": 97
+					}
+				},
+				{
+					"filename": "0004.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 11,
+						"w": 95,
+						"h": 97
+					},
+					"frame": {
+						"x": 274,
+						"y": 199,
+						"w": 95,
+						"h": 97
+					}
+				},
+				{
+					"filename": "0033.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 11,
+						"w": 95,
+						"h": 97
+					},
+					"frame": {
+						"x": 290,
+						"y": 0,
+						"w": 95,
+						"h": 97
+					}
+				},
+				{
+					"filename": "0034.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 11,
+						"w": 94,
+						"h": 96
+					},
+					"frame": {
+						"x": 282,
+						"y": 97,
+						"w": 94,
+						"h": 96
+					}
+				},
+				{
+					"filename": "0028.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 11,
+						"y": 11,
+						"w": 90,
+						"h": 97
+					},
+					"frame": {
+						"x": 369,
+						"y": 193,
+						"w": 90,
+						"h": 97
+					}
+				},
+				{
+					"filename": "0005.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 13,
+						"w": 93,
+						"h": 95
+					},
+					"frame": {
+						"x": 385,
+						"y": 0,
+						"w": 93,
+						"h": 95
+					}
+				},
+				{
+					"filename": "0017.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 13,
+						"y": 9,
+						"w": 91,
+						"h": 96
+					},
+					"frame": {
+						"x": 385,
+						"y": 95,
+						"w": 91,
+						"h": 96
+					}
+				},
+				{
+					"filename": "0008.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 12,
+						"y": 11,
+						"w": 87,
+						"h": 97
+					},
+					"frame": {
+						"x": 369,
+						"y": 290,
+						"w": 87,
+						"h": 97
+					}
+				},
+				{
+					"filename": "0009.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 11,
+						"y": 12,
+						"w": 90,
+						"h": 96
+					},
+					"frame": {
+						"x": 456,
+						"y": 290,
+						"w": 90,
+						"h": 96
+					}
+				},
+				{
+					"filename": "0015.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 12,
+						"y": 8,
+						"w": 90,
+						"h": 96
+					},
+					"frame": {
+						"x": 459,
+						"y": 191,
+						"w": 90,
+						"h": 96
+					}
+				},
+				{
+					"filename": "0016.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 13,
+						"y": 8,
+						"w": 90,
+						"h": 95
+					},
+					"frame": {
+						"x": 476,
+						"y": 95,
+						"w": 90,
+						"h": 95
+					}
+				},
+				{
+					"filename": "0014.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 12,
+						"y": 11,
+						"w": 89,
+						"h": 95
+					},
+					"frame": {
+						"x": 478,
+						"y": 0,
+						"w": 89,
+						"h": 95
+					}
+				},
+				{
+					"filename": "0027.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 11,
+						"y": 12,
+						"w": 89,
+						"h": 96
+					},
+					"frame": {
+						"x": 456,
+						"y": 386,
+						"w": 89,
+						"h": 96
+					}
+				},
+				{
+					"filename": "0025.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 11,
+						"y": 11,
+						"w": 89,
+						"h": 95
+					},
+					"frame": {
+						"x": 0,
+						"y": 296,
+						"w": 89,
+						"h": 95
+					}
+				},
+				{
+					"filename": "0006.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 9,
+						"y": 14,
+						"w": 89,
+						"h": 94
+					},
+					"frame": {
+						"x": 89,
+						"y": 296,
+						"w": 89,
+						"h": 94
+					}
+				},
+				{
+					"filename": "0011.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 12,
+						"y": 11,
+						"w": 88,
+						"h": 95
+					},
+					"frame": {
+						"x": 178,
+						"y": 296,
+						"w": 88,
+						"h": 95
+					}
+				},
+				{
+					"filename": "0023.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 12,
+						"y": 11,
+						"w": 87,
+						"h": 95
+					},
+					"frame": {
+						"x": 89,
+						"y": 390,
+						"w": 87,
+						"h": 95
+					}
+				},
+				{
+					"filename": "0013.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 11,
+						"y": 12,
+						"w": 89,
+						"h": 94
+					},
+					"frame": {
+						"x": 0,
+						"y": 391,
+						"w": 89,
+						"h": 94
+					}
+				},
+				{
+					"filename": "0012.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 11,
+						"y": 14,
+						"w": 89,
+						"h": 93
+					},
+					"frame": {
+						"x": 266,
+						"y": 387,
+						"w": 89,
+						"h": 93
+					}
+				},
+				{
+					"filename": "0019.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 16,
+						"y": 13,
+						"w": 85,
+						"h": 91
+					},
+					"frame": {
+						"x": 266,
+						"y": 296,
+						"w": 85,
+						"h": 91
+					}
+				},
+				{
+					"filename": "0024.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 11,
+						"y": 13,
+						"w": 88,
+						"h": 94
+					},
+					"frame": {
+						"x": 176,
+						"y": 391,
+						"w": 88,
+						"h": 94
+					}
+				},
+				{
+					"filename": "0010.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 12,
+						"y": 13,
+						"w": 87,
+						"h": 94
+					},
+					"frame": {
+						"x": 355,
+						"y": 387,
+						"w": 87,
+						"h": 94
+					}
+				},
+				{
+					"filename": "0018.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 16,
+						"y": 11,
+						"w": 87,
+						"h": 94
+					},
+					"frame": {
+						"x": 264,
+						"y": 480,
+						"w": 87,
+						"h": 94
+					}
+				},
+				{
+					"filename": "0026.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 11,
+						"y": 14,
+						"w": 89,
+						"h": 93
+					},
+					"frame": {
+						"x": 351,
+						"y": 481,
+						"w": 89,
+						"h": 93
+					}
+				},
+				{
+					"filename": "0022.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 12,
+						"y": 11,
+						"w": 87,
+						"h": 93
+					},
+					"frame": {
+						"x": 440,
+						"y": 482,
+						"w": 87,
+						"h": 93
+					}
+				},
+				{
+					"filename": "0021.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 13,
+						"y": 10,
+						"w": 86,
+						"h": 94
+					},
+					"frame": {
+						"x": 0,
+						"y": 485,
+						"w": 86,
+						"h": 94
+					}
+				},
+				{
+					"filename": "0020.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 13,
+						"y": 14,
+						"w": 85,
+						"h": 91
+					},
+					"frame": {
+						"x": 86,
+						"y": 485,
+						"w": 85,
+						"h": 91
+					}
+				}
+			]
+		}
+	],
+	"meta": {
+		"app": "https://www.codeandweb.com/texturepacker",
+		"version": "3.0",
+		"smartupdate": "$TexturePacker:SmartUpdate:8fd9e1830200ec8e4aac8571cc2d27a6:c966e3efce03c7bae43d7bca6d6dfa62:cedd2711a12bbacba5623505fe88bd92$"
+	}
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/890-eternamax_2.png b/public/images/pokemon/variant/890-eternamax_2.png
index adafb2f1d35..2327900b971 100644
Binary files a/public/images/pokemon/variant/890-eternamax_2.png and b/public/images/pokemon/variant/890-eternamax_2.png differ
diff --git a/public/images/pokemon/variant/890-eternamax_3.json b/public/images/pokemon/variant/890-eternamax_3.json
index 9d3f6070a27..ecc084c689f 100644
--- a/public/images/pokemon/variant/890-eternamax_3.json
+++ b/public/images/pokemon/variant/890-eternamax_3.json
@@ -1,20 +1,755 @@
-{ "frames": [
-   {
-    "filename": "0001.png",
-    "frame": { "x": 1, "y": 1, "w": 96, "h": 98 },
-    "rotated": false,
-    "trimmed": false,
-    "spriteSourceSize": { "x": 0, "y": 0, "w": 96, "h": 98 },
-    "sourceSize": { "w": 96, "h": 98 },
-    "duration": 100
-   }
- ],
- "meta": {
-  "app": "https://www.aseprite.org/",
-  "version": "1.3.13-x64",
-  "image": "890-eternamax_3.png",
-  "format": "RGBA8888",
-  "size": { "w": 98, "h": 100 },
-  "scale": "1"
- }
-}
+{
+	"textures": [
+		{
+			"image": "890-eternamax_3.png",
+			"format": "RGBA8888",
+			"size": {
+				"w": 579,
+				"h": 579
+			},
+			"scale": 1,
+			"frames": [
+				{
+					"filename": "0035.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 9,
+						"w": 100,
+						"h": 98
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 100,
+						"h": 98
+					}
+				},
+				{
+					"filename": "0031.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 8,
+						"w": 95,
+						"h": 100
+					},
+					"frame": {
+						"x": 100,
+						"y": 0,
+						"w": 95,
+						"h": 100
+					}
+				},
+				{
+					"filename": "0029.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 11,
+						"y": 8,
+						"w": 91,
+						"h": 100
+					},
+					"frame": {
+						"x": 0,
+						"y": 98,
+						"w": 91,
+						"h": 100
+					}
+				},
+				{
+					"filename": "0001.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 9,
+						"w": 96,
+						"h": 98
+					},
+					"frame": {
+						"x": 91,
+						"y": 100,
+						"w": 96,
+						"h": 98
+					}
+				},
+				{
+					"filename": "0032.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 9,
+						"w": 95,
+						"h": 99
+					},
+					"frame": {
+						"x": 187,
+						"y": 100,
+						"w": 95,
+						"h": 99
+					}
+				},
+				{
+					"filename": "0030.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 9,
+						"y": 10,
+						"w": 91,
+						"h": 98
+					},
+					"frame": {
+						"x": 0,
+						"y": 198,
+						"w": 91,
+						"h": 98
+					}
+				},
+				{
+					"filename": "0007.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 11,
+						"y": 10,
+						"w": 88,
+						"h": 98
+					},
+					"frame": {
+						"x": 91,
+						"y": 198,
+						"w": 88,
+						"h": 98
+					}
+				},
+				{
+					"filename": "0002.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 10,
+						"w": 95,
+						"h": 97
+					},
+					"frame": {
+						"x": 195,
+						"y": 0,
+						"w": 95,
+						"h": 97
+					}
+				},
+				{
+					"filename": "0003.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 11,
+						"w": 95,
+						"h": 97
+					},
+					"frame": {
+						"x": 179,
+						"y": 199,
+						"w": 95,
+						"h": 97
+					}
+				},
+				{
+					"filename": "0004.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 11,
+						"w": 95,
+						"h": 97
+					},
+					"frame": {
+						"x": 274,
+						"y": 199,
+						"w": 95,
+						"h": 97
+					}
+				},
+				{
+					"filename": "0033.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 11,
+						"w": 95,
+						"h": 97
+					},
+					"frame": {
+						"x": 290,
+						"y": 0,
+						"w": 95,
+						"h": 97
+					}
+				},
+				{
+					"filename": "0034.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 11,
+						"w": 94,
+						"h": 96
+					},
+					"frame": {
+						"x": 282,
+						"y": 97,
+						"w": 94,
+						"h": 96
+					}
+				},
+				{
+					"filename": "0028.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 11,
+						"y": 11,
+						"w": 90,
+						"h": 97
+					},
+					"frame": {
+						"x": 369,
+						"y": 193,
+						"w": 90,
+						"h": 97
+					}
+				},
+				{
+					"filename": "0005.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 13,
+						"w": 93,
+						"h": 95
+					},
+					"frame": {
+						"x": 385,
+						"y": 0,
+						"w": 93,
+						"h": 95
+					}
+				},
+				{
+					"filename": "0017.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 13,
+						"y": 9,
+						"w": 91,
+						"h": 96
+					},
+					"frame": {
+						"x": 385,
+						"y": 95,
+						"w": 91,
+						"h": 96
+					}
+				},
+				{
+					"filename": "0008.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 12,
+						"y": 11,
+						"w": 87,
+						"h": 97
+					},
+					"frame": {
+						"x": 369,
+						"y": 290,
+						"w": 87,
+						"h": 97
+					}
+				},
+				{
+					"filename": "0009.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 11,
+						"y": 12,
+						"w": 90,
+						"h": 96
+					},
+					"frame": {
+						"x": 456,
+						"y": 290,
+						"w": 90,
+						"h": 96
+					}
+				},
+				{
+					"filename": "0015.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 12,
+						"y": 8,
+						"w": 90,
+						"h": 96
+					},
+					"frame": {
+						"x": 459,
+						"y": 191,
+						"w": 90,
+						"h": 96
+					}
+				},
+				{
+					"filename": "0016.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 13,
+						"y": 8,
+						"w": 90,
+						"h": 95
+					},
+					"frame": {
+						"x": 476,
+						"y": 95,
+						"w": 90,
+						"h": 95
+					}
+				},
+				{
+					"filename": "0014.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 12,
+						"y": 11,
+						"w": 89,
+						"h": 95
+					},
+					"frame": {
+						"x": 478,
+						"y": 0,
+						"w": 89,
+						"h": 95
+					}
+				},
+				{
+					"filename": "0027.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 11,
+						"y": 12,
+						"w": 89,
+						"h": 96
+					},
+					"frame": {
+						"x": 456,
+						"y": 386,
+						"w": 89,
+						"h": 96
+					}
+				},
+				{
+					"filename": "0025.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 11,
+						"y": 11,
+						"w": 89,
+						"h": 95
+					},
+					"frame": {
+						"x": 0,
+						"y": 296,
+						"w": 89,
+						"h": 95
+					}
+				},
+				{
+					"filename": "0006.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 9,
+						"y": 14,
+						"w": 89,
+						"h": 94
+					},
+					"frame": {
+						"x": 89,
+						"y": 296,
+						"w": 89,
+						"h": 94
+					}
+				},
+				{
+					"filename": "0011.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 12,
+						"y": 11,
+						"w": 88,
+						"h": 95
+					},
+					"frame": {
+						"x": 178,
+						"y": 296,
+						"w": 88,
+						"h": 95
+					}
+				},
+				{
+					"filename": "0023.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 12,
+						"y": 11,
+						"w": 87,
+						"h": 95
+					},
+					"frame": {
+						"x": 89,
+						"y": 390,
+						"w": 87,
+						"h": 95
+					}
+				},
+				{
+					"filename": "0013.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 11,
+						"y": 12,
+						"w": 89,
+						"h": 94
+					},
+					"frame": {
+						"x": 0,
+						"y": 391,
+						"w": 89,
+						"h": 94
+					}
+				},
+				{
+					"filename": "0012.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 11,
+						"y": 14,
+						"w": 89,
+						"h": 93
+					},
+					"frame": {
+						"x": 266,
+						"y": 387,
+						"w": 89,
+						"h": 93
+					}
+				},
+				{
+					"filename": "0019.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 16,
+						"y": 13,
+						"w": 85,
+						"h": 91
+					},
+					"frame": {
+						"x": 266,
+						"y": 296,
+						"w": 85,
+						"h": 91
+					}
+				},
+				{
+					"filename": "0024.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 11,
+						"y": 13,
+						"w": 88,
+						"h": 94
+					},
+					"frame": {
+						"x": 176,
+						"y": 391,
+						"w": 88,
+						"h": 94
+					}
+				},
+				{
+					"filename": "0010.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 12,
+						"y": 13,
+						"w": 87,
+						"h": 94
+					},
+					"frame": {
+						"x": 355,
+						"y": 387,
+						"w": 87,
+						"h": 94
+					}
+				},
+				{
+					"filename": "0018.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 16,
+						"y": 11,
+						"w": 87,
+						"h": 94
+					},
+					"frame": {
+						"x": 264,
+						"y": 480,
+						"w": 87,
+						"h": 94
+					}
+				},
+				{
+					"filename": "0026.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 11,
+						"y": 14,
+						"w": 89,
+						"h": 93
+					},
+					"frame": {
+						"x": 351,
+						"y": 481,
+						"w": 89,
+						"h": 93
+					}
+				},
+				{
+					"filename": "0022.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 12,
+						"y": 11,
+						"w": 87,
+						"h": 93
+					},
+					"frame": {
+						"x": 440,
+						"y": 482,
+						"w": 87,
+						"h": 93
+					}
+				},
+				{
+					"filename": "0021.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 13,
+						"y": 10,
+						"w": 86,
+						"h": 94
+					},
+					"frame": {
+						"x": 0,
+						"y": 485,
+						"w": 86,
+						"h": 94
+					}
+				},
+				{
+					"filename": "0020.png",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 112,
+						"h": 112
+					},
+					"spriteSourceSize": {
+						"x": 13,
+						"y": 14,
+						"w": 85,
+						"h": 91
+					},
+					"frame": {
+						"x": 86,
+						"y": 485,
+						"w": 85,
+						"h": 91
+					}
+				}
+			]
+		}
+	],
+	"meta": {
+		"app": "https://www.codeandweb.com/texturepacker",
+		"version": "3.0",
+		"smartupdate": "$TexturePacker:SmartUpdate:8fd9e1830200ec8e4aac8571cc2d27a6:c966e3efce03c7bae43d7bca6d6dfa62:cedd2711a12bbacba5623505fe88bd92$"
+	}
+}
\ No newline at end of file
diff --git a/public/images/pokemon/variant/890-eternamax_3.png b/public/images/pokemon/variant/890-eternamax_3.png
index 21a3e5be381..140837cfbd0 100644
Binary files a/public/images/pokemon/variant/890-eternamax_3.png and b/public/images/pokemon/variant/890-eternamax_3.png differ
diff --git a/public/images/pokemon/variant/_masterlist.json b/public/images/pokemon/variant/_masterlist.json
index eb3efaa15b2..175b56139a6 100644
--- a/public/images/pokemon/variant/_masterlist.json
+++ b/public/images/pokemon/variant/_masterlist.json
@@ -719,7 +719,7 @@
 	"888-crowned": [0, 1, 1],
 	"889": [0, 1, 1],
 	"889-crowned": [0, 1, 1],
-	"890-eternamax": [0, 2, 2],
+	"890-eternamax": [0, 1, 1],
 	"890": [0, 1, 1],
 	"891": [1, 1, 1],
 	"892-gigantamax-rapid": [1, 2, 2],
diff --git a/src/data/ability.ts b/src/data/ability.ts
index eaf77f376f4..eea24c791b0 100644
--- a/src/data/ability.ts
+++ b/src/data/ability.ts
@@ -854,7 +854,8 @@ export class PostDefendStatStageChangeAbAttr extends PostDefendAbAttr {
     }
 
     if (this.allOthers) {
-      const otherPokemon = pokemon.getAlly() ? pokemon.getOpponents().concat([ pokemon.getAlly() ]) : pokemon.getOpponents();
+      const ally = pokemon.getAlly();
+      const otherPokemon = !Utils.isNullOrUndefined(ally) ? pokemon.getOpponents().concat([ ally ]) : pokemon.getOpponents();
       for (const other of otherPokemon) {
         globalScene.unshiftPhase(new StatStageChangePhase((other).getBattlerIndex(), false, [ this.stat ], this.stages));
       }
@@ -2460,12 +2461,12 @@ export class PostSummonAllyHealAbAttr extends PostSummonAbAttr {
   }
 
   override canApplyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean {
-    return pokemon.getAlly()?.isActive(true);
+    return pokemon.getAlly()?.isActive(true) ?? false;
   }
 
   override applyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): void {
     const target = pokemon.getAlly();
-    if (!simulated) {
+    if (!simulated && !Utils.isNullOrUndefined(target)) {
       globalScene.unshiftPhase(new PokemonHealPhase(target.getBattlerIndex(),
         Utils.toDmgValue(pokemon.getMaxHp() / this.healRatio), i18next.t("abilityTriggers:postSummonAllyHeal", { pokemonNameWithAffix: getPokemonNameWithAffix(target), pokemonName: pokemon.name }), true, !this.showAnim));
     }
@@ -2486,12 +2487,12 @@ export class PostSummonClearAllyStatStagesAbAttr extends PostSummonAbAttr {
   }
 
   override canApplyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): boolean {
-    return pokemon.getAlly()?.isActive(true);
+    return pokemon.getAlly()?.isActive(true) ?? false;
   }
 
   override applyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): void {
     const target = pokemon.getAlly();
-    if (!simulated) {
+    if (!simulated && !Utils.isNullOrUndefined(target)) {
       for (const s of BATTLE_STATS) {
         target.setStatStage(s, 0);
       }
@@ -2712,7 +2713,7 @@ export class PostSummonCopyAllyStatsAbAttr extends PostSummonAbAttr {
     }
 
     const ally = pokemon.getAlly();
-    if (!ally || ally.getStatStages().every(s => s === 0)) {
+    if (Utils.isNullOrUndefined(ally) || ally.getStatStages().every(s => s === 0)) {
       return false;
     }
 
@@ -2721,7 +2722,7 @@ export class PostSummonCopyAllyStatsAbAttr extends PostSummonAbAttr {
 
   override applyPostSummon(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): void {
     const ally = pokemon.getAlly();
-    if (!simulated) {
+    if (!simulated && !Utils.isNullOrUndefined(ally)) {
       for (const s of BATTLE_STATS) {
         pokemon.setStatStage(s, ally.getStatStage(s));
       }
@@ -2866,8 +2867,9 @@ export class CommanderAbAttr extends AbAttr {
     // another Pokemon, this effect cannot apply.
 
     // TODO: Should this work with X + Dondozo fusions?
-    return globalScene.currentBattle?.double && pokemon.getAlly()?.species.speciesId === Species.DONDOZO
-           && !(pokemon.getAlly().isFainted() || pokemon.getAlly().getTag(BattlerTagType.COMMANDED));
+    const ally = pokemon.getAlly();
+    return globalScene.currentBattle?.double && !Utils.isNullOrUndefined(ally) && ally.species.speciesId === Species.DONDOZO
+           && !(ally.isFainted() || ally.getTag(BattlerTagType.COMMANDED));
   }
 
   override apply(pokemon: Pokemon, passive: boolean, simulated: boolean, cancelled: null, args: any[]): void {
@@ -2877,7 +2879,7 @@ export class CommanderAbAttr extends AbAttr {
       // Play an animation of the source jumping into the ally Dondozo's mouth
       globalScene.triggerPokemonBattleAnim(pokemon, PokemonAnimType.COMMANDER_APPLY);
       // Apply boosts from this effect to the ally Dondozo
-      pokemon.getAlly().addTag(BattlerTagType.COMMANDED, 0, Moves.NONE, pokemon.id);
+      pokemon.getAlly()?.addTag(BattlerTagType.COMMANDED, 0, Moves.NONE, pokemon.id);
       // Cancel the source Pokemon's next move (if a move is queued)
       globalScene.tryRemovePhase((phase) => phase instanceof MovePhase && phase.pokemon === pokemon);
     }
@@ -4077,7 +4079,7 @@ export class PostTurnStatusHealAbAttr extends PostTurnAbAttr {
  */
 export class PostTurnResetStatusAbAttr extends PostTurnAbAttr {
   private allyTarget: boolean;
-  private target: Pokemon;
+  private target: Pokemon | undefined;
 
   constructor(allyTarget = false) {
     super(true);
@@ -4090,11 +4092,11 @@ export class PostTurnResetStatusAbAttr extends PostTurnAbAttr {
     } else {
       this.target = pokemon;
     }
-    return !Utils.isNullOrUndefined(this.target.status);
+    return !Utils.isNullOrUndefined(this.target?.status);
   }
 
   override applyPostTurn(pokemon: Pokemon, passive: boolean, simulated: boolean, args: any[]): void {
-    if (!simulated && this.target.status) {
+    if (!simulated && this.target?.status) {
       globalScene.queueMessage(getStatusEffectHealText(this.target.status?.effect, getPokemonNameWithAffix(this.target)));
       this.target.resetStatus(false);
       this.target.updateInfo();
@@ -5440,6 +5442,8 @@ class ForceSwitchOutHelper {
      * It will not flee if it is a Mystery Encounter with fleeing disabled (checked in `getSwitchOutCondition()`) or if it is a wave 10x wild boss
      */
     } else {
+      const allyPokemon = switchOutTarget.getAlly();
+
       if (!globalScene.currentBattle.waveIndex || globalScene.currentBattle.waveIndex % 10 === 0) {
         return false;
       }
@@ -5447,14 +5451,12 @@ class ForceSwitchOutHelper {
       if (switchOutTarget.hp > 0) {
         switchOutTarget.leaveField(false);
         globalScene.queueMessage(i18next.t("moveTriggers:fled", { pokemonName: getPokemonNameWithAffix(switchOutTarget) }), null, true, 500);
-
-        if (globalScene.currentBattle.double) {
-          const allyPokemon = switchOutTarget.getAlly();
+        if (globalScene.currentBattle.double && !Utils.isNullOrUndefined(allyPokemon)) {
           globalScene.redirectPokemonMoves(switchOutTarget, allyPokemon);
         }
       }
 
-      if (!switchOutTarget.getAlly()?.isActive(true)) {
+      if (!allyPokemon?.isActive(true)) {
         globalScene.clearEnemyHeldItemModifiers();
 
         if (switchOutTarget.hp) {
@@ -6440,9 +6442,9 @@ export function initAbilities() {
     new Ability(Abilities.CUTE_CHARM, 3)
       .attr(PostDefendContactApplyTagChanceAbAttr, 30, BattlerTagType.INFATUATED),
     new Ability(Abilities.PLUS, 3)
-      .conditionalAttr(p => globalScene.currentBattle.double && [ Abilities.PLUS, Abilities.MINUS ].some(a => p.getAlly().hasAbility(a)), StatMultiplierAbAttr, Stat.SPATK, 1.5),
+      .conditionalAttr(p => globalScene.currentBattle.double && [ Abilities.PLUS, Abilities.MINUS ].some(a => (p.getAlly()?.hasAbility(a) ?? false)), StatMultiplierAbAttr, Stat.SPATK, 1.5),
     new Ability(Abilities.MINUS, 3)
-      .conditionalAttr(p => globalScene.currentBattle.double && [ Abilities.PLUS, Abilities.MINUS ].some(a => p.getAlly().hasAbility(a)), StatMultiplierAbAttr, Stat.SPATK, 1.5),
+      .conditionalAttr(p => globalScene.currentBattle.double && [ Abilities.PLUS, Abilities.MINUS ].some(a => (p.getAlly()?.hasAbility(a) ?? false)), StatMultiplierAbAttr, Stat.SPATK, 1.5),
     new Ability(Abilities.FORECAST, 3)
       .uncopiable()
       .unreplaceable()
@@ -6669,7 +6671,7 @@ export function initAbilities() {
       .attr(PostDefendMoveDisableAbAttr, 30)
       .bypassFaint(),
     new Ability(Abilities.HEALER, 5)
-      .conditionalAttr(pokemon => pokemon.getAlly() && Utils.randSeedInt(10) < 3, PostTurnResetStatusAbAttr, true),
+      .conditionalAttr(pokemon => !Utils.isNullOrUndefined(pokemon.getAlly()) && Utils.randSeedInt(10) < 3, PostTurnResetStatusAbAttr, true),
     new Ability(Abilities.FRIEND_GUARD, 5)
       .attr(AlliedFieldDamageReductionAbAttr, 0.75)
       .ignorable(),
diff --git a/src/data/challenge.ts b/src/data/challenge.ts
index 455421ffefd..868fc7d2e60 100644
--- a/src/data/challenge.ts
+++ b/src/data/challenge.ts
@@ -1272,23 +1272,22 @@ function checkSpeciesValidForChallenge(species: PokemonSpecies, props: DexAttrPr
   if (soft && isValidForChallenge.value) {
     return true;
   }
-  pokemonFormChanges[species.speciesId].forEach(f1 => {
-    // Exclude form changes that require the mon to be on the field to begin with,
-    // such as Castform
-    if (!("item" in f1)) {
-      return;
+
+  const result = pokemonFormChanges[species.speciesId].some(f1 => {
+    // Exclude form changes that require the mon to be on the field to begin with
+    if (!("item" in f1.trigger)) {
+      return false;
     }
-    species.forms.forEach((f2, formIndex) => {
+
+    return species.forms.some((f2, formIndex) => {
       if (f1.formKey === f2.formKey) {
-        const formProps = { ...props };
-        formProps.formIndex = formIndex;
+        const formProps = { ...props, formIndex };
         const isFormValidForChallenge = new Utils.BooleanHolder(true);
         applyChallenges(ChallengeType.STARTER_CHOICE, species, isFormValidForChallenge, formProps);
-        if (isFormValidForChallenge.value) {
-          return true;
-        }
+        return isFormValidForChallenge.value;
       }
+      return false;
     });
   });
-  return false;
+  return result;
 }
diff --git a/src/data/moves/move.ts b/src/data/moves/move.ts
index 80e8f2dae55..2624fe6cda9 100644
--- a/src/data/moves/move.ts
+++ b/src/data/moves/move.ts
@@ -788,9 +788,9 @@ export default class Move implements Localizable {
     }
 
     applyPreAttackAbAttrs(VariableMovePowerAbAttr, source, target, this, simulated, power);
-
-    if (source.getAlly()) {
-      applyPreAttackAbAttrs(AllyMoveCategoryPowerBoostAbAttr, source.getAlly(), target, this, simulated, power);
+    const ally = source.getAlly();
+    if (!Utils.isNullOrUndefined(ally)) {
+      applyPreAttackAbAttrs(AllyMoveCategoryPowerBoostAbAttr, ally, target, this, simulated, power);
     }
 
     const fieldAuras = new Set(
@@ -911,7 +911,8 @@ export default class Move implements Localizable {
     ];
 
     // ...and cannot enhance Pollen Puff when targeting an ally.
-    const exceptPollenPuffAlly: boolean = this.id === Moves.POLLEN_PUFF && targets.includes(user.getAlly()?.getBattlerIndex())
+    const ally = user.getAlly();
+    const exceptPollenPuffAlly: boolean = this.id === Moves.POLLEN_PUFF && !Utils.isNullOrUndefined(ally) && targets.includes(ally.getBattlerIndex())
 
     return (!restrictSpread || !isMultiTarget)
       && !this.isChargingMove()
@@ -1946,7 +1947,7 @@ export class FlameBurstAttr extends MoveEffectAttr {
     const targetAlly = target.getAlly();
     const cancelled = new Utils.BooleanHolder(false);
 
-    if (targetAlly) {
+    if (!Utils.isNullOrUndefined(targetAlly)) {
       applyAbAttrs(BlockNonDirectDamageAbAttr, targetAlly, cancelled);
     }
 
@@ -1959,7 +1960,7 @@ export class FlameBurstAttr extends MoveEffectAttr {
   }
 
   getTargetBenefitScore(user: Pokemon, target: Pokemon, move: Move): number {
-    return target.getAlly() ? -5 : 0;
+    return !Utils.isNullOrUndefined(target.getAlly()) ? -5 : 0;
   }
 }
 
@@ -4357,10 +4358,10 @@ export class LastMoveDoublePowerAttr extends VariablePowerAttr {
       const userAlly = user.getAlly();
       const enemyAlly = enemy?.getAlly();
 
-      if (userAlly && userAlly.turnData.acted) {
+      if (!Utils.isNullOrUndefined(userAlly) && userAlly.turnData.acted) {
         pokemonActed.push(userAlly);
       }
-      if (enemyAlly && enemyAlly.turnData.acted) {
+      if (!Utils.isNullOrUndefined(enemyAlly) && enemyAlly.turnData.acted) {
         pokemonActed.push(enemyAlly);
       }
     }
@@ -6162,9 +6163,8 @@ export class RevivalBlessingAttr extends MoveEffectAttr {
       pokemon.resetStatus();
       pokemon.heal(Math.min(Utils.toDmgValue(0.5 * pokemon.getMaxHp()), pokemon.getMaxHp()));
       globalScene.queueMessage(i18next.t("moveTriggers:revivalBlessing", { pokemonName: getPokemonNameWithAffix(pokemon) }), 0, true);
-
-      if (globalScene.currentBattle.double && globalScene.getEnemyParty().length > 1) {
-        const allyPokemon = user.getAlly();
+      const allyPokemon = user.getAlly();
+      if (globalScene.currentBattle.double && globalScene.getEnemyParty().length > 1 && !Utils.isNullOrUndefined(allyPokemon)) {
         // Handle cases where revived pokemon needs to get switched in on same turn
         if (allyPokemon.isFainted() || allyPokemon === pokemon) {
           // Enemy switch phase should be removed and replaced with the revived pkmn switching in
@@ -6343,18 +6343,19 @@ export class ForceSwitchOutAttr extends MoveEffectAttr {
         return false;
       }
 
+      const allyPokemon = switchOutTarget.getAlly();
+
       if (switchOutTarget.hp > 0) {
         switchOutTarget.leaveField(false);
         globalScene.queueMessage(i18next.t("moveTriggers:fled", { pokemonName: getPokemonNameWithAffix(switchOutTarget) }), null, true, 500);
 
         // in double battles redirect potential moves off fled pokemon
-        if (globalScene.currentBattle.double) {
-          const allyPokemon = switchOutTarget.getAlly();
+        if (globalScene.currentBattle.double && !Utils.isNullOrUndefined(allyPokemon)) {
           globalScene.redirectPokemonMoves(switchOutTarget, allyPokemon);
         }
       }
 
-      if (!switchOutTarget.getAlly()?.isActive(true)) {
+      if (!allyPokemon?.isActive(true)) {
         globalScene.clearEnemyHeldItemModifiers();
 
         if (switchOutTarget.hp) {
@@ -7030,7 +7031,7 @@ export class RepeatMoveAttr extends MoveEffectAttr {
     const firstTarget = globalScene.getField()[moveTargets[0]];
     if (globalScene.currentBattle.double && moveTargets.length === 1 && firstTarget.isFainted() && firstTarget !== target.getAlly()) {
       const ally = firstTarget.getAlly();
-      if (ally.isActive()) { // ally exists, is not dead and can sponge the blast
+      if (!Utils.isNullOrUndefined(ally) && ally.isActive()) { // ally exists, is not dead and can sponge the blast
         moveTargets = [ ally.getBattlerIndex() ];
       }
     }
@@ -7404,10 +7405,11 @@ export class AbilityCopyAttr extends MoveEffectAttr {
     globalScene.queueMessage(i18next.t("moveTriggers:copiedTargetAbility", { pokemonName: getPokemonNameWithAffix(user), targetName: getPokemonNameWithAffix(target), abilityName: allAbilities[target.getAbility().id].name }));
 
     user.setTempAbility(target.getAbility());
+    const ally = user.getAlly();
 
-    if (this.copyToPartner && globalScene.currentBattle?.double && user.getAlly().hp) {
-      globalScene.queueMessage(i18next.t("moveTriggers:copiedTargetAbility", { pokemonName: getPokemonNameWithAffix(user.getAlly()), targetName: getPokemonNameWithAffix(target), abilityName: allAbilities[target.getAbility().id].name }));
-      user.getAlly().setTempAbility(target.getAbility());
+    if (this.copyToPartner && globalScene.currentBattle?.double && !Utils.isNullOrUndefined(ally) && ally.hp) { // TODO is this the best way to check that the ally is active?
+      globalScene.queueMessage(i18next.t("moveTriggers:copiedTargetAbility", { pokemonName: getPokemonNameWithAffix(ally), targetName: getPokemonNameWithAffix(target), abilityName: allAbilities[target.getAbility().id].name }));
+      ally.setTempAbility(target.getAbility());
     }
 
     return true;
@@ -7415,9 +7417,10 @@ export class AbilityCopyAttr extends MoveEffectAttr {
 
   getCondition(): MoveConditionFunc {
     return (user, target, move) => {
+      const ally = user.getAlly();
       let ret = target.getAbility().isCopiable && user.getAbility().isReplaceable;
       if (this.copyToPartner && globalScene.currentBattle?.double) {
-        ret = ret && (!user.getAlly().hp || user.getAlly().getAbility().isReplaceable);
+        ret = ret && (!ally?.hp || ally?.getAbility().isReplaceable);
       } else {
         ret = ret && user.getAbility().id !== target.getAbility().id;
       }
@@ -8188,6 +8191,7 @@ export function getMoveTargets(user: Pokemon, move: Moves, replaceTarget?: MoveT
 
   let set: Pokemon[] = [];
   let multiple = false;
+  const ally: Pokemon | undefined = user.getAlly();
 
   switch (moveTarget) {
     case MoveTarget.USER:
@@ -8198,7 +8202,7 @@ export function getMoveTargets(user: Pokemon, move: Moves, replaceTarget?: MoveT
     case MoveTarget.OTHER:
     case MoveTarget.ALL_NEAR_OTHERS:
     case MoveTarget.ALL_OTHERS:
-      set = (opponents.concat([ user.getAlly() ]));
+      set = !Utils.isNullOrUndefined(ally) ? (opponents.concat([ ally ])) : opponents;
       multiple = moveTarget === MoveTarget.ALL_NEAR_OTHERS || moveTarget === MoveTarget.ALL_OTHERS;
       break;
     case MoveTarget.NEAR_ENEMY:
@@ -8215,21 +8219,22 @@ export function getMoveTargets(user: Pokemon, move: Moves, replaceTarget?: MoveT
       return { targets: [ -1 as BattlerIndex ], multiple: false };
     case MoveTarget.NEAR_ALLY:
     case MoveTarget.ALLY:
-      set = [ user.getAlly() ];
+      set = !Utils.isNullOrUndefined(ally) ? [ ally ] : [];
       break;
     case MoveTarget.USER_OR_NEAR_ALLY:
     case MoveTarget.USER_AND_ALLIES:
     case MoveTarget.USER_SIDE:
-      set = [ user, user.getAlly() ];
+      set = !Utils.isNullOrUndefined(ally) ? [ user, ally ] : [ user ];
       multiple = moveTarget !== MoveTarget.USER_OR_NEAR_ALLY;
       break;
     case MoveTarget.ALL:
     case MoveTarget.BOTH_SIDES:
-      set = [ user, user.getAlly() ].concat(opponents);
+      set = (!Utils.isNullOrUndefined(ally) ? [ user, ally ] : [ user ]).concat(opponents);
       multiple = true;
       break;
     case MoveTarget.CURSE:
-      set = user.getTypes(true).includes(PokemonType.GHOST) ? (opponents.concat([ user.getAlly() ])) : [ user ];
+      const extraTargets = !Utils.isNullOrUndefined(ally) ? [ ally ] : [];
+      set = user.getTypes(true).includes(PokemonType.GHOST) ? (opponents.concat(extraTargets)) : [ user ];
       break;
   }
 
@@ -10123,7 +10128,7 @@ export function initMoves() {
       .attr(StatStageChangeAttr, [ Stat.DEF, Stat.SPDEF ], 1, false, { condition: (user, target, move) => !![ Abilities.PLUS, Abilities.MINUS ].find(a => target.hasAbility(a, false)) })
       .ignoresSubstitute()
       .target(MoveTarget.USER_AND_ALLIES)
-      .condition((user, target, move) => !![ user, user.getAlly() ].filter(p => p?.isActive()).find(p => !![ Abilities.PLUS, Abilities.MINUS ].find(a => p.hasAbility(a, false)))),
+      .condition((user, target, move) => !![ user, user.getAlly() ].filter(p => p?.isActive()).find(p => !![ Abilities.PLUS, Abilities.MINUS ].find(a => p?.hasAbility(a, false)))),
     new StatusMove(Moves.HAPPY_HOUR, PokemonType.NORMAL, -1, 30, -1, 0, 6) // No animation
       .attr(AddArenaTagAttr, ArenaTagType.HAPPY_HOUR, null, true)
       .target(MoveTarget.USER_SIDE),
@@ -10313,7 +10318,7 @@ export function initMoves() {
       .attr(StatStageChangeAttr, [ Stat.ATK, Stat.SPATK ], 1, false, { condition: (user, target, move) => !![ Abilities.PLUS, Abilities.MINUS ].find(a => target.hasAbility(a, false)) })
       .ignoresSubstitute()
       .target(MoveTarget.USER_AND_ALLIES)
-      .condition((user, target, move) => !![ user, user.getAlly() ].filter(p => p?.isActive()).find(p => !![ Abilities.PLUS, Abilities.MINUS ].find(a => p.hasAbility(a, false)))),
+      .condition((user, target, move) => !![ user, user.getAlly() ].filter(p => p?.isActive()).find(p => !![ Abilities.PLUS, Abilities.MINUS ].find(a => p?.hasAbility(a, false)))),
     new AttackMove(Moves.THROAT_CHOP, PokemonType.DARK, MoveCategory.PHYSICAL, 80, 100, 15, 100, 0, 7)
       .attr(AddBattlerTagAttr, BattlerTagType.THROAT_CHOPPED),
     new AttackMove(Moves.POLLEN_PUFF, PokemonType.BUG, MoveCategory.SPECIAL, 90, 100, 15, -1, 0, 7)
diff --git a/src/field/pokemon.ts b/src/field/pokemon.ts
index 20a8855fa55..f89319a6e30 100644
--- a/src/field/pokemon.ts
+++ b/src/field/pokemon.ts
@@ -1447,7 +1447,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
     }
 
     const ally = this.getAlly();
-    if (ally) {
+    if (!Utils.isNullOrUndefined(ally)) {
       applyAllyStatMultiplierAbAttrs(AllyStatMultiplierAbAttr, ally, stat, statValue, simulated, this, move?.hasFlag(MoveFlags.IGNORE_ABILITIES) || ignoreAllyAbility);
     }
 
@@ -3714,7 +3714,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
       : i18next.t("arenaTag:yourTeam");
   }
 
-  getAlly(): Pokemon {
+  getAlly(): Pokemon | undefined {
     return (
       this.isPlayer()
         ? globalScene.getPlayerField()
@@ -3900,7 +3900,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
     );
 
     const ally = this.getAlly();
-    if (ally) {
+    if (!isNullOrUndefined(ally)) {
       const ignore = this.hasAbilityWithAttr(MoveAbilityBypassAbAttr) || sourceMove.hasFlag(MoveFlags.IGNORE_ABILITIES);
       applyAllyStatMultiplierAbAttrs(AllyStatMultiplierAbAttr, ally, Stat.ACC, accuracyMultiplier, false, this, ignore);
       applyAllyStatMultiplierAbAttrs(AllyStatMultiplierAbAttr, ally, Stat.EVA, evasionMultiplier, false, this, ignore);
@@ -4336,11 +4336,12 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
         damage,
       );
 
+      const ally = this.getAlly();
       /** Additionally apply friend guard damage reduction if ally has it. */
-      if (globalScene.currentBattle.double && this.getAlly()?.isActive(true)) {
+      if (globalScene.currentBattle.double && !isNullOrUndefined(ally) && ally.isActive(true)) {
         applyPreDefendAbAttrs(
           AlliedFieldDamageReductionAbAttr,
-          this.getAlly(),
+          ally,
           source,
           move,
           cancelled,
diff --git a/src/phases/enemy-command-phase.ts b/src/phases/enemy-command-phase.ts
index 2e4861aacfc..166b8c1ae2d 100644
--- a/src/phases/enemy-command-phase.ts
+++ b/src/phases/enemy-command-phase.ts
@@ -39,7 +39,7 @@ export class EnemyCommandPhase extends FieldPhase {
     if (
       battle.double &&
       enemyPokemon.hasAbility(Abilities.COMMANDER) &&
-      enemyPokemon.getAlly().getTag(BattlerTagType.COMMANDED)
+      enemyPokemon.getAlly()?.getTag(BattlerTagType.COMMANDED)
     ) {
       this.skipTurn = true;
     }
diff --git a/src/phases/faint-phase.ts b/src/phases/faint-phase.ts
index dfc0e0653a5..7e1ae4ec07b 100644
--- a/src/phases/faint-phase.ts
+++ b/src/phases/faint-phase.ts
@@ -209,8 +209,8 @@ export class FaintPhase extends PokemonPhase {
     }
 
     // in double battles redirect potential moves off fainted pokemon
-    if (globalScene.currentBattle.double) {
-      const allyPokemon = pokemon.getAlly();
+    const allyPokemon = pokemon.getAlly();
+    if (globalScene.currentBattle.double && !isNullOrUndefined(allyPokemon)) {
       globalScene.redirectPokemonMoves(pokemon, allyPokemon);
     }
 
diff --git a/src/phases/revival-blessing-phase.ts b/src/phases/revival-blessing-phase.ts
index 1ed63f76b64..e650d714abc 100644
--- a/src/phases/revival-blessing-phase.ts
+++ b/src/phases/revival-blessing-phase.ts
@@ -42,8 +42,12 @@ export class RevivalBlessingPhase extends BattlePhase {
             true,
           );
 
-          if (globalScene.currentBattle.double && globalScene.getPlayerParty().length > 1) {
-            const allyPokemon = this.user.getAlly();
+          const allyPokemon = this.user.getAlly();
+          if (
+            globalScene.currentBattle.double &&
+            globalScene.getPlayerParty().length > 1 &&
+            !Utils.isNullOrUndefined(allyPokemon)
+          ) {
             if (slotIndex <= 1) {
               // Revived ally pokemon
               globalScene.unshiftPhase(
diff --git a/src/phases/stat-stage-change-phase.ts b/src/phases/stat-stage-change-phase.ts
index f58744ef5ce..4c82661a3bb 100644
--- a/src/phases/stat-stage-change-phase.ts
+++ b/src/phases/stat-stage-change-phase.ts
@@ -17,7 +17,7 @@ import type Pokemon from "#app/field/pokemon";
 import { getPokemonNameWithAffix } from "#app/messages";
 import { ResetNegativeStatStageModifier } from "#app/modifier/modifier";
 import { handleTutorial, Tutorial } from "#app/tutorial";
-import { NumberHolder, BooleanHolder } from "#app/utils";
+import { NumberHolder, BooleanHolder, isNullOrUndefined } from "#app/utils";
 import i18next from "i18next";
 import { PokemonPhase } from "./pokemon-phase";
 import { Stat, type BattleStat, getStatKey, getStatStageChangeDescriptionKey } from "#enums/stat";
@@ -161,7 +161,7 @@ export class StatStageChangePhase extends PokemonPhase {
           pokemon,
         );
         const ally = pokemon.getAlly();
-        if (ally) {
+        if (!isNullOrUndefined(ally)) {
           applyPreStatStageChangeAbAttrs(
             ConditionalUserFieldProtectStatAbAttr,
             ally,
diff --git a/src/system/game-data.ts b/src/system/game-data.ts
index 2388918dca2..391ceec503d 100644
--- a/src/system/game-data.ts
+++ b/src/system/game-data.ts
@@ -1793,7 +1793,9 @@ export class GameData {
       const dexEntry = this.dexData[species.speciesId];
       const caughtAttr = dexEntry.caughtAttr;
       const formIndex = pokemon.formIndex;
-      const dexAttr = pokemon.getDexAttr();
+
+      // This makes sure that we do not try to unlock data which cannot be unlocked
+      const dexAttr = pokemon.getDexAttr() & species.getFullUnlocksData();
 
       // Mark as caught
       dexEntry.caughtAttr |= dexAttr;
@@ -1803,6 +1805,10 @@ export class GameData {
       // always true except for the case of Urshifu.
       const formKey = pokemon.getFormKey();
       if (formIndex > 0) {
+        // In case a Pikachu with formIndex > 0 was unlocked, base form Pichu is also unlocked
+        if (pokemon.species.speciesId === Species.PIKACHU && species.speciesId === Species.PICHU) {
+          dexEntry.caughtAttr |= globalScene.gameData.getFormAttr(0);
+        }
         if (pokemon.species.speciesId === Species.URSHIFU) {
           if (formIndex === 2) {
             dexEntry.caughtAttr |= globalScene.gameData.getFormAttr(0);
diff --git a/src/system/version_migration/version_converter.ts b/src/system/version_migration/version_converter.ts
index 3c5abc2cc18..074f60c2c5d 100644
--- a/src/system/version_migration/version_converter.ts
+++ b/src/system/version_migration/version_converter.ts
@@ -10,6 +10,9 @@ import * as v1_1_0 from "./versions/v1_1_0";
 // --- v1.7.0 PATCHES --- //
 import * as v1_7_0 from "./versions/v1_7_0";
 
+// --- v1.8.3 PATCHES --- //
+import * as v1_8_3 from "./versions/v1_8_3";
+
 const LATEST_VERSION = version.split(".").map(value => Number.parseInt(value));
 
 /**
@@ -174,6 +177,12 @@ class SystemVersionConverter extends VersionConverter {
         console.log("Applying v1.7.0 system data migration!");
         this.callMigrators(data, v1_7_0.systemMigrators);
       }
+      if (curMinor === 8) {
+        if (curPatch <= 2) {
+          console.log("Applying v1.8.3 system data migration!");
+          this.callMigrators(data, v1_8_3.systemMigrators);
+        }
+      }
     }
 
     console.log(`System data successfully migrated to v${version}!`);
diff --git a/src/system/version_migration/versions/v1_8_3.ts b/src/system/version_migration/versions/v1_8_3.ts
new file mode 100644
index 00000000000..d35530c28e9
--- /dev/null
+++ b/src/system/version_migration/versions/v1_8_3.ts
@@ -0,0 +1,30 @@
+import { getPokemonSpecies } from "#app/data/pokemon-species";
+import { DexAttr, type SystemSaveData } from "#app/system/game-data";
+import { Species } from "#enums/species";
+
+export const systemMigrators = [
+  /**
+   * If a starter is caught, but the only forms registered as caught are not starterSelectable,
+   * unlock the default form.
+   * @param data {@linkcode SystemSaveData}
+   */
+  function migratePichuForms(data: SystemSaveData) {
+    if (data.starterData && data.dexData) {
+      // This is Pichu's Pokédex number
+      const sd = 172;
+      const caughtAttr = data.dexData[sd]?.caughtAttr;
+      const species = getPokemonSpecies(sd);
+      // An extra check because you never know
+      if (species.speciesId === Species.PICHU && caughtAttr) {
+        // Ensuring that only existing forms are unlocked
+        data.dexData[sd].caughtAttr &= species.getFullUnlocksData();
+        // If no forms are unlocked now, since Pichu is caught, we unlock form 0
+        data.dexData[sd].caughtAttr |= DexAttr.DEFAULT_FORM;
+      }
+    }
+  },
+] as const;
+
+export const settingsMigrators = [] as const;
+
+export const sessionMigrators = [] as const;