diff --git a/DS_Map/Main Window.Designer.cs b/DS_Map/Main Window.Designer.cs index 63ad85f..3393604 100644 --- a/DS_Map/Main Window.Designer.cs +++ b/DS_Map/Main Window.Designer.cs @@ -175,8 +175,11 @@ this.matrixNameLabel = new System.Windows.Forms.Label(); this.matrixTabControl = new System.Windows.Forms.TabControl(); this.headersTabPage = new System.Windows.Forms.TabPage(); + this.headersGridView = new DSPRE.DataGridViewDoubleBuffered(); this.heightsTabPage = new System.Windows.Forms.TabPage(); + this.heightsGridView = new DSPRE.DataGridViewDoubleBuffered(); this.mapFilesTabPage = new System.Windows.Forms.TabPage(); + this.mapFilesGridView = new DSPRE.DataGridViewDoubleBuffered(); this.matrixNameTextBox = new System.Windows.Forms.TextBox(); this.heightUpDown = new System.Windows.Forms.NumericUpDown(); this.widthUpDown = new System.Windows.Forms.NumericUpDown(); @@ -592,9 +595,6 @@ this.headerSearchToolStripButton = 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(); @@ -625,8 +625,11 @@ this.matrixEditorTabPage.SuspendLayout(); this.matrixTabControl.SuspendLayout(); this.headersTabPage.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.headersGridView)).BeginInit(); this.heightsTabPage.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.heightsGridView)).BeginInit(); this.mapFilesTabPage.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.mapFilesGridView)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.heightUpDown)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.widthUpDown)).BeginInit(); this.mapEditorTabPage.SuspendLayout(); @@ -746,9 +749,6 @@ 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 @@ -2281,6 +2281,62 @@ 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.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, 566); + this.headersGridView.TabIndex = 1; + this.headersGridView.CellFormatting += new System.Windows.Forms.DataGridViewCellFormattingEventHandler(this.headersGridView_CellFormatting); + this.headersGridView.CellMouseDoubleClick += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.headersGridView_CellMouseDoubleClick); + this.headersGridView.CellValueChanged += new System.Windows.Forms.DataGridViewCellEventHandler(this.headersGridView_CellValueChanged); + // // heightsTabPage // this.heightsTabPage.Controls.Add(this.heightsGridView); @@ -2291,6 +2347,60 @@ 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.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, 566); + this.heightsGridView.TabIndex = 2; + this.heightsGridView.CellFormatting += new System.Windows.Forms.DataGridViewCellFormattingEventHandler(this.heightsGridView_CellFormatting); + this.heightsGridView.CellValueChanged += new System.Windows.Forms.DataGridViewCellEventHandler(this.heightsGridView_CellValueChanged); + // // mapFilesTabPage // this.mapFilesTabPage.Controls.Add(this.mapFilesGridView); @@ -2301,6 +2411,61 @@ 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.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, 566); + this.mapFilesGridView.TabIndex = 2; + this.mapFilesGridView.CellContentDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.mapFilesGridView_CellMouseDoubleClick); + this.mapFilesGridView.CellFormatting += new System.Windows.Forms.DataGridViewCellFormattingEventHandler(this.mapFilesGridView_CellFormatting); + this.mapFilesGridView.CellValueChanged += new System.Windows.Forms.DataGridViewCellEventHandler(this.mapFilesGridView_CellValueChanged); + // // matrixNameTextBox // this.matrixNameTextBox.Location = new System.Drawing.Point(13, 73); @@ -5946,8 +6111,8 @@ this.scriptTextBox.Size = new System.Drawing.Size(581, 562); this.scriptTextBox.TabIndex = 7; this.scriptTextBox.Text = ""; - this.scriptTextBox.SelectionChanged += (sender, e) => this.AddLineNumbers(sender, e, LineNumberTextBoxScript); - this.scriptTextBox.VScroll += (sender, e) => this.AddLineNumbers(sender, e, LineNumberTextBoxScript); + this.scriptTextBox.SelectionChanged += new System.EventHandler(this.updateLineNumbersScripts); + this.scriptTextBox.VScroll += new System.EventHandler(this.updateLineNumbersScripts); // // LineNumberTextBoxScript // @@ -5995,8 +6160,8 @@ this.functionTextBox.Size = new System.Drawing.Size(581, 562); this.functionTextBox.TabIndex = 14; this.functionTextBox.Text = ""; - this.functionTextBox.SelectionChanged += (sender, e) => this.AddLineNumbers(sender, e, LineNumberTextBoxFunc); - this.functionTextBox.VScroll += (sender, e) => this.AddLineNumbers(sender, e, LineNumberTextBoxFunc); + this.functionTextBox.VScroll += new System.EventHandler(this.updateLineNumbersFunctions); + this.functionTextBox.TextChanged += new System.EventHandler(this.updateLineNumbersFunctions); // // LineNumberTextBoxFunc // @@ -6041,8 +6206,8 @@ this.movementTextBox.Size = new System.Drawing.Size(581, 562); this.movementTextBox.TabIndex = 17; this.movementTextBox.Text = ""; - this.movementTextBox.SelectionChanged += (sender, e) => this.AddLineNumbers(sender, e, LineNumberTextBoxMov); - this.movementTextBox.VScroll += (sender, e) => this.AddLineNumbers(sender, e, LineNumberTextBoxMov); + this.movementTextBox.SelectionChanged += new System.EventHandler(this.updateLineNumbersMovements); + this.movementTextBox.VScroll += new System.EventHandler(this.updateLineNumbersMovements); // // LineNumberTextBoxMov // @@ -7430,171 +7595,6 @@ 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.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, 566); - this.headersGridView.TabIndex = 1; - this.headersGridView.CellFormatting += new System.Windows.Forms.DataGridViewCellFormattingEventHandler(this.headersGridView_CellFormatting); - this.headersGridView.CellMouseDoubleClick += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.headersGridView_CellMouseDoubleClick); - this.headersGridView.CellValueChanged += new System.Windows.Forms.DataGridViewCellEventHandler(this.headersGridView_CellValueChanged); - // - // heightsGridView - // - this.heightsGridView.AllowUserToAddRows = false; - this.heightsGridView.AllowUserToDeleteRows = false; - this.heightsGridView.AllowUserToResizeColumns = false; - this.heightsGridView.AllowUserToResizeRows = false; - 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.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, 566); - this.heightsGridView.TabIndex = 2; - this.heightsGridView.CellFormatting += new System.Windows.Forms.DataGridViewCellFormattingEventHandler(this.heightsGridView_CellFormatting); - this.heightsGridView.CellValueChanged += new System.Windows.Forms.DataGridViewCellEventHandler(this.heightsGridView_CellValueChanged); - // - // mapFilesGridView - // - this.mapFilesGridView.AllowUserToAddRows = false; - this.mapFilesGridView.AllowUserToDeleteRows = false; - this.mapFilesGridView.AllowUserToResizeColumns = false; - this.mapFilesGridView.AllowUserToResizeRows = false; - 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.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, 566); - this.mapFilesGridView.TabIndex = 2; - this.mapFilesGridView.CellContentDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.mapFilesGridView_CellMouseDoubleClick); - this.mapFilesGridView.CellFormatting += new System.Windows.Forms.DataGridViewCellFormattingEventHandler(this.mapFilesGridView_CellFormatting); - this.mapFilesGridView.CellValueChanged += new System.Windows.Forms.DataGridViewCellEventHandler(this.mapFilesGridView_CellValueChanged); - // // MainProgram // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -7654,8 +7654,11 @@ this.matrixEditorTabPage.PerformLayout(); this.matrixTabControl.ResumeLayout(false); this.headersTabPage.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.headersGridView)).EndInit(); this.heightsTabPage.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.heightsGridView)).EndInit(); this.mapFilesTabPage.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.mapFilesGridView)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.heightUpDown)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.widthUpDown)).EndInit(); this.mapEditorTabPage.ResumeLayout(false); @@ -7812,9 +7815,6 @@ 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(); diff --git a/DS_Map/Main Window.cs b/DS_Map/Main Window.cs index 5c51f6e..587c994 100644 --- a/DS_Map/Main Window.cs +++ b/DS_Map/Main Window.cs @@ -4985,29 +4985,11 @@ namespace DSPRE { public ScriptFile currentScriptFile; #endregion - #region LineNumbers Scripts - public int GetWidthScript() { - int w = 29; - // get total lines of scriptTextBox - int line = scriptTextBox.Lines.Length; - - if (line <= 99) { - w = 24 + (int)scriptTextBox.Font.Size; - } else if (line <= 999) { - w = 34 + (int)scriptTextBox.Font.Size; - } else { - w = 54 + (int)scriptTextBox.Font.Size; - } - - return w; - } - - public void AddLineNumbers(object sender, EventArgs e, RichTextBox numberBox) { + #region LineNumbers + public void AddLineNumbers(RichTextBox mainbox, RichTextBox numberBox) { if (disableHandlers) return; - RichTextBox mainbox = (RichTextBox)sender; - // get line indices int indexFirstCharDisplayed = mainbox.GetCharIndexFromPosition(new Point(0, mainbox.Font.Height/2)); int firstLine = mainbox.GetLineFromCharIndex(indexFirstCharDisplayed); @@ -5020,47 +5002,43 @@ namespace DSPRE { // set LineNumberTextBox text to null & width to GetWidth() function value numberBox.Text = ""; - numberBox.Width = GetWidthScript(); + numberBox.Width = CalculateLineNumbersWidth(mainbox); // now add each line number to LineNumberTextBox upto last line for (int i = firstLine; i <= lastLine+1; i++) { numberBox.Text += i+1 + "\n"; } numberBox.Invalidate(); - } - #endregion - #region LineNumbers Functions - public int GetWidthFunc() { + } + public int CalculateLineNumbersWidth(RichTextBox mainbox) { int w = 25; // get total lines of functionTextBox - int line = functionTextBox.Lines.Length; + int line = mainbox.Lines.Length; if (line <= 99) { - w = 20 + (int)functionTextBox.Font.Size; + w = 20 + (int)mainbox.Font.Size; } else if (line <= 999) { - w = 30 + (int)functionTextBox.Font.Size; + w = 30 + (int)mainbox.Font.Size; } else { - w = 50 + (int)functionTextBox.Font.Size; + w = 50 + (int)mainbox.Font.Size; } return w; } - #endregion - #region LineNumbers Movements - public int GetWidthMov() { - int w = 25; - // get total lines of movementTextBox - int line = movementTextBox.Lines.Length; - - if (line <= 99) { - w = 20 + (int)movementTextBox.Font.Size; - } else if (line <= 999) { - w = 30 + (int)movementTextBox.Font.Size; - } else { - w = 50 + (int)movementTextBox.Font.Size; - } - - return w; + private void updateLineNumbersScripts(object sender, EventArgs e) { + if (disableHandlers) + return; + AddLineNumbers(scriptTextBox, LineNumberTextBoxScript); + } + private void updateLineNumbersFunctions(object sender, EventArgs e) { + if (disableHandlers) + return; + AddLineNumbers(functionTextBox, LineNumberTextBoxFunc); + } + private void updateLineNumbersMovements(object sender, EventArgs e) { + if (disableHandlers) + return; + AddLineNumbers(functionTextBox, LineNumberTextBoxMov); } #endregion private void addScriptFileButton_Click(object sender, EventArgs e) { @@ -5327,9 +5305,9 @@ namespace DSPRE { statusLabel.Text = "Ready"; disableHandlers = false; - AddLineNumbers(scriptTextBox, null, LineNumberTextBoxScript); - AddLineNumbers(functionTextBox, null, LineNumberTextBoxFunc); - AddLineNumbers(movementTextBox, null, LineNumberTextBoxMov); + AddLineNumbers(scriptTextBox, LineNumberTextBoxScript); + AddLineNumbers(functionTextBox, LineNumberTextBoxFunc); + AddLineNumbers(movementTextBox, LineNumberTextBoxMov); } #region Script Macros @@ -5339,7 +5317,7 @@ namespace DSPRE { if (f.okSelected) scriptTextBox.Text.Insert(scriptTextBox.SelectionStart, "\nSetFlag 0x" + ((int)f.inputValUpDown.Value).ToString("X4")); } - AddLineNumbers(scriptTextBox, null, LineNumberTextBoxScript); + AddLineNumbers(scriptTextBox, LineNumberTextBoxScript); scriptTextBox.ScrollToCaret(); } private void clearflagButton_Click(object sender, EventArgs e) { @@ -5348,7 +5326,7 @@ namespace DSPRE { if (f.okSelected) scriptTextBox.Text.Insert(scriptTextBox.SelectionStart, "\nClearFlag 0x" + ((int)f.inputValUpDown.Value).ToString("X4")); } - AddLineNumbers(scriptTextBox, null, LineNumberTextBoxScript); + AddLineNumbers(scriptTextBox, LineNumberTextBoxScript); scriptTextBox.ScrollToCaret(); } private void callFunctionButton_Click(object sender, EventArgs e) { @@ -5357,7 +5335,7 @@ namespace DSPRE { if (f.okSelected) scriptTextBox.Text.Insert(scriptTextBox.SelectionStart, "\nCall Function_#" + ((int)f.inputValUpDown.Value).ToString()); } - AddLineNumbers(scriptTextBox, null, LineNumberTextBoxScript); + AddLineNumbers(scriptTextBox, LineNumberTextBoxScript); scriptTextBox.ScrollToCaret(); } private void jumpToFuncButton_Click(object sender, EventArgs e) { @@ -5366,7 +5344,7 @@ namespace DSPRE { if (f.okSelected) scriptTextBox.Text.Insert(scriptTextBox.SelectionStart, "\nJump Function_#" + ((int)f.inputValUpDown.Value).ToString()); } - AddLineNumbers(scriptTextBox, null, LineNumberTextBoxScript); + AddLineNumbers(scriptTextBox, LineNumberTextBoxScript); scriptTextBox.ScrollToCaret(); } private void setvarButton_Click(object sender, EventArgs e) { @@ -5386,7 +5364,7 @@ namespace DSPRE { cmd += "\nSetVar 0x" + ((int)f.inputValUpDown.Value).ToString("X4"); scriptTextBox.Text.Insert(scriptTextBox.SelectionStart, cmd); - AddLineNumbers(scriptTextBox, null, LineNumberTextBoxScript); + AddLineNumbers(scriptTextBox, LineNumberTextBoxScript); scriptTextBox.ScrollToCaret(); } } @@ -5399,7 +5377,7 @@ namespace DSPRE { "\nWaitButton" + "\nCloseMessage" + "\nReleaseAll"; scriptTextBox.Text.Insert(scriptTextBox.SelectionStart, cmd); - AddLineNumbers(scriptTextBox, null, LineNumberTextBoxScript); + AddLineNumbers(scriptTextBox, LineNumberTextBoxScript); scriptTextBox.ScrollToCaret(); } } @@ -5411,29 +5389,29 @@ namespace DSPRE { if (f.okSelected) { scriptTextBox.Text.Insert(scriptTextBox.SelectionStart, "\nPlayCry 0x" + ((int)f.inputValUpDown.Value).ToString("X4") + " 0x1"); - AddLineNumbers(scriptTextBox, null, LineNumberTextBoxScript); + AddLineNumbers(scriptTextBox, LineNumberTextBoxScript); scriptTextBox.ScrollToCaret(); } } } private void routeSignButton_Click(object sender, EventArgs e) { - AddLineNumbers(scriptTextBox, null, LineNumberTextBoxScript); + AddLineNumbers(scriptTextBox, LineNumberTextBoxScript); scriptTextBox.ScrollToCaret(); } private void townSignButton_Click(object sender, EventArgs e) { - AddLineNumbers(scriptTextBox, null, LineNumberTextBoxScript); + AddLineNumbers(scriptTextBox, LineNumberTextBoxScript); scriptTextBox.ScrollToCaret(); } private void greySignButton_Click(object sender, EventArgs e) { - AddLineNumbers(scriptTextBox, null, LineNumberTextBoxScript); + AddLineNumbers(scriptTextBox, LineNumberTextBoxScript); scriptTextBox.ScrollToCaret(); } private void tipsSignButton_Click(object sender, EventArgs e) { - AddLineNumbers(scriptTextBox, null, LineNumberTextBoxScript); + AddLineNumbers(scriptTextBox, LineNumberTextBoxScript); scriptTextBox.ScrollToCaret(); } private void trainerBattleButton_Click(object sender, EventArgs e) { - AddLineNumbers(scriptTextBox, null, LineNumberTextBoxScript); + AddLineNumbers(scriptTextBox, LineNumberTextBoxScript); scriptTextBox.ScrollToCaret(); } @@ -5443,80 +5421,80 @@ namespace DSPRE { if (f.okSelected) scriptTextBox.Text.Insert(scriptTextBox.SelectionStart, "\nPlaySound 0x" + ((int)f.inputValUpDown.Value).ToString("X4")); } - AddLineNumbers(scriptTextBox, null, LineNumberTextBoxScript); + AddLineNumbers(scriptTextBox, LineNumberTextBoxScript); scriptTextBox.ScrollToCaret(); } private void waitSoundButton_Click(object sender, EventArgs e) { scriptTextBox.Text.Insert(scriptTextBox.SelectionStart, "\nWaitSound"); - AddLineNumbers(scriptTextBox, null, LineNumberTextBoxScript); + AddLineNumbers(scriptTextBox, LineNumberTextBoxScript); scriptTextBox.ScrollToCaret(); } private void switchMusicButton_Click(object sender, EventArgs e) { - AddLineNumbers(scriptTextBox, null, LineNumberTextBoxScript); + AddLineNumbers(scriptTextBox, LineNumberTextBoxScript); scriptTextBox.ScrollToCaret(); } private void restartMusicButton_Click(object sender, EventArgs e) { - AddLineNumbers(scriptTextBox, null, LineNumberTextBoxScript); + AddLineNumbers(scriptTextBox, LineNumberTextBoxScript); scriptTextBox.ScrollToCaret(); } private void waitKeyPressButton_Click(object sender, EventArgs e) { scriptTextBox.Text.Insert(scriptTextBox.SelectionStart, "\nWaitButton"); - AddLineNumbers(scriptTextBox, null, LineNumberTextBoxScript); + AddLineNumbers(scriptTextBox, LineNumberTextBoxScript); scriptTextBox.ScrollToCaret(); } private void closeMessageButton_Click(object sender, EventArgs e) { scriptTextBox.Text.Insert(scriptTextBox.SelectionStart, "\nCloseMessage"); - AddLineNumbers(scriptTextBox, null, LineNumberTextBoxScript); + AddLineNumbers(scriptTextBox, LineNumberTextBoxScript); scriptTextBox.ScrollToCaret(); } private void wildBattleButton_Click(object sender, EventArgs e) { - AddLineNumbers(scriptTextBox, null, LineNumberTextBoxScript); + AddLineNumbers(scriptTextBox, LineNumberTextBoxScript); scriptTextBox.ScrollToCaret(); } private void legendaryBattleButton_Click(object sender, EventArgs e) { - AddLineNumbers(scriptTextBox, null, LineNumberTextBoxScript); + AddLineNumbers(scriptTextBox, LineNumberTextBoxScript); scriptTextBox.ScrollToCaret(); } private void checkItemButton_Click(object sender, EventArgs e) { - AddLineNumbers(scriptTextBox, null, LineNumberTextBoxScript); + AddLineNumbers(scriptTextBox, LineNumberTextBoxScript); scriptTextBox.ScrollToCaret(); } private void takePokémonButton_Click(object sender, EventArgs e) { - AddLineNumbers(scriptTextBox, null, LineNumberTextBoxScript); + AddLineNumbers(scriptTextBox, LineNumberTextBoxScript); scriptTextBox.ScrollToCaret(); } private void checkMoneyButton_Click(object sender, EventArgs e) { - AddLineNumbers(scriptTextBox, null, LineNumberTextBoxScript); + AddLineNumbers(scriptTextBox, LineNumberTextBoxScript); scriptTextBox.ScrollToCaret(); } private void givePokédexButton_Click(object sender, EventArgs e) { - AddLineNumbers(scriptTextBox, null, LineNumberTextBoxScript); + AddLineNumbers(scriptTextBox, LineNumberTextBoxScript); scriptTextBox.ScrollToCaret(); } private void giveNationalDexButton_Click(object sender, EventArgs e) { - AddLineNumbers(scriptTextBox, null, LineNumberTextBoxScript); + AddLineNumbers(scriptTextBox, LineNumberTextBoxScript); scriptTextBox.ScrollToCaret(); } private void giveShoesButton_Click(object sender, EventArgs e) { - AddLineNumbers(scriptTextBox, null, LineNumberTextBoxScript); + AddLineNumbers(scriptTextBox, LineNumberTextBoxScript); scriptTextBox.ScrollToCaret(); } private void givePokégearButton_Click(object sender, EventArgs e) { - AddLineNumbers(scriptTextBox, null, LineNumberTextBoxScript); + AddLineNumbers(scriptTextBox, LineNumberTextBoxScript); scriptTextBox.ScrollToCaret(); } private void checkBadgeButton_Click(object sender, EventArgs e) { - AddLineNumbers(scriptTextBox, null, LineNumberTextBoxScript); + AddLineNumbers(scriptTextBox, LineNumberTextBoxScript); scriptTextBox.ScrollToCaret(); } private void checkPokemonButton_Click(object sender, EventArgs e) { - AddLineNumbers(scriptTextBox, null, LineNumberTextBoxScript); + AddLineNumbers(scriptTextBox, LineNumberTextBoxScript); scriptTextBox.ScrollToCaret(); } private void LockCameraButton_Click(object sender, EventArgs e) { scriptTextBox.Text.Insert(scriptTextBox.SelectionStart, "\nCheckPlayerPosition 0x8004 0x8005\n" + "LockCam 0x8004 0x8005\n"); - AddLineNumbers(scriptTextBox, null, LineNumberTextBoxScript); + AddLineNumbers(scriptTextBox, LineNumberTextBoxScript); scriptTextBox.ScrollToCaret(); } private void MoveCameraButton_Click(object sender, EventArgs e) { @@ -5524,33 +5502,33 @@ namespace DSPRE { f.ShowDialog(); if (f.okSelected) { scriptTextBox.Text.Insert(scriptTextBox.SelectionStart, "\nApplyMovement Cam Movement_#\n" + f.inputValUpDown.Value); - AddLineNumbers(scriptTextBox, null, LineNumberTextBoxScript); + AddLineNumbers(scriptTextBox, LineNumberTextBoxScript); scriptTextBox.ScrollToCaret(); } } } private void resetScreenButton_Click(object sender, EventArgs e) { - AddLineNumbers(scriptTextBox, null, LineNumberTextBoxScript); + AddLineNumbers(scriptTextBox, LineNumberTextBoxScript); scriptTextBox.ScrollToCaret(); } private void fadeScreenButton_Click(object sender, EventArgs e) { - AddLineNumbers(scriptTextBox, null, LineNumberTextBoxScript); + AddLineNumbers(scriptTextBox, LineNumberTextBoxScript); scriptTextBox.ScrollToCaret(); } private void applyMovementButton_Click(object sender, EventArgs e) { - AddLineNumbers(scriptTextBox, null, LineNumberTextBoxScript); + AddLineNumbers(scriptTextBox, LineNumberTextBoxScript); scriptTextBox.ScrollToCaret(); } private void setOwPositionButton_Click(object sender, EventArgs e) { - AddLineNumbers(scriptTextBox, null, LineNumberTextBoxScript); + AddLineNumbers(scriptTextBox, LineNumberTextBoxScript); scriptTextBox.ScrollToCaret(); } private void warpButton_Click(object sender, EventArgs e) { - AddLineNumbers(scriptTextBox, null, LineNumberTextBoxScript); + AddLineNumbers(scriptTextBox, LineNumberTextBoxScript); scriptTextBox.ScrollToCaret(); } private void followHeroButton_Click(object sender, EventArgs e) { - AddLineNumbers(scriptTextBox, null, LineNumberTextBoxScript); + AddLineNumbers(scriptTextBox, LineNumberTextBoxScript); scriptTextBox.ScrollToCaret(); } #endregion @@ -5565,19 +5543,19 @@ namespace DSPRE { string thirdLine = "CallStandard 0xFC 0x7"; scriptTextBox.Text.Insert(scriptTextBox.SelectionStart, firstLine + "\r" + secondLine + "\r" + thirdLine); - AddLineNumbers(scriptTextBox, null, LineNumberTextBoxScript); + AddLineNumbers(scriptTextBox, LineNumberTextBoxScript); scriptTextBox.ScrollToCaret(); } } } private void lockallButton_Click(object sender, EventArgs e) { scriptTextBox.Text.Insert(scriptTextBox.SelectionStart, "\nLockAll"); - AddLineNumbers(scriptTextBox, null, LineNumberTextBoxScript); + AddLineNumbers(scriptTextBox, LineNumberTextBoxScript); scriptTextBox.ScrollToCaret(); } private void releaseallButton_Click(object sender, EventArgs e) { scriptTextBox.Text.Insert(scriptTextBox.SelectionStart, "\nReleaseAll"); - AddLineNumbers(scriptTextBox, null, LineNumberTextBoxScript); + AddLineNumbers(scriptTextBox, LineNumberTextBoxScript); scriptTextBox.ScrollToCaret(); } private void lockButton_Click(object sender, EventArgs e) { @@ -5585,7 +5563,7 @@ namespace DSPRE { f.ShowDialog(); if (f.okSelected) { scriptTextBox.Text.Insert(scriptTextBox.SelectionStart, "\nLock" + " " + "Overworld_#" + ((int)f.inputValUpDown.Value).ToString("D")); - AddLineNumbers(scriptTextBox, null, LineNumberTextBoxScript); + AddLineNumbers(scriptTextBox, LineNumberTextBoxScript); scriptTextBox.ScrollToCaret(); } } @@ -5595,14 +5573,14 @@ namespace DSPRE { f.ShowDialog(); if (f.okSelected) { scriptTextBox.Text.Insert(scriptTextBox.SelectionStart, "\nRelease" + " " + "Overworld_#" + ((int)f.inputValUpDown.Value).ToString("D")); - AddLineNumbers(scriptTextBox, null, LineNumberTextBoxScript); + AddLineNumbers(scriptTextBox, LineNumberTextBoxScript); scriptTextBox.ScrollToCaret(); } } } private void waitmovementButton_Click(object sender, EventArgs e) { scriptTextBox.Text.Insert(scriptTextBox.SelectionStart, "WaitMovement"); - AddLineNumbers(scriptTextBox, null, LineNumberTextBoxScript); + AddLineNumbers(scriptTextBox, LineNumberTextBoxScript); scriptTextBox.ScrollToCaret(); } private void addpeopleButton_Click(object sender, EventArgs e) { @@ -5610,7 +5588,7 @@ namespace DSPRE { f.ShowDialog(); if (f.okSelected) { scriptTextBox.Text.Insert(scriptTextBox.SelectionStart, "\nAddOW" + " " + "Overworld_#" + ((int)f.inputValUpDown.Value).ToString("D")); - AddLineNumbers(scriptTextBox, null, LineNumberTextBoxScript); + AddLineNumbers(scriptTextBox, LineNumberTextBoxScript); scriptTextBox.ScrollToCaret(); } } @@ -5620,7 +5598,7 @@ namespace DSPRE { f.ShowDialog(); if (f.okSelected) { scriptTextBox.Text.Insert(scriptTextBox.SelectionStart, "\nRemoveOW" + " " + "Overworld_#" + ((int)f.inputValUpDown.Value).ToString("D")); - AddLineNumbers(scriptTextBox, null, LineNumberTextBoxScript); + AddLineNumbers(scriptTextBox, LineNumberTextBoxScript); scriptTextBox.ScrollToCaret(); } } @@ -5633,7 +5611,7 @@ namespace DSPRE { f.ShowDialog(); if (f.okSelected) { scriptTextBox.Text.Insert(scriptTextBox.SelectionStart, f.command); - AddLineNumbers(scriptTextBox, null, LineNumberTextBoxScript); + AddLineNumbers(scriptTextBox, LineNumberTextBoxScript); scriptTextBox.ScrollToCaret(); } } @@ -5643,7 +5621,7 @@ namespace DSPRE { f.ShowDialog(); if (f.okSelected) { scriptTextBox.Text.Insert(scriptTextBox.SelectionStart, "\nGiveMoney" + " " + "0x" + ((int)f.inputValUpDown.Value).ToString("X")); - AddLineNumbers(scriptTextBox, null, LineNumberTextBoxScript); + AddLineNumbers(scriptTextBox, LineNumberTextBoxScript); scriptTextBox.ScrollToCaret(); } } @@ -5653,7 +5631,7 @@ namespace DSPRE { f.ShowDialog(); if (f.okSelected) { scriptTextBox.Text.Insert(scriptTextBox.SelectionStart, "\nTakeMoney" + " " + "0x" + ((int)f.inputValUpDown.Value).ToString("X")); - AddLineNumbers(scriptTextBox, null, LineNumberTextBoxScript); + AddLineNumbers(scriptTextBox, LineNumberTextBoxScript); scriptTextBox.ScrollToCaret(); } } @@ -5666,7 +5644,7 @@ namespace DSPRE { string quantity = ((int)f.quantityNumericUpDown.Value).ToString("X"); scriptTextBox.Text.Insert(scriptTextBox.SelectionStart, "\nTakeItem" + " " + "0x" + item + " " + "0x" + quantity + " " + "0x800C"); - AddLineNumbers(scriptTextBox, null, LineNumberTextBoxScript); + AddLineNumbers(scriptTextBox, LineNumberTextBoxScript); scriptTextBox.ScrollToCaret(); } @@ -5678,7 +5656,7 @@ namespace DSPRE { if (f.okSelected) scriptTextBox.Text.Insert(scriptTextBox.SelectionStart, "\nEnableBadge 0x" + ((int)f.inputValUpDown.Value).ToString("X")); } - AddLineNumbers(scriptTextBox, null, LineNumberTextBoxScript); + AddLineNumbers(scriptTextBox, LineNumberTextBoxScript); scriptTextBox.ScrollToCaret(); } private void takeBadgeButton_Click(object sender, EventArgs e) { @@ -5687,7 +5665,7 @@ namespace DSPRE { if (f.okSelected) scriptTextBox.Text.Insert(scriptTextBox.SelectionStart, "\nDisableBadge 0x" + ((int)f.inputValUpDown.Value).ToString("X")); } - AddLineNumbers(scriptTextBox, null, LineNumberTextBoxScript); + AddLineNumbers(scriptTextBox, LineNumberTextBoxScript); scriptTextBox.ScrollToCaret(); } #endregion