From 76453a31d1ee6bd42f4ea37b93a88e7a008e5240 Mon Sep 17 00:00:00 2001
From: damocleas <damocleas25@gmail.com>
Date: Fri, 31 Oct 2025 00:47:07 -0400
Subject: [PATCH] [Balance][Bug] Rival Fight 3 Fix, Move Noibat in Biomes

Electivire corrected to be Electabuzz in Slot 3 on Fight 3 (55)

Noibat has been moved from Uncommon -> Rare in Grassy Field
---
 src/data/balance/biomes.ts              | 8 ++++----
 src/data/balance/init-biomes.ts         | 2 +-
 src/data/trainers/rival-party-config.ts | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/data/balance/biomes.ts b/src/data/balance/biomes.ts
index 562c07396e0..f81f76058ec 100644
--- a/src/data/balance/biomes.ts
+++ b/src/data/balance/biomes.ts
@@ -163,15 +163,15 @@ export const biomePokemonPools: BiomePokemonPools = {
     [BiomePoolTier.UNCOMMON]: {
       [TimeOfDay.DAWN]: [ SpeciesId.SUNKERN, SpeciesId.COMBEE ],
       [TimeOfDay.DAY]: [ SpeciesId.SUNKERN, SpeciesId.COMBEE ],
-      [TimeOfDay.DUSK]: [ SpeciesId.SEEDOT, SpeciesId.NOIBAT ],
-      [TimeOfDay.NIGHT]: [ SpeciesId.SEEDOT, SpeciesId.NOIBAT ],
+      [TimeOfDay.DUSK]: [ SpeciesId.SEEDOT ],
+      [TimeOfDay.NIGHT]: [ SpeciesId.SEEDOT ],
       [TimeOfDay.ALL]: [ SpeciesId.MILTANK, SpeciesId.CHERUBI, SpeciesId.FOONGUS, ]
     },
     [BiomePoolTier.RARE]: {
       [TimeOfDay.DAWN]: [],
       [TimeOfDay.DAY]: [],
-      [TimeOfDay.DUSK]: [],
-      [TimeOfDay.NIGHT]: [],
+      [TimeOfDay.DUSK]: [ SpeciesId.NOIBAT ],
+      [TimeOfDay.NIGHT]: [ SpeciesId.NOIBAT ],
       [TimeOfDay.ALL]: [ SpeciesId.BULBASAUR, SpeciesId.GROWLITHE, SpeciesId.TURTWIG, SpeciesId.BONSLY ]
     },
     [BiomePoolTier.SUPER_RARE]: { [TimeOfDay.DAWN]: [], [TimeOfDay.DAY]: [], [TimeOfDay.DUSK]: [], [TimeOfDay.NIGHT]: [], [TimeOfDay.ALL]: [] },
diff --git a/src/data/balance/init-biomes.ts b/src/data/balance/init-biomes.ts
index 1b410e637e8..eb2d4151fbf 100644
--- a/src/data/balance/init-biomes.ts
+++ b/src/data/balance/init-biomes.ts
@@ -3547,7 +3547,7 @@ export function initBiomes() {
     ],
     [SpeciesId.NOIBAT, PokemonType.FLYING, PokemonType.DRAGON, [
       [BiomeId.CAVE, BiomePoolTier.UNCOMMON],
-      [BiomeId.GRASS, BiomePoolTier.UNCOMMON, [TimeOfDay.DUSK, TimeOfDay.NIGHT]]
+      [BiomeId.GRASS, BiomePoolTier.RARE, [TimeOfDay.DUSK, TimeOfDay.NIGHT]]
     ]
     ],
     [SpeciesId.NOIVERN, PokemonType.FLYING, PokemonType.DRAGON, [
diff --git a/src/data/trainers/rival-party-config.ts b/src/data/trainers/rival-party-config.ts
index fa040ff66de..67b3f50d379 100644
--- a/src/data/trainers/rival-party-config.ts
+++ b/src/data/trainers/rival-party-config.ts
@@ -298,7 +298,7 @@ const SLOT_3_FIGHT_3 = [
   SpeciesId.RHYDON,
   SpeciesId.TANGROWTH,
   SpeciesId.PORYGON2,
-  SpeciesId.ELECTIVIRE,
+  SpeciesId.ELECTABUZZ,
   SpeciesId.MAGMAR,
   SpeciesId.AZUMARILL,
   SpeciesId.URSARING,