Leahnaya/PKHeX
1
0
Fork 0
mirror of https://github.com/kwsch/PKHeX.git synced 2026-10-02 14:07:05 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add mr mime to usum additions for egg balls

Browse Source
This commit is contained in:
Kurt
2018-08-26 09:43:11 -07:00
parent 9dae7dad67
commit 6a225ad091
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
PKHeX.Core/Legality/Encounters/Data/EncounterUtil.cs
View File

@@ -41,6 +41,8 @@ internal static EncounterArea[] GetEncounterTables(GameVersion game)
case GameVersion.MN: return GetEncounterTables("sm", "mn");
case GameVersion.US: return GetEncounterTables("uu", "us");
case GameVersion.UM: return GetEncounterTables("uu", "um");
case GameVersion.GP: return GetEncounterTables("gg", "gp");
case GameVersion.GE: return GetEncounterTables("gg", "ge");
}
return null; // bad request
}

4
PKHeX.Core/Legality/Tables7.cs
View File

@@ -185,7 +185,7 @@ public static partial class Legal
718,
// Regular
023, 086, 108, 138, 140, 163, 177, 179, 190, 204,
023, 086, 108, 122, 138, 140, 163, 177, 179, 190, 204,
206, 214, 223, 228, 238, 246, 303, 309, 341, 343,
345, 347, 352, 353, 357, 366, 427, 439, 458, 550,
559, 570, 572, 592, 605, 619, 621, 622, 624, 636,
@@ -328,7 +328,7 @@ public static partial class Legal
782,
// USUM Additions
023, 086, 108, 163, 177, 179, 190, 204,
023, 086, 108, 122, 163, 177, 179, 190, 204,
206, 214, 223, 228, 238, 246, 303, 309, 341, 343,
352, 353, 357, 366, 427, 439, 458, 550,
559, 570, 572, 592, 605, 619, 621, 622, 624, 636,

2
PKHeX.Core/Legality/Verifiers/BallVerifier.cs
View File

@@ -233,7 +233,7 @@ private CheckResult VerifyBallEggGen7(LegalityAnalysis data)
{
if (species == 669 && pkm.AltForm == 3 && pkm.AbilityNumber == 4)
return GetInvalid(V122); // Can't obtain Flabébé-Blue with Hidden Ability in wild
if ((species > 731 && species <= 785) || (Legal.PastGenAlolanNatives.Contains(species) && !Legal.PastGenAlolanNativesUncapturable.Contains(species)))
if ((species > 731 && species <= 785) || (Legal.AlolanCaptureOffspring.Contains(species) && !Legal.PastGenAlolanNativesUncapturable.Contains(species)))
return GetValid(V123);
if (Legal.PastGenAlolanScans.Contains(species))
return GetValid(V123);