Fix scald not defrosting opponent...

Also added defrosting the opponent as a gamemode attack function

P3D/Battle/BattleSystemV2/Battle.vb

@@ -1242,7 +1242,7 @@
             BattleScreen.BattleQuery.Add(New DelayQueryObject(20))
 
             If p.Status = Pokemon.StatusProblems.Freeze Then
-                If moveUsed.RemovesFrozen = True Then
+                If moveUsed.RemovesOwnFrozen = True Then
                     CureStatusProblem(own, own, BattleScreen, p.GetDisplayName() & " got defrosted by " & moveUsed.Name & ".", "defrostmove")
                 End If
             End If
@@ -2306,6 +2306,9 @@
                                 If canUseEffect AndAlso multiUseEffect OrElse (multiUseEffect = False AndAlso i = TimesToAttack) Then
                                     If substitute = 0 OrElse moveUsed.IsAffectedBySubstitute = False Then
                                         moveUsed.MoveHits(own, BattleScreen)
+                                        If moveUsed.RemovesOppFrozen = True Then
+                                            CureStatusProblem(Not own, own, BattleScreen, op.GetDisplayName() & " got defrosted by " & moveUsed.Name & ".", "defrostmove")
+                                        End If
                                     End If
                                 End If
                                 If op.HP > 0 AndAlso op.Status <> Pokemon.StatusProblems.Fainted Then

P3D/Pokemon/Attacks/Attack.vb

@@ -197,7 +197,8 @@
         Public IsOneHitKOMove As Boolean = False
         Public IsRecoilMove As Boolean = False
         Public IsTrappingMove As Boolean = False
-        Public RemovesFrozen As Boolean = False
+        Public RemovesOwnFrozen As Boolean = False
+        Public RemovesOppFrozen As Boolean = False
 
         'effected by various moves items and abilities
         Public ProtectAffected As Boolean = True

P3D/Pokemon/Attacks/Bug/AttackOrder.vb

@@ -37,7 +37,7 @@
             Me.UseEffectiveness = True
             Me.ImmunityAffected = True
             Me.HasSecondaryEffect = False
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False
 
             Me.IsHealingMove = False
             Me.IsRecoilMove = False

P3D/Pokemon/Attacks/Bug/BugBite.vb

@@ -36,7 +36,7 @@
             Me.DisabledWhileGravity = False
             Me.UseEffectiveness = True
             Me.ImmunityAffected = True
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False
             Me.HasSecondaryEffect = False
 
             Me.IsHealingMove = False

P3D/Pokemon/Attacks/Bug/BugBuzz.vb

@@ -36,7 +36,7 @@
             Me.DisabledWhileGravity = False
             Me.UseEffectiveness = True
             Me.ImmunityAffected = True
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False
             Me.HasSecondaryEffect = True
 
             Me.IsHealingMove = False

P3D/Pokemon/Attacks/Bug/DefendOrder.vb

@@ -37,7 +37,7 @@
             Me.UseEffectiveness = False
             Me.ImmunityAffected = False
             Me.HasSecondaryEffect = False
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False
 
             Me.IsHealingMove = False
             Me.IsRecoilMove = False

P3D/Pokemon/Attacks/Bug/FellStinger.vb

@@ -37,7 +37,7 @@
             Me.UseEffectiveness = True
             Me.ImmunityAffected = True
             Me.HasSecondaryEffect = False
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False
 
             Me.IsHealingMove = False
             Me.IsRecoilMove = False

P3D/Pokemon/Attacks/Bug/FirstImpression.vb

@@ -37,7 +37,7 @@
             Me.UseEffectiveness = True
             Me.ImmunityAffected = True
             Me.HasSecondaryEffect = False
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False
 
             Me.IsHealingMove = False
             Me.IsRecoilMove = False

P3D/Pokemon/Attacks/Bug/FuryCutter.vb

