diff --git a/DS_Map/Main Window.Designer.cs b/DS_Map/Main Window.Designer.cs
index b32c3bb..1ca70e3 100644
--- a/DS_Map/Main Window.Designer.cs	
+++ b/DS_Map/Main Window.Designer.cs	
@@ -30,21 +30,21 @@
         {
             this.components = new System.ComponentModel.Container();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainProgram));
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle31 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle32 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle33 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle34 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle35 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle36 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle37 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle38 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle39 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle40 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle41 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle42 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle43 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle44 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle45 = new System.Windows.Forms.DataGridViewCellStyle();
             this.mainTabControl = new System.Windows.Forms.TabControl();
             this.headerEditorTabPage = new System.Windows.Forms.TabPage();
             this.removeLastHeaderBTN = new System.Windows.Forms.Button();
@@ -548,6 +548,7 @@
             this.decimalRadioButton = new System.Windows.Forms.RadioButton();
             this.hexRadiobutton = new System.Windows.Forms.RadioButton();
             this.groupBox13 = new System.Windows.Forms.GroupBox();
+            this.label67 = new System.Windows.Forms.Label();
             this.searchAllArchivesCheckBox = new System.Windows.Forms.CheckBox();
             this.caseSensitiveTextReplaceCheckbox = new System.Windows.Forms.CheckBox();
             this.textSearchResultsListBox = new System.Windows.Forms.ListBox();
@@ -603,7 +604,7 @@
             this.label60 = new System.Windows.Forms.Label();
             this.label61 = new System.Windows.Forms.Label();
             this.label62 = new System.Windows.Forms.Label();
-            this.groupBox40 = new System.Windows.Forms.GroupBox();
+            this.poke6MovesGroupBox = new System.Windows.Forms.GroupBox();
             this.partyMove6_4ComboBox = new System.Windows.Forms.ComboBox();
             this.partyMove6_2ComboBox = new System.Windows.Forms.ComboBox();
             this.partyMove6_3ComboBox = new System.Windows.Forms.ComboBox();
@@ -618,7 +619,7 @@
             this.label57 = new System.Windows.Forms.Label();
             this.label58 = new System.Windows.Forms.Label();
             this.label59 = new System.Windows.Forms.Label();
-            this.groupBox38 = new System.Windows.Forms.GroupBox();
+            this.poke5MovesGroupBox = new System.Windows.Forms.GroupBox();
             this.partyMove5_4ComboBox = new System.Windows.Forms.ComboBox();
             this.partyMove5_2ComboBox = new System.Windows.Forms.ComboBox();
             this.partyMove5_3ComboBox = new System.Windows.Forms.ComboBox();
@@ -633,7 +634,7 @@
             this.label54 = new System.Windows.Forms.Label();
             this.label55 = new System.Windows.Forms.Label();
             this.label56 = new System.Windows.Forms.Label();
-            this.groupBox36 = new System.Windows.Forms.GroupBox();
+            this.poke4MovesGroupBox = new System.Windows.Forms.GroupBox();
             this.partyMove4_4ComboBox = new System.Windows.Forms.ComboBox();
             this.partyMove4_2ComboBox = new System.Windows.Forms.ComboBox();
             this.partyMove4_3ComboBox = new System.Windows.Forms.ComboBox();
@@ -648,7 +649,7 @@
             this.label51 = new System.Windows.Forms.Label();
             this.label52 = new System.Windows.Forms.Label();
             this.label53 = new System.Windows.Forms.Label();
-            this.groupBox33 = new System.Windows.Forms.GroupBox();
+            this.poke3MovesGroupBox = new System.Windows.Forms.GroupBox();
             this.partyMove3_4ComboBox = new System.Windows.Forms.ComboBox();
             this.partyMove3_2ComboBox = new System.Windows.Forms.ComboBox();
             this.partyMove3_3ComboBox = new System.Windows.Forms.ComboBox();
@@ -663,7 +664,7 @@
             this.label48 = new System.Windows.Forms.Label();
             this.label49 = new System.Windows.Forms.Label();
             this.label50 = new System.Windows.Forms.Label();
-            this.groupBox31 = new System.Windows.Forms.GroupBox();
+            this.poke2MovesGroupBox = new System.Windows.Forms.GroupBox();
             this.partyMove2_4ComboBox = new System.Windows.Forms.ComboBox();
             this.partyMove2_2ComboBox = new System.Windows.Forms.ComboBox();
             this.partyMove2_3ComboBox = new System.Windows.Forms.ComboBox();
@@ -678,7 +679,7 @@
             this.label47 = new System.Windows.Forms.Label();
             this.label46 = new System.Windows.Forms.Label();
             this.label45 = new System.Windows.Forms.Label();
-            this.groupBox35 = new System.Windows.Forms.GroupBox();
+            this.poke1MovesGroupBox = new System.Windows.Forms.GroupBox();
             this.partyMove1_4ComboBox = new System.Windows.Forms.ComboBox();
             this.partyMove1_2ComboBox = new System.Windows.Forms.ComboBox();
             this.partyMove1_3ComboBox = new System.Windows.Forms.ComboBox();
@@ -815,7 +816,6 @@
             this.spawnEditorToolStripButton = new System.Windows.Forms.ToolStripButton();
             this.versionLabel = new System.Windows.Forms.Label();
             this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
-            this.label67 = new System.Windows.Forms.Label();
             this.mainTabControl.SuspendLayout();
             this.headerEditorTabPage.SuspendLayout();
             this.worldmapCoordsGroupBox.SuspendLayout();
@@ -983,37 +983,37 @@
             this.trainerEditorTabPage.SuspendLayout();
             this.groupBox28.SuspendLayout();
             this.party6GroupBox.SuspendLayout();
-            this.groupBox40.SuspendLayout();
+            this.poke6MovesGroupBox.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.partyIV6UpDown)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.partyLevel6UpDown)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.partyBall6UpDown)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.partyPokemon6PictureBox)).BeginInit();
             this.party5GroupBox.SuspendLayout();
-            this.groupBox38.SuspendLayout();
+            this.poke5MovesGroupBox.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.partyIV5UpDown)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.partyLevel5UpDown)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.partyBall5UpDown)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.partyPokemon5PictureBox)).BeginInit();
             this.party4GroupBox.SuspendLayout();
-            this.groupBox36.SuspendLayout();
+            this.poke4MovesGroupBox.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.partyIV4UpDown)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.partyLevel4UpDown)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.partyBall4UpDown)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.partyPokemon4PictureBox)).BeginInit();
             this.party3GroupBox.SuspendLayout();
-            this.groupBox33.SuspendLayout();
+            this.poke3MovesGroupBox.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.partyIV3UpDown)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.partyLevel3UpDown)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.partyBall3UpDown)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.partyPokemon3PictureBox)).BeginInit();
             this.party2GroupBox.SuspendLayout();
-            this.groupBox31.SuspendLayout();
+            this.poke2MovesGroupBox.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.partyIV2UpDown)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.partyLevel2UpDown)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.partyBall2UpDown)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.partyPokemon2PictureBox)).BeginInit();
             this.party1GroupBox.SuspendLayout();
-            this.groupBox35.SuspendLayout();
+            this.poke1MovesGroupBox.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.partyIV1UpDown)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.partyLevel1UpDown)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.partyBall1UpDown)).BeginInit();
@@ -2683,40 +2683,40 @@
             this.headersGridView.AllowUserToResizeColumns = false;
             this.headersGridView.AllowUserToResizeRows = false;
             this.headersGridView.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None;
-            dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
-            dataGridViewCellStyle1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.Info;
-            dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.headersGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1;
+            dataGridViewCellStyle31.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle31.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
+            dataGridViewCellStyle31.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            dataGridViewCellStyle31.ForeColor = System.Drawing.SystemColors.Info;
+            dataGridViewCellStyle31.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle31.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle31.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.headersGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle31;
             this.headersGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window;
-            dataGridViewCellStyle2.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText;
-            dataGridViewCellStyle2.Format = "D4";
-            dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
-            this.headersGridView.DefaultCellStyle = dataGridViewCellStyle2;
+            dataGridViewCellStyle32.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle32.BackColor = System.Drawing.SystemColors.Window;
+            dataGridViewCellStyle32.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            dataGridViewCellStyle32.ForeColor = System.Drawing.SystemColors.ControlText;
+            dataGridViewCellStyle32.Format = "D4";
+            dataGridViewCellStyle32.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle32.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle32.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+            this.headersGridView.DefaultCellStyle = dataGridViewCellStyle32;
             this.headersGridView.Location = new System.Drawing.Point(0, 0);
             this.headersGridView.MultiSelect = false;
             this.headersGridView.Name = "headersGridView";
-            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Control;
-            dataGridViewCellStyle3.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F);
-            dataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.WindowText;
-            dataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.headersGridView.RowHeadersDefaultCellStyle = dataGridViewCellStyle3;
+            dataGridViewCellStyle33.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle33.BackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle33.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F);
+            dataGridViewCellStyle33.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle33.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle33.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle33.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.headersGridView.RowHeadersDefaultCellStyle = dataGridViewCellStyle33;
             this.headersGridView.RowHeadersWidth = 50;
             this.headersGridView.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
-            dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle4.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.headersGridView.RowsDefaultCellStyle = dataGridViewCellStyle4;
+            dataGridViewCellStyle34.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle34.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.headersGridView.RowsDefaultCellStyle = dataGridViewCellStyle34;
             this.headersGridView.RowTemplate.DefaultCellStyle.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
             this.headersGridView.RowTemplate.Height = 18;
             this.headersGridView.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.False;
@@ -2745,43 +2745,43 @@
             this.heightsGridView.AllowUserToDeleteRows = false;
             this.heightsGridView.AllowUserToResizeColumns = false;
             this.heightsGridView.AllowUserToResizeRows = false;
-            dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.heightsGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle5;
+            dataGridViewCellStyle35.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.heightsGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle35;
             this.heightsGridView.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None;
-            dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Control;
-            dataGridViewCellStyle6.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F);
-            dataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.WindowText;
-            dataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.heightsGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle6;
+            dataGridViewCellStyle36.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle36.BackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle36.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F);
+            dataGridViewCellStyle36.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle36.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle36.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle36.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.heightsGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle36;
             this.heightsGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle7.BackColor = System.Drawing.SystemColors.Window;
-            dataGridViewCellStyle7.Font = new System.Drawing.Font("Tahoma", 8.25F);
-            dataGridViewCellStyle7.ForeColor = System.Drawing.SystemColors.ControlText;
-            dataGridViewCellStyle7.Format = "D2";
-            dataGridViewCellStyle7.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
-            this.heightsGridView.DefaultCellStyle = dataGridViewCellStyle7;
+            dataGridViewCellStyle37.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle37.BackColor = System.Drawing.SystemColors.Window;
+            dataGridViewCellStyle37.Font = new System.Drawing.Font("Tahoma", 8.25F);
+            dataGridViewCellStyle37.ForeColor = System.Drawing.SystemColors.ControlText;
+            dataGridViewCellStyle37.Format = "D2";
+            dataGridViewCellStyle37.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle37.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle37.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+            this.heightsGridView.DefaultCellStyle = dataGridViewCellStyle37;
             this.heightsGridView.Location = new System.Drawing.Point(0, 0);
             this.heightsGridView.MultiSelect = false;
             this.heightsGridView.Name = "heightsGridView";
-            dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle8.BackColor = System.Drawing.SystemColors.Control;
-            dataGridViewCellStyle8.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F);
-            dataGridViewCellStyle8.ForeColor = System.Drawing.SystemColors.WindowText;
-            dataGridViewCellStyle8.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle8.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.heightsGridView.RowHeadersDefaultCellStyle = dataGridViewCellStyle8;
+            dataGridViewCellStyle38.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle38.BackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle38.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F);
+            dataGridViewCellStyle38.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle38.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle38.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle38.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.heightsGridView.RowHeadersDefaultCellStyle = dataGridViewCellStyle38;
             this.heightsGridView.RowHeadersWidth = 50;
             this.heightsGridView.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
-            dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle9.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.heightsGridView.RowsDefaultCellStyle = dataGridViewCellStyle9;
+            dataGridViewCellStyle39.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle39.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.heightsGridView.RowsDefaultCellStyle = dataGridViewCellStyle39;
             this.heightsGridView.RowTemplate.DefaultCellStyle.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
             this.heightsGridView.RowTemplate.Height = 18;
             this.heightsGridView.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.False;
@@ -2808,43 +2808,43 @@
             this.mapFilesGridView.AllowUserToDeleteRows = false;
             this.mapFilesGridView.AllowUserToResizeColumns = false;
             this.mapFilesGridView.AllowUserToResizeRows = false;
-            dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.mapFilesGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle10;
+            dataGridViewCellStyle40.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.mapFilesGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle40;
             this.mapFilesGridView.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None;
-            dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle11.BackColor = System.Drawing.SystemColors.Control;
-            dataGridViewCellStyle11.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F);
-            dataGridViewCellStyle11.ForeColor = System.Drawing.SystemColors.WindowText;
-            dataGridViewCellStyle11.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle11.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.mapFilesGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle11;
+            dataGridViewCellStyle41.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle41.BackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle41.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F);
+            dataGridViewCellStyle41.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle41.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle41.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle41.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.mapFilesGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle41;
             this.mapFilesGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle12.BackColor = System.Drawing.SystemColors.Window;
-            dataGridViewCellStyle12.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            dataGridViewCellStyle12.ForeColor = System.Drawing.SystemColors.ControlText;
-            dataGridViewCellStyle12.Format = "D4";
-            dataGridViewCellStyle12.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle12.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
-            this.mapFilesGridView.DefaultCellStyle = dataGridViewCellStyle12;
+            dataGridViewCellStyle42.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle42.BackColor = System.Drawing.SystemColors.Window;
+            dataGridViewCellStyle42.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            dataGridViewCellStyle42.ForeColor = System.Drawing.SystemColors.ControlText;
+            dataGridViewCellStyle42.Format = "D4";
+            dataGridViewCellStyle42.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle42.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle42.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+            this.mapFilesGridView.DefaultCellStyle = dataGridViewCellStyle42;
             this.mapFilesGridView.Location = new System.Drawing.Point(0, 0);
             this.mapFilesGridView.MultiSelect = false;
             this.mapFilesGridView.Name = "mapFilesGridView";
-            dataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle13.BackColor = System.Drawing.SystemColors.Control;
-            dataGridViewCellStyle13.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F);
-            dataGridViewCellStyle13.ForeColor = System.Drawing.SystemColors.WindowText;
-            dataGridViewCellStyle13.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle13.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.mapFilesGridView.RowHeadersDefaultCellStyle = dataGridViewCellStyle13;
+            dataGridViewCellStyle43.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle43.BackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle43.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F);
+            dataGridViewCellStyle43.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle43.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle43.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle43.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.mapFilesGridView.RowHeadersDefaultCellStyle = dataGridViewCellStyle43;
             this.mapFilesGridView.RowHeadersWidth = 50;
             this.mapFilesGridView.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
-            dataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle14.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.mapFilesGridView.RowsDefaultCellStyle = dataGridViewCellStyle14;
+            dataGridViewCellStyle44.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle44.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.mapFilesGridView.RowsDefaultCellStyle = dataGridViewCellStyle44;
             this.mapFilesGridView.RowTemplate.DefaultCellStyle.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
             this.mapFilesGridView.RowTemplate.Height = 18;
             this.mapFilesGridView.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.False;
@@ -7411,6 +7411,16 @@
             this.groupBox13.TabStop = false;
             this.groupBox13.Text = "Search / Replace";
             // 
+            // label67
+            // 
+            this.label67.AutoSize = true;
+            this.label67.Enabled = false;
+            this.label67.Location = new System.Drawing.Point(192, 131);
+            this.label67.Name = "label67";
+            this.label67.Size = new System.Drawing.Size(68, 13);
+            this.label67.TabIndex = 41;
+            this.label67.Text = "Coming soon";
+            // 
             // searchAllArchivesCheckBox
             // 
             this.searchAllArchivesCheckBox.AutoSize = true;
@@ -7547,8 +7557,8 @@
             this.textEditorDataGridView.Location = new System.Drawing.Point(12, 77);
             this.textEditorDataGridView.Name = "textEditorDataGridView";
             this.textEditorDataGridView.RowHeadersWidth = 68;
