Mirrors/PKHeX
2
0
Fork 0
mirror of https://github.com/kwsch/PKHeX synced 2024-09-22 15:21:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

Allow gen3/4 balls on gen3/4 starters

Browse source 
Closes #774
Thanks @PKMWM1 !
This commit is contained in:
Kurt 2017-01-29 19:11:40 -08:00
parent bcf4c72e86
commit f7e354a839
3 changed files with 7 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
PKHeX/Legality/Checks.cs
View file

@ -991,7 +991,7 @@ namespace PKHeX.Core
}
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 @@ namespace PKHeX.Core
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);

2
PKHeX/Legality/Tables6.cs
View file

@ -682,7 +682,7 @@ namespace PKHeX.Core
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

9
PKHeX/Legality/Tables7.cs
View file

@ -434,14 +434,9 @@ namespace PKHeX.Core
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 =