diff --git a/Source/SM64 Diagnostic/StroopMainForm.Designer.cs b/Source/SM64 Diagnostic/StroopMainForm.Designer.cs index a9414b2ba..da0647083 100644 --- a/Source/SM64 Diagnostic/StroopMainForm.Designer.cs +++ b/Source/SM64 Diagnostic/StroopMainForm.Designer.cs @@ -755,6 +755,8 @@ private void InitializeComponent() this.tabPageTesting = new System.Windows.Forms.TabPage(); this.groupBoxSchedule = new System.Windows.Forms.GroupBox(); this.buttonScheduleButtonSet = new System.Windows.Forms.Button(); + this.buttonScheduleNext = new System.Windows.Forms.Button(); + this.buttonSchedulePrevious = new System.Windows.Forms.Button(); this.buttonScheduleButtonReset = new System.Windows.Forms.Button(); this.label4 = new System.Windows.Forms.Label(); this.label5 = new System.Windows.Forms.Label(); @@ -898,8 +900,6 @@ private void InitializeComponent() this.buttonShowRightPane = new System.Windows.Forms.Button(); this.buttonShowLeftRightPane = new System.Windows.Forms.Button(); this.buttonShowLeftPane = new System.Windows.Forms.Button(); - this.buttonSchedulePrevious = new System.Windows.Forms.Button(); - this.buttonScheduleNext = new System.Windows.Forms.Button(); this.groupBoxObjects.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.trackBarObjSlotSize)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.splitContainerMain)).BeginInit(); @@ -1226,7 +1226,7 @@ private void InitializeComponent() this.groupBoxObjects.Margin = new System.Windows.Forms.Padding(2); this.groupBoxObjects.Name = "groupBoxObjects"; this.groupBoxObjects.Padding = new System.Windows.Forms.Padding(2); - this.groupBoxObjects.Size = new System.Drawing.Size(923, 326); + this.groupBoxObjects.Size = new System.Drawing.Size(923, 327); this.groupBoxObjects.TabIndex = 2; this.groupBoxObjects.TabStop = false; this.groupBoxObjects.Text = "Objects"; @@ -1291,7 +1291,7 @@ private void InitializeComponent() this.NoTearFlowLayoutPanelObjects.Location = new System.Drawing.Point(4, 45); this.NoTearFlowLayoutPanelObjects.Margin = new System.Windows.Forms.Padding(2); this.NoTearFlowLayoutPanelObjects.Name = "NoTearFlowLayoutPanelObjects"; - this.NoTearFlowLayoutPanelObjects.Size = new System.Drawing.Size(915, 155); + this.NoTearFlowLayoutPanelObjects.Size = new System.Drawing.Size(915, 153); this.NoTearFlowLayoutPanelObjects.TabIndex = 0; this.NoTearFlowLayoutPanelObjects.Resize += new System.EventHandler(this.NoTearFlowLayoutPanelObjects_Resize); // @@ -2291,7 +2291,7 @@ private void InitializeComponent() this.NoTearFlowLayoutPanelObject.Location = new System.Drawing.Point(2, 2); this.NoTearFlowLayoutPanelObject.Margin = new System.Windows.Forms.Padding(2); this.NoTearFlowLayoutPanelObject.Name = "NoTearFlowLayoutPanelObject"; - this.NoTearFlowLayoutPanelObject.Size = new System.Drawing.Size(696, 458); + this.NoTearFlowLayoutPanelObject.Size = new System.Drawing.Size(690, 458); this.NoTearFlowLayoutPanelObject.TabIndex = 3; // // tabPageMario @@ -2829,7 +2829,7 @@ private void InitializeComponent() this.NoTearFlowLayoutPanelMario.Location = new System.Drawing.Point(2, 2); this.NoTearFlowLayoutPanelMario.Margin = new System.Windows.Forms.Padding(2); this.NoTearFlowLayoutPanelMario.Name = "NoTearFlowLayoutPanelMario"; - this.NoTearFlowLayoutPanelMario.Size = new System.Drawing.Size(705, 456); + this.NoTearFlowLayoutPanelMario.Size = new System.Drawing.Size(699, 456); this.NoTearFlowLayoutPanelMario.TabIndex = 1; // // tabPageHud @@ -2973,7 +2973,7 @@ private void InitializeComponent() this.NoTearFlowLayoutPanelHud.Location = new System.Drawing.Point(2, 2); this.NoTearFlowLayoutPanelHud.Margin = new System.Windows.Forms.Padding(2); this.NoTearFlowLayoutPanelHud.Name = "NoTearFlowLayoutPanelHud"; - this.NoTearFlowLayoutPanelHud.Size = new System.Drawing.Size(797, 457); + this.NoTearFlowLayoutPanelHud.Size = new System.Drawing.Size(791, 457); this.NoTearFlowLayoutPanelHud.TabIndex = 3; // // tabPageCamera @@ -3354,7 +3354,7 @@ private void InitializeComponent() this.NoTearFlowLayoutPanelCamera.Location = new System.Drawing.Point(2, 2); this.NoTearFlowLayoutPanelCamera.Margin = new System.Windows.Forms.Padding(2); this.NoTearFlowLayoutPanelCamera.Name = "NoTearFlowLayoutPanelCamera"; - this.NoTearFlowLayoutPanelCamera.Size = new System.Drawing.Size(707, 457); + this.NoTearFlowLayoutPanelCamera.Size = new System.Drawing.Size(701, 457); this.NoTearFlowLayoutPanelCamera.TabIndex = 3; // // tabPageTriangles @@ -3896,7 +3896,7 @@ private void InitializeComponent() this.NoTearFlowLayoutPanelTriangles.Location = new System.Drawing.Point(2, 4); this.NoTearFlowLayoutPanelTriangles.Margin = new System.Windows.Forms.Padding(2); this.NoTearFlowLayoutPanelTriangles.Name = "NoTearFlowLayoutPanelTriangles"; - this.NoTearFlowLayoutPanelTriangles.Size = new System.Drawing.Size(704, 453); + this.NoTearFlowLayoutPanelTriangles.Size = new System.Drawing.Size(698, 453); this.NoTearFlowLayoutPanelTriangles.TabIndex = 7; // // tabPageWater @@ -4026,7 +4026,7 @@ private void InitializeComponent() this.NoTearFlowLayoutPanelInput.Location = new System.Drawing.Point(2, 2); this.NoTearFlowLayoutPanelInput.Margin = new System.Windows.Forms.Padding(2); this.NoTearFlowLayoutPanelInput.Name = "NoTearFlowLayoutPanelInput"; - this.NoTearFlowLayoutPanelInput.Size = new System.Drawing.Size(485, 460); + this.NoTearFlowLayoutPanelInput.Size = new System.Drawing.Size(479, 460); this.NoTearFlowLayoutPanelInput.TabIndex = 2; // // tabPageFile @@ -4389,7 +4389,7 @@ private void InitializeComponent() this.tableLayoutPanelFile.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F)); this.tableLayoutPanelFile.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F)); this.tableLayoutPanelFile.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F)); - this.tableLayoutPanelFile.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 154F)); + this.tableLayoutPanelFile.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 155F)); this.tableLayoutPanelFile.Controls.Add(this.textBoxTableRow15Col10, 10, 14); this.tableLayoutPanelFile.Controls.Add(this.textBoxTableRow14Col10, 10, 13); this.tableLayoutPanelFile.Controls.Add(this.textBoxTableRow13Col10, 10, 12); @@ -7363,7 +7363,7 @@ private void InitializeComponent() this.noTearFlowLayoutPanelFile.Location = new System.Drawing.Point(0, -1); this.noTearFlowLayoutPanelFile.Margin = new System.Windows.Forms.Padding(2); this.noTearFlowLayoutPanelFile.Name = "noTearFlowLayoutPanelFile"; - this.noTearFlowLayoutPanelFile.Size = new System.Drawing.Size(256, 463); + this.noTearFlowLayoutPanelFile.Size = new System.Drawing.Size(250, 463); this.noTearFlowLayoutPanelFile.TabIndex = 2; // // tabPageMisc @@ -7466,7 +7466,7 @@ private void InitializeComponent() this.NoTearFlowLayoutPanelMisc.Location = new System.Drawing.Point(2, 2); this.NoTearFlowLayoutPanelMisc.Margin = new System.Windows.Forms.Padding(2); this.NoTearFlowLayoutPanelMisc.Name = "NoTearFlowLayoutPanelMisc"; - this.NoTearFlowLayoutPanelMisc.Size = new System.Drawing.Size(784, 457); + this.NoTearFlowLayoutPanelMisc.Size = new System.Drawing.Size(778, 457); this.NoTearFlowLayoutPanelMisc.TabIndex = 5; // // tabPageDebug @@ -7727,7 +7727,7 @@ private void InitializeComponent() this.noTearFlowLayoutPanelDebug.Location = new System.Drawing.Point(2, 2); this.noTearFlowLayoutPanelDebug.Margin = new System.Windows.Forms.Padding(2); this.noTearFlowLayoutPanelDebug.Name = "noTearFlowLayoutPanelDebug"; - this.noTearFlowLayoutPanelDebug.Size = new System.Drawing.Size(524, 455); + this.noTearFlowLayoutPanelDebug.Size = new System.Drawing.Size(518, 455); this.noTearFlowLayoutPanelDebug.TabIndex = 26; // // tabPageMap @@ -7939,7 +7939,7 @@ private void InitializeComponent() this.glControlMap.Location = new System.Drawing.Point(4, 3); this.glControlMap.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.glControlMap.Name = "glControlMap"; - this.glControlMap.Size = new System.Drawing.Size(695, 430); + this.glControlMap.Size = new System.Drawing.Size(689, 430); this.glControlMap.TabIndex = 0; this.glControlMap.VSync = false; this.glControlMap.Load += new System.EventHandler(this.glControlMap_Load); @@ -8420,7 +8420,7 @@ private void InitializeComponent() this.glControlModelView.BackColor = System.Drawing.Color.Black; this.glControlModelView.Location = new System.Drawing.Point(3, 5); this.glControlModelView.Name = "glControlModelView"; - this.glControlModelView.Size = new System.Drawing.Size(478, 451); + this.glControlModelView.Size = new System.Drawing.Size(472, 451); this.glControlModelView.TabIndex = 0; this.glControlModelView.VSync = false; this.glControlModelView.Load += new System.EventHandler(this.glControlModelView_Load); @@ -8665,7 +8665,7 @@ private void InitializeComponent() this.groupBoxHackSpawn.Controls.Add(this.listBoxSpawn); this.groupBoxHackSpawn.Location = new System.Drawing.Point(4, 4); this.groupBoxHackSpawn.Name = "groupBoxHackSpawn"; - this.groupBoxHackSpawn.Size = new System.Drawing.Size(603, 447); + this.groupBoxHackSpawn.Size = new System.Drawing.Size(597, 447); this.groupBoxHackSpawn.TabIndex = 0; this.groupBoxHackSpawn.TabStop = false; this.groupBoxHackSpawn.Text = "Spawner"; @@ -8764,7 +8764,7 @@ private void InitializeComponent() this.listBoxSpawn.FormattingEnabled = true; this.listBoxSpawn.Location = new System.Drawing.Point(6, 19); this.listBoxSpawn.Name = "listBoxSpawn"; - this.listBoxSpawn.Size = new System.Drawing.Size(591, 342); + this.listBoxSpawn.Size = new System.Drawing.Size(585, 342); this.listBoxSpawn.Sorted = true; this.listBoxSpawn.TabIndex = 12; // @@ -9627,7 +9627,7 @@ private void InitializeComponent() this.noTearFlowLayoutPanelCamHack.Location = new System.Drawing.Point(2, 2); this.noTearFlowLayoutPanelCamHack.Margin = new System.Windows.Forms.Padding(2); this.noTearFlowLayoutPanelCamHack.Name = "noTearFlowLayoutPanelCamHack"; - this.noTearFlowLayoutPanelCamHack.Size = new System.Drawing.Size(475, 458); + this.noTearFlowLayoutPanelCamHack.Size = new System.Drawing.Size(469, 458); this.noTearFlowLayoutPanelCamHack.TabIndex = 2; // // tabPageQuarterFrame @@ -10240,6 +10240,26 @@ private void InitializeComponent() this.buttonScheduleButtonSet.Text = "Set"; this.buttonScheduleButtonSet.UseVisualStyleBackColor = true; // + // buttonScheduleNext + // + this.buttonScheduleNext.Location = new System.Drawing.Point(203, 95); + this.buttonScheduleNext.Margin = new System.Windows.Forms.Padding(2); + this.buttonScheduleNext.Name = "buttonScheduleNext"; + this.buttonScheduleNext.Size = new System.Drawing.Size(63, 25); + this.buttonScheduleNext.TabIndex = 43; + this.buttonScheduleNext.Text = "Next"; + this.buttonScheduleNext.UseVisualStyleBackColor = true; + // + // buttonSchedulePrevious + // + this.buttonSchedulePrevious.Location = new System.Drawing.Point(138, 95); + this.buttonSchedulePrevious.Margin = new System.Windows.Forms.Padding(2); + this.buttonSchedulePrevious.Name = "buttonSchedulePrevious"; + this.buttonSchedulePrevious.Size = new System.Drawing.Size(63, 25); + this.buttonSchedulePrevious.TabIndex = 43; + this.buttonSchedulePrevious.Text = "Previous"; + this.buttonSchedulePrevious.UseVisualStyleBackColor = true; + // // buttonScheduleButtonReset // this.buttonScheduleButtonReset.Location = new System.Drawing.Point(136, 126); @@ -11830,26 +11850,6 @@ private void InitializeComponent() this.buttonShowLeftPane.UseVisualStyleBackColor = true; this.buttonShowLeftPane.Click += new System.EventHandler(this.buttonShowLeftPanel_Click); // - // buttonSchedulePrevious - // - this.buttonSchedulePrevious.Location = new System.Drawing.Point(138, 95); - this.buttonSchedulePrevious.Margin = new System.Windows.Forms.Padding(2); - this.buttonSchedulePrevious.Name = "buttonSchedulePrevious"; - this.buttonSchedulePrevious.Size = new System.Drawing.Size(63, 25); - this.buttonSchedulePrevious.TabIndex = 43; - this.buttonSchedulePrevious.Text = "Previous"; - this.buttonSchedulePrevious.UseVisualStyleBackColor = true; - // - // buttonScheduleNext - // - this.buttonScheduleNext.Location = new System.Drawing.Point(203, 95); - this.buttonScheduleNext.Margin = new System.Windows.Forms.Padding(2); - this.buttonScheduleNext.Name = "buttonScheduleNext"; - this.buttonScheduleNext.Size = new System.Drawing.Size(63, 25); - this.buttonScheduleNext.TabIndex = 43; - this.buttonScheduleNext.Text = "Next"; - this.buttonScheduleNext.UseVisualStyleBackColor = true; - // // StroopMainForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); diff --git a/Windows Build/Stroop.exe b/Windows Build/Stroop.exe index c027a72be..9a9fb0f58 100644 Binary files a/Windows Build/Stroop.exe and b/Windows Build/Stroop.exe differ