diff --git a/PKX/f1-Main.Designer.cs b/PKX/f1-Main.Designer.cs
index c7ab3c62d..d5218659b 100644
--- a/PKX/f1-Main.Designer.cs
+++ b/PKX/f1-Main.Designer.cs
@@ -282,6 +282,11 @@ public void InitializeComponent()
             this.ppkx5 = new System.Windows.Forms.PictureBox();
             this.ppkx6 = new System.Windows.Forms.PictureBox();
             this.Tab_Other = new System.Windows.Forms.TabPage();
+            this.B_OpenSecretBase = new System.Windows.Forms.Button();
+            this.GB_SUBE = new System.Windows.Forms.GroupBox();
+            this.subepkx1 = new System.Windows.Forms.PictureBox();
+            this.subepkx2 = new System.Windows.Forms.PictureBox();
+            this.subepkx3 = new System.Windows.Forms.PictureBox();
             this.GB_Daycare = new System.Windows.Forms.GroupBox();
             this.label4 = new System.Windows.Forms.Label();
             this.label3 = new System.Windows.Forms.Label();
@@ -294,11 +299,6 @@ public void InitializeComponent()
             this.dcpkx2 = new System.Windows.Forms.PictureBox();
             this.dcpkx1 = new System.Windows.Forms.PictureBox();
             this.DayCare_HasEgg = new System.Windows.Forms.CheckBox();
-            this.GB_SUBE = new System.Windows.Forms.GroupBox();
-            this.subepkx1 = new System.Windows.Forms.PictureBox();
-            this.subepkx2 = new System.Windows.Forms.PictureBox();
-            this.subepkx3 = new System.Windows.Forms.PictureBox();
-            this.B_OpenSecretBase = new System.Windows.Forms.Button();
             this.GB_GTS = new System.Windows.Forms.GroupBox();
             this.gtspkx = new System.Windows.Forms.PictureBox();
             this.GB_Fused = new System.Windows.Forms.GroupBox();
@@ -404,13 +404,13 @@ public void InitializeComponent()
             ((System.ComponentModel.ISupportInitialize)(this.ppkx5)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.ppkx6)).BeginInit();
             this.Tab_Other.SuspendLayout();
-            this.GB_Daycare.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.dcpkx2)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.dcpkx1)).BeginInit();
             this.GB_SUBE.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.subepkx1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.subepkx2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.subepkx3)).BeginInit();
+            this.GB_Daycare.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.dcpkx2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.dcpkx1)).BeginInit();
             this.GB_GTS.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.gtspkx)).BeginInit();
             this.GB_Fused.SuspendLayout();
@@ -3382,6 +3382,60 @@ public void InitializeComponent()
             this.Tab_Other.Text = "Other";
             this.Tab_Other.UseVisualStyleBackColor = true;
             // 
+            // B_OpenSecretBase
+            // 
+            this.B_OpenSecretBase.Location = new System.Drawing.Point(227, 151);
+            this.B_OpenSecretBase.Name = "B_OpenSecretBase";
+            this.B_OpenSecretBase.Size = new System.Drawing.Size(60, 37);
+            this.B_OpenSecretBase.TabIndex = 21;
+            this.B_OpenSecretBase.Text = "Secret Base";
+            this.B_OpenSecretBase.UseVisualStyleBackColor = true;
+            this.B_OpenSecretBase.Visible = false;
+            this.B_OpenSecretBase.Click += new System.EventHandler(this.B_OpenSecretBase_Click);
+            // 
+            // GB_SUBE
+            // 
+            this.GB_SUBE.Controls.Add(this.subepkx1);
+            this.GB_SUBE.Controls.Add(this.subepkx2);
+            this.GB_SUBE.Controls.Add(this.subepkx3);
+            this.GB_SUBE.Location = new System.Drawing.Point(227, 136);
+            this.GB_SUBE.Name = "GB_SUBE";
+            this.GB_SUBE.Size = new System.Drawing.Size(60, 60);
+            this.GB_SUBE.TabIndex = 27;
+            this.GB_SUBE.TabStop = false;
+            this.GB_SUBE.Text = "OldMan";
+            // 
+            // subepkx1
+            // 
+            this.subepkx1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.subepkx1.Location = new System.Drawing.Point(9, 18);
+            this.subepkx1.Name = "subepkx1";
+            this.subepkx1.Size = new System.Drawing.Size(42, 32);
+            this.subepkx1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
+            this.subepkx1.TabIndex = 18;
+            this.subepkx1.TabStop = false;
+            this.subepkx1.Click += new System.EventHandler(this.slotModifier_Click);
+            // 
+            // subepkx2
+            // 
+            this.subepkx2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.subepkx2.Location = new System.Drawing.Point(62, 19);
+            this.subepkx2.Name = "subepkx2";
+            this.subepkx2.Size = new System.Drawing.Size(42, 34);
+            this.subepkx2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
+            this.subepkx2.TabIndex = 19;
+            this.subepkx2.TabStop = false;
+            // 
+            // subepkx3
+            // 
+            this.subepkx3.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.subepkx3.Location = new System.Drawing.Point(109, 19);
+            this.subepkx3.Name = "subepkx3";
+            this.subepkx3.Size = new System.Drawing.Size(42, 34);
+            this.subepkx3.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
+            this.subepkx3.TabIndex = 20;
+            this.subepkx3.TabStop = false;
+            // 
             // GB_Daycare
             // 
             this.GB_Daycare.Controls.Add(this.label4);
