From 17c439fd6525b238bf5ff195bb1effab6704d869 Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Sat, 4 Jan 2020 14:53:28 +1000
Subject: [PATCH] Decompile menuhandlerPakCancelDuplicateSave

---
 src/game/game_107fb0.c         | 28 +++++++++-------------------
 src/include/game/game_107fb0.h |  2 +-
 src/setup/setup_0160b0.c       |  2 +-
 3 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/src/game/game_107fb0.c b/src/game/game_107fb0.c
index 5662b406b..c8e13395a 100644
--- a/src/game/game_107fb0.c
+++ b/src/game/game_107fb0.c
@@ -2735,25 +2735,15 @@ glabel menuhandler0010a120
 /*  f10a15c:	00000000 */ 	sll	$zero,$zero,0x0
 );
 
-GLOBAL_ASM(
-glabel menuhandler0010a160
-/*  f10a160:	27bdffe8 */ 	addiu	$sp,$sp,-24
-/*  f10a164:	24010006 */ 	addiu	$at,$zero,0x6
-/*  f10a168:	afbf0014 */ 	sw	$ra,0x14($sp)
-/*  f10a16c:	afa5001c */ 	sw	$a1,0x1c($sp)
-/*  f10a170:	14810005 */ 	bne	$a0,$at,.L0f10a188
-/*  f10a174:	afa60020 */ 	sw	$a2,0x20($sp)
-/*  f10a178:	0fc3cdb7 */ 	jal	menuPopDialog
-/*  f10a17c:	00000000 */ 	sll	$zero,$zero,0x0
-/*  f10a180:	0fc3cdb7 */ 	jal	menuPopDialog
-/*  f10a184:	00000000 */ 	sll	$zero,$zero,0x0
-.L0f10a188:
-/*  f10a188:	8fbf0014 */ 	lw	$ra,0x14($sp)
-/*  f10a18c:	27bd0018 */ 	addiu	$sp,$sp,0x18
-/*  f10a190:	00001025 */ 	or	$v0,$zero,$zero
-/*  f10a194:	03e00008 */ 	jr	$ra
-/*  f10a198:	00000000 */ 	sll	$zero,$zero,0x0
-);
+s32 menuhandlerPakCancelDuplicateSave(u32 operation, struct menu_item *item, s32 *value)
+{
+	if (operation == MENUOP_SET) {
+		menuPopDialog();
+		menuPopDialog();
+	}
+
+	return 0;
+}
 
 GLOBAL_ASM(
 glabel func0f10a19c
diff --git a/src/include/game/game_107fb0.h b/src/include/game/game_107fb0.h
index e1d0c89f0..d55b95a1e 100644
--- a/src/include/game/game_107fb0.h
+++ b/src/include/game/game_107fb0.h
@@ -67,7 +67,7 @@ s32 menuhandler00108d48(u32, u32, u32 *);
 s32 menuhandler00108ecc(u32 operation, struct menu_item *item, s32 *value);
 s32 menuhandler00108f08(u32, u32, u32 *);
 s32 menuhandler0010a120(u32, u32, u32 *);
-s32 menuhandler0010a160(u32, u32, u32 *);
+s32 menuhandlerPakCancelDuplicateSave(u32 operation, struct menu_item *item, s32 *value);
 s32 menuhandlerPakCancelSave(u32 operation, struct menu_item *item, s32 *value);
 s32 menuhandler0010a488(u32, u32, u32 *);
 s32 menuhandlerPakConfirmDelete(u32 operation, struct menu_item *item, s32 *value);
diff --git a/src/setup/setup_0160b0.c b/src/setup/setup_0160b0.c
index c44569311..79faf829f 100644
--- a/src/setup/setup_0160b0.c
+++ b/src/setup/setup_0160b0.c
@@ -3399,7 +3399,7 @@ struct menu_item menuitems_duplicatefilename[] = {
 	{ MENUITEMTYPE_LABEL,       0, 0x02000030, (u32)&func0f10a1ec, 0x00000000, NULL },
 	{ MENUITEMTYPE_SELECTABLE,  0, 0x00000000, 0x000054eb, 0x00000000, menuhandler0010a120 }, // "Rename File"
 	{ MENUITEMTYPE_SELECTABLE,  0, 0x00000008, 0x000054ec, 0x00000000, NULL }, // "Change Location"
-	{ MENUITEMTYPE_SELECTABLE,  0, 0x00000000, 0x000054ed, 0x00000000, menuhandler0010a160 }, // "Cancel"
+	{ MENUITEMTYPE_SELECTABLE,  0, 0x00000000, 0x000054ed, 0x00000000, menuhandlerPakCancelDuplicateSave }, // "Cancel"
 	{ MENUITEMTYPE_END,         0, 0x00000000, 0x00000000, 0x00000000, NULL },
 };