@@ -37,7 +37,7 @@
             Me.UseEffectiveness = True
             Me.ImmunityAffected = True
             Me.HasSecondaryEffect = False
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False
 
             Me.IsHealingMove = False
             Me.IsRecoilMove = False

P3D/Pokemon/Attacks/Bug/HealOrder.vb

@@ -37,7 +37,7 @@
             Me.UseEffectiveness = False
             Me.ImmunityAffected = False
             Me.HasSecondaryEffect = False
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False
 
             Me.IsHealingMove = True
             Me.IsRecoilMove = False

P3D/Pokemon/Attacks/Bug/Infestation.vb

@@ -37,7 +37,7 @@ Namespace BattleSystem.Moves.Bug
             Me.UseEffectiveness = True
             Me.ImmunityAffected = True
             Me.HasSecondaryEffect = False
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False
 
             Me.IsHealingMove = False
             Me.IsRecoilMove = False

P3D/Pokemon/Attacks/Bug/LeechLife.vb

@@ -37,7 +37,7 @@
             Me.UseEffectiveness = True
             Me.ImmunityAffected = True
             Me.HasSecondaryEffect = False
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False
 
             Me.IsHealingMove = True
             Me.IsRecoilMove = False

P3D/Pokemon/Attacks/Bug/Lunge.vb

@@ -37,7 +37,7 @@ Namespace BattleSystem.Moves.Bug
             Me.UseEffectiveness = True
             Me.ImmunityAffected = True
             Me.HasSecondaryEffect = False
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False
 
             Me.IsHealingMove = False
             Me.IsRecoilMove = False

P3D/Pokemon/Attacks/Bug/Megahorn.vb

@@ -37,7 +37,7 @@
             Me.UseEffectiveness = True
             Me.ImmunityAffected = True
             Me.HasSecondaryEffect = False
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False
 
             Me.IsHealingMove = False
             Me.IsRecoilMove = False

P3D/Pokemon/Attacks/Bug/PinMissile.vb

@@ -37,7 +37,7 @@
             Me.UseEffectiveness = True
             Me.ImmunityAffected = True
             Me.HasSecondaryEffect = False
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False
 
             Me.IsHealingMove = False
             Me.IsRecoilMove = False

P3D/Pokemon/Attacks/Bug/PollenPuff.vb

@@ -36,7 +36,7 @@
             Me.DisabledWhileGravity = False
             Me.UseEffectiveness = True
             Me.ImmunityAffected = True
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False
             Me.HasSecondaryEffect = False
 
             Me.IsHealingMove = False

P3D/Pokemon/Attacks/Bug/SignalBeam.vb

@@ -37,7 +37,7 @@
             Me.UseEffectiveness = True
             Me.ImmunityAffected = True
             Me.HasSecondaryEffect = True
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False
 
             Me.IsHealingMove = False
             Me.IsRecoilMove = False

P3D/Pokemon/Attacks/Bug/Silverwind.vb

@@ -37,7 +37,7 @@
             Me.UseEffectiveness = True
             Me.ImmunityAffected = True
             Me.HasSecondaryEffect = True
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False
 
             Me.IsHealingMove = False
             Me.IsRecoilMove = False

P3D/Pokemon/Attacks/Bug/SpiderWeb.vb

@@ -37,7 +37,7 @@
             Me.UseEffectiveness = False
             Me.ImmunityAffected = True
             Me.HasSecondaryEffect = False
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False
 
             Me.IsHealingMove = False
             Me.IsRecoilMove = False

P3D/Pokemon/Attacks/Bug/StickyWeb.vb

@@ -37,7 +37,7 @@ Namespace BattleSystem.Moves.Bug
             Me.UseEffectiveness = False
             Me.ImmunityAffected = False
             Me.HasSecondaryEffect = False
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False
 
             Me.IsHealingMove = False
             Me.IsRecoilMove = False

P3D/Pokemon/Attacks/Bug/StringShot.vb

