diff --git a/P3D/Pokemon/Attacks/Bug/U-Turn.vb b/P3D/Pokemon/Attacks/Bug/U-Turn.vb
index 7c8343f2d..3824d578e 100644
--- a/P3D/Pokemon/Attacks/Bug/U-Turn.vb
+++ b/P3D/Pokemon/Attacks/Bug/U-Turn.vb
@@ -69,9 +69,7 @@
                 If BattleScreen.IsTrainerBattle = True Then
                     If BattleScreen.IsRemoteBattle = True Or BattleScreen.IsPVPBattle = True Then
                         If BattleScreen.OppPokemon.Status <> Pokemon.StatusProblems.Fainted Then
-                            BattleScreen.FieldEffects.OppUsedBatonPass = True
                             If BattleScreen.Trainer.CountUseablePokemon > 1 AndAlso BattleScreen.FieldEffects.OppSwapIndex <> BattleScreen.OppPokemonIndex AndAlso BattleScreen.FieldEffects.OppSwapIndex <> -1 Then
-                                BattleScreen.FieldEffects.OppUsedBatonPass = True
 
                                 BattleScreen.Battle.SwitchOutOpp(BattleScreen, BattleScreen.FieldEffects.OppSwapIndex)
                                 BattleScreen.FieldEffects.OppSwapIndex = -1
@@ -83,7 +81,6 @@
                         End If
                     Else
                         If BattleScreen.Trainer.CountUseablePokemon > 1 Then
-                            BattleScreen.FieldEffects.OppUsedBatonPass = True
 
                             BattleScreen.Battle.SwitchOutOpp(BattleScreen, GetPokemonIndex(BattleScreen, own))
                         Else
diff --git a/P3D/Pokemon/Attacks/Dark/PartingShot.vb b/P3D/Pokemon/Attacks/Dark/PartingShot.vb
index ac4234832..02c09e1ad 100644
--- a/P3D/Pokemon/Attacks/Dark/PartingShot.vb
+++ b/P3D/Pokemon/Attacks/Dark/PartingShot.vb
@@ -77,9 +77,7 @@
                 If BattleScreen.IsTrainerBattle = True Then
                     If BattleScreen.IsRemoteBattle = True Or BattleScreen.IsPVPBattle = True Then
                         If BattleScreen.OppPokemon.Status <> Pokemon.StatusProblems.Fainted Then
-                            BattleScreen.FieldEffects.OppUsedBatonPass = True
                             If BattleScreen.Trainer.CountUseablePokemon > 1 AndAlso BattleScreen.FieldEffects.OppSwapIndex <> BattleScreen.OppPokemonIndex AndAlso BattleScreen.FieldEffects.OppSwapIndex <> -1 Then
-                                BattleScreen.FieldEffects.OppUsedBatonPass = True
 
                                 BattleScreen.Battle.SwitchOutOpp(BattleScreen, BattleScreen.FieldEffects.OppSwapIndex)
                                 BattleScreen.FieldEffects.OppSwapIndex = -1
@@ -91,7 +89,6 @@
                         End If
                     Else
                         If BattleScreen.Trainer.CountUseablePokemon > 1 Then
-                            BattleScreen.FieldEffects.OppUsedBatonPass = True
 
                             BattleScreen.Battle.SwitchOutOpp(BattleScreen, GetPokemonIndex(BattleScreen, own))
                         Else
diff --git a/P3D/Pokemon/Attacks/Electric/VoltSwitch.vb b/P3D/Pokemon/Attacks/Electric/VoltSwitch.vb
index 4c7950896..dcbdbd63d 100644
--- a/P3D/Pokemon/Attacks/Electric/VoltSwitch.vb
+++ b/P3D/Pokemon/Attacks/Electric/VoltSwitch.vb
@@ -69,9 +69,8 @@ Namespace BattleSystem.Moves.Electric
                 If BattleScreen.IsTrainerBattle = True Then
                     If BattleScreen.IsRemoteBattle = True Or BattleScreen.IsPVPBattle = True Then
                         If BattleScreen.OppPokemon.Status <> Pokemon.StatusProblems.Fainted Then
-                            BattleScreen.FieldEffects.OppUsedBatonPass = True
+
                             If BattleScreen.Trainer.CountUseablePokemon > 1 AndAlso BattleScreen.FieldEffects.OppSwapIndex <> BattleScreen.OppPokemonIndex AndAlso BattleScreen.FieldEffects.OppSwapIndex <> -1 Then
-                                BattleScreen.FieldEffects.OppUsedBatonPass = True
 
                                 BattleScreen.Battle.SwitchOutOpp(BattleScreen, BattleScreen.FieldEffects.OppSwapIndex)
                                 BattleScreen.FieldEffects.OppSwapIndex = -1
@@ -83,7 +82,6 @@ Namespace BattleSystem.Moves.Electric
                         End If
                     Else
                         If BattleScreen.Trainer.CountUseablePokemon > 1 Then
-                            BattleScreen.FieldEffects.OppUsedBatonPass = True
 
                             BattleScreen.Battle.SwitchOutOpp(BattleScreen, GetPokemonIndex(BattleScreen, own))
                         Else