From b4cf80a9840f014e356878a62e9fa063b5d986ab Mon Sep 17 00:00:00 2001
From: hayuna <marek.kowalonek@gmail.com>
Date: Sat, 8 Jun 2024 15:41:56 +0200
Subject: [PATCH] [Bug] Override battles into single only if not fighting with
 trainers (#1949)

---
 src/battle-scene.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/battle-scene.ts b/src/battle-scene.ts
index 91dbea3c187..9899935b9fa 100644
--- a/src/battle-scene.ts
+++ b/src/battle-scene.ts
@@ -1010,7 +1010,8 @@ export default class BattleScene extends SceneBase {
     if (Overrides.DOUBLE_BATTLE_OVERRIDE) {
       newDouble = true;
     }
-    if (Overrides.SINGLE_BATTLE_OVERRIDE) {
+    /* Override battles into single only if not fighting with trainers */
+    if (newBattleType !== BattleType.TRAINER && Overrides.SINGLE_BATTLE_OVERRIDE) {
       newDouble = false;
     }