From 58d9c59fcde4df2fef881534f79338d60808ede5 Mon Sep 17 00:00:00 2001
From: Wlowscha <54003515+Wlowscha@users.noreply.github.com>
Date: Sat, 8 Feb 2025 23:04:24 +0100
Subject: [PATCH] Pikachu does not break the dex due to having no passive

---
 src/ui/pokedex-page-ui-handler.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/ui/pokedex-page-ui-handler.ts b/src/ui/pokedex-page-ui-handler.ts
index fb92cdd4d4d..4f7b614d263 100644
--- a/src/ui/pokedex-page-ui-handler.ts
+++ b/src/ui/pokedex-page-ui-handler.ts
@@ -628,7 +628,9 @@ export default class PokedexPageUiHandler extends MessageUiHandler {
     this.tmMoves = speciesTmMoves[species.speciesId]?.filter(m => Array.isArray(m) ? (m[0] === formKey ? true : false ) : true)
       .map(m => Array.isArray(m) ? m[1] : m).sort((a, b) => allMoves[a].name > allMoves[b].name ? 1 : -1) ?? [];
 
-    const passives = starterPassiveAbilities[this.getStarterSpeciesId(species.speciesId)];
+    const passiveId = starterPassiveAbilities.hasOwnProperty(species.speciesId) ? species.speciesId :
+      starterPassiveAbilities.hasOwnProperty(this.getStarterSpeciesId(species.speciesId)) ? this.getStarterSpeciesId(species.speciesId) : pokemonPrevolutions[this.getStarterSpeciesId(species.speciesId)];
+    const passives = starterPassiveAbilities[passiveId];
     this.passive = (this.formIndex in passives) ? passives[formIndex] : passives[0];
 
     const starterData = globalScene.gameData.starterData[this.getStarterSpeciesId(species.speciesId)];