From 74a624fd6dbbb9fddb562cc0ff41edb0422ab641 Mon Sep 17 00:00:00 2001 From: AdAstra-LD Date: Sat, 13 Feb 2021 00:59:48 +0100 Subject: [PATCH] Fixed event editor overwrite bug - also Removed unused SPK - fixed some movement names (not sure whether there are version differences or not) - added a few DPPt commands and fixed some params --- DS_Map/Main Window.Designer.cs | 658 +++++++++++++++--------------- DS_Map/Main Window.cs | 258 +++++------- DS_Map/Main Window.resx | 2 +- DS_Map/Properties/AssemblyInfo.cs | 6 +- DS_Map/ROMFiles/EventFile.cs | 2 + DS_Map/ROMFiles/ScriptFile.cs | 10 +- DS_Map/Resources/PokeDatabase.cs | 153 +++---- DS_Map/SPK.Designer.cs | 202 --------- DS_Map/SPK.cs | 199 --------- DS_Map/SPK.resx | 582 -------------------------- 10 files changed, 536 insertions(+), 1536 deletions(-) delete mode 100644 DS_Map/SPK.Designer.cs delete mode 100644 DS_Map/SPK.cs delete mode 100644 DS_Map/SPK.resx diff --git a/DS_Map/Main Window.Designer.cs b/DS_Map/Main Window.Designer.cs index 404c7f2..4432872 100644 --- a/DS_Map/Main Window.Designer.cs +++ b/DS_Map/Main Window.Designer.cs @@ -176,11 +176,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(); @@ -358,6 +355,10 @@ this.spawnableScriptUpDown = new System.Windows.Forms.NumericUpDown(); this.spawnablesListBox = new System.Windows.Forms.ListBox(); this.overworldsTabPage = new System.Windows.Forms.TabPage(); + this.groupBox22 = new System.Windows.Forms.GroupBox(); + this.normalRadioButton = new System.Windows.Forms.RadioButton(); + this.isTrainerRadioButton = new System.Windows.Forms.RadioButton(); + this.isItemRadioButton = new System.Windows.Forms.RadioButton(); this.spriteIDlabel = new System.Windows.Forms.Label(); this.duplicateOverworldsButton = new System.Windows.Forms.Button(); this.groupBox17 = new System.Windows.Forms.GroupBox(); @@ -366,17 +367,16 @@ this.label12 = new System.Windows.Forms.Label(); this.owXMatrixUpDown = new System.Windows.Forms.NumericUpDown(); this.label11 = new System.Windows.Forms.Label(); - this.isItemRadioButton = new System.Windows.Forms.RadioButton(); this.owSpritePictureBox = new System.Windows.Forms.PictureBox(); this.owMovementGroupBox = new System.Windows.Forms.GroupBox(); + this.groupBox23 = new System.Windows.Forms.GroupBox(); + this.label39 = new System.Windows.Forms.Label(); + this.label20 = new System.Windows.Forms.Label(); + this.owXRangeUpDown = new System.Windows.Forms.NumericUpDown(); + this.owYRangeUpDown = new System.Windows.Forms.NumericUpDown(); this.label4 = new System.Windows.Forms.Label(); this.owOrientationComboBox = new System.Windows.Forms.ComboBox(); - this.yMovRangeLabel = new System.Windows.Forms.Label(); - this.xMovRangeLabel = new System.Windows.Forms.Label(); - this.owYRangeUpDown = new System.Windows.Forms.NumericUpDown(); - this.owXRangeUpDown = new System.Windows.Forms.NumericUpDown(); this.owMovementComboBox = new System.Windows.Forms.ComboBox(); - this.isTrainerLabel = new System.Windows.Forms.Label(); this.positionGroupBox = new System.Windows.Forms.GroupBox(); this.label13 = new System.Windows.Forms.Label(); this.owXMapUpDown = new System.Windows.Forms.NumericUpDown(); @@ -384,8 +384,6 @@ this.owXPositionLabel = new System.Windows.Forms.Label(); this.owYMapUpDown = new System.Windows.Forms.NumericUpDown(); this.label10 = new System.Windows.Forms.Label(); - this.isTrainerRadioButton = new System.Windows.Forms.RadioButton(); - this.normalRadioButton = new System.Windows.Forms.RadioButton(); this.owSpecialGroupBox = new System.Windows.Forms.GroupBox(); this.owPartnerTrainerCheckBox = new System.Windows.Forms.CheckBox(); this.owItemComboBox = new System.Windows.Forms.ComboBox(); @@ -613,6 +611,9 @@ this.spawnEditorToolStripButton = new System.Windows.Forms.ToolStripButton(); this.versionLabel = new System.Windows.Forms.Label(); this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); + this.headersGridView = new DSPRE.DataGridViewDoubleBuffered(); + this.heightsGridView = new DSPRE.DataGridViewDoubleBuffered(); + this.mapFilesGridView = new DSPRE.DataGridViewDoubleBuffered(); this.mainTabControl.SuspendLayout(); this.headerEditorTabPage.SuspendLayout(); this.worldmapCoordsGroupBox.SuspendLayout(); @@ -643,11 +644,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(); @@ -706,13 +704,15 @@ ((System.ComponentModel.ISupportInitialize)(this.spawnableMapYUpDown)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.spawnableScriptUpDown)).BeginInit(); this.overworldsTabPage.SuspendLayout(); + this.groupBox22.SuspendLayout(); this.groupBox17.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.owYMatrixUpDown)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.owXMatrixUpDown)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.owSpritePictureBox)).BeginInit(); this.owMovementGroupBox.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.owYRangeUpDown)).BeginInit(); + this.groupBox23.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.owXRangeUpDown)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.owYRangeUpDown)).BeginInit(); this.positionGroupBox.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.owXMapUpDown)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.owZPositionUpDown)).BeginInit(); @@ -769,6 +769,9 @@ this.menuStrip1.SuspendLayout(); this.statusStrip1.SuspendLayout(); this.mainToolStrip.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.headersGridView)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.heightsGridView)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.mapFilesGridView)).BeginInit(); this.SuspendLayout(); // // mainTabControl @@ -2318,63 +2321,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; - dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.headersGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; - this.headersGridView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.headersGridView.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; - dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle2.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); - dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.headersGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2; - this.headersGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle3.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - dataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle3.Format = "D4"; - dataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.headersGridView.DefaultCellStyle = dataGridViewCellStyle3; - this.headersGridView.Location = new System.Drawing.Point(0, 0); - this.headersGridView.MultiSelect = false; - this.headersGridView.Name = "headersGridView"; - dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle4.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); - dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.headersGridView.RowHeadersDefaultCellStyle = dataGridViewCellStyle4; - this.headersGridView.RowHeadersWidth = 50; - this.headersGridView.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing; - dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle5.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.headersGridView.RowsDefaultCellStyle = dataGridViewCellStyle5; - this.headersGridView.RowTemplate.DefaultCellStyle.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.headersGridView.RowTemplate.Height = 18; - this.headersGridView.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.False; - this.headersGridView.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect; - this.headersGridView.ShowCellErrors = false; - this.headersGridView.Size = new System.Drawing.Size(1032, 597); - this.headersGridView.TabIndex = 1; - this.headersGridView.CellFormatting += new System.Windows.Forms.DataGridViewCellFormattingEventHandler(this.headersGridView_CellFormatting); - this.headersGridView.CellMouseDoubleClick += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.headersGridView_CellMouseDoubleClick); - this.headersGridView.CellValueChanged += new System.Windows.Forms.DataGridViewCellEventHandler(this.headersGridView_CellValueChanged); - // // heightsTabPage // this.heightsTabPage.Controls.Add(this.heightsGridView); @@ -2385,61 +2331,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; - dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.heightsGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle6; - this.heightsGridView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.heightsGridView.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; - dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle7.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle7.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); - dataGridViewCellStyle7.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle7.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.heightsGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle7; - this.heightsGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle8.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle8.Font = new System.Drawing.Font("Tahoma", 8.25F); - dataGridViewCellStyle8.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle8.Format = "D2"; - dataGridViewCellStyle8.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle8.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.heightsGridView.DefaultCellStyle = dataGridViewCellStyle8; - this.heightsGridView.Location = new System.Drawing.Point(0, 0); - this.heightsGridView.MultiSelect = false; - this.heightsGridView.Name = "heightsGridView"; - dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle9.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle9.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); - dataGridViewCellStyle9.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle9.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle9.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.heightsGridView.RowHeadersDefaultCellStyle = dataGridViewCellStyle9; - this.heightsGridView.RowHeadersWidth = 50; - this.heightsGridView.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing; - dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle10.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.heightsGridView.RowsDefaultCellStyle = dataGridViewCellStyle10; - this.heightsGridView.RowTemplate.DefaultCellStyle.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.heightsGridView.RowTemplate.Height = 18; - this.heightsGridView.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.False; - this.heightsGridView.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect; - this.heightsGridView.Size = new System.Drawing.Size(1032, 576); - this.heightsGridView.TabIndex = 2; - this.heightsGridView.CellFormatting += new System.Windows.Forms.DataGridViewCellFormattingEventHandler(this.heightsGridView_CellFormatting); - this.heightsGridView.CellValueChanged += new System.Windows.Forms.DataGridViewCellEventHandler(this.heightsGridView_CellValueChanged); - // // mapFilesTabPage // this.mapFilesTabPage.Controls.Add(this.mapFilesGridView); @@ -2450,62 +2341,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; - dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.mapFilesGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle11; - this.mapFilesGridView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.mapFilesGridView.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; - dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle12.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle12.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); - dataGridViewCellStyle12.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle12.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle12.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.mapFilesGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle12; - this.mapFilesGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle13.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle13.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - dataGridViewCellStyle13.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle13.Format = "D4"; - dataGridViewCellStyle13.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle13.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.mapFilesGridView.DefaultCellStyle = dataGridViewCellStyle13; - this.mapFilesGridView.Location = new System.Drawing.Point(0, 0); - this.mapFilesGridView.MultiSelect = false; - this.mapFilesGridView.Name = "mapFilesGridView"; - dataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle14.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle14.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); - dataGridViewCellStyle14.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle14.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle14.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle14.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.mapFilesGridView.RowHeadersDefaultCellStyle = dataGridViewCellStyle14; - this.mapFilesGridView.RowHeadersWidth = 50; - this.mapFilesGridView.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing; - dataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle15.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.mapFilesGridView.RowsDefaultCellStyle = dataGridViewCellStyle15; - this.mapFilesGridView.RowTemplate.DefaultCellStyle.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.mapFilesGridView.RowTemplate.Height = 18; - this.mapFilesGridView.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.False; - this.mapFilesGridView.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect; - this.mapFilesGridView.Size = new System.Drawing.Size(1032, 576); - this.mapFilesGridView.TabIndex = 2; - this.mapFilesGridView.CellContentDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.mapFilesGridView_CellMouseDoubleClick); - this.mapFilesGridView.CellFormatting += new System.Windows.Forms.DataGridViewCellFormattingEventHandler(this.mapFilesGridView_CellFormatting); - this.mapFilesGridView.CellValueChanged += new System.Windows.Forms.DataGridViewCellEventHandler(this.mapFilesGridView_CellValueChanged); - // // matrixNameTextBox // this.matrixNameTextBox.Location = new System.Drawing.Point(13, 73); @@ -4739,16 +4574,13 @@ // // overworldsTabPage // + this.overworldsTabPage.Controls.Add(this.groupBox22); this.overworldsTabPage.Controls.Add(this.spriteIDlabel); this.overworldsTabPage.Controls.Add(this.duplicateOverworldsButton); this.overworldsTabPage.Controls.Add(this.groupBox17); - this.overworldsTabPage.Controls.Add(this.isItemRadioButton); this.overworldsTabPage.Controls.Add(this.owSpritePictureBox); this.overworldsTabPage.Controls.Add(this.owMovementGroupBox); - this.overworldsTabPage.Controls.Add(this.isTrainerLabel); this.overworldsTabPage.Controls.Add(this.positionGroupBox); - this.overworldsTabPage.Controls.Add(this.isTrainerRadioButton); - this.overworldsTabPage.Controls.Add(this.normalRadioButton); this.overworldsTabPage.Controls.Add(this.owSpecialGroupBox); this.overworldsTabPage.Controls.Add(this.owScriptLabel); this.overworldsTabPage.Controls.Add(this.owScriptNumericUpDown); @@ -4769,10 +4601,59 @@ this.overworldsTabPage.Text = "Overworlds"; this.overworldsTabPage.UseVisualStyleBackColor = true; // + // groupBox22 + // + this.groupBox22.Controls.Add(this.normalRadioButton); + this.groupBox22.Controls.Add(this.isTrainerRadioButton); + this.groupBox22.Controls.Add(this.isItemRadioButton); + this.groupBox22.Location = new System.Drawing.Point(197, 98); + this.groupBox22.Name = "groupBox22"; + this.groupBox22.Size = new System.Drawing.Size(162, 45); + this.groupBox22.TabIndex = 28; + this.groupBox22.TabStop = false; + this.groupBox22.Text = "Overworld Properties"; + // + // normalRadioButton + // + this.normalRadioButton.AutoSize = true; + this.normalRadioButton.Checked = true; + this.normalRadioButton.Cursor = System.Windows.Forms.Cursors.Default; + this.normalRadioButton.Location = new System.Drawing.Point(6, 18); + this.normalRadioButton.Name = "normalRadioButton"; + this.normalRadioButton.Size = new System.Drawing.Size(51, 17); + this.normalRadioButton.TabIndex = 15; + this.normalRadioButton.TabStop = true; + this.normalRadioButton.Text = "None"; + this.normalRadioButton.UseVisualStyleBackColor = true; + this.normalRadioButton.CheckedChanged += new System.EventHandler(this.OWTypeChanged); + // + // isTrainerRadioButton + // + this.isTrainerRadioButton.AutoSize = true; + this.isTrainerRadioButton.Location = new System.Drawing.Point(57, 18); + this.isTrainerRadioButton.Name = "isTrainerRadioButton"; + this.isTrainerRadioButton.Size = new System.Drawing.Size(58, 17); + this.isTrainerRadioButton.TabIndex = 16; + this.isTrainerRadioButton.Text = "Trainer"; + this.isTrainerRadioButton.UseVisualStyleBackColor = true; + this.isTrainerRadioButton.Click += new System.EventHandler(this.OWTypeChanged); + // + // isItemRadioButton + // + this.isItemRadioButton.AutoSize = true; + this.isItemRadioButton.Enabled = false; + this.isItemRadioButton.Location = new System.Drawing.Point(113, 18); + this.isItemRadioButton.Name = "isItemRadioButton"; + this.isItemRadioButton.Size = new System.Drawing.Size(45, 17); + this.isItemRadioButton.TabIndex = 21; + this.isItemRadioButton.Text = "Item"; + this.isItemRadioButton.UseVisualStyleBackColor = true; + this.isItemRadioButton.Click += new System.EventHandler(this.OWTypeChanged); + // // spriteIDlabel // this.spriteIDlabel.AutoSize = true; - this.spriteIDlabel.Location = new System.Drawing.Point(362, 122); + this.spriteIDlabel.Location = new System.Drawing.Point(359, 122); this.spriteIDlabel.Name = "spriteIDlabel"; this.spriteIDlabel.Size = new System.Drawing.Size(0, 13); this.spriteIDlabel.TabIndex = 27; @@ -4781,7 +4662,7 @@ // this.duplicateOverworldsButton.Image = global::DSPRE.Properties.Resources.copyIcon_small; this.duplicateOverworldsButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.duplicateOverworldsButton.Location = new System.Drawing.Point(119, 155); + this.duplicateOverworldsButton.Location = new System.Drawing.Point(116, 155); this.duplicateOverworldsButton.Name = "duplicateOverworldsButton"; this.duplicateOverworldsButton.Size = new System.Drawing.Size(72, 31); this.duplicateOverworldsButton.TabIndex = 26; @@ -4797,9 +4678,9 @@ this.groupBox17.Controls.Add(this.label12); this.groupBox17.Controls.Add(this.owXMatrixUpDown); this.groupBox17.Controls.Add(this.label11); - this.groupBox17.Location = new System.Drawing.Point(12, 252); + this.groupBox17.Location = new System.Drawing.Point(9, 256); this.groupBox17.Name = "groupBox17"; - this.groupBox17.Size = new System.Drawing.Size(179, 94); + this.groupBox17.Size = new System.Drawing.Size(179, 90); this.groupBox17.TabIndex = 20; this.groupBox17.TabStop = false; this.groupBox17.Text = "Global Coordinates [Matrix]"; @@ -4808,7 +4689,7 @@ // this.button14.Image = ((System.Drawing.Image)(resources.GetObject("button14.Image"))); this.button14.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.button14.Location = new System.Drawing.Point(20, 47); + this.button14.Location = new System.Drawing.Point(20, 44); this.button14.Name = "button14"; this.button14.Size = new System.Drawing.Size(140, 39); this.button14.TabIndex = 5; @@ -4819,7 +4700,7 @@ // // owYMatrixUpDown // - this.owYMatrixUpDown.Location = new System.Drawing.Point(117, 22); + this.owYMatrixUpDown.Location = new System.Drawing.Point(117, 19); this.owYMatrixUpDown.Maximum = new decimal(new int[] { 65535, 0, @@ -4833,7 +4714,7 @@ // label12 // this.label12.AutoSize = true; - this.label12.Location = new System.Drawing.Point(19, 25); + this.label12.Location = new System.Drawing.Point(19, 22); this.label12.Name = "label12"; this.label12.Size = new System.Drawing.Size(14, 13); this.label12.TabIndex = 5; @@ -4841,7 +4722,7 @@ // // owXMatrixUpDown // - this.owXMatrixUpDown.Location = new System.Drawing.Point(36, 22); + this.owXMatrixUpDown.Location = new System.Drawing.Point(36, 19); this.owXMatrixUpDown.Maximum = new decimal(new int[] { 65535, 0, @@ -4855,29 +4736,17 @@ // label11 // this.label11.AutoSize = true; - this.label11.Location = new System.Drawing.Point(99, 24); + this.label11.Location = new System.Drawing.Point(99, 21); this.label11.Name = "label11"; this.label11.Size = new System.Drawing.Size(14, 13); this.label11.TabIndex = 7; this.label11.Text = "Y"; // - // isItemRadioButton - // - this.isItemRadioButton.AutoSize = true; - this.isItemRadioButton.Enabled = false; - this.isItemRadioButton.Location = new System.Drawing.Point(314, 122); - this.isItemRadioButton.Name = "isItemRadioButton"; - this.isItemRadioButton.Size = new System.Drawing.Size(45, 17); - this.isItemRadioButton.TabIndex = 21; - this.isItemRadioButton.Text = "Item"; - this.isItemRadioButton.UseVisualStyleBackColor = true; - this.isItemRadioButton.CheckedChanged += new System.EventHandler(this.isItemRadioButton_CheckedChanged); - // // owSpritePictureBox // this.owSpritePictureBox.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; this.owSpritePictureBox.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.owSpritePictureBox.Location = new System.Drawing.Point(366, 52); + this.owSpritePictureBox.Location = new System.Drawing.Point(366, 49); this.owSpritePictureBox.Name = "owSpritePictureBox"; this.owSpritePictureBox.Size = new System.Drawing.Size(66, 66); this.owSpritePictureBox.TabIndex = 20; @@ -4885,28 +4754,82 @@ // // owMovementGroupBox // + this.owMovementGroupBox.Controls.Add(this.groupBox23); this.owMovementGroupBox.Controls.Add(this.label4); this.owMovementGroupBox.Controls.Add(this.owOrientationComboBox); - this.owMovementGroupBox.Controls.Add(this.yMovRangeLabel); - this.owMovementGroupBox.Controls.Add(this.xMovRangeLabel); - this.owMovementGroupBox.Controls.Add(this.owYRangeUpDown); - this.owMovementGroupBox.Controls.Add(this.owXRangeUpDown); this.owMovementGroupBox.Controls.Add(this.owMovementComboBox); - this.owMovementGroupBox.Location = new System.Drawing.Point(201, 253); + this.owMovementGroupBox.Location = new System.Drawing.Point(197, 256); this.owMovementGroupBox.Name = "owMovementGroupBox"; - this.owMovementGroupBox.Size = new System.Drawing.Size(232, 93); + this.owMovementGroupBox.Size = new System.Drawing.Size(232, 90); this.owMovementGroupBox.TabIndex = 18; this.owMovementGroupBox.TabStop = false; this.owMovementGroupBox.Text = "Movement"; // + // groupBox23 + // + this.groupBox23.Controls.Add(this.label39); + this.groupBox23.Controls.Add(this.label20); + this.groupBox23.Controls.Add(this.owXRangeUpDown); + this.groupBox23.Controls.Add(this.owYRangeUpDown); + this.groupBox23.Location = new System.Drawing.Point(99, 41); + this.groupBox23.Name = "groupBox23"; + this.groupBox23.Size = new System.Drawing.Size(123, 45); + this.groupBox23.TabIndex = 7; + this.groupBox23.TabStop = false; + this.groupBox23.Text = "Sight Range"; + // + // label39 + // + this.label39.AutoSize = true; + this.label39.Location = new System.Drawing.Point(63, 20); + this.label39.Name = "label39"; + this.label39.Size = new System.Drawing.Size(14, 13); + this.label39.TabIndex = 4; + this.label39.Text = "Y"; + // + // label20 + // + this.label20.AutoSize = true; + this.label20.Location = new System.Drawing.Point(4, 20); + this.label20.Name = "label20"; + this.label20.Size = new System.Drawing.Size(14, 13); + this.label20.TabIndex = 3; + this.label20.Text = "X"; + // + // owXRangeUpDown + // + this.owXRangeUpDown.Location = new System.Drawing.Point(18, 17); + this.owXRangeUpDown.Maximum = new decimal(new int[] { + 65535, + 0, + 0, + 0}); + this.owXRangeUpDown.Name = "owXRangeUpDown"; + this.owXRangeUpDown.Size = new System.Drawing.Size(38, 20); + this.owXRangeUpDown.TabIndex = 1; + this.owXRangeUpDown.ValueChanged += new System.EventHandler(this.owXRangeUpDown_ValueChanged); + // + // owYRangeUpDown + // + this.owYRangeUpDown.Location = new System.Drawing.Point(77, 17); + this.owYRangeUpDown.Maximum = new decimal(new int[] { + 65535, + 0, + 0, + 0}); + this.owYRangeUpDown.Name = "owYRangeUpDown"; + this.owYRangeUpDown.Size = new System.Drawing.Size(38, 20); + this.owYRangeUpDown.TabIndex = 2; + this.owYRangeUpDown.ValueChanged += new System.EventHandler(this.owYRangeUpDown_ValueChanged); + // // label4 // this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(8, 47); + this.label4.Location = new System.Drawing.Point(8, 46); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(95, 13); + this.label4.Size = new System.Drawing.Size(80, 13); this.label4.TabIndex = 6; - this.label4.Text = "Starting orientation"; + this.label4.Text = "First Orientation"; // // owOrientationComboBox // @@ -4917,75 +4840,22 @@ "Down", "Left", "Right"}); - this.owOrientationComboBox.Location = new System.Drawing.Point(15, 64); + this.owOrientationComboBox.Location = new System.Drawing.Point(11, 61); this.owOrientationComboBox.Name = "owOrientationComboBox"; this.owOrientationComboBox.Size = new System.Drawing.Size(82, 21); this.owOrientationComboBox.TabIndex = 5; this.owOrientationComboBox.SelectedIndexChanged += new System.EventHandler(this.owOrientationComboBox_SelectedIndexChanged); // - // yMovRangeLabel - // - this.yMovRangeLabel.AutoSize = true; - this.yMovRangeLabel.Location = new System.Drawing.Point(110, 70); - this.yMovRangeLabel.Name = "yMovRangeLabel"; - this.yMovRangeLabel.Size = new System.Drawing.Size(55, 13); - this.yMovRangeLabel.TabIndex = 4; - this.yMovRangeLabel.Text = "Range (Y)"; - // - // xMovRangeLabel - // - this.xMovRangeLabel.AutoSize = true; - this.xMovRangeLabel.Location = new System.Drawing.Point(110, 46); - this.xMovRangeLabel.Name = "xMovRangeLabel"; - this.xMovRangeLabel.Size = new System.Drawing.Size(55, 13); - this.xMovRangeLabel.TabIndex = 3; - this.xMovRangeLabel.Text = "Range (X)"; - // - // owYRangeUpDown - // - this.owYRangeUpDown.Location = new System.Drawing.Point(167, 68); - this.owYRangeUpDown.Maximum = new decimal(new int[] { - 65535, - 0, - 0, - 0}); - this.owYRangeUpDown.Name = "owYRangeUpDown"; - this.owYRangeUpDown.Size = new System.Drawing.Size(52, 20); - this.owYRangeUpDown.TabIndex = 2; - this.owYRangeUpDown.ValueChanged += new System.EventHandler(this.owYRangeUpDown_ValueChanged); - // - // owXRangeUpDown - // - this.owXRangeUpDown.Location = new System.Drawing.Point(167, 43); - this.owXRangeUpDown.Maximum = new decimal(new int[] { - 65535, - 0, - 0, - 0}); - this.owXRangeUpDown.Name = "owXRangeUpDown"; - this.owXRangeUpDown.Size = new System.Drawing.Size(52, 20); - this.owXRangeUpDown.TabIndex = 1; - this.owXRangeUpDown.ValueChanged += new System.EventHandler(this.owXRangeUpDown_ValueChanged); - // // owMovementComboBox // this.owMovementComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.owMovementComboBox.FormattingEnabled = true; - this.owMovementComboBox.Location = new System.Drawing.Point(15, 17); + this.owMovementComboBox.Location = new System.Drawing.Point(11, 16); this.owMovementComboBox.Name = "owMovementComboBox"; - this.owMovementComboBox.Size = new System.Drawing.Size(203, 21); + this.owMovementComboBox.Size = new System.Drawing.Size(211, 21); this.owMovementComboBox.TabIndex = 0; this.owMovementComboBox.SelectedIndexChanged += new System.EventHandler(this.owMovementComboBox_SelectedIndexChanged); // - // isTrainerLabel - // - this.isTrainerLabel.AutoSize = true; - this.isTrainerLabel.Location = new System.Drawing.Point(198, 106); - this.isTrainerLabel.Name = "isTrainerLabel"; - this.isTrainerLabel.Size = new System.Drawing.Size(82, 13); - this.isTrainerLabel.TabIndex = 17; - this.isTrainerLabel.Text = "Overworld Type"; - // // positionGroupBox // this.positionGroupBox.Controls.Add(this.label13); @@ -4994,7 +4864,7 @@ this.positionGroupBox.Controls.Add(this.owXPositionLabel); this.positionGroupBox.Controls.Add(this.owYMapUpDown); this.positionGroupBox.Controls.Add(this.label10); - this.positionGroupBox.Location = new System.Drawing.Point(11, 192); + this.positionGroupBox.Location = new System.Drawing.Point(8, 196); this.positionGroupBox.Name = "positionGroupBox"; this.positionGroupBox.Size = new System.Drawing.Size(180, 57); this.positionGroupBox.TabIndex = 19; @@ -5082,31 +4952,6 @@ this.label10.TabIndex = 3; this.label10.Text = "Y"; // - // isTrainerRadioButton - // - this.isTrainerRadioButton.AutoSize = true; - this.isTrainerRadioButton.Location = new System.Drawing.Point(258, 122); - this.isTrainerRadioButton.Name = "isTrainerRadioButton"; - this.isTrainerRadioButton.Size = new System.Drawing.Size(58, 17); - this.isTrainerRadioButton.TabIndex = 16; - this.isTrainerRadioButton.Text = "Trainer"; - this.isTrainerRadioButton.UseVisualStyleBackColor = true; - this.isTrainerRadioButton.CheckedChanged += new System.EventHandler(this.isTrainerRadioButton_CheckedChanged); - // - // normalRadioButton - // - this.normalRadioButton.AutoSize = true; - this.normalRadioButton.Checked = true; - this.normalRadioButton.Cursor = System.Windows.Forms.Cursors.Default; - this.normalRadioButton.Location = new System.Drawing.Point(200, 122); - this.normalRadioButton.Name = "normalRadioButton"; - this.normalRadioButton.Size = new System.Drawing.Size(58, 17); - this.normalRadioButton.TabIndex = 15; - this.normalRadioButton.TabStop = true; - this.normalRadioButton.Text = "Normal"; - this.normalRadioButton.UseVisualStyleBackColor = true; - this.normalRadioButton.CheckedChanged += new System.EventHandler(this.normalRadioButton_CheckedChanged); - // // owSpecialGroupBox // this.owSpecialGroupBox.Controls.Add(this.owPartnerTrainerCheckBox); @@ -5117,7 +4962,7 @@ this.owSpecialGroupBox.Controls.Add(this.owSightRangeUpDown); this.owSpecialGroupBox.Controls.Add(this.owTrainerLabel); this.owSpecialGroupBox.Enabled = false; - this.owSpecialGroupBox.Location = new System.Drawing.Point(201, 147); + this.owSpecialGroupBox.Location = new System.Drawing.Point(197, 150); this.owSpecialGroupBox.Name = "owSpecialGroupBox"; this.owSpecialGroupBox.Size = new System.Drawing.Size(232, 102); this.owSpecialGroupBox.TabIndex = 14; @@ -5140,9 +4985,9 @@ this.owItemComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.owItemComboBox.Enabled = false; this.owItemComboBox.FormattingEnabled = true; - this.owItemComboBox.Location = new System.Drawing.Point(57, 73); + this.owItemComboBox.Location = new System.Drawing.Point(57, 72); this.owItemComboBox.Name = "owItemComboBox"; - this.owItemComboBox.Size = new System.Drawing.Size(161, 21); + this.owItemComboBox.Size = new System.Drawing.Size(165, 21); this.owItemComboBox.TabIndex = 6; this.owItemComboBox.SelectedIndexChanged += new System.EventHandler(this.owItemComboBox_SelectedIndexChanged); // @@ -5163,7 +5008,7 @@ this.owTrainerComboBox.FormattingEnabled = true; this.owTrainerComboBox.Location = new System.Drawing.Point(57, 19); this.owTrainerComboBox.Name = "owTrainerComboBox"; - this.owTrainerComboBox.Size = new System.Drawing.Size(161, 21); + this.owTrainerComboBox.Size = new System.Drawing.Size(165, 21); this.owTrainerComboBox.TabIndex = 4; this.owTrainerComboBox.SelectedIndexChanged += new System.EventHandler(this.owTrainerComboBox_SelectedIndexChanged); // @@ -5258,7 +5103,7 @@ // this.owSpriteComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.owSpriteComboBox.FormattingEnabled = true; - this.owSpriteComboBox.Location = new System.Drawing.Point(201, 67); + this.owSpriteComboBox.Location = new System.Drawing.Point(198, 67); this.owSpriteComboBox.Name = "owSpriteComboBox"; this.owSpriteComboBox.Size = new System.Drawing.Size(155, 21); this.owSpriteComboBox.TabIndex = 8; @@ -5290,7 +5135,7 @@ // this.removeOverworldButton.Image = global::DSPRE.Properties.Resources.deleteIcon; this.removeOverworldButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.removeOverworldButton.Location = new System.Drawing.Point(59, 155); + this.removeOverworldButton.Location = new System.Drawing.Point(56, 155); this.removeOverworldButton.Name = "removeOverworldButton"; this.removeOverworldButton.Size = new System.Drawing.Size(60, 31); this.removeOverworldButton.TabIndex = 5; @@ -5303,7 +5148,7 @@ // this.addOverworldButton.Image = global::DSPRE.Properties.Resources.addIcon; this.addOverworldButton.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.addOverworldButton.Location = new System.Drawing.Point(11, 155); + this.addOverworldButton.Location = new System.Drawing.Point(8, 155); this.addOverworldButton.Name = "addOverworldButton"; this.addOverworldButton.Size = new System.Drawing.Size(48, 31); this.addOverworldButton.TabIndex = 4; @@ -5315,7 +5160,7 @@ // overworldsListBox // this.overworldsListBox.FormattingEnabled = true; - this.overworldsListBox.Location = new System.Drawing.Point(11, 6); + this.overworldsListBox.Location = new System.Drawing.Point(8, 6); this.overworldsListBox.Name = "overworldsListBox"; this.overworldsListBox.Size = new System.Drawing.Size(180, 147); this.overworldsListBox.TabIndex = 3; @@ -7607,10 +7452,10 @@ this.heartGoldAndSoulSilverToolStripMenuItem.Text = "HeartGold and SoulSilver"; this.heartGoldAndSoulSilverToolStripMenuItem.Click += new System.EventHandler(this.heartGoldAndSoulSilverToolStripMenuItem_Click); // - // spawnPointEditorToolStripMenuItem + // spawnEditorToolStripMenuItem // this.spawnEditorToolStripMenuItem.Enabled = false; - this.spawnEditorToolStripMenuItem.Name = "spawnPointEditorToolStripMenuItem"; + this.spawnEditorToolStripMenuItem.Name = "spawnEditorToolStripMenuItem"; this.spawnEditorToolStripMenuItem.Size = new System.Drawing.Size(220, 22); this.spawnEditorToolStripMenuItem.Text = "Spawn Point Editor"; this.spawnEditorToolStripMenuItem.Click += new System.EventHandler(this.spawnEditorToolStripMenuItem_Click); @@ -7805,7 +7650,7 @@ this.scriptCommandsButton.Text = "Script Commands Database"; this.scriptCommandsButton.Click += new System.EventHandler(this.scriptCommandsDatabaseToolStripButton_Click); // - // spawnPointEditorToolStripButton + // spawnEditorToolStripButton // this.spawnEditorToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; this.spawnEditorToolStripButton.Enabled = false; @@ -7813,7 +7658,7 @@ this.spawnEditorToolStripButton.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.spawnEditorToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta; this.spawnEditorToolStripButton.Margin = new System.Windows.Forms.Padding(4, 6, 0, 2); - this.spawnEditorToolStripButton.Name = "spawnPointEditorToolStripButton"; + this.spawnEditorToolStripButton.Name = "spawnEditorToolStripButton"; this.spawnEditorToolStripButton.Size = new System.Drawing.Size(57, 36); this.spawnEditorToolStripButton.Text = "Spawn Point Editor"; this.spawnEditorToolStripButton.Click += new System.EventHandler(this.spawnEditorToolStripButton_Click); @@ -7827,6 +7672,174 @@ this.versionLabel.TabIndex = 9; this.versionLabel.Text = "ROM:"; // + // headersGridView + // + this.headersGridView.AllowUserToAddRows = false; + this.headersGridView.AllowUserToDeleteRows = false; + this.headersGridView.AllowUserToResizeColumns = false; + this.headersGridView.AllowUserToResizeRows = false; + dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.headersGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; + this.headersGridView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.headersGridView.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; + dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle2.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); + dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.headersGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2; + this.headersGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle3.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + dataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle3.Format = "D4"; + dataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.headersGridView.DefaultCellStyle = dataGridViewCellStyle3; + this.headersGridView.Location = new System.Drawing.Point(0, 0); + this.headersGridView.MultiSelect = false; + this.headersGridView.Name = "headersGridView"; + dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle4.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); + dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.headersGridView.RowHeadersDefaultCellStyle = dataGridViewCellStyle4; + this.headersGridView.RowHeadersWidth = 50; + this.headersGridView.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing; + dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle5.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.headersGridView.RowsDefaultCellStyle = dataGridViewCellStyle5; + this.headersGridView.RowTemplate.DefaultCellStyle.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.headersGridView.RowTemplate.Height = 18; + this.headersGridView.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.False; + this.headersGridView.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect; + this.headersGridView.ShowCellErrors = false; + this.headersGridView.Size = new System.Drawing.Size(1032, 597); + this.headersGridView.TabIndex = 1; + this.headersGridView.CellFormatting += new System.Windows.Forms.DataGridViewCellFormattingEventHandler(this.headersGridView_CellFormatting); + this.headersGridView.CellMouseDoubleClick += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.headersGridView_CellMouseDoubleClick); + this.headersGridView.CellValueChanged += new System.Windows.Forms.DataGridViewCellEventHandler(this.headersGridView_CellValueChanged); + // + // heightsGridView + // + this.heightsGridView.AllowUserToAddRows = false; + this.heightsGridView.AllowUserToDeleteRows = false; + this.heightsGridView.AllowUserToResizeColumns = false; + this.heightsGridView.AllowUserToResizeRows = false; + dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.heightsGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle6; + this.heightsGridView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.heightsGridView.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; + dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle7.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle7.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); + dataGridViewCellStyle7.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle7.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.heightsGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle7; + this.heightsGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle8.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle8.Font = new System.Drawing.Font("Tahoma", 8.25F); + dataGridViewCellStyle8.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle8.Format = "D2"; + dataGridViewCellStyle8.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle8.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.heightsGridView.DefaultCellStyle = dataGridViewCellStyle8; + this.heightsGridView.Location = new System.Drawing.Point(0, 0); + this.heightsGridView.MultiSelect = false; + this.heightsGridView.Name = "heightsGridView"; + dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle9.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle9.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); + dataGridViewCellStyle9.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle9.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle9.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.heightsGridView.RowHeadersDefaultCellStyle = dataGridViewCellStyle9; + this.heightsGridView.RowHeadersWidth = 50; + this.heightsGridView.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing; + dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle10.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.heightsGridView.RowsDefaultCellStyle = dataGridViewCellStyle10; + this.heightsGridView.RowTemplate.DefaultCellStyle.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.heightsGridView.RowTemplate.Height = 18; + this.heightsGridView.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.False; + this.heightsGridView.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect; + this.heightsGridView.Size = new System.Drawing.Size(1032, 576); + this.heightsGridView.TabIndex = 2; + this.heightsGridView.CellFormatting += new System.Windows.Forms.DataGridViewCellFormattingEventHandler(this.heightsGridView_CellFormatting); + this.heightsGridView.CellValueChanged += new System.Windows.Forms.DataGridViewCellEventHandler(this.heightsGridView_CellValueChanged); + // + // mapFilesGridView + // + this.mapFilesGridView.AllowUserToAddRows = false; + this.mapFilesGridView.AllowUserToDeleteRows = false; + this.mapFilesGridView.AllowUserToResizeColumns = false; + this.mapFilesGridView.AllowUserToResizeRows = false; + dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.mapFilesGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle11; + this.mapFilesGridView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.mapFilesGridView.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None; + dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle12.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle12.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); + dataGridViewCellStyle12.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle12.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle12.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.mapFilesGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle12; + this.mapFilesGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + dataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle13.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle13.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + dataGridViewCellStyle13.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle13.Format = "D4"; + dataGridViewCellStyle13.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle13.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.mapFilesGridView.DefaultCellStyle = dataGridViewCellStyle13; + this.mapFilesGridView.Location = new System.Drawing.Point(0, 0); + this.mapFilesGridView.MultiSelect = false; + this.mapFilesGridView.Name = "mapFilesGridView"; + dataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle14.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle14.Font = new System.Drawing.Font("Microsoft Sans Serif", 7F); + dataGridViewCellStyle14.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle14.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle14.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle14.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.mapFilesGridView.RowHeadersDefaultCellStyle = dataGridViewCellStyle14; + this.mapFilesGridView.RowHeadersWidth = 50; + this.mapFilesGridView.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing; + dataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle15.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.mapFilesGridView.RowsDefaultCellStyle = dataGridViewCellStyle15; + this.mapFilesGridView.RowTemplate.DefaultCellStyle.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.mapFilesGridView.RowTemplate.Height = 18; + this.mapFilesGridView.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.False; + this.mapFilesGridView.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect; + this.mapFilesGridView.Size = new System.Drawing.Size(1032, 576); + this.mapFilesGridView.TabIndex = 2; + this.mapFilesGridView.CellContentDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.mapFilesGridView_CellMouseDoubleClick); + this.mapFilesGridView.CellFormatting += new System.Windows.Forms.DataGridViewCellFormattingEventHandler(this.mapFilesGridView_CellFormatting); + this.mapFilesGridView.CellValueChanged += new System.Windows.Forms.DataGridViewCellEventHandler(this.mapFilesGridView_CellValueChanged); + // // MainProgram // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -7845,7 +7858,7 @@ this.MainMenuStrip = this.menuStrip1; this.MaximizeBox = false; this.Name = "MainProgram"; - this.Text = "DS Pokémon Rom Editor 1.1.4 (Nømura, AdAstra/LD3005)"; + this.Text = "DS Pokémon Rom Editor 1.1.4a (Nømura, AdAstra/LD3005)"; this.mainTabControl.ResumeLayout(false); this.headerEditorTabPage.ResumeLayout(false); this.headerEditorTabPage.PerformLayout(); @@ -7886,11 +7899,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); @@ -7966,6 +7976,8 @@ ((System.ComponentModel.ISupportInitialize)(this.spawnableScriptUpDown)).EndInit(); this.overworldsTabPage.ResumeLayout(false); this.overworldsTabPage.PerformLayout(); + this.groupBox22.ResumeLayout(false); + this.groupBox22.PerformLayout(); this.groupBox17.ResumeLayout(false); this.groupBox17.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.owYMatrixUpDown)).EndInit(); @@ -7973,8 +7985,10 @@ ((System.ComponentModel.ISupportInitialize)(this.owSpritePictureBox)).EndInit(); this.owMovementGroupBox.ResumeLayout(false); this.owMovementGroupBox.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.owYRangeUpDown)).EndInit(); + this.groupBox23.ResumeLayout(false); + this.groupBox23.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.owXRangeUpDown)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.owYRangeUpDown)).EndInit(); this.positionGroupBox.ResumeLayout(false); this.positionGroupBox.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.owXMapUpDown)).EndInit(); @@ -8048,6 +8062,9 @@ this.statusStrip1.PerformLayout(); this.mainToolStrip.ResumeLayout(false); this.mainToolStrip.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.headersGridView)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.heightsGridView)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.mapFilesGridView)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); @@ -8451,12 +8468,9 @@ private System.Windows.Forms.GroupBox owMovementGroupBox; private System.Windows.Forms.Label label4; private System.Windows.Forms.ComboBox owOrientationComboBox; - private System.Windows.Forms.Label yMovRangeLabel; - private System.Windows.Forms.Label xMovRangeLabel; private System.Windows.Forms.NumericUpDown owYRangeUpDown; private System.Windows.Forms.NumericUpDown owXRangeUpDown; private System.Windows.Forms.ComboBox owMovementComboBox; - private System.Windows.Forms.Label isTrainerLabel; private System.Windows.Forms.GroupBox positionGroupBox; private System.Windows.Forms.Label label13; private System.Windows.Forms.NumericUpDown owXMapUpDown; @@ -8622,6 +8636,10 @@ private System.Windows.Forms.Button setSpawnPointButton; private System.Windows.Forms.ToolStripButton spawnEditorToolStripButton; private System.Windows.Forms.ToolStripMenuItem spawnEditorToolStripMenuItem; + private System.Windows.Forms.GroupBox groupBox22; + private System.Windows.Forms.GroupBox groupBox23; + private System.Windows.Forms.Label label39; + private System.Windows.Forms.Label label20; } } diff --git a/DS_Map/Main Window.cs b/DS_Map/Main Window.cs index 223b112..19cacaa 100644 --- a/DS_Map/Main Window.cs +++ b/DS_Map/Main Window.cs @@ -715,7 +715,7 @@ namespace DSPRE { Update(); } private void aboutToolStripMenuItem_Click(object sender, EventArgs e) { - string message = "DS Pokémon Rom Editor by Nømura and AdAstra/LD3005" + Environment.NewLine + "version 1.1.4" + Environment.NewLine + string message = "DS Pokémon Rom Editor by Nømura and AdAstra/LD3005" + Environment.NewLine + "version 1.1.4a" + Environment.NewLine + Environment.NewLine + "This tool was largely inspired by Markitus95's Spiky's DS Map Editor, from which certain assets were also recycled. Credits go to Markitus, Ark, Zark, Florian, and everyone else who deserves credit for SDSME." + Environment.NewLine + Environment.NewLine + "Special thanks go to Trifindo, Mikelan98, JackHack96, Mixone and BagBoy." + Environment.NewLine + "Their help, research and expertise in many fields of NDS Rom Hacking made the development of this tool possible."; @@ -4447,33 +4447,6 @@ namespace DSPRE { overworldsListBox.Items.Add("Overworld " + (currentEvFile.overworlds.Count - 1).ToString()); overworldsListBox.SelectedIndex = currentEvFile.overworlds.Count - 1; } - private void isTrainerRadioButton_CheckedChanged(object sender, EventArgs e) { - if (disableHandlers) - return; - - /* Disable script number control */ - owScriptNumericUpDown.Enabled = false; - - /* Set special settings controls */ - owSpecialGroupBox.Enabled = true; - - owTrainerComboBox.Enabled = true; - owTrainerLabel.Enabled = true; - - owSightRangeUpDown.Enabled = true; - owSightRangeLabel.Enabled = true; - owPartnerTrainerCheckBox.Enabled = true; - - owItemComboBox.Enabled = false; - owItemLabel.Enabled = false; - - /* Set trainer flag to true */ - currentEvFile.overworlds[overworldsListBox.SelectedIndex].type = 0x1; - - /* Adjust script number */ - if (owTrainerComboBox.SelectedIndex >= 0) - owTrainerComboBox_SelectedIndexChanged(null, null); - } public static bool ScanScriptsCheckStandardizedItemNumbers() { ScriptFile itemScript = new ScriptFile(RomInfo.itemScriptFileNumber); @@ -4484,52 +4457,53 @@ namespace DSPRE { } return true; } - private void isItemRadioButton_CheckedChanged(object sender, EventArgs e) { - if (disableHandlers) - return; + private void OWTypeChanged(object sender, EventArgs e) { + if (normalRadioButton.Checked == true ) { + owScriptNumericUpDown.Enabled = true; + owSpecialGroupBox.Enabled = false; - /* Disable script number control */ - owScriptNumericUpDown.Enabled = false; + if (disableHandlers) + return; + currentEvFile.overworlds[overworldsListBox.SelectedIndex].type = 0x0; + currentEvFile.overworlds[overworldsListBox.SelectedIndex].scriptNumber = (ushort)(owScriptNumericUpDown.Value = 0); + } else if (isItemRadioButton.Checked == true) { + owScriptNumericUpDown.Enabled = false; - /* Set special settings controls */ - owSpecialGroupBox.Enabled = true; + owSpecialGroupBox.Enabled = true; + owTrainerComboBox.Enabled = false; + owTrainerLabel.Enabled = false; + owSightRangeUpDown.Enabled = false; + owSightRangeLabel.Enabled = false; + owPartnerTrainerCheckBox.Enabled = false; - owTrainerComboBox.Enabled = false; - owTrainerLabel.Enabled = false; - - owSightRangeUpDown.Enabled = false; - owSightRangeLabel.Enabled = false; - owPartnerTrainerCheckBox.Enabled = false; - - if (isItemRadioButton.Enabled) { - if (isItemRadioButton.Checked) { + if (disableHandlers) + return; + if (isItemRadioButton.Enabled) { owItemComboBox.Enabled = true; owItemLabel.Enabled = true; + currentEvFile.overworlds[overworldsListBox.SelectedIndex].type = 0x3; currentEvFile.overworlds[overworldsListBox.SelectedIndex].scriptNumber = (ushort)(owScriptNumericUpDown.Value = 7000 + owItemComboBox.SelectedIndex); } + } else { //trainer + owScriptNumericUpDown.Enabled = false; + + owSpecialGroupBox.Enabled = true; + owTrainerComboBox.Enabled = true; + owTrainerLabel.Enabled = true; + owItemLabel.Enabled = false; + owSightRangeUpDown.Enabled = true; + owSightRangeLabel.Enabled = true; + owPartnerTrainerCheckBox.Enabled = true; + + owItemComboBox.Enabled = false; + + if (disableHandlers) + return; + currentEvFile.overworlds[overworldsListBox.SelectedIndex].type = 0x1; + if (owTrainerComboBox.SelectedIndex >= 0) + owTrainerComboBox_SelectedIndexChanged(null, null); } - - /* Set overworld type to item */ - currentEvFile.overworlds[overworldsListBox.SelectedIndex].type = 0x3; - } - private void normalRadioButton_CheckedChanged(object sender, EventArgs e) { - if (disableHandlers) - return; - - /* Enable script number control buttons */ - owScriptNumericUpDown.Enabled = true; - - /* Set special settings controls */ - owSpecialGroupBox.Enabled = false; - - if (normalRadioButton.Checked) { - owScriptNumericUpDown.Value = 0; - } - - /* Set trainer flag to false and correct script number */ - currentEvFile.overworlds[overworldsListBox.SelectedIndex].type = 0x0; - currentEvFile.overworlds[overworldsListBox.SelectedIndex].scriptNumber = (ushort)owScriptNumericUpDown.Value; } private void owItemComboBox_SelectedIndexChanged(object sender, EventArgs e) { if (disableHandlers || overworldsListBox.SelectedIndex < 0) @@ -4538,89 +4512,75 @@ namespace DSPRE { owScriptNumericUpDown.Value = currentEvFile.overworlds[overworldsListBox.SelectedIndex].scriptNumber = (ushort)(7000 + owItemComboBox.SelectedIndex); } private void overworldsListBox_SelectedIndexChanged(object sender, EventArgs e) { - #region Disable Events for fast execution - if (disableHandlers) { + int index = overworldsListBox.SelectedIndex; + + if (disableHandlers || index < 0) { return; } - disableHandlers = true; - #endregion - int index = overworldsListBox.SelectedIndex; - if (index > -1) { - try { - selectedEvent = currentEvFile.overworlds[index]; - Overworld selectedOw = (Overworld)selectedEvent; - - /* Sprite index and image controls */ - owSpriteComboBox.SelectedIndex = Array.IndexOf(RomInfo.overworldTableKeys, selectedOw.overlayTableEntry); - owSpritePictureBox.BackgroundImage = GetOverworldImage(selectedOw.overlayTableEntry, selectedOw.orientation); - } catch (ArgumentOutOfRangeException) { - String errorMsg = "This Overworld's sprite ID couldn't be read correctly."; - MessageBox.Show(errorMsg, "Something went wrong", MessageBoxButtons.OK, MessageBoxIcon.Error); - } - - try { - /* Set coordinates controls */ - owXMapUpDown.Value = currentEvFile.overworlds[index].xMapPosition; - owYMapUpDown.Value = currentEvFile.overworlds[index].yMapPosition; - owXMatrixUpDown.Value = currentEvFile.overworlds[index].xMatrixPosition; - owYMatrixUpDown.Value = currentEvFile.overworlds[index].yMatrixPosition; - owZPositionUpDown.Value = currentEvFile.overworlds[index].zPosition; - - /*ID, Flag and Script number controls */ - owIDNumericUpDown.Value = currentEvFile.overworlds[index].owID; - owFlagNumericUpDown.Value = currentEvFile.overworlds[index].flag; - owScriptNumericUpDown.Value = currentEvFile.overworlds[index].scriptNumber; - - /* Special settings controls */ - if (currentEvFile.overworlds[index].type == 0x1) { - disableHandlers = false; - isTrainerRadioButton.Checked = true; - disableHandlers = true; - if (currentEvFile.overworlds[index].scriptNumber >= 4999) { - owTrainerComboBox.SelectedIndex = Math.Max(currentEvFile.overworlds[index].scriptNumber - 4999, 0); // Partner of double battle trainer - owPartnerTrainerCheckBox.Checked = true; - } else { - owTrainerComboBox.SelectedIndex = Math.Max(currentEvFile.overworlds[index].scriptNumber - 2999, 0); // Normal trainer - owPartnerTrainerCheckBox.Checked = false; - } - } else if (currentEvFile.overworlds[index].type == 0x3 || currentEvFile.overworlds[index].scriptNumber >= 7000 && currentEvFile.overworlds[index].scriptNumber <= 8000) { - disableHandlers = false; - isItemRadioButton.Checked = true; - owItemComboBox.SelectedIndex = Math.Max(currentEvFile.overworlds[index].scriptNumber - 7000, 0); - disableHandlers = true; - } else { - disableHandlers = false; - normalRadioButton.Checked = true; - disableHandlers = true; - } - - - /* Movement settings */ - owMovementComboBox.SelectedIndex = currentEvFile.overworlds[index].movement; - owOrientationComboBox.SelectedIndex = currentEvFile.overworlds[index].orientation; - owSightRangeUpDown.Value = currentEvFile.overworlds[index].sightRange; - owXRangeUpDown.Value = currentEvFile.overworlds[index].xRange; - owYRangeUpDown.Value = currentEvFile.overworlds[index].yRange; - try { - uint spriteID = RomInfo.OverworldTable[currentEvFile.overworlds[overworldsListBox.SelectedIndex].overlayTableEntry].spriteID; - if (spriteID == 0x3D3D) { - spriteIDlabel.Text = "3D Overworld"; - } else { - spriteIDlabel.Text = "Sprite ID: " + spriteID; - } - } catch { } - DisplayActiveEvents(); - } catch (ArgumentOutOfRangeException) { - String errorMsg = "There was a problem loading the overworld events of this Event file."; - MessageBox.Show(errorMsg, "Something went wrong", MessageBoxButtons.OK, MessageBoxIcon.Error); - } + selectedEvent = currentEvFile.overworlds[index]; + Overworld selectedOw = (Overworld)selectedEvent; + try { + /* Sprite index and image controls */ + owSpriteComboBox.SelectedIndex = Array.IndexOf(RomInfo.overworldTableKeys, selectedOw.overlayTableEntry); + owSpritePictureBox.BackgroundImage = GetOverworldImage(selectedOw.overlayTableEntry, selectedOw.orientation); + } catch (ArgumentOutOfRangeException) { + String errorMsg = "This Overworld's sprite ID couldn't be read correctly."; + MessageBox.Show(errorMsg, "Something went wrong", MessageBoxButtons.OK, MessageBoxIcon.Error); } - #region Re-enable events + try { + /* Special settings controls */ + if (selectedOw.type == (ushort)Overworld.owType.TRAINER) { + isTrainerRadioButton.Checked = true; + if (selectedOw.scriptNumber >= 4999) { + owTrainerComboBox.SelectedIndex = Math.Max(selectedOw.scriptNumber - 4999, 0); // Partner of double battle trainer + owPartnerTrainerCheckBox.Checked = true; + } else { + owTrainerComboBox.SelectedIndex = Math.Max(selectedOw.scriptNumber - 2999, 0); // Normal trainer + owPartnerTrainerCheckBox.Checked = false; + } + } else if (selectedOw.type == (ushort)Overworld.owType.ITEM || selectedOw.scriptNumber >= 7000 && selectedOw.scriptNumber <= 8000) { + isItemRadioButton.Checked = true; + owItemComboBox.SelectedIndex = Math.Max(selectedOw.scriptNumber - 7000, 0); + } else { + normalRadioButton.Checked = true; + } + + /* Set coordinates controls */ + owXMapUpDown.Value = selectedOw.xMapPosition; + owYMapUpDown.Value = selectedOw.yMapPosition; + owXMatrixUpDown.Value = selectedOw.xMatrixPosition; + owYMatrixUpDown.Value = selectedOw.yMatrixPosition; + owZPositionUpDown.Value = selectedOw.zPosition; + + /*ID, Flag and Script number controls */ + owIDNumericUpDown.Value = selectedOw.owID; + owFlagNumericUpDown.Value = selectedOw.flag; + owScriptNumericUpDown.Value = selectedOw.scriptNumber; + + /* Movement settings */ + owMovementComboBox.SelectedIndex = selectedOw.movement; + owOrientationComboBox.SelectedIndex = selectedOw.orientation; + owSightRangeUpDown.Value = selectedOw.sightRange; + owXRangeUpDown.Value = selectedOw.xRange; + owYRangeUpDown.Value = selectedOw.yRange; + try { + uint spriteID = RomInfo.OverworldTable[currentEvFile.overworlds[overworldsListBox.SelectedIndex].overlayTableEntry].spriteID; + if (spriteID == 0x3D3D) { + spriteIDlabel.Text = "3D Overworld"; + } else { + spriteIDlabel.Text = "Sprite ID: " + spriteID; + } + } catch { } + DisplayActiveEvents(); + } catch (ArgumentOutOfRangeException) { + String errorMsg = "There was a problem loading the overworld events of this Event file."; + MessageBox.Show(errorMsg, "Something went wrong", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + disableHandlers = false; - #endregion } private void owFlagNumericUpDown_ValueChanged(object sender, EventArgs e) { if (disableHandlers || overworldsListBox.SelectedIndex < 0) @@ -5094,11 +5054,16 @@ namespace DSPRE { } private void saveScriptFileButton_Click(object sender, EventArgs e) { /* Create new ScriptFile object */ + int idToAssign = selectScriptFileComboBox.SelectedIndex; ScriptFile userEdited = new ScriptFile(scriptTextBox.Lines, functionTextBox.Lines, movementTextBox.Lines, selectScriptFileComboBox.SelectedIndex); /* Write new scripts to file */ - userEdited.SaveToFileDefaultDir(selectScriptFileComboBox.SelectedIndex); - currentScriptFile = userEdited; + if (userEdited.fileID == idToAssign) { //check if ScriptFile instance was created succesfully + userEdited.SaveToFileDefaultDir(selectScriptFileComboBox.SelectedIndex); + currentScriptFile = userEdited; + } else { + MessageBox.Show("This " + typeof(ScriptFile).Name + " couldn't be saved.", "Can't save", MessageBoxButtons.OK, MessageBoxIcon.Warning); + } } private void importScriptFileButton_Click(object sender, EventArgs e) { /* Prompt user to select .scr file */ @@ -5123,6 +5088,7 @@ namespace DSPRE { scriptEditorIsReady = true; } + scriptEditorTabControl.SelectedIndex = 0; selectScriptFileComboBox.SelectedIndex = (int)scriptFileUpDown.Value; mainTabControl.SelectedTab = scriptEditorTabPage; } @@ -5243,13 +5209,7 @@ namespace DSPRE { if (currentScriptFile.isLevelScript) { scriptTextBox.Text += "Level script files are currently not supported.\nYou can use AdAstra's Level Scripts Editor."; - functionTextBox.Enabled = false; - movementTextBox.Enabled = false; - saveScriptFileButton.Enabled = false; } else { - saveScriptFileButton.Enabled = true; - functionTextBox.Enabled = true; - movementTextBox.Enabled = true; /* Add scripts */ disableHandlers = true; diff --git a/DS_Map/Main Window.resx b/DS_Map/Main Window.resx index 517cc5c..17816e3 100644 --- a/DS_Map/Main Window.resx +++ b/DS_Map/Main Window.resx @@ -1152,7 +1152,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACA - DwAAAk1TRnQBSQFMAgEBBwEAARwBDgEcAQ4BEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + DwAAAk1TRnQBSQFMAgEBBwEAAUQBDgFEAQ4BEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA diff --git a/DS_Map/Properties/AssemblyInfo.cs b/DS_Map/Properties/AssemblyInfo.cs index 1bbeafa..5571c7c 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.1.4")] +[assembly: AssemblyTitle("DSPRE Reloaded 1.1.4a")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("DSPRE Reloaded 1.1.4")] +[assembly: AssemblyProduct("DSPRE Reloaded 1.1.4a")] [assembly: AssemblyCopyright("Copyright © 2021")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -32,4 +32,4 @@ using System.Runtime.InteropServices; // usando l'asterisco '*' come illustrato di seguito: // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion("1.1.4")] -[assembly: AssemblyFileVersion("1.1.4")] +[assembly: AssemblyFileVersion("1.1.4a")] diff --git a/DS_Map/ROMFiles/EventFile.cs b/DS_Map/ROMFiles/EventFile.cs index ead0f22..87739b6 100644 --- a/DS_Map/ROMFiles/EventFile.cs +++ b/DS_Map/ROMFiles/EventFile.cs @@ -208,6 +208,8 @@ namespace DSPRE.ROMFiles { public class Overworld : Event { #region Fields (14) + public enum owType : ushort { NORMAL = 0, TRAINER = 1, ITEM = 3}; + public ushort owID; public ushort overlayTableEntry; public ushort movement; diff --git a/DS_Map/ROMFiles/ScriptFile.cs b/DS_Map/ROMFiles/ScriptFile.cs index ffc7d99..b8ea612 100644 --- a/DS_Map/ROMFiles/ScriptFile.cs +++ b/DS_Map/ROMFiles/ScriptFile.cs @@ -18,7 +18,7 @@ namespace DSPRE.ROMFiles { public List allScripts = new List(); public List allFunctions = new List(); public List allActions = new List(); - int fileID = -1; + public int fileID = -1; public bool isLevelScript = new bool(); #endregion @@ -131,13 +131,13 @@ namespace DSPRE.ROMFiles { "\\" + fileID.ToString("D4"), FileMode.Open)) { this.fileID = fileID; } - public ScriptFile(List scripts, List functions, List movements) { + public ScriptFile(List scripts, List functions, List movements, int fileID = -1) { allScripts = scripts; allFunctions = functions; allActions = movements; isLevelScript = false; } - public ScriptFile(string[] scriptLines, string[] functionLines, string[] actionLines, int ID = -1) { + public ScriptFile(string[] scriptLines, string[] functionLines, string[] actionLines, int fileID = -1) { //TODO: give user the possibility to jump to/call a script //once it's done, this Predicate below will be the only one needed, since there will be no distinction between //a script and a function @@ -151,7 +151,7 @@ namespace DSPRE.ROMFiles { || source[x].IndexOf(RomInfo.ScriptCommandNamesDict[0x0016] + " Function") >= 0; //Jump Function_# allScripts = readCommandsFromLines(scriptLines, containerTypes.SCRIPT, scriptEndCondition); //Jump + whitespace - if (allScripts == null) + if (allScripts == null || allScripts.Count <= 0) return; allFunctions = readCommandsFromLines(functionLines, containerTypes.FUNCTION, functionEndCondition); //Jump + whitespace @@ -162,7 +162,7 @@ namespace DSPRE.ROMFiles { if (allActions == null) return; - this.fileID = ID; + this.fileID = fileID; } #endregion diff --git a/DS_Map/Resources/PokeDatabase.cs b/DS_Map/Resources/PokeDatabase.cs index 0b1d0bc..7a731b5 100644 --- a/DS_Map/Resources/PokeDatabase.cs +++ b/DS_Map/Resources/PokeDatabase.cs @@ -521,79 +521,79 @@ namespace DSPRE.Resources { } public static class Overworlds { public static string[] movementsArray = new string[] { - "[00] None", - "[01] None", - "[02] Looking in all directions", - "[03] Walking around in all directions", - "[04] Walking Up, Down", - "[05] Walking Left, Right", - "[06] Looking Up, Left", - "[07] Looking Up, Right", - "[08] Looking Down, Left", - "[09] Looking Down, Right", - "[10] Looking Up, Down, Left", - "[11] Looking Up, Right, Down", - "[12] Looking Right, Left, Up", - "[13] Looking Right, Left, Down", - "[14] Facing Up", - "[15] Facing Down", - "[16] Facing Left", - "[17] Facing Right", - "[18] Counterclockwise spinning", - "[19] Clockwise spinning", - "[20] Running Up, Down", - "[21] L Run (Up, Right)", - "[22] Patrols Area, then stops", - "[23] Patrols Area, then stops", - "[24] L Run (Up, Right)", - "[25] Patrols Area, then stops", - "[26] Patrols Area, then stops", - "[27] Patrols Area, then stops", - "[28] L run (Right, Down)", - "[29] L run (Left, Up)", - "[30] Continuous patrolling", - "[31] Continuous patrolling", - "[32] L Run (Down, Right)", - "[33] L Run (Right, Up)", - "[34] Patrols Area, then stops", - "[35] Patrols Area, then stops", - "[36] L Run (Down, Left)", - "[37] Running Up, Left, Down, Right", - "[38] Running Down, Right, Up, Left", - "[39] Running Left, Down, Right, Up", - "[40] Running Right, Up, Left, Down", - "[41] Running Up, Right, Down, Left", - "[42] Running Down, Left, Up, Right", - "[43] Running Left, Up, Right, Down", - "[44] Running Right, Down, Left, Up", - "[45] Looking Up, Down", - "[46] Looking Right, Left", - "[47] ?", - "[48] Follow Hero", - "[49] Semi-circle spin (Down, Right, Up)", - "[50] ?", - "[51] Hidden Under Snow", - "[52] Hidden Under Snow", - "[53] Hidden Underground", - "[54] Hidden Under Grass", - "[55] Mimicks Player (moves within range)", - "[56] Mimicks Player (moves within range)", - "[57] Mimicks Player (moves within range)", - "[58] Mimicks Player (moves within range)", - "[59] Mimick's Player facing direction", - "[60] Mimick's Player facing direction", - "[61] Mimick's Player facing direction", - "[62] Mimick's Player facing direction", - "[63] Jogging on the spot", - "[64] Jogging on the spot", - "[65] Jogging on the spot", - "[66] Jogging on the spot", - "[67] Walking Right, Left", - "[68] Looking Right", - "[69] ?", - "[70] ?", - "[71] Looking Left" - }; + "[00] None", + "[01] None", + "[02] Looking in all directions", + "[03] Walking around in all directions", + "[04] Walking Up, Down", + "[05] Walking Left, Right", + "[06] Looking Up, Left", + "[07] Looking Up, Right", + "[08] Looking Down, Left", + "[09] Looking Down, Right", + "[10] Looking Up, Down, Left", + "[11] Looking Up, Right, Down", + "[12] Looking Right, Left, Up", + "[13] Looking Right, Left, Down", + "[14] Facing Up", + "[15] Facing Down", + "[16] Facing Left", + "[17] Facing Right", + "[18] Counterclockwise spinning", + "[19] Clockwise spinning", + "[20] Running Up, Down", + "[21] L Run (Up, Right)", + "[22] Patrols, then stops (might crash)", + "[23] Patrols, then stops (might crash)", + "[24] L Run (Up, Right)", + "[25] Patrols, then stops (might crash)", + "[26] Patrols, then stops (might crash)", + "[27] Patrols, then stops", + "[28] L run (Right, Down)", + "[29] L run (Left, Up)", + "[30] Continuous patrolling (might crash)", + "[31] Continuous patrolling (might crash)", + "[32] L Run (Down, Right)", + "[33] L Run (Right, Up)", + "[34] Patrols Area, then stops", + "[35] Patrols Area, then stops", + "[36] L Run (Down, Left)", + "[37] Running Up, Left, Down, Right", + "[38] Running Down, Right, Up, Left", + "[39] Running Left, Down, Right, Up", + "[40] Running Right, Up, Left, Down", + "[41] Running Up, Right, Down, Left", + "[42] Running Down, Left, Up, Right", + "[43] Running Left, Up, Right, Down", + "[44] Running Right, Down, Left, Up", + "[45] Looking Up, Down", + "[46] Looking Right, Left", + "[47] Crashes game (?)", + "[48] Follow Hero", + "[49] Semi-circle spin (Down, Right, Up)", + "[50] Looking down", + "[51] Hidden Under Snow", + "[52] Hidden Under Snow", + "[53] Hidden Underground", + "[54] Hidden Under Grass", + "[55] Follow Hero", + "[56] Disappears", + "[57] Looking Left", + "[58] Looking Right", + "[59] Mimick's Player facing direction", + "[60] Mimick's Player facing direction", + "[61] Mimick's Player facing direction", + "[62] Mimick's Player facing direction", + "[63] Apparently nothing (?)", + "[64] Apparently nothing (?)", + "[65] Apparently nothing (?)", + "[66] Apparently nothing (?)", + "[67] Walking Right, Left", + "[68] Looking Right", + "[69] Apparently nothing (?)", + "[70] Apparently nothing (?)", + "[71] Looking Left" + }; } } public static class ScriptEditor { @@ -1065,6 +1065,9 @@ namespace DSPRE.Resources { [0x01EB] = "ShowNationalSheet", [0x01F1] = "CheckFossil", [0x01F6] = "CheckPokémonLevel", + + [0x0200] = "GetPreviousHeader", + [0x0201] = "GetCurrentHeader", [0x0204] = "WarpLastElevator", [0x0205] = "Geonet", [0x0206] = "GreatMarshBynocule", @@ -1644,7 +1647,7 @@ namespace DSPRE.Resources { [0x01FA] = new byte[1] { 0 }, [0x01FB] = new byte[] { 2, 2 }, [0x01FC] = new byte[1] { 0 }, - [0x01FD] = new byte[1] { 0 }, + [0x01FD] = new byte[] { 2, 2, 2, 2 }, [0x01FE] = new byte[] { 1 }, [0x01FF] = new byte[] { 2, 2, 2 }, [0x0200] = new byte[] { 2 }, @@ -1763,7 +1766,7 @@ namespace DSPRE.Resources { [0x0271] = new byte[] { 2 }, [0x0272] = new byte[] { 1 }, [0x0273] = new byte[] { 1, 2 }, - [0x0274] = new byte[1] { 0 }, + [0x0274] = new byte[] { 2, 4 }, [0x0275] = new byte[] { 2 }, [0x0276] = new byte[] { 2, 2, 2 }, [0x0277] = new byte[] { 2 }, diff --git a/DS_Map/SPK.Designer.cs b/DS_Map/SPK.Designer.cs deleted file mode 100644 index e65128b..0000000 --- a/DS_Map/SPK.Designer.cs +++ /dev/null @@ -1,202 +0,0 @@ -namespace WindowsFormsApplication1 -{ - partial class SPK - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Windows Form Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(SPK)); - this.tabControl1 = new System.Windows.Forms.TabControl(); - this.tabPage1 = new System.Windows.Forms.TabPage(); - this.checkedListBox1 = new System.Windows.Forms.CheckedListBox(); - this.textBox2 = new System.Windows.Forms.TextBox(); - this.button2 = new System.Windows.Forms.Button(); - this.button1 = new System.Windows.Forms.Button(); - this.textBox1 = new System.Windows.Forms.TextBox(); - this.tabPage2 = new System.Windows.Forms.TabPage(); - this.checkedListBox2 = new System.Windows.Forms.CheckedListBox(); - this.listBox1 = new System.Windows.Forms.ListBox(); - this.button5 = new System.Windows.Forms.Button(); - this.button4 = new System.Windows.Forms.Button(); - this.button3 = new System.Windows.Forms.Button(); - this.textBox4 = new System.Windows.Forms.TextBox(); - this.textBox3 = new System.Windows.Forms.TextBox(); - this.tabControl1.SuspendLayout(); - this.tabPage1.SuspendLayout(); - this.tabPage2.SuspendLayout(); - this.SuspendLayout(); - // - // tabControl1 - // - this.tabControl1.Controls.Add(this.tabPage1); - this.tabControl1.Controls.Add(this.tabPage2); - resources.ApplyResources(this.tabControl1, "tabControl1"); - this.tabControl1.Name = "tabControl1"; - this.tabControl1.SelectedIndex = 0; - // - // tabPage1 - // - this.tabPage1.Controls.Add(this.checkedListBox1); - this.tabPage1.Controls.Add(this.textBox2); - this.tabPage1.Controls.Add(this.button2); - this.tabPage1.Controls.Add(this.button1); - this.tabPage1.Controls.Add(this.textBox1); - resources.ApplyResources(this.tabPage1, "tabPage1"); - this.tabPage1.Name = "tabPage1"; - this.tabPage1.UseVisualStyleBackColor = true; - // - // checkedListBox1 - // - this.checkedListBox1.FormattingEnabled = true; - resources.ApplyResources(this.checkedListBox1, "checkedListBox1"); - this.checkedListBox1.Name = "checkedListBox1"; - // - // textBox2 - // - this.textBox2.BackColor = System.Drawing.SystemColors.ButtonHighlight; - this.textBox2.Cursor = System.Windows.Forms.Cursors.Arrow; - resources.ApplyResources(this.textBox2, "textBox2"); - this.textBox2.Name = "textBox2"; - this.textBox2.ReadOnly = true; - // - // button2 - // - resources.ApplyResources(this.button2, "button2"); - this.button2.Name = "button2"; - this.button2.UseVisualStyleBackColor = true; - // - // button1 - // - resources.ApplyResources(this.button1, "button1"); - this.button1.Name = "button1"; - this.button1.UseVisualStyleBackColor = true; - this.button1.Click += new System.EventHandler(this.button1_Click); - // - // textBox1 - // - this.textBox1.BackColor = System.Drawing.SystemColors.ButtonHighlight; - this.textBox1.Cursor = System.Windows.Forms.Cursors.Arrow; - resources.ApplyResources(this.textBox1, "textBox1"); - this.textBox1.Name = "textBox1"; - this.textBox1.ReadOnly = true; - // - // tabPage2 - // - this.tabPage2.Controls.Add(this.checkedListBox2); - this.tabPage2.Controls.Add(this.listBox1); - this.tabPage2.Controls.Add(this.button5); - this.tabPage2.Controls.Add(this.button4); - this.tabPage2.Controls.Add(this.button3); - this.tabPage2.Controls.Add(this.textBox4); - this.tabPage2.Controls.Add(this.textBox3); - resources.ApplyResources(this.tabPage2, "tabPage2"); - this.tabPage2.Name = "tabPage2"; - this.tabPage2.UseVisualStyleBackColor = true; - // - // checkedListBox2 - // - resources.ApplyResources(this.checkedListBox2, "checkedListBox2"); - this.checkedListBox2.FormattingEnabled = true; - this.checkedListBox2.MultiColumn = true; - this.checkedListBox2.Name = "checkedListBox2"; - // - // listBox1 - // - this.listBox1.FormattingEnabled = true; - resources.ApplyResources(this.listBox1, "listBox1"); - this.listBox1.Name = "listBox1"; - // - // button5 - // - resources.ApplyResources(this.button5, "button5"); - this.button5.Name = "button5"; - this.button5.UseVisualStyleBackColor = true; - // - // button4 - // - resources.ApplyResources(this.button4, "button4"); - this.button4.Name = "button4"; - this.button4.UseVisualStyleBackColor = true; - // - // button3 - // - resources.ApplyResources(this.button3, "button3"); - this.button3.Name = "button3"; - this.button3.UseVisualStyleBackColor = true; - // - // textBox4 - // - this.textBox4.BackColor = System.Drawing.SystemColors.ButtonHighlight; - this.textBox4.Cursor = System.Windows.Forms.Cursors.Arrow; - resources.ApplyResources(this.textBox4, "textBox4"); - this.textBox4.Name = "textBox4"; - this.textBox4.ReadOnly = true; - // - // textBox3 - // - this.textBox3.BackColor = System.Drawing.SystemColors.ButtonHighlight; - this.textBox3.Cursor = System.Windows.Forms.Cursors.Arrow; - resources.ApplyResources(this.textBox3, "textBox3"); - this.textBox3.Name = "textBox3"; - // - // SPK - // - resources.ApplyResources(this, "$this"); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.Controls.Add(this.tabControl1); - this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; - this.MaximizeBox = false; - this.MinimizeBox = false; - this.Name = "SPK"; - this.Load += new System.EventHandler(this.SPK_Load); - this.tabControl1.ResumeLayout(false); - this.tabPage1.ResumeLayout(false); - this.tabPage1.PerformLayout(); - this.tabPage2.ResumeLayout(false); - this.tabPage2.PerformLayout(); - this.ResumeLayout(false); - - } - - #endregion - - private System.Windows.Forms.TabControl tabControl1; - private System.Windows.Forms.TabPage tabPage1; - private System.Windows.Forms.TabPage tabPage2; - private System.Windows.Forms.Button button1; - private System.Windows.Forms.TextBox textBox1; - private System.Windows.Forms.Button button2; - private System.Windows.Forms.TextBox textBox2; - private System.Windows.Forms.CheckedListBox checkedListBox1; - private System.Windows.Forms.TextBox textBox3; - private System.Windows.Forms.TextBox textBox4; - private System.Windows.Forms.Button button3; - private System.Windows.Forms.Button button5; - private System.Windows.Forms.Button button4; - private System.Windows.Forms.ListBox listBox1; - private System.Windows.Forms.CheckedListBox checkedListBox2; - } -} \ No newline at end of file diff --git a/DS_Map/SPK.cs b/DS_Map/SPK.cs deleted file mode 100644 index f59eba0..0000000 --- a/DS_Map/SPK.cs +++ /dev/null @@ -1,199 +0,0 @@ -using System; -using System.Text; -using System.Windows.Forms; -using System.IO; -using System.Resources; -using System.Reflection; - -namespace WindowsFormsApplication1 -{ - public partial class SPK : Form - { - ResourceManager rm = new ResourceManager("WindowsFormsApplication1.WinFormStrings", Assembly.GetExecutingAssembly()); - #region DPPt Flags - bool adae = false; - bool adas = false; - bool adaf = false; - bool adai = false; - bool adag = false; - bool adaj = false; - bool adak = false; - bool apae = false; - bool apas = false; - bool apaf = false; - bool apai = false; - bool apag = false; - bool apaj = false; - bool apak = false; - bool cpue = false; - bool cpus = false; - bool cpuf = false; - bool cpui = false; - bool cpug = false; - bool cpuj = false; - bool cpuk = false; - #endregion - #region HGSS Flags - bool ipke = false; - bool ipks = false; - bool ipkf = false; - bool ipki = false; - bool ipkg = false; - bool ipkj = false; - bool ipkk = false; - bool ipge = false; - bool ipgs = false; - bool ipgf = false; - bool ipgi = false; - bool ipgg = false; - bool ipgj = false; - bool ipgk = false; - #endregion - - public SPK() - { - InitializeComponent(); - } - - private void SPK_Load(object sender, EventArgs e) - { - checkedListBox2.Items.Add(rm.GetString("diamondb") + " " + rm.GetString("usa"), true); - checkedListBox2.Items.Add(rm.GetString("diamondb") + " " + rm.GetString("spa"), true); - checkedListBox2.Items.Add(rm.GetString("diamondb") + " " + rm.GetString("fra"), true); - checkedListBox2.Items.Add(rm.GetString("diamondb") + " " + rm.GetString("ita"), true); - checkedListBox2.Items.Add(rm.GetString("diamondb") + " " + rm.GetString("ger"), true); - checkedListBox2.Items.Add(rm.GetString("diamondb") + " " + rm.GetString("jap"), true); - checkedListBox2.Items.Add(rm.GetString("diamondb") + " " + rm.GetString("kor"), true); - checkedListBox2.Items.Add(rm.GetString("pearlb") + " " + rm.GetString("usa"), true); - checkedListBox2.Items.Add(rm.GetString("pearlb") + " " + rm.GetString("spa"), true); - checkedListBox2.Items.Add(rm.GetString("pearlb") + " " + rm.GetString("fra"), true); - checkedListBox2.Items.Add(rm.GetString("pearlb") + " " + rm.GetString("ita"), true); - checkedListBox2.Items.Add(rm.GetString("pearlb") + " " + rm.GetString("ger"), true); - checkedListBox2.Items.Add(rm.GetString("pearlb") + " " + rm.GetString("jap"), true); - checkedListBox2.Items.Add(rm.GetString("pearlb") + " " + rm.GetString("kor"), true); - checkedListBox2.Items.Add(rm.GetString("platinumb") + " " + rm.GetString("usa"), true); - checkedListBox2.Items.Add(rm.GetString("platinumb") + " " + rm.GetString("spa"), true); - checkedListBox2.Items.Add(rm.GetString("platinumb") + " " + rm.GetString("fra"), true); - checkedListBox2.Items.Add(rm.GetString("platinumb") + " " + rm.GetString("ita"), true); - checkedListBox2.Items.Add(rm.GetString("platinumb") + " " + rm.GetString("ger"), true); - checkedListBox2.Items.Add(rm.GetString("platinumb") + " " + rm.GetString("jap"), true); - checkedListBox2.Items.Add(rm.GetString("platinumb") + " " + rm.GetString("kor"), true); - checkedListBox2.Items.Add(rm.GetString("heartgoldb") + " " + rm.GetString("usa"), true); - checkedListBox2.Items.Add(rm.GetString("heartgoldb") + " " + rm.GetString("spa"), true); - checkedListBox2.Items.Add(rm.GetString("heartgoldb") + " " + rm.GetString("fra"), true); - checkedListBox2.Items.Add(rm.GetString("heartgoldb") + " " + rm.GetString("ita"), true); - checkedListBox2.Items.Add(rm.GetString("heartgoldb") + " " + rm.GetString("ger"), true); - checkedListBox2.Items.Add(rm.GetString("heartgoldb") + " " + rm.GetString("jap"), true); - checkedListBox2.Items.Add(rm.GetString("heartgoldb") + " " + rm.GetString("kor"), true); - checkedListBox2.Items.Add(rm.GetString("soulsilverb") + " " + rm.GetString("usa"), true); - checkedListBox2.Items.Add(rm.GetString("soulsilverb") + " " + rm.GetString("spa"), true); - checkedListBox2.Items.Add(rm.GetString("soulsilverb") + " " + rm.GetString("fra"), true); - checkedListBox2.Items.Add(rm.GetString("soulsilverb") + " " + rm.GetString("ita"), true); - checkedListBox2.Items.Add(rm.GetString("soulsilverb") + " " + rm.GetString("ger"), true); - checkedListBox2.Items.Add(rm.GetString("soulsilverb") + " " + rm.GetString("jap"), true); - checkedListBox2.Items.Add(rm.GetString("soulsilverb") + " " + rm.GetString("kor"), true); - checkedListBox2.Items.Add(rm.GetString("blackb") + " " + rm.GetString("usa"), true); - checkedListBox2.Items.Add(rm.GetString("blackb") + " " + rm.GetString("spa"), true); - checkedListBox2.Items.Add(rm.GetString("blackb") + " " + rm.GetString("fra"), true); - checkedListBox2.Items.Add(rm.GetString("blackb") + " " + rm.GetString("ita"), true); - checkedListBox2.Items.Add(rm.GetString("blackb") + " " + rm.GetString("ger"), true); - checkedListBox2.Items.Add(rm.GetString("blackb") + " " + rm.GetString("jap"), true); - checkedListBox2.Items.Add(rm.GetString("blackb") + " " + rm.GetString("kor"), true); - checkedListBox2.Items.Add(rm.GetString("whiteb") + " " + rm.GetString("usa"), true); - checkedListBox2.Items.Add(rm.GetString("whiteb") + " " + rm.GetString("spa"), true); - checkedListBox2.Items.Add(rm.GetString("whiteb") + " " + rm.GetString("fra"), true); - checkedListBox2.Items.Add(rm.GetString("whiteb") + " " + rm.GetString("ita"), true); - checkedListBox2.Items.Add(rm.GetString("whiteb") + " " + rm.GetString("ger"), true); - checkedListBox2.Items.Add(rm.GetString("whiteb") + " " + rm.GetString("jap"), true); - checkedListBox2.Items.Add(rm.GetString("whiteb") + " " + rm.GetString("kor"), true); - checkedListBox2.Items.Add(rm.GetString("black2b") + " " + rm.GetString("usa"), true); - checkedListBox2.Items.Add(rm.GetString("black2b") + " " + rm.GetString("spa"), true); - checkedListBox2.Items.Add(rm.GetString("black2b") + " " + rm.GetString("fra"), true); - checkedListBox2.Items.Add(rm.GetString("black2b") + " " + rm.GetString("ita"), true); - checkedListBox2.Items.Add(rm.GetString("black2b") + " " + rm.GetString("ger"), true); - checkedListBox2.Items.Add(rm.GetString("black2b") + " " + rm.GetString("jap"), true); - checkedListBox2.Items.Add(rm.GetString("black2b") + " " + rm.GetString("kor"), true); - checkedListBox2.Items.Add(rm.GetString("white2b") + " " + rm.GetString("usa"), true); - checkedListBox2.Items.Add(rm.GetString("white2b") + " " + rm.GetString("spa"), true); - checkedListBox2.Items.Add(rm.GetString("white2b") + " " + rm.GetString("fra"), true); - checkedListBox2.Items.Add(rm.GetString("white2b") + " " + rm.GetString("ita"), true); - checkedListBox2.Items.Add(rm.GetString("white2b") + " " + rm.GetString("ger"), true); - checkedListBox2.Items.Add(rm.GetString("white2b") + " " + rm.GetString("jap"), true); - checkedListBox2.Items.Add(rm.GetString("white2b") + " " + rm.GetString("kor"), true); - } - - private void button1_Click(object sender, EventArgs e) - { - OpenFileDialog openSPK = new OpenFileDialog(); - if (openSPK.ShowDialog() == DialogResult.OK) - { - textBox1.Text = openSPK.FileName; - BinaryReader readSPK = new BinaryReader(File.OpenRead(openSPK.FileName)); - #region Flags - int flagD = readSPK.ReadByte(); - if ((flagD & (1 << 0)) != 0) adae = true; - if ((flagD & (1 << 1)) != 0) adas = true; - if ((flagD & (1 << 2)) != 0) adaf = true; - if ((flagD & (1 << 3)) != 0) adai = true; - if ((flagD & (1 << 4)) != 0) adag = true; - if ((flagD & (1 << 5)) != 0) adaj = true; - if ((flagD & (1 << 6)) != 0) adak = true; - int flagP = readSPK.ReadByte(); - if ((flagP & (1 << 0)) != 0) apae = true; - if ((flagP & (1 << 1)) != 0) apas = true; - if ((flagP & (1 << 2)) != 0) apaf = true; - if ((flagP & (1 << 3)) != 0) apai = true; - if ((flagP & (1 << 4)) != 0) apag = true; - if ((flagP & (1 << 5)) != 0) apaj = true; - if ((flagP & (1 << 6)) != 0) apak = true; - int flagPt = readSPK.ReadByte(); - if ((flagPt & (1 << 0)) != 0) cpue = true; - if ((flagPt & (1 << 1)) != 0) cpus = true; - if ((flagPt & (1 << 2)) != 0) cpuf = true; - if ((flagPt & (1 << 3)) != 0) cpui = true; - if ((flagPt & (1 << 4)) != 0) cpug = true; - if ((flagPt & (1 << 5)) != 0) cpuj = true; - if ((flagPt & (1 << 6)) != 0) cpuk = true; - int flagHG = readSPK.ReadByte(); - if ((flagHG & (1 << 0)) != 0) ipke = true; - if ((flagHG & (1 << 1)) != 0) ipks = true; - if ((flagHG & (1 << 2)) != 0) ipkf = true; - if ((flagHG & (1 << 3)) != 0) ipki = true; - if ((flagHG & (1 << 4)) != 0) ipkg = true; - if ((flagHG & (1 << 5)) != 0) ipkj = true; - if ((flagHG & (1 << 6)) != 0) ipkk = true; - int flagSS = readSPK.ReadByte(); - if ((flagSS & (1 << 0)) != 0) ipge = true; - if ((flagSS & (1 << 1)) != 0) ipgs = true; - if ((flagSS & (1 << 2)) != 0) ipgf = true; - if ((flagSS & (1 << 3)) != 0) ipgi = true; - if ((flagSS & (1 << 4)) != 0) ipgg = true; - if ((flagSS & (1 << 5)) != 0) ipgj = true; - if ((flagSS & (1 << 6)) != 0) ipgk = true; - int flagB = readSPK.ReadByte(); - int flagW = readSPK.ReadByte(); - int flagB2 = readSPK.ReadByte(); - int flagW2 = readSPK.ReadByte(); - #endregion - readSPK.BaseStream.Position = 0xD; - string description = ""; - int titleLength = readSPK.ReadUInt16(); - description += Encoding.UTF8.GetString(readSPK.ReadBytes(titleLength)) + "\r\n\r\n"; - int descriptionLength = readSPK.ReadUInt16(); - description += Encoding.UTF8.GetString(readSPK.ReadBytes(descriptionLength)); - //byte[] test = Encoding.UTF8.GetBytes(description); - textBox2.Text = description; - int count = readSPK.ReadUInt16(); - for (int i = 0; i < count; i++) - { - int filenameLength = (int)readSPK.ReadUInt32(); - checkedListBox1.Items.Add(Encoding.UTF8.GetString(readSPK.ReadBytes(filenameLength))); - checkedListBox1.SetItemChecked(i, true); - } - readSPK.Close(); - button2.Enabled = true; - } - } - - } -} diff --git a/DS_Map/SPK.resx b/DS_Map/SPK.resx deleted file mode 100644 index a42927e..0000000 --- a/DS_Map/SPK.resx +++ /dev/null @@ -1,582 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - checkedListBox1 - - - System.Windows.Forms.CheckedListBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPage1 - - - 0 - - - textBox2 - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPage1 - - - 1 - - - button2 - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPage1 - - - 2 - - - button1 - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPage1 - - - 3 - - - textBox1 - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPage1 - - - 4 - - - - 4, 22 - - - - 3, 3, 3, 3 - - - 470, 276 - - - - 0 - - - Patch SPK Package - - - tabPage1 - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabControl1 - - - 0 - - - 160 - - - True - - - False - - - 205, 144 - - - 165, 129 - - - 12 - - - checkedListBox2 - - - System.Windows.Forms.CheckedListBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPage2 - - - 0 - - - False - - - 6, 144 - - - 193, 129 - - - 11 - - - listBox1 - - - System.Windows.Forms.ListBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPage2 - - - 1 - - - False - - - NoControl - - - 376, 173 - - - 88, 23 - - - 10 - - - Remove - - - button5 - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPage2 - - - 2 - - - 376, 144 - - - 88, 23 - - - 9 - - - Add - - - button4 - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPage2 - - - 3 - - - False - - - 376, 250 - - - 88, 23 - - - 8 - - - Create - - - button3 - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPage2 - - - 4 - - - 6, 35 - - - True - - - Vertical - - - 458, 103 - - - 5 - - - textBox4 - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPage2 - - - 5 - - - 6, 9 - - - 458, 20 - - - 2 - - - textBox3 - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPage2 - - - 6 - - - 4, 22 - - - 3, 3, 3, 3 - - - 470, 276 - - - 1 - - - Create SPK Package - - - tabPage2 - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabControl1 - - - 1 - - - 13, 13 - - - 478, 302 - - - 0 - - - tabControl1 - - - System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 0 - - - 6, 144 - - - 365, 124 - - - 6 - - - checkedListBox1 - - - System.Windows.Forms.CheckedListBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPage1 - - - 0 - - - 6, 35 - - - True - - - Vertical - - - 458, 103 - - - 4 - - - textBox2 - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPage1 - - - 1 - - - False - - - 377, 245 - - - 87, 23 - - - 3 - - - Patch - - - button2 - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPage1 - - - 2 - - - 377, 6 - - - 87, 23 - - - 2 - - - Open - - - button1 - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPage1 - - - 3 - - - 6, 8 - - - 365, 20 - - - 1 - - - textBox1 - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPage1 - - - 4 - - - True - - - 6, 13 - - - 503, 327 - - - CenterScreen - - - SPK Packages - - - SPK - - - System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file