-            dataGridViewCellStyle15.Font = new System.Drawing.Font("Consolas", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.textEditorDataGridView.RowsDefaultCellStyle = dataGridViewCellStyle15;
+            dataGridViewCellStyle45.Font = new System.Drawing.Font("Consolas", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.textEditorDataGridView.RowsDefaultCellStyle = dataGridViewCellStyle45;
             this.textEditorDataGridView.Size = new System.Drawing.Size(873, 496);
             this.textEditorDataGridView.TabIndex = 24;
             this.textEditorDataGridView.CellValueChanged += new System.Windows.Forms.DataGridViewCellEventHandler(this.textEditorDataGridView_CellValueChanged);
@@ -7733,7 +7743,7 @@
             this.cameraEditorDataGridView.CausesValidation = false;
             this.cameraEditorDataGridView.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.Raised;
             this.cameraEditorDataGridView.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
-            this.cameraEditorDataGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle15;
+            this.cameraEditorDataGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle45;
             this.cameraEditorDataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
             this.cameraEditorDataGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.DistanceGVCol,
@@ -8004,7 +8014,7 @@
             this.party6GroupBox.Controls.Add(this.label60);
             this.party6GroupBox.Controls.Add(this.label61);
             this.party6GroupBox.Controls.Add(this.label62);
-            this.party6GroupBox.Controls.Add(this.groupBox40);
+            this.party6GroupBox.Controls.Add(this.poke6MovesGroupBox);
             this.party6GroupBox.Controls.Add(this.partyIV6UpDown);
             this.party6GroupBox.Controls.Add(this.partyLevel6UpDown);
             this.party6GroupBox.Controls.Add(this.partyBall6UpDown);
@@ -8046,18 +8056,18 @@
             this.label62.TabIndex = 7;
             this.label62.Text = "Lv.";
             // 
-            // groupBox40
+            // poke6MovesGroupBox
             // 
-            this.groupBox40.Controls.Add(this.partyMove6_4ComboBox);
-            this.groupBox40.Controls.Add(this.partyMove6_2ComboBox);
-            this.groupBox40.Controls.Add(this.partyMove6_3ComboBox);
-            this.groupBox40.Controls.Add(this.partyMove6_1ComboBox);
-            this.groupBox40.Location = new System.Drawing.Point(110, 63);
-            this.groupBox40.Name = "groupBox40";
-            this.groupBox40.Size = new System.Drawing.Size(227, 85);
-            this.groupBox40.TabIndex = 6;
-            this.groupBox40.TabStop = false;
-            this.groupBox40.Text = "Moves";
+            this.poke6MovesGroupBox.Controls.Add(this.partyMove6_4ComboBox);
+            this.poke6MovesGroupBox.Controls.Add(this.partyMove6_2ComboBox);
+            this.poke6MovesGroupBox.Controls.Add(this.partyMove6_3ComboBox);
+            this.poke6MovesGroupBox.Controls.Add(this.partyMove6_1ComboBox);
+            this.poke6MovesGroupBox.Location = new System.Drawing.Point(110, 63);
+            this.poke6MovesGroupBox.Name = "poke6MovesGroupBox";
+            this.poke6MovesGroupBox.Size = new System.Drawing.Size(227, 85);
+            this.poke6MovesGroupBox.TabIndex = 6;
+            this.poke6MovesGroupBox.TabStop = false;
+            this.poke6MovesGroupBox.Text = "Moves";
             // 
             // partyMove6_4ComboBox
             // 
@@ -8110,15 +8120,23 @@
             this.partyIV6UpDown.Name = "partyIV6UpDown";
             this.partyIV6UpDown.Size = new System.Drawing.Size(49, 20);
             this.partyIV6UpDown.TabIndex = 5;
-            this.partyIV6UpDown.ValueChanged += new System.EventHandler(this.partyIV6UpDown_ValueChanged);
             // 
             // partyLevel6UpDown
             // 
             this.partyLevel6UpDown.Location = new System.Drawing.Point(48, 73);
+            this.partyLevel6UpDown.Minimum = new decimal(new int[] {
+            1,
+            0,
+            0,
+            0});
             this.partyLevel6UpDown.Name = "partyLevel6UpDown";
             this.partyLevel6UpDown.Size = new System.Drawing.Size(49, 20);
             this.partyLevel6UpDown.TabIndex = 4;
-            this.partyLevel6UpDown.ValueChanged += new System.EventHandler(this.partyLevel6UpDown_ValueChanged);
+            this.partyLevel6UpDown.Value = new decimal(new int[] {
+            1,
+            0,
+            0,
+            0});
             // 
             // partyBall6UpDown
             // 
@@ -8131,7 +8149,6 @@
             this.partyBall6UpDown.Name = "partyBall6UpDown";
             this.partyBall6UpDown.Size = new System.Drawing.Size(49, 20);
             this.partyBall6UpDown.TabIndex = 3;
-            this.partyBall6UpDown.ValueChanged += new System.EventHandler(this.partyBall6UpDown_ValueChanged);
             // 
             // partyItem6ComboBox
             // 
@@ -8141,7 +8158,6 @@
             this.partyItem6ComboBox.Name = "partyItem6ComboBox";
             this.partyItem6ComboBox.Size = new System.Drawing.Size(140, 21);
             this.partyItem6ComboBox.TabIndex = 2;
-            this.partyItem6ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyItem6ComboBox_SelectedIndexChanged);
             // 
             // partyPokemon6PictureBox
             // 
@@ -8165,7 +8181,7 @@
             this.party5GroupBox.Controls.Add(this.label57);
             this.party5GroupBox.Controls.Add(this.label58);
             this.party5GroupBox.Controls.Add(this.label59);
-            this.party5GroupBox.Controls.Add(this.groupBox38);
+            this.party5GroupBox.Controls.Add(this.poke5MovesGroupBox);
             this.party5GroupBox.Controls.Add(this.partyIV5UpDown);
             this.party5GroupBox.Controls.Add(this.partyLevel5UpDown);
             this.party5GroupBox.Controls.Add(this.partyBall5UpDown);
@@ -8207,18 +8223,18 @@
             this.label59.TabIndex = 7;
             this.label59.Text = "Lv.";
             // 
-            // groupBox38
+            // poke5MovesGroupBox
             // 
-            this.groupBox38.Controls.Add(this.partyMove5_4ComboBox);
-            this.groupBox38.Controls.Add(this.partyMove5_2ComboBox);
-            this.groupBox38.Controls.Add(this.partyMove5_3ComboBox);
-            this.groupBox38.Controls.Add(this.partyMove5_1ComboBox);
-            this.groupBox38.Location = new System.Drawing.Point(110, 63);
-            this.groupBox38.Name = "groupBox38";
-            this.groupBox38.Size = new System.Drawing.Size(227, 85);
-            this.groupBox38.TabIndex = 6;
-            this.groupBox38.TabStop = false;
-            this.groupBox38.Text = "Moves";
+            this.poke5MovesGroupBox.Controls.Add(this.partyMove5_4ComboBox);
+            this.poke5MovesGroupBox.Controls.Add(this.partyMove5_2ComboBox);
+            this.poke5MovesGroupBox.Controls.Add(this.partyMove5_3ComboBox);
+            this.poke5MovesGroupBox.Controls.Add(this.partyMove5_1ComboBox);
+            this.poke5MovesGroupBox.Location = new System.Drawing.Point(110, 63);
+            this.poke5MovesGroupBox.Name = "poke5MovesGroupBox";
+            this.poke5MovesGroupBox.Size = new System.Drawing.Size(227, 85);
+            this.poke5MovesGroupBox.TabIndex = 6;
+            this.poke5MovesGroupBox.TabStop = false;
+            this.poke5MovesGroupBox.Text = "Moves";
             // 
             // partyMove5_4ComboBox
             // 
@@ -8271,15 +8287,23 @@
             this.partyIV5UpDown.Name = "partyIV5UpDown";
             this.partyIV5UpDown.Size = new System.Drawing.Size(49, 20);
             this.partyIV5UpDown.TabIndex = 5;
-            this.partyIV5UpDown.ValueChanged += new System.EventHandler(this.partyIV5UpDown_ValueChanged);
             // 
             // partyLevel5UpDown
             // 
             this.partyLevel5UpDown.Location = new System.Drawing.Point(48, 73);
+            this.partyLevel5UpDown.Minimum = new decimal(new int[] {
+            1,
+            0,
+            0,
+            0});
             this.partyLevel5UpDown.Name = "partyLevel5UpDown";
             this.partyLevel5UpDown.Size = new System.Drawing.Size(49, 20);
             this.partyLevel5UpDown.TabIndex = 4;
-            this.partyLevel5UpDown.ValueChanged += new System.EventHandler(this.partyLevel5UpDown_ValueChanged);
+            this.partyLevel5UpDown.Value = new decimal(new int[] {
+            1,
+            0,
+            0,
+            0});
             // 
             // partyBall5UpDown
             // 
@@ -8292,7 +8316,6 @@
             this.partyBall5UpDown.Name = "partyBall5UpDown";
             this.partyBall5UpDown.Size = new System.Drawing.Size(49, 20);
             this.partyBall5UpDown.TabIndex = 3;
-            this.partyBall5UpDown.ValueChanged += new System.EventHandler(this.partyBall5UpDown_ValueChanged);
             // 
             // partyItem5ComboBox
             // 
@@ -8302,7 +8325,6 @@
             this.partyItem5ComboBox.Name = "partyItem5ComboBox";
             this.partyItem5ComboBox.Size = new System.Drawing.Size(140, 21);
             this.partyItem5ComboBox.TabIndex = 2;
-            this.partyItem5ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyItem5ComboBox_SelectedIndexChanged);
             // 
             // partyPokemon5PictureBox
             // 
@@ -8326,7 +8348,7 @@
             this.party4GroupBox.Controls.Add(this.label54);
             this.party4GroupBox.Controls.Add(this.label55);
             this.party4GroupBox.Controls.Add(this.label56);
-            this.party4GroupBox.Controls.Add(this.groupBox36);
+            this.party4GroupBox.Controls.Add(this.poke4MovesGroupBox);
             this.party4GroupBox.Controls.Add(this.partyIV4UpDown);
             this.party4GroupBox.Controls.Add(this.partyLevel4UpDown);
             this.party4GroupBox.Controls.Add(this.partyBall4UpDown);
@@ -8368,18 +8390,18 @@
             this.label56.TabIndex = 7;
             this.label56.Text = "Lv.";
             // 
-            // groupBox36
+            // poke4MovesGroupBox
             // 
-            this.groupBox36.Controls.Add(this.partyMove4_4ComboBox);
-            this.groupBox36.Controls.Add(this.partyMove4_2ComboBox);
-            this.groupBox36.Controls.Add(this.partyMove4_3ComboBox);
-            this.groupBox36.Controls.Add(this.partyMove4_1ComboBox);
-            this.groupBox36.Location = new System.Drawing.Point(110, 63);
-            this.groupBox36.Name = "groupBox36";
-            this.groupBox36.Size = new System.Drawing.Size(227, 85);
-            this.groupBox36.TabIndex = 6;
-            this.groupBox36.TabStop = false;
-            this.groupBox36.Text = "Moves";
+            this.poke4MovesGroupBox.Controls.Add(this.partyMove4_4ComboBox);
+            this.poke4MovesGroupBox.Controls.Add(this.partyMove4_2ComboBox);
+            this.poke4MovesGroupBox.Controls.Add(this.partyMove4_3ComboBox);
+            this.poke4MovesGroupBox.Controls.Add(this.partyMove4_1ComboBox);
+            this.poke4MovesGroupBox.Location = new System.Drawing.Point(110, 63);
+            this.poke4MovesGroupBox.Name = "poke4MovesGroupBox";
+            this.poke4MovesGroupBox.Size = new System.Drawing.Size(227, 85);
+            this.poke4MovesGroupBox.TabIndex = 6;
+            this.poke4MovesGroupBox.TabStop = false;
+            this.poke4MovesGroupBox.Text = "Moves";
             // 
             // partyMove4_4ComboBox
             // 
@@ -8432,15 +8454,23 @@
             this.partyIV4UpDown.Name = "partyIV4UpDown";
             this.partyIV4UpDown.Size = new System.Drawing.Size(49, 20);
             this.partyIV4UpDown.TabIndex = 5;
-            this.partyIV4UpDown.ValueChanged += new System.EventHandler(this.partyIV4UpDown_ValueChanged);
             // 
             // partyLevel4UpDown
             // 
             this.partyLevel4UpDown.Location = new System.Drawing.Point(48, 73);
+            this.partyLevel4UpDown.Minimum = new decimal(new int[] {
+            1,
+            0,
+            0,
+            0});
             this.partyLevel4UpDown.Name = "partyLevel4UpDown";
             this.partyLevel4UpDown.Size = new System.Drawing.Size(49, 20);
             this.partyLevel4UpDown.TabIndex = 4;
-            this.partyLevel4UpDown.ValueChanged += new System.EventHandler(this.partyLevel4UpDown_ValueChanged);
+            this.partyLevel4UpDown.Value = new decimal(new int[] {
+            1,
+            0,
+            0,
+            0});
             // 
             // partyBall4UpDown
             // 
@@ -8453,7 +8483,6 @@
             this.partyBall4UpDown.Name = "partyBall4UpDown";
             this.partyBall4UpDown.Size = new System.Drawing.Size(49, 20);
             this.partyBall4UpDown.TabIndex = 3;
-            this.partyBall4UpDown.ValueChanged += new System.EventHandler(this.partyBall4UpDown_ValueChanged);
             // 
             // partyItem4ComboBox
             // 
@@ -8463,7 +8492,6 @@
             this.partyItem4ComboBox.Name = "partyItem4ComboBox";
             this.partyItem4ComboBox.Size = new System.Drawing.Size(140, 21);
             this.partyItem4ComboBox.TabIndex = 2;
-            this.partyItem4ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyItem4ComboBox_SelectedIndexChanged);
             // 
             // partyPokemon4PictureBox
             // 
@@ -8487,7 +8515,7 @@
             this.party3GroupBox.Controls.Add(this.label51);
             this.party3GroupBox.Controls.Add(this.label52);
             this.party3GroupBox.Controls.Add(this.label53);
-            this.party3GroupBox.Controls.Add(this.groupBox33);
+            this.party3GroupBox.Controls.Add(this.poke3MovesGroupBox);
             this.party3GroupBox.Controls.Add(this.partyIV3UpDown);
             this.party3GroupBox.Controls.Add(this.partyLevel3UpDown);
             this.party3GroupBox.Controls.Add(this.partyBall3UpDown);
@@ -8529,18 +8557,18 @@
             this.label53.TabIndex = 7;
             this.label53.Text = "Lv.";
             // 
-            // groupBox33
+            // poke3MovesGroupBox
             // 
-            this.groupBox33.Controls.Add(this.partyMove3_4ComboBox);
-            this.groupBox33.Controls.Add(this.partyMove3_2ComboBox);
-            this.groupBox33.Controls.Add(this.partyMove3_3ComboBox);
-            this.groupBox33.Controls.Add(this.partyMove3_1ComboBox);
-            this.groupBox33.Location = new System.Drawing.Point(110, 63);
-            this.groupBox33.Name = "groupBox33";
-            this.groupBox33.Size = new System.Drawing.Size(227, 85);
-            this.groupBox33.TabIndex = 6;
-            this.groupBox33.TabStop = false;
-            this.groupBox33.Text = "Moves";
+            this.poke3MovesGroupBox.Controls.Add(this.partyMove3_4ComboBox);
+            this.poke3MovesGroupBox.Controls.Add(this.partyMove3_2ComboBox);
+            this.poke3MovesGroupBox.Controls.Add(this.partyMove3_3ComboBox);
+            this.poke3MovesGroupBox.Controls.Add(this.partyMove3_1ComboBox);
+            this.poke3MovesGroupBox.Location = new System.Drawing.Point(110, 63);
+            this.poke3MovesGroupBox.Name = "poke3MovesGroupBox";
+            this.poke3MovesGroupBox.Size = new System.Drawing.Size(227, 85);
+            this.poke3MovesGroupBox.TabIndex = 6;
+            this.poke3MovesGroupBox.TabStop = false;
+            this.poke3MovesGroupBox.Text = "Moves";
             // 
             // partyMove3_4ComboBox
             // 
