From 52d222d17f0cad4da9986c5bd61d0e24a5c48eac Mon Sep 17 00:00:00 2001
From: Kurt <kaphotics@gmail.com>
Date: Sat, 6 Dec 2014 17:13:06 -0800
Subject: [PATCH] Merge corrections to fix on-load event

---
 PKX/f1-Main.cs     |  3 +--
 SAV/SAV_Trainer.cs | 10 ++++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/PKX/f1-Main.cs b/PKX/f1-Main.cs
index a49c058c7..cf2275cdc 100644
--- a/PKX/f1-Main.cs
+++ b/PKX/f1-Main.cs
@@ -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
diff --git a/SAV/SAV_Trainer.cs b/SAV/SAV_Trainer.cs
index fdb53ff2e..f8b04d10f 100644
--- a/SAV/SAV_Trainer.cs
+++ b/SAV/SAV_Trainer.cs
@@ -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
             {