From 1a343ead85e4fa2e9006dfec2df7b7ac38c42e5d Mon Sep 17 00:00:00 2001 From: Kurt Date: Wed, 4 Oct 2017 17:36:43 -0700 Subject: [PATCH] Only modify SAV OT name if modified resolves gen1 pikachu forgetting the original OT --- PKHeX.WinForms/Subforms/Save Editors/SAV_SimpleTrainer.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/PKHeX.WinForms/Subforms/Save Editors/SAV_SimpleTrainer.cs b/PKHeX.WinForms/Subforms/Save Editors/SAV_SimpleTrainer.cs index a85bc09ff..e27f7967d 100644 --- a/PKHeX.WinForms/Subforms/Save Editors/SAV_SimpleTrainer.cs +++ b/PKHeX.WinForms/Subforms/Save Editors/SAV_SimpleTrainer.cs @@ -85,10 +85,9 @@ public SAV_SimpleTrainer(SaveFile sav) cba = new[] { CHK_1, CHK_2, CHK_3, CHK_4, CHK_6, CHK_5, CHK_7, CHK_8, CHK_H1, CHK_H2, CHK_H3, CHK_H4, CHK_H5, CHK_H6, CHK_H7, CHK_H8 }; } - if (SAV is SAV3) + if (SAV is SAV3 sav3) { GB_Map.Visible = false; - SAV3 sav3 = (SAV3)SAV; switch (sav3.Version) { case GameVersion.E: badgeval = sav3.Badges; break; @@ -167,7 +166,8 @@ private void Change255(object sender, EventArgs e) private void B_Save_Click(object sender, EventArgs e) { - SAV.OT = TB_OTName.Text; + if (SAV.OT != TB_OTName.Text) // only modify if changed (preserve trash bytes?) + SAV.OT = TB_OTName.Text; SAV.Gender = (byte)CB_Gender.SelectedIndex; SAV.TID = (ushort)Util.ToUInt32(MT_TID.Text);