@@ -8593,15 +8621,23 @@
             this.partyIV3UpDown.Name = "partyIV3UpDown";
             this.partyIV3UpDown.Size = new System.Drawing.Size(49, 20);
             this.partyIV3UpDown.TabIndex = 5;
-            this.partyIV3UpDown.ValueChanged += new System.EventHandler(this.partyIV3UpDown_ValueChanged);
             // 
             // partyLevel3UpDown
             // 
             this.partyLevel3UpDown.Location = new System.Drawing.Point(48, 73);
+            this.partyLevel3UpDown.Minimum = new decimal(new int[] {
+            1,
+            0,
+            0,
+            0});
             this.partyLevel3UpDown.Name = "partyLevel3UpDown";
             this.partyLevel3UpDown.Size = new System.Drawing.Size(49, 20);
             this.partyLevel3UpDown.TabIndex = 4;
-            this.partyLevel3UpDown.ValueChanged += new System.EventHandler(this.partyLevel3UpDown_ValueChanged);
+            this.partyLevel3UpDown.Value = new decimal(new int[] {
+            1,
+            0,
+            0,
+            0});
             // 
             // partyBall3UpDown
             // 
@@ -8614,7 +8650,6 @@
             this.partyBall3UpDown.Name = "partyBall3UpDown";
             this.partyBall3UpDown.Size = new System.Drawing.Size(49, 20);
             this.partyBall3UpDown.TabIndex = 3;
-            this.partyBall3UpDown.ValueChanged += new System.EventHandler(this.partyBall3UpDown_ValueChanged);
             // 
             // partyItem3ComboBox
             // 
@@ -8624,7 +8659,6 @@
             this.partyItem3ComboBox.Name = "partyItem3ComboBox";
             this.partyItem3ComboBox.Size = new System.Drawing.Size(140, 21);
             this.partyItem3ComboBox.TabIndex = 2;
-            this.partyItem3ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyItem3ComboBox_SelectedIndexChanged);
             // 
             // partyPokemon3PictureBox
             // 
@@ -8648,7 +8682,7 @@
             this.party2GroupBox.Controls.Add(this.label48);
             this.party2GroupBox.Controls.Add(this.label49);
             this.party2GroupBox.Controls.Add(this.label50);
-            this.party2GroupBox.Controls.Add(this.groupBox31);
+            this.party2GroupBox.Controls.Add(this.poke2MovesGroupBox);
             this.party2GroupBox.Controls.Add(this.partyIV2UpDown);
             this.party2GroupBox.Controls.Add(this.partyLevel2UpDown);
             this.party2GroupBox.Controls.Add(this.partyBall2UpDown);
@@ -8690,18 +8724,18 @@
             this.label50.TabIndex = 7;
             this.label50.Text = "Lv.";
             // 
-            // groupBox31
+            // poke2MovesGroupBox
             // 
-            this.groupBox31.Controls.Add(this.partyMove2_4ComboBox);
-            this.groupBox31.Controls.Add(this.partyMove2_2ComboBox);
-            this.groupBox31.Controls.Add(this.partyMove2_3ComboBox);
-            this.groupBox31.Controls.Add(this.partyMove2_1ComboBox);
-            this.groupBox31.Location = new System.Drawing.Point(110, 63);
-            this.groupBox31.Name = "groupBox31";
-            this.groupBox31.Size = new System.Drawing.Size(227, 85);
-            this.groupBox31.TabIndex = 6;
-            this.groupBox31.TabStop = false;
-            this.groupBox31.Text = "Moves";
+            this.poke2MovesGroupBox.Controls.Add(this.partyMove2_4ComboBox);
+            this.poke2MovesGroupBox.Controls.Add(this.partyMove2_2ComboBox);
+            this.poke2MovesGroupBox.Controls.Add(this.partyMove2_3ComboBox);
+            this.poke2MovesGroupBox.Controls.Add(this.partyMove2_1ComboBox);
+            this.poke2MovesGroupBox.Location = new System.Drawing.Point(110, 63);
+            this.poke2MovesGroupBox.Name = "poke2MovesGroupBox";
+            this.poke2MovesGroupBox.Size = new System.Drawing.Size(227, 85);
+            this.poke2MovesGroupBox.TabIndex = 6;
+            this.poke2MovesGroupBox.TabStop = false;
+            this.poke2MovesGroupBox.Text = "Moves";
             // 
             // partyMove2_4ComboBox
             // 
@@ -8754,15 +8788,23 @@
             this.partyIV2UpDown.Name = "partyIV2UpDown";
             this.partyIV2UpDown.Size = new System.Drawing.Size(49, 20);
             this.partyIV2UpDown.TabIndex = 5;
-            this.partyIV2UpDown.ValueChanged += new System.EventHandler(this.partyIV2UpDown_ValueChanged);
             // 
             // partyLevel2UpDown
             // 
             this.partyLevel2UpDown.Location = new System.Drawing.Point(48, 73);
+            this.partyLevel2UpDown.Minimum = new decimal(new int[] {
+            1,
+            0,
+            0,
+            0});
             this.partyLevel2UpDown.Name = "partyLevel2UpDown";
             this.partyLevel2UpDown.Size = new System.Drawing.Size(49, 20);
             this.partyLevel2UpDown.TabIndex = 4;
-            this.partyLevel2UpDown.ValueChanged += new System.EventHandler(this.partyLevel2UpDown_ValueChanged);
+            this.partyLevel2UpDown.Value = new decimal(new int[] {
+            1,
+            0,
+            0,
+            0});
             // 
             // partyBall2UpDown
             // 
@@ -8775,7 +8817,6 @@
             this.partyBall2UpDown.Name = "partyBall2UpDown";
             this.partyBall2UpDown.Size = new System.Drawing.Size(49, 20);
             this.partyBall2UpDown.TabIndex = 3;
-            this.partyBall2UpDown.ValueChanged += new System.EventHandler(this.partyBall2UpDown_ValueChanged);
             // 
             // partyItem2ComboBox
             // 
@@ -8785,7 +8826,6 @@
             this.partyItem2ComboBox.Name = "partyItem2ComboBox";
             this.partyItem2ComboBox.Size = new System.Drawing.Size(140, 21);
             this.partyItem2ComboBox.TabIndex = 2;
-            this.partyItem2ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyItem2ComboBox_SelectedIndexChanged);
             // 
             // partyPokemon2PictureBox
             // 
@@ -8809,7 +8849,7 @@
             this.party1GroupBox.Controls.Add(this.label47);
             this.party1GroupBox.Controls.Add(this.label46);
             this.party1GroupBox.Controls.Add(this.label45);
-            this.party1GroupBox.Controls.Add(this.groupBox35);
+            this.party1GroupBox.Controls.Add(this.poke1MovesGroupBox);
             this.party1GroupBox.Controls.Add(this.partyIV1UpDown);
             this.party1GroupBox.Controls.Add(this.partyLevel1UpDown);
             this.party1GroupBox.Controls.Add(this.partyBall1UpDown);
@@ -8851,18 +8891,18 @@
             this.label45.TabIndex = 7;
             this.label45.Text = "Lv.";
             // 
-            // groupBox35
+            // poke1MovesGroupBox
             // 
-            this.groupBox35.Controls.Add(this.partyMove1_4ComboBox);
-            this.groupBox35.Controls.Add(this.partyMove1_2ComboBox);
-            this.groupBox35.Controls.Add(this.partyMove1_3ComboBox);
-            this.groupBox35.Controls.Add(this.partyMove1_1ComboBox);
-            this.groupBox35.Location = new System.Drawing.Point(110, 63);
-            this.groupBox35.Name = "groupBox35";
-            this.groupBox35.Size = new System.Drawing.Size(227, 85);
-            this.groupBox35.TabIndex = 6;
-            this.groupBox35.TabStop = false;
-            this.groupBox35.Text = "Moves";
+            this.poke1MovesGroupBox.Controls.Add(this.partyMove1_4ComboBox);
+            this.poke1MovesGroupBox.Controls.Add(this.partyMove1_2ComboBox);
+            this.poke1MovesGroupBox.Controls.Add(this.partyMove1_3ComboBox);
+            this.poke1MovesGroupBox.Controls.Add(this.partyMove1_1ComboBox);
+            this.poke1MovesGroupBox.Location = new System.Drawing.Point(110, 63);
+            this.poke1MovesGroupBox.Name = "poke1MovesGroupBox";
+            this.poke1MovesGroupBox.Size = new System.Drawing.Size(227, 85);
+            this.poke1MovesGroupBox.TabIndex = 6;
+            this.poke1MovesGroupBox.TabStop = false;
+            this.poke1MovesGroupBox.Text = "Moves";
             // 
             // partyMove1_4ComboBox
             // 
@@ -8915,15 +8955,23 @@
             this.partyIV1UpDown.Name = "partyIV1UpDown";
             this.partyIV1UpDown.Size = new System.Drawing.Size(49, 20);
             this.partyIV1UpDown.TabIndex = 5;
-            this.partyIV1UpDown.ValueChanged += new System.EventHandler(this.partyIV1UpDown_ValueChanged);
             // 
             // partyLevel1UpDown
             // 
             this.partyLevel1UpDown.Location = new System.Drawing.Point(48, 73);
+            this.partyLevel1UpDown.Minimum = new decimal(new int[] {
+            1,
+            0,
+            0,
+            0});
             this.partyLevel1UpDown.Name = "partyLevel1UpDown";
             this.partyLevel1UpDown.Size = new System.Drawing.Size(49, 20);
             this.partyLevel1UpDown.TabIndex = 4;
-            this.partyLevel1UpDown.ValueChanged += new System.EventHandler(this.partyLevel1UpDown_ValueChanged);
+            this.partyLevel1UpDown.Value = new decimal(new int[] {
+            1,
+            0,
+            0,
+            0});
             // 
             // partyBall1UpDown
             // 
@@ -8936,7 +8984,6 @@
             this.partyBall1UpDown.Name = "partyBall1UpDown";
             this.partyBall1UpDown.Size = new System.Drawing.Size(49, 20);
             this.partyBall1UpDown.TabIndex = 3;
-            this.partyBall1UpDown.ValueChanged += new System.EventHandler(this.partyBall1UpDown_ValueChanged);
             // 
             // partyItem1ComboBox
             // 
@@ -8946,7 +8993,6 @@
             this.partyItem1ComboBox.Name = "partyItem1ComboBox";
             this.partyItem1ComboBox.Size = new System.Drawing.Size(140, 21);
             this.partyItem1ComboBox.TabIndex = 2;
-            this.partyItem1ComboBox.SelectedIndexChanged += new System.EventHandler(this.partyItem1ComboBox_SelectedIndexChanged);
             // 
             // partyPokemon1PictureBox
             // 
@@ -9141,7 +9187,6 @@
             this.trainerAI1CheckBox.TabIndex = 0;
             this.trainerAI1CheckBox.Text = "Basic";
             this.trainerAI1CheckBox.UseVisualStyleBackColor = true;
-            this.trainerAI1CheckBox.CheckedChanged += new System.EventHandler(this.trainerAICheckBox_CheckedChanged);
             // 
             // trainerAI2CheckBox
             // 
@@ -9152,7 +9197,6 @@
             this.trainerAI2CheckBox.TabIndex = 1;
             this.trainerAI2CheckBox.Text = "Evaluate Attack";
             this.trainerAI2CheckBox.UseVisualStyleBackColor = true;
-            this.trainerAI2CheckBox.CheckedChanged += new System.EventHandler(this.trainerAICheckBox_CheckedChanged);
             // 
             // trainerAI3CheckBox
             // 
@@ -9163,7 +9207,6 @@
             this.trainerAI3CheckBox.TabIndex = 2;
             this.trainerAI3CheckBox.Text = "Expert";
             this.trainerAI3CheckBox.UseVisualStyleBackColor = true;
-            this.trainerAI3CheckBox.CheckedChanged += new System.EventHandler(this.trainerAICheckBox_CheckedChanged);
             // 
             // trainerAI4CheckBox
             // 
@@ -9174,7 +9217,6 @@
             this.trainerAI4CheckBox.TabIndex = 3;
             this.trainerAI4CheckBox.Text = "Status";
             this.trainerAI4CheckBox.UseVisualStyleBackColor = true;
-            this.trainerAI4CheckBox.CheckedChanged += new System.EventHandler(this.trainerAICheckBox_CheckedChanged);
             // 
             // trainerAI5CheckBox
             // 
@@ -9185,7 +9227,6 @@
             this.trainerAI5CheckBox.TabIndex = 4;
             this.trainerAI5CheckBox.Text = "Risk";
             this.trainerAI5CheckBox.UseVisualStyleBackColor = true;
-            this.trainerAI5CheckBox.CheckedChanged += new System.EventHandler(this.trainerAICheckBox_CheckedChanged);
             // 
             // trainerAI6CheckBox
             // 
@@ -9196,7 +9237,6 @@
             this.trainerAI6CheckBox.TabIndex = 5;
             this.trainerAI6CheckBox.Text = "Damage Priority";
             this.trainerAI6CheckBox.UseVisualStyleBackColor = true;
-            this.trainerAI6CheckBox.CheckedChanged += new System.EventHandler(this.trainerAICheckBox_CheckedChanged);
             // 
             // trainerAI7CheckBox
             // 
@@ -9207,7 +9247,6 @@
             this.trainerAI7CheckBox.TabIndex = 6;
             this.trainerAI7CheckBox.Text = "Baton Pass";
             this.trainerAI7CheckBox.UseVisualStyleBackColor = true;
-            this.trainerAI7CheckBox.CheckedChanged += new System.EventHandler(this.trainerAICheckBox_CheckedChanged);
             // 
             // trainerAI8CheckBox
             // 
@@ -9218,7 +9257,6 @@
             this.trainerAI8CheckBox.TabIndex = 7;
             this.trainerAI8CheckBox.Text = "Tag Strategy";
             this.trainerAI8CheckBox.UseVisualStyleBackColor = true;
-            this.trainerAI8CheckBox.CheckedChanged += new System.EventHandler(this.trainerAICheckBox_CheckedChanged);
             // 
             // trainerAI9CheckBox
             // 
@@ -9229,7 +9267,6 @@
             this.trainerAI9CheckBox.TabIndex = 8;
             this.trainerAI9CheckBox.Text = "Check HP";
             this.trainerAI9CheckBox.UseVisualStyleBackColor = true;
-            this.trainerAI9CheckBox.CheckedChanged += new System.EventHandler(this.trainerAICheckBox_CheckedChanged);
             // 
             // trainerAI10CheckBox
             // 
@@ -9240,7 +9277,6 @@
             this.trainerAI10CheckBox.TabIndex = 9;
             this.trainerAI10CheckBox.Text = "Weather";
             this.trainerAI10CheckBox.UseVisualStyleBackColor = true;
-            this.trainerAI10CheckBox.CheckedChanged += new System.EventHandler(this.trainerAICheckBox_CheckedChanged);
             // 
             // trainerAI11CheckBox
             // 
@@ -9251,7 +9287,6 @@
             this.trainerAI11CheckBox.TabIndex = 10;
             this.trainerAI11CheckBox.Text = "???";
             this.trainerAI11CheckBox.UseVisualStyleBackColor = true;
-            this.trainerAI11CheckBox.CheckedChanged += new System.EventHandler(this.trainerAICheckBox_CheckedChanged);
             // 
             // trainerItemsGroupBox
             // 
@@ -9273,7 +9308,6 @@
             this.trainerItem4ComboBox.Name = "trainerItem4ComboBox";
             this.trainerItem4ComboBox.Size = new System.Drawing.Size(171, 21);
             this.trainerItem4ComboBox.TabIndex = 3;
-            this.trainerItem4ComboBox.SelectedIndexChanged += new System.EventHandler(this.trainerItem4ComboBox_SelectedIndexChanged);
             // 
             // trainerItem3ComboBox
             // 
@@ -9282,7 +9316,6 @@
             this.trainerItem3ComboBox.Name = "trainerItem3ComboBox";
             this.trainerItem3ComboBox.Size = new System.Drawing.Size(171, 21);
             this.trainerItem3ComboBox.TabIndex = 2;
-            this.trainerItem3ComboBox.SelectedIndexChanged += new System.EventHandler(this.trainerItem3ComboBox_SelectedIndexChanged);
             // 
             // trainerItem2ComboBox
             // 
