diff --git a/PKHeX.Core/Legality/Encounters/EncounterSlot/GO/EncounterSlotGO.cs b/PKHeX.Core/Legality/Encounters/EncounterSlot/GO/EncounterSlotGO.cs index b1a42309e..84c9788aa 100644 --- a/PKHeX.Core/Legality/Encounters/EncounterSlot/GO/EncounterSlotGO.cs +++ b/PKHeX.Core/Legality/Encounters/EncounterSlot/GO/EncounterSlotGO.cs @@ -103,8 +103,11 @@ private static bool GetIVsAboveMinimum(PKM pkm, int min) return pkm.IV_HP >> 1 >= min; // HP } - public static bool GetIVsValid(PKM pkm) + public bool GetIVsValid(PKM pkm) { + if (!GetIVsAboveMinimum(pkm)) + return false; + // HP * 2 | 1 -> HP // ATK * 2 | 1 -> ATK&SPA // DEF * 2 | 1 -> DEF&SPD diff --git a/PKHeX.Core/Legality/Verifiers/IndividualValueVerifier.cs b/PKHeX.Core/Legality/Verifiers/IndividualValueVerifier.cs index 6992a48ec..f77e0885b 100644 --- a/PKHeX.Core/Legality/Verifiers/IndividualValueVerifier.cs +++ b/PKHeX.Core/Legality/Verifiers/IndividualValueVerifier.cs @@ -109,7 +109,7 @@ private void VerifyIVsStatic(LegalityAnalysis data, EncounterStatic s) private void VerifyIVsGoTransfer(LegalityAnalysis data) { - if (data.EncounterMatch is EncounterSlotGO && !EncounterSlotGO.GetIVsValid(data.pkm)) + if (data.EncounterMatch is EncounterSlotGO g && !g.GetIVsValid(data.pkm)) data.AddLine(GetInvalid(LIVNotCorrect)); } }