From b78b3567d0b75b8d0399fe7d851e0957a25b25c2 Mon Sep 17 00:00:00 2001 From: Connor Olding Date: Sun, 15 Nov 2015 08:29:06 -0800 Subject: [PATCH] use voidout type that works with OoT --- Lua/addrs/O/common.lua | 2 +- Lua/cheat menu.lua | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Lua/addrs/O/common.lua b/Lua/addrs/O/common.lua index 27ad5e3..f115c69 100644 --- a/Lua/addrs/O/common.lua +++ b/Lua/addrs/O/common.lua @@ -117,7 +117,7 @@ return { item_get_inf = AL(0xEF0, 0x8), inf_table = AL(0xEF8, 0x3C), checksum = AL(0x1352, 2), - voidout_type = AL(0x1364, 4), -- TODO: verify. i'm just inferring + voidout_type = AL(0x1364, 4), voidout_x = AL(0x1368, 'f'), voidout_y = AL(0x136C, 'f'), voidout_z = AL(0x1370, 'f'), diff --git a/Lua/cheat menu.lua b/Lua/cheat menu.lua index b85c18e..cf676c8 100755 --- a/Lua/cheat menu.lua +++ b/Lua/cheat menu.lua @@ -189,7 +189,8 @@ function load_scene_pos:on() addrs.warp_destination(sp.scene) local fade = fades_killed and 0x0B or 0x01 addrs.fade_type(fade) - addrs.voidout_type(-4) -- void out type: reload area + local vt = oot and 1 or -4 -- TODO: check if there's a better type for OoT + addrs.voidout_type(vt) addrs.voidout_x(sp.x) addrs.voidout_y(sp.y) addrs.voidout_z(sp.z)