From 7dedbb7ec27235e94a6046d8bb6d402f6d02ca63 Mon Sep 17 00:00:00 2001
From: JappaWakka <jjlspeelman@outlook.com>
Date: Sun, 15 Jan 2023 20:46:26 +0100
Subject: [PATCH] Fix for non-HM field moves not visible in menu

---
 P3D/Screens/Pokemon/PartyScreen.vb | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/P3D/Screens/Pokemon/PartyScreen.vb b/P3D/Screens/Pokemon/PartyScreen.vb
index 2d3c898c3..0dda465c4 100644
--- a/P3D/Screens/Pokemon/PartyScreen.vb
+++ b/P3D/Screens/Pokemon/PartyScreen.vb
@@ -683,13 +683,12 @@ Public Class PartyScreen
                 If Badge.CanUseHMMove(CType(hmMove, Badge.HMMoves)) = False Then
                     Return False
                 End If
-
-                For Each a As BattleSystem.Attack In p.Attacks
-                    If a.Name.ToLower() = moveName.ToLower() Then
-                        Return True
-                    End If
-                Next
             End If
+            For Each a As BattleSystem.Attack In p.Attacks
+                If a.Name.ToLower() = moveName.ToLower() Then
+                    Return True
+                End If
+            Next
         End If
         Return False
     End Function