@@ -3506,60 +3560,6 @@ public void InitializeComponent()
             this.DayCare_HasEgg.Text = "Egg Available";
             this.DayCare_HasEgg.UseVisualStyleBackColor = true;
             // 
-            // GB_SUBE
-            // 
-            this.GB_SUBE.Controls.Add(this.subepkx1);
-            this.GB_SUBE.Controls.Add(this.subepkx2);
-            this.GB_SUBE.Controls.Add(this.subepkx3);
-            this.GB_SUBE.Location = new System.Drawing.Point(227, 136);
-            this.GB_SUBE.Name = "GB_SUBE";
-            this.GB_SUBE.Size = new System.Drawing.Size(60, 60);
-            this.GB_SUBE.TabIndex = 27;
-            this.GB_SUBE.TabStop = false;
-            this.GB_SUBE.Text = "OldMan";
-            // 
-            // subepkx1
-            // 
-            this.subepkx1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.subepkx1.Location = new System.Drawing.Point(9, 18);
-            this.subepkx1.Name = "subepkx1";
-            this.subepkx1.Size = new System.Drawing.Size(42, 32);
-            this.subepkx1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
-            this.subepkx1.TabIndex = 18;
-            this.subepkx1.TabStop = false;
-            this.subepkx1.Click += new System.EventHandler(this.slotModifier_Click);
-            // 
-            // subepkx2
-            // 
-            this.subepkx2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.subepkx2.Location = new System.Drawing.Point(62, 19);
-            this.subepkx2.Name = "subepkx2";
-            this.subepkx2.Size = new System.Drawing.Size(42, 34);
-            this.subepkx2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
-            this.subepkx2.TabIndex = 19;
-            this.subepkx2.TabStop = false;
-            // 
-            // subepkx3
-            // 
-            this.subepkx3.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.subepkx3.Location = new System.Drawing.Point(109, 19);
-            this.subepkx3.Name = "subepkx3";
-            this.subepkx3.Size = new System.Drawing.Size(42, 34);
-            this.subepkx3.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
-            this.subepkx3.TabIndex = 20;
-            this.subepkx3.TabStop = false;
-            // 
-            // B_OpenSecretBase
-            // 
-            this.B_OpenSecretBase.Location = new System.Drawing.Point(227, 151);
-            this.B_OpenSecretBase.Name = "B_OpenSecretBase";
-            this.B_OpenSecretBase.Size = new System.Drawing.Size(60, 37);
-            this.B_OpenSecretBase.TabIndex = 21;
-            this.B_OpenSecretBase.Text = "Secret Base";
-            this.B_OpenSecretBase.UseVisualStyleBackColor = true;
-            this.B_OpenSecretBase.Visible = false;
-            this.B_OpenSecretBase.Click += new System.EventHandler(this.B_OpenSecretBase_Click);
-            // 
             // GB_GTS
             // 
             this.GB_GTS.Controls.Add(this.gtspkx);
@@ -4013,15 +4013,15 @@ public void InitializeComponent()
             ((System.ComponentModel.ISupportInitialize)(this.ppkx5)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.ppkx6)).EndInit();
             this.Tab_Other.ResumeLayout(false);
-            this.GB_Daycare.ResumeLayout(false);
-            this.GB_Daycare.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.dcpkx2)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.dcpkx1)).EndInit();
             this.GB_SUBE.ResumeLayout(false);
             this.GB_SUBE.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.subepkx1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.subepkx2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.subepkx3)).EndInit();
