From 8dce522ce9a953e1fde227305cd964a142df3a76 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Sun, 31 May 2020 19:50:00 +1000 Subject: [PATCH] Attempt to decompile titleRenderNoController --- src/game/game_016100.c | 83 +++++++++++++++++--- src/game/game_097ba0.c | 12 +-- src/game/game_0d7070.c | 6 +- src/game/game_0dcdb0.c | 34 ++++---- src/game/game_0e5ce0.c | 138 ++++++++++++++++----------------- src/game/game_0f09f0.c | 48 ++++++------ src/game/game_0fd660.c | 40 +++++----- src/game/game_102240.c | 14 ++-- src/game/game_107fb0.c | 24 +++--- src/game/game_1371b0.c | 4 +- src/game/game_141820.c | 54 ++++++------- src/game/game_1531a0.c | 12 +-- src/game/game_179060.c | 4 +- src/game/game_17f930.c | 12 +-- src/game/game_19c990.c | 8 +- src/game/game_1a3340.c | 58 +++++++------- src/game/mplayer.c | 12 +-- src/include/game/game_0fd660.h | 2 +- src/include/game/game_1531a0.h | 6 +- src/include/lib/lib_09660.h | 4 +- src/include/lib/lib_13900.h | 2 +- src/include/types.h | 2 +- src/lib/lib_13900.c | 2 +- 23 files changed, 320 insertions(+), 261 deletions(-) diff --git a/src/game/game_016100.c b/src/game/game_016100.c index 7e8e8d291..193acfbb3 100644 --- a/src/game/game_016100.c +++ b/src/game/game_016100.c @@ -534,7 +534,7 @@ void titleTickCheckControllers(void) func0000bd20(0); if (g_TitleTimer > 6) { - if ((func0001404c() % 2) == 0) { + if ((getConnectedControllers() & 1) == 0) { titleSetNextMode(TITLEMODE_NOCONTROLLER); } else { titleSetNextMode(TITLEMODE_RARELOGO); @@ -569,7 +569,7 @@ glabel func0f0165f0 /* f016624: 27a50048 */ addiu $a1,$sp,0x48 /* f016628: 27a4004c */ addiu $a0,$sp,0x4c /* f01662c: afa00014 */ sw $zero,0x14($sp) -/* f016630: 0fc55cbe */ jal func0f1572f8 +/* f016630: 0fc55cbe */ jal textMeasure /* f016634: afae0010 */ sw $t6,0x10($sp) /* f016638: 8faf005c */ lw $t7,0x5c($sp) /* f01663c: 8fb80048 */ lw $t8,0x48($sp) @@ -612,7 +612,7 @@ glabel func0f0165f0 /* f0166c8: afb90010 */ sw $t9,0x10($sp) /* f0166cc: afa90014 */ sw $t1,0x14($sp) /* f0166d0: afa80018 */ sw $t0,0x18($sp) -/* f0166d4: 0fc5580f */ jal func0f15603c +/* f0166d4: 0fc5580f */ jal textRenderWhite /* f0166d8: afaa001c */ sw $t2,0x1c($sp) /* f0166dc: 8fbf0034 */ lw $ra,0x34($sp) /* f0166e0: 27bd0050 */ addiu $sp,$sp,0x50 @@ -1025,7 +1025,7 @@ glabel var7f1a83e4 /* f016cc8: afb4001c */ sw $s4,0x1c($sp) /* f016ccc: afa20020 */ sw $v0,0x20($sp) /* f016cd0: afa00024 */ sw $zero,0x24($sp) -/* f016cd4: 0fc5580f */ jal func0f15603c +/* f016cd4: 0fc5580f */ jal textRenderWhite /* f016cd8: afa00028 */ sw $zero,0x28($sp) /* f016cdc: afa20128 */ sw $v0,0x128($sp) .L0f016ce0: @@ -3319,7 +3319,7 @@ glabel func0f018ebc /* f019028: afa00024 */ sw $zero,0x24($sp) /* f01902c: afa00028 */ sw $zero,0x28($sp) /* f019030: afad0014 */ sw $t5,0x14($sp) -/* f019034: 0fc5580f */ jal func0f15603c +/* f019034: 0fc5580f */ jal textRenderWhite /* f019038: afac0010 */ sw $t4,0x10($sp) /* f01903c: 8fa8008c */ lw $t0,0x8c($sp) /* f019040: 26940001 */ addiu $s4,$s4,0x1 @@ -4562,7 +4562,7 @@ glabel titleRenderNoController /* f01a510: 27bdff98 */ addiu $sp,$sp,-104 /* f01a514: afbf003c */ sw $ra,0x3c($sp) /* f01a518: afb00038 */ sw $s0,0x38($sp) -/* f01a51c: 0c005013 */ jal func0001404c +/* f01a51c: 0c005013 */ jal getConnectedControllers /* f01a520: 00808025 */ or $s0,$a0,$zero /* f01a524: 0fc06bf0 */ jal func0f01afc0 /* f01a528: 02002025 */ or $a0,$s0,$zero @@ -4580,7 +4580,7 @@ glabel titleRenderNoController /* f01a558: 27a50060 */ addiu $a1,$sp,0x60 /* f01a55c: 00403025 */ or $a2,$v0,$zero /* f01a560: afa00014 */ sw $zero,0x14($sp) -/* f01a564: 0fc55cbe */ jal func0f1572f8 +/* f01a564: 0fc55cbe */ jal textMeasure /* f01a568: afae0010 */ sw $t6,0x10($sp) /* f01a56c: 8faf0060 */ lw $t7,0x60($sp) /* f01a570: 3c098006 */ lui $t1,%hi(var800624a0) @@ -4625,7 +4625,7 @@ glabel titleRenderNoController /* f01a608: afa0002c */ sw $zero,0x2c($sp) /* f01a60c: afb80014 */ sw $t8,0x14($sp) /* f01a610: afb90010 */ sw $t9,0x10($sp) -/* f01a614: 0fc55b92 */ jal func0f156e48 +/* f01a614: 0fc55b92 */ jal textRender /* f01a618: afab0020 */ sw $t3,0x20($sp) /* f01a61c: 10000018 */ beqz $zero,.L0f01a680 /* f01a620: 00408025 */ or $s0,$v0,$zero @@ -4650,7 +4650,7 @@ glabel titleRenderNoController /* f01a668: afa00028 */ sw $zero,0x28($sp) /* f01a66c: afac0014 */ sw $t4,0x14($sp) /* f01a670: afaa0010 */ sw $t2,0x10($sp) -/* f01a674: 0fc5580f */ jal func0f15603c +/* f01a674: 0fc5580f */ jal textRenderWhite /* f01a678: afae001c */ sw $t6,0x1c($sp) /* f01a67c: 00408025 */ or $s0,$v0,$zero .L0f01a680: @@ -4665,7 +4665,7 @@ glabel titleRenderNoController /* f01a6a0: 27a50060 */ addiu $a1,$sp,0x60 /* f01a6a4: 00403025 */ or $a2,$v0,$zero /* f01a6a8: afa00014 */ sw $zero,0x14($sp) -/* f01a6ac: 0fc55cbe */ jal func0f1572f8 +/* f01a6ac: 0fc55cbe */ jal textMeasure /* f01a6b0: afaf0010 */ sw $t7,0x10($sp) /* f01a6b4: 8fb90060 */ lw $t9,0x60($sp) /* f01a6b8: 3c0b8006 */ lui $t3,%hi(var800624a0) @@ -4710,7 +4710,7 @@ glabel titleRenderNoController /* f01a750: afa0002c */ sw $zero,0x2c($sp) /* f01a754: afb80014 */ sw $t8,0x14($sp) /* f01a758: afa80010 */ sw $t0,0x10($sp) -/* f01a75c: 0fc55b92 */ jal func0f156e48 +/* f01a75c: 0fc55b92 */ jal textRender /* f01a760: afac0020 */ sw $t4,0x20($sp) /* f01a764: 10000018 */ beqz $zero,.L0f01a7c8 /* f01a768: 00408025 */ or $s0,$v0,$zero @@ -4735,7 +4735,7 @@ glabel titleRenderNoController /* f01a7b0: afa00028 */ sw $zero,0x28($sp) /* f01a7b4: afad0014 */ sw $t5,0x14($sp) /* f01a7b8: afaa0010 */ sw $t2,0x10($sp) -/* f01a7bc: 0fc5580f */ jal func0f15603c +/* f01a7bc: 0fc5580f */ jal textRenderWhite /* f01a7c0: afaf001c */ sw $t7,0x1c($sp) /* f01a7c4: 00408025 */ or $s0,$v0,$zero .L0f01a7c8: @@ -4748,6 +4748,65 @@ glabel titleRenderNoController /* f01a7e0: 00000000 */ sll $zero,$zero,0x0 ); +// Mismatch because goal uses an implicit stack address for func0000bc08's +// return value while mine uses s0, or multiple stack addresses. +// +// Each time func000bc08 is called, goal puts the result in sp72 to preserve it +// past the call to func000bc18. It uses the same stack address each time. +// However, if the below is changed to call the final func000bc08 like the +// others, it uses s0 instead. Likewise, changing all calls to load their return +// values into variables also makes it use s0. And a mix between the two +// (as shown below) causes it to use different stack addresses. +//Gfx *titleRenderNoController(Gfx *gdl) +//{ +// s32 textheight; // sp100 +// s32 textwidth; // sp96 +// s32 x; // sp92 +// s32 y; // sp88 +// char *text; // sp84 +// u16 stack[6]; +// +// // This was likely printed to console +// getConnectedControllers(); +// +// gdl = func0f01afc0(gdl); +// gdl = func0f153628(gdl); +// +// // First line +// text = langGet(L_OPTIONS(71)); // "- no controller in controller socket 1 -" +// textMeasure(&textheight, &textwidth, text, var8007fb20, var8007fb1c, 0); +// +// x = 288 - (textwidth >> 1); +// y = ((var800624a0 / 2) - (textheight >> 1)) - 12; +// +// if (g_LanguageId != LANGUAGE_ENGLISH) { +// gdl = textRender(gdl, &x, &y, text, var8007fb20, var8007fb1c, +// -1, 0x008000ff, func0000bc08(), func0000bc18(), 0, 0); +// } else { +// gdl = textRenderWhite(gdl, &x, &y, text, var8007fb20, var8007fb1c, +// -1, func0000bc08(), func0000bc18(), 0, 0); +// } +// +// // Second line +// text = langGet(L_OPTIONS(72)); // "please power off and attach a controller" +// textMeasure(&textheight, &textwidth, text, var8007fb20, var8007fb1c, 0); +// +// x = 288 - (textwidth >> 1); +// y = ((var800624a0 / 2) - (textheight >> 1)) + 12; +// +// if (g_LanguageId != LANGUAGE_ENGLISH) { +// gdl = textRender(gdl, &x, &y, text, var8007fb20, var8007fb1c, +// -1, 0x008000ff, func0000bc08(), func0000bc18(), 0, 0); +// } else { +// s16 a = func0000bc08(); +// s16 b = func0000bc18(); +// gdl = textRenderWhite(gdl, &x, &y, text, var8007fb20, var8007fb1c, +// -1, a, b, 0, 0); +// } +// +// return func0f153780(gdl); +//} + void titleSetNextMode(s32 mode) { if (g_TitleDelayedMode != mode) { diff --git a/src/game/game_097ba0.c b/src/game/game_097ba0.c index d45d691a6..f1362ec51 100644 --- a/src/game/game_097ba0.c +++ b/src/game/game_097ba0.c @@ -21561,7 +21561,7 @@ glabel func0f0a9b68 /* f0a9bb0: afa00050 */ sw $zero,0x50($sp) /* f0a9bb4: afa00048 */ sw $zero,0x48($sp) /* f0a9bb8: afa0004c */ sw $zero,0x4c($sp) -/* f0a9bbc: 0fc55cbe */ jal func0f1572f8 +/* f0a9bbc: 0fc55cbe */ jal textMeasure /* f0a9bc0: afae0010 */ sw $t6,0x10($sp) /* f0a9bc4: 8fa2006c */ lw $v0,0x6c($sp) /* f0a9bc8: 24030001 */ addiu $v1,$zero,0x1 @@ -21654,7 +21654,7 @@ glabel func0f0a9b68 /* f0a9d04: afa0002c */ sw $zero,0x2c($sp) /* f0a9d08: afb80014 */ sw $t8,0x14($sp) /* f0a9d0c: afaf0010 */ sw $t7,0x10($sp) -/* f0a9d10: 0fc55b92 */ jal func0f156e48 +/* f0a9d10: 0fc55b92 */ jal textRender /* f0a9d14: afb90018 */ sw $t9,0x18($sp) /* f0a9d18: 8fbf003c */ lw $ra,0x3c($sp) /* f0a9d1c: 8fb00038 */ lw $s0,0x38($sp) @@ -22834,7 +22834,7 @@ glabel hudRenderAmmo /* f0aadd0: afa00014 */ sw $zero,0x14($sp) /* f0aadd4: afa600d4 */ sw $a2,0xd4($sp) /* f0aadd8: afaa0058 */ sw $t2,0x58($sp) -/* f0aaddc: 0fc55cbe */ jal func0f1572f8 +/* f0aaddc: 0fc55cbe */ jal textMeasure /* f0aade0: afae0010 */ sw $t6,0x10($sp) /* f0aade4: 8fb800c0 */ lw $t8,0xc0($sp) /* f0aade8: 8faa0058 */ lw $t2,0x58($sp) @@ -22952,7 +22952,7 @@ glabel hudRenderAmmo /* f0aaf98: afa00028 */ sw $zero,0x28($sp) /* f0aaf9c: afb80014 */ sw $t8,0x14($sp) /* f0aafa0: afb90018 */ sw $t9,0x18($sp) -/* f0aafa4: 0fc5580f */ jal func0f15603c +/* f0aafa4: 0fc5580f */ jal textRenderWhite /* f0aafa8: afae001c */ sw $t6,0x1c($sp) /* f0aafac: 0fc54f93 */ jal func0f153e4c /* f0aafb0: afa20130 */ sw $v0,0x130($sp) @@ -23042,7 +23042,7 @@ glabel hudRenderAmmo /* f0ab0e0: afa00014 */ sw $zero,0x14($sp) /* f0ab0e4: afa600d4 */ sw $a2,0xd4($sp) /* f0ab0e8: afaa0058 */ sw $t2,0x58($sp) -/* f0ab0ec: 0fc55cbe */ jal func0f1572f8 +/* f0ab0ec: 0fc55cbe */ jal textMeasure /* f0ab0f0: afaf0010 */ sw $t7,0x10($sp) /* f0ab0f4: 8fae00c0 */ lw $t6,0xc0($sp) /* f0ab0f8: 8faa0058 */ lw $t2,0x58($sp) @@ -23152,7 +23152,7 @@ glabel hudRenderAmmo /* f0ab290: afa00028 */ sw $zero,0x28($sp) /* f0ab294: afae0014 */ sw $t6,0x14($sp) /* f0ab298: afb80018 */ sw $t8,0x18($sp) -/* f0ab29c: 0fc5580f */ jal func0f15603c +/* f0ab29c: 0fc5580f */ jal textRenderWhite /* f0ab2a0: afb9001c */ sw $t9,0x1c($sp) /* f0ab2a4: 0fc54f93 */ jal func0f153e4c /* f0ab2a8: afa20130 */ sw $v0,0x130($sp) diff --git a/src/game/game_0d7070.c b/src/game/game_0d7070.c index 893ee5176..e9bda7869 100644 --- a/src/game/game_0d7070.c +++ b/src/game/game_0d7070.c @@ -1091,7 +1091,7 @@ glabel func0f0d78f4 /* f0d7eb4: afa00028 */ sw $zero,0x28($sp) /* f0d7eb8: afa0002c */ sw $zero,0x2c($sp) /* f0d7ebc: afb90014 */ sw $t9,0x14($sp) -/* f0d7ec0: 0fc55b92 */ jal func0f156e48 +/* f0d7ec0: 0fc55b92 */ jal textRender /* f0d7ec4: afaf0020 */ sw $t7,0x20($sp) /* f0d7ec8: 1000001d */ beqz $zero,.L0f0d7f40 /* f0d7ecc: afa20098 */ sw $v0,0x98($sp) @@ -1121,7 +1121,7 @@ glabel func0f0d78f4 /* f0d7f28: afa00028 */ sw $zero,0x28($sp) /* f0d7f2c: afa0002c */ sw $zero,0x2c($sp) /* f0d7f30: afae0014 */ sw $t6,0x14($sp) -/* f0d7f34: 0fc55b92 */ jal func0f156e48 +/* f0d7f34: 0fc55b92 */ jal textRender /* f0d7f38: afb90020 */ sw $t9,0x20($sp) /* f0d7f3c: afa20098 */ sw $v0,0x98($sp) .L0f0d7f40: @@ -2452,7 +2452,7 @@ glabel var7f1ade50 /* f0d921c: afa0002c */ sw $zero,0x2c($sp) /* f0d9220: afad0014 */ sw $t5,0x14($sp) /* f0d9224: afac0010 */ sw $t4,0x10($sp) -/* f0d9228: 0fc55b92 */ jal func0f156e48 +/* f0d9228: 0fc55b92 */ jal textRender /* f0d922c: afb80020 */ sw $t8,0x20($sp) /* f0d9230: 8fa30090 */ lw $v1,0x90($sp) /* f0d9234: 00409825 */ or $s3,$v0,$zero diff --git a/src/game/game_0dcdb0.c b/src/game/game_0dcdb0.c index c8768b4b6..82ca6dece 100644 --- a/src/game/game_0dcdb0.c +++ b/src/game/game_0dcdb0.c @@ -358,7 +358,7 @@ glabel func0f0dcef4 /* f0dd288: afae0014 */ sw $t6,0x14($sp) /* f0dd28c: afad0010 */ sw $t5,0x10($sp) /* f0dd290: afaf0018 */ sw $t7,0x18($sp) -/* f0dd294: 0fc55b92 */ jal func0f156e48 +/* f0dd294: 0fc55b92 */ jal textRender /* f0dd298: afb90020 */ sw $t9,0x20($sp) /* f0dd29c: 8fbf0034 */ lw $ra,0x34($sp) /* f0dd2a0: 27bd0090 */ addiu $sp,$sp,0x90 @@ -567,7 +567,7 @@ glabel func0f0dd2ac /* f0dd568: 27a50070 */ addiu $a1,$sp,0x70 /* f0dd56c: 27a60084 */ addiu $a2,$sp,0x84 /* f0dd570: afa00014 */ sw $zero,0x14($sp) -/* f0dd574: 0fc55cbe */ jal func0f1572f8 +/* f0dd574: 0fc55cbe */ jal textMeasure /* f0dd578: afaf0010 */ sw $t7,0x10($sp) /* f0dd57c: 8fb800b8 */ lw $t8,0xb8($sp) /* f0dd580: 8fb900b4 */ lw $t9,0xb4($sp) @@ -621,7 +621,7 @@ glabel func0f0dd2ac /* f0dd640: afa0002c */ sw $zero,0x2c($sp) /* f0dd644: afae0014 */ sw $t6,0x14($sp) /* f0dd648: afad0010 */ sw $t5,0x10($sp) -/* f0dd64c: 0fc55b92 */ jal func0f156e48 +/* f0dd64c: 0fc55b92 */ jal textRender /* f0dd650: afaa0020 */ sw $t2,0x20($sp) /* f0dd654: 3c057f1b */ lui $a1,%hi(var7f1ade94) /* f0dd658: afa200c0 */ sw $v0,0xc0($sp) @@ -636,7 +636,7 @@ glabel func0f0dd2ac /* f0dd67c: 27a50070 */ addiu $a1,$sp,0x70 /* f0dd680: 27a60084 */ addiu $a2,$sp,0x84 /* f0dd684: afa00014 */ sw $zero,0x14($sp) -/* f0dd688: 0fc55cbe */ jal func0f1572f8 +/* f0dd688: 0fc55cbe */ jal textMeasure /* f0dd68c: afab0010 */ sw $t3,0x10($sp) /* f0dd690: 8fa80070 */ lw $t0,0x70($sp) /* f0dd694: 8fac0044 */ lw $t4,0x44($sp) @@ -678,7 +678,7 @@ glabel func0f0dd2ac /* f0dd724: afaa0014 */ sw $t2,0x14($sp) /* f0dd728: afa90010 */ sw $t1,0x10($sp) /* f0dd72c: afab0018 */ sw $t3,0x18($sp) -/* f0dd730: 0fc55b92 */ jal func0f156e48 +/* f0dd730: 0fc55b92 */ jal textRender /* f0dd734: afad0020 */ sw $t5,0x20($sp) /* f0dd738: c7aa009c */ lwc1 $f10,0x9c($sp) /* f0dd73c: 3c057f1b */ lui $a1,%hi(var7f1ade98) @@ -700,7 +700,7 @@ glabel func0f0dd2ac /* f0dd77c: 27a50070 */ addiu $a1,$sp,0x70 /* f0dd780: 27a60084 */ addiu $a2,$sp,0x84 /* f0dd784: afa00014 */ sw $zero,0x14($sp) -/* f0dd788: 0fc55cbe */ jal func0f1572f8 +/* f0dd788: 0fc55cbe */ jal textMeasure /* f0dd78c: afae0010 */ sw $t6,0x10($sp) /* f0dd790: 8fa20044 */ lw $v0,0x44($sp) /* f0dd794: 8fa80070 */ lw $t0,0x70($sp) @@ -741,7 +741,7 @@ glabel func0f0dd2ac /* f0dd820: afab0014 */ sw $t3,0x14($sp) /* f0dd824: afaa0010 */ sw $t2,0x10($sp) /* f0dd828: afac0018 */ sw $t4,0x18($sp) -/* f0dd82c: 0fc55b92 */ jal func0f156e48 +/* f0dd82c: 0fc55b92 */ jal textRender /* f0dd830: afae0020 */ sw $t6,0x20($sp) .L0f0dd834: /* f0dd834: 8fbf003c */ lw $ra,0x3c($sp) @@ -2778,7 +2778,7 @@ glabel hudmsgCreate /* f0df128: 27a401dc */ addiu $a0,$sp,0x1dc /* f0df12c: 27a501e0 */ addiu $a1,$sp,0x1e0 /* f0df130: 8fa601f8 */ lw $a2,0x1f8($sp) -/* f0df134: 0fc55cbe */ jal func0f1572f8 +/* f0df134: 0fc55cbe */ jal textMeasure /* f0df138: afb80010 */ sw $t8,0x10($sp) /* f0df13c: 8faf01d4 */ lw $t7,0x1d4($sp) /* f0df140: 8fb901e0 */ lw $t9,0x1e0($sp) @@ -2836,7 +2836,7 @@ glabel hudmsgCreate /* f0df204: afa00014 */ sw $zero,0x14($sp) /* f0df208: 27a501e0 */ addiu $a1,$sp,0x1e0 /* f0df20c: 02403025 */ or $a2,$s2,$zero -/* f0df210: 0fc55cbe */ jal func0f1572f8 +/* f0df210: 0fc55cbe */ jal textMeasure /* f0df214: afad0010 */ sw $t5,0x10($sp) /* f0df218: 10000006 */ beqz $zero,.L0f0df234 /* f0df21c: 8fa901ec */ lw $t1,0x1ec($sp) @@ -3012,7 +3012,7 @@ glabel hudmsgCreate // uStack32 = 0; // msg = &g_HudMessages[index]; // iStack36 = func0f0ddb1c(&uStack32, conf16); -// func0f1572f8(&uStack28, &uStack24, text, conf04->unk00, conf08->unk00, 0); +// textMeasure(&uStack28, &uStack24, text, conf04->unk00, conf08->unk00, 0); // // if (iStack36 < uStack24) { // i = 0; @@ -3030,7 +3030,7 @@ glabel hudmsgCreate // stacktext[writeindex++] = '\0'; // // func0f157520(iStack36, stacktext, msg->text, conf04->unk00, conf08->unk00); -// func0f1572f8(&uStack28, &uStack24, msg->text, conf04->unk00, conf08->unk00, 0); +// textMeasure(&uStack28, &uStack24, msg->text, conf04->unk00, conf08->unk00, 0); // } else { // strncpy(msg->text, text, 399); // msg->text[399] = '\0'; @@ -3981,7 +3981,7 @@ glabel var7f1adef4 /* f0e005c: afb30018 */ sw $s3,0x18($sp) /* f0e0060: 02e03025 */ or $a2,$s7,$zero /* f0e0064: 26070020 */ addiu $a3,$s0,0x20 -/* f0e0068: 0fc5580f */ jal func0f15603c +/* f0e0068: 0fc5580f */ jal textRenderWhite /* f0e006c: afac0014 */ sw $t4,0x14($sp) /* f0e0070: 1000001f */ beqz $zero,.L0f0e00f0 /* f0e0074: 00409025 */ or $s2,$v0,$zero @@ -4013,7 +4013,7 @@ glabel var7f1adef4 /* f0e00d8: afb30018 */ sw $s3,0x18($sp) /* f0e00dc: 02e03025 */ or $a2,$s7,$zero /* f0e00e0: 26070020 */ addiu $a3,$s0,0x20 -/* f0e00e4: 0fc55b92 */ jal func0f156e48 +/* f0e00e4: 0fc55b92 */ jal textRender /* f0e00e8: afaa0014 */ sw $t2,0x14($sp) /* f0e00ec: 00409025 */ or $s2,$v0,$zero .L0f0e00f0: @@ -4084,7 +4084,7 @@ glabel var7f1adef4 /* f0e01e4: afb30018 */ sw $s3,0x18($sp) /* f0e01e8: 02e03025 */ or $a2,$s7,$zero /* f0e01ec: 26070020 */ addiu $a3,$s0,0x20 -/* f0e01f0: 0fc5580f */ jal func0f15603c +/* f0e01f0: 0fc5580f */ jal textRenderWhite /* f0e01f4: afaf0014 */ sw $t7,0x14($sp) /* f0e01f8: 10000021 */ beqz $zero,.L0f0e0280 /* f0e01fc: 00409025 */ or $s2,$v0,$zero @@ -4118,7 +4118,7 @@ glabel var7f1adef4 /* f0e0268: afb30018 */ sw $s3,0x18($sp) /* f0e026c: 02e03025 */ or $a2,$s7,$zero /* f0e0270: 26070020 */ addiu $a3,$s0,0x20 -/* f0e0274: 0fc55b92 */ jal func0f156e48 +/* f0e0274: 0fc55b92 */ jal textRender /* f0e0278: afad0014 */ sw $t5,0x14($sp) /* f0e027c: 00409025 */ or $s2,$v0,$zero .L0f0e0280: @@ -4249,7 +4249,7 @@ glabel var7f1adef4 /* f0e0458: afb30018 */ sw $s3,0x18($sp) /* f0e045c: 02e03025 */ or $a2,$s7,$zero /* f0e0460: 26070020 */ addiu $a3,$s0,0x20 -/* f0e0464: 0fc5580f */ jal func0f15603c +/* f0e0464: 0fc5580f */ jal textRenderWhite /* f0e0468: afa80014 */ sw $t0,0x14($sp) /* f0e046c: 1000001e */ beqz $zero,.L0f0e04e8 /* f0e0470: 00409025 */ or $s2,$v0,$zero @@ -4280,7 +4280,7 @@ glabel var7f1adef4 /* f0e04d0: afb30018 */ sw $s3,0x18($sp) /* f0e04d4: 02e03025 */ or $a2,$s7,$zero /* f0e04d8: 26070020 */ addiu $a3,$s0,0x20 -/* f0e04dc: 0fc55b92 */ jal func0f156e48 +/* f0e04dc: 0fc55b92 */ jal textRender /* f0e04e0: afa90014 */ sw $t1,0x14($sp) /* f0e04e4: 00409025 */ or $s2,$v0,$zero .L0f0e04e8: diff --git a/src/game/game_0e5ce0.c b/src/game/game_0e5ce0.c index 56e8b27ba..e2c1129c2 100644 --- a/src/game/game_0e5ce0.c +++ b/src/game/game_0e5ce0.c @@ -4615,7 +4615,7 @@ glabel func0f0e6038 /* f0e6270: afab0014 */ sw $t3,0x14($sp) /* f0e6274: afaa0010 */ sw $t2,0x10($sp) /* f0e6278: afa8001c */ sw $t0,0x1c($sp) -/* f0e627c: 0fc5580f */ jal func0f15603c +/* f0e627c: 0fc5580f */ jal textRenderWhite /* f0e6280: afac0020 */ sw $t4,0x20($sp) /* f0e6284: 8fbf003c */ lw $ra,0x3c($sp) /* f0e6288: 8fb00034 */ lw $s0,0x34($sp) @@ -5775,7 +5775,7 @@ glabel menuRenderItemCustom /* f0e733c: 014dc021 */ addu $t8,$t2,$t5 /* f0e7340: afb8001c */ sw $t8,0x1c($sp) /* f0e7344: afa80024 */ sw $t0,0x24($sp) -/* f0e7348: 0fc5580f */ jal func0f15603c +/* f0e7348: 0fc5580f */ jal textRenderWhite /* f0e734c: afa30020 */ sw $v1,0x20($sp) /* f0e7350: 240b00ff */ addiu $t3,$zero,0xff /* f0e7354: afb300b8 */ sw $s3,0xb8($sp) @@ -5917,7 +5917,7 @@ glabel menuRenderItemCustom /* f0e7550: 27a50130 */ addiu $a1,$sp,0x130 /* f0e7554: 27a6012c */ addiu $a2,$sp,0x12c /* f0e7558: 02603825 */ or $a3,$s3,$zero -/* f0e755c: 0fc5580f */ jal func0f15603c +/* f0e755c: 0fc5580f */ jal textRenderWhite /* f0e7560: afa80024 */ sw $t0,0x24($sp) /* f0e7564: 00409025 */ or $s2,$v0,$zero .L0f0e7568: @@ -6657,7 +6657,7 @@ glabel menuRenderItemDropdown /* f0e7fc8: afa00024 */ sw $zero,0x24($sp) /* f0e7fcc: 27a60070 */ addiu $a2,$sp,0x70 /* f0e7fd0: 8fa70078 */ lw $a3,0x78($sp) -/* f0e7fd4: 0fc5580f */ jal func0f15603c +/* f0e7fd4: 0fc5580f */ jal textRenderWhite /* f0e7fd8: afaa0020 */ sw $t2,0x20($sp) /* f0e7fdc: afa20080 */ sw $v0,0x80($sp) /* f0e7fe0: 8e0e0010 */ lw $t6,0x10($s0) @@ -6714,7 +6714,7 @@ glabel menuRenderItemDropdown /* f0e80a0: 27a50048 */ addiu $a1,$sp,0x48 /* f0e80a4: 00403025 */ or $a2,$v0,$zero /* f0e80a8: afa00014 */ sw $zero,0x14($sp) -/* f0e80ac: 0fc55cbe */ jal func0f1572f8 +/* f0e80ac: 0fc55cbe */ jal textMeasure /* f0e80b0: afac0010 */ sw $t4,0x10($sp) /* f0e80b4: 860d0000 */ lh $t5,0x0($s0) /* f0e80b8: 860a0004 */ lh $t2,0x4($s0) @@ -6739,7 +6739,7 @@ glabel menuRenderItemDropdown /* f0e8104: afa00024 */ sw $zero,0x24($sp) /* f0e8108: 27a60070 */ addiu $a2,$sp,0x70 /* f0e810c: 8fa70078 */ lw $a3,0x78($sp) -/* f0e8110: 0fc5580f */ jal func0f15603c +/* f0e8110: 0fc5580f */ jal textRenderWhite /* f0e8114: afac0020 */ sw $t4,0x20($sp) /* f0e8118: afa20080 */ sw $v0,0x80($sp) .L0f0e811c: @@ -6968,7 +6968,7 @@ glabel func0f0e8290 /* f0e8440: 00403025 */ or $a2,$v0,$zero /* f0e8444: 8e870000 */ lw $a3,0x0($s4) /* f0e8448: afa00014 */ sw $zero,0x14($sp) -/* f0e844c: 0fc55cbe */ jal func0f1572f8 +/* f0e844c: 0fc55cbe */ jal textMeasure /* f0e8450: afaa0010 */ sw $t2,0x10($sp) /* f0e8454: 8fa20098 */ lw $v0,0x98($sp) /* f0e8458: 87ab0070 */ lh $t3,0x70($sp) @@ -7208,7 +7208,7 @@ glabel menuRenderItemKeyboard /* f0e87ac: afa00024 */ sw $zero,0x24($sp) /* f0e87b0: 27a600e8 */ addiu $a2,$sp,0xe8 /* f0e87b4: 8fa700e4 */ lw $a3,0xe4($sp) -/* f0e87b8: 0fc5580f */ jal func0f15603c +/* f0e87b8: 0fc5580f */ jal textRenderWhite /* f0e87bc: afae0020 */ sw $t6,0x20($sp) /* f0e87c0: 0fc54de0 */ jal func0f153780 /* f0e87c4: 00402025 */ or $a0,$v0,$zero @@ -7615,7 +7615,7 @@ glabel menuRenderItemKeyboard /* f0e8d94: 27a500bc */ addiu $a1,$sp,0xbc /* f0e8d98: 00403025 */ or $a2,$v0,$zero /* f0e8d9c: afa00014 */ sw $zero,0x14($sp) -/* f0e8da0: 0fc55cbe */ jal func0f1572f8 +/* f0e8da0: 0fc55cbe */ jal textMeasure /* f0e8da4: afaf0010 */ sw $t7,0x10($sp) /* f0e8da8: 8faa00bc */ lw $t2,0xbc($sp) /* f0e8dac: 8fae00ec */ lw $t6,0xec($sp) @@ -7703,7 +7703,7 @@ glabel menuRenderItemKeyboard /* f0e8ee0: afa00024 */ sw $zero,0x24($sp) /* f0e8ee4: 27a600e8 */ addiu $a2,$sp,0xe8 /* f0e8ee8: 00403825 */ or $a3,$v0,$zero -/* f0e8eec: 0fc5580f */ jal func0f15603c +/* f0e8eec: 0fc5580f */ jal textRenderWhite /* f0e8ef0: afac0020 */ sw $t4,0x20($sp) /* f0e8ef4: 27af00ae */ addiu $t7,$sp,0xae /* f0e8ef8: 162f004a */ bne $s1,$t7,.L0f0e9024 @@ -7752,7 +7752,7 @@ glabel menuRenderItemKeyboard /* f0e8f9c: 8f18fb0c */ lw $t8,%lo(var8007fb0c)($t8) /* f0e8fa0: 8ce7fb10 */ lw $a3,%lo(var8007fb10)($a3) /* f0e8fa4: afa00014 */ sw $zero,0x14($sp) -/* f0e8fa8: 0fc55cbe */ jal func0f1572f8 +/* f0e8fa8: 0fc55cbe */ jal textMeasure /* f0e8fac: afb80010 */ sw $t8,0x10($sp) /* f0e8fb0: 8fae00bc */ lw $t6,0xbc($sp) /* f0e8fb4: 2419000c */ addiu $t9,$zero,0xc @@ -7781,7 +7781,7 @@ glabel menuRenderItemKeyboard /* f0e900c: afa00024 */ sw $zero,0x24($sp) /* f0e9010: 27a600e8 */ addiu $a2,$sp,0xe8 /* f0e9014: 27a700f0 */ addiu $a3,$sp,0xf0 -/* f0e9018: 0fc5580f */ jal func0f15603c +/* f0e9018: 0fc5580f */ jal textRenderWhite /* f0e901c: afae0020 */ sw $t6,0x20($sp) /* f0e9020: afa200f8 */ sw $v0,0xf8($sp) .L0f0e9024: @@ -8203,7 +8203,7 @@ glabel func0f0e91d0 /* f0e95f8: 27a5004c */ addiu $a1,$sp,0x4c /* f0e95fc: 02003025 */ or $a2,$s0,$zero /* f0e9600: afa00014 */ sw $zero,0x14($sp) -/* f0e9604: 0fc55cbe */ jal func0f1572f8 +/* f0e9604: 0fc55cbe */ jal textMeasure /* f0e9608: afae0010 */ sw $t6,0x10($sp) /* f0e960c: 8faf0078 */ lw $t7,0x78($sp) /* f0e9610: 8fac004c */ lw $t4,0x4c($sp) @@ -8505,7 +8505,7 @@ glabel func0f0e98ac /* f0e9a34: 27a500c4 */ addiu $a1,$sp,0xc4 /* f0e9a38: 02003025 */ or $a2,$s0,$zero /* f0e9a3c: afa00014 */ sw $zero,0x14($sp) -/* f0e9a40: 0fc55cbe */ jal func0f1572f8 +/* f0e9a40: 0fc55cbe */ jal textMeasure /* f0e9a44: afb90010 */ sw $t9,0x10($sp) /* f0e9a48: 87ae0142 */ lh $t6,0x142($sp) /* f0e9a4c: 8fa900c4 */ lw $t1,0xc4($sp) @@ -8529,7 +8529,7 @@ glabel func0f0e98ac /* f0e9a94: afab0010 */ sw $t3,0x10($sp) /* f0e9a98: afaf0018 */ sw $t7,0x18($sp) /* f0e9a9c: afb8001c */ sw $t8,0x1c($sp) -/* f0e9aa0: 0fc5580f */ jal func0f15603c +/* f0e9aa0: 0fc5580f */ jal textRenderWhite /* f0e9aa4: afb90020 */ sw $t9,0x20($sp) /* f0e9aa8: 87ae0142 */ lh $t6,0x142($sp) /* f0e9aac: 8faa0154 */ lw $t2,0x154($sp) @@ -8563,7 +8563,7 @@ glabel func0f0e98ac /* f0e9b1c: afab0010 */ sw $t3,0x10($sp) /* f0e9b20: afaf0018 */ sw $t7,0x18($sp) /* f0e9b24: afb8001c */ sw $t8,0x1c($sp) -/* f0e9b28: 0fc5580f */ jal func0f15603c +/* f0e9b28: 0fc5580f */ jal textRenderWhite /* f0e9b2c: afb90020 */ sw $t9,0x20($sp) /* f0e9b30: 1000001a */ beqz $zero,.L0f0e9b9c /* f0e9b34: afa20130 */ sw $v0,0x130($sp) @@ -8590,7 +8590,7 @@ glabel func0f0e98ac /* f0e9b84: afae0010 */ sw $t6,0x10($sp) /* f0e9b88: afaa0018 */ sw $t2,0x18($sp) /* f0e9b8c: afac001c */ sw $t4,0x1c($sp) -/* f0e9b90: 0fc5580f */ jal func0f15603c +/* f0e9b90: 0fc5580f */ jal textRenderWhite /* f0e9b94: afab0020 */ sw $t3,0x20($sp) /* f0e9b98: afa20130 */ sw $v0,0x130($sp) .L0f0e9b9c: @@ -8659,7 +8659,7 @@ glabel func0f0e98ac /* f0e9c80: 8fa600cc */ lw $a2,0xcc($sp) /* f0e9c84: 8ce7fb08 */ lw $a3,%lo(var8007fb08)($a3) /* f0e9c88: afa00014 */ sw $zero,0x14($sp) -/* f0e9c8c: 0fc55cbe */ jal func0f1572f8 +/* f0e9c8c: 0fc55cbe */ jal textMeasure /* f0e9c90: afad0010 */ sw $t5,0x10($sp) /* f0e9c94: 3c028007 */ lui $v0,%hi(var800711e8) /* f0e9c98: 8c4211e8 */ lw $v0,%lo(var800711e8)($v0) @@ -8695,7 +8695,7 @@ glabel func0f0e98ac /* f0e9d0c: afab0014 */ sw $t3,0x14($sp) /* f0e9d10: afaf0020 */ sw $t7,0x20($sp) /* f0e9d14: afac0010 */ sw $t4,0x10($sp) -/* f0e9d18: 0fc5580f */ jal func0f15603c +/* f0e9d18: 0fc5580f */ jal textRenderWhite /* f0e9d1c: afad0018 */ sw $t5,0x18($sp) /* f0e9d20: 8fb800c4 */ lw $t8,0xc4($sp) /* f0e9d24: 8fac00c8 */ lw $t4,0xc8($sp) @@ -8722,7 +8722,7 @@ glabel func0f0e98ac /* f0e9d78: afae0014 */ sw $t6,0x14($sp) /* f0e9d7c: afaa0010 */ sw $t2,0x10($sp) /* f0e9d80: afad001c */ sw $t5,0x1c($sp) -/* f0e9d84: 0fc5580f */ jal func0f15603c +/* f0e9d84: 0fc5580f */ jal textRenderWhite /* f0e9d88: afaf0020 */ sw $t7,0x20($sp) /* f0e9d8c: 8fb800c4 */ lw $t8,0xc4($sp) /* f0e9d90: 87b90146 */ lh $t9,0x146($sp) @@ -8943,7 +8943,7 @@ glabel func0f0e98ac /* f0ea0e4: 8fa60120 */ lw $a2,0x120($sp) /* f0ea0e8: 8ce7fb10 */ lw $a3,-0x4f0($a3) /* f0ea0ec: afa00014 */ sw $zero,0x14($sp) -/* f0ea0f0: 0fc55cbe */ jal func0f1572f8 +/* f0ea0f0: 0fc55cbe */ jal textMeasure /* f0ea0f4: afab0010 */ sw $t3,0x10($sp) /* f0ea0f8: 87ae0142 */ lh $t6,0x142($sp) /* f0ea0fc: 8fad00c4 */ lw $t5,0xc4($sp) @@ -9298,7 +9298,7 @@ glabel menuRenderItemLabel /* f0ea60c: 8fad008c */ lw $t5,0x8c($sp) /* f0ea610: 8fa70090 */ lw $a3,0x90($sp) /* f0ea614: afa00014 */ sw $zero,0x14($sp) -/* f0ea618: 0fc55cbe */ jal func0f1572f8 +/* f0ea618: 0fc55cbe */ jal textMeasure /* f0ea61c: afad0010 */ sw $t5,0x10($sp) /* f0ea620: 860e0004 */ lh $t6,0x4($s0) /* f0ea624: 8faf0084 */ lw $t7,0x84($sp) @@ -9571,7 +9571,7 @@ glabel menuRenderItemLabel /* f0eaa08: afa00024 */ sw $zero,0x24($sp) /* f0eaa0c: 27a6009c */ addiu $a2,$sp,0x9c /* f0eaa10: 8fa700a4 */ lw $a3,0xa4($sp) -/* f0eaa14: 0fc5580f */ jal func0f15603c +/* f0eaa14: 0fc5580f */ jal textRenderWhite /* f0eaa18: afab0020 */ sw $t3,0x20($sp) /* f0eaa1c: afa200b0 */ sw $v0,0xb0($sp) /* f0eaa20: 8e070008 */ lw $a3,0x8($s0) @@ -9604,7 +9604,7 @@ glabel menuRenderItemLabel /* f0eaa88: 8fa600a4 */ lw $a2,0xa4($sp) /* f0eaa8c: 8fa70090 */ lw $a3,0x90($sp) /* f0eaa90: afa00014 */ sw $zero,0x14($sp) -/* f0eaa94: 0fc55cbe */ jal func0f1572f8 +/* f0eaa94: 0fc55cbe */ jal textMeasure /* f0eaa98: afac0010 */ sw $t4,0x10($sp) /* f0eaa9c: 86180000 */ lh $t8,0x0($s0) /* f0eaaa0: 860d0004 */ lh $t5,0x4($s0) @@ -9636,7 +9636,7 @@ glabel menuRenderItemLabel /* f0eab04: 86080006 */ lh $t0,0x6($s0) /* f0eab08: afa00028 */ sw $zero,0x28($sp) /* f0eab0c: afa00024 */ sw $zero,0x24($sp) -/* f0eab10: 0fc5580f */ jal func0f15603c +/* f0eab10: 0fc5580f */ jal textRenderWhite /* f0eab14: afa80020 */ sw $t0,0x20($sp) /* f0eab18: afa200b0 */ sw $v0,0xb0($sp) .L0f0eab1c: @@ -9872,7 +9872,7 @@ glabel menuRenderItem15 /* f0eae88: afa00024 */ sw $zero,0x24($sp) /* f0eae8c: 27a5006c */ addiu $a1,$sp,0x6c /* f0eae90: 27a60068 */ addiu $a2,$sp,0x68 -/* f0eae94: 0fc5580f */ jal func0f15603c +/* f0eae94: 0fc5580f */ jal textRenderWhite /* f0eae98: afab0020 */ sw $t3,0x20($sp) /* f0eae9c: 0fc54de0 */ jal func0f153780 /* f0eaea0: 00402025 */ or $a0,$v0,$zero @@ -10168,7 +10168,7 @@ glabel menuRenderItemSelectable /* f0eb2d4: 11c00010 */ beqz $t6,.L0f0eb318 /* f0eb2d8: 8fab0064 */ lw $t3,0x64($sp) /* f0eb2dc: afab0010 */ sw $t3,0x10($sp) -/* f0eb2e0: 0fc55cbe */ jal func0f1572f8 +/* f0eb2e0: 0fc55cbe */ jal textMeasure /* f0eb2e4: afa00014 */ sw $zero,0x14($sp) /* f0eb2e8: 860f0004 */ lh $t7,0x4($s0) /* f0eb2ec: 8fb90054 */ lw $t9,0x54($sp) @@ -10209,7 +10209,7 @@ glabel menuRenderItemSelectable /* f0eb36c: afa00024 */ sw $zero,0x24($sp) /* f0eb370: 27a6006c */ addiu $a2,$sp,0x6c /* f0eb374: 8fa70074 */ lw $a3,0x74($sp) -/* f0eb378: 0fc5580f */ jal func0f15603c +/* f0eb378: 0fc5580f */ jal textRenderWhite /* f0eb37c: afaa0020 */ sw $t2,0x20($sp) /* f0eb380: afa20080 */ sw $v0,0x80($sp) /* f0eb384: 8e060008 */ lw $a2,0x8($s0) @@ -10236,7 +10236,7 @@ glabel menuRenderItemSelectable /* f0eb3d8: afa00014 */ sw $zero,0x14($sp) /* f0eb3dc: 27a5004c */ addiu $a1,$sp,0x4c /* f0eb3e0: 8fa70068 */ lw $a3,0x68($sp) -/* f0eb3e4: 0fc55cbe */ jal func0f1572f8 +/* f0eb3e4: 0fc55cbe */ jal textMeasure /* f0eb3e8: afb90010 */ sw $t9,0x10($sp) /* f0eb3ec: 86080000 */ lh $t0,0x0($s0) /* f0eb3f0: 86180004 */ lh $t8,0x4($s0) @@ -10260,7 +10260,7 @@ glabel menuRenderItemSelectable /* f0eb438: afa00024 */ sw $zero,0x24($sp) /* f0eb43c: 27a6006c */ addiu $a2,$sp,0x6c /* f0eb440: 8fa70074 */ lw $a3,0x74($sp) -/* f0eb444: 0fc5580f */ jal func0f15603c +/* f0eb444: 0fc5580f */ jal textRenderWhite /* f0eb448: afa80020 */ sw $t0,0x20($sp) /* f0eb44c: afa20080 */ sw $v0,0x80($sp) .L0f0eb450: @@ -10845,7 +10845,7 @@ glabel menuRenderItemSlider /* f0ebc9c: afa00024 */ sw $zero,0x24($sp) /* f0ebca0: 27a60090 */ addiu $a2,$sp,0x90 /* f0ebca4: 8fa700a8 */ lw $a3,0xa8($sp) -/* f0ebca8: 0fc5580f */ jal func0f15603c +/* f0ebca8: 0fc5580f */ jal textRenderWhite /* f0ebcac: afad0020 */ sw $t5,0x20($sp) /* f0ebcb0: afa200b0 */ sw $v0,0xb0($sp) /* f0ebcb4: 8e2b0008 */ lw $t3,0x8($s1) @@ -10886,7 +10886,7 @@ glabel menuRenderItemSlider /* f0ebd3c: 27a50088 */ addiu $a1,$sp,0x88 /* f0ebd40: 27a60098 */ addiu $a2,$sp,0x98 /* f0ebd44: afa00014 */ sw $zero,0x14($sp) -/* f0ebd48: 0fc55cbe */ jal func0f1572f8 +/* f0ebd48: 0fc55cbe */ jal textMeasure /* f0ebd4c: afb80010 */ sw $t8,0x10($sp) /* f0ebd50: 862e0000 */ lh $t6,0x0($s1) /* f0ebd54: 862d0004 */ lh $t5,0x4($s1) @@ -10974,7 +10974,7 @@ glabel menuRenderItemSlider /* f0ebe90: afa00024 */ sw $zero,0x24($sp) /* f0ebe94: 27a60090 */ addiu $a2,$sp,0x90 /* f0ebe98: 27a70098 */ addiu $a3,$sp,0x98 -/* f0ebe9c: 0fc5580f */ jal func0f15603c +/* f0ebe9c: 0fc5580f */ jal textRenderWhite /* f0ebea0: afa80020 */ sw $t0,0x20($sp) /* f0ebea4: afa200b0 */ sw $v0,0xb0($sp) .L0f0ebea8: @@ -11902,7 +11902,7 @@ glabel menuRenderItemCheckbox /* f0ecbcc: afa00024 */ sw $zero,0x24($sp) /* f0ecbd0: 27a60068 */ addiu $a2,$sp,0x68 /* f0ecbd4: 8fa70070 */ lw $a3,0x70($sp) -/* f0ecbd8: 0fc5580f */ jal func0f15603c +/* f0ecbd8: 0fc5580f */ jal textRenderWhite /* f0ecbdc: afb80020 */ sw $t8,0x20($sp) /* f0ecbe0: 0fc54de0 */ jal func0f153780 /* f0ecbe4: 00402025 */ or $a0,$v0,$zero @@ -12194,7 +12194,7 @@ glabel menuRenderItemScrollable /* f0ed120: afa00028 */ sw $zero,0x28($sp) /* f0ed124: 27a71fb8 */ addiu $a3,$sp,0x1fb8 /* f0ed128: 000b6823 */ negu $t5,$t3 -/* f0ed12c: 0fc5580f */ jal func0f15603c +/* f0ed12c: 0fc5580f */ jal textRenderWhite /* f0ed130: afad0024 */ sw $t5,0x24($sp) /* f0ed134: 860e0000 */ lh $t6,0x0($s0) /* f0ed138: 3c0f8008 */ lui $t7,%hi(var8007fb10) @@ -12225,7 +12225,7 @@ glabel menuRenderItemScrollable /* f0ed19c: afa00028 */ sw $zero,0x28($sp) /* f0ed1a0: 27a71fb8 */ addiu $a3,$sp,0x1fb8 /* f0ed1a4: 000f6023 */ negu $t4,$t7 -/* f0ed1a8: 0fc5580f */ jal func0f15603c +/* f0ed1a8: 0fc5580f */ jal textRenderWhite /* f0ed1ac: afac0024 */ sw $t4,0x24($sp) /* f0ed1b0: afa25e38 */ sw $v0,0x5e38($sp) /* f0ed1b4: 0fc3c94d */ jal func0f0f2534 @@ -12265,7 +12265,7 @@ glabel menuRenderItemScrollable /* f0ed234: afa00028 */ sw $zero,0x28($sp) /* f0ed238: 27a70078 */ addiu $a3,$sp,0x78 /* f0ed23c: 000f6023 */ negu $t4,$t7 -/* f0ed240: 0fc5580f */ jal func0f15603c +/* f0ed240: 0fc5580f */ jal textRenderWhite /* f0ed244: afac0024 */ sw $t4,0x24($sp) /* f0ed248: 0fc54de0 */ jal func0f153780 /* f0ed24c: 00402025 */ or $a0,$v0,$zero @@ -12369,7 +12369,7 @@ glabel func0f0ed264 /* f0ed3b4: 27a5004c */ addiu $a1,$sp,0x4c /* f0ed3b8: 27a60054 */ addiu $a2,$sp,0x54 /* f0ed3bc: afa00014 */ sw $zero,0x14($sp) -/* f0ed3c0: 0fc55cbe */ jal func0f1572f8 +/* f0ed3c0: 0fc55cbe */ jal textMeasure /* f0ed3c4: afae0010 */ sw $t6,0x10($sp) /* f0ed3c8: 8fb80048 */ lw $t8,0x48($sp) /* f0ed3cc: 87a9003c */ lh $t1,0x3c($sp) @@ -12592,7 +12592,7 @@ glabel menuRenderItemMarquee /* f0ed6c8: a3a20064 */ sb $v0,0x64($sp) /* f0ed6cc: 8fa70058 */ lw $a3,0x58($sp) /* f0ed6d0: afa00014 */ sw $zero,0x14($sp) -/* f0ed6d4: 0fc55cbe */ jal func0f1572f8 +/* f0ed6d4: 0fc55cbe */ jal textMeasure /* f0ed6d8: afa80010 */ sw $t0,0x10($sp) /* f0ed6dc: 8fa9007c */ lw $t1,0x7c($sp) /* f0ed6e0: 8fab006c */ lw $t3,0x6c($sp) @@ -12805,7 +12805,7 @@ glabel menuRenderItemMarquee /* f0ed9e4: 27a5007c */ addiu $a1,$sp,0x7c /* f0ed9e8: 27a60078 */ addiu $a2,$sp,0x78 /* f0ed9ec: 02003825 */ or $a3,$s0,$zero -/* f0ed9f0: 0fc5580f */ jal func0f15603c +/* f0ed9f0: 0fc5580f */ jal textRenderWhite /* f0ed9f4: afac0020 */ sw $t4,0x20($sp) /* f0ed9f8: 0fc54de0 */ jal func0f153780 /* f0ed9fc: 00402025 */ or $a0,$v0,$zero @@ -12876,7 +12876,7 @@ glabel func0f0eda34 /* f0edadc: 8fa60038 */ lw $a2,0x38($sp) .L0f0edae0: /* f0edae0: afa80010 */ sw $t0,0x10($sp) -/* f0edae4: 0fc55cbe */ jal func0f1572f8 +/* f0edae4: 0fc55cbe */ jal textMeasure /* f0edae8: afa00014 */ sw $zero,0x14($sp) /* f0edaec: 3c02800a */ lui $v0,%hi(g_Vars) /* f0edaf0: 8c429fc0 */ lw $v0,%lo(g_Vars)($v0) @@ -13038,7 +13038,7 @@ glabel menuRenderItemRanking /* f0edd08: 27a500a8 */ addiu $a1,$sp,0xa8 /* f0edd0c: 00403025 */ or $a2,$v0,$zero /* f0edd10: afa00014 */ sw $zero,0x14($sp) -/* f0edd14: 0fc55cbe */ jal func0f1572f8 +/* f0edd14: 0fc55cbe */ jal textMeasure /* f0edd18: afb80010 */ sw $t8,0x10($sp) /* f0edd1c: 87d90000 */ lh $t9,0x0($s8) /* f0edd20: 8fa800a8 */ lw $t0,0xa8($sp) @@ -13064,7 +13064,7 @@ glabel menuRenderItemRanking /* f0edd70: afa00024 */ sw $zero,0x24($sp) /* f0edd74: 27a600b0 */ addiu $a2,$sp,0xb0 /* f0edd78: 00403825 */ or $a3,$v0,$zero -/* f0edd7c: 0fc5580f */ jal func0f15603c +/* f0edd7c: 0fc5580f */ jal textRenderWhite /* f0edd80: afb80020 */ sw $t8,0x20($sp) /* f0edd84: afa201b0 */ sw $v0,0x1b0($sp) .L0f0edd88: @@ -13080,7 +13080,7 @@ glabel menuRenderItemRanking /* f0eddac: 00403025 */ or $a2,$v0,$zero /* f0eddb0: 8e270000 */ lw $a3,0x0($s1) /* f0eddb4: afa00014 */ sw $zero,0x14($sp) -/* f0eddb8: 0fc55cbe */ jal func0f1572f8 +/* f0eddb8: 0fc55cbe */ jal textMeasure /* f0eddbc: afb90010 */ sw $t9,0x10($sp) /* f0eddc0: 87c80000 */ lh $t0,0x0($s8) /* f0eddc4: 8fa900a8 */ lw $t1,0xa8($sp) @@ -13106,7 +13106,7 @@ glabel menuRenderItemRanking /* f0ede14: afa00024 */ sw $zero,0x24($sp) /* f0ede18: 27a600b0 */ addiu $a2,$sp,0xb0 /* f0ede1c: 00403825 */ or $a3,$v0,$zero -/* f0ede20: 0fc5580f */ jal func0f15603c +/* f0ede20: 0fc5580f */ jal textRenderWhite /* f0ede24: afb90020 */ sw $t9,0x20($sp) /* f0ede28: 0fc54de0 */ jal func0f153780 /* f0ede2c: 00402025 */ or $a0,$v0,$zero @@ -13455,7 +13455,7 @@ glabel menuRenderItemRanking /* f0ee334: 8fa401b0 */ lw $a0,0x1b0($sp) /* f0ee338: 27a500b4 */ addiu $a1,$sp,0xb4 /* f0ee33c: 27a600b0 */ addiu $a2,$sp,0xb0 -/* f0ee340: 0fc5580f */ jal func0f15603c +/* f0ee340: 0fc5580f */ jal textRenderWhite /* f0ee344: afaa0020 */ sw $t2,0x20($sp) /* f0ee348: 10000012 */ beqz $zero,.L0f0ee394 /* f0ee34c: afa201b0 */ sw $v0,0x1b0($sp) @@ -13474,7 +13474,7 @@ glabel menuRenderItemRanking /* f0ee37c: afa00028 */ sw $zero,0x28($sp) /* f0ee380: afa00024 */ sw $zero,0x24($sp) /* f0ee384: 27a600b0 */ addiu $a2,$sp,0xb0 -/* f0ee388: 0fc5580f */ jal func0f15603c +/* f0ee388: 0fc5580f */ jal textRenderWhite /* f0ee38c: afb90020 */ sw $t9,0x20($sp) /* f0ee390: afa201b0 */ sw $v0,0x1b0($sp) .L0f0ee394: @@ -13499,7 +13499,7 @@ glabel menuRenderItemRanking /* f0ee3dc: 02a03025 */ or $a2,$s5,$zero /* f0ee3e0: 8e670000 */ lw $a3,0x0($s3) /* f0ee3e4: afa00014 */ sw $zero,0x14($sp) -/* f0ee3e8: 0fc55cbe */ jal func0f1572f8 +/* f0ee3e8: 0fc55cbe */ jal textMeasure /* f0ee3ec: afab0010 */ sw $t3,0x10($sp) /* f0ee3f0: 87cc0000 */ lh $t4,0x0($s8) /* f0ee3f4: 8fad00a8 */ lw $t5,0xa8($sp) @@ -13527,7 +13527,7 @@ glabel menuRenderItemRanking /* f0ee44c: afa00028 */ sw $zero,0x28($sp) /* f0ee450: afa00024 */ sw $zero,0x24($sp) /* f0ee454: 02a03825 */ or $a3,$s5,$zero -/* f0ee458: 0fc5580f */ jal func0f15603c +/* f0ee458: 0fc5580f */ jal textRenderWhite /* f0ee45c: afae0020 */ sw $t6,0x20($sp) /* f0ee460: afa201b0 */ sw $v0,0x1b0($sp) .L0f0ee464: @@ -13549,7 +13549,7 @@ glabel menuRenderItemRanking /* f0ee4a0: 02a03025 */ or $a2,$s5,$zero /* f0ee4a4: 8e670000 */ lw $a3,0x0($s3) /* f0ee4a8: afa00014 */ sw $zero,0x14($sp) -/* f0ee4ac: 0fc55cbe */ jal func0f1572f8 +/* f0ee4ac: 0fc55cbe */ jal textMeasure /* f0ee4b0: afaf0010 */ sw $t7,0x10($sp) /* f0ee4b4: 87d90000 */ lh $t9,0x0($s8) /* f0ee4b8: 8fb800a8 */ lw $t8,0xa8($sp) @@ -13577,7 +13577,7 @@ glabel menuRenderItemRanking /* f0ee510: afa00028 */ sw $zero,0x28($sp) /* f0ee514: afa00024 */ sw $zero,0x24($sp) /* f0ee518: 02a03825 */ or $a3,$s5,$zero -/* f0ee51c: 0fc5580f */ jal func0f15603c +/* f0ee51c: 0fc5580f */ jal textRenderWhite /* f0ee520: afa90020 */ sw $t1,0x20($sp) /* f0ee524: 8fab00bc */ lw $t3,0xbc($sp) /* f0ee528: 26f70001 */ addiu $s7,$s7,0x1 @@ -13828,7 +13828,7 @@ glabel menuRenderItemPlayerStats /* f0ee898: 02e02825 */ or $a1,$s7,$zero /* f0ee89c: 02802025 */ or $a0,$s4,$zero /* f0ee8a0: 8fa700b0 */ lw $a3,0xb0($sp) -/* f0ee8a4: 0fc5580f */ jal func0f15603c +/* f0ee8a4: 0fc5580f */ jal textRenderWhite /* f0ee8a8: afac0020 */ sw $t4,0x20($sp) /* f0ee8ac: 8e300010 */ lw $s0,0x10($s1) /* f0ee8b0: 44802000 */ mtc1 $zero,$f4 @@ -13892,7 +13892,7 @@ glabel menuRenderItemPlayerStats /* f0ee98c: 27a500a4 */ addiu $a1,$sp,0xa4 /* f0ee990: 00403025 */ or $a2,$v0,$zero /* f0ee994: afa00014 */ sw $zero,0x14($sp) -/* f0ee998: 0fc55cbe */ jal func0f1572f8 +/* f0ee998: 0fc55cbe */ jal textMeasure /* f0ee99c: afaf0010 */ sw $t7,0x10($sp) /* f0ee9a0: 86380000 */ lh $t8,0x0($s1) /* f0ee9a4: 8fa800a4 */ lw $t0,0xa4($sp) @@ -13920,7 +13920,7 @@ glabel menuRenderItemPlayerStats /* f0ee9fc: afa00024 */ sw $zero,0x24($sp) /* f0eea00: 03c03025 */ or $a2,$s8,$zero /* f0eea04: 00403825 */ or $a3,$v0,$zero -/* f0eea08: 0fc5580f */ jal func0f15603c +/* f0eea08: 0fc5580f */ jal textRenderWhite /* f0eea0c: afaf0020 */ sw $t7,0x20($sp) /* f0eea10: 86380000 */ lh $t8,0x0($s1) /* f0eea14: 8fa800a4 */ lw $t0,0xa4($sp) @@ -13946,7 +13946,7 @@ glabel menuRenderItemPlayerStats /* f0eea64: 02603025 */ or $a2,$s3,$zero /* f0eea68: 8ea70000 */ lw $a3,0x0($s5) /* f0eea6c: afa00014 */ sw $zero,0x14($sp) -/* f0eea70: 0fc55cbe */ jal func0f1572f8 +/* f0eea70: 0fc55cbe */ jal textMeasure /* f0eea74: afad0010 */ sw $t5,0x10($sp) /* f0eea78: 8fae00c0 */ lw $t6,0xc0($sp) /* f0eea7c: 8faf00a4 */ lw $t7,0xa4($sp) @@ -13971,7 +13971,7 @@ glabel menuRenderItemPlayerStats /* f0eeac8: afa00024 */ sw $zero,0x24($sp) /* f0eeacc: 03c03025 */ or $a2,$s8,$zero /* f0eead0: 02603825 */ or $a3,$s3,$zero -/* f0eead4: 0fc5580f */ jal func0f15603c +/* f0eead4: 0fc5580f */ jal textRenderWhite /* f0eead8: afad0020 */ sw $t5,0x20($sp) /* f0eeadc: 0040a025 */ or $s4,$v0,$zero /* f0eeae0: 0fc6321f */ jal mpGetNumChrs @@ -14039,7 +14039,7 @@ glabel menuRenderItemPlayerStats /* f0eebcc: 27a500a4 */ addiu $a1,$sp,0xa4 /* f0eebd0: 00403025 */ or $a2,$v0,$zero /* f0eebd4: afa00014 */ sw $zero,0x14($sp) -/* f0eebd8: 0fc55cbe */ jal func0f1572f8 +/* f0eebd8: 0fc55cbe */ jal textMeasure /* f0eebdc: afb80010 */ sw $t8,0x10($sp) /* f0eebe0: 86280000 */ lh $t0,0x0($s1) /* f0eebe4: 8faa00a4 */ lw $t2,0xa4($sp) @@ -14067,7 +14067,7 @@ glabel menuRenderItemPlayerStats /* f0eec3c: afa00024 */ sw $zero,0x24($sp) /* f0eec40: 03c03025 */ or $a2,$s8,$zero /* f0eec44: 00403825 */ or $a3,$v0,$zero -/* f0eec48: 0fc5580f */ jal func0f15603c +/* f0eec48: 0fc5580f */ jal textRenderWhite /* f0eec4c: afb80020 */ sw $t8,0x20($sp) /* f0eec50: 0040a025 */ or $s4,$v0,$zero /* f0eec54: 0fc5b9f1 */ jal langGet @@ -14080,7 +14080,7 @@ glabel menuRenderItemPlayerStats /* f0eec70: 27a500a4 */ addiu $a1,$sp,0xa4 /* f0eec74: 00403025 */ or $a2,$v0,$zero /* f0eec78: afa00014 */ sw $zero,0x14($sp) -/* f0eec7c: 0fc55cbe */ jal func0f1572f8 +/* f0eec7c: 0fc55cbe */ jal textMeasure /* f0eec80: afa80010 */ sw $t0,0x10($sp) /* f0eec84: 862a0000 */ lh $t2,0x0($s1) /* f0eec88: 8fab00a4 */ lw $t3,0xa4($sp) @@ -14108,7 +14108,7 @@ glabel menuRenderItemPlayerStats /* f0eece0: afa00024 */ sw $zero,0x24($sp) /* f0eece4: 03c03025 */ or $a2,$s8,$zero /* f0eece8: 00403825 */ or $a3,$v0,$zero -/* f0eecec: 0fc5580f */ jal func0f15603c +/* f0eecec: 0fc5580f */ jal textRenderWhite /* f0eecf0: afa80020 */ sw $t0,0x20($sp) /* f0eecf4: 8faa00a0 */ lw $t2,0xa0($sp) /* f0eecf8: 86390006 */ lh $t9,0x6($s1) @@ -14342,7 +14342,7 @@ glabel menuRenderItemPlayerStats /* f0ef04c: afa00024 */ sw $zero,0x24($sp) /* f0ef050: 02e02825 */ or $a1,$s7,$zero /* f0ef054: 03c03025 */ or $a2,$s8,$zero -/* f0ef058: 0fc5580f */ jal func0f15603c +/* f0ef058: 0fc5580f */ jal textRenderWhite /* f0ef05c: afa90020 */ sw $t1,0x20($sp) /* f0ef060: 8fa70078 */ lw $a3,0x78($sp) /* f0ef064: 8faa006c */ lw $t2,0x6c($sp) @@ -14359,7 +14359,7 @@ glabel menuRenderItemPlayerStats /* f0ef090: 02603025 */ or $a2,$s3,$zero /* f0ef094: 8ea70000 */ lw $a3,0x0($s5) /* f0ef098: afa00014 */ sw $zero,0x14($sp) -/* f0ef09c: 0fc55cbe */ jal func0f1572f8 +/* f0ef09c: 0fc55cbe */ jal textMeasure /* f0ef0a0: afa80010 */ sw $t0,0x10($sp) /* f0ef0a4: 86380000 */ lh $t8,0x0($s1) /* f0ef0a8: 8fb900a4 */ lw $t9,0xa4($sp) @@ -14385,7 +14385,7 @@ glabel menuRenderItemPlayerStats /* f0ef0f8: afa00024 */ sw $zero,0x24($sp) /* f0ef0fc: 03c03025 */ or $a2,$s8,$zero /* f0ef100: 02603825 */ or $a3,$s3,$zero -/* f0ef104: 0fc5580f */ jal func0f15603c +/* f0ef104: 0fc5580f */ jal textRenderWhite /* f0ef108: afb80020 */ sw $t8,0x20($sp) /* f0ef10c: 8fb90070 */ lw $t9,0x70($sp) /* f0ef110: 3c057f1b */ lui $a1,%hi(var7f1b1e54) @@ -14400,7 +14400,7 @@ glabel menuRenderItemPlayerStats /* f0ef134: 02603025 */ or $a2,$s3,$zero /* f0ef138: 8ea70000 */ lw $a3,0x0($s5) /* f0ef13c: afa00014 */ sw $zero,0x14($sp) -/* f0ef140: 0fc55cbe */ jal func0f1572f8 +/* f0ef140: 0fc55cbe */ jal textMeasure /* f0ef144: afac0010 */ sw $t4,0x10($sp) /* f0ef148: 86290000 */ lh $t1,0x0($s1) /* f0ef14c: 8fad00a4 */ lw $t5,0xa4($sp) @@ -14426,7 +14426,7 @@ glabel menuRenderItemPlayerStats /* f0ef19c: afa00024 */ sw $zero,0x24($sp) /* f0ef1a0: 03c03025 */ or $a2,$s8,$zero /* f0ef1a4: 02603825 */ or $a3,$s3,$zero -/* f0ef1a8: 0fc5580f */ jal func0f15603c +/* f0ef1a8: 0fc5580f */ jal textRenderWhite /* f0ef1ac: afa90020 */ sw $t1,0x20($sp) /* f0ef1b0: 0040a025 */ or $s4,$v0,$zero /* f0ef1b4: 2652000a */ addiu $s2,$s2,0xa @@ -15207,7 +15207,7 @@ glabel func0f0efbb4 /* f0efcd8: afa00024 */ sw $zero,0x24($sp) /* f0efcdc: afa00028 */ sw $zero,0x28($sp) /* f0efce0: afac0014 */ sw $t4,0x14($sp) -/* f0efce4: 0fc5580f */ jal func0f15603c +/* f0efce4: 0fc5580f */ jal textRenderWhite /* f0efce8: afab0010 */ sw $t3,0x10($sp) /* f0efcec: 0040a825 */ or $s5,$v0,$zero .L0f0efcf0: @@ -15276,7 +15276,7 @@ glabel func0f0efbb4 /* f0efdd0: afa00024 */ sw $zero,0x24($sp) /* f0efdd4: afa00028 */ sw $zero,0x28($sp) /* f0efdd8: afab0014 */ sw $t3,0x14($sp) -/* f0efddc: 0fc5580f */ jal func0f15603c +/* f0efddc: 0fc5580f */ jal textRenderWhite /* f0efde0: afaa0010 */ sw $t2,0x10($sp) /* f0efde4: 26730001 */ addiu $s3,$s3,0x1 /* f0efde8: 24010009 */ addiu $at,$zero,0x9 @@ -15654,7 +15654,7 @@ glabel menuRenderItemController /* f0f0364: afad0014 */ sw $t5,0x14($sp) /* f0f0368: afac0010 */ sw $t4,0x10($sp) /* f0f036c: afae0018 */ sw $t6,0x18($sp) -/* f0f0370: 0fc5580f */ jal func0f15603c +/* f0f0370: 0fc5580f */ jal textRenderWhite /* f0f0374: afaf001c */ sw $t7,0x1c($sp) /* f0f0378: 0fc54de0 */ jal func0f153780 /* f0f037c: 00402025 */ or $a0,$v0,$zero @@ -15774,7 +15774,7 @@ glabel menuRenderItemController /* f0f0540: afab0014 */ sw $t3,0x14($sp) /* f0f0544: afa90010 */ sw $t1,0x10($sp) /* f0f0548: afaa0018 */ sw $t2,0x18($sp) -/* f0f054c: 0fc5580f */ jal func0f15603c +/* f0f054c: 0fc5580f */ jal textRenderWhite /* f0f0550: afac001c */ sw $t4,0x1c($sp) /* f0f0554: 0fc54de0 */ jal func0f153780 /* f0f0558: 00402025 */ or $a0,$v0,$zero diff --git a/src/game/game_0f09f0.c b/src/game/game_0f09f0.c index 5928ad9c2..81d791bce 100644 --- a/src/game/game_0f09f0.c +++ b/src/game/game_0f09f0.c @@ -583,7 +583,7 @@ glabel func0f0f0ce8 /* f0f0d84: 00403025 */ or $a2,$v0,$zero /* f0f0d88: 8fa70064 */ lw $a3,0x64($sp) /* f0f0d8c: afa00014 */ sw $zero,0x14($sp) -/* f0f0d90: 0fc55cbe */ jal func0f1572f8 +/* f0f0d90: 0fc55cbe */ jal textMeasure /* f0f0d94: afac0010 */ sw $t4,0x10($sp) /* f0f0d98: 0fc5b9f1 */ jal langGet /* f0f0d9c: 240451ef */ addiu $a0,$zero,0x51ef @@ -593,7 +593,7 @@ glabel func0f0f0ce8 /* f0f0dac: 00403025 */ or $a2,$v0,$zero /* f0f0db0: 8fa70064 */ lw $a3,0x64($sp) /* f0f0db4: afa00014 */ sw $zero,0x14($sp) -/* f0f0db8: 0fc55cbe */ jal func0f1572f8 +/* f0f0db8: 0fc55cbe */ jal textMeasure /* f0f0dbc: afad0010 */ sw $t5,0x10($sp) /* f0f0dc0: 8fae0040 */ lw $t6,0x40($sp) /* f0f0dc4: 240151eb */ addiu $at,$zero,0x51eb @@ -790,7 +790,7 @@ glabel func0f0f0ce8 /* f0f10b0: afa00024 */ sw $zero,0x24($sp) /* f0f10b4: afa00028 */ sw $zero,0x28($sp) /* f0f10b8: afb90010 */ sw $t9,0x10($sp) -/* f0f10bc: 0fc5580f */ jal func0f15603c +/* f0f10bc: 0fc5580f */ jal textRenderWhite /* f0f10c0: afb80014 */ sw $t8,0x14($sp) /* f0f10c4: 8faa0070 */ lw $t2,0x70($sp) /* f0f10c8: 8fa90044 */ lw $t1,0x44($sp) @@ -827,7 +827,7 @@ glabel func0f0f0ce8 /* f0f1140: afa00024 */ sw $zero,0x24($sp) /* f0f1144: afa00028 */ sw $zero,0x28($sp) /* f0f1148: afb90010 */ sw $t9,0x10($sp) -/* f0f114c: 0fc5580f */ jal func0f15603c +/* f0f114c: 0fc5580f */ jal textRenderWhite /* f0f1150: afb80014 */ sw $t8,0x14($sp) /* f0f1154: 8fa90078 */ lw $t1,0x78($sp) /* f0f1158: 8faa0044 */ lw $t2,0x44($sp) @@ -864,7 +864,7 @@ glabel func0f0f0ce8 /* f0f11d0: afa00024 */ sw $zero,0x24($sp) /* f0f11d4: afa00028 */ sw $zero,0x28($sp) /* f0f11d8: afb90010 */ sw $t9,0x10($sp) -/* f0f11dc: 0fc5580f */ jal func0f15603c +/* f0f11dc: 0fc5580f */ jal textRenderWhite /* f0f11e0: afb80014 */ sw $t8,0x14($sp) /* f0f11e4: 8faa0070 */ lw $t2,0x70($sp) /* f0f11e8: 8fa60084 */ lw $a2,0x84($sp) @@ -901,7 +901,7 @@ glabel func0f0f0ce8 /* f0f1260: afa00024 */ sw $zero,0x24($sp) /* f0f1264: afa00028 */ sw $zero,0x28($sp) /* f0f1268: afae0010 */ sw $t6,0x10($sp) -/* f0f126c: 0fc5580f */ jal func0f15603c +/* f0f126c: 0fc5580f */ jal textRenderWhite /* f0f1270: afb90014 */ sw $t9,0x14($sp) /* f0f1274: 8fab0040 */ lw $t3,0x40($sp) /* f0f1278: 8fa60080 */ lw $a2,0x80($sp) @@ -943,7 +943,7 @@ glabel func0f0f0ce8 /* f0f1304: afa00024 */ sw $zero,0x24($sp) /* f0f1308: afa00028 */ sw $zero,0x28($sp) /* f0f130c: afab0014 */ sw $t3,0x14($sp) -/* f0f1310: 0fc5580f */ jal func0f15603c +/* f0f1310: 0fc5580f */ jal textRenderWhite /* f0f1314: afb80010 */ sw $t8,0x10($sp) /* f0f1318: 00408825 */ or $s1,$v0,$zero .L0f0f131c: @@ -1306,7 +1306,7 @@ glabel var7f1b28c0 /* f0f17d8: 27a4006c */ addiu $a0,$sp,0x6c /* f0f17dc: 27a50070 */ addiu $a1,$sp,0x70 /* f0f17e0: afa00014 */ sw $zero,0x14($sp) -/* f0f17e4: 0fc55cbe */ jal func0f1572f8 +/* f0f17e4: 0fc55cbe */ jal textMeasure /* f0f17e8: afb90010 */ sw $t9,0x10($sp) .L0f0f17ec: /* f0f17ec: 8fa80070 */ lw $t0,0x70($sp) @@ -1338,7 +1338,7 @@ glabel var7f1b28c0 /* f0f1854: 27a50070 */ addiu $a1,$sp,0x70 /* f0f1858: 00403025 */ or $a2,$v0,$zero /* f0f185c: afa00014 */ sw $zero,0x14($sp) -/* f0f1860: 0fc55cbe */ jal func0f1572f8 +/* f0f1860: 0fc55cbe */ jal textMeasure /* f0f1864: afac0010 */ sw $t4,0x10($sp) /* f0f1868: 862d0000 */ lh $t5,0x0($s1) /* f0f186c: 8fae0070 */ lw $t6,0x70($sp) @@ -1410,7 +1410,7 @@ glabel var7f1b28c0 /* f0f1960: 27a50070 */ addiu $a1,$sp,0x70 /* f0f1964: 8fa70068 */ lw $a3,0x68($sp) /* f0f1968: afa00014 */ sw $zero,0x14($sp) -/* f0f196c: 0fc55cbe */ jal func0f1572f8 +/* f0f196c: 0fc55cbe */ jal textMeasure /* f0f1970: afab0010 */ sw $t3,0x10($sp) /* f0f1974: 87b90072 */ lh $t9,0x72($sp) /* f0f1978: 272c0022 */ addiu $t4,$t9,0x22 @@ -1491,7 +1491,7 @@ glabel var7f1b28c0 /* f0f1a88: 27a50070 */ addiu $a1,$sp,0x70 /* f0f1a8c: 8fa70068 */ lw $a3,0x68($sp) /* f0f1a90: afa00014 */ sw $zero,0x14($sp) -/* f0f1a94: 0fc55cbe */ jal func0f1572f8 +/* f0f1a94: 0fc55cbe */ jal textMeasure /* f0f1a98: afab0010 */ sw $t3,0x10($sp) /* f0f1a9c: 87b90072 */ lh $t9,0x72($sp) /* f0f1aa0: 3c010040 */ lui $at,0x40 @@ -1534,7 +1534,7 @@ glabel var7f1b28c0 /* f0f1b2c: 27a50070 */ addiu $a1,$sp,0x70 /* f0f1b30: 8fa70068 */ lw $a3,0x68($sp) /* f0f1b34: afa00014 */ sw $zero,0x14($sp) -/* f0f1b38: 0fc55cbe */ jal func0f1572f8 +/* f0f1b38: 0fc55cbe */ jal textMeasure /* f0f1b3c: afae0010 */ sw $t6,0x10($sp) /* f0f1b40: 862f0000 */ lh $t7,0x0($s1) /* f0f1b44: 8fb80070 */ lw $t8,0x70($sp) @@ -2069,7 +2069,7 @@ glabel func0f0f2134 /* f0f22bc: 27a50080 */ addiu $a1,$sp,0x80 /* f0f22c0: 00403025 */ or $a2,$v0,$zero /* f0f22c4: afa00014 */ sw $zero,0x14($sp) -/* f0f22c8: 0fc55cbe */ jal func0f1572f8 +/* f0f22c8: 0fc55cbe */ jal textMeasure /* f0f22cc: afac0010 */ sw $t4,0x10($sp) /* f0f22d0: 3c02800a */ lui $v0,%hi(g_MenuData+0x4) /* f0f22d4: 8c4219c4 */ lw $v0,%lo(g_MenuData+0x4)($v0) @@ -6158,7 +6158,7 @@ glabel func0f0f5360 /* f0f5c88: afa00028 */ sw $zero,0x28($sp) /* f0f5c8c: afb80010 */ sw $t8,0x10($sp) /* f0f5c90: afb90014 */ sw $t9,0x14($sp) -/* f0f5c94: 0fc5580f */ jal func0f15603c +/* f0f5c94: 0fc5580f */ jal textRenderWhite /* f0f5c98: afae001c */ sw $t6,0x1c($sp) /* f0f5c9c: afa201e8 */ sw $v0,0x1e8($sp) /* f0f5ca0: afb201d0 */ sw $s2,0x1d0($sp) @@ -6178,7 +6178,7 @@ glabel func0f0f5360 /* f0f5cd8: afab0010 */ sw $t3,0x10($sp) /* f0f5cdc: afac0014 */ sw $t4,0x14($sp) /* f0f5ce0: afb80018 */ sw $t8,0x18($sp) -/* f0f5ce4: 0fc5580f */ jal func0f15603c +/* f0f5ce4: 0fc5580f */ jal textRenderWhite /* f0f5ce8: afb9001c */ sw $t9,0x1c($sp) /* f0f5cec: 3c03800a */ lui $v1,%hi(g_MenuData+0x4) /* f0f5cf0: 8c6319c4 */ lw $v1,%lo(g_MenuData+0x4)($v1) @@ -6216,7 +6216,7 @@ glabel func0f0f5360 /* f0f5d6c: afab0010 */ sw $t3,0x10($sp) /* f0f5d70: afac0014 */ sw $t4,0x14($sp) /* f0f5d74: afb80018 */ sw $t8,0x18($sp) -/* f0f5d78: 0fc5580f */ jal func0f15603c +/* f0f5d78: 0fc5580f */ jal textRenderWhite /* f0f5d7c: afb9001c */ sw $t9,0x1c($sp) /* f0f5d80: afa201e8 */ sw $v0,0x1e8($sp) .L0f0f5d84: @@ -7667,7 +7667,7 @@ glabel func0f0f5360 /* f0f72d0: 8e470000 */ lw $a3,0x0($s2) /* f0f72d4: 00403025 */ or $a2,$v0,$zero /* f0f72d8: afa00014 */ sw $zero,0x14($sp) -/* f0f72dc: 0fc55cbe */ jal func0f1572f8 +/* f0f72dc: 0fc55cbe */ jal textMeasure /* f0f72e0: afad0010 */ sw $t5,0x10($sp) /* f0f72e4: 8fa200ac */ lw $v0,0xac($sp) /* f0f72e8: 8fa301e0 */ lw $v1,0x1e0($sp) @@ -7705,7 +7705,7 @@ glabel func0f0f5360 /* f0f7360: afa00028 */ sw $zero,0x28($sp) /* f0f7364: afab0010 */ sw $t3,0x10($sp) /* f0f7368: afb80014 */ sw $t8,0x14($sp) -/* f0f736c: 0fc5580f */ jal func0f15603c +/* f0f736c: 0fc5580f */ jal textRenderWhite /* f0f7370: afaf001c */ sw $t7,0x1c($sp) /* f0f7374: afa201e8 */ sw $v0,0x1e8($sp) /* f0f7378: 82230015 */ lb $v1,0x15($s1) @@ -7728,7 +7728,7 @@ glabel func0f0f5360 /* f0f73b8: 00403025 */ or $a2,$v0,$zero /* f0f73bc: 8e470000 */ lw $a3,0x0($s2) /* f0f73c0: afa00014 */ sw $zero,0x14($sp) -/* f0f73c4: 0fc55cbe */ jal func0f1572f8 +/* f0f73c4: 0fc55cbe */ jal textMeasure /* f0f73c8: afb80010 */ sw $t8,0x10($sp) /* f0f73cc: 8fa200ac */ lw $v0,0xac($sp) /* f0f73d0: 8fa30088 */ lw $v1,0x88($sp) @@ -7766,7 +7766,7 @@ glabel func0f0f5360 /* f0f7448: afa00028 */ sw $zero,0x28($sp) /* f0f744c: afb90010 */ sw $t9,0x10($sp) /* f0f7450: afae0014 */ sw $t6,0x14($sp) -/* f0f7454: 0fc5580f */ jal func0f15603c +/* f0f7454: 0fc5580f */ jal textRenderWhite /* f0f7458: afb8001c */ sw $t8,0x1c($sp) /* f0f745c: 0fc54de0 */ jal func0f153780 /* f0f7460: 00402025 */ or $a0,$v0,$zero @@ -13565,9 +13565,9 @@ glabel var7f1b2afc /* f0fc3d8: 02803025 */ or $a2,$s4,$zero /* f0fc3dc: afa00014 */ sw $zero,0x14($sp) /* f0fc3e0: 02f28821 */ addu $s1,$s7,$s2 -/* f0fc3e4: 0fc55cbe */ jal func0f1572f8 +/* f0fc3e4: 0fc55cbe */ jal textMeasure /* f0fc3e8: afaf0010 */ sw $t7,0x10($sp) -/* f0fc3ec: 0c005013 */ jal func0001404c +/* f0fc3ec: 0c005013 */ jal getConnectedControllers /* f0fc3f0: 00000000 */ sll $zero,$zero,0x0 /* f0fc3f4: 3c19800b */ lui $t9,%hi(g_MpSetup+0x16) /* f0fc3f8: 9739cb9e */ lhu $t9,%lo(g_MpSetup+0x16)($t9) @@ -13715,7 +13715,7 @@ glabel var7f1b2afc /* f0fc600: afa00024 */ sw $zero,0x24($sp) /* f0fc604: afa00028 */ sw $zero,0x28($sp) /* f0fc608: afaa0014 */ sw $t2,0x14($sp) -/* f0fc60c: 0fc5580f */ jal func0f15603c +/* f0fc60c: 0fc5580f */ jal textRenderWhite /* f0fc610: afac0010 */ sw $t4,0x10($sp) /* f0fc614: 8ece0490 */ lw $t6,0x490($s6) /* f0fc618: 24010002 */ addiu $at,$zero,0x2 @@ -13771,7 +13771,7 @@ glabel var7f1b2afc /* f0fc6d8: afa00028 */ sw $zero,0x28($sp) /* f0fc6dc: afad0014 */ sw $t5,0x14($sp) /* f0fc6e0: afab0010 */ sw $t3,0x10($sp) -/* f0fc6e4: 0fc5580f */ jal func0f15603c +/* f0fc6e4: 0fc5580f */ jal textRenderWhite /* f0fc6e8: afa30018 */ sw $v1,0x18($sp) /* f0fc6ec: 0040a825 */ or $s5,$v0,$zero .L0f0fc6f0: diff --git a/src/game/game_0fd660.c b/src/game/game_0fd660.c index 6a03e0cd7..41d54319f 100644 --- a/src/game/game_0fd660.c +++ b/src/game/game_0fd660.c @@ -469,7 +469,7 @@ glabel var7f1b2cd8 /* f0fdc30: afb8001c */ sw $t8,0x1c($sp) /* f0fdc34: afaf0014 */ sw $t7,0x14($sp) /* f0fdc38: afb90010 */ sw $t9,0x10($sp) -/* f0fdc3c: 0fc5580f */ jal func0f15603c +/* f0fdc3c: 0fc5580f */ jal textRenderWhite /* f0fdc40: afae0018 */ sw $t6,0x18($sp) /* f0fdc44: 0fc54de0 */ jal func0f153780 /* f0fdc48: 00402025 */ or $a0,$v0,$zero @@ -929,21 +929,21 @@ glabel func0f0fe848 /* f0fea10: 27bd0018 */ addiu $sp,$sp,0x18 ); -s16 func0f0fea14(void) +s16 activemenuCalculateSlotWidth(void) { - u32 sp140; - s32 value; + s32 textheight; + s32 textwidth; s32 max = 0; s32 i; u32 flags; - char label[32]; + char text[32]; for (i = 0; i != 9; i++) { - activemenuGetSlotDetails(i, &flags, label); - func0f1572f8(&sp140, &value, label, var800a21b0, var800a21b4, 0); + activemenuGetSlotDetails(i, &flags, text); + textMeasure(&textheight, &textwidth, text, var800a21b0, var800a21b4, 0); - if (value > max) { - max = value; + if (textwidth > max) { + max = textwidth; } } @@ -1004,7 +1004,7 @@ void activemenuChangeScreen(s32 step) g_ActiveMenuThings[g_ActiveMenuIndex].unk14 = 0; g_ActiveMenuThings[g_ActiveMenuIndex].unk10 = 0; g_ActiveMenuThings[g_ActiveMenuIndex].unk18 = 0; - g_ActiveMenuThings[g_ActiveMenuIndex].unk04 = func0f0fea14(); + g_ActiveMenuThings[g_ActiveMenuIndex].slotwidth = activemenuCalculateSlotWidth(); } GLOBAL_ASM( @@ -1209,7 +1209,7 @@ void activemenuOpen(void) g_ActiveMenuThings[g_ActiveMenuIndex].unk1c = 0; func0f0fecd4(); activemenuChangeScreen(0); - g_ActiveMenuThings[g_ActiveMenuIndex].unk02 = g_ActiveMenuThings[g_ActiveMenuIndex].unk04 + 5; + g_ActiveMenuThings[g_ActiveMenuIndex].unk02 = g_ActiveMenuThings[g_ActiveMenuIndex].slotwidth + 5; g_ActiveMenuThings[g_ActiveMenuIndex].unk18 = 0.3; g_ActiveMenuThings[g_ActiveMenuIndex].unk34 = 0; g_ActiveMenuThings[g_ActiveMenuIndex].unk33 = 0; @@ -1693,7 +1693,7 @@ glabel func0f0ff6f4 /* f0ff720: 27a5003c */ addiu $a1,$sp,0x3c /* f0ff724: 27a40038 */ addiu $a0,$sp,0x38 /* f0ff728: afa00014 */ sw $zero,0x14($sp) -/* f0ff72c: 0fc55cbe */ jal func0f1572f8 +/* f0ff72c: 0fc55cbe */ jal textMeasure /* f0ff730: afae0010 */ sw $t6,0x10($sp) /* f0ff734: 8fb8003c */ lw $t8,0x3c($sp) /* f0ff738: 87af0056 */ lh $t7,0x56($sp) @@ -1724,7 +1724,7 @@ glabel func0f0ff6f4 /* f0ff798: afa00028 */ sw $zero,0x28($sp) /* f0ff79c: afac0014 */ sw $t4,0x14($sp) /* f0ff7a0: afab0010 */ sw $t3,0x10($sp) -/* f0ff7a4: 0fc5580f */ jal func0f15603c +/* f0ff7a4: 0fc5580f */ jal textRenderWhite /* f0ff7a8: afad0018 */ sw $t5,0x18($sp) /* f0ff7ac: 8fbf0034 */ lw $ra,0x34($sp) /* f0ff7b0: 27bd0048 */ addiu $sp,$sp,0x48 @@ -1933,7 +1933,7 @@ glabel var7f1b2ce0 /* f0ffa60: 27a5008c */ addiu $a1,$sp,0x8c /* f0ffa64: 8fa6007c */ lw $a2,0x7c($sp) /* f0ffa68: afa00014 */ sw $zero,0x14($sp) -/* f0ffa6c: 0fc55cbe */ jal func0f1572f8 +/* f0ffa6c: 0fc55cbe */ jal textMeasure /* f0ffa70: afb90010 */ sw $t9,0x10($sp) /* f0ffa74: 0c002f40 */ jal func0000bd00 /* f0ffa78: 00000000 */ sll $zero,$zero,0x0 @@ -2075,7 +2075,7 @@ glabel var7f1b2ce0 /* f0ffc64: afa00028 */ sw $zero,0x28($sp) /* f0ffc68: afa0002c */ sw $zero,0x2c($sp) /* f0ffc6c: afb90014 */ sw $t9,0x14($sp) -/* f0ffc70: 0fc55b92 */ jal func0f156e48 +/* f0ffc70: 0fc55b92 */ jal textRender /* f0ffc74: afaf0010 */ sw $t7,0x10($sp) /* f0ffc78: 3c08800a */ lui $t0,%hi(g_Vars) /* f0ffc7c: 25089fc0 */ addiu $t0,$t0,%lo(g_Vars) @@ -2136,7 +2136,7 @@ glabel var7f1b2ce0 /* f0ffd40: 8fa60080 */ lw $a2,0x80($sp) /* f0ffd44: 8ce721b0 */ lw $a3,%lo(var800a21b0)($a3) /* f0ffd48: afa00014 */ sw $zero,0x14($sp) -/* f0ffd4c: 0fc55cbe */ jal func0f1572f8 +/* f0ffd4c: 0fc55cbe */ jal textMeasure /* f0ffd50: afb80010 */ sw $t8,0x10($sp) /* f0ffd54: 0c002f40 */ jal func0000bd00 /* f0ffd58: 00000000 */ sll $zero,$zero,0x0 @@ -2229,7 +2229,7 @@ glabel var7f1b2ce0 /* f0ffe9c: afa00028 */ sw $zero,0x28($sp) /* f0ffea0: afa0002c */ sw $zero,0x2c($sp) /* f0ffea4: afad0014 */ sw $t5,0x14($sp) -/* f0ffea8: 0fc55b92 */ jal func0f156e48 +/* f0ffea8: 0fc55b92 */ jal textRender /* f0ffeac: afaf0010 */ sw $t7,0x10($sp) /* f0ffeb0: 8fae0048 */ lw $t6,0x48($sp) /* f0ffeb4: afa20098 */ sw $v0,0x98($sp) @@ -2250,7 +2250,7 @@ glabel var7f1b2ce0 /* f0ffeec: 27a5008c */ addiu $a1,$sp,0x8c /* f0ffef0: 00403025 */ or $a2,$v0,$zero /* f0ffef4: afa00014 */ sw $zero,0x14($sp) -/* f0ffef8: 0fc55cbe */ jal func0f1572f8 +/* f0ffef8: 0fc55cbe */ jal textMeasure /* f0ffefc: afb90010 */ sw $t9,0x10($sp) /* f0fff00: 0c002f40 */ jal func0000bd00 /* f0fff04: 00000000 */ sll $zero,$zero,0x0 @@ -2394,7 +2394,7 @@ glabel var7f1b2ce0 /* f1000fc: afa00028 */ sw $zero,0x28($sp) /* f100100: afa0002c */ sw $zero,0x2c($sp) /* f100104: afb90014 */ sw $t9,0x14($sp) -/* f100108: 0fc55b92 */ jal func0f156e48 +/* f100108: 0fc55b92 */ jal textRender /* f10010c: afaf0010 */ sw $t7,0x10($sp) /* f100110: afa20098 */ sw $v0,0x98($sp) .L0f100114: @@ -3818,7 +3818,7 @@ glabel func0f100ad0 /* f10159c: 27a50138 */ addiu $a1,$sp,0x138 /* f1015a0: 02003025 */ or $a2,$s0,$zero /* f1015a4: afa00014 */ sw $zero,0x14($sp) -/* f1015a8: 0fc55cbe */ jal func0f1572f8 +/* f1015a8: 0fc55cbe */ jal textMeasure /* f1015ac: afaf0010 */ sw $t7,0x10($sp) /* f1015b0: 8fb10138 */ lw $s1,0x138($sp) /* f1015b4: 06210003 */ bgez $s1,.L0f1015c4 diff --git a/src/game/game_102240.c b/src/game/game_102240.c index 82f81d2b3..5d6475c4d 100644 --- a/src/game/game_102240.c +++ b/src/game/game_102240.c @@ -1528,7 +1528,7 @@ glabel menuhandlerCoopBuddy /* f104304: 0fc41023 */ jal getMaxAiBuddies /* f104308: 00000000 */ sll $zero,$zero,0x0 /* f10430c: afa20030 */ sw $v0,0x30($sp) -/* f104310: 0c005013 */ jal func0001404c +/* f104310: 0c005013 */ jal getConnectedControllers /* f104314: afa0002c */ sw $zero,0x2c($sp) /* f104318: 30490002 */ andi $t1,$v0,0x2 /* f10431c: 11200002 */ beqz $t1,.L0f104328 @@ -1541,7 +1541,7 @@ glabel menuhandlerCoopBuddy /* f104334: 10000035 */ beqz $zero,.L0f10440c /* f104338: ad8b0000 */ sw $t3,0x0($t4) .L0f10433c: -/* f10433c: 0c005013 */ jal func0001404c +/* f10433c: 0c005013 */ jal getConnectedControllers /* f104340: afa30028 */ sw $v1,0x28($sp) /* f104344: 304d0002 */ andi $t5,$v0,0x2 /* f104348: 11a00002 */ beqz $t5,.L0f104354 @@ -1559,7 +1559,7 @@ glabel menuhandlerCoopBuddy /* f104374: 10000027 */ beqz $zero,.L0f104414 /* f104378: 8fbf0014 */ lw $ra,0x14($sp) .L0f10437c: -/* f10437c: 0c005013 */ jal func0001404c +/* f10437c: 0c005013 */ jal getConnectedControllers /* f104380: afa30024 */ sw $v1,0x24($sp) /* f104384: 30490002 */ andi $t1,$v0,0x2 /* f104388: 11200002 */ beqz $t1,.L0f104394 @@ -1577,7 +1577,7 @@ glabel menuhandlerCoopBuddy /* f1043b4: 10000015 */ beqz $zero,.L0f10440c /* f1043b8: ac590458 */ sw $t9,0x458($v0) .L0f1043bc: -/* f1043bc: 0c005013 */ jal func0001404c +/* f1043bc: 0c005013 */ jal getConnectedControllers /* f1043c0: afa50020 */ sw $a1,0x20($sp) /* f1043c4: 30580002 */ andi $t8,$v0,0x2 /* f1043c8: 8fa30020 */ lw $v1,0x20($sp) @@ -2786,7 +2786,7 @@ glabel var7f1b2dfc /* f1054d8: 27a50130 */ addiu $a1,$sp,0x130 /* f1054dc: 27a6012c */ addiu $a2,$sp,0x12c /* f1054e0: 27a700f0 */ addiu $a3,$sp,0xf0 -/* f1054e4: 0fc5580f */ jal func0f15603c +/* f1054e4: 0fc5580f */ jal textRenderWhite /* f1054e8: afb80018 */ sw $t8,0x18($sp) /* f1054ec: 8faf004c */ lw $t7,0x4c($sp) /* f1054f0: afa20138 */ sw $v0,0x138($sp) @@ -2817,7 +2817,7 @@ glabel var7f1b2dfc /* f105554: 27a50130 */ addiu $a1,$sp,0x130 /* f105558: 27a6012c */ addiu $a2,$sp,0x12c /* f10555c: 27a700f0 */ addiu $a3,$sp,0xf0 -/* f105560: 0fc5580f */ jal func0f15603c +/* f105560: 0fc5580f */ jal textRenderWhite /* f105564: afaf0018 */ sw $t7,0x18($sp) /* f105568: afa20138 */ sw $v0,0x138($sp) /* f10556c: 0fc54de0 */ jal func0f153780 @@ -4479,7 +4479,7 @@ s32 menuhandlerMainMenuCooperative(u32 operation, struct menu_item *item, s32 *v s32 menuhandlerMainMenuCounterOperative(u32 operation, struct menu_item *item, s32 *value) { if (operation == MENUOP_CHECKDISABLED) { - if ((func0001404c() & 2) == 0) { + if ((getConnectedControllers() & 2) == 0) { return true; } } diff --git a/src/game/game_107fb0.c b/src/game/game_107fb0.c index 802ae5d54..9cc861a61 100644 --- a/src/game/game_107fb0.c +++ b/src/game/game_107fb0.c @@ -3290,7 +3290,7 @@ glabel var7f1b37a8 /* f10acec: afa00024 */ sw $zero,0x24($sp) /* f10acf0: afad0014 */ sw $t5,0x14($sp) /* f10acf4: afac0010 */ sw $t4,0x10($sp) -/* f10acf8: 0fc5580f */ jal func0f15603c +/* f10acf8: 0fc5580f */ jal textRenderWhite /* f10acfc: afae001c */ sw $t6,0x1c($sp) /* f10ad00: 8fb80070 */ lw $t8,0x70($sp) /* f10ad04: 00408825 */ or $s1,$v0,$zero @@ -3787,7 +3787,7 @@ glabel var7f1b37f8 /* f10b364: 27a60150 */ addiu $a2,$sp,0x150 /* f10b368: 27a700d4 */ addiu $a3,$sp,0xd4 /* f10b36c: afb9001c */ sw $t9,0x1c($sp) -/* f10b370: 0fc5580f */ jal func0f15603c +/* f10b370: 0fc5580f */ jal textRenderWhite /* f10b374: afb80018 */ sw $t8,0x18($sp) /* f10b378: 8faa0160 */ lw $t2,0x160($sp) /* f10b37c: afa2014c */ sw $v0,0x14c($sp) @@ -3875,7 +3875,7 @@ glabel var7f1b37f8 /* f10b4bc: 27a60150 */ addiu $a2,$sp,0x150 /* f10b4c0: 27a700d4 */ addiu $a3,$sp,0xd4 /* f10b4c4: afae001c */ sw $t6,0x1c($sp) -/* f10b4c8: 0fc5580f */ jal func0f15603c +/* f10b4c8: 0fc5580f */ jal textRenderWhite /* f10b4cc: afad0018 */ sw $t5,0x18($sp) /* f10b4d0: afa2014c */ sw $v0,0x14c($sp) /* f10b4d4: 8e180000 */ lw $t8,0x0($s0) @@ -3904,7 +3904,7 @@ glabel var7f1b37f8 /* f10b530: 27a60150 */ addiu $a2,$sp,0x150 /* f10b534: 27a70098 */ addiu $a3,$sp,0x98 /* f10b538: afad001c */ sw $t5,0x1c($sp) -/* f10b53c: 0fc5580f */ jal func0f15603c +/* f10b53c: 0fc5580f */ jal textRenderWhite /* f10b540: afac0018 */ sw $t4,0x18($sp) /* f10b544: 3c0f8008 */ lui $t7,%hi(var8007fb0c) /* f10b548: 8deffb0c */ lw $t7,%lo(var8007fb0c)($t7) @@ -3915,7 +3915,7 @@ glabel var7f1b37f8 /* f10b55c: 27a50058 */ addiu $a1,$sp,0x58 /* f10b560: 27a6005c */ addiu $a2,$sp,0x5c /* f10b564: afa00014 */ sw $zero,0x14($sp) -/* f10b568: 0fc55cbe */ jal func0f1572f8 +/* f10b568: 0fc55cbe */ jal textMeasure /* f10b56c: afaf0010 */ sw $t7,0x10($sp) /* f10b570: 8e180000 */ lw $t8,0x0($s0) /* f10b574: 8e190008 */ lw $t9,0x8($s0) @@ -3947,7 +3947,7 @@ glabel var7f1b37f8 /* f10b5dc: 27a60150 */ addiu $a2,$sp,0x150 /* f10b5e0: 27a7005c */ addiu $a3,$sp,0x5c /* f10b5e4: afb9001c */ sw $t9,0x1c($sp) -/* f10b5e8: 0fc5580f */ jal func0f15603c +/* f10b5e8: 0fc5580f */ jal textRenderWhite /* f10b5ec: afb80018 */ sw $t8,0x18($sp) /* f10b5f0: 1000001c */ beqz $zero,.L0f10b664 /* f10b5f4: 8fbf003c */ lw $ra,0x3c($sp) @@ -4840,7 +4840,7 @@ glabel var7f1b385c /* f10c3a8: 27a50144 */ addiu $a1,$sp,0x144 /* f10c3ac: 27a60140 */ addiu $a2,$sp,0x140 /* f10c3b0: 8fa70058 */ lw $a3,0x58($sp) -/* f10c3b4: 0fc5580f */ jal func0f15603c +/* f10c3b4: 0fc5580f */ jal textRenderWhite /* f10c3b8: afb90018 */ sw $t9,0x18($sp) /* f10c3bc: 100000c8 */ beqz $zero,.L0f10c6e0 /* f10c3c0: afa20130 */ sw $v0,0x130($sp) @@ -4870,7 +4870,7 @@ glabel var7f1b385c /* f10c41c: 27a50144 */ addiu $a1,$sp,0x144 /* f10c420: 27a60140 */ addiu $a2,$sp,0x140 /* f10c424: 27a70118 */ addiu $a3,$sp,0x118 -/* f10c428: 0fc5580f */ jal func0f15603c +/* f10c428: 0fc5580f */ jal textRenderWhite /* f10c42c: afb80018 */ sw $t8,0x18($sp) /* f10c430: 8fa3012c */ lw $v1,0x12c($sp) /* f10c434: afa20130 */ sw $v0,0x130($sp) @@ -4939,7 +4939,7 @@ glabel var7f1b385c /* f10c528: 27a50144 */ addiu $a1,$sp,0x144 /* f10c52c: 27a60140 */ addiu $a2,$sp,0x140 /* f10c530: 27a7009c */ addiu $a3,$sp,0x9c -/* f10c534: 0fc5580f */ jal func0f15603c +/* f10c534: 0fc5580f */ jal textRenderWhite /* f10c538: afab0018 */ sw $t3,0x18($sp) /* f10c53c: 8fb8012c */ lw $t8,0x12c($sp) /* f10c540: afa20130 */ sw $v0,0x130($sp) @@ -4985,7 +4985,7 @@ glabel var7f1b385c /* f10c5d8: 27a50098 */ addiu $a1,$sp,0x98 /* f10c5dc: 27a6009c */ addiu $a2,$sp,0x9c /* f10c5e0: afa00014 */ sw $zero,0x14($sp) -/* f10c5e4: 0fc55cbe */ jal func0f1572f8 +/* f10c5e4: 0fc55cbe */ jal textMeasure /* f10c5e8: afb90010 */ sw $t9,0x10($sp) /* f10c5ec: 0c002f02 */ jal func0000bc08 /* f10c5f0: 00000000 */ sll $zero,$zero,0x0 @@ -5009,7 +5009,7 @@ glabel var7f1b385c /* f10c638: 27a50144 */ addiu $a1,$sp,0x144 /* f10c63c: 27a60140 */ addiu $a2,$sp,0x140 /* f10c640: 27a7009c */ addiu $a3,$sp,0x9c -/* f10c644: 0fc5580f */ jal func0f15603c +/* f10c644: 0fc5580f */ jal textRenderWhite /* f10c648: afb80018 */ sw $t8,0x18($sp) /* f10c64c: 8fad0140 */ lw $t5,0x140($sp) /* f10c650: 8fae0144 */ lw $t6,0x144($sp) @@ -5045,7 +5045,7 @@ glabel var7f1b385c /* f10c6c8: 27a50144 */ addiu $a1,$sp,0x144 /* f10c6cc: 27a60140 */ addiu $a2,$sp,0x140 /* f10c6d0: 27a7009c */ addiu $a3,$sp,0x9c -/* f10c6d4: 0fc5580f */ jal func0f15603c +/* f10c6d4: 0fc5580f */ jal textRenderWhite /* f10c6d8: afb90018 */ sw $t9,0x18($sp) /* f10c6dc: afa20130 */ sw $v0,0x130($sp) .L0f10c6e0: diff --git a/src/game/game_1371b0.c b/src/game/game_1371b0.c index 1f3b718d6..a772f6ddb 100644 --- a/src/game/game_1371b0.c +++ b/src/game/game_1371b0.c @@ -3836,7 +3836,7 @@ glabel var7f1b592c /* f13a654: afb900e8 */ sw $t9,0xe8($sp) /* f13a658: 8e860000 */ lw $a2,0x0($s4) /* f13a65c: afa00014 */ sw $zero,0x14($sp) -/* f13a660: 0fc55cbe */ jal func0f1572f8 +/* f13a660: 0fc55cbe */ jal textMeasure /* f13a664: afa20010 */ sw $v0,0x10($sp) /* f13a668: 8e2a0004 */ lw $t2,0x4($s1) /* f13a66c: 8e860004 */ lw $a2,0x4($s4) @@ -3844,7 +3844,7 @@ glabel var7f1b592c /* f13a674: afa00014 */ sw $zero,0x14($sp) /* f13a678: 8fa40084 */ lw $a0,0x84($sp) /* f13a67c: 8fa50080 */ lw $a1,0x80($sp) -/* f13a680: 0fc55cbe */ jal func0f1572f8 +/* f13a680: 0fc55cbe */ jal textMeasure /* f13a684: afaa0010 */ sw $t2,0x10($sp) /* f13a688: 8ec30000 */ lw $v1,0x0($s6) /* f13a68c: 906b0001 */ lbu $t3,0x1($v1) diff --git a/src/game/game_141820.c b/src/game/game_141820.c index 53ef21ff4..5cb34d2af 100644 --- a/src/game/game_141820.c +++ b/src/game/game_141820.c @@ -3062,7 +3062,7 @@ glabel hudRenderEyespyUi /* f1443d0: 27a502e4 */ addiu $a1,$sp,0x2e4 /* f1443d4: 02603025 */ or $a2,$s3,$zero /* f1443d8: afa00014 */ sw $zero,0x14($sp) -/* f1443dc: 0fc55cbe */ jal func0f1572f8 +/* f1443dc: 0fc55cbe */ jal textMeasure /* f1443e0: afb90010 */ sw $t9,0x10($sp) /* f1443e4: 8fa902ac */ lw $t1,0x2ac($sp) /* f1443e8: 8faf0304 */ lw $t7,0x304($sp) @@ -3113,7 +3113,7 @@ glabel hudRenderEyespyUi /* f14449c: afa0002c */ sw $zero,0x2c($sp) /* f1444a0: afaf0014 */ sw $t7,0x14($sp) /* f1444a4: afae0010 */ sw $t6,0x10($sp) -/* f1444a8: 0fc55b92 */ jal func0f156e48 +/* f1444a8: 0fc55b92 */ jal textRender /* f1444ac: afb8001c */ sw $t8,0x1c($sp) /* f1444b0: 0040a825 */ or $s5,$v0,$zero /* f1444b4: 0fc5b9f1 */ jal langGet @@ -3142,7 +3142,7 @@ glabel hudRenderEyespyUi /* f144510: 27a502e4 */ addiu $a1,$sp,0x2e4 /* f144514: 02603025 */ or $a2,$s3,$zero /* f144518: afa00014 */ sw $zero,0x14($sp) -/* f14451c: 0fc55cbe */ jal func0f1572f8 +/* f14451c: 0fc55cbe */ jal textMeasure /* f144520: afaf0010 */ sw $t7,0x10($sp) /* f144524: 8fa30084 */ lw $v1,0x84($sp) /* f144528: 8fb802e4 */ lw $t8,0x2e4($sp) @@ -3182,7 +3182,7 @@ glabel hudRenderEyespyUi /* f1445b0: afa0002c */ sw $zero,0x2c($sp) /* f1445b4: afaf0014 */ sw $t7,0x14($sp) /* f1445b8: afae0010 */ sw $t6,0x10($sp) -/* f1445bc: 0fc55b92 */ jal func0f156e48 +/* f1445bc: 0fc55b92 */ jal textRender /* f1445c0: afb8001c */ sw $t8,0x1c($sp) /* f1445c4: 0040a825 */ or $s5,$v0,$zero /* f1445c8: 0fc5b9f1 */ jal langGet @@ -3207,7 +3207,7 @@ glabel hudRenderEyespyUi /* f144614: 27a502e4 */ addiu $a1,$sp,0x2e4 /* f144618: 02603025 */ or $a2,$s3,$zero /* f14461c: afa00014 */ sw $zero,0x14($sp) -/* f144620: 0fc55cbe */ jal func0f1572f8 +/* f144620: 0fc55cbe */ jal textMeasure /* f144624: afb80010 */ sw $t8,0x10($sp) /* f144628: 8fa30084 */ lw $v1,0x84($sp) /* f14462c: 8fb902e4 */ lw $t9,0x2e4($sp) @@ -3247,7 +3247,7 @@ glabel hudRenderEyespyUi /* f1446b4: afa0002c */ sw $zero,0x2c($sp) /* f1446b8: afb80014 */ sw $t8,0x14($sp) /* f1446bc: afaf0010 */ sw $t7,0x10($sp) -/* f1446c0: 0fc55b92 */ jal func0f156e48 +/* f1446c0: 0fc55b92 */ jal textRender /* f1446c4: afb9001c */ sw $t9,0x1c($sp) /* f1446c8: 0040a825 */ or $s5,$v0,$zero /* f1446cc: 0fc5b9f1 */ jal langGet @@ -3272,7 +3272,7 @@ glabel hudRenderEyespyUi /* f144718: 27a502e4 */ addiu $a1,$sp,0x2e4 /* f14471c: 02603025 */ or $a2,$s3,$zero /* f144720: afa00014 */ sw $zero,0x14($sp) -/* f144724: 0fc55cbe */ jal func0f1572f8 +/* f144724: 0fc55cbe */ jal textMeasure /* f144728: afb90010 */ sw $t9,0x10($sp) /* f14472c: 8fa30084 */ lw $v1,0x84($sp) /* f144730: 8fae02e4 */ lw $t6,0x2e4($sp) @@ -3312,7 +3312,7 @@ glabel hudRenderEyespyUi /* f1447b8: afa0002c */ sw $zero,0x2c($sp) /* f1447bc: afb90014 */ sw $t9,0x14($sp) /* f1447c0: afb80010 */ sw $t8,0x10($sp) -/* f1447c4: 0fc55b92 */ jal func0f156e48 +/* f1447c4: 0fc55b92 */ jal textRender /* f1447c8: afae001c */ sw $t6,0x1c($sp) /* f1447cc: 0040a825 */ or $s5,$v0,$zero /* f1447d0: 0fc5b9f1 */ jal langGet @@ -3330,7 +3330,7 @@ glabel hudRenderEyespyUi /* f144800: 27a502e4 */ addiu $a1,$sp,0x2e4 /* f144804: 02603025 */ or $a2,$s3,$zero /* f144808: afa00014 */ sw $zero,0x14($sp) -/* f14480c: 0fc55cbe */ jal func0f1572f8 +/* f14480c: 0fc55cbe */ jal textMeasure /* f144810: afaf0010 */ sw $t7,0x10($sp) /* f144814: 8fa902a8 */ lw $t1,0x2a8($sp) /* f144818: 8fb80304 */ lw $t8,0x304($sp) @@ -3391,7 +3391,7 @@ glabel hudRenderEyespyUi /* f1448e4: afaf0014 */ sw $t7,0x14($sp) /* f1448e8: afae0010 */ sw $t6,0x10($sp) /* f1448ec: afb80018 */ sw $t8,0x18($sp) -/* f1448f0: 0fc55b92 */ jal func0f156e48 +/* f1448f0: 0fc55b92 */ jal textRender /* f1448f4: afb9001c */ sw $t9,0x1c($sp) /* f1448f8: 8ece0284 */ lw $t6,0x284($s6) /* f1448fc: 0040a825 */ or $s5,$v0,$zero @@ -3438,7 +3438,7 @@ glabel hudRenderEyespyUi /* f144994: 27a502e4 */ addiu $a1,$sp,0x2e4 /* f144998: 02603025 */ or $a2,$s3,$zero /* f14499c: afa00014 */ sw $zero,0x14($sp) -/* f1449a0: 0fc55cbe */ jal func0f1572f8 +/* f1449a0: 0fc55cbe */ jal textMeasure /* f1449a4: afb80010 */ sw $t8,0x10($sp) /* f1449a8: 8fa902a8 */ lw $t1,0x2a8($sp) /* f1449ac: 8fb90304 */ lw $t9,0x304($sp) @@ -3499,7 +3499,7 @@ glabel hudRenderEyespyUi /* f144a78: afb80014 */ sw $t8,0x14($sp) /* f144a7c: afaf0010 */ sw $t7,0x10($sp) /* f144a80: afb90018 */ sw $t9,0x18($sp) -/* f144a84: 0fc55b92 */ jal func0f156e48 +/* f144a84: 0fc55b92 */ jal textRender /* f144a88: afae001c */ sw $t6,0x1c($sp) /* f144a8c: 8ecf0284 */ lw $t7,0x284($s6) /* f144a90: 0040a825 */ or $s5,$v0,$zero @@ -3522,7 +3522,7 @@ glabel hudRenderEyespyUi /* f144ad4: 27a502e4 */ addiu $a1,$sp,0x2e4 /* f144ad8: 02603025 */ or $a2,$s3,$zero /* f144adc: afa00014 */ sw $zero,0x14($sp) -/* f144ae0: 0fc55cbe */ jal func0f1572f8 +/* f144ae0: 0fc55cbe */ jal textMeasure /* f144ae4: afb90010 */ sw $t9,0x10($sp) /* f144ae8: 8faf02ac */ lw $t7,0x2ac($sp) /* f144aec: 8fae008c */ lw $t6,0x8c($sp) @@ -3582,7 +3582,7 @@ glabel hudRenderEyespyUi /* f144bbc: afaf0014 */ sw $t7,0x14($sp) /* f144bc0: afb90010 */ sw $t9,0x10($sp) /* f144bc4: afae0018 */ sw $t6,0x18($sp) -/* f144bc8: 0fc55b92 */ jal func0f156e48 +/* f144bc8: 0fc55b92 */ jal textRender /* f144bcc: afb8001c */ sw $t8,0x1c($sp) /* f144bd0: 1000009b */ beqz $zero,.L0f144e40 /* f144bd4: 0040a825 */ or $s5,$v0,$zero @@ -3605,7 +3605,7 @@ glabel hudRenderEyespyUi /* f144c14: 27a502e4 */ addiu $a1,$sp,0x2e4 /* f144c18: 02603025 */ or $a2,$s3,$zero /* f144c1c: afa00014 */ sw $zero,0x14($sp) -/* f144c20: 0fc55cbe */ jal func0f1572f8 +/* f144c20: 0fc55cbe */ jal textMeasure /* f144c24: afb90010 */ sw $t9,0x10($sp) /* f144c28: 8fae02ac */ lw $t6,0x2ac($sp) /* f144c2c: 8faf008c */ lw $t7,0x8c($sp) @@ -3665,7 +3665,7 @@ glabel hudRenderEyespyUi /* f144cfc: afae0014 */ sw $t6,0x14($sp) /* f144d00: afb90010 */ sw $t9,0x10($sp) /* f144d04: afaf0018 */ sw $t7,0x18($sp) -/* f144d08: 0fc55b92 */ jal func0f156e48 +/* f144d08: 0fc55b92 */ jal textRender /* f144d0c: afb8001c */ sw $t8,0x1c($sp) /* f144d10: 1000004b */ beqz $zero,.L0f144e40 /* f144d14: 0040a825 */ or $s5,$v0,$zero @@ -3685,7 +3685,7 @@ glabel hudRenderEyespyUi /* f144d48: 27a502e4 */ addiu $a1,$sp,0x2e4 /* f144d4c: 02603025 */ or $a2,$s3,$zero /* f144d50: afa00014 */ sw $zero,0x14($sp) -/* f144d54: 0fc55cbe */ jal func0f1572f8 +/* f144d54: 0fc55cbe */ jal textMeasure /* f144d58: afb90010 */ sw $t9,0x10($sp) /* f144d5c: 8faf02ac */ lw $t7,0x2ac($sp) /* f144d60: 8fae008c */ lw $t6,0x8c($sp) @@ -3743,7 +3743,7 @@ glabel hudRenderEyespyUi /* f144e28: afaf0014 */ sw $t7,0x14($sp) /* f144e2c: afb90010 */ sw $t9,0x10($sp) /* f144e30: afae0018 */ sw $t6,0x18($sp) -/* f144e34: 0fc55b92 */ jal func0f156e48 +/* f144e34: 0fc55b92 */ jal textRender /* f144e38: afb8001c */ sw $t8,0x1c($sp) /* f144e3c: 0040a825 */ or $s5,$v0,$zero .L0f144e40: @@ -3791,7 +3791,7 @@ glabel hudRenderEyespyUi /* f144ed8: 27a502e4 */ addiu $a1,$sp,0x2e4 /* f144edc: 02603025 */ or $a2,$s3,$zero /* f144ee0: afa00014 */ sw $zero,0x14($sp) -/* f144ee4: 0fc55cbe */ jal func0f1572f8 +/* f144ee4: 0fc55cbe */ jal textMeasure /* f144ee8: afae0010 */ sw $t6,0x10($sp) /* f144eec: 8fa902a8 */ lw $t1,0x2a8($sp) /* f144ef0: 8faf02ac */ lw $t7,0x2ac($sp) @@ -3857,7 +3857,7 @@ glabel hudRenderEyespyUi /* f144fd0: afb80014 */ sw $t8,0x14($sp) /* f144fd4: afae0010 */ sw $t6,0x10($sp) /* f144fd8: afaf0018 */ sw $t7,0x18($sp) -/* f144fdc: 0fc55b92 */ jal func0f156e48 +/* f144fdc: 0fc55b92 */ jal textRender /* f144fe0: afb9001c */ sw $t9,0x1c($sp) /* f144fe4: 8ece0284 */ lw $t6,0x284($s6) /* f144fe8: 0040a825 */ or $s5,$v0,$zero @@ -3894,7 +3894,7 @@ glabel hudRenderEyespyUi /* f145058: 27a502e4 */ addiu $a1,$sp,0x2e4 /* f14505c: 02603025 */ or $a2,$s3,$zero /* f145060: afa00014 */ sw $zero,0x14($sp) -/* f145064: 0fc55cbe */ jal func0f1572f8 +/* f145064: 0fc55cbe */ jal textMeasure /* f145068: afaf0010 */ sw $t7,0x10($sp) /* f14506c: 8fb902a8 */ lw $t9,0x2a8($sp) /* f145070: 8fb402ac */ lw $s4,0x2ac($sp) @@ -3968,7 +3968,7 @@ glabel hudRenderEyespyUi /* f145174: afae0014 */ sw $t6,0x14($sp) /* f145178: afb90010 */ sw $t9,0x10($sp) /* f14517c: afb80018 */ sw $t8,0x18($sp) -/* f145180: 0fc55b92 */ jal func0f156e48 +/* f145180: 0fc55b92 */ jal textRender /* f145184: afaf001c */ sw $t7,0x1c($sp) /* f145188: 0fc54e0e */ jal func0f153838 /* f14518c: 00402025 */ or $a0,$v0,$zero @@ -7321,7 +7321,7 @@ glabel hudRenderHorizonScanner /* f1482d8: afa00024 */ sw $zero,0x24($sp) /* f1482dc: afa00028 */ sw $zero,0x28($sp) /* f1482e0: afaa0014 */ sw $t2,0x14($sp) -/* f1482e4: 0fc5580f */ jal func0f15603c +/* f1482e4: 0fc5580f */ jal textRenderWhite /* f1482e8: afa90010 */ sw $t1,0x10($sp) /* f1482ec: 3c057f1b */ lui $a1,%hi(var7f1b5f0c) /* f1482f0: 00409025 */ or $s2,$v0,$zero @@ -7360,7 +7360,7 @@ glabel hudRenderHorizonScanner /* f148370: afa00024 */ sw $zero,0x24($sp) /* f148374: afa00028 */ sw $zero,0x28($sp) /* f148378: afb80014 */ sw $t8,0x14($sp) -/* f14837c: 0fc5580f */ jal func0f15603c +/* f14837c: 0fc5580f */ jal textRenderWhite /* f148380: afb90010 */ sw $t9,0x10($sp) /* f148384: 8faf00ac */ lw $t7,0xac($sp) /* f148388: 8faa0184 */ lw $t2,0x184($sp) @@ -7398,7 +7398,7 @@ glabel hudRenderHorizonScanner /* f148408: afa00024 */ sw $zero,0x24($sp) /* f14840c: afa00028 */ sw $zero,0x28($sp) /* f148410: afad0014 */ sw $t5,0x14($sp) -/* f148414: 0fc5580f */ jal func0f15603c +/* f148414: 0fc5580f */ jal textRenderWhite /* f148418: afac0010 */ sw $t4,0x10($sp) /* f14841c: 8fb800a8 */ lw $t8,0xa8($sp) /* f148420: 00409025 */ or $s2,$v0,$zero @@ -7446,7 +7446,7 @@ glabel hudRenderHorizonScanner /* f1484c0: afa00024 */ sw $zero,0x24($sp) /* f1484c4: afa00028 */ sw $zero,0x28($sp) /* f1484c8: afaf0014 */ sw $t7,0x14($sp) -/* f1484cc: 0fc5580f */ jal func0f15603c +/* f1484cc: 0fc5580f */ jal textRenderWhite /* f1484d0: afae0010 */ sw $t6,0x10($sp) /* f1484d4: 8faa00a8 */ lw $t2,0xa8($sp) /* f1484d8: 8fb900ac */ lw $t9,0xac($sp) @@ -7490,7 +7490,7 @@ glabel hudRenderHorizonScanner /* f148568: afa00024 */ sw $zero,0x24($sp) /* f14856c: afa00028 */ sw $zero,0x28($sp) /* f148570: afac0014 */ sw $t4,0x14($sp) -/* f148574: 0fc5580f */ jal func0f15603c +/* f148574: 0fc5580f */ jal textRenderWhite /* f148578: afab0010 */ sw $t3,0x10($sp) /* f14857c: 0fc54de0 */ jal func0f153780 /* f148580: 00402025 */ or $a0,$v0,$zero diff --git a/src/game/game_1531a0.c b/src/game/game_1531a0.c index 97235a598..5233b4313 100644 --- a/src/game/game_1531a0.c +++ b/src/game/game_1531a0.c @@ -2407,7 +2407,7 @@ glabel func0f1552d4 /* f15536c: afa00014 */ sw $zero,0x14($sp) /* f155370: afa200c4 */ sw $v0,0xc4($sp) /* f155374: 02003025 */ or $a2,$s0,$zero -/* f155378: 0fc55cbe */ jal func0f1572f8 +/* f155378: 0fc55cbe */ jal textMeasure /* f15537c: afb90010 */ sw $t9,0x10($sp) /* f155380: 8fa800cc */ lw $t0,0xcc($sp) /* f155384: 3c013f80 */ lui $at,0x3f80 @@ -3274,7 +3274,7 @@ glabel func0f156030 ); GLOBAL_ASM( -glabel func0f15603c +glabel textRenderWhite /* f15603c: 27bdff40 */ addiu $sp,$sp,-192 /* f156040: 3c0f8008 */ lui $t7,%hi(var8007fac8) /* f156044: 8deffac8 */ lw $t7,%lo(var8007fac8)($t7) @@ -3418,7 +3418,7 @@ glabel func0f15603c /* f15624c: afae0020 */ sw $t6,0x20($sp) /* f156250: afaf0024 */ sw $t7,0x24($sp) /* f156254: afb80028 */ sw $t8,0x28($sp) -/* f156258: 0fc55b92 */ jal func0f156e48 +/* f156258: 0fc55b92 */ jal textRender /* f15625c: afb9002c */ sw $t9,0x2c($sp) /* f156260: 0040a825 */ or $s5,$v0,$zero .L0f156264: @@ -4237,7 +4237,7 @@ glabel func0f156a24 ); GLOBAL_ASM( -glabel func0f156e48 +glabel textRender /* f156e48: 27bdff38 */ addiu $sp,$sp,-200 /* f156e4c: afbf005c */ sw $ra,0x5c($sp) /* f156e50: afbe0058 */ sw $s8,0x58($sp) @@ -4554,7 +4554,7 @@ glabel func0f156e48 ); GLOBAL_ASM( -glabel func0f1572f8 +glabel textMeasure /* f1572f8: 27bdffe8 */ addiu $sp,$sp,-24 /* f1572fc: afb10008 */ sw $s1,0x8($sp) /* f157300: 8fb1002c */ lw $s1,0x2c($sp) @@ -4775,7 +4775,7 @@ glabel func0f157520 /* f157608: 27a40074 */ addiu $a0,$sp,0x74 /* f15760c: 02803025 */ or $a2,$s4,$zero /* f157610: 02603825 */ or $a3,$s3,$zero -/* f157614: 0fc55cbe */ jal func0f1572f8 +/* f157614: 0fc55cbe */ jal textMeasure /* f157618: afb90010 */ sw $t9,0x10($sp) /* f15761c: 8fab0084 */ lw $t3,0x84($sp) /* f157620: 8fae0078 */ lw $t6,0x78($sp) diff --git a/src/game/game_179060.c b/src/game/game_179060.c index 8c80c2179..519f81257 100644 --- a/src/game/game_179060.c +++ b/src/game/game_179060.c @@ -1169,7 +1169,7 @@ glabel menuhandler0017a20c /* f17a320: 27a500b8 */ addiu $a1,$sp,0xb8 /* f17a324: 27a600b4 */ addiu $a2,$sp,0xb4 /* f17a328: 02003825 */ or $a3,$s0,$zero -/* f17a32c: 0fc5580f */ jal func0f15603c +/* f17a32c: 0fc5580f */ jal textRenderWhite /* f17a330: afb90018 */ sw $t9,0x18($sp) /* f17a334: afa200c4 */ sw $v0,0xc4($sp) /* f17a338: 0fc54de0 */ jal func0f153780 @@ -5451,7 +5451,7 @@ glabel var7f1b8288 /* f17e6b4: 27a500ac */ addiu $a1,$sp,0xac /* f17e6b8: 27a600a8 */ addiu $a2,$sp,0xa8 /* f17e6bc: 02203825 */ or $a3,$s1,$zero -/* f17e6c0: 0fc5580f */ jal func0f15603c +/* f17e6c0: 0fc5580f */ jal textRenderWhite /* f17e6c4: afab0018 */ sw $t3,0x18($sp) /* f17e6c8: afa200b4 */ sw $v0,0xb4($sp) /* f17e6cc: 0fc54de0 */ jal func0f153780 diff --git a/src/game/game_17f930.c b/src/game/game_17f930.c index 5f5ff9d9b..25d508bff 100644 --- a/src/game/game_17f930.c +++ b/src/game/game_17f930.c @@ -943,7 +943,7 @@ glabel scenarioHtbCallback18 /* f180884: 27a50098 */ addiu $a1,$sp,0x98 /* f180888: 27a6004c */ addiu $a2,$sp,0x4c /* f18088c: afa00014 */ sw $zero,0x14($sp) -/* f180890: 0fc55cbe */ jal func0f1572f8 +/* f180890: 0fc55cbe */ jal textMeasure /* f180894: afad0010 */ sw $t5,0x10($sp) /* f180898: 8fa70098 */ lw $a3,0x98($sp) /* f18089c: 8fa50090 */ lw $a1,0x90($sp) @@ -986,7 +986,7 @@ glabel scenarioHtbCallback18 /* f18092c: afa0002c */ sw $zero,0x2c($sp) /* f180930: afb80014 */ sw $t8,0x14($sp) /* f180934: afaf0010 */ sw $t7,0x10($sp) -/* f180938: 0fc55b92 */ jal func0f156e48 +/* f180938: 0fc55b92 */ jal textRender /* f18093c: afab0020 */ sw $t3,0x20($sp) /* f180940: 0fc54de0 */ jal func0f153780 /* f180944: 00402025 */ or $a0,$v0,$zero @@ -2709,7 +2709,7 @@ glabel scenarioKohCallback18 /* f18282c: 27a500a0 */ addiu $a1,$sp,0xa0 /* f182830: 27a60050 */ addiu $a2,$sp,0x50 /* f182834: afa00014 */ sw $zero,0x14($sp) -/* f182838: 0fc55cbe */ jal func0f1572f8 +/* f182838: 0fc55cbe */ jal textMeasure /* f18283c: afab0010 */ sw $t3,0x10($sp) /* f182840: 8fa700a0 */ lw $a3,0xa0($sp) /* f182844: 8fa50098 */ lw $a1,0x98($sp) @@ -2752,7 +2752,7 @@ glabel scenarioKohCallback18 /* f1828d4: afa0002c */ sw $zero,0x2c($sp) /* f1828d8: afae0014 */ sw $t6,0x14($sp) /* f1828dc: afad0010 */ sw $t5,0x10($sp) -/* f1828e0: 0fc55b92 */ jal func0f156e48 +/* f1828e0: 0fc55b92 */ jal textRender /* f1828e4: afb90020 */ sw $t9,0x20($sp) /* f1828e8: 0fc54de0 */ jal func0f153780 /* f1828ec: 00402025 */ or $a0,$v0,$zero @@ -4947,7 +4947,7 @@ glabel scenarioPacCallback18 /* f184b3c: 27a50094 */ addiu $a1,$sp,0x94 /* f184b40: 27a60048 */ addiu $a2,$sp,0x48 /* f184b44: afa00014 */ sw $zero,0x14($sp) -/* f184b48: 0fc55cbe */ jal func0f1572f8 +/* f184b48: 0fc55cbe */ jal textMeasure /* f184b4c: afa90010 */ sw $t1,0x10($sp) /* f184b50: 8fa70094 */ lw $a3,0x94($sp) /* f184b54: 8fa5008c */ lw $a1,0x8c($sp) @@ -4990,7 +4990,7 @@ glabel scenarioPacCallback18 /* f184be4: afa0002c */ sw $zero,0x2c($sp) /* f184be8: afad0014 */ sw $t5,0x14($sp) /* f184bec: afab0010 */ sw $t3,0x10($sp) -/* f184bf0: 0fc55b92 */ jal func0f156e48 +/* f184bf0: 0fc55b92 */ jal textRender /* f184bf4: afb80020 */ sw $t8,0x20($sp) /* f184bf8: 0fc54de0 */ jal func0f153780 /* f184bfc: 00402025 */ or $a0,$v0,$zero diff --git a/src/game/game_19c990.c b/src/game/game_19c990.c index c3107efb7..c647e0f75 100644 --- a/src/game/game_19c990.c +++ b/src/game/game_19c990.c @@ -5647,7 +5647,7 @@ glabel func0f1a2d88 /* f1a2db8: 27a50060 */ addiu $a1,$sp,0x60 /* f1a2dbc: 27a40064 */ addiu $a0,$sp,0x64 /* f1a2dc0: afa00014 */ sw $zero,0x14($sp) -/* f1a2dc4: 0fc55cbe */ jal func0f1572f8 +/* f1a2dc4: 0fc55cbe */ jal textMeasure /* f1a2dc8: afae0010 */ sw $t6,0x10($sp) /* f1a2dcc: 8fb80060 */ lw $t8,0x60($sp) /* f1a2dd0: 8faf006c */ lw $t7,0x6c($sp) @@ -5691,7 +5691,7 @@ glabel func0f1a2d88 /* f1a2e68: afa0002c */ sw $zero,0x2c($sp) /* f1a2e6c: afae0014 */ sw $t6,0x14($sp) /* f1a2e70: afad0010 */ sw $t5,0x10($sp) -/* f1a2e74: 0fc55b92 */ jal func0f156e48 +/* f1a2e74: 0fc55b92 */ jal textRender /* f1a2e78: afb90020 */ sw $t9,0x20($sp) /* f1a2e7c: 8fa60078 */ lw $a2,0x78($sp) /* f1a2e80: 00408025 */ or $s0,$v0,$zero @@ -5703,7 +5703,7 @@ glabel func0f1a2d88 /* f1a2e98: 3c078008 */ lui $a3,%hi(var8007fb08) /* f1a2e9c: 8ce7fb08 */ lw $a3,%lo(var8007fb08)($a3) /* f1a2ea0: afa00014 */ sw $zero,0x14($sp) -/* f1a2ea4: 0fc55cbe */ jal func0f1572f8 +/* f1a2ea4: 0fc55cbe */ jal textMeasure /* f1a2ea8: afaa0010 */ sw $t2,0x10($sp) /* f1a2eac: 8fac0060 */ lw $t4,0x60($sp) /* f1a2eb0: 8fab006c */ lw $t3,0x6c($sp) @@ -5742,7 +5742,7 @@ glabel func0f1a2d88 /* f1a2f34: afaa0010 */ sw $t2,0x10($sp) /* f1a2f38: afab0018 */ sw $t3,0x18($sp) /* f1a2f3c: afad001c */ sw $t5,0x1c($sp) -/* f1a2f40: 0fc55b92 */ jal func0f156e48 +/* f1a2f40: 0fc55b92 */ jal textRender /* f1a2f44: afae0020 */ sw $t6,0x20($sp) /* f1a2f48: 00408025 */ or $s0,$v0,$zero .L0f1a2f4c: diff --git a/src/game/game_1a3340.c b/src/game/game_1a3340.c index 4d7ea0260..c91327847 100644 --- a/src/game/game_1a3340.c +++ b/src/game/game_1a3340.c @@ -245,7 +245,7 @@ glabel var7f1b9940 /* f1a363c: 27a60080 */ addiu $a2,$sp,0x80 /* f1a3640: 8fa70044 */ lw $a3,0x44($sp) /* f1a3644: afaf0018 */ sw $t7,0x18($sp) -/* f1a3648: 0fc5580f */ jal func0f15603c +/* f1a3648: 0fc5580f */ jal textRenderWhite /* f1a364c: afb8001c */ sw $t8,0x1c($sp) /* f1a3650: afa2009c */ sw $v0,0x9c($sp) /* f1a3654: 0fc54de0 */ jal func0f153780 @@ -1560,7 +1560,7 @@ glabel menuhandler001a44c0 /* f1a4d54: afb90014 */ sw $t9,0x14($sp) /* f1a4d58: afad0010 */ sw $t5,0x10($sp) /* f1a4d5c: afae0018 */ sw $t6,0x18($sp) -/* f1a4d60: 0fc5580f */ jal func0f15603c +/* f1a4d60: 0fc5580f */ jal textRenderWhite /* f1a4d64: afac001c */ sw $t4,0x1c($sp) /* f1a4d68: afa2015c */ sw $v0,0x15c($sp) /* f1a4d6c: 0fc5b9f1 */ jal langGet @@ -1601,7 +1601,7 @@ glabel menuhandler001a44c0 /* f1a4df8: afb80014 */ sw $t8,0x14($sp) /* f1a4dfc: afac0010 */ sw $t4,0x10($sp) /* f1a4e00: afaf0018 */ sw $t7,0x18($sp) -/* f1a4e04: 0fc5580f */ jal func0f15603c +/* f1a4e04: 0fc5580f */ jal textRenderWhite /* f1a4e08: afad001c */ sw $t5,0x1c($sp) /* f1a4e0c: 8fb90140 */ lw $t9,0x140($sp) /* f1a4e10: afa2015c */ sw $v0,0x15c($sp) @@ -1621,7 +1621,7 @@ glabel menuhandler001a44c0 /* f1a4e48: 27a50148 */ addiu $a1,$sp,0x148 /* f1a4e4c: 27a600c0 */ addiu $a2,$sp,0xc0 /* f1a4e50: afa00014 */ sw $zero,0x14($sp) -/* f1a4e54: 0fc55cbe */ jal func0f1572f8 +/* f1a4e54: 0fc55cbe */ jal textMeasure /* f1a4e58: afac0010 */ sw $t4,0x10($sp) /* f1a4e5c: 8e180000 */ lw $t8,0x0($s0) /* f1a4e60: 8faf014c */ lw $t7,0x14c($sp) @@ -1658,7 +1658,7 @@ glabel menuhandler001a44c0 /* f1a4edc: afad0014 */ sw $t5,0x14($sp) /* f1a4ee0: afaf0010 */ sw $t7,0x10($sp) /* f1a4ee4: afb90018 */ sw $t9,0x18($sp) -/* f1a4ee8: 0fc5580f */ jal func0f15603c +/* f1a4ee8: 0fc5580f */ jal textRenderWhite /* f1a4eec: afae001c */ sw $t6,0x1c($sp) /* f1a4ef0: 8fac0140 */ lw $t4,0x140($sp) /* f1a4ef4: afa2015c */ sw $v0,0x15c($sp) @@ -1700,7 +1700,7 @@ glabel menuhandler001a44c0 /* f1a4f84: afb80014 */ sw $t8,0x14($sp) /* f1a4f88: afac0010 */ sw $t4,0x10($sp) /* f1a4f8c: afaf0018 */ sw $t7,0x18($sp) -/* f1a4f90: 0fc5580f */ jal func0f15603c +/* f1a4f90: 0fc5580f */ jal textRenderWhite /* f1a4f94: afad001c */ sw $t5,0x1c($sp) /* f1a4f98: afa2015c */ sw $v0,0x15c($sp) /* f1a4f9c: 0fc5b9f1 */ jal langGet @@ -1741,7 +1741,7 @@ glabel menuhandler001a44c0 /* f1a5028: afb90014 */ sw $t9,0x14($sp) /* f1a502c: afad0010 */ sw $t5,0x10($sp) /* f1a5030: afae0018 */ sw $t6,0x18($sp) -/* f1a5034: 0fc5580f */ jal func0f15603c +/* f1a5034: 0fc5580f */ jal textRenderWhite /* f1a5038: afac001c */ sw $t4,0x1c($sp) /* f1a503c: 8fb80140 */ lw $t8,0x140($sp) /* f1a5040: afa2015c */ sw $v0,0x15c($sp) @@ -1761,7 +1761,7 @@ glabel menuhandler001a44c0 /* f1a5078: 27a50148 */ addiu $a1,$sp,0x148 /* f1a507c: 27a600c0 */ addiu $a2,$sp,0xc0 /* f1a5080: afa00014 */ sw $zero,0x14($sp) -/* f1a5084: 0fc55cbe */ jal func0f1572f8 +/* f1a5084: 0fc55cbe */ jal textMeasure /* f1a5088: afad0010 */ sw $t5,0x10($sp) /* f1a508c: 8e190000 */ lw $t9,0x0($s0) /* f1a5090: 8fae014c */ lw $t6,0x14c($sp) @@ -1798,7 +1798,7 @@ glabel menuhandler001a44c0 /* f1a510c: afac0014 */ sw $t4,0x14($sp) /* f1a5110: afae0010 */ sw $t6,0x10($sp) /* f1a5114: afb80018 */ sw $t8,0x18($sp) -/* f1a5118: 0fc5580f */ jal func0f15603c +/* f1a5118: 0fc5580f */ jal textRenderWhite /* f1a511c: afaf001c */ sw $t7,0x1c($sp) /* f1a5120: 8fad0140 */ lw $t5,0x140($sp) /* f1a5124: afa2015c */ sw $v0,0x15c($sp) @@ -1840,7 +1840,7 @@ glabel menuhandler001a44c0 /* f1a51b4: afb90014 */ sw $t9,0x14($sp) /* f1a51b8: afad0010 */ sw $t5,0x10($sp) /* f1a51bc: afae0018 */ sw $t6,0x18($sp) -/* f1a51c0: 0fc5580f */ jal func0f15603c +/* f1a51c0: 0fc5580f */ jal textRenderWhite /* f1a51c4: afac001c */ sw $t4,0x1c($sp) /* f1a51c8: afa2015c */ sw $v0,0x15c($sp) /* f1a51cc: 0fc5b9f1 */ jal langGet @@ -1881,7 +1881,7 @@ glabel menuhandler001a44c0 /* f1a5258: afb80014 */ sw $t8,0x14($sp) /* f1a525c: afac0010 */ sw $t4,0x10($sp) /* f1a5260: afaf0018 */ sw $t7,0x18($sp) -/* f1a5264: 0fc5580f */ jal func0f15603c +/* f1a5264: 0fc5580f */ jal textRenderWhite /* f1a5268: afad001c */ sw $t5,0x1c($sp) /* f1a526c: 8fb90140 */ lw $t9,0x140($sp) /* f1a5270: afa2015c */ sw $v0,0x15c($sp) @@ -1900,7 +1900,7 @@ glabel menuhandler001a44c0 /* f1a52a4: 27a50148 */ addiu $a1,$sp,0x148 /* f1a52a8: 27a600c0 */ addiu $a2,$sp,0xc0 /* f1a52ac: afa00014 */ sw $zero,0x14($sp) -/* f1a52b0: 0fc55cbe */ jal func0f1572f8 +/* f1a52b0: 0fc55cbe */ jal textMeasure /* f1a52b4: afac0010 */ sw $t4,0x10($sp) /* f1a52b8: 8e180000 */ lw $t8,0x0($s0) /* f1a52bc: 8faf014c */ lw $t7,0x14c($sp) @@ -1937,7 +1937,7 @@ glabel menuhandler001a44c0 /* f1a5338: afad0014 */ sw $t5,0x14($sp) /* f1a533c: afaf0010 */ sw $t7,0x10($sp) /* f1a5340: afb90018 */ sw $t9,0x18($sp) -/* f1a5344: 0fc5580f */ jal func0f15603c +/* f1a5344: 0fc5580f */ jal textRenderWhite /* f1a5348: afae001c */ sw $t6,0x1c($sp) /* f1a534c: 8fac0140 */ lw $t4,0x140($sp) /* f1a5350: afa2015c */ sw $v0,0x15c($sp) @@ -1979,7 +1979,7 @@ glabel menuhandler001a44c0 /* f1a53e0: afb80014 */ sw $t8,0x14($sp) /* f1a53e4: afac0010 */ sw $t4,0x10($sp) /* f1a53e8: afaf0018 */ sw $t7,0x18($sp) -/* f1a53ec: 0fc5580f */ jal func0f15603c +/* f1a53ec: 0fc5580f */ jal textRenderWhite /* f1a53f0: afad001c */ sw $t5,0x1c($sp) /* f1a53f4: afa2015c */ sw $v0,0x15c($sp) /* f1a53f8: 0fc5b9f1 */ jal langGet @@ -2022,7 +2022,7 @@ glabel menuhandler001a44c0 /* f1a548c: afae0014 */ sw $t6,0x14($sp) /* f1a5490: afb90010 */ sw $t9,0x10($sp) /* f1a5494: afac0018 */ sw $t4,0x18($sp) -/* f1a5498: 0fc5580f */ jal func0f15603c +/* f1a5498: 0fc5580f */ jal textRenderWhite /* f1a549c: afb8001c */ sw $t8,0x1c($sp) /* f1a54a0: 8faf0140 */ lw $t7,0x140($sp) /* f1a54a4: afa2015c */ sw $v0,0x15c($sp) @@ -2039,7 +2039,7 @@ glabel menuhandler001a44c0 /* f1a54d0: 27a50148 */ addiu $a1,$sp,0x148 /* f1a54d4: 27a600c0 */ addiu $a2,$sp,0xc0 /* f1a54d8: afa00014 */ sw $zero,0x14($sp) -/* f1a54dc: 0fc55cbe */ jal func0f1572f8 +/* f1a54dc: 0fc55cbe */ jal textMeasure /* f1a54e0: afad0010 */ sw $t5,0x10($sp) /* f1a54e4: 8e190000 */ lw $t9,0x0($s0) /* f1a54e8: 8fae014c */ lw $t6,0x14c($sp) @@ -2076,7 +2076,7 @@ glabel menuhandler001a44c0 /* f1a5564: afac0014 */ sw $t4,0x14($sp) /* f1a5568: afae0010 */ sw $t6,0x10($sp) /* f1a556c: afb80018 */ sw $t8,0x18($sp) -/* f1a5570: 0fc5580f */ jal func0f15603c +/* f1a5570: 0fc5580f */ jal textRenderWhite /* f1a5574: afaf001c */ sw $t7,0x1c($sp) /* f1a5578: afa2015c */ sw $v0,0x15c($sp) /* f1a557c: 0fc5b9f1 */ jal langGet @@ -2117,7 +2117,7 @@ glabel menuhandler001a44c0 /* f1a5608: afad0014 */ sw $t5,0x14($sp) /* f1a560c: afaf0010 */ sw $t7,0x10($sp) /* f1a5610: afb90018 */ sw $t9,0x18($sp) -/* f1a5614: 0fc5580f */ jal func0f15603c +/* f1a5614: 0fc5580f */ jal textRenderWhite /* f1a5618: afae001c */ sw $t6,0x1c($sp) /* f1a561c: 8fac0140 */ lw $t4,0x140($sp) /* f1a5620: afa2015c */ sw $v0,0x15c($sp) @@ -2140,7 +2140,7 @@ glabel menuhandler001a44c0 /* f1a5664: 27a50148 */ addiu $a1,$sp,0x148 /* f1a5668: 27a600c0 */ addiu $a2,$sp,0xc0 /* f1a566c: afa00014 */ sw $zero,0x14($sp) -/* f1a5670: 0fc55cbe */ jal func0f1572f8 +/* f1a5670: 0fc55cbe */ jal textMeasure /* f1a5674: afaf0010 */ sw $t7,0x10($sp) /* f1a5678: 8e0d0000 */ lw $t5,0x0($s0) /* f1a567c: 8fb9014c */ lw $t9,0x14c($sp) @@ -2177,7 +2177,7 @@ glabel menuhandler001a44c0 /* f1a56f8: afac0014 */ sw $t4,0x14($sp) /* f1a56fc: afb90010 */ sw $t9,0x10($sp) /* f1a5700: afae0018 */ sw $t6,0x18($sp) -/* f1a5704: 0fc5580f */ jal func0f15603c +/* f1a5704: 0fc5580f */ jal textRenderWhite /* f1a5708: afb8001c */ sw $t8,0x1c($sp) /* f1a570c: afa2015c */ sw $v0,0x15c($sp) /* f1a5710: 0fc5b9f1 */ jal langGet @@ -2218,7 +2218,7 @@ glabel menuhandler001a44c0 /* f1a579c: afaf0014 */ sw $t7,0x14($sp) /* f1a57a0: afb80010 */ sw $t8,0x10($sp) /* f1a57a4: afad0018 */ sw $t5,0x18($sp) -/* f1a57a8: 0fc5580f */ jal func0f15603c +/* f1a57a8: 0fc5580f */ jal textRenderWhite /* f1a57ac: afb9001c */ sw $t9,0x1c($sp) /* f1a57b0: afa2015c */ sw $v0,0x15c($sp) /* f1a57b4: 0fc5b9f1 */ jal langGet @@ -2265,7 +2265,7 @@ glabel menuhandler001a44c0 /* f1a5858: 27a50154 */ addiu $a1,$sp,0x154 /* f1a585c: 27a60150 */ addiu $a2,$sp,0x150 /* f1a5860: 27a700c0 */ addiu $a3,$sp,0xc0 -/* f1a5864: 0fc5580f */ jal func0f15603c +/* f1a5864: 0fc5580f */ jal textRenderWhite /* f1a5868: afac001c */ sw $t4,0x1c($sp) /* f1a586c: afa2015c */ sw $v0,0x15c($sp) /* f1a5870: 0fc5b9f1 */ jal langGet @@ -2312,7 +2312,7 @@ glabel menuhandler001a44c0 /* f1a5914: 27a50154 */ addiu $a1,$sp,0x154 /* f1a5918: 27a60150 */ addiu $a2,$sp,0x150 /* f1a591c: 27a700c0 */ addiu $a3,$sp,0xc0 -/* f1a5920: 0fc5580f */ jal func0f15603c +/* f1a5920: 0fc5580f */ jal textRenderWhite /* f1a5924: afae001c */ sw $t6,0x1c($sp) /* f1a5928: afa2015c */ sw $v0,0x15c($sp) /* f1a592c: 0fc5b9f1 */ jal langGet @@ -2359,7 +2359,7 @@ glabel menuhandler001a44c0 /* f1a59d0: 27a50154 */ addiu $a1,$sp,0x154 /* f1a59d4: 27a60150 */ addiu $a2,$sp,0x150 /* f1a59d8: 27a700c0 */ addiu $a3,$sp,0xc0 -/* f1a59dc: 0fc5580f */ jal func0f15603c +/* f1a59dc: 0fc5580f */ jal textRenderWhite /* f1a59e0: afb8001c */ sw $t8,0x1c($sp) /* f1a59e4: afa2015c */ sw $v0,0x15c($sp) /* f1a59e8: 0fc5b9f1 */ jal langGet @@ -2406,7 +2406,7 @@ glabel menuhandler001a44c0 /* f1a5a8c: 27a50154 */ addiu $a1,$sp,0x154 /* f1a5a90: 27a60150 */ addiu $a2,$sp,0x150 /* f1a5a94: 27a700c0 */ addiu $a3,$sp,0xc0 -/* f1a5a98: 0fc5580f */ jal func0f15603c +/* f1a5a98: 0fc5580f */ jal textRenderWhite /* f1a5a9c: afaf001c */ sw $t7,0x1c($sp) /* f1a5aa0: afa2015c */ sw $v0,0x15c($sp) /* f1a5aa4: 0fc54e0e */ jal func0f153838 @@ -3916,7 +3916,7 @@ glabel menuhandler001a6ea4 /* f1a71d4: 27a5009c */ addiu $a1,$sp,0x9c /* f1a71d8: 00403025 */ or $a2,$v0,$zero /* f1a71dc: afa00014 */ sw $zero,0x14($sp) -/* f1a71e0: 0fc55cbe */ jal func0f1572f8 +/* f1a71e0: 0fc55cbe */ jal textMeasure /* f1a71e4: afaa0010 */ sw $t2,0x10($sp) /* f1a71e8: 8fa20094 */ lw $v0,0x94($sp) /* f1a71ec: 2401ffff */ addiu $at,$zero,-1 @@ -3956,7 +3956,7 @@ glabel menuhandler001a6ea4 /* f1a726c: 27a60098 */ addiu $a2,$sp,0x98 /* f1a7270: 8fa70090 */ lw $a3,0x90($sp) /* f1a7274: afae001c */ sw $t6,0x1c($sp) -/* f1a7278: 0fc5580f */ jal func0f15603c +/* f1a7278: 0fc5580f */ jal textRenderWhite /* f1a727c: afab0018 */ sw $t3,0x18($sp) /* f1a7280: afa200a4 */ sw $v0,0xa4($sp) /* f1a7284: 0fc69b31 */ jal func0f1a6cc4 @@ -3970,7 +3970,7 @@ glabel menuhandler001a6ea4 /* f1a72a4: 27a5009c */ addiu $a1,$sp,0x9c /* f1a72a8: 00403025 */ or $a2,$v0,$zero /* f1a72ac: afa00014 */ sw $zero,0x14($sp) -/* f1a72b0: 0fc55cbe */ jal func0f1572f8 +/* f1a72b0: 0fc55cbe */ jal textMeasure /* f1a72b4: afad0010 */ sw $t5,0x10($sp) /* f1a72b8: 8fac0094 */ lw $t4,0x94($sp) /* f1a72bc: 2401ffff */ addiu $at,$zero,-1 @@ -4010,7 +4010,7 @@ glabel menuhandler001a6ea4 /* f1a733c: 27a60098 */ addiu $a2,$sp,0x98 /* f1a7340: 8fa70090 */ lw $a3,0x90($sp) /* f1a7344: afab001c */ sw $t3,0x1c($sp) -/* f1a7348: 0fc5580f */ jal func0f15603c +/* f1a7348: 0fc5580f */ jal textRenderWhite /* f1a734c: afae0018 */ sw $t6,0x18($sp) /* f1a7350: afa200a4 */ sw $v0,0xa4($sp) /* f1a7354: 0fc54de0 */ jal func0f153780 diff --git a/src/game/mplayer.c b/src/game/mplayer.c index 092ed87be..fb9650701 100644 --- a/src/game/mplayer.c +++ b/src/game/mplayer.c @@ -2371,7 +2371,7 @@ glabel func0f18973c /* f189880: 27a5009c */ addiu $a1,$sp,0x9c /* f189884: 27a6005c */ addiu $a2,$sp,0x5c /* f189888: afa00014 */ sw $zero,0x14($sp) -/* f18988c: 0fc55cbe */ jal func0f1572f8 +/* f18988c: 0fc55cbe */ jal textMeasure /* f189890: afa80010 */ sw $t0,0x10($sp) /* f189894: 8faa009c */ lw $t2,0x9c($sp) /* f189898: 8fa90094 */ lw $t1,0x94($sp) @@ -2407,7 +2407,7 @@ glabel func0f18973c /* f18990c: afa0002c */ sw $zero,0x2c($sp) /* f189910: afae0014 */ sw $t6,0x14($sp) /* f189914: afad0010 */ sw $t5,0x10($sp) -/* f189918: 0fc55b92 */ jal func0f156e48 +/* f189918: 0fc55b92 */ jal textRender /* f18991c: afaa0020 */ sw $t2,0x20($sp) /* f189920: 0fc54de0 */ jal func0f153780 /* f189924: 00402025 */ or $a0,$v0,$zero @@ -2505,7 +2505,7 @@ glabel func0f18973c /* f189a7c: 27a5009c */ addiu $a1,$sp,0x9c /* f189a80: 27a6005c */ addiu $a2,$sp,0x5c /* f189a84: afa00014 */ sw $zero,0x14($sp) -/* f189a88: 0fc55cbe */ jal func0f1572f8 +/* f189a88: 0fc55cbe */ jal textMeasure /* f189a8c: afab0010 */ sw $t3,0x10($sp) /* f189a90: 8fad009c */ lw $t5,0x9c($sp) /* f189a94: 8fac0094 */ lw $t4,0x94($sp) @@ -2538,7 +2538,7 @@ glabel func0f18973c /* f189afc: afa0002c */ sw $zero,0x2c($sp) /* f189b00: afb90014 */ sw $t9,0x14($sp) /* f189b04: afb80010 */ sw $t8,0x10($sp) -/* f189b08: 0fc55b92 */ jal func0f156e48 +/* f189b08: 0fc55b92 */ jal textRender /* f189b0c: afa90020 */ sw $t1,0x20($sp) /* f189b10: 3c0b800a */ lui $t3,%hi(g_Vars+0x284) /* f189b14: 8d6ba244 */ lw $t3,%lo(g_Vars+0x284)($t3) @@ -2591,7 +2591,7 @@ glabel func0f18973c /* f189bc8: 27a5009c */ addiu $a1,$sp,0x9c /* f189bcc: 27a6005c */ addiu $a2,$sp,0x5c /* f189bd0: afa00014 */ sw $zero,0x14($sp) -/* f189bd4: 0fc55cbe */ jal func0f1572f8 +/* f189bd4: 0fc55cbe */ jal textMeasure /* f189bd8: afae0010 */ sw $t6,0x10($sp) /* f189bdc: 8fb8009c */ lw $t8,0x9c($sp) /* f189be0: 8faf0048 */ lw $t7,0x48($sp) @@ -2626,7 +2626,7 @@ glabel func0f18973c /* f189c50: afa0002c */ sw $zero,0x2c($sp) /* f189c54: afab0014 */ sw $t3,0x14($sp) /* f189c58: afa90010 */ sw $t1,0x10($sp) -/* f189c5c: 0fc55b92 */ jal func0f156e48 +/* f189c5c: 0fc55b92 */ jal textRender /* f189c60: afae0020 */ sw $t6,0x20($sp) /* f189c64: afa200a0 */ sw $v0,0xa0($sp) .L0f189c68: diff --git a/src/include/game/game_0fd660.h b/src/include/game/game_0fd660.h index 65fc67ff0..54c36fd81 100644 --- a/src/include/game/game_0fd660.h +++ b/src/include/game/game_0fd660.h @@ -10,7 +10,7 @@ s32 activemenuGetFirstBuddyIndex(void); void activemenuApply(s32 slot); void activemenuGetSlotDetails(s32 slot, u32 *flags, char *dst); void func0f0fe848(void); -s16 func0f0fea14(void); +s16 activemenuCalculateSlotWidth(void); void activemenuChangeScreen(s32 step); u32 func0f0fecd4(void); void activemenuOpen(void); diff --git a/src/include/game/game_1531a0.h b/src/include/game/game_1531a0.h index 94888053b..cebcdf957 100644 --- a/src/include/game/game_1531a0.h +++ b/src/include/game/game_1531a0.h @@ -38,12 +38,12 @@ u32 func0f1552d4(void); u32 func0f15568c(void); u32 func0f156024(void); u32 func0f156030(void); -u32 func0f15603c(void); +Gfx *textRenderWhite(Gfx *gdl, s32 *x, s32 *y, char *text, u32 arg4, u32 arg5, s32 arg6, s16 arg7, s16 arg8, u32 arg9, u32 arg10); u32 func0f1566cc(void); u32 func0f156790(void); u32 func0f156a24(void); -u32 func0f156e48(void); -void func0f1572f8(u32 *arg0, s32 *arg1, char *label, u32 arg3, u32 arg4, u32 arg5); +Gfx *textRender(Gfx *gdl, s32 *x, s32 *y, char *text, u32 arg4, u32 arg5, s32 arg6, u32 colour, s16 arg8, s16 arg9, u32 arg10, u32 arg11); +void textMeasure(s32 *textheight, s32 *textwidth, char *text, u32 arg3, u32 arg4, u32 arg5); void func0f157520(s32 arg0, char *arg1, char *arg2, u32 arg3, u32 arg4); u32 func0f1577f0(void); u32 func0f1578c8(void); diff --git a/src/include/lib/lib_09660.h b/src/include/lib/lib_09660.h index 93ebee806..f4e3887f9 100644 --- a/src/include/lib/lib_09660.h +++ b/src/include/lib/lib_09660.h @@ -39,8 +39,8 @@ void func0000bba0(s16 arg0, s16 arg1); u32 func0000bbc4(void); u32 func0000bbd4(void); void func0000bbe4(s16 arg0, s16 arg1); -s32 func0000bc08(void); -s32 func0000bc18(void); +s16 func0000bc08(void); +s16 func0000bc18(void); void func0000bc28(s16 arg0, s16 arg1); s16 func0000bc88(void); s16 func0000bc98(void); diff --git a/src/include/lib/lib_13900.h b/src/include/lib/lib_13900.h index e15ac0052..71c274bab 100644 --- a/src/include/lib/lib_13900.h +++ b/src/include/lib/lib_13900.h @@ -17,7 +17,7 @@ u32 func00013c94(void); u32 func00013dd4(void); u32 func00013dfc(void); u32 func00013e84(void); -u32 func0001404c(void); +u32 getConnectedControllers(void); u32 func00014058(void); u32 func00014238(void); u32 func000142f0(void); diff --git a/src/include/types.h b/src/include/types.h index d9c4feaef..ff4b98211 100644 --- a/src/include/types.h +++ b/src/include/types.h @@ -4358,7 +4358,7 @@ struct trainingdata { struct activemenuthing { /*0x00*/ s8 screenindex; /*0x02*/ u16 unk02; - /*0x04*/ s16 unk04; + /*0x04*/ s16 slotwidth; /*0x06*/ u16 unk06; /*0x08*/ u16 unk08; /*0x0a*/ s16 unk0a; diff --git a/src/lib/lib_13900.c b/src/lib/lib_13900.c index a75f03093..a1a90e3eb 100644 --- a/src/lib/lib_13900.c +++ b/src/lib/lib_13900.c @@ -598,7 +598,7 @@ glabel func00013e84 ); GLOBAL_ASM( -glabel func0001404c +glabel getConnectedControllers /* 1404c: 3c028006 */ lui $v0,%hi(var8005eeac) /* 14050: 03e00008 */ jr $ra /* 14054: 9042eeac */ lbu $v0,%lo(var8005eeac)($v0)