diff --git a/BizHawk.Client.Common/lua/EmuLuaLibrary.Events.cs b/BizHawk.Client.Common/lua/EmuLuaLibrary.Events.cs index 3ef04e8708..4bbc58f34f 100644 --- a/BizHawk.Client.Common/lua/EmuLuaLibrary.Events.cs +++ b/BizHawk.Client.Common/lua/EmuLuaLibrary.Events.cs @@ -183,9 +183,9 @@ namespace BizHawk.Client.Common return nlf.Guid.ToString(); } - [LuaMethodExample("local steveonm = event.onmemoryexecute(\r\n\tfunction()\r\n\t\tconsole.log( \"Fires after the given address is executed by the core\" );\r\n\tend\r\n\t, 0x200, \"Frame name\", \"System Bus\" );")] - [LuaMethod("onmemoryexecute", "Fires after the given address is executed by the core")] - public string OnMemoryExecute(LuaFunction luaf, uint address, string name = null, string domain = null) + [LuaMethodExample("local steveonm = event.onmemoryexecute(\r\n\tfunction()\r\n\t\tconsole.log( \"Fires after the given address is executed by the core. If is explicitly nil, it will attach to every memory read\" );\r\n\tend\r\n\t, 0x200, \"Frame name\", \"System Bus\" );")] + [LuaMethod("onmemoryexecute", "Fires after the given address is executed by the core. If the address is explicitly nil, it will attach to every memory read")] + public string OnMemoryExecute(LuaFunction luaf, uint? address, string name = null, string domain = null) { try { diff --git a/BizHawk.Emulation.Common/Base Implementations/MemoryCallbackSystem.cs b/BizHawk.Emulation.Common/Base Implementations/MemoryCallbackSystem.cs index 7a929cf8be..458cec1173 100644 --- a/BizHawk.Emulation.Common/Base Implementations/MemoryCallbackSystem.cs +++ b/BizHawk.Emulation.Common/Base Implementations/MemoryCallbackSystem.cs @@ -295,11 +295,6 @@ namespace BizHawk.Emulation.Common { public MemoryCallback(string scope, MemoryCallbackType type, string name, MemoryCallbackDelegate callback, uint? address, uint? mask) { - if (type == MemoryCallbackType.Execute && !address.HasValue) - { - throw new InvalidOperationException("When assigning an execute callback, an address must be specified"); - } - Type = type; Name = name; Callback = callback;