From fe19d32b65e71ecf4bd86f807a65a4db247db0b7 Mon Sep 17 00:00:00 2001
From: Kris Johnson <11083252+KrisXV@users.noreply.github.com>
Date: Thu, 7 May 2020 22:11:24 -0600
Subject: [PATCH] Fix Pokemon that inherit movesets from base formes (#1507)

---
 src/battle-dex-search.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/battle-dex-search.ts b/src/battle-dex-search.ts
index 5c9fcb47c..c5891454e 100644
--- a/src/battle-dex-search.ts
+++ b/src/battle-dex-search.ts
@@ -682,7 +682,11 @@ abstract class BattleTypedSearch<T extends SearchType> {
 		if (!species) return '' as ID;
 		if (species.prevo) return toID(species.prevo);
 		let baseSpecies = species.baseSpecies;
-		if (baseSpecies !== species.name && (baseSpecies === 'Rotom' || baseSpecies === 'Pumpkaboo')) {
+		if (species.changesFrom) {
+			return toID(species.changesFrom);
+		}
+		if (baseSpecies !== species.name && baseSpecies === 'Pumpkaboo') {
+			// Pumpkaboo-Super event
 			return toID(species.baseSpecies);
 		}
 		return '' as ID;