diff --git a/DS_Map/Main Window.Designer.cs b/DS_Map/Main Window.Designer.cs index 8d3b356..51bbdd2 100644 --- a/DS_Map/Main Window.Designer.cs +++ b/DS_Map/Main Window.Designer.cs @@ -30,6 +30,7 @@ { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainProgram)); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle(); 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(); @@ -44,7 +45,6 @@ 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(); this.mainTabControl = new System.Windows.Forms.TabControl(); this.headerEditorTabPage = new System.Windows.Forms.TabPage(); this.removeLastHeaderBTN = new System.Windows.Forms.Button(); @@ -181,11 +181,8 @@ this.matrixNameLabel = new System.Windows.Forms.Label(); this.matrixTabControl = new System.Windows.Forms.TabControl(); this.headersTabPage = new System.Windows.Forms.TabPage(); - this.headersGridView = new DSPRE.DataGridViewDoubleBuffered(); this.heightsTabPage = new System.Windows.Forms.TabPage(); - this.heightsGridView = new DSPRE.DataGridViewDoubleBuffered(); this.mapFilesTabPage = new System.Windows.Forms.TabPage(); - this.mapFilesGridView = new DSPRE.DataGridViewDoubleBuffered(); this.matrixNameTextBox = new System.Windows.Forms.TextBox(); this.heightUpDown = new System.Windows.Forms.NumericUpDown(); this.widthUpDown = new System.Windows.Forms.NumericUpDown(); @@ -687,9 +684,9 @@ this.partyPokemon1PictureBox = new System.Windows.Forms.PictureBox(); this.partyPokemon1ComboBox = new System.Windows.Forms.ComboBox(); this.groupBox27 = new System.Windows.Forms.GroupBox(); - this.label73 = new System.Windows.Forms.Label(); + this.eyeContactMusicAltLabel = new System.Windows.Forms.Label(); this.encounterSSEQAltUpDown = new System.Windows.Forms.NumericUpDown(); - this.label67 = new System.Windows.Forms.Label(); + this.eyeContactMusicLabel = new System.Windows.Forms.Label(); this.encounterSSEQMainUpDown = new System.Windows.Forms.NumericUpDown(); this.trainerClassFrameMaxLabel = new System.Windows.Forms.Label(); this.label40 = new System.Windows.Forms.Label(); @@ -812,6 +809,9 @@ this.spawnEditorToolStripButton = new System.Windows.Forms.ToolStripButton(); this.versionLabel = new System.Windows.Forms.Label(); this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); + this.headersGridView = new DSPRE.DataGridViewDoubleBuffered(); + this.heightsGridView = new DSPRE.DataGridViewDoubleBuffered(); + this.mapFilesGridView = new DSPRE.DataGridViewDoubleBuffered(); this.mainTabControl.SuspendLayout(); this.headerEditorTabPage.SuspendLayout(); this.worldmapCoordsGroupBox.SuspendLayout(); @@ -843,11 +843,8 @@ this.matrixEditorTabPage.SuspendLayout(); this.matrixTabControl.SuspendLayout(); this.headersTabPage.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.headersGridView)).BeginInit(); this.heightsTabPage.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.heightsGridView)).BeginInit(); this.mapFilesTabPage.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.mapFilesGridView)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.heightUpDown)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.widthUpDown)).BeginInit(); this.mapEditorTabPage.SuspendLayout(); @@ -1038,6 +1035,9 @@ this.menuStrip1.SuspendLayout(); this.statusStrip1.SuspendLayout(); this.mainToolStrip.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.headersGridView)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.heightsGridView)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.mapFilesGridView)).BeginInit(); this.SuspendLayout(); // // mainTabControl @@ -2660,59 +2660,6 @@ this.headersTabPage.Text = "Map Headers"; this.headersTabPage.UseVisualStyleBackColor = true; // - // headersGridView - // - this.headersGridView.AllowUserToAddRows = false; - this.headersGridView.AllowUserToDeleteRows = false; - this.headersGridView.AllowUserToResizeColumns = false; - this.headersGridView.AllowUserToResizeRows = false; - this.headersGridView.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; - dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); - dataGridViewCellStyle1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.Info; - dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.headersGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1; - this.headersGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle2.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle2.Format = "D4"; - dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.headersGridView.DefaultCellStyle = dataGridViewCellStyle2; - this.headersGridView.Location = new System.Drawing.Point(0, 0); - this.headersGridView.MultiSelect = false; - this.headersGridView.Name = "headersGridView"; - dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle3.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); - dataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.headersGridView.RowHeadersDefaultCellStyle = dataGridViewCellStyle3; - this.headersGridView.RowHeadersWidth = 50; - this.headersGridView.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing; - dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle4.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.headersGridView.RowsDefaultCellStyle = dataGridViewCellStyle4; - this.headersGridView.RowTemplate.DefaultCellStyle.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.headersGridView.RowTemplate.Height = 18; - this.headersGridView.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.False; - this.headersGridView.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect; - this.headersGridView.ShowCellErrors = false; - this.headersGridView.Size = new System.Drawing.Size(1032, 576); - this.headersGridView.TabIndex = 1; - this.headersGridView.CellFormatting += new System.Windows.Forms.DataGridViewCellFormattingEventHandler(this.headersGridView_CellFormatting); - this.headersGridView.CellMouseDoubleClick += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.headersGridView_CellMouseDoubleClick); - this.headersGridView.CellValueChanged += new System.Windows.Forms.DataGridViewCellEventHandler(this.headersGridView_CellValueChanged); - this.headersGridView.SelectionChanged += new System.EventHandler(this.headersGridView_SelectionChanged); - // // heightsTabPage // this.heightsTabPage.Controls.Add(this.heightsGridView); @@ -2723,59 +2670,6 @@ this.heightsTabPage.Text = "Map Heights"; this.heightsTabPage.UseVisualStyleBackColor = true; // - // heightsGridView - // - this.heightsGridView.AllowUserToAddRows = false; - this.heightsGridView.AllowUserToDeleteRows = false; - this.heightsGridView.AllowUserToResizeColumns = false; - this.heightsGridView.AllowUserToResizeRows = false; - dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.heightsGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle5; - this.heightsGridView.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; - dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle6.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); - dataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.heightsGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle6; - this.heightsGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle7.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle7.Font = new System.Drawing.Font("Tahoma", 8.25F); - dataGridViewCellStyle7.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle7.Format = "D2"; - dataGridViewCellStyle7.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.heightsGridView.DefaultCellStyle = dataGridViewCellStyle7; - this.heightsGridView.Location = new System.Drawing.Point(0, 0); - this.heightsGridView.MultiSelect = false; - this.heightsGridView.Name = "heightsGridView"; - dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle8.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle8.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); - dataGridViewCellStyle8.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle8.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle8.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.heightsGridView.RowHeadersDefaultCellStyle = dataGridViewCellStyle8; - this.heightsGridView.RowHeadersWidth = 50; - this.heightsGridView.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing; - dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle9.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.heightsGridView.RowsDefaultCellStyle = dataGridViewCellStyle9; - this.heightsGridView.RowTemplate.DefaultCellStyle.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.heightsGridView.RowTemplate.Height = 18; - this.heightsGridView.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.False; - this.heightsGridView.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect; - this.heightsGridView.Size = new System.Drawing.Size(1032, 576); - this.heightsGridView.TabIndex = 2; - this.heightsGridView.CellFormatting += new System.Windows.Forms.DataGridViewCellFormattingEventHandler(this.heightsGridView_CellFormatting); - this.heightsGridView.CellValueChanged += new System.Windows.Forms.DataGridViewCellEventHandler(this.heightsGridView_CellValueChanged); - this.heightsGridView.SelectionChanged += new System.EventHandler(this.heightsGridView_SelectionChanged); - // // mapFilesTabPage // this.mapFilesTabPage.Controls.Add(this.mapFilesGridView); @@ -2786,60 +2680,6 @@ this.mapFilesTabPage.Text = "Map Files"; this.mapFilesTabPage.UseVisualStyleBackColor = true; // - // mapFilesGridView - // - this.mapFilesGridView.AllowUserToAddRows = false; - this.mapFilesGridView.AllowUserToDeleteRows = false; - this.mapFilesGridView.AllowUserToResizeColumns = false; - this.mapFilesGridView.AllowUserToResizeRows = false; - dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.mapFilesGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle10; - this.mapFilesGridView.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; - dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle11.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle11.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); - dataGridViewCellStyle11.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle11.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle11.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.mapFilesGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle11; - this.mapFilesGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle12.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle12.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - dataGridViewCellStyle12.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle12.Format = "D4"; - dataGridViewCellStyle12.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle12.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.mapFilesGridView.DefaultCellStyle = dataGridViewCellStyle12; - this.mapFilesGridView.Location = new System.Drawing.Point(0, 0); - this.mapFilesGridView.MultiSelect = false; - this.mapFilesGridView.Name = "mapFilesGridView"; - dataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle13.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle13.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); - dataGridViewCellStyle13.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle13.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle13.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.mapFilesGridView.RowHeadersDefaultCellStyle = dataGridViewCellStyle13; - this.mapFilesGridView.RowHeadersWidth = 50; - this.mapFilesGridView.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing; - dataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle14.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.mapFilesGridView.RowsDefaultCellStyle = dataGridViewCellStyle14; - this.mapFilesGridView.RowTemplate.DefaultCellStyle.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.mapFilesGridView.RowTemplate.Height = 18; - this.mapFilesGridView.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.False; - this.mapFilesGridView.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect; - this.mapFilesGridView.Size = new System.Drawing.Size(1032, 576); - this.mapFilesGridView.TabIndex = 2; - this.mapFilesGridView.CellContentDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.mapFilesGridView_CellMouseDoubleClick); - this.mapFilesGridView.CellFormatting += new System.Windows.Forms.DataGridViewCellFormattingEventHandler(this.mapFilesGridView_CellFormatting); - this.mapFilesGridView.CellValueChanged += new System.Windows.Forms.DataGridViewCellEventHandler(this.mapFilesGridView_CellValueChanged); - this.mapFilesGridView.SelectionChanged += new System.EventHandler(this.mapFilesGridView_SelectionChanged); - // // matrixNameTextBox // this.matrixNameTextBox.Location = new System.Drawing.Point(13, 73); @@ -8908,9 +8748,9 @@ // // groupBox27 // - this.groupBox27.Controls.Add(this.label73); + this.groupBox27.Controls.Add(this.eyeContactMusicAltLabel); this.groupBox27.Controls.Add(this.encounterSSEQAltUpDown); - this.groupBox27.Controls.Add(this.label67); + this.groupBox27.Controls.Add(this.eyeContactMusicLabel); this.groupBox27.Controls.Add(this.encounterSSEQMainUpDown); this.groupBox27.Controls.Add(this.trainerClassFrameMaxLabel); this.groupBox27.Controls.Add(this.label40); @@ -8926,14 +8766,14 @@ this.groupBox27.TabStop = false; this.groupBox27.Text = "Trainer Class"; // - // label73 + // eyeContactMusicAltLabel // - this.label73.AutoSize = true; - this.label73.Location = new System.Drawing.Point(278, 69); - this.label73.Name = "label73"; - this.label73.Size = new System.Drawing.Size(117, 13); - this.label73.TabIndex = 36; - this.label73.Text = "Eye Contact Music [Alt]"; + this.eyeContactMusicAltLabel.AutoSize = true; + this.eyeContactMusicAltLabel.Location = new System.Drawing.Point(278, 69); + this.eyeContactMusicAltLabel.Name = "eyeContactMusicAltLabel"; + this.eyeContactMusicAltLabel.Size = new System.Drawing.Size(117, 13); + this.eyeContactMusicAltLabel.TabIndex = 36; + this.eyeContactMusicAltLabel.Text = "Eye Contact Music [Alt]"; // // encounterSSEQAltUpDown // @@ -8948,14 +8788,14 @@ this.encounterSSEQAltUpDown.Size = new System.Drawing.Size(81, 20); this.encounterSSEQAltUpDown.TabIndex = 35; // - // label67 + // eyeContactMusicLabel // - this.label67.AutoSize = true; - this.label67.Location = new System.Drawing.Point(143, 69); - this.label67.Name = "label67"; - this.label67.Size = new System.Drawing.Size(128, 13); - this.label67.TabIndex = 34; - this.label67.Text = "Eye Contact Music [Main]"; + this.eyeContactMusicLabel.AutoSize = true; + this.eyeContactMusicLabel.Location = new System.Drawing.Point(143, 69); + this.eyeContactMusicLabel.Name = "eyeContactMusicLabel"; + this.eyeContactMusicLabel.Size = new System.Drawing.Size(128, 13); + this.eyeContactMusicLabel.TabIndex = 34; + this.eyeContactMusicLabel.Text = "Eye Contact Music [Main]"; // // encounterSSEQMainUpDown // @@ -10267,6 +10107,166 @@ this.versionLabel.TabIndex = 9; this.versionLabel.Text = "ROM:"; // + // headersGridView + // + this.headersGridView.AllowUserToAddRows = false; + this.headersGridView.AllowUserToDeleteRows = false; + this.headersGridView.AllowUserToResizeColumns = false; + this.headersGridView.AllowUserToResizeRows = false; + this.headersGridView.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; + dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); + dataGridViewCellStyle1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.Info; + dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.headersGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1; + this.headersGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle2.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle2.Format = "D4"; + dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.headersGridView.DefaultCellStyle = dataGridViewCellStyle2; + this.headersGridView.Location = new System.Drawing.Point(0, 0); + this.headersGridView.MultiSelect = false; + this.headersGridView.Name = "headersGridView"; + dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle3.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); + dataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.headersGridView.RowHeadersDefaultCellStyle = dataGridViewCellStyle3; + this.headersGridView.RowHeadersWidth = 50; + this.headersGridView.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing; + dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle4.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.headersGridView.RowsDefaultCellStyle = dataGridViewCellStyle4; + this.headersGridView.RowTemplate.DefaultCellStyle.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.headersGridView.RowTemplate.Height = 18; + this.headersGridView.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.False; + this.headersGridView.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect; + this.headersGridView.ShowCellErrors = false; + this.headersGridView.Size = new System.Drawing.Size(1032, 576); + this.headersGridView.TabIndex = 1; + this.headersGridView.CellFormatting += new System.Windows.Forms.DataGridViewCellFormattingEventHandler(this.headersGridView_CellFormatting); + this.headersGridView.CellMouseDoubleClick += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.headersGridView_CellMouseDoubleClick); + this.headersGridView.CellValueChanged += new System.Windows.Forms.DataGridViewCellEventHandler(this.headersGridView_CellValueChanged); + this.headersGridView.SelectionChanged += new System.EventHandler(this.headersGridView_SelectionChanged); + // + // heightsGridView + // + this.heightsGridView.AllowUserToAddRows = false; + this.heightsGridView.AllowUserToDeleteRows = false; + this.heightsGridView.AllowUserToResizeColumns = false; + this.heightsGridView.AllowUserToResizeRows = false; + dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.heightsGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle5; + this.heightsGridView.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; + dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle6.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); + dataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.heightsGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle6; + this.heightsGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle7.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle7.Font = new System.Drawing.Font("Tahoma", 8.25F); + dataGridViewCellStyle7.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle7.Format = "D2"; + dataGridViewCellStyle7.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.heightsGridView.DefaultCellStyle = dataGridViewCellStyle7; + this.heightsGridView.Location = new System.Drawing.Point(0, 0); + this.heightsGridView.MultiSelect = false; + this.heightsGridView.Name = "heightsGridView"; + dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle8.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle8.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); + dataGridViewCellStyle8.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle8.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle8.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.heightsGridView.RowHeadersDefaultCellStyle = dataGridViewCellStyle8; + this.heightsGridView.RowHeadersWidth = 50; + this.heightsGridView.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing; + dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle9.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.heightsGridView.RowsDefaultCellStyle = dataGridViewCellStyle9; + this.heightsGridView.RowTemplate.DefaultCellStyle.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.heightsGridView.RowTemplate.Height = 18; + this.heightsGridView.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.False; + this.heightsGridView.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect; + this.heightsGridView.Size = new System.Drawing.Size(1032, 576); + this.heightsGridView.TabIndex = 2; + this.heightsGridView.CellFormatting += new System.Windows.Forms.DataGridViewCellFormattingEventHandler(this.heightsGridView_CellFormatting); + this.heightsGridView.CellValueChanged += new System.Windows.Forms.DataGridViewCellEventHandler(this.heightsGridView_CellValueChanged); + this.heightsGridView.SelectionChanged += new System.EventHandler(this.heightsGridView_SelectionChanged); + // + // mapFilesGridView + // + this.mapFilesGridView.AllowUserToAddRows = false; + this.mapFilesGridView.AllowUserToDeleteRows = false; + this.mapFilesGridView.AllowUserToResizeColumns = false; + this.mapFilesGridView.AllowUserToResizeRows = false; + dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.mapFilesGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle10; + this.mapFilesGridView.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; + dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle11.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle11.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); + dataGridViewCellStyle11.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle11.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle11.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.mapFilesGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle11; + this.mapFilesGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle12.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle12.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + dataGridViewCellStyle12.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle12.Format = "D4"; + dataGridViewCellStyle12.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle12.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.mapFilesGridView.DefaultCellStyle = dataGridViewCellStyle12; + this.mapFilesGridView.Location = new System.Drawing.Point(0, 0); + this.mapFilesGridView.MultiSelect = false; + this.mapFilesGridView.Name = "mapFilesGridView"; + dataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle13.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle13.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); + dataGridViewCellStyle13.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle13.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle13.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.mapFilesGridView.RowHeadersDefaultCellStyle = dataGridViewCellStyle13; + this.mapFilesGridView.RowHeadersWidth = 50; + this.mapFilesGridView.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing; + dataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle14.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.mapFilesGridView.RowsDefaultCellStyle = dataGridViewCellStyle14; + this.mapFilesGridView.RowTemplate.DefaultCellStyle.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.mapFilesGridView.RowTemplate.Height = 18; + this.mapFilesGridView.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.False; + this.mapFilesGridView.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect; + this.mapFilesGridView.Size = new System.Drawing.Size(1032, 576); + this.mapFilesGridView.TabIndex = 2; + this.mapFilesGridView.CellContentDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.mapFilesGridView_CellMouseDoubleClick); + this.mapFilesGridView.CellFormatting += new System.Windows.Forms.DataGridViewCellFormattingEventHandler(this.mapFilesGridView_CellFormatting); + this.mapFilesGridView.CellValueChanged += new System.Windows.Forms.DataGridViewCellEventHandler(this.mapFilesGridView_CellValueChanged); + this.mapFilesGridView.SelectionChanged += new System.EventHandler(this.mapFilesGridView_SelectionChanged); + // // MainProgram // this.AllowDrop = true; @@ -10286,7 +10286,7 @@ this.MainMenuStrip = this.menuStrip1; this.MaximizeBox = false; this.Name = "MainProgram"; - this.Text = "DS Pokémon Rom Editor 1.3.3 (Nømura, AdAstra/LD3005)"; + this.Text = "DS Pokémon Rom Editor 1.3.4 (Nømura, AdAstra/LD3005)"; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MainProgram_FormClosing); this.mainTabControl.ResumeLayout(false); this.headerEditorTabPage.ResumeLayout(false); @@ -10329,11 +10329,8 @@ this.matrixEditorTabPage.PerformLayout(); this.matrixTabControl.ResumeLayout(false); this.headersTabPage.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.headersGridView)).EndInit(); this.heightsTabPage.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.heightsGridView)).EndInit(); this.mapFilesTabPage.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.mapFilesGridView)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.heightUpDown)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.widthUpDown)).EndInit(); this.mapEditorTabPage.ResumeLayout(false); @@ -10581,6 +10578,9 @@ this.statusStrip1.PerformLayout(); this.mainToolStrip.ResumeLayout(false); this.mainToolStrip.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.headersGridView)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.heightsGridView)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.mapFilesGridView)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); @@ -11297,7 +11297,7 @@ private System.Windows.Forms.Label label66; private System.Windows.Forms.Button mapScreenshotButton; private System.Windows.Forms.NumericUpDown encounterSSEQAltUpDown; - private System.Windows.Forms.Label label67; + private System.Windows.Forms.Label eyeContactMusicLabel; private System.Windows.Forms.NumericUpDown encounterSSEQMainUpDown; private System.Windows.Forms.GroupBox pbEffectsGroupBox; private System.Windows.Forms.Label label22; @@ -11324,7 +11324,7 @@ private System.Windows.Forms.Label label71; private System.Windows.Forms.ComboBox pbEffectsPokemonCombobox; private System.Windows.Forms.ListBox pbEffectsVsPokemonListbox; - private System.Windows.Forms.Label label73; + private System.Windows.Forms.Label eyeContactMusicAltLabel; private System.Windows.Forms.PictureBox tbEditorTrClassPictureBox; private System.Windows.Forms.Label tbEditortrainerClassFrameMaxLabel; private System.Windows.Forms.NumericUpDown tbEditorTrClassFramePreviewUpDown; diff --git a/DS_Map/Main Window.cs b/DS_Map/Main Window.cs index c30a546..14d1c88 100644 --- a/DS_Map/Main Window.cs +++ b/DS_Map/Main Window.cs @@ -479,7 +479,7 @@ namespace DSPRE { Update(); } private void aboutToolStripMenuItem_Click(object sender, EventArgs e) { - string message = "DS Pokémon ROM Editor by Nømura and AdAstra/LD3005" + Environment.NewLine + "version 1.3.3" + Environment.NewLine + string message = "DS Pokémon ROM Editor by Nømura and AdAstra/LD3005" + Environment.NewLine + "version 1.3.4" + Environment.NewLine + Environment.NewLine + "This tool was largely inspired by Markitus95's \"Spiky's DS Map Editor\" (SDSME), 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 to Trifindo, Mikelan98, JackHack96, Pleonex and BagBoy." @@ -6590,6 +6590,7 @@ namespace DSPRE { } #endregion #endregion + #region Text Editor #region Variables @@ -7402,7 +7403,7 @@ namespace DSPRE { } #endregion - #region TrainerEditor + #region Trainer Editor private List partyPokemonComponentList = new List(); private List partyItemComponentList = new List(); private List partyLevelComponentList = new List(); @@ -8009,24 +8010,18 @@ namespace DSPRE { trainerClassNameTextbox.Text = GetTrainerClassNameFromListbox(trainerClassListBox.SelectedItem); - (uint entryOffset, ushort musicD, ushort? musicN) output; - if ( trainerClassEncounterMusicDict.TryGetValue((byte)trainerClassListBox.SelectedIndex, out output) ) { - encounterSSEQMainUpDown.Enabled = true; - encounterSSEQAltUpDown.Enabled = true; - + if (trainerClassEncounterMusicDict.TryGetValue((byte)trainerClassListBox.SelectedIndex, out (uint entryOffset, ushort musicD, ushort? musicN) output)) { + encounterSSEQMainUpDown.Enabled = eyeContactMusicLabel.Enabled = true; encounterSSEQMainUpDown.Value = output.musicD; - - if (gameFamily == gFamEnum.HGSS) { - encounterSSEQAltUpDown.Value = (ushort)output.musicN; - } } else { - encounterSSEQMainUpDown.Enabled = false; - encounterSSEQAltUpDown.Enabled = false; - + encounterSSEQMainUpDown.Enabled = eyeContactMusicLabel.Enabled = false; encounterSSEQMainUpDown.Value = 0; - encounterSSEQAltUpDown.Value = 0; } + eyeContactMusicAltLabel.Enabled = encounterSSEQAltUpDown.Enabled = (encounterSSEQMainUpDown.Enabled && gameFamily == gFamEnum.HGSS); + encounterSSEQAltUpDown.Value = output.musicN != null ? (ushort)output.musicN : 0; + + if (disableHandlers) { return; } diff --git a/DS_Map/Main Window.resx b/DS_Map/Main Window.resx index 4cf65fc..092750c 100644 --- a/DS_Map/Main Window.resx +++ b/DS_Map/Main Window.resx @@ -1958,7 +1958,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACM - EgAAAk1TRnQBSQFMAgEBCgEAAWQBFwFkARcBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + EgAAAk1TRnQBSQFMAgEBCgEAAXwBFwF8ARcBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAATADAAEBAQABCAYAAQwYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA @@ -2136,40 +2136,40 @@ iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALvSURBVFhH7ZfNbxJBGMb5ixqj9/bix8Wzh2oEihd7IPHU - QtC1NXrRWLUNBT1UUz1ZINLST22NB4gfKE22fqKEpSRtNK3RGiywO8477NvuLsMsxdakiU/yCyz77jzP - vrMzgGO/q0N/3XspYz3tyUG/ph+iCKVae+twyPFAtRgPlPXD3dFK4sJ8asivKTE/AZKDPgwBrxAAeALm - WMPqIk4VilpWKuZUjQMi+agPTU142tvqagEIvzop9dIae33LBL1wh7yBkHzMx1geD2yZ42cQjncNAEGg - S8zIqmzk/IaxzXZAyNyIp0IvhQDaTq4FkpHT29OzNn+5g1fEA4zSs/3q63uS9vXpla0OqJlhoiQkjXag - 3GyYZLTJEDBgKupU03clbfXxJYJYAyD5CVo32/8LVgxvPMBkjrKGgAGWJ7o3X42Yje0CINCR7Aupau0I - 1xwFIWpt7mNt5hkjdgGMKLQrhVH/b6E5aDtAbZ55xshOAsC0FEZ9NIBgb+BNQTHRvZn+iykoxqW6h5Ib - opmH0NqRFcp68jqpWoxzcboaxgM/RPuJKYTI3Ap0RZ6TqrgivtMAxjvOR3rpHYs3MsQUorWNyF2RH0pa - 7uWtSrOmiBz18XdE2Ip5FzTiy/RFTRFsvyZo3fNHbvEqAJUyIQKI9nWgtBgiuZk+7W3YzQbn1TDouex9 - L4E63UKs0mKYDq5Dg/AGBXM4jwG4IejxUqh2DtEtxDIFQGiQtWdXTeaAMQDAQjBjl8kY0S3EMhnbYA1g - h24hFs+oEf8DmALQB+797S7SdriTvTcaI7qFWDyjRmCAqQEPOXi0kyEPuxjHT5wih47RMP8iQPxaF1mi - ptCBA7QDYHyz52RdJ3QLe62/GShlJyWNZ2rEGAA7wJagxXgheMR+B+SpLIfPfaLf5TxzAANM3/CwDhhN - 5ySX9uGOE3647o4+L4TVRgGMzFBj5cHZvfvL9vNdcAOnxxig5Ta3qnJhygvfhh+HzmzqH+1HORx/AE+d - XPF2h8qVAAAAAElFTkSuQmCC + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALuSURBVFhH7ZfPbxJBFMf5ixqj9zYxRi+ePbTEYvFiDySe + Wgg6sUYvGkuNoeDPQzXxIJCC0KZqa4Q0kR6EhGqpRAKUpI2mNVqDUNhx3rCv3V2GWYqtSRO/ySew7Nv5 + fvfNzgCWo64+9fXwVXwx0hv3uBT1EEUZ9eZbiyUTdtfLYXdNPTwYrUevzicmXEox5KJA3OPEEPAKAYA3 + YI41vC5gbUBR10qErA3tgEgh6ERTHfbenpZaAMJvxMgoqzHXt5TXAXcoGggphJyctYh71xw/g3CiawAI + Al3iRkblAle2tW02A0Lmn9h22KUQQNnPtUA8MLA3PZvzN/pERSLAKDk31lh6TJSvb2/udqCRmqT5MFFY + B2qdhokHOwwBAyaC1kbyEVE2Xl+niDEA8mWa1c2N/YIVIxoP0JmjjCFggLWXw9X3D/XGZgEQ6Eg2SerG + jgjNURCi2eZrvM0iY8QsgJY860ppyvVbag7aC9CcZ5Exsp8AMC2lKScLINkbRFNQjg5Xk38xBeUwaXko + hSE6eQiNHVlnbC3eoXWDcS7EVkPE/UO2n+hCyMyNQFcyr0gdV8R3FkB7x4XAKLtj+UaG6EJ0txEN7qSf + EyW/dHenU1MkE3SKd0TYikUXtONzlChFyfarg9UtTp+XrwJQJeWjgGxfByppH83FiPLRf4EPLqrhsHO5 + pw4KdaqFXJW0nw2uwoKIBgVzOI8BhCHY8bKveQ5RLeTSBUBYkM13t3TmgDYAwENwY5vOGFEt5NIZm2AM + YIZqIZfIqB3/A+gCsAdu5f4Q7TnVz99rjRHVQi6RUTswwMy4nR4/3c/JTNo4Z89Z6YkzLMy/CBC+PUSX + mSl04BjrABhPjAy0dEK1MNfWh/FKNkIUkakWbQDsAF+CBuMF70nzHVCkWsZ/eYV9l4vMAQww67HzDmhN + Z4lNyT4YhB+uB6PVBX+jXQAtMWZcfHbp8P6y/fzk3cbp0Qbous3dqlaaccC34eq9i1X1o6Moi+UPmzda + 81svBvAAAAAASUVORK5CYII= iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAM2SURBVFhH7ZVfSFNRHMf32FPPPRYUdBMijXwVliWMROzB - YlnOTfrjpeEy0s3sqq0/kGCmqTMpoqSnKYn5rz9CD5MeNINp/6xQkxDCHhJMa/d0fmfnXO+9OzvTaUHQ - Dz7cs3v+fD/33O3MkkxJFXYk+V2E1LZSDdr952pPSXY0OI4AkHb55PqKpFfkamFSKQ0WCKT6Ze2a1np6 - 7TJaOLBKAbjSZVZfQ50FkalO33I4kITAUKNPne1Ryumy4vo62uQONXhVCGZo4UASAmwdEAl3nf9Fo4w1 - EaychwH6YIYWDqxBQE8oeCxCoy2WuWeXMniDGFo4oBPY6s5DW+w2lOO0oe3eo6sSAEIdK5TgCUBwJqbh - ipMAbbi3UgFDOCuzRKjBp37uLl7UC2w7cZAEnSm0od4HlaitViZUlRxGNedySZ/kyTcImF8tN5wVSMCE - 4YHqyMhdRZ19chGlnD1EFv4yEowheLucwOuDOSn+IhQZbUZT3Yo6fc/3QxgOtSxQowkAtX57UkA4MIkF - ok9fIH56w1bhVzDzqHhx+I6iSrIVyfiJFE82sls3EWypGwjQVkrzUaXnOKFMdpKxUpEVzXQpS7GvgCMh - +hLCAjvkvWTRqxfykCNrMyEnfSMB2vU3biK//ymS5WD0iseazxM9BglRuBnY1gq7leCySQRotwfbSLCi - DBAJ3lwzBgnRQcTDLMDeOW8sj3CHl38iwlHMmyACBHj3Y+jwohcPC8W/AqiF0RYETOIJ3IV0fOqvVscD - hWRxXj8B903cdyMYRyPEtfAqgDSwCHdRDPQzAa4E/jzWEu1j0AhxGQQYWGTu+TVDOKAXAIgECXYYghk0 - QlyG4ASYBRJBI8TFC4rHfwGDAP7CvWl1op2ZdtLWBzNohLh4QfFgAr11LpS2304INzsIB/Ly0e4sLPM3 - BLpqnWgMh8IO7MI7AMH1ZUdidoJGJK5vL+sWJnoUlReqRy/AdoD8BE3Bg037Ep+AvFoKBzzv8X85Lxxg - An3XXWQH9KGPFYf69lbBT7rU2uvDYCAST0BPPw6eaj+VQaetf31/3TTPXo9eIOltTraWpnvdH/uq1HeN - RYv01r9YFstv/Kom7B6lWSUAAAAASUVORK5CYII= + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAM0SURBVFhH7ZVfSFNRHMf32FPPPRYUtITIRb4KSxJGIvZg + cV01N+mPl4bLSDezW7b+QILaH3U2fCnpaYqWf5BKaNKDQRnMUpMiTUIIe0gwrd3T+Z2dc7337uxMpwVB + P/hwz+758/3cc7czSyZlrZGQNeghZIcrNWj3n6t9FQWJ4BQCgO3aqY0Vyakp0sKslTRYIJAdlLWrre3M + +mW0cGCNAnCly6y9hruc8emuwEo4kIHAcFNAnetTqumy4vo62uyNNvpVCGZo4UAGAmwdEIn1XPhFo4w1 + FaldgAH6YIYWDqxDQE80UhKn0RbL/LOrubxBDC0c0Als9xajbZIDFbodaKf/6JoEgGjnKiV4AhCch7l9 + 3U2ANtxbrYAhnJVZItoYUD8/Ll/SC+w4eYgEnS11oP6HtShcLxMuVRxBdeeLSJ/V5zQImF8tN5wVSMCE + kcHL8Zftijr35ArKOneYLPzlVSSJSHs1gdcHc7KCZSg+2oI+divqzP3AD2E41IpAnSYA1AeljIBw4AMW + SDy9U/z0hq3Cr2C2t3xpJKyoVtmOZPxEiq8ASfYtBEf2JgK0lUonqvWdIFTJbjLWWmZHsz3KcvIr4EiI + voSwwC55P1n0xsVi5MrfSijM2UyAdtOtuygYfIpkOZK44rHm80SPQUIUbga2tUayEzwOKwHaHZEwCVaU + QSLBm2vGICE6iHiYBdg7543lEev0809EOIp5E0SAAO9+Ep1+9KL7mPhXALU42oqAT3gCdyEdU32K+jZU + Shbn9RNw39QDL4JxNEJci29CSAOLcBfFQD8T4Ergz2OtiT4GjRCXQYCBReaf3zSEA3oBgEiQYJchmEEj + xGUIToNZIB00Qly8oFT8FzAI4C/ceJsb7c6TSFsfzKAR4uIFpYIJ9Dd4kO2ARIi1uAgHi51obz6W+RsC + PfVuNIZDYQf24B2A4KaqkqSdoBHp69vrhsWJR4rKC9WjF2A7QH6CpuChZnv6E5BXy7GQbxz/l/PCASYw + 0OghO6APHVBc6sS94z/pUuuvyaFQPJWAnj4cPN1xOpdO2/j6/q55gb0evUDG25xpLc/0e9/3KurknbIl + eutfLIvlN1XfJahS5LwGAAAAAElFTkSuQmCC diff --git a/DS_Map/Properties/AssemblyInfo.cs b/DS_Map/Properties/AssemblyInfo.cs index d06d652..35f27e8 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.3.3")] +[assembly: AssemblyTitle("DSPRE Reloaded 1.3.4")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("DSPRE Reloaded 1.3.3")] +[assembly: AssemblyProduct("DSPRE Reloaded 1.3.4")] [assembly: AssemblyCopyright("Copyright © 2021")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -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.3.3")] -[assembly: AssemblyFileVersion("1.3.3")] +[assembly: AssemblyVersion("1.3.4")] +[assembly: AssemblyFileVersion("1.3.4")]