From 10752415dea42ecf075fef8273bb23a49bbcfee8 Mon Sep 17 00:00:00 2001 From: AJ Fontaine Date: Thu, 20 Feb 2025 19:13:42 -0500 Subject: [PATCH] Add null check --- src/data/pokemon-species.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/data/pokemon-species.ts b/src/data/pokemon-species.ts index 11bd7099670..2c2cf47278f 100644 --- a/src/data/pokemon-species.ts +++ b/src/data/pokemon-species.ts @@ -833,7 +833,7 @@ export default class PokemonSpecies extends PokemonSpeciesForm implements Locali if ( // If evolutions shouldn't happen, add more cases here :) !allowEvolving || !pokemonEvolutions.hasOwnProperty(this.speciesId) - || globalScene.currentBattle.waveIndex === 20 && globalScene.gameMode.isClassic && globalScene.currentBattle.trainer + || globalScene.currentBattle?.waveIndex === 20 && globalScene.gameMode.isClassic && globalScene.currentBattle.trainer ) { return this.speciesId; }