From 668c39918b164163e95fa7a8f3a598e3a635f257 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Sat, 2 Jan 2021 16:55:20 +1000 Subject: [PATCH] Decompile mpMenuTitleStatsForPlayerName --- src/game/data/data_02a0e0.c | 2 +- src/game/mplayer/setup.c | 31 ++++++------------------------- src/include/game/mplayer/setup.h | 2 +- 3 files changed, 8 insertions(+), 27 deletions(-) diff --git a/src/game/data/data_02a0e0.c b/src/game/data/data_02a0e0.c index 2afdb5109..99ddd821d 100644 --- a/src/game/data/data_02a0e0.c +++ b/src/game/data/data_02a0e0.c @@ -995,7 +995,7 @@ struct menuitem menuitems_mpplayerstats[] = { // 2b450 struct menudialog menudialog_mpplayerstats = { MENUDIALOGTYPE_DEFAULT, - (u32)&func0f17b360, + (u32)&mpMenuTitleStatsForPlayerName, menuitems_mpplayerstats, NULL, 0x00000048, diff --git a/src/game/mplayer/setup.c b/src/game/mplayer/setup.c index 91bde5b74..b41ea622b 100644 --- a/src/game/mplayer/setup.c +++ b/src/game/mplayer/setup.c @@ -2056,31 +2056,12 @@ glabel menuhandlerMpMedal /* f17b35c: 00000000 */ nop ); -GLOBAL_ASM( -glabel func0f17b360 -/* f17b360: 27bdffe8 */ addiu $sp,$sp,-24 -/* f17b364: afbf0014 */ sw $ra,0x14($sp) -/* f17b368: afa40018 */ sw $a0,0x18($sp) -/* f17b36c: 0fc5b9f1 */ jal langGet -/* f17b370: 24045091 */ addiu $a0,$zero,0x5091 -/* f17b374: 3c0e8007 */ lui $t6,%hi(g_MpPlayerNum) -/* f17b378: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6) -/* f17b37c: 3c18800b */ lui $t8,%hi(g_MpPlayers) -/* f17b380: 2718c7b8 */ addiu $t8,$t8,%lo(g_MpPlayers) -/* f17b384: 000e7880 */ sll $t7,$t6,0x2 -/* f17b388: 01ee7821 */ addu $t7,$t7,$t6 -/* f17b38c: 000f7940 */ sll $t7,$t7,0x5 -/* f17b390: 3c048007 */ lui $a0,%hi(g_StringPointer) -/* f17b394: 8c841440 */ lw $a0,%lo(g_StringPointer)($a0) -/* f17b398: 01f83021 */ addu $a2,$t7,$t8 -/* f17b39c: 0c004dad */ jal sprintf -/* f17b3a0: 00402825 */ or $a1,$v0,$zero -/* f17b3a4: 8fbf0014 */ lw $ra,0x14($sp) -/* f17b3a8: 3c028007 */ lui $v0,%hi(g_StringPointer) -/* f17b3ac: 8c421440 */ lw $v0,%lo(g_StringPointer)($v0) -/* f17b3b0: 03e00008 */ jr $ra -/* f17b3b4: 27bd0018 */ addiu $sp,$sp,0x18 -); +char *mpMenuTitleStatsForPlayerName(struct menudialog *dialog) +{ + // "Stats for %s" + sprintf(g_StringPointer, langGet(L_MPMENU(145)), g_MpPlayers[g_MpPlayerNum].base.name); + return g_StringPointer; +} s32 menuhandlerMpUsernamePassword(u32 operation, struct menuitem *item, union handlerdata *data) { diff --git a/src/include/game/mplayer/setup.h b/src/include/game/mplayer/setup.h index 6a34bebf6..81b534301 100644 --- a/src/include/game/mplayer/setup.h +++ b/src/include/game/mplayer/setup.h @@ -29,7 +29,7 @@ void func0f17ad80(char *dst, f32 arg0); char *mpMenuTextPainReceived(struct menuitem *item); char *mpMenuTextDamageDealt(struct menuitem *item); s32 menuhandlerMpMedal(u32 operation, struct menuitem *item, union handlerdata *data); -u32 func0f17b360(void); +char *mpMenuTitleStatsForPlayerName(struct menudialog *dialog); u32 mpMenuTextUsernamePassword(void); s32 func0f17b4f8(u32 operation, struct menuitem *item, union handlerdata *data, s32 arg3, s32 arg4); char *mpMenuTextBodyName(struct menuitem *item);