diff --git a/Legality/Checks.cs b/Legality/Checks.cs index edda3e9f7..745e6de47 100644 --- a/Legality/Checks.cs +++ b/Legality/Checks.cs @@ -865,8 +865,12 @@ private LegalityCheck[] verifyMoves() else res[i] = new LegalityCheck(Severity.Invalid, "Invalid Move."); } - if (res.All(r => r.Valid)) // Card matched - { EncounterMatch = wc; RelearnBase = wc.RelearnMoves; } + if (res.Any(r => !r.Valid)) + continue; + + EncounterMatch = wc; + RelearnBase = wc.RelearnMoves; + break; } } else @@ -891,7 +895,6 @@ private LegalityCheck[] verifyMoves() if (Moves[0] == 0) res[0] = new LegalityCheck(Severity.Invalid, "Invalid Move."); - if (pk6.Species == 647) // Keldeo if (pk6.AltForm == 1 ^ pk6.Moves.Contains(548)) res[0] = new LegalityCheck(Severity.Invalid, "Secret Sword / Resolute Keldeo Mismatch.");