From 5127d73d4f3f334330fae881b5ee3c16bc7fb04d Mon Sep 17 00:00:00 2001
From: Greenlamp <gabriel.knuts@gmail.com>
Date: Sun, 5 May 2024 16:08:59 +0200
Subject: [PATCH] added settings to set battle style, either shift or set

---
 src/battle-scene.ts    | 1 +
 src/phases.ts          | 5 +++++
 src/system/settings.ts | 6 ++++++
 3 files changed, 12 insertions(+)

diff --git a/src/battle-scene.ts b/src/battle-scene.ts
index 46f7b4ae0a2..c772f8364af 100644
--- a/src/battle-scene.ts
+++ b/src/battle-scene.ts
@@ -119,6 +119,7 @@ export default class BattleScene extends SceneBase {
 	public experimentalSprites: boolean = false;
 	public moveAnimations: boolean = true;
 	public expGainsSpeed: integer = 0;
+	public battleStyle: integer = 0;
 	public hpBarSpeed: integer = 0;
 	public fusionPaletteSwaps: boolean = true;
 	public gamepadSupport: boolean = true;
diff --git a/src/phases.ts b/src/phases.ts
index 6f1ebc261da..6fb5b1572a5 100644
--- a/src/phases.ts
+++ b/src/phases.ts
@@ -1559,6 +1559,11 @@ export class CheckSwitchPhase extends BattlePhase {
       return;
     }
 
+    if (this.scene.battleStyle === 1) {
+        super.end();
+        return;
+    }
+
     this.scene.ui.showText(i18next.t('battle:switchQuestion', { pokemonName: this.useName ? pokemon.name : i18next.t('battle:pokemon') }), null, () => {
       this.scene.ui.setMode(Mode.CONFIRM, () => {
         this.scene.ui.setMode(Mode.MESSAGE);
diff --git a/src/system/settings.ts b/src/system/settings.ts
index e5769dfcce9..2e76d21b58d 100644
--- a/src/system/settings.ts
+++ b/src/system/settings.ts
@@ -21,6 +21,7 @@ export enum Setting {
   Move_Animations = "MOVE_ANIMATIONS",
   Show_Stats_on_Level_Up = "SHOW_LEVEL_UP_STATS",
   EXP_Gains_Speed = "EXP_GAINS_SPEED",
+  Battle_Style = "BATTLE_STYLE",
   HP_Bar_Speed = "HP_BAR_SPEED",
   Fusion_Palette_Swaps = "FUSION_PALETTE_SWAPS",
   Player_Gender = "PLAYER_GENDER",
@@ -53,6 +54,7 @@ export const settingOptions: SettingOptions = {
   [Setting.Move_Animations]: [ 'Off', 'On' ],
   [Setting.Show_Stats_on_Level_Up]: [ 'Off', 'On' ],
   [Setting.EXP_Gains_Speed]: [ 'Normal', 'Fast', 'Faster', 'Skip' ],
+  [Setting.Battle_Style]: [ 'Shift', 'Set' ],
   [Setting.HP_Bar_Speed]: [ 'Normal', 'Fast', 'Faster', 'Instant' ],
   [Setting.Fusion_Palette_Swaps]: [ 'Off', 'On' ],
   [Setting.Player_Gender]: [ 'Boy', 'Girl' ],
@@ -77,6 +79,7 @@ export const settingDefaults: SettingDefaults = {
   [Setting.Move_Animations]: 1,
   [Setting.Show_Stats_on_Level_Up]: 1,
   [Setting.EXP_Gains_Speed]: 0,
+  [Setting.Battle_Style]: 0,
   [Setting.HP_Bar_Speed]: 0,
   [Setting.Fusion_Palette_Swaps]: 1,
   [Setting.Player_Gender]: 0,
@@ -134,6 +137,9 @@ export function setSetting(scene: BattleScene, setting: Setting, value: integer)
     case Setting.EXP_Gains_Speed:
       scene.expGainsSpeed = value;
       break;
+    case Setting.Battle_Style:
+      scene.battleStyle = value;
+      break;
     case Setting.HP_Bar_Speed:
       scene.hpBarSpeed = value;
       break;