Refresh 2

This commit is contained in:
n64
2019-10-05 15:08:05 -04:00
parent 1ef98ec785
commit 52e605f075
316 changed files with 16346 additions and 16367 deletions

View File

@@ -1,108 +1,108 @@
glabel main_menu_geo_0001D0 # 0x0E0001D0
glabel geo_menu_mario_save_button # 0x0E0001D0
geo_node_start
geo_open_node
geo_scale 0x00, 524288
geo_open_node
geo_display_list LAYER_OPAQUE, main_menu_seg7_dl_07003330
geo_display_list LAYER_OPAQUE, main_menu_seg7_dl_070033D0
geo_display_list LAYER_OPAQUE, dl_menu_mario_save_button_base
geo_display_list LAYER_OPAQUE, dl_menu_save_button_back
geo_close_node
geo_close_node
geo_end
glabel main_menu_geo_000200 # 0x0E000200
glabel geo_menu_mario_save_button_fade # 0x0E000200
geo_node_start
geo_open_node
geo_scale 0x00, 524288
geo_open_node
geo_display_list LAYER_OPAQUE, main_menu_seg7_dl_07003330
geo_display_list LAYER_OPAQUE, main_menu_seg7_dl_07003400
geo_display_list LAYER_OPAQUE, dl_menu_mario_save_button_base
geo_display_list LAYER_OPAQUE, dl_menu_save_button_fade_back
geo_close_node
geo_close_node
geo_end
glabel main_menu_geo_000230 # 0x0E000230
glabel geo_menu_mario_new_button # 0x0E000230
geo_node_start
geo_open_node
geo_scale 0x00, 524288
geo_open_node
geo_display_list LAYER_OPAQUE, main_menu_seg7_dl_07003380
geo_display_list LAYER_OPAQUE, main_menu_seg7_dl_070033D0
geo_display_list LAYER_OPAQUE, dl_menu_mario_new_button_base
geo_display_list LAYER_OPAQUE, dl_menu_save_button_back
geo_close_node
geo_close_node
geo_end
glabel main_menu_geo_000260 # 0x0E000260
glabel geo_menu_mario_new_button_fade # 0x0E000260
geo_node_start
geo_open_node
geo_scale 0x00, 524288
geo_open_node
geo_display_list LAYER_OPAQUE, main_menu_seg7_dl_07003380
geo_display_list LAYER_OPAQUE, main_menu_seg7_dl_07003400
geo_display_list LAYER_OPAQUE, dl_menu_mario_new_button_base
geo_display_list LAYER_OPAQUE, dl_menu_save_button_fade_back
geo_close_node
geo_close_node
geo_end
glabel main_menu_geo_000290 # 0x0E000290
glabel geo_menu_erase_button # 0x0E000290
geo_node_start
geo_open_node
geo_scale 0x00, 524288
geo_open_node
geo_display_list LAYER_OPAQUE, main_menu_seg7_dl_070061C8
geo_display_list LAYER_OPAQUE, dl_menu_erase_button
geo_close_node
geo_close_node
geo_end
glabel main_menu_geo_0002B8 # 0x0E0002B8
glabel geo_menu_copy_button # 0x0E0002B8
geo_node_start
geo_open_node
geo_scale 0x00, 524288
geo_open_node
geo_display_list LAYER_OPAQUE, main_menu_seg7_dl_070061F8
geo_display_list LAYER_OPAQUE, dl_menu_copy_button
geo_close_node
geo_close_node
geo_end
glabel main_menu_geo_0002E0 # 0x0E0002E0
glabel geo_menu_file_button # 0x0E0002E0
geo_node_start
geo_open_node
geo_scale 0x00, 524288
geo_open_node
geo_display_list LAYER_OPAQUE, main_menu_seg7_dl_07006228
geo_display_list LAYER_OPAQUE, dl_menu_file_button
geo_close_node
geo_close_node
geo_end
glabel main_menu_geo_000308 # 0x0E000308
glabel geo_menu_score_button # 0x0E000308
geo_node_start
geo_open_node
geo_scale 0x00, 524288
geo_open_node
geo_display_list LAYER_OPAQUE, main_menu_seg7_dl_07006258
geo_display_list LAYER_OPAQUE, dl_menu_score_button
geo_close_node
geo_close_node
geo_end
glabel main_menu_geo_000330 # 0x0E000330
glabel geo_menu_sound_button # 0x0E000330
geo_node_start
geo_open_node
geo_scale 0x00, 524288
geo_open_node
geo_display_list LAYER_OPAQUE, main_menu_seg7_dl_07006288
geo_display_list LAYER_OPAQUE, dl_menu_sound_button
geo_close_node
geo_close_node
geo_end
glabel main_menu_geo_000358 # 0x0E000358
glabel geo_menu_generic_button # 0x0E000358
geo_node_start
geo_open_node
geo_scale 0x00, 524288
geo_open_node
geo_display_list LAYER_OPAQUE, main_menu_seg7_dl_070062B8
geo_display_list LAYER_OPAQUE, dl_menu_generic_button
geo_close_node
geo_close_node
geo_end
glabel main_menu_geo_000380 # 0x0E000380
glabel geo_menu_file_select_strings_and_menu_cursor # 0x0E000380
geo_node_screen_area 10, SCREEN_WIDTH/2, SCREEN_HEIGHT/2, SCREEN_WIDTH/2, SCREEN_HEIGHT/2
geo_open_node
geo_zbuffer 0
@@ -124,12 +124,12 @@ glabel main_menu_geo_000380 # 0x0E000380
geo_close_node
geo_zbuffer 0
geo_open_node
geo_asm 0, Geo18_80176688
geo_asm 0, geo_file_select_strings_and_menu_cursor
geo_close_node
geo_close_node
geo_end
glabel main_menu_geo_000408 # 0x0E000408
glabel geo_menu_act_selector_strings # 0x0E000408
geo_node_screen_area 10, SCREEN_WIDTH/2, SCREEN_HEIGHT/2, SCREEN_WIDTH/2, SCREEN_HEIGHT/2
geo_open_node
geo_zbuffer 0
@@ -151,7 +151,7 @@ glabel main_menu_geo_000408 # 0x0E000408
geo_close_node
geo_zbuffer 0
geo_open_node
geo_asm 0, Geo18_80177518
geo_asm 0, geo_act_selector_strings
geo_close_node
geo_close_node
geo_end

