notwa/mm
1
0
Fork 0
mirror of https://github.com/notwa/mm synced 2024-11-05 21:29:04 -08:00
Code Issues Releases Wiki Activity

tweaks

Browse source
This commit is contained in:
Connor Olding 2015-05-01 11:48:49 -07:00
parent 6c89f9306b
commit 736804be40
4 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Lua/actor lister.lua
View file

@ -327,7 +327,7 @@ local function runwrap(now)
end end
event.onloadstate(wipe, 'actor wipe') event.onloadstate(wipe, 'actor wipe')
while true do while oot or mm do
local now = emu.framecount() local now = emu.framecount()
runwrap(now) runwrap(now)
emu.frameadvance() emu.frameadvance()

3
Lua/data/_ootmemod.lua
View file

@ -51,6 +51,7 @@ return {
[575] = true, [575] = true,
[576] = true, [576] = true,
[578] = true, [578] = true,
[583] = true,
[584] = true, [584] = true,
[591] = true, [591] = true,
[592] = true, [592] = true,
@ -114,8 +115,10 @@ return {
[1939] = true, [1939] = true,
[1940] = true, [1940] = true,
[1941] = true, [1941] = true,
[1942] = true,
[1943] = true, [1943] = true,
[1944] = true, [1944] = true,
[1945] = true,
[1965] = true, [1965] = true,
[1967] = true, [1967] = true,
[1968] = true, [1968] = true,

9
Lua/oot memory editor monitor.lua
View file

@ -25,12 +25,7 @@ end
ShortMonitor = Class(Monitor) ShortMonitor = Class(Monitor)
function ShortMonitor:init(name, a) function ShortMonitor:init(name, a)
self.name = name Monitor.init(self, name, a)
self.begin = a.addr
self.len = a.type
self.once = false
self.old_bytes = {}
self.modified = {} self.modified = {}
self.dirty = false self.dirty = false
end end
@ -51,7 +46,7 @@ function ShortMonitor:dump()
local ih = i local ih = i
local block, page, row = distribute_index(ih) local block, page, row = distribute_index(ih)
local mod = self.modified[ih] local mod = self.modified[ih]
local value = R2(self.begin + ih) local value = R2(self.begin + ih*2)
local vs = mod and 'n/a' or ('%04X'):format(value) local vs = mod and 'n/a' or ('%04X'):format(value)
local name = ('%s%02i'):format(blocknames[block+1], page*16 + row) local name = ('%s%02i'):format(blocknames[block+1], page*16 + row)
local s = ('%s\t%i\t%i\t%s\n'):format(name, page+1, row+1, vs) local s = ('%s\t%i\t%i\t%s\n'):format(name, page+1, row+1, vs)

2
Lua/watch animations.lua
View file

@ -5,7 +5,7 @@ local anim_addr = addrs.link_actor.animation_id.addr
local fn = 'data/_anims_seen.lua' local fn = 'data/_anims_seen.lua'
local anims_seen = deserialize(fn) or {} local anims_seen = deserialize(fn) or {}
while true do while mm do
local anim_id = mainmemory.read_u16_be(anim_addr) local anim_id = mainmemory.read_u16_be(anim_addr)
local actor_loaded = mainmemory.read_u8(anim_addr - 2) == 4 local actor_loaded = mainmemory.read_u8(anim_addr - 2) == 4
local hexid = ('%04X'):format(anim_id) local hexid = ('%04X'):format(anim_id)