From 1d73eebddf47aaf934dd6dad4a28f8030d872af2 Mon Sep 17 00:00:00 2001
From: geeil-han <geeil.han@gmail.com>
Date: Mon, 10 Feb 2025 05:34:05 +0100
Subject: [PATCH] moved playerFaints reset to resetArenaEffects

---
 src/battle-scene.ts | 4 ----
 src/field/arena.ts  | 1 +
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/battle-scene.ts b/src/battle-scene.ts
index b6e9160d2da..e7f32f92d5c 100644
--- a/src/battle-scene.ts
+++ b/src/battle-scene.ts
@@ -1344,7 +1344,6 @@ export default class BattleScene extends SceneBase {
     if (newBattleType === BattleType.MYSTERY_ENCOUNTER) {
       // Will generate the actual Mystery Encounter during NextEncounterPhase, to ensure it uses proper biome
       this.currentBattle.mysteryEncounterType = mysteryEncounterType;
-      this.arena.resetPlayerFaintCount();
     }
 
     //this.pushPhase(new TrainerMessageTestPhase(this, TrainerType.RIVAL, TrainerType.RIVAL_2, TrainerType.RIVAL_3, TrainerType.RIVAL_4, TrainerType.RIVAL_5, TrainerType.RIVAL_6));
@@ -1362,9 +1361,6 @@ export default class BattleScene extends SceneBase {
         this.arena.updatePoolsForTimeOfDay();
       }
       if (resetArenaState) {
-        this.resetEnemyFaintCount();
-        this.arena.resetPlayerFaintCount();
-
         this.arena.resetArenaEffects();
 
         playerField.forEach((pokemon) => pokemon.lapseTag(BattlerTagType.COMMANDED));
diff --git a/src/field/arena.ts b/src/field/arena.ts
index 0e7550bea2d..5ee065d71dc 100644
--- a/src/field/arena.ts
+++ b/src/field/arena.ts
@@ -694,6 +694,7 @@ export class Arena {
       this.trySetWeather(WeatherType.NONE, false);
     }
     this.trySetTerrain(TerrainType.NONE, false, true);
+    this.resetPlayerFaintCount();
     this.removeAllTags();
   }