Mirrors/PKHeX
2
0
Fork 0
mirror of https://github.com/kwsch/PKHeX synced 2024-11-27 06:20:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix misc problems

Browse source 
flag undistributed gen3 events
fix gen3 string writing (resized then expanded yields 00, missing
terminator), closes #1204
fix stackoverflow, fix pkmeditor template loading save prompt, closes
#1207
This commit is contained in:
Kurt 2017-06-08 20:57:30 -07:00
parent b5b5ebd852
commit 63b18ff51f
6 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
PKHeX.Core/Legality/Analysis.cs
View file

@ -143,6 +143,9 @@ namespace PKHeX.Core
if (pkm.Version == 15) if (pkm.Version == 15)
verifyCXD(); verifyCXD();
if (info.EncounterMatch is WC3 z && z.NotDistributed)
AddLine(Severity.Invalid, V413, CheckIdentifier.Encounter);
} }
private void parsePK4(PKM pk) private void parsePK4(PKM pk)
{ {

2
PKHeX.Core/Legality/Core.cs
View file

@ -16,7 +16,7 @@ namespace PKHeX.Core
public static bool AllowGen1Tradeback = false; public static bool AllowGen1Tradeback = false;
public static bool AllowGen2VCTransfer => AllowGen1Tradeback; public static bool AllowGen2VCTransfer => AllowGen1Tradeback;
public static bool AllowGen2VCCrystal = false; public static bool AllowGen2VCCrystal = false;
public static bool AllowGen2Crystal => AllowGBCartEra || AllowGen2Crystal; public static bool AllowGen2Crystal => AllowGBCartEra || AllowGen2VCCrystal;
public static bool AllowGen2MoveReminder => AllowGBCartEra; public static bool AllowGen2MoveReminder => AllowGBCartEra;
/// <summary>Setting to specify if the e-berry index item is an eningma berry or a e-reader berry and the name of the e-reader berry</summary> /// <summary>Setting to specify if the e-berry index item is an eningma berry or a e-reader berry and the name of the e-reader berry</summary>

3
PKHeX.Core/Legality/LegalityCheckStrings.cs
View file

@ -363,8 +363,9 @@ namespace PKHeX.Core
public static string V352 {get; set;} = "Arceus from Hall of Origin. Unreleased event."; 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 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."; public static string V354 {get; set;} = "Non Platinum Shaymin from Flower Paradise. Unreleased event.";
public static string V383 {get; set;} = "Non Platinum Darkrai from Newmoon Island.Unreleased event."; public static string V383 {get; set;} = "Non Platinum Darkrai from Newmoon Island. Unreleased event.";
public static string V384 {get; set;} = "Johto Route 45 surfing encounter. Unreachable Water tiles."; public static string V384 {get; set;} = "Johto Route 45 surfing encounter. Unreachable Water tiles.";
public static string V413 {get; set;} = "Unreleased event.";
public static string V357 {get; set;} = "Only one Ninjask move allowed."; public static string V357 {get; set;} = "Only one Ninjask move allowed.";
public static string V358 {get; set;} = "Inherited move learned by Level-up. Incompatible with event egg moves."; public static string V358 {get; set;} = "Inherited move learned by Level-up. Incompatible with event egg moves.";
public static string V359 {get; set;} = "Unable to match a gift egg encounter from origin game."; public static string V359 {get; set;} = "Unable to match a gift egg encounter from origin game.";

2
PKHeX.Core/PKM/PKX.cs
View file

@ -1403,7 +1403,7 @@ namespace PKHeX.Core
} }
if (strdata.Length > 0) if (strdata.Length > 0)
strdata[strdata.Length - 1] = 0xFF; strdata[strdata.Length - 1] = 0xFF;
if (strdata.Length > maxLength) if (strdata.Length > maxLength && padTo <= maxLength)
Array.Resize(ref strdata, maxLength); Array.Resize(ref strdata, maxLength);
if (strdata.Length < padTo) if (strdata.Length < padTo)
{ {

6
PKHeX.WinForms/Controls/PKM Editor/PKMEditor.cs
View file

@ -1852,7 +1852,11 @@ namespace PKHeX.WinForms.Controls
public void TemplateFields(PKM template) public void TemplateFields(PKM template)
{ {
if (template != null) if (template != null)
{ populateFields(template); return; } {
populateFields(template);
lastData = null;
return;
}
if (CB_GameOrigin.Items.Count > 0) if (CB_GameOrigin.Items.Count > 0)
CB_GameOrigin.SelectedIndex = 0; CB_GameOrigin.SelectedIndex = 0;
CB_Move1.SelectedValue = 1; CB_Move1.SelectedValue = 1;

2
PKHeX.WinForms/MainWindow/Main.cs
View file

@ -157,7 +157,7 @@ namespace PKHeX.WinForms
{ {
openSAV(C_SAV.SAV, null); openSAV(C_SAV.SAV, null);
C_SAV.SAV.Edited = false; // Prevents form close warning from showing until changes are made C_SAV.SAV.Edited = false; // Prevents form close warning from showing until changes are made
} }
} }
if (pkmArg != null) if (pkmArg != null)
OpenQuick(pkmArg, force: true); OpenQuick(pkmArg, force: true);