Misc jp Gen1/2 vc fixes

Fix iterator jump
Allow bu dragonair encounter -- should probably rip out all the old catchrate compare stuff anyway.
This commit is contained in:
Kurt 2023-10-13 17:25:04 -07:00
parent 6978db5e9a
commit b3bbc044ca
2 changed files with 2 additions and 2 deletions

View File

@ -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;

View File

@ -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))