ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

basic bot - fix failure to fully use selected memory domain (fixes #1305)

This commit is contained in:
zeromus 2018-11-30 10:14:35 -06:00
parent 8c7919a1c4
commit 615d7848f9
3 changed files with 1422 additions and 1417 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

104
BizHawk.Client.EmuHawk/tools/BasicBot/BasicBot.Designer.cs generated
View File

@ -146,7 +146,7 @@
this.OptionsSubMenu}); this.OptionsSubMenu});
this.BotMenu.Location = new System.Drawing.Point(0, 0); this.BotMenu.Location = new System.Drawing.Point(0, 0);
this.BotMenu.Name = "BotMenu"; this.BotMenu.Name = "BotMenu";
this.BotMenu.Size = new System.Drawing.Size(687, 24); this.BotMenu.Size = new System.Drawing.Size(707, 24);
this.BotMenu.TabIndex = 0; this.BotMenu.TabIndex = 0;
this.BotMenu.Text = "menuStrip1"; this.BotMenu.Text = "menuStrip1";
// //
@ -161,7 +161,7 @@
this.toolStripSeparator1, this.toolStripSeparator1,
this.ExitMenuItem}); this.ExitMenuItem});
this.FileSubMenu.Name = "FileSubMenu"; this.FileSubMenu.Name = "FileSubMenu";
this.FileSubMenu.Size = new System.Drawing.Size(37, 20); this.FileSubMenu.Size = new System.Drawing.Size(35, 20);
this.FileSubMenu.Text = "&File"; this.FileSubMenu.Text = "&File";
this.FileSubMenu.DropDownOpened += new System.EventHandler(this.FileSubMenu_DropDownOpened); this.FileSubMenu.DropDownOpened += new System.EventHandler(this.FileSubMenu_DropDownOpened);
// //
@ -170,7 +170,7 @@
this.NewMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.NewFile; this.NewMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.NewFile;
this.NewMenuItem.Name = "NewMenuItem"; this.NewMenuItem.Name = "NewMenuItem";
this.NewMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.N))); this.NewMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.N)));
this.NewMenuItem.Size = new System.Drawing.Size(195, 22); this.NewMenuItem.Size = new System.Drawing.Size(193, 22);
this.NewMenuItem.Text = "&New"; this.NewMenuItem.Text = "&New";
this.NewMenuItem.Click += new System.EventHandler(this.NewMenuItem_Click); this.NewMenuItem.Click += new System.EventHandler(this.NewMenuItem_Click);
// //
@ -179,7 +179,7 @@
this.OpenMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.OpenFile; this.OpenMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.OpenFile;
this.OpenMenuItem.Name = "OpenMenuItem"; this.OpenMenuItem.Name = "OpenMenuItem";
this.OpenMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O))); this.OpenMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O)));
this.OpenMenuItem.Size = new System.Drawing.Size(195, 22); this.OpenMenuItem.Size = new System.Drawing.Size(193, 22);
this.OpenMenuItem.Text = "&Open..."; this.OpenMenuItem.Text = "&Open...";
this.OpenMenuItem.Click += new System.EventHandler(this.OpenMenuItem_Click); this.OpenMenuItem.Click += new System.EventHandler(this.OpenMenuItem_Click);
// //
@ -188,7 +188,7 @@
this.SaveMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.SaveAs; this.SaveMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.SaveAs;
this.SaveMenuItem.Name = "SaveMenuItem"; this.SaveMenuItem.Name = "SaveMenuItem";
this.SaveMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.S))); this.SaveMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.S)));
this.SaveMenuItem.Size = new System.Drawing.Size(195, 22); this.SaveMenuItem.Size = new System.Drawing.Size(193, 22);
this.SaveMenuItem.Text = "&Save"; this.SaveMenuItem.Text = "&Save";
this.SaveMenuItem.Click += new System.EventHandler(this.SaveMenuItem_Click); this.SaveMenuItem.Click += new System.EventHandler(this.SaveMenuItem_Click);
// //
@ -197,7 +197,7 @@
this.SaveAsMenuItem.Name = "SaveAsMenuItem"; this.SaveAsMenuItem.Name = "SaveAsMenuItem";
this.SaveAsMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) this.SaveAsMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift)
| System.Windows.Forms.Keys.S))); | System.Windows.Forms.Keys.S)));
this.SaveAsMenuItem.Size = new System.Drawing.Size(195, 22); this.SaveAsMenuItem.Size = new System.Drawing.Size(193, 22);
this.SaveAsMenuItem.Text = "Save &As..."; this.SaveAsMenuItem.Text = "Save &As...";
this.SaveAsMenuItem.Click += new System.EventHandler(this.SaveAsMenuItem_Click); this.SaveAsMenuItem.Click += new System.EventHandler(this.SaveAsMenuItem_Click);
// //
@ -207,7 +207,7 @@
this.toolStripSeparator2}); this.toolStripSeparator2});
this.RecentSubMenu.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Recent; this.RecentSubMenu.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Recent;
this.RecentSubMenu.Name = "RecentSubMenu"; this.RecentSubMenu.Name = "RecentSubMenu";
this.RecentSubMenu.Size = new System.Drawing.Size(195, 22); this.RecentSubMenu.Size = new System.Drawing.Size(193, 22);
this.RecentSubMenu.Text = "Recent"; this.RecentSubMenu.Text = "Recent";
this.RecentSubMenu.DropDownOpened += new System.EventHandler(this.RecentSubMenu_DropDownOpened); this.RecentSubMenu.DropDownOpened += new System.EventHandler(this.RecentSubMenu_DropDownOpened);
// //
@ -219,13 +219,13 @@
// toolStripSeparator1 // toolStripSeparator1
// //
this.toolStripSeparator1.Name = "toolStripSeparator1"; this.toolStripSeparator1.Name = "toolStripSeparator1";
this.toolStripSeparator1.Size = new System.Drawing.Size(192, 6); this.toolStripSeparator1.Size = new System.Drawing.Size(190, 6);
// //
// ExitMenuItem // ExitMenuItem
// //
this.ExitMenuItem.Name = "ExitMenuItem"; this.ExitMenuItem.Name = "ExitMenuItem";
this.ExitMenuItem.ShortcutKeyDisplayString = "Alt+F4"; this.ExitMenuItem.ShortcutKeyDisplayString = "Alt+F4";
this.ExitMenuItem.Size = new System.Drawing.Size(195, 22); this.ExitMenuItem.Size = new System.Drawing.Size(193, 22);
this.ExitMenuItem.Text = "E&xit"; this.ExitMenuItem.Text = "E&xit";
this.ExitMenuItem.Click += new System.EventHandler(this.ExitMenuItem_Click); this.ExitMenuItem.Click += new System.EventHandler(this.ExitMenuItem_Click);
// //
@ -238,7 +238,7 @@
this.toolStripSeparator4, this.toolStripSeparator4,
this.TurboWhileBottingMenuItem}); this.TurboWhileBottingMenuItem});
this.OptionsSubMenu.Name = "OptionsSubMenu"; this.OptionsSubMenu.Name = "OptionsSubMenu";
this.OptionsSubMenu.Size = new System.Drawing.Size(61, 20); this.OptionsSubMenu.Size = new System.Drawing.Size(56, 20);
this.OptionsSubMenu.Text = "&Options"; this.OptionsSubMenu.Text = "&Options";
this.OptionsSubMenu.DropDownOpened += new System.EventHandler(this.OptionsSubMenu_DropDownOpened); this.OptionsSubMenu.DropDownOpened += new System.EventHandler(this.OptionsSubMenu_DropDownOpened);
// //
@ -247,14 +247,14 @@
this.MemoryDomainsMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.MemoryDomainsMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.toolStripSeparator3}); this.toolStripSeparator3});
this.MemoryDomainsMenuItem.Name = "MemoryDomainsMenuItem"; this.MemoryDomainsMenuItem.Name = "MemoryDomainsMenuItem";
this.MemoryDomainsMenuItem.Size = new System.Drawing.Size(181, 22); this.MemoryDomainsMenuItem.Size = new System.Drawing.Size(168, 22);
this.MemoryDomainsMenuItem.Text = "Memory Domains"; this.MemoryDomainsMenuItem.Text = "Memory Domains";
this.MemoryDomainsMenuItem.DropDownOpened += new System.EventHandler(this.MemoryDomainsMenuItem_DropDownOpened); this.MemoryDomainsMenuItem.DropDownOpened += new System.EventHandler(this.MemoryDomainsMenuItem_DropDownOpened);
// //
// toolStripSeparator3 // toolStripSeparator3
// //
this.toolStripSeparator3.Name = "toolStripSeparator3"; this.toolStripSeparator3.Name = "toolStripSeparator3";
this.toolStripSeparator3.Size = new System.Drawing.Size(57, 6); this.toolStripSeparator3.Size = new System.Drawing.Size(149, 6);
// //
// DataSizeMenuItem // DataSizeMenuItem
// //
@ -263,47 +263,47 @@
this._2ByteMenuItem, this._2ByteMenuItem,
this._4ByteMenuItem}); this._4ByteMenuItem});
this.DataSizeMenuItem.Name = "DataSizeMenuItem"; this.DataSizeMenuItem.Name = "DataSizeMenuItem";
this.DataSizeMenuItem.Size = new System.Drawing.Size(181, 22); this.DataSizeMenuItem.Size = new System.Drawing.Size(168, 22);
this.DataSizeMenuItem.Text = "Data Size"; this.DataSizeMenuItem.Text = "Data Size";
this.DataSizeMenuItem.DropDownOpened += new System.EventHandler(this.DataSizeMenuItem_DropDownOpened); this.DataSizeMenuItem.DropDownOpened += new System.EventHandler(this.DataSizeMenuItem_DropDownOpened);
// //
// _1ByteMenuItem // _1ByteMenuItem
// //
this._1ByteMenuItem.Name = "_1ByteMenuItem"; this._1ByteMenuItem.Name = "_1ByteMenuItem";
this._1ByteMenuItem.Size = new System.Drawing.Size(111, 22); this._1ByteMenuItem.Size = new System.Drawing.Size(110, 22);
this._1ByteMenuItem.Text = "1 Byte"; this._1ByteMenuItem.Text = "1 Byte";
this._1ByteMenuItem.Click += new System.EventHandler(this._1ByteMenuItem_Click); this._1ByteMenuItem.Click += new System.EventHandler(this._1ByteMenuItem_Click);
// //
// _2ByteMenuItem // _2ByteMenuItem
// //
this._2ByteMenuItem.Name = "_2ByteMenuItem"; this._2ByteMenuItem.Name = "_2ByteMenuItem";
this._2ByteMenuItem.Size = new System.Drawing.Size(111, 22); this._2ByteMenuItem.Size = new System.Drawing.Size(110, 22);
this._2ByteMenuItem.Text = "2 Bytes"; this._2ByteMenuItem.Text = "2 Bytes";
this._2ByteMenuItem.Click += new System.EventHandler(this._2ByteMenuItem_Click); this._2ByteMenuItem.Click += new System.EventHandler(this._2ByteMenuItem_Click);
// //
// _4ByteMenuItem // _4ByteMenuItem
// //
this._4ByteMenuItem.Name = "_4ByteMenuItem"; this._4ByteMenuItem.Name = "_4ByteMenuItem";
this._4ByteMenuItem.Size = new System.Drawing.Size(111, 22); this._4ByteMenuItem.Size = new System.Drawing.Size(110, 22);
this._4ByteMenuItem.Text = "4 Bytes"; this._4ByteMenuItem.Text = "4 Bytes";
this._4ByteMenuItem.Click += new System.EventHandler(this._4ByteMenuItem_Click); this._4ByteMenuItem.Click += new System.EventHandler(this._4ByteMenuItem_Click);
// //
// BigEndianMenuItem // BigEndianMenuItem
// //
this.BigEndianMenuItem.Name = "BigEndianMenuItem"; this.BigEndianMenuItem.Name = "BigEndianMenuItem";
this.BigEndianMenuItem.Size = new System.Drawing.Size(181, 22); this.BigEndianMenuItem.Size = new System.Drawing.Size(168, 22);
this.BigEndianMenuItem.Text = "Big Endian"; this.BigEndianMenuItem.Text = "Big Endian";
this.BigEndianMenuItem.Click += new System.EventHandler(this.BigEndianMenuItem_Click); this.BigEndianMenuItem.Click += new System.EventHandler(this.BigEndianMenuItem_Click);
// //
// toolStripSeparator4 // toolStripSeparator4
// //
this.toolStripSeparator4.Name = "toolStripSeparator4"; this.toolStripSeparator4.Name = "toolStripSeparator4";
this.toolStripSeparator4.Size = new System.Drawing.Size(178, 6); this.toolStripSeparator4.Size = new System.Drawing.Size(165, 6);
// //
// TurboWhileBottingMenuItem // TurboWhileBottingMenuItem
// //
this.TurboWhileBottingMenuItem.Name = "TurboWhileBottingMenuItem"; this.TurboWhileBottingMenuItem.Name = "TurboWhileBottingMenuItem";
this.TurboWhileBottingMenuItem.Size = new System.Drawing.Size(181, 22); this.TurboWhileBottingMenuItem.Size = new System.Drawing.Size(168, 22);
this.TurboWhileBottingMenuItem.Text = "Turbo While Botting"; this.TurboWhileBottingMenuItem.Text = "Turbo While Botting";
this.TurboWhileBottingMenuItem.Click += new System.EventHandler(this.TurboWhileBottingMenuItem_Click); this.TurboWhileBottingMenuItem.Click += new System.EventHandler(this.TurboWhileBottingMenuItem_Click);
// //
@ -326,7 +326,7 @@
this.MessageLabel}); this.MessageLabel});
this.BotStatusStrip.Location = new System.Drawing.Point(0, 565); this.BotStatusStrip.Location = new System.Drawing.Point(0, 565);
this.BotStatusStrip.Name = "BotStatusStrip"; this.BotStatusStrip.Name = "BotStatusStrip";
this.BotStatusStrip.Size = new System.Drawing.Size(687, 22); this.BotStatusStrip.Size = new System.Drawing.Size(707, 22);
this.BotStatusStrip.TabIndex = 2; this.BotStatusStrip.TabIndex = 2;
this.BotStatusStrip.Text = "statusStrip1"; this.BotStatusStrip.Text = "statusStrip1";
// //
@ -355,7 +355,7 @@
this.ControlsBox.Controls.Add(this.ControlProbabilityPanel); this.ControlsBox.Controls.Add(this.ControlProbabilityPanel);
this.ControlsBox.Location = new System.Drawing.Point(12, 183); this.ControlsBox.Location = new System.Drawing.Point(12, 183);
this.ControlsBox.Name = "ControlsBox"; this.ControlsBox.Name = "ControlsBox";
this.ControlsBox.Size = new System.Drawing.Size(422, 369); this.ControlsBox.Size = new System.Drawing.Size(442, 369);
this.ControlsBox.TabIndex = 3; this.ControlsBox.TabIndex = 3;
this.ControlsBox.TabStop = false; this.ControlsBox.TabStop = false;
this.ControlsBox.Text = "Controls"; this.ControlsBox.Text = "Controls";
@ -368,7 +368,7 @@
this.ControlProbabilityPanel.AutoScroll = true; this.ControlProbabilityPanel.AutoScroll = true;
this.ControlProbabilityPanel.Location = new System.Drawing.Point(6, 19); this.ControlProbabilityPanel.Location = new System.Drawing.Point(6, 19);
this.ControlProbabilityPanel.Name = "ControlProbabilityPanel"; this.ControlProbabilityPanel.Name = "ControlProbabilityPanel";
this.ControlProbabilityPanel.Size = new System.Drawing.Size(410, 350); this.ControlProbabilityPanel.Size = new System.Drawing.Size(430, 350);
this.ControlProbabilityPanel.TabIndex = 0; this.ControlProbabilityPanel.TabIndex = 0;
// //
// BestGroupBox // BestGroupBox
@ -388,7 +388,7 @@
this.BestGroupBox.Controls.Add(this.label15); this.BestGroupBox.Controls.Add(this.label15);
this.BestGroupBox.Controls.Add(this.label14); this.BestGroupBox.Controls.Add(this.label14);
this.BestGroupBox.Controls.Add(this.label13); this.BestGroupBox.Controls.Add(this.label13);
this.BestGroupBox.Location = new System.Drawing.Point(441, 183); this.BestGroupBox.Location = new System.Drawing.Point(461, 183);
this.BestGroupBox.Name = "BestGroupBox"; this.BestGroupBox.Name = "BestGroupBox";
this.BestGroupBox.Size = new System.Drawing.Size(230, 369); this.BestGroupBox.Size = new System.Drawing.Size(230, 369);
this.BestGroupBox.TabIndex = 4; this.BestGroupBox.TabIndex = 4;
@ -591,7 +591,7 @@
this.GoalGroupBox.Controls.Add(this.panel6); this.GoalGroupBox.Controls.Add(this.panel6);
this.GoalGroupBox.Location = new System.Drawing.Point(12, 27); this.GoalGroupBox.Location = new System.Drawing.Point(12, 27);
this.GoalGroupBox.Name = "GoalGroupBox"; this.GoalGroupBox.Name = "GoalGroupBox";
this.GoalGroupBox.Size = new System.Drawing.Size(422, 150); this.GoalGroupBox.Size = new System.Drawing.Size(442, 150);
this.GoalGroupBox.TabIndex = 9; this.GoalGroupBox.TabIndex = 9;
this.GoalGroupBox.TabStop = false; this.GoalGroupBox.TabStop = false;
this.GoalGroupBox.Text = " "; this.GoalGroupBox.Text = " ";
@ -643,13 +643,13 @@
this.panel3.Controls.Add(this.maximizeLabeltext); this.panel3.Controls.Add(this.maximizeLabeltext);
this.panel3.Location = new System.Drawing.Point(9, 51); this.panel3.Location = new System.Drawing.Point(9, 51);
this.panel3.Name = "panel3"; this.panel3.Name = "panel3";
this.panel3.Size = new System.Drawing.Size(407, 26); this.panel3.Size = new System.Drawing.Size(427, 26);
this.panel3.TabIndex = 0; this.panel3.TabIndex = 0;
// //
// MainValueNumeric // MainValueNumeric
// //
this.MainValueNumeric.Enabled = false; this.MainValueNumeric.Enabled = false;
this.MainValueNumeric.Location = new System.Drawing.Point(336, 4); this.MainValueNumeric.Location = new System.Drawing.Point(357, 4);
this.MainValueNumeric.Maximum = new decimal(new int[] { this.MainValueNumeric.Maximum = new decimal(new int[] {
100000, 100000,
0, 0,
@ -668,7 +668,7 @@
// MainValueRadio // MainValueRadio
// //
this.MainValueRadio.AutoSize = true; this.MainValueRadio.AutoSize = true;
this.MainValueRadio.Location = new System.Drawing.Point(281, 6); this.MainValueRadio.Location = new System.Drawing.Point(302, 6);
this.MainValueRadio.Name = "MainValueRadio"; this.MainValueRadio.Name = "MainValueRadio";
this.MainValueRadio.Size = new System.Drawing.Size(52, 17); this.MainValueRadio.Size = new System.Drawing.Size(52, 17);
this.MainValueRadio.TabIndex = 1012; this.MainValueRadio.TabIndex = 1012;
@ -680,7 +680,7 @@
// //
this.MainBestRadio.AutoSize = true; this.MainBestRadio.AutoSize = true;
this.MainBestRadio.Checked = true; this.MainBestRadio.Checked = true;
this.MainBestRadio.Location = new System.Drawing.Point(235, 6); this.MainBestRadio.Location = new System.Drawing.Point(256, 6);
this.MainBestRadio.Name = "MainBestRadio"; this.MainBestRadio.Name = "MainBestRadio";
this.MainBestRadio.Size = new System.Drawing.Size(46, 17); this.MainBestRadio.Size = new System.Drawing.Size(46, 17);
this.MainBestRadio.TabIndex = 1011; this.MainBestRadio.TabIndex = 1011;
@ -699,7 +699,7 @@
"=", "=",
"<=", "<=",
"<"}); "<"});
this.MainOperator.Location = new System.Drawing.Point(187, 3); this.MainOperator.Location = new System.Drawing.Point(208, 3);
this.MainOperator.Name = "MainOperator"; this.MainOperator.Name = "MainOperator";
this.MainOperator.Size = new System.Drawing.Size(40, 21); this.MainOperator.Size = new System.Drawing.Size(40, 21);
this.MainOperator.TabIndex = 1010; this.MainOperator.TabIndex = 1010;
@ -721,7 +721,7 @@
this.MaximizeAddressBox.Location = new System.Drawing.Point(133, 4); this.MaximizeAddressBox.Location = new System.Drawing.Point(133, 4);
this.MaximizeAddressBox.Name = "MaximizeAddressBox"; this.MaximizeAddressBox.Name = "MaximizeAddressBox";
this.MaximizeAddressBox.Nullable = true; this.MaximizeAddressBox.Nullable = true;
this.MaximizeAddressBox.Size = new System.Drawing.Size(47, 20); this.MaximizeAddressBox.Size = new System.Drawing.Size(67, 20);
this.MaximizeAddressBox.TabIndex = 1009; this.MaximizeAddressBox.TabIndex = 1009;
// //
// maximizeLabeltext // maximizeLabeltext
@ -744,13 +744,13 @@
this.panel4.Controls.Add(this.label10); this.panel4.Controls.Add(this.label10);
this.panel4.Location = new System.Drawing.Point(9, 74); this.panel4.Location = new System.Drawing.Point(9, 74);
this.panel4.Name = "panel4"; this.panel4.Name = "panel4";
this.panel4.Size = new System.Drawing.Size(407, 26); this.panel4.Size = new System.Drawing.Size(427, 26);
this.panel4.TabIndex = 1; this.panel4.TabIndex = 1;
// //
// TieBreak1Numeric // TieBreak1Numeric
// //
this.TieBreak1Numeric.Enabled = false; this.TieBreak1Numeric.Enabled = false;
this.TieBreak1Numeric.Location = new System.Drawing.Point(336, 4); this.TieBreak1Numeric.Location = new System.Drawing.Point(357, 4);
this.TieBreak1Numeric.Maximum = new decimal(new int[] { this.TieBreak1Numeric.Maximum = new decimal(new int[] {
100000, 100000,
0, 0,
@ -769,7 +769,7 @@
// TieBreak1ValueRadio // TieBreak1ValueRadio
// //
this.TieBreak1ValueRadio.AutoSize = true; this.TieBreak1ValueRadio.AutoSize = true;
this.TieBreak1ValueRadio.Location = new System.Drawing.Point(281, 6); this.TieBreak1ValueRadio.Location = new System.Drawing.Point(302, 6);
this.TieBreak1ValueRadio.Name = "TieBreak1ValueRadio"; this.TieBreak1ValueRadio.Name = "TieBreak1ValueRadio";
this.TieBreak1ValueRadio.Size = new System.Drawing.Size(52, 17); this.TieBreak1ValueRadio.Size = new System.Drawing.Size(52, 17);
this.TieBreak1ValueRadio.TabIndex = 1012; this.TieBreak1ValueRadio.TabIndex = 1012;
@ -787,7 +787,7 @@
"=", "=",
"<=", "<=",
"<"}); "<"});
this.Tiebreak1Operator.Location = new System.Drawing.Point(187, 3); this.Tiebreak1Operator.Location = new System.Drawing.Point(208, 3);
this.Tiebreak1Operator.Name = "Tiebreak1Operator"; this.Tiebreak1Operator.Name = "Tiebreak1Operator";
this.Tiebreak1Operator.Size = new System.Drawing.Size(40, 21); this.Tiebreak1Operator.Size = new System.Drawing.Size(40, 21);
this.Tiebreak1Operator.TabIndex = 1007; this.Tiebreak1Operator.TabIndex = 1007;
@ -796,7 +796,7 @@
// //
this.TieBreak1BestRadio.AutoSize = true; this.TieBreak1BestRadio.AutoSize = true;
this.TieBreak1BestRadio.Checked = true; this.TieBreak1BestRadio.Checked = true;
this.TieBreak1BestRadio.Location = new System.Drawing.Point(235, 6); this.TieBreak1BestRadio.Location = new System.Drawing.Point(256, 6);
this.TieBreak1BestRadio.Name = "TieBreak1BestRadio"; this.TieBreak1BestRadio.Name = "TieBreak1BestRadio";
this.TieBreak1BestRadio.Size = new System.Drawing.Size(46, 17); this.TieBreak1BestRadio.Size = new System.Drawing.Size(46, 17);
this.TieBreak1BestRadio.TabIndex = 1011; this.TieBreak1BestRadio.TabIndex = 1011;
@ -822,7 +822,7 @@
this.TieBreaker1Box.Location = new System.Drawing.Point(133, 4); this.TieBreaker1Box.Location = new System.Drawing.Point(133, 4);
this.TieBreaker1Box.Name = "TieBreaker1Box"; this.TieBreaker1Box.Name = "TieBreaker1Box";
this.TieBreaker1Box.Nullable = true; this.TieBreaker1Box.Nullable = true;
this.TieBreaker1Box.Size = new System.Drawing.Size(47, 20); this.TieBreaker1Box.Size = new System.Drawing.Size(67, 20);
this.TieBreaker1Box.TabIndex = 1002; this.TieBreaker1Box.TabIndex = 1002;
// //
// label10 // label10
@ -845,13 +845,13 @@
this.panel5.Controls.Add(this.TieBreaker2Box); this.panel5.Controls.Add(this.TieBreaker2Box);
this.panel5.Location = new System.Drawing.Point(9, 97); this.panel5.Location = new System.Drawing.Point(9, 97);
this.panel5.Name = "panel5"; this.panel5.Name = "panel5";
this.panel5.Size = new System.Drawing.Size(407, 26); this.panel5.Size = new System.Drawing.Size(427, 26);
this.panel5.TabIndex = 2; this.panel5.TabIndex = 2;
// //
// TieBreak2Numeric // TieBreak2Numeric
// //
this.TieBreak2Numeric.Enabled = false; this.TieBreak2Numeric.Enabled = false;
this.TieBreak2Numeric.Location = new System.Drawing.Point(336, 4); this.TieBreak2Numeric.Location = new System.Drawing.Point(357, 4);
this.TieBreak2Numeric.Maximum = new decimal(new int[] { this.TieBreak2Numeric.Maximum = new decimal(new int[] {
100000, 100000,
0, 0,
@ -877,7 +877,7 @@
"=", "=",
"<=", "<=",
"<"}); "<"});
this.Tiebreak2Operator.Location = new System.Drawing.Point(187, 3); this.Tiebreak2Operator.Location = new System.Drawing.Point(208, 3);
this.Tiebreak2Operator.Name = "Tiebreak2Operator"; this.Tiebreak2Operator.Name = "Tiebreak2Operator";
this.Tiebreak2Operator.Size = new System.Drawing.Size(40, 21); this.Tiebreak2Operator.Size = new System.Drawing.Size(40, 21);
this.Tiebreak2Operator.TabIndex = 1008; this.Tiebreak2Operator.TabIndex = 1008;
@ -885,7 +885,7 @@
// TieBreak2ValueRadio // TieBreak2ValueRadio
// //
this.TieBreak2ValueRadio.AutoSize = true; this.TieBreak2ValueRadio.AutoSize = true;
this.TieBreak2ValueRadio.Location = new System.Drawing.Point(281, 6); this.TieBreak2ValueRadio.Location = new System.Drawing.Point(302, 6);
this.TieBreak2ValueRadio.Name = "TieBreak2ValueRadio"; this.TieBreak2ValueRadio.Name = "TieBreak2ValueRadio";
this.TieBreak2ValueRadio.Size = new System.Drawing.Size(52, 17); this.TieBreak2ValueRadio.Size = new System.Drawing.Size(52, 17);
this.TieBreak2ValueRadio.TabIndex = 1012; this.TieBreak2ValueRadio.TabIndex = 1012;
@ -897,7 +897,7 @@
// //
this.TieBreak2BestRadio.AutoSize = true; this.TieBreak2BestRadio.AutoSize = true;
this.TieBreak2BestRadio.Checked = true; this.TieBreak2BestRadio.Checked = true;
this.TieBreak2BestRadio.Location = new System.Drawing.Point(235, 6); this.TieBreak2BestRadio.Location = new System.Drawing.Point(256, 6);
this.TieBreak2BestRadio.Name = "TieBreak2BestRadio"; this.TieBreak2BestRadio.Name = "TieBreak2BestRadio";
this.TieBreak2BestRadio.Size = new System.Drawing.Size(46, 17); this.TieBreak2BestRadio.Size = new System.Drawing.Size(46, 17);
this.TieBreak2BestRadio.TabIndex = 1011; this.TieBreak2BestRadio.TabIndex = 1011;
@ -932,7 +932,7 @@
this.TieBreaker2Box.Location = new System.Drawing.Point(133, 4); this.TieBreaker2Box.Location = new System.Drawing.Point(133, 4);
this.TieBreaker2Box.Name = "TieBreaker2Box"; this.TieBreaker2Box.Name = "TieBreaker2Box";
this.TieBreaker2Box.Nullable = true; this.TieBreaker2Box.Nullable = true;
this.TieBreaker2Box.Size = new System.Drawing.Size(47, 20); this.TieBreaker2Box.Size = new System.Drawing.Size(67, 20);
this.TieBreaker2Box.TabIndex = 1003; this.TieBreaker2Box.TabIndex = 1003;
// //
// panel6 // panel6
@ -946,7 +946,7 @@
this.panel6.Controls.Add(this.Tiebreak3Operator); this.panel6.Controls.Add(this.Tiebreak3Operator);
this.panel6.Location = new System.Drawing.Point(9, 120); this.panel6.Location = new System.Drawing.Point(9, 120);
this.panel6.Name = "panel6"; this.panel6.Name = "panel6";
this.panel6.Size = new System.Drawing.Size(407, 26); this.panel6.Size = new System.Drawing.Size(427, 26);
this.panel6.TabIndex = 3; this.panel6.TabIndex = 3;
// //
// label12 // label12
@ -975,13 +975,13 @@
this.TieBreaker3Box.Location = new System.Drawing.Point(133, 4); this.TieBreaker3Box.Location = new System.Drawing.Point(133, 4);
this.TieBreaker3Box.Name = "TieBreaker3Box"; this.TieBreaker3Box.Name = "TieBreaker3Box";
this.TieBreaker3Box.Nullable = true; this.TieBreaker3Box.Nullable = true;
this.TieBreaker3Box.Size = new System.Drawing.Size(47, 20); this.TieBreaker3Box.Size = new System.Drawing.Size(67, 20);
this.TieBreaker3Box.TabIndex = 1016; this.TieBreaker3Box.TabIndex = 1016;
// //
// TieBreak3Numeric // TieBreak3Numeric
// //
this.TieBreak3Numeric.Enabled = false; this.TieBreak3Numeric.Enabled = false;
this.TieBreak3Numeric.Location = new System.Drawing.Point(336, 4); this.TieBreak3Numeric.Location = new System.Drawing.Point(357, 4);
this.TieBreak3Numeric.Maximum = new decimal(new int[] { this.TieBreak3Numeric.Maximum = new decimal(new int[] {
100000, 100000,
0, 0,
@ -1000,7 +1000,7 @@
// TieBreak3ValueRadio // TieBreak3ValueRadio
// //
this.TieBreak3ValueRadio.AutoSize = true; this.TieBreak3ValueRadio.AutoSize = true;
this.TieBreak3ValueRadio.Location = new System.Drawing.Point(281, 6); this.TieBreak3ValueRadio.Location = new System.Drawing.Point(302, 6);
this.TieBreak3ValueRadio.Name = "TieBreak3ValueRadio"; this.TieBreak3ValueRadio.Name = "TieBreak3ValueRadio";
this.TieBreak3ValueRadio.Size = new System.Drawing.Size(52, 17); this.TieBreak3ValueRadio.Size = new System.Drawing.Size(52, 17);
this.TieBreak3ValueRadio.TabIndex = 1012; this.TieBreak3ValueRadio.TabIndex = 1012;
@ -1012,7 +1012,7 @@
// //
this.TieBreak3BestRadio.AutoSize = true; this.TieBreak3BestRadio.AutoSize = true;
this.TieBreak3BestRadio.Checked = true; this.TieBreak3BestRadio.Checked = true;
this.TieBreak3BestRadio.Location = new System.Drawing.Point(235, 6); this.TieBreak3BestRadio.Location = new System.Drawing.Point(256, 6);
this.TieBreak3BestRadio.Name = "TieBreak3BestRadio"; this.TieBreak3BestRadio.Name = "TieBreak3BestRadio";
this.TieBreak3BestRadio.Size = new System.Drawing.Size(46, 17); this.TieBreak3BestRadio.Size = new System.Drawing.Size(46, 17);
this.TieBreak3BestRadio.TabIndex = 1011; this.TieBreak3BestRadio.TabIndex = 1011;
@ -1031,7 +1031,7 @@
"=", "=",
"<=", "<=",
"<"}); "<"});
this.Tiebreak3Operator.Location = new System.Drawing.Point(187, 3); this.Tiebreak3Operator.Location = new System.Drawing.Point(208, 3);
this.Tiebreak3Operator.Name = "Tiebreak3Operator"; this.Tiebreak3Operator.Name = "Tiebreak3Operator";
this.Tiebreak3Operator.Size = new System.Drawing.Size(40, 21); this.Tiebreak3Operator.Size = new System.Drawing.Size(40, 21);
this.Tiebreak3Operator.TabIndex = 1017; this.Tiebreak3Operator.TabIndex = 1017;
@ -1086,7 +1086,7 @@
this.ControlGroupBox.Controls.Add(this.RunBtn); this.ControlGroupBox.Controls.Add(this.RunBtn);
this.ControlGroupBox.Controls.Add(this.StartFromSlotBox); this.ControlGroupBox.Controls.Add(this.StartFromSlotBox);
this.ControlGroupBox.Controls.Add(this.label8); this.ControlGroupBox.Controls.Add(this.label8);
this.ControlGroupBox.Location = new System.Drawing.Point(440, 27); this.ControlGroupBox.Location = new System.Drawing.Point(460, 27);
this.ControlGroupBox.Name = "ControlGroupBox"; this.ControlGroupBox.Name = "ControlGroupBox";
this.ControlGroupBox.Size = new System.Drawing.Size(230, 150); this.ControlGroupBox.Size = new System.Drawing.Size(230, 150);
this.ControlGroupBox.TabIndex = 2004; this.ControlGroupBox.TabIndex = 2004;
@ -1110,12 +1110,12 @@
this.StatsContextMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.StatsContextMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.ClearStatsContextMenuItem}); this.ClearStatsContextMenuItem});
this.StatsContextMenu.Name = "StatsContextMenu"; this.StatsContextMenu.Name = "StatsContextMenu";
this.StatsContextMenu.Size = new System.Drawing.Size(102, 26); this.StatsContextMenu.Size = new System.Drawing.Size(100, 26);
// //
// ClearStatsContextMenuItem // ClearStatsContextMenuItem
// //
this.ClearStatsContextMenuItem.Name = "ClearStatsContextMenuItem"; this.ClearStatsContextMenuItem.Name = "ClearStatsContextMenuItem";
this.ClearStatsContextMenuItem.Size = new System.Drawing.Size(101, 22); this.ClearStatsContextMenuItem.Size = new System.Drawing.Size(99, 22);
this.ClearStatsContextMenuItem.Text = "&Clear"; this.ClearStatsContextMenuItem.Text = "&Clear";
this.ClearStatsContextMenuItem.Click += new System.EventHandler(this.ClearStatsContextMenuItem_Click); this.ClearStatsContextMenuItem.Click += new System.EventHandler(this.ClearStatsContextMenuItem_Click);
// //
@ -1125,7 +1125,7 @@
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.AutoSize = true; this.AutoSize = true;
this.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; this.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
this.ClientSize = new System.Drawing.Size(687, 587); this.ClientSize = new System.Drawing.Size(707, 587);
this.Controls.Add(this.ControlGroupBox); this.Controls.Add(this.ControlGroupBox);
this.Controls.Add(this.GoalGroupBox); this.Controls.Add(this.GoalGroupBox);
this.Controls.Add(this.BestGroupBox); this.Controls.Add(this.BestGroupBox);

