From 4a399465d27b10692cf38b841dc4cc9675ee3593 Mon Sep 17 00:00:00 2001
From: Arxalc <63990624+Arxalc@users.noreply.github.com>
Date: Sat, 13 Jul 2024 14:09:33 -0400
Subject: [PATCH] [Bug] Fix Clear terrains upon Trainer Battle (#2027)

* Clear terrains upon Trainer Battle

* Adjusted comment
---
 src/battle-scene.ts | 2 +-
 src/field/arena.ts  | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/battle-scene.ts b/src/battle-scene.ts
index 8d70646a56d..e4084de642d 100644
--- a/src/battle-scene.ts
+++ b/src/battle-scene.ts
@@ -1127,7 +1127,7 @@ export default class BattleScene extends SceneBase {
         this.arena.updatePoolsForTimeOfDay();
       }
       if (resetArenaState) {
-        this.arena.removeAllTags();
+        this.arena.resetArenaEffects();
         playerField.forEach((_, p) => this.unshiftPhase(new ReturnPhase(this, p)));
 
         for (const pokemon of this.getParty()) {
diff --git a/src/field/arena.ts b/src/field/arena.ts
index df8e98d9ca0..7069c65a5e3 100644
--- a/src/field/arena.ts
+++ b/src/field/arena.ts
@@ -638,6 +638,12 @@ export class Arena {
     }
   }
 
+  /** Clears terrain and arena tags when entering new biome or trainer battle. */
+  resetArenaEffects(): void {
+    this.trySetTerrain(TerrainType.NONE, false, true);
+    this.removeAllTags();
+  }
+
   preloadBgm(): void {
     this.scene.loadBgm(this.bgm);
   }