[Sprite] Fixes Busted Mimikyu variants and icons; Fixes #2683 (#2690)

* [Sprite] Gives Disguised form explicit identifier

`null` defaults to `disguised`, as is desired.

* [Sprite] Renamed Disguised form has exp sprites

* [Sprite] Add Busted Mimikyu to masterlist

* Rename static non-shiny front 778.png to 778-disguised.png

* static non-shiny front

* exp non-shiny front

* static non-shiny back

* exp non-shiny front

* static non-shiny back

* static shiny front

* static shiny front

* non-shiny icon

* exp non-shiny back

* shiny icon

* static var front

* exp non-shiny back

* exp shiny front

* exp shiny front

* exp shiny back

* static shiny back

* exp var front

* static var back

* Delete public/images/pokemon/variant/exp/778_3.png

* Delete public/images/pokemon/variant/exp/778_3.json

* exp shiny back

* exp shiny back

* rare icon

* epic icon

* exp var back

* static var front BUSTED

* static var back BUSTED

* exp var front BUSTED

* exp var back BUSTED

* [Sprite] Static Mimikyu Busted sprite fix

Fixes eyeholes on torso

* [Sprite] Exp Mimikyu sprite fixes

Fixes eyeholes on torsos

* Trim static shiny front sprite size

Addresses issue #2683

* [Sprite] Match static shiny Disguised w non-shiny

Addresses issue #2683

public/exp-sprites.json

@@ -621,7 +621,7 @@
     "777",
     "778-busted",
     "778-busted",
-    "778",
+    "778-disguised",
     "778",
     "779",
     "779",
@@ -1753,7 +1753,7 @@
     "777b",
     "778b-busted",
     "778b-busted",
-    "778b",
+    "778b-disguised",
     "778b",
     "779b",
     "779b",
@@ -2885,7 +2885,7 @@
     "777sb",
     "778sb-busted",
     "778sb-busted",
-    "778sb",
+    "778sb-disguised",
     "778sb",
     "779sb",
     "779sb",
@@ -4024,7 +4024,7 @@
     "777s",
     "778s-busted",
     "778s-busted",
-    "778s",
+    "778s-disguised",
     "778s",
     "779s",
     "779s",

public/images/pokemon/778-disguised.json

