From a6671b2e63dec5c7cb178d6825491d4f1b384576 Mon Sep 17 00:00:00 2001 From: Kurt Date: Sat, 3 Dec 2016 09:38:24 -0800 Subject: [PATCH] fix form1 meowstic gen6 edge case egg move tables are per species not per form in gen6 added comments for lessons learned --- PKHeX/Legality/Core.cs | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/PKHeX/Legality/Core.cs b/PKHeX/Legality/Core.cs index 207f6b62b..88922e49a 100644 --- a/PKHeX/Legality/Core.cs +++ b/PKHeX/Legality/Core.cs @@ -923,12 +923,10 @@ private static IEnumerable getEggMoves(PKM pkm, int species, int formnum) { switch (pkm.GenNumber) { - case 6: - int ind_XY = PersonalTable.XY.getFormeIndex(species, formnum); - int ind_AO = PersonalTable.AO.getFormeIndex(species, formnum); - return EggMovesAO[ind_AO].Moves.Concat(EggMovesXY[ind_XY].Moves); + case 6: // entries per species + return EggMovesAO[species].Moves.Concat(EggMovesXY[species].Moves); - case 7: + case 7: // entries per form var entry = EggMovesSM[species]; if (formnum > 0) entry = EggMovesSM[entry.FormTableIndex + formnum - 1];