From 96984213b1138e03b38347505a47cfd543e5ef42 Mon Sep 17 00:00:00 2001
From: JappaWakka <jjlspeelman@outlook.com>
Date: Tue, 11 Feb 2025 10:58:04 +0100
Subject: [PATCH] Fix Infatuation....

Moves that were supposed to fail because of infatuation didn't get the fail function triggered
---
 P3D/Battle/BattleSystemV2/Battle.vb | 3 +--
 P3D/Pokemon/Attacks/Attack.vb       | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/P3D/Battle/BattleSystemV2/Battle.vb b/P3D/Battle/BattleSystemV2/Battle.vb
index 834c1aa8e..77d1c9743 100644
--- a/P3D/Battle/BattleSystemV2/Battle.vb
+++ b/P3D/Battle/BattleSystemV2/Battle.vb
@@ -1635,8 +1635,6 @@
                 End If
             End If
 
-            moveUsed.PreAttack(own, BattleScreen)
-
             If p.HasVolatileStatus(Pokemon.VolatileStatus.Flinch) = True Then
                 p.RemoveVolatileStatus(Pokemon.VolatileStatus.Flinch)
                 BattleScreen.BattleQuery.Add(New TextQueryObject(p.GetDisplayName() & " flinched and couldn't move!"))
@@ -1692,6 +1690,7 @@
                             BattleScreen.BattleQuery.Add(HeartAnimation)
                         End If
                         BattleScreen.BattleQuery.Add(New TextQueryObject(p.GetDisplayName() & " is in love with " & op.GetDisplayName() & "!"))
+                        moveUsed.IsAttracted(own, BattleScreen)
                         Exit Sub
                     End If
                 End If
diff --git a/P3D/Pokemon/Attacks/Attack.vb b/P3D/Pokemon/Attacks/Attack.vb
index 72339b250..45c2e66b5 100644
--- a/P3D/Pokemon/Attacks/Attack.vb
+++ b/P3D/Pokemon/Attacks/Attack.vb
@@ -2261,7 +2261,7 @@
         End Sub
 
         ''' <summary>
-        ''' Event that occurs when the pokemon has falls in love with the opponent.
+        ''' Event that occurs when the pokemon has fallen in love with the opponent.
         ''' </summary>
         ''' <param name="Own">If the own Pokémon is in love.</param>
         ''' <param name="BattleScreen">Reference to the BattleScreen.</param>