From 59278cc0eb2c4a77c45233c91ea0cbf656e61bb7 Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Sat, 4 Jan 2020 14:44:16 +1000
Subject: [PATCH] Decompile menuhandlerPakCancelSave

---
 src/game/game_107fb0.c         | 25 ++++++++-----------------
 src/include/game/game_107fb0.h |  2 +-
 src/setup/setup_0160b0.c       |  2 +-
 3 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/src/game/game_107fb0.c b/src/game/game_107fb0.c
index cc2d03fd6..9762f5b19 100644
--- a/src/game/game_107fb0.c
+++ b/src/game/game_107fb0.c
@@ -2971,23 +2971,14 @@ glabel menuhandlerSaveLocation
 /*  f10a450:	00000000 */ 	sll	$zero,$zero,0x0
 );
 
-GLOBAL_ASM(
-glabel menuhandler0010a454
-/*  f10a454:	27bdffe8 */ 	addiu	$sp,$sp,-24
-/*  f10a458:	24010006 */ 	addiu	$at,$zero,0x6
-/*  f10a45c:	afbf0014 */ 	sw	$ra,0x14($sp)
-/*  f10a460:	afa5001c */ 	sw	$a1,0x1c($sp)
-/*  f10a464:	14810003 */ 	bne	$a0,$at,.L0f10a474
-/*  f10a468:	afa60020 */ 	sw	$a2,0x20($sp)
-/*  f10a46c:	0fc3cdb7 */ 	jal	menuPopDialog
-/*  f10a470:	00000000 */ 	sll	$zero,$zero,0x0
-.L0f10a474:
-/*  f10a474:	8fbf0014 */ 	lw	$ra,0x14($sp)
-/*  f10a478:	27bd0018 */ 	addiu	$sp,$sp,0x18
-/*  f10a47c:	00001025 */ 	or	$v0,$zero,$zero
-/*  f10a480:	03e00008 */ 	jr	$ra
-/*  f10a484:	00000000 */ 	sll	$zero,$zero,0x0
-);
+s32 menuhandlerPakCancelSave(u32 operation, struct menu_item *item, s32 *value)
+{
+	if (operation == MENUOP_SET) {
+		menuPopDialog();
+	}
+
+	return 0;
+}
 
 GLOBAL_ASM(
 glabel menuhandler0010a488
diff --git a/src/include/game/game_107fb0.h b/src/include/game/game_107fb0.h
index 776d5e8b4..d785dbfeb 100644
--- a/src/include/game/game_107fb0.h
+++ b/src/include/game/game_107fb0.h
@@ -68,7 +68,7 @@ s32 menuhandler00108ecc(u32, u32, u32 *);
 s32 menuhandler00108f08(u32, u32, u32 *);
 s32 menuhandler0010a120(u32, u32, u32 *);
 s32 menuhandler0010a160(u32, u32, u32 *);
-s32 menuhandler0010a454(u32, u32, u32 *);
+s32 menuhandlerPakCancelSave(u32 operation, struct menu_item *item, s32 *value);
 s32 menuhandler0010a488(u32, u32, u32 *);
 s32 menuhandler0010a5ac(u32, u32, u32 *);
 s32 menuhandler0010b14c(u32, u32, u32 *);
diff --git a/src/setup/setup_0160b0.c b/src/setup/setup_0160b0.c
index 8c8b8a81a..156c29c5b 100644
--- a/src/setup/setup_0160b0.c
+++ b/src/setup/setup_0160b0.c
@@ -3434,7 +3434,7 @@ struct menu_item menuitems_selectlocation[] = {
 	{ MENUITEMTYPE_SELECTABLE,  3, 0x00000000, (u32)&func0f10a22c, (u32)&func0f10a2ec, menuhandlerSaveLocation },
 	{ MENUITEMTYPE_SEPARATOR,   0, 0x00000000, 0x00000000, 0x00000000, NULL },
 	{ MENUITEMTYPE_SELECTABLE,  0, 0x00000000, 0x00005772, 0x00000000, menuhandler0010a488 }, // "Delete Files..."
-	{ MENUITEMTYPE_SELECTABLE,  0, 0x00000000, 0x00005773, 0x00000000, menuhandler0010a454 }, // "Cancel"
+	{ MENUITEMTYPE_SELECTABLE,  0, 0x00000000, 0x00005773, 0x00000000, menuhandlerPakCancelSave }, // "Cancel"
 	{ MENUITEMTYPE_END,         0, 0x00000000, 0x00000000, 0x00000000, NULL },
 };