diff --git a/DS_Map/Main Window.Designer.cs b/DS_Map/Main Window.Designer.cs index e3c01a0..f3ef0b9 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 dataGridViewCellStyle91 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle92 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle93 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle94 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle95 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle96 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle97 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle98 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle99 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle100 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle101 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle102 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle103 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle104 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle105 = 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.worldmapCoordsGroupBox = new System.Windows.Forms.GroupBox(); @@ -460,7 +460,7 @@ this.scriptEditorTabPage = new System.Windows.Forms.TabPage(); this.groupBox8 = new System.Windows.Forms.GroupBox(); this.scriptCmdSearchCaseSensitiveCheckBox = new System.Windows.Forms.CheckBox(); - this.searchInScriptsUpDown = new System.Windows.Forms.TextBox(); + this.searchInScriptsTextBox = new System.Windows.Forms.TextBox(); this.label31 = new System.Windows.Forms.Label(); this.searchProgressBar = new System.Windows.Forms.ProgressBar(); this.label30 = new System.Windows.Forms.Label(); @@ -1202,7 +1202,7 @@ // areaDataLabel // this.areaDataLabel.AutoSize = true; - this.areaDataLabel.Location = new System.Drawing.Point(11, 80); + this.areaDataLabel.Location = new System.Drawing.Point(10, 80); this.areaDataLabel.Name = "areaDataLabel"; this.areaDataLabel.Size = new System.Drawing.Size(56, 13); this.areaDataLabel.TabIndex = 27; @@ -1210,7 +1210,7 @@ // // areaDataUpDown // - this.areaDataUpDown.Location = new System.Drawing.Point(14, 98); + this.areaDataUpDown.Location = new System.Drawing.Point(13, 98); this.areaDataUpDown.Maximum = new decimal(new int[] { 255, 0, @@ -1224,7 +1224,7 @@ // matrixLabel // this.matrixLabel.AutoSize = true; - this.matrixLabel.Location = new System.Drawing.Point(11, 23); + this.matrixLabel.Location = new System.Drawing.Point(10, 23); this.matrixLabel.Name = "matrixLabel"; this.matrixLabel.Size = new System.Drawing.Size(53, 13); this.matrixLabel.TabIndex = 25; @@ -1232,7 +1232,7 @@ // // matrixUpDown // - this.matrixUpDown.Location = new System.Drawing.Point(14, 40); + this.matrixUpDown.Location = new System.Drawing.Point(13, 40); this.matrixUpDown.Maximum = new decimal(new int[] { 65535, 0, @@ -1961,7 +1961,7 @@ // flag3CheckBox // this.flag3CheckBox.AutoSize = true; - this.flag3CheckBox.Location = new System.Drawing.Point(15, 30); + this.flag3CheckBox.Location = new System.Drawing.Point(19, 30); this.flag3CheckBox.Name = "flag3CheckBox"; this.flag3CheckBox.Size = new System.Drawing.Size(39, 17); this.flag3CheckBox.TabIndex = 28; @@ -1972,7 +1972,7 @@ // flag2CheckBox // this.flag2CheckBox.AutoSize = true; - this.flag2CheckBox.Location = new System.Drawing.Point(15, 53); + this.flag2CheckBox.Location = new System.Drawing.Point(19, 53); this.flag2CheckBox.Name = "flag2CheckBox"; this.flag2CheckBox.Size = new System.Drawing.Size(76, 17); this.flag2CheckBox.TabIndex = 29; @@ -1983,7 +1983,7 @@ // flag1CheckBox // this.flag1CheckBox.AutoSize = true; - this.flag1CheckBox.Location = new System.Drawing.Point(15, 76); + this.flag1CheckBox.Location = new System.Drawing.Point(19, 76); this.flag1CheckBox.Name = "flag1CheckBox"; this.flag1CheckBox.Size = new System.Drawing.Size(46, 17); this.flag1CheckBox.TabIndex = 30; @@ -1994,7 +1994,7 @@ // flag0CheckBox // this.flag0CheckBox.AutoSize = true; - this.flag0CheckBox.Location = new System.Drawing.Point(15, 100); + this.flag0CheckBox.Location = new System.Drawing.Point(19, 100); this.flag0CheckBox.Name = "flag0CheckBox"; this.flag0CheckBox.Size = new System.Drawing.Size(60, 17); this.flag0CheckBox.TabIndex = 31; @@ -2004,7 +2004,7 @@ // flag7CheckBox // this.flag7CheckBox.AutoSize = true; - this.flag7CheckBox.Location = new System.Drawing.Point(109, 29); + this.flag7CheckBox.Location = new System.Drawing.Point(113, 29); this.flag7CheckBox.Name = "flag7CheckBox"; this.flag7CheckBox.Size = new System.Drawing.Size(15, 14); this.flag7CheckBox.TabIndex = 35; @@ -2015,7 +2015,7 @@ // flag6CheckBox // this.flag6CheckBox.AutoSize = true; - this.flag6CheckBox.Location = new System.Drawing.Point(109, 52); + this.flag6CheckBox.Location = new System.Drawing.Point(113, 52); this.flag6CheckBox.Name = "flag6CheckBox"; this.flag6CheckBox.Size = new System.Drawing.Size(15, 14); this.flag6CheckBox.TabIndex = 32; @@ -2026,7 +2026,7 @@ // flag5CheckBox // this.flag5CheckBox.AutoSize = true; - this.flag5CheckBox.Location = new System.Drawing.Point(109, 75); + this.flag5CheckBox.Location = new System.Drawing.Point(113, 75); this.flag5CheckBox.Name = "flag5CheckBox"; this.flag5CheckBox.Size = new System.Drawing.Size(15, 14); this.flag5CheckBox.TabIndex = 33; @@ -2037,7 +2037,7 @@ // flag4CheckBox // this.flag4CheckBox.AutoSize = true; - this.flag4CheckBox.Location = new System.Drawing.Point(109, 99); + this.flag4CheckBox.Location = new System.Drawing.Point(113, 99); this.flag4CheckBox.Name = "flag4CheckBox"; this.flag4CheckBox.Size = new System.Drawing.Size(15, 14); this.flag4CheckBox.TabIndex = 34; @@ -5832,7 +5832,7 @@ // groupBox8 // this.groupBox8.Controls.Add(this.scriptCmdSearchCaseSensitiveCheckBox); - this.groupBox8.Controls.Add(this.searchInScriptsUpDown); + this.groupBox8.Controls.Add(this.searchInScriptsTextBox); this.groupBox8.Controls.Add(this.label31); this.groupBox8.Controls.Add(this.searchProgressBar); this.groupBox8.Controls.Add(this.label30); @@ -5858,10 +5858,10 @@ // // searchInScriptsUpDown // - this.searchInScriptsUpDown.Location = new System.Drawing.Point(11, 35); - this.searchInScriptsUpDown.Name = "searchInScriptsUpDown"; - this.searchInScriptsUpDown.Size = new System.Drawing.Size(295, 20); - this.searchInScriptsUpDown.TabIndex = 38; + this.searchInScriptsTextBox.Location = new System.Drawing.Point(11, 35); + this.searchInScriptsTextBox.Name = "searchInScriptsUpDown"; + this.searchInScriptsTextBox.Size = new System.Drawing.Size(295, 20); + this.searchInScriptsTextBox.TabIndex = 38; // // label31 // @@ -7522,45 +7522,45 @@ this.headersGridView.AllowUserToDeleteRows = false; this.headersGridView.AllowUserToResizeColumns = false; this.headersGridView.AllowUserToResizeRows = false; - dataGridViewCellStyle91.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.headersGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle91; + dataGridViewCellStyle31.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.headersGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle31; this.headersGridView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.headersGridView.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; - dataGridViewCellStyle92.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle92.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle92.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); - dataGridViewCellStyle92.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle92.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle92.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle92.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.headersGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle92; + dataGridViewCellStyle32.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle32.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle32.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); + dataGridViewCellStyle32.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle32.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle32.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle32.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.headersGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle32; this.headersGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridViewCellStyle93.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle93.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle93.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - dataGridViewCellStyle93.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle93.Format = "D4"; - dataGridViewCellStyle93.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle93.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle93.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.headersGridView.DefaultCellStyle = dataGridViewCellStyle93; + dataGridViewCellStyle33.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle33.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle33.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + dataGridViewCellStyle33.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle33.Format = "D4"; + dataGridViewCellStyle33.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle33.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle33.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.headersGridView.DefaultCellStyle = dataGridViewCellStyle33; this.headersGridView.Location = new System.Drawing.Point(0, 0); this.headersGridView.Name = "headersGridView"; - dataGridViewCellStyle94.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle94.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle94.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); - dataGridViewCellStyle94.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle94.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle94.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle94.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.headersGridView.RowHeadersDefaultCellStyle = dataGridViewCellStyle94; + dataGridViewCellStyle34.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle34.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle34.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); + dataGridViewCellStyle34.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle34.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle34.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle34.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.headersGridView.RowHeadersDefaultCellStyle = dataGridViewCellStyle34; this.headersGridView.RowHeadersWidth = 50; this.headersGridView.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing; - dataGridViewCellStyle95.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle95.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.headersGridView.RowsDefaultCellStyle = dataGridViewCellStyle95; + dataGridViewCellStyle35.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle35.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.headersGridView.RowsDefaultCellStyle = dataGridViewCellStyle35; this.headersGridView.RowTemplate.DefaultCellStyle.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; this.headersGridView.RowTemplate.Height = 18; this.headersGridView.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.False; @@ -7578,45 +7578,45 @@ this.heightsGridView.AllowUserToDeleteRows = false; this.heightsGridView.AllowUserToResizeColumns = false; this.heightsGridView.AllowUserToResizeRows = false; - dataGridViewCellStyle96.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.heightsGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle96; + dataGridViewCellStyle36.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.heightsGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle36; this.heightsGridView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.heightsGridView.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; - dataGridViewCellStyle97.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle97.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle97.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); - dataGridViewCellStyle97.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle97.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle97.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle97.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.heightsGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle97; + dataGridViewCellStyle37.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle37.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle37.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); + dataGridViewCellStyle37.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle37.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle37.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle37.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.heightsGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle37; this.heightsGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridViewCellStyle98.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle98.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle98.Font = new System.Drawing.Font("Tahoma", 8.25F); - dataGridViewCellStyle98.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle98.Format = "D2"; - dataGridViewCellStyle98.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle98.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle98.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.heightsGridView.DefaultCellStyle = dataGridViewCellStyle98; + dataGridViewCellStyle38.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle38.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle38.Font = new System.Drawing.Font("Tahoma", 8.25F); + dataGridViewCellStyle38.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle38.Format = "D2"; + dataGridViewCellStyle38.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle38.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle38.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.heightsGridView.DefaultCellStyle = dataGridViewCellStyle38; this.heightsGridView.Location = new System.Drawing.Point(0, 0); this.heightsGridView.Name = "heightsGridView"; - dataGridViewCellStyle99.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle99.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle99.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); - dataGridViewCellStyle99.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle99.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle99.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle99.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.heightsGridView.RowHeadersDefaultCellStyle = dataGridViewCellStyle99; + dataGridViewCellStyle39.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle39.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle39.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); + dataGridViewCellStyle39.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle39.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle39.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle39.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.heightsGridView.RowHeadersDefaultCellStyle = dataGridViewCellStyle39; this.heightsGridView.RowHeadersWidth = 50; this.heightsGridView.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing; - dataGridViewCellStyle100.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle100.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.heightsGridView.RowsDefaultCellStyle = dataGridViewCellStyle100; + dataGridViewCellStyle40.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle40.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.heightsGridView.RowsDefaultCellStyle = dataGridViewCellStyle40; this.heightsGridView.RowTemplate.DefaultCellStyle.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; this.heightsGridView.RowTemplate.Height = 18; this.heightsGridView.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.False; @@ -7632,45 +7632,45 @@ this.mapFilesGridView.AllowUserToDeleteRows = false; this.mapFilesGridView.AllowUserToResizeColumns = false; this.mapFilesGridView.AllowUserToResizeRows = false; - dataGridViewCellStyle101.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.mapFilesGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle101; + dataGridViewCellStyle41.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.mapFilesGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle41; this.mapFilesGridView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.mapFilesGridView.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; - dataGridViewCellStyle102.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle102.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle102.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); - dataGridViewCellStyle102.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle102.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle102.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle102.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.mapFilesGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle102; + dataGridViewCellStyle42.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle42.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle42.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); + dataGridViewCellStyle42.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle42.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle42.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle42.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.mapFilesGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle42; this.mapFilesGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridViewCellStyle103.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle103.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle103.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - dataGridViewCellStyle103.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle103.Format = "D4"; - dataGridViewCellStyle103.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle103.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle103.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.mapFilesGridView.DefaultCellStyle = dataGridViewCellStyle103; + dataGridViewCellStyle43.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle43.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle43.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + dataGridViewCellStyle43.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle43.Format = "D4"; + dataGridViewCellStyle43.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle43.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle43.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.mapFilesGridView.DefaultCellStyle = dataGridViewCellStyle43; this.mapFilesGridView.Location = new System.Drawing.Point(0, 0); this.mapFilesGridView.Name = "mapFilesGridView"; - dataGridViewCellStyle104.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle104.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle104.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); - dataGridViewCellStyle104.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle104.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle104.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle104.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.mapFilesGridView.RowHeadersDefaultCellStyle = dataGridViewCellStyle104; + dataGridViewCellStyle44.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle44.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle44.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); + dataGridViewCellStyle44.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle44.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle44.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle44.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.mapFilesGridView.RowHeadersDefaultCellStyle = dataGridViewCellStyle44; this.mapFilesGridView.RowHeadersWidth = 50; this.mapFilesGridView.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing; - dataGridViewCellStyle105.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle105.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.mapFilesGridView.RowsDefaultCellStyle = dataGridViewCellStyle105; + dataGridViewCellStyle45.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle45.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.mapFilesGridView.RowsDefaultCellStyle = dataGridViewCellStyle45; this.mapFilesGridView.RowTemplate.DefaultCellStyle.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; this.mapFilesGridView.RowTemplate.Height = 18; this.mapFilesGridView.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.False; @@ -7699,7 +7699,7 @@ this.MainMenuStrip = this.menuStrip1; this.MaximizeBox = false; this.Name = "MainProgram"; - this.Text = "DS Pokémon Rom Editor 1.0.8 (Nømura, AdAstra/LD3005)"; + this.Text = "DS Pokémon Rom Editor 1.1 (Nømura, AdAstra/LD3005)"; this.mainTabControl.ResumeLayout(false); this.headerEditorTabPage.ResumeLayout(false); this.headerEditorTabPage.PerformLayout(); @@ -8194,7 +8194,7 @@ private System.Windows.Forms.RichTextBox LineNumberTextBoxScript; private System.Windows.Forms.RichTextBox LineNumberTextBoxFunc; private System.Windows.Forms.RichTextBox LineNumberTextBoxMov; - private System.Windows.Forms.TextBox searchInScriptsUpDown; + private System.Windows.Forms.TextBox searchInScriptsTextBox; private System.Windows.Forms.TabPage headerEditorTabPage; private System.Windows.Forms.GroupBox groupBox10; private System.Windows.Forms.Button openMessageFileButton; diff --git a/DS_Map/Main Window.cs b/DS_Map/Main Window.cs index 2768ecf..14610e3 100644 --- a/DS_Map/Main Window.cs +++ b/DS_Map/Main Window.cs @@ -739,7 +739,7 @@ namespace DSPRE { Update(); } private void aboutToolStripMenuItem1_Click(object sender, EventArgs e) { - string message = "DS Pokémon Rom Editor by Nømura and AdAstra/LD3005" + Environment.NewLine + "version 1.0.8" + Environment.NewLine + string message = "DS Pokémon Rom Editor by Nømura and AdAstra/LD3005" + Environment.NewLine + "version 1.1.0" + Environment.NewLine + Environment.NewLine + "This tool was largely inspired by Markitus95's Spiky's DS Map Editor, from which certain assets were also recycled. Credits go to Markitus, Ark, Zark, Florian, and everyone else who deserves credit for SDSME." + Environment.NewLine + Environment.NewLine + "Special thanks go to Trifindo, Mikelan98, JackHack96, Mixone and BagBoy." + Environment.NewLine + "Their help, research and expertise in many fields of NDS Rom Hacking made the development of this tool possible."; @@ -5154,11 +5154,11 @@ namespace DSPRE { } } private void searchInScriptsButton_Click(object sender, EventArgs e) { - if (searchMessageTextBox.Text == "") + if (searchInScriptsTextBox.Text == "") return; searchInScriptsResultListBox.Items.Clear(); - string searchString = searchInScriptsUpDown.Text; + string searchString = searchInScriptsTextBox.Text; searchProgressBar.Maximum = selectScriptFileComboBox.Items.Count; string resultsBuffer = ""; @@ -6222,14 +6222,12 @@ namespace DSPRE { MessageBox.Show("AreaData File imported successfully!", "", MessageBoxButtons.OK, MessageBoxIcon.Information); } #endregion - private void spawnableDirComboBox_SelectedIndexChanged(object sender, EventArgs e) { if (disableHandlers || spawnablesListBox.SelectedIndex < 0) return; currentEventFile.spawnables[spawnablesListBox.SelectedIndex].dir = (ushort)spawnableDirComboBox.SelectedIndex; } - private void spawnableTypeComboBox_SelectedIndexChanged(object sender, EventArgs e) { if (spawnablesListBox.SelectedIndex < 0) return; diff --git a/DS_Map/Main Window.resx b/DS_Map/Main Window.resx index b71f5e0..6002c59 100644 --- a/DS_Map/Main Window.resx +++ b/DS_Map/Main Window.resx @@ -117,100 +117,117 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 533, 20 + - + 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 + VRmTF6ps3wAAAABJRU5ErkJggg== - + - iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wgAADsIBFShKgAAAABh0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC41ZYUyZQAAALFJREFUOE+t0bEN - gzAQBVAKCpeMkYIiJeMwQkaIlKEYJgOkZATzv+SznPAjThwnvcIf3xeCLud8KRlGyDBChhEyNJgJknr2 - jwwJM8AKH3iAq1iGhLnDG3ggV7EMDaaHGdzFu0DBuItt4en0grZ0V2yF7YWzFkhXvCHP/Bx9fcMjvFyW - 2rKvonq3Pfzi5bJ0WFR3VEiYsSy7iowMCZOAf9BVZGRoMDdvkZFhhAwjZHhe7jZh5pqtdbNSWQAAAABJ - RU5ErkJggg== + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + vwAADr8BOAVTJAAAAWdJREFUWEftlj1Ow0AQRi16I4gShFLRmAJX7lOlobDEDUwFEg0XCH+X4AC0nCAN + fa7iM9AM+8UeaeKM12t77QJ5pFckOzvfy9qKHbSpMAw3dZQt7ctsbqTs28xn52Sjug8QUS08+OBL81n9 + hddXZ/T0eE8/228VrKFH2yvnS44E0Ly+OSENDNeCJejR9gLOkBwIcPjLw4p+d89HYLhNgte1vZipSagC + 2gCAIRxSR5086C0AbBK2cIDZRWJRnQQAgjS0Xok3ga4MIvD1eusETmh5uTAxxbVHJuglgMFpmjYymy/w + 3+BXgMOzLKM8z61EUURv7x97CSNzxxKgt4AWWAUCKE1iVAEUS5gaTyCO470Eg3tiVIEq5Yn4F0iSREX2 + gMEEXJkE/q+AdgMC2QOmSzAJNAq4vF4NchMCCLiwvDj1ewISXrRh+j4xyOWFRIJ+LwIAj1UMa4v6OO4i + 0LZfQxVwwUcVAkHwB88gY6VhELoRAAAAAElFTkSuQmCC - + - iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wgAADsIBFShKgAAAABh0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC41ZYUyZQAAAK9JREFUOE+t0cEN - glAQhOF34MDRMjx48Gg5lmAJJhZlMRbgkRKeM5FNnvi/RFg3+QgMy4RAqbX+FYYZGGZg2KMZZE/3AoZL - c9FZHvKUkfYMw6BpixyYzw+0bxz2i5wN9Ez4vEgUhfeBi6LsJtdfzF1llLu0RZu0b+jSi/gPtkvr39CH - oKHi9d/wK0wUYxg0veIj7RuGS5q2eJId7RmGPRoXn+hewDADwwwMMzDcrpYXK9SardEt3OkAAAAASUVO - RK5CYII= + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + vwAADr8BOAVTJAAAAZVJREFUWEftlj9qhEAUh/cCNptsWEJIEZAsmEKL9Om9UBCyaXKEvYY3sN02eIIU + IYXY5Agv/oYZGWffjOO/hcAK36j45r3P4YmzCoJgEkTUgYtxIQYjQTYEfa5O88wLMWiTsrvtDQ1hc7Wm + Zl4zfZyEGGSwKJ7nOdV17c3T7oHe9u+shCriQgwyOEMyJP2tjuJMX/vOPQfm4OAkVBEXYpDBrQCg71ei + zxdx1guaKAEcYyTEIANbAby5KK6QK8HxHO+EhAI9oQtw9AoA+vnwWgGT2+2mSccXVvQK+PZAURQnIEeT + 66Awi8tabgEfUCxN0xPiOKYwDFvW1xvrZwpGCajiZVlSVVVOIIE4m4RVIEkSK9HjvRDgCpooAZvEpBXg + CproApzE4gJRFLX9ANATZxUwgcQiAlyvAD0GeAtwyRRDmtBksRXw5SLwf5rQxVlWgHsbxeUrWFTAZ1e8 + SBMC7Ocg4cOsK6CjP7TRxB2w8+EK9DGbABLh/84VsYH4WQQA/utINhR2PzAUTNSvp9BJPAYuqT+0+gPu + VRmTF6ps3wAAAABJRU5ErkJggg== - + - iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wgAADsIBFShKgAAAABh0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC41ZYUyZQAAANtJREFUOE/tlLEN - wkAMRa9IQckYFBSUjJMRGAGJoRiGASgzwvF9sk+271+EqLH0lPNL8vNFQam1fgXmwHyGyoyEgSdY2H0P - lRnMDchhZfc9VHow0u6tgS+w25JKD8baGbstqTQwvp2x25JKA5PbGdOWVAqY/NvlK205CANj7eTlh57l - aqG05SCajO1WcNezXGWXM20Zli5juwX4QNmnLcPSRGqnrgfqPm0Zwpoo5Qo2/zAmB1pL+fApvO+XLks5 - govbQ6C6Mxj+MMIyQ4JACJxBZeYfSJ8xqPydWj4PJ5qtwk66WQAAAABJRU5ErkJggg== + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + vwAADr8BOAVTJAAAAZVJREFUWEftlj9qhEAUh/cCNptsWEJIEZAsmEKL9Om9UBCyaXKEvYY3sN02eIIU + IYXY5Agv/oYZGWffjOO/hcAK36j45r3P4YmzCoJgEkTUgYtxIQYjQTYEfa5O88wLMWiTsrvtDQ1hc7Wm + Zl4zfZyEGGSwKJ7nOdV17c3T7oHe9u+shCriQgwyOEMyJP2tjuJMX/vOPQfm4OAkVBEXYpDBrQCg71ei + zxdx1guaKAEcYyTEIANbAby5KK6QK8HxHO+EhAI9oQtw9AoA+vnwWgGT2+2mSccXVvQK+PZAURQnIEeT + 66Awi8tabgEfUCxN0xPiOKYwDFvW1xvrZwpGCajiZVlSVVVOIIE4m4RVIEkSK9HjvRDgCpooAZvEpBXg + CproApzE4gJRFLX9ANATZxUwgcQiAlyvAD0GeAtwyRRDmtBksRXw5SLwf5rQxVlWgHsbxeUrWFTAZ1e8 + SBMC7Ocg4cOsK6CjP7TRxB2w8+EK9DGbABLh/84VsYH4WQQA/utINhR2PzAUTNSvp9BJPAYuqT+0+gPu + VRmTF6ps3wAAAABJRU5ErkJggg== - + - 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 @@ -221,7 +238,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACA - DwAAAk1TRnQBSQFMAgEBBwEAAeQBCwHkAQsBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + DwAAAk1TRnQBSQFMAgEBBwEAAewBCwHsAQsBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA @@ -338,21 +355,6 @@ CproApzE4gJRFLX9ANATZxUwgcQiAlyvAD0GeAtwyRRDmtBksRXw5SLwf5rQxVlWgHsbxeUrWFTAZ1e8 SBMC7Ocg4cOsK6CjP7TRxB2w8+EK9DGbABLh/84VsYH4WQQA/utINhR2PzAUTNSvp9BJPAYuqT+0+gPu VRmTF6ps3wAAAABJRU5ErkJggg== - - - - 533, 20 - - - - iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vwAADr8BOAVTJAAAAWdJREFUWEftlj1Ow0AQRi16I4gShFLRmAJX7lOlobDEDUwFEg0XCH+X4AC0nCAN - fa7iM9AM+8UeaeKM12t77QJ5pFckOzvfy9qKHbSpMAw3dZQt7ctsbqTs28xn52Sjug8QUS08+OBL81n9 - hddXZ/T0eE8/228VrKFH2yvnS44E0Ly+OSENDNeCJejR9gLOkBwIcPjLw4p+d89HYLhNgte1vZipSagC - 2gCAIRxSR5086C0AbBK2cIDZRWJRnQQAgjS0Xok3ga4MIvD1eusETmh5uTAxxbVHJuglgMFpmjYymy/w - 3+BXgMOzLKM8z61EUURv7x97CSNzxxKgt4AWWAUCKE1iVAEUS5gaTyCO470Eg3tiVIEq5Yn4F0iSREX2 - gMEEXJkE/q+AdgMC2QOmSzAJNAq4vF4NchMCCLiwvDj1ewISXrRh+j4xyOWFRIJ+LwIAj1UMa4v6OO4i - 0LZfQxVwwUcVAkHwB88gY6VhELoRAAAAAElFTkSuQmCC @@ -403,69 +405,6 @@ CproApzE4gJRFLX9ANATZxUwgcQiAlyvAD0GeAtwyRRDmtBksRXw5SLwf5rQxVlWgHsbxeUrWFTAZ1e8 SBMC7Ocg4cOsK6CjP7TRxB2w8+EK9DGbABLh/84VsYH4WQQA/utINhR2PzAUTNSvp9BJPAYuqT+0+gPu VRmTF6ps3wAAAABJRU5ErkJggg== - - - - - iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vwAADr8BOAVTJAAAAWdJREFUWEftlj1Ow0AQRi16I4gShFLRmAJX7lOlobDEDUwFEg0XCH+X4AC0nCAN - fa7iM9AM+8UeaeKM12t77QJ5pFckOzvfy9qKHbSpMAw3dZQt7ctsbqTs28xn52Sjug8QUS08+OBL81n9 - hddXZ/T0eE8/228VrKFH2yvnS44E0Ly+OSENDNeCJejR9gLOkBwIcPjLw4p+d89HYLhNgte1vZipSagC - 2gCAIRxSR5086C0AbBK2cIDZRWJRnQQAgjS0Xok3ga4MIvD1eusETmh5uTAxxbVHJuglgMFpmjYymy/w - 3+BXgMOzLKM8z61EUURv7x97CSNzxxKgt4AWWAUCKE1iVAEUS5gaTyCO470Eg3tiVIEq5Yn4F0iSREX2 - gMEEXJkE/q+AdgMC2QOmSzAJNAq4vF4NchMCCLiwvDj1ewISXrRh+j4xyOWFRIJ+LwIAj1UMa4v6OO4i - 0LZfQxVwwUcVAkHwB88gY6VhELoRAAAAAElFTkSuQmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vwAADr8BOAVTJAAAAZVJREFUWEftlj9qhEAUh/cCNptsWEJIEZAsmEKL9Om9UBCyaXKEvYY3sN02eIIU - IYXY5Agv/oYZGWffjOO/hcAK36j45r3P4YmzCoJgEkTUgYtxIQYjQTYEfa5O88wLMWiTsrvtDQ1hc7Wm - Zl4zfZyEGGSwKJ7nOdV17c3T7oHe9u+shCriQgwyOEMyJP2tjuJMX/vOPQfm4OAkVBEXYpDBrQCg71ei - zxdx1guaKAEcYyTEIANbAby5KK6QK8HxHO+EhAI9oQtw9AoA+vnwWgGT2+2mSccXVvQK+PZAURQnIEeT - 66Awi8tabgEfUCxN0xPiOKYwDFvW1xvrZwpGCajiZVlSVVVOIIE4m4RVIEkSK9HjvRDgCpooAZvEpBXg - CproApzE4gJRFLX9ANATZxUwgcQiAlyvAD0GeAtwyRRDmtBksRXw5SLwf5rQxVlWgHsbxeUrWFTAZ1e8 - SBMC7Ocg4cOsK6CjP7TRxB2w8+EK9DGbABLh/84VsYH4WQQA/utINhR2PzAUTNSvp9BJPAYuqT+0+gPu - VRmTF6ps3wAAAABJRU5ErkJggg== - - - - - iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vwAADr8BOAVTJAAAAWdJREFUWEftlj1Ow0AQRi16I4gShFLRmAJX7lOlobDEDUwFEg0XCH+X4AC0nCAN - fa7iM9AM+8UeaeKM12t77QJ5pFckOzvfy9qKHbSpMAw3dZQt7ctsbqTs28xn52Sjug8QUS08+OBL81n9 - hddXZ/T0eE8/228VrKFH2yvnS44E0Ly+OSENDNeCJejR9gLOkBwIcPjLw4p+d89HYLhNgte1vZipSagC - 2gCAIRxSR5086C0AbBK2cIDZRWJRnQQAgjS0Xok3ga4MIvD1eusETmh5uTAxxbVHJuglgMFpmjYymy/w - 3+BXgMOzLKM8z61EUURv7x97CSNzxxKgt4AWWAUCKE1iVAEUS5gaTyCO470Eg3tiVIEq5Yn4F0iSREX2 - gMEEXJkE/q+AdgMC2QOmSzAJNAq4vF4NchMCCLiwvDj1ewISXrRh+j4xyOWFRIJ+LwIAj1UMa4v6OO4i - 0LZfQxVwwUcVAkHwB88gY6VhELoRAAAAAElFTkSuQmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vwAADr8BOAVTJAAAAZVJREFUWEftlj9qhEAUh/cCNptsWEJIEZAsmEKL9Om9UBCyaXKEvYY3sN02eIIU - IYXY5Agv/oYZGWffjOO/hcAK36j45r3P4YmzCoJgEkTUgYtxIQYjQTYEfa5O88wLMWiTsrvtDQ1hc7Wm - Zl4zfZyEGGSwKJ7nOdV17c3T7oHe9u+shCriQgwyOEMyJP2tjuJMX/vOPQfm4OAkVBEXYpDBrQCg71ei - zxdx1guaKAEcYyTEIANbAby5KK6QK8HxHO+EhAI9oQtw9AoA+vnwWgGT2+2mSccXVvQK+PZAURQnIEeT - 66Awi8tabgEfUCxN0xPiOKYwDFvW1xvrZwpGCajiZVlSVVVOIIE4m4RVIEkSK9HjvRDgCpooAZvEpBXg - CproApzE4gJRFLX9ANATZxUwgcQiAlyvAD0GeAtwyRRDmtBksRXw5SLwf5rQxVlWgHsbxeUrWFTAZ1e8 - SBMC7Ocg4cOsK6CjP7TRxB2w8+EK9DGbABLh/84VsYH4WQQA/utINhR2PzAUTNSvp9BJPAYuqT+0+gPu - VRmTF6ps3wAAAABJRU5ErkJggg== - - - - - iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vwAADr8BOAVTJAAAAZVJREFUWEftlj9qhEAUh/cCNptsWEJIEZAsmEKL9Om9UBCyaXKEvYY3sN02eIIU - IYXY5Agv/oYZGWffjOO/hcAK36j45r3P4YmzCoJgEkTUgYtxIQYjQTYEfa5O88wLMWiTsrvtDQ1hc7Wm - Zl4zfZyEGGSwKJ7nOdV17c3T7oHe9u+shCriQgwyOEMyJP2tjuJMX/vOPQfm4OAkVBEXYpDBrQCg71ei - zxdx1guaKAEcYyTEIANbAby5KK6QK8HxHO+EhAI9oQtw9AoA+vnwWgGT2+2mSccXVvQK+PZAURQnIEeT - 66Awi8tabgEfUCxN0xPiOKYwDFvW1xvrZwpGCajiZVlSVVVOIIE4m4RVIEkSK9HjvRDgCpooAZvEpBXg - CproApzE4gJRFLX9ANATZxUwgcQiAlyvAD0GeAtwyRRDmtBksRXw5SLwf5rQxVlWgHsbxeUrWFTAZ1e8 - SBMC7Ocg4cOsK6CjP7TRxB2w8+EK9DGbABLh/84VsYH4WQQA/utINhR2PzAUTNSvp9BJPAYuqT+0+gPu - VRmTF6ps3wAAAABJRU5ErkJggg== @@ -716,40 +655,6 @@ CproApzE4gJRFLX9ANATZxUwgcQiAlyvAD0GeAtwyRRDmtBksRXw5SLwf5rQxVlWgHsbxeUrWFTAZ1e8 SBMC7Ocg4cOsK6CjP7TRxB2w8+EK9DGbABLh/84VsYH4WQQA/utINhR2PzAUTNSvp9BJPAYuqT+0+gPu VRmTF6ps3wAAAABJRU5ErkJggg== - - - - - iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAABptJREFUWEfNl3tsFFUYxfsHGPCJQFsjiUajIcZg9I+aqCgRCDRKoQ9aUCJGUUEk - hPKyQFva8rLy6IMWEA0gmCqgCJRWAY0QLUIokILWYtvdvvfZ7e5Od/vY3R6/c6ct1u6a2JjoTU5n5pt7 - f+fMN7Pb2bD/0xg+dn2xdUxGKUavL8Go9BLcmVaC21NLMHKI4loyyCKTbPE4Ll7DdMtbY/jYzFJbxgUX - rtkDuGoL4ILZj39rkEUm2fQITzteLJ4DQoxiuipHAMOyb2LktmqEba6C3d4KQ4sNNc1DE9eSQRaZZNOD - XuJ5l26tjwi2qMLux6hcA0bErsPIHQY4nQ7UWSSEWWRx6FtRrZK9/zhYjcd1FrtikEUm2fSgl3iG69b6 - kAClKLf4EFlQh7tnp+OevDpobhea7C40t3nR4upAk9OLRocHDa3tIg1NbR5RsBqPNTTanHC7XIpFJtn0 - oBc9dWt9RIyWtpQ1d2FcoRH3LT+MMflGaJobJqcHc2Yn4JU5SdhdWIDCnfnYmZcDk6sTiQlx2FWwM0gt - H/m5OWh2aHIRbsUik2x60IueurU+InhfzjV04cFdtXj0IyMi82vgaW9XASzt3bB6/Wpr0rqUETtiln2z - JjW3XjNJzSLHrPN8i6NdMcgik2x69D4DgwOcrevEI7tr8dheA8YVSACPF2YBWT1+2Dsg24CE8MPc7rsl - tx6Ac2zenv45KpTcHjLIIpNsegQNMFaKp2o71cQJnxhU2s6ODtg93UiSts5NStTbnZ+Hgn7lIj9nh4Tr - kTnx/XNYz8vZDqvWiQ5hkEUm2fSgFz11a32oACdqvDLRiCf3GfHwHgM6O7tgk7a3dgKObqgtzdgNXT2w - yRXz6v86hzWrdIEMssgkmx4hAxy96cVT+42IOmDE+L216O72oVXufZuAKcJbxdgp+y75nuqr0ZD7rHPr - 6OoN6PEpBllkkk2P4AEyS1FU6cHTn9bjmYN1eFxa5vP54RRYQuzM/ra6fEBifBzmJCbI05+nak6pJcTN - 6r09ueoTkbt9GxwdAcUgi0yy6UEveurW+ogIl+LBXz147lADnv+sXrXM75cr6726vitzyBUzhFs6QGPW - 2AXVATnunys1hzyUPl+PYpFJNj3oRU/dWh8qwP5fNEwqasRkUZSk5ZDbiDYaUNJWh6j/OFStt+6WLQdZ - ZJJNj5ABPq7QMPXzRkz/QiZL4jMGrwIEeoYmDjLIIpNseoQMsEdORh9uwstHmvDS4UZMKWrAC7J44qGh - iWvJIItMsukRMkDhNQ0xR5sR+1Uz4kSzvmzGTDmecbRpSOJaMsgik2x6hAyQf1VD/LEWzP66BYki7scI - IPpIM6ZJ+n8iruFaMsgik/v0CBogQoo55RqSjpsw94SuuGMmFJWbAL881t0inzzmfnn8Ke6zFkqyhmvJ - 6OORTQ960VO31ocKsOOyhnknTXit2KS2sZIYfh8qaiyoMLSislHD7+YOpcpGt6pdq7GKLANVLfNli4BP - Mf7MpEfIAFsvuzG/xIzXRfNPmREvbePV3jA4YJGvvnUZWzBt6mRMm/Ii1qZvULUbxjZcl/M3jLfE4+sS - jmvJIEsxRfQIGeDDyy4s+MaCt0RvllqQJG0jpLLBBX6ko6dHIzklS5SJhUtTIF906lxlg3Ow6tvUWjLI - IpNseoQM8MElDQtP27DotBXvfGvFq8VmaaMfVU0a5I4jZkYMVqVtwcrUTXhveRq65LPOc1VN7sFqdMna - gGKQRSbZ9AgZYPMlF5actSotPmNVLUNPANVyz/mOHBsbh5SMbLyfno2lqzIgj5o6V23yBBXXkkFWH5ce - IQNskpPLvreLbFj6nU21TCgwWLvkr/zDSZiNdRu2YW3mVixfk6VC8ZzB0jFYEoxrySCLTLLp8TcBNKw+ - 78Dqc61Y8YMdi87YBAJ56fSpAIlJc5C6cTtSJcTKdRshjwAa5Fx9a/dA2bvRYJd/IjLIIItMsukRNEBk - anFb9hUvNlzUkPWzW35AuLHivFNBLJraID4hASnpW7Bm/RasXpulamY35F1wsCwiDjLIIpNseoSvPHhe - PAe8lo8SRUWmn3QyHTUmowS3rS3G9es3UXblN/x4pQpvLHj73eRVqxYvSU5ePG/zvl0Xr93ET+VyLojK - RFxLBln93GUHysTrCdGAHybDRfeLokSTRVOC6FnReNEDoodEE0QTRcHmhtIkEc159YN/H4rYCd6bYLpX - NELEhZx7h2iMKNjcUKIxr3yQ+X80wsL+AOStyFlaRN5ZAAAAAElFTkSuQmCC @@ -811,6 +716,101 @@ 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 + RU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wgAADsIBFShKgAAAABh0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC41ZYUyZQAAAK9JREFUOE+t0cEN + glAQhOF34MDRMjx48Gg5lmAJJhZlMRbgkRKeM5FNnvi/RFg3+QgMy4RAqbX+FYYZGGZg2KMZZE/3AoZL + c9FZHvKUkfYMw6BpixyYzw+0bxz2i5wN9Ez4vEgUhfeBi6LsJtdfzF1llLu0RZu0b+jSi/gPtkvr39CH + oKHi9d/wK0wUYxg0veIj7RuGS5q2eJId7RmGPRoXn+hewDADwwwMMzDcrpYXK9SardEt3OkAAAAASUVO + RK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wgAADsIBFShKgAAAABh0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC41ZYUyZQAAANtJREFUOE/tlLEN + wkAMRa9IQckYFBSUjJMRGAGJoRiGASgzwvF9sk+271+EqLH0lPNL8vNFQam1fgXmwHyGyoyEgSdY2H0P + lRnMDchhZfc9VHow0u6tgS+w25JKD8baGbstqTQwvp2x25JKA5PbGdOWVAqY/NvlK205CANj7eTlh57l + aqG05SCajO1WcNezXGWXM20Zli5juwX4QNmnLcPSRGqnrgfqPm0Zwpoo5Qo2/zAmB1pL+fApvO+XLks5 + govbQ6C6Mxj+MMIyQ4JACJxBZeYfSJ8xqPydWj4PJ5qtwk66WQAAAABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAABh0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC41ZYUyZQAAANlJREFUOE/tjrER + wjAMRVWkSMkYFBSUjJMRGCF3DMUwDEDJCOZ/n0VkWbEpKNHdO0ffkfwkpfRTwtCCWgE/1ujeE4aW/8Lw + H0sbiMzgZPpmIeoMDtpb6kbkCJ7gAaaSVQtRE+D9C1zsfL6vmu1nNkvJ/MKl9Hx4tvP5vgm2gWwJPgtL + rw9e/WyebwJnCezCrl2eD8Pa8la+eXbtSBzWlv7ctSNhSFBq6dm1I2FIUNZS6dqRMFRQ3rJrR8JQQVnL + oR0JQwtKLYd2JAwtKFrewdCOhKHn22UpJXkDfpOarffmz1gAAAAASUVORK5CYII= diff --git a/DS_Map/Properties/AssemblyInfo.cs b/DS_Map/Properties/AssemblyInfo.cs index f4560ee..43f7f86 100644 --- a/DS_Map/Properties/AssemblyInfo.cs +++ b/DS_Map/Properties/AssemblyInfo.cs @@ -4,11 +4,11 @@ using System.Runtime.InteropServices; // Le informazioni generali relative a un assembly sono controllate dal seguente // set di attributi. Modificare i valori di questi attributi per modificare le informazioni // associate a un assembly. -[assembly: AssemblyTitle("DSPRE Reloaded 1.0.8")] +[assembly: AssemblyTitle("DSPRE Reloaded 1.1.0")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("DSPRE Reloaded 1.0.8")] +[assembly: AssemblyProduct("DSPRE Reloaded 1.1.0")] [assembly: AssemblyCopyright("Copyright © 2021")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -19,7 +19,7 @@ using System.Runtime.InteropServices; [assembly: ComVisible(false)] // Se il progetto viene esposto a COM, il GUID seguente verrà utilizzato come ID della libreria dei tipi -[assembly: Guid("e1a6ae34-da89-4ff6-9274-fab931da1179")] +[assembly: Guid("e2a3aa33-da81-1fa6-9174-fac831da1179")] // Le informazioni sulla versione di un assembly sono costituite dai seguenti quattro valori: // @@ -31,5 +31,5 @@ using System.Runtime.InteropServices; // È possibile specificare tutti i valori oppure impostare valori predefiniti per i numeri relativi alla revisione e alla build // usando l'asterisco '*' come illustrato di seguito: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.8")] -[assembly: AssemblyFileVersion("1.0.8")] +[assembly: AssemblyVersion("1.1.0")] +[assembly: AssemblyFileVersion("1.1.0")] diff --git a/DS_Map/ROMToolboxDialog.Designer.cs b/DS_Map/ROMToolboxDialog.Designer.cs index 7bdc114..b06f436 100644 --- a/DS_Map/ROMToolboxDialog.Designer.cs +++ b/DS_Map/ROMToolboxDialog.Designer.cs @@ -131,7 +131,6 @@ // // label7 // - this.label7.Enabled = false; this.label7.Location = new System.Drawing.Point(15, 283); this.label7.Name = "label7"; this.label7.Size = new System.Drawing.Size(293, 49); @@ -142,7 +141,6 @@ // label8 // this.label8.AutoSize = true; - this.label8.Enabled = false; this.label8.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label8.Location = new System.Drawing.Point(15, 268); this.label8.Name = "label8"; diff --git a/README.md b/README.md index 1bd9818..3346b65 100644 --- a/README.md +++ b/README.md @@ -2,70 +2,82 @@ Nomura's C# and WinForm DS Pokemon ROM Editor forked with lots of new features and bugfixes. -![Screenshot](aDSPRE_107.png) -![Screenshot](bDSPRE_107.png) +![Screenshot](aDSPRE_108.png) +![Screenshot](bDSPRE_108.png) -## Major Changes to Mixone's fork +## Misc changes to the official DSPRE - Significantly shorter load and save times. - Fixed script editor (it's also much faster now). -- Added mouse support and warps navigation feature to the Event Editor. -- Support for custom color tables (matrix editor). - -- Added copy and paste buttons to header editor. -- Added import and export buttons to header editor. -- Updated Header Fields for all games (added WorldMap Coordinates to HGSS header editor) -- Added more HGSS weather effects, redone weather preview pics - -- Search location feature. - Added Advanced Header Search feature. - -- Fixed Camera settings selector for HGSS roms. -- Fixed Text Search and Replace. - -- Wild Encounter Editor allows adding and removing encounter files. -- Wild Encounter Editor can now attempt to repair corrupted encounter files. - -- Partially redesigned Building Editor (now with fewer controls and a more straightforward GUI) - -- Redesigned NSBTX Editor -- Added NSBTX editor button functions - -- Fixed "Open Matrix" not loading the correct textures and buildings, especially for interior maps. -- Fixed map screen randomly becoming 3D, even with the collision tab open. -- Fixed OW search algorithm for most (if not all) supported ROMs. -- Added new patches to the ROM ToolBox (including ARM9 memory expander, BDHCAM and much more). -- Replaced "Search Flag" with "Search any command". - - -## Minor Changes to Mixone's fork - +- Fixed Overworld sprite search algorithm for most (if not all) supported ROMs. - Lots of new icons. - Fixed app name. - Fixed many Exceptions, which now show user-friendly messages. - Fixed error upon loading Dragon's Den header (Music not found). - Some fields will now show a coloured text depending on their value. - -- Added BDHCAM Support. - -- Fixed BGS signature of maps being overwritten upon saving. +- New ROM Toolbox - Added new ALT key shortcuts (Hold alt to see which shortcuts are available). +###ROM Toolbox +Supported patches: +- Expand ARM9 +- BDHCAM +- Set Overlay1 as uncompressed +- Standardize item numbers (fixed) +- Pokémon names to Sentence Case + +###Wild Encounters Editor +- Added missing button functions (add and remove) +- Wild Encounter Editor can now attempt to repair corrupted encounter files. +- Editor now detects the selected header. + + +###Header Editor +- Added copy and paste buttons to every header category editor. +- Added import and export buttons to header editor. +- New basic search location feature. +- Updated Header Fields for all games (added WorldMap Coordinates to HGSS header editor) +- Added more HGSS weather effects. +- Redone HGSS weather preview pics. +- Fixed HGSS Camera settings - Fixed header flag names. - Editable Internal names. +- Added text length label to Internal Names box (Header Editor). - Fixed a bug that prevented Internal Names from displaying correctly (String termination). +- Fixed "Open Matrix" button not loading the correct textures and buildings, especially for interior maps. -- Enabled some of the quick script cmd buttons. -- Added New Movement names and changed some of the old ones. +###Matrix Editor +- Added support for custom color tables +- Fixed "add matrix" and "remove matrix" buttons GUI numbering mismatch. +- Fixed wrong row/col indices when resizing matrices. + +###Map Editor +- Partial GUI redesign (now with fewer building controls and a more straightforward GUI). +- New BGS Section - Expanded collisions database. +- Added Section size labels to 3D Model, Terrain and BGS Tabs (Map Editor). +- Added support for broken BTX detection to Map Editor and NSBTX Editor. +- Fixed map screen randomly becoming 3D, even with the collision tab open. +- Added BDHCAM Support to the import/export menu. +- Added Map BIN Import button +- Fixed BGS signature of maps being overwritten upon saving a map. -- Fixed Matrix editor "add" and "remove" buttons GUI numbering mismatch. -- Fixed wrong numbers when resizing matrices. +###NSBTX Editor +- GUI Redesign +- Added missing button functions (add and remove) +- Created a palette match algorithm -- Fixed "Text Editor" export button. -- Added option to show row numbers as hex in the Text Editor. +###Event Editor +- Added mouse support and warps navigation feature. +- Events can now be duplicated +- New fields (for Spawnables and Triggers) -- Fixed Encounters editor not opening. -- the "Open Wild Pokémon" button in Header Editor is disabled when a NULL encounter file is detected. -- Encounter Editor detects the selected header. +###Script Editor +- Replaced "Search Flag" with "Search any command". +- Enabled some of the quick script cmd buttons. -- Created a palette match algorithm for the Tileset Editor +###Text Editor +- Added New Movement names and changed some of the old ones. +- Fixed export button. +- Added option to show row numbers as hex. +- Fixed Text Search and Replace. \ No newline at end of file diff --git a/aDSPRE_107.png b/aDSPRE_107.png deleted file mode 100644 index 878e9d6..0000000 Binary files a/aDSPRE_107.png and /dev/null differ diff --git a/aDSPRE_11.png b/aDSPRE_11.png new file mode 100644 index 0000000..5183064 Binary files /dev/null and b/aDSPRE_11.png differ diff --git a/bDSPRE_107.png b/bDSPRE_107.png deleted file mode 100644 index be442d1..0000000 Binary files a/bDSPRE_107.png and /dev/null differ diff --git a/bDSPRE_11.png b/bDSPRE_11.png new file mode 100644 index 0000000..5604e38 Binary files /dev/null and b/bDSPRE_11.png differ