From adab471173d5f70a11c6be22ef6482591680f65e Mon Sep 17 00:00:00 2001 From: Connor Olding Date: Wed, 11 Nov 2015 17:32:21 -0800 Subject: [PATCH] Revert "update for new readbyterange behaviour" This reverts commit 71f44db82e481ae8468de094dfc1662c28d0923b. --- Lua/classes/Monitor.lua | 6 ++++-- Lua/test chests.lua | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Lua/classes/Monitor.lua b/Lua/classes/Monitor.lua index bb4aaa8..52b2118 100644 --- a/Lua/classes/Monitor.lua +++ b/Lua/classes/Monitor.lua @@ -12,10 +12,12 @@ function Monitor:init(name, a) end function Monitor:read() - local raw = mainmemory.readbyterange(self.begin, self.len) + -- bizhawk has an off-by-one bug where this returns length + 1 bytes + local raw = mainmemory.readbyterange(self.begin, self.len-1) local bytes = {} + local begin = self.begin for k, v in pairs(raw) do - bytes[k] = v + bytes[k - begin] = v end return bytes end diff --git a/Lua/test chests.lua b/Lua/test chests.lua index 0f20e96..52aa31a 100755 --- a/Lua/test chests.lua +++ b/Lua/test chests.lua @@ -43,7 +43,7 @@ function read_ascii(addr, len) -- so we'll set up a table we can use ipairs() on local ordered_bytes = {} for a, v in pairs(bytes) do - ordered_bytes[tonumber(a, 16) + 1] = v + ordered_bytes[tonumber(a, 16) - begin + 1] = v end local seq = false