Remove the nes debugger tool

This commit is contained in:
adelikat 2014-12-14 14:56:16 +00:00
parent 227fd64e60
commit 8648e6ba0a
10 changed files with 331 additions and 903 deletions

View File

@ -429,14 +429,6 @@ namespace BizHawk.Client.Common
public int NESPPURefreshRate = 4;
public bool NESPPUChrRomView = false;
// NESDebuger Settings
public bool AutoLoadNESDebugger = false;
public bool NESDebuggerSaveWindowPosition = true;
public int NESDebuggerWndx = -1;
public int NESDebuggerWndy = -1;
public int NESDebuggerWidth = -1;
public int NESDebuggerHeight = -1;
// NES NameTableViewer Settings
public ToolDialogSettings NesNameTableSettings = new ToolDialogSettings();
public bool AutoLoadNESNameTable = false;

View File

@ -801,12 +801,6 @@
<Compile Include="tools\NES\NameTableViewer.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="tools\NES\NESDebugger.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="tools\NES\NESDebugger.Designer.cs">
<DependentUpon>NESDebugger.cs</DependentUpon>
</Compile>
<Compile Include="tools\NES\NESGameGenie.cs">
<SubType>Form</SubType>
</Compile>
@ -1307,9 +1301,6 @@
<EmbeddedResource Include="tools\NES\BarcodeEntry.resx">
<DependentUpon>BarcodeEntry.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="tools\NES\NESDebugger.resx">
<DependentUpon>NESDebugger.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="tools\NES\NESGameGenie.resx">
<DependentUpon>NESGameGenie.cs</DependentUpon>
</EmbeddedResource>

File diff suppressed because it is too large Load Diff

View File

