diff --git a/pk3DS.Core/Legality/Tables7.cs b/pk3DS.Core/Legality/Tables7.cs index b2d7a49..888e7fb 100644 --- a/pk3DS.Core/Legality/Tables7.cs +++ b/pk3DS.Core/Legality/Tables7.cs @@ -114,7 +114,7 @@ public static partial class Legal 921, 922, 923, 924, 925, 926 }; internal static readonly ushort[] HeldItems_SM = new ushort[1].Concat(Pouch_Items_SM).Concat(Pouch_Berries_SM).Concat(Pouch_Medicine_SM).Concat(Pouch_ZCrystalHeld_SM).ToArray(); - internal static readonly ushort[] HeldItems_USUM = new ushort[1].Concat(Pouch_Items_SM).Concat(Pouch_Berries_SM).Concat(Pouch_Medicine_SM).Concat(Pouch_ZCrystalHeld_USUM).ToArray(); + internal static readonly ushort[] HeldItems_USUM = new ushort[1].Concat(HeldItems_SM).Concat(Pouch_ZCrystalHeld_USUM).ToArray(); internal static readonly int[] AlolanOriginForms = { 019, // Rattata diff --git a/pk3DS.Core/Randomizers/SpeciesRandomizer.cs b/pk3DS.Core/Randomizers/SpeciesRandomizer.cs index af7f908..686819a 100644 --- a/pk3DS.Core/Randomizers/SpeciesRandomizer.cs +++ b/pk3DS.Core/Randomizers/SpeciesRandomizer.cs @@ -157,7 +157,7 @@ private void AddGen2Species(List list) if (L) { - list.AddRange(Enumerable.Range(243, 3)); // Dogs + list.AddRange(Enumerable.Range(243, 3)); // Beasts list.AddRange(Enumerable.Range(249, 2)); // Lugia & Ho-Oh } if (E) list.Add(251); // Celebi @@ -173,20 +173,20 @@ private void AddGen3Species(List list) private void AddGen4Species(List list) { list.AddRange(Enumerable.Range(387, 93)); - if (L) list.AddRange(Enumerable.Range(480, 9)); // - if (E) list.AddRange(Enumerable.Range(489, 5)); // + if (L) list.AddRange(Enumerable.Range(480, 9)); // Sinnoh Legends + if (E) list.AddRange(Enumerable.Range(489, 5)); // Phione, Manaphy, Darkrai, Shaymin, Arceus } private void AddGen5Species(List list) { list.AddRange(Enumerable.Range(495, 143)); - if (L) list.AddRange(Enumerable.Range(638, 9)); list.Add(494); // - if (E) list.AddRange(Enumerable.Range(647, 3)); // + if (L) list.AddRange(Enumerable.Range(638, 9)); list.Add(494); // Unova Legends + if (E) list.AddRange(Enumerable.Range(647, 3)); // Keldeo, Meloetta, Genesect } private void AddGen6Species(List list) { list.AddRange(Enumerable.Range(650, 66)); - if (L) list.AddRange(Enumerable.Range(716, 3)); // - if (E) list.AddRange(Enumerable.Range(719, 3)); // + if (L) list.AddRange(Enumerable.Range(716, 3)); // Kalos Legends + if (E) list.AddRange(Enumerable.Range(719, 3)); // Diancie, Hoopa, Volcanion } private void AddGen7Species(List list) { @@ -196,8 +196,8 @@ private void AddGen7Species(List list) if (MaxSpeciesID == 807) // USUM { - if (L) list.AddRange(Enumerable.Range(803, 4)); // USUM UBs - if (E) list.AddRange(Enumerable.Range(807, 1)); // Zeraora + if (L) list.AddRange(Enumerable.Range(803, 4)); // Poipole, Naganadel, Stakataka, Blacephalon + if (E) list.Add(807); // Zeraora } }