From 1a15683983c52f614f63e1962d900c0751aef304 Mon Sep 17 00:00:00 2001
From: frutescens <info@laptop>
Date: Wed, 13 Nov 2024 22:51:05 -0800
Subject: [PATCH] Moved new doubles conditional to be above overrides.

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

diff --git a/src/battle-scene.ts b/src/battle-scene.ts
index 5c27ea4c9e6..750e32ce5ec 100644
--- a/src/battle-scene.ts
+++ b/src/battle-scene.ts
@@ -1233,6 +1233,11 @@ export default class BattleScene extends SceneBase {
       newDouble = !!double;
     }
 
+    // Disable double battles on Endless/Endless Spliced Wave 50x boss battles (Introduced 1.2.0)
+    if (this.gameMode.isEndlessBoss(newWaveIndex)) {
+      newDouble = false;
+    }
+
     if (Overrides.BATTLE_TYPE_OVERRIDE === "double") {
       newDouble = true;
     }
@@ -1241,11 +1246,6 @@ export default class BattleScene extends SceneBase {
       newDouble = false;
     }
 
-    // Disable double battles on Endless/Endless Spliced Wave 50x boss battles (Introduced 1.2.0)
-    if (this.gameMode.isEndlessBoss(newWaveIndex)) {
-      newDouble = false;
-    }
-
     const lastBattle = this.currentBattle;
 
     const maxExpLevel = this.getMaxExpLevel();