From c70b247579b90bc06c1c170ecc830775f33e69a8 Mon Sep 17 00:00:00 2001
From: cawtds <38510667+cawtds@users.noreply.github.com>
Date: Sat, 14 Mar 2026 18:33:43 +0100
Subject: [PATCH] Fix assert hits when species are disabled (#9520)

---
 src/battle_pyramid.c | 3 +++
 src/frontier_util.c  | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/src/battle_pyramid.c b/src/battle_pyramid.c
index f777be99cf..a652d77a10 100644
--- a/src/battle_pyramid.c
+++ b/src/battle_pyramid.c
@@ -1362,6 +1362,9 @@ static bool32 CheckBattlePyramidEvoRequirement(u16 species, const u16 *evoItems,
     u32 i, j, k;
     for (i = 0; i < NUM_SPECIES; i++)
     {
+        if (!IsSpeciesEnabled(i))
+            continue;
+
         const struct Evolution *evolutions = GetSpeciesEvolutions(i);
         if (evolutions == NULL)
             continue;
diff --git a/src/frontier_util.c b/src/frontier_util.c
index eb6978ea91..181c91b3e8 100644
--- a/src/frontier_util.c
+++ b/src/frontier_util.c
@@ -3352,6 +3352,9 @@ static u16 *MakeCaughtBannesSpeciesList(u32 totalBannedSpecies)
     u16 *list = AllocZeroed(sizeof(u16) * totalBannedSpecies);
     for (u32 i = 0; i < NUM_SPECIES; i++)
     {
+        if (!IsSpeciesEnabled(i))
+            continue;
+
         u32 baseSpecies = GET_BASE_SPECIES_ID(i);
         if (baseSpecies == i && gSpeciesInfo[baseSpecies].isFrontierBanned)
         {