diff --git a/DS_Map/BuildingEditor.Designer.cs b/DS_Map/BuildingEditor.Designer.cs index fe056a9..f01163e 100644 --- a/DS_Map/BuildingEditor.Designer.cs +++ b/DS_Map/BuildingEditor.Designer.cs @@ -34,7 +34,7 @@ this.exportButton = new System.Windows.Forms.Button(); this.buildingOpenGLControl = new Tao.Platform.Windows.SimpleOpenGlControl(); this.interiorCheckBox = new System.Windows.Forms.CheckBox(); - this.buildingsListBox = new System.Windows.Forms.ListBox(); + this.buildingEditorBldListBox = new System.Windows.Forms.ListBox(); this.panel1 = new System.Windows.Forms.Panel(); this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); this.panel1.SuspendLayout(); @@ -103,14 +103,14 @@ this.interiorCheckBox.UseVisualStyleBackColor = true; this.interiorCheckBox.CheckedChanged += new System.EventHandler(this.interiorCheckBox_CheckedChanged); // - // buildingsListBox + // buildingEditorBldListBox // - this.buildingsListBox.FormattingEnabled = true; - this.buildingsListBox.Location = new System.Drawing.Point(12, 12); - this.buildingsListBox.Name = "buildingsListBox"; - this.buildingsListBox.Size = new System.Drawing.Size(248, 446); - this.buildingsListBox.TabIndex = 19; - this.buildingsListBox.SelectedIndexChanged += new System.EventHandler(this.buildingsListBox_SelectedIndexChanged); + this.buildingEditorBldListBox.FormattingEnabled = true; + this.buildingEditorBldListBox.Location = new System.Drawing.Point(12, 12); + this.buildingEditorBldListBox.Name = "buildingEditorBldListBox"; + this.buildingEditorBldListBox.Size = new System.Drawing.Size(248, 446); + this.buildingEditorBldListBox.TabIndex = 19; + this.buildingEditorBldListBox.SelectedIndexChanged += new System.EventHandler(this.buildingsListBox_SelectedIndexChanged); // // panel1 // @@ -130,7 +130,7 @@ this.Controls.Add(this.importButton); this.Controls.Add(this.exportButton); this.Controls.Add(this.interiorCheckBox); - this.Controls.Add(this.buildingsListBox); + this.Controls.Add(this.buildingEditorBldListBox); this.Name = "BuildingEditor"; this.Text = "Building Editor"; this.panel1.ResumeLayout(false); @@ -147,7 +147,7 @@ private System.Windows.Forms.Button exportButton; private Tao.Platform.Windows.SimpleOpenGlControl buildingOpenGLControl; private System.Windows.Forms.CheckBox interiorCheckBox; - private System.Windows.Forms.ListBox buildingsListBox; + private System.Windows.Forms.ListBox buildingEditorBldListBox; private System.Windows.Forms.Panel panel1; private System.Windows.Forms.BindingSource bindingSource1; } diff --git a/DS_Map/BuildingEditor.cs b/DS_Map/BuildingEditor.cs index 39b9810..b98cbfd 100644 --- a/DS_Map/BuildingEditor.cs +++ b/DS_Map/BuildingEditor.cs @@ -44,7 +44,7 @@ namespace DSPRE FillTexturesBox(); textureComboBox.SelectedIndex = 0; disableHandlers = false; - buildingsListBox.SelectedIndex = 0; + buildingEditorBldListBox.SelectedIndex = 0; } #region Subroutines @@ -76,18 +76,19 @@ namespace DSPRE } - private void FillListBox(bool interior) - { + private void FillListBox(bool interior) { int modelCount = Directory.GetFiles(folder + rom.GetBuildingModelsDirPath(interior)).Length; - for (int i = 0; i < modelCount; i++) - { + for (int i = 0; i < modelCount; i++) { using (BinaryReader reader = new BinaryReader(File.OpenRead(folder + rom.GetBuildingModelsDirPath(interior) + "\\" + i.ToString("D4")))) { reader.BaseStream.Position = 0x14; - if (reader.ReadUInt32() == 0x304C444D) reader.BaseStream.Position = 0x34; - else reader.BaseStream.Position = 0x38; + if (reader.ReadUInt32() == 0x304C444D) + reader.BaseStream.Position = 0x34; + else + reader.BaseStream.Position = 0x38; + string nsbmdName = Encoding.UTF8.GetString(reader.ReadBytes(16)); - buildingsListBox.Items.Add(i + ": " + nsbmdName); + buildingEditorBldListBox.Items.Add("[" + (i+1).ToString("D2") + "] " + nsbmdName); } } } @@ -186,8 +187,8 @@ namespace DSPRE if (disableHandlers) return; - LoadBuildingModel(buildingsListBox.SelectedIndex, interiorCheckBox.Checked); - CreateEmbeddedTexturesFile(buildingsListBox.SelectedIndex, interiorCheckBox.Checked); + LoadBuildingModel(buildingEditorBldListBox.SelectedIndex, interiorCheckBox.Checked); + CreateEmbeddedTexturesFile(buildingEditorBldListBox.SelectedIndex, interiorCheckBox.Checked); LoadModelTextures(textureComboBox.SelectedIndex - 1); RenderModel(); } @@ -195,11 +196,11 @@ namespace DSPRE { SaveFileDialog em = new SaveFileDialog(); em.Filter = "NSBMD model (*.nsbmd)|*.nsbmd"; - em.FileName = buildingsListBox.SelectedItem.ToString(); + em.FileName = buildingEditorBldListBox.SelectedItem.ToString(); if (em.ShowDialog(this) != DialogResult.OK) return; - else File.Copy(folder + rom.GetBuildingModelsDirPath(interiorCheckBox.Checked) + "\\" + buildingsListBox.SelectedIndex.ToString("D4"), em.FileName, true); + else File.Copy(folder + rom.GetBuildingModelsDirPath(interiorCheckBox.Checked) + "\\" + buildingEditorBldListBox.SelectedIndex.ToString("D4"), em.FileName, true); } private void importButton_Click(object sender, EventArgs e) { @@ -217,7 +218,7 @@ namespace DSPRE } else { - File.Copy(im.FileName, folder + rom.GetBuildingModelsDirPath(interiorCheckBox.Checked) + "\\" + buildingsListBox.SelectedIndex.ToString("D4"), true); + File.Copy(im.FileName, folder + rom.GetBuildingModelsDirPath(interiorCheckBox.Checked) + "\\" + buildingEditorBldListBox.SelectedIndex.ToString("D4"), true); buildingsListBox_SelectedIndexChanged(null, null); } } @@ -225,12 +226,12 @@ namespace DSPRE private void interiorCheckBox_CheckedChanged(object sender, EventArgs e) { disableHandlers = true; - buildingsListBox.Items.Clear(); + buildingEditorBldListBox.Items.Clear(); FillListBox(interiorCheckBox.Checked); disableHandlers = false; - buildingsListBox.SelectedIndex = 0; + buildingEditorBldListBox.SelectedIndex = 0; } private void textureComboBox_SelectedIndexChanged(object sender, EventArgs e) { if (disableHandlers) diff --git a/DS_Map/DS Map.csproj b/DS_Map/DS Map.csproj index ee844e1..1fb4aaa 100644 --- a/DS_Map/DS Map.csproj +++ b/DS_Map/DS Map.csproj @@ -304,7 +304,6 @@ - @@ -396,7 +395,6 @@ - @@ -425,7 +423,6 @@ - @@ -436,6 +433,7 @@ + Always diff --git a/DS_Map/Graphics/Program Icons/unpackBuildingNarcsIcon.png b/DS_Map/Graphics/Program Icons/unpackBuildingNarcsIcon.png new file mode 100644 index 0000000..6b0f8da Binary files /dev/null and b/DS_Map/Graphics/Program Icons/unpackBuildingNarcsIcon.png differ diff --git a/DS_Map/Main Window.Designer.cs b/DS_Map/Main Window.Designer.cs index 23dab50..b1ebeb4 100644 --- a/DS_Map/Main Window.Designer.cs +++ b/DS_Map/Main Window.Designer.cs @@ -29,6 +29,7 @@ private void InitializeComponent() { this.components = new System.ComponentModel.Container(); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainProgram)); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle18 = new System.Windows.Forms.DataGridViewCellStyle(); @@ -44,9 +45,13 @@ 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.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainProgram)); this.mainTabControl = new System.Windows.Forms.TabControl(); this.headerEditorTabPage = new System.Windows.Forms.TabPage(); + this.groupBox18 = new System.Windows.Forms.GroupBox(); + this.openWildEditorWithIdButton = new System.Windows.Forms.Button(); + this.pasteWildEncountersButton = new System.Windows.Forms.Button(); + this.wildPokeUpDown = new System.Windows.Forms.NumericUpDown(); + this.copyWildEncountersButton = new System.Windows.Forms.Button(); this.importHeaderFromFileButton = new System.Windows.Forms.Button(); this.exportHeaderToFileButton = new System.Windows.Forms.Button(); this.pasteFlagsButton = new System.Windows.Forms.Button(); @@ -71,9 +76,7 @@ this.areaIconPictureBox = new System.Windows.Forms.PictureBox(); this.areaImageLabel = new System.Windows.Forms.Label(); this.nameGroupBox = new System.Windows.Forms.GroupBox(); - this.pasteWildEncountersButton = new System.Windows.Forms.Button(); this.pasteLocationNameButton = new System.Windows.Forms.Button(); - this.copyWildEncountersButton = new System.Windows.Forms.Button(); this.copyLocationNameButton = new System.Windows.Forms.Button(); this.pasteInternalNameButton = new System.Windows.Forms.Button(); this.copyInternalNameButton = new System.Windows.Forms.Button(); @@ -84,9 +87,7 @@ this.copyAreaSettingsButton = new System.Windows.Forms.Button(); this.label3 = new System.Windows.Forms.Label(); this.label14 = new System.Windows.Forms.Label(); - this.openWildEditorWithIdButton = new System.Windows.Forms.Button(); this.internalNameBox = new System.Windows.Forms.TextBox(); - this.wildPokeUpDown = new System.Windows.Forms.NumericUpDown(); this.label2 = new System.Windows.Forms.Label(); this.areaIconComboBox = new System.Windows.Forms.ComboBox(); this.areaSettingsComboBox = new System.Windows.Forms.ComboBox(); @@ -162,11 +163,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(); @@ -557,22 +555,26 @@ this.saveRomButton = new System.Windows.Forms.ToolStripButton(); this.mainToolStrip = new System.Windows.Forms.ToolStrip(); this.unpackAllButton = new System.Windows.Forms.ToolStripButton(); + this.updateMapNarcsButton = new System.Windows.Forms.ToolStripButton(); this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); this.wildEditorButton = new System.Windows.Forms.ToolStripButton(); this.buildingEditorButton = new System.Windows.Forms.ToolStripButton(); this.romToolboxButton = new System.Windows.Forms.ToolStripButton(); this.versionLabel = new System.Windows.Forms.Label(); this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); - this.groupBox18 = new System.Windows.Forms.GroupBox(); + this.headersGridView = new DSPRE.DataGridViewDoubleBuffered(); + this.heightsGridView = new DSPRE.DataGridViewDoubleBuffered(); + this.mapFilesGridView = new DSPRE.DataGridViewDoubleBuffered(); this.mainTabControl.SuspendLayout(); this.headerEditorTabPage.SuspendLayout(); + this.groupBox18.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.wildPokeUpDown)).BeginInit(); this.groupBox10.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.textFileUpDown)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.eventFileUpDown)).BeginInit(); this.groupBox9.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.areaIconPictureBox)).BeginInit(); this.nameGroupBox.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.wildPokeUpDown)).BeginInit(); this.groupBox2.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.weatherUpDown)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.musicNightUpDown)).BeginInit(); @@ -589,11 +591,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(); @@ -712,7 +711,9 @@ this.menuStrip1.SuspendLayout(); this.statusStrip1.SuspendLayout(); this.mainToolStrip.SuspendLayout(); - this.groupBox18.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.headersGridView)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.heightsGridView)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.mapFilesGridView)).BeginInit(); this.SuspendLayout(); // // mainTabControl @@ -767,6 +768,63 @@ this.headerEditorTabPage.TabIndex = 0; this.headerEditorTabPage.Text = "Header Editor"; // + // groupBox18 + // + this.groupBox18.Controls.Add(this.openWildEditorWithIdButton); + this.groupBox18.Controls.Add(this.pasteWildEncountersButton); + this.groupBox18.Controls.Add(this.wildPokeUpDown); + this.groupBox18.Controls.Add(this.copyWildEncountersButton); + this.groupBox18.Location = new System.Drawing.Point(732, 12); + this.groupBox18.Name = "groupBox18"; + this.groupBox18.Size = new System.Drawing.Size(101, 140); + this.groupBox18.TabIndex = 51; + this.groupBox18.TabStop = false; + this.groupBox18.Text = "Wild Encounters"; + // + // openWildEditorWithIdButton + // + this.openWildEditorWithIdButton.Location = new System.Drawing.Point(13, 46); + this.openWildEditorWithIdButton.Name = "openWildEditorWithIdButton"; + this.openWildEditorWithIdButton.Size = new System.Drawing.Size(73, 41); + this.openWildEditorWithIdButton.TabIndex = 24; + this.openWildEditorWithIdButton.Text = "Open Editor"; + this.openWildEditorWithIdButton.UseVisualStyleBackColor = true; + this.openWildEditorWithIdButton.Click += new System.EventHandler(this.openWildEditorWithIdButtonClick); + // + // pasteWildEncountersButton + // + this.pasteWildEncountersButton.Enabled = false; + this.pasteWildEncountersButton.Image = ((System.Drawing.Image)(resources.GetObject("pasteWildEncountersButton.Image"))); + this.pasteWildEncountersButton.Location = new System.Drawing.Point(51, 91); + this.pasteWildEncountersButton.Name = "pasteWildEncountersButton"; + this.pasteWildEncountersButton.Size = new System.Drawing.Size(35, 37); + this.pasteWildEncountersButton.TabIndex = 42; + this.pasteWildEncountersButton.UseVisualStyleBackColor = true; + this.pasteWildEncountersButton.Click += new System.EventHandler(this.pasteWildEncountersButton_Click); + // + // wildPokeUpDown + // + this.wildPokeUpDown.Location = new System.Drawing.Point(13, 20); + this.wildPokeUpDown.Maximum = new decimal(new int[] { + 65535, + 0, + 0, + 0}); + this.wildPokeUpDown.Name = "wildPokeUpDown"; + this.wildPokeUpDown.Size = new System.Drawing.Size(73, 20); + this.wildPokeUpDown.TabIndex = 24; + this.wildPokeUpDown.ValueChanged += new System.EventHandler(this.wildPokeUpDown_ValueChanged); + // + // copyWildEncountersButton + // + this.copyWildEncountersButton.Image = ((System.Drawing.Image)(resources.GetObject("copyWildEncountersButton.Image"))); + this.copyWildEncountersButton.Location = new System.Drawing.Point(13, 91); + this.copyWildEncountersButton.Name = "copyWildEncountersButton"; + this.copyWildEncountersButton.Size = new System.Drawing.Size(35, 37); + this.copyWildEncountersButton.TabIndex = 41; + this.copyWildEncountersButton.UseVisualStyleBackColor = true; + this.copyWildEncountersButton.Click += new System.EventHandler(this.copyWildEncountersButton_Click); + // // importHeaderFromFileButton // this.importHeaderFromFileButton.Image = global::DSPRE.Properties.Resources.importArrow; @@ -1054,17 +1112,6 @@ this.nameGroupBox.TabStop = false; this.nameGroupBox.Text = "Location Info"; // - // pasteWildEncountersButton - // - this.pasteWildEncountersButton.Enabled = false; - this.pasteWildEncountersButton.Image = ((System.Drawing.Image)(resources.GetObject("pasteWildEncountersButton.Image"))); - this.pasteWildEncountersButton.Location = new System.Drawing.Point(51, 91); - this.pasteWildEncountersButton.Name = "pasteWildEncountersButton"; - this.pasteWildEncountersButton.Size = new System.Drawing.Size(35, 37); - this.pasteWildEncountersButton.TabIndex = 42; - this.pasteWildEncountersButton.UseVisualStyleBackColor = true; - this.pasteWildEncountersButton.Click += new System.EventHandler(this.pasteWildEncountersButton_Click); - // // pasteLocationNameButton // this.pasteLocationNameButton.Enabled = false; @@ -1076,16 +1123,6 @@ this.pasteLocationNameButton.UseVisualStyleBackColor = true; this.pasteLocationNameButton.Click += new System.EventHandler(this.pasteLocationNameButton_Click); // - // copyWildEncountersButton - // - this.copyWildEncountersButton.Image = ((System.Drawing.Image)(resources.GetObject("copyWildEncountersButton.Image"))); - this.copyWildEncountersButton.Location = new System.Drawing.Point(13, 91); - this.copyWildEncountersButton.Name = "copyWildEncountersButton"; - this.copyWildEncountersButton.Size = new System.Drawing.Size(35, 37); - this.copyWildEncountersButton.TabIndex = 41; - this.copyWildEncountersButton.UseVisualStyleBackColor = true; - this.copyWildEncountersButton.Click += new System.EventHandler(this.copyWildEncountersButton_Click); - // // copyLocationNameButton // this.copyLocationNameButton.Image = ((System.Drawing.Image)(resources.GetObject("copyLocationNameButton.Image"))); @@ -1186,16 +1223,6 @@ this.label14.TabIndex = 27; this.label14.Text = "Internal name"; // - // openWildEditorWithIdButton - // - this.openWildEditorWithIdButton.Location = new System.Drawing.Point(13, 46); - this.openWildEditorWithIdButton.Name = "openWildEditorWithIdButton"; - this.openWildEditorWithIdButton.Size = new System.Drawing.Size(73, 41); - this.openWildEditorWithIdButton.TabIndex = 24; - this.openWildEditorWithIdButton.Text = "Open Editor"; - this.openWildEditorWithIdButton.UseVisualStyleBackColor = true; - this.openWildEditorWithIdButton.Click += new System.EventHandler(this.openWildEditorWithIdButtonClick); - // // internalNameBox // this.internalNameBox.Location = new System.Drawing.Point(257, 40); @@ -1204,19 +1231,6 @@ this.internalNameBox.Size = new System.Drawing.Size(138, 20); this.internalNameBox.TabIndex = 6; // - // wildPokeUpDown - // - this.wildPokeUpDown.Location = new System.Drawing.Point(13, 20); - this.wildPokeUpDown.Maximum = new decimal(new int[] { - 65535, - 0, - 0, - 0}); - this.wildPokeUpDown.Name = "wildPokeUpDown"; - this.wildPokeUpDown.Size = new System.Drawing.Size(73, 20); - this.wildPokeUpDown.TabIndex = 24; - this.wildPokeUpDown.ValueChanged += new System.EventHandler(this.wildPokeUpDown_ValueChanged); - // // label2 // this.label2.AutoSize = true; @@ -2064,62 +2078,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; - dataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.headersGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle16; - this.headersGridView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.headersGridView.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; - dataGridViewCellStyle17.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle17.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle17.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); - dataGridViewCellStyle17.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle17.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle17.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle17.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.headersGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle17; - this.headersGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridViewCellStyle18.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle18.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle18.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - dataGridViewCellStyle18.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle18.Format = "D4"; - dataGridViewCellStyle18.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle18.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle18.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.headersGridView.DefaultCellStyle = dataGridViewCellStyle18; - this.headersGridView.Location = new System.Drawing.Point(0, 0); - this.headersGridView.Name = "headersGridView"; - dataGridViewCellStyle19.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle19.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle19.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); - dataGridViewCellStyle19.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle19.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle19.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle19.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.headersGridView.RowHeadersDefaultCellStyle = dataGridViewCellStyle19; - this.headersGridView.RowHeadersWidth = 50; - this.headersGridView.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing; - dataGridViewCellStyle20.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle20.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.headersGridView.RowsDefaultCellStyle = dataGridViewCellStyle20; - this.headersGridView.RowTemplate.DefaultCellStyle.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.headersGridView.RowTemplate.Height = 18; - this.headersGridView.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.False; - this.headersGridView.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect; - this.headersGridView.ShowCellErrors = false; - this.headersGridView.Size = new System.Drawing.Size(965, 566); - 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); - // // heightsTabPage // this.heightsTabPage.Controls.Add(this.heightsGridView); @@ -2130,60 +2088,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; - dataGridViewCellStyle21.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.heightsGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle21; - this.heightsGridView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.heightsGridView.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; - dataGridViewCellStyle22.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle22.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle22.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); - dataGridViewCellStyle22.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle22.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle22.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle22.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.heightsGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle22; - this.heightsGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridViewCellStyle23.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle23.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle23.Font = new System.Drawing.Font("Tahoma", 8.25F); - dataGridViewCellStyle23.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle23.Format = "D2"; - dataGridViewCellStyle23.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle23.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle23.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.heightsGridView.DefaultCellStyle = dataGridViewCellStyle23; - this.heightsGridView.Location = new System.Drawing.Point(0, 0); - this.heightsGridView.Name = "heightsGridView"; - dataGridViewCellStyle24.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle24.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle24.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); - dataGridViewCellStyle24.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle24.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle24.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle24.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.heightsGridView.RowHeadersDefaultCellStyle = dataGridViewCellStyle24; - this.heightsGridView.RowHeadersWidth = 50; - this.heightsGridView.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing; - dataGridViewCellStyle25.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle25.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.heightsGridView.RowsDefaultCellStyle = dataGridViewCellStyle25; - this.heightsGridView.RowTemplate.DefaultCellStyle.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.heightsGridView.RowTemplate.Height = 18; - this.heightsGridView.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.False; - this.heightsGridView.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect; - this.heightsGridView.Size = new System.Drawing.Size(965, 566); - 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); - // // mapFilesTabPage // this.mapFilesTabPage.Controls.Add(this.mapFilesGridView); @@ -2194,61 +2098,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; - dataGridViewCellStyle26.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.mapFilesGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle26; - this.mapFilesGridView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.mapFilesGridView.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; - dataGridViewCellStyle27.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle27.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle27.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); - dataGridViewCellStyle27.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle27.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle27.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle27.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.mapFilesGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle27; - this.mapFilesGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridViewCellStyle28.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle28.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle28.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - dataGridViewCellStyle28.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle28.Format = "D4"; - dataGridViewCellStyle28.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle28.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle28.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.mapFilesGridView.DefaultCellStyle = dataGridViewCellStyle28; - this.mapFilesGridView.Location = new System.Drawing.Point(0, 0); - this.mapFilesGridView.Name = "mapFilesGridView"; - dataGridViewCellStyle29.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle29.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle29.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); - dataGridViewCellStyle29.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle29.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle29.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle29.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.mapFilesGridView.RowHeadersDefaultCellStyle = dataGridViewCellStyle29; - this.mapFilesGridView.RowHeadersWidth = 50; - this.mapFilesGridView.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing; - dataGridViewCellStyle30.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle30.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.mapFilesGridView.RowsDefaultCellStyle = dataGridViewCellStyle30; - this.mapFilesGridView.RowTemplate.DefaultCellStyle.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.mapFilesGridView.RowTemplate.Height = 18; - this.mapFilesGridView.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.False; - this.mapFilesGridView.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect; - this.mapFilesGridView.Size = new System.Drawing.Size(965, 566); - 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); - // // matrixNameTextBox // this.matrixNameTextBox.Location = new System.Drawing.Point(15, 211); @@ -2525,31 +2374,31 @@ // // buildingHeightUpDown // - this.buildingHeightUpDown.Location = new System.Drawing.Point(258, 285); + this.buildingHeightUpDown.Location = new System.Drawing.Point(327, 217); this.buildingHeightUpDown.Name = "buildingHeightUpDown"; - this.buildingHeightUpDown.Size = new System.Drawing.Size(101, 20); + this.buildingHeightUpDown.Size = new System.Drawing.Size(50, 20); this.buildingHeightUpDown.TabIndex = 24; this.buildingHeightUpDown.ValueChanged += new System.EventHandler(this.buildingHeightUpDown_ValueChanged); // // buildingLengthUpDown // - this.buildingLengthUpDown.Location = new System.Drawing.Point(138, 286); + this.buildingLengthUpDown.Location = new System.Drawing.Point(258, 217); this.buildingLengthUpDown.Name = "buildingLengthUpDown"; - this.buildingLengthUpDown.Size = new System.Drawing.Size(101, 20); + this.buildingLengthUpDown.Size = new System.Drawing.Size(50, 20); this.buildingLengthUpDown.TabIndex = 23; this.buildingLengthUpDown.ValueChanged += new System.EventHandler(this.buildingLengthUpDown_ValueChanged); // // buildingWidthUpDown // - this.buildingWidthUpDown.Location = new System.Drawing.Point(17, 286); + this.buildingWidthUpDown.Location = new System.Drawing.Point(188, 217); this.buildingWidthUpDown.Name = "buildingWidthUpDown"; - this.buildingWidthUpDown.Size = new System.Drawing.Size(101, 20); + this.buildingWidthUpDown.Size = new System.Drawing.Size(50, 20); this.buildingWidthUpDown.TabIndex = 22; this.buildingWidthUpDown.ValueChanged += new System.EventHandler(this.buildingWidthUpDown_ValueChanged); // // importBuildingsButton // - this.importBuildingsButton.Location = new System.Drawing.Point(247, 56); + this.importBuildingsButton.Location = new System.Drawing.Point(229, 56); this.importBuildingsButton.Name = "importBuildingsButton"; this.importBuildingsButton.Size = new System.Drawing.Size(112, 38); this.importBuildingsButton.TabIndex = 21; @@ -2559,7 +2408,7 @@ // // exportBuildingsButton // - this.exportBuildingsButton.Location = new System.Drawing.Point(247, 9); + this.exportBuildingsButton.Location = new System.Drawing.Point(229, 9); this.exportBuildingsButton.Name = "exportBuildingsButton"; this.exportBuildingsButton.Size = new System.Drawing.Size(112, 38); this.exportBuildingsButton.TabIndex = 20; @@ -2570,7 +2419,7 @@ // label20 // this.label20.AutoSize = true; - this.label20.Location = new System.Drawing.Point(255, 270); + this.label20.Location = new System.Drawing.Point(324, 202); this.label20.Name = "label20"; this.label20.Size = new System.Drawing.Size(38, 13); this.label20.TabIndex = 19; @@ -2579,7 +2428,7 @@ // label19 // this.label19.AutoSize = true; - this.label19.Location = new System.Drawing.Point(135, 270); + this.label19.Location = new System.Drawing.Point(255, 201); this.label19.Name = "label19"; this.label19.Size = new System.Drawing.Size(40, 13); this.label19.TabIndex = 18; @@ -2588,7 +2437,7 @@ // label18 // this.label18.AutoSize = true; - this.label18.Location = new System.Drawing.Point(14, 270); + this.label18.Location = new System.Drawing.Point(185, 201); this.label18.Name = "label18"; this.label18.Size = new System.Drawing.Size(35, 13); this.label18.TabIndex = 17; @@ -2596,9 +2445,9 @@ // // removeBuildingButton // - this.removeBuildingButton.Location = new System.Drawing.Point(100, 175); + this.removeBuildingButton.Location = new System.Drawing.Point(100, 302); this.removeBuildingButton.Name = "removeBuildingButton"; - this.removeBuildingButton.Size = new System.Drawing.Size(82, 33); + this.removeBuildingButton.Size = new System.Drawing.Size(82, 23); this.removeBuildingButton.TabIndex = 13; this.removeBuildingButton.Text = "Remove"; this.removeBuildingButton.UseVisualStyleBackColor = true; @@ -2606,9 +2455,9 @@ // // addBuildingButton // - this.addBuildingButton.Location = new System.Drawing.Point(14, 175); + this.addBuildingButton.Location = new System.Drawing.Point(14, 302); this.addBuildingButton.Name = "addBuildingButton"; - this.addBuildingButton.Size = new System.Drawing.Size(80, 33); + this.addBuildingButton.Size = new System.Drawing.Size(80, 23); this.addBuildingButton.TabIndex = 12; this.addBuildingButton.Text = "Add"; this.addBuildingButton.UseVisualStyleBackColor = true; @@ -2628,16 +2477,16 @@ this.buildPositionGroupBox.Controls.Add(this.zBuildUpDown); this.buildPositionGroupBox.Controls.Add(this.yBuildUpDown); this.buildPositionGroupBox.Controls.Add(this.xBuildUpDown); - this.buildPositionGroupBox.Location = new System.Drawing.Point(17, 315); + this.buildPositionGroupBox.Location = new System.Drawing.Point(17, 332); this.buildPositionGroupBox.Name = "buildPositionGroupBox"; - this.buildPositionGroupBox.Size = new System.Drawing.Size(342, 129); + this.buildPositionGroupBox.Size = new System.Drawing.Size(347, 120); this.buildPositionGroupBox.TabIndex = 11; this.buildPositionGroupBox.TabStop = false; this.buildPositionGroupBox.Text = "Position"; // // zFractionUpDown // - this.zFractionUpDown.Location = new System.Drawing.Point(121, 94); + this.zFractionUpDown.Location = new System.Drawing.Point(131, 92); this.zFractionUpDown.Maximum = new decimal(new int[] { 65535, 0, @@ -2650,7 +2499,7 @@ // // yFractionUpDown // - this.yFractionUpDown.Location = new System.Drawing.Point(121, 59); + this.yFractionUpDown.Location = new System.Drawing.Point(131, 55); this.yFractionUpDown.Maximum = new decimal(new int[] { 65535, 0, @@ -2663,7 +2512,7 @@ // // xFractionUpDown // - this.xFractionUpDown.Location = new System.Drawing.Point(121, 23); + this.xFractionUpDown.Location = new System.Drawing.Point(131, 21); this.xFractionUpDown.Maximum = new decimal(new int[] { 65535, 0, @@ -2677,7 +2526,7 @@ // label23 // this.label23.AutoSize = true; - this.label23.Location = new System.Drawing.Point(238, 98); + this.label23.Location = new System.Drawing.Point(238, 96); this.label23.Name = "label23"; this.label23.Size = new System.Drawing.Size(95, 13); this.label23.TabIndex = 16; @@ -2686,7 +2535,7 @@ // label22 // this.label22.AutoSize = true; - this.label22.Location = new System.Drawing.Point(238, 62); + this.label22.Location = new System.Drawing.Point(238, 60); this.label22.Name = "label22"; this.label22.Size = new System.Drawing.Size(95, 13); this.label22.TabIndex = 15; @@ -2695,7 +2544,7 @@ // label21 // this.label21.AutoSize = true; - this.label21.Location = new System.Drawing.Point(238, 25); + this.label21.Location = new System.Drawing.Point(238, 23); this.label21.Name = "label21"; this.label21.Size = new System.Drawing.Size(95, 13); this.label21.TabIndex = 14; @@ -2704,7 +2553,7 @@ // label17 // this.label17.AutoSize = true; - this.label17.Location = new System.Drawing.Point(12, 97); + this.label17.Location = new System.Drawing.Point(12, 95); this.label17.Name = "label17"; this.label17.Size = new System.Drawing.Size(14, 13); this.label17.TabIndex = 10; @@ -2713,7 +2562,7 @@ // yLabel // this.yLabel.AutoSize = true; - this.yLabel.Location = new System.Drawing.Point(12, 59); + this.yLabel.Location = new System.Drawing.Point(12, 57); this.yLabel.Name = "yLabel"; this.yLabel.Size = new System.Drawing.Size(14, 13); this.yLabel.TabIndex = 9; @@ -2722,7 +2571,7 @@ // xLabel // this.xLabel.AutoSize = true; - this.xLabel.Location = new System.Drawing.Point(12, 25); + this.xLabel.Location = new System.Drawing.Point(12, 23); this.xLabel.Name = "xLabel"; this.xLabel.Size = new System.Drawing.Size(14, 13); this.xLabel.TabIndex = 8; @@ -2730,7 +2579,7 @@ // // zBuildUpDown // - this.zBuildUpDown.Location = new System.Drawing.Point(32, 94); + this.zBuildUpDown.Location = new System.Drawing.Point(32, 92); this.zBuildUpDown.Maximum = new decimal(new int[] { 255, 0, @@ -2748,7 +2597,7 @@ // // yBuildUpDown // - this.yBuildUpDown.Location = new System.Drawing.Point(32, 57); + this.yBuildUpDown.Location = new System.Drawing.Point(32, 55); this.yBuildUpDown.Maximum = new decimal(new int[] { 255, 0, @@ -2766,7 +2615,7 @@ // // xBuildUpDown // - this.xBuildUpDown.Location = new System.Drawing.Point(32, 22); + this.xBuildUpDown.Location = new System.Drawing.Point(32, 20); this.xBuildUpDown.Maximum = new decimal(new int[] { 255, 0, @@ -2787,7 +2636,7 @@ this.exteriorbldRadioButton.AutoSize = true; this.exteriorbldRadioButton.Checked = true; this.exteriorbldRadioButton.Enabled = false; - this.exteriorbldRadioButton.Location = new System.Drawing.Point(269, 235); + this.exteriorbldRadioButton.Location = new System.Drawing.Point(320, 143); this.exteriorbldRadioButton.Name = "exteriorbldRadioButton"; this.exteriorbldRadioButton.Size = new System.Drawing.Size(60, 17); this.exteriorbldRadioButton.TabIndex = 4; @@ -2799,7 +2648,7 @@ // this.interiorbldRadioButton.AutoSize = true; this.interiorbldRadioButton.Enabled = false; - this.interiorbldRadioButton.Location = new System.Drawing.Point(206, 235); + this.interiorbldRadioButton.Location = new System.Drawing.Point(260, 143); this.interiorbldRadioButton.Name = "interiorbldRadioButton"; this.interiorbldRadioButton.Size = new System.Drawing.Size(57, 17); this.interiorbldRadioButton.TabIndex = 3; @@ -2810,19 +2659,19 @@ // modelNumberLabel // this.modelNumberLabel.AutoSize = true; - this.modelNumberLabel.Location = new System.Drawing.Point(14, 219); + this.modelNumberLabel.Location = new System.Drawing.Point(185, 145); this.modelNumberLabel.Name = "modelNumberLabel"; - this.modelNumberLabel.Size = new System.Drawing.Size(76, 13); + this.modelNumberLabel.Size = new System.Drawing.Size(68, 13); this.modelNumberLabel.TabIndex = 2; - this.modelNumberLabel.Text = "Building Model"; + this.modelNumberLabel.Text = "Buildings List"; // // buildIndexComboBox // this.buildIndexComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.buildIndexComboBox.FormattingEnabled = true; - this.buildIndexComboBox.Location = new System.Drawing.Point(17, 235); + this.buildIndexComboBox.Location = new System.Drawing.Point(188, 161); this.buildIndexComboBox.Name = "buildIndexComboBox"; - this.buildIndexComboBox.Size = new System.Drawing.Size(169, 21); + this.buildIndexComboBox.Size = new System.Drawing.Size(189, 21); this.buildIndexComboBox.TabIndex = 1; this.buildIndexComboBox.SelectedIndexChanged += new System.EventHandler(this.buildIndexComboBox_SelectedIndexChanged); // @@ -2831,7 +2680,7 @@ this.buildingsListBox.FormattingEnabled = true; this.buildingsListBox.Location = new System.Drawing.Point(14, 9); this.buildingsListBox.Name = "buildingsListBox"; - this.buildingsListBox.Size = new System.Drawing.Size(168, 160); + this.buildingsListBox.Size = new System.Drawing.Size(168, 290); this.buildingsListBox.TabIndex = 0; this.buildingsListBox.SelectedIndexChanged += new System.EventHandler(this.buildingsListBox_SelectedIndexChanged); // @@ -6817,6 +6666,7 @@ this.loadRomButton, this.saveRomButton, this.unpackAllButton, + this.updateMapNarcsButton, this.toolStripSeparator1, this.wildEditorButton, this.buildingEditorButton, @@ -6840,6 +6690,19 @@ this.unpackAllButton.Text = "Unpack All Narcs"; this.unpackAllButton.Click += new System.EventHandler(this.unpackAllButton_Click); // + // updateMapNarcsButton + // + this.updateMapNarcsButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.updateMapNarcsButton.Enabled = false; + this.updateMapNarcsButton.Image = global::DSPRE.Properties.Resources.unpackBuildingNarcsIcon; + this.updateMapNarcsButton.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; + this.updateMapNarcsButton.ImageTransparentColor = System.Drawing.Color.Magenta; + this.updateMapNarcsButton.Margin = new System.Windows.Forms.Padding(0, 6, 0, 2); + this.updateMapNarcsButton.Name = "updateMapNarcsButton"; + this.updateMapNarcsButton.Size = new System.Drawing.Size(36, 36); + this.updateMapNarcsButton.Text = "Update Map Narcs"; + this.updateMapNarcsButton.Click += new System.EventHandler(this.updateMapNarcsButton_Click); + // // toolStripSeparator1 // this.toolStripSeparator1.Name = "toolStripSeparator1"; @@ -6896,18 +6759,170 @@ this.versionLabel.TabIndex = 9; this.versionLabel.Text = "ROM:"; // - // groupBox18 + // headersGridView // - this.groupBox18.Controls.Add(this.openWildEditorWithIdButton); - this.groupBox18.Controls.Add(this.pasteWildEncountersButton); - this.groupBox18.Controls.Add(this.wildPokeUpDown); - this.groupBox18.Controls.Add(this.copyWildEncountersButton); - this.groupBox18.Location = new System.Drawing.Point(732, 12); - this.groupBox18.Name = "groupBox18"; - this.groupBox18.Size = new System.Drawing.Size(101, 140); - this.groupBox18.TabIndex = 51; - this.groupBox18.TabStop = false; - this.groupBox18.Text = "Wild Encounters"; + this.headersGridView.AllowUserToAddRows = false; + this.headersGridView.AllowUserToDeleteRows = false; + this.headersGridView.AllowUserToResizeColumns = false; + this.headersGridView.AllowUserToResizeRows = false; + dataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.headersGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle16; + this.headersGridView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.headersGridView.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; + dataGridViewCellStyle17.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle17.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle17.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); + dataGridViewCellStyle17.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle17.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle17.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle17.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.headersGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle17; + this.headersGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + dataGridViewCellStyle18.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle18.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle18.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + dataGridViewCellStyle18.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle18.Format = "D4"; + dataGridViewCellStyle18.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle18.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle18.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.headersGridView.DefaultCellStyle = dataGridViewCellStyle18; + this.headersGridView.Location = new System.Drawing.Point(0, 0); + this.headersGridView.Name = "headersGridView"; + dataGridViewCellStyle19.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle19.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle19.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); + dataGridViewCellStyle19.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle19.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle19.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle19.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.headersGridView.RowHeadersDefaultCellStyle = dataGridViewCellStyle19; + this.headersGridView.RowHeadersWidth = 50; + this.headersGridView.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing; + dataGridViewCellStyle20.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle20.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.headersGridView.RowsDefaultCellStyle = dataGridViewCellStyle20; + this.headersGridView.RowTemplate.DefaultCellStyle.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.headersGridView.RowTemplate.Height = 18; + this.headersGridView.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.False; + this.headersGridView.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect; + this.headersGridView.ShowCellErrors = false; + this.headersGridView.Size = new System.Drawing.Size(965, 566); + 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); + // + // heightsGridView + // + this.heightsGridView.AllowUserToAddRows = false; + this.heightsGridView.AllowUserToDeleteRows = false; + this.heightsGridView.AllowUserToResizeColumns = false; + this.heightsGridView.AllowUserToResizeRows = false; + dataGridViewCellStyle21.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.heightsGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle21; + this.heightsGridView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.heightsGridView.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; + dataGridViewCellStyle22.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle22.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle22.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); + dataGridViewCellStyle22.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle22.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle22.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle22.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.heightsGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle22; + this.heightsGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + dataGridViewCellStyle23.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle23.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle23.Font = new System.Drawing.Font("Tahoma", 8.25F); + dataGridViewCellStyle23.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle23.Format = "D2"; + dataGridViewCellStyle23.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle23.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle23.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.heightsGridView.DefaultCellStyle = dataGridViewCellStyle23; + this.heightsGridView.Location = new System.Drawing.Point(0, 0); + this.heightsGridView.Name = "heightsGridView"; + dataGridViewCellStyle24.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle24.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle24.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); + dataGridViewCellStyle24.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle24.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle24.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle24.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.heightsGridView.RowHeadersDefaultCellStyle = dataGridViewCellStyle24; + this.heightsGridView.RowHeadersWidth = 50; + this.heightsGridView.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing; + dataGridViewCellStyle25.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle25.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.heightsGridView.RowsDefaultCellStyle = dataGridViewCellStyle25; + this.heightsGridView.RowTemplate.DefaultCellStyle.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.heightsGridView.RowTemplate.Height = 18; + this.heightsGridView.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.False; + this.heightsGridView.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect; + this.heightsGridView.Size = new System.Drawing.Size(965, 566); + 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); + // + // mapFilesGridView + // + this.mapFilesGridView.AllowUserToAddRows = false; + this.mapFilesGridView.AllowUserToDeleteRows = false; + this.mapFilesGridView.AllowUserToResizeColumns = false; + this.mapFilesGridView.AllowUserToResizeRows = false; + dataGridViewCellStyle26.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.mapFilesGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle26; + this.mapFilesGridView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.mapFilesGridView.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; + dataGridViewCellStyle27.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle27.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle27.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); + dataGridViewCellStyle27.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle27.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle27.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle27.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.mapFilesGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle27; + this.mapFilesGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + dataGridViewCellStyle28.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle28.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle28.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + dataGridViewCellStyle28.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle28.Format = "D4"; + dataGridViewCellStyle28.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle28.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle28.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.mapFilesGridView.DefaultCellStyle = dataGridViewCellStyle28; + this.mapFilesGridView.Location = new System.Drawing.Point(0, 0); + this.mapFilesGridView.Name = "mapFilesGridView"; + dataGridViewCellStyle29.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle29.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle29.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); + dataGridViewCellStyle29.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle29.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle29.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle29.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.mapFilesGridView.RowHeadersDefaultCellStyle = dataGridViewCellStyle29; + this.mapFilesGridView.RowHeadersWidth = 50; + this.mapFilesGridView.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing; + dataGridViewCellStyle30.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle30.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.mapFilesGridView.RowsDefaultCellStyle = dataGridViewCellStyle30; + this.mapFilesGridView.RowTemplate.DefaultCellStyle.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.mapFilesGridView.RowTemplate.Height = 18; + this.mapFilesGridView.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.False; + this.mapFilesGridView.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect; + this.mapFilesGridView.Size = new System.Drawing.Size(965, 566); + 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); // // MainProgram // @@ -6927,10 +6942,12 @@ this.MainMenuStrip = this.menuStrip1; this.MaximizeBox = false; this.Name = "MainProgram"; - this.Text = "DS Pokémon Rom Editor 1.0.7a (Nømura, AdAstra, Mixone)"; + this.Text = "DS Pokémon Rom Editor 1.0.7b (Nømura, AdAstra, Mixone)"; this.mainTabControl.ResumeLayout(false); this.headerEditorTabPage.ResumeLayout(false); this.headerEditorTabPage.PerformLayout(); + this.groupBox18.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.wildPokeUpDown)).EndInit(); this.groupBox10.ResumeLayout(false); this.groupBox10.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.textFileUpDown)).EndInit(); @@ -6940,7 +6957,6 @@ ((System.ComponentModel.ISupportInitialize)(this.areaIconPictureBox)).EndInit(); this.nameGroupBox.ResumeLayout(false); this.nameGroupBox.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.wildPokeUpDown)).EndInit(); this.groupBox2.ResumeLayout(false); this.groupBox2.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.weatherUpDown)).EndInit(); @@ -6962,11 +6978,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); @@ -7119,7 +7132,9 @@ this.statusStrip1.PerformLayout(); this.mainToolStrip.ResumeLayout(false); this.mainToolStrip.PerformLayout(); - this.groupBox18.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.headersGridView)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.heightsGridView)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.mapFilesGridView)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); @@ -7645,6 +7660,7 @@ private System.Windows.Forms.Button exportHeaderToFileButton; private System.Windows.Forms.ToolTip toolTip1; private System.Windows.Forms.GroupBox groupBox18; + private System.Windows.Forms.ToolStripButton updateMapNarcsButton; } } diff --git a/DS_Map/Main Window.cs b/DS_Map/Main Window.cs index 794238e..048c7d9 100644 --- a/DS_Map/Main Window.cs +++ b/DS_Map/Main Window.cs @@ -32,7 +32,7 @@ namespace DSPRE { public bool expandedARM9; public bool standardizedItems; - private const string headerNamesSeparator = " - "; + private const string nameSeparator = " - "; /* Editors Setup */ public bool matrixEditorIsReady { get; private set; } = false; @@ -60,7 +60,7 @@ namespace DSPRE { using (BinaryReader reader = new BinaryReader(File.OpenRead(path + "\\" + i.ToString("D4")))) { reader.BaseStream.Position = 0x38; string nsbmdName = Encoding.UTF8.GetString(reader.ReadBytes(16)).TrimEnd(); - names.Add(i + ": " + nsbmdName); + names.Add(nsbmdName); } } return names.ToArray(); @@ -279,8 +279,6 @@ namespace DSPRE { } private void SetupEventEditor() { /* Extract essential NARCs sub-archives*/ - string[] narcPaths = romInfo.narcPaths; - string[] extractedNarcDirs = romInfo.extractedNarcDirs; statusLabel.Text = "Attempting to unpack Event Editor NARCs... Please wait. This might take a while"; toolStripProgressBar.Visible = true; @@ -288,21 +286,9 @@ namespace DSPRE { toolStripProgressBar.Value = 0; Update(); - for (int i = 2; i < 13; i++) { - var tuple = Tuple.Create(narcPaths[i], extractedNarcDirs[i]); - DirectoryInfo di = new DirectoryInfo(tuple.Item2); - if (!di.Exists || di.GetFiles().Length == 0) { - Narc.Open(romInfo.workDir + tuple.Item1).ExtractToFolder(tuple.Item2); - } - toolStripProgressBar.Value++; - } + UnpackNarcs(new List { 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12 }); if (romInfo.gameVersion == "HG" || romInfo.gameVersion == "SS") { - var tuple = Tuple.Create(narcPaths[narcPaths.Length - 1], extractedNarcDirs[extractedNarcDirs.Length - 1]); // Last = interior buildings dir - DirectoryInfo di = new DirectoryInfo(tuple.Item2); - if (!di.Exists || di.GetFiles().Length == 0) { - Narc.Open(romInfo.workDir + tuple.Item1).ExtractToFolder(tuple.Item2); - } - toolStripProgressBar.Value++; + UnpackNarcs(new List { romInfo.narcPaths.Length - 1 }); } @@ -412,19 +398,11 @@ namespace DSPRE { } private void SetupHeaderEditor() { /* Extract essential NARCs sub-archives*/ - string[] narcPaths = romInfo.narcPaths; - string[] extractedNarcDirs = romInfo.extractedNarcDirs; statusLabel.Text = "Attempting to unpack Header Editor NARCs... Please wait."; Update(); - for (int i = 0; i < 2; i++) { - var tuple = Tuple.Create(narcPaths[i], extractedNarcDirs[i]); - DirectoryInfo di = new DirectoryInfo(tuple.Item2); - if (!di.Exists || di.GetFiles().Length == 0) { - Narc.Open(romInfo.workDir + tuple.Item1).ExtractToFolder(tuple.Item2); - } - } + UnpackNarcs(new List { 0, 1 }); statusLabel.Text = "Reading internal names... Please wait."; Update(); @@ -439,7 +417,7 @@ namespace DSPRE { byte[] row = reader.ReadBytes(romInfo.internalNameLength); string internalName = Encoding.ASCII.GetString(row);//.TrimEnd(); - headerListBox.Items.Add(i.ToString("D3") + headerNamesSeparator + internalName); + headerListBox.Items.Add(i.ToString("D3") + nameSeparator + internalName); internalNames.Add(internalName); } } @@ -490,30 +468,15 @@ namespace DSPRE { } private void SetupMapEditor() { /* Extract essential NARCs sub-archives*/ - string[] narcPaths = romInfo.narcPaths; - string[] extractedNarcDirs = romInfo.extractedNarcDirs; - toolStripProgressBar.Visible = true; toolStripProgressBar.Maximum = 15; toolStripProgressBar.Value = 0; statusLabel.Text = "Attempting to unpack Map Editor NARCs... Please wait."; Update(); - for (int i = 3; i < 9; i++) { - var tuple = Tuple.Create(narcPaths[i], extractedNarcDirs[i]); - DirectoryInfo di = new DirectoryInfo(tuple.Item2); - if (!di.Exists || di.GetFiles().Length == 0) { - Narc.Open(romInfo.workDir + tuple.Item1).ExtractToFolder(tuple.Item2); - } - toolStripProgressBar.Value++; - } + UnpackNarcs(new List { 3, 4, 5, 6, 7, 8 }); if (romInfo.gameVersion == "HG" || romInfo.gameVersion == "SS") { - var tuple = Tuple.Create(narcPaths[narcPaths.Length - 1], extractedNarcDirs[extractedNarcDirs.Length - 1]); - DirectoryInfo di = new DirectoryInfo(tuple.Item2); - if (!di.Exists || di.GetFiles().Length == 0) { - Narc.Open(romInfo.workDir + tuple.Item1).ExtractToFolder(tuple.Item2); - } - toolStripProgressBar.Value++; + UnpackNarcs(new List { romInfo.narcPaths.Length - 1 }); } disableHandlers = true; @@ -550,15 +513,14 @@ namespace DSPRE { break; }; string nsbmdName = Encoding.UTF8.GetString(reader.ReadBytes(16)); - selectMapComboBox.Items.Add(i + ": " + nsbmdName); + selectMapComboBox.Items.Add(i.ToString("D3") + nameSeparator + nsbmdName); } } toolStripProgressBar.Value++; /* Fill building models list */ - buildIndexComboBox.Items.AddRange(GetBuildingsList(false)); - toolStripProgressBar.Value++; + updateBuildingListComboBox(false); /* Fill map textures list */ mapTextureComboBox.Items.Add("Untextured"); @@ -700,19 +662,20 @@ namespace DSPRE { break; }; } - private void SetupMatrixEditor() { - string[] narcPaths = romInfo.narcPaths; - string[] extractedNarcDirs = romInfo.extractedNarcDirs; + private void updateBuildingListComboBox(bool interior) { + string[] bldList = GetBuildingsList(interior); + for (int i = 0; i < bldList.Length; i++) { + buildIndexComboBox.Items.Add("[" + i + "] " + bldList[i]); + } + toolStripProgressBar.Value++; + } + + private void SetupMatrixEditor() { statusLabel.Text = "Setting up Matrix Editor..."; Update(); - var tuple = Tuple.Create(narcPaths[2], extractedNarcDirs[2]); // 2 = matrixDir - DirectoryInfo di = new DirectoryInfo(tuple.Item2); - if (!di.Exists || di.GetFiles().Length == 0) { - Narc.Open(romInfo.workDir + tuple.Item1).ExtractToFolder(tuple.Item2); - } - + UnpackNarcs(new List { 2 }); // 2 = matrixDir disableHandlers = true; @@ -726,18 +689,10 @@ namespace DSPRE { } private void SetupScriptEditor() { /* Extract essential NARCs sub-archives*/ - string[] narcPaths = romInfo.narcPaths; - string[] extractedNarcDirs = romInfo.extractedNarcDirs; - statusLabel.Text = "Setting up Script Editor..."; Update(); - var tuple = Tuple.Create(narcPaths[12], extractedNarcDirs[12]); //12 = scripts Narc Dir - DirectoryInfo di = new DirectoryInfo(tuple.Item2); - if (!di.Exists || di.GetFiles().Length == 0) { - Narc.Open(romInfo.workDir + tuple.Item1).ExtractToFolder(tuple.Item2); - } - + UnpackNarcs(new List { 12 }); //12 = scripts Narc Dir int scriptCount = Directory.GetFiles(romInfo.scriptDirPath).Length; for (int i = 0; i < scriptCount; i++) @@ -753,11 +708,7 @@ namespace DSPRE { string[] narcPaths = romInfo.narcPaths; string[] extractedNarcDirs = romInfo.extractedNarcDirs; - var tuple = Tuple.Create(narcPaths[2], extractedNarcDirs[2]); - DirectoryInfo di = new DirectoryInfo(tuple.Item2); - if (!di.Exists || di.GetFiles().Length == 0) { - Narc.Open(romInfo.workDir + tuple.Item1).ExtractToFolder(tuple.Item2); - } + UnpackNarcs(new List { 1 }); statusLabel.Text = "Setting up Text Editor..."; Update(); @@ -768,19 +719,10 @@ namespace DSPRE { selectTextFileComboBox.SelectedIndex = 0; } private void SetupTilesetEditor() { - string[] narcPaths = romInfo.narcPaths; - string[] extractedNarcDirs = romInfo.extractedNarcDirs; - statusLabel.Text = "Attempting to unpack Tileset Editor NARCs... Please wait."; Update(); - for (int i = 6; i < 9; i++) { - var tuple = Tuple.Create(narcPaths[i], extractedNarcDirs[i]); - DirectoryInfo di = new DirectoryInfo(tuple.Item2); - if (!di.Exists || di.GetFiles().Length == 0) { - Narc.Open(romInfo.workDir + tuple.Item1).ExtractToFolder(tuple.Item2); - } - } + UnpackNarcs(new List { 6, 7, 8 }); /* Fill Tileset ListBox */ FillTilesetBox(); @@ -870,9 +812,13 @@ namespace DSPRE { } } private void buildingEditorButton_Click(object sender, EventArgs e) { - string[] narcPaths = romInfo.narcPaths; - string[] extractedNarcDirs = romInfo.extractedNarcDirs; + unpackBuildingEditorNARCs(); + using (BuildingEditor editor = new BuildingEditor(romInfo)) + editor.ShowDialog(); + } + + private void unpackBuildingEditorNARCs() { toolStripProgressBar.Visible = true; statusLabel.Text = "Attempting to unpack Building Editor NARCs... Please wait. This might take a while"; @@ -881,35 +827,63 @@ namespace DSPRE { toolStripProgressBar.Value = 0; Update(); - for (int i = 4; i < 7; i++) { - var tuple = Tuple.Create(narcPaths[i], extractedNarcDirs[i]); - DirectoryInfo di = new DirectoryInfo(tuple.Item2); - if (!di.Exists || di.GetFiles().Length == 0) { - Narc.Open(romInfo.workDir + tuple.Item1).ExtractToFolder(tuple.Item2); - } - toolStripProgressBar.Value++; - } - if (romInfo.gameVersion == "HG" || romInfo.gameVersion == "SS") { - var tuple = Tuple.Create(narcPaths[narcPaths.Length - 1], extractedNarcDirs[extractedNarcDirs.Length - 1]); // Last = interior buildings dir - DirectoryInfo di = new DirectoryInfo(tuple.Item2); - if (!di.Exists || di.GetFiles().Length == 0) { - Narc.Open(romInfo.workDir + tuple.Item1).ExtractToFolder(tuple.Item2); - } - toolStripProgressBar.Value++; - } + UnpackNarcs(new List { 4, 5, 6 }); + if (romInfo.gameVersion == "HG" || romInfo.gameVersion == "SS") + UnpackNarcs(new List { romInfo.narcPaths.Length - 1 });// Last = interior buildings dir toolStripProgressBar.Value = 0; toolStripProgressBar.Visible = false; - - using (BuildingEditor editor = new BuildingEditor(romInfo)) - editor.ShowDialog(); } - private void aboutToolStripMenuItem1_Click(object sender, EventArgs e) { - string message = "DS Pokémon Rom Editor by Nømura (Unofficial Branch)" + Environment.NewLine + "version 1.0.7a" + Environment.NewLine - + Environment.NewLine + "This tool was largely inspired by Markitus95's Spiky's DS Map Editor, from which certain assets were also recycled. Credits go to Markitus, Ark, Zark, Florian, and everyone else who owes credit for SDSME." + Environment.NewLine + - "Special thanks go to Trifindo, Mikelan98, BagBoy, and JackHack96, whose help, research and expertise in the field of NDS Rom Hacking made the development of this tool possible."; - MessageBox.Show(message, "about", MessageBoxButtons.OK, MessageBoxIcon.Information); + private void UnpackNarcs(List IDs) { + string[] narcPaths = romInfo.narcPaths; + string[] extractedNarcDirs = romInfo.extractedNarcDirs; + + foreach (int id in IDs) { + var tuple = Tuple.Create(narcPaths[id], extractedNarcDirs[id]); + DirectoryInfo di = new DirectoryInfo(tuple.Item2); + if (!di.Exists || di.GetFiles().Length == 0) { + Narc.Open(romInfo.workDir + tuple.Item1).ExtractToFolder(tuple.Item2); + } + toolStripProgressBar.Value++; + } + } + + private void ForceUnpackBuildingEditorNARCs() { + toolStripProgressBar.Visible = true; + + statusLabel.Text = "Attempting to unpack Building Editor NARCs... Please wait. This might take a while"; + toolStripProgressBar.Visible = true; + toolStripProgressBar.Maximum = 4; + toolStripProgressBar.Value = 0; + Update(); + + forceUnpackNarcs(new List { 4, 5, 6 }); + if (romInfo.gameVersion == "HG" || romInfo.gameVersion == "SS") + forceUnpackNarcs(new List { romInfo.narcPaths.Length - 1 });// Last = interior buildings dir + + toolStripProgressBar.Value = 0; + toolStripProgressBar.Visible = false; + } + + private void forceUnpackNarcs(List IDs) { + string[] narcPaths = romInfo.narcPaths; + string[] extractedNarcDirs = romInfo.extractedNarcDirs; + + foreach (int id in IDs) { + var tuple = Tuple.Create(narcPaths[id], extractedNarcDirs[id]); + Narc.Open(romInfo.workDir + tuple.Item1).ExtractToFolder(tuple.Item2); + toolStripProgressBar.Value++; + } + + } + + private void aboutToolStripMenuItem1_Click(object sender, EventArgs e) { + string message = "DS Pokémon Rom Editor by Nømura (Unofficial Branch)" + Environment.NewLine + "version 1.0.7b" + Environment.NewLine + + Environment.NewLine + "This tool was largely inspired by Markitus95's Spiky's DS Map Editor, from which certain assets were also recycled. Credits go to Markitus, Ark, Zark, Florian, and everyone else who deserves credit for SDSME." + Environment.NewLine + + Environment.NewLine + "Special thanks go to Trifindo, Mikelan98, BagBoy, and JackHack96, whose help, research and expertise in the field of NDS Rom Hacking made the development of this tool possible."; + + MessageBox.Show(message, "About...", MessageBoxButtons.OK, MessageBoxIcon.Information); } private void loadRom_Click(object sender, EventArgs e) { OpenFileDialog openRom = new OpenFileDialog(); // Select ROM @@ -1009,6 +983,7 @@ namespace DSPRE { mainTabControl.Show(); saveRomButton.Enabled = true; unpackAllButton.Enabled = true; + updateMapNarcsButton.Enabled = true; romToolboxButton.Enabled = true; buildingEditorButton.Enabled = true; wildEditorButton.Enabled = true; @@ -1090,6 +1065,23 @@ namespace DSPRE { } } + private void updateMapNarcsButton_Click(object sender, EventArgs e) { + DialogResult d = MessageBox.Show("Do you wish to unpack all buildings-related NARCS?\n" + + "This operation might be long and can't be interrupted.\n" + + "Any unsaved changes made to buildings and textures in this session will be lost." + + "\nProceed?", "About to unpack all NARCS", + MessageBoxButtons.YesNo, MessageBoxIcon.Question); + + if (d == DialogResult.Yes) { + ForceUnpackBuildingEditorNARCs(); + + MessageBox.Show("Operation completed.", "Success", + MessageBoxButtons.OK, MessageBoxIcon.Information); + statusLabel.Text = "Ready"; + Update(); + } + } + private void mainTabControl_SelectedIndexChanged(object sender, EventArgs e) { if (mainTabControl.SelectedTab == headerEditorTabPage) { // @@ -1132,13 +1124,13 @@ namespace DSPRE { } private void openWildEditor(bool loadCurrent) { - string[] narcPaths = romInfo.narcPaths; - string[] extractedNarcDirs = romInfo.extractedNarcDirs; - statusLabel.Text = "Attempting to extract Wild Encounters NARC..."; Update(); + string[] narcPaths = romInfo.narcPaths; + string[] extractedNarcDirs = romInfo.extractedNarcDirs; Tuple t; + if (romInfo.gameVersion == "HG" || romInfo.gameVersion == "SS") { t = Tuple.Create(narcPaths[narcPaths.Length - 2], extractedNarcDirs[extractedNarcDirs.Length - 2]); } else { @@ -1706,7 +1698,7 @@ namespace DSPRE { private void updateHeaderNameShown(int thisIndex, int headerNumber, string text) { disableHandlers = true; - headerListBox.Items[thisIndex] = headerNumber.ToString("D3") + headerNamesSeparator + text; + headerListBox.Items[thisIndex] = headerNumber.ToString("D3") + nameSeparator + text; disableHandlers = false; } @@ -1723,7 +1715,7 @@ namespace DSPRE { for (int i = 0; i < internalNames.Count; i++) { String name = internalNames[i]; - headerListBox.Items.Add(i.ToString("D3") + headerNamesSeparator + name); + headerListBox.Items.Add(i.ToString("D3") + nameSeparator + name); } } private void searchHeaderTextBox_KeyPress(object sender, KeyEventArgs e) { @@ -1746,7 +1738,7 @@ namespace DSPRE { for (int i = 0; i < internalNames.Count; i++) { String locationName = locationNameComboBox.Items[((HeaderDP)LoadHeaderFromARM9(i)).locationName].ToString(); if (locationName.IndexOf(searchLocationTextBox.Text, StringComparison.InvariantCultureIgnoreCase) >= 0) { - headerListBox.Items.Add(i.ToString("D3") + headerNamesSeparator + internalNames[i]); + headerListBox.Items.Add(i.ToString("D3") + nameSeparator + internalNames[i]); empty = false; } } @@ -1755,7 +1747,7 @@ namespace DSPRE { for (int i = 0; i < internalNames.Count; i++) { String locationName = locationNameComboBox.Items[((HeaderPt)LoadHeaderFromARM9(i)).mapName].ToString(); if (locationName.IndexOf(searchLocationTextBox.Text, StringComparison.InvariantCultureIgnoreCase) >= 0) { - headerListBox.Items.Add(i.ToString("D3") + headerNamesSeparator + internalNames[i]); + headerListBox.Items.Add(i.ToString("D3") + nameSeparator + internalNames[i]); empty = false; } } @@ -1765,7 +1757,7 @@ namespace DSPRE { for (int i = 0; i < internalNames.Count; i++) { String locationName = locationNameComboBox.Items[((HeaderHGSS)LoadHeaderFromARM9(i)).mapName].ToString(); if (locationName.IndexOf(searchLocationTextBox.Text, StringComparison.InvariantCultureIgnoreCase) >= 0) { - headerListBox.Items.Add(i.ToString("D3") + headerNamesSeparator + internalNames[i]); + headerListBox.Items.Add(i.ToString("D3") + nameSeparator + internalNames[i]); empty = false; } } @@ -2509,7 +2501,11 @@ namespace DSPRE { #region Subroutines private void FillBuildingsBox() { buildingsListBox.Items.Clear(); - for (int i = 0; i < currentMapFile.buildings.Count; i++) buildingsListBox.Items.Add("Building " + (i + 1).ToString()); // Add entry into buildings ListBox + + string[] bldList = GetBuildingsList(interiorbldRadioButton.Checked); + for (int i = 0; i < currentMapFile.buildings.Count; i++) + // Add entry into buildings ListBox + buildingsListBox.Items.Add((i+1).ToString("D2") + nameSeparator + buildIndexComboBox.Items[(int)currentMapFile.buildings[i].modelID]); } private Building LoadBuildingModel(Building building, bool interior) { string modelPath = romInfo.GetBuildingModelsDirPath(interior) + "\\" + building.modelID.ToString("D4"); @@ -2621,7 +2617,7 @@ namespace DSPRE { using (BinaryWriter writer = new BinaryWriter(new FileStream(mapFilePath, FileMode.Create))) writer.Write(LoadMapFile(0).Save()); /* Update ComboBox and select new file */ - selectMapComboBox.Items.Add(selectMapComboBox.Items.Count + ": " + "newmap"); + selectMapComboBox.Items.Add(selectMapComboBox.Items.Count.ToString("D3") + nameSeparator + "newmap"); selectMapComboBox.SelectedIndex = selectMapComboBox.Items.Count - 1; } private void buildTextureComboBox_SelectedIndexChanged(object sender, EventArgs e) { @@ -2787,7 +2783,8 @@ namespace DSPRE { writer.Write(currentMapFile.Save()); } private void selectMapComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) return; + if (disableHandlers) + return; /* Load map data into MapFile class instance */ currentMapFile = LoadMapFile(selectMapComboBox.SelectedIndex); @@ -2820,9 +2817,6 @@ namespace DSPRE { FillBuildingsBox(); if (buildingsListBox.Items.Count > 0) buildingsListBox.SelectedIndex = 0; - } - private void textureComboBoxes_SelectedIndexChanged(object sender, EventArgs e) { - } private void wireframeCheckBox_CheckedChanged(object sender, EventArgs e) { if (wireframeCheckBox.Checked) @@ -2843,7 +2837,8 @@ namespace DSPRE { currentMapFile.buildings[currentMapFile.buildings.Count - 1].NSBMDFile = LoadModelTextures(currentMapFile.buildings[currentMapFile.buildings.Count - 1].NSBMDFile, romInfo.buildingTexturesDirPath, buildTextureComboBox.SelectedIndex - 1); /* Add new entry to buildings ListBox */ - buildingsListBox.Items.Add("Building " + (buildingsListBox.Items.Count + 1)); + buildingsListBox.Items.Add((buildingsListBox.Items.Count + 1).ToString("D2") + nameSeparator + + buildIndexComboBox.Items[(int)currentMapFile.buildings[currentMapFile.buildings.Count-1].modelID]); buildingsListBox.SelectedIndex = buildingsListBox.Items.Count - 1; /* Redraw scene with new building */ @@ -2851,7 +2846,12 @@ namespace DSPRE { } private void buildIndexComboBox_SelectedIndexChanged(object sender, EventArgs e) { - if (disableHandlers) return; + if (disableHandlers || buildingsListBox.SelectedIndex < 0) + return; + + disableHandlers = true; + buildingsListBox.Items[buildingsListBox.SelectedIndex] = (buildingsListBox.SelectedIndex + 1).ToString("D2") + nameSeparator + buildIndexComboBox.SelectedItem; + disableHandlers = false; currentMapFile.buildings[buildingsListBox.SelectedIndex].modelID = (uint)buildIndexComboBox.SelectedIndex; currentMapFile.buildings[buildingsListBox.SelectedIndex] = LoadBuildingModel(currentMapFile.buildings[buildingsListBox.SelectedIndex], interiorbldRadioButton.Checked); @@ -2932,10 +2932,27 @@ namespace DSPRE { private void interiorRadioButton_CheckedChanged(object sender, EventArgs e) { disableHandlers = true; int index = buildIndexComboBox.SelectedIndex; - buildIndexComboBox.Items.Clear(); - buildIndexComboBox.Items.AddRange(GetBuildingsList(interiorbldRadioButton.Checked)); - buildIndexComboBox.SelectedIndex = index; + + /* Fill building models list */ + updateBuildingListComboBox(interiorbldRadioButton.Checked); + FillBuildingsBox(); + + try { + buildIndexComboBox.SelectedIndex = index; + } catch (ArgumentOutOfRangeException) { + string bldType; + if (interiorbldRadioButton.Checked) + bldType = "interior"; + else + bldType = "exterior"; + + MessageBox.Show("Couldn't find " + bldType + " building #" + index + '.' + + "\nBuilding 0 will be loaded in its place.", "Building not found", MessageBoxButtons.OK, MessageBoxIcon.Error); + + buildIndexComboBox.SelectedIndex = 0; + currentMapFile.buildings[buildIndexComboBox.SelectedIndex].modelID = 0; + } /* Load buildings nsbmd and textures for renderer into MapFile's building objects */ for (int i = 0; i < currentMapFile.buildings.Count; i++) { diff --git a/DS_Map/Main Window.resx b/DS_Map/Main Window.resx index f49a3e4..f420653 100644 --- a/DS_Map/Main Window.resx +++ b/DS_Map/Main Window.resx @@ -117,97 +117,6 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 533, 20 - - - - - iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vwAADr8BOAVTJAAAAWdJREFUWEftlj1Ow0AQRi16I4gShFLRmAJX7lOlobDEDUwFEg0XCH+X4AC0nCAN - fa7iM9AM+8UeaeKM12t77QJ5pFckOzvfy9qKHbSpMAw3dZQt7ctsbqTs28xn52Sjug8QUS08+OBL81n9 - hddXZ/T0eE8/228VrKFH2yvnS44E0Ly+OSENDNeCJejR9gLOkBwIcPjLw4p+d89HYLhNgte1vZipSagC - 2gCAIRxSR5086C0AbBK2cIDZRWJRnQQAgjS0Xok3ga4MIvD1eusETmh5uTAxxbVHJuglgMFpmjYymy/w - 3+BXgMOzLKM8z61EUURv7x97CSNzxxKgt4AWWAUCKE1iVAEUS5gaTyCO470Eg3tiVIEq5Yn4F0iSREX2 - gMEEXJkE/q+AdgMC2QOmSzAJNAq4vF4NchMCCLiwvDj1ewISXrRh+j4xyOWFRIJ+LwIAj1UMa4v6OO4i - 0LZfQxVwwUcVAkHwB88gY6VhELoRAAAAAElFTkSuQmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vwAADr8BOAVTJAAAAZVJREFUWEftlj9qhEAUh/cCNptsWEJIEZAsmEKL9Om9UBCyaXKEvYY3sN02eIIU - IYXY5Agv/oYZGWffjOO/hcAK36j45r3P4YmzCoJgEkTUgYtxIQYjQTYEfa5O88wLMWiTsrvtDQ1hc7Wm - Zl4zfZyEGGSwKJ7nOdV17c3T7oHe9u+shCriQgwyOEMyJP2tjuJMX/vOPQfm4OAkVBEXYpDBrQCg71ei - zxdx1guaKAEcYyTEIANbAby5KK6QK8HxHO+EhAI9oQtw9AoA+vnwWgGT2+2mSccXVvQK+PZAURQnIEeT - 66Awi8tabgEfUCxN0xPiOKYwDFvW1xvrZwpGCajiZVlSVVVOIIE4m4RVIEkSK9HjvRDgCpooAZvEpBXg - CproApzE4gJRFLX9ANATZxUwgcQiAlyvAD0GeAtwyRRDmtBksRXw5SLwf5rQxVlWgHsbxeUrWFTAZ1e8 - SBMC7Ocg4cOsK6CjP7TRxB2w8+EK9DGbABLh/84VsYH4WQQA/utINhR2PzAUTNSvp9BJPAYuqT+0+gPu - VRmTF6ps3wAAAABJRU5ErkJggg== - - - - 533, 20 - - - - iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vwAADr8BOAVTJAAAAWdJREFUWEftlj1Ow0AQRi16I4gShFLRmAJX7lOlobDEDUwFEg0XCH+X4AC0nCAN - fa7iM9AM+8UeaeKM12t77QJ5pFckOzvfy9qKHbSpMAw3dZQt7ctsbqTs28xn52Sjug8QUS08+OBL81n9 - hddXZ/T0eE8/228VrKFH2yvnS44E0Ly+OSENDNeCJejR9gLOkBwIcPjLw4p+d89HYLhNgte1vZipSagC - 2gCAIRxSR5086C0AbBK2cIDZRWJRnQQAgjS0Xok3ga4MIvD1eusETmh5uTAxxbVHJuglgMFpmjYymy/w - 3+BXgMOzLKM8z61EUURv7x97CSNzxxKgt4AWWAUCKE1iVAEUS5gaTyCO470Eg3tiVIEq5Yn4F0iSREX2 - gMEEXJkE/q+AdgMC2QOmSzAJNAq4vF4NchMCCLiwvDj1ewISXrRh+j4xyOWFRIJ+LwIAj1UMa4v6OO4i - 0LZfQxVwwUcVAkHwB88gY6VhELoRAAAAAElFTkSuQmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vwAADr8BOAVTJAAAAZVJREFUWEftlj9qhEAUh/cCNptsWEJIEZAsmEKL9Om9UBCyaXKEvYY3sN02eIIU - IYXY5Agv/oYZGWffjOO/hcAK36j45r3P4YmzCoJgEkTUgYtxIQYjQTYEfa5O88wLMWiTsrvtDQ1hc7Wm - Zl4zfZyEGGSwKJ7nOdV17c3T7oHe9u+shCriQgwyOEMyJP2tjuJMX/vOPQfm4OAkVBEXYpDBrQCg71ei - zxdx1guaKAEcYyTEIANbAby5KK6QK8HxHO+EhAI9oQtw9AoA+vnwWgGT2+2mSccXVvQK+PZAURQnIEeT - 66Awi8tabgEfUCxN0xPiOKYwDFvW1xvrZwpGCajiZVlSVVVOIIE4m4RVIEkSK9HjvRDgCpooAZvEpBXg - CproApzE4gJRFLX9ANATZxUwgcQiAlyvAD0GeAtwyRRDmtBksRXw5SLwf5rQxVlWgHsbxeUrWFTAZ1e8 - SBMC7Ocg4cOsK6CjP7TRxB2w8+EK9DGbABLh/84VsYH4WQQA/utINhR2PzAUTNSvp9BJPAYuqT+0+gPu - VRmTF6ps3wAAAABJRU5ErkJggg== - - - - - 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 - - 239, 17 @@ -216,7 +125,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACA - DwAAAk1TRnQBSQFMAgEBBwEAAQQBBwEEAQcBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + DwAAAk1TRnQBSQFMAgEBBwEAASwBBwEsAQcBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA @@ -283,6 +192,72 @@ AQUBgAEBAa8BywEAAQEBQAEFAYABAQGgAQsBAAH9AUABBQGAAQEBoAF7ARgBxQFAAQUBwAEDAaABiwEk Ae0BQAEFAcABAwGgAbMBJAHNAUABBQHgAQcBoAGnARgB7QFAAQUB8AEPAb8BzwEAAf0BfwH9AfwBPwGA AR8BAAEBAQABAQL/Cw== + + + + + + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + vwAADr8BOAVTJAAAAWdJREFUWEftlj1Ow0AQRi16I4gShFLRmAJX7lOlobDEDUwFEg0XCH+X4AC0nCAN + fa7iM9AM+8UeaeKM12t77QJ5pFckOzvfy9qKHbSpMAw3dZQt7ctsbqTs28xn52Sjug8QUS08+OBL81n9 + hddXZ/T0eE8/228VrKFH2yvnS44E0Ly+OSENDNeCJejR9gLOkBwIcPjLw4p+d89HYLhNgte1vZipSagC + 2gCAIRxSR5086C0AbBK2cIDZRWJRnQQAgjS0Xok3ga4MIvD1eusETmh5uTAxxbVHJuglgMFpmjYymy/w + 3+BXgMOzLKM8z61EUURv7x97CSNzxxKgt4AWWAUCKE1iVAEUS5gaTyCO470Eg3tiVIEq5Yn4F0iSREX2 + gMEEXJkE/q+AdgMC2QOmSzAJNAq4vF4NchMCCLiwvDj1ewISXrRh+j4xyOWFRIJ+LwIAj1UMa4v6OO4i + 0LZfQxVwwUcVAkHwB88gY6VhELoRAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + vwAADr8BOAVTJAAAAZVJREFUWEftlj9qhEAUh/cCNptsWEJIEZAsmEKL9Om9UBCyaXKEvYY3sN02eIIU + IYXY5Agv/oYZGWffjOO/hcAK36j45r3P4YmzCoJgEkTUgYtxIQYjQTYEfa5O88wLMWiTsrvtDQ1hc7Wm + Zl4zfZyEGGSwKJ7nOdV17c3T7oHe9u+shCriQgwyOEMyJP2tjuJMX/vOPQfm4OAkVBEXYpDBrQCg71ei + zxdx1guaKAEcYyTEIANbAby5KK6QK8HxHO+EhAI9oQtw9AoA+vnwWgGT2+2mSccXVvQK+PZAURQnIEeT + 66Awi8tabgEfUCxN0xPiOKYwDFvW1xvrZwpGCajiZVlSVVVOIIE4m4RVIEkSK9HjvRDgCpooAZvEpBXg + CproApzE4gJRFLX9ANATZxUwgcQiAlyvAD0GeAtwyRRDmtBksRXw5SLwf5rQxVlWgHsbxeUrWFTAZ1e8 + SBMC7Ocg4cOsK6CjP7TRxB2w8+EK9DGbABLh/84VsYH4WQQA/utINhR2PzAUTNSvp9BJPAYuqT+0+gPu + VRmTF6ps3wAAAABJRU5ErkJggg== + + + + 533, 20 + + + + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + vwAADr8BOAVTJAAAAWdJREFUWEftlj1Ow0AQRi16I4gShFLRmAJX7lOlobDEDUwFEg0XCH+X4AC0nCAN + fa7iM9AM+8UeaeKM12t77QJ5pFckOzvfy9qKHbSpMAw3dZQt7ctsbqTs28xn52Sjug8QUS08+OBL81n9 + hddXZ/T0eE8/228VrKFH2yvnS44E0Ly+OSENDNeCJejR9gLOkBwIcPjLw4p+d89HYLhNgte1vZipSagC + 2gCAIRxSR5086C0AbBK2cIDZRWJRnQQAgjS0Xok3ga4MIvD1eusETmh5uTAxxbVHJuglgMFpmjYymy/w + 3+BXgMOzLKM8z61EUURv7x97CSNzxxKgt4AWWAUCKE1iVAEUS5gaTyCO470Eg3tiVIEq5Yn4F0iSREX2 + gMEEXJkE/q+AdgMC2QOmSzAJNAq4vF4NchMCCLiwvDj1ewISXrRh+j4xyOWFRIJ+LwIAj1UMa4v6OO4i + 0LZfQxVwwUcVAkHwB88gY6VhELoRAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + vwAADr8BOAVTJAAAAZVJREFUWEftlj9qhEAUh/cCNptsWEJIEZAsmEKL9Om9UBCyaXKEvYY3sN02eIIU + IYXY5Agv/oYZGWffjOO/hcAK36j45r3P4YmzCoJgEkTUgYtxIQYjQTYEfa5O88wLMWiTsrvtDQ1hc7Wm + Zl4zfZyEGGSwKJ7nOdV17c3T7oHe9u+shCriQgwyOEMyJP2tjuJMX/vOPQfm4OAkVBEXYpDBrQCg71ei + zxdx1guaKAEcYyTEIANbAby5KK6QK8HxHO+EhAI9oQtw9AoA+vnwWgGT2+2mSccXVvQK+PZAURQnIEeT + 66Awi8tabgEfUCxN0xPiOKYwDFvW1xvrZwpGCajiZVlSVVVOIIE4m4RVIEkSK9HjvRDgCpooAZvEpBXg + CproApzE4gJRFLX9ANATZxUwgcQiAlyvAD0GeAtwyRRDmtBksRXw5SLwf5rQxVlWgHsbxeUrWFTAZ1e8 + SBMC7Ocg4cOsK6CjP7TRxB2w8+EK9DGbABLh/84VsYH4WQQA/utINhR2PzAUTNSvp9BJPAYuqT+0+gPu + VRmTF6ps3wAAAABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + vwAADr8BOAVTJAAAAWdJREFUWEftlj1Ow0AQRi16I4gShFLRmAJX7lOlobDEDUwFEg0XCH+X4AC0nCAN + fa7iM9AM+8UeaeKM12t77QJ5pFckOzvfy9qKHbSpMAw3dZQt7ctsbqTs28xn52Sjug8QUS08+OBL81n9 + hddXZ/T0eE8/228VrKFH2yvnS44E0Ly+OSENDNeCJejR9gLOkBwIcPjLw4p+d89HYLhNgte1vZipSagC + 2gCAIRxSR5086C0AbBK2cIDZRWJRnQQAgjS0Xok3ga4MIvD1eusETmh5uTAxxbVHJuglgMFpmjYymy/w + 3+BXgMOzLKM8z61EUURv7x97CSNzxxKgt4AWWAUCKE1iVAEUS5gaTyCO470Eg3tiVIEq5Yn4F0iSREX2 + gMEEXJkE/q+AdgMC2QOmSzAJNAq4vF4NchMCCLiwvDj1ewISXrRh+j4xyOWFRIJ+LwIAj1UMa4v6OO4i + 0LZfQxVwwUcVAkHwB88gY6VhELoRAAAAAElFTkSuQmCC @@ -335,16 +310,17 @@ VRmTF6ps3wAAAABJRU5ErkJggg== - + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vwAADr8BOAVTJAAAAWdJREFUWEftlj1Ow0AQRi16I4gShFLRmAJX7lOlobDEDUwFEg0XCH+X4AC0nCAN - fa7iM9AM+8UeaeKM12t77QJ5pFckOzvfy9qKHbSpMAw3dZQt7ctsbqTs28xn52Sjug8QUS08+OBL81n9 - hddXZ/T0eE8/228VrKFH2yvnS44E0Ly+OSENDNeCJejR9gLOkBwIcPjLw4p+d89HYLhNgte1vZipSagC - 2gCAIRxSR5086C0AbBK2cIDZRWJRnQQAgjS0Xok3ga4MIvD1eusETmh5uTAxxbVHJuglgMFpmjYymy/w - 3+BXgMOzLKM8z61EUURv7x97CSNzxxKgt4AWWAUCKE1iVAEUS5gaTyCO470Eg3tiVIEq5Yn4F0iSREX2 - gMEEXJkE/q+AdgMC2QOmSzAJNAq4vF4NchMCCLiwvDj1ewISXrRh+j4xyOWFRIJ+LwIAj1UMa4v6OO4i - 0LZfQxVwwUcVAkHwB88gY6VhELoRAAAAAElFTkSuQmCC + vwAADr8BOAVTJAAAAZVJREFUWEftlj9qhEAUh/cCNptsWEJIEZAsmEKL9Om9UBCyaXKEvYY3sN02eIIU + IYXY5Agv/oYZGWffjOO/hcAK36j45r3P4YmzCoJgEkTUgYtxIQYjQTYEfa5O88wLMWiTsrvtDQ1hc7Wm + Zl4zfZyEGGSwKJ7nOdV17c3T7oHe9u+shCriQgwyOEMyJP2tjuJMX/vOPQfm4OAkVBEXYpDBrQCg71ei + zxdx1guaKAEcYyTEIANbAby5KK6QK8HxHO+EhAI9oQtw9AoA+vnwWgGT2+2mSccXVvQK+PZAURQnIEeT + 66Awi8tabgEfUCxN0xPiOKYwDFvW1xvrZwpGCajiZVlSVVVOIIE4m4RVIEkSK9HjvRDgCpooAZvEpBXg + CproApzE4gJRFLX9ANATZxUwgcQiAlyvAD0GeAtwyRRDmtBksRXw5SLwf5rQxVlWgHsbxeUrWFTAZ1e8 + SBMC7Ocg4cOsK6CjP7TRxB2w8+EK9DGbABLh/84VsYH4WQQA/utINhR2PzAUTNSvp9BJPAYuqT+0+gPu + VRmTF6ps3wAAAABJRU5ErkJggg== @@ -357,19 +333,6 @@ 3+BXgMOzLKM8z61EUURv7x97CSNzxxKgt4AWWAUCKE1iVAEUS5gaTyCO470Eg3tiVIEq5Yn4F0iSREX2 gMEEXJkE/q+AdgMC2QOmSzAJNAq4vF4NchMCCLiwvDj1ewISXrRh+j4xyOWFRIJ+LwIAj1UMa4v6OO4i 0LZfQxVwwUcVAkHwB88gY6VhELoRAAAAAElFTkSuQmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vwAADr8BOAVTJAAAAZVJREFUWEftlj9qhEAUh/cCNptsWEJIEZAsmEKL9Om9UBCyaXKEvYY3sN02eIIU - IYXY5Agv/oYZGWffjOO/hcAK36j45r3P4YmzCoJgEkTUgYtxIQYjQTYEfa5O88wLMWiTsrvtDQ1hc7Wm - Zl4zfZyEGGSwKJ7nOdV17c3T7oHe9u+shCriQgwyOEMyJP2tjuJMX/vOPQfm4OAkVBEXYpDBrQCg71ei - zxdx1guaKAEcYyTEIANbAby5KK6QK8HxHO+EhAI9oQtw9AoA+vnwWgGT2+2mSccXVvQK+PZAURQnIEeT - 66Awi8tabgEfUCxN0xPiOKYwDFvW1xvrZwpGCajiZVlSVVVOIIE4m4RVIEkSK9HjvRDgCpooAZvEpBXg - CproApzE4gJRFLX9ANATZxUwgcQiAlyvAD0GeAtwyRRDmtBksRXw5SLwf5rQxVlWgHsbxeUrWFTAZ1e8 - SBMC7Ocg4cOsK6CjP7TRxB2w8+EK9DGbABLh/84VsYH4WQQA/utINhR2PzAUTNSvp9BJPAYuqT+0+gPu - VRmTF6ps3wAAAABJRU5ErkJggg== @@ -608,6 +571,40 @@ CproApzE4gJRFLX9ANATZxUwgcQiAlyvAD0GeAtwyRRDmtBksRXw5SLwf5rQxVlWgHsbxeUrWFTAZ1e8 SBMC7Ocg4cOsK6CjP7TRxB2w8+EK9DGbABLh/84VsYH4WQQA/utINhR2PzAUTNSvp9BJPAYuqT+0+gPu VRmTF6ps3wAAAABJRU5ErkJggg== + + + + + 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 @@ -1173,59 +1170,59 @@ with 'Pokemon DS Map Studio' by Trifindo. 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 @@ -1234,20 +1231,20 @@ with 'Pokemon DS Map Studio' by Trifindo. iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAL2SURBVFhH7ZfvT1JRGMf5i1yr9/qm1Ztet2ZtkfSmN2wy - U2EUy5YvrIlUotTb0rYCFmg2K9ZqpSmVblrBKn6oS1cDIxjx69zOc7iP3ns5nIukbW4922dw4dzz/dzn - 3HtQw36vNvl17yv5oKc1MmYj8iGWRClX3xoMXwL28lrAXpQPd6fWJy+GouM2kvTbJCAyZkUJeAUB4BmE - 4xg2zmupwKCmK+q3VJQTIgmfFUNVmFpbasYCIL/xyNFLx+jXjwW3Ga6QNxGS8FsZq0H7Vjh+BnK8cwAQ - +Uq7xIK0FfNeyCrbrAdIxnzdJXoqCJCdnAtEvJ3by5MKXWnjDeIBQfHpvkpiwkG+P+/f6kBlYUTKzQ4R - 2oFiozIRX4MSMGHUZ6nEgw6y8fSyhGgFkOzMINmY7svBE8ObD1CFY2klYILVifOFWEAdrCeA5GadJD03 - UNZ2hBuOBRLVNl9ibeYFI3oCSnIzTrJyz/ZbGA61LVBdZ14wshOBLAiMW6mAYG/gLcHaZHch/hdLsPly - oOam5Eo0chNqO7JOSb8elMqa4MyrQZII2jOi/UQlIQrXAl1JPHGU8YnYpALKK054e+kVizcyRCXR1EZ0 - v6v0LdRP0vPXS42GIhGflb8jwlbMO6EeP+dvkKRg+1VBx31+2CV+CqDyC6MSINrXgfziqJQJ3yQfPGfY - 5LwxDAi+Y5ZgnBwhrvyih04uQ0V4k0I4fI8CXAl6vDxa/Q6RI8SlEkCoSOrFVVU4oBQAmAQLNqqCETlC - XKpgHbQCesgR4uIF1eO/gEqA3nCfbnVILYfb2XtlMCJHiIsXVA8UmHKapINH2hlLI0bGseOnpENHqcy/ - EAhc65CWaSh04ADtAAS7ek7WdEKO0K/M++F8+o2L8EKVKAWwA+wR1ASH3Sf0d0BeFZc8namZoboiKPB4 - yMQ6oAx95zKSyO3T8Ifr7tTmnKdST0BJ2Gkkybvn9u5ftl8f3VlcHqXA22bb3GwVV6bM8GsYHT5bkD/a - j2Uw/AFY3Wu//MTZ7gAAAABJRU5ErkJggg== + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAL4SURBVFhH7ZfLTxNRFIf7FxGje9gY3bgzcYEmVnBjYous + oE21AVMTaANoDLS6wldiYttYRBS1IUWpj4UlmcqriWmBhPJqo5ja1x3vuZ0DM9PbO6WCCYkn+dJO5879 + fXNm5rY1HfVqUV4Pv1LPupqlUTtRNrFkSqny1mSaDzlKqyFHQdk8mFobvxGOP7CTVNAuA9KoDSXgFQSA + dxCOY9g4v6UMgxqueNBSVk+IJAM2DNXQ3txUNRYA+fRLZzcdY1ybsWErnCFvIiQZtDFWxhy74fgZyPGO + AUBkgXaJBekr4b++o26zESD5/WlnkR4KAmQ/xwKS/+re5dkOu1p4g3hA0NJkbzkRdJKNqVu7HSjHRuTs + tJvQDhTqlZECdUrAhPGApbwUcJL025syohdAMpE+kp7s/QVPDG8+QBOOpZeACVZeXMsv+rXBRgJIdrqf + rH92lfQd4YZjgUSlzT2szbxgxEhATTbST5Yf2n8Lw6H2BCrXmReM7EcgwwRsVECwNvAuwep4Z37pLy7B + RthVdVNyJeq5CfUdWaNkZgbkki54a6qPJMccP0TriUZCFK4HupJ44yzhE5GlAuozTvq76RmLFzJEI9HQ + QvSko5h63UPWv9wp1huKSAEbf0WEpZh3QC02ZwZISrD8aqDj5p53iJ8CqFzMKwOidR3IzXrlregg+ea7 + xCbnjWHQfYlHVhnGKRHiys366OQKVIQ3KYTDfhTgStDtuLeyD1EixKURQKjIdsStCQfUAgCTYMFmTTCi + RIhLE2yAXsAIJUJcvKBa/BfQCNAbbv5em9x0spW9VwcjSoS4eEG1QIGJwXb5+KlWhjRiZpw5d0E+cZrK + /AuBkKdNjtNQ6MAx2gEIvt11vqoTSoRxZb4O5dbfewgvVI1aADvAHkFdcHT4rPEKyKuC5OtMR9w1RVDg + 1VA764A69JPHTBbuX4QfrgdTGx985VoCaqL9ZpJ6fOXw/rL9nBvewcujFvjYaJsbrcLyhBW+DRfvXs4r + Hx3FMpn+AIjNZ5yLWjFjAAAAAElFTkSuQmCC diff --git a/DS_Map/Properties/AssemblyInfo.cs b/DS_Map/Properties/AssemblyInfo.cs index 18c66e1..1f30362 100644 --- a/DS_Map/Properties/AssemblyInfo.cs +++ b/DS_Map/Properties/AssemblyInfo.cs @@ -4,11 +4,11 @@ using System.Runtime.InteropServices; // Le informazioni generali relative a un assembly sono controllate dal seguente // set di attributi. Modificare i valori di questi attributi per modificare le informazioni // associate a un assembly. -[assembly: AssemblyTitle("DSPRE Reloaded 1.0.7a")] +[assembly: AssemblyTitle("DSPRE Reloaded 1.0.7b")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("DSPRE Reloaded 1.0.7a")] +[assembly: AssemblyProduct("DSPRE Reloaded 1.0.7b")] [assembly: AssemblyCopyright("Copyright © 2021")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/DS_Map/Properties/Resources.Designer.cs b/DS_Map/Properties/Resources.Designer.cs index 2691e37..ad1cac2 100644 --- a/DS_Map/Properties/Resources.Designer.cs +++ b/DS_Map/Properties/Resources.Designer.cs @@ -1497,6 +1497,16 @@ namespace DSPRE.Properties { } } + /// + /// Cerca una risorsa localizzata di tipo System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap unpackBuildingNarcsIcon { + get { + object obj = ResourceManager.GetObject("unpackBuildingNarcsIcon", 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 179d427..46ac335 100644 --- a/DS_Map/Properties/Resources.resx +++ b/DS_Map/Properties/Resources.resx @@ -559,4 +559,7 @@ ..\Resources\importArrow.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Graphics\Program Icons\unpackBuildingNarcsIcon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file