This commit is contained in:
Kurt 2024-11-15 23:07:11 -06:00
commit 55b75e8061
3 changed files with 5 additions and 8 deletions

View file

@ -209,6 +209,7 @@ public static class EncounterServerDate
{0511, (new(2024, 08, 15), new(2024, 08, 31))}, // WCS 2024 Steenee {0511, (new(2024, 08, 15), new(2024, 08, 31))}, // WCS 2024 Steenee
{0512, (new(2024, 08, 16), new(2024, 08, 20))}, // Tomoya's Sylveon {0512, (new(2024, 08, 16), new(2024, 08, 20))}, // Tomoya's Sylveon
{0062, (new(2024, 10, 31), new(2026, 02, 01))}, // PokéCenter Birthday Tandemaus {0062, (new(2024, 10, 31), new(2026, 02, 01))}, // PokéCenter Birthday Tandemaus
{0513, (new(2024, 11, 15), new(2024, 11, 23))}, // Patrick's Pelipper
{9021, HOME3_ML}, // Hidden Ability Sprigatito {9021, HOME3_ML}, // Hidden Ability Sprigatito
{9022, HOME3_ML}, // Hidden Ability Fuecoco {9022, HOME3_ML}, // Hidden Ability Fuecoco

View file

@ -100,14 +100,10 @@ public sealed partial class MemoryContext8 : MemoryContext
if (version == GameVersion.SH && encountered == Zacian) if (version == GameVersion.SH && encountered == Zacian)
return false; return false;
return species switch // These legends can't meet Eternatus as OT memory since they require Eternatus to be caught.
{ if (species is (Zacian or Zamazenta or Glastrier or Spectrier or Calyrex))
// Zacian and Zamazenta can't meet Eternatus as OT memory. return encountered != Eternatus;
Zacian or Zamazenta => encountered != Eternatus, return true;
// Calyrex, Spectrier, Glastrier can't meet Eternatus, Zacian, Zamazenta as OT memory.
Calyrex or Spectrier or Glastrier => encountered is not (Eternatus or Zacian or Zamazenta),
_ => true,
};
} }
private static bool CanObtainMemorySWSH(byte memory) => memory <= MAX_MEMORY_ID_SWSH && !Memory_NotSWSH.Contains(memory); private static bool CanObtainMemorySWSH(byte memory) => memory <= MAX_MEMORY_ID_SWSH && !Memory_NotSWSH.Contains(memory);