From cbee5e86e9071f4ee99a8e96499e92ebe8cb9eb2 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Tue, 3 Mar 2020 17:39:12 +1000 Subject: [PATCH] Decompile menutextMissionTime --- src/game/cheats.c | 4 +- src/game/data/data_0160b0.c | 2 +- src/game/data/data_01a3a0.c | 4 +- src/game/game_066310.c | 54 ++++++++-------- src/game/game_092610.c | 6 +- src/game/game_0d4690.c | 2 +- src/game/game_0dcdb0.c | 2 +- src/game/game_102240.c | 2 +- src/game/game_107fb0.c | 10 +-- src/game/game_10ccd0.c | 98 +++++++++++++---------------- src/game/game_1165d0.c | 4 +- src/game/game_13e0e0.c | 4 +- src/game/game_177e00.c | 2 +- src/game/game_179060.c | 12 ++-- src/include/game/data/data_0160b0.h | 2 +- src/include/game/game_0d4690.h | 2 +- src/include/game/game_10ccd0.h | 2 +- src/include/lib/lib_13130.h | 2 +- src/lib/lib_13130.c | 2 +- 19 files changed, 101 insertions(+), 115 deletions(-) diff --git a/src/game/cheats.c b/src/game/cheats.c index 9cd94ab4b..b134daa40 100644 --- a/src/game/cheats.c +++ b/src/game/cheats.c @@ -598,10 +598,10 @@ char *cheatGetMarquee(struct menu_item *arg0) } if (g_Cheats[cheat_id].flags & CHEATFLAG_TRANSFERPAK) { - func00013224(g_CheatMarqueeString, langGet(0x548d)); // " or insert Game Boy ..." + strcat(g_CheatMarqueeString, langGet(0x548d)); // " or insert Game Boy ..." } - func00013224(g_CheatMarqueeString, "\n"); + strcat(g_CheatMarqueeString, "\n"); return g_CheatMarqueeString; } diff --git a/src/game/data/data_0160b0.c b/src/game/data/data_0160b0.c index 6a62f4f43..94f3ee448 100644 --- a/src/game/data/data_0160b0.c +++ b/src/game/data/data_0160b0.c @@ -1219,7 +1219,7 @@ u32 var80071430 = 0x54bb54bc; u32 var80071434 = 0x54bd54be; u32 var80071438 = 0x54bf54c0; u32 var8007143c = 0x54c10000; -u32 var80071440 = (u32) &g_CheatMarqueeString; +char *g_StringPointer = g_CheatMarqueeString; u32 var80071444 = 0x8009df3d; u32 g_MpPlayerNum = 0; u32 var8007144c = 0x51e451e5; diff --git a/src/game/data/data_01a3a0.c b/src/game/data/data_01a3a0.c index d35324960..99c9fa3d6 100644 --- a/src/game/data/data_01a3a0.c +++ b/src/game/data/data_01a3a0.c @@ -829,7 +829,7 @@ struct menu_item menuitems_1b7bc[] = { { MENUITEMTYPE_LABEL, 0, 0x00000210, 0x00005717, 0x00000000, NULL }, // "Agent Status:" { MENUITEMTYPE_LABEL, 0, 0x00000020, (u32)&func0f10d4d4, 0x00000000, NULL }, { MENUITEMTYPE_LABEL, 0, 0x00000210, 0x00005718, 0x00000000, NULL }, // "Mission Time:" - { MENUITEMTYPE_LABEL, 0, 0x00000020, (u32)&func0f10d6e4, 0x00000000, NULL }, + { MENUITEMTYPE_LABEL, 0, 0x00000020, (u32)&menutextMissionTime, 0x00000000, NULL }, { MENUITEMTYPE_LABEL, 0, 0x00000210, 0x00005481, 0x00000000, NULL }, // "Difficulty" { MENUITEMTYPE_LABEL, 0, 0x00000020, (u32)menutextDifficulty, 0x00000000, NULL }, { MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL }, @@ -855,7 +855,7 @@ u32 var80075968 = 0xff7f7fff; struct menu_item menuitems_1b98c[] = { { MENUITEMTYPE_LABEL, 0, 0x00000000, 0x00005716, (u32)&func0f10d2e0, NULL }, // "Mission Status:" { MENUITEMTYPE_LABEL, 0, 0x00000000, 0x00005717, (u32)&func0f10d4d4, NULL }, // "Agent Status:" - { MENUITEMTYPE_LABEL, 0, 0x01000000, 0x00005718, (u32)&func0f10d6e4, menuhandler0010e064 }, // "Mission Time:" + { MENUITEMTYPE_LABEL, 0, 0x01000000, 0x00005718, (u32)&menutextMissionTime, menuhandler0010e064 }, // "Mission Time:" { MENUITEMTYPE_LABEL, 1, 0x01000000, 0x000054f2, (u32)&func0f10e4d8, menuhandler0010e064 }, // "Target Time:" { MENUITEMTYPE_LABEL, 0, 0x00000000, 0x00005481, (u32)&menutextDifficulty, NULL }, // "Difficulty:" { MENUITEMTYPE_SEPARATOR, 2, 0x00000000, 0x00000000, 0x00000000, menuhandler0010e064 }, diff --git a/src/game/game_066310.c b/src/game/game_066310.c index eed43196a..04c5fe811 100644 --- a/src/game/game_066310.c +++ b/src/game/game_066310.c @@ -38169,7 +38169,7 @@ glabel func0f087638 /* f087644: 0fc5b9f1 */ jal langGet /* f087648: 24045200 */ addiu $a0,$zero,0x5200 /* f08764c: 8fa40018 */ lw $a0,0x18($sp) -/* f087650: 0c004c89 */ jal func00013224 +/* f087650: 0c004c89 */ jal strcat /* f087654: 00402825 */ or $a1,$v0,$zero /* f087658: 8fbf0014 */ lw $ra,0x14($sp) /* f08765c: 27bd0018 */ addiu $sp,$sp,0x18 @@ -38295,7 +38295,7 @@ glabel func0f087668 /* f087804: 0fc5b9f1 */ jal langGet /* f087808: 24045204 */ addiu $a0,$zero,0x5204 /* f08780c: 8fa40030 */ lw $a0,0x30($sp) -/* f087810: 0c004c89 */ jal func00013224 +/* f087810: 0c004c89 */ jal strcat /* f087814: 00402825 */ or $a1,$v0,$zero /* f087818: 10000007 */ beqz $zero,.L0f087838 /* f08781c: 8fae0028 */ lw $t6,0x28($sp) @@ -38303,7 +38303,7 @@ glabel func0f087668 /* f087820: 0fc5b9f1 */ jal langGet /* f087824: 24045205 */ addiu $a0,$zero,0x5205 /* f087828: 8fa40030 */ lw $a0,0x30($sp) -/* f08782c: 0c004c89 */ jal func00013224 +/* f08782c: 0c004c89 */ jal strcat /* f087830: 00402825 */ or $a1,$v0,$zero /* f087834: 8fae0028 */ lw $t6,0x28($sp) .L0f087838: @@ -38315,7 +38315,7 @@ glabel func0f087668 /* f08784c: 0fc5b9f1 */ jal langGet /* f087850: 24045206 */ addiu $a0,$zero,0x5206 /* f087854: 8fa40030 */ lw $a0,0x30($sp) -/* f087858: 0c004c89 */ jal func00013224 +/* f087858: 0c004c89 */ jal strcat /* f08785c: 00402825 */ or $a1,$v0,$zero /* f087860: 10000007 */ beqz $zero,.L0f087880 /* f087864: 8fb80024 */ lw $t8,0x24($sp) @@ -38323,7 +38323,7 @@ glabel func0f087668 /* f087868: 0fc5b9f1 */ jal langGet /* f08786c: 24045207 */ addiu $a0,$zero,0x5207 /* f087870: 8fa40030 */ lw $a0,0x30($sp) -/* f087874: 0c004c89 */ jal func00013224 +/* f087874: 0c004c89 */ jal strcat /* f087878: 00402825 */ or $a1,$v0,$zero /* f08787c: 8fb80024 */ lw $t8,0x24($sp) .L0f087880: @@ -38335,7 +38335,7 @@ glabel func0f087668 /* f087894: 0fc5b9f1 */ jal langGet /* f087898: 24045202 */ addiu $a0,$zero,0x5202 /* f08789c: 8fa40030 */ lw $a0,0x30($sp) -/* f0878a0: 0c004c89 */ jal func00013224 +/* f0878a0: 0c004c89 */ jal strcat /* f0878a4: 00402825 */ or $a1,$v0,$zero /* f0878a8: 10000007 */ beqz $zero,.L0f0878c8 /* f0878ac: 8fa90020 */ lw $t1,0x20($sp) @@ -38343,7 +38343,7 @@ glabel func0f087668 /* f0878b0: 0fc5b9f1 */ jal langGet /* f0878b4: 24045203 */ addiu $a0,$zero,0x5203 /* f0878b8: 8fa40030 */ lw $a0,0x30($sp) -/* f0878bc: 0c004c89 */ jal func00013224 +/* f0878bc: 0c004c89 */ jal strcat /* f0878c0: 00402825 */ or $a1,$v0,$zero /* f0878c4: 8fa90020 */ lw $t1,0x20($sp) .L0f0878c8: @@ -38355,7 +38355,7 @@ glabel func0f087668 /* f0878dc: 0fc5b9f1 */ jal langGet /* f0878e0: 24045208 */ addiu $a0,$zero,0x5208 /* f0878e4: 8fa40030 */ lw $a0,0x30($sp) -/* f0878e8: 0c004c89 */ jal func00013224 +/* f0878e8: 0c004c89 */ jal strcat /* f0878ec: 00402825 */ or $a1,$v0,$zero /* f0878f0: 10000007 */ beqz $zero,.L0f087910 /* f0878f4: 8fbf0014 */ lw $ra,0x14($sp) @@ -38363,7 +38363,7 @@ glabel func0f087668 /* f0878f8: 0fc5b9f1 */ jal langGet /* f0878fc: 24045209 */ addiu $a0,$zero,0x5209 /* f087900: 8fa40030 */ lw $a0,0x30($sp) -/* f087904: 0c004c89 */ jal func00013224 +/* f087904: 0c004c89 */ jal strcat /* f087908: 00402825 */ or $a1,$v0,$zero /* f08790c: 8fbf0014 */ lw $ra,0x14($sp) .L0f087910: @@ -38390,7 +38390,7 @@ glabel func0f08791c /* f08794c: 0fc5b9f1 */ jal langGet /* f087950: 2404520a */ addiu $a0,$zero,0x520a /* f087954: 8fa40018 */ lw $a0,0x18($sp) -/* f087958: 0c004c89 */ jal func00013224 +/* f087958: 0c004c89 */ jal strcat /* f08795c: 00402825 */ or $a1,$v0,$zero /* f087960: 10000067 */ beqz $zero,.L0f087b00 /* f087964: 8fbf0014 */ lw $ra,0x14($sp) @@ -38401,7 +38401,7 @@ glabel func0f08791c /* f087974: 0fc5b9f1 */ jal langGet /* f087978: 24045215 */ addiu $a0,$zero,0x5215 /* f08797c: 8fa40018 */ lw $a0,0x18($sp) -/* f087980: 0c004c89 */ jal func00013224 +/* f087980: 0c004c89 */ jal strcat /* f087984: 00402825 */ or $a1,$v0,$zero /* f087988: 8fae0020 */ lw $t6,0x20($sp) /* f08798c: 24010001 */ addiu $at,$zero,0x1 @@ -38410,7 +38410,7 @@ glabel func0f08791c /* f087998: 0fc5b9f1 */ jal langGet /* f08799c: 24045216 */ addiu $a0,$zero,0x5216 /* f0879a0: 8fa40018 */ lw $a0,0x18($sp) -/* f0879a4: 0c004c89 */ jal func00013224 +/* f0879a4: 0c004c89 */ jal strcat /* f0879a8: 00402825 */ or $a1,$v0,$zero /* f0879ac: 10000054 */ beqz $zero,.L0f087b00 /* f0879b0: 8fbf0014 */ lw $ra,0x14($sp) @@ -38418,7 +38418,7 @@ glabel func0f08791c /* f0879b4: 0fc5b9f1 */ jal langGet /* f0879b8: 24045217 */ addiu $a0,$zero,0x5217 /* f0879bc: 8fa40018 */ lw $a0,0x18($sp) -/* f0879c0: 0c004c89 */ jal func00013224 +/* f0879c0: 0c004c89 */ jal strcat /* f0879c4: 00402825 */ or $a1,$v0,$zero /* f0879c8: 1000004d */ beqz $zero,.L0f087b00 /* f0879cc: 8fbf0014 */ lw $ra,0x14($sp) @@ -38481,7 +38481,7 @@ glabel func0f08791c /* f087aa8: 0fc5b9f1 */ jal langGet /* f087aac: afa7001c */ sw $a3,0x1c($sp) /* f087ab0: 8fa40018 */ lw $a0,0x18($sp) -/* f087ab4: 0c004c89 */ jal func00013224 +/* f087ab4: 0c004c89 */ jal strcat /* f087ab8: 00402825 */ or $a1,$v0,$zero /* f087abc: 8fa7001c */ lw $a3,0x1c($sp) /* f087ac0: 8fb80020 */ lw $t8,0x20($sp) @@ -38498,7 +38498,7 @@ glabel func0f08791c /* f087ae8: 0fc5b9f1 */ jal langGet /* f087aec: 24045218 */ addiu $a0,$zero,0x5218 /* f087af0: 8fa40018 */ lw $a0,0x18($sp) -/* f087af4: 0c004c89 */ jal func00013224 +/* f087af4: 0c004c89 */ jal strcat /* f087af8: 00402825 */ or $a1,$v0,$zero .L0f087afc: /* f087afc: 8fbf0014 */ lw $ra,0x14($sp) @@ -38822,7 +38822,7 @@ glabel func0f087e40 .L0f087f48: /* f087f48: 3c057f1b */ lui $a1,0x7f1b /* f087f4c: 24a5a064 */ addiu $a1,$a1,-24476 -/* f087f50: 0c004c89 */ jal func00013224 +/* f087f50: 0c004c89 */ jal strcat /* f087f54: 8fa40028 */ lw $a0,0x28($sp) /* f087f58: 10000012 */ beqz $zero,.L0f087fa4 /* f087f5c: 8fbf0014 */ lw $ra,0x14($sp) @@ -38842,7 +38842,7 @@ glabel func0f087e40 /* f087f8c: 8fa60030 */ lw $a2,0x30($sp) /* f087f90: 3c057f1b */ lui $a1,0x7f1b /* f087f94: 24a5a068 */ addiu $a1,$a1,-24472 -/* f087f98: 0c004c89 */ jal func00013224 +/* f087f98: 0c004c89 */ jal strcat /* f087f9c: 8fa40028 */ lw $a0,0x28($sp) /* f087fa0: 8fbf0014 */ lw $ra,0x14($sp) .L0f087fa4: @@ -39246,7 +39246,7 @@ glabel func0f08841c /* f088508: 0fc5b9f1 */ jal langGet /* f08850c: 24045201 */ addiu $a0,$zero,0x5201 /* f088510: 8fa40020 */ lw $a0,0x20($sp) -/* f088514: 0c004c89 */ jal func00013224 +/* f088514: 0c004c89 */ jal strcat /* f088518: 00402825 */ or $a1,$v0,$zero /* f08851c: 10000051 */ beqz $zero,.L0f088664 /* f088520: 8fab0018 */ lw $t3,0x18($sp) @@ -39259,7 +39259,7 @@ glabel func0f08841c /* f088538: 0fc5b9f1 */ jal langGet /* f08853c: 24045200 */ addiu $a0,$zero,0x5200 /* f088540: 8fa40020 */ lw $a0,0x20($sp) -/* f088544: 0c004c89 */ jal func00013224 +/* f088544: 0c004c89 */ jal strcat /* f088548: 00402825 */ or $a1,$v0,$zero /* f08854c: 8fae0024 */ lw $t6,0x24($sp) /* f088550: 3c08800a */ lui $t0,%hi(g_Vars) @@ -39299,7 +39299,7 @@ glabel func0f08841c /* f0885c4: 0fc5b9f1 */ jal langGet /* f0885c8: 00000000 */ sll $zero,$zero,0x0 /* f0885cc: 8fa40020 */ lw $a0,0x20($sp) -/* f0885d0: 0c004c89 */ jal func00013224 +/* f0885d0: 0c004c89 */ jal strcat /* f0885d4: 00402825 */ or $a1,$v0,$zero /* f0885d8: 10000022 */ beqz $zero,.L0f088664 /* f0885dc: 8fab0018 */ lw $t3,0x18($sp) @@ -39338,7 +39338,7 @@ glabel func0f08841c /* f08864c: 0fc5b9f1 */ jal langGet /* f088650: 00000000 */ sll $zero,$zero,0x0 /* f088654: 8fa40020 */ lw $a0,0x20($sp) -/* f088658: 0c004c89 */ jal func00013224 +/* f088658: 0c004c89 */ jal strcat /* f08865c: 00402825 */ or $a1,$v0,$zero /* f088660: 8fab0018 */ lw $t3,0x18($sp) .L0f088664: @@ -39347,7 +39347,7 @@ glabel func0f08841c /* f08866c: 0fc28857 */ jal func0f0a215c /* f088670: 8fa40024 */ lw $a0,0x24($sp) /* f088674: 8fa40020 */ lw $a0,0x20($sp) -/* f088678: 0c004c89 */ jal func00013224 +/* f088678: 0c004c89 */ jal strcat /* f08867c: 00402825 */ or $a1,$v0,$zero /* f088680: 8fa40024 */ lw $a0,0x24($sp) /* f088684: 0fc2c5f0 */ jal weaponHasFlag @@ -39358,7 +39358,7 @@ glabel func0f08841c /* f088694: 0fc28874 */ jal func0f0a21d0 /* f088698: 8fa40024 */ lw $a0,0x24($sp) /* f08869c: 8fa40020 */ lw $a0,0x20($sp) -/* f0886a0: 0c004c89 */ jal func00013224 +/* f0886a0: 0c004c89 */ jal strcat /* f0886a4: 00402825 */ or $a1,$v0,$zero /* f0886a8: 8fa40024 */ lw $a0,0x24($sp) /* f0886ac: 0fc2c5f0 */ jal weaponHasFlag @@ -39382,7 +39382,7 @@ glabel func0f08841c /* f0886f0: 8fa40020 */ lw $a0,0x20($sp) .L0f0886f4: /* f0886f4: 3c057f1b */ lui $a1,0x7f1b -/* f0886f8: 0c004c89 */ jal func00013224 +/* f0886f8: 0c004c89 */ jal strcat /* f0886fc: 24a5a0d0 */ addiu $a1,$a1,-24368 .L0f088700: /* f088700: 3c188008 */ lui $t8,0x8008 @@ -39409,11 +39409,11 @@ glabel func0f08841c /* f088750: 0fc5b9f1 */ jal langGet /* f088754: 24045200 */ addiu $a0,$zero,0x5200 /* f088758: 8fa40020 */ lw $a0,0x20($sp) -/* f08875c: 0c004c89 */ jal func00013224 +/* f08875c: 0c004c89 */ jal strcat /* f088760: 00402825 */ or $a1,$v0,$zero /* f088764: 3c057f1b */ lui $a1,0x7f1b /* f088768: 24a5a0d4 */ addiu $a1,$a1,-24364 -/* f08876c: 0c004c89 */ jal func00013224 +/* f08876c: 0c004c89 */ jal strcat /* f088770: 8fa40020 */ lw $a0,0x20($sp) .L0f088774: /* f088774: 0c012983 */ jal func0004a60c @@ -39432,7 +39432,7 @@ glabel func0f08841c .L0f0887a8: /* f0887a8: 3c057f1b */ lui $a1,0x7f1b /* f0887ac: 24a5a0d8 */ addiu $a1,$a1,-24360 -/* f0887b0: 0c004c89 */ jal func00013224 +/* f0887b0: 0c004c89 */ jal strcat /* f0887b4: 8fa40020 */ lw $a0,0x20($sp) /* f0887b8: 8fbf0014 */ lw $ra,0x14($sp) /* f0887bc: 27bd0020 */ addiu $sp,$sp,0x20 diff --git a/src/game/game_092610.c b/src/game/game_092610.c index 0797dd259..1270450d8 100644 --- a/src/game/game_092610.c +++ b/src/game/game_092610.c @@ -4210,7 +4210,7 @@ glabel func0f095d64 /* f095e70: 0fc5b9f1 */ jal langGet /* f095e74: 2404582d */ addiu $a0,$zero,0x582d /* f095e78: 02402025 */ or $a0,$s2,$zero -/* f095e7c: 0c004c89 */ jal func00013224 +/* f095e7c: 0c004c89 */ jal strcat /* f095e80: 00402825 */ or $a1,$v0,$zero /* f095e84: 02402025 */ or $a0,$s2,$zero /* f095e88: 0fc25701 */ jal func0f095c04 @@ -4223,7 +4223,7 @@ glabel func0f095d64 /* f095ea0: 0fc5b9f1 */ jal langGet /* f095ea4: 2404582e */ addiu $a0,$zero,0x582e /* f095ea8: 02402025 */ or $a0,$s2,$zero -/* f095eac: 0c004c89 */ jal func00013224 +/* f095eac: 0c004c89 */ jal strcat /* f095eb0: 00402825 */ or $a1,$v0,$zero /* f095eb4: 02402025 */ or $a0,$s2,$zero /* f095eb8: 0fc25701 */ jal func0f095c04 @@ -4236,7 +4236,7 @@ glabel func0f095d64 /* f095ed0: 0fc5b9f1 */ jal langGet /* f095ed4: 2404582f */ addiu $a0,$zero,0x582f /* f095ed8: 02402025 */ or $a0,$s2,$zero -/* f095edc: 0c004c89 */ jal func00013224 +/* f095edc: 0c004c89 */ jal strcat /* f095ee0: 00402825 */ or $a1,$v0,$zero /* f095ee4: 02402025 */ or $a0,$s2,$zero /* f095ee8: 0fc25701 */ jal func0f095c04 diff --git a/src/game/game_0d4690.c b/src/game/game_0d4690.c index 0e75e69e3..6f575d168 100644 --- a/src/game/game_0d4690.c +++ b/src/game/game_0d4690.c @@ -1419,7 +1419,7 @@ glabel func0f0d579c ); GLOBAL_ASM( -glabel func0f0d57e0 +glabel formatTime /* f0d57e0: 2402003c */ addiu $v0,$zero,0x3c /* f0d57e4: 00a2001a */ div $zero,$a1,$v0 /* f0d57e8: 00007010 */ mfhi $t6 diff --git a/src/game/game_0dcdb0.c b/src/game/game_0dcdb0.c index 885c61874..4d0f57696 100644 --- a/src/game/game_0dcdb0.c +++ b/src/game/game_0dcdb0.c @@ -4623,7 +4623,7 @@ glabel func0f0dcef4 /* f0dd20c: afaf0064 */ sw $t7,0x64($sp) /* f0dd210: 27a40068 */ addiu $a0,$sp,0x68 /* f0dd214: 00402825 */ or $a1,$v0,$zero -/* f0dd218: 0fc355f8 */ jal func0f0d57e0 +/* f0dd218: 0fc355f8 */ jal formatTime /* f0dd21c: 24060004 */ addiu $a2,$zero,0x4 /* f0dd220: 3c198007 */ lui $t9,0x8007 /* f0dd224: 8f390fe4 */ lw $t9,0xfe4($t9) diff --git a/src/game/game_102240.c b/src/game/game_102240.c index 49de664ac..7338bb89a 100644 --- a/src/game/game_102240.c +++ b/src/game/game_102240.c @@ -3265,7 +3265,7 @@ glabel menuhandler0010476c /* f105478: 00402825 */ or $a1,$v0,$zero /* f10547c: 3c057f1b */ lui $a1,%hi(var7f1b2d50) /* f105480: 24a52d50 */ addiu $a1,$a1,%lo(var7f1b2d50) -/* f105484: 0c004c89 */ jal func00013224 +/* f105484: 0c004c89 */ jal strcat /* f105488: 27a400f0 */ addiu $a0,$sp,0xf0 /* f10548c: 0c002f02 */ jal func0000bc08 /* f105490: 00000000 */ sll $zero,$zero,0x0 diff --git a/src/game/game_107fb0.c b/src/game/game_107fb0.c index 4db3920e1..62f90572b 100644 --- a/src/game/game_107fb0.c +++ b/src/game/game_107fb0.c @@ -724,8 +724,8 @@ glabel func0f108550 /* f10858c: 3098007f */ andi $t8,$a0,0x7f /* f108590: 0fc41fec */ jal func0f107fb0 /* f108594: 03002025 */ or $a0,$t8,$zero -/* f108598: 3c078007 */ lui $a3,%hi(var80071440) -/* f10859c: 24e71440 */ addiu $a3,$a3,%lo(var80071440) +/* f108598: 3c078007 */ lui $a3,%hi(g_StringPointer) +/* f10859c: 24e71440 */ addiu $a3,$a3,%lo(g_StringPointer) /* f1085a0: 3c057f1b */ lui $a1,%hi(var7f1b2f68) /* f1085a4: 24a52f68 */ addiu $a1,$a1,%lo(var7f1b2f68) /* f1085a8: 8ce40000 */ lw $a0,0x0($a3) @@ -734,7 +734,7 @@ glabel func0f108550 /* f1085b4: 3c198007 */ lui $t9,0x8007 /* f1085b8: 8f391448 */ lw $t9,0x1448($t9) /* f1085bc: 3c09800a */ lui $t1,0x800a -/* f1085c0: 3c078007 */ lui $a3,%hi(var80071440) +/* f1085c0: 3c078007 */ lui $a3,%hi(g_StringPointer) /* f1085c4: 001940c0 */ sll $t0,$t9,0x3 /* f1085c8: 01194023 */ subu $t0,$t0,$t9 /* f1085cc: 00084080 */ sll $t0,$t0,0x2 @@ -745,7 +745,7 @@ glabel func0f108550 /* f1085e0: 01284821 */ addu $t1,$t1,$t0 /* f1085e4: 9529ee34 */ lhu $t1,-0x11cc($t1) /* f1085e8: 24010006 */ addiu $at,$zero,0x6 -/* f1085ec: 24e71440 */ addiu $a3,$a3,%lo(var80071440) +/* f1085ec: 24e71440 */ addiu $a3,$a3,%lo(g_StringPointer) /* f1085f0: 11210015 */ beq $t1,$at,.L0f108648 /* f1085f4: 240c003a */ addiu $t4,$zero,0x3a /* f1085f8: 8ce40000 */ lw $a0,0x0($a3) @@ -4979,7 +4979,7 @@ glabel menucustomChooseAgent .L0f10c4cc: /* f10c4cc: 3c057f1b */ lui $a1,%hi(var7f1b3514) /* f10c4d0: 24a53514 */ addiu $a1,$a1,%lo(var7f1b3514) -/* f10c4d4: 0c004c89 */ jal func00013224 +/* f10c4d4: 0c004c89 */ jal strcat /* f10c4d8: 27a4009c */ addiu $a0,$sp,0x9c /* f10c4dc: 0c002f02 */ jal func0000bc08 /* f10c4e0: 00000000 */ sll $zero,$zero,0x0 diff --git a/src/game/game_10ccd0.c b/src/game/game_10ccd0.c index 3e44d5973..31ca4bb19 100644 --- a/src/game/game_10ccd0.c +++ b/src/game/game_10ccd0.c @@ -56,38 +56,7 @@ const char var7f1b3898[] = ""; const char var7f1b389c[] = "%s: %s\n"; const char var7f1b38a4[] = "%s\n"; const char var7f1b38a8[] = "%s: %s\n"; -const char var7f1b38b0[] = "\n"; -const char var7f1b38b4[] = "ctcol"; -const char var7f1b38bc[] = "\n"; -const char var7f1b38c0[] = "Flag %d = %s"; -const char var7f1b38d0[] = "TRUE"; -const char var7f1b38d8[] = "FALSE"; -const char var7f1b38e0[] = "Dark"; -const char var7f1b38e8[] = "MAX_FUDGE_DATA_SIZE>=sizeof(PakFileTypeGameSetup_s)"; -const char var7f1b391c[] = "pdoptions.c"; -const char var7f1b3928[] = "MAX_FUDGE_DATA_SIZE>=sizeof(PakFileTypeGameSetup_s)"; -const char var7f1b395c[] = "pdoptions.c"; -const char var7f1b3968[] = "MAX_FUDGE_DATA_SIZE>=sizeof(PakFileTypeGameSetup_s)"; -const char var7f1b399c[] = "pdoptions.c"; -const char var7f1b39a8[] = ""; -const char var7f1b39ac[] = ""; -const char var7f1b39b0[] = "fileGuid"; -const char var7f1b39bc[] = "bossfile.c"; -const char var7f1b39c8[] = ""; -const char var7f1b39cc[] = ""; -const char var7f1b39d0[] = "Rebuilding pakWad %d:\n"; - -const u32 var7f1b39e8[] = {0x00000080}; -const u32 var7f1b39ec[] = {0x00000040}; -const u32 var7f1b39f0[] = {0x00000020}; -const u32 var7f1b39f4[] = {0x00000008}; -const u32 var7f1b39f8[] = {0x04000102}; -const u32 var7f1b39fc[] = {0x03000000}; -const u32 var7f1b3a00[] = {0x01020304}; -const u32 var7f1b3a04[] = {0x00000000}; - -const char var7f1b3a08[] = "tc != NULL"; -const char var7f1b3a14[] = "gamefile.c"; +//const char var7f1b38b0[] = "\n"; s32 menuhandlerDeclineMission(u32 operation, struct menu_item *item, s32 *value) { @@ -809,28 +778,13 @@ glabel func0f10d678 /* f10d6e0: 27bd0020 */ addiu $sp,$sp,0x20 ); -GLOBAL_ASM( -glabel func0f10d6e4 -/* f10d6e4: 27bdffe8 */ addiu $sp,$sp,-24 -/* f10d6e8: afbf0014 */ sw $ra,0x14($sp) -/* f10d6ec: 0fc3089f */ jal getMissionTime -/* f10d6f0: afa40018 */ sw $a0,0x18($sp) -/* f10d6f4: 3c048007 */ lui $a0,0x8007 -/* f10d6f8: 8c841440 */ lw $a0,0x1440($a0) -/* f10d6fc: 00402825 */ or $a1,$v0,$zero -/* f10d700: 0fc355f8 */ jal func0f0d57e0 -/* f10d704: 24060003 */ addiu $a2,$zero,0x3 -/* f10d708: 3c048007 */ lui $a0,0x8007 -/* f10d70c: 3c057f1b */ lui $a1,%hi(var7f1b38b0) -/* f10d710: 24a538b0 */ addiu $a1,$a1,%lo(var7f1b38b0) -/* f10d714: 0c004c89 */ jal func00013224 -/* f10d718: 8c841440 */ lw $a0,0x1440($a0) -/* f10d71c: 8fbf0014 */ lw $ra,0x14($sp) -/* f10d720: 3c028007 */ lui $v0,0x8007 -/* f10d724: 8c421440 */ lw $v0,0x1440($v0) -/* f10d728: 03e00008 */ jr $ra -/* f10d72c: 27bd0018 */ addiu $sp,$sp,0x18 -); +char *menutextMissionTime(s32 arg0) +{ + formatTime(g_StringPointer, getMissionTime(), 3); + strcat(g_StringPointer, "\n"); + + return g_StringPointer; +} GLOBAL_ASM( glabel func0f10d730 @@ -1829,12 +1783,12 @@ glabel func0f10e4d8 /* f10e548: 3c048007 */ lui $a0,0x8007 /* f10e54c: 8c841440 */ lw $a0,0x1440($a0) /* f10e550: 00052880 */ sll $a1,$a1,0x2 -/* f10e554: 0fc355f8 */ jal func0f0d57e0 +/* f10e554: 0fc355f8 */ jal formatTime /* f10e558: 24060003 */ addiu $a2,$zero,0x3 /* f10e55c: 3c048007 */ lui $a0,0x8007 /* f10e560: 3c057f1b */ lui $a1,%hi(var7f1b38bc) /* f10e564: 24a538bc */ addiu $a1,$a1,%lo(var7f1b38bc) -/* f10e568: 0c004c89 */ jal func00013224 +/* f10e568: 0c004c89 */ jal strcat /* f10e56c: 8c841440 */ lw $a0,0x1440($a0) /* f10e570: 3c028007 */ lui $v0,0x8007 /* f10e574: 8c421440 */ lw $v0,0x1440($v0) @@ -5217,3 +5171,35 @@ glabel func0f111460 /* f1115f8: 00000000 */ sll $zero,$zero,0x0 /* 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"; +const char var7f1b38e0[] = "Dark"; +const char var7f1b38e8[] = "MAX_FUDGE_DATA_SIZE>=sizeof(PakFileTypeGameSetup_s)"; +const char var7f1b391c[] = "pdoptions.c"; +const char var7f1b3928[] = "MAX_FUDGE_DATA_SIZE>=sizeof(PakFileTypeGameSetup_s)"; +const char var7f1b395c[] = "pdoptions.c"; +const char var7f1b3968[] = "MAX_FUDGE_DATA_SIZE>=sizeof(PakFileTypeGameSetup_s)"; +const char var7f1b399c[] = "pdoptions.c"; +const char var7f1b39a8[] = ""; +const char var7f1b39ac[] = ""; +const char var7f1b39b0[] = "fileGuid"; +const char var7f1b39bc[] = "bossfile.c"; +const char var7f1b39c8[] = ""; +const char var7f1b39cc[] = ""; +const char var7f1b39d0[] = "Rebuilding pakWad %d:\n"; + +const u32 var7f1b39e8[] = {0x00000080}; +const u32 var7f1b39ec[] = {0x00000040}; +const u32 var7f1b39f0[] = {0x00000020}; +const u32 var7f1b39f4[] = {0x00000008}; +const u32 var7f1b39f8[] = {0x04000102}; +const u32 var7f1b39fc[] = {0x03000000}; +const u32 var7f1b3a00[] = {0x01020304}; +const u32 var7f1b3a04[] = {0x00000000}; + +const char var7f1b3a08[] = "tc != NULL"; +const char var7f1b3a14[] = "gamefile.c"; diff --git a/src/game/game_1165d0.c b/src/game/game_1165d0.c index 2abbb0324..4e3348515 100644 --- a/src/game/game_1165d0.c +++ b/src/game/game_1165d0.c @@ -1781,7 +1781,7 @@ glabel func0f11776c /* f1177f0: 0c004dad */ jal sprintf /* f1177f4: 92260000 */ lbu $a2,0x0($s1) /* f1177f8: 02602025 */ or $a0,$s3,$zero -/* f1177fc: 0c004c89 */ jal func00013224 +/* f1177fc: 0c004c89 */ jal strcat /* f117800: 02402825 */ or $a1,$s2,$zero /* f117804: 26100001 */ addiu $s0,$s0,0x1 /* f117808: 1614fff1 */ bne $s0,$s4,.L0f1177d0 @@ -1789,7 +1789,7 @@ glabel func0f11776c .L0f117810: /* f117810: 3c057f1b */ lui $a1,%hi(var7f1b3bd8) /* f117814: 24a53bd8 */ addiu $a1,$a1,%lo(var7f1b3bd8) -/* f117818: 0c004c89 */ jal func00013224 +/* f117818: 0c004c89 */ jal strcat /* f11781c: 02602025 */ or $a0,$s3,$zero /* f117820: 8fbf0034 */ lw $ra,0x34($sp) /* f117824: 8fb00018 */ lw $s0,0x18($sp) diff --git a/src/game/game_13e0e0.c b/src/game/game_13e0e0.c index e24663e0c..6b322e5bf 100644 --- a/src/game/game_13e0e0.c +++ b/src/game/game_13e0e0.c @@ -11184,12 +11184,12 @@ glabel func0f147e24 /* f148304: 15800004 */ bnez $t4,.L0f148318 /* f148308: 3c057f1b */ lui $a1,%hi(var7f1b5f14) /* f14830c: 24a55f14 */ addiu $a1,$a1,%lo(var7f1b5f14) -/* f148310: 0c004c89 */ jal func00013224 +/* f148310: 0c004c89 */ jal strcat /* f148314: 27a40100 */ addiu $a0,$sp,0x100 .L0f148318: /* f148318: 3c057f1b */ lui $a1,%hi(var7f1b5f20) /* f14831c: 24a55f20 */ addiu $a1,$a1,%lo(var7f1b5f20) -/* f148320: 0c004c89 */ jal func00013224 +/* f148320: 0c004c89 */ jal strcat /* f148324: 27a40100 */ addiu $a0,$sp,0x100 /* f148328: 0c002f02 */ jal func0000bc08 /* f14832c: 00000000 */ sll $zero,$zero,0x0 diff --git a/src/game/game_177e00.c b/src/game/game_177e00.c index 209b90482..79f1bbedf 100644 --- a/src/game/game_177e00.c +++ b/src/game/game_177e00.c @@ -314,7 +314,7 @@ glabel func0f1782f8 /* f178308: 3c048007 */ lui $a0,0x8007 /* f17830c: 8c841440 */ lw $a0,0x1440($a0) /* f178310: 00402825 */ or $a1,$v0,$zero -/* f178314: 0fc355f8 */ jal func0f0d57e0 +/* f178314: 0fc355f8 */ jal formatTime /* f178318: 24060003 */ addiu $a2,$zero,0x3 /* f17831c: 8fbf0014 */ lw $ra,0x14($sp) /* f178320: 3c028007 */ lui $v0,0x8007 diff --git a/src/game/game_179060.c b/src/game/game_179060.c index 41f715154..0077e8558 100644 --- a/src/game/game_179060.c +++ b/src/game/game_179060.c @@ -2295,8 +2295,8 @@ glabel func0f17b408 /* f17b468: 00001025 */ or $v0,$zero,$zero /* f17b46c: 1720000f */ bnez $t9,.L0f17b4ac /* f17b470: 2406000f */ addiu $a2,$zero,0xf -/* f17b474: 3c058007 */ lui $a1,%hi(var80071440) -/* f17b478: 24a51440 */ addiu $a1,$a1,%lo(var80071440) +/* f17b474: 3c058007 */ lui $a1,%hi(g_StringPointer) +/* f17b478: 24a51440 */ addiu $a1,$a1,%lo(g_StringPointer) .L0f17b47c: /* f17b47c: 90780000 */ lbu $t8,0x0($v1) /* f17b480: 8ca80000 */ lw $t0,0x0($a1) @@ -2311,8 +2311,8 @@ glabel func0f17b408 /* f17b4a4: 10000012 */ beqz $zero,.L0f17b4f0 /* f17b4a8: 8ca20000 */ lw $v0,0x0($a1) .L0f17b4ac: -/* f17b4ac: 3c058007 */ lui $a1,%hi(var80071440) -/* f17b4b0: 24a51440 */ addiu $a1,$a1,%lo(var80071440) +/* f17b4ac: 3c058007 */ lui $a1,%hi(g_StringPointer) +/* f17b4b0: 24a51440 */ addiu $a1,$a1,%lo(g_StringPointer) /* f17b4b4: 00001025 */ or $v0,$zero,$zero /* f17b4b8: 27a30014 */ addiu $v1,$sp,0x14 /* f17b4bc: 00002025 */ or $a0,$zero,$zero @@ -3092,8 +3092,8 @@ glabel menuhandler0017bfc0 /* f17c02c: 10000053 */ beqz $zero,.L0f17c17c /* f17c030: ae6f0000 */ sw $t7,0x0($s3) /* f17c034: 8e780000 */ lw $t8,0x0($s3) -/* f17c038: 3c108007 */ lui $s0,%hi(var80071440) -/* f17c03c: 26101440 */ addiu $s0,$s0,%lo(var80071440) +/* f17c038: 3c108007 */ lui $s0,%hi(g_StringPointer) +/* f17c03c: 26101440 */ addiu $s0,$s0,%lo(g_StringPointer) /* f17c040: 0018c880 */ sll $t9,$t8,0x2 /* f17c044: 0338c823 */ subu $t9,$t9,$t8 /* f17c048: 0019c8c0 */ sll $t9,$t9,0x3 diff --git a/src/include/game/data/data_0160b0.h b/src/include/game/data/data_0160b0.h index 38fa5dc6a..8b20748ac 100644 --- a/src/include/game/data/data_0160b0.h +++ b/src/include/game/data/data_0160b0.h @@ -147,7 +147,7 @@ extern u32 var800711e0; extern u32 var800711e8; extern u32 var800711f4; extern u32 var8007142c; -extern u32 var80071440; +extern char *g_StringPointer; extern u32 g_MpPlayerNum; extern u32 var8007144c; extern u32 var80071468; diff --git a/src/include/game/game_0d4690.h b/src/include/game/game_0d4690.h index e82d4b7d2..573fb0f77 100644 --- a/src/include/game/game_0d4690.h +++ b/src/include/game/game_0d4690.h @@ -22,7 +22,7 @@ u32 func0f0d564c(void); u32 func0f0d5690(void); u32 func0f0d575c(void); u32 func0f0d579c(void); -u32 func0f0d57e0(void); +void formatTime(char *dst, s32 time, u32 arg2); u32 func0f0d5a7c(void); #endif diff --git a/src/include/game/game_10ccd0.h b/src/include/game/game_10ccd0.h index f3e134eb9..cd024e21c 100644 --- a/src/include/game/game_10ccd0.h +++ b/src/include/game/game_10ccd0.h @@ -20,7 +20,7 @@ u32 func0f10d4d4(void); u32 func0f10d588(void); u32 func0f10d61c(void); u32 func0f10d678(void); -u32 func0f10d6e4(void); +char *menutextMissionTime(s32 arg0); u32 func0f10d730(void); u32 func0f10d770(void); void func0f10d910(s32 arg0); diff --git a/src/include/lib/lib_13130.h b/src/include/lib/lib_13130.h index cfe7dd7d0..1a4599f09 100644 --- a/src/include/lib/lib_13130.h +++ b/src/include/lib/lib_13130.h @@ -5,7 +5,7 @@ char *strcpy(char *dest, char *src); u32 func000131c8(void); -u32 func00013224(char *dst, char *src); +u32 strcat(char *dst, char *src); u32 func00013274(void); u32 func00013274(void); u32 func000132c0(void); diff --git a/src/lib/lib_13130.c b/src/lib/lib_13130.c index a0a7a3f05..0afb8f547 100644 --- a/src/lib/lib_13130.c +++ b/src/lib/lib_13130.c @@ -99,7 +99,7 @@ glabel func000131c8 ); GLOBAL_ASM( -glabel func00013224 +glabel strcat /* 13224: 908e0000 */ lbu $t6,0x0($a0) /* 13228: 00801025 */ or $v0,$a0,$zero /* 1322c: 51c00006 */ beqzl $t6,.L00013248