diff --git a/PKHeX/Legality/Checks.cs b/PKHeX/Legality/Checks.cs index 582240ff3..6bdab2726 100644 --- a/PKHeX/Legality/Checks.cs +++ b/PKHeX/Legality/Checks.cs @@ -991,7 +991,7 @@ private void verifyEggBallGen6() } if (0x0D <= pkm.Ball && pkm.Ball <= 0x0F) { - if (Legal.Ban_Gen4Ball.Contains(pkm.Species)) + if (Legal.Ban_Gen4Ball_6.Contains(pkm.Species)) AddLine(Severity.Invalid, "Unobtainable capture for Gen4 Ball.", CheckIdentifier.Ball); else AddLine(Severity.Valid, "Obtainable capture for Gen4 Ball.", CheckIdentifier.Ball); @@ -1087,15 +1087,10 @@ private void verifyEggBallGen7() return; } - if (0x0D <= pkm.Ball && pkm.Ball <= 0x0F) + if (0x0D <= pkm.Ball && pkm.Ball <= 0x0F) // Dusk Heal Quick { - if (Legal.Ban_Gen4Ball.Contains(pkm.Species)) - { - if (!Legal.Ban_Gen4Ball_AllowG7.Contains(pkm.Species)) - AddLine(Severity.Invalid, "Unobtainable capture for Gen4 Ball.", CheckIdentifier.Ball); - else - AddLine(Severity.Valid, "Obtainable capture for Gen4 Ball.", CheckIdentifier.Ball); - } + if (Legal.Ban_Gen4Ball_7.Contains(pkm.Species)) + AddLine(Severity.Invalid, "Unobtainable capture for Gen4 Ball.", CheckIdentifier.Ball); else AddLine(Severity.Valid, "Obtainable capture for Gen4 Ball.", CheckIdentifier.Ball); diff --git a/PKHeX/Legality/Tables6.cs b/PKHeX/Legality/Tables6.cs index dcd694a84..26dbe5ff2 100644 --- a/PKHeX/Legality/Tables6.cs +++ b/PKHeX/Legality/Tables6.cs @@ -682,7 +682,7 @@ public static partial class Legal 497, 500, 503, //3 566, 567, 696, 697, 698, 699 // Fossil Only obtain }; - internal static readonly int[] Ban_Gen4Ball = + internal static readonly int[] Ban_Gen4Ball_6 = { 152, 155, 158, //1 - Chikorita, Cyndaquil, Totodile 153, 156, 159, //2 diff --git a/PKHeX/Legality/Tables7.cs b/PKHeX/Legality/Tables7.cs index 5ac1c896a..b8e5320d4 100644 --- a/PKHeX/Legality/Tables7.cs +++ b/PKHeX/Legality/Tables7.cs @@ -434,14 +434,9 @@ public static partial class Legal 496, 499, 502, //2 497, 500, 503, //3 }; - internal static readonly int[] Ban_Gen4Ball_AllowG7 = + internal static readonly int[] Ban_Gen4Ball_7 = { - 152, 155, 158, //1 - Chikorita, Cyndaquil, Totodile - 153, 156, 159, //2 - 154, 157, 160, //3 - 495, 498, 501, //1 - Snivy, Tepig, Oshawott - 496, 499, 502, //2 - 497, 500, 503, //3 + 566, 567, 696, 697, 698, 699 // Fossil Only obtain }; internal static readonly int[] ZygardeMoves =