1
0
Fork 0
mirror of https://github.com/notwa/mm synced 2024-11-05 05:39:02 -08:00

misc monitor tweaks

This commit is contained in:
Connor Olding 2015-11-25 03:02:21 -08:00
parent 577d4a5b4f
commit 433a99cb43
2 changed files with 39 additions and 34 deletions

View file

@ -103,6 +103,7 @@ return {
exit_value = AL(0x02, 2), exit_value = AL(0x02, 2),
mask_worn = AL(0x04, 1), mask_worn = AL(0x04, 1),
intro_completed = AL(0x05, 1), intro_completed = AL(0x05, 1),
anti_mash_timer = AL(0x06, 1),
cutscene_status = AL(0x0A, 2), cutscene_status = AL(0x0A, 2),
time = AL(0x0C, 2), time = AL(0x0C, 2),
owl_id = AL(0x0E, 2), owl_id = AL(0x0E, 2),

View file

@ -14,44 +14,48 @@ unk:load('data/_unk.lua')
local size = addrs.checksum.addr - addrs.exit_value.addr + 4 local size = addrs.checksum.addr - addrs.exit_value.addr + 4
local link = ByteMonitor('link', AL(0, size)) local link = ByteMonitor('link', AL(0, size))
local ignore_fields = mm and { local ignore_fields = mm and {
"exit_value", addrs.exit_value,
"mask_worn", addrs.mask_worn,
"cutscene_status", addrs.anti_mash_timer,
"time", addrs.cutscene_status,
"transformation", addrs.time,
"hearts", addrs.transformation,
"magic", addrs.hearts,
"rupees", addrs.magic,
"navi_timer", addrs.rupees,
"scene_flags_save", addrs.navi_timer,
"week_event_reg", addrs.inventory.b_button_item,
"event_inf", addrs.inventory.c_left_item,
"inventory_items", addrs.inventory.c_down_item,
"inventory_masks", addrs.inventory.c_right_item,
"inventory_quantities", addrs.inventory.c_left_slot,
addrs.inventory.c_down_slot,
addrs.inventory.c_right_slot,
addrs.scene_flags_save,
addrs.week_event_reg,
addrs.event_inf,
addrs.inventory_items,
addrs.inventory_masks,
addrs.inventory_quantities,
} or { } or {
"exit_value", addrs.exit_value,
"cutscene_status", addrs.cutscene_status,
"time", addrs.time,
"hearts", addrs.hearts,
"magic", addrs.magic,
"rupees", addrs.rupees,
"navi_timer", addrs.navi_timer,
"scene_flags_save", addrs.scene_flags_save,
"inventory_items", addrs.inventory_items,
"inventory_quantities", addrs.inventory_quantities,
"event_chk_inf", addrs.event_chk_inf,
"item_get_inf", addrs.item_get_inf,
"inf_table", addrs.inf_table,
"event_inf", addrs.event_inf,
} }
function link:ignore(i) function link:ignore(i)
for _, k in ipairs(ignore_fields) do for _, v in pairs(ignore_fields) do
local v = addrs[k]
if not v then
error('unknown addr: '..tostring(k), 1)
end
local size = v.type local size = v.type
if size == 'f' then size = 4 end if size == 'f' then size = 4 end
local a = v.addr - self.begin local a = v.addr - self.begin