diff --git a/DS_Map/DS Map.csproj b/DS_Map/DS Map.csproj index d119f79..f90953e 100644 --- a/DS_Map/DS Map.csproj +++ b/DS_Map/DS Map.csproj @@ -475,9 +475,11 @@ + + Always diff --git a/DS_Map/Graphics/Program Icons/checkmark.png b/DS_Map/Graphics/Program Icons/checkmark.png new file mode 100644 index 0000000..7a5eae6 Binary files /dev/null and b/DS_Map/Graphics/Program Icons/checkmark.png differ diff --git a/DS_Map/Graphics/Program Icons/wideLensImage.png b/DS_Map/Graphics/Program Icons/wideLensImage.png index c30c96b..c79b269 100644 Binary files a/DS_Map/Graphics/Program Icons/wideLensImage.png and b/DS_Map/Graphics/Program Icons/wideLensImage.png differ diff --git a/DS_Map/Graphics/Program Icons/wideLensImageTransp.png b/DS_Map/Graphics/Program Icons/wideLensImageTransp.png new file mode 100644 index 0000000..3430038 Binary files /dev/null and b/DS_Map/Graphics/Program Icons/wideLensImageTransp.png differ diff --git a/DS_Map/HeaderSearch.Designer.cs b/DS_Map/HeaderSearch.Designer.cs index e89176b..7135a7e 100644 --- a/DS_Map/HeaderSearch.Designer.cs +++ b/DS_Map/HeaderSearch.Designer.cs @@ -29,6 +29,7 @@ this.operator1ComboBox = new System.Windows.Forms.ComboBox(); this.value1TextBox = new System.Windows.Forms.TextBox(); this.startSearchButton = new System.Windows.Forms.Button(); + this.headerSearchResetButton = new System.Windows.Forms.Button(); this.SuspendLayout(); // // arm9expansionTextLBL @@ -43,9 +44,9 @@ this.fieldToSearch1ComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.fieldToSearch1ComboBox.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.fieldToSearch1ComboBox.FormattingEnabled = true; - this.fieldToSearch1ComboBox.Location = new System.Drawing.Point(63, 37); + this.fieldToSearch1ComboBox.Location = new System.Drawing.Point(11, 37); this.fieldToSearch1ComboBox.Name = "fieldToSearch1ComboBox"; - this.fieldToSearch1ComboBox.Size = new System.Drawing.Size(205, 24); + this.fieldToSearch1ComboBox.Size = new System.Drawing.Size(190, 24); this.fieldToSearch1ComboBox.TabIndex = 6; this.fieldToSearch1ComboBox.SelectedIndexChanged += new System.EventHandler(this.fieldToSearch1ComboBox_SelectedIndexChanged); // @@ -53,50 +54,66 @@ // this.explanationLabel.AutoSize = true; this.explanationLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.explanationLabel.Location = new System.Drawing.Point(10, 8); + this.explanationLabel.Location = new System.Drawing.Point(6, 10); this.explanationLabel.Name = "explanationLabel"; - this.explanationLabel.Size = new System.Drawing.Size(307, 15); + this.explanationLabel.Size = new System.Drawing.Size(269, 15); this.explanationLabel.TabIndex = 7; - this.explanationLabel.Text = "Find all headers that meet these requirements:"; + this.explanationLabel.Text = "Find all headers that meet this condition:"; // // operator1ComboBox // this.operator1ComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.operator1ComboBox.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.operator1ComboBox.FormattingEnabled = true; - this.operator1ComboBox.Location = new System.Drawing.Point(63, 68); + this.operator1ComboBox.Location = new System.Drawing.Point(11, 72); this.operator1ComboBox.Name = "operator1ComboBox"; - this.operator1ComboBox.Size = new System.Drawing.Size(205, 24); + this.operator1ComboBox.Size = new System.Drawing.Size(190, 24); this.operator1ComboBox.TabIndex = 8; // // value1TextBox // this.value1TextBox.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.value1TextBox.Location = new System.Drawing.Point(63, 100); + this.value1TextBox.Location = new System.Drawing.Point(11, 108); + this.value1TextBox.MaxLength = 16; this.value1TextBox.Name = "value1TextBox"; - this.value1TextBox.Size = new System.Drawing.Size(205, 22); + this.value1TextBox.Size = new System.Drawing.Size(190, 22); this.value1TextBox.TabIndex = 9; // // startSearchButton // this.startSearchButton.Image = global::DSPRE.Properties.Resources.wideLensImage; this.startSearchButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.startSearchButton.Location = new System.Drawing.Point(112, 133); + this.startSearchButton.Location = new System.Drawing.Point(209, 37); this.startSearchButton.Name = "startSearchButton"; this.startSearchButton.RightToLeft = System.Windows.Forms.RightToLeft.No; - this.startSearchButton.Size = new System.Drawing.Size(106, 43); + this.startSearchButton.Size = new System.Drawing.Size(86, 43); this.startSearchButton.TabIndex = 16; - this.startSearchButton.Text = "Start Search"; + this.startSearchButton.Text = "Start\r\nSearch"; this.startSearchButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.startSearchButton.UseVisualStyleBackColor = true; this.startSearchButton.Click += new System.EventHandler(this.startSearchButton_Click); // + // headerSearchResetButton + // + this.headerSearchResetButton.Image = global::DSPRE.Properties.Resources.wideLensImageTransp; + this.headerSearchResetButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; + this.headerSearchResetButton.Location = new System.Drawing.Point(209, 87); + this.headerSearchResetButton.Name = "headerSearchResetButton"; + this.headerSearchResetButton.RightToLeft = System.Windows.Forms.RightToLeft.No; + this.headerSearchResetButton.Size = new System.Drawing.Size(86, 43); + this.headerSearchResetButton.TabIndex = 17; + this.headerSearchResetButton.Text = "Reset\r\nResults"; + this.headerSearchResetButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.headerSearchResetButton.UseVisualStyleBackColor = true; + this.headerSearchResetButton.Click += new System.EventHandler(this.headerSearchResetButton_Click); + // // HeaderSearch // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - this.ClientSize = new System.Drawing.Size(329, 188); + this.ClientSize = new System.Drawing.Size(304, 145); + this.Controls.Add(this.headerSearchResetButton); this.Controls.Add(this.startSearchButton); this.Controls.Add(this.value1TextBox); this.Controls.Add(this.operator1ComboBox); @@ -120,5 +137,6 @@ private System.Windows.Forms.ComboBox operator1ComboBox; private System.Windows.Forms.TextBox value1TextBox; private System.Windows.Forms.Button startSearchButton; + private System.Windows.Forms.Button headerSearchResetButton; } } \ No newline at end of file diff --git a/DS_Map/HeaderSearch.cs b/DS_Map/HeaderSearch.cs index 5e24f7e..d264b57 100644 --- a/DS_Map/HeaderSearch.cs +++ b/DS_Map/HeaderSearch.cs @@ -68,8 +68,10 @@ namespace DSPRE { if (fieldToSearchComboBox.SelectedItem.ToString().Contains("ID")) { operatorComboBox.Items.AddRange(headerSearchNumericOperators); + value1TextBox.MaxLength = 5; } else { operatorComboBox.Items.AddRange(headerSearchTextOperators); + value1TextBox.MaxLength = 16; } operatorComboBox.SelectedIndex = 0; @@ -115,7 +117,13 @@ namespace DSPRE { fieldSplit[fieldSplit.Length - 1] = fieldSplit[fieldSplit.Length - 1].Replace(")", ""); //Remove ) from string string property = String.Join("", fieldSplit); - int numToSearch = int.Parse(valToSearch); + ushort numToSearch = 0; + try { + numToSearch = ushort.Parse(valToSearch); + } catch (OverflowException) { + MessageBox.Show("Your input exceeds the range of 16-bit integers (" + ushort.MinValue + " - " + ushort.MaxValue + ").", "Overflow Error", MessageBoxButtons.OK, MessageBoxIcon.Information); + return null; + } for (short i = startID; i < finalID; i++) { var headerFieldEntry = typeof(Header).GetProperty(property).GetValue(Header.LoadFromARM9(i), null); @@ -164,13 +172,14 @@ namespace DSPRE { result = advancedSearch(0, (short)intNames.Count, intNames, fieldToSearch1ComboBox.Text, operator1ComboBox.SelectedItem.ToString(), value1TextBox.Text); } catch (FormatException) { MessageBox.Show("Make sure the value to search is correct.", "Format Error", MessageBoxButtons.OK, MessageBoxIcon.Error); + value1TextBox.Clear(); headerListBox.Items.Add("Search parameters are invalid"); headerListBox.Enabled = false; return; } string searchConfiguration = fieldToSearch1ComboBox.Text + " " + operator1ComboBox.Text.ToLower() + " " + '"' + value1TextBox.Text + '"'; - if (result.Count <= 0) { + if (result == null || result.Count <= 0) { headerListBox.Items.Add("No header's " + searchConfiguration); headerListBox.Enabled = false; } else { @@ -181,5 +190,17 @@ namespace DSPRE { status = "Showing headers whose " + searchConfiguration; } } + private void headerSearchResetButton_Click(object sender, EventArgs e) { + headerSearchReset(headerListBox, intNames); + } + public static void headerSearchReset(ListBox headerListBox, List intNames) { + headerListBox.Enabled = true; + headerListBox.Items.Clear(); + + for (int i = 0; i < intNames.Count; i++) { + String name = intNames[i]; + headerListBox.Items.Add(i.ToString("D3") + Header.nameSeparator + name); + } + } } } diff --git a/DS_Map/Main Window.Designer.cs b/DS_Map/Main Window.Designer.cs index bbe8421..3935a00 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 dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle18 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle19 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle20 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle21 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle22 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle23 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle24 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle25 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle26 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle27 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle28 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle29 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle30 = 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(); @@ -592,9 +592,12 @@ this.headerSearchToolStripButton = new System.Windows.Forms.ToolStripButton(); this.versionLabel = new System.Windows.Forms.Label(); this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); + this.advancedHeaderSearchToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.headersGridView = new DSPRE.DataGridViewDoubleBuffered(); this.heightsGridView = new DSPRE.DataGridViewDoubleBuffered(); this.mapFilesGridView = new DSPRE.DataGridViewDoubleBuffered(); + this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); + this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator(); this.mainTabControl.SuspendLayout(); this.headerEditorTabPage.SuspendLayout(); this.worldmapCoordsGroupBox.SuspendLayout(); @@ -7246,7 +7249,8 @@ // aboutToolStripMenuItem // this.aboutToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.asmHacksToolStripMenuItem}); + this.asmHacksToolStripMenuItem, + this.advancedHeaderSearchToolStripMenuItem}); this.aboutToolStripMenuItem.Name = "aboutToolStripMenuItem"; this.aboutToolStripMenuItem.Size = new System.Drawing.Size(46, 20); this.aboutToolStripMenuItem.Text = "Tools"; @@ -7254,7 +7258,7 @@ // asmHacksToolStripMenuItem // this.asmHacksToolStripMenuItem.Name = "asmHacksToolStripMenuItem"; - this.asmHacksToolStripMenuItem.Size = new System.Drawing.Size(146, 22); + this.asmHacksToolStripMenuItem.Size = new System.Drawing.Size(206, 22); this.asmHacksToolStripMenuItem.Text = "ROM Toolbox"; this.asmHacksToolStripMenuItem.Click += new System.EventHandler(this.romToolBoxToolStripMenuItem_Click); // @@ -7321,11 +7325,13 @@ this.mainToolStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.loadRomButton, this.saveRomButton, + this.toolStripSeparator3, this.unpackAllButton, this.updateMapNarcsButton, this.toolStripSeparator1, this.wildEditorButton, this.buildingEditorButton, + this.toolStripSeparator2, this.romToolboxButton, this.headerSearchToolStripButton}); this.mainToolStrip.Location = new System.Drawing.Point(0, 24); @@ -7430,51 +7436,58 @@ this.versionLabel.TabIndex = 9; this.versionLabel.Text = "ROM:"; // + // advancedHeaderSearchToolStripMenuItem + // + this.advancedHeaderSearchToolStripMenuItem.Name = "advancedHeaderSearchToolStripMenuItem"; + this.advancedHeaderSearchToolStripMenuItem.Size = new System.Drawing.Size(206, 22); + this.advancedHeaderSearchToolStripMenuItem.Text = "Advanced Header Search"; + this.advancedHeaderSearchToolStripMenuItem.Click += new System.EventHandler(this.advancedHeaderSearchToolStripMenuItem_Click); + // // headersGridView // this.headersGridView.AllowUserToAddRows = false; this.headersGridView.AllowUserToDeleteRows = false; this.headersGridView.AllowUserToResizeColumns = false; this.headersGridView.AllowUserToResizeRows = false; - dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.headersGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; + dataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.headersGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle16; 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; - dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle2.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); - dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.headersGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2; + dataGridViewCellStyle17.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle17.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle17.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); + dataGridViewCellStyle17.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle17.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle17.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle17.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.headersGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle17; this.headersGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle3.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - dataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle3.Format = "D4"; - dataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.headersGridView.DefaultCellStyle = dataGridViewCellStyle3; + dataGridViewCellStyle18.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle18.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle18.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + dataGridViewCellStyle18.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle18.Format = "D4"; + dataGridViewCellStyle18.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle18.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle18.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.headersGridView.DefaultCellStyle = dataGridViewCellStyle18; this.headersGridView.Location = new System.Drawing.Point(0, 0); this.headersGridView.Name = "headersGridView"; - dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle4.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); - dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.headersGridView.RowHeadersDefaultCellStyle = dataGridViewCellStyle4; + dataGridViewCellStyle19.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle19.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle19.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); + dataGridViewCellStyle19.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle19.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle19.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle19.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.headersGridView.RowHeadersDefaultCellStyle = dataGridViewCellStyle19; this.headersGridView.RowHeadersWidth = 50; this.headersGridView.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing; - dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle5.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.headersGridView.RowsDefaultCellStyle = dataGridViewCellStyle5; + dataGridViewCellStyle20.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle20.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.headersGridView.RowsDefaultCellStyle = dataGridViewCellStyle20; this.headersGridView.RowTemplate.DefaultCellStyle.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; this.headersGridView.RowTemplate.Height = 18; this.headersGridView.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.False; @@ -7492,45 +7505,45 @@ this.heightsGridView.AllowUserToDeleteRows = false; this.heightsGridView.AllowUserToResizeColumns = false; this.heightsGridView.AllowUserToResizeRows = false; - dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.heightsGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle6; + dataGridViewCellStyle21.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.heightsGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle21; 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; - dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle7.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle7.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); - dataGridViewCellStyle7.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle7.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.heightsGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle7; + dataGridViewCellStyle22.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle22.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle22.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); + dataGridViewCellStyle22.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle22.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle22.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle22.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.heightsGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle22; this.heightsGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle8.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle8.Font = new System.Drawing.Font("Tahoma", 8.25F); - dataGridViewCellStyle8.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle8.Format = "D2"; - dataGridViewCellStyle8.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle8.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.heightsGridView.DefaultCellStyle = dataGridViewCellStyle8; + dataGridViewCellStyle23.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle23.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle23.Font = new System.Drawing.Font("Tahoma", 8.25F); + dataGridViewCellStyle23.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle23.Format = "D2"; + dataGridViewCellStyle23.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle23.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle23.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.heightsGridView.DefaultCellStyle = dataGridViewCellStyle23; this.heightsGridView.Location = new System.Drawing.Point(0, 0); this.heightsGridView.Name = "heightsGridView"; - dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle9.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle9.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); - dataGridViewCellStyle9.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle9.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle9.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.heightsGridView.RowHeadersDefaultCellStyle = dataGridViewCellStyle9; + dataGridViewCellStyle24.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle24.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle24.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); + dataGridViewCellStyle24.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle24.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle24.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle24.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.heightsGridView.RowHeadersDefaultCellStyle = dataGridViewCellStyle24; this.heightsGridView.RowHeadersWidth = 50; this.heightsGridView.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing; - dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle10.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.heightsGridView.RowsDefaultCellStyle = dataGridViewCellStyle10; + dataGridViewCellStyle25.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle25.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.heightsGridView.RowsDefaultCellStyle = dataGridViewCellStyle25; this.heightsGridView.RowTemplate.DefaultCellStyle.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; this.heightsGridView.RowTemplate.Height = 18; this.heightsGridView.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.False; @@ -7546,45 +7559,45 @@ this.mapFilesGridView.AllowUserToDeleteRows = false; this.mapFilesGridView.AllowUserToResizeColumns = false; this.mapFilesGridView.AllowUserToResizeRows = false; - dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.mapFilesGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle11; + dataGridViewCellStyle26.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.mapFilesGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle26; 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; - dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle12.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle12.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); - dataGridViewCellStyle12.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle12.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle12.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.mapFilesGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle12; + dataGridViewCellStyle27.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle27.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle27.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); + dataGridViewCellStyle27.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle27.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle27.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle27.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.mapFilesGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle27; this.mapFilesGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle13.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle13.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - dataGridViewCellStyle13.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle13.Format = "D4"; - dataGridViewCellStyle13.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle13.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.mapFilesGridView.DefaultCellStyle = dataGridViewCellStyle13; + dataGridViewCellStyle28.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle28.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle28.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + dataGridViewCellStyle28.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle28.Format = "D4"; + dataGridViewCellStyle28.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle28.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle28.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.mapFilesGridView.DefaultCellStyle = dataGridViewCellStyle28; this.mapFilesGridView.Location = new System.Drawing.Point(0, 0); this.mapFilesGridView.Name = "mapFilesGridView"; - dataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle14.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle14.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); - dataGridViewCellStyle14.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle14.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle14.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle14.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.mapFilesGridView.RowHeadersDefaultCellStyle = dataGridViewCellStyle14; + dataGridViewCellStyle29.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle29.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle29.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); + dataGridViewCellStyle29.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle29.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle29.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle29.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.mapFilesGridView.RowHeadersDefaultCellStyle = dataGridViewCellStyle29; this.mapFilesGridView.RowHeadersWidth = 50; this.mapFilesGridView.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing; - dataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle15.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.mapFilesGridView.RowsDefaultCellStyle = dataGridViewCellStyle15; + dataGridViewCellStyle30.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle30.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.mapFilesGridView.RowsDefaultCellStyle = dataGridViewCellStyle30; this.mapFilesGridView.RowTemplate.DefaultCellStyle.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; this.mapFilesGridView.RowTemplate.Height = 18; this.mapFilesGridView.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.False; @@ -7595,6 +7608,16 @@ this.mapFilesGridView.CellFormatting += new System.Windows.Forms.DataGridViewCellFormattingEventHandler(this.mapFilesGridView_CellFormatting); this.mapFilesGridView.CellValueChanged += new System.Windows.Forms.DataGridViewCellEventHandler(this.mapFilesGridView_CellValueChanged); // + // toolStripSeparator2 + // + this.toolStripSeparator2.Name = "toolStripSeparator2"; + this.toolStripSeparator2.Size = new System.Drawing.Size(6, 44); + // + // toolStripSeparator3 + // + this.toolStripSeparator3.Name = "toolStripSeparator3"; + this.toolStripSeparator3.Size = new System.Drawing.Size(6, 44); + // // MainProgram // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -8371,6 +8394,9 @@ private System.Windows.Forms.CheckBox showSignsCheckBox; private System.Windows.Forms.Button duplicateWarpsButton; private System.Windows.Forms.Button duplicateTriggersButton; + private System.Windows.Forms.ToolStripMenuItem advancedHeaderSearchToolStripMenuItem; + private System.Windows.Forms.ToolStripSeparator toolStripSeparator2; + private System.Windows.Forms.ToolStripSeparator toolStripSeparator3; } } diff --git a/DS_Map/Main Window.cs b/DS_Map/Main Window.cs index ed5fa28..6ea7f18 100644 --- a/DS_Map/Main Window.cs +++ b/DS_Map/Main Window.cs @@ -720,11 +720,15 @@ namespace DSPRE { } } private void headerSearchToolStripButton_Click(object sender, EventArgs e) { + mainTabControl.SelectedIndex = 0; //Select Header Editor using (HeaderSearch h = new HeaderSearch(ref internalNames, headerListBox)) { h.ShowDialog(); statusLabel.Text = h.status; } } + private void advancedHeaderSearchToolStripMenuItem_Click(object sender, EventArgs e) { + headerSearchToolStripButton_Click(null, null); + } private void buildingEditorButton_Click(object sender, EventArgs e) { unpackBuildingEditorNARCs(); @@ -1535,20 +1539,10 @@ namespace DSPRE { private void resetButton_Click(object sender, EventArgs e) { searchLocationTextBox.Clear(); if (headerListBox.Items.Count < internalNames.Count) - resetHeaderSearchResults(); + HeaderSearch.headerSearchReset(headerListBox, internalNames); statusLabel.Text = "Ready"; } - - private void resetHeaderSearchResults() { - headerListBox.Enabled = true; - headerListBox.Items.Clear(); - - for (int i = 0; i < internalNames.Count; i++) { - String name = internalNames[i]; - headerListBox.Items.Add(i.ToString("D3") + Header.nameSeparator + name); - } - } private void searchHeaderTextBox_KeyPress(object sender, KeyEventArgs e) { if (e.KeyCode == Keys.Enter) { startSearchGameLocation(); @@ -1601,7 +1595,7 @@ namespace DSPRE { headerListBox.Enabled = true; } } else if (headerListBox.Items.Count < internalNames.Count) { - resetHeaderSearchResults(); + HeaderSearch.headerSearchReset(headerListBox, internalNames); } } private void scriptFileUpDown_ValueChanged(object sender, EventArgs e) { @@ -2055,7 +2049,7 @@ namespace DSPRE { } private void headersGridView_CellMouseDoubleClick(object sender, DataGridViewCellMouseEventArgs e) { if (headerListBox.Items.Count < internalNames.Count) - resetHeaderSearchResults(); + HeaderSearch.headerSearchReset(headerListBox, internalNames); if (e.RowIndex >= 0 && e.ColumnIndex >= 0) { int headerNumber = Convert.ToInt32(headersGridView.Rows[e.RowIndex].Cells[e.ColumnIndex].Value); headerListBox.SelectedIndex = headerNumber; @@ -6316,5 +6310,6 @@ namespace DSPRE { MessageBox.Show("AreaData File imported successfully!", "", MessageBoxButtons.OK, MessageBoxIcon.Information); } #endregion + } } \ No newline at end of file diff --git a/DS_Map/Main Window.resx b/DS_Map/Main Window.resx index 741d886..14b87e4 100644 --- a/DS_Map/Main Window.resx +++ b/DS_Map/Main Window.resx @@ -117,6 +117,83 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 239, 17 + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w + LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 + ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACA + DwAAAk1TRnQBSQFMAgEBBwEAAWwBCwFsAQsBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA + 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/woAAewBEgHvBQAB9BEA + ChIYAALzAusB7wHsAesB8wUAAeoB9AUAAvIB9AYAAxIGSgMSFAAB8wHxAbwC7AEHAbwBBwHsAesBBwQA + AQ4BEgHtBAAB8AEiASkB6wHzBQABEgJKBm4CSgESEwABvAH3Ae0BkgHvAbwBBwHwAfQB8gHrAeoEAAEO + AW0B7QMAAQcBIwIrASoB6wHzAwABEgFKAW4BSgZuAUoBbgFKARISAAFtAvcB8AG8AfMC8gL0Ae0B6wEH + AwABBwEVAeoD7QEpASsBJQEfASUBKgHrAfQCAAESAUoBbgFKBpMBSgFuAUoBEhIAAbwB7wHxAfQB9gHy + AvAB9AH2Ae8B7AFtAwAB9AEQAesBSgEwAQMBJQEXAfkCIAElASoB6gIAARIBSgGTAW4GSQFuAZMBSgES + EgAB8gHvAvYB9wFtAesB8gH0AfYB8wHrAewBBwIAAfQBEAFzAUUBJAEgAfkBFwH5ASABHwEgATEBIgH0 + AQABEgGTAW4BSQZsAUkBbgGTARITAAHvAfMBvAGSAfAB9wH2AfcB7QEHAesB7AHvAwAB8gERAUUBHwIg + AfkBFwH5ASABHwExASIB9AEAARIBkwFJAmwEcQJsAUkBkwESEwABBwHwAUQBJQEaApIB8gLzAfQBEgHr + AfICAAHyAUMB7AFFAR8BIAH5ARcBJgExATcBMAEUAgABSQFuAWwBcQGXBHEBlwFxAWwBbgESEwAB9AFt + ASwBJQHrAfQC8QLvAfIC6wG8AgAB8wFtAesBRQEfAiAB+QExAVECbQHzAgABSQJsAZcCcQKXAnEBlwJs + AUkTAAEcASwBKwHqAQcBvALvAfQCvAHzAm0DAAHwARMBRQEfASQCKwFRAbwFAAFJAWwCcQaXAnEBbAFJ + EgAB7wIrAUsB7wEHAbwB8QQHAfQBiwHqAwAB8AERAUsBJAEjAQMBSgHwBwABbAFxA5cCeAOXAXEBbBIA + Ae8BKwEsAUUCvAEHAe8BBwG8AfABGQLbAWwBBwMAAfABIwIrAQ4B8AHxCAABSQFxApcBeAWXAXEBSRIA + ARIBLAFFAfIB8wHvAfIB8QG7AtoBswKLAfMEAAHwASMBNwExAQ4LAAFJAXEClwF4A5cBcQFJFAABEgG8 + AgABBwGzAdQBswJsAe8IAAHvAg4B8wwAAWwBcQSXAXEBbBkAAQcCEgG8HQAEcRcAAfQL8wH0EwAN8xMA + AQcL7wEHAgAPEAEAAQcNswEHBwAEQwcAAe8BAAG7BrMBuwIAAe8CAAEQBjgBEAbTARABAAGzDQABswUA + AkME8AJDBQAB7wEAAbMGAAGzAgAB7wIAARACOAMAATgBEALTAgAC0wEQAQABsw0AAbMEAAFDCPABQwQA + Ae8BAAGtAQABlwJWAZcBAAGzAgAB7wIAARADOAEAAjgBEAHTAQAC0wEAAdMBEAEAAbMBAAFWCVABVgEA + AbMDAAFDA/ABkgJDAZID8AFDAwAB7wEAAa0BAARWAQABswH0AQAB7wIAARACOAIAAjgBEAHTAQAC0wEA + AdMBEAEAAbMBAAtWAQABswMAAUMB8AGSARIBQwHwAZIBQwESAZIB8AFDAwAB7wEAAa0BAARWAQABswH0 + AQAB7wIAARADOAEAAjgBEALTAgAC0wEQAQABswEAC1YBAAGzAgABQwHwARICYwFDAQAB8AFDAmMBEgHw + AUMCAAHvAQABrQEABHgBAAGzAfQBAAHvAgABEAY4ARAG0wEQAQABswEAC1YBAAGzAgABQwESBEcCQwRH + ARIBQwIAAe8BAAGtBgABswHzAQAB7wIADxABAAGzAQALVgEAAbMCAAFDDEcBQwIAAe8BAAG7Aq0EswG7 + AfMBAAHvAgABEAZHARAGAAEQAQABswEAC1YBAAGzAgABQwxHAUMCAAHvAQAB8wP0AfMB9AQAAe8CAAEQ + AkcCAAJHARAGAAEQAQABswEAC1YBAAGzAwABQwJHApQGRwFDAwAB7wEAAXQCMgEsAXQBAAG8AvcBAAHv + AgABEAFHAQACRwEAAUcBEAYAARABAAGzAQABVgl4AVYBAAGzAwABQwFHBJQFRwFDAwAB7wEAASwDwwFT + AQAB9wIAAfMB8AIAARABRwEAAkcBAAFHARAGAAEQAQABswEAC3gBAAGzBAABQwSUBEcBQwQAAe8BAAF0 + AywBdAEAAfcBAAHzAfADAAEQAkcCAAJHARAGAAEQAQABswEAC3gBAAGzBQACQwGUA0cCQwUAAe8IAAHz + AfAEAAEQBkcBEAYAARABAAGzDQABswcABEMHAAEHCO8BBwUADxABAAEJDbMBCREAAUIBTQE+BwABPgMA + ASgDAAFAAwABIAMAAQEBAAEBBgABARYAA/8BAAH/AY8BvwH/AeABBwIAAfgBBwKPAcABAwIAAcABBwGP + AQcBwAEDAgABgAEHAY4BAwGAAQECAAGAAQMBgAEBAYABAQIAAYABAwGAAQEBgAEBAgABgAEBAYABAAGA + AQECAAHAAQEBwAEAAYABAQIAAcABAAHAAQEBgAEBAgABwAEAAcABAQGAAQECAAHAAQAB4AEPAYABAQIA + AYABAAHgAR8BwAEDBAAB4AE/AcABAwMAAQEB4AH/AeABBwIAAZgBDwHwAf8B8AEPAgAB+AF/Av8B/AE/ + AgABgAEDAv8BgAEDAv8BgAEDAQABAQEAAQEB/AE/AaABGwEAAQEBfwH9AfABDwGvAdsBAAExAX8B/QHg + AQcBqAFbAQABSQFAAQUBwAEDAagBSwEAAUkBQAEFAcABAwGoAUsBAAExAUABBQGBAQEBqAFLAQABAQFA + AQUBgAEBAa8BywEAAQEBQAEFAYABAQGgAQsBAAH9AUABBQGAAQEBoAF7ARgBxQFAAQUBwAEDAaABiwEk + Ae0BQAEFAcABAwGgAbMBJAHNAUABBQHgAQcBoAGnARgB7QFAAQUB8AEPAb8BzwEAAf0BfwH9AfwBPwGA + AR8BAAEBAQABAQL/Cw== + + @@ -1144,83 +1221,9 @@ True - - 239, 17 + + True - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w - LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 - ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACA - DwAAAk1TRnQBSQFMAgEBBwEAATwBCwE8AQsBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo - AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA - 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/woAAewBEgHvBQAB9BEA - ChIYAALzAusB7wHsAesB8wUAAeoB9AUAAvIB9AYAAxIGSgMSFAAB8wHxAbwC7AEHAbwBBwHsAesBBwQA - AQ4BEgHtBAAB8AEiASkB6wHzBQABEgJKBm4CSgESEwABvAH3Ae0BkgHvAbwBBwHwAfQB8gHrAeoEAAEO - AW0B7QMAAQcBIwIrASoB6wHzAwABEgFKAW4BSgZuAUoBbgFKARISAAFtAvcB8AG8AfMC8gL0Ae0B6wEH - AwABBwEVAeoD7QEpASsBJQEfASUBKgHrAfQCAAESAUoBbgFKBpMBSgFuAUoBEhIAAbwB7wHxAfQB9gHy - AvAB9AH2Ae8B7AFtAwAB9AEQAesBSgEwAQMBJQEXAfkCIAElASoB6gIAARIBSgGTAW4GSQFuAZMBSgES - EgAB8gHvAvYB9wFtAesB8gH0AfYB8wHrAewBBwIAAfQBEAFzAUUBJAEgAfkBFwH5ASABHwEgATEBIgH0 - AQABEgGTAW4BSQZsAUkBbgGTARITAAHvAfMBvAGSAfAB9wH2AfcB7QEHAesB7AHvAwAB8gERAUUBHwIg - AfkBFwH5ASABHwExASIB9AEAARIBkwFJAmwEcQJsAUkBkwESEwABBwHwAUQBJQEaApIB8gLzAfQBEgHr - AfICAAHyAUMB7AFFAR8BIAH5ARcBJgExATcBMAEUAgABSQFuAWwBcQGXBHEBlwFxAWwBbgESEwAB9AFt - ASwBJQHrAfQC8QLvAfIC6wG8AgAB8wFtAesBRQEfAiAB+QExAVECbQHzAgABSQJsAZcCcQKXAnEBlwJs - AUkTAAEcASwBKwHqAQcBvALvAfQCvAHzAm0DAAHwARMBRQEfASQCKwFRAbwFAAFJAWwCcQaXAnEBbAFJ - EgAB7wIrAUsB7wEHAbwB8QQHAfQBiwHqAwAB8AERAUsBJAEjAQMBSgHwBwABbAFxA5cCeAOXAXEBbBIA - Ae8BKwEsAUUCvAEHAe8BBwG8AfABGQLbAWwBBwMAAfABIwIrAQ4B8AHxCAABSQFxApcBeAWXAXEBSRIA - ARIBLAFFAfIB8wHvAfIB8QG7AtoBswKLAfMEAAHwASMBNwExAQ4LAAFJAXEClwF4A5cBcQFJFAABEgG8 - AgABBwGzAdQBswJsAe8IAAHvAg4B8wwAAWwBcQSXAXEBbBkAAQcCEgG8HQAEcRcAAfQL8wH0EwAN8xMA - AQcL7wEHAgAPEAEAAQcNswEHBwAEQwcAAe8BAAG7BrMBuwIAAe8CAAEQBjgBEAbTARABAAGzDQABswUA - AkME8AJDBQAB7wEAAbMGAAGzAgAB7wIAARACOAMAATgBEALTAgAC0wEQAQABsw0AAbMEAAFDCPABQwQA - Ae8BAAGtAQABlwJWAZcBAAGzAgAB7wIAARADOAEAAjgBEAHTAQAC0wEAAdMBEAEAAbMBAAFWCVABVgEA - AbMDAAFDA/ABkgJDAZID8AFDAwAB7wEAAa0BAARWAQABswH0AQAB7wIAARACOAIAAjgBEAHTAQAC0wEA - AdMBEAEAAbMBAAtWAQABswMAAUMB8AGSARIBQwHwAZIBQwESAZIB8AFDAwAB7wEAAa0BAARWAQABswH0 - AQAB7wIAARADOAEAAjgBEALTAgAC0wEQAQABswEAC1YBAAGzAgABQwHwARICYwFDAQAB8AFDAmMBEgHw - AUMCAAHvAQABrQEABHgBAAGzAfQBAAHvAgABEAY4ARAG0wEQAQABswEAC1YBAAGzAgABQwESBEcCQwRH - ARIBQwIAAe8BAAGtBgABswHzAQAB7wIADxABAAGzAQALVgEAAbMCAAFDDEcBQwIAAe8BAAG7Aq0EswG7 - AfMBAAHvAgABEAZHARAGAAEQAQABswEAC1YBAAGzAgABQwxHAUMCAAHvAQAB8wP0AfMB9AQAAe8CAAEQ - AkcCAAJHARAGAAEQAQABswEAC1YBAAGzAwABQwJHApQGRwFDAwAB7wEAAXQCMgEsAXQBAAG8AvcBAAHv - AgABEAFHAQACRwEAAUcBEAYAARABAAGzAQABVgl4AVYBAAGzAwABQwFHBJQFRwFDAwAB7wEAASwDwwFT - AQAB9wIAAfMB8AIAARABRwEAAkcBAAFHARAGAAEQAQABswEAC3gBAAGzBAABQwSUBEcBQwQAAe8BAAF0 - AywBdAEAAfcBAAHzAfADAAEQAkcCAAJHARAGAAEQAQABswEAC3gBAAGzBQACQwGUA0cCQwUAAe8IAAHz - AfAEAAEQBkcBEAYAARABAAGzDQABswcABEMHAAEHCO8BBwUADxABAAEJDbMBCREAAUIBTQE+BwABPgMA - ASgDAAFAAwABIAMAAQEBAAEBBgABARYAA/8BAAH/AY8BvwH/AeABBwIAAfgBBwKPAcABAwIAAcABBwGP - AQcBwAEDAgABgAEHAY4BAwGAAQECAAGAAQMBgAEBAYABAQIAAYABAwGAAQEBgAEBAgABgAEBAYABAAGA - AQECAAHAAQEBwAEAAYABAQIAAcABAAHAAQEBgAEBAgABwAEAAcABAQGAAQECAAHAAQAB4AEPAYABAQIA - AYABAAHgAR8BwAEDBAAB4AE/AcABAwMAAQEB4AH/AeABBwIAAZgBDwHwAf8B8AEPAgAB+AF/Av8B/AE/ - AgABgAEDAv8BgAEDAv8BgAEDAQABAQEAAQEB/AE/AaABGwEAAQEBfwH9AfABDwGvAdsBAAExAX8B/QHg - AQcBqAFbAQABSQFAAQUBwAEDAagBSwEAAUkBQAEFAcABAwGoAUsBAAExAUABBQGBAQEBqAFLAQABAQFA - AQUBgAEBAa8BywEAAQEBQAEFAYABAQGgAQsBAAH9AUABBQGAAQEBoAF7ARgBxQFAAQUBwAEDAaABiwEk - Ae0BQAEFAcABAwGgAbMBJAHNAUABBQHgAQcBoAGnARgB7QFAAQUB8AEPAb8BzwEAAf0BfwH9AfwBPwGA - AR8BAAEBAQABAQL/Cw== - - 17, 17 @@ -1339,6 +1342,9 @@ qcnkDWXJtp9DVaw7AAAAAElFTkSuQmCC + + 533, 20 + 48 diff --git a/DS_Map/Properties/Resources.Designer.cs b/DS_Map/Properties/Resources.Designer.cs index ce1eadd..c40e096 100644 --- a/DS_Map/Properties/Resources.Designer.cs +++ b/DS_Map/Properties/Resources.Designer.cs @@ -250,6 +250,16 @@ namespace DSPRE.Properties { } } + /// + /// Cerca una risorsa localizzata di tipo System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap checkmark { + get { + object obj = ResourceManager.GetObject("checkmark", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Cerca una risorsa localizzata di tipo System.Drawing.Bitmap. /// @@ -1606,5 +1616,15 @@ namespace DSPRE.Properties { return ((System.Drawing.Bitmap)(obj)); } } + + /// + /// Cerca una risorsa localizzata di tipo System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap wideLensImageTransp { + get { + object obj = ResourceManager.GetObject("wideLensImageTransp", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } } } diff --git a/DS_Map/Properties/Resources.resx b/DS_Map/Properties/Resources.resx index 7b589eb..0f73a79 100644 --- a/DS_Map/Properties/Resources.resx +++ b/DS_Map/Properties/Resources.resx @@ -148,8 +148,8 @@ ..\Graphics\Camera Angles\DPPt\dpcamera6.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\graphics\weather\hgss\hgssarcade.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\graphics\camera angles\hgss\hgsscamera12.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Graphics\Camera Angles\DPPt\ptcamera11.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -190,9 +190,6 @@ ..\Graphics\Camera Angles\DPPt\ptcamera6.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Graphics\Weather\DPPt\ptspotlight.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Graphics\Program Icons\SurfIcon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -358,6 +355,9 @@ ..\graphics\weather\hgss\hgssrain.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Graphics\Program Icons\wideLensImageTransp.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\graphics\program icons\exportarrow.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -394,6 +394,9 @@ ..\Graphics\Area Icons\hgssgray.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Graphics\Program Icons\copyIcon_small.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Graphics\Weather\DPPt\dplightning.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -478,9 +481,6 @@ ..\Graphics\Weather\DPPt\dpdiamondsnow.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\graphics\camera angles\hgss\hgsscamera12.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Graphics\Weather\DPPt\ptheavyrain.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -493,6 +493,9 @@ ..\Graphics\Program Icons\arrowup.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\graphics\weather\hgss\hgssarcade.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Graphics\Weather\DPPt\dpsandstorm.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -511,8 +514,8 @@ Plat - - ..\Graphics\Program Icons\warpGo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Graphics\Weather\DPPt\ptspotlight.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Graphics\Area Icons\areaicon00.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -553,6 +556,9 @@ ..\Graphics\Weather\DPPt\dphail.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Graphics\Program Icons\warpGo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Graphics\Camera Angles\DPPt\ptcamera1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -580,7 +586,7 @@ ..\Graphics\Program Icons\WheelClick.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Graphics\Program Icons\copyIcon_small.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Graphics\Program Icons\checkmark.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a \ No newline at end of file diff --git a/DS_Map/ROMToolboxDialog.Designer.cs b/DS_Map/ROMToolboxDialog.Designer.cs index 039f447..e163616 100644 --- a/DS_Map/ROMToolboxDialog.Designer.cs +++ b/DS_Map/ROMToolboxDialog.Designer.cs @@ -29,8 +29,6 @@ private void InitializeComponent() { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ROMToolboxDialog)); this.applyItemStandardizeButton = new System.Windows.Forms.Button(); - this.StandardizePatchLBL = new System.Windows.Forms.Label(); - this.StandardizePatchTextLBL = new System.Windows.Forms.Label(); this.arm9expansionTextLBL = new System.Windows.Forms.Label(); this.arm9expansionLBL = new System.Windows.Forms.Label(); this.applyARM9ExpansionButton = new System.Windows.Forms.Button(); @@ -44,52 +42,44 @@ this.overlay1patchtextLBL = new System.Windows.Forms.Label(); this.overlay1uncomprButton = new System.Windows.Forms.Button(); this.bdhcamARM9requiredLBL = new System.Windows.Forms.Label(); + this.arm9patchCB = new System.Windows.Forms.PictureBox(); + this.overlay1CB = new System.Windows.Forms.PictureBox(); + this.bdhcamCB = new System.Windows.Forms.PictureBox(); + this.sentenceCaseCB = new System.Windows.Forms.PictureBox(); + this.itemNumbersCB = new System.Windows.Forms.PictureBox(); + this.StandardizePatchLBL = new System.Windows.Forms.Label(); + this.StandardizePatchTextLBL = new System.Windows.Forms.Label(); + ((System.ComponentModel.ISupportInitialize)(this.arm9patchCB)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.overlay1CB)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bdhcamCB)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.sentenceCaseCB)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.itemNumbersCB)).BeginInit(); this.SuspendLayout(); // // applyItemStandardizeButton // - this.applyItemStandardizeButton.Location = new System.Drawing.Point(330, 337); + this.applyItemStandardizeButton.Location = new System.Drawing.Point(335, 346); this.applyItemStandardizeButton.Name = "applyItemStandardizeButton"; - this.applyItemStandardizeButton.Size = new System.Drawing.Size(100, 31); + this.applyItemStandardizeButton.Size = new System.Drawing.Size(100, 50); this.applyItemStandardizeButton.TabIndex = 0; this.applyItemStandardizeButton.Text = "Apply Patch"; this.applyItemStandardizeButton.UseVisualStyleBackColor = true; this.applyItemStandardizeButton.Click += new System.EventHandler(this.ApplyItemStandardizeButton_Click); - // - // StandardizePatchLBL - // - this.StandardizePatchLBL.AutoSize = true; - this.StandardizePatchLBL.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.StandardizePatchLBL.Location = new System.Drawing.Point(15, 322); - this.StandardizePatchLBL.Name = "StandardizePatchLBL"; - this.StandardizePatchLBL.Size = new System.Drawing.Size(155, 13); - this.StandardizePatchLBL.TabIndex = 1; - this.StandardizePatchLBL.Text = "Standardize Item Numbers"; - // - // StandardizePatchTextLBL - // - this.StandardizePatchTextLBL.AutoSize = true; - this.StandardizePatchTextLBL.Location = new System.Drawing.Point(15, 337); - this.StandardizePatchTextLBL.Name = "StandardizePatchTextLBL"; - this.StandardizePatchTextLBL.Size = new System.Drawing.Size(305, 26); - this.StandardizePatchTextLBL.TabIndex = 2; - this.StandardizePatchTextLBL.Text = "Makes it so that PokéBall item scripts follow the order of items\r\nas indexed in t" + - "he ROM. Needed for \'Item\' option in Event Editor\r\n"; // // arm9expansionTextLBL // - this.arm9expansionTextLBL.AutoSize = true; - this.arm9expansionTextLBL.Location = new System.Drawing.Point(15, 32); + this.arm9expansionTextLBL.Location = new System.Drawing.Point(15, 34); this.arm9expansionTextLBL.Name = "arm9expansionTextLBL"; - this.arm9expansionTextLBL.Size = new System.Drawing.Size(298, 52); + this.arm9expansionTextLBL.Size = new System.Drawing.Size(288, 58); this.arm9expansionTextLBL.TabIndex = 5; this.arm9expansionTextLBL.Text = resources.GetString("arm9expansionTextLBL.Text"); + this.arm9expansionTextLBL.UseMnemonic = false; // // arm9expansionLBL // this.arm9expansionLBL.AutoSize = true; this.arm9expansionLBL.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.arm9expansionLBL.Location = new System.Drawing.Point(15, 17); + this.arm9expansionLBL.Location = new System.Drawing.Point(15, 19); this.arm9expansionLBL.Name = "arm9expansionLBL"; this.arm9expansionLBL.Size = new System.Drawing.Size(103, 13); this.arm9expansionLBL.TabIndex = 4; @@ -97,9 +87,9 @@ // // applyARM9ExpansionButton // - this.applyARM9ExpansionButton.Location = new System.Drawing.Point(330, 32); + this.applyARM9ExpansionButton.Location = new System.Drawing.Point(335, 29); this.applyARM9ExpansionButton.Name = "applyARM9ExpansionButton"; - this.applyARM9ExpansionButton.Size = new System.Drawing.Size(100, 31); + this.applyARM9ExpansionButton.Size = new System.Drawing.Size(100, 50); this.applyARM9ExpansionButton.TabIndex = 3; this.applyARM9ExpansionButton.Text = "Expand ARM9"; this.applyARM9ExpansionButton.UseVisualStyleBackColor = true; @@ -107,22 +97,22 @@ // // BDHCAMpatchTextLBL // - this.BDHCAMpatchTextLBL.AutoSize = true; this.BDHCAMpatchTextLBL.Enabled = false; - this.BDHCAMpatchTextLBL.Location = new System.Drawing.Point(14, 170); + this.BDHCAMpatchTextLBL.Location = new System.Drawing.Point(15, 184); this.BDHCAMpatchTextLBL.Name = "BDHCAMpatchTextLBL"; - this.BDHCAMpatchTextLBL.Size = new System.Drawing.Size(231, 65); + this.BDHCAMpatchTextLBL.Size = new System.Drawing.Size(293, 67); this.BDHCAMpatchTextLBL.TabIndex = 8; this.BDHCAMpatchTextLBL.Text = "Adds Dynamic BDHC Cameras to current ROM.\r\nWith this patch, you have more control" + " over \r\nthe game camera\'s rotation and position.\r\nYou will need Trifindo\'s PDSMS" + "\r\nin order to make BDHCAM Files.\r\n"; + this.BDHCAMpatchTextLBL.UseMnemonic = false; // // BDHCAMpatchLBL // this.BDHCAMpatchLBL.AutoSize = true; this.BDHCAMpatchLBL.Enabled = false; this.BDHCAMpatchLBL.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.BDHCAMpatchLBL.Location = new System.Drawing.Point(14, 155); + this.BDHCAMpatchLBL.Location = new System.Drawing.Point(14, 168); this.BDHCAMpatchLBL.Name = "BDHCAMpatchLBL"; this.BDHCAMpatchLBL.Size = new System.Drawing.Size(107, 13); this.BDHCAMpatchLBL.TabIndex = 7; @@ -131,9 +121,9 @@ // BDHCAMpatchButton // this.BDHCAMpatchButton.Enabled = false; - this.BDHCAMpatchButton.Location = new System.Drawing.Point(330, 183); + this.BDHCAMpatchButton.Location = new System.Drawing.Point(335, 183); this.BDHCAMpatchButton.Name = "BDHCAMpatchButton"; - this.BDHCAMpatchButton.Size = new System.Drawing.Size(100, 31); + this.BDHCAMpatchButton.Size = new System.Drawing.Size(100, 50); this.BDHCAMpatchButton.TabIndex = 6; this.BDHCAMpatchButton.Text = "Apply Patch"; this.BDHCAMpatchButton.UseVisualStyleBackColor = true; @@ -141,20 +131,20 @@ // // label7 // - this.label7.AutoSize = true; this.label7.Enabled = false; - this.label7.Location = new System.Drawing.Point(15, 263); + this.label7.Location = new System.Drawing.Point(15, 283); this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(200, 39); + this.label7.Size = new System.Drawing.Size(293, 49); this.label7.TabIndex = 11; this.label7.Text = "BULBASAUR, IVYSAUR, VENUSAUR...\r\nbecome\r\nBulbasaur, Ivysaur, Venusaur...\r\n"; + this.label7.UseMnemonic = false; // // 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, 248); + this.label8.Location = new System.Drawing.Point(15, 268); this.label8.Name = "label8"; this.label8.Size = new System.Drawing.Size(252, 13); this.label8.TabIndex = 10; @@ -163,9 +153,9 @@ // namesToSentenceCaseButton // this.namesToSentenceCaseButton.Enabled = false; - this.namesToSentenceCaseButton.Location = new System.Drawing.Point(330, 263); + this.namesToSentenceCaseButton.Location = new System.Drawing.Point(335, 271); this.namesToSentenceCaseButton.Name = "namesToSentenceCaseButton"; - this.namesToSentenceCaseButton.Size = new System.Drawing.Size(100, 31); + this.namesToSentenceCaseButton.Size = new System.Drawing.Size(100, 50); this.namesToSentenceCaseButton.TabIndex = 9; this.namesToSentenceCaseButton.Text = "Coming soon"; this.namesToSentenceCaseButton.UseVisualStyleBackColor = true; @@ -175,7 +165,7 @@ // this.overlay1uncompressedLBL.AutoSize = true; this.overlay1uncompressedLBL.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.overlay1uncompressedLBL.Location = new System.Drawing.Point(15, 100); + this.overlay1uncompressedLBL.Location = new System.Drawing.Point(15, 105); this.overlay1uncompressedLBL.Name = "overlay1uncompressedLBL"; this.overlay1uncompressedLBL.Size = new System.Drawing.Size(217, 13); this.overlay1uncompressedLBL.TabIndex = 12; @@ -183,39 +173,120 @@ // // overlay1patchtextLBL // - this.overlay1patchtextLBL.AutoSize = true; - this.overlay1patchtextLBL.Location = new System.Drawing.Point(15, 115); + this.overlay1patchtextLBL.Location = new System.Drawing.Point(15, 120); this.overlay1patchtextLBL.Name = "overlay1patchtextLBL"; - this.overlay1patchtextLBL.Size = new System.Drawing.Size(223, 26); + this.overlay1patchtextLBL.Size = new System.Drawing.Size(293, 29); this.overlay1patchtextLBL.TabIndex = 13; this.overlay1patchtextLBL.Text = "Overlay1 won\'t have to be compressed again.\r\nThe operation is reversible.\r\n"; + this.overlay1patchtextLBL.UseMnemonic = false; // // overlay1uncomprButton // - this.overlay1uncomprButton.Location = new System.Drawing.Point(330, 106); + this.overlay1uncomprButton.Location = new System.Drawing.Point(335, 101); this.overlay1uncomprButton.Name = "overlay1uncomprButton"; - this.overlay1uncomprButton.Size = new System.Drawing.Size(100, 31); + this.overlay1uncomprButton.Size = new System.Drawing.Size(100, 50); this.overlay1uncomprButton.TabIndex = 14; this.overlay1uncomprButton.Text = "Apply Patch"; this.overlay1uncomprButton.UseVisualStyleBackColor = true; this.overlay1uncomprButton.Click += new System.EventHandler(this.overlay1uncomprButton_Click); // - // bdhcamARM9LBL + // bdhcamARM9requiredLBL // this.bdhcamARM9requiredLBL.AutoSize = true; this.bdhcamARM9requiredLBL.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.bdhcamARM9requiredLBL.Location = new System.Drawing.Point(117, 155); - this.bdhcamARM9requiredLBL.Name = "bdhcamARM9LBL"; + this.bdhcamARM9requiredLBL.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(64)))), ((int)(((byte)(0))))); + this.bdhcamARM9requiredLBL.Location = new System.Drawing.Point(118, 168); + this.bdhcamARM9requiredLBL.Name = "bdhcamARM9requiredLBL"; this.bdhcamARM9requiredLBL.Size = new System.Drawing.Size(165, 13); this.bdhcamARM9requiredLBL.TabIndex = 15; this.bdhcamARM9requiredLBL.Text = "(Requires ARM9 Expansion)"; // + // arm9patchCB + // + this.arm9patchCB.Image = global::DSPRE.Properties.Resources.checkmark; + this.arm9patchCB.Location = new System.Drawing.Point(309, 45); + this.arm9patchCB.Name = "arm9patchCB"; + this.arm9patchCB.Size = new System.Drawing.Size(20, 20); + this.arm9patchCB.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.arm9patchCB.TabIndex = 16; + this.arm9patchCB.TabStop = false; + this.arm9patchCB.Visible = false; + // + // overlay1CB + // + this.overlay1CB.Image = global::DSPRE.Properties.Resources.checkmark; + this.overlay1CB.Location = new System.Drawing.Point(309, 116); + this.overlay1CB.Name = "overlay1CB"; + this.overlay1CB.Size = new System.Drawing.Size(20, 20); + this.overlay1CB.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.overlay1CB.TabIndex = 17; + this.overlay1CB.TabStop = false; + this.overlay1CB.Visible = false; + // + // bdhcamCB + // + this.bdhcamCB.Image = global::DSPRE.Properties.Resources.checkmark; + this.bdhcamCB.Location = new System.Drawing.Point(309, 199); + this.bdhcamCB.Name = "bdhcamCB"; + this.bdhcamCB.Size = new System.Drawing.Size(20, 20); + this.bdhcamCB.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.bdhcamCB.TabIndex = 18; + this.bdhcamCB.TabStop = false; + this.bdhcamCB.Visible = false; + // + // sentenceCaseCB + // + this.sentenceCaseCB.Image = global::DSPRE.Properties.Resources.checkmark; + this.sentenceCaseCB.Location = new System.Drawing.Point(309, 286); + this.sentenceCaseCB.Name = "sentenceCaseCB"; + this.sentenceCaseCB.Size = new System.Drawing.Size(20, 20); + this.sentenceCaseCB.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.sentenceCaseCB.TabIndex = 19; + this.sentenceCaseCB.TabStop = false; + this.sentenceCaseCB.Visible = false; + // + // itemNumbersCB + // + this.itemNumbersCB.Image = global::DSPRE.Properties.Resources.checkmark; + this.itemNumbersCB.Location = new System.Drawing.Point(309, 359); + this.itemNumbersCB.Name = "itemNumbersCB"; + this.itemNumbersCB.Size = new System.Drawing.Size(20, 20); + this.itemNumbersCB.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.itemNumbersCB.TabIndex = 20; + this.itemNumbersCB.TabStop = false; + this.itemNumbersCB.Visible = false; + // + // StandardizePatchLBL + // + this.StandardizePatchLBL.AutoSize = true; + this.StandardizePatchLBL.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.StandardizePatchLBL.Location = new System.Drawing.Point(15, 343); + this.StandardizePatchLBL.Name = "StandardizePatchLBL"; + this.StandardizePatchLBL.Size = new System.Drawing.Size(155, 13); + this.StandardizePatchLBL.TabIndex = 1; + this.StandardizePatchLBL.Text = "Standardize Item Numbers"; + // + // StandardizePatchTextLBL + // + this.StandardizePatchTextLBL.Location = new System.Drawing.Point(15, 358); + this.StandardizePatchTextLBL.Name = "StandardizePatchTextLBL"; + this.StandardizePatchTextLBL.Size = new System.Drawing.Size(239, 40); + this.StandardizePatchTextLBL.TabIndex = 2; + this.StandardizePatchTextLBL.Text = "Makes it so that PokéBall item scripts follow the order of items\r\nas indexed in t" + + "he ROM. Needed for \'Item\' option in Event Editor\r\n"; + this.StandardizePatchTextLBL.UseMnemonic = false; + // // ROMToolboxDialog // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - this.ClientSize = new System.Drawing.Size(442, 378); + this.ClientSize = new System.Drawing.Size(448, 411); + this.Controls.Add(this.itemNumbersCB); + this.Controls.Add(this.sentenceCaseCB); + this.Controls.Add(this.bdhcamCB); + this.Controls.Add(this.overlay1CB); + this.Controls.Add(this.arm9patchCB); this.Controls.Add(this.bdhcamARM9requiredLBL); this.Controls.Add(this.overlay1uncomprButton); this.Controls.Add(this.overlay1patchtextLBL); @@ -237,6 +308,11 @@ this.Name = "ROMToolboxDialog"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.Text = "ROM Toolbox"; + ((System.ComponentModel.ISupportInitialize)(this.arm9patchCB)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.overlay1CB)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bdhcamCB)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.sentenceCaseCB)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.itemNumbersCB)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); @@ -245,8 +321,6 @@ #endregion private System.Windows.Forms.Button applyItemStandardizeButton; - private System.Windows.Forms.Label StandardizePatchLBL; - private System.Windows.Forms.Label StandardizePatchTextLBL; private System.Windows.Forms.Label arm9expansionTextLBL; private System.Windows.Forms.Label arm9expansionLBL; private System.Windows.Forms.Button applyARM9ExpansionButton; @@ -260,5 +334,12 @@ private System.Windows.Forms.Label overlay1patchtextLBL; private System.Windows.Forms.Button overlay1uncomprButton; private System.Windows.Forms.Label bdhcamARM9requiredLBL; + private System.Windows.Forms.PictureBox arm9patchCB; + private System.Windows.Forms.PictureBox overlay1CB; + private System.Windows.Forms.PictureBox bdhcamCB; + private System.Windows.Forms.PictureBox sentenceCaseCB; + private System.Windows.Forms.PictureBox itemNumbersCB; + private System.Windows.Forms.Label StandardizePatchLBL; + private System.Windows.Forms.Label StandardizePatchTextLBL; } } \ No newline at end of file diff --git a/DS_Map/ROMToolboxDialog.cs b/DS_Map/ROMToolboxDialog.cs index 42dade0..54017f9 100644 --- a/DS_Map/ROMToolboxDialog.cs +++ b/DS_Map/ROMToolboxDialog.cs @@ -76,7 +76,7 @@ namespace DSPRE { internal string overlayString1; internal string overlayString2; - internal int subroutineOffset; + internal uint subroutineOffset; internal byte[] subroutine; internal BDHCAMPatchData () { @@ -139,7 +139,7 @@ namespace DSPRE { case "P": bdhcamARM9requiredLBL.Enabled = false; BDHCAMpatchButton.Text = "Unsupported"; - + overlay1uncomprButton.Enabled = false; overlay1uncompressedLBL.Enabled = false; overlay1patchtextLBL.Enabled = false; @@ -151,8 +151,7 @@ namespace DSPRE { overlay1patchtextLBL.Enabled = false; overlay1uncomprButton.Text = "Unsupported"; - if (CheckFilesBDHCAMPatchApplied() == 1) - BDHCAMpatchButton.Text = "Already applied"; + CheckFilesBDHCAMPatchApplied(); break; case "HG": case "SS": @@ -160,10 +159,10 @@ namespace DSPRE { overlay1uncomprButton.Enabled = false; overlay1uncompressedLBL.Enabled = false; overlay1patchtextLBL.Enabled = false; + overlay1CB.Visible = true; overlay1uncomprButton.Text = "Already applied"; } - if (CheckFilesBDHCAMPatchApplied() == 1) - BDHCAMpatchButton.Text = "Already applied"; + CheckFilesBDHCAMPatchApplied(); break; } } @@ -174,17 +173,16 @@ namespace DSPRE { if (!flag_arm9Expanded) { ARM9PatchData data = new ARM9PatchData(); - try { - byte[] branchCodeRead = DSUtils.ReadFromArm9(data.branchOffset, data.branchString.Length / 3 + 1); //Read branchCode - byte[] initCodeRead = DSUtils.ReadFromArm9(data.initOffset, data.initString.Length / 3 + 1); //Read initCode - + try { byte[] branchCode = HexStringtoByteArray(data.branchString); - byte[] initCode = HexStringtoByteArray(data.branchString); - + byte[] branchCodeRead = DSUtils.ReadFromArm9(data.branchOffset, data.branchString.Length / 3 + 1); //Read branchCode if (branchCodeRead.Length != branchCode.Length) return 0; //0 means ARM9 Expansion has never been applied if (!branchCodeRead.SequenceEqual(branchCode)) return 0; + + byte[] initCode = HexStringtoByteArray(data.branchString); + byte[] initCodeRead = DSUtils.ReadFromArm9(data.initOffset, data.initString.Length / 3 + 1); //Read initCode if (initCodeRead.Length != initCode.Length) return 0; if (!initCodeRead.SequenceEqual(initCode)) @@ -197,6 +195,7 @@ namespace DSPRE { applyARM9ExpansionButton.Enabled = false; arm9expansionTextLBL.Enabled = false; arm9expansionLBL.Enabled = false; + arm9patchCB.Visible = true; applyARM9ExpansionButton.Text = "Already applied"; flag_arm9Expanded = true; @@ -217,19 +216,61 @@ namespace DSPRE { if (!flag_arm9Expanded) { bdhcamARM9requiredLBL.Visible = true; BDHCAMpatchButton.Enabled = false; - BDHCAMpatchLBL.Enabled = false; + BDHCAMpatchLBL.Enabled = true; BDHCAMpatchTextLBL.Enabled = false; return 0; } - if (flag_BDHCAMpatchApplied) - return 1; + if (!flag_BDHCAMpatchApplied) { + BDHCAMPatchData data = new BDHCAMPatchData(); + try { + byte[] branchCode = HexStringtoByteArray(data.branchString); + byte[] branchCodeRead = DSUtils.ReadFromArm9(data.branchOffset, branchCode.Length); + + if (branchCode.Length != branchCodeRead.Length) + return 0; //0 means BDHCAM patch has not been applied + if (!branchCode.SequenceEqual(branchCodeRead)) + return 0; + + + string overlayFilePath = romInfo.workDir + "overlay" + "\\" + "overlay_" + data.overlayNumber.ToString("D4") + ".bin"; + DSUtils.DecompressOverlay(data.overlayNumber, true); + overlayMustBeRestoredFromBackup = false; + + byte[] overlayCode1 = HexStringtoByteArray(data.overlayString1); + byte[] overlayCode1Read = DSUtils.ReadFromFile(overlayFilePath, data.overlayOffset1, overlayCode1.Length); + if (overlayCode1.Length != overlayCode1Read.Length) + return 0; //0 means BDHCAM patch has not been applied + if (!overlayCode1.SequenceEqual(overlayCode1Read)) + return 0; + + + byte[] overlayCode2 = HexStringtoByteArray(data.overlayString2); + byte[] overlayCode2Read = DSUtils.ReadFromFile(overlayFilePath, data.overlayOffset2, overlayCode2.Length); //Write new overlayCode1 + if (overlayCode2.Length != overlayCode2Read.Length) + return 0; //0 means BDHCAM patch has not been applied + if (!overlayCode2.SequenceEqual(overlayCode2Read)) + return 0; + + String fullFilePath = romInfo.syntheticOverlayPath + '\\' + expandedARMfileID.ToString("D4"); + byte[] subroutineRead = DSUtils.ReadFromFile(fullFilePath, data.subroutineOffset, data.subroutine.Length); //Write new overlayCode1 + if (data.subroutine.Length != subroutineRead.Length) + return 0; //0 means BDHCAM patch has not been applied + if (!data.subroutine.SequenceEqual(subroutineRead)) + return 0; + } catch { + return -1; + } + } bdhcamARM9requiredLBL.Visible = false; - BDHCAMpatchButton.Enabled = true; - BDHCAMpatchLBL.Enabled = true; - BDHCAMpatchTextLBL.Enabled = true; + BDHCAMpatchButton.Enabled = false; + BDHCAMpatchLBL.Enabled = false; + BDHCAMpatchTextLBL.Enabled = false; + bdhcamCB.Visible = true; + BDHCAMpatchButton.Text = "Already applied"; + flag_BDHCAMpatchApplied = true; return 0; } public bool CheckStandardizedItems() { @@ -238,7 +279,7 @@ namespace DSPRE { StandardizePatchLBL.Enabled = false; StandardizePatchTextLBL.Enabled = false; applyItemStandardizeButton.Text = "Already applied"; - + itemNumbersCB.Visible = true; flag_standardizedItems = true; return true; } @@ -256,6 +297,7 @@ namespace DSPRE { if (d == DialogResult.Yes) { //do things with RomInfo.pokémonNamesTextNumbers; + sentenceCaseCB.Visible = true; MessageBox.Show("Pokémon names have been converted to Sentence Case.", "Operation successful", MessageBoxButtons.OK, MessageBoxIcon.Information); } else { MessageBox.Show("No changes have been made.", "Operation canceled", MessageBoxButtons.OK, MessageBoxIcon.Information); @@ -301,22 +343,24 @@ namespace DSPRE { DSUtils.WriteToFile(overlayFilePath, data.overlayOffset1, HexStringtoByteArray(data.overlayString1)); //Write new overlayCode1 DSUtils.WriteToFile(overlayFilePath, data.overlayOffset2, HexStringtoByteArray(data.overlayString2)); //Write new overlayCode2 overlayMustBeRestoredFromBackup = false; + + String fullFilePath = romInfo.syntheticOverlayPath + '\\' + expandedARMfileID.ToString("D4"); + + /*Write Expanded ARM9 File*/ + DSUtils.WriteToFile(fullFilePath, data.subroutineOffset, data.subroutine); } catch { MessageBox.Show("Operation failed. It is strongly advised that you restore the arm9 and overlay from their respective backups.", "Something went wrong", MessageBoxButtons.OK, MessageBoxIcon.Error); return; } - String fullFilePath = romInfo.syntheticOverlayPath + '\\' + expandedARMfileID.ToString("D4"); - - /*Write Expanded ARM9 File*/ - using (BinaryWriter f = new BinaryWriter(File.OpenWrite(fullFilePath))) { - f.BaseStream.Position = data.subroutineOffset; - f.Write(data.subroutine); - } - flag_BDHCAMpatchApplied = true; - + bdhcamARM9requiredLBL.Visible = false; + BDHCAMpatchButton.Enabled = false; + BDHCAMpatchLBL.Enabled = false; + BDHCAMpatchTextLBL.Enabled = false; + bdhcamCB.Visible = true; + BDHCAMpatchButton.Text = "Already applied"; MessageBox.Show("The BDHCAM patch has been applied.", "Operation successful.", MessageBoxButtons.OK, MessageBoxIcon.Information); } else { MessageBox.Show("No changes have been made.", "Operation canceled", MessageBoxButtons.OK, MessageBoxIcon.Information); @@ -336,6 +380,7 @@ namespace DSPRE { overlay1uncomprButton.Enabled = false; overlay1uncompressedLBL.Enabled = false; overlay1patchtextLBL.Enabled = false; + overlay1CB.Visible = true; overlay1uncomprButton.Text = "Already applied"; MessageBox.Show("Overlay1 is now configured as uncompressed.", "Operation successful", MessageBoxButtons.OK, MessageBoxIcon.Information); } else { @@ -360,6 +405,7 @@ namespace DSPRE { StandardizePatchLBL.Enabled = false; StandardizePatchTextLBL.Enabled = false; applyItemStandardizeButton.Text = "Already applied"; + itemNumbersCB.Visible = true; flag_standardizedItems = true; } } @@ -393,7 +439,7 @@ namespace DSPRE { arm9expansionTextLBL.Enabled = false; arm9expansionLBL.Enabled = false; applyARM9ExpansionButton.Text = "Already applied"; - + arm9patchCB.Visible = true; flag_arm9Expanded = true; switch (RomInfo.gameVersion) { @@ -455,6 +501,4 @@ namespace DSPRE { } #endregion } - - -} +} \ No newline at end of file diff --git a/DS_Map/ROMToolboxDialog.resx b/DS_Map/ROMToolboxDialog.resx index dd51eb9..b56a2d2 100644 --- a/DS_Map/ROMToolboxDialog.resx +++ b/DS_Map/ROMToolboxDialog.resx @@ -119,8 +119,7 @@ Expands the ARM9's usable memory by repurposing a file -inside an unused NARC and turning it into a synthetic overlay, -in which you can place new code or new data. +inside an unused NARC and turning it into a synthetic overlay, in which you can place new code or new data. This patch is necessary to accomplish most ASM edits.