diff --git a/public/images/pokemon/332.png b/public/images/pokemon/332.png
index a9979480673..44e374426b4 100644
Binary files a/public/images/pokemon/332.png and b/public/images/pokemon/332.png differ
diff --git a/public/images/pokemon/646.png b/public/images/pokemon/646.png
index 64b0af2d151..e54083bfc73 100644
Binary files a/public/images/pokemon/646.png and b/public/images/pokemon/646.png differ
diff --git a/public/images/pokemon/back/332.png b/public/images/pokemon/back/332.png
index a432b1af4b2..b251a35e468 100644
Binary files a/public/images/pokemon/back/332.png and b/public/images/pokemon/back/332.png differ
diff --git a/public/images/pokemon/back/female/332.png b/public/images/pokemon/back/female/332.png
index a432b1af4b2..b251a35e468 100644
Binary files a/public/images/pokemon/back/female/332.png and b/public/images/pokemon/back/female/332.png differ
diff --git a/public/images/pokemon/female/332.png b/public/images/pokemon/female/332.png
index 2100e4b9a10..c1f7c8ec3f0 100644
Binary files a/public/images/pokemon/female/332.png and b/public/images/pokemon/female/332.png differ
diff --git a/public/images/pokemon/variant/332.json b/public/images/pokemon/variant/332.json
index e9b487bca25..336ef4a22f3 100644
--- a/public/images/pokemon/variant/332.json
+++ b/public/images/pokemon/variant/332.json
@@ -1,34 +1,36 @@
 {
 	"1": {
-		"319452": "831a1f",
-		"4a7310": "982443",
-		"7ba563": "b44040",
-		"bdef84": "ec8c8c",
 		"8cbd63": "c54b4b",
-		"215200": "710f2e",
+		"a5d670": "df5252",
+		"4aa552": "9f2f2c",
 		"a5d674": "e16363",
-		"196b21": "891222",
+		"7aa953": "c54b4b",
+		"7ba563": "b44040",
+		"215200": "710f2e",
 		"f7ce00": "7aa1df",
 		"525252": "123a5a",
-		"63b56b": "b2332f",
-		"a5d673": "df5252",
 		"8c6b3a": "448bc3",
-		"4aa552": "9f2f2c"
+		"bdef84": "ec8c8c",
+		"63b56b": "b2332f",
+		"319452": "831a1f",
+		"196b21": "891222",
+		"4a7310": "982443"
 	},
 	"2": {
-		"319452": "b08d72",
-		"4a7310": "4f3956",
-		"7ba563": "704e7e",
-		"bdef84": "a779ba",
 		"8cbd63": "e3d7a6",
-		"215200": "583823",
+		"a5d670": "d7cda7",
+		"4aa552": "c5a77f",
 		"a5d674": "8c669b",
-		"196b21": "78582c",
+		"7aa953": "704e7e",
+		"7ba563": "704e7e",
+		"215200": "583823",
 		"f7ce00": "f2aacd",
 		"525252": "a53b6f",
-		"63b56b": "cfc191",
-		"a5d673": "d7cda7",
 		"8c6b3a": "df87bb",
-		"4aa552": "c5a77f"
+		"bdef84": "a779ba",
+		"63b56b": "cfc191",
+		"319452": "b08d72",
+		"196b21": "78582c",
+		"4a7310": "4f3956"
 	}
 }
\ No newline at end of file
diff --git a/public/images/pokemon/variant/back/332.json b/public/images/pokemon/variant/back/332.json
index c13c07c34b4..fbfb3705202 100644
--- a/public/images/pokemon/variant/back/332.json
+++ b/public/images/pokemon/variant/back/332.json
@@ -1,28 +1,28 @@
 {
 	"1": {
+		"196b21": "831a1f",
+		"7ba563": "b44040",
+		"215201": "630d28",
+		"215200": "710f2f",
+		"a5d674": "df5252",
+		"8cbd63": "c54b4b",
+		"63b56b": "b2332f",
+		"a5d670": "e16363",
 		"319452": "831a1f",
 		"4aa552": "9f2f2c",
-		"7ba563": "b44040",
-		"8cbd63": "c54b4b",
-		"215200": "710f2f",
-		"196b21": "831a1f",
-		"a5d674": "df5252",
-		"4a7310": "982443",
-		"a5d673": "e16363",
-		"63b56b": "b2332f",
-		"215201": "630d28"
+		"4a7310": "982443"
 	},
 	"2": {
+		"196b21": "b08d72",
+		"7ba563": "704e7e",
+		"215201": "583823",
+		"215200": "3f3249",
+		"a5d674": "d7cda7",
+		"8cbd63": "e3d7a6",
+		"63b56b": "cfc191",
+		"a5d670": "8c669b",
 		"319452": "b08d72",
 		"4aa552": "c5a77f",
-		"7ba563": "704e7e",
-		"8cbd63": "e3d7a6",
-		"215200": "3f3249",
-		"196b21": "b08d72",
-		"a5d674": "d7cda7",
-		"4a7310": "4f3956",
-		"a5d673": "8c669b",
-		"63b56b": "cfc191",
-		"215201": "583823"
+		"4a7310": "4f3956"
 	}
 }
