diff --git a/PKHeX.Core/Legality/Encounters/EncounterStatic/EncounterStatic2.cs b/PKHeX.Core/Legality/Encounters/EncounterStatic/EncounterStatic2.cs index 14bad4b5b..73cc77c7f 100644 --- a/PKHeX.Core/Legality/Encounters/EncounterStatic/EncounterStatic2.cs +++ b/PKHeX.Core/Legality/Encounters/EncounterStatic/EncounterStatic2.cs @@ -71,8 +71,13 @@ protected override bool IsMatchLocation(PKM pk) return true; if (Location == 0) return true; - if (pk is ICaughtData2 {CaughtData: not 0}) - return Location == pk.Met_Location; + if (pk is ICaughtData2 c2) + { + if (c2.CaughtData is not 0) + return Location == pk.Met_Location; + if (pk.Species == (int)Core.Species.Celebi) + return false; // Cannot reset the Met data + } return true; } diff --git a/Tests/PKHeX.Core.Tests/Legality/Illegal/Misc/251 - CELEBI - E96B nomet notradeback.pk2 b/Tests/PKHeX.Core.Tests/Legality/Illegal/Misc/251 - CELEBI - E96B nomet notradeback.pk2 new file mode 100644 index 000000000..160d5efea Binary files /dev/null and b/Tests/PKHeX.Core.Tests/Legality/Illegal/Misc/251 - CELEBI - E96B nomet notradeback.pk2 differ