diff --git a/PKHeX.Core/Legality/Evolutions/EvolutionTree.cs b/PKHeX.Core/Legality/Evolutions/EvolutionTree.cs index 1dc9c5a16..fbe598ab7 100644 --- a/PKHeX.Core/Legality/Evolutions/EvolutionTree.cs +++ b/PKHeX.Core/Legality/Evolutions/EvolutionTree.cs @@ -176,9 +176,11 @@ private void FixEvoTreeSS() { // Gigantamax Pikachu, Meowth-0, and Eevee are prevented from evolving. BanEvo((int)Species.Raichu, 0, pkm => pkm is IGigantamax g && g.CanGigantamax); - BanEvo((int)Species.Raichu, 1, pkm => pkm is IGigantamax g && g.CanGigantamax); + BanEvo((int)Species.Raichu, 1, pkm => pkm is IGigantamax g && g.CanGigantamax || pkm.Gen8); BanEvo((int)Species.Persian, 0, pkm => pkm is IGigantamax g && g.CanGigantamax); + BanEvo((int)Species.Weezing, 0, pkm => pkm.Gen8); + foreach (var s in GetEvolutions((int)Species.Eevee, 0)) // Eeveelutions BanEvo(s, 0, pkm => pkm is IGigantamax g && g.CanGigantamax); } @@ -312,7 +314,7 @@ private List GetExplicitLineage(PKM pkm, int maxLevel, bool skipChe bool oneValid = false; foreach (var link in node) { - if (link.IsEvolutionBanned(pkm)) + if (link.IsEvolutionBanned(pkm) && !skipChecks) continue; var evo = link.Method; diff --git a/PKHeX.Core/Resources/byte/evos_ss.pkl b/PKHeX.Core/Resources/byte/evos_ss.pkl index d73910aac..70a0c91b1 100644 Binary files a/PKHeX.Core/Resources/byte/evos_ss.pkl and b/PKHeX.Core/Resources/byte/evos_ss.pkl differ