diff --git a/src/game/game_107fb0.c b/src/game/game_107fb0.c index 28e8ed001..78ce4ecc3 100644 --- a/src/game/game_107fb0.c +++ b/src/game/game_107fb0.c @@ -1229,26 +1229,19 @@ glabel menuhandlerSaveElsewhere /* f108ccc: 00000000 */ sll $zero,$zero,0x0 ); +s32 menuhandlerPakCancelSave2(u32 operation, struct menu_item *item, s32 *value) +{ + if (operation == MENUOP_SET) { + func0f0f33bc(); + func0f10898c(); + func0f0f361c(); + } + + return 0; +} + GLOBAL_ASM( -glabel menuhandler00108cd0 -/* f108cd0: 27bdffe8 */ addiu $sp,$sp,-24 -/* f108cd4: 24010006 */ addiu $at,$zero,0x6 -/* f108cd8: afbf0014 */ sw $ra,0x14($sp) -/* f108cdc: afa5001c */ sw $a1,0x1c($sp) -/* f108ce0: 14810007 */ bne $a0,$at,.L0f108d00 -/* f108ce4: afa60020 */ sw $a2,0x20($sp) -/* f108ce8: 0fc3ccef */ jal func0f0f33bc -/* f108cec: 00000000 */ sll $zero,$zero,0x0 -/* f108cf0: 0fc42263 */ jal func0f10898c -/* f108cf4: 00000000 */ sll $zero,$zero,0x0 -/* f108cf8: 0fc3cd87 */ jal func0f0f361c -/* f108cfc: 00000000 */ sll $zero,$zero,0x0 -.L0f108d00: -/* f108d00: 8fbf0014 */ lw $ra,0x14($sp) -/* f108d04: 27bd0018 */ addiu $sp,$sp,0x18 -/* f108d08: 00001025 */ or $v0,$zero,$zero -/* f108d0c: 03e00008 */ jr $ra -/* f108d10: 00000000 */ sll $zero,$zero,0x0 +glabel func0f108d14 /* f108d14: 27bdffe8 */ addiu $sp,$sp,-24 /* f108d18: 24010006 */ addiu $at,$zero,0x6 /* f108d1c: afbf0014 */ sw $ra,0x14($sp) diff --git a/src/include/game/game_107fb0.h b/src/include/game/game_107fb0.h index 821b05ca0..97d2124f2 100644 --- a/src/include/game/game_107fb0.h +++ b/src/include/game/game_107fb0.h @@ -62,7 +62,7 @@ s32 menuhandler00108014(u32 operation, struct menu_item *item, s32 *value); s32 menuhandler00108254(u32 operation, struct menu_item *item, s32 *value); s32 menuhandler001084b8(u32, u32, u32 *); s32 menuhandlerPakErrorTryAgain(u32 operation, struct menu_item *item, s32 *value); -s32 menuhandler00108cd0(u32, u32, u32 *); +s32 menuhandlerPakCancelSave2(u32 operation, struct menu_item *item, s32 *value); s32 menuhandlerAcknowledgePakFileLost(u32 operation, struct menu_item *item, s32 *value); s32 menuhandler00108ecc(u32 operation, struct menu_item *item, s32 *value); s32 menuhandler00108f08(u32, u32, u32 *); diff --git a/src/setup/setup_0160b0.c b/src/setup/setup_0160b0.c index 8806466d8..6286d3025 100644 --- a/src/setup/setup_0160b0.c +++ b/src/setup/setup_0160b0.c @@ -3299,7 +3299,7 @@ struct menu_item menuitems_saveerror[] = { { MENUITEMTYPE_LABEL, 0, 0x00000010, 0x0000575c, 0x00000000, NULL }, // "An error occurred while trying to save" { MENUITEMTYPE_SELECTABLE, 0, 0x00000020, 0x0000575d, 0x00000000, menuhandlerPakErrorTryAgain }, // "Try Again" { MENUITEMTYPE_SELECTABLE, 0, 0x00000020, 0x0000575e, 0x00000000, menuhandlerSaveElsewhere }, // "Save Elsewhere" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000020, 0x0000575f, 0x00000000, menuhandler00108cd0 }, // "Cancel" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000020, 0x0000575f, 0x00000000, menuhandlerPakCancelSave2 }, // "Cancel" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, }; @@ -3335,7 +3335,7 @@ struct menu_dialog menudialog_savelost = { struct menu_item menuitems_saveelsewhere[] = { { MENUITEMTYPE_LABEL, 0, 0x00000010, 0x00005768, 0x00000000, NULL }, // "Would you like to save your file elsewhere?" { MENUITEMTYPE_SELECTABLE, 0, 0x00000020, 0x00005769, 0x00000000, menuhandlerSaveElsewhere }, // "Yes" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000020, 0x0000576a, 0x00000000, menuhandler00108cd0 }, // "No" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000020, 0x0000576a, 0x00000000, menuhandlerPakCancelSave2 }, // "No" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, };