From c88fa5d6b8ea097fe13de796ce5d35aa7b168823 Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Wed, 18 Mar 2020 23:42:06 +1000
Subject: [PATCH] Decompile mpMenuTextSavePlayerOrCopy

---
 src/game/data/data_01a3a0.c    |  2 +-
 src/game/data/data_020df0.c    |  2 +-
 src/game/game_179060.c         | 42 +++++++++-------------------------
 src/include/game/game_179060.h |  2 +-
 src/include/types.h            |  2 +-
 5 files changed, 15 insertions(+), 35 deletions(-)

diff --git a/src/game/data/data_01a3a0.c b/src/game/data/data_01a3a0.c
index a783e8a70..4db01b784 100644
--- a/src/game/data/data_01a3a0.c
+++ b/src/game/data/data_01a3a0.c
@@ -536,7 +536,7 @@ struct menu_item menuitems_mpplayersetup[] = {
 	{ MENUITEMTYPE_SELECTABLE,  0, 0x00000004, L_MPMENU(35), 0x00000000, &menudialog_mpplayerstats }, // "Statistics"
 	{ MENUITEMTYPE_SEPARATOR,   0, 0x00000000, 0x00000000, 0x00000000, NULL },
 	{ MENUITEMTYPE_SELECTABLE,  0, 0x00000004, L_MPMENU(29), 0x00000000, &menudialog_mploadplayer }, // "Load Player"
-	{ MENUITEMTYPE_SELECTABLE,  0, 0x00000000, (u32)&func0f17eed4, 0x00000000, menuhandlerMpSavePlayer },
+	{ MENUITEMTYPE_SELECTABLE,  0, 0x00000000, (u32)&mpMenuTextSavePlayerOrCopy, 0x00000000, menuhandlerMpSavePlayer },
 	{ MENUITEMTYPE_END,         0, 0x00000000, 0x00000000, 0x00000000, NULL },
 };
 
diff --git a/src/game/data/data_020df0.c b/src/game/data/data_020df0.c
index 7af8947c6..54731e83c 100644
--- a/src/game/data/data_020df0.c
+++ b/src/game/data/data_020df0.c
@@ -11160,7 +11160,7 @@ struct menu_item menuitems_mpplayersetup4[] = {
 	{ MENUITEMTYPE_SELECTABLE,  0, 0x00000004, L_MPMENU(35), 0x00000000, &menudialog_mpplayerstats }, // "Statistics"
 	{ MENUITEMTYPE_SEPARATOR,   0, 0x00000000, 0x00000000, 0x00000000, NULL },
 	{ MENUITEMTYPE_SELECTABLE,  0, 0x00000004, L_MPMENU(29), 0x00000000, &menudialog_mploadplayer }, // "Load Player"
-	{ MENUITEMTYPE_SELECTABLE,  0, 0x00000000, (u32)&func0f17eed4, 0x00000000, menuhandlerMpSavePlayer },
+	{ MENUITEMTYPE_SELECTABLE,  0, 0x00000000, (u32)&mpMenuTextSavePlayerOrCopy, 0x00000000, menuhandlerMpSavePlayer },
 	{ MENUITEMTYPE_END,         0, 0x00000000, 0x00000000, 0x00000000, NULL },
 };
 