@@ -9291,7 +9324,6 @@
             this.trainerItem2ComboBox.Name = "trainerItem2ComboBox";
             this.trainerItem2ComboBox.Size = new System.Drawing.Size(171, 21);
             this.trainerItem2ComboBox.TabIndex = 1;
-            this.trainerItem2ComboBox.SelectedIndexChanged += new System.EventHandler(this.trainerItem2ComboBox_SelectedIndexChanged);
             // 
             // trainerItem1ComboBox
             // 
@@ -9300,7 +9332,6 @@
             this.trainerItem1ComboBox.Name = "trainerItem1ComboBox";
             this.trainerItem1ComboBox.Size = new System.Drawing.Size(171, 21);
             this.trainerItem1ComboBox.TabIndex = 0;
-            this.trainerItem1ComboBox.SelectedIndexChanged += new System.EventHandler(this.trainerItem1ComboBox_SelectedIndexChanged);
             // 
             // trainerItemsCheckBox
             // 
@@ -9333,7 +9364,6 @@
             this.trainerDoubleCheckBox.TabIndex = 23;
             this.trainerDoubleCheckBox.Text = "Double Battle";
             this.trainerDoubleCheckBox.UseVisualStyleBackColor = true;
-            this.trainerDoubleCheckBox.CheckedChanged += new System.EventHandler(this.trainerDoubleCheckBox_CheckedChanged);
             // 
             // trainerNameTextBox
             // 
@@ -10039,9 +10069,9 @@
             this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.statusLabel,
             this.toolStripProgressBar});
-            this.statusStrip1.Location = new System.Drawing.Point(0, 721);
+            this.statusStrip1.Location = new System.Drawing.Point(0, 719);
             this.statusStrip1.Name = "statusStrip1";
-            this.statusStrip1.Size = new System.Drawing.Size(1214, 22);
+            this.statusStrip1.Size = new System.Drawing.Size(1214, 24);
             this.statusStrip1.TabIndex = 13;
             this.statusStrip1.Text = "statusStrip1";
             // 
@@ -10306,16 +10336,6 @@
             this.versionLabel.TabIndex = 9;
             this.versionLabel.Text = "ROM:";
             // 
-            // label67
-            // 
-            this.label67.AutoSize = true;
-            this.label67.Enabled = false;
-            this.label67.Location = new System.Drawing.Point(192, 131);
-            this.label67.Name = "label67";
-            this.label67.Size = new System.Drawing.Size(68, 13);
-            this.label67.TabIndex = 41;
-            this.label67.Text = "Coming soon";
-            // 
             // MainProgram
             // 
             this.AllowDrop = true;
@@ -10557,42 +10577,42 @@
             this.groupBox28.ResumeLayout(false);
             this.party6GroupBox.ResumeLayout(false);
             this.party6GroupBox.PerformLayout();
-            this.groupBox40.ResumeLayout(false);
+            this.poke6MovesGroupBox.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.partyIV6UpDown)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.partyLevel6UpDown)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.partyBall6UpDown)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.partyPokemon6PictureBox)).EndInit();
             this.party5GroupBox.ResumeLayout(false);
             this.party5GroupBox.PerformLayout();
-            this.groupBox38.ResumeLayout(false);
+            this.poke5MovesGroupBox.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.partyIV5UpDown)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.partyLevel5UpDown)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.partyBall5UpDown)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.partyPokemon5PictureBox)).EndInit();
             this.party4GroupBox.ResumeLayout(false);
             this.party4GroupBox.PerformLayout();
-            this.groupBox36.ResumeLayout(false);
+            this.poke4MovesGroupBox.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.partyIV4UpDown)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.partyLevel4UpDown)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.partyBall4UpDown)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.partyPokemon4PictureBox)).EndInit();
             this.party3GroupBox.ResumeLayout(false);
             this.party3GroupBox.PerformLayout();
-            this.groupBox33.ResumeLayout(false);
+            this.poke3MovesGroupBox.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.partyIV3UpDown)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.partyLevel3UpDown)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.partyBall3UpDown)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.partyPokemon3PictureBox)).EndInit();
             this.party2GroupBox.ResumeLayout(false);
             this.party2GroupBox.PerformLayout();
-            this.groupBox31.ResumeLayout(false);
+            this.poke2MovesGroupBox.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.partyIV2UpDown)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.partyLevel2UpDown)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.partyBall2UpDown)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.partyPokemon2PictureBox)).EndInit();
             this.party1GroupBox.ResumeLayout(false);
             this.party1GroupBox.PerformLayout();
-            this.groupBox35.ResumeLayout(false);
+            this.poke1MovesGroupBox.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.partyIV1UpDown)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.partyLevel1UpDown)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.partyBall1UpDown)).EndInit();
@@ -11198,7 +11218,7 @@
         private System.Windows.Forms.Label label60;
         private System.Windows.Forms.Label label61;
         private System.Windows.Forms.Label label62;
-        private System.Windows.Forms.GroupBox groupBox40;
+        private System.Windows.Forms.GroupBox poke6MovesGroupBox;
         private System.Windows.Forms.ComboBox partyMove6_4ComboBox;
         private System.Windows.Forms.ComboBox partyMove6_2ComboBox;
         private System.Windows.Forms.ComboBox partyMove6_3ComboBox;
@@ -11213,7 +11233,7 @@
         private System.Windows.Forms.Label label57;
         private System.Windows.Forms.Label label58;
         private System.Windows.Forms.Label label59;
-        private System.Windows.Forms.GroupBox groupBox38;
+        private System.Windows.Forms.GroupBox poke5MovesGroupBox;
         private System.Windows.Forms.ComboBox partyMove5_4ComboBox;
         private System.Windows.Forms.ComboBox partyMove5_2ComboBox;
         private System.Windows.Forms.ComboBox partyMove5_3ComboBox;
@@ -11228,7 +11248,7 @@
         private System.Windows.Forms.Label label54;
         private System.Windows.Forms.Label label55;
         private System.Windows.Forms.Label label56;
-        private System.Windows.Forms.GroupBox groupBox36;
+        private System.Windows.Forms.GroupBox poke4MovesGroupBox;
         private System.Windows.Forms.ComboBox partyMove4_4ComboBox;
         private System.Windows.Forms.ComboBox partyMove4_2ComboBox;
         private System.Windows.Forms.ComboBox partyMove4_3ComboBox;
@@ -11243,7 +11263,7 @@
         private System.Windows.Forms.Label label51;
         private System.Windows.Forms.Label label52;
         private System.Windows.Forms.Label label53;
-        private System.Windows.Forms.GroupBox groupBox33;
+        private System.Windows.Forms.GroupBox poke3MovesGroupBox;
         private System.Windows.Forms.ComboBox partyMove3_4ComboBox;
         private System.Windows.Forms.ComboBox partyMove3_2ComboBox;
         private System.Windows.Forms.ComboBox partyMove3_3ComboBox;
@@ -11258,7 +11278,7 @@
         private System.Windows.Forms.Label label48;
         private System.Windows.Forms.Label label49;
         private System.Windows.Forms.Label label50;
-        private System.Windows.Forms.GroupBox groupBox31;
+        private System.Windows.Forms.GroupBox poke2MovesGroupBox;
         private System.Windows.Forms.ComboBox partyMove2_4ComboBox;
         private System.Windows.Forms.ComboBox partyMove2_2ComboBox;
         private System.Windows.Forms.ComboBox partyMove2_3ComboBox;
@@ -11273,7 +11293,7 @@
         private System.Windows.Forms.Label label47;
         private System.Windows.Forms.Label label46;
         private System.Windows.Forms.Label label45;
-        private System.Windows.Forms.GroupBox groupBox35;
+        private System.Windows.Forms.GroupBox poke1MovesGroupBox;
         private System.Windows.Forms.ComboBox partyMove1_4ComboBox;
         private System.Windows.Forms.ComboBox partyMove1_2ComboBox;
         private System.Windows.Forms.ComboBox partyMove1_3ComboBox;
