From 83c9c251db65eb0de9400a9f236cae629e9a0a7d Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Mon, 15 Jun 2020 17:52:51 +1000 Subject: [PATCH] Decompile fadeRender --- src/game/chr/chr.c | 24 +-- src/game/game_005fd0.c | 2 +- src/game/game_006bd0.c | 24 +-- src/game/game_097ba0.c | 50 ++--- src/game/game_0b63b0.c | 28 +-- src/game/game_0d7070.c | 40 ++-- src/game/game_0dcdb0.c | 26 +-- src/game/game_0e0770.c | 8 +- src/game/game_0e5ce0.c | 206 +++++++++---------- src/game/game_0f09f0.c | 132 ++++++------ src/game/game_0fd660.c | 50 ++--- src/game/game_10ccd0.c | 6 +- src/game/game_11f000.c | 56 ++--- src/game/game_135c70.c | 18 +- src/game/game_1371b0.c | 14 +- src/game/game_13c510.c | 12 +- src/game/game_141820.c | 106 +++++----- src/game/game_1531a0.c | 34 +-- src/game/game_157db0.c | 12 +- src/game/game_167ae0.c | 307 +++++++--------------------- src/game/game_177e00.c | 4 +- src/game/game_17f930.c | 36 ++-- src/game/game_18e5a0.c | 6 +- src/game/game_19c990.c | 26 +-- src/game/mplayer.c | 26 +-- src/game/propobj.c | 8 +- src/game/title.c | 14 +- src/include/game/data/data_020df0.h | 8 +- src/include/game/game_005fd0.h | 2 +- src/include/game/game_1531a0.h | 2 +- src/include/lib/lib_09660.h | 8 +- src/lib/lib_09660.c | 20 +- 32 files changed, 583 insertions(+), 732 deletions(-) diff --git a/src/game/chr/chr.c b/src/game/chr/chr.c index e894b851c..c33b2ef98 100644 --- a/src/game/chr/chr.c +++ b/src/game/chr/chr.c @@ -14865,60 +14865,60 @@ glabel func0f02bdf8 /* f02c204: 44144000 */ mfc1 $s4,$f8 /* f02c208: 44133000 */ mfc1 $s3,$f6 /* f02c20c: 2694fff8 */ addiu $s4,$s4,-8 -/* f02c210: 0c002f40 */ jal func0000bd00 +/* f02c210: 0c002f40 */ jal viGetLeft /* f02c214: 2673fff8 */ addiu $s3,$s3,-8 /* f02c218: 0262082a */ slt $at,$s3,$v0 /* f02c21c: 10200004 */ beqz $at,.L0f02c230 /* f02c220: 00000000 */ sll $zero,$zero,0x0 -/* f02c224: 0c002f40 */ jal func0000bd00 +/* f02c224: 0c002f40 */ jal viGetLeft /* f02c228: 00000000 */ sll $zero,$zero,0x0 /* f02c22c: 00409825 */ or $s3,$v0,$zero .L0f02c230: -/* f02c230: 0c002f40 */ jal func0000bd00 +/* f02c230: 0c002f40 */ jal viGetLeft /* f02c234: 00000000 */ sll $zero,$zero,0x0 /* f02c238: 00029400 */ sll $s2,$v0,0x10 /* f02c23c: 00127403 */ sra $t6,$s2,0x10 -/* f02c240: 0c002f22 */ jal func0000bc88 +/* f02c240: 0c002f22 */ jal viGetWidth /* f02c244: 01c09025 */ or $s2,$t6,$zero /* f02c248: 0052c821 */ addu $t9,$v0,$s2 /* f02c24c: 272cfff0 */ addiu $t4,$t9,-16 /* f02c250: 0193082a */ slt $at,$t4,$s3 /* f02c254: 10200009 */ beqz $at,.L0f02c27c /* f02c258: 00000000 */ sll $zero,$zero,0x0 -/* f02c25c: 0c002f40 */ jal func0000bd00 +/* f02c25c: 0c002f40 */ jal viGetLeft /* f02c260: 00000000 */ sll $zero,$zero,0x0 /* f02c264: 00029400 */ sll $s2,$v0,0x10 /* f02c268: 00126c03 */ sra $t5,$s2,0x10 -/* f02c26c: 0c002f22 */ jal func0000bc88 +/* f02c26c: 0c002f22 */ jal viGetWidth /* f02c270: 01a09025 */ or $s2,$t5,$zero /* f02c274: 00529821 */ addu $s3,$v0,$s2 /* f02c278: 2673fff0 */ addiu $s3,$s3,-16 .L0f02c27c: -/* f02c27c: 0c002f44 */ jal func0000bd10 +/* f02c27c: 0c002f44 */ jal viGetTop /* f02c280: 00000000 */ sll $zero,$zero,0x0 /* f02c284: 0282082a */ slt $at,$s4,$v0 /* f02c288: 10200004 */ beqz $at,.L0f02c29c /* f02c28c: 00000000 */ sll $zero,$zero,0x0 -/* f02c290: 0c002f44 */ jal func0000bd10 +/* f02c290: 0c002f44 */ jal viGetTop /* f02c294: 00000000 */ sll $zero,$zero,0x0 /* f02c298: 0040a025 */ or $s4,$v0,$zero .L0f02c29c: -/* f02c29c: 0c002f44 */ jal func0000bd10 +/* f02c29c: 0c002f44 */ jal viGetTop /* f02c2a0: 00000000 */ sll $zero,$zero,0x0 /* f02c2a4: 00029400 */ sll $s2,$v0,0x10 /* f02c2a8: 00127c03 */ sra $t7,$s2,0x10 -/* f02c2ac: 0c002f26 */ jal func0000bc98 +/* f02c2ac: 0c002f26 */ jal viGetHeight /* f02c2b0: 01e09025 */ or $s2,$t7,$zero /* f02c2b4: 0052c021 */ addu $t8,$v0,$s2 /* f02c2b8: 270efff0 */ addiu $t6,$t8,-16 /* f02c2bc: 01d4082a */ slt $at,$t6,$s4 /* f02c2c0: 5020000a */ beqzl $at,.L0f02c2ec /* f02c2c4: 3c0cff10 */ lui $t4,0xff10 -/* f02c2c8: 0c002f44 */ jal func0000bd10 +/* f02c2c8: 0c002f44 */ jal viGetTop /* f02c2cc: 00000000 */ sll $zero,$zero,0x0 /* f02c2d0: 00029400 */ sll $s2,$v0,0x10 /* f02c2d4: 0012cc03 */ sra $t9,$s2,0x10 -/* f02c2d8: 0c002f26 */ jal func0000bc98 +/* f02c2d8: 0c002f26 */ jal viGetHeight /* f02c2dc: 03209025 */ or $s2,$t9,$zero /* f02c2e0: 0052a021 */ addu $s4,$v0,$s2 /* f02c2e4: 2694fff0 */ addiu $s4,$s4,-16 diff --git a/src/game/game_005fd0.c b/src/game/game_005fd0.c index adfe11579..0acb12fcb 100644 --- a/src/game/game_005fd0.c +++ b/src/game/game_005fd0.c @@ -610,7 +610,7 @@ glabel var7f1a7e6c ); GLOBAL_ASM( -glabel func0f006900 +glabel colourBlend /* f006900: 00047e02 */ srl $t7,$a0,0x18 /* f006904: 31f800ff */ andi $t8,$t7,0xff /* f006908: 03060019 */ multu $t8,$a2 diff --git a/src/game/game_006bd0.c b/src/game/game_006bd0.c index 8d1fbff53..174f859e5 100644 --- a/src/game/game_006bd0.c +++ b/src/game/game_006bd0.c @@ -3961,31 +3961,31 @@ glabel func0f00a490 /* f00a580: afa20048 */ sw $v0,0x48($sp) /* f00a584: 0fc59e59 */ jal func0f167964 /* f00a588: 24040004 */ addiu $a0,$zero,0x4 -/* f00a58c: 0c002f40 */ jal func0000bd00 +/* f00a58c: 0c002f40 */ jal viGetLeft /* f00a590: 00408025 */ or $s0,$v0,$zero /* f00a594: 00027080 */ sll $t6,$v0,0x2 /* f00a598: 01c27021 */ addu $t6,$t6,$v0 /* f00a59c: 000e7040 */ sll $t6,$t6,0x1 -/* f00a5a0: 0c002f44 */ jal func0000bd10 +/* f00a5a0: 0c002f44 */ jal viGetTop /* f00a5a4: a7ae0042 */ sh $t6,0x42($sp) /* f00a5a8: 00027880 */ sll $t7,$v0,0x2 /* f00a5ac: 01e27821 */ addu $t7,$t7,$v0 /* f00a5b0: 000f7840 */ sll $t7,$t7,0x1 -/* f00a5b4: 0c002f40 */ jal func0000bd00 +/* f00a5b4: 0c002f40 */ jal viGetLeft /* f00a5b8: a7af0040 */ sh $t7,0x40($sp) /* f00a5bc: 00028c00 */ sll $s1,$v0,0x10 /* f00a5c0: 0011c403 */ sra $t8,$s1,0x10 -/* f00a5c4: 0c002f22 */ jal func0000bc88 +/* f00a5c4: 0c002f22 */ jal viGetWidth /* f00a5c8: 03008825 */ or $s1,$t8,$zero /* f00a5cc: 00515821 */ addu $t3,$v0,$s1 /* f00a5d0: 000b6080 */ sll $t4,$t3,0x2 /* f00a5d4: 018b6021 */ addu $t4,$t4,$t3 /* f00a5d8: 000c6040 */ sll $t4,$t4,0x1 -/* f00a5dc: 0c002f44 */ jal func0000bd10 +/* f00a5dc: 0c002f44 */ jal viGetTop /* f00a5e0: a7ac003e */ sh $t4,0x3e($sp) /* f00a5e4: 00028c00 */ sll $s1,$v0,0x10 /* f00a5e8: 00116c03 */ sra $t5,$s1,0x10 -/* f00a5ec: 0c002f26 */ jal func0000bc98 +/* f00a5ec: 0c002f26 */ jal viGetHeight /* f00a5f0: 01a08825 */ or $s1,$t5,$zero /* f00a5f4: 3c014100 */ lui $at,0x4100 /* f00a5f8: 44811000 */ mtc1 $at,$f2 @@ -4357,31 +4357,31 @@ glabel hudRenderGasIfEnabled /* f00ab6c: afa200a4 */ sw $v0,0xa4($sp) /* f00ab70: 0fc59e59 */ jal func0f167964 /* f00ab74: 24040008 */ addiu $a0,$zero,0x8 -/* f00ab78: 0c002f40 */ jal func0000bd00 +/* f00ab78: 0c002f40 */ jal viGetLeft /* f00ab7c: 00408025 */ or $s0,$v0,$zero /* f00ab80: 0002c080 */ sll $t8,$v0,0x2 /* f00ab84: 0302c021 */ addu $t8,$t8,$v0 /* f00ab88: 0018c040 */ sll $t8,$t8,0x1 -/* f00ab8c: 0c002f44 */ jal func0000bd10 +/* f00ab8c: 0c002f44 */ jal viGetTop /* f00ab90: a7b8009e */ sh $t8,0x9e($sp) /* f00ab94: 00025080 */ sll $t2,$v0,0x2 /* f00ab98: 01425021 */ addu $t2,$t2,$v0 /* f00ab9c: 000a5040 */ sll $t2,$t2,0x1 -/* f00aba0: 0c002f40 */ jal func0000bd00 +/* f00aba0: 0c002f40 */ jal viGetLeft /* f00aba4: a7aa009c */ sh $t2,0x9c($sp) /* f00aba8: 00028c00 */ sll $s1,$v0,0x10 /* f00abac: 00117c03 */ sra $t7,$s1,0x10 -/* f00abb0: 0c002f22 */ jal func0000bc88 +/* f00abb0: 0c002f22 */ jal viGetWidth /* f00abb4: 01e08825 */ or $s1,$t7,$zero /* f00abb8: 00516021 */ addu $t4,$v0,$s1 /* f00abbc: 000c6880 */ sll $t5,$t4,0x2 /* f00abc0: 01ac6821 */ addu $t5,$t5,$t4 /* f00abc4: 000d6840 */ sll $t5,$t5,0x1 -/* f00abc8: 0c002f44 */ jal func0000bd10 +/* f00abc8: 0c002f44 */ jal viGetTop /* f00abcc: a7ad009a */ sh $t5,0x9a($sp) /* f00abd0: 00028c00 */ sll $s1,$v0,0x10 /* f00abd4: 0011cc03 */ sra $t9,$s1,0x10 -/* f00abd8: 0c002f26 */ jal func0000bc98 +/* f00abd8: 0c002f26 */ jal viGetHeight /* f00abdc: 03208825 */ or $s1,$t9,$zero /* f00abe0: 00517821 */ addu $t7,$v0,$s1 /* f00abe4: 000f7080 */ sll $t6,$t7,0x2 diff --git a/src/game/game_097ba0.c b/src/game/game_097ba0.c index c5043a6a0..3a1f90f80 100644 --- a/src/game/game_097ba0.c +++ b/src/game/game_097ba0.c @@ -10922,7 +10922,7 @@ glabel var7f1ac764 /* f0a066c: c7b2008c */ lwc1 $f18,0x8c($sp) /* f0a0670: e6120000 */ swc1 $f18,0x0($s0) /* f0a0674: c7a40090 */ lwc1 $f4,0x90($sp) -/* f0a0678: 0c002f22 */ jal func0000bc88 +/* f0a0678: 0c002f22 */ jal viGetWidth /* f0a067c: e6440000 */ swc1 $f4,0x0($s2) /* f0a0680: 44824000 */ mtc1 $v0,$f8 /* f0a0684: c6060000 */ lwc1 $f6,0x0($s0) @@ -10930,7 +10930,7 @@ glabel var7f1ac764 /* f0a068c: 460a3003 */ div.s $f0,$f6,$f10 /* f0a0690: 46000480 */ add.s $f18,$f0,$f0 /* f0a0694: 46149101 */ sub.s $f4,$f18,$f20 -/* f0a0698: 0c002f26 */ jal func0000bc98 +/* f0a0698: 0c002f26 */ jal viGetHeight /* f0a069c: e6040000 */ swc1 $f4,0x0($s0) /* f0a06a0: 44823000 */ mtc1 $v0,$f6 /* f0a06a4: c6480000 */ lwc1 $f8,0x0($s2) @@ -18885,11 +18885,11 @@ glabel var7f1aca90 /* f0a7208: 00402025 */ or $a0,$v0,$zero /* f0a720c: 244e0008 */ addiu $t6,$v0,0x8 /* f0a7210: afae014c */ sw $t6,0x14c($sp) -/* f0a7214: 0c002f40 */ jal func0000bd00 +/* f0a7214: 0c002f40 */ jal viGetLeft /* f0a7218: 0040a825 */ or $s5,$v0,$zero /* f0a721c: 00028400 */ sll $s0,$v0,0x10 /* f0a7220: 00107c03 */ sra $t7,$s0,0x10 -/* f0a7224: 0c002f44 */ jal func0000bd10 +/* f0a7224: 0c002f44 */ jal viGetTop /* f0a7228: 01e08025 */ or $s0,$t7,$zero /* f0a722c: 44822000 */ mtc1 $v0,$f4 /* f0a7230: 44908000 */ mtc1 $s0,$f16 @@ -18910,19 +18910,19 @@ glabel var7f1aca90 /* f0a726c: 316c0fff */ andi $t4,$t3,0xfff /* f0a7270: 000c6b00 */ sll $t5,$t4,0xc /* f0a7274: 032d7025 */ or $t6,$t9,$t5 -/* f0a7278: 0c002f22 */ jal func0000bc88 +/* f0a7278: 0c002f22 */ jal viGetWidth /* f0a727c: aeae0000 */ sw $t6,0x0($s5) /* f0a7280: 00029400 */ sll $s2,$v0,0x10 /* f0a7284: 00127c03 */ sra $t7,$s2,0x10 -/* f0a7288: 0c002f40 */ jal func0000bd00 +/* f0a7288: 0c002f40 */ jal viGetLeft /* f0a728c: 01e09025 */ or $s2,$t7,$zero /* f0a7290: 0002a400 */ sll $s4,$v0,0x10 /* f0a7294: 00144c03 */ sra $t1,$s4,0x10 -/* f0a7298: 0c002f44 */ jal func0000bd10 +/* f0a7298: 0c002f44 */ jal viGetTop /* f0a729c: 0120a025 */ or $s4,$t1,$zero /* f0a72a0: 00028400 */ sll $s0,$v0,0x10 /* f0a72a4: 00104403 */ sra $t0,$s0,0x10 -/* f0a72a8: 0c002f26 */ jal func0000bc98 +/* f0a72a8: 0c002f26 */ jal viGetHeight /* f0a72ac: 01008025 */ or $s0,$t0,$zero /* f0a72b0: 00505021 */ addu $t2,$v0,$s0 /* f0a72b4: 448a4000 */ mtc1 $t2,$f8 @@ -19348,7 +19348,7 @@ glabel var7f1aca90 /* f0a78d0: 00000000 */ sll $zero,$zero,0x0 .L0f0a78d4: /* f0a78d4: 44d8f800 */ ctc1 $t8,$31 -/* f0a78d8: 0fc01a40 */ jal func0f006900 +/* f0a78d8: 0fc01a40 */ jal colourBlend /* f0a78dc: 03202825 */ or $a1,$t9,$zero /* f0a78e0: afa20140 */ sw $v0,0x140($sp) .L0f0a78e4: @@ -19584,11 +19584,11 @@ glabel var7f1aca90 /* f0a7c30: 00402025 */ or $a0,$v0,$zero /* f0a7c34: 244e0008 */ addiu $t6,$v0,0x8 /* f0a7c38: afae014c */ sw $t6,0x14c($sp) -/* f0a7c3c: 0c002f40 */ jal func0000bd00 +/* f0a7c3c: 0c002f40 */ jal viGetLeft /* f0a7c40: 00408825 */ or $s1,$v0,$zero /* f0a7c44: 00028400 */ sll $s0,$v0,0x10 /* f0a7c48: 00106403 */ sra $t4,$s0,0x10 -/* f0a7c4c: 0c002f44 */ jal func0000bd10 +/* f0a7c4c: 0c002f44 */ jal viGetTop /* f0a7c50: 01808025 */ or $s0,$t4,$zero /* f0a7c54: 44824000 */ mtc1 $v0,$f8 /* f0a7c58: 44902000 */ mtc1 $s0,$f4 @@ -19609,19 +19609,19 @@ glabel var7f1aca90 /* f0a7c94: 332f0fff */ andi $t7,$t9,0xfff /* f0a7c98: 000f4b00 */ sll $t1,$t7,0xc /* f0a7c9c: 01a97025 */ or $t6,$t5,$t1 -/* f0a7ca0: 0c002f22 */ jal func0000bc88 +/* f0a7ca0: 0c002f22 */ jal viGetWidth /* f0a7ca4: ae2e0000 */ sw $t6,0x0($s1) /* f0a7ca8: 00029400 */ sll $s2,$v0,0x10 /* f0a7cac: 00126403 */ sra $t4,$s2,0x10 -/* f0a7cb0: 0c002f40 */ jal func0000bd00 +/* f0a7cb0: 0c002f40 */ jal viGetLeft /* f0a7cb4: 01809025 */ or $s2,$t4,$zero /* f0a7cb8: 0002a400 */ sll $s4,$v0,0x10 /* f0a7cbc: 00145403 */ sra $t2,$s4,0x10 -/* f0a7cc0: 0c002f44 */ jal func0000bd10 +/* f0a7cc0: 0c002f44 */ jal viGetTop /* f0a7cc4: 0140a025 */ or $s4,$t2,$zero /* f0a7cc8: 00028400 */ sll $s0,$v0,0x10 /* f0a7ccc: 00104403 */ sra $t0,$s0,0x10 -/* f0a7cd0: 0c002f26 */ jal func0000bc98 +/* f0a7cd0: 0c002f26 */ jal viGetHeight /* f0a7cd4: 01008025 */ or $s0,$t0,$zero /* f0a7cd8: 00505821 */ addu $t3,$v0,$s0 /* f0a7cdc: 448b8000 */ mtc1 $t3,$f16 @@ -22150,7 +22150,7 @@ glabel func0f0a9fc0 /* f0aa410: 240600ff */ addiu $a2,$zero,0xff .L0f0aa414: /* f0aa414: 2405ffbf */ addiu $a1,$zero,-65 -/* f0aa418: 0fc01a40 */ jal func0f006900 +/* f0aa418: 0fc01a40 */ jal colourBlend /* f0aa41c: afa80044 */ sw $t0,0x44($sp) /* f0aa420: 8fa80044 */ lw $t0,0x44($sp) /* f0aa424: 8fa900e0 */ lw $t1,0xe0($sp) @@ -22163,7 +22163,7 @@ glabel func0f0a9fc0 .L0f0aa440: /* f0aa440: 8fa500f0 */ lw $a1,0xf0($sp) /* f0aa444: 00033080 */ sll $a2,$v1,0x2 -/* f0aa448: 0fc01a40 */ jal func0f006900 +/* f0aa448: 0fc01a40 */ jal colourBlend /* f0aa44c: afa80044 */ sw $t0,0x44($sp) /* f0aa450: 8fa80044 */ lw $t0,0x44($sp) /* f0aa454: 8fa900e0 */ lw $t1,0xe0($sp) @@ -22200,7 +22200,7 @@ glabel func0f0a9fc0 /* f0aa4c4: 34b900ff */ ori $t9,$a1,0xff /* f0aa4c8: 03202825 */ or $a1,$t9,$zero /* f0aa4cc: 8fa400f0 */ lw $a0,0xf0($sp) -/* f0aa4d0: 0fc01a40 */ jal func0f006900 +/* f0aa4d0: 0fc01a40 */ jal colourBlend /* f0aa4d4: afa80044 */ sw $t0,0x44($sp) /* f0aa4d8: 8fa80044 */ lw $t0,0x44($sp) /* f0aa4dc: 8fa900e0 */ lw $t1,0xe0($sp) @@ -22458,9 +22458,9 @@ glabel hudRenderAmmo /* f0aa874: 27bdfed0 */ addiu $sp,$sp,-304 /* f0aa878: afbf0034 */ sw $ra,0x34($sp) /* f0aa87c: afa40130 */ sw $a0,0x130($sp) -/* f0aa880: 0c002f44 */ jal func0000bd10 +/* f0aa880: 0c002f44 */ jal viGetTop /* f0aa884: afae012c */ sw $t6,0x12c($sp) -/* f0aa888: 0c002f26 */ jal func0000bc98 +/* f0aa888: 0c002f26 */ jal viGetHeight /* f0aa88c: a7a20076 */ sh $v0,0x76($sp) /* f0aa890: 87af0076 */ lh $t7,0x76($sp) /* f0aa894: 3c08800a */ lui $t0,%hi(g_Vars) @@ -22637,9 +22637,9 @@ glabel hudRenderAmmo /* f0aaafc: 8fb800e8 */ lw $t8,0xe8($sp) /* f0aab00: afb800f0 */ sw $t8,0xf0($sp) .L0f0aab04: -/* f0aab04: 0c002f40 */ jal func0000bd00 +/* f0aab04: 0c002f40 */ jal viGetLeft /* f0aab08: 00000000 */ sll $zero,$zero,0x0 -/* f0aab0c: 0c002f22 */ jal func0000bc88 +/* f0aab0c: 0c002f22 */ jal viGetWidth /* f0aab10: a7a20076 */ sh $v0,0x76($sp) /* f0aab14: 87b90076 */ lh $t9,0x76($sp) /* f0aab18: 3c0f8008 */ lui $t7,%hi(var8007fac0) @@ -23233,7 +23233,7 @@ glabel hudRenderAmmo /* f0ab3bc: 8faf005c */ lw $t7,0x5c($sp) /* f0ab3c0: afae0050 */ sw $t6,0x50($sp) /* f0ab3c4: afa40054 */ sw $a0,0x54($sp) -/* f0ab3c8: 0c002f40 */ jal func0000bd00 +/* f0ab3c8: 0c002f40 */ jal viGetLeft /* f0ab3cc: afaa0058 */ sw $t2,0x58($sp) /* f0ab3d0: 3c0e8008 */ lui $t6,%hi(var8007fac0) /* f0ab3d4: 8dcefac0 */ lw $t6,%lo(var8007fac0)($t6) @@ -23362,9 +23362,9 @@ glabel hudRenderAmmo /* f0ab5a0: 00197080 */ sll $t6,$t9,0x2 /* f0ab5a4: afae0050 */ sw $t6,0x50($sp) /* f0ab5a8: afaa0058 */ sw $t2,0x58($sp) -/* f0ab5ac: 0c002f40 */ jal func0000bd00 +/* f0ab5ac: 0c002f40 */ jal viGetLeft /* f0ab5b0: afaf00a4 */ sw $t7,0xa4($sp) -/* f0ab5b4: 0c002f22 */ jal func0000bc88 +/* f0ab5b4: 0c002f22 */ jal viGetWidth /* f0ab5b8: a7a20076 */ sh $v0,0x76($sp) /* f0ab5bc: 87b80076 */ lh $t8,0x76($sp) /* f0ab5c0: 3c198008 */ lui $t9,%hi(var8007fac0) diff --git a/src/game/game_0b63b0.c b/src/game/game_0b63b0.c index 34084eda2..cecbd46b9 100644 --- a/src/game/game_0b63b0.c +++ b/src/game/game_0b63b0.c @@ -5501,13 +5501,13 @@ glabel fadeDraw /* f0bb1dc: ac6f0004 */ sw $t7,0x4($v1) /* f0bb1e0: 26100008 */ addiu $s0,$s0,0x8 /* f0bb1e4: afb0003c */ sw $s0,0x3c($sp) -/* f0bb1e8: 0c002f22 */ jal func0000bc88 +/* f0bb1e8: 0c002f22 */ jal viGetWidth /* f0bb1ec: 26100008 */ addiu $s0,$s0,0x8 -/* f0bb1f0: 0c002f40 */ jal func0000bd00 +/* f0bb1f0: 0c002f40 */ jal viGetLeft /* f0bb1f4: a7a20026 */ sh $v0,0x26($sp) -/* f0bb1f8: 0c002f44 */ jal func0000bd10 +/* f0bb1f8: 0c002f44 */ jal viGetTop /* f0bb1fc: a7a20028 */ sh $v0,0x28($sp) -/* f0bb200: 0c002f26 */ jal func0000bc98 +/* f0bb200: 0c002f26 */ jal viGetHeight /* f0bb204: a7a2002a */ sh $v0,0x2a($sp) /* f0bb208: 87ab002a */ lh $t3,0x2a($sp) /* f0bb20c: 87ad0028 */ lh $t5,0x28($sp) @@ -5522,9 +5522,9 @@ glabel fadeDraw /* f0bb230: 01c17825 */ or $t7,$t6,$at /* f0bb234: 00194b80 */ sll $t1,$t9,0xe /* f0bb238: 01e96825 */ or $t5,$t7,$t1 -/* f0bb23c: 0c002f40 */ jal func0000bd00 +/* f0bb23c: 0c002f40 */ jal viGetLeft /* f0bb240: af0d0000 */ sw $t5,0x0($t8) -/* f0bb244: 0c002f44 */ jal func0000bd10 +/* f0bb244: 0c002f44 */ jal viGetTop /* f0bb248: a7a2002a */ sh $v0,0x2a($sp) /* f0bb24c: 87ab002a */ lh $t3,0x2a($sp) /* f0bb250: 8faf003c */ lw $t7,0x3c($sp) @@ -12754,10 +12754,10 @@ Gfx *func0f0c07c8(Gfx *gdl) // Draw menu if (g_Vars.currentplayer->cameramode != CAMERAMODE_EYESPY && g_Vars.currentplayer->mpmenuon) { - s32 a = func0000bd00(); - s32 b = func0000bd10(); - s32 c = func0000bd00() + func0000bc88(); - s32 d = func0000bd10() + func0000bc98(); + s32 a = viGetLeft(); + s32 b = viGetTop(); + s32 c = viGetLeft() + viGetWidth(); + s32 d = viGetTop() + viGetHeight(); gdl = func0f153628(gdl); gdl = func0f153a34(gdl, a, b, c, d, 160); @@ -12998,10 +12998,10 @@ Gfx *func0f0c07c8(Gfx *gdl) } if (g_Vars.currentplayer->mpmenuon) { - s32 a = func0000bd00(); - s32 b = func0000bd10(); - s32 c = func0000bd00() + func0000bc88(); - s32 d = func0000bd10() + func0000bc98(); + s32 a = viGetLeft(); + s32 b = viGetTop(); + s32 c = viGetLeft() + viGetWidth(); + s32 d = viGetTop() + viGetHeight(); gdl = func0f153628(gdl); gdl = func0f153a34(gdl, a, b, c, d, 160); diff --git a/src/game/game_0d7070.c b/src/game/game_0d7070.c index e9bda7869..ec9f0b0a3 100644 --- a/src/game/game_0d7070.c +++ b/src/game/game_0d7070.c @@ -696,7 +696,7 @@ glabel func0f0d78f4 /* f0d78fc: afa40098 */ sw $a0,0x98($sp) /* f0d7900: afa5009c */ sw $a1,0x9c($sp) /* f0d7904: afa600a0 */ sw $a2,0xa0($sp) -/* f0d7908: 0c002f40 */ jal func0000bd00 +/* f0d7908: 0c002f40 */ jal viGetLeft /* f0d790c: afa700a4 */ sw $a3,0xa4($sp) /* f0d7910: 3c0e8008 */ lui $t6,%hi(var8007fac0) /* f0d7914: 8dcefac0 */ lw $t6,%lo(var8007fac0)($t6) @@ -714,9 +714,9 @@ glabel func0f0d78f4 /* f0d7940: 00000000 */ sll $zero,$zero,0x0 /* f0d7944: 0006000d */ break 0x6 .L0f0d7948: -/* f0d7948: 0c002f44 */ jal func0000bd10 +/* f0d7948: 0c002f44 */ jal viGetTop /* f0d794c: 00000000 */ sll $zero,$zero,0x0 -/* f0d7950: 0c002f22 */ jal func0000bc88 +/* f0d7950: 0c002f22 */ jal viGetWidth /* f0d7954: afa20090 */ sw $v0,0x90($sp) /* f0d7958: 3c188008 */ lui $t8,%hi(var8007fac0) /* f0d795c: 8f18fac0 */ lw $t8,%lo(var8007fac0)($t8) @@ -735,7 +735,7 @@ glabel func0f0d78f4 /* f0d798c: 00000000 */ sll $zero,$zero,0x0 /* f0d7990: 0006000d */ break 0x6 .L0f0d7994: -/* f0d7994: 0c002f26 */ jal func0000bc98 +/* f0d7994: 0c002f26 */ jal viGetHeight /* f0d7998: 00000000 */ sll $zero,$zero,0x0 /* f0d799c: 8fae0090 */ lw $t6,0x90($sp) /* f0d79a0: 24190001 */ addiu $t9,$zero,0x1 @@ -1144,7 +1144,7 @@ glabel func0f0d7f54 /* f0d7f6c: 00c09025 */ or $s2,$a2,$zero /* f0d7f70: 00e09825 */ or $s3,$a3,$zero /* f0d7f74: afb00014 */ sw $s0,0x14($sp) -/* f0d7f78: 0c002f40 */ jal func0000bd00 +/* f0d7f78: 0c002f40 */ jal viGetLeft /* f0d7f7c: afa400d0 */ sw $a0,0xd0($sp) /* f0d7f80: 3c108008 */ lui $s0,%hi(var8007fac0) /* f0d7f84: 2610fac0 */ addiu $s0,$s0,%lo(var8007fac0) @@ -1164,9 +1164,9 @@ glabel func0f0d7f54 /* f0d7fb8: 00000000 */ sll $zero,$zero,0x0 /* f0d7fbc: 0006000d */ break 0x6 .L0f0d7fc0: -/* f0d7fc0: 0c002f44 */ jal func0000bd10 +/* f0d7fc0: 0c002f44 */ jal viGetTop /* f0d7fc4: 00000000 */ sll $zero,$zero,0x0 -/* f0d7fc8: 0c002f22 */ jal func0000bc88 +/* f0d7fc8: 0c002f22 */ jal viGetWidth /* f0d7fcc: afa200c8 */ sw $v0,0xc8($sp) /* f0d7fd0: 8e180000 */ lw $t8,0x0($s0) /* f0d7fd4: 8fa400d0 */ lw $a0,0xd0($sp) @@ -1184,7 +1184,7 @@ glabel func0f0d7f54 /* f0d8000: 00000000 */ sll $zero,$zero,0x0 /* f0d8004: 0006000d */ break 0x6 .L0f0d8008: -/* f0d8008: 0c002f26 */ jal func0000bc98 +/* f0d8008: 0c002f26 */ jal viGetHeight /* f0d800c: 00000000 */ sll $zero,$zero,0x0 /* f0d8010: 8fae00c8 */ lw $t6,0xc8($sp) /* f0d8014: 3c0500ff */ lui $a1,0xff @@ -3108,7 +3108,7 @@ glabel func0f0d9ba0 /* f0d9ba0: 27bdff70 */ addiu $sp,$sp,-144 /* f0d9ba4: afbf001c */ sw $ra,0x1c($sp) /* f0d9ba8: afa40090 */ sw $a0,0x90($sp) -/* f0d9bac: 0c002f40 */ jal func0000bd00 +/* f0d9bac: 0c002f40 */ jal viGetLeft /* f0d9bb0: afa50094 */ sw $a1,0x94($sp) /* f0d9bb4: 3c0e8008 */ lui $t6,%hi(var8007fac0) /* f0d9bb8: 8dcefac0 */ lw $t6,%lo(var8007fac0)($t6) @@ -3127,9 +3127,9 @@ glabel func0f0d9ba0 /* f0d9be8: 00000000 */ sll $zero,$zero,0x0 /* f0d9bec: 0006000d */ break 0x6 .L0f0d9bf0: -/* f0d9bf0: 0c002f44 */ jal func0000bd10 +/* f0d9bf0: 0c002f44 */ jal viGetTop /* f0d9bf4: 00000000 */ sll $zero,$zero,0x0 -/* f0d9bf8: 0c002f22 */ jal func0000bc88 +/* f0d9bf8: 0c002f22 */ jal viGetWidth /* f0d9bfc: afa20088 */ sw $v0,0x88($sp) /* f0d9c00: 3c188008 */ lui $t8,%hi(var8007fac0) /* f0d9c04: 8f18fac0 */ lw $t8,%lo(var8007fac0)($t8) @@ -3148,7 +3148,7 @@ glabel func0f0d9ba0 /* f0d9c34: 00000000 */ sll $zero,$zero,0x0 /* f0d9c38: 0006000d */ break 0x6 .L0f0d9c3c: -/* f0d9c3c: 0c002f26 */ jal func0000bc98 +/* f0d9c3c: 0c002f26 */ jal viGetHeight /* f0d9c40: 00000000 */ sll $zero,$zero,0x0 /* f0d9c44: 3c0e8008 */ lui $t6,%hi(var8007fac0) /* f0d9c48: 8dcefac0 */ lw $t6,%lo(var8007fac0)($t6) @@ -3620,7 +3620,7 @@ glabel var7f1ade54 /* f0da2dc: 27bdff00 */ addiu $sp,$sp,-256 /* f0da2e0: afbf0014 */ sw $ra,0x14($sp) /* f0da2e4: afa50104 */ sw $a1,0x104($sp) -/* f0da2e8: 0c002f40 */ jal func0000bd00 +/* f0da2e8: 0c002f40 */ jal viGetLeft /* f0da2ec: afa40100 */ sw $a0,0x100($sp) /* f0da2f0: 3c088008 */ lui $t0,%hi(var8007fac0) /* f0da2f4: 2508fac0 */ addiu $t0,$t0,%lo(var8007fac0) @@ -3640,9 +3640,9 @@ glabel var7f1ade54 /* f0da328: 00000000 */ sll $zero,$zero,0x0 /* f0da32c: 0006000d */ break 0x6 .L0f0da330: -/* f0da330: 0c002f44 */ jal func0000bd10 +/* f0da330: 0c002f44 */ jal viGetTop /* f0da334: 00000000 */ sll $zero,$zero,0x0 -/* f0da338: 0c002f22 */ jal func0000bc88 +/* f0da338: 0c002f22 */ jal viGetWidth /* f0da33c: afa200f8 */ sw $v0,0xf8($sp) /* f0da340: 3c088008 */ lui $t0,%hi(var8007fac0) /* f0da344: 2508fac0 */ addiu $t0,$t0,%lo(var8007fac0) @@ -3663,7 +3663,7 @@ glabel var7f1ade54 /* f0da37c: 0006000d */ break 0x6 .L0f0da380: /* f0da380: afae00f4 */ sw $t6,0xf4($sp) -/* f0da384: 0c002f26 */ jal func0000bc98 +/* f0da384: 0c002f26 */ jal viGetHeight /* f0da388: 00000000 */ sll $zero,$zero,0x0 /* f0da38c: 8fb800f8 */ lw $t8,0xf8($sp) /* f0da390: 00021843 */ sra $v1,$v0,0x1 @@ -5723,7 +5723,7 @@ glabel func0f0dc170 /* f0dc178: afb00014 */ sw $s0,0x14($sp) /* f0dc17c: 00808025 */ or $s0,$a0,$zero /* f0dc180: afb10018 */ sw $s1,0x18($sp) -/* f0dc184: 0c002f40 */ jal func0000bd00 +/* f0dc184: 0c002f40 */ jal viGetLeft /* f0dc188: afa500b4 */ sw $a1,0xb4($sp) /* f0dc18c: 3c118008 */ lui $s1,%hi(var8007fac0) /* f0dc190: 2631fac0 */ addiu $s1,$s1,%lo(var8007fac0) @@ -5742,9 +5742,9 @@ glabel func0f0dc170 /* f0dc1c0: 00000000 */ sll $zero,$zero,0x0 /* f0dc1c4: 0006000d */ break 0x6 .L0f0dc1c8: -/* f0dc1c8: 0c002f44 */ jal func0000bd10 +/* f0dc1c8: 0c002f44 */ jal viGetTop /* f0dc1cc: 00000000 */ sll $zero,$zero,0x0 -/* f0dc1d0: 0c002f22 */ jal func0000bc88 +/* f0dc1d0: 0c002f22 */ jal viGetWidth /* f0dc1d4: afa200a8 */ sw $v0,0xa8($sp) /* f0dc1d8: 8e380000 */ lw $t8,0x0($s1) /* f0dc1dc: 0058001a */ div $zero,$v0,$t8 @@ -5761,7 +5761,7 @@ glabel func0f0dc170 /* f0dc204: 00000000 */ sll $zero,$zero,0x0 /* f0dc208: 0006000d */ break 0x6 .L0f0dc20c: -/* f0dc20c: 0c002f26 */ jal func0000bc98 +/* f0dc20c: 0c002f26 */ jal viGetHeight /* f0dc210: 00000000 */ sll $zero,$zero,0x0 /* f0dc214: 8fae00a8 */ lw $t6,0xa8($sp) /* f0dc218: 3c03800a */ lui $v1,%hi(g_Vars+0x284) diff --git a/src/game/game_0dcdb0.c b/src/game/game_0dcdb0.c index 94c6b8a91..a4860cb79 100644 --- a/src/game/game_0dcdb0.c +++ b/src/game/game_0dcdb0.c @@ -108,7 +108,7 @@ glabel func0f0dcef4 /* f0dcef4: 27bdff70 */ addiu $sp,$sp,-144 /* f0dcef8: afbf0034 */ sw $ra,0x34($sp) /* f0dcefc: afa40090 */ sw $a0,0x90($sp) -/* f0dcf00: 0c002f40 */ jal func0000bd00 +/* f0dcf00: 0c002f40 */ jal viGetLeft /* f0dcf04: afa50094 */ sw $a1,0x94($sp) /* f0dcf08: 3c0e8008 */ lui $t6,%hi(var8007fac0) /* f0dcf0c: 8dcefac0 */ lw $t6,%lo(var8007fac0)($t6) @@ -126,9 +126,9 @@ glabel func0f0dcef4 /* f0dcf38: 00000000 */ sll $zero,$zero,0x0 /* f0dcf3c: 0006000d */ break 0x6 .L0f0dcf40: -/* f0dcf40: 0c002f44 */ jal func0000bd10 +/* f0dcf40: 0c002f44 */ jal viGetTop /* f0dcf44: 00000000 */ sll $zero,$zero,0x0 -/* f0dcf48: 0c002f26 */ jal func0000bc98 +/* f0dcf48: 0c002f26 */ jal viGetHeight /* f0dcf4c: a7a20056 */ sh $v0,0x56($sp) /* f0dcf50: 3c04800a */ lui $a0,%hi(g_Vars) /* f0dcf54: 24849fc0 */ addiu $a0,$a0,%lo(g_Vars) @@ -373,9 +373,9 @@ glabel func0f0dd2ac /* f0dd2b0: afbf003c */ sw $ra,0x3c($sp) /* f0dd2b4: afb00038 */ sw $s0,0x38($sp) /* f0dd2b8: afa400c0 */ sw $a0,0xc0($sp) -/* f0dd2bc: 0c002f44 */ jal func0000bd10 +/* f0dd2bc: 0c002f44 */ jal viGetTop /* f0dd2c0: afa500c4 */ sw $a1,0xc4($sp) -/* f0dd2c4: 0c002f40 */ jal func0000bd00 +/* f0dd2c4: 0c002f40 */ jal viGetLeft /* f0dd2c8: afa200bc */ sw $v0,0xbc($sp) /* f0dd2cc: 3c108008 */ lui $s0,%hi(var8007fac0) /* f0dd2d0: 2610fac0 */ addiu $s0,$s0,%lo(var8007fac0) @@ -394,7 +394,7 @@ glabel func0f0dd2ac /* f0dd300: 00000000 */ sll $zero,$zero,0x0 /* f0dd304: 0006000d */ break 0x6 .L0f0dd308: -/* f0dd308: 0c002f22 */ jal func0000bc88 +/* f0dd308: 0c002f22 */ jal viGetWidth /* f0dd30c: 00000000 */ sll $zero,$zero,0x0 /* f0dd310: 8e180000 */ lw $t8,0x0($s0) /* f0dd314: 0058001a */ div $zero,$v0,$t8 @@ -412,7 +412,7 @@ glabel func0f0dd2ac /* f0dd340: 0006000d */ break 0x6 .L0f0dd344: /* f0dd344: afa900b4 */ sw $t1,0xb4($sp) -/* f0dd348: 0c002f26 */ jal func0000bc98 +/* f0dd348: 0c002f26 */ jal viGetHeight /* f0dd34c: 00000000 */ sll $zero,$zero,0x0 /* f0dd350: 3c06800a */ lui $a2,%hi(g_Vars) /* f0dd354: 3c013f80 */ lui $at,0x3f80 @@ -4299,12 +4299,12 @@ glabel var7f1adef4 /* f0e050c: 15010039 */ bne $t0,$at,.L0f0e05f4 /* f0e0510: 00000000 */ sll $zero,$zero,0x0 /* f0e0514: afb2009c */ sw $s2,0x9c($sp) -/* f0e0518: 0c002f40 */ jal func0000bd00 +/* f0e0518: 0c002f40 */ jal viGetLeft /* f0e051c: 26520008 */ addiu $s2,$s2,0x8 /* f0e0520: 00028400 */ sll $s0,$v0,0x10 /* f0e0524: 00105c03 */ sra $t3,$s0,0x10 /* f0e0528: 01608025 */ or $s0,$t3,$zero -/* f0e052c: 0c002f44 */ jal func0000bd10 +/* f0e052c: 0c002f44 */ jal viGetTop /* f0e0530: 8fb3009c */ lw $s3,0x9c($sp) /* f0e0534: 44829000 */ mtc1 $v0,$f18 /* f0e0538: 44905000 */ mtc1 $s0,$f10 @@ -4323,17 +4323,17 @@ glabel var7f1adef4 /* f0e056c: 31e90fff */ andi $t1,$t7,0xfff /* f0e0570: 0009c300 */ sll $t8,$t1,0xc /* f0e0574: 01984025 */ or $t0,$t4,$t8 -/* f0e0578: 0c002f22 */ jal func0000bc88 +/* f0e0578: 0c002f22 */ jal viGetWidth /* f0e057c: ae680000 */ sw $t0,0x0($s3) -/* f0e0580: 0c002f40 */ jal func0000bd00 +/* f0e0580: 0c002f40 */ jal viGetLeft /* f0e0584: a7a20092 */ sh $v0,0x92($sp) /* f0e0588: 00028c00 */ sll $s1,$v0,0x10 /* f0e058c: 00115c03 */ sra $t3,$s1,0x10 -/* f0e0590: 0c002f44 */ jal func0000bd10 +/* f0e0590: 0c002f44 */ jal viGetTop /* f0e0594: 01608825 */ or $s1,$t3,$zero /* f0e0598: 00028400 */ sll $s0,$v0,0x10 /* f0e059c: 00105403 */ sra $t2,$s0,0x10 -/* f0e05a0: 0c002f26 */ jal func0000bc98 +/* f0e05a0: 0c002f26 */ jal viGetHeight /* f0e05a4: 01408025 */ or $s0,$t2,$zero /* f0e05a8: 87a90092 */ lh $t1,0x92($sp) /* f0e05ac: 00506821 */ addu $t5,$v0,$s0 diff --git a/src/game/game_0e0770.c b/src/game/game_0e0770.c index 1928a2572..409a23749 100644 --- a/src/game/game_0e0770.c +++ b/src/game/game_0e0770.c @@ -550,7 +550,7 @@ glabel func0f0e0dac /* f0e0ea4: 01670019 */ multu $t3,$a3 /* f0e0ea8: 00006812 */ mflo $t5 /* f0e0eac: 004d7021 */ addu $t6,$v0,$t5 -/* f0e0eb0: 0fc01a40 */ jal func0f006900 +/* f0e0eb0: 0fc01a40 */ jal colourBlend /* f0e0eb4: 8dc50000 */ lw $a1,0x0($t6) /* f0e0eb8: 8fa3004c */ lw $v1,0x4c($sp) /* f0e0ebc: 3c197f1b */ lui $t9,%hi(var7f1b1fb0) @@ -580,7 +580,7 @@ glabel func0f0e0dac /* f0e0f14: 000c6080 */ sll $t4,$t4,0x2 /* f0e0f18: 008c2021 */ addu $a0,$a0,$t4 /* f0e0f1c: 8c841fb8 */ lw $a0,%lo(var7f1b1fb8)($a0) -/* f0e0f20: 0fc01a40 */ jal func0f006900 +/* f0e0f20: 0fc01a40 */ jal colourBlend /* f0e0f24: 8ce50008 */ lw $a1,0x8($a3) /* f0e0f28: 8fa80030 */ lw $t0,0x30($sp) /* f0e0f2c: 00401825 */ or $v1,$v0,$zero @@ -2257,7 +2257,7 @@ glabel func0f0e2744 /* f0e2848: 00000000 */ sll $zero,$zero,0x0 /* f0e284c: 0006000d */ break 0x6 .L0f0e2850: -/* f0e2850: 0fc01a40 */ jal func0f006900 +/* f0e2850: 0fc01a40 */ jal colourBlend /* f0e2854: 00000000 */ sll $zero,$zero,0x0 /* f0e2858: 02c02025 */ or $a0,$s6,$zero /* f0e285c: 02202825 */ or $a1,$s1,$zero @@ -2347,7 +2347,7 @@ glabel func0f0e2744 /* f0e2994: 00000000 */ sll $zero,$zero,0x0 /* f0e2998: 0006000d */ break 0x6 .L0f0e299c: -/* f0e299c: 0fc01a40 */ jal func0f006900 +/* f0e299c: 0fc01a40 */ jal colourBlend /* f0e29a0: 00000000 */ sll $zero,$zero,0x0 /* f0e29a4: 02202025 */ or $a0,$s1,$zero /* f0e29a8: 02c02825 */ or $a1,$s6,$zero diff --git a/src/game/game_0e5ce0.c b/src/game/game_0e5ce0.c index 337e0cbba..40f12d2cb 100644 --- a/src/game/game_0e5ce0.c +++ b/src/game/game_0e5ce0.c @@ -4443,7 +4443,7 @@ glabel func0f0e6038 /* f0e60c0: 03284821 */ addu $t1,$t9,$t0 /* f0e60c4: 01686021 */ addu $t4,$t3,$t0 /* f0e60c8: 8d85002c */ lw $a1,0x2c($t4) -/* f0e60cc: 0fc01a40 */ jal func0f006900 +/* f0e60cc: 0fc01a40 */ jal colourBlend /* f0e60d0: 8d24002c */ lw $a0,0x2c($t1) /* f0e60d4: 00408025 */ or $s0,$v0,$zero .L0f0e60d8: @@ -4452,7 +4452,7 @@ glabel func0f0e6038 /* f0e60e0: 00002825 */ or $a1,$zero,$zero /* f0e60e4: 11a00007 */ beqz $t5,.L0f0e6104 /* f0e60e8: 00000000 */ sll $zero,$zero,0x0 -/* f0e60ec: 0fc01a40 */ jal func0f006900 +/* f0e60ec: 0fc01a40 */ jal colourBlend /* f0e60f0: 2406002c */ addiu $a2,$zero,0x2c /* f0e60f4: 2401ff00 */ addiu $at,$zero,-256 /* f0e60f8: 00417024 */ and $t6,$v0,$at @@ -4513,7 +4513,7 @@ glabel func0f0e6038 /* f0e61cc: 004b4021 */ addu $t0,$v0,$t3 /* f0e61d0: 004d7021 */ addu $t6,$v0,$t5 /* f0e61d4: 8dc50030 */ lw $a1,0x30($t6) -/* f0e61d8: 0fc01a40 */ jal func0f006900 +/* f0e61d8: 0fc01a40 */ jal colourBlend /* f0e61dc: 8d040030 */ lw $a0,0x30($t0) /* f0e61e0: 00408025 */ or $s0,$v0,$zero .L0f0e61e4: @@ -4522,7 +4522,7 @@ glabel func0f0e6038 /* f0e61ec: 00002825 */ or $a1,$zero,$zero /* f0e61f0: 51e00008 */ beqzl $t7,.L0f0e6214 /* f0e61f4: 9222003c */ lbu $v0,0x3c($s1) -/* f0e61f8: 0fc01a40 */ jal func0f006900 +/* f0e61f8: 0fc01a40 */ jal colourBlend /* f0e61fc: 2406002c */ addiu $a2,$zero,0x2c /* f0e6200: 2401ff00 */ addiu $at,$zero,-256 /* f0e6204: 0041c824 */ and $t9,$v0,$at @@ -5124,7 +5124,7 @@ glabel menuRenderItemCustom /* f0e6ab4: 01750019 */ multu $t3,$s5 /* f0e6ab8: 00005012 */ mflo $t2 /* f0e6abc: 02ca6821 */ addu $t5,$s6,$t2 -/* f0e6ac0: 0fc01a40 */ jal func0f006900 +/* f0e6ac0: 0fc01a40 */ jal colourBlend /* f0e6ac4: 8da50018 */ lw $a1,0x18($t5) /* f0e6ac8: 00408025 */ or $s0,$v0,$zero /* f0e6acc: 8e230010 */ lw $v1,0x10($s1) @@ -5134,7 +5134,7 @@ glabel menuRenderItemCustom /* f0e6ad8: 00002825 */ or $a1,$zero,$zero /* f0e6adc: 51800009 */ beqzl $t4,.L0f0e6b04 /* f0e6ae0: 906f003c */ lbu $t7,0x3c($v1) -/* f0e6ae4: 0fc01a40 */ jal func0f006900 +/* f0e6ae4: 0fc01a40 */ jal colourBlend /* f0e6ae8: 2406007f */ addiu $a2,$zero,0x7f /* f0e6aec: 2401ff00 */ addiu $at,$zero,-256 /* f0e6af0: 0041c824 */ and $t9,$v0,$at @@ -5306,18 +5306,18 @@ glabel menuRenderItemCustom /* f0e6d60: 03150019 */ multu $t8,$s5 /* f0e6d64: 00005812 */ mflo $t3 /* f0e6d68: 02cb5021 */ addu $t2,$s6,$t3 -/* f0e6d6c: 0fc01a40 */ jal func0f006900 +/* f0e6d6c: 0fc01a40 */ jal colourBlend /* f0e6d70: 8d450020 */ lw $a1,0x20($t2) /* f0e6d74: 00403825 */ or $a3,$v0,$zero .L0f0e6d78: /* f0e6d78: 02002025 */ or $a0,$s0,$zero /* f0e6d7c: 320500ff */ andi $a1,$s0,0xff /* f0e6d80: 2406007f */ addiu $a2,$zero,0x7f -/* f0e6d84: 0fc01a40 */ jal func0f006900 +/* f0e6d84: 0fc01a40 */ jal colourBlend /* f0e6d88: afa700b0 */ sw $a3,0xb0($sp) /* f0e6d8c: 8fa500b0 */ lw $a1,0xb0($sp) /* f0e6d90: 00402025 */ or $a0,$v0,$zero -/* f0e6d94: 0fc01a40 */ jal func0f006900 +/* f0e6d94: 0fc01a40 */ jal colourBlend /* f0e6d98: 8fa600ac */ lw $a2,0xac($sp) /* f0e6d9c: 8e230010 */ lw $v1,0x10($s1) /* f0e6da0: 44809000 */ mtc1 $zero,$f18 @@ -5807,7 +5807,7 @@ glabel menuRenderItemCustom /* f0e7490: 01f50019 */ multu $t7,$s5 /* f0e7494: 00006012 */ mflo $t4 /* f0e7498: 02cc7021 */ addu $t6,$s6,$t4 -/* f0e749c: 0fc01a40 */ jal func0f006900 +/* f0e749c: 0fc01a40 */ jal colourBlend /* f0e74a0: 8dc50018 */ lw $a1,0x18($t6) /* f0e74a4: 00408025 */ or $s0,$v0,$zero /* f0e74a8: 8e230010 */ lw $v1,0x10($s1) @@ -5817,7 +5817,7 @@ glabel menuRenderItemCustom /* f0e74b4: 00002825 */ or $a1,$zero,$zero /* f0e74b8: 51400008 */ beqzl $t2,.L0f0e74dc /* f0e74bc: 8fab011c */ lw $t3,0x11c($sp) -/* f0e74c0: 0fc01a40 */ jal func0f006900 +/* f0e74c0: 0fc01a40 */ jal colourBlend /* f0e74c4: 2406007f */ addiu $a2,$zero,0x7f /* f0e74c8: 2401ff00 */ addiu $at,$zero,-256 /* f0e74cc: 00416824 */ and $t5,$v0,$at @@ -6282,7 +6282,7 @@ glabel menuRenderItemDropdown /* f0e7b28: 01aa7021 */ addu $t6,$t5,$t2 /* f0e7b2c: 8dc50018 */ lw $a1,0x18($t6) /* f0e7b30: 8d640018 */ lw $a0,0x18($t3) -/* f0e7b34: 0fc01a40 */ jal func0f006900 +/* f0e7b34: 0fc01a40 */ jal colourBlend /* f0e7b38: 8c660044 */ lw $a2,0x44($v1) /* f0e7b3c: 00408825 */ or $s1,$v0,$zero /* f0e7b40: 8e030010 */ lw $v1,0x10($s0) @@ -6292,7 +6292,7 @@ glabel menuRenderItemDropdown /* f0e7b4c: 00002825 */ or $a1,$zero,$zero /* f0e7b50: 51e00008 */ beqzl $t7,.L0f0e7b74 /* f0e7b54: 8e02000c */ lw $v0,0xc($s0) -/* f0e7b58: 0fc01a40 */ jal func0f006900 +/* f0e7b58: 0fc01a40 */ jal colourBlend /* f0e7b5c: 2406007f */ addiu $a2,$zero,0x7f /* f0e7b60: 2401ff00 */ addiu $at,$zero,-256 /* f0e7b64: 0041c024 */ and $t8,$v0,$at @@ -6378,18 +6378,18 @@ glabel menuRenderItemDropdown /* f0e7c90: 004e7821 */ addu $t7,$v0,$t6 /* f0e7c94: 00594021 */ addu $t0,$v0,$t9 /* f0e7c98: 8d050020 */ lw $a1,0x20($t0) -/* f0e7c9c: 0fc01a40 */ jal func0f006900 +/* f0e7c9c: 0fc01a40 */ jal colourBlend /* f0e7ca0: 8de40020 */ lw $a0,0x20($t7) /* f0e7ca4: 00403825 */ or $a3,$v0,$zero .L0f0e7ca8: /* f0e7ca8: 02202025 */ or $a0,$s1,$zero /* f0e7cac: 322500ff */ andi $a1,$s1,0xff /* f0e7cb0: 2406007f */ addiu $a2,$zero,0x7f -/* f0e7cb4: 0fc01a40 */ jal func0f006900 +/* f0e7cb4: 0fc01a40 */ jal colourBlend /* f0e7cb8: afa7005c */ sw $a3,0x5c($sp) /* f0e7cbc: 8fa5005c */ lw $a1,0x5c($sp) /* f0e7cc0: 00402025 */ or $a0,$v0,$zero -/* f0e7cc4: 0fc01a40 */ jal func0f006900 +/* f0e7cc4: 0fc01a40 */ jal colourBlend /* f0e7cc8: 8fa60058 */ lw $a2,0x58($sp) /* f0e7ccc: 10000053 */ beqz $zero,.L0f0e7e1c /* f0e7cd0: 00408825 */ or $s1,$v0,$zero @@ -6467,18 +6467,18 @@ glabel menuRenderItemDropdown /* f0e7ddc: 01cfc021 */ addu $t8,$t6,$t7 /* f0e7de0: 010f4821 */ addu $t1,$t0,$t7 /* f0e7de4: 8d250020 */ lw $a1,0x20($t1) -/* f0e7de8: 0fc01a40 */ jal func0f006900 +/* f0e7de8: 0fc01a40 */ jal colourBlend /* f0e7dec: 8f040020 */ lw $a0,0x20($t8) /* f0e7df0: 00403825 */ or $a3,$v0,$zero .L0f0e7df4: /* f0e7df4: 02202025 */ or $a0,$s1,$zero /* f0e7df8: 322500ff */ andi $a1,$s1,0xff /* f0e7dfc: 2406007f */ addiu $a2,$zero,0x7f -/* f0e7e00: 0fc01a40 */ jal func0f006900 +/* f0e7e00: 0fc01a40 */ jal colourBlend /* f0e7e04: afa70054 */ sw $a3,0x54($sp) /* f0e7e08: 8fa50054 */ lw $a1,0x54($sp) /* f0e7e0c: 00402025 */ or $a0,$v0,$zero -/* f0e7e10: 0fc01a40 */ jal func0f006900 +/* f0e7e10: 0fc01a40 */ jal colourBlend /* f0e7e14: 8fa60050 */ lw $a2,0x50($sp) /* f0e7e18: 00408825 */ or $s1,$v0,$zero .L0f0e7e1c: @@ -6544,7 +6544,7 @@ glabel menuRenderItemDropdown /* f0e7efc: 01270019 */ multu $t1,$a3 /* f0e7f00: 00005812 */ mflo $t3 /* f0e7f04: 004b6021 */ addu $t4,$v0,$t3 -/* f0e7f08: 0fc01a40 */ jal func0f006900 +/* f0e7f08: 0fc01a40 */ jal colourBlend /* f0e7f0c: 8d85001c */ lw $a1,0x1c($t4) /* f0e7f10: 00408825 */ or $s1,$v0,$zero /* f0e7f14: 8e030010 */ lw $v1,0x10($s0) @@ -6554,7 +6554,7 @@ glabel menuRenderItemDropdown /* f0e7f20: 00002825 */ or $a1,$zero,$zero /* f0e7f24: 51a00009 */ beqzl $t5,.L0f0e7f4c /* f0e7f28: 9062003c */ lbu $v0,0x3c($v1) -/* f0e7f2c: 0fc01a40 */ jal func0f006900 +/* f0e7f2c: 0fc01a40 */ jal colourBlend /* f0e7f30: 2406007f */ addiu $a2,$zero,0x7f /* f0e7f34: 2401ff00 */ addiu $at,$zero,-256 /* f0e7f38: 00415024 */ and $t2,$v0,$at @@ -7224,17 +7224,17 @@ glabel menuRenderItemKeyboard /* f0e88c8: 01d50019 */ multu $t6,$s5 /* f0e88cc: 00007812 */ mflo $t7 /* f0e88d0: 03cfc021 */ addu $t8,$s8,$t7 -/* f0e88d4: 0fc01a40 */ jal func0f006900 +/* f0e88d4: 0fc01a40 */ jal colourBlend /* f0e88d8: 8f050020 */ lw $a1,0x20($t8) /* f0e88dc: 00408825 */ or $s1,$v0,$zero .L0f0e88e0: /* f0e88e0: 3404ffff */ dli $a0,0xffff /* f0e88e4: 240500ff */ addiu $a1,$zero,0xff -/* f0e88e8: 0fc01a40 */ jal func0f006900 +/* f0e88e8: 0fc01a40 */ jal colourBlend /* f0e88ec: 2406007f */ addiu $a2,$zero,0x7f /* f0e88f0: 00402025 */ or $a0,$v0,$zero /* f0e88f4: 02202825 */ or $a1,$s1,$zero -/* f0e88f8: 0fc01a40 */ jal func0f006900 +/* f0e88f8: 0fc01a40 */ jal colourBlend /* f0e88fc: 02603025 */ or $a2,$s3,$zero /* f0e8900: 8fa400f8 */ lw $a0,0xf8($sp) /* f0e8904: 0fc54df7 */ jal func0f1537dc @@ -7379,7 +7379,7 @@ glabel menuRenderItemKeyboard /* f0e8b10: 01950019 */ multu $t4,$s5 /* f0e8b14: 00005012 */ mflo $t2 /* f0e8b18: 03ca6821 */ addu $t5,$s8,$t2 -/* f0e8b1c: 0fc01a40 */ jal func0f006900 +/* f0e8b1c: 0fc01a40 */ jal colourBlend /* f0e8b20: 8da50018 */ lw $a1,0x18($t5) /* f0e8b24: 00409025 */ or $s2,$v0,$zero /* f0e8b28: 8e900010 */ lw $s0,0x10($s4) @@ -7389,7 +7389,7 @@ glabel menuRenderItemKeyboard /* f0e8b34: 00002825 */ or $a1,$zero,$zero /* f0e8b38: 51e00008 */ beqzl $t7,.L0f0e8b5c /* f0e8b3c: 8fb900e4 */ lw $t9,0xe4($sp) -/* f0e8b40: 0fc01a40 */ jal func0f006900 +/* f0e8b40: 0fc01a40 */ jal colourBlend /* f0e8b44: 2406007f */ addiu $a2,$zero,0x7f /* f0e8b48: 2401ff00 */ addiu $at,$zero,-256 /* f0e8b4c: 00417024 */ and $t6,$v0,$at @@ -7479,17 +7479,17 @@ glabel menuRenderItemKeyboard /* f0e8c80: 03350019 */ multu $t9,$s5 /* f0e8c84: 00005812 */ mflo $t3 /* f0e8c88: 03cb6021 */ addu $t4,$s8,$t3 -/* f0e8c8c: 0fc01a40 */ jal func0f006900 +/* f0e8c8c: 0fc01a40 */ jal colourBlend /* f0e8c90: 8d850020 */ lw $a1,0x20($t4) /* f0e8c94: 00408825 */ or $s1,$v0,$zero .L0f0e8c98: /* f0e8c98: 02402025 */ or $a0,$s2,$zero /* f0e8c9c: 324500ff */ andi $a1,$s2,0xff -/* f0e8ca0: 0fc01a40 */ jal func0f006900 +/* f0e8ca0: 0fc01a40 */ jal colourBlend /* f0e8ca4: 2406007f */ addiu $a2,$zero,0x7f /* f0e8ca8: 00402025 */ or $a0,$v0,$zero /* f0e8cac: 02202825 */ or $a1,$s1,$zero -/* f0e8cb0: 0fc01a40 */ jal func0f006900 +/* f0e8cb0: 0fc01a40 */ jal colourBlend /* f0e8cb4: 02603025 */ or $a2,$s3,$zero /* f0e8cb8: 00409025 */ or $s2,$v0,$zero /* f0e8cbc: 868a0000 */ lh $t2,0x0($s4) @@ -7597,7 +7597,7 @@ glabel menuRenderItemKeyboard /* f0e8e30: 03350019 */ multu $t9,$s5 /* f0e8e34: 00005812 */ mflo $t3 /* f0e8e38: 03cb6021 */ addu $t4,$s8,$t3 -/* f0e8e3c: 0fc01a40 */ jal func0f006900 +/* f0e8e3c: 0fc01a40 */ jal colourBlend /* f0e8e40: 8d85001c */ lw $a1,0x1c($t4) /* f0e8e44: 00409025 */ or $s2,$v0,$zero /* f0e8e48: 8e900010 */ lw $s0,0x10($s4) @@ -7607,7 +7607,7 @@ glabel menuRenderItemKeyboard /* f0e8e54: 00002825 */ or $a1,$zero,$zero /* f0e8e58: 51e00009 */ beqzl $t7,.L0f0e8e80 /* f0e8e5c: 9218003c */ lbu $t8,0x3c($s0) -/* f0e8e60: 0fc01a40 */ jal func0f006900 +/* f0e8e60: 0fc01a40 */ jal colourBlend /* f0e8e64: 2406007f */ addiu $a2,$zero,0x7f /* f0e8e68: 2401ff00 */ addiu $at,$zero,-256 /* f0e8e6c: 00415024 */ and $t2,$v0,$at @@ -8314,7 +8314,7 @@ glabel menuRenderItemSeparator /* f0e9848: 01880019 */ multu $t4,$t0 /* f0e984c: 00006812 */ mflo $t5 /* f0e9850: 00ed7021 */ addu $t6,$a3,$t5 -/* f0e9854: 0fc01a40 */ jal func0f006900 +/* f0e9854: 0fc01a40 */ jal colourBlend /* f0e9858: 8dc50018 */ lw $a1,0x18($t6) /* f0e985c: 00401825 */ or $v1,$v0,$zero .L0f0e9860: @@ -8398,7 +8398,7 @@ glabel func0f0e98ac /* f0e997c: 03100019 */ multu $t8,$s0 /* f0e9980: 0000c812 */ mflo $t9 /* f0e9984: 032e4821 */ addu $t1,$t9,$t6 -/* f0e9988: 0fc01a40 */ jal func0f006900 +/* f0e9988: 0fc01a40 */ jal colourBlend /* f0e998c: 8d250018 */ lw $a1,0x18($t1) /* f0e9990: afa2012c */ sw $v0,0x12c($sp) /* f0e9994: 8fa30134 */ lw $v1,0x134($sp) @@ -8408,7 +8408,7 @@ glabel func0f0e98ac /* f0e99a0: 00002825 */ or $a1,$zero,$zero /* f0e99a4: 5140000b */ beqzl $t2,.L0f0e99d4 /* f0e99a8: 9078003c */ lbu $t8,0x3c($v1) -/* f0e99ac: 0fc01a40 */ jal func0f006900 +/* f0e99ac: 0fc01a40 */ jal colourBlend /* f0e99b0: 2406002c */ addiu $a2,$zero,0x2c /* f0e99b4: 8fac012c */ lw $t4,0x12c($sp) /* f0e99b8: 2401ff00 */ addiu $at,$zero,-256 @@ -9131,7 +9131,7 @@ glabel menuRenderItemModel /* f0ea484: 00005012 */ mflo $t2 /* f0ea488: 006a5821 */ addu $t3,$v1,$t2 /* f0ea48c: 8d650020 */ lw $a1,0x20($t3) -/* f0ea490: 0fc01a40 */ jal func0f006900 +/* f0ea490: 0fc01a40 */ jal colourBlend /* f0ea494: afa70044 */ sw $a3,0x44($sp) /* f0ea498: 8fa70044 */ lw $a3,0x44($sp) /* f0ea49c: afa20038 */ sw $v0,0x38($sp) @@ -9143,7 +9143,7 @@ glabel menuRenderItemModel /* f0ea4b0: 2406007f */ addiu $a2,$zero,0x7f /* f0ea4b4: 51a0000b */ beqzl $t5,.L0f0ea4e4 /* f0ea4b8: 8faa0040 */ lw $t2,0x40($sp) -/* f0ea4bc: 0fc01a40 */ jal func0f006900 +/* f0ea4bc: 0fc01a40 */ jal colourBlend /* f0ea4c0: afa70044 */ sw $a3,0x44($sp) /* f0ea4c4: 8faf0038 */ lw $t7,0x38($sp) /* f0ea4c8: 2401ff00 */ addiu $at,$zero,-256 @@ -9288,7 +9288,7 @@ glabel menuRenderItemLabel /* f0ea6c4: 01f84021 */ addu $t0,$t7,$t8 /* f0ea6c8: 01385021 */ addu $t2,$t1,$t8 /* f0ea6cc: 8d450024 */ lw $a1,0x24($t2) -/* f0ea6d0: 0fc01a40 */ jal func0f006900 +/* f0ea6d0: 0fc01a40 */ jal colourBlend /* f0ea6d4: 8d040024 */ lw $a0,0x24($t0) /* f0ea6d8: 00408825 */ or $s1,$v0,$zero /* f0ea6dc: 8e030010 */ lw $v1,0x10($s0) @@ -9298,7 +9298,7 @@ glabel menuRenderItemLabel /* f0ea6e8: 00002825 */ or $a1,$zero,$zero /* f0ea6ec: 51600009 */ beqzl $t3,.L0f0ea714 /* f0ea6f0: 9062003c */ lbu $v0,0x3c($v1) -/* f0ea6f4: 0fc01a40 */ jal func0f006900 +/* f0ea6f4: 0fc01a40 */ jal colourBlend /* f0ea6f8: 2406007f */ addiu $a2,$zero,0x7f /* f0ea6fc: 2401ff00 */ addiu $at,$zero,-256 /* f0ea700: 00416024 */ and $t4,$v0,$at @@ -9350,7 +9350,7 @@ glabel menuRenderItemLabel /* f0ea7ac: 01385021 */ addu $t2,$t1,$t8 /* f0ea7b0: 01986821 */ addu $t5,$t4,$t8 /* f0ea7b4: 8da50018 */ lw $a1,0x18($t5) -/* f0ea7b8: 0fc01a40 */ jal func0f006900 +/* f0ea7b8: 0fc01a40 */ jal colourBlend /* f0ea7bc: 8d440018 */ lw $a0,0x18($t2) /* f0ea7c0: 00408825 */ or $s1,$v0,$zero /* f0ea7c4: 8e030010 */ lw $v1,0x10($s0) @@ -9360,7 +9360,7 @@ glabel menuRenderItemLabel /* f0ea7d0: 00002825 */ or $a1,$zero,$zero /* f0ea7d4: 51c00009 */ beqzl $t6,.L0f0ea7fc /* f0ea7d8: 9062003c */ lbu $v0,0x3c($v1) -/* f0ea7dc: 0fc01a40 */ jal func0f006900 +/* f0ea7dc: 0fc01a40 */ jal colourBlend /* f0ea7e0: 2406007f */ addiu $a2,$zero,0x7f /* f0ea7e4: 2401ff00 */ addiu $at,$zero,-256 /* f0ea7e8: 00417824 */ and $t7,$v0,$at @@ -9414,7 +9414,7 @@ glabel menuRenderItemLabel /* f0ea89c: 01a70019 */ multu $t5,$a3 /* f0ea8a0: 00007012 */ mflo $t6 /* f0ea8a4: 004e7821 */ addu $t7,$v0,$t6 -/* f0ea8a8: 0fc01a40 */ jal func0f006900 +/* f0ea8a8: 0fc01a40 */ jal colourBlend /* f0ea8ac: 8de5001c */ lw $a1,0x1c($t7) /* f0ea8b0: 00408825 */ or $s1,$v0,$zero /* f0ea8b4: 8e030010 */ lw $v1,0x10($s0) @@ -9424,7 +9424,7 @@ glabel menuRenderItemLabel /* f0ea8c0: 00002825 */ or $a1,$zero,$zero /* f0ea8c4: 51000009 */ beqzl $t0,.L0f0ea8ec /* f0ea8c8: 9062003c */ lbu $v0,0x3c($v1) -/* f0ea8cc: 0fc01a40 */ jal func0f006900 +/* f0ea8cc: 0fc01a40 */ jal colourBlend /* f0ea8d0: 2406007f */ addiu $a2,$zero,0x7f /* f0ea8d4: 2401ff00 */ addiu $at,$zero,-256 /* f0ea8d8: 0041c824 */ and $t9,$v0,$at @@ -9687,7 +9687,7 @@ glabel menuRenderItem15 /* f0eac98: 01680019 */ multu $t3,$t0 /* f0eac9c: 00006012 */ mflo $t4 /* f0eaca0: 004c6821 */ addu $t5,$v0,$t4 -/* f0eaca4: 0fc01a40 */ jal func0f006900 +/* f0eaca4: 0fc01a40 */ jal colourBlend /* f0eaca8: 8da50018 */ lw $a1,0x18($t5) /* f0eacac: 00403825 */ or $a3,$v0,$zero /* f0eacb0: 8e030010 */ lw $v1,0x10($s0) @@ -9697,7 +9697,7 @@ glabel menuRenderItem15 /* f0eacbc: 00002825 */ or $a1,$zero,$zero /* f0eacc0: 11c00008 */ beqz $t6,.L0f0eace4 /* f0eacc4: 2406007f */ addiu $a2,$zero,0x7f -/* f0eacc8: 0fc01a40 */ jal func0f006900 +/* f0eacc8: 0fc01a40 */ jal colourBlend /* f0eaccc: afa7005c */ sw $a3,0x5c($sp) /* f0eacd0: 8fa7005c */ lw $a3,0x5c($sp) /* f0eacd4: 2401ff00 */ addiu $at,$zero,-256 @@ -9710,7 +9710,7 @@ glabel menuRenderItem15 /* f0eacec: 02212025 */ or $a0,$s1,$at /* f0eacf0: 00808825 */ or $s1,$a0,$zero /* f0eacf4: 308500ff */ andi $a1,$a0,0xff -/* f0eacf8: 0fc01a40 */ jal func0f006900 +/* f0eacf8: 0fc01a40 */ jal colourBlend /* f0eacfc: 2406007f */ addiu $a2,$zero,0x7f /* f0ead00: 86060000 */ lh $a2,0x0($s0) /* f0ead04: 8fa40078 */ lw $a0,0x78($sp) @@ -9896,7 +9896,7 @@ glabel menuRenderItemSelectable /* f0eafb4: 01385021 */ addu $t2,$t1,$t8 /* f0eafb8: 8d450018 */ lw $a1,0x18($t2) /* f0eafbc: 8f240018 */ lw $a0,0x18($t9) -/* f0eafc0: 0fc01a40 */ jal func0f006900 +/* f0eafc0: 0fc01a40 */ jal colourBlend /* f0eafc4: 8c660044 */ lw $a2,0x44($v1) /* f0eafc8: 00408825 */ or $s1,$v0,$zero /* f0eafcc: 8e030010 */ lw $v1,0x10($s0) @@ -9906,7 +9906,7 @@ glabel menuRenderItemSelectable /* f0eafd8: 00002825 */ or $a1,$zero,$zero /* f0eafdc: 51600008 */ beqzl $t3,.L0f0eb000 /* f0eafe0: afb10078 */ sw $s1,0x78($sp) -/* f0eafe4: 0fc01a40 */ jal func0f006900 +/* f0eafe4: 0fc01a40 */ jal colourBlend /* f0eafe8: 2406007f */ addiu $a2,$zero,0x7f /* f0eafec: 2401ff00 */ addiu $at,$zero,-256 /* f0eaff0: 00416024 */ and $t4,$v0,$at @@ -9991,18 +9991,18 @@ glabel menuRenderItemSelectable /* f0eb118: 014b6021 */ addu $t4,$t2,$t3 /* f0eb11c: 01cb7821 */ addu $t7,$t6,$t3 /* f0eb120: 8de50020 */ lw $a1,0x20($t7) -/* f0eb124: 0fc01a40 */ jal func0f006900 +/* f0eb124: 0fc01a40 */ jal colourBlend /* f0eb128: 8d840020 */ lw $a0,0x20($t4) /* f0eb12c: 00403825 */ or $a3,$v0,$zero .L0f0eb130: /* f0eb130: 02202025 */ or $a0,$s1,$zero /* f0eb134: 322500ff */ andi $a1,$s1,0xff /* f0eb138: 2406007f */ addiu $a2,$zero,0x7f -/* f0eb13c: 0fc01a40 */ jal func0f006900 +/* f0eb13c: 0fc01a40 */ jal colourBlend /* f0eb140: afa70060 */ sw $a3,0x60($sp) /* f0eb144: 8fa50060 */ lw $a1,0x60($sp) /* f0eb148: 00402025 */ or $a0,$v0,$zero -/* f0eb14c: 0fc01a40 */ jal func0f006900 +/* f0eb14c: 0fc01a40 */ jal colourBlend /* f0eb150: 8fa6005c */ lw $a2,0x5c($sp) /* f0eb154: 8e190010 */ lw $t9,0x10($s0) /* f0eb158: 3c047f1b */ lui $a0,%hi(var7f1b22a0) @@ -10068,7 +10068,7 @@ glabel menuRenderItemSelectable /* f0eb23c: 004e5821 */ addu $t3,$v0,$t6 /* f0eb240: 00594021 */ addu $t0,$v0,$t9 /* f0eb244: 8d05001c */ lw $a1,0x1c($t0) -/* f0eb248: 0fc01a40 */ jal func0f006900 +/* f0eb248: 0fc01a40 */ jal colourBlend /* f0eb24c: 8d64001c */ lw $a0,0x1c($t3) /* f0eb250: 00408825 */ or $s1,$v0,$zero /* f0eb254: 8e030010 */ lw $v1,0x10($s0) @@ -10078,7 +10078,7 @@ glabel menuRenderItemSelectable /* f0eb260: 00002825 */ or $a1,$zero,$zero /* f0eb264: 51200009 */ beqzl $t1,.L0f0eb28c /* f0eb268: afb10078 */ sw $s1,0x78($sp) -/* f0eb26c: 0fc01a40 */ jal func0f006900 +/* f0eb26c: 0fc01a40 */ jal colourBlend /* f0eb270: 2406007f */ addiu $a2,$zero,0x7f /* f0eb274: 2401ff00 */ addiu $at,$zero,-256 /* f0eb278: 0041c024 */ and $t8,$v0,$at @@ -10371,7 +10371,7 @@ glabel menuRenderItemSlider /* f0eb68c: 01720019 */ multu $t3,$s2 /* f0eb690: 0000c012 */ mflo $t8 /* f0eb694: 030dc821 */ addu $t9,$t8,$t5 -/* f0eb698: 0fc01a40 */ jal func0f006900 +/* f0eb698: 0fc01a40 */ jal colourBlend /* f0eb69c: 8f250018 */ lw $a1,0x18($t9) /* f0eb6a0: 00408025 */ or $s0,$v0,$zero /* f0eb6a4: 8e230010 */ lw $v1,0x10($s1) @@ -10381,7 +10381,7 @@ glabel menuRenderItemSlider /* f0eb6b0: 00002825 */ or $a1,$zero,$zero /* f0eb6b4: 51000008 */ beqzl $t0,.L0f0eb6d8 /* f0eb6b8: 8e22000c */ lw $v0,0xc($s1) -/* f0eb6bc: 0fc01a40 */ jal func0f006900 +/* f0eb6bc: 0fc01a40 */ jal colourBlend /* f0eb6c0: 2406007f */ addiu $a2,$zero,0x7f /* f0eb6c4: 2401ff00 */ addiu $at,$zero,-256 /* f0eb6c8: 00414824 */ and $t1,$v0,$at @@ -10463,18 +10463,18 @@ glabel menuRenderItemSlider /* f0eb7e4: 01520019 */ multu $t2,$s2 /* f0eb7e8: 00006012 */ mflo $t4 /* f0eb7ec: 01887021 */ addu $t6,$t4,$t0 -/* f0eb7f0: 0fc01a40 */ jal func0f006900 +/* f0eb7f0: 0fc01a40 */ jal colourBlend /* f0eb7f4: 8dc50020 */ lw $a1,0x20($t6) /* f0eb7f8: 00403825 */ or $a3,$v0,$zero .L0f0eb7fc: /* f0eb7fc: 02002025 */ or $a0,$s0,$zero /* f0eb800: 320500ff */ andi $a1,$s0,0xff /* f0eb804: 2406007f */ addiu $a2,$zero,0x7f -/* f0eb808: 0fc01a40 */ jal func0f006900 +/* f0eb808: 0fc01a40 */ jal colourBlend /* f0eb80c: afa70068 */ sw $a3,0x68($sp) /* f0eb810: 8fa50068 */ lw $a1,0x68($sp) /* f0eb814: 00402025 */ or $a0,$v0,$zero -/* f0eb818: 0fc01a40 */ jal func0f006900 +/* f0eb818: 0fc01a40 */ jal colourBlend /* f0eb81c: 8fa60064 */ lw $a2,0x64($sp) /* f0eb820: 345000ff */ ori $s0,$v0,0xff .L0f0eb824: @@ -10548,7 +10548,7 @@ glabel menuRenderItemSlider /* f0eb924: 01520019 */ multu $t2,$s2 /* f0eb928: 00006012 */ mflo $t4 /* f0eb92c: 01994021 */ addu $t0,$t4,$t9 -/* f0eb930: 0fc01a40 */ jal func0f006900 +/* f0eb930: 0fc01a40 */ jal colourBlend /* f0eb934: 8d050018 */ lw $a1,0x18($t0) /* f0eb938: 00408025 */ or $s0,$v0,$zero /* f0eb93c: 8e230010 */ lw $v1,0x10($s1) @@ -10558,7 +10558,7 @@ glabel menuRenderItemSlider /* f0eb948: 00002825 */ or $a1,$zero,$zero /* f0eb94c: 51c00008 */ beqzl $t6,.L0f0eb970 /* f0eb950: 8e22000c */ lw $v0,0xc($s1) -/* f0eb954: 0fc01a40 */ jal func0f006900 +/* f0eb954: 0fc01a40 */ jal colourBlend /* f0eb958: 2406007f */ addiu $a2,$zero,0x7f /* f0eb95c: 2401ff00 */ addiu $at,$zero,-256 /* f0eb960: 00417824 */ and $t7,$v0,$at @@ -10641,18 +10641,18 @@ glabel menuRenderItemSlider /* f0eba80: 01720019 */ multu $t3,$s2 /* f0eba84: 0000c012 */ mflo $t8 /* f0eba88: 030e6821 */ addu $t5,$t8,$t6 -/* f0eba8c: 0fc01a40 */ jal func0f006900 +/* f0eba8c: 0fc01a40 */ jal colourBlend /* f0eba90: 8da50020 */ lw $a1,0x20($t5) /* f0eba94: 00403825 */ or $a3,$v0,$zero .L0f0eba98: /* f0eba98: 02002025 */ or $a0,$s0,$zero /* f0eba9c: 320500ff */ andi $a1,$s0,0xff /* f0ebaa0: 2406007f */ addiu $a2,$zero,0x7f -/* f0ebaa4: 0fc01a40 */ jal func0f006900 +/* f0ebaa4: 0fc01a40 */ jal colourBlend /* f0ebaa8: afa70060 */ sw $a3,0x60($sp) /* f0ebaac: 8fa50060 */ lw $a1,0x60($sp) /* f0ebab0: 00402025 */ or $a0,$v0,$zero -/* f0ebab4: 0fc01a40 */ jal func0f006900 +/* f0ebab4: 0fc01a40 */ jal colourBlend /* f0ebab8: 8fa6005c */ lw $a2,0x5c($sp) /* f0ebabc: 10000050 */ beqz $zero,.L0f0ebc00 /* f0ebac0: 00408025 */ or $s0,$v0,$zero @@ -10727,18 +10727,18 @@ glabel menuRenderItemSlider /* f0ebbc0: 01d20019 */ multu $t6,$s2 /* f0ebbc4: 00006812 */ mflo $t5 /* f0ebbc8: 01ab4821 */ addu $t1,$t5,$t3 -/* f0ebbcc: 0fc01a40 */ jal func0f006900 +/* f0ebbcc: 0fc01a40 */ jal colourBlend /* f0ebbd0: 8d250020 */ lw $a1,0x20($t1) /* f0ebbd4: 00403825 */ or $a3,$v0,$zero .L0f0ebbd8: /* f0ebbd8: 02002025 */ or $a0,$s0,$zero /* f0ebbdc: 320500ff */ andi $a1,$s0,0xff /* f0ebbe0: 2406007f */ addiu $a2,$zero,0x7f -/* f0ebbe4: 0fc01a40 */ jal func0f006900 +/* f0ebbe4: 0fc01a40 */ jal colourBlend /* f0ebbe8: afa70058 */ sw $a3,0x58($sp) /* f0ebbec: 8fa50058 */ lw $a1,0x58($sp) /* f0ebbf0: 00402025 */ or $a0,$v0,$zero -/* f0ebbf4: 0fc01a40 */ jal func0f006900 +/* f0ebbf4: 0fc01a40 */ jal colourBlend /* f0ebbf8: 8fa60054 */ lw $a2,0x54($sp) /* f0ebbfc: 00408025 */ or $s0,$v0,$zero .L0f0ebc00: @@ -10866,7 +10866,7 @@ glabel menuRenderItemSlider /* f0ebdd4: 01320019 */ multu $t1,$s2 /* f0ebdd8: 00005012 */ mflo $t2 /* f0ebddc: 004a6021 */ addu $t4,$v0,$t2 -/* f0ebde0: 0fc01a40 */ jal func0f006900 +/* f0ebde0: 0fc01a40 */ jal colourBlend /* f0ebde4: 8d850018 */ lw $a1,0x18($t4) /* f0ebde8: 00408025 */ or $s0,$v0,$zero /* f0ebdec: 8e230010 */ lw $v1,0x10($s1) @@ -10876,7 +10876,7 @@ glabel menuRenderItemSlider /* f0ebdf8: 00002825 */ or $a1,$zero,$zero /* f0ebdfc: 51000009 */ beqzl $t0,.L0f0ebe24 /* f0ebe00: 9078003c */ lbu $t8,0x3c($v1) -/* f0ebe04: 0fc01a40 */ jal func0f006900 +/* f0ebe04: 0fc01a40 */ jal colourBlend /* f0ebe08: 2406007f */ addiu $a2,$zero,0x7f /* f0ebe0c: 2401ff00 */ addiu $at,$zero,-256 /* f0ebe10: 00417824 */ and $t7,$v0,$at @@ -11256,7 +11256,7 @@ glabel menuRenderItemCarousel /* f0ec358: 01c80019 */ multu $t6,$t0 /* f0ec35c: 00007812 */ mflo $t7 /* f0ec360: 006fc021 */ addu $t8,$v1,$t7 -/* f0ec364: 0fc01a40 */ jal func0f006900 +/* f0ec364: 0fc01a40 */ jal colourBlend /* f0ec368: 8f050020 */ lw $a1,0x20($t8) /* f0ec36c: 00403825 */ or $a3,$v0,$zero .L0f0ec370: @@ -11264,11 +11264,11 @@ glabel menuRenderItemCarousel /* f0ec374: 348400ff */ ori $a0,$a0,0xff /* f0ec378: 240500ff */ addiu $a1,$zero,0xff /* f0ec37c: 2406007f */ addiu $a2,$zero,0x7f -/* f0ec380: 0fc01a40 */ jal func0f006900 +/* f0ec380: 0fc01a40 */ jal colourBlend /* f0ec384: afa70068 */ sw $a3,0x68($sp) /* f0ec388: 8fa50068 */ lw $a1,0x68($sp) /* f0ec38c: 00402025 */ or $a0,$v0,$zero -/* f0ec390: 0fc01a40 */ jal func0f006900 +/* f0ec390: 0fc01a40 */ jal colourBlend /* f0ec394: 8fa60064 */ lw $a2,0x64($sp) /* f0ec398: 00401825 */ or $v1,$v0,$zero .L0f0ec39c: @@ -11542,7 +11542,7 @@ glabel menuRenderItemCheckbox /* f0ec760: 01cfc021 */ addu $t8,$t6,$t7 /* f0ec764: 010f4821 */ addu $t1,$t0,$t7 /* f0ec768: 8d250024 */ lw $a1,0x24($t1) -/* f0ec76c: 0fc01a40 */ jal func0f006900 +/* f0ec76c: 0fc01a40 */ jal colourBlend /* f0ec770: 8f040024 */ lw $a0,0x24($t8) /* f0ec774: 00408025 */ or $s0,$v0,$zero /* f0ec778: 8e270010 */ lw $a3,0x10($s1) @@ -11552,7 +11552,7 @@ glabel menuRenderItemCheckbox /* f0ec784: 00002825 */ or $a1,$zero,$zero /* f0ec788: 51400009 */ beqzl $t2,.L0f0ec7b0 /* f0ec78c: 90e3003c */ lbu $v1,0x3c($a3) -/* f0ec790: 0fc01a40 */ jal func0f006900 +/* f0ec790: 0fc01a40 */ jal colourBlend /* f0ec794: 2406007f */ addiu $a2,$zero,0x7f /* f0ec798: 2401ff00 */ addiu $at,$zero,-256 /* f0ec79c: 00415824 */ and $t3,$v0,$at @@ -11605,7 +11605,7 @@ glabel menuRenderItemCheckbox /* f0ec848: 010f4821 */ addu $t1,$t0,$t7 /* f0ec84c: 016f6021 */ addu $t4,$t3,$t7 /* f0ec850: 8d850018 */ lw $a1,0x18($t4) -/* f0ec854: 0fc01a40 */ jal func0f006900 +/* f0ec854: 0fc01a40 */ jal colourBlend /* f0ec858: 8d240018 */ lw $a0,0x18($t1) /* f0ec85c: 00408025 */ or $s0,$v0,$zero /* f0ec860: 8e270010 */ lw $a3,0x10($s1) @@ -11615,7 +11615,7 @@ glabel menuRenderItemCheckbox /* f0ec86c: 00002825 */ or $a1,$zero,$zero /* f0ec870: 51a00009 */ beqzl $t5,.L0f0ec898 /* f0ec874: 90e3003c */ lbu $v1,0x3c($a3) -/* f0ec878: 0fc01a40 */ jal func0f006900 +/* f0ec878: 0fc01a40 */ jal colourBlend /* f0ec87c: 2406007f */ addiu $a2,$zero,0x7f /* f0ec880: 2401ff00 */ addiu $at,$zero,-256 /* f0ec884: 00417024 */ and $t6,$v0,$at @@ -11716,17 +11716,17 @@ glabel menuRenderItemCheckbox /* f0ec9e8: 004ec021 */ addu $t8,$v0,$t6 /* f0ec9ec: 00484821 */ addu $t1,$v0,$t0 /* f0ec9f0: 8d250020 */ lw $a1,0x20($t1) -/* f0ec9f4: 0fc01a40 */ jal func0f006900 +/* f0ec9f4: 0fc01a40 */ jal colourBlend /* f0ec9f8: 8f040020 */ lw $a0,0x20($t8) /* f0ec9fc: afa20050 */ sw $v0,0x50($sp) .L0f0eca00: /* f0eca00: 02002025 */ or $a0,$s0,$zero /* f0eca04: 320500ff */ andi $a1,$s0,0xff -/* f0eca08: 0fc01a40 */ jal func0f006900 +/* f0eca08: 0fc01a40 */ jal colourBlend /* f0eca0c: 2406007f */ addiu $a2,$zero,0x7f /* f0eca10: 00402025 */ or $a0,$v0,$zero /* f0eca14: 8fa50050 */ lw $a1,0x50($sp) -/* f0eca18: 0fc01a40 */ jal func0f006900 +/* f0eca18: 0fc01a40 */ jal colourBlend /* f0eca1c: 8fa6004c */ lw $a2,0x4c($sp) /* f0eca20: 8e2a0010 */ lw $t2,0x10($s1) /* f0eca24: 3c047f1b */ lui $a0,%hi(var7f1b22a0) @@ -11776,7 +11776,7 @@ glabel menuRenderItemCheckbox /* f0ecacc: 03230019 */ multu $t9,$v1 /* f0ecad0: 00004012 */ mflo $t0 /* f0ecad4: 00484821 */ addu $t1,$v0,$t0 -/* f0ecad8: 0fc01a40 */ jal func0f006900 +/* f0ecad8: 0fc01a40 */ jal colourBlend /* f0ecadc: 8d25001c */ lw $a1,0x1c($t1) /* f0ecae0: 00408025 */ or $s0,$v0,$zero /* f0ecae4: 8e270010 */ lw $a3,0x10($s1) @@ -11786,7 +11786,7 @@ glabel menuRenderItemCheckbox /* f0ecaf0: 00002825 */ or $a1,$zero,$zero /* f0ecaf4: 51400009 */ beqzl $t2,.L0f0ecb1c /* f0ecaf8: 90e3003c */ lbu $v1,0x3c($a3) -/* f0ecafc: 0fc01a40 */ jal func0f006900 +/* f0ecafc: 0fc01a40 */ jal colourBlend /* f0ecb00: 2406007f */ addiu $a2,$zero,0x7f /* f0ecb04: 2401ff00 */ addiu $at,$zero,-256 /* f0ecb08: 00415824 */ and $t3,$v0,$at @@ -12074,7 +12074,7 @@ glabel menuRenderItemScrollable /* f0ed034: 004d7021 */ addu $t6,$v0,$t5 /* f0ed038: 00585021 */ addu $t2,$v0,$t8 /* f0ed03c: 8d450018 */ lw $a1,0x18($t2) -/* f0ed040: 0fc01a40 */ jal func0f006900 +/* f0ed040: 0fc01a40 */ jal colourBlend /* f0ed044: 8dc40018 */ lw $a0,0x18($t6) /* f0ed048: afa2005c */ sw $v0,0x5c($sp) /* f0ed04c: 8e030010 */ lw $v1,0x10($s0) @@ -12084,7 +12084,7 @@ glabel menuRenderItemScrollable /* f0ed058: 00002825 */ or $a1,$zero,$zero /* f0ed05c: 51e0000b */ beqzl $t7,.L0f0ed08c /* f0ed060: 9062003c */ lbu $v0,0x3c($v1) -/* f0ed064: 0fc01a40 */ jal func0f006900 +/* f0ed064: 0fc01a40 */ jal colourBlend /* f0ed068: 2406007f */ addiu $a2,$zero,0x7f /* f0ed06c: 8fac005c */ lw $t4,0x5c($sp) /* f0ed070: 2401ff00 */ addiu $at,$zero,-256 @@ -12488,7 +12488,7 @@ glabel menuRenderItemMarquee /* f0ed624: 01470019 */ multu $t2,$a3 /* f0ed628: 00005812 */ mflo $t3 /* f0ed62c: 004b6021 */ addu $t4,$v0,$t3 -/* f0ed630: 0fc01a40 */ jal func0f006900 +/* f0ed630: 0fc01a40 */ jal colourBlend /* f0ed634: 8d850018 */ lw $a1,0x18($t4) /* f0ed638: afa20074 */ sw $v0,0x74($sp) /* f0ed63c: 8e230010 */ lw $v1,0x10($s1) @@ -12498,7 +12498,7 @@ glabel menuRenderItemMarquee /* f0ed648: 8fab0084 */ lw $t3,0x84($sp) /* f0ed64c: 8fa40074 */ lw $a0,0x74($sp) /* f0ed650: 00002825 */ or $a1,$zero,$zero -/* f0ed654: 0fc01a40 */ jal func0f006900 +/* f0ed654: 0fc01a40 */ jal colourBlend /* f0ed658: 2406007f */ addiu $a2,$zero,0x7f /* f0ed65c: 8faf0074 */ lw $t7,0x74($sp) /* f0ed660: 2401ff00 */ addiu $at,$zero,-256 @@ -12947,7 +12947,7 @@ glabel menuRenderItemRanking /* f0edc90: 01340019 */ multu $t1,$s4 /* f0edc94: 00005012 */ mflo $t2 /* f0edc98: 026a6021 */ addu $t4,$s3,$t2 -/* f0edc9c: 0fc01a40 */ jal func0f006900 +/* f0edc9c: 0fc01a40 */ jal colourBlend /* f0edca0: 8d850018 */ lw $a1,0x18($t4) /* f0edca4: 00408025 */ or $s0,$v0,$zero /* f0edca8: 8fd10010 */ lw $s1,0x10($s8) @@ -12956,7 +12956,7 @@ glabel menuRenderItemRanking /* f0edcb0: 11600008 */ beqz $t3,.L0f0edcd4 /* f0edcb4: 02002025 */ or $a0,$s0,$zero /* f0edcb8: 00002825 */ or $a1,$zero,$zero -/* f0edcbc: 0fc01a40 */ jal func0f006900 +/* f0edcbc: 0fc01a40 */ jal colourBlend /* f0edcc0: 2406007f */ addiu $a2,$zero,0x7f /* f0edcc4: 2415ff00 */ addiu $s5,$zero,-256 /* f0edcc8: 00556824 */ and $t5,$v0,$s5 @@ -13076,7 +13076,7 @@ glabel menuRenderItemRanking /* f0ede84: 01d40019 */ multu $t6,$s4 /* f0ede88: 00007812 */ mflo $t7 /* f0ede8c: 026fc021 */ addu $t8,$s3,$t7 -/* f0ede90: 0fc01a40 */ jal func0f006900 +/* f0ede90: 0fc01a40 */ jal colourBlend /* f0ede94: 8f050000 */ lw $a1,0x0($t8) /* f0ede98: 00409025 */ or $s2,$v0,$zero .L0f0ede9c: @@ -13084,7 +13084,7 @@ glabel menuRenderItemRanking /* f0edea0: 13200007 */ beqz $t9,.L0f0edec0 /* f0edea4: 02402025 */ or $a0,$s2,$zero /* f0edea8: 00002825 */ or $a1,$zero,$zero -/* f0edeac: 0fc01a40 */ jal func0f006900 +/* f0edeac: 0fc01a40 */ jal colourBlend /* f0edeb0: 2406002c */ addiu $a2,$zero,0x2c /* f0edeb4: 00554024 */ and $t0,$v0,$s5 /* f0edeb8: 324900ff */ andi $t1,$s2,0xff @@ -13109,7 +13109,7 @@ glabel menuRenderItemRanking /* f0edefc: 01740019 */ multu $t3,$s4 /* f0edf00: 00006812 */ mflo $t5 /* f0edf04: 026d7021 */ addu $t6,$s3,$t5 -/* f0edf08: 0fc01a40 */ jal func0f006900 +/* f0edf08: 0fc01a40 */ jal colourBlend /* f0edf0c: 8dc40008 */ lw $a0,0x8($t6) /* f0edf10: 00408825 */ or $s1,$v0,$zero /* f0edf14: 8e03000c */ lw $v1,0xc($s0) @@ -13117,7 +13117,7 @@ glabel menuRenderItemRanking /* f0edf18: 10600004 */ beqz $v1,.L0f0edf2c /* f0edf1c: 02202025 */ or $a0,$s1,$zero /* f0edf20: 00002825 */ or $a1,$zero,$zero -/* f0edf24: 0fc01a40 */ jal func0f006900 +/* f0edf24: 0fc01a40 */ jal colourBlend /* f0edf28: 2406002c */ addiu $a2,$zero,0x2c .L0f0edf2c: /* f0edf2c: 87c50002 */ lh $a1,0x2($s8) @@ -13361,7 +13361,7 @@ glabel menuRenderItemRanking .L0f0ee2ac: /* f0ee2ac: 3c0500ff */ lui $a1,0xff /* f0ee2b0: 34a5ffff */ ori $a1,$a1,0xffff -/* f0ee2b4: 0fc01a40 */ jal func0f006900 +/* f0ee2b4: 0fc01a40 */ jal colourBlend /* f0ee2b8: 02403025 */ or $a2,$s2,$zero /* f0ee2bc: 87c80000 */ lh $t0,0x0($s8) /* f0ee2c0: 8fac0098 */ lw $t4,0x98($sp) @@ -13425,7 +13425,7 @@ glabel menuRenderItemRanking /* f0ee3a0: 15000030 */ bnez $t0,.L0f0ee464 /* f0ee3a4: 3c05ff40 */ lui $a1,0xff40 /* f0ee3a8: 34a540ff */ ori $a1,$a1,0x40ff -/* f0ee3ac: 0fc01a40 */ jal func0f006900 +/* f0ee3ac: 0fc01a40 */ jal colourBlend /* f0ee3b0: 02403025 */ or $a2,$s2,$zero /* f0ee3b4: 8e290000 */ lw $t1,0x0($s1) /* f0ee3b8: 3c057f1b */ lui $a1,%hi(var7f1b1e44) @@ -13476,7 +13476,7 @@ glabel menuRenderItemRanking /* f0ee468: 3c0500ff */ lui $a1,0xff /* f0ee46c: 34a500ff */ ori $a1,$a1,0xff /* f0ee470: 348400ff */ ori $a0,$a0,0xff -/* f0ee474: 0fc01a40 */ jal func0f006900 +/* f0ee474: 0fc01a40 */ jal colourBlend /* f0ee478: 02403025 */ or $a2,$s2,$zero /* f0ee47c: 3c057f1b */ lui $a1,%hi(var7f1b1e48) /* f0ee480: 00408025 */ or $s0,$v0,$zero @@ -13731,17 +13731,17 @@ glabel menuRenderItemPlayerStats /* f0ee804: 01896821 */ addu $t5,$t4,$t1 /* f0ee808: 8da50020 */ lw $a1,0x20($t5) /* f0ee80c: 8d440020 */ lw $a0,0x20($t2) -/* f0ee810: 0fc01a40 */ jal func0f006900 +/* f0ee810: 0fc01a40 */ jal colourBlend /* f0ee814: 8e060044 */ lw $a2,0x44($s0) /* f0ee818: 00409025 */ or $s2,$v0,$zero .L0f0ee81c: /* f0ee81c: 2404ffff */ addiu $a0,$zero,-1 /* f0ee820: 240500ff */ addiu $a1,$zero,0xff -/* f0ee824: 0fc01a40 */ jal func0f006900 +/* f0ee824: 0fc01a40 */ jal colourBlend /* f0ee828: 2406007f */ addiu $a2,$zero,0x7f /* f0ee82c: 00402025 */ or $a0,$v0,$zero /* f0ee830: 02402825 */ or $a1,$s2,$zero -/* f0ee834: 0fc01a40 */ jal func0f006900 +/* f0ee834: 0fc01a40 */ jal colourBlend /* f0ee838: 02603025 */ or $a2,$s3,$zero /* f0ee83c: 862e0000 */ lh $t6,0x0($s1) /* f0ee840: 3c158008 */ lui $s5,%hi(var8007fb10) @@ -13803,7 +13803,7 @@ glabel menuRenderItemPlayerStats /* f0ee91c: 01796021 */ addu $t4,$t3,$t9 /* f0ee920: 8d850018 */ lw $a1,0x18($t4) /* f0ee924: 8d040018 */ lw $a0,0x18($t0) -/* f0ee928: 0fc01a40 */ jal func0f006900 +/* f0ee928: 0fc01a40 */ jal colourBlend /* f0ee92c: 8e060044 */ lw $a2,0x44($s0) /* f0ee930: afa200b8 */ sw $v0,0xb8($sp) /* f0ee934: 8e300010 */ lw $s0,0x10($s1) @@ -13813,7 +13813,7 @@ glabel menuRenderItemPlayerStats /* f0ee940: 00000000 */ sll $zero,$zero,0x0 /* f0ee944: 8fa400b8 */ lw $a0,0xb8($sp) /* f0ee948: 00002825 */ or $a1,$zero,$zero -/* f0ee94c: 0fc01a40 */ jal func0f006900 +/* f0ee94c: 0fc01a40 */ jal colourBlend /* f0ee950: 2406007f */ addiu $a2,$zero,0x7f /* f0ee954: 8fb000b8 */ lw $s0,0xb8($sp) /* f0ee958: 2401ff00 */ addiu $at,$zero,-256 @@ -13950,7 +13950,7 @@ glabel menuRenderItemPlayerStats /* f0eeb5c: 03230019 */ multu $t9,$v1 /* f0eeb60: 00006012 */ mflo $t4 /* f0eeb64: 004c4821 */ addu $t1,$v0,$t4 -/* f0eeb68: 0fc01a40 */ jal func0f006900 +/* f0eeb68: 0fc01a40 */ jal colourBlend /* f0eeb6c: 8d250018 */ lw $a1,0x18($t1) /* f0eeb70: afa200b8 */ sw $v0,0xb8($sp) /* f0eeb74: 8e300010 */ lw $s0,0x10($s1) @@ -13961,7 +13961,7 @@ glabel menuRenderItemPlayerStats /* f0eeb84: 8fb000b8 */ lw $s0,0xb8($sp) /* f0eeb88: 00002825 */ or $a1,$zero,$zero /* f0eeb8c: 2406007f */ addiu $a2,$zero,0x7f -/* f0eeb90: 0fc01a40 */ jal func0f006900 +/* f0eeb90: 0fc01a40 */ jal colourBlend /* f0eeb94: 02002025 */ or $a0,$s0,$zero /* f0eeb98: 2401ff00 */ addiu $at,$zero,-256 /* f0eeb9c: 00417024 */ and $t6,$v0,$at @@ -15421,7 +15421,7 @@ glabel menuRenderItemController /* f0f0160: 8f250018 */ lw $a1,0x18($t9) /* f0f0164: 8dc40018 */ lw $a0,0x18($t6) /* f0f0168: 8ce60044 */ lw $a2,0x44($a3) -/* f0f016c: 0fc01a40 */ jal func0f006900 +/* f0f016c: 0fc01a40 */ jal colourBlend /* f0f0170: afa70068 */ sw $a3,0x68($sp) /* f0f0174: 8fa70068 */ lw $a3,0x68($sp) /* f0f0178: afa20098 */ sw $v0,0x98($sp) @@ -15432,7 +15432,7 @@ glabel menuRenderItemController /* f0f0188: 8fa40098 */ lw $a0,0x98($sp) /* f0f018c: 00002825 */ or $a1,$zero,$zero /* f0f0190: 2406002c */ addiu $a2,$zero,0x2c -/* f0f0194: 0fc01a40 */ jal func0f006900 +/* f0f0194: 0fc01a40 */ jal colourBlend /* f0f0198: afa70068 */ sw $a3,0x68($sp) /* f0f019c: 8fab0098 */ lw $t3,0x98($sp) /* f0f01a0: 2401ff00 */ addiu $at,$zero,-256 @@ -15563,12 +15563,12 @@ glabel menuRenderItemController /* f0f0388: afa200a0 */ sw $v0,0xa0($sp) /* f0f038c: 00812824 */ and $a1,$a0,$at /* f0f0390: afa50044 */ sw $a1,0x44($sp) -/* f0f0394: 0fc01a40 */ jal func0f006900 +/* f0f0394: 0fc01a40 */ jal colourBlend /* f0f0398: 8fa60060 */ lw $a2,0x60($sp) /* f0f039c: 8fa50044 */ lw $a1,0x44($sp) /* f0f03a0: afa20094 */ sw $v0,0x94($sp) /* f0f03a4: 8fa40098 */ lw $a0,0x98($sp) -/* f0f03a8: 0fc01a40 */ jal func0f006900 +/* f0f03a8: 0fc01a40 */ jal colourBlend /* f0f03ac: 8fa60064 */ lw $a2,0x64($sp) /* f0f03b0: 3c188007 */ lui $t8,%hi(g_MpPlayerNum) /* f0f03b4: 8f181448 */ lw $t8,%lo(g_MpPlayerNum)($t8) diff --git a/src/game/game_0f09f0.c b/src/game/game_0f09f0.c index 488ba7c73..52b1a1bf4 100644 --- a/src/game/game_0f09f0.c +++ b/src/game/game_0f09f0.c @@ -4509,11 +4509,11 @@ glabel var7f1b2948 /* f0f44a8: 1000002a */ beqz $zero,.L0f0f4554 /* f0f44ac: e7a60394 */ swc1 $f6,0x394($sp) .L0f0f44b0: -/* f0f44b0: 0c002f40 */ jal func0000bd00 +/* f0f44b0: 0c002f40 */ jal viGetLeft /* f0f44b4: 00000000 */ sll $zero,$zero,0x0 /* f0f44b8: 00028c00 */ sll $s1,$v0,0x10 /* f0f44bc: 00117403 */ sra $t6,$s1,0x10 -/* f0f44c0: 0c002f22 */ jal func0000bc88 +/* f0f44c0: 0c002f22 */ jal viGetWidth /* f0f44c4: 01c08825 */ or $s1,$t6,$zero /* f0f44c8: 44825000 */ mtc1 $v0,$f10 /* f0f44cc: 3c013f00 */ lui $at,0x3f00 @@ -4532,11 +4532,11 @@ glabel var7f1b2948 /* f0f4500: 46805120 */ cvt.s.w $f4,$f10 /* f0f4504: 46044280 */ add.s $f10,$f8,$f4 /* f0f4508: 460a3200 */ add.s $f8,$f6,$f10 -/* f0f450c: 0c002f44 */ jal func0000bd10 +/* f0f450c: 0c002f44 */ jal viGetTop /* f0f4510: e7a80390 */ swc1 $f8,0x390($sp) /* f0f4514: 00028c00 */ sll $s1,$v0,0x10 /* f0f4518: 00116403 */ sra $t4,$s1,0x10 -/* f0f451c: 0c002f26 */ jal func0000bc98 +/* f0f451c: 0c002f26 */ jal viGetHeight /* f0f4520: 01808825 */ or $s1,$t4,$zero /* f0f4524: 44822000 */ mtc1 $v0,$f4 /* f0f4528: 3c013f00 */ lui $at,0x3f00 @@ -5617,7 +5617,7 @@ glabel func0f0f5360 /* f0f5474: 01b97021 */ addu $t6,$t5,$t9 /* f0f5478: 8dc50028 */ lw $a1,0x28($t6) /* f0f547c: 8d640028 */ lw $a0,0x28($t3) -/* f0f5480: 0fc01a40 */ jal func0f006900 +/* f0f5480: 0fc01a40 */ jal colourBlend /* f0f5484: afb001ec */ sw $s0,0x1ec($sp) /* f0f5488: afa201bc */ sw $v0,0x1bc($sp) .L0f0f548c: @@ -5778,7 +5778,7 @@ glabel func0f0f5360 /* f0f56d8: 01edc021 */ addu $t8,$t7,$t5 /* f0f56dc: 8f050000 */ lw $a1,0x0($t8) /* f0f56e0: 8f240000 */ lw $a0,0x0($t9) -/* f0f56e4: 0fc01a40 */ jal func0f006900 +/* f0f56e4: 0fc01a40 */ jal colourBlend /* f0f56e8: 8ce60044 */ lw $a2,0x44($a3) /* f0f56ec: 3c097f1b */ lui $t1,%hi(var7f1b1fb0) /* f0f56f0: 25291fb0 */ addiu $t1,$t1,%lo(var7f1b1fb0) @@ -5809,7 +5809,7 @@ glabel func0f0f5360 /* f0f574c: 01680019 */ multu $t3,$t0 /* f0f5750: 00006012 */ mflo $t4 /* f0f5754: 012cc821 */ addu $t9,$t1,$t4 -/* f0f5758: 0fc01a40 */ jal func0f006900 +/* f0f5758: 0fc01a40 */ jal colourBlend /* f0f575c: 8f250004 */ lw $a1,0x4($t9) /* f0f5760: 3c097f1b */ lui $t1,%hi(var7f1b1fb0) /* f0f5764: 25291fb0 */ addiu $t1,$t1,%lo(var7f1b1fb0) @@ -5840,7 +5840,7 @@ glabel func0f0f5360 /* f0f57c0: 01c80019 */ multu $t6,$t0 /* f0f57c4: 00007812 */ mflo $t7 /* f0f57c8: 012f6821 */ addu $t5,$t1,$t7 -/* f0f57cc: 0fc01a40 */ jal func0f006900 +/* f0f57cc: 0fc01a40 */ jal colourBlend /* f0f57d0: 8da50008 */ lw $a1,0x8($t5) /* f0f57d4: afa201b4 */ sw $v0,0x1b4($sp) /* f0f57d8: 8fa701ec */ lw $a3,0x1ec($sp) @@ -6116,7 +6116,7 @@ glabel func0f0f5360 /* f0f5be4: 030ec821 */ addu $t9,$t8,$t6 /* f0f5be8: 01ae5821 */ addu $t3,$t5,$t6 /* f0f5bec: 8d65000c */ lw $a1,0xc($t3) -/* f0f5bf0: 0fc01a40 */ jal func0f006900 +/* f0f5bf0: 0fc01a40 */ jal colourBlend /* f0f5bf4: 8f24000c */ lw $a0,0xc($t9) /* f0f5bf8: afa201bc */ sw $v0,0x1bc($sp) /* f0f5bfc: 8fa301ec */ lw $v1,0x1ec($sp) @@ -6305,7 +6305,7 @@ glabel func0f0f5360 /* f0f5eac: 01cb6021 */ addu $t4,$t6,$t3 /* f0f5eb0: 032b7821 */ addu $t7,$t9,$t3 /* f0f5eb4: 8de50010 */ lw $a1,0x10($t7) -/* f0f5eb8: 0fc01a40 */ jal func0f006900 +/* f0f5eb8: 0fc01a40 */ jal colourBlend /* f0f5ebc: 8d840010 */ lw $a0,0x10($t4) /* f0f5ec0: afa201bc */ sw $v0,0x1bc($sp) /* f0f5ec4: 8fa201ec */ lw $v0,0x1ec($sp) @@ -6315,7 +6315,7 @@ glabel func0f0f5360 /* f0f5ed0: 00002825 */ or $a1,$zero,$zero /* f0f5ed4: 51a0000b */ beqzl $t5,.L0f0f5f04 /* f0f5ed8: c4500040 */ lwc1 $f16,0x40($v0) -/* f0f5edc: 0fc01a40 */ jal func0f006900 +/* f0f5edc: 0fc01a40 */ jal colourBlend /* f0f5ee0: 2406002c */ addiu $a2,$zero,0x2c /* f0f5ee4: 8fac01bc */ lw $t4,0x1bc($sp) /* f0f5ee8: 2401ff00 */ addiu $at,$zero,-256 @@ -6354,7 +6354,7 @@ glabel func0f0f5360 /* f0f5f64: 01d8c821 */ addu $t9,$t6,$t8 /* f0f5f68: 01f86821 */ addu $t5,$t7,$t8 /* f0f5f6c: 8da50014 */ lw $a1,0x14($t5) -/* f0f5f70: 0fc01a40 */ jal func0f006900 +/* f0f5f70: 0fc01a40 */ jal colourBlend /* f0f5f74: 8f240014 */ lw $a0,0x14($t9) /* f0f5f78: afa201b8 */ sw $v0,0x1b8($sp) /* f0f5f7c: 8fa201ec */ lw $v0,0x1ec($sp) @@ -6463,7 +6463,7 @@ glabel func0f0f5360 /* f0f6104: 01d8c821 */ addu $t9,$t6,$t8 /* f0f6108: 8f250000 */ lw $a1,0x0($t9) /* f0f610c: 8da40000 */ lw $a0,0x0($t5) -/* f0f6110: 0fc01a40 */ jal func0f006900 +/* f0f6110: 0fc01a40 */ jal colourBlend /* f0f6114: 8c460044 */ lw $a2,0x44($v0) /* f0f6118: 00409025 */ or $s2,$v0,$zero /* f0f611c: 8fa201ec */ lw $v0,0x1ec($sp) @@ -6490,7 +6490,7 @@ glabel func0f0f5360 /* f0f6168: 030ec023 */ subu $t8,$t8,$t6 /* f0f616c: 0018c080 */ sll $t8,$t8,0x2 /* f0f6170: 00982021 */ addu $a0,$a0,$t8 -/* f0f6174: 0fc01a40 */ jal func0f006900 +/* f0f6174: 0fc01a40 */ jal colourBlend /* f0f6178: 8c841fb8 */ lw $a0,%lo(var7f1b1fb8)($a0) /* f0f617c: 00404025 */ or $t0,$v0,$zero .L0f0f6180: @@ -6516,7 +6516,7 @@ glabel func0f0f5360 /* f0f61c8: 8fa201e8 */ lw $v0,0x1e8($sp) .L0f0f61cc: /* f0f61cc: 01835821 */ addu $t3,$t4,$v1 -/* f0f61d0: 0c002f40 */ jal func0000bd00 +/* f0f61d0: 0c002f40 */ jal viGetLeft /* f0f61d4: afab0088 */ sw $t3,0x88($sp) /* f0f61d8: 3c0e8008 */ lui $t6,%hi(var8007fac0) /* f0f61dc: 8dcefac0 */ lw $t6,%lo(var8007fac0)($t6) @@ -6533,13 +6533,13 @@ glabel func0f0f5360 /* f0f6204: 00000000 */ sll $zero,$zero,0x0 /* f0f6208: 0006000d */ break 0x6 .L0f0f620c: -/* f0f620c: 0c002f44 */ jal func0000bd10 +/* f0f620c: 0c002f44 */ jal viGetTop /* f0f6210: 00000000 */ sll $zero,$zero,0x0 -/* f0f6214: 0c002f40 */ jal func0000bd00 +/* f0f6214: 0c002f40 */ jal viGetLeft /* f0f6218: 0040a025 */ or $s4,$v0,$zero /* f0f621c: 00028400 */ sll $s0,$v0,0x10 /* f0f6220: 0010c403 */ sra $t8,$s0,0x10 -/* f0f6224: 0c002f22 */ jal func0000bc88 +/* f0f6224: 0c002f22 */ jal viGetWidth /* f0f6228: 03008025 */ or $s0,$t8,$zero /* f0f622c: 3c0f8008 */ lui $t7,%hi(var8007fac0) /* f0f6230: 8deffac0 */ lw $t7,%lo(var8007fac0)($t7) @@ -6557,11 +6557,11 @@ glabel func0f0f5360 /* f0f625c: 00000000 */ sll $zero,$zero,0x0 /* f0f6260: 0006000d */ break 0x6 .L0f0f6264: -/* f0f6264: 0c002f44 */ jal func0000bd10 +/* f0f6264: 0c002f44 */ jal viGetTop /* f0f6268: 00000000 */ sll $zero,$zero,0x0 /* f0f626c: 00028400 */ sll $s0,$v0,0x10 /* f0f6270: 00106c03 */ sra $t5,$s0,0x10 -/* f0f6274: 0c002f26 */ jal func0000bc98 +/* f0f6274: 0c002f26 */ jal viGetHeight /* f0f6278: 01a08025 */ or $s0,$t5,$zero /* f0f627c: 8fac0088 */ lw $t4,0x88($sp) /* f0f6280: 3c08800a */ lui $t0,%hi(var800a2038) @@ -6755,7 +6755,7 @@ glabel func0f0f5360 /* f0f653c: 01af6823 */ subu $t5,$t5,$t7 /* f0f6540: 000d6880 */ sll $t5,$t5,0x2 /* f0f6544: 008d2021 */ addu $a0,$a0,$t5 -/* f0f6548: 0fc01a40 */ jal func0f006900 +/* f0f6548: 0fc01a40 */ jal colourBlend /* f0f654c: 8c841fc8 */ lw $a0,%lo(var7f1b1fc8)($a0) /* f0f6550: afa20120 */ sw $v0,0x120($sp) /* f0f6554: 8fa201ec */ lw $v0,0x1ec($sp) @@ -6952,13 +6952,13 @@ glabel func0f0f5360 /* f0f6824: 01a20019 */ multu $t5,$v0 /* f0f6828: 00007812 */ mflo $t7 /* f0f682c: 006fc021 */ addu $t8,$v1,$t7 -/* f0f6830: 0fc01a40 */ jal func0f006900 +/* f0f6830: 0fc01a40 */ jal colourBlend /* f0f6834: 8f050028 */ lw $a1,0x28($t8) /* f0f6838: 00402025 */ or $a0,$v0,$zero .L0f0f683c: /* f0f683c: 2401ff00 */ addiu $at,$zero,-256 /* f0f6840: 00812824 */ and $a1,$a0,$at -/* f0f6844: 0fc01a40 */ jal func0f006900 +/* f0f6844: 0fc01a40 */ jal colourBlend /* f0f6848: 2406007f */ addiu $a2,$zero,0x7f /* f0f684c: 8fa401e8 */ lw $a0,0x1e8($sp) /* f0f6850: 0fc54df7 */ jal func0f1537dc @@ -7345,11 +7345,11 @@ glabel func0f0f5360 .L0f0f6df8: /* f0f6df8: 00809825 */ or $s3,$a0,$zero /* f0f6dfc: 24840008 */ addiu $a0,$a0,0x8 -/* f0f6e00: 0c002f40 */ jal func0000bd00 +/* f0f6e00: 0c002f40 */ jal viGetLeft /* f0f6e04: afa401e8 */ sw $a0,0x1e8($sp) /* f0f6e08: 00028400 */ sll $s0,$v0,0x10 /* f0f6e0c: 00107c03 */ sra $t7,$s0,0x10 -/* f0f6e10: 0c002f44 */ jal func0000bd10 +/* f0f6e10: 0c002f44 */ jal viGetTop /* f0f6e14: 01e08025 */ or $s0,$t7,$zero /* f0f6e18: 44829000 */ mtc1 $v0,$f18 /* f0f6e1c: 44905000 */ mtc1 $s0,$f10 @@ -7370,19 +7370,19 @@ glabel func0f0f5360 /* f0f6e58: 31af0fff */ andi $t7,$t5,0xfff /* f0f6e5c: 000fc300 */ sll $t8,$t7,0xc /* f0f6e60: 01787025 */ or $t6,$t3,$t8 -/* f0f6e64: 0c002f22 */ jal func0000bc88 +/* f0f6e64: 0c002f22 */ jal viGetWidth /* f0f6e68: ae6e0000 */ sw $t6,0x0($s3) /* f0f6e6c: 00028c00 */ sll $s1,$v0,0x10 /* f0f6e70: 00116403 */ sra $t4,$s1,0x10 -/* f0f6e74: 0c002f40 */ jal func0000bd00 +/* f0f6e74: 0c002f40 */ jal viGetLeft /* f0f6e78: 01808825 */ or $s1,$t4,$zero /* f0f6e7c: 00029400 */ sll $s2,$v0,0x10 /* f0f6e80: 0012cc03 */ sra $t9,$s2,0x10 -/* f0f6e84: 0c002f44 */ jal func0000bd10 +/* f0f6e84: 0c002f44 */ jal viGetTop /* f0f6e88: 03209025 */ or $s2,$t9,$zero /* f0f6e8c: 00028400 */ sll $s0,$v0,0x10 /* f0f6e90: 00106c03 */ sra $t5,$s0,0x10 -/* f0f6e94: 0c002f26 */ jal func0000bc98 +/* f0f6e94: 0c002f26 */ jal viGetHeight /* f0f6e98: 01a08025 */ or $s0,$t5,$zero /* f0f6e9c: 00507821 */ addu $t7,$v0,$s0 /* f0f6ea0: 448f3000 */ mtc1 $t7,$f6 @@ -7407,11 +7407,11 @@ glabel func0f0f5360 /* f0f6eec: ae780004 */ sw $t8,0x4($s3) /* f0f6ef0: 24840008 */ addiu $a0,$a0,0x8 .L0f0f6ef4: -/* f0f6ef4: 0c002f40 */ jal func0000bd00 +/* f0f6ef4: 0c002f40 */ jal viGetLeft /* f0f6ef8: afa401e8 */ sw $a0,0x1e8($sp) /* f0f6efc: 00028400 */ sll $s0,$v0,0x10 /* f0f6f00: 00106403 */ sra $t4,$s0,0x10 -/* f0f6f04: 0c002f44 */ jal func0000bd10 +/* f0f6f04: 0c002f44 */ jal viGetTop /* f0f6f08: 01808025 */ or $s0,$t4,$zero /* f0f6f0c: 44825000 */ mtc1 $v0,$f10 /* f0f6f10: 44903000 */ mtc1 $s0,$f6 @@ -7432,19 +7432,19 @@ glabel func0f0f5360 /* f0f6f4c: 330c0fff */ andi $t4,$t8,0xfff /* f0f6f50: 000ccb00 */ sll $t9,$t4,0xc /* f0f6f54: 01d96825 */ or $t5,$t6,$t9 -/* f0f6f58: 0c002f22 */ jal func0000bc88 +/* f0f6f58: 0c002f22 */ jal viGetWidth /* f0f6f5c: ae6d0000 */ sw $t5,0x0($s3) /* f0f6f60: 00028c00 */ sll $s1,$v0,0x10 /* f0f6f64: 00117c03 */ sra $t7,$s1,0x10 -/* f0f6f68: 0c002f40 */ jal func0000bd00 +/* f0f6f68: 0c002f40 */ jal viGetLeft /* f0f6f6c: 01e08825 */ or $s1,$t7,$zero /* f0f6f70: 00029400 */ sll $s2,$v0,0x10 /* f0f6f74: 00125c03 */ sra $t3,$s2,0x10 -/* f0f6f78: 0c002f44 */ jal func0000bd10 +/* f0f6f78: 0c002f44 */ jal viGetTop /* f0f6f7c: 01609025 */ or $s2,$t3,$zero /* f0f6f80: 00028400 */ sll $s0,$v0,0x10 /* f0f6f84: 0010c403 */ sra $t8,$s0,0x10 -/* f0f6f88: 0c002f26 */ jal func0000bc98 +/* f0f6f88: 0c002f26 */ jal viGetHeight /* f0f6f8c: 03008025 */ or $s0,$t8,$zero /* f0f6f90: 00506021 */ addu $t4,$v0,$s0 /* f0f6f94: 448c9000 */ mtc1 $t4,$f18 @@ -7577,12 +7577,12 @@ glabel func0f0f5360 /* f0f7178: 01620019 */ multu $t3,$v0 /* f0f717c: 0000c012 */ mflo $t8 /* f0f7180: 00786021 */ addu $t4,$v1,$t8 -/* f0f7184: 0fc01a40 */ jal func0f006900 +/* f0f7184: 0fc01a40 */ jal colourBlend /* f0f7188: 8d850000 */ lw $a1,0x0($t4) /* f0f718c: 00402825 */ or $a1,$v0,$zero .L0f0f7190: /* f0f7190: 2404ffff */ addiu $a0,$zero,-1 -/* f0f7194: 0fc01a40 */ jal func0f006900 +/* f0f7194: 0fc01a40 */ jal colourBlend /* f0f7198: 02003025 */ or $a2,$s0,$zero /* f0f719c: 3c0141a0 */ lui $at,0x41a0 /* f0f71a0: 4481a000 */ mtc1 $at,$f20 @@ -8030,7 +8030,7 @@ glabel var7f1b2990 /* f0f7730: afa40038 */ sw $a0,0x38($sp) /* f0f7734: afa5003c */ sw $a1,0x3c($sp) /* f0f7738: afa60040 */ sw $a2,0x40($sp) -/* f0f773c: 0c002f40 */ jal func0000bd00 +/* f0f773c: 0c002f40 */ jal viGetLeft /* f0f7740: afa70044 */ sw $a3,0x44($sp) /* f0f7744: 3c0e8008 */ lui $t6,%hi(var8007fac0) /* f0f7748: 8dcefac0 */ lw $t6,%lo(var8007fac0)($t6) @@ -8051,12 +8051,12 @@ glabel var7f1b2990 /* f0f7780: 0006000d */ break 0x6 .L0f0f7784: /* f0f7784: afa60034 */ sw $a2,0x34($sp) -/* f0f7788: 0c002f44 */ jal func0000bd10 +/* f0f7788: 0c002f44 */ jal viGetTop /* f0f778c: 00000000 */ sll $zero,$zero,0x0 /* f0f7790: 24430004 */ addiu $v1,$v0,0x4 -/* f0f7794: 0c002f40 */ jal func0000bd00 +/* f0f7794: 0c002f40 */ jal viGetLeft /* f0f7798: afa30030 */ sw $v1,0x30($sp) -/* f0f779c: 0c002f22 */ jal func0000bc88 +/* f0f779c: 0c002f22 */ jal viGetWidth /* f0f77a0: a7a2001a */ sh $v0,0x1a($sp) /* f0f77a4: 87af001a */ lh $t7,0x1a($sp) /* f0f77a8: 3c198008 */ lui $t9,%hi(var8007fac0) @@ -8081,9 +8081,9 @@ glabel var7f1b2990 /* f0f77f0: 0006000d */ break 0x6 .L0f0f77f4: /* f0f77f4: afa7002c */ sw $a3,0x2c($sp) -/* f0f77f8: 0c002f44 */ jal func0000bd10 +/* f0f77f8: 0c002f44 */ jal viGetTop /* f0f77fc: 00000000 */ sll $zero,$zero,0x0 -/* f0f7800: 0c002f26 */ jal func0000bc98 +/* f0f7800: 0c002f26 */ jal viGetHeight /* f0f7804: a7a2001a */ sh $v0,0x1a($sp) /* f0f7808: 87ae001a */ lh $t6,0x1a($sp) /* f0f780c: 004e2021 */ addu $a0,$v0,$t6 @@ -8623,9 +8623,9 @@ glabel func0f0f7e98 .L0f0f7f88: /* f0f7f88: 59800017 */ blezl $t4,.L0f0f7fe8 /* f0f7f8c: 8fa80034 */ lw $t0,0x34($sp) -/* f0f7f90: 0c002f40 */ jal func0000bd00 +/* f0f7f90: 0c002f40 */ jal viGetLeft /* f0f7f94: 00000000 */ sll $zero,$zero,0x0 -/* f0f7f98: 0c002f22 */ jal func0000bc88 +/* f0f7f98: 0c002f22 */ jal viGetWidth /* f0f7f9c: a7a2002e */ sh $v0,0x2e($sp) /* f0f7fa0: 87ad002e */ lh $t5,0x2e($sp) /* f0f7fa4: 3c0f8008 */ lui $t7,%hi(var8007fac0) @@ -8658,9 +8658,9 @@ glabel func0f0f7e98 .L0f0f8004: /* f0f8004: 5980000a */ blezl $t4,.L0f0f8030 /* f0f8008: 8fbf001c */ lw $ra,0x1c($sp) -/* f0f800c: 0c002f44 */ jal func0000bd10 +/* f0f800c: 0c002f44 */ jal viGetTop /* f0f8010: 00000000 */ sll $zero,$zero,0x0 -/* f0f8014: 0c002f26 */ jal func0000bc98 +/* f0f8014: 0c002f26 */ jal viGetHeight /* f0f8018: a7a2002e */ sh $v0,0x2e($sp) /* f0f801c: 87ad002e */ lh $t5,0x2e($sp) /* f0f8020: 004d7021 */ addu $t6,$v0,$t5 @@ -9433,7 +9433,7 @@ glabel func0f0f86a8 /* f0f8a7c: 10000047 */ beqz $zero,.L0f0f8b9c /* f0f8a80: afa20098 */ sw $v0,0x98($sp) .L0f0f8a84: -/* f0f8a84: 0c002f40 */ jal func0000bd00 +/* f0f8a84: 0c002f40 */ jal viGetLeft /* f0f8a88: 00000000 */ sll $zero,$zero,0x0 /* f0f8a8c: 3c188008 */ lui $t8,%hi(var8007fac0) /* f0f8a90: 8f18fac0 */ lw $t8,%lo(var8007fac0)($t8) @@ -9451,13 +9451,13 @@ glabel func0f0f86a8 /* f0f8abc: 00000000 */ sll $zero,$zero,0x0 /* f0f8ac0: 0006000d */ break 0x6 .L0f0f8ac4: -/* f0f8ac4: 0c002f44 */ jal func0000bd10 +/* f0f8ac4: 0c002f44 */ jal viGetTop /* f0f8ac8: 00000000 */ sll $zero,$zero,0x0 -/* f0f8acc: 0c002f40 */ jal func0000bd00 +/* f0f8acc: 0c002f40 */ jal viGetLeft /* f0f8ad0: 00408825 */ or $s1,$v0,$zero /* f0f8ad4: 00028400 */ sll $s0,$v0,0x10 /* f0f8ad8: 00106c03 */ sra $t5,$s0,0x10 -/* f0f8adc: 0c002f22 */ jal func0000bc88 +/* f0f8adc: 0c002f22 */ jal viGetWidth /* f0f8ae0: 01a08025 */ or $s0,$t5,$zero /* f0f8ae4: 3c0a8008 */ lui $t2,%hi(var8007fac0) /* f0f8ae8: 8d4afac0 */ lw $t2,%lo(var8007fac0)($t2) @@ -9476,11 +9476,11 @@ glabel func0f0f86a8 /* f0f8b18: 00000000 */ sll $zero,$zero,0x0 /* f0f8b1c: 0006000d */ break 0x6 .L0f0f8b20: -/* f0f8b20: 0c002f44 */ jal func0000bd10 +/* f0f8b20: 0c002f44 */ jal viGetTop /* f0f8b24: 00000000 */ sll $zero,$zero,0x0 /* f0f8b28: 00028400 */ sll $s0,$v0,0x10 /* f0f8b2c: 00107c03 */ sra $t7,$s0,0x10 -/* f0f8b30: 0c002f26 */ jal func0000bc98 +/* f0f8b30: 0c002f26 */ jal viGetHeight /* f0f8b34: 01e08025 */ or $s0,$t7,$zero /* f0f8b38: 3c0e8007 */ lui $t6,%hi(g_MpPlayerNum) /* f0f8b3c: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6) @@ -13430,7 +13430,7 @@ glabel var7f1b2afc /* f0fc1ec: 54610148 */ bnel $v1,$at,.L0f0fc710 /* f0fc1f0: 02a01025 */ or $v0,$s5,$zero .L0f0fc1f4: -/* f0fc1f4: 0c002f40 */ jal func0000bd00 +/* f0fc1f4: 0c002f40 */ jal viGetLeft /* f0fc1f8: 00000000 */ sll $zero,$zero,0x0 /* f0fc1fc: 3c0e8008 */ lui $t6,%hi(var8007fac0) /* f0fc200: 8dcefac0 */ lw $t6,%lo(var8007fac0)($t6) @@ -13449,14 +13449,14 @@ glabel var7f1b2afc /* f0fc230: 0006000d */ break 0x6 .L0f0fc234: /* f0fc234: afb800f0 */ sw $t8,0xf0($sp) -/* f0fc238: 0c002f44 */ jal func0000bd10 +/* f0fc238: 0c002f44 */ jal viGetTop /* f0fc23c: 00000000 */ sll $zero,$zero,0x0 /* f0fc240: 24590004 */ addiu $t9,$v0,0x4 -/* f0fc244: 0c002f40 */ jal func0000bd00 +/* f0fc244: 0c002f40 */ jal viGetLeft /* f0fc248: afb900ec */ sw $t9,0xec($sp) /* f0fc24c: 00028400 */ sll $s0,$v0,0x10 /* f0fc250: 00105403 */ sra $t2,$s0,0x10 -/* f0fc254: 0c002f22 */ jal func0000bc88 +/* f0fc254: 0c002f22 */ jal viGetWidth /* f0fc258: 01408025 */ or $s0,$t2,$zero /* f0fc25c: 3c0b8008 */ lui $t3,%hi(var8007fac0) /* f0fc260: 8d6bfac0 */ lw $t3,%lo(var8007fac0)($t3) @@ -13476,11 +13476,11 @@ glabel var7f1b2afc /* f0fc294: 0006000d */ break 0x6 .L0f0fc298: /* f0fc298: afae00e8 */ sw $t6,0xe8($sp) -/* f0fc29c: 0c002f44 */ jal func0000bd10 +/* f0fc29c: 0c002f44 */ jal viGetTop /* f0fc2a0: 00000000 */ sll $zero,$zero,0x0 /* f0fc2a4: 00028400 */ sll $s0,$v0,0x10 /* f0fc2a8: 00107c03 */ sra $t7,$s0,0x10 -/* f0fc2ac: 0c002f26 */ jal func0000bc98 +/* f0fc2ac: 0c002f26 */ jal viGetHeight /* f0fc2b0: 01e08025 */ or $s0,$t7,$zero /* f0fc2b4: 0050c021 */ addu $t8,$v0,$s0 /* f0fc2b8: 2719fffc */ addiu $t9,$t8,-4 @@ -13745,7 +13745,7 @@ glabel var7f1b2afc /* f0fc674: 3c0400ff */ lui $a0,0xff /* f0fc678: 3484ff00 */ ori $a0,$a0,0xff00 /* f0fc67c: 2405ff00 */ addiu $a1,$zero,-256 -/* f0fc680: 0fc01a40 */ jal func0f006900 +/* f0fc680: 0fc01a40 */ jal colourBlend /* f0fc684: 8fa600a0 */ lw $a2,0xa0($sp) /* f0fc688: 922c0017 */ lbu $t4,0x17($s1) /* f0fc68c: 01821825 */ or $v1,$t4,$v0 @@ -13794,7 +13794,7 @@ glabel var7f1b2afc /* f0fc728: 2401ffff */ addiu $at,$zero,-1 /* f0fc72c: 130100a1 */ beq $t8,$at,.L0f0fc9b4 /* f0fc730: 00000000 */ sll $zero,$zero,0x0 -/* f0fc734: 0c002f40 */ jal func0000bd00 +/* f0fc734: 0c002f40 */ jal viGetLeft /* f0fc738: 00000000 */ sll $zero,$zero,0x0 /* f0fc73c: 3c198008 */ lui $t9,%hi(var8007fac0) /* f0fc740: 8f39fac0 */ lw $t9,%lo(var8007fac0)($t9) @@ -13812,13 +13812,13 @@ glabel var7f1b2afc /* f0fc76c: 00000000 */ sll $zero,$zero,0x0 /* f0fc770: 0006000d */ break 0x6 .L0f0fc774: -/* f0fc774: 0c002f44 */ jal func0000bd10 +/* f0fc774: 0c002f44 */ jal viGetTop /* f0fc778: 00000000 */ sll $zero,$zero,0x0 -/* f0fc77c: 0c002f40 */ jal func0000bd00 +/* f0fc77c: 0c002f40 */ jal viGetLeft /* f0fc780: afa20094 */ sw $v0,0x94($sp) /* f0fc784: 00028400 */ sll $s0,$v0,0x10 /* f0fc788: 00105403 */ sra $t2,$s0,0x10 -/* f0fc78c: 0c002f22 */ jal func0000bc88 +/* f0fc78c: 0c002f22 */ jal viGetWidth /* f0fc790: 01408025 */ or $s0,$t2,$zero /* f0fc794: 3c0d8008 */ lui $t5,%hi(var8007fac0) /* f0fc798: 8dadfac0 */ lw $t5,%lo(var8007fac0)($t5) @@ -13836,11 +13836,11 @@ glabel var7f1b2afc /* f0fc7c4: 00000000 */ sll $zero,$zero,0x0 /* f0fc7c8: 0006000d */ break 0x6 .L0f0fc7cc: -/* f0fc7cc: 0c002f44 */ jal func0000bd10 +/* f0fc7cc: 0c002f44 */ jal viGetTop /* f0fc7d0: 00000000 */ sll $zero,$zero,0x0 /* f0fc7d4: 00028400 */ sll $s0,$v0,0x10 /* f0fc7d8: 00107403 */ sra $t6,$s0,0x10 -/* f0fc7dc: 0c002f26 */ jal func0000bc98 +/* f0fc7dc: 0c002f26 */ jal viGetHeight /* f0fc7e0: 01c08025 */ or $s0,$t6,$zero /* f0fc7e4: 8ec7006c */ lw $a3,0x6c($s6) /* f0fc7e8: 00504821 */ addu $t1,$v0,$s0 diff --git a/src/game/game_0fd660.c b/src/game/game_0fd660.c index 903d3fdcb..2bb225d2d 100644 --- a/src/game/game_0fd660.c +++ b/src/game/game_0fd660.c @@ -427,7 +427,7 @@ glabel var7f1b2cd8 /* f0fdb90: 00000000 */ sll $zero,$zero,0x0 .L0f0fdb94: /* f0fdb94: 44d9f800 */ ctc1 $t9,$31 -/* f0fdb98: 0fc01a40 */ jal func0f006900 +/* f0fdb98: 0fc01a40 */ jal colourBlend /* f0fdb9c: afaf0070 */ sw $t7,0x70($sp) /* f0fdba0: 8fac0090 */ lw $t4,0x90($sp) /* f0fdba4: 2401ff00 */ addiu $at,$zero,-256 @@ -435,7 +435,7 @@ glabel var7f1b2cd8 /* f0fdbac: 8d84000c */ lw $a0,0xc($t4) /* f0fdbb0: 8fa60070 */ lw $a2,0x70($sp) /* f0fdbb4: 00817025 */ or $t6,$a0,$at -/* f0fdbb8: 0fc01a40 */ jal func0f006900 +/* f0fdbb8: 0fc01a40 */ jal colourBlend /* f0fdbbc: 01c02025 */ or $a0,$t6,$zero /* f0fdbc0: 8fac0090 */ lw $t4,0x90($sp) /* f0fdbc4: afa20084 */ sw $v0,0x84($sp) @@ -1584,9 +1584,9 @@ glabel func0f0ff274 /* f0ff5a4: afa40020 */ sw $a0,0x20($sp) .L0f0ff5a8: /* f0ff5a8: afa60048 */ sw $a2,0x48($sp) -/* f0ff5ac: 0c002f22 */ jal func0000bc88 +/* f0ff5ac: 0c002f22 */ jal viGetWidth /* f0ff5b0: afa7004c */ sw $a3,0x4c($sp) -/* f0ff5b4: 0c002f40 */ jal func0000bd00 +/* f0ff5b4: 0c002f40 */ jal viGetLeft /* f0ff5b8: a7a20024 */ sh $v0,0x24($sp) /* f0ff5bc: 3c038008 */ lui $v1,%hi(var8007fac0) /* f0ff5c0: 8c63fac0 */ lw $v1,%lo(var8007fac0)($v1) @@ -1624,9 +1624,9 @@ glabel func0f0ff274 /* f0ff634: 0006000d */ break 0x6 .L0f0ff638: /* f0ff638: 030fc821 */ addu $t9,$t8,$t7 -/* f0ff63c: 0c002f26 */ jal func0000bc98 +/* f0ff63c: 0c002f26 */ jal viGetHeight /* f0ff640: a4d90000 */ sh $t9,0x0($a2) -/* f0ff644: 0c002f44 */ jal func0000bd10 +/* f0ff644: 0c002f44 */ jal viGetTop /* f0ff648: a7a20024 */ sh $v0,0x24($sp) /* f0ff64c: 8fa7004c */ lw $a3,0x4c($sp) /* f0ff650: 87af0024 */ lh $t7,0x24($sp) @@ -1935,9 +1935,9 @@ glabel var7f1b2ce0 /* f0ffa68: afa00014 */ sw $zero,0x14($sp) /* f0ffa6c: 0fc55cbe */ jal textMeasure /* f0ffa70: afb90010 */ sw $t9,0x10($sp) -/* f0ffa74: 0c002f40 */ jal func0000bd00 +/* f0ffa74: 0c002f40 */ jal viGetLeft /* f0ffa78: 00000000 */ sll $zero,$zero,0x0 -/* f0ffa7c: 0c002f22 */ jal func0000bc88 +/* f0ffa7c: 0c002f22 */ jal viGetWidth /* f0ffa80: a7a2004e */ sh $v0,0x4e($sp) /* f0ffa84: 3c038008 */ lui $v1,%hi(var8007fac0) /* f0ffa88: 8c63fac0 */ lw $v1,%lo(var8007fac0)($v1) @@ -2023,13 +2023,13 @@ glabel var7f1b2ce0 /* f0ffba4: 29e10002 */ slti $at,$t7,0x2 /* f0ffba8: 14200006 */ bnez $at,.L0f0ffbc4 /* f0ffbac: 00000000 */ sll $zero,$zero,0x0 -/* f0ffbb0: 0c002f44 */ jal func0000bd10 +/* f0ffbb0: 0c002f44 */ jal viGetTop /* f0ffbb4: 00000000 */ sll $zero,$zero,0x0 /* f0ffbb8: 24590005 */ addiu $t9,$v0,0x5 /* f0ffbbc: 10000005 */ beqz $zero,.L0f0ffbd4 /* f0ffbc0: afb90090 */ sw $t9,0x90($sp) .L0f0ffbc4: -/* f0ffbc4: 0c002f44 */ jal func0000bd10 +/* f0ffbc4: 0c002f44 */ jal viGetTop /* f0ffbc8: 00000000 */ sll $zero,$zero,0x0 /* f0ffbcc: 244b000a */ addiu $t3,$v0,0xa /* f0ffbd0: afab0090 */ sw $t3,0x90($sp) @@ -2037,7 +2037,7 @@ glabel var7f1b2ce0 /* f0ffbd4: 8fb80074 */ lw $t8,0x74($sp) /* f0ffbd8: 13000012 */ beqz $t8,.L0f0ffc24 /* f0ffbdc: 00000000 */ sll $zero,$zero,0x0 -/* f0ffbe0: 0c002f40 */ jal func0000bd00 +/* f0ffbe0: 0c002f40 */ jal viGetLeft /* f0ffbe4: 00000000 */ sll $zero,$zero,0x0 /* f0ffbe8: 3c0c8008 */ lui $t4,%hi(var8007fac0) /* f0ffbec: 8d8cfac0 */ lw $t4,%lo(var8007fac0)($t4) @@ -2138,9 +2138,9 @@ glabel var7f1b2ce0 /* f0ffd48: afa00014 */ sw $zero,0x14($sp) /* f0ffd4c: 0fc55cbe */ jal textMeasure /* f0ffd50: afb80010 */ sw $t8,0x10($sp) -/* f0ffd54: 0c002f40 */ jal func0000bd00 +/* f0ffd54: 0c002f40 */ jal viGetLeft /* f0ffd58: 00000000 */ sll $zero,$zero,0x0 -/* f0ffd5c: 0c002f22 */ jal func0000bc88 +/* f0ffd5c: 0c002f22 */ jal viGetWidth /* f0ffd60: a7a2004e */ sh $v0,0x4e($sp) /* f0ffd64: 3c038008 */ lui $v1,%hi(var8007fac0) /* f0ffd68: 8c63fac0 */ lw $v1,%lo(var8007fac0)($v1) @@ -2191,7 +2191,7 @@ glabel var7f1b2ce0 /* f0ffe0c: 01edc821 */ addu $t9,$t7,$t5 /* f0ffe10: 13000012 */ beqz $t8,.L0f0ffe5c /* f0ffe14: afb90094 */ sw $t9,0x94($sp) -/* f0ffe18: 0c002f40 */ jal func0000bd00 +/* f0ffe18: 0c002f40 */ jal viGetLeft /* f0ffe1c: 00000000 */ sll $zero,$zero,0x0 /* f0ffe20: 3c0c8008 */ lui $t4,%hi(var8007fac0) /* f0ffe24: 8d8cfac0 */ lw $t4,%lo(var8007fac0)($t4) @@ -2252,9 +2252,9 @@ glabel var7f1b2ce0 /* f0ffef4: afa00014 */ sw $zero,0x14($sp) /* f0ffef8: 0fc55cbe */ jal textMeasure /* f0ffefc: afb90010 */ sw $t9,0x10($sp) -/* f0fff00: 0c002f40 */ jal func0000bd00 +/* f0fff00: 0c002f40 */ jal viGetLeft /* f0fff04: 00000000 */ sll $zero,$zero,0x0 -/* f0fff08: 0c002f22 */ jal func0000bc88 +/* f0fff08: 0c002f22 */ jal viGetWidth /* f0fff0c: a7a2004e */ sh $v0,0x4e($sp) /* f0fff10: 3c038008 */ lui $v1,%hi(var8007fac0) /* f0fff14: 8c63fac0 */ lw $v1,%lo(var8007fac0)($v1) @@ -2342,13 +2342,13 @@ glabel var7f1b2ce0 /* f10003c: 29e10002 */ slti $at,$t7,0x2 /* f100040: 14200006 */ bnez $at,.L0f10005c /* f100044: 00000000 */ sll $zero,$zero,0x0 -/* f100048: 0c002f44 */ jal func0000bd10 +/* f100048: 0c002f44 */ jal viGetTop /* f10004c: 00000000 */ sll $zero,$zero,0x0 /* f100050: 24590005 */ addiu $t9,$v0,0x5 /* f100054: 10000005 */ beqz $zero,.L0f10006c /* f100058: afb90090 */ sw $t9,0x90($sp) .L0f10005c: -/* f10005c: 0c002f44 */ jal func0000bd10 +/* f10005c: 0c002f44 */ jal viGetTop /* f100060: 00000000 */ sll $zero,$zero,0x0 /* f100064: 2458000a */ addiu $t8,$v0,0xa /* f100068: afb80090 */ sw $t8,0x90($sp) @@ -2356,7 +2356,7 @@ glabel var7f1b2ce0 /* f10006c: 8fad0074 */ lw $t5,0x74($sp) /* f100070: 11a00012 */ beqz $t5,.L0f1000bc /* f100074: 00000000 */ sll $zero,$zero,0x0 -/* f100078: 0c002f40 */ jal func0000bd00 +/* f100078: 0c002f40 */ jal viGetLeft /* f10007c: 00000000 */ sll $zero,$zero,0x0 /* f100080: 3c0c8008 */ lui $t4,%hi(var8007fac0) /* f100084: 8d8cfac0 */ lw $t4,%lo(var8007fac0)($t4) @@ -2988,7 +2988,7 @@ glabel func0f100128 /* f100994: 00000000 */ sll $zero,$zero,0x0 .L0f100998: /* f100998: 44cef800 */ ctc1 $t6,$31 -/* f10099c: 0fc01a40 */ jal func0f006900 +/* f10099c: 0fc01a40 */ jal colourBlend /* f1009a0: 00000000 */ sll $zero,$zero,0x0 /* f1009a4: 3c07800a */ lui $a3,%hi(g_ActiveMenuThings) /* f1009a8: 3c08800a */ lui $t0,%hi(g_ActiveMenuIndex) @@ -4226,7 +4226,7 @@ glabel func0f100ad0 /* f101b74: 00000000 */ sll $zero,$zero,0x0 /* f101b78: 10400015 */ beqz $v0,.L0f101bd0 /* f101b7c: 00000000 */ sll $zero,$zero,0x0 -/* f101b80: 0c002f40 */ jal func0000bd00 +/* f101b80: 0c002f40 */ jal viGetLeft /* f101b84: 00000000 */ sll $zero,$zero,0x0 /* f101b88: 3c188008 */ lui $t8,%hi(var8007fac0) /* f101b8c: 8f18fac0 */ lw $t8,%lo(var8007fac0)($t8) @@ -4249,11 +4249,11 @@ glabel func0f100ad0 /* f101bc8: 10000031 */ beqz $zero,.L0f101c90 /* f101bcc: 3c013e80 */ lui $at,0x3e80 .L0f101bd0: -/* f101bd0: 0c002f22 */ jal func0000bc88 +/* f101bd0: 0c002f22 */ jal viGetWidth /* f101bd4: 00000000 */ sll $zero,$zero,0x0 /* f101bd8: 00028c00 */ sll $s1,$v0,0x10 /* f101bdc: 00117c03 */ sra $t7,$s1,0x10 -/* f101be0: 0c002f40 */ jal func0000bd00 +/* f101be0: 0c002f40 */ jal viGetLeft /* f101be4: 01e08825 */ or $s1,$t7,$zero /* f101be8: 3c038008 */ lui $v1,%hi(var8007fac0) /* f101bec: 8c63fac0 */ lw $v1,%lo(var8007fac0)($v1) @@ -4347,11 +4347,11 @@ glabel func0f100ad0 /* f101d34: 3739ffff */ ori $t9,$t9,0xffff /* f101d38: adf90000 */ sw $t9,0x0($t7) /* f101d3c: adee0004 */ sw $t6,0x4($t7) -/* f101d40: 0c002f26 */ jal func0000bc98 +/* f101d40: 0c002f26 */ jal viGetHeight /* f101d44: e7a20068 */ swc1 $f2,0x68($sp) /* f101d48: 0002a400 */ sll $s4,$v0,0x10 /* f101d4c: 00147c03 */ sra $t7,$s4,0x10 -/* f101d50: 0c002f44 */ jal func0000bd10 +/* f101d50: 0c002f44 */ jal viGetTop /* f101d54: 01e0a025 */ or $s4,$t7,$zero /* f101d58: 3c04800a */ lui $a0,%hi(g_Vars) /* f101d5c: 24849fc0 */ addiu $a0,$a0,%lo(g_Vars) diff --git a/src/game/game_10ccd0.c b/src/game/game_10ccd0.c index 1d286b18c..87ce04c1d 100644 --- a/src/game/game_10ccd0.c +++ b/src/game/game_10ccd0.c @@ -1161,7 +1161,7 @@ glabel menuhandler0010e064 /* f10e1dc: 3c058007 */ lui $a1,%hi(var80075968) /* f10e1e0: 8ca55968 */ lw $a1,%lo(var80075968)($a1) /* f10e1e4: 8fa6001c */ lw $a2,0x1c($sp) -/* f10e1e8: 0fc01a40 */ jal func0f006900 +/* f10e1e8: 0fc01a40 */ jal colourBlend /* f10e1ec: 8d240004 */ lw $a0,0x4($t1) /* f10e1f0: 8fa70028 */ lw $a3,0x28($sp) /* f10e1f4: 24010003 */ addiu $at,$zero,0x3 @@ -1173,7 +1173,7 @@ glabel menuhandler0010e064 /* f10e20c: 54610009 */ bnel $v1,$at,.L0f10e234 /* f10e210: 24010005 */ addiu $at,$zero,0x5 /* f10e214: 8ce40000 */ lw $a0,0x0($a3) -/* f10e218: 0fc01a40 */ jal func0f006900 +/* f10e218: 0fc01a40 */ jal colourBlend /* f10e21c: 8ca55968 */ lw $a1,%lo(var80075968)($a1) /* f10e220: 8fa70028 */ lw $a3,0x28($sp) /* f10e224: ace20000 */ sw $v0,0x0($a3) @@ -1185,7 +1185,7 @@ glabel menuhandler0010e064 /* f10e238: 3c058007 */ lui $a1,%hi(var80075968) /* f10e23c: 8ce40000 */ lw $a0,0x0($a3) /* f10e240: 8ca55968 */ lw $a1,%lo(var80075968)($a1) -/* f10e244: 0fc01a40 */ jal func0f006900 +/* f10e244: 0fc01a40 */ jal colourBlend /* f10e248: 8fa6001c */ lw $a2,0x1c($sp) /* f10e24c: 8fad0028 */ lw $t5,0x28($sp) /* f10e250: ada20000 */ sw $v0,0x0($t5) diff --git a/src/game/game_11f000.c b/src/game/game_11f000.c index 8adfec26a..bb69c276a 100644 --- a/src/game/game_11f000.c +++ b/src/game/game_11f000.c @@ -915,15 +915,15 @@ glabel var7f1b50c8 .L0f11fabc: /* f11fabc: 00608825 */ or $s1,$v1,$zero /* f11fac0: 24630008 */ addiu $v1,$v1,0x8 -/* f11fac4: 0c002f22 */ jal func0000bc88 +/* f11fac4: 0c002f22 */ jal viGetWidth /* f11fac8: afa306b0 */ sw $v1,0x6b0($sp) -/* f11facc: 0c002f40 */ jal func0000bd00 +/* f11facc: 0c002f40 */ jal viGetLeft /* f11fad0: a7a2007a */ sh $v0,0x7a($sp) -/* f11fad4: 0c002f44 */ jal func0000bd10 +/* f11fad4: 0c002f44 */ jal viGetTop /* f11fad8: a7a2007c */ sh $v0,0x7c($sp) /* f11fadc: 00028400 */ sll $s0,$v0,0x10 /* f11fae0: 00106403 */ sra $t4,$s0,0x10 -/* f11fae4: 0c002f26 */ jal func0000bc98 +/* f11fae4: 0c002f26 */ jal viGetHeight /* f11fae8: 01808025 */ or $s0,$t4,$zero /* f11faec: 87ad007c */ lh $t5,0x7c($sp) /* f11faf0: 87ae007a */ lh $t6,0x7a($sp) @@ -938,11 +938,11 @@ glabel var7f1b50c8 /* f11fb14: 01a17025 */ or $t6,$t5,$at /* f11fb18: 00194b80 */ sll $t1,$t9,0xe /* f11fb1c: 01c97825 */ or $t7,$t6,$t1 -/* f11fb20: 0c002f40 */ jal func0000bd00 +/* f11fb20: 0c002f40 */ jal viGetLeft /* f11fb24: ae2f0000 */ sw $t7,0x0($s1) /* f11fb28: 00028400 */ sll $s0,$v0,0x10 /* f11fb2c: 0010c403 */ sra $t8,$s0,0x10 -/* f11fb30: 0c002f44 */ jal func0000bd10 +/* f11fb30: 0c002f44 */ jal viGetTop /* f11fb34: 03008025 */ or $s0,$t8,$zero /* f11fb38: 305903ff */ andi $t9,$v0,0x3ff /* f11fb3c: 320b03ff */ andi $t3,$s0,0x3ff @@ -7182,13 +7182,13 @@ glabel func0f125948 /* f12594c: afbf0014 */ sw $ra,0x14($sp) /* f125950: afa40028 */ sw $a0,0x28($sp) /* f125954: afa5002c */ sw $a1,0x2c($sp) -/* f125958: 0c002f40 */ jal func0000bd00 +/* f125958: 0c002f40 */ jal viGetLeft /* f12595c: afa60030 */ sw $a2,0x30($sp) -/* f125960: 0c002f44 */ jal func0000bd10 +/* f125960: 0c002f44 */ jal viGetTop /* f125964: afa20024 */ sw $v0,0x24($sp) -/* f125968: 0c002f22 */ jal func0000bc88 +/* f125968: 0c002f22 */ jal viGetWidth /* f12596c: afa20020 */ sw $v0,0x20($sp) -/* f125970: 0c002f26 */ jal func0000bc98 +/* f125970: 0c002f26 */ jal viGetHeight /* f125974: afa2001c */ sw $v0,0x1c($sp) /* f125978: 8fa30024 */ lw $v1,0x24($sp) /* f12597c: 8fa4002c */ lw $a0,0x2c($sp) @@ -7315,13 +7315,13 @@ glabel var7f1b5108 /* f125b18: 00000000 */ sll $zero,$zero,0x0 /* f125b1c: 24030002 */ addiu $v1,$zero,0x2 .L0f125b20: -/* f125b20: 0c002f40 */ jal func0000bd00 +/* f125b20: 0c002f40 */ jal viGetLeft /* f125b24: afa30128 */ sw $v1,0x128($sp) -/* f125b28: 0c002f44 */ jal func0000bd10 +/* f125b28: 0c002f44 */ jal viGetTop /* f125b2c: a7a20166 */ sh $v0,0x166($sp) -/* f125b30: 0c002f22 */ jal func0000bc88 +/* f125b30: 0c002f22 */ jal viGetWidth /* f125b34: a7a20164 */ sh $v0,0x164($sp) -/* f125b38: 0c002f26 */ jal func0000bc98 +/* f125b38: 0c002f26 */ jal viGetHeight /* f125b3c: a7a20162 */ sh $v0,0x162($sp) /* f125b40: 87a80162 */ lh $t0,0x162($sp) /* f125b44: 44824000 */ mtc1 $v0,$f8 @@ -7957,7 +7957,7 @@ glabel var7f1b511c /* f126498: 24100001 */ addiu $s0,$zero,0x1 /* f12649c: 24100002 */ addiu $s0,$zero,0x2 .L0f1264a0: -/* f1264a0: 0c002f22 */ jal func0000bc88 +/* f1264a0: 0c002f22 */ jal viGetWidth /* f1264a4: 00000000 */ sll $zero,$zero,0x0 /* f1264a8: 44822000 */ mtc1 $v0,$f4 /* f1264ac: 3c017f1b */ lui $at,%hi(var7f1b510c) @@ -7969,7 +7969,7 @@ glabel var7f1b511c /* f1264c4: 461e3202 */ mul.s $f8,$f6,$f30 /* f1264c8: 4608d281 */ sub.s $f10,$f26,$f8 /* f1264cc: 46145102 */ mul.s $f4,$f10,$f20 -/* f1264d0: 0c002f26 */ jal func0000bc98 +/* f1264d0: 0c002f26 */ jal viGetHeight /* f1264d4: e7a40128 */ swc1 $f4,0x128($sp) /* f1264d8: 44823000 */ mtc1 $v0,$f6 /* f1264dc: 3c16800b */ lui $s6,%hi(var800ab5a0) @@ -8346,7 +8346,7 @@ glabel var7f1b511c /* f126a8c: 26310004 */ addiu $s1,$s1,0x4 /* f126a90: 1614ff9d */ bne $s0,$s4,.L0f126908 /* f126a94: 26520004 */ addiu $s2,$s2,0x4 -/* f126a98: 0c002f22 */ jal func0000bc88 +/* f126a98: 0c002f22 */ jal viGetWidth /* f126a9c: 00000000 */ sll $zero,$zero,0x0 /* f126aa0: 44822000 */ mtc1 $v0,$f4 /* f126aa4: 3c013f00 */ lui $at,0x3f00 @@ -8354,7 +8354,7 @@ glabel var7f1b511c /* f126aac: 46802220 */ cvt.s.w $f8,$f4 /* f126ab0: c7aa0194 */ lwc1 $f10,0x194($sp) /* f126ab4: 46184182 */ mul.s $f6,$f8,$f24 -/* f126ab8: 0c002f26 */ jal func0000bc98 +/* f126ab8: 0c002f26 */ jal viGetHeight /* f126abc: 460a3501 */ sub.s $f20,$f6,$f10 /* f126ac0: 44822000 */ mtc1 $v0,$f4 /* f126ac4: c7aa0198 */ lwc1 $f10,0x198($sp) @@ -8484,13 +8484,13 @@ glabel func0f126c3c /* f126c98: 00000000 */ sll $zero,$zero,0x0 /* f126c9c: 4502004e */ bc1fl .L0f126dd8 /* f126ca0: 8fbf0024 */ lw $ra,0x24($sp) -/* f126ca4: 0c002f40 */ jal func0000bd00 +/* f126ca4: 0c002f40 */ jal viGetLeft /* f126ca8: 00000000 */ sll $zero,$zero,0x0 -/* f126cac: 0c002f44 */ jal func0000bd10 +/* f126cac: 0c002f44 */ jal viGetTop /* f126cb0: a7a2005a */ sh $v0,0x5a($sp) -/* f126cb4: 0c002f22 */ jal func0000bc88 +/* f126cb4: 0c002f22 */ jal viGetWidth /* f126cb8: a7a20058 */ sh $v0,0x58($sp) -/* f126cbc: 0c002f26 */ jal func0000bc98 +/* f126cbc: 0c002f26 */ jal viGetHeight /* f126cc0: a7a20056 */ sh $v0,0x56($sp) /* f126cc4: 87ae0056 */ lh $t6,0x56($sp) /* f126cc8: c7a60064 */ lwc1 $f6,0x64($sp) @@ -9281,13 +9281,13 @@ glabel var7f1b5140 /* f1277dc: 032dc025 */ or $t8,$t9,$t5 /* f1277e0: ac580004 */ sw $t8,0x4($v0) /* f1277e4: afb00038 */ sw $s0,0x38($sp) -/* f1277e8: 0c002f22 */ jal func0000bc88 +/* f1277e8: 0c002f22 */ jal viGetWidth /* f1277ec: 26100008 */ addiu $s0,$s0,0x8 -/* f1277f0: 0c002f40 */ jal func0000bd00 +/* f1277f0: 0c002f40 */ jal viGetLeft /* f1277f4: a7a20022 */ sh $v0,0x22($sp) -/* f1277f8: 0c002f44 */ jal func0000bd10 +/* f1277f8: 0c002f44 */ jal viGetTop /* f1277fc: a7a20024 */ sh $v0,0x24($sp) -/* f127800: 0c002f26 */ jal func0000bc98 +/* f127800: 0c002f26 */ jal viGetHeight /* f127804: a7a20026 */ sh $v0,0x26($sp) /* f127808: 87ae0024 */ lh $t6,0x24($sp) /* f12780c: 87af0022 */ lh $t7,0x22($sp) @@ -9302,9 +9302,9 @@ glabel var7f1b5140 /* f127830: 8fb90038 */ lw $t9,0x38($sp) /* f127834: 01a17025 */ or $t6,$t5,$at /* f127838: 01d87825 */ or $t7,$t6,$t8 -/* f12783c: 0c002f40 */ jal func0000bd00 +/* f12783c: 0c002f40 */ jal viGetLeft /* f127840: af2f0000 */ sw $t7,0x0($t9) -/* f127844: 0c002f44 */ jal func0000bd10 +/* f127844: 0c002f44 */ jal viGetTop /* f127848: a7a20026 */ sh $v0,0x26($sp) /* f12784c: 87b80026 */ lh $t8,0x26($sp) /* f127850: 304d03ff */ andi $t5,$v0,0x3ff diff --git a/src/game/game_135c70.c b/src/game/game_135c70.c index c18f06b5a..0f1ce34af 100644 --- a/src/game/game_135c70.c +++ b/src/game/game_135c70.c @@ -911,18 +911,18 @@ glabel var7f1b57bc /* f1368b8: f7b80028 */ sdc1 $f24,0x28($sp) /* f1368bc: f7b60020 */ sdc1 $f22,0x20($sp) /* f1368c0: f7b40018 */ sdc1 $f20,0x18($sp) -/* f1368c4: 0c002f40 */ jal func0000bd00 +/* f1368c4: 0c002f40 */ jal viGetLeft /* f1368c8: 00008825 */ or $s1,$zero,$zero /* f1368cc: 44822000 */ mtc1 $v0,$f4 -/* f1368d0: 0c002f22 */ jal func0000bc88 +/* f1368d0: 0c002f22 */ jal viGetWidth /* f1368d4: 46802520 */ cvt.s.w $f20,$f4 /* f1368d8: 44823000 */ mtc1 $v0,$f6 /* f1368dc: 00000000 */ sll $zero,$zero,0x0 /* f1368e0: 46803220 */ cvt.s.w $f8,$f6 -/* f1368e4: 0c002f44 */ jal func0000bd10 +/* f1368e4: 0c002f44 */ jal viGetTop /* f1368e8: 46144600 */ add.s $f24,$f8,$f20 /* f1368ec: 44825000 */ mtc1 $v0,$f10 -/* f1368f0: 0c002f26 */ jal func0000bc98 +/* f1368f0: 0c002f26 */ jal viGetHeight /* f1368f4: 468055a0 */ cvt.s.w $f22,$f10 /* f1368f8: 3c13800a */ lui $s3,%hi(g_Vars) /* f1368fc: 26739fc0 */ addiu $s3,$s3,%lo(g_Vars) @@ -996,7 +996,7 @@ glabel var7f1b57bc /* f1369f8: 00000000 */ sll $zero,$zero,0x0 .L0f1369fc: /* f1369fc: 44cff800 */ ctc1 $t7,$31 -/* f136a00: 0fc01a40 */ jal func0f006900 +/* f136a00: 0fc01a40 */ jal colourBlend /* f136a04: 00000000 */ sll $zero,$zero,0x0 /* f136a08: 3c014080 */ lui $at,0x4080 /* f136a0c: 44816000 */ mtc1 $at,$f12 @@ -1043,7 +1043,7 @@ glabel var7f1b57bc /* f136aa8: 00000000 */ sll $zero,$zero,0x0 .L0f136aac: /* f136aac: 44d8f800 */ ctc1 $t8,$31 -/* f136ab0: 0fc01a40 */ jal func0f006900 +/* f136ab0: 0fc01a40 */ jal colourBlend /* f136ab4: 00000000 */ sll $zero,$zero,0x0 /* f136ab8: 3c014000 */ lui $at,0x4000 /* f136abc: 44816000 */ mtc1 $at,$f12 @@ -1090,7 +1090,7 @@ glabel var7f1b57bc /* f136b58: 00000000 */ sll $zero,$zero,0x0 .L0f136b5c: /* f136b5c: 44d9f800 */ ctc1 $t9,$31 -/* f136b60: 0fc01a40 */ jal func0f006900 +/* f136b60: 0fc01a40 */ jal colourBlend /* f136b64: 00000000 */ sll $zero,$zero,0x0 /* f136b68: 3c014080 */ lui $at,0x4080 /* f136b6c: 44816000 */ mtc1 $at,$f12 @@ -1138,7 +1138,7 @@ glabel var7f1b57bc /* f136c0c: 00000000 */ sll $zero,$zero,0x0 .L0f136c10: /* f136c10: 44cef800 */ ctc1 $t6,$31 -/* f136c14: 0fc01a40 */ jal func0f006900 +/* f136c14: 0fc01a40 */ jal colourBlend /* f136c18: 00000000 */ sll $zero,$zero,0x0 /* f136c1c: 1220000a */ beqz $s1,.L0f136c48 /* f136c20: afa20128 */ sw $v0,0x128($sp) @@ -1147,7 +1147,7 @@ glabel var7f1b57bc /* f136c2c: 8e240000 */ lw $a0,0x0($s1) .L0f136c30: /* f136c30: 2406005f */ addiu $a2,$zero,0x5f -/* f136c34: 0fc01a40 */ jal func0f006900 +/* f136c34: 0fc01a40 */ jal colourBlend /* f136c38: 308500ff */ andi $a1,$a0,0xff /* f136c3c: 26310004 */ addiu $s1,$s1,0x4 /* f136c40: 5632fffb */ bnel $s1,$s2,.L0f136c30 diff --git a/src/game/game_1371b0.c b/src/game/game_1371b0.c index fe81e536a..234071a57 100644 --- a/src/game/game_1371b0.c +++ b/src/game/game_1371b0.c @@ -670,7 +670,7 @@ glabel func0f137874 /* f137aa8: 44cdf800 */ ctc1 $t5,$31 /* f137aac: afa2001c */ sw $v0,0x1c($sp) /* f137ab0: afa30018 */ sw $v1,0x18($sp) -/* f137ab4: 0fc01a40 */ jal func0f006900 +/* f137ab4: 0fc01a40 */ jal colourBlend /* f137ab8: afa60024 */ sw $a2,0x24($sp) /* f137abc: 8fae004c */ lw $t6,0x4c($sp) /* f137ac0: 8fb80044 */ lw $t8,0x44($sp) @@ -684,7 +684,7 @@ glabel func0f137874 /* f137ae0: 00057a00 */ sll $t7,$a1,0x8 /* f137ae4: 00046a00 */ sll $t5,$a0,0x8 /* f137ae8: 01a02025 */ or $a0,$t5,$zero -/* f137aec: 0fc01a40 */ jal func0f006900 +/* f137aec: 0fc01a40 */ jal colourBlend /* f137af0: 01e02825 */ or $a1,$t7,$zero /* f137af4: 8fb8004c */ lw $t8,0x4c($sp) /* f137af8: 8fad0044 */ lw $t5,0x44($sp) @@ -698,7 +698,7 @@ glabel func0f137874 /* f137b18: 0005ca00 */ sll $t9,$a1,0x8 /* f137b1c: 00047a00 */ sll $t7,$a0,0x8 /* f137b20: 01e02025 */ or $a0,$t7,$zero -/* f137b24: 0fc01a40 */ jal func0f006900 +/* f137b24: 0fc01a40 */ jal colourBlend /* f137b28: 03202825 */ or $a1,$t9,$zero /* f137b2c: 8fad004c */ lw $t5,0x4c($sp) /* f137b30: 8faf0044 */ lw $t7,0x44($sp) @@ -2458,7 +2458,7 @@ glabel var7f1b5850 /* f1393e8: 00084900 */ sll $t1,$t0,0x4 /* f1393ec: 02495021 */ addu $t2,$s2,$t1 /* f1393f0: 01545821 */ addu $t3,$t2,$s4 -/* f1393f4: 0fc01a40 */ jal func0f006900 +/* f1393f4: 0fc01a40 */ jal colourBlend /* f1393f8: 8d650000 */ lw $a1,0x0($t3) /* f1393fc: 10000006 */ beqz $zero,.L0f139418 /* f139400: 00403025 */ or $a2,$v0,$zero @@ -2924,12 +2924,12 @@ glabel var7f1b5868 /* f139ab0: 00000000 */ sll $zero,$zero,0x0 .L0f139ab4: /* f139ab4: 44cef800 */ ctc1 $t6,$31 -/* f139ab8: 0fc01a40 */ jal func0f006900 +/* f139ab8: 0fc01a40 */ jal colourBlend /* f139abc: 02003025 */ or $a2,$s0,$zero /* f139ac0: 0040b025 */ or $s6,$v0,$zero /* f139ac4: 3404af00 */ dli $a0,0xaf00 /* f139ac8: 2405ff00 */ addiu $a1,$zero,-256 -/* f139acc: 0fc01a40 */ jal func0f006900 +/* f139acc: 0fc01a40 */ jal colourBlend /* f139ad0: 02003025 */ or $a2,$s0,$zero /* f139ad4: 0040b825 */ or $s7,$v0,$zero /* f139ad8: 24100004 */ addiu $s0,$zero,0x4 @@ -2995,7 +2995,7 @@ glabel var7f1b5868 /* f139bc0: 00000000 */ sll $zero,$zero,0x0 .L0f139bc4: /* f139bc4: 02c02825 */ or $a1,$s6,$zero -/* f139bc8: 0fc01a40 */ jal func0f006900 +/* f139bc8: 0fc01a40 */ jal colourBlend /* f139bcc: 02403025 */ or $a2,$s2,$zero /* f139bd0: 44939000 */ mtc1 $s3,$f18 /* f139bd4: 3c01427c */ lui $at,0x427c diff --git a/src/game/game_13c510.c b/src/game/game_13c510.c index 98668dbb8..7469d0408 100644 --- a/src/game/game_13c510.c +++ b/src/game/game_13c510.c @@ -313,20 +313,20 @@ glabel func0f13c780 /* f13c888: 02002825 */ or $a1,$s0,$zero /* f13c88c: 0c005680 */ jal func00015a00 /* f13c890: 27a600f8 */ addiu $a2,$sp,0xf8 -/* f13c894: 0c002f22 */ jal func0000bc88 +/* f13c894: 0c002f22 */ jal viGetWidth /* f13c898: 00000000 */ sll $zero,$zero,0x0 /* f13c89c: 44822000 */ mtc1 $v0,$f4 /* f13c8a0: 00000000 */ sll $zero,$zero,0x0 /* f13c8a4: 468021a0 */ cvt.s.w $f6,$f4 -/* f13c8a8: 0c002f26 */ jal func0000bc98 +/* f13c8a8: 0c002f26 */ jal viGetHeight /* f13c8ac: e7a601bc */ swc1 $f6,0x1bc($sp) /* f13c8b0: 44824000 */ mtc1 $v0,$f8 /* f13c8b4: 00000000 */ sll $zero,$zero,0x0 /* f13c8b8: 468042a0 */ cvt.s.w $f10,$f8 -/* f13c8bc: 0c002f40 */ jal func0000bd00 +/* f13c8bc: 0c002f40 */ jal viGetLeft /* f13c8c0: e7aa01b8 */ swc1 $f10,0x1b8($sp) /* f13c8c4: 44822000 */ mtc1 $v0,$f4 -/* f13c8c8: 0c002f44 */ jal func0000bd10 +/* f13c8c8: 0c002f44 */ jal viGetTop /* f13c8cc: 468027a0 */ cvt.s.w $f30,$f4 /* f13c8d0: 8fae01c0 */ lw $t6,0x1c0($sp) /* f13c8d4: 44823000 */ mtc1 $v0,$f6 @@ -1711,7 +1711,7 @@ glabel func0f13d568 /* f13dce0: 46045682 */ mul.s $f26,$f10,$f4 /* f13dce4: 0fc2d60a */ jal currentPlayerGetPerspAspect /* f13dce8: 00000000 */ sll $zero,$zero,0x0 -/* f13dcec: 0c002f22 */ jal func0000bc88 +/* f13dcec: 0c002f22 */ jal viGetWidth /* f13dcf0: 46000506 */ mov.s $f20,$f0 /* f13dcf4: 44824000 */ mtc1 $v0,$f8 /* f13dcf8: 3c017f1b */ lui $at,%hi(var7f1b5a04) @@ -1720,7 +1720,7 @@ glabel func0f13d568 /* f13dd04: 46109182 */ mul.s $f6,$f18,$f16 /* f13dd08: 46143283 */ div.s $f10,$f6,$f20 /* f13dd0c: 460ac602 */ mul.s $f24,$f24,$f10 -/* f13dd10: 0c002f26 */ jal func0000bc98 +/* f13dd10: 0c002f26 */ jal viGetHeight /* f13dd14: 00000000 */ sll $zero,$zero,0x0 /* f13dd18: 44822000 */ mtc1 $v0,$f4 /* f13dd1c: 3c017f1b */ lui $at,%hi(var7f1b5a08) diff --git a/src/game/game_141820.c b/src/game/game_141820.c index 5cb34d2af..02e27f57c 100644 --- a/src/game/game_141820.c +++ b/src/game/game_141820.c @@ -916,13 +916,13 @@ glabel func0f142438 /* f14246c: f7b40028 */ sdc1 $f20,0x28($sp) /* f142470: 0c002acb */ jal func0000ab2c /* f142474: afa5007c */ sw $a1,0x7c($sp) -/* f142478: 0c002f44 */ jal func0000bd10 +/* f142478: 0c002f44 */ jal viGetTop /* f14247c: 0040b025 */ or $s6,$v0,$zero -/* f142480: 0c002f26 */ jal func0000bc98 +/* f142480: 0c002f26 */ jal viGetHeight /* f142484: 00409825 */ or $s3,$v0,$zero -/* f142488: 0c002f22 */ jal func0000bc88 +/* f142488: 0c002f22 */ jal viGetWidth /* f14248c: afa2006c */ sw $v0,0x6c($sp) -/* f142490: 0c002f40 */ jal func0000bd00 +/* f142490: 0c002f40 */ jal viGetLeft /* f142494: 0040a025 */ or $s4,$v0,$zero /* f142498: 3c038008 */ lui $v1,%hi(var8007f848) /* f14249c: 2463f848 */ addiu $v1,$v1,%lo(var8007f848) @@ -1056,13 +1056,13 @@ glabel func0f142644 /* f142670: afb3003c */ sw $s3,0x3c($sp) /* f142674: 0c002acb */ jal func0000ab2c /* f142678: f7b40028 */ sdc1 $f20,0x28($sp) -/* f14267c: 0c002f44 */ jal func0000bd10 +/* f14267c: 0c002f44 */ jal viGetTop /* f142680: 00000000 */ sll $zero,$zero,0x0 -/* f142684: 0c002f26 */ jal func0000bc98 +/* f142684: 0c002f26 */ jal viGetHeight /* f142688: 00409825 */ or $s3,$v0,$zero -/* f14268c: 0c002f22 */ jal func0000bc88 +/* f14268c: 0c002f22 */ jal viGetWidth /* f142690: afa20054 */ sw $v0,0x54($sp) -/* f142694: 0c002f40 */ jal func0000bd00 +/* f142694: 0c002f40 */ jal viGetLeft /* f142698: 0040a825 */ or $s5,$v0,$zero /* f14269c: 0c004b70 */ jal random /* f1426a0: 0040b025 */ or $s6,$v0,$zero @@ -1143,13 +1143,13 @@ glabel func0f142774 /* f1427b0: f7b60030 */ sdc1 $f22,0x30($sp) /* f1427b4: 0c002ac7 */ jal func0000ab1c /* f1427b8: f7b40028 */ sdc1 $f20,0x28($sp) -/* f1427bc: 0c002f44 */ jal func0000bd10 +/* f1427bc: 0c002f44 */ jal viGetTop /* f1427c0: afa2007c */ sw $v0,0x7c($sp) -/* f1427c4: 0c002f26 */ jal func0000bc98 +/* f1427c4: 0c002f26 */ jal viGetHeight /* f1427c8: 0040b825 */ or $s7,$v0,$zero -/* f1427cc: 0c002f22 */ jal func0000bc88 +/* f1427cc: 0c002f22 */ jal viGetWidth /* f1427d0: 00408825 */ or $s1,$v0,$zero -/* f1427d4: 0c002f40 */ jal func0000bd00 +/* f1427d4: 0c002f40 */ jal viGetLeft /* f1427d8: 0040f025 */ or $s8,$v0,$zero /* f1427dc: 3c017f1b */ lui $at,%hi(var7f1b5f2c) /* f1427e0: c4365f2c */ lwc1 $f22,%lo(var7f1b5f2c)($at) @@ -1287,13 +1287,13 @@ glabel func0f14298c /* f1429c0: afb10034 */ sw $s1,0x34($sp) /* f1429c4: 0c002ac7 */ jal func0000ab1c /* f1429c8: f7b40028 */ sdc1 $f20,0x28($sp) -/* f1429cc: 0c002f44 */ jal func0000bd10 +/* f1429cc: 0c002f44 */ jal viGetTop /* f1429d0: afa2008c */ sw $v0,0x8c($sp) -/* f1429d4: 0c002f26 */ jal func0000bc98 +/* f1429d4: 0c002f26 */ jal viGetHeight /* f1429d8: afa20088 */ sw $v0,0x88($sp) -/* f1429dc: 0c002f22 */ jal func0000bc88 +/* f1429dc: 0c002f22 */ jal viGetWidth /* f1429e0: 00408825 */ or $s1,$v0,$zero -/* f1429e4: 0c002f40 */ jal func0000bd00 +/* f1429e4: 0c002f40 */ jal viGetLeft /* f1429e8: afa2007c */ sw $v0,0x7c($sp) /* f1429ec: 3c018006 */ lui $at,0x8006 /* f1429f0: c4241630 */ lwc1 $f4,0x1630($at) @@ -1456,13 +1456,13 @@ glabel func0f142bf0 /* f142c28: f7b60030 */ sdc1 $f22,0x30($sp) /* f142c2c: 0c002acb */ jal func0000ab2c /* f142c30: f7b40028 */ sdc1 $f20,0x28($sp) -/* f142c34: 0c002f44 */ jal func0000bd10 +/* f142c34: 0c002f44 */ jal viGetTop /* f142c38: 0040b025 */ or $s6,$v0,$zero -/* f142c3c: 0c002f26 */ jal func0000bc98 +/* f142c3c: 0c002f26 */ jal viGetHeight /* f142c40: 0040a825 */ or $s5,$v0,$zero -/* f142c44: 0c002f22 */ jal func0000bc88 +/* f142c44: 0c002f22 */ jal viGetWidth /* f142c48: afa20064 */ sw $v0,0x64($sp) -/* f142c4c: 0c002f40 */ jal func0000bd00 +/* f142c4c: 0c002f40 */ jal viGetLeft /* f142c50: 00409825 */ or $s3,$v0,$zero /* f142c54: 3c038008 */ lui $v1,%hi(var8007f840) /* f142c58: 2463f840 */ addiu $v1,$v1,%lo(var8007f840) @@ -1609,9 +1609,9 @@ glabel hudRenderEyespyView /* f142e4c: f7b40028 */ sdc1 $f20,0x28($sp) /* f142e50: 0c002ac7 */ jal func0000ab1c /* f142e54: afa7013c */ sw $a3,0x13c($sp) -/* f142e58: 0c002f44 */ jal func0000bd10 +/* f142e58: 0c002f44 */ jal viGetTop /* f142e5c: afa2012c */ sw $v0,0x12c($sp) -/* f142e60: 0c002f26 */ jal func0000bc98 +/* f142e60: 0c002f26 */ jal viGetHeight /* f142e64: afa20128 */ sw $v0,0x128($sp) /* f142e68: 44822000 */ mtc1 $v0,$f4 /* f142e6c: 3c013f00 */ lui $at,0x3f00 @@ -1622,9 +1622,9 @@ glabel hudRenderEyespyView /* f142e80: 461ce200 */ add.s $f8,$f28,$f28 /* f142e84: 461ce602 */ mul.s $f24,$f28,$f28 /* f142e88: 46004287 */ neg.s $f10,$f8 -/* f142e8c: 0c002f22 */ jal func0000bc88 +/* f142e8c: 0c002f22 */ jal viGetWidth /* f142e90: 46025683 */ div.s $f26,$f10,$f2 -/* f142e94: 0c002f40 */ jal func0000bd00 +/* f142e94: 0c002f40 */ jal viGetLeft /* f142e98: 0040b025 */ or $s6,$v0,$zero /* f142e9c: 3c038008 */ lui $v1,%hi(var8007f840) /* f142ea0: 2463f840 */ addiu $v1,$v1,%lo(var8007f840) @@ -2308,13 +2308,13 @@ glabel hudRenderEyespyUi /* f1438a0: afb30044 */ sw $s3,0x44($sp) /* f1438a4: afb20040 */ sw $s2,0x40($sp) /* f1438a8: afb1003c */ sw $s1,0x3c($sp) -/* f1438ac: 0c002f40 */ jal func0000bd00 +/* f1438ac: 0c002f40 */ jal viGetLeft /* f1438b0: afb00038 */ sw $s0,0x38($sp) -/* f1438b4: 0c002f44 */ jal func0000bd10 +/* f1438b4: 0c002f44 */ jal viGetTop /* f1438b8: afa20304 */ sw $v0,0x304($sp) -/* f1438bc: 0c002f22 */ jal func0000bc88 +/* f1438bc: 0c002f22 */ jal viGetWidth /* f1438c0: afa20300 */ sw $v0,0x300($sp) -/* f1438c4: 0c002f26 */ jal func0000bc98 +/* f1438c4: 0c002f26 */ jal viGetHeight /* f1438c8: 00408825 */ or $s1,$v0,$zero /* f1438cc: 8fae0300 */ lw $t6,0x300($sp) /* f1438d0: 44806000 */ mtc1 $zero,$f12 @@ -6242,13 +6242,13 @@ glabel func0f1472fc /* f147328: afb00030 */ sw $s0,0x30($sp) /* f14732c: 0c002ac7 */ jal func0000ab1c /* f147330: f7b40028 */ sdc1 $f20,0x28($sp) -/* f147334: 0c002f26 */ jal func0000bc98 +/* f147334: 0c002f26 */ jal viGetHeight /* f147338: afa2005c */ sw $v0,0x5c($sp) -/* f14733c: 0c002f22 */ jal func0000bc88 +/* f14733c: 0c002f22 */ jal viGetWidth /* f147340: 00408025 */ or $s0,$v0,$zero -/* f147344: 0c002f44 */ jal func0000bd10 +/* f147344: 0c002f44 */ jal viGetTop /* f147348: 0040b025 */ or $s6,$v0,$zero -/* f14734c: 0c002f40 */ jal func0000bd00 +/* f14734c: 0c002f40 */ jal viGetLeft /* f147350: 00409825 */ or $s3,$v0,$zero /* f147354: 3c038008 */ lui $v1,%hi(var8007f840) /* f147358: 2463f840 */ addiu $v1,$v1,%lo(var8007f840) @@ -6418,13 +6418,13 @@ glabel func0f147578 /* f1475a8: f7b60030 */ sdc1 $f22,0x30($sp) /* f1475ac: 0c002ac7 */ jal func0000ab1c /* f1475b0: f7b40028 */ sdc1 $f20,0x28($sp) -/* f1475b4: 0c002f26 */ jal func0000bc98 +/* f1475b4: 0c002f26 */ jal viGetHeight /* f1475b8: 0040f025 */ or $s8,$v0,$zero -/* f1475bc: 0c002f22 */ jal func0000bc88 +/* f1475bc: 0c002f22 */ jal viGetWidth /* f1475c0: 00409825 */ or $s3,$v0,$zero -/* f1475c4: 0c002f44 */ jal func0000bd10 +/* f1475c4: 0c002f44 */ jal viGetTop /* f1475c8: afa200dc */ sw $v0,0xdc($sp) -/* f1475cc: 0c002f40 */ jal func0000bd00 +/* f1475cc: 0c002f40 */ jal viGetLeft /* f1475d0: 00408025 */ or $s0,$v0,$zero /* f1475d4: 3c038008 */ lui $v1,%hi(var8007f84c) /* f1475d8: 8c63f84c */ lw $v1,%lo(var8007f84c)($v1) @@ -6797,13 +6797,13 @@ glabel func0f147578 /* f147b38: f7b40028 */ sdc1 $f20,0x28($sp) /* f147b3c: 0c002ac7 */ jal func0000ab1c /* f147b40: afa5008c */ sw $a1,0x8c($sp) -/* f147b44: 0c002f44 */ jal func0000bd10 +/* f147b44: 0c002f44 */ jal viGetTop /* f147b48: 0040b025 */ or $s6,$v0,$zero -/* f147b4c: 0c002f26 */ jal func0000bc98 +/* f147b4c: 0c002f26 */ jal viGetHeight /* f147b50: afa20080 */ sw $v0,0x80($sp) -/* f147b54: 0c002f22 */ jal func0000bc88 +/* f147b54: 0c002f22 */ jal viGetWidth /* f147b58: afa2007c */ sw $v0,0x7c($sp) -/* f147b5c: 0c002f40 */ jal func0000bd00 +/* f147b5c: 0c002f40 */ jal viGetLeft /* f147b60: 0040a025 */ or $s4,$v0,$zero /* f147b64: 3c038008 */ lui $v1,%hi(var8007f840) /* f147b68: 2463f840 */ addiu $v1,$v1,%lo(var8007f840) @@ -6928,13 +6928,13 @@ glabel func0f147cf8 /* f147d18: afb0002c */ sw $s0,0x2c($sp) /* f147d1c: 0c002ac7 */ jal func0000ab1c /* f147d20: f7b40020 */ sdc1 $f20,0x20($sp) -/* f147d24: 0c002f44 */ jal func0000bd10 +/* f147d24: 0c002f44 */ jal viGetTop /* f147d28: 0040a825 */ or $s5,$v0,$zero -/* f147d2c: 0c002f26 */ jal func0000bc98 +/* f147d2c: 0c002f26 */ jal viGetHeight /* f147d30: afa20050 */ sw $v0,0x50($sp) -/* f147d34: 0c002f22 */ jal func0000bc88 +/* f147d34: 0c002f22 */ jal viGetWidth /* f147d38: afa2004c */ sw $v0,0x4c($sp) -/* f147d3c: 0c002f40 */ jal func0000bd00 +/* f147d3c: 0c002f40 */ jal viGetLeft /* f147d40: 00409825 */ or $s3,$v0,$zero /* f147d44: 3c038008 */ lui $v1,%hi(var8007f840) /* f147d48: 2463f840 */ addiu $v1,$v1,%lo(var8007f840) @@ -7009,13 +7009,13 @@ glabel hudRenderHorizonScanner /* f147e3c: f7b60040 */ sdc1 $f22,0x40($sp) /* f147e40: 0c002ac7 */ jal func0000ab1c /* f147e44: f7b40038 */ sdc1 $f20,0x38($sp) -/* f147e48: 0c002f44 */ jal func0000bd10 +/* f147e48: 0c002f44 */ jal viGetTop /* f147e4c: afa20194 */ sw $v0,0x194($sp) -/* f147e50: 0c002f26 */ jal func0000bc98 +/* f147e50: 0c002f26 */ jal viGetHeight /* f147e54: afa20190 */ sw $v0,0x190($sp) -/* f147e58: 0c002f22 */ jal func0000bc88 +/* f147e58: 0c002f22 */ jal viGetWidth /* f147e5c: afa2018c */ sw $v0,0x18c($sp) -/* f147e60: 0c002f40 */ jal func0000bd00 +/* f147e60: 0c002f40 */ jal viGetLeft /* f147e64: afa20188 */ sw $v0,0x188($sp) /* f147e68: 3c10800a */ lui $s0,%hi(g_Vars) /* f147e6c: 26109fc0 */ addiu $s0,$s0,%lo(g_Vars) @@ -7627,7 +7627,7 @@ glabel hudRenderHorizonScanner /* f148764: 00000000 */ sll $zero,$zero,0x0 .L0f148768: /* f148768: 44caf800 */ ctc1 $t2,$31 -/* f14876c: 0fc01a40 */ jal func0f006900 +/* f14876c: 0fc01a40 */ jal colourBlend /* f148770: 00000000 */ sll $zero,$zero,0x0 /* f148774: 00402825 */ or $a1,$v0,$zero /* f148778: 10000008 */ beqz $zero,.L0f14879c @@ -7716,13 +7716,13 @@ glabel func0f14886c /* f148890: afb20030 */ sw $s2,0x30($sp) /* f148894: afb1002c */ sw $s1,0x2c($sp) /* f148898: afb00028 */ sw $s0,0x28($sp) -/* f14889c: 0c002f26 */ jal func0000bc98 +/* f14889c: 0c002f26 */ jal viGetHeight /* f1488a0: f7b40020 */ sdc1 $f20,0x20($sp) -/* f1488a4: 0c002f22 */ jal func0000bc88 +/* f1488a4: 0c002f22 */ jal viGetWidth /* f1488a8: 00408025 */ or $s0,$v0,$zero -/* f1488ac: 0c002f44 */ jal func0000bd10 +/* f1488ac: 0c002f44 */ jal viGetTop /* f1488b0: afa200a8 */ sw $v0,0xa8($sp) -/* f1488b4: 0c002f40 */ jal func0000bd00 +/* f1488b4: 0c002f40 */ jal viGetLeft /* f1488b8: 00408825 */ or $s1,$v0,$zero /* f1488bc: 24090003 */ addiu $t1,$zero,0x3 /* f1488c0: 8fa600a8 */ lw $a2,0xa8($sp) diff --git a/src/game/game_1531a0.c b/src/game/game_1531a0.c index 5233b4313..fb7d52576 100644 --- a/src/game/game_1531a0.c +++ b/src/game/game_1531a0.c @@ -1176,7 +1176,7 @@ glabel func0f153e94 /* f1541a8: 00000000 */ sll $zero,$zero,0x0 .L0f1541ac: /* f1541ac: 44d8f800 */ ctc1 $t8,$31 -/* f1541b0: 0fc01a40 */ jal func0f006900 +/* f1541b0: 0fc01a40 */ jal colourBlend /* f1541b4: 032a3023 */ subu $a2,$t9,$t2 /* f1541b8: 10000077 */ beqz $zero,.L0f154398 /* f1541bc: 00404025 */ or $t0,$v0,$zero @@ -1239,7 +1239,7 @@ glabel func0f153e94 /* f154290: 00000000 */ sll $zero,$zero,0x0 .L0f154294: /* f154294: 44cbf800 */ ctc1 $t3,$31 -/* f154298: 0fc01a40 */ jal func0f006900 +/* f154298: 0fc01a40 */ jal colourBlend /* f15429c: 00000000 */ sll $zero,$zero,0x0 /* f1542a0: 1000003d */ beqz $zero,.L0f154398 /* f1542a4: 00404025 */ or $t0,$v0,$zero @@ -1305,7 +1305,7 @@ glabel func0f153e94 /* f154384: 00000000 */ sll $zero,$zero,0x0 .L0f154388: /* f154388: 44ccf800 */ ctc1 $t4,$31 -/* f15438c: 0fc01a40 */ jal func0f006900 +/* f15438c: 0fc01a40 */ jal colourBlend /* f154390: 00000000 */ sll $zero,$zero,0x0 /* f154394: 00404025 */ or $t0,$v0,$zero .L0f154398: @@ -1334,7 +1334,7 @@ glabel func0f1543ac /* f1543dc: 00002025 */ or $a0,$zero,$zero /* f1543e0: 00e02825 */ or $a1,$a3,$zero /* f1543e4: 8d260060 */ lw $a2,0x60($t1) -/* f1543e8: 0fc01a40 */ jal func0f006900 +/* f1543e8: 0fc01a40 */ jal colourBlend /* f1543ec: afa700b0 */ sw $a3,0xb0($sp) /* f1543f0: 8fa700b0 */ lw $a3,0xb0($sp) /* f1543f4: 3c09800a */ lui $t1,%hi(var800a45d0) @@ -1386,7 +1386,7 @@ glabel func0f1543ac /* f154498: 00000000 */ sll $zero,$zero,0x0 /* f15449c: 0006000d */ break 0x6 .L0f1544a0: -/* f1544a0: 0fc01a40 */ jal func0f006900 +/* f1544a0: 0fc01a40 */ jal colourBlend /* f1544a4: 00000000 */ sll $zero,$zero,0x0 /* f1544a8: 3c09800a */ lui $t1,%hi(var800a45d0) /* f1544ac: 252945d0 */ addiu $t1,$t1,%lo(var800a45d0) @@ -1433,7 +1433,7 @@ glabel func0f1543ac /* f15453c: 00000000 */ sll $zero,$zero,0x0 /* f154540: 0006000d */ break 0x6 .L0f154544: -/* f154544: 0fc01a40 */ jal func0f006900 +/* f154544: 0fc01a40 */ jal colourBlend /* f154548: 00000000 */ sll $zero,$zero,0x0 /* f15454c: 3c09800a */ lui $t1,%hi(var800a45d0) /* f154550: 252945d0 */ addiu $t1,$t1,%lo(var800a45d0) @@ -1728,7 +1728,7 @@ glabel func0f1543ac /* f154984: 00000000 */ sll $zero,$zero,0x0 .L0f154988: /* f154988: 44cff800 */ ctc1 $t7,$31 -/* f15498c: 0fc01a40 */ jal func0f006900 +/* f15498c: 0fc01a40 */ jal colourBlend /* f154990: 00000000 */ sll $zero,$zero,0x0 /* f154994: 3c09800a */ lui $t1,%hi(var800a45d0) /* f154998: 252945d0 */ addiu $t1,$t1,%lo(var800a45d0) @@ -1799,7 +1799,7 @@ glabel func0f1543ac /* f154a8c: 00000000 */ sll $zero,$zero,0x0 .L0f154a90: /* f154a90: 44caf800 */ ctc1 $t2,$31 -/* f154a94: 0fc01a40 */ jal func0f006900 +/* f154a94: 0fc01a40 */ jal colourBlend /* f154a98: 00000000 */ sll $zero,$zero,0x0 /* f154a9c: 3c09800a */ lui $t1,%hi(var800a45d0) /* f154aa0: 252945d0 */ addiu $t1,$t1,%lo(var800a45d0) @@ -1826,7 +1826,7 @@ glabel func0f1543ac /* f154af0: 02002825 */ or $a1,$s0,$zero /* f154af4: 45020008 */ bc1fl .L0f154b18 /* f154af8: 460e0081 */ sub.s $f2,$f0,$f14 -/* f154afc: 0fc01a40 */ jal func0f006900 +/* f154afc: 0fc01a40 */ jal colourBlend /* f154b00: 2406006e */ addiu $a2,$zero,0x6e /* f154b04: 3c09800a */ lui $t1,%hi(var800a45d0) /* f154b08: 252945d0 */ addiu $t1,$t1,%lo(var800a45d0) @@ -1849,12 +1849,12 @@ glabel func0f1543ac /* f154b48: 240600c0 */ addiu $a2,$zero,0xc0 /* f154b4c: 01822025 */ or $a0,$t4,$v0 /* f154b50: 460a4102 */ mul.s $f4,$f8,$f10 -/* f154b54: 0fc01a40 */ jal func0f006900 +/* f154b54: 0fc01a40 */ jal colourBlend /* f154b58: e7a4004c */ swc1 $f4,0x4c($sp) /* f154b5c: afa20028 */ sw $v0,0x28($sp) /* f154b60: 8fa40050 */ lw $a0,0x50($sp) /* f154b64: 02002825 */ or $a1,$s0,$zero -/* f154b68: 0fc01a40 */ jal func0f006900 +/* f154b68: 0fc01a40 */ jal colourBlend /* f154b6c: 2406006e */ addiu $a2,$zero,0x6e /* f154b70: 444df800 */ cfc1 $t5,$31 /* f154b74: 240e0001 */ addiu $t6,$zero,0x1 @@ -1895,7 +1895,7 @@ glabel func0f1543ac /* f154bf8: 00000000 */ sll $zero,$zero,0x0 .L0f154bfc: /* f154bfc: 44cdf800 */ ctc1 $t5,$31 -/* f154c00: 0fc01a40 */ jal func0f006900 +/* f154c00: 0fc01a40 */ jal colourBlend /* f154c04: 00ee3023 */ subu $a2,$a3,$t6 /* f154c08: 3c09800a */ lui $t1,%hi(var800a45d0) /* f154c0c: 252945d0 */ addiu $t1,$t1,%lo(var800a45d0) @@ -1914,7 +1914,7 @@ glabel func0f1543ac /* f154c3c: 44819000 */ mtc1 $at,$f18 /* f154c40: 8f39fbc8 */ lw $t9,%lo(var8007fbc8)($t9) /* f154c44: 240600c0 */ addiu $a2,$zero,0xc0 -/* f154c48: 0fc01a40 */ jal func0f006900 +/* f154c48: 0fc01a40 */ jal colourBlend /* f154c4c: 03222025 */ or $a0,$t9,$v0 /* f154c50: 3c09800a */ lui $t1,%hi(var800a45d0) /* f154c54: 252945d0 */ addiu $t1,$t1,%lo(var800a45d0) @@ -1940,7 +1940,7 @@ glabel func0f1543ac /* f154ca0: 240600c0 */ addiu $a2,$zero,0xc0 /* f154ca4: 03022025 */ or $a0,$t8,$v0 /* f154ca8: 46062202 */ mul.s $f8,$f4,$f6 -/* f154cac: 0fc01a40 */ jal func0f006900 +/* f154cac: 0fc01a40 */ jal colourBlend /* f154cb0: e7a80044 */ swc1 $f8,0x44($sp) /* f154cb4: 444ff800 */ cfc1 $t7,$31 /* f154cb8: 240b0001 */ addiu $t3,$zero,0x1 @@ -1981,7 +1981,7 @@ glabel func0f1543ac /* f154d3c: 00000000 */ sll $zero,$zero,0x0 .L0f154d40: /* f154d40: 44cff800 */ ctc1 $t7,$31 -/* f154d44: 0fc01a40 */ jal func0f006900 +/* f154d44: 0fc01a40 */ jal colourBlend /* f154d48: 00eb3023 */ subu $a2,$a3,$t3 /* f154d4c: 3c09800a */ lui $t1,%hi(var800a45d0) /* f154d50: 252945d0 */ addiu $t1,$t1,%lo(var800a45d0) @@ -2057,7 +2057,7 @@ glabel func0f1543ac /* f154e58: 004b2025 */ or $a0,$v0,$t3 /* f154e5c: 4600410d */ trunc.w.s $f4,$f8 /* f154e60: 44062000 */ mfc1 $a2,$f4 -/* f154e64: 0fc01a40 */ jal func0f006900 +/* f154e64: 0fc01a40 */ jal colourBlend /* f154e68: 00000000 */ sll $zero,$zero,0x0 /* f154e6c: 10000012 */ beqz $zero,.L0f154eb8 /* f154e70: 00408025 */ or $s0,$v0,$zero @@ -2077,7 +2077,7 @@ glabel func0f1543ac /* f154ea0: 004d2025 */ or $a0,$v0,$t5 /* f154ea4: 4600228d */ trunc.w.s $f10,$f4 /* f154ea8: 44065000 */ mfc1 $a2,$f10 -/* f154eac: 0fc01a40 */ jal func0f006900 +/* f154eac: 0fc01a40 */ jal colourBlend /* f154eb0: 00000000 */ sll $zero,$zero,0x0 /* f154eb4: 00408025 */ or $s0,$v0,$zero .L0f154eb8: diff --git a/src/game/game_157db0.c b/src/game/game_157db0.c index b7d76292a..37a616656 100644 --- a/src/game/game_157db0.c +++ b/src/game/game_157db0.c @@ -15588,7 +15588,7 @@ glabel func0f164748 /* f164774: 44824000 */ mtc1 $v0,$f8 /* f164778: 00000000 */ sll $zero,$zero,0x0 /* f16477c: 468042a0 */ cvt.s.w $f10,$f8 -/* f164780: 0c002f40 */ jal func0000bd00 +/* f164780: 0c002f40 */ jal viGetLeft /* f164784: e7aa0028 */ swc1 $f10,0x28($sp) /* f164788: 44828000 */ mtc1 $v0,$f16 /* f16478c: 44801000 */ mtc1 $zero,$f2 @@ -15607,7 +15607,7 @@ glabel func0f164748 /* f1647bc: 00000000 */ sll $zero,$zero,0x0 /* f1647c0: e6001794 */ swc1 $f0,0x1794($s0) .L0f1647c4: -/* f1647c4: 0c002f44 */ jal func0000bd10 +/* f1647c4: 0c002f44 */ jal viGetTop /* f1647c8: 00000000 */ sll $zero,$zero,0x0 /* f1647cc: 44822000 */ mtc1 $v0,$f4 /* f1647d0: 44801000 */ mtc1 $zero,$f2 @@ -15626,9 +15626,9 @@ glabel func0f164748 /* f164800: 00000000 */ sll $zero,$zero,0x0 /* f164804: e6001798 */ swc1 $f0,0x1798($s0) .L0f164808: -/* f164808: 0c002f40 */ jal func0000bd00 +/* f164808: 0c002f40 */ jal viGetLeft /* f16480c: 00000000 */ sll $zero,$zero,0x0 -/* f164810: 0c002f22 */ jal func0000bc88 +/* f164810: 0c002f22 */ jal viGetWidth /* f164814: a7a20022 */ sh $v0,0x22($sp) /* f164818: 87ae0022 */ lh $t6,0x22($sp) /* f16481c: 44801000 */ mtc1 $zero,$f2 @@ -15650,9 +15650,9 @@ glabel func0f164748 /* f164858: 00000000 */ sll $zero,$zero,0x0 /* f16485c: e60a179c */ swc1 $f10,0x179c($s0) .L0f164860: -/* f164860: 0c002f44 */ jal func0000bd10 +/* f164860: 0c002f44 */ jal viGetTop /* f164864: 00000000 */ sll $zero,$zero,0x0 -/* f164868: 0c002f26 */ jal func0000bc98 +/* f164868: 0c002f26 */ jal viGetHeight /* f16486c: a7a20022 */ sh $v0,0x22($sp) /* f164870: 87b80022 */ lh $t8,0x22($sp) /* f164874: 44801000 */ mtc1 $zero,$f2 diff --git a/src/game/game_167ae0.c b/src/game/game_167ae0.c index d103117fc..05fd90305 100644 --- a/src/game/game_167ae0.c +++ b/src/game/game_167ae0.c @@ -132,14 +132,10 @@ u32 g_BoostAndSlayerSounds[] = {0x05c8, 0x8068, 0x01c8}; u32 var80084050 = 0; s16 g_FadeNumFrames = 0; - -// 80084058 -f32 fade80084058 = -1; -u32 g_FadePrevColor = 0; -u32 g_FadeColor = 0; - -// 80084064 -u16 fade80084064 = 0; +f32 g_FadeFrac = -1; +u32 g_FadePrevColour = 0; +u32 g_FadeColour = 0; +s16 g_FadeDelay = 0; u32 getVar80084040(void) { @@ -480,223 +476,78 @@ void func0f167e7c(s32 stagenum) void fadeConfigure(u32 color, s16 num_frames) { g_FadeNumFrames = num_frames; - g_FadePrevColor = g_FadeColor; + g_FadePrevColour = g_FadeColour; if (g_FadeNumFrames == 0) { - g_FadeColor = color; - fade80084058 = -1.0; + g_FadeColour = color; + g_FadeFrac = -1; return; } - fade80084058 = 0.0; - g_FadeColor = color; - fade80084064 = 2; + g_FadeFrac = 0; + g_FadeColour = color; + g_FadeDelay = 2; } -GLOBAL_ASM( -glabel fadeRender -/* f1685d8: 3c05800a */ lui $a1,%hi(g_Vars) -/* f1685dc: 24a59fc0 */ addiu $a1,$a1,%lo(g_Vars) -/* f1685e0: 8cae04b4 */ lw $t6,0x4b4($a1) -/* f1685e4: 3c078008 */ lui $a3,%hi(g_FadeColor) -/* f1685e8: 8ce74060 */ lw $a3,%lo(g_FadeColor)($a3) -/* f1685ec: 27bdffb8 */ addiu $sp,$sp,-72 -/* f1685f0: afb00018 */ sw $s0,0x18($sp) -/* f1685f4: 2401004e */ addiu $at,$zero,0x4e -/* f1685f8: 00808025 */ or $s0,$a0,$zero -/* f1685fc: afbf001c */ sw $ra,0x1c($sp) -/* f168600: afa00040 */ sw $zero,0x40($sp) -/* f168604: 15c10003 */ bne $t6,$at,.L0f168614 -/* f168608: 00e03025 */ or $a2,$a3,$zero -/* f16860c: 240f003d */ addiu $t7,$zero,0x3d -/* f168610: afaf0040 */ sw $t7,0x40($sp) -.L0f168614: -/* f168614: 3c038008 */ lui $v1,%hi(fade80084058) -/* f168618: 24634058 */ addiu $v1,$v1,%lo(fade80084058) -/* f16861c: 44801000 */ mtc1 $zero,$f2 -/* f168620: c4600000 */ lwc1 $f0,0x0($v1) -/* f168624: 3c048008 */ lui $a0,%hi(fade80084064) -/* f168628: 24844064 */ addiu $a0,$a0,%lo(fade80084064) -/* f16862c: 4600103e */ c.le.s $f2,$f0 -/* f168630: 00000000 */ sll $zero,$zero,0x0 -/* f168634: 4502001a */ bc1fl .L0f1686a0 -/* f168638: 4602003c */ c.lt.s $f0,$f2 -/* f16863c: 84820000 */ lh $v0,0x0($a0) -/* f168640: 18400003 */ blez $v0,.L0f168650 -/* f168644: 2458ffff */ addiu $t8,$v0,-1 -/* f168648: 10000014 */ beqz $zero,.L0f16869c -/* f16864c: a4980000 */ sh $t8,0x0($a0) -.L0f168650: -/* f168650: 3c198008 */ lui $t9,%hi(g_FadeNumFrames) -/* f168654: 87394054 */ lh $t9,%lo(g_FadeNumFrames)($t9) -/* f168658: c4a40004 */ lwc1 $f4,0x4($a1) -/* f16865c: 3c013f80 */ lui $at,0x3f80 -/* f168660: 44993000 */ mtc1 $t9,$f6 -/* f168664: 44819000 */ mtc1 $at,$f18 -/* f168668: 46803220 */ cvt.s.w $f8,$f6 -/* f16866c: 46082283 */ div.s $f10,$f4,$f8 -/* f168670: 460a0400 */ add.s $f16,$f0,$f10 -/* f168674: e4700000 */ swc1 $f16,0x0($v1) -/* f168678: c4600000 */ lwc1 $f0,0x0($v1) -/* f16867c: 4600903e */ c.le.s $f18,$f0 -/* f168680: 00000000 */ sll $zero,$zero,0x0 -/* f168684: 45000005 */ bc1f .L0f16869c -/* f168688: 3c01bf80 */ lui $at,0xbf80 -/* f16868c: 44813000 */ mtc1 $at,$f6 -/* f168690: 00000000 */ sll $zero,$zero,0x0 -/* f168694: e4660000 */ swc1 $f6,0x0($v1) -/* f168698: c4600000 */ lwc1 $f0,0x0($v1) -.L0f16869c: -/* f16869c: 4602003c */ c.lt.s $f0,$f2 -.L0f1686a0: -/* f1686a0: 00000000 */ sll $zero,$zero,0x0 -/* f1686a4: 45000005 */ bc1f .L0f1686bc -/* f1686a8: 30e800ff */ andi $t0,$a3,0xff -/* f1686ac: 5500002e */ bnezl $t0,.L0f168768 -/* f1686b0: 30ca00ff */ andi $t2,$a2,0xff -/* f1686b4: 10000074 */ beqz $zero,.L0f168888 -/* f1686b8: 02001025 */ or $v0,$s0,$zero -.L0f1686bc: -/* f1686bc: 3c01437f */ lui $at,0x437f -/* f1686c0: 44812000 */ mtc1 $at,$f4 -/* f1686c4: 24060001 */ addiu $a2,$zero,0x1 -/* f1686c8: 3c058008 */ lui $a1,%hi(g_FadePrevColor) -/* f1686cc: 46040202 */ mul.s $f8,$f0,$f4 -/* f1686d0: 8ca5405c */ lw $a1,%lo(g_FadePrevColor)($a1) -/* f1686d4: 3c014f00 */ lui $at,0x4f00 -/* f1686d8: 00e02025 */ or $a0,$a3,$zero -/* f1686dc: 4449f800 */ cfc1 $t1,$31 -/* f1686e0: 44c6f800 */ ctc1 $a2,$31 -/* f1686e4: 00000000 */ sll $zero,$zero,0x0 -/* f1686e8: 460042a4 */ cvt.w.s $f10,$f8 -/* f1686ec: 4446f800 */ cfc1 $a2,$31 -/* f1686f0: 00000000 */ sll $zero,$zero,0x0 -/* f1686f4: 30c60078 */ andi $a2,$a2,0x78 -/* f1686f8: 50c00013 */ beqzl $a2,.L0f168748 -/* f1686fc: 44065000 */ mfc1 $a2,$f10 -/* f168700: 44815000 */ mtc1 $at,$f10 -/* f168704: 24060001 */ addiu $a2,$zero,0x1 -/* f168708: 460a4281 */ sub.s $f10,$f8,$f10 -/* f16870c: 44c6f800 */ ctc1 $a2,$31 -/* f168710: 00000000 */ sll $zero,$zero,0x0 -/* f168714: 460052a4 */ cvt.w.s $f10,$f10 -/* f168718: 4446f800 */ cfc1 $a2,$31 -/* f16871c: 00000000 */ sll $zero,$zero,0x0 -/* f168720: 30c60078 */ andi $a2,$a2,0x78 -/* f168724: 14c00005 */ bnez $a2,.L0f16873c -/* f168728: 00000000 */ sll $zero,$zero,0x0 -/* f16872c: 44065000 */ mfc1 $a2,$f10 -/* f168730: 3c018000 */ lui $at,0x8000 -/* f168734: 10000007 */ beqz $zero,.L0f168754 -/* f168738: 00c13025 */ or $a2,$a2,$at -.L0f16873c: -/* f16873c: 10000005 */ beqz $zero,.L0f168754 -/* f168740: 2406ffff */ addiu $a2,$zero,-1 -/* f168744: 44065000 */ mfc1 $a2,$f10 -.L0f168748: -/* f168748: 00000000 */ sll $zero,$zero,0x0 -/* f16874c: 04c0fffb */ bltz $a2,.L0f16873c -/* f168750: 00000000 */ sll $zero,$zero,0x0 -.L0f168754: -/* f168754: 44c9f800 */ ctc1 $t1,$31 -/* f168758: 0fc01a40 */ jal func0f006900 -/* f16875c: 00000000 */ sll $zero,$zero,0x0 -/* f168760: 00403025 */ or $a2,$v0,$zero -/* f168764: 30ca00ff */ andi $t2,$a2,0xff -.L0f168768: -/* f168768: 55400004 */ bnezl $t2,.L0f16877c -/* f16876c: 02001025 */ or $v0,$s0,$zero -/* f168770: 10000045 */ beqz $zero,.L0f168888 -/* f168774: 02001025 */ or $v0,$s0,$zero -/* f168778: 02001025 */ or $v0,$s0,$zero -.L0f16877c: -/* f16877c: 26100008 */ addiu $s0,$s0,0x8 -/* f168780: 3c0be700 */ lui $t3,0xe700 -/* f168784: 02001825 */ or $v1,$s0,$zero -/* f168788: ac4b0000 */ sw $t3,0x0($v0) -/* f16878c: ac400004 */ sw $zero,0x4($v0) -/* f168790: 26100008 */ addiu $s0,$s0,0x8 -/* f168794: 3c0cb900 */ lui $t4,0xb900 -/* f168798: 3c0d0050 */ lui $t5,0x50 -/* f16879c: 35ad4340 */ ori $t5,$t5,0x4340 -/* f1687a0: 358c031d */ ori $t4,$t4,0x31d -/* f1687a4: 02002025 */ or $a0,$s0,$zero -/* f1687a8: ac6c0000 */ sw $t4,0x0($v1) -/* f1687ac: ac6d0004 */ sw $t5,0x4($v1) -/* f1687b0: 26100008 */ addiu $s0,$s0,0x8 -/* f1687b4: 3c0efcff */ lui $t6,0xfcff -/* f1687b8: 3c0ffffd */ lui $t7,0xfffd -/* f1687bc: 35eff6fb */ ori $t7,$t7,0xf6fb -/* f1687c0: 35ceffff */ ori $t6,$t6,0xffff -/* f1687c4: 02002825 */ or $a1,$s0,$zero -/* f1687c8: ac8e0000 */ sw $t6,0x0($a0) -/* f1687cc: ac8f0004 */ sw $t7,0x4($a0) -/* f1687d0: 3c18fa00 */ lui $t8,0xfa00 -/* f1687d4: acb80000 */ sw $t8,0x0($a1) -/* f1687d8: aca60004 */ sw $a2,0x4($a1) -/* f1687dc: 26100008 */ addiu $s0,$s0,0x8 -/* f1687e0: afb0002c */ sw $s0,0x2c($sp) -/* f1687e4: 0c002f22 */ jal func0000bc88 -/* f1687e8: 26100008 */ addiu $s0,$s0,0x8 -/* f1687ec: 0c002f40 */ jal func0000bd00 -/* f1687f0: a7a20026 */ sh $v0,0x26($sp) -/* f1687f4: 0c002f44 */ jal func0000bd10 -/* f1687f8: a7a20028 */ sh $v0,0x28($sp) -/* f1687fc: 0c002f26 */ jal func0000bc98 -/* f168800: a7a2002a */ sh $v0,0x2a($sp) -/* f168804: 87b9002a */ lh $t9,0x2a($sp) -/* f168808: 8fa90040 */ lw $t1,0x40($sp) -/* f16880c: 87af0028 */ lh $t7,0x28($sp) -/* f168810: 87b80026 */ lh $t8,0x26($sp) -/* f168814: 00594021 */ addu $t0,$v0,$t9 -/* f168818: 01095023 */ subu $t2,$t0,$t1 -/* f16881c: 254b0002 */ addiu $t3,$t2,0x2 -/* f168820: 316c03ff */ andi $t4,$t3,0x3ff -/* f168824: 01f8c821 */ addu $t9,$t7,$t8 -/* f168828: 27280001 */ addiu $t0,$t9,0x1 -/* f16882c: 000c6880 */ sll $t5,$t4,0x2 -/* f168830: 310903ff */ andi $t1,$t0,0x3ff -/* f168834: 3c01f600 */ lui $at,0xf600 -/* f168838: 8fac002c */ lw $t4,0x2c($sp) -/* f16883c: 01a17025 */ or $t6,$t5,$at -/* f168840: 00095380 */ sll $t2,$t1,0xe -/* f168844: 01ca5825 */ or $t3,$t6,$t2 -/* f168848: 0c002f40 */ jal func0000bd00 -/* f16884c: ad8b0000 */ sw $t3,0x0($t4) -/* f168850: 0c002f44 */ jal func0000bd10 -/* f168854: a7a2002a */ sh $v0,0x2a($sp) -/* f168858: 8fad0040 */ lw $t5,0x40($sp) -/* f16885c: 87a8002a */ lh $t0,0x2a($sp) -/* f168860: 8fab002c */ lw $t3,0x2c($sp) -/* f168864: 004d7821 */ addu $t7,$v0,$t5 -/* f168868: 31f803ff */ andi $t8,$t7,0x3ff -/* f16886c: 310903ff */ andi $t1,$t0,0x3ff -/* f168870: 00097380 */ sll $t6,$t1,0xe -/* f168874: 0018c880 */ sll $t9,$t8,0x2 -/* f168878: 032e5025 */ or $t2,$t9,$t6 -/* f16887c: 02002025 */ or $a0,$s0,$zero -/* f168880: 0fc54e0e */ jal func0f153838 -/* f168884: ad6a0004 */ sw $t2,0x4($t3) -.L0f168888: -/* f168888: 8fbf001c */ lw $ra,0x1c($sp) -/* f16888c: 8fb00018 */ lw $s0,0x18($sp) -/* f168890: 27bd0048 */ addiu $sp,$sp,0x48 -/* f168894: 03e00008 */ jr $ra -/* f168898: 00000000 */ sll $zero,$zero,0x0 -); +Gfx *fadeRender(Gfx *gdl) +{ + u32 colour = g_FadeColour; + u32 inset = 0; + + if (g_Vars.stagenum == STAGE_TEST_OLD) { + inset = 61; + } + + if (g_FadeFrac >= 0) { + if (g_FadeDelay > 0) { + g_FadeDelay--; + } else { + g_FadeFrac += g_Vars.diffframe60f / g_FadeNumFrames; + + if (g_FadeFrac >= 1) { + g_FadeFrac = -1; + } + } + } + + if (g_FadeFrac < 0) { + if ((g_FadeColour & 0xff) == 0) { + return gdl; + } + } else { + colour = colourBlend(g_FadeColour, g_FadePrevColour, g_FadeFrac * 255); + } + + if ((colour & 0xff) == 0) { + return gdl; + } + + gDPPipeSync(gdl++); + gDPSetRenderMode(gdl++, 0x500000, 0x4340); + gDPSetCombine(gdl++, 0xffffff, 0xfffdf6fb); + gDPSetPrimColor(gdl++, 0, 0, colour); + + gDPFillRectangle(gdl++, + viGetLeft(), + viGetTop() + inset, + viGetLeft() + viGetWidth() + 1, + viGetTop() + viGetHeight() - inset + 2); + + return func0f153838(gdl); +} bool fadeIsActive(void) { - return fade80084058 >= 0; + return g_FadeFrac >= 0; } void fadeCancel(void) { g_FadeNumFrames = 0; - fade80084058 = -1; - g_FadePrevColor = 0; - g_FadeColor = 0; - fade80084064 = 0; + g_FadeFrac = -1; + g_FadePrevColour = 0; + g_FadeColour = 0; + g_FadeDelay = 0; } bool threatCheckCmpFollow(struct threat *threat, s32 index) @@ -1612,11 +1463,11 @@ glabel var7f1b7868 /* f169450: 0c002c74 */ jal func0000b1d0 /* f169454: 00402025 */ or $a0,$v0,$zero /* f169458: 0040a025 */ or $s4,$v0,$zero -/* f16945c: 0c002f40 */ jal func0000bd00 +/* f16945c: 0c002f40 */ jal viGetLeft /* f169460: 24520008 */ addiu $s2,$v0,0x8 /* f169464: 00028c00 */ sll $s1,$v0,0x10 /* f169468: 00116c03 */ sra $t5,$s1,0x10 -/* f16946c: 0c002f44 */ jal func0000bd10 +/* f16946c: 0c002f44 */ jal viGetTop /* f169470: 01a08825 */ or $s1,$t5,$zero /* f169474: 44822000 */ mtc1 $v0,$f4 /* f169478: 44918000 */ mtc1 $s1,$f16 @@ -1637,17 +1488,17 @@ glabel var7f1b7868 /* f1694b4: 316c0fff */ andi $t4,$t3,0xfff /* f1694b8: 000c6b00 */ sll $t5,$t4,0xc /* f1694bc: 032d7025 */ or $t6,$t9,$t5 -/* f1694c0: 0c002f22 */ jal func0000bc88 +/* f1694c0: 0c002f22 */ jal viGetWidth /* f1694c4: ae8e0000 */ sw $t6,0x0($s4) -/* f1694c8: 0c002f40 */ jal func0000bd00 +/* f1694c8: 0c002f40 */ jal viGetLeft /* f1694cc: a7a2008a */ sh $v0,0x8a($sp) /* f1694d0: 00028400 */ sll $s0,$v0,0x10 /* f1694d4: 00107c03 */ sra $t7,$s0,0x10 -/* f1694d8: 0c002f44 */ jal func0000bd10 +/* f1694d8: 0c002f44 */ jal viGetTop /* f1694dc: 01e08025 */ or $s0,$t7,$zero /* f1694e0: 00028c00 */ sll $s1,$v0,0x10 /* f1694e4: 0011c403 */ sra $t8,$s1,0x10 -/* f1694e8: 0c002f26 */ jal func0000bc98 +/* f1694e8: 0c002f26 */ jal viGetHeight /* f1694ec: 03008825 */ or $s1,$t8,$zero /* f1694f0: 87ad008a */ lh $t5,0x8a($sp) /* f1694f4: 00515021 */ addu $t2,$v0,$s1 @@ -2759,17 +2610,17 @@ glabel var7f1b7868 /* f16a524: acad0004 */ sw $t5,0x4($a1) /* f16a528: 44ccf800 */ ctc1 $t4,$31 /* f16a52c: afb200a8 */ sw $s2,0xa8($sp) -/* f16a530: 0c002f22 */ jal func0000bc88 +/* f16a530: 0c002f22 */ jal viGetWidth /* f16a534: 26520008 */ addiu $s2,$s2,0x8 -/* f16a538: 0c002f40 */ jal func0000bd00 +/* f16a538: 0c002f40 */ jal viGetLeft /* f16a53c: a7a2008a */ sh $v0,0x8a($sp) /* f16a540: 00028400 */ sll $s0,$v0,0x10 /* f16a544: 00107c03 */ sra $t7,$s0,0x10 -/* f16a548: 0c002f44 */ jal func0000bd10 +/* f16a548: 0c002f44 */ jal viGetTop /* f16a54c: 01e08025 */ or $s0,$t7,$zero /* f16a550: 00028c00 */ sll $s1,$v0,0x10 /* f16a554: 00115c03 */ sra $t3,$s1,0x10 -/* f16a558: 0c002f26 */ jal func0000bc98 +/* f16a558: 0c002f26 */ jal viGetHeight /* f16a55c: 01608825 */ or $s1,$t3,$zero /* f16a560: 87ae008a */ lh $t6,0x8a($sp) /* f16a564: 0051c821 */ addu $t9,$v0,$s1 @@ -2782,11 +2633,11 @@ glabel var7f1b7868 /* f16a580: 03016025 */ or $t4,$t8,$at /* f16a584: 000f5b80 */ sll $t3,$t7,0xe /* f16a588: 018bc825 */ or $t9,$t4,$t3 -/* f16a58c: 0c002f40 */ jal func0000bd00 +/* f16a58c: 0c002f40 */ jal viGetLeft /* f16a590: ad590000 */ sw $t9,0x0($t2) /* f16a594: 00028c00 */ sll $s1,$v0,0x10 /* f16a598: 0011c403 */ sra $t8,$s1,0x10 -/* f16a59c: 0c002f44 */ jal func0000bd10 +/* f16a59c: 0c002f44 */ jal viGetTop /* f16a5a0: 03008825 */ or $s1,$t8,$zero /* f16a5a4: 304e03ff */ andi $t6,$v0,0x3ff /* f16a5a8: 322f03ff */ andi $t7,$s1,0x3ff @@ -3300,19 +3151,19 @@ glabel var7f1b7868 /* f16acf0: 00000000 */ sll $zero,$zero,0x0 /* f16acf4: 0fc54d8a */ jal func0f153628 /* f16acf8: 02402025 */ or $a0,$s2,$zero -/* f16acfc: 0c002f40 */ jal func0000bd00 +/* f16acfc: 0c002f40 */ jal viGetLeft /* f16ad00: 00409025 */ or $s2,$v0,$zero -/* f16ad04: 0c002f44 */ jal func0000bd10 +/* f16ad04: 0c002f44 */ jal viGetTop /* f16ad08: a7a2006e */ sh $v0,0x6e($sp) -/* f16ad0c: 0c002f40 */ jal func0000bd00 +/* f16ad0c: 0c002f40 */ jal viGetLeft /* f16ad10: a7a20070 */ sh $v0,0x70($sp) -/* f16ad14: 0c002f22 */ jal func0000bc88 +/* f16ad14: 0c002f22 */ jal viGetWidth /* f16ad18: a7a20072 */ sh $v0,0x72($sp) -/* f16ad1c: 0c002f44 */ jal func0000bd10 +/* f16ad1c: 0c002f44 */ jal viGetTop /* f16ad20: a7a2008a */ sh $v0,0x8a($sp) /* f16ad24: 00028400 */ sll $s0,$v0,0x10 /* f16ad28: 00105403 */ sra $t2,$s0,0x10 -/* f16ad2c: 0c002f26 */ jal func0000bc98 +/* f16ad2c: 0c002f26 */ jal viGetHeight /* f16ad30: 01408025 */ or $s0,$t2,$zero /* f16ad34: 87ae008a */ lh $t6,0x8a($sp) /* f16ad38: 87b80072 */ lh $t8,0x72($sp) diff --git a/src/game/game_177e00.c b/src/game/game_177e00.c index 28f53ba98..f1e4c27e2 100644 --- a/src/game/game_177e00.c +++ b/src/game/game_177e00.c @@ -410,7 +410,7 @@ glabel menuhandler001785c4 /* f1786ac: 00000000 */ sll $zero,$zero,0x0 .L0f1786b0: /* f1786b0: 44c8f800 */ ctc1 $t0,$31 -/* f1786b4: 0fc01a40 */ jal func0f006900 +/* f1786b4: 0fc01a40 */ jal colourBlend /* f1786b8: 00000000 */ sll $zero,$zero,0x0 /* f1786bc: 8fa90020 */ lw $t1,0x20($sp) /* f1786c0: ad220004 */ sw $v0,0x4($t1) @@ -745,7 +745,7 @@ glabel menuhandler00178a94 /* f178b84: 00000000 */ sll $zero,$zero,0x0 .L0f178b88: /* f178b88: 44caf800 */ ctc1 $t2,$31 -/* f178b8c: 0fc01a40 */ jal func0f006900 +/* f178b8c: 0fc01a40 */ jal colourBlend /* f178b90: 00000000 */ sll $zero,$zero,0x0 /* f178b94: 8fab0020 */ lw $t3,0x20($sp) /* f178b98: ad620004 */ sw $v0,0x4($t3) diff --git a/src/game/game_17f930.c b/src/game/game_17f930.c index 1a3eba6aa..0a6db41df 100644 --- a/src/game/game_17f930.c +++ b/src/game/game_17f930.c @@ -887,9 +887,9 @@ glabel scenarioHtbCallback18 /* f1807ac: 00808025 */ or $s0,$a0,$zero /* f1807b0: 50400067 */ beqzl $v0,.L0f180950 /* f1807b4: 8fbf003c */ lw $ra,0x3c($sp) -/* f1807b8: 0c002f40 */ jal func0000bd00 +/* f1807b8: 0c002f40 */ jal viGetLeft /* f1807bc: 00000000 */ sll $zero,$zero,0x0 -/* f1807c0: 0c002f22 */ jal func0000bc88 +/* f1807c0: 0c002f22 */ jal viGetWidth /* f1807c4: a7a2004a */ sh $v0,0x4a($sp) /* f1807c8: 87af004a */ lh $t7,0x4a($sp) /* f1807cc: 04410003 */ bgez $v0,.L0f1807dc @@ -898,7 +898,7 @@ glabel scenarioHtbCallback18 /* f1807d8: 00017043 */ sra $t6,$at,0x1 .L0f1807dc: /* f1807dc: 01cf2821 */ addu $a1,$t6,$t7 -/* f1807e0: 0c002f44 */ jal func0000bd10 +/* f1807e0: 0c002f44 */ jal viGetTop /* f1807e4: afa50090 */ sw $a1,0x90($sp) /* f1807e8: 3c19800a */ lui $t9,%hi(g_Vars+0x288) /* f1807ec: 8f39a248 */ lw $t9,%lo(g_Vars+0x288)($t9) @@ -2605,9 +2605,9 @@ glabel scenarioKohCallback18 /* f1826ac: 84790008 */ lh $t9,0x8($v1) /* f1826b0: 57200091 */ bnezl $t9,.L0f1828f8 /* f1826b4: 8fbf003c */ lw $ra,0x3c($sp) -/* f1826b8: 0c002f40 */ jal func0000bd00 +/* f1826b8: 0c002f40 */ jal viGetLeft /* f1826bc: 00000000 */ sll $zero,$zero,0x0 -/* f1826c0: 0c002f22 */ jal func0000bc88 +/* f1826c0: 0c002f22 */ jal viGetWidth /* f1826c4: a7a2004e */ sh $v0,0x4e($sp) /* f1826c8: 87aa004e */ lh $t2,0x4e($sp) /* f1826cc: 04410003 */ bgez $v0,.L0f1826dc @@ -2616,7 +2616,7 @@ glabel scenarioKohCallback18 /* f1826d8: 00014843 */ sra $t1,$at,0x1 .L0f1826dc: /* f1826dc: 012a2821 */ addu $a1,$t1,$t2 -/* f1826e0: 0c002f44 */ jal func0000bd10 +/* f1826e0: 0c002f44 */ jal viGetTop /* f1826e4: afa50098 */ sw $a1,0x98($sp) /* f1826e8: 3c04800a */ lui $a0,%hi(g_Vars+0x484) /* f1826ec: 8c84a444 */ lw $a0,%lo(g_Vars+0x484)($a0) @@ -3770,18 +3770,18 @@ glabel scenarioHtmCallback18 /* f1839ec: 8529c1e0 */ lh $t1,%lo(g_ScenarioData+0xd0)($t1) /* f1839f0: 5449006b */ bnel $v0,$t1,.L0f183ba0 /* f1839f4: 8fbf001c */ lw $ra,0x1c($sp) -/* f1839f8: 0c002f40 */ jal func0000bd00 +/* f1839f8: 0c002f40 */ jal viGetLeft /* f1839fc: 00000000 */ sll $zero,$zero,0x0 -/* f183a00: 0c002f40 */ jal func0000bd00 +/* f183a00: 0c002f40 */ jal viGetLeft /* f183a04: afa2005c */ sw $v0,0x5c($sp) /* f183a08: 00028c00 */ sll $s1,$v0,0x10 /* f183a0c: 00115403 */ sra $t2,$s1,0x10 -/* f183a10: 0c002f22 */ jal func0000bc88 +/* f183a10: 0c002f22 */ jal viGetWidth /* f183a14: 01408825 */ or $s1,$t2,$zero /* f183a18: 00515821 */ addu $t3,$v0,$s1 -/* f183a1c: 0c002f44 */ jal func0000bd10 +/* f183a1c: 0c002f44 */ jal viGetTop /* f183a20: afab0058 */ sw $t3,0x58($sp) -/* f183a24: 0c002f22 */ jal func0000bc88 +/* f183a24: 0c002f22 */ jal viGetWidth /* f183a28: afa20054 */ sw $v0,0x54($sp) /* f183a2c: 8fac005c */ lw $t4,0x5c($sp) /* f183a30: 8fad0058 */ lw $t5,0x58($sp) @@ -4890,9 +4890,9 @@ glabel scenarioPacCallback18 /* f184a64: 958cc112 */ lhu $t4,%lo(g_ScenarioData+0x2)($t4) /* f184a68: 240d3840 */ addiu $t5,$zero,0x3840 /* f184a6c: 01ac1823 */ subu $v1,$t5,$t4 -/* f184a70: 0c002f40 */ jal func0000bd00 +/* f184a70: 0c002f40 */ jal viGetLeft /* f184a74: afa300a0 */ sw $v1,0xa0($sp) -/* f184a78: 0c002f22 */ jal func0000bc88 +/* f184a78: 0c002f22 */ jal viGetWidth /* f184a7c: a7a20046 */ sh $v0,0x46($sp) /* f184a80: 87b80046 */ lh $t8,0x46($sp) /* f184a84: 8fa300a0 */ lw $v1,0xa0($sp) @@ -4902,7 +4902,7 @@ glabel scenarioPacCallback18 /* f184a94: 00017843 */ sra $t7,$at,0x1 .L0f184a98: /* f184a98: 01f82821 */ addu $a1,$t7,$t8 -/* f184a9c: 0c002f44 */ jal func0000bd10 +/* f184a9c: 0c002f44 */ jal viGetTop /* f184aa0: afa5008c */ sw $a1,0x8c($sp) /* f184aa4: 8fa300a0 */ lw $v1,0xa0($sp) /* f184aa8: 2446000a */ addiu $a2,$v0,0xa @@ -5835,15 +5835,15 @@ glabel func0f185774 /* f185a30: ac6e0000 */ sw $t6,0x0($v1) /* f185a34: 24650008 */ addiu $a1,$v1,0x8 /* f185a38: ac640004 */ sw $a0,0x4($v1) -/* f185a3c: 0c002f40 */ jal func0000bd00 +/* f185a3c: 0c002f40 */ jal viGetLeft /* f185a40: afa50030 */ sw $a1,0x30($sp) -/* f185a44: 0c002f22 */ jal func0000bc88 +/* f185a44: 0c002f22 */ jal viGetWidth /* f185a48: afa2002c */ sw $v0,0x2c($sp) /* f185a4c: 8fa6002c */ lw $a2,0x2c($sp) /* f185a50: 00463821 */ addu $a3,$v0,$a2 -/* f185a54: 0c002f44 */ jal func0000bd10 +/* f185a54: 0c002f44 */ jal viGetTop /* f185a58: afa70028 */ sw $a3,0x28($sp) -/* f185a5c: 0c002f26 */ jal func0000bc98 +/* f185a5c: 0c002f26 */ jal viGetHeight /* f185a60: afa20024 */ sw $v0,0x24($sp) /* f185a64: 8faf0018 */ lw $t7,0x18($sp) /* f185a68: 3c09800a */ lui $t1,%hi(g_Vars) diff --git a/src/game/game_18e5a0.c b/src/game/game_18e5a0.c index 97c843aef..12efc47eb 100644 --- a/src/game/game_18e5a0.c +++ b/src/game/game_18e5a0.c @@ -1368,11 +1368,11 @@ glabel func0f18f874 /* f18fa00: 3c018008 */ lui $at,%hi(var8007fac0) /* f18fa04: ac22fac0 */ sw $v0,%lo(var8007fac0)($at) .L0f18fa08: -/* f18fa08: 0c002f40 */ jal func0000bd00 +/* f18fa08: 0c002f40 */ jal viGetLeft /* f18fa0c: afa6003c */ sw $a2,0x3c($sp) /* f18fa10: 00028400 */ sll $s0,$v0,0x10 /* f18fa14: 00105c03 */ sra $t3,$s0,0x10 -/* f18fa18: 0c002f22 */ jal func0000bc88 +/* f18fa18: 0c002f22 */ jal viGetWidth /* f18fa1c: 01608025 */ or $s0,$t3,$zero /* f18fa20: 3c0d8008 */ lui $t5,%hi(var8007fac0) /* f18fa24: 8dadfac0 */ lw $t5,%lo(var8007fac0)($t5) @@ -1445,7 +1445,7 @@ glabel func0f18f874 /* f18fb14: 25aefff9 */ addiu $t6,$t5,-7 /* f18fb18: ae2e0000 */ sw $t6,0x0($s1) .L0f18fb1c: -/* f18fb1c: 0c002f44 */ jal func0000bd10 +/* f18fb1c: 0c002f44 */ jal viGetTop /* f18fb20: 00000000 */ sll $zero,$zero,0x0 /* f18fb24: 8faf003c */ lw $t7,0x3c($sp) /* f18fb28: 3c10800b */ lui $s0,%hi(var800acc74) diff --git a/src/game/game_19c990.c b/src/game/game_19c990.c index 35c432f16..22378c2ad 100644 --- a/src/game/game_19c990.c +++ b/src/game/game_19c990.c @@ -5763,7 +5763,7 @@ glabel var7f1b97cc /* f1a2f64: afbf0024 */ sw $ra,0x24($sp) /* f1a2f68: 240e00a0 */ addiu $t6,$zero,0xa0 /* f1a2f6c: afa40158 */ sw $a0,0x158($sp) -/* f1a2f70: 0c002f22 */ jal func0000bc88 +/* f1a2f70: 0c002f22 */ jal viGetWidth /* f1a2f74: afae004c */ sw $t6,0x4c($sp) /* f1a2f78: 28410191 */ slti $at,$v0,0x191 /* f1a2f7c: 14200005 */ bnez $at,.L0f1a2f94 @@ -5812,9 +5812,9 @@ glabel var7f1b97cc /* f1a3018: afa20054 */ sw $v0,0x54($sp) /* f1a301c: 0fc68ab4 */ jal frGetHudMiddleSubtext /* f1a3020: 27a40058 */ addiu $a0,$sp,0x58 -/* f1a3024: 0c002f22 */ jal func0000bc88 +/* f1a3024: 0c002f22 */ jal viGetWidth /* f1a3028: afa20050 */ sw $v0,0x50($sp) -/* f1a302c: 0c002f44 */ jal func0000bd10 +/* f1a302c: 0c002f44 */ jal viGetTop /* f1a3030: a7a2003c */ sh $v0,0x3c($sp) /* f1a3034: 8fad0050 */ lw $t5,0x50($sp) /* f1a3038: 00021c00 */ sll $v1,$v0,0x10 @@ -5852,9 +5852,9 @@ glabel var7f1b97cc /* f1a30a8: 27a400d8 */ addiu $a0,$sp,0xd8 /* f1a30ac: 0fc68a09 */ jal frGetGoalScoreText /* f1a30b0: 27a40058 */ addiu $a0,$sp,0x58 -/* f1a30b4: 0c002f40 */ jal func0000bd00 +/* f1a30b4: 0c002f40 */ jal viGetLeft /* f1a30b8: 00000000 */ sll $zero,$zero,0x0 -/* f1a30bc: 0c002f44 */ jal func0000bd10 +/* f1a30bc: 0c002f44 */ jal viGetTop /* f1a30c0: a7a2003c */ sh $v0,0x3c($sp) /* f1a30c4: 87b8003c */ lh $t8,0x3c($sp) /* f1a30c8: 3c014282 */ lui $at,0x4282 @@ -5885,9 +5885,9 @@ glabel var7f1b97cc /* f1a312c: 27a50058 */ addiu $a1,$sp,0x58 /* f1a3130: 10400019 */ beqz $v0,.L0f1a3198 /* f1a3134: 00000000 */ sll $zero,$zero,0x0 -/* f1a3138: 0c002f40 */ jal func0000bd00 +/* f1a3138: 0c002f40 */ jal viGetLeft /* f1a313c: 00000000 */ sll $zero,$zero,0x0 -/* f1a3140: 0c002f44 */ jal func0000bd10 +/* f1a3140: 0c002f44 */ jal viGetTop /* f1a3144: a7a2003c */ sh $v0,0x3c($sp) /* f1a3148: 87ad003c */ lh $t5,0x3c($sp) /* f1a314c: c7aa002c */ lwc1 $f10,0x2c($sp) @@ -5920,11 +5920,11 @@ glabel var7f1b97cc /* f1a31b4: 44050000 */ mfc1 $a1,$f0 /* f1a31b8: 0fc68a4f */ jal frGetMinAccuracy /* f1a31bc: 27a40058 */ addiu $a0,$sp,0x58 -/* f1a31c0: 0c002f40 */ jal func0000bd00 +/* f1a31c0: 0c002f40 */ jal viGetLeft /* f1a31c4: afa20054 */ sw $v0,0x54($sp) -/* f1a31c8: 0c002f22 */ jal func0000bc88 +/* f1a31c8: 0c002f22 */ jal viGetWidth /* f1a31cc: a7a20036 */ sh $v0,0x36($sp) -/* f1a31d0: 0c002f44 */ jal func0000bd10 +/* f1a31d0: 0c002f44 */ jal viGetTop /* f1a31d4: a7a2003c */ sh $v0,0x3c($sp) /* f1a31d8: 8fac0054 */ lw $t4,0x54($sp) /* f1a31dc: 00021c00 */ sll $v1,$v0,0x10 @@ -5982,11 +5982,11 @@ glabel var7f1b97cc /* f1a32a0: c42697cc */ lwc1 $f6,%lo(var7f1b97cc)($at) /* f1a32a4: e7a60048 */ swc1 $f6,0x48($sp) .L0f1a32a8: -/* f1a32a8: 0c002f40 */ jal func0000bd00 +/* f1a32a8: 0c002f40 */ jal viGetLeft /* f1a32ac: 00000000 */ sll $zero,$zero,0x0 -/* f1a32b0: 0c002f22 */ jal func0000bc88 +/* f1a32b0: 0c002f22 */ jal viGetWidth /* f1a32b4: a7a20036 */ sh $v0,0x36($sp) -/* f1a32b8: 0c002f44 */ jal func0000bd10 +/* f1a32b8: 0c002f44 */ jal viGetTop /* f1a32bc: a7a2003c */ sh $v0,0x3c($sp) /* f1a32c0: 87ac003c */ lh $t4,0x3c($sp) /* f1a32c4: 87ad0036 */ lh $t5,0x36($sp) diff --git a/src/game/mplayer.c b/src/game/mplayer.c index bec080777..3749cf438 100644 --- a/src/game/mplayer.c +++ b/src/game/mplayer.c @@ -2318,9 +2318,9 @@ glabel func0f18973c /* f1897b8: 27a4005c */ addiu $a0,$sp,0x5c /* f1897bc: 0c004c4c */ jal strcpy /* f1897c0: 00402825 */ or $a1,$v0,$zero -/* f1897c4: 0c002f40 */ jal func0000bd00 +/* f1897c4: 0c002f40 */ jal viGetLeft /* f1897c8: 00000000 */ sll $zero,$zero,0x0 -/* f1897cc: 0c002f22 */ jal func0000bc88 +/* f1897cc: 0c002f22 */ jal viGetWidth /* f1897d0: a7a20042 */ sh $v0,0x42($sp) /* f1897d4: 87a80042 */ lh $t0,0x42($sp) /* f1897d8: 3c0a800a */ lui $t2,%hi(g_Vars+0x288) @@ -2345,15 +2345,15 @@ glabel func0f18973c /* f189820: 8dade4f8 */ lw $t5,%lo(g_MenuStack+0x4f8)($t5) /* f189824: 11a00006 */ beqz $t5,.L0f189840 /* f189828: 00000000 */ sll $zero,$zero,0x0 -/* f18982c: 0c002f44 */ jal func0000bd10 +/* f18982c: 0c002f44 */ jal viGetTop /* f189830: 00000000 */ sll $zero,$zero,0x0 /* f189834: 244e000a */ addiu $t6,$v0,0xa /* f189838: 1000000c */ beqz $zero,.L0f18986c /* f18983c: afae0090 */ sw $t6,0x90($sp) .L0f189840: -/* f189840: 0c002f44 */ jal func0000bd10 +/* f189840: 0c002f44 */ jal viGetTop /* f189844: 00000000 */ sll $zero,$zero,0x0 -/* f189848: 0c002f26 */ jal func0000bc98 +/* f189848: 0c002f26 */ jal viGetHeight /* f18984c: a7a20042 */ sh $v0,0x42($sp) /* f189850: 87b80042 */ lh $t8,0x42($sp) /* f189854: 04410003 */ bgez $v0,.L0f189864 @@ -2475,9 +2475,9 @@ glabel func0f18973c /* f189a08: 27a4005c */ addiu $a0,$sp,0x5c /* f189a0c: 0c004c4c */ jal strcpy /* f189a10: 00402825 */ or $a1,$v0,$zero -/* f189a14: 0c002f40 */ jal func0000bd00 +/* f189a14: 0c002f40 */ jal viGetLeft /* f189a18: 00000000 */ sll $zero,$zero,0x0 -/* f189a1c: 0c002f22 */ jal func0000bc88 +/* f189a1c: 0c002f22 */ jal viGetWidth /* f189a20: a7a20042 */ sh $v0,0x42($sp) /* f189a24: 87b80042 */ lh $t8,0x42($sp) /* f189a28: 04410003 */ bgez $v0,.L0f189a38 @@ -2486,9 +2486,9 @@ glabel func0f18973c /* f189a34: 00017843 */ sra $t7,$at,0x1 .L0f189a38: /* f189a38: 01f8c821 */ addu $t9,$t7,$t8 -/* f189a3c: 0c002f44 */ jal func0000bd10 +/* f189a3c: 0c002f44 */ jal viGetTop /* f189a40: afb90094 */ sw $t9,0x94($sp) -/* f189a44: 0c002f26 */ jal func0000bc98 +/* f189a44: 0c002f26 */ jal viGetHeight /* f189a48: a7a20042 */ sh $v0,0x42($sp) /* f189a4c: 87aa0042 */ lh $t2,0x42($sp) /* f189a50: 3c0b8008 */ lui $t3,%hi(var8007fb0c) @@ -2547,9 +2547,9 @@ glabel func0f18973c /* f189b1c: 8d6d1c0c */ lw $t5,0x1c0c($t3) /* f189b20: 19a00051 */ blez $t5,.L0f189c68 /* f189b24: 00000000 */ sll $zero,$zero,0x0 -/* f189b28: 0c002f44 */ jal func0000bd10 +/* f189b28: 0c002f44 */ jal viGetTop /* f189b2c: 00000000 */ sll $zero,$zero,0x0 -/* f189b30: 0c002f26 */ jal func0000bc98 +/* f189b30: 0c002f26 */ jal viGetHeight /* f189b34: a7a20042 */ sh $v0,0x42($sp) /* f189b38: 87ae0042 */ lh $t6,0x42($sp) /* f189b3c: 8fb80098 */ lw $t8,0x98($sp) @@ -2561,9 +2561,9 @@ glabel func0f18973c /* f189b50: 018e7821 */ addu $t7,$t4,$t6 /* f189b54: 01f8c821 */ addu $t9,$t7,$t8 /* f189b58: 27280002 */ addiu $t0,$t9,0x2 -/* f189b5c: 0c002f40 */ jal func0000bd00 +/* f189b5c: 0c002f40 */ jal viGetLeft /* f189b60: afa8004c */ sw $t0,0x4c($sp) -/* f189b64: 0c002f22 */ jal func0000bc88 +/* f189b64: 0c002f22 */ jal viGetWidth /* f189b68: a7a20042 */ sh $v0,0x42($sp) /* f189b6c: 87a90042 */ lh $t1,0x42($sp) /* f189b70: 3c0d800a */ lui $t5,%hi(g_Vars+0x284) diff --git a/src/game/propobj.c b/src/game/propobj.c index 65113da3b..01e1cf637 100644 --- a/src/game/propobj.c +++ b/src/game/propobj.c @@ -47312,16 +47312,16 @@ glabel var7f1ab1a8 /* f0908d0: afa40060 */ sw $a0,0x60($sp) /* f0908d4: 3c018007 */ lui $at,0x8007 /* f0908d8: c424990c */ lwc1 $f4,-0x66f4($at) -/* f0908dc: 0c002f40 */ jal func0000bd00 +/* f0908dc: 0c002f40 */ jal viGetLeft /* f0908e0: e7a4004c */ swc1 $f4,0x4c($sp) -/* f0908e4: 0c002f22 */ jal func0000bc88 +/* f0908e4: 0c002f22 */ jal viGetWidth /* f0908e8: a7a20036 */ sh $v0,0x36($sp) /* f0908ec: 87b80036 */ lh $t8,0x36($sp) /* f0908f0: 00027843 */ sra $t7,$v0,0x1 /* f0908f4: 01f8c821 */ addu $t9,$t7,$t8 -/* f0908f8: 0c002f44 */ jal func0000bd10 +/* f0908f8: 0c002f44 */ jal viGetTop /* f0908fc: afb90044 */ sw $t9,0x44($sp) -/* f090900: 0c002f26 */ jal func0000bc98 +/* f090900: 0c002f26 */ jal viGetHeight /* f090904: a7a20036 */ sh $v0,0x36($sp) /* f090908: 87a90036 */ lh $t1,0x36($sp) /* f09090c: 3c06800a */ lui $a2,%hi(g_Vars) diff --git a/src/game/title.c b/src/game/title.c index e409a2a9c..bdb5105c4 100644 --- a/src/game/title.c +++ b/src/game/title.c @@ -3452,8 +3452,8 @@ Gfx *titleRenderRarePresents(Gfx *gdl) gdl = func0f01afc0(gdl); gdl = func0f153628(gdl); - sp84 = func0000bd00() + 50; - sp80 = func0000bd10() + func0000bc98() - 80; + sp84 = viGetLeft() + 50; + sp80 = viGetTop() + viGetHeight() - 80; var80062868 = 0; @@ -3461,8 +3461,8 @@ Gfx *titleRenderRarePresents(Gfx *gdl) gdl = func0f018ebc(gdl, &sp84, &sp80, L_OPTIONS(5), g_TitleTimer, &sp76); // "earth:" if (g_TitleTimer > 70) { - sp84 = func0000bd00() + 50; - sp80 = func0000bd10() + func0000bc98() - 60; + sp84 = viGetLeft() + 50; + sp80 = viGetTop() + viGetHeight() - 60; gdl = func0f018ebc(gdl, &sp84, &sp80, L_OPTIONS(6), g_TitleTimer - 100, &sp76); // " prehistory" } } else { @@ -3494,9 +3494,9 @@ Gfx *titleRenderRarePresents(Gfx *gdl) f32 tmp2 = ((g_TitleTimer - 222.0f) / 78.0f); u32 stack; - gdl = func0f153a34(gdl, func0000bd00(), func0000bd10(), - func0000bd00() + func0000bc88(), - func0000bd10() + func0000bc98(), + gdl = func0f153a34(gdl, viGetLeft(), viGetTop(), + viGetLeft() + viGetWidth(), + viGetTop() + viGetHeight(), 255.0f * tmp2); } diff --git a/src/include/game/data/data_020df0.h b/src/include/game/data/data_020df0.h index faec58aef..f8a044063 100644 --- a/src/include/game/data/data_020df0.h +++ b/src/include/game/data/data_020df0.h @@ -25,10 +25,10 @@ extern struct menu_dialog menudialog_mpquickteam; extern s32 g_Difficulty; extern s16 g_FadeNumFrames; -extern f32 fade80084058; -extern u32 g_FadePrevColor; -extern u32 g_FadeColor; -extern u16 fade80084064; +extern f32 g_FadeFrac; +extern u32 g_FadePrevColour; +extern u32 g_FadeColour; +extern s16 g_FadeDelay; extern s32 var80087260; extern struct stagethinglist stagethinglist_20e10; diff --git a/src/include/game/game_005fd0.h b/src/include/game/game_005fd0.h index fed27225a..1aa65c8f8 100644 --- a/src/include/game/game_005fd0.h +++ b/src/include/game/game_005fd0.h @@ -7,7 +7,7 @@ bool func0f005fd0(s32 arg0); s32 chrChooseFootstepSound(struct chrdata *chr, u32 arg1); void func0f0061dc(struct chrdata *chr); void func0f006520(struct chrdata *chr); -u32 func0f006900(void); +s32 colourBlend(u32 colour, u32 prevcolour, u32 arg2); u32 func0f0069dc(void); u32 func0f006b08(void); u32 func0f006b54(void); diff --git a/src/include/game/game_1531a0.h b/src/include/game/game_1531a0.h index cebcdf957..1d3374c6b 100644 --- a/src/include/game/game_1531a0.h +++ b/src/include/game/game_1531a0.h @@ -11,7 +11,7 @@ void func0f1532ec(void); Gfx *func0f153628(Gfx *gdl); Gfx *func0f153780(Gfx *gdl); Gfx *func0f1537dc(Gfx *gdl, u32 colour); -u32 func0f153838(void); +Gfx *func0f153838(Gfx *gdl); u32 func0f153858(void); u32 func0f1538e4(void); u32 func0f153990(void); diff --git a/src/include/lib/lib_09660.h b/src/include/lib/lib_09660.h index f4e3887f9..2b443cb2c 100644 --- a/src/include/lib/lib_09660.h +++ b/src/include/lib/lib_09660.h @@ -42,11 +42,11 @@ void func0000bbe4(s16 arg0, s16 arg1); s16 func0000bc08(void); s16 func0000bc18(void); void func0000bc28(s16 arg0, s16 arg1); -s16 func0000bc88(void); -s16 func0000bc98(void); +s16 viGetWidth(void); +s16 viGetHeight(void); void func0000bca8(s16 arg0, s16 arg1); -s16 func0000bd00(void); -s16 func0000bd10(void); +s16 viGetLeft(void); +s16 viGetTop(void); void func0000bd20(bool arg0); void func0000bd30(f32 fovy); void func0000bd7c(f32 arg0); diff --git a/src/lib/lib_09660.c b/src/lib/lib_09660.c index c85c8194c..3db7d69b3 100644 --- a/src/lib/lib_09660.c +++ b/src/lib/lib_09660.c @@ -2216,7 +2216,7 @@ glabel func0000b330 /* b490: 55c0004e */ bnezl $t6,.L0000b5cc /* b494: 8d6d0290 */ lw $t5,0x290($t3) .L0000b498: -/* b498: 0c002f44 */ jal func0000bd10 +/* b498: 0c002f44 */ jal viGetTop /* b49c: afa600a8 */ sw $a2,0xa8($sp) /* b4a0: 1840001a */ blez $v0,.L0000b50c /* b4a4: 8fa600a8 */ lw $a2,0xa8($sp) @@ -2224,7 +2224,7 @@ glabel func0000b330 /* b4ac: 24c60008 */ addiu $a2,$a2,0x8 /* b4b0: 0c002f02 */ jal func0000bc08 /* b4b4: afa600a8 */ sw $a2,0xa8($sp) -/* b4b8: 0c002f44 */ jal func0000bd10 +/* b4b8: 0c002f44 */ jal viGetTop /* b4bc: a7a20056 */ sh $v0,0x56($sp) /* b4c0: 87ae0056 */ lh $t6,0x56($sp) /* b4c4: 244fffff */ addiu $t7,$v0,-1 @@ -2246,9 +2246,9 @@ glabel func0000b330 /* b504: ac600004 */ sw $zero,0x4($v1) /* b508: 24c60008 */ addiu $a2,$a2,0x8 .L0000b50c: -/* b50c: 0c002f26 */ jal func0000bc98 +/* b50c: 0c002f26 */ jal viGetHeight /* b510: afa600a8 */ sw $a2,0xa8($sp) -/* b514: 0c002f44 */ jal func0000bd10 +/* b514: 0c002f44 */ jal viGetTop /* b518: a7a20042 */ sh $v0,0x42($sp) /* b51c: 0c002f06 */ jal func0000bc18 /* b520: a7a20056 */ sh $v0,0x56($sp) @@ -2276,9 +2276,9 @@ glabel func0000b330 /* b578: 8fae0090 */ lw $t6,0x90($sp) /* b57c: 000fc380 */ sll $t8,$t7,0xe /* b580: 01b8c825 */ or $t9,$t5,$t8 -/* b584: 0c002f44 */ jal func0000bd10 +/* b584: 0c002f44 */ jal viGetTop /* b588: add90000 */ sw $t9,0x0($t6) -/* b58c: 0c002f26 */ jal func0000bc98 +/* b58c: 0c002f26 */ jal viGetHeight /* b590: a7a20056 */ sh $v0,0x56($sp) /* b594: 87af0056 */ lh $t7,0x56($sp) /* b598: 8fa600a8 */ lw $a2,0xa8($sp) @@ -2798,7 +2798,7 @@ glabel func0000bc28 ); GLOBAL_ASM( -glabel func0000bc88 +glabel viGetWidth /* bc88: 3c0e8006 */ lui $t6,%hi(var8005d594) /* bc8c: 8dced594 */ lw $t6,%lo(var8005d594)($t6) /* bc90: 03e00008 */ jr $ra @@ -2806,7 +2806,7 @@ glabel func0000bc88 ); GLOBAL_ASM( -glabel func0000bc98 +glabel viGetHeight /* bc98: 3c0e8006 */ lui $t6,%hi(var8005d594) /* bc9c: 8dced594 */ lw $t6,%lo(var8005d594)($t6) /* bca0: 03e00008 */ jr $ra @@ -2840,7 +2840,7 @@ glabel func0000bca8 ); GLOBAL_ASM( -glabel func0000bd00 +glabel viGetLeft /* bd00: 3c0e8006 */ lui $t6,%hi(var8005d594) /* bd04: 8dced594 */ lw $t6,%lo(var8005d594)($t6) /* bd08: 03e00008 */ jr $ra @@ -2848,7 +2848,7 @@ glabel func0000bd00 ); GLOBAL_ASM( -glabel func0000bd10 +glabel viGetTop /* bd10: 3c0e8006 */ lui $t6,%hi(var8005d594) /* bd14: 8dced594 */ lw $t6,%lo(var8005d594)($t6) /* bd18: 03e00008 */ jr $ra