@ -1209,11 +1209,7 @@ namespace BizHawk.Client.EmuHawk
{
FDSControlsMenuItem.Enabled = Global.Emulator.BoardName == "FDS";
NESDebuggerMenuItem.Visible =
VersionInfo.DeveloperBuild;
NESDebuggerMenuItem.Enabled =
NESPPUViewerMenuItem.Enabled =
NESPPUViewerMenuItem.Enabled =
NESNametableViewerMenuItem.Enabled =
NESSoundChannelsMenuItem.Enabled =
MovieSettingsMenuItem.Enabled =
@ -1244,11 +1240,6 @@ namespace BizHawk.Client.EmuHawk
}
}
private void NESDebuggerMenuItem_Click(object sender, EventArgs e)
{
GlobalWin.Tools.Load<NESDebugger>();
}
private void NESPPUViewerMenuItem_Click(object sender, EventArgs e)
{
GlobalWin.Tools.Load<NesPPU>();

View File

@ -386,11 +386,6 @@ namespace BizHawk.Client.EmuHawk
GlobalWin.Tools.Load<NESNameTableViewer>();
}
if (Global.Config.AutoLoadNESDebugger)
{
GlobalWin.Tools.Load<NESDebugger>();
}
if (Global.Config.NESGGAutoload)
{
GlobalWin.Tools.LoadGameGenieEc();

View File

@ -1,183 +0,0 @@
namespace BizHawk.Client.EmuHawk
{
partial class NESDebugger
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Windows Form Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
{
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(NESDebugger));
this.DebugView = new BizHawk.Client.EmuHawk.VirtualListView();
this.Address = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.Instruction = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.menuStrip1 = new MenuStripEx();
this.fileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.exitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.debugToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.optionsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.autoloadToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.saveWindowPositionToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
this.restoreOriginalSizeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.menuStrip1.SuspendLayout();
this.SuspendLayout();
//
// DebugView
//
this.DebugView.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.DebugView.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
this.Address,
this.Instruction});
this.DebugView.GridLines = true;
this.DebugView.ItemCount = 0;
this.DebugView.Location = new System.Drawing.Point(12, 40);
this.DebugView.Name = "DebugView";
this.DebugView.selectedItem = -1;
this.DebugView.Size = new System.Drawing.Size(241, 351);
this.DebugView.TabIndex = 0;
this.DebugView.UseCompatibleStateImageBehavior = false;
this.DebugView.View = System.Windows.Forms.View.Details;
//
// Address
//
this.Address.Text = "Address";
this.Address.Width = 94;
//
// Instruction
//
this.Instruction.Text = "Instruction";
this.Instruction.Width = 143;
//
// menuStrip1
//
this.menuStrip1.ClickThrough = true;
this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.fileToolStripMenuItem,
this.debugToolStripMenuItem,
this.optionsToolStripMenuItem});
this.menuStrip1.Location = new System.Drawing.Point(0, 0);
this.menuStrip1.Name = "menuStrip1";
this.menuStrip1.Size = new System.Drawing.Size(470, 24);
this.menuStrip1.TabIndex = 1;
this.menuStrip1.Text = "menuStrip1";
//
// fileToolStripMenuItem
//
this.fileToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.exitToolStripMenuItem});
this.fileToolStripMenuItem.Name = "fileToolStripMenuItem";
this.fileToolStripMenuItem.Size = new System.Drawing.Size(37, 20);
this.fileToolStripMenuItem.Text = "&File";
//
// exitToolStripMenuItem
//
this.exitToolStripMenuItem.Name = "exitToolStripMenuItem";
this.exitToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.F4)));
this.exitToolStripMenuItem.Size = new System.Drawing.Size(134, 22);
this.exitToolStripMenuItem.Text = "E&xit";
this.exitToolStripMenuItem.Click += new System.EventHandler(this.exitToolStripMenuItem_Click);
//
// debugToolStripMenuItem
//
this.debugToolStripMenuItem.Name = "debugToolStripMenuItem";
this.debugToolStripMenuItem.Size = new System.Drawing.Size(54, 20);
this.debugToolStripMenuItem.Text = "&Debug";
//
// optionsToolStripMenuItem
//
this.optionsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.autoloadToolStripMenuItem,
this.saveWindowPositionToolStripMenuItem,
this.toolStripSeparator1,
this.restoreOriginalSizeToolStripMenuItem});
this.optionsToolStripMenuItem.Name = "optionsToolStripMenuItem";
this.optionsToolStripMenuItem.Size = new System.Drawing.Size(61, 20);
this.optionsToolStripMenuItem.Text = "&Options";
this.optionsToolStripMenuItem.DropDownOpened += new System.EventHandler(this.optionsToolStripMenuItem_DropDownOpened);
//
// autoloadToolStripMenuItem
//
this.autoloadToolStripMenuItem.Name = "autoloadToolStripMenuItem";
this.autoloadToolStripMenuItem.Size = new System.Drawing.Size(189, 22);
this.autoloadToolStripMenuItem.Text = "Autoload";
this.autoloadToolStripMenuItem.Click += new System.EventHandler(this.autoloadToolStripMenuItem_Click);
//
// saveWindowPositionToolStripMenuItem
//
this.saveWindowPositionToolStripMenuItem.Name = "saveWindowPositionToolStripMenuItem";
this.saveWindowPositionToolStripMenuItem.Size = new System.Drawing.Size(189, 22);
this.saveWindowPositionToolStripMenuItem.Text = "Save window position";
this.saveWindowPositionToolStripMenuItem.Click += new System.EventHandler(this.saveWindowPositionToolStripMenuItem_Click);
//
// toolStripSeparator1
//
this.toolStripSeparator1.Name = "toolStripSeparator1";
this.toolStripSeparator1.Size = new System.Drawing.Size(186, 6);
//
// restoreOriginalSizeToolStripMenuItem
//
this.restoreOriginalSizeToolStripMenuItem.Name = "restoreOriginalSizeToolStripMenuItem";
this.restoreOriginalSizeToolStripMenuItem.Size = new System.Drawing.Size(189, 22);
this.restoreOriginalSizeToolStripMenuItem.Text = "Restore Window Size";
this.restoreOriginalSizeToolStripMenuItem.Click += new System.EventHandler(this.restoreOriginalSizeToolStripMenuItem_Click);
//
// NESDebugger
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(470, 403);
this.Controls.Add(this.DebugView);
this.Controls.Add(this.menuStrip1);
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.MainMenuStrip = this.menuStrip1;
this.Name = "NESDebugger";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
this.Text = "NES Debugger";
this.Load += new System.EventHandler(this.NESDebugger_Load);
this.menuStrip1.ResumeLayout(false);
this.menuStrip1.PerformLayout();
this.ResumeLayout(false);
this.PerformLayout();
}
#endregion
private VirtualListView DebugView;
private System.Windows.Forms.ColumnHeader Address;
private System.Windows.Forms.ColumnHeader Instruction;
private MenuStripEx menuStrip1;
private System.Windows.Forms.ToolStripMenuItem fileToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem exitToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem debugToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem optionsToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem autoloadToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem saveWindowPositionToolStripMenuItem;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;
private System.Windows.Forms.ToolStripMenuItem restoreOriginalSizeToolStripMenuItem;
}
}

