notwa/mm
1
0
Fork 0
mirror of https://github.com/notwa/mm synced 2025-02-05 05:23:22 -08:00
Code Issues Releases Wiki Activity

make event flag addrs generic

Browse source
This commit is contained in:
Connor Olding 2015-04-26 00:18:33 -07:00
parent 30dff10c7e
commit 671d7b4dee
2 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Lua/addrs/M common.lua
View file

@ -91,6 +91,7 @@ return {
slulltula_count_wf = AL(0xEC0, 2),
slulltula_count_gb = AL(0xEC2, 2),
banked_rupees = AL(0xEDE, 2),
week_event_reg = AL(0xEF8, 100),
archery = AL(0xF00, 1),
chateau_romani = AL(0xF06, 1), -- 8
disable_c_buttons = AL(0xF4A, 1), -- 8
@ -129,6 +130,7 @@ return {
-- note: these addresses are invalid for JP10, JP11.
checksum = AL(0x100A, 2),
event_inf = AL(0x100C, 9),
disable_pause = AL(0x100D, 1),
hookshot_ba = AL(0x100E, 1),
disable_c_buttons_2 = AL(0x100F, 1),

16
Lua/event flag monitor.lua
View file

@ -1,4 +1,5 @@
require "boilerplate"
require "addrs.init"
local ignore = {
-- every time a scene (un)loads
@ -37,10 +38,10 @@ end
FlagMonitor = Class()
function FlagMonitor:init(name, begin, len)
function FlagMonitor:init(name, a)
self.name = name
self.begin = begin
self.len = len
self.begin = a.addr
self.len = a.type
self.once = false
self.old_bytes = {}
end
@ -62,13 +63,12 @@ function FlagMonitor:diff()
self.once = true
end
-- US 1.0 addresses for the time being
local weg = FlagMonitor('weg', 0x1F0568, 100) -- week_event_reg
local inf = FlagMonitor('inf', 0x1F067C, 8) -- event_inf
local mmb = FlagMonitor('mmb', 0x1F3F3A, 8) -- mask_mask_bit (bad address?)
local weg = FlagMonitor('weg', addrs.week_event_reg)
local inf = FlagMonitor('inf', addrs.event_inf)
--local mmb = FlagMonitor('mmb', addrs.mask_mask_bit)
while true do
weg:diff()
inf:diff()
mmb:diff()
--mmb:diff()
emu.frameadvance()
end