diff --git a/P3D/Battle/BattleSystemV2/Battle.vb b/P3D/Battle/BattleSystemV2/Battle.vb
index 7246a929a..c07dc585e 100644
--- a/P3D/Battle/BattleSystemV2/Battle.vb
+++ b/P3D/Battle/BattleSystemV2/Battle.vb
@@ -4531,6 +4531,9 @@
                     End If
                 End If
             End If
+            If p.HP <= 0 And cause.Contains("move:") = False Then
+                FaintPokemon(own, BattleScreen, "")
+            End If
         End Sub
 
         Public Sub UseBerry(ByVal own As Boolean, ByVal from As Boolean, ByVal BerryItem As Item, ByVal BattleScreen As BattleScreen, ByVal message As String, ByVal cause As String)
diff --git a/P3D/Pokemon/Attacks/AttackSpecialFunctions.vb b/P3D/Pokemon/Attacks/AttackSpecialFunctions.vb
index 0fe5af41f..8d7d51a13 100644
--- a/P3D/Pokemon/Attacks/AttackSpecialFunctions.vb
+++ b/P3D/Pokemon/Attacks/AttackSpecialFunctions.vb
@@ -87,7 +87,7 @@
                                     Message = f.GetSplit(3, ",")
                                 End If
                             End If
-                            BattleScreen.Battle.ReduceHP(HPAmount, Target, own, BattleScreen, Message, Move.Name.ToLower)
+                            BattleScreen.Battle.ReduceHP(HPAmount, Target, own, BattleScreen, Message, "move:" & Move.Name.ToLower)
                         Case "gainhp", "increasehp", "heal"
                             Dim Target As Boolean = CBool(f.GetSplit(1, ","))
                             Dim HPAmount As Integer = 0
@@ -99,7 +99,7 @@
                                     Message = f.GetSplit(3, ",")
                                 End If
                             End If
-                            BattleScreen.Battle.GainHP(HPAmount, Target, own, BattleScreen, Message, Move.Name.ToLower)
+                            BattleScreen.Battle.GainHP(HPAmount, Target, own, BattleScreen, Message, "move:" & Move.Name.ToLower)
                         Case "endbattle"
                             Dim Blackout As Boolean = False