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

getting things up to speed

This commit is contained in:
Connor Olding 2015-05-24 03:19:32 -07:00
parent 8774a3a5b3
commit 7b8c2fff87
4 changed files with 9 additions and 14 deletions

View file

@ -153,11 +153,9 @@ function focus(actor, dump)
{'y', '%9.3f'}, {'y', '%9.3f'},
{'z', '%9.3f'}, {'z', '%9.3f'},
{'lin_vel_old', '%9.3f'}, {'lin_vel_old', '%9.3f'},
{'unk_54', '%9.3f'},
{'unk_74', '%9.3f'}, {'unk_74', '%9.3f'},
{'unk_78', '%9.3f'}, {'unk_78', '%9.3f'},
{'foot_left_x', '%9.3f'},
{'foot_left_y', '%9.3f'},
{'foot_left_z', '%9.3f'},
} }
for i, t in ipairs(watch) do for i, t in ipairs(watch) do
@ -166,6 +164,8 @@ function focus(actor, dump)
if dump then if dump then
a.unk_38(math.random(0, 0xFF)) a.unk_38(math.random(0, 0xFF))
--print(R1(actor.addr + 0x1E))
--W1(actor.addr + 0x1E, 0xFF)
end end
--a.x_old(a.x()) --a.x_old(a.x())
--a.y_old(a.y()) --a.y_old(a.y())
@ -197,14 +197,6 @@ function focus(actor, dump)
end end
end end
print(s) print(s)
--[[
for _, v in ipairs{'x', 'y', 'z', 'x_copy', 'y_copy', 'z_copy'} do
WF(actor.addr + actor_t[v].addr, 0)
end
--]]
print(R1(actor.addr + 0x1E))
W1(actor.addr + 0x1E, 0xFF)
end end
end end
@ -316,7 +308,7 @@ function ActorLister:run(now)
if not name then if not name then
name = "NEW" name = "NEW"
actor_names[num] = name actor_names[num] = name
print(("\t[0x%03X]=\"NEW\","):format(num)) dprint(("\t[0x%03X]=\"NEW\","):format(num))
end end
if not self.seen_once[num] then if not self.seen_once[num] then
@ -329,7 +321,7 @@ function ActorLister:run(now)
str = ("%s"):format(name) str = ("%s"):format(name)
end end
self.seen_strs[num] = str self.seen_strs[num] = str
print(str) dprint(str)
end end
local focal = false local focal = false
@ -418,5 +410,6 @@ event.onloadstate(function() al:wipe() end, 'actor wipe')
while oot or mm do while oot or mm do
local now = emu.framecount() local now = emu.framecount()
al:runwrap(now) al:runwrap(now)
print_deferred()
emu.frameadvance() emu.frameadvance()
end end

View file

@ -45,7 +45,7 @@ function Actor(addr)
y_vel = AA(0x68, 'f'), y_vel = AA(0x68, 'f'),
z_vel = AA(0x6C, 'f'), z_vel = AA(0x6C, 'f'),
lin_vel_old = AA(0x70, 'f'), lin_vel_old = AA(0x70, 'f'),
unk_74 = AA(0x74, 'f'), unk_74 = AA(0x74, 'f'), -- an offset perhaps?
unk_78 = AA(0x78, 'f'), unk_78 = AA(0x78, 'f'),
unk_7C = AA(0x7C, 4), unk_7C = AA(0x7C, 4),
unk_80 = AA(0x80, 4), -- pointer to ground? unk_80 = AA(0x80, 4), -- pointer to ground?

View file

@ -1,4 +1,5 @@
-- deprecated -- deprecated
-- (i say that, but i continue to use it myself)
local hash = gameinfo.getromhash() local hash = gameinfo.getromhash()
local Game = require "addrs.addrs" local Game = require "addrs.addrs"
local game = Game(hash) local game = Game(hash)

View file

@ -31,6 +31,7 @@ return {
[194] = true, [194] = true,
[195] = true, [195] = true,
[196] = true, [196] = true,
[197] = true,
[200] = true, [200] = true,
[201] = true, [201] = true,
[202] = true, [202] = true,