View File

@ -1,178 +0,0 @@
using System;
using System.Collections.Generic;
using System.Drawing;
using System.Windows.Forms;
using BizHawk.Emulation.Cores.Nintendo.NES;
using BizHawk.Client.Common;
namespace BizHawk.Client.EmuHawk
{
public partial class NESDebugger : Form, IToolForm
{
public IDictionary<Type, object> EmulatorServices { private get; set; }
private const int ADDR_MAX = 0xFFFF;
private const int DISASM_LINE_COUNT = 100;
private int defaultWidth; //For saving the default size of the dialog, so the user can restore if desired
private int defaultHeight;
private NES _nes;
private int pc;
private int addr;
private readonly List<DisasmOp> lines = new List<DisasmOp>();
private struct DisasmOp
{
public readonly int size;
public readonly string mnemonic;
public DisasmOp(int s, string m) { size = s; mnemonic = m; }
}
public bool AskSaveChanges() { return true; }
public bool UpdateBefore { get { return true; } }
public NESDebugger()
{
InitializeComponent();
DebugView.QueryItemText += DebugView_QueryItemText;
DebugView.QueryItemBkColor += DebugView_QueryItemBkColor;
DebugView.VirtualMode = true;
DebugView.ItemCount = ADDR_MAX + 1;
Activated += (o, e) => UpdateValues();
Closing += (o, e) => SaveConfigSettings();
}
public void Restart()
{
if (Global.Emulator is NES)
{
_nes = Global.Emulator as NES;
}
else
{
Close();
}
}
public void UpdateValues()
{
if (Global.Emulator is NES)
{
addr = pc = _nes.cpu.PC;
UpdateDebugView();
}
else
{
Close();
}
}
public void FastUpdate()
{
// Do nothing
}
private void UpdateDebugView()
{
DebugView.BlazingFast = true;
Disasm(DISASM_LINE_COUNT);
DebugView.ensureVisible(0xFFFF);
DebugView.ensureVisible(pc);
DebugView.Refresh();
DebugView.BlazingFast = false;
}
private void Disasm(int line_count)
{
lines.Clear();
int a = addr;
for (int i = 0; i < line_count; ++i)
{
int advance;
string line = _nes.cpu.Disassemble((ushort)a, out advance);
lines.Add(new DisasmOp(advance, line));
a += advance;
if (a > ADDR_MAX) break;
}
}
private void NESDebugger_Load(object sender, EventArgs e)
{
LoadConfigSettings();
_nes = Global.Emulator as NES;
}
private void LoadConfigSettings()
{
defaultWidth = Size.Width; //Save these first so that the user can restore to its original size
defaultHeight = Size.Height;
if (Global.Config.NESDebuggerSaveWindowPosition && Global.Config.NESDebuggerWndx >= 0 && Global.Config.NESDebuggerWndy >= 0)
Location = new Point(Global.Config.NESDebuggerWndx, Global.Config.NESDebuggerWndy);
if (Global.Config.NESDebuggerWidth >= 0 && Global.Config.NESDebuggerHeight >= 0)
{
Size = new Size(Global.Config.NESDebuggerWidth, Global.Config.NESDebuggerHeight);
}
}
public void SaveConfigSettings()
{
Global.Config.NESDebuggerWndx = Location.X;
Global.Config.NESDebuggerWndy = Location.Y;
Global.Config.NESDebuggerWidth = Right - Left;
Global.Config.NESDebuggerHeight = Bottom - Top;
}
private void DebugView_QueryItemBkColor(int index, int column, ref Color color)
{
}
void DebugView_QueryItemText(int index, int column, out string text)
{
text = "";
if (column == 0)
{
if (addr <= index && index < addr+lines.Count)
{
int a = addr;
for (int i = 0; i < index-addr; ++i)
a += lines[i].size;
text = String.Format("{0:X4}", a);
}
}
else if (column == 1)
{
if (addr <= index && index < addr+lines.Count)
text = lines[index-addr].mnemonic;
}
}
private void exitToolStripMenuItem_Click(object sender, EventArgs e)
{
Close();
}
private void autoloadToolStripMenuItem_Click(object sender, EventArgs e)
{
Global.Config.AutoLoadNESDebugger ^= true;
}
private void saveWindowPositionToolStripMenuItem_Click(object sender, EventArgs e)
{
Global.Config.NESDebuggerSaveWindowPosition ^= true;
}
private void optionsToolStripMenuItem_DropDownOpened(object sender, EventArgs e)
{
autoloadToolStripMenuItem.Checked = Global.Config.AutoLoadNESDebugger;
saveWindowPositionToolStripMenuItem.Checked = Global.Config.NESDebuggerSaveWindowPosition;
}
private void restoreOriginalSizeToolStripMenuItem_Click(object sender, EventArgs e)
{
Size = new Size(defaultWidth, defaultHeight);
}
}
}

