Leahnaya/PKHeX
1
0
Fork 0
mirror of https://github.com/kwsch/PKHeX.git synced 2026-08-28 03:44:10 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix B2W2 tutor moves (#1035)

Browse Source 
* 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
This commit is contained in:
wwwwwwzx
2017-04-08 09:08:54 -07:00
committed by Kurt
parent c51de0620f
commit 6ff4003036
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
PKHeX/Legality/Checks.cs
View File

@@ -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<EncounterStatic>;
var sgb = s?.FirstOrDefault(v => GameVersion.GBCartEraOnly.Contains(v.Version) || v.Version == GameVersion.VCEvents);
@@ -2646,7 +2646,7 @@ private CheckResult[] parseMoves(int[] moves, List<int>[] 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);

4
PKHeX/Legality/Tables5.cs
View File

@@ -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
};