diff --git a/DS_Map/Main Window.cs b/DS_Map/Main Window.cs
index f990054..0f18ed5 100644
--- a/DS_Map/Main Window.cs	
+++ b/DS_Map/Main Window.cs	
@@ -7602,16 +7602,14 @@ namespace DSPRE {
         #endregion
 
         #region Trainer Editor
-        private List<ComboBox> partyPokemonComponentList = new List<ComboBox>();
-        private List<ComboBox> partyItemComponentList = new List<ComboBox>();
-        private List<NumericUpDown> partyLevelComponentList = new List<NumericUpDown>();
-        private List<NumericUpDown> partyIVComponentList = new List<NumericUpDown>();
-        private List<NumericUpDown> partyBallComponentList = new List<NumericUpDown>();
-        private List<ComboBox> partyFirstMoveComponentList = new List<ComboBox>();
-        private List<ComboBox> partySecondMoveComponentList = new List<ComboBox>();
-        private List<ComboBox> partyThirdMoveComponentList = new List<ComboBox>();
-        private List<ComboBox> partyFourthMoveComponentList = new List<ComboBox>();
-        private List<GroupBox> partyGroupComponentList = new List<GroupBox>();
+        private List<ComboBox> partyPokemonComboboxList = new List<ComboBox>();
+        private List<ComboBox> partyItemsComboboxList = new List<ComboBox>();
+        private List<GroupBox> partyMovesGroupboxList = new List<GroupBox>();
+        private List<NumericUpDown> partyLevelUpdownList = new List<NumericUpDown>();
+        private List<NumericUpDown> partyIVUpdownList = new List<NumericUpDown>();
+        private List<NumericUpDown> partyBallUpdownList = new List<NumericUpDown>();
+        private List<GroupBox> partyGroupboxList = new List<GroupBox>();
+        private List<PictureBox> partyPokemonPictureBoxList = new List<PictureBox>();
 
         TrainerFile currentTrainerFile;
         PaletteBase pal;
@@ -7653,85 +7651,69 @@ namespace DSPRE {
 
             DSUtils.TryUnpackNarcs(new List<DirNames> { DirNames.trainerProperties, DirNames.trainerParty, DirNames.trainerGraphics, DirNames.textArchives });
 
-            partyPokemonComponentList.Clear();
-            partyPokemonComponentList.Add(partyPokemon1ComboBox);
-            partyPokemonComponentList.Add(partyPokemon2ComboBox);
-            partyPokemonComponentList.Add(partyPokemon3ComboBox);
-            partyPokemonComponentList.Add(partyPokemon4ComboBox);
-            partyPokemonComponentList.Add(partyPokemon5ComboBox);
-            partyPokemonComponentList.Add(partyPokemon6ComboBox);
+            partyPokemonComboboxList.Clear();
+            partyPokemonComboboxList.Add(partyPokemon1ComboBox);
+            partyPokemonComboboxList.Add(partyPokemon2ComboBox);
+            partyPokemonComboboxList.Add(partyPokemon3ComboBox);
+            partyPokemonComboboxList.Add(partyPokemon4ComboBox);
+            partyPokemonComboboxList.Add(partyPokemon5ComboBox);
+            partyPokemonComboboxList.Add(partyPokemon6ComboBox);
 
-            partyItemComponentList.Clear();
-            partyItemComponentList.Add(partyItem1ComboBox);
-            partyItemComponentList.Add(partyItem2ComboBox);
-            partyItemComponentList.Add(partyItem3ComboBox);
-            partyItemComponentList.Add(partyItem4ComboBox);
-            partyItemComponentList.Add(partyItem5ComboBox);
-            partyItemComponentList.Add(partyItem6ComboBox);
+            partyItemsComboboxList.Clear();
+            partyItemsComboboxList.Add(partyItem1ComboBox);
+            partyItemsComboboxList.Add(partyItem2ComboBox);
+            partyItemsComboboxList.Add(partyItem3ComboBox);
+            partyItemsComboboxList.Add(partyItem4ComboBox);
+            partyItemsComboboxList.Add(partyItem5ComboBox);
+            partyItemsComboboxList.Add(partyItem6ComboBox);
 
-            partyLevelComponentList.Clear();
-            partyLevelComponentList.Add(partyLevel1UpDown);
-            partyLevelComponentList.Add(partyLevel2UpDown);
-            partyLevelComponentList.Add(partyLevel3UpDown);
-            partyLevelComponentList.Add(partyLevel4UpDown);
-            partyLevelComponentList.Add(partyLevel5UpDown);
-            partyLevelComponentList.Add(partyLevel6UpDown);
+            partyLevelUpdownList.Clear();
+            partyLevelUpdownList.Add(partyLevel1UpDown);
+            partyLevelUpdownList.Add(partyLevel2UpDown);
+            partyLevelUpdownList.Add(partyLevel3UpDown);
+            partyLevelUpdownList.Add(partyLevel4UpDown);
+            partyLevelUpdownList.Add(partyLevel5UpDown);
+            partyLevelUpdownList.Add(partyLevel6UpDown);
 
-            partyIVComponentList.Clear();
-            partyIVComponentList.Add(partyIV1UpDown);
-            partyIVComponentList.Add(partyIV2UpDown);
-            partyIVComponentList.Add(partyIV3UpDown);
-            partyIVComponentList.Add(partyIV4UpDown);
-            partyIVComponentList.Add(partyIV5UpDown);
-            partyIVComponentList.Add(partyIV6UpDown);
+            partyIVUpdownList.Clear();
+            partyIVUpdownList.Add(partyIV1UpDown);
+            partyIVUpdownList.Add(partyIV2UpDown);
+            partyIVUpdownList.Add(partyIV3UpDown);
+            partyIVUpdownList.Add(partyIV4UpDown);
+            partyIVUpdownList.Add(partyIV5UpDown);
+            partyIVUpdownList.Add(partyIV6UpDown);
 
-            partyBallComponentList.Clear();
-            partyBallComponentList.Add(partyBall1UpDown);
-            partyBallComponentList.Add(partyBall2UpDown);
-            partyBallComponentList.Add(partyBall3UpDown);
-            partyBallComponentList.Add(partyBall4UpDown);
-            partyBallComponentList.Add(partyBall5UpDown);
-            partyBallComponentList.Add(partyBall6UpDown);
+            partyBallUpdownList.Clear();
+            partyBallUpdownList.Add(partyBall1UpDown);
+            partyBallUpdownList.Add(partyBall2UpDown);
+            partyBallUpdownList.Add(partyBall3UpDown);
+            partyBallUpdownList.Add(partyBall4UpDown);
+            partyBallUpdownList.Add(partyBall5UpDown);
+            partyBallUpdownList.Add(partyBall6UpDown);
 
-            partyFirstMoveComponentList.Clear();
-            partyFirstMoveComponentList.Add(partyMove1_1ComboBox);
-            partyFirstMoveComponentList.Add(partyMove2_1ComboBox);
-            partyFirstMoveComponentList.Add(partyMove3_1ComboBox);
-            partyFirstMoveComponentList.Add(partyMove4_1ComboBox);
-            partyFirstMoveComponentList.Add(partyMove5_1ComboBox);
-            partyFirstMoveComponentList.Add(partyMove6_1ComboBox);
+            partyMovesGroupboxList.Clear();
+            partyMovesGroupboxList.Add(poke1MovesGroupBox);
+            partyMovesGroupboxList.Add(poke2MovesGroupBox);
+            partyMovesGroupboxList.Add(poke3MovesGroupBox);
+            partyMovesGroupboxList.Add(poke4MovesGroupBox);
+            partyMovesGroupboxList.Add(poke5MovesGroupBox);
+            partyMovesGroupboxList.Add(poke6MovesGroupBox);
 
-            partySecondMoveComponentList.Clear();
-            partySecondMoveComponentList.Add(partyMove1_2ComboBox);
-            partySecondMoveComponentList.Add(partyMove2_2ComboBox);
-            partySecondMoveComponentList.Add(partyMove3_2ComboBox);
-            partySecondMoveComponentList.Add(partyMove4_2ComboBox);
-            partySecondMoveComponentList.Add(partyMove5_2ComboBox);
-            partySecondMoveComponentList.Add(partyMove6_2ComboBox);
+            partyGroupboxList.Clear();
+            partyGroupboxList.Add(party1GroupBox);
+            partyGroupboxList.Add(party2GroupBox);
+            partyGroupboxList.Add(party3GroupBox);
+            partyGroupboxList.Add(party4GroupBox);
+            partyGroupboxList.Add(party5GroupBox);
+            partyGroupboxList.Add(party6GroupBox);
 
-            partyThirdMoveComponentList.Clear();
-            partyThirdMoveComponentList.Add(partyMove1_3ComboBox);
-            partyThirdMoveComponentList.Add(partyMove2_3ComboBox);
-            partyThirdMoveComponentList.Add(partyMove3_3ComboBox);
-            partyThirdMoveComponentList.Add(partyMove4_3ComboBox);
-            partyThirdMoveComponentList.Add(partyMove5_3ComboBox);
-            partyThirdMoveComponentList.Add(partyMove6_3ComboBox);
-
-            partyFourthMoveComponentList.Clear();
-            partyFourthMoveComponentList.Add(partyMove1_4ComboBox);
-            partyFourthMoveComponentList.Add(partyMove2_4ComboBox);
-            partyFourthMoveComponentList.Add(partyMove3_4ComboBox);
-            partyFourthMoveComponentList.Add(partyMove4_4ComboBox);
-            partyFourthMoveComponentList.Add(partyMove5_4ComboBox);
-            partyFourthMoveComponentList.Add(partyMove6_4ComboBox);
-
-            partyGroupComponentList.Clear();
-            partyGroupComponentList.Add(party1GroupBox);
-            partyGroupComponentList.Add(party2GroupBox);
-            partyGroupComponentList.Add(party3GroupBox);
-            partyGroupComponentList.Add(party4GroupBox);
-            partyGroupComponentList.Add(party5GroupBox);
-            partyGroupComponentList.Add(party6GroupBox);
+            partyPokemonPictureBoxList.Clear();
+            partyPokemonPictureBoxList.Add(partyPokemon1PictureBox);
+            partyPokemonPictureBoxList.Add(partyPokemon2PictureBox);
+            partyPokemonPictureBoxList.Add(partyPokemon3PictureBox);
+            partyPokemonPictureBoxList.Add(partyPokemon4PictureBox);
+            partyPokemonPictureBoxList.Add(partyPokemon5PictureBox);
+            partyPokemonPictureBoxList.Add(partyPokemon6PictureBox);
 
             int trainerCount = Directory.GetFiles(RomInfo.gameDirs[DirNames.trainerProperties].unpackedDir).Length;
             trainerComboBox.Items.Clear();
@@ -7747,43 +7729,27 @@ namespace DSPRE {
             string[] pokeNames = RomInfo.GetPokémonNames();
             string[] moveNames = RomInfo.GetAttackNames();
 
-            trainerItem1ComboBox.Items.Clear();
-            trainerItem2ComboBox.Items.Clear();
-            trainerItem3ComboBox.Items.Clear();
-            trainerItem4ComboBox.Items.Clear();
-            trainerItem1ComboBox.Items.AddRange(itemNames);
-            trainerItem2ComboBox.Items.AddRange(itemNames);
-            trainerItem3ComboBox.Items.AddRange(itemNames);
-            trainerItem4ComboBox.Items.AddRange(itemNames);
+            foreach(Control c in trainerItemsGroupBox.Controls) {
+                ComboBox cbox = c as ComboBox;
+                cbox.Items.Clear();
+                cbox.Items.AddRange(itemNames);
+            }
 
-            foreach (ComboBox CB in partyPokemonComponentList) {
+            foreach (ComboBox CB in partyPokemonComboboxList) {
                 CB.Items.Clear();
                 CB.Items.AddRange(pokeNames);
             }
 
-            foreach (ComboBox CB in partyItemComponentList) {
+            foreach (ComboBox CB in partyItemsComboboxList) {
                 CB.Items.Clear();
                 CB.Items.AddRange(itemNames);
             }
 
-            foreach (ComboBox CB in partyFirstMoveComponentList) {
-                CB.Items.Clear();
-                CB.Items.AddRange(moveNames);
-            }
-
-            foreach (ComboBox CB in partySecondMoveComponentList) {
-                CB.Items.Clear();
-                CB.Items.AddRange(moveNames);
-            }
-
-            foreach (ComboBox CB in partyThirdMoveComponentList) {
-                CB.Items.Clear();
-                CB.Items.AddRange(moveNames);
-            }
-
-            foreach (ComboBox CB in partyFourthMoveComponentList) {
-                CB.Items.Clear();
-                CB.Items.AddRange(moveNames);
+            foreach (GroupBox movesGroup in partyMovesGroupboxList) {
+                foreach (ComboBox CB in movesGroup.Controls) {
+                    CB.Items.Clear();
+                    CB.Items.AddRange(moveNames);
+                }
             }
 
             trainerComboBox.SelectedIndex = 0;
@@ -7822,39 +7788,38 @@ namespace DSPRE {
             trainerItemsCheckBox.Checked = currentTrainerFile.trp.hasItems;
             partyCountUpDown.Value = currentTrainerFile.trp.partyCount;
 
-            trainerItem1ComboBox.SelectedIndex = currentTrainerFile.trp.trainerItems[0];
-            trainerItem2ComboBox.SelectedIndex = currentTrainerFile.trp.trainerItems[1];
-            trainerItem3ComboBox.SelectedIndex = currentTrainerFile.trp.trainerItems[2];
-            trainerItem4ComboBox.SelectedIndex = currentTrainerFile.trp.trainerItems[3];
+            IList trainerItems = trainerItemsGroupBox.Controls;
+            for (int i = 0; i < trainerItems.Count; i++) {
+                (trainerItems[i] as ComboBox).SelectedIndex = currentTrainerFile.trp.trainerItems[i];
+            }
 
-            IList list = TrainerAIGroupBox.Controls;
-            for (int i = 0; i < list.Count; i++) {
-                ((CheckBox)list[i]).Checked = currentTrainerFile.trp.AI[i];
+            IList trainerAI = TrainerAIGroupBox.Controls;
+            for (int i = 0; i < trainerAI.Count; i++) {
+                (trainerAI[i] as CheckBox).Checked = currentTrainerFile.trp.AI[i];
             }
         }
         public void RefreshTrainerPartyGUI() {
             for (int i = 0; i < TrainerFile.POKE_IN_PARTY; i++) {
-                partyPokemonComponentList[i].SelectedIndex = currentTrainerFile.party[i].pokeID ?? 0;
-                partyItemComponentList[i].SelectedIndex = currentTrainerFile.party[i].heldItem ?? 0;
-                partyLevelComponentList[i].Value = currentTrainerFile.party[i].level;
-                partyIVComponentList[i].Value = currentTrainerFile.party[i].unknown1_DATASTART;
-                partyBallComponentList[i].Value = currentTrainerFile.party[i].unknown2_DATAEND;
-                
+                partyPokemonComboboxList[i].SelectedIndex = currentTrainerFile.party[i].pokeID ?? 0;
+                partyItemsComboboxList[i].SelectedIndex = currentTrainerFile.party[i].heldItem ?? 0;
+                partyLevelUpdownList[i].Value = Math.Max((ushort)1, currentTrainerFile.party[i].level);
+                partyIVUpdownList[i].Value = currentTrainerFile.party[i].unknown1_DATASTART;
+                partyBallUpdownList[i].Value = currentTrainerFile.party[i].unknown2_DATAEND;
+
                 if (currentTrainerFile.party[i].moves == null) {
-                    partyFirstMoveComponentList[i].SelectedIndex = 0;
-                    partySecondMoveComponentList[i].SelectedIndex = 0;
-                    partyThirdMoveComponentList[i].SelectedIndex = 0;
-                    partyFourthMoveComponentList[i].SelectedIndex = 0;
+                    for (int j = 0; j < Party.MOVES_PER_POKE; j++) {
+                        (partyMovesGroupboxList[i].Controls[j] as ComboBox).SelectedIndex = 0;
+                    }
                 } else {
-                    partyFirstMoveComponentList[i].SelectedIndex = currentTrainerFile.party[i].moves[0];
-                    partySecondMoveComponentList[i].SelectedIndex = currentTrainerFile.party[i].moves[1];
-                    partyThirdMoveComponentList[i].SelectedIndex = currentTrainerFile.party[i].moves[2];
-                    partyFourthMoveComponentList[i].SelectedIndex = currentTrainerFile.party[i].moves[3];
+                    for (int j = 0; j < Party.MOVES_PER_POKE; j++) {
+                        (partyMovesGroupboxList[i].Controls[j] as ComboBox).SelectedIndex = currentTrainerFile.party[i].moves[j];
+                    }
                 }
             }
         }
         private string FixPokenameString(string toFix) {
             toFix = toFix.ToLower();
+            toFix = toFix.Replace(".", "_"); //Fix Mime Jr. and Mr. Mime
             toFix = toFix.Replace(" ", "_");
             toFix = toFix.Replace("'", "_");
             toFix = toFix.Replace("’", "_");
@@ -7866,302 +7831,120 @@ namespace DSPRE {
             toFix = toFix.Replace("♂", "M");
             return toFix;
         }
+        private void showTrainerEditorPokePic(byte partyPos) {
+            ComboBox cb = partyPokemonComboboxList[partyPos];
+            partyPokemonPictureBoxList[partyPos].Image = cb.SelectedIndex > 0 ? (Image)Properties.PokePics.ResourceManager.GetObject(FixPokenameString(PokeDatabase.System.pokeNames[(ushort)cb.SelectedIndex])) : null;
+        }
         private void partyPokemon1ComboBox_SelectedIndexChanged(object sender, EventArgs e) {
-            if (!disableHandlers) {
-                currentTrainerFile.party[0].pokeID = (ushort)partyPokemon1ComboBox.SelectedIndex;
-            }
-            ComboBox cb = (ComboBox)sender;
-            Image pokeIcon = cb.SelectedIndex > 0 ? (Image)Properties.PokePics.ResourceManager.GetObject(FixPokenameString(PokeDatabase.System.pokeNames[(ushort)cb.SelectedIndex])) : null;
-            partyPokemon1PictureBox.Image = pokeIcon;
+            showTrainerEditorPokePic(0);
         }
         private void partyPokemon2ComboBox_SelectedIndexChanged(object sender, EventArgs e) {
-            if (!disableHandlers) {
-                currentTrainerFile.party[1].pokeID = (ushort)partyPokemon2ComboBox.SelectedIndex;
-            }
-            ComboBox cb = (ComboBox)sender;
-            Image pokeIcon = cb.SelectedIndex > 0 ? (Image)Properties.PokePics.ResourceManager.GetObject(FixPokenameString(PokeDatabase.System.pokeNames[(ushort)cb.SelectedIndex])) : null;
-            partyPokemon2PictureBox.Image = pokeIcon;
+            showTrainerEditorPokePic(1);
         }
 
         private void partyPokemon3ComboBox_SelectedIndexChanged(object sender, EventArgs e) {
-            if (!disableHandlers) {
-                currentTrainerFile.party[2].pokeID = (ushort)partyPokemon3ComboBox.SelectedIndex;
-            }
-            ComboBox cb = (ComboBox)sender;
-            Image pokeIcon = cb.SelectedIndex > 0 ? (Image)Properties.PokePics.ResourceManager.GetObject(FixPokenameString(PokeDatabase.System.pokeNames[(ushort)cb.SelectedIndex])) : null;
-            partyPokemon3PictureBox.Image = pokeIcon;
+            showTrainerEditorPokePic(2);
         }
 
         private void partyPokemon4ComboBox_SelectedIndexChanged(object sender, EventArgs e) {
-            if (!disableHandlers) {
-                currentTrainerFile.party[3].pokeID = (ushort)partyPokemon4ComboBox.SelectedIndex;
-            }
-            ComboBox cb = (ComboBox)sender;
-            Image pokeIcon = cb.SelectedIndex > 0 ? (Image)Properties.PokePics.ResourceManager.GetObject(FixPokenameString(PokeDatabase.System.pokeNames[(ushort)cb.SelectedIndex])) : null;
-            partyPokemon4PictureBox.Image = pokeIcon;
+            showTrainerEditorPokePic(3);
         }
 
         private void partyPokemon5ComboBox_SelectedIndexChanged(object sender, EventArgs e) {
-            if (!disableHandlers) {
-                currentTrainerFile.party[4].pokeID = (ushort)partyPokemon5ComboBox.SelectedIndex;
-            }
-            ComboBox cb = (ComboBox)sender;
-            Image pokeIcon = cb.SelectedIndex > 0 ? (Image)Properties.PokePics.ResourceManager.GetObject(FixPokenameString(PokeDatabase.System.pokeNames[(ushort)cb.SelectedIndex])) : null;
-            partyPokemon5PictureBox.Image = pokeIcon;
+            showTrainerEditorPokePic(4);
         }
 
         private void partyPokemon6ComboBox_SelectedIndexChanged(object sender, EventArgs e) {
-            if (!disableHandlers) {
-                currentTrainerFile.party[5].pokeID = (ushort)partyPokemon6ComboBox.SelectedIndex;
-            }
-            ComboBox cb = (ComboBox)sender;
-            Image pokeIcon = cb.SelectedIndex > 0 ? (Image)Properties.PokePics.ResourceManager.GetObject(FixPokenameString(PokeDatabase.System.pokeNames[(ushort)cb.SelectedIndex])) : null;
-            partyPokemon6PictureBox.Image = pokeIcon;
+            showTrainerEditorPokePic(5);
         }
 
         private void partyCountUpDown_ValueChanged(object sender, EventArgs e) {
             for (int i = 0; i < TrainerFile.POKE_IN_PARTY; i++) {
-                partyGroupComponentList[i].Enabled = (partyCountUpDown.Value > i);
+                partyGroupboxList[i].Enabled = (partyCountUpDown.Value > i);
             }
             for (int i = Math.Min(currentTrainerFile.trp.partyCount, (int)partyCountUpDown.Value); i < TrainerFile.POKE_IN_PARTY; i++) {
                 currentTrainerFile.party[i] = new PartyPokemon(currentTrainerFile.trp.hasItems, currentTrainerFile.trp.hasMoves);
             }
-            currentTrainerFile.trp.partyCount = (byte)partyCountUpDown.Value;
 
-            if (!disableHandlers) {
-                RefreshTrainerPartyGUI();
-                RefreshTrainerPropertiesGUI();
-            }
+            //if (!disableHandlers) {
+            //    RefreshTrainerPartyGUI();
+            //    RefreshTrainerPropertiesGUI();
+            //}
         }
 
         private void trainerMovesCheckBox_CheckedChanged(object sender, EventArgs e) {
             for (int i = 0; i < TrainerFile.POKE_IN_PARTY; i++) {
-                partyFirstMoveComponentList[i].Enabled = trainerMovesCheckBox.Checked;
-                partySecondMoveComponentList[i].Enabled = trainerMovesCheckBox.Checked;
-                partyThirdMoveComponentList[i].Enabled = trainerMovesCheckBox.Checked;
-                partyFourthMoveComponentList[i].Enabled = trainerMovesCheckBox.Checked;
-
-
-                currentTrainerFile.party[i].moves = trainerMovesCheckBox.Checked ? new ushort[4] : null;
-            }
-
-            if (!disableHandlers) {
-                currentTrainerFile.trp.hasMoves = trainerMovesCheckBox.Checked;
+                for (int j = 0; j < Party.MOVES_PER_POKE; j++) {
+                    (partyMovesGroupboxList[i].Controls[j] as ComboBox).Enabled = trainerMovesCheckBox.Checked;
+                }
+                currentTrainerFile.party[i].moves = trainerMovesCheckBox.Checked ? new ushort[Party.MOVES_PER_POKE] : null;
             }
         }
-
         private void trainerItemsCheckBox_CheckedChanged(object sender, EventArgs e) {
             for (int i = 0; i < TrainerFile.POKE_IN_PARTY; i++) {
-                partyItemComponentList[i].Enabled = trainerItemsCheckBox.Checked;
-            }
-            if (!disableHandlers) {
-                currentTrainerFile.trp.hasItems = trainerItemsCheckBox.Checked;
+                partyItemsComboboxList[i].Enabled = trainerItemsCheckBox.Checked;
             }
         }
-
-        private void trainerDoubleCheckBox_CheckedChanged(object sender, EventArgs e) {
-            if (!disableHandlers) {
-                currentTrainerFile.trp.doubleBattle = trainerDoubleCheckBox.Checked;
-            }
-        }
-
-        private void trainerItem1ComboBox_SelectedIndexChanged(object sender, EventArgs e) {
-            if (!disableHandlers) {
-                currentTrainerFile.trp.trainerItems[0] = (ushort)trainerItem1ComboBox.SelectedIndex;
-            }
-        }
-
-        private void trainerItem2ComboBox_SelectedIndexChanged(object sender, EventArgs e) {
-            if (!disableHandlers) {
-                currentTrainerFile.trp.trainerItems[1] = (ushort)trainerItem2ComboBox.SelectedIndex;
-            }
-        }
-
-        private void trainerItem3ComboBox_SelectedIndexChanged(object sender, EventArgs e) {
-            if (!disableHandlers) {
-                currentTrainerFile.trp.trainerItems[2] = (ushort)trainerItem3ComboBox.SelectedIndex;
-            }
-        }
-
-        private void trainerItem4ComboBox_SelectedIndexChanged(object sender, EventArgs e) {
-            if (!disableHandlers) {
-                currentTrainerFile.trp.trainerItems[3] = (ushort)trainerItem4ComboBox.SelectedIndex;
-            }
-        }
-
-        private void trainerAICheckBox_CheckedChanged(object sender, EventArgs e) {
-            if (!disableHandlers) {
-                IList list = TrainerAIGroupBox.Controls;
-                for (int i = 0; i < list.Count; i++) {
-                    currentTrainerFile.trp.AI[i] = ((CheckBox)list[i]).Checked;
-                }
-            }
-        }
-
-        private void partyItem1ComboBox_SelectedIndexChanged(object sender, EventArgs e) {
-            if (!disableHandlers) {
-                currentTrainerFile.party[0].heldItem = (ushort)partyItem1ComboBox.SelectedIndex;
-            }
-        }
-
-        private void partyItem2ComboBox_SelectedIndexChanged(object sender, EventArgs e) {
-            if (!disableHandlers) {
-                currentTrainerFile.party[1].heldItem = (ushort)partyItem2ComboBox.SelectedIndex;
-            }
-        }
-
-        private void partyItem3ComboBox_SelectedIndexChanged(object sender, EventArgs e) {
-            if (!disableHandlers) {
-                currentTrainerFile.party[2].heldItem = (ushort)partyItem3ComboBox.SelectedIndex;
-            }
-        }
-
-        private void partyItem4ComboBox_SelectedIndexChanged(object sender, EventArgs e) {
-            if (!disableHandlers) {
-                currentTrainerFile.party[3].heldItem = (ushort)partyItem4ComboBox.SelectedIndex;
-            }
-        }
-
-        private void partyItem5ComboBox_SelectedIndexChanged(object sender, EventArgs e) {
-            if (!disableHandlers) {
-                currentTrainerFile.party[4].heldItem = (ushort)partyItem5ComboBox.SelectedIndex;
-            }
-        }
-
-        private void partyItem6ComboBox_SelectedIndexChanged(object sender, EventArgs e) {
-            if (!disableHandlers) {
-                currentTrainerFile.party[5].heldItem = (ushort)partyItem6ComboBox.SelectedIndex;
-            }
-        }
-
-        private void partyLevel1UpDown_ValueChanged(object sender, EventArgs e) {
-            if (!disableHandlers) {
-                currentTrainerFile.party[0].level = (ushort)partyLevel1UpDown.Value;
-            }
-        }
-
-        private void partyLevel2UpDown_ValueChanged(object sender, EventArgs e) {
-            if (!disableHandlers) {
-                currentTrainerFile.party[1].level = (ushort)partyLevel2UpDown.Value;
-            }
-        }
-
-        private void partyLevel3UpDown_ValueChanged(object sender, EventArgs e) {
-            if (!disableHandlers) {
-                currentTrainerFile.party[2].level = (ushort)partyLevel3UpDown.Value;
-            }
-        }
-
-        private void partyLevel4UpDown_ValueChanged(object sender, EventArgs e) {
-            if (!disableHandlers) {
-                currentTrainerFile.party[3].level = (ushort)partyLevel4UpDown.Value;
-            }
-        }
-
-        private void partyLevel5UpDown_ValueChanged(object sender, EventArgs e) {
-            if (!disableHandlers) {
-                currentTrainerFile.party[4].level = (ushort)partyLevel5UpDown.Value;
-            }
-        }
-
-        private void partyLevel6UpDown_ValueChanged(object sender, EventArgs e) {
-            if (!disableHandlers) {
-                currentTrainerFile.party[5].level = (ushort)partyLevel6UpDown.Value;
-            }
-        }
-
-        private void partyIV1UpDown_ValueChanged(object sender, EventArgs e) {
-            if (!disableHandlers) {
-                currentTrainerFile.party[0].unknown1_DATASTART = (ushort)partyIV1UpDown.Value;
-            }
-        }
-
-        private void partyIV2UpDown_ValueChanged(object sender, EventArgs e) {
-            if (!disableHandlers) {
-                currentTrainerFile.party[1].unknown1_DATASTART = (ushort)partyIV2UpDown.Value;
-            }
-        }
-
-        private void partyIV3UpDown_ValueChanged(object sender, EventArgs e) {
-            if (!disableHandlers) {
-                currentTrainerFile.party[2].unknown1_DATASTART = (ushort)partyIV3UpDown.Value;
-            }
-        }
-
-        private void partyIV4UpDown_ValueChanged(object sender, EventArgs e) {
-            if (!disableHandlers) {
-                currentTrainerFile.party[3].unknown1_DATASTART = (ushort)partyIV4UpDown.Value;
-            }
-        }
-
-        private void partyIV5UpDown_ValueChanged(object sender, EventArgs e) {
-            if (!disableHandlers) {
-                currentTrainerFile.party[4].unknown1_DATASTART = (ushort)partyIV5UpDown.Value;
-            }
-        }
-
-        private void partyIV6UpDown_ValueChanged(object sender, EventArgs e) {
-            if (!disableHandlers) {
-                currentTrainerFile.party[5].unknown1_DATASTART = (ushort)partyIV6UpDown.Value;
-            }
-        }
-
-        private void partyBall1UpDown_ValueChanged(object sender, EventArgs e) {
-            if (!disableHandlers) {
-                currentTrainerFile.party[0].unknown2_DATAEND = (ushort)partyBall1UpDown.Value;
-            }
-        }
-
-        private void partyBall2UpDown_ValueChanged(object sender, EventArgs e) {
-            if (!disableHandlers) {
-                currentTrainerFile.party[1].unknown2_DATAEND = (ushort)partyBall2UpDown.Value;
-            }
-        }
-
-        private void partyBall3UpDown_ValueChanged(object sender, EventArgs e) {
-            if (!disableHandlers) {
-                currentTrainerFile.party[2].unknown2_DATAEND = (ushort)partyBall3UpDown.Value;
-            }
-        }
-
-        private void partyBall4UpDown_ValueChanged(object sender, EventArgs e) {
-            if (!disableHandlers) {
-                currentTrainerFile.party[3].unknown2_DATAEND = (ushort)partyBall4UpDown.Value;
-            }
-        }
-
-        private void partyBall5UpDown_ValueChanged(object sender, EventArgs e) {
-            if (!disableHandlers) {
-                currentTrainerFile.party[4].unknown2_DATAEND = (ushort)partyBall5UpDown.Value;
-            }
-        }
-
-        private void partyBall6UpDown_ValueChanged(object sender, EventArgs e) {
-            if (!disableHandlers) {
-                currentTrainerFile.party[5].unknown2_DATAEND = (ushort)partyBall6UpDown.Value;
-            }
-        }
-
         private void partyMoveComboBox_SelectedIndexChanged(object sender, EventArgs e) {
             if (!disableHandlers) {
                 for (int i = 0; i < TrainerFile.POKE_IN_PARTY; i++) {
                     ushort[] moves = currentTrainerFile.party[i].moves;
+
                     if (moves != null) {
-                        moves[0] = (ushort)partyFirstMoveComponentList[i].SelectedIndex;
-                        moves[1] = (ushort)partySecondMoveComponentList[i].SelectedIndex;
-                        moves[2] = (ushort)partyThirdMoveComponentList[i].SelectedIndex;
-                        moves[3] = (ushort)partyFourthMoveComponentList[i].SelectedIndex;
+                        for (int j = 0; j < Party.MOVES_PER_POKE; j++) {
+                            moves[j] = (ushort)(partyMovesGroupboxList[i].Controls[j] as ComboBox).SelectedIndex;
+                        }
                     }
                 }
             }
         }
 
         private void trainerSaveCurrentButton_Click(object sender, EventArgs e) {
-            using (BinaryWriter writer = new BinaryWriter(new FileStream(RomInfo.gameDirs[DirNames.trainerProperties].unpackedDir + "\\" + trainerComboBox.SelectedIndex.ToString("D4"), FileMode.Create))) {
+            currentTrainerFile.trp.partyCount = (byte)partyCountUpDown.Value;
+            currentTrainerFile.trp.hasMoves = trainerMovesCheckBox.Checked;
+            currentTrainerFile.trp.hasItems = trainerItemsCheckBox.Checked;
+            currentTrainerFile.trp.doubleBattle = trainerDoubleCheckBox.Checked;
+
+            IList trainerItems = trainerItemsGroupBox.Controls;
+            for (int i = 0; i < trainerItems.Count; i++) {
+                currentTrainerFile.trp.trainerItems[i] = (ushort)(trainerItems[i] as ComboBox).SelectedIndex;
+            }
+
+            IList trainerAI = TrainerAIGroupBox.Controls;
+            for (int i = 0; i < trainerAI.Count; i++) {
+                currentTrainerFile.trp.AI[i] = (trainerAI[i] as CheckBox).Checked;
+            }
+
+            for (int i = 0; i < TrainerFile.POKE_IN_PARTY; i++) {
+                currentTrainerFile.party[i].moves = trainerMovesCheckBox.Checked ? new ushort[4] : null;
+            }
+
+            for (int i = 0; i < partyCountUpDown.Value; i++) {
+                currentTrainerFile.party[i].pokeID = (ushort)partyPokemonComboboxList[i].SelectedIndex;
+                currentTrainerFile.party[i].level = (ushort)partyLevelUpdownList[i].Value;
+
+                if (trainerMovesCheckBox.Checked) {
+                    IList movesList = partyMovesGroupboxList[i].Controls;
+                    for (int j = 0; j < Party.MOVES_PER_POKE; j++) {
+                        currentTrainerFile.party[i].moves[j] = (ushort)(movesList[j] as ComboBox).SelectedIndex;
+                    }
+                }
+
+                if (trainerItemsCheckBox.Checked) {
+                    currentTrainerFile.party[i].heldItem = (ushort)partyItemsComboboxList[i].SelectedIndex;
+                }
+
+                currentTrainerFile.party[i].unknown1_DATASTART = (ushort)partyIVUpdownList[i].Value;
+                currentTrainerFile.party[i].unknown2_DATAEND = (ushort)partyBallUpdownList[i].Value;
+            }
+
+            /*Write to File*/
+            string indexStr = "\\" + trainerComboBox.SelectedIndex.ToString("D4");
+            using (BinaryWriter writer = new BinaryWriter(new FileStream(RomInfo.gameDirs[DirNames.trainerProperties].unpackedDir + indexStr, FileMode.Create))) {
                 writer.Write(currentTrainerFile.trp.ToByteArray());
             }
 
-            using (BinaryWriter writer = new BinaryWriter(new FileStream(RomInfo.gameDirs[DirNames.trainerParty].unpackedDir + "\\" + trainerComboBox.SelectedIndex.ToString("D4"), FileMode.Create))) {
+            using (BinaryWriter writer = new BinaryWriter(new FileStream(RomInfo.gameDirs[DirNames.trainerParty].unpackedDir + indexStr, FileMode.Create))) {
                 writer.Write(currentTrainerFile.party.ToByteArray());
             }
 
@@ -8211,7 +7994,7 @@ namespace DSPRE {
                 int maxFrames = LoadTrainerClassPic(trainerClassListBox.SelectedIndex);
                 UpdateTrainerClassPic(trainerClassPicBox);
 
-                trClassFramePreviewUpDown.Maximum = maxFrames - 1;
+                trClassFramePreviewUpDown.Maximum = maxFrames;
                 trainerClassFrameMaxLabel.Text = "/" + maxFrames;
             } catch {
                 trClassFramePreviewUpDown.Maximum = 0;
@@ -8234,7 +8017,6 @@ namespace DSPRE {
             if (disableHandlers) {
                 return;
             }
-            currentTrainerFile.trp.trainerClass = (byte)trainerClassListBox.SelectedIndex;
         }
 
         private int LoadTrainerClassPic(int trClassID) {
@@ -8356,6 +8138,7 @@ namespace DSPRE {
         private void exportPartyButton_Click(object sender, EventArgs e) {
             currentTrainerFile.party.exportCondensedData = true;
             currentTrainerFile.party.SaveToFileExplorePath("G4 Party Data " + trainerComboBox.SelectedItem);
+            currentTrainerFile.party.exportCondensedData = false;
         }
 
         private void importReplacePartyButton_Click(object sender, EventArgs e) {
@@ -8392,7 +8175,10 @@ namespace DSPRE {
             string newName = trainerClassNameTextbox.Text;
             UpdateCurrentTrainerClassName(newName);
             trainerClassListBox.Items[selectedTrClass] = "[" + selectedTrClass.ToString("D3") + "]" + " " + newName;
-            UpdateCurrentTrainerShownName();
+
+            if (currentTrainerFile.trp.trainerClass == trainerClassListBox.SelectedIndex) { 
+                UpdateCurrentTrainerShownName();
+            }
             disableHandlers = false;
 
             //trainerClassListBox_SelectedIndexChanged(null, null);
diff --git a/DS_Map/Main Window.resx b/DS_Map/Main Window.resx
index 8e8e6b9..c9a1fdd 100644
--- a/DS_Map/Main Window.resx	
+++ b/DS_Map/Main Window.resx	
@@ -117,6 +117,96 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <metadata name="mainTabImageList.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>239, 17</value>
+  </metadata>
+  <data name="mainTabImageList.ImageStream" mimetype="application/x-microsoft.net.object.binary.base64">
+    <value>
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
+        LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
+        ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACM
+        EgAAAk1TRnQBSQFMAgEBCgEAAbgBGAG4ARgBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+        AwABQAMAATADAAEBAQABCAYAAQwYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
+        AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
+        AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
+        AWYDAAGZAwABzAIAATMDAAIzAgABMwFmAgABMwGZAgABMwHMAgABMwH/AgABZgMAAWYBMwIAAmYCAAFm
+        AZkCAAFmAcwCAAFmAf8CAAGZAwABmQEzAgABmQFmAgACmQIAAZkBzAIAAZkB/wIAAcwDAAHMATMCAAHM
+        AWYCAAHMAZkCAALMAgABzAH/AgAB/wFmAgAB/wGZAgAB/wHMAQABMwH/AgAB/wEAATMBAAEzAQABZgEA
+        ATMBAAGZAQABMwEAAcwBAAEzAQAB/wEAAf8BMwIAAzMBAAIzAWYBAAIzAZkBAAIzAcwBAAIzAf8BAAEz
+        AWYCAAEzAWYBMwEAATMCZgEAATMBZgGZAQABMwFmAcwBAAEzAWYB/wEAATMBmQIAATMBmQEzAQABMwGZ
+        AWYBAAEzApkBAAEzAZkBzAEAATMBmQH/AQABMwHMAgABMwHMATMBAAEzAcwBZgEAATMBzAGZAQABMwLM
+        AQABMwHMAf8BAAEzAf8BMwEAATMB/wFmAQABMwH/AZkBAAEzAf8BzAEAATMC/wEAAWYDAAFmAQABMwEA
+        AWYBAAFmAQABZgEAAZkBAAFmAQABzAEAAWYBAAH/AQABZgEzAgABZgIzAQABZgEzAWYBAAFmATMBmQEA
+        AWYBMwHMAQABZgEzAf8BAAJmAgACZgEzAQADZgEAAmYBmQEAAmYBzAEAAWYBmQIAAWYBmQEzAQABZgGZ
+        AWYBAAFmApkBAAFmAZkBzAEAAWYBmQH/AQABZgHMAgABZgHMATMBAAFmAcwBmQEAAWYCzAEAAWYBzAH/
+        AQABZgH/AgABZgH/ATMBAAFmAf8BmQEAAWYB/wHMAQABzAEAAf8BAAH/AQABzAEAApkCAAGZATMBmQEA
+        AZkBAAGZAQABmQEAAcwBAAGZAwABmQIzAQABmQEAAWYBAAGZATMBzAEAAZkBAAH/AQABmQFmAgABmQFm
+        ATMBAAGZATMBZgEAAZkBZgGZAQABmQFmAcwBAAGZATMB/wEAApkBMwEAApkBZgEAA5kBAAKZAcwBAAKZ
+        Af8BAAGZAcwCAAGZAcwBMwEAAWYBzAFmAQABmQHMAZkBAAGZAswBAAGZAcwB/wEAAZkB/wIAAZkB/wEz
+        AQABmQHMAWYBAAGZAf8BmQEAAZkB/wHMAQABmQL/AQABzAMAAZkBAAEzAQABzAEAAWYBAAHMAQABmQEA
+        AcwBAAHMAQABmQEzAgABzAIzAQABzAEzAWYBAAHMATMBmQEAAcwBMwHMAQABzAEzAf8BAAHMAWYCAAHM
+        AWYBMwEAAZkCZgEAAcwBZgGZAQABzAFmAcwBAAGZAWYB/wEAAcwBmQIAAcwBmQEzAQABzAGZAWYBAAHM
+        ApkBAAHMAZkBzAEAAcwBmQH/AQACzAIAAswBMwEAAswBZgEAAswBmQEAA8wBAALMAf8BAAHMAf8CAAHM
+        Af8BMwEAAZkB/wFmAQABzAH/AZkBAAHMAf8BzAEAAcwC/wEAAcwBAAEzAQAB/wEAAWYBAAH/AQABmQEA
+        AcwBMwIAAf8CMwEAAf8BMwFmAQAB/wEzAZkBAAH/ATMBzAEAAf8BMwH/AQAB/wFmAgAB/wFmATMBAAHM
+        AmYBAAH/AWYBmQEAAf8BZgHMAQABzAFmAf8BAAH/AZkCAAH/AZkBMwEAAf8BmQFmAQAB/wKZAQAB/wGZ
+        AcwBAAH/AZkB/wEAAf8BzAIAAf8BzAEzAQAB/wHMAWYBAAH/AcwBmQEAAf8CzAEAAf8BzAH/AQAC/wEz
+        AQABzAH/AWYBAAL/AZkBAAL/AcwBAAJmAf8BAAFmAf8BZgEAAWYC/wEAAf8CZgEAAf8BZgH/AQAC/wFm
+        AQABIQEAAaUBAANfAQADdwEAA4YBAAOWAQADywEAA7IBAAPXAQAD3QEAA+MBAAPqAQAD8QEAA/gBAAHw
+        AfsB/wEAAaQCoAEAA4ADAAH/AgAB/wMAAv8BAAH/AwAB/wEAAf8BAAL/AgAD/xMABLwEAAS8KwAGvAIA
+        BOkBvAMABOkBvCoAASYBHgQAArwBAATpBAAE6QG8KgABJgEeAgABJgEeAQABvAEAAukBvAIABLwBAALp
+        AbwtAAG8ASYBHgMAAukBvAEABAsCvALpAbwsAAEmAR4CAAG8AgAC6QG8AgsBvAEAAgsBvALpAbwmAAO8
+        AgABJgEeAgABvAMAAukBvAILArwCCwEAAukBvCUAAc0BCgEAAbwBAAEmAR4BAAHsAwABvAEAAukBvAUL
+        AgAC6QG8JQABzQEKAQACvAEmAR4BAAESArwBAAG8AQAC6QG8AgsCvAMAAukBvCQAAc0BCgMAAbwBAAEm
+        AR4GAALpAbwBAAILA7wBAALpAbwkAAHNAQoBEgHsAQABEgG8CAAC6QG8AgADCwIAAukBvCQAAc0BCgES
+        AgABEgG8CAAC6QO8BAABvALpAbwjAAHNAQoBAAG8AwABvAgABOkBvAMABOkBvAEAAbwhAAHNAQoBAAG8
+        AwAB7AG8BwAE6QQABOkBGwExAZkhAAFlGwADMT0AARsBMQEbKQAB7AESAe8FAAH0EQAKEhgAAvMC6wHv
+        AewB6wHzBQAB6gH0BQAC8gH0BgADEgZKAxIUAAHzAfEBvALsAQcBvAEHAewB6wEHBAABDgESAe0EAAHw
+        ASIBKQHrAfMFAAESAkoGbgJKARIDAAEPBwABDwUAAQ8BAAG8AfcB7QGSAe8BvAEHAfAB9AHyAesB6gQA
+        AQ4BbQHtAwABBwEjAisBKgHrAfMDAAESAUoBbgFKBm4BSgFuAUoBEgEAAQ8J7wEPAwAB7wIAAW0C9wHw
+        AbwB8wLyAvQB7QHrAQcDAAEHARUB6gPtASkBKwElAR8BJQEqAesB9AIAARIBSgFuAUoGkwFKAW4BSgES
+        AgAB7wEBAR8G7wMAAu8CAAG8Ae8B8QH0AfYB8gLwAfQB9gHvAewBbQMAAfQBEAHrAUoBMAEDASUBFwH5
+        AiABJQEqAeoCAAESAUoBkwFuBkkBbgGTAUoBEgIAAe8CAQEfBe8BAAIPAu8CAAHyAe8C9gH3AW0B6wHy
+        AfQB9gHzAesB7AEHAgAB9AEQAXMBRQEkASAB+QEXAfkBIAEfASABMQEiAfQBAAESAZMBbgFJBmwBSQFu
+        AZMBEgIAAe8BAQEfBu8DAALvAwAB7wHzAbwBkgHwAfcB9gH3Ae0BBwHrAewB7wMAAfIBEQFFAR8CIAH5
+        ARcB+QEgAR8BMQEiAfQBAAESAZMBSQJsBHECbAFJAZMBEgEAAQ8J7wEPAwAB7wMAAQcB8AFEASUBGgKS
+        AfIC8wH0ARIB6wHyAgAB8gFDAewBRQEfASAB+QEXASYBMQE3ATABFAIAAUkBbgFsAXEBlwRxAZcBcQFs
+        AW4BEgIAAQ8HAAEPBQABDwIAAfQBbQEsASUB6wH0AvEC7wHyAusBvAIAAfMBbQHrAUUBHwIgAfkBMQFR
+        Am0B8wIAAUkCbAGXAnEClwJxAZcCbAFJAgABFQEPARUDAAEVAQ8BFQgAARwBLAErAeoBBwG8Au8B9AK8
+        AfMCbQMAAfABEwFFAR8BJAIrAVEBvAUAAUkBbAJxBpcCcQFsAUkBAAEVAfcBBwH3ARUBAAEVAfcBBwH3
+        ARUGAAHvAisBSwHvAQcBvAHxBAcB9AGLAeoDAAHwAREBSwEkASMBAwFKAfAHAAFsAXEDlwJ4A5cBcQFs
+        AgABDwEHAQABBwEPAQABDwEHAQABBwEPBQAB7wErASwBRQK8AQcB7wEHAbwB8AEZAtsBbAEHAwAB8AEj
+        AisBDgHwAfEIAAFJAXEClwF4BZcBcQFJAgABFQH3AQcB9wEVAQABFQH3AQcB9wEVBQABEgEsAUUB8gHz
+        Ae8B8gHxAbsC2gGzAosB8wQAAfABIwE3ATEBDgsAAUkBcQKXAXgDlwFxAUkEAAEVAQ8BFQMAARUBDwEV
+        BwABEgG8AgABBwGzAdQBswJsAe8IAAHvAg4B8wwAAWwBcQSXAXEBbBkAAQcCEgG8HQAEcRcAAfQL8wH0
+        EwAN8xMAAQcL7wEHAgAPEAEAAQcNswEHBwAEQwcAAe8BAAG7BrMBuwIAAe8CAAEQBjgBEAbTARABAAGz
+        DQABswUAAkME8AJDBQAB7wEAAbMGAAGzAgAB7wIAARACOAMAATgBEALTAgAC0wEQAQABsw0AAbMEAAFD
+        CPABQwQAAe8BAAGtAQABlwJWAZcBAAGzAgAB7wIAARADOAEAAjgBEAHTAQAC0wEAAdMBEAEAAbMBAAFW
+        CVABVgEAAbMDAAFDA/ABkgJDAZID8AFDAwAB7wEAAa0BAARWAQABswH0AQAB7wIAARACOAIAAjgBEAHT
+        AQAC0wEAAdMBEAEAAbMBAAtWAQABswMAAUMB8AGSARIBQwHwAZIBQwESAZIB8AFDAwAB7wEAAa0BAARW
+        AQABswH0AQAB7wIAARADOAEAAjgBEALTAgAC0wEQAQABswEAC1YBAAGzAgABQwHwARICYwFDAQAB8AFD
+        AmMBEgHwAUMCAAHvAQABrQEABHgBAAGzAfQBAAHvAgABEAY4ARAG0wEQAQABswEAC1YBAAGzAgABQwES
+        BEcCQwRHARIBQwIAAe8BAAGtBgABswHzAQAB7wIADxABAAGzAQALVgEAAbMCAAFDDEcBQwIAAe8BAAG7
+        Aq0EswG7AfMBAAHvAgABEAZHARAGAAEQAQABswEAC1YBAAGzAgABQwxHAUMCAAHvAQAB8wP0AfMB9AQA
+        Ae8CAAEQAkcCAAJHARAGAAEQAQABswEAC1YBAAGzAwABQwJHApQGRwFDAwAB7wEAAXQCMgEsAXQBAAG8
+        AvcBAAHvAgABEAFHAQACRwEAAUcBEAYAARABAAGzAQABVgl4AVYBAAGzAwABQwFHBJQFRwFDAwAB7wEA
+        ASwDwwFTAQAB9wIAAfMB8AIAARABRwEAAkcBAAFHARAGAAEQAQABswEAC3gBAAGzBAABQwSUBEcBQwQA
+        Ae8BAAF0AywBdAEAAfcBAAHzAfADAAEQAkcCAAJHARAGAAEQAQABswEAC3gBAAGzBQACQwGUA0cCQwUA
+        Ae8IAAHzAfAEAAEQBkcBEAYAARABAAGzDQABswcABEMHAAEHCO8BBwUADxABAAEJDbMBCREAAUIBTQE+
+        BwABPgMAASgDAAFAAwABMAMAAQEBAAEBBQABgAEBFgAD/wEAAv8CwwQAAf8BgQKDBAAB/wEAAYcBgwQA
+        Af8BMAGMASMEAAH/AeEBiAEDBAAB/wHBAYEBAwQAAfEBgwGAASMEAAHhAQ4BgAFjBAAB4AEAAYAB4wQA
+        AcABgQGIASMEAAHAAX8BjAFjBAABxAF/AYMBwwQAAYQBfwGDAYIEAAGEAT8BhwGABAABjAF/Af8B+AQA
+        A/8B+AQAAf8BjwG/Af8B4AEHAv8B+AEHAo8BwAEDAv8BwAEHAY8BBwHAAQMBgAE8AYABBwGOAQMBgAEB
+        AQABGAGAAQMBgAEBAYABAQIAAYABAwGAAQEBgAEBAgABgAEBAYABAAGAAQECAAHAAQEBwAEAAYABAQEA
+        ARgBwAEAAcABAQGAAQEBgAE8AcABAAHAAQEBgAEBAY4BPwHAAQAB4AEPAYABAQEEAR8BgAEAAeABHwHA
+        AQMBJAGfAgAB4AE/AcABAwEEAR8BAAEBAeAB/wHgAQcBjgE/AZgBDwHwAf8B8AEPAv8B+AF/Av8B/AE/
+        Av8BgAEDAv8BgAEDAv8BgAEDAQABAQEAAQEB/AE/AaABGwEAAQEBfwH9AfABDwGvAdsBAAExAX8B/QHg
+        AQcBqAFbAQABSQFAAQUBwAEDAagBSwEAAUkBQAEFAcABAwGoAUsBAAExAUABBQGBAQEBqAFLAQABAQFA
+        AQUBgAEBAa8BywEAAQEBQAEFAYABAQGgAQsBAAH9AUABBQGAAQEBoAF7ARgBxQFAAQUBwAEDAaABiwEk
+        Ae0BQAEFAcABAwGgAbMBJAHNAUABBQHgAQcBoAGnARgB7QFAAQUB8AEPAb8BzwEAAf0BfwH9AfwBPwGA
+        AR8BAAEBAQABAQL/Cw==
+</value>
+  </data>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="worldmapCoordsPasteButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
@@ -789,6 +879,45 @@
   <metadata name="ImportBTN.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="DistanceGVCol.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="VertRotGVCol.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="HoriRotGVCol.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="zRotGVCol.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="OrthoGVCol.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="FovGVCol.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="NearClipGVCol.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="FarClipGVCol.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="XDispGVCol.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="YDispGVCol.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="ZDispGVCol.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="ExportBTN.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="ImportBTN.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <data name="importReplacePartyButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAACAAAAAQCAYAAAB3AH1ZAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
@@ -933,96 +1062,6 @@
         p3S+M+m1V1me9QgCUQNXX2YRT1sYHBiEP3wHVbp3PF3cB40GbrzN86xHENrScf1NDsl8FaI4jODMHOgS
         SOacfYAmbr5XeNYjGH7yDReXv+JeNIUhUYwFpmZjDz+nMLf5B3b2rcZ5tju4ntjtFw4T54j+v2g/t9NH
         9AiCIPwGJelqUAd/T3AAAAAASUVORK5CYII=
-</value>
-  </data>
-  <metadata name="mainTabImageList.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>239, 17</value>
-  </metadata>
-  <data name="mainTabImageList.ImageStream" mimetype="application/x-microsoft.net.object.binary.base64">
-    <value>
-        AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
-        LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
-        ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACM
-        EgAAAk1TRnQBSQFMAgEBCgEAAaABGAGgARgBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
-        AwABQAMAATADAAEBAQABCAYAAQwYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
-        AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
-        AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
-        AWYDAAGZAwABzAIAATMDAAIzAgABMwFmAgABMwGZAgABMwHMAgABMwH/AgABZgMAAWYBMwIAAmYCAAFm
-        AZkCAAFmAcwCAAFmAf8CAAGZAwABmQEzAgABmQFmAgACmQIAAZkBzAIAAZkB/wIAAcwDAAHMATMCAAHM
-        AWYCAAHMAZkCAALMAgABzAH/AgAB/wFmAgAB/wGZAgAB/wHMAQABMwH/AgAB/wEAATMBAAEzAQABZgEA
-        ATMBAAGZAQABMwEAAcwBAAEzAQAB/wEAAf8BMwIAAzMBAAIzAWYBAAIzAZkBAAIzAcwBAAIzAf8BAAEz
-        AWYCAAEzAWYBMwEAATMCZgEAATMBZgGZAQABMwFmAcwBAAEzAWYB/wEAATMBmQIAATMBmQEzAQABMwGZ
-        AWYBAAEzApkBAAEzAZkBzAEAATMBmQH/AQABMwHMAgABMwHMATMBAAEzAcwBZgEAATMBzAGZAQABMwLM
-        AQABMwHMAf8BAAEzAf8BMwEAATMB/wFmAQABMwH/AZkBAAEzAf8BzAEAATMC/wEAAWYDAAFmAQABMwEA
-        AWYBAAFmAQABZgEAAZkBAAFmAQABzAEAAWYBAAH/AQABZgEzAgABZgIzAQABZgEzAWYBAAFmATMBmQEA
-        AWYBMwHMAQABZgEzAf8BAAJmAgACZgEzAQADZgEAAmYBmQEAAmYBzAEAAWYBmQIAAWYBmQEzAQABZgGZ
-        AWYBAAFmApkBAAFmAZkBzAEAAWYBmQH/AQABZgHMAgABZgHMATMBAAFmAcwBmQEAAWYCzAEAAWYBzAH/
-        AQABZgH/AgABZgH/ATMBAAFmAf8BmQEAAWYB/wHMAQABzAEAAf8BAAH/AQABzAEAApkCAAGZATMBmQEA
-        AZkBAAGZAQABmQEAAcwBAAGZAwABmQIzAQABmQEAAWYBAAGZATMBzAEAAZkBAAH/AQABmQFmAgABmQFm
-        ATMBAAGZATMBZgEAAZkBZgGZAQABmQFmAcwBAAGZATMB/wEAApkBMwEAApkBZgEAA5kBAAKZAcwBAAKZ
-        Af8BAAGZAcwCAAGZAcwBMwEAAWYBzAFmAQABmQHMAZkBAAGZAswBAAGZAcwB/wEAAZkB/wIAAZkB/wEz
-        AQABmQHMAWYBAAGZAf8BmQEAAZkB/wHMAQABmQL/AQABzAMAAZkBAAEzAQABzAEAAWYBAAHMAQABmQEA
-        AcwBAAHMAQABmQEzAgABzAIzAQABzAEzAWYBAAHMATMBmQEAAcwBMwHMAQABzAEzAf8BAAHMAWYCAAHM
-        AWYBMwEAAZkCZgEAAcwBZgGZAQABzAFmAcwBAAGZAWYB/wEAAcwBmQIAAcwBmQEzAQABzAGZAWYBAAHM
-        ApkBAAHMAZkBzAEAAcwBmQH/AQACzAIAAswBMwEAAswBZgEAAswBmQEAA8wBAALMAf8BAAHMAf8CAAHM
-        Af8BMwEAAZkB/wFmAQABzAH/AZkBAAHMAf8BzAEAAcwC/wEAAcwBAAEzAQAB/wEAAWYBAAH/AQABmQEA
-        AcwBMwIAAf8CMwEAAf8BMwFmAQAB/wEzAZkBAAH/ATMBzAEAAf8BMwH/AQAB/wFmAgAB/wFmATMBAAHM
-        AmYBAAH/AWYBmQEAAf8BZgHMAQABzAFmAf8BAAH/AZkCAAH/AZkBMwEAAf8BmQFmAQAB/wKZAQAB/wGZ
-        AcwBAAH/AZkB/wEAAf8BzAIAAf8BzAEzAQAB/wHMAWYBAAH/AcwBmQEAAf8CzAEAAf8BzAH/AQAC/wEz
-        AQABzAH/AWYBAAL/AZkBAAL/AcwBAAJmAf8BAAFmAf8BZgEAAWYC/wEAAf8CZgEAAf8BZgH/AQAC/wFm
-        AQABIQEAAaUBAANfAQADdwEAA4YBAAOWAQADywEAA7IBAAPXAQAD3QEAA+MBAAPqAQAD8QEAA/gBAAHw
-        AfsB/wEAAaQCoAEAA4ADAAH/AgAB/wMAAv8BAAH/AwAB/wEAAf8BAAL/AgAD/xMABLwEAAS8KwAGvAIA
-        BOkBvAMABOkBvCoAASYBHgQAArwBAATpBAAE6QG8KgABJgEeAgABJgEeAQABvAEAAukBvAIABLwBAALp
-        AbwtAAG8ASYBHgMAAukBvAEABAsCvALpAbwsAAEmAR4CAAG8AgAC6QG8AgsBvAEAAgsBvALpAbwmAAO8
-        AgABJgEeAgABvAMAAukBvAILArwCCwEAAukBvCUAAc0BCgEAAbwBAAEmAR4BAAHsAwABvAEAAukBvAUL
-        AgAC6QG8JQABzQEKAQACvAEmAR4BAAESArwBAAG8AQAC6QG8AgsCvAMAAukBvCQAAc0BCgMAAbwBAAEm
-        AR4GAALpAbwBAAILA7wBAALpAbwkAAHNAQoBEgHsAQABEgG8CAAC6QG8AgADCwIAAukBvCQAAc0BCgES
-        AgABEgG8CAAC6QO8BAABvALpAbwjAAHNAQoBAAG8AwABvAgABOkBvAMABOkBvAEAAbwhAAHNAQoBAAG8
-        AwAB7AG8BwAE6QQABOkBGwExAZkhAAFlGwADMT0AARsBMQEbKQAB7AESAe8FAAH0EQAKEhgAAvMC6wHv
-        AewB6wHzBQAB6gH0BQAC8gH0BgADEgZKAxIUAAHzAfEBvALsAQcBvAEHAewB6wEHBAABDgESAe0EAAHw
-        ASIBKQHrAfMFAAESAkoGbgJKARIDAAEPBwABDwUAAQ8BAAG8AfcB7QGSAe8BvAEHAfAB9AHyAesB6gQA
-        AQ4BbQHtAwABBwEjAisBKgHrAfMDAAESAUoBbgFKBm4BSgFuAUoBEgEAAQ8J7wEPAwAB7wIAAW0C9wHw
-        AbwB8wLyAvQB7QHrAQcDAAEHARUB6gPtASkBKwElAR8BJQEqAesB9AIAARIBSgFuAUoGkwFKAW4BSgES
-        AgAB7wEBAR8G7wMAAu8CAAG8Ae8B8QH0AfYB8gLwAfQB9gHvAewBbQMAAfQBEAHrAUoBMAEDASUBFwH5
-        AiABJQEqAeoCAAESAUoBkwFuBkkBbgGTAUoBEgIAAe8CAQEfBe8BAAIPAu8CAAHyAe8C9gH3AW0B6wHy
-        AfQB9gHzAesB7AEHAgAB9AEQAXMBRQEkASAB+QEXAfkBIAEfASABMQEiAfQBAAESAZMBbgFJBmwBSQFu
-        AZMBEgIAAe8BAQEfBu8DAALvAwAB7wHzAbwBkgHwAfcB9gH3Ae0BBwHrAewB7wMAAfIBEQFFAR8CIAH5
-        ARcB+QEgAR8BMQEiAfQBAAESAZMBSQJsBHECbAFJAZMBEgEAAQ8J7wEPAwAB7wMAAQcB8AFEASUBGgKS
-        AfIC8wH0ARIB6wHyAgAB8gFDAewBRQEfASAB+QEXASYBMQE3ATABFAIAAUkBbgFsAXEBlwRxAZcBcQFs
-        AW4BEgIAAQ8HAAEPBQABDwIAAfQBbQEsASUB6wH0AvEC7wHyAusBvAIAAfMBbQHrAUUBHwIgAfkBMQFR
-        Am0B8wIAAUkCbAGXAnEClwJxAZcCbAFJAgABFQEPARUDAAEVAQ8BFQgAARwBLAErAeoBBwG8Au8B9AK8
-        AfMCbQMAAfABEwFFAR8BJAIrAVEBvAUAAUkBbAJxBpcCcQFsAUkBAAEVAfcBBwH3ARUBAAEVAfcBBwH3
-        ARUGAAHvAisBSwHvAQcBvAHxBAcB9AGLAeoDAAHwAREBSwEkASMBAwFKAfAHAAFsAXEDlwJ4A5cBcQFs
-        AgABDwEHAQABBwEPAQABDwEHAQABBwEPBQAB7wErASwBRQK8AQcB7wEHAbwB8AEZAtsBbAEHAwAB8AEj
-        AisBDgHwAfEIAAFJAXEClwF4BZcBcQFJAgABFQH3AQcB9wEVAQABFQH3AQcB9wEVBQABEgEsAUUB8gHz
-        Ae8B8gHxAbsC2gGzAosB8wQAAfABIwE3ATEBDgsAAUkBcQKXAXgDlwFxAUkEAAEVAQ8BFQMAARUBDwEV
-        BwABEgG8AgABBwGzAdQBswJsAe8IAAHvAg4B8wwAAWwBcQSXAXEBbBkAAQcCEgG8HQAEcRcAAfQL8wH0
-        EwAN8xMAAQcL7wEHAgAPEAEAAQcNswEHBwAEQwcAAe8BAAG7BrMBuwIAAe8CAAEQBjgBEAbTARABAAGz
-        DQABswUAAkME8AJDBQAB7wEAAbMGAAGzAgAB7wIAARACOAMAATgBEALTAgAC0wEQAQABsw0AAbMEAAFD
-        CPABQwQAAe8BAAGtAQABlwJWAZcBAAGzAgAB7wIAARADOAEAAjgBEAHTAQAC0wEAAdMBEAEAAbMBAAFW
-        CVABVgEAAbMDAAFDA/ABkgJDAZID8AFDAwAB7wEAAa0BAARWAQABswH0AQAB7wIAARACOAIAAjgBEAHT
-        AQAC0wEAAdMBEAEAAbMBAAtWAQABswMAAUMB8AGSARIBQwHwAZIBQwESAZIB8AFDAwAB7wEAAa0BAARW
-        AQABswH0AQAB7wIAARADOAEAAjgBEALTAgAC0wEQAQABswEAC1YBAAGzAgABQwHwARICYwFDAQAB8AFD
-        AmMBEgHwAUMCAAHvAQABrQEABHgBAAGzAfQBAAHvAgABEAY4ARAG0wEQAQABswEAC1YBAAGzAgABQwES
-        BEcCQwRHARIBQwIAAe8BAAGtBgABswHzAQAB7wIADxABAAGzAQALVgEAAbMCAAFDDEcBQwIAAe8BAAG7
-        Aq0EswG7AfMBAAHvAgABEAZHARAGAAEQAQABswEAC1YBAAGzAgABQwxHAUMCAAHvAQAB8wP0AfMB9AQA
-        Ae8CAAEQAkcCAAJHARAGAAEQAQABswEAC1YBAAGzAwABQwJHApQGRwFDAwAB7wEAAXQCMgEsAXQBAAG8
-        AvcBAAHvAgABEAFHAQACRwEAAUcBEAYAARABAAGzAQABVgl4AVYBAAGzAwABQwFHBJQFRwFDAwAB7wEA
-        ASwDwwFTAQAB9wIAAfMB8AIAARABRwEAAkcBAAFHARAGAAEQAQABswEAC3gBAAGzBAABQwSUBEcBQwQA
-        Ae8BAAF0AywBdAEAAfcBAAHzAfADAAEQAkcCAAJHARAGAAEQAQABswEAC3gBAAGzBQACQwGUA0cCQwUA
-        Ae8IAAHzAfAEAAEQBkcBEAYAARABAAGzDQABswcABEMHAAEHCO8BBwUADxABAAEJDbMBCREAAUIBTQE+
-        BwABPgMAASgDAAFAAwABMAMAAQEBAAEBBQABgAEBFgAD/wEAAv8CwwQAAf8BgQKDBAAB/wEAAYcBgwQA
-        Af8BMAGMASMEAAH/AeEBiAEDBAAB/wHBAYEBAwQAAfEBgwGAASMEAAHhAQ4BgAFjBAAB4AEAAYAB4wQA
-        AcABgQGIASMEAAHAAX8BjAFjBAABxAF/AYMBwwQAAYQBfwGDAYIEAAGEAT8BhwGABAABjAF/Af8B+AQA
-        A/8B+AQAAf8BjwG/Af8B4AEHAv8B+AEHAo8BwAEDAv8BwAEHAY8BBwHAAQMBgAE8AYABBwGOAQMBgAEB
-        AQABGAGAAQMBgAEBAYABAQIAAYABAwGAAQEBgAEBAgABgAEBAYABAAGAAQECAAHAAQEBwAEAAYABAQEA
-        ARgBwAEAAcABAQGAAQEBgAE8AcABAAHAAQEBgAEBAY4BPwHAAQAB4AEPAYABAQEEAR8BgAEAAeABHwHA
-        AQMBJAGfAgAB4AE/AcABAwEEAR8BAAEBAeAB/wHgAQcBjgE/AZgBDwHwAf8B8AEPAv8B+AF/Av8B/AE/
-        Av8BgAEDAv8BgAEDAv8BgAEDAQABAQEAAQEB/AE/AaABGwEAAQEBfwH9AfABDwGvAdsBAAExAX8B/QHg
-        AQcBqAFbAQABSQFAAQUBwAEDAagBSwEAAUkBQAEFAcABAwGoAUsBAAExAUABBQGBAQEBqAFLAQABAQFA
-        AQUBgAEBAa8BywEAAQEBQAEFAYABAQGgAQsBAAH9AUABBQGAAQEBoAF7ARgBxQFAAQUBwAEDAaABiwEk
-        Ae0BQAEFAcABAwGgAbMBJAHNAUABBQHgAQcBoAGnARgB7QFAAQUB8AEPAb8BzwEAAf0BfwH9AfwBPwGA
-        AR8BAAEBAQABAQL/Cw==
 </value>
   </data>
   <metadata name="menuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
@@ -1034,6 +1073,9 @@
   <metadata name="mainToolStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>386, 19</value>
   </metadata>
+  <metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>533, 20</value>
+  </metadata>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>35</value>
   </metadata>
diff --git a/DS_Map/ROMFiles/RomFile.cs b/DS_Map/ROMFiles/RomFile.cs
index 0816e64..b5225d7 100644
--- a/DS_Map/ROMFiles/RomFile.cs
+++ b/DS_Map/ROMFiles/RomFile.cs
@@ -29,10 +29,13 @@ namespace DSPRE.ROMFiles {
                 Filter = fileType + ' ' + "(*." + fileExtension + '|' + "(*." + fileExtension
             };
 
-            if (!string.IsNullOrEmpty(suggestedFileName))
+            if (!string.IsNullOrEmpty(suggestedFileName)) {
                 sf.FileName = suggestedFileName;
-            if (sf.ShowDialog() != DialogResult.OK)
+            }
+
+            if (sf.ShowDialog() != DialogResult.OK) {
                 return;
+            }
 
             this.SaveToFile(sf.FileName, showSuccessMessage);
         }
diff --git a/DS_Map/ROMFiles/TrainerFile.cs b/DS_Map/ROMFiles/TrainerFile.cs
index f16cea7..7eec946 100644
--- a/DS_Map/ROMFiles/TrainerFile.cs
+++ b/DS_Map/ROMFiles/TrainerFile.cs
@@ -154,6 +154,8 @@ namespace DSPRE.ROMFiles {
         private PartyPokemon[] content;
         private TrainerProperties trp;
         public bool exportCondensedData;
+
+        public const int MOVES_PER_POKE = 4;
         public Party(int POKE_IN_PARTY, bool init, TrainerProperties trp) {
             this.trp = trp;
             this.content = new PartyPokemon[POKE_IN_PARTY];
@@ -178,10 +180,9 @@ namespace DSPRE.ROMFiles {
                     }
 
                     int dividend = 8;
-                    int nMoves = 4;
 
                     if (trp.hasMoves) {
-                        dividend += nMoves * sizeof(ushort);
+                        dividend += Party.MOVES_PER_POKE * sizeof(ushort);
                     }
                     if (trp.hasItems) {
                         dividend += sizeof(ushort);
@@ -204,7 +205,6 @@ namespace DSPRE.ROMFiles {
                         //BITS 0 - 6 --> form ID ??? Even numbers only??? 
                         ushort pokemon = (ushort)(reader.ReadUInt16() & (ushort.MaxValue>>7)); 
                         
-
                         ushort? heldItem = null;
                         ushort[] moves = null;
 
@@ -212,10 +212,10 @@ namespace DSPRE.ROMFiles {
                             heldItem = reader.ReadUInt16();
                         }
                         if (trp.hasMoves) {
-                            moves = new ushort[4];
+                            moves = new ushort[MOVES_PER_POKE];
                             for (int m = 0; m < moves.Length; m++) {
                                 ushort val = reader.ReadUInt16();
-                                moves[m] = (ushort)(val == 0xFFFF ? 0 : val);
+                                moves[m] = (ushort)(val == ushort.MaxValue ? 0 : val);
                             }
                         }
 
diff --git a/DS_Map/Resources/ScriptDatabase.cs b/DS_Map/Resources/ScriptDatabase.cs
index e828a3d..e9fdd4c 100644
--- a/DS_Map/Resources/ScriptDatabase.cs
+++ b/DS_Map/Resources/ScriptDatabase.cs
@@ -1449,6 +1449,8 @@ namespace DSPRE.Resources {
 
             [0x0320] = "PortalAnimation",
 
+            [0x032B] = "CheckEventRegigigas",
+
             //International release exclusive
             [0x033C] = "TextItemLowercase",
             [0x0346] = "TextCapitalize",