From 9b232e86cf5755d3b2639d528be3ce518d1d8007 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Sat, 4 Jan 2020 14:57:38 +1000 Subject: [PATCH] Decompile menuhandlerAcknowledgePakFileLost --- src/game/game_107fb0.c | 31 ++++++++++--------------------- src/include/game/game_107fb0.h | 2 +- src/setup/setup_0160b0.c | 2 +- 3 files changed, 12 insertions(+), 23 deletions(-) diff --git a/src/game/game_107fb0.c b/src/game/game_107fb0.c index 95735308b..2511401fa 100644 --- a/src/game/game_107fb0.c +++ b/src/game/game_107fb0.c @@ -1303,27 +1303,16 @@ glabel menuhandler00108cd0 /* f108d44: 00000000 */ sll $zero,$zero,0x0 ); -GLOBAL_ASM( -glabel menuhandler00108d48 -/* f108d48: 27bdffe8 */ addiu $sp,$sp,-24 -/* f108d4c: 24010006 */ addiu $at,$zero,0x6 -/* f108d50: afbf0014 */ sw $ra,0x14($sp) -/* f108d54: afa5001c */ sw $a1,0x1c($sp) -/* f108d58: 14810007 */ bne $a0,$at,.L0f108d78 -/* f108d5c: afa60020 */ sw $a2,0x20($sp) -/* f108d60: 0fc3ccef */ jal func0f0f33bc -/* f108d64: 00000000 */ sll $zero,$zero,0x0 -/* f108d68: 0fc42263 */ jal func0f10898c -/* f108d6c: 00000000 */ sll $zero,$zero,0x0 -/* f108d70: 0fc3cd87 */ jal func0f0f361c -/* f108d74: 00000000 */ sll $zero,$zero,0x0 -.L0f108d78: -/* f108d78: 8fbf0014 */ lw $ra,0x14($sp) -/* f108d7c: 27bd0018 */ addiu $sp,$sp,0x18 -/* f108d80: 00001025 */ or $v0,$zero,$zero -/* f108d84: 03e00008 */ jr $ra -/* f108d88: 00000000 */ sll $zero,$zero,0x0 -); +s32 menuhandlerAcknowledgePakFileLost(u32 operation, struct menu_item *item, s32 *value) +{ + if (operation == MENUOP_SET) { + func0f0f33bc(); + func0f10898c(); + func0f0f361c(); + } + + return 0; +} GLOBAL_ASM( glabel func0f108d8c diff --git a/src/include/game/game_107fb0.h b/src/include/game/game_107fb0.h index f8a35d6de..6283a3ab4 100644 --- a/src/include/game/game_107fb0.h +++ b/src/include/game/game_107fb0.h @@ -63,7 +63,7 @@ s32 menuhandler00108254(u32, u32, u32 *); s32 menuhandler001084b8(u32, u32, u32 *); s32 menuhandlerPakErrorTryAgain(u32 operation, struct menu_item *item, s32 *value); s32 menuhandler00108cd0(u32, u32, u32 *); -s32 menuhandler00108d48(u32, u32, u32 *); +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 *); s32 menuhandlerPakRenameDuplicateSave(u32 operation, struct menu_item *item, s32 *value); diff --git a/src/setup/setup_0160b0.c b/src/setup/setup_0160b0.c index 7af15f6e4..e873f84b8 100644 --- a/src/setup/setup_0160b0.c +++ b/src/setup/setup_0160b0.c @@ -3317,7 +3317,7 @@ struct menu_dialog menudialog_saveerror = { struct menu_item menuitems_savelost[] = { { MENUITEMTYPE_LABEL, 0, 0x00000010, (u32)&func0f108078, 0x00000000, menuhandler00108014 }, { MENUITEMTYPE_LABEL, 0, 0x00000010, 0x000054fb, 0x00000000, NULL }, // "The saved file has been erased due to corruption or damage." - { MENUITEMTYPE_SELECTABLE, 0, 0x00000020, 0x00005762, 0x00000000, menuhandler00108d48 }, // "Cancel" + { MENUITEMTYPE_SELECTABLE, 0, 0x00000020, 0x00005762, 0x00000000, menuhandlerAcknowledgePakFileLost }, // "Cancel" { MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, };