+            this.GB_Daycare.ResumeLayout(false);
+            this.GB_Daycare.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.dcpkx2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.dcpkx1)).EndInit();
             this.GB_GTS.ResumeLayout(false);
             this.GB_GTS.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.gtspkx)).EndInit();
diff --git a/PKX/f1-Main.resx b/PKX/f1-Main.resx
index bdc9868bf..9008ceff3 100644
--- a/PKX/f1-Main.resx
+++ b/PKX/f1-Main.resx
@@ -612,6 +612,9 @@
   <metadata name="L_SAVINDEX.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>46</value>
+  </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
diff --git a/SAV/SAV_SecretBase.Designer.cs b/SAV/SAV_SecretBase.Designer.cs
index 1c63ff853..0f4c5fbe5 100644
--- a/SAV/SAV_SecretBase.Designer.cs
+++ b/SAV/SAV_SecretBase.Designer.cs
@@ -90,6 +90,10 @@ private void InitializeComponent()
             this.label15 = new System.Windows.Forms.Label();
             this.label14 = new System.Windows.Forms.Label();
             this.f_MAIN = new System.Windows.Forms.TabPage();
+            this.TB_FT2 = new System.Windows.Forms.TextBox();
+            this.TB_FT1 = new System.Windows.Forms.TextBox();
+            this.label24 = new System.Windows.Forms.Label();
+            this.label25 = new System.Windows.Forms.Label();
             this.groupBox1 = new System.Windows.Forms.GroupBox();
             this.label13 = new System.Windows.Forms.Label();
             this.label12 = new System.Windows.Forms.Label();
@@ -102,7 +106,6 @@ private void InitializeComponent()
             this.label9 = new System.Windows.Forms.Label();
             this.NUD_FObject = new System.Windows.Forms.NumericUpDown();
             this.label8 = new System.Windows.Forms.Label();
-            this.textBox1 = new System.Windows.Forms.TextBox();
             this.TB_FSay4 = new System.Windows.Forms.TextBox();
             this.TB_FSay3 = new System.Windows.Forms.TextBox();
             this.TB_FSay2 = new System.Windows.Forms.TextBox();
@@ -116,10 +119,7 @@ private void InitializeComponent()
             this.tabControl1 = new System.Windows.Forms.TabControl();
             this.B_GiveDecor = new System.Windows.Forms.Button();
             this.B_FSave = new System.Windows.Forms.Button();
-            this.TB_FT2 = new System.Windows.Forms.TextBox();
-            this.TB_FT1 = new System.Windows.Forms.TextBox();
-            this.label24 = new System.Windows.Forms.Label();
-            this.label25 = new System.Windows.Forms.Label();
+            this.NUD_FBaseLocation = new System.Windows.Forms.NumericUpDown();
             this.tabControl2.SuspendLayout();
             this.f_PKM.SuspendLayout();
             this.GB_PKM.SuspendLayout();
@@ -132,6 +132,7 @@ private void InitializeComponent()
             ((System.ComponentModel.ISupportInitialize)(this.NUD_FObjType)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.NUD_FObject)).BeginInit();
             this.tabControl1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.NUD_FBaseLocation)).BeginInit();
             this.SuspendLayout();
             // 
             // B_Save
@@ -816,13 +817,13 @@ private void InitializeComponent()
             // 
             // f_MAIN
             // 
+            this.f_MAIN.Controls.Add(this.NUD_FBaseLocation);
             this.f_MAIN.Controls.Add(this.TB_FT2);
             this.f_MAIN.Controls.Add(this.TB_FT1);
             this.f_MAIN.Controls.Add(this.label24);
             this.f_MAIN.Controls.Add(this.label25);
             this.f_MAIN.Controls.Add(this.groupBox1);
             this.f_MAIN.Controls.Add(this.label8);
-            this.f_MAIN.Controls.Add(this.textBox1);
             this.f_MAIN.Controls.Add(this.TB_FSay4);
             this.f_MAIN.Controls.Add(this.TB_FSay3);
             this.f_MAIN.Controls.Add(this.TB_FSay2);
@@ -841,6 +842,48 @@ private void InitializeComponent()
             this.f_MAIN.Text = "Main";
             this.f_MAIN.UseVisualStyleBackColor = true;
             // 
