From a7aabec15282a3631b4a10ae18f6794701b2e5cf Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Mon, 15 Feb 2021 22:06:15 +1000 Subject: [PATCH] Decompile mpMenuTextMedalHeadShot --- src/game/mplayer/setup.c | 30 +++++------------------------- src/include/game/mplayer/setup.h | 2 +- 2 files changed, 6 insertions(+), 26 deletions(-) diff --git a/src/game/mplayer/setup.c b/src/game/mplayer/setup.c index 33efd73b4..8e8c08840 100644 --- a/src/game/mplayer/setup.c +++ b/src/game/mplayer/setup.c @@ -1164,7 +1164,6 @@ const char var7f1b7f04[] = "%d\n"; const char var7f1b7f08[] = "%d\n"; const char var7f1b7f0c[] = "%d\n"; const char var7f1b7f10[] = "%d\n"; -const char var7f1b7f14[] = "%d\n"; GLOBAL_ASM( glabel mpMenuTextKills @@ -1341,30 +1340,11 @@ glabel mpMenuTextMedalAccuracy /* f17a8a0: 27bd0018 */ addiu $sp,$sp,0x18 ); -GLOBAL_ASM( -glabel mpMenuTextMedalHeadShot -/* f17a8a4: 3c0e8007 */ lui $t6,%hi(g_MpPlayerNum) -/* f17a8a8: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6) -/* f17a8ac: 27bdffe8 */ addiu $sp,$sp,-24 -/* f17a8b0: afa40018 */ sw $a0,0x18($sp) -/* f17a8b4: 000e7880 */ sll $t7,$t6,0x2 -/* f17a8b8: 01ee7821 */ addu $t7,$t7,$t6 -/* f17a8bc: 000f7940 */ sll $t7,$t7,0x5 -/* f17a8c0: 3c06800b */ lui $a2,%hi(g_MpPlayers+0x88) -/* f17a8c4: 00cf3021 */ addu $a2,$a2,$t7 -/* f17a8c8: 3c048007 */ lui $a0,%hi(g_StringPointer) -/* f17a8cc: afbf0014 */ sw $ra,0x14($sp) -/* f17a8d0: 3c057f1b */ lui $a1,%hi(var7f1b7f14) -/* f17a8d4: 24a57f14 */ addiu $a1,$a1,%lo(var7f1b7f14) -/* f17a8d8: 8c841440 */ lw $a0,%lo(g_StringPointer)($a0) -/* f17a8dc: 0c004dad */ jal sprintf -/* f17a8e0: 8cc6c840 */ lw $a2,%lo(g_MpPlayers+0x88)($a2) -/* f17a8e4: 8fbf0014 */ lw $ra,0x14($sp) -/* f17a8e8: 3c028007 */ lui $v0,%hi(g_StringPointer) -/* f17a8ec: 8c421440 */ lw $v0,%lo(g_StringPointer)($v0) -/* f17a8f0: 03e00008 */ jr $ra -/* f17a8f4: 27bd0018 */ addiu $sp,$sp,0x18 -); +char *mpMenuTextMedalHeadShot(struct menuitem *item) +{ \ + sprintf(g_StringPointer, "%d\n", g_MpPlayers[g_MpPlayerNum].headshotmedals); + return g_StringPointer; +} char *mpMenuTextMedalKillMaster(struct menuitem *item) { \ diff --git a/src/include/game/mplayer/setup.h b/src/include/game/mplayer/setup.h index b3619ebaa..ba9beb846 100644 --- a/src/include/game/mplayer/setup.h +++ b/src/include/game/mplayer/setup.h @@ -18,7 +18,7 @@ u32 mpMenuTextGamesWon(void); u32 mpMenuTextGamesLost(void); u32 mpMenuTextHeadShots(void); u32 mpMenuTextMedalAccuracy(void); -u32 mpMenuTextMedalHeadShot(void); +char *mpMenuTextMedalHeadShot(struct menuitem *item); char *mpMenuTextMedalKillMaster(struct menuitem *item); char *mpMenuTextMedalSurvivor(struct menuitem *item); char *mpMenuTextAmmoUsed(struct menuitem *item);