diff --git a/src/BizHawk.Client.Common/lua/LuaHelperLibs/EventsLuaLibrary.cs b/src/BizHawk.Client.Common/lua/LuaHelperLibs/EventsLuaLibrary.cs
index e8fdd6fe9e..c3e18f1c41 100644
--- a/src/BizHawk.Client.Common/lua/LuaHelperLibs/EventsLuaLibrary.cs
+++ b/src/BizHawk.Client.Common/lua/LuaHelperLibs/EventsLuaLibrary.cs
@@ -98,7 +98,7 @@ namespace BizHawk.Client.Common
.Guid.ToString();
[LuaDeprecatedMethod]
- [LuaMethod("onmemoryexecute", "Fires after the given address is executed by the core")]
+ [LuaMethod("onmemoryexecute", "Fires immediately before the given address is executed by the core")]
public string OnMemoryExecute(
LuaFunction luaf,
uint address,
@@ -109,8 +109,8 @@ namespace BizHawk.Client.Common
return OnBusExec(luaf, address, name: name, scope: scope);
}
- [LuaMethodExample("local exec_cb_id = event.on_bus_exec(\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("on_bus_exec", "Fires after the given address is executed by the core")]
+ [LuaMethodExample("local exec_cb_id = event.on_bus_exec(\r\n\tfunction()\r\n\t\tconsole.log( \"Fires immediately before the given address is executed by the core\" );\r\n\tend\r\n\t, 0x200, \"Frame name\", \"System Bus\" );")]
+ [LuaMethod("on_bus_exec", "Fires immediately before the given address is executed by the core")]
public string OnBusExec(
LuaFunction luaf,
uint address,
@@ -145,7 +145,7 @@ namespace BizHawk.Client.Common
}
[LuaDeprecatedMethod]
- [LuaMethod("onmemoryexecuteany", "Fires after any address is executed by the core (CPU-intensive)")]
+ [LuaMethod("onmemoryexecuteany", "Fires immediately before any address is executed by the core (CPU-intensive)")]
public string OnMemoryExecuteAny(
LuaFunction luaf,
string name = null,
@@ -155,8 +155,8 @@ namespace BizHawk.Client.Common
return OnBusExecAny(luaf, name: name, scope: scope);
}
- [LuaMethodExample("local exec_cb_id = event.on_bus_exec_any(\r\n\tfunction()\r\n\t\tconsole.log( \"Fires after any address is executed by the core (CPU-intensive)\" );\r\n\tend\r\n\t, \"Frame name\", \"System Bus\" );")]
- [LuaMethod("on_bus_exec_any", "Fires after any address is executed by the core (CPU-intensive)")]
+ [LuaMethodExample("local exec_cb_id = event.on_bus_exec_any(\r\n\tfunction()\r\n\t\tconsole.log( \"Fires immediately before every instruction executed (in the specified scope) by the core (CPU-intensive)\" );\r\n\tend\r\n\t, \"Frame name\", \"System Bus\" );")]
+ [LuaMethod("on_bus_exec_any", "Fires immediately before every instruction executed (in the specified scope) by the core (CPU-intensive)")]
public string OnBusExecAny(
LuaFunction luaf,
string name = null,
diff --git a/src/BizHawk.Emulation.Common/Interfaces/IMemoryCallbackSystem.cs b/src/BizHawk.Emulation.Common/Interfaces/IMemoryCallbackSystem.cs
index 36a7169016..8b4e562f1e 100644
--- a/src/BizHawk.Emulation.Common/Interfaces/IMemoryCallbackSystem.cs
+++ b/src/BizHawk.Emulation.Common/Interfaces/IMemoryCallbackSystem.cs
@@ -68,7 +68,7 @@ namespace BizHawk.Emulation.Common
/// Executes all matching callbacks for the given address and domain
///
/// The address to check for callbacks
- /// The value contained (or written to) addr
+ /// For reads/execs, the value read/executed; for writes, the value to be written. Cores may pass the default 0 if write/exec is partially implemented.
/// The callback flags relevant to this access
/// The scope that the address pertains to. Must be a value in
void CallMemoryCallbacks(uint addr, uint value, uint flags, string scope);