diff --git a/PKHeX.Core/Legality/Tables/Tables7b.cs b/PKHeX.Core/Legality/Tables/Tables7b.cs index 82993e93d..15c80b8d2 100644 --- a/PKHeX.Core/Legality/Tables/Tables7b.cs +++ b/PKHeX.Core/Legality/Tables/Tables7b.cs @@ -258,7 +258,7 @@ public static partial class Legal 022, // Fearow 023, // Ekans 024, // Arbok - 032, // Nidoran-M + 032, // Nidoran♂ 033, // Nidorino 034, // Nidoking 037, // Vulpix @@ -313,25 +313,5 @@ public static partial class Legal 150, // Mewtwo 151, // Mew }; - - internal static readonly HashSet GoTransferSpeciesShinyBanAlola = new HashSet - { - 019, // Rattata - 020, // Raticate - 027, // Sandshrew - 028, // Sandslash - 037, // Vulpix - 038, // Ninetales - 050, // Diglett - 051, // Dugtrio - 052, // Meowth - 053, // Persian - 074, // Geodude - 075, // Graveler - 076, // Golem - 088, // Grimer - 089, // Muk - 103, // Exeggutor - }; } } diff --git a/PKHeX.Core/Legality/Verifiers/IndividualValueVerifier.cs b/PKHeX.Core/Legality/Verifiers/IndividualValueVerifier.cs index 4e36bde79..aaf622c46 100644 --- a/PKHeX.Core/Legality/Verifiers/IndividualValueVerifier.cs +++ b/PKHeX.Core/Legality/Verifiers/IndividualValueVerifier.cs @@ -117,10 +117,10 @@ private void VerifyIVsGoTransfer(LegalityAnalysis data) if (!pkm.IsShiny) return; - var banlist = pkm.AltForm == 1 && Legal.EvolveToAlolanForms.Contains(pkm.Species) - ? Legal.GoTransferSpeciesShinyBanAlola - : Legal.GoTransferSpeciesShinyBan; - if (banlist.Contains(pkm.Species)) + var banlist = Legal.GoTransferSpeciesShinyBan; + + // all Shiny Alola Forms are legal, while some of their respective Kanto Forms are not + if (banlist.Contains(pkm.Species) && pkm.AltForm != 1) data.AddLine(GetInvalid(LEncStaticPIDShiny, CheckIdentifier.PID)); }