From 22e0b0f8735d61c06a42a9d479b930b3a80f4c66 Mon Sep 17 00:00:00 2001
From: javierhimura <javier_himura@hotmail.com>
Date: Mon, 27 Mar 2017 01:56:38 +0200
Subject: [PATCH] Unreleased Shaymin from Diamond and Pearl

---
 PKHeX/Legality/Checks.cs                            | 10 +++++++---
 PKHeX/Legality/LegalityCheckStrings.cs              |  1 +
 PKHeX/Legality/Tables4.cs                           |  2 +-
 PKHeX/Resources/text/en/LegalityCheckStrings_en.txt |  3 ++-
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/PKHeX/Legality/Checks.cs b/PKHeX/Legality/Checks.cs
index 7818f0cd0..419dad49e 100644
--- a/PKHeX/Legality/Checks.cs
+++ b/PKHeX/Legality/Checks.cs
@@ -659,13 +659,17 @@ namespace PKHeX.Core
         {
             var s = (EncounterStatic)EncounterMatch;
 
+            if (pkm.GenNumber == 3 && pkm.Species == 151 && s.Location == 201 && pkm.Language != 1)
+            {
+                return new CheckResult(Severity.Invalid, V353, CheckIdentifier.Encounter);
+            }
             if (pkm.GenNumber == 4 && pkm.Species == 493 && s.Location == 086)
             {
                   return new CheckResult(Severity.Invalid, V352, CheckIdentifier.Encounter);
             }
-            if (pkm.GenNumber == 3 && pkm.Species == 151 && s.Location == 201 && pkm.Language != 1)
+            if (pkm.GenNumber == 4 && pkm.Species == 492 && s.Location == 063 && pkm.Version != (int)GameVersion.Pt)
             {
-                return new CheckResult(Severity.Invalid, V353, CheckIdentifier.Encounter);
+                return new CheckResult(Severity.Invalid, V354, CheckIdentifier.Encounter);
             }
 
             // Re-parse relearn moves
@@ -797,7 +801,7 @@ namespace PKHeX.Core
             // TODO: Include also gen 3 events
             if (null != (EncounterMatch = Legal.getValidStaticEncounter(pkm)))
             {
-                NonEggResult = new CheckResult(Severity.Valid, V75, CheckIdentifier.Encounter);
+                NonEggResult = verifyEncounterStatic();
             }
 
             if (NonEggResult !=null)
diff --git a/PKHeX/Legality/LegalityCheckStrings.cs b/PKHeX/Legality/LegalityCheckStrings.cs
index d1501df74..7cd14a948 100644
--- a/PKHeX/Legality/LegalityCheckStrings.cs
+++ b/PKHeX/Legality/LegalityCheckStrings.cs
@@ -339,6 +339,7 @@ namespace PKHeX.Core
         public static string V351 {get; set;} = "Invalid Met Location, expected Transporter or Crown."; // Invalid
         public static string V352 {get; set;} = "Arceus from Hall of Origin. Unreleased event.";
         public static string V353 {get; set;} = "Non japanese Mew from Faraway Island. Unreleased event.";
+        public static string V354 {get; set;} = "Non Platinum Shaymin from Flower Paradise. Unreleased event.";
         #endregion
 
     }
diff --git a/PKHeX/Legality/Tables4.cs b/PKHeX/Legality/Tables4.cs
index ef6589dd4..f89b46f45 100644
--- a/PKHeX/Legality/Tables4.cs
+++ b/PKHeX/Legality/Tables4.cs
@@ -441,7 +441,7 @@ namespace PKHeX.Core
             new EncounterStatic { Species = 490, Level = 01, EggLocation = 3001, Fateful = true, Gift = true }, //Manaphy from Pokemon Ranger
             new EncounterStatic { Species = 491, Level = 40, Location = 079, Version = GameVersion.DP,}, //Darkrai @ Newmoon Island
             new EncounterStatic { Species = 491, Level = 50, Location = 079, Version = GameVersion.Pt,}, //Darkrai @ Newmoon Island
-            new EncounterStatic { Species = 492, Form = 0, Level = 30, Location = 063, Fateful = true,}, //Shaymin @ Flower Paradise
+            new EncounterStatic { Species = 492, Form = 0, Level = 30, Location = 063, Fateful = true,}, //Shaymin @ Flower Paradise (Unreleased in Diamond and Pearl)
             new EncounterStatic { Species = 493, Form = 0, Level = 80, Location = 086,}, //Arceus @ Hall of Origin (Unreleased)
         };
         internal static readonly EncounterStatic[] Encounter_DPPt = Encounter_DPPt_Roam.SelectMany(e => e.Clone(Roaming_MetLocation_DPPt)).Concat(Encounter_DPPt_Regular).ToArray();
diff --git a/PKHeX/Resources/text/en/LegalityCheckStrings_en.txt b/PKHeX/Resources/text/en/LegalityCheckStrings_en.txt
index 85e0c0b12..c9842eade 100644
--- a/PKHeX/Resources/text/en/LegalityCheckStrings_en.txt
+++ b/PKHeX/Resources/text/en/LegalityCheckStrings_en.txt
@@ -273,4 +273,5 @@ V348 = Inherited tutor move. Not expected in an event egg.
 V350 = Inherited TM/HM move. Not expected in an event egg.
 V351 = Invalid Met Location, expected Transporter or Crown.
 V352 = Arceus from Hall of Origin. Unreleased event.
-V353 = Non japanese Mew from Faraway Island. Unreleased event.
\ No newline at end of file
+V353 = Non japanese Mew from Faraway Island. Unreleased event.
+V354 = Non Platinum Shaymin from Flower Paradise. Unreleased event.
\ No newline at end of file