From b52fda36326b6f09970697417f40e6eaf8876da6 Mon Sep 17 00:00:00 2001 From: AJ Fontaine Date: Wed, 13 Nov 2024 19:36:25 -0500 Subject: [PATCH] Remove Pika/Eevee forms from Trainers before wave 30, and BB Gren --- src/battle-scene.ts | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/battle-scene.ts b/src/battle-scene.ts index c30ab2e2912..d1607be0332 100644 --- a/src/battle-scene.ts +++ b/src/battle-scene.ts @@ -1397,10 +1397,19 @@ export default class BattleScene extends SceneBase { case Species.PALDEA_TAUROS: return Utils.randSeedInt(species.forms.length); case Species.PIKACHU: + if (this.currentBattle.battleType === BattleType.TRAINER && this.currentBattle.waveIndex < 30) { + return 0; + } return Utils.randSeedInt(8); case Species.EEVEE: + if (this.currentBattle.battleType === BattleType.TRAINER && this.currentBattle.waveIndex < 30) { + return 0; // No Partner Eevee for Wave 12 Preschoolers + } return Utils.randSeedInt(2); case Species.GRENINJA: + if (this.currentBattle.battleType === BattleType.TRAINER) { + return 0; // Don't give trainers Battle Bond Greninja + } return Utils.randSeedInt(2); case Species.ZYGARDE: return Utils.randSeedInt(4);