From d098b237f1b5c7cfa2606b84362b5939b33b42b8 Mon Sep 17 00:00:00 2001 From: Connor Olding Date: Fri, 1 May 2015 13:34:23 -0700 Subject: [PATCH] update animation watcher for oot not that it needs it --- Lua/addrs/M common.lua | 2 +- Lua/addrs/O common.lua | 9 +++++++++ Lua/watch animations.lua | 4 ++-- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/Lua/addrs/M common.lua b/Lua/addrs/M common.lua index eefc0c4..8aafa77 100755 --- a/Lua/addrs/M common.lua +++ b/Lua/addrs/M common.lua @@ -307,5 +307,5 @@ return { lin_vel = AA(0xAD0, 'f'), movement_angle = AA(0xAD4, 2), active_sword = AA(0xADB, 1), - }, {__index = Actor(AA(0,0).addr)}) + }, {__index = Actor(AA(0,0).addr)}), } diff --git a/Lua/addrs/O common.lua b/Lua/addrs/O common.lua index 34d4a46..88f542f 100644 --- a/Lua/addrs/O common.lua +++ b/Lua/addrs/O common.lua @@ -169,4 +169,13 @@ return { z_cursor_actor = AG(0x1CC8, 4), z_target_actor = AG(0x1CCC, 4), + + link_actor = setmetatable({ + --item_in_hand = AA(0x148, 1), + animation_id = AA(0x1BE, 2), + --link_flags = AA(0xA6C, 0xC), + --lin_vel = AA(0xAD0, 'f'), + --movement_angle = AA(0xAD4, 2), + --active_sword = AA(0xADB, 1), + }, {__index = Actor(AA(0,0).addr)}), } diff --git a/Lua/watch animations.lua b/Lua/watch animations.lua index 36a832d..4bdf93f 100755 --- a/Lua/watch animations.lua +++ b/Lua/watch animations.lua @@ -2,10 +2,10 @@ require "addrs.init" require "serialize" local anim_addr = addrs.link_actor.animation_id.addr -local fn = 'data/_anims_seen.lua' +local fn = mm and 'data/_anims_seen.lua' or 'data/_anims_seen_oot.lua' local anims_seen = deserialize(fn) or {} -while mm do +while mm or oot do local anim_id = mainmemory.read_u16_be(anim_addr) local actor_loaded = mainmemory.read_u8(anim_addr - 2) == 4 local hexid = ('%04X'):format(anim_id)