@@ -37,7 +37,7 @@
             Me.UseEffectiveness = False
             Me.ImmunityAffected = True
             Me.HasSecondaryEffect = False
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False
 
             Me.IsHealingMove = False
             Me.IsRecoilMove = False

P3D/Pokemon/Attacks/Bug/StruggleBug.vb

@@ -36,7 +36,7 @@
             Me.DisabledWhileGravity = False
             Me.UseEffectiveness = True
             Me.ImmunityAffected = True
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False
             Me.HasSecondaryEffect = False
 
             Me.IsHealingMove = False

P3D/Pokemon/Attacks/Bug/Tailglow.vb

@@ -37,7 +37,7 @@
             Me.UseEffectiveness = False
             Me.ImmunityAffected = False
             Me.HasSecondaryEffect = False
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False
 
             Me.IsHealingMove = False
             Me.IsRecoilMove = False

P3D/Pokemon/Attacks/Bug/Twineedle.vb

@@ -37,7 +37,7 @@
             Me.UseEffectiveness = True
             Me.ImmunityAffected = True
             Me.HasSecondaryEffect = True
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False
 
             Me.IsHealingMove = False
             Me.IsRecoilMove = False

P3D/Pokemon/Attacks/Bug/U-Turn.vb

@@ -36,7 +36,7 @@
             Me.DisabledWhileGravity = False
             Me.UseEffectiveness = True
             Me.ImmunityAffected = True
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False
             Me.HasSecondaryEffect = False
 
             Me.IsHealingMove = False

P3D/Pokemon/Attacks/Bug/Xscissor.vb

@@ -37,7 +37,7 @@
             Me.UseEffectiveness = True
             Me.ImmunityAffected = True
             Me.HasSecondaryEffect = False
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False
 
             Me.IsHealingMove = False
             Me.IsRecoilMove = False

P3D/Pokemon/Attacks/Dark/Assurance.vb

@@ -37,7 +37,7 @@
             Me.UseEffectiveness = True
             Me.ImmunityAffected = True
             Me.HasSecondaryEffect = False
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False
 
             Me.IsHealingMove = False
             Me.IsRecoilMove = False

P3D/Pokemon/Attacks/Dark/BeatUp.vb

@@ -36,7 +36,7 @@
             Me.DisabledWhileGravity = False
             Me.UseEffectiveness = True
             Me.ImmunityAffected = False
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False
             Me.HasSecondaryEffect = False
 
             Me.IsHealingMove = False

P3D/Pokemon/Attacks/Dark/Bite.vb

@@ -37,7 +37,7 @@
             Me.UseEffectiveness = True
             Me.ImmunityAffected = True
             Me.HasSecondaryEffect = True
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False
 
             Me.IsHealingMove = False
             Me.IsRecoilMove = False

P3D/Pokemon/Attacks/Dark/BrutalSwing.vb

@@ -37,7 +37,7 @@
             Me.UseEffectiveness = True
             Me.ImmunityAffected = True
             Me.HasSecondaryEffect = False
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False
 
             Me.IsHealingMove = False
             Me.IsRecoilMove = False

P3D/Pokemon/Attacks/Dark/Crunch.vb

@@ -37,7 +37,7 @@
             Me.UseEffectiveness = True
             Me.ImmunityAffected = True
             Me.HasSecondaryEffect = True
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False
 
             Me.IsHealingMove = False
             Me.IsRecoilMove = False

P3D/Pokemon/Attacks/Dark/DarkPulse.vb

@@ -36,7 +36,7 @@
             Me.DisabledWhileGravity = False
             Me.UseEffectiveness = True
             Me.ImmunityAffected = True
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False
             Me.HasSecondaryEffect = True
 
             Me.IsHealingMove = False

P3D/Pokemon/Attacks/Dark/DarkVoid.vb

@@ -36,7 +36,7 @@
             Me.DisabledWhileGravity = False
             Me.UseEffectiveness = False
             Me.ImmunityAffected = False
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False
             Me.HasSecondaryEffect = False
 
             Me.IsHealingMove = False

