diff --git a/src/game/game_176d70.c b/src/game/game_176d70.c index 7206c3837..0c9f241db 100644 --- a/src/game/game_176d70.c +++ b/src/game/game_176d70.c @@ -3620,26 +3620,15 @@ glabel menuhandler00179968 /* f179a0c: 00000000 */ sll $zero,$zero,0x0 ); -GLOBAL_ASM( -glabel menuhandler00179a10 -/* f179a10: 27bdffe8 */ addiu $sp,$sp,-24 -/* f179a14: 24010006 */ addiu $at,$zero,0x6 -/* f179a18: afbf0014 */ sw $ra,0x14($sp) -/* f179a1c: afa5001c */ sw $a1,0x1c($sp) -/* f179a20: 14810006 */ bne $a0,$at,.L0f179a3c -/* f179a24: afa60020 */ sw $a2,0x20($sp) -/* f179a28: 0fc3cdb7 */ jal menuPopDialog -/* f179a2c: 00000000 */ sll $zero,$zero,0x0 -/* f179a30: 24040006 */ addiu $a0,$zero,0x6 -/* f179a34: 0fc42947 */ jal func0f10a51c -/* f179a38: 24050002 */ addiu $a1,$zero,0x2 -.L0f179a3c: -/* f179a3c: 8fbf0014 */ lw $ra,0x14($sp) -/* f179a40: 27bd0018 */ addiu $sp,$sp,0x18 -/* f179a44: 00001025 */ or $v0,$zero,$zero -/* f179a48: 03e00008 */ jr $ra -/* f179a4c: 00000000 */ sll $zero,$zero,0x0 -); +s32 menuhandlerMpConfirmSaveChr(u32 operation, struct menu_item *item, s32 *value) +{ + if (operation == MENUOP_SET) { + menuPopDialog(); + func0f10a51c(6, 2); + } + + return 0; +} GLOBAL_ASM( glabel menuhandler00179a50 diff --git a/src/include/game/game_107fb0.h b/src/include/game/game_107fb0.h index b2b519376..7c0ab831c 100644 --- a/src/include/game/game_107fb0.h +++ b/src/include/game/game_107fb0.h @@ -35,7 +35,7 @@ u32 func0f10a19c(void); u32 func0f10a1ec(void); u32 func0f10a22c(void); u32 func0f10a2ec(void); -u32 func0f10a51c(void); +void func0f10a51c(s32 arg0, s32 arg1); u32 func0f10a5e8(void); u32 func0f10a630(void); u32 func0f10a97c(void); diff --git a/src/include/game/game_176d70.h b/src/include/game/game_176d70.h index 1266acee0..41b21dfad 100644 --- a/src/include/game/game_176d70.h +++ b/src/include/game/game_176d70.h @@ -193,7 +193,7 @@ s32 menuhandlerMpTeamsLabel(u32 operation, struct menu_item *item, s32 *value); s32 menuhandler001791c8(u32, u32, u32 *); s32 menuhandler00179634(u32, u32, u32 *); s32 menuhandler00179968(u32, u32, u32 *); -s32 menuhandler00179a10(u32, u32, u32 *); +s32 menuhandlerMpConfirmSaveChr(u32 operation, struct menu_item *item, s32 *value); s32 menuhandler00179a50(u32, u32, u32 *); s32 menuhandler00179ad0(u32, u32, u32 *); s32 menuhandler00179b18(u32, u32, u32 *); diff --git a/src/setup/setup_020df0.c b/src/setup/setup_020df0.c index ecf244c89..d13756e6d 100644 --- a/src/setup/setup_020df0.c +++ b/src/setup/setup_020df0.c @@ -10340,7 +10340,7 @@ struct menu_item menuitems_mpsavechr[] = { { MENUITEMTYPE_LABEL, 0, 0x00000010, 0x000050bf, 0x00000000, NULL }, // "Your player file is always saved automatically." { MENUITEMTYPE_LABEL, 0, 0x00000010, 0x000050c0, 0x00000000, NULL }, // "Save a copy now?" { MENUITEMTYPE_SELECTABLE, 0, 0x00000008, 0x000050c1, 0x00000000, NULL }, // "No" - { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, 0x000050c2, 0x00000000, menuhandler00179a10 }, // "Yes" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000000, 0x000050c2, 0x00000000, menuhandlerMpConfirmSaveChr }, // "Yes" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, };