Indigo Disk cross-evos now usable

Hydrapple and Archaludon are now able to be used. Dipplin also, as it was missing all it's graphics previously. Dragon Cheer is also in the TM pool now to accommodate this change.

public/images/pokemon/1011.json

@@ -0,0 +1,41 @@
+{
+	"textures": [
+		{
+			"image": "1011.png",
+			"format": "RGBA8888",
+			"size": {
+				"w": 65,
+				"h": 65
+			},
+			"scale": 1,
+			"frames": [
+				{
+					"filename": "0001.png",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 42,
+						"h": 65
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 42,
+						"h": 65
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 42,
+						"h": 65
+					}
+				}
+			]
+		}
+	],
+	"meta": {
+		"app": "https://www.codeandweb.com/texturepacker",
+		"version": "3.0",
+		"smartupdate": ""
+	}
+}

public/images/pokemon/1018.json

@@ -0,0 +1,41 @@
+{
+	"textures": [
+		{
+			"image": "1018.png",
+			"format": "RGBA8888",
+			"size": {
+				"w": 83,
+				"h": 83
+			},
+			"scale": 1,
+			"frames": [
+				{
+					"filename": "0001.png",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 68,
+						"h": 83
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 68,
+						"h": 83
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 68,
+						"h": 83
+					}
+				}
+			]
+		}
+	],
+	"meta": {
+		"app": "https://www.codeandweb.com/texturepacker",
+		"version": "3.0",
+		"smartupdate": ""
+	}
+}

public/images/pokemon/1019.json

@@ -0,0 +1,41 @@
+{
+	"textures": [
+		{
+			"image": "1019.png",
+			"format": "RGBA8888",
+			"size": {
+				"w": 86,
+				"h": 86
+			},
+			"scale": 1,
+			"frames": [
+				{
+					"filename": "0001.png",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 71,
+						"h": 86
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 71,
+						"h": 86
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 71,
+						"h": 86
+					}
+				}
+			]
+		}
+	],
+	"meta": {
+		"app": "https://www.codeandweb.com/texturepacker",
+		"version": "3.0",
+		"smartupdate": ""
+	}
+}

public/images/pokemon/back/1011.json

@@ -0,0 +1,41 @@
+{
+	"textures": [
+		{
+			"image": "1011.png",
+			"format": "RGBA8888",
+			"size": {
+				"w": 66,
+				"h": 66
+			},
+			"scale": 1,
+			"frames": [
+				{
+					"filename": "0001.png",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 43,
+						"h": 66
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 43,
+						"h": 66
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 43,
+						"h": 66
+					}
+				}
+			]
+		}
+	],
+	"meta": {
+		"app": "https://www.codeandweb.com/texturepacker",
+		"version": "3.0",
+		"smartupdate": ""
+	}
+}

public/images/pokemon/back/1018.json

@@ -0,0 +1,41 @@
+{
+	"textures": [
+		{
+			"image": "1018.png",
+			"format": "RGBA8888",
+			"size": {
+				"w": 83,
+				"h": 83
+			},
+			"scale": 1,
+			"frames": [
+				{
+					"filename": "0001.png",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 72,
+						"h": 83
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 72,
+						"h": 83
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 72,
+						"h": 83
+					}
+				}
+			]
+		}
+	],
+	"meta": {
+		"app": "https://www.codeandweb.com/texturepacker",
+		"version": "3.0",
+		"smartupdate": ""
+	}
+}

public/images/pokemon/back/1019.json

@@ -0,0 +1,41 @@
+{
+	"textures": [
+		{
+			"image": "1019.png",
+			"format": "RGBA8888",
+			"size": {
+				"w": 88,
+				"h": 88
+			},
+			"scale": 1,
+			"frames": [
+				{
+					"filename": "0001.png",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 60,
+						"h": 88
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 60,
+						"h": 88
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 60,
+						"h": 88
+					}
+				}
+			]
+		}
+	],
+	"meta": {
+		"app": "https://www.codeandweb.com/texturepacker",
+		"version": "3.0",
+		"smartupdate": ""
+	}
+}

