From 5bd29d5d8088fa340189c9be3e82bfd6726f9291 Mon Sep 17 00:00:00 2001
From: beirich <beirich@4bbf4f03-6f44-549e-7e59-35d4b0962838>
Date: Fri, 23 Nov 2012 00:38:24 +0000
Subject: [PATCH]

---
 BizHawk.Emulation/CPUs/Z80/Z80A.cs | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

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<ushort, byte> ReadMemory;
         public Action<ushort, byte> 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