From b06fddef8092f0282cb24cdf034c4a9f6a306542 Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Fri, 20 Mar 2020 20:02:09 +1000
Subject: [PATCH] Decompile soloMenuTextNumLimbShots

---
 src/game/data/data_01a3a0.c    |  4 ++--
 src/game/game_10ccd0.c         | 25 +++++--------------------
 src/include/game/game_10ccd0.h |  2 +-
 3 files changed, 8 insertions(+), 23 deletions(-)

diff --git a/src/game/data/data_01a3a0.c b/src/game/data/data_01a3a0.c
index 34fac8691..92d45be4b 100644
--- a/src/game/data/data_01a3a0.c
+++ b/src/game/data/data_01a3a0.c
@@ -844,7 +844,7 @@ struct menu_item menuitems_1b7bc[] = {
 	{ MENUITEMTYPE_LABEL,       0, 0x00000000, L_OPTIONS(284), (u32)&soloMenuTextNumShots, NULL }, // "Shot Total:"
 	{ MENUITEMTYPE_LABEL,       0, L_AME(0), L_OPTIONS(285), (u32)&soloMenuTextNumHeadShots, NULL }, // "Head Shots:"
 	{ MENUITEMTYPE_LABEL,       0, L_AME(0), L_OPTIONS(286), (u32)&soloMenuTextNumBodyShots, NULL }, // "Body Shots:"
-	{ MENUITEMTYPE_LABEL,       0, L_AME(0), L_OPTIONS(287), (u32)&func0f10d140, NULL }, // "Limb Shots:"
+	{ MENUITEMTYPE_LABEL,       0, L_AME(0), L_OPTIONS(287), (u32)&soloMenuTextNumLimbShots, NULL }, // "Limb Shots:"
 	{ MENUITEMTYPE_LABEL,       0, L_AME(0), L_OPTIONS(288), (u32)&func0f10d180, NULL }, // "Others:"
 	{ MENUITEMTYPE_SEPARATOR,   0, 0x00000000, 0x00000000, 0x00000000, NULL },
 	{ MENUITEMTYPE_SELECTABLE,  0, 0x00000020, L_OPTIONS(289), 0x00000000, NULL }, // "Press START"
@@ -872,7 +872,7 @@ struct menu_item menuitems_1b98c[] = {
 	{ MENUITEMTYPE_LABEL,       0, 0x00000000, L_OPTIONS(284), (u32)&soloMenuTextNumShots, NULL }, // "Shot Total:"
 	{ MENUITEMTYPE_LABEL,       0, 0x00000000, L_OPTIONS(285), (u32)&soloMenuTextNumHeadShots, NULL }, // "Head Shots:"
 	{ MENUITEMTYPE_LABEL,       0, 0x00000000, L_OPTIONS(286), (u32)&soloMenuTextNumBodyShots, NULL }, // "Body Shots:"
-	{ MENUITEMTYPE_LABEL,       6, 0x00000000, L_OPTIONS(287), (u32)&func0f10d140, menuhandler0010e064 }, // "Limb Shots:"
+	{ MENUITEMTYPE_LABEL,       6, 0x00000000, L_OPTIONS(287), (u32)&soloMenuTextNumLimbShots, menuhandler0010e064 }, // "Limb Shots:"
 	{ MENUITEMTYPE_LABEL,       4, 0x00000000, L_OPTIONS(288), (u32)&func0f10d180, menuhandler0010e064 }, // "Others:"
 	{ MENUITEMTYPE_SEPARATOR,   0, 0x00000000, 0x00000000, 0x00000000, NULL },
 	{ MENUITEMTYPE_SELECTABLE,  0, 0x00000020, L_OPTIONS(289), 0x00000000, NULL }, // "Press START"
diff --git a/src/game/game_10ccd0.c b/src/game/game_10ccd0.c
index 056fc0532..3f17b3c76 100644
--- a/src/game/game_10ccd0.c
+++ b/src/game/game_10ccd0.c
@@ -293,25 +293,11 @@ char *soloMenuTextNumBodyShots(struct menu_item *item)
 	return g_StringPointer;
 }
 
-GLOBAL_ASM(
-glabel func0f10d140
-/*  f10d140:	27bdffe8 */ 	addiu	$sp,$sp,-24
-/*  f10d144:	afbf0014 */ 	sw	$ra,0x14($sp)
-/*  f10d148:	afa40018 */ 	sw	$a0,0x18($sp)
-/*  f10d14c:	0fc2c14b */ 	jal	currentPlayerGetShotCount
-/*  f10d150:	24040003 */ 	addiu	$a0,$zero,0x3
-/*  f10d154:	3c048007 */ 	lui	$a0,%hi(g_StringPointer)
-/*  f10d158:	3c057f1b */ 	lui	$a1,%hi(var7f1b3880)
-/*  f10d15c:	24a53880 */ 	addiu	$a1,$a1,%lo(var7f1b3880)
-/*  f10d160:	8c841440 */ 	lw	$a0,%lo(g_StringPointer)($a0)
-/*  f10d164:	0c004dad */ 	jal	sprintf
-/*  f10d168:	00403025 */ 	or	$a2,$v0,$zero
-/*  f10d16c:	8fbf0014 */ 	lw	$ra,0x14($sp)
-/*  f10d170:	3c028007 */ 	lui	$v0,%hi(g_StringPointer)
-/*  f10d174:	8c421440 */ 	lw	$v0,%lo(g_StringPointer)($v0)
-/*  f10d178:	03e00008 */ 	jr	$ra
-/*  f10d17c:	27bd0018 */ 	addiu	$sp,$sp,0x18
-);
+char *soloMenuTextNumLimbShots(struct menu_item *item)
+{
+	sprintf(g_StringPointer, "%d", currentPlayerGetShotCount(3));
+	return g_StringPointer;
+}
 
 GLOBAL_ASM(
 glabel func0f10d180
@@ -589,7 +575,6 @@ glabel func0f10d678
 /*  f10d6e0:	27bd0020 */ 	addiu	$sp,$sp,0x20
 );
 
-const char var7f1b3880[] = "%d";
 const char var7f1b3884[] = "%d";
 const char var7f1b3888[] = "%s%s%.1f%%";
 const char var7f1b3894[] = "";
diff --git a/src/include/game/game_10ccd0.h b/src/include/game/game_10ccd0.h
index d7f590206..567e82877 100644
--- a/src/include/game/game_10ccd0.h
+++ b/src/include/game/game_10ccd0.h
@@ -12,7 +12,7 @@ char *soloMenuTextNumKills(struct menu_item *item);
 char *soloMenuTextNumShots(struct menu_item *item);
 char *soloMenuTextNumHeadShots(struct menu_item *item);
 char *soloMenuTextNumBodyShots(struct menu_item *item);
-u32 func0f10d140(void);
+char *soloMenuTextNumLimbShots(struct menu_item *item);
 u32 func0f10d180(void);
 u32 func0f10d1d0(void);
 char *soloMenuTextMissionStatus(struct menu_item *item);