Leahnaya/PKHeX
1
0
Fork 0
mirror of https://github.com/kwsch/PKHeX.git synced 2026-07-29 12:27:30 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix SAV4:Gen4 met locations

Browse Source 
Do gen4 metloc check after gen3, THEN do gen5.

Thanks @poutros !

Fixes #140
This commit is contained in:
Kaphotics 2016-07-28 21:46:30 -07:00
parent 1755b49a9c
commit 67a375ecae
1 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
MainWindow/Main.cs
View File

@ -1805,7 +1805,26 @@ private void updateOriginGame(object sender, EventArgs e)
CB_MetLocation.DataSource = met_list;
CB_MetLocation.SelectedValue = 0;
}
else if (Version < 24 && origintrack != "Past" && SAV.Generation >= 4)
else if (SAV.Generation == 4 && origintrack != "Gen4")
{
var met_list = Util.getCBList(metHGSS_00000, new[] { 0 });
met_list = Util.getOffsetCBList(met_list, metHGSS_02000, 2000, new[] { 2000 });
met_list = Util.getOffsetCBList(met_list, metHGSS_02000, 2000, new[] { 2002 });
met_list = Util.getOffsetCBList(met_list, metHGSS_03000, 3000, new[] { 3001 });
met_list = Util.getOffsetCBList(met_list, metHGSS_00000, 0000, Legal.Met_HGSS_0);
met_list = Util.getOffsetCBList(met_list, metHGSS_02000, 2000, Legal.Met_HGSS_2);
met_list = Util.getOffsetCBList(met_list, metHGSS_03000, 3000, Legal.Met_HGSS_3);
CB_MetLocation.DisplayMember = "Text";
CB_MetLocation.ValueMember = "Value";
CB_MetLocation.DataSource = met_list;
CB_EggLocation.DisplayMember = "Text";
CB_EggLocation.ValueMember = "Value";
CB_EggLocation.DataSource = new BindingSource(met_list, null);
CB_EggLocation.SelectedValue = 0;
CB_MetLocation.SelectedValue = 0;
origintrack = "Gen4";
}
else if (Version < 24 && origintrack != "Past" && SAV.Generation >= 5)
{
// Load Past Gen Locations
#region B2W2 Met Locations
@ -1855,23 +1874,8 @@ private void updateOriginGame(object sender, EventArgs e)
}
#endregion
}
else if (SAV.Generation == 4 && origintrack != "Gen4")
{
var met_list = Util.getCBList(metHGSS_00000, new[] { 0 });
met_list = Util.getOffsetCBList(met_list, metHGSS_02000, 2000, new[] { 2000 });
met_list = Util.getOffsetCBList(met_list, metHGSS_02000, 2000, new[] { 2002 });
met_list = Util.getOffsetCBList(met_list, metHGSS_03000, 3000, new[] { 3001 });
met_list = Util.getOffsetCBList(met_list, metHGSS_00000, 0000, Legal.Met_HGSS_0);
met_list = Util.getOffsetCBList(met_list, metHGSS_02000, 2000, Legal.Met_HGSS_2);
met_list = Util.getOffsetCBList(met_list, metHGSS_03000, 3000, Legal.Met_HGSS_3);
CB_MetLocation.DisplayMember = "Text";
CB_MetLocation.ValueMember = "Value";
CB_MetLocation.DataSource = met_list;
CB_MetLocation.SelectedValue = 0;
origintrack = "Gen4";
}
if (SAV.Generation > 3 && Version < 0x10 && origintrack != "Gen4")
if (SAV.Generation >= 4 && Version < 0x10 && origintrack != "Gen4")
{
// Load Gen 4 egg locations if Gen 4 Origin.
#region HGSS Met Locations