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

Merge branch 'master' of https://github.com/kwsch/PKHeX

Browse source
This commit is contained in:
Kurt 2018-05-22 16:51:32 -07:00
commit caa617ee83
2 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
PKHeX.Core/Editing/ShowdownSet.cs
View file

@ -67,7 +67,7 @@ namespace PKHeX.Core
}
private void LoadLines(IEnumerable<string> lines)
{
lines = lines.Select(z => z.Replace("'", "’").Trim()); // Sanitize apostrophes
lines = lines.Select(z => z.Replace("'", "’").Replace("–", "-").Trim()); // Sanitize apostrophes & dashes
lines = lines.Where(z => z.Length > 2);
ParseLines(lines);

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

@ -1025,10 +1025,7 @@ namespace PKHeX.WinForms.Controls
pkm.Version = (int)Version;
TID_Trainer.LoadIDValues(pkm);
}
if (newTrack == GameVersion.GSC && pkm.Format >= 7)
newTrack = GameVersion.USUM;
else if (pkm.Format < 3)
newTrack = GameVersion.GSC;
if (newTrack != origintrack)
{
var met_list = GameInfo.GetLocationList(Version, pkm.Format, egg: false);