From e1812466a839d8edfd442f15bd2696d822a2963e Mon Sep 17 00:00:00 2001
From: NightKev <34855794+DayKev@users.noreply.github.com>
Date: Fri, 2 Aug 2024 19:29:07 -0700
Subject: [PATCH] [Bug] Weather should be reset upon arena reset (#3301)

* `resetArenaEffects()` should also reset weather

* Update function doc
---
 src/field/arena.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/field/arena.ts b/src/field/arena.ts
index efbcdcd6727..cb045cc76ac 100644
--- a/src/field/arena.ts
+++ b/src/field/arena.ts
@@ -639,9 +639,13 @@ export class Arena {
   }
 
   /**
-   * Clears terrain and arena tags when entering new biome or trainer battle.
+   * Clears weather, terrain and arena tags when entering new biome or trainer battle.
    */
   resetArenaEffects(): void {
+    // Don't reset weather if a Biome's permanent weather is active
+    if (this.weather?.turnsLeft !== 0) {
+      this.trySetWeather(WeatherType.NONE, false);
+    }
     this.trySetTerrain(TerrainType.NONE, false, true);
     this.removeAllTags();
   }