diff --git a/src/game/activemenu/activemenu.c b/src/game/activemenu/activemenu.c index c0a69234b..8eec64aa3 100644 --- a/src/game/activemenu/activemenu.c +++ b/src/game/activemenu/activemenu.c @@ -852,7 +852,7 @@ glabel amIsCramped /* f0ffe3c: 10000031 */ b .JF0f0fff04 /* f0ffe40: 24020001 */ li $v0,0x1 .JF0f0ffe44: -/* f0ffe44: 0fc54978 */ jal 0xf1525e0 +/* f0ffe44: 0fc54978 */ jal optionsGetScreenSplit /* f0ffe48: 00000000 */ nop /* f0ffe4c: 3c06800a */ lui $a2,0x800a /* f0ffe50: 240b0001 */ li $t3,0x1 @@ -1331,7 +1331,7 @@ glabel var7f1acfe0nb /* f1004cc: 01856821 */ addu $t5,$t4,$a1 /* f1004d0: 55a10009 */ bnel $t5,$at,.JF0f1004f8 /* f1004d4: 8d26006c */ lw $a2,0x6c($t1) -/* f1004d8: 0fc548e8 */ jal 0xf1523a0 +/* f1004d8: 0fc548e8 */ jal optionsGetEffectiveScreenSize /* f1004dc: 00000000 */ nop /* f1004e0: 3c09800a */ lui $t1,0x800a /* f1004e4: 10400003 */ beqz $v0,.JF0f1004f4 @@ -1372,7 +1372,7 @@ glabel var7f1acfe0nb /* f100550: 0305c821 */ addu $t9,$t8,$a1 /* f100554: 17210010 */ bne $t9,$at,.JF0f100598 /* f100558: 00000000 */ nop -/* f10055c: 0fc54978 */ jal 0xf1525e0 +/* f10055c: 0fc54978 */ jal optionsGetScreenSplit /* f100560: 00000000 */ nop /* f100564: 3c09800a */ lui $t1,0x800a /* f100568: 24010001 */ li $at,0x1 @@ -1464,12 +1464,12 @@ glabel var7f1acfe0nb /* f10069c: 14200005 */ bnez $at,.JF0f1006b4 /* f1006a0: 00000000 */ nop .JF0f1006a4: -/* f1006a4: 0fc5baa5 */ jal 0xf16ea94 +/* f1006a4: 0fc5baa5 */ jal langGet /* f1006a8: 24045870 */ li $a0,0x5870 /* f1006ac: 10000003 */ b .JF0f1006bc /* f1006b0: 00000000 */ nop .JF0f1006b4: -/* f1006b4: 0fc28c4e */ jal 0xf0a3138 +/* f1006b4: 0fc28c4e */ jal bgunGetShortName /* f1006b8: 00000000 */ nop .JF0f1006bc: /* f1006bc: 3c19800a */ lui $t9,0x800a @@ -1480,11 +1480,11 @@ glabel var7f1acfe0nb /* f1006d0: 27a5008c */ addiu $a1,$sp,0x8c /* f1006d4: 8fa6007c */ lw $a2,0x7c($sp) /* f1006d8: afa00014 */ sw $zero,0x14($sp) -/* f1006dc: 0fc55d49 */ jal 0xf157524 +/* f1006dc: 0fc55d49 */ jal textMeasure /* f1006e0: afb90010 */ sw $t9,0x10($sp) -/* f1006e4: 0c002f29 */ jal 0xbca4 +/* f1006e4: 0c002f29 */ jal viGetViewLeft /* f1006e8: 00000000 */ nop -/* f1006ec: 0c002f0b */ jal 0xbc2c +/* f1006ec: 0c002f0b */ jal viGetViewWidth /* f1006f0: a7a2004e */ sh $v0,0x4e($sp) /* f1006f4: 3c038008 */ lui $v1,0x8008 /* f1006f8: 8c6300f4 */ lw $v1,0xf4($v1) @@ -1570,13 +1570,13 @@ glabel var7f1acfe0nb /* f100814: 29e10002 */ slti $at,$t7,0x2 /* f100818: 14200006 */ bnez $at,.JF0f100834 /* f10081c: 00000000 */ nop -/* f100820: 0c002f2d */ jal 0xbcb4 +/* f100820: 0c002f2d */ jal viGetViewTop /* f100824: 00000000 */ nop /* f100828: 24590005 */ addiu $t9,$v0,0x5 /* f10082c: 10000005 */ b .JF0f100844 /* f100830: afb90090 */ sw $t9,0x90($sp) .JF0f100834: -/* f100834: 0c002f2d */ jal 0xbcb4 +/* f100834: 0c002f2d */ jal viGetViewTop /* f100838: 00000000 */ nop /* f10083c: 244b000a */ addiu $t3,$v0,0xa /* f100840: afab0090 */ sw $t3,0x90($sp) @@ -1584,7 +1584,7 @@ glabel var7f1acfe0nb /* f100844: 8fb80074 */ lw $t8,0x74($sp) /* f100848: 13000014 */ beqz $t8,.JF0f10089c /* f10084c: 00000000 */ nop -/* f100850: 0c002f29 */ jal 0xbca4 +/* f100850: 0c002f29 */ jal viGetViewLeft /* f100854: 00000000 */ nop /* f100858: 3c0c8008 */ lui $t4,0x8008 /* f10085c: 8d8c00f4 */ lw $t4,0xf4($t4) @@ -1624,7 +1624,7 @@ glabel var7f1acfe0nb /* f1008dc: afa00028 */ sw $zero,0x28($sp) /* f1008e0: afa0002c */ sw $zero,0x2c($sp) /* f1008e4: afb90014 */ sw $t9,0x14($sp) -/* f1008e8: 0fc55d34 */ jal 0xf1574d0 +/* f1008e8: 0fc55d34 */ jal func0f1574d0jf /* f1008ec: afaf0010 */ sw $t7,0x10($sp) /* f1008f0: 3c09800a */ lui $t1,0x800a /* f1008f4: 2529a630 */ addiu $t1,$t1,-22992 @@ -1683,7 +1683,7 @@ glabel var7f1acfe0nb /* f1009b0: 10000090 */ b .JF0f100bf4 /* f1009b4: adcc1c04 */ sw $t4,0x1c04($t6) .JF0f1009b8: -/* f1009b8: 0fc5baa5 */ jal 0xf16ea94 +/* f1009b8: 0fc5baa5 */ jal langGet /* f1009bc: 2404589a */ li $a0,0x589a /* f1009c0: 3c0d800a */ lui $t5,0x800a /* f1009c4: 8dad28b4 */ lw $t5,0x28b4($t5) @@ -1694,11 +1694,11 @@ glabel var7f1acfe0nb /* f1009d8: 27a5008c */ addiu $a1,$sp,0x8c /* f1009dc: 00403025 */ move $a2,$v0 /* f1009e0: afa00014 */ sw $zero,0x14($sp) -/* f1009e4: 0fc55d49 */ jal 0xf157524 +/* f1009e4: 0fc55d49 */ jal textMeasure /* f1009e8: afad0010 */ sw $t5,0x10($sp) -/* f1009ec: 0c002f29 */ jal 0xbca4 +/* f1009ec: 0c002f29 */ jal viGetViewLeft /* f1009f0: 00000000 */ nop -/* f1009f4: 0c002f0b */ jal 0xbc2c +/* f1009f4: 0c002f0b */ jal viGetViewWidth /* f1009f8: a7a2004e */ sh $v0,0x4e($sp) /* f1009fc: 3c038008 */ lui $v1,0x8008 /* f100a00: 8c6300f4 */ lw $v1,0xf4($v1) @@ -1783,13 +1783,13 @@ glabel var7f1acfe0nb /* f100b1c: 29810002 */ slti $at,$t4,0x2 /* f100b20: 14200006 */ bnez $at,.JF0f100b3c /* f100b24: 00000000 */ nop -/* f100b28: 0c002f2d */ jal 0xbcb4 +/* f100b28: 0c002f2d */ jal viGetViewTop /* f100b2c: 00000000 */ nop /* f100b30: 244d0005 */ addiu $t5,$v0,0x5 /* f100b34: 10000005 */ b .JF0f100b4c /* f100b38: afad0090 */ sw $t5,0x90($sp) .JF0f100b3c: -/* f100b3c: 0c002f2d */ jal 0xbcb4 +/* f100b3c: 0c002f2d */ jal viGetViewTop /* f100b40: 00000000 */ nop /* f100b44: 244f000a */ addiu $t7,$v0,0xa /* f100b48: afaf0090 */ sw $t7,0x90($sp) @@ -1797,7 +1797,7 @@ glabel var7f1acfe0nb /* f100b4c: 8fae0074 */ lw $t6,0x74($sp) /* f100b50: 11c00012 */ beqz $t6,.JF0f100b9c /* f100b54: 00000000 */ nop -/* f100b58: 0c002f29 */ jal 0xbca4 +/* f100b58: 0c002f29 */ jal viGetViewLeft /* f100b5c: 00000000 */ nop /* f100b60: 3c198008 */ lui $t9,0x8008 /* f100b64: 8f3900f4 */ lw $t9,0xf4($t9) @@ -1835,7 +1835,7 @@ glabel var7f1acfe0nb /* f100bdc: afa00028 */ sw $zero,0x28($sp) /* f100be0: afa0002c */ sw $zero,0x2c($sp) /* f100be4: afad0014 */ sw $t5,0x14($sp) -/* f100be8: 0fc55d34 */ jal 0xf1574d0 +/* f100be8: 0fc55d34 */ jal func0f1574d0jf /* f100bec: afac0010 */ sw $t4,0x10($sp) /* f100bf0: afa20098 */ sw $v0,0x98($sp) .JF0f100bf4: @@ -2700,7 +2700,7 @@ glabel amRender /* f101598: 912a0250 */ lbu $t2,0x250($t1) /* f10159c: 5140033d */ beqzl $t2,.JF0f102294 /* f1015a0: 8fbf004c */ lw $ra,0x4c($sp) -/* f1015a4: 0fc54b55 */ jal 0xf152d54 +/* f1015a4: 0fc54b55 */ jal func0f153628 /* f1015a8: 8fa40148 */ lw $a0,0x148($sp) /* f1015ac: 8eeb0318 */ lw $t3,0x318($s7) /* f1015b0: afa20148 */ sw $v0,0x148($sp) @@ -2753,7 +2753,7 @@ glabel amRender .JF0f101664: /* f101664: 000c2403 */ sra $a0,$t4,0x10 /* f101668: 000e2c03 */ sra $a1,$t6,0x10 -/* f10166c: 0fc3ffc5 */ jal 0xf0fff14 +/* f10166c: 0fc3ffc5 */ jal amCalculateSlotPosition /* f101670: 26070008 */ addiu $a3,$s0,0x8 /* f101674: 8fd80000 */ lw $t8,0x0($s8) /* f101678: 3c09800a */ lui $t1,0x800a @@ -2778,16 +2778,16 @@ glabel amRender /* f1016c0: 00046400 */ sll $t4,$a0,0x10 /* f1016c4: 000c2403 */ sra $a0,$t4,0x10 /* f1016c8: 000e2c03 */ sra $a1,$t6,0x10 -/* f1016cc: 0fc3ffc5 */ jal 0xf0fff14 +/* f1016cc: 0fc3ffc5 */ jal amCalculateSlotPosition /* f1016d0: 2607000c */ addiu $a3,$s0,0xc .JF0f1016d4: -/* f1016d4: 0fc35617 */ jal 0xf0d585c +/* f1016d4: 0fc35617 */ jal func0f0d479c /* f1016d8: 8fa40148 */ lw $a0,0x148($sp) /* f1016dc: afa20148 */ sw $v0,0x148($sp) -/* f1016e0: 0fc59f77 */ jal 0xf167ddc +/* f1016e0: 0fc59f77 */ jal gfxAllocateColours /* f1016e4: 24040002 */ li $a0,0x2 /* f1016e8: 0040a825 */ move $s5,$v0 -/* f1016ec: 0fc59f5d */ jal 0xf167d74 +/* f1016ec: 0fc59f5d */ jal gfxAllocateVertices /* f1016f0: 24040008 */ li $a0,0x8 /* f1016f4: 8fb80148 */ lw $t8,0x148($sp) /* f1016f8: 3c09e700 */ lui $t1,0xe700 @@ -2841,7 +2841,7 @@ glabel amRender /* f1017b8: 27a40148 */ addiu $a0,$sp,0x148 /* f1017bc: 00002825 */ move $a1,$zero /* f1017c0: 24060002 */ li $a2,0x2 -/* f1017c4: 0fc2d290 */ jal 0xf0b4a40 +/* f1017c4: 0fc2d290 */ jal func0f0b39c0 /* f1017c8: 00003825 */ move $a3,$zero /* f1017cc: 8fac0148 */ lw $t4,0x148($sp) /* f1017d0: 3c0eb900 */ lui $t6,0xb900 @@ -2857,7 +2857,7 @@ glabel amRender /* f1017f8: 24040001 */ li $a0,0x1 /* f1017fc: 00002825 */ move $a1,$zero /* f101800: ad8e0000 */ sw $t6,0x0($t4) -/* f101804: 0fc3ffc5 */ jal 0xf0fff14 +/* f101804: 0fc3ffc5 */ jal amCalculateSlotPosition /* f101808: ad8f0004 */ sw $t7,0x4($t4) /* f10180c: 87b8012a */ lh $t8,0x12a($sp) /* f101810: 2411000a */ li $s1,0xa @@ -2874,7 +2874,7 @@ glabel amRender /* f10183c: 01310019 */ multu $t1,$s1 /* f101840: 00005012 */ mflo $t2 /* f101844: a60a0002 */ sh $t2,0x2($s0) -/* f101848: 0fc3ffc5 */ jal 0xf0fff14 +/* f101848: 0fc3ffc5 */ jal amCalculateSlotPosition /* f10184c: 00000000 */ nop /* f101850: 87ab012a */ lh $t3,0x12a($sp) /* f101854: 24040001 */ li $a0,0x1 @@ -2889,7 +2889,7 @@ glabel amRender /* f101878: 01b10019 */ multu $t5,$s1 /* f10187c: 00007012 */ mflo $t6 /* f101880: a60e000e */ sh $t6,0xe($s0) -/* f101884: 0fc3ffc5 */ jal 0xf0fff14 +/* f101884: 0fc3ffc5 */ jal amCalculateSlotPosition /* f101888: 00000000 */ nop /* f10188c: 87af012a */ lh $t7,0x12a($sp) /* f101890: 00002025 */ move $a0,$zero @@ -2904,7 +2904,7 @@ glabel amRender /* f1018b4: 03310019 */ multu $t9,$s1 /* f1018b8: 00004812 */ mflo $t1 /* f1018bc: a609001a */ sh $t1,0x1a($s0) -/* f1018c0: 0fc3ffc5 */ jal 0xf0fff14 +/* f1018c0: 0fc3ffc5 */ jal amCalculateSlotPosition /* f1018c4: 00000000 */ nop /* f1018c8: 87aa012a */ lh $t2,0x12a($sp) /* f1018cc: 8602000c */ lh $v0,0xc($s0) @@ -2975,7 +2975,7 @@ glabel amRender /* f1019c8: 262d0008 */ addiu $t5,$s1,0x8 /* f1019cc: afad0148 */ sw $t5,0x148($sp) /* f1019d0: 02a02025 */ move $a0,$s5 -/* f1019d4: 0c012b34 */ jal 0x4acd0 +/* f1019d4: 0c012b34 */ jal osVirtualToPhysical /* f1019d8: ae2e0000 */ sw $t6,0x0($s1) /* f1019dc: ae220004 */ sw $v0,0x4($s1) /* f1019e0: 8fb20148 */ lw $s2,0x148($sp) @@ -2984,7 +2984,7 @@ glabel amRender /* f1019ec: 26580008 */ addiu $t8,$s2,0x8 /* f1019f0: afb80148 */ sw $t8,0x148($sp) /* f1019f4: 02002025 */ move $a0,$s0 -/* f1019f8: 0c012b34 */ jal 0x4acd0 +/* f1019f8: 0c012b34 */ jal osVirtualToPhysical /* f1019fc: ae590000 */ sw $t9,0x0($s2) /* f101a00: ae420004 */ sw $v0,0x4($s2) /* f101a04: 8fa90148 */ lw $t1,0x148($sp) @@ -3013,7 +3013,7 @@ glabel amRender /* f101a60: 356b5621 */ ori $t3,$t3,0x5621 /* f101a64: af2b0004 */ sw $t3,0x4($t9) /* f101a68: af2a0000 */ sw $t2,0x0($t9) -/* f101a6c: 0fc356a2 */ jal 0xf0d5a88 +/* f101a6c: 0fc356a2 */ jal func0f0d49c8 /* f101a70: 8fa40148 */ lw $a0,0x148($sp) /* f101a74: 3c168007 */ lui $s6,0x8007 /* f101a78: afa20148 */ sw $v0,0x148($sp) @@ -3032,7 +3032,7 @@ glabel amRender /* f101aa4: 01a02825 */ move $a1,$t5 /* f101aa8: 27a600f2 */ addiu $a2,$sp,0xf2 /* f101aac: 27a700f0 */ addiu $a3,$sp,0xf0 -/* f101ab0: 0fc3ffc5 */ jal 0xf0fff14 +/* f101ab0: 0fc3ffc5 */ jal amCalculateSlotPosition /* f101ab4: 2414ffff */ li $s4,-1 /* f101ab8: 8fcf0000 */ lw $t7,0x0($s8) /* f101abc: 3c19800a */ lui $t9,0x800a @@ -3052,7 +3052,7 @@ glabel amRender /* f101af0: 812ae6eb */ lb $t2,-0x1915($t1) /* f101af4: 0543002b */ bgezl $t2,.JF0f101ba4 /* f101af8: 8eef0318 */ lw $t7,0x318($s7) -/* f101afc: 0fc3fae3 */ jal 0xf0feb8c +/* f101afc: 0fc3fae3 */ jal amGetFirstBuddyIndex /* f101b00: 00000000 */ nop /* f101b04: 04420027 */ bltzl $v0,.JF0f101ba4 /* f101b08: 8eef0318 */ lw $t7,0x318($s7) @@ -3139,14 +3139,14 @@ glabel amRender /* f101c3c: 3c144f4f */ lui $s4,0x4f4f /* f101c40: 36944f7f */ ori $s4,$s4,0x4f7f .JF0f101c44: -/* f101c44: 0fc3fbe0 */ jal 0xf0fef80 +/* f101c44: 0fc3fbe0 */ jal amGetSlotDetails /* f101c48: 02a03025 */ move $a2,$s5 /* f101c4c: 24020001 */ li $v0,0x1 /* f101c50: 1662000f */ bne $s3,$v0,.JF0f101c90 /* f101c54: 8fa40148 */ lw $a0,0x148($sp) /* f101c58: 5622000e */ bnel $s1,$v0,.JF0f101c94 /* f101c5c: 8fac0140 */ lw $t4,0x140($sp) -/* f101c60: 0fc3ff48 */ jal 0xf0ffd20 +/* f101c60: 0fc3ff48 */ jal amIsCramped /* f101c64: 00000000 */ nop /* f101c68: 14400011 */ bnez $v0,.JF0f101cb0 /* f101c6c: 8fa40148 */ lw $a0,0x148($sp) @@ -3154,7 +3154,7 @@ glabel amRender /* f101c74: 02a02825 */ move $a1,$s5 /* f101c78: 02803025 */ move $a2,$s4 /* f101c7c: 87a700f2 */ lh $a3,0xf2($sp) -/* f101c80: 0fc400df */ jal 0xf10037c +/* f101c80: 0fc400df */ jal amRenderText /* f101c84: afab0010 */ sw $t3,0x10($sp) /* f101c88: 10000009 */ b .JF0f101cb0 /* f101c8c: afa20148 */ sw $v0,0x148($sp) @@ -3165,7 +3165,7 @@ glabel amRender /* f101c98: 87a600f2 */ lh $a2,0xf2($sp) /* f101c9c: 87a700f0 */ lh $a3,0xf0($sp) /* f101ca0: afb00010 */ sw $s0,0x10($sp) -/* f101ca4: 0fc40302 */ jal 0xf100c08 +/* f101ca4: 0fc40302 */ jal amRenderSlot /* f101ca8: afac0014 */ sw $t4,0x14($sp) /* f101cac: afa20148 */ sw $v0,0x148($sp) .JF0f101cb0: @@ -3185,7 +3185,7 @@ glabel amRender /* f101ce4: 8329e6eb */ lb $t1,-0x1915($t9) /* f101ce8: 05230006 */ bgezl $t1,.JF0f101d04 /* f101cec: 8eea0318 */ lw $t2,0x318($s7) -/* f101cf0: 0fc3fae3 */ jal 0xf0feb8c +/* f101cf0: 0fc3fae3 */ jal amGetFirstBuddyIndex /* f101cf4: 00000000 */ nop /* f101cf8: 04430013 */ bgezl $v0,.JF0f101d48 /* f101cfc: 8fcd0000 */ lw $t5,0x0($s8) @@ -3204,7 +3204,7 @@ glabel amRender /* f101d2c: 28410002 */ slti $at,$v0,0x2 /* f101d30: 54200005 */ bnezl $at,.JF0f101d48 /* f101d34: 8fcd0000 */ lw $t5,0x0($s8) -/* f101d38: 0fc40111 */ jal 0xf100444 +/* f101d38: 0fc40111 */ jal amRenderAibotInfo /* f101d3c: 2445fffe */ addiu $a1,$v0,-2 /* f101d40: afa20148 */ sw $v0,0x148($sp) /* f101d44: 8fcd0000 */ lw $t5,0x0($s8) @@ -3225,7 +3225,7 @@ glabel amRender /* f101d7c: 12210140 */ beq $s1,$at,.JF0f102280 .JF0f101d80: /* f101d80: 24130007 */ li $s3,0x7 -/* f101d84: 0c0068df */ jal 0x1a37c +/* f101d84: 0c0068df */ jal sinf /* f101d88: c60c001c */ lwc1 $f12,0x1c($s0) /* f101d8c: 3c013f80 */ lui $at,0x3f80 /* f101d90: 44812000 */ mtc1 $at,$f4 @@ -3283,7 +3283,7 @@ glabel amRender /* f101e54: 3c144f4f */ lui $s4,0x4f4f /* f101e58: 36944f7f */ ori $s4,$s4,0x4f7f .JF0f101e5c: -/* f101e5c: 0fc54bce */ jal 0xf152f38 +/* f101e5c: 0fc54bce */ jal gfxSetPrimColour /* f101e60: 02802825 */ move $a1,$s4 /* f101e64: 8fce0000 */ lw $t6,0x0($s8) /* f101e68: 3c18800a */ lui $t8,0x800a @@ -3303,7 +3303,7 @@ glabel amRender /* f101e9c: 24010004 */ li $at,0x4 /* f101ea0: 15210039 */ bne $t1,$at,.JF0f101f88 /* f101ea4: 03208825 */ move $s1,$t9 -/* f101ea8: 0fc3ff48 */ jal 0xf0ffd20 +/* f101ea8: 0fc3ff48 */ jal amIsCramped /* f101eac: 00000000 */ nop /* f101eb0: 50400006 */ beqzl $v0,.JF0f101ecc /* f101eb4: 8eea006c */ lw $t2,0x6c($s7) @@ -3346,7 +3346,7 @@ glabel amRender /* f101f34: 2b010002 */ slti $at,$t8,0x2 /* f101f38: 14200013 */ bnez $at,.JF0f101f88 /* f101f3c: 24040004 */ li $a0,0x4 -/* f101f40: 0fc3fbe0 */ jal 0xf0fef80 +/* f101f40: 0fc3fbe0 */ jal amGetSlotDetails /* f101f44: 27a50084 */ addiu $a1,$sp,0x84 /* f101f48: 3c19800a */ lui $t9,0x800a /* f101f4c: 8f3928b4 */ lw $t9,0x28b4($t9) @@ -3356,7 +3356,7 @@ glabel amRender /* f101f5c: 27a500a8 */ addiu $a1,$sp,0xa8 /* f101f60: 02003025 */ move $a2,$s0 /* f101f64: afa00014 */ sw $zero,0x14($sp) -/* f101f68: 0fc55d49 */ jal 0xf157524 +/* f101f68: 0fc55d49 */ jal textMeasure /* f101f6c: afb90010 */ sw $t9,0x10($sp) /* f101f70: 8fb100a8 */ lw $s1,0xa8($sp) /* f101f74: 06210003 */ bgez $s1,.JF0f101f84 @@ -3553,11 +3553,11 @@ glabel amRender /* f102268: 000a7380 */ sll $t6,$t2,0xe /* f10226c: 016e6825 */ or $t5,$t3,$t6 /* f102270: ac4d0004 */ sw $t5,0x4($v0) -/* f102274: 0fc54be5 */ jal 0xf152f94 +/* f102274: 0fc54be5 */ jal func0f153838 /* f102278: 8fa40148 */ lw $a0,0x148($sp) /* f10227c: afa20148 */ sw $v0,0x148($sp) .JF0f102280: -/* f102280: 0fc54bb7 */ jal 0xf152edc +/* f102280: 0fc54bb7 */ jal func0f153780 /* f102284: 8fa40148 */ lw $a0,0x148($sp) /* f102288: afa20148 */ sw $v0,0x148($sp) /* f10228c: 24030001 */ li $v1,0x1 diff --git a/src/game/activemenu/tick.c b/src/game/activemenu/tick.c index 73bd2ad5e..3984f21f5 100644 --- a/src/game/activemenu/tick.c +++ b/src/game/activemenu/tick.c @@ -76,7 +76,7 @@ glabel var7f1a9184jf /* f01c3b4: afa700d8 */ sw $a3,0xd8($sp) /* f01c3b8: c4349184 */ lwc1 $f20,-0x6e7c($at) .JF0f01c3bc: -/* f01c3bc: 0fc4a34d */ jal 0xf128d34 +/* f01c3bc: 0fc4a34d */ jal setCurrentPlayerNum /* f01c3c0: 8fa400d8 */ lw $a0,0xd8($sp) /* f01c3c4: 3c07800a */ lui $a3,0x800a /* f01c3c8: 24e7a630 */ addiu $a3,$a3,-22992 @@ -95,7 +95,7 @@ glabel var7f1a9184jf /* f01c3fc: 00002825 */ move $a1,$zero /* f01c400: 51e0000f */ beqzl $t7,.JF0f01c440 /* f01c404: 8ce80318 */ lw $t0,0x318($a3) -/* f01c408: 0fc2a677 */ jal 0xf0a99dc +/* f01c408: 0fc2a677 */ jal bgunConsiderToggleGunFunction /* f01c40c: 24060001 */ li $a2,0x1 /* f01c410: 18400009 */ blez $v0,.JF0f01c438 /* f01c414: 3c07800a */ lui $a3,0x800a @@ -113,7 +113,7 @@ glabel var7f1a9184jf .JF0f01c440: /* f01c440: 1500000f */ bnez $t0,.JF0f01c480 /* f01c444: 00000000 */ nop -/* f01c448: 0fc44b55 */ jal 0xf112d54 +/* f01c448: 0fc44b55 */ jal invGetCount /* f01c44c: 00000000 */ nop /* f01c450: 3c09800a */ lui $t1,0x800a /* f01c454: 8d2928b8 */ lw $t1,0x28b8($t1) @@ -125,7 +125,7 @@ glabel var7f1a9184jf /* f01c46c: 916b2801 */ lbu $t3,0x2801($t3) /* f01c470: 104b0003 */ beq $v0,$t3,.JF0f01c480 /* f01c474: 00000000 */ nop -/* f01c478: 0fc3fe4e */ jal 0xf0ff938 +/* f01c478: 0fc3fe4e */ jal amAssignWeaponSlots /* f01c47c: 00000000 */ nop .JF0f01c480: /* f01c480: 3c07800a */ lui $a3,0x800a @@ -136,14 +136,14 @@ glabel var7f1a9184jf /* f01c494: 00000000 */ nop /* f01c498: 8cee0288 */ lw $t6,0x288($a3) /* f01c49c: 0000f025 */ move $s8,$zero -/* f01c4a0: 0fc5474c */ jal 0xf151d30 +/* f01c4a0: 0fc5474c */ jal optionsGetControlMode /* f01c4a4: 8dc40070 */ lw $a0,0x70($t6) /* f01c4a8: 3c0f800a */ lui $t7,0x800a /* f01c4ac: 8defa8b8 */ lw $t7,-0x5748($t7) /* f01c4b0: afa200d4 */ sw $v0,0xd4($sp) -/* f01c4b4: 0fc5475a */ jal 0xf151d68 +/* f01c4b4: 0fc5475a */ jal optionsGetContpadNum1 /* f01c4b8: 8de40070 */ lw $a0,0x70($t7) -/* f01c4bc: 0c0051ed */ jal 0x147b4 +/* f01c4bc: 0c0051ed */ jal joyGetNumSamples /* f01c4c0: a3a200d3 */ sb $v0,0xd3($sp) /* f01c4c4: 1840023f */ blez $v0,.JF0f01cdc4 /* f01c4c8: afa200cc */ sw $v0,0xcc($sp) @@ -155,25 +155,25 @@ glabel var7f1a9184jf /* f01c4dc: 24150001 */ li $s5,0x1 /* f01c4e0: 24140001 */ li $s4,0x1 /* f01c4e4: afa000b0 */ sw $zero,0xb0($sp) -/* f01c4e8: 0c0051f8 */ jal 0x147e0 +/* f01c4e8: 0c0051f8 */ jal joyGetStickXOnSample /* f01c4ec: afa000ac */ sw $zero,0xac($sp) /* f01c4f0: 0002b600 */ sll $s6,$v0,0x18 /* f01c4f4: 0016c603 */ sra $t8,$s6,0x18 /* f01c4f8: 0300b025 */ move $s6,$t8 /* f01c4fc: 03c02025 */ move $a0,$s8 -/* f01c500: 0c005227 */ jal 0x1489c +/* f01c500: 0c005227 */ jal joyGetStickYOnSample /* f01c504: 83a500d3 */ lb $a1,0xd3($sp) /* f01c508: 0002be00 */ sll $s7,$v0,0x18 /* f01c50c: 0017ce03 */ sra $t9,$s7,0x18 /* f01c510: 0320b825 */ move $s7,$t9 /* f01c514: 03c02025 */ move $a0,$s8 /* f01c518: 83a500d3 */ lb $a1,0xd3($sp) -/* f01c51c: 0c005284 */ jal 0x14a10 +/* f01c51c: 0c005284 */ jal joyGetButtonsOnSample /* f01c520: 3406ffff */ li $a2,0xffff /* f01c524: 3051ffff */ andi $s1,$v0,0xffff /* f01c528: 03c02025 */ move $a0,$s8 /* f01c52c: 83a500d3 */ lb $a1,0xd3($sp) -/* f01c530: 0c0052ba */ jal 0x14ae8 +/* f01c530: 0c0052ba */ jal joyGetButtonsPressedOnSample /* f01c534: 3406ffff */ li $a2,0xffff /* f01c538: 3c08800a */ lui $t0,0x800a /* f01c53c: 8d0828b8 */ lw $t0,0x28b8($t0) @@ -254,7 +254,7 @@ glabel var7f1a9184jf /* f01c644: 1720000d */ bnez $t9,.JF0f01c67c /* f01c648: 00000000 */ nop /* f01c64c: a2030034 */ sb $v1,0x34($s0) -/* f01c650: 0fc3fdf7 */ jal 0xf0ff7dc +/* f01c650: 0fc3fdf7 */ jal amChangeScreen /* f01c654: a2080000 */ sb $t0,0x0($s0) /* f01c658: 3c09800a */ lui $t1,0x800a /* f01c65c: 8d2928b8 */ lw $t1,0x28b8($t1) @@ -273,7 +273,7 @@ glabel var7f1a9184jf /* f01c68c: 50400005 */ beqzl $v0,.JF0f01c6a4 /* f01c690: 324c0008 */ andi $t4,$s2,0x8 /* f01c694: a2020000 */ sb $v0,0x0($s0) -/* f01c698: 0fc3fdf7 */ jal 0xf0ff7dc +/* f01c698: 0fc3fdf7 */ jal amChangeScreen /* f01c69c: a2000034 */ sb $zero,0x34($s0) /* f01c6a0: 324c0008 */ andi $t4,$s2,0x8 .JF0f01c6a4: @@ -321,7 +321,7 @@ glabel var7f1a9184jf /* f01c728: 00000000 */ nop .JF0f01c72c: /* f01c72c: 8d6ba8b8 */ lw $t3,-0x5748($t3) -/* f01c730: 0fc54761 */ jal 0xf151d84 +/* f01c730: 0fc54761 */ jal optionsGetContpadNum2 /* f01c734: 8d640070 */ lw $a0,0x70($t3) /* f01c738: 00028600 */ sll $s0,$v0,0x18 /* f01c73c: 00022e00 */ sll $a1,$v0,0x18 @@ -329,7 +329,7 @@ glabel var7f1a9184jf /* f01c744: 00056e03 */ sra $t5,$a1,0x18 /* f01c748: 01808025 */ move $s0,$t4 /* f01c74c: 01a02825 */ move $a1,$t5 -/* f01c750: 0c0051f8 */ jal 0x147e0 +/* f01c750: 0c0051f8 */ jal joyGetStickXOnSample /* f01c754: 03c02025 */ move $a0,$s8 /* f01c758: 00029600 */ sll $s2,$v0,0x18 /* f01c75c: 00102e00 */ sll $a1,$s0,0x18 @@ -337,7 +337,7 @@ glabel var7f1a9184jf /* f01c764: 00057e03 */ sra $t7,$a1,0x18 /* f01c768: 01c09025 */ move $s2,$t6 /* f01c76c: 01e02825 */ move $a1,$t7 -/* f01c770: 0c005227 */ jal 0x1489c +/* f01c770: 0c005227 */ jal joyGetStickYOnSample /* f01c774: 03c02025 */ move $a0,$s8 /* f01c778: 00029e00 */ sll $s3,$v0,0x18 /* f01c77c: 00102e00 */ sll $a1,$s0,0x18 @@ -346,14 +346,14 @@ glabel var7f1a9184jf /* f01c788: 03009825 */ move $s3,$t8 /* f01c78c: 03202825 */ move $a1,$t9 /* f01c790: 03c02025 */ move $a0,$s8 -/* f01c794: 0c005284 */ jal 0x14a10 +/* f01c794: 0c005284 */ jal joyGetButtonsOnSample /* f01c798: 3406ffff */ li $a2,0xffff /* f01c79c: 00102e00 */ sll $a1,$s0,0x18 /* f01c7a0: 00054603 */ sra $t0,$a1,0x18 /* f01c7a4: 3051ffff */ andi $s1,$v0,0xffff /* f01c7a8: 01002825 */ move $a1,$t0 /* f01c7ac: 03c02025 */ move $a0,$s8 -/* f01c7b0: 0c0052ba */ jal 0x14ae8 +/* f01c7b0: 0c0052ba */ jal joyGetButtonsPressedOnSample /* f01c7b4: 3406ffff */ li $a2,0xffff /* f01c7b8: 3c09800a */ lui $t1,0x800a /* f01c7bc: 8d29a8b4 */ lw $t1,-0x574c($t1) @@ -584,7 +584,7 @@ glabel var7f1a9184jf /* f01caac: 15e00005 */ bnez $t7,.JF0f01cac4 /* f01cab0: 00000000 */ nop .JF0f01cab4: -/* f01cab4: 0fc3ff29 */ jal 0xf0ffca4 +/* f01cab4: 0fc3ff29 */ jal amClose /* f01cab8: 00000000 */ nop /* f01cabc: 100000c1 */ b .JF0f01cdc4 /* f01cac0: 00000000 */ nop @@ -624,7 +624,7 @@ glabel var7f1a9184jf /* f01cb40: 1000002c */ b .JF0f01cbf4 /* f01cb44: a3b900c7 */ sb $t9,0xc7($sp) .JF0f01cb48: -/* f01cb48: 0fc3fb05 */ jal 0xf0fec14 +/* f01cb48: 0fc3fb05 */ jal amApply /* f01cb4c: 00000000 */ nop /* f01cb50: 10000029 */ b .JF0f01cbf8 /* f01cb54: 83ae00c7 */ lb $t6,0xc7($sp) @@ -636,7 +636,7 @@ glabel var7f1a9184jf /* f01cb68: 9108d5a8 */ lbu $t0,-0x2a58($t0) /* f01cb6c: 5501000d */ bnel $t0,$at,.JF0f01cba4 /* f01cb70: 920b0032 */ lbu $t3,0x32($s0) -/* f01cb74: 0fc3f8d8 */ jal 0xf0fe360 +/* f01cb74: 0fc3f8d8 */ jal amOpenPickTarget /* f01cb78: 00000000 */ nop /* f01cb7c: 3c09800a */ lui $t1,0x800a /* f01cb80: 8d2928b8 */ lw $t1,0x28b8($t1) @@ -658,7 +658,7 @@ glabel var7f1a9184jf .JF0f01cbb8: /* f01cbb8: 1041000e */ beq $v0,$at,.JF0f01cbf4 /* f01cbbc: 00402025 */ move $a0,$v0 -/* f01cbc0: 0fc3fb05 */ jal 0xf0fec14 +/* f01cbc0: 0fc3fb05 */ jal amApply /* f01cbc4: 00000000 */ nop /* f01cbc8: 1000000b */ b .JF0f01cbf8 /* f01cbcc: 83ae00c7 */ lb $t6,0xc7($sp) @@ -671,14 +671,14 @@ glabel var7f1a9184jf /* f01cbe4: 10000003 */ b .JF0f01cbf4 /* f01cbe8: a3ad00c7 */ sb $t5,0xc7($sp) .JF0f01cbec: -/* f01cbec: 0fc3fb05 */ jal 0xf0fec14 +/* f01cbec: 0fc3fb05 */ jal amApply /* f01cbf0: 00000000 */ nop .JF0f01cbf4: /* f01cbf4: 83ae00c7 */ lb $t6,0xc7($sp) .JF0f01cbf8: /* f01cbf8: 11c0001f */ beqz $t6,.JF0f01cc78 /* f01cbfc: 00000000 */ nop -/* f01cc00: 0fc3fdf7 */ jal 0xf0ff7dc +/* f01cc00: 0fc3fdf7 */ jal amChangeScreen /* f01cc04: 01c02025 */ move $a0,$t6 /* f01cc08: 3c0f800a */ lui $t7,0x800a /* f01cc0c: 8def28b8 */ lw $t7,0x28b8($t7) @@ -694,19 +694,19 @@ glabel var7f1a9184jf /* f01cc34: 00000000 */ nop /* f01cc38: 8c84a8b4 */ lw $a0,-0x574c($a0) /* f01cc3c: 00002825 */ move $a1,$zero -/* f01cc40: 0fc2c84e */ jal 0xf0b2138 +/* f01cc40: 0fc2c84e */ jal weaponGetFunction /* f01cc44: 24840638 */ addiu $a0,$a0,0x638 /* f01cc48: 3c04800a */ lui $a0,0x800a /* f01cc4c: 8c84a8b4 */ lw $a0,-0x574c($a0) /* f01cc50: 00408025 */ move $s0,$v0 /* f01cc54: 24050001 */ li $a1,0x1 -/* f01cc58: 0fc2c84e */ jal 0xf0b2138 +/* f01cc58: 0fc2c84e */ jal weaponGetFunction /* f01cc5c: 24840638 */ addiu $a0,$a0,0x638 /* f01cc60: 16000005 */ bnez $s0,.JF0f01cc78 /* f01cc64: 00000000 */ nop /* f01cc68: 14400003 */ bnez $v0,.JF0f01cc78 /* f01cc6c: 00000000 */ nop -/* f01cc70: 0fc3fdf7 */ jal 0xf0ff7dc +/* f01cc70: 0fc3fdf7 */ jal amChangeScreen /* f01cc74: 83a400c7 */ lb $a0,0xc7($sp) .JF0f01cc78: /* f01cc78: 3c08800a */ lui $t0,0x800a @@ -740,11 +740,11 @@ glabel var7f1a9184jf .JF0f01cce4: /* f01cce4: 02402025 */ move $a0,$s2 /* f01cce8: 27a50070 */ addiu $a1,$sp,0x70 -/* f01ccec: 0fc3fbe0 */ jal 0xf0fef80 +/* f01ccec: 0fc3fbe0 */ jal amGetSlotDetails /* f01ccf0: 27a60074 */ addiu $a2,$sp,0x74 /* f01ccf4: 3c057f1b */ lui $a1,0x7f1b /* f01ccf8: 24a59180 */ addiu $a1,$a1,-28288 -/* f01ccfc: 0c004c85 */ jal 0x13214 +/* f01ccfc: 0c004c85 */ jal strcmp /* f01cd00: 27a40074 */ addiu $a0,$sp,0x74 /* f01cd04: 14400002 */ bnez $v0,.JF0f01cd10 /* f01cd08: 3c0f800a */ lui $t7,0x800a @@ -969,7 +969,7 @@ glabel var7f1a9184jf /* f01d014: 1420fce9 */ bnez $at,.JF0f01c3bc /* f01d018: afa600d8 */ sw $a2,0xd8($sp) .JF0f01d01c: -/* f01d01c: 0fc4a34d */ jal 0xf128d34 +/* f01d01c: 0fc4a34d */ jal setCurrentPlayerNum /* f01d020: 8fa400dc */ lw $a0,0xdc($sp) /* f01d024: 8fbf0044 */ lw $ra,0x44($sp) /* f01d028: d7b40018 */ ldc1 $f20,0x18($sp) diff --git a/src/game/bondeyespy.c b/src/game/bondeyespy.c index ce27fba27..16269178e 100644 --- a/src/game/bondeyespy.c +++ b/src/game/bondeyespy.c @@ -749,15 +749,15 @@ glabel var7f1adb00 /* f0d1a14: 8f190004 */ lw $t9,0x4($t8) /* f0d1a18: e7a400e0 */ swc1 $f4,0xe0($sp) /* f0d1a1c: afb900e4 */ sw $t9,0xe4($sp) -/* f0d1a20: 0fc5475a */ jal 0xf151d68 +/* f0d1a20: 0fc5475a */ jal optionsGetContpadNum1 /* f0d1a24: 8dc40070 */ lw $a0,0x70($t6) /* f0d1a28: 00022600 */ sll $a0,$v0,0x18 /* f0d1a2c: 00047e03 */ sra $t7,$a0,0x18 /* f0d1a30: a3a200c3 */ sb $v0,0xc3($sp) -/* f0d1a34: 0c00536a */ jal 0x14da8 +/* f0d1a34: 0c00536a */ jal joyGetStickX /* f0d1a38: 01e02025 */ move $a0,$t7 /* f0d1a3c: 83a400c3 */ lb $a0,0xc3($sp) -/* f0d1a40: 0c005394 */ jal 0x14e50 +/* f0d1a40: 0c005394 */ jal joyGetStickY /* f0d1a44: a3a200c2 */ sb $v0,0xc2($sp) /* f0d1a48: 8fae00e8 */ lw $t6,0xe8($sp) /* f0d1a4c: 00023e00 */ sll $a3,$v0,0x18 @@ -770,7 +770,7 @@ glabel var7f1adb00 /* f0d1a68: a3bf00c2 */ sb $ra,0xc2($sp) /* f0d1a6c: 83a400c3 */ lb $a0,0xc3($sp) /* f0d1a70: 3405ffff */ li $a1,0xffff -/* f0d1a74: 0c0053be */ jal 0x14ef8 +/* f0d1a74: 0c0053be */ jal joyGetButtons /* f0d1a78: a3b900c0 */ sb $t9,0xc0($sp) /* f0d1a7c: 3c09800a */ lui $t1,0x800a /* f0d1a80: 2529a630 */ addiu $t1,$t1,-22992 @@ -787,7 +787,7 @@ glabel var7f1adb00 /* f0d1aa4: 8f040070 */ lw $a0,0x70($t8) /* f0d1aa8: a3bf00c2 */ sb $ra,0xc2($sp) /* f0d1aac: a7a800bc */ sh $t0,0xbc($sp) -/* f0d1ab0: 0fc5474c */ jal 0xf151d30 +/* f0d1ab0: 0fc5474c */ jal optionsGetControlMode /* f0d1ab4: a3a700c0 */ sb $a3,0xc0($sp) /* f0d1ab8: 44808000 */ mtc1 $zero,$f16 /* f0d1abc: 3c09800a */ lui $t1,0x800a @@ -810,18 +810,18 @@ glabel var7f1adb00 /* f0d1b00: a3bf00c2 */ sb $ra,0xc2($sp) /* f0d1b04: afa200b0 */ sw $v0,0xb0($sp) /* f0d1b08: a7a800bc */ sh $t0,0xbc($sp) -/* f0d1b0c: 0fc54761 */ jal 0xf151d84 +/* f0d1b0c: 0fc54761 */ jal optionsGetContpadNum2 /* f0d1b10: a3a700c0 */ sb $a3,0xc0($sp) /* f0d1b14: 00021e00 */ sll $v1,$v0,0x18 /* f0d1b18: 00037e03 */ sra $t7,$v1,0x18 /* f0d1b1c: 000f2600 */ sll $a0,$t7,0x18 /* f0d1b20: 0004c603 */ sra $t8,$a0,0x18 /* f0d1b24: afaf0074 */ sw $t7,0x74($sp) -/* f0d1b28: 0c00536a */ jal 0x14da8 +/* f0d1b28: 0c00536a */ jal joyGetStickX /* f0d1b2c: 03002025 */ move $a0,$t8 /* f0d1b30: 83a40077 */ lb $a0,0x77($sp) /* f0d1b34: a3a200c1 */ sb $v0,0xc1($sp) -/* f0d1b38: 0c005394 */ jal 0x14e50 +/* f0d1b38: 0c005394 */ jal joyGetStickY /* f0d1b3c: afa4003c */ sw $a0,0x3c($sp) /* f0d1b40: 8faf00e8 */ lw $t7,0xe8($sp) /* f0d1b44: 00023600 */ sll $a2,$v0,0x18 @@ -842,7 +842,7 @@ glabel var7f1adb00 /* f0d1b80: a3a700c0 */ sb $a3,0xc0($sp) /* f0d1b84: a7a800bc */ sh $t0,0xbc($sp) /* f0d1b88: a3aa00c1 */ sb $t2,0xc1($sp) -/* f0d1b8c: 0c0053be */ jal 0x14ef8 +/* f0d1b8c: 0c0053be */ jal joyGetButtons /* f0d1b90: afab00b0 */ sw $t3,0xb0($sp) /* f0d1b94: 3c09800a */ lui $t1,0x800a /* f0d1b98: 2529a630 */ addiu $t1,$t1,-22992 @@ -1249,9 +1249,9 @@ glabel var7f1adb00 /* f0d20fc: 8f240000 */ lw $a0,0x0($t9) /* f0d2100: a3bf00c2 */ sb $ra,0xc2($sp) /* f0d2104: e7ae00e0 */ swc1 $f14,0xe0($sp) -/* f0d2108: 0fc19a31 */ jal 0xf0668c4 +/* f0d2108: 0fc19a31 */ jal roomsCopy /* f0d210c: 24840028 */ addiu $a0,$a0,0x28 -/* f0d2110: 0fc44828 */ jal 0xf1120a0 +/* f0d2110: 0fc44828 */ jal invHasSingleWeaponIncAllGuns /* f0d2114: 2404002e */ li $a0,0x2e /* f0d2118: 3c09800a */ lui $t1,0x800a /* f0d211c: 44808000 */ mtc1 $zero,$f16 @@ -1281,7 +1281,7 @@ glabel var7f1adb00 /* f0d217c: 030e2023 */ subu $a0,$t8,$t6 /* f0d2180: 0081001a */ div $zero,$a0,$at /* f0d2184: 00002012 */ mflo $a0 -/* f0d2188: 0fc0886c */ jal 0xf0221b0 +/* f0d2188: 0fc0886c */ jal chrClearReferences /* f0d218c: 00000000 */ nop /* f0d2190: 3c09800a */ lui $t1,0x800a /* f0d2194: 44808000 */ mtc1 $zero,$f16 @@ -1354,7 +1354,7 @@ glabel var7f1adb00 .JF0f0d2290: /* f0d2290: c424e7e4 */ lwc1 $f4,-0x181c($at) /* f0d2294: 46040302 */ mul.s $f12,$f0,$f4 -/* f0d2298: 0c0068dc */ jal 0x1a370 +/* f0d2298: 0c0068dc */ jal cosf /* f0d229c: 00000000 */ nop /* f0d22a0: 3c09800a */ lui $t1,0x800a /* f0d22a4: 2529a630 */ addiu $t1,$t1,-22992 @@ -1367,7 +1367,7 @@ glabel var7f1adb00 /* f0d22c0: 8df90480 */ lw $t9,0x480($t7) /* f0d22c4: c728001c */ lwc1 $f8,0x1c($t9) /* f0d22c8: 460a4302 */ mul.s $f12,$f8,$f10 -/* f0d22cc: 0c0068df */ jal 0x1a37c +/* f0d22cc: 0c0068df */ jal sinf /* f0d22d0: 00000000 */ nop /* f0d22d4: 3c09800a */ lui $t1,0x800a /* f0d22d8: 2529a630 */ addiu $t1,$t1,-22992 @@ -1429,7 +1429,7 @@ glabel var7f1adb00 .JF0f0d23ac: /* f0d23ac: c428e7ec */ lwc1 $f8,-0x1814($at) /* f0d23b0: 46081302 */ mul.s $f12,$f2,$f8 -/* f0d23b4: 0c0068dc */ jal 0x1a370 +/* f0d23b4: 0c0068dc */ jal cosf /* f0d23b8: 00000000 */ nop /* f0d23bc: 3c09800a */ lui $t1,0x800a /* f0d23c0: 2529a630 */ addiu $t1,$t1,-22992 @@ -1442,7 +1442,7 @@ glabel var7f1adb00 /* f0d23dc: 8f0e0480 */ lw $t6,0x480($t8) /* f0d23e0: c5ca0028 */ lwc1 $f10,0x28($t6) /* f0d23e4: 46045302 */ mul.s $f12,$f10,$f4 -/* f0d23e8: 0c0068df */ jal 0x1a37c +/* f0d23e8: 0c0068df */ jal sinf /* f0d23ec: 00000000 */ nop /* f0d23f0: 3c09800a */ lui $t1,0x800a /* f0d23f4: 2529a630 */ addiu $t1,$t1,-22992 @@ -1528,7 +1528,7 @@ glabel var7f1adb00 /* f0d2520: 3c017f1b */ lui $at,0x7f1b /* f0d2524: c424e7fc */ lwc1 $f4,-0x1804($at) /* f0d2528: 46041302 */ mul.s $f12,$f2,$f4 -/* f0d252c: 0c0068dc */ jal 0x1a370 +/* f0d252c: 0c0068dc */ jal cosf /* f0d2530: 00000000 */ nop /* f0d2534: 3c09800a */ lui $t1,0x800a /* f0d2538: 2529a630 */ addiu $t1,$t1,-22992 @@ -1541,7 +1541,7 @@ glabel var7f1adb00 /* f0d2554: 8df90480 */ lw $t9,0x480($t7) /* f0d2558: c7260028 */ lwc1 $f6,0x28($t9) /* f0d255c: 46083302 */ mul.s $f12,$f6,$f8 -/* f0d2560: 0c0068df */ jal 0x1a37c +/* f0d2560: 0c0068df */ jal sinf /* f0d2564: 00000000 */ nop /* f0d2568: 3c09800a */ lui $t1,0x800a /* f0d256c: 2529a630 */ addiu $t1,$t1,-22992 @@ -1673,7 +1673,7 @@ glabel var7f1adb00 /* f0d274c: 00000000 */ nop /* f0d2750: 45000018 */ bc1f .JF0f0d27b4 /* f0d2754: 00000000 */ nop -/* f0d2758: 0c012838 */ jal 0x4a0e0 +/* f0d2758: 0c012838 */ jal sqrtf /* f0d275c: 46003306 */ mov.s $f12,$f6 /* f0d2760: 3c09800a */ lui $t1,0x800a /* f0d2764: 2529a630 */ addiu $t1,$t1,-22992 @@ -1711,7 +1711,7 @@ glabel var7f1adb00 /* f0d27e0: 00000000 */ nop /* f0d27e4: 4502001a */ bc1fl .JF0f0d2850 /* f0d27e8: c4660044 */ lwc1 $f6,0x44($v1) -/* f0d27ec: 0c012838 */ jal 0x4a0e0 +/* f0d27ec: 0c012838 */ jal sqrtf /* f0d27f0: 46002306 */ mov.s $f12,$f4 /* f0d27f4: 3c09800a */ lui $t1,0x800a /* f0d27f8: 2529a630 */ addiu $t1,$t1,-22992 @@ -1914,7 +1914,7 @@ glabel var7f1adb00 /* f0d2aec: a0391418 */ sb $t9,0x1418($at) /* f0d2af0: a0400000 */ sb $zero,0x0($v0) /* f0d2af4: 3c018007 */ lui $at,0x8007 -/* f0d2af8: 0fc343b9 */ jal 0xf0d0ee4 +/* f0d2af8: 0fc343b9 */ jal eyespyUpdateVertical /* f0d2afc: a020141c */ sb $zero,0x141c($at) /* f0d2b00: 3c09800a */ lui $t1,0x800a /* f0d2b04: 2529a630 */ addiu $t1,$t1,-22992 @@ -1958,7 +1958,7 @@ glabel var7f1adb00 /* f0d2b9c: 00002825 */ move $a1,$zero /* f0d2ba0: 24063e80 */ li $a2,0x3e80 /* f0d2ba4: 24070040 */ li $a3,0x40 -/* f0d2ba8: 0c0041b5 */ jal 0x106d4 +/* f0d2ba8: 0c0041b5 */ jal snd00010718 /* f0d2bac: e7a60014 */ swc1 $f6,0x14($sp) /* f0d2bb0: 3c09800a */ lui $t1,0x800a /* f0d2bb4: 2529a630 */ addiu $t1,$t1,-22992 @@ -1979,7 +1979,7 @@ glabel var7f1adb00 /* f0d2bf0: 00002825 */ move $a1,$zero /* f0d2bf4: 24063e80 */ li $a2,0x3e80 /* f0d2bf8: 24070040 */ li $a3,0x40 -/* f0d2bfc: 0c0041b5 */ jal 0x106d4 +/* f0d2bfc: 0c0041b5 */ jal snd00010718 /* f0d2c00: e7a40014 */ swc1 $f4,0x14($sp) /* f0d2c04: 3c09800a */ lui $t1,0x800a /* f0d2c08: 2529a630 */ addiu $t1,$t1,-22992 @@ -2000,7 +2000,7 @@ glabel var7f1adb00 /* f0d2c44: 00002825 */ move $a1,$zero /* f0d2c48: 24063e80 */ li $a2,0x3e80 /* f0d2c4c: 24070040 */ li $a3,0x40 -/* f0d2c50: 0c0041b5 */ jal 0x106d4 +/* f0d2c50: 0c0041b5 */ jal snd00010718 /* f0d2c54: e7aa0014 */ swc1 $f10,0x14($sp) /* f0d2c58: 3c09800a */ lui $t1,0x800a /* f0d2c5c: 2529a630 */ addiu $t1,$t1,-22992 @@ -2021,7 +2021,7 @@ glabel var7f1adb00 /* f0d2c98: 00002825 */ move $a1,$zero /* f0d2c9c: 24063e80 */ li $a2,0x3e80 /* f0d2ca0: 24070040 */ li $a3,0x40 -/* f0d2ca4: 0c0041b5 */ jal 0x106d4 +/* f0d2ca4: 0c0041b5 */ jal snd00010718 /* f0d2ca8: e7a80014 */ swc1 $f8,0x14($sp) /* f0d2cac: 3c09800a */ lui $t1,0x800a /* f0d2cb0: 2529a630 */ addiu $t1,$t1,-22992 @@ -2041,7 +2041,7 @@ glabel var7f1adb00 /* f0d2ce8: 240500f2 */ li $a1,0xf2 /* f0d2cec: 00003025 */ move $a2,$zero /* f0d2cf0: 2407ffff */ li $a3,-1 -/* f0d2cf4: 0c004230 */ jal 0x108c0 +/* f0d2cf4: 0c004230 */ jal sndStart /* f0d2cf8: e7a60014 */ swc1 $f6,0x14($sp) /* f0d2cfc: 3c09800a */ lui $t1,0x800a /* f0d2d00: 2529a630 */ addiu $t1,$t1,-22992 @@ -2072,7 +2072,7 @@ glabel var7f1adb00 /* f0d2d54: 46040282 */ mul.s $f10,$f0,$f4 /* f0d2d58: 4600520d */ trunc.w.s $f8,$f10 /* f0d2d5c: 44054000 */ mfc1 $a1,$f8 -/* f0d2d60: 0fc25144 */ jal 0xf094510 +/* f0d2d60: 0fc25144 */ jal func0f093790 /* f0d2d64: 00000000 */ nop /* f0d2d68: 3c09800a */ lui $t1,0x800a /* f0d2d6c: 2529a630 */ addiu $t1,$t1,-22992 @@ -2097,7 +2097,7 @@ glabel var7f1adb00 /* f0d2db4: 8fa400e4 */ lw $a0,0xe4($sp) /* f0d2db8: 46064002 */ mul.s $f0,$f8,$f6 /* f0d2dbc: 44050000 */ mfc1 $a1,$f0 -/* f0d2dc0: 0fc0fddb */ jal 0xf03f76c +/* f0d2dc0: 0fc0fddb */ jal chrSetLookAngle /* f0d2dc4: 00000000 */ nop /* f0d2dc8: 3c09800a */ lui $t1,0x800a /* f0d2dcc: 2529a630 */ addiu $t1,$t1,-22992 @@ -2220,7 +2220,7 @@ glabel var7f1adb00 /* f0d2f80: 25040008 */ addiu $a0,$t0,0x8 /* f0d2f84: 25050028 */ addiu $a1,$t0,0x28 /* f0d2f88: 24460008 */ addiu $a2,$v0,0x8 -/* f0d2f8c: 0c00b5d3 */ jal 0x2d74c +/* f0d2f8c: 0c00b5d3 */ jal cdHasLineOfSight /* f0d2f90: 24470028 */ addiu $a3,$v0,0x28 /* f0d2f94: 3c09800a */ lui $t1,0x800a /* f0d2f98: 14400003 */ bnez $v0,.JF0f0d2fa8 @@ -2256,10 +2256,10 @@ glabel var7f1adb00 /* f0d3004: 37380400 */ ori $t8,$t9,0x400 /* f0d3008: 370e0010 */ ori $t6,$t8,0x10 /* f0d300c: adf80018 */ sw $t8,0x18($t7) -/* f0d3010: 0fc2233f */ jal 0xf088cfc +/* f0d3010: 0fc2233f */ jal weaponPlayPickupSound /* f0d3014: adee0018 */ sw $t6,0x18($t7) /* f0d3018: 2404002e */ li $a0,0x2e -/* f0d301c: 0fc22553 */ jal 0xf08954c +/* f0d301c: 0fc22553 */ jal currentPlayerQueuePickupWeaponHudmsg /* f0d3020: 00002825 */ move $a1,$zero /* f0d3024: 3c09800a */ lui $t1,0x800a /* f0d3028: 2529a630 */ addiu $t1,$t1,-22992 @@ -2267,7 +2267,7 @@ glabel var7f1adb00 /* f0d3030: 24050001 */ li $a1,0x1 /* f0d3034: 3406ffff */ li $a2,0xffff /* f0d3038: 8f380480 */ lw $t8,0x480($t9) -/* f0d303c: 0fc24d13 */ jal 0xf09344c +/* f0d303c: 0fc24d13 */ jal func0f0926bc /* f0d3040: 8f040000 */ lw $a0,0x0($t8) /* f0d3044: 3c09800a */ lui $t1,0x800a /* f0d3048: 2529a630 */ addiu $t1,$t1,-22992 @@ -2279,13 +2279,13 @@ glabel var7f1adb00 /* f0d3060: 03382023 */ subu $a0,$t9,$t8 /* f0d3064: 0081001a */ div $zero,$a0,$at /* f0d3068: 00002012 */ mflo $a0 -/* f0d306c: 0fc0886c */ jal 0xf0221b0 +/* f0d306c: 0fc0886c */ jal chrClearReferences /* f0d3070: 00000000 */ nop /* f0d3074: 8faf00e4 */ lw $t7,0xe4($sp) .JF0f0d3078: /* f0d3078: 24050001 */ li $a1,0x1 /* f0d307c: 8de4001c */ lw $a0,0x1c($t7) -/* f0d3080: 0fc22e56 */ jal 0xf08b958 +/* f0d3080: 0fc22e56 */ jal coordTriggerProxies /* f0d3084: 24840008 */ addiu $a0,$a0,0x8 /* f0d3088: 8fbf002c */ lw $ra,0x2c($sp) .JF0f0d308c: diff --git a/src/game/bondgun.c b/src/game/bondgun.c index 954e99340..0b0f1a1d6 100644 --- a/src/game/bondgun.c +++ b/src/game/bondgun.c @@ -584,10 +584,10 @@ glabel var7f1ac1b0 /* f098fbc: 00809025 */ move $s2,$a0 /* f098fc0: 1701000f */ bne $t8,$at,.JF0f099000 /* f098fc4: a08f0690 */ sb $t7,0x690($a0) -/* f098fc8: 0fc263bf */ jal 0xf098efc +/* f098fc8: 0fc263bf */ jal bgun0f09815c /* f098fcc: 00000000 */ nop /* f098fd0: 46000506 */ mov.s $f20,$f0 -/* f098fd4: 0c00747e */ jal 0x1d1f8 +/* f098fd4: 0c00747e */ jal modelGetNumAnimFrames /* f098fd8: 26440384 */ addiu $a0,$s2,0x384 /* f098fdc: 2459ffff */ addiu $t9,$v0,-1 /* f098fe0: 44992000 */ mtc1 $t9,$f4 @@ -641,7 +641,7 @@ glabel var7f1ac1b0 /* f099094: 81f80de4 */ lb $t8,0xde4($t7) /* f099098: 13000016 */ beqz $t8,.JF0f0990f4 /* f09909c: 00000000 */ nop -/* f0990a0: 0c004b60 */ jal 0x12d80 +/* f0990a0: 0c004b60 */ jal random /* f0990a4: 00000000 */ nop /* f0990a8: 44822000 */ mtc1 $v0,$f4 /* f0990ac: 3c014f80 */ lui $at,0x4f80 @@ -677,15 +677,15 @@ glabel var7f1ac1b0 /* f09911c: 03202825 */ move $a1,$t9 /* f099120: 00003025 */ move $a2,$zero /* f099124: e7a20014 */ swc1 $f2,0x14($sp) -/* f099128: 0c00772b */ jal 0x1dcac +/* f099128: 0c00772b */ jal modelSetAnimation /* f09912c: e7a60010 */ swc1 $f6,0x10($sp) -/* f099130: 0c00747e */ jal 0x1d1f8 +/* f099130: 0c00747e */ jal modelGetNumAnimFrames /* f099134: 02802025 */ move $a0,$s4 /* f099138: 44825000 */ mtc1 $v0,$f10 /* f09913c: 02802025 */ move $a0,$s4 /* f099140: 468052a0 */ cvt.s.w $f10,$f10 /* f099144: 44055000 */ mfc1 $a1,$f10 -/* f099148: 0c0077fe */ jal 0x1dff8 +/* f099148: 0c0077fe */ jal model0001e018 /* f09914c: 00000000 */ nop /* f099150: 1000000b */ b .JF0f099180 /* f099154: 240affff */ li $t2,-1 @@ -697,14 +697,14 @@ glabel var7f1ac1b0 /* f099168: 01202825 */ move $a1,$t1 /* f09916c: 00003025 */ move $a2,$zero /* f099170: e7a20014 */ swc1 $f2,0x14($sp) -/* f099174: 0c00772b */ jal 0x1dcac +/* f099174: 0c00772b */ jal modelSetAnimation /* f099178: e7b00010 */ swc1 $f16,0x10($sp) /* f09917c: 240affff */ li $t2,-1 .JF0f099180: /* f099180: 240b0002 */ li $t3,0x2 /* f099184: ae4a0680 */ sw $t2,0x680($s2) /* f099188: ae4b068c */ sw $t3,0x68c($s2) -/* f09918c: 0c00749a */ jal 0x1d268 +/* f09918c: 0c00749a */ jal modelGetAbsAnimSpeed /* f099190: 02802025 */ move $a0,$s4 /* f099194: 8e4c0684 */ lw $t4,0x684($s2) /* f099198: 44801000 */ mtc1 $zero,$f2 @@ -721,7 +721,7 @@ glabel var7f1ac1b0 /* f0991c0: ae400684 */ sw $zero,0x684($s2) /* f0991c4: e6420688 */ swc1 $f2,0x688($s2) .JF0f0991c8: -/* f0991c8: 0fc263bf */ jal 0xf098efc +/* f0991c8: 0fc263bf */ jal bgun0f09815c /* f0991cc: 02402025 */ move $a0,$s2 /* f0991d0: 44805000 */ mtc1 $zero,$f10 /* f0991d4: c6460688 */ lwc1 $f6,0x688($s2) @@ -851,7 +851,7 @@ glabel var7f1ac1b0 /* f099390: 00000000 */ nop /* f099394: 45020059 */ bc1fl .JF0f0994fc /* f099398: 8fac014c */ lw $t4,0x14c($sp) -/* f09939c: 0fc263bf */ jal 0xf098efc +/* f09939c: 0fc263bf */ jal bgun0f09815c /* f0993a0: 02402025 */ move $a0,$s2 /* f0993a4: 962a0002 */ lhu $t2,0x2($s1) /* f0993a8: 3c014f80 */ lui $at,0x4f80 @@ -872,14 +872,14 @@ glabel var7f1ac1b0 /* f0993e0: 00000000 */ nop /* f0993e4: 45000011 */ bc1f .JF0f09942c /* f0993e8: 00000000 */ nop -/* f0993ec: 0c00749a */ jal 0x1d268 +/* f0993ec: 0c00749a */ jal modelGetAbsAnimSpeed /* f0993f0: e7a20084 */ swc1 $f2,0x84($sp) /* f0993f4: c7a20084 */ lwc1 $f2,0x84($sp) /* f0993f8: 02802025 */ move $a0,$s4 /* f0993fc: 46001283 */ div.s $f10,$f2,$f0 /* f099400: 4600540d */ trunc.w.s $f16,$f10 /* f099404: 440c8000 */ mfc1 $t4,$f16 -/* f099408: 0c00749a */ jal 0x1d268 +/* f099408: 0c00749a */ jal modelGetAbsAnimSpeed /* f09940c: ae4c0684 */ sw $t4,0x684($s2) /* f099410: 8e4d0684 */ lw $t5,0x684($s2) /* f099414: 448d9000 */ mtc1 $t5,$f18 @@ -938,7 +938,7 @@ glabel var7f1ac1b0 /* f0994d4: e6520688 */ swc1 $f18,0x688($s2) /* f0994d8: 44050000 */ mfc1 $a1,$f0 /* f0994dc: 46000506 */ mov.s $f20,$f0 -/* f0994e0: 0c0077fe */ jal 0x1dff8 +/* f0994e0: 0c0077fe */ jal model0001e018 /* f0994e4: e7a00080 */ swc1 $f0,0x80($sp) /* f0994e8: 924a0691 */ lbu $t2,0x691($s2) /* f0994ec: c7ae0080 */ lwc1 $f14,0x80($sp) @@ -963,7 +963,7 @@ glabel var7f1ac1b0 /* f09952c: afa3005c */ sw $v1,0x5c($sp) /* f099530: afa2007c */ sw $v0,0x7c($sp) /* f099534: 02403025 */ move $a2,$s2 -/* f099538: 0fc26305 */ jal 0xf098c14 +/* f099538: 0fc26305 */ jal bgunSetPartVisible /* f09953c: 8fa70164 */ lw $a3,0x164($sp) /* f099540: 8fa2007c */ lw $v0,0x7c($sp) /* f099544: 8fa3005c */ lw $v1,0x5c($sp) @@ -976,13 +976,13 @@ glabel var7f1ac1b0 /* f09955c: 02802025 */ move $a0,$s4 .JF0f099560: /* f099560: 3c054080 */ lui $a1,0x4080 -/* f099564: 0c0077e3 */ jal 0x1df8c +/* f099564: 0c0077e3 */ jal modelSetAnimPlaySpeed /* f099568: 24060000 */ li $a2,0x0 /* f09956c: 02802025 */ move $a0,$s4 /* f099570: 8e450684 */ lw $a1,0x684($s2) -/* f099574: 0c007b7e */ jal 0x1edf8 +/* f099574: 0c007b7e */ jal model0001ee18 /* f099578: 24060001 */ li $a2,0x1 -/* f09957c: 0fc263bf */ jal 0xf098efc +/* f09957c: 0fc263bf */ jal bgun0f09815c /* f099580: 02402025 */ move $a0,$s2 /* f099584: 8e4306b0 */ lw $v1,0x6b0($s2) /* f099588: 46000386 */ mov.s $f14,$f0 @@ -1051,7 +1051,7 @@ glabel var7f1ac1b0 /* f099674: 24070040 */ li $a3,0x40 /* f099678: 00008825 */ move $s1,$zero /* f09967c: afae0010 */ sw $t6,0x10($sp) -/* f099680: 0c0041b5 */ jal 0x106d4 +/* f099680: 0c0041b5 */ jal snd00010718 /* f099684: e7aa0014 */ swc1 $f10,0x14($sp) /* f099688: 8fa80078 */ lw $t0,0x78($sp) /* f09968c: 10000028 */ b .JF0f099730 @@ -1072,7 +1072,7 @@ glabel var7f1ac1b0 /* f0996c4: 24067fff */ li $a2,0x7fff /* f0996c8: 24070040 */ li $a3,0x40 /* f0996cc: afa90010 */ sw $t1,0x10($sp) -/* f0996d0: 0c0041b5 */ jal 0x106d4 +/* f0996d0: 0c0041b5 */ jal snd00010718 /* f0996d4: e7b00014 */ swc1 $f16,0x14($sp) /* f0996d8: 8fa80078 */ lw $t0,0x78($sp) /* f0996dc: 10000014 */ b .JF0f099730 @@ -3405,7 +3405,7 @@ glabel bgun0f098df8 /* f099ce0: afa40038 */ sw $a0,0x38($sp) /* f099ce4: afa60040 */ sw $a2,0x40($sp) /* f099ce8: afa70044 */ sw $a3,0x44($sp) -/* f099cec: 0fc2c84e */ jal 0xf0b2138 +/* f099cec: 0fc2c84e */ jal weaponGetFunction /* f099cf0: 00c02025 */ move $a0,$a2 /* f099cf4: 5040005f */ beqzl $v0,.JF0f099e74 /* f099cf8: 8fbf001c */ lw $ra,0x1c($sp) @@ -3429,7 +3429,7 @@ glabel bgun0f098df8 /* f099d40: afa3002c */ sw $v1,0x2c($sp) /* f099d44: afa70024 */ sw $a3,0x24($sp) /* f099d48: afa60030 */ sw $a2,0x30($sp) -/* f099d4c: 0fc262ab */ jal 0xf098aac +/* f099d4c: 0fc262ab */ jal bgunGetUnequippedReloadIndex /* f099d50: afa50020 */ sw $a1,0x20($sp) /* f099d54: 3c0c8009 */ lui $t4,0x8009 /* f099d58: 918c8e74 */ lbu $t4,-0x718c($t4) @@ -3650,18 +3650,18 @@ glabel bgunTickIncIdle /* f09a0e8: 00c08025 */ move $s0,$a2 /* f09a0ec: afa40040 */ sw $a0,0x40($sp) /* f09a0f0: afa50044 */ sw $a1,0x44($sp) -/* f09a0f4: 0fc2a73f */ jal 0xf0a9cfc +/* f09a0f4: 0fc2a73f */ jal bgunIsUsingSecondaryFunction /* f09a0f8: afa7004c */ sw $a3,0x4c($sp) /* f09a0fc: 44802000 */ mtc1 $zero,$f4 /* f09a100: afa20038 */ sw $v0,0x38($sp) /* f09a104: a20005dc */ sb $zero,0x5dc($s0) /* f09a108: ae000558 */ sw $zero,0x558($s0) /* f09a10c: e60405fc */ swc1 $f4,0x5fc($s0) -/* f09a110: 0fc2731c */ jal 0xf09cc70 +/* f09a110: 0fc2731c */ jal bgunIsReadyToSwitch /* f09a114: 8fa40044 */ lw $a0,0x44($sp) /* f09a118: 10400007 */ beqz $v0,.JF0f09a138 /* f09a11c: 8fa40044 */ lw $a0,0x44($sp) -/* f09a120: 0fc2770c */ jal 0xf09dc30 +/* f09a120: 0fc2770c */ jal bgunSetState /* f09a124: 24050005 */ li $a1,0x5 /* f09a128: 50400004 */ beqzl $v0,.JF0f09a13c /* f09a12c: 8fae0038 */ lw $t6,0x38($sp) @@ -3684,7 +3684,7 @@ glabel bgunTickIncIdle /* f09a164: 11600106 */ beqz $t3,.JF0f09a580 /* f09a168: a20a0690 */ sb $t2,0x690($s0) /* f09a16c: 92040003 */ lbu $a0,0x3($s0) -/* f09a170: 0fc266dd */ jal 0xf099b74 +/* f09a170: 0fc266dd */ jal bgun0f098ca0 /* f09a174: 8fa50040 */ lw $a1,0x40($sp) /* f09a178: 92030003 */ lbu $v1,0x3($s0) /* f09a17c: 8fac0038 */ lw $t4,0x38($sp) @@ -3704,7 +3704,7 @@ glabel bgunTickIncIdle /* f09a1b4: 8fa50040 */ lw $a1,0x40($sp) /* f09a1b8: 02003025 */ move $a2,$s0 /* f09a1bc: afa7002c */ sw $a3,0x2c($sp) -/* f09a1c0: 0fc266dd */ jal 0xf099b74 +/* f09a1c0: 0fc266dd */ jal bgun0f098ca0 /* f09a1c4: afa20034 */ sw $v0,0x34($sp) /* f09a1c8: 8fa7002c */ lw $a3,0x2c($sp) /* f09a1cc: 04410002 */ bgez $v0,.JF0f09a1d8 @@ -3726,7 +3726,7 @@ glabel bgunTickIncIdle /* f09a208: a20b0003 */ sb $t3,0x3($s0) /* f09a20c: afa80034 */ sw $t0,0x34($sp) /* f09a210: afa7002c */ sw $a3,0x2c($sp) -/* f09a214: 0fc2770c */ jal 0xf09dc30 +/* f09a214: 0fc2770c */ jal bgunSetState /* f09a218: 8fa40044 */ lw $a0,0x44($sp) /* f09a21c: 8fa7002c */ lw $a3,0x2c($sp) /* f09a220: 10400006 */ beqz $v0,.JF0f09a23c @@ -3745,7 +3745,7 @@ glabel bgunTickIncIdle /* f09a24c: 318dfffd */ andi $t5,$t4,0xfffd /* f09a250: a20d0690 */ sb $t5,0x690($s0) /* f09a254: afa80034 */ sw $t0,0x34($sp) -/* f09a258: 0fc2770c */ jal 0xf09dc30 +/* f09a258: 0fc2770c */ jal bgunSetState /* f09a25c: 8fa40044 */ lw $a0,0x44($sp) /* f09a260: 10400003 */ beqz $v0,.JF0f09a270 /* f09a264: 8fa80034 */ lw $t0,0x34($sp) @@ -3755,7 +3755,7 @@ glabel bgunTickIncIdle /* f09a270: 05010071 */ bgez $t0,.JF0f09a438 /* f09a274: 8fae0040 */ lw $t6,0x40($sp) /* f09a278: 8dc40000 */ lw $a0,0x0($t6) -/* f09a27c: 0fc2ca10 */ jal 0xf0b2840 +/* f09a27c: 0fc2ca10 */ jal weaponHasFlag /* f09a280: 24050001 */ li $a1,0x1 /* f09a284: 1040000f */ beqz $v0,.JF0f09a2c4 /* f09a288: 8faf0040 */ lw $t7,0x40($sp) @@ -3768,7 +3768,7 @@ glabel bgunTickIncIdle /* f09a2a4: 13210007 */ beq $t9,$at,.JF0f09a2c4 /* f09a2a8: 00000000 */ nop .JF0f09a2ac: -/* f09a2ac: 0fc2770c */ jal 0xf09dc30 +/* f09a2ac: 0fc2770c */ jal bgunSetState /* f09a2b0: 24050008 */ li $a1,0x8 /* f09a2b4: 10400003 */ beqz $v0,.JF0f09a2c4 /* f09a2b8: 00000000 */ nop @@ -3810,13 +3810,13 @@ glabel bgunTickIncIdle /* f09a33c: 8fae0044 */ lw $t6,0x44($sp) /* f09a340: 920c0003 */ lbu $t4,0x3($s0) /* f09a344: 240d0001 */ li $t5,0x1 -/* f09a348: 0fc266dd */ jal 0xf099b74 +/* f09a348: 0fc266dd */ jal bgun0f098ca0 /* f09a34c: 01ac2023 */ subu $a0,$t5,$t4 /* f09a350: 920e0003 */ lbu $t6,0x3($s0) /* f09a354: 24190001 */ li $t9,0x1 /* f09a358: afa20030 */ sw $v0,0x30($sp) /* f09a35c: 02002025 */ move $a0,$s0 -/* f09a360: 0fc26820 */ jal 0xf09a080 +/* f09a360: 0fc26820 */ jal bgun0f099188 /* f09a364: 032e2823 */ subu $a1,$t9,$t6 /* f09a368: 1040001a */ beqz $v0,.JF0f09a3d4 /* f09a36c: 8fa30030 */ lw $v1,0x30($sp) @@ -3834,7 +3834,7 @@ glabel bgunTickIncIdle /* f09a39c: 2403ffff */ li $v1,-1 /* f09a3a0: 920c0003 */ lbu $t4,0x3($s0) /* f09a3a4: afa30030 */ sw $v1,0x30($sp) -/* f09a3a8: 0fc2c84e */ jal 0xf0b2138 +/* f09a3a8: 0fc2c84e */ jal weaponGetFunction /* f09a3ac: 032c2823 */ subu $a1,$t9,$t4 /* f09a3b0: 8c4e0000 */ lw $t6,0x0($v0) /* f09a3b4: 24010003 */ li $at,0x3 @@ -3854,7 +3854,7 @@ glabel bgunTickIncIdle /* f09a3e8: a20a0690 */ sb $t2,0x690($s0) .JF0f09a3ec: /* f09a3ec: 8d640000 */ lw $a0,0x0($t3) -/* f09a3f0: 0fc2ca10 */ jal 0xf0b2840 +/* f09a3f0: 0fc2ca10 */ jal weaponHasFlag /* f09a3f4: 3c050400 */ lui $a1,0x400 /* f09a3f8: 50400006 */ beqzl $v0,.JF0f09a414 /* f09a3fc: 920c0690 */ lbu $t4,0x690($s0) @@ -3867,7 +3867,7 @@ glabel bgunTickIncIdle /* f09a414: 24050007 */ li $a1,0x7 /* f09a418: 358e0002 */ ori $t6,$t4,0x2 /* f09a41c: a20e0690 */ sb $t6,0x690($s0) -/* f09a420: 0fc2770c */ jal 0xf09dc30 +/* f09a420: 0fc2770c */ jal bgunSetState /* f09a424: 8fa40044 */ lw $a0,0x44($sp) /* f09a428: 50400056 */ beqzl $v0,.JF0f09a584 /* f09a42c: 8fae0044 */ lw $t6,0x44($sp) @@ -3888,7 +3888,7 @@ glabel bgunTickIncIdle /* f09a464: 24050003 */ li $a1,0x3 /* f09a468: 314bff7f */ andi $t3,$t2,0xff7f /* f09a46c: a20b0690 */ sb $t3,0x690($s0) -/* f09a470: 0fc2770c */ jal 0xf09dc30 +/* f09a470: 0fc2770c */ jal bgunSetState /* f09a474: 8fa40044 */ lw $a0,0x44($sp) /* f09a478: 50400042 */ beqzl $v0,.JF0f09a584 /* f09a47c: 8fae0044 */ lw $t6,0x44($sp) @@ -3897,7 +3897,7 @@ glabel bgunTickIncIdle /* f09a488: ae00001c */ sw $zero,0x1c($s0) .JF0f09a48c: /* f09a48c: ae000018 */ sw $zero,0x18($s0) -/* f09a490: 0fc2770c */ jal 0xf09dc30 +/* f09a490: 0fc2770c */ jal bgunSetState /* f09a494: 8fa40044 */ lw $a0,0x44($sp) /* f09a498: 5040003a */ beqzl $v0,.JF0f09a584 /* f09a49c: 8fae0044 */ lw $t6,0x44($sp) @@ -3933,7 +3933,7 @@ glabel bgunTickIncIdle /* f09a50c: ae000014 */ sw $zero,0x14($s0) /* f09a510: a21906d7 */ sb $t9,0x6d7($s0) /* f09a514: afa80034 */ sw $t0,0x34($sp) -/* f09a518: 0fc2770c */ jal 0xf09dc30 +/* f09a518: 0fc2770c */ jal bgunSetState /* f09a51c: 8fa40044 */ lw $a0,0x44($sp) /* f09a520: 10400003 */ beqz $v0,.JF0f09a530 /* f09a524: 8fa80034 */ lw $t0,0x34($sp) @@ -3955,7 +3955,7 @@ glabel bgunTickIncIdle /* f09a55c: 8fae0044 */ lw $t6,0x44($sp) /* f09a560: 05000007 */ bltz $t0,.JF0f09a580 /* f09a564: 8fa40044 */ lw $a0,0x44($sp) -/* f09a568: 0fc2770c */ jal 0xf09dc30 +/* f09a568: 0fc2770c */ jal bgunSetState /* f09a56c: 24050001 */ li $a1,0x1 /* f09a570: 50400004 */ beqzl $v0,.JF0f09a584 /* f09a574: 8fae0044 */ lw $t6,0x44($sp) @@ -3976,7 +3976,7 @@ glabel bgunTickIncIdle /* f09a5a8: 00095f40 */ sll $t3,$t1,0x1d /* f09a5ac: 05610005 */ bgez $t3,.JF0f09a5c4 /* f09a5b0: 000c6080 */ sll $t4,$t4,0x2 -/* f09a5b4: 0fc28b57 */ jal 0xf0a2d5c +/* f09a5b4: 0fc28b57 */ jal bgunAutoSwitchWeapon /* f09a5b8: 00000000 */ nop /* f09a5bc: 10000027 */ b .JF0f09a65c /* f09a5c0: 00001025 */ move $v0,$zero @@ -4010,7 +4010,7 @@ glabel bgunTickIncIdle /* f09a624: 51a00005 */ beqzl $t5,.JF0f09a63c /* f09a628: 904c0690 */ lbu $t4,0x690($v0) .JF0f09a62c: -/* f09a62c: 0fc28b57 */ jal 0xf0a2d5c +/* f09a62c: 0fc28b57 */ jal bgunAutoSwitchWeapon /* f09a630: afa20024 */ sw $v0,0x24($sp) /* f09a634: 8fa20024 */ lw $v0,0x24($sp) /* f09a638: 904c0690 */ lbu $t4,0x690($v0) @@ -5628,7 +5628,7 @@ glabel var7f1ac1b8 /* f09ab40: 00c08025 */ move $s0,$a2 /* f09ab44: afa5003c */ sw $a1,0x3c($sp) /* f09ab48: afa70044 */ sw $a3,0x44($sp) -/* f09ab4c: 0fc2c83f */ jal 0xf0b20fc +/* f09ab4c: 0fc2c83f */ jal gsetGetWeaponFunction /* f09ab50: 00c02025 */ move $a0,$a2 /* f09ab54: 3c0e800a */ lui $t6,0x800a /* f09ab58: 8dcea8b4 */ lw $t6,-0x574c($t6) @@ -5640,7 +5640,7 @@ glabel var7f1ac1b8 /* f09ab70: 8e190618 */ lw $t9,0x618($s0) /* f09ab74: ae00068c */ sw $zero,0x68c($s0) /* f09ab78: ae180680 */ sw $t8,0x680($s0) -/* f09ab7c: 0fc2770c */ jal 0xf09dc30 +/* f09ab7c: 0fc2770c */ jal bgunSetState /* f09ab80: 8fa4003c */ lw $a0,0x3c($sp) /* f09ab84: 50400004 */ beqzl $v0,.JF0f09ab98 /* f09ab88: 8e190618 */ lw $t9,0x618($s0) @@ -5740,7 +5740,7 @@ glabel var7f1ac1b8 /* f09ace4: 8fa5003c */ lw $a1,0x3c($sp) /* f09ace8: 1141001e */ beq $t2,$at,.JF0f09ad64 /* f09acec: 00000000 */ nop -/* f09acf0: 0fc265ee */ jal 0xf0997b8 +/* f09acf0: 0fc265ee */ jal bgunStartAnimation /* f09acf4: 02003025 */ move $a2,$s0 /* f09acf8: 920b06d6 */ lbu $t3,0x6d6($s0) /* f09acfc: 8fa30038 */ lw $v1,0x38($sp) @@ -5775,7 +5775,7 @@ glabel var7f1ac1b8 /* f09ad64: 10000007 */ b .JF0f09ad84 /* f09ad68: ae090608 */ sw $t1,0x608($s0) .JF0f09ad6c: -/* f09ad6c: 0fc2770c */ jal 0xf09dc30 +/* f09ad6c: 0fc2770c */ jal bgunSetState /* f09ad70: 00002825 */ move $a1,$zero /* f09ad74: 10400003 */ beqz $v0,.JF0f09ad84 /* f09ad78: 00000000 */ nop @@ -5796,7 +5796,7 @@ glabel var7f1ac1b8 /* f09adac: 332d0004 */ andi $t5,$t9,0x4 /* f09adb0: 51a00037 */ beqzl $t5,.JF0f09ae90 /* f09adb4: 8e19060c */ lw $t9,0x60c($s0) -/* f09adb8: 0fc26647 */ jal 0xf09991c +/* f09adb8: 0fc26647 */ jal bgun0f098a44 /* f09adbc: 24050001 */ li $a1,0x1 /* f09adc0: 5040001f */ beqzl $v0,.JF0f09ae40 /* f09adc4: ae00060c */ sw $zero,0x60c($s0) @@ -5807,14 +5807,14 @@ glabel var7f1ac1b8 /* f09add8: 17000019 */ bnez $t8,.JF0f09ae40 /* f09addc: 24070001 */ li $a3,0x1 /* f09ade0: 92040003 */ lbu $a0,0x3($s0) -/* f09ade4: 0fc26733 */ jal 0xf099ccc +/* f09ade4: 0fc26733 */ jal bgun0f098df8 /* f09ade8: afa00010 */ sw $zero,0x10($sp) /* f09adec: 8e0a060c */ lw $t2,0x60c($s0) /* f09adf0: 92040003 */ lbu $a0,0x3($s0) /* f09adf4: 02003025 */ move $a2,$s0 /* f09adf8: 35480010 */ ori $t0,$t2,0x10 /* f09adfc: ae08060c */ sw $t0,0x60c($s0) -/* f09ae00: 0fc266dd */ jal 0xf099b74 +/* f09ae00: 0fc266dd */ jal bgun0f098ca0 /* f09ae04: 8fa50038 */ lw $a1,0x38($sp) /* f09ae08: 28410002 */ slti $at,$v0,0x2 /* f09ae0c: 54200005 */ bnezl $at,.JF0f09ae24 @@ -5859,14 +5859,14 @@ glabel var7f1ac1b8 /* f09ae94: 332d0010 */ andi $t5,$t9,0x10 /* f09ae98: 55a0000e */ bnezl $t5,.JF0f09aed4 /* f09ae9c: 8e18068c */ lw $t8,0x68c($s0) -/* f09aea0: 0fc26647 */ jal 0xf09991c +/* f09aea0: 0fc26647 */ jal bgun0f098a44 /* f09aea4: 24050001 */ li $a1,0x1 /* f09aea8: 10400009 */ beqz $v0,.JF0f09aed0 /* f09aeac: 8fa50038 */ lw $a1,0x38($sp) /* f09aeb0: 92040003 */ lbu $a0,0x3($s0) /* f09aeb4: afa00010 */ sw $zero,0x10($sp) /* f09aeb8: 02003025 */ move $a2,$s0 -/* f09aebc: 0fc26733 */ jal 0xf099ccc +/* f09aebc: 0fc26733 */ jal bgun0f098df8 /* f09aec0: 00003825 */ move $a3,$zero /* f09aec4: 8e09060c */ lw $t1,0x60c($s0) /* f09aec8: 352a0010 */ ori $t2,$t1,0x10 @@ -5878,7 +5878,7 @@ glabel var7f1ac1b8 /* f09aed8: 8fa4003c */ lw $a0,0x3c($sp) /* f09aedc: 53010008 */ beql $t8,$at,.JF0f09af00 /* f09aee0: 8e030608 */ lw $v1,0x608($s0) -/* f09aee4: 0fc2770c */ jal 0xf09dc30 +/* f09aee4: 0fc2770c */ jal bgunSetState /* f09aee8: 00002825 */ move $a1,$zero /* f09aeec: 50400004 */ beqzl $v0,.JF0f09af00 /* f09aef0: 8e030608 */ lw $v1,0x608($s0) @@ -5918,7 +5918,7 @@ glabel var7f1ac1b8 /* f09af68: 46083282 */ mul.s $f10,$f6,$f8 /* f09af6c: 46105483 */ div.s $f18,$f10,$f16 /* f09af70: 44059000 */ mfc1 $a1,$f18 -/* f09af74: 0fc2699c */ jal 0xf09a670 +/* f09af74: 0fc2699c */ jal bgun0f099780 /* f09af78: 00000000 */ nop /* f09af7c: 8e030608 */ lw $v1,0x608($s0) .JF0f09af80: @@ -5946,7 +5946,7 @@ glabel var7f1ac1b8 /* f09afd0: 8dc4000c */ lw $a0,0xc($t6) /* f09afd4: 50800007 */ beqzl $a0,.JF0f09aff4 /* f09afd8: 8e0d060c */ lw $t5,0x60c($s0) -/* f09afdc: 0fc265ee */ jal 0xf0997b8 +/* f09afdc: 0fc265ee */ jal bgunStartAnimation /* f09afe0: 02003025 */ move $a2,$s0 /* f09afe4: 920c0690 */ lbu $t4,0x690($s0) /* f09afe8: 358f0040 */ ori $t7,$t4,0x40 @@ -5959,7 +5959,7 @@ glabel var7f1ac1b8 /* f09b000: 15200004 */ bnez $t1,.JF0f09b014 /* f09b004: 00003825 */ move $a3,$zero /* f09b008: 92040003 */ lbu $a0,0x3($s0) -/* f09b00c: 0fc26733 */ jal 0xf099ccc +/* f09b00c: 0fc26733 */ jal bgun0f098df8 /* f09b010: afa00010 */ sw $zero,0x10($sp) .JF0f09b014: /* f09b014: 3c19800a */ lui $t9,0x800a @@ -5972,7 +5972,7 @@ glabel var7f1ac1b8 /* f09b030: 8d580000 */ lw $t8,0x0($t2) /* f09b034: 53010027 */ beql $t8,$at,.JF0f09b0d4 /* f09b038: 8e0a001c */ lw $t2,0x1c($s0) -/* f09b03c: 0fc27b28 */ jal 0xf09eca0 +/* f09b03c: 0fc27b28 */ jal bgun0f09dd7c /* f09b040: 00000000 */ nop /* f09b044: 10400022 */ beqz $v0,.JF0f09b0d0 /* f09b048: 3c088007 */ lui $t0,0x8007 @@ -6008,7 +6008,7 @@ glabel var7f1ac1b8 /* f09b0bc: 2405804f */ li $a1,-32689 /* f09b0c0: 00003025 */ move $a2,$zero /* f09b0c4: 2407ffff */ li $a3,-1 -/* f09b0c8: 0c004230 */ jal 0x108c0 +/* f09b0c8: 0c004230 */ jal sndStart /* f09b0cc: e7a40014 */ swc1 $f4,0x14($sp) .JF0f09b0d0: /* f09b0d0: 8e0a001c */ lw $t2,0x1c($s0) @@ -6032,7 +6032,7 @@ glabel var7f1ac1b8 /* f09b114: 10000004 */ b .JF0f09b128 /* f09b118: ae000018 */ sw $zero,0x18($s0) .JF0f09b11c: -/* f09b11c: 0fc2699c */ jal 0xf09a670 +/* f09b11c: 0fc2699c */ jal bgun0f099780 /* f09b120: 34a55dd8 */ ori $a1,$a1,0x5dd8 /* f09b124: 8e030608 */ lw $v1,0x608($s0) .JF0f09b128: @@ -6058,17 +6058,17 @@ glabel var7f1ac1b8 /* f09b168: 29410017 */ slti $at,$t2,0x17 /* f09b16c: 50200010 */ beqzl $at,.JF0f09b1b0 /* f09b170: ae000020 */ sw $zero,0x20($s0) -/* f09b174: 0fc2cad4 */ jal 0xf0b2b50 +/* f09b174: 0fc2cad4 */ jal weaponGetModelNum2 /* f09b178: 8f040000 */ lw $a0,0x0($t8) /* f09b17c: 1040000b */ beqz $v0,.JF0f09b1ac /* f09b180: 8fa80038 */ lw $t0,0x38($sp) /* f09b184: 8d040000 */ lw $a0,0x0($t0) -/* f09b188: 0fc2ca10 */ jal 0xf0b2840 +/* f09b188: 0fc2ca10 */ jal weaponHasFlag /* f09b18c: 24050040 */ li $a1,0x40 /* f09b190: 10400006 */ beqz $v0,.JF0f09b1ac /* f09b194: 8fae0038 */ lw $t6,0x38($sp) /* f09b198: 8dc40000 */ lw $a0,0x0($t6) -/* f09b19c: 0fc2ca10 */ jal 0xf0b2840 +/* f09b19c: 0fc2ca10 */ jal weaponHasFlag /* f09b1a0: 24050080 */ li $a1,0x80 /* f09b1a4: 5040000c */ beqzl $v0,.JF0f09b1d8 /* f09b1a8: 8e0b001c */ lw $t3,0x1c($s0) @@ -6078,7 +6078,7 @@ glabel var7f1ac1b8 /* f09b1b0: ae00001c */ sw $zero,0x1c($s0) /* f09b1b4: ae000018 */ sw $zero,0x18($s0) /* f09b1b8: 8fa4003c */ lw $a0,0x3c($sp) -/* f09b1bc: 0fc2770c */ jal 0xf09dc30 +/* f09b1bc: 0fc2770c */ jal bgunSetState /* f09b1c0: 00002825 */ move $a1,$zero /* f09b1c4: 50400013 */ beqzl $v0,.JF0f09b214 /* f09b1c8: 00001025 */ move $v0,$zero @@ -6098,7 +6098,7 @@ glabel var7f1ac1b8 /* f09b1fc: 460a4402 */ mul.s $f16,$f8,$f10 /* f09b200: 46128103 */ div.s $f4,$f16,$f18 /* f09b204: 44052000 */ mfc1 $a1,$f4 -/* f09b208: 0fc2699c */ jal 0xf09a670 +/* f09b208: 0fc2699c */ jal bgun0f099780 /* f09b20c: 00000000 */ nop .JF0f09b210: /* f09b210: 00001025 */ move $v0,$zero @@ -11046,13 +11046,13 @@ glabel bgunTick /* f09dd28: 24110014 */ li $s1,0x14 /* f09dd2c: 02602025 */ move $a0,$s3 /* f09dd30: afa3003c */ sw $v1,0x3c($sp) -/* f09dd34: 0fc266c8 */ jal 0xf099b20 +/* f09dd34: 0fc266c8 */ jal bgunGetWeaponInfo /* f09dd38: 02402825 */ move $a1,$s2 /* f09dd3c: 8fa3003c */ lw $v1,0x3c($sp) /* f09dd40: 3c02800a */ lui $v0,0x800a /* f09dd44: 8c50a668 */ lw $s0,-0x5998($v0) /* f09dd48: 24640384 */ addiu $a0,$v1,0x384 -/* f09dd4c: 0c00749a */ jal 0x1d268 +/* f09dd4c: 0c00749a */ jal modelGetAbsAnimSpeed /* f09dd50: ac700684 */ sw $s0,0x684($v1) /* f09dd54: 8fa3003c */ lw $v1,0x3c($sp) /* f09dd58: 8c780684 */ lw $t8,0x684($v1) @@ -11064,7 +11064,7 @@ glabel bgunTick /* f09dd70: 02602025 */ move $a0,$s3 .JF0f09dd74: /* f09dd74: 02402825 */ move $a1,$s2 -/* f09dd78: 0fc2769d */ jal 0xf09da74 +/* f09dd78: 0fc2769d */ jal bgunTickInc /* f09dd7c: 02003025 */ move $a2,$s0 /* f09dd80: 00408025 */ move $s0,$v0 /* f09dd84: 18400003 */ blez $v0,.JF0f09dd94 @@ -18887,17 +18887,17 @@ glabel bgun0f0a1528 /* f0a24ac: 828e0002 */ lb $t6,0x2($s4) /* f0a24b0: 05c200eb */ bltzl $t6,.JF0f0a2860 /* f0a24b4: 82a20de4 */ lb $v0,0xde4($s5) -/* f0a24b8: 0fc27378 */ jal 0xf09cde0 +/* f0a24b8: 0fc27378 */ jal bgun0f09bec8 /* f0a24bc: 00002025 */ move $a0,$zero /* f0a24c0: 504000fb */ beqzl $v0,.JF0f0a28b0 /* f0a24c4: 8fbf0044 */ lw $ra,0x44($sp) -/* f0a24c8: 0fc27378 */ jal 0xf09cde0 +/* f0a24c8: 0fc27378 */ jal bgun0f09bec8 /* f0a24cc: 24040001 */ li $a0,0x1 /* f0a24d0: 504000f7 */ beqzl $v0,.JF0f0a28b0 /* f0a24d4: 8fbf0044 */ lw $ra,0x44($sp) /* f0a24d8: 82b01580 */ lb $s0,0x1580($s5) /* f0a24dc: 82b20de4 */ lb $s2,0xde4($s5) -/* f0a24e0: 0fc2ca4f */ jal 0xf0b293c +/* f0a24e0: 0fc2ca4f */ jal currentPlayerGetDeviceState /* f0a24e4: 82840002 */ lb $a0,0x2($s4) /* f0a24e8: 2401ffff */ li $at,-1 /* f0a24ec: 10410002 */ beq $v0,$at,.JF0f0a24f8 @@ -18915,7 +18915,7 @@ glabel bgun0f0a1528 /* f0a2514: 07210009 */ bgez $t9,.JF0f0a253c /* f0a2518: 00000000 */ nop /* f0a251c: 82840002 */ lb $a0,0x2($s4) -/* f0a2520: 0fc4483f */ jal 0xf1120fc +/* f0a2520: 0fc4483f */ jal invHasDoubleWeaponIncAllGuns /* f0a2524: 00802825 */ move $a1,$a0 /* f0a2528: 14400004 */ bnez $v0,.JF0f0a253c /* f0a252c: 00000000 */ nop @@ -18923,11 +18923,11 @@ glabel bgun0f0a1528 /* f0a2534: 3109ff7f */ andi $t1,$t0,0xff7f /* f0a2538: a2890003 */ sb $t1,0x3($s4) .JF0f0a253c: -/* f0a253c: 0fc36109 */ jal 0xf0d8424 +/* f0a253c: 0fc36109 */ jal func0f0d7364 /* f0a2540: 00000000 */ nop -/* f0a2544: 0fc288a8 */ jal 0xf0a22a0 +/* f0a2544: 0fc288a8 */ jal bgun0f0a134c /* f0a2548: 02202025 */ move $a0,$s1 -/* f0a254c: 0fc288a8 */ jal 0xf0a22a0 +/* f0a254c: 0fc288a8 */ jal bgun0f0a134c /* f0a2550: 00002025 */ move $a0,$zero /* f0a2554: 24060032 */ li $a2,0x32 /* f0a2558: 16060005 */ bne $s0,$a2,.JF0f0a2570 @@ -18981,7 +18981,7 @@ glabel bgun0f0a1528 /* f0a2608: 1000000a */ b .JF0f0a2634 /* f0a260c: a2800000 */ sb $zero,0x0($s4) .JF0f0a2610: -/* f0a2610: 0fc27ba2 */ jal 0xf09ee88 +/* f0a2610: 0fc27ba2 */ jal bgun0f09df64 /* f0a2614: 00000000 */ nop /* f0a2618: 82990002 */ lb $t9,0x2($s4) /* f0a261c: 26a20ddc */ addiu $v0,$s5,0xddc @@ -19062,18 +19062,18 @@ glabel bgun0f0a1528 /* f0a272c: e6140d08 */ swc1 $f20,0xd08($s0) /* f0a2730: 024c6807 */ srav $t5,$t4,$s2 /* f0a2734: 31ae000f */ andi $t6,$t5,0xf -/* f0a2738: 0fc2b36d */ jal 0xf0acdb4 +/* f0a2738: 0fc2b36d */ jal bgun0f0abd30 /* f0a273c: a20e0639 */ sb $t6,0x639($s0) -/* f0a2740: 0c008aed */ jal 0x22bb4 +/* f0a2740: 0c008aed */ jal animInit /* f0a2744: 02602025 */ move $a0,$s3 /* f0a2748: 8e040d84 */ lw $a0,0xd84($s0) /* f0a274c: 50800008 */ beqzl $a0,.JF0f0a2770 /* f0a2750: 26310001 */ addiu $s1,$s1,0x1 -/* f0a2754: 0c00ccc0 */ jal 0x33300 +/* f0a2754: 0c00ccc0 */ jal sndGetState /* f0a2758: 00000000 */ nop /* f0a275c: 50400004 */ beqzl $v0,.JF0f0a2770 /* f0a2760: 26310001 */ addiu $s1,$s1,0x1 -/* f0a2764: 0c00cd8d */ jal 0x33634 +/* f0a2764: 0c00cd8d */ jal audioStop /* f0a2768: 8e040d84 */ lw $a0,0xd84($s0) /* f0a276c: 26310001 */ addiu $s1,$s1,0x1 .JF0f0a2770: @@ -19082,7 +19082,7 @@ glabel bgun0f0a1528 /* f0a2778: 26520004 */ addiu $s2,$s2,0x4 /* f0a277c: 1621ffd3 */ bne $s1,$at,.JF0f0a26cc /* f0a2780: 267307a4 */ addiu $s3,$s3,0x7a4 -/* f0a2784: 0fc44ccb */ jal 0xf11332c +/* f0a2784: 0fc44ccb */ jal invCalculateCurrentIndex /* f0a2788: 00000000 */ nop /* f0a278c: 82820000 */ lb $v0,0x0($s4) /* f0a2790: 240fffff */ li $t7,-1 @@ -19109,7 +19109,7 @@ glabel bgun0f0a1528 /* f0a27e0: 2405042e */ li $a1,0x42e /* f0a27e4: 00003025 */ move $a2,$zero /* f0a27e8: 2407ffff */ li $a3,-1 -/* f0a27ec: 0c004230 */ jal 0x108c0 +/* f0a27ec: 0c004230 */ jal sndStart /* f0a27f0: e7a40014 */ swc1 $f4,0x14($sp) /* f0a27f4: 3c03800a */ lui $v1,0x800a /* f0a27f8: 8c63a8b4 */ lw $v1,-0x574c($v1) @@ -19128,9 +19128,9 @@ glabel bgun0f0a1528 /* f0a282c: 00000000 */ nop /* f0a2830: ae190014 */ sw $t9,0x14($s0) .JF0f0a2834: -/* f0a2834: 0fc448aa */ jal 0xf1122a8 +/* f0a2834: 0fc448aa */ jal invRemoveItemByNum /* f0a2838: 82840000 */ lb $a0,0x0($s4) -/* f0a283c: 0fc28ae5 */ jal 0xf0a2b94 +/* f0a283c: 0fc28ae5 */ jal bgunCycleBack /* f0a2840: 00000000 */ nop /* f0a2844: 92880003 */ lbu $t0,0x3($s4) .JF0f0a2848: @@ -19153,11 +19153,11 @@ glabel bgun0f0a1528 /* f0a2880: 05a3000b */ bgezl $t5,.JF0f0a28b0 /* f0a2884: 8fbf0044 */ lw $ra,0x44($sp) .JF0f0a2888: -/* f0a2888: 0fc27378 */ jal 0xf09cde0 +/* f0a2888: 0fc27378 */ jal bgun0f09bec8 /* f0a288c: 24040001 */ li $a0,0x1 /* f0a2890: 50400007 */ beqzl $v0,.JF0f0a28b0 /* f0a2894: 8fbf0044 */ lw $ra,0x44($sp) -/* f0a2898: 0fc288a8 */ jal 0xf0a22a0 +/* f0a2898: 0fc288a8 */ jal bgun0f0a134c /* f0a289c: 24040001 */ li $a0,0x1 /* f0a28a0: 92ae1583 */ lbu $t6,0x1583($s5) /* f0a28a4: 000e79c2 */ srl $t7,$t6,0x7 @@ -21049,7 +21049,7 @@ glabel var7f1ac7d0 /* f0a42f0: c432d448 */ lwc1 $f18,-0x2bb8($at) /* f0a42f4: afa60050 */ sw $a2,0x50($sp) /* f0a42f8: 46120302 */ mul.s $f12,$f0,$f18 -/* f0a42fc: 0c0068dc */ jal 0x1a370 +/* f0a42fc: 0c0068dc */ jal cosf /* f0a4300: 00000000 */ nop /* f0a4304: 3c013f00 */ lui $at,0x3f00 /* f0a4308: 44813000 */ mtc1 $at,$f6 @@ -21080,10 +21080,10 @@ glabel var7f1ac7d0 /* f0a4364: 46049182 */ mul.s $f6,$f18,$f4 /* f0a4368: 00000000 */ nop /* f0a436c: 46061202 */ mul.s $f8,$f2,$f6 -/* f0a4370: 0c00590b */ jal 0x1642c +/* f0a4370: 0c00590b */ jal mtx4LoadRotation /* f0a4374: e7a80040 */ swc1 $f8,0x40($sp) /* f0a4378: 8fa40058 */ lw $a0,0x58($sp) -/* f0a437c: 0c0056e0 */ jal 0x15b80 +/* f0a437c: 0c0056e0 */ jal mtx00015be0 /* f0a4380: 8fa5005c */ lw $a1,0x5c($sp) /* f0a4384: 3c014080 */ lui $at,0x4080 /* f0a4388: 44818000 */ mtc1 $at,$f16 @@ -23749,7 +23749,7 @@ glabel var7f1ac8cc /* f0a5670: 10000140 */ b .JF0f0a5b74 /* f0a5674: 3c014348 */ lui $at,0x4348 .JF0f0a5678: -/* f0a5678: 0c004b60 */ jal 0x12d80 +/* f0a5678: 0c004b60 */ jal random /* f0a567c: 00000000 */ nop /* f0a5680: 3c017f1b */ lui $at,0x7f1b /* f0a5684: c420d54c */ lwc1 $f0,-0x2ab4($at) @@ -23773,7 +23773,7 @@ glabel var7f1ac8cc /* f0a56c8: 00000000 */ nop /* f0a56cc: 46082182 */ mul.s $f6,$f4,$f8 /* f0a56d0: 46003280 */ add.s $f10,$f6,$f0 -/* f0a56d4: 0c004b60 */ jal 0x12d80 +/* f0a56d4: 0c004b60 */ jal random /* f0a56d8: e60a06e8 */ swc1 $f10,0x6e8($s0) /* f0a56dc: 44828000 */ mtc1 $v0,$f16 /* f0a56e0: 3c014020 */ lui $at,0x4020 @@ -23795,7 +23795,7 @@ glabel var7f1ac8cc /* f0a571c: 00000000 */ nop /* f0a5720: 460a3402 */ mul.s $f16,$f6,$f10 /* f0a5724: 46008100 */ add.s $f4,$f16,$f0 -/* f0a5728: 0c004b60 */ jal 0x12d80 +/* f0a5728: 0c004b60 */ jal random /* f0a572c: e60406ec */ swc1 $f4,0x6ec($s0) /* f0a5730: 44824000 */ mtc1 $v0,$f8 /* f0a5734: 3c014f80 */ lui $at,0x4f80 @@ -23815,7 +23815,7 @@ glabel var7f1ac8cc /* f0a5768: 46048482 */ mul.s $f18,$f16,$f4 /* f0a576c: 46089283 */ div.s $f10,$f18,$f8 /* f0a5770: 46065401 */ sub.s $f16,$f10,$f6 -/* f0a5774: 0c004b60 */ jal 0x12d80 +/* f0a5774: 0c004b60 */ jal random /* f0a5778: e7b000d0 */ swc1 $f16,0xd0($sp) /* f0a577c: 44822000 */ mtc1 $v0,$f4 /* f0a5780: 3c014f80 */ lui $at,0x4f80 @@ -23835,7 +23835,7 @@ glabel var7f1ac8cc /* f0a57b4: 46065402 */ mul.s $f16,$f10,$f6 /* f0a57b8: 46048203 */ div.s $f8,$f16,$f4 /* f0a57bc: 46124281 */ sub.s $f10,$f8,$f18 -/* f0a57c0: 0c004b60 */ jal 0x12d80 +/* f0a57c0: 0c004b60 */ jal random /* f0a57c4: e7aa00d4 */ swc1 $f10,0xd4($sp) /* f0a57c8: 44823000 */ mtc1 $v0,$f6 /* f0a57cc: 3c014f80 */ lui $at,0x4f80 @@ -23858,7 +23858,7 @@ glabel var7f1ac8cc /* f0a580c: 100000d8 */ b .JF0f0a5b70 /* f0a5810: e7a800d8 */ swc1 $f8,0xd8($sp) .JF0f0a5814: -/* f0a5814: 0c004b60 */ jal 0x12d80 +/* f0a5814: 0c004b60 */ jal random /* f0a5818: 00000000 */ nop /* f0a581c: 3c017f1b */ lui $at,0x7f1b /* f0a5820: c420d568 */ lwc1 $f0,-0x2a98($at) @@ -23887,7 +23887,7 @@ glabel var7f1ac8cc /* f0a5878: 46002402 */ mul.s $f16,$f4,$f0 /* f0a587c: 46105200 */ add.s $f8,$f10,$f16 /* f0a5880: 46004487 */ neg.s $f18,$f8 -/* f0a5884: 0c004b60 */ jal 0x12d80 +/* f0a5884: 0c004b60 */ jal random /* f0a5888: e61206e8 */ swc1 $f18,0x6e8($s0) /* f0a588c: 44823000 */ mtc1 $v0,$f6 /* f0a5890: 3c014020 */ lui $at,0x4020 @@ -23906,7 +23906,7 @@ glabel var7f1ac8cc /* f0a58c0: 00000000 */ nop /* f0a58c4: 46124182 */ mul.s $f6,$f8,$f18 /* f0a58c8: 46003280 */ add.s $f10,$f6,$f0 -/* f0a58cc: 0c004b60 */ jal 0x12d80 +/* f0a58cc: 0c004b60 */ jal random /* f0a58d0: e60a06ec */ swc1 $f10,0x6ec($s0) /* f0a58d4: 44822000 */ mtc1 $v0,$f4 /* f0a58d8: 3c014f80 */ lui $at,0x4f80 @@ -23922,7 +23922,7 @@ glabel var7f1ac8cc /* f0a58fc: 00000000 */ nop /* f0a5900: 46069280 */ add.s $f10,$f18,$f6 /* f0a5904: 46005107 */ neg.s $f4,$f10 -/* f0a5908: 0c004b60 */ jal 0x12d80 +/* f0a5908: 0c004b60 */ jal random /* f0a590c: e60406f0 */ swc1 $f4,0x6f0($s0) /* f0a5910: 44824000 */ mtc1 $v0,$f8 /* f0a5914: 3c014f80 */ lui $at,0x4f80 @@ -23942,7 +23942,7 @@ glabel var7f1ac8cc /* f0a5948: 460a3100 */ add.s $f4,$f6,$f10 /* f0a594c: 46082482 */ mul.s $f18,$f4,$f8 /* f0a5950: 46109183 */ div.s $f6,$f18,$f16 -/* f0a5954: 0c004b60 */ jal 0x12d80 +/* f0a5954: 0c004b60 */ jal random /* f0a5958: e7a600d0 */ swc1 $f6,0xd0($sp) /* f0a595c: 44825000 */ mtc1 $v0,$f10 /* f0a5960: 3c014f80 */ lui $at,0x4f80 @@ -23962,7 +23962,7 @@ glabel var7f1ac8cc /* f0a5994: 46109182 */ mul.s $f6,$f18,$f16 /* f0a5998: 460a3203 */ div.s $f8,$f6,$f10 /* f0a599c: 46044481 */ sub.s $f18,$f8,$f4 -/* f0a59a0: 0c004b60 */ jal 0x12d80 +/* f0a59a0: 0c004b60 */ jal random /* f0a59a4: e7b200d4 */ swc1 $f18,0xd4($sp) /* f0a59a8: 44828000 */ mtc1 $v0,$f16 /* f0a59ac: 3c014f80 */ lui $at,0x4f80 @@ -23986,7 +23986,7 @@ glabel var7f1ac8cc /* f0a59f0: e7a800d8 */ swc1 $f8,0xd8($sp) /* f0a59f4: 44802000 */ mtc1 $zero,$f4 .JF0f0a59f8: -/* f0a59f8: 0c004b60 */ jal 0x12d80 +/* f0a59f8: 0c004b60 */ jal random /* f0a59fc: e60406e8 */ swc1 $f4,0x6e8($s0) /* f0a5a00: 3c014020 */ lui $at,0x4020 /* f0a5a04: 44810000 */ mtc1 $at,$f0 @@ -24007,7 +24007,7 @@ glabel var7f1ac8cc /* f0a5a3c: 00000000 */ nop /* f0a5a40: 46044482 */ mul.s $f18,$f8,$f4 /* f0a5a44: 46009280 */ add.s $f10,$f18,$f0 -/* f0a5a48: 0c004b60 */ jal 0x12d80 +/* f0a5a48: 0c004b60 */ jal random /* f0a5a4c: e60a06ec */ swc1 $f10,0x6ec($s0) /* f0a5a50: 44828000 */ mtc1 $v0,$f16 /* f0a5a54: 3c014f80 */ lui $at,0x4f80 @@ -24024,7 +24024,7 @@ glabel var7f1ac8cc /* f0a5a7c: 44818000 */ mtc1 $at,$f16 /* f0a5a80: 46122280 */ add.s $f10,$f4,$f18 /* f0a5a84: 46105202 */ mul.s $f8,$f10,$f16 -/* f0a5a88: 0c004b60 */ jal 0x12d80 +/* f0a5a88: 0c004b60 */ jal random /* f0a5a8c: e60806f0 */ swc1 $f8,0x6f0($s0) /* f0a5a90: 44823000 */ mtc1 $v0,$f6 /* f0a5a94: 3c014f80 */ lui $at,0x4f80 @@ -24044,7 +24044,7 @@ glabel var7f1ac8cc /* f0a5ac8: 46105200 */ add.s $f8,$f10,$f16 /* f0a5acc: 46064482 */ mul.s $f18,$f8,$f6 /* f0a5ad0: 46049283 */ div.s $f10,$f18,$f4 -/* f0a5ad4: 0c004b60 */ jal 0x12d80 +/* f0a5ad4: 0c004b60 */ jal random /* f0a5ad8: e7aa00d0 */ swc1 $f10,0xd0($sp) /* f0a5adc: 44828000 */ mtc1 $v0,$f16 /* f0a5ae0: 3c014f80 */ lui $at,0x4f80 @@ -24064,7 +24064,7 @@ glabel var7f1ac8cc /* f0a5b14: 46049282 */ mul.s $f10,$f18,$f4 /* f0a5b18: 46105183 */ div.s $f6,$f10,$f16 /* f0a5b1c: 46083481 */ sub.s $f18,$f6,$f8 -/* f0a5b20: 0c004b60 */ jal 0x12d80 +/* f0a5b20: 0c004b60 */ jal random /* f0a5b24: e7b200d4 */ swc1 $f18,0xd4($sp) /* f0a5b28: 44822000 */ mtc1 $v0,$f4 /* f0a5b2c: 3c014f80 */ lui $at,0x4f80 @@ -24093,10 +24093,10 @@ glabel var7f1ac8cc /* f0a5b7c: 27a400d0 */ addiu $a0,$sp,0xd0 /* f0a5b80: 27a50090 */ addiu $a1,$sp,0x90 /* f0a5b84: 46124101 */ sub.s $f4,$f8,$f18 -/* f0a5b88: 0c00590b */ jal 0x1642c +/* f0a5b88: 0c00590b */ jal mtx4LoadRotation /* f0a5b8c: e60406d8 */ swc1 $f4,0x6d8($s0) /* f0a5b90: 27a40090 */ addiu $a0,$sp,0x90 -/* f0a5b94: 0c005750 */ jal 0x15d40 +/* f0a5b94: 0c005750 */ jal mtx4ToMtx3 /* f0a5b98: 26050718 */ addiu $a1,$s0,0x718 /* f0a5b9c: 3c03800a */ lui $v1,0x800a /* f0a5ba0: 2463a630 */ addiu $v1,$v1,-22992 @@ -24125,10 +24125,10 @@ glabel var7f1ac8cc /* f0a5bfc: c606032c */ lwc1 $f6,0x32c($s0) /* f0a5c00: 46083481 */ sub.s $f18,$f6,$f8 /* f0a5c04: 46009103 */ div.s $f4,$f18,$f0 -/* f0a5c08: 0c005d4a */ jal 0x17528 +/* f0a5c08: 0c005d4a */ jal mtx00017588 /* f0a5c0c: e7a4008c */ swc1 $f4,0x8c($sp) /* f0a5c10: 27a40044 */ addiu $a0,$sp,0x44 -/* f0a5c14: 0c0056ac */ jal 0x15ab0 +/* f0a5c14: 0c0056ac */ jal mtx4RotateVecInPlace /* f0a5c18: 27a50084 */ addiu $a1,$sp,0x84 /* f0a5c1c: 3c017f1b */ lui $at,0x7f1b /* f0a5c20: c420d594 */ lwc1 $f0,-0x2a6c($at) @@ -24213,7 +24213,7 @@ glabel var7f1ac8cc /* f0a5d4c: 8fa40030 */ lw $a0,0x30($sp) .JF0f0a5d50: /* f0a5d50: 8fa5002c */ lw $a1,0x2c($sp) -/* f0a5d54: 0c00582c */ jal 0x160b0 +/* f0a5d54: 0c00582c */ jal mtx00016110 /* f0a5d58: afa20040 */ sw $v0,0x40($sp) /* f0a5d5c: 3c03800a */ lui $v1,0x800a /* f0a5d60: 8fa20040 */ lw $v0,0x40($sp) @@ -26625,11 +26625,11 @@ glabel var7f1adc74pf /* f0a6528: afa001d4 */ sw $zero,0x1d4($sp) /* f0a652c: afa30054 */ sw $v1,0x54($sp) /* f0a6530: afa40310 */ sw $a0,0x310($sp) -/* f0a6534: 0fc28a56 */ jal 0xf0a2958 +/* f0a6534: 0fc28a56 */ jal bgunGetWeaponNum2 /* f0a6538: afa201e0 */ sw $v0,0x1e0($sp) /* f0a653c: afa201cc */ sw $v0,0x1cc($sp) /* f0a6540: afa001c0 */ sw $zero,0x1c0($sp) -/* f0a6544: 0fc2c814 */ jal 0xf0b2050 +/* f0a6544: 0fc2c814 */ jal weaponFindById /* f0a6548: 00402025 */ move $a0,$v0 /* f0a654c: 8fb80310 */ lw $t8,0x310($sp) /* f0a6550: 24010001 */ li $at,0x1 @@ -26643,7 +26643,7 @@ glabel var7f1adc74pf /* f0a6570: 00000000 */ nop /* f0a6574: afaf01c0 */ sw $t7,0x1c0($sp) .JF0f0a6578: -/* f0a6578: 0fc2c82f */ jal 0xf0b20bc +/* f0a6578: 0fc2c82f */ jal gsetGetWeaponFunction2 /* f0a657c: 02002025 */ move $a0,$s0 /* f0a6580: 10400007 */ beqz $v0,.JF0f0a65a0 /* f0a6584: afa201d8 */ sw $v0,0x1d8($sp) @@ -26656,15 +26656,15 @@ glabel var7f1adc74pf .JF0f0a65a0: /* f0a65a0: 02002025 */ move $a0,$s0 .JF0f0a65a4: -/* f0a65a4: 0fc2791d */ jal 0xf09e474 +/* f0a65a4: 0fc2791d */ jal bgun0f09d550 /* f0a65a8: 8fa50310 */ lw $a1,0x310($sp) /* f0a65ac: 8fac0310 */ lw $t4,0x310($sp) /* f0a65b0: 1580002b */ bnez $t4,.JF0f0a6660 /* f0a65b4: 00000000 */ nop -/* f0a65b8: 0fc28a56 */ jal 0xf0a2958 +/* f0a65b8: 0fc28a56 */ jal bgunGetWeaponNum2 /* f0a65bc: 24040001 */ li $a0,0x1 /* f0a65c0: 00402025 */ move $a0,$v0 -/* f0a65c4: 0fc2ca10 */ jal 0xf0b2840 +/* f0a65c4: 0fc2ca10 */ jal weaponHasFlag /* f0a65c8: 24050040 */ li $a1,0x40 /* f0a65cc: 10400013 */ beqz $v0,.JF0f0a661c /* f0a65d0: 3c01800a */ lui $at,0x800a @@ -26705,10 +26705,10 @@ glabel var7f1adc74pf /* f0a6658: 1000002b */ b .JF0f0a6708 /* f0a665c: e60601bc */ swc1 $f6,0x1bc($s0) .JF0f0a6660: -/* f0a6660: 0fc28a56 */ jal 0xf0a2958 +/* f0a6660: 0fc28a56 */ jal bgunGetWeaponNum2 /* f0a6664: 00002025 */ move $a0,$zero /* f0a6668: 00402025 */ move $a0,$v0 -/* f0a666c: 0fc2ca10 */ jal 0xf0b2840 +/* f0a666c: 0fc2ca10 */ jal weaponHasFlag /* f0a6670: 24050040 */ li $a1,0x40 /* f0a6674: 10400013 */ beqz $v0,.JF0f0a66c4 /* f0a6678: 3c01800a */ lui $at,0x800a @@ -26753,7 +26753,7 @@ glabel var7f1adc74pf .JF0f0a670c: /* f0a670c: 55400017 */ bnezl $t2,.JF0f0a676c /* f0a6710: 8fb901c0 */ lw $t9,0x1c0($sp) -/* f0a6714: 0fc2c8e7 */ jal 0xf0b239c +/* f0a6714: 0fc2c8e7 */ jal func0f0b131c /* f0a6718: 01402025 */ move $a0,$t2 /* f0a671c: c61200b8 */ lwc1 $f18,0xb8($s0) /* f0a6720: c61001b0 */ lwc1 $f16,0x1b0($s0) @@ -26801,7 +26801,7 @@ glabel var7f1adc74pf /* f0a67c4: 10000015 */ b .JF0f0a681c /* f0a67c8: e7a60284 */ swc1 $f6,0x284($sp) .JF0f0a67cc: -/* f0a67cc: 0fc2c8e7 */ jal 0xf0b239c +/* f0a67cc: 0fc2c8e7 */ jal func0f0b131c /* f0a67d0: 8fa40310 */ lw $a0,0x310($sp) /* f0a67d4: c61000b8 */ lwc1 $f16,0xb8($s0) /* f0a67d8: c61201b0 */ lwc1 $f18,0x1b0($s0) @@ -26858,7 +26858,7 @@ glabel var7f1adc74pf /* f0a68a0: 8c4d0014 */ lw $t5,0x14($v0) /* f0a68a4: 11a0004a */ beqz $t5,.JF0f0a69d0 /* f0a68a8: 00000000 */ nop -/* f0a68ac: 0c004b60 */ jal 0x12d80 +/* f0a68ac: 0c004b60 */ jal random /* f0a68b0: 00000000 */ nop /* f0a68b4: 44822000 */ mtc1 $v0,$f4 /* f0a68b8: 3c014f80 */ lui $at,0x4f80 @@ -26883,7 +26883,7 @@ glabel var7f1adc74pf /* f0a6900: 00000000 */ nop /* f0a6904: 46125182 */ mul.s $f6,$f10,$f18 /* f0a6908: 46064100 */ add.s $f4,$f8,$f6 -/* f0a690c: 0c004b60 */ jal 0x12d80 +/* f0a690c: 0c004b60 */ jal random /* f0a6910: e7a4027c */ swc1 $f4,0x27c($sp) /* f0a6914: 44828000 */ mtc1 $v0,$f16 /* f0a6918: 3c014f80 */ lui $at,0x4f80 @@ -26908,7 +26908,7 @@ glabel var7f1adc74pf /* f0a6960: 00000000 */ nop /* f0a6964: 46085182 */ mul.s $f6,$f10,$f8 /* f0a6968: 46062400 */ add.s $f16,$f4,$f6 -/* f0a696c: 0c004b60 */ jal 0x12d80 +/* f0a696c: 0c004b60 */ jal random /* f0a6970: e7b00280 */ swc1 $f16,0x280($sp) /* f0a6974: 44829000 */ mtc1 $v0,$f18 /* f0a6978: 3c014f80 */ lui $at,0x4f80 @@ -26935,11 +26935,11 @@ glabel var7f1adc74pf /* f0a69c8: 46068480 */ add.s $f18,$f16,$f6 /* f0a69cc: e7b20284 */ swc1 $f18,0x284($sp) .JF0f0a69d0: -/* f0a69d0: 0fc2da16 */ jal 0xf0b6858 +/* f0a69d0: 0fc2da16 */ jal currentPlayerGetScreenWidth /* f0a69d4: 00000000 */ nop -/* f0a69d8: 0fc2da1e */ jal 0xf0b6878 +/* f0a69d8: 0fc2da1e */ jal currentPlayerGetScreenLeft /* f0a69dc: e7a00064 */ swc1 $f0,0x64($sp) -/* f0a69e0: 0fc2da16 */ jal 0xf0b6858 +/* f0a69e0: 0fc2da16 */ jal currentPlayerGetScreenWidth /* f0a69e4: e7a00068 */ swc1 $f0,0x68($sp) /* f0a69e8: 3c013f00 */ lui $at,0x3f00 /* f0a69ec: 44811000 */ mtc1 $at,$f2 @@ -26957,9 +26957,9 @@ glabel var7f1adc74pf /* f0a6a1c: 00000000 */ nop /* f0a6a20: 46020402 */ mul.s $f16,$f0,$f2 /* f0a6a24: 46105103 */ div.s $f4,$f10,$f16 -/* f0a6a28: 0fc2da22 */ jal 0xf0b6888 +/* f0a6a28: 0fc2da22 */ jal currentPlayerGetScreenTop /* f0a6a2c: e604076c */ swc1 $f4,0x76c($s0) -/* f0a6a30: 0fc2da1a */ jal 0xf0b6868 +/* f0a6a30: 0fc2da1a */ jal currentPlayerGetScreenHeight /* f0a6a34: e7a00068 */ swc1 $f0,0x68($sp) /* f0a6a38: 3c013f00 */ lui $at,0x3f00 /* f0a6a3c: 44813000 */ mtc1 $at,$f6 @@ -26972,11 +26972,11 @@ glabel var7f1adc74pf /* f0a6a58: 00000000 */ nop /* f0a6a5c: 4500001a */ bc1f .JF0f0a6ac8 /* f0a6a60: 00000000 */ nop -/* f0a6a64: 0fc2da1a */ jal 0xf0b6868 +/* f0a6a64: 0fc2da1a */ jal currentPlayerGetScreenHeight /* f0a6a68: 00000000 */ nop -/* f0a6a6c: 0fc2da22 */ jal 0xf0b6888 +/* f0a6a6c: 0fc2da22 */ jal currentPlayerGetScreenTop /* f0a6a70: e7a00064 */ swc1 $f0,0x64($sp) -/* f0a6a74: 0fc2da1a */ jal 0xf0b6868 +/* f0a6a74: 0fc2da1a */ jal currentPlayerGetScreenHeight /* f0a6a78: e7a00068 */ swc1 $f0,0x68($sp) /* f0a6a7c: 3c013f00 */ lui $at,0x3f00 /* f0a6a80: 44819000 */ mtc1 $at,$f18 @@ -26998,11 +26998,11 @@ glabel var7f1adc74pf /* f0a6ac0: 10000019 */ b .JF0f0a6b28 /* f0a6ac4: e6100770 */ swc1 $f16,0x770($s0) .JF0f0a6ac8: -/* f0a6ac8: 0fc2da1a */ jal 0xf0b6868 +/* f0a6ac8: 0fc2da1a */ jal currentPlayerGetScreenHeight /* f0a6acc: 00000000 */ nop -/* f0a6ad0: 0fc2da22 */ jal 0xf0b6888 +/* f0a6ad0: 0fc2da22 */ jal currentPlayerGetScreenTop /* f0a6ad4: e7a00064 */ swc1 $f0,0x64($sp) -/* f0a6ad8: 0fc2da1a */ jal 0xf0b6868 +/* f0a6ad8: 0fc2da1a */ jal currentPlayerGetScreenHeight /* f0a6adc: e7a00068 */ swc1 $f0,0x68($sp) /* f0a6ae0: 3c013f00 */ lui $at,0x3f00 /* f0a6ae4: 44814000 */ mtc1 $at,$f8 @@ -27034,12 +27034,12 @@ glabel var7f1adc74pf /* f0a6b48: e7a6027c */ swc1 $f6,0x27c($sp) /* f0a6b4c: e7aa0280 */ swc1 $f10,0x280($sp) /* f0a6b50: a2090007 */ sb $t1,0x7($s0) -/* f0a6b54: 0fc2ca10 */ jal 0xf0b2840 +/* f0a6b54: 0fc2ca10 */ jal weaponHasFlag /* f0a6b58: 8fa401cc */ lw $a0,0x1cc($sp) /* f0a6b5c: 50400018 */ beqzl $v0,.JF0f0a6bc0 /* f0a6b60: a2000007 */ sb $zero,0x7($s0) /* f0a6b64: 8fa401cc */ lw $a0,0x1cc($sp) -/* f0a6b68: 0fc2ca10 */ jal 0xf0b2840 +/* f0a6b68: 0fc2ca10 */ jal weaponHasFlag /* f0a6b6c: 24050080 */ li $a1,0x80 /* f0a6b70: 54400013 */ bnezl $v0,.JF0f0a6bc0 /* f0a6b74: a2000007 */ sb $zero,0x7($s0) @@ -27049,14 +27049,14 @@ glabel var7f1adc74pf /* f0a6b84: 24010007 */ li $at,0x7 /* f0a6b88: 5041000d */ beql $v0,$at,.JF0f0a6bc0 /* f0a6b8c: a2000007 */ sb $zero,0x7($s0) -/* f0a6b90: 0fc27b28 */ jal 0xf09eca0 +/* f0a6b90: 0fc27b28 */ jal bgun0f09dd7c /* f0a6b94: 00000000 */ nop /* f0a6b98: 50400009 */ beqzl $v0,.JF0f0a6bc0 /* f0a6b9c: a2000007 */ sb $zero,0x7($s0) /* f0a6ba0: 820d0008 */ lb $t5,0x8($s0) /* f0a6ba4: 51a00006 */ beqzl $t5,.JF0f0a6bc0 /* f0a6ba8: a2000007 */ sb $zero,0x7($s0) -/* f0a6bac: 0fc27b3c */ jal 0xf09ecf0 +/* f0a6bac: 0fc27b3c */ jal bgunGetGunMemType /* f0a6bb0: 00000000 */ nop /* f0a6bb4: 54400003 */ bnezl $v0,.JF0f0a6bc4 /* f0a6bb8: 820c0007 */ lb $t4,0x7($s0) @@ -27072,11 +27072,11 @@ glabel var7f1adc74pf /* f0a6bd4: 8444000e */ lh $a0,0xe($v0) /* f0a6bd8: afa20288 */ sw $v0,0x288($sp) /* f0a6bdc: 00045980 */ sll $t3,$a0,0x6 -/* f0a6be0: 0fc59f81 */ jal 0xf167e04 +/* f0a6be0: 0fc59f81 */ jal gfxAllocate /* f0a6be4: 01602025 */ move $a0,$t3 /* f0a6be8: afa2030c */ sw $v0,0x30c($sp) /* f0a6bec: 8fa401cc */ lw $a0,0x1cc($sp) -/* f0a6bf0: 0fc2ca10 */ jal 0xf0b2840 +/* f0a6bf0: 0fc2ca10 */ jal weaponHasFlag /* f0a6bf4: 3c050200 */ lui $a1,0x200 /* f0a6bf8: 10400012 */ beqz $v0,.JF0f0a6c44 /* f0a6bfc: 8fb90288 */ lw $t9,0x288($sp) @@ -27087,7 +27087,7 @@ glabel var7f1adc74pf /* f0a6c10: 00000000 */ nop /* f0a6c14: afa201d0 */ sw $v0,0x1d0($sp) .JF0f0a6c18: -/* f0a6c18: 0c005654 */ jal 0x15950 +/* f0a6c18: 0c005654 */ jal mtx4LoadIdentity /* f0a6c1c: afa4004c */ sw $a0,0x4c($sp) /* f0a6c20: 8fae0288 */ lw $t6,0x288($sp) /* f0a6c24: 8fa201d0 */ lw $v0,0x1d0($sp) @@ -27099,27 +27099,27 @@ glabel var7f1adc74pf /* f0a6c3c: 5420fff6 */ bnezl $at,.JF0f0a6c18 /* f0a6c40: afa201d0 */ sw $v0,0x1d0($sp) .JF0f0a6c44: -/* f0a6c44: 0fc28f44 */ jal 0xf0a3d10 +/* f0a6c44: 0fc28f44 */ jal bgun0f0a2da8 /* f0a6c48: 8e040794 */ lw $a0,0x794($s0) /* f0a6c4c: 8fa901e0 */ lw $t1,0x1e0($sp) /* f0a6c50: 8d2d1594 */ lw $t5,0x1594($t1) /* f0a6c54: 51a00004 */ beqzl $t5,.JF0f0a6c68 /* f0a6c58: 02002025 */ move $a0,$s0 -/* f0a6c5c: 0fc28f44 */ jal 0xf0a3d10 +/* f0a6c5c: 0fc28f44 */ jal bgun0f0a2da8 /* f0a6c60: 8e040798 */ lw $a0,0x798($s0) /* f0a6c64: 02002025 */ move $a0,$s0 .JF0f0a6c68: -/* f0a6c68: 0fc26374 */ jal 0xf098dd0 +/* f0a6c68: 0fc26374 */ jal bgun0f098030 /* f0a6c6c: 8fa50288 */ lw $a1,0x288($sp) /* f0a6c70: 8fa401cc */ lw $a0,0x1cc($sp) -/* f0a6c74: 0fc2ca10 */ jal 0xf0b2840 +/* f0a6c74: 0fc2ca10 */ jal weaponHasFlag /* f0a6c78: 24052000 */ li $a1,0x2000 /* f0a6c7c: 10400003 */ beqz $v0,.JF0f0a6c8c /* f0a6c80: 02002025 */ move $a0,$s0 -/* f0a6c84: 0fc263e2 */ jal 0xf098f88 +/* f0a6c84: 0fc263e2 */ jal bgun0f0981e8 /* f0a6c88: 8fa50288 */ lw $a1,0x288($sp) .JF0f0a6c8c: -/* f0a6c8c: 0c005654 */ jal 0x15950 +/* f0a6c8c: 0c005654 */ jal mtx4LoadIdentity /* f0a6c90: 27a4023c */ addiu $a0,$sp,0x23c /* f0a6c94: 3c08800a */ lui $t0,0x800a /* f0a6c98: 2508a630 */ addiu $t0,$t0,-22992 @@ -27162,7 +27162,7 @@ glabel var7f1adc74pf /* f0a6d1c: 8fa401cc */ lw $a0,0x1cc($sp) /* f0a6d20: 5121000e */ beql $t1,$at,.JF0f0a6d5c /* f0a6d24: 8e0a00b4 */ lw $t2,0xb4($s0) -/* f0a6d28: 0fc2ca10 */ jal 0xf0b2840 +/* f0a6d28: 0fc2ca10 */ jal weaponHasFlag /* f0a6d2c: 3c050008 */ lui $a1,0x8 /* f0a6d30: 10400009 */ beqz $v0,.JF0f0a6d58 /* f0a6d34: 02002025 */ move $a0,$s0 @@ -27172,7 +27172,7 @@ glabel var7f1adc74pf /* f0a6d44: afad0010 */ sw $t5,0x10($sp) /* f0a6d48: 8fa50310 */ lw $a1,0x310($sp) /* f0a6d4c: 27a6027c */ addiu $a2,$sp,0x27c -/* f0a6d50: 0fc29032 */ jal 0xf0a40c8 +/* f0a6d50: 0fc29032 */ jal bgun0f0a3160 /* f0a6d54: 8fa701d8 */ lw $a3,0x1d8($sp) .JF0f0a6d58: /* f0a6d58: 8e0a00b4 */ lw $t2,0xb4($s0) @@ -27192,7 +27192,7 @@ glabel var7f1adc74pf /* f0a6d8c: e7aa0280 */ swc1 $f10,0x280($sp) /* f0a6d90: c61000ac */ lwc1 $f16,0xac($s0) /* f0a6d94: 46109100 */ add.s $f4,$f18,$f16 -/* f0a6d98: 0c0056e0 */ jal 0x15b80 +/* f0a6d98: 0c0056e0 */ jal mtx00015be0 /* f0a6d9c: e7a40284 */ swc1 $f4,0x284($sp) /* f0a6da0: 44800000 */ mtc1 $zero,$f0 /* f0a6da4: 00000000 */ nop @@ -27223,10 +27223,10 @@ glabel var7f1adc74pf /* f0a6e00: c61000d4 */ lwc1 $f16,0xd4($s0) /* f0a6e04: e7b00020 */ swc1 $f16,0x20($sp) /* f0a6e08: c60400d8 */ lwc1 $f4,0xd8($s0) -/* f0a6e0c: 0c005b3e */ jal 0x16cf8 +/* f0a6e0c: 0c005b3e */ jal mtx00016d58 /* f0a6e10: e7a40024 */ swc1 $f4,0x24($sp) /* f0a6e14: 27a4028c */ addiu $a0,$sp,0x28c -/* f0a6e18: 0c0056e0 */ jal 0x15b80 +/* f0a6e18: 0c0056e0 */ jal mtx00015be0 /* f0a6e1c: 27a5023c */ addiu $a1,$sp,0x23c /* f0a6e20: 44800000 */ mtc1 $zero,$f0 /* f0a6e24: 3c017f1b */ lui $at,0x7f1b @@ -27235,24 +27235,24 @@ glabel var7f1adc74pf /* f0a6e30: 27a5016c */ addiu $a1,$sp,0x16c /* f0a6e34: e7a001ac */ swc1 $f0,0x1ac($sp) /* f0a6e38: e7a001b4 */ swc1 $f0,0x1b4($sp) -/* f0a6e3c: 0c00590b */ jal 0x1642c +/* f0a6e3c: 0c00590b */ jal mtx4LoadRotation /* f0a6e40: e7a601b0 */ swc1 $f6,0x1b0($sp) /* f0a6e44: 44804000 */ mtc1 $zero,$f8 /* f0a6e48: 27a40120 */ addiu $a0,$sp,0x120 /* f0a6e4c: 8fa50310 */ lw $a1,0x310($sp) -/* f0a6e50: 0fc28d16 */ jal 0xf0a3458 +/* f0a6e50: 0fc28d16 */ jal bgun0f0a24f0 /* f0a6e54: e7a801b0 */ swc1 $f8,0x1b0($sp) /* f0a6e58: c7ac0120 */ lwc1 $f12,0x120($sp) /* f0a6e5c: c7ae0128 */ lwc1 $f14,0x128($sp) /* f0a6e60: 8fa6027c */ lw $a2,0x27c($sp) -/* f0a6e64: 0fc28d00 */ jal 0xf0a3400 +/* f0a6e64: 0fc28d00 */ jal bgun0f0a2498 /* f0a6e68: 8fa70284 */ lw $a3,0x284($sp) /* f0a6e6c: 46000287 */ neg.s $f10,$f0 /* f0a6e70: c7ac0124 */ lwc1 $f12,0x124($sp) /* f0a6e74: e7aa01b0 */ swc1 $f10,0x1b0($sp) /* f0a6e78: c7ae0128 */ lwc1 $f14,0x128($sp) /* f0a6e7c: 8fa60280 */ lw $a2,0x280($sp) -/* f0a6e80: 0fc28d00 */ jal 0xf0a3400 +/* f0a6e80: 0fc28d00 */ jal bgun0f0a2498 /* f0a6e84: 8fa70284 */ lw $a3,0x284($sp) /* f0a6e88: e7a001ac */ swc1 $f0,0x1ac($sp) /* f0a6e8c: c7b201ac */ lwc1 $f18,0x1ac($sp) @@ -27260,41 +27260,41 @@ glabel var7f1adc74pf /* f0a6e94: 27a5012c */ addiu $a1,$sp,0x12c /* f0a6e98: e6120234 */ swc1 $f18,0x234($s0) /* f0a6e9c: c7b001b0 */ lwc1 $f16,0x1b0($sp) -/* f0a6ea0: 0c00590b */ jal 0x1642c +/* f0a6ea0: 0c00590b */ jal mtx4LoadRotation /* f0a6ea4: e6100238 */ swc1 $f16,0x238($s0) /* f0a6ea8: 27a4012c */ addiu $a0,$sp,0x12c /* f0a6eac: 27a5016c */ addiu $a1,$sp,0x16c -/* f0a6eb0: 0c005668 */ jal 0x159a0 +/* f0a6eb0: 0c005668 */ jal mtx4MultMtx4 /* f0a6eb4: 27a6028c */ addiu $a2,$sp,0x28c /* f0a6eb8: 27a4028c */ addiu $a0,$sp,0x28c -/* f0a6ebc: 0c005667 */ jal 0x1599c +/* f0a6ebc: 0c005667 */ jal mtx4MultMtx4InPlace /* f0a6ec0: 27a5023c */ addiu $a1,$sp,0x23c /* f0a6ec4: 27a4023c */ addiu $a0,$sp,0x23c -/* f0a6ec8: 0c00572e */ jal 0x15cb8 +/* f0a6ec8: 0c00572e */ jal mtx4Copy /* f0a6ecc: 27a502cc */ addiu $a1,$sp,0x2cc /* f0a6ed0: 27a4027c */ addiu $a0,$sp,0x27c -/* f0a6ed4: 0c00575d */ jal 0x15d74 +/* f0a6ed4: 0c00575d */ jal mtx4SetTranslation /* f0a6ed8: 27a502cc */ addiu $a1,$sp,0x2cc /* f0a6edc: 260502b4 */ addiu $a1,$s0,0x2b4 /* f0a6ee0: afa5004c */ sw $a1,0x4c($sp) -/* f0a6ee4: 0c00572e */ jal 0x15cb8 +/* f0a6ee4: 0c00572e */ jal mtx4Copy /* f0a6ee8: 27a402cc */ addiu $a0,$sp,0x2cc /* f0a6eec: 260402f4 */ addiu $a0,$s0,0x2f4 /* f0a6ef0: afa40044 */ sw $a0,0x44($sp) -/* f0a6ef4: 0c00572e */ jal 0x15cb8 +/* f0a6ef4: 0c00572e */ jal mtx4Copy /* f0a6ef8: 26050334 */ addiu $a1,$s0,0x334 -/* f0a6efc: 0fc2d9fe */ jal 0xf0b67f8 +/* f0a6efc: 0fc2d9fe */ jal currentPlayerGetUnk174c /* f0a6f00: 00000000 */ nop /* f0a6f04: 00402025 */ move $a0,$v0 /* f0a6f08: 8fa5004c */ lw $a1,0x4c($sp) -/* f0a6f0c: 0c0056e1 */ jal 0x15b84 +/* f0a6f0c: 0c0056e1 */ jal mtx00015be4 /* f0a6f10: 8fa60044 */ lw $a2,0x44($sp) /* f0a6f14: 820b0007 */ lb $t3,0x7($s0) /* f0a6f18: 1160020f */ beqz $t3,.JF0f0a7758 /* f0a6f1c: 2405005a */ li $a1,0x5a /* f0a6f20: 8fa40288 */ lw $a0,0x288($sp) .JF0f0a6f24: -/* f0a6f24: 0c006a2f */ jal 0x1a8bc +/* f0a6f24: 0c006a2f */ jal modelGetPart /* f0a6f28: afa5011c */ sw $a1,0x11c($sp) /* f0a6f2c: 1040000c */ beqz $v0,.JF0f0a6f60 /* f0a6f30: 8fa5011c */ lw $a1,0x11c($sp) @@ -27318,7 +27318,7 @@ glabel var7f1adc74pf /* f0a6f74: 24050020 */ li $a1,0x20 /* f0a6f78: ae020390 */ sw $v0,0x390($s0) /* f0a6f7c: ae020540 */ sw $v0,0x540($s0) -/* f0a6f80: 0fc2ca10 */ jal 0xf0b2840 +/* f0a6f80: 0fc2ca10 */ jal weaponHasFlag /* f0a6f84: 8fa401cc */ lw $a0,0x1cc($sp) /* f0a6f88: 10400008 */ beqz $v0,.JF0f0a6fac /* f0a6f8c: 00000000 */ nop @@ -27327,15 +27327,15 @@ glabel var7f1adc74pf /* f0a6f98: 15610004 */ bne $t3,$at,.JF0f0a6fac /* f0a6f9c: 3c01bf80 */ lui $at,0xbf80 /* f0a6fa0: 44816000 */ mtc1 $at,$f12 -/* f0a6fa4: 0c005771 */ jal 0x15dc4 +/* f0a6fa4: 0c005771 */ jal mtx00015e24 /* f0a6fa8: 27a502cc */ addiu $a1,$sp,0x2cc .JF0f0a6fac: /* f0a6fac: 3c017f1b */ lui $at,0x7f1b /* f0a6fb0: c42cd668 */ lwc1 $f12,-0x2998($at) -/* f0a6fb4: 0c0057a9 */ jal 0x15ea4 +/* f0a6fb4: 0c0057a9 */ jal mtx00015f04 /* f0a6fb8: 27a502cc */ addiu $a1,$sp,0x2cc /* f0a6fbc: 27a402cc */ addiu $a0,$sp,0x2cc -/* f0a6fc0: 0c00572e */ jal 0x15cb8 +/* f0a6fc0: 0c00572e */ jal mtx4Copy /* f0a6fc4: 8fa5030c */ lw $a1,0x30c($sp) /* f0a6fc8: 8e190690 */ lw $t9,0x690($s0) /* f0a6fcc: 0019c0c0 */ sll $t8,$t9,0x3 @@ -27376,7 +27376,7 @@ glabel var7f1adc74pf /* f0a704c: 19400005 */ blez $t2,.JF0f0a7064 /* f0a7050: 02002025 */ move $a0,$s0 /* f0a7054: 8fa50288 */ lw $a1,0x288($sp) -/* f0a7058: 0fc2954e */ jal 0xf0a5538 +/* f0a7058: 0fc2954e */ jal bgun0f0a45d0 /* f0a705c: 8fa601c0 */ lw $a2,0x1c0($sp) /* f0a7060: 8fa801cc */ lw $t0,0x1cc($sp) .JF0f0a7064: @@ -27394,13 +27394,13 @@ glabel var7f1adc74pf /* f0a7090: 2401001d */ li $at,0x1d /* f0a7094: 15010009 */ bne $t0,$at,.JF0f0a70bc /* f0a7098: 00000000 */ nop -/* f0a709c: 0fc294a7 */ jal 0xf0a529c +/* f0a709c: 0fc294a7 */ jal bgun0f0a4334 /* f0a70a0: 02002025 */ move $a0,$s0 /* f0a70a4: 10000005 */ b .JF0f0a70bc /* f0a70a8: 8fa801cc */ lw $t0,0x1cc($sp) .JF0f0a70ac: /* f0a70ac: 02002025 */ move $a0,$s0 -/* f0a70b0: 0fc29283 */ jal 0xf0a4a0c +/* f0a70b0: 0fc29283 */ jal bgun0f0a3aa4 /* f0a70b4: 8fa50288 */ lw $a1,0x288($sp) /* f0a70b8: 8fa801cc */ lw $t0,0x1cc($sp) .JF0f0a70bc: @@ -27494,7 +27494,7 @@ glabel var7f1adc74pf /* f0a71f4: afa40054 */ sw $a0,0x54($sp) .JF0f0a71f8: /* f0a71f8: afa50118 */ sw $a1,0x118($sp) -/* f0a71fc: 0c007447 */ jal 0x1d11c +/* f0a71fc: 0c007447 */ jal modelGetAnimNum /* f0a7200: afa700d4 */ sw $a3,0xd4($sp) /* f0a7204: 284100e5 */ slti $at,$v0,0xe5 /* f0a7208: 8fa50118 */ lw $a1,0x118($sp) @@ -27548,7 +27548,7 @@ glabel var7f1adc74pf /* f0a72b4: 8d2a0dd4 */ lw $t2,0xdd4($t1) /* f0a72b8: 55410022 */ bnel $t2,$at,.JF0f0a7344 /* f0a72bc: 8e0a038c */ lw $t2,0x38c($s0) -/* f0a72c0: 0c005654 */ jal 0x15950 +/* f0a72c0: 0c005654 */ jal mtx4LoadIdentity /* f0a72c4: afa700d4 */ sw $a3,0xd4($sp) /* f0a72c8: 8fb901e0 */ lw $t9,0x1e0($sp) /* f0a72cc: 8e060390 */ lw $a2,0x390($s0) @@ -27568,7 +27568,7 @@ glabel var7f1adc74pf /* f0a7300: 27a400d8 */ addiu $a0,$sp,0xd8 /* f0a7304: 8fa50054 */ lw $a1,0x54($sp) /* f0a7308: afa600c8 */ sw $a2,0xc8($sp) -/* f0a730c: 0c0073a7 */ jal 0x1ce9c +/* f0a730c: 0c0073a7 */ jal model0001cebc /* f0a7310: afa700d4 */ sw $a3,0xd4($sp) /* f0a7314: 8fa700d4 */ lw $a3,0xd4($sp) /* f0a7318: 3c018006 */ lui $at,0x8006 @@ -27594,7 +27594,7 @@ glabel var7f1adc74pf .JF0f0a7360: /* f0a7360: afa200d0 */ sw $v0,0xd0($sp) /* f0a7364: afa500cc */ sw $a1,0xcc($sp) -/* f0a7368: 0c0056e1 */ jal 0x15b84 +/* f0a7368: 0c0056e1 */ jal mtx00015be4 /* f0a736c: afa600c8 */ sw $a2,0xc8($sp) /* f0a7370: 8fb901dc */ lw $t9,0x1dc($sp) /* f0a7374: 8fa200d0 */ lw $v0,0xd0($sp) @@ -27620,7 +27620,7 @@ glabel var7f1adc74pf .JF0f0a73c0: /* f0a73c0: 27a400d8 */ addiu $a0,$sp,0xd8 /* f0a73c4: 8fa50054 */ lw $a1,0x54($sp) -/* f0a73c8: 0c0073a7 */ jal 0x1ce9c +/* f0a73c8: 0c0073a7 */ jal model0001cebc /* f0a73cc: afa700d4 */ sw $a3,0xd4($sp) /* f0a73d0: 8fa700d4 */ lw $a3,0xd4($sp) /* f0a73d4: 3c018006 */ lui $at,0x8006 @@ -27632,14 +27632,14 @@ glabel var7f1adc74pf /* f0a73e8: 3c018006 */ lui $at,0x8006 /* f0a73ec: ac20ee84 */ sw $zero,-0x117c($at) /* f0a73f0: 8fa40288 */ lw $a0,0x288($sp) -/* f0a73f4: 0c006a2f */ jal 0x1a8bc +/* f0a73f4: 0c006a2f */ jal modelGetPart /* f0a73f8: 24050033 */ li $a1,0x33 /* f0a73fc: 10400020 */ beqz $v0,.JF0f0a7480 /* f0a7400: 00402025 */ move $a0,$v0 -/* f0a7404: 0c006931 */ jal 0x1a4c4 +/* f0a7404: 0c006931 */ jal model0001a524 /* f0a7408: 00002825 */ move $a1,$zero /* f0a740c: afa20084 */ sw $v0,0x84($sp) -/* f0a7410: 0fc28ca9 */ jal 0xf0a32a4 +/* f0a7410: 0fc28ca9 */ jal bgun0f0a233c /* f0a7414: 8fa40310 */ lw $a0,0x310($sp) /* f0a7418: 44800000 */ mtc1 $zero,$f0 /* f0a741c: 8fa90084 */ lw $t1,0x84($sp) @@ -27652,7 +27652,7 @@ glabel var7f1adc74pf /* f0a7438: 46002187 */ neg.s $f6,$f4 /* f0a743c: afa40054 */ sw $a0,0x54($sp) /* f0a7440: e7a60080 */ swc1 $f6,0x80($sp) -/* f0a7444: 0c0056ac */ jal 0x15ab0 +/* f0a7444: 0c0056ac */ jal mtx4RotateVecInPlace /* f0a7448: 27a50078 */ addiu $a1,$sp,0x78 /* f0a744c: 8fa40054 */ lw $a0,0x54($sp) /* f0a7450: c7aa0078 */ lwc1 $f10,0x78($sp) @@ -27698,22 +27698,22 @@ glabel var7f1adc74pf /* f0a74e0: 1000000d */ b .JF0f0a7518 /* f0a74e4: 8fa40288 */ lw $a0,0x288($sp) .JF0f0a74e8: -/* f0a74e8: 0fc29385 */ jal 0xf0a4e14 +/* f0a74e8: 0fc29385 */ jal bgun0f0a3eac /* f0a74ec: 8fa5030c */ lw $a1,0x30c($sp) /* f0a74f0: 10000009 */ b .JF0f0a7518 /* f0a74f4: 8fa40288 */ lw $a0,0x288($sp) .JF0f0a74f8: /* f0a74f8: 8fa5030c */ lw $a1,0x30c($sp) -/* f0a74fc: 0fc293ff */ jal 0xf0a4ffc +/* f0a74fc: 0fc293ff */ jal bgun0f0a4094 /* f0a7500: 8fa60288 */ lw $a2,0x288($sp) /* f0a7504: 10000004 */ b .JF0f0a7518 /* f0a7508: 8fa40288 */ lw $a0,0x288($sp) .JF0f0a750c: -/* f0a750c: 0fc29441 */ jal 0xf0a5104 +/* f0a750c: 0fc29441 */ jal bgun0f0a419c /* f0a7510: 8fa70288 */ lw $a3,0x288($sp) /* f0a7514: 8fa40288 */ lw $a0,0x288($sp) .JF0f0a7518: -/* f0a7518: 0c006a2f */ jal 0x1a8bc +/* f0a7518: 0c006a2f */ jal modelGetPart /* f0a751c: 24050032 */ li $a1,0x32 /* f0a7520: 8fad01cc */ lw $t5,0x1cc($sp) /* f0a7524: 24010014 */ li $at,0x14 @@ -27734,7 +27734,7 @@ glabel var7f1adc74pf /* f0a755c: 00a1001a */ div $zero,$a1,$at /* f0a7560: 00004810 */ mfhi $t1 /* f0a7564: 2525001e */ addiu $a1,$t1,0x1e -/* f0a7568: 0c006a2f */ jal 0x1a8bc +/* f0a7568: 0c006a2f */ jal modelGetPart /* f0a756c: 00000000 */ nop /* f0a7570: 1000000a */ b .JF0f0a759c /* f0a7574: 00402025 */ move $a0,$v0 @@ -27745,13 +27745,13 @@ glabel var7f1adc74pf /* f0a7584: 00a1001a */ div $zero,$a1,$at /* f0a7588: 00006010 */ mfhi $t4 /* f0a758c: 2585001e */ addiu $a1,$t4,0x1e -/* f0a7590: 0c006a2f */ jal 0x1a8bc +/* f0a7590: 0c006a2f */ jal modelGetPart /* f0a7594: 00000000 */ nop /* f0a7598: 00402025 */ move $a0,$v0 .JF0f0a759c: /* f0a759c: 10400038 */ beqz $v0,.JF0f0a7680 /* f0a75a0: 8fad01cc */ lw $t5,0x1cc($sp) -/* f0a75a4: 0c006931 */ jal 0x1a4c4 +/* f0a75a4: 0c006931 */ jal model0001a524 /* f0a75a8: 00002825 */ move $a1,$zero /* f0a75ac: 8faa030c */ lw $t2,0x30c($sp) /* f0a75b0: 00025980 */ sll $t3,$v0,0x6 @@ -27763,12 +27763,12 @@ glabel var7f1adc74pf /* f0a75c8: c4840034 */ lwc1 $f4,0x34($a0) /* f0a75cc: e6040378 */ swc1 $f4,0x378($s0) /* f0a75d0: c4860038 */ lwc1 $f6,0x38($a0) -/* f0a75d4: 0c00572e */ jal 0x15cb8 +/* f0a75d4: 0c00572e */ jal mtx4Copy /* f0a75d8: e606037c */ swc1 $f6,0x37c($s0) -/* f0a75dc: 0fc2d9fe */ jal 0xf0b67f8 +/* f0a75dc: 0fc2d9fe */ jal currentPlayerGetUnk174c /* f0a75e0: 00000000 */ nop /* f0a75e4: 00402025 */ move $a0,$v0 -/* f0a75e8: 0c0056c1 */ jal 0x15b04 +/* f0a75e8: 0c0056c1 */ jal mtx4TransformVecInPlace /* f0a75ec: 26050374 */ addiu $a1,$s0,0x374 /* f0a75f0: 8fa20070 */ lw $v0,0x70($sp) /* f0a75f4: 8fb9030c */ lw $t9,0x30c($sp) @@ -27802,7 +27802,7 @@ glabel var7f1adc74pf /* f0a7664: afb80010 */ sw $t8,0x10($sp) /* f0a7668: afa90018 */ sw $t1,0x18($sp) /* f0a766c: afa20020 */ sw $v0,0x20($sp) -/* f0a7670: 0fc29764 */ jal 0xf0a5d90 +/* f0a7670: 0fc29764 */ jal bgun0f0a4e44 /* f0a7674: afaa0014 */ sw $t2,0x14($sp) /* f0a7678: 10000044 */ b .JF0f0a778c /* f0a767c: 8fb901cc */ lw $t9,0x1cc($sp) @@ -27820,10 +27820,10 @@ glabel var7f1adc74pf /* f0a76a8: 15a1001f */ bne $t5,$at,.JF0f0a7728 /* f0a76ac: 26050620 */ addiu $a1,$s0,0x620 .JF0f0a76b0: -/* f0a76b0: 0c006a2f */ jal 0x1a8bc +/* f0a76b0: 0c006a2f */ jal modelGetPart /* f0a76b4: 24050037 */ li $a1,0x37 /* f0a76b8: 00402025 */ move $a0,$v0 -/* f0a76bc: 0c006931 */ jal 0x1a4c4 +/* f0a76bc: 0c006931 */ jal model0001a524 /* f0a76c0: 00002825 */ move $a1,$zero /* f0a76c4: 8fae030c */ lw $t6,0x30c($sp) /* f0a76c8: 00026180 */ sll $t4,$v0,0x6 @@ -27835,12 +27835,12 @@ glabel var7f1adc74pf /* f0a76e0: c4900034 */ lwc1 $f16,0x34($a0) /* f0a76e4: e6100378 */ swc1 $f16,0x378($s0) /* f0a76e8: c4840038 */ lwc1 $f4,0x38($a0) -/* f0a76ec: 0c00572e */ jal 0x15cb8 +/* f0a76ec: 0c00572e */ jal mtx4Copy /* f0a76f0: e604037c */ swc1 $f4,0x37c($s0) -/* f0a76f4: 0fc2d9fe */ jal 0xf0b67f8 +/* f0a76f4: 0fc2d9fe */ jal currentPlayerGetUnk174c /* f0a76f8: 00000000 */ nop /* f0a76fc: 00402025 */ move $a0,$v0 -/* f0a7700: 0c0056c1 */ jal 0x15b04 +/* f0a7700: 0c0056c1 */ jal mtx4TransformVecInPlace /* f0a7704: 26050374 */ addiu $a1,$s0,0x374 /* f0a7708: 8faa0070 */ lw $t2,0x70($sp) /* f0a770c: 8fb8030c */ lw $t8,0x30c($sp) @@ -27857,7 +27857,7 @@ glabel var7f1adc74pf /* f0a7734: e60a0374 */ swc1 $f10,0x374($s0) /* f0a7738: e6120378 */ swc1 $f18,0x378($s0) /* f0a773c: e610037c */ swc1 $f16,0x37c($s0) -/* f0a7740: 0c00572e */ jal 0x15cb8 +/* f0a7740: 0c00572e */ jal mtx4Copy /* f0a7744: 8fa40044 */ lw $a0,0x44($sp) /* f0a7748: c60402ec */ lwc1 $f4,0x2ec($s0) /* f0a774c: 46002187 */ neg.s $f6,$f4 @@ -27871,7 +27871,7 @@ glabel var7f1adc74pf /* f0a7768: e60a0378 */ swc1 $f10,0x378($s0) /* f0a776c: e612037c */ swc1 $f18,0x37c($s0) /* f0a7770: 8fa40044 */ lw $a0,0x44($sp) -/* f0a7774: 0c00572e */ jal 0x15cb8 +/* f0a7774: 0c00572e */ jal mtx4Copy /* f0a7778: 26050620 */ addiu $a1,$s0,0x620 /* f0a777c: c61002ec */ lwc1 $f16,0x2ec($s0) /* f0a7780: 46008107 */ neg.s $f4,$f16 @@ -27887,7 +27887,7 @@ glabel var7f1adc74pf /* f0a77a0: 1721000f */ bne $t9,$at,.JF0f0a77e0 /* f0a77a4: 02002025 */ move $a0,$s0 /* f0a77a8: 8fa50310 */ lw $a1,0x310($sp) -/* f0a77ac: 0fc29536 */ jal 0xf0a54d8 +/* f0a77ac: 0fc29536 */ jal bgun0f0a4570 /* f0a77b0: 8fa601d8 */ lw $a2,0x1d8($sp) /* f0a77b4: 1000000b */ b .JF0f0a77e4 /* f0a77b8: 820c0004 */ lb $t4,0x4($s0) @@ -27899,7 +27899,7 @@ glabel var7f1adc74pf /* f0a77cc: 000d7742 */ srl $t6,$t5,0x1d /* f0a77d0: 19c00003 */ blez $t6,.JF0f0a77e0 /* f0a77d4: 8fa60288 */ lw $a2,0x288($sp) -/* f0a77d8: 0fc294e8 */ jal 0xf0a53a0 +/* f0a77d8: 0fc294e8 */ jal bgun0f0a4438 /* f0a77dc: 8fa7030c */ lw $a3,0x30c($sp) .JF0f0a77e0: /* f0a77e0: 820c0004 */ lb $t4,0x4($s0) @@ -27915,7 +27915,7 @@ glabel var7f1adc74pf /* f0a7804: 8fa9030c */ lw $t1,0x30c($sp) /* f0a7808: 8fa701cc */ lw $a3,0x1cc($sp) /* f0a780c: afb80010 */ sw $t8,0x10($sp) -/* f0a7810: 0fc29893 */ jal 0xf0a624c +/* f0a7810: 0fc29893 */ jal bgun0f0a5300 /* f0a7814: afa90014 */ sw $t1,0x14($sp) .JF0f0a7818: /* f0a7818: 3c0b800a */ lui $t3,0x800a @@ -27967,7 +27967,7 @@ glabel var7f1adc74pf /* f0a78bc: 8fa50310 */ lw $a1,0x310($sp) /* f0a78c0: 11200003 */ beqz $t1,.JF0f0a78d0 /* f0a78c4: 8fa601cc */ lw $a2,0x1cc($sp) -/* f0a78c8: 0fc290fe */ jal 0xf0a43f8 +/* f0a78c8: 0fc290fe */ jal bgun0f0a3490 /* f0a78cc: 8fa701d8 */ lw $a3,0x1d8($sp) .JF0f0a78d0: /* f0a78d0: 960b06d6 */ lhu $t3,0x6d6($s0) @@ -27977,7 +27977,7 @@ glabel var7f1adc74pf /* f0a78dc: 000bcb02 */ srl $t9,$t3,0xc /* f0a78e0: 1b200003 */ blez $t9,.JF0f0a78f0 /* f0a78e4: 00000000 */ nop -/* f0a78e8: 0fc29583 */ jal 0xf0a560c +/* f0a78e8: 0fc29583 */ jal bgun0f0a46a4 /* f0a78ec: 8fa601c0 */ lw $a2,0x1c0($sp) .JF0f0a78f0: /* f0a78f0: 3c0f800a */ lui $t7,0x800a @@ -28032,12 +28032,12 @@ glabel var7f1adc74pf /* f0a7998: 02002025 */ move $a0,$s0 /* f0a799c: 8fa50288 */ lw $a1,0x288($sp) /* f0a79a0: 8fa60310 */ lw $a2,0x310($sp) -/* f0a79a4: 0fc291c7 */ jal 0xf0a471c +/* f0a79a4: 0fc291c7 */ jal bgun0f0a37b4 /* f0a79a8: 8fa7030c */ lw $a3,0x30c($sp) /* f0a79ac: 10000004 */ b .JF0f0a79c0 /* f0a79b0: 44803000 */ mtc1 $zero,$f6 .JF0f0a79b4: -/* f0a79b4: 0fc2c516 */ jal 0xf0b1458 +/* f0a79b4: 0fc2c516 */ jal lasersightFree /* f0a79b8: 8fa40310 */ lw $a0,0x310($sp) /* f0a79bc: 44803000 */ mtc1 $zero,$f6 .JF0f0a79c0: @@ -37506,7 +37506,7 @@ glabel bgunRenderHudGauge /* f0ab094: 8fa500e8 */ lw $a1,0xe8($sp) /* f0ab098: 8fa400e4 */ lw $a0,0xe4($sp) /* f0ab09c: afb000b4 */ sw $s0,0xb4($sp) -/* f0ab0a0: 0fc2ab8b */ jal 0xf0aae2c +/* f0ab0a0: 0fc2ab8b */ jal bgun0f0a9da8 /* f0ab0a4: 02003025 */ move $a2,$s0 /* f0ab0a8: 2a010015 */ slti $at,$s0,0x15 /* f0ab0ac: 8fa900e4 */ lw $t1,0xe4($sp) @@ -37591,7 +37591,7 @@ glabel bgunRenderHudGauge /* f0ab1cc: 00d2082a */ slt $at,$a2,$s2 /* f0ab1d0: 1020003e */ beqz $at,.JF0f0ab2cc /* f0ab1d4: 00000000 */ nop -/* f0ab1d8: 0fc54bce */ jal 0xf152f38 +/* f0ab1d8: 0fc54bce */ jal gfxSetPrimColour /* f0ab1dc: afa600bc */ sw $a2,0xbc($sp) /* f0ab1e0: 8fae00f8 */ lw $t6,0xf8($sp) /* f0ab1e4: 8fa600bc */ lw $a2,0xbc($sp) @@ -37651,14 +37651,14 @@ glabel bgunRenderHudGauge /* f0ab2b8: 01eec825 */ or $t9,$t7,$t6 /* f0ab2bc: ac590004 */ sw $t9,0x4($v0) .JF0f0ab2c0: -/* f0ab2c0: 0fc54be5 */ jal 0xf152f94 +/* f0ab2c0: 0fc54be5 */ jal func0f153838 /* f0ab2c4: 02202025 */ move $a0,$s1 /* f0ab2c8: 00408825 */ move $s1,$v0 .JF0f0ab2cc: /* f0ab2cc: 3c138008 */ lui $s3,0x8008 /* f0ab2d0: 267300f4 */ addiu $s3,$s3,0xf4 /* f0ab2d4: 02202025 */ move $a0,$s1 -/* f0ab2d8: 0fc54bce */ jal 0xf152f38 +/* f0ab2d8: 0fc54bce */ jal gfxSetPrimColour /* f0ab2dc: 8fa500f4 */ lw $a1,0xf4($sp) /* f0ab2e0: 8fb800f8 */ lw $t8,0xf8($sp) /* f0ab2e4: 3c0af600 */ lui $t2,0xf600 @@ -37716,7 +37716,7 @@ glabel bgunRenderHudGauge .JF0f0ab3b0: /* f0ab3b0: 8fa500f0 */ lw $a1,0xf0($sp) /* f0ab3b4: afa600bc */ sw $a2,0xbc($sp) -/* f0ab3b8: 0fc54bce */ jal 0xf152f38 +/* f0ab3b8: 0fc54bce */ jal gfxSetPrimColour /* f0ab3bc: e7a000b8 */ swc1 $f0,0xb8($sp) /* f0ab3c0: 8fb900b4 */ lw $t9,0xb4($sp) /* f0ab3c4: 8fa600bc */ lw $a2,0xbc($sp) @@ -37772,7 +37772,7 @@ glabel bgunRenderHudGauge /* f0ab488: 240600ff */ li $a2,0xff .JF0f0ab48c: /* f0ab48c: 2405ffbf */ li $a1,-65 -/* f0ab490: 0fc01a60 */ jal 0xf006980 +/* f0ab490: 0fc01a60 */ jal colourBlend /* f0ab494: afa80044 */ sw $t0,0x44($sp) /* f0ab498: 8fa80044 */ lw $t0,0x44($sp) /* f0ab49c: 8fa900e4 */ lw $t1,0xe4($sp) @@ -37789,7 +37789,7 @@ glabel bgunRenderHudGauge /* f0ab4c4: 240600ff */ li $a2,0xff .JF0f0ab4c8: /* f0ab4c8: 8fa500f0 */ lw $a1,0xf0($sp) -/* f0ab4cc: 0fc01a60 */ jal 0xf006980 +/* f0ab4cc: 0fc01a60 */ jal colourBlend /* f0ab4d0: afa80044 */ sw $t0,0x44($sp) /* f0ab4d4: 8fa80044 */ lw $t0,0x44($sp) /* f0ab4d8: 8fa900e4 */ lw $t1,0xe4($sp) @@ -37826,7 +37826,7 @@ glabel bgunRenderHudGauge /* f0ab548: 34b800ff */ ori $t8,$a1,0xff /* f0ab54c: 03002825 */ move $a1,$t8 /* f0ab550: 8fa400f0 */ lw $a0,0xf0($sp) -/* f0ab554: 0fc01a60 */ jal 0xf006980 +/* f0ab554: 0fc01a60 */ jal colourBlend /* f0ab558: afa80044 */ sw $t0,0x44($sp) /* f0ab55c: 8fa900e4 */ lw $t1,0xe4($sp) /* f0ab560: 8fa80044 */ lw $t0,0x44($sp) @@ -38054,7 +38054,7 @@ glabel bgunRenderHudGauge /* f0ab894: 03387025 */ or $t6,$t9,$t8 /* f0ab898: ac4e0004 */ sw $t6,0x4($v0) .JF0f0ab89c: -/* f0ab89c: 0fc54be5 */ jal 0xf152f94 +/* f0ab89c: 0fc54be5 */ jal func0f153838 /* f0ab8a0: 02202025 */ move $a0,$s1 /* f0ab8a4: 3c0fb900 */ lui $t7,0xb900 /* f0ab8a8: 3c190050 */ lui $t9,0x50 diff --git a/src/game/bondview.c b/src/game/bondview.c index 990d31928..943579ec3 100644 --- a/src/game/bondview.c +++ b/src/game/bondview.c @@ -752,15 +752,15 @@ glabel var7f1b6c28jf /* f143240: f7b80038 */ sdc1 $f24,0x38($sp) /* f143244: f7b60030 */ sdc1 $f22,0x30($sp) /* f143248: f7b40028 */ sdc1 $f20,0x28($sp) -/* f14324c: 0c002ab0 */ jal 0xaac0 +/* f14324c: 0c002ab0 */ jal viGetBackBuffer /* f143250: afa7013c */ sw $a3,0x13c($sp) -/* f143254: 0c002f2d */ jal 0xbcb4 +/* f143254: 0c002f2d */ jal viGetViewTop /* f143258: afa2012c */ sw $v0,0x12c($sp) -/* f14325c: 0c002f0f */ jal 0xbc3c +/* f14325c: 0c002f0f */ jal viGetViewHeight /* f143260: afa20128 */ sw $v0,0x128($sp) -/* f143264: 0c002f0b */ jal 0xbc2c +/* f143264: 0c002f0b */ jal viGetViewWidth /* f143268: afa20124 */ sw $v0,0x124($sp) -/* f14326c: 0c002f29 */ jal 0xbca4 +/* f14326c: 0c002f29 */ jal viGetViewLeft /* f143270: 0040b025 */ move $s6,$v0 /* f143274: 8fae0124 */ lw $t6,0x124($sp) /* f143278: 3c013f80 */ lui $at,0x3f80 @@ -788,7 +788,7 @@ glabel var7f1b6c28jf /* f1432cc: 3c057f1b */ lui $a1,0x7f1b /* f1432d0: 24a56ab4 */ addiu $a1,$a1,0x6ab4 /* f1432d4: 248448e0 */ addiu $a0,$a0,0x48e0 -/* f1432d8: 0c004c34 */ jal 0x130d0 +/* f1432d8: 0c004c34 */ jal strcpy /* f1432dc: e7a00098 */ swc1 $f0,0x98($sp) /* f1432e0: 83a30143 */ lb $v1,0x143($sp) /* f1432e4: 24130001 */ li $s3,0x1 @@ -828,7 +828,7 @@ glabel var7f1b6c28jf /* f143368: ac400004 */ sw $zero,0x4($v0) /* f14336c: afa7007c */ sw $a3,0x7c($sp) /* f143370: 02e02825 */ move $a1,$s7 -/* f143374: 0fc5092c */ jal 0xf1424b0 +/* f143374: 0fc5092c */ jal bviewPrepareStaticRgba16 /* f143378: 02003025 */ move $a2,$s0 /* f14337c: 8fae007c */ lw $t6,0x7c($sp) /* f143380: 00408825 */ move $s1,$v0 @@ -889,7 +889,7 @@ glabel var7f1b6c28jf /* f143454: 02402025 */ move $a0,$s2 /* f143458: 44074000 */ mfc1 $a3,$f8 /* f14345c: 44053000 */ mfc1 $a1,$f6 -/* f143460: 0fc50c5d */ jal 0xf143174 +/* f143460: 0fc50c5d */ jal bview0f142d74 /* f143464: 00000000 */ nop /* f143468: 461c0282 */ mul.s $f10,$f0,$f28 /* f14346c: 02202025 */ move $a0,$s1 @@ -899,7 +899,7 @@ glabel var7f1b6c28jf /* f14347c: afb00010 */ sw $s0,0x10($sp) /* f143480: afb50018 */ sw $s5,0x18($sp) /* f143484: e7aa0014 */ swc1 $f10,0x14($sp) -/* f143488: 0fc507ac */ jal 0xf141eb0 +/* f143488: 0fc507ac */ jal bviewRenderLensRect /* f14348c: afb6001c */ sw $s6,0x1c($sp) /* f143490: 00408825 */ move $s1,$v0 /* f143494: 8fa30128 */ lw $v1,0x128($sp) @@ -940,7 +940,7 @@ glabel var7f1b6c28jf /* f143510: 24010004 */ li $at,0x4 /* f143514: 17c1001f */ bne $s8,$at,.JF0f143594 /* f143518: 02201025 */ move $v0,$s1 -/* f14351c: 0c004b60 */ jal 0x12d80 +/* f14351c: 0c004b60 */ jal random /* f143520: 00000000 */ nop /* f143524: 24010078 */ li $at,0x78 /* f143528: 0041001b */ divu $zero,$v0,$at @@ -949,7 +949,7 @@ glabel var7f1b6c28jf /* f143534: 3c01ff33 */ lui $at,0xff33 /* f143538: 34213300 */ ori $at,$at,0x3300 /* f14353c: 312b00ff */ andi $t3,$t1,0xff -/* f143540: 0c004b60 */ jal 0x12d80 +/* f143540: 0c004b60 */ jal random /* f143544: 0161b825 */ or $s7,$t3,$at /* f143548: 304c001f */ andi $t4,$v0,0x1f /* f14354c: 448c8000 */ mtc1 $t4,$f16 @@ -980,7 +980,7 @@ glabel var7f1b6c28jf /* f1435a4: 4405a000 */ mfc1 $a1,$f20 /* f1435a8: 4406b000 */ mfc1 $a2,$f22 /* f1435ac: 4407c000 */ mfc1 $a3,$f24 -/* f1435b0: 0fc50c5d */ jal 0xf143174 +/* f1435b0: 0fc50c5d */ jal bview0f142d74 /* f1435b4: 02402025 */ move $a0,$s2 /* f1435b8: 461a0402 */ mul.s $f16,$f0,$f26 /* f1435bc: 02202025 */ move $a0,$s1 @@ -990,7 +990,7 @@ glabel var7f1b6c28jf /* f1435cc: afb00010 */ sw $s0,0x10($sp) /* f1435d0: afb50018 */ sw $s5,0x18($sp) /* f1435d4: e7b00014 */ swc1 $f16,0x14($sp) -/* f1435d8: 0fc507ac */ jal 0xf141eb0 +/* f1435d8: 0fc507ac */ jal bviewRenderLensRect /* f1435dc: afb6001c */ sw $s6,0x1c($sp) /* f1435e0: 24010004 */ li $at,0x4 /* f1435e4: 17c10019 */ bne $s8,$at,.JF0f14364c @@ -1004,7 +1004,7 @@ glabel var7f1b6c28jf /* f143604: ac4e0004 */ sw $t6,0x4($v0) /* f143608: ac540000 */ sw $s4,0x0($v0) /* f14360c: 26310008 */ addiu $s1,$s1,0x8 -/* f143610: 0fc50c5d */ jal 0xf143174 +/* f143610: 0fc50c5d */ jal bview0f142d74 /* f143614: 02402025 */ move $a0,$s2 /* f143618: 3c017f1b */ lui $at,0x7f1b /* f14361c: c4246c20 */ lwc1 $f4,0x6c20($at) @@ -1016,7 +1016,7 @@ glabel var7f1b6c28jf /* f143634: afb00010 */ sw $s0,0x10($sp) /* f143638: afb50018 */ sw $s5,0x18($sp) /* f14363c: afb6001c */ sw $s6,0x1c($sp) -/* f143640: 0fc507ac */ jal 0xf141eb0 +/* f143640: 0fc507ac */ jal bviewRenderLensRect /* f143644: e7b20014 */ swc1 $f18,0x14($sp) /* f143648: 00408825 */ move $s1,$v0 .JF0f14364c: @@ -1148,13 +1148,13 @@ glabel var7f1b6c28jf /* f143820: 02202025 */ move $a0,$s1 /* f143824: 02002825 */ move $a1,$s0 /* f143828: 02a03825 */ move $a3,$s5 -/* f14382c: 0fc508b5 */ jal 0xf1422d4 +/* f14382c: 0fc508b5 */ jal bviewRenderFisheyeRect /* f143830: afb60010 */ sw $s6,0x10($sp) /* f143834: 4406a000 */ mfc1 $a2,$f20 /* f143838: 00402025 */ move $a0,$v0 /* f14383c: 02402825 */ move $a1,$s2 /* f143840: 02a03825 */ move $a3,$s5 -/* f143844: 0fc508b5 */ jal 0xf1422d4 +/* f143844: 0fc508b5 */ jal bviewRenderFisheyeRect /* f143848: afb60010 */ sw $s6,0x10($sp) /* f14384c: 26100001 */ addiu $s0,$s0,0x1 /* f143850: 2652ffff */ addiu $s2,$s2,-1 @@ -1199,7 +1199,7 @@ glabel var7f1b6c28jf /* f1438e4: 00000000 */ nop /* f1438e8: 45020007 */ bc1fl .JF0f143908 /* f1438ec: 4600d086 */ mov.s $f2,$f26 -/* f1438f0: 0c012838 */ jal 0x4a0e0 +/* f1438f0: 0c012838 */ jal sqrtf /* f1438f4: 4600c301 */ sub.s $f12,$f24,$f0 /* f1438f8: 46160082 */ mul.s $f2,$f0,$f22 /* f1438fc: 10000002 */ b .JF0f143908 @@ -1214,7 +1214,7 @@ glabel var7f1b6c28jf /* f14391c: afb60010 */ sw $s6,0x10($sp) /* f143920: 460aa500 */ add.s $f20,$f20,$f10 /* f143924: 44060000 */ mfc1 $a2,$f0 -/* f143928: 0fc508b5 */ jal 0xf1422d4 +/* f143928: 0fc508b5 */ jal bviewRenderFisheyeRect /* f14392c: e7a00094 */ swc1 $f0,0x94($sp) /* f143930: c7a00094 */ lwc1 $f0,0x94($sp) /* f143934: 12120008 */ beq $s0,$s2,.JF0f143958 @@ -1223,7 +1223,7 @@ glabel var7f1b6c28jf /* f143940: 00402025 */ move $a0,$v0 /* f143944: 02402825 */ move $a1,$s2 /* f143948: 02a03825 */ move $a3,$s5 -/* f14394c: 0fc508b5 */ jal 0xf1422d4 +/* f14394c: 0fc508b5 */ jal bviewRenderFisheyeRect /* f143950: afb60010 */ sw $s6,0x10($sp) /* f143954: 00408825 */ move $s1,$v0 .JF0f143958: @@ -1248,13 +1248,13 @@ glabel var7f1b6c28jf .JF0f14399c: /* f14399c: 4406b000 */ mfc1 $a2,$f22 /* f1439a0: 4407c000 */ mfc1 $a3,$f24 -/* f1439a4: 0fc50c5d */ jal 0xf143174 +/* f1439a4: 0fc50c5d */ jal bview0f142d74 /* f1439a8: 02402025 */ move $a0,$s2 /* f1439ac: 44060000 */ mfc1 $a2,$f0 /* f1439b0: 02202025 */ move $a0,$s1 /* f1439b4: 02002825 */ move $a1,$s0 /* f1439b8: 02a03825 */ move $a3,$s5 -/* f1439bc: 0fc508b5 */ jal 0xf1422d4 +/* f1439bc: 0fc508b5 */ jal bviewRenderFisheyeRect /* f1439c0: afb60010 */ sw $s6,0x10($sp) /* f1439c4: 02539021 */ addu $s2,$s2,$s3 /* f1439c8: 44929000 */ mtc1 $s2,$f18 @@ -3267,13 +3267,13 @@ glabel var7f1b6c2cjf /* f143c74: afb30044 */ sw $s3,0x44($sp) /* f143c78: afb20040 */ sw $s2,0x40($sp) /* f143c7c: afb1003c */ sw $s1,0x3c($sp) -/* f143c80: 0c002f29 */ jal 0xbca4 +/* f143c80: 0c002f29 */ jal viGetViewLeft /* f143c84: afb00038 */ sw $s0,0x38($sp) -/* f143c88: 0c002f0b */ jal 0xbc2c +/* f143c88: 0c002f0b */ jal viGetViewWidth /* f143c8c: afa2030c */ sw $v0,0x30c($sp) -/* f143c90: 0c002f2d */ jal 0xbcb4 +/* f143c90: 0c002f2d */ jal viGetViewTop /* f143c94: afa20308 */ sw $v0,0x308($sp) -/* f143c98: 0c002f0f */ jal 0xbc3c +/* f143c98: 0c002f0f */ jal viGetViewHeight /* f143c9c: afa20304 */ sw $v0,0x304($sp) /* f143ca0: 8fae0308 */ lw $t6,0x308($sp) /* f143ca4: 44806000 */ mtc1 $zero,$f12 @@ -3304,7 +3304,7 @@ glabel var7f1b6c2cjf /* f143cfc: 10000e6d */ b .JF0f1476b4 /* f143d00: 02a01025 */ move $v0,$s5 .JF0f143d04: -/* f143d04: 0fc54978 */ jal 0xf1525e0 +/* f143d04: 0fc54978 */ jal optionsGetScreenSplit /* f143d08: e7ac02c4 */ swc1 $f12,0x2c4($sp) /* f143d0c: 44800000 */ mtc1 $zero,$f0 /* f143d10: 24010001 */ li $at,0x1 @@ -3402,7 +3402,7 @@ glabel var7f1b6c2cjf /* f143e64: 00000000 */ nop /* f143e68: 45020006 */ bc1fl .JF0f143e84 /* f143e6c: e7a002c8 */ swc1 $f0,0x2c8($sp) -/* f143e70: 0c012838 */ jal 0x4a0e0 +/* f143e70: 0c012838 */ jal sqrtf /* f143e74: 00000000 */ nop /* f143e78: 10000002 */ b .JF0f143e84 /* f143e7c: e7a002c8 */ swc1 $f0,0x2c8($sp) @@ -3414,7 +3414,7 @@ glabel var7f1b6c2cjf /* f143e90: 14600006 */ bnez $v1,.JF0f143eac /* f143e94: 3c0500ff */ lui $a1,0xff /* f143e98: 34a50028 */ ori $a1,$a1,0x28 -/* f143e9c: 0fc54bce */ jal 0xf152f38 +/* f143e9c: 0fc54bce */ jal gfxSetPrimColour /* f143ea0: 02a02025 */ move $a0,$s5 /* f143ea4: 1000000e */ b .JF0f143ee0 /* f143ea8: 0040a825 */ move $s5,$v0 @@ -3424,13 +3424,13 @@ glabel var7f1b6c2cjf /* f143eb4: 02a02025 */ move $a0,$s5 /* f143eb8: 3c052244 */ lui $a1,0x2244 /* f143ebc: 34a5ffa0 */ ori $a1,$a1,0xffa0 -/* f143ec0: 0fc54bce */ jal 0xf152f38 +/* f143ec0: 0fc54bce */ jal gfxSetPrimColour /* f143ec4: 02a02025 */ move $a0,$s5 /* f143ec8: 10000005 */ b .JF0f143ee0 /* f143ecc: 0040a825 */ move $s5,$v0 .JF0f143ed0: /* f143ed0: 3c05ff33 */ lui $a1,0xff33 -/* f143ed4: 0fc54bce */ jal 0xf152f38 +/* f143ed4: 0fc54bce */ jal gfxSetPrimColour /* f143ed8: 34a500a0 */ ori $a1,$a1,0xa0 /* f143edc: 0040a825 */ move $s5,$v0 .JF0f143ee0: @@ -3996,7 +3996,7 @@ glabel var7f1b6c2cjf /* f144744: afb402bc */ sw $s4,0x2bc($sp) /* f144748: afb902b8 */ sw $t9,0x2b8($sp) .JF0f14474c: -/* f14474c: 0fc5baa5 */ jal 0xf16ea94 +/* f14474c: 0fc5baa5 */ jal langGet /* f144750: 2404580c */ li $a0,0x580c /* f144754: 3c017f1b */ lui $at,0x7f1b /* f144758: c4246c30 */ lwc1 $f4,0x6c30($at) @@ -4010,7 +4010,7 @@ glabel var7f1b6c2cjf /* f144778: 02602025 */ move $a0,$s3 /* f14477c: 00403025 */ move $a2,$v0 /* f144780: 46003221 */ cvt.d.s $f8,$f6 -/* f144784: 0c004d95 */ jal 0x13654 +/* f144784: 0c004d95 */ jal sprintf /* f144788: f7a80010 */ sdc1 $f8,0x10($sp) /* f14478c: 3c0f8008 */ lui $t7,0x8008 /* f144790: 8def0140 */ lw $t7,0x140($t7) @@ -4020,7 +4020,7 @@ glabel var7f1b6c2cjf /* f1447a0: 27a502ec */ addiu $a1,$sp,0x2ec /* f1447a4: 02603025 */ move $a2,$s3 /* f1447a8: afa00014 */ sw $zero,0x14($sp) -/* f1447ac: 0fc55d49 */ jal 0xf157524 +/* f1447ac: 0fc55d49 */ jal textMeasure /* f1447b0: afaf0010 */ sw $t7,0x10($sp) /* f1447b4: 8faa02b4 */ lw $t2,0x2b4($sp) /* f1447b8: 8fae030c */ lw $t6,0x30c($sp) @@ -4047,13 +4047,13 @@ glabel var7f1b6c2cjf /* f14480c: 02a02025 */ move $a0,$s5 /* f144810: 27a502f4 */ addiu $a1,$sp,0x2f4 /* f144814: 27a602f0 */ addiu $a2,$sp,0x2f0 -/* f144818: 0fc54bed */ jal 0xf152fb4 +/* f144818: 0fc54bed */ jal func0f153858 /* f14481c: 27a702e4 */ addiu $a3,$sp,0x2e4 -/* f144820: 0c002eeb */ jal 0xbbac +/* f144820: 0c002eeb */ jal viGetWidth /* f144824: 0040a825 */ move $s5,$v0 /* f144828: 00028400 */ sll $s0,$v0,0x10 /* f14482c: 0010cc03 */ sra $t9,$s0,0x10 -/* f144830: 0c002eef */ jal 0xbbbc +/* f144830: 0c002eef */ jal viGetHeight /* f144834: 03208025 */ move $s0,$t9 /* f144838: 3c0f8008 */ lui $t7,0x8008 /* f14483c: 3c188008 */ lui $t8,0x8008 @@ -4071,10 +4071,10 @@ glabel var7f1b6c2cjf /* f14486c: afa0002c */ sw $zero,0x2c($sp) /* f144870: afb80014 */ sw $t8,0x14($sp) /* f144874: afaf0010 */ sw $t7,0x10($sp) -/* f144878: 0fc55d34 */ jal 0xf1574d0 +/* f144878: 0fc55d34 */ jal func0f1574d0jf /* f14487c: afae001c */ sw $t6,0x1c($sp) /* f144880: 0040a825 */ move $s5,$v0 -/* f144884: 0fc5baa5 */ jal 0xf16ea94 +/* f144884: 0fc5baa5 */ jal langGet /* f144888: 2404580d */ li $a0,0x580d /* f14488c: 8ed90284 */ lw $t9,0x284($s6) /* f144890: 3c017f1b */ lui $at,0x7f1b @@ -4089,7 +4089,7 @@ glabel var7f1b6c2cjf /* f1448b4: 02602025 */ move $a0,$s3 /* f1448b8: 00403025 */ move $a2,$v0 /* f1448bc: 46003221 */ cvt.d.s $f8,$f6 -/* f1448c0: 0c004d95 */ jal 0x13654 +/* f1448c0: 0c004d95 */ jal sprintf /* f1448c4: f7a80010 */ sdc1 $f8,0x10($sp) /* f1448c8: 3c188008 */ lui $t8,0x8008 /* f1448cc: 8f180140 */ lw $t8,0x140($t8) @@ -4100,7 +4100,7 @@ glabel var7f1b6c2cjf /* f1448e0: 27a502ec */ addiu $a1,$sp,0x2ec /* f1448e4: 02603025 */ move $a2,$s3 /* f1448e8: afa00014 */ sw $zero,0x14($sp) -/* f1448ec: 0fc55d49 */ jal 0xf157524 +/* f1448ec: 0fc55d49 */ jal textMeasure /* f1448f0: afb80010 */ sw $t8,0x10($sp) /* f1448f4: 8fa902ec */ lw $t1,0x2ec($sp) /* f1448f8: 8fa30088 */ lw $v1,0x88($sp) @@ -4116,13 +4116,13 @@ glabel var7f1b6c2cjf /* f144920: 27a602f0 */ addiu $a2,$sp,0x2f0 /* f144924: 27a702e4 */ addiu $a3,$sp,0x2e4 /* f144928: afb102f0 */ sw $s1,0x2f0($sp) -/* f14492c: 0fc54bed */ jal 0xf152fb4 +/* f14492c: 0fc54bed */ jal func0f153858 /* f144930: afa302f4 */ sw $v1,0x2f4($sp) -/* f144934: 0c002eeb */ jal 0xbbac +/* f144934: 0c002eeb */ jal viGetWidth /* f144938: 0040a825 */ move $s5,$v0 /* f14493c: 00028400 */ sll $s0,$v0,0x10 /* f144940: 00107403 */ sra $t6,$s0,0x10 -/* f144944: 0c002eef */ jal 0xbbbc +/* f144944: 0c002eef */ jal viGetHeight /* f144948: 01c08025 */ move $s0,$t6 /* f14494c: 3c198008 */ lui $t9,0x8008 /* f144950: 3c0f8008 */ lui $t7,0x8008 @@ -4140,10 +4140,10 @@ glabel var7f1b6c2cjf /* f144980: afa0002c */ sw $zero,0x2c($sp) /* f144984: afaf0014 */ sw $t7,0x14($sp) /* f144988: afb90010 */ sw $t9,0x10($sp) -/* f14498c: 0fc55d34 */ jal 0xf1574d0 +/* f14498c: 0fc55d34 */ jal func0f1574d0jf /* f144990: afb8001c */ sw $t8,0x1c($sp) /* f144994: 0040a825 */ move $s5,$v0 -/* f144998: 0fc5baa5 */ jal 0xf16ea94 +/* f144998: 0fc5baa5 */ jal langGet /* f14499c: 2404580e */ li $a0,0x580e /* f1449a0: 8ece0284 */ lw $t6,0x284($s6) /* f1449a4: 3c057f1b */ lui $a1,0x7f1b @@ -4154,7 +4154,7 @@ glabel var7f1b6c2cjf /* f1449b8: c72a001c */ lwc1 $f10,0x1c($t9) /* f1449bc: 4600510d */ trunc.w.s $f4,$f10 /* f1449c0: 44072000 */ mfc1 $a3,$f4 -/* f1449c4: 0c004d95 */ jal 0x13654 +/* f1449c4: 0c004d95 */ jal sprintf /* f1449c8: 00000000 */ nop /* f1449cc: 3c188008 */ lui $t8,0x8008 /* f1449d0: 8f180140 */ lw $t8,0x140($t8) @@ -4165,7 +4165,7 @@ glabel var7f1b6c2cjf /* f1449e4: 27a502ec */ addiu $a1,$sp,0x2ec /* f1449e8: 02603025 */ move $a2,$s3 /* f1449ec: afa00014 */ sw $zero,0x14($sp) -/* f1449f0: 0fc55d49 */ jal 0xf157524 +/* f1449f0: 0fc55d49 */ jal textMeasure /* f1449f4: afb80010 */ sw $t8,0x10($sp) /* f1449f8: 8fa902ec */ lw $t1,0x2ec($sp) /* f1449fc: 8fa30088 */ lw $v1,0x88($sp) @@ -4181,13 +4181,13 @@ glabel var7f1b6c2cjf /* f144a24: 27a602f0 */ addiu $a2,$sp,0x2f0 /* f144a28: 27a702e4 */ addiu $a3,$sp,0x2e4 /* f144a2c: afb102f0 */ sw $s1,0x2f0($sp) -/* f144a30: 0fc54bed */ jal 0xf152fb4 +/* f144a30: 0fc54bed */ jal func0f153858 /* f144a34: afa302f4 */ sw $v1,0x2f4($sp) -/* f144a38: 0c002eeb */ jal 0xbbac +/* f144a38: 0c002eeb */ jal viGetWidth /* f144a3c: 0040a825 */ move $s5,$v0 /* f144a40: 00028400 */ sll $s0,$v0,0x10 /* f144a44: 00107403 */ sra $t6,$s0,0x10 -/* f144a48: 0c002eef */ jal 0xbbbc +/* f144a48: 0c002eef */ jal viGetHeight /* f144a4c: 01c08025 */ move $s0,$t6 /* f144a50: 3c198008 */ lui $t9,0x8008 /* f144a54: 3c0f8008 */ lui $t7,0x8008 @@ -4205,10 +4205,10 @@ glabel var7f1b6c2cjf /* f144a84: afa0002c */ sw $zero,0x2c($sp) /* f144a88: afaf0014 */ sw $t7,0x14($sp) /* f144a8c: afb90010 */ sw $t9,0x10($sp) -/* f144a90: 0fc55d34 */ jal 0xf1574d0 +/* f144a90: 0fc55d34 */ jal func0f1574d0jf /* f144a94: afb8001c */ sw $t8,0x1c($sp) /* f144a98: 0040a825 */ move $s5,$v0 -/* f144a9c: 0fc5baa5 */ jal 0xf16ea94 +/* f144a9c: 0fc5baa5 */ jal langGet /* f144aa0: 2404580f */ li $a0,0x580f /* f144aa4: 8ece0284 */ lw $t6,0x284($s6) /* f144aa8: 3c057f1b */ lui $a1,0x7f1b @@ -4219,7 +4219,7 @@ glabel var7f1b6c2cjf /* f144abc: c7260028 */ lwc1 $f6,0x28($t9) /* f144ac0: 4600320d */ trunc.w.s $f8,$f6 /* f144ac4: 44074000 */ mfc1 $a3,$f8 -/* f144ac8: 0c004d95 */ jal 0x13654 +/* f144ac8: 0c004d95 */ jal sprintf /* f144acc: 00000000 */ nop /* f144ad0: 3c188008 */ lui $t8,0x8008 /* f144ad4: 8f180140 */ lw $t8,0x140($t8) @@ -4230,7 +4230,7 @@ glabel var7f1b6c2cjf /* f144ae8: 27a502ec */ addiu $a1,$sp,0x2ec /* f144aec: 02603025 */ move $a2,$s3 /* f144af0: afa00014 */ sw $zero,0x14($sp) -/* f144af4: 0fc55d49 */ jal 0xf157524 +/* f144af4: 0fc55d49 */ jal textMeasure /* f144af8: afb80010 */ sw $t8,0x10($sp) /* f144afc: 8fa902ec */ lw $t1,0x2ec($sp) /* f144b00: 8fa30088 */ lw $v1,0x88($sp) @@ -4246,13 +4246,13 @@ glabel var7f1b6c2cjf /* f144b28: 27a602f0 */ addiu $a2,$sp,0x2f0 /* f144b2c: 27a702e4 */ addiu $a3,$sp,0x2e4 /* f144b30: afb102f0 */ sw $s1,0x2f0($sp) -/* f144b34: 0fc54bed */ jal 0xf152fb4 +/* f144b34: 0fc54bed */ jal func0f153858 /* f144b38: afa302f4 */ sw $v1,0x2f4($sp) -/* f144b3c: 0c002eeb */ jal 0xbbac +/* f144b3c: 0c002eeb */ jal viGetWidth /* f144b40: 0040a825 */ move $s5,$v0 /* f144b44: 00028400 */ sll $s0,$v0,0x10 /* f144b48: 00107403 */ sra $t6,$s0,0x10 -/* f144b4c: 0c002eef */ jal 0xbbbc +/* f144b4c: 0c002eef */ jal viGetHeight /* f144b50: 01c08025 */ move $s0,$t6 /* f144b54: 3c198008 */ lui $t9,0x8008 /* f144b58: 3c0f8008 */ lui $t7,0x8008 @@ -4270,15 +4270,15 @@ glabel var7f1b6c2cjf /* f144b88: afa0002c */ sw $zero,0x2c($sp) /* f144b8c: afaf0014 */ sw $t7,0x14($sp) /* f144b90: afb90010 */ sw $t9,0x10($sp) -/* f144b94: 0fc55d34 */ jal 0xf1574d0 +/* f144b94: 0fc55d34 */ jal func0f1574d0jf /* f144b98: afb8001c */ sw $t8,0x1c($sp) /* f144b9c: 0040a825 */ move $s5,$v0 -/* f144ba0: 0fc5baa5 */ jal 0xf16ea94 +/* f144ba0: 0fc5baa5 */ jal langGet /* f144ba4: 24045810 */ li $a0,0x5810 /* f144ba8: 3c057f1b */ lui $a1,0x7f1b /* f144bac: 24a56af4 */ addiu $a1,$a1,0x6af4 /* f144bb0: 02602025 */ move $a0,$s3 -/* f144bb4: 0c004d95 */ jal 0x13654 +/* f144bb4: 0c004d95 */ jal sprintf /* f144bb8: 00403025 */ move $a2,$v0 /* f144bbc: 3c0e8008 */ lui $t6,0x8008 /* f144bc0: 8dce0140 */ lw $t6,0x140($t6) @@ -4288,7 +4288,7 @@ glabel var7f1b6c2cjf /* f144bd0: 27a502ec */ addiu $a1,$sp,0x2ec /* f144bd4: 02603025 */ move $a2,$s3 /* f144bd8: afa00014 */ sw $zero,0x14($sp) -/* f144bdc: 0fc55d49 */ jal 0xf157524 +/* f144bdc: 0fc55d49 */ jal textMeasure /* f144be0: afae0010 */ sw $t6,0x10($sp) /* f144be4: 8fa402b0 */ lw $a0,0x2b0($sp) /* f144be8: 8fb9030c */ lw $t9,0x30c($sp) @@ -4324,13 +4324,13 @@ glabel var7f1b6c2cjf /* f144c50: 27a502f4 */ addiu $a1,$sp,0x2f4 /* f144c54: 27a602f0 */ addiu $a2,$sp,0x2f0 /* f144c58: 27a702e4 */ addiu $a3,$sp,0x2e4 -/* f144c5c: 0fc54bed */ jal 0xf152fb4 +/* f144c5c: 0fc54bed */ jal func0f153858 /* f144c60: afa302f4 */ sw $v1,0x2f4($sp) -/* f144c64: 0c002eeb */ jal 0xbbac +/* f144c64: 0c002eeb */ jal viGetWidth /* f144c68: 0040a825 */ move $s5,$v0 /* f144c6c: 00028400 */ sll $s0,$v0,0x10 /* f144c70: 0010cc03 */ sra $t9,$s0,0x10 -/* f144c74: 0c002eef */ jal 0xbbbc +/* f144c74: 0c002eef */ jal viGetHeight /* f144c78: 03208025 */ move $s0,$t9 /* f144c7c: 3c0f8008 */ lui $t7,0x8008 /* f144c80: 3c188008 */ lui $t8,0x8008 @@ -4349,7 +4349,7 @@ glabel var7f1b6c2cjf /* f144cb4: afb80014 */ sw $t8,0x14($sp) /* f144cb8: afaf0010 */ sw $t7,0x10($sp) /* f144cbc: afae0018 */ sw $t6,0x18($sp) -/* f144cc0: 0fc55d34 */ jal 0xf1574d0 +/* f144cc0: 0fc55d34 */ jal func0f1574d0jf /* f144cc4: afb9001c */ sw $t9,0x1c($sp) /* f144cc8: 8ecf0284 */ lw $t7,0x284($s6) /* f144ccc: 0040a825 */ move $s5,$v0 @@ -4357,12 +4357,12 @@ glabel var7f1b6c2cjf /* f144cd4: 9303006b */ lbu $v1,0x6b($t8) /* f144cd8: 5460000b */ bnezl $v1,.JF0f144d08 /* f144cdc: 24010001 */ li $at,0x1 -/* f144ce0: 0fc5baa5 */ jal 0xf16ea94 +/* f144ce0: 0fc5baa5 */ jal langGet /* f144ce4: 24045811 */ li $a0,0x5811 /* f144ce8: 3c057f1b */ lui $a1,0x7f1b /* f144cec: 24a56af8 */ addiu $a1,$a1,0x6af8 /* f144cf0: 02602025 */ move $a0,$s3 -/* f144cf4: 0c004d95 */ jal 0x13654 +/* f144cf4: 0c004d95 */ jal sprintf /* f144cf8: 00403025 */ move $a2,$v0 /* f144cfc: 10000014 */ b .JF0f144d50 /* f144d00: 00000000 */ nop @@ -4370,22 +4370,22 @@ glabel var7f1b6c2cjf .JF0f144d08: /* f144d08: 1461000a */ bne $v1,$at,.JF0f144d34 /* f144d0c: 00000000 */ nop -/* f144d10: 0fc5baa5 */ jal 0xf16ea94 +/* f144d10: 0fc5baa5 */ jal langGet /* f144d14: 24045893 */ li $a0,0x5893 /* f144d18: 3c057f1b */ lui $a1,0x7f1b /* f144d1c: 24a56afc */ addiu $a1,$a1,0x6afc /* f144d20: 02602025 */ move $a0,$s3 -/* f144d24: 0c004d95 */ jal 0x13654 +/* f144d24: 0c004d95 */ jal sprintf /* f144d28: 00403025 */ move $a2,$v0 /* f144d2c: 10000008 */ b .JF0f144d50 /* f144d30: 00000000 */ nop .JF0f144d34: -/* f144d34: 0fc5baa5 */ jal 0xf16ea94 +/* f144d34: 0fc5baa5 */ jal langGet /* f144d38: 2404589c */ li $a0,0x589c /* f144d3c: 3c057f1b */ lui $a1,0x7f1b /* f144d40: 24a56b00 */ addiu $a1,$a1,0x6b00 /* f144d44: 02602025 */ move $a0,$s3 -/* f144d48: 0c004d95 */ jal 0x13654 +/* f144d48: 0c004d95 */ jal sprintf /* f144d4c: 00403025 */ move $a2,$v0 .JF0f144d50: /* f144d50: 3c0e8008 */ lui $t6,0x8008 @@ -4396,7 +4396,7 @@ glabel var7f1b6c2cjf /* f144d64: 27a502ec */ addiu $a1,$sp,0x2ec /* f144d68: 02603025 */ move $a2,$s3 /* f144d6c: afa00014 */ sw $zero,0x14($sp) -/* f144d70: 0fc55d49 */ jal 0xf157524 +/* f144d70: 0fc55d49 */ jal textMeasure /* f144d74: afae0010 */ sw $t6,0x10($sp) /* f144d78: 8fa402b0 */ lw $a0,0x2b0($sp) /* f144d7c: 8fb9030c */ lw $t9,0x30c($sp) @@ -4432,13 +4432,13 @@ glabel var7f1b6c2cjf /* f144de4: 27a502f4 */ addiu $a1,$sp,0x2f4 /* f144de8: 27a602f0 */ addiu $a2,$sp,0x2f0 /* f144dec: 27a702e4 */ addiu $a3,$sp,0x2e4 -/* f144df0: 0fc54bed */ jal 0xf152fb4 +/* f144df0: 0fc54bed */ jal func0f153858 /* f144df4: afa302f4 */ sw $v1,0x2f4($sp) -/* f144df8: 0c002eeb */ jal 0xbbac +/* f144df8: 0c002eeb */ jal viGetWidth /* f144dfc: 0040a825 */ move $s5,$v0 /* f144e00: 00028400 */ sll $s0,$v0,0x10 /* f144e04: 0010cc03 */ sra $t9,$s0,0x10 -/* f144e08: 0c002eef */ jal 0xbbbc +/* f144e08: 0c002eef */ jal viGetHeight /* f144e0c: 03208025 */ move $s0,$t9 /* f144e10: 3c0f8008 */ lui $t7,0x8008 /* f144e14: 3c188008 */ lui $t8,0x8008 @@ -4457,7 +4457,7 @@ glabel var7f1b6c2cjf /* f144e48: afb80014 */ sw $t8,0x14($sp) /* f144e4c: afaf0010 */ sw $t7,0x10($sp) /* f144e50: afae0018 */ sw $t6,0x18($sp) -/* f144e54: 0fc55d34 */ jal 0xf1574d0 +/* f144e54: 0fc55d34 */ jal func0f1574d0jf /* f144e58: afb9001c */ sw $t9,0x1c($sp) /* f144e5c: 8ecf0284 */ lw $t7,0x284($s6) /* f144e60: 0040a825 */ move $s5,$v0 @@ -4465,12 +4465,12 @@ glabel var7f1b6c2cjf /* f144e68: 9303006b */ lbu $v1,0x6b($t8) /* f144e6c: 54600048 */ bnezl $v1,.JF0f144f90 /* f144e70: 24010001 */ li $at,0x1 -/* f144e74: 0fc5baa5 */ jal 0xf16ea94 +/* f144e74: 0fc5baa5 */ jal langGet /* f144e78: 24045812 */ li $a0,0x5812 /* f144e7c: 3c057f1b */ lui $a1,0x7f1b /* f144e80: 24a56b04 */ addiu $a1,$a1,0x6b04 /* f144e84: 02602025 */ move $a0,$s3 -/* f144e88: 0c004d95 */ jal 0x13654 +/* f144e88: 0c004d95 */ jal sprintf /* f144e8c: 00403025 */ move $a2,$v0 /* f144e90: 3c0e8008 */ lui $t6,0x8008 /* f144e94: 8dce0140 */ lw $t6,0x140($t6) @@ -4480,7 +4480,7 @@ glabel var7f1b6c2cjf /* f144ea4: 27a502ec */ addiu $a1,$sp,0x2ec /* f144ea8: 02603025 */ move $a2,$s3 /* f144eac: afa00014 */ sw $zero,0x14($sp) -/* f144eb0: 0fc55d49 */ jal 0xf157524 +/* f144eb0: 0fc55d49 */ jal textMeasure /* f144eb4: afae0010 */ sw $t6,0x10($sp) /* f144eb8: 8fa902ec */ lw $t1,0x2ec($sp) /* f144ebc: 8fb90094 */ lw $t9,0x94($sp) @@ -4508,13 +4508,13 @@ glabel var7f1b6c2cjf /* f144f0c: 27a502f4 */ addiu $a1,$sp,0x2f4 /* f144f10: 27a602f0 */ addiu $a2,$sp,0x2f0 /* f144f14: 27a702e4 */ addiu $a3,$sp,0x2e4 -/* f144f18: 0fc54bed */ jal 0xf152fb4 +/* f144f18: 0fc54bed */ jal func0f153858 /* f144f1c: afa302f4 */ sw $v1,0x2f4($sp) -/* f144f20: 0c002eeb */ jal 0xbbac +/* f144f20: 0c002eeb */ jal viGetWidth /* f144f24: 0040a825 */ move $s5,$v0 /* f144f28: 00028400 */ sll $s0,$v0,0x10 /* f144f2c: 00107403 */ sra $t6,$s0,0x10 -/* f144f30: 0c002eef */ jal 0xbbbc +/* f144f30: 0c002eef */ jal viGetHeight /* f144f34: 01c08025 */ move $s0,$t6 /* f144f38: 3c198008 */ lui $t9,0x8008 /* f144f3c: 3c0f8008 */ lui $t7,0x8008 @@ -4533,7 +4533,7 @@ glabel var7f1b6c2cjf /* f144f70: afaf0014 */ sw $t7,0x14($sp) /* f144f74: afb90010 */ sw $t9,0x10($sp) /* f144f78: afb80018 */ sw $t8,0x18($sp) -/* f144f7c: 0fc55d34 */ jal 0xf1574d0 +/* f144f7c: 0fc55d34 */ jal func0f1574d0jf /* f144f80: afae001c */ sw $t6,0x1c($sp) /* f144f84: 1000008f */ b .JF0f1451c4 /* f144f88: 0040a825 */ move $s5,$v0 @@ -4541,12 +4541,12 @@ glabel var7f1b6c2cjf .JF0f144f90: /* f144f90: 14610047 */ bne $v1,$at,.JF0f1450b0 /* f144f94: 00000000 */ nop -/* f144f98: 0fc5baa5 */ jal 0xf16ea94 +/* f144f98: 0fc5baa5 */ jal langGet /* f144f9c: 240458d1 */ li $a0,0x58d1 /* f144fa0: 3c057f1b */ lui $a1,0x7f1b /* f144fa4: 24a56b0c */ addiu $a1,$a1,0x6b0c /* f144fa8: 02602025 */ move $a0,$s3 -/* f144fac: 0c004d95 */ jal 0x13654 +/* f144fac: 0c004d95 */ jal sprintf /* f144fb0: 00403025 */ move $a2,$v0 /* f144fb4: 3c198008 */ lui $t9,0x8008 /* f144fb8: 8f390140 */ lw $t9,0x140($t9) @@ -4556,7 +4556,7 @@ glabel var7f1b6c2cjf /* f144fc8: 27a502ec */ addiu $a1,$sp,0x2ec /* f144fcc: 02603025 */ move $a2,$s3 /* f144fd0: afa00014 */ sw $zero,0x14($sp) -/* f144fd4: 0fc55d49 */ jal 0xf157524 +/* f144fd4: 0fc55d49 */ jal textMeasure /* f144fd8: afb90010 */ sw $t9,0x10($sp) /* f144fdc: 8fa902ec */ lw $t1,0x2ec($sp) /* f144fe0: 8faf0094 */ lw $t7,0x94($sp) @@ -4584,13 +4584,13 @@ glabel var7f1b6c2cjf /* f145030: 27a502f4 */ addiu $a1,$sp,0x2f4 /* f145034: 27a602f0 */ addiu $a2,$sp,0x2f0 /* f145038: 27a702e4 */ addiu $a3,$sp,0x2e4 -/* f14503c: 0fc54bed */ jal 0xf152fb4 +/* f14503c: 0fc54bed */ jal func0f153858 /* f145040: afa302f4 */ sw $v1,0x2f4($sp) -/* f145044: 0c002eeb */ jal 0xbbac +/* f145044: 0c002eeb */ jal viGetWidth /* f145048: 0040a825 */ move $s5,$v0 /* f14504c: 00028400 */ sll $s0,$v0,0x10 /* f145050: 0010cc03 */ sra $t9,$s0,0x10 -/* f145054: 0c002eef */ jal 0xbbbc +/* f145054: 0c002eef */ jal viGetHeight /* f145058: 03208025 */ move $s0,$t9 /* f14505c: 3c0f8008 */ lui $t7,0x8008 /* f145060: 3c188008 */ lui $t8,0x8008 @@ -4609,17 +4609,17 @@ glabel var7f1b6c2cjf /* f145094: afb80014 */ sw $t8,0x14($sp) /* f145098: afaf0010 */ sw $t7,0x10($sp) /* f14509c: afae0018 */ sw $t6,0x18($sp) -/* f1450a0: 0fc55d34 */ jal 0xf1574d0 +/* f1450a0: 0fc55d34 */ jal func0f1574d0jf /* f1450a4: afb9001c */ sw $t9,0x1c($sp) /* f1450a8: 10000046 */ b .JF0f1451c4 /* f1450ac: 0040a825 */ move $s5,$v0 .JF0f1450b0: -/* f1450b0: 0fc5baa5 */ jal 0xf16ea94 +/* f1450b0: 0fc5baa5 */ jal langGet /* f1450b4: 240458d2 */ li $a0,0x58d2 /* f1450b8: 3c057f1b */ lui $a1,0x7f1b /* f1450bc: 24a56b14 */ addiu $a1,$a1,0x6b14 /* f1450c0: 02602025 */ move $a0,$s3 -/* f1450c4: 0c004d95 */ jal 0x13654 +/* f1450c4: 0c004d95 */ jal sprintf /* f1450c8: 00403025 */ move $a2,$v0 /* f1450cc: 3c0f8008 */ lui $t7,0x8008 /* f1450d0: 8def0140 */ lw $t7,0x140($t7) @@ -4629,7 +4629,7 @@ glabel var7f1b6c2cjf /* f1450e0: 27a502ec */ addiu $a1,$sp,0x2ec /* f1450e4: 02603025 */ move $a2,$s3 /* f1450e8: afa00014 */ sw $zero,0x14($sp) -/* f1450ec: 0fc55d49 */ jal 0xf157524 +/* f1450ec: 0fc55d49 */ jal textMeasure /* f1450f0: afaf0010 */ sw $t7,0x10($sp) /* f1450f4: 8fa902ec */ lw $t1,0x2ec($sp) /* f1450f8: 8fb80094 */ lw $t8,0x94($sp) @@ -4657,13 +4657,13 @@ glabel var7f1b6c2cjf /* f145148: 27a502f4 */ addiu $a1,$sp,0x2f4 /* f14514c: 27a602f0 */ addiu $a2,$sp,0x2f0 /* f145150: 27a702e4 */ addiu $a3,$sp,0x2e4 -/* f145154: 0fc54bed */ jal 0xf152fb4 +/* f145154: 0fc54bed */ jal func0f153858 /* f145158: afa302f4 */ sw $v1,0x2f4($sp) -/* f14515c: 0c002eeb */ jal 0xbbac +/* f14515c: 0c002eeb */ jal viGetWidth /* f145160: 0040a825 */ move $s5,$v0 /* f145164: 00028400 */ sll $s0,$v0,0x10 /* f145168: 00107c03 */ sra $t7,$s0,0x10 -/* f14516c: 0c002eef */ jal 0xbbbc +/* f14516c: 0c002eef */ jal viGetHeight /* f145170: 01e08025 */ move $s0,$t7 /* f145174: 3c188008 */ lui $t8,0x8008 /* f145178: 3c0e8008 */ lui $t6,0x8008 @@ -4682,7 +4682,7 @@ glabel var7f1b6c2cjf /* f1451ac: afae0014 */ sw $t6,0x14($sp) /* f1451b0: afb80010 */ sw $t8,0x10($sp) /* f1451b4: afb90018 */ sw $t9,0x18($sp) -/* f1451b8: 0fc55d34 */ jal 0xf1574d0 +/* f1451b8: 0fc55d34 */ jal func0f1574d0jf /* f1451bc: afaf001c */ sw $t7,0x1c($sp) /* f1451c0: 0040a825 */ move $s5,$v0 .JF0f1451c4: @@ -4691,12 +4691,12 @@ glabel var7f1b6c2cjf /* f1451cc: 91c3006b */ lbu $v1,0x6b($t6) /* f1451d0: 5460000b */ bnezl $v1,.JF0f145200 /* f1451d4: 24010001 */ li $at,0x1 -/* f1451d8: 0fc5baa5 */ jal 0xf16ea94 +/* f1451d8: 0fc5baa5 */ jal langGet /* f1451dc: 24045813 */ li $a0,0x5813 /* f1451e0: 3c057f1b */ lui $a1,0x7f1b /* f1451e4: 24a56b1c */ addiu $a1,$a1,0x6b1c /* f1451e8: 02602025 */ move $a0,$s3 -/* f1451ec: 0c004d95 */ jal 0x13654 +/* f1451ec: 0c004d95 */ jal sprintf /* f1451f0: 00403025 */ move $a2,$v0 /* f1451f4: 10000014 */ b .JF0f145248 /* f1451f8: 00000000 */ nop @@ -4704,22 +4704,22 @@ glabel var7f1b6c2cjf .JF0f145200: /* f145200: 1461000a */ bne $v1,$at,.JF0f14522c /* f145204: 00000000 */ nop -/* f145208: 0fc5baa5 */ jal 0xf16ea94 +/* f145208: 0fc5baa5 */ jal langGet /* f14520c: 24045892 */ li $a0,0x5892 /* f145210: 3c057f1b */ lui $a1,0x7f1b /* f145214: 24a56b20 */ addiu $a1,$a1,0x6b20 /* f145218: 02602025 */ move $a0,$s3 -/* f14521c: 0c004d95 */ jal 0x13654 +/* f14521c: 0c004d95 */ jal sprintf /* f145220: 00403025 */ move $a2,$v0 /* f145224: 10000008 */ b .JF0f145248 /* f145228: 00000000 */ nop .JF0f14522c: -/* f14522c: 0fc5baa5 */ jal 0xf16ea94 +/* f14522c: 0fc5baa5 */ jal langGet /* f145230: 2404589b */ li $a0,0x589b /* f145234: 3c057f1b */ lui $a1,0x7f1b /* f145238: 24a56b24 */ addiu $a1,$a1,0x6b24 /* f14523c: 02602025 */ move $a0,$s3 -/* f145240: 0c004d95 */ jal 0x13654 +/* f145240: 0c004d95 */ jal sprintf /* f145244: 00403025 */ move $a2,$v0 .JF0f145248: /* f145248: 3c198008 */ lui $t9,0x8008 @@ -4730,7 +4730,7 @@ glabel var7f1b6c2cjf /* f14525c: 27a502ec */ addiu $a1,$sp,0x2ec /* f145260: 02603025 */ move $a2,$s3 /* f145264: afa00014 */ sw $zero,0x14($sp) -/* f145268: 0fc55d49 */ jal 0xf157524 +/* f145268: 0fc55d49 */ jal textMeasure /* f14526c: afb90010 */ sw $t9,0x10($sp) /* f145270: 8faf02b0 */ lw $t7,0x2b0($sp) /* f145274: 8fb80094 */ lw $t8,0x94($sp) @@ -4766,13 +4766,13 @@ glabel var7f1b6c2cjf /* f1452dc: afb802e4 */ sw $t8,0x2e4($sp) /* f1452e0: 27a602f0 */ addiu $a2,$sp,0x2f0 /* f1452e4: 27a702e4 */ addiu $a3,$sp,0x2e4 -/* f1452e8: 0fc54bed */ jal 0xf152fb4 +/* f1452e8: 0fc54bed */ jal func0f153858 /* f1452ec: afa302f4 */ sw $v1,0x2f4($sp) -/* f1452f0: 0c002eeb */ jal 0xbbac +/* f1452f0: 0c002eeb */ jal viGetWidth /* f1452f4: 0040a825 */ move $s5,$v0 /* f1452f8: 00028400 */ sll $s0,$v0,0x10 /* f1452fc: 0010c403 */ sra $t8,$s0,0x10 -/* f145300: 0c002eef */ jal 0xbbbc +/* f145300: 0c002eef */ jal viGetHeight /* f145304: 03008025 */ move $s0,$t8 /* f145308: 3c0e8008 */ lui $t6,0x8008 /* f14530c: 3c198008 */ lui $t9,0x8008 @@ -4791,7 +4791,7 @@ glabel var7f1b6c2cjf /* f145340: afb90014 */ sw $t9,0x14($sp) /* f145344: afae0010 */ sw $t6,0x10($sp) /* f145348: afaf0018 */ sw $t7,0x18($sp) -/* f14534c: 0fc55d34 */ jal 0xf1574d0 +/* f14534c: 0fc55d34 */ jal func0f1574d0jf /* f145350: afb8001c */ sw $t8,0x1c($sp) /* f145354: 8ece0284 */ lw $t6,0x284($s6) /* f145358: 0040a825 */ move $s5,$v0 @@ -4802,22 +4802,22 @@ glabel var7f1b6c2cjf /* f14536c: 1461000a */ bne $v1,$at,.JF0f145398 /* f145370: 00000000 */ nop .JF0f145374: -/* f145374: 0fc5baa5 */ jal 0xf16ea94 +/* f145374: 0fc5baa5 */ jal langGet /* f145378: 24045814 */ li $a0,0x5814 /* f14537c: 3c057f1b */ lui $a1,0x7f1b /* f145380: 24a56b28 */ addiu $a1,$a1,0x6b28 /* f145384: 02602025 */ move $a0,$s3 -/* f145388: 0c004d95 */ jal 0x13654 +/* f145388: 0c004d95 */ jal sprintf /* f14538c: 00403025 */ move $a2,$v0 /* f145390: 10000008 */ b .JF0f1453b4 /* f145394: 00000000 */ nop .JF0f145398: -/* f145398: 0fc5baa5 */ jal 0xf16ea94 +/* f145398: 0fc5baa5 */ jal langGet /* f14539c: 24045891 */ li $a0,0x5891 /* f1453a0: 3c057f1b */ lui $a1,0x7f1b /* f1453a4: 24a56b2c */ addiu $a1,$a1,0x6b2c /* f1453a8: 02602025 */ move $a0,$s3 -/* f1453ac: 0c004d95 */ jal 0x13654 +/* f1453ac: 0c004d95 */ jal sprintf /* f1453b0: 00403025 */ move $a2,$v0 .JF0f1453b4: /* f1453b4: 3c0f8008 */ lui $t7,0x8008 @@ -4828,7 +4828,7 @@ glabel var7f1b6c2cjf /* f1453c8: 27a502ec */ addiu $a1,$sp,0x2ec /* f1453cc: 02603025 */ move $a2,$s3 /* f1453d0: afa00014 */ sw $zero,0x14($sp) -/* f1453d4: 0fc55d49 */ jal 0xf157524 +/* f1453d4: 0fc55d49 */ jal textMeasure /* f1453d8: afaf0010 */ sw $t7,0x10($sp) /* f1453dc: 8fa902ec */ lw $t1,0x2ec($sp) /* f1453e0: 8fb80094 */ lw $t8,0x94($sp) @@ -4856,13 +4856,13 @@ glabel var7f1b6c2cjf /* f145430: 27a502f4 */ addiu $a1,$sp,0x2f4 /* f145434: 27a602f0 */ addiu $a2,$sp,0x2f0 /* f145438: 27a702e4 */ addiu $a3,$sp,0x2e4 -/* f14543c: 0fc54bed */ jal 0xf152fb4 +/* f14543c: 0fc54bed */ jal func0f153858 /* f145440: afa302f4 */ sw $v1,0x2f4($sp) -/* f145444: 0c002eeb */ jal 0xbbac +/* f145444: 0c002eeb */ jal viGetWidth /* f145448: 0040a825 */ move $s5,$v0 /* f14544c: 00028400 */ sll $s0,$v0,0x10 /* f145450: 00107c03 */ sra $t7,$s0,0x10 -/* f145454: 0c002eef */ jal 0xbbbc +/* f145454: 0c002eef */ jal viGetHeight /* f145458: 01e08025 */ move $s0,$t7 /* f14545c: 3c188008 */ lui $t8,0x8008 /* f145460: 3c0e8008 */ lui $t6,0x8008 @@ -4881,13 +4881,13 @@ glabel var7f1b6c2cjf /* f145494: afae0014 */ sw $t6,0x14($sp) /* f145498: afb80010 */ sw $t8,0x10($sp) /* f14549c: afb90018 */ sw $t9,0x18($sp) -/* f1454a0: 0fc55d34 */ jal 0xf1574d0 +/* f1454a0: 0fc55d34 */ jal func0f1574d0jf /* f1454a4: afaf001c */ sw $t7,0x1c($sp) -/* f1454a8: 0fc54be5 */ jal 0xf152f94 +/* f1454a8: 0fc54be5 */ jal func0f153838 /* f1454ac: 00402025 */ move $a0,$v0 /* f1454b0: 8ed80288 */ lw $t8,0x288($s6) /* f1454b4: 0040a825 */ move $s5,$v0 -/* f1454b8: 0fc5475a */ jal 0xf151d68 +/* f1454b8: 0fc5475a */ jal optionsGetContpadNum1 /* f1454bc: 8f040070 */ lw $a0,0x70($t8) /* f1454c0: 00028600 */ sll $s0,$v0,0x18 /* f1454c4: 00022600 */ sll $a0,$v0,0x18 @@ -4895,25 +4895,25 @@ glabel var7f1b6c2cjf /* f1454cc: 0004ce03 */ sra $t9,$a0,0x18 /* f1454d0: 01c08025 */ move $s0,$t6 /* f1454d4: 03202025 */ move $a0,$t9 -/* f1454d8: 0c0053be */ jal 0x14ef8 +/* f1454d8: 0c0053be */ jal joyGetButtons /* f1454dc: 3405ffff */ li $a1,0xffff /* f1454e0: 00102600 */ sll $a0,$s0,0x18 /* f1454e4: 00047e03 */ sra $t7,$a0,0x18 /* f1454e8: 01e02025 */ move $a0,$t7 /* f1454ec: 3051ffff */ andi $s1,$v0,0xffff -/* f1454f0: 0c0053ee */ jal 0x14fb8 +/* f1454f0: 0c0053ee */ jal joyGetButtonsPressedThisFrame /* f1454f4: 3405ffff */ li $a1,0xffff /* f1454f8: 00102600 */ sll $a0,$s0,0x18 /* f1454fc: 0004c603 */ sra $t8,$a0,0x18 /* f145500: 3052ffff */ andi $s2,$v0,0xffff -/* f145504: 0c00536a */ jal 0x14da8 +/* f145504: 0c00536a */ jal joyGetStickX /* f145508: 03002025 */ move $a0,$t8 /* f14550c: 0002a600 */ sll $s4,$v0,0x18 /* f145510: 00102600 */ sll $a0,$s0,0x18 /* f145514: 0004ce03 */ sra $t9,$a0,0x18 /* f145518: 00147603 */ sra $t6,$s4,0x18 /* f14551c: 01c0a025 */ move $s4,$t6 -/* f145520: 0c005394 */ jal 0x14e50 +/* f145520: 0c005394 */ jal joyGetStickY /* f145524: 03202025 */ move $a0,$t9 /* f145528: 02a01825 */ move $v1,$s5 /* f14552c: 26b50008 */ addiu $s5,$s5,0x8 @@ -6822,7 +6822,7 @@ glabel var7f1b6c2cjf /* f14716c: a3a000cf */ sb $zero,0xcf($sp) .JF0f147170: /* f147170: afa500c8 */ sw $a1,0xc8($sp) -/* f147174: 0fc35617 */ jal 0xf0d585c +/* f147174: 0fc35617 */ jal func0f0d479c /* f147178: e7ae007c */ swc1 $f14,0x7c($sp) /* f14717c: c7ae007c */ lwc1 $f14,0x7c($sp) /* f147180: 3c0eb600 */ lui $t6,0xb600 @@ -6925,7 +6925,7 @@ glabel var7f1b6c2cjf /* f1472f4: 03197023 */ subu $t6,$t8,$t9 /* f1472f8: 448e2000 */ mtc1 $t6,$f4 /* f1472fc: afa302f4 */ sw $v1,0x2f4($sp) -/* f147300: 0c012838 */ jal 0x4a0e0 +/* f147300: 0c012838 */ jal sqrtf /* f147304: 46802320 */ cvt.s.w $f12,$f4 /* f147308: c7a80074 */ lwc1 $f8,0x74($sp) /* f14730c: c7a60078 */ lwc1 $f6,0x78($sp) @@ -6949,7 +6949,7 @@ glabel var7f1b6c2cjf /* f147354: 44035000 */ mfc1 $v1,$f10 /* f147358: 46802320 */ cvt.s.w $f12,$f4 /* f14735c: afa30244 */ sw $v1,0x244($sp) -/* f147360: 0c012838 */ jal 0x4a0e0 +/* f147360: 0c012838 */ jal sqrtf /* f147364: afa302f4 */ sw $v1,0x2f4($sp) /* f147368: c7a60074 */ lwc1 $f6,0x74($sp) /* f14736c: c7a80078 */ lwc1 $f8,0x78($sp) @@ -6979,7 +6979,7 @@ glabel var7f1b6c2cjf /* f1473cc: 14600006 */ bnez $v1,.JF0f1473e8 /* f1473d0: 00000000 */ nop /* f1473d4: afa00010 */ sw $zero,0x10($sp) -/* f1473d8: 0fc50e93 */ jal 0xf143a4c +/* f1473d8: 0fc50e93 */ jal bviewRenderEyespySideRect /* f1473dc: afa20014 */ sw $v0,0x14($sp) /* f1473e0: 10000017 */ b .JF0f147440 /* f1473e4: 0040a825 */ move $s5,$v0 @@ -6993,7 +6993,7 @@ glabel var7f1b6c2cjf /* f147400: 27a5022c */ addiu $a1,$sp,0x22c /* f147404: 24060010 */ li $a2,0x10 /* f147408: 326700ff */ andi $a3,$s3,0xff -/* f14740c: 0fc50e93 */ jal 0xf143a4c +/* f14740c: 0fc50e93 */ jal bviewRenderEyespySideRect /* f147410: afa20014 */ sw $v0,0x14($sp) /* f147414: 1000000a */ b .JF0f147440 /* f147418: 0040a825 */ move $s5,$v0 @@ -7004,7 +7004,7 @@ glabel var7f1b6c2cjf /* f147428: 27a5022c */ addiu $a1,$sp,0x22c /* f14742c: 326600ff */ andi $a2,$s3,0xff /* f147430: afa00010 */ sw $zero,0x10($sp) -/* f147434: 0fc50e93 */ jal 0xf143a4c +/* f147434: 0fc50e93 */ jal bviewRenderEyespySideRect /* f147438: afa20014 */ sw $v0,0x14($sp) /* f14743c: 0040a825 */ move $s5,$v0 .JF0f147440: @@ -7081,7 +7081,7 @@ glabel var7f1b6c2cjf /* f147544: 01cfc023 */ subu $t8,$t6,$t7 /* f147548: 44984000 */ mtc1 $t8,$f8 /* f14754c: afa802f0 */ sw $t0,0x2f0($sp) -/* f147550: 0c012838 */ jal 0x4a0e0 +/* f147550: 0c012838 */ jal sqrtf /* f147554: 46804320 */ cvt.s.w $f12,$f8 /* f147558: c7aa0074 */ lwc1 $f10,0x74($sp) /* f14755c: c7a60078 */ lwc1 $f6,0x78($sp) @@ -7105,7 +7105,7 @@ glabel var7f1b6c2cjf /* f1475a4: 44033000 */ mfc1 $v1,$f6 /* f1475a8: 46804320 */ cvt.s.w $f12,$f8 /* f1475ac: afa30244 */ sw $v1,0x244($sp) -/* f1475b0: 0c012838 */ jal 0x4a0e0 +/* f1475b0: 0c012838 */ jal sqrtf /* f1475b4: afa302f4 */ sw $v1,0x2f4($sp) /* f1475b8: c7aa0074 */ lwc1 $f10,0x74($sp) /* f1475bc: c7a60078 */ lwc1 $f6,0x78($sp) @@ -7135,7 +7135,7 @@ glabel var7f1b6c2cjf /* f14761c: 14600006 */ bnez $v1,.JF0f147638 /* f147620: 00000000 */ nop /* f147624: afa00010 */ sw $zero,0x10($sp) -/* f147628: 0fc50e93 */ jal 0xf143a4c +/* f147628: 0fc50e93 */ jal bviewRenderEyespySideRect /* f14762c: afa20014 */ sw $v0,0x14($sp) /* f147630: 10000017 */ b .JF0f147690 /* f147634: 0040a825 */ move $s5,$v0 @@ -7149,7 +7149,7 @@ glabel var7f1b6c2cjf /* f147650: 27a5022c */ addiu $a1,$sp,0x22c /* f147654: 24060010 */ li $a2,0x10 /* f147658: 326700ff */ andi $a3,$s3,0xff -/* f14765c: 0fc50e93 */ jal 0xf143a4c +/* f14765c: 0fc50e93 */ jal bviewRenderEyespySideRect /* f147660: afa20014 */ sw $v0,0x14($sp) /* f147664: 1000000a */ b .JF0f147690 /* f147668: 0040a825 */ move $s5,$v0 @@ -7160,7 +7160,7 @@ glabel var7f1b6c2cjf /* f147678: 27a5022c */ addiu $a1,$sp,0x22c /* f14767c: 326600ff */ andi $a2,$s3,0xff /* f147680: afa00010 */ sw $zero,0x10($sp) -/* f147684: 0fc50e93 */ jal 0xf143a4c +/* f147684: 0fc50e93 */ jal bviewRenderEyespySideRect /* f147688: afa20014 */ sw $v0,0x14($sp) /* f14768c: 0040a825 */ move $s5,$v0 .JF0f147690: @@ -7172,7 +7172,7 @@ glabel var7f1b6c2cjf /* f1476a4: 25080002 */ addiu $t0,$t0,0x2 /* f1476a8: afa802f0 */ sw $t0,0x2f0($sp) .JF0f1476ac: -/* f1476ac: 0fc356a2 */ jal 0xf0d5a88 +/* f1476ac: 0fc356a2 */ jal func0f0d49c8 /* f1476b0: 02a02025 */ move $a0,$s5 .JF0f1476b4: /* f1476b4: 8fbf0054 */ lw $ra,0x54($sp) diff --git a/src/game/cheats.c b/src/game/cheats.c index ec5644b0e..efab2ab05 100644 --- a/src/game/cheats.c +++ b/src/game/cheats.c @@ -474,22 +474,22 @@ glabel cheatGetMarquee /* f107c40: 254a4794 */ addiu $t2,$t2,0x4794 /* f107c44: 1542000f */ bne $t2,$v0,.JF0f107c84 /* f107c48: 00000000 */ nop -/* f107c4c: 0fc5baa5 */ jal 0xf16ea94 +/* f107c4c: 0fc5baa5 */ jal langGet /* f107c50: 24045490 */ li $a0,0x5490 /* f107c54: afa20054 */ sw $v0,0x54($sp) -/* f107c58: 0fc5baa5 */ jal 0xf16ea94 +/* f107c58: 0fc5baa5 */ jal langGet /* f107c5c: 24045476 */ li $a0,0x5476 /* f107c60: 3c04800a */ lui $a0,0x800a /* f107c64: 3c057f1b */ lui $a1,0x7f1b /* f107c68: 24a53b80 */ addiu $a1,$a1,0x3b80 /* f107c6c: 2484e590 */ addiu $a0,$a0,-6768 /* f107c70: 8fa60054 */ lw $a2,0x54($sp) -/* f107c74: 0c004d95 */ jal 0x13654 +/* f107c74: 0c004d95 */ jal sprintf /* f107c78: 00403825 */ move $a3,$v0 /* f107c7c: 100000cd */ b .JF0f107fb4 /* f107c80: 00000000 */ nop .JF0f107c84: -/* f107c84: 0fc41ba4 */ jal 0xf106e90 +/* f107c84: 0fc41ba4 */ jal cheatIsUnlocked /* f107c88: afa40264 */ sw $a0,0x264($sp) /* f107c8c: 10400028 */ beqz $v0,.JF0f107d30 /* f107c90: 8fa90264 */ lw $t1,0x264($sp) @@ -510,12 +510,12 @@ glabel cheatGetMarquee /* f107ccc: 8dcf0000 */ lw $t7,0x0($t6) /* f107cd0: 156f0005 */ bne $t3,$t7,.JF0f107ce8 /* f107cd4: 00000000 */ nop -/* f107cd8: 0fc5baa5 */ jal 0xf16ea94 +/* f107cd8: 0fc5baa5 */ jal langGet /* f107cdc: 24045490 */ li $a0,0x5490 /* f107ce0: 10000004 */ b .JF0f107cf4 /* f107ce4: afa20054 */ sw $v0,0x54($sp) .JF0f107ce8: -/* f107ce8: 0fc5baa5 */ jal 0xf16ea94 +/* f107ce8: 0fc5baa5 */ jal langGet /* f107cec: 24045489 */ li $a0,0x5489 /* f107cf0: afa20054 */ sw $v0,0x54($sp) .JF0f107cf4: @@ -523,14 +523,14 @@ glabel cheatGetMarquee /* f107cf8: 3c048007 */ lui $a0,0x8007 /* f107cfc: 0018c8c0 */ sll $t9,$t8,0x3 /* f107d00: 00992021 */ addu $a0,$a0,$t9 -/* f107d04: 0fc5baa5 */ jal 0xf16ea94 +/* f107d04: 0fc5baa5 */ jal langGet /* f107d08: 94844070 */ lhu $a0,0x4070($a0) /* f107d0c: 3c04800a */ lui $a0,0x800a /* f107d10: 3c057f1b */ lui $a1,0x7f1b /* f107d14: 24a53b88 */ addiu $a1,$a1,0x3b88 /* f107d18: 2484e590 */ addiu $a0,$a0,-6768 /* f107d1c: 8fa60054 */ lw $a2,0x54($sp) -/* f107d20: 0c004d95 */ jal 0x13654 +/* f107d20: 0c004d95 */ jal sprintf /* f107d24: 00403825 */ move $a3,$v0 /* f107d28: 100000a2 */ b .JF0f107fb4 /* f107d2c: 00000000 */ nop @@ -540,10 +540,10 @@ glabel cheatGetMarquee /* f107d38: 000950c0 */ sll $t2,$t1,0x3 /* f107d3c: 014c1021 */ addu $v0,$t2,$t4 /* f107d40: 94440000 */ lhu $a0,0x0($v0) -/* f107d44: 0fc5baa5 */ jal 0xf16ea94 +/* f107d44: 0fc5baa5 */ jal langGet /* f107d48: afa20040 */ sw $v0,0x40($sp) /* f107d4c: 27a40060 */ addiu $a0,$sp,0x60 -/* f107d50: 0c004c34 */ jal 0x130d0 +/* f107d50: 0c004c34 */ jal strcpy /* f107d54: 00402825 */ move $a1,$v0 /* f107d58: 93ad0060 */ lbu $t5,0x60($sp) /* f107d5c: 2406000a */ li $a2,0xa @@ -561,7 +561,7 @@ glabel cheatGetMarquee /* f107d84: 316f0004 */ andi $t7,$t3,0x4 /* f107d88: 51e00029 */ beqzl $t7,.JF0f107e30 /* f107d8c: 90440005 */ lbu $a0,0x5($v0) -/* f107d90: 0fc5baa5 */ jal 0xf16ea94 +/* f107d90: 0fc5baa5 */ jal langGet /* f107d94: 2404548a */ li $a0,0x548a /* f107d98: 8fb80040 */ lw $t8,0x40($sp) /* f107d9c: afa2004c */ sw $v0,0x4c($sp) @@ -571,7 +571,7 @@ glabel cheatGetMarquee /* f107dac: 01394823 */ subu $t1,$t1,$t9 /* f107db0: 00094880 */ sll $t1,$t1,0x2 /* f107db4: 00892021 */ addu $a0,$a0,$t1 -/* f107db8: 0fc5baa5 */ jal 0xf16ea94 +/* f107db8: 0fc5baa5 */ jal langGet /* f107dbc: 948423a6 */ lhu $a0,0x23a6($a0) /* f107dc0: 8faa0040 */ lw $t2,0x40($sp) /* f107dc4: afa20050 */ sw $v0,0x50($sp) @@ -581,10 +581,10 @@ glabel cheatGetMarquee /* f107dd4: 01ac6823 */ subu $t5,$t5,$t4 /* f107dd8: 000d6880 */ sll $t5,$t5,0x2 /* f107ddc: 008d2021 */ addu $a0,$a0,$t5 -/* f107de0: 0fc5baa5 */ jal 0xf16ea94 +/* f107de0: 0fc5baa5 */ jal langGet /* f107de4: 948423a8 */ lhu $a0,0x23a8($a0) /* f107de8: afa20054 */ sw $v0,0x54($sp) -/* f107dec: 0fc5baa5 */ jal 0xf16ea94 +/* f107dec: 0fc5baa5 */ jal langGet /* f107df0: 2404548b */ li $a0,0x548b /* f107df4: 8fae0054 */ lw $t6,0x54($sp) /* f107df8: 3c04800a */ lui $a0,0x800a @@ -596,16 +596,16 @@ glabel cheatGetMarquee /* f107e10: 8fa6004c */ lw $a2,0x4c($sp) /* f107e14: 8fa70050 */ lw $a3,0x50($sp) /* f107e18: afa20014 */ sw $v0,0x14($sp) -/* f107e1c: 0c004d95 */ jal 0x13654 +/* f107e1c: 0c004d95 */ jal sprintf /* f107e20: afae0010 */ sw $t6,0x10($sp) /* f107e24: 10000054 */ b .JF0f107f78 /* f107e28: 8fae0040 */ lw $t6,0x40($sp) /* f107e2c: 90440005 */ lbu $a0,0x5($v0) .JF0f107e30: -/* f107e30: 0fc5baa5 */ jal 0xf16ea94 +/* f107e30: 0fc5baa5 */ jal langGet /* f107e34: 248456fb */ addiu $a0,$a0,0x56fb /* f107e38: 27a40160 */ addiu $a0,$sp,0x160 -/* f107e3c: 0c004c34 */ jal 0x130d0 +/* f107e3c: 0c004c34 */ jal strcpy /* f107e40: 00402825 */ move $a1,$v0 /* f107e44: 93af0160 */ lbu $t7,0x160($sp) /* f107e48: 2406000a */ li $a2,0xa @@ -618,7 +618,7 @@ glabel cheatGetMarquee /* f107e60: 54d8fffe */ bnel $a2,$t8,.JF0f107e5c /* f107e64: 90780001 */ lbu $t8,0x1($v1) .JF0f107e68: -/* f107e68: 0fc5baa5 */ jal 0xf16ea94 +/* f107e68: 0fc5baa5 */ jal langGet /* f107e6c: a0600000 */ sb $zero,0x0($v1) /* f107e70: 8fb90040 */ lw $t9,0x40($sp) /* f107e74: afa20044 */ sw $v0,0x44($sp) @@ -628,7 +628,7 @@ glabel cheatGetMarquee /* f107e84: 01495023 */ subu $t2,$t2,$t1 /* f107e88: 000a5080 */ sll $t2,$t2,0x2 /* f107e8c: 008a2021 */ addu $a0,$a0,$t2 -/* f107e90: 0fc5baa5 */ jal 0xf16ea94 +/* f107e90: 0fc5baa5 */ jal langGet /* f107e94: 948423a6 */ lhu $a0,0x23a6($a0) /* f107e98: 8fac0040 */ lw $t4,0x40($sp) /* f107e9c: afa20048 */ sw $v0,0x48($sp) @@ -638,16 +638,16 @@ glabel cheatGetMarquee /* f107eac: 01cd7023 */ subu $t6,$t6,$t5 /* f107eb0: 000e7080 */ sll $t6,$t6,0x2 /* f107eb4: 008e2021 */ addu $a0,$a0,$t6 -/* f107eb8: 0fc5baa5 */ jal 0xf16ea94 +/* f107eb8: 0fc5baa5 */ jal langGet /* f107ebc: 948423a8 */ lhu $a0,0x23a8($a0) /* f107ec0: afa2004c */ sw $v0,0x4c($sp) -/* f107ec4: 0fc5baa5 */ jal 0xf16ea94 +/* f107ec4: 0fc5baa5 */ jal langGet /* f107ec8: 2404548c */ li $a0,0x548c /* f107ecc: afa20050 */ sw $v0,0x50($sp) -/* f107ed0: 0fc5baa5 */ jal 0xf16ea94 +/* f107ed0: 0fc5baa5 */ jal langGet /* f107ed4: 2404548d */ li $a0,0x548d /* f107ed8: afa20054 */ sw $v0,0x54($sp) -/* f107edc: 0fc5baa5 */ jal 0xf16ea94 +/* f107edc: 0fc5baa5 */ jal langGet /* f107ee0: 2404548b */ li $a0,0x548b /* f107ee4: 8fab004c */ lw $t3,0x4c($sp) /* f107ee8: 8faf0050 */ lw $t7,0x50($sp) @@ -685,7 +685,7 @@ glabel cheatGetMarquee /* f107f64: 00000000 */ nop /* f107f68: 0006000d */ break 0x6 .JF0f107f6c: -/* f107f6c: 0c004d95 */ jal 0x13654 +/* f107f6c: 0c004d95 */ jal sprintf /* f107f70: 00000000 */ nop /* f107f74: 8fae0040 */ lw $t6,0x40($sp) .JF0f107f78: @@ -693,21 +693,21 @@ glabel cheatGetMarquee /* f107f7c: 316f0002 */ andi $t7,$t3,0x2 /* f107f80: 11e00007 */ beqz $t7,.JF0f107fa0 /* f107f84: 00000000 */ nop -/* f107f88: 0fc5baa5 */ jal 0xf16ea94 +/* f107f88: 0fc5baa5 */ jal langGet /* f107f8c: 2404548e */ li $a0,0x548e /* f107f90: 3c04800a */ lui $a0,0x800a /* f107f94: 2484e590 */ addiu $a0,$a0,-6768 -/* f107f98: 0c004c71 */ jal 0x131c4 +/* f107f98: 0c004c71 */ jal strcat /* f107f9c: 00402825 */ move $a1,$v0 .JF0f107fa0: /* f107fa0: 3c04800a */ lui $a0,0x800a /* f107fa4: 3c057f1b */ lui $a1,0x7f1b /* f107fa8: 24a53bc0 */ addiu $a1,$a1,0x3bc0 -/* f107fac: 0c004c71 */ jal 0x131c4 +/* f107fac: 0c004c71 */ jal strcat /* f107fb0: 2484e590 */ addiu $a0,$a0,-6768 .JF0f107fb4: /* f107fb4: 3c04800a */ lui $a0,0x800a -/* f107fb8: 0c012847 */ jal 0x4a11c +/* f107fb8: 0c012847 */ jal strlen /* f107fbc: 2484e590 */ addiu $a0,$a0,-6768 /* f107fc0: 3c188007 */ lui $t8,0x8007 /* f107fc4: 8f18422c */ lw $t8,0x422c($t8) @@ -726,7 +726,7 @@ glabel cheatGetMarquee /* f107ff4: 10000003 */ b .JF0f108004 /* f107ff8: 2442e590 */ addiu $v0,$v0,-6768 .JF0f107ffc: -/* f107ffc: 0fc5baa5 */ jal 0xf16ea94 +/* f107ffc: 0fc5baa5 */ jal langGet /* f108000: 2404548f */ li $a0,0x548f .JF0f108004: /* f108004: 8fbf0034 */ lw $ra,0x34($sp) diff --git a/src/game/chr/chraction.c b/src/game/chr/chraction.c index 7b44d41b1..01df3bd1d 100644 --- a/src/game/chr/chraction.c +++ b/src/game/chr/chraction.c @@ -6518,7 +6518,7 @@ glabel chrCanSeeTarget /* f03a58c: 27bdffe0 */ addiu $sp,$sp,-32 /* f03a590: afbf0014 */ sw $ra,0x14($sp) /* f03a594: afa40020 */ sw $a0,0x20($sp) -/* f03a598: 0fc0a693 */ jal 0xf029a4c +/* f03a598: 0fc0a693 */ jal chrGetTargetProp /* f03a59c: afa0001c */ sw $zero,0x1c($sp) /* f03a5a0: 5040000d */ beqzl $v0,.JF0f03a5d8 /* f03a5a4: 8fbf0014 */ lw $ra,0x14($sp) @@ -6527,11 +6527,11 @@ glabel chrCanSeeTarget /* f03a5b0: 00003025 */ move $a2,$zero /* f03a5b4: 51c00008 */ beqzl $t6,.JF0f03a5d8 /* f03a5b8: 8fbf0014 */ lw $ra,0x14($sp) -/* f03a5bc: 0fc0e914 */ jal 0xf03a450 +/* f03a5bc: 0fc0e914 */ jal chrCanSeeChr /* f03a5c0: 8c450004 */ lw $a1,0x4($v0) /* f03a5c4: 10400003 */ beqz $v0,.JF0f03a5d4 /* f03a5c8: afa2001c */ sw $v0,0x1c($sp) -/* f03a5cc: 0fc0e855 */ jal 0xf03a154 +/* f03a5cc: 0fc0e855 */ jal chrRecordLastVisibleTargetTime /* f03a5d0: 8fa40020 */ lw $a0,0x20($sp) .JF0f03a5d4: /* f03a5d4: 8fbf0014 */ lw $ra,0x14($sp) @@ -23004,7 +23004,7 @@ glabel func0f048398 /* f0495cc: afb30024 */ sw $s3,0x24($sp) /* f0495d0: afb20020 */ sw $s2,0x20($sp) /* f0495d4: afb1001c */ sw $s1,0x1c($sp) -/* f0495d8: 0fc07dbc */ jal 0xf01f6f0 +/* f0495d8: 0fc07dbc */ jal chrsGetNumSlots /* f0495dc: afb00018 */ sw $s0,0x18($sp) /* f0495e0: 3c168006 */ lui $s6,0x8006 /* f0495e4: 3c178006 */ lui $s7,0x8006 @@ -23039,11 +23039,11 @@ glabel func0f048398 /* f049654: 8e19001c */ lw $t9,0x1c($s0) /* f049658: 53200046 */ beqzl $t9,.JF0f049774 /* f04965c: 8faa00e0 */ lw $t2,0xe0($sp) -/* f049660: 0fc0eb32 */ jal 0xf03acc8 +/* f049660: 0fc0eb32 */ jal chrIsDead /* f049664: 02002025 */ move $a0,$s0 /* f049668: 54400042 */ bnezl $v0,.JF0f049774 /* f04966c: 8faa00e0 */ lw $t2,0xe0($sp) -/* f049670: 0fc0a693 */ jal 0xf029a4c +/* f049670: 0fc0a693 */ jal chrGetTargetProp /* f049674: 02002025 */ move $a0,$s0 /* f049678: 1040003d */ beqz $v0,.JF0f049770 /* f04967c: 00403825 */ move $a3,$v0 @@ -23068,7 +23068,7 @@ glabel func0f048398 /* f0496c4: 8ce20004 */ lw $v0,0x4($a3) /* f0496c8: 8ce50004 */ lw $a1,0x4($a3) .JF0f0496cc: -/* f0496cc: 0fc12ecc */ jal 0xf04bb30 +/* f0496cc: 0fc12ecc */ jal chrCompareTeams /* f0496d0: afa7006c */ sw $a3,0x6c($sp) /* f0496d4: 14400009 */ bnez $v0,.JF0f0496fc /* f0496d8: 8fa7006c */ lw $a3,0x6c($sp) @@ -23132,17 +23132,17 @@ glabel func0f048398 /* f0497a4: 3c018007 */ lui $at,0x8007 /* f0497a8: ac2083a4 */ sw $zero,-0x7c5c($at) .JF0f0497ac: -/* f0497ac: 0fc47cac */ jal 0xf11f2b0 +/* f0497ac: 0fc47cac */ jal debugDangerousProps /* f0497b0: 00000000 */ nop /* f0497b4: 50400004 */ beqzl $v0,.JF0f0497c8 /* f0497b8: 83c204d2 */ lb $v0,0x4d2($s8) -/* f0497bc: 0fc112de */ jal 0xf044b78 +/* f0497bc: 0fc112de */ jal propPrintDangerous /* f0497c0: 00000000 */ nop /* f0497c4: 83c204d2 */ lb $v0,0x4d2($s8) .JF0f0497c8: /* f0497c8: 04400007 */ bltz $v0,.JF0f0497e8 /* f0497cc: 00000000 */ nop -/* f0497d0: 0fc12539 */ jal 0xf0494e4 +/* f0497d0: 0fc12539 */ jal cutsceneStart /* f0497d4: 24440c00 */ addiu $a0,$v0,0xc00 /* f0497d8: 240bffff */ li $t3,-1 /* f0497dc: 240c0001 */ li $t4,0x1 @@ -23165,7 +23165,7 @@ glabel func0f048398 /* f049818: 53000006 */ beqzl $t8,.JF0f049834 /* f04981c: 26520001 */ addiu $s2,$s2,0x1 .JF0f049820: -/* f049820: 0fc123ad */ jal 0xf048eb4 +/* f049820: 0fc123ad */ jal chraTick /* f049824: 02222021 */ addu $a0,$s1,$v0 /* f049828: 3c038006 */ lui $v1,0x8006 /* f04982c: 8c637db0 */ lw $v1,0x7db0($v1) @@ -23247,7 +23247,7 @@ glabel func0f048398 /* f04993c: 14200019 */ bnez $at,.JF0f0499a4 /* f049940: 24630004 */ addiu $v1,$v1,0x4 /* f049944: afa30048 */ sw $v1,0x48($sp) -/* f049948: 0c004b60 */ jal 0x12d80 +/* f049948: 0c004b60 */ jal random /* f04994c: afa6005c */ sw $a2,0x5c($sp) /* f049950: 0055001b */ divu $zero,$v0,$s5 /* f049954: 00002810 */ mfhi $a1 @@ -23261,7 +23261,7 @@ glabel func0f048398 /* f049974: 0007000d */ break 0x7 .JF0f049978: /* f049978: 8de40000 */ lw $a0,0x0($t7) -/* f04997c: 0fc0f7c4 */ jal 0xf03df10 +/* f04997c: 0fc0f7c4 */ jal chrFadeCorpse /* f049980: 00000000 */ nop /* f049984: 8fa30048 */ lw $v1,0x48($sp) /* f049988: 0010c880 */ sll $t9,$s0,0x2 @@ -23329,7 +23329,7 @@ glabel func0f048398 /* f049a64: 8c89002c */ lw $t1,0x2c($a0) /* f049a68: 55200005 */ bnezl $t1,.JF0f049a80 /* f049a6c: 26520001 */ addiu $s2,$s2,0x1 -/* f049a70: 0fc0f7c4 */ jal 0xf03df10 +/* f049a70: 0fc0f7c4 */ jal chrFadeCorpse /* f049a74: 00000000 */ nop /* f049a78: 8fa500e0 */ lw $a1,0xe0($sp) /* f049a7c: 26520001 */ addiu $s2,$s2,0x1 diff --git a/src/game/credits.c b/src/game/credits.c index 4b6a2382c..44792c0df 100644 --- a/src/game/credits.c +++ b/src/game/credits.c @@ -3304,7 +3304,7 @@ glabel var7f1b6608jf /* f13a848: 4481a000 */ mtc1 $at,$f20 /* f13a84c: 27b601c4 */ addiu $s6,$sp,0x1c4 .JF0f13a850: -/* f13a850: 0fc4e939 */ jal 0xf13a4e4 +/* f13a850: 0fc4e939 */ jal creditGetByRow /* f13a854: 02a02025 */ move $a0,$s5 /* f13a858: 1440000d */ bnez $v0,.JF0f13a890 /* f13a85c: aec20000 */ sw $v0,0x0($s6) @@ -3344,11 +3344,11 @@ glabel var7f1b6608jf /* f13a8e0: 0058a021 */ addu $s4,$v0,$t8 /* f13a8e4: afaf0074 */ sw $t7,0x74($sp) /* f13a8e8: afae0078 */ sw $t6,0x78($sp) -/* f13a8ec: 0fc5baa5 */ jal 0xf16ea94 +/* f13a8ec: 0fc5baa5 */ jal langGet /* f13a8f0: afac0080 */ sw $t4,0x80($sp) /* f13a8f4: 8ed90000 */ lw $t9,0x0($s6) /* f13a8f8: ae820000 */ sw $v0,0x0($s4) -/* f13a8fc: 0fc5baa5 */ jal 0xf16ea94 +/* f13a8fc: 0fc5baa5 */ jal langGet /* f13a900: 97240004 */ lhu $a0,0x4($t9) /* f13a904: 8ec30000 */ lw $v1,0x0($s6) /* f13a908: ae820004 */ sw $v0,0x4($s4) @@ -3441,7 +3441,7 @@ glabel var7f1b6608jf /* f13aa48: afb800d8 */ sw $t8,0xd8($sp) /* f13aa4c: 8e860000 */ lw $a2,0x0($s4) /* f13aa50: afb90014 */ sw $t9,0x14($sp) -/* f13aa54: 0fc55d49 */ jal 0xf157524 +/* f13aa54: 0fc55d49 */ jal textMeasure /* f13aa58: afa20010 */ sw $v0,0x10($sp) /* f13aa5c: 8e2a0004 */ lw $t2,0x4($s1) /* f13aa60: 8e860004 */ lw $a2,0x4($s4) @@ -3450,7 +3450,7 @@ glabel var7f1b6608jf /* f13aa6c: afab0014 */ sw $t3,0x14($sp) /* f13aa70: 8fa40078 */ lw $a0,0x78($sp) /* f13aa74: 8fa50074 */ lw $a1,0x74($sp) -/* f13aa78: 0fc55d49 */ jal 0xf157524 +/* f13aa78: 0fc55d49 */ jal textMeasure /* f13aa7c: afaa0010 */ sw $t2,0x10($sp) /* f13aa80: 8ec30000 */ lw $v1,0x0($s6) /* f13aa84: 906c0001 */ lbu $t4,0x1($v1) @@ -3540,7 +3540,7 @@ glabel var7f1b6608jf /* f13abb8: 00000000 */ nop /* f13abbc: 0000a825 */ move $s5,$zero .JF0f13abc0: -/* f13abc0: 0fc54b55 */ jal 0xf152d54 +/* f13abc0: 0fc54b55 */ jal func0f153628 /* f13abc4: 8fa401d8 */ lw $a0,0x1d8($sp) /* f13abc8: 3c04800a */ lui $a0,0x800a /* f13abcc: 8c844890 */ lw $a0,0x4890($a0) @@ -3695,7 +3695,7 @@ glabel var7f1b6608jf /* f13ade4: e7ae001c */ swc1 $f14,0x1c($sp) /* f13ade8: e7ac0018 */ swc1 $f12,0x18($sp) /* f13adec: 01533021 */ addu $a2,$t2,$s3 -/* f13adf0: 0fc4e774 */ jal 0xf139dd0 +/* f13adf0: 0fc4e774 */ jal func0f1399d0 /* f13adf4: afac0014 */ sw $t4,0x14($sp) /* f13adf8: 3c04800a */ lui $a0,0x800a /* f13adfc: 8c844890 */ lw $a0,0x4890($a0) @@ -3886,7 +3886,7 @@ glabel var7f1b6608jf .JF0f13b098: /* f13b098: 50e0002c */ beqzl $a3,.JF0f13b14c /* f13b09c: 8faf0074 */ lw $t7,0x74($sp) -/* f13b0a0: 0c004b60 */ jal 0x12d80 +/* f13b0a0: 0c004b60 */ jal random /* f13b0a4: 00000000 */ nop /* f13b0a8: 3c0a800a */ lui $t2,0x800a /* f13b0ac: 8d4a4890 */ lw $t2,0x4890($t2) @@ -3901,7 +3901,7 @@ glabel var7f1b6608jf .JF0f13b0d0: /* f13b0d0: 55c1001e */ bnel $t6,$at,.JF0f13b14c /* f13b0d4: 8faf0074 */ lw $t7,0x74($sp) -/* f13b0d8: 0c004b60 */ jal 0x12d80 +/* f13b0d8: 0c004b60 */ jal random /* f13b0dc: 00000000 */ nop /* f13b0e0: 44823000 */ mtc1 $v0,$f6 /* f13b0e4: 3c014f80 */ lui $at,0x4f80 @@ -3918,12 +3918,12 @@ glabel var7f1b6608jf /* f13b10c: 46082182 */ mul.s $f6,$f4,$f8 /* f13b110: 00000000 */ nop /* f13b114: 460a3582 */ mul.s $f22,$f6,$f10 -/* f13b118: 0c004b60 */ jal 0x12d80 +/* f13b118: 0c004b60 */ jal random /* f13b11c: 00000000 */ nop /* f13b120: 24010003 */ li $at,0x3 /* f13b124: 0041001b */ divu $zero,$v0,$at /* f13b128: 00008010 */ mfhi $s0 -/* f13b12c: 0c004b60 */ jal 0x12d80 +/* f13b12c: 0c004b60 */ jal random /* f13b130: 00000000 */ nop /* f13b134: 24010003 */ li $at,0x3 /* f13b138: 0041001b */ divu $zero,$v0,$at @@ -3945,7 +3945,7 @@ glabel var7f1b6608jf /* f13b174: e7b60018 */ swc1 $f22,0x18($sp) /* f13b178: 8fa401d8 */ lw $a0,0x1d8($sp) /* f13b17c: 01b33021 */ addu $a2,$t5,$s3 -/* f13b180: 0fc4e867 */ jal 0xf13a19c +/* f13b180: 0fc4e867 */ jal func0f139d9c /* f13b184: afaa0014 */ sw $t2,0x14($sp) /* f13b188: 3c04800a */ lui $a0,0x800a /* f13b18c: 8c844890 */ lw $a0,0x4890($a0) @@ -3959,7 +3959,7 @@ glabel var7f1b6608jf /* f13b1a8: 1420ff24 */ bnez $at,.JF0f13ae3c /* f13b1ac: 24050002 */ li $a1,0x2 .JF0f13b1b0: -/* f13b1b0: 0fc54bb7 */ jal 0xf152edc +/* f13b1b0: 0fc54bb7 */ jal func0f153780 /* f13b1b4: 8fa401d8 */ lw $a0,0x1d8($sp) .JF0f13b1b8: /* f13b1b8: 8fbf0064 */ lw $ra,0x64($sp) diff --git a/src/game/filemgr.c b/src/game/filemgr.c index b7fe1e98a..a4d6729e9 100644 --- a/src/game/filemgr.c +++ b/src/game/filemgr.c @@ -1170,7 +1170,7 @@ glabel filemgrDeleteCurrentFile /* f109850: afb20020 */ sw $s2,0x20($sp) /* f109854: afb1001c */ sw $s1,0x1c($sp) /* f109858: 00008025 */ move $s0,$zero -/* f10985c: 0fc47aac */ jal 0xf11eab0 +/* f10985c: 0fc47aac */ jal pakFindBySerial /* f109860: 97040004 */ lhu $a0,0x4($t8) /* f109864: 00028e00 */ sll $s1,$v0,0x18 /* f109868: 0011ce03 */ sra $t9,$s1,0x18 @@ -1182,7 +1182,7 @@ glabel filemgrDeleteCurrentFile /* f109880: 000950c0 */ sll $t2,$t1,0x3 /* f109884: 028a5821 */ addu $t3,$s4,$t2 /* f109888: 8d650000 */ lw $a1,0x0($t3) -/* f10988c: 0fc45b04 */ jal 0xf116c10 +/* f10988c: 0fc45b04 */ jal pakDeleteFile /* f109890: 01002025 */ move $a0,$t0 /* f109894: 50400005 */ beqzl $v0,.JF0f1098ac /* f109898: 8e6d0000 */ lw $t5,0x0($s3) @@ -1213,7 +1213,7 @@ glabel filemgrDeleteCurrentFile /* f1098f0: 01230019 */ multu $t1,$v1 /* f1098f4: 00005012 */ mflo $t2 /* f1098f8: 004a5821 */ addu $t3,$v0,$t2 -/* f1098fc: 0fc421f7 */ jal 0xf1087dc +/* f1098fc: 0fc421f7 */ jal filemgrPushErrorDialog /* f109900: a1710e3c */ sb $s1,0xe3c($t3) /* f109904: 10000016 */ b .JF0f109960 /* f109908: 8fbf002c */ lw $ra,0x2c($sp) @@ -1234,7 +1234,7 @@ glabel filemgrDeleteCurrentFile /* f10993c: 02002025 */ move $a0,$s0 /* f109940: 572c0004 */ bnel $t9,$t4,.JF0f109954 /* f109944: 26100001 */ addiu $s0,$s0,0x1 -/* f109948: 0fc621cb */ jal 0xf18872c +/* f109948: 0fc621cb */ jal mpPlayerSetDefaults /* f10994c: 24050001 */ li $a1,0x1 /* f109950: 26100001 */ addiu $s0,$s0,0x1 .JF0f109954: @@ -2086,7 +2086,7 @@ glabel filemgrIsFileInUse /* f10a760: 00808025 */ move $s0,$a0 /* f10a764: afbf001c */ sw $ra,0x1c($sp) /* f10a768: 3c048007 */ lui $a0,0x8007 -/* f10a76c: 0fc3f89a */ jal 0xf0fe268 +/* f10a76c: 0fc3f89a */ jal menuIsDialogOpen /* f10a770: 24845024 */ addiu $a0,$a0,0x5024 /* f10a774: 1040000d */ beqz $v0,.JF0f10a7ac /* f10a778: 3c048007 */ lui $a0,0x8007 @@ -2103,7 +2103,7 @@ glabel filemgrIsFileInUse /* f10a7a4: 10000062 */ b .JF0f10a930 /* f10a7a8: 24020001 */ li $v0,0x1 .JF0f10a7ac: -/* f10a7ac: 0fc3f89a */ jal 0xf0fe268 +/* f10a7ac: 0fc3f89a */ jal menuIsDialogOpen /* f10a7b0: 24845524 */ addiu $a0,$a0,0x5524 /* f10a7b4: 10400003 */ beqz $v0,.JF0f10a7c4 /* f10a7b8: 3c0a800a */ lui $t2,0x800a @@ -2235,18 +2235,18 @@ glabel filemgrConfirmDeleteMenuHandler /* f10a974: 8c590000 */ lw $t9,0x0($v0) /* f10a978: 94480004 */ lhu $t0,0x4($v0) /* f10a97c: afb90020 */ sw $t9,0x20($sp) -/* f10a980: 0fc3d0dc */ jal 0xf0f4370 +/* f10a980: 0fc3d0dc */ jal menuPopDialog /* f10a984: a7a80024 */ sh $t0,0x24($sp) -/* f10a988: 0fc429d6 */ jal 0xf10a758 +/* f10a988: 0fc429d6 */ jal filemgrIsFileInUse /* f10a98c: 27a40020 */ addiu $a0,$sp,0x20 /* f10a990: 10400005 */ beqz $v0,.JF0f10a9a8 /* f10a994: 00000000 */ nop -/* f10a998: 0fc421f7 */ jal 0xf1087dc +/* f10a998: 0fc421f7 */ jal filemgrPushErrorDialog /* f10a99c: 24040003 */ li $a0,0x3 /* f10a9a0: 10000004 */ b .JF0f10a9b4 /* f10a9a4: 8fbf0014 */ lw $ra,0x14($sp) .JF0f10a9a8: -/* f10a9a8: 0fc42608 */ jal 0xf109820 +/* f10a9a8: 0fc42608 */ jal filemgrDeleteCurrentFile /* f10a9ac: 00000000 */ nop .JF0f10a9b0: /* f10a9b0: 8fbf0014 */ lw $ra,0x14($sp) @@ -2496,7 +2496,7 @@ glabel filemgrFileToDeleteListMenuHandler /* f10b094: 004e3021 */ addu $a2,$v0,$t6 /* f10b098: 10c00036 */ beqz $a2,.JF0f10b174 /* f10b09c: 00c02025 */ move $a0,$a2 -/* f10b0a0: 0fc429d6 */ jal 0xf10a758 +/* f10b0a0: 0fc429d6 */ jal filemgrIsFileInUse /* f10b0a4: afa6001c */ sw $a2,0x1c($sp) /* f10b0a8: 3c038007 */ lui $v1,0x8007 /* f10b0ac: 3c07800a */ lui $a3,0x800a @@ -2515,10 +2515,10 @@ glabel filemgrFileToDeleteListMenuHandler /* f10b0e0: 00095080 */ sll $t2,$t1,0x2 /* f10b0e4: 006a5821 */ addu $t3,$v1,$t2 /* f10b0e8: 8d6c0000 */ lw $t4,0x0($t3) -/* f10b0ec: 0fc42154 */ jal 0xf108550 +/* f10b0ec: 0fc42154 */ jal filemgrSetFileToDelete /* f10b0f0: 9185030b */ lbu $a1,0x30b($t4) /* f10b0f4: 3c048007 */ lui $a0,0x8007 -/* f10b0f8: 0fc3cef8 */ jal 0xf0f3be0 +/* f10b0f8: 0fc3cef8 */ jal menuPushDialog /* f10b0fc: 24844f54 */ addiu $a0,$a0,0x4f54 /* f10b100: 1000001d */ b .JF0f10b178 /* f10b104: 8fa40020 */ lw $a0,0x20($sp) @@ -2534,7 +2534,7 @@ glabel filemgrFileToDeleteListMenuHandler /* f10b128: 00794821 */ addu $t1,$v1,$t9 /* f10b12c: 8d2a0000 */ lw $t2,0x0($t1) /* f10b130: 9145030b */ lbu $a1,0x30b($t2) -/* f10b134: 0fc42154 */ jal 0xf108550 +/* f10b134: 0fc42154 */ jal filemgrSetFileToDelete /* f10b138: afa6001c */ sw $a2,0x1c($sp) /* f10b13c: 8fa6001c */ lw $a2,0x1c($sp) /* f10b140: 3c0b8007 */ lui $t3,0x8007 @@ -2548,14 +2548,14 @@ glabel filemgrFileToDeleteListMenuHandler /* f10b160: 94cf0004 */ lhu $t7,0x4($a2) /* f10b164: 3c048007 */ lui $a0,0x8007 /* f10b168: 24844ed8 */ addiu $a0,$a0,0x4ed8 -/* f10b16c: 0fc3cef8 */ jal 0xf0f3be0 +/* f10b16c: 0fc3cef8 */ jal menuPushDialog /* f10b170: a44f0004 */ sh $t7,0x4($v0) .JF0f10b174: /* f10b174: 8fa40020 */ lw $a0,0x20($sp) .JF0f10b178: /* f10b178: 8fa50024 */ lw $a1,0x24($sp) /* f10b17c: 8fa60028 */ lw $a2,0x28($sp) -/* f10b180: 0fc42b56 */ jal 0xf10ad58 +/* f10b180: 0fc42b56 */ jal filemgrFileToCopyOrDeleteListMenuHandler /* f10b184: 24070001 */ li $a3,0x1 .JF0f10b188: /* f10b188: 8fbf0014 */ lw $ra,0x14($sp) diff --git a/src/game/game_000000.c b/src/game/game_000000.c index e3f1771d1..6368100df 100644 --- a/src/game/game_000000.c +++ b/src/game/game_000000.c @@ -29,7 +29,7 @@ glabel func0f000000 /* f000040: 24050006 */ li $a1,0x6 /* f000044: 0004c880 */ sll $t9,$a0,0x2 /* f000048: 0324c823 */ subu $t9,$t9,$a0 -/* f00004c: 0c0048e2 */ jal 0x12388 +/* f00004c: 0c0048e2 */ jal mempAlloc /* f000050: 00192140 */ sll $a0,$t9,0x5 /* f000054: 3c06800a */ lui $a2,0x800a /* f000058: 3c01800b */ lui $at,0x800b @@ -40,7 +40,7 @@ glabel func0f000000 /* f00006c: 00044040 */ sll $t0,$a0,0x1 /* f000070: 2504000f */ addiu $a0,$t0,0xf /* f000074: 3489000f */ ori $t1,$a0,0xf -/* f000078: 0c0048e2 */ jal 0x12388 +/* f000078: 0c0048e2 */ jal mempAlloc /* f00007c: 3924000f */ xori $a0,$t1,0xf /* f000080: 3c06800a */ lui $a2,0x800a /* f000084: 24c6d140 */ addiu $a2,$a2,-11968 diff --git a/src/game/game_005fd0.c b/src/game/game_005fd0.c index 90b1a6783..19fc38e4d 100644 --- a/src/game/game_005fd0.c +++ b/src/game/game_005fd0.c @@ -153,7 +153,7 @@ glabel chrCheckFootstep /* f006270: afbf004c */ sw $ra,0x4c($sp) /* f006274: afb10048 */ sw $s1,0x48($sp) /* f006278: 00808825 */ move $s1,$a0 -/* f00627c: 0fc47cbe */ jal 0xf11f2f8 +/* f00627c: 0fc47cbe */ jal debugIsFootstepsEnabled /* f006280: afb00044 */ sw $s0,0x44($sp) /* f006284: 104000c2 */ beqz $v0,.JF0f006590 /* f006288: 24010001 */ li $at,0x1 @@ -212,7 +212,7 @@ glabel chrCheckFootstep /* f00634c: e7a0006c */ swc1 $f0,0x6c($sp) .JF0f006350: /* f006350: 8e240020 */ lw $a0,0x20($s1) -/* f006354: 0c007447 */ jal 0x1d11c +/* f006354: 0c007447 */ jal modelGetAnimNum /* f006358: afa30050 */ sw $v1,0x50($sp) /* f00635c: 8fa30050 */ lw $v1,0x50($sp) /* f006360: 24010023 */ li $at,0x23 @@ -328,7 +328,7 @@ glabel chrCheckFootstep /* f0064e8: 00000000 */ nop /* f0064ec: a2390190 */ sb $t9,0x190($s1) .JF0f0064f0: -/* f0064f0: 0fc01841 */ jal 0xf006104 +/* f0064f0: 0fc01841 */ jal chrChooseFootstepSound /* f0064f4: 02202025 */ move $a0,$s1 /* f0064f8: 2401ffff */ li $at,-1 /* f0064fc: 5041001c */ beql $v0,$at,.JF0f006570 @@ -357,7 +357,7 @@ glabel chrCheckFootstep /* f006558: e7a00024 */ swc1 $f0,0x24($sp) /* f00655c: e7a00030 */ swc1 $f0,0x30($sp) /* f006560: e7a00034 */ swc1 $f0,0x34($sp) -/* f006564: 0fc251de */ jal 0xf094778 +/* f006564: 0fc251de */ jal func0f0939f8 /* f006568: e7a00038 */ swc1 $f0,0x38($sp) .JF0f00656c: /* f00656c: 8e2e0020 */ lw $t6,0x20($s1) diff --git a/src/game/game_00b320.c b/src/game/game_00b320.c index 36b6d0754..29ec64900 100644 --- a/src/game/game_00b320.c +++ b/src/game/game_00b320.c @@ -53,13 +53,13 @@ glabel stageLoadCommonLang .JF0f00b440: /* f00b440: 348f000f */ ori $t7,$a0,0xf /* f00b444: 39e4000f */ xori $a0,$t7,0xf -/* f00b448: 0c0048e2 */ jal 0x12388 +/* f00b448: 0c0048e2 */ jal mempAlloc /* f00b44c: afa30018 */ sw $v1,0x18($sp) /* f00b450: 3c018008 */ lui $at,0x8008 /* f00b454: 8fa30018 */ lw $v1,0x18($sp) /* f00b458: ac224774 */ sw $v0,0x4774($at) /* f00b45c: 3c018008 */ lui $at,0x8008 -/* f00b460: 0fc5bab6 */ jal 0xf16ead8 +/* f00b460: 0fc5bab6 */ jal func0f16f6ecpf /* f00b464: ac23477c */ sw $v1,0x477c($at) /* f00b468: 8fbf0014 */ lw $ra,0x14($sp) /* f00b46c: 27bd0020 */ addiu $sp,$sp,0x20 diff --git a/src/game/game_01d860.c b/src/game/game_01d860.c index 4e57ae5ea..967594bf2 100644 --- a/src/game/game_01d860.c +++ b/src/game/game_01d860.c @@ -17,14 +17,14 @@ glabel func0f01d860 /* f01ea30: 3c058006 */ lui $a1,0x8006 /* f01ea34: ac20d370 */ sw $zero,-0x2c90($at) /* f01ea38: 24a528a0 */ addiu $a1,$a1,0x28a0 -/* f01ea3c: 0c0036b4 */ jal 0xdad0 +/* f01ea3c: 0c0036b4 */ jal mainOverrideVariable /* f01ea40: 24849240 */ addiu $a0,$a0,-28096 /* f01ea44: 3c048006 */ lui $a0,0x8006 /* f01ea48: 8c8428a0 */ lw $a0,0x28a0($a0) /* f01ea4c: 2c810002 */ sltiu $at,$a0,0x2 /* f01ea50: 10200006 */ beqz $at,.JF0f01ea6c /* f01ea54: 00000000 */ nop -/* f01ea58: 0fc5bb09 */ jal 0xf16ec24 +/* f01ea58: 0fc5bb09 */ jal func0f16ec24jf /* f01ea5c: 00000000 */ nop /* f01ea60: 240e0063 */ li $t6,0x63 /* f01ea64: 3c018006 */ lui $at,0x8006 diff --git a/src/game/game_02cde0.c b/src/game/game_02cde0.c index 5cda265da..6933d64d2 100644 --- a/src/game/game_02cde0.c +++ b/src/game/game_02cde0.c @@ -1167,7 +1167,7 @@ glabel var7f1a9678jf /* f02f114: 8fa40048 */ lw $a0,0x48($sp) /* f02f118: 27a50044 */ addiu $a1,$sp,0x44 /* f02f11c: 27a6003c */ addiu $a2,$sp,0x3c -/* f02f120: 0c008b2c */ jal 0x22cb0 +/* f02f120: 0c008b2c */ jal modelIterateDisplayLists /* f02f124: afa70038 */ sw $a3,0x38($sp) /* f02f128: 8fa90044 */ lw $t1,0x44($sp) /* f02f12c: 8fa70038 */ lw $a3,0x38($sp) @@ -1202,7 +1202,7 @@ glabel var7f1a9678jf /* f02f198: 5700ffde */ bnezl $t8,.JF0f02f114 /* f02f19c: 8fb00044 */ lw $s0,0x44($sp) /* f02f1a0: 8fa40048 */ lw $a0,0x48($sp) -/* f02f1a4: 0fc1a6a3 */ jal 0xf069a8c +/* f02f1a4: 0fc1a6a3 */ jal modelFileDataFindBboxRodata /* f02f1a8: afa70038 */ sw $a3,0x38($sp) /* f02f1ac: 10400009 */ beqz $v0,.JF0f02f1d4 /* f02f1b0: 8fa70038 */ lw $a3,0x38($sp) diff --git a/src/game/game_092610.c b/src/game/game_092610.c index f7d350bb9..39c7f288d 100644 --- a/src/game/game_092610.c +++ b/src/game/game_092610.c @@ -446,7 +446,7 @@ glabel var7f1ab740 /* f0939e0: 8e040000 */ lw $a0,0x0($s0) /* f0939e4: 50800006 */ beqzl $a0,.JF0f093a00 /* f0939e8: 96030030 */ lhu $v1,0x30($s0) -/* f0939ec: 0c00ccc0 */ jal 0x33300 +/* f0939ec: 0c00ccc0 */ jal sndGetState /* f0939f0: 00000000 */ nop /* f0939f4: 54400010 */ bnezl $v0,.JF0f093a38 /* f0939f8: 8e020050 */ lw $v0,0x50($s0) @@ -461,7 +461,7 @@ glabel var7f1ab740 /* f093a18: 306e0010 */ andi $t6,$v1,0x10 /* f093a1c: 51c001e2 */ beqzl $t6,.JF0f0941a8 /* f093a20: 860e0028 */ lh $t6,0x28($s0) -/* f093a24: 0c003a5c */ jal 0xe970 +/* f093a24: 0c003a5c */ jal sndIsPlayingMp3 /* f093a28: 00000000 */ nop /* f093a2c: 504001de */ beqzl $v0,.JF0f0941a8 /* f093a30: 860e0028 */ lh $t6,0x28($s0) @@ -531,7 +531,7 @@ glabel var7f1ab740 /* f093b10: afa8004c */ sw $t0,0x4c($sp) /* f093b14: afa40050 */ sw $a0,0x50($sp) /* f093b18: afb9001c */ sw $t9,0x1c($sp) -/* f093b1c: 0fc2550c */ jal 0xf095430 +/* f093b1c: 0fc2550c */ jal func0f0946b0 /* f093b20: afb80018 */ sw $t8,0x18($sp) /* f093b24: 8fa40050 */ lw $a0,0x50($sp) /* f093b28: 8fa8004c */ lw $t0,0x4c($sp) @@ -551,7 +551,7 @@ glabel var7f1ab740 /* f093b5c: afab0014 */ sw $t3,0x14($sp) /* f093b60: afa8004c */ sw $t0,0x4c($sp) /* f093b64: afb00018 */ sw $s0,0x18($sp) -/* f093b68: 0fc256be */ jal 0xf095af8 +/* f093b68: 0fc256be */ jal propsnd0f094d78 /* f093b6c: e7a40010 */ swc1 $f4,0x10($sp) /* f093b70: 8fa8004c */ lw $t0,0x4c($sp) /* f093b74: 3c09800a */ lui $t1,0x800a @@ -717,7 +717,7 @@ glabel var7f1ab740 /* f093db4: afa50048 */ sw $a1,0x48($sp) .JF0f093db8: /* f093db8: afa80040 */ sw $t0,0x40($sp) -/* f093dbc: 0fc5b3cc */ jal 0xf16cf30 +/* f093dbc: 0fc5b3cc */ jal lvIsPaused /* f093dc0: e7b2003c */ swc1 $f18,0x3c($sp) /* f093dc4: 3c09800a */ lui $t1,0x800a /* f093dc8: 2529a630 */ addiu $t1,$t1,-22992 @@ -725,7 +725,7 @@ glabel var7f1ab740 /* f093dd0: 14400031 */ bnez $v0,.JF0f093e98 /* f093dd4: c7b2003c */ lwc1 $f18,0x3c($sp) /* f093dd8: afa80040 */ sw $t0,0x40($sp) -/* f093ddc: 0fc6279d */ jal 0xf189e74 +/* f093ddc: 0fc6279d */ jal mpIsPaused /* f093de0: e7b2003c */ swc1 $f18,0x3c($sp) /* f093de4: 3c09800a */ lui $t1,0x800a /* f093de8: 2529a630 */ addiu $t1,$t1,-22992 @@ -738,7 +738,7 @@ glabel var7f1ab740 /* f093e04: 240bffff */ li $t3,-1 .JF0f093e08: /* f093e08: afa80040 */ sw $t0,0x40($sp) -/* f093e0c: 0fc6279d */ jal 0xf189e74 +/* f093e0c: 0fc6279d */ jal mpIsPaused /* f093e10: e7b2003c */ swc1 $f18,0x3c($sp) /* f093e14: 3c09800a */ lui $t1,0x800a /* f093e18: 2529a630 */ addiu $t1,$t1,-22992 @@ -903,14 +903,14 @@ glabel var7f1ab740 /* f09403c: 5080000e */ beqzl $a0,.JF0f094078 /* f094040: 960a0030 */ lhu $t2,0x30($s0) /* f094044: afa80040 */ sw $t0,0x40($sp) -/* f094048: 0c00ccc0 */ jal 0x33300 +/* f094048: 0c00ccc0 */ jal sndGetState /* f09404c: e7b2003c */ swc1 $f18,0x3c($sp) /* f094050: 8fa80040 */ lw $t0,0x40($sp) /* f094054: 10400007 */ beqz $v0,.JF0f094074 /* f094058: c7b2003c */ lwc1 $f18,0x3c($sp) /* f09405c: 8e040000 */ lw $a0,0x0($s0) /* f094060: e7b2003c */ swc1 $f18,0x3c($sp) -/* f094064: 0c00cd8d */ jal 0x33634 +/* f094064: 0c00cd8d */ jal audioStop /* f094068: afa80040 */ sw $t0,0x40($sp) /* f09406c: 8fa80040 */ lw $t0,0x40($sp) /* f094070: c7b2003c */ lwc1 $f18,0x3c($sp) @@ -943,7 +943,7 @@ glabel var7f1ab740 /* f0940c8: 10000001 */ b .JF0f0940d0 /* f0940cc: 24070001 */ li $a3,0x1 .JF0f0940d0: -/* f0940d0: 0c0042a8 */ jal 0x10aa0 +/* f0940d0: 0c0042a8 */ jal sndStartMp3 /* f0940d4: 86040026 */ lh $a0,0x26($s0) /* f0940d8: 10000021 */ b .JF0f094160 /* f0940dc: 96030030 */ lhu $v1,0x30($s0) @@ -962,7 +962,7 @@ glabel var7f1ab740 /* f09410c: 920d001a */ lbu $t5,0x1a($s0) /* f094110: afac0020 */ sw $t4,0x20($sp) /* f094114: afa8001c */ sw $t0,0x1c($sp) -/* f094118: 0c0041b5 */ jal 0x106d4 +/* f094118: 0c0041b5 */ jal snd00010718 /* f09411c: afad0018 */ sw $t5,0x18($sp) /* f094120: 1000000f */ b .JF0f094160 /* f094124: 96030030 */ lhu $v1,0x30($s0) @@ -978,7 +978,7 @@ glabel var7f1ab740 /* f094148: afa8001c */ sw $t0,0x1c($sp) /* f09414c: 01c03025 */ move $a2,$t6 /* f094150: 8fa70044 */ lw $a3,0x44($sp) -/* f094154: 0c0041b5 */ jal 0x106d4 +/* f094154: 0c0041b5 */ jal snd00010718 /* f094158: afb80018 */ sw $t8,0x18($sp) /* f09415c: 96030030 */ lhu $v1,0x30($s0) .JF0f094160: @@ -996,7 +996,7 @@ glabel var7f1ab740 /* f094188: 30650010 */ andi $a1,$v1,0x10 /* f09418c: 8fa60048 */ lw $a2,0x48($sp) /* f094190: 8fa70044 */ lw $a3,0x44($sp) -/* f094194: 0c004117 */ jal 0x1045c +/* f094194: 0c004117 */ jal sndAdjust /* f094198: afad0018 */ sw $t5,0x18($sp) /* f09419c: 10000026 */ b .JF0f094238 /* f0941a0: 00000000 */ nop @@ -1009,7 +1009,7 @@ glabel var7f1ab740 /* f0941b8: 306f0010 */ andi $t7,$v1,0x10 /* f0941bc: 51e00015 */ beqzl $t7,.JF0f094214 /* f0941c0: 8e0b0000 */ lw $t3,0x0($s0) -/* f0941c4: 0c003a5c */ jal 0xe970 +/* f0941c4: 0c003a5c */ jal sndIsPlayingMp3 /* f0941c8: 00000000 */ nop /* f0941cc: 5440000e */ bnezl $v0,.JF0f094208 /* f0941d0: 240a0001 */ li $t2,0x1 @@ -1017,14 +1017,14 @@ glabel var7f1ab740 /* f0941d8: 30780008 */ andi $t8,$v1,0x8 /* f0941dc: 53000005 */ beqzl $t8,.JF0f0941f4 /* f0941e0: 30790200 */ andi $t9,$v1,0x200 -/* f0941e4: 0fc16f3f */ jal 0xf05bcfc +/* f0941e4: 0fc16f3f */ jal func0f05abdc /* f0941e8: 8e040050 */ lw $a0,0x50($s0) /* f0941ec: 96030030 */ lhu $v1,0x30($s0) /* f0941f0: 30790200 */ andi $t9,$v1,0x200 .JF0f0941f4: /* f0941f4: 53200004 */ beqzl $t9,.JF0f094208 /* f0941f8: 240a0001 */ li $t2,0x1 -/* f0941fc: 0fc37ba6 */ jal 0xf0dee98 +/* f0941fc: 0fc37ba6 */ jal hudmsgsHideByChannel /* f094200: 8fa40058 */ lw $a0,0x58($sp) /* f094204: 240a0001 */ li $t2,0x1 .JF0f094208: @@ -1037,7 +1037,7 @@ glabel var7f1ab740 /* f09421c: 00000000 */ nop /* f094220: 51a00004 */ beqzl $t5,.JF0f094234 /* f094224: 240c0001 */ li $t4,0x1 -/* f094228: 0fc16f3f */ jal 0xf05bcfc +/* f094228: 0fc16f3f */ jal func0f05abdc /* f09422c: 8e040050 */ lw $a0,0x50($s0) /* f094230: 240c0001 */ li $t4,0x1 .JF0f094234: @@ -1051,7 +1051,7 @@ glabel var7f1ab740 /* f09424c: 31f80004 */ andi $t8,$t7,0x4 /* f094250: 53000004 */ beqzl $t8,.JF0f094264 /* f094254: 96190030 */ lhu $t9,0x30($s0) -/* f094258: 0fc24e38 */ jal 0xf0938e0 +/* f094258: 0fc24e38 */ jal propsndPrintChannel /* f09425c: 02002025 */ move $a0,$s0 /* f094260: 96190030 */ lhu $t9,0x30($s0) .JF0f094264: diff --git a/src/game/game_1531a0.c b/src/game/game_1531a0.c index 84a4afe90..e33ecb714 100644 --- a/src/game/game_1531a0.c +++ b/src/game/game_1531a0.c @@ -232,14 +232,14 @@ glabel fontLoad /* f1528d8: afa70044 */ sw $a3,0x44($sp) /* f1528dc: afa4001c */ sw $a0,0x1c($sp) /* f1528e0: 24050004 */ li $a1,0x4 -/* f1528e4: 0c0048e2 */ jal 0x12388 +/* f1528e4: 0c0048e2 */ jal mempAlloc /* f1528e8: afa80020 */ sw $t0,0x20($sp) /* f1528ec: 244902a4 */ addiu $t1,$v0,0x2a4 /* f1528f0: afa90024 */ sw $t1,0x24($sp) /* f1528f4: 00402025 */ move $a0,$v0 /* f1528f8: 8fa50038 */ lw $a1,0x38($sp) /* f1528fc: 8fa6001c */ lw $a2,0x1c($sp) -/* f152900: 0c0034ec */ jal 0xd3b0 +/* f152900: 0c0034ec */ jal dmaExec /* f152904: afa20028 */ sw $v0,0x28($sp) /* f152908: 8fa90024 */ lw $t1,0x24($sp) /* f15290c: 8fa70028 */ lw $a3,0x28($sp) @@ -462,7 +462,7 @@ glabel fontsLoadForCurrentStage /* f152af4: 24c60148 */ addiu $a2,$a2,0x148 /* f152af8: 24a5c640 */ addiu $a1,$a1,-14784 /* f152afc: 248493c0 */ addiu $a0,$a0,-27712 -/* f152b00: 0fc54a2f */ jal 0xf1528bc +/* f152b00: 0fc54a2f */ jal fontLoad /* f152b04: afa00010 */ sw $zero,0x10($sp) /* f152b08: 3c04007f */ lui $a0,0x7f /* f152b0c: 3c05007f */ lui $a1,0x7f @@ -472,7 +472,7 @@ glabel fontsLoadForCurrentStage /* f152b1c: 24c60150 */ addiu $a2,$a2,0x150 /* f152b20: 24a52d00 */ addiu $a1,$a1,0x2d00 /* f152b24: 2484ecb0 */ addiu $a0,$a0,-4944 -/* f152b28: 0fc54a2f */ jal 0xf1528bc +/* f152b28: 0fc54a2f */ jal fontLoad /* f152b2c: afa00010 */ sw $zero,0x10($sp) /* f152b30: 3c04007f */ lui $a0,0x7f /* f152b34: 3c05007f */ lui $a1,0x7f @@ -482,7 +482,7 @@ glabel fontsLoadForCurrentStage /* f152b44: 24c60158 */ addiu $a2,$a2,0x158 /* f152b48: 24a561c0 */ addiu $a1,$a1,0x61c0 /* f152b4c: 24842d00 */ addiu $a0,$a0,0x2d00 -/* f152b50: 0fc54a2f */ jal 0xf1528bc +/* f152b50: 0fc54a2f */ jal fontLoad /* f152b54: afa00010 */ sw $zero,0x10($sp) /* f152b58: 1000007b */ b .JF0f152d48 /* f152b5c: 8fbf001c */ lw $ra,0x1c($sp) @@ -498,7 +498,7 @@ glabel fontsLoadForCurrentStage /* f152b80: 24c60140 */ addiu $a2,$a2,0x140 /* f152b84: 24a5ecb0 */ addiu $a1,$a1,-4944 /* f152b88: 2484c640 */ addiu $a0,$a0,-14784 -/* f152b8c: 0fc54a2f */ jal 0xf1528bc +/* f152b8c: 0fc54a2f */ jal fontLoad /* f152b90: afa00010 */ sw $zero,0x10($sp) /* f152b94: 3c068008 */ lui $a2,0x8008 /* f152b98: 3c04007f */ lui $a0,0x7f @@ -508,7 +508,7 @@ glabel fontsLoadForCurrentStage /* f152ba8: 24e7014c */ addiu $a3,$a3,0x14c /* f152bac: 24a5c640 */ addiu $a1,$a1,-14784 /* f152bb0: 248493c0 */ addiu $a0,$a0,-27712 -/* f152bb4: 0fc54a2f */ jal 0xf1528bc +/* f152bb4: 0fc54a2f */ jal fontLoad /* f152bb8: afa00010 */ sw $zero,0x10($sp) /* f152bbc: 3c04007f */ lui $a0,0x7f /* f152bc0: 3c05007f */ lui $a1,0x7f @@ -518,7 +518,7 @@ glabel fontsLoadForCurrentStage /* f152bd0: 24c60150 */ addiu $a2,$a2,0x150 /* f152bd4: 24a52d00 */ addiu $a1,$a1,0x2d00 /* f152bd8: 2484ecb0 */ addiu $a0,$a0,-4944 -/* f152bdc: 0fc54a2f */ jal 0xf1528bc +/* f152bdc: 0fc54a2f */ jal fontLoad /* f152be0: afa00010 */ sw $zero,0x10($sp) /* f152be4: 3c04007f */ lui $a0,0x7f /* f152be8: 3c05007f */ lui $a1,0x7f @@ -528,7 +528,7 @@ glabel fontsLoadForCurrentStage /* f152bf8: 24c60158 */ addiu $a2,$a2,0x158 /* f152bfc: 24a561c0 */ addiu $a1,$a1,0x61c0 /* f152c00: 24842d00 */ addiu $a0,$a0,0x2d00 -/* f152c04: 0fc54a2f */ jal 0xf1528bc +/* f152c04: 0fc54a2f */ jal fontLoad /* f152c08: afa00010 */ sw $zero,0x10($sp) /* f152c0c: 1000004e */ b .JF0f152d48 /* f152c10: 8fbf001c */ lw $ra,0x1c($sp) @@ -536,7 +536,7 @@ glabel fontsLoadForCurrentStage /* f152c14: 3c05007f */ lui $a1,0x7f /* f152c18: 24a593c0 */ addiu $a1,$a1,-27712 /* f152c1c: 248481b0 */ addiu $a0,$a0,-32336 -/* f152c20: 0fc54a2f */ jal 0xf1528bc +/* f152c20: 0fc54a2f */ jal fontLoad /* f152c24: afa00010 */ sw $zero,0x10($sp) /* f152c28: 3c0f800a */ lui $t7,0x800a /* f152c2c: 8defa948 */ lw $t7,-0x56b8($t7) @@ -568,7 +568,7 @@ glabel fontsLoadForCurrentStage /* f152c8c: 24e7014c */ addiu $a3,$a3,0x14c /* f152c90: 24a5c640 */ addiu $a1,$a1,-14784 /* f152c94: 248493c0 */ addiu $a0,$a0,-27712 -/* f152c98: 0fc54a2f */ jal 0xf1528bc +/* f152c98: 0fc54a2f */ jal fontLoad /* f152c9c: afa00010 */ sw $zero,0x10($sp) /* f152ca0: 3c09800a */ lui $t1,0x800a /* f152ca4: 8d29a948 */ lw $t1,-0x56b8($t1) @@ -586,7 +586,7 @@ glabel fontsLoadForCurrentStage /* f152cd0: 24e70154 */ addiu $a3,$a3,0x154 /* f152cd4: 24c60150 */ addiu $a2,$a2,0x150 /* f152cd8: 24a52d00 */ addiu $a1,$a1,0x2d00 -/* f152cdc: 0fc54a2f */ jal 0xf1528bc +/* f152cdc: 0fc54a2f */ jal fontLoad /* f152ce0: afa00010 */ sw $zero,0x10($sp) .JF0f152ce4: /* f152ce4: 3c0b800a */ lui $t3,0x800a @@ -601,7 +601,7 @@ glabel fontsLoadForCurrentStage /* f152d08: 24e7015c */ addiu $a3,$a3,0x15c /* f152d0c: 24c60158 */ addiu $a2,$a2,0x158 /* f152d10: 24a561c0 */ addiu $a1,$a1,0x61c0 -/* f152d14: 0fc54a2f */ jal 0xf1528bc +/* f152d14: 0fc54a2f */ jal fontLoad /* f152d18: afa00010 */ sw $zero,0x10($sp) .JF0f152d1c: /* f152d1c: 3c04007f */ lui $a0,0x7f @@ -612,7 +612,7 @@ glabel fontsLoadForCurrentStage /* f152d30: 24c60140 */ addiu $a2,$a2,0x140 /* f152d34: 24a5ecb0 */ addiu $a1,$a1,-4944 /* f152d38: 2484c640 */ addiu $a0,$a0,-14784 -/* f152d3c: 0fc54a2f */ jal 0xf1528bc +/* f152d3c: 0fc54a2f */ jal fontLoad /* f152d40: afa00010 */ sw $zero,0x10($sp) .JF0f152d44: /* f152d44: 8fbf001c */ lw $ra,0x1c($sp) @@ -889,7 +889,7 @@ glabel func0f153990 /* f1530f4: afa5001c */ sw $a1,0x1c($sp) /* f1530f8: afa60020 */ sw $a2,0x20($sp) /* f1530fc: afa70024 */ sw $a3,0x24($sp) -/* f153100: 0fc54bce */ jal 0xf152f38 +/* f153100: 0fc54bce */ jal gfxSetPrimColour /* f153104: 00002825 */ move $a1,$zero /* f153108: 3c0f8008 */ lui $t7,0x8008 /* f15310c: 8def0108 */ lw $t7,0x108($t7) @@ -923,7 +923,7 @@ glabel func0f153990 /* f15317c: 01b8c825 */ or $t9,$t5,$t8 /* f153180: 01684825 */ or $t1,$t3,$t0 /* f153184: ac490000 */ sw $t1,0x0($v0) -/* f153188: 0fc54be5 */ jal 0xf152f94 +/* f153188: 0fc54be5 */ jal func0f153838 /* f15318c: ac590004 */ sw $t9,0x4($v0) /* f153190: 8fbf0014 */ lw $ra,0x14($sp) /* f153194: 27bd0018 */ addiu $sp,$sp,0x18 @@ -3438,7 +3438,7 @@ glabel func0f15642cpb /* f154b68: a0650003 */ sb $a1,0x3($v1) /* f154b6c: a0650004 */ sb $a1,0x4($v1) /* f154b70: a4600006 */ sh $zero,0x6($v1) -/* f154b74: 0fc5525a */ jal 0xf154968 +/* f154b74: 0fc5525a */ jal func0f155d2cpf /* f154b78: ac600008 */ sw $zero,0x8($v1) /* f154b7c: 8fab0034 */ lw $t3,0x34($sp) /* f154b80: 3c03800a */ lui $v1,0x800a @@ -3499,7 +3499,7 @@ glabel func0f15642cpb /* f154c50: 018d4825 */ or $t1,$t4,$t5 /* f154c54: a7a9002a */ sh $t1,0x2a($sp) /* f154c58: afa90024 */ sw $t1,0x24($sp) -/* f154c5c: 0c0036b4 */ jal 0xdad0 +/* f154c5c: 0c0036b4 */ jal mainOverrideVariable /* f154c60: a3a00029 */ sb $zero,0x29($sp) /* f154c64: 3c0e8008 */ lui $t6,0x8008 /* f154c68: 8dce0228 */ lw $t6,0x228($t6) @@ -3508,7 +3508,7 @@ glabel func0f15642cpb /* f154c74: 93a80029 */ lbu $t0,0x29($sp) /* f154c78: 11c00006 */ beqz $t6,.JF0f154c94 /* f154c7c: 8fb00024 */ lw $s0,0x24($sp) -/* f154c80: 0fc551e1 */ jal 0xf154784 +/* f154c80: 0fc551e1 */ jal func0f154784jf /* f154c84: 3204ffff */ andi $a0,$s0,0xffff /* f154c88: 3c03800a */ lui $v1,0x800a /* f154c8c: 24635008 */ addiu $v1,$v1,0x5008 @@ -3818,7 +3818,7 @@ glabel func0f154f38 /* f154d7c: 55c00006 */ bnezl $t6,.JF0f154d98 /* f154d80: 96390000 */ lhu $t9,0x0($s1) /* f154d84: 94c40000 */ lhu $a0,0x0($a2) -/* f154d88: 0fc5b967 */ jal 0xf16e59c +/* f154d88: 0fc5b967 */ jal func0f16e3fc /* f154d8c: 2484ff80 */ addiu $a0,$a0,-128 /* f154d90: ae220008 */ sw $v0,0x8($s1) /* f154d94: 96390000 */ lhu $t9,0x0($s1) @@ -3836,7 +3836,7 @@ glabel func0f154f38 /* f154dc0: acaf0000 */ sw $t7,0x0($a1) /* f154dc4: afa5002c */ sw $a1,0x2c($sp) /* f154dc8: 26100008 */ addiu $s0,$s0,0x8 -/* f154dcc: 0c012b34 */ jal 0x4acd0 +/* f154dcc: 0c012b34 */ jal osVirtualToPhysical /* f154dd0: 248401d8 */ addiu $a0,$a0,0x1d8 /* f154dd4: 8fa5002c */ lw $a1,0x2c($sp) /* f154dd8: 24180001 */ li $t8,0x1 @@ -3865,7 +3865,7 @@ glabel func0f154f38 /* f154e30: acaf0000 */ sw $t7,0x0($a1) /* f154e34: afa50020 */ sw $a1,0x20($sp) /* f154e38: 26100008 */ addiu $s0,$s0,0x8 -/* f154e3c: 0c012b34 */ jal 0x4acd0 +/* f154e3c: 0c012b34 */ jal osVirtualToPhysical /* f154e40: 24840178 */ addiu $a0,$a0,0x178 /* f154e44: 8fa50020 */ lw $a1,0x20($sp) /* f154e48: 3c018008 */ lui $at,0x8008 @@ -4003,10 +4003,10 @@ glabel func0f154f38 /* f15504c: a7ac0040 */ sh $t4,0x40($sp) /* f155050: 00076180 */ sll $t4,$a3,0x6 /* f155054: 25980001 */ addiu $t8,$t4,0x1 -/* f155058: 0fc59f5d */ jal 0xf167d74 +/* f155058: 0fc59f5d */ jal gfxAllocateVertices /* f15505c: a7b80038 */ sh $t8,0x38($sp) /* f155060: 24040001 */ li $a0,0x1 -/* f155064: 0fc59f77 */ jal 0xf167ddc +/* f155064: 0fc59f77 */ jal gfxAllocateColours /* f155068: afa20034 */ sw $v0,0x34($sp) /* f15506c: 8fa30034 */ lw $v1,0x34($sp) /* f155070: 3c0dff00 */ lui $t5,0xff00 @@ -4373,7 +4373,7 @@ glabel func0f1552d4 /* f155228: 27a400c0 */ addiu $a0,$sp,0xc0 /* f15522c: 8fa700e8 */ lw $a3,0xe8($sp) /* f155230: afa00014 */ sw $zero,0x14($sp) -/* f155234: 0fc55d49 */ jal 0xf157524 +/* f155234: 0fc55d49 */ jal textMeasure /* f155238: afaf0010 */ sw $t7,0x10($sp) /* f15523c: 8fb800c4 */ lw $t8,0xc4($sp) /* f155240: 3c013f80 */ lui $at,0x3f80 @@ -4421,7 +4421,7 @@ glabel func0f1552d4 /* f1552e8: ac6a0000 */ sw $t2,0x0($v1) /* f1552ec: ae4c0000 */ sw $t4,0x0($s2) /* f1552f0: 46124282 */ mul.s $f10,$f8,$f18 -/* f1552f4: 0c012b34 */ jal 0x4acd0 +/* f1552f4: 0c012b34 */ jal osVirtualToPhysical /* f1552f8: 460a8581 */ sub.s $f22,$f16,$f10 /* f1552fc: ae420004 */ sw $v0,0x4($s2) /* f155300: 240d0001 */ li $t5,0x1 @@ -4524,7 +4524,7 @@ glabel func0f1552d4 /* f15546c: afad0010 */ sw $t5,0x10($sp) /* f155470: 27a50084 */ addiu $a1,$sp,0x84 /* f155474: 27a60080 */ addiu $a2,$sp,0x80 -/* f155478: 0fc552c0 */ jal 0xf154b00 +/* f155478: 0fc552c0 */ jal func0f15642cpb /* f15547c: 8fa700e8 */ lw $a3,0xe8($sp) /* f155480: 8fae00ec */ lw $t6,0xec($sp) /* f155484: 02002025 */ move $a0,$s0 @@ -4535,7 +4535,7 @@ glabel func0f1552d4 /* f155498: e7b80018 */ swc1 $f24,0x18($sp) /* f15549c: e7b4001c */ swc1 $f20,0x1c($sp) /* f1554a0: e7b60020 */ swc1 $f22,0x20($sp) -/* f1554a4: 0fc55344 */ jal 0xf154d10 +/* f1554a4: 0fc55344 */ jal func0f154f38 /* f1554a8: afae0010 */ sw $t6,0x10($sp) /* f1554ac: 00408025 */ move $s0,$v0 .JF0f1554b0: @@ -5349,14 +5349,14 @@ glabel func0f15568c /* f15560c: 8e4f0000 */ lw $t7,0x0($s2) /* f155610: 59e002ee */ blezl $t7,.JF0f1561cc /* f155614: 922f0004 */ lbu $t7,0x4($s1) -/* f155618: 0c002eeb */ jal 0xbbac +/* f155618: 0c002eeb */ jal viGetWidth /* f15561c: afac00b0 */ sw $t4,0xb0($sp) /* f155620: 8e580000 */ lw $t8,0x0($s2) /* f155624: 8fac00b0 */ lw $t4,0xb0($sp) /* f155628: 0058082a */ slt $at,$v0,$t8 /* f15562c: 542002e7 */ bnezl $at,.JF0f1561cc /* f155630: 922f0004 */ lbu $t7,0x4($s1) -/* f155634: 0c002eef */ jal 0xbbbc +/* f155634: 0c002eef */ jal viGetHeight /* f155638: afac00b0 */ sw $t4,0xb0($sp) /* f15563c: 8fac00b0 */ lw $t4,0xb0($sp) /* f155640: 82390002 */ lb $t9,0x2($s1) @@ -5396,7 +5396,7 @@ glabel func0f15568c /* f1556c4: 962f0000 */ lhu $t7,0x0($s1) /* f1556c8: 96240000 */ lhu $a0,0x0($s1) /* f1556cc: afac00b0 */ sw $t4,0xb0($sp) -/* f1556d0: 0fc5b967 */ jal 0xf16e59c +/* f1556d0: 0fc5b967 */ jal func0f16e3fc /* f1556d4: 2484ff80 */ addiu $a0,$a0,-128 /* f1556d8: 8fac00b0 */ lw $t4,0xb0($sp) /* f1556dc: 3c0d8008 */ lui $t5,0x8008 @@ -5420,7 +5420,7 @@ glabel func0f15568c /* f155720: afac00b0 */ sw $t4,0xb0($sp) /* f155724: afa500a4 */ sw $a1,0xa4($sp) /* f155728: 26100008 */ addiu $s0,$s0,0x8 -/* f15572c: 0c012b34 */ jal 0x4acd0 +/* f15572c: 0c012b34 */ jal osVirtualToPhysical /* f155730: 248401d8 */ addiu $a0,$a0,0x1d8 /* f155734: 8fa500a4 */ lw $a1,0xa4($sp) /* f155738: 8fac00b0 */ lw $t4,0xb0($sp) @@ -5455,7 +5455,7 @@ glabel func0f15568c /* f1557a8: afac00b0 */ sw $t4,0xb0($sp) /* f1557ac: afa50098 */ sw $a1,0x98($sp) /* f1557b0: 26100008 */ addiu $s0,$s0,0x8 -/* f1557b4: 0c012b34 */ jal 0x4acd0 +/* f1557b4: 0c012b34 */ jal osVirtualToPhysical /* f1557b8: 24840178 */ addiu $a0,$a0,0x178 /* f1557bc: 8fa50098 */ lw $a1,0x98($sp) /* f1557c0: 8fac00b0 */ lw $t4,0xb0($sp) @@ -5541,7 +5541,7 @@ glabel func0f15568c /* f1558f0: 8dd80000 */ lw $t8,0x0($t6) /* f1558f4: 00002812 */ mflo $a1 /* f1558f8: afac00b0 */ sw $t4,0xb0($sp) -/* f1558fc: 0fc5518e */ jal 0xf154638 +/* f1558fc: 0fc5518e */ jal func0f154ecc /* f155900: 030f3021 */ addu $a2,$t8,$t7 /* f155904: 3c0d8008 */ lui $t5,0x8008 /* f155908: 3c1f8008 */ lui $ra,0x8008 @@ -5797,7 +5797,7 @@ glabel func0f15568c /* f155cc8: 922f0004 */ lbu $t7,0x4($s1) /* f155ccc: 8dd90000 */ lw $t9,0x0($t6) /* f155cd0: afac00b0 */ sw $t4,0xb0($sp) -/* f155cd4: 0fc54cb6 */ jal 0xf1532d8 +/* f155cd4: 0fc54cb6 */ jal func0f153b6c /* f155cd8: 032f2021 */ addu $a0,$t9,$t7 /* f155cdc: 3c0e8008 */ lui $t6,0x8008 /* f155ce0: 8dce00f4 */ lw $t6,0xf4($t6) @@ -5852,7 +5852,7 @@ glabel func0f15568c /* f155d9c: 03020019 */ multu $t8,$v0 /* f155da0: 00007012 */ mflo $t6 /* f155da4: 00cec821 */ addu $t9,$a2,$t6 -/* f155da8: 0fc35773 */ jal 0xf0d5dcc +/* f155da8: 0fc35773 */ jal func0f0d4d0c /* f155dac: afb90010 */ sw $t9,0x10($sp) /* f155db0: 3c01800a */ lui $at,0x800a /* f155db4: ac224ffc */ sw $v0,0x4ffc($at) @@ -5910,7 +5910,7 @@ glabel func0f15568c /* f155e78: 01e20019 */ multu $t7,$v0 /* f155e7c: 0000c012 */ mflo $t8 /* f155e80: 00d87021 */ addu $t6,$a2,$t8 -/* f155e84: 0fc35773 */ jal 0xf0d5dcc +/* f155e84: 0fc35773 */ jal func0f0d4d0c /* f155e88: afae0010 */ sw $t6,0x10($sp) /* f155e8c: 3c01800a */ lui $at,0x800a /* f155e90: 100000cd */ b .JF0f1561c8 @@ -8141,7 +8141,7 @@ glabel textRenderProjected /* f1562a4: 11c000d8 */ beqz $t6,.JF0f156608 /* f1562a8: 3c014220 */ lui $at,0x4220 /* f1562ac: 44816000 */ mtc1 $at,$f12 -/* f1562b0: 0fc01ae2 */ jal 0xf006b88 +/* f1562b0: 0fc01ae2 */ jal func0f006b08 /* f1562b4: 00000000 */ nop /* f1562b8: 8e4f0000 */ lw $t7,0x0($s2) /* f1562bc: 3c188008 */ lui $t8,0x8008 @@ -8179,7 +8179,7 @@ glabel textRenderProjected /* f156330: 3c047f1c */ lui $a0,0x7f1c /* f156334: 3c058008 */ lui $a1,0x8008 /* f156338: 24a50230 */ addiu $a1,$a1,0x230 -/* f15633c: 0c0036b4 */ jal 0xdad0 +/* f15633c: 0c0036b4 */ jal mainOverrideVariable /* f156340: 2484806c */ addiu $a0,$a0,-32660 /* f156344: 3c028008 */ lui $v0,0x8008 /* f156348: 8c420230 */ lw $v0,0x230($v0) @@ -8242,7 +8242,7 @@ glabel textRenderProjected /* f156418: afac0020 */ sw $t4,0x20($sp) /* f15641c: afad0024 */ sw $t5,0x24($sp) /* f156420: afaa0014 */ sw $t2,0x14($sp) -/* f156424: 0fc55886 */ jal 0xf156218 +/* f156424: 0fc55886 */ jal textRenderProjected /* f156428: afab001c */ sw $t3,0x1c($sp) /* f15642c: 8e4e0000 */ lw $t6,0x0($s2) /* f156430: 3c0f8008 */ lui $t7,0x8008 @@ -8281,7 +8281,7 @@ glabel textRenderProjected /* f1564ac: afac0014 */ sw $t4,0x14($sp) /* f1564b0: afad001c */ sw $t5,0x1c($sp) /* f1564b4: afae0020 */ sw $t6,0x20($sp) -/* f1564b8: 0fc55886 */ jal 0xf156218 +/* f1564b8: 0fc55886 */ jal textRenderProjected /* f1564bc: afaf0024 */ sw $t7,0x24($sp) /* f1564c0: 8e580000 */ lw $t8,0x0($s2) /* f1564c4: 3c198008 */ lui $t9,0x8008 @@ -8319,7 +8319,7 @@ glabel textRenderProjected /* f15653c: afae0014 */ sw $t6,0x14($sp) /* f156540: afb80020 */ sw $t8,0x20($sp) /* f156544: afb90024 */ sw $t9,0x24($sp) -/* f156548: 0fc55886 */ jal 0xf156218 +/* f156548: 0fc55886 */ jal textRenderProjected /* f15654c: afaf001c */ sw $t7,0x1c($sp) /* f156550: 8e490000 */ lw $t1,0x0($s2) /* f156554: 3c0a8008 */ lui $t2,0x8008 @@ -8357,7 +8357,7 @@ glabel textRenderProjected /* f1565cc: afb80014 */ sw $t8,0x14($sp) /* f1565d0: afa90020 */ sw $t1,0x20($sp) /* f1565d4: afaa0024 */ sw $t2,0x24($sp) -/* f1565d8: 0fc55886 */ jal 0xf156218 +/* f1565d8: 0fc55886 */ jal textRenderProjected /* f1565dc: afb9001c */ sw $t9,0x1c($sp) /* f1565e0: 8fac0088 */ lw $t4,0x88($sp) /* f1565e4: 240b0001 */ li $t3,0x1 @@ -8381,37 +8381,37 @@ glabel textRenderProjected /* f156628: ae380000 */ sw $t8,0x0($s1) .JF0f15662c: /* f15662c: 3c058008 */ lui $a1,0x8008 -/* f156630: 0c0036b4 */ jal 0xdad0 +/* f156630: 0c0036b4 */ jal mainOverrideVariable /* f156634: 24a50208 */ addiu $a1,$a1,0x208 /* f156638: 3c047f1c */ lui $a0,0x7f1c /* f15663c: 3c058008 */ lui $a1,0x8008 /* f156640: 24a50214 */ addiu $a1,$a1,0x214 -/* f156644: 0c0036b4 */ jal 0xdad0 +/* f156644: 0c0036b4 */ jal mainOverrideVariable /* f156648: 2484807c */ addiu $a0,$a0,-32644 /* f15664c: 3c047f1c */ lui $a0,0x7f1c /* f156650: 3c058008 */ lui $a1,0x8008 /* f156654: 24a50218 */ addiu $a1,$a1,0x218 -/* f156658: 0c0036b4 */ jal 0xdad0 +/* f156658: 0c0036b4 */ jal mainOverrideVariable /* f15665c: 24848088 */ addiu $a0,$a0,-32632 /* f156660: 3c047f1c */ lui $a0,0x7f1c /* f156664: 3c058008 */ lui $a1,0x8008 /* f156668: 24a50220 */ addiu $a1,$a1,0x220 -/* f15666c: 0c0036b4 */ jal 0xdad0 +/* f15666c: 0c0036b4 */ jal mainOverrideVariable /* f156670: 24848094 */ addiu $a0,$a0,-32620 /* f156674: 3c047f1c */ lui $a0,0x7f1c /* f156678: 3c058008 */ lui $a1,0x8008 /* f15667c: 24a5021c */ addiu $a1,$a1,0x21c -/* f156680: 0c0036b4 */ jal 0xdad0 +/* f156680: 0c0036b4 */ jal mainOverrideVariable /* f156684: 2484809c */ addiu $a0,$a0,-32612 /* f156688: 3c047f1c */ lui $a0,0x7f1c /* f15668c: 3c058008 */ lui $a1,0x8008 /* f156690: 24a5020c */ addiu $a1,$a1,0x20c -/* f156694: 0c0036b4 */ jal 0xdad0 +/* f156694: 0c0036b4 */ jal mainOverrideVariable /* f156698: 248480a4 */ addiu $a0,$a0,-32604 /* f15669c: 3c047f1c */ lui $a0,0x7f1c /* f1566a0: 3c058008 */ lui $a1,0x8008 /* f1566a4: 24a50210 */ addiu $a1,$a1,0x210 -/* f1566a8: 0c0036b4 */ jal 0xdad0 +/* f1566a8: 0c0036b4 */ jal mainOverrideVariable /* f1566ac: 248480ac */ addiu $a0,$a0,-32596 /* f1566b0: 8e390000 */ lw $t9,0x0($s1) /* f1566b4: 8e500000 */ lw $s0,0x0($s2) @@ -8446,7 +8446,7 @@ glabel textRenderProjected /* f156720: 3c048008 */ lui $a0,0x8008 /* f156724: 248401d8 */ addiu $a0,$a0,0x1d8 /* f156728: afa70078 */ sw $a3,0x78($sp) -/* f15672c: 0c012b34 */ jal 0x4acd0 +/* f15672c: 0c012b34 */ jal osVirtualToPhysical /* f156730: 26730008 */ addiu $s3,$s3,0x8 /* f156734: 8fa70078 */ lw $a3,0x78($sp) /* f156738: 24190001 */ li $t9,0x1 @@ -8546,7 +8546,7 @@ glabel textRenderProjected /* f15689c: 27a400bc */ addiu $a0,$sp,0xbc /* f1568a0: 27a5005c */ addiu $a1,$sp,0x5c /* f1568a4: 27a60058 */ addiu $a2,$sp,0x58 -/* f1568a8: 0fc552c0 */ jal 0xf154b00 +/* f1568a8: 0fc552c0 */ jal func0f15642cpb /* f1568ac: 8fa700c0 */ lw $a3,0xc0($sp) /* f1568b0: 8fb80058 */ lw $t8,0x58($sp) /* f1568b4: 8fb900c4 */ lw $t9,0xc4($sp) @@ -8564,7 +8564,7 @@ glabel textRenderProjected /* f1568e4: afaa001c */ sw $t2,0x1c($sp) /* f1568e8: afa90020 */ sw $t1,0x20($sp) /* f1568ec: afab0024 */ sw $t3,0x24($sp) -/* f1568f0: 0fc55541 */ jal 0xf155504 +/* f1568f0: 0fc55541 */ jal func0f15568c /* f1568f4: afac0028 */ sw $t4,0x28($sp) /* f1568f8: 00409825 */ move $s3,$v0 .JF0f1568fc: @@ -9936,13 +9936,13 @@ glabel func0f156790 /* f156b0c: 016f6023 */ subu $t4,$t3,$t7 /* f156b10: 1980005f */ blez $t4,.JF0f156c90 /* f156b14: acac0000 */ sw $t4,0x0($a1) -/* f156b18: 0c002eeb */ jal 0xbbac +/* f156b18: 0c002eeb */ jal viGetWidth /* f156b1c: 00000000 */ nop /* f156b20: 8e590000 */ lw $t9,0x0($s2) /* f156b24: 0059082a */ slt $at,$v0,$t9 /* f156b28: 14200059 */ bnez $at,.JF0f156c90 /* f156b2c: 00000000 */ nop -/* f156b30: 0c002eef */ jal 0xbbbc +/* f156b30: 0c002eef */ jal viGetHeight /* f156b34: 00000000 */ nop /* f156b38: 8fae0038 */ lw $t6,0x38($sp) /* f156b3c: 82380002 */ lb $t8,0x2($s1) @@ -9973,7 +9973,7 @@ glabel func0f156790 /* f156ba0: 57000008 */ bnezl $t8,.JF0f156bc4 /* f156ba4: 02001025 */ move $v0,$s0 /* f156ba8: 96240000 */ lhu $a0,0x0($s1) -/* f156bac: 0fc5b967 */ jal 0xf16e59c +/* f156bac: 0fc5b967 */ jal func0f16e3fc /* f156bb0: 2484ff80 */ addiu $a0,$a0,-128 /* f156bb4: 8fa90058 */ lw $t1,0x58($sp) /* f156bb8: 8faa005c */ lw $t2,0x5c($sp) @@ -10030,7 +10030,7 @@ glabel func0f156790 /* f156c78: 032e2823 */ subu $a1,$t9,$t6 /* f156c7c: afaf001c */ sw $t7,0x1c($sp) /* f156c80: afab0018 */ sw $t3,0x18($sp) -/* f156c84: 0fc55b33 */ jal 0xf156ccc +/* f156c84: 0fc55b33 */ jal func0f156a24 /* f156c88: 24c6ffff */ addiu $a2,$a2,-1 /* f156c8c: 00408025 */ move $s0,$v0 .JF0f156c90: @@ -10849,7 +10849,7 @@ glabel textRender /* f1571b8: 3c0efd10 */ lui $t6,0xfd10 /* f1571bc: 3c048008 */ lui $a0,0x8008 /* f1571c0: 24840198 */ addiu $a0,$a0,0x198 -/* f1571c4: 0c012b34 */ jal 0x4acd0 +/* f1571c4: 0c012b34 */ jal osVirtualToPhysical /* f1571c8: ae4e0000 */ sw $t6,0x0($s2) /* f1571cc: 02001825 */ move $v1,$s0 /* f1571d0: ae420004 */ sw $v0,0x4($s2) @@ -10975,7 +10975,7 @@ glabel textRender /* f1573a4: afaf0010 */ sw $t7,0x10($sp) /* f1573a8: 27a50078 */ addiu $a1,$sp,0x78 /* f1573ac: 27a60074 */ addiu $a2,$sp,0x74 -/* f1573b0: 0fc552c0 */ jal 0xf154b00 +/* f1573b0: 0fc552c0 */ jal func0f15642cpb /* f1573b4: 8fa700d0 */ lw $a3,0xd0($sp) /* f1573b8: 8e4b0000 */ lw $t3,0x0($s2) /* f1573bc: 8fb90074 */ lw $t9,0x74($sp) @@ -10992,7 +10992,7 @@ glabel textRender /* f1573e8: afb90010 */ sw $t9,0x10($sp) /* f1573ec: 00006012 */ mflo $t4 /* f1573f0: afac0020 */ sw $t4,0x20($sp) -/* f1573f4: 0fc55aa1 */ jal 0xf156a84 +/* f1573f4: 0fc55aa1 */ jal func0f156790 /* f1573f8: afb8001c */ sw $t8,0x1c($sp) /* f1573fc: 00408025 */ move $s0,$v0 .JF0f157400: @@ -11917,7 +11917,7 @@ glabel func0f1574d0jf /* f157500: afb9001c */ sw $t9,0x1c($sp) /* f157504: afa80020 */ sw $t0,0x20($sp) /* f157508: afa90024 */ sw $t1,0x24($sp) -/* f15750c: 0fc55886 */ jal 0xf156218 +/* f15750c: 0fc55886 */ jal textRenderProjected /* f157510: afaa0028 */ sw $t2,0x28($sp) /* f157514: 8fbf0034 */ lw $ra,0x34($sp) /* f157518: 27bd0038 */ addiu $sp,$sp,0x38 @@ -12009,7 +12009,7 @@ glabel textMeasure /* f15763c: 27a50054 */ addiu $a1,$sp,0x54 /* f157640: 27a60050 */ addiu $a2,$sp,0x50 /* f157644: 02c03825 */ move $a3,$s6 -/* f157648: 0fc552c0 */ jal 0xf154b00 +/* f157648: 0fc552c0 */ jal func0f15642cpb /* f15764c: 00008825 */ move $s1,$zero /* f157650: 8fac0054 */ lw $t4,0x54($sp) /* f157654: 240100be */ li $at,0xbe @@ -12700,7 +12700,7 @@ glabel textWrap /* f157810: 24170001 */ li $s7,0x1 /* f157814: 3051ffff */ andi $s1,$v0,0xffff /* f157818: 3044ffff */ andi $a0,$v0,0xffff -/* f15781c: 0fc551e1 */ jal 0xf154784 +/* f15781c: 0fc551e1 */ jal func0f154784jf /* f157820: afa70094 */ sw $a3,0x94($sp) /* f157824: 8fa70094 */ lw $a3,0x94($sp) /* f157828: 16000002 */ bnez $s0,.JF0f157834 @@ -12801,7 +12801,7 @@ glabel textWrap /* f157960: 000e79c0 */ sll $t7,$t6,0x7 /* f157964: 01f82025 */ or $a0,$t7,$t8 /* f157968: 3099ffff */ andi $t9,$a0,0xffff -/* f15796c: 0fc551e1 */ jal 0xf154784 +/* f15796c: 0fc551e1 */ jal func0f154784jf /* f157970: 03202025 */ move $a0,$t9 /* f157974: 14400002 */ bnez $v0,.JF0f157980 /* f157978: 8fa70094 */ lw $a3,0x94($sp) @@ -12832,7 +12832,7 @@ glabel textWrap /* f1579d0: 27a400a4 */ addiu $a0,$sp,0xa4 /* f1579d4: 27a500a8 */ addiu $a1,$sp,0xa8 /* f1579d8: 27a60074 */ addiu $a2,$sp,0x74 -/* f1579dc: 0fc55d49 */ jal 0xf157524 +/* f1579dc: 0fc55d49 */ jal textMeasure /* f1579e0: afac0010 */ sw $t4,0x10($sp) /* f1579e4: 8fad00b4 */ lw $t5,0xb4($sp) /* f1579e8: 8fae00a8 */ lw $t6,0xa8($sp) diff --git a/src/game/gamefile.c b/src/game/gamefile.c index 0c7d175d9..0e5aac3da 100644 --- a/src/game/gamefile.c +++ b/src/game/gamefile.c @@ -82,172 +82,172 @@ glabel gamefileApplyOptions /* f10f4f0: afa80020 */ sw $t0,0x20($sp) .JF0f10f4f4: /* f10f4f4: 24d00014 */ addiu $s0,$a2,0x14 -/* f10f4f8: 0fc47a54 */ jal 0xf11e950 +/* f10f4f8: 0fc47a54 */ jal pakHasBitflag /* f10f4fc: 02002825 */ move $a1,$s0 /* f10f500: 8fa40024 */ lw $a0,0x24($sp) -/* f10f504: 0fc547da */ jal 0xf151f68 +/* f10f504: 0fc547da */ jal optionsSetForwardPitch /* f10f508: 00402825 */ move $a1,$v0 /* f10f50c: 24040001 */ li $a0,0x1 -/* f10f510: 0fc47a54 */ jal 0xf11e950 +/* f10f510: 0fc47a54 */ jal pakHasBitflag /* f10f514: 02002825 */ move $a1,$s0 /* f10f518: 8fa40024 */ lw $a0,0x24($sp) -/* f10f51c: 0fc547f0 */ jal 0xf151fc0 +/* f10f51c: 0fc547f0 */ jal optionsSetAutoAim /* f10f520: 00402825 */ move $a1,$v0 /* f10f524: 24040002 */ li $a0,0x2 -/* f10f528: 0fc47a54 */ jal 0xf11e950 +/* f10f528: 0fc47a54 */ jal pakHasBitflag /* f10f52c: 02002825 */ move $a1,$s0 /* f10f530: 8fa40024 */ lw $a0,0x24($sp) -/* f10f534: 0fc5481c */ jal 0xf152070 +/* f10f534: 0fc5481c */ jal optionsSetAimControl /* f10f538: 00402825 */ move $a1,$v0 /* f10f53c: 24040003 */ li $a0,0x3 -/* f10f540: 0fc47a54 */ jal 0xf11e950 +/* f10f540: 0fc47a54 */ jal pakHasBitflag /* f10f544: 02002825 */ move $a1,$s0 /* f10f548: 8fa40024 */ lw $a0,0x24($sp) -/* f10f54c: 0fc54832 */ jal 0xf1520c8 +/* f10f54c: 0fc54832 */ jal optionsSetSightOnScreen /* f10f550: 00402825 */ move $a1,$v0 /* f10f554: 24040004 */ li $a0,0x4 -/* f10f558: 0fc47a54 */ jal 0xf11e950 +/* f10f558: 0fc47a54 */ jal pakHasBitflag /* f10f55c: 02002825 */ move $a1,$s0 /* f10f560: 8fa40024 */ lw $a0,0x24($sp) -/* f10f564: 0fc54806 */ jal 0xf152018 +/* f10f564: 0fc54806 */ jal optionsSetLookAhead /* f10f568: 00402825 */ move $a1,$v0 /* f10f56c: 24040005 */ li $a0,0x5 -/* f10f570: 0fc47a54 */ jal 0xf11e950 +/* f10f570: 0fc47a54 */ jal pakHasBitflag /* f10f574: 02002825 */ move $a1,$s0 /* f10f578: 8fa40024 */ lw $a0,0x24($sp) -/* f10f57c: 0fc54848 */ jal 0xf152120 +/* f10f57c: 0fc54848 */ jal optionsSetAmmoOnScreen /* f10f580: 00402825 */ move $a1,$v0 /* f10f584: 24040009 */ li $a0,0x9 -/* f10f588: 0fc47a54 */ jal 0xf11e950 +/* f10f588: 0fc47a54 */ jal pakHasBitflag /* f10f58c: 02002825 */ move $a1,$s0 /* f10f590: 8fa40024 */ lw $a0,0x24($sp) -/* f10f594: 0fc548d2 */ jal 0xf152348 +/* f10f594: 0fc548d2 */ jal optionsSetHeadRoll /* f10f598: 00402825 */ move $a1,$v0 /* f10f59c: 2404000a */ li $a0,0xa -/* f10f5a0: 0fc47a54 */ jal 0xf11e950 +/* f10f5a0: 0fc47a54 */ jal pakHasBitflag /* f10f5a4: 02002825 */ move $a1,$s0 /* f10f5a8: 8fa40024 */ lw $a0,0x24($sp) -/* f10f5ac: 0fc5485e */ jal 0xf152178 +/* f10f5ac: 0fc5485e */ jal optionsSetShowGunFunction /* f10f5b0: 00402825 */ move $a1,$v0 /* f10f5b4: 24040015 */ li $a0,0x15 -/* f10f5b8: 0fc47a54 */ jal 0xf11e950 +/* f10f5b8: 0fc47a54 */ jal pakHasBitflag /* f10f5bc: 02002825 */ move $a1,$s0 /* f10f5c0: 8fa40024 */ lw $a0,0x24($sp) -/* f10f5c4: 0fc54874 */ jal 0xf1521d0 +/* f10f5c4: 0fc54874 */ jal optionsSetAlwaysShowTarget /* f10f5c8: 00402825 */ move $a1,$v0 /* f10f5cc: 24040017 */ li $a0,0x17 -/* f10f5d0: 0fc47a54 */ jal 0xf11e950 +/* f10f5d0: 0fc47a54 */ jal pakHasBitflag /* f10f5d4: 02002825 */ move $a1,$s0 /* f10f5d8: 8fa40024 */ lw $a0,0x24($sp) -/* f10f5dc: 0fc5488a */ jal 0xf152228 +/* f10f5dc: 0fc5488a */ jal optionsSetShowZoomRange /* f10f5e0: 00402825 */ move $a1,$v0 /* f10f5e4: 2404001a */ li $a0,0x1a -/* f10f5e8: 0fc47a54 */ jal 0xf11e950 +/* f10f5e8: 0fc47a54 */ jal pakHasBitflag /* f10f5ec: 02002825 */ move $a1,$s0 /* f10f5f0: 8fa40024 */ lw $a0,0x24($sp) -/* f10f5f4: 0fc548b6 */ jal 0xf1522d8 +/* f10f5f4: 0fc548b6 */ jal optionsSetShowMissionTime /* f10f5f8: 00402825 */ move $a1,$v0 /* f10f5fc: 24040020 */ li $a0,0x20 -/* f10f600: 0fc47a54 */ jal 0xf11e950 +/* f10f600: 0fc47a54 */ jal pakHasBitflag /* f10f604: 02002825 */ move $a1,$s0 /* f10f608: 8fa40024 */ lw $a0,0x24($sp) -/* f10f60c: 0fc548a0 */ jal 0xf152280 +/* f10f60c: 0fc548a0 */ jal optionsSetPaintball /* f10f610: 00402825 */ move $a1,$v0 /* f10f614: 2404000c */ li $a0,0xc -/* f10f618: 0fc47a54 */ jal 0xf11e950 +/* f10f618: 0fc47a54 */ jal pakHasBitflag /* f10f61c: 02002825 */ move $a1,$s0 /* f10f620: 8fa40020 */ lw $a0,0x20($sp) -/* f10f624: 0fc547da */ jal 0xf151f68 +/* f10f624: 0fc547da */ jal optionsSetForwardPitch /* f10f628: 00402825 */ move $a1,$v0 /* f10f62c: 2404000d */ li $a0,0xd -/* f10f630: 0fc47a54 */ jal 0xf11e950 +/* f10f630: 0fc47a54 */ jal pakHasBitflag /* f10f634: 02002825 */ move $a1,$s0 /* f10f638: 8fa40020 */ lw $a0,0x20($sp) -/* f10f63c: 0fc547f0 */ jal 0xf151fc0 +/* f10f63c: 0fc547f0 */ jal optionsSetAutoAim /* f10f640: 00402825 */ move $a1,$v0 /* f10f644: 2404000e */ li $a0,0xe -/* f10f648: 0fc47a54 */ jal 0xf11e950 +/* f10f648: 0fc47a54 */ jal pakHasBitflag /* f10f64c: 02002825 */ move $a1,$s0 /* f10f650: 8fa40020 */ lw $a0,0x20($sp) -/* f10f654: 0fc5481c */ jal 0xf152070 +/* f10f654: 0fc5481c */ jal optionsSetAimControl /* f10f658: 00402825 */ move $a1,$v0 /* f10f65c: 2404000f */ li $a0,0xf -/* f10f660: 0fc47a54 */ jal 0xf11e950 +/* f10f660: 0fc47a54 */ jal pakHasBitflag /* f10f664: 02002825 */ move $a1,$s0 /* f10f668: 8fa40020 */ lw $a0,0x20($sp) -/* f10f66c: 0fc54832 */ jal 0xf1520c8 +/* f10f66c: 0fc54832 */ jal optionsSetSightOnScreen /* f10f670: 00402825 */ move $a1,$v0 /* f10f674: 24040010 */ li $a0,0x10 -/* f10f678: 0fc47a54 */ jal 0xf11e950 +/* f10f678: 0fc47a54 */ jal pakHasBitflag /* f10f67c: 02002825 */ move $a1,$s0 /* f10f680: 8fa40020 */ lw $a0,0x20($sp) -/* f10f684: 0fc54806 */ jal 0xf152018 +/* f10f684: 0fc54806 */ jal optionsSetLookAhead /* f10f688: 00402825 */ move $a1,$v0 /* f10f68c: 24040011 */ li $a0,0x11 -/* f10f690: 0fc47a54 */ jal 0xf11e950 +/* f10f690: 0fc47a54 */ jal pakHasBitflag /* f10f694: 02002825 */ move $a1,$s0 /* f10f698: 8fa40020 */ lw $a0,0x20($sp) -/* f10f69c: 0fc54848 */ jal 0xf152120 +/* f10f69c: 0fc54848 */ jal optionsSetAmmoOnScreen /* f10f6a0: 00402825 */ move $a1,$v0 /* f10f6a4: 24040012 */ li $a0,0x12 -/* f10f6a8: 0fc47a54 */ jal 0xf11e950 +/* f10f6a8: 0fc47a54 */ jal pakHasBitflag /* f10f6ac: 02002825 */ move $a1,$s0 /* f10f6b0: 8fa40020 */ lw $a0,0x20($sp) -/* f10f6b4: 0fc548d2 */ jal 0xf152348 +/* f10f6b4: 0fc548d2 */ jal optionsSetHeadRoll /* f10f6b8: 00402825 */ move $a1,$v0 /* f10f6bc: 24040013 */ li $a0,0x13 -/* f10f6c0: 0fc47a54 */ jal 0xf11e950 +/* f10f6c0: 0fc47a54 */ jal pakHasBitflag /* f10f6c4: 02002825 */ move $a1,$s0 /* f10f6c8: 8fa40020 */ lw $a0,0x20($sp) -/* f10f6cc: 0fc5485e */ jal 0xf152178 +/* f10f6cc: 0fc5485e */ jal optionsSetShowGunFunction /* f10f6d0: 00402825 */ move $a1,$v0 /* f10f6d4: 24040016 */ li $a0,0x16 -/* f10f6d8: 0fc47a54 */ jal 0xf11e950 +/* f10f6d8: 0fc47a54 */ jal pakHasBitflag /* f10f6dc: 02002825 */ move $a1,$s0 /* f10f6e0: 8fa40020 */ lw $a0,0x20($sp) -/* f10f6e4: 0fc54874 */ jal 0xf1521d0 +/* f10f6e4: 0fc54874 */ jal optionsSetAlwaysShowTarget /* f10f6e8: 00402825 */ move $a1,$v0 /* f10f6ec: 24040018 */ li $a0,0x18 -/* f10f6f0: 0fc47a54 */ jal 0xf11e950 +/* f10f6f0: 0fc47a54 */ jal pakHasBitflag /* f10f6f4: 02002825 */ move $a1,$s0 /* f10f6f8: 8fa40020 */ lw $a0,0x20($sp) -/* f10f6fc: 0fc5488a */ jal 0xf152228 +/* f10f6fc: 0fc5488a */ jal optionsSetShowZoomRange /* f10f700: 00402825 */ move $a1,$v0 /* f10f704: 2404001b */ li $a0,0x1b -/* f10f708: 0fc47a54 */ jal 0xf11e950 +/* f10f708: 0fc47a54 */ jal pakHasBitflag /* f10f70c: 02002825 */ move $a1,$s0 /* f10f710: 8fa40020 */ lw $a0,0x20($sp) -/* f10f714: 0fc548b6 */ jal 0xf1522d8 +/* f10f714: 0fc548b6 */ jal optionsSetShowMissionTime /* f10f718: 00402825 */ move $a1,$v0 /* f10f71c: 24040021 */ li $a0,0x21 -/* f10f720: 0fc47a54 */ jal 0xf11e950 +/* f10f720: 0fc47a54 */ jal pakHasBitflag /* f10f724: 02002825 */ move $a1,$s0 /* f10f728: 8fa40020 */ lw $a0,0x20($sp) -/* f10f72c: 0fc548a0 */ jal 0xf152280 +/* f10f72c: 0fc548a0 */ jal optionsSetPaintball /* f10f730: 00402825 */ move $a1,$v0 /* f10f734: 2404000b */ li $a0,0xb -/* f10f738: 0fc47a54 */ jal 0xf11e950 +/* f10f738: 0fc47a54 */ jal pakHasBitflag /* f10f73c: 02002825 */ move $a1,$s0 -/* f10f740: 0fc548cc */ jal 0xf152330 +/* f10f740: 0fc548cc */ jal optionsSetInGameSubtitles /* f10f744: 00402025 */ move $a0,$v0 /* f10f748: 24040014 */ li $a0,0x14 -/* f10f74c: 0fc47a54 */ jal 0xf11e950 +/* f10f74c: 0fc47a54 */ jal pakHasBitflag /* f10f750: 02002825 */ move $a1,$s0 -/* f10f754: 0fc548cf */ jal 0xf15233c +/* f10f754: 0fc548cf */ jal optionsSetCutsceneSubtitles /* f10f758: 00402025 */ move $a0,$v0 /* f10f75c: 24040021 */ li $a0,0x21 -/* f10f760: 0fc47a54 */ jal 0xf11e950 +/* f10f760: 0fc47a54 */ jal pakHasBitflag /* f10f764: 02002825 */ move $a1,$s0 /* f10f768: 8fa40020 */ lw $a0,0x20($sp) -/* f10f76c: 0fc548a0 */ jal 0xf152280 +/* f10f76c: 0fc548a0 */ jal optionsSetPaintball /* f10f770: 00402825 */ move $a1,$v0 /* f10f774: 24040040 */ li $a0,0x40 -/* f10f778: 0fc47a54 */ jal 0xf11e950 +/* f10f778: 0fc47a54 */ jal pakHasBitflag /* f10f77c: 02002825 */ move $a1,$s0 /* f10f780: 3c01800a */ lui $at,0x800a /* f10f784: a022ab13 */ sb $v0,-0x54ed($at) /* f10f788: 24040022 */ li $a0,0x22 -/* f10f78c: 0fc47a54 */ jal 0xf11e950 +/* f10f78c: 0fc47a54 */ jal pakHasBitflag /* f10f790: 02002825 */ move $a1,$s0 /* f10f794: 1040000d */ beqz $v0,.JF0f10f7cc /* f10f798: 3c098009 */ lui $t1,0x8009 @@ -255,17 +255,17 @@ glabel gamefileApplyOptions /* f10f7a0: 24010001 */ li $at,0x1 /* f10f7a4: 15210005 */ bne $t1,$at,.JF0f10f7bc /* f10f7a8: 00000000 */ nop -/* f10f7ac: 0fc2f537 */ jal 0xf0bd4dc +/* f10f7ac: 0fc2f537 */ jal playerSetHiResEnabled /* f10f7b0: 00002025 */ move $a0,$zero /* f10f7b4: 10000007 */ b .JF0f10f7d4 /* f10f7b8: 00000000 */ nop .JF0f10f7bc: -/* f10f7bc: 0fc2f537 */ jal 0xf0bd4dc +/* f10f7bc: 0fc2f537 */ jal playerSetHiResEnabled /* f10f7c0: 24040001 */ li $a0,0x1 /* f10f7c4: 10000003 */ b .JF0f10f7d4 /* f10f7c8: 00000000 */ nop .JF0f10f7cc: -/* f10f7cc: 0fc2f537 */ jal 0xf0bd4dc +/* f10f7cc: 0fc2f537 */ jal playerSetHiResEnabled /* f10f7d0: 00002025 */ move $a0,$zero .JF0f10f7d4: /* f10f7d4: 3c0a8009 */ lui $t2,0x8009 @@ -273,49 +273,49 @@ glabel gamefileApplyOptions /* f10f7dc: 24010001 */ li $at,0x1 /* f10f7e0: 55410008 */ bnel $t2,$at,.JF0f10f804 /* f10f7e4: 24040019 */ li $a0,0x19 -/* f10f7e8: 0fc5497b */ jal 0xf1525ec +/* f10f7e8: 0fc5497b */ jal optionsSetScreenSplit /* f10f7ec: 00002025 */ move $a0,$zero -/* f10f7f0: 0fc54975 */ jal 0xf1525d4 +/* f10f7f0: 0fc54975 */ jal optionsSetScreenRatio /* f10f7f4: 00002025 */ move $a0,$zero /* f10f7f8: 1000000c */ b .JF0f10f82c /* f10f7fc: 24040008 */ li $a0,0x8 /* f10f800: 24040019 */ li $a0,0x19 .JF0f10f804: -/* f10f804: 0fc47a54 */ jal 0xf11e950 +/* f10f804: 0fc47a54 */ jal pakHasBitflag /* f10f808: 02002825 */ move $a1,$s0 -/* f10f80c: 0fc5497b */ jal 0xf1525ec +/* f10f80c: 0fc5497b */ jal optionsSetScreenSplit /* f10f810: 304400ff */ andi $a0,$v0,0xff /* f10f814: 24040007 */ li $a0,0x7 -/* f10f818: 0fc47a54 */ jal 0xf11e950 +/* f10f818: 0fc47a54 */ jal pakHasBitflag /* f10f81c: 02002825 */ move $a1,$s0 -/* f10f820: 0fc54975 */ jal 0xf1525d4 +/* f10f820: 0fc54975 */ jal optionsSetScreenRatio /* f10f824: 00402025 */ move $a0,$v0 /* f10f828: 24040008 */ li $a0,0x8 .JF0f10f82c: -/* f10f82c: 0fc47a54 */ jal 0xf11e950 +/* f10f82c: 0fc47a54 */ jal pakHasBitflag /* f10f830: 02002825 */ move $a1,$s0 /* f10f834: 50400006 */ beqzl $v0,.JF0f10f850 /* f10f838: 24040006 */ li $a0,0x6 -/* f10f83c: 0fc5496f */ jal 0xf1525bc +/* f10f83c: 0fc5496f */ jal optionsSetScreenSize /* f10f840: 24040002 */ li $a0,0x2 /* f10f844: 1000000d */ b .JF0f10f87c /* f10f848: 2404001f */ li $a0,0x1f /* f10f84c: 24040006 */ li $a0,0x6 .JF0f10f850: -/* f10f850: 0fc47a54 */ jal 0xf11e950 +/* f10f850: 0fc47a54 */ jal pakHasBitflag /* f10f854: 02002825 */ move $a1,$s0 /* f10f858: 10400005 */ beqz $v0,.JF0f10f870 /* f10f85c: 00000000 */ nop -/* f10f860: 0fc5496f */ jal 0xf1525bc +/* f10f860: 0fc5496f */ jal optionsSetScreenSize /* f10f864: 24040001 */ li $a0,0x1 /* f10f868: 10000004 */ b .JF0f10f87c /* f10f86c: 2404001f */ li $a0,0x1f .JF0f10f870: -/* f10f870: 0fc5496f */ jal 0xf1525bc +/* f10f870: 0fc5496f */ jal optionsSetScreenSize /* f10f874: 00002025 */ move $a0,$zero /* f10f878: 2404001f */ li $a0,0x1f .JF0f10f87c: -/* f10f87c: 0fc47a54 */ jal 0xf11e950 +/* f10f87c: 0fc47a54 */ jal pakHasBitflag /* f10f880: 02002825 */ move $a1,$s0 /* f10f884: 10400005 */ beqz $v0,.JF0f10f89c /* f10f888: 2404001c */ li $a0,0x1c @@ -327,7 +327,7 @@ glabel gamefileApplyOptions /* f10f89c: 3c01800a */ lui $at,0x800a /* f10f8a0: ac20aa80 */ sw $zero,-0x5580($at) .JF0f10f8a4: -/* f10f8a4: 0fc47a54 */ jal 0xf11e950 +/* f10f8a4: 0fc47a54 */ jal pakHasBitflag /* f10f8a8: 02002825 */ move $a1,$s0 /* f10f8ac: 10400005 */ beqz $v0,.JF0f10f8c4 /* f10f8b0: 2404001d */ li $a0,0x1d @@ -339,7 +339,7 @@ glabel gamefileApplyOptions /* f10f8c4: 3c01800a */ lui $at,0x800a /* f10f8c8: ac20aa78 */ sw $zero,-0x5588($at) .JF0f10f8cc: -/* f10f8cc: 0fc47a54 */ jal 0xf11e950 +/* f10f8cc: 0fc47a54 */ jal pakHasBitflag /* f10f8d0: 02002825 */ move $a1,$s0 /* f10f8d4: 10400005 */ beqz $v0,.JF0f10f8ec /* f10f8d8: 2404001e */ li $a0,0x1e @@ -351,7 +351,7 @@ glabel gamefileApplyOptions /* f10f8ec: 3c01800a */ lui $at,0x800a /* f10f8f0: ac20aa84 */ sw $zero,-0x557c($at) .JF0f10f8f4: -/* f10f8f4: 0fc47a54 */ jal 0xf11e950 +/* f10f8f4: 0fc47a54 */ jal pakHasBitflag /* f10f8f8: 02002825 */ move $a1,$s0 /* f10f8fc: 10400005 */ beqz $v0,.JF0f10f914 /* f10f900: 24040044 */ li $a0,0x44 @@ -365,7 +365,7 @@ glabel gamefileApplyOptions .JF0f10f91c: /* f10f91c: 3c01800a */ lui $at,0x800a /* f10f920: a420aab2 */ sh $zero,-0x554e($at) -/* f10f924: 0fc47a54 */ jal 0xf11e950 +/* f10f924: 0fc47a54 */ jal pakHasBitflag /* f10f928: 02002825 */ move $a1,$s0 /* f10f92c: 10400006 */ beqz $v0,.JF0f10f948 /* f10f930: 24040045 */ li $a0,0x45 @@ -375,7 +375,7 @@ glabel gamefileApplyOptions /* f10f940: 35f80001 */ ori $t8,$t7,0x1 /* f10f944: a438aab2 */ sh $t8,-0x554e($at) .JF0f10f948: -/* f10f948: 0fc47a54 */ jal 0xf11e950 +/* f10f948: 0fc47a54 */ jal pakHasBitflag /* f10f94c: 02002825 */ move $a1,$s0 /* f10f950: 10400006 */ beqz $v0,.JF0f10f96c /* f10f954: 24040046 */ li $a0,0x46 @@ -385,7 +385,7 @@ glabel gamefileApplyOptions /* f10f964: 37280002 */ ori $t0,$t9,0x2 /* f10f968: a428aab2 */ sh $t0,-0x554e($at) .JF0f10f96c: -/* f10f96c: 0fc47a54 */ jal 0xf11e950 +/* f10f96c: 0fc47a54 */ jal pakHasBitflag /* f10f970: 02002825 */ move $a1,$s0 /* f10f974: 10400006 */ beqz $v0,.JF0f10f990 /* f10f978: 3c04800a */ lui $a0,0x800a @@ -395,7 +395,7 @@ glabel gamefileApplyOptions /* f10f988: 352a0004 */ ori $t2,$t1,0x4 /* f10f98c: a42aaab2 */ sh $t2,-0x554e($at) .JF0f10f990: -/* f10f990: 0fc5bad2 */ jal 0xf16eb48 +/* f10f990: 0fc5bad2 */ jal func0f16f75c /* f10f994: 9484aab2 */ lhu $a0,-0x554e($a0) /* f10f998: 8fbf001c */ lw $ra,0x1c($sp) /* f10f99c: 8fb00018 */ lw $s0,0x18($sp) @@ -1218,7 +1218,7 @@ glabel gamefileLoadDefaults /* f10fa08: 24100001 */ li $s0,0x1 .JF0f10fa0c: /* f10fa0c: 3c057f1b */ lui $a1,0x7f1b -/* f10fa10: 0c004c34 */ jal 0x130d0 +/* f10fa10: 0c004c34 */ jal strcpy /* f10fa14: 24a545b0 */ addiu $a1,$a1,0x45b0 /* f10fa18: 8fa20028 */ lw $v0,0x28($sp) /* f10fa1c: 24045000 */ li $a0,0x5000 @@ -1228,177 +1228,177 @@ glabel gamefileLoadDefaults /* f10fa2c: 3308ff07 */ andi $t0,$t8,0xff07 /* f10fa30: 310900f8 */ andi $t1,$t0,0xf8 /* f10fa34: a048000b */ sb $t0,0xb($v0) -/* f10fa38: 0c003a6f */ jal 0xe9bc +/* f10fa38: 0c003a6f */ jal sndSetSfxVolume /* f10fa3c: a049000b */ sb $t1,0xb($v0) -/* f10fa40: 0fc54987 */ jal 0xf15261c +/* f10fa40: 0fc54987 */ jal optionsSetMusicVolume /* f10fa44: 24045000 */ li $a0,0x5000 -/* f10fa48: 0c003ccb */ jal 0xf32c +/* f10fa48: 0c003ccb */ jal sndSetSoundMode /* f10fa4c: 24040001 */ li $a0,0x1 /* f10fa50: 02202025 */ move $a0,$s1 -/* f10fa54: 0fc54753 */ jal 0xf151d4c +/* f10fa54: 0fc54753 */ jal optionsSetControlMode /* f10fa58: 00002825 */ move $a1,$zero /* f10fa5c: 02002025 */ move $a0,$s0 -/* f10fa60: 0fc54753 */ jal 0xf151d4c +/* f10fa60: 0fc54753 */ jal optionsSetControlMode /* f10fa64: 00002825 */ move $a1,$zero /* f10fa68: 8fb00028 */ lw $s0,0x28($sp) /* f10fa6c: 26100014 */ addiu $s0,$s0,0x14 -/* f10fa70: 0fc47a62 */ jal 0xf11e988 +/* f10fa70: 0fc47a62 */ jal pakClearAllBitflags /* f10fa74: 02002025 */ move $a0,$s0 /* f10fa78: 00002025 */ move $a0,$zero /* f10fa7c: 02002825 */ move $a1,$s0 -/* f10fa80: 0fc47a3f */ jal 0xf11e8fc +/* f10fa80: 0fc47a3f */ jal pakSetBitflag /* f10fa84: 00003025 */ move $a2,$zero /* f10fa88: 24040001 */ li $a0,0x1 /* f10fa8c: 02002825 */ move $a1,$s0 -/* f10fa90: 0fc47a3f */ jal 0xf11e8fc +/* f10fa90: 0fc47a3f */ jal pakSetBitflag /* f10fa94: 24060001 */ li $a2,0x1 /* f10fa98: 24040002 */ li $a0,0x2 /* f10fa9c: 02002825 */ move $a1,$s0 -/* f10faa0: 0fc47a3f */ jal 0xf11e8fc +/* f10faa0: 0fc47a3f */ jal pakSetBitflag /* f10faa4: 00003025 */ move $a2,$zero /* f10faa8: 24040003 */ li $a0,0x3 /* f10faac: 02002825 */ move $a1,$s0 -/* f10fab0: 0fc47a3f */ jal 0xf11e8fc +/* f10fab0: 0fc47a3f */ jal pakSetBitflag /* f10fab4: 24060001 */ li $a2,0x1 /* f10fab8: 24040004 */ li $a0,0x4 /* f10fabc: 02002825 */ move $a1,$s0 -/* f10fac0: 0fc47a3f */ jal 0xf11e8fc +/* f10fac0: 0fc47a3f */ jal pakSetBitflag /* f10fac4: 24060001 */ li $a2,0x1 /* f10fac8: 24040005 */ li $a0,0x5 /* f10facc: 02002825 */ move $a1,$s0 -/* f10fad0: 0fc47a3f */ jal 0xf11e8fc +/* f10fad0: 0fc47a3f */ jal pakSetBitflag /* f10fad4: 24060001 */ li $a2,0x1 /* f10fad8: 24040009 */ li $a0,0x9 /* f10fadc: 02002825 */ move $a1,$s0 -/* f10fae0: 0fc47a3f */ jal 0xf11e8fc +/* f10fae0: 0fc47a3f */ jal pakSetBitflag /* f10fae4: 24060001 */ li $a2,0x1 /* f10fae8: 2404000a */ li $a0,0xa /* f10faec: 02002825 */ move $a1,$s0 -/* f10faf0: 0fc47a3f */ jal 0xf11e8fc +/* f10faf0: 0fc47a3f */ jal pakSetBitflag /* f10faf4: 24060001 */ li $a2,0x1 /* f10faf8: 2404000b */ li $a0,0xb /* f10fafc: 02002825 */ move $a1,$s0 -/* f10fb00: 0fc47a3f */ jal 0xf11e8fc +/* f10fb00: 0fc47a3f */ jal pakSetBitflag /* f10fb04: 24060001 */ li $a2,0x1 /* f10fb08: 24040015 */ li $a0,0x15 /* f10fb0c: 02002825 */ move $a1,$s0 -/* f10fb10: 0fc47a3f */ jal 0xf11e8fc +/* f10fb10: 0fc47a3f */ jal pakSetBitflag /* f10fb14: 24060001 */ li $a2,0x1 /* f10fb18: 24040017 */ li $a0,0x17 /* f10fb1c: 02002825 */ move $a1,$s0 -/* f10fb20: 0fc47a3f */ jal 0xf11e8fc +/* f10fb20: 0fc47a3f */ jal pakSetBitflag /* f10fb24: 24060001 */ li $a2,0x1 /* f10fb28: 2404001a */ li $a0,0x1a /* f10fb2c: 02002825 */ move $a1,$s0 -/* f10fb30: 0fc47a3f */ jal 0xf11e8fc +/* f10fb30: 0fc47a3f */ jal pakSetBitflag /* f10fb34: 00003025 */ move $a2,$zero /* f10fb38: 24040020 */ li $a0,0x20 /* f10fb3c: 02002825 */ move $a1,$s0 -/* f10fb40: 0fc47a3f */ jal 0xf11e8fc +/* f10fb40: 0fc47a3f */ jal pakSetBitflag /* f10fb44: 00003025 */ move $a2,$zero /* f10fb48: 2404000c */ li $a0,0xc /* f10fb4c: 02002825 */ move $a1,$s0 -/* f10fb50: 0fc47a3f */ jal 0xf11e8fc +/* f10fb50: 0fc47a3f */ jal pakSetBitflag /* f10fb54: 00003025 */ move $a2,$zero /* f10fb58: 2404000d */ li $a0,0xd /* f10fb5c: 02002825 */ move $a1,$s0 -/* f10fb60: 0fc47a3f */ jal 0xf11e8fc +/* f10fb60: 0fc47a3f */ jal pakSetBitflag /* f10fb64: 24060001 */ li $a2,0x1 /* f10fb68: 2404000e */ li $a0,0xe /* f10fb6c: 02002825 */ move $a1,$s0 -/* f10fb70: 0fc47a3f */ jal 0xf11e8fc +/* f10fb70: 0fc47a3f */ jal pakSetBitflag /* f10fb74: 00003025 */ move $a2,$zero /* f10fb78: 2404000f */ li $a0,0xf /* f10fb7c: 02002825 */ move $a1,$s0 -/* f10fb80: 0fc47a3f */ jal 0xf11e8fc +/* f10fb80: 0fc47a3f */ jal pakSetBitflag /* f10fb84: 24060001 */ li $a2,0x1 /* f10fb88: 24040010 */ li $a0,0x10 /* f10fb8c: 02002825 */ move $a1,$s0 -/* f10fb90: 0fc47a3f */ jal 0xf11e8fc +/* f10fb90: 0fc47a3f */ jal pakSetBitflag /* f10fb94: 24060001 */ li $a2,0x1 /* f10fb98: 24040011 */ li $a0,0x11 /* f10fb9c: 02002825 */ move $a1,$s0 -/* f10fba0: 0fc47a3f */ jal 0xf11e8fc +/* f10fba0: 0fc47a3f */ jal pakSetBitflag /* f10fba4: 24060001 */ li $a2,0x1 /* f10fba8: 24040012 */ li $a0,0x12 /* f10fbac: 02002825 */ move $a1,$s0 -/* f10fbb0: 0fc47a3f */ jal 0xf11e8fc +/* f10fbb0: 0fc47a3f */ jal pakSetBitflag /* f10fbb4: 24060001 */ li $a2,0x1 /* f10fbb8: 24040013 */ li $a0,0x13 /* f10fbbc: 02002825 */ move $a1,$s0 -/* f10fbc0: 0fc47a3f */ jal 0xf11e8fc +/* f10fbc0: 0fc47a3f */ jal pakSetBitflag /* f10fbc4: 24060001 */ li $a2,0x1 /* f10fbc8: 24040014 */ li $a0,0x14 /* f10fbcc: 02002825 */ move $a1,$s0 -/* f10fbd0: 0fc47a3f */ jal 0xf11e8fc +/* f10fbd0: 0fc47a3f */ jal pakSetBitflag /* f10fbd4: 24060001 */ li $a2,0x1 /* f10fbd8: 24040016 */ li $a0,0x16 /* f10fbdc: 02002825 */ move $a1,$s0 -/* f10fbe0: 0fc47a3f */ jal 0xf11e8fc +/* f10fbe0: 0fc47a3f */ jal pakSetBitflag /* f10fbe4: 24060001 */ li $a2,0x1 /* f10fbe8: 24040018 */ li $a0,0x18 /* f10fbec: 02002825 */ move $a1,$s0 -/* f10fbf0: 0fc47a3f */ jal 0xf11e8fc +/* f10fbf0: 0fc47a3f */ jal pakSetBitflag /* f10fbf4: 24060001 */ li $a2,0x1 /* f10fbf8: 2404001b */ li $a0,0x1b /* f10fbfc: 02002825 */ move $a1,$s0 -/* f10fc00: 0fc47a3f */ jal 0xf11e8fc +/* f10fc00: 0fc47a3f */ jal pakSetBitflag /* f10fc04: 00003025 */ move $a2,$zero /* f10fc08: 24040021 */ li $a0,0x21 /* f10fc0c: 02002825 */ move $a1,$s0 -/* f10fc10: 0fc47a3f */ jal 0xf11e8fc +/* f10fc10: 0fc47a3f */ jal pakSetBitflag /* f10fc14: 00003025 */ move $a2,$zero /* f10fc18: 24040019 */ li $a0,0x19 /* f10fc1c: 02002825 */ move $a1,$s0 -/* f10fc20: 0fc47a3f */ jal 0xf11e8fc +/* f10fc20: 0fc47a3f */ jal pakSetBitflag /* f10fc24: 00003025 */ move $a2,$zero /* f10fc28: 24040007 */ li $a0,0x7 /* f10fc2c: 02002825 */ move $a1,$s0 -/* f10fc30: 0fc47a3f */ jal 0xf11e8fc +/* f10fc30: 0fc47a3f */ jal pakSetBitflag /* f10fc34: 00003025 */ move $a2,$zero /* f10fc38: 24040008 */ li $a0,0x8 /* f10fc3c: 02002825 */ move $a1,$s0 -/* f10fc40: 0fc47a3f */ jal 0xf11e8fc +/* f10fc40: 0fc47a3f */ jal pakSetBitflag /* f10fc44: 00003025 */ move $a2,$zero /* f10fc48: 24040006 */ li $a0,0x6 /* f10fc4c: 02002825 */ move $a1,$s0 -/* f10fc50: 0fc47a3f */ jal 0xf11e8fc +/* f10fc50: 0fc47a3f */ jal pakSetBitflag /* f10fc54: 00003025 */ move $a2,$zero /* f10fc58: 24040022 */ li $a0,0x22 /* f10fc5c: 02002825 */ move $a1,$s0 -/* f10fc60: 0fc47a3f */ jal 0xf11e8fc +/* f10fc60: 0fc47a3f */ jal pakSetBitflag /* f10fc64: 00003025 */ move $a2,$zero /* f10fc68: 24040040 */ li $a0,0x40 /* f10fc6c: 02002825 */ move $a1,$s0 -/* f10fc70: 0fc47a3f */ jal 0xf11e8fc +/* f10fc70: 0fc47a3f */ jal pakSetBitflag /* f10fc74: 00003025 */ move $a2,$zero /* f10fc78: 24040041 */ li $a0,0x41 /* f10fc7c: 02002825 */ move $a1,$s0 -/* f10fc80: 0fc47a3f */ jal 0xf11e8fc +/* f10fc80: 0fc47a3f */ jal pakSetBitflag /* f10fc84: 00003025 */ move $a2,$zero /* f10fc88: 24040042 */ li $a0,0x42 /* f10fc8c: 02002825 */ move $a1,$s0 -/* f10fc90: 0fc47a3f */ jal 0xf11e8fc +/* f10fc90: 0fc47a3f */ jal pakSetBitflag /* f10fc94: 00003025 */ move $a2,$zero /* f10fc98: 24040043 */ li $a0,0x43 /* f10fc9c: 02002825 */ move $a1,$s0 -/* f10fca0: 0fc47a3f */ jal 0xf11e8fc +/* f10fca0: 0fc47a3f */ jal pakSetBitflag /* f10fca4: 00003025 */ move $a2,$zero /* f10fca8: 2404001c */ li $a0,0x1c /* f10fcac: 02002825 */ move $a1,$s0 -/* f10fcb0: 0fc47a3f */ jal 0xf11e8fc +/* f10fcb0: 0fc47a3f */ jal pakSetBitflag /* f10fcb4: 24060001 */ li $a2,0x1 /* f10fcb8: 2404001d */ li $a0,0x1d /* f10fcbc: 02002825 */ move $a1,$s0 -/* f10fcc0: 0fc47a3f */ jal 0xf11e8fc +/* f10fcc0: 0fc47a3f */ jal pakSetBitflag /* f10fcc4: 24060001 */ li $a2,0x1 /* f10fcc8: 2404001e */ li $a0,0x1e /* f10fccc: 02002825 */ move $a1,$s0 -/* f10fcd0: 0fc47a3f */ jal 0xf11e8fc +/* f10fcd0: 0fc47a3f */ jal pakSetBitflag /* f10fcd4: 24060001 */ li $a2,0x1 /* f10fcd8: 2404001f */ li $a0,0x1f /* f10fcdc: 02002825 */ move $a1,$s0 -/* f10fce0: 0fc47a3f */ jal 0xf11e8fc +/* f10fce0: 0fc47a3f */ jal pakSetBitflag /* f10fce4: 24060001 */ li $a2,0x1 /* f10fce8: 96460482 */ lhu $a2,0x482($s2) /* f10fcec: 3c10800a */ lui $s0,0x800a @@ -1407,21 +1407,21 @@ glabel gamefileLoadDefaults /* f10fcf8: 394b0001 */ xori $t3,$t2,0x1 /* f10fcfc: 2d660001 */ sltiu $a2,$t3,0x1 /* f10fd00: 02002825 */ move $a1,$s0 -/* f10fd04: 0fc47a3f */ jal 0xf11e8fc +/* f10fd04: 0fc47a3f */ jal pakSetBitflag /* f10fd08: 24040044 */ li $a0,0x44 /* f10fd0c: 96460482 */ lhu $a2,0x482($s2) /* f10fd10: 24040045 */ li $a0,0x45 /* f10fd14: 02002825 */ move $a1,$s0 /* f10fd18: 30cc0002 */ andi $t4,$a2,0x2 /* f10fd1c: 398d0002 */ xori $t5,$t4,0x2 -/* f10fd20: 0fc47a3f */ jal 0xf11e8fc +/* f10fd20: 0fc47a3f */ jal pakSetBitflag /* f10fd24: 2da60001 */ sltiu $a2,$t5,0x1 /* f10fd28: 96460482 */ lhu $a2,0x482($s2) /* f10fd2c: 24040046 */ li $a0,0x46 /* f10fd30: 02002825 */ move $a1,$s0 /* f10fd34: 30ce0004 */ andi $t6,$a2,0x4 /* f10fd38: 39cf0004 */ xori $t7,$t6,0x4 -/* f10fd3c: 0fc47a3f */ jal 0xf11e8fc +/* f10fd3c: 0fc47a3f */ jal pakSetBitflag /* f10fd40: 2de60001 */ sltiu $a2,$t7,0x1 /* f10fd44: 8fa40028 */ lw $a0,0x28($sp) /* f10fd48: 00009025 */ move $s2,$zero @@ -1446,7 +1446,7 @@ glabel gamefileLoadDefaults /* f10fd88: 02402025 */ move $a0,$s2 .JF0f10fd8c: /* f10fd8c: 02002825 */ move $a1,$s0 -/* f10fd90: 0fc6735b */ jal 0xf19cd6c +/* f10fd90: 0fc6735b */ jal mpSetChallengeCompletedByAnyPlayerWithNumPlayers /* f10fd94: 00003025 */ move $a2,$zero /* f10fd98: 26100001 */ addiu $s0,$s0,0x1 /* f10fd9c: 5611fffb */ bnel $s0,$s1,.JF0f10fd8c @@ -1455,7 +1455,7 @@ glabel gamefileLoadDefaults /* f10fda8: 2a41001e */ slti $at,$s2,0x1e /* f10fdac: 5420fff6 */ bnezl $at,.JF0f10fd88 /* f10fdb0: 24100001 */ li $s0,0x1 -/* f10fdb4: 0fc66e4f */ jal 0xf19b93c +/* f10fdb4: 0fc66e4f */ jal mpDetermineUnlockedFeatures /* f10fdb8: 00000000 */ nop /* f10fdbc: 3c02800a */ lui $v0,0x800a /* f10fdc0: 3c03800a */ lui $v1,0x800a @@ -1483,7 +1483,7 @@ glabel gamefileLoadDefaults /* f10fe0c: 24420001 */ addiu $v0,$v0,0x1 /* f10fe10: 1443fffe */ bne $v0,$v1,.JF0f10fe0c /* f10fe14: a04000b4 */ sb $zero,0xb4($v0) -/* f10fe18: 0fc43d25 */ jal 0xf10f494 +/* f10fe18: 0fc43d25 */ jal gamefileApplyOptions /* f10fe1c: 8fa40028 */ lw $a0,0x28($sp) /* f10fe20: 8fbf0024 */ lw $ra,0x24($sp) /* f10fe24: 8fb00018 */ lw $s0,0x18($sp) @@ -2374,221 +2374,221 @@ glabel gamefileSave .JF0f110290: /* f110290: 3c018007 */ lui $at,0x8007 /* f110294: ac3461c0 */ sw $s4,0x61c0($at) -/* f110298: 0fc54768 */ jal 0xf151da0 +/* f110298: 0fc54768 */ jal optionsGetForwardPitch /* f11029c: 02202025 */ move $a0,$s1 /* f1102a0: 3c10800a */ lui $s0,0x800a /* f1102a4: 26102934 */ addiu $s0,$s0,0x2934 /* f1102a8: 02002825 */ move $a1,$s0 /* f1102ac: 00002025 */ move $a0,$zero -/* f1102b0: 0fc47a3f */ jal 0xf11e8fc +/* f1102b0: 0fc47a3f */ jal pakSetBitflag /* f1102b4: 00403025 */ move $a2,$v0 -/* f1102b8: 0fc54771 */ jal 0xf151dc4 +/* f1102b8: 0fc54771 */ jal optionsGetAutoAim /* f1102bc: 02202025 */ move $a0,$s1 /* f1102c0: 02802025 */ move $a0,$s4 /* f1102c4: 02002825 */ move $a1,$s0 -/* f1102c8: 0fc47a3f */ jal 0xf11e8fc +/* f1102c8: 0fc47a3f */ jal pakSetBitflag /* f1102cc: 00403025 */ move $a2,$v0 -/* f1102d0: 0fc54783 */ jal 0xf151e0c +/* f1102d0: 0fc54783 */ jal optionsGetAimControl /* f1102d4: 02202025 */ move $a0,$s1 /* f1102d8: 24040002 */ li $a0,0x2 /* f1102dc: 02002825 */ move $a1,$s0 -/* f1102e0: 0fc47a3f */ jal 0xf11e8fc +/* f1102e0: 0fc47a3f */ jal pakSetBitflag /* f1102e4: 00403025 */ move $a2,$v0 -/* f1102e8: 0fc5478c */ jal 0xf151e30 +/* f1102e8: 0fc5478c */ jal optionsGetSightOnScreen /* f1102ec: 02202025 */ move $a0,$s1 /* f1102f0: 24040003 */ li $a0,0x3 /* f1102f4: 02002825 */ move $a1,$s0 -/* f1102f8: 0fc47a3f */ jal 0xf11e8fc +/* f1102f8: 0fc47a3f */ jal pakSetBitflag /* f1102fc: 00403025 */ move $a2,$v0 -/* f110300: 0fc5477a */ jal 0xf151de8 +/* f110300: 0fc5477a */ jal optionsGetLookAhead /* f110304: 02202025 */ move $a0,$s1 /* f110308: 24040004 */ li $a0,0x4 /* f11030c: 02002825 */ move $a1,$s0 -/* f110310: 0fc47a3f */ jal 0xf11e8fc +/* f110310: 0fc47a3f */ jal pakSetBitflag /* f110314: 00403025 */ move $a2,$v0 -/* f110318: 0fc54795 */ jal 0xf151e54 +/* f110318: 0fc54795 */ jal optionsGetAmmoOnScreen /* f11031c: 02202025 */ move $a0,$s1 /* f110320: 24040005 */ li $a0,0x5 /* f110324: 02002825 */ move $a1,$s0 -/* f110328: 0fc47a3f */ jal 0xf11e8fc +/* f110328: 0fc47a3f */ jal pakSetBitflag /* f11032c: 00403025 */ move $a2,$v0 -/* f110330: 0fc547d1 */ jal 0xf151f44 +/* f110330: 0fc547d1 */ jal optionsGetHeadRoll /* f110334: 02202025 */ move $a0,$s1 /* f110338: 24040009 */ li $a0,0x9 /* f11033c: 02002825 */ move $a1,$s0 -/* f110340: 0fc47a3f */ jal 0xf11e8fc +/* f110340: 0fc47a3f */ jal pakSetBitflag /* f110344: 00403025 */ move $a2,$v0 -/* f110348: 0fc5479e */ jal 0xf151e78 +/* f110348: 0fc5479e */ jal optionsGetShowGunFunction /* f11034c: 02202025 */ move $a0,$s1 /* f110350: 2404000a */ li $a0,0xa /* f110354: 02002825 */ move $a1,$s0 -/* f110358: 0fc47a3f */ jal 0xf11e8fc +/* f110358: 0fc47a3f */ jal pakSetBitflag /* f11035c: 00403025 */ move $a2,$v0 -/* f110360: 0fc547a7 */ jal 0xf151e9c +/* f110360: 0fc547a7 */ jal optionsGetAlwaysShowTarget /* f110364: 02202025 */ move $a0,$s1 /* f110368: 24040015 */ li $a0,0x15 /* f11036c: 02002825 */ move $a1,$s0 -/* f110370: 0fc47a3f */ jal 0xf11e8fc +/* f110370: 0fc47a3f */ jal pakSetBitflag /* f110374: 00403025 */ move $a2,$v0 -/* f110378: 0fc547b0 */ jal 0xf151ec0 +/* f110378: 0fc547b0 */ jal optionsGetShowZoomRange /* f11037c: 02202025 */ move $a0,$s1 /* f110380: 24040017 */ li $a0,0x17 /* f110384: 02002825 */ move $a1,$s0 -/* f110388: 0fc47a3f */ jal 0xf11e8fc +/* f110388: 0fc47a3f */ jal pakSetBitflag /* f11038c: 00403025 */ move $a2,$v0 -/* f110390: 0fc547c2 */ jal 0xf151f08 +/* f110390: 0fc547c2 */ jal optionsGetShowMissionTime /* f110394: 02202025 */ move $a0,$s1 /* f110398: 2404001a */ li $a0,0x1a /* f11039c: 02002825 */ move $a1,$s0 -/* f1103a0: 0fc47a3f */ jal 0xf11e8fc +/* f1103a0: 0fc47a3f */ jal pakSetBitflag /* f1103a4: 00403025 */ move $a2,$v0 -/* f1103a8: 0fc547b9 */ jal 0xf151ee4 +/* f1103a8: 0fc547b9 */ jal optionsGetPaintball /* f1103ac: 02202025 */ move $a0,$s1 /* f1103b0: 24040020 */ li $a0,0x20 /* f1103b4: 02002825 */ move $a1,$s0 -/* f1103b8: 0fc47a3f */ jal 0xf11e8fc +/* f1103b8: 0fc47a3f */ jal pakSetBitflag /* f1103bc: 00403025 */ move $a2,$v0 -/* f1103c0: 0fc54768 */ jal 0xf151da0 +/* f1103c0: 0fc54768 */ jal optionsGetForwardPitch /* f1103c4: 02602025 */ move $a0,$s3 /* f1103c8: 2404000c */ li $a0,0xc /* f1103cc: 02002825 */ move $a1,$s0 -/* f1103d0: 0fc47a3f */ jal 0xf11e8fc +/* f1103d0: 0fc47a3f */ jal pakSetBitflag /* f1103d4: 00403025 */ move $a2,$v0 -/* f1103d8: 0fc54771 */ jal 0xf151dc4 +/* f1103d8: 0fc54771 */ jal optionsGetAutoAim /* f1103dc: 02602025 */ move $a0,$s3 /* f1103e0: 2404000d */ li $a0,0xd /* f1103e4: 02002825 */ move $a1,$s0 -/* f1103e8: 0fc47a3f */ jal 0xf11e8fc +/* f1103e8: 0fc47a3f */ jal pakSetBitflag /* f1103ec: 00403025 */ move $a2,$v0 -/* f1103f0: 0fc54783 */ jal 0xf151e0c +/* f1103f0: 0fc54783 */ jal optionsGetAimControl /* f1103f4: 02602025 */ move $a0,$s3 /* f1103f8: 2404000e */ li $a0,0xe /* f1103fc: 02002825 */ move $a1,$s0 -/* f110400: 0fc47a3f */ jal 0xf11e8fc +/* f110400: 0fc47a3f */ jal pakSetBitflag /* f110404: 00403025 */ move $a2,$v0 -/* f110408: 0fc5478c */ jal 0xf151e30 +/* f110408: 0fc5478c */ jal optionsGetSightOnScreen /* f11040c: 02602025 */ move $a0,$s3 /* f110410: 2404000f */ li $a0,0xf /* f110414: 02002825 */ move $a1,$s0 -/* f110418: 0fc47a3f */ jal 0xf11e8fc +/* f110418: 0fc47a3f */ jal pakSetBitflag /* f11041c: 00403025 */ move $a2,$v0 -/* f110420: 0fc5477a */ jal 0xf151de8 +/* f110420: 0fc5477a */ jal optionsGetLookAhead /* f110424: 02602025 */ move $a0,$s3 /* f110428: 24040010 */ li $a0,0x10 /* f11042c: 02002825 */ move $a1,$s0 -/* f110430: 0fc47a3f */ jal 0xf11e8fc +/* f110430: 0fc47a3f */ jal pakSetBitflag /* f110434: 00403025 */ move $a2,$v0 -/* f110438: 0fc54795 */ jal 0xf151e54 +/* f110438: 0fc54795 */ jal optionsGetAmmoOnScreen /* f11043c: 02602025 */ move $a0,$s3 /* f110440: 24040011 */ li $a0,0x11 /* f110444: 02002825 */ move $a1,$s0 -/* f110448: 0fc47a3f */ jal 0xf11e8fc +/* f110448: 0fc47a3f */ jal pakSetBitflag /* f11044c: 00403025 */ move $a2,$v0 -/* f110450: 0fc547d1 */ jal 0xf151f44 +/* f110450: 0fc547d1 */ jal optionsGetHeadRoll /* f110454: 02602025 */ move $a0,$s3 /* f110458: 24040012 */ li $a0,0x12 /* f11045c: 02002825 */ move $a1,$s0 -/* f110460: 0fc47a3f */ jal 0xf11e8fc +/* f110460: 0fc47a3f */ jal pakSetBitflag /* f110464: 00403025 */ move $a2,$v0 -/* f110468: 0fc5479e */ jal 0xf151e78 +/* f110468: 0fc5479e */ jal optionsGetShowGunFunction /* f11046c: 02602025 */ move $a0,$s3 /* f110470: 24040013 */ li $a0,0x13 /* f110474: 02002825 */ move $a1,$s0 -/* f110478: 0fc47a3f */ jal 0xf11e8fc +/* f110478: 0fc47a3f */ jal pakSetBitflag /* f11047c: 00403025 */ move $a2,$v0 -/* f110480: 0fc547a7 */ jal 0xf151e9c +/* f110480: 0fc547a7 */ jal optionsGetAlwaysShowTarget /* f110484: 02602025 */ move $a0,$s3 /* f110488: 24040016 */ li $a0,0x16 /* f11048c: 02002825 */ move $a1,$s0 -/* f110490: 0fc47a3f */ jal 0xf11e8fc +/* f110490: 0fc47a3f */ jal pakSetBitflag /* f110494: 00403025 */ move $a2,$v0 -/* f110498: 0fc547b0 */ jal 0xf151ec0 +/* f110498: 0fc547b0 */ jal optionsGetShowZoomRange /* f11049c: 02602025 */ move $a0,$s3 /* f1104a0: 24040018 */ li $a0,0x18 /* f1104a4: 02002825 */ move $a1,$s0 -/* f1104a8: 0fc47a3f */ jal 0xf11e8fc +/* f1104a8: 0fc47a3f */ jal pakSetBitflag /* f1104ac: 00403025 */ move $a2,$v0 -/* f1104b0: 0fc547c2 */ jal 0xf151f08 +/* f1104b0: 0fc547c2 */ jal optionsGetShowMissionTime /* f1104b4: 02602025 */ move $a0,$s3 /* f1104b8: 2404001b */ li $a0,0x1b /* f1104bc: 02002825 */ move $a1,$s0 -/* f1104c0: 0fc47a3f */ jal 0xf11e8fc +/* f1104c0: 0fc47a3f */ jal pakSetBitflag /* f1104c4: 00403025 */ move $a2,$v0 -/* f1104c8: 0fc547b9 */ jal 0xf151ee4 +/* f1104c8: 0fc547b9 */ jal optionsGetPaintball /* f1104cc: 02602025 */ move $a0,$s3 /* f1104d0: 24040021 */ li $a0,0x21 /* f1104d4: 02002825 */ move $a1,$s0 -/* f1104d8: 0fc47a3f */ jal 0xf11e8fc +/* f1104d8: 0fc47a3f */ jal pakSetBitflag /* f1104dc: 00403025 */ move $a2,$v0 -/* f1104e0: 0fc54978 */ jal 0xf1525e0 +/* f1104e0: 0fc54978 */ jal optionsGetScreenSplit /* f1104e4: 00000000 */ nop /* f1104e8: 24040019 */ li $a0,0x19 /* f1104ec: 02002825 */ move $a1,$s0 -/* f1104f0: 0fc47a3f */ jal 0xf11e8fc +/* f1104f0: 0fc47a3f */ jal pakSetBitflag /* f1104f4: 00403025 */ move $a2,$v0 -/* f1104f8: 0fc54972 */ jal 0xf1525c8 +/* f1104f8: 0fc54972 */ jal optionsGetScreenRatio /* f1104fc: 00000000 */ nop /* f110500: 24040007 */ li $a0,0x7 /* f110504: 02002825 */ move $a1,$s0 -/* f110508: 0fc47a3f */ jal 0xf11e8fc +/* f110508: 0fc47a3f */ jal pakSetBitflag /* f11050c: 00403025 */ move $a2,$v0 -/* f110510: 0fc5496c */ jal 0xf1525b0 +/* f110510: 0fc5496c */ jal optionsGetScreenSize /* f110514: 00000000 */ nop /* f110518: 00543026 */ xor $a2,$v0,$s4 /* f11051c: 2cc60001 */ sltiu $a2,$a2,0x1 /* f110520: 24040006 */ li $a0,0x6 -/* f110524: 0fc47a3f */ jal 0xf11e8fc +/* f110524: 0fc47a3f */ jal pakSetBitflag /* f110528: 02002825 */ move $a1,$s0 -/* f11052c: 0fc5496c */ jal 0xf1525b0 +/* f11052c: 0fc5496c */ jal optionsGetScreenSize /* f110530: 00000000 */ nop /* f110534: 24150002 */ li $s5,0x2 /* f110538: 00553026 */ xor $a2,$v0,$s5 /* f11053c: 2cc60001 */ sltiu $a2,$a2,0x1 /* f110540: 24040008 */ li $a0,0x8 -/* f110544: 0fc47a3f */ jal 0xf11e8fc +/* f110544: 0fc47a3f */ jal pakSetBitflag /* f110548: 02002825 */ move $a1,$s0 /* f11054c: 3c188007 */ lui $t8,0x8007 /* f110550: 8f180c18 */ lw $t8,0xc18($t8) /* f110554: 24040022 */ li $a0,0x22 /* f110558: 02002825 */ move $a1,$s0 /* f11055c: 02983026 */ xor $a2,$s4,$t8 -/* f110560: 0fc47a3f */ jal 0xf11e8fc +/* f110560: 0fc47a3f */ jal pakSetBitflag /* f110564: 2cc60001 */ sltiu $a2,$a2,0x1 -/* f110568: 0fc547cb */ jal 0xf151f2c +/* f110568: 0fc547cb */ jal optionsGetInGameSubtitles /* f11056c: 00000000 */ nop /* f110570: 2404000b */ li $a0,0xb /* f110574: 02002825 */ move $a1,$s0 -/* f110578: 0fc47a3f */ jal 0xf11e8fc +/* f110578: 0fc47a3f */ jal pakSetBitflag /* f11057c: 00403025 */ move $a2,$v0 -/* f110580: 0fc547ce */ jal 0xf151f38 +/* f110580: 0fc547ce */ jal optionsGetCutsceneSubtitles /* f110584: 00000000 */ nop /* f110588: 24040014 */ li $a0,0x14 /* f11058c: 02002825 */ move $a1,$s0 -/* f110590: 0fc47a3f */ jal 0xf11e8fc +/* f110590: 0fc47a3f */ jal pakSetBitflag /* f110594: 00403025 */ move $a2,$v0 /* f110598: 24040040 */ li $a0,0x40 /* f11059c: 02002825 */ move $a1,$s0 -/* f1105a0: 0fc47a3f */ jal 0xf11e8fc +/* f1105a0: 0fc47a3f */ jal pakSetBitflag /* f1105a4: 924604e3 */ lbu $a2,0x4e3($s2) -/* f1105a8: 0fc67519 */ jal 0xf19d464 +/* f1105a8: 0fc67519 */ jal frIsWeaponFound /* f1105ac: 24040020 */ li $a0,0x20 /* f1105b0: 24040041 */ li $a0,0x41 /* f1105b4: 02002825 */ move $a1,$s0 -/* f1105b8: 0fc47a3f */ jal 0xf11e8fc +/* f1105b8: 0fc47a3f */ jal pakSetBitflag /* f1105bc: 00403025 */ move $a2,$v0 -/* f1105c0: 0fc67519 */ jal 0xf19d464 +/* f1105c0: 0fc67519 */ jal frIsWeaponFound /* f1105c4: 24040021 */ li $a0,0x21 /* f1105c8: 24040042 */ li $a0,0x42 /* f1105cc: 02002825 */ move $a1,$s0 -/* f1105d0: 0fc47a3f */ jal 0xf11e8fc +/* f1105d0: 0fc47a3f */ jal pakSetBitflag /* f1105d4: 00403025 */ move $a2,$v0 -/* f1105d8: 0fc67519 */ jal 0xf19d464 +/* f1105d8: 0fc67519 */ jal frIsWeaponFound /* f1105dc: 24040022 */ li $a0,0x22 /* f1105e0: 24040043 */ li $a0,0x43 /* f1105e4: 02002825 */ move $a1,$s0 -/* f1105e8: 0fc47a3f */ jal 0xf11e8fc +/* f1105e8: 0fc47a3f */ jal pakSetBitflag /* f1105ec: 00403025 */ move $a2,$v0 -/* f1105f0: 0fc5496c */ jal 0xf1525b0 +/* f1105f0: 0fc5496c */ jal optionsGetScreenSize /* f1105f4: 00000000 */ nop /* f1105f8: 50400002 */ beqzl $v0,.JF0f110604 /* f1105fc: 8e590450 */ lw $t9,0x450($s2) @@ -2597,78 +2597,78 @@ glabel gamefileSave /* f110604: 2404001f */ li $a0,0x1f /* f110608: 02002825 */ move $a1,$s0 /* f11060c: 02993026 */ xor $a2,$s4,$t9 -/* f110610: 0fc47a3f */ jal 0xf11e8fc +/* f110610: 0fc47a3f */ jal pakSetBitflag /* f110614: 2cc60001 */ sltiu $a2,$a2,0x1 /* f110618: 8e480448 */ lw $t0,0x448($s2) /* f11061c: 2404001c */ li $a0,0x1c /* f110620: 02002825 */ move $a1,$s0 /* f110624: 02883026 */ xor $a2,$s4,$t0 -/* f110628: 0fc47a3f */ jal 0xf11e8fc +/* f110628: 0fc47a3f */ jal pakSetBitflag /* f11062c: 2cc60001 */ sltiu $a2,$a2,0x1 /* f110630: 8e490454 */ lw $t1,0x454($s2) /* f110634: 2404001d */ li $a0,0x1d /* f110638: 02002825 */ move $a1,$s0 /* f11063c: 02893026 */ xor $a2,$s4,$t1 -/* f110640: 0fc47a3f */ jal 0xf11e8fc +/* f110640: 0fc47a3f */ jal pakSetBitflag /* f110644: 2cc60001 */ sltiu $a2,$a2,0x1 /* f110648: 8e4a044c */ lw $t2,0x44c($s2) /* f11064c: 2404001e */ li $a0,0x1e /* f110650: 02002825 */ move $a1,$s0 /* f110654: 028a3026 */ xor $a2,$s4,$t2 -/* f110658: 0fc47a3f */ jal 0xf11e8fc +/* f110658: 0fc47a3f */ jal pakSetBitflag /* f11065c: 2cc60001 */ sltiu $a2,$a2,0x1 /* f110660: 964b0482 */ lhu $t3,0x482($s2) /* f110664: 24040044 */ li $a0,0x44 /* f110668: 02002825 */ move $a1,$s0 /* f11066c: 316c0001 */ andi $t4,$t3,0x1 /* f110670: 028c3026 */ xor $a2,$s4,$t4 -/* f110674: 0fc47a3f */ jal 0xf11e8fc +/* f110674: 0fc47a3f */ jal pakSetBitflag /* f110678: 2cc60001 */ sltiu $a2,$a2,0x1 /* f11067c: 964d0482 */ lhu $t5,0x482($s2) /* f110680: 24040045 */ li $a0,0x45 /* f110684: 02002825 */ move $a1,$s0 /* f110688: 31ae0002 */ andi $t6,$t5,0x2 /* f11068c: 02ae3026 */ xor $a2,$s5,$t6 -/* f110690: 0fc47a3f */ jal 0xf11e8fc +/* f110690: 0fc47a3f */ jal pakSetBitflag /* f110694: 2cc60001 */ sltiu $a2,$a2,0x1 /* f110698: 96460482 */ lhu $a2,0x482($s2) /* f11069c: 24040046 */ li $a0,0x46 /* f1106a0: 02002825 */ move $a1,$s0 /* f1106a4: 30cf0004 */ andi $t7,$a2,0x4 /* f1106a8: 39f80004 */ xori $t8,$t7,0x4 -/* f1106ac: 0fc47a3f */ jal 0xf11e8fc +/* f1106ac: 0fc47a3f */ jal pakSetBitflag /* f1106b0: 2f060001 */ sltiu $a2,$t8,0x1 /* f1106b4: 8fb90148 */ lw $t9,0x148($sp) /* f1106b8: 27b4004c */ addiu $s4,$sp,0x4c /* f1106bc: 2402ffff */ li $v0,-1 /* f1106c0: 072000b6 */ bltz $t9,.JF0f11099c /* f1106c4: 00000000 */ nop -/* f1106c8: 0fc35947 */ jal 0xf0d651c +/* f1106c8: 0fc35947 */ jal savebufferClear /* f1106cc: 02802025 */ move $a0,$s4 /* f1106d0: 3c12800a */ lui $s2,0x800a /* f1106d4: 26522920 */ addiu $s2,$s2,0x2920 /* f1106d8: 02402825 */ move $a1,$s2 -/* f1106dc: 0fc35999 */ jal 0xf0d6664 +/* f1106dc: 0fc35999 */ jal func0f0d55a4 /* f1106e0: 02802025 */ move $a0,$s4 /* f1106e4: 9245000b */ lbu $a1,0xb($s2) /* f1106e8: 02802025 */ move $a0,$s4 /* f1106ec: 24060005 */ li $a2,0x5 /* f1106f0: 000540c2 */ srl $t0,$a1,0x3 -/* f1106f4: 0fc358ee */ jal 0xf0d63b8 +/* f1106f4: 0fc358ee */ jal savebufferOr /* f1106f8: 01002825 */ move $a1,$t0 /* f1106fc: 02802025 */ move $a0,$s4 /* f110700: 8e450010 */ lw $a1,0x10($s2) -/* f110704: 0fc358ee */ jal 0xf0d63b8 +/* f110704: 0fc358ee */ jal savebufferOr /* f110708: 24060020 */ li $a2,0x20 /* f11070c: 8e450008 */ lw $a1,0x8($s2) /* f110710: 02802025 */ move $a0,$s4 /* f110714: 24060002 */ li $a2,0x2 /* f110718: 30a90007 */ andi $t1,$a1,0x7 -/* f11071c: 0fc358ee */ jal 0xf0d63b8 +/* f11071c: 0fc358ee */ jal savebufferOr /* f110720: 01202825 */ move $a1,$t1 /* f110724: 02802025 */ move $a0,$s4 /* f110728: 9245000c */ lbu $a1,0xc($s2) -/* f11072c: 0fc358ee */ jal 0xf0d63b8 +/* f11072c: 0fc358ee */ jal savebufferOr /* f110730: 24060005 */ li $a2,0x5 /* f110734: 3c028006 */ lui $v0,0x8006 /* f110738: 9442dc78 */ lhu $v0,-0x2388($v0) @@ -2683,32 +2683,32 @@ glabel gamefileSave .JF0f11075c: /* f11075c: 000729c3 */ sra $a1,$a3,0x7 /* f110760: 00055082 */ srl $t2,$a1,0x2 -/* f110764: 0fc358ee */ jal 0xf0d63b8 +/* f110764: 0fc358ee */ jal savebufferOr /* f110768: 01402825 */ move $a1,$t2 -/* f11076c: 0fc5497f */ jal 0xf1525fc +/* f11076c: 0fc5497f */ jal optionsGetMusicVolume /* f110770: 00000000 */ nop /* f110774: 000229c3 */ sra $a1,$v0,0x7 /* f110778: 00055882 */ srl $t3,$a1,0x2 /* f11077c: 01602825 */ move $a1,$t3 /* f110780: 02802025 */ move $a0,$s4 -/* f110784: 0fc358ee */ jal 0xf0d63b8 +/* f110784: 0fc358ee */ jal savebufferOr /* f110788: 24060006 */ li $a2,0x6 /* f11078c: 3c058006 */ lui $a1,0x8006 /* f110790: 8ca5dc7c */ lw $a1,-0x2384($a1) /* f110794: 02802025 */ move $a0,$s4 -/* f110798: 0fc358ee */ jal 0xf0d63b8 +/* f110798: 0fc358ee */ jal savebufferOr /* f11079c: 24060002 */ li $a2,0x2 -/* f1107a0: 0fc5474c */ jal 0xf151d30 +/* f1107a0: 0fc5474c */ jal optionsGetControlMode /* f1107a4: 02202025 */ move $a0,$s1 /* f1107a8: 02802025 */ move $a0,$s4 /* f1107ac: 00402825 */ move $a1,$v0 -/* f1107b0: 0fc358ee */ jal 0xf0d63b8 +/* f1107b0: 0fc358ee */ jal savebufferOr /* f1107b4: 24060003 */ li $a2,0x3 -/* f1107b8: 0fc5474c */ jal 0xf151d30 +/* f1107b8: 0fc5474c */ jal optionsGetControlMode /* f1107bc: 02602025 */ move $a0,$s3 /* f1107c0: 02802025 */ move $a0,$s4 /* f1107c4: 00402825 */ move $a1,$v0 -/* f1107c8: 0fc358ee */ jal 0xf0d63b8 +/* f1107c8: 0fc358ee */ jal savebufferOr /* f1107cc: 24060003 */ li $a2,0x3 /* f1107d0: 3c10800a */ lui $s0,0x800a /* f1107d4: 3c11800a */ lui $s1,0x800a @@ -2717,7 +2717,7 @@ glabel gamefileSave /* f1107e0: 02802025 */ move $a0,$s4 .JF0f1107e4: /* f1107e4: 92050014 */ lbu $a1,0x14($s0) -/* f1107e8: 0fc358ee */ jal 0xf0d63b8 +/* f1107e8: 0fc358ee */ jal savebufferOr /* f1107ec: 24060008 */ li $a2,0x8 /* f1107f0: 26100001 */ addiu $s0,$s0,0x1 /* f1107f4: 0211082b */ sltu $at,$s0,$s1 @@ -2725,7 +2725,7 @@ glabel gamefileSave /* f1107fc: 02802025 */ move $a0,$s4 /* f110800: 02802025 */ move $a0,$s4 /* f110804: 9645001e */ lhu $a1,0x1e($s2) -/* f110808: 0fc358ee */ jal 0xf0d63b8 +/* f110808: 0fc358ee */ jal savebufferOr /* f11080c: 24060010 */ li $a2,0x10 /* f110810: 3c15800a */ lui $s5,0x800a /* f110814: 26b52920 */ addiu $s5,$s5,0x2920 @@ -2736,7 +2736,7 @@ glabel gamefileSave .JF0f110824: /* f110824: 02802025 */ move $a0,$s4 /* f110828: 96450020 */ lhu $a1,0x20($s2) -/* f11082c: 0fc358ee */ jal 0xf0d63b8 +/* f11082c: 0fc358ee */ jal savebufferOr /* f110830: 2406000c */ li $a2,0xc /* f110834: 26310002 */ addiu $s1,$s1,0x2 /* f110838: 1633fffa */ bne $s1,$s3,.JF0f110824 @@ -2753,11 +2753,11 @@ glabel gamefileSave .JF0f110864: /* f110864: 02202025 */ move $a0,$s1 .JF0f110868: -/* f110868: 0fc6734f */ jal 0xf19cd3c +/* f110868: 0fc6734f */ jal mpIsChallengeCompletedByAnyPlayerWithNumPlayers /* f11086c: 02002825 */ move $a1,$s0 /* f110870: 02802025 */ move $a0,$s4 /* f110874: 00402825 */ move $a1,$v0 -/* f110878: 0fc358ee */ jal 0xf0d63b8 +/* f110878: 0fc358ee */ jal savebufferOr /* f11087c: 24060001 */ li $a2,0x1 /* f110880: 26100001 */ addiu $s0,$s0,0x1 /* f110884: 5612fff8 */ bnel $s0,$s2,.JF0f110868 @@ -2773,7 +2773,7 @@ glabel gamefileSave /* f1108ac: 02802025 */ move $a0,$s4 .JF0f1108b0: /* f1108b0: 8e0500a0 */ lw $a1,0xa0($s0) -/* f1108b4: 0fc358ee */ jal 0xf0d63b8 +/* f1108b4: 0fc358ee */ jal savebufferOr /* f1108b8: 24060015 */ li $a2,0x15 /* f1108bc: 26100004 */ addiu $s0,$s0,0x4 /* f1108c0: 0211082b */ sltu $at,$s0,$s1 @@ -2794,7 +2794,7 @@ glabel gamefileSave /* f1108f4: 24070008 */ li $a3,0x8 .JF0f1108f8: /* f1108f8: 920500ac */ lbu $a1,0xac($s0) -/* f1108fc: 0fc358ee */ jal 0xf0d63b8 +/* f1108fc: 0fc358ee */ jal savebufferOr /* f110900: 00e03025 */ move $a2,$a3 /* f110904: 26100001 */ addiu $s0,$s0,0x1 /* f110908: 0212082b */ sltu $at,$s0,$s2 @@ -2807,12 +2807,12 @@ glabel gamefileSave /* f110924: 02802025 */ move $a0,$s4 .JF0f110928: /* f110928: 920500b5 */ lbu $a1,0xb5($s0) -/* f11092c: 0fc358ee */ jal 0xf0d63b8 +/* f11092c: 0fc358ee */ jal savebufferOr /* f110930: 24060008 */ li $a2,0x8 /* f110934: 26100001 */ addiu $s0,$s0,0x1 /* f110938: 5611fffb */ bnel $s0,$s1,.JF0f110928 /* f11093c: 02802025 */ move $a0,$s4 -/* f110940: 0fc35961 */ jal 0xf0d6584 +/* f110940: 0fc35961 */ jal func0f0d54c4 /* f110944: 02802025 */ move $a0,$s4 /* f110948: 27ad0140 */ addiu $t5,$sp,0x140 /* f11094c: afad0010 */ sw $t5,0x10($sp) @@ -2820,7 +2820,7 @@ glabel gamefileSave /* f110954: 8fa5014c */ lw $a1,0x14c($sp) /* f110958: 24060080 */ li $a2,0x80 /* f11095c: 27a70050 */ addiu $a3,$sp,0x50 -/* f110960: 0fc45af6 */ jal 0xf116bd8 +/* f110960: 0fc45af6 */ jal pakSaveAtGuid /* f110964: afa00014 */ sw $zero,0x14($sp) /* f110968: 3c01800a */ lui $at,0x800a /* f11096c: 14400009 */ bnez $v0,.JF0f110994 diff --git a/src/game/hudmsg.c b/src/game/hudmsg.c index a141fedae..16f31703d 100644 --- a/src/game/hudmsg.c +++ b/src/game/hudmsg.c @@ -595,7 +595,7 @@ glabel func0f0ddb1c /* f0debdc: 27bdffe0 */ addiu $sp,$sp,-32 /* f0debe0: afbf0014 */ sw $ra,0x14($sp) /* f0debe4: afa50024 */ sw $a1,0x24($sp) -/* f0debe8: 0c002f0b */ jal 0xbc2c +/* f0debe8: 0c002f0b */ jal viGetViewWidth /* f0debec: afa40020 */ sw $a0,0x20($sp) /* f0debf0: 3c0e8008 */ lui $t6,0x8008 /* f0debf4: 8dce00f4 */ lw $t6,0xf4($t6) @@ -654,7 +654,7 @@ glabel func0f0ddb1c /* f0decac: 8cce0000 */ lw $t6,0x0($a2) /* f0decb0: afa60020 */ sw $a2,0x20($sp) /* f0decb4: afaa0018 */ sw $t2,0x18($sp) -/* f0decb8: 0fc54978 */ jal 0xf1525e0 +/* f0decb8: 0fc54978 */ jal optionsGetScreenSplit /* f0decbc: afad001c */ sw $t5,0x1c($sp) /* f0decc0: 3c07800a */ lui $a3,0x800a /* f0decc4: 24010001 */ li $at,0x1 @@ -1000,7 +1000,7 @@ glabel hudmsgCreateAsSubtitle /* f0df2e4: afb00050 */ sw $s0,0x50($sp) /* f0df2e8: f7b40048 */ sdc1 $f20,0x48($sp) /* f0df2ec: afa601d0 */ sw $a2,0x1d0($sp) -/* f0df2f0: 0fc257fe */ jal 0xf095ff8 +/* f0df2f0: 0fc257fe */ jal propsndGetDuration60 /* f0df2f4: 00e02025 */ move $a0,$a3 /* f0df2f8: 24100006 */ li $s0,0x6 /* f0df2fc: 16d0000e */ bne $s6,$s0,.JF0f0df338 @@ -1009,14 +1009,14 @@ glabel hudmsgCreateAsSubtitle /* f0df308: 8dcea8dc */ lw $t6,-0x5724($t6) /* f0df30c: 160e0007 */ bne $s0,$t6,.JF0f0df32c /* f0df310: 00000000 */ nop -/* f0df314: 0fc547ce */ jal 0xf151f38 +/* f0df314: 0fc547ce */ jal optionsGetCutsceneSubtitles /* f0df318: 00000000 */ nop /* f0df31c: 5040006b */ beqzl $v0,.JF0f0df4cc /* f0df320: 8fbf006c */ lw $ra,0x6c($sp) /* f0df324: 10000004 */ b .JF0f0df338 /* f0df328: 2416000b */ li $s6,0xb .JF0f0df32c: -/* f0df32c: 0fc547cb */ jal 0xf151f2c +/* f0df32c: 0fc547cb */ jal optionsGetInGameSubtitles /* f0df330: 00000000 */ nop /* f0df334: 10400064 */ beqz $v0,.JF0f0df4c8 .JF0f0df338: @@ -1035,7 +1035,7 @@ glabel hudmsgCreateAsSubtitle /* f0df368: 92b80002 */ lbu $t8,0x2($s5) /* f0df36c: 0622003e */ bltzl $s1,.JF0f0df468 /* f0df370: 92b80002 */ lbu $t8,0x2($s5) -/* f0df374: 0c012847 */ jal 0x4a11c +/* f0df374: 0c012847 */ jal strlen /* f0df378: 02602025 */ move $a0,$s3 /* f0df37c: 304bffff */ andi $t3,$v0,0xffff /* f0df380: 448b4000 */ mtc1 $t3,$f8 @@ -1097,7 +1097,7 @@ glabel hudmsgCreateAsSubtitle /* f0df440: 46142402 */ mul.s $f16,$f4,$f20 /* f0df444: 4600818d */ trunc.w.s $f6,$f16 /* f0df448: 44073000 */ mfc1 $a3,$f6 -/* f0df44c: 0fc37c8a */ jal 0xf0df228 +/* f0df44c: 0fc37c8a */ jal hudmsgCreateWithDuration /* f0df450: 00000000 */ nop .JF0f0df454: /* f0df454: 5240ffda */ beqzl $s2,.JF0f0df3c0 @@ -1128,7 +1128,7 @@ glabel hudmsgCreateAsSubtitle /* f0df4b4: 86af0018 */ lh $t7,0x18($s5) /* f0df4b8: afa00038 */ sw $zero,0x38($sp) /* f0df4bc: afb20034 */ sw $s2,0x34($sp) -/* f0df4c0: 0fc37f11 */ jal 0xf0dfc44 +/* f0df4c0: 0fc37f11 */ jal hudmsgCreateFromArgs /* f0df4c4: afaf0030 */ sw $t7,0x30($sp) .JF0f0df4c8: /* f0df4c8: 8fbf006c */ lw $ra,0x6c($sp) @@ -1541,7 +1541,7 @@ glabel hudmsgCreateFromArgs /* f0dfc68: afa70204 */ sw $a3,0x204($sp) /* f0dfc6c: 14b10005 */ bne $a1,$s1,.JF0f0dfc84 /* f0dfc70: 00004825 */ move $t1,$zero -/* f0dfc74: 0fc547cb */ jal 0xf151f2c +/* f0dfc74: 0fc547cb */ jal optionsGetInGameSubtitles /* f0dfc78: afa001ec */ sw $zero,0x1ec($sp) /* f0dfc7c: 10400118 */ beqz $v0,.JF0f0e00e0 /* f0dfc80: 8fa901ec */ lw $t1,0x1ec($sp) @@ -1641,7 +1641,7 @@ glabel hudmsgCreateFromArgs .JF0f0dfdc4: /* f0dfdc4: 2404ffff */ li $a0,-1 .JF0f0dfdc8: -/* f0dfdc8: 0fc37c00 */ jal 0xf0df000 +/* f0dfdc8: 0fc37c00 */ jal hudmsgGetNext /* f0dfdcc: afa901ec */ sw $t1,0x1ec($sp) /* f0dfdd0: 8fa901ec */ lw $t1,0x1ec($sp) /* f0dfdd4: 0440001d */ bltz $v0,.JF0f0dfe4c @@ -1671,7 +1671,7 @@ glabel hudmsgCreateFromArgs /* f0dfe2c: 00007812 */ mflo $t7 /* f0dfe30: 00afc821 */ addu $t9,$a1,$t7 /* f0dfe34: 8f2401b8 */ lw $a0,0x1b8($t9) -/* f0dfe38: 0fc37c00 */ jal 0xf0df000 +/* f0dfe38: 0fc37c00 */ jal hudmsgGetNext /* f0dfe3c: afa901ec */ sw $t1,0x1ec($sp) /* f0dfe40: 8fa901ec */ lw $t1,0x1ec($sp) /* f0dfe44: 0441ffe7 */ bgez $v0,.JF0f0dfde4 @@ -1695,7 +1695,7 @@ glabel hudmsgCreateFromArgs /* f0dfe84: afa901ec */ sw $t1,0x1ec($sp) /* f0dfe88: 00005812 */ mflo $t3 /* f0dfe8c: 016c9021 */ addu $s2,$t3,$t4 -/* f0dfe90: 0fc37af7 */ jal 0xf0debdc +/* f0dfe90: 0fc37af7 */ jal func0f0ddb1c /* f0dfe94: 00000000 */ nop /* f0dfe98: 8fae0210 */ lw $t6,0x210($sp) /* f0dfe9c: 8fad020c */ lw $t5,0x20c($sp) @@ -1706,7 +1706,7 @@ glabel hudmsgCreateFromArgs /* f0dfeb0: 27a401dc */ addiu $a0,$sp,0x1dc /* f0dfeb4: 27a501e0 */ addiu $a1,$sp,0x1e0 /* f0dfeb8: 8fa601f8 */ lw $a2,0x1f8($sp) -/* f0dfebc: 0fc55d49 */ jal 0xf157524 +/* f0dfebc: 0fc55d49 */ jal textMeasure /* f0dfec0: afb80010 */ sw $t8,0x10($sp) /* f0dfec4: 8faf01d4 */ lw $t7,0x1d4($sp) /* f0dfec8: 8fb901e0 */ lw $t9,0x1e0($sp) @@ -1755,7 +1755,7 @@ glabel hudmsgCreateFromArgs /* f0dff68: afa901ec */ sw $t1,0x1ec($sp) /* f0dff6c: 02203025 */ move $a2,$s1 /* f0dff70: 8fa401d4 */ lw $a0,0x1d4($sp) -/* f0dff74: 0fc55dde */ jal 0xf157778 +/* f0dff74: 0fc55dde */ jal textWrap /* f0dff78: afad0010 */ sw $t5,0x10($sp) /* f0dff7c: 8fae0210 */ lw $t6,0x210($sp) /* f0dff80: 8fac020c */ lw $t4,0x20c($sp) @@ -1765,7 +1765,7 @@ glabel hudmsgCreateFromArgs /* f0dff90: afa00014 */ sw $zero,0x14($sp) /* f0dff94: 27a501e0 */ addiu $a1,$sp,0x1e0 /* f0dff98: 02203025 */ move $a2,$s1 -/* f0dff9c: 0fc55d49 */ jal 0xf157524 +/* f0dff9c: 0fc55d49 */ jal textMeasure /* f0dffa0: afb80010 */ sw $t8,0x10($sp) /* f0dffa4: 10000008 */ b .JF0f0dffc8 /* f0dffa8: 8fa901ec */ lw $t1,0x1ec($sp) @@ -1773,7 +1773,7 @@ glabel hudmsgCreateFromArgs /* f0dffac: 26440020 */ addiu $a0,$s2,0x20 /* f0dffb0: 8fa501f8 */ lw $a1,0x1f8($sp) /* f0dffb4: 2406018f */ li $a2,0x18f -/* f0dffb8: 0c004c5a */ jal 0x13168 +/* f0dffb8: 0c004c5a */ jal strncpy /* f0dffbc: afa901ec */ sw $t1,0x1ec($sp) /* f0dffc0: 8fa901ec */ lw $t1,0x1ec($sp) /* f0dffc4: a24001af */ sb $zero,0x1af($s2) @@ -1826,7 +1826,7 @@ glabel hudmsgCreateFromArgs /* f0e007c: ae4c01d0 */ sw $t4,0x1d0($s2) /* f0e0080: 8fae0228 */ lw $t6,0x228($sp) /* f0e0084: ae4901d8 */ sw $t1,0x1d8($s2) -/* f0e0088: 0fc37d59 */ jal 0xf0df564 +/* f0e0088: 0fc37d59 */ jal hudmsgCalculatePosition /* f0e008c: ae4e01d4 */ sw $t6,0x1d4($s2) /* f0e0090: 8fb80230 */ lw $t8,0x230($sp) /* f0e0094: 8fab01fc */ lw $t3,0x1fc($sp) @@ -2305,7 +2305,7 @@ glabel var7f1adee0 /* f0e08d0: 3c018008 */ lui $at,0x8008 /* f0e08d4: ac2200f4 */ sw $v0,0xf4($at) .JF0f0e08d8: -/* f0e08d8: 0fc54b55 */ jal 0xf152d54 +/* f0e08d8: 0fc54b55 */ jal func0f153628 /* f0e08dc: 02402025 */ move $a0,$s2 /* f0e08e0: 3c19800a */ lui $t9,0x800a /* f0e08e4: 8f39a8c8 */ lw $t9,-0x5738($t9) @@ -2400,7 +2400,7 @@ glabel var7f1adee0 /* f0e0a24: 3c014270 */ lui $at,0x4270 /* f0e0a28: 44819000 */ mtc1 $at,$f18 /* f0e0a2c: 460a3402 */ mul.s $f16,$f6,$f10 -/* f0e0a30: 0c0068df */ jal 0x1a37c +/* f0e0a30: 0c0068df */ jal sinf /* f0e0a34: 46128303 */ div.s $f12,$f16,$f18 /* f0e0a38: 44802000 */ mtc1 $zero,$f4 /* f0e0a3c: 3c014340 */ lui $at,0x4340 @@ -2467,11 +2467,11 @@ glabel var7f1adee0 /* f0e0b18: 8e0e01b4 */ lw $t6,0x1b4($s0) /* f0e0b1c: 55c10011 */ bnel $t6,$at,.JF0f0e0b64 /* f0e0b20: 8e0901b4 */ lw $t1,0x1b4($s0) -/* f0e0b24: 0fc30a21 */ jal 0xf0c2884 +/* f0e0b24: 0fc30a21 */ jal playerIsHealthVisible /* f0e0b28: 00000000 */ nop /* f0e0b2c: 5040000d */ beqzl $v0,.JF0f0e0b64 /* f0e0b30: 8e0901b4 */ lw $t1,0x1b4($s0) -/* f0e0b34: 0fc309eb */ jal 0xf0c27ac +/* f0e0b34: 0fc309eb */ jal playerGetHealthBarHeightFrac /* f0e0b38: 00000000 */ nop /* f0e0b3c: 3c014180 */ lui $at,0x4180 /* f0e0b40: 44818000 */ mtc1 $at,$f16 @@ -2506,7 +2506,7 @@ glabel var7f1adee0 /* f0e0bb0: 330f0fff */ andi $t7,$t8,0xfff /* f0e0bb4: 000fcb00 */ sll $t9,$t7,0xc /* f0e0bb8: 03214025 */ or $t0,$t9,$at -/* f0e0bbc: 0c002ede */ jal 0xbb78 +/* f0e0bbc: 0c002ede */ jal viGetBufHeight /* f0e0bc0: ae280000 */ sw $t0,0x0($s1) /* f0e0bc4: 8fa900e8 */ lw $t1,0xe8($sp) /* f0e0bc8: 960b001c */ lhu $t3,0x1c($s0) @@ -2575,7 +2575,7 @@ glabel var7f1adee0 /* f0e0cb8: 00005012 */ mflo $t2 /* f0e0cbc: 016a4021 */ addu $t0,$t3,$t2 /* f0e0cc0: 44884000 */ mtc1 $t0,$f8 -/* f0e0cc4: 0c012838 */ jal 0x4a0e0 +/* f0e0cc4: 0c012838 */ jal sqrtf /* f0e0cc8: 46804320 */ cvt.s.w $f12,$f8 /* f0e0ccc: 3c014304 */ lui $at,0x4304 /* f0e0cd0: 44813000 */ mtc1 $at,$f6 @@ -2616,7 +2616,7 @@ glabel var7f1adee0 /* f0e0d50: 44801000 */ mtc1 $zero,$f2 /* f0e0d54: 00000000 */ nop .JF0f0e0d58: -/* f0e0d58: 0fc54ce3 */ jal 0xf15338c +/* f0e0d58: 0fc54ce3 */ jal func0f153c20 /* f0e0d5c: e7a200c0 */ swc1 $f2,0xc0($sp) /* f0e0d60: 920d0001 */ lbu $t5,0x1($s0) /* f0e0d64: c7a200c0 */ lwc1 $f2,0xc0($sp) @@ -2637,13 +2637,13 @@ glabel var7f1adee0 /* f0e0da0: e7b40014 */ swc1 $f20,0x14($sp) /* f0e0da4: 02402025 */ move $a0,$s2 /* f0e0da8: 2706fffd */ addiu $a2,$t8,-3 -/* f0e0dac: 0fc37a42 */ jal 0xf0de908 +/* f0e0dac: 0fc37a42 */ jal hudmsgRenderBox /* f0e0db0: 25c5fffd */ addiu $a1,$t6,-3 -/* f0e0db4: 0c002eeb */ jal 0xbbac +/* f0e0db4: 0c002eeb */ jal viGetWidth /* f0e0db8: 00409025 */ move $s2,$v0 /* f0e0dbc: 00028c00 */ sll $s1,$v0,0x10 /* f0e0dc0: 00115403 */ sra $t2,$s1,0x10 -/* f0e0dc4: 0c002eef */ jal 0xbbbc +/* f0e0dc4: 0c002eef */ jal viGetHeight /* f0e0dc8: 01408825 */ move $s1,$t2 /* f0e0dcc: 8e080008 */ lw $t0,0x8($s0) /* f0e0dd0: 02402025 */ move $a0,$s2 @@ -2657,7 +2657,7 @@ glabel var7f1adee0 /* f0e0df0: afb30018 */ sw $s3,0x18($sp) /* f0e0df4: 02e03025 */ move $a2,$s7 /* f0e0df8: 26070020 */ addiu $a3,$s0,0x20 -/* f0e0dfc: 0fc55886 */ jal 0xf156218 +/* f0e0dfc: 0fc55886 */ jal textRenderProjected /* f0e0e00: afac0014 */ sw $t4,0x14($sp) /* f0e0e04: 1000001f */ b .JF0f0e0e84 /* f0e0e08: 00409025 */ move $s2,$v0 @@ -2668,13 +2668,13 @@ glabel var7f1adee0 /* f0e0e18: afa00014 */ sw $zero,0x14($sp) /* f0e0e1c: 0326c021 */ addu $t8,$t9,$a2 /* f0e0e20: afb80010 */ sw $t8,0x10($sp) -/* f0e0e24: 0fc54c68 */ jal 0xf1531a0 +/* f0e0e24: 0fc54c68 */ jal func0f153a34 /* f0e0e28: 01c53821 */ addu $a3,$t6,$a1 -/* f0e0e2c: 0c002eeb */ jal 0xbbac +/* f0e0e2c: 0c002eeb */ jal viGetWidth /* f0e0e30: 00409025 */ move $s2,$v0 /* f0e0e34: 00028c00 */ sll $s1,$v0,0x10 /* f0e0e38: 00114c03 */ sra $t1,$s1,0x10 -/* f0e0e3c: 0c002eef */ jal 0xbbbc +/* f0e0e3c: 0c002eef */ jal viGetHeight /* f0e0e40: 01208825 */ move $s1,$t1 /* f0e0e44: 8e0b0008 */ lw $t3,0x8($s0) /* f0e0e48: 02402025 */ move $a0,$s2 @@ -2689,7 +2689,7 @@ glabel var7f1adee0 /* f0e0e6c: afb30018 */ sw $s3,0x18($sp) /* f0e0e70: 02e03025 */ move $a2,$s7 /* f0e0e74: 26070020 */ addiu $a3,$s0,0x20 -/* f0e0e78: 0fc55d34 */ jal 0xf1574d0 +/* f0e0e78: 0fc55d34 */ jal func0f1574d0jf /* f0e0e7c: afaa0014 */ sw $t2,0x14($sp) /* f0e0e80: 00409025 */ move $s2,$v0 .JF0f0e0e84: @@ -2699,7 +2699,7 @@ glabel var7f1adee0 /* f0e0e90: 00000000 */ nop /* f0e0e94: afa000e0 */ sw $zero,0xe0($sp) .JF0f0e0e98: -/* f0e0e98: 0fc54d6e */ jal 0xf1535b8 +/* f0e0e98: 0fc54d6e */ jal func0f153e4c /* f0e0e9c: 00000000 */ nop /* f0e0ea0: 100000fe */ b .JF0f0e129c /* f0e0ea4: 8e0801b4 */ lw $t0,0x1b4($s0) @@ -2740,13 +2740,13 @@ glabel var7f1adee0 /* f0e0f28: afa30018 */ sw $v1,0x18($sp) /* f0e0f2c: e7b40014 */ swc1 $f20,0x14($sp) /* f0e0f30: 02402025 */ move $a0,$s2 -/* f0e0f34: 0fc37a42 */ jal 0xf0de908 +/* f0e0f34: 0fc37a42 */ jal hudmsgRenderBox /* f0e0f38: 2566fffd */ addiu $a2,$t3,-3 -/* f0e0f3c: 0c002eeb */ jal 0xbbac +/* f0e0f3c: 0c002eeb */ jal viGetWidth /* f0e0f40: 00409025 */ move $s2,$v0 /* f0e0f44: 00028c00 */ sll $s1,$v0,0x10 /* f0e0f48: 00116c03 */ sra $t5,$s1,0x10 -/* f0e0f4c: 0c002eef */ jal 0xbbbc +/* f0e0f4c: 0c002eef */ jal viGetHeight /* f0e0f50: 01a08825 */ move $s1,$t5 /* f0e0f54: 8e190008 */ lw $t9,0x8($s0) /* f0e0f58: 02402025 */ move $a0,$s2 @@ -2760,7 +2760,7 @@ glabel var7f1adee0 /* f0e0f78: afb30018 */ sw $s3,0x18($sp) /* f0e0f7c: 02e03025 */ move $a2,$s7 /* f0e0f80: 26070020 */ addiu $a3,$s0,0x20 -/* f0e0f84: 0fc55886 */ jal 0xf156218 +/* f0e0f84: 0fc55886 */ jal textRenderProjected /* f0e0f88: afaf0014 */ sw $t7,0x14($sp) /* f0e0f8c: 10000021 */ b .JF0f0e1014 /* f0e0f90: 00409025 */ move $s2,$v0 @@ -2773,13 +2773,13 @@ glabel var7f1adee0 /* f0e0fa8: afab0010 */ sw $t3,0x10($sp) /* f0e0fac: afa00014 */ sw $zero,0x14($sp) /* f0e0fb0: 02402025 */ move $a0,$s2 -/* f0e0fb4: 0fc54c68 */ jal 0xf1531a0 +/* f0e0fb4: 0fc54c68 */ jal func0f153a34 /* f0e0fb8: 01253821 */ addu $a3,$t1,$a1 -/* f0e0fbc: 0c002eeb */ jal 0xbbac +/* f0e0fbc: 0c002eeb */ jal viGetWidth /* f0e0fc0: 00409025 */ move $s2,$v0 /* f0e0fc4: 00028c00 */ sll $s1,$v0,0x10 /* f0e0fc8: 00116403 */ sra $t4,$s1,0x10 -/* f0e0fcc: 0c002eef */ jal 0xbbbc +/* f0e0fcc: 0c002eef */ jal viGetHeight /* f0e0fd0: 01808825 */ move $s1,$t4 /* f0e0fd4: 8e0e0008 */ lw $t6,0x8($s0) /* f0e0fd8: 02402025 */ move $a0,$s2 @@ -2794,7 +2794,7 @@ glabel var7f1adee0 /* f0e0ffc: afb30018 */ sw $s3,0x18($sp) /* f0e1000: 02e03025 */ move $a2,$s7 /* f0e1004: 26070020 */ addiu $a3,$s0,0x20 -/* f0e1008: 0fc55d34 */ jal 0xf1574d0 +/* f0e1008: 0fc55d34 */ jal func0f1574d0jf /* f0e100c: afad0014 */ sw $t5,0x14($sp) /* f0e1010: 00409025 */ move $s2,$v0 .JF0f0e1014: @@ -2814,7 +2814,7 @@ glabel var7f1adee0 /* f0e1048: 00004812 */ mflo $t1 /* f0e104c: 01e9c021 */ addu $t8,$t7,$t1 /* f0e1050: 44984000 */ mtc1 $t8,$f8 -/* f0e1054: 0c012838 */ jal 0x4a0e0 +/* f0e1054: 0c012838 */ jal sqrtf /* f0e1058: 46804320 */ cvt.s.w $f12,$f8 /* f0e105c: 3c0142b8 */ lui $at,0x42b8 /* f0e1060: 44813000 */ mtc1 $at,$f6 @@ -2861,7 +2861,7 @@ glabel var7f1adee0 /* f0e10f8: 032f2021 */ addu $a0,$t9,$t7 /* f0e10fc: 01382821 */ addu $a1,$t1,$t8 /* f0e1100: 44060000 */ mfc1 $a2,$f0 -/* f0e1104: 0fc54ce3 */ jal 0xf15338c +/* f0e1104: 0fc54ce3 */ jal func0f153c20 /* f0e1108: 00000000 */ nop /* f0e110c: c7a200a8 */ lwc1 $f2,0xa8($sp) /* f0e1110: 3c014f80 */ lui $at,0x4f80 @@ -2905,13 +2905,13 @@ glabel var7f1adee0 /* f0e119c: e7b40014 */ swc1 $f20,0x14($sp) /* f0e11a0: 02402025 */ move $a0,$s2 /* f0e11a4: 2565fffd */ addiu $a1,$t3,-3 -/* f0e11a8: 0fc37a42 */ jal 0xf0de908 +/* f0e11a8: 0fc37a42 */ jal hudmsgRenderBox /* f0e11ac: 2586fffd */ addiu $a2,$t4,-3 -/* f0e11b0: 0c002eeb */ jal 0xbbac +/* f0e11b0: 0c002eeb */ jal viGetWidth /* f0e11b4: 00409025 */ move $s2,$v0 /* f0e11b8: 00028c00 */ sll $s1,$v0,0x10 /* f0e11bc: 00114c03 */ sra $t1,$s1,0x10 -/* f0e11c0: 0c002eef */ jal 0xbbbc +/* f0e11c0: 0c002eef */ jal viGetHeight /* f0e11c4: 01208825 */ move $s1,$t1 /* f0e11c8: 8e180008 */ lw $t8,0x8($s0) /* f0e11cc: 02402025 */ move $a0,$s2 @@ -2925,7 +2925,7 @@ glabel var7f1adee0 /* f0e11ec: afb30018 */ sw $s3,0x18($sp) /* f0e11f0: 02e03025 */ move $a2,$s7 /* f0e11f4: 26070020 */ addiu $a3,$s0,0x20 -/* f0e11f8: 0fc55886 */ jal 0xf156218 +/* f0e11f8: 0fc55886 */ jal textRenderProjected /* f0e11fc: afa80014 */ sw $t0,0x14($sp) /* f0e1200: 1000001e */ b .JF0f0e127c /* f0e1204: 00409025 */ move $s2,$v0 @@ -2935,13 +2935,13 @@ glabel var7f1adee0 /* f0e1210: afa00014 */ sw $zero,0x14($sp) /* f0e1214: 01a66021 */ addu $t4,$t5,$a2 /* f0e1218: afac0010 */ sw $t4,0x10($sp) -/* f0e121c: 0fc54c68 */ jal 0xf1531a0 +/* f0e121c: 0fc54c68 */ jal func0f153a34 /* f0e1220: 01653821 */ addu $a3,$t3,$a1 -/* f0e1224: 0c002eeb */ jal 0xbbac +/* f0e1224: 0c002eeb */ jal viGetWidth /* f0e1228: 00409025 */ move $s2,$v0 /* f0e122c: 00028c00 */ sll $s1,$v0,0x10 /* f0e1230: 0011cc03 */ sra $t9,$s1,0x10 -/* f0e1234: 0c002eef */ jal 0xbbbc +/* f0e1234: 0c002eef */ jal viGetHeight /* f0e1238: 03208825 */ move $s1,$t9 /* f0e123c: 8e0f0008 */ lw $t7,0x8($s0) /* f0e1240: 02402025 */ move $a0,$s2 @@ -2956,7 +2956,7 @@ glabel var7f1adee0 /* f0e1264: afb30018 */ sw $s3,0x18($sp) /* f0e1268: 02e03025 */ move $a2,$s7 /* f0e126c: 26070020 */ addiu $a3,$s0,0x20 -/* f0e1270: 0fc55d34 */ jal 0xf1574d0 +/* f0e1270: 0fc55d34 */ jal func0f1574d0jf /* f0e1274: afa90014 */ sw $t1,0x14($sp) /* f0e1278: 00409025 */ move $s2,$v0 .JF0f0e127c: @@ -2966,7 +2966,7 @@ glabel var7f1adee0 /* f0e1288: 00000000 */ nop /* f0e128c: afa000e0 */ sw $zero,0xe0($sp) .JF0f0e1290: -/* f0e1290: 0fc54d6e */ jal 0xf1535b8 +/* f0e1290: 0fc54d6e */ jal func0f153e4c /* f0e1294: 00000000 */ nop .JF0f0e1298: /* f0e1298: 8e0801b4 */ lw $t0,0x1b4($s0) @@ -2975,12 +2975,12 @@ glabel var7f1adee0 /* f0e12a0: 15010039 */ bne $t0,$at,.JF0f0e1388 /* f0e12a4: 00000000 */ nop /* f0e12a8: afb2009c */ sw $s2,0x9c($sp) -/* f0e12ac: 0c002f29 */ jal 0xbca4 +/* f0e12ac: 0c002f29 */ jal viGetViewLeft /* f0e12b0: 26520008 */ addiu $s2,$s2,0x8 /* f0e12b4: 00028400 */ sll $s0,$v0,0x10 /* f0e12b8: 00105c03 */ sra $t3,$s0,0x10 /* f0e12bc: 01608025 */ move $s0,$t3 -/* f0e12c0: 0c002f2d */ jal 0xbcb4 +/* f0e12c0: 0c002f2d */ jal viGetViewTop /* f0e12c4: 8fb3009c */ lw $s3,0x9c($sp) /* f0e12c8: 44829000 */ mtc1 $v0,$f18 /* f0e12cc: 44905000 */ mtc1 $s0,$f10 @@ -2999,17 +2999,17 @@ glabel var7f1adee0 /* f0e1300: 31e90fff */ andi $t1,$t7,0xfff /* f0e1304: 0009c300 */ sll $t8,$t1,0xc /* f0e1308: 01984025 */ or $t0,$t4,$t8 -/* f0e130c: 0c002f0b */ jal 0xbc2c +/* f0e130c: 0c002f0b */ jal viGetViewWidth /* f0e1310: ae680000 */ sw $t0,0x0($s3) -/* f0e1314: 0c002f29 */ jal 0xbca4 +/* f0e1314: 0c002f29 */ jal viGetViewLeft /* f0e1318: a7a20092 */ sh $v0,0x92($sp) /* f0e131c: 00028c00 */ sll $s1,$v0,0x10 /* f0e1320: 00115c03 */ sra $t3,$s1,0x10 -/* f0e1324: 0c002f2d */ jal 0xbcb4 +/* f0e1324: 0c002f2d */ jal viGetViewTop /* f0e1328: 01608825 */ move $s1,$t3 /* f0e132c: 00028400 */ sll $s0,$v0,0x10 /* f0e1330: 00105403 */ sra $t2,$s0,0x10 -/* f0e1334: 0c002f0f */ jal 0xbc3c +/* f0e1334: 0c002f0f */ jal viGetViewHeight /* f0e1338: 01408025 */ move $s0,$t2 /* f0e133c: 87a90092 */ lh $t1,0x92($sp) /* f0e1340: 00506821 */ addu $t5,$v0,$s0 @@ -3050,7 +3050,7 @@ glabel var7f1adee0 /* f0e13c0: 11200028 */ beqz $t1,.JF0f0e1464 /* f0e13c4: 00000000 */ nop /* f0e13c8: 8d8ca8b8 */ lw $t4,-0x5748($t4) -/* f0e13cc: 0fc547c2 */ jal 0xf151f08 +/* f0e13cc: 0fc547c2 */ jal optionsGetShowMissionTime /* f0e13d0: 8d840070 */ lw $a0,0x70($t4) /* f0e13d4: 10400019 */ beqz $v0,.JF0f0e143c /* f0e13d8: 3c188007 */ lui $t8,0x8007 @@ -3075,23 +3075,23 @@ glabel var7f1adee0 /* f0e1424: 00000000 */ nop /* f0e1428: 10410004 */ beq $v0,$at,.JF0f0e143c /* f0e142c: 02402025 */ move $a0,$s2 -/* f0e1430: 0fc377ed */ jal 0xf0ddfb4 +/* f0e1430: 0fc377ed */ jal hudmsgRenderMissionTimer /* f0e1434: 8fa500e0 */ lw $a1,0xe0($sp) /* f0e1438: 00409025 */ move $s2,$v0 .JF0f0e143c: -/* f0e143c: 0fc3779f */ jal 0xf0dde7c +/* f0e143c: 0fc3779f */ jal hudmsgIsZoomRangeVisible /* f0e1440: 00000000 */ nop /* f0e1444: 10400004 */ beqz $v0,.JF0f0e1458 /* f0e1448: 02402025 */ move $a0,$s2 -/* f0e144c: 0fc378db */ jal 0xf0de36c +/* f0e144c: 0fc378db */ jal hudmsgRenderZoomRange /* f0e1450: 8fa500e0 */ lw $a1,0xe0($sp) /* f0e1454: 00409025 */ move $s2,$v0 .JF0f0e1458: -/* f0e1458: 0fc2458f */ jal 0xf09163c +/* f0e1458: 0fc2458f */ jal countdownTimerRender /* f0e145c: 02402025 */ move $a0,$s2 /* f0e1460: 00409025 */ move $s2,$v0 .JF0f0e1464: -/* f0e1464: 0fc54bb7 */ jal 0xf152edc +/* f0e1464: 0fc54bb7 */ jal func0f153780 /* f0e1468: 02402025 */ move $a0,$s2 /* f0e146c: 8fbf007c */ lw $ra,0x7c($sp) /* f0e1470: 240a0001 */ li $t2,0x1 diff --git a/src/game/inventory/inventory.c b/src/game/inventory/inventory.c index e99c28a74..4d4025a38 100644 --- a/src/game/inventory/inventory.c +++ b/src/game/inventory/inventory.c @@ -1012,7 +1012,7 @@ GLOBAL_ASM( glabel invGetShortNameByIndex /* f113228: 27bdffe0 */ addiu $sp,$sp,-32 /* f11322c: afbf0014 */ sw $ra,0x14($sp) -/* f113230: 0fc44b97 */ jal 0xf112e5c +/* f113230: 0fc44b97 */ jal invGetItemByIndex /* f113234: afa40020 */ sw $a0,0x20($sp) /* f113238: 8fa40020 */ lw $a0,0x20($sp) /* f11323c: 00402825 */ move $a1,$v0 @@ -1024,7 +1024,7 @@ glabel invGetShortNameByIndex /* f113254: 24010001 */ li $at,0x1 /* f113258: 8ca20004 */ lw $v0,0x4($a1) /* f11325c: 8c440004 */ lw $a0,0x4($v0) -/* f113260: 0fc44bf1 */ jal 0xf112fc4 +/* f113260: 0fc44bf1 */ jal invGetTextOverrideForObj /* f113264: afa00018 */ sw $zero,0x18($sp) /* f113268: 1040001c */ beqz $v0,.JF0f1132dc /* f11326c: 8fa60018 */ lw $a2,0x18($sp) @@ -1043,7 +1043,7 @@ glabel invGetShortNameByIndex /* f113298: 11e00010 */ beqz $t7,.JF0f1132dc /* f11329c: 00000000 */ nop /* f1132a0: afa40020 */ sw $a0,0x20($sp) -/* f1132a4: 0fc447f4 */ jal 0xf111fd0 +/* f1132a4: 0fc447f4 */ jal currentStageForbidsSlayer /* f1132a8: afa60018 */ sw $a2,0x18($sp) /* f1132ac: 8fa40020 */ lw $a0,0x20($sp) /* f1132b0: 2418002c */ li $t8,0x2c @@ -1051,14 +1051,14 @@ glabel invGetShortNameByIndex /* f1132b8: 0099082a */ slt $at,$a0,$t9 /* f1132bc: 10200007 */ beqz $at,.JF0f1132dc /* f1132c0: 8fa60018 */ lw $a2,0x18($sp) -/* f1132c4: 0fc447da */ jal 0xf111f68 +/* f1132c4: 0fc447da */ jal invAddOneIfCantHaveSlayer /* f1132c8: 24840001 */ addiu $a0,$a0,0x1 -/* f1132cc: 0fc28c4e */ jal 0xf0a3138 +/* f1132cc: 0fc28c4e */ jal bgunGetShortName /* f1132d0: 00402025 */ move $a0,$v0 /* f1132d4: 10000004 */ b .JF0f1132e8 /* f1132d8: 8fbf0014 */ lw $ra,0x14($sp) .JF0f1132dc: -/* f1132dc: 0fc28c4e */ jal 0xf0a3138 +/* f1132dc: 0fc28c4e */ jal bgunGetShortName /* f1132e0: 00c02025 */ move $a0,$a2 /* f1132e4: 8fbf0014 */ lw $ra,0x14($sp) .JF0f1132e8: diff --git a/src/game/lang.c b/src/game/lang.c index 5285c4646..8f3484426 100644 --- a/src/game/lang.c +++ b/src/game/lang.c @@ -199,12 +199,12 @@ glabel func0f16e3fc /* f16e5d0: 24848850 */ addiu $a0,$a0,-30640 /* f16e5d4: afa80020 */ sw $t0,0x20($sp) /* f16e5d8: afa90028 */ sw $t1,0x28($sp) -/* f16e5dc: 0c0036b4 */ jal 0xdad0 +/* f16e5dc: 0c0036b4 */ jal mainOverrideVariable /* f16e5e0: afaa0024 */ sw $t2,0x24($sp) /* f16e5e4: 3c047f1c */ lui $a0,0x7f1c /* f16e5e8: 3c058008 */ lui $a1,0x8008 /* f16e5ec: 24a54810 */ addiu $a1,$a1,0x4810 -/* f16e5f0: 0c0036b4 */ jal 0xdad0 +/* f16e5f0: 0c0036b4 */ jal mainOverrideVariable /* f16e5f4: 24848858 */ addiu $a0,$a0,-30632 /* f16e5f8: 3c028008 */ lui $v0,0x8008 /* f16e5fc: 8c424810 */ lw $v0,0x4810($v0) @@ -354,7 +354,7 @@ glabel func0f16e3fc /* f16e814: 01c80019 */ multu $t6,$t0 /* f16e818: 00006812 */ mflo $t5 /* f16e81c: 01afc021 */ addu $t8,$t5,$t7 -/* f16e820: 0c0034ec */ jal 0xd3b0 +/* f16e820: 0c0034ec */ jal dmaExec /* f16e824: 030b2821 */ addu $a1,$t8,$t3 /* f16e828: 3c0c8008 */ lui $t4,0x8008 /* f16e82c: 8fa90028 */ lw $t1,0x28($sp) @@ -652,9 +652,9 @@ GLOBAL_ASM( glabel langSetBankSimple /* f16e964: 27bdffe0 */ addiu $sp,$sp,-32 /* f16e968: afbf0014 */ sw $ra,0x14($sp) -/* f16e96c: 0fc5ba4c */ jal 0xf16e930 +/* f16e96c: 0fc5ba4c */ jal langGetFileId /* f16e970: afa40020 */ sw $a0,0x20($sp) -/* f16e974: 0fc59d19 */ jal 0xf167464 +/* f16e974: 0fc59d19 */ jal fileGetInflatedLength /* f16e978: 00402025 */ move $a0,$v0 /* f16e97c: 3c038008 */ lui $v1,0x8008 /* f16e980: 8c634774 */ lw $v1,0x4774($v1) @@ -676,13 +676,13 @@ glabel langSetBankSimple .JF0f16e9c0: /* f16e9c0: 00084940 */ sll $t1,$t0,0x5 /* f16e9c4: afa90018 */ sw $t1,0x18($sp) -/* f16e9c8: 0fc5ba4c */ jal 0xf16e930 +/* f16e9c8: 0fc5ba4c */ jal langGetFileId /* f16e9cc: 8fa40020 */ lw $a0,0x20($sp) /* f16e9d0: 3c068008 */ lui $a2,0x8008 /* f16e9d4: 8cc64778 */ lw $a2,0x4778($a2) /* f16e9d8: 8fa70018 */ lw $a3,0x18($sp) /* f16e9dc: 00402025 */ move $a0,$v0 -/* f16e9e0: 0fc59d84 */ jal 0xf167610 +/* f16e9e0: 0fc59d84 */ jal func0f167200 /* f16e9e4: 24050022 */ li $a1,0x22 /* f16e9e8: 8faa0020 */ lw $t2,0x20($sp) /* f16e9ec: 3c0c8008 */ lui $t4,0x8008 @@ -692,7 +692,7 @@ glabel langSetBankSimple /* f16e9fc: 000a5880 */ sll $t3,$t2,0x2 /* f16ea00: 002b0821 */ addu $at,$at,$t3 /* f16ea04: ac22b490 */ sw $v0,-0x4b70($at) -/* f16ea08: 0fc5dc84 */ jal 0xf177210 +/* f16ea08: 0fc5dc84 */ jal align32 /* f16ea0c: 018d2021 */ addu $a0,$t4,$t5 /* f16ea10: 3c018008 */ lui $at,0x8008 /* f16ea14: 10000003 */ b .JF0f16ea24 @@ -878,7 +878,7 @@ glabel func0f16f6ecpf /* f16eae4: afb20020 */ sw $s2,0x20($sp) /* f16eae8: afb1001c */ sw $s1,0x1c($sp) /* f16eaec: afb00018 */ sw $s0,0x18($sp) -/* f16eaf0: 0fc5dc84 */ jal 0xf177210 +/* f16eaf0: 0fc5dc84 */ jal align32 /* f16eaf4: 8c844774 */ lw $a0,0x4774($a0) /* f16eaf8: 3c018008 */ lui $at,0x8008 /* f16eafc: 3c11800b */ lui $s1,0x800b @@ -890,7 +890,7 @@ glabel func0f16f6ecpf /* f16eb10: 8e2e0000 */ lw $t6,0x0($s1) /* f16eb14: 51c00004 */ beqzl $t6,.JF0f16eb28 /* f16eb18: 26100001 */ addiu $s0,$s0,0x1 -/* f16eb1c: 0fc5ba59 */ jal 0xf16e964 +/* f16eb1c: 0fc5ba59 */ jal langSetBankSimple /* f16eb20: 02002025 */ move $a0,$s0 /* f16eb24: 26100001 */ addiu $s0,$s0,0x1 .JF0f16eb28: @@ -996,7 +996,7 @@ glabel var7f1b9080pf .JF0f16eb68: /* f16eb68: 10400004 */ beqz $v0,.JF0f16eb7c /* f16eb6c: 27a4001f */ addiu $a0,$sp,0x1f -/* f16eb70: 0fc622a3 */ jal 0xf188a8c +/* f16eb70: 0fc622a3 */ jal mpGetTeamsWithDefaultName /* f16eb74: afa20018 */ sw $v0,0x18($sp) /* f16eb78: 8fa20018 */ lw $v0,0x18($sp) .JF0f16eb7c: @@ -1032,12 +1032,12 @@ glabel var7f1b9080pf /* f16ebf0: 3c018008 */ lui $at,0x8008 /* f16ebf4: ac2a4780 */ sw $t2,0x4780($at) .JF0f16ebf8: -/* f16ebf8: 0fc5bab6 */ jal 0xf16ead8 +/* f16ebf8: 0fc5bab6 */ jal func0f16f6ecpf /* f16ebfc: afa20018 */ sw $v0,0x18($sp) /* f16ec00: 8fa20018 */ lw $v0,0x18($sp) /* f16ec04: 50400004 */ beqzl $v0,.JF0f16ec18 /* f16ec08: 8fbf0014 */ lw $ra,0x14($sp) -/* f16ec0c: 0fc622c5 */ jal 0xf188b14 +/* f16ec0c: 0fc622c5 */ jal mpSetTeamNamesToDefault /* f16ec10: 93a4001f */ lbu $a0,0x1f($sp) /* f16ec14: 8fbf0014 */ lw $ra,0x14($sp) .JF0f16ec18: @@ -1205,7 +1205,7 @@ glabel func0f16ec24jf /* f16ec40: 3c018008 */ lui $at,0x8008 /* f16ec44: ac204770 */ sw $zero,0x4770($at) .JF0f16ec48: -/* f16ec48: 0fc5bab6 */ jal 0xf16ead8 +/* f16ec48: 0fc5bab6 */ jal func0f16f6ecpf /* f16ec4c: 00000000 */ nop /* f16ec50: 8fbf0014 */ lw $ra,0x14($sp) /* f16ec54: 27bd0018 */ addiu $sp,$sp,0x18 diff --git a/src/game/lv.c b/src/game/lv.c index e355edb2f..bcc0902a0 100644 --- a/src/game/lv.c +++ b/src/game/lv.c @@ -995,7 +995,7 @@ glabel var7f1b8770jf /* f1697b8: 35ce0006 */ ori $t6,$t6,0x6 /* f1697bc: ac8e0000 */ sw $t6,0x0($a0) /* f1697c0: ac800004 */ sw $zero,0x4($a0) -/* f1697c4: 0fc35acf */ jal 0xf0d6b3c +/* f1697c4: 0fc35acf */ jal func0f0d5a7c /* f1697c8: 24930008 */ addiu $s3,$a0,0x8 /* f1697cc: 3c12800a */ lui $s2,0x800a /* f1697d0: 2652a630 */ addiu $s2,$s2,-22992 @@ -1005,7 +1005,7 @@ glabel var7f1b8770jf /* f1697e0: 2401004e */ li $at,0x4e /* f1697e4: 5441005f */ bnel $v0,$at,.JF0f169964 /* f1697e8: 8e4204b4 */ lw $v0,0x4b4($s2) -/* f1697ec: 0fc06f4a */ jal 0xf01bd28 +/* f1697ec: 0fc06f4a */ jal titleIsKeepingMode /* f1697f0: 00000000 */ nop /* f1697f4: 1040005a */ beqz $v0,.JF0f169960 .JF0f1697f8: @@ -1015,7 +1015,7 @@ glabel var7f1b8770jf /* f169804: 3c0f0600 */ lui $t7,0x600 /* f169808: ac4f0000 */ sw $t7,0x0($v0) /* f16980c: ac580004 */ sw $t8,0x4($v0) -/* f169810: 0fc47c8a */ jal 0xf11f228 +/* f169810: 0fc47c8a */ jal debugIsZBufferDisabled /* f169814: 26730008 */ addiu $s3,$s3,0x8 /* f169818: 10400008 */ beqz $v0,.JF0f16983c /* f16981c: 02601025 */ move $v0,$s3 @@ -1035,16 +1035,16 @@ glabel var7f1b8770jf /* f169850: ac4c0004 */ sw $t4,0x4($v0) /* f169854: 26730008 */ addiu $s3,$s3,0x8 .JF0f169858: -/* f169858: 0c002c89 */ jal 0xb224 +/* f169858: 0c002c89 */ jal vi0000b280 /* f16985c: 02602025 */ move $a0,$s3 -/* f169860: 0c002c5d */ jal 0xb174 +/* f169860: 0c002c5d */ jal vi0000b1d0 /* f169864: 00402025 */ move $a0,$v0 /* f169868: 00408825 */ move $s1,$v0 -/* f16986c: 0c002f29 */ jal 0xbca4 +/* f16986c: 0c002f29 */ jal viGetViewLeft /* f169870: 24530008 */ addiu $s3,$v0,0x8 /* f169874: 00028400 */ sll $s0,$v0,0x10 /* f169878: 00106c03 */ sra $t5,$s0,0x10 -/* f16987c: 0c002f2d */ jal 0xbcb4 +/* f16987c: 0c002f2d */ jal viGetViewTop /* f169880: 01a08025 */ move $s0,$t5 /* f169884: 44822000 */ mtc1 $v0,$f4 /* f169888: 44908000 */ mtc1 $s0,$f16 @@ -1065,15 +1065,15 @@ glabel var7f1b8770jf /* f1698c4: 316c0fff */ andi $t4,$t3,0xfff /* f1698c8: 000c6b00 */ sll $t5,$t4,0xc /* f1698cc: 032d7025 */ or $t6,$t9,$t5 -/* f1698d0: 0c002f0b */ jal 0xbc2c +/* f1698d0: 0c002f0b */ jal viGetViewWidth /* f1698d4: ae2e0000 */ sw $t6,0x0($s1) -/* f1698d8: 0c002f29 */ jal 0xbca4 +/* f1698d8: 0c002f29 */ jal viGetViewLeft /* f1698dc: a7a2008e */ sh $v0,0x8e($sp) -/* f1698e0: 0c002f2d */ jal 0xbcb4 +/* f1698e0: 0c002f2d */ jal viGetViewTop /* f1698e4: a7a20090 */ sh $v0,0x90($sp) /* f1698e8: 00028400 */ sll $s0,$v0,0x10 /* f1698ec: 00107c03 */ sra $t7,$s0,0x10 -/* f1698f0: 0c002f0f */ jal 0xbc3c +/* f1698f0: 0c002f0f */ jal viGetViewHeight /* f1698f4: 01e08025 */ move $s0,$t7 /* f1698f8: 87b80090 */ lh $t8,0x90($sp) /* f1698fc: 87aa008e */ lh $t2,0x8e($sp) @@ -1095,9 +1095,9 @@ glabel var7f1b8770jf /* f16993c: 000d7300 */ sll $t6,$t5,0xc /* f169940: 314b0fff */ andi $t3,$t2,0xfff /* f169944: 016e6025 */ or $t4,$t3,$t6 -/* f169948: 0fc07020 */ jal 0xf01c080 +/* f169948: 0fc07020 */ jal titleRender /* f16994c: ae2c0004 */ sw $t4,0x4($s1) -/* f169950: 0fc5a27a */ jal 0xf1689e8 +/* f169950: 0fc5a27a */ jal lvRenderFade /* f169954: 00402025 */ move $a0,$v0 /* f169958: 100005e0 */ b .JF0f16b0dc /* f16995c: 00409825 */ move $s3,$v0 @@ -1145,29 +1145,29 @@ glabel var7f1b8770jf /* f1699fc: ac4b0004 */ sw $t3,0x4($v0) /* f169a00: ac490000 */ sw $t1,0x0($v0) /* f169a04: 26730008 */ addiu $s3,$s3,0x8 -/* f169a08: 0fc4a34d */ jal 0xf128d34 +/* f169a08: 0fc4a34d */ jal setCurrentPlayerNum /* f169a0c: 00002025 */ move $a0,$zero /* f169a10: 8e500284 */ lw $s0,0x284($s2) /* f169a14: 86040634 */ lh $a0,0x634($s0) -/* f169a18: 0c002f13 */ jal 0xbc4c +/* f169a18: 0c002f13 */ jal viSetViewPosition /* f169a1c: 86050636 */ lh $a1,0x636($s0) /* f169a20: 8e500284 */ lw $s0,0x284($s2) /* f169a24: c60c1854 */ lwc1 $f12,0x1854($s0) /* f169a28: c60e1858 */ lwc1 $f14,0x1858($s0) /* f169a2c: 86060630 */ lh $a2,0x630($s0) -/* f169a30: 0c002f5f */ jal 0xbd7c +/* f169a30: 0c002f5f */ jal viSetFovAspectAndSize /* f169a34: 86070632 */ lh $a3,0x632($s0) /* f169a38: 3c013f80 */ lui $at,0x3f80 /* f169a3c: 44816000 */ mtc1 $at,$f12 -/* f169a40: 0c0059ba */ jal 0x166e8 +/* f169a40: 0c0059ba */ jal mtx00016748 /* f169a44: 00000000 */ nop -/* f169a48: 0c002c5d */ jal 0xb174 +/* f169a48: 0c002c5d */ jal vi0000b1d0 /* f169a4c: 02602025 */ move $a0,$s3 -/* f169a50: 0c002cb5 */ jal 0xb2d4 +/* f169a50: 0c002cb5 */ jal viRenderViewportEdges /* f169a54: 00402025 */ move $a0,$v0 -/* f169a58: 0fc573e1 */ jal 0xf15cf84 +/* f169a58: 0fc573e1 */ jal currentPlayerScissorToViewport /* f169a5c: 00402025 */ move $a0,$v0 -/* f169a60: 0fc3f249 */ jal 0xf0fc924 +/* f169a60: 0fc3f249 */ jal menuRender /* f169a64: 00402025 */ move $a0,$v0 /* f169a68: 1000059c */ b .JF0f16b0dc /* f169a6c: 00409825 */ move $s3,$v0 @@ -1213,63 +1213,63 @@ glabel var7f1b8770jf /* f169b08: ac580004 */ sw $t8,0x4($v0) /* f169b0c: ac490000 */ sw $t1,0x0($v0) /* f169b10: 26730008 */ addiu $s3,$s3,0x8 -/* f169b14: 0fc4a34d */ jal 0xf128d34 +/* f169b14: 0fc4a34d */ jal setCurrentPlayerNum /* f169b18: 00002025 */ move $a0,$zero -/* f169b1c: 0c002a95 */ jal 0xaa54 +/* f169b1c: 0c002a95 */ jal viSetMode /* f169b20: 24040001 */ li $a0,0x1 /* f169b24: 8e500284 */ lw $s0,0x284($s2) /* f169b28: 86040634 */ lh $a0,0x634($s0) -/* f169b2c: 0c002f13 */ jal 0xbc4c +/* f169b2c: 0c002f13 */ jal viSetViewPosition /* f169b30: 86050636 */ lh $a1,0x636($s0) -/* f169b34: 0fc2f53a */ jal 0xf0bd4e8 +/* f169b34: 0fc2f53a */ jal playerGetFbWidth /* f169b38: 00000000 */ nop -/* f169b3c: 0fc2f545 */ jal 0xf0bd514 +/* f169b3c: 0fc2f545 */ jal playerGetFbHeight /* f169b40: a7a20090 */ sh $v0,0x90($sp) /* f169b44: 00022c00 */ sll $a1,$v0,0x10 /* f169b48: 00055403 */ sra $t2,$a1,0x10 /* f169b4c: 01402825 */ move $a1,$t2 -/* f169b50: 0c002ee2 */ jal 0xbb88 +/* f169b50: 0c002ee2 */ jal viSetSize /* f169b54: 87a40090 */ lh $a0,0x90($sp) -/* f169b58: 0fc2f53a */ jal 0xf0bd4e8 +/* f169b58: 0fc2f53a */ jal playerGetFbWidth /* f169b5c: 00000000 */ nop -/* f169b60: 0fc2f545 */ jal 0xf0bd514 +/* f169b60: 0fc2f545 */ jal playerGetFbHeight /* f169b64: a7a20090 */ sh $v0,0x90($sp) /* f169b68: 00022c00 */ sll $a1,$v0,0x10 /* f169b6c: 00055c03 */ sra $t3,$a1,0x10 /* f169b70: 01602825 */ move $a1,$t3 -/* f169b74: 0c002ed1 */ jal 0xbb44 +/* f169b74: 0c002ed1 */ jal viSetBufSize /* f169b78: 87a40090 */ lh $a0,0x90($sp) -/* f169b7c: 0fc2f53a */ jal 0xf0bd4e8 +/* f169b7c: 0fc2f53a */ jal playerGetFbWidth /* f169b80: 00000000 */ nop -/* f169b84: 0fc2f545 */ jal 0xf0bd514 +/* f169b84: 0fc2f545 */ jal playerGetFbHeight /* f169b88: a7a20090 */ sh $v0,0x90($sp) /* f169b8c: 00022c00 */ sll $a1,$v0,0x10 /* f169b90: 00057403 */ sra $t6,$a1,0x10 /* f169b94: 01c02825 */ move $a1,$t6 -/* f169b98: 0c002ef3 */ jal 0xbbcc +/* f169b98: 0c002ef3 */ jal viSetViewSize /* f169b9c: 87a40090 */ lh $a0,0x90($sp) /* f169ba0: 8e500284 */ lw $s0,0x284($s2) /* f169ba4: c60c1854 */ lwc1 $f12,0x1854($s0) /* f169ba8: c60e1858 */ lwc1 $f14,0x1858($s0) /* f169bac: 86060630 */ lh $a2,0x630($s0) -/* f169bb0: 0c002f5f */ jal 0xbd7c +/* f169bb0: 0c002f5f */ jal viSetFovAspectAndSize /* f169bb4: 86070632 */ lh $a3,0x632($s0) /* f169bb8: 3c013f80 */ lui $at,0x3f80 /* f169bbc: 44816000 */ mtc1 $at,$f12 -/* f169bc0: 0c0059ba */ jal 0x166e8 +/* f169bc0: 0c0059ba */ jal mtx00016748 /* f169bc4: 00000000 */ nop -/* f169bc8: 0c002c5d */ jal 0xb174 +/* f169bc8: 0c002c5d */ jal vi0000b1d0 /* f169bcc: 02602025 */ move $a0,$s3 -/* f169bd0: 0fc573e1 */ jal 0xf15cf84 +/* f169bd0: 0fc573e1 */ jal currentPlayerScissorToViewport /* f169bd4: 00402025 */ move $a0,$v0 -/* f169bd8: 0fc3f249 */ jal 0xf0fc924 +/* f169bd8: 0fc3f249 */ jal menuRender /* f169bdc: 00402025 */ move $a0,$v0 /* f169be0: 8e4c0284 */ lw $t4,0x284($s2) /* f169be4: 00409825 */ move $s3,$v0 /* f169be8: 8d991a24 */ lw $t9,0x1a24($t4) /* f169bec: 5320053c */ beqzl $t9,.JF0f16b0e0 /* f169bf0: 824d04d3 */ lb $t5,0x4d3($s2) -/* f169bf4: 0fc2ef7b */ jal 0xf0bbdec +/* f169bf4: 0fc2ef7b */ jal playerTickPauseMenu /* f169bf8: 00000000 */ nop /* f169bfc: 10000538 */ b .JF0f16b0e0 /* f169c00: 824d04d3 */ lb $t5,0x4d3($s2) @@ -1315,29 +1315,29 @@ glabel var7f1b8770jf /* f169c9c: ac4e0004 */ sw $t6,0x4($v0) /* f169ca0: ac490000 */ sw $t1,0x0($v0) /* f169ca4: 26730008 */ addiu $s3,$s3,0x8 -/* f169ca8: 0fc4a34d */ jal 0xf128d34 +/* f169ca8: 0fc4a34d */ jal setCurrentPlayerNum /* f169cac: 00002025 */ move $a0,$zero /* f169cb0: 8e500284 */ lw $s0,0x284($s2) /* f169cb4: 86040634 */ lh $a0,0x634($s0) -/* f169cb8: 0c002f13 */ jal 0xbc4c +/* f169cb8: 0c002f13 */ jal viSetViewPosition /* f169cbc: 86050636 */ lh $a1,0x636($s0) /* f169cc0: 8e500284 */ lw $s0,0x284($s2) /* f169cc4: c60c1854 */ lwc1 $f12,0x1854($s0) /* f169cc8: c60e1858 */ lwc1 $f14,0x1858($s0) /* f169ccc: 86060630 */ lh $a2,0x630($s0) -/* f169cd0: 0c002f5f */ jal 0xbd7c +/* f169cd0: 0c002f5f */ jal viSetFovAspectAndSize /* f169cd4: 86070632 */ lh $a3,0x632($s0) /* f169cd8: 3c013f80 */ lui $at,0x3f80 /* f169cdc: 44816000 */ mtc1 $at,$f12 -/* f169ce0: 0c0059ba */ jal 0x166e8 +/* f169ce0: 0c0059ba */ jal mtx00016748 /* f169ce4: 00000000 */ nop -/* f169ce8: 0c002c53 */ jal 0xb14c +/* f169ce8: 0c002c53 */ jal vi0000b1a8 /* f169cec: 02602025 */ move $a0,$s3 -/* f169cf0: 0c002c5d */ jal 0xb174 +/* f169cf0: 0c002c5d */ jal vi0000b1d0 /* f169cf4: 00402025 */ move $a0,$v0 -/* f169cf8: 0c002cb5 */ jal 0xb2d4 +/* f169cf8: 0c002cb5 */ jal viRenderViewportEdges /* f169cfc: 00402025 */ move $a0,$v0 -/* f169d00: 0fc4ed14 */ jal 0xf13b450 +/* f169d00: 0fc4ed14 */ jal creditsRender /* f169d04: 00402025 */ move $a0,$v0 /* f169d08: 100004f4 */ b .JF0f16b0dc /* f169d0c: 00409825 */ move $s3,$v0 @@ -1351,7 +1351,7 @@ glabel var7f1b8770jf /* f169d28: 12000004 */ beqz $s0,.JF0f169d3c /* f169d2c: 00000000 */ nop .JF0f169d30: -/* f169d30: 0fc2f557 */ jal 0xf0bd55c +/* f169d30: 0fc2f557 */ jal playerHasSharedViewport /* f169d34: 00000000 */ nop /* f169d38: 0002802b */ sltu $s0,$zero,$v0 .JF0f169d3c: @@ -1437,16 +1437,16 @@ glabel var7f1b8770jf /* f169e5c: afb30108 */ sw $s3,0x108($sp) /* f169e60: 11800007 */ beqz $t4,.JF0f169e80 /* f169e64: 00002025 */ move $a0,$zero -/* f169e68: 0fc4a34d */ jal 0xf128d34 +/* f169e68: 0fc4a34d */ jal setCurrentPlayerNum /* f169e6c: 24110001 */ li $s1,0x1 /* f169e70: 26190001 */ addiu $t9,$s0,0x1 /* f169e74: ae400290 */ sw $zero,0x290($s2) /* f169e78: 1000000a */ b .JF0f169ea4 /* f169e7c: afb90064 */ sw $t9,0x64($sp) .JF0f169e80: -/* f169e80: 0fc4a4b4 */ jal 0xf1292d0 +/* f169e80: 0fc4a4b4 */ jal playermgrGetPlayerAtOrder /* f169e84: 02002025 */ move $a0,$s0 -/* f169e88: 0fc4a34d */ jal 0xf128d34 +/* f169e88: 0fc4a34d */ jal setCurrentPlayerNum /* f169e8c: 00402025 */ move $a0,$v0 /* f169e90: 8fad010c */ lw $t5,0x10c($sp) /* f169e94: 26020001 */ addiu $v0,$s0,0x1 @@ -1501,14 +1501,14 @@ glabel var7f1b8770jf /* f169f4c: a44002d8 */ sh $zero,0x2d8($v0) /* f169f50: a04002ff */ sb $zero,0x2ff($v0) .JF0f169f54: -/* f169f54: 0fc523ca */ jal 0xf148f28 +/* f169f54: 0fc523ca */ jal bviewSetBlur /* f169f58: 02802025 */ move $a0,$s4 /* f169f5c: 02601025 */ move $v0,$s3 /* f169f60: 3c0e0600 */ lui $t6,0x600 /* f169f64: ac4e0000 */ sw $t6,0x0($v0) /* f169f68: 8fac006c */ lw $t4,0x6c($sp) /* f169f6c: 26730008 */ addiu $s3,$s3,0x8 -/* f169f70: 0fc47c8a */ jal 0xf11f228 +/* f169f70: 0fc47c8a */ jal debugIsZBufferDisabled /* f169f74: ac4c0004 */ sw $t4,0x4($v0) /* f169f78: 10400009 */ beqz $v0,.JF0f169fa0 /* f169f7c: 3c0f0600 */ lui $t7,0x600 @@ -1530,28 +1530,28 @@ glabel var7f1b8770jf .JF0f169fb8: /* f169fb8: 8e500284 */ lw $s0,0x284($s2) /* f169fbc: 86040634 */ lh $a0,0x634($s0) -/* f169fc0: 0c002f13 */ jal 0xbc4c +/* f169fc0: 0c002f13 */ jal viSetViewPosition /* f169fc4: 86050636 */ lh $a1,0x636($s0) /* f169fc8: 8e500284 */ lw $s0,0x284($s2) /* f169fcc: c60c1854 */ lwc1 $f12,0x1854($s0) /* f169fd0: c60e1858 */ lwc1 $f14,0x1858($s0) /* f169fd4: 86060630 */ lh $a2,0x630($s0) -/* f169fd8: 0c002f5f */ jal 0xbd7c +/* f169fd8: 0c002f5f */ jal viSetFovAspectAndSize /* f169fdc: 86070632 */ lh $a3,0x632($s0) /* f169fe0: 8e4a0288 */ lw $t2,0x288($s2) -/* f169fe4: 0c0059ba */ jal 0x166e8 +/* f169fe4: 0c0059ba */ jal mtx00016748 /* f169fe8: c54c0074 */ lwc1 $f12,0x74($t2) -/* f169fec: 0fc59702 */ jal 0xf165c08 +/* f169fec: 0fc59702 */ jal env0f1657f8 /* f169ff0: 00000000 */ nop -/* f169ff4: 0fc5d9ba */ jal 0xf1766e8 +/* f169ff4: 0fc5d9ba */ jal func0f176298 /* f169ff8: 00000000 */ nop -/* f169ffc: 0c002c89 */ jal 0xb224 +/* f169ffc: 0c002c89 */ jal vi0000b280 /* f16a000: 02602025 */ move $a0,$s3 -/* f16a004: 0c002c5d */ jal 0xb174 +/* f16a004: 0c002c5d */ jal vi0000b1d0 /* f16a008: 00402025 */ move $a0,$v0 -/* f16a00c: 0fc573e1 */ jal 0xf15cf84 +/* f16a00c: 0fc573e1 */ jal currentPlayerScissorToViewport /* f16a010: 00402025 */ move $a0,$v0 -/* f16a014: 0fc4f244 */ jal 0xf13c910 +/* f16a014: 0fc4f244 */ jal func0f13c510 /* f16a018: 00409825 */ move $s3,$v0 /* f16a01c: 8e4b04b4 */ lw $t3,0x4b4($s2) /* f16a020: 24010026 */ li $at,0x26 @@ -1608,7 +1608,7 @@ glabel var7f1b8770jf /* f16a0e0: 8dade6c0 */ lw $t5,-0x1940($t5) /* f16a0e4: 55a0000b */ bnezl $t5,.JF0f16a114 /* f16a0e8: 8e4c0320 */ lw $t4,0x320($s2) -/* f16a0ec: 0fc27e82 */ jal 0xf09fa08 +/* f16a0ec: 0fc27e82 */ jal bgun0f09eae4 /* f16a0f0: 00000000 */ nop /* f16a0f4: 8e500284 */ lw $s0,0x284($s2) /* f16a0f8: 00027840 */ sll $t7,$v0,0x1 @@ -1624,7 +1624,7 @@ glabel var7f1b8770jf /* f16a118: 2405ffff */ li $a1,-1 /* f16a11c: 11800008 */ beqz $t4,.JF0f16a140 /* f16a120: 3c0f800a */ lui $t7,0x800a -/* f16a124: 0fc50a0e */ jal 0xf142838 +/* f16a124: 0fc50a0e */ jal bviewRenderMotionBlur /* f16a128: 240600ff */ li $a2,0xff /* f16a12c: 8e4d0320 */ lw $t5,0x320($s2) /* f16a130: 00409825 */ move $s3,$v0 @@ -1636,20 +1636,20 @@ glabel var7f1b8770jf /* f16a144: 3c0e8007 */ lui $t6,0x8007 /* f16a148: 11e00012 */ beqz $t7,.JF0f16a194 /* f16a14c: 00000000 */ nop -/* f16a150: 0c002cb5 */ jal 0xb2d4 +/* f16a150: 0c002cb5 */ jal viRenderViewportEdges /* f16a154: 02602025 */ move $a0,$s3 -/* f16a158: 0fc573e1 */ jal 0xf15cf84 +/* f16a158: 0fc573e1 */ jal currentPlayerScissorToViewport /* f16a15c: 00402025 */ move $a0,$v0 /* f16a160: 3c013f80 */ lui $at,0x3f80 /* f16a164: 44816000 */ mtc1 $at,$f12 -/* f16a168: 0c0059ba */ jal 0x166e8 +/* f16a168: 0c0059ba */ jal mtx00016748 /* f16a16c: 00409825 */ move $s3,$v0 /* f16a170: 8e4a0284 */ lw $t2,0x284($s2) /* f16a174: 8d581c50 */ lw $t8,0x1c50($t2) /* f16a178: 00185fc2 */ srl $t3,$t8,0x1f /* f16a17c: 116003c3 */ beqz $t3,.JF0f16b08c /* f16a180: 00000000 */ nop -/* f16a184: 0fc3f249 */ jal 0xf0fc924 +/* f16a184: 0fc3f249 */ jal menuRender /* f16a188: 02602025 */ move $a0,$s3 /* f16a18c: 100003bf */ b .JF0f16b08c /* f16a190: 00409825 */ move $s3,$v0 @@ -1658,27 +1658,27 @@ glabel var7f1b8770jf /* f16a198: 24010002 */ li $at,0x2 /* f16a19c: 15c10004 */ bne $t6,$at,.JF0f16a1b0 /* f16a1a0: 00000000 */ nop -/* f16a1a4: 0fc30421 */ jal 0xf0c1084 +/* f16a1a4: 0fc30421 */ jal playerUpdateShootRot /* f16a1a8: 02602025 */ move $a0,$s3 /* f16a1ac: 00409825 */ move $s3,$v0 .JF0f16a1b0: -/* f16a1b0: 0c002cb5 */ jal 0xb2d4 +/* f16a1b0: 0c002cb5 */ jal viRenderViewportEdges /* f16a1b4: 02602025 */ move $a0,$s3 -/* f16a1b8: 0fc47f61 */ jal 0xf11fd84 +/* f16a1b8: 0fc47f61 */ jal func0f11f984 /* f16a1bc: 00402025 */ move $a0,$v0 -/* f16a1c0: 0fc57384 */ jal 0xf15ce10 +/* f16a1c0: 0fc57384 */ jal bgTick /* f16a1c4: 00409825 */ move $s3,$v0 -/* f16a1c8: 0fc010e9 */ jal 0xf0043a4 +/* f16a1c8: 0fc010e9 */ jal func0f004314 /* f16a1cc: 00000000 */ nop -/* f16a1d0: 0fc19053 */ jal 0xf06414c +/* f16a1d0: 0fc19053 */ jal propsTick /* f16a1d4: 02202025 */ move $a0,$s1 -/* f16a1d8: 0fc61780 */ jal 0xf185e00 +/* f16a1d8: 0fc61780 */ jal scenarioTickChr /* f16a1dc: 00002025 */ move $a0,$zero -/* f16a1e0: 0fc184b4 */ jal 0xf0612d0 +/* f16a1e0: 0fc184b4 */ jal propsSort /* f16a1e4: 00000000 */ nop -/* f16a1e8: 0fc19782 */ jal 0xf065e08 +/* f16a1e8: 0fc19782 */ jal autoaimTick /* f16a1ec: 00000000 */ nop -/* f16a1f0: 0fc18f13 */ jal 0xf063c4c +/* f16a1f0: 0fc18f13 */ jal handsTickAttack /* f16a1f4: 00000000 */ nop /* f16a1f8: 8e4c006c */ lw $t4,0x6c($s2) /* f16a1fc: 00002025 */ move $a0,$zero @@ -1718,20 +1718,20 @@ glabel var7f1b8770jf /* f16a274: 8e4c029c */ lw $t4,0x29c($s2) /* f16a278: 0583000c */ bgezl $t4,.JF0f16a2ac /* f16a27c: 00002025 */ move $a0,$zero -/* f16a280: 0fc28a44 */ jal 0xf0a2910 +/* f16a280: 0fc28a44 */ jal bgunGetWeaponNum /* f16a284: 00002025 */ move $a0,$zero /* f16a288: 00402025 */ move $a0,$v0 -/* f16a28c: 0fc2ca10 */ jal 0xf0b2840 +/* f16a28c: 0fc2ca10 */ jal weaponHasFlag /* f16a290: 3c054000 */ lui $a1,0x4000 /* f16a294: 50400050 */ beqzl $v0,.JF0f16a3d8 /* f16a298: 8e4c0284 */ lw $t4,0x284($s2) -/* f16a29c: 0fc322ec */ jal 0xf0c8bb0 +/* f16a29c: 0fc322ec */ jal bmoveIsInSightAimMode /* f16a2a0: 00000000 */ nop /* f16a2a4: 1040004b */ beqz $v0,.JF0f16a3d4 /* f16a2a8: 00002025 */ move $a0,$zero .JF0f16a2ac: /* f16a2ac: 00002825 */ move $a1,$zero -/* f16a2b0: 0fc18b9d */ jal 0xf062e74 +/* f16a2b0: 0fc18b9d */ jal func0f061d54 /* f16a2b4: 00003025 */ move $a2,$zero /* f16a2b8: 8e4d0284 */ lw $t5,0x284($s2) /* f16a2bc: ada21624 */ sw $v0,0x1624($t5) @@ -1820,23 +1820,23 @@ glabel var7f1b8770jf .JF0f16a3e0: /* f16a3e0: 26040638 */ addiu $a0,$s0,0x638 .JF0f16a3e4: -/* f16a3e4: 0fc2cbcb */ jal 0xf0b2f2c +/* f16a3e4: 0fc2cbcb */ jal gsetHasFunctionFlags /* f16a3e8: 3c050008 */ lui $a1,0x8 /* f16a3ec: 10400005 */ beqz $v0,.JF0f16a404 /* f16a3f0: 00000000 */ nop -/* f16a3f4: 0fc5a574 */ jal 0xf1695d0 +/* f16a3f4: 0fc5a574 */ jal lvFindThreats /* f16a3f8: 00000000 */ nop /* f16a3fc: 10000033 */ b .JF0f16a4cc /* f16a400: 8e500284 */ lw $s0,0x284($s2) .JF0f16a404: -/* f16a404: 0fc28a44 */ jal 0xf0a2910 +/* f16a404: 0fc28a44 */ jal bgunGetWeaponNum /* f16a408: 00002025 */ move $a0,$zero /* f16a40c: 00402025 */ move $a0,$v0 -/* f16a410: 0fc2ca10 */ jal 0xf0b2840 +/* f16a410: 0fc2ca10 */ jal weaponHasFlag /* f16a414: 3c054000 */ lui $a1,0x4000 /* f16a418: 5040002c */ beqzl $v0,.JF0f16a4cc /* f16a41c: 8e500284 */ lw $s0,0x284($s2) -/* f16a420: 0fc68567 */ jal 0xf1a159c +/* f16a420: 0fc68567 */ jal frIsInTraining /* f16a424: 00000000 */ nop /* f16a428: 5040000f */ beqzl $v0,.JF0f16a468 /* f16a42c: 8e440284 */ lw $a0,0x284($s2) @@ -1844,19 +1844,19 @@ glabel var7f1b8770jf /* f16a434: 8dcd1624 */ lw $t5,0x1624($t6) /* f16a438: 51a0000b */ beqzl $t5,.JF0f16a468 /* f16a43c: 8e440284 */ lw $a0,0x284($s2) -/* f16a440: 0fc322ec */ jal 0xf0c8bb0 +/* f16a440: 0fc322ec */ jal bmoveIsInSightAimMode /* f16a444: 00000000 */ nop /* f16a448: 50400007 */ beqzl $v0,.JF0f16a468 /* f16a44c: 8e440284 */ lw $a0,0x284($s2) /* f16a450: 8e590284 */ lw $t9,0x284($s2) -/* f16a454: 0fc684a4 */ jal 0xf1a1290 +/* f16a454: 0fc684a4 */ jal func0f1a0924 /* f16a458: 8f241624 */ lw $a0,0x1624($t9) /* f16a45c: 1000000a */ b .JF0f16a488 /* f16a460: 00008825 */ move $s1,$zero /* f16a464: 8e440284 */ lw $a0,0x284($s2) .JF0f16a468: /* f16a468: 02e02825 */ move $a1,$s7 -/* f16a46c: 0fc5a343 */ jal 0xf168d0c +/* f16a46c: 0fc5a343 */ jal lvCheckCmpFollowThreat /* f16a470: 24841624 */ addiu $a0,$a0,0x1624 /* f16a474: 54400004 */ bnezl $v0,.JF0f16a488 /* f16a478: 00008825 */ move $s1,$zero @@ -1869,7 +1869,7 @@ glabel var7f1b8770jf /* f16a48c: 8e4a0284 */ lw $t2,0x284($s2) /* f16a490: 02202825 */ move $a1,$s1 /* f16a494: 01502021 */ addu $a0,$t2,$s0 -/* f16a498: 0fc5a343 */ jal 0xf168d0c +/* f16a498: 0fc5a343 */ jal lvCheckCmpFollowThreat /* f16a49c: 24841630 */ addiu $a0,$a0,0x1630 /* f16a4a0: 14400007 */ bnez $v0,.JF0f16a4c0 /* f16a4a4: 26310001 */ addiu $s1,$s1,0x1 @@ -1902,7 +1902,7 @@ glabel var7f1b8770jf /* f16a508: 14600010 */ bnez $v1,.JF0f16a54c /* f16a50c: 00000000 */ nop /* f16a510: 44816000 */ mtc1 $at,$f12 -/* f16a514: 0fc25b8a */ jal 0xf096e28 +/* f16a514: 0fc25b8a */ jal objectiveCheckHolograph /* f16a518: 00000000 */ nop /* f16a51c: 3c048009 */ lui $a0,0x8009 /* f16a520: 8c845870 */ lw $a0,0x5870($a0) @@ -1912,7 +1912,7 @@ glabel var7f1b8770jf /* f16a530: afb70010 */ sw $s7,0x10($sp) /* f16a534: e7b40014 */ swc1 $f20,0x14($sp) /* f16a538: afb70018 */ sw $s7,0x18($sp) -/* f16a53c: 0c004230 */ jal 0x108c0 +/* f16a53c: 0c004230 */ jal sndStart /* f16a540: afb7001c */ sw $s7,0x1c($sp) /* f16a544: 10000053 */ b .JF0f16a694 /* f16a548: 8e500284 */ lw $s0,0x284($s2) @@ -1932,7 +1932,7 @@ glabel var7f1b8770jf /* f16a57c: afb70010 */ sw $s7,0x10($sp) /* f16a580: e7b40014 */ swc1 $f20,0x14($sp) /* f16a584: afb70018 */ sw $s7,0x18($sp) -/* f16a588: 0c004230 */ jal 0x108c0 +/* f16a588: 0c004230 */ jal sndStart /* f16a58c: afb7001c */ sw $s7,0x1c($sp) /* f16a590: 8e500284 */ lw $s0,0x284($s2) /* f16a594: 240b001c */ li $t3,0x1c @@ -1955,7 +1955,7 @@ glabel var7f1b8770jf /* f16a5d8: 8f040000 */ lw $a0,0x0($t8) /* f16a5dc: afa00014 */ sw $zero,0x14($sp) /* f16a5e0: afab0010 */ sw $t3,0x10($sp) -/* f16a5e4: 0fc24818 */ jal 0xf092060 +/* f16a5e4: 0fc24818 */ jal projectileCreate /* f16a5e8: 24860008 */ addiu $a2,$a0,0x8 /* f16a5ec: 10000008 */ b .JF0f16a610 /* f16a5f0: 00000000 */ nop @@ -1965,7 +1965,7 @@ glabel var7f1b8770jf /* f16a5fc: afb70010 */ sw $s7,0x10($sp) /* f16a600: e7b40014 */ swc1 $f20,0x14($sp) /* f16a604: afb70018 */ sw $s7,0x18($sp) -/* f16a608: 0c004230 */ jal 0x108c0 +/* f16a608: 0c004230 */ jal sndStart /* f16a60c: afb7001c */ sw $s7,0x1c($sp) .JF0f16a610: /* f16a610: 10000020 */ b .JF0f16a694 @@ -1987,7 +1987,7 @@ glabel var7f1b8770jf /* f16a64c: 8f040000 */ lw $a0,0x0($t8) /* f16a650: afa00010 */ sw $zero,0x10($sp) /* f16a654: 24850008 */ addiu $a1,$a0,0x8 -/* f16a658: 0fc4a740 */ jal 0xf129d00 +/* f16a658: 0fc4a740 */ jal explosionCreateSimple /* f16a65c: 24860028 */ addiu $a2,$a0,0x28 /* f16a660: 8e4b0284 */ lw $t3,0x284($s2) /* f16a664: 27ac00b0 */ addiu $t4,$sp,0xb0 @@ -1999,7 +1999,7 @@ glabel var7f1b8770jf /* f16a67c: 8f240004 */ lw $a0,0x4($t9) /* f16a680: afa00018 */ sw $zero,0x18($sp) /* f16a684: afa00014 */ sw $zero,0x14($sp) -/* f16a688: 0fc0caea */ jal 0xf032ba8 +/* f16a688: 0fc0caea */ jal chrBeginDeath /* f16a68c: afac0010 */ sw $t4,0x10($sp) /* f16a690: 8e500284 */ lw $s0,0x284($s2) .JF0f16a694: @@ -2007,13 +2007,13 @@ glabel var7f1b8770jf .JF0f16a698: /* f16a698: 51c0000c */ beqzl $t6,.JF0f16a6cc /* f16a69c: 8e020480 */ lw $v0,0x480($s0) -/* f16a6a0: 0fc18fe5 */ jal 0xf063f94 +/* f16a6a0: 0fc18fe5 */ jal currentPlayerInteract /* f16a6a4: 00002025 */ move $a0,$zero /* f16a6a8: 10400012 */ beqz $v0,.JF0f16a6f4 /* f16a6ac: 00000000 */ nop -/* f16a6b0: 0fc28c60 */ jal 0xf0a3180 +/* f16a6b0: 0fc28c60 */ jal bgunReloadIfPossible /* f16a6b4: 00002025 */ move $a0,$zero -/* f16a6b8: 0fc28c60 */ jal 0xf0a3180 +/* f16a6b8: 0fc28c60 */ jal bgunReloadIfPossible /* f16a6bc: 03c02025 */ move $a0,$s8 /* f16a6c0: 1000000c */ b .JF0f16a6f4 /* f16a6c4: 00000000 */ nop @@ -2027,12 +2027,12 @@ glabel var7f1b8770jf /* f16a6e0: 904a006a */ lbu $t2,0x6a($v0) /* f16a6e4: 11400003 */ beqz $t2,.JF0f16a6f4 /* f16a6e8: 00000000 */ nop -/* f16a6ec: 0fc18fe5 */ jal 0xf063f94 +/* f16a6ec: 0fc18fe5 */ jal currentPlayerInteract /* f16a6f0: 03c02025 */ move $a0,$s8 .JF0f16a6f4: -/* f16a6f4: 0fc194c5 */ jal 0xf065314 +/* f16a6f4: 0fc194c5 */ jal func0f0641f4 /* f16a6f8: 00000000 */ nop -/* f16a6fc: 0fc573bc */ jal 0xf15cef0 +/* f16a6fc: 0fc573bc */ jal bgRender /* f16a700: 02602025 */ move $a0,$s3 /* f16a704: 3c108007 */ lui $s0,0x8007 /* f16a708: 8e106358 */ lw $s0,0x6358($s0) @@ -2046,22 +2046,22 @@ glabel var7f1b8770jf /* f16a728: 0010582b */ sltu $t3,$zero,$s0 /* f16a72c: 01608025 */ move $s0,$t3 .JF0f16a730: -/* f16a730: 0fc0a598 */ jal 0xf029660 +/* f16a730: 0fc0a598 */ jal chr0f028498 /* f16a734: 02002025 */ move $a0,$s0 -/* f16a738: 0fc201e2 */ jal 0xf080788 +/* f16a738: 0fc201e2 */ jal propsRenderBeams /* f16a73c: 02602025 */ move $a0,$s3 -/* f16a740: 0fc54741 */ jal 0xf151d04 +/* f16a740: 0fc54741 */ jal shardsRender /* f16a744: 00402025 */ move $a0,$v0 -/* f16a748: 0fc4c111 */ jal 0xf130444 +/* f16a748: 0fc4c111 */ jal sparksRender /* f16a74c: 00402025 */ move $a0,$v0 -/* f16a750: 0fc4c518 */ jal 0xf131460 +/* f16a750: 0fc4c518 */ jal weatherRender /* f16a754: 00402025 */ move $a0,$v0 /* f16a758: 3c0d8006 */ lui $t5,0x8006 /* f16a75c: 8dad1520 */ lw $t5,0x1520($t5) /* f16a760: 00409825 */ move $s3,$v0 /* f16a764: 11a00004 */ beqz $t5,.JF0f16a778 /* f16a768: 00000000 */ nop -/* f16a76c: 0fc0287c */ jal 0xf00a1f0 +/* f16a76c: 0fc0287c */ jal nbombsRender /* f16a770: 00402025 */ move $a0,$v0 /* f16a774: 00409825 */ move $s3,$v0 .JF0f16a778: @@ -2070,19 +2070,19 @@ glabel var7f1b8770jf /* f16a780: 24010002 */ li $at,0x2 /* f16a784: 17210005 */ bne $t9,$at,.JF0f16a79c /* f16a788: 00000000 */ nop -/* f16a78c: 0fc30620 */ jal 0xf0c1880 +/* f16a78c: 0fc30620 */ jal playerRenderHud /* f16a790: 02602025 */ move $a0,$s3 /* f16a794: 1000000b */ b .JF0f16a7c4 /* f16a798: 00409825 */ move $s3,$v0 .JF0f16a79c: -/* f16a79c: 0fc2bfd6 */ jal 0xf0aff58 +/* f16a79c: 0fc2bfd6 */ jal func0f0aeed8 /* f16a7a0: 02602025 */ move $a0,$s3 /* f16a7a4: 8e4c0284 */ lw $t4,0x284($s2) /* f16a7a8: 00409825 */ move $s3,$v0 /* f16a7ac: 958e0010 */ lhu $t6,0x10($t4) /* f16a7b0: 13ce0004 */ beq $s8,$t6,.JF0f16a7c4 /* f16a7b4: 00000000 */ nop -/* f16a7b8: 0fc56d49 */ jal 0xf15b524 +/* f16a7b8: 0fc56d49 */ jal func0f15b114 /* f16a7bc: 00402025 */ move $a0,$v0 /* f16a7c0: 00409825 */ move $s3,$v0 .JF0f16a7c4: @@ -2112,7 +2112,7 @@ glabel var7f1b8770jf /* f16a820: 28410583 */ slti $at,$v0,0x583 /* f16a824: 1020005e */ beqz $at,.JF0f16a9a0 /* f16a828: 00000000 */ nop -/* f16a82c: 0fc52083 */ jal 0xf14820c +/* f16a82c: 0fc52083 */ jal bviewRenderHorizonScanner /* f16a830: 02602025 */ move $a0,$s3 /* f16a834: 1000005a */ b .JF0f16a9a0 /* f16a838: 00409825 */ move $s3,$v0 @@ -2130,7 +2130,7 @@ glabel var7f1b8770jf /* f16a864: afb70010 */ sw $s7,0x10($sp) /* f16a868: e7b40014 */ swc1 $f20,0x14($sp) /* f16a86c: afb70018 */ sw $s7,0x18($sp) -/* f16a870: 0c004230 */ jal 0x108c0 +/* f16a870: 0c004230 */ jal sndStart /* f16a874: afb7001c */ sw $s7,0x1c($sp) .JF0f16a878: /* f16a878: 3c188008 */ lui $t8,0x8008 @@ -2140,7 +2140,7 @@ glabel var7f1b8770jf /* f16a888: 030b6823 */ subu $t5,$t8,$t3 /* f16a88c: 05a1000b */ bgez $t5,.JF0f16a8bc /* f16a890: ac2d46ec */ sw $t5,0x46ec($at) -/* f16a894: 0c004b60 */ jal 0x12d80 +/* f16a894: 0c004b60 */ jal random /* f16a898: 00000000 */ nop /* f16a89c: 240100c8 */ li $at,0xc8 /* f16a8a0: 0041001b */ divu $zero,$v0,$at @@ -2153,7 +2153,7 @@ glabel var7f1b8770jf .JF0f16a8bc: /* f16a8bc: 02602025 */ move $a0,$s3 /* f16a8c0: 2405ffff */ li $a1,-1 -/* f16a8c4: 0fc50b63 */ jal 0xf142d8c +/* f16a8c4: 0fc50b63 */ jal bviewRenderFilmLens /* f16a8c8: 2406ffff */ li $a2,-1 /* f16a8cc: 3c0e8008 */ lui $t6,0x8008 /* f16a8d0: 8dce46ec */ lw $t6,0x46ec($t6) @@ -2175,7 +2175,7 @@ glabel var7f1b8770jf /* f16a910: afb70010 */ sw $s7,0x10($sp) /* f16a914: e7b40014 */ swc1 $f20,0x14($sp) /* f16a918: afb70018 */ sw $s7,0x18($sp) -/* f16a91c: 0c004230 */ jal 0x108c0 +/* f16a91c: 0c004230 */ jal sndStart /* f16a920: afb7001c */ sw $s7,0x1c($sp) .JF0f16a924: /* f16a924: 3c188008 */ lui $t8,0x8008 @@ -2186,7 +2186,7 @@ glabel var7f1b8770jf /* f16a938: 000b5840 */ sll $t3,$t3,0x1 /* f16a93c: 01ab8023 */ subu $s0,$t5,$t3 .JF0f16a940: -/* f16a940: 0c004b60 */ jal 0x12d80 +/* f16a940: 0c004b60 */ jal random /* f16a944: 00000000 */ nop /* f16a948: 2401003c */ li $at,0x3c /* f16a94c: 0041001b */ divu $zero,$v0,$at @@ -2202,13 +2202,13 @@ glabel var7f1b8770jf /* f16a974: afb70010 */ sw $s7,0x10($sp) /* f16a978: e7b40014 */ swc1 $f20,0x14($sp) /* f16a97c: afb70018 */ sw $s7,0x18($sp) -/* f16a980: 0c004230 */ jal 0x108c0 +/* f16a980: 0c004230 */ jal sndStart /* f16a984: afb7001c */ sw $s7,0x1c($sp) .JF0f16a988: /* f16a988: 12000005 */ beqz $s0,.JF0f16a9a0 /* f16a98c: 02602025 */ move $a0,$s3 /* f16a990: 2405ffff */ li $a1,-1 -/* f16a994: 0fc50a91 */ jal 0xf142a44 +/* f16a994: 0fc50a91 */ jal bviewRenderStatic /* f16a998: 02003025 */ move $a2,$s0 /* f16a99c: 00409825 */ move $s3,$v0 .JF0f16a9a0: @@ -2218,7 +2218,7 @@ glabel var7f1b8770jf /* f16a9ac: 8e500284 */ lw $s0,0x284($s2) /* f16a9b0: 56200004 */ bnezl $s1,.JF0f16a9c4 /* f16a9b4: 8e500284 */ lw $s0,0x284($s2) -/* f16a9b8: 0c00cd8d */ jal 0x33634 +/* f16a9b8: 0c00cd8d */ jal audioStop /* f16a9bc: 00000000 */ nop /* f16a9c0: 8e500284 */ lw $s0,0x284($s2) .JF0f16a9c4: @@ -2231,7 +2231,7 @@ glabel var7f1b8770jf /* f16a9dc: 02602025 */ move $a0,$s3 /* f16a9e0: 11c10016 */ beq $t6,$at,.JF0f16aa3c /* f16a9e4: 2405ffff */ li $a1,-1 -/* f16a9e8: 0fc50add */ jal 0xf142b74 +/* f16a9e8: 0fc50add */ jal bviewRenderSlayerRocketLens /* f16a9ec: 2406ffff */ li $a2,-1 /* f16a9f0: 8e500284 */ lw $s0,0x284($s2) /* f16a9f4: 00409825 */ move $s3,$v0 @@ -2249,7 +2249,7 @@ glabel var7f1b8770jf /* f16aa24: 00000000 */ nop /* f16aa28: 240600ff */ li $a2,0xff .JF0f16aa2c: -/* f16aa2c: 0fc50a91 */ jal 0xf142a44 +/* f16aa2c: 0fc50a91 */ jal bviewRenderStatic /* f16aa30: 34a5ffff */ ori $a1,$a1,0xffff /* f16aa34: 00409825 */ move $s3,$v0 /* f16aa38: 8e500284 */ lw $s0,0x284($s2) @@ -2261,7 +2261,7 @@ glabel var7f1b8770jf /* f16aa48: 14610009 */ bne $v1,$at,.JF0f16aa70 /* f16aa4c: 3c054fff */ lui $a1,0x4fff /* f16aa50: 34a5ffff */ ori $a1,$a1,0xffff -/* f16aa54: 0fc50a91 */ jal 0xf142a44 +/* f16aa54: 0fc50a91 */ jal bviewRenderStatic /* f16aa58: 240600ff */ li $a2,0xff /* f16aa5c: 8e4a0284 */ lw $t2,0x284($s2) /* f16aa60: 00409825 */ move $s3,$v0 @@ -2290,7 +2290,7 @@ glabel var7f1b8770jf /* f16aab4: 02602025 */ move $a0,$s3 /* f16aab8: 2405ffff */ li $a1,-1 /* f16aabc: 44070000 */ mfc1 $a3,$f0 -/* f16aac0: 0fc50bfc */ jal 0xf142ff0 +/* f16aac0: 0fc50bfc */ jal bviewRenderZoomBlur /* f16aac4: e7a00010 */ swc1 $f0,0x10($sp) /* f16aac8: 00409825 */ move $s3,$v0 /* f16aacc: 8e430460 */ lw $v1,0x460($s2) @@ -2318,7 +2318,7 @@ glabel var7f1b8770jf /* f16ab14: 8e4f0464 */ lw $t7,0x464($s2) /* f16ab18: 55e00015 */ bnezl $t7,.JF0f16ab70 /* f16ab1c: 2861000f */ slti $at,$v1,0xf -/* f16ab20: 0fc5ae7b */ jal 0xf16b9ec +/* f16ab20: 0fc5ae7b */ jal lvGetSlowMotionType /* f16ab24: 00000000 */ nop /* f16ab28: 10400003 */ beqz $v0,.JF0f16ab38 /* f16ab2c: 3c048009 */ lui $a0,0x8009 @@ -2336,7 +2336,7 @@ glabel var7f1b8770jf /* f16ab54: afb70010 */ sw $s7,0x10($sp) /* f16ab58: e7b40014 */ swc1 $f20,0x14($sp) /* f16ab5c: afb70018 */ sw $s7,0x18($sp) -/* f16ab60: 0c004230 */ jal 0x108c0 +/* f16ab60: 0c004230 */ jal sndStart /* f16ab64: afb7001c */ sw $s7,0x1c($sp) /* f16ab68: 8e430460 */ lw $v1,0x460($s2) /* f16ab6c: 2861000f */ slti $at,$v1,0xf @@ -2364,7 +2364,7 @@ glabel var7f1b8770jf /* f16abc0: 460a4402 */ mul.s $f16,$f8,$f10 /* f16abc4: 46128000 */ add.s $f0,$f16,$f18 /* f16abc8: 44070000 */ mfc1 $a3,$f0 -/* f16abcc: 0fc50bfc */ jal 0xf142ff0 +/* f16abcc: 0fc50bfc */ jal bviewRenderZoomBlur /* f16abd0: e7a00010 */ swc1 $f0,0x10($sp) /* f16abd4: 8e4d0460 */ lw $t5,0x460($s2) /* f16abd8: 3c017f1c */ lui $at,0x7f1c @@ -2376,7 +2376,7 @@ glabel var7f1b8770jf /* f16abf0: 240600ff */ li $a2,0xff /* f16abf4: 240700ff */ li $a3,0xff /* f16abf8: 46083282 */ mul.s $f10,$f6,$f8 -/* f16abfc: 0fc2f033 */ jal 0xf0bc0cc +/* f16abfc: 0fc2f033 */ jal playerDrawFade /* f16ac00: e7aa0010 */ swc1 $f10,0x10($sp) /* f16ac04: 10000029 */ b .JF0f16acac /* f16ac08: 00409825 */ move $s3,$v0 @@ -2403,7 +2403,7 @@ glabel var7f1b8770jf /* f16ac58: 46049182 */ mul.s $f6,$f18,$f4 /* f16ac5c: 46083000 */ add.s $f0,$f6,$f8 /* f16ac60: 44070000 */ mfc1 $a3,$f0 -/* f16ac64: 0fc50bfc */ jal 0xf142ff0 +/* f16ac64: 0fc50bfc */ jal bviewRenderZoomBlur /* f16ac68: e7a00010 */ swc1 $f0,0x10($sp) /* f16ac6c: 8e4c0460 */ lw $t4,0x460($s2) /* f16ac70: 3c0141f0 */ lui $at,0x41f0 @@ -2418,7 +2418,7 @@ glabel var7f1b8770jf /* f16ac94: 240700ff */ li $a3,0xff /* f16ac98: 46125101 */ sub.s $f4,$f10,$f18 /* f16ac9c: 46062202 */ mul.s $f8,$f4,$f6 -/* f16aca0: 0fc2f033 */ jal 0xf0bc0cc +/* f16aca0: 0fc2f033 */ jal playerDrawFade /* f16aca4: e7a80010 */ swc1 $f8,0x10($sp) /* f16aca8: 00409825 */ move $s3,$v0 .JF0f16acac: @@ -2461,11 +2461,11 @@ glabel var7f1b8770jf .JF0f16ad24: /* f16ad24: 52800009 */ beqzl $s4,.JF0f16ad4c /* f16ad28: 8e4c02ac */ lw $t4,0x2ac($s2) -/* f16ad2c: 0fc523d5 */ jal 0xf148f54 +/* f16ad2c: 0fc523d5 */ jal bviewClearBlur /* f16ad30: 00000000 */ nop /* f16ad34: 02602025 */ move $a0,$s3 /* f16ad38: 2405ffff */ li $a1,-1 -/* f16ad3c: 0fc50a0e */ jal 0xf142838 +/* f16ad3c: 0fc50a0e */ jal bviewRenderMotionBlur /* f16ad40: 02803025 */ move $a2,$s4 /* f16ad44: 00409825 */ move $s3,$v0 /* f16ad48: 8e4c02ac */ lw $t4,0x2ac($s2) @@ -2473,7 +2473,7 @@ glabel var7f1b8770jf /* f16ad4c: 24010006 */ li $at,0x6 /* f16ad50: 15810031 */ bne $t4,$at,.JF0f16ae18 /* f16ad54: 00000000 */ nop -/* f16ad58: 0fc2ee2e */ jal 0xf0bb8b8 +/* f16ad58: 0fc2ee2e */ jal playerGetCutsceneBlurFrac /* f16ad5c: 00000000 */ nop /* f16ad60: 44808000 */ mtc1 $zero,$f16 /* f16ad64: 3c01437f */ lui $at,0x437f @@ -2521,38 +2521,38 @@ glabel var7f1b8770jf /* f16ae04: 00000000 */ nop .JF0f16ae08: /* f16ae08: 44cef800 */ ctc1 $t6,$31 -/* f16ae0c: 0fc50a0e */ jal 0xf142838 +/* f16ae0c: 0fc50a0e */ jal bviewRenderMotionBlur /* f16ae10: 00000000 */ nop /* f16ae14: 00409825 */ move $s3,$v0 .JF0f16ae18: -/* f16ae18: 0fc47cb6 */ jal 0xf11f2d8 +/* f16ae18: 0fc47cb6 */ jal debugGetMotionBlur /* f16ae1c: 00000000 */ nop /* f16ae20: 145e0006 */ bne $v0,$s8,.JF0f16ae3c /* f16ae24: 02602025 */ move $a0,$s3 /* f16ae28: 2405ff00 */ li $a1,-256 -/* f16ae2c: 0fc50a0e */ jal 0xf142838 +/* f16ae2c: 0fc50a0e */ jal bviewRenderMotionBlur /* f16ae30: 24060080 */ li $a2,0x80 /* f16ae34: 10000014 */ b .JF0f16ae88 /* f16ae38: 00409825 */ move $s3,$v0 .JF0f16ae3c: -/* f16ae3c: 0fc47cb6 */ jal 0xf11f2d8 +/* f16ae3c: 0fc47cb6 */ jal debugGetMotionBlur /* f16ae40: 00000000 */ nop /* f16ae44: 24010002 */ li $at,0x2 /* f16ae48: 14410006 */ bne $v0,$at,.JF0f16ae64 /* f16ae4c: 02602025 */ move $a0,$s3 /* f16ae50: 2405ff00 */ li $a1,-256 -/* f16ae54: 0fc50a0e */ jal 0xf142838 +/* f16ae54: 0fc50a0e */ jal bviewRenderMotionBlur /* f16ae58: 240600c0 */ li $a2,0xc0 /* f16ae5c: 1000000a */ b .JF0f16ae88 /* f16ae60: 00409825 */ move $s3,$v0 .JF0f16ae64: -/* f16ae64: 0fc47cb6 */ jal 0xf11f2d8 +/* f16ae64: 0fc47cb6 */ jal debugGetMotionBlur /* f16ae68: 00000000 */ nop /* f16ae6c: 24010003 */ li $at,0x3 /* f16ae70: 14410005 */ bne $v0,$at,.JF0f16ae88 /* f16ae74: 02602025 */ move $a0,$s3 /* f16ae78: 2405ff00 */ li $a1,-256 -/* f16ae7c: 0fc50a0e */ jal 0xf142838 +/* f16ae7c: 0fc50a0e */ jal bviewRenderMotionBlur /* f16ae80: 240600e6 */ li $a2,0xe6 /* f16ae84: 00409825 */ move $s3,$v0 .JF0f16ae88: @@ -2592,21 +2592,21 @@ glabel var7f1b8770jf .JF0f16af00: /* f16af00: 12200021 */ beqz $s1,.JF0f16af88 /* f16af04: 00000000 */ nop -/* f16af08: 0fc54b55 */ jal 0xf152d54 +/* f16af08: 0fc54b55 */ jal func0f153628 /* f16af0c: 02602025 */ move $a0,$s3 -/* f16af10: 0c002f29 */ jal 0xbca4 +/* f16af10: 0c002f29 */ jal viGetViewLeft /* f16af14: 00409825 */ move $s3,$v0 -/* f16af18: 0c002f2d */ jal 0xbcb4 +/* f16af18: 0c002f2d */ jal viGetViewTop /* f16af1c: a7a20072 */ sh $v0,0x72($sp) /* f16af20: 00028400 */ sll $s0,$v0,0x10 /* f16af24: 00105403 */ sra $t2,$s0,0x10 -/* f16af28: 0c002f29 */ jal 0xbca4 +/* f16af28: 0c002f29 */ jal viGetViewLeft /* f16af2c: 01408025 */ move $s0,$t2 -/* f16af30: 0c002f0b */ jal 0xbc2c +/* f16af30: 0c002f0b */ jal viGetViewWidth /* f16af34: a7a20076 */ sh $v0,0x76($sp) -/* f16af38: 0c002f2d */ jal 0xbcb4 +/* f16af38: 0c002f2d */ jal viGetViewTop /* f16af3c: a7a2008e */ sh $v0,0x8e($sp) -/* f16af40: 0c002f0f */ jal 0xbc3c +/* f16af40: 0c002f0f */ jal viGetViewHeight /* f16af44: a7a20090 */ sh $v0,0x90($sp) /* f16af48: 87b90090 */ lh $t9,0x90($sp) /* f16af4c: 87b8008e */ lh $t8,0x8e($sp) @@ -2619,72 +2619,72 @@ glabel var7f1b8770jf /* f16af68: 02602025 */ move $a0,$s3 /* f16af6c: 87a50072 */ lh $a1,0x72($sp) /* f16af70: 02003025 */ move $a2,$s0 -/* f16af74: 0fc54c68 */ jal 0xf1531a0 +/* f16af74: 0fc54c68 */ jal func0f153a34 /* f16af78: 030d3821 */ addu $a3,$t8,$t5 -/* f16af7c: 0fc54bb7 */ jal 0xf152edc +/* f16af7c: 0fc54bb7 */ jal func0f153780 /* f16af80: 00402025 */ move $a0,$v0 /* f16af84: 00409825 */ move $s3,$v0 .JF0f16af88: -/* f16af88: 0fc61795 */ jal 0xf185e54 +/* f16af88: 0fc61795 */ jal scenarioRenderHud /* f16af8c: 02602025 */ move $a0,$s3 -/* f16af90: 0fc5a27a */ jal 0xf1689e8 +/* f16af90: 0fc5a27a */ jal lvRenderFade /* f16af94: 00402025 */ move $a0,$v0 /* f16af98: 3c0e8009 */ lui $t6,0x8009 /* f16af9c: 91ce8e74 */ lbu $t6,-0x718c($t6) /* f16afa0: 00409825 */ move $s3,$v0 /* f16afa4: 11c00004 */ beqz $t6,.JF0f16afb8 /* f16afa8: 00000000 */ nop -/* f16afac: 0fc68e8b */ jal 0xf1a3a2c +/* f16afac: 0fc68e8b */ jal frRenderHud /* f16afb0: 00402025 */ move $a0,$v0 /* f16afb4: 00409825 */ move $s3,$v0 .JF0f16afb8: -/* f16afb8: 0fc47ca2 */ jal 0xf11f288 +/* f16afb8: 0fc47ca2 */ jal debugGetTilesDebugMode /* f16afbc: 00000000 */ nop /* f16afc0: 14400013 */ bnez $v0,.JF0f16b010 /* f16afc4: 00000000 */ nop -/* f16afc8: 0fc47ca4 */ jal 0xf11f290 +/* f16afc8: 0fc47ca4 */ jal debugGetPadsDebugMode /* f16afcc: 00000000 */ nop /* f16afd0: 1440000f */ bnez $v0,.JF0f16b010 /* f16afd4: 00000000 */ nop -/* f16afd8: 0fc47caa */ jal 0xf11f2a8 +/* f16afd8: 0fc47caa */ jal debug0f11eea8 /* f16afdc: 00000000 */ nop /* f16afe0: 1440000b */ bnez $v0,.JF0f16b010 /* f16afe4: 00000000 */ nop -/* f16afe8: 0fc47ce0 */ jal 0xf11f380 +/* f16afe8: 0fc47ce0 */ jal debug0f11ef80 /* f16afec: 00000000 */ nop /* f16aff0: 14400007 */ bnez $v0,.JF0f16b010 /* f16aff4: 00000000 */ nop -/* f16aff8: 0fc47cde */ jal 0xf11f378 +/* f16aff8: 0fc47cde */ jal debugIsChrStatsEnabled /* f16affc: 00000000 */ nop /* f16b000: 14400003 */ bnez $v0,.JF0f16b010 /* f16b004: 00000000 */ nop -/* f16b008: 0fc47c90 */ jal 0xf11f240 +/* f16b008: 0fc47c90 */ jal debug0f11ee40 /* f16b00c: 00000000 */ nop .JF0f16b010: -/* f16b010: 0fc49e36 */ jal 0xf1278d8 +/* f16b010: 0fc49e36 */ jal func0f1274d8 /* f16b014: 02602025 */ move $a0,$s3 -/* f16b018: 0fc40547 */ jal 0xf10151c +/* f16b018: 0fc40547 */ jal amRender /* f16b01c: 00402025 */ move $a0,$v0 /* f16b020: 3c013f80 */ lui $at,0x3f80 /* f16b024: 44816000 */ mtc1 $at,$f12 -/* f16b028: 0c0059ba */ jal 0x166e8 +/* f16b028: 0c0059ba */ jal mtx00016748 /* f16b02c: 00409825 */ move $s3,$v0 /* f16b030: 8e4f0284 */ lw $t7,0x284($s2) /* f16b034: 8dea1c50 */ lw $t2,0x1c50($t7) /* f16b038: 000ac7c2 */ srl $t8,$t2,0x1f /* f16b03c: 53000005 */ beqzl $t8,.JF0f16b054 /* f16b040: 8e4d0288 */ lw $t5,0x288($s2) -/* f16b044: 0fc3f249 */ jal 0xf0fc924 +/* f16b044: 0fc3f249 */ jal menuRender /* f16b048: 02602025 */ move $a0,$s3 /* f16b04c: 00409825 */ move $s3,$v0 /* f16b050: 8e4d0288 */ lw $t5,0x288($s2) .JF0f16b054: -/* f16b054: 0c0059ba */ jal 0x166e8 +/* f16b054: 0c0059ba */ jal mtx00016748 /* f16b058: c5ac0074 */ lwc1 $f12,0x74($t5) /* f16b05c: 8e590314 */ lw $t9,0x314($s2) /* f16b060: 53200005 */ beqzl $t9,.JF0f16b078 /* f16b064: 8e4b0284 */ lw $t3,0x284($s2) -/* f16b068: 0fc627dc */ jal 0xf189f70 +/* f16b068: 0fc627dc */ jal mpRenderModalText /* f16b06c: 02602025 */ move $a0,$s3 /* f16b070: 00409825 */ move $s3,$v0 /* f16b074: 8e4b0284 */ lw $t3,0x284($s2) @@ -2692,10 +2692,10 @@ glabel var7f1b8770jf /* f16b078: 916c19b3 */ lbu $t4,0x19b3($t3) /* f16b07c: 11800003 */ beqz $t4,.JF0f16b08c /* f16b080: 00000000 */ nop -/* f16b084: 0fc2e0d7 */ jal 0xf0b835c +/* f16b084: 0fc2e0d7 */ jal playerStartNewLife /* f16b088: 00000000 */ nop .JF0f16b08c: -/* f16b08c: 0fc4f253 */ jal 0xf13c94c +/* f16b08c: 0fc4f253 */ jal func0f13c54c /* f16b090: 00000000 */ nop /* f16b094: 8e4e0298 */ lw $t6,0x298($s2) /* f16b098: 05c10004 */ bgez $t6,.JF0f16b0ac @@ -2704,7 +2704,7 @@ glabel var7f1b8770jf /* f16b0a4: 05e2000a */ bltzl $t7,.JF0f16b0d0 /* f16b0a8: 8fb00064 */ lw $s0,0x64($sp) .JF0f16b0ac: -/* f16b0ac: 0fc2f557 */ jal 0xf0bd55c +/* f16b0ac: 0fc2f557 */ jal playerHasSharedViewport /* f16b0b0: 00000000 */ nop /* f16b0b4: 50400006 */ beqzl $v0,.JF0f16b0d0 /* f16b0b8: 8fb00064 */ lw $s0,0x64($sp) @@ -2741,7 +2741,7 @@ glabel var7f1b8770jf /* f16b124: 824e04d5 */ lb $t6,0x4d5($s2) /* f16b128: 5dc00004 */ bgtzl $t6,.JF0f16b13c /* f16b12c: 824f04d3 */ lb $t7,0x4d3($s2) -/* f16b130: 0c003a3f */ jal 0xe8fc +/* f16b130: 0c003a3f */ jal mainChangeToStage /* f16b134: 2404005a */ li $a0,0x5a .JF0f16b138: /* f16b138: 824f04d3 */ lb $t7,0x4d3($s2) @@ -2754,7 +2754,7 @@ glabel var7f1b8770jf /* f16b150: 825804d5 */ lb $t8,0x4d5($s2) /* f16b154: 5b00003c */ blezl $t8,.JF0f16b248 /* f16b158: 02608825 */ move $s1,$s3 -/* f16b15c: 0fc37bed */ jal 0xf0defb4 +/* f16b15c: 0fc37bed */ jal hudmsgRemoveAll /* f16b160: 00000000 */ nop /* f16b164: 824d04d4 */ lb $t5,0x4d4($s2) /* f16b168: 2414000c */ li $s4,0xc @@ -2777,14 +2777,14 @@ glabel var7f1b8770jf /* f16b1ac: ae570298 */ sw $s7,0x298($s2) /* f16b1b0: ae57029c */ sw $s7,0x29c($s2) /* f16b1b4: a2180003 */ sb $t8,0x3($s0) -/* f16b1b8: 0fc06c4c */ jal 0xf01b130 +/* f16b1b8: 0fc06c4c */ jal setNumPlayers /* f16b1bc: a24c04d2 */ sb $t4,0x4d2($s2) -/* f16b1c0: 0fc06e49 */ jal 0xf01b924 +/* f16b1c0: 0fc06e49 */ jal titleSetNextMode /* f16b1c4: 24040005 */ li $a0,0x5 /* f16b1c8: 920d0000 */ lbu $t5,0x0($s0) /* f16b1cc: 00002025 */ move $a0,$zero /* f16b1d0: 31b9ff01 */ andi $t9,$t5,0xff01 -/* f16b1d4: 0fc5b3d2 */ jal 0xf16cf48 +/* f16b1d4: 0fc5b3d2 */ jal lvSetDifficulty /* f16b1d8: a2190000 */ sb $t9,0x0($s0) /* f16b1dc: 824b04d4 */ lb $t3,0x4d4($s2) /* f16b1e0: 01740019 */ multu $t3,$s4 @@ -2793,13 +2793,13 @@ glabel var7f1b8770jf /* f16b1ec: 844e0002 */ lh $t6,0x2($v0) /* f16b1f0: 84440000 */ lh $a0,0x0($v0) /* f16b1f4: a20e0002 */ sb $t6,0x2($s0) -/* f16b1f8: 0fc070bd */ jal 0xf01c2f4 +/* f16b1f8: 0fc070bd */ jal titleSetNextStage /* f16b1fc: a2040001 */ sb $a0,0x1($s0) /* f16b200: 824f04d4 */ lb $t7,0x4d4($s2) /* f16b204: 01f40019 */ multu $t7,$s4 /* f16b208: 00005012 */ mflo $t2 /* f16b20c: 022ac021 */ addu $t8,$s1,$t2 -/* f16b210: 0c003a3f */ jal 0xe8fc +/* f16b210: 0c003a3f */ jal mainChangeToStage /* f16b214: 87040000 */ lh $a0,0x0($t8) /* f16b218: 824d04d5 */ lb $t5,0x4d5($s2) /* f16b21c: 25b9ffff */ addiu $t9,$t5,-1 @@ -2817,11 +2817,11 @@ glabel var7f1b8770jf .JF0f16b248: /* f16b248: 3c0fed00 */ lui $t7,0xed00 /* f16b24c: ae2f0000 */ sw $t7,0x0($s1) -/* f16b250: 0c002eeb */ jal 0xbbac +/* f16b250: 0c002eeb */ jal viGetWidth /* f16b254: 26730008 */ addiu $s3,$s3,0x8 /* f16b258: 00028400 */ sll $s0,$v0,0x10 /* f16b25c: 00105403 */ sra $t2,$s0,0x10 -/* f16b260: 0c002eef */ jal 0xbbbc +/* f16b260: 0c002eef */ jal viGetHeight /* f16b264: 01408025 */ move $s0,$t2 /* f16b268: 44823000 */ mtc1 $v0,$f6 /* f16b26c: 44909000 */ mtc1 $s0,$f18 @@ -3937,9 +3937,9 @@ glabel var7f1b878cjf /* f16b6d0: 3c014000 */ lui $at,0x4000 /* f16b6d4: 04630021 */ bgezl $v1,.JF0f16b75c /* f16b6d8: 3c014000 */ lui $at,0x4000 -/* f16b6dc: 0fc30c93 */ jal 0xf0c324c +/* f16b6dc: 0fc30c93 */ jal playerGetHealthFrac /* f16b6e0: e7ae0020 */ swc1 $f14,0x20($sp) -/* f16b6e4: 0fc30c97 */ jal 0xf0c325c +/* f16b6e4: 0fc30c97 */ jal playerGetShieldFrac /* f16b6e8: e7a0001c */ swc1 $f0,0x1c($sp) /* f16b6ec: c7a8001c */ lwc1 $f8,0x1c($sp) /* f16b6f0: 3c013e00 */ lui $at,0x3e00 diff --git a/src/game/menu.c b/src/game/menu.c index 0ab5b6543..b6ada362b 100644 --- a/src/game/menu.c +++ b/src/game/menu.c @@ -297,7 +297,7 @@ glabel menuRenderBanner /* f0f1abc: afa20040 */ sw $v0,0x40($sp) /* f0f1ac0: afb90084 */ sw $t9,0x84($sp) /* f0f1ac4: afa30064 */ sw $v1,0x64($sp) -/* f0f1ac8: 0fc5baa5 */ jal 0xf16ea94 +/* f0f1ac8: 0fc5baa5 */ jal langGet /* f0f1acc: afa80060 */ sw $t0,0x60($sp) /* f0f1ad0: 8fac0060 */ lw $t4,0x60($sp) /* f0f1ad4: 27a4007c */ addiu $a0,$sp,0x7c @@ -305,9 +305,9 @@ glabel menuRenderBanner /* f0f1adc: 00403025 */ move $a2,$v0 /* f0f1ae0: 8fa70064 */ lw $a3,0x64($sp) /* f0f1ae4: afa00014 */ sw $zero,0x14($sp) -/* f0f1ae8: 0fc55d49 */ jal 0xf157524 +/* f0f1ae8: 0fc55d49 */ jal textMeasure /* f0f1aec: afac0010 */ sw $t4,0x10($sp) -/* f0f1af0: 0fc5baa5 */ jal 0xf16ea94 +/* f0f1af0: 0fc5baa5 */ jal langGet /* f0f1af4: 240451ef */ li $a0,0x51ef /* f0f1af8: 8fad0060 */ lw $t5,0x60($sp) /* f0f1afc: 27a40074 */ addiu $a0,$sp,0x74 @@ -315,7 +315,7 @@ glabel menuRenderBanner /* f0f1b04: 00403025 */ move $a2,$v0 /* f0f1b08: 8fa70064 */ lw $a3,0x64($sp) /* f0f1b0c: afa00014 */ sw $zero,0x14($sp) -/* f0f1b10: 0fc55d49 */ jal 0xf157524 +/* f0f1b10: 0fc55d49 */ jal textMeasure /* f0f1b14: afad0010 */ sw $t5,0x10($sp) /* f0f1b18: 8fa2007c */ lw $v0,0x7c($sp) /* f0f1b1c: 8fa30074 */ lw $v1,0x74($sp) @@ -336,7 +336,7 @@ glabel menuRenderBanner /* f0f1b54: afb8006c */ sw $t8,0x6c($sp) /* f0f1b58: afaa0068 */ sw $t2,0x68($sp) /* f0f1b5c: afa60084 */ sw $a2,0x84($sp) -/* f0f1b60: 0fc54bce */ jal 0xf152f38 +/* f0f1b60: 0fc54bce */ jal gfxSetPrimColour /* f0f1b64: 2405007f */ li $a1,0x7f /* f0f1b68: 3c038008 */ lui $v1,0x8008 /* f0f1b6c: 246300f4 */ addiu $v1,$v1,0xf4 @@ -364,11 +364,11 @@ glabel menuRenderBanner /* f0f1bc4: 31cf03ff */ andi $t7,$t6,0x3ff /* f0f1bc8: 000fcb80 */ sll $t9,$t7,0xe /* f0f1bcc: 032a5825 */ or $t3,$t9,$t2 -/* f0f1bd0: 0fc54be5 */ jal 0xf152f94 +/* f0f1bd0: 0fc54be5 */ jal func0f153838 /* f0f1bd4: ac4b0004 */ sw $t3,0x4($v0) /* f0f1bd8: 3c10f600 */ lui $s0,0xf600 /* f0f1bdc: 00402025 */ move $a0,$v0 -/* f0f1be0: 0fc54bce */ jal 0xf152f38 +/* f0f1be0: 0fc54bce */ jal gfxSetPrimColour /* f0f1be4: 24057f7f */ li $a1,0x7f7f /* f0f1be8: 3c038008 */ lui $v1,0x8008 /* f0f1bec: 246300f4 */ addiu $v1,$v1,0xf4 @@ -395,11 +395,11 @@ glabel menuRenderBanner /* f0f1c40: 31e903ff */ andi $t1,$t7,0x3ff /* f0f1c44: 0009cb80 */ sll $t9,$t1,0xe /* f0f1c48: 032b6025 */ or $t4,$t9,$t3 -/* f0f1c4c: 0fc54be5 */ jal 0xf152f94 +/* f0f1c4c: 0fc54be5 */ jal func0f153838 /* f0f1c50: ac4c0004 */ sw $t4,0x4($v0) /* f0f1c54: 3c057f7f */ lui $a1,0x7f7f /* f0f1c58: 34a5ff7f */ ori $a1,$a1,0xff7f -/* f0f1c5c: 0fc54bce */ jal 0xf152f38 +/* f0f1c5c: 0fc54bce */ jal gfxSetPrimColour /* f0f1c60: 00402025 */ move $a0,$v0 /* f0f1c64: 3c038008 */ lui $v1,0x8008 /* f0f1c68: 246300f4 */ addiu $v1,$v1,0xf4 @@ -453,9 +453,9 @@ glabel menuRenderBanner /* f0f1d28: 330b03ff */ andi $t3,$t8,0x3ff /* f0f1d2c: 000b7380 */ sll $t6,$t3,0xe /* f0f1d30: 01cac825 */ or $t9,$t6,$t2 -/* f0f1d34: 0fc54be5 */ jal 0xf152f94 +/* f0f1d34: 0fc54be5 */ jal func0f153838 /* f0f1d38: ac59000c */ sw $t9,0xc($v0) -/* f0f1d3c: 0fc54b55 */ jal 0xf152d54 +/* f0f1d3c: 0fc54b55 */ jal func0f153628 /* f0f1d40: 00402025 */ move $a0,$v0 /* f0f1d44: 8fac0094 */ lw $t4,0x94($sp) /* f0f1d48: 8fb800ac */ lw $t8,0xac($sp) @@ -485,11 +485,11 @@ glabel menuRenderBanner /* f0f1da0: 24c60002 */ addiu $a2,$a2,0x2 /* f0f1da4: 95640000 */ lhu $a0,0x0($t3) /* f0f1da8: afa60084 */ sw $a2,0x84($sp) -/* f0f1dac: 0fc5baa5 */ jal 0xf16ea94 +/* f0f1dac: 0fc5baa5 */ jal langGet /* f0f1db0: afa30044 */ sw $v1,0x44($sp) -/* f0f1db4: 0c002eeb */ jal 0xbbac +/* f0f1db4: 0c002eeb */ jal viGetWidth /* f0f1db8: afa2004c */ sw $v0,0x4c($sp) -/* f0f1dbc: 0c002eeb */ jal 0xbbac +/* f0f1dbc: 0c002eeb */ jal viGetWidth /* f0f1dc0: a7a20048 */ sh $v0,0x48($sp) /* f0f1dc4: 8faf0064 */ lw $t7,0x64($sp) /* f0f1dc8: 8fad0060 */ lw $t5,0x60($sp) @@ -505,7 +505,7 @@ glabel menuRenderBanner /* f0f1df0: afa00028 */ sw $zero,0x28($sp) /* f0f1df4: afaf0010 */ sw $t7,0x10($sp) /* f0f1df8: afad0014 */ sw $t5,0x14($sp) -/* f0f1dfc: 0fc55886 */ jal 0xf156218 +/* f0f1dfc: 0fc55886 */ jal textRenderProjected /* f0f1e00: afae001c */ sw $t6,0x1c($sp) /* f0f1e04: 8fb90070 */ lw $t9,0x70($sp) /* f0f1e08: 8faa0044 */ lw $t2,0x44($sp) @@ -521,11 +521,11 @@ glabel menuRenderBanner /* f0f1e2c: 24c60003 */ addiu $a2,$a2,0x3 /* f0f1e30: afab0088 */ sw $t3,0x88($sp) /* f0f1e34: afa60084 */ sw $a2,0x84($sp) -/* f0f1e38: 0fc5baa5 */ jal 0xf16ea94 +/* f0f1e38: 0fc5baa5 */ jal langGet /* f0f1e3c: 240451ef */ li $a0,0x51ef -/* f0f1e40: 0c002eeb */ jal 0xbbac +/* f0f1e40: 0c002eeb */ jal viGetWidth /* f0f1e44: afa2004c */ sw $v0,0x4c($sp) -/* f0f1e48: 0c002eeb */ jal 0xbbac +/* f0f1e48: 0c002eeb */ jal viGetWidth /* f0f1e4c: a7a20048 */ sh $v0,0x48($sp) /* f0f1e50: 8faf0064 */ lw $t7,0x64($sp) /* f0f1e54: 8fad0060 */ lw $t5,0x60($sp) @@ -541,7 +541,7 @@ glabel menuRenderBanner /* f0f1e7c: afa00028 */ sw $zero,0x28($sp) /* f0f1e80: afaf0010 */ sw $t7,0x10($sp) /* f0f1e84: afad0014 */ sw $t5,0x14($sp) -/* f0f1e88: 0fc55886 */ jal 0xf156218 +/* f0f1e88: 0fc55886 */ jal textRenderProjected /* f0f1e8c: afae001c */ sw $t6,0x1c($sp) /* f0f1e90: 8faa0078 */ lw $t2,0x78($sp) /* f0f1e94: 8fb90044 */ lw $t9,0x44($sp) @@ -556,11 +556,11 @@ glabel menuRenderBanner /* f0f1eb4: 032cc023 */ subu $t8,$t9,$t4 /* f0f1eb8: afb80088 */ sw $t8,0x88($sp) /* f0f1ebc: 95640000 */ lhu $a0,0x0($t3) -/* f0f1ec0: 0fc5baa5 */ jal 0xf16ea94 +/* f0f1ec0: 0fc5baa5 */ jal langGet /* f0f1ec4: afa60084 */ sw $a2,0x84($sp) -/* f0f1ec8: 0c002eeb */ jal 0xbbac +/* f0f1ec8: 0c002eeb */ jal viGetWidth /* f0f1ecc: afa2004c */ sw $v0,0x4c($sp) -/* f0f1ed0: 0c002eeb */ jal 0xbbac +/* f0f1ed0: 0c002eeb */ jal viGetWidth /* f0f1ed4: a7a20048 */ sh $v0,0x48($sp) /* f0f1ed8: 8faf0064 */ lw $t7,0x64($sp) /* f0f1edc: 8fad0060 */ lw $t5,0x60($sp) @@ -577,7 +577,7 @@ glabel menuRenderBanner /* f0f1f08: afa00028 */ sw $zero,0x28($sp) /* f0f1f0c: afaf0010 */ sw $t7,0x10($sp) /* f0f1f10: afad0014 */ sw $t5,0x14($sp) -/* f0f1f14: 0fc55886 */ jal 0xf156218 +/* f0f1f14: 0fc55886 */ jal textRenderProjected /* f0f1f18: afae001c */ sw $t6,0x1c($sp) /* f0f1f1c: 8fb90070 */ lw $t9,0x70($sp) /* f0f1f20: 8fa60084 */ lw $a2,0x84($sp) @@ -592,11 +592,11 @@ glabel menuRenderBanner /* f0f1f40: 014cc023 */ subu $t8,$t2,$t4 /* f0f1f44: afb80088 */ sw $t8,0x88($sp) /* f0f1f48: afa60084 */ sw $a2,0x84($sp) -/* f0f1f4c: 0fc5baa5 */ jal 0xf16ea94 +/* f0f1f4c: 0fc5baa5 */ jal langGet /* f0f1f50: 240451ef */ li $a0,0x51ef -/* f0f1f54: 0c002eeb */ jal 0xbbac +/* f0f1f54: 0c002eeb */ jal viGetWidth /* f0f1f58: afa2004c */ sw $v0,0x4c($sp) -/* f0f1f5c: 0c002eeb */ jal 0xbbac +/* f0f1f5c: 0c002eeb */ jal viGetWidth /* f0f1f60: a7a20048 */ sh $v0,0x48($sp) /* f0f1f64: 8fab0064 */ lw $t3,0x64($sp) /* f0f1f68: 8faf0060 */ lw $t7,0x60($sp) @@ -613,9 +613,9 @@ glabel menuRenderBanner /* f0f1f94: afa00028 */ sw $zero,0x28($sp) /* f0f1f98: afab0010 */ sw $t3,0x10($sp) /* f0f1f9c: afaf0014 */ sw $t7,0x14($sp) -/* f0f1fa0: 0fc55886 */ jal 0xf156218 +/* f0f1fa0: 0fc55886 */ jal textRenderProjected /* f0f1fa4: afa9001c */ sw $t1,0x1c($sp) -/* f0f1fa8: 0fc54bb7 */ jal 0xf152edc +/* f0f1fa8: 0fc54bb7 */ jal func0f153780 /* f0f1fac: 00402025 */ move $a0,$v0 /* f0f1fb0: 8fbf003c */ lw $ra,0x3c($sp) /* f0f1fb4: 8fb00038 */ lw $s0,0x38($sp) @@ -4019,13 +4019,13 @@ glabel var7f1b3658jf .JF0f0f45a8: /* f0f45a8: 5720000e */ bnezl $t9,.JF0f0f45e4 /* f0f45ac: 8e090004 */ lw $t1,0x4($s0) -/* f0f45b0: 0fc27bca */ jal 0xf09ef28 +/* f0f45b0: 0fc27bca */ jal bgun0f09e004 /* f0f45b4: 24040001 */ li $a0,0x1 /* f0f45b8: 10400007 */ beqz $v0,.JF0f0f45d8 /* f0f45bc: 00000000 */ nop -/* f0f45c0: 0fc27b44 */ jal 0xf09ed10 +/* f0f45c0: 0fc27b44 */ jal bgunGetGunMem /* f0f45c4: 00000000 */ nop -/* f0f45c8: 0fc27b48 */ jal 0xf09ed20 +/* f0f45c8: 0fc27b48 */ jal bgunCalculateGunMemCapacity /* f0f45cc: ae020004 */ sw $v0,0x4($s0) /* f0f45d0: 10000003 */ b .JF0f0f45e0 /* f0f45d4: ae020008 */ sw $v0,0x8($s0) @@ -4054,7 +4054,7 @@ glabel var7f1b3658jf .JF0f0f4620: /* f0f4620: 54610004 */ bnel $v1,$at,.JF0f0f4634 /* f0f4624: 92020000 */ lbu $v0,0x0($s0) -/* f0f4628: 0fc672f2 */ jal 0xf19cbc8 +/* f0f4628: 0fc672f2 */ jal mpClearCurrentChallenge /* f0f462c: 00000000 */ nop /* f0f4630: 92020000 */ lbu $v0,0x0($s0) .JF0f0f4634: @@ -4090,25 +4090,25 @@ glabel var7f1b3658jf /* f0f469c: 322a00ff */ andi $t2,$s1,0xff /* f0f46a0: 00025e02 */ srl $t3,$v0,0x18 /* f0f46a4: 01408825 */ move $s1,$t2 -/* f0f46a8: 0fc63127 */ jal 0xf18c49c +/* f0f46a8: 0fc63127 */ jal mpGetBodyId /* f0f46ac: 316400ff */ andi $a0,$t3,0xff -/* f0f46b0: 0fc6310a */ jal 0xf18c428 +/* f0f46b0: 0fc6310a */ jal mpGetNumHeads2 /* f0f46b4: afa20404 */ sw $v0,0x404($sp) /* f0f46b8: 0222082a */ slt $at,$s1,$v0 /* f0f46bc: 10200005 */ beqz $at,.JF0f0f46d4 /* f0f46c0: 00000000 */ nop -/* f0f46c4: 0fc6310e */ jal 0xf18c438 +/* f0f46c4: 0fc6310e */ jal mpGetHeadId /* f0f46c8: 322400ff */ andi $a0,$s1,0xff /* f0f46cc: 1000000b */ b .JF0f0f46fc /* f0f46d0: afa20400 */ sw $v0,0x400($sp) .JF0f0f46d4: -/* f0f46d4: 0fc6310a */ jal 0xf18c428 +/* f0f46d4: 0fc6310a */ jal mpGetNumHeads2 /* f0f46d8: 00000000 */ nop -/* f0f46dc: 0fc52806 */ jal 0xf14a018 +/* f0f46dc: 0fc52806 */ jal func0f14a9f8 /* f0f46e0: 02222023 */ subu $a0,$s1,$v0 -/* f0f46e4: 0fc6311c */ jal 0xf18c470 +/* f0f46e4: 0fc6311c */ jal mpGetBeauHeadId /* f0f46e8: 304400ff */ andi $a0,$v0,0xff -/* f0f46ec: 0fc6310a */ jal 0xf18c428 +/* f0f46ec: 0fc6310a */ jal mpGetNumHeads2 /* f0f46f0: afa20400 */ sw $v0,0x400($sp) /* f0f46f4: 02226823 */ subu $t5,$s1,$v0 /* f0f46f8: a20d05b0 */ sb $t5,0x5b0($s0) @@ -4123,7 +4123,7 @@ glabel var7f1b3658jf /* f0f4718: 96220002 */ lhu $v0,0x2($s1) /* f0f471c: 00402025 */ move $a0,$v0 /* f0f4720: a7a2040a */ sh $v0,0x40a($sp) -/* f0f4724: 0fc59d19 */ jal 0xf167464 +/* f0f4724: 0fc59d19 */ jal fileGetInflatedLength /* f0f4728: afa2003c */ sw $v0,0x3c($sp) /* f0f472c: 8e2a0000 */ lw $t2,0x0($s1) /* f0f4730: 2443003f */ addiu $v1,$v0,0x3f @@ -4144,7 +4144,7 @@ glabel var7f1b3658jf /* f0f4768: 000f7880 */ sll $t7,$t7,0x2 /* f0f476c: 022f8821 */ addu $s1,$s1,$t7 /* f0f4770: 9631d506 */ lhu $s1,-0x2afa($s1) -/* f0f4774: 0fc59d19 */ jal 0xf167464 +/* f0f4774: 0fc59d19 */ jal fileGetInflatedLength /* f0f4778: 02202025 */ move $a0,$s1 /* f0f477c: 8fb80420 */ lw $t8,0x420($sp) /* f0f4780: 2459003f */ addiu $t9,$v0,0x3f @@ -4159,7 +4159,7 @@ glabel var7f1b3658jf /* f0f47a0: afa30420 */ sw $v1,0x420($sp) /* f0f47a4: 27a40410 */ addiu $a0,$sp,0x410 /* f0f47a8: 01832821 */ addu $a1,$t4,$v1 -/* f0f47ac: 0fc5ccb0 */ jal 0xf1732c0 +/* f0f47ac: 0fc5ccb0 */ jal func0f172e70 /* f0f47b0: 01a33023 */ subu $a2,$t5,$v1 /* f0f47b4: 8fae0400 */ lw $t6,0x400($sp) /* f0f47b8: 8e050004 */ lw $a1,0x4($s0) @@ -4168,16 +4168,16 @@ glabel var7f1b3658jf /* f0f47c4: 8faf0404 */ lw $t7,0x404($sp) /* f0f47c8: a60f056a */ sh $t7,0x56a($s0) /* f0f47cc: 8fa60420 */ lw $a2,0x420($sp) -/* f0f47d0: 0fc6a0c5 */ jal 0xf1a8314 +/* f0f47d0: 0fc6a0c5 */ jal func0f1a7794 /* f0f47d4: 97a4040a */ lhu $a0,0x40a($sp) /* f0f47d8: ae020054 */ sw $v0,0x54($s0) -/* f0f47dc: 0fc59da4 */ jal 0xf167690 +/* f0f47dc: 0fc59da4 */ jal fileGetSize /* f0f47e0: 8fa4003c */ lw $a0,0x3c($sp) /* f0f47e4: 2443003f */ addiu $v1,$v0,0x3f /* f0f47e8: 3479003f */ ori $t9,$v1,0x3f /* f0f47ec: 3b29003f */ xori $t1,$t9,0x3f /* f0f47f0: 8e040054 */ lw $a0,0x54($s0) -/* f0f47f4: 0c008a0e */ jal 0x22838 +/* f0f47f4: 0c008a0e */ jal modelCalculateRwDataLen /* f0f47f8: afa9040c */ sw $t1,0x40c($sp) /* f0f47fc: 8fb80400 */ lw $t8,0x400($sp) /* f0f4800: 8fa3040c */ lw $v1,0x40c($sp) @@ -4191,26 +4191,26 @@ glabel var7f1b3658jf /* f0f481c: afb10040 */ sw $s1,0x40($sp) /* f0f4820: 01633023 */ subu $a2,$t3,$v1 /* f0f4824: 27a70410 */ addiu $a3,$sp,0x410 -/* f0f4828: 0fc6a0c5 */ jal 0xf1a8314 +/* f0f4828: 0fc6a0c5 */ jal func0f1a7794 /* f0f482c: 01432821 */ addu $a1,$t2,$v1 /* f0f4830: ae020058 */ sw $v0,0x58($s0) -/* f0f4834: 0fc59da4 */ jal 0xf167690 +/* f0f4834: 0fc59da4 */ jal fileGetSize /* f0f4838: 8fa40040 */ lw $a0,0x40($sp) /* f0f483c: 8e040058 */ lw $a0,0x58($s0) /* f0f4840: 8fa50400 */ lw $a1,0x400($sp) -/* f0f4844: 0fc0bbdf */ jal 0xf02ef7c +/* f0f4844: 0fc0bbdf */ jal bodyCalculateHeadOffset /* f0f4848: 8fa60404 */ lw $a2,0x404($sp) -/* f0f484c: 0c008a0e */ jal 0x22838 +/* f0f484c: 0c008a0e */ jal modelCalculateRwDataLen /* f0f4850: 8e040058 */ lw $a0,0x58($s0) .JF0f0f4854: /* f0f4854: 26040060 */ addiu $a0,$s0,0x60 /* f0f4858: 8e050054 */ lw $a1,0x54($s0) /* f0f485c: afa4003c */ sw $a0,0x3c($sp) /* f0f4860: 26060110 */ addiu $a2,$s0,0x110 -/* f0f4864: 0c008aae */ jal 0x22ab8 +/* f0f4864: 0c008aae */ jal modelInit /* f0f4868: 24070001 */ li $a3,0x1 /* f0f486c: 26110084 */ addiu $s1,$s0,0x84 -/* f0f4870: 0c008aed */ jal 0x22bb4 +/* f0f4870: 0c008aed */ jal animInit /* f0f4874: 02202025 */ move $a0,$s1 /* f0f4878: 240c0100 */ li $t4,0x100 /* f0f487c: a60c0062 */ sh $t4,0x62($s0) @@ -4224,12 +4224,12 @@ glabel var7f1b3658jf /* f0f489c: afa00010 */ sw $zero,0x10($sp) /* f0f48a0: 8fa50400 */ lw $a1,0x400($sp) /* f0f48a4: 8fa40404 */ lw $a0,0x404($sp) -/* f0f48a8: 0fc0b813 */ jal 0xf02e04c +/* f0f48a8: 0fc0b813 */ jal func0f02ce8c /* f0f48ac: afad0014 */ sw $t5,0x14($sp) /* f0f48b0: 10000027 */ b .JF0f0f4950 /* f0f48b4: 8e0b000c */ lw $t3,0xc($s0) .JF0f0f48b8: -/* f0f48b8: 0fc59d19 */ jal 0xf167464 +/* f0f48b8: 0fc59d19 */ jal fileGetInflatedLength /* f0f48bc: 00402025 */ move $a0,$v0 /* f0f48c0: 2443003f */ addiu $v1,$v0,0x3f /* f0f48c4: 346f003f */ ori $t7,$v1,0x3f @@ -4240,7 +4240,7 @@ glabel var7f1b3658jf /* f0f48d8: afa30420 */ sw $v1,0x420($sp) /* f0f48dc: 27a40410 */ addiu $a0,$sp,0x410 /* f0f48e0: 01232821 */ addu $a1,$t1,$v1 -/* f0f48e4: 0fc5ccb0 */ jal 0xf1732c0 +/* f0f48e4: 0fc5ccb0 */ jal func0f172e70 /* f0f48e8: 03033023 */ subu $a2,$t8,$v1 /* f0f48ec: 2402ffff */ li $v0,-1 /* f0f48f0: a6020002 */ sh $v0,0x2($s0) @@ -4248,20 +4248,20 @@ glabel var7f1b3658jf /* f0f48f8: 8fa60420 */ lw $a2,0x420($sp) /* f0f48fc: 9604000e */ lhu $a0,0xe($s0) /* f0f4900: 8e050004 */ lw $a1,0x4($s0) -/* f0f4904: 0fc6a0c5 */ jal 0xf1a8314 +/* f0f4904: 0fc6a0c5 */ jal func0f1a7794 /* f0f4908: 27a70410 */ addiu $a3,$sp,0x410 /* f0f490c: ae020054 */ sw $v0,0x54($s0) -/* f0f4910: 0fc59da4 */ jal 0xf167690 +/* f0f4910: 0fc59da4 */ jal fileGetSize /* f0f4914: 8e04000c */ lw $a0,0xc($s0) -/* f0f4918: 0c008a0e */ jal 0x22838 +/* f0f4918: 0c008a0e */ jal modelCalculateRwDataLen /* f0f491c: 8e040054 */ lw $a0,0x54($s0) /* f0f4920: 26040060 */ addiu $a0,$s0,0x60 /* f0f4924: 8e050054 */ lw $a1,0x54($s0) /* f0f4928: 26060110 */ addiu $a2,$s0,0x110 -/* f0f492c: 0c008aae */ jal 0x22ab8 +/* f0f492c: 0c008aae */ jal modelInit /* f0f4930: 24070001 */ li $a3,0x1 /* f0f4934: 26110084 */ addiu $s1,$s0,0x84 -/* f0f4938: 0c008aed */ jal 0x22bb4 +/* f0f4938: 0c008aed */ jal animInit /* f0f493c: 02202025 */ move $a0,$s1 /* f0f4940: 240a0100 */ li $t2,0x100 /* f0f4944: a60a0062 */ sh $t2,0x62($s0) @@ -4305,10 +4305,10 @@ glabel var7f1b3658jf /* f0f49c8: 000a6280 */ sll $t4,$t2,0xa /* f0f49cc: 05830018 */ bgezl $t4,.JF0f0f4a30 /* f0f49d0: 8faa0440 */ lw $t2,0x440($sp) -/* f0f49d4: 0c002c89 */ jal 0xb224 +/* f0f49d4: 0c002c89 */ jal vi0000b280 /* f0f49d8: 8fa40440 */ lw $a0,0x440($sp) /* f0f49dc: afa20440 */ sw $v0,0x440($sp) -/* f0f49e0: 0c002c5d */ jal 0xb174 +/* f0f49e0: 0c002c5d */ jal vi0000b1d0 /* f0f49e4: 00402025 */ move $a0,$v0 /* f0f49e8: 3c0f800a */ lui $t7,0x800a /* f0f49ec: 91ef2695 */ lbu $t7,0x2695($t7) @@ -4319,7 +4319,7 @@ glabel var7f1b3658jf /* f0f4a00: 24010002 */ li $at,0x2 /* f0f4a04: 11c10003 */ beq $t6,$at,.JF0f0f4a14 /* f0f4a08: afa20440 */ sw $v0,0x440($sp) -/* f0f4a0c: 0fc3d768 */ jal 0xf0f5da0 +/* f0f4a0c: 0fc3d768 */ jal menuApplyScissor /* f0f4a10: 00402025 */ move $a0,$v0 .JF0f0f4a14: /* f0f4a14: 244d0008 */ addiu $t5,$v0,0x8 @@ -4362,7 +4362,7 @@ glabel var7f1b3658jf /* f0f4aa0: 8c8b0004 */ lw $t3,0x4($a0) /* f0f4aa4: 554b002f */ bnel $t2,$t3,.JF0f0f4b64 /* f0f4aa8: 8fb902f4 */ lw $t9,0x2f4($sp) -/* f0f4aac: 0c006a2f */ jal 0x1a8bc +/* f0f4aac: 0c006a2f */ jal modelGetPart /* f0f4ab0: 24050006 */ li $a1,0x6 /* f0f4ab4: 5040002b */ beqzl $v0,.JF0f0f4b64 /* f0f4ab8: 8fb902f4 */ lw $t9,0x2f4($sp) @@ -4372,7 +4372,7 @@ glabel var7f1b3658jf /* f0f4ac8: 448c4000 */ mtc1 $t4,$f8 /* f0f4acc: 8c510004 */ lw $s1,0x4($v0) /* f0f4ad0: 468042a0 */ cvt.s.w $f10,$f8 -/* f0f4ad4: 0fc01b14 */ jal 0xf006c50 +/* f0f4ad4: 0fc01b14 */ jal func0f006bd0 /* f0f4ad8: 46045303 */ div.s $f12,$f10,$f4 /* f0f4adc: 44806000 */ mtc1 $zero,$f12 /* f0f4ae0: 3c013f80 */ lui $at,0x3f80 @@ -4405,13 +4405,13 @@ glabel var7f1b3658jf /* f0f4b4c: 8fa4003c */ lw $a0,0x3c($sp) /* f0f4b50: 46065202 */ mul.s $f8,$f10,$f6 /* f0f4b54: 46081103 */ div.s $f4,$f2,$f8 -/* f0f4b58: 0fc1a6f2 */ jal 0xf069bc8 +/* f0f4b58: 0fc1a6f2 */ jal modelFindBboxRodata /* f0f4b5c: e7a402f8 */ swc1 $f4,0x2f8($sp) /* f0f4b60: 8fb902f4 */ lw $t9,0x2f4($sp) .JF0f0f4b64: /* f0f4b64: 13200025 */ beqz $t9,.JF0f0f4bfc /* f0f4b68: 00000000 */ nop -/* f0f4b6c: 0fc1a6f2 */ jal 0xf069bc8 +/* f0f4b6c: 0fc1a6f2 */ jal modelFindBboxRodata /* f0f4b70: 8fa4003c */ lw $a0,0x3c($sp) /* f0f4b74: 10400021 */ beqz $v0,.JF0f0f4bfc /* f0f4b78: 00000000 */ nop @@ -4448,7 +4448,7 @@ glabel var7f1b3658jf /* f0f4bf4: 46082283 */ div.s $f10,$f4,$f8 /* f0f4bf8: e7aa02f8 */ swc1 $f10,0x2f8($sp) .JF0f0f4bfc: -/* f0f4bfc: 0c005654 */ jal 0x15950 +/* f0f4bfc: 0c005654 */ jal mtx4LoadIdentity /* f0f4c00: 27a40350 */ addiu $a0,$sp,0x350 /* f0f4c04: 8fad0448 */ lw $t5,0x448($sp) /* f0f4c08: 24010001 */ li $at,0x1 @@ -4588,7 +4588,7 @@ glabel var7f1b3658jf /* f0f4dfc: e6000528 */ swc1 $f0,0x528($s0) /* f0f4e00: e7a20398 */ swc1 $f2,0x398($sp) /* f0f4e04: e7ac039c */ swc1 $f12,0x39c($sp) -/* f0f4e08: 0c00590b */ jal 0x1642c +/* f0f4e08: 0c00590b */ jal mtx4LoadRotation /* f0f4e0c: e7a003a0 */ swc1 $f0,0x3a0($sp) /* f0f4e10: 100000b4 */ b .JF0f0f50e4 /* f0f4e14: 3c01c2c8 */ lui $at,0xc2c8 @@ -4632,7 +4632,7 @@ glabel var7f1b3658jf .JF0f0f4ea8: /* f0f4ea8: c4243674 */ lwc1 $f4,0x3674($at) /* f0f4eac: 46040302 */ mul.s $f12,$f0,$f4 -/* f0f4eb0: 0c0068dc */ jal 0x1a370 +/* f0f4eb0: 0c0068dc */ jal cosf /* f0f4eb4: 00000000 */ nop /* f0f4eb8: 3c013f00 */ lui $at,0x3f00 /* f0f4ebc: 44814000 */ mtc1 $at,$f8 @@ -4712,7 +4712,7 @@ glabel var7f1b3658jf /* f0f4fd4: e7aa0294 */ swc1 $f10,0x294($sp) /* f0f4fd8: c6060528 */ lwc1 $f6,0x528($s0) /* f0f4fdc: e7ae02d0 */ swc1 $f14,0x2d0($sp) -/* f0f4fe0: 0fc25e90 */ jal 0xf097a40 +/* f0f4fe0: 0fc25e90 */ jal quaternion0f096ca0 /* f0f4fe4: e7a60298 */ swc1 $f6,0x298($sp) /* f0f4fe8: c6080548 */ lwc1 $f8,0x548($s0) /* f0f4fec: 02202025 */ move $a0,$s1 @@ -4721,17 +4721,17 @@ glabel var7f1b3658jf /* f0f4ff8: c604054c */ lwc1 $f4,0x54c($s0) /* f0f4ffc: e7a40294 */ swc1 $f4,0x294($sp) /* f0f5000: c60a0550 */ lwc1 $f10,0x550($s0) -/* f0f5004: 0fc25e90 */ jal 0xf097a40 +/* f0f5004: 0fc25e90 */ jal quaternion0f096ca0 /* f0f5008: e7aa0298 */ swc1 $f10,0x298($sp) /* f0f500c: c7ae02d0 */ lwc1 $f14,0x2d0($sp) /* f0f5010: 27b1029c */ addiu $s1,$sp,0x29c /* f0f5014: 02203825 */ move $a3,$s1 /* f0f5018: 44067000 */ mfc1 $a2,$f14 /* f0f501c: 27a402bc */ addiu $a0,$sp,0x2bc -/* f0f5020: 0fc26016 */ jal 0xf098058 +/* f0f5020: 0fc26016 */ jal quaternionSlerp /* f0f5024: 27a502ac */ addiu $a1,$sp,0x2ac /* f0f5028: 02202025 */ move $a0,$s1 -/* f0f502c: 0fc25f1d */ jal 0xf097c74 +/* f0f502c: 0fc25f1d */ jal quaternionToMtx /* f0f5030: 27a50350 */ addiu $a1,$sp,0x350 /* f0f5034: 8e0205b0 */ lw $v0,0x5b0($s0) /* f0f5038: 0002c300 */ sll $t8,$v0,0xc @@ -4746,7 +4746,7 @@ glabel var7f1b3658jf /* f0f5058: e6000528 */ swc1 $f0,0x528($s0) /* f0f505c: e7a20398 */ swc1 $f2,0x398($sp) /* f0f5060: e7ac039c */ swc1 $f12,0x39c($sp) -/* f0f5064: 0c00590b */ jal 0x1642c +/* f0f5064: 0c00590b */ jal mtx4LoadRotation /* f0f5068: e7a003a0 */ swc1 $f0,0x3a0($sp) /* f0f506c: 8e0205b0 */ lw $v0,0x5b0($s0) /* f0f5070: 00025b00 */ sll $t3,$v0,0xc @@ -4776,7 +4776,7 @@ glabel var7f1b3658jf /* f0f50cc: e6000528 */ swc1 $f0,0x528($s0) /* f0f50d0: e7a20398 */ swc1 $f2,0x398($sp) /* f0f50d4: e7ac039c */ swc1 $f12,0x39c($sp) -/* f0f50d8: 0c00590b */ jal 0x1642c +/* f0f50d8: 0c00590b */ jal mtx4LoadRotation /* f0f50dc: e7a003a0 */ swc1 $f0,0x3a0($sp) .JF0f0f50e0: /* f0f50e0: 3c01c2c8 */ lui $at,0xc2c8 @@ -4805,11 +4805,11 @@ glabel var7f1b3658jf /* f0f5138: 1000002a */ b .JF0f0f51e4 /* f0f513c: e7a60394 */ swc1 $f6,0x394($sp) .JF0f0f5140: -/* f0f5140: 0c002f29 */ jal 0xbca4 +/* f0f5140: 0c002f29 */ jal viGetViewLeft /* f0f5144: 00000000 */ nop /* f0f5148: 00028c00 */ sll $s1,$v0,0x10 /* f0f514c: 00116c03 */ sra $t5,$s1,0x10 -/* f0f5150: 0c002f0b */ jal 0xbc2c +/* f0f5150: 0c002f0b */ jal viGetViewWidth /* f0f5154: 01a08825 */ move $s1,$t5 /* f0f5158: 44825000 */ mtc1 $v0,$f10 /* f0f515c: 3c013f00 */ lui $at,0x3f00 @@ -4828,11 +4828,11 @@ glabel var7f1b3658jf /* f0f5190: 46805120 */ cvt.s.w $f4,$f10 /* f0f5194: 46044280 */ add.s $f10,$f8,$f4 /* f0f5198: 460a3200 */ add.s $f8,$f6,$f10 -/* f0f519c: 0c002f2d */ jal 0xbcb4 +/* f0f519c: 0c002f2d */ jal viGetViewTop /* f0f51a0: e7a80390 */ swc1 $f8,0x390($sp) /* f0f51a4: 00028c00 */ sll $s1,$v0,0x10 /* f0f51a8: 0011c403 */ sra $t8,$s1,0x10 -/* f0f51ac: 0c002f0f */ jal 0xbc3c +/* f0f51ac: 0c002f0f */ jal viGetViewHeight /* f0f51b0: 03008825 */ move $s1,$t8 /* f0f51b4: 44822000 */ mtc1 $v0,$f4 /* f0f51b8: 3c013f00 */ lui $at,0x3f00 @@ -4850,9 +4850,9 @@ glabel var7f1b3658jf /* f0f51e4: 27a40390 */ addiu $a0,$sp,0x390 .JF0f0f51e8: /* f0f51e8: 27a50398 */ addiu $a1,$sp,0x398 -/* f0f51ec: 0fc2d72f */ jal 0xf0b5cbc +/* f0f51ec: 0fc2d72f */ jal func0f0b4c3c /* f0f51f0: 3c063f80 */ lui $a2,0x3f80 -/* f0f51f4: 0c005654 */ jal 0x15950 +/* f0f51f4: 0c005654 */ jal mtx4LoadIdentity /* f0f51f8: 27a40310 */ addiu $a0,$sp,0x310 /* f0f51fc: 8e0205b4 */ lw $v0,0x5b4($s0) /* f0f5200: 5040001d */ beqzl $v0,.JF0f0f5278 @@ -4864,13 +4864,13 @@ glabel var7f1b3658jf /* f0f5218: 8fac0448 */ lw $t4,0x448($sp) /* f0f521c: 8e040054 */ lw $a0,0x54($s0) .JF0f0f5220: -/* f0f5220: 0c006a2f */ jal 0x1a8bc +/* f0f5220: 0c006a2f */ jal modelGetPart /* f0f5224: afa3028c */ sw $v1,0x28c($sp) /* f0f5228: 8fa3028c */ lw $v1,0x28c($sp) /* f0f522c: 1040000d */ beqz $v0,.JF0f0f5264 /* f0f5230: 00402825 */ move $a1,$v0 /* f0f5234: 8fa4003c */ lw $a0,0x3c($sp) -/* f0f5238: 0c006a6f */ jal 0x1a9bc +/* f0f5238: 0c006a6f */ jal modelGetNodeRwData /* f0f523c: afa3028c */ sw $v1,0x28c($sp) /* f0f5240: 10400008 */ beqz $v0,.JF0f0f5264 /* f0f5244: 8fa3028c */ lw $v1,0x28c($sp) @@ -4914,7 +4914,7 @@ glabel var7f1b3658jf /* f0f52d0: e7a4039c */ swc1 $f4,0x39c($sp) /* f0f52d4: e7a203a0 */ swc1 $f2,0x3a0($sp) .JF0f0f52d8: -/* f0f52d8: 0c00599f */ jal 0x1667c +/* f0f52d8: 0c00599f */ jal mtx4LoadTranslation /* f0f52dc: 27a50310 */ addiu $a1,$sp,0x310 /* f0f52e0: 8faf0308 */ lw $t7,0x308($sp) /* f0f52e4: 51e0000a */ beqzl $t7,.JF0f0f5310 @@ -4923,19 +4923,19 @@ glabel var7f1b3658jf /* f0f52f0: c7a802f8 */ lwc1 $f8,0x2f8($sp) /* f0f52f4: 27a50310 */ addiu $a1,$sp,0x310 /* f0f52f8: 46085302 */ mul.s $f12,$f10,$f8 -/* f0f52fc: 0c0057a9 */ jal 0x15ea4 +/* f0f52fc: 0c0057a9 */ jal mtx00015f04 /* f0f5300: 00000000 */ nop /* f0f5304: 10000005 */ b .JF0f0f531c /* f0f5308: 8fb90308 */ lw $t9,0x308($sp) /* f0f530c: c7ac0424 */ lwc1 $f12,0x424($sp) .JF0f0f5310: -/* f0f5310: 0c0057a9 */ jal 0x15ea4 +/* f0f5310: 0c0057a9 */ jal mtx00015f04 /* f0f5314: 27a50310 */ addiu $a1,$sp,0x310 /* f0f5318: 8fb90308 */ lw $t9,0x308($sp) .JF0f0f531c: /* f0f531c: 13200005 */ beqz $t9,.JF0f0f5334 /* f0f5320: 27a402fc */ addiu $a0,$sp,0x2fc -/* f0f5324: 0c00599f */ jal 0x1667c +/* f0f5324: 0c00599f */ jal mtx4LoadTranslation /* f0f5328: 27a50204 */ addiu $a1,$sp,0x204 /* f0f532c: 1000000b */ b .JF0f0f535c /* f0f5330: 27b10244 */ addiu $s1,$sp,0x244 @@ -4947,28 +4947,28 @@ glabel var7f1b3658jf /* f0f5344: c6040530 */ lwc1 $f4,0x530($s0) /* f0f5348: e7a4039c */ swc1 $f4,0x39c($sp) /* f0f534c: c60a0534 */ lwc1 $f10,0x534($s0) -/* f0f5350: 0c00599f */ jal 0x1667c +/* f0f5350: 0c00599f */ jal mtx4LoadTranslation /* f0f5354: e7aa03a0 */ swc1 $f10,0x3a0($sp) /* f0f5358: 27b10244 */ addiu $s1,$sp,0x244 .JF0f0f535c: /* f0f535c: 02203025 */ move $a2,$s1 /* f0f5360: 27a40310 */ addiu $a0,$sp,0x310 -/* f0f5364: 0c005668 */ jal 0x159a0 +/* f0f5364: 0c005668 */ jal mtx4MultMtx4 /* f0f5368: 27a50350 */ addiu $a1,$sp,0x350 /* f0f536c: 8fae0448 */ lw $t6,0x448($sp) /* f0f5370: 24010003 */ li $at,0x3 /* f0f5374: 55c1000f */ bnel $t6,$at,.JF0f0f53b4 /* f0f5378: 26060014 */ addiu $a2,$s0,0x14 -/* f0f537c: 0fc4ec7c */ jal 0xf13b1f0 +/* f0f537c: 0fc4ec7c */ jal func0f13ae04 /* f0f5380: 27a401c4 */ addiu $a0,$sp,0x1c4 /* f0f5384: 27a401c4 */ addiu $a0,$sp,0x1c4 /* f0f5388: 02202825 */ move $a1,$s1 -/* f0f538c: 0c005668 */ jal 0x159a0 +/* f0f538c: 0c005668 */ jal mtx4MultMtx4 /* f0f5390: 27a60184 */ addiu $a2,$sp,0x184 /* f0f5394: 26060014 */ addiu $a2,$s0,0x14 /* f0f5398: afa60040 */ sw $a2,0x40($sp) /* f0f539c: 27a40184 */ addiu $a0,$sp,0x184 -/* f0f53a0: 0c005668 */ jal 0x159a0 +/* f0f53a0: 0c005668 */ jal mtx4MultMtx4 /* f0f53a4: 27a50204 */ addiu $a1,$sp,0x204 /* f0f53a8: 10000006 */ b .JF0f0f53c4 /* f0f53ac: 00000000 */ nop @@ -4976,10 +4976,10 @@ glabel var7f1b3658jf .JF0f0f53b4: /* f0f53b4: afa60040 */ sw $a2,0x40($sp) /* f0f53b8: 02202025 */ move $a0,$s1 -/* f0f53bc: 0c005668 */ jal 0x159a0 +/* f0f53bc: 0c005668 */ jal mtx4MultMtx4 /* f0f53c0: 27a50204 */ addiu $a1,$sp,0x204 .JF0f0f53c4: -/* f0f53c4: 0fc38c3f */ jal 0xf0e30fc +/* f0f53c4: 0fc38c3f */ jal menugfx0f0e2348 /* f0f53c8: 8fa40440 */ lw $a0,0x440($sp) /* f0f53cc: 8fad0448 */ lw $t5,0x448($sp) /* f0f53d0: afa20440 */ sw $v0,0x440($sp) @@ -4988,16 +4988,16 @@ glabel var7f1b3658jf /* f0f53dc: 8e180054 */ lw $t8,0x54($s0) /* f0f53e0: 11a0000e */ beqz $t5,.JF0f0f541c /* f0f53e4: 3c11800a */ lui $s1,0x800a -/* f0f53e8: 0fc356a2 */ jal 0xf0d5a88 +/* f0f53e8: 0fc356a2 */ jal func0f0d49c8 /* f0f53ec: 00402025 */ move $a0,$v0 /* f0f53f0: 24490008 */ addiu $t1,$v0,0x8 /* f0f53f4: 3c180103 */ lui $t8,0x103 /* f0f53f8: 37180040 */ ori $t8,$t8,0x40 /* f0f53fc: afa90440 */ sw $t1,0x440($sp) /* f0f5400: ac580000 */ sw $t8,0x0($v0) -/* f0f5404: 0fc2d81a */ jal 0xf0b6068 +/* f0f5404: 0fc2d81a */ jal currentPlayerGetUnk1750 /* f0f5408: 00408825 */ move $s1,$v0 -/* f0f540c: 0c012b34 */ jal 0x4acd0 +/* f0f540c: 0c012b34 */ jal osVirtualToPhysical /* f0f5410: 00402025 */ move $a0,$v0 /* f0f5414: 1000005f */ b .JF0f0f5594 /* f0f5418: ae220004 */ sw $v0,0x4($s1) @@ -5021,14 +5021,14 @@ glabel var7f1b3658jf /* f0f545c: 2484331c */ addiu $a0,$a0,0x331c /* f0f5460: 468041a0 */ cvt.s.w $f6,$f8 /* f0f5464: 460a3203 */ div.s $f8,$f6,$f10 -/* f0f5468: 0c0036b4 */ jal 0xdad0 +/* f0f5468: 0c0036b4 */ jal mainOverrideVariable /* f0f546c: e7a8017c */ swc1 $f8,0x17c($sp) /* f0f5470: 3c047f1b */ lui $a0,0x7f1b /* f0f5474: 3c058007 */ lui $a1,0x8007 /* f0f5478: 24a51a14 */ addiu $a1,$a1,0x1a14 -/* f0f547c: 0c0036b4 */ jal 0xdad0 +/* f0f547c: 0c0036b4 */ jal mainOverrideVariable /* f0f5480: 24843320 */ addiu $a0,$a0,0x3320 -/* f0f5484: 0fc356a2 */ jal 0xf0d5a88 +/* f0f5484: 0fc356a2 */ jal func0f0d49c8 /* f0f5488: 8fa40440 */ lw $a0,0x440($sp) /* f0f548c: 3c098008 */ lui $t1,0x8008 /* f0f5490: 8d2900f4 */ lw $t1,0xf4($t1) @@ -5039,7 +5039,7 @@ glabel var7f1b3658jf /* f0f54a4: 84a52742 */ lh $a1,0x2742($a1) /* f0f54a8: 00002012 */ mflo $a0 /* f0f54ac: 0004c400 */ sll $t8,$a0,0x10 -/* f0f54b0: 0c002f13 */ jal 0xbc4c +/* f0f54b0: 0c002f13 */ jal viSetViewPosition /* f0f54b4: 00182403 */ sra $a0,$t8,0x10 /* f0f54b8: 3c0c800a */ lui $t4,0x800a /* f0f54bc: 8d8c273c */ lw $t4,0x273c($t4) @@ -5061,7 +5061,7 @@ glabel var7f1b3658jf /* f0f54fc: 00003012 */ mflo $a2 /* f0f5500: 00066c00 */ sll $t5,$a2,0x10 /* f0f5504: 000d3403 */ sra $a2,$t5,0x10 -/* f0f5508: 0c002f5f */ jal 0xbd7c +/* f0f5508: 0c002f5f */ jal viSetFovAspectAndSize /* f0f550c: 000b3c03 */ sra $a3,$t3,0x10 /* f0f5510: 3c0f8007 */ lui $t7,0x8007 /* f0f5514: 8def1998 */ lw $t7,0x1998($t7) @@ -5069,7 +5069,7 @@ glabel var7f1b3658jf /* f0f551c: 25ce2748 */ addiu $t6,$t6,0x2748 /* f0f5520: 000fc940 */ sll $t9,$t7,0x5 /* f0f5524: 032e2821 */ addu $a1,$t9,$t6 -/* f0f5528: 0c002ba9 */ jal 0xaea4 +/* f0f5528: 0c002ba9 */ jal vi0000af00 /* f0f552c: 8fa40440 */ lw $a0,0x440($sp) /* f0f5530: 3c0d8007 */ lui $t5,0x8007 /* f0f5534: 8dad1a10 */ lw $t5,0x1a10($t5) @@ -5095,7 +5095,7 @@ glabel var7f1b3658jf /* f0f5580: 46085280 */ add.s $f10,$f10,$f8 .JF0f0f5584: /* f0f5584: 44065000 */ mfc1 $a2,$f10 -/* f0f5588: 0c002b12 */ jal 0xac48 +/* f0f5588: 0c002b12 */ jal vi0000aca4 /* f0f558c: 00000000 */ nop /* f0f5590: afa20440 */ sw $v0,0x440($sp) .JF0f0f5594: @@ -5103,7 +5103,7 @@ glabel var7f1b3658jf .JF0f0f5598: /* f0f5598: 8704000e */ lh $a0,0xe($t8) /* f0f559c: 00045180 */ sll $t2,$a0,0x6 -/* f0f55a0: 0fc59f81 */ jal 0xf167e04 +/* f0f55a0: 0fc59f81 */ jal gfxAllocate /* f0f55a4: 01402025 */ move $a0,$t2 /* f0f55a8: afa203b4 */ sw $v0,0x3b4($sp) /* f0f55ac: 8e0b0054 */ lw $t3,0x54($s0) @@ -5114,7 +5114,7 @@ glabel var7f1b3658jf /* f0f55c0: 8fb903b4 */ lw $t9,0x3b4($sp) .JF0f0f55c4: /* f0f55c4: 00117980 */ sll $t7,$s1,0x6 -/* f0f55c8: 0c005654 */ jal 0x15950 +/* f0f55c8: 0c005654 */ jal mtx4LoadIdentity /* f0f55cc: 01f92021 */ addu $a0,$t7,$t9 /* f0f55d0: 8e0e0054 */ lw $t6,0x54($s0) /* f0f55d4: 26310001 */ addiu $s1,$s1,0x1 @@ -5144,15 +5144,15 @@ glabel var7f1b3658jf /* f0f5630: 00003025 */ move $a2,$zero /* f0f5634: 24070000 */ li $a3,0x0 /* f0f5638: e7a40010 */ swc1 $f4,0x10($sp) -/* f0f563c: 0c00772b */ jal 0x1dcac +/* f0f563c: 0c00772b */ jal modelSetAnimation /* f0f5640: e7a60014 */ swc1 $f6,0x14($sp) -/* f0f5644: 0c00747e */ jal 0x1d1f8 +/* f0f5644: 0c00747e */ jal modelGetNumAnimFrames /* f0f5648: 8fa4003c */ lw $a0,0x3c($sp) /* f0f564c: 44825000 */ mtc1 $v0,$f10 /* f0f5650: 8fa4003c */ lw $a0,0x3c($sp) /* f0f5654: 468052a0 */ cvt.s.w $f10,$f10 /* f0f5658: 44055000 */ mfc1 $a1,$f10 -/* f0f565c: 0c0077fe */ jal 0x1dff8 +/* f0f565c: 0c0077fe */ jal model0001e018 /* f0f5660: 00000000 */ nop /* f0f5664: 10000008 */ b .JF0f0f5688 /* f0f5668: 860f005c */ lh $t7,0x5c($s0) @@ -5161,7 +5161,7 @@ glabel var7f1b3658jf /* f0f5670: 44802000 */ mtc1 $zero,$f4 /* f0f5674: 24070000 */ li $a3,0x0 /* f0f5678: e7a80010 */ swc1 $f8,0x10($sp) -/* f0f567c: 0c00772b */ jal 0x1dcac +/* f0f567c: 0c00772b */ jal modelSetAnimation /* f0f5680: e7a40014 */ swc1 $f4,0x14($sp) /* f0f5684: 860f005c */ lh $t7,0x5c($s0) .JF0f0f5688: @@ -5174,16 +5174,16 @@ glabel var7f1b3658jf /* f0f5698: 3c05800a */ lui $a1,0x800a /* f0f569c: 8ca5a670 */ lw $a1,-0x5990($a1) /* f0f56a0: 8fa4003c */ lw $a0,0x3c($sp) -/* f0f56a4: 0c007b7e */ jal 0x1edf8 +/* f0f56a4: 0c007b7e */ jal model0001ee18 /* f0f56a8: 24060001 */ li $a2,0x1 /* f0f56ac: 8e0e05b0 */ lw $t6,0x5b0($s0) /* f0f56b0: 000e4ac0 */ sll $t1,$t6,0xb /* f0f56b4: 0521000c */ bgez $t1,.JF0f0f56e8 /* f0f56b8: 00000000 */ nop -/* f0f56bc: 0c00747e */ jal 0x1d1f8 +/* f0f56bc: 0c00747e */ jal modelGetNumAnimFrames /* f0f56c0: 8fa4003c */ lw $a0,0x3c($sp) /* f0f56c4: afa2004c */ sw $v0,0x4c($sp) -/* f0f56c8: 0c007457 */ jal 0x1d15c +/* f0f56c8: 0c007457 */ jal modelGetCurAnimFrame /* f0f56cc: 8fa4003c */ lw $a0,0x3c($sp) /* f0f56d0: 8fb8004c */ lw $t8,0x4c($sp) /* f0f56d4: 44983000 */ mtc1 $t8,$f6 @@ -5192,12 +5192,12 @@ glabel var7f1b3658jf /* f0f56e0: 10000004 */ b .JF0f0f56f4 /* f0f56e4: 46005081 */ sub.s $f2,$f10,$f0 .JF0f0f56e8: -/* f0f56e8: 0c007457 */ jal 0x1d15c +/* f0f56e8: 0c007457 */ jal modelGetCurAnimFrame /* f0f56ec: 8fa4003c */ lw $a0,0x3c($sp) /* f0f56f0: 46000086 */ mov.s $f2,$f0 .JF0f0f56f4: /* f0f56f4: 8fa4003c */ lw $a0,0x3c($sp) -/* f0f56f8: 0c00747e */ jal 0x1d1f8 +/* f0f56f8: 0c00747e */ jal modelGetNumAnimFrames /* f0f56fc: e7a20178 */ swc1 $f2,0x178($sp) /* f0f5700: 244affff */ addiu $t2,$v0,-1 /* f0f5704: 448a4000 */ mtc1 $t2,$f8 @@ -5211,14 +5211,14 @@ glabel var7f1b3658jf .JF0f0f5724: /* f0f5724: 8fa40040 */ lw $a0,0x40($sp) .JF0f0f5728: -/* f0f5728: 0c00572e */ jal 0x15cb8 +/* f0f5728: 0c00572e */ jal mtx4Copy /* f0f572c: 8fa503b4 */ lw $a1,0x3b4($sp) /* f0f5730: 8fab0040 */ lw $t3,0x40($sp) /* f0f5734: 27a403b8 */ addiu $a0,$sp,0x3b8 /* f0f5738: 8fa5003c */ lw $a1,0x3c($sp) /* f0f573c: afab03b8 */ sw $t3,0x3b8($sp) /* f0f5740: 8e0c006c */ lw $t4,0x6c($s0) -/* f0f5744: 0c0073a7 */ jal 0x1ce9c +/* f0f5744: 0c0073a7 */ jal model0001cebc /* f0f5748: afac03c8 */ sw $t4,0x3c8($sp) /* f0f574c: 8e040054 */ lw $a0,0x54($s0) /* f0f5750: 3c0f8008 */ lui $t7,0x8008 @@ -5226,7 +5226,7 @@ glabel var7f1b3658jf /* f0f5758: 8c990004 */ lw $t9,0x4($a0) /* f0f575c: 55f90096 */ bnel $t7,$t9,.JF0f0f59b8 /* f0f5760: 8fa90440 */ lw $t1,0x440($sp) -/* f0f5764: 0c006a2f */ jal 0x1a8bc +/* f0f5764: 0c006a2f */ jal modelGetPart /* f0f5768: 00002825 */ move $a1,$zero /* f0f576c: 50400032 */ beqzl $v0,.JF0f0f5838 /* f0f5770: 8e040054 */ lw $a0,0x54($s0) @@ -5283,21 +5283,21 @@ glabel var7f1b3658jf /* f0f5830: c5060010 */ lwc1 $f6,0x10($t0) /* f0f5834: 8e040054 */ lw $a0,0x54($s0) .JF0f0f5838: -/* f0f5838: 0c006a2f */ jal 0x1a8bc +/* f0f5838: 0c006a2f */ jal modelGetPart /* f0f583c: 24050002 */ li $a1,0x2 /* f0f5840: 10400019 */ beqz $v0,.JF0f0f58a8 /* f0f5844: 00402025 */ move $a0,$v0 -/* f0f5848: 0c006931 */ jal 0x1a4c4 +/* f0f5848: 0c006931 */ jal model0001a524 /* f0f584c: 00002825 */ move $a1,$zero /* f0f5850: afa20160 */ sw $v0,0x160($sp) -/* f0f5854: 0c005654 */ jal 0x15950 +/* f0f5854: 0c005654 */ jal mtx4LoadIdentity /* f0f5858: 27a40120 */ addiu $a0,$sp,0x120 /* f0f585c: 3c014080 */ lui $at,0x4080 /* f0f5860: 44816000 */ mtc1 $at,$f12 -/* f0f5864: 0fc01af5 */ jal 0xf006bd4 +/* f0f5864: 0fc01af5 */ jal func0f006b54 /* f0f5868: 00000000 */ nop /* f0f586c: 46000306 */ mov.s $f12,$f0 -/* f0f5870: 0c0058a2 */ jal 0x16288 +/* f0f5870: 0c0058a2 */ jal mtx4LoadXRotation /* f0f5874: 27a50120 */ addiu $a1,$sp,0x120 /* f0f5878: 8faf0160 */ lw $t7,0x160($sp) /* f0f587c: 8fac03b4 */ lw $t4,0x3b4($sp) @@ -5306,14 +5306,14 @@ glabel var7f1b3658jf /* f0f5888: 01993821 */ addu $a3,$t4,$t9 /* f0f588c: 00e02025 */ move $a0,$a3 /* f0f5890: afa70040 */ sw $a3,0x40($sp) -/* f0f5894: 0c005668 */ jal 0x159a0 +/* f0f5894: 0c005668 */ jal mtx4MultMtx4 /* f0f5898: 27a600e0 */ addiu $a2,$sp,0xe0 /* f0f589c: 8fa50040 */ lw $a1,0x40($sp) -/* f0f58a0: 0c00572e */ jal 0x15cb8 +/* f0f58a0: 0c00572e */ jal mtx4Copy /* f0f58a4: 27a400e0 */ addiu $a0,$sp,0xe0 .JF0f0f58a8: /* f0f58a8: 8e040054 */ lw $a0,0x54($s0) -/* f0f58ac: 0c006a2f */ jal 0x1a8bc +/* f0f58ac: 0c006a2f */ jal modelGetPart /* f0f58b0: 24050001 */ li $a1,0x1 /* f0f58b4: 1040003f */ beqz $v0,.JF0f0f59b4 /* f0f58b8: 00402025 */ move $a0,$v0 @@ -5329,7 +5329,7 @@ glabel var7f1b3658jf /* f0f58e0: 54410035 */ bnel $v0,$at,.JF0f0f59b8 /* f0f58e4: 8fa90440 */ lw $t1,0x440($sp) .JF0f0f58e8: -/* f0f58e8: 0c006931 */ jal 0x1a4c4 +/* f0f58e8: 0c006931 */ jal model0001a524 /* f0f58ec: 00002825 */ move $a1,$zero /* f0f58f0: 8fae03b4 */ lw $t6,0x3b4($sp) /* f0f58f4: 00026980 */ sll $t5,$v0,0x6 @@ -5341,9 +5341,9 @@ glabel var7f1b3658jf /* f0f590c: c4660034 */ lwc1 $f6,0x34($v1) /* f0f5910: e7a600d4 */ swc1 $f6,0xd4($sp) /* f0f5914: c46a0038 */ lwc1 $f10,0x38($v1) -/* f0f5918: 0fc2d761 */ jal 0xf0b5d84 +/* f0f5918: 0fc2d761 */ jal func0f0b4d04 /* f0f591c: e7aa00d8 */ swc1 $f10,0xd8($sp) -/* f0f5920: 0c002eeb */ jal 0xbbac +/* f0f5920: 0c002eeb */ jal viGetWidth /* f0f5924: 00000000 */ nop /* f0f5928: c7a800c8 */ lwc1 $f8,0xc8($sp) /* f0f592c: 3c0f8008 */ lui $t7,0x8008 @@ -5371,7 +5371,7 @@ glabel var7f1b3658jf /* f0f5978: 3c01800a */ lui $at,0x800a /* f0f597c: 00006012 */ mflo $t4 /* f0f5980: ac2ce568 */ sw $t4,-0x1a98($at) -/* f0f5984: 0c002eef */ jal 0xbbbc +/* f0f5984: 0c002eef */ jal viGetHeight /* f0f5988: 00000000 */ nop /* f0f598c: c7a600cc */ lwc1 $f6,0xcc($sp) /* f0f5990: 4600328d */ trunc.w.s $f10,$f6 @@ -5419,7 +5419,7 @@ glabel var7f1b3658jf /* f0f5a2c: 25ec0008 */ addiu $t4,$t7,0x8 /* f0f5a30: afac0440 */ sw $t4,0x440($sp) /* f0f5a34: adf90000 */ sw $t9,0x0($t7) -/* f0f5a38: 0fc2da0a */ jal 0xf0b6828 +/* f0f5a38: 0fc2da0a */ jal currentPlayerGetUnk175c /* f0f5a3c: afaf00b8 */ sw $t7,0xb8($sp) /* f0f5a40: 8fa500b8 */ lw $a1,0xb8($sp) /* f0f5a44: 3c180382 */ lui $t8,0x382 @@ -5429,7 +5429,7 @@ glabel var7f1b3658jf /* f0f5a54: 25cd0008 */ addiu $t5,$t6,0x8 /* f0f5a58: afad0440 */ sw $t5,0x440($sp) /* f0f5a5c: add80000 */ sw $t8,0x0($t6) -/* f0f5a60: 0fc2da0a */ jal 0xf0b6828 +/* f0f5a60: 0fc2da0a */ jal currentPlayerGetUnk175c /* f0f5a64: afae00b4 */ sw $t6,0xb4($sp) /* f0f5a68: 8fa600b4 */ lw $a2,0xb4($sp) /* f0f5a6c: 24490010 */ addiu $t1,$v0,0x10 @@ -5452,10 +5452,10 @@ glabel var7f1b3658jf /* f0f5ab0: afa903bc */ sw $t1,0x3bc($sp) /* f0f5ab4: 8fa5003c */ lw $a1,0x3c($sp) /* f0f5ab8: 27a403b8 */ addiu $a0,$sp,0x3b8 -/* f0f5abc: 0c008682 */ jal 0x21a08 +/* f0f5abc: 0c008682 */ jal modelRender /* f0f5ac0: afb803c4 */ sw $t8,0x3c4($sp) /* f0f5ac4: 8faa03c4 */ lw $t2,0x3c4($sp) -/* f0f5ac8: 0c0059c0 */ jal 0x16700 +/* f0f5ac8: 0c0059c0 */ jal mtx00016760 /* f0f5acc: afaa0440 */ sw $t2,0x440($sp) /* f0f5ad0: 8e0b0054 */ lw $t3,0x54($s0) /* f0f5ad4: 00001025 */ move $v0,$zero @@ -5466,12 +5466,12 @@ glabel var7f1b3658jf .JF0f0f5ae8: /* f0f5ae8: afa20040 */ sw $v0,0x40($sp) /* f0f5aec: 27a50070 */ addiu $a1,$sp,0x70 -/* f0f5af0: 0c00572e */ jal 0x15cb8 +/* f0f5af0: 0c00572e */ jal mtx4Copy /* f0f5af4: 01822021 */ addu $a0,$t4,$v0 /* f0f5af8: 8e19006c */ lw $t9,0x6c($s0) /* f0f5afc: 00117180 */ sll $t6,$s1,0x6 /* f0f5b00: 27a40070 */ addiu $a0,$sp,0x70 -/* f0f5b04: 0c0057fd */ jal 0x15ff4 +/* f0f5b04: 0c0057fd */ jal mtx00016054 /* f0f5b08: 032e2821 */ addu $a1,$t9,$t6 /* f0f5b0c: 8e0d0054 */ lw $t5,0x54($s0) /* f0f5b10: 8fa20040 */ lw $v0,0x40($sp) @@ -5482,13 +5482,13 @@ glabel var7f1b3658jf /* f0f5b24: 5420fff0 */ bnezl $at,.JF0f0f5ae8 /* f0f5b28: 8e0c006c */ lw $t4,0x6c($s0) .JF0f0f5b2c: -/* f0f5b2c: 0c0059c9 */ jal 0x16724 +/* f0f5b2c: 0c0059c9 */ jal mtx00016784 /* f0f5b30: 00000000 */ nop /* f0f5b34: 8fa90448 */ lw $t1,0x448($sp) /* f0f5b38: 29210003 */ slti $at,$t1,0x3 /* f0f5b3c: 50200005 */ beqzl $at,.JF0f0f5b54 /* f0f5b40: 8faa0440 */ lw $t2,0x440($sp) -/* f0f5b44: 0fc35617 */ jal 0xf0d585c +/* f0f5b44: 0fc35617 */ jal func0f0d479c /* f0f5b48: 8fa40440 */ lw $a0,0x440($sp) /* f0f5b4c: afa20440 */ sw $v0,0x440($sp) /* f0f5b50: 8faa0440 */ lw $t2,0x440($sp) @@ -5544,7 +5544,7 @@ glabel var7f1b3658jf /* f0f5c14: afa00018 */ sw $zero,0x18($sp) /* f0f5c18: 00002825 */ move $a1,$zero /* f0f5c1c: 24060002 */ li $a2,0x2 -/* f0f5c20: 0fc2d290 */ jal 0xf0b4a40 +/* f0f5c20: 0fc2d290 */ jal func0f0b39c0 /* f0f5c24: 00003825 */ move $a3,$zero /* f0f5c28: 8fae0440 */ lw $t6,0x440($sp) /* f0f5c2c: 3c18b900 */ lui $t8,0xb900 @@ -5563,7 +5563,7 @@ glabel var7f1b3658jf /* f0f5c60: 02002025 */ move $a0,$s0 /* f0f5c64: 00002825 */ move $a1,$zero /* f0f5c68: 24060002 */ li $a2,0x2 -/* f0f5c6c: 0fc2d290 */ jal 0xf0b4a40 +/* f0f5c6c: 0fc2d290 */ jal func0f0b39c0 /* f0f5c70: 00003825 */ move $a3,$zero /* f0f5c74: 8faf0440 */ lw $t7,0x440($sp) /* f0f5c78: 3c190600 */ lui $t9,0x600 @@ -12747,7 +12747,7 @@ glabel dialogRender /* f0f6074: 0722000c */ bltzl $t9,.JF0f0f60a8 /* f0f6078: 8fb001ec */ lw $s0,0x1ec($sp) .JF0f0f607c: -/* f0f607c: 0fc3f641 */ jal 0xf0fd904 +/* f0f607c: 0fc3f641 */ jal menuGetRoot /* f0f6080: afb001ec */ sw $s0,0x1ec($sp) /* f0f6084: 24010005 */ li $at,0x5 /* f0f6088: 14410006 */ bne $v0,$at,.JF0f0f60a4 @@ -12792,11 +12792,11 @@ glabel dialogRender /* f0f6118: 01b97021 */ addu $t6,$t5,$t9 /* f0f611c: 8dc50028 */ lw $a1,0x28($t6) /* f0f6120: 8d640028 */ lw $a0,0x28($t3) -/* f0f6124: 0fc01a60 */ jal 0xf006980 +/* f0f6124: 0fc01a60 */ jal colourBlend /* f0f6128: afb001ec */ sw $s0,0x1ec($sp) /* f0f612c: afa201bc */ sw $v0,0x1bc($sp) .JF0f0f6130: -/* f0f6130: 0fc55883 */ jal 0xf15620c +/* f0f6130: 0fc55883 */ jal func0f156030 /* f0f6134: 8fa401bc */ lw $a0,0x1bc($sp) /* f0f6138: 3c0f8007 */ lui $t7,0x8007 /* f0f613c: 8def1998 */ lw $t7,0x1998($t7) @@ -12850,7 +12850,7 @@ glabel dialogRender /* f0f61fc: 256c0840 */ addiu $t4,$t3,0x840 /* f0f6200: 018d2821 */ addu $a1,$t4,$t5 /* f0f6204: 8fa401e8 */ lw $a0,0x1e8($sp) -/* f0f6208: 0fc3d151 */ jal 0xf0f4544 +/* f0f6208: 0fc3d151 */ jal menuRenderModels /* f0f620c: 24060002 */ li $a2,0x2 /* f0f6210: 24590008 */ addiu $t9,$v0,0x8 /* f0f6214: afb901e8 */ sw $t9,0x1e8($sp) @@ -12885,7 +12885,7 @@ glabel dialogRender /* f0f627c: 0720000b */ bltz $t9,.JF0f0f62ac /* f0f6280: 00000000 */ nop .JF0f0f6284: -/* f0f6284: 0fc3f641 */ jal 0xf0fd904 +/* f0f6284: 0fc3f641 */ jal menuGetRoot /* f0f6288: e7a00170 */ swc1 $f0,0x170($sp) /* f0f628c: 24010005 */ li $at,0x5 /* f0f6290: 14410006 */ bne $v0,$at,.JF0f0f62ac @@ -12919,7 +12919,7 @@ glabel dialogRender /* f0f62f8: 02021821 */ addu $v1,$s0,$v0 /* f0f62fc: afa301d4 */ sw $v1,0x1d4($sp) /* f0f6300: afa30084 */ sw $v1,0x84($sp) -/* f0f6304: 0fc3c883 */ jal 0xf0f220c +/* f0f6304: 0fc3c883 */ jal menuResolveDialogTitle /* f0f6308: afa201dc */ sw $v0,0x1dc($sp) /* f0f630c: 8fa701ec */ lw $a3,0x1ec($sp) /* f0f6310: 0040b825 */ move $s7,$v0 @@ -12953,7 +12953,7 @@ glabel dialogRender /* f0f637c: 01edc021 */ addu $t8,$t7,$t5 /* f0f6380: 8f050000 */ lw $a1,0x0($t8) /* f0f6384: 8f240000 */ lw $a0,0x0($t9) -/* f0f6388: 0fc01a60 */ jal 0xf006980 +/* f0f6388: 0fc01a60 */ jal colourBlend /* f0f638c: 8ce60044 */ lw $a2,0x44($a3) /* f0f6390: 3c097f1b */ lui $t1,0x7f1b /* f0f6394: 25292ce0 */ addiu $t1,$t1,0x2ce0 @@ -12984,7 +12984,7 @@ glabel dialogRender /* f0f63f0: 01680019 */ multu $t3,$t0 /* f0f63f4: 00006012 */ mflo $t4 /* f0f63f8: 012cc821 */ addu $t9,$t1,$t4 -/* f0f63fc: 0fc01a60 */ jal 0xf006980 +/* f0f63fc: 0fc01a60 */ jal colourBlend /* f0f6400: 8f250004 */ lw $a1,0x4($t9) /* f0f6404: 3c097f1b */ lui $t1,0x7f1b /* f0f6408: 25292ce0 */ addiu $t1,$t1,0x2ce0 @@ -13015,7 +13015,7 @@ glabel dialogRender /* f0f6464: 01c80019 */ multu $t6,$t0 /* f0f6468: 00007812 */ mflo $t7 /* f0f646c: 012f6821 */ addu $t5,$t1,$t7 -/* f0f6470: 0fc01a60 */ jal 0xf006980 +/* f0f6470: 0fc01a60 */ jal colourBlend /* f0f6474: 8da50008 */ lw $a1,0x8($t5) /* f0f6478: afa201b4 */ sw $v0,0x1b4($sp) /* f0f647c: 8fa701ec */ lw $a3,0x1ec($sp) @@ -13079,7 +13079,7 @@ glabel dialogRender /* f0f6550: afb30010 */ sw $s3,0x10($sp) /* f0f6554: afb10014 */ sw $s1,0x14($sp) /* f0f6558: afb20018 */ sw $s2,0x18($sp) -/* f0f655c: 0fc35773 */ jal 0xf0d5dcc +/* f0f655c: 0fc35773 */ jal func0f0d4d0c /* f0f6560: afa0001c */ sw $zero,0x1c($sp) /* f0f6564: ae020000 */ sw $v0,0x0($s0) /* f0f6568: 00402025 */ move $a0,$v0 @@ -13089,7 +13089,7 @@ glabel dialogRender /* f0f6578: afb40010 */ sw $s4,0x10($sp) /* f0f657c: afb20014 */ sw $s2,0x14($sp) /* f0f6580: afb10018 */ sw $s1,0x18($sp) -/* f0f6584: 0fc35773 */ jal 0xf0d5dcc +/* f0f6584: 0fc35773 */ jal func0f0d4d0c /* f0f6588: afa0001c */ sw $zero,0x1c($sp) /* f0f658c: ae020000 */ sw $v0,0x0($s0) /* f0f6590: 00402025 */ move $a0,$v0 @@ -13099,7 +13099,7 @@ glabel dialogRender /* f0f65a0: afb40010 */ sw $s4,0x10($sp) /* f0f65a4: afb10014 */ sw $s1,0x14($sp) /* f0f65a8: afb20018 */ sw $s2,0x18($sp) -/* f0f65ac: 0fc35773 */ jal 0xf0d5dcc +/* f0f65ac: 0fc35773 */ jal func0f0d4d0c /* f0f65b0: afa0001c */ sw $zero,0x1c($sp) /* f0f65b4: ae020000 */ sw $v0,0x0($s0) /* f0f65b8: 00402025 */ move $a0,$v0 @@ -13109,7 +13109,7 @@ glabel dialogRender /* f0f65c8: afb30010 */ sw $s3,0x10($sp) /* f0f65cc: afb20014 */ sw $s2,0x14($sp) /* f0f65d0: afb10018 */ sw $s1,0x18($sp) -/* f0f65d4: 0fc35773 */ jal 0xf0d5dcc +/* f0f65d4: 0fc35773 */ jal func0f0d4d0c /* f0f65d8: afa0001c */ sw $zero,0x1c($sp) /* f0f65dc: 24180001 */ li $t8,0x1 /* f0f65e0: ae020000 */ sw $v0,0x0($s0) @@ -13120,7 +13120,7 @@ glabel dialogRender /* f0f65f4: 02c03825 */ move $a3,$s6 /* f0f65f8: afb30010 */ sw $s3,0x10($sp) /* f0f65fc: afb20014 */ sw $s2,0x14($sp) -/* f0f6600: 0fc35773 */ jal 0xf0d5dcc +/* f0f6600: 0fc35773 */ jal func0f0d4d0c /* f0f6604: afb10018 */ sw $s1,0x18($sp) /* f0f6608: 240c0001 */ li $t4,0x1 /* f0f660c: ae020000 */ sw $v0,0x0($s0) @@ -13131,7 +13131,7 @@ glabel dialogRender /* f0f6620: 02c03825 */ move $a3,$s6 /* f0f6624: afb40010 */ sw $s4,0x10($sp) /* f0f6628: afb10014 */ sw $s1,0x14($sp) -/* f0f662c: 0fc35773 */ jal 0xf0d5dcc +/* f0f662c: 0fc35773 */ jal func0f0d4d0c /* f0f6630: afb20018 */ sw $s2,0x18($sp) /* f0f6634: 24190001 */ li $t9,0x1 /* f0f6638: ae020000 */ sw $v0,0x0($s0) @@ -13142,7 +13142,7 @@ glabel dialogRender /* f0f664c: 02a03825 */ move $a3,$s5 /* f0f6650: afb40010 */ sw $s4,0x10($sp) /* f0f6654: afb20014 */ sw $s2,0x14($sp) -/* f0f6658: 0fc35773 */ jal 0xf0d5dcc +/* f0f6658: 0fc35773 */ jal func0f0d4d0c /* f0f665c: afb10018 */ sw $s1,0x18($sp) /* f0f6660: 240f0001 */ li $t7,0x1 /* f0f6664: ae020000 */ sw $v0,0x0($s0) @@ -13153,7 +13153,7 @@ glabel dialogRender /* f0f6678: 02a03825 */ move $a3,$s5 /* f0f667c: afb30010 */ sw $s3,0x10($sp) /* f0f6680: afb10014 */ sw $s1,0x14($sp) -/* f0f6684: 0fc35773 */ jal 0xf0d5dcc +/* f0f6684: 0fc35773 */ jal func0f0d4d0c /* f0f6688: afb20018 */ sw $s2,0x18($sp) /* f0f668c: 8fae01ec */ lw $t6,0x1ec($sp) /* f0f6690: ae020000 */ sw $v0,0x0($s0) @@ -13180,7 +13180,7 @@ glabel dialogRender /* f0f66dc: 27a401bc */ addiu $a0,$sp,0x1bc /* f0f66e0: 13210003 */ beq $t9,$at,.JF0f0f66f0 /* f0f66e4: 27a501b8 */ addiu $a1,$sp,0x1b8 -/* f0f66e8: 0fc3d72a */ jal 0xf0f5ca8 +/* f0f66e8: 0fc3d72a */ jal menuGetTeamTitlebarColours /* f0f66ec: 27a601b4 */ addiu $a2,$sp,0x1b4 .JF0f0f66f0: /* f0f66f0: 8fa301e0 */ lw $v1,0x1e0($sp) @@ -13201,7 +13201,7 @@ glabel dialogRender /* f0f6728: 8fa401e8 */ lw $a0,0x1e8($sp) /* f0f672c: afad0014 */ sw $t5,0x14($sp) /* f0f6730: afab0018 */ sw $t3,0x18($sp) -/* f0f6734: 0fc38aa7 */ jal 0xf0e2a9c +/* f0f6734: 0fc38aa7 */ jal menugfxRenderGradient /* f0f6738: afae001c */ sw $t6,0x1c($sp) /* f0f673c: 8fac01bc */ lw $t4,0x1bc($sp) /* f0f6740: 8fa601dc */ lw $a2,0x1dc($sp) @@ -13217,7 +13217,7 @@ glabel dialogRender /* f0f6768: 00402025 */ move $a0,$v0 /* f0f676c: 02002825 */ move $a1,$s0 /* f0f6770: 02203825 */ move $a3,$s1 -/* f0f6774: 0fc38e16 */ jal 0xf0e3858 +/* f0f6774: 0fc38e16 */ jal menugfxDrawShimmer /* f0f6778: afa00020 */ sw $zero,0x20($sp) /* f0f677c: 8fae01bc */ lw $t6,0x1bc($sp) /* f0f6780: 8fa601dc */ lw $a2,0x1dc($sp) @@ -13233,7 +13233,7 @@ glabel dialogRender /* f0f67a8: 02203825 */ move $a3,$s1 /* f0f67ac: afb50010 */ sw $s5,0x10($sp) /* f0f67b0: afa00018 */ sw $zero,0x18($sp) -/* f0f67b4: 0fc38e16 */ jal 0xf0e3858 +/* f0f67b4: 0fc38e16 */ jal menugfxDrawShimmer /* f0f67b8: 24c6000a */ addiu $a2,$a2,0xa /* f0f67bc: 8fb201e0 */ lw $s2,0x1e0($sp) /* f0f67c0: 8fb001dc */ lw $s0,0x1dc($sp) @@ -13241,7 +13241,7 @@ glabel dialogRender /* f0f67c8: 26520002 */ addiu $s2,$s2,0x2 /* f0f67cc: 26100002 */ addiu $s0,$s0,0x2 /* f0f67d0: afb001cc */ sw $s0,0x1cc($sp) -/* f0f67d4: 0fc54b55 */ jal 0xf152d54 +/* f0f67d4: 0fc54b55 */ jal func0f153628 /* f0f67d8: afb201d0 */ sw $s2,0x1d0($sp) /* f0f67dc: 8fad01f4 */ lw $t5,0x1f4($sp) /* f0f67e0: afa201e8 */ sw $v0,0x1e8($sp) @@ -13291,7 +13291,7 @@ glabel dialogRender /* f0f6888: 030ec821 */ addu $t9,$t8,$t6 /* f0f688c: 01ae5821 */ addu $t3,$t5,$t6 /* f0f6890: 8d65000c */ lw $a1,0xc($t3) -/* f0f6894: 0fc01a60 */ jal 0xf006980 +/* f0f6894: 0fc01a60 */ jal colourBlend /* f0f6898: 8f24000c */ lw $a0,0xc($t9) /* f0f689c: afa201bc */ sw $v0,0x1bc($sp) /* f0f68a0: 8fa301ec */ lw $v1,0x1ec($sp) @@ -13305,14 +13305,14 @@ glabel dialogRender /* f0f68bc: 00822021 */ addu $a0,$a0,$v0 /* f0f68c0: 00a22821 */ addu $a1,$a1,$v0 /* f0f68c4: 8ca52e54 */ lw $a1,0x2e54($a1) -/* f0f68c8: 0fc54d69 */ jal 0xf1535a4 +/* f0f68c8: 0fc54d69 */ jal func0f153e38 /* f0f68cc: 8c842fbc */ lw $a0,0x2fbc($a0) /* f0f68d0: 8fa301e0 */ lw $v1,0x1e0($sp) /* f0f68d4: 8fa501dc */ lw $a1,0x1dc($sp) /* f0f68d8: 24630003 */ addiu $v1,$v1,0x3 /* f0f68dc: 24a50003 */ addiu $a1,$a1,0x3 /* f0f68e0: afa501cc */ sw $a1,0x1cc($sp) -/* f0f68e4: 0c002eef */ jal 0xbbbc +/* f0f68e4: 0c002eef */ jal viGetHeight /* f0f68e8: afa301d0 */ sw $v1,0x1d0($sp) /* f0f68ec: 8faf01bc */ lw $t7,0x1bc($sp) /* f0f68f0: 3c118008 */ lui $s1,0x8008 @@ -13333,11 +13333,11 @@ glabel dialogRender /* f0f692c: afa00028 */ sw $zero,0x28($sp) /* f0f6930: afb80010 */ sw $t8,0x10($sp) /* f0f6934: afb90014 */ sw $t9,0x14($sp) -/* f0f6938: 0fc55886 */ jal 0xf156218 +/* f0f6938: 0fc55886 */ jal textRenderProjected /* f0f693c: afae001c */ sw $t6,0x1c($sp) /* f0f6940: afa201e8 */ sw $v0,0x1e8($sp) /* f0f6944: afb201d0 */ sw $s2,0x1d0($sp) -/* f0f6948: 0c002eef */ jal 0xbbbc +/* f0f6948: 0c002eef */ jal viGetHeight /* f0f694c: afb001cc */ sw $s0,0x1cc($sp) /* f0f6950: 8e2b0000 */ lw $t3,0x0($s1) /* f0f6954: 8e6c0000 */ lw $t4,0x0($s3) @@ -13353,7 +13353,7 @@ glabel dialogRender /* f0f697c: afab0010 */ sw $t3,0x10($sp) /* f0f6980: afac0014 */ sw $t4,0x14($sp) /* f0f6984: afb80018 */ sw $t8,0x18($sp) -/* f0f6988: 0fc55886 */ jal 0xf156218 +/* f0f6988: 0fc55886 */ jal textRenderProjected /* f0f698c: afb9001c */ sw $t9,0x1c($sp) /* f0f6990: 3c03800a */ lui $v1,0x800a /* f0f6994: 8c6320c4 */ lw $v1,0x20c4($v1) @@ -13371,7 +13371,7 @@ glabel dialogRender /* f0f69c0: 8fa30088 */ lw $v1,0x88($sp) /* f0f69c4: afb001cc */ sw $s0,0x1cc($sp) /* f0f69c8: 2463fff7 */ addiu $v1,$v1,-9 -/* f0f69cc: 0c002eef */ jal 0xbbbc +/* f0f69cc: 0c002eef */ jal viGetHeight /* f0f69d0: afa301d0 */ sw $v1,0x1d0($sp) /* f0f69d4: 3c0f8007 */ lui $t7,0x8007 /* f0f69d8: 8def1998 */ lw $t7,0x1998($t7) @@ -13391,11 +13391,11 @@ glabel dialogRender /* f0f6a10: afab0010 */ sw $t3,0x10($sp) /* f0f6a14: afac0014 */ sw $t4,0x14($sp) /* f0f6a18: afb80018 */ sw $t8,0x18($sp) -/* f0f6a1c: 0fc55886 */ jal 0xf156218 +/* f0f6a1c: 0fc55886 */ jal textRenderProjected /* f0f6a20: afb9001c */ sw $t9,0x1c($sp) /* f0f6a24: afa201e8 */ sw $v0,0x1e8($sp) .JF0f0f6a28: -/* f0f6a28: 0fc54bb7 */ jal 0xf152edc +/* f0f6a28: 0fc54bb7 */ jal func0f153780 /* f0f6a2c: 8fa401e8 */ lw $a0,0x1e8($sp) /* f0f6a30: afa201e8 */ sw $v0,0x1e8($sp) .JF0f0f6a34: @@ -13420,14 +13420,14 @@ glabel dialogRender /* f0f6a7c: 44060000 */ mfc1 $a2,$f0 /* f0f6a80: 8c440014 */ lw $a0,0x14($v0) /* f0f6a84: 8c450018 */ lw $a1,0x18($v0) -/* f0f6a88: 0fc54ce3 */ jal 0xf15338c +/* f0f6a88: 0fc54ce3 */ jal func0f153c20 /* f0f6a8c: 24070001 */ li $a3,0x1 /* f0f6a90: 10000006 */ b .JF0f0f6aac /* f0f6a94: 240e0001 */ li $t6,0x1 /* f0f6a98: 44060000 */ mfc1 $a2,$f0 .JF0f0f6a9c: /* f0f6a9c: 8c440014 */ lw $a0,0x14($v0) -/* f0f6aa0: 0fc54ce3 */ jal 0xf15338c +/* f0f6aa0: 0fc54ce3 */ jal func0f153c20 /* f0f6aa4: 8c450018 */ lw $a1,0x18($v0) /* f0f6aa8: 240e0001 */ li $t6,0x1 .JF0f0f6aac: @@ -13440,7 +13440,7 @@ glabel dialogRender /* f0f6ac0: 24010003 */ li $at,0x3 /* f0f6ac4: 55610005 */ bnel $t3,$at,.JF0f0f6adc /* f0f6ac8: 8fac0084 */ lw $t4,0x84($sp) -/* f0f6acc: 0fc54d3d */ jal 0xf1534f4 +/* f0f6acc: 0fc54d3d */ jal func0f153d88 /* f0f6ad0: c44c0050 */ lwc1 $f12,0x50($v0) /* f0f6ad4: 8fa201ec */ lw $v0,0x1ec($sp) .JF0f0f6ad8: @@ -13480,7 +13480,7 @@ glabel dialogRender /* f0f6b50: 01cb6021 */ addu $t4,$t6,$t3 /* f0f6b54: 032b7821 */ addu $t7,$t9,$t3 /* f0f6b58: 8de50010 */ lw $a1,0x10($t7) -/* f0f6b5c: 0fc01a60 */ jal 0xf006980 +/* f0f6b5c: 0fc01a60 */ jal colourBlend /* f0f6b60: 8d840010 */ lw $a0,0x10($t4) /* f0f6b64: afa201bc */ sw $v0,0x1bc($sp) /* f0f6b68: 8fa201ec */ lw $v0,0x1ec($sp) @@ -13490,7 +13490,7 @@ glabel dialogRender /* f0f6b74: 00002825 */ move $a1,$zero /* f0f6b78: 51a0000b */ beqzl $t5,.JF0f0f6ba8 /* f0f6b7c: c4500040 */ lwc1 $f16,0x40($v0) -/* f0f6b80: 0fc01a60 */ jal 0xf006980 +/* f0f6b80: 0fc01a60 */ jal colourBlend /* f0f6b84: 2406002c */ li $a2,0x2c /* f0f6b88: 8fac01bc */ lw $t4,0x1bc($sp) /* f0f6b8c: 2401ff00 */ li $at,-256 @@ -13529,7 +13529,7 @@ glabel dialogRender /* f0f6c08: 01d8c821 */ addu $t9,$t6,$t8 /* f0f6c0c: 01f86821 */ addu $t5,$t7,$t8 /* f0f6c10: 8da50014 */ lw $a1,0x14($t5) -/* f0f6c14: 0fc01a60 */ jal 0xf006980 +/* f0f6c14: 0fc01a60 */ jal colourBlend /* f0f6c18: 8f240014 */ lw $a0,0x14($t9) /* f0f6c1c: afa201b8 */ sw $v0,0x1b8($sp) /* f0f6c20: 8fa201ec */ lw $v0,0x1ec($sp) @@ -13558,7 +13558,7 @@ glabel dialogRender /* f0f6c78: afb90010 */ sw $t9,0x10($sp) /* f0f6c7c: e7b20020 */ swc1 $f18,0x20($sp) /* f0f6c80: afab0018 */ sw $t3,0x18($sp) -/* f0f6c84: 0fc386d8 */ jal 0xf0e1b60 +/* f0f6c84: 0fc386d8 */ jal menugfxRenderDialogBackground /* f0f6c88: afaf001c */ sw $t7,0x1c($sp) /* f0f6c8c: 10000027 */ b .JF0f0f6d2c /* f0f6c90: afa201e8 */ sw $v0,0x1e8($sp) @@ -13580,7 +13580,7 @@ glabel dialogRender /* f0f6ccc: 02002825 */ move $a1,$s0 /* f0f6cd0: 8fa401e8 */ lw $a0,0x1e8($sp) /* f0f6cd4: 02a03025 */ move $a2,$s5 -/* f0f6cd8: 0fc386d8 */ jal 0xf0e1b60 +/* f0f6cd8: 0fc386d8 */ jal menugfxRenderDialogBackground /* f0f6cdc: e7a40020 */ swc1 $f4,0x20($sp) /* f0f6ce0: 10000012 */ b .JF0f0f6d2c /* f0f6ce4: afa201e8 */ sw $v0,0x1e8($sp) @@ -13599,7 +13599,7 @@ glabel dialogRender /* f0f6d14: afae0010 */ sw $t6,0x10($sp) /* f0f6d18: e7a60020 */ swc1 $f6,0x20($sp) /* f0f6d1c: afb90018 */ sw $t9,0x18($sp) -/* f0f6d20: 0fc386d8 */ jal 0xf0e1b60 +/* f0f6d20: 0fc386d8 */ jal menugfxRenderDialogBackground /* f0f6d24: afab001c */ sw $t3,0x1c($sp) /* f0f6d28: afa201e8 */ sw $v0,0x1e8($sp) .JF0f0f6d2c: @@ -13638,7 +13638,7 @@ glabel dialogRender /* f0f6da8: 01d8c821 */ addu $t9,$t6,$t8 /* f0f6dac: 8f250000 */ lw $a1,0x0($t9) /* f0f6db0: 8da40000 */ lw $a0,0x0($t5) -/* f0f6db4: 0fc01a60 */ jal 0xf006980 +/* f0f6db4: 0fc01a60 */ jal colourBlend /* f0f6db8: 8c460044 */ lw $a2,0x44($v0) /* f0f6dbc: 00409025 */ move $s2,$v0 /* f0f6dc0: 8fa201ec */ lw $v0,0x1ec($sp) @@ -13665,7 +13665,7 @@ glabel dialogRender /* f0f6e0c: 030ec023 */ subu $t8,$t8,$t6 /* f0f6e10: 0018c080 */ sll $t8,$t8,0x2 /* f0f6e14: 00982021 */ addu $a0,$a0,$t8 -/* f0f6e18: 0fc01a60 */ jal 0xf006980 +/* f0f6e18: 0fc01a60 */ jal colourBlend /* f0f6e1c: 8c842ce8 */ lw $a0,0x2ce8($a0) /* f0f6e20: 00404025 */ move $t0,$v0 .JF0f0f6e24: @@ -13677,7 +13677,7 @@ glabel dialogRender /* f0f6e38: 02a03025 */ move $a2,$s5 /* f0f6e3c: 02203825 */ move $a3,$s1 /* f0f6e40: afb20014 */ sw $s2,0x14($sp) -/* f0f6e44: 0fc38f27 */ jal 0xf0e3c9c +/* f0f6e44: 0fc38f27 */ jal menugfxDrawDialogBorderLine /* f0f6e48: afa80018 */ sw $t0,0x18($sp) /* f0f6e4c: afa201e8 */ sw $v0,0x1e8($sp) /* f0f6e50: 8fa201ec */ lw $v0,0x1ec($sp) @@ -13691,7 +13691,7 @@ glabel dialogRender /* f0f6e6c: 8fa201e8 */ lw $v0,0x1e8($sp) .JF0f0f6e70: /* f0f6e70: 01835821 */ addu $t3,$t4,$v1 -/* f0f6e74: 0c002f29 */ jal 0xbca4 +/* f0f6e74: 0c002f29 */ jal viGetViewLeft /* f0f6e78: afab0088 */ sw $t3,0x88($sp) /* f0f6e7c: 3c0e8008 */ lui $t6,0x8008 /* f0f6e80: 8dce00f4 */ lw $t6,0xf4($t6) @@ -13708,13 +13708,13 @@ glabel dialogRender /* f0f6ea8: 00000000 */ nop /* f0f6eac: 0006000d */ break 0x6 .JF0f0f6eb0: -/* f0f6eb0: 0c002f2d */ jal 0xbcb4 +/* f0f6eb0: 0c002f2d */ jal viGetViewTop /* f0f6eb4: 00000000 */ nop -/* f0f6eb8: 0c002f29 */ jal 0xbca4 +/* f0f6eb8: 0c002f29 */ jal viGetViewLeft /* f0f6ebc: 0040a025 */ move $s4,$v0 /* f0f6ec0: 00028400 */ sll $s0,$v0,0x10 /* f0f6ec4: 0010c403 */ sra $t8,$s0,0x10 -/* f0f6ec8: 0c002f0b */ jal 0xbc2c +/* f0f6ec8: 0c002f0b */ jal viGetViewWidth /* f0f6ecc: 03008025 */ move $s0,$t8 /* f0f6ed0: 3c0f8008 */ lui $t7,0x8008 /* f0f6ed4: 8def00f4 */ lw $t7,0xf4($t7) @@ -13732,11 +13732,11 @@ glabel dialogRender /* f0f6f00: 00000000 */ nop /* f0f6f04: 0006000d */ break 0x6 .JF0f0f6f08: -/* f0f6f08: 0c002f2d */ jal 0xbcb4 +/* f0f6f08: 0c002f2d */ jal viGetViewTop /* f0f6f0c: 00000000 */ nop /* f0f6f10: 00028400 */ sll $s0,$v0,0x10 /* f0f6f14: 00106c03 */ sra $t5,$s0,0x10 -/* f0f6f18: 0c002f0f */ jal 0xbc3c +/* f0f6f18: 0c002f0f */ jal viGetViewHeight /* f0f6f1c: 01a08025 */ move $s0,$t5 /* f0f6f20: 8fac0088 */ lw $t4,0x88($sp) /* f0f6f24: 3c08800a */ lui $t0,0x800a @@ -13810,7 +13810,7 @@ glabel dialogRender /* f0f7014: ac27e560 */ sw $a3,-0x1aa0($at) /* f0f7018: 3c01800a */ lui $at,0x800a /* f0f701c: ac25e564 */ sw $a1,-0x1a9c($at) -/* f0f7020: 0fc3d768 */ jal 0xf0f5da0 +/* f0f7020: 0fc3d768 */ jal menuApplyScissor /* f0f7024: 8fa401e8 */ lw $a0,0x1e8($sp) /* f0f7028: 3c198007 */ lui $t9,0x8007 /* f0f702c: 8f391998 */ lw $t9,0x1998($t9) @@ -13858,7 +13858,7 @@ glabel dialogRender /* f0f70d4: 272f0840 */ addiu $t7,$t9,0x840 /* f0f70d8: 24840008 */ addiu $a0,$a0,0x8 /* f0f70dc: 01ed2821 */ addu $a1,$t7,$t5 -/* f0f70e0: 0fc3d151 */ jal 0xf0f4544 +/* f0f70e0: 0fc3d151 */ jal menuRenderModels /* f0f70e4: 00003025 */ move $a2,$zero /* f0f70e8: 244c0008 */ addiu $t4,$v0,0x8 /* f0f70ec: afac01e8 */ sw $t4,0x1e8($sp) @@ -13868,13 +13868,13 @@ glabel dialogRender /* f0f70fc: ac4b0000 */ sw $t3,0x0($v0) /* f0f7100: 8fd00284 */ lw $s0,0x284($s8) /* f0f7104: 86040634 */ lh $a0,0x634($s0) -/* f0f7108: 0c002f13 */ jal 0xbc4c +/* f0f7108: 0c002f13 */ jal viSetViewPosition /* f0f710c: 86050636 */ lh $a1,0x636($s0) /* f0f7110: 8fd00284 */ lw $s0,0x284($s8) /* f0f7114: c60c1854 */ lwc1 $f12,0x1854($s0) /* f0f7118: c60e1858 */ lwc1 $f14,0x1858($s0) /* f0f711c: 86060630 */ lh $a2,0x630($s0) -/* f0f7120: 0c002f5f */ jal 0xbd7c +/* f0f7120: 0c002f5f */ jal viSetFovAspectAndSize /* f0f7124: 86070632 */ lh $a3,0x632($s0) /* f0f7128: 8fa701ec */ lw $a3,0x1ec($sp) /* f0f712c: 8fa401e8 */ lw $a0,0x1e8($sp) @@ -13930,7 +13930,7 @@ glabel dialogRender /* f0f71e0: 01af6823 */ subu $t5,$t5,$t7 /* f0f71e4: 000d6880 */ sll $t5,$t5,0x2 /* f0f71e8: 008d2021 */ addu $a0,$a0,$t5 -/* f0f71ec: 0fc01a60 */ jal 0xf006980 +/* f0f71ec: 0fc01a60 */ jal colourBlend /* f0f71f0: 8c842cf8 */ lw $a0,0x2cf8($a0) /* f0f71f4: afa20120 */ sw $v0,0x120($sp) /* f0f71f8: 8fa201ec */ lw $v0,0x1ec($sp) @@ -13956,7 +13956,7 @@ glabel dialogRender /* f0f7244: 8fab01d4 */ lw $t3,0x1d4($sp) /* f0f7248: afb80014 */ sw $t8,0x14($sp) /* f0f724c: afb80018 */ sw $t8,0x18($sp) -/* f0f7250: 0fc38f44 */ jal 0xf0e3d10 +/* f0f7250: 0fc38f44 */ jal menugfxDrawFilledRect /* f0f7254: afab0010 */ sw $t3,0x10($sp) /* f0f7258: afa201e8 */ sw $v0,0x1e8($sp) .JF0f0f725c: @@ -14083,7 +14083,7 @@ glabel dialogRender /* f0f7420: afa30014 */ sw $v1,0x14($sp) /* f0f7424: afa30018 */ sw $v1,0x18($sp) /* f0f7428: 02002825 */ move $a1,$s0 -/* f0f742c: 0fc38f44 */ jal 0xf0e3d10 +/* f0f742c: 0fc38f44 */ jal menugfxDrawFilledRect /* f0f7430: 020e3821 */ addu $a3,$s0,$t6 /* f0f7434: afa201e8 */ sw $v0,0x1e8($sp) .JF0f0f7438: @@ -14127,16 +14127,16 @@ glabel dialogRender /* f0f74c8: 01a20019 */ multu $t5,$v0 /* f0f74cc: 00007812 */ mflo $t7 /* f0f74d0: 006fc021 */ addu $t8,$v1,$t7 -/* f0f74d4: 0fc01a60 */ jal 0xf006980 +/* f0f74d4: 0fc01a60 */ jal colourBlend /* f0f74d8: 8f050028 */ lw $a1,0x28($t8) /* f0f74dc: 00402025 */ move $a0,$v0 .JF0f0f74e0: /* f0f74e0: 2401ff00 */ li $at,-256 /* f0f74e4: 00812824 */ and $a1,$a0,$at -/* f0f74e8: 0fc01a60 */ jal 0xf006980 +/* f0f74e8: 0fc01a60 */ jal colourBlend /* f0f74ec: 2406007f */ li $a2,0x7f /* f0f74f0: 8fa401e8 */ lw $a0,0x1e8($sp) -/* f0f74f4: 0fc54bce */ jal 0xf152f38 +/* f0f74f4: 0fc54bce */ jal gfxSetPrimColour /* f0f74f8: 00402825 */ move $a1,$v0 /* f0f74fc: 3c038008 */ lui $v1,0x8008 /* f0f7500: 246300f4 */ addiu $v1,$v1,0xf4 @@ -14160,7 +14160,7 @@ glabel dialogRender /* f0f7548: 316d03ff */ andi $t5,$t3,0x3ff /* f0f754c: 000dc380 */ sll $t8,$t5,0xe /* f0f7550: 030e6025 */ or $t4,$t8,$t6 -/* f0f7554: 0fc54be5 */ jal 0xf152f94 +/* f0f7554: 0fc54be5 */ jal func0f153838 /* f0f7558: ac4c0004 */ sw $t4,0x4($v0) /* f0f755c: afa201e8 */ sw $v0,0x1e8($sp) .JF0f0f7560: @@ -14202,7 +14202,7 @@ glabel dialogRender /* f0f75e0: 51c00006 */ beqzl $t6,.JF0f0f75fc /* f0f75e4: 24010004 */ li $at,0x4 .JF0f0f75e8: -/* f0f75e8: 0fc55880 */ jal 0xf156200 +/* f0f75e8: 0fc55880 */ jal func0f156024 /* f0f75ec: 24040001 */ li $a0,0x1 /* f0f75f0: 8fac0118 */ lw $t4,0x118($sp) /* f0f75f4: 91820000 */ lbu $v0,0x0($t4) @@ -14240,7 +14240,7 @@ glabel dialogRender /* f0f7668: 8fa401e8 */ lw $a0,0x1e8($sp) /* f0f766c: 0040a025 */ move $s4,$v0 /* f0f7670: 24510008 */ addiu $s1,$v0,0x8 -/* f0f7674: 0fc38c93 */ jal 0xf0e324c +/* f0f7674: 0fc38c93 */ jal menugfx0f0e2498 /* f0f7678: 004ff021 */ addu $s8,$v0,$t7 /* f0f767c: 8fa30120 */ lw $v1,0x120($sp) /* f0f7680: 2615ffff */ addiu $s5,$s0,-1 @@ -14252,7 +14252,7 @@ glabel dialogRender /* f0f7698: afb00010 */ sw $s0,0x10($sp) /* f0f769c: afa0001c */ sw $zero,0x1c($sp) /* f0f76a0: afa30014 */ sw $v1,0x14($sp) -/* f0f76a4: 0fc38cd0 */ jal 0xf0e3340 +/* f0f76a4: 0fc38cd0 */ jal menugfxDrawTri2 /* f0f76a8: afa30018 */ sw $v1,0x18($sp) /* f0f76ac: 8fac0120 */ lw $t4,0x120($sp) /* f0f76b0: 240bffff */ li $t3,-1 @@ -14263,7 +14263,7 @@ glabel dialogRender /* f0f76c4: 02203825 */ move $a3,$s1 /* f0f76c8: afb00010 */ sw $s0,0x10($sp) /* f0f76cc: afa0001c */ sw $zero,0x1c($sp) -/* f0f76d0: 0fc38cd0 */ jal 0xf0e3340 +/* f0f76d0: 0fc38cd0 */ jal menugfxDrawTri2 /* f0f76d4: afac0014 */ sw $t4,0x14($sp) /* f0f76d8: 8fa30120 */ lw $v1,0x120($sp) /* f0f76dc: 26130001 */ addiu $s3,$s0,0x1 @@ -14275,7 +14275,7 @@ glabel dialogRender /* f0f76f4: 02403825 */ move $a3,$s2 /* f0f76f8: afa0001c */ sw $zero,0x1c($sp) /* f0f76fc: afa30014 */ sw $v1,0x14($sp) -/* f0f7700: 0fc38cd0 */ jal 0xf0e3340 +/* f0f7700: 0fc38cd0 */ jal menugfxDrawTri2 /* f0f7704: afa30018 */ sw $v1,0x18($sp) /* f0f7708: 8fb90120 */ lw $t9,0x120($sp) /* f0f770c: 240dffff */ li $t5,-1 @@ -14286,7 +14286,7 @@ glabel dialogRender /* f0f7720: 02203825 */ move $a3,$s1 /* f0f7724: afb60010 */ sw $s6,0x10($sp) /* f0f7728: afa0001c */ sw $zero,0x1c($sp) -/* f0f772c: 0fc38cd0 */ jal 0xf0e3340 +/* f0f772c: 0fc38cd0 */ jal menugfxDrawTri2 /* f0f7730: afb90014 */ sw $t9,0x14($sp) /* f0f7734: 8faf0078 */ lw $t7,0x78($sp) /* f0f7738: 00402025 */ move $a0,$v0 @@ -14296,7 +14296,7 @@ glabel dialogRender /* f0f7748: afb30010 */ sw $s3,0x10($sp) /* f0f774c: afb70018 */ sw $s7,0x18($sp) /* f0f7750: afa0001c */ sw $zero,0x1c($sp) -/* f0f7754: 0fc38cd0 */ jal 0xf0e3340 +/* f0f7754: 0fc38cd0 */ jal menugfxDrawTri2 /* f0f7758: afaf0014 */ sw $t7,0x14($sp) /* f0f775c: 8fb80118 */ lw $t8,0x118($sp) /* f0f7760: afa201e8 */ sw $v0,0x1e8($sp) @@ -14319,7 +14319,7 @@ glabel dialogRender /* f0f77a4: afb00010 */ sw $s0,0x10($sp) /* f0f77a8: afa80014 */ sw $t0,0x14($sp) /* f0f77ac: afa80018 */ sw $t0,0x18($sp) -/* f0f77b0: 0fc38cd0 */ jal 0xf0e3340 +/* f0f77b0: 0fc38cd0 */ jal menugfxDrawTri2 /* f0f77b4: afa0001c */ sw $zero,0x1c($sp) /* f0f77b8: 8fad0120 */ lw $t5,0x120($sp) /* f0f77bc: 26320003 */ addiu $s2,$s1,0x3 @@ -14331,7 +14331,7 @@ glabel dialogRender /* f0f77d4: 02a03025 */ move $a2,$s5 /* f0f77d8: afb00010 */ sw $s0,0x10($sp) /* f0f77dc: afa0001c */ sw $zero,0x1c($sp) -/* f0f77e0: 0fc38cd0 */ jal 0xf0e3340 +/* f0f77e0: 0fc38cd0 */ jal menugfxDrawTri2 /* f0f77e4: afad0018 */ sw $t5,0x18($sp) /* f0f77e8: 8faf0120 */ lw $t7,0x120($sp) /* f0f77ec: 00402025 */ move $a0,$v0 @@ -14341,7 +14341,7 @@ glabel dialogRender /* f0f77fc: afb60010 */ sw $s6,0x10($sp) /* f0f7800: afa0001c */ sw $zero,0x1c($sp) /* f0f7804: afaf0014 */ sw $t7,0x14($sp) -/* f0f7808: 0fc38cd0 */ jal 0xf0e3340 +/* f0f7808: 0fc38cd0 */ jal menugfxDrawTri2 /* f0f780c: afaf0018 */ sw $t7,0x18($sp) /* f0f7810: 8fae0120 */ lw $t6,0x120($sp) /* f0f7814: 2418ffff */ li $t8,-1 @@ -14352,7 +14352,7 @@ glabel dialogRender /* f0f7828: 02403825 */ move $a3,$s2 /* f0f782c: afb60010 */ sw $s6,0x10($sp) /* f0f7830: afa0001c */ sw $zero,0x1c($sp) -/* f0f7834: 0fc38cd0 */ jal 0xf0e3340 +/* f0f7834: 0fc38cd0 */ jal menugfxDrawTri2 /* f0f7838: afae0018 */ sw $t6,0x18($sp) /* f0f783c: 8fac0078 */ lw $t4,0x78($sp) /* f0f7840: 00402025 */ move $a0,$v0 @@ -14362,13 +14362,13 @@ glabel dialogRender /* f0f7850: afb30010 */ sw $s3,0x10($sp) /* f0f7854: afb70014 */ sw $s7,0x14($sp) /* f0f7858: afa0001c */ sw $zero,0x1c($sp) -/* f0f785c: 0fc38cd0 */ jal 0xf0e3340 +/* f0f785c: 0fc38cd0 */ jal menugfxDrawTri2 /* f0f7860: afac0018 */ sw $t4,0x18($sp) /* f0f7864: afa201e8 */ sw $v0,0x1e8($sp) .JF0f0f7868: /* f0f7868: 8fa401e8 */ lw $a0,0x1e8($sp) .JF0f0f786c: -/* f0f786c: 0fc3c4bd */ jal 0xf0f12f4 +/* f0f786c: 0fc3c4bd */ jal menuitemRender /* f0f7870: 27a50198 */ addiu $a1,$sp,0x198 /* f0f7874: 8fab0118 */ lw $t3,0x118($sp) /* f0f7878: afa201e8 */ sw $v0,0x1e8($sp) @@ -14382,7 +14382,7 @@ glabel dialogRender .JF0f0f7898: /* f0f7898: 51e00004 */ beqzl $t7,.JF0f0f78ac /* f0f789c: 8fae007c */ lw $t6,0x7c($sp) -/* f0f78a0: 0fc55880 */ jal 0xf156200 +/* f0f78a0: 0fc55880 */ jal func0f156024 /* f0f78a4: 00002025 */ move $a0,$zero /* f0f78a8: 8fae007c */ lw $t6,0x7c($sp) .JF0f0f78ac: @@ -14417,7 +14417,7 @@ glabel dialogRender /* f0f7914: 15a00061 */ bnez $t5,.JF0f0f7a9c /* f0f7918: 8faf01e0 */ lw $t7,0x1e0($sp) /* f0f791c: afaf0194 */ sw $t7,0x194($sp) -/* f0f7920: 0fc54bce */ jal 0xf152f38 +/* f0f7920: 0fc54bce */ jal gfxSetPrimColour /* f0f7924: afa001e4 */ sw $zero,0x1e4($sp) /* f0f7928: 8fae01ec */ lw $t6,0x1ec($sp) /* f0f792c: afa201e8 */ sw $v0,0x1e8($sp) @@ -14485,7 +14485,7 @@ glabel dialogRender /* f0f7a18: afa90014 */ sw $t1,0x14($sp) /* f0f7a1c: 8fa401e8 */ lw $a0,0x1e8($sp) /* f0f7a20: afaf0018 */ sw $t7,0x18($sp) -/* f0f7a24: 0fc3c59c */ jal 0xf0f1670 +/* f0f7a24: 0fc3c59c */ jal menuitemOverlay /* f0f7a28: afad0010 */ sw $t5,0x10($sp) /* f0f7a2c: 8fac01c0 */ lw $t4,0x1c0($sp) /* f0f7a30: 8fae007c */ lw $t6,0x7c($sp) @@ -14513,18 +14513,18 @@ glabel dialogRender /* f0f7a84: 1420ffad */ bnez $at,.JF0f0f793c /* f0f7a88: afab0194 */ sw $t3,0x194($sp) .JF0f0f7a8c: -/* f0f7a8c: 0fc54be5 */ jal 0xf152f94 +/* f0f7a8c: 0fc54be5 */ jal func0f153838 /* f0f7a90: 8fa401e8 */ lw $a0,0x1e8($sp) /* f0f7a94: afa201e8 */ sw $v0,0x1e8($sp) /* f0f7a98: 00402025 */ move $a0,$v0 .JF0f0f7a9c: /* f0f7a9c: 00809825 */ move $s3,$a0 /* f0f7aa0: 24840008 */ addiu $a0,$a0,0x8 -/* f0f7aa4: 0c002f29 */ jal 0xbca4 +/* f0f7aa4: 0c002f29 */ jal viGetViewLeft /* f0f7aa8: afa401e8 */ sw $a0,0x1e8($sp) /* f0f7aac: 00028400 */ sll $s0,$v0,0x10 /* f0f7ab0: 00107c03 */ sra $t7,$s0,0x10 -/* f0f7ab4: 0c002f2d */ jal 0xbcb4 +/* f0f7ab4: 0c002f2d */ jal viGetViewTop /* f0f7ab8: 01e08025 */ move $s0,$t7 /* f0f7abc: 44829000 */ mtc1 $v0,$f18 /* f0f7ac0: 44905000 */ mtc1 $s0,$f10 @@ -14545,19 +14545,19 @@ glabel dialogRender /* f0f7afc: 31af0fff */ andi $t7,$t5,0xfff /* f0f7b00: 000fc300 */ sll $t8,$t7,0xc /* f0f7b04: 01787025 */ or $t6,$t3,$t8 -/* f0f7b08: 0c002f0b */ jal 0xbc2c +/* f0f7b08: 0c002f0b */ jal viGetViewWidth /* f0f7b0c: ae6e0000 */ sw $t6,0x0($s3) /* f0f7b10: 00028c00 */ sll $s1,$v0,0x10 /* f0f7b14: 00116403 */ sra $t4,$s1,0x10 -/* f0f7b18: 0c002f29 */ jal 0xbca4 +/* f0f7b18: 0c002f29 */ jal viGetViewLeft /* f0f7b1c: 01808825 */ move $s1,$t4 /* f0f7b20: 00029400 */ sll $s2,$v0,0x10 /* f0f7b24: 0012cc03 */ sra $t9,$s2,0x10 -/* f0f7b28: 0c002f2d */ jal 0xbcb4 +/* f0f7b28: 0c002f2d */ jal viGetViewTop /* f0f7b2c: 03209025 */ move $s2,$t9 /* f0f7b30: 00028400 */ sll $s0,$v0,0x10 /* f0f7b34: 00106c03 */ sra $t5,$s0,0x10 -/* f0f7b38: 0c002f0f */ jal 0xbc3c +/* f0f7b38: 0c002f0f */ jal viGetViewHeight /* f0f7b3c: 01a08025 */ move $s0,$t5 /* f0f7b40: 00507821 */ addu $t7,$v0,$s0 /* f0f7b44: 448f3000 */ mtc1 $t7,$f6 @@ -14582,11 +14582,11 @@ glabel dialogRender /* f0f7b90: ae780004 */ sw $t8,0x4($s3) /* f0f7b94: 24840008 */ addiu $a0,$a0,0x8 .JF0f0f7b98: -/* f0f7b98: 0c002f29 */ jal 0xbca4 +/* f0f7b98: 0c002f29 */ jal viGetViewLeft /* f0f7b9c: afa401e8 */ sw $a0,0x1e8($sp) /* f0f7ba0: 00028400 */ sll $s0,$v0,0x10 /* f0f7ba4: 00106403 */ sra $t4,$s0,0x10 -/* f0f7ba8: 0c002f2d */ jal 0xbcb4 +/* f0f7ba8: 0c002f2d */ jal viGetViewTop /* f0f7bac: 01808025 */ move $s0,$t4 /* f0f7bb0: 44825000 */ mtc1 $v0,$f10 /* f0f7bb4: 44903000 */ mtc1 $s0,$f6 @@ -14607,19 +14607,19 @@ glabel dialogRender /* f0f7bf0: 330c0fff */ andi $t4,$t8,0xfff /* f0f7bf4: 000ccb00 */ sll $t9,$t4,0xc /* f0f7bf8: 01d96825 */ or $t5,$t6,$t9 -/* f0f7bfc: 0c002f0b */ jal 0xbc2c +/* f0f7bfc: 0c002f0b */ jal viGetViewWidth /* f0f7c00: ae6d0000 */ sw $t5,0x0($s3) /* f0f7c04: 00028c00 */ sll $s1,$v0,0x10 /* f0f7c08: 00117c03 */ sra $t7,$s1,0x10 -/* f0f7c0c: 0c002f29 */ jal 0xbca4 +/* f0f7c0c: 0c002f29 */ jal viGetViewLeft /* f0f7c10: 01e08825 */ move $s1,$t7 /* f0f7c14: 00029400 */ sll $s2,$v0,0x10 /* f0f7c18: 00125c03 */ sra $t3,$s2,0x10 -/* f0f7c1c: 0c002f2d */ jal 0xbcb4 +/* f0f7c1c: 0c002f2d */ jal viGetViewTop /* f0f7c20: 01609025 */ move $s2,$t3 /* f0f7c24: 00028400 */ sll $s0,$v0,0x10 /* f0f7c28: 0010c403 */ sra $t8,$s0,0x10 -/* f0f7c2c: 0c002f0f */ jal 0xbc3c +/* f0f7c2c: 0c002f0f */ jal viGetViewHeight /* f0f7c30: 03008025 */ move $s0,$t8 /* f0f7c34: 00506021 */ addu $t4,$v0,$s0 /* f0f7c38: 448c9000 */ mtc1 $t4,$f18 @@ -14682,7 +14682,7 @@ glabel dialogRender /* f0f7d14: 142000ff */ bnez $at,.JF0f0f8114 /* f0f7d18: 3c014120 */ lui $at,0x4120 /* f0f7d1c: 44816000 */ mtc1 $at,$f12 -/* f0f7d20: 0fc01ae2 */ jal 0xf006b88 +/* f0f7d20: 0fc01ae2 */ jal func0f006b08 /* f0f7d24: 00000000 */ nop /* f0f7d28: 3c01437f */ lui $at,0x437f /* f0f7d2c: 44818000 */ mtc1 $at,$f16 @@ -14752,17 +14752,17 @@ glabel dialogRender /* f0f7e1c: 01620019 */ multu $t3,$v0 /* f0f7e20: 0000c012 */ mflo $t8 /* f0f7e24: 00786021 */ addu $t4,$v1,$t8 -/* f0f7e28: 0fc01a60 */ jal 0xf006980 +/* f0f7e28: 0fc01a60 */ jal colourBlend /* f0f7e2c: 8d850000 */ lw $a1,0x0($t4) /* f0f7e30: 00402825 */ move $a1,$v0 .JF0f0f7e34: /* f0f7e34: 2404ffff */ li $a0,-1 -/* f0f7e38: 0fc01a60 */ jal 0xf006980 +/* f0f7e38: 0fc01a60 */ jal colourBlend /* f0f7e3c: 02003025 */ move $a2,$s0 /* f0f7e40: 3c0141a0 */ lui $at,0x41a0 /* f0f7e44: 4481a000 */ mtc1 $at,$f20 /* f0f7e48: 00408025 */ move $s0,$v0 -/* f0f7e4c: 0fc01ae2 */ jal 0xf006b88 +/* f0f7e4c: 0fc01ae2 */ jal func0f006b08 /* f0f7e50: 4600a306 */ mov.s $f12,$f20 /* f0f7e54: 8fad01dc */ lw $t5,0x1dc($sp) /* f0f7e58: 8fb901d4 */ lw $t9,0x1d4($sp) @@ -14781,10 +14781,10 @@ glabel dialogRender /* f0f7e8c: 26a10001 */ addiu $at,$s5,0x1 /* f0f7e90: 0001a043 */ sra $s4,$at,0x1 .JF0f0f7e94: -/* f0f7e94: 0fc39036 */ jal 0xf0e40d8 +/* f0f7e94: 0fc39036 */ jal menugfxDrawDialogChevron /* f0f7e98: 02803025 */ move $a2,$s4 /* f0f7e9c: afa201e8 */ sw $v0,0x1e8($sp) -/* f0f7ea0: 0fc01ae2 */ jal 0xf006b88 +/* f0f7ea0: 0fc01ae2 */ jal func0f006b08 /* f0f7ea4: 4600a306 */ mov.s $f12,$f20 /* f0f7ea8: 8fa50088 */ lw $a1,0x88($sp) /* f0f7eac: 240b0003 */ li $t3,0x3 @@ -14795,7 +14795,7 @@ glabel dialogRender /* f0f7ec0: afb00014 */ sw $s0,0x14($sp) /* f0f7ec4: afb00018 */ sw $s0,0x18($sp) /* f0f7ec8: e7a0001c */ swc1 $f0,0x1c($sp) -/* f0f7ecc: 0fc39036 */ jal 0xf0e40d8 +/* f0f7ecc: 0fc39036 */ jal menugfxDrawDialogChevron /* f0f7ed0: 24a50005 */ addiu $a1,$a1,0x5 /* f0f7ed4: 3c03800a */ lui $v1,0x800a /* f0f7ed8: 8c6320c4 */ lw $v1,0x20c4($v1) @@ -14810,11 +14810,11 @@ glabel dialogRender /* f0f7efc: 54610086 */ bnel $v1,$at,.JF0f0f8118 /* f0f7f00: 8fa201e8 */ lw $v0,0x1e8($sp) .JF0f0f7f04: -/* f0f7f04: 0fc54d6e */ jal 0xf1535b8 +/* f0f7f04: 0fc54d6e */ jal func0f153e4c /* f0f7f08: 00000000 */ nop -/* f0f7f0c: 0fc54a1a */ jal 0xf152868 +/* f0f7f0c: 0fc54a1a */ jal textSetRotation90 /* f0f7f10: 24040001 */ li $a0,0x1 -/* f0f7f14: 0fc54b55 */ jal 0xf152d54 +/* f0f7f14: 0fc54b55 */ jal func0f153628 /* f0f7f18: 8fa401e8 */ lw $a0,0x1e8($sp) /* f0f7f1c: afa201e8 */ sw $v0,0x1e8($sp) /* f0f7f20: 82230015 */ lb $v1,0x15($s1) @@ -14827,7 +14827,7 @@ glabel dialogRender .JF0f0f7f3c: /* f0f7f3c: 02386021 */ addu $t4,$s1,$t8 /* f0f7f40: 8d8f0000 */ lw $t7,0x0($t4) -/* f0f7f44: 0fc3c883 */ jal 0xf0f220c +/* f0f7f44: 0fc3c883 */ jal menuResolveDialogTitle /* f0f7f48: 8de40000 */ lw $a0,0x0($t7) /* f0f7f4c: 3c138008 */ lui $s3,0x8008 /* f0f7f50: 26730140 */ addiu $s3,$s3,0x140 @@ -14842,7 +14842,7 @@ glabel dialogRender /* f0f7f74: 8e470000 */ lw $a3,0x0($s2) /* f0f7f78: 00403025 */ move $a2,$v0 /* f0f7f7c: afa00014 */ sw $zero,0x14($sp) -/* f0f7f80: 0fc55d49 */ jal 0xf157524 +/* f0f7f80: 0fc55d49 */ jal textMeasure /* f0f7f84: afad0010 */ sw $t5,0x10($sp) /* f0f7f88: 8fa200ac */ lw $v0,0xac($sp) /* f0f7f8c: 8fa301e0 */ lw $v1,0x1e0($sp) @@ -14864,7 +14864,7 @@ glabel dialogRender /* f0f7fc8: afa301d0 */ sw $v1,0x1d0($sp) /* f0f7fcc: afae01cc */ sw $t6,0x1cc($sp) .JF0f0f7fd0: -/* f0f7fd0: 0c002eef */ jal 0xbbbc +/* f0f7fd0: 0c002eef */ jal viGetHeight /* f0f7fd4: 00000000 */ nop /* f0f7fd8: 8e4b0000 */ lw $t3,0x0($s2) /* f0f7fdc: 8e780000 */ lw $t8,0x0($s3) @@ -14880,7 +14880,7 @@ glabel dialogRender /* f0f8004: afa00028 */ sw $zero,0x28($sp) /* f0f8008: afab0010 */ sw $t3,0x10($sp) /* f0f800c: afb80014 */ sw $t8,0x14($sp) -/* f0f8010: 0fc55886 */ jal 0xf156218 +/* f0f8010: 0fc55886 */ jal textRenderProjected /* f0f8014: afaf001c */ sw $t7,0x1c($sp) /* f0f8018: afa201e8 */ sw $v0,0x1e8($sp) /* f0f801c: 82230015 */ lb $v1,0x15($s1) @@ -14894,7 +14894,7 @@ glabel dialogRender .JF0f0f803c: /* f0f803c: 02397021 */ addu $t6,$s1,$t9 /* f0f8040: 8dcb0000 */ lw $t3,0x0($t6) -/* f0f8044: 0fc3c883 */ jal 0xf0f220c +/* f0f8044: 0fc3c883 */ jal menuResolveDialogTitle /* f0f8048: 8d640000 */ lw $a0,0x0($t3) /* f0f804c: 8e780000 */ lw $t8,0x0($s3) /* f0f8050: 00408025 */ move $s0,$v0 @@ -14903,7 +14903,7 @@ glabel dialogRender /* f0f805c: 00403025 */ move $a2,$v0 /* f0f8060: 8e470000 */ lw $a3,0x0($s2) /* f0f8064: afa00014 */ sw $zero,0x14($sp) -/* f0f8068: 0fc55d49 */ jal 0xf157524 +/* f0f8068: 0fc55d49 */ jal textMeasure /* f0f806c: afb80010 */ sw $t8,0x10($sp) /* f0f8070: 8fa200ac */ lw $v0,0xac($sp) /* f0f8074: 8fa30088 */ lw $v1,0x88($sp) @@ -14925,7 +14925,7 @@ glabel dialogRender /* f0f80b0: afa301d0 */ sw $v1,0x1d0($sp) /* f0f80b4: afad01cc */ sw $t5,0x1cc($sp) .JF0f0f80b8: -/* f0f80b8: 0c002eef */ jal 0xbbbc +/* f0f80b8: 0c002eef */ jal viGetHeight /* f0f80bc: 00000000 */ nop /* f0f80c0: 8e590000 */ lw $t9,0x0($s2) /* f0f80c4: 8e6e0000 */ lw $t6,0x0($s3) @@ -14941,12 +14941,12 @@ glabel dialogRender /* f0f80ec: afa00028 */ sw $zero,0x28($sp) /* f0f80f0: afb90010 */ sw $t9,0x10($sp) /* f0f80f4: afae0014 */ sw $t6,0x14($sp) -/* f0f80f8: 0fc55886 */ jal 0xf156218 +/* f0f80f8: 0fc55886 */ jal textRenderProjected /* f0f80fc: afb8001c */ sw $t8,0x1c($sp) -/* f0f8100: 0fc54bb7 */ jal 0xf152edc +/* f0f8100: 0fc54bb7 */ jal func0f153780 /* f0f8104: 00402025 */ move $a0,$v0 /* f0f8108: afa201e8 */ sw $v0,0x1e8($sp) -/* f0f810c: 0fc54a1a */ jal 0xf152868 +/* f0f810c: 0fc54a1a */ jal textSetRotation90 /* f0f8110: 00002025 */ move $a0,$zero .JF0f0f8114: /* f0f8114: 8fa201e8 */ lw $v0,0x1e8($sp) @@ -20161,7 +20161,7 @@ glabel var7f1b369cjf /* f0f83d4: afa40040 */ sw $a0,0x40($sp) /* f0f83d8: afa50044 */ sw $a1,0x44($sp) /* f0f83dc: afa60048 */ sw $a2,0x48($sp) -/* f0f83e0: 0c002f29 */ jal 0xbca4 +/* f0f83e0: 0c002f29 */ jal viGetViewLeft /* f0f83e4: afa7004c */ sw $a3,0x4c($sp) /* f0f83e8: 3c0e8008 */ lui $t6,0x8008 /* f0f83ec: 8dce00f4 */ lw $t6,0xf4($t6) @@ -20182,12 +20182,12 @@ glabel var7f1b369cjf /* f0f8424: 0006000d */ break 0x6 .JF0f0f8428: /* f0f8428: afa6003c */ sw $a2,0x3c($sp) -/* f0f842c: 0c002f2d */ jal 0xbcb4 +/* f0f842c: 0c002f2d */ jal viGetViewTop /* f0f8430: 00000000 */ nop /* f0f8434: 24440004 */ addiu $a0,$v0,0x4 -/* f0f8438: 0c002f29 */ jal 0xbca4 +/* f0f8438: 0c002f29 */ jal viGetViewLeft /* f0f843c: afa40038 */ sw $a0,0x38($sp) -/* f0f8440: 0c002f0b */ jal 0xbc2c +/* f0f8440: 0c002f0b */ jal viGetViewWidth /* f0f8444: a7a2001e */ sh $v0,0x1e($sp) /* f0f8448: 87af001e */ lh $t7,0x1e($sp) /* f0f844c: 3c198008 */ lui $t9,0x8008 @@ -20212,15 +20212,15 @@ glabel var7f1b369cjf /* f0f8494: 0006000d */ break 0x6 .JF0f0f8498: /* f0f8498: afa70034 */ sw $a3,0x34($sp) -/* f0f849c: 0c002f2d */ jal 0xbcb4 +/* f0f849c: 0c002f2d */ jal viGetViewTop /* f0f84a0: 00000000 */ nop -/* f0f84a4: 0c002f0f */ jal 0xbc3c +/* f0f84a4: 0c002f0f */ jal viGetViewHeight /* f0f84a8: a7a2001e */ sh $v0,0x1e($sp) /* f0f84ac: 87ae001e */ lh $t6,0x1e($sp) /* f0f84b0: afa00024 */ sw $zero,0x24($sp) /* f0f84b4: 004e2821 */ addu $a1,$v0,$t6 /* f0f84b8: 24a5fffc */ addiu $a1,$a1,-4 -/* f0f84bc: 0fc3c64f */ jal 0xf0f193c +/* f0f84bc: 0fc3c64f */ jal currentPlayerIsMenuOpenInSoloOrMp /* f0f84c0: afa50030 */ sw $a1,0x30($sp) /* f0f84c4: 8fa30024 */ lw $v1,0x24($sp) /* f0f84c8: 8fa40038 */ lw $a0,0x38($sp) @@ -20255,7 +20255,7 @@ glabel var7f1b369cjf /* f0f8530: afa40038 */ sw $a0,0x38($sp) /* f0f8534: afa50030 */ sw $a1,0x30($sp) /* f0f8538: afa6003c */ sw $a2,0x3c($sp) -/* f0f853c: 0fc548e8 */ jal 0xf1523a0 +/* f0f853c: 0fc548e8 */ jal optionsGetEffectiveScreenSize /* f0f8540: afa70034 */ sw $a3,0x34($sp) /* f0f8544: 24010002 */ li $at,0x2 /* f0f8548: 8fa40038 */ lw $a0,0x38($sp) @@ -20657,7 +20657,7 @@ glabel var7f1b369cjf /* f0f8ad0: 01ca7821 */ addu $t7,$t6,$t2 /* f0f8ad4: 55e1002a */ bnel $t7,$at,.JF0f0f8b80 /* f0f8ad8: 8fbf0014 */ lw $ra,0x14($sp) -/* f0f8adc: 0fc54978 */ jal 0xf1525e0 +/* f0f8adc: 0fc54978 */ jal optionsGetScreenSplit /* f0f8ae0: 00000000 */ nop /* f0f8ae4: 24080001 */ li $t0,0x1 /* f0f8ae8: 3c0d800a */ lui $t5,0x800a @@ -22090,7 +22090,7 @@ glabel var7f1b2ac8 .JF0f0fb488: /* f0fb488: afa80124 */ sw $t0,0x124($sp) /* f0fb48c: afa90128 */ sw $t1,0x128($sp) -/* f0fb490: 0fc3c829 */ jal 0xf0f20a4 +/* f0fb490: 0fc3c829 */ jal func0f0f1418 /* f0fb494: afac012c */ sw $t4,0x12c($sp) /* f0fb498: 8eef0000 */ lw $t7,0x0($s7) /* f0fb49c: 8fa80124 */ lw $t0,0x124($sp) @@ -22131,7 +22131,7 @@ glabel var7f1b2ac8 /* f0fb524: afa90128 */ sw $t1,0x128($sp) /* f0fb528: afaa00f4 */ sw $t2,0xf4($sp) /* f0fb52c: afab00f0 */ sw $t3,0xf0($sp) -/* f0fb530: 0fc3e053 */ jal 0xf0f814c +/* f0fb530: 0fc3e053 */ jal menuGetContPads /* f0fb534: afac012c */ sw $t4,0x12c($sp) /* f0fb538: 83a200d7 */ lb $v0,0xd7($sp) /* f0fb53c: 8fa80124 */ lw $t0,0x124($sp) @@ -22174,7 +22174,7 @@ glabel var7f1b2ac8 /* f0fb5c8: afab00f0 */ sw $t3,0xf0($sp) /* f0fb5cc: afac012c */ sw $t4,0x12c($sp) /* f0fb5d0: afae00cc */ sw $t6,0xcc($sp) -/* f0fb5d4: 0fc42599 */ jal 0xf109664 +/* f0fb5d4: 0fc42599 */ jal filemgrSaveOrLoad /* f0fb5d8: a7af00d0 */ sh $t7,0xd0($sp) /* f0fb5dc: 8fa80124 */ lw $t0,0x124($sp) /* f0fb5e0: 8fa90128 */ lw $t1,0x128($sp) @@ -22197,22 +22197,22 @@ glabel var7f1b2ac8 /* f0fb618: afab00f0 */ sw $t3,0xf0($sp) /* f0fb61c: afaa00f4 */ sw $t2,0xf4($sp) /* f0fb620: afa90128 */ sw $t1,0x128($sp) -/* f0fb624: 0c00536a */ jal 0x14da8 +/* f0fb624: 0c00536a */ jal joyGetStickX /* f0fb628: afa80124 */ sw $t0,0x124($sp) /* f0fb62c: 00028600 */ sll $s0,$v0,0x18 /* f0fb630: 0010c603 */ sra $t8,$s0,0x18 /* f0fb634: 03008025 */ move $s0,$t8 -/* f0fb638: 0c005394 */ jal 0x14e50 +/* f0fb638: 0c005394 */ jal joyGetStickY /* f0fb63c: 82640003 */ lb $a0,0x3($s3) /* f0fb640: 00028e00 */ sll $s1,$v0,0x18 /* f0fb644: 0011ce03 */ sra $t9,$s1,0x18 /* f0fb648: 03208825 */ move $s1,$t9 /* f0fb64c: 82640003 */ lb $a0,0x3($s3) -/* f0fb650: 0c0053be */ jal 0x14ef8 +/* f0fb650: 0c0053be */ jal joyGetButtons /* f0fb654: 3405ffff */ li $a1,0xffff /* f0fb658: 3052ffff */ andi $s2,$v0,0xffff /* f0fb65c: 82640003 */ lb $a0,0x3($s3) -/* f0fb660: 0c0053ee */ jal 0x14fb8 +/* f0fb660: 0c0053ee */ jal joyGetButtonsPressedThisFrame /* f0fb664: 3405ffff */ li $a1,0xffff /* f0fb668: 304e8000 */ andi $t6,$v0,0x8000 /* f0fb66c: 8fa80124 */ lw $t0,0x124($sp) @@ -22922,7 +22922,7 @@ glabel var7f1b2ac8 /* f0fbf9c: 24060001 */ li $a2,0x1 /* f0fbfa0: 24130001 */ li $s3,0x1 .JF0f0fbfa4: -/* f0fbfa4: 0fc3e816 */ jal 0xf0fa058 +/* f0fbfa4: 0fc3e816 */ jal dialogTick /* f0fbfa8: 8e240000 */ lw $a0,0x0($s1) /* f0fbfac: 824e0014 */ lb $t6,0x14($s2) /* f0fbfb0: 26100001 */ addiu $s0,$s0,0x1 @@ -22981,7 +22981,7 @@ glabel var7f1b2ac8 /* f0fc07c: 24845e34 */ addiu $a0,$a0,0x5e34 /* f0fc080: 10820005 */ beq $a0,$v0,.JF0f0fc098 /* f0fc084: 00000000 */ nop -/* f0fc088: 0fc3cef8 */ jal 0xf0f3be0 +/* f0fc088: 0fc3cef8 */ jal menuPushDialog /* f0fc08c: 00000000 */ nop /* f0fc090: 1000002f */ b .JF0f0fc150 /* f0fc094: 8fbf003c */ lw $ra,0x3c($sp) @@ -22990,7 +22990,7 @@ glabel var7f1b2ac8 /* f0fc09c: 27186cfc */ addiu $t8,$t8,0x6cfc /* f0fc0a0: 5702002b */ bnel $t8,$v0,.JF0f0fc150 /* f0fc0a4: 8fbf003c */ lw $ra,0x3c($sp) -/* f0fc0a8: 0fc5fe86 */ jal 0xf17fa18 +/* f0fc0a8: 0fc5fe86 */ jal func0f17f428 /* f0fc0ac: 00000000 */ nop /* f0fc0b0: 10000027 */ b .JF0f0fc150 /* f0fc0b4: 8fbf003c */ lw $ra,0x3c($sp) @@ -22998,7 +22998,7 @@ glabel var7f1b2ac8 /* f0fc0bc: 8dce0cb4 */ lw $t6,0xcb4($t6) /* f0fc0c0: 51c00010 */ beqzl $t6,.JF0f0fc104 /* f0fc0c4: 240e000a */ li $t6,0xa -/* f0fc0c8: 0fc3e386 */ jal 0xf0f8e18 +/* f0fc0c8: 0fc3e386 */ jal func0f0f8120 /* f0fc0cc: 00000000 */ nop /* f0fc0d0: 3c0f8007 */ lui $t7,0x8007 /* f0fc0d4: 8def1998 */ lw $t7,0x1998($t7) @@ -23030,7 +23030,7 @@ glabel var7f1b2ac8 /* f0fc138: 33380020 */ andi $t8,$t9,0x20 /* f0fc13c: 57000004 */ bnezl $t8,.JF0f0fc150 /* f0fc140: 8fbf003c */ lw $ra,0x3c($sp) -/* f0fc144: 0fc3e386 */ jal 0xf0f8e18 +/* f0fc144: 0fc3e386 */ jal func0f0f8120 /* f0fc148: 00000000 */ nop .JF0f0fc14c: /* f0fc14c: 8fbf003c */ lw $ra,0x3c($sp) @@ -27911,7 +27911,7 @@ glabel var7f1b381cjf /* f0fc97c: 3c018008 */ lui $at,0x8008 /* f0fc980: ac2200f4 */ sw $v0,0xf4($at) .JF0f0fc984: -/* f0fc984: 0fc35617 */ jal 0xf0d585c +/* f0fc984: 0fc35617 */ jal func0f0d479c /* f0fc988: 02a02025 */ move $a0,$s5 /* f0fc98c: 3c138006 */ lui $s3,0x8006 /* f0fc990: 3c17800a */ lui $s7,0x800a @@ -27934,23 +27934,23 @@ glabel var7f1b381cjf /* f0fc9d4: 92e50014 */ lbu $a1,0x14($s7) /* f0fc9d8: 46062201 */ sub.s $f8,$f4,$f6 /* f0fc9dc: 44064000 */ mfc1 $a2,$f8 -/* f0fc9e0: 0fc3f05f */ jal 0xf0fc17c +/* f0fc9e0: 0fc3f05f */ jal menuRenderBackgroundLayer1 /* f0fc9e4: 00000000 */ nop /* f0fc9e8: 1000000e */ b .JF0f0fca24 /* f0fc9ec: 0040a825 */ move $s5,$v0 .JF0f0fc9f0: /* f0fc9f0: 92e50014 */ lbu $a1,0x14($s7) -/* f0fc9f4: 0fc3f05f */ jal 0xf0fc17c +/* f0fc9f4: 0fc3f05f */ jal menuRenderBackgroundLayer1 /* f0fc9f8: 3c063f80 */ lui $a2,0x3f80 /* f0fc9fc: 00402025 */ move $a0,$v0 /* f0fca00: 92e50015 */ lbu $a1,0x15($s7) -/* f0fca04: 0fc3f05f */ jal 0xf0fc17c +/* f0fca04: 0fc3f05f */ jal menuRenderBackgroundLayer1 /* f0fca08: 8ee60010 */ lw $a2,0x10($s7) /* f0fca0c: 10000005 */ b .JF0f0fca24 /* f0fca10: 0040a825 */ move $s5,$v0 .JF0f0fca14: /* f0fca14: 92e50014 */ lbu $a1,0x14($s7) -/* f0fca18: 0fc3f05f */ jal 0xf0fc17c +/* f0fca18: 0fc3f05f */ jal menuRenderBackgroundLayer1 /* f0fca1c: 3c063f80 */ lui $a2,0x3f80 /* f0fca20: 0040a825 */ move $s5,$v0 .JF0f0fca24: @@ -27983,7 +27983,7 @@ glabel var7f1b381cjf /* f0fca88: 00008025 */ move $s0,$zero /* f0fca8c: 26b50008 */ addiu $s5,$s5,0x8 /* f0fca90: ac4c0000 */ sw $t4,0x0($v0) -/* f0fca94: 0c004b60 */ jal 0x12d80 +/* f0fca94: 0c004b60 */ jal random /* f0fca98: ac4d0004 */ sw $t5,0x4($v0) /* f0fca9c: 44825000 */ mtc1 $v0,$f10 /* f0fcaa0: 3c014f80 */ lui $at,0x4f80 @@ -28003,7 +28003,7 @@ glabel var7f1b381cjf /* f0fcad4: 00000000 */ nop /* f0fcad8: 4502002d */ bc1fl .JF0f0fcb90 /* f0fcadc: 8ee30004 */ lw $v1,0x4($s7) -/* f0fcae0: 0c004b60 */ jal 0x12d80 +/* f0fcae0: 0c004b60 */ jal random /* f0fcae4: 00000000 */ nop /* f0fcae8: 44829000 */ mtc1 $v0,$f18 /* f0fcaec: 3c014f80 */ lui $at,0x4f80 @@ -28025,7 +28025,7 @@ glabel var7f1b381cjf /* f0fcb28: 460a4482 */ mul.s $f18,$f8,$f10 /* f0fcb2c: 46049400 */ add.s $f16,$f18,$f4 /* f0fcb30: 46068201 */ sub.s $f8,$f16,$f6 -/* f0fcb34: 0c004b60 */ jal 0x12d80 +/* f0fcb34: 0c004b60 */ jal random /* f0fcb38: e6e80554 */ swc1 $f8,0x554($s7) /* f0fcb3c: 44825000 */ mtc1 $v0,$f10 /* f0fcb40: 3c014f80 */ lui $at,0x4f80 @@ -28134,7 +28134,7 @@ glabel var7f1b381cjf /* f0fccb4: aee0059c */ sw $zero,0x59c($s7) /* f0fccb8: a2e005d4 */ sb $zero,0x5d4($s7) .JF0f0fccbc: -/* f0fccbc: 0c0036b4 */ jal 0xdad0 +/* f0fccbc: 0c0036b4 */ jal mainOverrideVariable /* f0fccc0: 24a51a44 */ addiu $a1,$a1,0x1a44 /* f0fccc4: 3c188007 */ lui $t8,0x8007 /* f0fccc8: 8f181a44 */ lw $t8,0x1a44($t8) @@ -28146,7 +28146,7 @@ glabel var7f1b381cjf /* f0fcce0: 24a520dc */ addiu $a1,$a1,0x20dc /* f0fcce4: 24060001 */ li $a2,0x1 /* f0fcce8: 332affdf */ andi $t2,$t9,0xffdf -/* f0fccec: 0fc3d151 */ jal 0xf0f4544 +/* f0fccec: 0fc3d151 */ jal menuRenderModels /* f0fccf0: a2ea05d5 */ sb $t2,0x5d5($s7) /* f0fccf4: 3c0cb600 */ lui $t4,0xb600 /* f0fccf8: 240b0001 */ li $t3,0x1 @@ -28192,22 +28192,22 @@ glabel var7f1b381cjf /* f0fcd88: 92e50014 */ lbu $a1,0x14($s7) /* f0fcd8c: 460a4101 */ sub.s $f4,$f8,$f10 /* f0fcd90: 44062000 */ mfc1 $a2,$f4 -/* f0fcd94: 0fc3f225 */ jal 0xf0fc894 +/* f0fcd94: 0fc3f225 */ jal menuRenderBackgroundLayer2 /* f0fcd98: 00000000 */ nop /* f0fcd9c: 1000000d */ b .JF0f0fcdd4 /* f0fcda0: 0040a825 */ move $s5,$v0 .JF0f0fcda4: /* f0fcda4: 92e50014 */ lbu $a1,0x14($s7) -/* f0fcda8: 0fc3f225 */ jal 0xf0fc894 +/* f0fcda8: 0fc3f225 */ jal menuRenderBackgroundLayer2 /* f0fcdac: 3c063f80 */ lui $a2,0x3f80 /* f0fcdb0: 00402025 */ move $a0,$v0 /* f0fcdb4: 92e50015 */ lbu $a1,0x15($s7) -/* f0fcdb8: 0fc3f225 */ jal 0xf0fc894 +/* f0fcdb8: 0fc3f225 */ jal menuRenderBackgroundLayer2 /* f0fcdbc: 8ee60010 */ lw $a2,0x10($s7) /* f0fcdc0: 10000004 */ b .JF0f0fcdd4 /* f0fcdc4: 0040a825 */ move $s5,$v0 .JF0f0fcdc8: -/* f0fcdc8: 0fc3f225 */ jal 0xf0fc894 +/* f0fcdc8: 0fc3f225 */ jal menuRenderBackgroundLayer2 /* f0fcdcc: 92e50014 */ lbu $a1,0x14($s7) /* f0fcdd0: 0040a825 */ move $s5,$v0 .JF0f0fcdd4: @@ -28227,18 +28227,18 @@ glabel var7f1b381cjf /* f0fce04: 57000009 */ bnezl $t8,.JF0f0fce2c /* f0fce08: 8ef90000 */ lw $t9,0x0($s7) .JF0f0fce0c: -/* f0fce0c: 0fc356a2 */ jal 0xf0d5a88 +/* f0fce0c: 0fc356a2 */ jal func0f0d49c8 /* f0fce10: 02a02025 */ move $a0,$s5 -/* f0fce14: 0fc2f3fe */ jal 0xf0bcff8 +/* f0fce14: 0fc2f3fe */ jal playerRenderHealthBar /* f0fce18: 00402025 */ move $a0,$v0 -/* f0fce1c: 0fc35617 */ jal 0xf0d585c +/* f0fce1c: 0fc35617 */ jal func0f0d479c /* f0fce20: 00402025 */ move $a0,$v0 /* f0fce24: 0040a825 */ move $s5,$v0 /* f0fce28: 8ef90000 */ lw $t9,0x0($s7) .JF0f0fce2c: /* f0fce2c: 5b20017c */ blezl $t9,.JF0f0fd420 /* f0fce30: 82ef001b */ lb $t7,0x1b($s7) -/* f0fce34: 0fc54c87 */ jal 0xf15321c +/* f0fce34: 0fc54c87 */ jal func0f153ab0 /* f0fce38: 02a02025 */ move $a0,$s5 /* f0fce3c: 8ee30004 */ lw $v1,0x4($s7) /* f0fce40: 24010004 */ li $at,0x4 @@ -28251,13 +28251,13 @@ glabel var7f1b381cjf /* f0fce58: 8eca0288 */ lw $t2,0x288($s6) /* f0fce5c: 02a02025 */ move $a0,$s5 /* f0fce60: 8d4c0070 */ lw $t4,0x70($t2) -/* f0fce64: 0fc3e4e8 */ jal 0xf0f93a0 +/* f0fce64: 0fc3e4e8 */ jal menuRenderDialogs /* f0fce68: ae2c0000 */ sw $t4,0x0($s1) /* f0fce6c: 10000008 */ b .JF0f0fce90 /* f0fce70: 0040a825 */ move $s5,$v0 .JF0f0fce74: /* f0fce74: ae300000 */ sw $s0,0x0($s1) -/* f0fce78: 0fc3e4e8 */ jal 0xf0f93a0 +/* f0fce78: 0fc3e4e8 */ jal menuRenderDialogs /* f0fce7c: 02a02025 */ move $a0,$s5 /* f0fce80: 26100001 */ addiu $s0,$s0,0x1 /* f0fce84: 24010004 */ li $at,0x4 @@ -28269,16 +28269,16 @@ glabel var7f1b381cjf /* f0fce98: 356b0040 */ ori $t3,$t3,0x40 /* f0fce9c: 02a08025 */ move $s0,$s5 /* f0fcea0: ae0b0000 */ sw $t3,0x0($s0) -/* f0fcea4: 0fc2d81a */ jal 0xf0b6068 +/* f0fcea4: 0fc2d81a */ jal currentPlayerGetUnk1750 /* f0fcea8: 26b50008 */ addiu $s5,$s5,0x8 -/* f0fceac: 0c012b34 */ jal 0x4acd0 +/* f0fceac: 0c012b34 */ jal osVirtualToPhysical /* f0fceb0: 00402025 */ move $a0,$v0 /* f0fceb4: 02a01825 */ move $v1,$s5 /* f0fceb8: ae020004 */ sw $v0,0x4($s0) /* f0fcebc: 3c0d0600 */ lui $t5,0x600 /* f0fcec0: ac6d0000 */ sw $t5,0x0($v1) /* f0fcec4: ac730004 */ sw $s3,0x4($v1) -/* f0fcec8: 0fc54cab */ jal 0xf1532ac +/* f0fcec8: 0fc54cab */ jal func0f153b40 /* f0fcecc: 26b50008 */ addiu $s5,$s5,0x8 /* f0fced0: 8ee30004 */ lw $v1,0x4($s7) /* f0fced4: 24010003 */ li $at,0x3 @@ -28287,7 +28287,7 @@ glabel var7f1b381cjf /* f0fcee0: 54610149 */ bnel $v1,$at,.JF0f0fd408 /* f0fcee4: 02a01025 */ move $v0,$s5 .JF0f0fcee8: -/* f0fcee8: 0c002f29 */ jal 0xbca4 +/* f0fcee8: 0c002f29 */ jal viGetViewLeft /* f0fceec: 00000000 */ nop /* f0fcef0: 3c0e8008 */ lui $t6,0x8008 /* f0fcef4: 8dce00f4 */ lw $t6,0xf4($t6) @@ -28306,14 +28306,14 @@ glabel var7f1b381cjf /* f0fcf24: 0006000d */ break 0x6 .JF0f0fcf28: /* f0fcf28: afb800f0 */ sw $t8,0xf0($sp) -/* f0fcf2c: 0c002f2d */ jal 0xbcb4 +/* f0fcf2c: 0c002f2d */ jal viGetViewTop /* f0fcf30: 00000000 */ nop /* f0fcf34: 24590004 */ addiu $t9,$v0,0x4 -/* f0fcf38: 0c002f29 */ jal 0xbca4 +/* f0fcf38: 0c002f29 */ jal viGetViewLeft /* f0fcf3c: afb900ec */ sw $t9,0xec($sp) /* f0fcf40: 00028400 */ sll $s0,$v0,0x10 /* f0fcf44: 00105403 */ sra $t2,$s0,0x10 -/* f0fcf48: 0c002f0b */ jal 0xbc2c +/* f0fcf48: 0c002f0b */ jal viGetViewWidth /* f0fcf4c: 01408025 */ move $s0,$t2 /* f0fcf50: 3c0b8008 */ lui $t3,0x8008 /* f0fcf54: 8d6b00f4 */ lw $t3,0xf4($t3) @@ -28333,16 +28333,16 @@ glabel var7f1b381cjf /* f0fcf88: 0006000d */ break 0x6 .JF0f0fcf8c: /* f0fcf8c: afae00e8 */ sw $t6,0xe8($sp) -/* f0fcf90: 0c002f2d */ jal 0xbcb4 +/* f0fcf90: 0c002f2d */ jal viGetViewTop /* f0fcf94: 00000000 */ nop /* f0fcf98: 00028400 */ sll $s0,$v0,0x10 /* f0fcf9c: 00107c03 */ sra $t7,$s0,0x10 -/* f0fcfa0: 0c002f0f */ jal 0xbc3c +/* f0fcfa0: 0c002f0f */ jal viGetViewHeight /* f0fcfa4: 01e08025 */ move $s0,$t7 /* f0fcfa8: 0050c021 */ addu $t8,$v0,$s0 /* f0fcfac: 2719fffc */ addiu $t9,$t8,-4 /* f0fcfb0: afb900e4 */ sw $t9,0xe4($sp) -/* f0fcfb4: 0fc54b55 */ jal 0xf152d54 +/* f0fcfb4: 0fc54b55 */ jal func0f153628 /* f0fcfb8: 02a02025 */ move $a0,$s5 /* f0fcfbc: 3c13800a */ lui $s3,0x800a /* f0fcfc0: 0040a825 */ move $s5,$v0 @@ -28359,16 +28359,16 @@ glabel var7f1b381cjf /* f0fcfe8: 24100001 */ li $s0,0x1 /* f0fcfec: 5180000f */ beqzl $t4,.JF0f0fd02c /* f0fcff0: 8eeb0004 */ lw $t3,0x4($s7) -/* f0fcff4: 0fc5baa5 */ jal 0xf16ea94 +/* f0fcff4: 0fc5baa5 */ jal langGet /* f0fcff8: 240451e2 */ li $a0,0x51e2 /* f0fcffc: 00408825 */ move $s1,$v0 -/* f0fd000: 0fc5baa5 */ jal 0xf16ea94 +/* f0fd000: 0fc5baa5 */ jal langGet /* f0fd004: 240458ca */ li $a0,0x58ca /* f0fd008: 3c057f1b */ lui $a1,0x7f1b /* f0fd00c: 24a534c0 */ addiu $a1,$a1,0x34c0 /* f0fd010: 02802025 */ move $a0,$s4 /* f0fd014: 02203025 */ move $a2,$s1 -/* f0fd018: 0c004d95 */ jal 0x13654 +/* f0fd018: 0c004d95 */ jal sprintf /* f0fd01c: 00403825 */ move $a3,$v0 /* f0fd020: 10000023 */ b .JF0f0fd0b0 /* f0fd024: 00000000 */ nop @@ -28400,16 +28400,16 @@ glabel var7f1b381cjf /* f0fd07c: 10000001 */ b .JF0f0fd084 /* f0fd080: 01c08025 */ move $s0,$t6 .JF0f0fd084: -/* f0fd084: 0fc5baa5 */ jal 0xf16ea94 +/* f0fd084: 0fc5baa5 */ jal langGet /* f0fd088: 240451e2 */ li $a0,0x51e2 /* f0fd08c: 00408825 */ move $s1,$v0 -/* f0fd090: 0fc5baa5 */ jal 0xf16ea94 +/* f0fd090: 0fc5baa5 */ jal langGet /* f0fd094: 240451e3 */ li $a0,0x51e3 /* f0fd098: 3c057f1b */ lui $a1,0x7f1b /* f0fd09c: 24a534c8 */ addiu $a1,$a1,0x34c8 /* f0fd0a0: 02802025 */ move $a0,$s4 /* f0fd0a4: 02203025 */ move $a2,$s1 -/* f0fd0a8: 0c004d95 */ jal 0x13654 +/* f0fd0a8: 0c004d95 */ jal sprintf /* f0fd0ac: 00403825 */ move $a3,$v0 .JF0f0fd0b0: /* f0fd0b0: 120000cd */ beqz $s0,.JF0f0fd3e8 @@ -28422,9 +28422,9 @@ glabel var7f1b381cjf /* f0fd0cc: 02803025 */ move $a2,$s4 /* f0fd0d0: afa00014 */ sw $zero,0x14($sp) /* f0fd0d4: 02f28821 */ addu $s1,$s7,$s2 -/* f0fd0d8: 0fc55d49 */ jal 0xf157524 +/* f0fd0d8: 0fc55d49 */ jal textMeasure /* f0fd0dc: afaf0010 */ sw $t7,0x10($sp) -/* f0fd0e0: 0c004ff9 */ jal 0x13fe4 +/* f0fd0e0: 0c004ff9 */ jal joyGetConnectedControllers /* f0fd0e4: 00000000 */ nop /* f0fd0e8: 3c19800b */ lui $t9,0x800b /* f0fd0ec: 9739d5ce */ lhu $t9,-0x2a32($t9) @@ -28478,7 +28478,7 @@ glabel var7f1b381cjf /* f0fd19c: 18400092 */ blez $v0,.JF0f0fd3e8 /* f0fd1a0: 3c0141a0 */ lui $at,0x41a0 /* f0fd1a4: 44816000 */ mtc1 $at,$f12 -/* f0fd1a8: 0fc01ae2 */ jal 0xf006b88 +/* f0fd1a8: 0fc01ae2 */ jal func0f006b08 /* f0fd1ac: 00000000 */ nop /* f0fd1b0: 3c01437f */ lui $at,0x437f /* f0fd1b4: 44813000 */ mtc1 $at,$f6 @@ -28520,11 +28520,11 @@ glabel var7f1b381cjf /* f0fd23c: 00000000 */ nop .JF0f0fd240: /* f0fd240: 44cdf800 */ ctc1 $t5,$31 -/* f0fd244: 0fc5baa5 */ jal 0xf16ea94 +/* f0fd244: 0fc5baa5 */ jal langGet /* f0fd248: afae00a0 */ sw $t6,0xa0($sp) /* f0fd24c: 02802025 */ move $a0,$s4 /* f0fd250: 00402825 */ move $a1,$v0 -/* f0fd254: 0c004d95 */ jal 0x13654 +/* f0fd254: 0c004d95 */ jal sprintf /* f0fd258: 26460001 */ addiu $a2,$s2,0x1 /* f0fd25c: 2a410002 */ slti $at,$s2,0x2 /* f0fd260: 10200005 */ beqz $at,.JF0f0fd278 @@ -28553,11 +28553,11 @@ glabel var7f1b381cjf /* f0fd2ac: 25f80002 */ addiu $t8,$t7,0x2 /* f0fd2b0: afb800ac */ sw $t8,0xac($sp) .JF0f0fd2b4: -/* f0fd2b4: 0c002eeb */ jal 0xbbac +/* f0fd2b4: 0c002eeb */ jal viGetWidth /* f0fd2b8: 00000000 */ nop /* f0fd2bc: 00028400 */ sll $s0,$v0,0x10 /* f0fd2c0: 0010cc03 */ sra $t9,$s0,0x10 -/* f0fd2c4: 0c002eef */ jal 0xbbbc +/* f0fd2c4: 0c002eef */ jal viGetHeight /* f0fd2c8: 03208025 */ move $s0,$t9 /* f0fd2cc: 922b0017 */ lbu $t3,0x17($s1) /* f0fd2d0: 3c0c8008 */ lui $t4,0x8008 @@ -28577,7 +28577,7 @@ glabel var7f1b381cjf /* f0fd308: afa00024 */ sw $zero,0x24($sp) /* f0fd30c: afa00028 */ sw $zero,0x28($sp) /* f0fd310: afaa0014 */ sw $t2,0x14($sp) -/* f0fd314: 0fc55886 */ jal 0xf156218 +/* f0fd314: 0fc55886 */ jal textRenderProjected /* f0fd318: afac0010 */ sw $t4,0x10($sp) /* f0fd31c: 8ece0490 */ lw $t6,0x490($s6) /* f0fd320: 24010002 */ li $at,0x2 @@ -28587,32 +28587,32 @@ glabel var7f1b381cjf /* f0fd330: 81f80494 */ lb $t8,0x494($t7) /* f0fd334: 13000008 */ beqz $t8,.JF0f0fd358 /* f0fd338: 00000000 */ nop -/* f0fd33c: 0fc5baa5 */ jal 0xf16ea94 +/* f0fd33c: 0fc5baa5 */ jal langGet /* f0fd340: 240458ca */ li $a0,0x58ca /* f0fd344: 02802025 */ move $a0,$s4 -/* f0fd348: 0c004c34 */ jal 0x130d0 +/* f0fd348: 0c004c34 */ jal strcpy /* f0fd34c: 00402825 */ move $a1,$v0 /* f0fd350: 1000000d */ b .JF0f0fd388 /* f0fd354: 2403ffff */ li $v1,-1 .JF0f0fd358: -/* f0fd358: 0fc5baa5 */ jal 0xf16ea94 +/* f0fd358: 0fc5baa5 */ jal langGet /* f0fd35c: 240451e3 */ li $a0,0x51e3 /* f0fd360: 02802025 */ move $a0,$s4 -/* f0fd364: 0c004c34 */ jal 0x130d0 +/* f0fd364: 0c004c34 */ jal strcpy /* f0fd368: 00402825 */ move $a1,$v0 /* f0fd36c: 3c0400ff */ lui $a0,0xff /* f0fd370: 3484ff00 */ ori $a0,$a0,0xff00 /* f0fd374: 2405ff00 */ li $a1,-256 -/* f0fd378: 0fc01a60 */ jal 0xf006980 +/* f0fd378: 0fc01a60 */ jal colourBlend /* f0fd37c: 8fa600a0 */ lw $a2,0xa0($sp) /* f0fd380: 92390017 */ lbu $t9,0x17($s1) /* f0fd384: 03221825 */ or $v1,$t9,$v0 .JF0f0fd388: -/* f0fd388: 0c002eeb */ jal 0xbbac +/* f0fd388: 0c002eeb */ jal viGetWidth /* f0fd38c: afa300a4 */ sw $v1,0xa4($sp) /* f0fd390: 00028400 */ sll $s0,$v0,0x10 /* f0fd394: 00106403 */ sra $t4,$s0,0x10 -/* f0fd398: 0c002eef */ jal 0xbbbc +/* f0fd398: 0c002eef */ jal viGetHeight /* f0fd39c: 01808025 */ move $s0,$t4 /* f0fd3a0: 3c0a8008 */ lui $t2,0x8008 /* f0fd3a4: 3c0b8008 */ lui $t3,0x8008 @@ -28629,7 +28629,7 @@ glabel var7f1b381cjf /* f0fd3d0: afa00028 */ sw $zero,0x28($sp) /* f0fd3d4: afab0014 */ sw $t3,0x14($sp) /* f0fd3d8: afaa0010 */ sw $t2,0x10($sp) -/* f0fd3dc: 0fc55886 */ jal 0xf156218 +/* f0fd3dc: 0fc55886 */ jal textRenderProjected /* f0fd3e0: afa30018 */ sw $v1,0x18($sp) /* f0fd3e4: 0040a825 */ move $s5,$v0 .JF0f0fd3e8: @@ -28637,7 +28637,7 @@ glabel var7f1b381cjf /* f0fd3ec: 24010004 */ li $at,0x4 /* f0fd3f0: 5641fef8 */ bnel $s2,$at,.JF0f0fcfd4 /* f0fd3f4: 8ec20490 */ lw $v0,0x490($s6) -/* f0fd3f8: 0fc54bb7 */ jal 0xf152edc +/* f0fd3f8: 0fc54bb7 */ jal func0f153780 /* f0fd3fc: 02a02025 */ move $a0,$s5 /* f0fd400: 0040a825 */ move $s5,$v0 /* f0fd404: 02a01025 */ move $v0,$s5 @@ -28652,7 +28652,7 @@ glabel var7f1b381cjf /* f0fd420: 2401ffff */ li $at,-1 /* f0fd424: 11e100a1 */ beq $t7,$at,.JF0f0fd6ac /* f0fd428: 00000000 */ nop -/* f0fd42c: 0c002f29 */ jal 0xbca4 +/* f0fd42c: 0c002f29 */ jal viGetViewLeft /* f0fd430: 00000000 */ nop /* f0fd434: 3c188008 */ lui $t8,0x8008 /* f0fd438: 8f1800f4 */ lw $t8,0xf4($t8) @@ -28670,13 +28670,13 @@ glabel var7f1b381cjf /* f0fd464: 00000000 */ nop /* f0fd468: 0006000d */ break 0x6 .JF0f0fd46c: -/* f0fd46c: 0c002f2d */ jal 0xbcb4 +/* f0fd46c: 0c002f2d */ jal viGetViewTop /* f0fd470: 00000000 */ nop -/* f0fd474: 0c002f29 */ jal 0xbca4 +/* f0fd474: 0c002f29 */ jal viGetViewLeft /* f0fd478: afa20094 */ sw $v0,0x94($sp) /* f0fd47c: 00028400 */ sll $s0,$v0,0x10 /* f0fd480: 00106403 */ sra $t4,$s0,0x10 -/* f0fd484: 0c002f0b */ jal 0xbc2c +/* f0fd484: 0c002f0b */ jal viGetViewWidth /* f0fd488: 01808025 */ move $s0,$t4 /* f0fd48c: 3c0b8008 */ lui $t3,0x8008 /* f0fd490: 8d6b00f4 */ lw $t3,0xf4($t3) @@ -28694,11 +28694,11 @@ glabel var7f1b381cjf /* f0fd4bc: 00000000 */ nop /* f0fd4c0: 0006000d */ break 0x6 .JF0f0fd4c4: -/* f0fd4c4: 0c002f2d */ jal 0xbcb4 +/* f0fd4c4: 0c002f2d */ jal viGetViewTop /* f0fd4c8: 00000000 */ nop /* f0fd4cc: 00028400 */ sll $s0,$v0,0x10 /* f0fd4d0: 00106c03 */ sra $t5,$s0,0x10 -/* f0fd4d4: 0c002f0f */ jal 0xbc3c +/* f0fd4d4: 0c002f0f */ jal viGetViewHeight /* f0fd4d8: 01a08025 */ move $s0,$t5 /* f0fd4dc: 8ec7006c */ lw $a3,0x6c($s6) /* f0fd4e0: 00504821 */ addu $t1,$v0,$s0 @@ -28775,7 +28775,7 @@ glabel var7f1b381cjf /* f0fd5cc: 01885021 */ addu $t2,$t4,$t0 /* f0fd5d0: 55410013 */ bnel $t2,$at,.JF0f0fd620 /* f0fd5d4: 8ece006c */ lw $t6,0x6c($s6) -/* f0fd5d8: 0fc54978 */ jal 0xf1525e0 +/* f0fd5d8: 0fc54978 */ jal optionsGetScreenSplit /* f0fd5dc: afa9008c */ sw $t1,0x8c($sp) /* f0fd5e0: 24010001 */ li $at,0x1 /* f0fd5e4: 10410006 */ beq $v0,$at,.JF0f0fd600 @@ -28836,11 +28836,11 @@ glabel var7f1b381cjf /* f0fd694: afa90010 */ sw $t1,0x10($sp) /* f0fd698: afb2001c */ sw $s2,0x1c($sp) /* f0fd69c: afb30020 */ sw $s3,0x20($sp) -/* f0fd6a0: 0fc3c68e */ jal 0xf0f1a38 +/* f0fd6a0: 0fc3c68e */ jal menuRenderBanner /* f0fd6a4: afaa0018 */ sw $t2,0x18($sp) /* f0fd6a8: 0040a825 */ move $s5,$v0 .JF0f0fd6ac: -/* f0fd6ac: 0fc356a2 */ jal 0xf0d5a88 +/* f0fd6ac: 0fc356a2 */ jal func0f0d49c8 /* f0fd6b0: 02a02025 */ move $a0,$s5 /* f0fd6b4: 8fbf0054 */ lw $ra,0x54($sp) /* f0fd6b8: 240b0001 */ li $t3,0x1 diff --git a/src/game/menugfx.c b/src/game/menugfx.c index b6bdf9d30..09d759c31 100644 --- a/src/game/menugfx.c +++ b/src/game/menugfx.c @@ -661,9 +661,9 @@ glabel menugfxRenderBgBlur /* f0e1758: afa60098 */ sw $a2,0x98($sp) /* f0e175c: 15c10013 */ bne $t6,$at,.JF0f0e17ac /* f0e1760: afa7009c */ sw $a3,0x9c($sp) -/* f0e1764: 0c002eeb */ jal 0xbbac +/* f0e1764: 0c002eeb */ jal viGetWidth /* f0e1768: 00000000 */ nop -/* f0e176c: 0c002eef */ jal 0xbbbc +/* f0e176c: 0c002eef */ jal viGetHeight /* f0e1770: a7a20030 */ sh $v0,0x30($sp) /* f0e1774: 240f00ff */ li $t7,0xff /* f0e1778: 241800ff */ li $t8,0xff @@ -675,15 +675,15 @@ glabel menugfxRenderBgBlur /* f0e1790: 00002825 */ move $a1,$zero /* f0e1794: 00003025 */ move $a2,$zero /* f0e1798: 87a70030 */ lh $a3,0x30($sp) -/* f0e179c: 0fc38aa7 */ jal 0xf0e2a9c +/* f0e179c: 0fc38aa7 */ jal menugfxRenderGradient /* f0e17a0: afa20010 */ sw $v0,0x10($sp) /* f0e17a4: 100000ae */ b .JF0f0e1a60 /* f0e17a8: 8fbf002c */ lw $ra,0x2c($sp) .JF0f0e17ac: -/* f0e17ac: 0fc59f77 */ jal 0xf167ddc +/* f0e17ac: 0fc59f77 */ jal gfxAllocateColours /* f0e17b0: 24040001 */ li $a0,0x1 /* f0e17b4: afa2008c */ sw $v0,0x8c($sp) -/* f0e17b8: 0fc59f5d */ jal 0xf167d74 +/* f0e17b8: 0fc59f5d */ jal gfxAllocateVertices /* f0e17bc: 24040004 */ li $a0,0x4 /* f0e17c0: 02001825 */ move $v1,$s0 /* f0e17c4: 26100008 */ addiu $s0,$s0,0x8 @@ -787,9 +787,9 @@ glabel menugfxRenderBgBlur /* f0e194c: ac580004 */ sw $t8,0x4($v0) /* f0e1950: ac4f0000 */ sw $t7,0x0($v0) /* f0e1954: 26100008 */ addiu $s0,$s0,0x8 -/* f0e1958: 0c002eeb */ jal 0xbbac +/* f0e1958: 0c002eeb */ jal viGetWidth /* f0e195c: afa50088 */ sw $a1,0x88($sp) -/* f0e1960: 0c002eef */ jal 0xbbbc +/* f0e1960: 0c002eef */ jal viGetHeight /* f0e1964: 00000000 */ nop /* f0e1968: 8fa50088 */ lw $a1,0x88($sp) /* f0e196c: 87a3009a */ lh $v1,0x9a($sp) @@ -832,7 +832,7 @@ glabel menugfxRenderBgBlur /* f0e1a00: ac6a0000 */ sw $t2,0x0($v1) /* f0e1a04: afa3003c */ sw $v1,0x3c($sp) /* f0e1a08: 26100008 */ addiu $s0,$s0,0x8 -/* f0e1a0c: 0c012b34 */ jal 0x4acd0 +/* f0e1a0c: 0c012b34 */ jal osVirtualToPhysical /* f0e1a10: afa50088 */ sw $a1,0x88($sp) /* f0e1a14: 8fa3003c */ lw $v1,0x3c($sp) /* f0e1a18: 8fa40088 */ lw $a0,0x88($sp) @@ -842,7 +842,7 @@ glabel menugfxRenderBgBlur /* f0e1a28: ac620004 */ sw $v0,0x4($v1) /* f0e1a2c: accb0000 */ sw $t3,0x0($a2) /* f0e1a30: afa60038 */ sw $a2,0x38($sp) -/* f0e1a34: 0c012b34 */ jal 0x4acd0 +/* f0e1a34: 0c012b34 */ jal osVirtualToPhysical /* f0e1a38: 26100008 */ addiu $s0,$s0,0x8 /* f0e1a3c: 8fa60038 */ lw $a2,0x38($sp) /* f0e1a40: 3c0cb100 */ lui $t4,0xb100 diff --git a/src/game/menuitem.c b/src/game/menuitem.c index 49f4e03f6..25950522f 100644 --- a/src/game/menuitem.c +++ b/src/game/menuitem.c @@ -299,47 +299,47 @@ glabel menuitemListRender /* f0e723c: 00000000 */ nop /* f0e7240: afc00000 */ sw $zero,0x0($s8) .JF0f0e7244: -/* f0e7244: 0c002eda */ jal 0xbb68 +/* f0e7244: 0c002eda */ jal viGetBufWidth /* f0e7248: a7a500ee */ sh $a1,0xee($sp) /* f0e724c: 3c0a8007 */ lui $t2,0x8007 /* f0e7250: 8d4a16d0 */ lw $t2,0x16d0($t2) /* f0e7254: 004a082a */ slt $at,$v0,$t2 /* f0e7258: 10200005 */ beqz $at,.JF0f0e7270 /* f0e725c: 00000000 */ nop -/* f0e7260: 0c002eda */ jal 0xbb68 +/* f0e7260: 0c002eda */ jal viGetBufWidth /* f0e7264: 00000000 */ nop /* f0e7268: 3c018007 */ lui $at,0x8007 /* f0e726c: ac2216d0 */ sw $v0,0x16d0($at) .JF0f0e7270: -/* f0e7270: 0c002eda */ jal 0xbb68 +/* f0e7270: 0c002eda */ jal viGetBufWidth /* f0e7274: 00000000 */ nop /* f0e7278: 8eeb0000 */ lw $t3,0x0($s7) /* f0e727c: 004b082a */ slt $at,$v0,$t3 /* f0e7280: 10200004 */ beqz $at,.JF0f0e7294 /* f0e7284: 00000000 */ nop -/* f0e7288: 0c002eda */ jal 0xbb68 +/* f0e7288: 0c002eda */ jal viGetBufWidth /* f0e728c: 00000000 */ nop /* f0e7290: aee20000 */ sw $v0,0x0($s7) .JF0f0e7294: -/* f0e7294: 0c002ede */ jal 0xbb78 +/* f0e7294: 0c002ede */ jal viGetBufHeight /* f0e7298: 00000000 */ nop /* f0e729c: 3c0c8007 */ lui $t4,0x8007 /* f0e72a0: 8d8c16d8 */ lw $t4,0x16d8($t4) /* f0e72a4: 004c082a */ slt $at,$v0,$t4 /* f0e72a8: 10200005 */ beqz $at,.JF0f0e72c0 /* f0e72ac: 00000000 */ nop -/* f0e72b0: 0c002ede */ jal 0xbb78 +/* f0e72b0: 0c002ede */ jal viGetBufHeight /* f0e72b4: 00000000 */ nop /* f0e72b8: 3c018007 */ lui $at,0x8007 /* f0e72bc: ac2216d8 */ sw $v0,0x16d8($at) .JF0f0e72c0: -/* f0e72c0: 0c002ede */ jal 0xbb78 +/* f0e72c0: 0c002ede */ jal viGetBufHeight /* f0e72c4: 00000000 */ nop /* f0e72c8: 8fc30000 */ lw $v1,0x0($s8) /* f0e72cc: 0043082a */ slt $at,$v0,$v1 /* f0e72d0: 10200005 */ beqz $at,.JF0f0e72e8 /* f0e72d4: 00000000 */ nop -/* f0e72d8: 0c002ede */ jal 0xbb78 +/* f0e72d8: 0c002ede */ jal viGetBufHeight /* f0e72dc: 00000000 */ nop /* f0e72e0: afc20000 */ sw $v0,0x0($s8) /* f0e72e4: 00401825 */ move $v1,$v0 @@ -439,7 +439,7 @@ glabel menuitemListRender /* f0e7440: 00ca6821 */ addu $t5,$a2,$t2 /* f0e7444: afad0010 */ sw $t5,0x10($sp) /* f0e7448: 02002825 */ move $a1,$s0 -/* f0e744c: 0fc38907 */ jal 0xf0e241c +/* f0e744c: 0fc38907 */ jal menugfx0f0e1668 /* f0e7450: 020b3821 */ addu $a3,$s0,$t3 /* f0e7454: 86300000 */ lh $s0,0x0($s1) /* f0e7458: 86260002 */ lh $a2,0x2($s1) @@ -456,7 +456,7 @@ glabel menuitemListRender /* f0e7484: afae0014 */ sw $t6,0x14($sp) /* f0e7488: 00402025 */ move $a0,$v0 /* f0e748c: 02002825 */ move $a1,$s0 -/* f0e7490: 0fc38e16 */ jal 0xf0e3858 +/* f0e7490: 0fc38e16 */ jal menugfxDrawShimmer /* f0e7494: 26070001 */ addiu $a3,$s0,0x1 /* f0e7498: 862a0000 */ lh $t2,0x0($s1) /* f0e749c: 862d0004 */ lh $t5,0x4($s1) @@ -473,7 +473,7 @@ glabel menuitemListRender /* f0e74c8: afaf001c */ sw $t7,0x1c($sp) /* f0e74cc: afae0014 */ sw $t6,0x14($sp) /* f0e74d0: afa00018 */ sw $zero,0x18($sp) -/* f0e74d4: 0fc38e16 */ jal 0xf0e3858 +/* f0e74d4: 0fc38e16 */ jal menugfxDrawShimmer /* f0e74d8: 00402025 */ move $a0,$v0 /* f0e74dc: 86300000 */ lh $s0,0x0($s1) /* f0e74e0: 86260002 */ lh $a2,0x2($s1) @@ -489,7 +489,7 @@ glabel menuitemListRender /* f0e7508: afa00018 */ sw $zero,0x18($sp) /* f0e750c: 00402025 */ move $a0,$v0 /* f0e7510: 02002825 */ move $a1,$s0 -/* f0e7514: 0fc38e16 */ jal 0xf0e3858 +/* f0e7514: 0fc38e16 */ jal menugfxDrawShimmer /* f0e7518: 020b3821 */ addu $a3,$s0,$t3 /* f0e751c: 86300000 */ lh $s0,0x0($s1) /* f0e7520: 862e0002 */ lh $t6,0x2($s1) @@ -506,7 +506,7 @@ glabel menuitemListRender /* f0e754c: afa00018 */ sw $zero,0x18($sp) /* f0e7550: 00402025 */ move $a0,$v0 /* f0e7554: 02002825 */ move $a1,$s0 -/* f0e7558: 0fc38e16 */ jal 0xf0e3858 +/* f0e7558: 0fc38e16 */ jal menugfxDrawShimmer /* f0e755c: 02183821 */ addu $a3,$s0,$t8 /* f0e7560: 00409025 */ move $s2,$v0 /* f0e7564: 8e270008 */ lw $a3,0x8($s1) @@ -549,13 +549,13 @@ glabel menuitemListRender /* f0e75ec: 870b0000 */ lh $t3,0x0($t8) /* f0e75f0: 8e250008 */ lw $a1,0x8($s1) /* f0e75f4: 01762023 */ subu $a0,$t3,$s6 -/* f0e75f8: 0fc39ab7 */ jal 0xf0e6adc +/* f0e75f8: 0fc39ab7 */ jal menuitem0f0e5d2c /* f0e75fc: 00808025 */ move $s0,$a0 /* f0e7600: 862a0002 */ lh $t2,0x2($s1) /* f0e7604: 0040a825 */ move $s5,$v0 /* f0e7608: 02402025 */ move $a0,$s2 /* f0e760c: 01506821 */ addu $t5,$t2,$s0 -/* f0e7610: 0fc54b55 */ jal 0xf152d54 +/* f0e7610: 0fc54b55 */ jal func0f153628 /* f0e7614: afad012c */ sw $t5,0x12c($sp) /* f0e7618: 00152400 */ sll $a0,$s5,0x10 /* f0e761c: afa00160 */ sw $zero,0x160($sp) @@ -563,7 +563,7 @@ glabel menuitemListRender /* f0e7624: 00409025 */ move $s2,$v0 /* f0e7628: 02a09825 */ move $s3,$s5 /* f0e762c: 01802025 */ move $a0,$t4 -/* f0e7630: 0fc39b2a */ jal 0xf0e6ca8 +/* f0e7630: 0fc39b2a */ jal menuitem0f0e5ef8 /* f0e7634: 8e250008 */ lw $a1,0x8($s1) /* f0e7638: 8fb9016c */ lw $t9,0x16c($sp) /* f0e763c: 00567021 */ addu $t6,$v0,$s6 @@ -650,7 +650,7 @@ glabel menuitemListRender /* f0e7770: afad0010 */ sw $t5,0x10($sp) /* f0e7774: 8e2e0010 */ lw $t6,0x10($s1) /* f0e7778: 02402025 */ move $a0,$s2 -/* f0e777c: 0fc39b79 */ jal 0xf0e6de4 +/* f0e777c: 0fc39b79 */ jal menuitemListRenderHeader /* f0e7780: afae001c */ sw $t6,0x1c($sp) /* f0e7784: 240f0001 */ li $t7,0x1 /* f0e7788: 00409025 */ move $s2,$v0 @@ -717,7 +717,7 @@ glabel menuitemListRender /* f0e7860: 01750019 */ multu $t3,$s5 /* f0e7864: 00005012 */ mflo $t2 /* f0e7868: 02ca6821 */ addu $t5,$s6,$t2 -/* f0e786c: 0fc01a60 */ jal 0xf006980 +/* f0e786c: 0fc01a60 */ jal colourBlend /* f0e7870: 8da50018 */ lw $a1,0x18($t5) /* f0e7874: 00408025 */ move $s0,$v0 /* f0e7878: 8e230010 */ lw $v1,0x10($s1) @@ -727,7 +727,7 @@ glabel menuitemListRender /* f0e7884: 00002825 */ move $a1,$zero /* f0e7888: 51800009 */ beqzl $t4,.JF0f0e78b0 /* f0e788c: 906f003c */ lbu $t7,0x3c($v1) -/* f0e7890: 0fc01a60 */ jal 0xf006980 +/* f0e7890: 0fc01a60 */ jal colourBlend /* f0e7894: 2406007f */ li $a2,0x7f /* f0e7898: 2401ff00 */ li $at,-256 /* f0e789c: 0041c824 */ and $t9,$v0,$at @@ -743,7 +743,7 @@ glabel menuitemListRender /* f0e78c0: 00822021 */ addu $a0,$a0,$v0 /* f0e78c4: 00a22821 */ addu $a1,$a1,$v0 /* f0e78c8: 8ca52e60 */ lw $a1,0x2e60($a1) -/* f0e78cc: 0fc54d69 */ jal 0xf1535a4 +/* f0e78cc: 0fc54d69 */ jal func0f153e38 /* f0e78d0: 8c842fc8 */ lw $a0,0x2fc8($a0) /* f0e78d4: 8fb800fc */ lw $t8,0xfc($sp) /* f0e78d8: 8faa0108 */ lw $t2,0x108($sp) @@ -754,7 +754,7 @@ glabel menuitemListRender /* f0e78ec: 000b5280 */ sll $t2,$t3,0xa /* f0e78f0: 05430006 */ bgezl $t2,.JF0f0e790c /* f0e78f4: 8cf90010 */ lw $t9,0x10($a3) -/* f0e78f8: 0fc3d768 */ jal 0xf0f5da0 +/* f0e78f8: 0fc3d768 */ jal menuApplyScissor /* f0e78fc: 02402025 */ move $a0,$s2 /* f0e7900: 00409025 */ move $s2,$v0 /* f0e7904: 8e270008 */ lw $a3,0x8($s1) @@ -787,7 +787,7 @@ glabel menuitemListRender /* f0e7968: 01f43021 */ addu $a2,$t7,$s4 /* f0e796c: 0006c400 */ sll $t8,$a2,0x10 /* f0e7970: 00183403 */ sra $a2,$t8,0x10 -/* f0e7974: 0fc39b79 */ jal 0xf0e6de4 +/* f0e7974: 0fc39b79 */ jal menuitemListRenderHeader /* f0e7978: afb9001c */ sw $t9,0x1c($sp) /* f0e797c: 8fad014c */ lw $t5,0x14c($sp) /* f0e7980: 8fac0100 */ lw $t4,0x100($sp) @@ -833,7 +833,7 @@ glabel menuitemListRender /* f0e7a14: 51e00065 */ beqzl $t7,.JF0f0e7bac /* f0e7a18: 8e2e0008 */ lw $t6,0x8($s1) /* f0e7a1c: 44816000 */ mtc1 $at,$f12 -/* f0e7a20: 0fc01ae2 */ jal 0xf006b88 +/* f0e7a20: 0fc01ae2 */ jal func0f006b08 /* f0e7a24: 00000000 */ nop /* f0e7a28: 3c01437f */ lui $at,0x437f /* f0e7a2c: 44812000 */ mtc1 $at,$f4 @@ -899,18 +899,18 @@ glabel menuitemListRender /* f0e7b0c: 03150019 */ multu $t8,$s5 /* f0e7b10: 00005812 */ mflo $t3 /* f0e7b14: 02cb5021 */ addu $t2,$s6,$t3 -/* f0e7b18: 0fc01a60 */ jal 0xf006980 +/* f0e7b18: 0fc01a60 */ jal colourBlend /* f0e7b1c: 8d450020 */ lw $a1,0x20($t2) /* f0e7b20: 00403825 */ move $a3,$v0 .JF0f0e7b24: /* f0e7b24: 02002025 */ move $a0,$s0 /* f0e7b28: 320500ff */ andi $a1,$s0,0xff /* f0e7b2c: 2406007f */ li $a2,0x7f -/* f0e7b30: 0fc01a60 */ jal 0xf006980 +/* f0e7b30: 0fc01a60 */ jal colourBlend /* f0e7b34: afa700b0 */ sw $a3,0xb0($sp) /* f0e7b38: 8fa500b0 */ lw $a1,0xb0($sp) /* f0e7b3c: 00402025 */ move $a0,$v0 -/* f0e7b40: 0fc01a60 */ jal 0xf006980 +/* f0e7b40: 0fc01a60 */ jal colourBlend /* f0e7b44: 8fa600ac */ lw $a2,0xac($sp) /* f0e7b48: 8e230010 */ lw $v1,0x10($s1) /* f0e7b4c: 44809000 */ mtc1 $zero,$f18 @@ -934,7 +934,7 @@ glabel menuitemListRender /* f0e7b90: 51800006 */ beqzl $t4,.JF0f0e7bac /* f0e7b94: 8e2e0008 */ lw $t6,0x8($s1) .JF0f0e7b98: -/* f0e7b98: 0fc55880 */ jal 0xf156200 +/* f0e7b98: 0fc55880 */ jal func0f156024 /* f0e7b9c: 24040001 */ li $a0,0x1 /* f0e7ba0: 24190001 */ li $t9,0x1 /* f0e7ba4: afb900b4 */ sw $t9,0xb4($sp) @@ -998,7 +998,7 @@ glabel menuitemListRender /* f0e7c78: afa40094 */ sw $a0,0x94($sp) .JF0f0e7c7c: /* f0e7c7c: afa50090 */ sw $a1,0x90($sp) -/* f0e7c80: 0c002eeb */ jal 0xbbac +/* f0e7c80: 0c002eeb */ jal viGetWidth /* f0e7c84: afa7008c */ sw $a3,0x8c($sp) /* f0e7c88: 3c0a8008 */ lui $t2,0x8008 /* f0e7c8c: 8d4a00f4 */ lw $t2,0xf4($t2) @@ -1022,7 +1022,7 @@ glabel menuitemListRender /* f0e7ccc: 50200014 */ beqzl $at,.JF0f0e7d20 /* f0e7cd0: afa40094 */ sw $a0,0x94($sp) /* f0e7cd4: afa50090 */ sw $a1,0x90($sp) -/* f0e7cd8: 0c002eeb */ jal 0xbbac +/* f0e7cd8: 0c002eeb */ jal viGetWidth /* f0e7cdc: afa7008c */ sw $a3,0x8c($sp) /* f0e7ce0: 3c198008 */ lui $t9,0x8008 /* f0e7ce4: 8f3900f4 */ lw $t9,0xf4($t9) @@ -1044,7 +1044,7 @@ glabel menuitemListRender /* f0e7d1c: afa40094 */ sw $a0,0x94($sp) .JF0f0e7d20: /* f0e7d20: afa50090 */ sw $a1,0x90($sp) -/* f0e7d24: 0c002eeb */ jal 0xbbac +/* f0e7d24: 0c002eeb */ jal viGetWidth /* f0e7d28: afa7008c */ sw $a3,0x8c($sp) /* f0e7d2c: 3c0b8008 */ lui $t3,0x8008 /* f0e7d30: 8d6b00f4 */ lw $t3,0xf4($t3) @@ -1068,7 +1068,7 @@ glabel menuitemListRender /* f0e7d70: 50200014 */ beqzl $at,.JF0f0e7dc4 /* f0e7d74: 02401025 */ move $v0,$s2 /* f0e7d78: afa40094 */ sw $a0,0x94($sp) -/* f0e7d7c: 0c002eeb */ jal 0xbbac +/* f0e7d7c: 0c002eeb */ jal viGetWidth /* f0e7d80: afa50090 */ sw $a1,0x90($sp) /* f0e7d84: 3c0e8008 */ lui $t6,0x8008 /* f0e7d88: 8dce00f4 */ lw $t6,0xf4($t6) @@ -1130,47 +1130,47 @@ glabel menuitemListRender /* f0e7e50: 00000000 */ nop /* f0e7e54: afc00000 */ sw $zero,0x0($s8) .JF0f0e7e58: -/* f0e7e58: 0c002eda */ jal 0xbb68 +/* f0e7e58: 0c002eda */ jal viGetBufWidth /* f0e7e5c: 00000000 */ nop /* f0e7e60: 3c0e8007 */ lui $t6,0x8007 /* f0e7e64: 8dce16d0 */ lw $t6,0x16d0($t6) /* f0e7e68: 004e082a */ slt $at,$v0,$t6 /* f0e7e6c: 10200005 */ beqz $at,.JF0f0e7e84 /* f0e7e70: 00000000 */ nop -/* f0e7e74: 0c002eda */ jal 0xbb68 +/* f0e7e74: 0c002eda */ jal viGetBufWidth /* f0e7e78: 00000000 */ nop /* f0e7e7c: 3c018007 */ lui $at,0x8007 /* f0e7e80: ac2216d0 */ sw $v0,0x16d0($at) .JF0f0e7e84: -/* f0e7e84: 0c002eda */ jal 0xbb68 +/* f0e7e84: 0c002eda */ jal viGetBufWidth /* f0e7e88: 00000000 */ nop /* f0e7e8c: 8eef0000 */ lw $t7,0x0($s7) /* f0e7e90: 004f082a */ slt $at,$v0,$t7 /* f0e7e94: 10200004 */ beqz $at,.JF0f0e7ea8 /* f0e7e98: 00000000 */ nop -/* f0e7e9c: 0c002eda */ jal 0xbb68 +/* f0e7e9c: 0c002eda */ jal viGetBufWidth /* f0e7ea0: 00000000 */ nop /* f0e7ea4: aee20000 */ sw $v0,0x0($s7) .JF0f0e7ea8: -/* f0e7ea8: 0c002ede */ jal 0xbb78 +/* f0e7ea8: 0c002ede */ jal viGetBufHeight /* f0e7eac: 00000000 */ nop /* f0e7eb0: 3c188007 */ lui $t8,0x8007 /* f0e7eb4: 8f1816d8 */ lw $t8,0x16d8($t8) /* f0e7eb8: 0058082a */ slt $at,$v0,$t8 /* f0e7ebc: 10200005 */ beqz $at,.JF0f0e7ed4 /* f0e7ec0: 00000000 */ nop -/* f0e7ec4: 0c002ede */ jal 0xbb78 +/* f0e7ec4: 0c002ede */ jal viGetBufHeight /* f0e7ec8: 00000000 */ nop /* f0e7ecc: 3c018007 */ lui $at,0x8007 /* f0e7ed0: ac2216d8 */ sw $v0,0x16d8($at) .JF0f0e7ed4: -/* f0e7ed4: 0c002ede */ jal 0xbb78 +/* f0e7ed4: 0c002ede */ jal viGetBufHeight /* f0e7ed8: 00000000 */ nop /* f0e7edc: 8fc30000 */ lw $v1,0x0($s8) /* f0e7ee0: 0043082a */ slt $at,$v0,$v1 /* f0e7ee4: 10200005 */ beqz $at,.JF0f0e7efc /* f0e7ee8: 00000000 */ nop -/* f0e7eec: 0c002ede */ jal 0xbb78 +/* f0e7eec: 0c002ede */ jal viGetBufHeight /* f0e7ef0: 00000000 */ nop /* f0e7ef4: afc20000 */ sw $v0,0x0($s8) /* f0e7ef8: 00401825 */ move $v1,$v0 @@ -1309,7 +1309,7 @@ glabel menuitemListRender /* f0e80e8: 014dc021 */ addu $t8,$t2,$t5 /* f0e80ec: afb8001c */ sw $t8,0x1c($sp) /* f0e80f0: afa80024 */ sw $t0,0x24($sp) -/* f0e80f4: 0fc55886 */ jal 0xf156218 +/* f0e80f4: 0fc55886 */ jal textRenderProjected /* f0e80f8: afa30020 */ sw $v1,0x20($sp) /* f0e80fc: 240b00ff */ li $t3,0xff /* f0e8100: afb300b8 */ sw $s3,0xb8($sp) @@ -1335,14 +1335,14 @@ glabel menuitemListRender /* f0e8150: afae0018 */ sw $t6,0x18($sp) /* f0e8154: afb00014 */ sw $s0,0x14($sp) /* f0e8158: afac0010 */ sw $t4,0x10($sp) -/* f0e815c: 0fc39159 */ jal 0xf0e4564 +/* f0e815c: 0fc39159 */ jal menugfxDrawCheckbox /* f0e8160: 24070006 */ li $a3,0x6 /* f0e8164: 00409025 */ move $s2,$v0 .JF0f0e8168: /* f0e8168: 8faa00b4 */ lw $t2,0xb4($sp) /* f0e816c: 51400004 */ beqzl $t2,.JF0f0e8180 /* f0e8170: 8fb80108 */ lw $t8,0x108($sp) -/* f0e8174: 0fc55880 */ jal 0xf156200 +/* f0e8174: 0fc55880 */ jal func0f156024 /* f0e8178: 00002025 */ move $a0,$zero /* f0e817c: 8fb80108 */ lw $t8,0x108($sp) .JF0f0e8180: @@ -1365,7 +1365,7 @@ glabel menuitemListRender .JF0f0e81bc: /* f0e81bc: 5180fd95 */ beqzl $t4,.JF0f0e7814 /* f0e81c0: 8e230010 */ lw $v1,0x10($s1) -/* f0e81c4: 0fc3d768 */ jal 0xf0f5da0 +/* f0e81c4: 0fc3d768 */ jal menuApplyScissor /* f0e81c8: 02402025 */ move $a0,$s2 /* f0e81cc: 10000051 */ b .JF0f0e8314 /* f0e81d0: 00409025 */ move $s2,$v0 @@ -1400,7 +1400,7 @@ glabel menuitemListRender /* f0e823c: 01f50019 */ multu $t7,$s5 /* f0e8240: 00006012 */ mflo $t4 /* f0e8244: 02cc7021 */ addu $t6,$s6,$t4 -/* f0e8248: 0fc01a60 */ jal 0xf006980 +/* f0e8248: 0fc01a60 */ jal colourBlend /* f0e824c: 8dc50018 */ lw $a1,0x18($t6) /* f0e8250: 00408025 */ move $s0,$v0 /* f0e8254: 8e230010 */ lw $v1,0x10($s1) @@ -1410,7 +1410,7 @@ glabel menuitemListRender /* f0e8260: 00002825 */ move $a1,$zero /* f0e8264: 51400008 */ beqzl $t2,.JF0f0e8288 /* f0e8268: 8fab011c */ lw $t3,0x11c($sp) -/* f0e826c: 0fc01a60 */ jal 0xf006980 +/* f0e826c: 0fc01a60 */ jal colourBlend /* f0e8270: 2406007f */ li $a2,0x7f /* f0e8274: 2401ff00 */ li $at,-256 /* f0e8278: 00416824 */ and $t5,$v0,$at @@ -1429,9 +1429,9 @@ glabel menuitemListRender /* f0e82a8: 00017043 */ sra $t6,$at,0x1 .JF0f0e82ac: /* f0e82ac: 01ee5021 */ addu $t2,$t7,$t6 -/* f0e82b0: 0fc5baa5 */ jal 0xf16ea94 +/* f0e82b0: 0fc5baa5 */ jal langGet /* f0e82b4: afaa012c */ sw $t2,0x12c($sp) -/* f0e82b8: 0c002eef */ jal 0xbbbc +/* f0e82b8: 0c002eef */ jal viGetHeight /* f0e82bc: 00409825 */ move $s3,$v0 /* f0e82c0: 8fad00e8 */ lw $t5,0xe8($sp) /* f0e82c4: 8fb800f4 */ lw $t8,0xf4($sp) @@ -1451,11 +1451,11 @@ glabel menuitemListRender /* f0e82fc: 27a50130 */ addiu $a1,$sp,0x130 /* f0e8300: 27a6012c */ addiu $a2,$sp,0x12c /* f0e8304: 02603825 */ move $a3,$s3 -/* f0e8308: 0fc55886 */ jal 0xf156218 +/* f0e8308: 0fc55886 */ jal textRenderProjected /* f0e830c: afa80024 */ sw $t0,0x24($sp) /* f0e8310: 00409025 */ move $s2,$v0 .JF0f0e8314: -/* f0e8314: 0fc54bb7 */ jal 0xf152edc +/* f0e8314: 0fc54bb7 */ jal func0f153780 /* f0e8318: 02402025 */ move $a0,$s2 .JF0f0e831c: /* f0e831c: 8fbf005c */ lw $ra,0x5c($sp) @@ -4771,13 +4771,13 @@ glabel menuitemObjectivesRenderOne /* f0ea684: 3c058007 */ lui $a1,0x8007 /* f0ea688: 24a51728 */ addiu $a1,$a1,0x1728 /* f0ea68c: 2484ecd0 */ addiu $a0,$a0,-4912 -/* f0ea690: 0c0036b4 */ jal 0xdad0 +/* f0ea690: 0c0036b4 */ jal mainOverrideVariable /* f0ea694: afa200bc */ sw $v0,0xbc($sp) /* f0ea698: 8faf0138 */ lw $t7,0x138($sp) /* f0ea69c: 3c04800a */ lui $a0,0x800a /* f0ea6a0: 000fc040 */ sll $t8,$t7,0x1 /* f0ea6a4: 00982021 */ addu $a0,$a0,$t8 -/* f0ea6a8: 0fc5baa5 */ jal 0xf16ea94 +/* f0ea6a8: 0fc5baa5 */ jal langGet /* f0ea6ac: 9484e6ca */ lhu $a0,-0x1936($a0) /* f0ea6b0: 87b90146 */ lh $t9,0x146($sp) /* f0ea6b4: 8fa30134 */ lw $v1,0x134($sp) @@ -4812,7 +4812,7 @@ glabel menuitemObjectivesRenderOne /* f0ea724: 03100019 */ multu $t8,$s0 /* f0ea728: 0000c812 */ mflo $t9 /* f0ea72c: 032e4821 */ addu $t1,$t9,$t6 -/* f0ea730: 0fc01a60 */ jal 0xf006980 +/* f0ea730: 0fc01a60 */ jal colourBlend /* f0ea734: 8d250018 */ lw $a1,0x18($t1) /* f0ea738: afa2012c */ sw $v0,0x12c($sp) /* f0ea73c: 8fa30134 */ lw $v1,0x134($sp) @@ -4822,7 +4822,7 @@ glabel menuitemObjectivesRenderOne /* f0ea748: 00002825 */ move $a1,$zero /* f0ea74c: 5140000b */ beqzl $t2,.JF0f0ea77c /* f0ea750: 9078003c */ lbu $t8,0x3c($v1) -/* f0ea754: 0fc01a60 */ jal 0xf006980 +/* f0ea754: 0fc01a60 */ jal colourBlend /* f0ea758: 2406002c */ li $a2,0x2c /* f0ea75c: 8fac012c */ lw $t4,0x12c($sp) /* f0ea760: 2401ff00 */ li $at,-256 @@ -4840,17 +4840,17 @@ glabel menuitemObjectivesRenderOne /* f0ea78c: 00822021 */ addu $a0,$a0,$v0 /* f0ea790: 00a22821 */ addu $a1,$a1,$v0 /* f0ea794: 8ca52e60 */ lw $a1,0x2e60($a1) -/* f0ea798: 0fc54d69 */ jal 0xf1535a4 +/* f0ea798: 0fc54d69 */ jal func0f153e38 /* f0ea79c: 8c842fc8 */ lw $a0,0x2fc8($a0) /* f0ea7a0: a3a000d0 */ sb $zero,0xd0($sp) -/* f0ea7a4: 0fc54b55 */ jal 0xf152d54 +/* f0ea7a4: 0fc54b55 */ jal func0f153628 /* f0ea7a8: 8fa40130 */ lw $a0,0x130($sp) /* f0ea7ac: 27b000d0 */ addiu $s0,$sp,0xd0 /* f0ea7b0: 3c057f1b */ lui $a1,0x7f1b /* f0ea7b4: afa20130 */ sw $v0,0x130($sp) /* f0ea7b8: 24a5ecd8 */ addiu $a1,$a1,-4904 /* f0ea7bc: 02002025 */ move $a0,$s0 -/* f0ea7c0: 0c004d95 */ jal 0x13654 +/* f0ea7c0: 0c004d95 */ jal sprintf /* f0ea7c4: 8fa6013c */ lw $a2,0x13c($sp) /* f0ea7c8: 3c198008 */ lui $t9,0x8008 /* f0ea7cc: 8f390148 */ lw $t9,0x148($t9) @@ -4860,7 +4860,7 @@ glabel menuitemObjectivesRenderOne /* f0ea7dc: 27a500c4 */ addiu $a1,$sp,0xc4 /* f0ea7e0: 02003025 */ move $a2,$s0 /* f0ea7e4: afa00014 */ sw $zero,0x14($sp) -/* f0ea7e8: 0fc55d49 */ jal 0xf157524 +/* f0ea7e8: 0fc55d49 */ jal textMeasure /* f0ea7ec: afb90010 */ sw $t9,0x10($sp) /* f0ea7f0: 87ae0142 */ lh $t6,0x142($sp) /* f0ea7f4: 8fa900c4 */ lw $t1,0xc4($sp) @@ -4884,7 +4884,7 @@ glabel menuitemObjectivesRenderOne /* f0ea83c: afab0010 */ sw $t3,0x10($sp) /* f0ea840: afaf0018 */ sw $t7,0x18($sp) /* f0ea844: afb8001c */ sw $t8,0x1c($sp) -/* f0ea848: 0fc55886 */ jal 0xf156218 +/* f0ea848: 0fc55886 */ jal textRenderProjected /* f0ea84c: afb90020 */ sw $t9,0x20($sp) /* f0ea850: 87ae0142 */ lh $t6,0x142($sp) /* f0ea854: 8faa0154 */ lw $t2,0x154($sp) @@ -4899,7 +4899,7 @@ glabel menuitemObjectivesRenderOne /* f0ea878: 24040055 */ li $a0,0x55 /* f0ea87c: 8fa50120 */ lw $a1,0x120($sp) /* f0ea880: 02003025 */ move $a2,$s0 -/* f0ea884: 0fc55dde */ jal 0xf157778 +/* f0ea884: 0fc55dde */ jal textWrap /* f0ea888: afac0010 */ sw $t4,0x10($sp) /* f0ea88c: 3c0b8008 */ lui $t3,0x8008 /* f0ea890: 3c0d8008 */ lui $t5,0x8008 @@ -4918,7 +4918,7 @@ glabel menuitemObjectivesRenderOne /* f0ea8c4: afab0010 */ sw $t3,0x10($sp) /* f0ea8c8: afaf0018 */ sw $t7,0x18($sp) /* f0ea8cc: afb8001c */ sw $t8,0x1c($sp) -/* f0ea8d0: 0fc55886 */ jal 0xf156218 +/* f0ea8d0: 0fc55886 */ jal textRenderProjected /* f0ea8d4: afb90020 */ sw $t9,0x20($sp) /* f0ea8d8: 1000001a */ b .JF0f0ea944 /* f0ea8dc: afa20130 */ sw $v0,0x130($sp) @@ -4926,7 +4926,7 @@ glabel menuitemObjectivesRenderOne /* f0ea8e0: 3c057f1b */ lui $a1,0x7f1b /* f0ea8e4: 24a5ece0 */ addiu $a1,$a1,-4896 /* f0ea8e8: 02002025 */ move $a0,$s0 -/* f0ea8ec: 0c004d95 */ jal 0x13654 +/* f0ea8ec: 0c004d95 */ jal sprintf /* f0ea8f0: 8fa60120 */ lw $a2,0x120($sp) /* f0ea8f4: 3c0e8008 */ lui $t6,0x8008 /* f0ea8f8: 3c098008 */ lui $t1,0x8008 @@ -4945,7 +4945,7 @@ glabel menuitemObjectivesRenderOne /* f0ea92c: afae0010 */ sw $t6,0x10($sp) /* f0ea930: afaa0018 */ sw $t2,0x18($sp) /* f0ea934: afac001c */ sw $t4,0x1c($sp) -/* f0ea938: 0fc55886 */ jal 0xf156218 +/* f0ea938: 0fc55886 */ jal textRenderProjected /* f0ea93c: afab0020 */ sw $t3,0x20($sp) /* f0ea940: afa20130 */ sw $v0,0x130($sp) .JF0f0ea944: @@ -4954,7 +4954,7 @@ glabel menuitemObjectivesRenderOne /* f0ea94c: 8fa80124 */ lw $t0,0x124($sp) /* f0ea950: 11a00126 */ beqz $t5,.JF0f0eadec /* f0ea954: 25cc0016 */ addiu $t4,$t6,0x16 -/* f0ea958: 0fc25901 */ jal 0xf096404 +/* f0ea958: 0fc25901 */ jal objectiveCheck /* f0ea95c: 8fa40138 */ lw $a0,0x138($sp) /* f0ea960: 10400007 */ beqz $v0,.JF0f0ea980 /* f0ea964: 24010001 */ li $at,0x1 @@ -4965,7 +4965,7 @@ glabel menuitemObjectivesRenderOne /* f0ea978: 10000015 */ b .JF0f0ea9d0 /* f0ea97c: 00000000 */ nop .JF0f0ea980: -/* f0ea980: 0fc5baa5 */ jal 0xf16ea94 +/* f0ea980: 0fc5baa5 */ jal langGet /* f0ea984: 24045601 */ li $a0,0x5601 /* f0ea988: 3c0fffff */ lui $t7,0xffff /* f0ea98c: 35ef00ff */ ori $t7,$t7,0xff @@ -4973,7 +4973,7 @@ glabel menuitemObjectivesRenderOne /* f0ea994: 1000000e */ b .JF0f0ea9d0 /* f0ea998: afaf00c8 */ sw $t7,0xc8($sp) .JF0f0ea99c: -/* f0ea99c: 0fc5baa5 */ jal 0xf16ea94 +/* f0ea99c: 0fc5baa5 */ jal langGet /* f0ea9a0: 24045600 */ li $a0,0x5600 /* f0ea9a4: 3c1800ff */ lui $t8,0xff /* f0ea9a8: 371800ff */ ori $t8,$t8,0xff @@ -4981,7 +4981,7 @@ glabel menuitemObjectivesRenderOne /* f0ea9b0: 10000007 */ b .JF0f0ea9d0 /* f0ea9b4: afb800c8 */ sw $t8,0xc8($sp) .JF0f0ea9b8: -/* f0ea9b8: 0fc5baa5 */ jal 0xf16ea94 +/* f0ea9b8: 0fc5baa5 */ jal langGet /* f0ea9bc: 24045602 */ li $a0,0x5602 /* f0ea9c0: 3c19ff40 */ lui $t9,0xff40 /* f0ea9c4: 373940ff */ ori $t9,$t9,0x40ff @@ -5014,7 +5014,7 @@ glabel menuitemObjectivesRenderOne /* f0eaa28: 8fa600cc */ lw $a2,0xcc($sp) /* f0eaa2c: 8ce70144 */ lw $a3,0x144($a3) /* f0eaa30: afa00014 */ sw $zero,0x14($sp) -/* f0eaa34: 0fc55d49 */ jal 0xf157524 +/* f0eaa34: 0fc55d49 */ jal textMeasure /* f0eaa38: afad0010 */ sw $t5,0x10($sp) /* f0eaa3c: 3c028007 */ lui $v0,0x8007 /* f0eaa40: 8c421728 */ lw $v0,0x1728($v0) @@ -5049,7 +5049,7 @@ glabel menuitemObjectivesRenderOne /* f0eaab0: afab0014 */ sw $t3,0x14($sp) /* f0eaab4: afaf0020 */ sw $t7,0x20($sp) /* f0eaab8: afac0010 */ sw $t4,0x10($sp) -/* f0eaabc: 0fc55886 */ jal 0xf156218 +/* f0eaabc: 0fc55886 */ jal textRenderProjected /* f0eaac0: afad0018 */ sw $t5,0x18($sp) /* f0eaac4: 8fb800c4 */ lw $t8,0xc4($sp) /* f0eaac8: 87a80146 */ lh $t0,0x146($sp) @@ -5058,7 +5058,7 @@ glabel menuitemObjectivesRenderOne /* f0eaad4: 24c6fff3 */ addiu $a2,$a2,-13 /* f0eaad8: 25080009 */ addiu $t0,$t0,0x9 /* f0eaadc: afa80124 */ sw $t0,0x124($sp) -/* f0eaae0: 0fc54bb7 */ jal 0xf152edc +/* f0eaae0: 0fc54bb7 */ jal func0f153780 /* f0eaae4: afa60128 */ sw $a2,0x128($sp) /* f0eaae8: 87a50142 */ lh $a1,0x142($sp) /* f0eaaec: 8fa60128 */ lw $a2,0x128($sp) @@ -5100,7 +5100,7 @@ glabel menuitemObjectivesRenderOne /* f0eab78: afac0098 */ sw $t4,0x98($sp) /* f0eab7c: 010b6821 */ addu $t5,$t0,$t3 /* f0eab80: 25b80005 */ addiu $t8,$t5,0x5 -/* f0eab84: 0fc38c93 */ jal 0xf0e324c +/* f0eab84: 0fc38c93 */ jal menugfx0f0e2498 /* f0eab88: afb800a8 */ sw $t8,0xa8($sp) /* f0eab8c: 8fa3012c */ lw $v1,0x12c($sp) /* f0eab90: 8fa600b0 */ lw $a2,0xb0($sp) @@ -5115,7 +5115,7 @@ glabel menuitemObjectivesRenderOne /* f0eabb4: afb90054 */ sw $t9,0x54($sp) /* f0eabb8: 00402025 */ move $a0,$v0 /* f0eabbc: 87a50142 */ lh $a1,0x142($sp) -/* f0eabc0: 0fc38d3e */ jal 0xf0e34f8 +/* f0eabc0: 0fc38d3e */ jal menugfxDrawTessellatedRect /* f0eabc4: 8fa700b4 */ lw $a3,0xb4($sp) /* f0eabc8: 8fa500b4 */ lw $a1,0xb4($sp) /* f0eabcc: 8faa00ac */ lw $t2,0xac($sp) @@ -5125,7 +5125,7 @@ glabel menuitemObjectivesRenderOne /* f0eabdc: 8fa600b0 */ lw $a2,0xb0($sp) /* f0eabe0: afb00014 */ sw $s0,0x14($sp) /* f0eabe4: afb00018 */ sw $s0,0x18($sp) -/* f0eabe8: 0fc38d3e */ jal 0xf0e34f8 +/* f0eabe8: 0fc38d3e */ jal menugfxDrawTessellatedRect /* f0eabec: afaa0010 */ sw $t2,0x10($sp) /* f0eabf0: 8fa600ac */ lw $a2,0xac($sp) /* f0eabf4: 8fa7005c */ lw $a3,0x5c($sp) @@ -5138,7 +5138,7 @@ glabel menuitemObjectivesRenderOne /* f0eac10: 00402025 */ move $a0,$v0 /* f0eac14: 87a50142 */ lh $a1,0x142($sp) /* f0eac18: afb00018 */ sw $s0,0x18($sp) -/* f0eac1c: 0fc38d3e */ jal 0xf0e34f8 +/* f0eac1c: 0fc38d3e */ jal menugfxDrawTessellatedRect /* f0eac20: afa30014 */ sw $v1,0x14($sp) /* f0eac24: 8fa50058 */ lw $a1,0x58($sp) /* f0eac28: 8fa80048 */ lw $t0,0x48($sp) @@ -5149,7 +5149,7 @@ glabel menuitemObjectivesRenderOne /* f0eac3c: 8fa7004c */ lw $a3,0x4c($sp) /* f0eac40: afb00014 */ sw $s0,0x14($sp) /* f0eac44: afb00018 */ sw $s0,0x18($sp) -/* f0eac48: 0fc38d3e */ jal 0xf0e34f8 +/* f0eac48: 0fc38d3e */ jal menugfxDrawTessellatedRect /* f0eac4c: afa80010 */ sw $t0,0x10($sp) /* f0eac50: 8fa300a8 */ lw $v1,0xa8($sp) /* f0eac54: 8fa50058 */ lw $a1,0x58($sp) @@ -5160,7 +5160,7 @@ glabel menuitemObjectivesRenderOne /* f0eac68: 8fa600ac */ lw $a2,0xac($sp) /* f0eac6c: afb00014 */ sw $s0,0x14($sp) /* f0eac70: afb00018 */ sw $s0,0x18($sp) -/* f0eac74: 0fc38d3e */ jal 0xf0e34f8 +/* f0eac74: 0fc38d3e */ jal menugfxDrawTessellatedRect /* f0eac78: 24a70001 */ addiu $a3,$a1,0x1 /* f0eac7c: 8fa50058 */ lw $a1,0x58($sp) /* f0eac80: 8fa900a8 */ lw $t1,0xa8($sp) @@ -5171,7 +5171,7 @@ glabel menuitemObjectivesRenderOne /* f0eac94: 8fa70054 */ lw $a3,0x54($sp) /* f0eac98: afb00014 */ sw $s0,0x14($sp) /* f0eac9c: afb00018 */ sw $s0,0x18($sp) -/* f0eaca0: 0fc38d3e */ jal 0xf0e34f8 +/* f0eaca0: 0fc38d3e */ jal menugfxDrawTessellatedRect /* f0eaca4: afa90010 */ sw $t1,0x10($sp) /* f0eaca8: 8fa600a8 */ lw $a2,0xa8($sp) /* f0eacac: 8fa7005c */ lw $a3,0x5c($sp) @@ -5183,7 +5183,7 @@ glabel menuitemObjectivesRenderOne /* f0eacc4: afa30048 */ sw $v1,0x48($sp) /* f0eacc8: 00402025 */ move $a0,$v0 /* f0eaccc: afb00014 */ sw $s0,0x14($sp) -/* f0eacd0: 0fc38d3e */ jal 0xf0e34f8 +/* f0eacd0: 0fc38d3e */ jal menugfxDrawTessellatedRect /* f0eacd4: afb00018 */ sw $s0,0x18($sp) /* f0eacd8: 8fa300a8 */ lw $v1,0xa8($sp) /* f0eacdc: 00402025 */ move $a0,$v0 @@ -5194,7 +5194,7 @@ glabel menuitemObjectivesRenderOne /* f0eacf0: 8fa6004c */ lw $a2,0x4c($sp) /* f0eacf4: 8fa70054 */ lw $a3,0x54($sp) /* f0eacf8: afb00014 */ sw $s0,0x14($sp) -/* f0eacfc: 0fc38d3e */ jal 0xf0e34f8 +/* f0eacfc: 0fc38d3e */ jal menugfxDrawTessellatedRect /* f0ead00: afb00018 */ sw $s0,0x18($sp) /* f0ead04: 8fae0048 */ lw $t6,0x48($sp) /* f0ead08: 00402025 */ move $a0,$v0 @@ -5203,7 +5203,7 @@ glabel menuitemObjectivesRenderOne /* f0ead14: 8fa70098 */ lw $a3,0x98($sp) /* f0ead18: afb00014 */ sw $s0,0x14($sp) /* f0ead1c: afb00018 */ sw $s0,0x18($sp) -/* f0ead20: 0fc38d3e */ jal 0xf0e34f8 +/* f0ead20: 0fc38d3e */ jal menugfxDrawTessellatedRect /* f0ead24: afae0010 */ sw $t6,0x10($sp) /* f0ead28: 8fac0044 */ lw $t4,0x44($sp) /* f0ead2c: 00402025 */ move $a0,$v0 @@ -5212,7 +5212,7 @@ glabel menuitemObjectivesRenderOne /* f0ead38: 8fa70098 */ lw $a3,0x98($sp) /* f0ead3c: afb00014 */ sw $s0,0x14($sp) /* f0ead40: afb00018 */ sw $s0,0x18($sp) -/* f0ead44: 0fc38d3e */ jal 0xf0e34f8 +/* f0ead44: 0fc38d3e */ jal menugfxDrawTessellatedRect /* f0ead48: afac0010 */ sw $t4,0x10($sp) /* f0ead4c: 8fa300c8 */ lw $v1,0xc8($sp) /* f0ead50: 8fa50098 */ lw $a1,0x98($sp) @@ -5228,7 +5228,7 @@ glabel menuitemObjectivesRenderOne /* f0ead78: afb8005c */ sw $t8,0x5c($sp) /* f0ead7c: 00402025 */ move $a0,$v0 /* f0ead80: 8fa600a8 */ lw $a2,0xa8($sp) -/* f0ead84: 0fc38d3e */ jal 0xf0e34f8 +/* f0ead84: 0fc38d3e */ jal menugfxDrawTessellatedRect /* f0ead88: afad0010 */ sw $t5,0x10($sp) /* f0ead8c: 8fa7009c */ lw $a3,0x9c($sp) /* f0ead90: 8faf004c */ lw $t7,0x4c($sp) @@ -5239,7 +5239,7 @@ glabel menuitemObjectivesRenderOne /* f0eada4: 8fa60048 */ lw $a2,0x48($sp) /* f0eada8: afb00014 */ sw $s0,0x14($sp) /* f0eadac: afb00018 */ sw $s0,0x18($sp) -/* f0eadb0: 0fc38d3e */ jal 0xf0e34f8 +/* f0eadb0: 0fc38d3e */ jal menugfxDrawTessellatedRect /* f0eadb4: afaf0010 */ sw $t7,0x10($sp) /* f0eadb8: 8faa005c */ lw $t2,0x5c($sp) /* f0eadbc: 8fb9004c */ lw $t9,0x4c($sp) @@ -5250,7 +5250,7 @@ glabel menuitemObjectivesRenderOne /* f0eadd0: 8fa60048 */ lw $a2,0x48($sp) /* f0eadd4: 8fa7009c */ lw $a3,0x9c($sp) /* f0eadd8: afb00014 */ sw $s0,0x14($sp) -/* f0eaddc: 0fc38d3e */ jal 0xf0e34f8 +/* f0eaddc: 0fc38d3e */ jal menugfxDrawTessellatedRect /* f0eade0: afb90010 */ sw $t9,0x10($sp) /* f0eade4: 10000077 */ b .JF0f0eafc4 /* f0eade8: afa20130 */ sw $v0,0x130($sp) @@ -5271,7 +5271,7 @@ glabel menuitemObjectivesRenderOne /* f0eae20: 27a500c4 */ addiu $a1,$sp,0xc4 /* f0eae24: 8fa60120 */ lw $a2,0x120($sp) /* f0eae28: afa00014 */ sw $zero,0x14($sp) -/* f0eae2c: 0fc55d49 */ jal 0xf157524 +/* f0eae2c: 0fc55d49 */ jal textMeasure /* f0eae30: afb90010 */ sw $t9,0x10($sp) /* f0eae34: 87ae0142 */ lh $t6,0x142($sp) /* f0eae38: 8fac00c4 */ lw $t4,0xc4($sp) @@ -5281,9 +5281,9 @@ glabel menuitemObjectivesRenderOne /* f0eae48: 25ab0019 */ addiu $t3,$t5,0x19 /* f0eae4c: 2549fffe */ addiu $t1,$t2,-2 /* f0eae50: afa90074 */ sw $t1,0x74($sp) -/* f0eae54: 0fc54bb7 */ jal 0xf152edc +/* f0eae54: 0fc54bb7 */ jal func0f153780 /* f0eae58: afab006c */ sw $t3,0x6c($sp) -/* f0eae5c: 0fc38c93 */ jal 0xf0e324c +/* f0eae5c: 0fc38c93 */ jal menugfx0f0e2498 /* f0eae60: 00402025 */ move $a0,$v0 /* f0eae64: 8fa3012c */ lw $v1,0x12c($sp) /* f0eae68: 8fa6007c */ lw $a2,0x7c($sp) @@ -5298,7 +5298,7 @@ glabel menuitemObjectivesRenderOne /* f0eae8c: afaf0054 */ sw $t7,0x54($sp) /* f0eae90: 00402025 */ move $a0,$v0 /* f0eae94: 87a50142 */ lh $a1,0x142($sp) -/* f0eae98: 0fc38d3e */ jal 0xf0e34f8 +/* f0eae98: 0fc38d3e */ jal menugfxDrawTessellatedRect /* f0eae9c: 8fa70080 */ lw $a3,0x80($sp) /* f0eaea0: 8fa50080 */ lw $a1,0x80($sp) /* f0eaea4: 8faa0078 */ lw $t2,0x78($sp) @@ -5308,7 +5308,7 @@ glabel menuitemObjectivesRenderOne /* f0eaeb4: 8fa6007c */ lw $a2,0x7c($sp) /* f0eaeb8: afb00014 */ sw $s0,0x14($sp) /* f0eaebc: afb00018 */ sw $s0,0x18($sp) -/* f0eaec0: 0fc38d3e */ jal 0xf0e34f8 +/* f0eaec0: 0fc38d3e */ jal menugfxDrawTessellatedRect /* f0eaec4: afaa0010 */ sw $t2,0x10($sp) /* f0eaec8: 87a90142 */ lh $t1,0x142($sp) /* f0eaecc: 8fa60078 */ lw $a2,0x78($sp) @@ -5330,7 +5330,7 @@ glabel menuitemObjectivesRenderOne .JF0f0eaf0c: /* f0eaf0c: 2587ffff */ addiu $a3,$t4,-1 /* f0eaf10: afa70058 */ sw $a3,0x58($sp) -/* f0eaf14: 0fc38d3e */ jal 0xf0e34f8 +/* f0eaf14: 0fc38d3e */ jal menugfxDrawTessellatedRect /* f0eaf18: afa30014 */ sw $v1,0x14($sp) /* f0eaf1c: 8fa50058 */ lw $a1,0x58($sp) /* f0eaf20: 8fa8004c */ lw $t0,0x4c($sp) @@ -5341,7 +5341,7 @@ glabel menuitemObjectivesRenderOne /* f0eaf34: 8fa7005c */ lw $a3,0x5c($sp) /* f0eaf38: afb00014 */ sw $s0,0x14($sp) /* f0eaf3c: afb00018 */ sw $s0,0x18($sp) -/* f0eaf40: 0fc38d3e */ jal 0xf0e34f8 +/* f0eaf40: 0fc38d3e */ jal menugfxDrawTessellatedRect /* f0eaf44: afa80010 */ sw $t0,0x10($sp) /* f0eaf48: 8fad0074 */ lw $t5,0x74($sp) /* f0eaf4c: 8fa50058 */ lw $a1,0x58($sp) @@ -5351,7 +5351,7 @@ glabel menuitemObjectivesRenderOne /* f0eaf5c: 8fa60078 */ lw $a2,0x78($sp) /* f0eaf60: afb00014 */ sw $s0,0x14($sp) /* f0eaf64: afb00018 */ sw $s0,0x18($sp) -/* f0eaf68: 0fc38d3e */ jal 0xf0e34f8 +/* f0eaf68: 0fc38d3e */ jal menugfxDrawTessellatedRect /* f0eaf6c: 24a70001 */ addiu $a3,$a1,0x1 /* f0eaf70: 8fa50058 */ lw $a1,0x58($sp) /* f0eaf74: 8fb80074 */ lw $t8,0x74($sp) @@ -5362,7 +5362,7 @@ glabel menuitemObjectivesRenderOne /* f0eaf88: 8fa70054 */ lw $a3,0x54($sp) /* f0eaf8c: afb00014 */ sw $s0,0x14($sp) /* f0eaf90: afb00018 */ sw $s0,0x18($sp) -/* f0eaf94: 0fc38d3e */ jal 0xf0e34f8 +/* f0eaf94: 0fc38d3e */ jal menugfxDrawTessellatedRect /* f0eaf98: afb80010 */ sw $t8,0x10($sp) /* f0eaf9c: 8fa60074 */ lw $a2,0x74($sp) /* f0eafa0: 8fa50044 */ lw $a1,0x44($sp) @@ -5371,7 +5371,7 @@ glabel menuitemObjectivesRenderOne /* f0eafac: afb90010 */ sw $t9,0x10($sp) /* f0eafb0: 8fa7006c */ lw $a3,0x6c($sp) /* f0eafb4: afb00014 */ sw $s0,0x14($sp) -/* f0eafb8: 0fc38d3e */ jal 0xf0e34f8 +/* f0eafb8: 0fc38d3e */ jal menugfxDrawTessellatedRect /* f0eafbc: afb00018 */ sw $s0,0x18($sp) /* f0eafc0: afa20130 */ sw $v0,0x130($sp) .JF0f0eafc4: @@ -8728,7 +8728,7 @@ glabel menuitemMarqueeRender /* f0ee258: 8cae0014 */ lw $t6,0x14($a1) /* f0ee25c: 00a08825 */ move $s1,$a1 /* f0ee260: afae0084 */ sw $t6,0x84($sp) -/* f0ee264: 0fc3c87a */ jal 0xf0f21e8 +/* f0ee264: 0fc3c87a */ jal menuResolveParam2Text /* f0ee268: 8ca40008 */ lw $a0,0x8($a1) /* f0ee26c: 3c188007 */ lui $t8,0x8007 /* f0ee270: afa20080 */ sw $v0,0x80($sp) @@ -8778,7 +8778,7 @@ glabel menuitemMarqueeRender /* f0ee318: 01230019 */ multu $t1,$v1 /* f0ee31c: 00005012 */ mflo $t2 /* f0ee320: 004a5821 */ addu $t3,$v0,$t2 -/* f0ee324: 0fc01a60 */ jal 0xf006980 +/* f0ee324: 0fc01a60 */ jal colourBlend /* f0ee328: 8d650018 */ lw $a1,0x18($t3) /* f0ee32c: afa20074 */ sw $v0,0x74($sp) /* f0ee330: 8e300010 */ lw $s0,0x10($s1) @@ -8788,7 +8788,7 @@ glabel menuitemMarqueeRender /* f0ee33c: 8faa0084 */ lw $t2,0x84($sp) /* f0ee340: 8fa40074 */ lw $a0,0x74($sp) /* f0ee344: 00002825 */ move $a1,$zero -/* f0ee348: 0fc01a60 */ jal 0xf006980 +/* f0ee348: 0fc01a60 */ jal colourBlend /* f0ee34c: 2406007f */ li $a2,0x7f /* f0ee350: 8fae0074 */ lw $t6,0x74($sp) /* f0ee354: 2401ff00 */ li $at,-256 @@ -8845,7 +8845,7 @@ glabel menuitemMarqueeRender /* f0ee408: 27a60064 */ addiu $a2,$sp,0x64 /* f0ee40c: 8fa70058 */ lw $a3,0x58($sp) /* f0ee410: afa00014 */ sw $zero,0x14($sp) -/* f0ee414: 0fc55d49 */ jal 0xf157524 +/* f0ee414: 0fc55d49 */ jal textMeasure /* f0ee418: afa90010 */ sw $t1,0x10($sp) /* f0ee41c: 8fab007c */ lw $t3,0x7c($sp) /* f0ee420: 8fac006c */ lw $t4,0x6c($sp) @@ -8912,43 +8912,43 @@ glabel menuitemMarqueeRender /* f0ee500: 00000000 */ nop /* f0ee504: aca00000 */ sw $zero,0x0($a1) .JF0f0ee508: -/* f0ee508: 0c002eda */ jal 0xbb68 +/* f0ee508: 0c002eda */ jal viGetBufWidth /* f0ee50c: 00000000 */ nop /* f0ee510: 3c098007 */ lui $t1,0x8007 /* f0ee514: 8d2916d0 */ lw $t1,0x16d0($t1) /* f0ee518: 0049082a */ slt $at,$v0,$t1 /* f0ee51c: 10200005 */ beqz $at,.JF0f0ee534 /* f0ee520: 00000000 */ nop -/* f0ee524: 0c002eda */ jal 0xbb68 +/* f0ee524: 0c002eda */ jal viGetBufWidth /* f0ee528: 00000000 */ nop /* f0ee52c: 3c018007 */ lui $at,0x8007 /* f0ee530: ac2216d0 */ sw $v0,0x16d0($at) .JF0f0ee534: -/* f0ee534: 0c002eda */ jal 0xbb68 +/* f0ee534: 0c002eda */ jal viGetBufWidth /* f0ee538: 00000000 */ nop /* f0ee53c: 3c0b8007 */ lui $t3,0x8007 /* f0ee540: 8d6b16d4 */ lw $t3,0x16d4($t3) /* f0ee544: 004b082a */ slt $at,$v0,$t3 /* f0ee548: 10200005 */ beqz $at,.JF0f0ee560 /* f0ee54c: 00000000 */ nop -/* f0ee550: 0c002eda */ jal 0xbb68 +/* f0ee550: 0c002eda */ jal viGetBufWidth /* f0ee554: 00000000 */ nop /* f0ee558: 3c018007 */ lui $at,0x8007 /* f0ee55c: ac2216d4 */ sw $v0,0x16d4($at) .JF0f0ee560: -/* f0ee560: 0c002ede */ jal 0xbb78 +/* f0ee560: 0c002ede */ jal viGetBufHeight /* f0ee564: 00000000 */ nop /* f0ee568: 3c0c8007 */ lui $t4,0x8007 /* f0ee56c: 8d8c16d8 */ lw $t4,0x16d8($t4) /* f0ee570: 004c082a */ slt $at,$v0,$t4 /* f0ee574: 10200005 */ beqz $at,.JF0f0ee58c /* f0ee578: 00000000 */ nop -/* f0ee57c: 0c002ede */ jal 0xbb78 +/* f0ee57c: 0c002ede */ jal viGetBufHeight /* f0ee580: 00000000 */ nop /* f0ee584: 3c018007 */ lui $at,0x8007 /* f0ee588: ac2216d8 */ sw $v0,0x16d8($at) .JF0f0ee58c: -/* f0ee58c: 0c002ede */ jal 0xbb78 +/* f0ee58c: 0c002ede */ jal viGetBufHeight /* f0ee590: 00000000 */ nop /* f0ee594: 3c068007 */ lui $a2,0x8007 /* f0ee598: 24c616dc */ addiu $a2,$a2,0x16dc @@ -8956,7 +8956,7 @@ glabel menuitemMarqueeRender /* f0ee5a0: 0045082a */ slt $at,$v0,$a1 /* f0ee5a4: 10200009 */ beqz $at,.JF0f0ee5cc /* f0ee5a8: 00000000 */ nop -/* f0ee5ac: 0c002ede */ jal 0xbb78 +/* f0ee5ac: 0c002ede */ jal viGetBufHeight /* f0ee5b0: 00000000 */ nop /* f0ee5b4: 3c018007 */ lui $at,0x8007 /* f0ee5b8: ac2216dc */ sw $v0,0x16dc($at) @@ -9020,7 +9020,7 @@ glabel menuitemMarqueeRender /* f0ee694: 330b0fff */ andi $t3,$t8,0xfff /* f0ee698: 01eb6025 */ or $t4,$t7,$t3 /* f0ee69c: ac4c0004 */ sw $t4,0x4($v0) -/* f0ee6a0: 0fc54d24 */ jal 0xf153490 +/* f0ee6a0: 0fc54d24 */ jal func0f153d24 /* f0ee6a4: afa50088 */ sw $a1,0x88($sp) /* f0ee6a8: 8e2e0008 */ lw $t6,0x8($s1) /* f0ee6ac: 8dcd0004 */ lw $t5,0x4($t6) @@ -9030,17 +9030,17 @@ glabel menuitemMarqueeRender /* f0ee6bc: 86240000 */ lh $a0,0x0($s1) /* f0ee6c0: 86390004 */ lh $t9,0x4($s1) /* f0ee6c4: 2406001c */ li $a2,0x1c -/* f0ee6c8: 0fc54d15 */ jal 0xf153454 +/* f0ee6c8: 0fc54d15 */ jal func0f153ce8 /* f0ee6cc: 00992821 */ addu $a1,$a0,$t9 /* f0ee6d0: 10000005 */ b .JF0f0ee6e8 /* f0ee6d4: 00000000 */ nop /* f0ee6d8: 86240000 */ lh $a0,0x0($s1) .JF0f0ee6dc: /* f0ee6dc: 2406000e */ li $a2,0xe -/* f0ee6e0: 0fc54d15 */ jal 0xf153454 +/* f0ee6e0: 0fc54d15 */ jal func0f153ce8 /* f0ee6e4: 00802825 */ move $a1,$a0 .JF0f0ee6e8: -/* f0ee6e8: 0fc54b55 */ jal 0xf152d54 +/* f0ee6e8: 0fc54b55 */ jal func0f153628 /* f0ee6ec: 8fa40088 */ lw $a0,0x88($sp) /* f0ee6f0: 8faa0058 */ lw $t2,0x58($sp) /* f0ee6f4: 8fa9005c */ lw $t1,0x5c($sp) @@ -9061,13 +9061,13 @@ glabel menuitemMarqueeRender /* f0ee730: 27a5007c */ addiu $a1,$sp,0x7c /* f0ee734: 27a60078 */ addiu $a2,$sp,0x78 /* f0ee738: 02003825 */ move $a3,$s0 -/* f0ee73c: 0fc55886 */ jal 0xf156218 +/* f0ee73c: 0fc55886 */ jal textRenderProjected /* f0ee740: afa80020 */ sw $t0,0x20($sp) -/* f0ee744: 0fc54bb7 */ jal 0xf152edc +/* f0ee744: 0fc54bb7 */ jal func0f153780 /* f0ee748: 00402025 */ move $a0,$v0 -/* f0ee74c: 0fc3d768 */ jal 0xf0f5da0 +/* f0ee74c: 0fc3d768 */ jal menuApplyScissor /* f0ee750: 00402025 */ move $a0,$v0 -/* f0ee754: 0fc54d2a */ jal 0xf1534a8 +/* f0ee754: 0fc54d2a */ jal func0f153d3c /* f0ee758: afa20088 */ sw $v0,0x88($sp) /* f0ee75c: 86390004 */ lh $t9,0x4($s1) /* f0ee760: 8faa0084 */ lw $t2,0x84($sp) @@ -10703,7 +10703,7 @@ glabel menuitemControllerRenderLines /* f0f05d8: 00003825 */ move $a3,$zero /* f0f05dc: 24060002 */ li $a2,0x2 /* f0f05e0: 27a40050 */ addiu $a0,$sp,0x50 -/* f0f05e4: 0fc2d290 */ jal 0xf0b4a40 +/* f0f05e4: 0fc2d290 */ jal func0f0b39c0 /* f0f05e8: 24a50294 */ addiu $a1,$a1,0x294 /* f0f05ec: 8fb90050 */ lw $t9,0x50($sp) /* f0f05f0: 3c0dba00 */ lui $t5,0xba00 @@ -10819,7 +10819,7 @@ glabel menuitemControllerRenderLines /* f0f0784: 01933821 */ addu $a3,$t4,$s3 /* f0f0788: 03323021 */ addu $a2,$t9,$s2 /* f0f078c: afae0010 */ sw $t6,0x10($sp) -/* f0f0790: 0fc3c038 */ jal 0xf0f00e0 +/* f0f0790: 0fc3c038 */ jal menuitemControllerRenderLine /* f0f0794: afb80014 */ sw $t8,0x14($sp) /* f0f0798: 26310001 */ addiu $s1,$s1,0x1 /* f0f079c: 26100010 */ addiu $s0,$s0,0x10 diff --git a/src/game/mplayer/ingame.c b/src/game/mplayer/ingame.c index 38cdbbd56..5ec98ba48 100644 --- a/src/game/mplayer/ingame.c +++ b/src/game/mplayer/ingame.c @@ -216,7 +216,7 @@ glabel mpMenuTextWeaponDescription /* f1787ac: 3c04800a */ lui $a0,0x800a /* f1787b0: afbf0014 */ sw $ra,0x14($sp) /* f1787b4: 008f2021 */ addu $a0,$a0,$t7 -/* f1787b8: 0fc2c814 */ jal 0xf0b2050 +/* f1787b8: 0fc2c814 */ jal weaponFindById /* f1787bc: 8c84f528 */ lw $a0,-0xad8($a0) /* f1787c0: 10400067 */ beqz $v0,.JF0f178960 /* f1787c4: 00402825 */ move $a1,$v0 @@ -244,7 +244,7 @@ glabel mpMenuTextWeaponDescription /* f17881c: 24010001 */ li $at,0x1 /* f178820: 54810006 */ bnel $a0,$at,.JF0f17883c /* f178824: 24010002 */ li $at,0x2 -/* f178828: 0fc5baa5 */ jal 0xf16ea94 +/* f178828: 0fc5baa5 */ jal langGet /* f17882c: 24044ced */ li $a0,0x4ced /* f178830: 1000004e */ b .JF0f17896c /* f178834: 8fbf0014 */ lw $ra,0x14($sp) @@ -252,7 +252,7 @@ glabel mpMenuTextWeaponDescription .JF0f17883c: /* f17883c: 54810006 */ bnel $a0,$at,.JF0f178858 /* f178840: 24010050 */ li $at,0x50 -/* f178844: 0fc5baa5 */ jal 0xf16ea94 +/* f178844: 0fc5baa5 */ jal langGet /* f178848: 24044cec */ li $a0,0x4cec /* f17884c: 10000047 */ b .JF0f17896c /* f178850: 8fbf0014 */ lw $ra,0x14($sp) @@ -264,7 +264,7 @@ glabel mpMenuTextWeaponDescription /* f178864: 24010034 */ li $at,0x34 /* f178868: 15210039 */ bne $t1,$at,.JF0f178950 /* f17886c: 00000000 */ nop -/* f178870: 0fc5b3cf */ jal 0xf16cf3c +/* f178870: 0fc5b3cf */ jal lvGetDifficulty /* f178874: afa5004c */ sw $a1,0x4c($sp) /* f178878: 28410002 */ slti $at,$v0,0x2 /* f17887c: 14200034 */ bnez $at,.JF0f178950 @@ -311,24 +311,24 @@ glabel mpMenuTextWeaponDescription /* f178918: 256dfffc */ addiu $t5,$t3,-4 /* f17891c: 1464fffa */ bne $v1,$a0,.JF0f178908 /* f178920: a04dffff */ sb $t5,-0x1($v0) -/* f178924: 0fc5baa5 */ jal 0xf16ea94 +/* f178924: 0fc5baa5 */ jal langGet /* f178928: 24044cef */ li $a0,0x4cef /* f17892c: 3c048007 */ lui $a0,0x8007 /* f178930: 8c841990 */ lw $a0,0x1990($a0) /* f178934: 00402825 */ move $a1,$v0 /* f178938: 27a60040 */ addiu $a2,$sp,0x40 -/* f17893c: 0c004d95 */ jal 0x13654 +/* f17893c: 0c004d95 */ jal sprintf /* f178940: 27a70030 */ addiu $a3,$sp,0x30 /* f178944: 3c028007 */ lui $v0,0x8007 /* f178948: 10000007 */ b .JF0f178968 /* f17894c: 8c421990 */ lw $v0,0x1990($v0) .JF0f178950: -/* f178950: 0fc5baa5 */ jal 0xf16ea94 +/* f178950: 0fc5baa5 */ jal langGet /* f178954: 94a4004a */ lhu $a0,0x4a($a1) /* f178958: 10000004 */ b .JF0f17896c /* f17895c: 8fbf0014 */ lw $ra,0x14($sp) .JF0f178960: -/* f178960: 0fc5baa5 */ jal 0xf16ea94 +/* f178960: 0fc5baa5 */ jal langGet /* f178964: 24045603 */ li $a0,0x5603 .JF0f178968: /* f178968: 8fbf0014 */ lw $ra,0x14($sp) @@ -783,36 +783,36 @@ glabel mpPushEndscreenDialog /* f179550: 11600005 */ beqz $t3,.JF0f179568 /* f179554: 00000000 */ nop .JF0f179558: -/* f179558: 0fc3e40a */ jal 0xf0f9028 +/* f179558: 0fc3e40a */ jal menuPushRootDialog /* f17955c: 24050005 */ li $a1,0x5 /* f179560: 10000018 */ b .JF0f1795c4 /* f179564: 00000000 */ nop .JF0f179568: -/* f179568: 0fc673a7 */ jal 0xf19ce9c +/* f179568: 0fc673a7 */ jal mpIsChallengeCompleteForEndscreen /* f17956c: 00000000 */ nop /* f179570: 10400007 */ beqz $v0,.JF0f179590 /* f179574: 3c048008 */ lui $a0,0x8008 /* f179578: 3c048008 */ lui $a0,0x8008 /* f17957c: 248450b4 */ addiu $a0,$a0,0x50b4 -/* f179580: 0fc3e40a */ jal 0xf0f9028 +/* f179580: 0fc3e40a */ jal menuPushRootDialog /* f179584: 24050005 */ li $a1,0x5 /* f179588: 1000000e */ b .JF0f1795c4 /* f17958c: 00000000 */ nop .JF0f179590: /* f179590: 248450e4 */ addiu $a0,$a0,0x50e4 -/* f179594: 0fc3e40a */ jal 0xf0f9028 +/* f179594: 0fc3e40a */ jal menuPushRootDialog /* f179598: 24050005 */ li $a1,0x5 /* f17959c: 10000009 */ b .JF0f1795c4 /* f1795a0: 00000000 */ nop .JF0f1795a4: -/* f1795a4: 0fc3e40a */ jal 0xf0f9028 +/* f1795a4: 0fc3e40a */ jal menuPushRootDialog /* f1795a8: 24050005 */ li $a1,0x5 /* f1795ac: 10000005 */ b .JF0f1795c4 /* f1795b0: 00000000 */ nop .JF0f1795b4: /* f1795b4: 3c048008 */ lui $a0,0x8008 /* f1795b8: 24845084 */ addiu $a0,$a0,0x5084 -/* f1795bc: 0fc3e40a */ jal 0xf0f9028 +/* f1795bc: 0fc3e40a */ jal menuPushRootDialog /* f1795c0: 24050005 */ li $a1,0x5 .JF0f1795c4: /* f1795c4: 3c0c8009 */ lui $t4,0x8009 @@ -840,7 +840,7 @@ glabel mpPushEndscreenDialog /* f17961c: 34694000 */ ori $t1,$v1,0x4000 /* f179620: 15000003 */ bnez $t0,.JF0f179630 /* f179624: 248451a0 */ addiu $a0,$a0,0x51a0 -/* f179628: 0fc3cef8 */ jal 0xf0f3be0 +/* f179628: 0fc3cef8 */ jal menuPushDialog /* f17962c: a4490048 */ sh $t1,0x48($v0) .JF0f179630: /* f179630: 8fbf0014 */ lw $ra,0x14($sp) diff --git a/src/game/mplayer/mplayer.c b/src/game/mplayer/mplayer.c index d82904b74..b82723322 100644 --- a/src/game/mplayer/mplayer.c +++ b/src/game/mplayer/mplayer.c @@ -1230,17 +1230,17 @@ glabel mpRenderModalText /* f189ff8: 0321001a */ div $zero,$t9,$at /* f189ffc: 00004010 */ mfhi $t0 /* f18a000: afa80054 */ sw $t0,0x54($sp) -/* f18a004: 0fc54b55 */ jal 0xf152d54 +/* f18a004: 0fc54b55 */ jal func0f153628 /* f18a008: 00000000 */ nop /* f18a00c: afa200a0 */ sw $v0,0xa0($sp) -/* f18a010: 0fc5baa5 */ jal 0xf16ea94 +/* f18a010: 0fc5baa5 */ jal langGet /* f18a014: 24045429 */ li $a0,0x5429 /* f18a018: 27a4005c */ addiu $a0,$sp,0x5c -/* f18a01c: 0c004c34 */ jal 0x130d0 +/* f18a01c: 0c004c34 */ jal strcpy /* f18a020: 00402825 */ move $a1,$v0 -/* f18a024: 0c002f29 */ jal 0xbca4 +/* f18a024: 0c002f29 */ jal viGetViewLeft /* f18a028: 00000000 */ nop -/* f18a02c: 0c002f0b */ jal 0xbc2c +/* f18a02c: 0c002f0b */ jal viGetViewWidth /* f18a030: a7a20042 */ sh $v0,0x42($sp) /* f18a034: 87aa0042 */ lh $t2,0x42($sp) /* f18a038: 3c0c8008 */ lui $t4,0x8008 @@ -1281,15 +1281,15 @@ glabel mpRenderModalText /* f18a0b8: 8f39ebf8 */ lw $t9,-0x1408($t9) /* f18a0bc: 13200006 */ beqz $t9,.JF0f18a0d8 /* f18a0c0: 00000000 */ nop -/* f18a0c4: 0c002f2d */ jal 0xbcb4 +/* f18a0c4: 0c002f2d */ jal viGetViewTop /* f18a0c8: 00000000 */ nop /* f18a0cc: 2448000a */ addiu $t0,$v0,0xa /* f18a0d0: 1000000c */ b .JF0f18a104 /* f18a0d4: afa80090 */ sw $t0,0x90($sp) .JF0f18a0d8: -/* f18a0d8: 0c002f2d */ jal 0xbcb4 +/* f18a0d8: 0c002f2d */ jal viGetViewTop /* f18a0dc: 00000000 */ nop -/* f18a0e0: 0c002f0f */ jal 0xbc3c +/* f18a0e0: 0c002f0f */ jal viGetViewHeight /* f18a0e4: a7a20042 */ sh $v0,0x42($sp) /* f18a0e8: 87aa0042 */ lh $t2,0x42($sp) /* f18a0ec: 04410003 */ bgez $v0,.JF0f18a0fc @@ -1308,7 +1308,7 @@ glabel mpRenderModalText /* f18a118: 27a5009c */ addiu $a1,$sp,0x9c /* f18a11c: 27a6005c */ addiu $a2,$sp,0x5c /* f18a120: afa00014 */ sw $zero,0x14($sp) -/* f18a124: 0fc55d49 */ jal 0xf157524 +/* f18a124: 0fc55d49 */ jal textMeasure /* f18a128: afac0010 */ sw $t4,0x10($sp) /* f18a12c: 8fad009c */ lw $t5,0x9c($sp) /* f18a130: 8fa30094 */ lw $v1,0x94($sp) @@ -1318,9 +1318,9 @@ glabel mpRenderModalText /* f18a140: 00017043 */ sra $t6,$at,0x1 .JF0f18a144: /* f18a144: 006e1823 */ subu $v1,$v1,$t6 -/* f18a148: 0c002eeb */ jal 0xbbac +/* f18a148: 0c002eeb */ jal viGetWidth /* f18a14c: afa30094 */ sw $v1,0x94($sp) -/* f18a150: 0c002eeb */ jal 0xbbac +/* f18a150: 0c002eeb */ jal viGetWidth /* f18a154: a7a20040 */ sh $v0,0x40($sp) /* f18a158: 8fb90054 */ lw $t9,0x54($sp) /* f18a15c: 3c0f8008 */ lui $t7,0x8008 @@ -1344,9 +1344,9 @@ glabel mpRenderModalText /* f18a1a4: afa0002c */ sw $zero,0x2c($sp) /* f18a1a8: afb80014 */ sw $t8,0x14($sp) /* f18a1ac: afaf0010 */ sw $t7,0x10($sp) -/* f18a1b0: 0fc55d34 */ jal 0xf1574d0 +/* f18a1b0: 0fc55d34 */ jal func0f1574d0jf /* f18a1b4: afab0020 */ sw $t3,0x20($sp) -/* f18a1b8: 0fc54bb7 */ jal 0xf152edc +/* f18a1b8: 0fc54bb7 */ jal func0f153780 /* f18a1bc: 00402025 */ move $a0,$v0 /* f18a1c0: afa200a0 */ sw $v0,0xa0($sp) /* f18a1c4: 100000fb */ b .JF0f18a5b4 @@ -1403,17 +1403,17 @@ glabel mpRenderModalText /* f18a280: 8f184688 */ lw $t8,0x4688($t8) /* f18a284: 570000cc */ bnezl $t8,.JF0f18a5b8 /* f18a288: 8fbf0034 */ lw $ra,0x34($sp) -/* f18a28c: 0fc54b55 */ jal 0xf152d54 +/* f18a28c: 0fc54b55 */ jal func0f153628 /* f18a290: 8fa400a0 */ lw $a0,0xa0($sp) /* f18a294: afa200a0 */ sw $v0,0xa0($sp) -/* f18a298: 0fc5baa5 */ jal 0xf16ea94 +/* f18a298: 0fc5baa5 */ jal langGet /* f18a29c: 24045428 */ li $a0,0x5428 /* f18a2a0: 27a4005c */ addiu $a0,$sp,0x5c -/* f18a2a4: 0c004c34 */ jal 0x130d0 +/* f18a2a4: 0c004c34 */ jal strcpy /* f18a2a8: 00402825 */ move $a1,$v0 -/* f18a2ac: 0c002f29 */ jal 0xbca4 +/* f18a2ac: 0c002f29 */ jal viGetViewLeft /* f18a2b0: 00000000 */ nop -/* f18a2b4: 0c002f0b */ jal 0xbc2c +/* f18a2b4: 0c002f0b */ jal viGetViewWidth /* f18a2b8: a7a20042 */ sh $v0,0x42($sp) /* f18a2bc: 87a80042 */ lh $t0,0x42($sp) /* f18a2c0: 04410003 */ bgez $v0,.JF0f18a2d0 @@ -1438,9 +1438,9 @@ glabel mpRenderModalText .JF0f18a304: /* f18a304: 00001812 */ mflo $v1 /* f18a308: afa30094 */ sw $v1,0x94($sp) -/* f18a30c: 0c002f2d */ jal 0xbcb4 +/* f18a30c: 0c002f2d */ jal viGetViewTop /* f18a310: 00000000 */ nop -/* f18a314: 0c002f0f */ jal 0xbc3c +/* f18a314: 0c002f0f */ jal viGetViewHeight /* f18a318: a7a20042 */ sh $v0,0x42($sp) /* f18a31c: 87ab0042 */ lh $t3,0x42($sp) /* f18a320: 3c0d8008 */ lui $t5,0x8008 @@ -1458,7 +1458,7 @@ glabel mpRenderModalText /* f18a34c: 27a5009c */ addiu $a1,$sp,0x9c /* f18a350: 27a6005c */ addiu $a2,$sp,0x5c /* f18a354: afa00014 */ sw $zero,0x14($sp) -/* f18a358: 0fc55d49 */ jal 0xf157524 +/* f18a358: 0fc55d49 */ jal textMeasure /* f18a35c: afad0010 */ sw $t5,0x10($sp) /* f18a360: 8fae009c */ lw $t6,0x9c($sp) /* f18a364: 8fa30094 */ lw $v1,0x94($sp) @@ -1468,9 +1468,9 @@ glabel mpRenderModalText /* f18a374: 00017843 */ sra $t7,$at,0x1 .JF0f18a378: /* f18a378: 006f1823 */ subu $v1,$v1,$t7 -/* f18a37c: 0c002eeb */ jal 0xbbac +/* f18a37c: 0c002eeb */ jal viGetWidth /* f18a380: afa30094 */ sw $v1,0x94($sp) -/* f18a384: 0c002eeb */ jal 0xbbac +/* f18a384: 0c002eeb */ jal viGetWidth /* f18a388: a7a20040 */ sh $v0,0x40($sp) /* f18a38c: 3c188008 */ lui $t8,0x8008 /* f18a390: 3c198008 */ lui $t9,0x8008 @@ -1491,7 +1491,7 @@ glabel mpRenderModalText /* f18a3cc: afa0002c */ sw $zero,0x2c($sp) /* f18a3d0: afb90014 */ sw $t9,0x14($sp) /* f18a3d4: afb80010 */ sw $t8,0x10($sp) -/* f18a3d8: 0fc55d34 */ jal 0xf1574d0 +/* f18a3d8: 0fc55d34 */ jal func0f1574d0jf /* f18a3dc: afaa0020 */ sw $t2,0x20($sp) /* f18a3e0: 3c0b800a */ lui $t3,0x800a /* f18a3e4: 8d6ba8b4 */ lw $t3,-0x574c($t3) @@ -1499,9 +1499,9 @@ glabel mpRenderModalText /* f18a3ec: 8d6c1c0c */ lw $t4,0x1c0c($t3) /* f18a3f0: 1980005e */ blez $t4,.JF0f18a56c /* f18a3f4: 00000000 */ nop -/* f18a3f8: 0c002f2d */ jal 0xbcb4 +/* f18a3f8: 0c002f2d */ jal viGetViewTop /* f18a3fc: 00000000 */ nop -/* f18a400: 0c002f0f */ jal 0xbc3c +/* f18a400: 0c002f0f */ jal viGetViewHeight /* f18a404: a7a20042 */ sh $v0,0x42($sp) /* f18a408: 87ae0042 */ lh $t6,0x42($sp) /* f18a40c: 8fb80098 */ lw $t8,0x98($sp) @@ -1513,9 +1513,9 @@ glabel mpRenderModalText /* f18a420: 01ae7821 */ addu $t7,$t5,$t6 /* f18a424: 01f8c821 */ addu $t9,$t7,$t8 /* f18a428: 27280002 */ addiu $t0,$t9,0x2 -/* f18a42c: 0c002f29 */ jal 0xbca4 +/* f18a42c: 0c002f29 */ jal viGetViewLeft /* f18a430: afa8004c */ sw $t0,0x4c($sp) -/* f18a434: 0c002f0b */ jal 0xbc2c +/* f18a434: 0c002f0b */ jal viGetViewWidth /* f18a438: a7a20042 */ sh $v0,0x42($sp) /* f18a43c: 87aa0042 */ lh $t2,0x42($sp) /* f18a440: 3c0c8008 */ lui $t4,0x8008 @@ -1549,7 +1549,7 @@ glabel mpRenderModalText /* f18a4a4: 00c1001a */ div $zero,$a2,$at /* f18a4a8: 00003012 */ mflo $a2 /* f18a4ac: 24a599f4 */ addiu $a1,$a1,-26124 -/* f18a4b0: 0c004d95 */ jal 0x13654 +/* f18a4b0: 0c004d95 */ jal sprintf /* f18a4b4: 27a4005c */ addiu $a0,$sp,0x5c /* f18a4b8: 3c188008 */ lui $t8,0x8008 /* f18a4bc: 8f180148 */ lw $t8,0x148($t8) @@ -1559,7 +1559,7 @@ glabel mpRenderModalText /* f18a4cc: 27a5009c */ addiu $a1,$sp,0x9c /* f18a4d0: 27a6005c */ addiu $a2,$sp,0x5c /* f18a4d4: afa00014 */ sw $zero,0x14($sp) -/* f18a4d8: 0fc55d49 */ jal 0xf157524 +/* f18a4d8: 0fc55d49 */ jal textMeasure /* f18a4dc: afb80010 */ sw $t8,0x10($sp) /* f18a4e0: 8fa8009c */ lw $t0,0x9c($sp) /* f18a4e4: 8fb90048 */ lw $t9,0x48($sp) @@ -1571,9 +1571,9 @@ glabel mpRenderModalText .JF0f18a4fc: /* f18a4fc: 03291823 */ subu $v1,$t9,$t1 /* f18a500: afa30094 */ sw $v1,0x94($sp) -/* f18a504: 0c002eeb */ jal 0xbbac +/* f18a504: 0c002eeb */ jal viGetWidth /* f18a508: afaa0090 */ sw $t2,0x90($sp) -/* f18a50c: 0c002eeb */ jal 0xbbac +/* f18a50c: 0c002eeb */ jal viGetWidth /* f18a510: a7a20040 */ sh $v0,0x40($sp) /* f18a514: 3c0b8008 */ lui $t3,0x8008 /* f18a518: 3c0c8008 */ lui $t4,0x8008 @@ -1594,11 +1594,11 @@ glabel mpRenderModalText /* f18a554: afa0002c */ sw $zero,0x2c($sp) /* f18a558: afac0014 */ sw $t4,0x14($sp) /* f18a55c: afab0010 */ sw $t3,0x10($sp) -/* f18a560: 0fc55d34 */ jal 0xf1574d0 +/* f18a560: 0fc55d34 */ jal func0f1574d0jf /* f18a564: afaf0020 */ sw $t7,0x20($sp) /* f18a568: afa200a0 */ sw $v0,0xa0($sp) .JF0f18a56c: -/* f18a56c: 0fc54bb7 */ jal 0xf152edc +/* f18a56c: 0fc54bb7 */ jal func0f153780 /* f18a570: 8fa400a0 */ lw $a0,0xa0($sp) /* f18a574: 3c08800a */ lui $t0,0x800a /* f18a578: 8d08a8b8 */ lw $t0,-0x5748($t0) @@ -6369,7 +6369,7 @@ glabel func0f18dec4 /* f18e7ec: afa0002c */ sw $zero,0x2c($sp) /* f18e7f0: 00008025 */ move $s0,$zero .JF0f18e7f4: -/* f18e7f4: 0fc63924 */ jal 0xf18e490 +/* f18e7f4: 0fc63924 */ jal mpIsPresetUnlocked /* f18e7f8: 02002025 */ move $a0,$s0 /* f18e7fc: 5040000d */ beqzl $v0,.JF0f18e834 /* f18e800: 26100001 */ addiu $s0,$s0,0x1 @@ -6394,9 +6394,9 @@ glabel func0f18dec4 .JF0f18e844: /* f18e844: 8fa4002c */ lw $a0,0x2c($sp) /* f18e848: 27a50030 */ addiu $a1,$sp,0x30 -/* f18e84c: 0fc6709d */ jal 0xf19c274 +/* f18e84c: 0fc6709d */ jal mpLoadConfig /* f18e850: 240601ca */ li $a2,0x1ca -/* f18e854: 0fc6397e */ jal 0xf18e5f8 +/* f18e854: 0fc6397e */ jal mpApplyConfig /* f18e858: 00402025 */ move $a0,$v0 /* f18e85c: 3c03800b */ lui $v1,0x800b /* f18e860: 2463d5b8 */ addiu $v1,$v1,-10824 diff --git a/src/game/mplayer/scenarios.c b/src/game/mplayer/scenarios.c index 44ded2c65..d3dc5e51a 100644 --- a/src/game/mplayer/scenarios.c +++ b/src/game/mplayer/scenarios.c @@ -1101,7 +1101,7 @@ glabel scenarioPickUpBriefcase /* f186fc0: 8c9902d4 */ lw $t9,0x2d4($a0) /* f186fc4: 13200016 */ beqz $t9,.JF0f187020 /* f186fc8: 00000000 */ nop -/* f186fcc: 0fc63641 */ jal 0xf18d904 +/* f186fcc: 0fc63641 */ jal mpPlayerGetIndex /* f186fd0: 00000000 */ nop /* f186fd4: 00024080 */ sll $t0,$v0,0x2 /* f186fd8: 3c09800b */ lui $t1,0x800b @@ -1110,14 +1110,14 @@ glabel scenarioPickUpBriefcase /* f186fe4: 8faa0128 */ lw $t2,0x128($sp) /* f186fe8: 8fa40134 */ lw $a0,0x134($sp) /* f186fec: afa90058 */ sw $t1,0x58($sp) -/* f186ff0: 0fc222fe */ jal 0xf088bf8 +/* f186ff0: 0fc222fe */ jal propPlayPickupSound /* f186ff4: 9145005c */ lbu $a1,0x5c($t2) /* f186ff8: 8fa40130 */ lw $a0,0x130($sp) /* f186ffc: 24050057 */ li $a1,0x57 /* f187000: 8c8302d4 */ lw $v1,0x2d4($a0) /* f187004: 906c009c */ lbu $t4,0x9c($v1) /* f187008: 358d0080 */ ori $t5,$t4,0x80 -/* f18700c: 0fc661fb */ jal 0xf1987ec +/* f18700c: 0fc661fb */ jal botinvGiveSingleWeapon /* f187010: a06d009c */ sb $t5,0x9c($v1) /* f187014: 3c13800a */ lui $s3,0x800a /* f187018: 10000022 */ b .JF0f1870a4 @@ -1151,27 +1151,27 @@ glabel scenarioPickUpBriefcase /* f187080: 016c6821 */ addu $t5,$t3,$t4 /* f187084: afad0058 */ sw $t5,0x58($sp) .JF0f187088: -/* f187088: 0fc44863 */ jal 0xf11218c +/* f187088: 0fc44863 */ jal invGiveSingleWeapon /* f18708c: 24040057 */ li $a0,0x57 /* f187090: 24040057 */ li $a0,0x57 -/* f187094: 0fc22553 */ jal 0xf08954c +/* f187094: 0fc22553 */ jal currentPlayerQueuePickupWeaponHudmsg /* f187098: 00002825 */ move $a1,$zero -/* f18709c: 0fc2233f */ jal 0xf088cfc +/* f18709c: 0fc2233f */ jal weaponPlayPickupSound /* f1870a0: 24040057 */ li $a0,0x57 .JF0f1870a4: -/* f1870a4: 0fc5baa5 */ jal 0xf16ea94 +/* f1870a4: 0fc5baa5 */ jal langGet /* f1870a8: 24045401 */ li $a0,0x5401 /* f1870ac: 00408825 */ move $s1,$v0 /* f1870b0: 8fa40058 */ lw $a0,0x58($sp) -/* f1870b4: 0fc60110 */ jal 0xf180440 +/* f1870b4: 0fc60110 */ jal func0f180440jf /* f1870b8: 00002825 */ move $a1,$zero /* f1870bc: 00408025 */ move $s0,$v0 -/* f1870c0: 0fc28c4e */ jal 0xf0a3138 +/* f1870c0: 0fc28c4e */ jal bgunGetShortName /* f1870c4: 24040057 */ li $a0,0x57 /* f1870c8: 27a400dc */ addiu $a0,$sp,0xdc /* f1870cc: 02202825 */ move $a1,$s1 /* f1870d0: 02003025 */ move $a2,$s0 -/* f1870d4: 0c004d95 */ jal 0x13654 +/* f1870d4: 0c004d95 */ jal sprintf /* f1870d8: 00403825 */ move $a3,$v0 /* f1870dc: 8e67006c */ lw $a3,0x6c($s3) /* f1870e0: 8e6e028c */ lw $t6,0x28c($s3) @@ -1217,11 +1217,11 @@ glabel scenarioPickUpBriefcase /* f187168: 124a000f */ beq $s2,$t2,.JF0f1871a8 /* f18716c: 00000000 */ nop .JF0f187170: -/* f187170: 0fc4a34d */ jal 0xf128d34 +/* f187170: 0fc4a34d */ jal setCurrentPlayerNum /* f187174: 02402025 */ move $a0,$s2 /* f187178: 27a400dc */ addiu $a0,$sp,0xdc /* f18717c: 24050009 */ li $a1,0x9 -/* f187180: 0fc37c3e */ jal 0xf0df0f8 +/* f187180: 0fc37c3e */ jal hudmsgCreateWithFlags /* f187184: 24060021 */ li $a2,0x21 /* f187188: 3c07800a */ lui $a3,0x800a /* f18718c: 3c06800a */ lui $a2,0x800a @@ -1261,7 +1261,7 @@ glabel scenarioPickUpBriefcase /* f1871fc: 5420ffd6 */ bnezl $at,.JF0f187158 /* f187200: 8fa80130 */ lw $t0,0x130($sp) .JF0f187204: -/* f187204: 0fc4a34d */ jal 0xf128d34 +/* f187204: 0fc4a34d */ jal setCurrentPlayerNum /* f187208: 8fa40120 */ lw $a0,0x120($sp) /* f18720c: 8fae0130 */ lw $t6,0x130($sp) /* f187210: 8fa3012c */ lw $v1,0x12c($sp) @@ -1278,7 +1278,7 @@ glabel scenarioPickUpBriefcase .JF0f18723c: /* f18723c: 00002825 */ move $a1,$zero /* f187240: 30c90004 */ andi $t1,$a2,0x4 -/* f187244: 0fc1af91 */ jal 0xf06be44 +/* f187244: 0fc1af91 */ jal objFree /* f187248: 01203025 */ move $a2,$t1 /* f18724c: 100001cf */ b .JF0f18798c /* f187250: 24020001 */ li $v0,0x1 @@ -1292,7 +1292,7 @@ glabel scenarioPickUpBriefcase /* f18726c: 8d4302d4 */ lw $v1,0x2d4($t2) /* f187270: 5060000e */ beqzl $v1,.JF0f1872ac /* f187274: 8e6e028c */ lw $t6,0x28c($s3) -/* f187278: 0fc63641 */ jal 0xf18d904 +/* f187278: 0fc63641 */ jal mpPlayerGetIndex /* f18727c: 01402025 */ move $a0,$t2 /* f187280: 00025880 */ sll $t3,$v0,0x2 /* f187284: 3c0c800b */ lui $t4,0x800b @@ -1346,7 +1346,7 @@ glabel scenarioPickUpBriefcase .JF0f187338: /* f187338: 546000bd */ bnezl $v1,.JF0f187630 /* f18733c: 8fa90130 */ lw $t1,0x130($sp) -/* f187340: 0fc44b12 */ jal 0xf112c48 +/* f187340: 0fc44b12 */ jal invHasBriefcase /* f187344: 00000000 */ nop /* f187348: 504000b9 */ beqzl $v0,.JF0f187630 /* f18734c: 8fa90130 */ lw $t1,0x130($sp) @@ -1373,7 +1373,7 @@ glabel scenarioPickUpBriefcase .JF0f187398: /* f187398: 11e00009 */ beqz $t7,.JF0f1873c0 /* f18739c: 03002025 */ move $a0,$t8 -/* f1873a0: 0fc668b9 */ jal 0xf19a2e4 +/* f1873a0: 0fc668b9 */ jal botinvDropOne /* f1873a4: 24050057 */ li $a1,0x57 /* f1873a8: 8fa80130 */ lw $t0,0x130($sp) /* f1873ac: 8d0302d4 */ lw $v1,0x2d4($t0) @@ -1395,14 +1395,14 @@ glabel scenarioPickUpBriefcase /* f1873e8: 240505b8 */ li $a1,0x5b8 /* f1873ec: 00003025 */ move $a2,$zero /* f1873f0: 2407ffff */ li $a3,-1 -/* f1873f4: 0c004230 */ jal 0x108c0 +/* f1873f4: 0c004230 */ jal sndStart /* f1873f8: e7a40014 */ swc1 $f4,0x14($sp) -/* f1873fc: 0fc247f5 */ jal 0xf091fd4 +/* f1873fc: 0fc247f5 */ jal weaponCreateForPlayerDrop /* f187400: 24040057 */ li $a0,0x57 -/* f187404: 0fc448aa */ jal 0xf1122a8 +/* f187404: 0fc448aa */ jal invRemoveItemByNum /* f187408: 24040057 */ li $a0,0x57 .JF0f18740c: -/* f18740c: 0fc5baa5 */ jal 0xf16ea94 +/* f18740c: 0fc5baa5 */ jal langGet /* f187410: 24045405 */ li $a0,0x5405 /* f187414: 00127080 */ sll $t6,$s2,0x2 /* f187418: 01d27023 */ subu $t6,$t6,$s2 @@ -1412,36 +1412,36 @@ glabel scenarioPickUpBriefcase /* f187428: 01d92021 */ addu $a0,$t6,$t9 /* f18742c: afa40044 */ sw $a0,0x44($sp) /* f187430: 00408025 */ move $s0,$v0 -/* f187434: 0fc60110 */ jal 0xf180440 +/* f187434: 0fc60110 */ jal func0f180440jf /* f187438: 00002825 */ move $a1,$zero /* f18743c: 27a400dc */ addiu $a0,$sp,0xdc /* f187440: 02002825 */ move $a1,$s0 -/* f187444: 0c004d95 */ jal 0x13654 +/* f187444: 0c004d95 */ jal sprintf /* f187448: 00403025 */ move $a2,$v0 -/* f18744c: 0fc5baa5 */ jal 0xf16ea94 +/* f18744c: 0fc5baa5 */ jal langGet /* f187450: 24045406 */ li $a0,0x5406 /* f187454: 00408025 */ move $s0,$v0 /* f187458: 8fa40058 */ lw $a0,0x58($sp) -/* f18745c: 0fc60110 */ jal 0xf180440 +/* f18745c: 0fc60110 */ jal func0f180440jf /* f187460: 00002825 */ move $a1,$zero /* f187464: 27a4009c */ addiu $a0,$sp,0x9c /* f187468: 02002825 */ move $a1,$s0 -/* f18746c: 0c004d95 */ jal 0x13654 +/* f18746c: 0c004d95 */ jal sprintf /* f187470: 00403025 */ move $a2,$v0 -/* f187474: 0fc5baa5 */ jal 0xf16ea94 +/* f187474: 0fc5baa5 */ jal langGet /* f187478: 24045407 */ li $a0,0x5407 /* f18747c: 00408825 */ move $s1,$v0 /* f187480: 8fa40058 */ lw $a0,0x58($sp) -/* f187484: 0fc60110 */ jal 0xf180440 +/* f187484: 0fc60110 */ jal func0f180440jf /* f187488: 00002825 */ move $a1,$zero /* f18748c: 00408025 */ move $s0,$v0 /* f187490: 8fa40044 */ lw $a0,0x44($sp) -/* f187494: 0fc60110 */ jal 0xf180440 +/* f187494: 0fc60110 */ jal func0f180440jf /* f187498: 24050001 */ li $a1,0x1 /* f18749c: 27a4005c */ addiu $a0,$sp,0x5c /* f1874a0: 02202825 */ move $a1,$s1 /* f1874a4: 02003025 */ move $a2,$s0 -/* f1874a8: 0c004d95 */ jal 0x13654 +/* f1874a8: 0c004d95 */ jal sprintf /* f1874ac: 00403825 */ move $a3,$v0 /* f1874b0: 8e78006c */ lw $t8,0x6c($s3) /* f1874b4: 8e6f028c */ lw $t7,0x28c($s3) @@ -1480,7 +1480,7 @@ glabel scenarioPickUpBriefcase /* f187524: 1960003f */ blez $t3,.JF0f187624 /* f187528: 00000000 */ nop .JF0f18752c: -/* f18752c: 0fc4a34d */ jal 0xf128d34 +/* f18752c: 0fc4a34d */ jal setCurrentPlayerNum /* f187530: 02402025 */ move $a0,$s2 /* f187534: 8fae0130 */ lw $t6,0x130($sp) /* f187538: 00124080 */ sll $t0,$s2,0x2 @@ -1493,7 +1493,7 @@ glabel scenarioPickUpBriefcase /* f187554: 164f0006 */ bne $s2,$t7,.JF0f187570 /* f187558: 27a400dc */ addiu $a0,$sp,0xdc /* f18755c: 24050009 */ li $a1,0x9 -/* f187560: 0fc37c3e */ jal 0xf0df0f8 +/* f187560: 0fc37c3e */ jal hudmsgCreateWithFlags /* f187564: 24060021 */ li $a2,0x21 /* f187568: 10000011 */ b .JF0f1875b0 /* f18756c: 8e6c006c */ lw $t4,0x6c($s3) @@ -1507,12 +1507,12 @@ glabel scenarioPickUpBriefcase /* f187588: 170a0006 */ bne $t8,$t2,.JF0f1875a4 /* f18758c: 00000000 */ nop /* f187590: 27a4009c */ addiu $a0,$sp,0x9c -/* f187594: 0fc37c3e */ jal 0xf0df0f8 +/* f187594: 0fc37c3e */ jal hudmsgCreateWithFlags /* f187598: 24050009 */ li $a1,0x9 /* f18759c: 10000004 */ b .JF0f1875b0 /* f1875a0: 8e6c006c */ lw $t4,0x6c($s3) .JF0f1875a4: -/* f1875a4: 0fc37c3e */ jal 0xf0df0f8 +/* f1875a4: 0fc37c3e */ jal hudmsgCreateWithFlags /* f1875a8: 24060021 */ li $a2,0x21 /* f1875ac: 8e6c006c */ lw $t4,0x6c($s3) .JF0f1875b0: @@ -1550,7 +1550,7 @@ glabel scenarioPickUpBriefcase /* f18761c: 1420ffc3 */ bnez $at,.JF0f18752c /* f187620: 00000000 */ nop .JF0f187624: -/* f187624: 0fc4a34d */ jal 0xf128d34 +/* f187624: 0fc4a34d */ jal setCurrentPlayerNum /* f187628: 8fa40120 */ lw $a0,0x120($sp) /* f18762c: 8fa90130 */ lw $t1,0x130($sp) .JF0f187630: @@ -1572,7 +1572,7 @@ glabel scenarioPickUpBriefcase .JF0f187664: /* f187664: 546000bc */ bnezl $v1,.JF0f187958 /* f187668: 8faa0130 */ lw $t2,0x130($sp) -/* f18766c: 0fc44b12 */ jal 0xf112c48 +/* f18766c: 0fc44b12 */ jal invHasBriefcase /* f187670: 00000000 */ nop /* f187674: 144000b7 */ bnez $v0,.JF0f187954 /* f187678: 8fab0130 */ lw $t3,0x130($sp) @@ -1585,7 +1585,7 @@ glabel scenarioPickUpBriefcase /* f187690: a06f009c */ sb $t7,0x9c($v1) /* f187694: 8fa80128 */ lw $t0,0x128($sp) /* f187698: 8fa40134 */ lw $a0,0x134($sp) -/* f18769c: 0fc222fe */ jal 0xf088bf8 +/* f18769c: 0fc222fe */ jal propPlayPickupSound /* f1876a0: 9105005c */ lbu $a1,0x5c($t0) /* f1876a4: 8faa0128 */ lw $t2,0x128($sp) .JF0f1876a8: @@ -1596,11 +1596,11 @@ glabel scenarioPickUpBriefcase /* f1876b8: 24045402 */ li $a0,0x5402 /* f1876bc: 000c6880 */ sll $t5,$t4,0x2 /* f1876c0: 002d0821 */ addu $at,$at,$t5 -/* f1876c4: 0fc5baa5 */ jal 0xf16ea94 +/* f1876c4: 0fc5baa5 */ jal langGet /* f1876c8: ac38cb98 */ sw $t8,-0x3468($at) /* f1876cc: 00408825 */ move $s1,$v0 /* f1876d0: 8fa40058 */ lw $a0,0x58($sp) -/* f1876d4: 0fc60110 */ jal 0xf180440 +/* f1876d4: 0fc60110 */ jal func0f180440jf /* f1876d8: 00002825 */ move $a1,$zero /* f1876dc: 8fab0128 */ lw $t3,0x128($sp) /* f1876e0: 3c12800b */ lui $s2,0x800b @@ -1611,24 +1611,24 @@ glabel scenarioPickUpBriefcase /* f1876f4: 000ec880 */ sll $t9,$t6,0x2 /* f1876f8: 032ec823 */ subu $t9,$t9,$t6 /* f1876fc: 0019c880 */ sll $t9,$t9,0x2 -/* f187700: 0fc60110 */ jal 0xf180440 +/* f187700: 0fc60110 */ jal func0f180440jf /* f187704: 02592021 */ addu $a0,$s2,$t9 /* f187708: 27a400dc */ addiu $a0,$sp,0xdc /* f18770c: 02202825 */ move $a1,$s1 /* f187710: 02003025 */ move $a2,$s0 -/* f187714: 0c004d95 */ jal 0x13654 +/* f187714: 0c004d95 */ jal sprintf /* f187718: 00403825 */ move $a3,$v0 -/* f18771c: 0fc5baa5 */ jal 0xf16ea94 +/* f18771c: 0fc5baa5 */ jal langGet /* f187720: 24045403 */ li $a0,0x5403 /* f187724: 00408025 */ move $s0,$v0 /* f187728: 8fa40058 */ lw $a0,0x58($sp) -/* f18772c: 0fc60110 */ jal 0xf180440 +/* f18772c: 0fc60110 */ jal func0f180440jf /* f187730: 00002825 */ move $a1,$zero /* f187734: 27a4009c */ addiu $a0,$sp,0x9c /* f187738: 02002825 */ move $a1,$s0 -/* f18773c: 0c004d95 */ jal 0x13654 +/* f18773c: 0c004d95 */ jal sprintf /* f187740: 00403025 */ move $a2,$v0 -/* f187744: 0fc5baa5 */ jal 0xf16ea94 +/* f187744: 0fc5baa5 */ jal langGet /* f187748: 24045404 */ li $a0,0x5404 /* f18774c: 8faf0128 */ lw $t7,0x128($sp) /* f187750: 00408025 */ move $s0,$v0 @@ -1637,11 +1637,11 @@ glabel scenarioPickUpBriefcase /* f18775c: 00084880 */ sll $t1,$t0,0x2 /* f187760: 01284823 */ subu $t1,$t1,$t0 /* f187764: 00094880 */ sll $t1,$t1,0x2 -/* f187768: 0fc60110 */ jal 0xf180440 +/* f187768: 0fc60110 */ jal func0f180440jf /* f18776c: 02492021 */ addu $a0,$s2,$t1 /* f187770: 27a4005c */ addiu $a0,$sp,0x5c /* f187774: 02002825 */ move $a1,$s0 -/* f187778: 0c004d95 */ jal 0x13654 +/* f187778: 0c004d95 */ jal sprintf /* f18777c: 00403025 */ move $a2,$v0 /* f187780: 8e6c006c */ lw $t4,0x6c($s3) /* f187784: 8e6a028c */ lw $t2,0x28c($s3) @@ -1679,7 +1679,7 @@ glabel scenarioPickUpBriefcase /* f1877f0: 19e0003f */ blez $t7,.JF0f1878f0 /* f1877f4: 00000000 */ nop .JF0f1877f8: -/* f1877f8: 0fc4a34d */ jal 0xf128d34 +/* f1877f8: 0fc4a34d */ jal setCurrentPlayerNum /* f1877fc: 02402025 */ move $a0,$s2 /* f187800: 8fa80130 */ lw $t0,0x130($sp) /* f187804: 00126880 */ sll $t5,$s2,0x2 @@ -1692,7 +1692,7 @@ glabel scenarioPickUpBriefcase /* f187820: 164a0006 */ bne $s2,$t2,.JF0f18783c /* f187824: 27a4005c */ addiu $a0,$sp,0x5c /* f187828: 24050009 */ li $a1,0x9 -/* f18782c: 0fc37c3e */ jal 0xf0df0f8 +/* f18782c: 0fc37c3e */ jal hudmsgCreateWithFlags /* f187830: 24060021 */ li $a2,0x21 /* f187834: 10000011 */ b .JF0f18787c /* f187838: 8e79006c */ lw $t9,0x6c($s3) @@ -1706,12 +1706,12 @@ glabel scenarioPickUpBriefcase /* f187854: 170e0006 */ bne $t8,$t6,.JF0f187870 /* f187858: 00000000 */ nop /* f18785c: 27a4009c */ addiu $a0,$sp,0x9c -/* f187860: 0fc37c3e */ jal 0xf0df0f8 +/* f187860: 0fc37c3e */ jal hudmsgCreateWithFlags /* f187864: 24050009 */ li $a1,0x9 /* f187868: 10000004 */ b .JF0f18787c /* f18786c: 8e79006c */ lw $t9,0x6c($s3) .JF0f187870: -/* f187870: 0fc37c3e */ jal 0xf0df0f8 +/* f187870: 0fc37c3e */ jal hudmsgCreateWithFlags /* f187874: 24060021 */ li $a2,0x21 /* f187878: 8e79006c */ lw $t9,0x6c($s3) .JF0f18787c: @@ -1749,14 +1749,14 @@ glabel scenarioPickUpBriefcase /* f1878e8: 1420ffc3 */ bnez $at,.JF0f1877f8 /* f1878ec: 00000000 */ nop .JF0f1878f0: -/* f1878f0: 0fc4a34d */ jal 0xf128d34 +/* f1878f0: 0fc4a34d */ jal setCurrentPlayerNum /* f1878f4: 8fa40120 */ lw $a0,0x120($sp) /* f1878f8: 8fab0130 */ lw $t3,0x130($sp) /* f1878fc: 8d7802d4 */ lw $t8,0x2d4($t3) /* f187900: 01602025 */ move $a0,$t3 /* f187904: 13000009 */ beqz $t8,.JF0f18792c /* f187908: 00000000 */ nop -/* f18790c: 0fc661fb */ jal 0xf1987ec +/* f18790c: 0fc661fb */ jal botinvGiveSingleWeapon /* f187910: 24050057 */ li $a1,0x57 /* f187914: 8fae012c */ lw $t6,0x12c($sp) /* f187918: 00001025 */ move $v0,$zero @@ -1765,13 +1765,13 @@ glabel scenarioPickUpBriefcase /* f187924: 10000019 */ b .JF0f18798c /* f187928: adcf0040 */ sw $t7,0x40($t6) .JF0f18792c: -/* f18792c: 0fc4493d */ jal 0xf1124f4 +/* f18792c: 0fc4493d */ jal invGiveWeaponsByProp /* f187930: 8fa40134 */ lw $a0,0x134($sp) /* f187934: 8fa4012c */ lw $a0,0x12c($sp) /* f187938: 00002825 */ move $a1,$zero /* f18793c: 90860002 */ lbu $a2,0x2($a0) /* f187940: 30c90004 */ andi $t1,$a2,0x4 -/* f187944: 0fc1af91 */ jal 0xf06be44 +/* f187944: 0fc1af91 */ jal objFree /* f187948: 01203025 */ move $a2,$t1 /* f18794c: 1000000f */ b .JF0f18798c /* f187950: 24020001 */ li $v0,0x1 diff --git a/src/game/mplayer/setup.c b/src/game/mplayer/setup.c index 88e2b7126..0572d72a4 100644 --- a/src/game/mplayer/setup.c +++ b/src/game/mplayer/setup.c @@ -3722,7 +3722,7 @@ glabel var7f1b9204 /* f17fb0c: 8c2e9204 */ lw $t6,-0x6dfc($at) /* f17fb10: 01c00008 */ jr $t6 /* f17fb14: 00000000 */ nop -/* f17fb18: 0fc61aba */ jal 0xf186ae8 +/* f17fb18: 0fc61aba */ jal scenarioGetMaxTeams /* f17fb1c: afa60020 */ sw $a2,0x20($sp) /* f17fb20: 8fa60020 */ lw $a2,0x20($sp) /* f17fb24: 1000003e */ b .JF0f17fc20 @@ -3742,7 +3742,7 @@ glabel var7f1b9204 /* f17fb5c: 10000030 */ b .JF0f17fc20 /* f17fb60: a028aadc */ sb $t0,-0x5524($at) /* f17fb64: afa5001c */ sw $a1,0x1c($sp) -/* f17fb68: 0fc61aba */ jal 0xf186ae8 +/* f17fb68: 0fc61aba */ jal scenarioGetMaxTeams /* f17fb6c: afa60020 */ sw $a2,0x20($sp) /* f17fb70: 8fa5001c */ lw $a1,0x1c($sp) /* f17fb74: 3c04800a */ lui $a0,0x800a @@ -3754,7 +3754,7 @@ glabel var7f1b9204 /* f17fb8c: 1420001b */ bnez $at,.JF0f17fbfc /* f17fb90: 00000000 */ nop /* f17fb94: afa5001c */ sw $a1,0x1c($sp) -/* f17fb98: 0fc61aba */ jal 0xf186ae8 +/* f17fb98: 0fc61aba */ jal scenarioGetMaxTeams /* f17fb9c: afa60020 */ sw $a2,0x20($sp) /* f17fba0: 8fa5001c */ lw $a1,0x1c($sp) /* f17fba4: 3c0c800a */ lui $t4,0x800a diff --git a/src/game/objectives/objectives.c b/src/game/objectives/objectives.c index b2717f2f9..1f861ecdb 100644 --- a/src/game/objectives/objectives.c +++ b/src/game/objectives/objectives.c @@ -427,16 +427,16 @@ glabel objectivesCheckAll /* f096b84: 27deb478 */ addiu $s8,$s8,-19336 /* f096b88: 27b6004c */ addiu $s6,$sp,0x4c .JF0f096b8c: -/* f096b8c: 0fc25901 */ jal 0xf096404 +/* f096b8c: 0fc25901 */ jal objectiveCheck /* f096b90: 02602025 */ move $a0,$s3 /* f096b94: 8e8b0000 */ lw $t3,0x0($s4) /* f096b98: 00408825 */ move $s1,$v0 /* f096b9c: 02602025 */ move $a0,$s3 /* f096ba0: 104b003b */ beq $v0,$t3,.JF0f096c90 /* f096ba4: 00000000 */ nop -/* f096ba8: 0fc258f4 */ jal 0xf0963d0 +/* f096ba8: 0fc258f4 */ jal objectiveGetDifficultyBits /* f096bac: ae820000 */ sw $v0,0x0($s4) -/* f096bb0: 0fc5b3cf */ jal 0xf16cf3c +/* f096bb0: 0fc5b3cf */ jal lvGetDifficulty /* f096bb4: 00408025 */ move $s0,$v0 /* f096bb8: 240c0001 */ li $t4,0x1 /* f096bbc: 004c6804 */ sllv $t5,$t4,$v0 @@ -449,55 +449,55 @@ glabel objectivesCheckAll /* f096bd8: bac10002 */ swr $at,0x2($s6) /* f096bdc: a3ae004c */ sb $t6,0x4c($sp) /* f096be0: a3a9004d */ sb $t1,0x4d($sp) -/* f096be4: 0fc5baa5 */ jal 0xf16ea94 +/* f096be4: 0fc5baa5 */ jal langGet /* f096be8: 24045803 */ li $a0,0x5803 /* f096bec: 3c057f1b */ lui $a1,0x7f1b /* f096bf0: 24a5c444 */ addiu $a1,$a1,-15292 /* f096bf4: 02402025 */ move $a0,$s2 /* f096bf8: 00403025 */ move $a2,$v0 -/* f096bfc: 0c004d95 */ jal 0x13654 +/* f096bfc: 0c004d95 */ jal sprintf /* f096c00: 02c03825 */ move $a3,$s6 /* f096c04: 24010001 */ li $at,0x1 /* f096c08: 1621000b */ bne $s1,$at,.JF0f096c38 /* f096c0c: 00000000 */ nop -/* f096c10: 0fc5baa5 */ jal 0xf16ea94 +/* f096c10: 0fc5baa5 */ jal langGet /* f096c14: 24045804 */ li $a0,0x5804 /* f096c18: 02402025 */ move $a0,$s2 -/* f096c1c: 0c004c71 */ jal 0x131c4 +/* f096c1c: 0c004c71 */ jal strcat /* f096c20: 00402825 */ move $a1,$v0 /* f096c24: 02402025 */ move $a0,$s2 -/* f096c28: 0fc25a61 */ jal 0xf096984 +/* f096c28: 0fc25a61 */ jal objectivesShowHudmsg /* f096c2c: 24050001 */ li $a1,0x1 /* f096c30: 10000017 */ b .JF0f096c90 /* f096c34: 00000000 */ nop .JF0f096c38: /* f096c38: 1620000b */ bnez $s1,.JF0f096c68 /* f096c3c: 24010002 */ li $at,0x2 -/* f096c40: 0fc5baa5 */ jal 0xf16ea94 +/* f096c40: 0fc5baa5 */ jal langGet /* f096c44: 24045805 */ li $a0,0x5805 /* f096c48: 02402025 */ move $a0,$s2 -/* f096c4c: 0c004c71 */ jal 0x131c4 +/* f096c4c: 0c004c71 */ jal strcat /* f096c50: 00402825 */ move $a1,$v0 /* f096c54: 02402025 */ move $a0,$s2 -/* f096c58: 0fc25a61 */ jal 0xf096984 +/* f096c58: 0fc25a61 */ jal objectivesShowHudmsg /* f096c5c: 24050001 */ li $a1,0x1 /* f096c60: 1000000b */ b .JF0f096c90 /* f096c64: 00000000 */ nop .JF0f096c68: /* f096c68: 16210009 */ bne $s1,$at,.JF0f096c90 /* f096c6c: 00000000 */ nop -/* f096c70: 0fc5baa5 */ jal 0xf16ea94 +/* f096c70: 0fc5baa5 */ jal langGet /* f096c74: 24045806 */ li $a0,0x5806 /* f096c78: 02402025 */ move $a0,$s2 -/* f096c7c: 0c004c71 */ jal 0x131c4 +/* f096c7c: 0c004c71 */ jal strcat /* f096c80: 00402825 */ move $a1,$v0 /* f096c84: 02402025 */ move $a0,$s2 -/* f096c88: 0fc25a61 */ jal 0xf096984 +/* f096c88: 0fc25a61 */ jal objectivesShowHudmsg /* f096c8c: 24050002 */ li $a1,0x2 .JF0f096c90: -/* f096c90: 0fc258f4 */ jal 0xf0963d0 +/* f096c90: 0fc258f4 */ jal objectiveGetDifficultyBits /* f096c94: 02602025 */ move $a0,$s3 -/* f096c98: 0fc5b3cf */ jal 0xf16cf3c +/* f096c98: 0fc5b3cf */ jal lvGetDifficulty /* f096c9c: 00408025 */ move $s0,$v0 /* f096ca0: 240a0001 */ li $t2,0x1 /* f096ca4: 004a5804 */ sllv $t3,$t2,$v0 diff --git a/src/game/pak/pak.c b/src/game/pak/pak.c index 9469e3056..9fdc04d3d 100644 --- a/src/game/pak/pak.c +++ b/src/game/pak/pak.c @@ -10182,7 +10182,7 @@ glabel pakN64FontCodeToAscii .JF0f11ea8c: /* f11ea8c: a0400000 */ sb $zero,0x0($v0) /* f11ea90: 8fa40134 */ lw $a0,0x134($sp) -/* f11ea94: 0c004c34 */ jal 0x130d0 +/* f11ea94: 0c004c34 */ jal strcpy /* f11ea98: 27a50030 */ addiu $a1,$sp,0x30 /* f11ea9c: 8fbf001c */ lw $ra,0x1c($sp) /* f11eaa0: 8fb00014 */ lw $s0,0x14($sp) diff --git a/src/game/player.c b/src/game/player.c index d25a3102a..c4ed3eaaa 100644 --- a/src/game/player.c +++ b/src/game/player.c @@ -3678,38 +3678,38 @@ GLOBAL_ASM( glabel playerConfigureVi /* f0be800: 27bdffd8 */ addiu $sp,$sp,-40 /* f0be804: afbf001c */ sw $ra,0x1c($sp) -/* f0be808: 0fc2f8fd */ jal 0xf0be3f4 +/* f0be808: 0fc2f8fd */ jal player0f0bd358 /* f0be80c: afb00018 */ sw $s0,0x18($sp) /* f0be810: 3c018007 */ lui $at,0x8007 /* f0be814: e7a00024 */ swc1 $f0,0x24($sp) /* f0be818: ac200c18 */ sw $zero,0xc18($at) -/* f0be81c: 0fc54a23 */ jal 0xf15288c +/* f0be81c: 0fc54a23 */ jal func0f1531dc /* f0be820: 00002025 */ move $a0,$zero /* f0be824: 3c018008 */ lui $at,0x8008 /* f0be828: ac2000f0 */ sw $zero,0xf0($at) /* f0be82c: 3c014270 */ lui $at,0x4270 /* f0be830: 44816000 */ mtc1 $at,$f12 -/* f0be834: 0fc4a3b7 */ jal 0xf128edc +/* f0be834: 0fc4a3b7 */ jal playermgrSetFovY /* f0be838: 00000000 */ nop -/* f0be83c: 0fc4a3bb */ jal 0xf128eec +/* f0be83c: 0fc4a3bb */ jal playermgrSetAspectRatio /* f0be840: c7ac0024 */ lwc1 $f12,0x24($sp) -/* f0be844: 0fc2f57c */ jal 0xf0bd5f0 +/* f0be844: 0fc2f57c */ jal playerGetViewportWidth /* f0be848: 00000000 */ nop /* f0be84c: 00028400 */ sll $s0,$v0,0x10 /* f0be850: 00107403 */ sra $t6,$s0,0x10 -/* f0be854: 0fc2f6cf */ jal 0xf0bdb3c +/* f0be854: 0fc2f6cf */ jal playerGetViewportHeight /* f0be858: 01c08025 */ move $s0,$t6 /* f0be85c: 02002025 */ move $a0,$s0 -/* f0be860: 0fc4a3a9 */ jal 0xf128ea4 +/* f0be860: 0fc4a3a9 */ jal playermgrSetViewSize /* f0be864: 00402825 */ move $a1,$v0 -/* f0be868: 0fc2f612 */ jal 0xf0bd848 +/* f0be868: 0fc2f612 */ jal playerGetViewportLeft /* f0be86c: 00000000 */ nop /* f0be870: 00028400 */ sll $s0,$v0,0x10 /* f0be874: 00107c03 */ sra $t7,$s0,0x10 -/* f0be878: 0fc2f7b0 */ jal 0xf0bdec0 +/* f0be878: 0fc2f7b0 */ jal playerGetViewportTop /* f0be87c: 01e08025 */ move $s0,$t7 /* f0be880: 02002025 */ move $a0,$s0 -/* f0be884: 0fc4a3b0 */ jal 0xf128ec0 +/* f0be884: 0fc4a3b0 */ jal playermgrSetViewPosition /* f0be888: 00402825 */ move $a1,$v0 /* f0be88c: 3c188007 */ lui $t8,0x8007 /* f0be890: 8f180c18 */ lw $t8,0xc18($t8) @@ -3720,13 +3720,13 @@ glabel playerConfigureVi /* f0be8a4: 0338c823 */ subu $t9,$t9,$t8 /* f0be8a8: 0019c880 */ sll $t9,$t9,0x2 /* f0be8ac: 00992021 */ addu $a0,$a0,$t9 -/* f0be8b0: 0c002a95 */ jal 0xaa54 +/* f0be8b0: 0c002a95 */ jal viSetMode /* f0be8b4: 8c840bd0 */ lw $a0,0xbd0($a0) -/* f0be8b8: 0fc2f57c */ jal 0xf0bd5f0 +/* f0be8b8: 0fc2f57c */ jal playerGetViewportWidth /* f0be8bc: 00000000 */ nop /* f0be8c0: 00028400 */ sll $s0,$v0,0x10 /* f0be8c4: 00104403 */ sra $t0,$s0,0x10 -/* f0be8c8: 0fc2f6cf */ jal 0xf0bdb3c +/* f0be8c8: 0fc2f6cf */ jal playerGetViewportHeight /* f0be8cc: 01008025 */ move $s0,$t0 /* f0be8d0: 3c014270 */ lui $at,0x4270 /* f0be8d4: 00103400 */ sll $a2,$s0,0x10 @@ -3736,46 +3736,46 @@ glabel playerConfigureVi /* f0be8e4: 44816000 */ mtc1 $at,$f12 /* f0be8e8: 01203025 */ move $a2,$t1 /* f0be8ec: 01403825 */ move $a3,$t2 -/* f0be8f0: 0c002f5f */ jal 0xbd7c +/* f0be8f0: 0c002f5f */ jal viSetFovAspectAndSize /* f0be8f4: c7ae0024 */ lwc1 $f14,0x24($sp) -/* f0be8f8: 0fc2f612 */ jal 0xf0bd848 +/* f0be8f8: 0fc2f612 */ jal playerGetViewportLeft /* f0be8fc: 00000000 */ nop /* f0be900: 00028400 */ sll $s0,$v0,0x10 /* f0be904: 00105c03 */ sra $t3,$s0,0x10 -/* f0be908: 0fc2f7b0 */ jal 0xf0bdec0 +/* f0be908: 0fc2f7b0 */ jal playerGetViewportTop /* f0be90c: 01608025 */ move $s0,$t3 /* f0be910: 00102400 */ sll $a0,$s0,0x10 /* f0be914: 00022c00 */ sll $a1,$v0,0x10 /* f0be918: 00056c03 */ sra $t5,$a1,0x10 /* f0be91c: 00046403 */ sra $t4,$a0,0x10 /* f0be920: 01802025 */ move $a0,$t4 -/* f0be924: 0c002f13 */ jal 0xbc4c +/* f0be924: 0c002f13 */ jal viSetViewPosition /* f0be928: 01a02825 */ move $a1,$t5 -/* f0be92c: 0fc2f53a */ jal 0xf0bd4e8 +/* f0be92c: 0fc2f53a */ jal playerGetFbWidth /* f0be930: 00000000 */ nop /* f0be934: 00028400 */ sll $s0,$v0,0x10 /* f0be938: 00107403 */ sra $t6,$s0,0x10 -/* f0be93c: 0fc2f545 */ jal 0xf0bd514 +/* f0be93c: 0fc2f545 */ jal playerGetFbHeight /* f0be940: 01c08025 */ move $s0,$t6 /* f0be944: 00102400 */ sll $a0,$s0,0x10 /* f0be948: 00022c00 */ sll $a1,$v0,0x10 /* f0be94c: 0005c403 */ sra $t8,$a1,0x10 /* f0be950: 00047c03 */ sra $t7,$a0,0x10 /* f0be954: 01e02025 */ move $a0,$t7 -/* f0be958: 0c002ee2 */ jal 0xbb88 +/* f0be958: 0c002ee2 */ jal viSetSize /* f0be95c: 03002825 */ move $a1,$t8 -/* f0be960: 0fc2f53a */ jal 0xf0bd4e8 +/* f0be960: 0fc2f53a */ jal playerGetFbWidth /* f0be964: 00000000 */ nop /* f0be968: 00028400 */ sll $s0,$v0,0x10 /* f0be96c: 0010cc03 */ sra $t9,$s0,0x10 -/* f0be970: 0fc2f545 */ jal 0xf0bd514 +/* f0be970: 0fc2f545 */ jal playerGetFbHeight /* f0be974: 03208025 */ move $s0,$t9 /* f0be978: 00102400 */ sll $a0,$s0,0x10 /* f0be97c: 00022c00 */ sll $a1,$v0,0x10 /* f0be980: 00054c03 */ sra $t1,$a1,0x10 /* f0be984: 00044403 */ sra $t0,$a0,0x10 /* f0be988: 01002025 */ move $a0,$t0 -/* f0be98c: 0c002ed1 */ jal 0xbb44 +/* f0be98c: 0c002ed1 */ jal viSetBufSize /* f0be990: 01202825 */ move $a1,$t1 /* f0be994: 8fbf001c */ lw $ra,0x1c($sp) /* f0be998: 8fb00018 */ lw $s0,0x18($sp) @@ -3892,21 +3892,21 @@ glabel var7f1af390 /* f0bea80: 24010001 */ li $at,0x1 /* f0bea84: 15e10005 */ bne $t7,$at,.JF0f0bea9c /* f0bea88: 00000000 */ nop -/* f0bea8c: 0fc54a23 */ jal 0xf15288c +/* f0bea8c: 0fc54a23 */ jal func0f1531dc /* f0bea90: 24040001 */ li $a0,0x1 /* f0bea94: 10000003 */ b .JF0f0beaa4 /* f0bea98: 00000000 */ nop .JF0f0bea9c: -/* f0bea9c: 0fc54a23 */ jal 0xf15288c +/* f0bea9c: 0fc54a23 */ jal func0f1531dc /* f0beaa0: 00002025 */ move $a0,$zero .JF0f0beaa4: /* f0beaa4: 3c018008 */ lui $at,0x8008 -/* f0beaa8: 0fc54972 */ jal 0xf1525c8 +/* f0beaa8: 0fc54972 */ jal optionsGetScreenRatio /* f0beaac: ac2000f0 */ sw $zero,0xf0($at) /* f0beab0: 24010001 */ li $at,0x1 /* f0beab4: 14410008 */ bne $v0,$at,.JF0f0bead8 /* f0beab8: 00000000 */ nop -/* f0beabc: 0fc2f8fd */ jal 0xf0be3f4 +/* f0beabc: 0fc2f8fd */ jal player0f0bd358 /* f0beac0: 00000000 */ nop /* f0beac4: 3c017f1b */ lui $at,0x7f1b /* f0beac8: c424e3b0 */ lwc1 $f4,-0x1c50($at) @@ -3914,7 +3914,7 @@ glabel var7f1af390 /* f0bead0: 10000004 */ b .JF0f0beae4 /* f0bead4: e7a6032c */ swc1 $f6,0x32c($sp) .JF0f0bead8: -/* f0bead8: 0fc2f8fd */ jal 0xf0be3f4 +/* f0bead8: 0fc2f8fd */ jal player0f0bd358 /* f0beadc: 00000000 */ nop /* f0beae0: e7a0032c */ swc1 $f0,0x32c($sp) .JF0f0beae4: @@ -3922,7 +3922,7 @@ glabel var7f1af390 /* f0beae8: 26100d8c */ addiu $s0,$s0,0xd8c /* f0beaec: 3c047f1b */ lui $a0,0x7f1b /* f0beaf0: 2484e254 */ addiu $a0,$a0,-7596 -/* f0beaf4: 0c0036b4 */ jal 0xdad0 +/* f0beaf4: 0c0036b4 */ jal mainOverrideVariable /* f0beaf8: 02002825 */ move $a1,$s0 /* f0beafc: 8e180000 */ lw $t8,0x0($s0) /* f0beb00: 53000008 */ beqzl $t8,.JF0f0beb24 @@ -3939,45 +3939,45 @@ glabel var7f1af390 /* f0beb28: 914b1bfc */ lbu $t3,0x1bfc($t2) /* f0beb2c: 51600004 */ beqzl $t3,.JF0f0beb40 /* f0beb30: 8e6c04b4 */ lw $t4,0x4b4($s3) -/* f0beb34: 0fc2f960 */ jal 0xf0be580 +/* f0beb34: 0fc2f960 */ jal playerTickTeleport /* f0beb38: 27a4032c */ addiu $a0,$sp,0x32c /* f0beb3c: 8e6c04b4 */ lw $t4,0x4b4($s3) .JF0f0beb40: /* f0beb40: 2401004e */ li $at,0x4e /* f0beb44: 5581000a */ bnel $t4,$at,.JF0f0beb70 /* f0beb48: 3c014270 */ lui $at,0x4270 -/* f0beb4c: 0fc06fbb */ jal 0xf01beec +/* f0beb4c: 0fc06fbb */ jal func0f01ad5c /* f0beb50: 00000000 */ nop /* f0beb54: 50400006 */ beqzl $v0,.JF0f0beb70 /* f0beb58: 3c014270 */ lui $at,0x4270 -/* f0beb5c: 0fc06fd2 */ jal 0xf01bf48 +/* f0beb5c: 0fc06fd2 */ jal func0f01adb8 /* f0beb60: 00000000 */ nop /* f0beb64: 10000838 */ b .JF0f0c0c48 /* f0beb68: 8fbf004c */ lw $ra,0x4c($sp) /* f0beb6c: 3c014270 */ lui $at,0x4270 .JF0f0beb70: /* f0beb70: 44816000 */ mtc1 $at,$f12 -/* f0beb74: 0fc4a3b7 */ jal 0xf128edc +/* f0beb74: 0fc4a3b7 */ jal playermgrSetFovY /* f0beb78: 00000000 */ nop -/* f0beb7c: 0fc4a3bb */ jal 0xf128eec +/* f0beb7c: 0fc4a3bb */ jal playermgrSetAspectRatio /* f0beb80: c7ac032c */ lwc1 $f12,0x32c($sp) -/* f0beb84: 0fc2f57c */ jal 0xf0bd5f0 +/* f0beb84: 0fc2f57c */ jal playerGetViewportWidth /* f0beb88: 00000000 */ nop /* f0beb8c: 00028400 */ sll $s0,$v0,0x10 /* f0beb90: 00106c03 */ sra $t5,$s0,0x10 -/* f0beb94: 0fc2f6cf */ jal 0xf0bdb3c +/* f0beb94: 0fc2f6cf */ jal playerGetViewportHeight /* f0beb98: 01a08025 */ move $s0,$t5 /* f0beb9c: 02002025 */ move $a0,$s0 -/* f0beba0: 0fc4a3a9 */ jal 0xf128ea4 +/* f0beba0: 0fc4a3a9 */ jal playermgrSetViewSize /* f0beba4: 00402825 */ move $a1,$v0 -/* f0beba8: 0fc2f612 */ jal 0xf0bd848 +/* f0beba8: 0fc2f612 */ jal playerGetViewportLeft /* f0bebac: 00000000 */ nop /* f0bebb0: 00028400 */ sll $s0,$v0,0x10 /* f0bebb4: 00107403 */ sra $t6,$s0,0x10 -/* f0bebb8: 0fc2f7b0 */ jal 0xf0bdec0 +/* f0bebb8: 0fc2f7b0 */ jal playerGetViewportTop /* f0bebbc: 01c08025 */ move $s0,$t6 /* f0bebc0: 02002025 */ move $a0,$s0 -/* f0bebc4: 0fc4a3b0 */ jal 0xf128ec0 +/* f0bebc4: 0fc4a3b0 */ jal playermgrSetViewPosition /* f0bebc8: 00402825 */ move $a1,$v0 /* f0bebcc: 8e2f0000 */ lw $t7,0x0($s1) /* f0bebd0: 3c048007 */ lui $a0,0x8007 @@ -3987,13 +3987,13 @@ glabel var7f1af390 /* f0bebe0: 030fc023 */ subu $t8,$t8,$t7 /* f0bebe4: 0018c080 */ sll $t8,$t8,0x2 /* f0bebe8: 00982021 */ addu $a0,$a0,$t8 -/* f0bebec: 0c002a95 */ jal 0xaa54 +/* f0bebec: 0c002a95 */ jal viSetMode /* f0bebf0: 8c840bd0 */ lw $a0,0xbd0($a0) -/* f0bebf4: 0fc2f57c */ jal 0xf0bd5f0 +/* f0bebf4: 0fc2f57c */ jal playerGetViewportWidth /* f0bebf8: 00000000 */ nop /* f0bebfc: 00028400 */ sll $s0,$v0,0x10 /* f0bec00: 0010cc03 */ sra $t9,$s0,0x10 -/* f0bec04: 0fc2f6cf */ jal 0xf0bdb3c +/* f0bec04: 0fc2f6cf */ jal playerGetViewportHeight /* f0bec08: 03208025 */ move $s0,$t9 /* f0bec0c: 3c014270 */ lui $at,0x4270 /* f0bec10: 00103400 */ sll $a2,$s0,0x10 @@ -4003,74 +4003,74 @@ glabel var7f1af390 /* f0bec20: 44816000 */ mtc1 $at,$f12 /* f0bec24: 01203025 */ move $a2,$t1 /* f0bec28: 01403825 */ move $a3,$t2 -/* f0bec2c: 0c002f5f */ jal 0xbd7c +/* f0bec2c: 0c002f5f */ jal viSetFovAspectAndSize /* f0bec30: c7ae032c */ lwc1 $f14,0x32c($sp) -/* f0bec34: 0fc2f612 */ jal 0xf0bd848 +/* f0bec34: 0fc2f612 */ jal playerGetViewportLeft /* f0bec38: 00000000 */ nop /* f0bec3c: 00028400 */ sll $s0,$v0,0x10 /* f0bec40: 00105c03 */ sra $t3,$s0,0x10 -/* f0bec44: 0fc2f7b0 */ jal 0xf0bdec0 +/* f0bec44: 0fc2f7b0 */ jal playerGetViewportTop /* f0bec48: 01608025 */ move $s0,$t3 /* f0bec4c: 00102400 */ sll $a0,$s0,0x10 /* f0bec50: 00022c00 */ sll $a1,$v0,0x10 /* f0bec54: 00056c03 */ sra $t5,$a1,0x10 /* f0bec58: 00046403 */ sra $t4,$a0,0x10 /* f0bec5c: 01802025 */ move $a0,$t4 -/* f0bec60: 0c002f13 */ jal 0xbc4c +/* f0bec60: 0c002f13 */ jal viSetViewPosition /* f0bec64: 01a02825 */ move $a1,$t5 -/* f0bec68: 0fc2f53a */ jal 0xf0bd4e8 +/* f0bec68: 0fc2f53a */ jal playerGetFbWidth /* f0bec6c: 00000000 */ nop /* f0bec70: 00028400 */ sll $s0,$v0,0x10 /* f0bec74: 00107403 */ sra $t6,$s0,0x10 -/* f0bec78: 0fc2f545 */ jal 0xf0bd514 +/* f0bec78: 0fc2f545 */ jal playerGetFbHeight /* f0bec7c: 01c08025 */ move $s0,$t6 /* f0bec80: 00102400 */ sll $a0,$s0,0x10 /* f0bec84: 00022c00 */ sll $a1,$v0,0x10 /* f0bec88: 0005c403 */ sra $t8,$a1,0x10 /* f0bec8c: 00047c03 */ sra $t7,$a0,0x10 /* f0bec90: 01e02025 */ move $a0,$t7 -/* f0bec94: 0c002ee2 */ jal 0xbb88 +/* f0bec94: 0c002ee2 */ jal viSetSize /* f0bec98: 03002825 */ move $a1,$t8 -/* f0bec9c: 0fc2f53a */ jal 0xf0bd4e8 +/* f0bec9c: 0fc2f53a */ jal playerGetFbWidth /* f0beca0: 00000000 */ nop /* f0beca4: 00028400 */ sll $s0,$v0,0x10 /* f0beca8: 0010cc03 */ sra $t9,$s0,0x10 -/* f0becac: 0fc2f545 */ jal 0xf0bd514 +/* f0becac: 0fc2f545 */ jal playerGetFbHeight /* f0becb0: 03208025 */ move $s0,$t9 /* f0becb4: 00102400 */ sll $a0,$s0,0x10 /* f0becb8: 00022c00 */ sll $a1,$v0,0x10 /* f0becbc: 00055403 */ sra $t2,$a1,0x10 /* f0becc0: 00044c03 */ sra $t1,$a0,0x10 /* f0becc4: 01202025 */ move $a0,$t1 -/* f0becc8: 0c002ed1 */ jal 0xbb44 +/* f0becc8: 0c002ed1 */ jal viSetBufSize /* f0beccc: 01402825 */ move $a1,$t2 -/* f0becd0: 0fc2f12b */ jal 0xf0bc4ac +/* f0becd0: 0fc2f12b */ jal playerUpdateColourScreenProperties /* f0becd4: 00000000 */ nop -/* f0becd8: 0fc2f19b */ jal 0xf0bc66c +/* f0becd8: 0fc2f19b */ jal playerTickChrFade /* f0becdc: 00000000 */ nop /* f0bece0: 8e6b0288 */ lw $t3,0x288($s3) -/* f0bece4: 0fc54771 */ jal 0xf151dc4 +/* f0bece4: 0fc54771 */ jal optionsGetAutoAim /* f0bece8: 8d640070 */ lw $a0,0x70($t3) -/* f0becec: 0fc322b8 */ jal 0xf0c8ae0 +/* f0becec: 0fc322b8 */ jal bmoveSetAutoAimY /* f0becf0: 00402025 */ move $a0,$v0 /* f0becf4: 8e6c0288 */ lw $t4,0x288($s3) -/* f0becf8: 0fc54771 */ jal 0xf151dc4 +/* f0becf8: 0fc54771 */ jal optionsGetAutoAim /* f0becfc: 8d840070 */ lw $a0,0x70($t4) -/* f0bed00: 0fc32309 */ jal 0xf0c8c24 +/* f0bed00: 0fc32309 */ jal bmoveSetAutoAimX /* f0bed04: 00402025 */ move $a0,$v0 /* f0bed08: 8e6d0288 */ lw $t5,0x288($s3) -/* f0bed0c: 0fc5477a */ jal 0xf151de8 +/* f0bed0c: 0fc5477a */ jal optionsGetLookAhead /* f0bed10: 8da40070 */ lw $a0,0x70($t5) -/* f0bed14: 0fc322b0 */ jal 0xf0c8ac0 +/* f0bed14: 0fc322b0 */ jal bmoveSetAutoMoveCentreEnabled /* f0bed18: 00402025 */ move $a0,$v0 /* f0bed1c: 8e6e0288 */ lw $t6,0x288($s3) -/* f0bed20: 0fc54795 */ jal 0xf151e54 +/* f0bed20: 0fc54795 */ jal optionsGetAmmoOnScreen /* f0bed24: 8dc40070 */ lw $a0,0x70($t6) /* f0bed28: 02a02025 */ move $a0,$s5 -/* f0bed2c: 0fc2a99b */ jal 0xf0aa66c +/* f0bed2c: 0fc2a99b */ jal bgunSetGunAmmoVisible /* f0bed30: 00402825 */ move $a1,$v0 /* f0bed34: 02a02025 */ move $a0,$s5 -/* f0bed38: 0fc2b33e */ jal 0xf0accf8 +/* f0bed38: 0fc2b33e */ jal bgunSetSightVisible /* f0bed3c: 24050001 */ li $a1,0x1 /* f0bed40: 8e6302ac */ lw $v1,0x2ac($s3) /* f0bed44: 10600002 */ beqz $v1,.JF0f0bed50 @@ -4098,12 +4098,12 @@ glabel var7f1af390 /* f0bed90: 11a00004 */ beqz $t5,.JF0f0beda4 /* f0bed94: 00000000 */ nop /* f0bed98: 8e64028c */ lw $a0,0x28c($s3) -/* f0bed9c: 0fc3092f */ jal 0xf0c24bc +/* f0bed9c: 0fc3092f */ jal playerDieByShooter /* f0beda0: 24050001 */ li $a1,0x1 .JF0f0beda4: -/* f0beda4: 0fc2f225 */ jal 0xf0bc894 +/* f0beda4: 0fc2f225 */ jal playerTickDamageAndHealth /* f0beda8: 00000000 */ nop -/* f0bedac: 0fc2f468 */ jal 0xf0bd1a0 +/* f0bedac: 0fc2f468 */ jal playerTickExplode /* f0bedb0: 00000000 */ nop /* f0bedb4: 8e700284 */ lw $s0,0x284($s3) /* f0bedb8: 8e020480 */ lw $v0,0x480($s0) @@ -4120,7 +4120,7 @@ glabel var7f1af390 /* f0bede4: 8c910004 */ lw $s1,0x4($a0) /* f0bede8: a2400035 */ sb $zero,0x35($s2) /* f0bedec: a2550034 */ sb $s5,0x34($s2) -/* f0bedf0: 0fc24d13 */ jal 0xf09344c +/* f0bedf0: 0fc24d13 */ jal func0f0926bc /* f0bedf4: a2400037 */ sb $zero,0x37($s2) /* f0bedf8: 8e2f0018 */ lw $t7,0x18($s1) /* f0bedfc: 2401fffb */ li $at,-5 @@ -4141,14 +4141,14 @@ glabel var7f1af390 /* f0bee34: 51a00022 */ beqzl $t5,.JF0f0beec0 /* f0bee38: 8e6c0034 */ lw $t4,0x34($s3) /* f0bee3c: 8e6e0288 */ lw $t6,0x288($s3) -/* f0bee40: 0fc5475a */ jal 0xf151d68 +/* f0bee40: 0fc5475a */ jal optionsGetContpadNum1 /* f0bee44: 8dc40070 */ lw $a0,0x70($t6) /* f0bee48: 8fb80330 */ lw $t8,0x330($sp) /* f0bee4c: 00022600 */ sll $a0,$v0,0x18 /* f0bee50: 00047e03 */ sra $t7,$a0,0x18 /* f0bee54: 13000005 */ beqz $t8,.JF0f0bee6c /* f0bee58: 01e02025 */ move $a0,$t7 -/* f0bee5c: 0c0053be */ jal 0x14ef8 +/* f0bee5c: 0c0053be */ jal joyGetButtons /* f0bee60: 3405ffff */ li $a1,0xffff /* f0bee64: 10000002 */ b .JF0f0bee70 /* f0bee68: 3043ffff */ andi $v1,$v0,0xffff @@ -4168,18 +4168,18 @@ glabel var7f1af390 /* f0bee98: 8e6b0314 */ lw $t3,0x314($s3) /* f0bee9c: 15600005 */ bnez $t3,.JF0f0beeb4 /* f0beea0: 00000000 */ nop -/* f0beea4: 0fc2efe3 */ jal 0xf0bbf8c +/* f0beea4: 0fc2efe3 */ jal playerPause /* f0beea8: 24040002 */ li $a0,0x2 /* f0beeac: 10000004 */ b .JF0f0beec0 /* f0beeb0: 8e6c0034 */ lw $t4,0x34($s3) .JF0f0beeb4: -/* f0beeb4: 0fc5e4e5 */ jal 0xf179394 +/* f0beeb4: 0fc5e4e5 */ jal mpPushPauseDialog /* f0beeb8: 00000000 */ nop /* f0beebc: 8e6c0034 */ lw $t4,0x34($s3) .JF0f0beec0: /* f0beec0: 5180001d */ beqzl $t4,.JF0f0bef38 /* f0beec4: 924e0035 */ lbu $t6,0x35($s2) -/* f0beec8: 0fc3467a */ jal 0xf0d19e8 +/* f0beec8: 0fc3467a */ jal eyespyProcessInput /* f0beecc: 8fa40330 */ lw $a0,0x330($sp) /* f0beed0: 10000019 */ b .JF0f0bef38 /* f0beed4: 924e0035 */ lbu $t6,0x35($s2) @@ -4196,7 +4196,7 @@ glabel var7f1af390 /* f0beefc: 8d4a0ca0 */ lw $t2,0xca0($t2) /* f0bef00: 5140000d */ beqzl $t2,.JF0f0bef38 /* f0bef04: 924e0035 */ lbu $t6,0x35($s2) -/* f0bef08: 0fc344f4 */ jal 0xf0d13d0 +/* f0bef08: 0fc344f4 */ jal eyespyTryLaunch /* f0bef0c: 00000000 */ nop /* f0bef10: 54400009 */ bnezl $v0,.JF0f0bef38 /* f0bef14: 924e0035 */ lbu $t6,0x35($s2) @@ -4251,25 +4251,25 @@ glabel var7f1af390 /* f0befd0: 240580ab */ li $a1,-32597 /* f0befd4: 00003025 */ move $a2,$zero /* f0befd8: 2407ffff */ li $a3,-1 -/* f0befdc: 0c004230 */ jal 0x108c0 +/* f0befdc: 0c004230 */ jal sndStart /* f0befe0: e7a80014 */ swc1 $f8,0x14($sp) /* f0befe4: 8e700284 */ lw $s0,0x284($s3) .JF0f0befe8: /* f0befe8: 2411ffd8 */ li $s1,-40 /* f0befec: a611024c */ sh $s1,0x24c($s0) .JF0f0beff0: -/* f0beff0: 0fc5b3cc */ jal 0xf16cf30 +/* f0beff0: 0fc5b3cc */ jal lvIsPaused /* f0beff4: 2411ffd8 */ li $s1,-40 /* f0beff8: 50400004 */ beqzl $v0,.JF0f0bf00c /* f0beffc: 8e700284 */ lw $s0,0x284($s3) -/* f0bf000: 0fc2ef58 */ jal 0xf0bbd60 +/* f0bf000: 0fc2ef58 */ jal playerStopAudioForPause /* f0bf004: 00000000 */ nop /* f0bf008: 8e700284 */ lw $s0,0x284($s3) .JF0f0bf00c: /* f0bf00c: 8e0c1a24 */ lw $t4,0x1a24($s0) /* f0bf010: 51800005 */ beqzl $t4,.JF0f0bf028 /* f0bf014: 960e0010 */ lhu $t6,0x10($s0) -/* f0bf018: 0fc2ef7b */ jal 0xf0bbdec +/* f0bf018: 0fc2ef7b */ jal playerTickPauseMenu /* f0bf01c: 00000000 */ nop /* f0bf020: 8e700284 */ lw $s0,0x284($s3) /* f0bf024: 960e0010 */ lhu $t6,0x10($s0) @@ -4298,7 +4298,7 @@ glabel var7f1af390 /* f0bf070: 24010006 */ li $at,0x6 /* f0bf074: 54610054 */ bnel $v1,$at,.JF0f0bf1c8 /* f0bf078: 8e700284 */ lw $s0,0x284($s3) -/* f0bf07c: 0fc2e708 */ jal 0xf0b9c20 +/* f0bf07c: 0fc2e708 */ jal playerTickChrBody /* f0bf080: 00000000 */ nop /* f0bf084: 8e700284 */ lw $s0,0x284($s3) /* f0bf088: 00002025 */ move $a0,$zero @@ -4308,9 +4308,9 @@ glabel var7f1af390 /* f0bf098: 24070001 */ li $a3,0x1 /* f0bf09c: 51200008 */ beqzl $t1,.JF0f0bf0c0 /* f0bf0a0: 8e6b006c */ lw $t3,0x6c($s3) -/* f0bf0a4: 0fc33346 */ jal 0xf0ccd18 +/* f0bf0a4: 0fc33346 */ jal bmoveTick /* f0bf0a8: a611024c */ sh $s1,0x24c($s0) -/* f0bf0ac: 0fc2ecc7 */ jal 0xf0bb31c +/* f0bf0ac: 0fc2ecc7 */ jal playerTickCutscene /* f0bf0b0: 8fa40330 */ lw $a0,0x330($sp) /* f0bf0b4: 8e6a0284 */ lw $t2,0x284($s3) /* f0bf0b8: a551024c */ sh $s1,0x24c($t2) @@ -4408,9 +4408,9 @@ glabel var7f1af390 /* f0bf1f8: 51a00028 */ beqzl $t5,.JF0f0bf29c /* f0bf1fc: 920d1bfc */ lbu $t5,0x1bfc($s0) /* f0bf200: 4481a000 */ mtc1 $at,$f20 -/* f0bf204: 0fc4a3b7 */ jal 0xf128edc +/* f0bf204: 0fc4a3b7 */ jal playermgrSetFovY /* f0bf208: 4600a306 */ mov.s $f12,$f20 -/* f0bf20c: 0c002f35 */ jal 0xbcd4 +/* f0bf20c: 0c002f35 */ jal viSetFovY /* f0bf210: 4600a306 */ mov.s $f12,$f20 /* f0bf214: 8e700284 */ lw $s0,0x284($s3) /* f0bf218: 8e190480 */ lw $t9,0x480($s0) @@ -4424,14 +4424,14 @@ glabel var7f1af390 /* f0bf238: 8e090480 */ lw $t1,0x480($s0) /* f0bf23c: 8d2b0000 */ lw $t3,0x0($t1) /* f0bf240: c5640010 */ lwc1 $f4,0x10($t3) -/* f0bf244: 0fc2e708 */ jal 0xf0b9c20 +/* f0bf244: 0fc2e708 */ jal playerTickChrBody /* f0bf248: e7a40310 */ swc1 $f4,0x310($sp) /* f0bf24c: 00002025 */ move $a0,$zero /* f0bf250: 00002825 */ move $a1,$zero /* f0bf254: 00003025 */ move $a2,$zero -/* f0bf258: 0fc33346 */ jal 0xf0ccd18 +/* f0bf258: 0fc33346 */ jal bmoveTick /* f0bf25c: 24070001 */ li $a3,0x1 -/* f0bf260: 0fc30a3a */ jal 0xf0c28e8 +/* f0bf260: 0fc30a3a */ jal playerSetCameraMode /* f0bf264: 24040002 */ li $a0,0x2 /* f0bf268: 8e6c0284 */ lw $t4,0x284($s3) /* f0bf26c: 27a40308 */ addiu $a0,$sp,0x308 @@ -4441,7 +4441,7 @@ glabel var7f1af390 /* f0bf27c: 24460004 */ addiu $a2,$v0,0x4 /* f0bf280: 246e0028 */ addiu $t6,$v1,0x28 /* f0bf284: afae0010 */ sw $t6,0x10($sp) -/* f0bf288: 0fc30a3e */ jal 0xf0c28f8 +/* f0bf288: 0fc30a3e */ jal player0f0c1840 /* f0bf28c: 24670008 */ addiu $a3,$v1,0x8 /* f0bf290: 100005d6 */ b .JF0f0c09ec /* f0bf294: 8e700284 */ lw $s0,0x284($s3) @@ -4450,7 +4450,7 @@ glabel var7f1af390 /* f0bf29c: 24020003 */ li $v0,0x3 /* f0bf2a0: 544d0011 */ bnel $v0,$t5,.JF0f0bf2e8 /* f0bf2a4: 96180010 */ lhu $t8,0x10($s0) -/* f0bf2a8: 0fc2e708 */ jal 0xf0b9c20 +/* f0bf2a8: 0fc2e708 */ jal playerTickChrBody /* f0bf2ac: 00000000 */ nop /* f0bf2b0: 8e790284 */ lw $t9,0x284($s3) /* f0bf2b4: 3c01800a */ lui $at,0x800a @@ -4459,9 +4459,9 @@ glabel var7f1af390 /* f0bf2c0: 00002825 */ move $a1,$zero /* f0bf2c4: 00003025 */ move $a2,$zero /* f0bf2c8: 24070001 */ li $a3,0x1 -/* f0bf2cc: 0fc33346 */ jal 0xf0ccd18 +/* f0bf2cc: 0fc33346 */ jal bmoveTick /* f0bf2d0: a42fe4b8 */ sh $t7,-0x1b48($at) -/* f0bf2d4: 0fc2eb4f */ jal 0xf0bad3c +/* f0bf2d4: 0fc2eb4f */ jal playerExecutePreparedWarp /* f0bf2d8: 00000000 */ nop /* f0bf2dc: 100005c3 */ b .JF0f0c09ec /* f0bf2e0: 8e700284 */ lw $s0,0x284($s3) @@ -4498,16 +4498,16 @@ glabel var7f1af390 /* f0bf358: 24040001 */ li $a0,0x1 /* f0bf35c: af010008 */ sw $at,0x8($t8) /* f0bf360: afa002e0 */ sw $zero,0x2e0($sp) -/* f0bf364: 0fc30a3a */ jal 0xf0c28e8 +/* f0bf364: 0fc30a3a */ jal playerSetCameraMode /* f0bf368: 8e110264 */ lw $s1,0x264($s0) -/* f0bf36c: 0fc2e708 */ jal 0xf0b9c20 +/* f0bf36c: 0fc2e708 */ jal playerTickChrBody /* f0bf370: 00000000 */ nop /* f0bf374: 00002025 */ move $a0,$zero /* f0bf378: 00002825 */ move $a1,$zero /* f0bf37c: 00003025 */ move $a2,$zero -/* f0bf380: 0fc33346 */ jal 0xf0ccd18 +/* f0bf380: 0fc33346 */ jal bmoveTick /* f0bf384: 24070001 */ li $a3,0x1 -/* f0bf388: 0fc2f918 */ jal 0xf0be460 +/* f0bf388: 0fc2f918 */ jal playerUpdateShake /* f0bf38c: 00000000 */ nop /* f0bf390: 522001fc */ beqzl $s1,.JF0f0bfb84 /* f0bf394: 8fa902e0 */ lw $t1,0x2e0($sp) @@ -4522,7 +4522,7 @@ glabel var7f1af390 /* f0bf3b8: 460e7202 */ mul.s $f8,$f14,$f14 /* f0bf3bc: 46083280 */ add.s $f10,$f6,$f8 /* f0bf3c0: 46000482 */ mul.s $f18,$f0,$f0 -/* f0bf3c4: 0c012838 */ jal 0x4a0e0 +/* f0bf3c4: 0c012838 */ jal sqrtf /* f0bf3c8: 460a9300 */ add.s $f12,$f18,$f10 /* f0bf3cc: e7a002a8 */ swc1 $f0,0x2a8($sp) /* f0bf3d0: c624001c */ lwc1 $f4,0x1c($s1) @@ -4567,7 +4567,7 @@ glabel var7f1af390 /* f0bf46c: 8e2d0014 */ lw $t5,0x14($s1) /* f0bf470: c5a40010 */ lwc1 $f4,0x10($t5) /* f0bf474: afaf0010 */ sw $t7,0x10($sp) -/* f0bf478: 0fc58969 */ jal 0xf1625a4 +/* f0bf478: 0fc58969 */ jal func0f162194 /* f0bf47c: e7a40304 */ swc1 $f4,0x304($sp) /* f0bf480: 87aa027c */ lh $t2,0x27c($sp) /* f0bf484: 2401ffff */ li $at,-1 @@ -4605,10 +4605,10 @@ glabel var7f1af390 /* f0bf4fc: 00000000 */ nop /* f0bf500: ae0000c8 */ sw $zero,0xc8($s0) .JF0f0bf504: -/* f0bf504: 0c00586a */ jal 0x161a8 +/* f0bf504: 0c00586a */ jal mtx00016208 /* f0bf508: 27a502f0 */ addiu $a1,$sp,0x2f0 /* f0bf50c: 27a402b8 */ addiu $a0,$sp,0x2b8 -/* f0bf510: 0c00586a */ jal 0x161a8 +/* f0bf510: 0c00586a */ jal mtx00016208 /* f0bf514: 27a502e4 */ addiu $a1,$sp,0x2e4 /* f0bf518: 8e2a0040 */ lw $t2,0x40($s1) /* f0bf51c: 31580080 */ andi $t8,$t2,0x80 @@ -4616,17 +4616,17 @@ glabel var7f1af390 /* f0bf524: 8fa902e0 */ lw $t1,0x2e0($sp) /* f0bf528: 8e6b0288 */ lw $t3,0x288($s3) /* f0bf52c: 8e340048 */ lw $s4,0x48($s1) -/* f0bf530: 0fc5474c */ jal 0xf151d30 +/* f0bf530: 0fc5474c */ jal optionsGetControlMode /* f0bf534: 8d640070 */ lw $a0,0x70($t3) /* f0bf538: 8e690288 */ lw $t1,0x288($s3) /* f0bf53c: 00408025 */ move $s0,$v0 -/* f0bf540: 0fc5475a */ jal 0xf151d68 +/* f0bf540: 0fc5475a */ jal optionsGetContpadNum1 /* f0bf544: 8d240070 */ lw $a0,0x70($t1) /* f0bf548: 8e790288 */ lw $t9,0x288($s3) /* f0bf54c: 00029600 */ sll $s2,$v0,0x18 /* f0bf550: 00126603 */ sra $t4,$s2,0x18 /* f0bf554: 01809025 */ move $s2,$t4 -/* f0bf558: 0fc54761 */ jal 0xf151d84 +/* f0bf558: 0fc54761 */ jal optionsGetContpadNum2 /* f0bf55c: 8f240070 */ lw $a0,0x70($t9) /* f0bf560: 0002ae00 */ sll $s5,$v0,0x18 /* f0bf564: 00157603 */ sra $t6,$s5,0x18 @@ -4663,19 +4663,19 @@ glabel var7f1af390 .JF0f0bf5dc: /* f0bf5dc: 0004c603 */ sra $t8,$a0,0x18 /* f0bf5e0: 03002025 */ move $a0,$t8 -/* f0bf5e4: 0c0053be */ jal 0x14ef8 +/* f0bf5e4: 0c0053be */ jal joyGetButtons /* f0bf5e8: 3405c000 */ li $a1,0xc000 /* f0bf5ec: 1440000c */ bnez $v0,.JF0f0bf620 /* f0bf5f0: 00152600 */ sll $a0,$s5,0x18 /* f0bf5f4: 00045e03 */ sra $t3,$a0,0x18 /* f0bf5f8: 01602025 */ move $a0,$t3 -/* f0bf5fc: 0c0053be */ jal 0x14ef8 +/* f0bf5fc: 0c0053be */ jal joyGetButtons /* f0bf600: 3405c000 */ li $a1,0xc000 /* f0bf604: 14400006 */ bnez $v0,.JF0f0bf620 /* f0bf608: 00152600 */ sll $a0,$s5,0x18 /* f0bf60c: 00044e03 */ sra $t1,$a0,0x18 /* f0bf610: 01202025 */ move $a0,$t1 -/* f0bf614: 0c0053be */ jal 0x14ef8 +/* f0bf614: 0c0053be */ jal joyGetButtons /* f0bf618: 24052000 */ li $a1,0x2000 /* f0bf61c: 10400002 */ beqz $v0,.JF0f0bf628 .JF0f0bf620: @@ -4685,7 +4685,7 @@ glabel var7f1af390 /* f0bf628: 00122600 */ sll $a0,$s2,0x18 /* f0bf62c: 0004ce03 */ sra $t9,$a0,0x18 /* f0bf630: 03202025 */ move $a0,$t9 -/* f0bf634: 0c0053ee */ jal 0x14fb8 +/* f0bf634: 0c0053ee */ jal joyGetButtonsPressedThisFrame /* f0bf638: 24052000 */ li $a1,0x2000 /* f0bf63c: 1040001e */ beqz $v0,.JF0f0bf6b8 /* f0bf640: 240e0001 */ li $t6,0x1 @@ -4694,19 +4694,19 @@ glabel var7f1af390 .JF0f0bf64c: /* f0bf64c: 00122600 */ sll $a0,$s2,0x18 /* f0bf650: 00046e03 */ sra $t5,$a0,0x18 -/* f0bf654: 0c0053be */ jal 0x14ef8 +/* f0bf654: 0c0053be */ jal joyGetButtons /* f0bf658: 01a02025 */ move $a0,$t5 /* f0bf65c: 1440000c */ bnez $v0,.JF0f0bf690 /* f0bf660: 00152600 */ sll $a0,$s5,0x18 /* f0bf664: 00047e03 */ sra $t7,$a0,0x18 /* f0bf668: 01e02025 */ move $a0,$t7 -/* f0bf66c: 0c0053be */ jal 0x14ef8 +/* f0bf66c: 0c0053be */ jal joyGetButtons /* f0bf670: 3405c000 */ li $a1,0xc000 /* f0bf674: 14400006 */ bnez $v0,.JF0f0bf690 /* f0bf678: 00122600 */ sll $a0,$s2,0x18 /* f0bf67c: 00045603 */ sra $t2,$a0,0x18 /* f0bf680: 01402025 */ move $a0,$t2 -/* f0bf684: 0c0053be */ jal 0x14ef8 +/* f0bf684: 0c0053be */ jal joyGetButtons /* f0bf688: 24052000 */ li $a1,0x2000 /* f0bf68c: 10400002 */ beqz $v0,.JF0f0bf698 .JF0f0bf690: @@ -4716,7 +4716,7 @@ glabel var7f1af390 /* f0bf698: 00152600 */ sll $a0,$s5,0x18 /* f0bf69c: 00045e03 */ sra $t3,$a0,0x18 /* f0bf6a0: 01602025 */ move $a0,$t3 -/* f0bf6a4: 0c0053ee */ jal 0x14fb8 +/* f0bf6a4: 0c0053ee */ jal joyGetButtonsPressedThisFrame /* f0bf6a8: 24052000 */ li $a1,0x2000 /* f0bf6ac: 10400002 */ beqz $v0,.JF0f0bf6b8 /* f0bf6b0: 24090001 */ li $t1,0x1 @@ -4724,12 +4724,12 @@ glabel var7f1af390 .JF0f0bf6b8: /* f0bf6b8: 00122600 */ sll $a0,$s2,0x18 /* f0bf6bc: 00046603 */ sra $t4,$a0,0x18 -/* f0bf6c0: 0c00536a */ jal 0x14da8 +/* f0bf6c0: 0c00536a */ jal joyGetStickX /* f0bf6c4: 01802025 */ move $a0,$t4 /* f0bf6c8: 00122600 */ sll $a0,$s2,0x18 /* f0bf6cc: 0004ce03 */ sra $t9,$a0,0x18 /* f0bf6d0: a3a2023d */ sb $v0,0x23d($sp) -/* f0bf6d4: 0c005394 */ jal 0x14e50 +/* f0bf6d4: 0c005394 */ jal joyGetStickY /* f0bf6d8: 03202025 */ move $a0,$t9 /* f0bf6dc: 10000002 */ b .JF0f0bf6e8 /* f0bf6e0: a3a2023c */ sb $v0,0x23c($sp) @@ -4738,13 +4738,13 @@ glabel var7f1af390 /* f0bf6e8: 00122600 */ sll $a0,$s2,0x18 /* f0bf6ec: 00046e03 */ sra $t5,$a0,0x18 /* f0bf6f0: 01a02025 */ move $a0,$t5 -/* f0bf6f4: 0c0053be */ jal 0x14ef8 +/* f0bf6f4: 0c0053be */ jal joyGetButtons /* f0bf6f8: 24051000 */ li $a1,0x1000 /* f0bf6fc: 14400006 */ bnez $v0,.JF0f0bf718 /* f0bf700: 00152600 */ sll $a0,$s5,0x18 /* f0bf704: 00047e03 */ sra $t7,$a0,0x18 /* f0bf708: 01e02025 */ move $a0,$t7 -/* f0bf70c: 0c0053be */ jal 0x14ef8 +/* f0bf70c: 0c0053be */ jal joyGetButtons /* f0bf710: 24051000 */ li $a1,0x1000 /* f0bf714: 10400044 */ beqz $v0,.JF0f0bf828 .JF0f0bf718: @@ -4769,7 +4769,7 @@ glabel var7f1af390 .JF0f0bf75c: /* f0bf75c: 00046603 */ sra $t4,$a0,0x18 /* f0bf760: 01802025 */ move $a0,$t4 -/* f0bf764: 0c0053ee */ jal 0x14fb8 +/* f0bf764: 0c0053ee */ jal joyGetButtonsPressedThisFrame /* f0bf768: 34058000 */ li $a1,0x8000 /* f0bf76c: 10400003 */ beqz $v0,.JF0f0bf77c /* f0bf770: 00122600 */ sll $a0,$s2,0x18 @@ -4778,7 +4778,7 @@ glabel var7f1af390 .JF0f0bf77c: /* f0bf77c: 00047603 */ sra $t6,$a0,0x18 /* f0bf780: 01c02025 */ move $a0,$t6 -/* f0bf784: 0c0053be */ jal 0x14ef8 +/* f0bf784: 0c0053be */ jal joyGetButtons /* f0bf788: 24056030 */ li $a1,0x6030 /* f0bf78c: 10400012 */ beqz $v0,.JF0f0bf7d8 /* f0bf790: 240d0001 */ li $t5,0x1 @@ -4787,7 +4787,7 @@ glabel var7f1af390 .JF0f0bf79c: /* f0bf79c: 00122600 */ sll $a0,$s2,0x18 /* f0bf7a0: 00047e03 */ sra $t7,$a0,0x18 -/* f0bf7a4: 0c0053ee */ jal 0x14fb8 +/* f0bf7a4: 0c0053ee */ jal joyGetButtonsPressedThisFrame /* f0bf7a8: 01e02025 */ move $a0,$t7 /* f0bf7ac: 10400003 */ beqz $v0,.JF0f0bf7bc /* f0bf7b0: 00122600 */ sll $a0,$s2,0x18 @@ -4796,7 +4796,7 @@ glabel var7f1af390 .JF0f0bf7bc: /* f0bf7bc: 0004c603 */ sra $t8,$a0,0x18 /* f0bf7c0: 03002025 */ move $a0,$t8 -/* f0bf7c4: 0c0053be */ jal 0x14ef8 +/* f0bf7c4: 0c0053be */ jal joyGetButtons /* f0bf7c8: 3405c030 */ li $a1,0xc030 /* f0bf7cc: 10400002 */ beqz $v0,.JF0f0bf7d8 /* f0bf7d0: 240b0001 */ li $t3,0x1 @@ -4804,12 +4804,12 @@ glabel var7f1af390 .JF0f0bf7d8: /* f0bf7d8: 00122600 */ sll $a0,$s2,0x18 /* f0bf7dc: 00044e03 */ sra $t1,$a0,0x18 -/* f0bf7e0: 0c00536a */ jal 0x14da8 +/* f0bf7e0: 0c00536a */ jal joyGetStickX /* f0bf7e4: 01202025 */ move $a0,$t1 /* f0bf7e8: 00122600 */ sll $a0,$s2,0x18 /* f0bf7ec: 00046603 */ sra $t4,$a0,0x18 /* f0bf7f0: a3a2023d */ sb $v0,0x23d($sp) -/* f0bf7f4: 0c005394 */ jal 0x14e50 +/* f0bf7f4: 0c005394 */ jal joyGetStickY /* f0bf7f8: 01802025 */ move $a0,$t4 /* f0bf7fc: 10000002 */ b .JF0f0bf808 /* f0bf800: a3a2023c */ sb $v0,0x23c($sp) @@ -4818,7 +4818,7 @@ glabel var7f1af390 /* f0bf808: 00122600 */ sll $a0,$s2,0x18 /* f0bf80c: 00047603 */ sra $t6,$a0,0x18 /* f0bf810: 01c02025 */ move $a0,$t6 -/* f0bf814: 0c0053be */ jal 0x14ef8 +/* f0bf814: 0c0053be */ jal joyGetButtons /* f0bf818: 24051000 */ li $a1,0x1000 /* f0bf81c: 10400002 */ beqz $v0,.JF0f0bf828 /* f0bf820: 240d0001 */ li $t5,0x1 @@ -4830,12 +4830,12 @@ glabel var7f1af390 /* f0bf834: 8e6a0314 */ lw $t2,0x314($s3) /* f0bf838: 15400005 */ bnez $t2,.JF0f0bf850 /* f0bf83c: 00000000 */ nop -/* f0bf840: 0fc2efe3 */ jal 0xf0bbf8c +/* f0bf840: 0fc2efe3 */ jal playerPause /* f0bf844: 24040002 */ li $a0,0x2 /* f0bf848: 10000004 */ b .JF0f0bf85c /* f0bf84c: 83ab023c */ lb $t3,0x23c($sp) .JF0f0bf850: -/* f0bf850: 0fc5e4e5 */ jal 0xf179394 +/* f0bf850: 0fc5e4e5 */ jal mpPushPauseDialog /* f0bf854: 00000000 */ nop /* f0bf858: 83ab023c */ lb $t3,0x23c($sp) .JF0f0bf85c: @@ -4865,7 +4865,7 @@ glabel var7f1af390 /* f0bf8b8: 00000000 */ nop /* f0bf8bc: 46021282 */ mul.s $f10,$f2,$f2 /* f0bf8c0: e7a80174 */ swc1 $f8,0x174($sp) -/* f0bf8c4: 0c012838 */ jal 0x4a0e0 +/* f0bf8c4: 0c012838 */ jal sqrtf /* f0bf8c8: 460a9300 */ add.s $f12,$f18,$f10 /* f0bf8cc: c7a202ac */ lwc1 $f2,0x2ac($sp) /* f0bf8d0: c7ae02b4 */ lwc1 $f14,0x2b4($sp) @@ -4873,10 +4873,10 @@ glabel var7f1af390 /* f0bf8d8: 46001083 */ div.s $f2,$f2,$f0 /* f0bf8dc: 46007383 */ div.s $f14,$f14,$f0 /* f0bf8e0: e7a202ac */ swc1 $f2,0x2ac($sp) -/* f0bf8e4: 0c0068df */ jal 0x1a37c +/* f0bf8e4: 0c0068df */ jal sinf /* f0bf8e8: e7ae02b4 */ swc1 $f14,0x2b4($sp) /* f0bf8ec: 46000506 */ mov.s $f20,$f0 -/* f0bf8f0: 0c0068dc */ jal 0x1a370 +/* f0bf8f0: 0c0068dc */ jal cosf /* f0bf8f4: 4600b306 */ mov.s $f12,$f22 /* f0bf8f8: c7a202ac */ lwc1 $f2,0x2ac($sp) /* f0bf8fc: c7ae02b4 */ lwc1 $f14,0x2b4($sp) @@ -4887,10 +4887,10 @@ glabel var7f1af390 /* f0bf910: 46147202 */ mul.s $f8,$f14,$f20 /* f0bf914: e7a60154 */ swc1 $f6,0x154($sp) /* f0bf918: e7a40150 */ swc1 $f4,0x150($sp) -/* f0bf91c: 0c0068df */ jal 0x1a37c +/* f0bf91c: 0c0068df */ jal sinf /* f0bf920: e7a80158 */ swc1 $f8,0x158($sp) /* f0bf924: 46000506 */ mov.s $f20,$f0 -/* f0bf928: 0c0068dc */ jal 0x1a370 +/* f0bf928: 0c0068dc */ jal cosf /* f0bf92c: c7ac0174 */ lwc1 $f12,0x174($sp) /* f0bf930: 44801000 */ mtc1 $zero,$f2 /* f0bf934: c7b202c8 */ lwc1 $f18,0x2c8($sp) @@ -4908,14 +4908,14 @@ glabel var7f1af390 /* f0bf960: 4600a287 */ neg.s $f10,$f20 /* f0bf964: e7aa0164 */ swc1 $f10,0x164($sp) .JF0f0bf968: -/* f0bf968: 0fc26136 */ jal 0xf0984d8 +/* f0bf968: 0fc26136 */ jal quaternionMultQuaternion /* f0bf96c: e7a20168 */ swc1 $f2,0x168($sp) /* f0bf970: 27b001fc */ addiu $s0,$sp,0x1fc /* f0bf974: 02002825 */ move $a1,$s0 -/* f0bf978: 0fc25f1d */ jal 0xf097c74 +/* f0bf978: 0fc25f1d */ jal quaternionToMtx /* f0bf97c: 02a02025 */ move $a0,$s5 /* f0bf980: 02002025 */ move $a0,$s0 -/* f0bf984: 0c0056ac */ jal 0x15ab0 +/* f0bf984: 0c0056ac */ jal mtx4RotateVecInPlace /* f0bf988: 26850004 */ addiu $a1,$s4,0x4 /* f0bf98c: 8e8e0000 */ lw $t6,0x0($s4) /* f0bf990: 44808000 */ mtc1 $zero,$f16 @@ -4943,7 +4943,7 @@ glabel var7f1af390 /* f0bf9e0: 460e7182 */ mul.s $f6,$f14,$f14 /* f0bf9e4: 46062200 */ add.s $f8,$f4,$f6 /* f0bf9e8: 46000482 */ mul.s $f18,$f0,$f0 -/* f0bf9ec: 0c012838 */ jal 0x4a0e0 +/* f0bf9ec: 0c012838 */ jal sqrtf /* f0bf9f0: 46089300 */ add.s $f12,$f18,$f8 /* f0bf9f4: 8fab0114 */ lw $t3,0x114($sp) /* f0bf9f8: 46000386 */ mov.s $f14,$f0 @@ -5003,23 +5003,23 @@ glabel var7f1af390 /* f0bfabc: 46023482 */ mul.s $f18,$f6,$f2 /* f0bfac0: 460e9203 */ div.s $f8,$f18,$f14 /* f0bfac4: e6840008 */ swc1 $f4,0x8($s4) -/* f0bfac8: 0c00573d */ jal 0x15cf4 +/* f0bfac8: 0c00573d */ jal mtx3ToMtx4 /* f0bfacc: e688000c */ swc1 $f8,0xc($s4) /* f0bfad0: 27b2012c */ addiu $s2,$sp,0x12c /* f0bfad4: 02402825 */ move $a1,$s2 -/* f0bfad8: 0fc25f79 */ jal 0xf097de4 +/* f0bfad8: 0fc25f79 */ jal quaternion0f097044 /* f0bfadc: 02002025 */ move $a0,$s0 /* f0bfae0: 27b0011c */ addiu $s0,$sp,0x11c /* f0bfae4: 02003025 */ move $a2,$s0 /* f0bfae8: 02a02025 */ move $a0,$s5 -/* f0bfaec: 0fc26136 */ jal 0xf0984d8 +/* f0bfaec: 0fc26136 */ jal quaternionMultQuaternion /* f0bfaf0: 02402825 */ move $a1,$s2 /* f0bfaf4: 27b2017c */ addiu $s2,$sp,0x17c /* f0bfaf8: 02402825 */ move $a1,$s2 -/* f0bfafc: 0fc25f1d */ jal 0xf097c74 +/* f0bfafc: 0fc25f1d */ jal quaternionToMtx /* f0bfb00: 02002025 */ move $a0,$s0 /* f0bfb04: 02402025 */ move $a0,$s2 -/* f0bfb08: 0c005750 */ jal 0x15d40 +/* f0bfb08: 0c005750 */ jal mtx4ToMtx3 /* f0bfb0c: 27a502b8 */ addiu $a1,$sp,0x2b8 /* f0bfb10: c7a002a8 */ lwc1 $f0,0x2a8($sp) /* f0bfb14: c7aa02b8 */ lwc1 $f10,0x2b8($sp) @@ -5072,13 +5072,13 @@ glabel var7f1af390 /* f0bfbc8: afaa0010 */ sw $t2,0x10($sp) /* f0bfbcc: 27a402fc */ addiu $a0,$sp,0x2fc /* f0bfbd0: 27a502e4 */ addiu $a1,$sp,0x2e4 -/* f0bfbd4: 0fc30a3e */ jal 0xf0c28f8 +/* f0bfbd4: 0fc30a3e */ jal player0f0c1840 /* f0bfbd8: 27a602f0 */ addiu $a2,$sp,0x2f0 /* f0bfbdc: 10000004 */ b .JF0f0bfbf0 /* f0bfbe0: 00000000 */ nop .JF0f0bfbe4: /* f0bfbe4: 00003825 */ move $a3,$zero -/* f0bfbe8: 0fc30a3e */ jal 0xf0c28f8 +/* f0bfbe8: 0fc30a3e */ jal player0f0c1840 /* f0bfbec: afa00010 */ sw $zero,0x10($sp) .JF0f0bfbf0: /* f0bfbf0: 1000037e */ b .JF0f0c09ec @@ -5087,7 +5087,7 @@ glabel var7f1af390 /* f0bfbf8: 24010001 */ li $at,0x1 /* f0bfbfc: 14610261 */ bne $v1,$at,.JF0f0c0584 /* f0bfc00: 00000000 */ nop -/* f0bfc04: 0fc2e96e */ jal 0xf0ba5b8 +/* f0bfc04: 0fc2e96e */ jal player0f0b9538 /* f0bfc08: 00000000 */ nop /* f0bfc0c: 8e78028c */ lw $t8,0x28c($s3) /* f0bfc10: 3c098007 */ lui $t1,0x8007 @@ -5101,17 +5101,17 @@ glabel var7f1af390 /* f0bfc30: 00003025 */ move $a2,$zero /* f0bfc34: 24040001 */ li $a0,0x1 /* f0bfc38: 24050001 */ li $a1,0x1 -/* f0bfc3c: 0fc33346 */ jal 0xf0ccd18 +/* f0bfc3c: 0fc33346 */ jal bmoveTick /* f0bfc40: 8fa60330 */ lw $a2,0x330($sp) /* f0bfc44: 10000003 */ b .JF0f0bfc54 /* f0bfc48: 00000000 */ nop .JF0f0bfc4c: -/* f0bfc4c: 0fc33346 */ jal 0xf0ccd18 +/* f0bfc4c: 0fc33346 */ jal bmoveTick /* f0bfc50: 24070001 */ li $a3,0x1 .JF0f0bfc54: -/* f0bfc54: 0fc2f918 */ jal 0xf0be460 +/* f0bfc54: 0fc2f918 */ jal playerUpdateShake /* f0bfc58: 00000000 */ nop -/* f0bfc5c: 0fc30a3a */ jal 0xf0c28e8 +/* f0bfc5c: 0fc30a3a */ jal playerSetCameraMode /* f0bfc60: 00002025 */ move $a0,$zero /* f0bfc64: 8e700284 */ lw $s0,0x284($s3) /* f0bfc68: 44802000 */ mtc1 $zero,$f4 @@ -5138,7 +5138,7 @@ glabel var7f1af390 /* f0bfcbc: 8e0300bc */ lw $v1,0xbc($s0) /* f0bfcc0: 246c0028 */ addiu $t4,$v1,0x28 /* f0bfcc4: afac0010 */ sw $t4,0x10($sp) -/* f0bfcc8: 0fc30a3e */ jal 0xf0c28f8 +/* f0bfcc8: 0fc30a3e */ jal player0f0c1840 /* f0bfccc: 24670008 */ addiu $a3,$v1,0x8 /* f0bfcd0: 8e790318 */ lw $t9,0x318($s3) /* f0bfcd4: 3c0e800a */ lui $t6,0x800a @@ -5182,11 +5182,11 @@ glabel var7f1af390 /* f0bfd68: 0181c824 */ and $t9,$t4,$at /* f0bfd6c: 17200078 */ bnez $t9,.JF0f0bff50 /* f0bfd70: 00000000 */ nop -/* f0bfd74: 0fc59689 */ jal 0xf165a24 +/* f0bfd74: 0fc59689 */ jal stageGetIndex /* f0bfd78: 8e6404b4 */ lw $a0,0x4b4($s3) /* f0bfd7c: 14540015 */ bne $v0,$s4,.JF0f0bfdd4 /* f0bfd80: 00000000 */ nop -/* f0bfd84: 0c00611c */ jal 0x18470 +/* f0bfd84: 0c00611c */ jal ailistFindById /* f0bfd88: 24040012 */ li $a0,0x12 /* f0bfd8c: 8e700284 */ lw $s0,0x284($s3) /* f0bfd90: 3c014000 */ lui $at,0x4000 @@ -5202,17 +5202,17 @@ glabel var7f1af390 /* f0bfdb8: 24660008 */ addiu $a2,$v1,0x8 /* f0bfdbc: 24670028 */ addiu $a3,$v1,0x28 /* f0bfdc0: 46143482 */ mul.s $f18,$f6,$f20 -/* f0bfdc4: 0fc130e6 */ jal 0xf04c398 +/* f0bfdc4: 0fc130e6 */ jal chrSpawnAtCoord /* f0bfdc8: e7b20010 */ swc1 $f18,0x10($sp) /* f0bfdcc: 1000002a */ b .JF0f0bfe78 /* f0bfdd0: 00408825 */ move $s1,$v0 .JF0f0bfdd4: -/* f0bfdd4: 0fc59689 */ jal 0xf165a24 +/* f0bfdd4: 0fc59689 */ jal stageGetIndex /* f0bfdd8: 8e6404b4 */ lw $a0,0x4b4($s3) /* f0bfddc: 24010023 */ li $at,0x23 /* f0bfde0: 14410012 */ bne $v0,$at,.JF0f0bfe2c /* f0bfde4: 00000000 */ nop -/* f0bfde8: 0c00611c */ jal 0x18470 +/* f0bfde8: 0c00611c */ jal ailistFindById /* f0bfdec: 24040012 */ li $a0,0x12 /* f0bfdf0: 8e700284 */ lw $s0,0x284($s3) /* f0bfdf4: 240d0010 */ li $t5,0x10 @@ -5225,12 +5225,12 @@ glabel var7f1af390 /* f0bfe10: 24050008 */ li $a1,0x8 /* f0bfe14: 24660008 */ addiu $a2,$v1,0x8 /* f0bfe18: 24670028 */ addiu $a3,$v1,0x28 -/* f0bfe1c: 0fc130e6 */ jal 0xf04c398 +/* f0bfe1c: 0fc130e6 */ jal chrSpawnAtCoord /* f0bfe20: e7aa0010 */ swc1 $f10,0x10($sp) /* f0bfe24: 10000014 */ b .JF0f0bfe78 /* f0bfe28: 00408825 */ move $s1,$v0 .JF0f0bfe2c: -/* f0bfe2c: 0c00611c */ jal 0x18470 +/* f0bfe2c: 0c00611c */ jal ailistFindById /* f0bfe30: 24040012 */ li $a0,0x12 /* f0bfe34: 8e700284 */ lw $s0,0x284($s3) /* f0bfe38: 3c014000 */ lui $at,0x4000 @@ -5246,7 +5246,7 @@ glabel var7f1af390 /* f0bfe60: 24660008 */ addiu $a2,$v1,0x8 /* f0bfe64: 24670028 */ addiu $a3,$v1,0x28 /* f0bfe68: 46149202 */ mul.s $f8,$f18,$f20 -/* f0bfe6c: 0fc130e6 */ jal 0xf04c398 +/* f0bfe6c: 0fc130e6 */ jal chrSpawnAtCoord /* f0bfe70: e7a80010 */ swc1 $f8,0x10($sp) /* f0bfe74: 00408825 */ move $s1,$v0 .JF0f0bfe78: @@ -5272,21 +5272,21 @@ glabel var7f1af390 /* f0bfec4: a20f02e2 */ sb $t7,0x2e2($s0) /* f0bfec8: a2120002 */ sb $s2,0x2($s0) /* f0bfecc: a2120003 */ sb $s2,0x3($s0) -/* f0bfed0: 0fc59689 */ jal 0xf165a24 +/* f0bfed0: 0fc59689 */ jal stageGetIndex /* f0bfed4: 8e6404b4 */ lw $a0,0x4b4($s3) /* f0bfed8: 14540005 */ bne $v0,$s4,.JF0f0bfef0 /* f0bfedc: 02002025 */ move $a0,$s0 -/* f0bfee0: 0fc085f3 */ jal 0xf0217cc +/* f0bfee0: 0fc085f3 */ jal chrAddHealth /* f0bfee4: 3c054220 */ lui $a1,0x4220 /* f0bfee8: 10000005 */ b .JF0f0bff00 /* f0bfeec: 02002025 */ move $a0,$s0 .JF0f0bfef0: /* f0bfef0: 4405b000 */ mfc1 $a1,$f22 -/* f0bfef4: 0fc085f3 */ jal 0xf0217cc +/* f0bfef4: 0fc085f3 */ jal chrAddHealth /* f0bfef8: 02002025 */ move $a0,$s0 /* f0bfefc: 02002025 */ move $a0,$s0 .JF0f0bff00: -/* f0bff00: 0fc085ee */ jal 0xf0217b8 +/* f0bff00: 0fc085ee */ jal chrSetMaxDamage /* f0bff04: 3c054080 */ lui $a1,0x4080 /* f0bff08: 8e0a0018 */ lw $t2,0x18($s0) /* f0bff0c: 921902e1 */ lbu $t9,0x2e1($s0) @@ -5304,19 +5304,19 @@ glabel var7f1af390 /* f0bff3c: 02002025 */ move $a0,$s0 /* f0bff40: 240500f5 */ li $a1,0xf5 /* f0bff44: 24060002 */ li $a2,0x2 -/* f0bff48: 0fc23215 */ jal 0xf08c854 +/* f0bff48: 0fc23215 */ jal chrGiveWeapon /* f0bff4c: 00003825 */ move $a3,$zero .JF0f0bff50: -/* f0bff50: 0fc41bed */ jal 0xf106fb4 +/* f0bff50: 0fc41bed */ jal cheatIsActive /* f0bff54: 24040016 */ li $a0,0x16 /* f0bff58: 10400058 */ beqz $v0,.JF0f0c00bc /* f0bff5c: 00000000 */ nop -/* f0bff60: 0fc59689 */ jal 0xf165a24 +/* f0bff60: 0fc59689 */ jal stageGetIndex /* f0bff64: 8e6404b4 */ lw $a0,0x4b4($s3) /* f0bff68: 24010023 */ li $at,0x23 /* f0bff6c: 14410012 */ bne $v0,$at,.JF0f0bffb8 /* f0bff70: 00000000 */ nop -/* f0bff74: 0c00611c */ jal 0x18470 +/* f0bff74: 0c00611c */ jal ailistFindById /* f0bff78: 24040012 */ li $a0,0x12 /* f0bff7c: 8e700284 */ lw $s0,0x284($s3) /* f0bff80: 240a0010 */ li $t2,0x10 @@ -5329,12 +5329,12 @@ glabel var7f1af390 /* f0bff9c: 24050008 */ li $a1,0x8 /* f0bffa0: 24660008 */ addiu $a2,$v1,0x8 /* f0bffa4: 24670028 */ addiu $a3,$v1,0x28 -/* f0bffa8: 0fc130e6 */ jal 0xf04c398 +/* f0bffa8: 0fc130e6 */ jal chrSpawnAtCoord /* f0bffac: e7a40010 */ swc1 $f4,0x10($sp) /* f0bffb0: 10000011 */ b .JF0f0bfff8 /* f0bffb4: 00408825 */ move $s1,$v0 .JF0f0bffb8: -/* f0bffb8: 0c00611c */ jal 0x18470 +/* f0bffb8: 0c00611c */ jal ailistFindById /* f0bffbc: 02802025 */ move $a0,$s4 /* f0bffc0: 8e700284 */ lw $s0,0x284($s3) /* f0bffc4: 24180010 */ li $t8,0x10 @@ -5347,7 +5347,7 @@ glabel var7f1af390 /* f0bffe0: 2405001b */ li $a1,0x1b /* f0bffe4: 24660008 */ addiu $a2,$v1,0x8 /* f0bffe8: 24670028 */ addiu $a3,$v1,0x28 -/* f0bffec: 0fc130e6 */ jal 0xf04c398 +/* f0bffec: 0fc130e6 */ jal chrSpawnAtCoord /* f0bfff0: e7b20010 */ swc1 $f18,0x10($sp) /* f0bfff4: 00408825 */ move $s1,$v0 .JF0f0bfff8: @@ -5373,17 +5373,17 @@ glabel var7f1af390 /* f0c0044: a21502b1 */ sb $s5,0x2b1($s0) /* f0c0048: a2120002 */ sb $s2,0x2($s0) /* f0c004c: a2120003 */ sb $s2,0x3($s0) -/* f0c0050: 0fc59689 */ jal 0xf165a24 +/* f0c0050: 0fc59689 */ jal stageGetIndex /* f0c0054: 8e6404b4 */ lw $a0,0x4b4($s3) /* f0c0058: 14540005 */ bne $v0,$s4,.JF0f0c0070 /* f0c005c: 02002025 */ move $a0,$s0 -/* f0c0060: 0fc085f3 */ jal 0xf0217cc +/* f0c0060: 0fc085f3 */ jal chrAddHealth /* f0c0064: 3c054220 */ lui $a1,0x4220 /* f0c0068: 10000005 */ b .JF0f0c0080 /* f0c006c: 8e180018 */ lw $t8,0x18($s0) .JF0f0c0070: /* f0c0070: 4405b000 */ mfc1 $a1,$f22 -/* f0c0074: 0fc085f3 */ jal 0xf0217cc +/* f0c0074: 0fc085f3 */ jal chrAddHealth /* f0c0078: 02002025 */ move $a0,$s0 /* f0c007c: 8e180018 */ lw $t8,0x18($s0) .JF0f0c0080: @@ -5400,19 +5400,19 @@ glabel var7f1af390 /* f0c00a8: ae0b0018 */ sw $t3,0x18($s0) /* f0c00ac: ae0c0014 */ sw $t4,0x14($s0) /* f0c00b0: a20a02e1 */ sb $t2,0x2e1($s0) -/* f0c00b4: 0fc085ee */ jal 0xf0217b8 +/* f0c00b4: 0fc085ee */ jal chrSetMaxDamage /* f0c00b8: 02002025 */ move $a0,$s0 .JF0f0c00bc: -/* f0c00bc: 0fc41bed */ jal 0xf106fb4 +/* f0c00bc: 0fc41bed */ jal cheatIsActive /* f0c00c0: 24040018 */ li $a0,0x18 /* f0c00c4: 1040005e */ beqz $v0,.JF0f0c0240 /* f0c00c8: 00000000 */ nop -/* f0c00cc: 0fc59689 */ jal 0xf165a24 +/* f0c00cc: 0fc59689 */ jal stageGetIndex /* f0c00d0: 8e6404b4 */ lw $a0,0x4b4($s3) /* f0c00d4: 24010023 */ li $at,0x23 /* f0c00d8: 14410012 */ bne $v0,$at,.JF0f0c0124 /* f0c00dc: 00000000 */ nop -/* f0c00e0: 0c00611c */ jal 0x18470 +/* f0c00e0: 0c00611c */ jal ailistFindById /* f0c00e4: 24040012 */ li $a0,0x12 /* f0c00e8: 8e700284 */ lw $s0,0x284($s3) /* f0c00ec: 24180010 */ li $t8,0x10 @@ -5425,12 +5425,12 @@ glabel var7f1af390 /* f0c0108: 24050008 */ li $a1,0x8 /* f0c010c: 24660008 */ addiu $a2,$v1,0x8 /* f0c0110: 24670028 */ addiu $a3,$v1,0x28 -/* f0c0114: 0fc130e6 */ jal 0xf04c398 +/* f0c0114: 0fc130e6 */ jal chrSpawnAtCoord /* f0c0118: e7aa0010 */ swc1 $f10,0x10($sp) /* f0c011c: 10000011 */ b .JF0f0c0164 /* f0c0120: 00408825 */ move $s1,$v0 .JF0f0c0124: -/* f0c0124: 0c00611c */ jal 0x18470 +/* f0c0124: 0c00611c */ jal ailistFindById /* f0c0128: 24040012 */ li $a0,0x12 /* f0c012c: 8e700284 */ lw $s0,0x284($s3) /* f0c0130: 240b0010 */ li $t3,0x10 @@ -5443,7 +5443,7 @@ glabel var7f1af390 /* f0c014c: 24050012 */ li $a1,0x12 /* f0c0150: 24660008 */ addiu $a2,$v1,0x8 /* f0c0154: 24670028 */ addiu $a3,$v1,0x28 -/* f0c0158: 0fc130e6 */ jal 0xf04c398 +/* f0c0158: 0fc130e6 */ jal chrSpawnAtCoord /* f0c015c: e7a60010 */ swc1 $f6,0x10($sp) /* f0c0160: 00408825 */ move $s1,$v0 .JF0f0c0164: @@ -5470,21 +5470,21 @@ glabel var7f1af390 /* f0c01b4: a20b02e2 */ sb $t3,0x2e2($s0) /* f0c01b8: a2090002 */ sb $t1,0x2($s0) /* f0c01bc: a2120003 */ sb $s2,0x3($s0) -/* f0c01c0: 0fc59689 */ jal 0xf165a24 +/* f0c01c0: 0fc59689 */ jal stageGetIndex /* f0c01c4: 8e6404b4 */ lw $a0,0x4b4($s3) /* f0c01c8: 14540006 */ bne $v0,$s4,.JF0f0c01e4 /* f0c01cc: 02002025 */ move $a0,$s0 /* f0c01d0: 4405b000 */ mfc1 $a1,$f22 -/* f0c01d4: 0fc085f3 */ jal 0xf0217cc +/* f0c01d4: 0fc085f3 */ jal chrAddHealth /* f0c01d8: 02002025 */ move $a0,$s0 /* f0c01dc: 10000004 */ b .JF0f0c01f0 /* f0c01e0: 02002025 */ move $a0,$s0 .JF0f0c01e4: -/* f0c01e4: 0fc085f3 */ jal 0xf0217cc +/* f0c01e4: 0fc085f3 */ jal chrAddHealth /* f0c01e8: 3c054120 */ lui $a1,0x4120 /* f0c01ec: 02002025 */ move $a0,$s0 .JF0f0c01f0: -/* f0c01f0: 0fc085ee */ jal 0xf0217b8 +/* f0c01f0: 0fc085ee */ jal chrSetMaxDamage /* f0c01f4: 3c054120 */ lui $a1,0x4120 /* f0c01f8: 8e0c0018 */ lw $t4,0x18($s0) /* f0c01fc: 920a02e1 */ lbu $t2,0x2e1($s0) @@ -5502,19 +5502,19 @@ glabel var7f1af390 /* f0c022c: 02002025 */ move $a0,$s0 /* f0c0230: 24050101 */ li $a1,0x101 /* f0c0234: 24060010 */ li $a2,0x10 -/* f0c0238: 0fc23215 */ jal 0xf08c854 +/* f0c0238: 0fc23215 */ jal chrGiveWeapon /* f0c023c: 00003825 */ move $a3,$zero .JF0f0c0240: -/* f0c0240: 0fc41bed */ jal 0xf106fb4 +/* f0c0240: 0fc41bed */ jal cheatIsActive /* f0c0244: 24040017 */ li $a0,0x17 /* f0c0248: 10400062 */ beqz $v0,.JF0f0c03d4 /* f0c024c: 00000000 */ nop -/* f0c0250: 0fc59689 */ jal 0xf165a24 +/* f0c0250: 0fc59689 */ jal stageGetIndex /* f0c0254: 8e6404b4 */ lw $a0,0x4b4($s3) /* f0c0258: 24010023 */ li $at,0x23 /* f0c025c: 14410012 */ bne $v0,$at,.JF0f0c02a8 /* f0c0260: 00000000 */ nop -/* f0c0264: 0c00611c */ jal 0x18470 +/* f0c0264: 0c00611c */ jal ailistFindById /* f0c0268: 24040012 */ li $a0,0x12 /* f0c026c: 8e700284 */ lw $s0,0x284($s3) /* f0c0270: 240c0010 */ li $t4,0x10 @@ -5527,12 +5527,12 @@ glabel var7f1af390 /* f0c028c: 24050008 */ li $a1,0x8 /* f0c0290: 24660008 */ addiu $a2,$v1,0x8 /* f0c0294: 24670028 */ addiu $a3,$v1,0x28 -/* f0c0298: 0fc130e6 */ jal 0xf04c398 +/* f0c0298: 0fc130e6 */ jal chrSpawnAtCoord /* f0c029c: e7a80010 */ swc1 $f8,0x10($sp) /* f0c02a0: 10000011 */ b .JF0f0c02e8 /* f0c02a4: 00408825 */ move $s1,$v0 .JF0f0c02a8: -/* f0c02a8: 0c00611c */ jal 0x18470 +/* f0c02a8: 0c00611c */ jal ailistFindById /* f0c02ac: 24040012 */ li $a0,0x12 /* f0c02b0: 8e700284 */ lw $s0,0x284($s3) /* f0c02b4: 24190010 */ li $t9,0x10 @@ -5545,7 +5545,7 @@ glabel var7f1af390 /* f0c02d0: 02802825 */ move $a1,$s4 /* f0c02d4: 24660008 */ addiu $a2,$v1,0x8 /* f0c02d8: 24670028 */ addiu $a3,$v1,0x28 -/* f0c02dc: 0fc130e6 */ jal 0xf04c398 +/* f0c02dc: 0fc130e6 */ jal chrSpawnAtCoord /* f0c02e0: e7a40010 */ swc1 $f4,0x10($sp) /* f0c02e4: 00408825 */ move $s1,$v0 .JF0f0c02e8: @@ -5571,21 +5571,21 @@ glabel var7f1af390 /* f0c0334: a20c02e2 */ sb $t4,0x2e2($s0) /* f0c0338: a2190002 */ sb $t9,0x2($s0) /* f0c033c: a2120003 */ sb $s2,0x3($s0) -/* f0c0340: 0fc59689 */ jal 0xf165a24 +/* f0c0340: 0fc59689 */ jal stageGetIndex /* f0c0344: 8e6404b4 */ lw $a0,0x4b4($s3) /* f0c0348: 14540005 */ bne $v0,$s4,.JF0f0c0360 /* f0c034c: 02002025 */ move $a0,$s0 -/* f0c0350: 0fc085f3 */ jal 0xf0217cc +/* f0c0350: 0fc085f3 */ jal chrAddHealth /* f0c0354: 3c054220 */ lui $a1,0x4220 /* f0c0358: 10000005 */ b .JF0f0c0370 /* f0c035c: 02002025 */ move $a0,$s0 .JF0f0c0360: /* f0c0360: 4405b000 */ mfc1 $a1,$f22 -/* f0c0364: 0fc085f3 */ jal 0xf0217cc +/* f0c0364: 0fc085f3 */ jal chrAddHealth /* f0c0368: 02002025 */ move $a0,$s0 /* f0c036c: 02002025 */ move $a0,$s0 .JF0f0c0370: -/* f0c0370: 0fc085ee */ jal 0xf0217b8 +/* f0c0370: 0fc085ee */ jal chrSetMaxDamage /* f0c0374: 3c054120 */ lui $a1,0x4120 /* f0c0378: 8e0e0018 */ lw $t6,0x18($s0) /* f0c037c: 920b02e1 */ lbu $t3,0x2e1($s0) @@ -5603,24 +5603,24 @@ glabel var7f1af390 /* f0c03ac: 02002025 */ move $a0,$s0 /* f0c03b0: 240500f9 */ li $a1,0xf9 /* f0c03b4: 24060009 */ li $a2,0x9 -/* f0c03b8: 0fc23215 */ jal 0xf08c854 +/* f0c03b8: 0fc23215 */ jal chrGiveWeapon /* f0c03bc: 00003825 */ move $a3,$zero /* f0c03c0: 02002025 */ move $a0,$s0 /* f0c03c4: 240500f8 */ li $a1,0xf8 /* f0c03c8: 24060008 */ li $a2,0x8 -/* f0c03cc: 0fc23215 */ jal 0xf08c854 +/* f0c03cc: 0fc23215 */ jal chrGiveWeapon /* f0c03d0: 3c071000 */ lui $a3,0x1000 .JF0f0c03d4: -/* f0c03d4: 0fc41bed */ jal 0xf106fb4 +/* f0c03d4: 0fc41bed */ jal cheatIsActive /* f0c03d8: 24040019 */ li $a0,0x19 /* f0c03dc: 5040005d */ beqzl $v0,.JF0f0c0554 /* f0c03e0: 8fad0058 */ lw $t5,0x58($sp) -/* f0c03e4: 0fc59689 */ jal 0xf165a24 +/* f0c03e4: 0fc59689 */ jal stageGetIndex /* f0c03e8: 8e6404b4 */ lw $a0,0x4b4($s3) /* f0c03ec: 24010023 */ li $at,0x23 /* f0c03f0: 14410012 */ bne $v0,$at,.JF0f0c043c /* f0c03f4: 00000000 */ nop -/* f0c03f8: 0c00611c */ jal 0x18470 +/* f0c03f8: 0c00611c */ jal ailistFindById /* f0c03fc: 24040012 */ li $a0,0x12 /* f0c0400: 8e700284 */ lw $s0,0x284($s3) /* f0c0404: 240e0010 */ li $t6,0x10 @@ -5633,12 +5633,12 @@ glabel var7f1af390 /* f0c0420: 24050008 */ li $a1,0x8 /* f0c0424: 24660008 */ addiu $a2,$v1,0x8 /* f0c0428: 24670028 */ addiu $a3,$v1,0x28 -/* f0c042c: 0fc130e6 */ jal 0xf04c398 +/* f0c042c: 0fc130e6 */ jal chrSpawnAtCoord /* f0c0430: e7b20010 */ swc1 $f18,0x10($sp) /* f0c0434: 10000011 */ b .JF0f0c047c /* f0c0438: 00408825 */ move $s1,$v0 .JF0f0c043c: -/* f0c043c: 0c00611c */ jal 0x18470 +/* f0c043c: 0c00611c */ jal ailistFindById /* f0c0440: 24040012 */ li $a0,0x12 /* f0c0444: 8e700284 */ lw $s0,0x284($s3) /* f0c0448: 240d0010 */ li $t5,0x10 @@ -5651,7 +5651,7 @@ glabel var7f1af390 /* f0c0464: 24050029 */ li $a1,0x29 /* f0c0468: 24660008 */ addiu $a2,$v1,0x8 /* f0c046c: 24670028 */ addiu $a3,$v1,0x28 -/* f0c0470: 0fc130e6 */ jal 0xf04c398 +/* f0c0470: 0fc130e6 */ jal chrSpawnAtCoord /* f0c0474: e7aa0010 */ swc1 $f10,0x10($sp) /* f0c0478: 00408825 */ move $s1,$v0 .JF0f0c047c: @@ -5676,21 +5676,21 @@ glabel var7f1af390 /* f0c04c4: a20e02e2 */ sb $t6,0x2e2($s0) /* f0c04c8: a2120002 */ sb $s2,0x2($s0) /* f0c04cc: a2120003 */ sb $s2,0x3($s0) -/* f0c04d0: 0fc59689 */ jal 0xf165a24 +/* f0c04d0: 0fc59689 */ jal stageGetIndex /* f0c04d4: 8e6404b4 */ lw $a0,0x4b4($s3) /* f0c04d8: 14540005 */ bne $v0,$s4,.JF0f0c04f0 /* f0c04dc: 02002025 */ move $a0,$s0 -/* f0c04e0: 0fc085f3 */ jal 0xf0217cc +/* f0c04e0: 0fc085f3 */ jal chrAddHealth /* f0c04e4: 3c054220 */ lui $a1,0x4220 /* f0c04e8: 10000005 */ b .JF0f0c0500 /* f0c04ec: 02002025 */ move $a0,$s0 .JF0f0c04f0: /* f0c04f0: 4405b000 */ mfc1 $a1,$f22 -/* f0c04f4: 0fc085f3 */ jal 0xf0217cc +/* f0c04f4: 0fc085f3 */ jal chrAddHealth /* f0c04f8: 02002025 */ move $a0,$s0 /* f0c04fc: 02002025 */ move $a0,$s0 .JF0f0c0500: -/* f0c0500: 0fc085ee */ jal 0xf0217b8 +/* f0c0500: 0fc085ee */ jal chrSetMaxDamage /* f0c0504: 3c054120 */ lui $a1,0x4120 /* f0c0508: 8e0d0018 */ lw $t5,0x18($s0) /* f0c050c: 920902e1 */ lbu $t1,0x2e1($s0) @@ -5708,7 +5708,7 @@ glabel var7f1af390 /* f0c053c: 02002025 */ move $a0,$s0 /* f0c0540: 24050104 */ li $a1,0x104 /* f0c0544: 2406000d */ li $a2,0xd -/* f0c0548: 0fc23215 */ jal 0xf08c854 +/* f0c0548: 0fc23215 */ jal chrGiveWeapon /* f0c054c: 00003825 */ move $a3,$zero .JF0f0c0550: /* f0c0550: 8fad0058 */ lw $t5,0x58($sp) @@ -5732,16 +5732,16 @@ glabel var7f1af390 /* f0c058c: 54610018 */ bnel $v1,$at,.JF0f0c05f0 /* f0c0590: 24010004 */ li $at,0x4 .JF0f0c0594: -/* f0c0594: 0fc2e96e */ jal 0xf0ba5b8 +/* f0c0594: 0fc2e96e */ jal player0f0b9538 /* f0c0598: 00000000 */ nop /* f0c059c: 24040001 */ li $a0,0x1 /* f0c05a0: 24050001 */ li $a1,0x1 /* f0c05a4: 8fa60330 */ lw $a2,0x330($sp) -/* f0c05a8: 0fc33346 */ jal 0xf0ccd18 +/* f0c05a8: 0fc33346 */ jal bmoveTick /* f0c05ac: 00003825 */ move $a3,$zero -/* f0c05b0: 0fc2f918 */ jal 0xf0be460 +/* f0c05b0: 0fc2f918 */ jal playerUpdateShake /* f0c05b4: 00000000 */ nop -/* f0c05b8: 0fc30a3a */ jal 0xf0c28e8 +/* f0c05b8: 0fc30a3a */ jal playerSetCameraMode /* f0c05bc: 00002025 */ move $a0,$zero /* f0c05c0: 8e700284 */ lw $s0,0x284($s3) /* f0c05c4: 8e0300bc */ lw $v1,0xbc($s0) @@ -5750,7 +5750,7 @@ glabel var7f1af390 /* f0c05d0: 246c0028 */ addiu $t4,$v1,0x28 /* f0c05d4: afac0010 */ sw $t4,0x10($sp) /* f0c05d8: 26060388 */ addiu $a2,$s0,0x388 -/* f0c05dc: 0fc30a3e */ jal 0xf0c28f8 +/* f0c05dc: 0fc30a3e */ jal player0f0c1840 /* f0c05e0: 24670008 */ addiu $a3,$v1,0x8 /* f0c05e4: 10000101 */ b .JF0f0c09ec /* f0c05e8: 8e700284 */ lw $s0,0x284($s3) @@ -5758,42 +5758,42 @@ glabel var7f1af390 .JF0f0c05f0: /* f0c05f0: 1461000c */ bne $v1,$at,.JF0f0c0624 /* f0c05f4: 00000000 */ nop -/* f0c05f8: 0fc2e708 */ jal 0xf0b9c20 +/* f0c05f8: 0fc2e708 */ jal playerTickChrBody /* f0c05fc: 00000000 */ nop /* f0c0600: 00002025 */ move $a0,$zero /* f0c0604: 00002825 */ move $a1,$zero /* f0c0608: 00003025 */ move $a2,$zero -/* f0c060c: 0fc33346 */ jal 0xf0ccd18 +/* f0c060c: 0fc33346 */ jal bmoveTick /* f0c0610: 24070001 */ li $a3,0x1 -/* f0c0614: 0fc2e9da */ jal 0xf0ba768 +/* f0c0614: 0fc2e9da */ jal playerTickMpSwirl /* f0c0618: 00000000 */ nop /* f0c061c: 100000f3 */ b .JF0f0c09ec /* f0c0620: 8e700284 */ lw $s0,0x284($s3) .JF0f0c0624: /* f0c0624: 1443000c */ bne $v0,$v1,.JF0f0c0658 /* f0c0628: 24010007 */ li $at,0x7 -/* f0c062c: 0fc2e708 */ jal 0xf0b9c20 +/* f0c062c: 0fc2e708 */ jal playerTickChrBody /* f0c0630: 00000000 */ nop /* f0c0634: 00002025 */ move $a0,$zero /* f0c0638: 00002825 */ move $a1,$zero /* f0c063c: 00003025 */ move $a2,$zero -/* f0c0640: 0fc33346 */ jal 0xf0ccd18 +/* f0c0640: 0fc33346 */ jal bmoveTick /* f0c0644: 24070001 */ li $a3,0x1 -/* f0c0648: 0fc2eb4f */ jal 0xf0bad3c +/* f0c0648: 0fc2eb4f */ jal playerExecutePreparedWarp /* f0c064c: 00000000 */ nop /* f0c0650: 100000e6 */ b .JF0f0c09ec /* f0c0654: 8e700284 */ lw $s0,0x284($s3) .JF0f0c0658: /* f0c0658: 546100e5 */ bnel $v1,$at,.JF0f0c09f0 /* f0c065c: c60a1b80 */ lwc1 $f10,0x1b80($s0) -/* f0c0660: 0fc2e96e */ jal 0xf0ba5b8 +/* f0c0660: 0fc2e96e */ jal player0f0b9538 /* f0c0664: 00000000 */ nop /* f0c0668: 8e790284 */ lw $t9,0x284($s3) /* f0c066c: 24050002 */ li $a1,0x2 /* f0c0670: 27a60078 */ addiu $a2,$sp,0x78 -/* f0c0674: 0fc45798 */ jal 0xf115e60 +/* f0c0674: 0fc45798 */ jal padUnpack /* f0c0678: 87241ba4 */ lh $a0,0x1ba4($t9) -/* f0c067c: 0c003a49 */ jal 0xe924 +/* f0c067c: 0c003a49 */ jal mainGetStageNum /* f0c0680: 00000000 */ nop /* f0c0684: 3c0e8008 */ lui $t6,0x8008 /* f0c0688: 85ce0610 */ lh $t6,0x610($t6) @@ -5819,7 +5819,7 @@ glabel var7f1af390 /* f0c06d0: 460a4301 */ sub.s $f12,$f8,$f10 /* f0c06d4: 46062381 */ sub.s $f14,$f4,$f6 /* f0c06d8: e7ac00d8 */ swc1 $f12,0xd8($sp) -/* f0c06dc: 0fc25d3c */ jal 0xf0974f0 +/* f0c06dc: 0fc25d3c */ jal atan2f /* f0c06e0: e7ae00d4 */ swc1 $f14,0xd4($sp) /* f0c06e4: 3c017f1b */ lui $at,0x7f1b /* f0c06e8: c436e3c4 */ lwc1 $f22,-0x1c3c($at) @@ -5839,7 +5839,7 @@ glabel var7f1af390 /* f0c071c: 8e700284 */ lw $s0,0x284($s3) .JF0f0c0720: /* f0c0720: c60c036c */ lwc1 $f12,0x36c($s0) -/* f0c0724: 0fc25d3c */ jal 0xf0974f0 +/* f0c0724: 0fc25d3c */ jal atan2f /* f0c0728: c60e0374 */ lwc1 $f14,0x374($s0) /* f0c072c: 4600b03c */ c.lt.s $f22,$f0 /* f0c0730: 44804000 */ mtc1 $zero,$f8 @@ -5944,7 +5944,7 @@ glabel var7f1af390 /* f0c089c: 46042182 */ mul.s $f6,$f4,$f4 /* f0c08a0: c7a000d4 */ lwc1 $f0,0xd4($sp) /* f0c08a4: 46000482 */ mul.s $f18,$f0,$f0 -/* f0c08a8: 0c012838 */ jal 0x4a0e0 +/* f0c08a8: 0c012838 */ jal sqrtf /* f0c08ac: 46123300 */ add.s $f12,$f6,$f18 /* f0c08b0: 8e700284 */ lw $s0,0x284($s3) /* f0c08b4: e7a000d8 */ swc1 $f0,0xd8($sp) @@ -5956,7 +5956,7 @@ glabel var7f1af390 /* f0c08cc: 00000000 */ nop /* f0c08d0: 45000004 */ bc1f .JF0f0c08e4 /* f0c08d4: 00000000 */ nop -/* f0c08d8: 0fc2e9af */ jal 0xf0ba6bc +/* f0c08d8: 0fc2e9af */ jal playerSetTickMode /* f0c08dc: 24040001 */ li $a0,0x1 /* f0c08e0: 8e700284 */ lw $s0,0x284($s3) .JF0f0c08e4: @@ -5974,7 +5974,7 @@ glabel var7f1af390 /* f0c090c: 00000000 */ nop /* f0c0910: 45020006 */ bc1fl .JF0f0c092c /* f0c0914: 860d1ba8 */ lh $t5,0x1ba8($s0) -/* f0c0918: 0fc2e9af */ jal 0xf0ba6bc +/* f0c0918: 0fc2e9af */ jal playerSetTickMode /* f0c091c: 24040001 */ li $a0,0x1 /* f0c0920: 8e700284 */ lw $s0,0x284($s3) /* f0c0924: 86021baa */ lh $v0,0x1baa($s0) @@ -6015,11 +6015,11 @@ glabel var7f1af390 /* f0c09a0: 46022182 */ mul.s $f6,$f4,$f2 /* f0c09a4: 4600348d */ trunc.w.s $f18,$f6 /* f0c09a8: 44189000 */ mfc1 $t8,$f18 -/* f0c09ac: 0fc33346 */ jal 0xf0ccd18 +/* f0c09ac: 0fc33346 */ jal bmoveTick /* f0c09b0: ae181bdc */ sw $t8,0x1bdc($s0) -/* f0c09b4: 0fc2f918 */ jal 0xf0be460 +/* f0c09b4: 0fc2f918 */ jal playerUpdateShake /* f0c09b8: 00000000 */ nop -/* f0c09bc: 0fc30a3a */ jal 0xf0c28e8 +/* f0c09bc: 0fc30a3a */ jal playerSetCameraMode /* f0c09c0: 00002025 */ move $a0,$zero /* f0c09c4: 8e700284 */ lw $s0,0x284($s3) /* f0c09c8: 8e0300bc */ lw $v1,0xbc($s0) @@ -6028,7 +6028,7 @@ glabel var7f1af390 /* f0c09d4: 246b0028 */ addiu $t3,$v1,0x28 /* f0c09d8: afab0010 */ sw $t3,0x10($sp) /* f0c09dc: 26060388 */ addiu $a2,$s0,0x388 -/* f0c09e0: 0fc30a3e */ jal 0xf0c28f8 +/* f0c09e0: 0fc30a3e */ jal player0f0c1840 /* f0c09e4: 24670008 */ addiu $a3,$v1,0x8 /* f0c09e8: 8e700284 */ lw $s0,0x284($s3) .JF0f0c09ec: @@ -6043,11 +6043,11 @@ glabel var7f1af390 /* f0c0a08: 11400047 */ beqz $t2,.JF0f0c0b28 /* f0c0a0c: 00000000 */ nop /* f0c0a10: 8e690288 */ lw $t1,0x288($s3) -/* f0c0a14: 0fc5475a */ jal 0xf151d68 +/* f0c0a14: 0fc5475a */ jal optionsGetContpadNum1 /* f0c0a18: 8d240070 */ lw $a0,0x70($t1) /* f0c0a1c: 00028600 */ sll $s0,$v0,0x18 /* f0c0a20: 00106603 */ sra $t4,$s0,0x18 -/* f0c0a24: 0fc5b3cc */ jal 0xf16cf30 +/* f0c0a24: 0fc5b3cc */ jal lvIsPaused /* f0c0a28: 01808025 */ move $s0,$t4 /* f0c0a2c: 1440002c */ bnez $v0,.JF0f0c0ae0 /* f0c0a30: 8fb90330 */ lw $t9,0x330($sp) @@ -6055,11 +6055,11 @@ glabel var7f1af390 /* f0c0a38: 00102600 */ sll $a0,$s0,0x18 /* f0c0a3c: 00047603 */ sra $t6,$a0,0x18 /* f0c0a40: 01c02025 */ move $a0,$t6 -/* f0c0a44: 0c0053ee */ jal 0x14fb8 +/* f0c0a44: 0c0053ee */ jal joyGetButtonsPressedThisFrame /* f0c0a48: 3405f030 */ li $a1,0xf030 /* f0c0a4c: 10400024 */ beqz $v0,.JF0f0c0ae0 /* f0c0a50: 240d0002 */ li $t5,0x2 -/* f0c0a54: 0fc2f11f */ jal 0xf0bc47c +/* f0c0a54: 0fc2f11f */ jal playerIsFadeComplete /* f0c0a58: ae2d0000 */ sw $t5,0x0($s1) /* f0c0a5c: 50400016 */ beqzl $v0,.JF0f0c0ab8 /* f0c0a60: 8e700284 */ lw $s0,0x284($s3) @@ -6073,13 +6073,13 @@ glabel var7f1af390 /* f0c0a80: 45020018 */ bc1fl .JF0f0c0ae4 /* f0c0a84: 8e380000 */ lw $t8,0x0($s1) /* f0c0a88: 44070000 */ mfc1 $a3,$f0 -/* f0c0a8c: 0fc2f0e8 */ jal 0xf0bc3a0 +/* f0c0a8c: 0fc2f0e8 */ jal playerSetFadeColour /* f0c0a90: 00003025 */ move $a2,$zero /* f0c0a94: 3c014270 */ lui $at,0x4270 /* f0c0a98: 44816000 */ mtc1 $at,$f12 /* f0c0a9c: 3c013f80 */ lui $at,0x3f80 /* f0c0aa0: 44817000 */ mtc1 $at,$f14 -/* f0c0aa4: 0fc2f112 */ jal 0xf0bc448 +/* f0c0aa4: 0fc2f112 */ jal playerSetFadeFrac /* f0c0aa8: 00000000 */ nop /* f0c0aac: 1000000d */ b .JF0f0c0ae4 /* f0c0ab0: 8e380000 */ lw $t8,0x0($s1) @@ -6093,7 +6093,7 @@ glabel var7f1af390 /* f0c0acc: 45020005 */ bc1fl .JF0f0c0ae4 /* f0c0ad0: 8e380000 */ lw $t8,0x0($s1) /* f0c0ad4: 44817000 */ mtc1 $at,$f14 -/* f0c0ad8: 0fc2f112 */ jal 0xf0bc448 +/* f0c0ad8: 0fc2f112 */ jal playerSetFadeFrac /* f0c0adc: c60c02e8 */ lwc1 $f12,0x2e8($s0) .JF0f0c0ae0: /* f0c0ae0: 8e380000 */ lw $t8,0x0($s1) @@ -6101,7 +6101,7 @@ glabel var7f1af390 /* f0c0ae4: 24010002 */ li $at,0x2 /* f0c0ae8: 1701000f */ bne $t8,$at,.JF0f0c0b28 /* f0c0aec: 00000000 */ nop -/* f0c0af0: 0fc2f11f */ jal 0xf0bc47c +/* f0c0af0: 0fc2f11f */ jal playerIsFadeComplete /* f0c0af4: 00000000 */ nop /* f0c0af8: 1040000b */ beqz $v0,.JF0f0c0b28 /* f0c0afc: 00000000 */ nop @@ -6113,14 +6113,14 @@ glabel var7f1af390 /* f0c0b14: 00000000 */ nop /* f0c0b18: 45000003 */ bc1f .JF0f0c0b28 /* f0c0b1c: 00000000 */ nop -/* f0c0b20: 0c003a4c */ jal 0xe930 +/* f0c0b20: 0c003a4c */ jal func0000e990 /* f0c0b24: 00000000 */ nop .JF0f0c0b28: /* f0c0b28: 3c0a8007 */ lui $t2,0x8007 /* f0c0b2c: 8d4a0c94 */ lw $t2,0xc94($t2) /* f0c0b30: 51400004 */ beqzl $t2,.JF0f0c0b44 /* f0c0b34: 8e700284 */ lw $s0,0x284($s3) -/* f0c0b38: 0fc2e9b4 */ jal 0xf0ba6d0 +/* f0c0b38: 0fc2e9b4 */ jal playerBeginGeFadeIn /* f0c0b3c: 00000000 */ nop /* f0c0b40: 8e700284 */ lw $s0,0x284($s3) .JF0f0c0b44: @@ -6130,7 +6130,7 @@ glabel var7f1af390 /* f0c0b50: 8e02032c */ lw $v0,0x32c($s0) /* f0c0b54: 14400005 */ bnez $v0,.JF0f0c0b6c /* f0c0b58: 00000000 */ nop -/* f0c0b5c: 0fc28e4c */ jal 0xf0a3930 +/* f0c0b5c: 0fc28e4c */ jal bgun0f0a29c8 /* f0c0b60: 00000000 */ nop /* f0c0b64: 8e700284 */ lw $s0,0x284($s3) /* f0c0b68: 8e02032c */ lw $v0,0x32c($s0) @@ -6143,7 +6143,7 @@ glabel var7f1af390 /* f0c0b80: 8e790314 */ lw $t9,0x314($s3) /* f0c0b84: 57200006 */ bnezl $t9,.JF0f0c0ba0 /* f0c0b88: 8e6e0298 */ lw $t6,0x298($s3) -/* f0c0b8c: 0c003989 */ jal 0xe624 +/* f0c0b8c: 0c003989 */ jal mainEndStage /* f0c0b90: 00000000 */ nop /* f0c0b94: 10000022 */ b .JF0f0c0c20 /* f0c0b98: 8e6c02ac */ lw $t4,0x2ac($s3) @@ -6164,12 +6164,12 @@ glabel var7f1af390 /* f0c0bd0: 8c4b0330 */ lw $t3,0x330($v0) /* f0c0bd4: 11600005 */ beqz $t3,.JF0f0c0bec /* f0c0bd8: 00000000 */ nop -/* f0c0bdc: 0c003989 */ jal 0xe624 +/* f0c0bdc: 0c003989 */ jal mainEndStage /* f0c0be0: 00000000 */ nop /* f0c0be4: 1000000e */ b .JF0f0c0c20 /* f0c0be8: 8e6c02ac */ lw $t4,0x2ac($s3) .JF0f0c0bec: -/* f0c0bec: 0fc129ba */ jal 0xf04a6e8 +/* f0c0bec: 0fc129ba */ jal chrsClearRefsToPlayer /* f0c0bf0: 8e64028c */ lw $a0,0x28c($s3) /* f0c0bf4: 1000000a */ b .JF0f0c0c20 /* f0c0bf8: 8e6c02ac */ lw $t4,0x2ac($s3) @@ -6180,18 +6180,18 @@ glabel var7f1af390 /* f0c0c08: 8e6902a0 */ lw $t1,0x2a0($s3) /* f0c0c0c: 55300004 */ bnel $t1,$s0,.JF0f0c0c20 /* f0c0c10: 8e6c02ac */ lw $t4,0x2ac($s3) -/* f0c0c14: 0c003989 */ jal 0xe624 +/* f0c0c14: 0c003989 */ jal mainEndStage /* f0c0c18: 00000000 */ nop /* f0c0c1c: 8e6c02ac */ lw $t4,0x2ac($s3) .JF0f0c0c20: /* f0c0c20: 24010005 */ li $at,0x5 /* f0c0c24: 55810008 */ bnel $t4,$at,.JF0f0c0c48 /* f0c0c28: 8fbf004c */ lw $ra,0x4c($sp) -/* f0c0c2c: 0fc2f11f */ jal 0xf0bc47c +/* f0c0c2c: 0fc2f11f */ jal playerIsFadeComplete /* f0c0c30: 00000000 */ nop /* f0c0c34: 50400004 */ beqzl $v0,.JF0f0c0c48 /* f0c0c38: 8fbf004c */ lw $ra,0x4c($sp) -/* f0c0c3c: 0c003989 */ jal 0xe624 +/* f0c0c3c: 0c003989 */ jal mainEndStage /* f0c0c40: 00000000 */ nop /* f0c0c44: 8fbf004c */ lw $ra,0x4c($sp) .JF0f0c0c48: diff --git a/src/game/propobj.c b/src/game/propobj.c index f58b2849c..acce7966a 100644 --- a/src/game/propobj.c +++ b/src/game/propobj.c @@ -2698,7 +2698,7 @@ glabel func0f068c04 /* f069de8: afa70128 */ sw $a3,0x128($sp) /* f069dec: 2405005e */ li $a1,0x5e /* f069df0: 27a600b0 */ addiu $a2,$sp,0xb0 -/* f069df4: 0fc45798 */ jal 0xf115e60 +/* f069df4: 0fc45798 */ jal padUnpack /* f069df8: afa30104 */ sw $v1,0x104($sp) /* f069dfc: 8fab012c */ lw $t3,0x12c($sp) /* f069e00: 3c010400 */ lui $at,0x400 @@ -2708,10 +2708,10 @@ glabel func0f068c04 /* f069e10: 01816824 */ and $t5,$t4,$at /* f069e14: 51a0000f */ beqzl $t5,.JF0f069e54 /* f069e18: 95cf0070 */ lhu $t7,0x70($t6) -/* f069e1c: 0fc002ed */ jal 0xf000bb4 +/* f069e1c: 0fc002ed */ jal func0f000b24 /* f069e20: 8fa400f8 */ lw $a0,0xf8($sp) /* f069e24: 02629821 */ addu $s3,$s3,$v0 -/* f069e28: 0fc00339 */ jal 0xf000ce4 +/* f069e28: 0fc00339 */ jal func0f000c54 /* f069e2c: 8fa400f8 */ lw $a0,0xf8($sp) /* f069e30: 0282a021 */ addu $s4,$s4,$v0 /* f069e34: 02741821 */ addu $v1,$s3,$s4 @@ -2796,10 +2796,10 @@ glabel func0f068c04 /* f069f60: 45020011 */ bc1fl .JF0f069fa8 /* f069f64: 8624002a */ lh $a0,0x2a($s1) .JF0f069f68: -/* f069f68: 0fc00339 */ jal 0xf000ce4 +/* f069f68: 0fc00339 */ jal func0f000c54 /* f069f6c: 00000000 */ nop /* f069f70: 00408025 */ move $s0,$v0 -/* f069f74: 0fc002ed */ jal 0xf000bb4 +/* f069f74: 0fc002ed */ jal func0f000b24 /* f069f78: 86240028 */ lh $a0,0x28($s1) /* f069f7c: 00501821 */ addu $v1,$v0,$s0 /* f069f80: 28610100 */ slti $at,$v1,0x100 @@ -2835,11 +2835,11 @@ glabel func0f068c04 /* f069fe4: 8fb00130 */ lw $s0,0x130($sp) /* f069fe8: 00002825 */ move $a1,$zero /* f069fec: 26100028 */ addiu $s0,$s0,0x28 -/* f069ff0: 0fc1a70d */ jal 0xf069c34 +/* f069ff0: 0fc1a70d */ jal func0f068b14 /* f069ff4: 02002025 */ move $a0,$s0 /* f069ff8: 00408825 */ move $s1,$v0 /* f069ffc: 02002025 */ move $a0,$s0 -/* f06a000: 0fc1a70d */ jal 0xf069c34 +/* f06a000: 0fc1a70d */ jal func0f068b14 /* f06a004: 24050001 */ li $a1,0x1 /* f06a008: 10000017 */ b .JF0f06a068 /* f06a00c: 00401825 */ move $v1,$v0 @@ -26599,7 +26599,7 @@ glabel var7f1ab110jf /* f074dd4: 24010058 */ li $at,0x58 /* f074dd8: 57010006 */ bnel $t8,$at,.JF0f074df4 /* f074ddc: 8e020000 */ lw $v0,0x0($s0) -/* f074de0: 0fc1d164 */ jal 0xf074590 +/* f074de0: 0fc1d164 */ jal func0f073478 /* f074de4: 00000000 */ nop /* f074de8: 10000c92 */ b .JF0f078034 /* f074dec: afa205d8 */ sw $v0,0x5d8($sp) @@ -26626,7 +26626,7 @@ glabel var7f1ab110jf /* f074e38: 31cf0080 */ andi $t7,$t6,0x80 /* f074e3c: 11e00005 */ beqz $t7,.JF0f074e54 /* f074e40: 27a605e8 */ addiu $a2,$sp,0x5e8 -/* f074e44: 0fc1d300 */ jal 0xf074c00 +/* f074e44: 0fc1d300 */ jal func0f073ae8 /* f074e48: 27a705f4 */ addiu $a3,$sp,0x5f4 /* f074e4c: 3c03800a */ lui $v1,0x800a /* f074e50: 2463a630 */ addiu $v1,$v1,-22992 @@ -26650,11 +26650,11 @@ glabel var7f1ab110jf /* f074e90: 30490800 */ andi $t1,$v0,0x800 /* f074e94: 11200379 */ beqz $t1,.JF0f075c7c /* f074e98: 304e0001 */ andi $t6,$v0,0x1 -/* f074e9c: 0c00573d */ jal 0x15cf4 +/* f074e9c: 0c00573d */ jal mtx3ToMtx4 /* f074ea0: afa40074 */ sw $a0,0x74($sp) /* f074ea4: 26440008 */ addiu $a0,$s2,0x8 /* f074ea8: afa40070 */ sw $a0,0x70($sp) -/* f074eac: 0c00575d */ jal 0x15d74 +/* f074eac: 0c00575d */ jal mtx4SetTranslation /* f074eb0: 27a50504 */ addiu $a1,$sp,0x504 /* f074eb4: 4480a000 */ mtc1 $zero,$f20 /* f074eb8: c60000dc */ lwc1 $f0,0xdc($s0) @@ -26779,7 +26779,7 @@ glabel var7f1ab110jf /* f07506c: 46021282 */ mul.s $f10,$f2,$f2 /* f075070: 00000000 */ nop /* f075074: 460e7102 */ mul.s $f4,$f14,$f14 -/* f075078: 0c012838 */ jal 0x4a0e0 +/* f075078: 0c012838 */ jal sqrtf /* f07507c: 46045300 */ add.s $f12,$f10,$f4 /* f075080: 4600a03c */ c.lt.s $f20,$f0 /* f075084: 3c03800a */ lui $v1,0x800a @@ -26879,7 +26879,7 @@ glabel var7f1ab110jf .JF0f0751d4: /* f0751d4: 50800004 */ beqzl $a0,.JF0f0751e8 /* f0751d8: 86240006 */ lh $a0,0x6($s1) -/* f0751dc: 0fc194a6 */ jal 0xf065298 +/* f0751dc: 0fc194a6 */ jal propSetPerimEnabled /* f0751e0: 00002825 */ move $a1,$zero /* f0751e4: 86240006 */ lh $a0,0x6($s1) .JF0f0751e8: @@ -26897,7 +26897,7 @@ glabel var7f1ab110jf /* f075210: 8fb90088 */ lw $t9,0x88($sp) /* f075214: 1320003b */ beqz $t9,.JF0f075304 /* f075218: 24050002 */ li $a1,0x2 -/* f07521c: 0fc45798 */ jal 0xf115e60 +/* f07521c: 0fc45798 */ jal padUnpack /* f075220: 27a60430 */ addiu $a2,$sp,0x430 /* f075224: 3c014348 */ lui $at,0x4348 /* f075228: 44811000 */ mtc1 $at,$f2 @@ -26935,7 +26935,7 @@ glabel var7f1ab110jf /* f0752a0: 46000282 */ mul.s $f10,$f0,$f0 /* f0752a4: 00000000 */ nop /* f0752a8: 46021102 */ mul.s $f4,$f2,$f2 -/* f0752ac: 0c012838 */ jal 0x4a0e0 +/* f0752ac: 0c012838 */ jal sqrtf /* f0752b0: 46045300 */ add.s $f12,$f10,$f4 /* f0752b4: c7a60418 */ lwc1 $f6,0x418($sp) /* f0752b8: c7a8041c */ lwc1 $f8,0x41c($sp) @@ -26978,7 +26978,7 @@ glabel var7f1ab110jf /* f075344: acae0004 */ sw $t6,0x4($a1) /* f075348: 8d810008 */ lw $at,0x8($t4) /* f07534c: aca10008 */ sw $at,0x8($a1) -/* f075350: 0fc1cc97 */ jal 0xf07325c +/* f075350: 0fc1cc97 */ jal func0f072144 /* f075354: e7a005a8 */ swc1 $f0,0x5a8($sp) /* f075358: 2401ffff */ li $at,-1 /* f07535c: 1041000c */ beq $v0,$at,.JF0f075390 @@ -26992,7 +26992,7 @@ glabel var7f1ab110jf /* f07537c: 02202025 */ move $a0,$s1 /* f075380: 46062282 */ mul.s $f10,$f4,$f6 /* f075384: 27a50404 */ addiu $a1,$sp,0x404 -/* f075388: 0fc1ce3b */ jal 0xf0738ec +/* f075388: 0fc1ce3b */ jal func0f0727d4 /* f07538c: e60a00dc */ swc1 $f10,0xdc($s0) .JF0f075390: /* f075390: 3c01800a */ lui $at,0x800a @@ -27018,7 +27018,7 @@ glabel var7f1ab110jf /* f0753e0: 46000202 */ mul.s $f8,$f0,$f0 /* f0753e4: 460a3081 */ sub.s $f2,$f6,$f10 /* f0753e8: 46021102 */ mul.s $f4,$f2,$f2 -/* f0753ec: 0c012838 */ jal 0x4a0e0 +/* f0753ec: 0c012838 */ jal sqrtf /* f0753f0: 46044300 */ add.s $f12,$f8,$f4 /* f0753f4: c7ac0418 */ lwc1 $f12,0x418($sp) /* f0753f8: c7a6041c */ lwc1 $f6,0x41c($sp) @@ -27060,13 +27060,13 @@ glabel var7f1ab110jf .JF0f075480: /* f075480: 02202025 */ move $a0,$s1 /* f075484: 27a5059c */ addiu $a1,$sp,0x59c -/* f075488: 0fc1cc97 */ jal 0xf07325c +/* f075488: 0fc1cc97 */ jal func0f072144 /* f07548c: 24070001 */ li $a3,0x1 /* f075490: 144001ae */ bnez $v0,.JF0f075b4c /* f075494: afa20600 */ sw $v0,0x600($sp) /* f075498: 4406a000 */ mfc1 $a2,$f20 /* f07549c: 02202025 */ move $a0,$s1 -/* f0754a0: 0fc1ce3b */ jal 0xf0738ec +/* f0754a0: 0fc1ce3b */ jal func0f0727d4 /* f0754a4: 27a5059c */ addiu $a1,$sp,0x59c /* f0754a8: c604008c */ lwc1 $f4,0x8c($s0) /* f0754ac: 27a403d0 */ addiu $a0,$sp,0x3d0 @@ -27076,7 +27076,7 @@ glabel var7f1ab110jf /* f0754bc: 00000000 */ nop /* f0754c0: 450201a3 */ bc1fl .JF0f075b50 /* f0754c4: 8fab0600 */ lw $t3,0x600($sp) -/* f0754c8: 0c00939d */ jal 0x24e74 +/* f0754c8: 0c00939d */ jal cd00025364 /* f0754cc: e7b0058c */ swc1 $f16,0x58c($sp) /* f0754d0: 1040000e */ beqz $v0,.JF0f07550c /* f0754d4: c7b0058c */ lwc1 $f16,0x58c($sp) @@ -27099,7 +27099,7 @@ glabel var7f1ab110jf /* f075514: 27a403d0 */ addiu $a0,$sp,0x3d0 /* f075518: 27a503c4 */ addiu $a1,$sp,0x3c4 /* f07551c: 240620a8 */ li $a2,0x20a8 -/* f075520: 0c009257 */ jal 0x2495c +/* f075520: 0c009257 */ jal cd00024e4c /* f075524: e7b0058c */ swc1 $f16,0x58c($sp) /* f075528: c7aa03d0 */ lwc1 $f10,0x3d0($sp) /* f07552c: c7a803c4 */ lwc1 $f8,0x3c4($sp) @@ -27129,7 +27129,7 @@ glabel var7f1ab110jf /* f075588: 27a403d0 */ addiu $a0,$sp,0x3d0 /* f07558c: 27a503c4 */ addiu $a1,$sp,0x3c4 /* f075590: 27a603b8 */ addiu $a2,$sp,0x3b8 -/* f075594: 0fc0bdbe */ jal 0xf02f6f8 +/* f075594: 0fc0bdbe */ jal func0f02e4f8 /* f075598: e7b0058c */ swc1 $f16,0x58c($sp) /* f07559c: c6460008 */ lwc1 $f6,0x8($s2) /* f0755a0: c7aa05dc */ lwc1 $f10,0x5dc($sp) @@ -27182,7 +27182,7 @@ glabel var7f1ab110jf /* f075650: 27a503dc */ addiu $a1,$sp,0x3dc /* f075654: 240620ce */ li $a2,0x20ce /* f075658: e60600dc */ swc1 $f6,0xdc($s0) -/* f07565c: 0c009257 */ jal 0x2495c +/* f07565c: 0c009257 */ jal cd00024e4c /* f075660: e7b0058c */ swc1 $f16,0x58c($sp) /* f075664: c7aa03e4 */ lwc1 $f10,0x3e4($sp) /* f075668: c7a803f0 */ lwc1 $f8,0x3f0($sp) @@ -27205,7 +27205,7 @@ glabel var7f1ab110jf /* f0756ac: 45030006 */ bc1tl .JF0f0756c8 /* f0756b0: 44815000 */ mtc1 $at,$f10 .JF0f0756b4: -/* f0756b4: 0c0011e4 */ jal 0x4790 +/* f0756b4: 0c0011e4 */ jal guNormalize /* f0756b8: e7b0058c */ swc1 $f16,0x58c($sp) /* f0756bc: 10000004 */ b .JF0f0756d0 /* f0756c0: c7b0058c */ lwc1 $f16,0x58c($sp) @@ -27254,7 +27254,7 @@ glabel var7f1ab110jf /* f075764: 46000202 */ mul.s $f8,$f0,$f0 /* f075768: 46045081 */ sub.s $f2,$f10,$f4 /* f07576c: 46021182 */ mul.s $f6,$f2,$f2 -/* f075770: 0c012838 */ jal 0x4a0e0 +/* f075770: 0c012838 */ jal sqrtf /* f075774: 46064300 */ add.s $f12,$f8,$f6 /* f075778: c7aa0418 */ lwc1 $f10,0x418($sp) /* f07577c: c7a4041c */ lwc1 $f4,0x41c($sp) @@ -27297,13 +27297,13 @@ glabel var7f1ab110jf .JF0f075808: /* f075808: 02202025 */ move $a0,$s1 /* f07580c: 27a5059c */ addiu $a1,$sp,0x59c -/* f075810: 0fc1cc97 */ jal 0xf07325c +/* f075810: 0fc1cc97 */ jal func0f072144 /* f075814: 24070001 */ li $a3,0x1 /* f075818: 144000c2 */ bnez $v0,.JF0f075b24 /* f07581c: afa20600 */ sw $v0,0x600($sp) /* f075820: 4406a000 */ mfc1 $a2,$f20 /* f075824: 02202025 */ move $a0,$s1 -/* f075828: 0fc1ce3b */ jal 0xf0738ec +/* f075828: 0fc1ce3b */ jal func0f0727d4 /* f07582c: 27a5059c */ addiu $a1,$sp,0x59c /* f075830: c604008c */ lwc1 $f4,0x8c($s0) /* f075834: c6080004 */ lwc1 $f8,0x4($s0) @@ -27336,7 +27336,7 @@ glabel var7f1ab110jf /* f0758a0: 46000182 */ mul.s $f6,$f0,$f0 /* f0758a4: 46082081 */ sub.s $f2,$f4,$f8 /* f0758a8: 46021282 */ mul.s $f10,$f2,$f2 -/* f0758ac: 0c012838 */ jal 0x4a0e0 +/* f0758ac: 0c012838 */ jal sqrtf /* f0758b0: 460a3300 */ add.s $f12,$f6,$f10 /* f0758b4: c7a40418 */ lwc1 $f4,0x418($sp) /* f0758b8: c7a8041c */ lwc1 $f8,0x41c($sp) @@ -27379,13 +27379,13 @@ glabel var7f1ab110jf .JF0f075944: /* f075944: 02202025 */ move $a0,$s1 /* f075948: 27a5059c */ addiu $a1,$sp,0x59c -/* f07594c: 0fc1cc97 */ jal 0xf07325c +/* f07594c: 0fc1cc97 */ jal func0f072144 /* f075950: 24070001 */ li $a3,0x1 /* f075954: 14400073 */ bnez $v0,.JF0f075b24 /* f075958: afa20600 */ sw $v0,0x600($sp) /* f07595c: 4406a000 */ mfc1 $a2,$f20 /* f075960: 02202025 */ move $a0,$s1 -/* f075964: 0fc1ce3b */ jal 0xf0738ec +/* f075964: 0fc1ce3b */ jal func0f0727d4 /* f075968: 27a5059c */ addiu $a1,$sp,0x59c /* f07596c: c7ae03e8 */ lwc1 $f14,0x3e8($sp) /* f075970: c7b203dc */ lwc1 $f18,0x3dc($sp) @@ -27407,7 +27407,7 @@ glabel var7f1ab110jf /* f0759ac: e7a203a0 */ swc1 $f2,0x3a0($sp) /* f0759b0: 46000182 */ mul.s $f6,$f0,$f0 /* f0759b4: e7a00398 */ swc1 $f0,0x398($sp) -/* f0759b8: 0c012838 */ jal 0x4a0e0 +/* f0759b8: 0c012838 */ jal sqrtf /* f0759bc: 46064300 */ add.s $f12,$f8,$f6 /* f0759c0: 3c013f80 */ lui $at,0x3f80 /* f0759c4: 44815000 */ mtc1 $at,$f10 @@ -27450,7 +27450,7 @@ glabel var7f1ab110jf /* f075a58: 46000102 */ mul.s $f4,$f0,$f0 /* f075a5c: 460a4081 */ sub.s $f2,$f8,$f10 /* f075a60: 46021182 */ mul.s $f6,$f2,$f2 -/* f075a64: 0c012838 */ jal 0x4a0e0 +/* f075a64: 0c012838 */ jal sqrtf /* f075a68: 46062300 */ add.s $f12,$f4,$f6 /* f075a6c: c7a80418 */ lwc1 $f8,0x418($sp) /* f075a70: c7aa041c */ lwc1 $f10,0x41c($sp) @@ -27493,13 +27493,13 @@ glabel var7f1ab110jf .JF0f075afc: /* f075afc: 02202025 */ move $a0,$s1 /* f075b00: 27a5059c */ addiu $a1,$sp,0x59c -/* f075b04: 0fc1cc97 */ jal 0xf07325c +/* f075b04: 0fc1cc97 */ jal func0f072144 /* f075b08: 24070001 */ li $a3,0x1 /* f075b0c: 14400005 */ bnez $v0,.JF0f075b24 /* f075b10: afa20600 */ sw $v0,0x600($sp) /* f075b14: 4406a000 */ mfc1 $a2,$f20 /* f075b18: 02202025 */ move $a0,$s1 -/* f075b1c: 0fc1ce3b */ jal 0xf0738ec +/* f075b1c: 0fc1ce3b */ jal func0f0727d4 /* f075b20: 27a5059c */ addiu $a1,$sp,0x59c .JF0f075b24: /* f075b24: 8faa0600 */ lw $t2,0x600($sp) @@ -27526,7 +27526,7 @@ glabel var7f1ab110jf .JF0f075b6c: /* f075b6c: 50800004 */ beqzl $a0,.JF0f075b80 /* f075b70: c6080004 */ lwc1 $f8,0x4($s0) -/* f075b74: 0fc194a6 */ jal 0xf065298 +/* f075b74: 0fc194a6 */ jal propSetPerimEnabled /* f075b78: 24050001 */ li $a1,0x1 /* f075b7c: c6080004 */ lwc1 $f8,0x4($s0) .JF0f075b80: @@ -27544,7 +27544,7 @@ glabel var7f1ab110jf /* f075bac: 00000000 */ nop /* f075bb0: 45020004 */ bc1fl .JF0f075bc4 /* f075bb4: 8fad0600 */ lw $t5,0x600($sp) -/* f075bb8: 0fc1af56 */ jal 0xf06bd58 +/* f075bb8: 0fc1af56 */ jal objEndFlight /* f075bbc: 02202025 */ move $a0,$s1 /* f075bc0: 8fad0600 */ lw $t5,0x600($sp) .JF0f075bc4: @@ -27554,7 +27554,7 @@ glabel var7f1ab110jf /* f075bd0: 3c054000 */ lui $a1,0x4000 /* f075bd4: 26460028 */ addiu $a2,$s2,0x28 /* f075bd8: 26270058 */ addiu $a3,$s1,0x58 -/* f075bdc: 0c00a790 */ jal 0x29e40 +/* f075bdc: 0c00a790 */ jal cdFindGroundYSimple /* f075be0: afa00010 */ sw $zero,0x10($sp) /* f075be4: 3c017f1b */ lui $at,0x7f1b /* f075be8: c426b128 */ lwc1 $f6,-0x4ed8($at) @@ -27564,7 +27564,7 @@ glabel var7f1ab110jf /* f075bf8: 00000000 */ nop /* f075bfc: 45020007 */ bc1fl .JF0f075c1c /* f075c00: 02202025 */ move $a0,$s1 -/* f075c04: 0fc1c91e */ jal 0xf072478 +/* f075c04: 0fc1c91e */ jal objGetHov04 /* f075c08: e7a20584 */ swc1 $f2,0x584($sp) /* f075c0c: c7a20584 */ lwc1 $f2,0x584($sp) /* f075c10: 46020200 */ add.s $f8,$f0,$f2 @@ -27573,25 +27573,25 @@ glabel var7f1ab110jf /* f075c18: 02202025 */ move $a0,$s1 .JF0f075c1c: /* f075c1c: 00002825 */ move $a1,$zero -/* f075c20: 0fc1ab62 */ jal 0xf06ad88 +/* f075c20: 0fc1ab62 */ jal func0f069c70 /* f075c24: 24060001 */ li $a2,0x1 /* f075c28: 27b00484 */ addiu $s0,$sp,0x484 /* f075c2c: 02002825 */ move $a1,$s0 -/* f075c30: 0c00573d */ jal 0x15cf4 +/* f075c30: 0c00573d */ jal mtx3ToMtx4 /* f075c34: 8fa40074 */ lw $a0,0x74($sp) /* f075c38: 8fa40070 */ lw $a0,0x70($sp) -/* f075c3c: 0c00575d */ jal 0x15d74 +/* f075c3c: 0c00575d */ jal mtx4SetTranslation /* f075c40: 02002825 */ move $a1,$s0 /* f075c44: 27b104c4 */ addiu $s1,$sp,0x4c4 /* f075c48: 02202825 */ move $a1,$s1 -/* f075c4c: 0c005ca4 */ jal 0x17290 +/* f075c4c: 0c005ca4 */ jal mtx000172f0 /* f075c50: 27a40504 */ addiu $a0,$sp,0x504 /* f075c54: 02002025 */ move $a0,$s0 /* f075c58: 02202825 */ move $a1,$s1 -/* f075c5c: 0c005668 */ jal 0x159a0 +/* f075c5c: 0c005668 */ jal mtx4MultMtx4 /* f075c60: 27a60544 */ addiu $a2,$sp,0x544 /* f075c64: 02402025 */ move $a0,$s2 -/* f075c68: 0fc1d0fb */ jal 0xf0743ec +/* f075c68: 0fc1d0fb */ jal func0f0732d4 /* f075c6c: 27a50544 */ addiu $a1,$sp,0x544 /* f075c70: 240c0001 */ li $t4,0x1 /* f075c74: 100008ef */ b .JF0f078034 @@ -27656,7 +27656,7 @@ glabel var7f1ab110jf /* f075d4c: 27a50358 */ addiu $a1,$sp,0x358 /* f075d50: 018e7821 */ addu $t7,$t4,$t6 /* f075d54: ae0f00a0 */ sw $t7,0xa0($s0) -/* f075d58: 0c00571e */ jal 0x15c78 +/* f075d58: 0c00571e */ jal mtx3Copy /* f075d5c: afa40074 */ sw $a0,0x74($sp) /* f075d60: 8e180000 */ lw $t8,0x0($s0) /* f075d64: 3c017f1b */ lui $at,0x7f1b @@ -27794,10 +27794,10 @@ glabel var7f1ab110jf /* f075f60: 460e7282 */ mul.s $f10,$f14,$f14 /* f075f64: 460a2180 */ add.s $f6,$f4,$f10 /* f075f68: 46000202 */ mul.s $f8,$f0,$f0 -/* f075f6c: 0c012838 */ jal 0x4a0e0 +/* f075f6c: 0c012838 */ jal sqrtf /* f075f70: 46064300 */ add.s $f12,$f8,$f6 /* f075f74: 27a402a0 */ addiu $a0,$sp,0x2a0 -/* f075f78: 0c005654 */ jal 0x15950 +/* f075f78: 0c005654 */ jal mtx4LoadIdentity /* f075f7c: e7a0029c */ swc1 $f0,0x29c($sp) /* f075f80: c7ae029c */ lwc1 $f14,0x29c($sp) /* f075f84: c624001c */ lwc1 $f4,0x1c($s1) @@ -27854,7 +27854,7 @@ glabel var7f1ab110jf /* f076050: c7260010 */ lwc1 $f6,0x10($t9) /* f076054: e7ae029c */ swc1 $f14,0x29c($sp) /* f076058: 46043281 */ sub.s $f10,$f6,$f4 -/* f07605c: 0c0011e4 */ jal 0x4790 +/* f07605c: 0c0011e4 */ jal guNormalize /* f076060: e7aa0298 */ swc1 $f10,0x298($sp) /* f076064: c6080004 */ lwc1 $f8,0x4($s0) /* f076068: 27a402ec */ addiu $a0,$sp,0x2ec @@ -27864,7 +27864,7 @@ glabel var7f1ab110jf /* f076078: 27a602f4 */ addiu $a2,$sp,0x2f4 /* f07607c: e7a602f0 */ swc1 $f6,0x2f0($sp) /* f076080: c604000c */ lwc1 $f4,0xc($s0) -/* f076084: 0c0011e4 */ jal 0x4790 +/* f076084: 0c0011e4 */ jal guNormalize /* f076088: e7a402f4 */ swc1 $f4,0x2f4($sp) /* f07608c: c7aa0298 */ lwc1 $f10,0x298($sp) /* f076090: c7a802f4 */ lwc1 $f8,0x2f4($sp) @@ -27877,7 +27877,7 @@ glabel var7f1ab110jf /* f0760ac: 00000000 */ nop /* f0760b0: 46124102 */ mul.s $f4,$f8,$f18 /* f0760b4: 46045200 */ add.s $f8,$f10,$f4 -/* f0760b8: 0fc25ddc */ jal 0xf097770 +/* f0760b8: 0fc25ddc */ jal acosf /* f0760bc: 46083300 */ add.s $f12,$f6,$f8 /* f0760c0: 3c017f1b */ lui $at,0x7f1b /* f0760c4: c42ab140 */ lwc1 $f10,-0x4ec0($at) @@ -27895,17 +27895,17 @@ glabel var7f1ab110jf /* f0760f4: 4500009c */ bc1f .JF0f076368 .JF0f0760f8: /* f0760f8: 24a59b14 */ addiu $a1,$a1,-25836 -/* f0760fc: 0c0036b4 */ jal 0xdad0 +/* f0760fc: 0c0036b4 */ jal mainOverrideVariable /* f076100: e7ae029c */ swc1 $f14,0x29c($sp) /* f076104: 3c047f1b */ lui $a0,0x7f1b /* f076108: 3c058007 */ lui $a1,0x8007 /* f07610c: 24a59b18 */ addiu $a1,$a1,-25832 -/* f076110: 0c0036b4 */ jal 0xdad0 +/* f076110: 0c0036b4 */ jal mainOverrideVariable /* f076114: 2484ad04 */ addiu $a0,$a0,-21244 /* f076118: 3c047f1b */ lui $a0,0x7f1b /* f07611c: 3c058007 */ lui $a1,0x8007 /* f076120: 24a59b1c */ addiu $a1,$a1,-25828 -/* f076124: 0c0036b4 */ jal 0xdad0 +/* f076124: 0c0036b4 */ jal mainOverrideVariable /* f076128: 2484ad08 */ addiu $a0,$a0,-21240 /* f07612c: 3c188007 */ lui $t8,0x8007 /* f076130: 8f189b18 */ lw $t8,-0x64e8($t8) @@ -27988,42 +27988,42 @@ glabel var7f1ab110jf /* f076258: 46040302 */ mul.s $f12,$f0,$f4 /* f07625c: 460a4181 */ sub.s $f6,$f8,$f10 /* f076260: e7ac0078 */ swc1 $f12,0x78($sp) -/* f076264: 0c0068dc */ jal 0x1a370 +/* f076264: 0c0068dc */ jal cosf /* f076268: e7a60288 */ swc1 $f6,0x288($sp) /* f07626c: e7a00260 */ swc1 $f0,0x260($sp) -/* f076270: 0c0068df */ jal 0x1a37c +/* f076270: 0c0068df */ jal sinf /* f076274: c7ac0078 */ lwc1 $f12,0x78($sp) /* f076278: c7a80280 */ lwc1 $f8,0x280($sp) /* f07627c: c7ac0078 */ lwc1 $f12,0x78($sp) /* f076280: 46080282 */ mul.s $f10,$f0,$f8 -/* f076284: 0c0068df */ jal 0x1a37c +/* f076284: 0c0068df */ jal sinf /* f076288: e7aa0264 */ swc1 $f10,0x264($sp) /* f07628c: c7a60284 */ lwc1 $f6,0x284($sp) /* f076290: c7ac0078 */ lwc1 $f12,0x78($sp) /* f076294: 46060102 */ mul.s $f4,$f0,$f6 -/* f076298: 0c0068df */ jal 0x1a37c +/* f076298: 0c0068df */ jal sinf /* f07629c: e7a40268 */ swc1 $f4,0x268($sp) /* f0762a0: c7a80288 */ lwc1 $f8,0x288($sp) /* f0762a4: 27a40260 */ addiu $a0,$sp,0x260 /* f0762a8: 27a5020c */ addiu $a1,$sp,0x20c /* f0762ac: 46080282 */ mul.s $f10,$f0,$f8 -/* f0762b0: 0fc25f1d */ jal 0xf097c74 +/* f0762b0: 0fc25f1d */ jal quaternionToMtx /* f0762b4: e7aa026c */ swc1 $f10,0x26c($sp) /* f0762b8: e6140018 */ swc1 $f20,0x18($s0) /* f0762bc: e6140014 */ swc1 $f20,0x14($s0) /* f0762c0: e6140010 */ swc1 $f20,0x10($s0) /* f0762c4: 27a4020c */ addiu $a0,$sp,0x20c -/* f0762c8: 0c0056ac */ jal 0x15ab0 +/* f0762c8: 0c0056ac */ jal mtx4RotateVecInPlace /* f0762cc: 26050004 */ addiu $a1,$s0,0x4 /* f0762d0: 27a402a0 */ addiu $a0,$sp,0x2a0 -/* f0762d4: 0fc25f79 */ jal 0xf097de4 +/* f0762d4: 0fc25f79 */ jal quaternion0f097044 /* f0762d8: 27a50270 */ addiu $a1,$sp,0x270 /* f0762dc: 27a40270 */ addiu $a0,$sp,0x270 /* f0762e0: 27a50260 */ addiu $a1,$sp,0x260 -/* f0762e4: 0fc26136 */ jal 0xf0984d8 +/* f0762e4: 0fc26136 */ jal quaternionMultQuaternion /* f0762e8: 27a60250 */ addiu $a2,$sp,0x250 /* f0762ec: 27a40250 */ addiu $a0,$sp,0x250 -/* f0762f0: 0fc25f1d */ jal 0xf097c74 +/* f0762f0: 0fc25f1d */ jal quaternionToMtx /* f0762f4: 27a5020c */ addiu $a1,$sp,0x20c /* f0762f8: c7ae029c */ lwc1 $f14,0x29c($sp) /* f0762fc: c7a6020c */ lwc1 $f6,0x20c($sp) @@ -28132,16 +28132,16 @@ glabel var7f1ab110jf /* f076480: c608000c */ lwc1 $f8,0xc($s0) /* f076484: 46024182 */ mul.s $f6,$f8,$f2 /* f076488: 46065100 */ add.s $f4,$f10,$f6 -/* f07648c: 0c00573d */ jal 0x15cf4 +/* f07648c: 0c00573d */ jal mtx3ToMtx4 /* f076490: e7a405e4 */ swc1 $f4,0x5e4($sp) /* f076494: 26050020 */ addiu $a1,$s0,0x20 /* f076498: 3c06800a */ lui $a2,0x800a /* f07649c: 8cc6a664 */ lw $a2,-0x599c($a2) /* f0764a0: afa50064 */ sw $a1,0x64($sp) -/* f0764a4: 0fc25d0e */ jal 0xf097438 +/* f0764a4: 0fc25d0e */ jal func0f096698 /* f0764a8: 27a4030c */ addiu $a0,$sp,0x30c /* f0764ac: 27a4030c */ addiu $a0,$sp,0x30c -/* f0764b0: 0c005750 */ jal 0x15d40 +/* f0764b0: 0c005750 */ jal mtx4ToMtx3 /* f0764b4: 8fa50074 */ lw $a1,0x74($sp) /* f0764b8: c6480008 */ lwc1 $f8,0x8($s2) /* f0764bc: 26440028 */ addiu $a0,$s2,0x28 @@ -28151,12 +28151,12 @@ glabel var7f1ab110jf /* f0764cc: e7aa05cc */ swc1 $f10,0x5cc($sp) /* f0764d0: c6460010 */ lwc1 $f6,0x10($s2) /* f0764d4: afa4006c */ sw $a0,0x6c($sp) -/* f0764d8: 0fc19a31 */ jal 0xf0668c4 +/* f0764d8: 0fc19a31 */ jal roomsCopy /* f0764dc: e7a605d0 */ swc1 $f6,0x5d0($sp) /* f0764e0: 8e040088 */ lw $a0,0x88($s0) /* f0764e4: 50800004 */ beqzl $a0,.JF0f0764f8 /* f0764e8: 8e0c0000 */ lw $t4,0x0($s0) -/* f0764ec: 0fc194a6 */ jal 0xf065298 +/* f0764ec: 0fc194a6 */ jal propSetPerimEnabled /* f0764f0: 00002825 */ move $a1,$zero /* f0764f4: 8e0c0000 */ lw $t4,0x0($s0) .JF0f0764f8: @@ -28165,7 +28165,7 @@ glabel var7f1ab110jf /* f076500: 02202025 */ move $a0,$s1 /* f076504: 27a505dc */ addiu $a1,$sp,0x5dc /* f076508: 27a605e8 */ addiu $a2,$sp,0x5e8 -/* f07650c: 0fc1b786 */ jal 0xf06de18 +/* f07650c: 0fc1b786 */ jal func0f06cd00 /* f076510: 27a705f4 */ addiu $a3,$sp,0x5f4 /* f076514: 10000007 */ b .JF0f076534 /* f076518: afa20600 */ sw $v0,0x600($sp) @@ -28173,14 +28173,14 @@ glabel var7f1ab110jf /* f07651c: 02202025 */ move $a0,$s1 /* f076520: 27a505dc */ addiu $a1,$sp,0x5dc /* f076524: 27a605e8 */ addiu $a2,$sp,0x5e8 -/* f076528: 0fc1b925 */ jal 0xf06e494 +/* f076528: 0fc1b925 */ jal func0f06d37c /* f07652c: 27a705f4 */ addiu $a3,$sp,0x5f4 /* f076530: afa20600 */ sw $v0,0x600($sp) .JF0f076534: /* f076534: 8e040088 */ lw $a0,0x88($s0) /* f076538: 50800004 */ beqzl $a0,.JF0f07654c /* f07653c: 240e0001 */ li $t6,0x1 -/* f076540: 0fc194a6 */ jal 0xf065298 +/* f076540: 0fc194a6 */ jal propSetPerimEnabled /* f076544: 24050001 */ li $a1,0x1 /* f076548: 240e0001 */ li $t6,0x1 .JF0f07654c: @@ -28242,7 +28242,7 @@ glabel var7f1ab110jf /* f076618: 24010035 */ li $at,0x35 /* f07661c: 10e10006 */ beq $a3,$at,.JF0f076638 /* f076620: 2624005c */ addiu $a0,$s1,0x5c -/* f076624: 0fc2cbcb */ jal 0xf0b2f2c +/* f076624: 0fc2cbcb */ jal gsetHasFunctionFlags /* f076628: 24050100 */ li $a1,0x100 /* f07662c: 50400014 */ beqzl $v0,.JF0f076680 /* f076630: 8fb801f8 */ lw $t8,0x1f8($sp) @@ -28357,7 +28357,7 @@ glabel var7f1ab110jf /* f0767b0: 2406ffff */ li $a2,-1 /* f0767b4: afa301e4 */ sw $v1,0x1e4($sp) /* f0767b8: afa40070 */ sw $a0,0x70($sp) -/* f0767bc: 0fc2a521 */ jal 0xf0a9484 +/* f0767bc: 0fc2a521 */ jal bgun0f0a8404 /* f0767c0: afa801ec */ sw $t0,0x1ec($sp) /* f0767c4: 8fa401e4 */ lw $a0,0x1e4($sp) /* f0767c8: 8fa801ec */ lw $t0,0x1ec($sp) @@ -28371,10 +28371,10 @@ glabel var7f1ab110jf /* f0767e8: 8d6ba8bc */ lw $t3,-0x5744($t3) /* f0767ec: 9107005c */ lbu $a3,0x5c($t0) /* f0767f0: afa001f8 */ sw $zero,0x1f8($sp) -/* f0767f4: 0fc218ca */ jal 0xf086328 +/* f0767f4: 0fc218ca */ jal objTakeGunfire /* f0767f8: afab0010 */ sw $t3,0x10($sp) /* f0767fc: 8fa401f4 */ lw $a0,0x1f4($sp) -/* f076800: 0fc1c5ec */ jal 0xf0717b0 +/* f076800: 0fc1c5ec */ jal objDropRecursively /* f076804: 00002825 */ move $a1,$zero /* f076808: 240c0001 */ li $t4,0x1 /* f07680c: 1000000e */ b .JF0f076848 @@ -28387,7 +28387,7 @@ glabel var7f1ab110jf /* f076824: 54410009 */ bnel $v0,$at,.JF0f07684c /* f076828: 8fae034c */ lw $t6,0x34c($sp) .JF0f07682c: -/* f07682c: 0fc0d471 */ jal 0xf0351c4 +/* f07682c: 0fc0d471 */ jal chrGetShield /* f076830: 8de40004 */ lw $a0,0x4($t7) /* f076834: 4600a03c */ c.lt.s $f20,$f0 /* f076838: 00000000 */ nop @@ -28439,10 +28439,10 @@ glabel var7f1ab110jf /* f0768e0: 8c4e0088 */ lw $t6,0x88($v0) /* f0768e4: afa70070 */ sw $a3,0x70($sp) /* f0768e8: afa401dc */ sw $a0,0x1dc($sp) -/* f0768ec: 0fc0d471 */ jal 0xf0351c4 +/* f0768ec: 0fc0d471 */ jal chrGetShield /* f0768f0: afae01d4 */ sw $t6,0x1d4($sp) /* f0768f4: 8fa40070 */ lw $a0,0x70($sp) -/* f0768f8: 0fc2cb6a */ jal 0xf0b2da8 +/* f0768f8: 0fc2cb6a */ jal gsetGetDamage /* f0768fc: e7a001d8 */ swc1 $f0,0x1d8($sp) /* f076900: 3c188007 */ lui $t8,0x8007 /* f076904: 3c098007 */ lui $t1,0x8007 @@ -28468,7 +28468,7 @@ glabel var7f1ab110jf /* f076954: afad001c */ sw $t5,0x1c($sp) /* f076958: afa90018 */ sw $t1,0x18($sp) /* f07695c: afb80014 */ sw $t8,0x14($sp) -/* f076960: 0fc0d500 */ jal 0xf035400 +/* f076960: 0fc0d500 */ jal func0f0341dc /* f076964: afb90010 */ sw $t9,0x10($sp) /* f076968: c7a401d8 */ lwc1 $f4,0x1d8($sp) /* f07696c: 8faf01d4 */ lw $t7,0x1d4($sp) @@ -28491,7 +28491,7 @@ glabel var7f1ab110jf /* f0769ac: 8ca59880 */ lw $a1,-0x6780($a1) /* f0769b0: 8cc69884 */ lw $a2,-0x677c($a2) /* f0769b4: afb90010 */ sw $t9,0x10($sp) -/* f0769b8: 0fc09c2b */ jal 0xf0270ac +/* f0769b8: 0fc09c2b */ jal chrEmitSparks /* f0769bc: afb80014 */ sw $t8,0x14($sp) /* f0769c0: 3c098007 */ lui $t1,0x8007 /* f0769c4: 8d299880 */ lw $t1,-0x6780($t1) @@ -28511,19 +28511,19 @@ glabel var7f1ab110jf /* f0769fc: 104100f7 */ beq $v0,$at,.JF0f076ddc /* f076a00: 3c05800a */ lui $a1,0x800a /* f076a04: 8ca5d534 */ lw $a1,-0x2acc($a1) -/* f076a08: 0c00695b */ jal 0x1a56c +/* f076a08: 0c00695b */ jal model0001a5cc /* f076a0c: 00003025 */ move $a2,$zero -/* f076a10: 0fc2d9de */ jal 0xf0b6778 +/* f076a10: 0fc2d9de */ jal currentPlayerGetMatrix1740 /* f076a14: afa20184 */ sw $v0,0x184($sp) /* f076a18: 00402025 */ move $a0,$v0 /* f076a1c: 27a505e8 */ addiu $a1,$sp,0x5e8 -/* f076a20: 0c0056c2 */ jal 0x15b08 +/* f076a20: 0c0056c2 */ jal mtx4TransformVec /* f076a24: 27a601c8 */ addiu $a2,$sp,0x1c8 /* f076a28: 8fa40184 */ lw $a0,0x184($sp) -/* f076a2c: 0c005c4f */ jal 0x1713c +/* f076a2c: 0c005c4f */ jal mtx0001719c /* f076a30: 27a50188 */ addiu $a1,$sp,0x188 /* f076a34: 27a40188 */ addiu $a0,$sp,0x188 -/* f076a38: 0c0056c1 */ jal 0x15b04 +/* f076a38: 0c0056c1 */ jal mtx4TransformVecInPlace /* f076a3c: 27a501c8 */ addiu $a1,$sp,0x1c8 /* f076a40: 3c04800a */ lui $a0,0x800a /* f076a44: 3c058007 */ lui $a1,0x8007 @@ -28531,7 +28531,7 @@ glabel var7f1ab110jf /* f076a4c: 8cc6d534 */ lw $a2,-0x2acc($a2) /* f076a50: 8ca59884 */ lw $a1,-0x677c($a1) /* f076a54: 8c84d530 */ lw $a0,-0x2ad0($a0) -/* f076a58: 0fc09ca3 */ jal 0xf02728c +/* f076a58: 0fc09ca3 */ jal chr0f0260c4 /* f076a5c: 27a701c8 */ addiu $a3,$sp,0x1c8 /* f076a60: 100000df */ b .JF0f076de0 /* f076a64: 8faf034c */ lw $t7,0x34c($sp) @@ -28570,7 +28570,7 @@ glabel var7f1ab110jf /* f076adc: afad0018 */ sw $t5,0x18($sp) /* f076ae0: 8ce7d534 */ lw $a3,-0x2acc($a3) /* f076ae4: afa90014 */ sw $t1,0x14($sp) -/* f076ae8: 0fc0a851 */ jal 0xf02a144 +/* f076ae8: 0fc0a851 */ jal shieldhitCreate /* f076aec: afb80010 */ sw $t8,0x10($sp) .JF0f076af0: /* f076af0: 8faa0180 */ lw $t2,0x180($sp) @@ -28585,7 +28585,7 @@ glabel var7f1ab110jf /* f076b14: 55e100b2 */ bnel $t7,$at,.JF0f076de0 /* f076b18: 8faf034c */ lw $t7,0x34c($sp) /* f076b1c: 4406a000 */ mfc1 $a2,$f20 -/* f076b20: 0fc6858b */ jal 0xf1a162c +/* f076b20: 0fc6858b */ jal frCalculateHit /* f076b24: 27a505e8 */ addiu $a1,$sp,0x5e8 /* f076b28: 100000ad */ b .JF0f076de0 /* f076b2c: 8faf034c */ lw $t7,0x34c($sp) @@ -28620,7 +28620,7 @@ glabel var7f1ab110jf /* f076b94: 11600008 */ beqz $t3,.JF0f076bb8 /* f076b98: 8fa4017c */ lw $a0,0x17c($sp) /* f076b9c: afa00178 */ sw $zero,0x178($sp) -/* f076ba0: 0fc63653 */ jal 0xf18d94c +/* f076ba0: 0fc63653 */ jal mpGetChrFromPlayerIndex /* f076ba4: afa70070 */ sw $a3,0x70($sp) /* f076ba8: 8fa30178 */ lw $v1,0x178($sp) /* f076bac: 10400002 */ beqz $v0,.JF0f076bb8 @@ -28649,7 +28649,7 @@ glabel var7f1ab110jf /* f076c04: afae0024 */ sw $t6,0x24($sp) /* f076c08: afac0020 */ sw $t4,0x20($sp) /* f076c0c: afaa001c */ sw $t2,0x1c($sp) -/* f076c10: 0fc0d500 */ jal 0xf035400 +/* f076c10: 0fc0d500 */ jal func0f0341dc /* f076c14: afaf0014 */ sw $t7,0x14($sp) /* f076c18: 1000002f */ b .JF0f076cd8 /* f076c1c: 02202025 */ move $a0,$s1 @@ -28692,7 +28692,7 @@ glabel var7f1ab110jf /* f076c9c: afac0018 */ sw $t4,0x18($sp) /* f076ca0: 8ce7d534 */ lw $a3,-0x2acc($a3) /* f076ca4: afaa0014 */ sw $t2,0x14($sp) -/* f076ca8: 0fc0a851 */ jal 0xf02a144 +/* f076ca8: 0fc0a851 */ jal shieldhitCreate /* f076cac: afaf0010 */ sw $t7,0x10($sp) /* f076cb0: 3c0e8007 */ lui $t6,0x8007 /* f076cb4: 8dce9880 */ lw $t6,-0x6780($t6) @@ -28702,13 +28702,13 @@ glabel var7f1ab110jf /* f076cc0: 8fb9017c */ lw $t9,0x17c($sp) /* f076cc4: 3c0542c8 */ lui $a1,0x42c8 /* f076cc8: 8fa60070 */ lw $a2,0x70($sp) -/* f076ccc: 0fc218d9 */ jal 0xf086364 +/* f076ccc: 0fc218d9 */ jal objDamage /* f076cd0: afb90010 */ sw $t9,0x10($sp) .JF0f076cd4: /* f076cd4: 02202025 */ move $a0,$s1 .JF0f076cd8: /* f076cd8: 24050001 */ li $a1,0x1 -/* f076cdc: 0fc1ab62 */ jal 0xf06ad88 +/* f076cdc: 0fc1ab62 */ jal func0f069c70 /* f076ce0: 24060001 */ li $a2,0x1 /* f076ce4: 1000003d */ b .JF0f076ddc /* f076ce8: a6200062 */ sh $zero,0x62($s1) @@ -28734,7 +28734,7 @@ glabel var7f1ab110jf /* f076d30: 8ce7d530 */ lw $a3,-0x2ad0($a3) /* f076d34: 8ca5d534 */ lw $a1,-0x2acc($a1) /* f076d38: afaf0014 */ sw $t7,0x14($sp) -/* f076d3c: 0fc0d4a9 */ jal 0xf0352a4 +/* f076d3c: 0fc0d4a9 */ jal func0f034080 /* f076d40: afab0010 */ sw $t3,0x10($sp) /* f076d44: 10000026 */ b .JF0f076de0 /* f076d48: 8faf034c */ lw $t7,0x34c($sp) @@ -28777,7 +28777,7 @@ glabel var7f1ab110jf /* f076dc8: afab0018 */ sw $t3,0x18($sp) /* f076dcc: 8ce7d534 */ lw $a3,-0x2acc($a3) /* f076dd0: afb80010 */ sw $t8,0x10($sp) -/* f076dd4: 0fc0a851 */ jal 0xf02a144 +/* f076dd4: 0fc0a851 */ jal shieldhitCreate /* f076dd8: afad0014 */ sw $t5,0x14($sp) .JF0f076ddc: /* f076ddc: 8faf034c */ lw $t7,0x34c($sp) @@ -28790,7 +28790,7 @@ glabel var7f1ab110jf /* f076df4: afac034c */ sw $t4,0x34c($sp) /* f076df8: 02202025 */ move $a0,$s1 /* f076dfc: 24050001 */ li $a1,0x1 -/* f076e00: 0fc1ab62 */ jal 0xf06ad88 +/* f076e00: 0fc1ab62 */ jal func0f069c70 /* f076e04: 24060001 */ li $a2,0x1 /* f076e08: 922e0003 */ lbu $t6,0x3($s1) /* f076e0c: 24010008 */ li $at,0x8 @@ -28814,12 +28814,12 @@ glabel var7f1ab110jf /* f076e50: 2627005c */ addiu $a3,$s1,0x5c /* f076e54: 8f18a8bc */ lw $t8,-0x5744($t8) /* f076e58: afa70070 */ sw $a3,0x70($sp) -/* f076e5c: 0fc4a361 */ jal 0xf128d84 +/* f076e5c: 0fc4a361 */ jal playermgrGetPlayerNumByProp /* f076e60: afb80164 */ sw $t8,0x164($sp) -/* f076e64: 0fc4a34d */ jal 0xf128d34 +/* f076e64: 0fc4a34d */ jal setCurrentPlayerNum /* f076e68: 00402025 */ move $a0,$v0 /* f076e6c: 8fa40070 */ lw $a0,0x70($sp) -/* f076e70: 0fc2c528 */ jal 0xf0b14a0 +/* f076e70: 0fc2c528 */ jal mpstatsIncrementPlayerShotCount /* f076e74: 00002825 */ move $a1,$zero /* f076e78: 3c058007 */ lui $a1,0x8007 /* f076e7c: 8ca59880 */ lw $a1,-0x6780($a1) @@ -28831,12 +28831,12 @@ glabel var7f1ab110jf /* f076e94: 5441000c */ bnel $v0,$at,.JF0f076ec8 /* f076e98: 24010003 */ li $at,0x3 /* f076e9c: 8ca40004 */ lw $a0,0x4($a1) -/* f076ea0: 0fc21e98 */ jal 0xf087a60 +/* f076ea0: 0fc21e98 */ jal objIsHealthy /* f076ea4: afa70070 */ sw $a3,0x70($sp) /* f076ea8: 1040004c */ beqz $v0,.JF0f076fdc /* f076eac: 8fa70070 */ lw $a3,0x70($sp) /* f076eb0: 00e02025 */ move $a0,$a3 -/* f076eb4: 0fc2c528 */ jal 0xf0b14a0 +/* f076eb4: 0fc2c528 */ jal mpstatsIncrementPlayerShotCount /* f076eb8: 24050006 */ li $a1,0x6 /* f076ebc: 10000047 */ b .JF0f076fdc /* f076ec0: 00000000 */ nop @@ -28862,7 +28862,7 @@ glabel var7f1ab110jf /* f076f04: 1441000e */ bne $v0,$at,.JF0f076f40 /* f076f08: 00000000 */ nop /* f076f0c: afa6015c */ sw $a2,0x15c($sp) -/* f076f10: 0fc4a361 */ jal 0xf128d84 +/* f076f10: 0fc4a361 */ jal playermgrGetPlayerNumByProp /* f076f14: afa70070 */ sw $a3,0x70($sp) /* f076f18: 00025880 */ sll $t3,$v0,0x2 /* f076f1c: 3c0f800a */ lui $t7,0x800a @@ -28897,30 +28897,30 @@ glabel var7f1ab110jf /* f076f8c: 10000011 */ b .JF0f076fd4 /* f076f90: 00e02025 */ move $a0,$a3 .JF0f076f94: -/* f076f94: 0fc2c528 */ jal 0xf0b14a0 +/* f076f94: 0fc2c528 */ jal mpstatsIncrementPlayerShotCount /* f076f98: 00e02025 */ move $a0,$a3 /* f076f9c: 1000000f */ b .JF0f076fdc /* f076fa0: 00000000 */ nop .JF0f076fa4: -/* f076fa4: 0fc2c528 */ jal 0xf0b14a0 +/* f076fa4: 0fc2c528 */ jal mpstatsIncrementPlayerShotCount /* f076fa8: 24050004 */ li $a1,0x4 /* f076fac: 1000000b */ b .JF0f076fdc /* f076fb0: 00000000 */ nop .JF0f076fb4: -/* f076fb4: 0fc2c528 */ jal 0xf0b14a0 +/* f076fb4: 0fc2c528 */ jal mpstatsIncrementPlayerShotCount /* f076fb8: 24050005 */ li $a1,0x5 /* f076fbc: 10000007 */ b .JF0f076fdc /* f076fc0: 00000000 */ nop .JF0f076fc4: -/* f076fc4: 0fc2c528 */ jal 0xf0b14a0 +/* f076fc4: 0fc2c528 */ jal mpstatsIncrementPlayerShotCount /* f076fc8: 24050002 */ li $a1,0x2 /* f076fcc: 10000003 */ b .JF0f076fdc /* f076fd0: 00000000 */ nop .JF0f076fd4: -/* f076fd4: 0fc2c528 */ jal 0xf0b14a0 +/* f076fd4: 0fc2c528 */ jal mpstatsIncrementPlayerShotCount /* f076fd8: 24050003 */ li $a1,0x3 .JF0f076fdc: -/* f076fdc: 0fc4a34d */ jal 0xf128d34 +/* f076fdc: 0fc4a34d */ jal setCurrentPlayerNum /* f076fe0: 8fa40164 */ lw $a0,0x164($sp) .JF0f076fe4: /* f076fe4: 8fae01f4 */ lw $t6,0x1f4($sp) @@ -28948,7 +28948,7 @@ glabel var7f1ab110jf /* f077030: e7aa0154 */ swc1 $f10,0x154($sp) /* f077034: c606000c */ lwc1 $f6,0xc($s0) /* f077038: afa2014c */ sw $v0,0x14c($sp) -/* f07703c: 0c0011e4 */ jal 0x4790 +/* f07703c: 0c0011e4 */ jal guNormalize /* f077040: e7a60158 */ swc1 $f6,0x158($sp) /* f077044: 8fa2014c */ lw $v0,0x14c($sp) /* f077048: 50400005 */ beqzl $v0,.JF0f077060 @@ -28958,7 +28958,7 @@ glabel var7f1ab110jf /* f077058: afa90088 */ sw $t1,0x88($sp) /* f07705c: afa00088 */ sw $zero,0x88($sp) .JF0f077060: -/* f077060: 0fc4fa2a */ jal 0xf13e8a8 +/* f077060: 0fc4fa2a */ jal chrIsUsingPaintball /* f077064: 8fa40088 */ lw $a0,0x88($sp) /* f077068: 1040000c */ beqz $v0,.JF0f07709c /* f07706c: 02402825 */ move $a1,$s2 @@ -28969,7 +28969,7 @@ glabel var7f1ab110jf /* f077080: afb80010 */ sw $t8,0x10($sp) /* f077084: 02402825 */ move $a1,$s2 /* f077088: 27a605e8 */ addiu $a2,$sp,0x5e8 -/* f07708c: 0fc4bf7c */ jal 0xf12fdf0 +/* f07708c: 0fc4bf7c */ jal sparksCreate /* f077090: 27a70150 */ addiu $a3,$sp,0x150 /* f077094: 1000000a */ b .JF0f0770c0 /* f077098: 02402025 */ move $a0,$s2 @@ -28980,13 +28980,13 @@ glabel var7f1ab110jf /* f0770a8: afaf0014 */ sw $t7,0x14($sp) /* f0770ac: afab0010 */ sw $t3,0x10($sp) /* f0770b0: 27a605e8 */ addiu $a2,$sp,0x5e8 -/* f0770b4: 0fc4bf7c */ jal 0xf12fdf0 +/* f0770b4: 0fc4bf7c */ jal sparksCreate /* f0770b8: 27a70150 */ addiu $a3,$sp,0x150 /* f0770bc: 02402025 */ move $a0,$s2 .JF0f0770c0: /* f0770c0: 27a505e8 */ addiu $a1,$sp,0x5e8 /* f0770c4: 27a605f4 */ addiu $a2,$sp,0x5f4 -/* f0770c8: 0fc1c06e */ jal 0xf0701b8 +/* f0770c8: 0fc1c06e */ jal func0f06f0a0 /* f0770cc: 8fa7060c */ lw $a3,0x60c($sp) .JF0f0770d0: /* f0770d0: 8faa034c */ lw $t2,0x34c($sp) @@ -28998,7 +28998,7 @@ glabel var7f1ab110jf /* f0770e4: 26440008 */ addiu $a0,$s2,0x8 /* f0770e8: 8fa5006c */ lw $a1,0x6c($sp) /* f0770ec: 27a605dc */ addiu $a2,$sp,0x5dc -/* f0770f0: 0fc19be5 */ jal 0xf066f94 +/* f0770f0: 0fc19be5 */ jal func0f065e74 /* f0770f4: 27a7013c */ addiu $a3,$sp,0x13c /* f0770f8: c7a405dc */ lwc1 $f4,0x5dc($sp) /* f0770fc: 02402025 */ move $a0,$s2 @@ -29006,10 +29006,10 @@ glabel var7f1ab110jf /* f077104: c7a805e0 */ lwc1 $f8,0x5e0($sp) /* f077108: e648000c */ swc1 $f8,0xc($s2) /* f07710c: c7aa05e4 */ lwc1 $f10,0x5e4($sp) -/* f077110: 0fc19b59 */ jal 0xf066d64 +/* f077110: 0fc19b59 */ jal propDeregisterRooms /* f077114: e64a0010 */ swc1 $f10,0x10($s2) /* f077118: 27a4013c */ addiu $a0,$sp,0x13c -/* f07711c: 0fc19a31 */ jal 0xf0668c4 +/* f07711c: 0fc19a31 */ jal roomsCopy /* f077120: 8fa5006c */ lw $a1,0x6c($sp) /* f077124: 10000025 */ b .JF0f0771bc /* f077128: 8fae034c */ lw $t6,0x34c($sp) @@ -29040,7 +29040,7 @@ glabel var7f1ab110jf /* f07717c: e7aa05e0 */ swc1 $f10,0x5e0($sp) /* f077180: e7a605e4 */ swc1 $f6,0x5e4($sp) .JF0f077184: -/* f077184: 0fc19be5 */ jal 0xf066f94 +/* f077184: 0fc19be5 */ jal func0f065e74 /* f077188: 8fa5006c */ lw $a1,0x6c($sp) /* f07718c: c7a405dc */ lwc1 $f4,0x5dc($sp) /* f077190: 02402025 */ move $a0,$s2 @@ -29048,19 +29048,19 @@ glabel var7f1ab110jf /* f077198: c7a805e0 */ lwc1 $f8,0x5e0($sp) /* f07719c: e648000c */ swc1 $f8,0xc($s2) /* f0771a0: c7aa05e4 */ lwc1 $f10,0x5e4($sp) -/* f0771a4: 0fc19b59 */ jal 0xf066d64 +/* f0771a4: 0fc19b59 */ jal propDeregisterRooms /* f0771a8: e64a0010 */ swc1 $f10,0x10($s2) /* f0771ac: 27a4012c */ addiu $a0,$sp,0x12c -/* f0771b0: 0fc19a31 */ jal 0xf0668c4 +/* f0771b0: 0fc19a31 */ jal roomsCopy /* f0771b4: 8fa5006c */ lw $a1,0x6c($sp) /* f0771b8: 8fae034c */ lw $t6,0x34c($sp) .JF0f0771bc: /* f0771bc: 55c0039e */ bnezl $t6,.JF0f078038 /* f0771c0: 8fbf005c */ lw $ra,0x5c($sp) -/* f0771c4: 0fc1a705 */ jal 0xf069c14 +/* f0771c4: 0fc1a705 */ jal objFindBboxRodata /* f0771c8: 02202025 */ move $a0,$s1 /* f0771cc: 00402025 */ move $a0,$v0 -/* f0771d0: 0fc19e9f */ jal 0xf067a7c +/* f0771d0: 0fc19e9f */ jal func0f06695c /* f0771d4: 8fa50074 */ lw $a1,0x74($sp) /* f0771d8: e7a0037c */ swc1 $f0,0x37c($sp) /* f0771dc: c6460008 */ lwc1 $f6,0x8($s2) @@ -29078,7 +29078,7 @@ glabel var7f1ab110jf /* f07720c: afa70074 */ sw $a3,0x74($sp) /* f077210: afa90014 */ sw $t1,0x14($sp) /* f077214: afb90010 */ sw $t9,0x10($sp) -/* f077218: 0c00a83d */ jal 0x2a0f4 +/* f077218: 0c00a83d */ jal cd0002a5e4 /* f07721c: e7aa05b4 */ swc1 $f10,0x5b4($sp) /* f077220: 00021c00 */ sll $v1,$v0,0x10 /* f077224: 1840002e */ blez $v0,.JF0f0772e0 @@ -29096,7 +29096,7 @@ glabel var7f1ab110jf /* f077254: 45020023 */ bc1fl .JF0f0772e4 /* f077258: 26440008 */ addiu $a0,$s2,0x8 /* f07725c: afad0010 */ sw $t5,0x10($sp) -/* f077260: 0c00b5aa */ jal 0x2d6a8 +/* f077260: 0c00b5aa */ jal cd0002db98 /* f077264: a7b8038e */ sh $t8,0x38e($sp) /* f077268: 1440001d */ bnez $v0,.JF0f0772e0 /* f07726c: 87a3038e */ lh $v1,0x38e($sp) @@ -29111,7 +29111,7 @@ glabel var7f1ab110jf /* f077290: a7a3038e */ sh $v1,0x38e($sp) /* f077294: e7a605f4 */ swc1 $f6,0x5f4($sp) /* f077298: e7a405f8 */ swc1 $f4,0x5f8($sp) -/* f07729c: 0c0011e4 */ jal 0x4790 +/* f07729c: 0c0011e4 */ jal guNormalize /* f0772a0: e7a805fc */ swc1 $f8,0x5fc($sp) /* f0772a4: c64a0008 */ lwc1 $f10,0x8($s2) /* f0772a8: c7a60390 */ lwc1 $f6,0x390($sp) @@ -29137,7 +29137,7 @@ glabel var7f1ab110jf /* f0772f0: 8fa5006c */ lw $a1,0x6c($sp) /* f0772f4: 27a60390 */ addiu $a2,$sp,0x390 /* f0772f8: 8fa70074 */ lw $a3,0x74($sp) -/* f0772fc: 0c00a81d */ jal 0x2a074 +/* f0772fc: 0c00a81d */ jal cd0002a564 /* f077300: afa00014 */ sw $zero,0x14($sp) /* f077304: 00021c00 */ sll $v1,$v0,0x10 /* f077308: 00034c03 */ sra $t1,$v1,0x10 @@ -29153,7 +29153,7 @@ glabel var7f1ab110jf /* f077330: ae0b0000 */ sw $t3,0x0($s0) /* f077334: a7a9038e */ sh $t1,0x38e($sp) /* f077338: 27a405c8 */ addiu $a0,$sp,0x5c8 -/* f07733c: 0c00a7c4 */ jal 0x29f10 +/* f07733c: 0c00a7c4 */ jal cd0002a400 /* f077340: 27a505b8 */ addiu $a1,$sp,0x5b8 /* f077344: 18400004 */ blez $v0,.JF0f077358 /* f077348: 87a3038e */ lh $v1,0x38e($sp) @@ -29171,16 +29171,16 @@ glabel var7f1ab110jf /* f077374: 02402025 */ move $a0,$s2 /* f077378: e64a000c */ swc1 $f10,0xc($s2) /* f07737c: c7a605d0 */ lwc1 $f6,0x5d0($sp) -/* f077380: 0fc19b59 */ jal 0xf066d64 +/* f077380: 0fc19b59 */ jal propDeregisterRooms /* f077384: e6460010 */ swc1 $f6,0x10($s2) /* f077388: 27a405b8 */ addiu $a0,$sp,0x5b8 -/* f07738c: 0fc19a31 */ jal 0xf0668c4 +/* f07738c: 0fc19a31 */ jal roomsCopy /* f077390: 8fa5006c */ lw $a1,0x6c($sp) /* f077394: 8fa40070 */ lw $a0,0x70($sp) /* f077398: 8fa5006c */ lw $a1,0x6c($sp) /* f07739c: 27a60390 */ addiu $a2,$sp,0x390 /* f0773a0: 8fa70074 */ lw $a3,0x74($sp) -/* f0773a4: 0c00a7d4 */ jal 0x29f50 +/* f0773a4: 0c00a7d4 */ jal cd0002a440 /* f0773a8: afa00010 */ sw $zero,0x10($sp) /* f0773ac: 00021c00 */ sll $v1,$v0,0x10 /* f0773b0: 0003cc03 */ sra $t9,$v1,0x10 @@ -29281,7 +29281,7 @@ glabel var7f1ab110jf /* f077508: 02402025 */ move $a0,$s2 /* f07750c: 57010004 */ bnel $t8,$at,.JF0f077520 /* f077510: 8fad0350 */ lw $t5,0x350($sp) -/* f077514: 0fc4bac5 */ jal 0xf12eb14 +/* f077514: 0fc4bac5 */ jal smokeCreateAtProp /* f077518: 24050013 */ li $a1,0x13 /* f07751c: 8fad0350 */ lw $t5,0x350($sp) .JF0f077520: @@ -29294,7 +29294,7 @@ glabel var7f1ab110jf /* f077538: 8fab0354 */ lw $t3,0x354($sp) /* f07753c: 51600007 */ beqzl $t3,.JF0f07755c /* f077540: 8e0f0000 */ lw $t7,0x0($s0) -/* f077544: 0fc1adce */ jal 0xf06b738 +/* f077544: 0fc1adce */ jal func0f06a620 /* f077548: 02202025 */ move $a0,$s1 /* f07754c: c646000c */ lwc1 $f6,0xc($s2) /* f077550: 46003200 */ add.s $f8,$f6,$f0 @@ -29314,7 +29314,7 @@ glabel var7f1ab110jf /* f077584: 50200004 */ beqzl $at,.JF0f077598 /* f077588: 8e190090 */ lw $t9,0x90($s0) .JF0f07758c: -/* f07758c: 0fc25c40 */ jal 0xf097100 +/* f07758c: 0fc25c40 */ jal func0f096360 /* f077590: 8fa40064 */ lw $a0,0x64($sp) /* f077594: 8e190090 */ lw $t9,0x90($s0) .JF0f077598: @@ -29343,7 +29343,7 @@ glabel var7f1ab110jf /* f0775ec: c604008c */ lwc1 $f4,0x8c($s0) /* f0775f0: 11c00029 */ beqz $t6,.JF0f077698 /* f0775f4: 02202025 */ move $a0,$s1 -/* f0775f8: 0fc1bb3c */ jal 0xf06ecf0 +/* f0775f8: 0fc1bb3c */ jal func0f06dbd8 /* f0775fc: 27a50358 */ addiu $a1,$sp,0x358 /* f077600: 10000026 */ b .JF0f07769c /* f077604: 922b0003 */ lbu $t3,0x3($s1) @@ -29377,14 +29377,14 @@ glabel var7f1ab110jf .JF0f077670: /* f077670: 13000009 */ beqz $t8,.JF0f077698 /* f077674: 02202025 */ move $a0,$s1 -/* f077678: 0fc1bb3c */ jal 0xf06ecf0 +/* f077678: 0fc1bb3c */ jal func0f06dbd8 /* f07767c: 27a50358 */ addiu $a1,$sp,0x358 /* f077680: 10000006 */ b .JF0f07769c /* f077684: 922b0003 */ lbu $t3,0x3($s1) .JF0f077688: /* f077688: 11a00003 */ beqz $t5,.JF0f077698 /* f07768c: 02202025 */ move $a0,$s1 -/* f077690: 0fc1bb3c */ jal 0xf06ecf0 +/* f077690: 0fc1bb3c */ jal func0f06dbd8 /* f077694: 27a50358 */ addiu $a1,$sp,0x358 .JF0f077698: /* f077698: 922b0003 */ lbu $t3,0x3($s1) @@ -29400,7 +29400,7 @@ glabel var7f1ab110jf /* f0776bc: 24010001 */ li $at,0x1 /* f0776c0: 55e10006 */ bnel $t7,$at,.JF0f0776dc /* f0776c4: 24010053 */ li $at,0x53 -/* f0776c8: 0fc1be65 */ jal 0xf06f994 +/* f0776c8: 0fc1be65 */ jal func0f06e87c /* f0776cc: 02202025 */ move $a0,$s1 /* f0776d0: 100000b0 */ b .JF0f077994 /* f0776d4: 8fac0600 */ lw $t4,0x600($sp) @@ -29453,7 +29453,7 @@ glabel var7f1ab110jf /* f077780: 27a60110 */ addiu $a2,$sp,0x110 /* f077784: e7a4010c */ swc1 $f4,0x10c($sp) /* f077788: c608000c */ lwc1 $f8,0xc($s0) -/* f07778c: 0c0011e4 */ jal 0x4790 +/* f07778c: 0c0011e4 */ jal guNormalize /* f077790: e7a80110 */ swc1 $f8,0x110($sp) /* f077794: 3c0141a0 */ lui $at,0x41a0 /* f077798: 44810000 */ mtc1 $at,$f0 @@ -29474,7 +29474,7 @@ glabel var7f1ab110jf /* f0777d4: e7a8010c */ swc1 $f8,0x10c($sp) /* f0777d8: c64a0010 */ lwc1 $f10,0x10($s2) /* f0777dc: 46045201 */ sub.s $f8,$f10,$f4 -/* f0777e0: 0fc4bb08 */ jal 0xf12ec20 +/* f0777e0: 0fc4bb08 */ jal smokeCreateSimple /* f0777e4: e7a80110 */ swc1 $f8,0x110($sp) /* f0777e8: 1000006a */ b .JF0f077994 /* f0777ec: 8fac0600 */ lw $t4,0x600($sp) @@ -29488,7 +29488,7 @@ glabel var7f1ab110jf /* f077808: a6200062 */ sh $zero,0x62($s1) .JF0f07780c: /* f07780c: 8fa5006c */ lw $a1,0x6c($sp) -/* f077810: 0fc4bb08 */ jal 0xf12ec20 +/* f077810: 0fc4bb08 */ jal smokeCreateSimple /* f077814: 2406000b */ li $a2,0xb /* f077818: 1000005e */ b .JF0f077994 /* f07781c: 8fac0600 */ lw $t4,0x600($sp) @@ -29588,7 +29588,7 @@ glabel var7f1ab110jf /* f07797c: 10470004 */ beq $v0,$a3,.JF0f077990 /* f077980: 26440008 */ addiu $a0,$s2,0x8 /* f077984: 8fa5006c */ lw $a1,0x6c($sp) -/* f077988: 0fc4bb08 */ jal 0xf12ec20 +/* f077988: 0fc4bb08 */ jal smokeCreateSimple /* f07798c: 24060009 */ li $a2,0x9 .JF0f077990: /* f077990: 8fac0600 */ lw $t4,0x600($sp) @@ -29626,7 +29626,7 @@ glabel var7f1ab110jf /* f077a08: e7a00024 */ swc1 $f0,0x24($sp) /* f077a0c: e7a00030 */ swc1 $f0,0x30($sp) /* f077a10: e7a00034 */ swc1 $f0,0x34($sp) -/* f077a14: 0fc251de */ jal 0xf094778 +/* f077a14: 0fc251de */ jal func0f0939f8 /* f077a18: e7a00038 */ swc1 $f0,0x38($sp) /* f077a1c: 3c03800a */ lui $v1,0x800a /* f077a20: 10000052 */ b .JF0f077b6c @@ -29644,7 +29644,7 @@ glabel var7f1ab110jf /* f077a4c: 8dec0004 */ lw $t4,0x4($t7) /* f077a50: 27ab0100 */ addiu $t3,$sp,0x100 /* f077a54: ad610000 */ sw $at,0x0($t3) -/* f077a58: 0c004b60 */ jal 0x12d80 +/* f077a58: 0c004b60 */ jal random /* f077a5c: ad6c0004 */ sw $t4,0x4($t3) /* f077a60: 304e0003 */ andi $t6,$v0,0x3 /* f077a64: 000ec840 */ sll $t9,$t6,0x1 @@ -29667,7 +29667,7 @@ glabel var7f1ab110jf /* f077aa8: e7a00024 */ swc1 $f0,0x24($sp) /* f077aac: e7a00030 */ swc1 $f0,0x30($sp) /* f077ab0: e7a00034 */ swc1 $f0,0x34($sp) -/* f077ab4: 0fc251de */ jal 0xf094778 +/* f077ab4: 0fc251de */ jal func0f0939f8 /* f077ab8: e7a00038 */ swc1 $f0,0x38($sp) /* f077abc: 3c01bf80 */ lui $at,0xbf80 /* f077ac0: 44810000 */ mtc1 $at,$f0 @@ -29687,7 +29687,7 @@ glabel var7f1ab110jf /* f077af8: e7a00024 */ swc1 $f0,0x24($sp) /* f077afc: e7a00030 */ swc1 $f0,0x30($sp) /* f077b00: e7a00034 */ swc1 $f0,0x34($sp) -/* f077b04: 0fc251de */ jal 0xf094778 +/* f077b04: 0fc251de */ jal func0f0939f8 /* f077b08: e7a00038 */ swc1 $f0,0x38($sp) /* f077b0c: 3c03800a */ lui $v1,0x800a /* f077b10: 10000016 */ b .JF0f077b6c @@ -29710,7 +29710,7 @@ glabel var7f1ab110jf /* f077b50: e7a00024 */ swc1 $f0,0x24($sp) /* f077b54: e7a00030 */ swc1 $f0,0x30($sp) /* f077b58: e7a00034 */ swc1 $f0,0x34($sp) -/* f077b5c: 0fc251de */ jal 0xf094778 +/* f077b5c: 0fc251de */ jal func0f0939f8 /* f077b60: e7a00038 */ swc1 $f0,0x38($sp) /* f077b64: 3c03800a */ lui $v1,0x800a /* f077b68: 8c63a63c */ lw $v1,-0x59c4($v1) @@ -29720,7 +29720,7 @@ glabel var7f1ab110jf /* f077b70: 02202025 */ move $a0,$s1 .JF0f077b74: /* f077b74: 24050001 */ li $a1,0x1 -/* f077b78: 0fc1ab62 */ jal 0xf06ad88 +/* f077b78: 0fc1ab62 */ jal func0f069c70 /* f077b7c: 24060001 */ li $a2,0x1 /* f077b80: 1000012d */ b .JF0f078038 /* f077b84: 8fbf005c */ lw $ra,0x5c($sp) @@ -29759,22 +29759,22 @@ glabel var7f1ab110jf /* f077c00: c6000060 */ lwc1 $f0,0x60($s0) /* f077c04: 44060000 */ mfc1 $a2,$f0 .JF0f077c08: -/* f077c08: 0fc26016 */ jal 0xf098058 +/* f077c08: 0fc26016 */ jal quaternionSlerp /* f077c0c: 27a700ec */ addiu $a3,$sp,0xec /* f077c10: 27a400ec */ addiu $a0,$sp,0xec -/* f077c14: 0fc25f1d */ jal 0xf097c74 +/* f077c14: 0fc25f1d */ jal quaternionToMtx /* f077c18: 27a500ac */ addiu $a1,$sp,0xac /* f077c1c: c60c00b8 */ lwc1 $f12,0xb8($s0) -/* f077c20: 0c005771 */ jal 0x15dc4 +/* f077c20: 0c005771 */ jal mtx00015e24 /* f077c24: 27a500ac */ addiu $a1,$sp,0xac /* f077c28: c60c00bc */ lwc1 $f12,0xbc($s0) -/* f077c2c: 0c005788 */ jal 0x15e20 +/* f077c2c: 0c005788 */ jal mtx00015e80 /* f077c30: 27a500ac */ addiu $a1,$sp,0xac /* f077c34: c60c00c0 */ lwc1 $f12,0xc0($s0) -/* f077c38: 0c00579f */ jal 0x15e7c +/* f077c38: 0c00579f */ jal mtx00015edc /* f077c3c: 27a500ac */ addiu $a1,$sp,0xac /* f077c40: 27a400ac */ addiu $a0,$sp,0xac -/* f077c44: 0c005750 */ jal 0x15d40 +/* f077c44: 0c005750 */ jal mtx4ToMtx3 /* f077c48: 2625001c */ addiu $a1,$s1,0x1c /* f077c4c: 3c013f80 */ lui $at,0x3f80 /* f077c50: 44816000 */ mtc1 $at,$f12 @@ -29800,10 +29800,10 @@ glabel var7f1ab110jf /* f077c9c: 8faf00fc */ lw $t7,0xfc($sp) /* f077ca0: afa90074 */ sw $t1,0x74($sp) .JF0f077ca4: -/* f077ca4: 0fc1a705 */ jal 0xf069c14 +/* f077ca4: 0fc1a705 */ jal objFindBboxRodata /* f077ca8: afa000fc */ sw $zero,0xfc($sp) /* f077cac: 00402025 */ move $a0,$v0 -/* f077cb0: 0fc19e9f */ jal 0xf067a7c +/* f077cb0: 0fc19e9f */ jal func0f06695c /* f077cb4: 8fa50074 */ lw $a1,0x74($sp) /* f077cb8: 3c03800a */ lui $v1,0x800a /* f077cbc: 8c63a668 */ lw $v1,-0x5998($v1) @@ -29839,7 +29839,7 @@ glabel var7f1ab110jf /* f077d30: 46021202 */ mul.s $f8,$f2,$f2 /* f077d34: 00000000 */ nop /* f077d38: 460e7182 */ mul.s $f6,$f14,$f14 -/* f077d3c: 0c012838 */ jal 0x4a0e0 +/* f077d3c: 0c012838 */ jal sqrtf /* f077d40: 46064300 */ add.s $f12,$f8,$f6 /* f077d44: 4600a03c */ c.lt.s $f20,$f0 /* f077d48: 3c017f1b */ lui $at,0x7f1b @@ -29903,12 +29903,12 @@ glabel var7f1ab110jf /* f077e14: e7a405cc */ swc1 $f4,0x5cc($sp) /* f077e18: c6480010 */ lwc1 $f8,0x10($s2) /* f077e1c: afa4006c */ sw $a0,0x6c($sp) -/* f077e20: 0fc19a31 */ jal 0xf0668c4 +/* f077e20: 0fc19a31 */ jal roomsCopy /* f077e24: e7a805d0 */ swc1 $f8,0x5d0($sp) /* f077e28: 02202025 */ move $a0,$s1 /* f077e2c: 27a505dc */ addiu $a1,$sp,0x5dc /* f077e30: 27a605e8 */ addiu $a2,$sp,0x5e8 -/* f077e34: 0fc1b925 */ jal 0xf06e494 +/* f077e34: 0fc1b925 */ jal func0f06d37c /* f077e38: 27a705f4 */ addiu $a3,$sp,0x5f4 /* f077e3c: 24180001 */ li $t8,0x1 /* f077e40: afb805d8 */ sw $t8,0x5d8($sp) @@ -29926,7 +29926,7 @@ glabel var7f1ab110jf /* f077e70: c6460010 */ lwc1 $f6,0x10($s2) /* f077e74: afa70074 */ sw $a3,0x74($sp) /* f077e78: afad0010 */ sw $t5,0x10($sp) -/* f077e7c: 0c00a7f8 */ jal 0x29fe0 +/* f077e7c: 0c00a7f8 */ jal cd0002a4d0 /* f077e80: e7a605b4 */ swc1 $f6,0x5b4($sp) /* f077e84: 00021c00 */ sll $v1,$v0,0x10 /* f077e88: 1840000b */ blez $v0,.JF0f077eb8 @@ -29937,7 +29937,7 @@ glabel var7f1ab110jf /* f077e9c: 27a505b8 */ addiu $a1,$sp,0x5b8 /* f077ea0: 27a605ac */ addiu $a2,$sp,0x5ac /* f077ea4: 24070021 */ li $a3,0x21 -/* f077ea8: 0c00b5aa */ jal 0x2d6a8 +/* f077ea8: 0c00b5aa */ jal cd0002db98 /* f077eac: a7aa00a2 */ sh $t2,0xa2($sp) /* f077eb0: 1040000b */ beqz $v0,.JF0f077ee0 /* f077eb4: 87a300a2 */ lh $v1,0xa2($sp) @@ -29947,7 +29947,7 @@ glabel var7f1ab110jf /* f077ec0: 26440008 */ addiu $a0,$s2,0x8 /* f077ec4: 8fa5006c */ lw $a1,0x6c($sp) /* f077ec8: 27a600a4 */ addiu $a2,$sp,0xa4 -/* f077ecc: 0c00a7d4 */ jal 0x29f50 +/* f077ecc: 0c00a7d4 */ jal cd0002a440 /* f077ed0: 8fa70074 */ lw $a3,0x74($sp) /* f077ed4: 00021c00 */ sll $v1,$v0,0x10 /* f077ed8: 00036403 */ sra $t4,$v1,0x10 @@ -29960,17 +29960,17 @@ glabel var7f1ab110jf /* f077ef0: 264e0008 */ addiu $t6,$s2,0x8 /* f077ef4: 02402025 */ move $a0,$s2 /* f077ef8: e6440010 */ swc1 $f4,0x10($s2) -/* f077efc: 0fc19b59 */ jal 0xf066d64 +/* f077efc: 0fc19b59 */ jal propDeregisterRooms /* f077f00: afae0070 */ sw $t6,0x70($sp) /* f077f04: 27a405b8 */ addiu $a0,$sp,0x5b8 -/* f077f08: 0fc19a31 */ jal 0xf0668c4 +/* f077f08: 0fc19a31 */ jal roomsCopy /* f077f0c: 8fa5006c */ lw $a1,0x6c($sp) /* f077f10: 27b90096 */ addiu $t9,$sp,0x96 /* f077f14: afb90010 */ sw $t9,0x10($sp) /* f077f18: 8fa40070 */ lw $a0,0x70($sp) /* f077f1c: 8fa5006c */ lw $a1,0x6c($sp) /* f077f20: 27a600a4 */ addiu $a2,$sp,0xa4 -/* f077f24: 0c00a7d4 */ jal 0x29f50 +/* f077f24: 0c00a7d4 */ jal cd0002a440 /* f077f28: 8fa70074 */ lw $a3,0x74($sp) /* f077f2c: 00021c00 */ sll $v1,$v0,0x10 /* f077f30: 00034c03 */ sra $t1,$v1,0x10 @@ -29980,7 +29980,7 @@ glabel var7f1ab110jf .JF0f077f40: /* f077f40: 18600010 */ blez $v1,.JF0f077f84 /* f077f44: c7a805cc */ lwc1 $f8,0x5cc($sp) -/* f077f48: 0fc1adce */ jal 0xf06b738 +/* f077f48: 0fc1adce */ jal func0f06a620 /* f077f4c: 02202025 */ move $a0,$s1 /* f077f50: c7a800a4 */ lwc1 $f8,0xa4($sp) /* f077f54: c7a60098 */ lwc1 $f6,0x98($sp) @@ -30026,14 +30026,14 @@ glabel var7f1ab110jf .JF0f077fec: /* f077fec: 51e0000b */ beqzl $t7,.JF0f07801c /* f077ff0: 8fae05d8 */ lw $t6,0x5d8($sp) -/* f077ff4: 0fc1af56 */ jal 0xf06bd58 +/* f077ff4: 0fc1af56 */ jal objEndFlight /* f077ff8: 02202025 */ move $a0,$s1 /* f077ffc: 922c0003 */ lbu $t4,0x3($s1) /* f078000: 24010008 */ li $at,0x8 /* f078004: 26450028 */ addiu $a1,$s2,0x28 /* f078008: 55810004 */ bnel $t4,$at,.JF0f07801c /* f07800c: 8fae05d8 */ lw $t6,0x5d8($sp) -/* f078010: 0fc25b5e */ jal 0xf096d78 +/* f078010: 0fc25b5e */ jal objectiveCheckMultiroomEntered /* f078014: 9224005c */ lbu $a0,0x5c($s1) /* f078018: 8fae05d8 */ lw $t6,0x5d8($sp) .JF0f07801c: @@ -30041,7 +30041,7 @@ glabel var7f1ab110jf /* f078020: 24050001 */ li $a1,0x1 /* f078024: 51c00004 */ beqzl $t6,.JF0f078038 /* f078028: 8fbf005c */ lw $ra,0x5c($sp) -/* f07802c: 0fc1ab62 */ jal 0xf06ad88 +/* f07802c: 0fc1ab62 */ jal func0f069c70 /* f078030: 24060001 */ li $a2,0x1 .JF0f078034: /* f078034: 8fbf005c */ lw $ra,0x5c($sp) @@ -52791,7 +52791,7 @@ glabel var7f1aa610 /* f07c4fc: c44400cc */ lwc1 $f4,0xcc($v0) /* f07c500: e7b00110 */ swc1 $f16,0x110($sp) /* f07c504: e7b0010c */ swc1 $f16,0x10c($sp) -/* f07c508: 0fc1ef9c */ jal 0xf07be70 +/* f07c508: 0fc1ef9c */ jal chopperGetTargetProp /* f07c50c: e7a400e0 */ swc1 $f4,0xe0($sp) /* f07c510: afa200dc */ sw $v0,0xdc($sp) /* f07c514: afa000d4 */ sw $zero,0xd4($sp) @@ -52809,7 +52809,7 @@ glabel var7f1aa610 /* f07c544: 8fa90114 */ lw $t1,0x114($sp) /* f07c548: 510000b2 */ beqzl $t0,.JF0f07c814 /* f07c54c: c60000d8 */ lwc1 $f0,0xd8($s0) -/* f07c550: 0c006a57 */ jal 0x1a95c +/* f07c550: 0c006a57 */ jal modelGetPartRodata /* f07c554: 8d240008 */ lw $a0,0x8($t1) /* f07c558: 8faa00dc */ lw $t2,0xdc($sp) /* f07c55c: afa200d0 */ sw $v0,0xd0($sp) @@ -52817,9 +52817,9 @@ glabel var7f1aa610 /* f07c564: 44814000 */ mtc1 $at,$f8 /* f07c568: c546000c */ lwc1 $f6,0xc($t2) /* f07c56c: 46083281 */ sub.s $f10,$f6,$f8 -/* f07c570: 0c004b60 */ jal 0x12d80 +/* f07c570: 0c004b60 */ jal random /* f07c574: e7aa004c */ swc1 $f10,0x4c($sp) -/* f07c578: 0c004b60 */ jal 0x12d80 +/* f07c578: 0c004b60 */ jal random /* f07c57c: afa2003c */ sw $v0,0x3c($sp) /* f07c580: 44802000 */ mtc1 $zero,$f4 /* f07c584: 04010005 */ bgez $zero,.JF0f07c59c @@ -52835,7 +52835,7 @@ glabel var7f1aa610 /* f07c5a8: 460a3102 */ mul.s $f4,$f6,$f10 /* f07c5ac: c5680000 */ lwc1 $f8,0x0($t3) /* f07c5b0: 46082180 */ add.s $f6,$f4,$f8 -/* f07c5b4: 0c004b60 */ jal 0x12d80 +/* f07c5b4: 0c004b60 */ jal random /* f07c5b8: e7a600f0 */ swc1 $f6,0xf0($sp) /* f07c5bc: 44805000 */ mtc1 $zero,$f10 /* f07c5c0: 8fa3011c */ lw $v1,0x11c($sp) @@ -52880,13 +52880,13 @@ glabel var7f1aa610 /* f07c658: e7a400f4 */ swc1 $f4,0xf4($sp) /* f07c65c: e7aa00f8 */ swc1 $f10,0xf8($sp) .JF0f07c660: -/* f07c660: 0c00573d */ jal 0x15cf4 +/* f07c660: 0c00573d */ jal mtx3ToMtx4 /* f07c664: 27a50050 */ addiu $a1,$sp,0x50 /* f07c668: 27a400f0 */ addiu $a0,$sp,0xf0 -/* f07c66c: 0c00599f */ jal 0x1667c +/* f07c66c: 0c00599f */ jal mtx4LoadTranslation /* f07c670: 27a50090 */ addiu $a1,$sp,0x90 /* f07c674: 27a40050 */ addiu $a0,$sp,0x50 -/* f07c678: 0c005667 */ jal 0x1599c +/* f07c678: 0c005667 */ jal mtx4MultMtx4InPlace /* f07c67c: 27a50090 */ addiu $a1,$sp,0x90 /* f07c680: 8fa30120 */ lw $v1,0x120($sp) /* f07c684: c7a400c0 */ lwc1 $f4,0xc0($sp) @@ -52907,7 +52907,7 @@ glabel var7f1aa610 /* f07c6c0: c44a0010 */ lwc1 $f10,0x10($v0) /* f07c6c4: c4440008 */ lwc1 $f4,0x8($v0) /* f07c6c8: 46085381 */ sub.s $f14,$f10,$f8 -/* f07c6cc: 0fc25d3c */ jal 0xf0974f0 +/* f07c6cc: 0fc25d3c */ jal atan2f /* f07c6d0: 46062301 */ sub.s $f12,$f4,$f6 /* f07c6d4: 44802000 */ mtc1 $zero,$f4 /* f07c6d8: 46000406 */ mov.s $f16,$f0 @@ -52955,12 +52955,12 @@ glabel var7f1aa610 /* f07c770: 46000102 */ mul.s $f4,$f0,$f0 /* f07c774: 00000000 */ sll $zero,$zero,0x0 /* f07c778: 46021182 */ mul.s $f6,$f2,$f2 -/* f07c77c: 0c012838 */ jal 0x4a0e0 +/* f07c77c: 0c012838 */ jal sqrtf /* f07c780: 46062300 */ add.s $f12,$f4,$f6 /* f07c784: c7aa004c */ lwc1 $f10,0x4c($sp) /* f07c788: c7a800f4 */ lwc1 $f8,0xf4($sp) /* f07c78c: 46000386 */ mov.s $f14,$f0 -/* f07c790: 0fc25d3c */ jal 0xf0974f0 +/* f07c790: 0fc25d3c */ jal atan2f /* f07c794: 46085301 */ sub.s $f12,$f10,$f8 /* f07c798: c6040080 */ lwc1 $f4,0x80($s0) /* f07c79c: 3c017f1b */ lui $at,0x7f1b @@ -53041,7 +53041,7 @@ glabel var7f1aa610 /* f07c8b4: e7a00010 */ swc1 $f0,0x10($sp) /* f07c8b8: e7a00030 */ swc1 $f0,0x30($sp) /* f07c8bc: e7ae0014 */ swc1 $f14,0x14($sp) -/* f07c8c0: 0fc1ba89 */ jal 0xf06ea24 +/* f07c8c0: 0fc1ba89 */ jal applySpeed /* f07c8c4: e7ae002c */ swc1 $f14,0x2c($sp) /* f07c8c8: c7b00110 */ lwc1 $f16,0x110($sp) /* f07c8cc: c7a800ec */ lwc1 $f8,0xec($sp) @@ -53076,7 +53076,7 @@ glabel var7f1aa610 /* f07c938: e7a00010 */ swc1 $f0,0x10($sp) /* f07c93c: e7ae0014 */ swc1 $f14,0x14($sp) /* f07c940: e7a00030 */ swc1 $f0,0x30($sp) -/* f07c944: 0fc1ba89 */ jal 0xf06ea24 +/* f07c944: 0fc1ba89 */ jal applySpeed /* f07c948: e7a2010c */ swc1 $f2,0x10c($sp) /* f07c94c: c7a2010c */ lwc1 $f2,0x10c($sp) /* f07c950: c7a800e8 */ lwc1 $f8,0xe8($sp) @@ -53122,11 +53122,11 @@ glabel var7f1aa610 /* f07c9e8: 8fa90114 */ lw $t1,0x114($sp) .JF0f07c9ec: /* f07c9ec: 24050003 */ addiu $a1,$zero,0x3 -/* f07c9f0: 0c006a2f */ jal 0x1a8bc +/* f07c9f0: 0c006a2f */ jal modelGetPart /* f07c9f4: 8d240008 */ lw $a0,0x8($t1) /* f07c9f8: 10400004 */ beqz $v0,.JF0f07ca0c /* f07c9fc: 00402825 */ or $a1,$v0,$zero -/* f07ca00: 0c006a6f */ jal 0x1a9bc +/* f07ca00: 0c006a6f */ jal modelGetNodeRwData /* f07ca04: 8fa40114 */ lw $a0,0x114($sp) /* f07ca08: afa200d4 */ sw $v0,0xd4($sp) .JF0f07ca0c: @@ -53141,21 +53141,21 @@ glabel var7f1aa610 /* f07ca2c: c608007c */ lwc1 $f8,0x7c($s0) /* f07ca30: c60600d0 */ lwc1 $f6,0xd0($s0) /* f07ca34: 46083300 */ add.s $f12,$f6,$f8 -/* f07ca38: 0c0068df */ jal 0x1a37c +/* f07ca38: 0c0068df */ jal sinf /* f07ca3c: e7ac0040 */ swc1 $f12,0x40($sp) /* f07ca40: e7a00038 */ swc1 $f0,0x38($sp) -/* f07ca44: 0c0068dc */ jal 0x1a370 +/* f07ca44: 0c0068dc */ jal cosf /* f07ca48: c7ac0044 */ lwc1 $f12,0x44($sp) /* f07ca4c: c7a40038 */ lwc1 $f4,0x38($sp) /* f07ca50: c7ac0044 */ lwc1 $f12,0x44($sp) /* f07ca54: 46040282 */ mul.s $f10,$f0,$f4 -/* f07ca58: 0c0068df */ jal 0x1a37c +/* f07ca58: 0c0068df */ jal sinf /* f07ca5c: e7aa00fc */ swc1 $f10,0xfc($sp) /* f07ca60: e7a00100 */ swc1 $f0,0x100($sp) -/* f07ca64: 0c0068dc */ jal 0x1a370 +/* f07ca64: 0c0068dc */ jal cosf /* f07ca68: c7ac0040 */ lwc1 $f12,0x40($sp) /* f07ca6c: e7a00038 */ swc1 $f0,0x38($sp) -/* f07ca70: 0c0068dc */ jal 0x1a370 +/* f07ca70: 0c0068dc */ jal cosf /* f07ca74: c7ac0044 */ lwc1 $f12,0x44($sp) /* f07ca78: c7a60038 */ lwc1 $f6,0x38($sp) /* f07ca7c: 8fac00dc */ lw $t4,0xdc($sp) @@ -53167,7 +53167,7 @@ glabel var7f1aa610 /* f07ca94: e7a80104 */ swc1 $f8,0x104($sp) /* f07ca98: 8e0500e0 */ lw $a1,0xe0($s0) /* f07ca9c: afab0010 */ sw $t3,0x10($sp) -/* f07caa0: 0fc24818 */ jal 0xf092060 +/* f07caa0: 0fc24818 */ jal projectileCreate /* f07caa4: afac0014 */ sw $t4,0x14($sp) /* f07caa8: 8fad00d4 */ lw $t5,0xd4($sp) /* f07caac: 240e0001 */ addiu $t6,$zero,0x1 @@ -58881,9 +58881,9 @@ glabel var7f1aa6e4 /* f07e2fc: 86180094 */ lh $t8,0x94($s0) /* f07e300: 07030036 */ bgezl $t8,.JF0f07e3dc /* f07e304: 860f0092 */ lh $t7,0x92($s0) -/* f07e308: 0fc1a6f2 */ jal 0xf069bc8 +/* f07e308: 0fc1a6f2 */ jal modelFindBboxRodata /* f07e30c: 8e040018 */ lw $a0,0x18($s0) -/* f07e310: 0fc19e37 */ jal 0xf0678dc +/* f07e310: 0fc19e37 */ jal modelBboxGetYMin /* f07e314: 00402025 */ move $a0,$v0 /* f07e318: 8fa40278 */ lw $a0,0x278($sp) /* f07e31c: 24050001 */ li $a1,0x1 @@ -58910,7 +58910,7 @@ glabel var7f1aa6e4 /* f07e370: c4860010 */ lwc1 $f6,0x10($a0) /* f07e374: 46005102 */ mul.s $f4,$f10,$f0 /* f07e378: 46062200 */ add.s $f8,$f4,$f6 -/* f07e37c: 0fc24d13 */ jal 0xf09344c +/* f07e37c: 0fc24d13 */ jal func0f0926bc /* f07e380: e7a801ec */ swc1 $f8,0x1ec($sp) /* f07e384: 8fa20278 */ lw $v0,0x278($sp) /* f07e388: 3c08800a */ lui $t0,0x800a @@ -58927,7 +58927,7 @@ glabel var7f1aa6e4 /* f07e3b4: 24450008 */ addiu $a1,$v0,0x8 /* f07e3b8: 24460028 */ addiu $a2,$v0,0x28 /* f07e3bc: afa80010 */ sw $t0,0x10($sp) -/* f07e3c0: 0fc4a8d5 */ jal 0xf12a354 +/* f07e3c0: 0fc4a8d5 */ jal explosionCreate /* f07e3c4: afab001c */ sw $t3,0x1c($sp) /* f07e3c8: 8e0d0040 */ lw $t5,0x40($s0) /* f07e3cc: 35ae0004 */ ori $t6,$t5,0x4 @@ -58974,14 +58974,14 @@ glabel var7f1aa6e4 /* f07e468: e7a00024 */ swc1 $f0,0x24($sp) /* f07e46c: e7a00030 */ swc1 $f0,0x30($sp) /* f07e470: e7a00034 */ swc1 $f0,0x34($sp) -/* f07e474: 0fc251de */ jal 0xf094778 +/* f07e474: 0fc251de */ jal func0f0939f8 /* f07e478: e7a00038 */ swc1 $f0,0x38($sp) /* f07e47c: 8fa50278 */ lw $a1,0x278($sp) /* f07e480: 00003825 */ move $a3,$zero /* f07e484: 84a40028 */ lh $a0,0x28($a1) /* f07e488: afa00014 */ sw $zero,0x14($sp) /* f07e48c: afa00010 */ sw $zero,0x10($sp) -/* f07e490: 0fc4bf7c */ jal 0xf12fdf0 +/* f07e490: 0fc4bf7c */ jal sparksCreate /* f07e494: 24a60008 */ addiu $a2,$a1,0x8 /* f07e498: 100002e0 */ b .JF0f07f01c /* f07e49c: 8fbf004c */ lw $ra,0x4c($sp) @@ -59021,7 +59021,7 @@ glabel var7f1aa6e4 /* f07e51c: 27a701b0 */ addiu $a3,$sp,0x1b0 /* f07e520: 25050028 */ addiu $a1,$t0,0x28 /* f07e524: afa50054 */ sw $a1,0x54($sp) -/* f07e528: 0fc19be5 */ jal 0xf066f94 +/* f07e528: 0fc19be5 */ jal func0f065e74 /* f07e52c: 25040008 */ addiu $a0,$t0,0x8 /* f07e530: 8fa40278 */ lw $a0,0x278($sp) /* f07e534: c7a801c0 */ lwc1 $f8,0x1c0($sp) @@ -59029,19 +59029,19 @@ glabel var7f1aa6e4 /* f07e53c: c7a401c4 */ lwc1 $f4,0x1c4($sp) /* f07e540: e484000c */ swc1 $f4,0xc($a0) /* f07e544: c7aa01c8 */ lwc1 $f10,0x1c8($sp) -/* f07e548: 0fc19b59 */ jal 0xf066d64 +/* f07e548: 0fc19b59 */ jal propDeregisterRooms /* f07e54c: e48a0010 */ swc1 $f10,0x10($a0) /* f07e550: 27a401b0 */ addiu $a0,$sp,0x1b0 -/* f07e554: 0fc19a31 */ jal 0xf0668c4 +/* f07e554: 0fc19a31 */ jal roomsCopy /* f07e558: 8fa50054 */ lw $a1,0x54($sp) /* f07e55c: 02002025 */ move $a0,$s0 /* f07e560: 00002825 */ move $a1,$zero -/* f07e564: 0fc1ab62 */ jal 0xf06ad88 +/* f07e564: 0fc1ab62 */ jal func0f069c70 /* f07e568: 24060001 */ li $a2,0x1 /* f07e56c: 100002ab */ b .JF0f07f01c /* f07e570: 8fbf004c */ lw $ra,0x4c($sp) .JF0f07e574: -/* f07e574: 0fc139d5 */ jal 0xf04e754 +/* f07e574: 0fc139d5 */ jal chraiExecute /* f07e578: afa201f8 */ sw $v0,0x1f8($sp) /* f07e57c: afa00274 */ sw $zero,0x274($sp) /* f07e580: 8e020088 */ lw $v0,0x88($s0) @@ -59053,7 +59053,7 @@ glabel var7f1aa6e4 /* f07e598: 27a60220 */ addiu $a2,$sp,0x220 /* f07e59c: 000a5880 */ sll $t3,$t2,0x2 /* f07e5a0: 012b1821 */ addu $v1,$t1,$t3 -/* f07e5a4: 0fc45798 */ jal 0xf115e60 +/* f07e5a4: 0fc45798 */ jal padUnpack /* f07e5a8: 8c640000 */ lw $a0,0x0($v1) /* f07e5ac: 8fac01f8 */ lw $t4,0x1f8($sp) /* f07e5b0: c7a60220 */ lwc1 $f6,0x220($sp) @@ -59068,7 +59068,7 @@ glabel var7f1aa6e4 /* f07e5d4: 27a60210 */ addiu $a2,$sp,0x210 /* f07e5d8: 00003825 */ move $a3,$zero /* f07e5dc: afa00010 */ sw $zero,0x10($sp) -/* f07e5e0: 0c00a790 */ jal 0x29e40 +/* f07e5e0: 0c00a790 */ jal cdFindGroundYSimple /* f07e5e4: a7ad0210 */ sh $t5,0x210($sp) /* f07e5e8: 3c01420c */ lui $at,0x420c /* f07e5ec: 44814000 */ mtc1 $at,$f8 @@ -59089,11 +59089,11 @@ glabel var7f1aa6e4 /* f07e620: 000fc080 */ sll $t8,$t7,0x2 /* f07e624: 07030011 */ bgezl $t8,.JF0f07e66c /* f07e628: 8fa20278 */ lw $v0,0x278($sp) -/* f07e62c: 0fc11645 */ jal 0xf045914 +/* f07e62c: 0fc11645 */ jal posIsArrivingLaterallyAtPos /* f07e630: 8fa701f4 */ lw $a3,0x1f4($sp) /* f07e634: 5040000d */ beqzl $v0,.JF0f07e66c /* f07e638: 8fa20278 */ lw $v0,0x278($sp) -/* f07e63c: 0fc1ce23 */ jal 0xf07388c +/* f07e63c: 0fc1ce23 */ jal hovercarIncrementStep /* f07e640: 02002025 */ move $a0,$s0 /* f07e644: 8e190088 */ lw $t9,0x88($s0) /* f07e648: 8e0a008c */ lw $t2,0x8c($s0) @@ -59102,7 +59102,7 @@ glabel var7f1aa6e4 /* f07e654: 000a4880 */ sll $t1,$t2,0x2 /* f07e658: 27a60220 */ addiu $a2,$sp,0x220 /* f07e65c: 01091821 */ addu $v1,$t0,$t1 -/* f07e660: 0fc45798 */ jal 0xf115e60 +/* f07e660: 0fc45798 */ jal padUnpack /* f07e664: 8c640000 */ lw $a0,0x0($v1) /* f07e668: 8fa20278 */ lw $v0,0x278($sp) .JF0f07e66c: @@ -59111,7 +59111,7 @@ glabel var7f1aa6e4 /* f07e674: c4440008 */ lwc1 $f4,0x8($v0) /* f07e678: c4460010 */ lwc1 $f6,0x10($v0) /* f07e67c: 46044301 */ sub.s $f12,$f8,$f4 -/* f07e680: 0fc25d3c */ jal 0xf0974f0 +/* f07e680: 0fc25d3c */ jal atan2f /* f07e684: 46065381 */ sub.s $f14,$f10,$f6 /* f07e688: 8fa20278 */ lw $v0,0x278($sp) /* f07e68c: e7a00200 */ swc1 $f0,0x200($sp) @@ -59124,13 +59124,13 @@ glabel var7f1aa6e4 /* f07e6a8: 46021202 */ mul.s $f8,$f2,$f2 /* f07e6ac: 00000000 */ nop /* f07e6b0: 460e7102 */ mul.s $f4,$f14,$f14 -/* f07e6b4: 0c012838 */ jal 0x4a0e0 +/* f07e6b4: 0c012838 */ jal sqrtf /* f07e6b8: 46044300 */ add.s $f12,$f8,$f4 /* f07e6bc: 8fab0278 */ lw $t3,0x278($sp) /* f07e6c0: c7aa0218 */ lwc1 $f10,0x218($sp) /* f07e6c4: 46000386 */ mov.s $f14,$f0 /* f07e6c8: c566000c */ lwc1 $f6,0xc($t3) -/* f07e6cc: 0fc25d3c */ jal 0xf0974f0 +/* f07e6cc: 0fc25d3c */ jal atan2f /* f07e6d0: 46065301 */ sub.s $f12,$f10,$f6 /* f07e6d4: e7a001fc */ swc1 $f0,0x1fc($sp) /* f07e6d8: 8e0c0008 */ lw $t4,0x8($s0) @@ -59162,11 +59162,11 @@ glabel var7f1aa6e4 /* f07e738: 24075000 */ li $a3,0x5000 /* f07e73c: afa00010 */ sw $zero,0x10($sp) /* f07e740: e7a00014 */ swc1 $f0,0x14($sp) -/* f07e744: 0c00b4b4 */ jal 0x2d2d0 +/* f07e744: 0c00b4b4 */ jal cd0002d7c0 /* f07e748: e7a00018 */ swc1 $f0,0x18($sp) /* f07e74c: 54400005 */ bnezl $v0,.JF0f07e764 /* f07e750: 8fa301f0 */ lw $v1,0x1f0($sp) -/* f07e754: 0c009270 */ jal 0x249c0 +/* f07e754: 0c009270 */ jal cdGetObstacle /* f07e758: 00000000 */ nop /* f07e75c: afa201f0 */ sw $v0,0x1f0($sp) /* f07e760: 8fa301f0 */ lw $v1,0x1f0($sp) @@ -59193,10 +59193,10 @@ glabel var7f1aa6e4 /* f07e7b0: 00000000 */ nop /* f07e7b4: 45000007 */ bc1f .JF0f07e7d4 /* f07e7b8: 00000000 */ nop -/* f07e7bc: 0fc24391 */ jal 0xf090e44 +/* f07e7bc: 0fc24391 */ jal doorsChooseSwingDirection /* f07e7c0: e7ac0058 */ swc1 $f12,0x58($sp) /* f07e7c4: 8fa401a0 */ lw $a0,0x1a0($sp) -/* f07e7c8: 0fc23c83 */ jal 0xf08f20c +/* f07e7c8: 0fc23c83 */ jal doorsRequestMode /* f07e7cc: 24050001 */ li $a1,0x1 /* f07e7d0: c7ac0058 */ lwc1 $f12,0x58($sp) .JF0f07e7d4: @@ -59206,7 +59206,7 @@ glabel var7f1aa6e4 /* f07e7e0: 00000000 */ nop /* f07e7e4: 45000005 */ bc1f .JF0f07e7fc /* f07e7e8: 00000000 */ nop -/* f07e7ec: 0fc23cba */ jal 0xf08f2e8 +/* f07e7ec: 0fc23cba */ jal doorIsOpen /* f07e7f0: 8fa401a0 */ lw $a0,0x1a0($sp) /* f07e7f4: 2c480001 */ sltiu $t0,$v0,0x1 /* f07e7f8: afa80274 */ sw $t0,0x274($sp) @@ -59219,7 +59219,7 @@ glabel var7f1aa6e4 /* f07e80c: 05630016 */ bgezl $t3,.JF0f07e868 /* f07e810: 44807000 */ mtc1 $zero,$f14 /* f07e814: c60c0034 */ lwc1 $f12,0x34($s0) -/* f07e818: 0fc25d3c */ jal 0xf0974f0 +/* f07e818: 0fc25d3c */ jal atan2f /* f07e81c: c60e003c */ lwc1 $f14,0x3c($s0) /* f07e820: c6020034 */ lwc1 $f2,0x34($s0) /* f07e824: c60e003c */ lwc1 $f14,0x3c($s0) @@ -59227,10 +59227,10 @@ glabel var7f1aa6e4 /* f07e82c: 46021282 */ mul.s $f10,$f2,$f2 /* f07e830: 00000000 */ nop /* f07e834: 460e7182 */ mul.s $f6,$f14,$f14 -/* f07e838: 0c012838 */ jal 0x4a0e0 +/* f07e838: 0c012838 */ jal sqrtf /* f07e83c: 46065300 */ add.s $f12,$f10,$f6 /* f07e840: c60c0038 */ lwc1 $f12,0x38($s0) -/* f07e844: 0fc25d3c */ jal 0xf0974f0 +/* f07e844: 0fc25d3c */ jal atan2f /* f07e848: 46000386 */ mov.s $f14,$f0 /* f07e84c: 8e0c0008 */ lw $t4,0x8($s0) /* f07e850: 3c01dfff */ lui $at,0xdfff @@ -59350,21 +59350,21 @@ glabel var7f1aa6e4 /* f07e9f8: e7aa0180 */ swc1 $f10,0x180($sp) /* f07e9fc: c60c007c */ lwc1 $f12,0x7c($s0) /* f07ea00: afb90054 */ sw $t9,0x54($sp) -/* f07ea04: 0c0068df */ jal 0x1a37c +/* f07ea04: 0c0068df */ jal sinf /* f07ea08: afb80058 */ sw $t8,0x58($sp) /* f07ea0c: c60c0080 */ lwc1 $f12,0x80($s0) -/* f07ea10: 0c0068dc */ jal 0x1a370 +/* f07ea10: 0c0068dc */ jal cosf /* f07ea14: e7a00068 */ swc1 $f0,0x68($sp) /* f07ea18: c7a20068 */ lwc1 $f2,0x68($sp) /* f07ea1c: 46020182 */ mul.s $f6,$f0,$f2 /* f07ea20: e7a60194 */ swc1 $f6,0x194($sp) -/* f07ea24: 0c0068df */ jal 0x1a37c +/* f07ea24: 0c0068df */ jal sinf /* f07ea28: c60c0080 */ lwc1 $f12,0x80($s0) /* f07ea2c: e7a00198 */ swc1 $f0,0x198($sp) -/* f07ea30: 0c0068dc */ jal 0x1a370 +/* f07ea30: 0c0068dc */ jal cosf /* f07ea34: c60c007c */ lwc1 $f12,0x7c($s0) /* f07ea38: c60c0080 */ lwc1 $f12,0x80($s0) -/* f07ea3c: 0c0068dc */ jal 0x1a370 +/* f07ea3c: 0c0068dc */ jal cosf /* f07ea40: e7a00068 */ swc1 $f0,0x68($sp) /* f07ea44: c7a20068 */ lwc1 $f2,0x68($sp) /* f07ea48: 8fa40058 */ lw $a0,0x58($sp) @@ -59372,7 +59372,7 @@ glabel var7f1aa6e4 /* f07ea50: 46020202 */ mul.s $f8,$f0,$f2 /* f07ea54: 27a60214 */ addiu $a2,$sp,0x214 /* f07ea58: 8fa701f4 */ lw $a3,0x1f4($sp) -/* f07ea5c: 0fc115fe */ jal 0xf0457f8 +/* f07ea5c: 0fc115fe */ jal posIsMovingTowardsPosOrStoppedInRange /* f07ea60: e7a8019c */ swc1 $f8,0x19c($sp) /* f07ea64: 50400006 */ beqzl $v0,.JF0f07ea80 /* f07ea68: 8fa201f8 */ lw $v0,0x1f8($sp) @@ -59425,7 +59425,7 @@ glabel var7f1aa6e4 /* f07eb08: 44073000 */ mfc1 $a3,$f6 /* f07eb0c: 46000200 */ add.s $f8,$f0,$f0 /* f07eb10: e7aa0014 */ swc1 $f10,0x14($sp) -/* f07eb14: 0fc1bb06 */ jal 0xf06ec18 +/* f07eb14: 0fc1bb06 */ jal applyRotation /* f07eb18: e7a80010 */ swc1 $f8,0x10($sp) /* f07eb1c: c7a60190 */ lwc1 $f6,0x190($sp) /* f07eb20: c7a80200 */ lwc1 $f8,0x200($sp) @@ -59511,7 +59511,7 @@ glabel var7f1aa6e4 /* f07ec34: e7a80010 */ swc1 $f8,0x10($sp) /* f07ec38: 8fa501fc */ lw $a1,0x1fc($sp) /* f07ec3c: 27a60180 */ addiu $a2,$sp,0x180 -/* f07ec40: 0fc1bb06 */ jal 0xf06ec18 +/* f07ec40: 0fc1bb06 */ jal applyRotation /* f07ec44: e7aa0014 */ swc1 $f10,0x14($sp) /* f07ec48: c7a6018c */ lwc1 $f6,0x18c($sp) /* f07ec4c: c7a801fc */ lwc1 $f8,0x1fc($sp) @@ -59599,7 +59599,7 @@ glabel var7f1aa6e4 /* f07ed70: 45000006 */ bc1f .JF0f07ed8c /* f07ed74: 00000000 */ nop /* f07ed78: 46004306 */ mov.s $f12,$f8 -/* f07ed7c: 0c0058e8 */ jal 0x163a0 +/* f07ed7c: 0c0058e8 */ jal mtx4LoadZRotation /* f07ed80: 27a5006c */ addiu $a1,$sp,0x6c /* f07ed84: 10000008 */ b .JF0f07eda8 /* f07ed88: 27a4012c */ addiu $a0,$sp,0x12c @@ -59608,46 +59608,46 @@ glabel var7f1aa6e4 /* f07ed90: c424b41c */ lwc1 $f4,-0x4be4($at) /* f07ed94: c7aa0188 */ lwc1 $f10,0x188($sp) /* f07ed98: 27a5006c */ addiu $a1,$sp,0x6c -/* f07ed9c: 0c0058e8 */ jal 0x163a0 +/* f07ed9c: 0c0058e8 */ jal mtx4LoadZRotation /* f07eda0: 46045300 */ add.s $f12,$f10,$f4 /* f07eda4: 27a4012c */ addiu $a0,$sp,0x12c .JF0f07eda8: -/* f07eda8: 0c00590b */ jal 0x1642c +/* f07eda8: 0c00590b */ jal mtx4LoadRotation /* f07edac: 27a500ac */ addiu $a1,$sp,0xac /* f07edb0: 8e0d0018 */ lw $t5,0x18($s0) /* f07edb4: 27a500ac */ addiu $a1,$sp,0xac -/* f07edb8: 0c0057a9 */ jal 0x15ea4 +/* f07edb8: 0c0057a9 */ jal mtx00015f04 /* f07edbc: c5ac0014 */ lwc1 $f12,0x14($t5) /* f07edc0: 27a400ac */ addiu $a0,$sp,0xac /* f07edc4: 27a5006c */ addiu $a1,$sp,0x6c -/* f07edc8: 0c005668 */ jal 0x159a0 +/* f07edc8: 0c005668 */ jal mtx4MultMtx4 /* f07edcc: 27a600ec */ addiu $a2,$sp,0xec /* f07edd0: 27a400ec */ addiu $a0,$sp,0xec -/* f07edd4: 0c005750 */ jal 0x15d40 +/* f07edd4: 0c005750 */ jal mtx4ToMtx3 /* f07edd8: 27a5015c */ addiu $a1,$sp,0x15c /* f07eddc: 27a4015c */ addiu $a0,$sp,0x15c -/* f07ede0: 0c00571e */ jal 0x15c78 +/* f07ede0: 0c00571e */ jal mtx3Copy /* f07ede4: 2605001c */ addiu $a1,$s0,0x1c -/* f07ede8: 0c0068dc */ jal 0x1a370 +/* f07ede8: 0c0068dc */ jal cosf /* f07edec: c7ac018c */ lwc1 $f12,0x18c($sp) /* f07edf0: e7a00138 */ swc1 $f0,0x138($sp) -/* f07edf4: 0c0068df */ jal 0x1a37c +/* f07edf4: 0c0068df */ jal sinf /* f07edf8: c7ac0190 */ lwc1 $f12,0x190($sp) /* f07edfc: c7a60138 */ lwc1 $f6,0x138($sp) /* f07ee00: 8fae01f8 */ lw $t6,0x1f8($sp) /* f07ee04: 46060202 */ mul.s $f8,$f0,$f6 /* f07ee08: 11c00005 */ beqz $t6,.JF0f07ee20 /* f07ee0c: e7a80194 */ swc1 $f8,0x194($sp) -/* f07ee10: 0c0068df */ jal 0x1a37c +/* f07ee10: 0c0068df */ jal sinf /* f07ee14: c7ac01fc */ lwc1 $f12,0x1fc($sp) /* f07ee18: 10000004 */ b .JF0f07ee2c /* f07ee1c: e7a00198 */ swc1 $f0,0x198($sp) .JF0f07ee20: -/* f07ee20: 0c0068df */ jal 0x1a37c +/* f07ee20: 0c0068df */ jal sinf /* f07ee24: c7ac018c */ lwc1 $f12,0x18c($sp) /* f07ee28: e7a00198 */ swc1 $f0,0x198($sp) .JF0f07ee2c: -/* f07ee2c: 0c0068dc */ jal 0x1a370 +/* f07ee2c: 0c0068dc */ jal cosf /* f07ee30: c7ac0190 */ lwc1 $f12,0x190($sp) /* f07ee34: c7aa0138 */ lwc1 $f10,0x138($sp) /* f07ee38: 3c01800a */ lui $at,0x800a @@ -59679,7 +59679,7 @@ glabel var7f1aa6e4 /* f07eea0: c5e60010 */ lwc1 $f6,0x10($t7) /* f07eea4: 46044282 */ mul.s $f10,$f8,$f4 /* f07eea8: 46065200 */ add.s $f8,$f10,$f6 -/* f07eeac: 0fc19be5 */ jal 0xf066f94 +/* f07eeac: 0fc19be5 */ jal func0f065e74 /* f07eeb0: e7a80158 */ swc1 $f8,0x158($sp) /* f07eeb4: 8fb801f8 */ lw $t8,0x1f8($sp) /* f07eeb8: 27a40150 */ addiu $a0,$sp,0x150 @@ -59687,7 +59687,7 @@ glabel var7f1aa6e4 /* f07eec0: 13000017 */ beqz $t8,.JF0f07ef20 /* f07eec4: 27a60140 */ addiu $a2,$sp,0x140 /* f07eec8: 00003825 */ move $a3,$zero -/* f07eecc: 0c00a790 */ jal 0x29e40 +/* f07eecc: 0c00a790 */ jal cdFindGroundYSimple /* f07eed0: afa00010 */ sw $zero,0x10($sp) /* f07eed4: 3c01420c */ lui $at,0x420c /* f07eed8: 44812000 */ mtc1 $at,$f4 @@ -59716,10 +59716,10 @@ glabel var7f1aa6e4 /* f07ef2c: c7a60154 */ lwc1 $f6,0x154($sp) /* f07ef30: e486000c */ swc1 $f6,0xc($a0) /* f07ef34: c7a80158 */ lwc1 $f8,0x158($sp) -/* f07ef38: 0fc19b59 */ jal 0xf066d64 +/* f07ef38: 0fc19b59 */ jal propDeregisterRooms /* f07ef3c: e4880010 */ swc1 $f8,0x10($a0) /* f07ef40: 27a40140 */ addiu $a0,$sp,0x140 -/* f07ef44: 0fc19a31 */ jal 0xf0668c4 +/* f07ef44: 0fc19a31 */ jal roomsCopy /* f07ef48: 8fa50054 */ lw $a1,0x54($sp) /* f07ef4c: c7aa0190 */ lwc1 $f10,0x190($sp) /* f07ef50: 8e020088 */ lw $v0,0x88($s0) @@ -59748,11 +59748,11 @@ glabel var7f1aa6e4 /* f07efac: 46062202 */ mul.s $f8,$f4,$f6 /* f07efb0: 27a60214 */ addiu $a2,$sp,0x214 /* f07efb4: 44074000 */ mfc1 $a3,$f8 -/* f07efb8: 0fc11645 */ jal 0xf045914 +/* f07efb8: 0fc11645 */ jal posIsArrivingLaterallyAtPos /* f07efbc: 00000000 */ nop /* f07efc0: 50400012 */ beqzl $v0,.JF0f07f00c /* f07efc4: 02002025 */ move $a0,$s0 -/* f07efc8: 0fc1ce23 */ jal 0xf07388c +/* f07efc8: 0fc1ce23 */ jal hovercarIncrementStep /* f07efcc: 02002025 */ move $a0,$s0 /* f07efd0: 1000000e */ b .JF0f07f00c /* f07efd4: 02002025 */ move $a0,$s0 @@ -59763,17 +59763,17 @@ glabel var7f1aa6e4 /* f07efe4: 46045182 */ mul.s $f6,$f10,$f4 /* f07efe8: 27a60214 */ addiu $a2,$sp,0x214 /* f07efec: 44073000 */ mfc1 $a3,$f6 -/* f07eff0: 0fc11645 */ jal 0xf045914 +/* f07eff0: 0fc11645 */ jal posIsArrivingLaterallyAtPos /* f07eff4: 00000000 */ nop /* f07eff8: 50400004 */ beqzl $v0,.JF0f07f00c /* f07effc: 02002025 */ move $a0,$s0 -/* f07f000: 0fc1ce23 */ jal 0xf07388c +/* f07f000: 0fc1ce23 */ jal hovercarIncrementStep /* f07f004: 02002025 */ move $a0,$s0 .JF0f07f008: /* f07f008: 02002025 */ move $a0,$s0 .JF0f07f00c: /* f07f00c: 00002825 */ move $a1,$zero -/* f07f010: 0fc1ab62 */ jal 0xf06ad88 +/* f07f010: 0fc1ab62 */ jal func0f069c70 /* f07f014: 24060001 */ li $a2,0x1 .JF0f07f018: /* f07f018: 8fbf004c */ lw $ra,0x4c($sp) @@ -73731,7 +73731,7 @@ glabel var7f1ab890jf /* f088784: a7a80098 */ sh $t0,0x98($sp) /* f088788: afa600b0 */ sw $a2,0xb0($sp) /* f08878c: 8fa500bc */ lw $a1,0xbc($sp) -/* f088790: 0fc221bc */ jal 0xf0886f0 +/* f088790: 0fc221bc */ jal func0f087888pf /* f088794: 8fa400ac */ lw $a0,0xac($sp) /* f088798: 8fa600b0 */ lw $a2,0xb0($sp) /* f08879c: 97a80098 */ lhu $t0,0x98($sp) @@ -73902,27 +73902,27 @@ glabel var7f1ab890jf /* f0889dc: 00000000 */ nop /* f0889e0: 01002025 */ move $a0,$t0 /* f0889e4: afa60020 */ sw $a2,0x20($sp) -/* f0889e8: 0fc5baa5 */ jal 0xf16ea94 +/* f0889e8: 0fc5baa5 */ jal langGet /* f0889ec: afa90094 */ sw $t1,0x94($sp) /* f0889f0: 8fa40020 */ lw $a0,0x20($sp) -/* f0889f4: 0fc5baa5 */ jal 0xf16ea94 +/* f0889f4: 0fc5baa5 */ jal langGet /* f0889f8: afa20024 */ sw $v0,0x24($sp) /* f0889fc: 3c057f1b */ lui $a1,0x7f1b /* f088a00: 24a5ad98 */ addiu $a1,$a1,-21096 /* f088a04: 27a4002c */ addiu $a0,$sp,0x2c /* f088a08: 8fa60024 */ lw $a2,0x24($sp) -/* f088a0c: 0c004d95 */ jal 0x13654 +/* f088a0c: 0c004d95 */ jal sprintf /* f088a10: 00403825 */ move $a3,$v0 /* f088a14: 8fa90094 */ lw $t1,0x94($sp) /* f088a18: 1000000a */ b .JF0f088a44 /* f088a1c: 8faa00b4 */ lw $t2,0xb4($sp) .JF0f088a20: -/* f088a20: 0fc5baa5 */ jal 0xf16ea94 +/* f088a20: 0fc5baa5 */ jal langGet /* f088a24: afa90094 */ sw $t1,0x94($sp) /* f088a28: 3c057f1b */ lui $a1,0x7f1b /* f088a2c: 24a5ada0 */ addiu $a1,$a1,-21088 /* f088a30: 27a4002c */ addiu $a0,$sp,0x2c -/* f088a34: 0c004d95 */ jal 0x13654 +/* f088a34: 0c004d95 */ jal sprintf /* f088a38: 00403025 */ move $a2,$v0 /* f088a3c: 8fa90094 */ lw $t1,0x94($sp) /* f088a40: 8faa00b4 */ lw $t2,0xb4($sp) @@ -73948,30 +73948,30 @@ glabel var7f1ab890jf /* f088a80: 8fac00b8 */ lw $t4,0xb8($sp) /* f088a84: 1180000b */ beqz $t4,.JF0f088ab4 /* f088a88: 00000000 */ nop -/* f088a8c: 0fc5baa5 */ jal 0xf16ea94 +/* f088a8c: 0fc5baa5 */ jal langGet /* f088a90: 24045208 */ li $a0,0x5208 /* f088a94: 3c057f1b */ lui $a1,0x7f1b /* f088a98: 24a5ada4 */ addiu $a1,$a1,-21084 /* f088a9c: 8fa400a8 */ lw $a0,0xa8($sp) /* f088aa0: 00403025 */ move $a2,$v0 -/* f088aa4: 0c004d95 */ jal 0x13654 +/* f088aa4: 0c004d95 */ jal sprintf /* f088aa8: 27a7002c */ addiu $a3,$sp,0x2c /* f088aac: 1000000f */ b .JF0f088aec /* f088ab0: 8fbf0014 */ lw $ra,0x14($sp) .JF0f088ab4: /* f088ab4: 15400009 */ bnez $t2,.JF0f088adc /* f088ab8: 8fa400a8 */ lw $a0,0xa8($sp) -/* f088abc: 0fc5baa5 */ jal 0xf16ea94 +/* f088abc: 0fc5baa5 */ jal langGet /* f088ac0: 25245200 */ addiu $a0,$t1,0x5200 /* f088ac4: 8fa400a8 */ lw $a0,0xa8($sp) /* f088ac8: 00402825 */ move $a1,$v0 -/* f088acc: 0c004d95 */ jal 0x13654 +/* f088acc: 0c004d95 */ jal sprintf /* f088ad0: 27a6002c */ addiu $a2,$sp,0x2c /* f088ad4: 10000005 */ b .JF0f088aec /* f088ad8: 8fbf0014 */ lw $ra,0x14($sp) .JF0f088adc: /* f088adc: 3c057f1b */ lui $a1,0x7f1b -/* f088ae0: 0c004d95 */ jal 0x13654 +/* f088ae0: 0c004d95 */ jal sprintf /* f088ae4: 24a5adac */ addiu $a1,$a1,-21076 .JF0f088ae8: /* f088ae8: 8fbf0014 */ lw $ra,0x14($sp) diff --git a/src/game/title.c b/src/game/title.c index fe6bf7395..7544d0746 100644 --- a/src/game/title.c +++ b/src/game/title.c @@ -577,13 +577,13 @@ glabel var7f1a84fcjf /* f0167b0: 8d8c2664 */ lw $t4,0x2664($t4) /* f0167b4: 518001c9 */ beqzl $t4,.JF0f016edc /* f0167b8: 8fbf005c */ lw $ra,0x5c($sp) -/* f0167bc: 0fc07058 */ jal 0xf01c160 +/* f0167bc: 0fc07058 */ jal func0f01afc0 /* f0167c0: 8fa40130 */ lw $a0,0x130($sp) /* f0167c4: afa20130 */ sw $v0,0x130($sp) -/* f0167c8: 0fc35617 */ jal 0xf0d585c +/* f0167c8: 0fc35617 */ jal func0f0d479c /* f0167cc: 00402025 */ move $a0,$v0 /* f0167d0: afa20130 */ sw $v0,0x130($sp) -/* f0167d4: 0fc54b55 */ jal 0xf152d54 +/* f0167d4: 0fc54b55 */ jal func0f153628 /* f0167d8: 00402025 */ move $a0,$v0 /* f0167dc: 3c0d8006 */ lui $t5,0x8006 /* f0167e0: 3c128006 */ lui $s2,0x8006 @@ -660,9 +660,9 @@ glabel var7f1a84fcjf /* f0168e8: 24010003 */ li $at,0x3 /* f0168ec: 54410016 */ bnel $v0,$at,.JF0f016948 /* f0168f0: 24010004 */ li $at,0x4 -/* f0168f4: 0fc54bb7 */ jal 0xf152edc +/* f0168f4: 0fc54bb7 */ jal func0f153780 /* f0168f8: 8fa40130 */ lw $a0,0x130($sp) -/* f0168fc: 0c002eeb */ jal 0xbbac +/* f0168fc: 0c002eeb */ jal viGetWidth /* f016900: afa20130 */ sw $v0,0x130($sp) /* f016904: 86430002 */ lh $v1,0x2($s2) /* f016908: 3c0c7f7f */ lui $t4,0x7f7f @@ -673,10 +673,10 @@ glabel var7f1a84fcjf /* f01691c: afac0014 */ sw $t4,0x14($sp) /* f016920: 8fa40130 */ lw $a0,0x130($sp) /* f016924: 00403825 */ move $a3,$v0 -/* f016928: 0fc54c68 */ jal 0xf1531a0 +/* f016928: 0fc54c68 */ jal func0f153a34 /* f01692c: 2466ffff */ addiu $a2,$v1,-1 /* f016930: afa20130 */ sw $v0,0x130($sp) -/* f016934: 0fc54b55 */ jal 0xf152d54 +/* f016934: 0fc54b55 */ jal func0f153628 /* f016938: 00402025 */ move $a0,$v0 /* f01693c: 1000015e */ b .JF0f016eb8 /* f016940: afa20130 */ sw $v0,0x130($sp) @@ -684,7 +684,7 @@ glabel var7f1a84fcjf .JF0f016948: /* f016948: 54410075 */ bnel $v0,$at,.JF0f016b20 /* f01694c: 24010007 */ li $at,0x7 -/* f016950: 0fc54bb7 */ jal 0xf152edc +/* f016950: 0fc54bb7 */ jal func0f153780 /* f016954: 8fa40130 */ lw $a0,0x130($sp) /* f016958: 244d0008 */ addiu $t5,$v0,0x8 /* f01695c: afad0130 */ sw $t5,0x130($sp) @@ -730,7 +730,7 @@ glabel var7f1a84fcjf /* f0169fc: 27a40130 */ addiu $a0,$sp,0x130 /* f016a00: 24060001 */ li $a2,0x1 /* f016a04: 00003825 */ move $a3,$zero -/* f016a08: 0fc2d290 */ jal 0xf0b4a40 +/* f016a08: 0fc2d290 */ jal func0f0b39c0 /* f016a0c: 24a50234 */ addiu $a1,$a1,0x234 /* f016a10: 8fab0130 */ lw $t3,0x130($sp) /* f016a14: 3c0eba00 */ lui $t6,0xba00 @@ -795,7 +795,7 @@ glabel var7f1a84fcjf /* f016b00: 3c0eb300 */ lui $t6,0xb300 /* f016b04: af0e0000 */ sw $t6,0x0($t8) /* f016b08: af0d0004 */ sw $t5,0x4($t8) -/* f016b0c: 0fc54b55 */ jal 0xf152d54 +/* f016b0c: 0fc54b55 */ jal func0f153628 /* f016b10: 8fa40130 */ lw $a0,0x130($sp) /* f016b14: 100000e8 */ b .JF0f016eb8 /* f016b18: afa20130 */ sw $v0,0x130($sp) @@ -803,7 +803,7 @@ glabel var7f1a84fcjf .JF0f016b20: /* f016b20: 54410075 */ bnel $v0,$at,.JF0f016cf8 /* f016b24: 86430000 */ lh $v1,0x0($s2) -/* f016b28: 0fc54bb7 */ jal 0xf152edc +/* f016b28: 0fc54bb7 */ jal func0f153780 /* f016b2c: 8fa40130 */ lw $a0,0x130($sp) /* f016b30: 24590008 */ addiu $t9,$v0,0x8 /* f016b34: afb90130 */ sw $t9,0x130($sp) @@ -849,7 +849,7 @@ glabel var7f1a84fcjf /* f016bd4: 27a40130 */ addiu $a0,$sp,0x130 /* f016bd8: 24060001 */ li $a2,0x1 /* f016bdc: 00003825 */ move $a3,$zero -/* f016be0: 0fc2d290 */ jal 0xf0b4a40 +/* f016be0: 0fc2d290 */ jal func0f0b39c0 /* f016be4: 24a5024c */ addiu $a1,$a1,0x24c /* f016be8: 8fb80130 */ lw $t8,0x130($sp) /* f016bec: 3c0eba00 */ lui $t6,0xba00 @@ -914,7 +914,7 @@ glabel var7f1a84fcjf /* f016cd8: 3c0eb300 */ lui $t6,0xb300 /* f016cdc: ad6e0000 */ sw $t6,0x0($t3) /* f016ce0: ad790004 */ sw $t9,0x4($t3) -/* f016ce4: 0fc54b55 */ jal 0xf152d54 +/* f016ce4: 0fc54b55 */ jal func0f153628 /* f016ce8: 8fa40130 */ lw $a0,0x130($sp) /* f016cec: 10000072 */ b .JF0f016eb8 /* f016cf0: afa20130 */ sw $v0,0x130($sp) @@ -949,13 +949,13 @@ glabel var7f1a84fcjf /* f016d58: 25d90018 */ addiu $t9,$t6,0x18 /* f016d5c: afb900e0 */ sw $t9,0xe0($sp) .JF0f016d60: -/* f016d60: 0fc5baa5 */ jal 0xf16ea94 +/* f016d60: 0fc5baa5 */ jal langGet /* f016d64: 9644000a */ lhu $a0,0xa($s2) -/* f016d68: 0c002eeb */ jal 0xbbac +/* f016d68: 0c002eeb */ jal viGetWidth /* f016d6c: 00408025 */ move $s0,$v0 /* f016d70: 00028c00 */ sll $s1,$v0,0x10 /* f016d74: 00116403 */ sra $t4,$s1,0x10 -/* f016d78: 0c002eef */ jal 0xbbbc +/* f016d78: 0c002eef */ jal viGetHeight /* f016d7c: 01808825 */ move $s1,$t4 /* f016d80: 8fa40130 */ lw $a0,0x130($sp) /* f016d84: 03c02825 */ move $a1,$s8 @@ -967,7 +967,7 @@ glabel var7f1a84fcjf /* f016d9c: afb1001c */ sw $s1,0x1c($sp) /* f016da0: afa20020 */ sw $v0,0x20($sp) /* f016da4: afa00024 */ sw $zero,0x24($sp) -/* f016da8: 0fc55886 */ jal 0xf156218 +/* f016da8: 0fc55886 */ jal textRenderProjected /* f016dac: afa00028 */ sw $zero,0x28($sp) /* f016db0: 24030001 */ li $v1,0x1 /* f016db4: 3c018008 */ lui $at,0x8008 @@ -977,13 +977,13 @@ glabel var7f1a84fcjf /* f016dc4: 1000003c */ b .JF0f016eb8 /* f016dc8: ac23010c */ sw $v1,0x10c($at) .JF0f016dcc: -/* f016dcc: 0fc5baa5 */ jal 0xf16ea94 +/* f016dcc: 0fc5baa5 */ jal langGet /* f016dd0: 9644000a */ lhu $a0,0xa($s2) -/* f016dd4: 0c002eeb */ jal 0xbbac +/* f016dd4: 0c002eeb */ jal viGetWidth /* f016dd8: 00408025 */ move $s0,$v0 /* f016ddc: 00028c00 */ sll $s1,$v0,0x10 /* f016de0: 00116c03 */ sra $t5,$s1,0x10 -/* f016de4: 0c002eef */ jal 0xbbbc +/* f016de4: 0c002eef */ jal viGetHeight /* f016de8: 01a08825 */ move $s1,$t5 /* f016dec: 2401ff00 */ li $at,-256 /* f016df0: 02a1c024 */ and $t8,$s5,$at @@ -1003,7 +1003,7 @@ glabel var7f1a84fcjf /* f016e28: afb1001c */ sw $s1,0x1c($sp) /* f016e2c: afa20020 */ sw $v0,0x20($sp) /* f016e30: afa00024 */ sw $zero,0x24($sp) -/* f016e34: 0fc55886 */ jal 0xf156218 +/* f016e34: 0fc55886 */ jal textRenderProjected /* f016e38: afa00028 */ sw $zero,0x28($sp) /* f016e3c: afa20130 */ sw $v0,0x130($sp) /* f016e40: 86430000 */ lh $v1,0x0($s2) @@ -1015,13 +1015,13 @@ glabel var7f1a84fcjf .JF0f016e58: /* f016e58: 864c0002 */ lh $t4,0x2($s2) /* f016e5c: afac00dc */ sw $t4,0xdc($sp) -/* f016e60: 0fc5baa5 */ jal 0xf16ea94 +/* f016e60: 0fc5baa5 */ jal langGet /* f016e64: 9644000a */ lhu $a0,0xa($s2) -/* f016e68: 0c002eeb */ jal 0xbbac +/* f016e68: 0c002eeb */ jal viGetWidth /* f016e6c: 00408025 */ move $s0,$v0 /* f016e70: 00028c00 */ sll $s1,$v0,0x10 /* f016e74: 00116c03 */ sra $t5,$s1,0x10 -/* f016e78: 0c002eef */ jal 0xbbbc +/* f016e78: 0c002eef */ jal viGetHeight /* f016e7c: 01a08825 */ move $s1,$t5 /* f016e80: 8fa40130 */ lw $a0,0x130($sp) /* f016e84: 03c02825 */ move $a1,$s8 @@ -1033,7 +1033,7 @@ glabel var7f1a84fcjf /* f016e9c: afb1001c */ sw $s1,0x1c($sp) /* f016ea0: afa20020 */ sw $v0,0x20($sp) /* f016ea4: afa00024 */ sw $zero,0x24($sp) -/* f016ea8: 0fc55886 */ jal 0xf156218 +/* f016ea8: 0fc55886 */ jal textRenderProjected /* f016eac: afa00028 */ sw $zero,0x28($sp) /* f016eb0: afa20130 */ sw $v0,0x130($sp) /* f016eb4: 8fb600e0 */ lw $s6,0xe0($sp) @@ -1043,7 +1043,7 @@ glabel var7f1a84fcjf /* f016ec0: 024b082b */ sltu $at,$s2,$t3 /* f016ec4: 5420fe4e */ bnezl $at,.JF0f016800 /* f016ec8: 86420008 */ lh $v0,0x8($s2) -/* f016ecc: 0fc54bb7 */ jal 0xf152edc +/* f016ecc: 0fc54bb7 */ jal func0f153780 /* f016ed0: 8fa40130 */ lw $a0,0x130($sp) /* f016ed4: afa20130 */ sw $v0,0x130($sp) /* f016ed8: 8fbf005c */ lw $ra,0x5c($sp) @@ -1736,10 +1736,10 @@ glabel var7f1a8f68jf /* f016ffc: 96040244 */ lhu $a0,0x244($s0) /* f017000: 34c67800 */ ori $a2,$a2,0x7800 /* f017004: 02202825 */ move $a1,$s1 -/* f017008: 0fc6a0c5 */ jal 0xf1a8314 +/* f017008: 0fc6a0c5 */ jal func0f1a7794 /* f01700c: 00003825 */ move $a3,$zero /* f017010: ae020240 */ sw $v0,0x240($s0) -/* f017014: 0fc59da4 */ jal 0xf167690 +/* f017014: 0fc59da4 */ jal fileGetSize /* f017018: 96040244 */ lhu $a0,0x244($s0) /* f01701c: 2443003f */ addiu $v1,$v0,0x3f /* f017020: 346a003f */ ori $t2,$v1,0x3f @@ -1748,19 +1748,19 @@ glabel var7f1a8f68jf /* f01702c: 358c7800 */ ori $t4,$t4,0x7800 /* f017030: 022b8821 */ addu $s1,$s1,$t3 /* f017034: 018b9023 */ subu $s2,$t4,$t3 -/* f017038: 0c008a0e */ jal 0x22838 +/* f017038: 0c008a0e */ jal modelCalculateRwDataLen /* f01703c: 8e040240 */ lw $a0,0x240($s0) -/* f017040: 0fc2d0c0 */ jal 0xf0b4300 +/* f017040: 0fc2d0c0 */ jal func0f0b3280 /* f017044: 8e040240 */ lw $a0,0x240($s0) /* f017048: 3c038006 */ lui $v1,0x8006 /* f01704c: 246323d8 */ addiu $v1,$v1,0x23d8 /* f017050: ac620000 */ sw $v0,0x0($v1) /* f017054: 00402025 */ move $a0,$v0 -/* f017058: 0c006bbe */ jal 0x1aef8 +/* f017058: 0c006bbe */ jal modelSetScale /* f01705c: 3c053f80 */ lui $a1,0x3f80 /* f017060: 3c048006 */ lui $a0,0x8006 /* f017064: 8c8423d8 */ lw $a0,0x23d8($a0) -/* f017068: 0c006b35 */ jal 0x1acd4 +/* f017068: 0c006b35 */ jal modelSetRootPosition /* f01706c: 27a50060 */ addiu $a1,$sp,0x60 /* f017070: 3c188006 */ lui $t8,0x8006 /* f017074: 2718267c */ addiu $t8,$t8,0x267c @@ -1774,29 +1774,29 @@ glabel var7f1a8f68jf /* f017094: ada10008 */ sw $at,0x8($t5) /* f017098: 9604024c */ lhu $a0,0x24c($s0) /* f01709c: 02403025 */ move $a2,$s2 -/* f0170a0: 0fc6a0c5 */ jal 0xf1a8314 +/* f0170a0: 0fc6a0c5 */ jal func0f1a7794 /* f0170a4: 00003825 */ move $a3,$zero /* f0170a8: ae020248 */ sw $v0,0x248($s0) -/* f0170ac: 0fc59da4 */ jal 0xf167690 +/* f0170ac: 0fc59da4 */ jal fileGetSize /* f0170b0: 9604024c */ lhu $a0,0x24c($s0) /* f0170b4: 2443003f */ addiu $v1,$v0,0x3f /* f0170b8: 3479003f */ ori $t9,$v1,0x3f /* f0170bc: 3b2a003f */ xori $t2,$t9,0x3f /* f0170c0: 022a8821 */ addu $s1,$s1,$t2 /* f0170c4: 024a9023 */ subu $s2,$s2,$t2 -/* f0170c8: 0c008a0e */ jal 0x22838 +/* f0170c8: 0c008a0e */ jal modelCalculateRwDataLen /* f0170cc: 8e040248 */ lw $a0,0x248($s0) -/* f0170d0: 0fc2d0c0 */ jal 0xf0b4300 +/* f0170d0: 0fc2d0c0 */ jal func0f0b3280 /* f0170d4: 8e040248 */ lw $a0,0x248($s0) /* f0170d8: 3c038006 */ lui $v1,0x8006 /* f0170dc: 246323dc */ addiu $v1,$v1,0x23dc /* f0170e0: ac620000 */ sw $v0,0x0($v1) /* f0170e4: 00402025 */ move $a0,$v0 -/* f0170e8: 0c006bbe */ jal 0x1aef8 +/* f0170e8: 0c006bbe */ jal modelSetScale /* f0170ec: 3c053f80 */ lui $a1,0x3f80 /* f0170f0: 3c048006 */ lui $a0,0x8006 /* f0170f4: 8c8423dc */ lw $a0,0x23dc($a0) -/* f0170f8: 0c006b35 */ jal 0x1acd4 +/* f0170f8: 0c006b35 */ jal modelSetRootPosition /* f0170fc: 27a50054 */ addiu $a1,$sp,0x54 /* f017100: 3c0c8006 */ lui $t4,0x8006 /* f017104: 258c2688 */ addiu $t4,$t4,0x2688 @@ -1810,29 +1810,29 @@ glabel var7f1a8f68jf /* f017124: ad610008 */ sw $at,0x8($t3) /* f017128: 9604026c */ lhu $a0,0x26c($s0) /* f01712c: 02403025 */ move $a2,$s2 -/* f017130: 0fc6a0c5 */ jal 0xf1a8314 +/* f017130: 0fc6a0c5 */ jal func0f1a7794 /* f017134: 00003825 */ move $a3,$zero /* f017138: ae020268 */ sw $v0,0x268($s0) -/* f01713c: 0fc59da4 */ jal 0xf167690 +/* f01713c: 0fc59da4 */ jal fileGetSize /* f017140: 9604026c */ lhu $a0,0x26c($s0) /* f017144: 2443003f */ addiu $v1,$v0,0x3f /* f017148: 3478003f */ ori $t8,$v1,0x3f /* f01714c: 3b0f003f */ xori $t7,$t8,0x3f /* f017150: 022f8821 */ addu $s1,$s1,$t7 /* f017154: 024f9023 */ subu $s2,$s2,$t7 -/* f017158: 0c008a0e */ jal 0x22838 +/* f017158: 0c008a0e */ jal modelCalculateRwDataLen /* f01715c: 8e040268 */ lw $a0,0x268($s0) -/* f017160: 0fc2d04b */ jal 0xf0b412c +/* f017160: 0fc2d04b */ jal modelInstantiate /* f017164: 8e040268 */ lw $a0,0x268($s0) /* f017168: 3c038006 */ lui $v1,0x8006 /* f01716c: 246323e8 */ addiu $v1,$v1,0x23e8 /* f017170: ac620000 */ sw $v0,0x0($v1) /* f017174: 00402025 */ move $a0,$v0 -/* f017178: 0c006bbe */ jal 0x1aef8 +/* f017178: 0c006bbe */ jal modelSetScale /* f01717c: 3c053f80 */ lui $a1,0x3f80 /* f017180: 3c048006 */ lui $a0,0x8006 /* f017184: 8c8423e8 */ lw $a0,0x23e8($a0) -/* f017188: 0c006b35 */ jal 0x1acd4 +/* f017188: 0c006b35 */ jal modelSetRootPosition /* f01718c: 27a50048 */ addiu $a1,$sp,0x48 /* f017190: 3c0a8006 */ lui $t2,0x8006 /* f017194: 254a2694 */ addiu $t2,$t2,0x2694 @@ -1846,68 +1846,68 @@ glabel var7f1a8f68jf /* f0171b4: af210008 */ sw $at,0x8($t9) /* f0171b8: 96040dcc */ lhu $a0,0xdcc($s0) /* f0171bc: 02403025 */ move $a2,$s2 -/* f0171c0: 0fc6a0c5 */ jal 0xf1a8314 +/* f0171c0: 0fc6a0c5 */ jal func0f1a7794 /* f0171c4: 00003825 */ move $a3,$zero /* f0171c8: ae020dc8 */ sw $v0,0xdc8($s0) -/* f0171cc: 0fc59da4 */ jal 0xf167690 +/* f0171cc: 0fc59da4 */ jal fileGetSize /* f0171d0: 96040dcc */ lhu $a0,0xdcc($s0) /* f0171d4: 2443003f */ addiu $v1,$v0,0x3f /* f0171d8: 346c003f */ ori $t4,$v1,0x3f /* f0171dc: 398d003f */ xori $t5,$t4,0x3f /* f0171e0: 022d8821 */ addu $s1,$s1,$t5 /* f0171e4: 024d9023 */ subu $s2,$s2,$t5 -/* f0171e8: 0c008a0e */ jal 0x22838 +/* f0171e8: 0c008a0e */ jal modelCalculateRwDataLen /* f0171ec: 8e040dc8 */ lw $a0,0xdc8($s0) -/* f0171f0: 0fc2d04b */ jal 0xf0b412c +/* f0171f0: 0fc2d04b */ jal modelInstantiate /* f0171f4: 8e040dc8 */ lw $a0,0xdc8($s0) /* f0171f8: 3c018006 */ lui $at,0x8006 /* f0171fc: ac2223f4 */ sw $v0,0x23f4($at) -/* f017200: 0fc2d04b */ jal 0xf0b412c +/* f017200: 0fc2d04b */ jal modelInstantiate /* f017204: 8e040dc8 */ lw $a0,0xdc8($s0) /* f017208: 3c018006 */ lui $at,0x8006 /* f01720c: 3c048006 */ lui $a0,0x8006 /* f017210: ac2223f8 */ sw $v0,0x23f8($at) /* f017214: 8c8423f4 */ lw $a0,0x23f4($a0) -/* f017218: 0c006bbe */ jal 0x1aef8 +/* f017218: 0c006bbe */ jal modelSetScale /* f01721c: 3c053f80 */ lui $a1,0x3f80 /* f017220: 3c048006 */ lui $a0,0x8006 /* f017224: 8c8423f8 */ lw $a0,0x23f8($a0) -/* f017228: 0c006bbe */ jal 0x1aef8 +/* f017228: 0c006bbe */ jal modelSetScale /* f01722c: 3c053f80 */ lui $a1,0x3f80 /* f017230: 3c048006 */ lui $a0,0x8006 /* f017234: 8c8423f4 */ lw $a0,0x23f4($a0) -/* f017238: 0c006b35 */ jal 0x1acd4 +/* f017238: 0c006b35 */ jal modelSetRootPosition /* f01723c: 27a5003c */ addiu $a1,$sp,0x3c /* f017240: 3c048006 */ lui $a0,0x8006 /* f017244: 8c8423f8 */ lw $a0,0x23f8($a0) -/* f017248: 0c006b35 */ jal 0x1acd4 +/* f017248: 0c006b35 */ jal modelSetRootPosition /* f01724c: 27a5003c */ addiu $a1,$sp,0x3c /* f017250: 96040dd4 */ lhu $a0,0xdd4($s0) /* f017254: 02202825 */ move $a1,$s1 /* f017258: 02403025 */ move $a2,$s2 -/* f01725c: 0fc6a0c5 */ jal 0xf1a8314 +/* f01725c: 0fc6a0c5 */ jal func0f1a7794 /* f017260: 00003825 */ move $a3,$zero /* f017264: ae020dd0 */ sw $v0,0xdd0($s0) -/* f017268: 0fc59da4 */ jal 0xf167690 +/* f017268: 0fc59da4 */ jal fileGetSize /* f01726c: 96040dd4 */ lhu $a0,0xdd4($s0) /* f017270: 2443003f */ addiu $v1,$v0,0x3f /* f017274: 3478003f */ ori $t8,$v1,0x3f /* f017278: 3b0f003f */ xori $t7,$t8,0x3f /* f01727c: 022f8821 */ addu $s1,$s1,$t7 /* f017280: 024f9023 */ subu $s2,$s2,$t7 -/* f017284: 0c008a0e */ jal 0x22838 +/* f017284: 0c008a0e */ jal modelCalculateRwDataLen /* f017288: 8e040dd0 */ lw $a0,0xdd0($s0) -/* f01728c: 0fc2d04b */ jal 0xf0b412c +/* f01728c: 0fc2d04b */ jal modelInstantiate /* f017290: 8e040dd0 */ lw $a0,0xdd0($s0) /* f017294: 3c038006 */ lui $v1,0x8006 /* f017298: 246323fc */ addiu $v1,$v1,0x23fc /* f01729c: ac620000 */ sw $v0,0x0($v1) /* f0172a0: 00402025 */ move $a0,$v0 -/* f0172a4: 0c006bbe */ jal 0x1aef8 +/* f0172a4: 0c006bbe */ jal modelSetScale /* f0172a8: 3c053f80 */ lui $a1,0x3f80 /* f0172ac: 3c048006 */ lui $a0,0x8006 /* f0172b0: 8c8423fc */ lw $a0,0x23fc($a0) -/* f0172b4: 0c006b35 */ jal 0x1acd4 +/* f0172b4: 0c006b35 */ jal modelSetRootPosition /* f0172b8: 27a5003c */ addiu $a1,$sp,0x3c /* f0172bc: 3c198006 */ lui $t9,0x8006 /* f0172c0: 273926a0 */ addiu $t9,$t9,0x26a0 @@ -1921,32 +1921,32 @@ glabel var7f1a8f68jf /* f0172e0: adc10008 */ sw $at,0x8($t6) /* f0172e4: 96040274 */ lhu $a0,0x274($s0) /* f0172e8: 02403025 */ move $a2,$s2 -/* f0172ec: 0fc6a0c5 */ jal 0xf1a8314 +/* f0172ec: 0fc6a0c5 */ jal func0f1a7794 /* f0172f0: 00003825 */ move $a3,$zero /* f0172f4: ae020270 */ sw $v0,0x270($s0) -/* f0172f8: 0fc59da4 */ jal 0xf167690 +/* f0172f8: 0fc59da4 */ jal fileGetSize /* f0172fc: 96040274 */ lhu $a0,0x274($s0) /* f017300: 2443003f */ addiu $v1,$v0,0x3f /* f017304: 346c003f */ ori $t4,$v1,0x3f /* f017308: 398d003f */ xori $t5,$t4,0x3f /* f01730c: 022d8821 */ addu $s1,$s1,$t5 /* f017310: 024d9023 */ subu $s2,$s2,$t5 -/* f017314: 0c008a0e */ jal 0x22838 +/* f017314: 0c008a0e */ jal modelCalculateRwDataLen /* f017318: 8e040270 */ lw $a0,0x270($s0) -/* f01731c: 0fc2d04b */ jal 0xf0b412c +/* f01731c: 0fc2d04b */ jal modelInstantiate /* f017320: 8e040270 */ lw $a0,0x270($s0) /* f017324: 3c038006 */ lui $v1,0x8006 /* f017328: 246323ec */ addiu $v1,$v1,0x23ec /* f01732c: ac620000 */ sw $v0,0x0($v1) /* f017330: 00402025 */ move $a0,$v0 -/* f017334: 0c006bbe */ jal 0x1aef8 +/* f017334: 0c006bbe */ jal modelSetScale /* f017338: 3c053f80 */ lui $a1,0x3f80 /* f01733c: 3c048006 */ lui $a0,0x8006 /* f017340: 8c8423ec */ lw $a0,0x23ec($a0) -/* f017344: 0c006b35 */ jal 0x1acd4 +/* f017344: 0c006b35 */ jal modelSetRootPosition /* f017348: 27a50030 */ addiu $a1,$sp,0x30 /* f01734c: 8e040268 */ lw $a0,0x268($s0) -/* f017350: 0c006a57 */ jal 0x1a95c +/* f017350: 0c006a57 */ jal modelGetPartRodata /* f017354: 24050002 */ li $a1,0x2 /* f017358: 84430010 */ lh $v1,0x10($v0) /* f01735c: 3c04800a */ lui $a0,0x800a @@ -1976,7 +1976,7 @@ glabel var7f1a8f68jf /* f0173bc: 24100001 */ li $s0,0x1 /* f0173c0: 3c018006 */ lui $at,0x8006 /* f0173c4: ac3023d4 */ sw $s0,0x23d4($at) -/* f0173c8: 0c0051ea */ jal 0x147a8 +/* f0173c8: 0c0051ea */ jal joy00014810 /* f0173cc: 00002025 */ move $a0,$zero /* f0173d0: 3c0c8006 */ lui $t4,0x8006 /* f0173d4: 8d8c2388 */ lw $t4,0x2388($t4) @@ -1985,7 +1985,7 @@ glabel var7f1a8f68jf /* f0173e0: 3c018006 */ lui $at,0x8006 /* f0173e4: 11800003 */ beqz $t4,.JF0f0173f4 /* f0173e8: ac20266c */ sw $zero,0x266c($at) -/* f0173ec: 0fc05f58 */ jal 0xf017d60 +/* f0173ec: 0fc05f58 */ jal titleSkipToPdTitle /* f0173f0: 00000000 */ nop .JF0f0173f4: /* f0173f4: 8fbf0024 */ lw $ra,0x24($sp) @@ -2311,27 +2311,27 @@ glabel titleExitPdLogo /* f01740c: 27bdffe8 */ addiu $sp,$sp,-24 /* f017410: afbf0014 */ sw $ra,0x14($sp) /* f017414: 3c048006 */ lui $a0,0x8006 -/* f017418: 0fc2d053 */ jal 0xf0b414c +/* f017418: 0fc2d053 */ jal modelFree /* f01741c: 8c8423d8 */ lw $a0,0x23d8($a0) /* f017420: 3c048006 */ lui $a0,0x8006 -/* f017424: 0fc2d053 */ jal 0xf0b414c +/* f017424: 0fc2d053 */ jal modelFree /* f017428: 8c8423dc */ lw $a0,0x23dc($a0) /* f01742c: 3c048006 */ lui $a0,0x8006 -/* f017430: 0fc2d053 */ jal 0xf0b414c +/* f017430: 0fc2d053 */ jal modelFree /* f017434: 8c8423e8 */ lw $a0,0x23e8($a0) /* f017438: 3c048006 */ lui $a0,0x8006 -/* f01743c: 0fc2d053 */ jal 0xf0b414c +/* f01743c: 0fc2d053 */ jal modelFree /* f017440: 8c8423ec */ lw $a0,0x23ec($a0) /* f017444: 3c048006 */ lui $a0,0x8006 -/* f017448: 0fc2d053 */ jal 0xf0b414c +/* f017448: 0fc2d053 */ jal modelFree /* f01744c: 8c8423f4 */ lw $a0,0x23f4($a0) /* f017450: 3c048006 */ lui $a0,0x8006 -/* f017454: 0fc2d053 */ jal 0xf0b414c +/* f017454: 0fc2d053 */ jal modelFree /* f017458: 8c8423f8 */ lw $a0,0x23f8($a0) /* f01745c: 3c048006 */ lui $a0,0x8006 -/* f017460: 0fc2d053 */ jal 0xf0b414c +/* f017460: 0fc2d053 */ jal modelFree /* f017464: 8c8423fc */ lw $a0,0x23fc($a0) -/* f017468: 0c0051ea */ jal 0x147a8 +/* f017468: 0c0051ea */ jal joy00014810 /* f01746c: 24040001 */ li $a0,0x1 /* f017470: 8fbf0014 */ lw $ra,0x14($sp) /* f017474: 27bd0018 */ addiu $sp,$sp,0x18 @@ -2362,17 +2362,17 @@ glabel var7f1a8f70jf /* f017484: 3c014238 */ lui $at,0x4238 /* f017488: afbf0014 */ sw $ra,0x14($sp) /* f01748c: 44816000 */ mtc1 $at,$f12 -/* f017490: 0c002f35 */ jal 0xbcd4 +/* f017490: 0c002f35 */ jal viSetFovY /* f017494: 00000000 */ nop /* f017498: 3c017f1b */ lui $at,0x7f1b -/* f01749c: 0c002f48 */ jal 0xbd20 +/* f01749c: 0c002f48 */ jal viSetAspect /* f0174a0: c42c8f70 */ lwc1 $f12,-0x7090($at) /* f0174a4: 3c0142c8 */ lui $at,0x42c8 /* f0174a8: 44816000 */ mtc1 $at,$f12 /* f0174ac: 3c017f1b */ lui $at,0x7f1b -/* f0174b0: 0c002f8a */ jal 0xbe28 +/* f0174b0: 0c002f8a */ jal viSetZRange /* f0174b4: c42e8f74 */ lwc1 $f14,-0x708c($at) -/* f0174b8: 0c002f31 */ jal 0xbcc4 +/* f0174b8: 0c002f31 */ jal viSetUseZBuf /* f0174bc: 00002025 */ move $a0,$zero /* f0174c0: 3c038006 */ lui $v1,0x8006 /* f0174c4: 246323a4 */ addiu $v1,$v1,0x23a4 @@ -2407,15 +2407,15 @@ glabel var7f1a8f70jf /* f017534: 240f0005 */ li $t7,0x5 /* f017538: 11c10018 */ beq $t6,$at,.JF0f01759c /* f01753c: 3c018006 */ lui $at,0x8006 -/* f017540: 0fc4ee95 */ jal 0xf13ba54 +/* f017540: 0fc4ee95 */ jal creditsRequestAltTitle /* f017544: ac2f2394 */ sw $t7,0x2394($at) /* f017548: 2418005c */ li $t8,0x5c /* f01754c: 3c018006 */ lui $at,0x8006 /* f017550: ac3823c4 */ sw $t8,0x23c4($at) -/* f017554: 0fc06c4c */ jal 0xf01b130 +/* f017554: 0fc06c4c */ jal setNumPlayers /* f017558: 24040001 */ li $a0,0x1 /* f01755c: 3c048006 */ lui $a0,0x8006 -/* f017560: 0c003a3f */ jal 0xe8fc +/* f017560: 0c003a3f */ jal mainChangeToStage /* f017564: 8c8423c4 */ lw $a0,0x23c4($a0) /* f017568: 3c03800a */ lui $v1,0x800a /* f01756c: 2463a630 */ addiu $v1,$v1,-22992 @@ -2423,15 +2423,15 @@ glabel var7f1a8f70jf /* f017574: ac600294 */ sw $zero,0x294($v1) /* f017578: ac620298 */ sw $v0,0x298($v1) /* f01757c: ac62029c */ sw $v0,0x29c($v1) -/* f017580: 0fc5b3d2 */ jal 0xf16cf48 +/* f017580: 0fc5b3d2 */ jal lvSetDifficulty /* f017584: 00002025 */ move $a0,$zero -/* f017588: 0c00279a */ jal 0x9e68 +/* f017588: 0c00279a */ jal viBlack /* f01758c: 24040001 */ li $a0,0x1 /* f017590: 3c038006 */ lui $v1,0x8006 /* f017594: 10000005 */ b .JF0f0175ac /* f017598: 246323a4 */ addiu $v1,$v1,0x23a4 .JF0f01759c: -/* f01759c: 0fc06e49 */ jal 0xf01b924 +/* f01759c: 0fc06e49 */ jal titleSetNextMode /* f0175a0: 24040005 */ li $a0,0x5 /* f0175a4: 3c038006 */ lui $v1,0x8006 /* f0175a8: 246323a4 */ addiu $v1,$v1,0x23a4 @@ -2444,11 +2444,11 @@ glabel var7f1a8f70jf /* f0175c0: 2b21029b */ slti $at,$t9,0x29b /* f0175c4: 54200004 */ bnezl $at,.JF0f0175d8 /* f0175c8: 00002025 */ move $a0,$zero -/* f0175cc: 0fc06e49 */ jal 0xf01b924 +/* f0175cc: 0fc06e49 */ jal titleSetNextMode /* f0175d0: 24040005 */ li $a0,0x5 /* f0175d4: 00002025 */ move $a0,$zero .JF0f0175d8: -/* f0175d8: 0c0053ee */ jal 0x14fb8 +/* f0175d8: 0c0053ee */ jal joyGetButtonsPressedThisFrame /* f0175dc: 3405ffff */ li $a1,0xffff /* f0175e0: 1040000d */ beqz $v0,.JF0f017618 /* f0175e4: 24090001 */ li $t1,0x1 @@ -2462,7 +2462,7 @@ glabel var7f1a8f70jf /* f017604: 29610225 */ slti $at,$t3,0x225 /* f017608: 50200004 */ beqzl $at,.JF0f01761c /* f01760c: 8fbf0014 */ lw $ra,0x14($sp) -/* f017610: 0fc06e49 */ jal 0xf01b924 +/* f017610: 0fc06e49 */ jal titleSetNextMode /* f017614: 24040002 */ li $a0,0x2 .JF0f017618: /* f017618: 8fbf0014 */ lw $ra,0x14($sp) @@ -3287,7 +3287,7 @@ glabel var7f1a8f88jf /* f0180dc: 44051000 */ mfc1 $a1,$f2 /* f0180e0: 44070000 */ mfc1 $a3,$f0 /* f0180e4: e7a00010 */ swc1 $f0,0x10($sp) -/* f0180e8: 0fc1ba89 */ jal 0xf06ea24 +/* f0180e8: 0fc1ba89 */ jal applySpeed /* f0180ec: e7a60014 */ swc1 $f6,0x14($sp) /* f0180f0: 3c028006 */ lui $v0,0x8006 /* f0180f4: 3c0b8006 */ lui $t3,0x8006 @@ -3477,7 +3477,7 @@ glabel var7f1a8f88jf /* f0183a0: 44057000 */ mfc1 $a1,$f14 /* f0183a4: 44070000 */ mfc1 $a3,$f0 /* f0183a8: e7a00010 */ swc1 $f0,0x10($sp) -/* f0183ac: 0fc1bb06 */ jal 0xf06ec18 +/* f0183ac: 0fc1bb06 */ jal applyRotation /* f0183b0: e7a60014 */ swc1 $f6,0x14($sp) /* f0183b4: 3c017f1b */ lui $at,0x7f1b /* f0183b8: c42c8fc4 */ lwc1 $f12,-0x703c($at) @@ -3771,7 +3771,7 @@ glabel var7f1a8f88jf /* f0187dc: 8fa404e0 */ lw $a0,0x4e0($sp) /* f0187e0: 00002825 */ move $a1,$zero /* f0187e4: 00003025 */ move $a2,$zero -/* f0187e8: 0c002faa */ jal 0xbea8 +/* f0187e8: 0c002faa */ jal viSetFillColour /* f0187ec: 00003825 */ move $a3,$zero /* f0187f0: 1000004d */ b .JF0f018928 /* f0187f4: afa204e0 */ sw $v0,0x4e0($sp) @@ -3786,7 +3786,7 @@ glabel var7f1a8f88jf /* f018814: 44052000 */ mfc1 $a1,$f4 /* f018818: 00000000 */ nop /* f01881c: 00a03025 */ move $a2,$a1 -/* f018820: 0c002faa */ jal 0xbea8 +/* f018820: 0c002faa */ jal viSetFillColour /* f018824: 00a03825 */ move $a3,$a1 /* f018828: 1000003f */ b .JF0f018928 /* f01882c: afa204e0 */ sw $v0,0x4e0($sp) @@ -3836,7 +3836,7 @@ glabel var7f1a8f88jf /* f0188d0: 00000000 */ nop .JF0f0188d4: /* f0188d4: 44cff800 */ ctc1 $t7,$31 -/* f0188d8: 0fc01a60 */ jal 0xf006980 +/* f0188d8: 0fc01a60 */ jal colourBlend /* f0188dc: 34a52c00 */ ori $a1,$a1,0x2c00 /* f0188e0: 00022e02 */ srl $a1,$v0,0x18 /* f0188e4: 00023402 */ srl $a2,$v0,0x10 @@ -3847,18 +3847,18 @@ glabel var7f1a8f88jf /* f0188f8: 01c02825 */ move $a1,$t6 /* f0188fc: 03003025 */ move $a2,$t8 /* f018900: 03203825 */ move $a3,$t9 -/* f018904: 0c002faa */ jal 0xbea8 +/* f018904: 0c002faa */ jal viSetFillColour /* f018908: 8fa404e0 */ lw $a0,0x4e0($sp) /* f01890c: 10000006 */ b .JF0f018928 /* f018910: afa204e0 */ sw $v0,0x4e0($sp) .JF0f018914: /* f018914: 8fa404e0 */ lw $a0,0x4e0($sp) /* f018918: 00003025 */ move $a2,$zero -/* f01891c: 0c002faa */ jal 0xbea8 +/* f01891c: 0c002faa */ jal viSetFillColour /* f018920: 2407002c */ li $a3,0x2c /* f018924: afa204e0 */ sw $v0,0x4e0($sp) .JF0f018928: -/* f018928: 0c002c9a */ jal 0xb268 +/* f018928: 0c002c9a */ jal viFillBuffer /* f01892c: 8fa404e0 */ lw $a0,0x4e0($sp) /* f018930: 3c0f8006 */ lui $t7,0x8006 /* f018934: 8def2710 */ lw $t7,0x2710($t7) @@ -3869,7 +3869,7 @@ glabel var7f1a8f88jf /* f018948: 8fbf0034 */ lw $ra,0x34($sp) /* f01894c: 24040002 */ li $a0,0x2 .JF0f018950: -/* f018950: 0fc59f70 */ jal 0xf167dc0 +/* f018950: 0fc59f70 */ jal gfxAllocateLookAt /* f018954: afa304e0 */ sw $v1,0x4e0($sp) /* f018958: 44800000 */ mtc1 $zero,$f0 /* f01895c: 3c01457a */ lui $at,0x457a @@ -3887,7 +3887,7 @@ glabel var7f1a8f88jf /* f01898c: e7a00020 */ swc1 $f0,0x20($sp) /* f018990: e7a00028 */ swc1 $f0,0x28($sp) /* f018994: e7a80010 */ swc1 $f8,0x10($sp) -/* f018998: 0c0011c3 */ jal 0x470c +/* f018998: 0c0011c3 */ jal guLookAtReflect /* f01899c: e7a60024 */ swc1 $f6,0x24($sp) /* f0189a0: 8fae04e0 */ lw $t6,0x4e0($sp) /* f0189a4: 8fa802c8 */ lw $t0,0x2c8($sp) @@ -4123,10 +4123,10 @@ glabel var7f1a8f88jf /* f018d00: a0e50001 */ sb $a1,0x1($a3) /* f018d04: e7ae027c */ swc1 $f14,0x27c($sp) /* f018d08: e7b20278 */ swc1 $f18,0x278($sp) -/* f018d0c: 0c0068df */ jal 0x1a37c +/* f018d0c: 0c0068df */ jal sinf /* f018d10: 46007306 */ mov.s $f12,$f14 /* f018d14: e7a00054 */ swc1 $f0,0x54($sp) -/* f018d18: 0c0068dc */ jal 0x1a370 +/* f018d18: 0c0068dc */ jal cosf /* f018d1c: c7ac0278 */ lwc1 $f12,0x278($sp) /* f018d20: 3c0142fe */ lui $at,0x42fe /* f018d24: 44815000 */ mtc1 $at,$f10 @@ -4138,7 +4138,7 @@ glabel var7f1a8f88jf /* f018d3c: 46080182 */ mul.s $f6,$f0,$f8 /* f018d40: 4600328d */ trunc.w.s $f10,$f6 /* f018d44: 44195000 */ mfc1 $t9,$f10 -/* f018d48: 0c0068df */ jal 0x1a37c +/* f018d48: 0c0068df */ jal sinf /* f018d4c: a0392490 */ sb $t9,0x2490($at) /* f018d50: 3c0142fe */ lui $at,0x42fe /* f018d54: 44812000 */ mtc1 $at,$f4 @@ -4147,10 +4147,10 @@ glabel var7f1a8f88jf /* f018d60: 46040202 */ mul.s $f8,$f0,$f4 /* f018d64: 4600418d */ trunc.w.s $f6,$f8 /* f018d68: 440e3000 */ mfc1 $t6,$f6 -/* f018d6c: 0c0068dc */ jal 0x1a370 +/* f018d6c: 0c0068dc */ jal cosf /* f018d70: a02e2491 */ sb $t6,0x2491($at) /* f018d74: e7a00054 */ swc1 $f0,0x54($sp) -/* f018d78: 0c0068dc */ jal 0x1a370 +/* f018d78: 0c0068dc */ jal cosf /* f018d7c: c7ac0278 */ lwc1 $f12,0x278($sp) /* f018d80: 3c0142fe */ lui $at,0x42fe /* f018d84: 44815000 */ mtc1 $at,$f10 @@ -4174,7 +4174,7 @@ glabel var7f1a8f88jf /* f018dcc: a0392492 */ sb $t9,0x2492($at) /* f018dd0: 3c013f80 */ lui $at,0x3f80 /* f018dd4: 44812000 */ mtc1 $at,$f4 -/* f018dd8: 0c005aa1 */ jal 0x16a84 +/* f018dd8: 0c005aa1 */ jal mtx00016ae4 /* f018ddc: e7a40020 */ swc1 $f4,0x20($sp) /* f018de0: 3c0f8006 */ lui $t7,0x8006 /* f018de4: 8def2704 */ lw $t7,0x2704($t7) @@ -4191,22 +4191,22 @@ glabel var7f1a8f88jf /* f018e0c: 8f1823dc */ lw $t8,0x23dc($t8) /* f018e10: afb803dc */ sw $t8,0x3dc($sp) .JF0f018e14: -/* f018e14: 0c0058c5 */ jal 0x16314 +/* f018e14: 0c0058c5 */ jal mtx4LoadYRotation /* f018e18: c42c26ec */ lwc1 $f12,0x26ec($at) /* f018e1c: 3c018006 */ lui $at,0x8006 /* f018e20: c42c26f4 */ lwc1 $f12,0x26f4($at) -/* f018e24: 0c0058a2 */ jal 0x16288 +/* f018e24: 0c0058a2 */ jal mtx4LoadXRotation /* f018e28: 27a50358 */ addiu $a1,$sp,0x358 /* f018e2c: 27a40358 */ addiu $a0,$sp,0x358 -/* f018e30: 0c005667 */ jal 0x1599c +/* f018e30: 0c005667 */ jal mtx4MultMtx4InPlace /* f018e34: 27a50398 */ addiu $a1,$sp,0x398 /* f018e38: 27a40460 */ addiu $a0,$sp,0x460 /* f018e3c: 27a50398 */ addiu $a1,$sp,0x398 -/* f018e40: 0c005668 */ jal 0x159a0 +/* f018e40: 0c005668 */ jal mtx4MultMtx4 /* f018e44: 27a60420 */ addiu $a2,$sp,0x420 /* f018e48: 3c018006 */ lui $at,0x8006 /* f018e4c: c42c26fc */ lwc1 $f12,0x26fc($at) -/* f018e50: 0c0057a9 */ jal 0x15ea4 +/* f018e50: 0c0057a9 */ jal mtx00015f04 /* f018e54: 27a50420 */ addiu $a1,$sp,0x420 /* f018e58: 3c198006 */ lui $t9,0x8006 /* f018e5c: 8f39273c */ lw $t9,0x273c($t9) @@ -4216,7 +4216,7 @@ glabel var7f1a8f88jf /* f018e6c: 8faf03dc */ lw $t7,0x3dc($sp) /* f018e70: afa0026c */ sw $zero,0x26c($sp) /* f018e74: afa00268 */ sw $zero,0x268($sp) -/* f018e78: 0c006a2f */ jal 0x1a8bc +/* f018e78: 0c006a2f */ jal modelGetPart /* f018e7c: 8de40008 */ lw $a0,0x8($t7) /* f018e80: 10400027 */ beqz $v0,.JF0f018f20 /* f018e84: 00402825 */ move $a1,$v0 @@ -4228,10 +4228,10 @@ glabel var7f1a8f88jf /* f018e9c: 94d90016 */ lhu $t9,0x16($a2) /* f018ea0: afa60314 */ sw $a2,0x314($sp) /* f018ea4: 272f0001 */ addiu $t7,$t9,0x1 -/* f018ea8: 0c006a6f */ jal 0x1a9bc +/* f018ea8: 0c006a6f */ jal modelGetNodeRwData /* f018eac: afaf0268 */ sw $t7,0x268($sp) /* f018eb0: afa20310 */ sw $v0,0x310($sp) -/* f018eb4: 0fc59f81 */ jal 0xf167e04 +/* f018eb4: 0fc59f81 */ jal gfxAllocate /* f018eb8: 24040028 */ li $a0,0x28 /* f018ebc: 8fae0310 */ lw $t6,0x310($sp) /* f018ec0: 8fa60314 */ lw $a2,0x314($sp) @@ -4261,7 +4261,7 @@ glabel var7f1a8f88jf .JF0f018f20: /* f018f20: 8fb803dc */ lw $t8,0x3dc($sp) /* f018f24: 24050004 */ li $a1,0x4 -/* f018f28: 0c006a2f */ jal 0x1a8bc +/* f018f28: 0c006a2f */ jal modelGetPart /* f018f2c: 8f040008 */ lw $a0,0x8($t8) /* f018f30: 10400037 */ beqz $v0,.JF0f019010 /* f018f34: 00402825 */ move $a1,$v0 @@ -4277,10 +4277,10 @@ glabel var7f1a8f88jf /* f018f5c: afa60314 */ sw $a2,0x314($sp) /* f018f60: 032f7021 */ addu $t6,$t9,$t7 /* f018f64: 25d80001 */ addiu $t8,$t6,0x1 -/* f018f68: 0c006a6f */ jal 0x1a9bc +/* f018f68: 0c006a6f */ jal modelGetNodeRwData /* f018f6c: afb80268 */ sw $t8,0x268($sp) /* f018f70: afa20310 */ sw $v0,0x310($sp) -/* f018f74: 0fc59f81 */ jal 0xf167e04 +/* f018f74: 0fc59f81 */ jal gfxAllocate /* f018f78: 24040028 */ li $a0,0x28 /* f018f7c: 8fb90310 */ lw $t9,0x310($sp) /* f018f80: 8fa60314 */ lw $a2,0x314($sp) @@ -4323,7 +4323,7 @@ glabel var7f1a8f88jf .JF0f019010: /* f019010: 8fae03dc */ lw $t6,0x3dc($sp) /* f019014: 24050006 */ li $a1,0x6 -/* f019018: 0c006a2f */ jal 0x1a8bc +/* f019018: 0c006a2f */ jal modelGetPart /* f01901c: 8dc40008 */ lw $a0,0x8($t6) /* f019020: 10400037 */ beqz $v0,.JF0f019100 /* f019024: 00402825 */ move $a1,$v0 @@ -4339,10 +4339,10 @@ glabel var7f1a8f88jf /* f01904c: afa60314 */ sw $a2,0x314($sp) /* f019050: 03197821 */ addu $t7,$t8,$t9 /* f019054: 25ee0001 */ addiu $t6,$t7,0x1 -/* f019058: 0c006a6f */ jal 0x1a9bc +/* f019058: 0c006a6f */ jal modelGetNodeRwData /* f01905c: afae0268 */ sw $t6,0x268($sp) /* f019060: afa20310 */ sw $v0,0x310($sp) -/* f019064: 0fc59f81 */ jal 0xf167e04 +/* f019064: 0fc59f81 */ jal gfxAllocate /* f019068: 24040028 */ li $a0,0x28 /* f01906c: 8fb80310 */ lw $t8,0x310($sp) /* f019070: 8fa60314 */ lw $a2,0x314($sp) @@ -4385,7 +4385,7 @@ glabel var7f1a8f88jf .JF0f019100: /* f019100: 8faf03dc */ lw $t7,0x3dc($sp) /* f019104: 24050008 */ li $a1,0x8 -/* f019108: 0c006a2f */ jal 0x1a8bc +/* f019108: 0c006a2f */ jal modelGetPart /* f01910c: 8de40008 */ lw $a0,0x8($t7) /* f019110: 10400037 */ beqz $v0,.JF0f0191f0 /* f019114: 00402825 */ move $a1,$v0 @@ -4401,10 +4401,10 @@ glabel var7f1a8f88jf /* f01913c: afa60314 */ sw $a2,0x314($sp) /* f019140: 01d8c821 */ addu $t9,$t6,$t8 /* f019144: 272f0001 */ addiu $t7,$t9,0x1 -/* f019148: 0c006a6f */ jal 0x1a9bc +/* f019148: 0c006a6f */ jal modelGetNodeRwData /* f01914c: afaf0268 */ sw $t7,0x268($sp) /* f019150: afa20310 */ sw $v0,0x310($sp) -/* f019154: 0fc59f81 */ jal 0xf167e04 +/* f019154: 0fc59f81 */ jal gfxAllocate /* f019158: 24040028 */ li $a0,0x28 /* f01915c: 8fae0310 */ lw $t6,0x310($sp) /* f019160: 8fa60314 */ lw $a2,0x314($sp) @@ -4445,10 +4445,10 @@ glabel var7f1a8f88jf /* f0191e8: ac580000 */ sw $t8,0x0($v0) /* f0191ec: ac400004 */ sw $zero,0x4($v0) .JF0f0191f0: -/* f0191f0: 0fc59f5d */ jal 0xf167d74 +/* f0191f0: 0fc59f5d */ jal gfxAllocateVertices /* f0191f4: 8fa4026c */ lw $a0,0x26c($sp) /* f0191f8: afa2004c */ sw $v0,0x4c($sp) -/* f0191fc: 0fc59f77 */ jal 0xf167ddc +/* f0191fc: 0fc59f77 */ jal gfxAllocateColours /* f019200: 8fa40268 */ lw $a0,0x268($sp) /* f019204: 3c013f80 */ lui $at,0x3f80 /* f019208: 44815000 */ mtc1 $at,$f10 @@ -4465,7 +4465,7 @@ glabel var7f1a8f88jf /* f019234: 8fa503dc */ lw $a1,0x3dc($sp) /* f019238: afa20020 */ sw $v0,0x20($sp) /* f01923c: afae001c */ sw $t6,0x1c($sp) -/* f019240: 0fc05d8a */ jal 0xf017628 +/* f019240: 0fc05d8a */ jal titleRenderPdLogoModel /* f019244: e7aa0014 */ swc1 $f10,0x14($sp) /* f019248: afa204e0 */ sw $v0,0x4e0($sp) /* f01924c: 8fa204e0 */ lw $v0,0x4e0($sp) @@ -4503,23 +4503,23 @@ glabel var7f1a8f88jf /* f0192c8: ac810008 */ sw $at,0x8($a0) /* f0192cc: afa90040 */ sw $t1,0x40($sp) /* f0192d0: afa80044 */ sw $t0,0x44($sp) -/* f0192d4: 0c00599f */ jal 0x1667c +/* f0192d4: 0c00599f */ jal mtx4LoadTranslation /* f0192d8: afa704e0 */ sw $a3,0x4e0($sp) /* f0192dc: 3c017f1b */ lui $at,0x7f1b /* f0192e0: c42c8ff0 */ lwc1 $f12,-0x7010($at) -/* f0192e4: 0c005792 */ jal 0x15e48 +/* f0192e4: 0c005792 */ jal mtx00015ea8 /* f0192e8: 27a50398 */ addiu $a1,$sp,0x398 /* f0192ec: 27a40460 */ addiu $a0,$sp,0x460 /* f0192f0: 27a50398 */ addiu $a1,$sp,0x398 -/* f0192f4: 0c005668 */ jal 0x159a0 +/* f0192f4: 0c005668 */ jal mtx4MultMtx4 /* f0192f8: 27a603e0 */ addiu $a2,$sp,0x3e0 /* f0192fc: 3c017f1b */ lui $at,0x7f1b /* f019300: c42c8ff4 */ lwc1 $f12,-0x700c($at) -/* f019304: 0c0057a9 */ jal 0x15ea4 +/* f019304: 0c0057a9 */ jal mtx00015f04 /* f019308: 27a503e0 */ addiu $a1,$sp,0x3e0 /* f01930c: 3c014060 */ lui $at,0x4060 /* f019310: 44816000 */ mtc1 $at,$f12 -/* f019314: 0c0057a9 */ jal 0x15ea4 +/* f019314: 0c0057a9 */ jal mtx00015f04 /* f019318: 27a503e0 */ addiu $a1,$sp,0x3e0 /* f01931c: 3c048006 */ lui $a0,0x8006 /* f019320: 8c84273c */ lw $a0,0x273c($a0) @@ -4570,7 +4570,7 @@ glabel var7f1a8f88jf /* f0193cc: 00000000 */ nop .JF0f0193d0: /* f0193d0: 44cef800 */ ctc1 $t6,$31 -/* f0193d4: 0c005654 */ jal 0x15950 +/* f0193d4: 0c005654 */ jal mtx4LoadIdentity /* f0193d8: afb90198 */ sw $t9,0x198($sp) /* f0193dc: 3c01800a */ lui $at,0x800a /* f0193e0: c426d350 */ lwc1 $f6,-0x2cb0($at) @@ -4578,7 +4578,7 @@ glabel var7f1a8f88jf /* f0193e8: 44815000 */ mtc1 $at,$f10 /* f0193ec: 27a501b0 */ addiu $a1,$sp,0x1b0 /* f0193f0: 460a3302 */ mul.s $f12,$f6,$f10 -/* f0193f4: 0c0057a9 */ jal 0x15ea4 +/* f0193f4: 0c0057a9 */ jal mtx00015f04 /* f0193f8: 00000000 */ nop /* f0193fc: 44800000 */ mtc1 $zero,$f0 /* f019400: 3c013f80 */ lui $at,0x3f80 @@ -4592,13 +4592,13 @@ glabel var7f1a8f88jf /* f019420: e7a00018 */ swc1 $f0,0x18($sp) /* f019424: e7a0001c */ swc1 $f0,0x1c($sp) /* f019428: e7a00024 */ swc1 $f0,0x24($sp) -/* f01942c: 0c005aa1 */ jal 0x16a84 +/* f01942c: 0c005aa1 */ jal mtx00016ae4 /* f019430: e7a40020 */ swc1 $f4,0x20($sp) /* f019434: 27a40460 */ addiu $a0,$sp,0x460 -/* f019438: 0c005667 */ jal 0x1599c +/* f019438: 0c005667 */ jal mtx4MultMtx4InPlace /* f01943c: 27a501b0 */ addiu $a1,$sp,0x1b0 /* f019440: 27a401b0 */ addiu $a0,$sp,0x1b0 -/* f019444: 0c00572e */ jal 0x15cb8 +/* f019444: 0c00572e */ jal mtx4Copy /* f019448: 27a50460 */ addiu $a1,$sp,0x460 /* f01944c: 3c0f8006 */ lui $t7,0x8006 /* f019450: 8def23f8 */ lw $t7,0x23f8($t7) @@ -4607,18 +4607,18 @@ glabel var7f1a8f88jf /* f01945c: 8dee0008 */ lw $t6,0x8($t7) /* f019460: 85c4000e */ lh $a0,0xe($t6) /* f019464: 0004c980 */ sll $t9,$a0,0x6 -/* f019468: 0fc59f81 */ jal 0xf167e04 +/* f019468: 0fc59f81 */ jal gfxAllocate /* f01946c: 03202025 */ move $a0,$t9 /* f019470: afa204b0 */ sw $v0,0x4b0($sp) /* f019474: 27a40460 */ addiu $a0,$sp,0x460 -/* f019478: 0c00572e */ jal 0x15cb8 +/* f019478: 0c00572e */ jal mtx4Copy /* f01947c: 00402825 */ move $a1,$v0 /* f019480: 3c028006 */ lui $v0,0x8006 /* f019484: 244223f8 */ addiu $v0,$v0,0x23f8 /* f019488: 8c4f0000 */ lw $t7,0x0($v0) /* f01948c: 8fb804b0 */ lw $t8,0x4b0($sp) /* f019490: adf8000c */ sw $t8,0xc($t7) -/* f019494: 0c0072fc */ jal 0x1cbf0 +/* f019494: 0c0072fc */ jal model0001cc20 /* f019498: 8c440000 */ lw $a0,0x0($v0) /* f01949c: 8fb80198 */ lw $t8,0x198($sp) /* f0194a0: 240e0005 */ li $t6,0x5 @@ -4634,7 +4634,7 @@ glabel var7f1a8f88jf /* f0194c8: afaf04d4 */ sw $t7,0x4d4($sp) /* f0194cc: 8ca523f8 */ lw $a1,0x23f8($a1) /* f0194d0: 27a404a0 */ addiu $a0,$sp,0x4a0 -/* f0194d4: 0c008682 */ jal 0x21a08 +/* f0194d4: 0c008682 */ jal modelRender /* f0194d8: afae04ac */ sw $t6,0x4ac($sp) /* f0194dc: 8fab04ac */ lw $t3,0x4ac($sp) /* f0194e0: 3c038006 */ lui $v1,0x8006 @@ -4652,7 +4652,7 @@ glabel var7f1a8f88jf /* f01950c: afa6003c */ sw $a2,0x3c($sp) /* f019510: afa2019c */ sw $v0,0x19c($sp) /* f019514: 27a50158 */ addiu $a1,$sp,0x158 -/* f019518: 0c00572e */ jal 0x15cb8 +/* f019518: 0c00572e */ jal mtx4Copy /* f01951c: 01e62021 */ addu $a0,$t7,$a2 /* f019520: 3c0e8006 */ lui $t6,0x8006 /* f019524: 8dce23f8 */ lw $t6,0x23f8($t6) @@ -4660,7 +4660,7 @@ glabel var7f1a8f88jf /* f01952c: 27a40158 */ addiu $a0,$sp,0x158 /* f019530: 8dd9000c */ lw $t9,0xc($t6) /* f019534: 0002c180 */ sll $t8,$v0,0x6 -/* f019538: 0c0057fd */ jal 0x15ff4 +/* f019538: 0c0057fd */ jal mtx00016054 /* f01953c: 03382821 */ addu $a1,$t9,$t8 /* f019540: 3c038006 */ lui $v1,0x8006 /* f019544: 8c6323f8 */ lw $v1,0x23f8($v1) @@ -4901,18 +4901,18 @@ glabel var7f1a8f88jf /* f0198b8: afa90150 */ sw $t1,0x150($sp) /* f0198bc: afa80154 */ sw $t0,0x154($sp) /* f0198c0: 00047980 */ sll $t7,$a0,0x6 -/* f0198c4: 0fc59f81 */ jal 0xf167e04 +/* f0198c4: 0fc59f81 */ jal gfxAllocate /* f0198c8: 01e02025 */ move $a0,$t7 /* f0198cc: afa204b0 */ sw $v0,0x4b0($sp) /* f0198d0: 27a403e0 */ addiu $a0,$sp,0x3e0 -/* f0198d4: 0c00572e */ jal 0x15cb8 +/* f0198d4: 0c00572e */ jal mtx4Copy /* f0198d8: 00402825 */ move $a1,$v0 /* f0198dc: 3c028006 */ lui $v0,0x8006 /* f0198e0: 244223fc */ addiu $v0,$v0,0x23fc /* f0198e4: 8c590000 */ lw $t9,0x0($v0) /* f0198e8: 8fae04b0 */ lw $t6,0x4b0($sp) /* f0198ec: af2e000c */ sw $t6,0xc($t9) -/* f0198f0: 0c0072fc */ jal 0x1cbf0 +/* f0198f0: 0c0072fc */ jal model0001cc20 /* f0198f4: 8c440000 */ lw $a0,0x0($v0) /* f0198f8: 8fa80154 */ lw $t0,0x154($sp) /* f0198fc: 24180005 */ li $t8,0x5 @@ -4937,7 +4937,7 @@ glabel var7f1a8f88jf /* f019940: afa904d4 */ sw $t1,0x4d4($sp) /* f019944: 8ca523fc */ lw $a1,0x23fc($a1) /* f019948: 27a404a0 */ addiu $a0,$sp,0x4a0 -/* f01994c: 0c008682 */ jal 0x21a08 +/* f01994c: 0c008682 */ jal modelRender /* f019950: afaf04ac */ sw $t7,0x4ac($sp) /* f019954: 8fae04ac */ lw $t6,0x4ac($sp) /* f019958: 3c038006 */ lui $v1,0x8006 @@ -4954,7 +4954,7 @@ glabel var7f1a8f88jf /* f019980: afa60044 */ sw $a2,0x44($sp) /* f019984: afa2014c */ sw $v0,0x14c($sp) /* f019988: 27a500f4 */ addiu $a1,$sp,0xf4 -/* f01998c: 0c00572e */ jal 0x15cb8 +/* f01998c: 0c00572e */ jal mtx4Copy /* f019990: 01e62021 */ addu $a0,$t7,$a2 /* f019994: 3c0e8006 */ lui $t6,0x8006 /* f019998: 8dce23fc */ lw $t6,0x23fc($t6) @@ -4962,7 +4962,7 @@ glabel var7f1a8f88jf /* f0199a0: 27a400f4 */ addiu $a0,$sp,0xf4 /* f0199a4: 8dd9000c */ lw $t9,0xc($t6) /* f0199a8: 0002c180 */ sll $t8,$v0,0x6 -/* f0199ac: 0c0057fd */ jal 0x15ff4 +/* f0199ac: 0c0057fd */ jal mtx00016054 /* f0199b0: 03382821 */ addu $a1,$t9,$t8 /* f0199b4: 3c038006 */ lui $v1,0x8006 /* f0199b8: 8c6323fc */ lw $v1,0x23fc($v1) @@ -4976,7 +4976,7 @@ glabel var7f1a8f88jf /* f0199d8: 5420ffe9 */ bnezl $at,.JF0f019980 /* f0199dc: 8c6f000c */ lw $t7,0xc($v1) .JF0f0199e0: -/* f0199e0: 0c005654 */ jal 0x15950 +/* f0199e0: 0c005654 */ jal mtx4LoadIdentity /* f0199e4: 27a400b0 */ addiu $a0,$sp,0xb0 /* f0199e8: 3c01800a */ lui $at,0x800a /* f0199ec: c424d34c */ lwc1 $f4,-0x2cb4($at) @@ -4984,7 +4984,7 @@ glabel var7f1a8f88jf /* f0199f4: 44815000 */ mtc1 $at,$f10 /* f0199f8: 27a500b0 */ addiu $a1,$sp,0xb0 /* f0199fc: 460a2302 */ mul.s $f12,$f4,$f10 -/* f019a00: 0c0057a9 */ jal 0x15ea4 +/* f019a00: 0c0057a9 */ jal mtx00015f04 /* f019a04: 00000000 */ nop /* f019a08: 44804000 */ mtc1 $zero,$f8 /* f019a0c: 44803000 */ mtc1 $zero,$f6 @@ -5002,13 +5002,13 @@ glabel var7f1a8f88jf /* f019a3c: e7a60024 */ swc1 $f6,0x24($sp) /* f019a40: e7a80020 */ swc1 $f8,0x20($sp) /* f019a44: e7a40018 */ swc1 $f4,0x18($sp) -/* f019a48: 0c005aa1 */ jal 0x16a84 +/* f019a48: 0c005aa1 */ jal mtx00016ae4 /* f019a4c: e7aa001c */ swc1 $f10,0x1c($sp) /* f019a50: 27a40460 */ addiu $a0,$sp,0x460 -/* f019a54: 0c005667 */ jal 0x1599c +/* f019a54: 0c005667 */ jal mtx4MultMtx4InPlace /* f019a58: 27a500b0 */ addiu $a1,$sp,0xb0 /* f019a5c: 27a400b0 */ addiu $a0,$sp,0xb0 -/* f019a60: 0c00572e */ jal 0x15cb8 +/* f019a60: 0c00572e */ jal mtx4Copy /* f019a64: 27a50460 */ addiu $a1,$sp,0x460 /* f019a68: 3c188006 */ lui $t8,0x8006 /* f019a6c: 8f1823f4 */ lw $t8,0x23f4($t8) @@ -5017,18 +5017,18 @@ glabel var7f1a8f88jf /* f019a78: 8f0f0008 */ lw $t7,0x8($t8) /* f019a7c: 85e4000e */ lh $a0,0xe($t7) /* f019a80: 00047180 */ sll $t6,$a0,0x6 -/* f019a84: 0fc59f81 */ jal 0xf167e04 +/* f019a84: 0fc59f81 */ jal gfxAllocate /* f019a88: 01c02025 */ move $a0,$t6 /* f019a8c: afa204b0 */ sw $v0,0x4b0($sp) /* f019a90: 27a40460 */ addiu $a0,$sp,0x460 -/* f019a94: 0c00572e */ jal 0x15cb8 +/* f019a94: 0c00572e */ jal mtx4Copy /* f019a98: 00402825 */ move $a1,$v0 /* f019a9c: 3c028006 */ lui $v0,0x8006 /* f019aa0: 244223f4 */ addiu $v0,$v0,0x23f4 /* f019aa4: 8c580000 */ lw $t8,0x0($v0) /* f019aa8: 8fb904b0 */ lw $t9,0x4b0($sp) /* f019aac: af19000c */ sw $t9,0xc($t8) -/* f019ab0: 0c0072fc */ jal 0x1cbf0 +/* f019ab0: 0c0072fc */ jal model0001cc20 /* f019ab4: 8c440000 */ lw $a0,0x0($v0) /* f019ab8: 8fb804e0 */ lw $t8,0x4e0($sp) /* f019abc: 240f0005 */ li $t7,0x5 @@ -5041,7 +5041,7 @@ glabel var7f1a8f88jf /* f019ad8: afb904d4 */ sw $t9,0x4d4($sp) /* f019adc: 8ca523f4 */ lw $a1,0x23f4($a1) /* f019ae0: 27a404a0 */ addiu $a0,$sp,0x4a0 -/* f019ae4: 0c008682 */ jal 0x21a08 +/* f019ae4: 0c008682 */ jal modelRender /* f019ae8: afb804ac */ sw $t8,0x4ac($sp) /* f019aec: 8faf04ac */ lw $t7,0x4ac($sp) /* f019af0: 3c038006 */ lui $v1,0x8006 @@ -5058,7 +5058,7 @@ glabel var7f1a8f88jf /* f019b18: afa60044 */ sw $a2,0x44($sp) /* f019b1c: afa2009c */ sw $v0,0x9c($sp) /* f019b20: 27a5005c */ addiu $a1,$sp,0x5c -/* f019b24: 0c00572e */ jal 0x15cb8 +/* f019b24: 0c00572e */ jal mtx4Copy /* f019b28: 03062021 */ addu $a0,$t8,$a2 /* f019b2c: 3c0f8006 */ lui $t7,0x8006 /* f019b30: 8def23f4 */ lw $t7,0x23f4($t7) @@ -5066,7 +5066,7 @@ glabel var7f1a8f88jf /* f019b38: 27a4005c */ addiu $a0,$sp,0x5c /* f019b3c: 8dee000c */ lw $t6,0xc($t7) /* f019b40: 0002c980 */ sll $t9,$v0,0x6 -/* f019b44: 0c0057fd */ jal 0x15ff4 +/* f019b44: 0c0057fd */ jal mtx00016054 /* f019b48: 01d92821 */ addu $a1,$t6,$t9 /* f019b4c: 3c038006 */ lui $v1,0x8006 /* f019b50: 8c6323f4 */ lw $v1,0x23f4($v1) @@ -10164,11 +10164,11 @@ glabel titleRenderNoController /* f01b2f0: afbf003c */ sw $ra,0x3c($sp) /* f01b2f4: afb10038 */ sw $s1,0x38($sp) /* f01b2f8: 00808825 */ move $s1,$a0 -/* f01b2fc: 0c004ff9 */ jal 0x13fe4 +/* f01b2fc: 0c004ff9 */ jal joyGetConnectedControllers /* f01b300: afb00034 */ sw $s0,0x34($sp) -/* f01b304: 0fc07058 */ jal 0xf01c160 +/* f01b304: 0fc07058 */ jal func0f01afc0 /* f01b308: 02202025 */ move $a0,$s1 -/* f01b30c: 0fc54b55 */ jal 0xf152d54 +/* f01b30c: 0fc54b55 */ jal func0f153628 /* f01b310: 00402025 */ move $a0,$v0 /* f01b314: 3c0e8006 */ lui $t6,0x8006 /* f01b318: 85ce2380 */ lh $t6,0x2380($t6) @@ -10185,7 +10185,7 @@ glabel titleRenderNoController /* f01b340: 3c018008 */ lui $at,0x8008 /* f01b344: afb80058 */ sw $t8,0x58($sp) /* f01b348: ac23010c */ sw $v1,0x10c($at) -/* f01b34c: 0fc5baa5 */ jal 0xf16ea94 +/* f01b34c: 0fc5baa5 */ jal langGet /* f01b350: 2404551d */ li $a0,0x551d /* f01b354: 3c198008 */ lui $t9,0x8008 /* f01b358: 8f390158 */ lw $t9,0x158($t9) @@ -10196,16 +10196,16 @@ glabel titleRenderNoController /* f01b36c: 27a50060 */ addiu $a1,$sp,0x60 /* f01b370: 00403025 */ move $a2,$v0 /* f01b374: afa00014 */ sw $zero,0x14($sp) -/* f01b378: 0fc55d49 */ jal 0xf157524 +/* f01b378: 0fc55d49 */ jal textMeasure /* f01b37c: afb90010 */ sw $t9,0x10($sp) /* f01b380: 8fa80060 */ lw $t0,0x60($sp) /* f01b384: 24090120 */ li $t1,0x120 /* f01b388: 01285023 */ subu $t2,$t1,$t0 -/* f01b38c: 0c002eeb */ jal 0xbbac +/* f01b38c: 0c002eeb */ jal viGetWidth /* f01b390: afaa005c */ sw $t2,0x5c($sp) /* f01b394: 00028400 */ sll $s0,$v0,0x10 /* f01b398: 00105c03 */ sra $t3,$s0,0x10 -/* f01b39c: 0c002eef */ jal 0xbbbc +/* f01b39c: 0c002eef */ jal viGetHeight /* f01b3a0: 01608025 */ move $s0,$t3 /* f01b3a4: 3c0c8008 */ lui $t4,0x8008 /* f01b3a8: 3c0d8008 */ lui $t5,0x8008 @@ -10222,13 +10222,13 @@ glabel titleRenderNoController /* f01b3d4: afa00024 */ sw $zero,0x24($sp) /* f01b3d8: afa00028 */ sw $zero,0x28($sp) /* f01b3dc: afad0014 */ sw $t5,0x14($sp) -/* f01b3e0: 0fc55886 */ jal 0xf156218 +/* f01b3e0: 0fc55886 */ jal textRenderProjected /* f01b3e4: afac0010 */ sw $t4,0x10($sp) /* f01b3e8: 8faf0058 */ lw $t7,0x58($sp) /* f01b3ec: 00408825 */ move $s1,$v0 /* f01b3f0: 2404551e */ li $a0,0x551e /* f01b3f4: 25f80012 */ addiu $t8,$t7,0x12 -/* f01b3f8: 0fc5baa5 */ jal 0xf16ea94 +/* f01b3f8: 0fc5baa5 */ jal langGet /* f01b3fc: afb80058 */ sw $t8,0x58($sp) /* f01b400: 3c198008 */ lui $t9,0x8008 /* f01b404: 8f390158 */ lw $t9,0x158($t9) @@ -10239,16 +10239,16 @@ glabel titleRenderNoController /* f01b418: 27a50060 */ addiu $a1,$sp,0x60 /* f01b41c: 00403025 */ move $a2,$v0 /* f01b420: afa00014 */ sw $zero,0x14($sp) -/* f01b424: 0fc55d49 */ jal 0xf157524 +/* f01b424: 0fc55d49 */ jal textMeasure /* f01b428: afb90010 */ sw $t9,0x10($sp) /* f01b42c: 8fa90060 */ lw $t1,0x60($sp) /* f01b430: 24080120 */ li $t0,0x120 /* f01b434: 01095023 */ subu $t2,$t0,$t1 -/* f01b438: 0c002eeb */ jal 0xbbac +/* f01b438: 0c002eeb */ jal viGetWidth /* f01b43c: afaa005c */ sw $t2,0x5c($sp) /* f01b440: 00028400 */ sll $s0,$v0,0x10 /* f01b444: 00105c03 */ sra $t3,$s0,0x10 -/* f01b448: 0c002eef */ jal 0xbbbc +/* f01b448: 0c002eef */ jal viGetHeight /* f01b44c: 01608025 */ move $s0,$t3 /* f01b450: 3c0c8008 */ lui $t4,0x8008 /* f01b454: 3c0d8008 */ lui $t5,0x8008 @@ -10265,13 +10265,13 @@ glabel titleRenderNoController /* f01b480: afa00024 */ sw $zero,0x24($sp) /* f01b484: afa00028 */ sw $zero,0x28($sp) /* f01b488: afad0014 */ sw $t5,0x14($sp) -/* f01b48c: 0fc55886 */ jal 0xf156218 +/* f01b48c: 0fc55886 */ jal textRenderProjected /* f01b490: afac0010 */ sw $t4,0x10($sp) /* f01b494: 8faf0058 */ lw $t7,0x58($sp) /* f01b498: 00408825 */ move $s1,$v0 /* f01b49c: 2404551f */ li $a0,0x551f /* f01b4a0: 25f8001c */ addiu $t8,$t7,0x1c -/* f01b4a4: 0fc5baa5 */ jal 0xf16ea94 +/* f01b4a4: 0fc5baa5 */ jal langGet /* f01b4a8: afb80058 */ sw $t8,0x58($sp) /* f01b4ac: 3c198008 */ lui $t9,0x8008 /* f01b4b0: 8f390158 */ lw $t9,0x158($t9) @@ -10282,16 +10282,16 @@ glabel titleRenderNoController /* f01b4c4: 27a50060 */ addiu $a1,$sp,0x60 /* f01b4c8: 00403025 */ move $a2,$v0 /* f01b4cc: afa00014 */ sw $zero,0x14($sp) -/* f01b4d0: 0fc55d49 */ jal 0xf157524 +/* f01b4d0: 0fc55d49 */ jal textMeasure /* f01b4d4: afb90010 */ sw $t9,0x10($sp) /* f01b4d8: 8fa80060 */ lw $t0,0x60($sp) /* f01b4dc: 24090120 */ li $t1,0x120 /* f01b4e0: 01285023 */ subu $t2,$t1,$t0 -/* f01b4e4: 0c002eeb */ jal 0xbbac +/* f01b4e4: 0c002eeb */ jal viGetWidth /* f01b4e8: afaa005c */ sw $t2,0x5c($sp) /* f01b4ec: 00028400 */ sll $s0,$v0,0x10 /* f01b4f0: 00105c03 */ sra $t3,$s0,0x10 -/* f01b4f4: 0c002eef */ jal 0xbbbc +/* f01b4f4: 0c002eef */ jal viGetHeight /* f01b4f8: 01608025 */ move $s0,$t3 /* f01b4fc: 3c0c8008 */ lui $t4,0x8008 /* f01b500: 3c0d8008 */ lui $t5,0x8008 @@ -10308,13 +10308,13 @@ glabel titleRenderNoController /* f01b52c: afa00024 */ sw $zero,0x24($sp) /* f01b530: afa00028 */ sw $zero,0x28($sp) /* f01b534: afad0014 */ sw $t5,0x14($sp) -/* f01b538: 0fc55886 */ jal 0xf156218 +/* f01b538: 0fc55886 */ jal textRenderProjected /* f01b53c: afac0010 */ sw $t4,0x10($sp) /* f01b540: 8faf0058 */ lw $t7,0x58($sp) /* f01b544: 00408825 */ move $s1,$v0 /* f01b548: 24045520 */ li $a0,0x5520 /* f01b54c: 25f80012 */ addiu $t8,$t7,0x12 -/* f01b550: 0fc5baa5 */ jal 0xf16ea94 +/* f01b550: 0fc5baa5 */ jal langGet /* f01b554: afb80058 */ sw $t8,0x58($sp) /* f01b558: 3c198008 */ lui $t9,0x8008 /* f01b55c: 8f390158 */ lw $t9,0x158($t9) @@ -10325,16 +10325,16 @@ glabel titleRenderNoController /* f01b570: 27a50060 */ addiu $a1,$sp,0x60 /* f01b574: 00403025 */ move $a2,$v0 /* f01b578: afa00014 */ sw $zero,0x14($sp) -/* f01b57c: 0fc55d49 */ jal 0xf157524 +/* f01b57c: 0fc55d49 */ jal textMeasure /* f01b580: afb90010 */ sw $t9,0x10($sp) /* f01b584: 8fa90060 */ lw $t1,0x60($sp) /* f01b588: 24080120 */ li $t0,0x120 /* f01b58c: 01095023 */ subu $t2,$t0,$t1 -/* f01b590: 0c002eeb */ jal 0xbbac +/* f01b590: 0c002eeb */ jal viGetWidth /* f01b594: afaa005c */ sw $t2,0x5c($sp) /* f01b598: 00028400 */ sll $s0,$v0,0x10 /* f01b59c: 00105c03 */ sra $t3,$s0,0x10 -/* f01b5a0: 0c002eef */ jal 0xbbbc +/* f01b5a0: 0c002eef */ jal viGetHeight /* f01b5a4: 01608025 */ move $s0,$t3 /* f01b5a8: 3c0c8008 */ lui $t4,0x8008 /* f01b5ac: 3c0d8008 */ lui $t5,0x8008 @@ -10351,7 +10351,7 @@ glabel titleRenderNoController /* f01b5d8: afa00024 */ sw $zero,0x24($sp) /* f01b5dc: afa00028 */ sw $zero,0x28($sp) /* f01b5e0: afad0014 */ sw $t5,0x14($sp) -/* f01b5e4: 0fc55886 */ jal 0xf156218 +/* f01b5e4: 0fc55886 */ jal textRenderProjected /* f01b5e8: afac0010 */ sw $t4,0x10($sp) /* f01b5ec: 8faf0058 */ lw $t7,0x58($sp) /* f01b5f0: 24030001 */ li $v1,0x1 @@ -10361,7 +10361,7 @@ glabel titleRenderNoController /* f01b600: 25f80012 */ addiu $t8,$t7,0x12 /* f01b604: afb80058 */ sw $t8,0x58($sp) /* f01b608: ac23010c */ sw $v1,0x10c($at) -/* f01b60c: 0fc54bb7 */ jal 0xf152edc +/* f01b60c: 0fc54bb7 */ jal func0f153780 /* f01b610: 00402025 */ move $a0,$v0 /* f01b614: 8fbf003c */ lw $ra,0x3c($sp) /* f01b618: 8fb00034 */ lw $s0,0x34($sp) @@ -10653,17 +10653,17 @@ glabel var7f1a9058jf /* f01b640: 3c014270 */ lui $at,0x4270 /* f01b644: afbf0014 */ sw $ra,0x14($sp) /* f01b648: 44816000 */ mtc1 $at,$f12 -/* f01b64c: 0c002f35 */ jal 0xbcd4 +/* f01b64c: 0c002f35 */ jal viSetFovY /* f01b650: 00000000 */ nop /* f01b654: 3c017f1b */ lui $at,0x7f1b -/* f01b658: 0c002f48 */ jal 0xbd20 +/* f01b658: 0c002f48 */ jal viSetAspect /* f01b65c: c42c9058 */ lwc1 $f12,-0x6fa8($at) /* f01b660: 3c0142c8 */ lui $at,0x42c8 /* f01b664: 44816000 */ mtc1 $at,$f12 /* f01b668: 3c017f1b */ lui $at,0x7f1b -/* f01b66c: 0c002f8a */ jal 0xbe28 +/* f01b66c: 0c002f8a */ jal viSetZRange /* f01b670: c42e905c */ lwc1 $f14,-0x6fa4($at) -/* f01b674: 0c002f31 */ jal 0xbcc4 +/* f01b674: 0c002f31 */ jal viSetUseZBuf /* f01b678: 00002025 */ move $a0,$zero /* f01b67c: 3c028006 */ lui $v0,0x8006 /* f01b680: 244223a4 */ addiu $v0,$v0,0x23a4 @@ -10685,11 +10685,11 @@ GLOBAL_ASM( glabel titleRenderNoExpansion /* f01b6a4: 27bdffa0 */ addiu $sp,$sp,-96 /* f01b6a8: afbf0034 */ sw $ra,0x34($sp) -/* f01b6ac: 0c004ff9 */ jal 0x13fe4 +/* f01b6ac: 0c004ff9 */ jal joyGetConnectedControllers /* f01b6b0: afa40060 */ sw $a0,0x60($sp) -/* f01b6b4: 0fc07058 */ jal 0xf01c160 +/* f01b6b4: 0fc07058 */ jal func0f01afc0 /* f01b6b8: 8fa40060 */ lw $a0,0x60($sp) -/* f01b6bc: 0fc54b55 */ jal 0xf152d54 +/* f01b6bc: 0fc54b55 */ jal func0f153628 /* f01b6c0: 00402025 */ move $a0,$v0 /* f01b6c4: 3c0f8006 */ lui $t7,0x8006 /* f01b6c8: 85ef2380 */ lh $t7,0x2380($t7) @@ -10708,7 +10708,7 @@ glabel titleRenderNoExpansion /* f01b6f8: 3c018008 */ lui $at,0x8008 /* f01b6fc: afb90050 */ sw $t9,0x50($sp) /* f01b700: ac23010c */ sw $v1,0x10c($at) -/* f01b704: 0fc5baa5 */ jal 0xf16ea94 +/* f01b704: 0fc5baa5 */ jal langGet /* f01b708: 2404551a */ li $a0,0x551a /* f01b70c: 3c088008 */ lui $t0,0x8008 /* f01b710: 8d080158 */ lw $t0,0x158($t0) @@ -10719,14 +10719,14 @@ glabel titleRenderNoExpansion /* f01b724: 27a50058 */ addiu $a1,$sp,0x58 /* f01b728: 00403025 */ move $a2,$v0 /* f01b72c: afa00014 */ sw $zero,0x14($sp) -/* f01b730: 0fc55d49 */ jal 0xf157524 +/* f01b730: 0fc55d49 */ jal textMeasure /* f01b734: afa80010 */ sw $t0,0x10($sp) /* f01b738: 8fa90058 */ lw $t1,0x58($sp) /* f01b73c: 240a0120 */ li $t2,0x120 /* f01b740: 01495823 */ subu $t3,$t2,$t1 -/* f01b744: 0c002eeb */ jal 0xbbac +/* f01b744: 0c002eeb */ jal viGetWidth /* f01b748: afab0054 */ sw $t3,0x54($sp) -/* f01b74c: 0c002eef */ jal 0xbbbc +/* f01b74c: 0c002eef */ jal viGetHeight /* f01b750: a7a20040 */ sh $v0,0x40($sp) /* f01b754: 3c0c8008 */ lui $t4,0x8008 /* f01b758: 3c0d8008 */ lui $t5,0x8008 @@ -10744,13 +10744,13 @@ glabel titleRenderNoExpansion /* f01b788: afa00028 */ sw $zero,0x28($sp) /* f01b78c: afad0014 */ sw $t5,0x14($sp) /* f01b790: afac0010 */ sw $t4,0x10($sp) -/* f01b794: 0fc55886 */ jal 0xf156218 +/* f01b794: 0fc55886 */ jal textRenderProjected /* f01b798: afaf001c */ sw $t7,0x1c($sp) /* f01b79c: 8fb80050 */ lw $t8,0x50($sp) /* f01b7a0: afa20060 */ sw $v0,0x60($sp) /* f01b7a4: 2404551b */ li $a0,0x551b /* f01b7a8: 27190012 */ addiu $t9,$t8,0x12 -/* f01b7ac: 0fc5baa5 */ jal 0xf16ea94 +/* f01b7ac: 0fc5baa5 */ jal langGet /* f01b7b0: afb90050 */ sw $t9,0x50($sp) /* f01b7b4: 3c088008 */ lui $t0,0x8008 /* f01b7b8: 8d080158 */ lw $t0,0x158($t0) @@ -10761,14 +10761,14 @@ glabel titleRenderNoExpansion /* f01b7cc: 27a50058 */ addiu $a1,$sp,0x58 /* f01b7d0: 00403025 */ move $a2,$v0 /* f01b7d4: afa00014 */ sw $zero,0x14($sp) -/* f01b7d8: 0fc55d49 */ jal 0xf157524 +/* f01b7d8: 0fc55d49 */ jal textMeasure /* f01b7dc: afa80010 */ sw $t0,0x10($sp) /* f01b7e0: 8faa0058 */ lw $t2,0x58($sp) /* f01b7e4: 24090120 */ li $t1,0x120 /* f01b7e8: 012a5823 */ subu $t3,$t1,$t2 -/* f01b7ec: 0c002eeb */ jal 0xbbac +/* f01b7ec: 0c002eeb */ jal viGetWidth /* f01b7f0: afab0054 */ sw $t3,0x54($sp) -/* f01b7f4: 0c002eef */ jal 0xbbbc +/* f01b7f4: 0c002eef */ jal viGetHeight /* f01b7f8: a7a20040 */ sh $v0,0x40($sp) /* f01b7fc: 3c0c8008 */ lui $t4,0x8008 /* f01b800: 3c0d8008 */ lui $t5,0x8008 @@ -10786,13 +10786,13 @@ glabel titleRenderNoExpansion /* f01b830: afa00028 */ sw $zero,0x28($sp) /* f01b834: afad0014 */ sw $t5,0x14($sp) /* f01b838: afac0010 */ sw $t4,0x10($sp) -/* f01b83c: 0fc55886 */ jal 0xf156218 +/* f01b83c: 0fc55886 */ jal textRenderProjected /* f01b840: afaf001c */ sw $t7,0x1c($sp) /* f01b844: 8fb80050 */ lw $t8,0x50($sp) /* f01b848: afa20060 */ sw $v0,0x60($sp) /* f01b84c: 2404551c */ li $a0,0x551c /* f01b850: 27190012 */ addiu $t9,$t8,0x12 -/* f01b854: 0fc5baa5 */ jal 0xf16ea94 +/* f01b854: 0fc5baa5 */ jal langGet /* f01b858: afb90050 */ sw $t9,0x50($sp) /* f01b85c: 3c088008 */ lui $t0,0x8008 /* f01b860: 8d080158 */ lw $t0,0x158($t0) @@ -10803,14 +10803,14 @@ glabel titleRenderNoExpansion /* f01b874: 27a50058 */ addiu $a1,$sp,0x58 /* f01b878: 00403025 */ move $a2,$v0 /* f01b87c: afa00014 */ sw $zero,0x14($sp) -/* f01b880: 0fc55d49 */ jal 0xf157524 +/* f01b880: 0fc55d49 */ jal textMeasure /* f01b884: afa80010 */ sw $t0,0x10($sp) /* f01b888: 8fa90058 */ lw $t1,0x58($sp) /* f01b88c: 240a0120 */ li $t2,0x120 /* f01b890: 01495823 */ subu $t3,$t2,$t1 -/* f01b894: 0c002eeb */ jal 0xbbac +/* f01b894: 0c002eeb */ jal viGetWidth /* f01b898: afab0054 */ sw $t3,0x54($sp) -/* f01b89c: 0c002eef */ jal 0xbbbc +/* f01b89c: 0c002eef */ jal viGetHeight /* f01b8a0: a7a20040 */ sh $v0,0x40($sp) /* f01b8a4: 3c0c8008 */ lui $t4,0x8008 /* f01b8a8: 3c0d8008 */ lui $t5,0x8008 @@ -10828,7 +10828,7 @@ glabel titleRenderNoExpansion /* f01b8d8: afa00028 */ sw $zero,0x28($sp) /* f01b8dc: afad0014 */ sw $t5,0x14($sp) /* f01b8e0: afac0010 */ sw $t4,0x10($sp) -/* f01b8e4: 0fc55886 */ jal 0xf156218 +/* f01b8e4: 0fc55886 */ jal textRenderProjected /* f01b8e8: afaf001c */ sw $t7,0x1c($sp) /* f01b8ec: 8fb80050 */ lw $t8,0x50($sp) /* f01b8f0: 24030001 */ li $v1,0x1 @@ -10838,7 +10838,7 @@ glabel titleRenderNoExpansion /* f01b900: 27190012 */ addiu $t9,$t8,0x12 /* f01b904: afb90050 */ sw $t9,0x50($sp) /* f01b908: ac23010c */ sw $v1,0x10c($at) -/* f01b90c: 0fc54bb7 */ jal 0xf152edc +/* f01b90c: 0fc54bb7 */ jal func0f153780 /* f01b910: 00402025 */ move $a0,$v0 /* f01b914: 8fbf0034 */ lw $ra,0x34($sp) /* f01b918: 27bd0060 */ addiu $sp,$sp,0x60 diff --git a/src/game/training/menus.c b/src/game/training/menus.c index 6d9aa0117..3b58a889d 100644 --- a/src/game/training/menus.c +++ b/src/game/training/menus.c @@ -1934,7 +1934,7 @@ glabel var7f1b99d8 /* f1a7ec8: 3c048009 */ lui $a0,0x8009 /* f1a7ecc: afa500a4 */ sw $a1,0xa4($sp) /* f1a7ed0: 90848fd4 */ lbu $a0,-0x702c($a0) -/* f1a7ed4: 0fc68836 */ jal 0xf1a20d8 +/* f1a7ed4: 0fc68836 */ jal ciGetHangarBioIndexBySlot /* f1a7ed8: afa600a0 */ sw $a2,0xa0($sp) /* f1a7edc: 2841000e */ slti $at,$v0,0xe /* f1a7ee0: 14200076 */ bnez $at,.JF0f1a80bc diff --git a/src/game/training/training.c b/src/game/training/training.c index 4912c3b85..754a22bc2 100644 --- a/src/game/training/training.c +++ b/src/game/training/training.c @@ -71,7 +71,7 @@ glabel ciGetFiringRangeScore /* f19d314: afbf0014 */ sw $ra,0x14($sp) /* f19d318: 00802825 */ move $a1,$a0 /* f19d31c: afa50018 */ sw $a1,0x18($sp) -/* f19d320: 0fc67598 */ jal 0xf19d660 +/* f19d320: 0fc67598 */ jal frGetWeaponIndexByWeapon /* f19d324: 2404001a */ li $a0,0x1a /* f19d328: 8fa50018 */ lw $a1,0x18($sp) /* f19d32c: 8fbf0014 */ lw $ra,0x14($sp) @@ -3352,15 +3352,15 @@ glabel var7f1b94e4 /* f1a0388: 00184f00 */ sll $t1,$t8,0x1c /* f1a038c: 0520000b */ bltz $t1,.JF0f1a03bc /* f1a0390: 00000000 */ nop -/* f1a0394: 0fc67702 */ jal 0xf19dc08 +/* f1a0394: 0fc67702 */ jal frGetWeaponBySlot /* f1a0398: 96a40456 */ lhu $a0,0x456($s5) -/* f1a039c: 0fc44828 */ jal 0xf1120a0 +/* f1a039c: 0fc44828 */ jal invHasSingleWeaponIncAllGuns /* f1a03a0: 00402025 */ move $a0,$v0 /* f1a03a4: 10400005 */ beqz $v0,.JF0f1a03bc /* f1a03a8: 00000000 */ nop -/* f1a03ac: 0fc67702 */ jal 0xf19dc08 +/* f1a03ac: 0fc67702 */ jal frGetWeaponBySlot /* f1a03b0: 96a40456 */ lhu $a0,0x456($s5) -/* f1a03b4: 0fc28a35 */ jal 0xf0a28d4 +/* f1a03b4: 0fc28a35 */ jal bgunEquipWeapon /* f1a03b8: 00402025 */ move $a0,$v0 .JF0f1a03bc: /* f1a03bc: 3c15800b */ lui $s5,0x800b @@ -3404,7 +3404,7 @@ glabel var7f1b94e4 /* f1a0448: 02602825 */ move $a1,$s3 /* f1a044c: 50800004 */ beqzl $a0,.JF0f1a0460 /* f1a0450: 2610003c */ addiu $s0,$s0,0x3c -/* f1a0454: 0fc24d13 */ jal 0xf09344c +/* f1a0454: 0fc24d13 */ jal func0f0926bc /* f1a0458: 3406ffff */ li $a2,0xffff /* f1a045c: 2610003c */ addiu $s0,$s0,0x3c .JF0f1a0460: @@ -3426,16 +3426,16 @@ glabel var7f1b94e4 /* f1a049c: 10000370 */ b .JF0f1a1260 /* f1a04a0: 8fbf007c */ lw $ra,0x7c($sp) .JF0f1a04a4: -/* f1a04a4: 0fc6a034 */ jal 0xf1a80d0 +/* f1a04a4: 0fc6a034 */ jal ciGetFrWeaponListMenuDialog /* f1a04a8: 00000000 */ nop /* f1a04ac: 00402025 */ move $a0,$v0 -/* f1a04b0: 0fc3e4b6 */ jal 0xf0f92d8 +/* f1a04b0: 0fc3e4b6 */ jal func0f0f85e0 /* f1a04b4: 2405000d */ li $a1,0xd /* f1a04b8: 10000369 */ b .JF0f1a1260 /* f1a04bc: 8fbf007c */ lw $ra,0x7c($sp) .JF0f1a04c0: /* f1a04c0: 248495d0 */ addiu $a0,$a0,-27184 -/* f1a04c4: 0fc3e4b6 */ jal 0xf0f92d8 +/* f1a04c4: 0fc3e4b6 */ jal func0f0f85e0 /* f1a04c8: 2405000d */ li $a1,0xd /* f1a04cc: 10000364 */ b .JF0f1a1260 /* f1a04d0: 8fbf007c */ lw $ra,0x7c($sp) @@ -3452,11 +3452,11 @@ glabel var7f1b94e4 /* f1a04f8: 240505db */ li $a1,0x5db /* f1a04fc: 00003025 */ move $a2,$zero /* f1a0500: 2407ffff */ li $a3,-1 -/* f1a0504: 0c004230 */ jal 0x108c0 +/* f1a0504: 0c004230 */ jal sndStart /* f1a0508: e7b80014 */ swc1 $f24,0x14($sp) /* f1a050c: 3c048009 */ lui $a0,0x8009 /* f1a0510: 24849808 */ addiu $a0,$a0,-26616 -/* f1a0514: 0fc3e4b6 */ jal 0xf0f92d8 +/* f1a0514: 0fc3e4b6 */ jal func0f0f85e0 /* f1a0518: 2405000d */ li $a1,0xd /* f1a051c: 10000350 */ b .JF0f1a1260 /* f1a0520: 8fbf007c */ lw $ra,0x7c($sp) @@ -3473,16 +3473,16 @@ glabel var7f1b94e4 /* f1a0548: 240505dc */ li $a1,0x5dc /* f1a054c: 00003025 */ move $a2,$zero /* f1a0550: 2407ffff */ li $a3,-1 -/* f1a0554: 0c004230 */ jal 0x108c0 +/* f1a0554: 0c004230 */ jal sndStart /* f1a0558: e7b80014 */ swc1 $f24,0x14($sp) /* f1a055c: 3c048009 */ lui $a0,0x8009 /* f1a0560: 248496ec */ addiu $a0,$a0,-26900 -/* f1a0564: 0fc3e4b6 */ jal 0xf0f92d8 +/* f1a0564: 0fc3e4b6 */ jal func0f0f85e0 /* f1a0568: 2405000d */ li $a1,0xd /* f1a056c: 3c04800a */ lui $a0,0x800a /* f1a0570: 248429e0 */ addiu $a0,$a0,0x29e0 /* f1a0574: 00002825 */ move $a1,$zero -/* f1a0578: 0fc42599 */ jal 0xf109664 +/* f1a0578: 0fc42599 */ jal filemgrSaveOrLoad /* f1a057c: 00003025 */ move $a2,$zero /* f1a0580: 10000337 */ b .JF0f1a1260 /* f1a0584: 8fbf007c */ lw $ra,0x7c($sp) @@ -3516,7 +3516,7 @@ glabel var7f1b94e4 /* f1a05ec: 11400004 */ beqz $t2,.JF0f1a0600 /* f1a05f0: 3406ffff */ li $a2,0xffff /* f1a05f4: a20b0041 */ sb $t3,0x41($s0) -/* f1a05f8: 0fc24d13 */ jal 0xf09344c +/* f1a05f8: 0fc24d13 */ jal func0f0926bc /* f1a05fc: 8e040014 */ lw $a0,0x14($s0) .JF0f1a0600: /* f1a0600: 2610003c */ addiu $s0,$s0,0x3c @@ -3526,10 +3526,10 @@ glabel var7f1b94e4 /* f1a060c: 3c02800a */ lui $v0,0x800a /* f1a0610: 8c42a8b4 */ lw $v0,-0x574c($v0) /* f1a0614: 24040001 */ li $a0,0x1 -/* f1a0618: 0fc67d9f */ jal 0xf19f67c +/* f1a0618: 0fc67d9f */ jal frEndSession /* f1a061c: ac401c08 */ sw $zero,0x1c08($v0) /* f1a0620: 00002025 */ move $a0,$zero -/* f1a0624: 0fc12bfb */ jal 0xf04afec +/* f1a0624: 0fc12bfb */ jal chrUnsetStageFlag /* f1a0628: 24050001 */ li $a1,0x1 /* f1a062c: 1000030c */ b .JF0f1a1260 /* f1a0630: 8fbf007c */ lw $ra,0x7c($sp) @@ -3539,7 +3539,7 @@ glabel var7f1b94e4 /* f1a063c: 8c4c00d8 */ lw $t4,0xd8($v0) /* f1a0640: 51800004 */ beqzl $t4,.JF0f1a0654 /* f1a0644: 8ecd0034 */ lw $t5,0x34($s6) -/* f1a0648: 0fc67d9f */ jal 0xf19f67c +/* f1a0648: 0fc67d9f */ jal frEndSession /* f1a064c: 00002025 */ move $a0,$zero /* f1a0650: 8ecd0034 */ lw $t5,0x34($s6) .JF0f1a0654: @@ -3564,7 +3564,7 @@ glabel var7f1b94e4 /* f1a0698: 11200004 */ beqz $t1,.JF0f1a06ac /* f1a069c: 3406ffff */ li $a2,0xffff /* f1a06a0: a20a0041 */ sb $t2,0x41($s0) -/* f1a06a4: 0fc24d13 */ jal 0xf09344c +/* f1a06a4: 0fc24d13 */ jal func0f0926bc /* f1a06a8: 8e040014 */ lw $a0,0x14($s0) .JF0f1a06ac: /* f1a06ac: 2610003c */ addiu $s0,$s0,0x3c @@ -3576,23 +3576,23 @@ glabel var7f1b94e4 .JF0f1a06c0: /* f1a06c0: 8ecc0284 */ lw $t4,0x284($s6) /* f1a06c4: 240b0001 */ li $t3,0x1 -/* f1a06c8: 0fc67a3e */ jal 0xf19e8f8 +/* f1a06c8: 0fc67a3e */ jal frExecuteHelpScript /* f1a06cc: ad8b1c08 */ sw $t3,0x1c08($t4) /* f1a06d0: 92ad045a */ lbu $t5,0x45a($s5) /* f1a06d4: 51a0004b */ beqzl $t5,.JF0f1a0804 /* f1a06d8: 8eab044c */ lw $t3,0x44c($s5) -/* f1a06dc: 0fc67702 */ jal 0xf19dc08 +/* f1a06dc: 0fc67702 */ jal frGetWeaponBySlot /* f1a06e0: 96a40456 */ lhu $a0,0x456($s5) /* f1a06e4: 00409025 */ move $s2,$v0 /* f1a06e8: 00402025 */ move $a0,$v0 -/* f1a06ec: 0fc2aaa5 */ jal 0xf0aaa94 +/* f1a06ec: 0fc2aaa5 */ jal bgunGetAmmoTypeForWeapon /* f1a06f0: 00002825 */ move $a1,$zero /* f1a06f4: 00408825 */ move $s1,$v0 -/* f1a06f8: 0fc2aa5d */ jal 0xf0aa974 +/* f1a06f8: 0fc2aa5d */ jal bgunGetCapacityByAmmotype /* f1a06fc: 00402025 */ move $a0,$v0 /* f1a0700: 00408025 */ move $s0,$v0 /* f1a0704: 02402025 */ move $a0,$s2 -/* f1a0708: 0fc2c89b */ jal 0xf0b226c +/* f1a0708: 0fc2c89b */ jal weaponGetAmmoByFunction /* f1a070c: 00002825 */ move $a1,$zero /* f1a0710: 10400003 */ beqz $v0,.JF0f1a0720 /* f1a0714: 00001825 */ move $v1,$zero @@ -3604,7 +3604,7 @@ glabel var7f1b94e4 /* f1a0728: 2401ffff */ li $at,-1 /* f1a072c: 18400011 */ blez $v0,.JF0f1a0774 /* f1a0730: 00000000 */ nop -/* f1a0734: 0fc2a9fc */ jal 0xf0aa7f0 +/* f1a0734: 0fc2a9fc */ jal bgunGetReservedAmmoCount /* f1a0738: 02202025 */ move $a0,$s1 /* f1a073c: 92a3045a */ lbu $v1,0x45a($s5) /* f1a0740: 86ae0476 */ lh $t6,0x476($s5) @@ -3617,28 +3617,28 @@ glabel var7f1b94e4 /* f1a075c: 00000000 */ nop /* f1a0760: a6a00476 */ sh $zero,0x476($s5) .JF0f1a0764: -/* f1a0764: 0fc2a9aa */ jal 0xf0aa6a8 +/* f1a0764: 0fc2a9aa */ jal bgunSetAmmoQuantity /* f1a0768: 02202025 */ move $a0,$s1 /* f1a076c: 10000006 */ b .JF0f1a0788 /* f1a0770: 24010012 */ li $at,0x12 .JF0f1a0774: /* f1a0774: 14410003 */ bne $v0,$at,.JF0f1a0784 /* f1a0778: 02202025 */ move $a0,$s1 -/* f1a077c: 0fc2a9aa */ jal 0xf0aa6a8 +/* f1a077c: 0fc2a9aa */ jal bgunSetAmmoQuantity /* f1a0780: 02002825 */ move $a1,$s0 .JF0f1a0784: /* f1a0784: 24010012 */ li $at,0x12 .JF0f1a0788: /* f1a0788: 5641001d */ bnel $s2,$at,.JF0f1a0800 /* f1a078c: a2a0045a */ sb $zero,0x45a($s5) -/* f1a0790: 0fc2aa5d */ jal 0xf0aa974 +/* f1a0790: 0fc2aa5d */ jal bgunGetCapacityByAmmotype /* f1a0794: 2404000b */ li $a0,0xb /* f1a0798: 86a30478 */ lh $v1,0x478($s5) /* f1a079c: 00408025 */ move $s0,$v0 /* f1a07a0: 2401ffff */ li $at,-1 /* f1a07a4: 18600011 */ blez $v1,.JF0f1a07ec /* f1a07a8: 00000000 */ nop -/* f1a07ac: 0fc2a9fc */ jal 0xf0aa7f0 +/* f1a07ac: 0fc2a9fc */ jal bgunGetReservedAmmoCount /* f1a07b0: 2404000b */ li $a0,0xb /* f1a07b4: 92a3045a */ lbu $v1,0x45a($s5) /* f1a07b8: 86b90478 */ lh $t9,0x478($s5) @@ -3651,14 +3651,14 @@ glabel var7f1b94e4 /* f1a07d4: 00000000 */ nop /* f1a07d8: a6a00478 */ sh $zero,0x478($s5) .JF0f1a07dc: -/* f1a07dc: 0fc2a9aa */ jal 0xf0aa6a8 +/* f1a07dc: 0fc2a9aa */ jal bgunSetAmmoQuantity /* f1a07e0: 2404000b */ li $a0,0xb /* f1a07e4: 10000006 */ b .JF0f1a0800 /* f1a07e8: a2a0045a */ sb $zero,0x45a($s5) .JF0f1a07ec: /* f1a07ec: 14610003 */ bne $v1,$at,.JF0f1a07fc /* f1a07f0: 2404000b */ li $a0,0xb -/* f1a07f4: 0fc2a9aa */ jal 0xf0aa6a8 +/* f1a07f4: 0fc2a9aa */ jal bgunSetAmmoQuantity /* f1a07f8: 02002825 */ move $a1,$s0 .JF0f1a07fc: /* f1a07fc: a2a0045a */ sb $zero,0x45a($s5) @@ -3694,7 +3694,7 @@ glabel var7f1b94e4 /* f1a086c: 240505d4 */ li $a1,0x5d4 /* f1a0870: 00003025 */ move $a2,$zero /* f1a0874: 2407ffff */ li $a3,-1 -/* f1a0878: 0c004230 */ jal 0x108c0 +/* f1a0878: 0c004230 */ jal sndStart /* f1a087c: e7b80014 */ swc1 $f24,0x14($sp) /* f1a0880: 8ea30464 */ lw $v1,0x464($s5) .JF0f1a0884: @@ -3706,7 +3706,7 @@ glabel var7f1b94e4 /* f1a0894: 2b01ff20 */ slti $at,$t8,-224 /* f1a0898: 54200271 */ bnezl $at,.JF0f1a1260 /* f1a089c: 8fbf007c */ lw $ra,0x7c($sp) -/* f1a08a0: 0fc67736 */ jal 0xf19dcd8 +/* f1a08a0: 0fc67736 */ jal frInitLighting /* f1a08a4: 00000000 */ nop /* f1a08a8: 1000026d */ b .JF0f1a1260 /* f1a08ac: 8fbf007c */ lw $ra,0x7c($sp) @@ -3715,7 +3715,7 @@ glabel var7f1b94e4 /* f1a08b4: 001952c0 */ sll $t2,$t9,0xb /* f1a08b8: 05420004 */ bltzl $t2,.JF0f1a08cc /* f1a08bc: 92ac0465 */ lbu $t4,0x465($s5) -/* f1a08c0: 0fc67736 */ jal 0xf19dcd8 +/* f1a08c0: 0fc67736 */ jal frInitLighting /* f1a08c4: 00000000 */ nop /* f1a08c8: 92ac0465 */ lbu $t4,0x465($s5) .JF0f1a08cc: @@ -3742,7 +3742,7 @@ glabel var7f1b94e4 /* f1a0914: 052100d1 */ bgez $t1,.JF0f1a0c5c /* f1a0918: 00009025 */ move $s2,$zero /* f1a091c: a3a00123 */ sb $zero,0x123($sp) -/* f1a0920: 0fc67702 */ jal 0xf19dc08 +/* f1a0920: 0fc67702 */ jal frGetWeaponBySlot /* f1a0924: 96a40456 */ lhu $a0,0x456($s5) /* f1a0928: 8e110014 */ lw $s1,0x14($s0) /* f1a092c: 304300ff */ andi $v1,$v0,0xff @@ -3753,7 +3753,7 @@ glabel var7f1b94e4 /* f1a0940: 14610003 */ bne $v1,$at,.JF0f1a0950 .JF0f1a0944: /* f1a0944: 26240008 */ addiu $a0,$s1,0x8 -/* f1a0948: 0fc22e56 */ jal 0xf08b958 +/* f1a0948: 0fc22e56 */ jal coordTriggerProxies /* f1a094c: 24050001 */ li $a1,0x1 .JF0f1a0950: /* f1a0950: 920a0043 */ lbu $t2,0x43($s0) @@ -3783,7 +3783,7 @@ glabel var7f1b94e4 /* f1a09b0: afad002c */ sw $t5,0x2c($sp) /* f1a09b4: e7b80030 */ swc1 $f24,0x30($sp) /* f1a09b8: e7b80034 */ swc1 $f24,0x34($sp) -/* f1a09bc: 0fc251de */ jal 0xf094778 +/* f1a09bc: 0fc251de */ jal func0f0939f8 /* f1a09c0: e7b80038 */ swc1 $f24,0x38($sp) /* f1a09c4: c6000038 */ lwc1 $f0,0x38($s0) .JF0f1a09c8: @@ -3835,7 +3835,7 @@ glabel var7f1b94e4 /* f1a0a6c: 004b082a */ slt $at,$v0,$t3 /* f1a0a70: 50200007 */ beqzl $at,.JF0f1a0a90 /* f1a0a74: 96ac045c */ lhu $t4,0x45c($s5) -/* f1a0a78: 0fc67702 */ jal 0xf19dc08 +/* f1a0a78: 0fc67702 */ jal frGetWeaponBySlot /* f1a0a7c: 96a40456 */ lhu $a0,0x456($s5) /* f1a0a80: 24010007 */ li $at,0x7 /* f1a0a84: 5441000e */ bnel $v0,$at,.JF0f1a0ac0 @@ -3869,7 +3869,7 @@ glabel var7f1b94e4 /* f1a0ae8: 1420005c */ bnez $at,.JF0f1a0c5c /* f1a0aec: 00000000 */ nop .JF0f1a0af0: -/* f1a0af0: 0fc1a705 */ jal 0xf069c14 +/* f1a0af0: 0fc1a705 */ jal objFindBboxRodata /* f1a0af4: 00001025 */ move $v0,$zero /* f1a0af8: 3c038009 */ lui $v1,0x8009 /* f1a0afc: 90638e7c */ lbu $v1,-0x7184($v1) @@ -3884,7 +3884,7 @@ glabel var7f1b94e4 /* f1a0b20: a02d8e7c */ sb $t5,-0x7184($at) /* f1a0b24: 24050001 */ li $a1,0x1 /* f1a0b28: 3406ffff */ li $a2,0xffff -/* f1a0b2c: 0fc24d13 */ jal 0xf09344c +/* f1a0b2c: 0fc24d13 */ jal func0f0926bc /* f1a0b30: afa20118 */ sw $v0,0x118($sp) /* f1a0b34: 8fa80118 */ lw $t0,0x118($sp) .JF0f1a0b38: @@ -3903,7 +3903,7 @@ glabel var7f1b94e4 /* f1a0b64: c5060010 */ lwc1 $f6,0x10($t0) /* f1a0b68: afb10024 */ sw $s1,0x24($sp) /* f1a0b6c: afae0020 */ sw $t6,0x20($sp) -/* f1a0b70: 0fc53f90 */ jal 0xf14fe40 +/* f1a0b70: 0fc53f90 */ jal shardsCreate /* f1a0b74: e7a6001c */ swc1 $f6,0x1c($sp) /* f1a0b78: 92af0455 */ lbu $t7,0x455($s5) /* f1a0b7c: 24070005 */ li $a3,0x5 @@ -3917,7 +3917,7 @@ glabel var7f1b94e4 /* f1a0b9c: 240a0001 */ li $t2,0x1 /* f1a0ba0: afaa0010 */ sw $t2,0x10($sp) /* f1a0ba4: 24850008 */ addiu $a1,$a0,0x8 -/* f1a0ba8: 0fc4a740 */ jal 0xf129d00 +/* f1a0ba8: 0fc4a740 */ jal explosionCreateSimple /* f1a0bac: 24860028 */ addiu $a2,$a0,0x28 /* f1a0bb0: 920b0010 */ lbu $t3,0x10($s0) .JF0f1a0bb4: @@ -3937,7 +3937,7 @@ glabel var7f1b94e4 /* f1a0be8: c428a438 */ lwc1 $f8,-0x5bc8($at) /* f1a0bec: e6360010 */ swc1 $f22,0x10($s1) /* f1a0bf0: 00003025 */ move $a2,$zero -/* f1a0bf4: 0fc1ab62 */ jal 0xf06ad88 +/* f1a0bf4: 0fc1ab62 */ jal func0f069c70 /* f1a0bf8: e628000c */ swc1 $f8,0xc($s1) /* f1a0bfc: 3c03800b */ lui $v1,0x800b /* f1a0c00: 2463d750 */ addiu $v1,$v1,-10416 @@ -3984,7 +3984,7 @@ glabel var7f1b94e4 /* f1a0c94: 0182082a */ slt $at,$t4,$v0 /* f1a0c98: 14200005 */ bnez $at,.JF0f1a0cb0 /* f1a0c9c: 00000000 */ nop -/* f1a0ca0: 0fc67ecb */ jal 0xf19fb2c +/* f1a0ca0: 0fc67ecb */ jal frSetCompleted /* f1a0ca4: 00000000 */ nop /* f1a0ca8: 1000016d */ b .JF0f1a1260 /* f1a0cac: 8fbf007c */ lw $ra,0x7c($sp) @@ -4004,7 +4004,7 @@ glabel var7f1b94e4 /* f1a0cdc: 54200006 */ bnezl $at,.JF0f1a0cf8 /* f1a0ce0: 92ae0454 */ lbu $t6,0x454($s5) .JF0f1a0ce4: -/* f1a0ce4: 0fc67ecb */ jal 0xf19fb2c +/* f1a0ce4: 0fc67ecb */ jal frSetCompleted /* f1a0ce8: 00000000 */ nop /* f1a0cec: 1000015c */ b .JF0f1a1260 /* f1a0cf0: 8fbf007c */ lw $ra,0x7c($sp) @@ -4014,16 +4014,16 @@ glabel var7f1b94e4 /* f1a0cf8: 004e082a */ slt $at,$v0,$t6 /* f1a0cfc: 14200005 */ bnez $at,.JF0f1a0d14 /* f1a0d00: 00000000 */ nop -/* f1a0d04: 0fc67eb1 */ jal 0xf19fac4 +/* f1a0d04: 0fc67eb1 */ jal frSetFailReason /* f1a0d08: 24040003 */ li $a0,0x3 /* f1a0d0c: 10000154 */ b .JF0f1a1260 /* f1a0d10: 8fbf007c */ lw $ra,0x7c($sp) .JF0f1a0d14: -/* f1a0d14: 0fc67fb1 */ jal 0xf19fec4 +/* f1a0d14: 0fc67fb1 */ jal frIsAmmoWasted /* f1a0d18: 00000000 */ nop /* f1a0d1c: 50400006 */ beqzl $v0,.JF0f1a0d38 /* f1a0d20: 92a20005 */ lbu $v0,0x5($s5) -/* f1a0d24: 0fc67eb1 */ jal 0xf19fac4 +/* f1a0d24: 0fc67eb1 */ jal frSetFailReason /* f1a0d28: 24040001 */ li $a0,0x1 /* f1a0d2c: 1000014c */ b .JF0f1a1260 /* f1a0d30: 8fbf007c */ lw $ra,0x7c($sp) @@ -4039,7 +4039,7 @@ glabel var7f1b94e4 /* f1a0d54: 01f8082a */ slt $at,$t7,$t8 /* f1a0d58: 14200005 */ bnez $at,.JF0f1a0d70 /* f1a0d5c: 00000000 */ nop -/* f1a0d60: 0fc67eb1 */ jal 0xf19fac4 +/* f1a0d60: 0fc67eb1 */ jal frSetFailReason /* f1a0d64: 24040002 */ li $a0,0x2 /* f1a0d68: 1000013d */ b .JF0f1a1260 /* f1a0d6c: 8fbf007c */ lw $ra,0x7c($sp) @@ -4096,7 +4096,7 @@ glabel var7f1b94e4 /* f1a0e2c: c7a40160 */ lwc1 $f4,0x160($sp) /* f1a0e30: 46042182 */ mul.s $f6,$f4,$f4 /* f1a0e34: 46104480 */ add.s $f18,$f8,$f16 -/* f1a0e38: 0c012838 */ jal 0x4a0e0 +/* f1a0e38: 0c012838 */ jal sqrtf /* f1a0e3c: 46123300 */ add.s $f12,$f6,$f18 /* f1a0e40: 46160032 */ c.eq.s $f0,$f22 /* f1a0e44: c7ae0110 */ lwc1 $f14,0x110($sp) @@ -4165,7 +4165,7 @@ glabel var7f1b94e4 /* f1a0f38: a04b0000 */ sb $t3,0x0($v0) .JF0f1a0f3c: /* f1a0f3c: 24050001 */ li $a1,0x1 -/* f1a0f40: 0fc24d13 */ jal 0xf09344c +/* f1a0f40: 0fc24d13 */ jal func0f0926bc /* f1a0f44: 3406ffff */ li $a2,0xffff /* f1a0f48: 240cffff */ li $t4,-1 /* f1a0f4c: 240d0400 */ li $t5,0x400 @@ -4184,7 +4184,7 @@ glabel var7f1b94e4 /* f1a0f80: afa00028 */ sw $zero,0x28($sp) /* f1a0f84: e7b80030 */ swc1 $f24,0x30($sp) /* f1a0f88: e7b80034 */ swc1 $f24,0x34($sp) -/* f1a0f8c: 0fc251de */ jal 0xf094778 +/* f1a0f8c: 0fc251de */ jal func0f0939f8 /* f1a0f90: e7b80038 */ swc1 $f24,0x38($sp) .JF0f1a0f94: /* f1a0f94: c7a8014c */ lwc1 $f8,0x14c($sp) @@ -4196,7 +4196,7 @@ glabel var7f1b94e4 /* f1a0fa8: 00003025 */ move $a2,$zero /* f1a0fac: e62a000c */ swc1 $f10,0xc($s1) /* f1a0fb0: c7a60154 */ lwc1 $f6,0x154($sp) -/* f1a0fb4: 0fc1ab62 */ jal 0xf06ad88 +/* f1a0fb4: 0fc1ab62 */ jal func0f069c70 /* f1a0fb8: e6260010 */ swc1 $f6,0x10($s1) /* f1a0fbc: 8e020010 */ lw $v0,0x10($s0) .JF0f1a0fc0: @@ -4328,17 +4328,17 @@ glabel var7f1b94e4 .JF0f1a1188: /* f1a1188: c426a450 */ lwc1 $f6,-0x5bb0($at) /* f1a118c: 02802825 */ move $a1,$s4 -/* f1a1190: 0c0058c5 */ jal 0x16314 +/* f1a1190: 0c0058c5 */ jal mtx4LoadYRotation /* f1a1194: 46060300 */ add.s $f12,$f0,$f6 /* f1a1198: 8e6c0018 */ lw $t4,0x18($s3) /* f1a119c: 02802825 */ move $a1,$s4 -/* f1a11a0: 0c0057a9 */ jal 0x15ea4 +/* f1a11a0: 0c0057a9 */ jal mtx00015f04 /* f1a11a4: c58c0014 */ lwc1 $f12,0x14($t4) /* f1a11a8: 02802025 */ move $a0,$s4 -/* f1a11ac: 0c005750 */ jal 0x15d40 +/* f1a11ac: 0c005750 */ jal mtx4ToMtx3 /* f1a11b0: 02a02825 */ move $a1,$s5 /* f1a11b4: 02a02025 */ move $a0,$s5 -/* f1a11b8: 0c00571e */ jal 0x15c78 +/* f1a11b8: 0c00571e */ jal mtx3Copy /* f1a11bc: 2665001c */ addiu $a1,$s3,0x1c /* f1a11c0: 8e020010 */ lw $v0,0x10($s0) .JF0f1a11c4: @@ -4356,26 +4356,26 @@ glabel var7f1b94e4 /* f1a11f0: 92090010 */ lbu $t1,0x10($s0) /* f1a11f4: 02402025 */ move $a0,$s2 /* f1a11f8: 312affef */ andi $t2,$t1,0xffef -/* f1a11fc: 0fc67a8c */ jal 0xf19ea30 +/* f1a11fc: 0fc67a8c */ jal frExecuteTargetScript /* f1a1200: a20a0010 */ sb $t2,0x10($s0) /* f1a1204: 14400005 */ bnez $v0,.JF0f1a121c /* f1a1208: 00000000 */ nop .JF0f1a120c: -/* f1a120c: 0fc67a8c */ jal 0xf19ea30 +/* f1a120c: 0fc67a8c */ jal frExecuteTargetScript /* f1a1210: 02402025 */ move $a0,$s2 /* f1a1214: 1040fffd */ beqz $v0,.JF0f1a120c /* f1a1218: 00000000 */ nop .JF0f1a121c: -/* f1a121c: 0fc67a25 */ jal 0xf19e894 +/* f1a121c: 0fc67a25 */ jal frTargetIsAtScriptStart /* f1a1220: 02402025 */ move $a0,$s2 /* f1a1224: 5040000a */ beqzl $v0,.JF0f1a1250 /* f1a1228: 26520001 */ addiu $s2,$s2,0x1 -/* f1a122c: 0fc67a8c */ jal 0xf19ea30 +/* f1a122c: 0fc67a8c */ jal frExecuteTargetScript /* f1a1230: 02402025 */ move $a0,$s2 /* f1a1234: 54400006 */ bnezl $v0,.JF0f1a1250 /* f1a1238: 26520001 */ addiu $s2,$s2,0x1 .JF0f1a123c: -/* f1a123c: 0fc67a8c */ jal 0xf19ea30 +/* f1a123c: 0fc67a8c */ jal frExecuteTargetScript /* f1a1240: 02402025 */ move $a0,$s2 /* f1a1244: 1040fffd */ beqz $v0,.JF0f1a123c /* f1a1248: 00000000 */ nop @@ -10536,18 +10536,18 @@ glabel frGetGoalTargetsText /* f1a30fc: afbf0014 */ sw $ra,0x14($sp) /* f1a3100: afa40018 */ sw $a0,0x18($sp) /* f1a3104: afa5001c */ sw $a1,0x1c($sp) -/* f1a3108: 0fc5baa5 */ jal 0xf16ea94 +/* f1a3108: 0fc5baa5 */ jal langGet /* f1a310c: 2404589e */ li $a0,0x589e /* f1a3110: 3c057f1c */ lui $a1,0x7f1c /* f1a3114: 24a5a0e0 */ addiu $a1,$a1,-24352 /* f1a3118: 8fa40018 */ lw $a0,0x18($sp) -/* f1a311c: 0c004d95 */ jal 0x13654 +/* f1a311c: 0c004d95 */ jal sprintf /* f1a3120: 00403025 */ move $a2,$v0 /* f1a3124: 3c057f1c */ lui $a1,0x7f1c /* f1a3128: 3c06800b */ lui $a2,0x800b /* f1a312c: 90c6d754 */ lbu $a2,-0x28ac($a2) /* f1a3130: 24a5a0e4 */ addiu $a1,$a1,-24348 -/* f1a3134: 0c004d95 */ jal 0x13654 +/* f1a3134: 0c004d95 */ jal sprintf /* f1a3138: 8fa4001c */ lw $a0,0x1c($sp) /* f1a313c: 8fbf0014 */ lw $ra,0x14($sp) /* f1a3140: 27bd0018 */ addiu $sp,$sp,0x18 @@ -10588,29 +10588,29 @@ glabel frGetGoalScoreText /* f1a31b8: 11c00011 */ beqz $t6,.JF0f1a3200 /* f1a31bc: 00803825 */ move $a3,$a0 /* f1a31c0: 2404589f */ li $a0,0x589f -/* f1a31c4: 0fc5baa5 */ jal 0xf16ea94 +/* f1a31c4: 0fc5baa5 */ jal langGet /* f1a31c8: afa70018 */ sw $a3,0x18($sp) /* f1a31cc: 3c057f1c */ lui $a1,0x7f1c /* f1a31d0: 24a5a0f8 */ addiu $a1,$a1,-24328 /* f1a31d4: 8fa40018 */ lw $a0,0x18($sp) -/* f1a31d8: 0c004d95 */ jal 0x13654 +/* f1a31d8: 0c004d95 */ jal sprintf /* f1a31dc: 00403025 */ move $a2,$v0 /* f1a31e0: 3c057f1c */ lui $a1,0x7f1c /* f1a31e4: 3c06800b */ lui $a2,0x800b /* f1a31e8: 94c6d752 */ lhu $a2,-0x28ae($a2) /* f1a31ec: 24a5a0fc */ addiu $a1,$a1,-24324 -/* f1a31f0: 0c004d95 */ jal 0x13654 +/* f1a31f0: 0c004d95 */ jal sprintf /* f1a31f4: 8fa4001c */ lw $a0,0x1c($sp) /* f1a31f8: 1000000a */ b .JF0f1a3224 /* f1a31fc: 8fbf0014 */ lw $ra,0x14($sp) .JF0f1a3200: /* f1a3200: 3c057f1c */ lui $a1,0x7f1c /* f1a3204: 24a5a100 */ addiu $a1,$a1,-24320 -/* f1a3208: 0c004d95 */ jal 0x13654 +/* f1a3208: 0c004d95 */ jal sprintf /* f1a320c: 00e02025 */ move $a0,$a3 /* f1a3210: 3c057f1c */ lui $a1,0x7f1c /* f1a3214: 24a5a104 */ addiu $a1,$a1,-24316 -/* f1a3218: 0c004d95 */ jal 0x13654 +/* f1a3218: 0c004d95 */ jal sprintf /* f1a321c: 8fa4001c */ lw $a0,0x1c($sp) /* f1a3220: 8fbf0014 */ lw $ra,0x14($sp) .JF0f1a3224: @@ -10662,18 +10662,18 @@ glabel frGetMinAccuracy /* f1a32ec: afa40018 */ sw $a0,0x18($sp) /* f1a32f0: afa5001c */ sw $a1,0x1c($sp) /* f1a32f4: afa60020 */ sw $a2,0x20($sp) -/* f1a32f8: 0fc5baa5 */ jal 0xf16ea94 +/* f1a32f8: 0fc5baa5 */ jal langGet /* f1a32fc: 240458a0 */ li $a0,0x58a0 /* f1a3300: 3c057f1c */ lui $a1,0x7f1c /* f1a3304: 24a5a11c */ addiu $a1,$a1,-24292 /* f1a3308: 8fa40018 */ lw $a0,0x18($sp) -/* f1a330c: 0c004d95 */ jal 0x13654 +/* f1a330c: 0c004d95 */ jal sprintf /* f1a3310: 00403025 */ move $a2,$v0 /* f1a3314: 3c057f1c */ lui $a1,0x7f1c /* f1a3318: 3c06800b */ lui $a2,0x800b /* f1a331c: 90c6d758 */ lbu $a2,-0x28a8($a2) /* f1a3320: 24a5a120 */ addiu $a1,$a1,-24288 -/* f1a3324: 0c004d95 */ jal 0x13654 +/* f1a3324: 0c004d95 */ jal sprintf /* f1a3328: 8fa40020 */ lw $a0,0x20($sp) /* f1a332c: 3c0e800b */ lui $t6,0x800b /* f1a3330: 91ced758 */ lbu $t6,-0x28a8($t6) @@ -10763,7 +10763,7 @@ glabel frGetHudMiddleSubtext /* f1a349c: afbf001c */ sw $ra,0x1c($sp) /* f1a34a0: 3c057f1c */ lui $a1,0x7f1c /* f1a34a4: afb00018 */ sw $s0,0x18($sp) -/* f1a34a8: 0c004d95 */ jal 0x13654 +/* f1a34a8: 0c004d95 */ jal sprintf /* f1a34ac: 24a5a134 */ addiu $a1,$a1,-24268 /* f1a34b0: 3c04800b */ lui $a0,0x800b /* f1a34b4: 2484d750 */ addiu $a0,$a0,-10416 @@ -10771,24 +10771,24 @@ glabel frGetHudMiddleSubtext /* f1a34bc: 2861ff4c */ slti $at,$v1,-180 /* f1a34c0: 1020000a */ beqz $at,.JF0f1a34ec /* f1a34c4: 00000000 */ nop -/* f1a34c8: 0fc5baa5 */ jal 0xf16ea94 +/* f1a34c8: 0fc5baa5 */ jal langGet /* f1a34cc: 240458a1 */ li $a0,0x58a1 /* f1a34d0: 3c057f1c */ lui $a1,0x7f1c /* f1a34d4: 24a5a138 */ addiu $a1,$a1,-24264 /* f1a34d8: 8fa40028 */ lw $a0,0x28($sp) -/* f1a34dc: 0c004d95 */ jal 0x13654 +/* f1a34dc: 0c004d95 */ jal sprintf /* f1a34e0: 00403025 */ move $a2,$v0 /* f1a34e4: 1000002b */ b .JF0f1a3594 /* f1a34e8: 00001025 */ move $v0,$zero .JF0f1a34ec: /* f1a34ec: 0463000b */ bgezl $v1,.JF0f1a351c /* f1a34f0: 90820005 */ lbu $v0,0x5($a0) -/* f1a34f4: 0fc5baa5 */ jal 0xf16ea94 +/* f1a34f4: 0fc5baa5 */ jal langGet /* f1a34f8: 240458a2 */ li $a0,0x58a2 /* f1a34fc: 3c057f1c */ lui $a1,0x7f1c /* f1a3500: 24a5a13c */ addiu $a1,$a1,-24260 /* f1a3504: 8fa40028 */ lw $a0,0x28($sp) -/* f1a3508: 0c004d95 */ jal 0x13654 +/* f1a3508: 0c004d95 */ jal sprintf /* f1a350c: 00403025 */ move $a2,$v0 /* f1a3510: 10000020 */ b .JF0f1a3594 /* f1a3514: 24020001 */ li $v0,0x1 @@ -10813,18 +10813,18 @@ glabel frGetHudMiddleSubtext /* f1a3554: 1020fffd */ beqz $at,.JF0f1a354c /* f1a3558: 26100001 */ addiu $s0,$s0,0x1 .JF0f1a355c: -/* f1a355c: 0fc5baa5 */ jal 0xf16ea94 +/* f1a355c: 0fc5baa5 */ jal langGet /* f1a3560: afa70024 */ sw $a3,0x24($sp) /* f1a3564: 3c057f1c */ lui $a1,0x7f1c /* f1a3568: 24a5a140 */ addiu $a1,$a1,-24256 /* f1a356c: 8fa40028 */ lw $a0,0x28($sp) -/* f1a3570: 0c004d95 */ jal 0x13654 +/* f1a3570: 0c004d95 */ jal sprintf /* f1a3574: 00403025 */ move $a2,$v0 /* f1a3578: 3c057f1c */ lui $a1,0x7f1c /* f1a357c: 8fa70024 */ lw $a3,0x24($sp) /* f1a3580: 24a5a144 */ addiu $a1,$a1,-24252 /* f1a3584: 8fa4002c */ lw $a0,0x2c($sp) -/* f1a3588: 0c004d95 */ jal 0x13654 +/* f1a3588: 0c004d95 */ jal sprintf /* f1a358c: 02003025 */ move $a2,$s0 /* f1a3590: 24020001 */ li $v0,0x1 .JF0f1a3594: @@ -10923,7 +10923,7 @@ glabel var7f1ba70cjf /* f1a35e8: 24a5a150 */ addiu $a1,$a1,-24240 /* f1a35ec: 00c02025 */ move $a0,$a2 /* f1a35f0: adc8000c */ sw $t0,0xc($t6) -/* f1a35f4: 0c004d95 */ jal 0x13654 +/* f1a35f4: 0c004d95 */ jal sprintf /* f1a35f8: adc10010 */ sw $at,0x10($t6) /* f1a35fc: 3c03800b */ lui $v1,0x800b /* f1a3600: 2463d750 */ addiu $v1,$v1,-10416 @@ -10949,7 +10949,7 @@ glabel var7f1ba70cjf /* f1a364c: 00803025 */ move $a2,$a0 /* f1a3650: 3c057f1c */ lui $a1,0x7f1c /* f1a3654: 24a5a154 */ addiu $a1,$a1,-24236 -/* f1a3658: 0c004d95 */ jal 0x13654 +/* f1a3658: 0c004d95 */ jal sprintf /* f1a365c: 00e02025 */ move $a0,$a3 /* f1a3660: 3c03800b */ lui $v1,0x800b /* f1a3664: 10000007 */ b .JF0f1a3684 @@ -10957,7 +10957,7 @@ glabel var7f1ba70cjf .JF0f1a366c: /* f1a366c: 3c057f1c */ lui $a1,0x7f1c /* f1a3670: 24a5a15c */ addiu $a1,$a1,-24228 -/* f1a3674: 0c004d95 */ jal 0x13654 +/* f1a3674: 0c004d95 */ jal sprintf /* f1a3678: 00e02025 */ move $a0,$a3 /* f1a367c: 3c03800b */ lui $v1,0x800b /* f1a3680: 2463d750 */ addiu $v1,$v1,-10416 @@ -10972,55 +10972,55 @@ glabel var7f1ba70cjf /* f1a36a0: 8c39a70c */ lw $t9,-0x58f4($at) /* f1a36a4: 03200008 */ jr $t9 /* f1a36a8: 00000000 */ nop -/* f1a36ac: 0fc5baa5 */ jal 0xf16ea94 +/* f1a36ac: 0fc5baa5 */ jal langGet /* f1a36b0: 8fa40024 */ lw $a0,0x24($sp) /* f1a36b4: 3c057f1c */ lui $a1,0x7f1c /* f1a36b8: 24a5a164 */ addiu $a1,$a1,-24220 /* f1a36bc: 8fa4003c */ lw $a0,0x3c($sp) -/* f1a36c0: 0c004d95 */ jal 0x13654 +/* f1a36c0: 0c004d95 */ jal sprintf /* f1a36c4: 00403025 */ move $a2,$v0 /* f1a36c8: 1000002b */ b .JF0f1a3778 /* f1a36cc: 24020001 */ li $v0,0x1 -/* f1a36d0: 0fc5baa5 */ jal 0xf16ea94 +/* f1a36d0: 0fc5baa5 */ jal langGet /* f1a36d4: 8fa40028 */ lw $a0,0x28($sp) /* f1a36d8: 3c057f1c */ lui $a1,0x7f1c /* f1a36dc: 24a5a168 */ addiu $a1,$a1,-24216 /* f1a36e0: 8fa4003c */ lw $a0,0x3c($sp) -/* f1a36e4: 0c004d95 */ jal 0x13654 +/* f1a36e4: 0c004d95 */ jal sprintf /* f1a36e8: 00403025 */ move $a2,$v0 /* f1a36ec: 10000022 */ b .JF0f1a3778 /* f1a36f0: 24020001 */ li $v0,0x1 -/* f1a36f4: 0fc5baa5 */ jal 0xf16ea94 +/* f1a36f4: 0fc5baa5 */ jal langGet /* f1a36f8: 8fa4002c */ lw $a0,0x2c($sp) /* f1a36fc: 3c057f1c */ lui $a1,0x7f1c /* f1a3700: 24a5a16c */ addiu $a1,$a1,-24212 /* f1a3704: 8fa4003c */ lw $a0,0x3c($sp) -/* f1a3708: 0c004d95 */ jal 0x13654 +/* f1a3708: 0c004d95 */ jal sprintf /* f1a370c: 00403025 */ move $a2,$v0 /* f1a3710: 10000019 */ b .JF0f1a3778 /* f1a3714: 24020001 */ li $v0,0x1 -/* f1a3718: 0fc5baa5 */ jal 0xf16ea94 +/* f1a3718: 0fc5baa5 */ jal langGet /* f1a371c: 8fa40030 */ lw $a0,0x30($sp) /* f1a3720: 3c057f1c */ lui $a1,0x7f1c /* f1a3724: 24a5a170 */ addiu $a1,$a1,-24208 /* f1a3728: 8fa4003c */ lw $a0,0x3c($sp) -/* f1a372c: 0c004d95 */ jal 0x13654 +/* f1a372c: 0c004d95 */ jal sprintf /* f1a3730: 00403025 */ move $a2,$v0 /* f1a3734: 10000010 */ b .JF0f1a3778 /* f1a3738: 24020001 */ li $v0,0x1 -/* f1a373c: 0fc5baa5 */ jal 0xf16ea94 +/* f1a373c: 0fc5baa5 */ jal langGet /* f1a3740: 8fa40034 */ lw $a0,0x34($sp) /* f1a3744: 3c057f1c */ lui $a1,0x7f1c /* f1a3748: 24a5a174 */ addiu $a1,$a1,-24204 /* f1a374c: 8fa4003c */ lw $a0,0x3c($sp) -/* f1a3750: 0c004d95 */ jal 0x13654 +/* f1a3750: 0c004d95 */ jal sprintf /* f1a3754: 00403025 */ move $a2,$v0 /* f1a3758: 10000007 */ b .JF0f1a3778 /* f1a375c: 24020001 */ li $v0,0x1 .JF0f1a3760: /* f1a3760: 3c057f1c */ lui $a1,0x7f1c /* f1a3764: 24a5a178 */ addiu $a1,$a1,-24200 -/* f1a3768: 0c004d95 */ jal 0x13654 +/* f1a3768: 0c004d95 */ jal sprintf /* f1a376c: 8fa4003c */ lw $a0,0x3c($sp) /* f1a3770: 10000001 */ b .JF0f1a3778 /* f1a3774: 24020001 */ li $v0,0x1 @@ -11101,7 +11101,7 @@ glabel frRenderHudElement /* f1a37bc: 27a50070 */ addiu $a1,$sp,0x70 /* f1a37c0: 27a40074 */ addiu $a0,$sp,0x74 /* f1a37c4: afa00014 */ sw $zero,0x14($sp) -/* f1a37c8: 0fc55d49 */ jal 0xf157524 +/* f1a37c8: 0fc55d49 */ jal textMeasure /* f1a37cc: afae0010 */ sw $t6,0x10($sp) /* f1a37d0: 8fa80070 */ lw $t0,0x70($sp) /* f1a37d4: 8faf007c */ lw $t7,0x7c($sp) @@ -11115,13 +11115,13 @@ glabel frRenderHudElement /* f1a37f4: 27a5006c */ addiu $a1,$sp,0x6c /* f1a37f8: 27a60068 */ addiu $a2,$sp,0x68 /* f1a37fc: 27a70070 */ addiu $a3,$sp,0x70 -/* f1a3800: 0fc54bed */ jal 0xf152fb4 +/* f1a3800: 0fc54bed */ jal func0f153858 /* f1a3804: afa30068 */ sw $v1,0x68($sp) -/* f1a3808: 0c002eeb */ jal 0xbbac +/* f1a3808: 0c002eeb */ jal viGetWidth /* f1a380c: 00408025 */ move $s0,$v0 /* f1a3810: 00028c00 */ sll $s1,$v0,0x10 /* f1a3814: 00115c03 */ sra $t3,$s1,0x10 -/* f1a3818: 0c002eef */ jal 0xbbbc +/* f1a3818: 0c002eef */ jal viGetHeight /* f1a381c: 01608825 */ move $s1,$t3 /* f1a3820: 93a30097 */ lbu $v1,0x97($sp) /* f1a3824: 8fae0090 */ lw $t6,0x90($sp) @@ -11146,7 +11146,7 @@ glabel frRenderHudElement /* f1a3870: afa00028 */ sw $zero,0x28($sp) /* f1a3874: afa0002c */ sw $zero,0x2c($sp) /* f1a3878: afad0014 */ sw $t5,0x14($sp) -/* f1a387c: 0fc55d34 */ jal 0xf1574d0 +/* f1a387c: 0fc55d34 */ jal func0f1574d0jf /* f1a3880: afac0010 */ sw $t4,0x10($sp) /* f1a3884: 8fa60088 */ lw $a2,0x88($sp) /* f1a3888: 00408025 */ move $s0,$v0 @@ -11158,7 +11158,7 @@ glabel frRenderHudElement /* f1a38a0: 3c078008 */ lui $a3,0x8008 /* f1a38a4: 8ce7014c */ lw $a3,0x14c($a3) /* f1a38a8: afa00014 */ sw $zero,0x14($sp) -/* f1a38ac: 0fc55d49 */ jal 0xf157524 +/* f1a38ac: 0fc55d49 */ jal textMeasure /* f1a38b0: afb80010 */ sw $t8,0x10($sp) /* f1a38b4: 3c198008 */ lui $t9,0x8008 /* f1a38b8: 8f390148 */ lw $t9,0x148($t9) @@ -11168,7 +11168,7 @@ glabel frRenderHudElement /* f1a38c8: 27a50050 */ addiu $a1,$sp,0x50 /* f1a38cc: 8fa6008c */ lw $a2,0x8c($sp) /* f1a38d0: afa00014 */ sw $zero,0x14($sp) -/* f1a38d4: 0fc55d49 */ jal 0xf157524 +/* f1a38d4: 0fc55d49 */ jal textMeasure /* f1a38d8: afb90010 */ sw $t9,0x10($sp) /* f1a38dc: 8fab0058 */ lw $t3,0x58($sp) /* f1a38e0: 8fac0050 */ lw $t4,0x50($sp) @@ -11189,13 +11189,13 @@ glabel frRenderHudElement /* f1a391c: 27a5006c */ addiu $a1,$sp,0x6c /* f1a3920: 27a60068 */ addiu $a2,$sp,0x68 /* f1a3924: 27a70070 */ addiu $a3,$sp,0x70 -/* f1a3928: 0fc54bed */ jal 0xf152fb4 +/* f1a3928: 0fc54bed */ jal func0f153858 /* f1a392c: afaa0074 */ sw $t2,0x74($sp) -/* f1a3930: 0c002eeb */ jal 0xbbac +/* f1a3930: 0c002eeb */ jal viGetWidth /* f1a3934: 00408025 */ move $s0,$v0 /* f1a3938: 00028c00 */ sll $s1,$v0,0x10 /* f1a393c: 0011cc03 */ sra $t9,$s1,0x10 -/* f1a3940: 0c002eef */ jal 0xbbbc +/* f1a3940: 0c002eef */ jal viGetHeight /* f1a3944: 03208825 */ move $s1,$t9 /* f1a3948: 3c0a8008 */ lui $t2,0x8008 /* f1a394c: 3c0b8008 */ lui $t3,0x8008 @@ -11214,7 +11214,7 @@ glabel frRenderHudElement /* f1a3980: afab0014 */ sw $t3,0x14($sp) /* f1a3984: afaa0010 */ sw $t2,0x10($sp) /* f1a3988: afac0018 */ sw $t4,0x18($sp) -/* f1a398c: 0fc55d34 */ jal 0xf1574d0 +/* f1a398c: 0fc55d34 */ jal func0f1574d0jf /* f1a3990: afad001c */ sw $t5,0x1c($sp) /* f1a3994: 8fa30040 */ lw $v1,0x40($sp) /* f1a3998: 8fae006c */ lw $t6,0x6c($sp) @@ -11222,11 +11222,11 @@ glabel frRenderHudElement /* f1a39a0: 24630001 */ addiu $v1,$v1,0x1 /* f1a39a4: 25cffffc */ addiu $t7,$t6,-4 /* f1a39a8: afaf006c */ sw $t7,0x6c($sp) -/* f1a39ac: 0c002eeb */ jal 0xbbac +/* f1a39ac: 0c002eeb */ jal viGetWidth /* f1a39b0: afa30068 */ sw $v1,0x68($sp) /* f1a39b4: 00028c00 */ sll $s1,$v0,0x10 /* f1a39b8: 0011c403 */ sra $t8,$s1,0x10 -/* f1a39bc: 0c002eef */ jal 0xbbbc +/* f1a39bc: 0c002eef */ jal viGetHeight /* f1a39c0: 03008825 */ move $s1,$t8 /* f1a39c4: 3c198008 */ lui $t9,0x8008 /* f1a39c8: 3c0a8008 */ lui $t2,0x8008 @@ -11245,7 +11245,7 @@ glabel frRenderHudElement /* f1a39fc: afaa0014 */ sw $t2,0x14($sp) /* f1a3a00: afb90010 */ sw $t9,0x10($sp) /* f1a3a04: afab0018 */ sw $t3,0x18($sp) -/* f1a3a08: 0fc55d34 */ jal 0xf1574d0 +/* f1a3a08: 0fc55d34 */ jal func0f1574d0jf /* f1a3a0c: afac001c */ sw $t4,0x1c($sp) /* f1a3a10: 00408025 */ move $s0,$v0 .JF0f1a3a14: @@ -11303,7 +11303,7 @@ glabel var7f1ba738jf /* f1a3a30: afbf0024 */ sw $ra,0x24($sp) /* f1a3a34: 240e00a0 */ li $t6,0xa0 /* f1a3a38: afa401d8 */ sw $a0,0x1d8($sp) -/* f1a3a3c: 0c002f0b */ jal 0xbc2c +/* f1a3a3c: 0c002f0b */ jal viGetViewWidth /* f1a3a40: afae004c */ sw $t6,0x4c($sp) /* f1a3a44: 28410191 */ slti $at,$v0,0x191 /* f1a3a48: 14200005 */ bnez $at,.JF0f1a3a60 @@ -11344,18 +11344,18 @@ glabel var7f1ba738jf /* f1a3ac8: 00000000 */ nop /* f1a3acc: afac004c */ sw $t4,0x4c($sp) .JF0f1a3ad0: -/* f1a3ad0: 0fc54b55 */ jal 0xf152d54 +/* f1a3ad0: 0fc54b55 */ jal func0f153628 /* f1a3ad4: 8fa401d8 */ lw $a0,0x1d8($sp) /* f1a3ad8: afa201d8 */ sw $v0,0x1d8($sp) -/* f1a3adc: 0fc68cdd */ jal 0xf1a3374 +/* f1a3adc: 0fc68cdd */ jal frFormatTime /* f1a3ae0: 27a40158 */ addiu $a0,$sp,0x158 /* f1a3ae4: afa20054 */ sw $v0,0x54($sp) /* f1a3ae8: 27a400d8 */ addiu $a0,$sp,0xd8 -/* f1a3aec: 0fc68d23 */ jal 0xf1a348c +/* f1a3aec: 0fc68d23 */ jal frGetHudMiddleSubtext /* f1a3af0: 27a50058 */ addiu $a1,$sp,0x58 -/* f1a3af4: 0c002f0b */ jal 0xbc2c +/* f1a3af4: 0c002f0b */ jal viGetViewWidth /* f1a3af8: afa20050 */ sw $v0,0x50($sp) -/* f1a3afc: 0c002f2d */ jal 0xbcb4 +/* f1a3afc: 0c002f2d */ jal viGetViewTop /* f1a3b00: a7a20038 */ sh $v0,0x38($sp) /* f1a3b04: 8fa40050 */ lw $a0,0x50($sp) /* f1a3b08: 00024c00 */ sll $t1,$v0,0x10 @@ -11393,17 +11393,17 @@ glabel var7f1ba738jf /* f1a3b70: afa80014 */ sw $t0,0x14($sp) /* f1a3b74: afa20018 */ sw $v0,0x18($sp) /* f1a3b78: afaa001c */ sw $t2,0x1c($sp) -/* f1a3b7c: 0fc68de2 */ jal 0xf1a3788 +/* f1a3b7c: 0fc68de2 */ jal frRenderHudElement /* f1a3b80: afaa002c */ sw $t2,0x2c($sp) /* f1a3b84: afa201d8 */ sw $v0,0x1d8($sp) -/* f1a3b88: 0fc68c5e */ jal 0xf1a3178 +/* f1a3b88: 0fc68c5e */ jal frGetScoreValue /* f1a3b8c: 27a40158 */ addiu $a0,$sp,0x158 /* f1a3b90: 27a400d8 */ addiu $a0,$sp,0xd8 -/* f1a3b94: 0fc68c69 */ jal 0xf1a31a4 +/* f1a3b94: 0fc68c69 */ jal frGetGoalScoreText /* f1a3b98: 27a50058 */ addiu $a1,$sp,0x58 -/* f1a3b9c: 0c002f29 */ jal 0xbca4 +/* f1a3b9c: 0c002f29 */ jal viGetViewLeft /* f1a3ba0: 00000000 */ nop -/* f1a3ba4: 0c002f2d */ jal 0xbcb4 +/* f1a3ba4: 0c002f2d */ jal viGetViewTop /* f1a3ba8: a7a20038 */ sh $v0,0x38($sp) /* f1a3bac: 87b80038 */ lh $t8,0x38($sp) /* f1a3bb0: 3c014282 */ lui $at,0x4282 @@ -11428,18 +11428,18 @@ glabel var7f1ba738jf /* f1a3bfc: afae001c */ sw $t6,0x1c($sp) /* f1a3c00: 4600910d */ trunc.w.s $f4,$f18 /* f1a3c04: 44052000 */ mfc1 $a1,$f4 -/* f1a3c08: 0fc68de2 */ jal 0xf1a3788 +/* f1a3c08: 0fc68de2 */ jal frRenderHudElement /* f1a3c0c: 00000000 */ nop /* f1a3c10: afa201d8 */ sw $v0,0x1d8($sp) /* f1a3c14: 27a40158 */ addiu $a0,$sp,0x158 /* f1a3c18: 27a500d8 */ addiu $a1,$sp,0xd8 -/* f1a3c1c: 0fc68d6a */ jal 0xf1a35a8 +/* f1a3c1c: 0fc68d6a */ jal frGetFeedback /* f1a3c20: 27a60058 */ addiu $a2,$sp,0x58 /* f1a3c24: 1040001b */ beqz $v0,.JF0f1a3c94 /* f1a3c28: 00000000 */ nop -/* f1a3c2c: 0c002f29 */ jal 0xbca4 +/* f1a3c2c: 0c002f29 */ jal viGetViewLeft /* f1a3c30: 00000000 */ nop -/* f1a3c34: 0c002f2d */ jal 0xbcb4 +/* f1a3c34: 0c002f2d */ jal viGetViewTop /* f1a3c38: a7a20038 */ sh $v0,0x38($sp) /* f1a3c3c: 87af0038 */ lh $t7,0x38($sp) /* f1a3c40: c7aa0028 */ lwc1 $f10,0x28($sp) @@ -11460,7 +11460,7 @@ glabel var7f1ba738jf /* f1a3c7c: 4600848d */ trunc.w.s $f18,$f16 /* f1a3c80: afad001c */ sw $t5,0x1c($sp) /* f1a3c84: 44059000 */ mfc1 $a1,$f18 -/* f1a3c88: 0fc68de2 */ jal 0xf1a3788 +/* f1a3c88: 0fc68de2 */ jal frRenderHudElement /* f1a3c8c: 00000000 */ nop /* f1a3c90: afa201d8 */ sw $v0,0x1d8($sp) .JF0f1a3c94: @@ -11469,17 +11469,17 @@ glabel var7f1ba738jf /* f1a3c9c: 904e0008 */ lbu $t6,0x8($v0) /* f1a3ca0: 59c00032 */ blezl $t6,.JF0f1a3d6c /* f1a3ca4: 90590004 */ lbu $t9,0x4($v0) -/* f1a3ca8: 0fc68c8c */ jal 0xf1a3230 +/* f1a3ca8: 0fc68c8c */ jal frGetAccuracy /* f1a3cac: 27a40158 */ addiu $a0,$sp,0x158 /* f1a3cb0: 44050000 */ mfc1 $a1,$f0 /* f1a3cb4: 27a400d8 */ addiu $a0,$sp,0xd8 -/* f1a3cb8: 0fc68cb9 */ jal 0xf1a32e4 +/* f1a3cb8: 0fc68cb9 */ jal frGetMinAccuracy /* f1a3cbc: 27a60058 */ addiu $a2,$sp,0x58 -/* f1a3cc0: 0c002f29 */ jal 0xbca4 +/* f1a3cc0: 0c002f29 */ jal viGetViewLeft /* f1a3cc4: afa20054 */ sw $v0,0x54($sp) -/* f1a3cc8: 0c002f0b */ jal 0xbc2c +/* f1a3cc8: 0c002f0b */ jal viGetViewWidth /* f1a3ccc: a7a20032 */ sh $v0,0x32($sp) -/* f1a3cd0: 0c002f2d */ jal 0xbcb4 +/* f1a3cd0: 0c002f2d */ jal viGetViewTop /* f1a3cd4: a7a20038 */ sh $v0,0x38($sp) /* f1a3cd8: 8fb80054 */ lw $t8,0x54($sp) /* f1a3cdc: 00024c00 */ sll $t1,$v0,0x10 @@ -11515,7 +11515,7 @@ glabel var7f1ba738jf /* f1a3d4c: 46103481 */ sub.s $f18,$f6,$f16 /* f1a3d50: 4600910d */ trunc.w.s $f4,$f18 /* f1a3d54: 44052000 */ mfc1 $a1,$f4 -/* f1a3d58: 0fc68de2 */ jal 0xf1a3788 +/* f1a3d58: 0fc68de2 */ jal frRenderHudElement /* f1a3d5c: 00000000 */ nop /* f1a3d60: 10000035 */ b .JF0f1a3e38 /* f1a3d64: afa201d8 */ sw $v0,0x1d8($sp) @@ -11524,10 +11524,10 @@ glabel var7f1ba738jf /* f1a3d6c: 240100ff */ li $at,0xff /* f1a3d70: 13210031 */ beq $t9,$at,.JF0f1a3e38 /* f1a3d74: 00000000 */ nop -/* f1a3d78: 0fc68c53 */ jal 0xf1a314c +/* f1a3d78: 0fc68c53 */ jal frGetTargetsDestroyedValue /* f1a3d7c: 27a40158 */ addiu $a0,$sp,0x158 /* f1a3d80: 27a400d8 */ addiu $a0,$sp,0xd8 -/* f1a3d84: 0fc68c3e */ jal 0xf1a30f8 +/* f1a3d84: 0fc68c3e */ jal frGetGoalTargetsText /* f1a3d88: 27a50058 */ addiu $a1,$sp,0x58 /* f1a3d8c: 3c014000 */ lui $at,0x4000 /* f1a3d90: 44815000 */ mtc1 $at,$f10 @@ -11540,11 +11540,11 @@ glabel var7f1ba738jf /* f1a3dac: c426a73c */ lwc1 $f6,-0x58c4($at) /* f1a3db0: e7a60048 */ swc1 $f6,0x48($sp) .JF0f1a3db4: -/* f1a3db4: 0c002f29 */ jal 0xbca4 +/* f1a3db4: 0c002f29 */ jal viGetViewLeft /* f1a3db8: 00000000 */ nop -/* f1a3dbc: 0c002f0b */ jal 0xbc2c +/* f1a3dbc: 0c002f0b */ jal viGetViewWidth /* f1a3dc0: a7a20032 */ sh $v0,0x32($sp) -/* f1a3dc4: 0c002f2d */ jal 0xbcb4 +/* f1a3dc4: 0c002f2d */ jal viGetViewTop /* f1a3dc8: a7a20038 */ sh $v0,0x38($sp) /* f1a3dcc: 87ab0038 */ lh $t3,0x38($sp) /* f1a3dd0: 87ac0032 */ lh $t4,0x32($sp) @@ -11570,11 +11570,11 @@ glabel var7f1ba738jf /* f1a3e20: afab001c */ sw $t3,0x1c($sp) /* f1a3e24: 4600340d */ trunc.w.s $f16,$f6 /* f1a3e28: 44058000 */ mfc1 $a1,$f16 -/* f1a3e2c: 0fc68de2 */ jal 0xf1a3788 +/* f1a3e2c: 0fc68de2 */ jal frRenderHudElement /* f1a3e30: 00000000 */ nop /* f1a3e34: afa201d8 */ sw $v0,0x1d8($sp) .JF0f1a3e38: -/* f1a3e38: 0fc54bb7 */ jal 0xf152edc +/* f1a3e38: 0fc54bb7 */ jal func0f153780 /* f1a3e3c: 8fa401d8 */ lw $a0,0x1d8($sp) .JF0f1a3e40: /* f1a3e40: 8fbf0024 */ lw $ra,0x24($sp) diff --git a/src/lib/main.c b/src/lib/main.c index 50cb6f076..42d52f479 100644 --- a/src/lib/main.c +++ b/src/lib/main.c @@ -298,30 +298,30 @@ GLOBAL_ASM( glabel mainInit /* d4c0: 27bdeb28 */ addiu $sp,$sp,-5336 /* d4c4: afbf002c */ sw $ra,0x2c($sp) -/* d4c8: 0c002fd4 */ jal 0xbf50 +/* d4c8: 0c002fd4 */ jal faultCreateThread /* d4cc: afb00028 */ sw $s0,0x28($sp) -/* d4d0: 0c003410 */ jal 0xd040 +/* d4d0: 0c003410 */ jal dmaInit /* d4d4: 00000000 */ nop -/* d4d8: 0c002264 */ jal 0x8990 +/* d4d8: 0c002264 */ jal amgrAllocateStack /* d4dc: 00000000 */ nop -/* d4e0: 0c005600 */ jal 0x15800 +/* d4e0: 0c005600 */ jal gvarsInit /* d4e4: 00000000 */ nop -/* d4e8: 0c004868 */ jal 0x121a0 +/* d4e8: 0c004868 */ jal memp000121e0 /* d4ec: 00000000 */ nop -/* d4f0: 0c004a73 */ jal 0x129cc +/* d4f0: 0c004a73 */ jal memaInit /* d4f4: 00000000 */ nop -/* d4f8: 0c004dbe */ jal 0x136f8 +/* d4f8: 0c004dbe */ jal videbugCreateMesgQueue /* d4fc: 00000000 */ nop -/* d500: 0c002690 */ jal 0x9a40 +/* d500: 0c002690 */ jal viConfigureForLogos /* d504: 00000000 */ nop -/* d508: 0c00bd46 */ jal 0x2f518 +/* d508: 0c00bd46 */ jal rmonIsDisabled /* d50c: 00000000 */ nop /* d510: 3c018006 */ lui $at,0x8006 -/* d514: 0c004f0b */ jal 0x13c2c +/* d514: 0c004f0b */ jal joySystemInit /* d518: ac22d860 */ sw $v0,-0x27a0($at) /* d51c: 27a41490 */ addiu $a0,$sp,0x1490 /* d520: 27a514cc */ addiu $a1,$sp,0x14cc -/* d524: 0c011f94 */ jal 0x47e50 +/* d524: 0c011f94 */ jal osCreateMesgQueue /* d528: 24060001 */ li $a2,0x1 /* d52c: 00008025 */ move $s0,$zero /* d530: 3c070047 */ lui $a3,0x47 @@ -336,16 +336,16 @@ glabel mainInit /* d550: afae0010 */ sw $t6,0x10($sp) /* d554: 34e7868c */ ori $a3,$a3,0x868c /* d558: 27a414a8 */ addiu $a0,$sp,0x14a8 -/* d55c: 0c01218c */ jal 0x48630 +/* d55c: 0c01218c */ jal osSetTimer /* d560: 24060000 */ li $a2,0x0 /* d564: 27a41490 */ addiu $a0,$sp,0x1490 /* d568: 27a514cc */ addiu $a1,$sp,0x14cc -/* d56c: 0c012080 */ jal 0x48200 +/* d56c: 0c012080 */ jal osRecvMesg /* d570: 24060001 */ li $a2,0x1 /* d574: 24010001 */ li $at,0x1 /* d578: 56010006 */ bnel $s0,$at,.JF0000d594 /* d57c: 2a010002 */ slti $at,$s0,0x2 -/* d580: 0c004f65 */ jal 0x13d94 +/* d580: 0c004f65 */ jal joy00013dfc /* d584: 00000000 */ nop /* d588: 10000007 */ b .JF0000d5a8 /* d58c: 26100001 */ addiu $s0,$s0,0x1 @@ -353,7 +353,7 @@ glabel mainInit .JF0000d594: /* d594: 54200004 */ bnezl $at,.JF0000d5a8 /* d598: 26100001 */ addiu $s0,$s0,0x1 -/* d59c: 0c0050a2 */ jal 0x14288 +/* d59c: 0c0050a2 */ jal joyDebugJoy /* d5a0: 00000000 */ nop /* d5a4: 26100001 */ addiu $s0,$s0,0x1 .JF0000d5a8: @@ -362,7 +362,7 @@ glabel mainInit /* d5b0: 3c070047 */ lui $a3,0x47 /* d5b4: 3c057005 */ lui $a1,0x7005 /* d5b8: 24a53948 */ addiu $a1,$a1,0x3948 -/* d5bc: 0c004bec */ jal 0x12fb0 +/* d5bc: 0c004bec */ jal argFindByPrefix /* d5c0: 24040001 */ li $a0,0x1 /* d5c4: 14400004 */ bnez $v0,.JF0000d5d8 /* d5c8: 00002025 */ move $a0,$zero @@ -370,19 +370,19 @@ glabel mainInit /* d5d0: 3c018006 */ lui $at,0x8006 /* d5d4: ac2bd860 */ sw $t3,-0x27a0($at) .JF0000d5d8: -/* d5d8: 0c0053be */ jal 0x14ef8 +/* d5d8: 0c0053be */ jal joyGetButtons /* d5dc: 24051000 */ li $a1,0x1000 /* d5e0: 14400010 */ bnez $v0,.JF0000d624 /* d5e4: 24040001 */ li $a0,0x1 -/* d5e8: 0c0053be */ jal 0x14ef8 +/* d5e8: 0c0053be */ jal joyGetButtons /* d5ec: 24051000 */ li $a1,0x1000 /* d5f0: 1440000c */ bnez $v0,.JF0000d624 /* d5f4: 24040002 */ li $a0,0x2 -/* d5f8: 0c0053be */ jal 0x14ef8 +/* d5f8: 0c0053be */ jal joyGetButtons /* d5fc: 24051000 */ li $a1,0x1000 /* d600: 14400008 */ bnez $v0,.JF0000d624 /* d604: 24040003 */ li $a0,0x3 -/* d608: 0c0053be */ jal 0x14ef8 +/* d608: 0c0053be */ jal joyGetButtons /* d60c: 24051000 */ li $a1,0x1000 /* d610: 14400004 */ bnez $v0,.JF0000d624 /* d614: 3c108006 */ lui $s0,0x8006 @@ -414,7 +414,7 @@ glabel mainInit /* d674: 8dd9001c */ lw $t9,0x1c($t6) /* d678: 8dc10018 */ lw $at,0x18($t6) /* d67c: adb9001c */ sw $t9,0x1c($t5) -/* d680: 0c0005b0 */ jal 0x16c0 +/* d680: 0c0005b0 */ jal bootGetMemSize /* d684: ada10018 */ sw $at,0x18($t5) /* d688: 3c010040 */ lui $at,0x40 /* d68c: 34210001 */ ori $at,$at,0x1 @@ -451,7 +451,7 @@ glabel mainInit /* d704: 256bea90 */ addiu $t3,$t3,-5488 /* d708: 39c4003f */ xori $a0,$t6,0x3f /* d70c: 00808025 */ move $s0,$a0 -/* d710: 0c0034ec */ jal 0xd3b0 +/* d710: 0c0034ec */ jal dmaExec /* d714: 01653023 */ subu $a2,$t3,$a1 /* d718: 1000000e */ b .JF0000d754 /* d71c: 3c01ffff */ lui $at,0xffff @@ -466,7 +466,7 @@ glabel mainInit /* d73c: 25efe1e0 */ addiu $t7,$t7,-7712 /* d740: 3b04003f */ xori $a0,$t8,0x3f /* d744: 00808025 */ move $s0,$a0 -/* d748: 0c0034ec */ jal 0xd3b0 +/* d748: 0c0034ec */ jal dmaExec /* d74c: 01e53023 */ subu $a2,$t7,$a1 /* d750: 3c01ffff */ lui $at,0xffff .JF0000d754: @@ -474,7 +474,7 @@ glabel mainInit /* d758: 02012821 */ addu $a1,$s0,$at /* d75c: afa50048 */ sw $a1,0x48($sp) /* d760: 02002025 */ move $a0,$s0 -/* d764: 0c001d18 */ jal 0x7460 +/* d764: 0c001d18 */ jal rzipInflate /* d768: 27a60050 */ addiu $a2,$sp,0x50 /* d76c: 3c050004 */ lui $a1,0x4 /* d770: 8faa0048 */ lw $t2,0x48($sp) @@ -519,9 +519,9 @@ glabel mainInit /* d7fc: 14c9fff3 */ bne $a2,$t1,.JF0000d7cc /* d800: 24e70240 */ addiu $a3,$a3,0x240 .JF0000d804: -/* d804: 0c002a95 */ jal 0xaa54 +/* d804: 0c002a95 */ jal viSetMode /* d808: 24040002 */ li $a0,0x2 -/* d80c: 0c0026bd */ jal 0x9af4 +/* d80c: 0c0026bd */ jal viConfigureForBanner /* d810: 02002025 */ move $a0,$s0 /* d814: 8faa0048 */ lw $t2,0x48($sp) /* d818: 3c018006 */ lui $at,0x8006 @@ -532,14 +532,14 @@ glabel mainInit /* d82c: ac2eef00 */ sw $t6,-0x1100($at) /* d830: 2484e1a0 */ addiu $a0,$a0,-7776 /* d834: 27a51470 */ addiu $a1,$sp,0x1470 -/* d838: 0c012080 */ jal 0x48200 +/* d838: 0c012080 */ jal osRecvMesg /* d83c: 00003025 */ move $a2,$zero /* d840: 14400007 */ bnez $v0,.JF0000d860 .JF0000d844: /* d844: 3c048009 */ lui $a0,0x8009 /* d848: 2484e1a0 */ addiu $a0,$a0,-7776 /* d84c: 27a51470 */ addiu $a1,$sp,0x1470 -/* d850: 0c012080 */ jal 0x48200 +/* d850: 0c012080 */ jal osRecvMesg /* d854: 00003025 */ move $a2,$zero /* d858: 1040fffa */ beqz $v0,.JF0000d844 /* d85c: 00000000 */ nop @@ -550,7 +550,7 @@ glabel mainInit /* d868: 2484e1a0 */ addiu $a0,$a0,-7776 /* d86c: 27a51470 */ addiu $a1,$sp,0x1470 /* d870: 24060001 */ li $a2,0x1 -/* d874: 0c012080 */ jal 0x48200 +/* d874: 0c012080 */ jal osRecvMesg /* d878: afa31488 */ sw $v1,0x1488($sp) /* d87c: 8fb91470 */ lw $t9,0x1470($sp) /* d880: 24010001 */ li $at,0x1 @@ -559,14 +559,14 @@ glabel mainInit /* d88c: 27b01450 */ addiu $s0,$sp,0x1450 /* d890: 5561000d */ bnel $t3,$at,.JF0000d8c8 /* d894: 28610006 */ slti $at,$v1,0x6 -/* d898: 0c0027fa */ jal 0x9fe8 +/* d898: 0c0027fa */ jal viUpdateMode /* d89c: afa31488 */ sw $v1,0x1488($sp) /* d8a0: 3c048006 */ lui $a0,0x8006 /* d8a4: 3c058006 */ lui $a1,0x8006 /* d8a8: 24a5dba0 */ addiu $a1,$a1,-9312 /* d8ac: 2484db78 */ addiu $a0,$a0,-9352 /* d8b0: 00003025 */ move $a2,$zero -/* d8b4: 0c00bd01 */ jal 0x2f404 +/* d8b4: 0c00bd01 */ jal rdpCreateTask /* d8b8: 02003825 */ move $a3,$s0 /* d8bc: 8fa31488 */ lw $v1,0x1488($sp) /* d8c0: 24630001 */ addiu $v1,$v1,0x1 @@ -583,105 +583,105 @@ glabel mainInit /* d8e4: 1000ffff */ b .JF0000d8e4 /* d8e8: 00000000 */ nop .JF0000d8ec: -/* d8ec: 0c001c10 */ jal 0x7040 +/* d8ec: 0c001c10 */ jal vmInit /* d8f0: 00000000 */ nop -/* d8f4: 0fc6a10c */ jal 0xf1a8430 +/* d8f4: 0fc6a10c */ jal func0f1a78b0 /* d8f8: 00000000 */ nop -/* d8fc: 0fc59ce1 */ jal 0xf167384 +/* d8fc: 0fc59ce1 */ jal func0f166f74 /* d900: 00000000 */ nop -/* d904: 0fc5d8e8 */ jal 0xf1763a0 +/* d904: 0fc5d8e8 */ jal stub0f175f50 /* d908: 00000000 */ nop -/* d90c: 0fc5d8f8 */ jal 0xf1763e0 +/* d90c: 0fc5d8f8 */ jal func0f175f90 /* d910: 00000000 */ nop /* d914: 3c0c8006 */ lui $t4,0x8006 /* d918: 8d8cd860 */ lw $t4,-0x27a0($t4) /* d91c: 11800003 */ beqz $t4,.JF0000d92c /* d920: 3c047005 */ lui $a0,0x7005 -/* d924: 0c004baf */ jal 0x12ebc +/* d924: 0c004baf */ jal argSetString /* d928: 24843950 */ addiu $a0,$a0,0x3950 .JF0000d92c: /* d92c: 3c04800b */ lui $a0,0x800b -/* d930: 0c012b34 */ jal 0x4acd0 +/* d930: 0c012b34 */ jal osVirtualToPhysical /* d934: 2484dbf0 */ addiu $a0,$a0,-9232 /* d938: 3c038009 */ lui $v1,0x8009 /* d93c: 8c631170 */ lw $v1,0x1170($v1) /* d940: 3c018000 */ lui $at,0x8000 /* d944: 00412025 */ or $a0,$v0,$at -/* d948: 0c00486a */ jal 0x121a8 +/* d948: 0c00486a */ jal mempInit /* d94c: 00642823 */ subu $a1,$v1,$a0 -/* d950: 0c00493a */ jal 0x124e8 +/* d950: 0c00493a */ jal mempResetPool /* d954: 24040008 */ li $a0,0x8 -/* d958: 0c00493a */ jal 0x124e8 +/* d958: 0c00493a */ jal mempResetPool /* d95c: 24040006 */ li $a0,0x6 -/* d960: 0c0033a6 */ jal 0xce98 +/* d960: 0c0033a6 */ jal crashReset /* d964: 00000000 */ nop -/* d968: 0fc02ca8 */ jal 0xf00b2a0 +/* d968: 0fc02ca8 */ jal mpInitPresetFeatures /* d96c: 00000000 */ nop -/* d970: 0fc5dc8b */ jal 0xf17722c +/* d970: 0fc5dc8b */ jal func0f176ddc /* d974: 00000000 */ nop -/* d978: 0c000d34 */ jal 0x34d0 +/* d978: 0c000d34 */ jal func000034d0 /* d97c: 00000000 */ nop -/* d980: 0fc02c88 */ jal 0xf00b220 +/* d980: 0fc02c88 */ jal loadTextureList /* d984: 00000000 */ nop -/* d988: 0fc00000 */ jal 0xf000000 +/* d988: 0fc00000 */ jal func0f000000 /* d98c: 00000000 */ nop -/* d990: 0fc59fc2 */ jal 0xf167f08 +/* d990: 0fc59fc2 */ jal lv0f167af8 /* d994: 00000000 */ nop -/* d998: 0fc41d8f */ jal 0xf10763c +/* d998: 0fc41d8f */ jal cheatsDisableAll /* d99c: 00000000 */ nop -/* d9a0: 0c003a58 */ jal 0xe960 +/* d9a0: 0c003a58 */ jal func0000e9c0 /* d9a4: 00000000 */ nop -/* d9a8: 0fc54a14 */ jal 0xf152850 +/* d9a8: 0fc54a14 */ jal func0f1531a0 /* d9ac: 00000000 */ nop -/* d9b0: 0c004dcc */ jal 0x13730 +/* d9b0: 0c004dcc */ jal dhudInit /* d9b4: 00000000 */ nop -/* d9b8: 0fc49f44 */ jal 0xf127d10 +/* d9b8: 0fc49f44 */ jal playermgrInit /* d9bc: 00000000 */ nop -/* d9c0: 0fc5b3ec */ jal 0xf16cfb0 +/* d9c0: 0fc5b3ec */ jal frametimeInit /* d9c4: 00000000 */ nop -/* d9c8: 0fc02ca4 */ jal 0xf00b290 +/* d9c8: 0fc02ca4 */ jal stub0f00b200 /* d9cc: 00000000 */ nop -/* d9d0: 0c002684 */ jal 0x9a10 +/* d9d0: 0c002684 */ jal profileInit /* d9d4: 00000000 */ nop -/* d9d8: 0fc00240 */ jal 0xf000900 +/* d9d8: 0fc00240 */ jal stub0f000870 /* d9dc: 00000000 */ nop -/* d9e0: 0fc00244 */ jal 0xf000910 +/* d9e0: 0fc00244 */ jal func0f000880 /* d9e4: 00000000 */ nop -/* d9e8: 0fc0025c */ jal 0xf000970 +/* d9e8: 0fc0025c */ jal stub0f0008e0 /* d9ec: 00000000 */ nop -/* d9f0: 0fc00260 */ jal 0xf000980 +/* d9f0: 0fc00260 */ jal stub0f0008f0 /* d9f4: 00000000 */ nop -/* d9f8: 0fc00264 */ jal 0xf000990 +/* d9f8: 0fc00264 */ jal stub0f000900 /* d9fc: 00000000 */ nop -/* da00: 0fc02c84 */ jal 0xf00b210 +/* da00: 0fc02c84 */ jal stub0f00b180 /* da04: 00000000 */ nop -/* da08: 0fc00268 */ jal 0xf0009a0 +/* da08: 0fc00268 */ jal stub0f000910 /* da0c: 00000000 */ nop -/* da10: 0fc00234 */ jal 0xf0008d0 +/* da10: 0fc00234 */ jal stub0f000840 /* da14: 00000000 */ nop -/* da18: 0fc6224c */ jal 0xf188930 +/* da18: 0fc6224c */ jal mpSetDefaultSetup /* da1c: 00000000 */ nop -/* da20: 0fc52652 */ jal 0xf149948 +/* da20: 0fc52652 */ jal phAllocate /* da24: 00000000 */ nop -/* da28: 0fc46362 */ jal 0xf118d88 +/* da28: 0fc46362 */ jal pakInitAll /* da2c: 00000000 */ nop -/* da30: 0fc52677 */ jal 0xf1499dc +/* da30: 0fc52677 */ jal func0f14a3bc /* da34: 00000000 */ nop -/* da38: 0c008bb4 */ jal 0x22ed0 +/* da38: 0c008bb4 */ jal animsInit /* da3c: 00000000 */ nop -/* da40: 0fc00064 */ jal 0xf000190 +/* da40: 0fc00064 */ jal func0f000100 /* da44: 00000000 */ nop -/* da48: 0fc00070 */ jal 0xf0001c0 +/* da48: 0fc00070 */ jal func0f000130 /* da4c: 00000000 */ nop -/* da50: 0fc00238 */ jal 0xf0008e0 +/* da50: 0fc00238 */ jal stub0f000850 /* da54: 00000000 */ nop -/* da58: 0fc0023c */ jal 0xf0008f0 +/* da58: 0fc0023c */ jal stub0f000860 /* da5c: 00000000 */ nop -/* da60: 0fc00040 */ jal 0xf000100 +/* da60: 0fc00040 */ jal func0f000090 /* da64: 00000000 */ nop -/* da68: 0c0026e7 */ jal 0x9b9c +/* da68: 0c0026e7 */ jal viConfigureForLegal /* da6c: 00000000 */ nop -/* da70: 0c00279a */ jal 0x9e68 +/* da70: 0c00279a */ jal viBlack /* da74: 24040001 */ li $a0,0x1 /* da78: 8fbf002c */ lw $ra,0x2c($sp) /* da7c: 3c018006 */ lui $at,0x8006 diff --git a/src/lib/model.c b/src/lib/model.c index 16b8e0ead..24b9e152a 100644 --- a/src/lib/model.c +++ b/src/lib/model.c @@ -1382,7 +1382,7 @@ glabel var70053fc0pf /* 1c008: afb80014 */ sw $t8,0x14($sp) /* 1c00c: 8fa40154 */ lw $a0,0x154($sp) /* 1c010: 8fa60150 */ lw $a2,0x150($sp) -/* 1c014: 0c008ed8 */ jal 0x23b60 +/* 1c014: 0c008ed8 */ jal anim00024050 /* 1c018: afb90010 */ sw $t9,0x10($sp) /* 1c01c: 3c0a800a */ lui $t2,0x800a /* 1c020: 8d4aaafc */ lw $t2,-0x5504($t2) @@ -1398,7 +1398,7 @@ glabel var70053fc0pf /* 1c048: 3c017005 */ lui $at,0x7005 /* 1c04c: c42841dc */ lwc1 $f8,0x41dc($at) /* 1c050: 46002183 */ div.s $f6,$f4,$f0 -/* 1c054: 0fc2618c */ jal 0xf098630 +/* 1c054: 0fc2618c */ jal floorf /* 1c058: 46083300 */ add.s $f12,$f6,$f8 /* 1c05c: c60a001c */ lwc1 $f10,0x1c($s0) /* 1c060: 44807000 */ mtc1 $zero,$f14 @@ -1423,13 +1423,13 @@ glabel var70053fc0pf /* 1c0a4: e7a200e0 */ swc1 $f2,0xe0($sp) /* 1c0a8: afad0018 */ sw $t5,0x18($sp) /* 1c0ac: afac0014 */ sw $t4,0x14($sp) -/* 1c0b0: 0c008ed8 */ jal 0x23b60 +/* 1c0b0: 0c008ed8 */ jal anim00024050 /* 1c0b4: afab0010 */ sw $t3,0x10($sp) /* 1c0b8: c7a200e0 */ lwc1 $f2,0xe0($sp) /* 1c0bc: 27a40144 */ addiu $a0,$sp,0x144 /* 1c0c0: 27a500d4 */ addiu $a1,$sp,0xd4 /* 1c0c4: 44061000 */ mfc1 $a2,$f2 -/* 1c0c8: 0c006c07 */ jal 0x1b01c +/* 1c0c8: 0c006c07 */ jal model0001b07c /* 1c0cc: 00000000 */ nop /* 1c0d0: 8faf003c */ lw $t7,0x3c($sp) /* 1c0d4: c7a200e0 */ lwc1 $f2,0xe0($sp) @@ -1441,7 +1441,7 @@ glabel var70053fc0pf /* 1c0ec: 44807000 */ mtc1 $zero,$f14 .JF0001c0f0: /* 1c0f0: 44061000 */ mfc1 $a2,$f2 -/* 1c0f4: 0c006bce */ jal 0x1af38 +/* 1c0f4: 0c006bce */ jal model0001af98 /* 1c0f8: 27a500c8 */ addiu $a1,$sp,0xc8 .JF0001c0fc: /* 1c0fc: 44807000 */ mtc1 $zero,$f14 @@ -1479,7 +1479,7 @@ glabel var70053fc0pf /* 1c170: afaa001c */ sw $t2,0x1c($sp) /* 1c174: afa90018 */ sw $t1,0x18($sp) /* 1c178: afa80014 */ sw $t0,0x14($sp) -/* 1c17c: 0c008ed8 */ jal 0x23b60 +/* 1c17c: 0c008ed8 */ jal anim00024050 /* 1c180: afb80010 */ sw $t8,0x10($sp) /* 1c184: 44802000 */ mtc1 $zero,$f4 /* 1c188: c6060034 */ lwc1 $f6,0x34($s0) @@ -1497,26 +1497,26 @@ glabel var70053fc0pf /* 1c1b8: afae001c */ sw $t6,0x1c($sp) /* 1c1bc: afad0018 */ sw $t5,0x18($sp) /* 1c1c0: afac0014 */ sw $t4,0x14($sp) -/* 1c1c4: 0c008ed8 */ jal 0x23b60 +/* 1c1c4: 0c008ed8 */ jal anim00024050 /* 1c1c8: afab0010 */ sw $t3,0x10($sp) /* 1c1cc: 27a400b0 */ addiu $a0,$sp,0xb0 /* 1c1d0: 27a5005c */ addiu $a1,$sp,0x5c -/* 1c1d4: 0c006c07 */ jal 0x1b01c +/* 1c1d4: 0c006c07 */ jal model0001b07c /* 1c1d8: 8e060034 */ lw $a2,0x34($s0) /* 1c1dc: 27a40144 */ addiu $a0,$sp,0x144 .JF0001c1e0: -/* 1c1e0: 0fc25e90 */ jal 0xf097a40 +/* 1c1e0: 0fc25e90 */ jal quaternion0f096ca0 /* 1c1e4: 27a50088 */ addiu $a1,$sp,0x88 /* 1c1e8: 27a400b0 */ addiu $a0,$sp,0xb0 -/* 1c1ec: 0fc25e90 */ jal 0xf097a40 +/* 1c1ec: 0fc25e90 */ jal quaternion0f096ca0 /* 1c1f0: 27a50078 */ addiu $a1,$sp,0x78 /* 1c1f4: 27a40088 */ addiu $a0,$sp,0x88 -/* 1c1f8: 0fc26118 */ jal 0xf098460 +/* 1c1f8: 0fc26118 */ jal quaternion0f0976c0 /* 1c1fc: 27a50078 */ addiu $a1,$sp,0x78 /* 1c200: 27a70068 */ addiu $a3,$sp,0x68 /* 1c204: 27a40088 */ addiu $a0,$sp,0x88 /* 1c208: 27a50078 */ addiu $a1,$sp,0x78 -/* 1c20c: 0fc26016 */ jal 0xf098058 +/* 1c20c: 0fc26016 */ jal quaternionSlerp /* 1c210: 8e060054 */ lw $a2,0x54($s0) /* 1c214: 44804000 */ mtc1 $zero,$f8 /* 1c218: c7aa0138 */ lwc1 $f10,0x138($sp) @@ -1571,7 +1571,7 @@ glabel var70053fc0pf /* 1c2d8: 8fa40160 */ lw $a0,0x160($sp) .JF0001c2dc: /* 1c2dc: afb80010 */ sw $t8,0x10($sp) -/* 1c2e0: 0c006ef3 */ jal 0x1bbcc +/* 1c2e0: 0c006ef3 */ jal model0001bc14 /* 1c2e4: afa80014 */ sw $t0,0x14($sp) /* 1c2e8: 100000a2 */ b .JF0001c574 /* 1c2ec: 8fbf002c */ lw $ra,0x2c($sp) @@ -1589,20 +1589,20 @@ glabel var70053fc0pf /* 1c318: afad0014 */ sw $t5,0x14($sp) /* 1c31c: 8fa40160 */ lw $a0,0x160($sp) /* 1c320: 01202825 */ move $a1,$t1 -/* 1c324: 0c006ef3 */ jal 0x1bbcc +/* 1c324: 0c006ef3 */ jal model0001bc14 /* 1c328: afac0010 */ sw $t4,0x10($sp) /* 1c32c: 10000091 */ b .JF0001c574 /* 1c330: 8fbf002c */ lw $ra,0x2c($sp) .JF0001c334: /* 1c334: afae0010 */ sw $t6,0x10($sp) -/* 1c338: 0c006ef3 */ jal 0x1bbcc +/* 1c338: 0c006ef3 */ jal model0001bc14 /* 1c33c: afaf0014 */ sw $t7,0x14($sp) /* 1c340: 1000008c */ b .JF0001c574 /* 1c344: 8fbf002c */ lw $ra,0x2c($sp) .JF0001c348: /* 1c348: 13200019 */ beqz $t9,.JF0001c3b0 /* 1c34c: c7a60138 */ lwc1 $f6,0x138($sp) -/* 1c350: 0fc57326 */ jal 0xf15cc98 +/* 1c350: 0fc57326 */ jal func0f15c888 /* 1c354: 00000000 */ nop /* 1c358: c7a60138 */ lwc1 $f6,0x138($sp) /* 1c35c: c7b0013c */ lwc1 $f16,0x13c($sp) @@ -1622,7 +1622,7 @@ glabel var70053fc0pf /* 1c394: 8fa50164 */ lw $a1,0x164($sp) /* 1c398: e7a80140 */ swc1 $f8,0x140($sp) /* 1c39c: 8fa60168 */ lw $a2,0x168($sp) -/* 1c3a0: 0c006df1 */ jal 0x1b7c4 +/* 1c3a0: 0c006df1 */ jal model0001b80c /* 1c3a4: 27a70144 */ addiu $a3,$sp,0x144 /* 1c3a8: 10000072 */ b .JF0001c574 /* 1c3ac: 8fbf002c */ lw $ra,0x2c($sp) @@ -1677,7 +1677,7 @@ glabel var70053fc0pf /* 1c460: 8fa60168 */ lw $a2,0x168($sp) /* 1c464: afaf0010 */ sw $t7,0x10($sp) /* 1c468: afa00014 */ sw $zero,0x14($sp) -/* 1c46c: 0c006df1 */ jal 0x1b7c4 +/* 1c46c: 0c006df1 */ jal model0001b80c /* 1c470: afb90018 */ sw $t9,0x18($sp) /* 1c474: 1000003f */ b .JF0001c574 /* 1c478: 8fbf002c */ lw $ra,0x2c($sp) @@ -1698,7 +1698,7 @@ glabel var70053fc0pf /* 1c4b0: 03003025 */ move $a2,$t8 /* 1c4b4: 27a70144 */ addiu $a3,$sp,0x144 /* 1c4b8: afa00014 */ sw $zero,0x14($sp) -/* 1c4bc: 0c006df1 */ jal 0x1b7c4 +/* 1c4bc: 0c006df1 */ jal model0001b80c /* 1c4c0: afac0010 */ sw $t4,0x10($sp) /* 1c4c4: 1000002b */ b .JF0001c574 /* 1c4c8: 8fbf002c */ lw $ra,0x2c($sp) @@ -1707,7 +1707,7 @@ glabel var70053fc0pf /* 1c4d0: 27ae012c */ addiu $t6,$sp,0x12c /* 1c4d4: afae0018 */ sw $t6,0x18($sp) /* 1c4d8: afad0010 */ sw $t5,0x10($sp) -/* 1c4dc: 0c006df1 */ jal 0x1b7c4 +/* 1c4dc: 0c006df1 */ jal model0001b80c /* 1c4e0: afa00014 */ sw $zero,0x14($sp) /* 1c4e4: 10000023 */ b .JF0001c574 /* 1c4e8: 8fbf002c */ lw $ra,0x2c($sp) @@ -1718,7 +1718,7 @@ glabel var70053fc0pf /* 1c4f8: 8de50008 */ lw $a1,0x8($t7) /* 1c4fc: 50a00006 */ beqzl $a1,.JF0001c518 /* 1c500: 8f300000 */ lw $s0,0x0($t9) -/* 1c504: 0c00695b */ jal 0x1a56c +/* 1c504: 0c00695b */ jal model0001a5cc /* 1c508: 00003025 */ move $a2,$zero /* 1c50c: 10000002 */ b .JF0001c518 /* 1c510: 00408025 */ move $s0,$v0 @@ -1727,7 +1727,7 @@ glabel var70053fc0pf /* 1c518: 1200000f */ beqz $s0,.JF0001c558 /* 1c51c: 8fa40158 */ lw $a0,0x158($sp) /* 1c520: 8fa40158 */ lw $a0,0x158($sp) -/* 1c524: 0c00599f */ jal 0x1667c +/* 1c524: 0c00599f */ jal mtx4LoadTranslation /* 1c528: 27a500e8 */ addiu $a1,$sp,0xe8 /* 1c52c: 8fa80158 */ lw $t0,0x158($sp) /* 1c530: 8faa0164 */ lw $t2,0x164($sp) @@ -1736,7 +1736,7 @@ glabel var70053fc0pf /* 1c53c: 8d49000c */ lw $t1,0xc($t2) /* 1c540: 27a500e8 */ addiu $a1,$sp,0xe8 /* 1c544: 00186180 */ sll $t4,$t8,0x6 -/* 1c548: 0c0056e1 */ jal 0x15b84 +/* 1c548: 0c0056e1 */ jal mtx00015be4 /* 1c54c: 012c3021 */ addu $a2,$t1,$t4 /* 1c550: 10000008 */ b .JF0001c574 /* 1c554: 8fbf002c */ lw $ra,0x2c($sp) @@ -1745,7 +1745,7 @@ glabel var70053fc0pf /* 1c55c: 848f000e */ lh $t7,0xe($a0) /* 1c560: 8dae000c */ lw $t6,0xc($t5) /* 1c564: 000fc980 */ sll $t9,$t7,0x6 -/* 1c568: 0c00599f */ jal 0x1667c +/* 1c568: 0c00599f */ jal mtx4LoadTranslation /* 1c56c: 01d92821 */ addu $a1,$t6,$t9 /* 1c570: 8fbf002c */ lw $ra,0x2c($sp) .JF0001c574: diff --git a/src/lib/ultra/os/initialize2.c b/src/lib/ultra/os/initialize2.c index 7a4ac64fa..28a7d0a06 100644 --- a/src/lib/ultra/os/initialize2.c +++ b/src/lib/ultra/os/initialize2.c @@ -35,25 +35,25 @@ glabel osInitialize2 /* 519dc: 3c018009 */ lui $at,0x8009 /* 519e0: afb00018 */ sw $s0,0x18($sp) /* 519e4: afa00030 */ sw $zero,0x30($sp) -/* 519e8: 0c0129f8 */ jal 0x4a7e0 +/* 519e8: 0c0129f8 */ jal __osGetSR /* 519ec: ac2e10d0 */ sw $t6,0x10d0($at) /* 519f0: 00408025 */ move $s0,$v0 /* 519f4: 3c012000 */ lui $at,0x2000 -/* 519f8: 0c0129f4 */ jal 0x4a7d0 +/* 519f8: 0c0129f4 */ jal __osSetSR /* 519fc: 02012025 */ or $a0,$s0,$at /* 51a00: 3c040100 */ lui $a0,0x100 -/* 51a04: 0c011f3c */ jal 0x47cf0 +/* 51a04: 0c011f3c */ jal __osSetFpcCsr /* 51a08: 34840800 */ ori $a0,$a0,0x800 /* 51a0c: 3c041fc0 */ lui $a0,0x1fc0 /* 51a10: 348407fc */ ori $a0,$a0,0x7fc -/* 51a14: 0c0129fc */ jal 0x4a7f0 +/* 51a14: 0c0129fc */ jal __osSiRawReadIo /* 51a18: 27a50034 */ addiu $a1,$sp,0x34 /* 51a1c: 10400007 */ beqz $v0,.JF00051a3c /* 51a20: 00000000 */ nop .JF00051a24: /* 51a24: 3c041fc0 */ lui $a0,0x1fc0 /* 51a28: 348407fc */ ori $a0,$a0,0x7fc -/* 51a2c: 0c0129fc */ jal 0x4a7f0 +/* 51a2c: 0c0129fc */ jal __osSiRawReadIo /* 51a30: 27a50034 */ addiu $a1,$sp,0x34 /* 51a34: 1440fffb */ bnez $v0,.JF00051a24 /* 51a38: 00000000 */ nop @@ -62,7 +62,7 @@ glabel osInitialize2 /* 51a40: 3c041fc0 */ lui $a0,0x1fc0 /* 51a44: 348407fc */ ori $a0,$a0,0x7fc /* 51a48: 34af0008 */ ori $t7,$a1,0x8 -/* 51a4c: 0c012a10 */ jal 0x4a840 +/* 51a4c: 0c012a10 */ jal __osSiRawWriteIo /* 51a50: 01e02825 */ move $a1,$t7 /* 51a54: 10400009 */ beqz $v0,.JF00051a7c /* 51a58: 00000000 */ nop @@ -71,7 +71,7 @@ glabel osInitialize2 /* 51a60: 3c041fc0 */ lui $a0,0x1fc0 /* 51a64: 348407fc */ ori $a0,$a0,0x7fc /* 51a68: 34b80008 */ ori $t8,$a1,0x8 -/* 51a6c: 0c012a10 */ jal 0x4a840 +/* 51a6c: 0c012a10 */ jal __osSiRawWriteIo /* 51a70: 03002825 */ move $a1,$t8 /* 51a74: 1440fff9 */ bnez $v0,.JF00051a5c /* 51a78: 00000000 */ nop @@ -124,30 +124,30 @@ glabel osInitialize2 /* 51b30: 8dc10008 */ lw $at,0x8($t6) /* 51b34: ade10008 */ sw $at,0x8($t7) /* 51b38: 8dd8000c */ lw $t8,0xc($t6) -/* 51b3c: 0c012a24 */ jal 0x4a890 +/* 51b3c: 0c012a24 */ jal osWritebackDCache /* 51b40: adf8000c */ sw $t8,0xc($t7) /* 51b44: 3c048000 */ lui $a0,0x8000 -/* 51b48: 0c011f18 */ jal 0x47c60 +/* 51b48: 0c011f18 */ jal osInvalICache /* 51b4c: 24050190 */ li $a1,0x190 -/* 51b50: 0c01471e */ jal 0x51c78 +/* 51b50: 0c01471e */ jal osCartRomInit2 /* 51b54: 00000000 */ nop -/* 51b58: 0c0148a4 */ jal 0x52290 +/* 51b58: 0c0148a4 */ jal osUnmapTLBAll /* 51b5c: 00000000 */ nop -/* 51b60: 0c000bfc */ jal 0x2ff0 +/* 51b60: 0c000bfc */ jal osMapTLBRdb /* 51b64: 00000000 */ nop /* 51b68: 3c048006 */ lui $a0,0x8006 /* 51b6c: 3c058006 */ lui $a1,0x8006 /* 51b70: 8ca5ce24 */ lw $a1,-0x31dc($a1) /* 51b74: 8c84ce20 */ lw $a0,-0x31e0($a0) /* 51b78: 24060000 */ li $a2,0x0 -/* 51b7c: 0c01375e */ jal 0x4dd78 +/* 51b7c: 0c01375e */ jal __ll_mul /* 51b80: 24070003 */ li $a3,0x3 /* 51b84: afa20020 */ sw $v0,0x20($sp) /* 51b88: afa30024 */ sw $v1,0x24($sp) /* 51b8c: 8fa50024 */ lw $a1,0x24($sp) /* 51b90: 8fa40020 */ lw $a0,0x20($sp) /* 51b94: 24060000 */ li $a2,0x0 -/* 51b98: 0c01371e */ jal 0x4dc78 +/* 51b98: 0c01371e */ jal __ull_div /* 51b9c: 24070004 */ li $a3,0x4 /* 51ba0: 3c088000 */ lui $t0,0x8000 /* 51ba4: 8d08030c */ lw $t0,0x30c($t0) @@ -157,7 +157,7 @@ glabel osInitialize2 /* 51bb4: ac23ce24 */ sw $v1,-0x31dc($at) /* 51bb8: 3c048000 */ lui $a0,0x8000 /* 51bbc: 2484031c */ addiu $a0,$a0,0x31c -/* 51bc0: 0c012a44 */ jal 0x4a910 +/* 51bc0: 0c012a44 */ jal bzero /* 51bc4: 24050040 */ li $a1,0x40 .JF00051bc8: /* 51bc8: 3c198000 */ lui $t9,0x8000 @@ -186,7 +186,7 @@ glabel osInitialize2 /* 51c1c: 3c018006 */ lui $at,0x8006 /* 51c20: ac2d11f8 */ sw $t5,0x11f8($at) .JF00051c24: -/* 51c24: 0c012a6c */ jal 0x4a9b0 +/* 51c24: 0c012a6c */ jal __osGetCause /* 51c28: 00000000 */ nop /* 51c2c: 304c1000 */ andi $t4,$v0,0x1000 /* 51c30: 11800003 */ beqz $t4,.JF00051c40