diff --git a/PKHeX.Core/Legality/Evolutions/EvolutionTree.cs b/PKHeX.Core/Legality/Evolutions/EvolutionTree.cs index 2a8e2dd5c..d42b651c9 100644 --- a/PKHeX.Core/Legality/Evolutions/EvolutionTree.cs +++ b/PKHeX.Core/Legality/Evolutions/EvolutionTree.cs @@ -33,9 +33,8 @@ static EvolutionTree() Evolves4 = new EvolutionTree(new[] { get("g4") }, GameVersion.Gen4, PersonalTable.DP, Legal.MaxSpeciesID_4); Evolves5 = new EvolutionTree(new[] { get("g5") }, GameVersion.Gen5, PersonalTable.BW, Legal.MaxSpeciesID_5); Evolves6 = new EvolutionTree(unpack("ao"), GameVersion.Gen6, PersonalTable.AO, Legal.MaxSpeciesID_6); - var uu = unpack("uu"); - Evolves7 = new EvolutionTree(uu, GameVersion.Gen7, PersonalTable.USUM, Legal.MaxSpeciesID_7_USUM); - Evolves7b = new EvolutionTree(uu, GameVersion.Gen7, PersonalTable.GG, Legal.MaxSpeciesID_7b); + Evolves7 = new EvolutionTree(unpack("uu"), GameVersion.Gen7, PersonalTable.USUM, Legal.MaxSpeciesID_7_USUM); + Evolves7b = new EvolutionTree(unpack("gg"), GameVersion.Gen7, PersonalTable.GG, Legal.MaxSpeciesID_7b); // There's always oddballs. Evolves7.FixEvoTreeSM(); @@ -197,9 +196,6 @@ private void FixEvoTreeSM() private void FixEvoTreeGG() { - // Alolan Meowth now evolves at level 28 (not friendship). Copy from Meowth. - Lineage[Personal.GetFormeIndex(53, 1)] = Lineage[Personal.GetFormeIndex(53, 0)]; - // Ban Raichu Evolution on SM Lineage[Personal.GetFormeIndex(26, 0)] .Chain[1].StageEntryMethods[0] diff --git a/PKHeX.Core/PKHeX.Core.csproj b/PKHeX.Core/PKHeX.Core.csproj index 5cce3c9fa..408413424 100644 --- a/PKHeX.Core/PKHeX.Core.csproj +++ b/PKHeX.Core/PKHeX.Core.csproj @@ -67,8 +67,8 @@ - + @@ -799,8 +799,8 @@ - + diff --git a/PKHeX.Core/Resources/byte/evos_sm.pkl b/PKHeX.Core/Resources/byte/evos_gg.pkl similarity index 88% rename from PKHeX.Core/Resources/byte/evos_sm.pkl rename to PKHeX.Core/Resources/byte/evos_gg.pkl index 5a8f1500b..d6eb15b03 100644 Binary files a/PKHeX.Core/Resources/byte/evos_sm.pkl and b/PKHeX.Core/Resources/byte/evos_gg.pkl differ