From 6ff400303600f2e37682e25e0e427bce03be52c8 Mon Sep 17 00:00:00 2001 From: wwwwwwzx Date: Sat, 8 Apr 2017 09:08:54 -0700 Subject: [PATCH] Fix B2W2 tutor moves (#1035) * Fix b2w2 tutor move Iron tail(231) is taught at Lentimas city. * Fix B2W2 Tutor Move Iron tail (231) is taught at Lentimas city. Also fix the string ID of Tutor Move --- PKHeX/Legality/Checks.cs | 4 ++-- PKHeX/Legality/Tables5.cs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/PKHeX/Legality/Checks.cs b/PKHeX/Legality/Checks.cs index 132620396..62862529a 100644 --- a/PKHeX/Legality/Checks.cs +++ b/PKHeX/Legality/Checks.cs @@ -956,7 +956,7 @@ private CheckResult verifyVCEncounter(int baseSpecies) // Check existing EncounterMatch if ((EncounterOriginal ?? EncounterMatch) == null) - return new CheckResult(Severity.Invalid, V80, CheckIdentifier.Encounter); + return new CheckResult(CheckIdentifier.Encounter); // Avoid duplicate invaild message var s = EncounterMatch as List; var sgb = s?.FirstOrDefault(v => GameVersion.GBCartEraOnly.Contains(v.Version) || v.Version == GameVersion.VCEvents); @@ -2646,7 +2646,7 @@ private CheckResult[] parseMoves(int[] moves, List[] learn, int[] relearn, else if (tmhm[gen].Contains(moves[m])) res[m] = new CheckResult(Severity.Valid, native ? V173 : string.Format(V331, gen), CheckIdentifier.Move); else if (tutor[gen].Contains(moves[m])) - res[m] = new CheckResult(Severity.Valid, native ? V173 : string.Format(V332, gen), CheckIdentifier.Move); + res[m] = new CheckResult(Severity.Valid, native ? V174 : string.Format(V332, gen), CheckIdentifier.Move); else if (gen == pkm.GenNumber && special.Contains(moves[m])) res[m] = new CheckResult(Severity.Valid, V175, CheckIdentifier.Move); diff --git a/PKHeX/Legality/Tables5.cs b/PKHeX/Legality/Tables5.cs index 6fabb28dd..f8ff0ca90 100644 --- a/PKHeX/Legality/Tables5.cs +++ b/PKHeX/Legality/Tables5.cs @@ -120,8 +120,8 @@ public static partial class Legal internal static readonly int[][] Tutors_B2W2 = { new[] { 450, 343, 162, 530, 324, 442, 402, 529, 340, 067, 441, 253, 009, 007, 008 }, // Driftveil City - new[] { 277, 335, 414, 492, 356, 393, 334, 387, 276, 527, 196, 401, 399, 428, 406, 304 }, // Lentimas Town - new[] { 231, 020, 173, 282, 235, 257, 272, 215, 366, 143, 220, 202, 409, 355 }, // Humilau City + new[] { 277, 335, 414, 492, 356, 393, 334, 387, 276, 527, 196, 401, 399, 428, 406, 304, 231 }, // Lentimas Town + new[] { 020, 173, 282, 235, 257, 272, 215, 366, 143, 220, 202, 409, 355 }, // Humilau City new[] { 380, 388, 180, 495, 270, 271, 478, 472, 283, 200, 278, 289, 446, 214, 285 } // Nacrene City };