diff --git a/src/game/data/data_020df0.c b/src/game/data/data_020df0.c index af3414312..72f94cfdb 100644 --- a/src/game/data/data_020df0.c +++ b/src/game/data/data_020df0.c @@ -10071,7 +10071,7 @@ struct menu_dialog menudialog_mpendgame = { // 2a6cc struct menu_item menuitems_2a6cc[] = { { MENUITEMTYPE_LABEL, 0, 0x00000020, (u32)&func0f17eac8, 0x00000000, menuhandler00178018 }, - { MENUITEMTYPE_LABEL, 0, 0x00000020, (u32)&func0f18500c, 0x00000000, NULL }, + { MENUITEMTYPE_LABEL, 0, 0x00000020, (u32)&mpMenuTextScenarioName, 0x00000000, NULL }, { MENUITEMTYPE_LABEL, 0, L_AME(0), L_MPWEAPONS(162), (u32)&mpMenuTextInGameLimit, menuhandlerMpInGameLimitLabel }, // "Time Limit:" { MENUITEMTYPE_LABEL, 1, L_AME(0), L_MPWEAPONS(163), (u32)&mpMenuTextInGameLimit, menuhandlerMpInGameLimitLabel }, // "Score Limit:" { MENUITEMTYPE_LABEL, 2, L_AME(0), L_MPWEAPONS(164), (u32)&mpMenuTextInGameLimit, menuhandlerMpInGameLimitLabel }, // "Team Score Limit:" diff --git a/src/game/game_17f930.c b/src/game/game_17f930.c index 93c7844b4..ed5de1962 100644 --- a/src/game/game_17f930.c +++ b/src/game/game_17f930.c @@ -5231,37 +5231,15 @@ char *mpMenuTextScenarioShortName(struct menu_item *item) return g_StringPointer; } -const char var7f1b88cc[] = "%s\n"; +char *mpMenuTextScenarioName(struct menu_item *item) +{ + sprintf(g_StringPointer, "%s\n", langGet(g_MpScenarioOverviews[g_MpSetup.scenario].name)); + return g_StringPointer; +} + const char var7f1b88d0[] = "%s:\n"; const char var7f1b88d8[] = "%s\n"; -GLOBAL_ASM( -glabel func0f18500c -/* f18500c: 3c0e800b */ lui $t6,%hi(g_MpSetup+0x10) -/* f185010: 91cecb98 */ lbu $t6,%lo(g_MpSetup+0x10)($t6) -/* f185014: 27bdffe8 */ addiu $sp,$sp,-24 -/* f185018: afa40018 */ sw $a0,0x18($sp) -/* f18501c: 000e7880 */ sll $t7,$t6,0x2 -/* f185020: 01ee7823 */ subu $t7,$t7,$t6 -/* f185024: 000f7840 */ sll $t7,$t7,0x1 -/* f185028: 3c048008 */ lui $a0,%hi(g_MpScenarioOverviews) -/* f18502c: afbf0014 */ sw $ra,0x14($sp) -/* f185030: 008f2021 */ addu $a0,$a0,$t7 -/* f185034: 0fc5b9f1 */ jal langGet -/* f185038: 94847148 */ lhu $a0,%lo(g_MpScenarioOverviews)($a0) -/* f18503c: 3c048007 */ lui $a0,%hi(g_StringPointer) -/* f185040: 3c057f1c */ lui $a1,%hi(var7f1b88cc) -/* f185044: 24a588cc */ addiu $a1,$a1,%lo(var7f1b88cc) -/* f185048: 8c841440 */ lw $a0,%lo(g_StringPointer)($a0) -/* f18504c: 0c004dad */ jal sprintf -/* f185050: 00403025 */ or $a2,$v0,$zero -/* f185054: 8fbf0014 */ lw $ra,0x14($sp) -/* f185058: 3c028007 */ lui $v0,%hi(g_StringPointer) -/* f18505c: 8c421440 */ lw $v0,%lo(g_StringPointer)($v0) -/* f185060: 03e00008 */ jr $ra -/* f185064: 27bd0018 */ addiu $sp,$sp,0x18 -); - GLOBAL_ASM( glabel menuhandler00185068 .late_rodata diff --git a/src/game/game_1a3340.c b/src/game/game_1a3340.c index 3f0cb34a9..e6b12d7fa 100644 --- a/src/game/game_1a3340.c +++ b/src/game/game_1a3340.c @@ -4471,9 +4471,5 @@ void *func0f1a7878(u16 fileid, s32 arg1, s32 arg2) return func0f1a7794(fileid, arg1, arg2, 0); } -const char var7f1b98d0[] = "%dm %2ds\n"; -const char var7f1b98dc[] = "%s%s%2.2fs\n"; -const char var7f1b98e8[] = ""; -const char var7f1b98ec[] = ""; const char var7f1b98f0[] = "%s\n"; diff --git a/src/include/game/game_179060.h b/src/include/game/game_179060.h index 3e5247e1d..5fc28fbd2 100644 --- a/src/include/game/game_179060.h +++ b/src/include/game/game_179060.h @@ -101,7 +101,7 @@ u32 scenarioPacCallback18(void); bool scenarioPacRadar2(Gfx **gdl, struct prop *prop); s32 menudialog00184ec0(u32, u32, u32 *); char *mpMenuTextScenarioShortName(struct menu_item *item); -u32 func0f18500c(void); +char *mpMenuTextScenarioName(struct menu_item *item); s32 menuhandler00185068(u32, u32, u32 *); void func0f185568(void); u32 func0f185774(void);