diff --git a/BizHawk.Client.EmuHawk/MainForm.Hotkey.cs b/BizHawk.Client.EmuHawk/MainForm.Hotkey.cs index eff7717179..7b29585201 100644 --- a/BizHawk.Client.EmuHawk/MainForm.Hotkey.cs +++ b/BizHawk.Client.EmuHawk/MainForm.Hotkey.cs @@ -294,16 +294,10 @@ namespace BizHawk.Client.EmuHawk GlobalWin.Tools.LoadRamWatch(true); break; case "Ram Search": - if (Global.Emulator.HasMemoryDomains()) - { - GlobalWin.Tools.Load(); - } + GlobalWin.Tools.Load(); break; case "Hex Editor": - if (Global.Emulator.HasMemoryDomains()) - { - GlobalWin.Tools.Load(); - } + GlobalWin.Tools.Load(); break; case "Trace Logger": GlobalWin.Tools.LoadTraceLogger(); @@ -312,16 +306,10 @@ namespace BizHawk.Client.EmuHawk OpenLuaConsole(); break; case "Cheats": - if (Global.Emulator.HasMemoryDomains()) - { - GlobalWin.Tools.Load(); - } + GlobalWin.Tools.Load(); break; case "TAStudio": - if (Global.Emulator.HasSavestates() && Global.Emulator.CanPollInput()) - { - GlobalWin.Tools.Load(); - } + GlobalWin.Tools.Load(); break; case "ToolBox": GlobalWin.Tools.Load(); @@ -332,40 +320,22 @@ namespace BizHawk.Client.EmuHawk // Ram Search case "Do Search": - if (Global.Emulator.HasMemoryDomains()) - { - GlobalWin.Tools.RamSearch.DoSearch(); - } + GlobalWin.Tools.RamSearch.DoSearch(); break; case "New Search": - if (Global.Emulator.HasMemoryDomains()) - { - GlobalWin.Tools.RamSearch.NewSearch(); - } + GlobalWin.Tools.RamSearch.NewSearch(); break; case "Previous Compare To": - if (Global.Emulator.HasMemoryDomains()) - { - GlobalWin.Tools.RamSearch.NextCompareTo(reverse: true); - } + GlobalWin.Tools.RamSearch.NextCompareTo(reverse: true); break; case "Next Compare To": - if (Global.Emulator.HasMemoryDomains()) - { - GlobalWin.Tools.RamSearch.NextCompareTo(); - } + GlobalWin.Tools.RamSearch.NextCompareTo(); break; case "Previous Operator": - if (Global.Emulator.HasMemoryDomains()) - { - GlobalWin.Tools.RamSearch.NextOperator(reverse: true); - } + GlobalWin.Tools.RamSearch.NextOperator(reverse: true); break; case "Next Operator": - if (Global.Emulator.HasMemoryDomains()) - { - GlobalWin.Tools.RamSearch.NextOperator(); - } + GlobalWin.Tools.RamSearch.NextOperator(); break; // SNES