From 1e5fc96e8e1986d4b9302c182f7927c5ce8957e7 Mon Sep 17 00:00:00 2001 From: Kurt Date: Mon, 20 Nov 2017 09:11:37 -0800 Subject: [PATCH] fix gs met location errors override current location if format is GB update GS transfer location ID --- PKHeX.Core/PKM/PK2.cs | 2 +- PKHeX.WinForms/Controls/PKM Editor/PKMEditor.cs | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/PKHeX.Core/PKM/PK2.cs b/PKHeX.Core/PKM/PK2.cs index 48ceed2b2..0ede78569 100644 --- a/PKHeX.Core/PKM/PK2.cs +++ b/PKHeX.Core/PKM/PK2.cs @@ -426,7 +426,7 @@ namespace PKHeX.Core Move2_PP = Move2_PP, Move3_PP = Move3_PP, Move4_PP = Move4_PP, - Met_Location = 30004, + Met_Location = 30017, Gender = Gender, IsNicknamed = false, AltForm = AltForm, diff --git a/PKHeX.WinForms/Controls/PKM Editor/PKMEditor.cs b/PKHeX.WinForms/Controls/PKM Editor/PKMEditor.cs index 1dc7faa4b..deae3d88c 100644 --- a/PKHeX.WinForms/Controls/PKM Editor/PKMEditor.cs +++ b/PKHeX.WinForms/Controls/PKM Editor/PKMEditor.cs @@ -1256,6 +1256,8 @@ namespace PKHeX.WinForms.Controls // check if differs GameVersion newTrack = GameUtil.GetMetLocationVersionGroup(Version); + if (pkm.Format < 3) + newTrack = GameVersion.GSC; if (newTrack != origintrack) { var met_list = GameInfo.GetLocationList(Version, pkm.Format, egg: false); @@ -1266,11 +1268,12 @@ namespace PKHeX.WinForms.Controls if (fieldsLoaded) { int metLoc = 0; // transporter or pal park for past gen pkm + if (pkm.Format >= 7) // check transfer scenarios switch (newTrack) { case GameVersion.GO: metLoc = 30012; break; case GameVersion.RBY: metLoc = 30013; break; - case GameVersion.GSC: metLoc = 30004; break; + case GameVersion.GSC: metLoc = 30017; break; } if (metLoc != 0) CB_MetLocation.SelectedValue = metLoc;