Fix 4b324e5

This reverts the other changes that were related to that commit.
kirliavc · Dec 2, 2019 · a133a5b · a133a5b
1 parent 953531c
commit a133a5b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/data/abilities.js b/data/abilities.js
@@ -4641,9 +4641,9 @@ let BattleAbilities = {
 			if (pokemon.baseTemplate.baseSpecies !== 'Darmanitan' || pokemon.transformed) {
 				return;
 			}
-			if (pokemon.hp <= pokemon.maxhp / 2 && pokemon.template.forme !== 'Zen') {
+			if (pokemon.hp <= pokemon.maxhp / 2 && !['Zen', 'Zen-Galar'].includes(pokemon.template.forme)) {
 				pokemon.addVolatile('zenmode');
-			} else if (pokemon.hp > pokemon.maxhp / 2 && pokemon.template.forme === 'Zen') {
+			} else if (pokemon.hp > pokemon.maxhp / 2 && ['Zen', 'Zen-Galar'].includes(pokemon.template.forme)) {
 				pokemon.addVolatile('zenmode'); // in case of base Darmanitan-Zen
 				pokemon.removeVolatile('zenmode');
 			}
@@ -4652,18 +4652,18 @@ let BattleAbilities = {
 			if (!pokemon.volatiles['zenmode'] || !pokemon.hp) return;
 			pokemon.transformed = false;
 			delete pokemon.volatiles['zenmode'];
-			pokemon.formeChange(pokemon.template.baseSpecies, this.effect, false, '[silent]');
+			pokemon.formeChange(pokemon.template.inheritsLearnsetFrom, this.effect, false, '[silent]');
 		},
 		effect: {
 			onStart(pokemon) {
 				if (!pokemon.template.species.includes('Galar')) {
 					if (pokemon.template.speciesid !== 'darmanitanzen') pokemon.formeChange('Darmanitan-Zen');
 				} else {
-					if (pokemon.template.speciesid !== 'darmanitangalarzen') pokemon.formeChange('Darmanitan-Galar-Zen');
+					if (pokemon.template.speciesid !== 'darmanitanzengalar') pokemon.formeChange('Darmanitan-Zen-Galar');
 				}
 			},
 			onEnd(pokemon) {
-				if (pokemon.template.forme === 'Zen') pokemon.formeChange(pokemon.template.baseSpecies);
+				if (['Zen', 'Zen-Galar'].includes(pokemon.template.forme)) pokemon.formeChange(pokemon.template.inheritsLearnsetFrom);
 			},
 		},
 		id: "zenmode",

diff --git a/data/mods/gen7/abilities.js b/data/mods/gen7/abilities.js
@@ -8,7 +8,7 @@ let BattleAbilities = {
 		shortDesc: "(Mimikyu only) First hit deals 0 damage, breaks disguise.",
 		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);
 			}
 		},

diff --git a/sim/dex-data.ts b/sim/dex-data.ts
@@ -676,7 +676,7 @@ export class Template extends BasicEffect implements Readonly<BasicEffect & Temp
 		}
 
 		if (!this.gen && this.num >= 1) {
-			if (this.num >= 810 || this.species.includes('Galar') || this.forme === 'Gmax') {
+			if (this.num >= 810 || this.forme.endsWith('Galar') || this.forme === 'Gmax') {
 				this.gen = 8;
 			} else if (this.num >= 722 || this.forme.startsWith('Alola') || this.forme === 'Starter') {
 				this.gen = 7;