+            // TB_FT2
+            // 
+            this.TB_FT2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.TB_FT2.Font = new System.Drawing.Font("Courier New", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.TB_FT2.Location = new System.Drawing.Point(240, 132);
+            this.TB_FT2.MaxLength = 16;
+            this.TB_FT2.Name = "TB_FT2";
+            this.TB_FT2.Size = new System.Drawing.Size(124, 20);
+            this.TB_FT2.TabIndex = 15;
+            // 
+            // TB_FT1
+            // 
+            this.TB_FT1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.TB_FT1.Font = new System.Drawing.Font("Courier New", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.TB_FT1.Location = new System.Drawing.Point(240, 110);
+            this.TB_FT1.MaxLength = 16;
+            this.TB_FT1.Name = "TB_FT1";
+            this.TB_FT1.Size = new System.Drawing.Size(124, 20);
+            this.TB_FT1.TabIndex = 14;
+            // 
+            // label24
+            // 
+            this.label24.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.label24.AutoSize = true;
+            this.label24.Location = new System.Drawing.Point(166, 135);
+            this.label24.Name = "label24";
+            this.label24.Size = new System.Drawing.Size(73, 13);
+            this.label24.TabIndex = 17;
+            this.label24.Text = "Team Slogan:";
+            this.label24.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+            // 
+            // label25
+            // 
+            this.label25.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.label25.AutoSize = true;
+            this.label25.Location = new System.Drawing.Point(171, 113);
+            this.label25.Name = "label25";
+            this.label25.Size = new System.Drawing.Size(68, 13);
+            this.label25.TabIndex = 16;
+            this.label25.Text = "Team Name:";
+            this.label25.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+            // 
             // groupBox1
             // 
             this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
@@ -957,7 +1000,7 @@ private void InitializeComponent()
             0,
             -2147483648});
             this.NUD_FObjType.Name = "NUD_FObjType";
-            this.NUD_FObjType.Size = new System.Drawing.Size(36, 20);
+            this.NUD_FObjType.Size = new System.Drawing.Size(38, 20);
             this.NUD_FObjType.TabIndex = 2;
             this.NUD_FObjType.Value = new decimal(new int[] {
             1,
@@ -1007,14 +1050,6 @@ private void InitializeComponent()
             this.label8.TabIndex = 11;
             this.label8.Text = "Secret Base Location:";
             // 
-            // textBox1
-            // 
-            this.textBox1.Enabled = false;
-            this.textBox1.Location = new System.Drawing.Point(128, 33);
-            this.textBox1.Name = "textBox1";
-            this.textBox1.Size = new System.Drawing.Size(45, 20);
-            this.textBox1.TabIndex = 10;
-            // 
             // TB_FSay4
             // 
             this.TB_FSay4.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
@@ -1152,47 +1187,17 @@ private void InitializeComponent()
             this.B_FSave.UseVisualStyleBackColor = true;
             this.B_FSave.Click += new System.EventHandler(this.B_FAV2SAV);
             // 
-            // TB_FT2
+            // NUD_FBaseLocation
             // 
-            this.TB_FT2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.TB_FT2.Font = new System.Drawing.Font("Courier New", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.TB_FT2.Location = new System.Drawing.Point(240, 132);
-            this.TB_FT2.MaxLength = 16;
-            this.TB_FT2.Name = "TB_FT2";
-            this.TB_FT2.Size = new System.Drawing.Size(124, 20);
-            this.TB_FT2.TabIndex = 15;
-            // 
-            // TB_FT1
-            // 
-            this.TB_FT1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.TB_FT1.Font = new System.Drawing.Font("Courier New", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.TB_FT1.Location = new System.Drawing.Point(240, 110);
-            this.TB_FT1.MaxLength = 16;
-            this.TB_FT1.Name = "TB_FT1";
-            this.TB_FT1.Size = new System.Drawing.Size(124, 20);
-            this.TB_FT1.TabIndex = 14;
-            // 
-            // label24
-            // 
-            this.label24.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.label24.AutoSize = true;
-            this.label24.Location = new System.Drawing.Point(166, 135);
-            this.label24.Name = "label24";
-            this.label24.Size = new System.Drawing.Size(73, 13);
-            this.label24.TabIndex = 17;
-            this.label24.Text = "Team Slogan:";
-            this.label24.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
-            // 
-            // label25
-            // 
-            this.label25.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.label25.AutoSize = true;
-            this.label25.Location = new System.Drawing.Point(171, 113);
-            this.label25.Name = "label25";
-            this.label25.Size = new System.Drawing.Size(68, 13);
-            this.label25.TabIndex = 16;
-            this.label25.Text = "Team Name:";
-            this.label25.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+            this.NUD_FBaseLocation.Location = new System.Drawing.Point(128, 35);
+            this.NUD_FBaseLocation.Maximum = new decimal(new int[] {
+            85,
+            0,
+            0,
+            0});
+            this.NUD_FBaseLocation.Name = "NUD_FBaseLocation";
+            this.NUD_FBaseLocation.Size = new System.Drawing.Size(45, 20);
+            this.NUD_FBaseLocation.TabIndex = 18;
             // 
             // SAV_SecretBase
             // 
@@ -1235,6 +1240,7 @@ private void InitializeComponent()
             ((System.ComponentModel.ISupportInitialize)(this.NUD_FObjType)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.NUD_FObject)).EndInit();
             this.tabControl1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.NUD_FBaseLocation)).EndInit();
             this.ResumeLayout(false);
             this.PerformLayout();
 
@@ -1277,7 +1283,6 @@ private void InitializeComponent()
         private System.Windows.Forms.Label label9;
         private System.Windows.Forms.NumericUpDown NUD_FObject;
         private System.Windows.Forms.Label label8;
-        private System.Windows.Forms.TextBox textBox1;
         private System.Windows.Forms.TextBox TB_FSay4;
         private System.Windows.Forms.TextBox TB_FSay3;
         private System.Windows.Forms.TextBox TB_FSay2;
@@ -1333,5 +1338,6 @@ private void InitializeComponent()
         private System.Windows.Forms.TextBox TB_FT1;
         private System.Windows.Forms.Label label24;
         private System.Windows.Forms.Label label25;
+        private System.Windows.Forms.NumericUpDown NUD_FBaseLocation;
     }
 }
