From 044ae4e6feebdf6d63045817192246dbb337f811 Mon Sep 17 00:00:00 2001 From: ReignOfComputer Date: Tue, 22 May 2018 11:19:00 +0800 Subject: [PATCH] Correct Control Switching for G2->G7 (#1957) Is there a reason for having GSC newTrack as USUM? This causes `origintrack = newTrack;` not to happen and thus controls don't switch from G2->G7 correctly. --- PKHeX.WinForms/Controls/PKM Editor/PKMEditor.cs | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/PKHeX.WinForms/Controls/PKM Editor/PKMEditor.cs b/PKHeX.WinForms/Controls/PKM Editor/PKMEditor.cs index 7ce89fa9d..89a008232 100644 --- a/PKHeX.WinForms/Controls/PKM Editor/PKMEditor.cs +++ b/PKHeX.WinForms/Controls/PKM Editor/PKMEditor.cs @@ -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);