Monitor class; class inheritance

Lua/boilerplate.lua

@@ -54,12 +54,15 @@ function A(addr, atype)
     }, mt)
 end
 
-Class = function()
+Class = function(inherit)
-    return setmetatable({}, {__call = function(self, ...)
+    return setmetatable({}, {
-        local obj = setmetatable({}, {__index = self})
+        __call = function(self, ...)
-        obj:init(...)
+            local obj = setmetatable({}, {__index = self})
-        return obj
+            obj:init(...)
-    end})
+            return obj
+        end,
+        __index = inherit,
+    })
 end
 
 function printf(fmt, ...)

Lua/classes.lua

@@ -0,0 +1,26 @@
+Monitor = Class()
+function Monitor:init(name, a)
+    self.name = name
+    self.begin = a.addr
+    self.len = a.type
+    self.once = false
+    self.old_bytes = {}
+end
+
+function Monitor:diff()
+    local bytes = mainmemory.readbyterange(self.begin, self.len)
+    local old_bytes = self.old_bytes
+    if self.once then
+        for k, v in pairs(bytes) do
+            local i = tonumber(k) - self.begin
+            local x = tonumber(v)
+            local x1 = tonumber(old_bytes[k])
+            if x ~= x1 then
+                self:mark(i, x, x1)
+            end
+        end
+    end
+    self.old_bytes = bytes
+    self.once = true
+end
+

Lua/event flag monitor.lua

@@ -1,5 +1,6 @@
 require "boilerplate"
 require "addrs.init"
+require "classes"
 
 local ignore = {
     -- every time a scene (un)loads
@@ -21,23 +22,7 @@ local ignore = {
     ['28,2=1 (weg)'] = true,
 }
 
-function poop(x, x1, i, name)
+FlagMonitor = Class(Monitor)
-    local now = emu.framecount()
-    local diff = bit.bxor(x, x1)
-    for which = 0, 7 do
-        if bit.band(diff, 2^which) ~= 0 then
-            local state = bit.band(x, 2^which) ~= 0 and 1 or 0
-            local str = ('%02i,%i=%i (%s)'):format(i, which, state, name)
-            if not ignore[str] then
-                printf('%s  @%i', str, now)
-                gui.addmessage(str)
-            end
-        end
-    end
-end
-
-FlagMonitor = Class()
-
 function FlagMonitor:init(name, a)
     self.name = name
     self.begin = a.addr
@@ -46,21 +31,19 @@ function FlagMonitor:init(name, a)
     self.old_bytes = {}
 end
 
-function FlagMonitor:diff()
+function FlagMonitor:mark(i, x, x1)
-    local bytes = mainmemory.readbyterange(self.begin, self.len)
+    local now = emu.framecount()
-    local old_bytes = self.old_bytes
+    local diff = bit.bxor(x, x1)
-    if self.once then
+    for which = 0, 7 do
-        for k, v in pairs(bytes) do
+        if bit.band(diff, 2^which) ~= 0 then
-            local i = tonumber(k) - self.begin
+            local state = bit.band(x, 2^which) ~= 0 and 1 or 0
-            local x = tonumber(v)
+            local str = ('%02i,%i=%i (%s)'):format(i, which, state, self.name)
-            local x1 = tonumber(old_bytes[k])
+            if not ignore[str] then
-            if x ~= x1 then
+                printf('%s  @%i', str, now)
-                poop(x, x1, i, self.name)
+                gui.addmessage(str)
             end
         end
     end
-    self.old_bytes = bytes
-    self.once = true
 end
 
 local weg = FlagMonitor('weg', addrs.week_event_reg)

Lua/oot memory editor monitor.lua

@@ -1,5 +1,6 @@
 require "boilerplate"
 require "addrs.init"
+require "classes"
 require "serialize"
 
 local blocknames = {
@@ -21,7 +22,7 @@ function butts(ih)
     return block, page, row
 end
 
-ShortMonitor = Class()
+ShortMonitor = Class(Monitor)
 function ShortMonitor:init(name, a)
     self.name = name
     self.begin = a.addr
@@ -33,23 +34,6 @@ function ShortMonitor:init(name, a)
     self.dirty = false
 end
 
-function ShortMonitor:diff()
-    local bytes = mainmemory.readbyterange(self.begin, self.len)
-    local old_bytes = self.old_bytes
-    if self.once then
-        for k, v in pairs(bytes) do
-            local i = tonumber(k) - self.begin
-            local x = tonumber(v)
-            local x1 = tonumber(old_bytes[k])
-            if x ~= x1 then
-                self:mark(i, x, x1)
-            end
-        end
-    end
-    self.old_bytes = bytes
-    self.once = true
-end
-
 function ShortMonitor:mark(i, x, x1)
     local ih = math.floor(i/2)
     if not self.modified[ih] then
@@ -67,7 +51,7 @@ function ShortMonitor:dump()
         local block, page, row = butts(ih)
         local mod = self.modified[ih]
         local value = R2(self.begin + ih)
-        local vs = mod and '[variable]' or ('%04X'):format(value)
+        local vs = mod and 'n/a' or ('%04X'):format(value)
         local s = ('%02X\t%i\t%i\t%s\n'):format(block, page+1, row+1, vs)
         buff = buff..s
     end