\ No newline at end of file
diff --git a/SAV/SAV_SecretBase.cs b/SAV/SAV_SecretBase.cs
index 56c4f1426..e2309a620 100644
--- a/SAV/SAV_SecretBase.cs
+++ b/SAV/SAV_SecretBase.cs
@@ -269,7 +269,7 @@ private void B_SAV2FAV(object sender, EventArgs e)
             string saying4 = Util.TrimFromZero(Encoding.Unicode.GetString(sav, sv + offset + 0x276 + 0x22 * 3, 0x22));
 
             int baseloc = BitConverter.ToInt16(sav, sv + offset);
-            textBox1.Text = baseloc.ToString();
+            NUD_FBaseLocation.Value = baseloc;
 
             TB_FSay1.Text = saying1; TB_FSay2.Text = saying2; TB_FSay3.Text = saying3; TB_FSay4.Text = saying4;
 
@@ -301,6 +301,8 @@ private void B_FAV2SAV(object sender, EventArgs e)
         {
             // Write data back to save
             int index = LB_Favorite.SelectedIndex; // store for restoring
+            if (!GB_PKM.Enabled && index > 0)
+            { MessageBox.Show("Sorry, no overwriting someone else's base with your own data.", "Error"); return; }
             if (GB_PKM.Enabled && index == 0)
             { MessageBox.Show("Sorry, no overwriting of your own base with someone else's.","Error"); return; }
             if (LB_Favorite.Items[index].ToString().Substring(LB_Favorite.Items[index].ToString().Length - 5, 5) == "Empty")
@@ -313,8 +315,6 @@ private void B_FAV2SAV(object sender, EventArgs e)
                 offset = fav_offset + 0x5400 + 0x326;
             else offset += 0x3E0 * index;
 
-
-
             string TrainerName = TB_FOT.Text;
             byte[] tr = Encoding.Unicode.GetBytes(TrainerName);
             Array.Resize(ref tr, 0x22); Array.Copy(tr, 0, sav, sv + offset + 0x218, 0x1A);
@@ -339,7 +339,8 @@ private void B_FAV2SAV(object sender, EventArgs e)
             byte[] s4 = Encoding.Unicode.GetBytes(saying4);
             Array.Resize(ref s4, 0x22); Array.Copy(s4, 0, sav, sv + offset + 0x276 + 0x22 * 3, 0x22);
 
-            int baseloc = Convert.ToInt16(textBox1.Text);
+            int baseloc = (int)NUD_FBaseLocation.Value;
+            if (baseloc < 3) baseloc = 0; // skip 1/2 baselocs as they are dummied out ingame.
             Array.Copy(BitConverter.GetBytes(baseloc), 0, sav, sv + offset, 2);
 
             TB_FOT.Text = TrainerName; TB_FSay1.Text = saying1; TB_FSay2.Text = saying2; TB_FSay3.Text = saying3; TB_FSay4.Text = saying4;