From 0357b2bb5864222ec3fd171c8bed00ad8858008b Mon Sep 17 00:00:00 2001
From: Wlowscha <54003515+Wlowscha@users.noreply.github.com>
Date: Sun, 16 Mar 2025 12:24:24 +0100
Subject: [PATCH] Fixing Basculin

---
 src/data/challenge.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/data/challenge.ts b/src/data/challenge.ts
index d9f5dc3d24e..1c40c63dd31 100644
--- a/src/data/challenge.ts
+++ b/src/data/challenge.ts
@@ -1281,7 +1281,11 @@ export function checkStarterValidForChallenge(species: PokemonSpecies, props: De
     }
     if (checking && pokemonEvolutions.hasOwnProperty(checking)) {
       pokemonEvolutions[checking].forEach(e => {
-        speciesToCheck.push(e.speciesId);
+        // Form check to deal with cases such as Basculin -> Basculegion
+        // TODO: does this miss anything if checking forms of a stage 2 Pokémon?
+        if (!e?.preFormKey || e.preFormKey === species.forms[props.formIndex].formKey) {
+          speciesToCheck.push(e.speciesId);
+        }
       });
     }
   }