Leahnaya/PKHeX
1
0
Fork 0
mirror of https://github.com/kwsch/PKHeX.git synced 2026-09-11 20:16:27 -05:00
Code Issues Actions Packages Projects Releases 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
parent d3ea1968bd 97e21ce133
commit caa617ee83
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -67,7 +67,7 @@ public ShowdownSet(IEnumerable<string> lines)
}
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 @@ private void UpdateOriginGame(object sender, EventArgs e)
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);