Simplify form egg move handling

Closes #2588
This commit is contained in:
Kurt 2019-12-21 13:37:20 -08:00
parent d7bc68d7a5
commit 7889a0abe6
2 changed files with 3 additions and 7 deletions

View file

@ -68,13 +68,8 @@ namespace PKHeX.Core
private static int[] GetFormEggMoves(int species, int formnum, IReadOnlyList<EggMoves7> table)
{
var entry = table[species];
if (formnum > 0)
{
if (AlolanOriginForms.Contains(species))
entry = table[entry.FormTableIndex + formnum - 1];
else if (GalarOriginForms.Contains(species))
entry = table[entry.FormTableIndex + formnum - 1];
}
if (formnum > 0 && entry.FormTableIndex > species)
entry = table[entry.FormTableIndex + formnum - 1];
return entry.Moves;
}

View file

@ -416,6 +416,7 @@ namespace PKHeX.Core
32, // Nidoran♂
313, // Volbeat
314, // Illumise
(int)Species.Indeedee, // male/female
};
public static readonly HashSet<int> FixedGenderFromBiGender = new HashSet<int>