From 5fdc133955a95643fe34148c5f9ba0d68dffd256 Mon Sep 17 00:00:00 2001
From: Wlowscha <54003515+Wlowscha@users.noreply.github.com>
Date: Thu, 27 Mar 2025 04:26:03 +0100
Subject: [PATCH] =?UTF-8?q?[UI/UX]=20Pok=C3=A9dex=20filters=20correctly=20?=
 =?UTF-8?q?show=20split=20passives=20(#5560)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Pokédex filters properly take split passives into account

* Removed unused dependency
---
 src/ui/pokedex-ui-handler.ts | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/ui/pokedex-ui-handler.ts b/src/ui/pokedex-ui-handler.ts
index 1f79d7006b0..d55b278a148 100644
--- a/src/ui/pokedex-ui-handler.ts
+++ b/src/ui/pokedex-ui-handler.ts
@@ -37,11 +37,10 @@ import { addWindow } from "./ui-theme";
 import type { OptionSelectConfig } from "./abstact-option-select-ui-handler";
 import { FilterText, FilterTextRow } from "./filter-text";
 import { allAbilities } from "#app/data/ability";
-import type { PassiveAbilities } from "#app/data/balance/passives";
 import { starterPassiveAbilities } from "#app/data/balance/passives";
 import { allMoves } from "#app/data/moves/move";
 import { speciesTmMoves } from "#app/data/balance/tms";
-import { pokemonStarters } from "#app/data/balance/pokemon-evolutions";
+import { pokemonPrevolutions, pokemonStarters } from "#app/data/balance/pokemon-evolutions";
 import { Biome } from "#enums/biome";
 import { globalScene } from "#app/global-scene";
 
@@ -1404,7 +1403,12 @@ export default class PokedexUiHandler extends MessageUiHandler {
 
       // Ability filter
       const abilities = [species.ability1, species.ability2, species.abilityHidden].map(a => allAbilities[a].name);
-      const passives = starterPassiveAbilities[starterId] ?? ({} as PassiveAbilities);
+      const passiveId = starterPassiveAbilities.hasOwnProperty(species.speciesId)
+        ? species.speciesId
+        : starterPassiveAbilities.hasOwnProperty(starterId)
+          ? starterId
+          : pokemonPrevolutions[starterId];
+      const passives = starterPassiveAbilities[passiveId];
 
       const selectedAbility1 = this.filterText.getValue(FilterTextRow.ABILITY_1);
       const fitsFormAbility1 = species.forms.some(form =>