From 4b324e536e17caa42ca73b50733d69e1a5a8ddf4 Mon Sep 17 00:00:00 2001
From: Guangcong Luo <guangcongluo@gmail.com>
Date: Mon, 2 Dec 2019 13:56:18 +0900
Subject: [PATCH] Revert "Pokedex: Update formes"

This reverts commit 302f3913818acf0ab68351acf0f15f5e4d58f625.

Fixes a bug in 77cca394bd6ce
---
 data/abilities.js              |  2 +-
 data/formats-data.js           |  4 ++--
 data/mods/gen7/formats-data.js |  2 +-
 data/pokedex.js                | 26 ++++++++++++++------------
 4 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/data/abilities.js b/data/abilities.js
index f3b8ec5d44..edab8fddd0 100644
--- a/data/abilities.js
+++ b/data/abilities.js
@@ -762,7 +762,7 @@ let BattleAbilities = {
 		},
 		onUpdate(pokemon) {
 			if (['mimikyu', 'mimikyutotem'].includes(pokemon.template.speciesid) && this.effectData.busted) {
-				let templateid = pokemon.template.speciesid + 'busted';
+				let templateid = pokemon.template.speciesid === 'mimikyutotem' ? 'Mimikyu-Busted-Totem' : 'Mimikyu-Busted';
 				pokemon.formeChange(templateid, this.effect, true);
 				this.damage(pokemon.maxhp / 8, pokemon, pokemon);
 			}
diff --git a/data/formats-data.js b/data/formats-data.js
index 2648ec6cff..1343f1f229 100644
--- a/data/formats-data.js
+++ b/data/formats-data.js
@@ -5392,7 +5392,7 @@ let BattleFormatsData = {
 		tier: "OU",
 		doublesTier: "New",
 	},
-	darmanitangalarzen: {
+	darmanitanzengalar: {
 		requiredAbility: "Zen Mode",
 		battleOnly: true,
 	},
@@ -7124,7 +7124,7 @@ let BattleFormatsData = {
 		isNonstandard: "Past",
 		tier: "Illegal",
 	},
-	mimikyutotembusted: {
+	mimikyubustedtotem: {
 		requiredAbility: 'Disguise',
 		battleOnly: true,
 		isNonstandard: "Past",
diff --git a/data/mods/gen7/formats-data.js b/data/mods/gen7/formats-data.js
index dbce844975..7987b4f170 100644
--- a/data/mods/gen7/formats-data.js
+++ b/data/mods/gen7/formats-data.js
@@ -5499,7 +5499,7 @@ let BattleFormatsData = {
 		tier: "UU",
 		doublesTier: "DUU",
 	},
-	mimikyutotembusted: {
+	mimikyubustedtotem: {
 		requiredAbility: 'Disguise',
 		battleOnly: true,
 	},
diff --git a/data/pokedex.js b/data/pokedex.js
index e7199fd8a2..3cefd827c2 100644
--- a/data/pokedex.js
+++ b/data/pokedex.js
@@ -7044,6 +7044,7 @@ let BattlePokedex = {
 		heightm: 0.5,
 		weightkg: 9.3,
 		color: "Pink",
+		prevo: "cherubi",
 		evoLevel: 25,
 		eggGroups: ["Fairy", "Grass"],
 	},
@@ -9262,7 +9263,7 @@ let BattlePokedex = {
 		prevo: "darumaka",
 		evoLevel: 35,
 		eggGroups: ["Field"],
-		otherFormes: ["darmanitanzen", "darmanitangalar"],
+		otherFormes: ["darmanitanzen", "darmanitangalar", "darmanitanzengalar"],
 	},
 	darmanitanzen: {
 		num: 555,
@@ -9275,6 +9276,7 @@ let BattlePokedex = {
 		heightm: 1.3,
 		weightkg: 92.9,
 		color: "Blue",
+		prevo: "darumaka",
 		evoLevel: 35,
 		eggGroups: ["Field"],
 	},
@@ -9293,19 +9295,19 @@ let BattlePokedex = {
 		evoType: "useItem",
 		evoItem: "Ice Stone",
 		eggGroups: ["Field"],
-		otherFormes: ["darmanitangalarzen"],
 	},
-	darmanitangalarzen: {
+	darmanitanzengalar: {
 		num: 555,
-		species: "Darmanitan-Galar-Zen",
-		baseSpecies: "Darmanitan-Galar",
-		forme: "Zen",
+		species: "Darmanitan-Zen-Galar",
+		baseSpecies: "Darmanitan",
+		forme: "Zen-Galar",
 		types: ["Ice", "Fire"],
 		baseStats: {hp: 105, atk: 160, def: 55, spa: 30, spd: 55, spe: 135},
 		abilities: {0: "Zen Mode"},
 		heightm: 1.7,
 		weightkg: 120,
 		color: "White",
+		prevo: "darumakagalar",
 		evoType: "useItem",
 		evoItem: "Ice Stone",
 		eggGroups: ["Field"],
@@ -11236,6 +11238,7 @@ let BattlePokedex = {
 		heightm: 1.7,
 		weightkg: 53,
 		color: "Brown",
+		prevo: "doublade",
 		evoType: "useItem",
 		evoItem: "Dusk Stone",
 		eggGroups: ["Mineral"],
@@ -13100,7 +13103,7 @@ let BattlePokedex = {
 		weightkg: 0.7,
 		color: "Yellow",
 		eggGroups: ["Amorphous"],
-		otherFormes: ["mimikyubusted", "mimikyutotem"],
+		otherFormes: ["mimikyubusted", "mimikyutotem", "mimikyubustedtotem"],
 	},
 	mimikyubusted: {
 		num: 778,
@@ -13127,13 +13130,12 @@ let BattlePokedex = {
 		weightkg: 2.8,
 		color: "Yellow",
 		eggGroups: ["Amorphous"],
-		otherFormes: ["mimikyutotembusted"],
 	},
-	mimikyutotembusted: {
+	mimikyubustedtotem: {
 		num: 778,
-		species: "Mimikyu-Totem-Busted",
-		baseSpecies: "Mimikyu-Totem",
-		forme: "Busted",
+		species: "Mimikyu-Busted-Totem",
+		baseSpecies: "Mimikyu",
+		forme: "Busted-Totem",
 		types: ["Ghost", "Fairy"],
 		baseStats: {hp: 55, atk: 90, def: 80, spa: 50, spd: 105, spe: 96},
 		abilities: {0: "Disguise"},