@@ -1,7 +1,7 @@
 {
 	"textures": [
 		{
-			"image": "778.png",
+			"image": "778-disguised.png",
 			"format": "RGBA8888",
 			"size": {
 				"w": 48,

public/images/pokemon/back/778-disguised.json

@@ -1,7 +1,7 @@
 {
 	"textures": [
 		{
-			"image": "778.png",
+			"image": "778-disguised.png",
 			"format": "RGBA8888",
 			"size": {
 				"w": 51,

public/images/pokemon/back/shiny/778-disguised.json

@@ -1,7 +1,7 @@
 {
 	"textures": [
 		{
-			"image": "778.png",
+			"image": "778-disguised.png",
 			"format": "RGBA8888",
 			"size": {
 				"w": 51,

public/images/pokemon/exp/778-disguised.json

@@ -1,7 +1,7 @@
 {
 	"textures": [
 		{
-			"image": "778.png",
+			"image": "778-disguised.png",
 			"format": "RGBA8888",
 			"size": {
 				"w": 219,

public/images/pokemon/exp/back/778-disguised.json

@@ -1,7 +1,7 @@
 {
 	"textures": [
 		{
-			"image": "778.png",
+			"image": "778-disguised.png",
 			"format": "RGBA8888",
 			"size": {
 				"w": 210,

public/images/pokemon/exp/back/shiny/778-disguised.json

@@ -1,7 +1,7 @@
 {
 	"textures": [
 		{
-			"image": "778.png",
+			"image": "778-disguised.png",
 			"format": "RGBA8888",
 			"size": {
 				"w": 210,

public/images/pokemon/exp/shiny/778-disguised.json

@@ -1,7 +1,7 @@
 {
 	"textures": [
 		{
-			"image": "778.png",
+			"image": "778-disguised.png",
 			"format": "RGBA8888",
 			"size": {
 				"w": 219,

public/images/pokemon/shiny/778-disguised.json

@@ -1,10 +1,10 @@
 {
 	"textures": [
 		{
-			"image": "778.png",
+			"image": "778-disguised.png",
 			"format": "RGBA8888",
 			"size": {
-				"w": 48,
+				"w": 39,
 				"h": 48
 			},
 			"scale": 1,

public/images/pokemon/variant/778-busted.json

@@ -0,0 +1,26 @@
+{
+	"1": {
+		"101010": "000000",
+		"404040": "3a200c",
+		"b3a76b": "8d4f3d",
+		"f2e291": "aa6f46",
+		"665f3d": "542c21",
+		"f28b24": "d9ae6c",
+		"a55c18": "c58850",
+		"4d361f": "a0561d",
+		"b37d47": "fabc5f",
+		"404039": "381a15"
+	},
+	"2": {
+		"101010": "000000",
+		"404040": "0c123a",
+		"b3a76b": "3d2e4f",
+		"f2e291": "5b496b",
+		"665f3d": "1b1031",
+		"f28b24": "69a3cb",
+		"a55c18": "5b8abd",
+		"4d361f": "3e5075",
+		"b37d47": "8eb5cd",
+		"404039": "ff766e"
+	}
+}

public/images/pokemon/variant/778-disguised.json

@@ -31,4 +31,4 @@
 		"805933": "6d80a4",
 		"3c3838": "ff766e"
 	}
-}
+}

public/images/pokemon/variant/_masterlist.json

@@ -2464,7 +2464,12 @@
 		1,
 		1
 	],
-	"778": [
+	"778-busted": [
+		0,
+		1,
+		1
+	],
+	"778-disguised": [
 		0,
 		1,
 		1
@@ -5832,7 +5837,12 @@
 			1,
 			1
 		],
-		"778": [
+		"778-busted": [
+			0,
+			1,
+			1
+		],
+		"778-disguised": [
 			0,
 			1,
 			1
@@ -7371,10 +7381,15 @@
 			1,
 			1
 		],
-		"778": [
+		"778-busted": [
 			0,
 			1,
-			2
+			1
+		],
+		"778-disguised": [
+			0,
+			1,
+			1
 		],
 		"779": [
 			0,
@@ -8653,7 +8668,12 @@
 				1,
 				1
 			],
-			"778": [
+			"778-busted": [
+				0,
+				1,
+				1
+			],
+			"778-disguised": [
 				0,
 				1,
 				1
@@ -9320,4 +9340,4 @@
 			1
 		]
 	}
-}
+}

public/images/pokemon/variant/back/778-busted.json

@@ -0,0 +1,22 @@
+{
+	"1": {
+		"101010": "101010",
+		"404040": "2d1818",
+		"b3a76b": "8d4f3d",
+		"f2e291": "aa6f46",
+		"665f3d": "542c21",
+		"4d361f": "844b20",
+		"b37d47": "fabc5f",
+		"805933": "b97d2c"
+	},
+	"2": {
+		"101010": "000000",
+		"404040": "0c123a",
+		"b3a76b": "3d2e4f",
+		"f2e291": "5b496b",
+		"665f3d": "1b1031",
+		"4d361f": "3e5075",
+		"b37d47": "8eb5cd",
+		"805933": "6d80a4"
+	}
+}

public/images/pokemon/variant/back/778-disguised.json

@@ -19,4 +19,4 @@
 		"b37d47": "8eb5cd",
 		"805933": "6d80a4"
 	}
-}
+}

public/images/pokemon/variant/exp/778-busted.json

@@ -0,0 +1,30 @@
+{
+	"1": {
+		"000000": "000000",
+		"101010": "101010",
+		"404040": "180c05",
+		"b3a76b": "8d4f3d",
+		"f2e291": "aa6f46",
+		"665f3d": "382313",
+		"f28b24": "d9ae6c",
+		"b3671b": "c58850",
+		"4d361f": "a0561d",
+		"b37d47": "fabc5f",
+		"805933": "d18e33",
+		"404039": "180c05"
+	},
+	"2": {
+		"000000": "000000",
+		"101010": "000000",
+		"404040": "0b1231",
+		"b3a76b": "3d2e4f",
+		"f2e291": "5b496b",
+		"665f3d": "25213a",
+		"f28b24": "69a3cb",
+		"b3671b": "5b8abd",
+		"4d361f": "3e5075",
+		"b37d47": "8eb5cd",
+		"805933": "6d80a4",
+		"404039": "ff766e"
+	}
+}

public/images/pokemon/variant/exp/778-disguised.json

@@ -0,0 +1,28 @@
+{
+	"1": {
+		"000000": "000000",
+		"404040": "180c05",
+		"b3a76b": "8d4f3d",
+		"f2e291": "aa6f46",
+		"665f3d": "382313",
+		"f28b24": "d9ae6c",
+		"b3671b": "c58850",
+		"4d361f": "a0561d",
+		"b37d47": "fabc5f",
+		"805933": "d18e33",
+		"404039": "180c05"
+	},
+	"2": {
+		"000000": "000000",
+		"404040": "0b1231",
+		"b3a76b": "3d2e4f",
+		"f2e291": "5b496b",
+		"665f3d": "25213a",
+		"f28b24": "69a3cb",
+		"b3671b": "5b8abd",
+		"4d361f": "3e5075",
+		"b37d47": "8eb5cd",
+		"805933": "6d80a4",
+		"404039": "ff766e"
+	}
+}

public/images/pokemon/variant/exp/778.json

@@ -1,14 +0,0 @@
-{
-	"1": {
-		"000000": "000000",
-		"404040": "180c05",
-		"b3a76b": "8d4f3d",
-		"f2e291": "aa6f46",
-		"665f3d": "382313",
-		"f28b24": "d9ae6c",
-		"b3671b": "c58850",
-		"4d361f": "a0561d",
-		"b37d47": "fabc5f",
-		"805933": "d18e33"
-	}
-}

public/images/pokemon/variant/exp/back/778-busted.json

@@ -0,0 +1,26 @@
+{
+	"1": {
+		"000000": "000000",
+		"101010": "101010",
+		"404040": "2d1818",
+		"b3a76b": "8d4f3d",
+		"f2e291": "aa6f46",
+		"665f3d": "542c21",
+		"000000": "101010",
+		"4d361f": "844b20",
+		"b37d47": "fabc5f",
+		"805933": "b97d2c"
+	},
+	"2": {
+		"000000": "000000",
+		"101010": "000000",
+		"404040": "0c123a",
+		"b3a76b": "3d2e4f",
+		"f2e291": "5b496b",
+		"665f3d": "1b1031",
+		"000000": "000000",
+		"4d361f": "3e5075",
+		"b37d47": "8eb5cd",
+		"805933": "6d80a4"
+	}
+}

public/images/pokemon/variant/exp/back/778-disguised.json

@@ -21,4 +21,4 @@
 		"b37d47": "8eb5cd",
 		"805933": "6d80a4"
 	}
-}
+}

src/data/pokemon-species.ts

@@ -2158,7 +2158,7 @@ export function initSpecies() {
     new PokemonSpecies(Species.TURTONATOR, 7, false, false, false, "Blast Turtle Pokémon", Type.FIRE, Type.DRAGON, 2, 212, Abilities.SHELL_ARMOR, Abilities.NONE, Abilities.NONE, 485, 60, 78, 135, 91, 85, 36, 70, 50, 170, GrowthRate.MEDIUM_FAST, 50, false),
     new PokemonSpecies(Species.TOGEDEMARU, 7, false, false, false, "Roly-Poly Pokémon", Type.ELECTRIC, Type.STEEL, 0.3, 3.3, Abilities.IRON_BARBS, Abilities.LIGHTNING_ROD, Abilities.STURDY, 435, 65, 98, 63, 40, 73, 96, 180, 50, 152, GrowthRate.MEDIUM_FAST, 50, false),
     new PokemonSpecies(Species.MIMIKYU, 7, false, false, false, "Disguise Pokémon", Type.GHOST, Type.FAIRY, 0.2, 0.7, Abilities.DISGUISE, Abilities.NONE, Abilities.NONE, 476, 55, 90, 80, 50, 105, 96, 45, 50, 167, GrowthRate.MEDIUM_FAST, 50, false, false,
-      new PokemonForm("Disguised Form", "disguised", Type.GHOST, Type.FAIRY, 0.2, 0.7, Abilities.DISGUISE, Abilities.NONE, Abilities.NONE, 476, 55, 90, 80, 50, 105, 96, 45, 50, 167, false, "", true),
+      new PokemonForm("Disguised Form", "disguised", Type.GHOST, Type.FAIRY, 0.2, 0.7, Abilities.DISGUISE, Abilities.NONE, Abilities.NONE, 476, 55, 90, 80, 50, 105, 96, 45, 50, 167, false, null, true),
       new PokemonForm("Busted Form", "busted", Type.GHOST, Type.FAIRY, 0.2, 0.7, Abilities.DISGUISE, Abilities.NONE, Abilities.NONE, 476, 55, 90, 80, 50, 105, 96, 45, 50, 167),
     ),
     new PokemonSpecies(Species.BRUXISH, 7, false, false, false, "Gnash Teeth Pokémon", Type.WATER, Type.PSYCHIC, 0.9, 19, Abilities.DAZZLING, Abilities.STRONG_JAW, Abilities.WONDER_SKIN, 475, 68, 105, 70, 70, 70, 92, 80, 70, 166, GrowthRate.MEDIUM_FAST, 50, false),