From 7b8c2fff873e28094eeefca874fe6b8174b178d4 Mon Sep 17 00:00:00 2001 From: Connor Olding Date: Sun, 24 May 2015 03:19:32 -0700 Subject: [PATCH] getting things up to speed --- Lua/actor lister.lua | 19 ++++++------------- Lua/addrs/M/common.lua | 2 +- Lua/addrs/init.lua | 1 + Lua/data/_it.lua | 1 + 4 files changed, 9 insertions(+), 14 deletions(-) diff --git a/Lua/actor lister.lua b/Lua/actor lister.lua index a281b7d..8d442c0 100755 --- a/Lua/actor lister.lua +++ b/Lua/actor lister.lua @@ -153,11 +153,9 @@ function focus(actor, dump) {'y', '%9.3f'}, {'z', '%9.3f'}, {'lin_vel_old', '%9.3f'}, + {'unk_54', '%9.3f'}, {'unk_74', '%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 @@ -166,6 +164,8 @@ function focus(actor, dump) if dump then a.unk_38(math.random(0, 0xFF)) + --print(R1(actor.addr + 0x1E)) + --W1(actor.addr + 0x1E, 0xFF) end --a.x_old(a.x()) --a.y_old(a.y()) @@ -197,14 +197,6 @@ function focus(actor, dump) end end 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 @@ -316,7 +308,7 @@ function ActorLister:run(now) if not name then name = "NEW" actor_names[num] = name - print(("\t[0x%03X]=\"NEW\","):format(num)) + dprint(("\t[0x%03X]=\"NEW\","):format(num)) end if not self.seen_once[num] then @@ -329,7 +321,7 @@ function ActorLister:run(now) str = ("%s"):format(name) end self.seen_strs[num] = str - print(str) + dprint(str) end local focal = false @@ -418,5 +410,6 @@ event.onloadstate(function() al:wipe() end, 'actor wipe') while oot or mm do local now = emu.framecount() al:runwrap(now) + print_deferred() emu.frameadvance() end diff --git a/Lua/addrs/M/common.lua b/Lua/addrs/M/common.lua index 67ab324..769a006 100755 --- a/Lua/addrs/M/common.lua +++ b/Lua/addrs/M/common.lua @@ -45,7 +45,7 @@ function Actor(addr) y_vel = AA(0x68, 'f'), z_vel = AA(0x6C, '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_7C = AA(0x7C, 4), unk_80 = AA(0x80, 4), -- pointer to ground? diff --git a/Lua/addrs/init.lua b/Lua/addrs/init.lua index 85a686d..2cc9f99 100644 --- a/Lua/addrs/init.lua +++ b/Lua/addrs/init.lua @@ -1,4 +1,5 @@ -- deprecated +-- (i say that, but i continue to use it myself) local hash = gameinfo.getromhash() local Game = require "addrs.addrs" local game = Game(hash) diff --git a/Lua/data/_it.lua b/Lua/data/_it.lua index ce83fa7..ffc1a29 100644 --- a/Lua/data/_it.lua +++ b/Lua/data/_it.lua @@ -31,6 +31,7 @@ return { [194] = true, [195] = true, [196] = true, + [197] = true, [200] = true, [201] = true, [202] = true,