From a51fcba53fd4bb3bcc092f074883c69b60b0dfbe Mon Sep 17 00:00:00 2001
From: Kris Johnson <11083252+KrisXV@users.noreply.github.com>
Date: Sun, 22 Dec 2019 06:39:06 -0700
Subject: [PATCH] Teambuilder: Fix learnset and tier issues for National Dex
 metas (#1431)

* Teambuilder: Fix learnsets for National Dex metas

* Fix issue with banned Pokemon still showing as OU

* remove space
---
 build-tools/build-indexes | 14 ++++++++++----
 js/search.js              |  2 +-
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/build-tools/build-indexes b/build-tools/build-indexes
index 7c163d148..c5ed4fef6 100755
--- a/build-tools/build-indexes
+++ b/build-tools/build-indexes
@@ -310,11 +310,17 @@ process.stdout.write("Building `data/teambuilder-tables.js`... ");
 					let tier = template.tier;
 					if (template.tier === 'Illegal' || template.isNonstandard === 'Past' || template.isUnreleased === 'Past') tier = Dex.mod('gen7').getTemplate(template.species).tier;
 					let banlist = Dex.getFormat('gen8nationaldex').banlist;
-					if (tier === 'Uber') {
-						if (banlist.includes(template.species) || banlist.includes(template.species + '-Base')) return tier;
-						if (banlist.includes(template.baseSpecies)) return tier;
-						if (['Zygarde-Complete', 'Necrozma-Ultra'].includes(template.species)) return tier;
+					if (
+						banlist.includes(template.species) ||
+						banlist.includes(template.species + '-Base') ||
+						banlist.includes(template.baseSpecies) ||
+						['Zygarde-Complete', 'Necrozma-Ultra'].includes(template.species)
+					)  {
+						tier = 'Uber';
+						return tier;
+					} else if (tier === 'Uber') { // This check is for Pokemon tiered as Uber but aren't in the banlist for National Dex
 						tier = 'OU';
+						return tier;
 					}
 					if (['Meltan', 'Melmetal', 'Melmetal-Gmax'].includes(template.species)) tier = 'OU';
 					if (template.species === 'Toxtricity-Gmax') tier = Dex.getTemplate('toxtricity').tier;
diff --git a/js/search.js b/js/search.js
index 380876049..47a0beddd 100644
--- a/js/search.js
+++ b/js/search.js
@@ -811,7 +811,7 @@
 		}
 		var requirePentagon = (format === 'battlespotsingles' || format === 'battledoubles' || format.slice(0, 3) === 'vgc');
 		 // CAP check is temporary
-		var requireGalar = (this.gen === 8 && format.indexOf('nationaldex') < 0 && format.indexOf('cap') < 0);
+		var requireGalar = (this.gen === 8 && !isNatDex && format.indexOf('cap') < 0);
 		var template;
 		var isBH = (format === 'balancedhackmons' || format === 'bh');
 		this.resultSet = null;