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

use voidout type that works with OoT

This commit is contained in:
Connor Olding 2015-11-15 08:29:06 -08:00
parent 42493fd48c
commit b78b3567d0
2 changed files with 3 additions and 2 deletions

View file

@ -117,7 +117,7 @@ return {
item_get_inf = AL(0xEF0, 0x8), item_get_inf = AL(0xEF0, 0x8),
inf_table = AL(0xEF8, 0x3C), inf_table = AL(0xEF8, 0x3C),
checksum = AL(0x1352, 2), 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_x = AL(0x1368, 'f'),
voidout_y = AL(0x136C, 'f'), voidout_y = AL(0x136C, 'f'),
voidout_z = AL(0x1370, 'f'), voidout_z = AL(0x1370, 'f'),

View file

@ -189,7 +189,8 @@ function load_scene_pos:on()
addrs.warp_destination(sp.scene) addrs.warp_destination(sp.scene)
local fade = fades_killed and 0x0B or 0x01 local fade = fades_killed and 0x0B or 0x01
addrs.fade_type(fade) 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_x(sp.x)
addrs.voidout_y(sp.y) addrs.voidout_y(sp.y)
addrs.voidout_z(sp.z) addrs.voidout_z(sp.z)