diff --git a/PKHeX/MainWindow/Main.cs b/PKHeX/MainWindow/Main.cs index 333cf7d4d..6d3daf63a 100644 --- a/PKHeX/MainWindow/Main.cs +++ b/PKHeX/MainWindow/Main.cs @@ -1045,6 +1045,10 @@ private void loadSAV(SaveFile sav, string path) CB_ExtraBytes.SelectedIndex = 0; } + // pk2 save files do not have an Origin Game stored. Prompt the met location list to update. + if (SAV.Generation == 2) + updateOriginGame(null, null); + // Refresh PK#->PK6 conversion info PKMConverter.updateConfig(SAV.SubRegion, SAV.Country, SAV.ConsoleRegion, SAV.OT, SAV.Gender); @@ -2142,8 +2146,11 @@ private void updateSpecies(object sender, EventArgs e) updateLegality(); } - private List getLocationList(GameVersion Version, int SaveFormat, bool egg) + private static List getLocationList(GameVersion Version, int SaveFormat, bool egg) { + if (SaveFormat == 2) + return metGen2; + if (egg) { if (Version < GameVersion.W && SaveFormat >= 5) @@ -2152,13 +2159,6 @@ private List getLocationList(GameVersion Version, int SaveFormat, boo switch (Version) { - case GameVersion.GSC: - case GameVersion.GS: - case GameVersion.C: - if (SaveFormat == 2) - return metGen2; - break; - case GameVersion.CXD: if (SaveFormat == 3) return metGen3;