diff --git a/PKHeX.Core/Legality/Restrictions/GBRestrictions.cs b/PKHeX.Core/Legality/Restrictions/GBRestrictions.cs index 133d1a4a0..241cd12dc 100644 --- a/PKHeX.Core/Legality/Restrictions/GBRestrictions.cs +++ b/PKHeX.Core/Legality/Restrictions/GBRestrictions.cs @@ -493,7 +493,11 @@ public static TimeCapsuleEvaluation IsTimeCapsuleTransferred(PKM pkm, IList z != null && z.Generation != enc.Generation && z.Generation <= 2)) + { + if (pkm is PK1 {Catch_Rate: not 0} g1 && !IsTradebackCatchRate(g1.Catch_Rate)) + return TimeCapsuleEvaluation.BadCatchRate; return enc.Generation == 2 ? TimeCapsuleEvaluation.Transferred21 : TimeCapsuleEvaluation.Transferred12; + } if (pkm is not GBPKM gb) { @@ -518,9 +522,14 @@ public static TimeCapsuleEvaluation IsTimeCapsuleTransferred(PKM pkm, IList z.Generation == 2)) + return GetInvalid(LG1CatchRateItem); var e = data.EncounterMatch; if (e is EncounterStatic1E {Version: GameVersion.Stadium} or EncounterTrade1) return GetValid(LG1CatchRateMatchPrevious); // Encounters detected by the catch rate, cant be invalid if match this encounters