Mirrors/PKHeX
2
0
Fork 0
mirror of https://github.com/kwsch/PKHeX synced 2025-02-16 13:28:35 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge corrections to fix on-load event

Browse source
This commit is contained in:
Kurt 2014-12-06 17:13:06 -08:00
parent 333f609bcd
commit 52d222d17f
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
PKX/f1-Main.cs
View file

@ -4898,8 +4898,7 @@ namespace PKHeX
if (dr != DialogResult.Yes)
return;
}
}
postcheck:
}
SaveFileDialog cySAV = new SaveFileDialog();
// Try for file path

10
SAV/SAV_Trainer.cs
View file

@ -29,8 +29,9 @@ namespace PKHeX
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 @@ namespace PKHeX
"0x134", "0x134",
"0x138", "0x138",
"0x13C", "0x13C",
"0x140", "0x140",
"0x140", "Flags Captured",
"0x144", "0x144",
"0x148", "0x148",
"0x14C", "0x14C",
@ -771,7 +772,8 @@ namespace PKHeX
{
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
{