P3D/Pokemon/Attacks/Dark/DarkestLariat.vb

@@ -37,7 +37,7 @@
             Me.UseEffectiveness = True
             Me.ImmunityAffected = True
             Me.HasSecondaryEffect = False
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False
 
             Me.IsHealingMove = False
             Me.IsRecoilMove = False

P3D/Pokemon/Attacks/Dark/Embargo.vb

@@ -37,7 +37,7 @@
             Me.UseEffectiveness = False
             Me.ImmunityAffected = False
             Me.HasSecondaryEffect = False
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False
 
             Me.IsHealingMove = False
             Me.IsRecoilMove = False

P3D/Pokemon/Attacks/Dark/FakeTears.vb

@@ -37,7 +37,7 @@ Namespace BattleSystem.Moves.Dark
             Me.UseEffectiveness = False
             Me.ImmunityAffected = False
             Me.HasSecondaryEffect = False
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False
 
             Me.IsHealingMove = False
             Me.IsRecoilMove = False

P3D/Pokemon/Attacks/Dark/FeintAttack.vb

@@ -36,7 +36,7 @@
             Me.DisabledWhileGravity = False
             Me.UseEffectiveness = True
             Me.ImmunityAffected = True
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False
             Me.HasSecondaryEffect = False
 
             Me.IsHealingMove = False

P3D/Pokemon/Attacks/Dark/Flatter.vb

@@ -37,7 +37,7 @@
             Me.UseEffectiveness = False
             Me.ImmunityAffected = False
             Me.HasSecondaryEffect = False
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False
 
             Me.IsHealingMove = False
             Me.IsRecoilMove = False

P3D/Pokemon/Attacks/Dark/Fling.vb

@@ -37,7 +37,7 @@
             Me.UseEffectiveness = True
             Me.ImmunityAffected = True
             Me.HasSecondaryEffect = False
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False
 
             Me.IsHealingMove = False
             Me.IsRecoilMove = False

P3D/Pokemon/Attacks/Dark/FoulPlay.vb

@@ -37,7 +37,7 @@ Namespace BattleSystem.Moves.Dark
             Me.UseEffectiveness = True
             Me.ImmunityAffected = True
             Me.HasSecondaryEffect = False
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False
 
             Me.IsHealingMove = False
             Me.IsRecoilMove = False

P3D/Pokemon/Attacks/Dark/HyperspaceFury.vb

@@ -36,7 +36,7 @@
             Me.DisabledWhileGravity = False
             Me.UseEffectiveness = True
             Me.ImmunityAffected = True
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False
             Me.HasSecondaryEffect = True
 
             Me.IsHealingMove = False

P3D/Pokemon/Attacks/Dark/KnockOff.vb

@@ -36,7 +36,7 @@
             Me.DisabledWhileGravity = False
             Me.UseEffectiveness = True
             Me.ImmunityAffected = True
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False
             Me.HasSecondaryEffect = False
 
             Me.IsHealingMove = False

P3D/Pokemon/Attacks/Dark/Memento.vb

@@ -37,7 +37,7 @@
             Me.UseEffectiveness = False
             Me.ImmunityAffected = False
             Me.HasSecondaryEffect = False
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False
 
             Me.IsHealingMove = False
             Me.IsRecoilMove = False

P3D/Pokemon/Attacks/Dark/NastyPlot.vb

@@ -37,7 +37,7 @@
             Me.UseEffectiveness = False
             Me.ImmunityAffected = False
             Me.HasSecondaryEffect = False
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False
 
             Me.IsHealingMove = False
             Me.IsRecoilMove = False

P3D/Pokemon/Attacks/Dark/NightDaze.vb

@@ -37,7 +37,7 @@
             Me.UseEffectiveness = True
             Me.ImmunityAffected = True
             Me.HasSecondaryEffect = True
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False
 
             Me.IsHealingMove = False
             Me.IsRecoilMove = False

P3D/Pokemon/Attacks/Dark/Nightslash.vb

