From b71df7b064417b62e8df0d1f52232182033e2fa1 Mon Sep 17 00:00:00 2001 From: Kurt Date: Mon, 21 Dec 2020 16:49:42 -0800 Subject: [PATCH] Allow shared moves from daycare as "can know move" See b58f3bbc22723cbe14d7a71baae16c40ec83533a --- PKHeX.Core/Legality/Core.cs | 4 ++++ PKHeX.Core/Legality/Verifiers/MemoryVerifier.cs | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/PKHeX.Core/Legality/Core.cs b/PKHeX.Core/Legality/Core.cs index 41ef18b9d..31cbbee3c 100644 --- a/PKHeX.Core/Legality/Core.cs +++ b/PKHeX.Core/Legality/Core.cs @@ -180,6 +180,10 @@ internal static bool GetCanKnowMove(PKM pkm, int move, int generation, IReadOnly { if (pkm.Species == (int)Species.Smeargle) return !InvalidSketch.Contains(move); + + if (generation >= 8 && MoveEgg.GetIsSharedEggMove(pkm, generation, move)) + return true; + return MoveList.GetValidMoves(pkm, version, evos, generation, LVL: true, Relearn: true, Tutor: true, Machine: true).Contains(move); } diff --git a/PKHeX.Core/Legality/Verifiers/MemoryVerifier.cs b/PKHeX.Core/Legality/Verifiers/MemoryVerifier.cs index 858e00ba0..cb0a51dcd 100644 --- a/PKHeX.Core/Legality/Verifiers/MemoryVerifier.cs +++ b/PKHeX.Core/Legality/Verifiers/MemoryVerifier.cs @@ -56,9 +56,9 @@ private CheckResult VerifyCommonMemory(PKM pkm, int handler, int gen, LegalInfo // Move // {0} studied about how to use {2} in a Box, thinking about {1}. {4} that {3}. - case 80 when memory.Variable == 0 || !Legal.GetCanKnowMove(pkm, gen, memory.Variable, info.EvoChainsAllGens[gen]): + case 80 when memory.Variable == 0 || !Legal.GetCanKnowMove(pkm, memory.Variable, gen, info.EvoChainsAllGens[gen]): // {0} practiced its cool pose for the move {2} in a Box, wishing to be praised by {1}. {4} that {3}. - case 81 when memory.Variable == 0 || !Legal.GetCanKnowMove(pkm, gen, memory.Variable, info.EvoChainsAllGens[gen]): + case 81 when memory.Variable == 0 || !Legal.GetCanKnowMove(pkm, memory.Variable, gen, info.EvoChainsAllGens[gen]): return GetInvalid(string.Format(LMemoryArgBadMove, memory.Handler)); // Species