diff --git a/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj b/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
index f1ead2c24e..b9f57f746c 100644
--- a/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
+++ b/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
@@ -785,12 +785,6 @@
-
- Form
-
-
- AutoHawk.cs
-
Form
@@ -1552,9 +1546,6 @@
RomStatusPicker.cs
-
- AutoHawk.cs
-
BasicBot.cs
diff --git a/BizHawk.Client.EmuHawk/MainForm.Designer.cs b/BizHawk.Client.EmuHawk/MainForm.Designer.cs
index 0d8d91dfff..af23e02304 100644
--- a/BizHawk.Client.EmuHawk/MainForm.Designer.cs
+++ b/BizHawk.Client.EmuHawk/MainForm.Designer.cs
@@ -234,7 +234,6 @@
this.dummyExternalTool = new System.Windows.Forms.ToolStripMenuItem();
this.batchRunnerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.ExperimentalToolsSubMenu = new System.Windows.Forms.ToolStripMenuItem();
- this.AutoHawkMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.NewHexEditorMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.NESSubMenu = new System.Windows.Forms.ToolStripMenuItem();
this.coreToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -2265,20 +2264,12 @@
// ExperimentalToolsSubMenu
//
this.ExperimentalToolsSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
- this.AutoHawkMenuItem,
this.NewHexEditorMenuItem});
this.ExperimentalToolsSubMenu.Name = "ExperimentalToolsSubMenu";
this.ExperimentalToolsSubMenu.Size = new System.Drawing.Size(191, 22);
this.ExperimentalToolsSubMenu.Text = "Experimental Tools";
this.ExperimentalToolsSubMenu.DropDownOpened += new System.EventHandler(this.ExperimentalToolsSubMenu_DropDownOpened);
//
- // AutoHawkMenuItem
- //
- this.AutoHawkMenuItem.Name = "AutoHawkMenuItem";
- this.AutoHawkMenuItem.Size = new System.Drawing.Size(155, 22);
- this.AutoHawkMenuItem.Text = "AutoHawk";
- this.AutoHawkMenuItem.Click += new System.EventHandler(this.AutoHawkMenuItem_Click);
- //
// NewHexEditorMenuItem
//
this.NewHexEditorMenuItem.Name = "NewHexEditorMenuItem";
@@ -4748,7 +4739,6 @@
private System.Windows.Forms.ToolStripMenuItem dummyExternalTool;
private System.Windows.Forms.ToolStripMenuItem RecordAVMenuItem;
private System.Windows.Forms.ToolStripMenuItem ExperimentalToolsSubMenu;
- private System.Windows.Forms.ToolStripMenuItem AutoHawkMenuItem;
private System.Windows.Forms.ToolStripMenuItem NewHexEditorMenuItem;
private System.Windows.Forms.ToolStripMenuItem SaveConfigAsMenuItem;
private System.Windows.Forms.ToolStripMenuItem LoadConfigFromMenuItem;
diff --git a/BizHawk.Client.EmuHawk/MainForm.Events.cs b/BizHawk.Client.EmuHawk/MainForm.Events.cs
index fb13ec3eeb..6ac855a1ee 100644
--- a/BizHawk.Client.EmuHawk/MainForm.Events.cs
+++ b/BizHawk.Client.EmuHawk/MainForm.Events.cs
@@ -1414,7 +1414,6 @@ namespace BizHawk.Client.EmuHawk
private void ExperimentalToolsSubMenu_DropDownOpened(object sender, EventArgs e)
{
- AutoHawkMenuItem.Enabled = GlobalWin.Tools.IsAvailable();
NewHexEditorMenuItem.Enabled = GlobalWin.Tools.IsAvailable();
}
@@ -1511,11 +1510,6 @@ namespace BizHawk.Client.EmuHawk
new BatchRun().ShowDialog();
}
- private void AutoHawkMenuItem_Click(object sender, EventArgs e)
- {
- GlobalWin.Tools.Load();
- }
-
private void NewHexEditorMenuItem_Click(object sender, EventArgs e)
{
GlobalWin.Tools.Load();
diff --git a/BizHawk.Client.EmuHawk/tools/AutoHawk.Designer.cs b/BizHawk.Client.EmuHawk/tools/AutoHawk.Designer.cs
deleted file mode 100644
index 5054e0208c..0000000000
--- a/BizHawk.Client.EmuHawk/tools/AutoHawk.Designer.cs
+++ /dev/null
@@ -1,86 +0,0 @@
-namespace BizHawk.Client.EmuHawk
-{
- partial class AutoHawk
- {
- ///
- /// Required designer variable.
- ///
- private System.ComponentModel.IContainer components = null;
-
- ///
- /// Clean up any resources being used.
- ///
- /// true if managed resources should be disposed; otherwise, false.
- protected override void Dispose(bool disposing)
- {
- if (disposing && (components != null))
- {
- components.Dispose();
- }
- base.Dispose(disposing);
- }
-
- #region Windows Form Designer generated code
-
- ///
- /// Required method for Designer support - do not modify
- /// the contents of this method with the code editor.
- ///
- private void InitializeComponent()
- {
- this.AutoMenu = new System.Windows.Forms.MenuStrip();
- this.FileSubMenu = new System.Windows.Forms.ToolStripMenuItem();
- this.ExitMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.AutoMenu.SuspendLayout();
- this.SuspendLayout();
- //
- // AutoMenu
- //
- this.AutoMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
- this.FileSubMenu});
- this.AutoMenu.Location = new System.Drawing.Point(0, 0);
- this.AutoMenu.Name = "AutoMenu";
- this.AutoMenu.Size = new System.Drawing.Size(508, 24);
- this.AutoMenu.TabIndex = 2;
- this.AutoMenu.Text = "menuStrip1";
- //
- // FileSubMenu
- //
- this.FileSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
- this.ExitMenuItem});
- this.FileSubMenu.Name = "FileSubMenu";
- this.FileSubMenu.Size = new System.Drawing.Size(37, 20);
- this.FileSubMenu.Text = "&File";
- //
- // ExitMenuItem
- //
- this.ExitMenuItem.Name = "ExitMenuItem";
- this.ExitMenuItem.Size = new System.Drawing.Size(152, 22);
- this.ExitMenuItem.Text = "E&xit";
- this.ExitMenuItem.Click += new System.EventHandler(this.ExitMenuItem_Click);
- //
- // AutoHawk
- //
- this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
- this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(508, 444);
- this.Controls.Add(this.AutoMenu);
- this.MainMenuStrip = this.AutoMenu;
- this.Name = "AutoHawk";
- this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
- this.Text = "AutoHawk";
- this.Load += new System.EventHandler(this.AutoHawk_Load);
- this.AutoMenu.ResumeLayout(false);
- this.AutoMenu.PerformLayout();
- this.ResumeLayout(false);
- this.PerformLayout();
-
- }
-
- #endregion
-
- private System.Windows.Forms.MenuStrip AutoMenu;
- private System.Windows.Forms.ToolStripMenuItem FileSubMenu;
- private System.Windows.Forms.ToolStripMenuItem ExitMenuItem;
- }
-}
\ No newline at end of file
diff --git a/BizHawk.Client.EmuHawk/tools/AutoHawk.cs b/BizHawk.Client.EmuHawk/tools/AutoHawk.cs
deleted file mode 100644
index c1674db0ee..0000000000
--- a/BizHawk.Client.EmuHawk/tools/AutoHawk.cs
+++ /dev/null
@@ -1,74 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Windows.Forms;
-
-using BizHawk.Emulation.Common;
-
-namespace BizHawk.Client.EmuHawk
-{
- [Tool(released: false, supportedSystems: null)]
- public partial class AutoHawk : Form, IToolFormAutoConfig
- {
- public AutoHawk()
- {
- InitializeComponent();
- }
-
- private void AutoHawk_Load(object sender, EventArgs e)
- {
-
- }
-
- [RequiredService]
- public IMemoryDomains MemoryDomains { get; set; }
-
- [RequiredService]
- public IStatable StatableCore { get; set; }
-
- [ConfigPersist]
- public ConfigVariables Config { get; set; }
-
- public class ConfigVariables
- {
- // anything that needs to be saved in config.ini should go here
- }
-
- #region IToolForm Implementation
-
- public void NewUpdate(ToolFormUpdateType type) { }
-
- public void UpdateValues()
- {
- // TODO: per frame stuff goes here
- }
-
- public void FastUpdate()
- {
- // TODO: when the user is turboing this will be called, slow things like updating graphics should be avoided, but critical operations must still be done here
- }
-
- public void Restart()
- {
- // When the user changes to a new ROM, closes a ROM, starts a movie, etc, this will be called
- }
-
- public bool UpdateBefore { get { return true; } }
-
- public bool AskSaveChanges()
- {
- return true;
- }
-
- #endregion
-
- private void ExitMenuItem_Click(object sender, EventArgs e)
- {
- Close();
- }
- }
-}
diff --git a/BizHawk.Client.EmuHawk/tools/AutoHawk.resx b/BizHawk.Client.EmuHawk/tools/AutoHawk.resx
deleted file mode 100644
index 435c368278..0000000000
--- a/BizHawk.Client.EmuHawk/tools/AutoHawk.resx
+++ /dev/null
@@ -1,123 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- text/microsoft-resx
-
-
- 2.0
-
-
- System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- 17, 17
-
-
\ No newline at end of file