From 10e108939b6330bafd9d68d7eba992622634bdaa Mon Sep 17 00:00:00 2001 From: Kurt Date: Wed, 13 Mar 2024 00:18:58 -0500 Subject: [PATCH] Move fallback pressure check to near end --- PKHeX.Core/Legality/RNG/ClassicEra/Gen4/MethodJ.cs | 10 +++++----- PKHeX.Core/Legality/RNG/ClassicEra/Gen4/MethodK.cs | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/PKHeX.Core/Legality/RNG/ClassicEra/Gen4/MethodJ.cs b/PKHeX.Core/Legality/RNG/ClassicEra/Gen4/MethodJ.cs index 9c111f501..35f861849 100644 --- a/PKHeX.Core/Legality/RNG/ClassicEra/Gen4/MethodJ.cs +++ b/PKHeX.Core/Legality/RNG/ClassicEra/Gen4/MethodJ.cs @@ -286,11 +286,6 @@ private static bool TryGetMatchNoSync(in FrameCheckDetails ctx, out LeadSe { result = new(pressure, PressureHustleSpirit); return true; } result = default; return false; } - if (ctx.Encounter.PressureLevel <= ctx.LevelMax) // Can be boosted, or not. - { - if (IsSlotValidHustleVital(ctx, out var pressure)) - { result = new(pressure, PressureHustleSpirit); return true; } - } } if (IsSlotValidRegular(ctx, out uint seed)) @@ -310,6 +305,11 @@ private static bool TryGetMatchNoSync(in FrameCheckDetails ctx, out LeadSe { result = new(seed, lead); return true; } if (IsSlotValidIntimidate(ctx, out seed)) { result = new(seed, IntimidateKeenEyeFail); return true; } + if (ctx.Encounter.PressureLevel <= ctx.LevelMax) // Can be boosted, or not. + { + if (IsSlotValidHustleVital(ctx, out var pressure)) + { result = new(pressure, PressureHustleSpirit); return true; } + } if (CanRadar(ctx.Encounter)) { result = new(ctx.Seed1, Radar); return true; } diff --git a/PKHeX.Core/Legality/RNG/ClassicEra/Gen4/MethodK.cs b/PKHeX.Core/Legality/RNG/ClassicEra/Gen4/MethodK.cs index af0efa22c..0e8745889 100644 --- a/PKHeX.Core/Legality/RNG/ClassicEra/Gen4/MethodK.cs +++ b/PKHeX.Core/Legality/RNG/ClassicEra/Gen4/MethodK.cs @@ -308,11 +308,6 @@ private static bool TryGetMatchNoSync(in FrameCheckDetails ctx, out LeadSe { result = new(pressure, PressureHustleSpirit); return true; } result = default; return false; } - if (ctx.Encounter.PressureLevel <= ctx.LevelMax) // Can be boosted, or not. - { - if (IsSlotValidHustleVital(ctx, out var pressure)) - { result = new(pressure, PressureHustleSpirit); return true; } - } } if (IsSlotValidRegular(ctx, out uint seed)) @@ -332,6 +327,11 @@ private static bool TryGetMatchNoSync(in FrameCheckDetails ctx, out LeadSe { result = new(seed, sm); return true; } if (IsSlotValidIntimidate(ctx, out seed)) { result = new(seed, IntimidateKeenEyeFail); return true; } + if (ctx.Encounter.PressureLevel <= ctx.LevelMax) // Can be boosted, or not. + { + if (IsSlotValidHustleVital(ctx, out var pressure)) + { result = new(pressure, PressureHustleSpirit); return true; } + } result = default; return false; }