diff --git a/PKHeX/PKM/PK6.cs b/PKHeX/PKM/PK6.cs index 6872d60f5..898398b96 100644 --- a/PKHeX/PKM/PK6.cs +++ b/PKHeX/PKM/PK6.cs @@ -584,11 +584,11 @@ namespace PKHeX.Core // Legality Properties public override bool WasLink => Met_Location == 30011; - public override bool WasEgg => Legal.EggLocations.Contains(Egg_Location); + public override bool WasEgg => GenNumber < 5 ? base.WasEgg : Legal.EggLocations.Contains(Egg_Location); public override bool WasEvent => Met_Location > 40000 && Met_Location < 50000 || FatefulEncounter && Species != 386; public override bool WasEventEgg => ((Egg_Location > 40000 && Egg_Location < 50000) || (FatefulEncounter && Egg_Location == 30002)) && Met_Level == 1; - public override bool WasTradedEgg => Egg_Location == 30002; - public override bool WasIngameTrade => Met_Location == 30001; + public override bool WasTradedEgg => GenNumber < 5 ? base.WasEgg : Egg_Location == 30002; + public override bool WasIngameTrade => GenNumber < 5 ? base.WasEgg : Met_Location == 30001; public PK7 convertToPK7() { diff --git a/PKHeX/PKM/PK7.cs b/PKHeX/PKM/PK7.cs index 2e66ca784..500030f43 100644 --- a/PKHeX/PKM/PK7.cs +++ b/PKHeX/PKM/PK7.cs @@ -621,10 +621,10 @@ namespace PKHeX.Core // Legality Properties public override bool WasLink => Met_Location == 30011; - public override bool WasEgg => Legal.EggLocations.Contains(Egg_Location); + public override bool WasEgg => GenNumber < 5 ? base.WasEgg : Legal.EggLocations.Contains(Egg_Location); public override bool WasEvent => Met_Location > 40000 && Met_Location < 50000 || FatefulEncounter && Species != 386; public override bool WasEventEgg => ((Egg_Location > 40000 && Egg_Location < 50000) || (FatefulEncounter && Egg_Location == 30002)) && Met_Level == 1; - public override bool WasTradedEgg => Egg_Location == 30002; - public override bool WasIngameTrade => Met_Location == 30001; + public override bool WasTradedEgg => GenNumber < 5 ? base.WasEgg : Egg_Location == 30002; + public override bool WasIngameTrade => GenNumber < 5 ? base.WasEgg : Met_Location == 30001; } }