File diff suppressed because it is too large Load Diff

View File

@@ -4,18 +4,18 @@ glabel level_main_menu_entry_1
load_mio0 /*seg*/ 0x07, /*romStart*/ _menu_segment_7SegmentRomStart, /*romEnd*/ _menu_segment_7SegmentRomEnd
load_raw /*seg*/ 0x13, /*romStart*/ _behaviorSegmentRomStart, /*romEnd*/ _behaviorSegmentRomEnd
alloc_level_pool
load_model_from_geo /*model*/ MODEL_MAIN_MENU_MARIO_SAVE_BUTTON, /*geo*/ main_menu_geo_0001D0
load_model_from_geo /*model*/ MODEL_MAIN_MENU_RED_ERASE_BUTTON, /*geo*/ main_menu_geo_000290
load_model_from_geo /*model*/ MODEL_MAIN_MENU_BLUE_COPY_BUTTON, /*geo*/ main_menu_geo_0002B8
load_model_from_geo /*model*/ MODEL_MAIN_MENU_YELLOW_FILE_BUTTON, /*geo*/ main_menu_geo_0002E0
load_model_from_geo /*model*/ MODEL_MAIN_MENU_GREEN_SCORE_BUTTON, /*geo*/ main_menu_geo_000308
load_model_from_geo /*model*/ MODEL_MAIN_MENU_MARIO_SAVE_BUTTON_FADE, /*geo*/ main_menu_geo_000200
load_model_from_geo /*model*/ MODEL_MAIN_MENU_MARIO_NEW_BUTTON, /*geo*/ main_menu_geo_000230
load_model_from_geo /*model*/ MODEL_MAIN_MENU_MARIO_NEW_BUTTON_FADE, /*geo*/ main_menu_geo_000260
load_model_from_geo /*model*/ MODEL_MAIN_MENU_PURPLE_SOUND_BUTTON, /*geo*/ main_menu_geo_000330
load_model_from_geo /*model*/ MODEL_MAIN_MENU_GENERIC_BUTTON, /*geo*/ main_menu_geo_000358
load_model_from_geo /*model*/ MODEL_MAIN_MENU_MARIO_SAVE_BUTTON, /*geo*/ geo_menu_mario_save_button
load_model_from_geo /*model*/ MODEL_MAIN_MENU_RED_ERASE_BUTTON, /*geo*/ geo_menu_erase_button
load_model_from_geo /*model*/ MODEL_MAIN_MENU_BLUE_COPY_BUTTON, /*geo*/ geo_menu_copy_button
load_model_from_geo /*model*/ MODEL_MAIN_MENU_YELLOW_FILE_BUTTON, /*geo*/ geo_menu_file_button
load_model_from_geo /*model*/ MODEL_MAIN_MENU_GREEN_SCORE_BUTTON, /*geo*/ geo_menu_score_button
load_model_from_geo /*model*/ MODEL_MAIN_MENU_MARIO_SAVE_BUTTON_FADE, /*geo*/ geo_menu_mario_save_button_fade
load_model_from_geo /*model*/ MODEL_MAIN_MENU_MARIO_NEW_BUTTON, /*geo*/ geo_menu_mario_new_button
load_model_from_geo /*model*/ MODEL_MAIN_MENU_MARIO_NEW_BUTTON_FADE, /*geo*/ geo_menu_mario_new_button_fade
load_model_from_geo /*model*/ MODEL_MAIN_MENU_PURPLE_SOUND_BUTTON, /*geo*/ geo_menu_sound_button
load_model_from_geo /*model*/ MODEL_MAIN_MENU_GENERIC_BUTTON, /*geo*/ geo_menu_generic_button
area /*index*/ 1, /*geo*/ main_menu_geo_000380
area /*index*/ 1, /*geo*/ geo_menu_file_select_strings_and_menu_cursor
object /*model*/ MODEL_NONE, /*pos*/ 0, 0, -19000, /*angle*/ 0, 0, 0, /*behParam*/ 0x04000000, /*beh*/ bhvMenuButtonManager
object /*model*/ MODEL_MAIN_MENU_YELLOW_FILE_BUTTON, /*pos*/ 0, 0, -19000, /*angle*/ 0, 0, 0, /*behParam*/ 0x04000000, /*beh*/ bhvYellowBackgroundInMenu
terrain /*terrainData*/ main_menu_seg7_collision
@@ -25,8 +25,8 @@ glabel level_main_menu_entry_1
load_area /*area*/ 1
set_menu_music /*seq*/ 0x0021
transition /*unk2*/ 0, /*unk3*/ 16, /*color*/ -1, -1, -1
call /*arg*/ 0, /*func*/ LevelProc_801766DC
call_loop /*arg*/ 0, /*func*/ LevelProc_801768A0
call /*arg*/ 0, /*func*/ lvl_init_menu_values_and_cursor_pos
call_loop /*arg*/ 0, /*func*/ lvl_update_obj_and_load_file_selected
get_or_set /*op*/ OP_SET, /*var*/ VAR_CURR_SAVE_FILE_NUM
cmd38 /*unk2*/ 0x00BE
transition /*unk2*/ 1, /*unk3*/ 16, /*color*/ -1, -1, -1
@@ -44,7 +44,7 @@ glabel level_main_menu_entry_2
load_mio0 /*seg*/ 0x07, /*romStart*/ _menu_segment_7SegmentRomStart, /*romEnd*/ _menu_segment_7SegmentRomEnd
alloc_level_pool
area /*index*/ 2, /*geo*/ main_menu_geo_000408
area /*index*/ 2, /*geo*/ geo_menu_act_selector_strings
object /*model*/ MODEL_NONE, /*pos*/ 0, -100, 0, /*angle*/ 0, 0, 0, /*behParam*/ 0x04000000, /*beh*/ bhvActSelector
terrain /*terrainData*/ main_menu_seg7_collision
end_area
@@ -54,8 +54,8 @@ glabel level_main_menu_entry_2
transition /*unk2*/ 0, /*unk3*/ 16, /*color*/ -1, -1, -1
sleep /*frames*/ 16
set_menu_music /*seq*/ 0x000D
call /*arg*/ 0, /*func*/ LevelProc_80177560
call_loop /*arg*/ 0, /*func*/ LevelProc_80177610
call /*arg*/ 0, /*func*/ lvl_init_act_selector_values_and_stars
call_loop /*arg*/ 0, /*func*/ lvl_update_obj_and_load_act_button_actions
get_or_set /*op*/ OP_SET, /*var*/ VAR_CURR_ACT_NUM
cmd38 /*unk2*/ 0x00BE
transition /*unk2*/ 1, /*unk3*/ 16, /*color*/ -1, -1, -1