From cc2d46153d79199d842cca3e2df40434259891ee Mon Sep 17 00:00:00 2001
From: JappaWakka <jjlspeelman@outlook.com>
Date: Sun, 15 Jan 2023 09:34:42 +0100
Subject: [PATCH] Disable Shift BattleStyle in PvP

---
 P3D/Battle/BattleSystemV2/Battle.vb       | 2 +-
 P3D/Battle/BattleSystemV2/BattleScreen.vb | 4 +++-
 P3D/Screens/NewOptionScreen.vb            | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/P3D/Battle/BattleSystemV2/Battle.vb b/P3D/Battle/BattleSystemV2/Battle.vb
index c71ba4156..c0b75f6cc 100644
--- a/P3D/Battle/BattleSystemV2/Battle.vb
+++ b/P3D/Battle/BattleSystemV2/Battle.vb
@@ -7875,7 +7875,7 @@
 
                 Dim oppModel As String = BattleScreen.GetModelName(False)
                 'Switch BattleStyle
-                If Core.Player.BattleStyle <> 1 And OppStep.StepType <> RoundConst.StepTypes.Switch Then
+                If Core.Player.BattleStyle <> 1 And OppStep.StepType <> RoundConst.StepTypes.Switch And BattleScreen.IsPVPBattle = False Then
                     BattleScreen.BattleQuery.Add(New SwitchPokemonQueryObject(BattleScreen, BattleScreen.OppPokemon))
                     BattleScreen.Battle.ChangeCameraAngle(1, False, BattleScreen)
                 End If
diff --git a/P3D/Battle/BattleSystemV2/BattleScreen.vb b/P3D/Battle/BattleSystemV2/BattleScreen.vb
index f39594ada..7f6541dd7 100644
--- a/P3D/Battle/BattleSystemV2/BattleScreen.vb
+++ b/P3D/Battle/BattleSystemV2/BattleScreen.vb
@@ -1718,7 +1718,9 @@ nextIndex:
 
             'prevents multi turn action to take place in an after fainting switching turn
             If Not (BV2Screen.OppFaint And BV2Screen.IsRemoteBattle) Then
-                BV2Screen.Battle.StartMultiTurnAction(BV2Screen)
+                If BV2Screen.HasSwitchedOwn = False Then
+                    BV2Screen.Battle.StartMultiTurnAction(BV2Screen)
+                End If
             Else
                 BV2Screen.BattleMenu.Visible = True
             End If
diff --git a/P3D/Screens/NewOptionScreen.vb b/P3D/Screens/NewOptionScreen.vb
index e4d1b03e0..e9b3d1be7 100644
--- a/P3D/Screens/NewOptionScreen.vb
+++ b/P3D/Screens/NewOptionScreen.vb
@@ -11,7 +11,7 @@
     Dim ShowBattleAnimations As Integer = 1
     Dim DiagonalMovement As Boolean = True
     Dim Difficulty As Integer = 0
-    Dim BattleStyle As Integer = 0
+    Dim BattleStyle As Integer = 1
     Dim LoadOffsetMaps As Integer = 1
     Dim ViewBobbing As Boolean = True
     Dim ShowModels As Integer = 1