Mirrors/PKHeX
2
0
Fork 0
mirror of https://github.com/kwsch/PKHeX synced 2024-11-27 06:20:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix friendship loading

Browse source 
move from misc1 (pk1++) to misc2 (pk2++)
This commit is contained in:
Kurt 2017-10-05 16:06:51 -07:00
parent bf1855c0a6
commit 9c92472723
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
PKHeX.WinForms/Controls/PKM Editor/LoadSave.cs
View file

@ -238,7 +238,6 @@ namespace PKHeX.WinForms.Controls
private void SaveMisc1(PKM pk) private void SaveMisc1(PKM pk)
{ {
SaveSpeciesLevelEXP(pk); SaveSpeciesLevelEXP(pk);
TB_Friendship.Text = pk.CurrentFriendship.ToString();
SaveNickname(pk); SaveNickname(pk);
SaveOTID(pk); SaveOTID(pk);
SaveIVs(pk); SaveIVs(pk);
@ -252,6 +251,7 @@ namespace PKHeX.WinForms.Controls
CHK_IsEgg.Checked = pk.IsEgg; CHK_IsEgg.Checked = pk.IsEgg;
CB_HeldItem.SelectedValue = pk.HeldItem; CB_HeldItem.SelectedValue = pk.HeldItem;
CB_Form.SelectedIndex = CB_Form.Items.Count > pk.AltForm ? pk.AltForm : CB_Form.Items.Count - 1; CB_Form.SelectedIndex = CB_Form.Items.Count > pk.AltForm ? pk.AltForm : CB_Form.Items.Count - 1;
TB_Friendship.Text = pk.CurrentFriendship.ToString();
} }
private void SaveMisc2(PKM pk) private void SaveMisc2(PKM pk)
{ {
@ -259,6 +259,7 @@ namespace PKHeX.WinForms.Controls
pk.IsEgg = CHK_IsEgg.Checked; pk.IsEgg = CHK_IsEgg.Checked;
pk.HeldItem = WinFormsUtil.GetIndex(CB_HeldItem); pk.HeldItem = WinFormsUtil.GetIndex(CB_HeldItem);
pk.AltForm = (MT_Form.Enabled ? Convert.ToInt32(MT_Form.Text) : CB_Form.Enabled ? CB_Form.SelectedIndex : 0) & 0x1F; pk.AltForm = (MT_Form.Enabled ? Convert.ToInt32(MT_Form.Text) : CB_Form.Enabled ? CB_Form.SelectedIndex : 0) & 0x1F;
pk.CurrentFriendship = Util.ToInt32(TB_Friendship.Text);
} }
private void LoadMisc3(PKM pk) private void LoadMisc3(PKM pk)