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

add necessary store/restore addrs for most versions

This commit is contained in:
Connor Olding 2015-11-15 07:13:57 -08:00
parent 1ccc4891be
commit 8ed4aee8ce
5 changed files with 41 additions and 11 deletions

View file

@ -33,6 +33,14 @@ return {
pictograph_picture = AL(0x1390, 0x2BC0), pictograph_picture = AL(0x1390, 0x2BC0),
title_screen_mod = AL(0x3F5C, 4), title_screen_mod = AL(0x3F5C, 4),
entrance_mod = AL(0x3F60, 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_crap = AL(0x408C, 4),
timer_x = AL(0x41B8, 2), timer_x = AL(0x41B8, 2),
timer_y = AL(0x41C6, 2), timer_y = AL(0x41C6, 2),
@ -42,7 +50,7 @@ return {
weird_a_graphic = AL(0x42CE, 1), weird_a_graphic = AL(0x42CE, 1),
target_style = AL(0x42D1, 1), target_style = AL(0x42D1, 1),
music_mod = nil, music_mod = nil,
entrance_mod_setter = nil, entrance_mod_setter = AL(0x42D6, 2),
title_screen_thing = AL(0x42D8, 1), title_screen_thing = AL(0x42D8, 1),
transition_mod = nil, transition_mod = nil,
suns_song_effect = AL(0x42E4, 2), suns_song_effect = AL(0x42E4, 2),

View file

@ -33,6 +33,14 @@ return {
pictograph_picture = AL(0x1390, 0x2BC0), pictograph_picture = AL(0x1390, 0x2BC0),
title_screen_mod = AL(0x3F5C, 4), title_screen_mod = AL(0x3F5C, 4),
entrance_mod = AL(0x3F60, 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_crap = AL(0x408C, 4),
timer_x = AL(0x41B8, 2), timer_x = AL(0x41B8, 2),
timer_y = AL(0x41C6, 2), timer_y = AL(0x41C6, 2),
@ -42,7 +50,7 @@ return {
weird_a_graphic = AL(0x42CE, 1), weird_a_graphic = AL(0x42CE, 1),
target_style = AL(0x42D1, 1), target_style = AL(0x42D1, 1),
music_mod = nil, music_mod = nil,
entrance_mod_setter = nil, entrance_mod_setter = AL(0x42D6, 2),
title_screen_thing = AL(0x42D8, 1), title_screen_thing = AL(0x42D8, 1),
transition_mod = nil, transition_mod = nil,
suns_song_effect = AL(0x42E4, 2), suns_song_effect = AL(0x42E4, 2),

View file

@ -203,6 +203,14 @@ return {
current_save = AL(0x3CA0, 4), current_save = AL(0x3CA0, 4),
title_screen_mod = AL(0x3CA8, 4), title_screen_mod = AL(0x3CA8, 4),
entrance_mod = AL(0x3CAC, 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), dog_spawner = AL(0x3DBC, 2),
timer_crap = AL(0x3DD0, 4), timer_crap = AL(0x3DD0, 4),
postman_timer = AL(0x3DE4, 4), -- minigame postman_timer = AL(0x3DE4, 4), -- minigame

View file

@ -117,6 +117,14 @@ 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_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), event_inf = AL(0x13FA, 0x8),
magic_max = AL(0x13F4, 2), magic_max = AL(0x13F4, 2),

View file

@ -188,15 +188,13 @@ 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)
-- TODO: add these to address list addrs.voidout_type(-4) -- void out type: reload area
-- probably the same struct for both MM and OoT addrs.voidout_x(sp.x)
AL(0x3CB0, 4)(-4) -- void out type: reload area addrs.voidout_y(sp.y)
AL(0x3CB4, 'f')(sp.x) addrs.voidout_z(sp.z)
AL(0x3CB8, 'f')(sp.y) addrs.voidout_angle(sp.a)
AL(0x3CBC, 'f')(sp.z) addrs.voidout_var(0x0BFF) -- puts camera behind link instead of at entrance
AL(0x3CC0, 2)(sp.a) --voidout_room_number(sp.room)
AL(0x3CC2, 2)(0x0BFF) -- puts camera behind link instead of at entrance
--AL(0x3CC6, 2)(sp.room)
end end
local kill_fades = Callbacks() local kill_fades = Callbacks()