mirror/perfect-dark
1
0
Fork 0
mirror of https://gitlab.com/ryandwyer/perfect-dark synced 2026-07-26 22:31:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

Rename some menu symbols

Browse Source
This commit is contained in:
Ryan Dwyer
2020-10-06 20:59:59 +10:00
parent 3615d6c7f9
commit 33917dffaa
16 changed files with 569 additions and 587 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/game_097ba0.c
+2 -2
View File
@@ -22936,7 +22936,7 @@ glabel hudRenderAmmo
/* f0aaf98: afa00028 */ sw $zero,0x28($sp)
/* f0aaf9c: afb80014 */ sw $t8,0x14($sp)
/* f0aafa0: afb90018 */ sw $t9,0x18($sp)
/* f0aafa4: 0fc5580f */ jal textRenderWhite
/* f0aafa4: 0fc5580f */ jal textRenderProjected
/* f0aafa8: afae001c */ sw $t6,0x1c($sp)
/* f0aafac: 0fc54f93 */ jal func0f153e4c
/* f0aafb0: afa20130 */ sw $v0,0x130($sp)
@@ -23136,7 +23136,7 @@ glabel hudRenderAmmo
/* f0ab290: afa00028 */ sw $zero,0x28($sp)
/* f0ab294: afae0014 */ sw $t6,0x14($sp)
/* f0ab298: afb80018 */ sw $t8,0x18($sp)
/* f0ab29c: 0fc5580f */ jal textRenderWhite
/* f0ab29c: 0fc5580f */ jal textRenderProjected
/* f0ab2a0: afb9001c */ sw $t9,0x1c($sp)
/* f0ab2a4: 0fc54f93 */ jal func0f153e4c
/* f0ab2a8: afa20130 */ sw $v0,0x130($sp)
src/game/game_0dcdb0.c
+6 -6
View File
@@ -4059,7 +4059,7 @@ glabel var7f1adef4
/* f0e005c: afb30018 */ sw $s3,0x18($sp)
/* f0e0060: 02e03025 */ or $a2,$s7,$zero
/* f0e0064: 26070020 */ addiu $a3,$s0,0x20
/* f0e0068: 0fc5580f */ jal textRenderWhite
/* f0e0068: 0fc5580f */ jal textRenderProjected
/* f0e006c: afac0014 */ sw $t4,0x14($sp)
/* f0e0070: 1000001f */ b .L0f0e00f0
/* f0e0074: 00409025 */ or $s2,$v0,$zero
@@ -4162,7 +4162,7 @@ glabel var7f1adef4
/* f0e01e4: afb30018 */ sw $s3,0x18($sp)
/* f0e01e8: 02e03025 */ or $a2,$s7,$zero
/* f0e01ec: 26070020 */ addiu $a3,$s0,0x20
/* f0e01f0: 0fc5580f */ jal textRenderWhite
/* f0e01f0: 0fc5580f */ jal textRenderProjected
/* f0e01f4: afaf0014 */ sw $t7,0x14($sp)
/* f0e01f8: 10000021 */ b .L0f0e0280
/* f0e01fc: 00409025 */ or $s2,$v0,$zero
@@ -4327,7 +4327,7 @@ glabel var7f1adef4
/* f0e0458: afb30018 */ sw $s3,0x18($sp)
/* f0e045c: 02e03025 */ or $a2,$s7,$zero
/* f0e0460: 26070020 */ addiu $a3,$s0,0x20
/* f0e0464: 0fc5580f */ jal textRenderWhite
/* f0e0464: 0fc5580f */ jal textRenderProjected
/* f0e0468: afa80014 */ sw $t0,0x14($sp)
/* f0e046c: 1000001e */ b .L0f0e04e8
/* f0e0470: 00409025 */ or $s2,$v0,$zero
@@ -4653,7 +4653,7 @@ glabel var7f1adef4
// // fe0
// gdl = hudRenderMessageBox(gdl, x - 3, y - 3, x + msg->width + 2, y + msg->height + 2, 1.0f, bordercolour, spc0);
// // 020
// gdl = textRenderWhite(gdl, &x, &y, msg->text, msg->font1, msg->font2, textcolour, viGetX(), viGetY(), 0, 0);
// gdl = textRenderProjected(gdl, &x, &y, msg->text, msg->font1, msg->font2, textcolour, viGetX(), viGetY(), 0, 0);
// } else {
// // 078
// gdl = func0f153a34(gdl, x, y, x + msg->width, y + msg->height, 0);
@@ -4680,7 +4680,7 @@ glabel var7f1adef4
// // 1a0
// gdl = hudRenderMessageBox(gdl, x - 3, y - 3, x + msg->width + 2, y + msg->height + 2, 1.0f, bordercolour, 1.0f);
// // 1f0
// gdl = textRenderWhite(gdl, &x, &y, msg->text, msg->font1, msg->font2, textcolour, viGetX(), viGetY(), 0, 0);
// gdl = textRenderProjected(gdl, &x, &y, msg->text, msg->font1, msg->font2, textcolour, viGetX(), viGetY(), 0, 0);
// } else {
// // 200
// gdl = func0f153a34(gdl, x, y, x + msg->width, y + msg->height, 0);
@@ -4727,7 +4727,7 @@ glabel var7f1adef4
// // 414
// gdl = hudRenderMessageBox(gdl, x - 3, y - 3, x + msg->width + 2, y + msg->height + 2, 1.0f, bordercolour, 1.0f - spa8);
// // 464
// gdl = textRenderWhite(gdl, &x, &y, msg->text, msg->font1, msg->font2, textcolour, viGetX(), viGetY(), 0, 0);
// gdl = textRenderProjected(gdl, &x, &y, msg->text, msg->font1, msg->font2, textcolour, viGetX(), viGetY(), 0, 0);
// } else {
// // 474
// gdl = func0f153a34(gdl, x, y, x + msg->width, y + msg->height, 0);
src/game/game_0e5ce0.c
+438 -438
View File
File diff suppressed because it is too large Load Diff
src/game/game_0f09f0.c
+12 -12
View File
@@ -468,7 +468,7 @@ glabel func0f0f0ce8
/* f0f10b0: afa00024 */ sw $zero,0x24($sp)
/* f0f10b4: afa00028 */ sw $zero,0x28($sp)
/* f0f10b8: afb90010 */ sw $t9,0x10($sp)
/* f0f10bc: 0fc5580f */ jal textRenderWhite
/* f0f10bc: 0fc5580f */ jal textRenderProjected
/* f0f10c0: afb80014 */ sw $t8,0x14($sp)
/* f0f10c4: 8faa0070 */ lw $t2,0x70($sp)
/* f0f10c8: 8fa90044 */ lw $t1,0x44($sp)
@@ -505,7 +505,7 @@ glabel func0f0f0ce8
/* f0f1140: afa00024 */ sw $zero,0x24($sp)
/* f0f1144: afa00028 */ sw $zero,0x28($sp)
/* f0f1148: afb90010 */ sw $t9,0x10($sp)
/* f0f114c: 0fc5580f */ jal textRenderWhite
/* f0f114c: 0fc5580f */ jal textRenderProjected
/* f0f1150: afb80014 */ sw $t8,0x14($sp)
/* f0f1154: 8fa90078 */ lw $t1,0x78($sp)
/* f0f1158: 8faa0044 */ lw $t2,0x44($sp)
@@ -542,7 +542,7 @@ glabel func0f0f0ce8
/* f0f11d0: afa00024 */ sw $zero,0x24($sp)
/* f0f11d4: afa00028 */ sw $zero,0x28($sp)
/* f0f11d8: afb90010 */ sw $t9,0x10($sp)
/* f0f11dc: 0fc5580f */ jal textRenderWhite
/* f0f11dc: 0fc5580f */ jal textRenderProjected
/* f0f11e0: afb80014 */ sw $t8,0x14($sp)
/* f0f11e4: 8faa0070 */ lw $t2,0x70($sp)
/* f0f11e8: 8fa60084 */ lw $a2,0x84($sp)
@@ -579,7 +579,7 @@ glabel func0f0f0ce8
/* f0f1260: afa00024 */ sw $zero,0x24($sp)
/* f0f1264: afa00028 */ sw $zero,0x28($sp)
/* f0f1268: afae0010 */ sw $t6,0x10($sp)
/* f0f126c: 0fc5580f */ jal textRenderWhite
/* f0f126c: 0fc5580f */ jal textRenderProjected
/* f0f1270: afb90014 */ sw $t9,0x14($sp)
/* f0f1274: 8fab0040 */ lw $t3,0x40($sp)
/* f0f1278: 8fa60080 */ lw $a2,0x80($sp)
@@ -621,7 +621,7 @@ glabel func0f0f0ce8
/* f0f1304: afa00024 */ sw $zero,0x24($sp)
/* f0f1308: afa00028 */ sw $zero,0x28($sp)
/* f0f130c: afab0014 */ sw $t3,0x14($sp)
/* f0f1310: 0fc5580f */ jal textRenderWhite
/* f0f1310: 0fc5580f */ jal textRenderProjected
/* f0f1314: afb80010 */ sw $t8,0x10($sp)
/* f0f1318: 00408825 */ or $s1,$v0,$zero
.L0f0f131c:
@@ -5584,7 +5584,7 @@ glabel func0f0f5360
/* f0f5c88: afa00028 */ sw $zero,0x28($sp)
/* f0f5c8c: afb80010 */ sw $t8,0x10($sp)
/* f0f5c90: afb90014 */ sw $t9,0x14($sp)
/* f0f5c94: 0fc5580f */ jal textRenderWhite
/* f0f5c94: 0fc5580f */ jal textRenderProjected
/* f0f5c98: afae001c */ sw $t6,0x1c($sp)
/* f0f5c9c: afa201e8 */ sw $v0,0x1e8($sp)
/* f0f5ca0: afb201d0 */ sw $s2,0x1d0($sp)
@@ -5604,7 +5604,7 @@ glabel func0f0f5360
/* f0f5cd8: afab0010 */ sw $t3,0x10($sp)
/* f0f5cdc: afac0014 */ sw $t4,0x14($sp)
/* f0f5ce0: afb80018 */ sw $t8,0x18($sp)
/* f0f5ce4: 0fc5580f */ jal textRenderWhite
/* f0f5ce4: 0fc5580f */ jal textRenderProjected
/* f0f5ce8: afb9001c */ sw $t9,0x1c($sp)
/* f0f5cec: 3c03800a */ lui $v1,%hi(g_MenuData+0x4)
/* f0f5cf0: 8c6319c4 */ lw $v1,%lo(g_MenuData+0x4)($v1)
@@ -5642,7 +5642,7 @@ glabel func0f0f5360
/* f0f5d6c: afab0010 */ sw $t3,0x10($sp)
/* f0f5d70: afac0014 */ sw $t4,0x14($sp)
/* f0f5d74: afb80018 */ sw $t8,0x18($sp)
/* f0f5d78: 0fc5580f */ jal textRenderWhite
/* f0f5d78: 0fc5580f */ jal textRenderProjected
/* f0f5d7c: afb9001c */ sw $t9,0x1c($sp)
/* f0f5d80: afa201e8 */ sw $v0,0x1e8($sp)
.L0f0f5d84:
@@ -7131,7 +7131,7 @@ glabel func0f0f5360
/* f0f7360: afa00028 */ sw $zero,0x28($sp)
/* f0f7364: afab0010 */ sw $t3,0x10($sp)
/* f0f7368: afb80014 */ sw $t8,0x14($sp)
/* f0f736c: 0fc5580f */ jal textRenderWhite
/* f0f736c: 0fc5580f */ jal textRenderProjected
/* f0f7370: afaf001c */ sw $t7,0x1c($sp)
/* f0f7374: afa201e8 */ sw $v0,0x1e8($sp)
/* f0f7378: 82230015 */ lb $v1,0x15($s1)
@@ -7192,7 +7192,7 @@ glabel func0f0f5360
/* f0f7448: afa00028 */ sw $zero,0x28($sp)
/* f0f744c: afb90010 */ sw $t9,0x10($sp)
/* f0f7450: afae0014 */ sw $t6,0x14($sp)
/* f0f7454: 0fc5580f */ jal textRenderWhite
/* f0f7454: 0fc5580f */ jal textRenderProjected
/* f0f7458: afb8001c */ sw $t8,0x1c($sp)
/* f0f745c: 0fc54de0 */ jal func0f153780
/* f0f7460: 00402025 */ or $a0,$v0,$zero
@@ -13065,7 +13065,7 @@ glabel var7f1b2afc
/* f0fc600: afa00024 */ sw $zero,0x24($sp)
/* f0fc604: afa00028 */ sw $zero,0x28($sp)
/* f0fc608: afaa0014 */ sw $t2,0x14($sp)
/* f0fc60c: 0fc5580f */ jal textRenderWhite
/* f0fc60c: 0fc5580f */ jal textRenderProjected
/* f0fc610: afac0010 */ sw $t4,0x10($sp)
/* f0fc614: 8ece0490 */ lw $t6,0x490($s6)
/* f0fc618: 24010002 */ addiu $at,$zero,0x2
@@ -13121,7 +13121,7 @@ glabel var7f1b2afc
/* f0fc6d8: afa00028 */ sw $zero,0x28($sp)
/* f0fc6dc: afad0014 */ sw $t5,0x14($sp)
/* f0fc6e0: afab0010 */ sw $t3,0x10($sp)
/* f0fc6e4: 0fc5580f */ jal textRenderWhite
/* f0fc6e4: 0fc5580f */ jal textRenderProjected
/* f0fc6e8: afa30018 */ sw $v1,0x18($sp)
/* f0fc6ec: 0040a825 */ or $s5,$v0,$zero
.L0f0fc6f0:
src/game/game_0fd660.c
+2 -2
View File
@@ -468,7 +468,7 @@ glabel var7f1b2cd8
/* f0fdc30: afb8001c */ sw $t8,0x1c($sp)
/* f0fdc34: afaf0014 */ sw $t7,0x14($sp)
/* f0fdc38: afb90010 */ sw $t9,0x10($sp)
/* f0fdc3c: 0fc5580f */ jal textRenderWhite
/* f0fdc3c: 0fc5580f */ jal textRenderProjected
/* f0fdc40: afae0018 */ sw $t6,0x18($sp)
/* f0fdc44: 0fc54de0 */ jal func0f153780
/* f0fdc48: 00402025 */ or $a0,$v0,$zero
@@ -1722,7 +1722,7 @@ glabel func0f0ff6f4
/* f0ff798: afa00028 */ sw $zero,0x28($sp)
/* f0ff79c: afac0014 */ sw $t4,0x14($sp)
/* f0ff7a0: afab0010 */ sw $t3,0x10($sp)
/* f0ff7a4: 0fc5580f */ jal textRenderWhite
/* f0ff7a4: 0fc5580f */ jal textRenderProjected
/* f0ff7a8: afad0018 */ sw $t5,0x18($sp)
/* f0ff7ac: 8fbf0034 */ lw $ra,0x34($sp)
/* f0ff7b0: 27bd0048 */ addiu $sp,$sp,0x48
src/game/game_102240.c
+2 -2
View File
@@ -2594,7 +2594,7 @@ glabel var7f1b2dfc
/* f1054d8: 27a50130 */ addiu $a1,$sp,0x130
/* f1054dc: 27a6012c */ addiu $a2,$sp,0x12c
/* f1054e0: 27a700f0 */ addiu $a3,$sp,0xf0
/* f1054e4: 0fc5580f */ jal textRenderWhite
/* f1054e4: 0fc5580f */ jal textRenderProjected
/* f1054e8: afb80018 */ sw $t8,0x18($sp)
/* f1054ec: 8faf004c */ lw $t7,0x4c($sp)
/* f1054f0: afa20138 */ sw $v0,0x138($sp)
@@ -2625,7 +2625,7 @@ glabel var7f1b2dfc
/* f105554: 27a50130 */ addiu $a1,$sp,0x130
/* f105558: 27a6012c */ addiu $a2,$sp,0x12c
/* f10555c: 27a700f0 */ addiu $a3,$sp,0xf0
/* f105560: 0fc5580f */ jal textRenderWhite
/* f105560: 0fc5580f */ jal textRenderProjected
/* f105564: afaf0018 */ sw $t7,0x18($sp)
/* f105568: afa20138 */ sw $v0,0x138($sp)
/* f10556c: 0fc54de0 */ jal func0f153780
src/game/game_107fb0.c
+10 -10
View File
@@ -3212,7 +3212,7 @@ glabel var7f1b37a8
/* f10acec: afa00024 */ sw $zero,0x24($sp)
/* f10acf0: afad0014 */ sw $t5,0x14($sp)
/* f10acf4: afac0010 */ sw $t4,0x10($sp)
/* f10acf8: 0fc5580f */ jal textRenderWhite
/* f10acf8: 0fc5580f */ jal textRenderProjected
/* f10acfc: afae001c */ sw $t6,0x1c($sp)
/* f10ad00: 8fb80070 */ lw $t8,0x70($sp)
/* f10ad04: 00408825 */ or $s1,$v0,$zero
@@ -3673,7 +3673,7 @@ glabel var7f1b37f8
/* f10b364: 27a60150 */ addiu $a2,$sp,0x150
/* f10b368: 27a700d4 */ addiu $a3,$sp,0xd4
/* f10b36c: afb9001c */ sw $t9,0x1c($sp)
/* f10b370: 0fc5580f */ jal textRenderWhite
/* f10b370: 0fc5580f */ jal textRenderProjected
/* f10b374: afb80018 */ sw $t8,0x18($sp)
/* f10b378: 8faa0160 */ lw $t2,0x160($sp)
/* f10b37c: afa2014c */ sw $v0,0x14c($sp)
@@ -3761,7 +3761,7 @@ glabel var7f1b37f8
/* f10b4bc: 27a60150 */ addiu $a2,$sp,0x150
/* f10b4c0: 27a700d4 */ addiu $a3,$sp,0xd4
/* f10b4c4: afae001c */ sw $t6,0x1c($sp)
/* f10b4c8: 0fc5580f */ jal textRenderWhite
/* f10b4c8: 0fc5580f */ jal textRenderProjected
/* f10b4cc: afad0018 */ sw $t5,0x18($sp)
/* f10b4d0: afa2014c */ sw $v0,0x14c($sp)
/* f10b4d4: 8e180000 */ lw $t8,0x0($s0)
@@ -3790,7 +3790,7 @@ glabel var7f1b37f8
/* f10b530: 27a60150 */ addiu $a2,$sp,0x150
/* f10b534: 27a70098 */ addiu $a3,$sp,0x98
/* f10b538: afad001c */ sw $t5,0x1c($sp)
/* f10b53c: 0fc5580f */ jal textRenderWhite
/* f10b53c: 0fc5580f */ jal textRenderProjected
/* f10b540: afac0018 */ sw $t4,0x18($sp)
/* f10b544: 3c0f8008 */ lui $t7,%hi(var8007fb0c)
/* f10b548: 8deffb0c */ lw $t7,%lo(var8007fb0c)($t7)
@@ -3833,7 +3833,7 @@ glabel var7f1b37f8
/* f10b5dc: 27a60150 */ addiu $a2,$sp,0x150
/* f10b5e0: 27a7005c */ addiu $a3,$sp,0x5c
/* f10b5e4: afb9001c */ sw $t9,0x1c($sp)
/* f10b5e8: 0fc5580f */ jal textRenderWhite
/* f10b5e8: 0fc5580f */ jal textRenderProjected
/* f10b5ec: afb80018 */ sw $t8,0x18($sp)
/* f10b5f0: 1000001c */ b .L0f10b664
/* f10b5f4: 8fbf003c */ lw $ra,0x3c($sp)
@@ -4628,7 +4628,7 @@ glabel var7f1b385c
/* f10c3a8: 27a50144 */ addiu $a1,$sp,0x144
/* f10c3ac: 27a60140 */ addiu $a2,$sp,0x140
/* f10c3b0: 8fa70058 */ lw $a3,0x58($sp)
/* f10c3b4: 0fc5580f */ jal textRenderWhite
/* f10c3b4: 0fc5580f */ jal textRenderProjected
/* f10c3b8: afb90018 */ sw $t9,0x18($sp)
/* f10c3bc: 100000c8 */ b .L0f10c6e0
/* f10c3c0: afa20130 */ sw $v0,0x130($sp)
@@ -4658,7 +4658,7 @@ glabel var7f1b385c
/* f10c41c: 27a50144 */ addiu $a1,$sp,0x144
/* f10c420: 27a60140 */ addiu $a2,$sp,0x140
/* f10c424: 27a70118 */ addiu $a3,$sp,0x118
/* f10c428: 0fc5580f */ jal textRenderWhite
/* f10c428: 0fc5580f */ jal textRenderProjected
/* f10c42c: afb80018 */ sw $t8,0x18($sp)
/* f10c430: 8fa3012c */ lw $v1,0x12c($sp)
/* f10c434: afa20130 */ sw $v0,0x130($sp)
@@ -4727,7 +4727,7 @@ glabel var7f1b385c
/* f10c528: 27a50144 */ addiu $a1,$sp,0x144
/* f10c52c: 27a60140 */ addiu $a2,$sp,0x140
/* f10c530: 27a7009c */ addiu $a3,$sp,0x9c
/* f10c534: 0fc5580f */ jal textRenderWhite
/* f10c534: 0fc5580f */ jal textRenderProjected
/* f10c538: afab0018 */ sw $t3,0x18($sp)
/* f10c53c: 8fb8012c */ lw $t8,0x12c($sp)
/* f10c540: afa20130 */ sw $v0,0x130($sp)
@@ -4797,7 +4797,7 @@ glabel var7f1b385c
/* f10c638: 27a50144 */ addiu $a1,$sp,0x144
/* f10c63c: 27a60140 */ addiu $a2,$sp,0x140
/* f10c640: 27a7009c */ addiu $a3,$sp,0x9c
/* f10c644: 0fc5580f */ jal textRenderWhite
/* f10c644: 0fc5580f */ jal textRenderProjected
/* f10c648: afb80018 */ sw $t8,0x18($sp)
/* f10c64c: 8fad0140 */ lw $t5,0x140($sp)
/* f10c650: 8fae0144 */ lw $t6,0x144($sp)
@@ -4833,7 +4833,7 @@ glabel var7f1b385c
/* f10c6c8: 27a50144 */ addiu $a1,$sp,0x144
/* f10c6cc: 27a60140 */ addiu $a2,$sp,0x140
/* f10c6d0: 27a7009c */ addiu $a3,$sp,0x9c
/* f10c6d4: 0fc5580f */ jal textRenderWhite
/* f10c6d4: 0fc5580f */ jal textRenderProjected
/* f10c6d8: afb90018 */ sw $t9,0x18($sp)
/* f10c6dc: afa20130 */ sw $v0,0x130($sp)
.L0f10c6e0:
src/game/game_141820.c
+5 -5
View File
@@ -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 textRenderWhite
/* f1482e4: 0fc5580f */ jal textRenderProjected
/* 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 textRenderWhite
/* f14837c: 0fc5580f */ jal textRenderProjected
/* 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 textRenderWhite
/* f148414: 0fc5580f */ jal textRenderProjected
/* 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 textRenderWhite
/* f1484cc: 0fc5580f */ jal textRenderProjected
/* 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 textRenderWhite
/* f148574: 0fc5580f */ jal textRenderProjected
/* f148578: afab0010 */ sw $t3,0x10($sp)
/* f14857c: 0fc54de0 */ jal func0f153780
/* f148580: 00402025 */ or $a0,$v0,$zero
src/game/game_1531a0.c
+1 -1
View File
@@ -3054,7 +3054,7 @@ glabel func0f156030
);
GLOBAL_ASM(
glabel textRenderWhite
glabel textRenderProjected
/* f15603c: 27bdff40 */ addiu $sp,$sp,-192
/* f156040: 3c0f8008 */ lui $t7,%hi(var8007fac8)
/* f156044: 8deffac8 */ lw $t7,%lo(var8007fac8)($t7)
src/game/game_179060.c
+2 -2
View File
@@ -1103,7 +1103,7 @@ glabel menuhandler0017a20c
/* f17a320: 27a500b8 */ addiu $a1,$sp,0xb8
/* f17a324: 27a600b4 */ addiu $a2,$sp,0xb4
/* f17a328: 02003825 */ or $a3,$s0,$zero
/* f17a32c: 0fc5580f */ jal textRenderWhite
/* f17a32c: 0fc5580f */ jal textRenderProjected
/* f17a330: afb90018 */ sw $t9,0x18($sp)
/* f17a334: afa200c4 */ sw $v0,0xc4($sp)
/* f17a338: 0fc54de0 */ jal func0f153780
@@ -5270,7 +5270,7 @@ glabel var7f1b8288
/* f17e6b4: 27a500ac */ addiu $a1,$sp,0xac
/* f17e6b8: 27a600a8 */ addiu $a2,$sp,0xa8
/* f17e6bc: 02203825 */ or $a3,$s1,$zero
/* f17e6c0: 0fc5580f */ jal textRenderWhite
/* f17e6c0: 0fc5580f */ jal textRenderProjected
/* f17e6c4: afab0018 */ sw $t3,0x18($sp)
/* f17e6c8: afa200b4 */ sw $v0,0xb4($sp)
/* f17e6cc: 0fc54de0 */ jal func0f153780
src/game/game_1a3340.c
+22 -22
View File
@@ -242,7 +242,7 @@ glabel var7f1b9940
/* f1a363c: 27a60080 */ addiu $a2,$sp,0x80
/* f1a3640: 8fa70044 */ lw $a3,0x44($sp)
/* f1a3644: afaf0018 */ sw $t7,0x18($sp)
/* f1a3648: 0fc5580f */ jal textRenderWhite
/* f1a3648: 0fc5580f */ jal textRenderProjected
/* f1a364c: afb8001c */ sw $t8,0x1c($sp)
/* f1a3650: afa2009c */ sw $v0,0x9c($sp)
/* f1a3654: 0fc54de0 */ jal func0f153780
@@ -1411,7 +1411,7 @@ glabel menuhandler001a44c0
/* f1a4d54: afb90014 */ sw $t9,0x14($sp)
/* f1a4d58: afad0010 */ sw $t5,0x10($sp)
/* f1a4d5c: afae0018 */ sw $t6,0x18($sp)
/* f1a4d60: 0fc5580f */ jal textRenderWhite
/* f1a4d60: 0fc5580f */ jal textRenderProjected
/* f1a4d64: afac001c */ sw $t4,0x1c($sp)
/* f1a4d68: afa2015c */ sw $v0,0x15c($sp)
/* f1a4d6c: 0fc5b9f1 */ jal langGet
@@ -1452,7 +1452,7 @@ glabel menuhandler001a44c0
/* f1a4df8: afb80014 */ sw $t8,0x14($sp)
/* f1a4dfc: afac0010 */ sw $t4,0x10($sp)
/* f1a4e00: afaf0018 */ sw $t7,0x18($sp)
/* f1a4e04: 0fc5580f */ jal textRenderWhite
/* f1a4e04: 0fc5580f */ jal textRenderProjected
/* f1a4e08: afad001c */ sw $t5,0x1c($sp)
/* f1a4e0c: 8fb90140 */ lw $t9,0x140($sp)
/* f1a4e10: afa2015c */ sw $v0,0x15c($sp)
@@ -1509,7 +1509,7 @@ glabel menuhandler001a44c0
/* f1a4edc: afad0014 */ sw $t5,0x14($sp)
/* f1a4ee0: afaf0010 */ sw $t7,0x10($sp)
/* f1a4ee4: afb90018 */ sw $t9,0x18($sp)
/* f1a4ee8: 0fc5580f */ jal textRenderWhite
/* f1a4ee8: 0fc5580f */ jal textRenderProjected
/* f1a4eec: afae001c */ sw $t6,0x1c($sp)
/* f1a4ef0: 8fac0140 */ lw $t4,0x140($sp)
/* f1a4ef4: afa2015c */ sw $v0,0x15c($sp)
@@ -1551,7 +1551,7 @@ glabel menuhandler001a44c0
/* f1a4f84: afb80014 */ sw $t8,0x14($sp)
/* f1a4f88: afac0010 */ sw $t4,0x10($sp)
/* f1a4f8c: afaf0018 */ sw $t7,0x18($sp)
/* f1a4f90: 0fc5580f */ jal textRenderWhite
/* f1a4f90: 0fc5580f */ jal textRenderProjected
/* f1a4f94: afad001c */ sw $t5,0x1c($sp)
/* f1a4f98: afa2015c */ sw $v0,0x15c($sp)
/* f1a4f9c: 0fc5b9f1 */ jal langGet
@@ -1592,7 +1592,7 @@ glabel menuhandler001a44c0
/* f1a5028: afb90014 */ sw $t9,0x14($sp)
/* f1a502c: afad0010 */ sw $t5,0x10($sp)
/* f1a5030: afae0018 */ sw $t6,0x18($sp)
/* f1a5034: 0fc5580f */ jal textRenderWhite
/* f1a5034: 0fc5580f */ jal textRenderProjected
/* f1a5038: afac001c */ sw $t4,0x1c($sp)
/* f1a503c: 8fb80140 */ lw $t8,0x140($sp)
/* f1a5040: afa2015c */ sw $v0,0x15c($sp)
@@ -1649,7 +1649,7 @@ glabel menuhandler001a44c0
/* f1a510c: afac0014 */ sw $t4,0x14($sp)
/* f1a5110: afae0010 */ sw $t6,0x10($sp)
/* f1a5114: afb80018 */ sw $t8,0x18($sp)
/* f1a5118: 0fc5580f */ jal textRenderWhite
/* f1a5118: 0fc5580f */ jal textRenderProjected
/* f1a511c: afaf001c */ sw $t7,0x1c($sp)
/* f1a5120: 8fad0140 */ lw $t5,0x140($sp)
/* f1a5124: afa2015c */ sw $v0,0x15c($sp)
@@ -1691,7 +1691,7 @@ glabel menuhandler001a44c0
/* f1a51b4: afb90014 */ sw $t9,0x14($sp)
/* f1a51b8: afad0010 */ sw $t5,0x10($sp)
/* f1a51bc: afae0018 */ sw $t6,0x18($sp)
/* f1a51c0: 0fc5580f */ jal textRenderWhite
/* f1a51c0: 0fc5580f */ jal textRenderProjected
/* f1a51c4: afac001c */ sw $t4,0x1c($sp)
/* f1a51c8: afa2015c */ sw $v0,0x15c($sp)
/* f1a51cc: 0fc5b9f1 */ jal langGet
@@ -1732,7 +1732,7 @@ glabel menuhandler001a44c0
/* f1a5258: afb80014 */ sw $t8,0x14($sp)
/* f1a525c: afac0010 */ sw $t4,0x10($sp)
/* f1a5260: afaf0018 */ sw $t7,0x18($sp)
/* f1a5264: 0fc5580f */ jal textRenderWhite
/* f1a5264: 0fc5580f */ jal textRenderProjected
/* f1a5268: afad001c */ sw $t5,0x1c($sp)
/* f1a526c: 8fb90140 */ lw $t9,0x140($sp)
/* f1a5270: afa2015c */ sw $v0,0x15c($sp)
@@ -1788,7 +1788,7 @@ glabel menuhandler001a44c0
/* f1a5338: afad0014 */ sw $t5,0x14($sp)
/* f1a533c: afaf0010 */ sw $t7,0x10($sp)
/* f1a5340: afb90018 */ sw $t9,0x18($sp)
/* f1a5344: 0fc5580f */ jal textRenderWhite
/* f1a5344: 0fc5580f */ jal textRenderProjected
/* f1a5348: afae001c */ sw $t6,0x1c($sp)
/* f1a534c: 8fac0140 */ lw $t4,0x140($sp)
/* f1a5350: afa2015c */ sw $v0,0x15c($sp)
@@ -1830,7 +1830,7 @@ glabel menuhandler001a44c0
/* f1a53e0: afb80014 */ sw $t8,0x14($sp)
/* f1a53e4: afac0010 */ sw $t4,0x10($sp)
/* f1a53e8: afaf0018 */ sw $t7,0x18($sp)
/* f1a53ec: 0fc5580f */ jal textRenderWhite
/* f1a53ec: 0fc5580f */ jal textRenderProjected
/* f1a53f0: afad001c */ sw $t5,0x1c($sp)
/* f1a53f4: afa2015c */ sw $v0,0x15c($sp)
/* f1a53f8: 0fc5b9f1 */ jal langGet
@@ -1873,7 +1873,7 @@ glabel menuhandler001a44c0
/* f1a548c: afae0014 */ sw $t6,0x14($sp)
/* f1a5490: afb90010 */ sw $t9,0x10($sp)
/* f1a5494: afac0018 */ sw $t4,0x18($sp)
/* f1a5498: 0fc5580f */ jal textRenderWhite
/* f1a5498: 0fc5580f */ jal textRenderProjected
/* f1a549c: afb8001c */ sw $t8,0x1c($sp)
/* f1a54a0: 8faf0140 */ lw $t7,0x140($sp)
/* f1a54a4: afa2015c */ sw $v0,0x15c($sp)
@@ -1927,7 +1927,7 @@ glabel menuhandler001a44c0
/* f1a5564: afac0014 */ sw $t4,0x14($sp)
/* f1a5568: afae0010 */ sw $t6,0x10($sp)
/* f1a556c: afb80018 */ sw $t8,0x18($sp)
/* f1a5570: 0fc5580f */ jal textRenderWhite
/* f1a5570: 0fc5580f */ jal textRenderProjected
/* f1a5574: afaf001c */ sw $t7,0x1c($sp)
/* f1a5578: afa2015c */ sw $v0,0x15c($sp)
/* f1a557c: 0fc5b9f1 */ jal langGet
@@ -1968,7 +1968,7 @@ glabel menuhandler001a44c0
/* f1a5608: afad0014 */ sw $t5,0x14($sp)
/* f1a560c: afaf0010 */ sw $t7,0x10($sp)
/* f1a5610: afb90018 */ sw $t9,0x18($sp)
/* f1a5614: 0fc5580f */ jal textRenderWhite
/* f1a5614: 0fc5580f */ jal textRenderProjected
/* f1a5618: afae001c */ sw $t6,0x1c($sp)
/* f1a561c: 8fac0140 */ lw $t4,0x140($sp)
/* f1a5620: afa2015c */ sw $v0,0x15c($sp)
@@ -2028,7 +2028,7 @@ glabel menuhandler001a44c0
/* f1a56f8: afac0014 */ sw $t4,0x14($sp)
/* f1a56fc: afb90010 */ sw $t9,0x10($sp)
/* f1a5700: afae0018 */ sw $t6,0x18($sp)
/* f1a5704: 0fc5580f */ jal textRenderWhite
/* f1a5704: 0fc5580f */ jal textRenderProjected
/* f1a5708: afb8001c */ sw $t8,0x1c($sp)
/* f1a570c: afa2015c */ sw $v0,0x15c($sp)
/* f1a5710: 0fc5b9f1 */ jal langGet
@@ -2069,7 +2069,7 @@ glabel menuhandler001a44c0
/* f1a579c: afaf0014 */ sw $t7,0x14($sp)
/* f1a57a0: afb80010 */ sw $t8,0x10($sp)
/* f1a57a4: afad0018 */ sw $t5,0x18($sp)
/* f1a57a8: 0fc5580f */ jal textRenderWhite
/* f1a57a8: 0fc5580f */ jal textRenderProjected
/* f1a57ac: afb9001c */ sw $t9,0x1c($sp)
/* f1a57b0: afa2015c */ sw $v0,0x15c($sp)
/* f1a57b4: 0fc5b9f1 */ jal langGet
@@ -2116,7 +2116,7 @@ glabel menuhandler001a44c0
/* f1a5858: 27a50154 */ addiu $a1,$sp,0x154
/* f1a585c: 27a60150 */ addiu $a2,$sp,0x150
/* f1a5860: 27a700c0 */ addiu $a3,$sp,0xc0
/* f1a5864: 0fc5580f */ jal textRenderWhite
/* f1a5864: 0fc5580f */ jal textRenderProjected
/* f1a5868: afac001c */ sw $t4,0x1c($sp)
/* f1a586c: afa2015c */ sw $v0,0x15c($sp)
/* f1a5870: 0fc5b9f1 */ jal langGet
@@ -2163,7 +2163,7 @@ glabel menuhandler001a44c0
/* f1a5914: 27a50154 */ addiu $a1,$sp,0x154
/* f1a5918: 27a60150 */ addiu $a2,$sp,0x150
/* f1a591c: 27a700c0 */ addiu $a3,$sp,0xc0
/* f1a5920: 0fc5580f */ jal textRenderWhite
/* f1a5920: 0fc5580f */ jal textRenderProjected
/* f1a5924: afae001c */ sw $t6,0x1c($sp)
/* f1a5928: afa2015c */ sw $v0,0x15c($sp)
/* f1a592c: 0fc5b9f1 */ jal langGet
@@ -2210,7 +2210,7 @@ glabel menuhandler001a44c0
/* f1a59d0: 27a50154 */ addiu $a1,$sp,0x154
/* f1a59d4: 27a60150 */ addiu $a2,$sp,0x150
/* f1a59d8: 27a700c0 */ addiu $a3,$sp,0xc0
/* f1a59dc: 0fc5580f */ jal textRenderWhite
/* f1a59dc: 0fc5580f */ jal textRenderProjected
/* f1a59e0: afb8001c */ sw $t8,0x1c($sp)
/* f1a59e4: afa2015c */ sw $v0,0x15c($sp)
/* f1a59e8: 0fc5b9f1 */ jal langGet
@@ -2257,7 +2257,7 @@ glabel menuhandler001a44c0
/* f1a5a8c: 27a50154 */ addiu $a1,$sp,0x154
/* f1a5a90: 27a60150 */ addiu $a2,$sp,0x150
/* f1a5a94: 27a700c0 */ addiu $a3,$sp,0xc0
/* f1a5a98: 0fc5580f */ jal textRenderWhite
/* f1a5a98: 0fc5580f */ jal textRenderProjected
/* f1a5a9c: afaf001c */ sw $t7,0x1c($sp)
/* f1a5aa0: afa2015c */ sw $v0,0x15c($sp)
/* f1a5aa4: 0fc54e0e */ jal func0f153838
@@ -3583,7 +3583,7 @@ glabel menuhandler001a6ea4
/* f1a726c: 27a60098 */ addiu $a2,$sp,0x98
/* f1a7270: 8fa70090 */ lw $a3,0x90($sp)
/* f1a7274: afae001c */ sw $t6,0x1c($sp)
/* f1a7278: 0fc5580f */ jal textRenderWhite
/* f1a7278: 0fc5580f */ jal textRenderProjected
/* f1a727c: afab0018 */ sw $t3,0x18($sp)
/* f1a7280: afa200a4 */ sw $v0,0xa4($sp)
/* f1a7284: 0fc69b31 */ jal ciMenuTextHangarBioSubheading
@@ -3637,7 +3637,7 @@ glabel menuhandler001a6ea4
/* f1a733c: 27a60098 */ addiu $a2,$sp,0x98
/* f1a7340: 8fa70090 */ lw $a3,0x90($sp)
/* f1a7344: afab001c */ sw $t3,0x1c($sp)
/* f1a7348: 0fc5580f */ jal textRenderWhite
/* f1a7348: 0fc5580f */ jal textRenderProjected
/* f1a734c: afae0018 */ sw $t6,0x18($sp)
/* f1a7350: afa200a4 */ sw $v0,0xa4($sp)
/* f1a7354: 0fc54de0 */ jal func0f153780
src/game/title.c
+7 -7
View File
@@ -533,7 +533,7 @@ glabel func0f0165f0
/* f0166c8: afb90010 */ sw $t9,0x10($sp)
/* f0166cc: afa90014 */ sw $t1,0x14($sp)
/* f0166d0: afa80018 */ sw $t0,0x18($sp)
/* f0166d4: 0fc5580f */ jal textRenderWhite
/* f0166d4: 0fc5580f */ jal textRenderProjected
/* f0166d8: afaa001c */ sw $t2,0x1c($sp)
/* f0166dc: 8fbf0034 */ lw $ra,0x34($sp)
/* f0166e0: 27bd0050 */ addiu $sp,$sp,0x50
@@ -946,7 +946,7 @@ glabel var7f1a83e4
/* f016cc8: afb4001c */ sw $s4,0x1c($sp)
/* f016ccc: afa20020 */ sw $v0,0x20($sp)
/* f016cd0: afa00024 */ sw $zero,0x24($sp)
/* f016cd4: 0fc5580f */ jal textRenderWhite
/* f016cd4: 0fc5580f */ jal textRenderProjected
/* f016cd8: afa00028 */ sw $zero,0x28($sp)
/* f016cdc: afa20128 */ sw $v0,0x128($sp)
.L0f016ce0:
@@ -3418,7 +3418,7 @@ glabel func0f018ebc
/* f019028: afa00024 */ sw $zero,0x24($sp)
/* f01902c: afa00028 */ sw $zero,0x28($sp)
/* f019030: afad0014 */ sw $t5,0x14($sp)
/* f019034: 0fc5580f */ jal textRenderWhite
/* f019034: 0fc5580f */ jal textRenderProjected
/* f019038: afac0010 */ sw $t4,0x10($sp)
/* f01903c: 8fa8008c */ lw $t0,0x8c($sp)
/* f019040: 26940001 */ addiu $s4,$s4,0x1
@@ -4575,7 +4575,7 @@ glabel titleRenderNoController
/* f01a668: afa00028 */ sw $zero,0x28($sp)
/* f01a66c: afac0014 */ sw $t4,0x14($sp)
/* f01a670: afaa0010 */ sw $t2,0x10($sp)
/* f01a674: 0fc5580f */ jal textRenderWhite
/* f01a674: 0fc5580f */ jal textRenderProjected
/* f01a678: afae001c */ sw $t6,0x1c($sp)
/* f01a67c: 00408025 */ or $s0,$v0,$zero
.L0f01a680:
@@ -4660,7 +4660,7 @@ glabel titleRenderNoController
/* f01a7b0: afa00028 */ sw $zero,0x28($sp)
/* f01a7b4: afad0014 */ sw $t5,0x14($sp)
/* f01a7b8: afaa0010 */ sw $t2,0x10($sp)
/* f01a7bc: 0fc5580f */ jal textRenderWhite
/* f01a7bc: 0fc5580f */ jal textRenderProjected
/* f01a7c0: afaf001c */ sw $t7,0x1c($sp)
/* f01a7c4: 00408025 */ or $s0,$v0,$zero
.L0f01a7c8:
@@ -4708,7 +4708,7 @@ glabel titleRenderNoController
// gdl = textRender(gdl, &x, &y, text, var8007fb20, var8007fb1c,
// -1, 0x008000ff, viGetX(), viGetY(), 0, 0);
// } else {
// gdl = textRenderWhite(gdl, &x, &y, text, var8007fb20, var8007fb1c,
// gdl = textRenderProjected(gdl, &x, &y, text, var8007fb20, var8007fb1c,
// -1, viGetX(), viGetY(), 0, 0);
// }
//
@@ -4725,7 +4725,7 @@ glabel titleRenderNoController
// } else {
// s16 a = viGetX();
// s16 b = viGetY();
// gdl = textRenderWhite(gdl, &x, &y, text, var8007fb20, var8007fb1c,
// gdl = textRenderProjected(gdl, &x, &y, text, var8007fb20, var8007fb1c,
// -1, a, b, 0, 0);
// }
//
src/include/game/game_0e5ce0.h
+35 -35
View File
@@ -8,74 +8,74 @@ s32 func0f0e5ef8(s16 arg0, struct menuitem *item);
u32 func0f0e6038(void);
Gfx *func0f0e6298(Gfx *gdl, s16 x, s16 y, s16 x2, s16 y2);
Gfx *menuRenderItemList(Gfx *gdl);
bool menuTickItemList(struct menuitem *item, struct menuinputs *inputs, u32 arg2, union menuitemtickdata *data);
bool menuTickItemList(struct menuitem *item, struct menuinputs *inputs, u32 arg2, union menuitemdata *data);
void menuInitItemDropdown(struct menuitem *item, union menuitemtickdata *data);
void menuInitItemDropdown(struct menuitem *item, union menuitemdata *data);
Gfx *menuRenderItemDropdown(Gfx *gdl);
bool menuTickItemDropdown(struct menuitem *item, struct menuframe *frame, struct menuinputs *inputs, u32 arg3, union menuitemtickdata *data);
bool menuTickItemDropdown(struct menuitem *item, struct menuframe *frame, struct menuinputs *inputs, u32 arg3, union menuitemdata *data);
Gfx *func0f0e8290(Gfx *gdl, s16 x, s16 y, s16 x2, s16 y2, struct menuitem *item, u32 arg6, u32 arg7);
bool menuIsStringEmptyOrSpaces(char *text);
Gfx *menuRenderItemKeyboard(Gfx *gdl, struct menurenderthing *thing);
bool menuTickItemKeyboard(struct menuitem *item, struct menuinputs *inputs, u32 arg2, union menuitemtickdata *data);
void menuInitItemKeyboard(struct menuitem *item, union menuitemtickdata *data);
Gfx *menuRenderItemKeyboard(Gfx *gdl, struct menurendercontext *thing);
bool menuTickItemKeyboard(struct menuitem *item, struct menuinputs *inputs, u32 arg2, union menuitemdata *data);
void menuInitItemKeyboard(struct menuitem *item, union menuitemdata *data);
Gfx *menuRenderItemSeparator(Gfx *gdl, struct menurenderthing *thing);
Gfx *menuRenderItemSeparator(Gfx *gdl, struct menurendercontext *context);
Gfx *menuRenderObjective(Gfx *gfx, struct menuframe *frame, s32 index, s32 position, s32 x, s32 y, s32 width, s32 height, s32 arg8, s32 arg9);
Gfx *menuRenderItemObjectives(Gfx *gdl, struct menurenderthing *thing);
Gfx *menuRenderItemObjectives(Gfx *gdl, struct menurendercontext *context);
Gfx *menuRenderItemModel(Gfx *gdl, struct menurenderthing *thing);
Gfx *menuRenderItemModel(Gfx *gdl, struct menurendercontext *context);
Gfx *menuRenderItemLabel(Gfx *gdl, struct menurenderthing *thing);
Gfx *menuRenderItemLabel(Gfx *gdl, struct menurendercontext *context);
Gfx *menuRenderItemMeter(Gfx *gdl, struct menurenderthing *thing);
Gfx *menuRenderItemMeter(Gfx *gdl, struct menurendercontext *context);
Gfx *menuRenderItemSelectable(Gfx *gdl, struct menurenderthing *thing);
Gfx *menuRenderItemSelectable(Gfx *gdl, struct menurendercontext *context);
bool menuTickItemSelectable(struct menuitem *item, struct menuinputs *inputs, u32 arg2);
Gfx *menuRenderItemSlider(Gfx *gdl);
bool menuTickItemSlider(struct menuitem *item, struct menuframe *frame, struct menuinputs *inputs, u32 arg3, union menuitemtickdata *data);
void menuInitItemSlider(union menuitemtickdata *data);
bool menuTickItemSlider(struct menuitem *item, struct menuframe *frame, struct menuinputs *inputs, u32 arg3, union menuitemdata *data);
void menuInitItemSlider(union menuitemdata *data);
Gfx *menuRenderItemCarousel(Gfx *gdl, struct menurenderthing *thing);
Gfx *menuRenderItemCarousel(Gfx *gdl, struct menurendercontext *context);
bool menuTickItemCarousel(struct menuitem *item, struct menuinputs *inputs, u32 arg2);
Gfx *menuRenderItemCheckbox(Gfx *gdl, struct menurenderthing *thing);
Gfx *menuRenderItemCheckbox(Gfx *gdl, struct menurendercontext *context);
bool menuTickItemCheckbox(struct menuitem *item, struct menuinputs *inputs, u32 arg2);
char *menuItemScrollableGetText(u32 type);
Gfx *menuRenderItemScrollable(Gfx *gdl, struct menurenderthing *thing);
bool menuTickItemScrollable(struct menuitem *item, struct menuframe *frame, struct menuinputs *inputs, u32 arg3, union menuitemtickdata *data);
void menuInitItemScrollable(union menuitemtickdata *data);
Gfx *menuRenderItemScrollable(Gfx *gdl, struct menurendercontext *context);
bool menuTickItemScrollable(struct menuitem *item, struct menuframe *frame, struct menuinputs *inputs, u32 arg3, union menuitemdata *data);
void menuInitItemScrollable(union menuitemdata *data);
Gfx *menuRenderItemMarquee(Gfx *gdl, struct menurenderthing *thing);
bool menuTickItemMarquee(struct menuitem *item, union menuitemtickdata *data);
void menuInitItemMarquee(union menuitemtickdata *data);
Gfx *menuRenderItemMarquee(Gfx *gdl, struct menurendercontext *context);
bool menuTickItemMarquee(struct menuitem *item, union menuitemdata *data);
void menuInitItemMarquee(union menuitemdata *data);
Gfx *menuRenderItem07(Gfx *gdl);
Gfx *menuRenderItemRanking(Gfx *gdl, struct menurenderthing *thing);
bool menuTickItemRanking(struct menuinputs *inputs, u32 arg1, union menuitemtickdata *data);
void menuInitItemRanking(union menuitemtickdata *data);
Gfx *menuRenderItemRanking(Gfx *gdl, struct menurendercontext *context);
bool menuTickItemRanking(struct menuinputs *inputs, u32 arg1, union menuitemdata *data);
void menuInitItemRanking(union menuitemdata *data);
Gfx *menuRenderItemPlayerStats(Gfx *gdl);
bool menuTickItemPlayerStats(struct menuitem *item, struct menuframe *frame, struct menuinputs *inputs, u32 arg3, union menuitemtickdata *data);
bool menuTickItemPlayerStats(struct menuitem *item, struct menuframe *frame, struct menuinputs *inputs, u32 arg3, union menuitemdata *data);
Gfx *func0f0ef2fc(Gfx *gdl, s16 x, s16 y, s16 x2, s16 y2, struct menuitem *item, u32 arg6, u32 arg7);
void menuInitItemPlayerStats(struct menuitem *item, union menuitemtickdata *data);
void menuInitItemPlayerStats(struct menuitem *item, union menuitemdata *data);
u32 func0f0ef394(void);
Gfx *menuRenderControllerTexture(Gfx *gdl, s32 x, s32 y, s32 texturenum, u32 alpha);
Gfx *menuRenderControllerLines(Gfx *gdl, struct menurenderthing *thing, s32 arg2, s32 arg3, s32 x, s32 y, u32 alpha);
Gfx *menuRenderControllerLines(Gfx *gdl, struct menurendercontext *context, s32 arg2, s32 arg3, s32 x, s32 y, u32 alpha);
u16 menuControllerGetButtonAction(s32 mode, s32 buttonnum);
Gfx *menuRenderControllerText(Gfx *gdl, s32 curmode, struct menurenderthing *thing, s32 x, s32 y, u32 valuecolour, u32 labelcolour, s8 prevmode);
Gfx *menuRenderControllerInfo(Gfx *gdl, struct menurenderthing *thing, s32 x, s32 y, s32 curmode, u32 alpha, u32 colour1, u32 colour2, s8 prevmode);
Gfx *menuRenderItemController(Gfx *gdl, struct menurenderthing *thing);
void menuInitItemController(union menuitemtickdata *data);
Gfx *menuRenderControllerText(Gfx *gdl, s32 curmode, struct menurendercontext *context, s32 x, s32 y, u32 valuecolour, u32 labelcolour, s8 prevmode);
Gfx *menuRenderControllerInfo(Gfx *gdl, struct menurendercontext *context, s32 x, s32 y, s32 curmode, u32 alpha, u32 colour1, u32 colour2, s8 prevmode);
Gfx *menuRenderItemController(Gfx *gdl, struct menurendercontext *context);
void menuInitItemController(union menuitemdata *data);
Gfx *menuRenderItem(Gfx *gdl, struct menurenderthing *thing);
bool menuTickItem(struct menuitem *item, struct menuframe *frame, struct menuinputs *inputs, u32 arg3, union menuitemtickdata *data);
void menuInitItem(struct menuitem *item, union menuitemtickdata *data);
Gfx *menuRenderItem(Gfx *gdl, struct menurendercontext *context);
bool menuTickItem(struct menuitem *item, struct menuframe *frame, struct menuinputs *inputs, u32 arg3, union menuitemdata *data);
void menuInitItem(struct menuitem *item, union menuitemdata *data);
Gfx *func0f0f0918(Gfx *gdl, s16 x, s16 y, s16 x2, s16 y2, struct menuitem *item, u32 arg6, u32 arg7);
#endif
src/include/game/game_1531a0.h
+1 -1
View File
@@ -38,7 +38,7 @@ u32 func0f1552d4(void);
u32 func0f15568c(void);
u32 func0f156024(void);
u32 func0f156030(void);
Gfx *textRenderWhite(Gfx *gdl, s32 *x, s32 *y, char *text, u32 font1, u32 font2, s32 colour, s16 width, s16 height, s32 arg9, u32 arg10);
Gfx *textRenderProjected(Gfx *gdl, s32 *x, s32 *y, char *text, u32 font1, u32 font2, s32 colour, s16 width, s16 height, s32 arg9, u32 arg10);
u32 func0f1566cc(void);
u32 func0f156790(void);
u32 func0f156a24(void);
src/include/types.h
+24 -38
View File
@@ -3248,15 +3248,15 @@ struct hoverprop {
u16 size;
};
struct menuitemtickdata_controller {
u8 unk00;
u8 unk01;
u8 unk02;
u8 unk03;
s8 unk04;
struct menuitemdata_controller {
u8 textfadetimer;
u8 contfadetimer;
u8 curmode;
u8 controlgroup;
s8 prevmode;
};
struct menuitemtickdata_dropdown {
struct menuitemdata_dropdown {
u16 unk00;
u16 unk02;
s16 unk04;
@@ -3267,7 +3267,7 @@ struct menuitemtickdata_dropdown {
u16 unk0e;
};
struct menuitemtickdata_keyboard {
struct menuitemdata_keyboard {
char string[11];
s8 col;
s8 row;
@@ -3275,44 +3275,44 @@ struct menuitemtickdata_keyboard {
u8 capseffective : 1; // Same as above, but inverted if holding L or R
};
struct menuitemtickdata_list {
struct menuitemdata_list {
s16 unk00;
s16 unk02;
s16 unk04;
s16 unk06;
};
struct menuitemtickdata_marquee {
struct menuitemdata_marquee {
u16 totalmoved;
u16 sum;
u16 unk04;
u16 unk06;
};
struct menuitemtickdata_ranking {
struct menuitemdata_ranking {
s16 scrolloffset;
};
struct menuitemtickdata_scrollable {
struct menuitemdata_scrollable {
s16 unk00;
s16 unk02;
s16 unk04;
s16 unk06;
};
struct menuitemtickdata_slider {
struct menuitemdata_slider {
s16 unk00;
};
union menuitemtickdata {
struct menuitemtickdata_controller controller;
struct menuitemtickdata_dropdown dropdown;
struct menuitemtickdata_keyboard keyboard;
struct menuitemtickdata_list list;
struct menuitemtickdata_marquee marquee;
struct menuitemtickdata_ranking ranking;
struct menuitemtickdata_scrollable scrollable;
struct menuitemtickdata_slider slider;
union menuitemdata {
struct menuitemdata_controller controller;
struct menuitemdata_dropdown dropdown;
struct menuitemdata_keyboard keyboard;
struct menuitemdata_list list;
struct menuitemdata_marquee marquee;
struct menuitemdata_ranking ranking;
struct menuitemdata_scrollable scrollable;
struct menuitemdata_slider slider;
};
struct handlerdata_carousel {
@@ -6868,15 +6868,7 @@ struct splat {
/*0x440*/ u32 unk440;
};
struct menurenderthing14_controller {
u8 textfadetimer;
u8 contfadetimer;
u8 curmode;
u8 controlgroup;
s8 prevmode;
};
struct menurenderthing {
struct menurendercontext {
s16 x;
s16 y;
s16 width;
@@ -6884,13 +6876,7 @@ struct menurenderthing {
struct menuitem *item;
bool focused;
struct menuframe *frame;
// Suspected to be handlerdata
union {
s16 *s16;
u16 *u16;
struct menurenderthing14_controller *controller;
} unk14;
union menuitemdata *data;
};
struct menucolourpalette {
src/lib/lib_13130.c
-4
View File
@@ -130,10 +130,6 @@ glabel strcat
GLOBAL_ASM(
glabel func00013274
.L00013274:
);
GLOBAL_ASM(
glabel func00013274
/* 13274: 90820000 */ lbu $v0,0x0($a0)
/* 13278: 90a30000 */ lbu $v1,0x0($a1)
/* 1327c: 24840001 */ addiu $a0,$a0,0x1