diff --git a/src/game/game_107fb0.c b/src/game/game_107fb0.c index 9762f5b19..b4e99eb1f 100644 --- a/src/game/game_107fb0.c +++ b/src/game/game_107fb0.c @@ -1969,7 +1969,7 @@ glabel func0f1094e4 ); GLOBAL_ASM( -glabel func0f1096a0 +glabel pakDeleteFile /* f1096a0: 27bdffd8 */ addiu $sp,$sp,-40 /* f1096a4: afb30020 */ sw $s3,0x20($sp) /* f1096a8: 3c13800a */ lui $s3,%hi(var800a21f0) @@ -3062,25 +3062,15 @@ glabel func0f10a51c /* f10a5a8: 00000000 */ sll $zero,$zero,0x0 ); -GLOBAL_ASM( -glabel menuhandler0010a5ac -/* f10a5ac: 27bdffe8 */ addiu $sp,$sp,-24 -/* f10a5b0: 24010006 */ addiu $at,$zero,0x6 -/* f10a5b4: afbf0014 */ sw $ra,0x14($sp) -/* f10a5b8: afa5001c */ sw $a1,0x1c($sp) -/* f10a5bc: 14810005 */ bne $a0,$at,.L0f10a5d4 -/* f10a5c0: afa60020 */ sw $a2,0x20($sp) -/* f10a5c4: 0fc3cdb7 */ jal menuPopDialog -/* f10a5c8: 00000000 */ sll $zero,$zero,0x0 -/* f10a5cc: 0fc425a8 */ jal func0f1096a0 -/* f10a5d0: 00000000 */ sll $zero,$zero,0x0 -.L0f10a5d4: -/* f10a5d4: 8fbf0014 */ lw $ra,0x14($sp) -/* f10a5d8: 27bd0018 */ addiu $sp,$sp,0x18 -/* f10a5dc: 00001025 */ or $v0,$zero,$zero -/* f10a5e0: 03e00008 */ jr $ra -/* f10a5e4: 00000000 */ sll $zero,$zero,0x0 -); +s32 menuhandlerPakConfirmDelete(u32 operation, struct menu_item *item, s32 *value) +{ + if (operation == MENUOP_SET) { + menuPopDialog(); + pakDeleteFile(); + } + + return 0; +} GLOBAL_ASM( glabel func0f10a5e8 diff --git a/src/include/game/game_107fb0.h b/src/include/game/game_107fb0.h index d785dbfeb..f7c83b43a 100644 --- a/src/include/game/game_107fb0.h +++ b/src/include/game/game_107fb0.h @@ -23,7 +23,7 @@ u32 func0f108f90(void); void func0f109038(s32 arg0); u32 func0f1091e0(void); void func0f1094e4(bool *saved, s32 arg1, s32 arg2); -u32 func0f1096a0(void); +u32 pakDeleteFile(void); u32 func0f1097d0(void); u32 func0f109954(void); u32 func0f1099a8(void); @@ -70,7 +70,7 @@ s32 menuhandler0010a120(u32, u32, u32 *); s32 menuhandler0010a160(u32, u32, u32 *); s32 menuhandlerPakCancelSave(u32 operation, struct menu_item *item, s32 *value); s32 menuhandler0010a488(u32, u32, u32 *); -s32 menuhandler0010a5ac(u32, u32, u32 *); +s32 menuhandlerPakConfirmDelete(u32 operation, struct menu_item *item, s32 *value); s32 menuhandler0010b14c(u32, u32, u32 *); s32 menuhandler0010b974(u32, u32, u32 *); s32 menuhandler0010bc98(u32, u32, u32 *); diff --git a/src/setup/setup_0160b0.c b/src/setup/setup_0160b0.c index 156c29c5b..ddc660067 100644 --- a/src/setup/setup_0160b0.c +++ b/src/setup/setup_0160b0.c @@ -3454,7 +3454,7 @@ struct menu_item menuitems_confirmdelete[] = { { MENUITEMTYPE_LABEL, 0, 0x00000230, (u32)&func0f108078, 0x00000000, menuhandler00108014 }, { MENUITEMTYPE_LABEL, 0, 0x00000010, 0x0000577c, 0x00000000, NULL }, // "Are you sure you want to delete this file?" { MENUITEMTYPE_SELECTABLE, 0, 0x00000028, 0x0000577d, 0x00000000, NULL }, // "Cancel" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000020, 0x0000577e, 0x00000000, menuhandler0010a5ac }, // "OK" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000020, 0x0000577e, 0x00000000, menuhandlerPakConfirmDelete }, // "OK" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, };