View File

@ -1,148 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<metadata name="menuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAABMLAAATCwAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAEpWMf/m5ub/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPUgo/wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADJBI/8AAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAEpWMf8AAAAAAAAAAAAAAAAyOSD/eWId/3hjHf95Yx3/eWId/wAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARU4t/wAAAAB5ZR//eWUg/4fJpv+Bx5//ecKV/yt8
Ov94ZB//AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADlFKP8AAAAAeWch/5zSuP+Z0rX/kc6u/zyN
U/95w5b/emYi/wAAAAAAAAAASk4x/wAAAAAAAAAAAAAAAAAAAAAyPiP/emgk/67cxv+038v/rtvH/1in
c/+Rzq//gcef/3poJP8yOSD/PU4t/wAAAAAAAAAAAAAAAAAAAABFTjH/OUUo/3tqJ//C59X/zOvb/3/B
kv+u28b/mdK2/4fJpv96ayf/AAAAAAAAAAAAAAAAAAAAAFNWOP9TVjj/AAAAAAAAAAB7bSr/zOrb/9vz
5//M69v/tN/L/53SuP98bSr/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAr9zH/yJq
Lv/M69v/wubV/67cxv97byz/AAAAAAAAAAA9Ti3/SlYx/wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAANvz
5/+v28f/fHAt/3xwLf98cC3/8vLy/zI5IP85QSj/AAAAAAAAAAAAAAAAAAAAAEpWMf9KTjH/RU4t/z1I
KP98cC3/fHAt//Pz8/85RSj/8/Pz/wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAPUgt/wAAAAAAAAAAAAAAAEVOMf8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAEpOMf8AAAAAAAAAAAAAAABTVjj/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAABOVjj/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAA+f8AAP3/AAD9/wAA3B8AAOgPAADoDQAA4AMAAMAPAAAwHwAA8DMAAPAPAAAAfwAA938AAPd/
AAD3/////////w==
</value>
</data>
</root>

