diff --git a/src/game/game_176d70.c b/src/game/game_176d70.c index b287a7948..a19263cad 100644 --- a/src/game/game_176d70.c +++ b/src/game/game_176d70.c @@ -3670,28 +3670,15 @@ glabel menuhandler00179a50 /* f179acc: 00000000 */ sll $zero,$zero,0x0 ); -GLOBAL_ASM( -glabel menuhandler00179ad0 -/* f179ad0: 27bdffe8 */ addiu $sp,$sp,-24 -/* f179ad4: 24010006 */ addiu $at,$zero,0x6 -/* f179ad8: afbf0014 */ sw $ra,0x14($sp) -/* f179adc: afa5001c */ sw $a1,0x1c($sp) -/* f179ae0: 14810008 */ bne $a0,$at,.L0f179b04 -/* f179ae4: afa60020 */ sw $a2,0x20($sp) -/* f179ae8: 0fc3cdb7 */ jal menuPopDialog -/* f179aec: 00000000 */ sll $zero,$zero,0x0 -/* f179af0: 3c04800b */ lui $a0,0x800b -/* f179af4: 2484cba8 */ addiu $a0,$a0,-13400 -/* f179af8: 24050004 */ addiu $a1,$zero,0x4 -/* f179afc: 0fc42539 */ jal func0f1094e4 -/* f179b00: 00003025 */ or $a2,$zero,$zero -.L0f179b04: -/* f179b04: 8fbf0014 */ lw $ra,0x14($sp) -/* f179b08: 27bd0018 */ addiu $sp,$sp,0x18 -/* f179b0c: 00001025 */ or $v0,$zero,$zero -/* f179b10: 03e00008 */ jr $ra -/* f179b14: 00000000 */ sll $zero,$zero,0x0 -); +s32 menuhandlerMpSaveSetupOverwrite(u32 operation, struct menu_item *item, s32 *value) +{ + if (operation == MENUOP_SET) { + menuPopDialog(); + func0f1094e4(&g_MpSetup.saved, 4, 0); + } + + return 0; +} s32 menuhandlerMpSaveSetupCopy(u32 operation, struct menu_item *item, s32 *value) { diff --git a/src/include/game/game_107fb0.h b/src/include/game/game_107fb0.h index 7c0ab831c..cd4071b79 100644 --- a/src/include/game/game_107fb0.h +++ b/src/include/game/game_107fb0.h @@ -22,7 +22,7 @@ u32 func0f108d8c(void); u32 func0f108f90(void); u32 func0f109038(void); u32 func0f1091e0(void); -void func0f1094e4(void *arg0, s32 arg1, s32 arg2); +void func0f1094e4(bool *saved, s32 arg1, s32 arg2); u32 func0f1096a0(void); u32 func0f1097d0(void); u32 func0f109954(void); diff --git a/src/include/game/game_176d70.h b/src/include/game/game_176d70.h index b9ecef8d8..971f3a9ea 100644 --- a/src/include/game/game_176d70.h +++ b/src/include/game/game_176d70.h @@ -195,7 +195,7 @@ s32 menuhandler00179634(u32, u32, u32 *); s32 menuhandler00179968(u32, u32, u32 *); s32 menuhandlerMpConfirmSaveChr(u32 operation, struct menu_item *item, s32 *value); s32 menuhandler00179a50(u32, u32, u32 *); -s32 menuhandler00179ad0(u32, u32, u32 *); +s32 menuhandlerMpSaveSetupOverwrite(u32 operation, struct menu_item *item, s32 *value); s32 menuhandlerMpSaveSetupCopy(u32 operation, struct menu_item *item, s32 *value); s32 menuhandler0017a20c(u32, u32, u32 *); s32 menuhandler0017b3b8(u32, u32, u32 *); diff --git a/src/setup/setup_020df0.c b/src/setup/setup_020df0.c index 6f8fc7862..161b9eb77 100644 --- a/src/setup/setup_020df0.c +++ b/src/setup/setup_020df0.c @@ -10376,7 +10376,7 @@ struct menu_item menuitems_mpsavesetup[] = { { MENUITEMTYPE_LABEL, 0, 0x00000210, 0x000054e6, (u32)&func0f179b58, NULL }, // "Name:" { MENUITEMTYPE_LABEL, 0, 0x00000230, (u32)&func0f108078, 0x00000000, NULL }, { MENUITEMTYPE_LABEL, 0, 0x00000010, 0x000050b8, 0x00000000, NULL }, // "Do you want to save over your original game file?" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, 0x000050b9, 0x00000000, menuhandler00179ad0 }, // "Save Over Original" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, 0x000050b9, 0x00000000, menuhandlerMpSaveSetupOverwrite }, // "Save Over Original" { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, 0x000050ba, 0x00000000, menuhandlerMpSaveSetupCopy }, // "Save Copy" { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, 0x000050bb, 0x00000000, NULL }, // "Do Not Save" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },