diff --git a/src/game/game_107fb0.c b/src/game/game_107fb0.c index 0717f0052..cc2d03fd6 100644 --- a/src/game/game_107fb0.c +++ b/src/game/game_107fb0.c @@ -1209,23 +1209,14 @@ glabel func0f108a80 /* f108bec: 00000000 */ sll $zero,$zero,0x0 ); -GLOBAL_ASM( -glabel menuhandler00108bf0 -/* f108bf0: 27bdffe8 */ addiu $sp,$sp,-24 -/* f108bf4: 24010006 */ addiu $at,$zero,0x6 -/* f108bf8: afbf0014 */ sw $ra,0x14($sp) -/* f108bfc: afa5001c */ sw $a1,0x1c($sp) -/* f108c00: 14810003 */ bne $a0,$at,.L0f108c10 -/* f108c04: afa60020 */ sw $a2,0x20($sp) -/* f108c08: 0fc4240e */ jal func0f109038 -/* f108c0c: 24040002 */ addiu $a0,$zero,0x2 -.L0f108c10: -/* f108c10: 8fbf0014 */ lw $ra,0x14($sp) -/* f108c14: 27bd0018 */ addiu $sp,$sp,0x18 -/* f108c18: 00001025 */ or $v0,$zero,$zero -/* f108c1c: 03e00008 */ jr $ra -/* f108c20: 00000000 */ sll $zero,$zero,0x0 -); +s32 menuhandlerPakErrorTryAgain(u32 operation, struct menu_item *item, s32 *value) +{ + if (operation == MENUOP_SET) { + func0f109038(2); + } + + return 0; +} GLOBAL_ASM( glabel menuhandlerSaveElsewhere diff --git a/src/include/game/game_107fb0.h b/src/include/game/game_107fb0.h index cd4071b79..776d5e8b4 100644 --- a/src/include/game/game_107fb0.h +++ b/src/include/game/game_107fb0.h @@ -20,7 +20,7 @@ u32 func0f10898c(void); u32 func0f108a80(void); u32 func0f108d8c(void); u32 func0f108f90(void); -u32 func0f109038(void); +void func0f109038(s32 arg0); u32 func0f1091e0(void); void func0f1094e4(bool *saved, s32 arg1, s32 arg2); u32 func0f1096a0(void); @@ -61,7 +61,7 @@ s32 menudialog0010cc08(u32, u32, u32 *); s32 menuhandler00108014(u32, u32, u32 *); s32 menuhandler00108254(u32, u32, u32 *); s32 menuhandler001084b8(u32, u32, u32 *); -s32 menuhandler00108bf0(u32, u32, u32 *); +s32 menuhandlerPakErrorTryAgain(u32 operation, struct menu_item *item, s32 *value); s32 menuhandler00108cd0(u32, u32, u32 *); s32 menuhandler00108d48(u32, u32, u32 *); s32 menuhandler00108ecc(u32, u32, u32 *); diff --git a/src/setup/setup_0160b0.c b/src/setup/setup_0160b0.c index 31d52a7d2..8c8b8a81a 100644 --- a/src/setup/setup_0160b0.c +++ b/src/setup/setup_0160b0.c @@ -3297,7 +3297,7 @@ struct menu_dialog menudialog_filesaved = { struct menu_item menuitems_saveerror[] = { { MENUITEMTYPE_LABEL, 0, 0x00000010, (u32)&func0f108078, 0x00000000, menuhandler00108014 }, { MENUITEMTYPE_LABEL, 0, 0x00000010, 0x0000575c, 0x00000000, NULL }, // "An error occurred while trying to save" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000020, 0x0000575d, 0x00000000, menuhandler00108bf0 }, // "Try Again" + { 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_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },