diff --git a/Lua/addrs/M/JP10.lua b/Lua/addrs/M/JP10.lua index f25a00c..0910707 100755 --- a/Lua/addrs/M/JP10.lua +++ b/Lua/addrs/M/JP10.lua @@ -33,6 +33,14 @@ return { pictograph_picture = AL(0x1390, 0x2BC0), title_screen_mod = AL(0x3F5C, 4), entrance_mod = AL(0x3F60, 4), + voidout_type = AL(0x3F64, 4), + voidout_x = AL(0x3F68, 'f'), + voidout_y = AL(0x3F6C, 'f'), + voidout_z = AL(0x3F70, 'f'), + voidout_angle = AL(0x3F74, 2), + voidout_var = AL(0x3F76, 2), + voidout_entrance = AL(0x3F78, 2), + voidout_room_number = AL(0x3F7A, 2), timer_crap = AL(0x408C, 4), timer_x = AL(0x41B8, 2), timer_y = AL(0x41C6, 2), @@ -42,7 +50,7 @@ return { weird_a_graphic = AL(0x42CE, 1), target_style = AL(0x42D1, 1), music_mod = nil, - entrance_mod_setter = nil, + entrance_mod_setter = AL(0x42D6, 2), title_screen_thing = AL(0x42D8, 1), transition_mod = nil, suns_song_effect = AL(0x42E4, 2), diff --git a/Lua/addrs/M/JP11.lua b/Lua/addrs/M/JP11.lua index e10b166..8149579 100755 --- a/Lua/addrs/M/JP11.lua +++ b/Lua/addrs/M/JP11.lua @@ -33,6 +33,14 @@ return { pictograph_picture = AL(0x1390, 0x2BC0), title_screen_mod = AL(0x3F5C, 4), entrance_mod = AL(0x3F60, 4), + voidout_type = AL(0x3F64, 4), + voidout_x = AL(0x3F68, 'f'), + voidout_y = AL(0x3F6C, 'f'), + voidout_z = AL(0x3F70, 'f'), + voidout_angle = AL(0x3F74, 2), + voidout_var = AL(0x3F76, 2), + voidout_entrance = AL(0x3F78, 2), + voidout_room_number = AL(0x3F7A, 2), timer_crap = AL(0x408C, 4), timer_x = AL(0x41B8, 2), timer_y = AL(0x41C6, 2), @@ -42,7 +50,7 @@ return { weird_a_graphic = AL(0x42CE, 1), target_style = AL(0x42D1, 1), music_mod = nil, - entrance_mod_setter = nil, + entrance_mod_setter = AL(0x42D6, 2), title_screen_thing = AL(0x42D8, 1), transition_mod = nil, suns_song_effect = AL(0x42E4, 2), diff --git a/Lua/addrs/M/common.lua b/Lua/addrs/M/common.lua index fd6165c..d2c79f0 100755 --- a/Lua/addrs/M/common.lua +++ b/Lua/addrs/M/common.lua @@ -203,6 +203,14 @@ return { current_save = AL(0x3CA0, 4), title_screen_mod = AL(0x3CA8, 4), entrance_mod = AL(0x3CAC, 4), + voidout_type = AL(0x3CB0, 4), + voidout_x = AL(0x3CB4, 'f'), + voidout_y = AL(0x3CB8, 'f'), + voidout_z = AL(0x3CBC, 'f'), + voidout_angle = AL(0x3CC0, 2), + voidout_var = AL(0x3CC2, 2), + voidout_entrance = AL(0x3CC4, 2), + voidout_room_number = AL(0x3CC6, 2), dog_spawner = AL(0x3DBC, 2), timer_crap = AL(0x3DD0, 4), postman_timer = AL(0x3DE4, 4), -- minigame diff --git a/Lua/addrs/O/common.lua b/Lua/addrs/O/common.lua index a3b0fbf..83bc60b 100644 --- a/Lua/addrs/O/common.lua +++ b/Lua/addrs/O/common.lua @@ -117,6 +117,14 @@ 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_x = AL(0x1368, 'f'), + voidout_y = AL(0x136C, 'f'), + voidout_z = AL(0x1370, 'f'), + voidout_angle = AL(0x1374, 2), + voidout_var = AL(0x1376, 2), + voidout_entrance = AL(0x1378, 2), + voidout_room_number = AL(0x137A, 2), event_inf = AL(0x13FA, 0x8), magic_max = AL(0x13F4, 2), diff --git a/Lua/cheat menu.lua b/Lua/cheat menu.lua index 40549bd..8ad5d2a 100755 --- a/Lua/cheat menu.lua +++ b/Lua/cheat menu.lua @@ -188,15 +188,13 @@ function load_scene_pos:on() addrs.warp_destination(sp.scene) local fade = fades_killed and 0x0B or 0x01 addrs.fade_type(fade) - -- TODO: add these to address list - -- probably the same struct for both MM and OoT - AL(0x3CB0, 4)(-4) -- void out type: reload area - AL(0x3CB4, 'f')(sp.x) - AL(0x3CB8, 'f')(sp.y) - AL(0x3CBC, 'f')(sp.z) - AL(0x3CC0, 2)(sp.a) - AL(0x3CC2, 2)(0x0BFF) -- puts camera behind link instead of at entrance - --AL(0x3CC6, 2)(sp.room) + addrs.voidout_type(-4) -- void out type: reload area + addrs.voidout_x(sp.x) + addrs.voidout_y(sp.y) + addrs.voidout_z(sp.z) + addrs.voidout_angle(sp.a) + addrs.voidout_var(0x0BFF) -- puts camera behind link instead of at entrance + --voidout_room_number(sp.room) end local kill_fades = Callbacks()