diff --git a/src/game/game_179060.c b/src/game/game_179060.c
index c38f8898b..59ef318ee 100644
--- a/src/game/game_179060.c
+++ b/src/game/game_179060.c
@@ -3569,8 +3569,8 @@ s32 menuhandlerMpRestoreHandicapDefaults(u32 operation, struct menu_item *item,
 bool menudialogMpReady(u32 operation, struct menu_dialog *dialog, struct menustackitem *stackitem)
 {
 	if (operation == MENUOP_100) {
-		if (g_MpPlayers[g_MpPlayerNum].unk4c && g_MpPlayers[g_MpPlayerNum].unk50) {
-			func0f1094e4(&g_MpPlayers[g_MpPlayerNum].unk4c, 3, g_MpPlayerNum);
+		if (g_MpPlayers[g_MpPlayerNum].saved && g_MpPlayers[g_MpPlayerNum].unk50) {
+			func0f1094e4(&g_MpPlayers[g_MpPlayerNum].saved, 3, g_MpPlayerNum);
 		}
 	}
 
@@ -5873,7 +5873,7 @@ char *menuhandlerMpLock(u32 operation, struct menu_item *item, s32 *value)
 s32 menuhandlerMpSavePlayer(u32 operation, struct menu_item *item, s32 *value)
 {
 	if (operation == MENUOP_SET) {
-		if (g_MpPlayers[g_MpPlayerNum].unk4c == 0) {
+		if (g_MpPlayers[g_MpPlayerNum].saved == false) {
 			func0f10a51c(6, 2);
 		} else {
 			menuPushDialog(&g_MpSaveChrMenuDialog);
@@ -5883,34 +5883,14 @@ s32 menuhandlerMpSavePlayer(u32 operation, struct menu_item *item, s32 *value)
 	return 0;
 }
 
-GLOBAL_ASM(
-glabel func0f17eed4
-/*  f17eed4:	3c0e8007 */ 	lui	$t6,%hi(g_MpPlayerNum)
-/*  f17eed8:	8dce1448 */ 	lw	$t6,%lo(g_MpPlayerNum)($t6)
-/*  f17eedc:	3c18800b */ 	lui	$t8,%hi(g_MpPlayers+0x4c)
-/*  f17eee0:	27bdffe8 */ 	addiu	$sp,$sp,-24
-/*  f17eee4:	000e7880 */ 	sll	$t7,$t6,0x2
-/*  f17eee8:	01ee7821 */ 	addu	$t7,$t7,$t6
-/*  f17eeec:	000f7940 */ 	sll	$t7,$t7,0x5
-/*  f17eef0:	030fc021 */ 	addu	$t8,$t8,$t7
-/*  f17eef4:	8f18c804 */ 	lw	$t8,%lo(g_MpPlayers+0x4c)($t8)
-/*  f17eef8:	afbf0014 */ 	sw	$ra,0x14($sp)
-/*  f17eefc:	afa40018 */ 	sw	$a0,0x18($sp)
-/*  f17ef00:	17000005 */ 	bnez	$t8,.L0f17ef18
-/*  f17ef04:	00000000 */ 	sll	$zero,$zero,0x0
-/*  f17ef08:	0fc5b9f1 */ 	jal	langGet
-/*  f17ef0c:	24045026 */ 	addiu	$a0,$zero,0x5026
-/*  f17ef10:	10000004 */ 	beqz	$zero,.L0f17ef24
-/*  f17ef14:	8fbf0014 */ 	lw	$ra,0x14($sp)
-.L0f17ef18:
-/*  f17ef18:	0fc5b9f1 */ 	jal	langGet
-/*  f17ef1c:	24045027 */ 	addiu	$a0,$zero,0x5027
-/*  f17ef20:	8fbf0014 */ 	lw	$ra,0x14($sp)
-.L0f17ef24:
-/*  f17ef24:	27bd0018 */ 	addiu	$sp,$sp,0x18
-/*  f17ef28:	03e00008 */ 	jr	$ra
-/*  f17ef2c:	00000000 */ 	sll	$zero,$zero,0x0
-);
+char *mpMenuTextSavePlayerOrCopy(struct menu_item *item)
+{
+	if (g_MpPlayers[g_MpPlayerNum].saved == false) {
+		return langGet(L_MPMENU(38)); // "Save Player"
+	}
+
+	return langGet(L_MPMENU(39)); // "Save Copy of Player"
+}
 
 s32 menuhandler0017ef30(u32 operation, struct menu_item *item, s32 *value)
 {
diff --git a/src/include/game/game_179060.h b/src/include/game/game_179060.h
index f935b607d..f32c5ed6d 100644
--- a/src/include/game/game_179060.h
+++ b/src/include/game/game_179060.h
@@ -59,7 +59,7 @@ s32 menudialog0017e3fc(u32, u32, u32 *);
 s32 menuhandler0017e4d4(u32, u32, u32 *);
 u32 func0f17eac8(void);
 s32 menudialog0017eb34(u32, u32, u32 *);
-u32 func0f17eed4(void);
+char *mpMenuTextSavePlayerOrCopy(struct menu_item *item);
 u32 func0f17f024(void);
 u32 func0f17f088(void);
 u32 func0f17f100(void);
diff --git a/src/include/types.h b/src/include/types.h
index 62dc9d473..b12f32f3c 100644
--- a/src/include/types.h
+++ b/src/include/types.h
@@ -4365,7 +4365,7 @@ struct mpchr {
 struct mpplayer {
 	/*0x00*/ struct mpchr base;
 	/*0x48*/ u16 options;
-	/*0x4c*/ u32 unk4c;
+	/*0x4c*/ bool saved;
 	/*0x50*/ u16 unk50;
 	/*0x54*/ u32 kills;
 	/*0x58*/ u32 deaths;