@@ -37,7 +37,7 @@
             Me.UseEffectiveness = True
             Me.ImmunityAffected = True
             Me.HasSecondaryEffect = False
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False
 
             Me.IsHealingMove = False
             Me.IsRecoilMove = False

P3D/Pokemon/Attacks/Dark/PartingShot.vb

@@ -36,7 +36,7 @@
             Me.DisabledWhileGravity = False
             Me.UseEffectiveness = False
             Me.ImmunityAffected = False
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False
             Me.HasSecondaryEffect = False
 
             Me.IsHealingMove = False

P3D/Pokemon/Attacks/Dark/Payback.vb

@@ -37,7 +37,7 @@
             Me.UseEffectiveness = True
             Me.ImmunityAffected = True
             Me.HasSecondaryEffect = False
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False
 
             Me.IsHealingMove = False
             Me.IsRecoilMove = False

P3D/Pokemon/Attacks/Dark/Punishment.vb

@@ -37,7 +37,7 @@ Namespace BattleSystem.Moves.Dark
             Me.UseEffectiveness = True
             Me.ImmunityAffected = True
             Me.HasSecondaryEffect = False
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False
 
             Me.IsHealingMove = False
             Me.IsRecoilMove = False

P3D/Pokemon/Attacks/Dark/Pursuit.vb

@@ -37,7 +37,7 @@
             Me.UseEffectiveness = True
             Me.ImmunityAffected = True
             Me.HasSecondaryEffect = False
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False
 
             Me.IsHealingMove = False
             Me.IsRecoilMove = False

P3D/Pokemon/Attacks/Dark/Snarl.vb

@@ -37,7 +37,7 @@
             Me.UseEffectiveness = True
             Me.ImmunityAffected = True
             Me.HasSecondaryEffect = True
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False
 
             Me.IsHealingMove = False
             Me.IsRecoilMove = False

P3D/Pokemon/Attacks/Dark/Snatch.vb

@@ -37,7 +37,7 @@
             Me.UseEffectiveness = False
             Me.ImmunityAffected = False
             Me.HasSecondaryEffect = False
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False
 
             Me.IsHealingMove = False
             Me.IsRecoilMove = False

P3D/Pokemon/Attacks/Dark/SuckerPunch.vb

@@ -37,7 +37,7 @@
             Me.UseEffectiveness = True
             Me.ImmunityAffected = True
             Me.HasSecondaryEffect = False
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False
 
             Me.IsHealingMove = False
             Me.IsRecoilMove = False

P3D/Pokemon/Attacks/Dark/Switcheroo.vb

@@ -36,7 +36,7 @@ Namespace BattleSystem.Moves.Dark
             Me.DisabledWhileGravity = False
             Me.UseEffectiveness = False
             Me.ImmunityAffected = False
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False
             Me.HasSecondaryEffect = False
 
             Me.IsHealingMove = False

P3D/Pokemon/Attacks/Dark/Taunt.vb

@@ -37,7 +37,7 @@
             Me.UseEffectiveness = False
             Me.ImmunityAffected = False
             Me.HasSecondaryEffect = False
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False
 
             Me.IsHealingMove = False
             Me.IsRecoilMove = False

P3D/Pokemon/Attacks/Dark/Thief.vb

@@ -37,7 +37,7 @@
             Me.UseEffectiveness = True
             Me.ImmunityAffected = True
             Me.HasSecondaryEffect = False
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False
 
             Me.IsHealingMove = False
             Me.IsRecoilMove = False

P3D/Pokemon/Attacks/Dark/Torment.vb

@@ -37,7 +37,7 @@
             Me.UseEffectiveness = False
             Me.ImmunityAffected = False
             Me.HasSecondaryEffect = False
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False
 
             Me.IsHealingMove = False
             Me.IsRecoilMove = False

P3D/Pokemon/Attacks/Dragon/ClangingScales.vb

