From 91e84d49dad78d6cbb189bd39fe1eb36a8d4e3c9 Mon Sep 17 00:00:00 2001
From: asgdf <asgdf@users.noreply.github.com>
Date: Sat, 20 Apr 2019 07:38:51 +0200
Subject: [PATCH] Teambuilder: Fix changed hidden abilities in older gens
 (#1266)

---
 build-tools/build-indexes | 5 +++++
 src/battle-dex.ts         | 3 +++
 2 files changed, 8 insertions(+)

diff --git a/build-tools/build-indexes b/build-tools/build-indexes
index 71662dd15..d3eb18b68 100755
--- a/build-tools/build-indexes
+++ b/build-tools/build-indexes
@@ -718,6 +718,8 @@ process.stdout.write("Building `data/teambuilder-tables.js`... ");
 		BattleTeambuilderTable[gen].overrideType = overrideType;
 		const overrideAbility = {};
 		BattleTeambuilderTable[gen].overrideAbility = overrideAbility;
+		const overrideHiddenAbility = {};
+		BattleTeambuilderTable[gen].overrideHiddenAbility = overrideHiddenAbility;
 		const removeSecondAbility = {};
 		BattleTeambuilderTable[gen].removeSecondAbility = removeSecondAbility;
 		for (const id in genData.Pokedex) {
@@ -737,6 +739,9 @@ process.stdout.write("Building `data/teambuilder-tables.js`... ");
 			if (pastEntry.abilities['0'] !== nowEntry.abilities['0']) {
 				overrideAbility[id] = pastEntry.abilities['0'];
 			}
+			if (pastEntry.abilities['H'] !== nowEntry.abilities['H']) {
+				overrideHiddenAbility[id] = pastEntry.abilities['H'];
+			}
 			// in the gen 3 dex, Pokemon already have the abilities that were added in gen 4
 			const hasAbilityFromNewerGen = Dex.getTemplate(id).gen <= genNum && Dex.getAbility(pastEntry.abilities['1']).gen > genNum;
 			if ((!pastEntry.abilities['1'] && nowEntry.abilities['1']) || hasAbilityFromNewerGen) {
diff --git a/src/battle-dex.ts b/src/battle-dex.ts
index a82bdbe98..ce82059c3 100644
--- a/src/battle-dex.ts
+++ b/src/battle-dex.ts
@@ -771,6 +771,9 @@ class ModdedDex {
 			if (id in table.removeSecondAbility) {
 				delete abilities['1'];
 			}
+			if (id in table.overrideHiddenAbility) {
+				abilities['H'] = table.overrideHiddenAbility[id];
+			}
 			if (this.gen < 5) delete abilities['H'];
 			if (this.gen < 7) delete abilities['S'];