From 43a9d4eb99544acbc06caf3f893c775c4e681285 Mon Sep 17 00:00:00 2001 From: Kurt Date: Thu, 15 Nov 2018 17:34:54 -0800 Subject: [PATCH] Add gg evolution tree turns out it was totally needed; am glad I didn't do the silly stuff of past gen evo tables (gen6/7 is just raw evo data) --- .../Legality/Evolutions/EvolutionTree.cs | 8 ++------ PKHeX.Core/PKHeX.Core.csproj | 4 ++-- .../byte/{evos_sm.pkl => evos_gg.pkl} | Bin 65356 -> 66648 bytes 3 files changed, 4 insertions(+), 8 deletions(-) rename PKHeX.Core/Resources/byte/{evos_sm.pkl => evos_gg.pkl} (88%) 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 5a8f1500b6d1ab7e1d6d07fe534353ace234f406..d6eb15b036eff2afce2343fcd10945bcf8b4b477 100644 GIT binary patch literal 66648 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 literal 65356 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 Urlp$Nwtd&Gt3X$Q<+lQV0nMr;Z~y=R