From 4331d7fa8482fd930807e58a5fe447bbbb23042d Mon Sep 17 00:00:00 2001 From: Kurt Date: Thu, 26 Jan 2017 19:42:03 -0800 Subject: [PATCH] Fix Meowstic edge case Closes #757 --- PKHeX/Legality/Core.cs | 2 ++ PKHeX/Legality/Structures/EvolutionTree.cs | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/PKHeX/Legality/Core.cs b/PKHeX/Legality/Core.cs index b25f0d290..c50b2e15f 100644 --- a/PKHeX/Legality/Core.cs +++ b/PKHeX/Legality/Core.cs @@ -952,6 +952,8 @@ private static IEnumerable getEggMoves(PKM pkm, int species, int formnum) return EggMovesAO[species].Moves.Concat(EggMovesXY[species].Moves); case 7: // entries per form + if (species == 678) + { species = 677; formnum = 0; } var entry = EggMovesSM[species]; if (formnum > 0) entry = EggMovesSM[entry.FormTableIndex + formnum - 1]; diff --git a/PKHeX/Legality/Structures/EvolutionTree.cs b/PKHeX/Legality/Structures/EvolutionTree.cs index cdbfecd4e..eb89c08db 100644 --- a/PKHeX/Legality/Structures/EvolutionTree.cs +++ b/PKHeX/Legality/Structures/EvolutionTree.cs @@ -125,7 +125,8 @@ private int getIndex(PKM pkm) if (pkm.Format < 7) return pkm.Species; - return Personal.getFormeIndex(pkm.Species, pkm.AltForm); + var form = pkm.Species == 678 ? 0 : pkm.AltForm; // override Meowstic forme index + return Personal.getFormeIndex(pkm.Species, form); } private int getIndex(EvolutionMethod evo) {