public/images/pokemon/back/shiny/1011.json

@@ -0,0 +1,41 @@
+{
+	"textures": [
+		{
+			"image": "1011.png",
+			"format": "RGBA8888",
+			"size": {
+				"w": 66,
+				"h": 66
+			},
+			"scale": 1,
+			"frames": [
+				{
+					"filename": "0001.png",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 43,
+						"h": 66
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 43,
+						"h": 66
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 43,
+						"h": 66
+					}
+				}
+			]
+		}
+	],
+	"meta": {
+		"app": "https://www.codeandweb.com/texturepacker",
+		"version": "3.0",
+		"smartupdate": ""
+	}
+}

public/images/pokemon/back/shiny/1018.json

@@ -0,0 +1,41 @@
+{
+	"textures": [
+		{
+			"image": "1018.png",
+			"format": "RGBA8888",
+			"size": {
+				"w": 83,
+				"h": 83
+			},
+			"scale": 1,
+			"frames": [
+				{
+					"filename": "0001.png",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 72,
+						"h": 83
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 72,
+						"h": 83
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 72,
+						"h": 83
+					}
+				}
+			]
+		}
+	],
+	"meta": {
+		"app": "https://www.codeandweb.com/texturepacker",
+		"version": "3.0",
+		"smartupdate": ""
+	}
+}

public/images/pokemon/back/shiny/1019.json

@@ -0,0 +1,41 @@
+{
+	"textures": [
+		{
+			"image": "1019.png",
+			"format": "RGBA8888",
+			"size": {
+				"w": 88,
+				"h": 88
+			},
+			"scale": 1,
+			"frames": [
+				{
+					"filename": "0001.png",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 60,
+						"h": 88
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 60,
+						"h": 88
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 60,
+						"h": 88
+					}
+				}
+			]
+		}
+	],
+	"meta": {
+		"app": "https://www.codeandweb.com/texturepacker",
+		"version": "3.0",
+		"smartupdate": ""
+	}
+}

public/images/pokemon/shiny/1011.json

@@ -0,0 +1,41 @@
+{
+	"textures": [
+		{
+			"image": "1011.png",
+			"format": "RGBA8888",
+			"size": {
+				"w": 65,
+				"h": 65
+			},
+			"scale": 1,
+			"frames": [
+				{
+					"filename": "0001.png",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 42,
+						"h": 65
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 42,
+						"h": 65
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 42,
+						"h": 65
+					}
+				}
+			]
+		}
+	],
+	"meta": {
+		"app": "https://www.codeandweb.com/texturepacker",
+		"version": "3.0",
+		"smartupdate": ""
+	}
+}

public/images/pokemon/shiny/1018.json

@@ -0,0 +1,41 @@
+{
+	"textures": [
+		{
+			"image": "1018.png",
+			"format": "RGBA8888",
+			"size": {
+				"w": 83,
+				"h": 83
+			},
+			"scale": 1,
+			"frames": [
+				{
+					"filename": "0001.png",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 68,
+						"h": 83
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 68,
+						"h": 83
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 68,
+						"h": 83
+					}
+				}
+			]
+		}
+	],
+	"meta": {
+		"app": "https://www.codeandweb.com/texturepacker",
+		"version": "3.0",
+		"smartupdate": ""
+	}
+}

public/images/pokemon/shiny/1019.json

@@ -0,0 +1,41 @@
+{
+	"textures": [
+		{
+			"image": "1019.png",
+			"format": "RGBA8888",
+			"size": {
+				"w": 86,
+				"h": 86
+			},
+			"scale": 1,
+			"frames": [
+				{
+					"filename": "0001.png",
+					"rotated": false,
+					"trimmed": false,
+					"sourceSize": {
+						"w": 71,
+						"h": 86
+					},
+					"spriteSourceSize": {
+						"x": 0,
+						"y": 0,
+						"w": 71,
+						"h": 86
+					},
+					"frame": {
+						"x": 0,
+						"y": 0,
+						"w": 71,
+						"h": 86
+					}
+				}
+			]
+		}
+	],
+	"meta": {
+		"app": "https://www.codeandweb.com/texturepacker",
+		"version": "3.0",
+		"smartupdate": ""
+	}
+}

