mirror of
https://github.com/kwsch/PKHeX.git
synced 2026-10-01 12:57:04 -05:00
Merge corrections to fix on-load event
This commit is contained in:
@@ -4898,8 +4898,7 @@ private void exportSAV(object sender, EventArgs e)
|
||||
if (dr != DialogResult.Yes)
|
||||
return;
|
||||
}
|
||||
}
|
||||
postcheck:
|
||||
}
|
||||
SaveFileDialog cySAV = new SaveFileDialog();
|
||||
|
||||
// Try for file path
|
||||
|
||||
@@ -29,8 +29,9 @@ public SAV_Trainer(Form1 frm1)
|
||||
this.Width = (int)((float)Width * (float)428 / (float)590);
|
||||
CB_Multi.Enabled = true;
|
||||
label34.Enabled = true; // Multiplayer Sprite Label
|
||||
label21.Enabled = false; // Style Label
|
||||
TB_Style.Enabled = false;
|
||||
|
||||
label21.Visible = false; // Style Label
|
||||
TB_Style.Visible = false;
|
||||
GB_Appear.Visible = false;
|
||||
}
|
||||
editing = true;
|
||||
@@ -119,7 +120,7 @@ public SAV_Trainer(Form1 frm1)
|
||||
"0x134", "0x134",
|
||||
"0x138", "0x138",
|
||||
"0x13C", "0x13C",
|
||||
"0x140", "0x140",
|
||||
"0x140", "Flags Captured",
|
||||
"0x144", "0x144",
|
||||
"0x148", "0x148",
|
||||
"0x14C", "0x14C",
|
||||
@@ -771,7 +772,8 @@ private void CB_Multi_SelectedIndexChanged(object sender, EventArgs e)
|
||||
{
|
||||
if (m_parent.savegame_oras)
|
||||
{
|
||||
PB_Sprite.Image = (Image)Properties.Resources.ResourceManager.GetObject("tr_" + ((int)(CB_Multi.SelectedValue)).ToString("00"));
|
||||
int sprite = Util.getIndex(CB_Multi);
|
||||
PB_Sprite.Image = (Image)Properties.Resources.ResourceManager.GetObject("tr_" + sprite.ToString("00"));
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user