diff --git a/PKHeX.Core/Legality/Encounters/EncounterStatic/EncounterStatic1.cs b/PKHeX.Core/Legality/Encounters/EncounterStatic/EncounterStatic1.cs index 055720359..b8b115709 100644 --- a/PKHeX.Core/Legality/Encounters/EncounterStatic/EncounterStatic1.cs +++ b/PKHeX.Core/Legality/Encounters/EncounterStatic/EncounterStatic1.cs @@ -60,10 +60,10 @@ protected override bool IsMatchPartial(PKM pkm) { - if (ParseSettings.AllowGen1Tradeback) - return false; if (pkm is not PK1 pk1) return false; + if (PK1.IsCatchRateHeldItem(pk1.Catch_Rate)) + return false; if (IsCatchRateValid(pk1)) return false; return true; diff --git a/Tests/PKHeX.Core.Tests/Legality/Legal/Generation 1 Only/025 - PIKACHU - E9D3.pk1 b/Tests/PKHeX.Core.Tests/Legality/Legal/Generation 1 Only/025 - PIKACHU - E9D3.pk1 new file mode 100644 index 000000000..c26bbbbe8 Binary files /dev/null and b/Tests/PKHeX.Core.Tests/Legality/Legal/Generation 1 Only/025 - PIKACHU - E9D3.pk1 differ diff --git a/Tests/PKHeX.Core.Tests/Legality/Legal/Generation 1 Only/026 - RAZOR - 9BD7.pk1 b/Tests/PKHeX.Core.Tests/Legality/Legal/Generation 1 Only/026 - RAZOR - 9BD7.pk1 new file mode 100644 index 000000000..4abfdd582 Binary files /dev/null and b/Tests/PKHeX.Core.Tests/Legality/Legal/Generation 1 Only/026 - RAZOR - 9BD7.pk1 differ