@@ -37,7 +37,7 @@ Namespace BattleSystem.Moves.Dragon
             Me.UseEffectiveness = True
             Me.ImmunityAffected = True
             Me.HasSecondaryEffect = False
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False
 
             Me.IsHealingMove = False
             Me.IsRecoilMove = False

P3D/Pokemon/Attacks/Dragon/DracoMeteor.vb

@@ -37,7 +37,7 @@
             Me.UseEffectiveness = True
             Me.ImmunityAffected = True
             Me.HasSecondaryEffect = False
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False
 
             Me.IsHealingMove = False
             Me.IsRecoilMove = False

P3D/Pokemon/Attacks/Dragon/DragonBreath.vb

@@ -37,7 +37,7 @@
             Me.UseEffectiveness = True
             Me.ImmunityAffected = True
             Me.HasSecondaryEffect = True
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False
 
             Me.IsHealingMove = False
             Me.IsRecoilMove = False

P3D/Pokemon/Attacks/Dragon/DragonClaw.vb

@@ -37,7 +37,7 @@
             Me.UseEffectiveness = True
             Me.ImmunityAffected = True
             Me.HasSecondaryEffect = False
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False
 
             Me.IsHealingMove = False
             Me.IsRecoilMove = False

P3D/Pokemon/Attacks/Dragon/DragonDance.vb

@@ -37,7 +37,7 @@
             Me.UseEffectiveness = False
             Me.ImmunityAffected = False
             Me.HasSecondaryEffect = False
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False
 
             Me.IsHealingMove = False
             Me.IsRecoilMove = False

P3D/Pokemon/Attacks/Dragon/DragonHammer.vb

@@ -37,7 +37,7 @@
             Me.UseEffectiveness = True
             Me.ImmunityAffected = True
             Me.HasSecondaryEffect = False
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False
 
             Me.IsHealingMove = False
             Me.IsRecoilMove = False

P3D/Pokemon/Attacks/Dragon/DragonPulse.vb

@@ -37,7 +37,7 @@
             Me.UseEffectiveness = True
             Me.ImmunityAffected = True
             Me.HasSecondaryEffect = False
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False
 
             Me.IsHealingMove = False
             Me.IsRecoilMove = False

P3D/Pokemon/Attacks/Dragon/DragonRage.vb

@@ -37,7 +37,7 @@
             Me.UseEffectiveness = False
             Me.ImmunityAffected = True
             Me.HasSecondaryEffect = False
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False
 
             Me.IsHealingMove = False
             Me.IsRecoilMove = False

P3D/Pokemon/Attacks/Dragon/DragonRush.vb

@@ -37,7 +37,7 @@
             Me.UseEffectiveness = True
             Me.ImmunityAffected = True
             Me.HasSecondaryEffect = True
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False
 
             Me.IsHealingMove = False
             Me.IsRecoilMove = False

P3D/Pokemon/Attacks/Dragon/DragonTail.vb

@@ -37,7 +37,7 @@
             Me.UseEffectiveness = True
             Me.ImmunityAffected = True
             Me.HasSecondaryEffect = False
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False
 
             Me.IsHealingMove = False
             Me.IsRecoilMove = False

P3D/Pokemon/Attacks/Dragon/Outrage.vb

@@ -37,7 +37,7 @@
             Me.UseEffectiveness = True
             Me.ImmunityAffected = True
             Me.HasSecondaryEffect = False
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False
 
             Me.IsHealingMove = False
             Me.IsRecoilMove = False

P3D/Pokemon/Attacks/Dragon/RoarOfTime.vb

@@ -37,7 +37,7 @@
             Me.UseEffectiveness = True
             Me.ImmunityAffected = True
             Me.HasSecondaryEffect = False
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False
 
             Me.IsHealingMove = False
             Me.IsRecoilMove = False

P3D/Pokemon/Attacks/Dragon/SpacialRend.vb

@@ -37,7 +37,7 @@
             Me.UseEffectiveness = True
             Me.ImmunityAffected = True
             Me.HasSecondaryEffect = False
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False
 
             Me.IsHealingMove = False
             Me.IsRecoilMove = False

