diff --git a/PKHeX/Legality/Analysis.cs b/PKHeX/Legality/Analysis.cs index fd3b33282..c5f4b7ec2 100644 --- a/PKHeX/Legality/Analysis.cs +++ b/PKHeX/Legality/Analysis.cs @@ -10,7 +10,7 @@ namespace PKHeX.Core private DexLevel[][] EvoChainsAllGens; private readonly List Parse = new List(); - private object EncounterMatch; + private object EncounterMatch, EncounterOriginal; private Type EncounterType; private bool EncounterIsMysteryGift => EncounterType.IsSubclassOf(typeof (MysteryGift)); private string EncounterName => Legal.getEncounterTypeName(pkm, EncounterMatch); @@ -142,7 +142,7 @@ namespace PKHeX.Core Encounter = verifyEncounter(); Parse.Add(Encounter); - EvoChainsAllGens = Legal.getEvolutionChainsAllGens(pkm, EncounterMatch); + EvoChainsAllGens = Legal.getEvolutionChainsAllGens(pkm, EncounterOriginal ?? EncounterMatch); } private void updateEncounterInfo() { diff --git a/PKHeX/Legality/Checks.cs b/PKHeX/Legality/Checks.cs index 2a8b54bf8..5fe69bd39 100644 --- a/PKHeX/Legality/Checks.cs +++ b/PKHeX/Legality/Checks.cs @@ -636,6 +636,7 @@ namespace PKHeX.Core AddLine(new CheckResult(Severity.Invalid, "Special encounter is not available to Virtual Console games.", CheckIdentifier.Encounter)); } + EncounterOriginal = EncounterMatch; // Store for later recollection EncounterMatch = new EncounterStatic { Species = species,