From bff867ce31fc181bb1cece888bf593c8fc9db627 Mon Sep 17 00:00:00 2001 From: javierhimura Date: Mon, 27 Mar 2017 01:18:26 +0200 Subject: [PATCH] Add transporter or crown location text error --- PKHeX/Legality/Checks.cs | 4 ++-- PKHeX/Legality/LegalityCheckStrings.cs | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/PKHeX/Legality/Checks.cs b/PKHeX/Legality/Checks.cs index 1a73c2aba..f3a08e7cd 100644 --- a/PKHeX/Legality/Checks.cs +++ b/PKHeX/Legality/Checks.cs @@ -729,7 +729,7 @@ private CheckResult verifyEncounter() if (pkm.Gen4 && !pkm.HasOriginalMetLocation) { - return verifyEncounterG3Transfer(); + return verifyEncounterG4Transfer(); } bool wasEvent = pkm.WasEvent || pkm.WasEventEgg; @@ -839,7 +839,7 @@ private CheckResult verifyEncounterG4Transfer() CrownLocation = pkm.Species == 251 ? 30010 : 30012; // Celebi : Beast if (pkm.Met_Location != 30001 && (!AllowCrownLocation || pkm.Met_Location != CrownLocation)) - InvalidTransferResult = new CheckResult(Severity.Invalid, V61, CheckIdentifier.Encounter); + InvalidTransferResult = new CheckResult(Severity.Invalid, AllowCrownLocation ? V351 : V61, CheckIdentifier.Encounter); bool wasEvent = pkm.WasEvent || pkm.WasEventEgg; if (wasEvent) diff --git a/PKHeX/Legality/LegalityCheckStrings.cs b/PKHeX/Legality/LegalityCheckStrings.cs index ecee05022..fd20169bc 100644 --- a/PKHeX/Legality/LegalityCheckStrings.cs +++ b/PKHeX/Legality/LegalityCheckStrings.cs @@ -336,7 +336,8 @@ public static class LegalityCheckStrings public static string V347 {get; set;} = "Inherited move learned by Level-up.Not expected in an event egg."; public static string V348 {get; set;} = "Inherited tutor move. Not expected in an event egg."; public static string V350 {get; set;} = "Inherited TM/HM move. Not expected in an event egg."; + public static string V351 {get; set;} = "Invalid Met Location, expected Transporter or Crown."; // Invalid #endregion - } + } }