Disable Shift BattleStyle in PvP

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

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

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