From d557a98b48838f2df89f4f7eb74cb8efedb06ba0 Mon Sep 17 00:00:00 2001
From: CaptainSegis <F20121237@outlook.com>
Date: Tue, 24 Jan 2017 00:34:40 -0500
Subject: [PATCH] Fixed infatuation volatile status lingering after the opp has
 switched out.

---
 2.5DHero/2.5DHero/Battle/BattleSystemV2/Battle.vb | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/2.5DHero/2.5DHero/Battle/BattleSystemV2/Battle.vb b/2.5DHero/2.5DHero/Battle/BattleSystemV2/Battle.vb
index 0a54a118b..d4bd9c2e8 100644
--- a/2.5DHero/2.5DHero/Battle/BattleSystemV2/Battle.vb
+++ b/2.5DHero/2.5DHero/Battle/BattleSystemV2/Battle.vb
@@ -6048,6 +6048,10 @@
                     .OppMagmaStorm = 0
                     .OppSandTomb = 0
                     .OppInfestation = 0
+
+                    If BattleScreen.OppPokemon.HasVolatileStatus(Pokemon.VolatileStatus.Infatuation) Then
+                        BattleScreen.OppPokemon.RemoveVolatileStatus(Pokemon.VolatileStatus.Infatuation)
+                    End If
                 End With
 
                 .OwnPokemon.Ability.SwitchOut(.OwnPokemon)
@@ -6380,6 +6384,9 @@
                     .OwnSandTomb = 0
                     .OwnInfestation = 0
 
+                    If BattleScreen.OwnPokemon.HasVolatileStatus(Pokemon.VolatileStatus.Infatuation) Then
+                        BattleScreen.OwnPokemon.RemoveVolatileStatus(Pokemon.VolatileStatus.Infatuation)
+                    End If
                 End With
             End With