From b3bbc044cae463c609a358456cbdfcdbf0fd8fb1 Mon Sep 17 00:00:00 2001 From: Kurt Date: Fri, 13 Oct 2023 17:25:04 -0700 Subject: [PATCH] Misc jp Gen1/2 vc fixes Fix iterator jump Allow bu dragonair encounter -- should probably rip out all the old catchrate compare stuff anyway. --- .../Encounters/Generator/Search/EncounterEnumerator2.cs | 2 +- PKHeX.Core/Legality/Verifiers/MiscVerifier.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/PKHeX.Core/Legality/Encounters/Generator/Search/EncounterEnumerator2.cs b/PKHeX.Core/Legality/Encounters/Generator/Search/EncounterEnumerator2.cs index 39175a1d0..6162a7943 100644 --- a/PKHeX.Core/Legality/Encounters/Generator/Search/EncounterEnumerator2.cs +++ b/PKHeX.Core/Legality/Encounters/Generator/Search/EncounterEnumerator2.cs @@ -105,7 +105,7 @@ public bool MoveNext() { State = YieldState.StaticCOdd; goto case YieldState.StaticCOdd; } if (canOriginateCrystal) { State = YieldState.StaticC; goto case YieldState.StaticC; } - State = YieldState.SlotGD; goto case YieldState.SlotGD; + State = YieldState.StaticGD; goto case YieldState.StaticGD; case YieldState.StaticCOdd: if (TryGetNext(Encounters2.StaticOddEggC)) return true; diff --git a/PKHeX.Core/Legality/Verifiers/MiscVerifier.cs b/PKHeX.Core/Legality/Verifiers/MiscVerifier.cs index 873fdb3cb..eaa1d0d65 100644 --- a/PKHeX.Core/Legality/Verifiers/MiscVerifier.cs +++ b/PKHeX.Core/Legality/Verifiers/MiscVerifier.cs @@ -388,7 +388,7 @@ CheckResult GetWasNotTradeback(TimeCapsuleEvaluation timeCapsuleEvalution) ushort species = pk1.Species; if (GBRestrictions.IsSpeciesNotAvailableCatchRate((byte)species) && catch_rate == PersonalTable.RB[species].CatchRate) { - if (species != (int) Species.Dragonite || catch_rate != 45 || !e.Version.Contains(GameVersion.YW)) + if (species != (int) Species.Dragonite || catch_rate != 45 || !(e.Version == GameVersion.BU || e.Version.Contains(GameVersion.YW))) return GetInvalid(LG1CatchRateEvo); } if (!GBRestrictions.RateMatchesEncounter(e.Species, e.Version, catch_rate))