P3D/Pokemon/Attacks/Dragon/Twister.vb

@@ -37,7 +37,7 @@
             Me.UseEffectiveness = True
             Me.ImmunityAffected = True
             Me.HasSecondaryEffect = True
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False
 
             Me.IsHealingMove = False
             Me.IsRecoilMove = False

P3D/Pokemon/Attacks/Electric/BoltStrike.vb

@@ -37,7 +37,7 @@ Namespace BattleSystem.Moves.Electric
             Me.UseEffectiveness = True
             Me.ImmunityAffected = True
             Me.HasSecondaryEffect = True
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False
 
             Me.IsHealingMove = False
             Me.IsRecoilMove = False

P3D/Pokemon/Attacks/Electric/Charge.vb

@@ -37,7 +37,7 @@
             Me.UseEffectiveness = False
             Me.ImmunityAffected = False
             Me.HasSecondaryEffect = False
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False
 
             Me.IsHealingMove = False
             Me.IsRecoilMove = False

P3D/Pokemon/Attacks/Electric/Chargebeam.vb

@@ -37,7 +37,7 @@
             Me.UseEffectiveness = True
             Me.ImmunityAffected = True
             Me.HasSecondaryEffect = True
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False
 
             Me.IsHealingMove = False
             Me.IsRecoilMove = False

P3D/Pokemon/Attacks/Electric/Discharge.vb

@@ -37,7 +37,7 @@
             Me.UseEffectiveness = True
             Me.ImmunityAffected = True
             Me.HasSecondaryEffect = True
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False
 
             Me.IsHealingMove = False
             Me.IsRecoilMove = False

P3D/Pokemon/Attacks/Electric/EerieImpulse.vb

@@ -37,7 +37,7 @@ Namespace BattleSystem.Moves.Electric
             Me.UseEffectiveness = False
             Me.ImmunityAffected = False
             Me.HasSecondaryEffect = False
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False
 
             Me.IsHealingMove = False
             Me.IsRecoilMove = False

P3D/Pokemon/Attacks/Electric/ElectricTerrain.vb

@@ -37,7 +37,7 @@
             Me.UseEffectiveness = False
             Me.ImmunityAffected = False
             Me.HasSecondaryEffect = False
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False
 
             Me.IsHealingMove = False
             Me.IsRecoilMove = False

P3D/Pokemon/Attacks/Electric/Flash.vb

@@ -35,7 +35,7 @@
             Me.DisabledWhileGravity = False
             Me.UseEffectiveness = True
             Me.IsHealingMove = False
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False
             Me.IsRecoilMove = False
 
             Me.ImmunityAffected = True

P3D/Pokemon/Attacks/Electric/FusionBolt.vb

@@ -37,7 +37,7 @@
             Me.UseEffectiveness = True
             Me.ImmunityAffected = True
             Me.HasSecondaryEffect = False
-            Me.RemovesFrozen = True
+            Me.RemovesOwnFrozen = True
 
             Me.IsHealingMove = False
             Me.IsRecoilMove = False

P3D/Pokemon/Attacks/Electric/MagnetRise.vb

@@ -36,7 +36,7 @@
             Me.DisabledWhileGravity = False
             Me.UseEffectiveness = False
             Me.ImmunityAffected = False
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False
             Me.HasSecondaryEffect = False
 
             Me.IsHealingMove = False

P3D/Pokemon/Attacks/Electric/Nuzzle.vb

@@ -37,7 +37,7 @@ Namespace BattleSystem.Moves.Electric
             Me.UseEffectiveness = False
             Me.ImmunityAffected = True
             Me.HasSecondaryEffect = True
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False
 
             Me.IsHealingMove = False
             Me.IsRecoilMove = False

P3D/Pokemon/Attacks/Electric/ParabolicCharge.vb

