From ca63bf2e511958684db8d7076e4da20f0cbe664d Mon Sep 17 00:00:00 2001 From: javierhimura Date: Sun, 26 Mar 2017 18:45:01 +0200 Subject: [PATCH] Names changed to avoid confusions --- PKHeX/Legality/Checks.cs | 6 +++--- PKHeX/Legality/Core.cs | 2 +- PKHeX/Legality/Tables3.cs | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/PKHeX/Legality/Checks.cs b/PKHeX/Legality/Checks.cs index 11b8ccbbd..03482306b 100644 --- a/PKHeX/Legality/Checks.cs +++ b/PKHeX/Legality/Checks.cs @@ -2112,7 +2112,7 @@ namespace PKHeX.Core return new[] { GameVersion.GS, GameVersion.C }; } - private GameVersion getBaseGamesWasEgg() + private GameVersion getBaseGamesIsEgg() { switch (pkm.GenNumber) { @@ -2165,7 +2165,7 @@ namespace PKHeX.Core CheckResult[] res = new CheckResult[4]; var ValidSpecialMoves = SpecialMoves.Where(m => m > 0); // Some games can have different egg movepools. Have to check all situations. - GameVersion ver = getBaseGamesWasEgg(); + GameVersion ver = getBaseGamesIsEgg(); int splitctr = Legal.getSplitBreedGeneration(pkm).Contains(pkm.Species) ? 1 : 0; for (int i = 0; i <= splitctr; i++) { @@ -2208,7 +2208,7 @@ namespace PKHeX.Core Games = getBaseGamesWasEggGen2(); break; case 3: // Generation 3 does not overwrite source game after pokemon hatched - Games = new[] { getBaseGamesWasEgg() }; + Games = new[] { getBaseGamesIsEgg() }; break; case 4: Games = new[] { GameVersion.DP, GameVersion.Pt, GameVersion.HGSS }; diff --git a/PKHeX/Legality/Core.cs b/PKHeX/Legality/Core.cs index 1501ac315..0f73d55ce 100644 --- a/PKHeX/Legality/Core.cs +++ b/PKHeX/Legality/Core.cs @@ -1665,7 +1665,7 @@ namespace PKHeX.Core if (pkm.Species == 700 && generation == 5) return pkm.CurrentLevel - 1; - if (pkm.Gen3 && pkm.Format > 4 && pkm.Met_Level == pkm.CurrentLevel && FutureEvolutionsGen3_LevelUp.Contains(pkm.Species)) + if (pkm.Gen3 && pkm.Format > 4 && pkm.Met_Level == pkm.CurrentLevel && FutureEvolutionsGen3_LevelUpGen4.Contains(pkm.Species)) return pkm.Met_Level - 1; if (!pkm.HasOriginalMetLocation) diff --git a/PKHeX/Legality/Tables3.cs b/PKHeX/Legality/Tables3.cs index e564499d7..69e4cd50f 100644 --- a/PKHeX/Legality/Tables3.cs +++ b/PKHeX/Legality/Tables3.cs @@ -96,7 +96,7 @@ namespace PKHeX.Core 407,424,429,430,461,462,463,464,465,466,467,468,469,470,471,472,473,474,475,476,477,700 }; - internal static readonly int[] FutureEvolutionsGen3_LevelUp = + internal static readonly int[] FutureEvolutionsGen3_LevelUpGen4 = { 424, 461, 462, 463, 465, 469, 470, 471, 472, 473, 476 };