13
BizHawk.Client.EmuHawk/tools/BasicBot/BasicBot.cs
View File

@ -821,10 +821,10 @@ namespace BizHawk.Client.EmuHawk
private void SetupControlsAndProperties() private void SetupControlsAndProperties()
{ {
MaximizeAddressBox.SetHexProperties(MemoryDomains.MainMemory.Size); MaximizeAddressBox.SetHexProperties(_currentDomain.Size);
TieBreaker1Box.SetHexProperties(MemoryDomains.MainMemory.Size); TieBreaker1Box.SetHexProperties(_currentDomain.Size);
TieBreaker2Box.SetHexProperties(MemoryDomains.MainMemory.Size); TieBreaker2Box.SetHexProperties(_currentDomain.Size);
TieBreaker3Box.SetHexProperties(MemoryDomains.MainMemory.Size); TieBreaker3Box.SetHexProperties(_currentDomain.Size);
StartFromSlotBox.SelectedIndex = 0; StartFromSlotBox.SelectedIndex = 0;
@ -864,6 +864,11 @@ namespace BizHawk.Client.EmuHawk
{ {
_currentDomain = MemoryDomains[name]; _currentDomain = MemoryDomains[name];
_bigEndian = MemoryDomains[name].EndianType == MemoryDomain.Endian.Big; _bigEndian = MemoryDomains[name].EndianType == MemoryDomain.Endian.Big;
MaximizeAddressBox.SetHexProperties(_currentDomain.Size);
TieBreaker1Box.SetHexProperties(_currentDomain.Size);
TieBreaker2Box.SetHexProperties(_currentDomain.Size);
TieBreaker3Box.SetHexProperties(_currentDomain.Size);
} }
private int GetRamvalue(int addr) private int GetRamvalue(int addr)