View File

@ -37,7 +37,6 @@
this.LuaConsoleToolbarItem = new System.Windows.Forms.ToolStripButton();
this.TAStudioToolbarItem = new System.Windows.Forms.ToolStripButton();
this.VirtualpadToolbarItem = new System.Windows.Forms.ToolStripButton();
this.NesDebuggerToolbarItem = new System.Windows.Forms.ToolStripButton();
this.NesPPUToolbarItem = new System.Windows.Forms.ToolStripButton();
this.NesNameTableToolbarItem = new System.Windows.Forms.ToolStripButton();
this.NesGameGenieToolbarItem = new System.Windows.Forms.ToolStripButton();
@ -76,7 +75,6 @@
this.LuaConsoleToolbarItem,
this.TAStudioToolbarItem,
this.VirtualpadToolbarItem,
this.NesDebuggerToolbarItem,
this.NesPPUToolbarItem,
this.NesNameTableToolbarItem,
this.NesGameGenieToolbarItem,
@ -166,16 +164,6 @@
this.VirtualpadToolbarItem.ToolTipText = "Virtualpads";
this.VirtualpadToolbarItem.Click += new System.EventHandler(this.VirtualpadToolbarItem_Click);
//
// NesDebuggerToolbarItem
//
this.NesDebuggerToolbarItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.NESControllerIcon;
this.NesDebuggerToolbarItem.ImageTransparentColor = System.Drawing.Color.Magenta;
this.NesDebuggerToolbarItem.Name = "NesDebuggerToolbarItem";
this.NesDebuggerToolbarItem.Size = new System.Drawing.Size(49, 20);
this.NesDebuggerToolbarItem.Text = "Dbg";
this.NesDebuggerToolbarItem.ToolTipText = "Nes Debugger";
this.NesDebuggerToolbarItem.Click += new System.EventHandler(this.NesDebuggerToolbarItem_Click);
//
// NesPPUToolbarItem
//
this.NesPPUToolbarItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.NESControllerIcon;
@ -372,7 +360,6 @@
private System.Windows.Forms.ToolStripButton HexEditorToolbarItem;
private System.Windows.Forms.ToolStripButton LuaConsoleToolbarItem;
private System.Windows.Forms.ToolStripButton NesPPUToolbarItem;
private System.Windows.Forms.ToolStripButton NesDebuggerToolbarItem;
private System.Windows.Forms.ToolStripButton NesGameGenieToolbarItem;
private System.Windows.Forms.ToolStripButton NesNameTableToolbarItem;
private System.Windows.Forms.ToolStripButton TI83KeypadToolbarItem;

View File

@ -63,7 +63,6 @@ namespace BizHawk.Client.EmuHawk
Global.Emulator.HasMemoryDomains();
NesPPUToolbarItem.Visible =
NesDebuggerToolbarItem.Visible =
NesNameTableToolbarItem.Visible =
Global.Emulator is NES;
@ -95,8 +94,6 @@ namespace BizHawk.Client.EmuHawk
SmsVdpToolbarItem.Visible = Global.Emulator is SMS;
NesDebuggerToolbarItem.Visible = VersionInfo.DeveloperBuild && Global.Emulator.SystemId == "NES";
TAStudioToolbarItem.Visible = Global.Emulator.HasSavestates() && Global.Emulator.CanPollInput();
foreach (var button in ToolBoxItems)
@ -169,11 +166,6 @@ namespace BizHawk.Client.EmuHawk
GlobalWin.Tools.Load<NesPPU>();
}
private void NesDebuggerToolbarItem_Click(object sender, EventArgs e)
{
GlobalWin.Tools.Load<NESDebugger>();
}
private void NesGameGenieToolbarItem_Click(object sender, EventArgs e)
{
GlobalWin.Tools.LoadGameGenieEc();