From 3e9262efbb0a2bbdeb9d1e56671066b0c69fd6f1 Mon Sep 17 00:00:00 2001 From: Kurt Date: Tue, 11 Feb 2020 22:25:50 -0800 Subject: [PATCH] Only check memory feeling restriction if gen6 dunno restrictions for gen8 memories. --- PKHeX.Core/Legality/Verifiers/MemoryVerifier.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PKHeX.Core/Legality/Verifiers/MemoryVerifier.cs b/PKHeX.Core/Legality/Verifiers/MemoryVerifier.cs index d4e95df54..0d79e1354 100644 --- a/PKHeX.Core/Legality/Verifiers/MemoryVerifier.cs +++ b/PKHeX.Core/Legality/Verifiers/MemoryVerifier.cs @@ -48,13 +48,13 @@ private CheckResult VerifyCommonMemory(PKM pkm, int handler, int gen) return GetInvalid(string.Format(LMemoryArgBadMove, memory.Handler)); } - if (!Memories.CanHaveIntensity(memory.MemoryID, memory.Intensity)) + if (gen == 6 && !Memories.CanHaveIntensity(memory.MemoryID, memory.Intensity)) { if (pkm.Gen6 || (pkm.Gen7 && memory.MemoryID != 0)) // todo: memory intensity checks for gen8 return GetInvalid(string.Format(LMemoryIndexIntensityMin, memory.Handler, Memories.GetMinimumIntensity(memory.MemoryID))); } - if (memory.MemoryID != 4 && !Memories.CanHaveFeeling(memory.MemoryID, memory.Feeling)) + if (gen == 6 && memory.MemoryID != 4 && !Memories.CanHaveFeeling(memory.MemoryID, memory.Feeling)) { if (pkm.Gen6 || (pkm.Gen7 && memory.MemoryID != 0)) // todo: memory feeling checks for gen8 return GetInvalid(string.Format(LMemoryFeelInvalid, memory.Handler));