\ No newline at end of file
diff --git a/public/images/pokemon/variant/back/female/332.json b/public/images/pokemon/variant/back/female/332.json
index 9ec50cb7e92..17f8d3c5f74 100644
--- a/public/images/pokemon/variant/back/female/332.json
+++ b/public/images/pokemon/variant/back/female/332.json
@@ -1,28 +1,28 @@
 {
 	"1": {
+		"196b21": "780d4a",
+		"7ba563": "b44040",
+		"215201": "710f2e",
+		"215200": "710f2f",
+		"a5d674": "de5b6f",
+		"8cbd63": "bf3d64",
+		"63b56b": "9e2056",
+		"a5d670": "e16363",
 		"319452": "780d4a",
 		"4aa552": "8a1652",
-		"7ba563": "b44040",
-		"8cbd63": "bf3d64",
-		"215200": "710f2f",
-		"196b21": "780d4a",
-		"a5d674": "de5b6f",
-		"4a7310": "982443",
-		"a5d673": "e16363",
-		"63b56b": "9e2056",
-		"215201": "710f2e"
+		"4a7310": "982443"
 	},
 	"2": {
+		"196b21": "b59c72",
+		"7ba563": "805a9c",
+		"215201": "694d37",
+		"215200": "41334d",
+		"a5d674": "f6f7df",
+		"8cbd63": "ebe9ca",
+		"63b56b": "e3ddb8",
+		"a5d670": "a473ba",
 		"319452": "b59c72",
 		"4aa552": "c9b991",
-		"7ba563": "805a9c",
-		"8cbd63": "ebe9ca",
-		"215200": "41334d",
-		"196b21": "b59c72",
-		"a5d674": "f6f7df",
-		"4a7310": "4f3956",
-		"a5d673": "a473ba",
-		"63b56b": "e3ddb8",
-		"215201": "694d37"
+		"4a7310": "4f3956"
 	}
 }
\ No newline at end of file
diff --git a/public/images/pokemon/variant/female/332.json b/public/images/pokemon/variant/female/332.json
index c86429d13c4..7a1dc0f1457 100644
--- a/public/images/pokemon/variant/female/332.json
+++ b/public/images/pokemon/variant/female/332.json
@@ -1,34 +1,36 @@
 {
 	"1": {
-		"319452": "780d4a",
-		"4a7310": "982443",
-		"7ba563": "b44040",
-		"bdef84": "ec8c8c",
 		"8cbd63": "bf3d64",
-		"215200": "710f2e",
+		"a5d670": "de5b6f",
+		"4aa552": "8a1652",
 		"a5d674": "e16363",
-		"196b21": "7d1157",
+		"7aa953": "bf3d64",
+		"7ba563": "b44040",
+		"215200": "710f2e",
 		"f7ce00": "5bcfc3",
 		"525252": "20668c",
-		"63b56b": "9e2056",
-		"a5d673": "de5b6f",
 		"8c6b3a": "33a3b0",
-		"4aa552": "8a1652"
+		"bdef84": "ec8c8c",
+		"63b56b": "9e2056",
+		"319452": "780d4a",
+		"196b21": "7d1157",
+		"4a7310": "982443"
 	},
 	"2": {
-		"319452": "b59c72",
-		"4a7310": "4f3956",
-		"7ba563": "805a9c",
-		"bdef84": "c193cf",
 		"8cbd63": "f6f7df",
-		"215200": "694d37",
+		"a5d670": "ebe9ca",
+		"4aa552": "c9b991",
 		"a5d674": "a473ba",
-		"196b21": "9c805f",
+		"7aa953": "805a9c",
+		"7ba563": "805a9c",
+		"215200": "694d37",
 		"f7ce00": "f2aab6",
 		"525252": "983364",
-		"63b56b": "e3ddb8",
-		"a5d673": "ebe9ca",
 		"8c6b3a": "df879f",
-		"4aa552": "c9b991"
+		"bdef84": "c193cf",
+		"63b56b": "e3ddb8",
+		"319452": "b59c72",
+		"196b21": "9c805f",
+		"4a7310": "4f3956"
 	}
 }