@@ -37,7 +37,7 @@ Namespace BattleSystem.Moves.Electric
             Me.UseEffectiveness = True
             Me.ImmunityAffected = True
             Me.HasSecondaryEffect = False
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False
 
             Me.IsHealingMove = True
             Me.IsRecoilMove = False

P3D/Pokemon/Attacks/Electric/ShockWave.vb

@@ -36,7 +36,7 @@ Namespace BattleSystem.Moves.Electric
             Me.DisabledWhileGravity = False
             Me.UseEffectiveness = True
             Me.ImmunityAffected = True
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False
             Me.HasSecondaryEffect = False
 
             Me.IsHealingMove = False

P3D/Pokemon/Attacks/Electric/Spark.vb

@@ -37,7 +37,7 @@
             Me.UseEffectiveness = True
             Me.ImmunityAffected = True
             Me.HasSecondaryEffect = True
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False
 
             Me.IsHealingMove = False
             Me.IsRecoilMove = False

P3D/Pokemon/Attacks/Electric/Thunder.vb

@@ -37,7 +37,7 @@
             Me.UseEffectiveness = True
             Me.ImmunityAffected = True
             Me.HasSecondaryEffect = True
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False
 
             Me.IsHealingMove = False
             Me.IsRecoilMove = False

P3D/Pokemon/Attacks/Electric/ThunderFang.vb

@@ -37,7 +37,7 @@
             Me.UseEffectiveness = True
             Me.ImmunityAffected = True
             Me.HasSecondaryEffect = True
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False
 
             Me.IsHealingMove = False
             Me.IsRecoilMove = False

P3D/Pokemon/Attacks/Electric/ThunderPunch.vb

@@ -37,7 +37,7 @@
             Me.UseEffectiveness = True
             Me.ImmunityAffected = True
             Me.HasSecondaryEffect = True
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False
 
             Me.IsHealingMove = False
             Me.IsRecoilMove = False

P3D/Pokemon/Attacks/Electric/ThunderShock.vb

@@ -37,7 +37,7 @@
             Me.UseEffectiveness = True
             Me.ImmunityAffected = True
             Me.HasSecondaryEffect = True
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False
 
             Me.IsHealingMove = False
             Me.IsRecoilMove = False

P3D/Pokemon/Attacks/Electric/ThunderWave.vb

@@ -37,7 +37,7 @@
             Me.UseEffectiveness = False
             Me.ImmunityAffected = True
             Me.HasSecondaryEffect = False
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False
 
             Me.IsHealingMove = False
             Me.IsRecoilMove = False

P3D/Pokemon/Attacks/Electric/Thunderbolt.vb

@@ -37,7 +37,7 @@
             Me.UseEffectiveness = True
             Me.ImmunityAffected = True
             Me.HasSecondaryEffect = True
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False
 
             Me.IsHealingMove = False
             Me.IsRecoilMove = False

P3D/Pokemon/Attacks/Electric/VoltSwitch.vb

@@ -36,7 +36,7 @@ Namespace BattleSystem.Moves.Electric
             Me.DisabledWhileGravity = False
             Me.UseEffectiveness = True
             Me.ImmunityAffected = True
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False
             Me.HasSecondaryEffect = False
 
             Me.IsHealingMove = False

P3D/Pokemon/Attacks/Electric/VoltTackle.vb

@@ -37,7 +37,7 @@ Namespace BattleSystem.Moves.Electric
             Me.UseEffectiveness = True
             Me.ImmunityAffected = True
             Me.HasSecondaryEffect = True
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False
 
             Me.IsHealingMove = False
             Me.IsRecoilMove = True

P3D/Pokemon/Attacks/Electric/WildCharge.vb

@@ -37,7 +37,7 @@
             Me.UseEffectiveness = True
             Me.ImmunityAffected = True
             Me.HasSecondaryEffect = False
-            Me.RemovesFrozen = False
+            Me.RemovesOwnFrozen = False
 
             Me.IsHealingMove = False
             Me.IsRecoilMove = True