diff --git a/src/game/game_10ccd0.c b/src/game/game_10ccd0.c index 925818e05..5224993af 100644 --- a/src/game/game_10ccd0.c +++ b/src/game/game_10ccd0.c @@ -920,23 +920,17 @@ s32 menuhandlerReplayLastLevel(u32 operation, struct menu_item *item, s32 *value return 0; } -GLOBAL_ASM( -glabel menuhandlerContinueToCredits -/* f10d8dc: 27bdffe8 */ addiu $sp,$sp,-24 -/* f10d8e0: 24010006 */ addiu $at,$zero,0x6 -/* f10d8e4: afbf0014 */ sw $ra,0x14($sp) -/* f10d8e8: afa5001c */ sw $a1,0x1c($sp) -/* f10d8ec: 14810003 */ bne $a0,$at,.L0f10d8fc -/* f10d8f0: afa60020 */ sw $a2,0x20($sp) -/* f10d8f4: 0fc43644 */ jal func0f10d910 -/* f10d8f8: 24040002 */ addiu $a0,$zero,0x2 -.L0f10d8fc: -/* f10d8fc: 8fbf0014 */ lw $ra,0x14($sp) -/* f10d900: 27bd0018 */ addiu $sp,$sp,0x18 -/* f10d904: 00001025 */ or $v0,$zero,$zero -/* f10d908: 03e00008 */ jr $ra -/* f10d90c: 00000000 */ sll $zero,$zero,0x0 -); +/** + * Displayed after Defense and Skedar Ruins completion screens. + */ +s32 menuhandlerContinueMission(u32 operation, struct menu_item *item, s32 *value) +{ + if (operation == MENUOP_SET) { + func0f10d910(2); + } + + return 0; +} GLOBAL_ASM( glabel func0f10d910 diff --git a/src/include/game/game_10ccd0.h b/src/include/game/game_10ccd0.h index b567152db..e73ca9bca 100644 --- a/src/include/game/game_10ccd0.h +++ b/src/include/game/game_10ccd0.h @@ -23,7 +23,7 @@ u32 func0f10d678(void); u32 func0f10d6e4(void); u32 func0f10d730(void); u32 func0f10d770(void); -u32 func0f10d910(void); +void func0f10d910(s32 arg0); u32 func0f10e3fc(void); u32 func0f10e468(void); u32 func0f10e4d8(void); @@ -56,7 +56,7 @@ s32 menudialog0010dd28(u32, u32, u32 *); s32 menudialog0010de58(u32, u32, u32 *); s32 menuhandlerDeclineMission(u32 operation, struct menu_item *item, s32 *value); s32 menuhandler0010e064(u32, u32, u32 *); -s32 menuhandlerContinueToCredits(u32, u32, u32 *); +s32 menuhandlerContinueMission(u32 operation, struct menu_item *item, s32 *value); s32 menuhandlerReplayLastLevel(u32 operation, struct menu_item *item, s32 *value); s32 menuhandlerReplayPreviousMission(u32 operation, struct menu_item *item, s32 *value); diff --git a/src/setup/setup_0160b0.c b/src/setup/setup_0160b0.c index b5180e03b..a97b4db6d 100644 --- a/src/setup/setup_0160b0.c +++ b/src/setup/setup_0160b0.c @@ -3996,7 +3996,7 @@ struct menu_dialog menudialog_1b750 = { // 1b768 struct menu_item menuitems_1b768[] = { - { MENUITEMTYPE_SELECTABLE, 0, 0x00000020, 0x000054f4, 0x00000000, menuhandlerContinueToCredits }, // "Continue" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000020, 0x000054f4, 0x00000000, menuhandlerContinueMission }, // "Continue" { MENUITEMTYPE_SELECTABLE, 0, 0x00000020, 0x000054f5, 0x00000000, menuhandlerReplayLastLevel }, // "Replay Last Level" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, };