\ No newline at end of file
diff --git a/public/locales b/public/locales
index 42cd5cf577f..e9ccbadb6ea 160000
--- a/public/locales
+++ b/public/locales
@@ -1 +1 @@
-Subproject commit 42cd5cf577f475c22bc82d55e7ca358eb4f3184f
+Subproject commit e9ccbadb6eaa3b797f3dec919745befda2ec74bd
diff --git a/src/data/pokemon-species.ts b/src/data/pokemon-species.ts
index 59167ba47f6..5c97f360094 100644
--- a/src/data/pokemon-species.ts
+++ b/src/data/pokemon-species.ts
@@ -1697,8 +1697,8 @@ export function initSpecies() {
     new PokemonSpecies(Species.CHINCHOU, 2, false, false, false, "Angler Pokémon", PokemonType.WATER, PokemonType.ELECTRIC, 0.5, 12, Abilities.VOLT_ABSORB, Abilities.ILLUMINATE, Abilities.WATER_ABSORB, 330, 75, 38, 38, 56, 56, 67, 190, 50, 66, GrowthRate.SLOW, 50, false),
     new PokemonSpecies(Species.LANTURN, 2, false, false, false, "Light Pokémon", PokemonType.WATER, PokemonType.ELECTRIC, 1.2, 22.5, Abilities.VOLT_ABSORB, Abilities.ILLUMINATE, Abilities.WATER_ABSORB, 460, 125, 58, 58, 76, 76, 67, 75, 50, 161, GrowthRate.SLOW, 50, false),
     new PokemonSpecies(Species.PICHU, 2, false, false, false, "Tiny Mouse Pokémon", PokemonType.ELECTRIC, null, 0.3, 2, Abilities.STATIC, Abilities.NONE, Abilities.LIGHTNING_ROD, 205, 20, 40, 15, 35, 35, 60, 190, 70, 41, GrowthRate.MEDIUM_FAST, 50, false, false,
-      new PokemonForm("Normal", "", PokemonType.ELECTRIC, null, 1.4, 61.5, Abilities.STATIC, Abilities.NONE, Abilities.LIGHTNING_ROD, 205, 20, 40, 15, 35, 35, 60, 190, 70, 41, false, null, true),
-      new PokemonForm("Spiky-Eared", "spiky", PokemonType.ELECTRIC, null, 1.4, 61.5, Abilities.STATIC, Abilities.NONE, Abilities.LIGHTNING_ROD, 205, 20, 40, 15, 35, 35, 60, 190, 70, 41, false, null, true),
+      new PokemonForm("Normal", "", PokemonType.ELECTRIC, null, 1.4, 2, Abilities.STATIC, Abilities.NONE, Abilities.LIGHTNING_ROD, 205, 20, 40, 15, 35, 35, 60, 190, 70, 41, false, null, true),
+      new PokemonForm("Spiky-Eared", "spiky", PokemonType.ELECTRIC, null, 1.4, 2, Abilities.STATIC, Abilities.NONE, Abilities.LIGHTNING_ROD, 205, 20, 40, 15, 35, 35, 60, 190, 70, 41, false, null, true),
     ),
     new PokemonSpecies(Species.CLEFFA, 2, false, false, false, "Star Shape Pokémon", PokemonType.FAIRY, null, 0.3, 3, Abilities.CUTE_CHARM, Abilities.MAGIC_GUARD, Abilities.FRIEND_GUARD, 218, 50, 25, 28, 45, 55, 15, 150, 140, 44, GrowthRate.FAST, 25, false),
     new PokemonSpecies(Species.IGGLYBUFF, 2, false, false, false, "Balloon Pokémon", PokemonType.NORMAL, PokemonType.FAIRY, 0.3, 1, Abilities.CUTE_CHARM, Abilities.COMPETITIVE, Abilities.FRIEND_GUARD, 210, 90, 30, 15, 40, 20, 15, 170, 50, 42, GrowthRate.FAST, 25, false),
@@ -3121,7 +3121,7 @@ export function initSpecies() {
     ),
     new PokemonSpecies(Species.WALKING_WAKE, 9, false, false, false, "Paradox Pokémon", PokemonType.WATER, PokemonType.DRAGON, 3.5, 280, Abilities.PROTOSYNTHESIS, Abilities.NONE, Abilities.NONE, 590, 99, 83, 91, 125, 83, 109, 10, 0, 295, GrowthRate.SLOW, null, false), //Custom Catchrate, matching Gouging Fire and Raging Bolt
     new PokemonSpecies(Species.IRON_LEAVES, 9, false, false, false, "Paradox Pokémon", PokemonType.GRASS, PokemonType.PSYCHIC, 1.5, 125, Abilities.QUARK_DRIVE, Abilities.NONE, Abilities.NONE, 590, 90, 130, 88, 70, 108, 104, 10, 0, 295, GrowthRate.SLOW, null, false), //Custom Catchrate, matching Iron Boulder and Iron Crown
-    new PokemonSpecies(Species.DIPPLIN, 9, false, false, false, "Candy Apple Pokémon", PokemonType.GRASS, PokemonType.DRAGON, 0.4, 9.7, Abilities.SUPERSWEET_SYRUP, Abilities.GLUTTONY, Abilities.STICKY_HOLD, 485, 80, 80, 110, 95, 80, 40, 45, 50, 170, GrowthRate.ERRATIC, 50, false),
+    new PokemonSpecies(Species.DIPPLIN, 9, false, false, false, "Candy Apple Pokémon", PokemonType.GRASS, PokemonType.DRAGON, 0.4, 4.4, Abilities.SUPERSWEET_SYRUP, Abilities.GLUTTONY, Abilities.STICKY_HOLD, 485, 80, 80, 110, 95, 80, 40, 45, 50, 170, GrowthRate.ERRATIC, 50, false),
     new PokemonSpecies(Species.POLTCHAGEIST, 9, false, false, false, "Matcha Pokémon", PokemonType.GRASS, PokemonType.GHOST, 0.1, 1.1, Abilities.HOSPITALITY, Abilities.NONE, Abilities.HEATPROOF, 308, 40, 45, 45, 74, 54, 50, 120, 50, 62, GrowthRate.SLOW, null, false, false,
       new PokemonForm("Counterfeit Form", "counterfeit", PokemonType.GRASS, PokemonType.GHOST, 0.1, 1.1, Abilities.HOSPITALITY, Abilities.NONE, Abilities.HEATPROOF, 308, 40, 45, 45, 74, 54, 50, 120, 50, 62, false, null, true),
       new PokemonForm("Artisan Form", "artisan", PokemonType.GRASS, PokemonType.GHOST, 0.1, 1.1, Abilities.HOSPITALITY, Abilities.NONE, Abilities.HEATPROOF, 308, 40, 45, 45, 74, 54, 50, 120, 50, 62, false, null, false, true),
diff --git a/src/phases/switch-summon-phase.ts b/src/phases/switch-summon-phase.ts
index a063b6e6863..3e9cc7718f1 100644
--- a/src/phases/switch-summon-phase.ts
+++ b/src/phases/switch-summon-phase.ts
@@ -124,6 +124,12 @@ export class SwitchSummonPhase extends SummonPhase {
     const switchedInPokemon: Pokemon | undefined = party[this.slotIndex];
     this.lastPokemon = this.getPokemon();
 
+    // Defensive programming: Overcome the bug where the summon data has somehow not been reset
+    // prior to switching in a new Pokemon.
+    // Force the switch to occur and load the assets for the new pokemon, ignoring override.
+    switchedInPokemon.resetSummonData();
+    switchedInPokemon.loadAssets(true);
+
     applyPreSummonAbAttrs(PreSummonAbAttr, switchedInPokemon);
     applyPreSwitchOutAbAttrs(PreSwitchOutAbAttr, this.lastPokemon);
     if (!switchedInPokemon) {
@@ -131,6 +137,7 @@ export class SwitchSummonPhase extends SummonPhase {
       return;
     }
 
+
     if (this.switchType === SwitchType.BATON_PASS) {
       // If switching via baton pass, update opposing tags coming from the prior pokemon
       (this.player ? globalScene.getEnemyField() : globalScene.getPlayerField()).forEach((enemyPokemon: Pokemon) =>