diff --git a/src/game/data/data_01a3a0.c b/src/game/data/data_01a3a0.c index 01a7956cb..eb70689cf 100644 --- a/src/game/data/data_01a3a0.c +++ b/src/game/data/data_01a3a0.c @@ -858,7 +858,7 @@ struct menu_item menuitems_1b98c[] = { { MENUITEMTYPE_LABEL, 0, 0x00000000, L_OPTIONS(278), (u32)&soloMenuTextMissionStatus, NULL }, // "Mission Status:" { MENUITEMTYPE_LABEL, 0, 0x00000000, L_OPTIONS(279), (u32)&soloMenuTextAgentStatus, NULL }, // "Agent Status:" { MENUITEMTYPE_LABEL, 0, 0x01000000, L_OPTIONS(280), (u32)&soloMenuTextMissionTime, menuhandler0010e064 }, // "Mission Time:" - { MENUITEMTYPE_LABEL, 1, 0x01000000, L_MPWEAPONS(242), (u32)&func0f10e4d8, menuhandler0010e064 }, // "Target Time:" + { MENUITEMTYPE_LABEL, 1, 0x01000000, L_MPWEAPONS(242), (u32)&soloMenuTextTargetTime, menuhandler0010e064 }, // "Target Time:" { MENUITEMTYPE_LABEL, 0, 0x00000000, L_MPWEAPONS(129), (u32)&soloMenuTextDifficulty, NULL }, // "Difficulty:" { MENUITEMTYPE_SEPARATOR, 2, 0x00000000, 0x00000000, 0x00000000, menuhandler0010e064 }, { MENUITEMTYPE_LABEL, 2, 0x00000000, L_MPWEAPONS(243), 0x00000000, menuhandler0010e064 }, // "New Cheat Available!:" diff --git a/src/game/game_10ccd0.c b/src/game/game_10ccd0.c index e0edd7f9d..76e418ba0 100644 --- a/src/game/game_10ccd0.c +++ b/src/game/game_10ccd0.c @@ -1110,6 +1110,8 @@ glabel menudialog0010de58 /* f10e060: 00000000 */ sll $zero,$zero,0x0 ); +const char var7f1b38b4[] = "ctcol"; + GLOBAL_ASM( glabel menuhandler0010e064 /* f10e064: 27bdffe0 */ addiu $sp,$sp,-32 @@ -1428,7 +1430,7 @@ glabel func0f10e468 ); GLOBAL_ASM( -glabel func0f10e4d8 +glabel soloMenuTextTargetTime /* f10e4d8: 3c0e8007 */ lui $t6,%hi(g_MpPlayerNum) /* f10e4dc: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6) /* f10e4e0: 3c02800a */ lui $v0,%hi(g_MenuStack+0xe20) @@ -1478,6 +1480,28 @@ glabel func0f10e4d8 /* f10e584: 00000000 */ sll $zero,$zero,0x0 ); +const char var7f1b38bc[] = "\n"; + +// regalloc +//char *soloMenuTextTargetTime(struct menu_item *item) +//{ +// s32 time; +// +// if ((g_MenuStack[g_MpPlayerNum].slotcount & 0x00000100) == 0) { +// return NULL; +// } +// +// time = cheatGetTime(g_MenuStack[g_MpPlayerNum].slotcount & 0xff); +// +// if (!time) { +// return NULL; +// } +// +// formatTime(g_StringPointer, time * 60, 3); +// strcat(g_StringPointer, "\n"); +// return g_StringPointer; +//} + GLOBAL_ASM( glabel func0f10e588 /* f10e588: 3c0e800a */ lui $t6,%hi(g_CheatsActiveBank0) @@ -4851,8 +4875,6 @@ glabel func0f111460 /* f1115fc: 00000000 */ sll $zero,$zero,0x0 ); -const char var7f1b38b4[] = "ctcol"; -const char var7f1b38bc[] = "\n"; const char var7f1b38c0[] = "Flag %d = %s"; const char var7f1b38d0[] = "TRUE"; const char var7f1b38d8[] = "FALSE"; diff --git a/src/include/game/game_10ccd0.h b/src/include/game/game_10ccd0.h index 054674347..d645eb26d 100644 --- a/src/include/game/game_10ccd0.h +++ b/src/include/game/game_10ccd0.h @@ -26,7 +26,7 @@ void func0f10d770(void); void func0f10d910(s32 arg0); u32 func0f10e3fc(void); u32 func0f10e468(void); -u32 func0f10e4d8(void); +char *soloMenuTextTargetTime(struct menu_item *item); u32 func0f10e588(void); u32 func0f10e620(void); u32 func0f10ecb4(void);