diff --git a/BizHawk.Emulation/CPUs/Z80/Z80A.cs b/BizHawk.Emulation/CPUs/Z80/Z80A.cs index 056b802c2a..417d172e6e 100644 --- a/BizHawk.Emulation/CPUs/Z80/Z80A.cs +++ b/BizHawk.Emulation/CPUs/Z80/Z80A.cs @@ -47,10 +47,12 @@ namespace BizHawk.Emulation.CPUs.Z80 public Func ReadMemory; public Action WriteMemory; - public void UnregisterMemoryMapper() + // Utility function, not used by core + public ushort ReadWord(ushort addr) { - ReadMemory = null; - WriteMemory = null; + ushort value = ReadMemory(addr++); + value |= (ushort) (ReadMemory(addr) << 8); + return value; } // Hardware I/O Port Access