Mirrors/PKHeX
2
0
Fork 0
mirror of https://github.com/kwsch/PKHeX synced 2024-12-03 17:29:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

Unreleased Shaymin from Diamond and Pearl

Browse source
This commit is contained in:
javierhimura 2017-03-27 01:56:38 +02:00
parent a66f106aef
commit 22e0b0f873
4 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
PKHeX/Legality/Checks.cs
View file

@ -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)

1
PKHeX/Legality/LegalityCheckStrings.cs
View file

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

2
PKHeX/Legality/Tables4.cs
View file

@ -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();

3
PKHeX/Resources/text/en/LegalityCheckStrings_en.txt
View file

@ -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.
V353 = Non japanese Mew from Faraway Island. Unreleased event.
V354 = Non Platinum Shaymin from Flower Paradise. Unreleased event.