From 17c32db8b56fb402c0168c646c49393ae5262b4e Mon Sep 17 00:00:00 2001 From: Kurt Date: Mon, 6 Sep 2021 15:38:32 -0700 Subject: [PATCH] Minor fixes Replace hardcoded move int with enum val Lillipup->Rockruff personal_swsh: remove pledge bitflags (missed in CT update) --- PKHeX.Core/Legality/Moves/MoveTutor.cs | 2 +- PKHeX.Core/Legality/Verifiers/FormVerifier.cs | 2 +- .../Resources/byte/personal/personal_swsh | Bin 209792 -> 209792 bytes 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/PKHeX.Core/Legality/Moves/MoveTutor.cs b/PKHeX.Core/Legality/Moves/MoveTutor.cs index 4452ac816..c78d4a56b 100644 --- a/PKHeX.Core/Legality/Moves/MoveTutor.cs +++ b/PKHeX.Core/Legality/Moves/MoveTutor.cs @@ -27,7 +27,7 @@ public static GameVersion GetIsTutorMove(PKM pkm, int species, int form, int gen private static GameVersion GetIsTutor1(PKM pkm, int species, int move) { // Surf Pikachu via Stadium - if (move != 57 || ParseSettings.AllowGBCartEra) + if (move != (int)Move.Surf || ParseSettings.AllowGBCartEra) return NONE; if (pkm.Format < 3 && species is (int)Species.Pikachu or (int)Species.Raichu) return GameVersion.Stadium; diff --git a/PKHeX.Core/Legality/Verifiers/FormVerifier.cs b/PKHeX.Core/Legality/Verifiers/FormVerifier.cs index 6e9aeedab..d60b366b8 100644 --- a/PKHeX.Core/Legality/Verifiers/FormVerifier.cs +++ b/PKHeX.Core/Legality/Verifiers/FormVerifier.cs @@ -140,7 +140,7 @@ private CheckResult VerifyForm(LegalityAnalysis data) } // Form doesn't exist in SM; cannot originate from that game. - case Lillipup when enc.Generation == 7 && form == 1 && pkm.SM: + case Rockruff when enc.Generation == 7 && form == 1 && pkm.SM: case Lycanroc when enc.Generation == 7 && form == 2 && pkm.SM: return GetInvalid(LFormInvalidGame); diff --git a/PKHeX.Core/Resources/byte/personal/personal_swsh b/PKHeX.Core/Resources/byte/personal/personal_swsh index 67eda404ec62e3f2f90ea163619e7a326236e910..b80c71d6b74131bdd9ac2905eddc47353f102772 100644 GIT binary patch delta 141 zcmZp8&eH%yEsR^3RtPg5+`dwn>HZJKgVQ^CnAZa-OI|Sb5<<=71M@uj!PHL(wNe1g pixdP?oI+q~Cxprr2J<9Ez|=_yRVfPQX^MfVn_y~tr#SO>X#j1*Hf#U@ delta 141 zcmZp8&eH%yEsR^3RtPg5-@a0q>HZJKX#k1WHrN0F