From af2ac169e192e52a805dcda0d9b1865e672ba11f Mon Sep 17 00:00:00 2001 From: Kurt Date: Mon, 30 May 2022 00:50:35 -0700 Subject: [PATCH] Only disallow catchrate enc if !tradeback Closes #3501 --- PKHeX.Core/Legality/Encounters/Generator/EncounterFinder.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PKHeX.Core/Legality/Encounters/Generator/EncounterFinder.cs b/PKHeX.Core/Legality/Encounters/Generator/EncounterFinder.cs index e61d05e02..e6d2a3670 100644 --- a/PKHeX.Core/Legality/Encounters/Generator/EncounterFinder.cs +++ b/PKHeX.Core/Legality/Encounters/Generator/EncounterFinder.cs @@ -126,7 +126,7 @@ private static bool VerifySecondaryChecks(PKM pkm, LegalInfo info, PeekEnumerato return false; } } - else if (pkm is PK1 pk1) + else if (pkm is PK1 pk1 && !ParseSettings.AllowGen1Tradeback) { if (!Array.TrueForAll(info.Moves, z => z.Generation is 1) && !PK1.IsCatchRateHeldItem(pk1.Catch_Rate)) return false;