public/images/ui/pokemon_icons_9.json

@@ -92,6 +92,69 @@
 						"w": 22,
 						"h": 26
 					}
+				},
+				{
+					"filename": "1018",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 5,
+						"y": 0,
+						"w": 31,
+						"h": 30
+					},
+					"frame": {
+						"x": 48,
+						"y": 0,
+						"w": 31,
+						"h": 30
+					}
+				},
+				{
+					"filename": "1011",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 11,
+						"y": 5,
+						"w": 19,
+						"h": 22
+					},
+					"frame": {
+						"x": 49,
+						"y": 30,
+						"w": 19,
+						"h": 22
+					}
+				},
+				{
+					"filename": "1019",
+					"rotated": false,
+					"trimmed": true,
+					"sourceSize": {
+						"w": 40,
+						"h": 30
+					},
+					"spriteSourceSize": {
+						"x": 8,
+						"y": 0,
+						"w": 24,
+						"h": 29
+					},
+					"frame": {
+						"x": 68,
+						"y": 30,
+						"w": 24,
+						"h": 29
+					}
 				}
 			]
 		}

src/data/pokemon-evolutions.ts

@@ -1433,11 +1433,11 @@ export const pokemonEvolutions: PokemonEvolutions = {
   [Species.SINISTEA]: [
     new SpeciesEvolution(Species.POLTEAGEIST, 1, EvolutionItem.DUSK_STONE, null, SpeciesWildEvolutionDelay.LONG)
   ],
-//[Species.DURALUDON]: [
-//  new SpeciesEvolution(Species.ARCHALUDON, 1, EvolutionItem.DUSK_STONE, new SpeciesEvolutionCondition(
-//    (p: Pokemon) => !!p.scene.findModifier(m => m instanceof AttackTypeBoosterModifier && (m.type as AttackTypeBoosterModifierType).moveType === Type.STEEL) ),
-//    SpeciesWildEvolutionDelay.VERY_LONG)
-//],
+  [Species.DURALUDON]: [
+    new SpeciesEvolution(Species.ARCHALUDON, 1, EvolutionItem.DUSK_STONE, new SpeciesEvolutionCondition(
+      (p: Pokemon) => !!p.scene.findModifier(m => m instanceof AttackTypeBoosterModifier && (m.type as AttackTypeBoosterModifierType).moveType === Type.STEEL) ),
+      SpeciesWildEvolutionDelay.VERY_LONG)
+  ],
   [Species.KUBFU]: [
     new SpeciesFormEvolution(Species.URSHIFU, '', 'single-strike', 1, EvolutionItem.DUSK_STONE, new SpeciesEvolutionCondition((p: Pokemon) => p.scene.arena.biomeType === Biome.ABYSS), null),
     new SpeciesFormEvolution(Species.URSHIFU, '', 'rapid-strike', 1, EvolutionItem.WATER_STONE, new SpeciesEvolutionCondition((p: Pokemon) => p.scene.arena.biomeType === Biome.SEA), null)
@@ -1473,9 +1473,9 @@ export const pokemonEvolutions: PokemonEvolutions = {
   [Species.POLTCHAGEIST]: [
     new SpeciesEvolution(Species.SINISTCHA, 1, EvolutionItem.DUSK_STONE, null, SpeciesWildEvolutionDelay.LONG)
   ],
-//[Species.DIPPLIN]: [
-//  new SpeciesEvolution(Species.HYDRAPPLE, 1, null, new SpeciesEvolutionCondition((p: Pokemon) => p.moveset.filter(m => m.moveId === Moves.DRAGON_CHEER).length > 0), SpeciesWildEvolutionDelay.VERY_LONG)
-//],
+  [Species.DIPPLIN]: [
+    new SpeciesEvolution(Species.HYDRAPPLE, 1, null, new SpeciesEvolutionCondition((p: Pokemon) => p.moveset.filter(m => m.moveId === Moves.DRAGON_CHEER).length > 0), SpeciesWildEvolutionDelay.VERY_LONG)
+  ],
   [Species.KADABRA]: [
     new SpeciesEvolution(Species.ALAKAZAM, 1, EvolutionItem.LINKING_CORD, null, SpeciesWildEvolutionDelay.VERY_LONG)
   ],

src/data/tms.ts

@@ -59363,6 +59363,66 @@ export const tmSpecies: TmSpecies = {
     ],
     Species.PALDEA_WOOPER,
   ],
+  [Moves.DRAGON_CHEER]: [
+    Species.CHARIZARD,
+    Species.GYARADOS,
+    Species.LAPRAS,
+    Species.DRATINI,
+    Species.DRAGONAIR,
+    Species.DRAGONITE,
+    Species.MEW,
+    Species.AMPHAROS,
+    Species.SCEPTILE,
+    Species.FLYGON,
+    Species.SWABLU,
+    Species.ALTARIA,
+    Species.MILOTIC,
+    Species.BAGON,
+    Species.SHELGON,
+    Species.SALAMENCE,
+    Species.LATIAS,
+    Species.LATIOS,
+    Species.RAYQUAZA,
+    Species.CRANIDOS,
+    Species.RAMPARDOS,
+    Species.GIBLE,
+    Species.GABITE,
+    Species.GARCHOMP,
+    Species.AXEW,
+    Species.FRAXURE,
+    Species.HAXORUS,
+    Species.DEINO,
+    Species.ZWEILOUS,
+    Species.HYDREIGON,
+    Species.RESHIRAM,
+    Species.ZEKROM,
+    Species.KYUREM,
+    Species.GOODRA,
+    Species.NOIVERN,
+    Species.SALAZZLE,
+    Species.JANGMO_O,
+    Species.HAKAMO_O,
+    Species.KOMMO_O,
+    Species.DURALUDON,
+    Species.DRAKLOAK,
+    Species.DRAGAPULT,
+    Species.REGIDRAGO,
+    Species.CYCLIZAR,
+    Species.TATSUGIRI,
+    Species.IRON_JUGULIS,
+    Species.BAXCALIBUR,
+    Species.ROARING_MOON,
+    Species.KORAIDON,
+    Species.MIRAIDON,
+    Species.WALKING_WAKE,
+    Species.DIPPLIN,
+    Species.ARCHALUDON,
+    Species.HYDRAPPLE,
+    Species.GOUGING_FIRE,
+    Species.RAGING_BOLT,
+    Species.ALOLA_EXEGGUTOR,
+    Species.HISUI_GOODRA,
+  ],
 };
 
 interface TmPoolTiers {
@@ -59653,6 +59713,7 @@ export const tmPoolTiers: TmPoolTiers = {
     [Moves.POUNCE]: ModifierTier.COMMON,
     [Moves.TRAILBLAZE]: ModifierTier.COMMON,
     [Moves.CHILLING_WATER]: ModifierTier.COMMON,
+    [Moves.DRAGON_CHEER]: ModifierTier.COMMON,
   //[Moves.PAIN_SPLIT]: ModifierTier.COMMON,
   //[Moves.DOUBLE_EDGE]: ModifierTier.ULTRA,
   //[Moves.ENDEAVOR]: ModifierTier.COMMON,
@@ -59663,7 +59724,6 @@ export const tmPoolTiers: TmPoolTiers = {
   //[Moves.METAL_SOUND]: ModifierTier.COMMON,
   //[Moves.CURSE]: ModifierTier.COMMON,
   //[Moves.HARD_PRESS]: ModifierTier.GREAT,
-  //[Moves.DRAGON_CHEER]: ModifierTier.COMMON,
   //[Moves.ALLURING_VOICE]: ModifierTier.GREAT,
   //[Moves.PSYCHIC_NOISE]: ModifierTier.GREAT,
   //[Moves.UPPER_HAND]: ModifierTier.COMMON,