From 8f8726ac5e4ee6e09389689c6509f75ca973f596 Mon Sep 17 00:00:00 2001
From: Kurt <kaphotics@gmail.com>
Date: Sun, 13 Mar 2022 18:29:47 -0700
Subject: [PATCH] Disallow encstatic1 yield catchrate not tradeback

---
 .../Encounters/EncounterStatic/EncounterStatic1.cs |   4 ++--
 .../Generation 1 Only/025 - PIKACHU - E9D3.pk1     | Bin 0 -> 69 bytes
 .../Legal/Generation 1 Only/026 - RAZOR - 9BD7.pk1 | Bin 0 -> 69 bytes
 3 files changed, 2 insertions(+), 2 deletions(-)
 create mode 100644 Tests/PKHeX.Core.Tests/Legality/Legal/Generation 1 Only/025 - PIKACHU - E9D3.pk1
 create mode 100644 Tests/PKHeX.Core.Tests/Legality/Legal/Generation 1 Only/026 - RAZOR - 9BD7.pk1

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 0000000000000000000000000000000000000000..c26bbbbe8c9f83ec77b0c95e14ac20e8d9f046e9
GIT binary patch
literal 69
zcmZP!`5(d{%*r4xzAr?VfgzHIfuWWG4mNPfX}~!kMq6tDjNjkU)zH*FB>)HjTBQqV

literal 0
HcmV?d00001

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 0000000000000000000000000000000000000000..4abfdd582010b41cb4ca337c56ec194fff404549
GIT binary patch
literal 69
zcmZP!{U6G((w0G7d|$YdWaw8j=J|Y*E>a~Dy3!01udbDH@v`#UGOT3iV~A#$!qD2)
TGPR>OfB^(1Hq7js7yt$UyiF9F

literal 0
HcmV?d00001