diff --git a/PKHeX/Legality/Checks.cs b/PKHeX/Legality/Checks.cs index 8ad4e1f73..e5488b135 100644 --- a/PKHeX/Legality/Checks.cs +++ b/PKHeX/Legality/Checks.cs @@ -847,9 +847,14 @@ namespace PKHeX.Core } else if (null != (EncounterStaticMatch = Legal.getValidStaticEncounter(pkm))) { - EncounterMatch = EncounterStaticMatch.First(); - if ((G3Result = verifyEncounterStatic())?.Valid ?? false) - G3Encounter = EncounterMatch; + if (new[] {380, 381}.Contains(pkm.Species)) + EncounterStaticMatch = EncounterStaticMatch.Where(z => z.Fateful == pkm.FatefulEncounter).ToList(); + if (null != EncounterStaticMatch && EncounterStaticMatch.Any()) + { + EncounterMatch = EncounterStaticMatch.First(); + if ((G3Result = verifyEncounterStatic())?.Valid ?? false) + G3Encounter = EncounterMatch; + } } // Check events after static, to match Mew/Deoxys static encounters diff --git a/PKHeX/Legality/Tables3.cs b/PKHeX/Legality/Tables3.cs index 969fcc65d..43eb01918 100644 --- a/PKHeX/Legality/Tables3.cs +++ b/PKHeX/Legality/Tables3.cs @@ -279,10 +279,10 @@ namespace PKHeX.Core new EncounterStatic { Species = 377, Level = 40, Location = 082, }, // Regirock @ Desert Ruins new EncounterStatic { Species = 378, Level = 40, Location = 081, }, // Regice @ Island Cave new EncounterStatic { Species = 379, Level = 40, Location = 083, }, // Registeel @ Ancient Tomb - new EncounterStatic { Species = 380, Level = 50, Location = 073, Version = GameVersion.R, }, // Latias @ Southern Island - new EncounterStatic { Species = 380, Level = 50, Location = 073, Version = GameVersion.E, }, // Latias @ Southern Island - new EncounterStatic { Species = 381, Level = 50, Location = 073, Version = GameVersion.S, }, // Latios @ Southern Island - new EncounterStatic { Species = 381, Level = 50, Location = 073, Version = GameVersion.E, }, // Latios @ Southern Island + new EncounterStatic { Species = 380, Level = 50, Location = 073, Version = GameVersion.R, Fateful = true }, // Latias @ Southern Island + new EncounterStatic { Species = 380, Level = 50, Location = 073, Version = GameVersion.E, Fateful = true }, // Latias @ Southern Island + new EncounterStatic { Species = 381, Level = 50, Location = 073, Version = GameVersion.S, Fateful = true }, // Latios @ Southern Island + new EncounterStatic { Species = 381, Level = 50, Location = 073, Version = GameVersion.E, Fateful = true }, // Latios @ Southern Island new EncounterStatic { Species = 382, Level = 45, Location = 072, Version = GameVersion.S, }, // Kyogre @ Cave of Origin new EncounterStatic { Species = 382, Level = 70, Location = 203, Version = GameVersion.E, }, // Kyogre @ Marine Cave new EncounterStatic { Species = 383, Level = 45, Location = 072, Version = GameVersion.R, }, // Groudon @ Cave of Origin @@ -291,9 +291,9 @@ namespace PKHeX.Core // Event new EncounterStatic { Species = 151, Level = 30, Location = 201, Version = GameVersion.E, Fateful = true }, // Mew @ Faraway Island (Unreleased outside of Japan) - new EncounterStatic { Species = 249, Level = 70, Location = 211, Version = GameVersion.E, }, // Lugia @ Navel Rock - new EncounterStatic { Species = 250, Level = 70, Location = 211, Version = GameVersion.E, }, // Ho-Oh @ Navel Rock - new EncounterStatic { Species = 386, Level = 30, Location = 200, Version = GameVersion.E, Form = 3, Fateful = true }, // Deoxys @ Birth Island + new EncounterStatic { Species = 249, Level = 70, Location = 211, Version = GameVersion.E, Fateful = true }, // Lugia @ Navel Rock + new EncounterStatic { Species = 250, Level = 70, Location = 211, Version = GameVersion.E, Fateful = true }, // Ho-Oh @ Navel Rock + new EncounterStatic { Species = 386, Level = 30, Location = 200, Version = GameVersion.E, Fateful = true, Form = 3 }, // Deoxys @ Birth Island }; @@ -349,8 +349,8 @@ namespace PKHeX.Core new EncounterStatic { Species = 150, Level = 70, Location = 141, }, // Mewtwo @ Cerulean Cave // Event - new EncounterStatic { Species = 249, Level = 70, Location = 174, }, // Lugia @ Navel Rock - new EncounterStatic { Species = 250, Level = 70, Location = 174, }, // Ho-Oh @ Navel Rock + new EncounterStatic { Species = 249, Level = 70, Location = 174, Fateful = true }, // Lugia @ Navel Rock + new EncounterStatic { Species = 250, Level = 70, Location = 174, Fateful = true }, // Ho-Oh @ Navel Rock new EncounterStatic { Species = 386, Level = 30, Location = 187, Version = GameVersion.FR, Form = 1, Fateful = true }, // Deoxys @ Birth Island new EncounterStatic { Species = 386, Level = 30, Location = 187, Version = GameVersion.LG, Form = 2, Fateful = true }, // Deoxys @ Birth Island };