diff --git a/DS_Map/DSPRE.csproj b/DS_Map/DSPRE.csproj index db2935d..e31536c 100644 --- a/DS_Map/DSPRE.csproj +++ b/DS_Map/DSPRE.csproj @@ -1265,6 +1265,7 @@ + diff --git a/DS_Map/Main Window.Designer.cs b/DS_Map/Main Window.Designer.cs index 5e67313..4fff21b 100644 --- a/DS_Map/Main Window.Designer.cs +++ b/DS_Map/Main Window.Designer.cs @@ -30,23 +30,23 @@ { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainProgram)); - 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(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle31 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle32 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle33 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle34 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle 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(); this.mainTabControl = new System.Windows.Forms.TabControl(); this.headerEditorTabPage = new System.Windows.Forms.TabPage(); this.removeLastHeaderBTN = new System.Windows.Forms.Button(); @@ -184,8 +184,11 @@ 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(); @@ -670,6 +673,9 @@ this.partyPokemon1ComboBox = new System.Windows.Forms.ComboBox(); this.trainerSaveCurrentButton = new System.Windows.Forms.Button(); this.groupBox27 = new System.Windows.Forms.GroupBox(); + this.trainerClassFrameMaxLabel = new System.Windows.Forms.Label(); + this.label40 = new System.Windows.Forms.Label(); + this.trClassFramePreviewUpDown = new System.Windows.Forms.NumericUpDown(); this.saveTrainerClassButton = new System.Windows.Forms.Button(); this.label22 = new System.Windows.Forms.Label(); this.trClassVSAnimationUpDown = new System.Windows.Forms.NumericUpDown(); @@ -727,6 +733,7 @@ this.loadRomButton = new System.Windows.Forms.ToolStripButton(); this.saveRomButton = new System.Windows.Forms.ToolStripButton(); this.mainToolStrip = new System.Windows.Forms.ToolStrip(); + this.readDataFromFolderButton = new System.Windows.Forms.ToolStripButton(); this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator(); this.unpackAllButton = new System.Windows.Forms.ToolStripButton(); this.updateMapNarcsButton = new System.Windows.Forms.ToolStripButton(); @@ -745,12 +752,6 @@ this.spawnEditorToolStripButton = new System.Windows.Forms.ToolStripButton(); this.versionLabel = new System.Windows.Forms.Label(); this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); - this.label40 = new System.Windows.Forms.Label(); - this.trClassFramePreviewUpDown = new System.Windows.Forms.NumericUpDown(); - this.trainerClassFrameMaxLabel = new System.Windows.Forms.Label(); - this.headersGridView = new DSPRE.DataGridViewDoubleBuffered(); - this.heightsGridView = new DSPRE.DataGridViewDoubleBuffered(); - this.mapFilesGridView = new DSPRE.DataGridViewDoubleBuffered(); this.mainTabControl.SuspendLayout(); this.headerEditorTabPage.SuspendLayout(); this.worldmapCoordsGroupBox.SuspendLayout(); @@ -782,8 +783,11 @@ 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(); @@ -948,6 +952,7 @@ ((System.ComponentModel.ISupportInitialize)(this.partyBall1UpDown)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.partyPokemon1PictureBox)).BeginInit(); this.groupBox27.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.trClassFramePreviewUpDown)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.trClassVSAnimationUpDown)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.trClassBattleSSEQUpDown)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.trainerClassPicBox)).BeginInit(); @@ -958,10 +963,6 @@ this.menuStrip1.SuspendLayout(); this.statusStrip1.SuspendLayout(); this.mainToolStrip.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.trClassFramePreviewUpDown)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.headersGridView)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.heightsGridView)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.mapFilesGridView)).BeginInit(); this.SuspendLayout(); // // mainTabControl @@ -2124,7 +2125,7 @@ this.headerListBox.Name = "headerListBox"; this.headerListBox.Size = new System.Drawing.Size(214, 484); this.headerListBox.TabIndex = 2; - this.headerListBox.SelectedValueChanged += new System.EventHandler(this.headerListBox_SelectedIndexChanged); + this.headerListBox.SelectedValueChanged += new System.EventHandler(this.headerListBox_SelectedValueChanged); this.headerListBox.Leave += new System.EventHandler(this.headerListBox_Leave); // // saveHeaderButton @@ -2219,6 +2220,7 @@ // pasteMapSettingsButton // this.pasteMapSettingsButton.Enabled = false; + this.pasteMapSettingsButton.Image = global::DSPRE.Properties.Resources.pasteIcon; this.pasteMapSettingsButton.Location = new System.Drawing.Point(239, 74); this.pasteMapSettingsButton.Name = "pasteMapSettingsButton"; this.pasteMapSettingsButton.Size = new System.Drawing.Size(35, 37); @@ -2597,6 +2599,64 @@ 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; + dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.headersGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; + 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; + 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; + this.headersGridView.Location = new System.Drawing.Point(0, 0); + this.headersGridView.MultiSelect = false; + 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; + 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; + 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, 597); + 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); @@ -2607,6 +2667,62 @@ 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; + dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.heightsGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle6; + 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; + 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; + this.heightsGridView.Location = new System.Drawing.Point(0, 0); + this.heightsGridView.MultiSelect = false; + 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; + 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; + 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); @@ -2617,6 +2733,63 @@ 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; + dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.mapFilesGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle11; + 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; + 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; + this.mapFilesGridView.Location = new System.Drawing.Point(0, 0); + this.mapFilesGridView.MultiSelect = false; + 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; + 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; + 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); @@ -7063,8 +7236,8 @@ this.textEditorDataGridView.Location = new System.Drawing.Point(12, 77); this.textEditorDataGridView.Name = "textEditorDataGridView"; this.textEditorDataGridView.RowHeadersWidth = 68; - dataGridViewCellStyle18.Font = new System.Drawing.Font("Consolas", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.textEditorDataGridView.RowsDefaultCellStyle = dataGridViewCellStyle18; + dataGridViewCellStyle16.Font = new System.Drawing.Font("Consolas", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.textEditorDataGridView.RowsDefaultCellStyle = dataGridViewCellStyle16; this.textEditorDataGridView.Size = new System.Drawing.Size(873, 496); this.textEditorDataGridView.TabIndex = 24; this.textEditorDataGridView.CellValueChanged += new System.Windows.Forms.DataGridViewCellEventHandler(this.textEditorDataGridView_CellValueChanged); @@ -7223,14 +7396,14 @@ this.cameraEditorDataGridView.CausesValidation = false; this.cameraEditorDataGridView.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.Raised; this.cameraEditorDataGridView.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single; - dataGridViewCellStyle19.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle19.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); - dataGridViewCellStyle19.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - dataGridViewCellStyle19.ForeColor = System.Drawing.SystemColors.Info; - dataGridViewCellStyle19.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle19.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle19.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.cameraEditorDataGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle19; + dataGridViewCellStyle17.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle17.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); + dataGridViewCellStyle17.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + dataGridViewCellStyle17.ForeColor = System.Drawing.SystemColors.Info; + dataGridViewCellStyle17.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle17.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle17.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.cameraEditorDataGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle17; this.cameraEditorDataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.cameraEditorDataGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.DistanceGVCol, @@ -8503,6 +8676,32 @@ this.groupBox27.TabStop = false; this.groupBox27.Text = "Trainer Class"; // + // trainerClassFrameMaxLabel + // + this.trainerClassFrameMaxLabel.AutoSize = true; + this.trainerClassFrameMaxLabel.Location = new System.Drawing.Point(180, 33); + this.trainerClassFrameMaxLabel.Name = "trainerClassFrameMaxLabel"; + this.trainerClassFrameMaxLabel.Size = new System.Drawing.Size(18, 13); + this.trainerClassFrameMaxLabel.TabIndex = 32; + this.trainerClassFrameMaxLabel.Text = "/0"; + // + // label40 + // + this.label40.AutoSize = true; + this.label40.Location = new System.Drawing.Point(143, 14); + this.label40.Name = "label40"; + this.label40.Size = new System.Drawing.Size(77, 13); + this.label40.TabIndex = 31; + this.label40.Text = "Frame Preview"; + // + // trClassFramePreviewUpDown + // + this.trClassFramePreviewUpDown.Location = new System.Drawing.Point(146, 30); + this.trClassFramePreviewUpDown.Name = "trClassFramePreviewUpDown"; + this.trClassFramePreviewUpDown.Size = new System.Drawing.Size(34, 20); + this.trClassFramePreviewUpDown.TabIndex = 30; + this.trClassFramePreviewUpDown.ValueChanged += new System.EventHandler(this.trClassFramePreviewUpDown_ValueChanged); + // // saveTrainerClassButton // this.saveTrainerClassButton.Image = global::DSPRE.Properties.Resources.save_rom; @@ -9044,7 +9243,7 @@ // loadRomButton // this.loadRomButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.loadRomButton.Image = ((System.Drawing.Image)(resources.GetObject("loadRomButton.Image"))); + this.loadRomButton.Image = global::DSPRE.Properties.Resources.open_rom; this.loadRomButton.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.loadRomButton.ImageTransparentColor = System.Drawing.Color.Magenta; this.loadRomButton.Margin = new System.Windows.Forms.Padding(13, 6, 0, 2); @@ -9072,6 +9271,7 @@ this.mainToolStrip.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden; this.mainToolStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.loadRomButton, + this.readDataFromFolderButton, this.saveRomButton, this.toolStripSeparator3, this.unpackAllButton, @@ -9095,6 +9295,19 @@ this.mainToolStrip.TabIndex = 16; this.mainToolStrip.Text = "mainToolStrip"; // + // openFolderWithoutRomButton + // + this.readDataFromFolderButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.readDataFromFolderButton.Image = global::DSPRE.Properties.Resources.open_file; + this.readDataFromFolderButton.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; + this.readDataFromFolderButton.ImageTransparentColor = System.Drawing.Color.Magenta; + this.readDataFromFolderButton.Margin = new System.Windows.Forms.Padding(0, 6, 0, 2); + this.readDataFromFolderButton.Name = "openFolderWithoutRomButton"; + this.readDataFromFolderButton.Size = new System.Drawing.Size(36, 36); + this.readDataFromFolderButton.Text = "Open Extracted Data"; + this.readDataFromFolderButton.ToolTipText = "Open Extracted Data"; + this.readDataFromFolderButton.Click += new System.EventHandler(this.readDataFromFolderButton_Click); + // // toolStripSeparator3 // this.toolStripSeparator3.Name = "toolStripSeparator3"; @@ -9276,203 +9489,6 @@ this.versionLabel.TabIndex = 9; this.versionLabel.Text = "ROM:"; // - // label40 - // - this.label40.AutoSize = true; - this.label40.Location = new System.Drawing.Point(143, 14); - this.label40.Name = "label40"; - this.label40.Size = new System.Drawing.Size(77, 13); - this.label40.TabIndex = 31; - this.label40.Text = "Frame Preview"; - // - // trClassFramePreviewUpDown - // - this.trClassFramePreviewUpDown.Location = new System.Drawing.Point(146, 30); - this.trClassFramePreviewUpDown.Name = "trClassFramePreviewUpDown"; - this.trClassFramePreviewUpDown.Size = new System.Drawing.Size(34, 20); - this.trClassFramePreviewUpDown.TabIndex = 30; - this.trClassFramePreviewUpDown.ValueChanged += new System.EventHandler(this.trClassFramePreviewUpDown_ValueChanged); - // - // trainerClassFrameMaxLabel - // - this.trainerClassFrameMaxLabel.AutoSize = true; - this.trainerClassFrameMaxLabel.Location = new System.Drawing.Point(180, 33); - this.trainerClassFrameMaxLabel.Name = "trainerClassFrameMaxLabel"; - this.trainerClassFrameMaxLabel.Size = new System.Drawing.Size(18, 13); - this.trainerClassFrameMaxLabel.TabIndex = 32; - this.trainerClassFrameMaxLabel.Text = "/0"; - // - // headersGridView - // - this.headersGridView.AllowUserToAddRows = false; - this.headersGridView.AllowUserToDeleteRows = false; - this.headersGridView.AllowUserToResizeColumns = false; - this.headersGridView.AllowUserToResizeRows = false; - dataGridViewCellStyle20.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.headersGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle20; - 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; - dataGridViewCellStyle21.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle21.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle21.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); - dataGridViewCellStyle21.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle21.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle21.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle21.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.headersGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle21; - this.headersGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridViewCellStyle22.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle22.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle22.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - dataGridViewCellStyle22.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle22.Format = "D4"; - dataGridViewCellStyle22.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle22.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle22.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.headersGridView.DefaultCellStyle = dataGridViewCellStyle22; - this.headersGridView.Location = new System.Drawing.Point(0, 0); - this.headersGridView.MultiSelect = false; - this.headersGridView.Name = "headersGridView"; - dataGridViewCellStyle23.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle23.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle23.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); - dataGridViewCellStyle23.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle23.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle23.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle23.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.headersGridView.RowHeadersDefaultCellStyle = dataGridViewCellStyle23; - this.headersGridView.RowHeadersWidth = 50; - this.headersGridView.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing; - dataGridViewCellStyle24.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle24.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.headersGridView.RowsDefaultCellStyle = dataGridViewCellStyle24; - 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, 597); - 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; - dataGridViewCellStyle25.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.heightsGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle25; - 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; - dataGridViewCellStyle26.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle26.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle26.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); - dataGridViewCellStyle26.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle26.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle26.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle26.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.heightsGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle26; - this.heightsGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridViewCellStyle27.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle27.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle27.Font = new System.Drawing.Font("Tahoma", 8.25F); - dataGridViewCellStyle27.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle27.Format = "D2"; - dataGridViewCellStyle27.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle27.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle27.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.heightsGridView.DefaultCellStyle = dataGridViewCellStyle27; - this.heightsGridView.Location = new System.Drawing.Point(0, 0); - this.heightsGridView.MultiSelect = false; - this.heightsGridView.Name = "heightsGridView"; - dataGridViewCellStyle28.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle28.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle28.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); - dataGridViewCellStyle28.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle28.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle28.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle28.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.heightsGridView.RowHeadersDefaultCellStyle = dataGridViewCellStyle28; - this.heightsGridView.RowHeadersWidth = 50; - this.heightsGridView.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing; - dataGridViewCellStyle29.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle29.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.heightsGridView.RowsDefaultCellStyle = dataGridViewCellStyle29; - 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; - dataGridViewCellStyle30.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.mapFilesGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle30; - 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; - dataGridViewCellStyle31.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle31.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle31.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); - dataGridViewCellStyle31.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle31.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle31.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle31.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.mapFilesGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle31; - this.mapFilesGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridViewCellStyle32.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle32.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle32.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - dataGridViewCellStyle32.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle32.Format = "D4"; - dataGridViewCellStyle32.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle32.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle32.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.mapFilesGridView.DefaultCellStyle = dataGridViewCellStyle32; - this.mapFilesGridView.Location = new System.Drawing.Point(0, 0); - this.mapFilesGridView.MultiSelect = false; - this.mapFilesGridView.Name = "mapFilesGridView"; - dataGridViewCellStyle33.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle33.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle33.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); - dataGridViewCellStyle33.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle33.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle33.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle33.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.mapFilesGridView.RowHeadersDefaultCellStyle = dataGridViewCellStyle33; - this.mapFilesGridView.RowHeadersWidth = 50; - this.mapFilesGridView.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing; - dataGridViewCellStyle34.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle34.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.mapFilesGridView.RowsDefaultCellStyle = dataGridViewCellStyle34; - 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; @@ -9535,8 +9551,11 @@ 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); @@ -9746,6 +9765,7 @@ ((System.ComponentModel.ISupportInitialize)(this.partyPokemon1PictureBox)).EndInit(); this.groupBox27.ResumeLayout(false); this.groupBox27.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.trClassFramePreviewUpDown)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.trClassVSAnimationUpDown)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.trClassBattleSSEQUpDown)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.trainerClassPicBox)).EndInit(); @@ -9761,10 +9781,6 @@ this.statusStrip1.PerformLayout(); this.mainToolStrip.ResumeLayout(false); this.mainToolStrip.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.trClassFramePreviewUpDown)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.headersGridView)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.heightsGridView)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.mapFilesGridView)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); @@ -10475,6 +10491,7 @@ private System.Windows.Forms.Label label40; private System.Windows.Forms.NumericUpDown trClassFramePreviewUpDown; private System.Windows.Forms.Label trainerClassFrameMaxLabel; + private System.Windows.Forms.ToolStripButton readDataFromFolderButton; } } diff --git a/DS_Map/Main Window.cs b/DS_Map/Main Window.cs index bc0d923..9aa3025 100644 --- a/DS_Map/Main Window.cs +++ b/DS_Map/Main Window.cs @@ -474,32 +474,15 @@ namespace DSPRE { OpenFileDialog openRom = new OpenFileDialog { Filter = "NDS File (*.nds)|*.nds" }; // Select ROM - if (openRom.ShowDialog(this) != DialogResult.OK) + if (openRom.ShowDialog(this) != DialogResult.OK) { return; - - using (BinaryReader br = new BinaryReader(File.OpenRead(openRom.FileName))) { - br.BaseStream.Position = 0xC; // get ROM ID - gameCode = Encoding.UTF8.GetString(br.ReadBytes(4)); - br.BaseStream.Position = 0x1E; - europeByte = br.ReadByte(); } + + SetupROMLanguage(openRom.FileName); /* Set ROM gameVersion and language */ - romInfo = new RomInfo(gameCode, openRom.FileName); + romInfo = new RomInfo(gameCode, openRom.FileName, useSuffix: true); - if (RomInfo.gameVersion is null) { - statusLabel.Text = "Unsupported ROM"; - Update(); - return; - } - - versionLabel.Text = "Pokémon " + RomInfo.gameName + " [" + RomInfo.romID + "]"; - languageLabel.Text = "Language: " + RomInfo.gameLanguage; - - if (RomInfo.gameLanguage == "ENG") - if (europeByte == 0x0A) - languageLabel.Text += " [Europe]"; - else - languageLabel.Text += " [America]"; + CheckROMLanguage(); int userchoice = UnpackRomCheckUserChoice(); switch (userchoice) { @@ -546,6 +529,57 @@ namespace DSPRE { statusLabel.Text = "Attempting to unpack NARCs from folder..."; Update(); + ReadROMInitData(); + } + + private void CheckROMLanguage() { + if (RomInfo.gameVersion is null) { + statusLabel.Text = "Unsupported ROM"; + Update(); + return; + } + + versionLabel.Text = "Pokémon " + RomInfo.gameName + " [" + RomInfo.romID + "]"; + languageLabel.Text = "Language: " + RomInfo.gameLanguage; + + if (RomInfo.gameLanguage == "ENG") { + if (europeByte == 0x0A) { + languageLabel.Text += " [Europe]"; + } else { + languageLabel.Text += " [America]"; + } + } + } + + private void readDataFromFolderButton_Click(object sender, EventArgs e) { + FolderBrowserDialog romFolder = new FolderBrowserDialog { + }; // Select ROM + if (romFolder.ShowDialog(this) != DialogResult.OK) { + return; + } + + SetupROMLanguage(Directory.GetFiles(romFolder.SelectedPath).First(x => x.Contains("header.bin"))); + /* Set ROM gameVersion and language */ + romInfo = new RomInfo(gameCode, romFolder.SelectedPath, useSuffix: false); + + CheckROMLanguage(); + + iconON = true; + gameIcon.Refresh(); // Paint game icon + + ReadROMInitData(); + } + + private void SetupROMLanguage(string headerPath) { + using (BinaryReader br = new BinaryReader(File.OpenRead(headerPath))) { + br.BaseStream.Position = 0xC; // get ROM ID + gameCode = Encoding.UTF8.GetString(br.ReadBytes(4)); + br.BaseStream.Position = 0x1E; + europeByte = br.ReadByte(); + } + } + + private void ReadROMInitData() { switch (RomInfo.gameFamily) { case "DP": case "Plat": @@ -566,6 +600,7 @@ namespace DSPRE { mainTabControl.Show(); loadRomButton.Enabled = false; + readDataFromFolderButton.Enabled = false; saveRomButton.Enabled = true; saveROMToolStripMenuItem.Enabled = true; openROMToolStripMenuItem.Enabled = false; @@ -587,6 +622,7 @@ namespace DSPRE { statusLabel.Text = "Ready"; this.Text += " - " + RomInfo.fileName; } + private void saveRom_Click(object sender, EventArgs e) { SaveFileDialog saveRom = new SaveFileDialog(); saveRom.Filter = "NDS File (*.nds)|*.nds"; @@ -1032,7 +1068,7 @@ namespace DSPRE { } currentHeader.flags = flagVal; } - private void headerListBox_SelectedIndexChanged(object sender, EventArgs e) { + private void headerListBox_SelectedValueChanged(object sender, EventArgs e) { if (disableHandlers || headerListBox.SelectedIndex < 0) return; diff --git a/DS_Map/Main Window.resx b/DS_Map/Main Window.resx index 70904d8..d02d61b 100644 --- a/DS_Map/Main Window.resx +++ b/DS_Map/Main Window.resx @@ -117,91 +117,6 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 239, 17 - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w - LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 - ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABy - EQAAAk1TRnQBSQFMAgEBCQEAAXwBFAF8ARQBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo - AwABQAMAATADAAEBAQABCAYAAQwYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA - AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 - AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA - AWYDAAGZAwABzAIAATMDAAIzAgABMwFmAgABMwGZAgABMwHMAgABMwH/AgABZgMAAWYBMwIAAmYCAAFm - AZkCAAFmAcwCAAFmAf8CAAGZAwABmQEzAgABmQFmAgACmQIAAZkBzAIAAZkB/wIAAcwDAAHMATMCAAHM - AWYCAAHMAZkCAALMAgABzAH/AgAB/wFmAgAB/wGZAgAB/wHMAQABMwH/AgAB/wEAATMBAAEzAQABZgEA - ATMBAAGZAQABMwEAAcwBAAEzAQAB/wEAAf8BMwIAAzMBAAIzAWYBAAIzAZkBAAIzAcwBAAIzAf8BAAEz - AWYCAAEzAWYBMwEAATMCZgEAATMBZgGZAQABMwFmAcwBAAEzAWYB/wEAATMBmQIAATMBmQEzAQABMwGZ - AWYBAAEzApkBAAEzAZkBzAEAATMBmQH/AQABMwHMAgABMwHMATMBAAEzAcwBZgEAATMBzAGZAQABMwLM - AQABMwHMAf8BAAEzAf8BMwEAATMB/wFmAQABMwH/AZkBAAEzAf8BzAEAATMC/wEAAWYDAAFmAQABMwEA - AWYBAAFmAQABZgEAAZkBAAFmAQABzAEAAWYBAAH/AQABZgEzAgABZgIzAQABZgEzAWYBAAFmATMBmQEA - AWYBMwHMAQABZgEzAf8BAAJmAgACZgEzAQADZgEAAmYBmQEAAmYBzAEAAWYBmQIAAWYBmQEzAQABZgGZ - AWYBAAFmApkBAAFmAZkBzAEAAWYBmQH/AQABZgHMAgABZgHMATMBAAFmAcwBmQEAAWYCzAEAAWYBzAH/ - AQABZgH/AgABZgH/ATMBAAFmAf8BmQEAAWYB/wHMAQABzAEAAf8BAAH/AQABzAEAApkCAAGZATMBmQEA - AZkBAAGZAQABmQEAAcwBAAGZAwABmQIzAQABmQEAAWYBAAGZATMBzAEAAZkBAAH/AQABmQFmAgABmQFm - ATMBAAGZATMBZgEAAZkBZgGZAQABmQFmAcwBAAGZATMB/wEAApkBMwEAApkBZgEAA5kBAAKZAcwBAAKZ - Af8BAAGZAcwCAAGZAcwBMwEAAWYBzAFmAQABmQHMAZkBAAGZAswBAAGZAcwB/wEAAZkB/wIAAZkB/wEz - AQABmQHMAWYBAAGZAf8BmQEAAZkB/wHMAQABmQL/AQABzAMAAZkBAAEzAQABzAEAAWYBAAHMAQABmQEA - AcwBAAHMAQABmQEzAgABzAIzAQABzAEzAWYBAAHMATMBmQEAAcwBMwHMAQABzAEzAf8BAAHMAWYCAAHM - AWYBMwEAAZkCZgEAAcwBZgGZAQABzAFmAcwBAAGZAWYB/wEAAcwBmQIAAcwBmQEzAQABzAGZAWYBAAHM - ApkBAAHMAZkBzAEAAcwBmQH/AQACzAIAAswBMwEAAswBZgEAAswBmQEAA8wBAALMAf8BAAHMAf8CAAHM - Af8BMwEAAZkB/wFmAQABzAH/AZkBAAHMAf8BzAEAAcwC/wEAAcwBAAEzAQAB/wEAAWYBAAH/AQABmQEA - AcwBMwIAAf8CMwEAAf8BMwFmAQAB/wEzAZkBAAH/ATMBzAEAAf8BMwH/AQAB/wFmAgAB/wFmATMBAAHM - AmYBAAH/AWYBmQEAAf8BZgHMAQABzAFmAf8BAAH/AZkCAAH/AZkBMwEAAf8BmQFmAQAB/wKZAQAB/wGZ - AcwBAAH/AZkB/wEAAf8BzAIAAf8BzAEzAQAB/wHMAWYBAAH/AcwBmQEAAf8CzAEAAf8BzAH/AQAC/wEz - AQABzAH/AWYBAAL/AZkBAAL/AcwBAAJmAf8BAAFmAf8BZgEAAWYC/wEAAf8CZgEAAf8BZgH/AQAC/wFm - AQABIQEAAaUBAANfAQADdwEAA4YBAAOWAQADywEAA7IBAAPXAQAD3QEAA+MBAAPqAQAD8QEAA/gBAAHw - AfsB/wEAAaQCoAEAA4ADAAH/AgAB/wMAAv8BAAH/AwAB/wEAAf8BAAL/AgAD/0oABrw5AAEmAR4EAAK8 - OAABJgEeAgABJgEeAQABvDsAAbwBJgEePAABJgEeAgABvDUAA7wCAAEmAR4CAAG8NQABzQEKAQABvAEA - ASYBHgEAAewDAAG8MwABzQEKAQACvAEmAR4BAAESArwBAAG8MgABzQEKAwABvAEAASYBHjcAAc0BCgES - AewBAAESAbw5AAHNAQoBEgIAARIBvDgAAc0BCgEAAbwDAAG8OAABzQEKAQABvAMAAewBvDcAAWWHAAHs - ARIB7wUAAfQRAAoSGAAC8wLrAe8B7AHrAfMFAAHqAfQFAALyAfQGAAMSBkoDEhQAAfMB8QG8AuwBBwG8 - AQcB7AHrAQcEAAEOARIB7QQAAfABIgEpAesB8wUAARICSgZuAkoBEgMAAQ8HAAEPBQABDwEAAbwB9wHt - AZIB7wG8AQcB8AH0AfIB6wHqBAABDgFtAe0DAAEHASMCKwEqAesB8wMAARIBSgFuAUoGbgFKAW4BSgES - AQABDwnvAQ8DAAHvAgABbQL3AfABvAHzAvIC9AHtAesBBwMAAQcBFQHqA+0BKQErASUBHwElASoB6wH0 - AgABEgFKAW4BSgaTAUoBbgFKARICAAHvAQEBHwbvAwAC7wIAAbwB7wHxAfQB9gHyAvAB9AH2Ae8B7AFt - AwAB9AEQAesBSgEwAQMBJQEXAfkCIAElASoB6gIAARIBSgGTAW4GSQFuAZMBSgESAgAB7wIBAR8F7wEA - Ag8C7wIAAfIB7wL2AfcBbQHrAfIB9AH2AfMB6wHsAQcCAAH0ARABcwFFASQBIAH5ARcB+QEgAR8BIAEx - ASIB9AEAARIBkwFuAUkGbAFJAW4BkwESAgAB7wEBAR8G7wMAAu8DAAHvAfMBvAGSAfAB9wH2AfcB7QEH - AesB7AHvAwAB8gERAUUBHwIgAfkBFwH5ASABHwExASIB9AEAARIBkwFJAmwEcQJsAUkBkwESAQABDwnv - AQ8DAAHvAwABBwHwAUQBJQEaApIB8gLzAfQBEgHrAfICAAHyAUMB7AFFAR8BIAH5ARcBJgExATcBMAEU - AgABSQFuAWwBcQGXBHEBlwFxAWwBbgESAgABDwcAAQ8FAAEPAgAB9AFtASwBJQHrAfQC8QLvAfIC6wG8 - AgAB8wFtAesBRQEfAiAB+QExAVECbQHzAgABSQJsAZcCcQKXAnEBlwJsAUkCAAEVAQ8BFQMAARUBDwEV - CAABHAEsASsB6gEHAbwC7wH0ArwB8wJtAwAB8AETAUUBHwEkAisBUQG8BQABSQFsAnEGlwJxAWwBSQEA - ARUB9wEHAfcBFQEAARUB9wEHAfcBFQYAAe8CKwFLAe8BBwG8AfEEBwH0AYsB6gMAAfABEQFLASQBIwED - AUoB8AcAAWwBcQOXAngDlwFxAWwCAAEPAQcBAAEHAQ8BAAEPAQcBAAEHAQ8FAAHvASsBLAFFArwBBwHv - AQcBvAHwARkC2wFsAQcDAAHwASMCKwEOAfAB8QgAAUkBcQKXAXgFlwFxAUkCAAEVAfcBBwH3ARUBAAEV - AfcBBwH3ARUFAAESASwBRQHyAfMB7wHyAfEBuwLaAbMCiwHzBAAB8AEjATcBMQEOCwABSQFxApcBeAOX - AXEBSQQAARUBDwEVAwABFQEPARUHAAESAbwCAAEHAbMB1AGzAmwB7wgAAe8CDgHzDAABbAFxBJcBcQFs - GQABBwISAbwdAARxFwAB9AvzAfQTAA3zEwABBwvvAQcCAA8QAQABBw2zAQcHAARDBwAB7wEAAbsGswG7 - AgAB7wIAARAGOAEQBtMBEAEAAbMNAAGzBQACQwTwAkMFAAHvAQABswYAAbMCAAHvAgABEAI4AwABOAEQ - AtMCAALTARABAAGzDQABswQAAUMI8AFDBAAB7wEAAa0BAAGXAlYBlwEAAbMCAAHvAgABEAM4AQACOAEQ - AdMBAALTAQAB0wEQAQABswEAAVYJUAFWAQABswMAAUMD8AGSAkMBkgPwAUMDAAHvAQABrQEABFYBAAGz - AfQBAAHvAgABEAI4AgACOAEQAdMBAALTAQAB0wEQAQABswEAC1YBAAGzAwABQwHwAZIBEgFDAfABkgFD - ARIBkgHwAUMDAAHvAQABrQEABFYBAAGzAfQBAAHvAgABEAM4AQACOAEQAtMCAALTARABAAGzAQALVgEA - AbMCAAFDAfABEgJjAUMBAAHwAUMCYwESAfABQwIAAe8BAAGtAQAEeAEAAbMB9AEAAe8CAAEQBjgBEAbT - ARABAAGzAQALVgEAAbMCAAFDARIERwJDBEcBEgFDAgAB7wEAAa0GAAGzAfMBAAHvAgAPEAEAAbMBAAtW - AQABswIAAUMMRwFDAgAB7wEAAbsCrQSzAbsB8wEAAe8CAAEQBkcBEAYAARABAAGzAQALVgEAAbMCAAFD - DEcBQwIAAe8BAAHzA/QB8wH0BAAB7wIAARACRwIAAkcBEAYAARABAAGzAQALVgEAAbMDAAFDAkcClAZH - AUMDAAHvAQABdAIyASwBdAEAAbwC9wEAAe8CAAEQAUcBAAJHAQABRwEQBgABEAEAAbMBAAFWCXgBVgEA - AbMDAAFDAUcElAVHAUMDAAHvAQABLAPDAVMBAAH3AgAB8wHwAgABEAFHAQACRwEAAUcBEAYAARABAAGz - AQALeAEAAbMEAAFDBJQERwFDBAAB7wEAAXQDLAF0AQAB9wEAAfMB8AMAARACRwIAAkcBEAYAARABAAGz - AQALeAEAAbMFAAJDAZQDRwJDBQAB7wgAAfMB8AQAARAGRwEQBgABEAEAAbMNAAGzBwAEQwcAAQcI7wEH - BQAPEAEAAQkNswEJEQABQgFNAT4HAAE+AwABKAMAAUADAAEwAwABAQEAAQEFAAGAAQEWAAP/AQAC/wYA - Af8BgQYAAf8HAAH/ATAGAAH/AeEGAAH/AcEGAAHxAYMGAAHhAQ4GAAHgBwABwAGBBgABwAF/BgABxAF/ - BgABhAF/BgABhAE/BgABjAF/BgAC/wYAAf8BjwG/Af8B4AEHAv8B+AEHAo8BwAEDAv8BwAEHAY8BBwHA - AQMBgAE8AYABBwGOAQMBgAEBAQABGAGAAQMBgAEBAYABAQIAAYABAwGAAQEBgAEBAgABgAEBAYABAAGA - AQECAAHAAQEBwAEAAYABAQEAARgBwAEAAcABAQGAAQEBgAE8AcABAAHAAQEBgAEBAY4BPwHAAQAB4AEP - AYABAQEEAR8BgAEAAeABHwHAAQMBJAGfAgAB4AE/AcABAwEEAR8BAAEBAeAB/wHgAQcBjgE/AZgBDwHw - Af8B8AEPAv8B+AF/Av8B/AE/Av8BgAEDAv8BgAEDAv8BgAEDAQABAQEAAQEB/AE/AaABGwEAAQEBfwH9 - AfABDwGvAdsBAAExAX8B/QHgAQcBqAFbAQABSQFAAQUBwAEDAagBSwEAAUkBQAEFAcABAwGoAUsBAAEx - AUABBQGBAQEBqAFLAQABAQFAAQUBgAEBAa8BywEAAQEBQAEFAYABAQGgAQsBAAH9AUABBQGAAQEBoAF7 - ARgBxQFAAQUBwAEDAaABiwEkAe0BQAEFAcABAwGgAbMBJAHNAUABBQHgAQcBoAGnARgB7QFAAQUB8AEP - Ab8BzwEAAf0BfwH9AfwBPwGAAR8BAAEBAQABAQL/Cw== - - @@ -930,36 +845,97 @@ True + + 239, 17 + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w + LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 + ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABy + EQAAAk1TRnQBSQFMAgEBCQEAAZQBFAGUARQBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + AwABQAMAATADAAEBAQABCAYAAQwYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA + AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 + AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA + AWYDAAGZAwABzAIAATMDAAIzAgABMwFmAgABMwGZAgABMwHMAgABMwH/AgABZgMAAWYBMwIAAmYCAAFm + AZkCAAFmAcwCAAFmAf8CAAGZAwABmQEzAgABmQFmAgACmQIAAZkBzAIAAZkB/wIAAcwDAAHMATMCAAHM + AWYCAAHMAZkCAALMAgABzAH/AgAB/wFmAgAB/wGZAgAB/wHMAQABMwH/AgAB/wEAATMBAAEzAQABZgEA + ATMBAAGZAQABMwEAAcwBAAEzAQAB/wEAAf8BMwIAAzMBAAIzAWYBAAIzAZkBAAIzAcwBAAIzAf8BAAEz + AWYCAAEzAWYBMwEAATMCZgEAATMBZgGZAQABMwFmAcwBAAEzAWYB/wEAATMBmQIAATMBmQEzAQABMwGZ + AWYBAAEzApkBAAEzAZkBzAEAATMBmQH/AQABMwHMAgABMwHMATMBAAEzAcwBZgEAATMBzAGZAQABMwLM + AQABMwHMAf8BAAEzAf8BMwEAATMB/wFmAQABMwH/AZkBAAEzAf8BzAEAATMC/wEAAWYDAAFmAQABMwEA + AWYBAAFmAQABZgEAAZkBAAFmAQABzAEAAWYBAAH/AQABZgEzAgABZgIzAQABZgEzAWYBAAFmATMBmQEA + AWYBMwHMAQABZgEzAf8BAAJmAgACZgEzAQADZgEAAmYBmQEAAmYBzAEAAWYBmQIAAWYBmQEzAQABZgGZ + AWYBAAFmApkBAAFmAZkBzAEAAWYBmQH/AQABZgHMAgABZgHMATMBAAFmAcwBmQEAAWYCzAEAAWYBzAH/ + AQABZgH/AgABZgH/ATMBAAFmAf8BmQEAAWYB/wHMAQABzAEAAf8BAAH/AQABzAEAApkCAAGZATMBmQEA + AZkBAAGZAQABmQEAAcwBAAGZAwABmQIzAQABmQEAAWYBAAGZATMBzAEAAZkBAAH/AQABmQFmAgABmQFm + ATMBAAGZATMBZgEAAZkBZgGZAQABmQFmAcwBAAGZATMB/wEAApkBMwEAApkBZgEAA5kBAAKZAcwBAAKZ + Af8BAAGZAcwCAAGZAcwBMwEAAWYBzAFmAQABmQHMAZkBAAGZAswBAAGZAcwB/wEAAZkB/wIAAZkB/wEz + AQABmQHMAWYBAAGZAf8BmQEAAZkB/wHMAQABmQL/AQABzAMAAZkBAAEzAQABzAEAAWYBAAHMAQABmQEA + AcwBAAHMAQABmQEzAgABzAIzAQABzAEzAWYBAAHMATMBmQEAAcwBMwHMAQABzAEzAf8BAAHMAWYCAAHM + AWYBMwEAAZkCZgEAAcwBZgGZAQABzAFmAcwBAAGZAWYB/wEAAcwBmQIAAcwBmQEzAQABzAGZAWYBAAHM + ApkBAAHMAZkBzAEAAcwBmQH/AQACzAIAAswBMwEAAswBZgEAAswBmQEAA8wBAALMAf8BAAHMAf8CAAHM + Af8BMwEAAZkB/wFmAQABzAH/AZkBAAHMAf8BzAEAAcwC/wEAAcwBAAEzAQAB/wEAAWYBAAH/AQABmQEA + AcwBMwIAAf8CMwEAAf8BMwFmAQAB/wEzAZkBAAH/ATMBzAEAAf8BMwH/AQAB/wFmAgAB/wFmATMBAAHM + AmYBAAH/AWYBmQEAAf8BZgHMAQABzAFmAf8BAAH/AZkCAAH/AZkBMwEAAf8BmQFmAQAB/wKZAQAB/wGZ + AcwBAAH/AZkB/wEAAf8BzAIAAf8BzAEzAQAB/wHMAWYBAAH/AcwBmQEAAf8CzAEAAf8BzAH/AQAC/wEz + AQABzAH/AWYBAAL/AZkBAAL/AcwBAAJmAf8BAAFmAf8BZgEAAWYC/wEAAf8CZgEAAf8BZgH/AQAC/wFm + AQABIQEAAaUBAANfAQADdwEAA4YBAAOWAQADywEAA7IBAAPXAQAD3QEAA+MBAAPqAQAD8QEAA/gBAAHw + AfsB/wEAAaQCoAEAA4ADAAH/AgAB/wMAAv8BAAH/AwAB/wEAAf8BAAL/AgAD/0oABrw5AAEmAR4EAAK8 + OAABJgEeAgABJgEeAQABvDsAAbwBJgEePAABJgEeAgABvDUAA7wCAAEmAR4CAAG8NQABzQEKAQABvAEA + ASYBHgEAAewDAAG8MwABzQEKAQACvAEmAR4BAAESArwBAAG8MgABzQEKAwABvAEAASYBHjcAAc0BCgES + AewBAAESAbw5AAHNAQoBEgIAARIBvDgAAc0BCgEAAbwDAAG8OAABzQEKAQABvAMAAewBvDcAAWWHAAHs + ARIB7wUAAfQRAAoSGAAC8wLrAe8B7AHrAfMFAAHqAfQFAALyAfQGAAMSBkoDEhQAAfMB8QG8AuwBBwG8 + AQcB7AHrAQcEAAEOARIB7QQAAfABIgEpAesB8wUAARICSgZuAkoBEgMAAQ8HAAEPBQABDwEAAbwB9wHt + AZIB7wG8AQcB8AH0AfIB6wHqBAABDgFtAe0DAAEHASMCKwEqAesB8wMAARIBSgFuAUoGbgFKAW4BSgES + AQABDwnvAQ8DAAHvAgABbQL3AfABvAHzAvIC9AHtAesBBwMAAQcBFQHqA+0BKQErASUBHwElASoB6wH0 + AgABEgFKAW4BSgaTAUoBbgFKARICAAHvAQEBHwbvAwAC7wIAAbwB7wHxAfQB9gHyAvAB9AH2Ae8B7AFt + AwAB9AEQAesBSgEwAQMBJQEXAfkCIAElASoB6gIAARIBSgGTAW4GSQFuAZMBSgESAgAB7wIBAR8F7wEA + Ag8C7wIAAfIB7wL2AfcBbQHrAfIB9AH2AfMB6wHsAQcCAAH0ARABcwFFASQBIAH5ARcB+QEgAR8BIAEx + ASIB9AEAARIBkwFuAUkGbAFJAW4BkwESAgAB7wEBAR8G7wMAAu8DAAHvAfMBvAGSAfAB9wH2AfcB7QEH + AesB7AHvAwAB8gERAUUBHwIgAfkBFwH5ASABHwExASIB9AEAARIBkwFJAmwEcQJsAUkBkwESAQABDwnv + AQ8DAAHvAwABBwHwAUQBJQEaApIB8gLzAfQBEgHrAfICAAHyAUMB7AFFAR8BIAH5ARcBJgExATcBMAEU + AgABSQFuAWwBcQGXBHEBlwFxAWwBbgESAgABDwcAAQ8FAAEPAgAB9AFtASwBJQHrAfQC8QLvAfIC6wG8 + AgAB8wFtAesBRQEfAiAB+QExAVECbQHzAgABSQJsAZcCcQKXAnEBlwJsAUkCAAEVAQ8BFQMAARUBDwEV + CAABHAEsASsB6gEHAbwC7wH0ArwB8wJtAwAB8AETAUUBHwEkAisBUQG8BQABSQFsAnEGlwJxAWwBSQEA + ARUB9wEHAfcBFQEAARUB9wEHAfcBFQYAAe8CKwFLAe8BBwG8AfEEBwH0AYsB6gMAAfABEQFLASQBIwED + AUoB8AcAAWwBcQOXAngDlwFxAWwCAAEPAQcBAAEHAQ8BAAEPAQcBAAEHAQ8FAAHvASsBLAFFArwBBwHv + AQcBvAHwARkC2wFsAQcDAAHwASMCKwEOAfAB8QgAAUkBcQKXAXgFlwFxAUkCAAEVAfcBBwH3ARUBAAEV + AfcBBwH3ARUFAAESASwBRQHyAfMB7wHyAfEBuwLaAbMCiwHzBAAB8AEjATcBMQEOCwABSQFxApcBeAOX + AXEBSQQAARUBDwEVAwABFQEPARUHAAESAbwCAAEHAbMB1AGzAmwB7wgAAe8CDgHzDAABbAFxBJcBcQFs + GQABBwISAbwdAARxFwAB9AvzAfQTAA3zEwABBwvvAQcCAA8QAQABBw2zAQcHAARDBwAB7wEAAbsGswG7 + AgAB7wIAARAGOAEQBtMBEAEAAbMNAAGzBQACQwTwAkMFAAHvAQABswYAAbMCAAHvAgABEAI4AwABOAEQ + AtMCAALTARABAAGzDQABswQAAUMI8AFDBAAB7wEAAa0BAAGXAlYBlwEAAbMCAAHvAgABEAM4AQACOAEQ + AdMBAALTAQAB0wEQAQABswEAAVYJUAFWAQABswMAAUMD8AGSAkMBkgPwAUMDAAHvAQABrQEABFYBAAGz + AfQBAAHvAgABEAI4AgACOAEQAdMBAALTAQAB0wEQAQABswEAC1YBAAGzAwABQwHwAZIBEgFDAfABkgFD + ARIBkgHwAUMDAAHvAQABrQEABFYBAAGzAfQBAAHvAgABEAM4AQACOAEQAtMCAALTARABAAGzAQALVgEA + AbMCAAFDAfABEgJjAUMBAAHwAUMCYwESAfABQwIAAe8BAAGtAQAEeAEAAbMB9AEAAe8CAAEQBjgBEAbT + ARABAAGzAQALVgEAAbMCAAFDARIERwJDBEcBEgFDAgAB7wEAAa0GAAGzAfMBAAHvAgAPEAEAAbMBAAtW + AQABswIAAUMMRwFDAgAB7wEAAbsCrQSzAbsB8wEAAe8CAAEQBkcBEAYAARABAAGzAQALVgEAAbMCAAFD + DEcBQwIAAe8BAAHzA/QB8wH0BAAB7wIAARACRwIAAkcBEAYAARABAAGzAQALVgEAAbMDAAFDAkcClAZH + AUMDAAHvAQABdAIyASwBdAEAAbwC9wEAAe8CAAEQAUcBAAJHAQABRwEQBgABEAEAAbMBAAFWCXgBVgEA + AbMDAAFDAUcElAVHAUMDAAHvAQABLAPDAVMBAAH3AgAB8wHwAgABEAFHAQACRwEAAUcBEAYAARABAAGz + AQALeAEAAbMEAAFDBJQERwFDBAAB7wEAAXQDLAF0AQAB9wEAAfMB8AMAARACRwIAAkcBEAYAARABAAGz + AQALeAEAAbMFAAJDAZQDRwJDBQAB7wgAAfMB8AQAARAGRwEQBgABEAEAAbMNAAGzBwAEQwcAAQcI7wEH + BQAPEAEAAQkNswEJEQABQgFNAT4HAAE+AwABKAMAAUADAAEwAwABAQEAAQEFAAGAAQEWAAP/AQAC/wYA + Af8BgQYAAf8HAAH/ATAGAAH/AeEGAAH/AcEGAAHxAYMGAAHhAQ4GAAHgBwABwAGBBgABwAF/BgABxAF/ + BgABhAF/BgABhAE/BgABjAF/BgAC/wYAAf8BjwG/Af8B4AEHAv8B+AEHAo8BwAEDAv8BwAEHAY8BBwHA + AQMBgAE8AYABBwGOAQMBgAEBAQABGAGAAQMBgAEBAYABAQIAAYABAwGAAQEBgAEBAgABgAEBAYABAAGA + AQECAAHAAQEBwAEAAYABAQEAARgBwAEAAcABAQGAAQEBgAE8AcABAAHAAQEBgAEBAY4BPwHAAQAB4AEP + AYABAQEEAR8BgAEAAeABHwHAAQMBJAGfAgAB4AE/AcABAwEEAR8BAAEBAeAB/wHgAQcBjgE/AZgBDwHw + Af8B8AEPAv8B+AF/Av8B/AE/Av8BgAEDAv8BgAEDAv8BgAEDAQABAQEAAQEB/AE/AaABGwEAAQEBfwH9 + AfABDwGvAdsBAAExAX8B/QHgAQcBqAFbAQABSQFAAQUBwAEDAagBSwEAAUkBQAEFAcABAwGoAUsBAAEx + AUABBQGBAQEBqAFLAQABAQFAAQUBgAEBAa8BywEAAQEBQAEFAYABAQGgAQsBAAH9AUABBQGAAQEBoAF7 + ARgBxQFAAQUBwAEDAaABiwEkAe0BQAEFAcABAwGgAbMBJAHNAUABBQHgAQcBoAGnARgB7QFAAQUB8AEP + Ab8BzwEAAf0BfwH9AfwBPwGAAR8BAAEBAQABAQL/Cw== + + 17, 17 132, 17 - - - iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAQ0SURBVFhH7ZZrTFtlHMbrLRoTL9GtiYkxMUazRD+omYCC - AzYviV8Wp35QMzdYhgNh4Maom1V0W0akMpSyS5zTmMy6KWxuuGRRZkxEVxj0SgttKRScTIaTAWOc9rR9 - fN5zcLSjq0O7b/yTX0g5p+/zvP/z/M9bzVzNFev6DmPud7b6J2GtyyRPJCAT4npHfW6TuF/9WurqFrE4 - wj5A6gImu2ciEV63GbMg7le/lrqaL3YoxIPW5ZCsK0neJbwG/NWM9g8XwvLx4wk6lByle+wytRJ2T6sY - uOCEZF8FybEGkrNwGgexFyByej+74aXRWRL0AJFexQS1EnZPNTBhpeDrkDqLScklvMFrNOYomIkzCY7V - CDryacTFTmQKA/NVyfiaMtCKYGchgq61pDQB4v+CkinUz6GuUsiXZS1kdxE71wqrUemAVpWMLxrIAsZb - EHQXI9hVRt78V0KedZB95Rg1F2CsNRmrMOH7jI9gESpfXZDRsj174cm6nEzqXqPKXzTwE0Ld3FH3OrI+ - KbK3HBF/BfzfPI+TNRkk/bK016Shg1g+yoBFCaU60m0xoVQNjB1HyMudcfGQbwN3VzGTngqEe3SI9G1E - b8My+E3PMWQM2qSbuK6QTo60Jy6UNMD3wOgxCpdTRIdw3yZEAqRf8HYc0QE9xV+Ef/9SyK4ihmw1JBun - x5Z/BazkRiohnzXjx6r0NmrfGWPgKMJ+HaIBIbAMbQa20JCWgAz4DyxFuLsMITfDySlRYX6S4SQc8cjp - LzDUZkR90YN6at8eY+CwsuORE2vg3fcscP5XPpafSUsMv5ATkIW4CKN7NohJKqbOcfgaC0T7HyA3KQYs - wsC5g8Cpd9Hb+AKGW9YjOtLMwBUTEcxSFY+A4h6G0cOszApOTaAK4eHvYTbknqHuXeTaaQNjXwODm2Gp - zYLUtwtRtirk5UQwkCEGMB7df4CT88deDJk/wOdlD9dQ9w4hLoqPYBHH8AAudFXAtWcx3/uHIQ8YIPvf - IptSwEaiA0aOoKchDwvuue1R6t6syv9jYMKEgaOvYPCHQt54COHAO5wGPRF//y+coFPViAw3wlyXJlHz - bnKdos7SWo3ZPIxMcO19BpM924GhTxHuryTvp4hKYHgPzrZvxbf6xxqoOU+VVktrq89B9M+dsO/MYRhN - iA7WIvLbFrI1RWzmul/Bf3AFNrx0/8vUjDsVtbYduRhz6hE4soLt/xKRwW2I/F6VIrYhOlTLXO3jD5ps - MX73khsU5anS2nctQV/Tcpqg05FPgDPVxJA6uOY5+3s4tiW9WeiRiweRKK1j91M8LpkDmT86ztPA+I7U - IpnQ35SH6vyHSqh3qyo7XdrW3U+PCxMiCxZORKoRm+swZo9S6z5yo6IaU+J9/AhZTJZcJcTaYvbF4aO8 - /WJLBEKYEM/maiI04sI3V3Ol0Wg0fwM+F0xGiiAPagAAAABJRU5ErkJggg== - - iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 @@ -1048,9 +1024,6 @@ qcnkDWXJtp9DVaw7AAAAAElFTkSuQmCC - - 533, 20 - 25 diff --git a/DS_Map/Properties/Resources.Designer.cs b/DS_Map/Properties/Resources.Designer.cs index ab9c920..223e5a6 100644 --- a/DS_Map/Properties/Resources.Designer.cs +++ b/DS_Map/Properties/Resources.Designer.cs @@ -1150,6 +1150,16 @@ namespace DSPRE.Properties { } } + /// + /// Cerca una risorsa localizzata di tipo System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap open_rom { + get { + object obj = ResourceManager.GetObject("open_rom", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Cerca una risorsa localizzata di tipo System.Drawing.Bitmap. /// diff --git a/DS_Map/Properties/Resources.resx b/DS_Map/Properties/Resources.resx index 290433d..02e1559 100644 --- a/DS_Map/Properties/Resources.resx +++ b/DS_Map/Properties/Resources.resx @@ -652,4 +652,7 @@ ..\Resources\Graphics\Program Icons\saveButton.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Graphics\Program Icons\open_rom.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.cs b/DS_Map/ROMToolboxDialog.cs index 5c03f02..a418279 100644 --- a/DS_Map/ROMToolboxDialog.cs +++ b/DS_Map/ROMToolboxDialog.cs @@ -327,9 +327,10 @@ namespace DSPRE { return true; } public bool CheckDynamicHeadersPatchApplied() { - if (!ROMToolboxDialog.flag_DynamicHeadersPatchApplied) { - if (!ROMToolboxDialog.CheckFilesDynamicHeadersPatchApplied()) + if (!flag_DynamicHeadersPatchApplied) { + if (!ROMToolboxDialog.CheckFilesDynamicHeadersPatchApplied()) { return false; + } } ROMToolboxDialog.flag_DynamicHeadersPatchApplied = true; diff --git a/DS_Map/Resources/Graphics/Program Icons/open_rom.png b/DS_Map/Resources/Graphics/Program Icons/open_rom.png new file mode 100644 index 0000000..a978e4a Binary files /dev/null and b/DS_Map/Resources/Graphics/Program Icons/open_rom.png differ diff --git a/DS_Map/RomInfo.cs b/DS_Map/RomInfo.cs index e7924eb..c099b87 100644 --- a/DS_Map/RomInfo.cs +++ b/DS_Map/RomInfo.cs @@ -14,7 +14,7 @@ namespace DSPRE { /// public class RomInfo { - private static readonly string folderSuffix = "_DSPRE_contents"; + private static string folderSuffix = "_DSPRE_contents"; public static string romID { get; private set; } public static string fileName { get; private set; } public static string workDir { get; private set; } @@ -87,10 +87,16 @@ namespace DSPRE { #region Constructors (1) - public RomInfo(string id, string romName) { + public RomInfo(string id, string romName, bool useSuffix = true) { romID = id; fileName = romName; + + if (!useSuffix) { + folderSuffix = ""; + } + workDir = Path.GetDirectoryName(romName) + "\\" + Path.GetFileNameWithoutExtension(romName) + folderSuffix + "\\"; + LoadGameVersion(); if (gameVersion is null) return;