From 6d89ad95699a3c380cb01e69da02395b76d2daa7 Mon Sep 17 00:00:00 2001
From: MokaStitcher <54149968+MokaStitcher@users.noreply.github.com>
Date: Mon, 30 Sep 2024 03:52:13 +0200
Subject: [PATCH] [P2] Fix duplicate mon ID / RNG not properly resetting after
 game over (#4505)

---
 src/battle-scene.ts | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/battle-scene.ts b/src/battle-scene.ts
index 8e299dd8e06..c5283b091d4 100644
--- a/src/battle-scene.ts
+++ b/src/battle-scene.ts
@@ -1040,10 +1040,6 @@ export default class BattleScene extends SceneBase {
 
     this.gameMode = getGameMode(GameModes.CLASSIC);
 
-    this.setSeed(Overrides.SEED_OVERRIDE || Utils.randomString(24));
-    console.log("Seed:", this.seed);
-    this.resetSeed(); // Properly resets RNG after saving and quitting a session
-
     this.disableMenu = false;
 
     this.score = 0;
@@ -1078,6 +1074,12 @@ export default class BattleScene extends SceneBase {
     //@ts-ignore  - allowing `null` for currentBattle causes a lot of trouble
     this.currentBattle = null; // TODO: resolve ts-ignore
 
+    // Reset RNG after end of game or save & quit.
+    // This needs to happen after clearing this.currentBattle or the seed will be affected by the last wave played
+    this.setSeed(Overrides.SEED_OVERRIDE || Utils.randomString(24));
+    console.log("Seed:", this.seed);
+    this.resetSeed();
+
     this.biomeWaveText.setText(startingWave.toString());
     this.biomeWaveText.setVisible(false);