diff --git a/PKHeX.Core/Legality/LegalityCheckStrings.cs b/PKHeX.Core/Legality/LegalityCheckStrings.cs index b2f100a24..2e42e0fad 100644 --- a/PKHeX.Core/Legality/LegalityCheckStrings.cs +++ b/PKHeX.Core/Legality/LegalityCheckStrings.cs @@ -203,9 +203,6 @@ public static class LegalityCheckStrings public static string LFormPikachuCosplay { get; set; } = "Only Cosplay Pikachu can have this form."; public static string LFormPikachuCosplayInvalid { get; set; } = "Cosplay Pikachu cannot have the default form."; public static string LFormPikachuEventInvalid { get; set; } = "Event Pikachu cannot have the default form."; - public static string LFormSafariFlorgesColor { get; set; } = "Friend Safari: Not valid color."; - public static string LFormSafariPumpkabooAverage { get; set; } = "Friend Safari: Not average sized."; - public static string LFormSafariSawsbuckSpring { get; set; } = "Friend Safari: Not Spring form."; public static string LFormValid { get; set; } = "Form is Valid."; public static string LFormVivillon { get; set; } = "Valid Vivillon pattern."; public static string LFormVivillonEventPre { get; set; } = "Event Vivillon pattern on pre-evolution."; diff --git a/PKHeX.Core/Legality/Verifiers/FormVerifier.cs b/PKHeX.Core/Legality/Verifiers/FormVerifier.cs index d3402f5a4..8049ab762 100644 --- a/PKHeX.Core/Legality/Verifiers/FormVerifier.cs +++ b/PKHeX.Core/Legality/Verifiers/FormVerifier.cs @@ -44,9 +44,6 @@ private CheckResult VerifyForm(LegalityAnalysis data) switch (enc) { - case EncounterSlot w when w.Area.Type == SlotType.FriendSafari: - VerifyFormFriendSafari(data); - break; case EncounterEgg e when FormInfo.IsTotemForm(species, form, e.Generation): return GetInvalid(LFormInvalidGame); } @@ -227,26 +224,6 @@ public static int GetGenesectFormFromHeldItem(int item) return 0; } - private void VerifyFormFriendSafari(LegalityAnalysis data) - { - var pkm = data.pkm; - switch ((Species)pkm.Species) - { - case Floette or Florges when pkm.Form is not (0 or 1 or 3): // Floette (RBY colors only) - data.AddLine(GetInvalid(LFormSafariFlorgesColor)); - break; - case Pumpkaboo or Gourgeist when pkm.Form != 0: // Average - data.AddLine(GetInvalid(LFormSafariPumpkabooAverage)); - break; - case Gastrodon when pkm.Form != 0: // West - data.AddLine(GetInvalid(LFormSafariFlorgesColor)); - break; - case Sawsbuck when pkm.Form != 0: // Sawsbuck - data.AddLine(GetInvalid(LFormSafariSawsbuckSpring)); - break; - } - } - private CheckResult VerifyFormArgument(LegalityAnalysis data, IFormArgument f) { var pkm = data.pkm;