diff --git a/src/battle-scene.ts b/src/battle-scene.ts
index 3b6e716e436..00149db3d50 100644
--- a/src/battle-scene.ts
+++ b/src/battle-scene.ts
@@ -388,7 +388,6 @@ export default class BattleScene extends SceneBase {
 
   public inputMethod: string;
   private infoToggles: InfoToggle[] = [];
-  public waveIndex: number | null;
 
   public eventManager: TimedEventManager;
 
@@ -1555,7 +1554,6 @@ export default class BattleScene extends SceneBase {
     this.resetSeed(newWaveIndex);
 
     const playerField = this.getPlayerField();
-    this.waveIndex = newWaveIndex; // temporary wave index so it can be accessed by trainer constructor
 
     if (
       this.gameMode.isFixedBattle(newWaveIndex) &&
diff --git a/src/field/trainer.ts b/src/field/trainer.ts
index 882dc767e4f..a51b9cbdbb8 100644
--- a/src/field/trainer.ts
+++ b/src/field/trainer.ts
@@ -70,7 +70,7 @@ export default class Trainer extends Phaser.GameObjects.Container {
       }
     }
 
-    if (this.config.trainerAI.teraMode === TeraAIMode.INSTANT_TERA && globalScene.waveIndex && globalScene.waveIndex >= this.config.minTeraWave) {
+    if (this.config.trainerAI.teraMode === TeraAIMode.INSTANT_TERA) {
       this.teraIndexes.push(...this.config.trainerAI.instantTeras.map(i => i < 0 ? this.getPartyTemplate().size + i : i));
       console.log("Tera index %d", this.teraIndexes[0]);
       if (this.teraIndexes.length === 0) {
@@ -444,7 +444,7 @@ export default class Trainer extends Phaser.GameObjects.Container {
       while (retry && evoAttempt++ < 10) {
         ret = getPokemonSpecies(baseSpecies.getTrainerSpeciesForLevel(level, true, strength, globalScene.currentBattle.waveIndex));
         console.log(ret.name);
-        if (!ret.isOfType(this.config.specialtyType)) {
+        if (ret.isOfType(this.config.specialtyType)) {
           retry = false;
         }
       }