diff --git a/src/game/activemenu/activemenu.c b/src/game/activemenu/activemenu.c index ff6c0d949..84b2feec0 100644 --- a/src/game/activemenu/activemenu.c +++ b/src/game/activemenu/activemenu.c @@ -3530,7 +3530,7 @@ glabel amRender /* f1010cc: 90790250 */ lbu $t9,0x250($v1) /* f1010d0: 53200353 */ beqzl $t9,.PB0f101e20 /* f1010d4: 8c621c04 */ lw $v0,0x1c04($v1) -/* f1010d8: 0fc5528f */ jal 0xf154a3c +/* f1010d8: 0fc5528f */ jal func0f153628 /* f1010dc: 8fa401d8 */ lw $a0,0x1d8($sp) /* f1010e0: 3c08800a */ lui $t0,0x800a /* f1010e4: 2508e4d0 */ addiu $t0,$t0,-6960 @@ -3587,7 +3587,7 @@ glabel amRender .PB0f1011a8: /* f1011a8: 00182403 */ sra $a0,$t8,0x10 /* f1011ac: 000e2c03 */ sra $a1,$t6,0x10 -/* f1011b0: 0fc3fe05 */ jal 0xf0ff814 +/* f1011b0: 0fc3fe05 */ jal amCalculateSlotPosition /* f1011b4: 26070008 */ addiu $a3,$s0,0x8 /* f1011b8: 3c18800a */ lui $t8,0x800a /* f1011bc: 8f1866e8 */ lw $t8,0x66e8($t8) @@ -3610,16 +3610,16 @@ glabel amRender /* f1011fc: 0004c400 */ sll $t8,$a0,0x10 /* f101200: 00182403 */ sra $a0,$t8,0x10 /* f101204: 000e2c03 */ sra $a1,$t6,0x10 -/* f101208: 0fc3fe05 */ jal 0xf0ff814 +/* f101208: 0fc3fe05 */ jal amCalculateSlotPosition /* f10120c: 2607000c */ addiu $a3,$s0,0xc .PB0f101210: -/* f101210: 0fc3530f */ jal 0xf0d4c3c +/* f101210: 0fc3530f */ jal func0f0d479c /* f101214: 8fa401d8 */ lw $a0,0x1d8($sp) /* f101218: afa201d8 */ sw $v0,0x1d8($sp) -/* f10121c: 0fc5a40f */ jal 0xf16903c +/* f10121c: 0fc5a40f */ jal gfxAllocateColours /* f101220: 24040002 */ li $a0,0x2 /* f101224: 0040a825 */ move $s5,$v0 -/* f101228: 0fc5a3f5 */ jal 0xf168fd4 +/* f101228: 0fc5a3f5 */ jal gfxAllocateVertices /* f10122c: 24040008 */ li $a0,0x8 /* f101230: 8fb801d8 */ lw $t8,0x1d8($sp) /* f101234: 3c0ee700 */ lui $t6,0xe700 @@ -3673,7 +3673,7 @@ glabel amRender /* f1012f4: 27a401d8 */ addiu $a0,$sp,0x1d8 /* f1012f8: 00002825 */ move $a1,$zero /* f1012fc: 24060002 */ li $a2,0x2 -/* f101300: 0fc2cf74 */ jal 0xf0b3dd0 +/* f101300: 0fc2cf74 */ jal func0f0b39c0 /* f101304: 00003825 */ move $a3,$zero /* f101308: 8faf01d8 */ lw $t7,0x1d8($sp) /* f10130c: 3c19b900 */ lui $t9,0xb900 @@ -3689,7 +3689,7 @@ glabel amRender /* f101334: 24040001 */ li $a0,0x1 /* f101338: 00002825 */ move $a1,$zero /* f10133c: adf90000 */ sw $t9,0x0($t7) -/* f101340: 0fc3fe05 */ jal 0xf0ff814 +/* f101340: 0fc3fe05 */ jal amCalculateSlotPosition /* f101344: adee0004 */ sw $t6,0x4($t7) /* f101348: 87af01ba */ lh $t7,0x1ba($sp) /* f10134c: 2411000a */ li $s1,0xa @@ -3706,7 +3706,7 @@ glabel amRender /* f101378: 03310019 */ multu $t9,$s1 /* f10137c: 00007012 */ mflo $t6 /* f101380: a60e0002 */ sh $t6,0x2($s0) -/* f101384: 0fc3fe05 */ jal 0xf0ff814 +/* f101384: 0fc3fe05 */ jal amCalculateSlotPosition /* f101388: 00000000 */ nop /* f10138c: 87af01ba */ lh $t7,0x1ba($sp) /* f101390: 24040001 */ li $a0,0x1 @@ -3721,7 +3721,7 @@ glabel amRender /* f1013b4: 03310019 */ multu $t9,$s1 /* f1013b8: 00007012 */ mflo $t6 /* f1013bc: a60e000e */ sh $t6,0xe($s0) -/* f1013c0: 0fc3fe05 */ jal 0xf0ff814 +/* f1013c0: 0fc3fe05 */ jal amCalculateSlotPosition /* f1013c4: 00000000 */ nop /* f1013c8: 87af01ba */ lh $t7,0x1ba($sp) /* f1013cc: 00002025 */ move $a0,$zero @@ -3736,7 +3736,7 @@ glabel amRender /* f1013f0: 03310019 */ multu $t9,$s1 /* f1013f4: 00007012 */ mflo $t6 /* f1013f8: a60e001a */ sh $t6,0x1a($s0) -/* f1013fc: 0fc3fe05 */ jal 0xf0ff814 +/* f1013fc: 0fc3fe05 */ jal amCalculateSlotPosition /* f101400: 00000000 */ nop /* f101404: 87af01ba */ lh $t7,0x1ba($sp) /* f101408: 8602000c */ lh $v0,0xc($s0) @@ -3807,7 +3807,7 @@ glabel amRender /* f101504: 26380008 */ addiu $t8,$s1,0x8 /* f101508: afb801d8 */ sw $t8,0x1d8($sp) /* f10150c: 02a02025 */ move $a0,$s5 -/* f101510: 0c012de0 */ jal 0x4b780 +/* f101510: 0c012de0 */ jal osVirtualToPhysical /* f101514: ae390000 */ sw $t9,0x0($s1) /* f101518: ae220004 */ sw $v0,0x4($s1) /* f10151c: 8fb201d8 */ lw $s2,0x1d8($sp) @@ -3816,7 +3816,7 @@ glabel amRender /* f101528: 264f0008 */ addiu $t7,$s2,0x8 /* f10152c: afaf01d8 */ sw $t7,0x1d8($sp) /* f101530: 02002025 */ move $a0,$s0 -/* f101534: 0c012de0 */ jal 0x4b780 +/* f101534: 0c012de0 */ jal osVirtualToPhysical /* f101538: ae580000 */ sw $t8,0x0($s2) /* f10153c: ae420004 */ sw $v0,0x4($s2) /* f101540: 8fb901d8 */ lw $t9,0x1d8($sp) @@ -3845,7 +3845,7 @@ glabel amRender /* f10159c: 37185621 */ ori $t8,$t8,0x5621 /* f1015a0: af380004 */ sw $t8,0x4($t9) /* f1015a4: af2f0000 */ sw $t7,0x0($t9) -/* f1015a8: 0fc3539a */ jal 0xf0d4e68 +/* f1015a8: 0fc3539a */ jal func0f0d49c8 /* f1015ac: 8fa401d8 */ lw $a0,0x1d8($sp) /* f1015b0: 3c168007 */ lui $s6,0x8007 /* f1015b4: afa201d8 */ sw $v0,0x1d8($sp) @@ -3864,7 +3864,7 @@ glabel amRender /* f1015e0: 01c02825 */ move $a1,$t6 /* f1015e4: 27a60182 */ addiu $a2,$sp,0x182 /* f1015e8: 27a70180 */ addiu $a3,$sp,0x180 -/* f1015ec: 0fc3fe05 */ jal 0xf0ff814 +/* f1015ec: 0fc3fe05 */ jal amCalculateSlotPosition /* f1015f0: 2414ffff */ li $s4,-1 /* f1015f4: 3c18800a */ lui $t8,0x800a /* f1015f8: 8f1866e8 */ lw $t8,0x66e8($t8) @@ -3884,7 +3884,7 @@ glabel amRender /* f10162c: 8319251b */ lb $t9,0x251b($t8) /* f101630: 07210029 */ bgez $t9,.PB0f1016d8 /* f101634: 00000000 */ nop -/* f101638: 0fc3f90b */ jal 0xf0fe42c +/* f101638: 0fc3f90b */ jal amGetFirstBuddyIndex /* f10163c: 00000000 */ nop /* f101640: 04400025 */ bltz $v0,.PB0f1016d8 /* f101644: 00000000 */ nop @@ -3969,14 +3969,14 @@ glabel amRender /* f101774: 3c144f4f */ lui $s4,0x4f4f /* f101778: 36944f7f */ ori $s4,$s4,0x4f7f .PB0f10177c: -/* f10177c: 0fc3fa08 */ jal 0xf0fe820 +/* f10177c: 0fc3fa08 */ jal amGetSlotDetails /* f101780: 02a03025 */ move $a2,$s5 /* f101784: 24020001 */ li $v0,0x1 /* f101788: 1662000f */ bne $s3,$v0,.PB0f1017c8 /* f10178c: 8fa401d8 */ lw $a0,0x1d8($sp) /* f101790: 5622000e */ bnel $s1,$v0,.PB0f1017cc /* f101794: 8faf01d0 */ lw $t7,0x1d0($sp) -/* f101798: 0fc3fd97 */ jal 0xf0ff65c +/* f101798: 0fc3fd97 */ jal amIsCramped /* f10179c: 00000000 */ nop /* f1017a0: 14400011 */ bnez $v0,.PB0f1017e8 /* f1017a4: 8fa401d8 */ lw $a0,0x1d8($sp) @@ -3984,7 +3984,7 @@ glabel amRender /* f1017ac: 02a02825 */ move $a1,$s5 /* f1017b0: 02803025 */ move $a2,$s4 /* f1017b4: 87a70182 */ lh $a3,0x182($sp) -/* f1017b8: 0fc3ff25 */ jal 0xf0ffc94 +/* f1017b8: 0fc3ff25 */ jal amRenderText /* f1017bc: afae0010 */ sw $t6,0x10($sp) /* f1017c0: 10000009 */ b .PB0f1017e8 /* f1017c4: afa201d8 */ sw $v0,0x1d8($sp) @@ -3995,7 +3995,7 @@ glabel amRender /* f1017d0: 87a60182 */ lh $a2,0x182($sp) /* f1017d4: 87a70180 */ lh $a3,0x180($sp) /* f1017d8: afb00010 */ sw $s0,0x10($sp) -/* f1017dc: 0fc401b2 */ jal 0xf1006c8 +/* f1017dc: 0fc401b2 */ jal amRenderSlot /* f1017e0: afaf0014 */ sw $t7,0x14($sp) /* f1017e4: afa201d8 */ sw $v0,0x1d8($sp) .PB0f1017e8: @@ -4015,7 +4015,7 @@ glabel amRender /* f10181c: 8319251b */ lb $t9,0x251b($t8) /* f101820: 07210004 */ bgez $t9,.PB0f101834 /* f101824: 00000000 */ nop -/* f101828: 0fc3f90b */ jal 0xf0fe42c +/* f101828: 0fc3f90b */ jal amGetFirstBuddyIndex /* f10182c: 00000000 */ nop /* f101830: 04410011 */ bgez $v0,.PB0f101878 .PB0f101834: @@ -4033,7 +4033,7 @@ glabel amRender /* f101860: 28410002 */ slti $at,$v0,0x2 /* f101864: 14200004 */ bnez $at,.PB0f101878 /* f101868: 00000000 */ nop -/* f10186c: 0fc3ff57 */ jal 0xf0ffd5c +/* f10186c: 0fc3ff57 */ jal amRenderAibotInfo /* f101870: 2445fffe */ addiu $a1,$v0,-2 /* f101874: afa201d8 */ sw $v0,0x1d8($sp) .PB0f101878: @@ -4092,7 +4092,7 @@ glabel amRender /* f101934: 24120005 */ li $s2,0x5 /* f101938: 24130003 */ li $s3,0x3 .PB0f10193c: -/* f10193c: 0c006b8b */ jal 0x1ae2c +/* f10193c: 0c006b8b */ jal sinf /* f101940: c60c001c */ lwc1 $f12,0x1c($s0) /* f101944: 3c013f80 */ lui $at,0x3f80 /* f101948: 44812000 */ mtc1 $at,$f4 @@ -4151,7 +4151,7 @@ glabel amRender /* f101a10: 3c144f4f */ lui $s4,0x4f4f /* f101a14: 36944f7f */ ori $s4,$s4,0x4f7f .PB0f101a18: -/* f101a18: 0fc552fc */ jal 0xf154bf0 +/* f101a18: 0fc552fc */ jal gfxSetPrimColour /* f101a1c: 02802825 */ move $a1,$s4 /* f101a20: 3c0e800a */ lui $t6,0x800a /* f101a24: 8dce66e8 */ lw $t6,0x66e8($t6) @@ -4169,7 +4169,7 @@ glabel amRender /* f101a50: 24010004 */ li $at,0x4 /* f101a54: 1721003c */ bne $t9,$at,.PB0f101b48 /* f101a58: 03008825 */ move $s1,$t8 -/* f101a5c: 0fc3fd97 */ jal 0xf0ff65c +/* f101a5c: 0fc3fd97 */ jal amIsCramped /* f101a60: 00000000 */ nop /* f101a64: 10400005 */ beqz $v0,.PB0f101a7c /* f101a68: 3c0e800a */ lui $t6,0x800a @@ -4216,7 +4216,7 @@ glabel amRender /* f101af4: 14200014 */ bnez $at,.PB0f101b48 /* f101af8: 24040004 */ li $a0,0x4 /* f101afc: 27a50114 */ addiu $a1,$sp,0x114 -/* f101b00: 0fc3fa08 */ jal 0xf0fe820 +/* f101b00: 0fc3fa08 */ jal amGetSlotDetails /* f101b04: 02003025 */ move $a2,$s0 /* f101b08: 3c19800a */ lui $t9,0x800a /* f101b0c: 8f3966e4 */ lw $t9,0x66e4($t9) @@ -4226,7 +4226,7 @@ glabel amRender /* f101b1c: 27a50138 */ addiu $a1,$sp,0x138 /* f101b20: 02003025 */ move $a2,$s0 /* f101b24: afa00014 */ sw $zero,0x14($sp) -/* f101b28: 0fc5625a */ jal 0xf158968 +/* f101b28: 0fc5625a */ jal textMeasure /* f101b2c: afb90010 */ sw $t9,0x10($sp) /* f101b30: 8fb10138 */ lw $s1,0x138($sp) /* f101b34: 06210003 */ bgez $s1,.PB0f101b44 @@ -4407,11 +4407,11 @@ glabel amRender /* f101de8: 00187880 */ sll $t7,$t8,0x2 /* f101dec: 01eec825 */ or $t9,$t7,$t6 /* f101df0: ac590004 */ sw $t9,0x4($v0) -/* f101df4: 0fc55313 */ jal 0xf154c4c +/* f101df4: 0fc55313 */ jal func0f153838 /* f101df8: 8fa401d8 */ lw $a0,0x1d8($sp) /* f101dfc: afa201d8 */ sw $v0,0x1d8($sp) .PB0f101e00: -/* f101e00: 0fc552e5 */ jal 0xf154b94 +/* f101e00: 0fc552e5 */ jal func0f153780 /* f101e04: 8fa401d8 */ lw $a0,0x1d8($sp) /* f101e08: 3c03800a */ lui $v1,0x800a /* f101e0c: 3c0b800a */ lui $t3,0x800a @@ -4543,7 +4543,7 @@ glabel amRender /* f101fbc: 0326c021 */ addu $t8,$t9,$a2 /* f101fc0: 17010011 */ bne $t8,$at,.PB0f102008 /* f101fc4: 00000000 */ nop -/* f101fc8: 0fc550b9 */ jal 0xf1542e4 +/* f101fc8: 0fc550b9 */ jal optionsGetScreenSplit /* f101fcc: 00000000 */ nop /* f101fd0: 24010001 */ li $at,0x1 /* f101fd4: 10410021 */ beq $v0,$at,.PB0f10205c @@ -4630,11 +4630,11 @@ glabel amRender /* f1020e4: 03067821 */ addu $t7,$t8,$a2 /* f1020e8: 15e10019 */ bne $t7,$at,.PB0f102150 /* f1020ec: 00000000 */ nop -/* f1020f0: 0fc5504c */ jal 0xf154130 +/* f1020f0: 0fc5504c */ jal optionsGetEffectiveScreenSize /* f1020f4: 00000000 */ nop /* f1020f8: 10400015 */ beqz $v0,.PB0f102150 /* f1020fc: 00000000 */ nop -/* f102100: 0c002e8b */ jal 0xba2c +/* f102100: 0c002e8b */ jal viGetViewLeft /* f102104: 00000000 */ nop /* f102108: 3c0e8008 */ lui $t6,0x8008 /* f10210c: 8dce1f90 */ lw $t6,0x1f90($t6) @@ -4657,11 +4657,11 @@ glabel amRender /* f102148: 10000031 */ b .PB0f102210 /* f10214c: 3c013e80 */ lui $at,0x3e80 .PB0f102150: -/* f102150: 0c002e6d */ jal 0xb9b4 +/* f102150: 0c002e6d */ jal viGetViewWidth /* f102154: 00000000 */ nop /* f102158: 00028c00 */ sll $s1,$v0,0x10 /* f10215c: 0011cc03 */ sra $t9,$s1,0x10 -/* f102160: 0c002e8b */ jal 0xba2c +/* f102160: 0c002e8b */ jal viGetViewLeft /* f102164: 03208825 */ move $s1,$t9 /* f102168: 3c038008 */ lui $v1,0x8008 /* f10216c: 8c631f90 */ lw $v1,0x1f90($v1) @@ -4755,11 +4755,11 @@ glabel amRender /* f1022b4: 35efffff */ ori $t7,$t7,0xffff /* f1022b8: af2f0000 */ sw $t7,0x0($t9) /* f1022bc: af380004 */ sw $t8,0x4($t9) -/* f1022c0: 0c002e71 */ jal 0xb9c4 +/* f1022c0: 0c002e71 */ jal viGetViewHeight /* f1022c4: e7a20068 */ swc1 $f2,0x68($sp) /* f1022c8: 0002a400 */ sll $s4,$v0,0x10 /* f1022cc: 0014cc03 */ sra $t9,$s4,0x10 -/* f1022d0: 0c002e8f */ jal 0xba3c +/* f1022d0: 0c002e8f */ jal viGetViewTop /* f1022d4: 0320a025 */ move $s4,$t9 /* f1022d8: 3c04800a */ lui $a0,0x800a /* f1022dc: 2484e4d0 */ addiu $a0,$a0,-6960 diff --git a/src/game/bondeyespy.c b/src/game/bondeyespy.c index de576e4af..652580840 100644 --- a/src/game/bondeyespy.c +++ b/src/game/bondeyespy.c @@ -2362,15 +2362,15 @@ glabel var7f1adb00 /* f0d0df4: 8f190004 */ lw $t9,0x4($t8) /* f0d0df8: e7a400e0 */ swc1 $f4,0xe0($sp) /* f0d0dfc: afb900e4 */ sw $t9,0xe4($sp) -/* f0d0e00: 0fc54ebe */ jal 0xf153af8 +/* f0d0e00: 0fc54ebe */ jal optionsGetContpadNum1 /* f0d0e04: 8dc40070 */ lw $a0,0x70($t6) /* f0d0e08: 00022600 */ sll $a0,$v0,0x18 /* f0d0e0c: 00047e03 */ sra $t7,$a0,0x18 /* f0d0e10: a3a200c3 */ sb $v0,0xc3($sp) -/* f0d0e14: 0c005616 */ jal 0x15858 +/* f0d0e14: 0c005616 */ jal joyGetStickX /* f0d0e18: 01e02025 */ move $a0,$t7 /* f0d0e1c: 83a400c3 */ lb $a0,0xc3($sp) -/* f0d0e20: 0c005640 */ jal 0x15900 +/* f0d0e20: 0c005640 */ jal joyGetStickY /* f0d0e24: a3a200c2 */ sb $v0,0xc2($sp) /* f0d0e28: 8fae00e8 */ lw $t6,0xe8($sp) /* f0d0e2c: 00023e00 */ sll $a3,$v0,0x18 @@ -2383,7 +2383,7 @@ glabel var7f1adb00 /* f0d0e48: a3bf00c2 */ sb $ra,0xc2($sp) /* f0d0e4c: 83a400c3 */ lb $a0,0xc3($sp) /* f0d0e50: 3405ffff */ li $a1,0xffff -/* f0d0e54: 0c00566a */ jal 0x159a8 +/* f0d0e54: 0c00566a */ jal joyGetButtons /* f0d0e58: a3b900c0 */ sb $t9,0xc0($sp) /* f0d0e5c: 3c09800a */ lui $t1,0x800a /* f0d0e60: 2529e4d0 */ addiu $t1,$t1,-6960 @@ -2400,7 +2400,7 @@ glabel var7f1adb00 /* f0d0e84: 8f040070 */ lw $a0,0x70($t8) /* f0d0e88: a3bf00c2 */ sb $ra,0xc2($sp) /* f0d0e8c: a7a800bc */ sh $t0,0xbc($sp) -/* f0d0e90: 0fc54eb0 */ jal 0xf153ac0 +/* f0d0e90: 0fc54eb0 */ jal optionsGetControlMode /* f0d0e94: a3a700c0 */ sb $a3,0xc0($sp) /* f0d0e98: 44808000 */ mtc1 $zero,$f16 /* f0d0e9c: 3c09800a */ lui $t1,0x800a @@ -2423,18 +2423,18 @@ glabel var7f1adb00 /* f0d0ee0: a3bf00c2 */ sb $ra,0xc2($sp) /* f0d0ee4: afa200b0 */ sw $v0,0xb0($sp) /* f0d0ee8: a7a800bc */ sh $t0,0xbc($sp) -/* f0d0eec: 0fc54ec5 */ jal 0xf153b14 +/* f0d0eec: 0fc54ec5 */ jal optionsGetContpadNum2 /* f0d0ef0: a3a700c0 */ sb $a3,0xc0($sp) /* f0d0ef4: 00021e00 */ sll $v1,$v0,0x18 /* f0d0ef8: 00037e03 */ sra $t7,$v1,0x18 /* f0d0efc: 000f2600 */ sll $a0,$t7,0x18 /* f0d0f00: 0004c603 */ sra $t8,$a0,0x18 /* f0d0f04: afaf0074 */ sw $t7,0x74($sp) -/* f0d0f08: 0c005616 */ jal 0x15858 +/* f0d0f08: 0c005616 */ jal joyGetStickX /* f0d0f0c: 03002025 */ move $a0,$t8 /* f0d0f10: 83a40077 */ lb $a0,0x77($sp) /* f0d0f14: a3a200c1 */ sb $v0,0xc1($sp) -/* f0d0f18: 0c005640 */ jal 0x15900 +/* f0d0f18: 0c005640 */ jal joyGetStickY /* f0d0f1c: afa4003c */ sw $a0,0x3c($sp) /* f0d0f20: 8faf00e8 */ lw $t7,0xe8($sp) /* f0d0f24: 00023600 */ sll $a2,$v0,0x18 @@ -2455,7 +2455,7 @@ glabel var7f1adb00 /* f0d0f60: a3a700c0 */ sb $a3,0xc0($sp) /* f0d0f64: a7a800bc */ sh $t0,0xbc($sp) /* f0d0f68: a3aa00c1 */ sb $t2,0xc1($sp) -/* f0d0f6c: 0c00566a */ jal 0x159a8 +/* f0d0f6c: 0c00566a */ jal joyGetButtons /* f0d0f70: afab00b0 */ sw $t3,0xb0($sp) /* f0d0f74: 3c09800a */ lui $t1,0x800a /* f0d0f78: 2529e4d0 */ addiu $t1,$t1,-6960 @@ -2862,9 +2862,9 @@ glabel var7f1adb00 /* f0d14dc: 8f240000 */ lw $a0,0x0($t9) /* f0d14e0: a3bf00c2 */ sb $ra,0xc2($sp) /* f0d14e4: e7ae00e0 */ swc1 $f14,0xe0($sp) -/* f0d14e8: 0fc19661 */ jal 0xf065984 +/* f0d14e8: 0fc19661 */ jal roomsCopy /* f0d14ec: 24840028 */ addiu $a0,$a0,0x28 -/* f0d14f0: 0fc4494f */ jal 0xf11253c +/* f0d14f0: 0fc4494f */ jal invHasSingleWeaponIncAllGuns /* f0d14f4: 2404002e */ li $a0,0x2e /* f0d14f8: 3c09800a */ lui $t1,0x800a /* f0d14fc: 44808000 */ mtc1 $zero,$f16 @@ -2894,7 +2894,7 @@ glabel var7f1adb00 /* f0d155c: 030e2023 */ subu $a0,$t8,$t6 /* f0d1560: 0081001a */ div $zero,$a0,$at /* f0d1564: 00002012 */ mflo $a0 -/* f0d1568: 0fc08414 */ jal 0xf021050 +/* f0d1568: 0fc08414 */ jal chrClearReferences /* f0d156c: 00000000 */ nop /* f0d1570: 3c09800a */ lui $t1,0x800a /* f0d1574: 44808000 */ mtc1 $zero,$f16 @@ -2967,7 +2967,7 @@ glabel var7f1adb00 .PB0f0d1670: /* f0d1670: c424f7d4 */ lwc1 $f4,-0x82c($at) /* f0d1674: 46040302 */ mul.s $f12,$f0,$f4 -/* f0d1678: 0c006b88 */ jal 0x1ae20 +/* f0d1678: 0c006b88 */ jal cosf /* f0d167c: 00000000 */ nop /* f0d1680: 3c09800a */ lui $t1,0x800a /* f0d1684: 2529e4d0 */ addiu $t1,$t1,-6960 @@ -2980,7 +2980,7 @@ glabel var7f1adb00 /* f0d16a0: 8df90480 */ lw $t9,0x480($t7) /* f0d16a4: c728001c */ lwc1 $f8,0x1c($t9) /* f0d16a8: 460a4302 */ mul.s $f12,$f8,$f10 -/* f0d16ac: 0c006b8b */ jal 0x1ae2c +/* f0d16ac: 0c006b8b */ jal sinf /* f0d16b0: 00000000 */ nop /* f0d16b4: 3c09800a */ lui $t1,0x800a /* f0d16b8: 2529e4d0 */ addiu $t1,$t1,-6960 @@ -3042,7 +3042,7 @@ glabel var7f1adb00 .PB0f0d178c: /* f0d178c: c428f7dc */ lwc1 $f8,-0x824($at) /* f0d1790: 46081302 */ mul.s $f12,$f2,$f8 -/* f0d1794: 0c006b88 */ jal 0x1ae20 +/* f0d1794: 0c006b88 */ jal cosf /* f0d1798: 00000000 */ nop /* f0d179c: 3c09800a */ lui $t1,0x800a /* f0d17a0: 2529e4d0 */ addiu $t1,$t1,-6960 @@ -3055,7 +3055,7 @@ glabel var7f1adb00 /* f0d17bc: 8f0e0480 */ lw $t6,0x480($t8) /* f0d17c0: c5ca0028 */ lwc1 $f10,0x28($t6) /* f0d17c4: 46045302 */ mul.s $f12,$f10,$f4 -/* f0d17c8: 0c006b8b */ jal 0x1ae2c +/* f0d17c8: 0c006b8b */ jal sinf /* f0d17cc: 00000000 */ nop /* f0d17d0: 3c09800a */ lui $t1,0x800a /* f0d17d4: 2529e4d0 */ addiu $t1,$t1,-6960 @@ -3141,7 +3141,7 @@ glabel var7f1adb00 /* f0d1900: 3c017f1b */ lui $at,0x7f1b /* f0d1904: c424f7ec */ lwc1 $f4,-0x814($at) /* f0d1908: 46041302 */ mul.s $f12,$f2,$f4 -/* f0d190c: 0c006b88 */ jal 0x1ae20 +/* f0d190c: 0c006b88 */ jal cosf /* f0d1910: 00000000 */ nop /* f0d1914: 3c09800a */ lui $t1,0x800a /* f0d1918: 2529e4d0 */ addiu $t1,$t1,-6960 @@ -3154,7 +3154,7 @@ glabel var7f1adb00 /* f0d1934: 8df90480 */ lw $t9,0x480($t7) /* f0d1938: c7260028 */ lwc1 $f6,0x28($t9) /* f0d193c: 46083302 */ mul.s $f12,$f6,$f8 -/* f0d1940: 0c006b8b */ jal 0x1ae2c +/* f0d1940: 0c006b8b */ jal sinf /* f0d1944: 00000000 */ nop /* f0d1948: 3c09800a */ lui $t1,0x800a /* f0d194c: 2529e4d0 */ addiu $t1,$t1,-6960 @@ -3286,7 +3286,7 @@ glabel var7f1adb00 /* f0d1b2c: 00000000 */ nop /* f0d1b30: 45000018 */ bc1f .PB0f0d1b94 /* f0d1b34: 00000000 */ nop -/* f0d1b38: 0c012ae4 */ jal 0x4ab90 +/* f0d1b38: 0c012ae4 */ jal sqrtf /* f0d1b3c: 46003306 */ mov.s $f12,$f6 /* f0d1b40: 3c09800a */ lui $t1,0x800a /* f0d1b44: 2529e4d0 */ addiu $t1,$t1,-6960 @@ -3324,7 +3324,7 @@ glabel var7f1adb00 /* f0d1bc0: 00000000 */ nop /* f0d1bc4: 4502001a */ bc1fl .PB0f0d1c30 /* f0d1bc8: c4660044 */ lwc1 $f6,0x44($v1) -/* f0d1bcc: 0c012ae4 */ jal 0x4ab90 +/* f0d1bcc: 0c012ae4 */ jal sqrtf /* f0d1bd0: 46002306 */ mov.s $f12,$f4 /* f0d1bd4: 3c09800a */ lui $t1,0x800a /* f0d1bd8: 2529e4d0 */ addiu $t1,$t1,-6960 @@ -3527,7 +3527,7 @@ glabel var7f1adb00 /* f0d1ecc: a0392b98 */ sb $t9,0x2b98($at) /* f0d1ed0: a0400000 */ sb $zero,0x0($v0) /* f0d1ed4: 3c018007 */ lui $at,0x8007 -/* f0d1ed8: 0fc340b1 */ jal 0xf0d02c4 +/* f0d1ed8: 0fc340b1 */ jal eyespyUpdateVertical /* f0d1edc: a0202b9c */ sb $zero,0x2b9c($at) /* f0d1ee0: 3c09800a */ lui $t1,0x800a /* f0d1ee4: 2529e4d0 */ addiu $t1,$t1,-6960 @@ -3571,7 +3571,7 @@ glabel var7f1adb00 /* f0d1f7c: 00002825 */ move $a1,$zero /* f0d1f80: 24063e80 */ li $a2,0x3e80 /* f0d1f84: 24070040 */ li $a3,0x40 -/* f0d1f88: 0c0041d9 */ jal 0x10764 +/* f0d1f88: 0c0041d9 */ jal snd00010718 /* f0d1f8c: e7a60014 */ swc1 $f6,0x14($sp) /* f0d1f90: 3c09800a */ lui $t1,0x800a /* f0d1f94: 2529e4d0 */ addiu $t1,$t1,-6960 @@ -3592,7 +3592,7 @@ glabel var7f1adb00 /* f0d1fd0: 00002825 */ move $a1,$zero /* f0d1fd4: 24063e80 */ li $a2,0x3e80 /* f0d1fd8: 24070040 */ li $a3,0x40 -/* f0d1fdc: 0c0041d9 */ jal 0x10764 +/* f0d1fdc: 0c0041d9 */ jal snd00010718 /* f0d1fe0: e7a40014 */ swc1 $f4,0x14($sp) /* f0d1fe4: 3c09800a */ lui $t1,0x800a /* f0d1fe8: 2529e4d0 */ addiu $t1,$t1,-6960 @@ -3613,7 +3613,7 @@ glabel var7f1adb00 /* f0d2024: 00002825 */ move $a1,$zero /* f0d2028: 24063e80 */ li $a2,0x3e80 /* f0d202c: 24070040 */ li $a3,0x40 -/* f0d2030: 0c0041d9 */ jal 0x10764 +/* f0d2030: 0c0041d9 */ jal snd00010718 /* f0d2034: e7aa0014 */ swc1 $f10,0x14($sp) /* f0d2038: 3c09800a */ lui $t1,0x800a /* f0d203c: 2529e4d0 */ addiu $t1,$t1,-6960 @@ -3634,7 +3634,7 @@ glabel var7f1adb00 /* f0d2078: 00002825 */ move $a1,$zero /* f0d207c: 24063e80 */ li $a2,0x3e80 /* f0d2080: 24070040 */ li $a3,0x40 -/* f0d2084: 0c0041d9 */ jal 0x10764 +/* f0d2084: 0c0041d9 */ jal snd00010718 /* f0d2088: e7a80014 */ swc1 $f8,0x14($sp) /* f0d208c: 3c09800a */ lui $t1,0x800a /* f0d2090: 2529e4d0 */ addiu $t1,$t1,-6960 @@ -3654,7 +3654,7 @@ glabel var7f1adb00 /* f0d20c8: 240500f2 */ li $a1,0xf2 /* f0d20cc: 00003025 */ move $a2,$zero /* f0d20d0: 2407ffff */ li $a3,-1 -/* f0d20d4: 0c004254 */ jal 0x10950 +/* f0d20d4: 0c004254 */ jal sndStart /* f0d20d8: e7a60014 */ swc1 $f6,0x14($sp) /* f0d20dc: 3c09800a */ lui $t1,0x800a /* f0d20e0: 2529e4d0 */ addiu $t1,$t1,-6960 @@ -3685,7 +3685,7 @@ glabel var7f1adb00 /* f0d2134: 46040282 */ mul.s $f10,$f0,$f4 /* f0d2138: 4600520d */ trunc.w.s $f8,$f10 /* f0d213c: 44054000 */ mfc1 $a1,$f8 -/* f0d2140: 0fc24d74 */ jal 0xf0935d0 +/* f0d2140: 0fc24d74 */ jal func0f093790 /* f0d2144: 00000000 */ nop /* f0d2148: 3c09800a */ lui $t1,0x800a /* f0d214c: 2529e4d0 */ addiu $t1,$t1,-6960 @@ -3710,7 +3710,7 @@ glabel var7f1adb00 /* f0d2194: 8fa400e4 */ lw $a0,0xe4($sp) /* f0d2198: 46064002 */ mul.s $f0,$f8,$f6 /* f0d219c: 44050000 */ mfc1 $a1,$f0 -/* f0d21a0: 0fc0f992 */ jal 0xf03e648 +/* f0d21a0: 0fc0f992 */ jal chrSetLookAngle /* f0d21a4: 00000000 */ nop /* f0d21a8: 3c09800a */ lui $t1,0x800a /* f0d21ac: 2529e4d0 */ addiu $t1,$t1,-6960 @@ -3833,7 +3833,7 @@ glabel var7f1adb00 /* f0d2360: 25040008 */ addiu $a0,$t0,0x8 /* f0d2364: 25050028 */ addiu $a1,$t0,0x28 /* f0d2368: 24460008 */ addiu $a2,$v0,0x8 -/* f0d236c: 0c00b87f */ jal 0x2e1fc +/* f0d236c: 0c00b87f */ jal cdHasLineOfSight /* f0d2370: 24470028 */ addiu $a3,$v0,0x28 /* f0d2374: 3c09800a */ lui $t1,0x800a /* f0d2378: 14400003 */ bnez $v0,.PB0f0d2388 @@ -3869,10 +3869,10 @@ glabel var7f1adb00 /* f0d23e4: 37380400 */ ori $t8,$t9,0x400 /* f0d23e8: 370e0010 */ ori $t6,$t8,0x10 /* f0d23ec: adf80018 */ sw $t8,0x18($t7) -/* f0d23f0: 0fc21f74 */ jal 0xf087dd0 +/* f0d23f0: 0fc21f74 */ jal weaponPlayPickupSound /* f0d23f4: adee0018 */ sw $t6,0x18($t7) /* f0d23f8: 2404002e */ li $a0,0x2e -/* f0d23fc: 0fc22191 */ jal 0xf088644 +/* f0d23fc: 0fc22191 */ jal currentPlayerQueuePickupWeaponHudmsg /* f0d2400: 00002825 */ move $a1,$zero /* f0d2404: 3c09800a */ lui $t1,0x800a /* f0d2408: 2529e4d0 */ addiu $t1,$t1,-6960 @@ -3880,7 +3880,7 @@ glabel var7f1adb00 /* f0d2410: 24050001 */ li $a1,0x1 /* f0d2414: 3406ffff */ li $a2,0xffff /* f0d2418: 8f380480 */ lw $t8,0x480($t9) -/* f0d241c: 0fc24943 */ jal 0xf09250c +/* f0d241c: 0fc24943 */ jal func0f0926bc /* f0d2420: 8f040000 */ lw $a0,0x0($t8) /* f0d2424: 3c09800a */ lui $t1,0x800a /* f0d2428: 2529e4d0 */ addiu $t1,$t1,-6960 @@ -3892,13 +3892,13 @@ glabel var7f1adb00 /* f0d2440: 03382023 */ subu $a0,$t9,$t8 /* f0d2444: 0081001a */ div $zero,$a0,$at /* f0d2448: 00002012 */ mflo $a0 -/* f0d244c: 0fc08414 */ jal 0xf021050 +/* f0d244c: 0fc08414 */ jal chrClearReferences /* f0d2450: 00000000 */ nop /* f0d2454: 8faf00e4 */ lw $t7,0xe4($sp) .PB0f0d2458: /* f0d2458: 24050001 */ li $a1,0x1 /* f0d245c: 8de4001c */ lw $a0,0x1c($t7) -/* f0d2460: 0fc22a94 */ jal 0xf08aa50 +/* f0d2460: 0fc22a94 */ jal coordTriggerProxies /* f0d2464: 24840008 */ addiu $a0,$a0,0x8 /* f0d2468: 8fbf002c */ lw $ra,0x2c($sp) .PB0f0d246c: diff --git a/src/game/bondgun.c b/src/game/bondgun.c index 295874064..5760d3f8a 100644 --- a/src/game/bondgun.c +++ b/src/game/bondgun.c @@ -1163,10 +1163,10 @@ glabel var7f1ad3acpf /* f09808c: 00809025 */ move $s2,$a0 /* f098090: 1701000f */ bne $t8,$at,.PB0f0980d0 /* f098094: a08f0690 */ sb $t7,0x690($a0) -/* f098098: 0fc25ff3 */ jal 0xf097fcc +/* f098098: 0fc25ff3 */ jal bgun0f09815c /* f09809c: 00000000 */ nop /* f0980a0: 46000506 */ mov.s $f20,$f0 -/* f0980a4: 0c00772a */ jal 0x1dca8 +/* f0980a4: 0c00772a */ jal modelGetNumAnimFrames /* f0980a8: 26440384 */ addiu $a0,$s2,0x384 /* f0980ac: 2459ffff */ addiu $t9,$v0,-1 /* f0980b0: 44992000 */ mtc1 $t9,$f4 @@ -1220,7 +1220,7 @@ glabel var7f1ad3acpf /* f098164: 81f80de4 */ lb $t8,0xde4($t7) /* f098168: 13000016 */ beqz $t8,.PB0f0981c4 /* f09816c: 00000000 */ nop -/* f098170: 0c004be0 */ jal 0x12f80 +/* f098170: 0c004be0 */ jal random /* f098174: 00000000 */ nop /* f098178: 44822000 */ mtc1 $v0,$f4 /* f09817c: 3c014f80 */ lui $at,0x4f80 @@ -1256,15 +1256,15 @@ glabel var7f1ad3acpf /* f0981ec: 03202825 */ move $a1,$t9 /* f0981f0: 00003025 */ move $a2,$zero /* f0981f4: e7a20014 */ swc1 $f2,0x14($sp) -/* f0981f8: 0c0079d7 */ jal 0x1e75c +/* f0981f8: 0c0079d7 */ jal modelSetAnimation /* f0981fc: e7a60010 */ swc1 $f6,0x10($sp) -/* f098200: 0c00772a */ jal 0x1dca8 +/* f098200: 0c00772a */ jal modelGetNumAnimFrames /* f098204: 02802025 */ move $a0,$s4 /* f098208: 44825000 */ mtc1 $v0,$f10 /* f09820c: 02802025 */ move $a0,$s4 /* f098210: 468052a0 */ cvt.s.w $f10,$f10 /* f098214: 44055000 */ mfc1 $a1,$f10 -/* f098218: 0c007aaa */ jal 0x1eaa8 +/* f098218: 0c007aaa */ jal model0001e018 /* f09821c: 00000000 */ nop /* f098220: 1000000b */ b .PB0f098250 /* f098224: 240affff */ li $t2,-1 @@ -1276,14 +1276,14 @@ glabel var7f1ad3acpf /* f098238: 01202825 */ move $a1,$t1 /* f09823c: 00003025 */ move $a2,$zero /* f098240: e7a20014 */ swc1 $f2,0x14($sp) -/* f098244: 0c0079d7 */ jal 0x1e75c +/* f098244: 0c0079d7 */ jal modelSetAnimation /* f098248: e7b00010 */ swc1 $f16,0x10($sp) /* f09824c: 240affff */ li $t2,-1 .PB0f098250: /* f098250: 240b0002 */ li $t3,0x2 /* f098254: ae4a0680 */ sw $t2,0x680($s2) /* f098258: ae4b068c */ sw $t3,0x68c($s2) -/* f09825c: 0c007746 */ jal 0x1dd18 +/* f09825c: 0c007746 */ jal modelGetAbsAnimSpeed /* f098260: 02802025 */ move $a0,$s4 /* f098264: 8e4c0684 */ lw $t4,0x684($s2) /* f098268: 3c017f1b */ lui $at,0x7f1b @@ -1303,7 +1303,7 @@ glabel var7f1ad3acpf /* f09829c: ae400684 */ sw $zero,0x684($s2) /* f0982a0: e6420688 */ swc1 $f2,0x688($s2) .PB0f0982a4: -/* f0982a4: 0fc25ff3 */ jal 0xf097fcc +/* f0982a4: 0fc25ff3 */ jal bgun0f09815c /* f0982a8: 02402025 */ move $a0,$s2 /* f0982ac: 44809000 */ mtc1 $zero,$f18 /* f0982b0: c6500688 */ lwc1 $f16,0x688($s2) @@ -1433,7 +1433,7 @@ glabel var7f1ad3acpf /* f09846c: 00000000 */ nop /* f098470: 45020060 */ bc1fl .PB0f0985f4 /* f098474: 8fac014c */ lw $t4,0x14c($sp) -/* f098478: 0fc25ff3 */ jal 0xf097fcc +/* f098478: 0fc25ff3 */ jal bgun0f09815c /* f09847c: 02402025 */ move $a0,$s2 /* f098480: 962a0002 */ lhu $t2,0x2($s1) /* f098484: 3c014f80 */ lui $at,0x4f80 @@ -1454,7 +1454,7 @@ glabel var7f1ad3acpf /* f0984bc: 00000000 */ nop /* f0984c0: 45000018 */ bc1f .PB0f098524 /* f0984c4: 00000000 */ nop -/* f0984c8: 0c007746 */ jal 0x1dd18 +/* f0984c8: 0c007746 */ jal modelGetAbsAnimSpeed /* f0984cc: e7a20084 */ swc1 $f2,0x84($sp) /* f0984d0: 3c017f1b */ lui $at,0x7f1b /* f0984d4: c432ddf8 */ lwc1 $f18,-0x2208($at) @@ -1464,7 +1464,7 @@ glabel var7f1ad3acpf /* f0984e4: 46002203 */ div.s $f8,$f4,$f0 /* f0984e8: 4600440d */ trunc.w.s $f16,$f8 /* f0984ec: 440c8000 */ mfc1 $t4,$f16 -/* f0984f0: 0c007746 */ jal 0x1dd18 +/* f0984f0: 0c007746 */ jal modelGetAbsAnimSpeed /* f0984f4: ae4c0684 */ sw $t4,0x684($s2) /* f0984f8: 8e4d0684 */ lw $t5,0x684($s2) /* f0984fc: 3c017f1b */ lui $at,0x7f1b @@ -1527,7 +1527,7 @@ glabel var7f1ad3acpf /* f0985cc: e6520688 */ swc1 $f18,0x688($s2) /* f0985d0: 44050000 */ mfc1 $a1,$f0 /* f0985d4: 46000506 */ mov.s $f20,$f0 -/* f0985d8: 0c007aaa */ jal 0x1eaa8 +/* f0985d8: 0c007aaa */ jal model0001e018 /* f0985dc: e7a00080 */ swc1 $f0,0x80($sp) /* f0985e0: 924a0691 */ lbu $t2,0x691($s2) /* f0985e4: c7ae0080 */ lwc1 $f14,0x80($sp) @@ -1552,7 +1552,7 @@ glabel var7f1ad3acpf /* f098624: afa3005c */ sw $v1,0x5c($sp) /* f098628: afa2007c */ sw $v0,0x7c($sp) /* f09862c: 02403025 */ move $a2,$s2 -/* f098630: 0fc25f39 */ jal 0xf097ce4 +/* f098630: 0fc25f39 */ jal bgunSetPartVisible /* f098634: 8fa70164 */ lw $a3,0x164($sp) /* f098638: 8fa2007c */ lw $v0,0x7c($sp) /* f09863c: 8fa3005c */ lw $v1,0x5c($sp) @@ -1566,13 +1566,13 @@ glabel var7f1ad3acpf .PB0f098658: /* f098658: 34a5999a */ ori $a1,$a1,0x999a /* f09865c: 02802025 */ move $a0,$s4 -/* f098660: 0c007a8f */ jal 0x1ea3c +/* f098660: 0c007a8f */ jal modelSetAnimPlaySpeed /* f098664: 24060000 */ li $a2,0x0 /* f098668: 02802025 */ move $a0,$s4 /* f09866c: 8e450684 */ lw $a1,0x684($s2) -/* f098670: 0c007e2a */ jal 0x1f8a8 +/* f098670: 0c007e2a */ jal model0001ee18 /* f098674: 24060001 */ li $a2,0x1 -/* f098678: 0fc25ff3 */ jal 0xf097fcc +/* f098678: 0fc25ff3 */ jal bgun0f09815c /* f09867c: 02402025 */ move $a0,$s2 /* f098680: 8e4306b0 */ lw $v1,0x6b0($s2) /* f098684: 46000386 */ mov.s $f14,$f0 @@ -1641,7 +1641,7 @@ glabel var7f1ad3acpf /* f098770: 24070040 */ li $a3,0x40 /* f098774: 00008825 */ move $s1,$zero /* f098778: afae0010 */ sw $t6,0x10($sp) -/* f09877c: 0c0041d9 */ jal 0x10764 +/* f09877c: 0c0041d9 */ jal snd00010718 /* f098780: e7a60014 */ swc1 $f6,0x14($sp) /* f098784: 8fa80078 */ lw $t0,0x78($sp) /* f098788: 10000028 */ b .PB0f09882c @@ -1662,7 +1662,7 @@ glabel var7f1ad3acpf /* f0987c0: 24067fff */ li $a2,0x7fff /* f0987c4: 24070040 */ li $a3,0x40 /* f0987c8: afa90010 */ sw $t1,0x10($sp) -/* f0987cc: 0c0041d9 */ jal 0x10764 +/* f0987cc: 0c0041d9 */ jal snd00010718 /* f0987d0: e7aa0014 */ swc1 $f10,0x14($sp) /* f0987d4: 8fa80078 */ lw $t0,0x78($sp) /* f0987d8: 10000014 */ b .PB0f09882c @@ -3359,18 +3359,18 @@ glabel bgunTickIncIdle /* f0991cc: 00c08025 */ move $s0,$a2 /* f0991d0: afa40040 */ sw $a0,0x40($sp) /* f0991d4: afa50044 */ sw $a1,0x44($sp) -/* f0991d8: 0fc2a406 */ jal 0xf0a9018 +/* f0991d8: 0fc2a406 */ jal bgunIsUsingSecondaryFunction /* f0991dc: afa7004c */ sw $a3,0x4c($sp) /* f0991e0: 44802000 */ mtc1 $zero,$f4 /* f0991e4: afa20038 */ sw $v0,0x38($sp) /* f0991e8: a20005dc */ sb $zero,0x5dc($s0) /* f0991ec: ae000558 */ sw $zero,0x558($s0) /* f0991f0: e60405fc */ swc1 $f4,0x5fc($s0) -/* f0991f4: 0fc26fd0 */ jal 0xf09bf40 +/* f0991f4: 0fc26fd0 */ jal bgunIsReadyToSwitch /* f0991f8: 8fa40044 */ lw $a0,0x44($sp) /* f0991fc: 10400007 */ beqz $v0,.PB0f09921c /* f099200: 8fa40044 */ lw $a0,0x44($sp) -/* f099204: 0fc273c0 */ jal 0xf09cf00 +/* f099204: 0fc273c0 */ jal bgunSetState /* f099208: 24050005 */ li $a1,0x5 /* f09920c: 50400004 */ beqzl $v0,.PB0f099220 /* f099210: 8fae0038 */ lw $t6,0x38($sp) @@ -3393,7 +3393,7 @@ glabel bgunTickIncIdle /* f099248: 11600106 */ beqz $t3,.PB0f099664 /* f09924c: a20a0690 */ sb $t2,0x690($s0) /* f099250: 92040003 */ lbu $a0,0x3($s0) -/* f099254: 0fc2631c */ jal 0xf098c70 +/* f099254: 0fc2631c */ jal bgun0f098ca0 /* f099258: 8fa50040 */ lw $a1,0x40($sp) /* f09925c: 92030003 */ lbu $v1,0x3($s0) /* f099260: 8fac0038 */ lw $t4,0x38($sp) @@ -3413,7 +3413,7 @@ glabel bgunTickIncIdle /* f099298: 8fa50040 */ lw $a1,0x40($sp) /* f09929c: 02003025 */ move $a2,$s0 /* f0992a0: afa7002c */ sw $a3,0x2c($sp) -/* f0992a4: 0fc2631c */ jal 0xf098c70 +/* f0992a4: 0fc2631c */ jal bgun0f098ca0 /* f0992a8: afa20034 */ sw $v0,0x34($sp) /* f0992ac: 8fa7002c */ lw $a3,0x2c($sp) /* f0992b0: 04410002 */ bgez $v0,.PB0f0992bc @@ -3435,7 +3435,7 @@ glabel bgunTickIncIdle /* f0992ec: a20b0003 */ sb $t3,0x3($s0) /* f0992f0: afa80034 */ sw $t0,0x34($sp) /* f0992f4: afa7002c */ sw $a3,0x2c($sp) -/* f0992f8: 0fc273c0 */ jal 0xf09cf00 +/* f0992f8: 0fc273c0 */ jal bgunSetState /* f0992fc: 8fa40044 */ lw $a0,0x44($sp) /* f099300: 8fa7002c */ lw $a3,0x2c($sp) /* f099304: 10400006 */ beqz $v0,.PB0f099320 @@ -3454,7 +3454,7 @@ glabel bgunTickIncIdle /* f099330: 318dfffd */ andi $t5,$t4,0xfffd /* f099334: a20d0690 */ sb $t5,0x690($s0) /* f099338: afa80034 */ sw $t0,0x34($sp) -/* f09933c: 0fc273c0 */ jal 0xf09cf00 +/* f09933c: 0fc273c0 */ jal bgunSetState /* f099340: 8fa40044 */ lw $a0,0x44($sp) /* f099344: 10400003 */ beqz $v0,.PB0f099354 /* f099348: 8fa80034 */ lw $t0,0x34($sp) @@ -3464,7 +3464,7 @@ glabel bgunTickIncIdle /* f099354: 05010071 */ bgez $t0,.PB0f09951c /* f099358: 8fae0040 */ lw $t6,0x40($sp) /* f09935c: 8dc40000 */ lw $a0,0x0($t6) -/* f099360: 0fc2c6f4 */ jal 0xf0b1bd0 +/* f099360: 0fc2c6f4 */ jal weaponHasFlag /* f099364: 24050001 */ li $a1,0x1 /* f099368: 1040000f */ beqz $v0,.PB0f0993a8 /* f09936c: 8faf0040 */ lw $t7,0x40($sp) @@ -3477,7 +3477,7 @@ glabel bgunTickIncIdle /* f099388: 13210007 */ beq $t9,$at,.PB0f0993a8 /* f09938c: 00000000 */ nop .PB0f099390: -/* f099390: 0fc273c0 */ jal 0xf09cf00 +/* f099390: 0fc273c0 */ jal bgunSetState /* f099394: 24050008 */ li $a1,0x8 /* f099398: 10400003 */ beqz $v0,.PB0f0993a8 /* f09939c: 00000000 */ nop @@ -3519,13 +3519,13 @@ glabel bgunTickIncIdle /* f099420: 8fae0044 */ lw $t6,0x44($sp) /* f099424: 920c0003 */ lbu $t4,0x3($s0) /* f099428: 240d0001 */ li $t5,0x1 -/* f09942c: 0fc2631c */ jal 0xf098c70 +/* f09942c: 0fc2631c */ jal bgun0f098ca0 /* f099430: 01ac2023 */ subu $a0,$t5,$t4 /* f099434: 920e0003 */ lbu $t6,0x3($s0) /* f099438: 24190001 */ li $t9,0x1 /* f09943c: afa20030 */ sw $v0,0x30($sp) /* f099440: 02002025 */ move $a0,$s0 -/* f099444: 0fc26459 */ jal 0xf099164 +/* f099444: 0fc26459 */ jal bgun0f099188 /* f099448: 032e2823 */ subu $a1,$t9,$t6 /* f09944c: 1040001a */ beqz $v0,.PB0f0994b8 /* f099450: 8fa30030 */ lw $v1,0x30($sp) @@ -3543,7 +3543,7 @@ glabel bgunTickIncIdle /* f099480: 2403ffff */ li $v1,-1 /* f099484: 920c0003 */ lbu $t4,0x3($s0) /* f099488: afa30030 */ sw $v1,0x30($sp) -/* f09948c: 0fc2c532 */ jal 0xf0b14c8 +/* f09948c: 0fc2c532 */ jal weaponGetFunction /* f099490: 032c2823 */ subu $a1,$t9,$t4 /* f099494: 8c4e0000 */ lw $t6,0x0($v0) /* f099498: 24010003 */ li $at,0x3 @@ -3563,7 +3563,7 @@ glabel bgunTickIncIdle /* f0994cc: a20a0690 */ sb $t2,0x690($s0) .PB0f0994d0: /* f0994d0: 8d640000 */ lw $a0,0x0($t3) -/* f0994d4: 0fc2c6f4 */ jal 0xf0b1bd0 +/* f0994d4: 0fc2c6f4 */ jal weaponHasFlag /* f0994d8: 3c050400 */ lui $a1,0x400 /* f0994dc: 50400006 */ beqzl $v0,.PB0f0994f8 /* f0994e0: 920c0690 */ lbu $t4,0x690($s0) @@ -3576,7 +3576,7 @@ glabel bgunTickIncIdle /* f0994f8: 24050007 */ li $a1,0x7 /* f0994fc: 358e0002 */ ori $t6,$t4,0x2 /* f099500: a20e0690 */ sb $t6,0x690($s0) -/* f099504: 0fc273c0 */ jal 0xf09cf00 +/* f099504: 0fc273c0 */ jal bgunSetState /* f099508: 8fa40044 */ lw $a0,0x44($sp) /* f09950c: 50400056 */ beqzl $v0,.PB0f099668 /* f099510: 8fae0044 */ lw $t6,0x44($sp) @@ -3597,7 +3597,7 @@ glabel bgunTickIncIdle /* f099548: 24050003 */ li $a1,0x3 /* f09954c: 314bff7f */ andi $t3,$t2,0xff7f /* f099550: a20b0690 */ sb $t3,0x690($s0) -/* f099554: 0fc273c0 */ jal 0xf09cf00 +/* f099554: 0fc273c0 */ jal bgunSetState /* f099558: 8fa40044 */ lw $a0,0x44($sp) /* f09955c: 50400042 */ beqzl $v0,.PB0f099668 /* f099560: 8fae0044 */ lw $t6,0x44($sp) @@ -3606,7 +3606,7 @@ glabel bgunTickIncIdle /* f09956c: ae00001c */ sw $zero,0x1c($s0) .PB0f099570: /* f099570: ae000018 */ sw $zero,0x18($s0) -/* f099574: 0fc273c0 */ jal 0xf09cf00 +/* f099574: 0fc273c0 */ jal bgunSetState /* f099578: 8fa40044 */ lw $a0,0x44($sp) /* f09957c: 5040003a */ beqzl $v0,.PB0f099668 /* f099580: 8fae0044 */ lw $t6,0x44($sp) @@ -3642,7 +3642,7 @@ glabel bgunTickIncIdle /* f0995f0: ae000014 */ sw $zero,0x14($s0) /* f0995f4: a21906d7 */ sb $t9,0x6d7($s0) /* f0995f8: afa80034 */ sw $t0,0x34($sp) -/* f0995fc: 0fc273c0 */ jal 0xf09cf00 +/* f0995fc: 0fc273c0 */ jal bgunSetState /* f099600: 8fa40044 */ lw $a0,0x44($sp) /* f099604: 10400003 */ beqz $v0,.PB0f099614 /* f099608: 8fa80034 */ lw $t0,0x34($sp) @@ -3664,7 +3664,7 @@ glabel bgunTickIncIdle /* f099640: 8fae0044 */ lw $t6,0x44($sp) /* f099644: 05000007 */ bltz $t0,.PB0f099664 /* f099648: 8fa40044 */ lw $a0,0x44($sp) -/* f09964c: 0fc273c0 */ jal 0xf09cf00 +/* f09964c: 0fc273c0 */ jal bgunSetState /* f099650: 24050001 */ li $a1,0x1 /* f099654: 50400004 */ beqzl $v0,.PB0f099668 /* f099658: 8fae0044 */ lw $t6,0x44($sp) @@ -3685,7 +3685,7 @@ glabel bgunTickIncIdle /* f09968c: 00095f40 */ sll $t3,$t1,0x1d /* f099690: 05610005 */ bgez $t3,.PB0f0996a8 /* f099694: 000c6080 */ sll $t4,$t4,0x2 -/* f099698: 0fc2881e */ jal 0xf0a2078 +/* f099698: 0fc2881e */ jal bgunAutoSwitchWeapon /* f09969c: 00000000 */ nop /* f0996a0: 10000027 */ b .PB0f099740 /* f0996a4: 00001025 */ move $v0,$zero @@ -3719,7 +3719,7 @@ glabel bgunTickIncIdle /* f099708: 51a00005 */ beqzl $t5,.PB0f099720 /* f09970c: 904c0690 */ lbu $t4,0x690($v0) .PB0f099710: -/* f099710: 0fc2881e */ jal 0xf0a2078 +/* f099710: 0fc2881e */ jal bgunAutoSwitchWeapon /* f099714: afa20024 */ sw $v0,0x24($sp) /* f099718: 8fa20024 */ lw $v0,0x24($sp) /* f09971c: 904c0690 */ lbu $t4,0x690($v0) @@ -9456,13 +9456,13 @@ glabel var7f1ad810pf /* f09cff8: 24110014 */ li $s1,0x14 /* f09cffc: 02602025 */ move $a0,$s3 /* f09d000: afa3003c */ sw $v1,0x3c($sp) -/* f09d004: 0fc26307 */ jal 0xf098c1c +/* f09d004: 0fc26307 */ jal bgunGetWeaponInfo /* f09d008: 02402825 */ move $a1,$s2 /* f09d00c: 8fa3003c */ lw $v1,0x3c($sp) /* f09d010: 3c02800a */ lui $v0,0x800a /* f09d014: 8c50e508 */ lw $s0,-0x1af8($v0) /* f09d018: 24640384 */ addiu $a0,$v1,0x384 -/* f09d01c: 0c007746 */ jal 0x1dd18 +/* f09d01c: 0c007746 */ jal modelGetAbsAnimSpeed /* f09d020: ac700684 */ sw $s0,0x684($v1) /* f09d024: 8fa3003c */ lw $v1,0x3c($sp) /* f09d028: 3c017f1b */ lui $at,0x7f1b @@ -9478,7 +9478,7 @@ glabel var7f1ad810pf /* f09d050: 02602025 */ move $a0,$s3 .PB0f09d054: /* f09d054: 02402825 */ move $a1,$s2 -/* f09d058: 0fc27351 */ jal 0xf09cd44 +/* f09d058: 0fc27351 */ jal bgunTickInc /* f09d05c: 02003025 */ move $a2,$s0 /* f09d060: 00408025 */ move $s0,$v0 /* f09d064: 18400003 */ blez $v0,.PB0f09d074 @@ -13899,7 +13899,7 @@ glabel var7f1ac740 /* f09fd28: 24630638 */ addiu $v1,$v1,0x638 /* f09fd2c: 90640000 */ lbu $a0,0x0($v1) /* f09fd30: afa50058 */ sw $a1,0x58($sp) -/* f09fd34: 0fc2c4f8 */ jal 0xf0b13e0 +/* f09fd34: 0fc2c4f8 */ jal weaponFindById /* f09fd38: afa302b0 */ sw $v1,0x2b0($sp) /* f09fd3c: 1040022d */ beqz $v0,.PB0f0a05f4 /* f09fd40: 8fb902b0 */ lw $t9,0x2b0($sp) @@ -13914,17 +13914,17 @@ glabel var7f1ac740 /* f09fd64: 27a40270 */ addiu $a0,$sp,0x270 /* f09fd68: 55610223 */ bnel $t3,$at,.PB0f0a05f8 /* f09fd6c: 8fbf004c */ lw $ra,0x4c($sp) -/* f09fd70: 0c005900 */ jal 0x16400 +/* f09fd70: 0c005900 */ jal mtx4LoadIdentity /* f09fd74: afa301d8 */ sw $v1,0x1d8($sp) /* f09fd78: 27a40204 */ addiu $a0,$sp,0x204 /* f09fd7c: 27a501f8 */ addiu $a1,$sp,0x1f8 /* f09fd80: 02003025 */ move $a2,$s0 -/* f09fd84: 0fc283c9 */ jal 0xf0a0f24 +/* f09fd84: 0fc283c9 */ jal bgunCalculateShotSpread /* f09fd88: 24070001 */ li $a3,0x1 -/* f09fd8c: 0fc2d6e2 */ jal 0xf0b5b88 +/* f09fd8c: 0fc2d6e2 */ jal currentPlayerGetUnk174c /* f09fd90: 00000000 */ nop /* f09fd94: 00402025 */ move $a0,$v0 -/* f09fd98: 0c005958 */ jal 0x16560 +/* f09fd98: 0c005958 */ jal mtx4RotateVecInPlace /* f09fd9c: 27a501f8 */ addiu $a1,$sp,0x1f8 /* f09fda0: 8fa402b0 */ lw $a0,0x2b0($sp) /* f09fda4: 24010019 */ li $at,0x19 @@ -13976,12 +13976,12 @@ glabel var7f1ac740 /* f09fe54: 00000000 */ nop /* f09fe58: 46803420 */ cvt.s.w $f16,$f6 /* f09fe5c: 46008282 */ mul.s $f10,$f16,$f0 -/* f09fe60: 0fc2c8ae */ jal 0xf0b22b8 +/* f09fe60: 0fc2c8ae */ jal gsetHasFunctionFlags /* f09fe64: e7aa025c */ swc1 $f10,0x25c($sp) /* f09fe68: 1040007a */ beqz $v0,.PB0f0a0054 /* f09fe6c: 00002025 */ move $a0,$zero /* f09fe70: 00002825 */ move $a1,$zero -/* f09fe74: 0fc187c1 */ jal 0xf061f04 +/* f09fe74: 0fc187c1 */ jal func0f061d54 /* f09fe78: 00003025 */ move $a2,$zero /* f09fe7c: 8fa302b0 */ lw $v1,0x2b0($sp) /* f09fe80: 8c7806b4 */ lw $t8,0x6b4($v1) @@ -13996,7 +13996,7 @@ glabel var7f1ac740 /* f09fea4: 27a701bc */ addiu $a3,$sp,0x1bc /* f09fea8: e7b201cc */ swc1 $f18,0x1cc($sp) /* f09feac: c46806c0 */ lwc1 $f8,0x6c0($v1) -/* f09feb0: 0fc1010b */ jal 0xf04042c +/* f09feb0: 0fc1010b */ jal func0f04031c /* f09feb4: e7a801d0 */ swc1 $f8,0x1d0($sp) /* f09feb8: c7a601f8 */ lwc1 $f6,0x1f8($sp) /* f09febc: c7b001bc */ lwc1 $f16,0x1bc($sp) @@ -14008,7 +14008,7 @@ glabel var7f1ac740 /* f09fed4: c7a40200 */ lwc1 $f4,0x200($sp) /* f09fed8: 46048482 */ mul.s $f18,$f16,$f4 /* f09fedc: 46085180 */ add.s $f6,$f10,$f8 -/* f09fee0: 0fc25a10 */ jal 0xf096840 +/* f09fee0: 0fc25a10 */ jal acosf /* f09fee4: 46069300 */ add.s $f12,$f18,$f6 /* f09fee8: 3c017f1b */ lui $at,0x7f1b /* f09feec: c42ae384 */ lwc1 $f10,-0x1c7c($at) @@ -14040,7 +14040,7 @@ glabel var7f1ac740 /* f09ff50: e7a20024 */ swc1 $f2,0x24($sp) /* f09ff54: e7a40014 */ swc1 $f4,0x14($sp) /* f09ff58: e7a60020 */ swc1 $f6,0x20($sp) -/* f09ff5c: 0c005d6a */ jal 0x175a8 +/* f09ff5c: 0c005d6a */ jal mtx00016b58 /* f09ff60: e7b20018 */ swc1 $f18,0x18($sp) /* f09ff64: 44801000 */ mtc1 $zero,$f2 /* f09ff68: 3c013f80 */ lui $at,0x3f80 @@ -14057,17 +14057,17 @@ glabel var7f1ac740 /* f09ff94: e7aa0010 */ swc1 $f10,0x10($sp) /* f09ff98: e7a40020 */ swc1 $f4,0x20($sp) /* f09ff9c: e7a80014 */ swc1 $f8,0x14($sp) -/* f09ffa0: 0c005d6a */ jal 0x175a8 +/* f09ffa0: 0c005d6a */ jal mtx00016b58 /* f09ffa4: e7b00018 */ swc1 $f16,0x18($sp) /* f09ffa8: 02002025 */ move $a0,$s0 -/* f09ffac: 0fc25bad */ jal 0xf096eb4 +/* f09ffac: 0fc25bad */ jal quaternion0f097044 /* f09ffb0: 27a500e4 */ addiu $a1,$sp,0xe4 /* f09ffb4: 27b000d4 */ addiu $s0,$sp,0xd4 /* f09ffb8: 02002825 */ move $a1,$s0 -/* f09ffbc: 0fc25bad */ jal 0xf096eb4 +/* f09ffbc: 0fc25bad */ jal quaternion0f097044 /* f09ffc0: 27a40134 */ addiu $a0,$sp,0x134 /* f09ffc4: 27a400e4 */ addiu $a0,$sp,0xe4 -/* f09ffc8: 0fc25d4c */ jal 0xf097530 +/* f09ffc8: 0fc25d4c */ jal quaternion0f0976c0 /* f09ffcc: 02002825 */ move $a1,$s0 /* f09ffd0: 3c017f1b */ lui $at,0x7f1b /* f09ffd4: c432e38c */ lwc1 $f18,-0x1c74($at) @@ -14083,10 +14083,10 @@ glabel var7f1ac740 /* f09fffc: 46000307 */ neg.s $f12,$f0 /* f0a0000: 44066000 */ mfc1 $a2,$f12 .PB0f0a0004: -/* f0a0004: 0fc25c4a */ jal 0xf097128 +/* f0a0004: 0fc25c4a */ jal quaternionSlerp /* f0a0008: 27a700c4 */ addiu $a3,$sp,0xc4 /* f0a000c: 27a400c4 */ addiu $a0,$sp,0xc4 -/* f0a0010: 0fc25b51 */ jal 0xf096d44 +/* f0a0010: 0fc25b51 */ jal quaternionToMtx /* f0a0014: 27a500f4 */ addiu $a1,$sp,0xf4 /* f0a0018: c7aa0114 */ lwc1 $f10,0x114($sp) /* f0a001c: c7b00118 */ lwc1 $f16,0x118($sp) @@ -14177,7 +14177,7 @@ glabel var7f1ac740 /* f0a015c: 8fac0058 */ lw $t4,0x58($sp) /* f0a0160: 27a50210 */ addiu $a1,$sp,0x210 /* f0a0164: 016c2021 */ addu $a0,$t3,$t4 -/* f0a0168: 0c0059da */ jal 0x16768 +/* f0a0168: 0c0059da */ jal mtx4Copy /* f0a016c: 2484092c */ addiu $a0,$a0,0x92c /* f0a0170: 44801000 */ mtc1 $zero,$f2 /* f0a0174: 8fa702b0 */ lw $a3,0x2b0($sp) @@ -14229,7 +14229,7 @@ glabel var7f1ac740 /* f0a0220: 8faf01d8 */ lw $t7,0x1d8($sp) /* f0a0224: 8f1900bc */ lw $t9,0xbc($t8) /* f0a0228: 8de40040 */ lw $a0,0x40($t7) -/* f0a022c: 0fc22dbf */ jal 0xf08b6fc +/* f0a022c: 0fc22dbf */ jal func0f08b880 /* f0a0230: 8f260004 */ lw $a2,0x4($t9) /* f0a0234: 10000039 */ b .PB0f0a031c /* f0a0238: 00408025 */ move $s0,$v0 @@ -14242,7 +14242,7 @@ glabel var7f1ac740 /* f0a0250: 24050056 */ li $a1,0x56 /* f0a0254: 8d2a00bc */ lw $t2,0xbc($t1) /* f0a0258: 8d040040 */ lw $a0,0x40($t0) -/* f0a025c: 0fc22dbf */ jal 0xf08b6fc +/* f0a025c: 0fc22dbf */ jal func0f08b880 /* f0a0260: 8d460004 */ lw $a2,0x4($t2) /* f0a0264: 1040002d */ beqz $v0,.PB0f0a031c /* f0a0268: 00408025 */ move $s0,$v0 @@ -14259,7 +14259,7 @@ glabel var7f1ac740 /* f0a0290: 24050055 */ li $a1,0x55 /* f0a0294: 8dcf00bc */ lw $t7,0xbc($t6) /* f0a0298: 8da40040 */ lw $a0,0x40($t5) -/* f0a029c: 0fc22dbf */ jal 0xf08b6fc +/* f0a029c: 0fc22dbf */ jal func0f08b880 /* f0a02a0: 8de60004 */ lw $a2,0x4($t7) /* f0a02a4: 1040001d */ beqz $v0,.PB0f0a031c /* f0a02a8: 00408025 */ move $s0,$v0 @@ -14277,7 +14277,7 @@ glabel var7f1ac740 /* f0a02d4: 24050055 */ li $a1,0x55 /* f0a02d8: 8d2a00bc */ lw $t2,0xbc($t1) /* f0a02dc: 8d040040 */ lw $a0,0x40($t0) -/* f0a02e0: 0fc22dbf */ jal 0xf08b6fc +/* f0a02e0: 0fc22dbf */ jal func0f08b880 /* f0a02e4: 8d460004 */ lw $a2,0x4($t2) /* f0a02e8: 1040000c */ beqz $v0,.PB0f0a031c /* f0a02ec: 00408025 */ move $s0,$v0 @@ -14290,7 +14290,7 @@ glabel var7f1ac740 /* f0a0304: 00e02825 */ move $a1,$a3 /* f0a0308: 8dae00bc */ lw $t6,0xbc($t5) /* f0a030c: 8d840040 */ lw $a0,0x40($t4) -/* f0a0310: 0fc22d35 */ jal 0xf08b4d4 +/* f0a0310: 0fc22d35 */ jal func0f08b658 /* f0a0314: 8dc60004 */ lw $a2,0x4($t6) /* f0a0318: 00408025 */ move $s0,$v0 .PB0f0a031c: @@ -14335,7 +14335,7 @@ glabel var7f1ac740 /* f0a03b0: 000d7700 */ sll $t6,$t5,0x1c /* f0a03b4: 016e7825 */ or $t7,$t3,$t6 /* f0a03b8: ae0f0040 */ sw $t7,0x40($s0) -/* f0a03bc: 0fc27bd8 */ jal 0xf09ef60 +/* f0a03bc: 0fc27bd8 */ jal bgun0f09ed2c /* f0a03c0: afb80010 */ sw $t8,0x10($sp) /* f0a03c4: 8e190040 */ lw $t9,0x40($s0) /* f0a03c8: 8fa301d8 */ lw $v1,0x1d8($sp) @@ -14378,14 +14378,14 @@ glabel var7f1ac740 /* f0a0454: c4d20014 */ lwc1 $f18,0x14($a2) /* f0a0458: 46009402 */ mul.s $f16,$f18,$f0 /* f0a045c: e4d00014 */ swc1 $f16,0x14($a2) -/* f0a0460: 0c0059e9 */ jal 0x167a4 +/* f0a0460: 0c0059e9 */ jal mtx3ToMtx4 /* f0a0464: afa40058 */ sw $a0,0x58($sp) /* f0a0468: 8fa801d8 */ lw $t0,0x1d8($sp) /* f0a046c: 27a50078 */ addiu $a1,$sp,0x78 -/* f0a0470: 0c005a55 */ jal 0x16954 +/* f0a0470: 0c005a55 */ jal mtx00015f04 /* f0a0474: c50c0048 */ lwc1 $f12,0x48($t0) /* f0a0478: 27a40078 */ addiu $a0,$sp,0x78 -/* f0a047c: 0c0059fc */ jal 0x167f0 +/* f0a047c: 0c0059fc */ jal mtx4ToMtx3 /* f0a0480: 8fa50058 */ lw $a1,0x58($sp) /* f0a0484: 8fa301d8 */ lw $v1,0x1d8($sp) /* f0a0488: 8e0a0048 */ lw $t2,0x48($s0) @@ -14440,7 +14440,7 @@ glabel var7f1ac740 /* f0a0548: e7a00024 */ swc1 $f0,0x24($sp) /* f0a054c: e7a00030 */ swc1 $f0,0x30($sp) /* f0a0550: e7a00034 */ swc1 $f0,0x34($sp) -/* f0a0554: 0fc24e0e */ jal 0xf093838 +/* f0a0554: 0fc24e0e */ jal func0f0939f8 /* f0a0558: e7a00038 */ swc1 $f0,0x38($sp) /* f0a055c: 8fa301d8 */ lw $v1,0x1d8($sp) /* f0a0560: 8c6d0010 */ lw $t5,0x10($v1) @@ -14448,7 +14448,7 @@ glabel var7f1ac740 /* f0a0564: 31ac0800 */ andi $t4,$t5,0x800 /* f0a0568: 51800004 */ beqzl $t4,.PB0f0a057c /* f0a056c: 8e050048 */ lw $a1,0x48($s0) -/* f0a0570: 0fc2f645 */ jal 0xf0bd914 +/* f0a0570: 0fc2f645 */ jal playerLaunchSlayerRocket /* f0a0574: 02002025 */ move $a0,$s0 /* f0a0578: 8e050048 */ lw $a1,0x48($s0) .PB0f0a057c: @@ -14458,7 +14458,7 @@ glabel var7f1ac740 /* f0a0588: 31cf0080 */ andi $t7,$t6,0x80 /* f0a058c: 51e00009 */ beqzl $t7,.PB0f0a05b4 /* f0a0590: 8fa800b8 */ lw $t0,0xb8($sp) -/* f0a0594: 0fc1cf2c */ jal 0xf073cb0 +/* f0a0594: 0fc1cf2c */ jal func0f073ae8 /* f0a0598: 27a70060 */ addiu $a3,$sp,0x60 /* f0a059c: 10000005 */ b .PB0f0a05b4 /* f0a05a0: 8fa800b8 */ lw $t0,0xb8($sp) @@ -14477,13 +14477,13 @@ glabel var7f1ac740 /* f0a05c4: a6090062 */ sh $t1,0x62($s0) /* f0a05c8: 50800004 */ beqzl $a0,.PB0f0a05dc /* f0a05cc: 8e060018 */ lw $a2,0x18($s0) -/* f0a05d0: 0fc1817a */ jal 0xf0605e8 +/* f0a05d0: 0fc1817a */ jal propFree /* f0a05d4: 00000000 */ nop /* f0a05d8: 8e060018 */ lw $a2,0x18($s0) .PB0f0a05dc: /* f0a05dc: 50c00004 */ beqzl $a2,.PB0f0a05f0 /* f0a05e0: ae000014 */ sw $zero,0x14($s0) -/* f0a05e4: 0fc2cd37 */ jal 0xf0b34dc +/* f0a05e4: 0fc2cd37 */ jal modelFree /* f0a05e8: 00c02025 */ move $a0,$a2 /* f0a05ec: ae000014 */ sw $zero,0x14($s0) .PB0f0a05f0: @@ -22067,7 +22067,7 @@ glabel var7f1ac918 /* f0a498c: 10000140 */ b .PB0f0a4e90 /* f0a4990: 3c014348 */ lui $at,0x4348 .PB0f0a4994: -/* f0a4994: 0c004be0 */ jal 0x12f80 +/* f0a4994: 0c004be0 */ jal random /* f0a4998: 00000000 */ nop /* f0a499c: 3c017f1b */ lui $at,0x7f1b /* f0a49a0: c420e51c */ lwc1 $f0,-0x1ae4($at) @@ -22091,7 +22091,7 @@ glabel var7f1ac918 /* f0a49e4: 00000000 */ nop /* f0a49e8: 46082182 */ mul.s $f6,$f4,$f8 /* f0a49ec: 46003280 */ add.s $f10,$f6,$f0 -/* f0a49f0: 0c004be0 */ jal 0x12f80 +/* f0a49f0: 0c004be0 */ jal random /* f0a49f4: e60a06e8 */ swc1 $f10,0x6e8($s0) /* f0a49f8: 44828000 */ mtc1 $v0,$f16 /* f0a49fc: 3c014020 */ lui $at,0x4020 @@ -22113,7 +22113,7 @@ glabel var7f1ac918 /* f0a4a38: 00000000 */ nop /* f0a4a3c: 460a3402 */ mul.s $f16,$f6,$f10 /* f0a4a40: 46008100 */ add.s $f4,$f16,$f0 -/* f0a4a44: 0c004be0 */ jal 0x12f80 +/* f0a4a44: 0c004be0 */ jal random /* f0a4a48: e60406ec */ swc1 $f4,0x6ec($s0) /* f0a4a4c: 44824000 */ mtc1 $v0,$f8 /* f0a4a50: 3c014f80 */ lui $at,0x4f80 @@ -22133,7 +22133,7 @@ glabel var7f1ac918 /* f0a4a84: 46048482 */ mul.s $f18,$f16,$f4 /* f0a4a88: 46089283 */ div.s $f10,$f18,$f8 /* f0a4a8c: 46065401 */ sub.s $f16,$f10,$f6 -/* f0a4a90: 0c004be0 */ jal 0x12f80 +/* f0a4a90: 0c004be0 */ jal random /* f0a4a94: e7b000d0 */ swc1 $f16,0xd0($sp) /* f0a4a98: 44822000 */ mtc1 $v0,$f4 /* f0a4a9c: 3c014f80 */ lui $at,0x4f80 @@ -22153,7 +22153,7 @@ glabel var7f1ac918 /* f0a4ad0: 46065402 */ mul.s $f16,$f10,$f6 /* f0a4ad4: 46048203 */ div.s $f8,$f16,$f4 /* f0a4ad8: 46124281 */ sub.s $f10,$f8,$f18 -/* f0a4adc: 0c004be0 */ jal 0x12f80 +/* f0a4adc: 0c004be0 */ jal random /* f0a4ae0: e7aa00d4 */ swc1 $f10,0xd4($sp) /* f0a4ae4: 44823000 */ mtc1 $v0,$f6 /* f0a4ae8: 3c014f80 */ lui $at,0x4f80 @@ -22176,7 +22176,7 @@ glabel var7f1ac918 /* f0a4b28: 100000d8 */ b .PB0f0a4e8c /* f0a4b2c: e7a800d8 */ swc1 $f8,0xd8($sp) .PB0f0a4b30: -/* f0a4b30: 0c004be0 */ jal 0x12f80 +/* f0a4b30: 0c004be0 */ jal random /* f0a4b34: 00000000 */ nop /* f0a4b38: 3c017f1b */ lui $at,0x7f1b /* f0a4b3c: c420e538 */ lwc1 $f0,-0x1ac8($at) @@ -22205,7 +22205,7 @@ glabel var7f1ac918 /* f0a4b94: 46002402 */ mul.s $f16,$f4,$f0 /* f0a4b98: 46105200 */ add.s $f8,$f10,$f16 /* f0a4b9c: 46004487 */ neg.s $f18,$f8 -/* f0a4ba0: 0c004be0 */ jal 0x12f80 +/* f0a4ba0: 0c004be0 */ jal random /* f0a4ba4: e61206e8 */ swc1 $f18,0x6e8($s0) /* f0a4ba8: 44823000 */ mtc1 $v0,$f6 /* f0a4bac: 3c014020 */ lui $at,0x4020 @@ -22224,7 +22224,7 @@ glabel var7f1ac918 /* f0a4bdc: 00000000 */ nop /* f0a4be0: 46124182 */ mul.s $f6,$f8,$f18 /* f0a4be4: 46003280 */ add.s $f10,$f6,$f0 -/* f0a4be8: 0c004be0 */ jal 0x12f80 +/* f0a4be8: 0c004be0 */ jal random /* f0a4bec: e60a06ec */ swc1 $f10,0x6ec($s0) /* f0a4bf0: 44822000 */ mtc1 $v0,$f4 /* f0a4bf4: 3c014f80 */ lui $at,0x4f80 @@ -22240,7 +22240,7 @@ glabel var7f1ac918 /* f0a4c18: 00000000 */ nop /* f0a4c1c: 46069280 */ add.s $f10,$f18,$f6 /* f0a4c20: 46005107 */ neg.s $f4,$f10 -/* f0a4c24: 0c004be0 */ jal 0x12f80 +/* f0a4c24: 0c004be0 */ jal random /* f0a4c28: e60406f0 */ swc1 $f4,0x6f0($s0) /* f0a4c2c: 44824000 */ mtc1 $v0,$f8 /* f0a4c30: 3c014f80 */ lui $at,0x4f80 @@ -22260,7 +22260,7 @@ glabel var7f1ac918 /* f0a4c64: 460a3100 */ add.s $f4,$f6,$f10 /* f0a4c68: 46082482 */ mul.s $f18,$f4,$f8 /* f0a4c6c: 46109183 */ div.s $f6,$f18,$f16 -/* f0a4c70: 0c004be0 */ jal 0x12f80 +/* f0a4c70: 0c004be0 */ jal random /* f0a4c74: e7a600d0 */ swc1 $f6,0xd0($sp) /* f0a4c78: 44825000 */ mtc1 $v0,$f10 /* f0a4c7c: 3c014f80 */ lui $at,0x4f80 @@ -22280,7 +22280,7 @@ glabel var7f1ac918 /* f0a4cb0: 46109182 */ mul.s $f6,$f18,$f16 /* f0a4cb4: 460a3203 */ div.s $f8,$f6,$f10 /* f0a4cb8: 46044481 */ sub.s $f18,$f8,$f4 -/* f0a4cbc: 0c004be0 */ jal 0x12f80 +/* f0a4cbc: 0c004be0 */ jal random /* f0a4cc0: e7b200d4 */ swc1 $f18,0xd4($sp) /* f0a4cc4: 44828000 */ mtc1 $v0,$f16 /* f0a4cc8: 3c014f80 */ lui $at,0x4f80 @@ -22304,7 +22304,7 @@ glabel var7f1ac918 /* f0a4d0c: e7a800d8 */ swc1 $f8,0xd8($sp) /* f0a4d10: 44802000 */ mtc1 $zero,$f4 .PB0f0a4d14: -/* f0a4d14: 0c004be0 */ jal 0x12f80 +/* f0a4d14: 0c004be0 */ jal random /* f0a4d18: e60406e8 */ swc1 $f4,0x6e8($s0) /* f0a4d1c: 3c014020 */ lui $at,0x4020 /* f0a4d20: 44810000 */ mtc1 $at,$f0 @@ -22325,7 +22325,7 @@ glabel var7f1ac918 /* f0a4d58: 00000000 */ nop /* f0a4d5c: 46044482 */ mul.s $f18,$f8,$f4 /* f0a4d60: 46009280 */ add.s $f10,$f18,$f0 -/* f0a4d64: 0c004be0 */ jal 0x12f80 +/* f0a4d64: 0c004be0 */ jal random /* f0a4d68: e60a06ec */ swc1 $f10,0x6ec($s0) /* f0a4d6c: 44828000 */ mtc1 $v0,$f16 /* f0a4d70: 3c014f80 */ lui $at,0x4f80 @@ -22342,7 +22342,7 @@ glabel var7f1ac918 /* f0a4d98: 44818000 */ mtc1 $at,$f16 /* f0a4d9c: 46122280 */ add.s $f10,$f4,$f18 /* f0a4da0: 46105202 */ mul.s $f8,$f10,$f16 -/* f0a4da4: 0c004be0 */ jal 0x12f80 +/* f0a4da4: 0c004be0 */ jal random /* f0a4da8: e60806f0 */ swc1 $f8,0x6f0($s0) /* f0a4dac: 44823000 */ mtc1 $v0,$f6 /* f0a4db0: 3c014f80 */ lui $at,0x4f80 @@ -22362,7 +22362,7 @@ glabel var7f1ac918 /* f0a4de4: 46105200 */ add.s $f8,$f10,$f16 /* f0a4de8: 46064482 */ mul.s $f18,$f8,$f6 /* f0a4dec: 46049283 */ div.s $f10,$f18,$f4 -/* f0a4df0: 0c004be0 */ jal 0x12f80 +/* f0a4df0: 0c004be0 */ jal random /* f0a4df4: e7aa00d0 */ swc1 $f10,0xd0($sp) /* f0a4df8: 44828000 */ mtc1 $v0,$f16 /* f0a4dfc: 3c014f80 */ lui $at,0x4f80 @@ -22382,7 +22382,7 @@ glabel var7f1ac918 /* f0a4e30: 46049282 */ mul.s $f10,$f18,$f4 /* f0a4e34: 46105183 */ div.s $f6,$f10,$f16 /* f0a4e38: 46083481 */ sub.s $f18,$f6,$f8 -/* f0a4e3c: 0c004be0 */ jal 0x12f80 +/* f0a4e3c: 0c004be0 */ jal random /* f0a4e40: e7b200d4 */ swc1 $f18,0xd4($sp) /* f0a4e44: 44822000 */ mtc1 $v0,$f4 /* f0a4e48: 3c014f80 */ lui $at,0x4f80 @@ -22411,10 +22411,10 @@ glabel var7f1ac918 /* f0a4e98: 27a400d0 */ addiu $a0,$sp,0xd0 /* f0a4e9c: 27a50090 */ addiu $a1,$sp,0x90 /* f0a4ea0: 46124101 */ sub.s $f4,$f8,$f18 -/* f0a4ea4: 0c005bb7 */ jal 0x16edc +/* f0a4ea4: 0c005bb7 */ jal mtx4LoadRotation /* f0a4ea8: e60406d8 */ swc1 $f4,0x6d8($s0) /* f0a4eac: 27a40090 */ addiu $a0,$sp,0x90 -/* f0a4eb0: 0c0059fc */ jal 0x167f0 +/* f0a4eb0: 0c0059fc */ jal mtx4ToMtx3 /* f0a4eb4: 26050718 */ addiu $a1,$s0,0x718 /* f0a4eb8: 3c03800a */ lui $v1,0x800a /* f0a4ebc: 2463e4d0 */ addiu $v1,$v1,-6960 @@ -22443,10 +22443,10 @@ glabel var7f1ac918 /* f0a4f18: c606032c */ lwc1 $f6,0x32c($s0) /* f0a4f1c: 46083481 */ sub.s $f18,$f6,$f8 /* f0a4f20: 46009103 */ div.s $f4,$f18,$f0 -/* f0a4f24: 0c005ff6 */ jal 0x17fd8 +/* f0a4f24: 0c005ff6 */ jal mtx00017588 /* f0a4f28: e7a4008c */ swc1 $f4,0x8c($sp) /* f0a4f2c: 27a40044 */ addiu $a0,$sp,0x44 -/* f0a4f30: 0c005958 */ jal 0x16560 +/* f0a4f30: 0c005958 */ jal mtx4RotateVecInPlace /* f0a4f34: 27a50084 */ addiu $a1,$sp,0x84 /* f0a4f38: 3c017f1b */ lui $at,0x7f1b /* f0a4f3c: c420e564 */ lwc1 $f0,-0x1a9c($at) @@ -22531,7 +22531,7 @@ glabel var7f1ac918 /* f0a5068: 8fa40030 */ lw $a0,0x30($sp) .PB0f0a506c: /* f0a506c: 8fa5002c */ lw $a1,0x2c($sp) -/* f0a5070: 0c005ad8 */ jal 0x16b60 +/* f0a5070: 0c005ad8 */ jal mtx00016110 /* f0a5074: afa20040 */ sw $v0,0x40($sp) /* f0a5078: 3c03800a */ lui $v1,0x800a /* f0a507c: 8fa20040 */ lw $v0,0x40($sp) @@ -25458,11 +25458,11 @@ glabel var7f1adc74pf /* f0a5844: afa001d4 */ sw $zero,0x1d4($sp) /* f0a5848: afa30054 */ sw $v1,0x54($sp) /* f0a584c: afa40310 */ sw $a0,0x310($sp) -/* f0a5850: 0fc2871d */ jal 0xf0a1c74 +/* f0a5850: 0fc2871d */ jal bgunGetWeaponNum2 /* f0a5854: afa201e0 */ sw $v0,0x1e0($sp) /* f0a5858: afa201cc */ sw $v0,0x1cc($sp) /* f0a585c: afa001c0 */ sw $zero,0x1c0($sp) -/* f0a5860: 0fc2c4f8 */ jal 0xf0b13e0 +/* f0a5860: 0fc2c4f8 */ jal weaponFindById /* f0a5864: 00402025 */ move $a0,$v0 /* f0a5868: 8fb80310 */ lw $t8,0x310($sp) /* f0a586c: 24010001 */ li $at,0x1 @@ -25476,7 +25476,7 @@ glabel var7f1adc74pf /* f0a588c: 00000000 */ nop /* f0a5890: afaf01c0 */ sw $t7,0x1c0($sp) .PB0f0a5894: -/* f0a5894: 0fc2c513 */ jal 0xf0b144c +/* f0a5894: 0fc2c513 */ jal gsetGetWeaponFunction2 /* f0a5898: 02002025 */ move $a0,$s0 /* f0a589c: 10400007 */ beqz $v0,.PB0f0a58bc /* f0a58a0: afa201d8 */ sw $v0,0x1d8($sp) @@ -25489,15 +25489,15 @@ glabel var7f1adc74pf .PB0f0a58bc: /* f0a58bc: 02002025 */ move $a0,$s0 .PB0f0a58c0: -/* f0a58c0: 0fc275d5 */ jal 0xf09d754 +/* f0a58c0: 0fc275d5 */ jal bgun0f09d550 /* f0a58c4: 8fa50310 */ lw $a1,0x310($sp) /* f0a58c8: 8fac0310 */ lw $t4,0x310($sp) /* f0a58cc: 1580002b */ bnez $t4,.PB0f0a597c /* f0a58d0: 00000000 */ nop -/* f0a58d4: 0fc2871d */ jal 0xf0a1c74 +/* f0a58d4: 0fc2871d */ jal bgunGetWeaponNum2 /* f0a58d8: 24040001 */ li $a0,0x1 /* f0a58dc: 00402025 */ move $a0,$v0 -/* f0a58e0: 0fc2c6f4 */ jal 0xf0b1bd0 +/* f0a58e0: 0fc2c6f4 */ jal weaponHasFlag /* f0a58e4: 24050040 */ li $a1,0x40 /* f0a58e8: 10400013 */ beqz $v0,.PB0f0a5938 /* f0a58ec: 3c01800a */ lui $at,0x800a @@ -25538,10 +25538,10 @@ glabel var7f1adc74pf /* f0a5974: 1000002b */ b .PB0f0a5a24 /* f0a5978: e60601bc */ swc1 $f6,0x1bc($s0) .PB0f0a597c: -/* f0a597c: 0fc2871d */ jal 0xf0a1c74 +/* f0a597c: 0fc2871d */ jal bgunGetWeaponNum2 /* f0a5980: 00002025 */ move $a0,$zero /* f0a5984: 00402025 */ move $a0,$v0 -/* f0a5988: 0fc2c6f4 */ jal 0xf0b1bd0 +/* f0a5988: 0fc2c6f4 */ jal weaponHasFlag /* f0a598c: 24050040 */ li $a1,0x40 /* f0a5990: 10400013 */ beqz $v0,.PB0f0a59e0 /* f0a5994: 3c01800a */ lui $at,0x800a @@ -25586,7 +25586,7 @@ glabel var7f1adc74pf .PB0f0a5a28: /* f0a5a28: 55400017 */ bnezl $t2,.PB0f0a5a88 /* f0a5a2c: 8fb901c0 */ lw $t9,0x1c0($sp) -/* f0a5a30: 0fc2c5cb */ jal 0xf0b172c +/* f0a5a30: 0fc2c5cb */ jal func0f0b131c /* f0a5a34: 01402025 */ move $a0,$t2 /* f0a5a38: c61200b8 */ lwc1 $f18,0xb8($s0) /* f0a5a3c: c61001b0 */ lwc1 $f16,0x1b0($s0) @@ -25634,7 +25634,7 @@ glabel var7f1adc74pf /* f0a5ae0: 10000015 */ b .PB0f0a5b38 /* f0a5ae4: e7a60284 */ swc1 $f6,0x284($sp) .PB0f0a5ae8: -/* f0a5ae8: 0fc2c5cb */ jal 0xf0b172c +/* f0a5ae8: 0fc2c5cb */ jal func0f0b131c /* f0a5aec: 8fa40310 */ lw $a0,0x310($sp) /* f0a5af0: c61000b8 */ lwc1 $f16,0xb8($s0) /* f0a5af4: c61201b0 */ lwc1 $f18,0x1b0($s0) @@ -25691,7 +25691,7 @@ glabel var7f1adc74pf /* f0a5bbc: 8c4d0014 */ lw $t5,0x14($v0) /* f0a5bc0: 11a0004a */ beqz $t5,.PB0f0a5cec /* f0a5bc4: 00000000 */ nop -/* f0a5bc8: 0c004be0 */ jal 0x12f80 +/* f0a5bc8: 0c004be0 */ jal random /* f0a5bcc: 00000000 */ nop /* f0a5bd0: 44822000 */ mtc1 $v0,$f4 /* f0a5bd4: 3c014f80 */ lui $at,0x4f80 @@ -25716,7 +25716,7 @@ glabel var7f1adc74pf /* f0a5c1c: 00000000 */ nop /* f0a5c20: 46125182 */ mul.s $f6,$f10,$f18 /* f0a5c24: 46064100 */ add.s $f4,$f8,$f6 -/* f0a5c28: 0c004be0 */ jal 0x12f80 +/* f0a5c28: 0c004be0 */ jal random /* f0a5c2c: e7a4027c */ swc1 $f4,0x27c($sp) /* f0a5c30: 44828000 */ mtc1 $v0,$f16 /* f0a5c34: 3c014f80 */ lui $at,0x4f80 @@ -25741,7 +25741,7 @@ glabel var7f1adc74pf /* f0a5c7c: 00000000 */ nop /* f0a5c80: 46085182 */ mul.s $f6,$f10,$f8 /* f0a5c84: 46062400 */ add.s $f16,$f4,$f6 -/* f0a5c88: 0c004be0 */ jal 0x12f80 +/* f0a5c88: 0c004be0 */ jal random /* f0a5c8c: e7b00280 */ swc1 $f16,0x280($sp) /* f0a5c90: 44829000 */ mtc1 $v0,$f18 /* f0a5c94: 3c014f80 */ lui $at,0x4f80 @@ -25768,11 +25768,11 @@ glabel var7f1adc74pf /* f0a5ce4: 46068480 */ add.s $f18,$f16,$f6 /* f0a5ce8: e7b20284 */ swc1 $f18,0x284($sp) .PB0f0a5cec: -/* f0a5cec: 0fc2d6fa */ jal 0xf0b5be8 +/* f0a5cec: 0fc2d6fa */ jal currentPlayerGetScreenWidth /* f0a5cf0: 00000000 */ nop -/* f0a5cf4: 0fc2d702 */ jal 0xf0b5c08 +/* f0a5cf4: 0fc2d702 */ jal currentPlayerGetScreenLeft /* f0a5cf8: e7a00064 */ swc1 $f0,0x64($sp) -/* f0a5cfc: 0fc2d6fa */ jal 0xf0b5be8 +/* f0a5cfc: 0fc2d6fa */ jal currentPlayerGetScreenWidth /* f0a5d00: e7a00068 */ swc1 $f0,0x68($sp) /* f0a5d04: 3c013f00 */ lui $at,0x3f00 /* f0a5d08: 44811000 */ mtc1 $at,$f2 @@ -25790,9 +25790,9 @@ glabel var7f1adc74pf /* f0a5d38: 00000000 */ nop /* f0a5d3c: 46020402 */ mul.s $f16,$f0,$f2 /* f0a5d40: 46105103 */ div.s $f4,$f10,$f16 -/* f0a5d44: 0fc2d706 */ jal 0xf0b5c18 +/* f0a5d44: 0fc2d706 */ jal currentPlayerGetScreenTop /* f0a5d48: e604076c */ swc1 $f4,0x76c($s0) -/* f0a5d4c: 0fc2d6fe */ jal 0xf0b5bf8 +/* f0a5d4c: 0fc2d6fe */ jal currentPlayerGetScreenHeight /* f0a5d50: e7a00068 */ swc1 $f0,0x68($sp) /* f0a5d54: 3c013f00 */ lui $at,0x3f00 /* f0a5d58: 44813000 */ mtc1 $at,$f6 @@ -25805,11 +25805,11 @@ glabel var7f1adc74pf /* f0a5d74: 00000000 */ nop /* f0a5d78: 4500001a */ bc1f .PB0f0a5de4 /* f0a5d7c: 00000000 */ nop -/* f0a5d80: 0fc2d6fe */ jal 0xf0b5bf8 +/* f0a5d80: 0fc2d6fe */ jal currentPlayerGetScreenHeight /* f0a5d84: 00000000 */ nop -/* f0a5d88: 0fc2d706 */ jal 0xf0b5c18 +/* f0a5d88: 0fc2d706 */ jal currentPlayerGetScreenTop /* f0a5d8c: e7a00064 */ swc1 $f0,0x64($sp) -/* f0a5d90: 0fc2d6fe */ jal 0xf0b5bf8 +/* f0a5d90: 0fc2d6fe */ jal currentPlayerGetScreenHeight /* f0a5d94: e7a00068 */ swc1 $f0,0x68($sp) /* f0a5d98: 3c013f00 */ lui $at,0x3f00 /* f0a5d9c: 44819000 */ mtc1 $at,$f18 @@ -25831,11 +25831,11 @@ glabel var7f1adc74pf /* f0a5ddc: 10000019 */ b .PB0f0a5e44 /* f0a5de0: e6100770 */ swc1 $f16,0x770($s0) .PB0f0a5de4: -/* f0a5de4: 0fc2d6fe */ jal 0xf0b5bf8 +/* f0a5de4: 0fc2d6fe */ jal currentPlayerGetScreenHeight /* f0a5de8: 00000000 */ nop -/* f0a5dec: 0fc2d706 */ jal 0xf0b5c18 +/* f0a5dec: 0fc2d706 */ jal currentPlayerGetScreenTop /* f0a5df0: e7a00064 */ swc1 $f0,0x64($sp) -/* f0a5df4: 0fc2d6fe */ jal 0xf0b5bf8 +/* f0a5df4: 0fc2d6fe */ jal currentPlayerGetScreenHeight /* f0a5df8: e7a00068 */ swc1 $f0,0x68($sp) /* f0a5dfc: 3c013f00 */ lui $at,0x3f00 /* f0a5e00: 44814000 */ mtc1 $at,$f8 @@ -25867,12 +25867,12 @@ glabel var7f1adc74pf /* f0a5e64: e7a6027c */ swc1 $f6,0x27c($sp) /* f0a5e68: e7aa0280 */ swc1 $f10,0x280($sp) /* f0a5e6c: a2090007 */ sb $t1,0x7($s0) -/* f0a5e70: 0fc2c6f4 */ jal 0xf0b1bd0 +/* f0a5e70: 0fc2c6f4 */ jal weaponHasFlag /* f0a5e74: 8fa401cc */ lw $a0,0x1cc($sp) /* f0a5e78: 50400018 */ beqzl $v0,.PB0f0a5edc /* f0a5e7c: a2000007 */ sb $zero,0x7($s0) /* f0a5e80: 8fa401cc */ lw $a0,0x1cc($sp) -/* f0a5e84: 0fc2c6f4 */ jal 0xf0b1bd0 +/* f0a5e84: 0fc2c6f4 */ jal weaponHasFlag /* f0a5e88: 24050080 */ li $a1,0x80 /* f0a5e8c: 54400013 */ bnezl $v0,.PB0f0a5edc /* f0a5e90: a2000007 */ sb $zero,0x7($s0) @@ -25882,14 +25882,14 @@ glabel var7f1adc74pf /* f0a5ea0: 24010007 */ li $at,0x7 /* f0a5ea4: 5041000d */ beql $v0,$at,.PB0f0a5edc /* f0a5ea8: a2000007 */ sb $zero,0x7($s0) -/* f0a5eac: 0fc277e0 */ jal 0xf09df80 +/* f0a5eac: 0fc277e0 */ jal bgun0f09dd7c /* f0a5eb0: 00000000 */ nop /* f0a5eb4: 50400009 */ beqzl $v0,.PB0f0a5edc /* f0a5eb8: a2000007 */ sb $zero,0x7($s0) /* f0a5ebc: 820d0008 */ lb $t5,0x8($s0) /* f0a5ec0: 51a00006 */ beqzl $t5,.PB0f0a5edc /* f0a5ec4: a2000007 */ sb $zero,0x7($s0) -/* f0a5ec8: 0fc277f4 */ jal 0xf09dfd0 +/* f0a5ec8: 0fc277f4 */ jal bgunGetGunMemType /* f0a5ecc: 00000000 */ nop /* f0a5ed0: 54400003 */ bnezl $v0,.PB0f0a5ee0 /* f0a5ed4: 820c0007 */ lb $t4,0x7($s0) @@ -25905,11 +25905,11 @@ glabel var7f1adc74pf /* f0a5ef0: 8444000e */ lh $a0,0xe($v0) /* f0a5ef4: afa20288 */ sw $v0,0x288($sp) /* f0a5ef8: 00045980 */ sll $t3,$a0,0x6 -/* f0a5efc: 0fc5a419 */ jal 0xf169064 +/* f0a5efc: 0fc5a419 */ jal gfxAllocate /* f0a5f00: 01602025 */ move $a0,$t3 /* f0a5f04: afa2030c */ sw $v0,0x30c($sp) /* f0a5f08: 8fa401cc */ lw $a0,0x1cc($sp) -/* f0a5f0c: 0fc2c6f4 */ jal 0xf0b1bd0 +/* f0a5f0c: 0fc2c6f4 */ jal weaponHasFlag /* f0a5f10: 3c050200 */ lui $a1,0x200 /* f0a5f14: 10400012 */ beqz $v0,.PB0f0a5f60 /* f0a5f18: 8fb90288 */ lw $t9,0x288($sp) @@ -25920,7 +25920,7 @@ glabel var7f1adc74pf /* f0a5f2c: 00000000 */ nop /* f0a5f30: afa201d0 */ sw $v0,0x1d0($sp) .PB0f0a5f34: -/* f0a5f34: 0c005900 */ jal 0x16400 +/* f0a5f34: 0c005900 */ jal mtx4LoadIdentity /* f0a5f38: afa4004c */ sw $a0,0x4c($sp) /* f0a5f3c: 8fae0288 */ lw $t6,0x288($sp) /* f0a5f40: 8fa201d0 */ lw $v0,0x1d0($sp) @@ -25932,27 +25932,27 @@ glabel var7f1adc74pf /* f0a5f58: 5420fff6 */ bnezl $at,.PB0f0a5f34 /* f0a5f5c: afa201d0 */ sw $v0,0x1d0($sp) .PB0f0a5f60: -/* f0a5f60: 0fc28c0b */ jal 0xf0a302c +/* f0a5f60: 0fc28c0b */ jal bgun0f0a2da8 /* f0a5f64: 8e040794 */ lw $a0,0x794($s0) /* f0a5f68: 8fa901e0 */ lw $t1,0x1e0($sp) /* f0a5f6c: 8d2d1594 */ lw $t5,0x1594($t1) /* f0a5f70: 51a00004 */ beqzl $t5,.PB0f0a5f84 /* f0a5f74: 02002025 */ move $a0,$s0 -/* f0a5f78: 0fc28c0b */ jal 0xf0a302c +/* f0a5f78: 0fc28c0b */ jal bgun0f0a2da8 /* f0a5f7c: 8e040798 */ lw $a0,0x798($s0) /* f0a5f80: 02002025 */ move $a0,$s0 .PB0f0a5f84: -/* f0a5f84: 0fc25fa8 */ jal 0xf097ea0 +/* f0a5f84: 0fc25fa8 */ jal bgun0f098030 /* f0a5f88: 8fa50288 */ lw $a1,0x288($sp) /* f0a5f8c: 8fa401cc */ lw $a0,0x1cc($sp) -/* f0a5f90: 0fc2c6f4 */ jal 0xf0b1bd0 +/* f0a5f90: 0fc2c6f4 */ jal weaponHasFlag /* f0a5f94: 24052000 */ li $a1,0x2000 /* f0a5f98: 10400003 */ beqz $v0,.PB0f0a5fa8 /* f0a5f9c: 02002025 */ move $a0,$s0 -/* f0a5fa0: 0fc26016 */ jal 0xf098058 +/* f0a5fa0: 0fc26016 */ jal bgun0f0981e8 /* f0a5fa4: 8fa50288 */ lw $a1,0x288($sp) .PB0f0a5fa8: -/* f0a5fa8: 0c005900 */ jal 0x16400 +/* f0a5fa8: 0c005900 */ jal mtx4LoadIdentity /* f0a5fac: 27a4023c */ addiu $a0,$sp,0x23c /* f0a5fb0: 3c08800a */ lui $t0,0x800a /* f0a5fb4: 2508e4d0 */ addiu $t0,$t0,-6960 @@ -25995,7 +25995,7 @@ glabel var7f1adc74pf /* f0a6038: 8fa401cc */ lw $a0,0x1cc($sp) /* f0a603c: 5121000e */ beql $t1,$at,.PB0f0a6078 /* f0a6040: 8e0a00b4 */ lw $t2,0xb4($s0) -/* f0a6044: 0fc2c6f4 */ jal 0xf0b1bd0 +/* f0a6044: 0fc2c6f4 */ jal weaponHasFlag /* f0a6048: 3c050008 */ lui $a1,0x8 /* f0a604c: 10400009 */ beqz $v0,.PB0f0a6074 /* f0a6050: 02002025 */ move $a0,$s0 @@ -26005,7 +26005,7 @@ glabel var7f1adc74pf /* f0a6060: afad0010 */ sw $t5,0x10($sp) /* f0a6064: 8fa50310 */ lw $a1,0x310($sp) /* f0a6068: 27a6027c */ addiu $a2,$sp,0x27c -/* f0a606c: 0fc28cf9 */ jal 0xf0a33e4 +/* f0a606c: 0fc28cf9 */ jal bgun0f0a3160 /* f0a6070: 8fa701d8 */ lw $a3,0x1d8($sp) .PB0f0a6074: /* f0a6074: 8e0a00b4 */ lw $t2,0xb4($s0) @@ -26025,7 +26025,7 @@ glabel var7f1adc74pf /* f0a60a8: e7aa0280 */ swc1 $f10,0x280($sp) /* f0a60ac: c61000ac */ lwc1 $f16,0xac($s0) /* f0a60b0: 46109100 */ add.s $f4,$f18,$f16 -/* f0a60b4: 0c00598c */ jal 0x16630 +/* f0a60b4: 0c00598c */ jal mtx00015be0 /* f0a60b8: e7a40284 */ swc1 $f4,0x284($sp) /* f0a60bc: 44800000 */ mtc1 $zero,$f0 /* f0a60c0: 00000000 */ nop @@ -26056,10 +26056,10 @@ glabel var7f1adc74pf /* f0a611c: c61000d4 */ lwc1 $f16,0xd4($s0) /* f0a6120: e7b00020 */ swc1 $f16,0x20($sp) /* f0a6124: c60400d8 */ lwc1 $f4,0xd8($s0) -/* f0a6128: 0c005dea */ jal 0x177a8 +/* f0a6128: 0c005dea */ jal mtx00016d58 /* f0a612c: e7a40024 */ swc1 $f4,0x24($sp) /* f0a6130: 27a4028c */ addiu $a0,$sp,0x28c -/* f0a6134: 0c00598c */ jal 0x16630 +/* f0a6134: 0c00598c */ jal mtx00015be0 /* f0a6138: 27a5023c */ addiu $a1,$sp,0x23c /* f0a613c: 44800000 */ mtc1 $zero,$f0 /* f0a6140: 3c017f1b */ lui $at,0x7f1b @@ -26068,24 +26068,24 @@ glabel var7f1adc74pf /* f0a614c: 27a5016c */ addiu $a1,$sp,0x16c /* f0a6150: e7a001ac */ swc1 $f0,0x1ac($sp) /* f0a6154: e7a001b4 */ swc1 $f0,0x1b4($sp) -/* f0a6158: 0c005bb7 */ jal 0x16edc +/* f0a6158: 0c005bb7 */ jal mtx4LoadRotation /* f0a615c: e7a601b0 */ swc1 $f6,0x1b0($sp) /* f0a6160: 44804000 */ mtc1 $zero,$f8 /* f0a6164: 27a40120 */ addiu $a0,$sp,0x120 /* f0a6168: 8fa50310 */ lw $a1,0x310($sp) -/* f0a616c: 0fc289dd */ jal 0xf0a2774 +/* f0a616c: 0fc289dd */ jal bgun0f0a24f0 /* f0a6170: e7a801b0 */ swc1 $f8,0x1b0($sp) /* f0a6174: c7ac0120 */ lwc1 $f12,0x120($sp) /* f0a6178: c7ae0128 */ lwc1 $f14,0x128($sp) /* f0a617c: 8fa6027c */ lw $a2,0x27c($sp) -/* f0a6180: 0fc289c7 */ jal 0xf0a271c +/* f0a6180: 0fc289c7 */ jal bgun0f0a2498 /* f0a6184: 8fa70284 */ lw $a3,0x284($sp) /* f0a6188: 46000287 */ neg.s $f10,$f0 /* f0a618c: c7ac0124 */ lwc1 $f12,0x124($sp) /* f0a6190: e7aa01b0 */ swc1 $f10,0x1b0($sp) /* f0a6194: c7ae0128 */ lwc1 $f14,0x128($sp) /* f0a6198: 8fa60280 */ lw $a2,0x280($sp) -/* f0a619c: 0fc289c7 */ jal 0xf0a271c +/* f0a619c: 0fc289c7 */ jal bgun0f0a2498 /* f0a61a0: 8fa70284 */ lw $a3,0x284($sp) /* f0a61a4: e7a001ac */ swc1 $f0,0x1ac($sp) /* f0a61a8: c7b201ac */ lwc1 $f18,0x1ac($sp) @@ -26093,41 +26093,41 @@ glabel var7f1adc74pf /* f0a61b0: 27a5012c */ addiu $a1,$sp,0x12c /* f0a61b4: e6120234 */ swc1 $f18,0x234($s0) /* f0a61b8: c7b001b0 */ lwc1 $f16,0x1b0($sp) -/* f0a61bc: 0c005bb7 */ jal 0x16edc +/* f0a61bc: 0c005bb7 */ jal mtx4LoadRotation /* f0a61c0: e6100238 */ swc1 $f16,0x238($s0) /* f0a61c4: 27a4012c */ addiu $a0,$sp,0x12c /* f0a61c8: 27a5016c */ addiu $a1,$sp,0x16c -/* f0a61cc: 0c005914 */ jal 0x16450 +/* f0a61cc: 0c005914 */ jal mtx4MultMtx4 /* f0a61d0: 27a6028c */ addiu $a2,$sp,0x28c /* f0a61d4: 27a4028c */ addiu $a0,$sp,0x28c -/* f0a61d8: 0c005913 */ jal 0x1644c +/* f0a61d8: 0c005913 */ jal mtx4MultMtx4InPlace /* f0a61dc: 27a5023c */ addiu $a1,$sp,0x23c /* f0a61e0: 27a4023c */ addiu $a0,$sp,0x23c -/* f0a61e4: 0c0059da */ jal 0x16768 +/* f0a61e4: 0c0059da */ jal mtx4Copy /* f0a61e8: 27a502cc */ addiu $a1,$sp,0x2cc /* f0a61ec: 27a4027c */ addiu $a0,$sp,0x27c -/* f0a61f0: 0c005a09 */ jal 0x16824 +/* f0a61f0: 0c005a09 */ jal mtx4SetTranslation /* f0a61f4: 27a502cc */ addiu $a1,$sp,0x2cc /* f0a61f8: 260502b4 */ addiu $a1,$s0,0x2b4 /* f0a61fc: afa5004c */ sw $a1,0x4c($sp) -/* f0a6200: 0c0059da */ jal 0x16768 +/* f0a6200: 0c0059da */ jal mtx4Copy /* f0a6204: 27a402cc */ addiu $a0,$sp,0x2cc /* f0a6208: 260402f4 */ addiu $a0,$s0,0x2f4 /* f0a620c: afa40044 */ sw $a0,0x44($sp) -/* f0a6210: 0c0059da */ jal 0x16768 +/* f0a6210: 0c0059da */ jal mtx4Copy /* f0a6214: 26050334 */ addiu $a1,$s0,0x334 -/* f0a6218: 0fc2d6e2 */ jal 0xf0b5b88 +/* f0a6218: 0fc2d6e2 */ jal currentPlayerGetUnk174c /* f0a621c: 00000000 */ nop /* f0a6220: 00402025 */ move $a0,$v0 /* f0a6224: 8fa5004c */ lw $a1,0x4c($sp) -/* f0a6228: 0c00598d */ jal 0x16634 +/* f0a6228: 0c00598d */ jal mtx00015be4 /* f0a622c: 8fa60044 */ lw $a2,0x44($sp) /* f0a6230: 820b0007 */ lb $t3,0x7($s0) /* f0a6234: 1160020f */ beqz $t3,.PB0f0a6a74 /* f0a6238: 2405005a */ li $a1,0x5a /* f0a623c: 8fa40288 */ lw $a0,0x288($sp) .PB0f0a6240: -/* f0a6240: 0c006cdb */ jal 0x1b36c +/* f0a6240: 0c006cdb */ jal modelGetPart /* f0a6244: afa5011c */ sw $a1,0x11c($sp) /* f0a6248: 1040000c */ beqz $v0,.PB0f0a627c /* f0a624c: 8fa5011c */ lw $a1,0x11c($sp) @@ -26151,7 +26151,7 @@ glabel var7f1adc74pf /* f0a6290: 24050020 */ li $a1,0x20 /* f0a6294: ae020390 */ sw $v0,0x390($s0) /* f0a6298: ae020540 */ sw $v0,0x540($s0) -/* f0a629c: 0fc2c6f4 */ jal 0xf0b1bd0 +/* f0a629c: 0fc2c6f4 */ jal weaponHasFlag /* f0a62a0: 8fa401cc */ lw $a0,0x1cc($sp) /* f0a62a4: 10400008 */ beqz $v0,.PB0f0a62c8 /* f0a62a8: 00000000 */ nop @@ -26160,15 +26160,15 @@ glabel var7f1adc74pf /* f0a62b4: 15610004 */ bne $t3,$at,.PB0f0a62c8 /* f0a62b8: 3c01bf80 */ lui $at,0xbf80 /* f0a62bc: 44816000 */ mtc1 $at,$f12 -/* f0a62c0: 0c005a1d */ jal 0x16874 +/* f0a62c0: 0c005a1d */ jal mtx00015e24 /* f0a62c4: 27a502cc */ addiu $a1,$sp,0x2cc .PB0f0a62c8: /* f0a62c8: 3c017f1b */ lui $at,0x7f1b /* f0a62cc: c42ce638 */ lwc1 $f12,-0x19c8($at) -/* f0a62d0: 0c005a55 */ jal 0x16954 +/* f0a62d0: 0c005a55 */ jal mtx00015f04 /* f0a62d4: 27a502cc */ addiu $a1,$sp,0x2cc /* f0a62d8: 27a402cc */ addiu $a0,$sp,0x2cc -/* f0a62dc: 0c0059da */ jal 0x16768 +/* f0a62dc: 0c0059da */ jal mtx4Copy /* f0a62e0: 8fa5030c */ lw $a1,0x30c($sp) /* f0a62e4: 8e190690 */ lw $t9,0x690($s0) /* f0a62e8: 0019c0c0 */ sll $t8,$t9,0x3 @@ -26209,7 +26209,7 @@ glabel var7f1adc74pf /* f0a6368: 19400005 */ blez $t2,.PB0f0a6380 /* f0a636c: 02002025 */ move $a0,$s0 /* f0a6370: 8fa50288 */ lw $a1,0x288($sp) -/* f0a6374: 0fc29215 */ jal 0xf0a4854 +/* f0a6374: 0fc29215 */ jal bgun0f0a45d0 /* f0a6378: 8fa601c0 */ lw $a2,0x1c0($sp) /* f0a637c: 8fa801cc */ lw $t0,0x1cc($sp) .PB0f0a6380: @@ -26227,13 +26227,13 @@ glabel var7f1adc74pf /* f0a63ac: 2401001d */ li $at,0x1d /* f0a63b0: 15010009 */ bne $t0,$at,.PB0f0a63d8 /* f0a63b4: 00000000 */ nop -/* f0a63b8: 0fc2916e */ jal 0xf0a45b8 +/* f0a63b8: 0fc2916e */ jal bgun0f0a4334 /* f0a63bc: 02002025 */ move $a0,$s0 /* f0a63c0: 10000005 */ b .PB0f0a63d8 /* f0a63c4: 8fa801cc */ lw $t0,0x1cc($sp) .PB0f0a63c8: /* f0a63c8: 02002025 */ move $a0,$s0 -/* f0a63cc: 0fc28f4a */ jal 0xf0a3d28 +/* f0a63cc: 0fc28f4a */ jal bgun0f0a3aa4 /* f0a63d0: 8fa50288 */ lw $a1,0x288($sp) /* f0a63d4: 8fa801cc */ lw $t0,0x1cc($sp) .PB0f0a63d8: @@ -26327,7 +26327,7 @@ glabel var7f1adc74pf /* f0a6510: afa40054 */ sw $a0,0x54($sp) .PB0f0a6514: /* f0a6514: afa50118 */ sw $a1,0x118($sp) -/* f0a6518: 0c0076f3 */ jal 0x1dbcc +/* f0a6518: 0c0076f3 */ jal modelGetAnimNum /* f0a651c: afa700d4 */ sw $a3,0xd4($sp) /* f0a6520: 284100e5 */ slti $at,$v0,0xe5 /* f0a6524: 8fa50118 */ lw $a1,0x118($sp) @@ -26381,7 +26381,7 @@ glabel var7f1adc74pf /* f0a65d0: 8d2a0dd4 */ lw $t2,0xdd4($t1) /* f0a65d4: 55410022 */ bnel $t2,$at,.PB0f0a6660 /* f0a65d8: 8e0a038c */ lw $t2,0x38c($s0) -/* f0a65dc: 0c005900 */ jal 0x16400 +/* f0a65dc: 0c005900 */ jal mtx4LoadIdentity /* f0a65e0: afa700d4 */ sw $a3,0xd4($sp) /* f0a65e4: 8fb901e0 */ lw $t9,0x1e0($sp) /* f0a65e8: 8e060390 */ lw $a2,0x390($s0) @@ -26401,7 +26401,7 @@ glabel var7f1adc74pf /* f0a661c: 27a400d8 */ addiu $a0,$sp,0xd8 /* f0a6620: 8fa50054 */ lw $a1,0x54($sp) /* f0a6624: afa600c8 */ sw $a2,0xc8($sp) -/* f0a6628: 0c007653 */ jal 0x1d94c +/* f0a6628: 0c007653 */ jal model0001cebc /* f0a662c: afa700d4 */ sw $a3,0xd4($sp) /* f0a6630: 8fa700d4 */ lw $a3,0xd4($sp) /* f0a6634: 3c018006 */ lui $at,0x8006 @@ -26427,7 +26427,7 @@ glabel var7f1adc74pf .PB0f0a667c: /* f0a667c: afa200d0 */ sw $v0,0xd0($sp) /* f0a6680: afa500cc */ sw $a1,0xcc($sp) -/* f0a6684: 0c00598d */ jal 0x16634 +/* f0a6684: 0c00598d */ jal mtx00015be4 /* f0a6688: afa600c8 */ sw $a2,0xc8($sp) /* f0a668c: 8fb901dc */ lw $t9,0x1dc($sp) /* f0a6690: 8fa200d0 */ lw $v0,0xd0($sp) @@ -26453,7 +26453,7 @@ glabel var7f1adc74pf .PB0f0a66dc: /* f0a66dc: 27a400d8 */ addiu $a0,$sp,0xd8 /* f0a66e0: 8fa50054 */ lw $a1,0x54($sp) -/* f0a66e4: 0c007653 */ jal 0x1d94c +/* f0a66e4: 0c007653 */ jal model0001cebc /* f0a66e8: afa700d4 */ sw $a3,0xd4($sp) /* f0a66ec: 8fa700d4 */ lw $a3,0xd4($sp) /* f0a66f0: 3c018006 */ lui $at,0x8006 @@ -26465,14 +26465,14 @@ glabel var7f1adc74pf /* f0a6704: 3c018006 */ lui $at,0x8006 /* f0a6708: ac200664 */ sw $zero,0x664($at) /* f0a670c: 8fa40288 */ lw $a0,0x288($sp) -/* f0a6710: 0c006cdb */ jal 0x1b36c +/* f0a6710: 0c006cdb */ jal modelGetPart /* f0a6714: 24050033 */ li $a1,0x33 /* f0a6718: 10400020 */ beqz $v0,.PB0f0a679c /* f0a671c: 00402025 */ move $a0,$v0 -/* f0a6720: 0c006bdd */ jal 0x1af74 +/* f0a6720: 0c006bdd */ jal model0001a524 /* f0a6724: 00002825 */ move $a1,$zero /* f0a6728: afa20084 */ sw $v0,0x84($sp) -/* f0a672c: 0fc28970 */ jal 0xf0a25c0 +/* f0a672c: 0fc28970 */ jal bgun0f0a233c /* f0a6730: 8fa40310 */ lw $a0,0x310($sp) /* f0a6734: 44800000 */ mtc1 $zero,$f0 /* f0a6738: 8fa90084 */ lw $t1,0x84($sp) @@ -26485,7 +26485,7 @@ glabel var7f1adc74pf /* f0a6754: 46002187 */ neg.s $f6,$f4 /* f0a6758: afa40054 */ sw $a0,0x54($sp) /* f0a675c: e7a60080 */ swc1 $f6,0x80($sp) -/* f0a6760: 0c005958 */ jal 0x16560 +/* f0a6760: 0c005958 */ jal mtx4RotateVecInPlace /* f0a6764: 27a50078 */ addiu $a1,$sp,0x78 /* f0a6768: 8fa40054 */ lw $a0,0x54($sp) /* f0a676c: c7aa0078 */ lwc1 $f10,0x78($sp) @@ -26531,22 +26531,22 @@ glabel var7f1adc74pf /* f0a67fc: 1000000d */ b .PB0f0a6834 /* f0a6800: 8fa40288 */ lw $a0,0x288($sp) .PB0f0a6804: -/* f0a6804: 0fc2904c */ jal 0xf0a4130 +/* f0a6804: 0fc2904c */ jal bgun0f0a3eac /* f0a6808: 8fa5030c */ lw $a1,0x30c($sp) /* f0a680c: 10000009 */ b .PB0f0a6834 /* f0a6810: 8fa40288 */ lw $a0,0x288($sp) .PB0f0a6814: /* f0a6814: 8fa5030c */ lw $a1,0x30c($sp) -/* f0a6818: 0fc290c6 */ jal 0xf0a4318 +/* f0a6818: 0fc290c6 */ jal bgun0f0a4094 /* f0a681c: 8fa60288 */ lw $a2,0x288($sp) /* f0a6820: 10000004 */ b .PB0f0a6834 /* f0a6824: 8fa40288 */ lw $a0,0x288($sp) .PB0f0a6828: -/* f0a6828: 0fc29108 */ jal 0xf0a4420 +/* f0a6828: 0fc29108 */ jal bgun0f0a419c /* f0a682c: 8fa70288 */ lw $a3,0x288($sp) /* f0a6830: 8fa40288 */ lw $a0,0x288($sp) .PB0f0a6834: -/* f0a6834: 0c006cdb */ jal 0x1b36c +/* f0a6834: 0c006cdb */ jal modelGetPart /* f0a6838: 24050032 */ li $a1,0x32 /* f0a683c: 8fad01cc */ lw $t5,0x1cc($sp) /* f0a6840: 24010014 */ li $at,0x14 @@ -26567,7 +26567,7 @@ glabel var7f1adc74pf /* f0a6878: 00a1001a */ div $zero,$a1,$at /* f0a687c: 00004810 */ mfhi $t1 /* f0a6880: 2525001e */ addiu $a1,$t1,0x1e -/* f0a6884: 0c006cdb */ jal 0x1b36c +/* f0a6884: 0c006cdb */ jal modelGetPart /* f0a6888: 00000000 */ nop /* f0a688c: 1000000a */ b .PB0f0a68b8 /* f0a6890: 00402025 */ move $a0,$v0 @@ -26578,13 +26578,13 @@ glabel var7f1adc74pf /* f0a68a0: 00a1001a */ div $zero,$a1,$at /* f0a68a4: 00006010 */ mfhi $t4 /* f0a68a8: 2585001e */ addiu $a1,$t4,0x1e -/* f0a68ac: 0c006cdb */ jal 0x1b36c +/* f0a68ac: 0c006cdb */ jal modelGetPart /* f0a68b0: 00000000 */ nop /* f0a68b4: 00402025 */ move $a0,$v0 .PB0f0a68b8: /* f0a68b8: 10400038 */ beqz $v0,.PB0f0a699c /* f0a68bc: 8fad01cc */ lw $t5,0x1cc($sp) -/* f0a68c0: 0c006bdd */ jal 0x1af74 +/* f0a68c0: 0c006bdd */ jal model0001a524 /* f0a68c4: 00002825 */ move $a1,$zero /* f0a68c8: 8faa030c */ lw $t2,0x30c($sp) /* f0a68cc: 00025980 */ sll $t3,$v0,0x6 @@ -26596,12 +26596,12 @@ glabel var7f1adc74pf /* f0a68e4: c4840034 */ lwc1 $f4,0x34($a0) /* f0a68e8: e6040378 */ swc1 $f4,0x378($s0) /* f0a68ec: c4860038 */ lwc1 $f6,0x38($a0) -/* f0a68f0: 0c0059da */ jal 0x16768 +/* f0a68f0: 0c0059da */ jal mtx4Copy /* f0a68f4: e606037c */ swc1 $f6,0x37c($s0) -/* f0a68f8: 0fc2d6e2 */ jal 0xf0b5b88 +/* f0a68f8: 0fc2d6e2 */ jal currentPlayerGetUnk174c /* f0a68fc: 00000000 */ nop /* f0a6900: 00402025 */ move $a0,$v0 -/* f0a6904: 0c00596d */ jal 0x165b4 +/* f0a6904: 0c00596d */ jal mtx4TransformVecInPlace /* f0a6908: 26050374 */ addiu $a1,$s0,0x374 /* f0a690c: 8fa20070 */ lw $v0,0x70($sp) /* f0a6910: 8fb9030c */ lw $t9,0x30c($sp) @@ -26635,7 +26635,7 @@ glabel var7f1adc74pf /* f0a6980: afb80010 */ sw $t8,0x10($sp) /* f0a6984: afa90018 */ sw $t1,0x18($sp) /* f0a6988: afa20020 */ sw $v0,0x20($sp) -/* f0a698c: 0fc2942b */ jal 0xf0a50ac +/* f0a698c: 0fc2942b */ jal bgun0f0a4e44 /* f0a6990: afaa0014 */ sw $t2,0x14($sp) /* f0a6994: 10000044 */ b .PB0f0a6aa8 /* f0a6998: 8fb901cc */ lw $t9,0x1cc($sp) @@ -26653,10 +26653,10 @@ glabel var7f1adc74pf /* f0a69c4: 15a1001f */ bne $t5,$at,.PB0f0a6a44 /* f0a69c8: 26050620 */ addiu $a1,$s0,0x620 .PB0f0a69cc: -/* f0a69cc: 0c006cdb */ jal 0x1b36c +/* f0a69cc: 0c006cdb */ jal modelGetPart /* f0a69d0: 24050037 */ li $a1,0x37 /* f0a69d4: 00402025 */ move $a0,$v0 -/* f0a69d8: 0c006bdd */ jal 0x1af74 +/* f0a69d8: 0c006bdd */ jal model0001a524 /* f0a69dc: 00002825 */ move $a1,$zero /* f0a69e0: 8fae030c */ lw $t6,0x30c($sp) /* f0a69e4: 00026180 */ sll $t4,$v0,0x6 @@ -26668,12 +26668,12 @@ glabel var7f1adc74pf /* f0a69fc: c4900034 */ lwc1 $f16,0x34($a0) /* f0a6a00: e6100378 */ swc1 $f16,0x378($s0) /* f0a6a04: c4840038 */ lwc1 $f4,0x38($a0) -/* f0a6a08: 0c0059da */ jal 0x16768 +/* f0a6a08: 0c0059da */ jal mtx4Copy /* f0a6a0c: e604037c */ swc1 $f4,0x37c($s0) -/* f0a6a10: 0fc2d6e2 */ jal 0xf0b5b88 +/* f0a6a10: 0fc2d6e2 */ jal currentPlayerGetUnk174c /* f0a6a14: 00000000 */ nop /* f0a6a18: 00402025 */ move $a0,$v0 -/* f0a6a1c: 0c00596d */ jal 0x165b4 +/* f0a6a1c: 0c00596d */ jal mtx4TransformVecInPlace /* f0a6a20: 26050374 */ addiu $a1,$s0,0x374 /* f0a6a24: 8faa0070 */ lw $t2,0x70($sp) /* f0a6a28: 8fb8030c */ lw $t8,0x30c($sp) @@ -26690,7 +26690,7 @@ glabel var7f1adc74pf /* f0a6a50: e60a0374 */ swc1 $f10,0x374($s0) /* f0a6a54: e6120378 */ swc1 $f18,0x378($s0) /* f0a6a58: e610037c */ swc1 $f16,0x37c($s0) -/* f0a6a5c: 0c0059da */ jal 0x16768 +/* f0a6a5c: 0c0059da */ jal mtx4Copy /* f0a6a60: 8fa40044 */ lw $a0,0x44($sp) /* f0a6a64: c60402ec */ lwc1 $f4,0x2ec($s0) /* f0a6a68: 46002187 */ neg.s $f6,$f4 @@ -26704,7 +26704,7 @@ glabel var7f1adc74pf /* f0a6a84: e60a0378 */ swc1 $f10,0x378($s0) /* f0a6a88: e612037c */ swc1 $f18,0x37c($s0) /* f0a6a8c: 8fa40044 */ lw $a0,0x44($sp) -/* f0a6a90: 0c0059da */ jal 0x16768 +/* f0a6a90: 0c0059da */ jal mtx4Copy /* f0a6a94: 26050620 */ addiu $a1,$s0,0x620 /* f0a6a98: c61002ec */ lwc1 $f16,0x2ec($s0) /* f0a6a9c: 46008107 */ neg.s $f4,$f16 @@ -26720,7 +26720,7 @@ glabel var7f1adc74pf /* f0a6abc: 1721000f */ bne $t9,$at,.PB0f0a6afc /* f0a6ac0: 02002025 */ move $a0,$s0 /* f0a6ac4: 8fa50310 */ lw $a1,0x310($sp) -/* f0a6ac8: 0fc291fd */ jal 0xf0a47f4 +/* f0a6ac8: 0fc291fd */ jal bgun0f0a4570 /* f0a6acc: 8fa601d8 */ lw $a2,0x1d8($sp) /* f0a6ad0: 1000000b */ b .PB0f0a6b00 /* f0a6ad4: 820c0004 */ lb $t4,0x4($s0) @@ -26732,7 +26732,7 @@ glabel var7f1adc74pf /* f0a6ae8: 000d7742 */ srl $t6,$t5,0x1d /* f0a6aec: 19c00003 */ blez $t6,.PB0f0a6afc /* f0a6af0: 8fa60288 */ lw $a2,0x288($sp) -/* f0a6af4: 0fc291af */ jal 0xf0a46bc +/* f0a6af4: 0fc291af */ jal bgun0f0a4438 /* f0a6af8: 8fa7030c */ lw $a3,0x30c($sp) .PB0f0a6afc: /* f0a6afc: 820c0004 */ lb $t4,0x4($s0) @@ -26748,7 +26748,7 @@ glabel var7f1adc74pf /* f0a6b20: 8fa9030c */ lw $t1,0x30c($sp) /* f0a6b24: 8fa701cc */ lw $a3,0x1cc($sp) /* f0a6b28: afb80010 */ sw $t8,0x10($sp) -/* f0a6b2c: 0fc2955a */ jal 0xf0a5568 +/* f0a6b2c: 0fc2955a */ jal bgun0f0a5300 /* f0a6b30: afa90014 */ sw $t1,0x14($sp) .PB0f0a6b34: /* f0a6b34: 3c0b800a */ lui $t3,0x800a @@ -26800,7 +26800,7 @@ glabel var7f1adc74pf /* f0a6bd8: 8fa50310 */ lw $a1,0x310($sp) /* f0a6bdc: 11200003 */ beqz $t1,.PB0f0a6bec /* f0a6be0: 8fa601cc */ lw $a2,0x1cc($sp) -/* f0a6be4: 0fc28dc5 */ jal 0xf0a3714 +/* f0a6be4: 0fc28dc5 */ jal bgun0f0a3490 /* f0a6be8: 8fa701d8 */ lw $a3,0x1d8($sp) .PB0f0a6bec: /* f0a6bec: 960b06d6 */ lhu $t3,0x6d6($s0) @@ -26810,7 +26810,7 @@ glabel var7f1adc74pf /* f0a6bf8: 000bcb02 */ srl $t9,$t3,0xc /* f0a6bfc: 1b200003 */ blez $t9,.PB0f0a6c0c /* f0a6c00: 00000000 */ nop -/* f0a6c04: 0fc2924a */ jal 0xf0a4928 +/* f0a6c04: 0fc2924a */ jal bgun0f0a46a4 /* f0a6c08: 8fa601c0 */ lw $a2,0x1c0($sp) .PB0f0a6c0c: /* f0a6c0c: 3c0f800a */ lui $t7,0x800a @@ -26865,12 +26865,12 @@ glabel var7f1adc74pf /* f0a6cb4: 02002025 */ move $a0,$s0 /* f0a6cb8: 8fa50288 */ lw $a1,0x288($sp) /* f0a6cbc: 8fa60310 */ lw $a2,0x310($sp) -/* f0a6cc0: 0fc28e8e */ jal 0xf0a3a38 +/* f0a6cc0: 0fc28e8e */ jal bgun0f0a37b4 /* f0a6cc4: 8fa7030c */ lw $a3,0x30c($sp) /* f0a6cc8: 10000004 */ b .PB0f0a6cdc /* f0a6ccc: 44803000 */ mtc1 $zero,$f6 .PB0f0a6cd0: -/* f0a6cd0: 0fc2c1fa */ jal 0xf0b07e8 +/* f0a6cd0: 0fc2c1fa */ jal lasersightFree /* f0a6cd4: 8fa40310 */ lw $a0,0x310($sp) /* f0a6cd8: 44803000 */ mtc1 $zero,$f6 .PB0f0a6cdc: @@ -33856,7 +33856,7 @@ glabel bgunRenderHudGauge /* f0aa3bc: 8fa500f0 */ lw $a1,0xf0($sp) /* f0aa3c0: 8fa400ec */ lw $a0,0xec($sp) /* f0aa3c4: afb000bc */ sw $s0,0xbc($sp) -/* f0aa3c8: 0fc2a851 */ jal 0xf0aa144 +/* f0aa3c8: 0fc2a851 */ jal bgun0f0a9da8 /* f0aa3cc: 02003025 */ move $a2,$s0 /* f0aa3d0: 2a010015 */ slti $at,$s0,0x15 /* f0aa3d4: 8fa800ec */ lw $t0,0xec($sp) @@ -33941,7 +33941,7 @@ glabel bgunRenderHudGauge /* f0aa4f4: 00d2082a */ slt $at,$a2,$s2 /* f0aa4f8: 1020003e */ beqz $at,.PB0f0aa5f4 /* f0aa4fc: 00000000 */ nop -/* f0aa500: 0fc552fc */ jal 0xf154bf0 +/* f0aa500: 0fc552fc */ jal gfxSetPrimColour /* f0aa504: afa600c4 */ sw $a2,0xc4($sp) /* f0aa508: 8fb90100 */ lw $t9,0x100($sp) /* f0aa50c: 8fa600c4 */ lw $a2,0xc4($sp) @@ -34001,14 +34001,14 @@ glabel bgunRenderHudGauge /* f0aa5e0: 01d96825 */ or $t5,$t6,$t9 /* f0aa5e4: ac4d0004 */ sw $t5,0x4($v0) .PB0f0aa5e8: -/* f0aa5e8: 0fc55313 */ jal 0xf154c4c +/* f0aa5e8: 0fc55313 */ jal func0f153838 /* f0aa5ec: 02202025 */ move $a0,$s1 /* f0aa5f0: 00408825 */ move $s1,$v0 .PB0f0aa5f4: /* f0aa5f4: 3c138008 */ lui $s3,0x8008 /* f0aa5f8: 26731f90 */ addiu $s3,$s3,0x1f90 /* f0aa5fc: 02202025 */ move $a0,$s1 -/* f0aa600: 0fc552fc */ jal 0xf154bf0 +/* f0aa600: 0fc552fc */ jal gfxSetPrimColour /* f0aa604: 8fa500fc */ lw $a1,0xfc($sp) /* f0aa608: 8fb80100 */ lw $t8,0x100($sp) /* f0aa60c: 3c09f600 */ lui $t1,0xf600 @@ -34066,7 +34066,7 @@ glabel bgunRenderHudGauge .PB0f0aa6d8: /* f0aa6d8: 8fa500f8 */ lw $a1,0xf8($sp) /* f0aa6dc: afa600c4 */ sw $a2,0xc4($sp) -/* f0aa6e0: 0fc552fc */ jal 0xf154bf0 +/* f0aa6e0: 0fc552fc */ jal gfxSetPrimColour /* f0aa6e4: e7a000c0 */ swc1 $f0,0xc0($sp) /* f0aa6e8: 8faf00bc */ lw $t7,0xbc($sp) /* f0aa6ec: 8fa600c4 */ lw $a2,0xc4($sp) @@ -34132,7 +34132,7 @@ glabel bgunRenderHudGauge /* f0aa7d8: 240600ff */ li $a2,0xff .PB0f0aa7dc: /* f0aa7dc: 2405ffbf */ li $a1,-65 -/* f0aa7e0: 0fc01a3c */ jal 0xf0068f0 +/* f0aa7e0: 0fc01a3c */ jal colourBlend /* f0aa7e4: afa70048 */ sw $a3,0x48($sp) /* f0aa7e8: 8fa70048 */ lw $a3,0x48($sp) /* f0aa7ec: 8fa800ec */ lw $t0,0xec($sp) @@ -34155,7 +34155,7 @@ glabel bgunRenderHudGauge /* f0aa82c: 240600ff */ li $a2,0xff .PB0f0aa830: /* f0aa830: 8fa500f8 */ lw $a1,0xf8($sp) -/* f0aa834: 0fc01a3c */ jal 0xf0068f0 +/* f0aa834: 0fc01a3c */ jal colourBlend /* f0aa838: afa70048 */ sw $a3,0x48($sp) /* f0aa83c: 8fa70048 */ lw $a3,0x48($sp) /* f0aa840: 8fa800ec */ lw $t0,0xec($sp) @@ -34203,7 +34203,7 @@ glabel bgunRenderHudGauge /* f0aa8dc: 34ae00ff */ ori $t6,$a1,0xff /* f0aa8e0: 01c02825 */ move $a1,$t6 /* f0aa8e4: 8fa400f8 */ lw $a0,0xf8($sp) -/* f0aa8e8: 0fc01a3c */ jal 0xf0068f0 +/* f0aa8e8: 0fc01a3c */ jal colourBlend /* f0aa8ec: afa70048 */ sw $a3,0x48($sp) /* f0aa8f0: 8fa800ec */ lw $t0,0xec($sp) /* f0aa8f4: 8fa70048 */ lw $a3,0x48($sp) @@ -34431,7 +34431,7 @@ glabel bgunRenderHudGauge /* f0aac28: 01af7025 */ or $t6,$t5,$t7 /* f0aac2c: ac4e0004 */ sw $t6,0x4($v0) .PB0f0aac30: -/* f0aac30: 0fc55313 */ jal 0xf154c4c +/* f0aac30: 0fc55313 */ jal func0f153838 /* f0aac34: 02202025 */ move $a0,$s1 /* f0aac38: 3c19b900 */ lui $t9,0xb900 /* f0aac3c: 3c180050 */ lui $t8,0x50 @@ -36592,9 +36592,9 @@ glabel bgunRenderHud /* f0aac8c: 27bdfed0 */ addiu $sp,$sp,-304 /* f0aac90: afbf0034 */ sw $ra,0x34($sp) /* f0aac94: afa40130 */ sw $a0,0x130($sp) -/* f0aac98: 0c002e8f */ jal 0xba3c +/* f0aac98: 0c002e8f */ jal viGetViewTop /* f0aac9c: afae012c */ sw $t6,0x12c($sp) -/* f0aaca0: 0c002e71 */ jal 0xb9c4 +/* f0aaca0: 0c002e71 */ jal viGetViewHeight /* f0aaca4: a7a20076 */ sh $v0,0x76($sp) /* f0aaca8: 87af0076 */ lh $t7,0x76($sp) /* f0aacac: 3c08800a */ lui $t0,0x800a @@ -36644,7 +36644,7 @@ glabel bgunRenderHud /* f0aad48: afae0108 */ sw $t6,0x108($sp) /* f0aad4c: afaf0104 */ sw $t7,0x104($sp) /* f0aad50: 83041580 */ lb $a0,0x1580($t8) -/* f0aad54: 0fc2c4f8 */ jal 0xf0b13e0 +/* f0aad54: 0fc2c4f8 */ jal weaponFindById /* f0aad58: afa70060 */ sw $a3,0x60($sp) /* f0aad5c: 8fb9012c */ lw $t9,0x12c($sp) /* f0aad60: afa200fc */ sw $v0,0xfc($sp) @@ -36674,7 +36674,7 @@ glabel bgunRenderHud .PB0f0aadb8: /* f0aadb8: 3c018008 */ lui $at,0x8008 /* f0aadbc: ac2f1f90 */ sw $t7,0x1f90($at) -/* f0aadc0: 0fc5528f */ jal 0xf154a3c +/* f0aadc0: 0fc5528f */ jal func0f153628 /* f0aadc4: 8fa40130 */ lw $a0,0x130($sp) /* f0aadc8: 8fb80060 */ lw $t8,0x60($sp) /* f0aadcc: afa20130 */ sw $v0,0x130($sp) @@ -36693,7 +36693,7 @@ glabel bgunRenderHud /* f0aae00: 24010001 */ li $at,0x1 /* f0aae04: 53210009 */ beql $t9,$at,.PB0f0aae2c /* f0aae08: 8faf0128 */ lw $t7,0x128($sp) -/* f0aae0c: 0fc550b9 */ jal 0xf1542e4 +/* f0aae0c: 0fc550b9 */ jal optionsGetScreenSplit /* f0aae10: 00000000 */ nop /* f0aae14: 24010001 */ li $at,0x1 /* f0aae18: 10410007 */ beq $v0,$at,.PB0f0aae38 @@ -36728,7 +36728,7 @@ glabel bgunRenderHud /* f0aae78: 10000007 */ b .PB0f0aae98 /* f0aae7c: afb80128 */ sw $t8,0x128($sp) .PB0f0aae80: -/* f0aae80: 0fc5504c */ jal 0xf154130 +/* f0aae80: 0fc5504c */ jal optionsGetEffectiveScreenSize /* f0aae84: 00000000 */ nop /* f0aae88: 10400003 */ beqz $v0,.PB0f0aae98 /* f0aae8c: 8fb90128 */ lw $t9,0x128($sp) @@ -36753,23 +36753,23 @@ glabel bgunRenderHud /* f0aaed4: afa2005c */ sw $v0,0x5c($sp) /* f0aaed8: 27a400dc */ addiu $a0,$sp,0xdc /* f0aaedc: 00002825 */ move $a1,$zero -/* f0aaee0: 0fc26307 */ jal 0xf098c1c +/* f0aaee0: 0fc26307 */ jal bgunGetWeaponInfo /* f0aaee4: afb800f0 */ sw $t8,0xf0($sp) -/* f0aaee8: 0fc2a406 */ jal 0xf0a9018 +/* f0aaee8: 0fc2a406 */ jal bgunIsUsingSecondaryFunction /* f0aaeec: 00000000 */ nop /* f0aaef0: afa200e8 */ sw $v0,0xe8($sp) /* f0aaef4: 00402025 */ move $a0,$v0 /* f0aaef8: 27a500dc */ addiu $a1,$sp,0xdc -/* f0aaefc: 0fc2631c */ jal 0xf098c70 +/* f0aaefc: 0fc2631c */ jal bgun0f098ca0 /* f0aaf00: 8fa6005c */ lw $a2,0x5c($sp) /* f0aaf04: 04400003 */ bltz $v0,.PB0f0aaf14 /* f0aaf08: 00000000 */ nop /* f0aaf0c: 8fb800e8 */ lw $t8,0xe8($sp) /* f0aaf10: afb800f0 */ sw $t8,0xf0($sp) .PB0f0aaf14: -/* f0aaf14: 0c002e8b */ jal 0xba2c +/* f0aaf14: 0c002e8b */ jal viGetViewLeft /* f0aaf18: 00000000 */ nop -/* f0aaf1c: 0c002e6d */ jal 0xb9b4 +/* f0aaf1c: 0c002e6d */ jal viGetViewWidth /* f0aaf20: a7a20076 */ sh $v0,0x76($sp) /* f0aaf24: 87b90076 */ lh $t9,0x76($sp) /* f0aaf28: 3c0f8008 */ lui $t7,0x8008 @@ -36795,7 +36795,7 @@ glabel bgunRenderHud /* f0aaf70: 24010002 */ li $at,0x2 /* f0aaf74: 1701000f */ bne $t8,$at,.PB0f0aafb4 /* f0aaf78: afaf0100 */ sw $t7,0x100($sp) -/* f0aaf7c: 0fc550b9 */ jal 0xf1542e4 +/* f0aaf7c: 0fc550b9 */ jal optionsGetScreenSplit /* f0aaf80: 00000000 */ nop /* f0aaf84: 24070001 */ li $a3,0x1 /* f0aaf88: 10e20004 */ beq $a3,$v0,.PB0f0aaf9c @@ -36875,7 +36875,7 @@ glabel bgunRenderHud .PB0f0ab08c: /* f0ab08c: 8fa40130 */ lw $a0,0x130($sp) /* f0ab090: 8fa500f4 */ lw $a1,0xf4($sp) -/* f0ab094: 0fc552fc */ jal 0xf154bf0 +/* f0ab094: 0fc552fc */ jal gfxSetPrimColour /* f0ab098: afaa0058 */ sw $t2,0x58($sp) /* f0ab09c: 3c068008 */ lui $a2,0x8008 /* f0ab0a0: 8fa70100 */ lw $a3,0x100($sp) @@ -36906,26 +36906,26 @@ glabel bgunRenderHud /* f0ab104: 0018c880 */ sll $t9,$t8,0x2 /* f0ab108: 01d97825 */ or $t7,$t6,$t9 /* f0ab10c: ac4f0004 */ sw $t7,0x4($v0) -/* f0ab110: 0fc55313 */ jal 0xf154c4c +/* f0ab110: 0fc55313 */ jal func0f153838 /* f0ab114: afa30060 */ sw $v1,0x60($sp) /* f0ab118: 3c18800a */ lui $t8,0x800a /* f0ab11c: 8f18e758 */ lw $t8,-0x18a8($t8) /* f0ab120: afa20130 */ sw $v0,0x130($sp) -/* f0ab124: 0fc54f02 */ jal 0xf153c08 +/* f0ab124: 0fc54f02 */ jal optionsGetShowGunFunction /* f0ab128: 8f040070 */ lw $a0,0x70($t8) /* f0ab12c: 10400163 */ beqz $v0,.PB0f0ab6bc /* f0ab130: 8faa0058 */ lw $t2,0x58($sp) /* f0ab134: 8fae005c */ lw $t6,0x5c($sp) /* f0ab138: 8fa500f0 */ lw $a1,0xf0($sp) /* f0ab13c: 91c40000 */ lbu $a0,0x0($t6) -/* f0ab140: 0fc2c505 */ jal 0xf0b1414 +/* f0ab140: 0fc2c505 */ jal weaponGetFunctionById /* f0ab144: afaa0058 */ sw $t2,0x58($sp) -/* f0ab148: 0fc44dfc */ jal 0xf1137f0 +/* f0ab148: 0fc44dfc */ jal invGetCurrentIndex /* f0ab14c: afa200bc */ sw $v0,0xbc($sp) -/* f0ab150: 0fc44d66 */ jal 0xf113598 +/* f0ab150: 0fc44d66 */ jal invGetNameIdByIndex /* f0ab154: 00402025 */ move $a0,$v0 /* f0ab158: 00402025 */ move $a0,$v0 -/* f0ab15c: 0fc5c06a */ jal 0xf1701a8 +/* f0ab15c: 0fc5c06a */ jal langGet /* f0ab160: a7a200ba */ sh $v0,0xba($sp) /* f0ab164: 8faa0058 */ lw $t2,0x58($sp) /* f0ab168: 97a300ba */ lhu $v1,0xba($sp) @@ -36963,7 +36963,7 @@ glabel bgunRenderHud /* f0ab1dc: afa00014 */ sw $zero,0x14($sp) /* f0ab1e0: afa600d4 */ sw $a2,0xd4($sp) /* f0ab1e4: afaa0058 */ sw $t2,0x58($sp) -/* f0ab1e8: 0fc5625a */ jal 0xf158968 +/* f0ab1e8: 0fc5625a */ jal textMeasure /* f0ab1ec: afb80010 */ sw $t8,0x10($sp) /* f0ab1f0: 8fae00c0 */ lw $t6,0xc0($sp) /* f0ab1f4: 8faa0058 */ lw $t2,0x58($sp) @@ -37018,7 +37018,7 @@ glabel bgunRenderHud /* f0ab2ac: afae00d0 */ sw $t6,0xd0($sp) .PB0f0ab2b0: /* f0ab2b0: 8fa40130 */ lw $a0,0x130($sp) -/* f0ab2b4: 0fc552fc */ jal 0xf154bf0 +/* f0ab2b4: 0fc552fc */ jal gfxSetPrimColour /* f0ab2b8: afaa0058 */ sw $t2,0x58($sp) /* f0ab2bc: 3c038008 */ lui $v1,0x8008 /* f0ab2c0: 8faf0100 */ lw $t7,0x100($sp) @@ -37047,7 +37047,7 @@ glabel bgunRenderHud /* f0ab31c: 31f803ff */ andi $t8,$t7,0x3ff /* f0ab320: 00187080 */ sll $t6,$t8,0x2 /* f0ab324: 032e7825 */ or $t7,$t9,$t6 -/* f0ab328: 0fc55313 */ jal 0xf154c4c +/* f0ab328: 0fc55313 */ jal func0f153838 /* f0ab32c: ac4f0004 */ sw $t7,0x4($v0) /* f0ab330: 3c018006 */ lui $at,0x8006 /* f0ab334: c4242cf0 */ lwc1 $f4,0x2cf0($at) @@ -37059,10 +37059,10 @@ glabel bgunRenderHud /* f0ab34c: 24060032 */ li $a2,0x32 /* f0ab350: 4600428d */ trunc.w.s $f10,$f8 /* f0ab354: 44045000 */ mfc1 $a0,$f10 -/* f0ab358: 0fc55459 */ jal 0xf155164 +/* f0ab358: 0fc55459 */ jal func0f153d50 /* f0ab35c: 00000000 */ nop /* f0ab360: 2404ffff */ li $a0,-1 -/* f0ab364: 0fc55493 */ jal 0xf15524c +/* f0ab364: 0fc55493 */ jal func0f153e38 /* f0ab368: 2405ffff */ li $a1,-1 /* f0ab36c: 3c198008 */ lui $t9,0x8008 /* f0ab370: 8f391fd8 */ lw $t9,0x1fd8($t9) @@ -37081,9 +37081,9 @@ glabel bgunRenderHud /* f0ab3a4: afa00028 */ sw $zero,0x28($sp) /* f0ab3a8: afae0014 */ sw $t6,0x14($sp) /* f0ab3ac: afaf0018 */ sw $t7,0x18($sp) -/* f0ab3b0: 0fc55e10 */ jal 0xf157840 +/* f0ab3b0: 0fc55e10 */ jal textRenderProjected /* f0ab3b4: afb8001c */ sw $t8,0x1c($sp) -/* f0ab3b8: 0fc55498 */ jal 0xf155260 +/* f0ab3b8: 0fc55498 */ jal func0f153e4c /* f0ab3bc: afa20130 */ sw $v0,0x130($sp) /* f0ab3c0: 8faa0058 */ lw $t2,0x58($sp) /* f0ab3c4: 8fa200bc */ lw $v0,0xbc($sp) @@ -37091,7 +37091,7 @@ glabel bgunRenderHud /* f0ab3c8: 504000bd */ beqzl $v0,.PB0f0ab6c0 /* f0ab3cc: 8fa500fc */ lw $a1,0xfc($sp) /* f0ab3d0: 94440004 */ lhu $a0,0x4($v0) -/* f0ab3d4: 0fc5c06a */ jal 0xf1701a8 +/* f0ab3d4: 0fc5c06a */ jal langGet /* f0ab3d8: afaa0058 */ sw $t2,0x58($sp) /* f0ab3dc: 3c0eff55 */ lui $t6,0xff55 /* f0ab3e0: 8fa300bc */ lw $v1,0xbc($sp) @@ -37115,7 +37115,7 @@ glabel bgunRenderHud /* f0ab420: a559006c */ sh $t9,0x6c($t2) /* f0ab424: 3324ffff */ andi $a0,$t9,0xffff .PB0f0ab428: -/* f0ab428: 0fc5c06a */ jal 0xf1701a8 +/* f0ab428: 0fc5c06a */ jal langGet /* f0ab42c: afaa0058 */ sw $t2,0x58($sp) /* f0ab430: 8faa0058 */ lw $t2,0x58($sp) /* f0ab434: 00403025 */ move $a2,$v0 @@ -37171,7 +37171,7 @@ glabel bgunRenderHud /* f0ab4ec: afa00014 */ sw $zero,0x14($sp) /* f0ab4f0: afa600d4 */ sw $a2,0xd4($sp) /* f0ab4f4: afaa0058 */ sw $t2,0x58($sp) -/* f0ab4f8: 0fc5625a */ jal 0xf158968 +/* f0ab4f8: 0fc5625a */ jal textMeasure /* f0ab4fc: afb90010 */ sw $t9,0x10($sp) /* f0ab500: 8fb800c0 */ lw $t8,0xc0($sp) /* f0ab504: 8faa0058 */ lw $t2,0x58($sp) @@ -37216,7 +37216,7 @@ glabel bgunRenderHud /* f0ab59c: afae00d0 */ sw $t6,0xd0($sp) .PB0f0ab5a0: /* f0ab5a0: 8fa40130 */ lw $a0,0x130($sp) -/* f0ab5a4: 0fc552fc */ jal 0xf154bf0 +/* f0ab5a4: 0fc552fc */ jal gfxSetPrimColour /* f0ab5a8: afaa0058 */ sw $t2,0x58($sp) /* f0ab5ac: 3c038008 */ lui $v1,0x8008 /* f0ab5b0: 24631f90 */ addiu $v1,$v1,0x1f90 @@ -37247,7 +37247,7 @@ glabel bgunRenderHud /* f0ab614: 31cf03ff */ andi $t7,$t6,0x3ff /* f0ab618: 000fc080 */ sll $t8,$t7,0x2 /* f0ab61c: 03387025 */ or $t6,$t9,$t8 -/* f0ab620: 0fc55313 */ jal 0xf154c4c +/* f0ab620: 0fc55313 */ jal func0f153838 /* f0ab624: ac4e0004 */ sw $t6,0x4($v0) /* f0ab628: 3c018006 */ lui $at,0x8006 /* f0ab62c: c4302cf0 */ lwc1 $f16,0x2cf0($at) @@ -37259,10 +37259,10 @@ glabel bgunRenderHud /* f0ab644: 24060032 */ li $a2,0x32 /* f0ab648: 4600218d */ trunc.w.s $f6,$f4 /* f0ab64c: 44043000 */ mfc1 $a0,$f6 -/* f0ab650: 0fc55459 */ jal 0xf155164 +/* f0ab650: 0fc55459 */ jal func0f153d50 /* f0ab654: 00000000 */ nop /* f0ab658: 2404ffff */ li $a0,-1 -/* f0ab65c: 0fc55493 */ jal 0xf15524c +/* f0ab65c: 0fc55493 */ jal func0f153e38 /* f0ab660: 2405ffff */ li $a1,-1 /* f0ab664: 3c198008 */ lui $t9,0x8008 /* f0ab668: 8f391fd8 */ lw $t9,0x1fd8($t9) @@ -37281,9 +37281,9 @@ glabel bgunRenderHud /* f0ab69c: afa00028 */ sw $zero,0x28($sp) /* f0ab6a0: afb80014 */ sw $t8,0x14($sp) /* f0ab6a4: afae0018 */ sw $t6,0x18($sp) -/* f0ab6a8: 0fc55e10 */ jal 0xf157840 +/* f0ab6a8: 0fc55e10 */ jal textRenderProjected /* f0ab6ac: afaf001c */ sw $t7,0x1c($sp) -/* f0ab6b0: 0fc55498 */ jal 0xf155260 +/* f0ab6b0: 0fc55498 */ jal func0f153e4c /* f0ab6b4: afa20130 */ sw $v0,0x130($sp) /* f0ab6b8: 8faa0058 */ lw $t2,0x58($sp) .PB0f0ab6bc: @@ -37319,7 +37319,7 @@ glabel bgunRenderHud .PB0f0ab728: /* f0ab728: 57030008 */ bnel $t8,$v1,.PB0f0ab74c /* f0ab72c: 8faf0110 */ lw $t7,0x110($sp) -/* f0ab730: 0fc552e5 */ jal 0xf154b94 +/* f0ab730: 0fc552e5 */ jal func0f153780 /* f0ab734: 8fa40130 */ lw $a0,0x130($sp) /* f0ab738: 240e0001 */ li $t6,0x1 /* f0ab73c: 3c018008 */ lui $at,0x8008 @@ -37331,13 +37331,13 @@ glabel bgunRenderHud /* f0ab750: 8fa4012c */ lw $a0,0x12c($sp) /* f0ab754: 11f9000d */ beq $t7,$t9,.PB0f0ab78c /* f0ab758: 24841568 */ addiu $a0,$a0,0x1568 -/* f0ab75c: 0fc2a84c */ jal 0xf0aa130 +/* f0ab75c: 0fc2a84c */ jal bgunResetAbmag /* f0ab760: afaa0058 */ sw $t2,0x58($sp) /* f0ab764: 8fa4005c */ lw $a0,0x5c($sp) -/* f0ab768: 0fc2a84c */ jal 0xf0aa130 +/* f0ab768: 0fc2a84c */ jal bgunResetAbmag /* f0ab76c: 2484078c */ addiu $a0,$a0,0x78c /* f0ab770: 8faa0058 */ lw $t2,0x58($sp) -/* f0ab774: 0fc2a84c */ jal 0xf0aa130 +/* f0ab774: 0fc2a84c */ jal bgunResetAbmag /* f0ab778: 2544005c */ addiu $a0,$t2,0x5c /* f0ab77c: 8faa0058 */ lw $t2,0x58($sp) /* f0ab780: 8fb80110 */ lw $t8,0x110($sp) @@ -37362,7 +37362,7 @@ glabel bgunRenderHud /* f0ab7c8: 8fb9005c */ lw $t9,0x5c($sp) /* f0ab7cc: afb80050 */ sw $t8,0x50($sp) /* f0ab7d0: afa40054 */ sw $a0,0x54($sp) -/* f0ab7d4: 0c002e8b */ jal 0xba2c +/* f0ab7d4: 0c002e8b */ jal viGetViewLeft /* f0ab7d8: afaa0058 */ sw $t2,0x58($sp) /* f0ab7dc: 3c188008 */ lui $t8,0x8008 /* f0ab7e0: 8f181f90 */ lw $t8,0x1f90($t8) @@ -37388,7 +37388,7 @@ glabel bgunRenderHud /* f0ab828: 57210015 */ bnel $t9,$at,.PB0f0ab880 /* f0ab82c: 8fb80124 */ lw $t8,0x124($sp) /* f0ab830: afa40054 */ sw $a0,0x54($sp) -/* f0ab834: 0fc550b9 */ jal 0xf1542e4 +/* f0ab834: 0fc550b9 */ jal optionsGetScreenSplit /* f0ab838: afaa0058 */ sw $t2,0x58($sp) /* f0ab83c: 24010001 */ li $at,0x1 /* f0ab840: 8fa40054 */ lw $a0,0x54($sp) @@ -37457,7 +37457,7 @@ glabel bgunRenderHud /* f0ab92c: afa00028 */ sw $zero,0x28($sp) /* f0ab930: afa8001c */ sw $t0,0x1c($sp) /* f0ab934: 24c6fffd */ addiu $a2,$a2,-3 -/* f0ab938: 0fc2a8db */ jal 0xf0aa36c +/* f0ab938: 0fc2a8db */ jal bgunRenderHudGauge /* f0ab93c: afaf0018 */ sw $t7,0x18($sp) /* f0ab940: 8fa3004c */ lw $v1,0x4c($sp) /* f0ab944: 8fb80048 */ lw $t8,0x48($sp) @@ -37471,7 +37471,7 @@ glabel bgunRenderHud /* f0ab964: afa00014 */ sw $zero,0x14($sp) /* f0ab968: 00402025 */ move $a0,$v0 /* f0ab96c: 24070001 */ li $a3,0x1 -/* f0ab970: 0fc2a832 */ jal 0xf0aa0c8 +/* f0ab970: 0fc2a832 */ jal bgunRenderHudInteger /* f0ab974: 24c60002 */ addiu $a2,$a2,0x2 /* f0ab978: 8faa0058 */ lw $t2,0x58($sp) /* f0ab97c: afa20130 */ sw $v0,0x130($sp) @@ -37491,9 +37491,9 @@ glabel bgunRenderHud /* f0ab9ac: 000fc080 */ sll $t8,$t7,0x2 /* f0ab9b0: afb80050 */ sw $t8,0x50($sp) /* f0ab9b4: afaa0058 */ sw $t2,0x58($sp) -/* f0ab9b8: 0c002e8b */ jal 0xba2c +/* f0ab9b8: 0c002e8b */ jal viGetViewLeft /* f0ab9bc: afb900a4 */ sw $t9,0xa4($sp) -/* f0ab9c0: 0c002e6d */ jal 0xb9b4 +/* f0ab9c0: 0c002e6d */ jal viGetViewWidth /* f0ab9c4: a7a20076 */ sh $v0,0x76($sp) /* f0ab9c8: 87ae0076 */ lh $t6,0x76($sp) /* f0ab9cc: 3c0f8008 */ lui $t7,0x8008 @@ -37520,7 +37520,7 @@ glabel bgunRenderHud /* f0aba18: 24010002 */ li $at,0x2 /* f0aba1c: 17010011 */ bne $t8,$at,.PB0f0aba64 /* f0aba20: afaf0100 */ sw $t7,0x100($sp) -/* f0aba24: 0fc550b9 */ jal 0xf1542e4 +/* f0aba24: 0fc550b9 */ jal optionsGetScreenSplit /* f0aba28: afaa0058 */ sw $t2,0x58($sp) /* f0aba2c: 24010001 */ li $at,0x1 /* f0aba30: 10410006 */ beq $v0,$at,.PB0f0aba4c @@ -37596,7 +37596,7 @@ glabel bgunRenderHud /* f0abb38: afa3001c */ sw $v1,0x1c($sp) /* f0abb3c: 24c6fffd */ addiu $a2,$a2,-3 /* f0abb40: 8fa40130 */ lw $a0,0x130($sp) -/* f0abb44: 0fc2a8db */ jal 0xf0aa36c +/* f0abb44: 0fc2a8db */ jal bgunRenderHudGauge /* f0abb48: afb90018 */ sw $t9,0x18($sp) /* f0abb4c: 8fa80038 */ lw $t0,0x38($sp) /* f0abb50: 8fa60100 */ lw $a2,0x100($sp) @@ -37609,7 +37609,7 @@ glabel bgunRenderHud /* f0abb6c: 00402025 */ move $a0,$v0 /* f0abb70: 00003825 */ move $a3,$zero /* f0abb74: 24c6fffe */ addiu $a2,$a2,-2 -/* f0abb78: 0fc2a832 */ jal 0xf0aa0c8 +/* f0abb78: 0fc2a832 */ jal bgunRenderHudInteger /* f0abb7c: afb90010 */ sw $t9,0x10($sp) /* f0abb80: 8fa80038 */ lw $t0,0x38($sp) /* f0abb84: 8faa0058 */ lw $t2,0x58($sp) @@ -37677,7 +37677,7 @@ glabel bgunRenderHud /* f0abc68: afab001c */ sw $t3,0x1c($sp) /* f0abc6c: afa60048 */ sw $a2,0x48($sp) /* f0abc70: afa9009c */ sw $t1,0x9c($sp) -/* f0abc74: 0fc2a8db */ jal 0xf0aa36c +/* f0abc74: 0fc2a8db */ jal bgunRenderHudGauge /* f0abc78: afae0010 */ sw $t6,0x10($sp) /* f0abc7c: 8fae0048 */ lw $t6,0x48($sp) /* f0abc80: 3c1800ff */ lui $t8,0xff @@ -37689,7 +37689,7 @@ glabel bgunRenderHud /* f0abc98: 8fa5009c */ lw $a1,0x9c($sp) /* f0abc9c: 8fa60054 */ lw $a2,0x54($sp) /* f0abca0: 00003825 */ move $a3,$zero -/* f0abca4: 0fc2a832 */ jal 0xf0aa0c8 +/* f0abca4: 0fc2a832 */ jal bgunRenderHudInteger /* f0abca8: afa00014 */ sw $zero,0x14($sp) /* f0abcac: afa20130 */ sw $v0,0x130($sp) /* f0abcb0: 8fb9005c */ lw $t9,0x5c($sp) @@ -37771,7 +37771,7 @@ glabel bgunRenderHud /* f0abdc8: 00000000 */ nop /* f0abdcc: 0006000d */ break 0x6 .PB0f0abdd0: -/* f0abdd0: 0c004e1d */ jal 0x13874 +/* f0abdd0: 0c004e1d */ jal sprintf /* f0abdd4: 00000000 */ nop /* f0abdd8: 1000002b */ b .PB0f0abe88 /* f0abddc: 8fa60044 */ lw $a2,0x44($sp) @@ -37819,7 +37819,7 @@ glabel bgunRenderHud /* f0abe74: 00000000 */ nop /* f0abe78: 0006000d */ break 0x6 .PB0f0abe7c: -/* f0abe7c: 0c004e1d */ jal 0x13874 +/* f0abe7c: 0c004e1d */ jal sprintf /* f0abe80: 00000000 */ nop /* f0abe84: 8fa60044 */ lw $a2,0x44($sp) .PB0f0abe88: @@ -37832,11 +37832,11 @@ glabel bgunRenderHud /* f0abea0: 00003825 */ move $a3,$zero /* f0abea4: afa00014 */ sw $zero,0x14($sp) /* f0abea8: 24c6fffe */ addiu $a2,$a2,-2 -/* f0abeac: 0fc2a7c1 */ jal 0xf0a9f04 +/* f0abeac: 0fc2a7c1 */ jal bgunRenderHudString /* f0abeb0: afae0010 */ sw $t6,0x10($sp) /* f0abeb4: afa20130 */ sw $v0,0x130($sp) .PB0f0abeb8: -/* f0abeb8: 0fc552e5 */ jal 0xf154b94 +/* f0abeb8: 0fc552e5 */ jal func0f153780 /* f0abebc: 8fa40130 */ lw $a0,0x130($sp) /* f0abec0: 24180001 */ li $t8,0x1 /* f0abec4: 3c018008 */ lui $at,0x8008 diff --git a/src/game/bondview.c b/src/game/bondview.c index 8c4a9c648..03c5657a0 100644 --- a/src/game/bondview.c +++ b/src/game/bondview.c @@ -1430,12 +1430,12 @@ glabel var7f1b5f48 /* f1443cc: f7b80038 */ sdc1 $f24,0x38($sp) /* f1443d0: f7b60030 */ sdc1 $f22,0x30($sp) /* f1443d4: f7b40028 */ sdc1 $f20,0x28($sp) -/* f1443d8: 0c002a12 */ jal 0xa848 +/* f1443d8: 0c002a12 */ jal viGetBackBuffer /* f1443dc: afa70134 */ sw $a3,0x134($sp) -/* f1443e0: 0c002e8f */ jal 0xba3c +/* f1443e0: 0c002e8f */ jal viGetViewTop /* f1443e4: afa20124 */ sw $v0,0x124($sp) /* f1443e8: 244e0010 */ addiu $t6,$v0,0x10 -/* f1443ec: 0c002e71 */ jal 0xb9c4 +/* f1443ec: 0c002e71 */ jal viGetViewHeight /* f1443f0: afae0120 */ sw $t6,0x120($sp) /* f1443f4: 2443ffe0 */ addiu $v1,$v0,-32 /* f1443f8: 44832000 */ mtc1 $v1,$f4 @@ -1447,9 +1447,9 @@ glabel var7f1b5f48 /* f144410: 461ad200 */ add.s $f8,$f26,$f26 /* f144414: 461ad582 */ mul.s $f22,$f26,$f26 /* f144418: 46004287 */ neg.s $f10,$f8 -/* f14441c: 0c002e6d */ jal 0xb9b4 +/* f14441c: 0c002e6d */ jal viGetViewWidth /* f144420: 46025603 */ div.s $f24,$f10,$f2 -/* f144424: 0c002e8b */ jal 0xba2c +/* f144424: 0c002e8b */ jal viGetViewLeft /* f144428: 0040b025 */ move $s6,$v0 /* f14442c: 3c038008 */ lui $v1,0x8008 /* f144430: 24631d10 */ addiu $v1,$v1,0x1d10 @@ -1469,7 +1469,7 @@ glabel var7f1b5f48 /* f144464: 3c04800b */ lui $a0,0x800b /* f144468: 3c057f1b */ lui $a1,0x7f1b /* f14446c: 24a57df4 */ addiu $a1,$a1,0x7df4 -/* f144470: 0c004cbc */ jal 0x132f0 +/* f144470: 0c004cbc */ jal strcpy /* f144474: 248487e0 */ addiu $a0,$a0,-30752 /* f144478: 83a3013b */ lb $v1,0x13b($sp) /* f14447c: 24130001 */ li $s3,0x1 @@ -1513,7 +1513,7 @@ glabel var7f1b5f48 /* f144510: ac400004 */ sw $zero,0x4($v0) /* f144514: afa70074 */ sw $a3,0x74($sp) /* f144518: 02e02825 */ move $a1,$s7 -/* f14451c: 0fc50d90 */ jal 0xf143640 +/* f14451c: 0fc50d90 */ jal bviewPrepareStaticRgba16 /* f144520: 02003025 */ move $a2,$s0 /* f144524: 8faf0074 */ lw $t7,0x74($sp) /* f144528: 00408825 */ move $s1,$v0 @@ -1570,7 +1570,7 @@ glabel var7f1b5f48 /* f1445ec: 012b6025 */ or $t4,$t1,$t3 /* f1445f0: 4407b000 */ mfc1 $a3,$f22 /* f1445f4: ac4c0004 */ sw $t4,0x4($v0) -/* f1445f8: 0fc510c1 */ jal 0xf144304 +/* f1445f8: 0fc510c1 */ jal bview0f142d74 /* f1445fc: 26310008 */ addiu $s1,$s1,0x8 /* f144600: c7a800f0 */ lwc1 $f8,0xf0($sp) /* f144604: 02202025 */ move $a0,$s1 @@ -1581,7 +1581,7 @@ glabel var7f1b5f48 /* f144618: afb00010 */ sw $s0,0x10($sp) /* f14461c: afb50018 */ sw $s5,0x18($sp) /* f144620: afb6001c */ sw $s6,0x1c($sp) -/* f144624: 0fc50c10 */ jal 0xf143040 +/* f144624: 0fc50c10 */ jal bviewRenderLensRect /* f144628: e7aa0014 */ swc1 $f10,0x14($sp) /* f14462c: 00408825 */ move $s1,$v0 /* f144630: 8fa30120 */ lw $v1,0x120($sp) @@ -1628,7 +1628,7 @@ glabel var7f1b5f48 /* f1446c4: 02201025 */ move $v0,$s1 /* f1446c8: 17210020 */ bne $t9,$at,.PB0f14474c /* f1446cc: 240cffff */ li $t4,-1 -/* f1446d0: 0c004be0 */ jal 0x12f80 +/* f1446d0: 0c004be0 */ jal random /* f1446d4: 00000000 */ nop /* f1446d8: 24010078 */ li $at,0x78 /* f1446dc: 0041001b */ divu $zero,$v0,$at @@ -1637,7 +1637,7 @@ glabel var7f1b5f48 /* f1446e8: 3c01ff33 */ lui $at,0xff33 /* f1446ec: 34213300 */ ori $at,$at,0x3300 /* f1446f0: 310a00ff */ andi $t2,$t0,0xff -/* f1446f4: 0c004be0 */ jal 0x12f80 +/* f1446f4: 0c004be0 */ jal random /* f1446f8: 0141b825 */ or $s7,$t2,$at /* f1446fc: 304b001f */ andi $t3,$v0,0x1f /* f144700: 448b9000 */ mtc1 $t3,$f18 @@ -1668,7 +1668,7 @@ glabel var7f1b5f48 /* f144758: 4405c000 */ mfc1 $a1,$f24 /* f14475c: 4406d000 */ mfc1 $a2,$f26 /* f144760: 4407b000 */ mfc1 $a3,$f22 -/* f144764: 0fc510c1 */ jal 0xf144304 +/* f144764: 0fc510c1 */ jal bview0f142d74 /* f144768: 02402025 */ move $a0,$s2 /* f14476c: c7a600d0 */ lwc1 $f6,0xd0($sp) /* f144770: 02202025 */ move $a0,$s1 @@ -1679,7 +1679,7 @@ glabel var7f1b5f48 /* f144784: afb00010 */ sw $s0,0x10($sp) /* f144788: afb50018 */ sw $s5,0x18($sp) /* f14478c: afb6001c */ sw $s6,0x1c($sp) -/* f144790: 0fc50c10 */ jal 0xf143040 +/* f144790: 0fc50c10 */ jal bviewRenderLensRect /* f144794: e7a40014 */ swc1 $f4,0x14($sp) /* f144798: 8fad007c */ lw $t5,0x7c($sp) /* f14479c: 24010004 */ li $at,0x4 @@ -1694,7 +1694,7 @@ glabel var7f1b5f48 /* f1447c0: ac4e0004 */ sw $t6,0x4($v0) /* f1447c4: ac540000 */ sw $s4,0x0($v0) /* f1447c8: 26310008 */ addiu $s1,$s1,0x8 -/* f1447cc: 0fc510c1 */ jal 0xf144304 +/* f1447cc: 0fc510c1 */ jal bview0f142d74 /* f1447d0: 02402025 */ move $a0,$s2 /* f1447d4: 3c017f1b */ lui $at,0x7f1b /* f1447d8: c4287f60 */ lwc1 $f8,0x7f60($at) @@ -1706,7 +1706,7 @@ glabel var7f1b5f48 /* f1447f0: afb00010 */ sw $s0,0x10($sp) /* f1447f4: afb50018 */ sw $s5,0x18($sp) /* f1447f8: afb6001c */ sw $s6,0x1c($sp) -/* f1447fc: 0fc50c10 */ jal 0xf143040 +/* f1447fc: 0fc50c10 */ jal bviewRenderLensRect /* f144800: e7aa0014 */ swc1 $f10,0x14($sp) /* f144804: 00408825 */ move $s1,$v0 .PB0f144808: @@ -1854,13 +1854,13 @@ glabel var7f1b5f48 /* f144a1c: 02202025 */ move $a0,$s1 /* f144a20: 02002825 */ move $a1,$s0 /* f144a24: 02a03825 */ move $a3,$s5 -/* f144a28: 0fc50d19 */ jal 0xf143464 +/* f144a28: 0fc50d19 */ jal bviewRenderFisheyeRect /* f144a2c: afb60010 */ sw $s6,0x10($sp) /* f144a30: 4406a000 */ mfc1 $a2,$f20 /* f144a34: 00402025 */ move $a0,$v0 /* f144a38: 02402825 */ move $a1,$s2 /* f144a3c: 02a03825 */ move $a3,$s5 -/* f144a40: 0fc50d19 */ jal 0xf143464 +/* f144a40: 0fc50d19 */ jal bviewRenderFisheyeRect /* f144a44: afb60010 */ sw $s6,0x10($sp) /* f144a48: 26100001 */ addiu $s0,$s0,0x1 /* f144a4c: 2652ffff */ addiu $s2,$s2,-1 @@ -1901,7 +1901,7 @@ glabel var7f1b5f48 /* f144ad0: 00000000 */ nop /* f144ad4: 45000008 */ bc1f .PB0f144af8 /* f144ad8: 00000000 */ nop -/* f144adc: 0c012ae4 */ jal 0x4ab90 +/* f144adc: 0c012ae4 */ jal sqrtf /* f144ae0: 4600b301 */ sub.s $f12,$f22,$f0 /* f144ae4: 3c017f1b */ lui $at,0x7f1b /* f144ae8: c4287f64 */ lwc1 $f8,0x7f64($at) @@ -1919,7 +1919,7 @@ glabel var7f1b5f48 /* f144b10: 02a03825 */ move $a3,$s5 /* f144b14: afb60010 */ sw $s6,0x10($sp) /* f144b18: 44060000 */ mfc1 $a2,$f0 -/* f144b1c: 0fc50d19 */ jal 0xf143464 +/* f144b1c: 0fc50d19 */ jal bviewRenderFisheyeRect /* f144b20: e7a00078 */ swc1 $f0,0x78($sp) /* f144b24: c7a00078 */ lwc1 $f0,0x78($sp) /* f144b28: 12120008 */ beq $s0,$s2,.PB0f144b4c @@ -1928,7 +1928,7 @@ glabel var7f1b5f48 /* f144b34: 00402025 */ move $a0,$v0 /* f144b38: 02402825 */ move $a1,$s2 /* f144b3c: 02a03825 */ move $a3,$s5 -/* f144b40: 0fc50d19 */ jal 0xf143464 +/* f144b40: 0fc50d19 */ jal bviewRenderFisheyeRect /* f144b44: afb60010 */ sw $s6,0x10($sp) /* f144b48: 00408825 */ move $s1,$v0 .PB0f144b4c: @@ -1953,13 +1953,13 @@ glabel var7f1b5f48 .PB0f144b90: /* f144b90: 4406d000 */ mfc1 $a2,$f26 /* f144b94: 4407b000 */ mfc1 $a3,$f22 -/* f144b98: 0fc510c1 */ jal 0xf144304 +/* f144b98: 0fc510c1 */ jal bview0f142d74 /* f144b9c: 02402025 */ move $a0,$s2 /* f144ba0: 44060000 */ mfc1 $a2,$f0 /* f144ba4: 02202025 */ move $a0,$s1 /* f144ba8: 02002825 */ move $a1,$s0 /* f144bac: 02a03825 */ move $a3,$s5 -/* f144bb0: 0fc50d19 */ jal 0xf143464 +/* f144bb0: 0fc50d19 */ jal bviewRenderFisheyeRect /* f144bb4: afb60010 */ sw $s6,0x10($sp) /* f144bb8: 02539021 */ addu $s2,$s2,$s3 /* f144bbc: 44922000 */ mtc1 $s2,$f4 @@ -1978,9 +1978,9 @@ glabel var7f1b5f48 /* f144bec: 561effe8 */ bnel $s0,$s8,.PB0f144b90 /* f144bf0: 4405c000 */ mfc1 $a1,$f24 .PB0f144bf4: -/* f144bf4: 0c002e8f */ jal 0xba3c +/* f144bf4: 0c002e8f */ jal viGetViewTop /* f144bf8: 00000000 */ nop -/* f144bfc: 0c002e71 */ jal 0xb9c4 +/* f144bfc: 0c002e71 */ jal viGetViewHeight /* f144c00: 00409825 */ move $s3,$v0 /* f144c04: 00539021 */ addu $s2,$v0,$s3 /* f144c08: 2652fff0 */ addiu $s2,$s2,-16 @@ -6708,14 +6708,14 @@ glabel var7f1b5f58 /* f144ee8: afb30044 */ sw $s3,0x44($sp) /* f144eec: afb20040 */ sw $s2,0x40($sp) /* f144ef0: afb1003c */ sw $s1,0x3c($sp) -/* f144ef4: 0c002e8b */ jal 0xba2c +/* f144ef4: 0c002e8b */ jal viGetViewLeft /* f144ef8: afb00038 */ sw $s0,0x38($sp) -/* f144efc: 0c002e6d */ jal 0xb9b4 +/* f144efc: 0c002e6d */ jal viGetViewWidth /* f144f00: afa20304 */ sw $v0,0x304($sp) -/* f144f04: 0c002e8f */ jal 0xba3c +/* f144f04: 0c002e8f */ jal viGetViewTop /* f144f08: 00408825 */ move $s1,$v0 /* f144f0c: 244e0010 */ addiu $t6,$v0,0x10 -/* f144f10: 0c002e71 */ jal 0xb9c4 +/* f144f10: 0c002e71 */ jal viGetViewHeight /* f144f14: afae02fc */ sw $t6,0x2fc($sp) /* f144f18: 8fb802fc */ lw $t8,0x2fc($sp) /* f144f1c: 44806000 */ mtc1 $zero,$f12 @@ -6753,7 +6753,7 @@ glabel var7f1b5f58 /* f144f90: 10000de0 */ b .PB0f148714 /* f144f94: 02a01025 */ move $v0,$s5 .PB0f144f98: -/* f144f98: 0fc550b9 */ jal 0xf1542e4 +/* f144f98: 0fc550b9 */ jal optionsGetScreenSplit /* f144f9c: e7ac02bc */ swc1 $f12,0x2bc($sp) /* f144fa0: 44800000 */ mtc1 $zero,$f0 /* f144fa4: 24010001 */ li $at,0x1 @@ -6851,7 +6851,7 @@ glabel var7f1b5f58 /* f1450f8: 00000000 */ nop /* f1450fc: 45020006 */ bc1fl .PB0f145118 /* f145100: e7a002c0 */ swc1 $f0,0x2c0($sp) -/* f145104: 0c012ae4 */ jal 0x4ab90 +/* f145104: 0c012ae4 */ jal sqrtf /* f145108: 00000000 */ nop /* f14510c: 10000002 */ b .PB0f145118 /* f145110: e7a002c0 */ swc1 $f0,0x2c0($sp) @@ -6863,7 +6863,7 @@ glabel var7f1b5f58 /* f145124: 14600006 */ bnez $v1,.PB0f145140 /* f145128: 3c0500ff */ lui $a1,0xff /* f14512c: 34a50028 */ ori $a1,$a1,0x28 -/* f145130: 0fc552fc */ jal 0xf154bf0 +/* f145130: 0fc552fc */ jal gfxSetPrimColour /* f145134: 02a02025 */ move $a0,$s5 /* f145138: 1000000e */ b .PB0f145174 /* f14513c: 0040a825 */ move $s5,$v0 @@ -6873,13 +6873,13 @@ glabel var7f1b5f58 /* f145148: 02a02025 */ move $a0,$s5 /* f14514c: 3c052244 */ lui $a1,0x2244 /* f145150: 34a5ffa0 */ ori $a1,$a1,0xffa0 -/* f145154: 0fc552fc */ jal 0xf154bf0 +/* f145154: 0fc552fc */ jal gfxSetPrimColour /* f145158: 02a02025 */ move $a0,$s5 /* f14515c: 10000005 */ b .PB0f145174 /* f145160: 0040a825 */ move $s5,$v0 .PB0f145164: /* f145164: 3c05ff33 */ lui $a1,0xff33 -/* f145168: 0fc552fc */ jal 0xf154bf0 +/* f145168: 0fc552fc */ jal gfxSetPrimColour /* f14516c: 34a500a0 */ ori $a1,$a1,0xa0 /* f145170: 0040a825 */ move $s5,$v0 .PB0f145174: @@ -7446,7 +7446,7 @@ glabel var7f1b5f58 /* f1459dc: afa202b4 */ sw $v0,0x2b4($sp) /* f1459e0: afae02b0 */ sw $t6,0x2b0($sp) .PB0f1459e4: -/* f1459e4: 0fc5c06a */ jal 0xf1701a8 +/* f1459e4: 0fc5c06a */ jal langGet /* f1459e8: e7a00070 */ swc1 $f0,0x70($sp) /* f1459ec: 3c017f1b */ lui $at,0x7f1b /* f1459f0: c4247f74 */ lwc1 $f4,0x7f74($at) @@ -7460,7 +7460,7 @@ glabel var7f1b5f58 /* f145a10: 02602025 */ move $a0,$s3 /* f145a14: 00403025 */ move $a2,$v0 /* f145a18: 460042a1 */ cvt.d.s $f10,$f8 -/* f145a1c: 0c004e1d */ jal 0x13874 +/* f145a1c: 0c004e1d */ jal sprintf /* f145a20: f7aa0010 */ sdc1 $f10,0x10($sp) /* f145a24: 3c0f8008 */ lui $t7,0x8008 /* f145a28: 8def1fd4 */ lw $t7,0x1fd4($t7) @@ -7470,7 +7470,7 @@ glabel var7f1b5f58 /* f145a38: 27a502e4 */ addiu $a1,$sp,0x2e4 /* f145a3c: 02603025 */ move $a2,$s3 /* f145a40: afa00014 */ sw $zero,0x14($sp) -/* f145a44: 0fc5625a */ jal 0xf158968 +/* f145a44: 0fc5625a */ jal textMeasure /* f145a48: afaf0010 */ sw $t7,0x10($sp) /* f145a4c: 8fb202fc */ lw $s2,0x2fc($sp) /* f145a50: 8fb802e4 */ lw $t8,0x2e4($sp) @@ -7487,13 +7487,13 @@ glabel var7f1b5f58 /* f145a7c: 27a502ec */ addiu $a1,$sp,0x2ec /* f145a80: 27a602e8 */ addiu $a2,$sp,0x2e8 /* f145a84: 27a702dc */ addiu $a3,$sp,0x2dc -/* f145a88: 0fc5531b */ jal 0xf154c6c +/* f145a88: 0fc5531b */ jal func0f153858 /* f145a8c: afb402ec */ sw $s4,0x2ec($sp) -/* f145a90: 0c002e4d */ jal 0xb934 +/* f145a90: 0c002e4d */ jal viGetWidth /* f145a94: 0040a825 */ move $s5,$v0 /* f145a98: 00028400 */ sll $s0,$v0,0x10 /* f145a9c: 0010cc03 */ sra $t9,$s0,0x10 -/* f145aa0: 0c002e51 */ jal 0xb944 +/* f145aa0: 0c002e51 */ jal viGetHeight /* f145aa4: 03208025 */ move $s0,$t9 /* f145aa8: 3c0e8008 */ lui $t6,0x8008 /* f145aac: 3c0f8008 */ lui $t7,0x8008 @@ -7512,10 +7512,10 @@ glabel var7f1b5f58 /* f145ae0: afaf0014 */ sw $t7,0x14($sp) /* f145ae4: afae0010 */ sw $t6,0x10($sp) /* f145ae8: afb80018 */ sw $t8,0x18($sp) -/* f145aec: 0fc56160 */ jal 0xf158580 +/* f145aec: 0fc56160 */ jal textRender /* f145af0: afb9001c */ sw $t9,0x1c($sp) /* f145af4: 0040a825 */ move $s5,$v0 -/* f145af8: 0fc5c06a */ jal 0xf1701a8 +/* f145af8: 0fc5c06a */ jal langGet /* f145afc: 2404580d */ li $a0,0x580d /* f145b00: 8ece0284 */ lw $t6,0x284($s6) /* f145b04: 3c017f1b */ lui $at,0x7f1b @@ -7530,7 +7530,7 @@ glabel var7f1b5f58 /* f145b28: 02602025 */ move $a0,$s3 /* f145b2c: 00403025 */ move $a2,$v0 /* f145b30: 460042a1 */ cvt.d.s $f10,$f8 -/* f145b34: 0c004e1d */ jal 0x13874 +/* f145b34: 0c004e1d */ jal sprintf /* f145b38: f7aa0010 */ sdc1 $f10,0x10($sp) /* f145b3c: 3c188008 */ lui $t8,0x8008 /* f145b40: 8f181fd4 */ lw $t8,0x1fd4($t8) @@ -7541,7 +7541,7 @@ glabel var7f1b5f58 /* f145b54: 27a502e4 */ addiu $a1,$sp,0x2e4 /* f145b58: 02603025 */ move $a2,$s3 /* f145b5c: afa00014 */ sw $zero,0x14($sp) -/* f145b60: 0fc5625a */ jal 0xf158968 +/* f145b60: 0fc5625a */ jal textMeasure /* f145b64: afb80010 */ sw $t8,0x10($sp) /* f145b68: 8fb902e4 */ lw $t9,0x2e4($sp) /* f145b6c: 8faf02e0 */ lw $t7,0x2e0($sp) @@ -7556,13 +7556,13 @@ glabel var7f1b5f58 /* f145b90: 27a602e8 */ addiu $a2,$sp,0x2e8 /* f145b94: 27a702dc */ addiu $a3,$sp,0x2dc /* f145b98: afb402ec */ sw $s4,0x2ec($sp) -/* f145b9c: 0fc5531b */ jal 0xf154c6c +/* f145b9c: 0fc5531b */ jal func0f153858 /* f145ba0: afb102e8 */ sw $s1,0x2e8($sp) -/* f145ba4: 0c002e4d */ jal 0xb934 +/* f145ba4: 0c002e4d */ jal viGetWidth /* f145ba8: 0040a825 */ move $s5,$v0 /* f145bac: 00028400 */ sll $s0,$v0,0x10 /* f145bb0: 00107403 */ sra $t6,$s0,0x10 -/* f145bb4: 0c002e51 */ jal 0xb944 +/* f145bb4: 0c002e51 */ jal viGetHeight /* f145bb8: 01c08025 */ move $s0,$t6 /* f145bbc: 3c0f8008 */ lui $t7,0x8008 /* f145bc0: 3c188008 */ lui $t8,0x8008 @@ -7581,10 +7581,10 @@ glabel var7f1b5f58 /* f145bf4: afb80014 */ sw $t8,0x14($sp) /* f145bf8: afaf0010 */ sw $t7,0x10($sp) /* f145bfc: afb90018 */ sw $t9,0x18($sp) -/* f145c00: 0fc56160 */ jal 0xf158580 +/* f145c00: 0fc56160 */ jal textRender /* f145c04: afae001c */ sw $t6,0x1c($sp) /* f145c08: 0040a825 */ move $s5,$v0 -/* f145c0c: 0fc5c06a */ jal 0xf1701a8 +/* f145c0c: 0fc5c06a */ jal langGet /* f145c10: 2404580e */ li $a0,0x580e /* f145c14: 8ecf0284 */ lw $t7,0x284($s6) /* f145c18: 3c057f1b */ lui $a1,0x7f1b @@ -7595,7 +7595,7 @@ glabel var7f1b5f58 /* f145c2c: c706001c */ lwc1 $f6,0x1c($t8) /* f145c30: 4600310d */ trunc.w.s $f4,$f6 /* f145c34: 44072000 */ mfc1 $a3,$f4 -/* f145c38: 0c004e1d */ jal 0x13874 +/* f145c38: 0c004e1d */ jal sprintf /* f145c3c: 00000000 */ nop /* f145c40: 3c0e8008 */ lui $t6,0x8008 /* f145c44: 8dce1fd4 */ lw $t6,0x1fd4($t6) @@ -7606,7 +7606,7 @@ glabel var7f1b5f58 /* f145c58: 27a502e4 */ addiu $a1,$sp,0x2e4 /* f145c5c: 02603025 */ move $a2,$s3 /* f145c60: afa00014 */ sw $zero,0x14($sp) -/* f145c64: 0fc5625a */ jal 0xf158968 +/* f145c64: 0fc5625a */ jal textMeasure /* f145c68: afae0010 */ sw $t6,0x10($sp) /* f145c6c: 8faf02e4 */ lw $t7,0x2e4($sp) /* f145c70: 8fb902e0 */ lw $t9,0x2e0($sp) @@ -7621,13 +7621,13 @@ glabel var7f1b5f58 /* f145c94: 27a602e8 */ addiu $a2,$sp,0x2e8 /* f145c98: 27a702dc */ addiu $a3,$sp,0x2dc /* f145c9c: afb402ec */ sw $s4,0x2ec($sp) -/* f145ca0: 0fc5531b */ jal 0xf154c6c +/* f145ca0: 0fc5531b */ jal func0f153858 /* f145ca4: afb102e8 */ sw $s1,0x2e8($sp) -/* f145ca8: 0c002e4d */ jal 0xb934 +/* f145ca8: 0c002e4d */ jal viGetWidth /* f145cac: 0040a825 */ move $s5,$v0 /* f145cb0: 00028400 */ sll $s0,$v0,0x10 /* f145cb4: 0010c403 */ sra $t8,$s0,0x10 -/* f145cb8: 0c002e51 */ jal 0xb944 +/* f145cb8: 0c002e51 */ jal viGetHeight /* f145cbc: 03008025 */ move $s0,$t8 /* f145cc0: 3c198008 */ lui $t9,0x8008 /* f145cc4: 3c0e8008 */ lui $t6,0x8008 @@ -7646,10 +7646,10 @@ glabel var7f1b5f58 /* f145cf8: afae0014 */ sw $t6,0x14($sp) /* f145cfc: afb90010 */ sw $t9,0x10($sp) /* f145d00: afaf0018 */ sw $t7,0x18($sp) -/* f145d04: 0fc56160 */ jal 0xf158580 +/* f145d04: 0fc56160 */ jal textRender /* f145d08: afb8001c */ sw $t8,0x1c($sp) /* f145d0c: 0040a825 */ move $s5,$v0 -/* f145d10: 0fc5c06a */ jal 0xf1701a8 +/* f145d10: 0fc5c06a */ jal langGet /* f145d14: 2404580f */ li $a0,0x580f /* f145d18: 8ed90284 */ lw $t9,0x284($s6) /* f145d1c: 3c057f1b */ lui $a1,0x7f1b @@ -7660,7 +7660,7 @@ glabel var7f1b5f58 /* f145d30: c5c80028 */ lwc1 $f8,0x28($t6) /* f145d34: 4600428d */ trunc.w.s $f10,$f8 /* f145d38: 44075000 */ mfc1 $a3,$f10 -/* f145d3c: 0c004e1d */ jal 0x13874 +/* f145d3c: 0c004e1d */ jal sprintf /* f145d40: 00000000 */ nop /* f145d44: 3c188008 */ lui $t8,0x8008 /* f145d48: 8f181fd4 */ lw $t8,0x1fd4($t8) @@ -7671,7 +7671,7 @@ glabel var7f1b5f58 /* f145d5c: 27a502e4 */ addiu $a1,$sp,0x2e4 /* f145d60: 02603025 */ move $a2,$s3 /* f145d64: afa00014 */ sw $zero,0x14($sp) -/* f145d68: 0fc5625a */ jal 0xf158968 +/* f145d68: 0fc5625a */ jal textMeasure /* f145d6c: afb80010 */ sw $t8,0x10($sp) /* f145d70: 8fb902e4 */ lw $t9,0x2e4($sp) /* f145d74: 8faf02e0 */ lw $t7,0x2e0($sp) @@ -7686,13 +7686,13 @@ glabel var7f1b5f58 /* f145d98: 27a602e8 */ addiu $a2,$sp,0x2e8 /* f145d9c: 27a702dc */ addiu $a3,$sp,0x2dc /* f145da0: afb402ec */ sw $s4,0x2ec($sp) -/* f145da4: 0fc5531b */ jal 0xf154c6c +/* f145da4: 0fc5531b */ jal func0f153858 /* f145da8: afb102e8 */ sw $s1,0x2e8($sp) -/* f145dac: 0c002e4d */ jal 0xb934 +/* f145dac: 0c002e4d */ jal viGetWidth /* f145db0: 0040a825 */ move $s5,$v0 /* f145db4: 00028400 */ sll $s0,$v0,0x10 /* f145db8: 00107403 */ sra $t6,$s0,0x10 -/* f145dbc: 0c002e51 */ jal 0xb944 +/* f145dbc: 0c002e51 */ jal viGetHeight /* f145dc0: 01c08025 */ move $s0,$t6 /* f145dc4: 3c0f8008 */ lui $t7,0x8008 /* f145dc8: 3c188008 */ lui $t8,0x8008 @@ -7711,15 +7711,15 @@ glabel var7f1b5f58 /* f145dfc: afb80014 */ sw $t8,0x14($sp) /* f145e00: afaf0010 */ sw $t7,0x10($sp) /* f145e04: afb90018 */ sw $t9,0x18($sp) -/* f145e08: 0fc56160 */ jal 0xf158580 +/* f145e08: 0fc56160 */ jal textRender /* f145e0c: afae001c */ sw $t6,0x1c($sp) /* f145e10: 0040a825 */ move $s5,$v0 -/* f145e14: 0fc5c06a */ jal 0xf1701a8 +/* f145e14: 0fc5c06a */ jal langGet /* f145e18: 24045810 */ li $a0,0x5810 /* f145e1c: 3c057f1b */ lui $a1,0x7f1b /* f145e20: 24a57e34 */ addiu $a1,$a1,0x7e34 /* f145e24: 02602025 */ move $a0,$s3 -/* f145e28: 0c004e1d */ jal 0x13874 +/* f145e28: 0c004e1d */ jal sprintf /* f145e2c: 00403025 */ move $a2,$v0 /* f145e30: 3c0f8008 */ lui $t7,0x8008 /* f145e34: 8def1fd4 */ lw $t7,0x1fd4($t7) @@ -7729,7 +7729,7 @@ glabel var7f1b5f58 /* f145e44: 27a502e4 */ addiu $a1,$sp,0x2e4 /* f145e48: 02603025 */ move $a2,$s3 /* f145e4c: afa00014 */ sw $zero,0x14($sp) -/* f145e50: 0fc5625a */ jal 0xf158968 +/* f145e50: 0fc5625a */ jal textMeasure /* f145e54: afaf0010 */ sw $t7,0x10($sp) /* f145e58: 8fa902a4 */ lw $t1,0x2a4($sp) /* f145e5c: 8fb80304 */ lw $t8,0x304($sp) @@ -7763,13 +7763,13 @@ glabel var7f1b5f58 /* f145ebc: 27a502ec */ addiu $a1,$sp,0x2ec /* f145ec0: 27a602e8 */ addiu $a2,$sp,0x2e8 /* f145ec4: 27a702dc */ addiu $a3,$sp,0x2dc -/* f145ec8: 0fc5531b */ jal 0xf154c6c +/* f145ec8: 0fc5531b */ jal func0f153858 /* f145ecc: afa302ec */ sw $v1,0x2ec($sp) -/* f145ed0: 0c002e4d */ jal 0xb934 +/* f145ed0: 0c002e4d */ jal viGetWidth /* f145ed4: 0040a825 */ move $s5,$v0 /* f145ed8: 00028400 */ sll $s0,$v0,0x10 /* f145edc: 00107c03 */ sra $t7,$s0,0x10 -/* f145ee0: 0c002e51 */ jal 0xb944 +/* f145ee0: 0c002e51 */ jal viGetHeight /* f145ee4: 01e08025 */ move $s0,$t7 /* f145ee8: 3c188008 */ lui $t8,0x8008 /* f145eec: 3c198008 */ lui $t9,0x8008 @@ -7788,7 +7788,7 @@ glabel var7f1b5f58 /* f145f20: afb90014 */ sw $t9,0x14($sp) /* f145f24: afb80010 */ sw $t8,0x10($sp) /* f145f28: afae0018 */ sw $t6,0x18($sp) -/* f145f2c: 0fc56160 */ jal 0xf158580 +/* f145f2c: 0fc56160 */ jal textRender /* f145f30: afaf001c */ sw $t7,0x1c($sp) /* f145f34: 8ed80284 */ lw $t8,0x284($s6) /* f145f38: 0040a825 */ move $s5,$v0 @@ -7796,12 +7796,12 @@ glabel var7f1b5f58 /* f145f40: 9323006b */ lbu $v1,0x6b($t9) /* f145f44: 5460000b */ bnezl $v1,.PB0f145f74 /* f145f48: 24010001 */ li $at,0x1 -/* f145f4c: 0fc5c06a */ jal 0xf1701a8 +/* f145f4c: 0fc5c06a */ jal langGet /* f145f50: 24045811 */ li $a0,0x5811 /* f145f54: 3c057f1b */ lui $a1,0x7f1b /* f145f58: 24a57e38 */ addiu $a1,$a1,0x7e38 /* f145f5c: 02602025 */ move $a0,$s3 -/* f145f60: 0c004e1d */ jal 0x13874 +/* f145f60: 0c004e1d */ jal sprintf /* f145f64: 00403025 */ move $a2,$v0 /* f145f68: 10000014 */ b .PB0f145fbc /* f145f6c: 00000000 */ nop @@ -7809,22 +7809,22 @@ glabel var7f1b5f58 .PB0f145f74: /* f145f74: 1461000a */ bne $v1,$at,.PB0f145fa0 /* f145f78: 00000000 */ nop -/* f145f7c: 0fc5c06a */ jal 0xf1701a8 +/* f145f7c: 0fc5c06a */ jal langGet /* f145f80: 24045893 */ li $a0,0x5893 /* f145f84: 3c057f1b */ lui $a1,0x7f1b /* f145f88: 24a57e3c */ addiu $a1,$a1,0x7e3c /* f145f8c: 02602025 */ move $a0,$s3 -/* f145f90: 0c004e1d */ jal 0x13874 +/* f145f90: 0c004e1d */ jal sprintf /* f145f94: 00403025 */ move $a2,$v0 /* f145f98: 10000008 */ b .PB0f145fbc /* f145f9c: 00000000 */ nop .PB0f145fa0: -/* f145fa0: 0fc5c06a */ jal 0xf1701a8 +/* f145fa0: 0fc5c06a */ jal langGet /* f145fa4: 2404589c */ li $a0,0x589c /* f145fa8: 3c057f1b */ lui $a1,0x7f1b /* f145fac: 24a57e40 */ addiu $a1,$a1,0x7e40 /* f145fb0: 02602025 */ move $a0,$s3 -/* f145fb4: 0c004e1d */ jal 0x13874 +/* f145fb4: 0c004e1d */ jal sprintf /* f145fb8: 00403025 */ move $a2,$v0 .PB0f145fbc: /* f145fbc: 3c0e8008 */ lui $t6,0x8008 @@ -7835,7 +7835,7 @@ glabel var7f1b5f58 /* f145fd0: 27a502e4 */ addiu $a1,$sp,0x2e4 /* f145fd4: 02603025 */ move $a2,$s3 /* f145fd8: afa00014 */ sw $zero,0x14($sp) -/* f145fdc: 0fc5625a */ jal 0xf158968 +/* f145fdc: 0fc5625a */ jal textMeasure /* f145fe0: afae0010 */ sw $t6,0x10($sp) /* f145fe4: 8fa902a4 */ lw $t1,0x2a4($sp) /* f145fe8: 8faf0304 */ lw $t7,0x304($sp) @@ -7869,13 +7869,13 @@ glabel var7f1b5f58 /* f146048: 27a502ec */ addiu $a1,$sp,0x2ec /* f14604c: 27a602e8 */ addiu $a2,$sp,0x2e8 /* f146050: 27a702dc */ addiu $a3,$sp,0x2dc -/* f146054: 0fc5531b */ jal 0xf154c6c +/* f146054: 0fc5531b */ jal func0f153858 /* f146058: afa302ec */ sw $v1,0x2ec($sp) -/* f14605c: 0c002e4d */ jal 0xb934 +/* f14605c: 0c002e4d */ jal viGetWidth /* f146060: 0040a825 */ move $s5,$v0 /* f146064: 00028400 */ sll $s0,$v0,0x10 /* f146068: 00107403 */ sra $t6,$s0,0x10 -/* f14606c: 0c002e51 */ jal 0xb944 +/* f14606c: 0c002e51 */ jal viGetHeight /* f146070: 01c08025 */ move $s0,$t6 /* f146074: 3c0f8008 */ lui $t7,0x8008 /* f146078: 3c188008 */ lui $t8,0x8008 @@ -7894,7 +7894,7 @@ glabel var7f1b5f58 /* f1460ac: afb80014 */ sw $t8,0x14($sp) /* f1460b0: afaf0010 */ sw $t7,0x10($sp) /* f1460b4: afb90018 */ sw $t9,0x18($sp) -/* f1460b8: 0fc56160 */ jal 0xf158580 +/* f1460b8: 0fc56160 */ jal textRender /* f1460bc: afae001c */ sw $t6,0x1c($sp) /* f1460c0: 8ecf0284 */ lw $t7,0x284($s6) /* f1460c4: 0040a825 */ move $s5,$v0 @@ -7902,12 +7902,12 @@ glabel var7f1b5f58 /* f1460cc: 9303006b */ lbu $v1,0x6b($t8) /* f1460d0: 54600047 */ bnezl $v1,.PB0f1461f0 /* f1460d4: 24010001 */ li $at,0x1 -/* f1460d8: 0fc5c06a */ jal 0xf1701a8 +/* f1460d8: 0fc5c06a */ jal langGet /* f1460dc: 24045812 */ li $a0,0x5812 /* f1460e0: 3c057f1b */ lui $a1,0x7f1b /* f1460e4: 24a57e44 */ addiu $a1,$a1,0x7e44 /* f1460e8: 02602025 */ move $a0,$s3 -/* f1460ec: 0c004e1d */ jal 0x13874 +/* f1460ec: 0c004e1d */ jal sprintf /* f1460f0: 00403025 */ move $a2,$v0 /* f1460f4: 3c198008 */ lui $t9,0x8008 /* f1460f8: 8f391fd4 */ lw $t9,0x1fd4($t9) @@ -7917,7 +7917,7 @@ glabel var7f1b5f58 /* f146108: 27a502e4 */ addiu $a1,$sp,0x2e4 /* f14610c: 02603025 */ move $a2,$s3 /* f146110: afa00014 */ sw $zero,0x14($sp) -/* f146114: 0fc5625a */ jal 0xf158968 +/* f146114: 0fc5625a */ jal textMeasure /* f146118: afb90010 */ sw $t9,0x10($sp) /* f14611c: 8fae02a4 */ lw $t6,0x2a4($sp) /* f146120: 8fa30088 */ lw $v1,0x88($sp) @@ -7944,13 +7944,13 @@ glabel var7f1b5f58 /* f14616c: 27a502ec */ addiu $a1,$sp,0x2ec /* f146170: 27a602e8 */ addiu $a2,$sp,0x2e8 /* f146174: 27a702dc */ addiu $a3,$sp,0x2dc -/* f146178: 0fc5531b */ jal 0xf154c6c +/* f146178: 0fc5531b */ jal func0f153858 /* f14617c: afa302ec */ sw $v1,0x2ec($sp) -/* f146180: 0c002e4d */ jal 0xb934 +/* f146180: 0c002e4d */ jal viGetWidth /* f146184: 0040a825 */ move $s5,$v0 /* f146188: 00028400 */ sll $s0,$v0,0x10 /* f14618c: 0010cc03 */ sra $t9,$s0,0x10 -/* f146190: 0c002e51 */ jal 0xb944 +/* f146190: 0c002e51 */ jal viGetHeight /* f146194: 03208025 */ move $s0,$t9 /* f146198: 3c0e8008 */ lui $t6,0x8008 /* f14619c: 3c0f8008 */ lui $t7,0x8008 @@ -7969,7 +7969,7 @@ glabel var7f1b5f58 /* f1461d0: afaf0014 */ sw $t7,0x14($sp) /* f1461d4: afae0010 */ sw $t6,0x10($sp) /* f1461d8: afb80018 */ sw $t8,0x18($sp) -/* f1461dc: 0fc56160 */ jal 0xf158580 +/* f1461dc: 0fc56160 */ jal textRender /* f1461e0: afb9001c */ sw $t9,0x1c($sp) /* f1461e4: 1000008d */ b .PB0f14641c /* f1461e8: 0040a825 */ move $s5,$v0 @@ -7977,12 +7977,12 @@ glabel var7f1b5f58 .PB0f1461f0: /* f1461f0: 14610046 */ bne $v1,$at,.PB0f14630c /* f1461f4: 00000000 */ nop -/* f1461f8: 0fc5c06a */ jal 0xf1701a8 +/* f1461f8: 0fc5c06a */ jal langGet /* f1461fc: 240458d1 */ li $a0,0x58d1 /* f146200: 3c057f1b */ lui $a1,0x7f1b /* f146204: 24a57e4c */ addiu $a1,$a1,0x7e4c /* f146208: 02602025 */ move $a0,$s3 -/* f14620c: 0c004e1d */ jal 0x13874 +/* f14620c: 0c004e1d */ jal sprintf /* f146210: 00403025 */ move $a2,$v0 /* f146214: 3c0e8008 */ lui $t6,0x8008 /* f146218: 8dce1fd4 */ lw $t6,0x1fd4($t6) @@ -7992,7 +7992,7 @@ glabel var7f1b5f58 /* f146228: 27a502e4 */ addiu $a1,$sp,0x2e4 /* f14622c: 02603025 */ move $a2,$s3 /* f146230: afa00014 */ sw $zero,0x14($sp) -/* f146234: 0fc5625a */ jal 0xf158968 +/* f146234: 0fc5625a */ jal textMeasure /* f146238: afae0010 */ sw $t6,0x10($sp) /* f14623c: 8faf02a4 */ lw $t7,0x2a4($sp) /* f146240: 8fa30088 */ lw $v1,0x88($sp) @@ -8019,13 +8019,13 @@ glabel var7f1b5f58 /* f14628c: 27a502ec */ addiu $a1,$sp,0x2ec /* f146290: 27a602e8 */ addiu $a2,$sp,0x2e8 /* f146294: 27a702dc */ addiu $a3,$sp,0x2dc -/* f146298: 0fc5531b */ jal 0xf154c6c +/* f146298: 0fc5531b */ jal func0f153858 /* f14629c: afa302ec */ sw $v1,0x2ec($sp) -/* f1462a0: 0c002e4d */ jal 0xb934 +/* f1462a0: 0c002e4d */ jal viGetWidth /* f1462a4: 0040a825 */ move $s5,$v0 /* f1462a8: 00028400 */ sll $s0,$v0,0x10 /* f1462ac: 00107403 */ sra $t6,$s0,0x10 -/* f1462b0: 0c002e51 */ jal 0xb944 +/* f1462b0: 0c002e51 */ jal viGetHeight /* f1462b4: 01c08025 */ move $s0,$t6 /* f1462b8: 3c0f8008 */ lui $t7,0x8008 /* f1462bc: 3c188008 */ lui $t8,0x8008 @@ -8044,17 +8044,17 @@ glabel var7f1b5f58 /* f1462f0: afb80014 */ sw $t8,0x14($sp) /* f1462f4: afaf0010 */ sw $t7,0x10($sp) /* f1462f8: afb90018 */ sw $t9,0x18($sp) -/* f1462fc: 0fc56160 */ jal 0xf158580 +/* f1462fc: 0fc56160 */ jal textRender /* f146300: afae001c */ sw $t6,0x1c($sp) /* f146304: 10000045 */ b .PB0f14641c /* f146308: 0040a825 */ move $s5,$v0 .PB0f14630c: -/* f14630c: 0fc5c06a */ jal 0xf1701a8 +/* f14630c: 0fc5c06a */ jal langGet /* f146310: 240458d2 */ li $a0,0x58d2 /* f146314: 3c057f1b */ lui $a1,0x7f1b /* f146318: 24a57e54 */ addiu $a1,$a1,0x7e54 /* f14631c: 02602025 */ move $a0,$s3 -/* f146320: 0c004e1d */ jal 0x13874 +/* f146320: 0c004e1d */ jal sprintf /* f146324: 00403025 */ move $a2,$v0 /* f146328: 3c0f8008 */ lui $t7,0x8008 /* f14632c: 8def1fd4 */ lw $t7,0x1fd4($t7) @@ -8064,7 +8064,7 @@ glabel var7f1b5f58 /* f14633c: 27a502e4 */ addiu $a1,$sp,0x2e4 /* f146340: 02603025 */ move $a2,$s3 /* f146344: afa00014 */ sw $zero,0x14($sp) -/* f146348: 0fc5625a */ jal 0xf158968 +/* f146348: 0fc5625a */ jal textMeasure /* f14634c: afaf0010 */ sw $t7,0x10($sp) /* f146350: 8fb802a4 */ lw $t8,0x2a4($sp) /* f146354: 8fa30088 */ lw $v1,0x88($sp) @@ -8091,13 +8091,13 @@ glabel var7f1b5f58 /* f1463a0: 27a502ec */ addiu $a1,$sp,0x2ec /* f1463a4: 27a602e8 */ addiu $a2,$sp,0x2e8 /* f1463a8: 27a702dc */ addiu $a3,$sp,0x2dc -/* f1463ac: 0fc5531b */ jal 0xf154c6c +/* f1463ac: 0fc5531b */ jal func0f153858 /* f1463b0: afa302ec */ sw $v1,0x2ec($sp) -/* f1463b4: 0c002e4d */ jal 0xb934 +/* f1463b4: 0c002e4d */ jal viGetWidth /* f1463b8: 0040a825 */ move $s5,$v0 /* f1463bc: 00028400 */ sll $s0,$v0,0x10 /* f1463c0: 00107c03 */ sra $t7,$s0,0x10 -/* f1463c4: 0c002e51 */ jal 0xb944 +/* f1463c4: 0c002e51 */ jal viGetHeight /* f1463c8: 01e08025 */ move $s0,$t7 /* f1463cc: 3c188008 */ lui $t8,0x8008 /* f1463d0: 3c198008 */ lui $t9,0x8008 @@ -8116,7 +8116,7 @@ glabel var7f1b5f58 /* f146404: afb90014 */ sw $t9,0x14($sp) /* f146408: afb80010 */ sw $t8,0x10($sp) /* f14640c: afae0018 */ sw $t6,0x18($sp) -/* f146410: 0fc56160 */ jal 0xf158580 +/* f146410: 0fc56160 */ jal textRender /* f146414: afaf001c */ sw $t7,0x1c($sp) /* f146418: 0040a825 */ move $s5,$v0 .PB0f14641c: @@ -8125,12 +8125,12 @@ glabel var7f1b5f58 /* f146424: 9323006b */ lbu $v1,0x6b($t9) /* f146428: 5460000b */ bnezl $v1,.PB0f146458 /* f14642c: 24010001 */ li $at,0x1 -/* f146430: 0fc5c06a */ jal 0xf1701a8 +/* f146430: 0fc5c06a */ jal langGet /* f146434: 24045813 */ li $a0,0x5813 /* f146438: 3c057f1b */ lui $a1,0x7f1b /* f14643c: 24a57e5c */ addiu $a1,$a1,0x7e5c /* f146440: 02602025 */ move $a0,$s3 -/* f146444: 0c004e1d */ jal 0x13874 +/* f146444: 0c004e1d */ jal sprintf /* f146448: 00403025 */ move $a2,$v0 /* f14644c: 10000014 */ b .PB0f1464a0 /* f146450: 00000000 */ nop @@ -8138,22 +8138,22 @@ glabel var7f1b5f58 .PB0f146458: /* f146458: 1461000a */ bne $v1,$at,.PB0f146484 /* f14645c: 00000000 */ nop -/* f146460: 0fc5c06a */ jal 0xf1701a8 +/* f146460: 0fc5c06a */ jal langGet /* f146464: 24045892 */ li $a0,0x5892 /* f146468: 3c057f1b */ lui $a1,0x7f1b /* f14646c: 24a57e60 */ addiu $a1,$a1,0x7e60 /* f146470: 02602025 */ move $a0,$s3 -/* f146474: 0c004e1d */ jal 0x13874 +/* f146474: 0c004e1d */ jal sprintf /* f146478: 00403025 */ move $a2,$v0 /* f14647c: 10000008 */ b .PB0f1464a0 /* f146480: 00000000 */ nop .PB0f146484: -/* f146484: 0fc5c06a */ jal 0xf1701a8 +/* f146484: 0fc5c06a */ jal langGet /* f146488: 2404589b */ li $a0,0x589b /* f14648c: 3c057f1b */ lui $a1,0x7f1b /* f146490: 24a57e64 */ addiu $a1,$a1,0x7e64 /* f146494: 02602025 */ move $a0,$s3 -/* f146498: 0c004e1d */ jal 0x13874 +/* f146498: 0c004e1d */ jal sprintf /* f14649c: 00403025 */ move $a2,$v0 .PB0f1464a0: /* f1464a0: 3c0e8008 */ lui $t6,0x8008 @@ -8164,7 +8164,7 @@ glabel var7f1b5f58 /* f1464b4: 27a502e4 */ addiu $a1,$sp,0x2e4 /* f1464b8: 02603025 */ move $a2,$s3 /* f1464bc: afa00014 */ sw $zero,0x14($sp) -/* f1464c0: 0fc5625a */ jal 0xf158968 +/* f1464c0: 0fc5625a */ jal textMeasure /* f1464c4: afae0010 */ sw $t6,0x10($sp) /* f1464c8: 8fa902a4 */ lw $t1,0x2a4($sp) /* f1464cc: 8faf0088 */ lw $t7,0x88($sp) @@ -8198,13 +8198,13 @@ glabel var7f1b5f58 /* f14652c: 27a502ec */ addiu $a1,$sp,0x2ec /* f146530: 27a602e8 */ addiu $a2,$sp,0x2e8 /* f146534: 27a702dc */ addiu $a3,$sp,0x2dc -/* f146538: 0fc5531b */ jal 0xf154c6c +/* f146538: 0fc5531b */ jal func0f153858 /* f14653c: afa302ec */ sw $v1,0x2ec($sp) -/* f146540: 0c002e4d */ jal 0xb934 +/* f146540: 0c002e4d */ jal viGetWidth /* f146544: 0040a825 */ move $s5,$v0 /* f146548: 00028400 */ sll $s0,$v0,0x10 /* f14654c: 00107403 */ sra $t6,$s0,0x10 -/* f146550: 0c002e51 */ jal 0xb944 +/* f146550: 0c002e51 */ jal viGetHeight /* f146554: 01c08025 */ move $s0,$t6 /* f146558: 3c0f8008 */ lui $t7,0x8008 /* f14655c: 3c188008 */ lui $t8,0x8008 @@ -8223,7 +8223,7 @@ glabel var7f1b5f58 /* f146590: afb80014 */ sw $t8,0x14($sp) /* f146594: afaf0010 */ sw $t7,0x10($sp) /* f146598: afb90018 */ sw $t9,0x18($sp) -/* f14659c: 0fc56160 */ jal 0xf158580 +/* f14659c: 0fc56160 */ jal textRender /* f1465a0: afae001c */ sw $t6,0x1c($sp) /* f1465a4: 8ecf0284 */ lw $t7,0x284($s6) /* f1465a8: 0040a825 */ move $s5,$v0 @@ -8234,22 +8234,22 @@ glabel var7f1b5f58 /* f1465bc: 1461000a */ bne $v1,$at,.PB0f1465e8 /* f1465c0: 00000000 */ nop .PB0f1465c4: -/* f1465c4: 0fc5c06a */ jal 0xf1701a8 +/* f1465c4: 0fc5c06a */ jal langGet /* f1465c8: 24045814 */ li $a0,0x5814 /* f1465cc: 3c057f1b */ lui $a1,0x7f1b /* f1465d0: 24a57e68 */ addiu $a1,$a1,0x7e68 /* f1465d4: 02602025 */ move $a0,$s3 -/* f1465d8: 0c004e1d */ jal 0x13874 +/* f1465d8: 0c004e1d */ jal sprintf /* f1465dc: 00403025 */ move $a2,$v0 /* f1465e0: 10000008 */ b .PB0f146604 /* f1465e4: 00000000 */ nop .PB0f1465e8: -/* f1465e8: 0fc5c06a */ jal 0xf1701a8 +/* f1465e8: 0fc5c06a */ jal langGet /* f1465ec: 24045891 */ li $a0,0x5891 /* f1465f0: 3c057f1b */ lui $a1,0x7f1b /* f1465f4: 24a57e6c */ addiu $a1,$a1,0x7e6c /* f1465f8: 02602025 */ move $a0,$s3 -/* f1465fc: 0c004e1d */ jal 0x13874 +/* f1465fc: 0c004e1d */ jal sprintf /* f146600: 00403025 */ move $a2,$v0 .PB0f146604: /* f146604: 3c198008 */ lui $t9,0x8008 @@ -8260,7 +8260,7 @@ glabel var7f1b5f58 /* f146618: 27a502e4 */ addiu $a1,$sp,0x2e4 /* f14661c: 02603025 */ move $a2,$s3 /* f146620: afa00014 */ sw $zero,0x14($sp) -/* f146624: 0fc5625a */ jal 0xf158968 +/* f146624: 0fc5625a */ jal textMeasure /* f146628: afb90010 */ sw $t9,0x10($sp) /* f14662c: 8fae02a4 */ lw $t6,0x2a4($sp) /* f146630: 3c014040 */ lui $at,0x4040 @@ -8304,13 +8304,13 @@ glabel var7f1b5f58 /* f1466bc: afae0010 */ sw $t6,0x10($sp) /* f1466c0: afaf02dc */ sw $t7,0x2dc($sp) /* f1466c4: afa802e8 */ sw $t0,0x2e8($sp) -/* f1466c8: 0fc5531b */ jal 0xf154c6c +/* f1466c8: 0fc5531b */ jal func0f153858 /* f1466cc: afa302ec */ sw $v1,0x2ec($sp) -/* f1466d0: 0c002e4d */ jal 0xb934 +/* f1466d0: 0c002e4d */ jal viGetWidth /* f1466d4: 0040a825 */ move $s5,$v0 /* f1466d8: 00028400 */ sll $s0,$v0,0x10 /* f1466dc: 00107c03 */ sra $t7,$s0,0x10 -/* f1466e0: 0c002e51 */ jal 0xb944 +/* f1466e0: 0c002e51 */ jal viGetHeight /* f1466e4: 01e08025 */ move $s0,$t7 /* f1466e8: 3c188008 */ lui $t8,0x8008 /* f1466ec: 3c198008 */ lui $t9,0x8008 @@ -8329,13 +8329,13 @@ glabel var7f1b5f58 /* f146720: afb90014 */ sw $t9,0x14($sp) /* f146724: afb80010 */ sw $t8,0x10($sp) /* f146728: afae0018 */ sw $t6,0x18($sp) -/* f14672c: 0fc56160 */ jal 0xf158580 +/* f14672c: 0fc56160 */ jal textRender /* f146730: afaf001c */ sw $t7,0x1c($sp) -/* f146734: 0fc55313 */ jal 0xf154c4c +/* f146734: 0fc55313 */ jal func0f153838 /* f146738: 00402025 */ move $a0,$v0 /* f14673c: 8ed80288 */ lw $t8,0x288($s6) /* f146740: 0040a825 */ move $s5,$v0 -/* f146744: 0fc54ebe */ jal 0xf153af8 +/* f146744: 0fc54ebe */ jal optionsGetContpadNum1 /* f146748: 8f040070 */ lw $a0,0x70($t8) /* f14674c: 00028600 */ sll $s0,$v0,0x18 /* f146750: 00022600 */ sll $a0,$v0,0x18 @@ -8343,25 +8343,25 @@ glabel var7f1b5f58 /* f146758: 00047603 */ sra $t6,$a0,0x18 /* f14675c: 03208025 */ move $s0,$t9 /* f146760: 01c02025 */ move $a0,$t6 -/* f146764: 0c00566a */ jal 0x159a8 +/* f146764: 0c00566a */ jal joyGetButtons /* f146768: 3405ffff */ li $a1,0xffff /* f14676c: 00102600 */ sll $a0,$s0,0x18 /* f146770: 00047e03 */ sra $t7,$a0,0x18 /* f146774: 01e02025 */ move $a0,$t7 /* f146778: 3051ffff */ andi $s1,$v0,0xffff -/* f14677c: 0c00569a */ jal 0x15a68 +/* f14677c: 0c00569a */ jal joyGetButtonsPressedThisFrame /* f146780: 3405ffff */ li $a1,0xffff /* f146784: 00102600 */ sll $a0,$s0,0x18 /* f146788: 0004c603 */ sra $t8,$a0,0x18 /* f14678c: 3052ffff */ andi $s2,$v0,0xffff -/* f146790: 0c005616 */ jal 0x15858 +/* f146790: 0c005616 */ jal joyGetStickX /* f146794: 03002025 */ move $a0,$t8 /* f146798: 0002a600 */ sll $s4,$v0,0x18 /* f14679c: 00102600 */ sll $a0,$s0,0x18 /* f1467a0: 00047603 */ sra $t6,$a0,0x18 /* f1467a4: 0014ce03 */ sra $t9,$s4,0x18 /* f1467a8: 0320a025 */ move $s4,$t9 -/* f1467ac: 0c005640 */ jal 0x15900 +/* f1467ac: 0c005640 */ jal joyGetStickY /* f1467b0: 01c02025 */ move $a0,$t6 /* f1467b4: 02a01825 */ move $v1,$s5 /* f1467b8: 26b50008 */ addiu $s5,$s5,0x8 @@ -10141,7 +10141,7 @@ glabel var7f1b5f58 /* f148204: a3a000c3 */ sb $zero,0xc3($sp) .PB0f148208: /* f148208: afa500bc */ sw $a1,0xbc($sp) -/* f14820c: 0fc3530f */ jal 0xf0d4c3c +/* f14820c: 0fc3530f */ jal func0f0d479c /* f148210: afa6007c */ sw $a2,0x7c($sp) /* f148214: 3c0eb600 */ lui $t6,0xb600 /* f148218: 24193000 */ li $t9,0x3000 @@ -10230,7 +10230,7 @@ glabel var7f1b5f58 /* f148354: 01f97023 */ subu $t6,$t7,$t9 /* f148358: 448e2000 */ mtc1 $t6,$f4 /* f14835c: afa302ec */ sw $v1,0x2ec($sp) -/* f148360: 0c012ae4 */ jal 0x4ab90 +/* f148360: 0c012ae4 */ jal sqrtf /* f148364: 46802320 */ cvt.s.w $f12,$f4 /* f148368: c7aa02a8 */ lwc1 $f10,0x2a8($sp) /* f14836c: c7a6006c */ lwc1 $f6,0x6c($sp) @@ -10254,7 +10254,7 @@ glabel var7f1b5f58 /* f1483b4: 44034000 */ mfc1 $v1,$f8 /* f1483b8: 46802320 */ cvt.s.w $f12,$f4 /* f1483bc: afa30238 */ sw $v1,0x238($sp) -/* f1483c0: 0c012ae4 */ jal 0x4ab90 +/* f1483c0: 0c012ae4 */ jal sqrtf /* f1483c4: afa302ec */ sw $v1,0x2ec($sp) /* f1483c8: c7a602a8 */ lwc1 $f6,0x2a8($sp) /* f1483cc: c7aa006c */ lwc1 $f10,0x6c($sp) @@ -10284,7 +10284,7 @@ glabel var7f1b5f58 /* f14842c: 14600006 */ bnez $v1,.PB0f148448 /* f148430: 00000000 */ nop /* f148434: afa00010 */ sw $zero,0x10($sp) -/* f148438: 0fc51330 */ jal 0xf144cc0 +/* f148438: 0fc51330 */ jal bviewRenderEyespySideRect /* f14843c: afa20014 */ sw $v0,0x14($sp) /* f148440: 10000017 */ b .PB0f1484a0 /* f148444: 0040a825 */ move $s5,$v0 @@ -10298,7 +10298,7 @@ glabel var7f1b5f58 /* f148460: 27a50220 */ addiu $a1,$sp,0x220 /* f148464: 24060010 */ li $a2,0x10 /* f148468: 326700ff */ andi $a3,$s3,0xff -/* f14846c: 0fc51330 */ jal 0xf144cc0 +/* f14846c: 0fc51330 */ jal bviewRenderEyespySideRect /* f148470: afa20014 */ sw $v0,0x14($sp) /* f148474: 1000000a */ b .PB0f1484a0 /* f148478: 0040a825 */ move $s5,$v0 @@ -10309,7 +10309,7 @@ glabel var7f1b5f58 /* f148488: 27a50220 */ addiu $a1,$sp,0x220 /* f14848c: 326600ff */ andi $a2,$s3,0xff /* f148490: afa00010 */ sw $zero,0x10($sp) -/* f148494: 0fc51330 */ jal 0xf144cc0 +/* f148494: 0fc51330 */ jal bviewRenderEyespySideRect /* f148498: afa20014 */ sw $v0,0x14($sp) /* f14849c: 0040a825 */ move $s5,$v0 .PB0f1484a0: @@ -10386,7 +10386,7 @@ glabel var7f1b5f58 /* f1485a4: 01d87823 */ subu $t7,$t6,$t8 /* f1485a8: 448f5000 */ mtc1 $t7,$f10 /* f1485ac: afa802e8 */ sw $t0,0x2e8($sp) -/* f1485b0: 0c012ae4 */ jal 0x4ab90 +/* f1485b0: 0c012ae4 */ jal sqrtf /* f1485b4: 46805320 */ cvt.s.w $f12,$f10 /* f1485b8: c7a802a8 */ lwc1 $f8,0x2a8($sp) /* f1485bc: c7a6006c */ lwc1 $f6,0x6c($sp) @@ -10410,7 +10410,7 @@ glabel var7f1b5f58 /* f148604: 44033000 */ mfc1 $v1,$f6 /* f148608: 46805320 */ cvt.s.w $f12,$f10 /* f14860c: afa30238 */ sw $v1,0x238($sp) -/* f148610: 0c012ae4 */ jal 0x4ab90 +/* f148610: 0c012ae4 */ jal sqrtf /* f148614: afa302ec */ sw $v1,0x2ec($sp) /* f148618: c7a802a8 */ lwc1 $f8,0x2a8($sp) /* f14861c: c7a6006c */ lwc1 $f6,0x6c($sp) @@ -10440,7 +10440,7 @@ glabel var7f1b5f58 /* f14867c: 14600006 */ bnez $v1,.PB0f148698 /* f148680: 00000000 */ nop /* f148684: afa00010 */ sw $zero,0x10($sp) -/* f148688: 0fc51330 */ jal 0xf144cc0 +/* f148688: 0fc51330 */ jal bviewRenderEyespySideRect /* f14868c: afa20014 */ sw $v0,0x14($sp) /* f148690: 10000017 */ b .PB0f1486f0 /* f148694: 0040a825 */ move $s5,$v0 @@ -10454,7 +10454,7 @@ glabel var7f1b5f58 /* f1486b0: 27a50220 */ addiu $a1,$sp,0x220 /* f1486b4: 24060010 */ li $a2,0x10 /* f1486b8: 326700ff */ andi $a3,$s3,0xff -/* f1486bc: 0fc51330 */ jal 0xf144cc0 +/* f1486bc: 0fc51330 */ jal bviewRenderEyespySideRect /* f1486c0: afa20014 */ sw $v0,0x14($sp) /* f1486c4: 1000000a */ b .PB0f1486f0 /* f1486c8: 0040a825 */ move $s5,$v0 @@ -10465,7 +10465,7 @@ glabel var7f1b5f58 /* f1486d8: 27a50220 */ addiu $a1,$sp,0x220 /* f1486dc: 326600ff */ andi $a2,$s3,0xff /* f1486e0: afa00010 */ sw $zero,0x10($sp) -/* f1486e4: 0fc51330 */ jal 0xf144cc0 +/* f1486e4: 0fc51330 */ jal bviewRenderEyespySideRect /* f1486e8: afa20014 */ sw $v0,0x14($sp) /* f1486ec: 0040a825 */ move $s5,$v0 .PB0f1486f0: @@ -10477,7 +10477,7 @@ glabel var7f1b5f58 /* f148704: 25080002 */ addiu $t0,$t0,0x2 /* f148708: afa802e8 */ sw $t0,0x2e8($sp) .PB0f14870c: -/* f14870c: 0fc3539a */ jal 0xf0d4e68 +/* f14870c: 0fc3539a */ jal func0f0d49c8 /* f148710: 02a02025 */ move $a0,$s5 .PB0f148714: /* f148714: 8fbf0054 */ lw $ra,0x54($sp) diff --git a/src/game/bondwalk.c b/src/game/bondwalk.c index a2414df3a..cea93ef8e 100644 --- a/src/game/bondwalk.c +++ b/src/game/bondwalk.c @@ -4962,7 +4962,7 @@ glabel var7f1ad854 /* f0c6ea0: 44813000 */ mtc1 $at,$f6 /* f0c6ea4: c54419c4 */ lwc1 $f4,0x19c4($t2) /* f0c6ea8: 46062201 */ sub.s $f8,$f4,$f6 -/* f0c6eac: 0fc44c39 */ jal 0xf1130e4 +/* f0c6eac: 0fc44c39 */ jal invHasBriefcase /* f0c6eb0: e7a800c0 */ swc1 $f8,0xc0($sp) /* f0c6eb4: 3c08800a */ lui $t0,0x800a /* f0c6eb8: 1040000a */ beqz $v0,.PB0f0c6ee4 @@ -4999,7 +4999,7 @@ glabel var7f1ad854 /* f0c6f2c: 46080002 */ mul.s $f0,$f0,$f8 /* f0c6f30: 00000000 */ nop .PB0f0c6f34: -/* f0c6f34: 0fc41d39 */ jal 0xf1074e4 +/* f0c6f34: 0fc41d39 */ jal cheatIsActive /* f0c6f38: e7a000c0 */ swc1 $f0,0xc0($sp) /* f0c6f3c: 3c08800a */ lui $t0,0x800a /* f0c6f40: 10400006 */ beqz $v0,.PB0f0c6f5c @@ -5037,7 +5037,7 @@ glabel var7f1ad854 .PB0f0c6fbc: /* f0c6fbc: c42af52c */ lwc1 $f10,-0xad4($at) /* f0c6fc0: 460a0302 */ mul.s $f12,$f0,$f10 -/* f0c6fc4: 0c006b88 */ jal 0x1ae20 +/* f0c6fc4: 0c006b88 */ jal cosf /* f0c6fc8: 00000000 */ nop /* f0c6fcc: 3c013f80 */ lui $at,0x3f80 /* f0c6fd0: 44811000 */ mtc1 $at,$f2 @@ -5059,28 +5059,28 @@ glabel var7f1ad854 /* f0c7010: c4661b4c */ lwc1 $f6,0x1b4c($v1) /* f0c7014: 24671b08 */ addiu $a3,$v1,0x1b08 /* f0c7018: 46061101 */ sub.s $f4,$f2,$f6 -/* f0c701c: 0fc33212 */ jal 0xf0cc848 +/* f0c701c: 0fc33212 */ jal bmoveUpdateHead /* f0c7020: e7a40010 */ swc1 $f4,0x10($sp) /* f0c7024: 3c08800a */ lui $t0,0x800a /* f0c7028: 2508e4d0 */ addiu $t0,$t0,-6960 /* f0c702c: 8d090284 */ lw $t1,0x284($t0) /* f0c7030: 27a400cc */ addiu $a0,$sp,0xcc -/* f0c7034: 0fc32ff6 */ jal 0xf0cbfd8 +/* f0c7034: 0fc32ff6 */ jal bmoveUpdateMoveInitSpeed /* f0c7038: e53400cc */ swc1 $f20,0xcc($t1) /* f0c703c: 4405a000 */ mfc1 $a1,$f20 /* f0c7040: 4407a000 */ mfc1 $a3,$f20 /* f0c7044: 240a003f */ li $t2,0x3f /* f0c7048: afaa0010 */ sw $t2,0x10($sp) /* f0c704c: 27a400cc */ addiu $a0,$sp,0xcc -/* f0c7050: 0fc311b8 */ jal 0xf0c46e0 +/* f0c7050: 0fc311b8 */ jal bwalkCalculateNewPositionWithPush /* f0c7054: 24060001 */ li $a2,0x1 /* f0c7058: 3c08800a */ lui $t0,0x800a /* f0c705c: 100002e6 */ b .PB0f0c7bf8 /* f0c7060: 2508e4d0 */ addiu $t0,$t0,-6960 .PB0f0c7064: -/* f0c7064: 0fc31924 */ jal 0xf0c6490 +/* f0c7064: 0fc31924 */ jal bwalkApplyCrouchSpeed /* f0c7068: 00000000 */ nop -/* f0c706c: 0fc3198a */ jal 0xf0c6628 +/* f0c706c: 0fc3198a */ jal bwalkUpdateCrouchOffset /* f0c7070: 00000000 */ nop /* f0c7074: 3c08800a */ lui $t0,0x800a /* f0c7078: 2508e4d0 */ addiu $t0,$t0,-6960 @@ -5090,7 +5090,7 @@ glabel var7f1ad854 /* f0c7088: c468014c */ lwc1 $f8,0x14c($v1) /* f0c708c: 8c670150 */ lw $a3,0x150($v1) /* f0c7090: 2466017c */ addiu $a2,$v1,0x17c -/* f0c7094: 0fc32fc6 */ jal 0xf0cbf18 +/* f0c7094: 0fc32fc6 */ jal bmove0f0cba88 /* f0c7098: e7a80010 */ swc1 $f8,0x10($sp) /* f0c709c: 3c08800a */ lui $t0,0x800a /* f0c70a0: 2508e4d0 */ addiu $t0,$t0,-6960 @@ -5144,7 +5144,7 @@ glabel var7f1ad854 /* f0c7154: e7b000b4 */ swc1 $f16,0xb4($sp) /* f0c7158: 46129282 */ mul.s $f10,$f18,$f18 /* f0c715c: e7b200b0 */ swc1 $f18,0xb0($sp) -/* f0c7160: 0c012ae4 */ jal 0x4ab90 +/* f0c7160: 0c012ae4 */ jal sqrtf /* f0c7164: 460a4300 */ add.s $f12,$f8,$f10 /* f0c7168: 3c08800a */ lui $t0,0x800a /* f0c716c: 2508e4d0 */ addiu $t0,$t0,-6960 @@ -5331,7 +5331,7 @@ glabel var7f1ad854 /* f0c73f8: 46085102 */ mul.s $f4,$f10,$f8 /* f0c73fc: 46062280 */ add.s $f10,$f4,$f6 /* f0c7400: 46005082 */ mul.s $f2,$f10,$f0 -/* f0c7404: 0fc41d39 */ jal 0xf1074e4 +/* f0c7404: 0fc41d39 */ jal cheatIsActive /* f0c7408: e7a200e0 */ swc1 $f2,0xe0($sp) /* f0c740c: 3c08800a */ lui $t0,0x800a /* f0c7410: 2508e4d0 */ addiu $t0,$t0,-6960 @@ -5348,7 +5348,7 @@ glabel var7f1ad854 /* f0c7438: 44061000 */ mfc1 $a2,$f2 /* f0c743c: c7ac0078 */ lwc1 $f12,0x78($sp) /* f0c7440: 46062282 */ mul.s $f10,$f4,$f6 -/* f0c7444: 0fc332b9 */ jal 0xf0ccae4 +/* f0c7444: 0fc332b9 */ jal bmove0f0cc654 /* f0c7448: 46085380 */ add.s $f14,$f10,$f8 /* f0c744c: 3c08800a */ lui $t0,0x800a /* f0c7450: 2508e4d0 */ addiu $t0,$t0,-6960 @@ -5360,7 +5360,7 @@ glabel var7f1ad854 /* f0c7468: c46003c0 */ lwc1 $f0,0x3c0($v1) /* f0c746c: c46203c8 */ lwc1 $f2,0x3c8($v1) /* f0c7470: e7a000dc */ swc1 $f0,0xdc($sp) -/* f0c7474: 0fc41d39 */ jal 0xf1074e4 +/* f0c7474: 0fc41d39 */ jal cheatIsActive /* f0c7478: e7a200d8 */ swc1 $f2,0xd8($sp) /* f0c747c: 3c08800a */ lui $t0,0x800a /* f0c7480: 2508e4d0 */ addiu $t0,$t0,-6960 @@ -5400,9 +5400,9 @@ glabel var7f1ad854 /* f0c7504: e7a400d4 */ swc1 $f4,0xd4($sp) /* f0c7508: 46062280 */ add.s $f10,$f4,$f6 /* f0c750c: e7a800cc */ swc1 $f8,0xcc($sp) -/* f0c7510: 0fc32ff6 */ jal 0xf0cbfd8 +/* f0c7510: 0fc32ff6 */ jal bmoveUpdateMoveInitSpeed /* f0c7514: e7aa00d4 */ swc1 $f10,0xd4($sp) -/* f0c7518: 0fc48092 */ jal 0xf120248 +/* f0c7518: 0fc48092 */ jal debugIsTurboModeEnabled /* f0c751c: 00000000 */ nop /* f0c7520: 3c08800a */ lui $t0,0x800a /* f0c7524: 1040001f */ beqz $v0,.PB0f0c75a4 @@ -5466,7 +5466,7 @@ glabel var7f1ad854 /* f0c7600: 246502a4 */ addiu $a1,$v1,0x2a4 /* f0c7604: 51a0006a */ beqzl $t5,.PB0f0c77b0 /* f0c7608: 8c640298 */ lw $a0,0x298($v1) -/* f0c760c: 0c0011d8 */ jal 0x4760 +/* f0c760c: 0c0011d8 */ jal guNormalize /* f0c7610: 246602a8 */ addiu $a2,$v1,0x2a8 /* f0c7614: 3c08800a */ lui $t0,0x800a /* f0c7618: 2508e4d0 */ addiu $t0,$t0,-6960 @@ -5508,7 +5508,7 @@ glabel var7f1ad854 /* f0c76a8: e46a029c */ swc1 $f10,0x29c($v1) /* f0c76ac: 8c6400bc */ lw $a0,0xbc($v1) .PB0f0c76b0: -/* f0c76b0: 0fc3094c */ jal 0xf0c2530 +/* f0c76b0: 0fc3094c */ jal playerGetBbox /* f0c76b4: e7a00074 */ swc1 $f0,0x74($sp) /* f0c76b8: 3c08800a */ lui $t0,0x800a /* f0c76bc: 3c017f1b */ lui $at,0x7f1b @@ -5534,7 +5534,7 @@ glabel var7f1ad854 /* f0c770c: 460a3200 */ add.s $f8,$f6,$f10 /* f0c7710: 24440008 */ addiu $a0,$v0,0x8 /* f0c7714: 44074000 */ mfc1 $a3,$f8 -/* f0c7718: 0c00a9bf */ jal 0x2a6fc +/* f0c7718: 0c00a9bf */ jal cd0002a13c /* f0c771c: 00000000 */ nop /* f0c7720: 3c08800a */ lui $t0,0x800a /* f0c7724: 2508e4d0 */ addiu $t0,$t0,-6960 @@ -5613,7 +5613,7 @@ glabel var7f1ad854 /* f0c7830: 00000000 */ nop /* f0c7834: 24050001 */ li $a1,0x1 .PB0f0c7838: -/* f0c7838: 0fc31a19 */ jal 0xf0c6864 +/* f0c7838: 0fc31a19 */ jal bwalk0f0c63bc /* f0c783c: 2406003f */ li $a2,0x3f /* f0c7840: 3c08800a */ lui $t0,0x800a /* f0c7844: 2508e4d0 */ addiu $t0,$t0,-6960 @@ -5854,7 +5854,7 @@ glabel var7f1ad854 /* f0c7bb0: 46082180 */ add.s $f6,$f4,$f8 /* f0c7bb4: 460e3303 */ div.s $f12,$f6,$f14 .PB0f0c7bb8: -/* f0c7bb8: 0c012ae4 */ jal 0x4ab90 +/* f0c7bb8: 0c012ae4 */ jal sqrtf /* f0c7bbc: 00000000 */ nop /* f0c7bc0: c7a400b4 */ lwc1 $f4,0xb4($sp) /* f0c7bc4: 3c08800a */ lui $t0,0x800a @@ -5886,7 +5886,7 @@ glabel var7f1ad854 /* f0c7c28: c46a00cc */ lwc1 $f10,0xcc($v1) /* f0c7c2c: e7aa003c */ swc1 $f10,0x3c($sp) /* f0c7c30: 46083080 */ add.s $f2,$f6,$f8 -/* f0c7c34: 0fc45283 */ jal 0xf114a0c +/* f0c7c34: 0fc45283 */ jal bheadGetBreathingValue /* f0c7c38: e7a20040 */ swc1 $f2,0x40($sp) /* f0c7c3c: 3c013f80 */ lui $at,0x3f80 /* f0c7c40: 44817000 */ mtc1 $at,$f14 @@ -5922,7 +5922,7 @@ glabel var7f1ad854 /* f0c7cac: 46040302 */ mul.s $f12,$f0,$f4 /* f0c7cb0: 00000000 */ nop .PB0f0c7cb4: -/* f0c7cb4: 0fc276b8 */ jal 0xf09dae0 +/* f0c7cb4: 0fc276b8 */ jal bgun0f09d8dc /* f0c7cb8: e7b40010 */ swc1 $f20,0x10($sp) /* f0c7cbc: 3c08800a */ lui $t0,0x800a /* f0c7cc0: 2508e4d0 */ addiu $t0,$t0,-6960 @@ -5931,7 +5931,7 @@ glabel var7f1ad854 /* f0c7ccc: c428f574 */ lwc1 $f8,-0xa8c($at) /* f0c7cd0: c5a60158 */ lwc1 $f6,0x158($t5) /* f0c7cd4: 46083302 */ mul.s $f12,$f6,$f8 -/* f0c7cd8: 0fc28945 */ jal 0xf0a2514 +/* f0c7cd8: 0fc28945 */ jal bgunSetAdjustPos /* f0c7cdc: 00000000 */ nop /* f0c7ce0: 8fbf0024 */ lw $ra,0x24($sp) /* f0c7ce4: d7b40018 */ ldc1 $f20,0x18($sp) diff --git a/src/game/bot.c b/src/game/bot.c index 584d704d5..2d668ec6b 100644 --- a/src/game/bot.c +++ b/src/game/bot.c @@ -10443,7 +10443,7 @@ glabel var7f1b8fc8 /* f19670c: afb20028 */ sw $s2,0x28($sp) /* f196710: afb10024 */ sw $s1,0x24($sp) /* f196714: afb00020 */ sw $s0,0x20($sp) -/* f196718: 0fc0e6e9 */ jal 0xf039ba4 +/* f196718: 0fc0e6e9 */ jal chrIsDead /* f19671c: 2415ffff */ li $s5,-1 /* f196720: 14400a77 */ bnez $v0,.PB0f199100 /* f196724: 3c16800a */ lui $s6,0x800a @@ -10454,15 +10454,15 @@ glabel var7f1b8fc8 /* f196738: 01cfc823 */ subu $t9,$t6,$t7 /* f19673c: 07210017 */ bgez $t9,.PB0f19679c /* f196740: ae5902cc */ sw $t9,0x2cc($s2) -/* f196744: 0c004be0 */ jal 0x12f80 +/* f196744: 0c004be0 */ jal random /* f196748: 00000000 */ nop /* f19674c: 24012ee0 */ li $at,0x2ee0 /* f196750: 0041001b */ divu $zero,$v0,$at /* f196754: 00004810 */ mfhi $t1 /* f196758: 252a05dc */ addiu $t2,$t1,0x5dc -/* f19675c: 0c004be0 */ jal 0x12f80 +/* f19675c: 0c004be0 */ jal random /* f196760: ae4a02cc */ sw $t2,0x2cc($s2) -/* f196764: 0c004be0 */ jal 0x12f80 +/* f196764: 0c004be0 */ jal random /* f196768: ae4202d0 */ sw $v0,0x2d0($s2) /* f19676c: 44822000 */ mtc1 $v0,$f4 /* f196770: 3c014f80 */ lui $at,0x4f80 @@ -10493,7 +10493,7 @@ glabel var7f1b8fc8 /* f1967c8: 26100001 */ addiu $s0,$s0,0x1 /* f1967cc: 02002825 */ move $a1,$s0 /* f1967d0: 24060001 */ li $a2,0x1 -/* f1967d4: 0fc66d88 */ jal 0xf19b620 +/* f1967d4: 0fc66d88 */ jal botactReload /* f1967d8: afa70054 */ sw $a3,0x54($sp) /* f1967dc: 10000030 */ b .PB0f1968a0 /* f1967e0: 8fa70054 */ lw $a3,0x54($sp) @@ -10502,7 +10502,7 @@ glabel var7f1b8fc8 /* f1967e8: 8e440020 */ lw $a0,0x20($s2) /* f1967ec: afa70054 */ sw $a3,0x54($sp) /* f1967f0: 00057080 */ sll $t6,$a1,0x2 -/* f1967f4: 0fc66f9f */ jal 0xf19be7c +/* f1967f4: 0fc66f9f */ jal botactIsWeaponThrowable /* f1967f8: 000e2fc2 */ srl $a1,$t6,0x1f /* f1967fc: 14400028 */ bnez $v0,.PB0f1968a0 /* f196800: 8fa70054 */ lw $a3,0x54($sp) @@ -10514,7 +10514,7 @@ glabel var7f1b8fc8 /* f196818: 00054880 */ sll $t1,$a1,0x2 /* f19681c: 00092fc2 */ srl $a1,$t1,0x1f /* f196820: afa70054 */ sw $a3,0x54($sp) -/* f196824: 0fc66d76 */ jal 0xf19b5d8 +/* f196824: 0fc66d76 */ jal botactGetClipCapacityByFunction /* f196828: afa302e8 */ sw $v1,0x2e8($sp) /* f19682c: 8fa302e8 */ lw $v1,0x2e8($sp) /* f196830: 8fa70054 */ lw $a3,0x54($sp) @@ -10523,7 +10523,7 @@ glabel var7f1b8fc8 /* f19683c: 18400006 */ blez $v0,.PB0f196858 /* f196840: 02802025 */ move $a0,$s4 /* f196844: 02002825 */ move $a1,$s0 -/* f196848: 0fc6548f */ jal 0xf19523c +/* f196848: 0fc6548f */ jal botScheduleReload /* f19684c: afa70054 */ sw $a3,0x54($sp) /* f196850: 10000013 */ b .PB0f1968a0 /* f196854: 8fa70054 */ lw $a3,0x54($sp) @@ -10544,7 +10544,7 @@ glabel var7f1b8fc8 /* f196888: 50200006 */ beqzl $at,.PB0f1968a4 /* f19688c: 26100001 */ addiu $s0,$s0,0x1 /* f196890: 02002825 */ move $a1,$s0 -/* f196894: 0fc6548f */ jal 0xf19523c +/* f196894: 0fc6548f */ jal botScheduleReload /* f196898: afa70054 */ sw $a3,0x54($sp) /* f19689c: 8fa70054 */ lw $a3,0x54($sp) .PB0f1968a0: @@ -10561,10 +10561,10 @@ glabel var7f1b8fc8 /* f1968c4: 004fc823 */ subu $t9,$v0,$t7 /* f1968c8: 1f20003f */ bgtz $t9,.PB0f1969c8 /* f1968cc: ae5900cc */ sw $t9,0xcc($s2) -/* f1968d0: 0fc66634 */ jal 0xf1998d0 +/* f1968d0: 0fc66634 */ jal botinvGetItem /* f1968d4: 8e450020 */ lw $a1,0x20($s2) /* f1968d8: 00408025 */ move $s0,$v0 -/* f1968dc: 0fc4a7f5 */ jal 0xf129fd4 +/* f1968dc: 0fc4a7f5 */ jal playermgrGetModelOfWeapon /* f1968e0: 8e440020 */ lw $a0,0x20($s2) /* f1968e4: 12000019 */ beqz $s0,.PB0f19694c /* f1968e8: 00408825 */ move $s1,$v0 @@ -10572,11 +10572,11 @@ glabel var7f1b8fc8 /* f1968f0: 02802025 */ move $a0,$s4 /* f1968f4: 00402825 */ move $a1,$v0 /* f1968f8: 8e460020 */ lw $a2,0x20($s2) -/* f1968fc: 0fc22e53 */ jal 0xf08b94c +/* f1968fc: 0fc22e53 */ jal chrGiveWeapon /* f196900: 00003825 */ move $a3,$zero /* f196904: 02802025 */ move $a0,$s4 /* f196908: 00002825 */ move $a1,$zero -/* f19690c: 0fc66d88 */ jal 0xf19b620 +/* f19690c: 0fc66d88 */ jal botactReload /* f196910: 00003025 */ move $a2,$zero /* f196914: 8e090000 */ lw $t1,0x0($s0) /* f196918: 24010003 */ li $at,0x3 @@ -10584,11 +10584,11 @@ glabel var7f1b8fc8 /* f196920: 15210008 */ bne $t1,$at,.PB0f196944 /* f196924: 02202825 */ move $a1,$s1 /* f196928: 8e460020 */ lw $a2,0x20($s2) -/* f19692c: 0fc22e53 */ jal 0xf08b94c +/* f19692c: 0fc22e53 */ jal chrGiveWeapon /* f196930: 3c071000 */ lui $a3,0x1000 /* f196934: 02802025 */ move $a0,$s4 /* f196938: 24050001 */ li $a1,0x1 -/* f19693c: 0fc66d88 */ jal 0xf19b620 +/* f19693c: 0fc66d88 */ jal botactReload /* f196940: 00003025 */ move $a2,$zero .PB0f196944: /* f196944: 1000000e */ b .PB0f196980 @@ -10643,7 +10643,7 @@ glabel var7f1b8fc8 /* f1969ec: 8df80050 */ lw $t8,0x50($t7) /* f1969f0: 1b00000d */ blez $t8,.PB0f196a28 /* f1969f4: 02802025 */ move $a0,$s4 -/* f1969f8: 0fc64c78 */ jal 0xf1931e0 +/* f1969f8: 0fc64c78 */ jal botIsAboutToAttack /* f1969fc: 02e02825 */ move $a1,$s7 /* f196a00: 54400006 */ bnezl $v0,.PB0f196a1c /* f196a04: 924a004c */ lbu $t2,0x4c($s2) @@ -10702,11 +10702,11 @@ glabel var7f1b8fc8 /* f196ab8: 17210033 */ bne $t9,$at,.PB0f196b88 /* f196abc: 2405000d */ li $a1,0xd /* f196ac0: 00003025 */ move $a2,$zero -/* f196ac4: 0fc66df1 */ jal 0xf19b7c4 +/* f196ac4: 0fc66df1 */ jal botactGetAmmoQuantityByWeapon /* f196ac8: 02e03825 */ move $a3,$s7 /* f196acc: 00408025 */ move $s0,$v0 /* f196ad0: 02802025 */ move $a0,$s4 -/* f196ad4: 0fc64c78 */ jal 0xf1931e0 +/* f196ad4: 0fc64c78 */ jal botIsAboutToAttack /* f196ad8: 02e02825 */ move $a1,$s7 /* f196adc: 5040001a */ beqzl $v0,.PB0f196b48 /* f196ae0: 8e4b0210 */ lw $t3,0x210($s2) @@ -10793,7 +10793,7 @@ glabel var7f1b8fc8 .PB0f196c04: /* f196c04: 5c40013a */ bgtzl $v0,.PB0f1970f0 /* f196c08: 928d02a0 */ lbu $t5,0x2a0($s4) -/* f196c0c: 0fc6589f */ jal 0xf19627c +/* f196c0c: 0fc6589f */ jal botGetTeamSize /* f196c10: 02802025 */ move $a0,$s4 /* f196c14: 3c03800b */ lui $v1,0x800b /* f196c18: 906311b8 */ lbu $v1,0x11b8($v1) @@ -10802,7 +10802,7 @@ glabel var7f1b8fc8 /* f196c24: 16e3001e */ bne $s7,$v1,.PB0f196ca0 /* f196c28: 24010002 */ li $at,0x2 /* f196c2c: 2405000b */ li $a1,0xb -/* f196c30: 0fc658b3 */ jal 0xf1962cc +/* f196c30: 0fc658b3 */ jal botGetCountInTeamDoingCommand /* f196c34: 00003025 */ move $a2,$zero /* f196c38: 18400010 */ blez $v0,.PB0f196c7c /* f196c3c: 266c0001 */ addiu $t4,$s3,0x1 @@ -10814,7 +10814,7 @@ glabel var7f1b8fc8 /* f196c50: 004e082a */ slt $at,$v0,$t6 /* f196c54: 5420000a */ bnezl $at,.PB0f196c80 /* f196c58: 02802025 */ move $a0,$s4 -/* f196c5c: 0c004be0 */ jal 0x12f80 +/* f196c5c: 0c004be0 */ jal random /* f196c60: 00000000 */ nop /* f196c64: 24010064 */ li $at,0x64 /* f196c68: 0041001b */ divu $zero,$v0,$at @@ -10825,12 +10825,12 @@ glabel var7f1b8fc8 .PB0f196c7c: /* f196c7c: 02802025 */ move $a0,$s4 .PB0f196c80: -/* f196c80: 0fc6506e */ jal 0xf1941b8 +/* f196c80: 0fc6506e */ jal botApplyScenarioCommand /* f196c84: 2405000b */ li $a1,0xb /* f196c88: 10000111 */ b .PB0f1970d0 /* f196c8c: 00000000 */ nop .PB0f196c90: -/* f196c90: 0fc6506e */ jal 0xf1941b8 +/* f196c90: 0fc6506e */ jal botApplyScenarioCommand /* f196c94: 24050004 */ li $a1,0x4 /* f196c98: 1000010d */ b .PB0f1970d0 /* f196c9c: 00000000 */ nop @@ -10838,7 +10838,7 @@ glabel var7f1b8fc8 /* f196ca0: 14610022 */ bne $v1,$at,.PB0f196d2c /* f196ca4: 02802025 */ move $a0,$s4 /* f196ca8: 24050005 */ li $a1,0x5 -/* f196cac: 0fc658b3 */ jal 0xf1962cc +/* f196cac: 0fc658b3 */ jal botGetCountInTeamDoingCommand /* f196cb0: 00003025 */ move $a2,$zero /* f196cb4: 8e58004c */ lw $t8,0x4c($s2) /* f196cb8: 00184940 */ sll $t1,$t8,0x5 @@ -10854,7 +10854,7 @@ glabel var7f1b8fc8 /* f196cdc: 004b082a */ slt $at,$v0,$t3 /* f196ce0: 5420000a */ bnezl $at,.PB0f196d0c /* f196ce4: 02802025 */ move $a0,$s4 -/* f196ce8: 0c004be0 */ jal 0x12f80 +/* f196ce8: 0c004be0 */ jal random /* f196cec: 00000000 */ nop /* f196cf0: 24010064 */ li $at,0x64 /* f196cf4: 0041001b */ divu $zero,$v0,$at @@ -10865,12 +10865,12 @@ glabel var7f1b8fc8 .PB0f196d08: /* f196d08: 02802025 */ move $a0,$s4 .PB0f196d0c: -/* f196d0c: 0fc6506e */ jal 0xf1941b8 +/* f196d0c: 0fc6506e */ jal botApplyScenarioCommand /* f196d10: 24050005 */ li $a1,0x5 /* f196d14: 100000ee */ b .PB0f1970d0 /* f196d18: 00000000 */ nop .PB0f196d1c: -/* f196d1c: 0fc6506e */ jal 0xf1941b8 +/* f196d1c: 0fc6506e */ jal botApplyScenarioCommand /* f196d20: 24050004 */ li $a1,0x4 /* f196d24: 100000ea */ b .PB0f1970d0 /* f196d28: 00000000 */ nop @@ -10879,7 +10879,7 @@ glabel var7f1b8fc8 /* f196d30: 1461001e */ bne $v1,$at,.PB0f196dac /* f196d34: 02802025 */ move $a0,$s4 /* f196d38: 2405000c */ li $a1,0xc -/* f196d3c: 0fc658b3 */ jal 0xf1962cc +/* f196d3c: 0fc658b3 */ jal botGetCountInTeamDoingCommand /* f196d40: 00003025 */ move $a2,$zero /* f196d44: 18400010 */ blez $v0,.PB0f196d88 /* f196d48: 266c0001 */ addiu $t4,$s3,0x1 @@ -10891,7 +10891,7 @@ glabel var7f1b8fc8 /* f196d5c: 004e082a */ slt $at,$v0,$t6 /* f196d60: 5420000a */ bnezl $at,.PB0f196d8c /* f196d64: 02802025 */ move $a0,$s4 -/* f196d68: 0c004be0 */ jal 0x12f80 +/* f196d68: 0c004be0 */ jal random /* f196d6c: 00000000 */ nop /* f196d70: 24010064 */ li $at,0x64 /* f196d74: 0041001b */ divu $zero,$v0,$at @@ -10902,12 +10902,12 @@ glabel var7f1b8fc8 .PB0f196d88: /* f196d88: 02802025 */ move $a0,$s4 .PB0f196d8c: -/* f196d8c: 0fc6506e */ jal 0xf1941b8 +/* f196d8c: 0fc6506e */ jal botApplyScenarioCommand /* f196d90: 2405000c */ li $a1,0xc /* f196d94: 100000ce */ b .PB0f1970d0 /* f196d98: 00000000 */ nop .PB0f196d9c: -/* f196d9c: 0fc6506e */ jal 0xf1941b8 +/* f196d9c: 0fc6506e */ jal botApplyScenarioCommand /* f196da0: 24050004 */ li $a1,0x4 /* f196da4: 100000ca */ b .PB0f1970d0 /* f196da8: 00000000 */ nop @@ -10915,7 +10915,7 @@ glabel var7f1b8fc8 /* f196dac: 24010004 */ li $at,0x4 /* f196db0: 54610034 */ bnel $v1,$at,.PB0f196e84 /* f196db4: 24010005 */ li $at,0x5 -/* f196db8: 0fc6592b */ jal 0xf1964ac +/* f196db8: 0fc6592b */ jal botGetNumTeammatesDefendingHill /* f196dbc: 02802025 */ move $a0,$s4 /* f196dc0: 8e98001c */ lw $t8,0x1c($s4) /* f196dc4: 3c09800b */ lui $t1,0x800b @@ -10938,17 +10938,17 @@ glabel var7f1b8fc8 /* f196e00: 10200005 */ beqz $at,.PB0f196e18 /* f196e04: 00000000 */ nop .PB0f196e08: -/* f196e08: 0fc6506e */ jal 0xf1941b8 +/* f196e08: 0fc6506e */ jal botApplyScenarioCommand /* f196e0c: 2405000a */ li $a1,0xa /* f196e10: 100000af */ b .PB0f1970d0 /* f196e14: 00000000 */ nop .PB0f196e18: -/* f196e18: 0fc6594e */ jal 0xf196538 +/* f196e18: 0fc6594e */ jal botGetNumOpponentsInHill /* f196e1c: 02802025 */ move $a0,$s4 /* f196e20: 0050082a */ slt $at,$v0,$s0 /* f196e24: 10200012 */ beqz $at,.PB0f196e70 /* f196e28: 02802025 */ move $a0,$s4 -/* f196e2c: 0c004be0 */ jal 0x12f80 +/* f196e2c: 0c004be0 */ jal random /* f196e30: 00000000 */ nop /* f196e34: 24010064 */ li $at,0x64 /* f196e38: 0041001b */ divu $zero,$v0,$at @@ -10957,17 +10957,17 @@ glabel var7f1b8fc8 /* f196e44: 10200006 */ beqz $at,.PB0f196e60 /* f196e48: 02802025 */ move $a0,$s4 /* f196e4c: 02802025 */ move $a0,$s4 -/* f196e50: 0fc6506e */ jal 0xf1941b8 +/* f196e50: 0fc6506e */ jal botApplyScenarioCommand /* f196e54: 24050009 */ li $a1,0x9 /* f196e58: 1000009d */ b .PB0f1970d0 /* f196e5c: 00000000 */ nop .PB0f196e60: -/* f196e60: 0fc6506e */ jal 0xf1941b8 +/* f196e60: 0fc6506e */ jal botApplyScenarioCommand /* f196e64: 24050004 */ li $a1,0x4 /* f196e68: 10000099 */ b .PB0f1970d0 /* f196e6c: 00000000 */ nop .PB0f196e70: -/* f196e70: 0fc6506e */ jal 0xf1941b8 +/* f196e70: 0fc6506e */ jal botApplyScenarioCommand /* f196e74: 2405000a */ li $a1,0xa /* f196e78: 10000095 */ b .PB0f1970d0 /* f196e7c: 00000000 */ nop @@ -10979,23 +10979,23 @@ glabel var7f1b8fc8 /* f196e90: 02802025 */ move $a0,$s4 /* f196e94: 02802025 */ move $a0,$s4 /* f196e98: 24050006 */ li $a1,0x6 -/* f196e9c: 0fc658b3 */ jal 0xf1962cc +/* f196e9c: 0fc658b3 */ jal botGetCountInTeamDoingCommand /* f196ea0: 02e03025 */ move $a2,$s7 /* f196ea4: 00408025 */ move $s0,$v0 -/* f196ea8: 0fc65911 */ jal 0xf196444 +/* f196ea8: 0fc65911 */ jal botShouldReturnCtcToken /* f196eac: 02802025 */ move $a0,$s4 /* f196eb0: 10400005 */ beqz $v0,.PB0f196ec8 /* f196eb4: 02802025 */ move $a0,$s4 -/* f196eb8: 0fc6506e */ jal 0xf1941b8 +/* f196eb8: 0fc6506e */ jal botApplyScenarioCommand /* f196ebc: 24050006 */ li $a1,0x6 /* f196ec0: 10000083 */ b .PB0f1970d0 /* f196ec4: 00000000 */ nop .PB0f196ec8: -/* f196ec8: 0fc658f7 */ jal 0xf1963dc +/* f196ec8: 0fc658f7 */ jal botIsChrsCtcTokenHeld /* f196ecc: 02802025 */ move $a0,$s4 /* f196ed0: 10400012 */ beqz $v0,.PB0f196f1c /* f196ed4: 00000000 */ nop -/* f196ed8: 0c004be0 */ jal 0x12f80 +/* f196ed8: 0c004be0 */ jal random /* f196edc: 00000000 */ nop /* f196ee0: 24010064 */ li $at,0x64 /* f196ee4: 0041001b */ divu $zero,$v0,$at @@ -11004,17 +11004,17 @@ glabel var7f1b8fc8 /* f196ef0: 10200006 */ beqz $at,.PB0f196f0c /* f196ef4: 02802025 */ move $a0,$s4 /* f196ef8: 02802025 */ move $a0,$s4 -/* f196efc: 0fc6506e */ jal 0xf1941b8 +/* f196efc: 0fc6506e */ jal botApplyScenarioCommand /* f196f00: 24050006 */ li $a1,0x6 /* f196f04: 10000072 */ b .PB0f1970d0 /* f196f08: 00000000 */ nop .PB0f196f0c: -/* f196f0c: 0fc6506e */ jal 0xf1941b8 +/* f196f0c: 0fc6506e */ jal botApplyScenarioCommand /* f196f10: 24050008 */ li $a1,0x8 /* f196f14: 1000006e */ b .PB0f1970d0 /* f196f18: 00000000 */ nop .PB0f196f1c: -/* f196f1c: 0c004be0 */ jal 0x12f80 +/* f196f1c: 0c004be0 */ jal random /* f196f20: 00000000 */ nop /* f196f24: 24010064 */ li $at,0x64 /* f196f28: 0041001b */ divu $zero,$v0,$at @@ -11025,41 +11025,41 @@ glabel var7f1b8fc8 /* f196f3c: 1e000005 */ bgtz $s0,.PB0f196f54 /* f196f40: 24050008 */ li $a1,0x8 .PB0f196f44: -/* f196f44: 0fc6506e */ jal 0xf1941b8 +/* f196f44: 0fc6506e */ jal botApplyScenarioCommand /* f196f48: 24050006 */ li $a1,0x6 /* f196f4c: 10000060 */ b .PB0f1970d0 /* f196f50: 00000000 */ nop .PB0f196f54: -/* f196f54: 0fc6506e */ jal 0xf1941b8 +/* f196f54: 0fc6506e */ jal botApplyScenarioCommand /* f196f58: 02802025 */ move $a0,$s4 /* f196f5c: 1000005c */ b .PB0f1970d0 /* f196f60: 00000000 */ nop .PB0f196f64: /* f196f64: 24050006 */ li $a1,0x6 -/* f196f68: 0fc658b3 */ jal 0xf1962cc +/* f196f68: 0fc658b3 */ jal botGetCountInTeamDoingCommand /* f196f6c: 00003025 */ move $a2,$zero /* f196f70: 00408825 */ move $s1,$v0 /* f196f74: 02802025 */ move $a0,$s4 /* f196f78: 24050008 */ li $a1,0x8 -/* f196f7c: 0fc658b3 */ jal 0xf1962cc +/* f196f7c: 0fc658b3 */ jal botGetCountInTeamDoingCommand /* f196f80: 00003025 */ move $a2,$zero /* f196f84: 00408025 */ move $s0,$v0 -/* f196f88: 0fc65911 */ jal 0xf196444 +/* f196f88: 0fc65911 */ jal botShouldReturnCtcToken /* f196f8c: 02802025 */ move $a0,$s4 /* f196f90: 10400005 */ beqz $v0,.PB0f196fa8 /* f196f94: 02802025 */ move $a0,$s4 -/* f196f98: 0fc6506e */ jal 0xf1941b8 +/* f196f98: 0fc6506e */ jal botApplyScenarioCommand /* f196f9c: 24050006 */ li $a1,0x6 /* f196fa0: 1000004b */ b .PB0f1970d0 /* f196fa4: 00000000 */ nop .PB0f196fa8: -/* f196fa8: 0fc658f7 */ jal 0xf1963dc +/* f196fa8: 0fc658f7 */ jal botIsChrsCtcTokenHeld /* f196fac: 02802025 */ move $a0,$s4 /* f196fb0: 10400014 */ beqz $v0,.PB0f197004 /* f196fb4: 00000000 */ nop /* f196fb8: 5a00000a */ blezl $s0,.PB0f196fe4 /* f196fbc: 02802025 */ move $a0,$s4 -/* f196fc0: 0c004be0 */ jal 0x12f80 +/* f196fc0: 0c004be0 */ jal random /* f196fc4: 00000000 */ nop /* f196fc8: 24010064 */ li $at,0x64 /* f196fcc: 0041001b */ divu $zero,$v0,$at @@ -11069,12 +11069,12 @@ glabel var7f1b8fc8 /* f196fdc: 02802025 */ move $a0,$s4 /* f196fe0: 02802025 */ move $a0,$s4 .PB0f196fe4: -/* f196fe4: 0fc6506e */ jal 0xf1941b8 +/* f196fe4: 0fc6506e */ jal botApplyScenarioCommand /* f196fe8: 24050008 */ li $a1,0x8 /* f196fec: 10000038 */ b .PB0f1970d0 /* f196ff0: 00000000 */ nop .PB0f196ff4: -/* f196ff4: 0fc6506e */ jal 0xf1941b8 +/* f196ff4: 0fc6506e */ jal botApplyScenarioCommand /* f196ff8: 24050006 */ li $a1,0x6 /* f196ffc: 10000034 */ b .PB0f1970d0 /* f197000: 00000000 */ nop @@ -11087,7 +11087,7 @@ glabel var7f1b8fc8 /* f197018: 10200005 */ beqz $at,.PB0f197030 .PB0f19701c: /* f19701c: 02802025 */ move $a0,$s4 -/* f197020: 0fc6506e */ jal 0xf1941b8 +/* f197020: 0fc6506e */ jal botApplyScenarioCommand /* f197024: 24050006 */ li $a1,0x6 /* f197028: 10000029 */ b .PB0f1970d0 /* f19702c: 00000000 */ nop @@ -11103,12 +11103,12 @@ glabel var7f1b8fc8 /* f19704c: 10200005 */ beqz $at,.PB0f197064 /* f197050: 00000000 */ nop .PB0f197054: -/* f197054: 0fc6506e */ jal 0xf1941b8 +/* f197054: 0fc6506e */ jal botApplyScenarioCommand /* f197058: 24050008 */ li $a1,0x8 /* f19705c: 1000001c */ b .PB0f1970d0 /* f197060: 00000000 */ nop .PB0f197064: -/* f197064: 0c004be0 */ jal 0x12f80 +/* f197064: 0c004be0 */ jal random /* f197068: 00000000 */ nop /* f19706c: 24010064 */ li $at,0x64 /* f197070: 0041001b */ divu $zero,$v0,$at @@ -11116,12 +11116,12 @@ glabel var7f1b8fc8 /* f197078: 2f21001e */ sltiu $at,$t9,0x1e /* f19707c: 10200005 */ beqz $at,.PB0f197094 /* f197080: 02802025 */ move $a0,$s4 -/* f197084: 0fc6506e */ jal 0xf1941b8 +/* f197084: 0fc6506e */ jal botApplyScenarioCommand /* f197088: 24050006 */ li $a1,0x6 /* f19708c: 10000010 */ b .PB0f1970d0 /* f197090: 00000000 */ nop .PB0f197094: -/* f197094: 0c004be0 */ jal 0x12f80 +/* f197094: 0c004be0 */ jal random /* f197098: 00000000 */ nop /* f19709c: 24010064 */ li $at,0x64 /* f1970a0: 0041001b */ divu $zero,$v0,$at @@ -11130,15 +11130,15 @@ glabel var7f1b8fc8 /* f1970ac: 10200006 */ beqz $at,.PB0f1970c8 /* f1970b0: 02802025 */ move $a0,$s4 /* f1970b4: 02802025 */ move $a0,$s4 -/* f1970b8: 0fc6506e */ jal 0xf1941b8 +/* f1970b8: 0fc6506e */ jal botApplyScenarioCommand /* f1970bc: 24050008 */ li $a1,0x8 /* f1970c0: 10000003 */ b .PB0f1970d0 /* f1970c4: 00000000 */ nop .PB0f1970c8: -/* f1970c8: 0fc6506e */ jal 0xf1941b8 +/* f1970c8: 0fc6506e */ jal botApplyScenarioCommand /* f1970cc: 24050004 */ li $a1,0x4 .PB0f1970d0: -/* f1970d0: 0c004be0 */ jal 0x12f80 +/* f1970d0: 0c004be0 */ jal random /* f1970d4: 00000000 */ nop /* f1970d8: 240107d0 */ li $at,0x7d0 /* f1970dc: 0041001b */ divu $zero,$v0,$at @@ -11168,16 +11168,16 @@ glabel var7f1b8fc8 /* f197134: 02802025 */ move $a0,$s4 /* f197138: 13200007 */ beqz $t9,.PB0f197158 /* f19713c: 00000000 */ nop -/* f197140: 0fc0a255 */ jal 0xf028954 +/* f197140: 0fc0a255 */ jal chrGetTargetProp /* f197144: 2415002f */ li $s5,0x2f -/* f197148: 0fc63af1 */ jal 0xf18ebc4 +/* f197148: 0fc63af1 */ jal mpPlayerGetIndex /* f19714c: 8c440004 */ lw $a0,0x4($v0) /* f197150: a6420008 */ sh $v0,0x8($s2) /* f197154: ae5e01d8 */ sw $s8,0x1d8($s2) .PB0f197158: /* f197158: 06a10006 */ bgez $s5,.PB0f197174 /* f19715c: 00000000 */ nop -/* f197160: 0fc6588f */ jal 0xf19623c +/* f197160: 0fc6588f */ jal botFindDefaultPickup /* f197164: 02802025 */ move $a0,$s4 /* f197168: 10400002 */ beqz $v0,.PB0f197174 /* f19716c: ae420010 */ sw $v0,0x10($s2) @@ -11195,19 +11195,19 @@ glabel var7f1b8fc8 /* f197198: 000a50c0 */ sll $t2,$t2,0x3 /* f19719c: 014b6821 */ addu $t5,$t2,$t3 /* f1971a0: 8db00004 */ lw $s0,0x4($t5) -/* f1971a4: 0fc0e6e9 */ jal 0xf039ba4 +/* f1971a4: 0fc0e6e9 */ jal chrIsDead /* f1971a8: 02002025 */ move $a0,$s0 /* f1971ac: 14400232 */ bnez $v0,.PB0f197a78 /* f1971b0: 02802025 */ move $a0,$s4 -/* f1971b4: 0fc6513d */ jal 0xf1944f4 +/* f1971b4: 0fc6513d */ jal botIsTargetInvisible /* f1971b8: 02002825 */ move $a1,$s0 /* f1971bc: 1440022e */ bnez $v0,.PB0f197a78 /* f1971c0: 02802025 */ move $a0,$s4 -/* f1971c4: 0fc65258 */ jal 0xf194960 +/* f1971c4: 0fc65258 */ jal botPassesCowardCheck /* f1971c8: 02002825 */ move $a1,$s0 /* f1971cc: 1040022a */ beqz $v0,.PB0f197a78 /* f1971d0: 02002025 */ move $a0,$s0 -/* f1971d4: 0fc63af1 */ jal 0xf18ebc4 +/* f1971d4: 0fc63af1 */ jal mpPlayerGetIndex /* f1971d8: 2415002f */ li $s5,0x2f /* f1971dc: a6420008 */ sh $v0,0x8($s2) /* f1971e0: 10000225 */ b .PB0f197a78 @@ -11223,7 +11223,7 @@ glabel var7f1b8fc8 /* f197204: 000e70c0 */ sll $t6,$t6,0x3 /* f197208: 01cfc021 */ addu $t8,$t6,$t7 /* f19720c: 24150032 */ li $s5,0x32 -/* f197210: 0fc63af1 */ jal 0xf18ebc4 +/* f197210: 0fc63af1 */ jal mpPlayerGetIndex /* f197214: 8f040004 */ lw $a0,0x4($t8) /* f197218: 10000217 */ b .PB0f197a78 /* f19721c: a642000a */ sh $v0,0xa($s2) @@ -11238,7 +11238,7 @@ glabel var7f1b8fc8 /* f19723c: 000948c0 */ sll $t1,$t1,0x3 /* f197240: 012a5821 */ addu $t3,$t1,$t2 /* f197244: 24150032 */ li $s5,0x32 -/* f197248: 0fc63af1 */ jal 0xf18ebc4 +/* f197248: 0fc63af1 */ jal mpPlayerGetIndex /* f19724c: 8d640004 */ lw $a0,0x4($t3) /* f197250: 10000209 */ b .PB0f197a78 /* f197254: a642000a */ sh $v0,0xa($s2) @@ -11268,7 +11268,7 @@ glabel var7f1b8fc8 /* f1972a8: 000c7840 */ sll $t7,$t4,0x1 /* f1972ac: 05e0007f */ bltz $t7,.PB0f1974ac /* f1972b0: 00000000 */ nop -/* f1972b4: 0fc6414a */ jal 0xf190528 +/* f1972b4: 0fc6414a */ jal radarGetTeamIndex /* f1972b8: 92840125 */ lbu $a0,0x125($s4) /* f1972bc: 3c07800b */ lui $a3,0x800b /* f1972c0: 00003025 */ move $a2,$zero @@ -11321,7 +11321,7 @@ glabel var7f1b8fc8 /* f197364: 00000000 */ nop /* f197368: 18c00050 */ blez $a2,.PB0f1974ac /* f19736c: 00000000 */ nop -/* f197370: 0c004be0 */ jal 0x12f80 +/* f197370: 0c004be0 */ jal random /* f197374: afa60294 */ sw $a2,0x294($sp) /* f197378: 8fa60294 */ lw $a2,0x294($sp) /* f19737c: 0046001b */ divu $zero,$v0,$a2 @@ -11352,7 +11352,7 @@ glabel var7f1b8fc8 /* f1973d0: afa60294 */ sw $a2,0x294($sp) /* f1973d4: afa30288 */ sw $v1,0x288($sp) /* f1973d8: 02802025 */ move $a0,$s4 -/* f1973dc: 0fc1259e */ jal 0xf049678 +/* f1973dc: 0fc1259e */ jal chrGetSquaredDistanceToCoord /* f1973e0: 24a50008 */ addiu $a1,$a1,0x8 /* f1973e4: 3c017f1c */ lui $at,0x7f1c /* f1973e8: c424b2f4 */ lwc1 $f4,-0x4d0c($at) @@ -11398,17 +11398,17 @@ glabel var7f1b8fc8 /* f197470: 10000181 */ b .PB0f197a78 /* f197474: ae420010 */ sw $v0,0x10($s2) .PB0f197478: -/* f197478: 0fc6541f */ jal 0xf19507c +/* f197478: 0fc6541f */ jal botCanFollow /* f19747c: 8c450004 */ lw $a1,0x4($v0) /* f197480: 1040000a */ beqz $v0,.PB0f1974ac /* f197484: 00000000 */ nop -/* f197488: 0c004be0 */ jal 0x12f80 +/* f197488: 0c004be0 */ jal random /* f19748c: 24150032 */ li $s5,0x32 /* f197490: 304e0003 */ andi $t6,$v0,0x3 /* f197494: 2dcf0001 */ sltiu $t7,$t6,0x1 /* f197498: ae4f01e0 */ sw $t7,0x1e0($s2) /* f19749c: 8e780000 */ lw $t8,0x0($s3) -/* f1974a0: 0fc63af1 */ jal 0xf18ebc4 +/* f1974a0: 0fc63af1 */ jal mpPlayerGetIndex /* f1974a4: 8f040004 */ lw $a0,0x4($t8) /* f1974a8: a642000a */ sh $v0,0xa($s2) .PB0f1974ac: @@ -11422,7 +11422,7 @@ glabel var7f1b8fc8 /* f1974c4: 24010005 */ li $at,0x5 /* f1974c8: 1721016b */ bne $t9,$at,.PB0f197a78 /* f1974cc: 00000000 */ nop -/* f1974d0: 0fc6414a */ jal 0xf190528 +/* f1974d0: 0fc6414a */ jal radarGetTeamIndex /* f1974d4: 92840125 */ lbu $a0,0x125($s4) /* f1974d8: 00024880 */ sll $t1,$v0,0x2 /* f1974dc: 3c03800b */ lui $v1,0x800b @@ -11441,33 +11441,33 @@ glabel var7f1b8fc8 /* f19750c: 920b0125 */ lbu $t3,0x125($s0) /* f197510: 154b000e */ bne $t2,$t3,.PB0f19754c /* f197514: 00000000 */ nop -/* f197518: 0fc6541f */ jal 0xf19507c +/* f197518: 0fc6541f */ jal botCanFollow /* f19751c: 02002825 */ move $a1,$s0 /* f197520: 10400155 */ beqz $v0,.PB0f197a78 /* f197524: 00000000 */ nop -/* f197528: 0c004be0 */ jal 0x12f80 +/* f197528: 0c004be0 */ jal random /* f19752c: 24150032 */ li $s5,0x32 /* f197530: 304d0003 */ andi $t5,$v0,0x3 /* f197534: 2dac0001 */ sltiu $t4,$t5,0x1 /* f197538: ae4c01e0 */ sw $t4,0x1e0($s2) -/* f19753c: 0fc63af1 */ jal 0xf18ebc4 +/* f19753c: 0fc63af1 */ jal mpPlayerGetIndex /* f197540: 02002025 */ move $a0,$s0 /* f197544: 1000014c */ b .PB0f197a78 /* f197548: a642000a */ sh $v0,0xa($s2) .PB0f19754c: -/* f19754c: 0fc0e6e9 */ jal 0xf039ba4 +/* f19754c: 0fc0e6e9 */ jal chrIsDead /* f197550: 02002025 */ move $a0,$s0 /* f197554: 14400148 */ bnez $v0,.PB0f197a78 /* f197558: 02802025 */ move $a0,$s4 -/* f19755c: 0fc6513d */ jal 0xf1944f4 +/* f19755c: 0fc6513d */ jal botIsTargetInvisible /* f197560: 02002825 */ move $a1,$s0 /* f197564: 14400144 */ bnez $v0,.PB0f197a78 /* f197568: 02802025 */ move $a0,$s4 -/* f19756c: 0fc65258 */ jal 0xf194960 +/* f19756c: 0fc65258 */ jal botPassesCowardCheck /* f197570: 02002825 */ move $a1,$s0 /* f197574: 10400140 */ beqz $v0,.PB0f197a78 /* f197578: 02002025 */ move $a0,$s0 -/* f19757c: 0fc63af1 */ jal 0xf18ebc4 +/* f19757c: 0fc63af1 */ jal mpPlayerGetIndex /* f197580: 2415002f */ li $s5,0x2f /* f197584: a6420008 */ sh $v0,0x8($s2) /* f197588: 1000013b */ b .PB0f197a78 @@ -11481,7 +11481,7 @@ glabel var7f1b8fc8 /* f1975a4: 264500f8 */ addiu $a1,$s2,0xf8 /* f1975a8: e64600f0 */ swc1 $f6,0xf0($s2) /* f1975ac: c46a0010 */ lwc1 $f10,0x10($v1) -/* f1975b0: 0fc19661 */ jal 0xf065984 +/* f1975b0: 0fc19661 */ jal roomsCopy /* f1975b4: e64a00f4 */ swc1 $f10,0xf4($s2) /* f1975b8: 924e004c */ lbu $t6,0x4c($s2) /* f1975bc: 31cfff7f */ andi $t7,$t6,0xff7f @@ -11507,16 +11507,16 @@ glabel var7f1b8fc8 /* f197608: 8e4d0128 */ lw $t5,0x128($s2) /* f19760c: 11a00010 */ beqz $t5,.PB0f197650 /* f197610: 00000000 */ nop -/* f197614: 0fc0a255 */ jal 0xf028954 +/* f197614: 0fc0a255 */ jal chrGetTargetProp /* f197618: 02802025 */ move $a0,$s4 /* f19761c: 02802025 */ move $a0,$s4 -/* f197620: 0fc65258 */ jal 0xf194960 +/* f197620: 0fc65258 */ jal botPassesCowardCheck /* f197624: 8c450004 */ lw $a1,0x4($v0) /* f197628: 10400009 */ beqz $v0,.PB0f197650 /* f19762c: 02802025 */ move $a0,$s4 -/* f197630: 0fc0a255 */ jal 0xf028954 +/* f197630: 0fc0a255 */ jal chrGetTargetProp /* f197634: 2415002f */ li $s5,0x2f -/* f197638: 0fc63af1 */ jal 0xf18ebc4 +/* f197638: 0fc63af1 */ jal mpPlayerGetIndex /* f19763c: 8c440004 */ lw $a0,0x4($v0) /* f197640: 240c00fa */ li $t4,0xfa /* f197644: a6420008 */ sh $v0,0x8($s2) @@ -11529,7 +11529,7 @@ glabel var7f1b8fc8 /* f19765c: 8484073e */ lh $a0,0x73e($a0) /* f197660: 27a5026c */ addiu $a1,$sp,0x26c /* f197664: 27a60268 */ addiu $a2,$sp,0x268 -/* f197668: 0fc671fc */ jal 0xf19c7f0 +/* f197668: 0fc671fc */ jal botroomFindPos /* f19766c: 27a70264 */ addiu $a3,$sp,0x264 /* f197670: 10400101 */ beqz $v0,.PB0f197a78 /* f197674: c7b2026c */ lwc1 $f18,0x26c($sp) @@ -11541,7 +11541,7 @@ glabel var7f1b8fc8 /* f19768c: c7a80274 */ lwc1 $f8,0x274($sp) /* f197690: 2484073e */ addiu $a0,$a0,0x73e /* f197694: 264500f8 */ addiu $a1,$s2,0xf8 -/* f197698: 0fc19661 */ jal 0xf065984 +/* f197698: 0fc19661 */ jal roomsCopy /* f19769c: e64800f4 */ swc1 $f8,0xf4($s2) /* f1976a0: 8e8f001c */ lw $t7,0x1c($s4) /* f1976a4: 3c19800b */ lui $t9,0x800b @@ -11576,7 +11576,7 @@ glabel var7f1b8fc8 /* f197714: afad0010 */ sw $t5,0x10($sp) /* f197718: 8484073e */ lh $a0,0x73e($a0) /* f19771c: 27a60250 */ addiu $a2,$sp,0x250 -/* f197720: 0fc671fc */ jal 0xf19c7f0 +/* f197720: 0fc671fc */ jal botroomFindPos /* f197724: 27a7024c */ addiu $a3,$sp,0x24c /* f197728: 104000d3 */ beqz $v0,.PB0f197a78 /* f19772c: c7a60254 */ lwc1 $f6,0x254($sp) @@ -11588,7 +11588,7 @@ glabel var7f1b8fc8 /* f197744: c7b2025c */ lwc1 $f18,0x25c($sp) /* f197748: 2484073e */ addiu $a0,$a0,0x73e /* f19774c: 264500f8 */ addiu $a1,$s2,0xf8 -/* f197750: 0fc19661 */ jal 0xf065984 +/* f197750: 0fc19661 */ jal roomsCopy /* f197754: e65200f4 */ swc1 $f18,0xf4($s2) /* f197758: 8e8e001c */ lw $t6,0x1c($s4) /* f19775c: 3c0f800b */ lui $t7,0x800b @@ -11644,29 +11644,29 @@ glabel var7f1b8fc8 /* f19781c: 02002825 */ move $a1,$s0 /* f197820: 15cc000e */ bne $t6,$t4,.PB0f19785c /* f197824: 00000000 */ nop -/* f197828: 0fc6541f */ jal 0xf19507c +/* f197828: 0fc6541f */ jal botCanFollow /* f19782c: 02802025 */ move $a0,$s4 /* f197830: 10400091 */ beqz $v0,.PB0f197a78 /* f197834: 00000000 */ nop -/* f197838: 0c004be0 */ jal 0x12f80 +/* f197838: 0c004be0 */ jal random /* f19783c: 24150032 */ li $s5,0x32 /* f197840: 304f0003 */ andi $t7,$v0,0x3 /* f197844: 2df80001 */ sltiu $t8,$t7,0x1 /* f197848: ae5801e0 */ sw $t8,0x1e0($s2) -/* f19784c: 0fc63af1 */ jal 0xf18ebc4 +/* f19784c: 0fc63af1 */ jal mpPlayerGetIndex /* f197850: 02002025 */ move $a0,$s0 /* f197854: 10000088 */ b .PB0f197a78 /* f197858: a642000a */ sh $v0,0xa($s2) .PB0f19785c: -/* f19785c: 0fc6513d */ jal 0xf1944f4 +/* f19785c: 0fc6513d */ jal botIsTargetInvisible /* f197860: 02002825 */ move $a1,$s0 /* f197864: 14400084 */ bnez $v0,.PB0f197a78 /* f197868: 02802025 */ move $a0,$s4 -/* f19786c: 0fc65258 */ jal 0xf194960 +/* f19786c: 0fc65258 */ jal botPassesCowardCheck /* f197870: 02002825 */ move $a1,$s0 /* f197874: 10400080 */ beqz $v0,.PB0f197a78 /* f197878: 02002025 */ move $a0,$s0 -/* f19787c: 0fc63af1 */ jal 0xf18ebc4 +/* f19787c: 0fc63af1 */ jal mpPlayerGetIndex /* f197880: 2415002f */ li $s5,0x2f /* f197884: a6420008 */ sh $v0,0x8($s2) /* f197888: 1000007b */ b .PB0f197a78 @@ -11708,29 +11708,29 @@ glabel var7f1b8fc8 /* f19790c: 02002825 */ move $a1,$s0 /* f197910: 156e000e */ bne $t3,$t6,.PB0f19794c /* f197914: 00000000 */ nop -/* f197918: 0fc6541f */ jal 0xf19507c +/* f197918: 0fc6541f */ jal botCanFollow /* f19791c: 02802025 */ move $a0,$s4 /* f197920: 10400055 */ beqz $v0,.PB0f197a78 /* f197924: 00000000 */ nop -/* f197928: 0c004be0 */ jal 0x12f80 +/* f197928: 0c004be0 */ jal random /* f19792c: 24150032 */ li $s5,0x32 /* f197930: 304c0003 */ andi $t4,$v0,0x3 /* f197934: 2d8f0001 */ sltiu $t7,$t4,0x1 /* f197938: ae4f01e0 */ sw $t7,0x1e0($s2) -/* f19793c: 0fc63af1 */ jal 0xf18ebc4 +/* f19793c: 0fc63af1 */ jal mpPlayerGetIndex /* f197940: 02002025 */ move $a0,$s0 /* f197944: 1000004c */ b .PB0f197a78 /* f197948: a642000a */ sh $v0,0xa($s2) .PB0f19794c: -/* f19794c: 0fc6513d */ jal 0xf1944f4 +/* f19794c: 0fc6513d */ jal botIsTargetInvisible /* f197950: 02002825 */ move $a1,$s0 /* f197954: 14400048 */ bnez $v0,.PB0f197a78 /* f197958: 02802025 */ move $a0,$s4 -/* f19795c: 0fc65258 */ jal 0xf194960 +/* f19795c: 0fc65258 */ jal botPassesCowardCheck /* f197960: 02002825 */ move $a1,$s0 /* f197964: 10400044 */ beqz $v0,.PB0f197a78 /* f197968: 02002025 */ move $a0,$s0 -/* f19796c: 0fc63af1 */ jal 0xf18ebc4 +/* f19796c: 0fc63af1 */ jal mpPlayerGetIndex /* f197970: 2415002f */ li $s5,0x2f /* f197974: a6420008 */ sh $v0,0x8($s2) /* f197978: 1000003f */ b .PB0f197a78 @@ -11774,29 +11774,29 @@ glabel var7f1b8fc8 /* f197a08: 02002825 */ move $a1,$s0 /* f197a0c: 15f8000e */ bne $t7,$t8,.PB0f197a48 /* f197a10: 00000000 */ nop -/* f197a14: 0fc6541f */ jal 0xf19507c +/* f197a14: 0fc6541f */ jal botCanFollow /* f197a18: 02802025 */ move $a0,$s4 /* f197a1c: 10400016 */ beqz $v0,.PB0f197a78 /* f197a20: 00000000 */ nop -/* f197a24: 0c004be0 */ jal 0x12f80 +/* f197a24: 0c004be0 */ jal random /* f197a28: 24150032 */ li $s5,0x32 /* f197a2c: 30590003 */ andi $t9,$v0,0x3 /* f197a30: 2f290001 */ sltiu $t1,$t9,0x1 /* f197a34: ae4901e0 */ sw $t1,0x1e0($s2) -/* f197a38: 0fc63af1 */ jal 0xf18ebc4 +/* f197a38: 0fc63af1 */ jal mpPlayerGetIndex /* f197a3c: 02002025 */ move $a0,$s0 /* f197a40: 1000000d */ b .PB0f197a78 /* f197a44: a642000a */ sh $v0,0xa($s2) .PB0f197a48: -/* f197a48: 0fc6513d */ jal 0xf1944f4 +/* f197a48: 0fc6513d */ jal botIsTargetInvisible /* f197a4c: 02002825 */ move $a1,$s0 /* f197a50: 14400009 */ bnez $v0,.PB0f197a78 /* f197a54: 02802025 */ move $a0,$s4 -/* f197a58: 0fc65258 */ jal 0xf194960 +/* f197a58: 0fc65258 */ jal botPassesCowardCheck /* f197a5c: 02002825 */ move $a1,$s0 /* f197a60: 10400005 */ beqz $v0,.PB0f197a78 /* f197a64: 02002025 */ move $a0,$s0 -/* f197a68: 0fc63af1 */ jal 0xf18ebc4 +/* f197a68: 0fc63af1 */ jal mpPlayerGetIndex /* f197a6c: 2415002f */ li $s5,0x2f /* f197a70: a6420008 */ sh $v0,0x8($s2) /* f197a74: ae5e01d8 */ sw $s8,0x1d8($s2) @@ -11811,7 +11811,7 @@ glabel var7f1b8fc8 /* f197a94: 000a6fc2 */ srl $t5,$t2,0x1f /* f197a98: 11a00070 */ beqz $t5,.PB0f197c5c /* f197a9c: 00000000 */ nop -/* f197aa0: 0c004be0 */ jal 0x12f80 +/* f197aa0: 0c004be0 */ jal random /* f197aa4: 03c08025 */ move $s0,$s8 /* f197aa8: 24010064 */ li $at,0x64 /* f197aac: 0041001b */ divu $zero,$v0,$at @@ -11820,13 +11820,13 @@ glabel var7f1b8fc8 /* f197ab8: 10200005 */ beqz $at,.PB0f197ad0 /* f197abc: 02802025 */ move $a0,$s4 /* f197ac0: 3c0547c3 */ lui $a1,0x47c3 -/* f197ac4: 0fc65434 */ jal 0xf1950d0 +/* f197ac4: 0fc65434 */ jal botFindTeammateToFollow /* f197ac8: 34a55000 */ ori $a1,$a1,0x5000 /* f197acc: 00408025 */ move $s0,$v0 .PB0f197ad0: /* f197ad0: 06000062 */ bltz $s0,.PB0f197c5c /* f197ad4: 00000000 */ nop -/* f197ad8: 0c004be0 */ jal 0x12f80 +/* f197ad8: 0c004be0 */ jal random /* f197adc: 24150032 */ li $s5,0x32 /* f197ae0: 304e0003 */ andi $t6,$v0,0x3 /* f197ae4: 2dcc0001 */ sltiu $t4,$t6,0x1 @@ -11850,7 +11850,7 @@ glabel var7f1b8fc8 /* f197b28: 8d23001c */ lw $v1,0x1c($t1) /* f197b2c: 146a004b */ bne $v1,$t2,.PB0f197c5c /* f197b30: 00000000 */ nop -/* f197b34: 0c004be0 */ jal 0x12f80 +/* f197b34: 0c004be0 */ jal random /* f197b38: 03c08025 */ move $s0,$s8 /* f197b3c: 24010064 */ li $at,0x64 /* f197b40: 0041001b */ divu $zero,$v0,$at @@ -11859,13 +11859,13 @@ glabel var7f1b8fc8 /* f197b4c: 10200005 */ beqz $at,.PB0f197b64 /* f197b50: 02802025 */ move $a0,$s4 /* f197b54: 3c0547c3 */ lui $a1,0x47c3 -/* f197b58: 0fc65434 */ jal 0xf1950d0 +/* f197b58: 0fc65434 */ jal botFindTeammateToFollow /* f197b5c: 34a55000 */ ori $a1,$a1,0x5000 /* f197b60: 00408025 */ move $s0,$v0 .PB0f197b64: /* f197b64: 0600003d */ bltz $s0,.PB0f197c5c /* f197b68: 00000000 */ nop -/* f197b6c: 0c004be0 */ jal 0x12f80 +/* f197b6c: 0c004be0 */ jal random /* f197b70: 24150032 */ li $s5,0x32 /* f197b74: 304b0003 */ andi $t3,$v0,0x3 /* f197b78: 2d6e0001 */ sltiu $t6,$t3,0x1 @@ -11876,12 +11876,12 @@ glabel var7f1b8fc8 /* f197b88: 24010005 */ li $at,0x5 /* f197b8c: 54610021 */ bnel $v1,$at,.PB0f197c14 /* f197b90: 24010002 */ li $at,0x2 -/* f197b94: 0fc65911 */ jal 0xf196444 +/* f197b94: 0fc65911 */ jal botShouldReturnCtcToken /* f197b98: 02802025 */ move $a0,$s4 /* f197b9c: 1040002f */ beqz $v0,.PB0f197c5c /* f197ba0: 00000000 */ nop /* f197ba4: 92840125 */ lbu $a0,0x125($s4) -/* f197ba8: 0fc6414a */ jal 0xf190528 +/* f197ba8: 0fc6414a */ jal radarGetTeamIndex /* f197bac: 2415002b */ li $s5,0x2b /* f197bb0: 3c07800b */ lui $a3,0x800b /* f197bb4: 24e70730 */ addiu $a3,$a3,0x730 @@ -11892,7 +11892,7 @@ glabel var7f1b8fc8 /* f197bc8: 27a601d8 */ addiu $a2,$sp,0x1d8 /* f197bcc: 0003c100 */ sll $t8,$v1,0x4 /* f197bd0: 00f8c821 */ addu $t9,$a3,$t8 -/* f197bd4: 0fc458d4 */ jal 0xf116350 +/* f197bd4: 0fc458d4 */ jal padUnpack /* f197bd8: 87240018 */ lh $a0,0x18($t9) /* f197bdc: c7a401d8 */ lwc1 $f4,0x1d8($sp) /* f197be0: 924a004c */ lbu $t2,0x4c($s2) @@ -11915,7 +11915,7 @@ glabel var7f1b8fc8 /* f197c20: 8e8e001c */ lw $t6,0x1c($s4) /* f197c24: 156e000d */ bne $t3,$t6,.PB0f197c5c /* f197c28: 00000000 */ nop -/* f197c2c: 0fc63af1 */ jal 0xf18ebc4 +/* f197c2c: 0fc63af1 */ jal mpPlayerGetIndex /* f197c30: 02802025 */ move $a0,$s4 /* f197c34: 3c03800b */ lui $v1,0x800b /* f197c38: 24630730 */ addiu $v1,$v1,0x730 @@ -11941,7 +11941,7 @@ glabel var7f1b8fc8 /* f197c84: 04400098 */ bltz $v0,.PB0f197ee8 /* f197c88: 0002c880 */ sll $t9,$v0,0x2 /* f197c8c: 00b92821 */ addu $a1,$a1,$t9 -/* f197c90: 0fc6513d */ jal 0xf1944f4 +/* f197c90: 0fc6513d */ jal botIsTargetInvisible /* f197c94: 8ca50af0 */ lw $a1,0xaf0($a1) /* f197c98: 14400093 */ bnez $v0,.PB0f197ee8 /* f197c9c: 00000000 */ nop @@ -11964,7 +11964,7 @@ glabel var7f1b8fc8 /* f197cdc: 00026880 */ sll $t5,$v0,0x2 /* f197ce0: 00ad2821 */ addu $a1,$a1,$t5 /* f197ce4: 8ca50af0 */ lw $a1,0xaf0($a1) -/* f197ce8: 0fc12aec */ jal 0xf04abb0 +/* f197ce8: 0fc12aec */ jal chrCompareTeams /* f197cec: 24060001 */ li $a2,0x1 /* f197cf0: 54400004 */ bnezl $v0,.PB0f197d04 /* f197cf4: 8e420114 */ lw $v0,0x114($s2) @@ -11978,7 +11978,7 @@ glabel var7f1b8fc8 /* f197d0c: 04400076 */ bltz $v0,.PB0f197ee8 /* f197d10: 00027080 */ sll $t6,$v0,0x2 /* f197d14: 00ae2821 */ addu $a1,$a1,$t6 -/* f197d18: 0fc6513d */ jal 0xf1944f4 +/* f197d18: 0fc6513d */ jal botIsTargetInvisible /* f197d1c: 8ca50af0 */ lw $a1,0xaf0($a1) /* f197d20: 14400071 */ bnez $v0,.PB0f197ee8 /* f197d24: 00000000 */ nop @@ -11991,7 +11991,7 @@ glabel var7f1b8fc8 .PB0f197d40: /* f197d40: 5441002a */ bnel $v0,$at,.PB0f197dec /* f197d44: 24010006 */ li $at,0x6 -/* f197d48: 0fc62862 */ jal 0xf18a188 +/* f197d48: 0fc62862 */ jal mpGetPlayerRankings /* f197d4c: 27a400e4 */ addiu $a0,$sp,0xe4 /* f197d50: 18400065 */ blez $v0,.PB0f197ee8 /* f197d54: 0002c080 */ sll $t8,$v0,0x2 @@ -12001,24 +12001,24 @@ glabel var7f1b8fc8 /* f197d64: 0310c821 */ addu $t9,$t8,$s0 /* f197d68: afb90050 */ sw $t9,0x50($sp) .PB0f197d6c: -/* f197d6c: 0fc63b2d */ jal 0xf18ecb4 +/* f197d6c: 0fc63b2d */ jal func0f18d0e8 /* f197d70: 8e040004 */ lw $a0,0x4($s0) /* f197d74: afa200d8 */ sw $v0,0xd8($sp) -/* f197d78: 0fc63b03 */ jal 0xf18ec0c +/* f197d78: 0fc63b03 */ jal mpGetChrFromPlayerIndex /* f197d7c: 00402025 */ move $a0,$v0 /* f197d80: 10540012 */ beq $v0,$s4,.PB0f197dcc /* f197d84: 00402025 */ move $a0,$v0 -/* f197d88: 0fc0e6e9 */ jal 0xf039ba4 +/* f197d88: 0fc0e6e9 */ jal chrIsDead /* f197d8c: afa200d4 */ sw $v0,0xd4($sp) /* f197d90: 1440000e */ bnez $v0,.PB0f197dcc /* f197d94: 8fb100d4 */ lw $s1,0xd4($sp) /* f197d98: 02802025 */ move $a0,$s4 /* f197d9c: 02202825 */ move $a1,$s1 -/* f197da0: 0fc12aec */ jal 0xf04abb0 +/* f197da0: 0fc12aec */ jal chrCompareTeams /* f197da4: 24060002 */ li $a2,0x2 /* f197da8: 10400008 */ beqz $v0,.PB0f197dcc /* f197dac: 02802025 */ move $a0,$s4 -/* f197db0: 0fc6513d */ jal 0xf1944f4 +/* f197db0: 0fc6513d */ jal botIsTargetInvisible /* f197db4: 02202825 */ move $a1,$s1 /* f197db8: 14400004 */ bnez $v0,.PB0f197dcc /* f197dbc: 8fa900d8 */ lw $t1,0xd8($sp) @@ -12045,22 +12045,22 @@ glabel var7f1b8fc8 /* f197e08: 19a00032 */ blez $t5,.PB0f197ed4 /* f197e0c: e7aa00d0 */ swc1 $f10,0xd0($sp) .PB0f197e10: -/* f197e10: 0fc63b03 */ jal 0xf18ec0c +/* f197e10: 0fc63b03 */ jal mpGetChrFromPlayerIndex /* f197e14: 02002025 */ move $a0,$s0 /* f197e18: 10540029 */ beq $v0,$s4,.PB0f197ec0 /* f197e1c: 00402025 */ move $a0,$v0 -/* f197e20: 0fc0e6e9 */ jal 0xf039ba4 +/* f197e20: 0fc0e6e9 */ jal chrIsDead /* f197e24: afa200c0 */ sw $v0,0xc0($sp) /* f197e28: 14400025 */ bnez $v0,.PB0f197ec0 /* f197e2c: 8fa500c0 */ lw $a1,0xc0($sp) /* f197e30: 02802025 */ move $a0,$s4 /* f197e34: 24060002 */ li $a2,0x2 -/* f197e38: 0fc12aec */ jal 0xf04abb0 +/* f197e38: 0fc12aec */ jal chrCompareTeams /* f197e3c: afa500c0 */ sw $a1,0xc0($sp) /* f197e40: 1040001f */ beqz $v0,.PB0f197ec0 /* f197e44: 8fa500c0 */ lw $a1,0xc0($sp) /* f197e48: 02802025 */ move $a0,$s4 -/* f197e4c: 0fc6513d */ jal 0xf1944f4 +/* f197e4c: 0fc6513d */ jal botIsTargetInvisible /* f197e50: afa500c0 */ sw $a1,0xc0($sp) /* f197e54: 1440001a */ bnez $v0,.PB0f197ec0 /* f197e58: 8fa500c0 */ lw $a1,0xc0($sp) @@ -12072,7 +12072,7 @@ glabel var7f1b8fc8 /* f197e70: 1000000b */ b .PB0f197ea0 /* f197e74: 46049001 */ sub.s $f0,$f18,$f4 .PB0f197e78: -/* f197e78: 0fc4a797 */ jal 0xf129e5c +/* f197e78: 0fc4a797 */ jal playermgrGetPlayerNumByProp /* f197e7c: 8ca4001c */ lw $a0,0x1c($a1) /* f197e80: 00027080 */ sll $t6,$v0,0x2 /* f197e84: 02ce6021 */ addu $t4,$s6,$t6 @@ -12111,10 +12111,10 @@ glabel var7f1b8fc8 /* f197ef0: 8699017e */ lh $t9,0x17e($s4) /* f197ef4: 13d9000a */ beq $s8,$t9,.PB0f197f20 /* f197ef8: 00000000 */ nop -/* f197efc: 0fc0a255 */ jal 0xf028954 +/* f197efc: 0fc0a255 */ jal chrGetTargetProp /* f197f00: 02802025 */ move $a0,$s4 /* f197f04: 02802025 */ move $a0,$s4 -/* f197f08: 0fc65258 */ jal 0xf194960 +/* f197f08: 0fc65258 */ jal botPassesCowardCheck /* f197f0c: 8c450004 */ lw $a1,0x4($v0) /* f197f10: 10400003 */ beqz $v0,.PB0f197f20 /* f197f14: 00000000 */ nop @@ -12123,11 +12123,11 @@ glabel var7f1b8fc8 .PB0f197f20: /* f197f20: 06a1000b */ bgez $s5,.PB0f197f50 /* f197f24: 02802025 */ move $a0,$s4 -/* f197f28: 0fc65434 */ jal 0xf1950d0 +/* f197f28: 0fc65434 */ jal botFindTeammateToFollow /* f197f2c: 3c054396 */ lui $a1,0x4396 /* f197f30: 04400007 */ bltz $v0,.PB0f197f50 /* f197f34: 00408025 */ move $s0,$v0 -/* f197f38: 0c004be0 */ jal 0x12f80 +/* f197f38: 0c004be0 */ jal random /* f197f3c: 24150032 */ li $s5,0x32 /* f197f40: 30490003 */ andi $t1,$v0,0x3 /* f197f44: 2d2a0001 */ sltiu $t2,$t1,0x1 @@ -12136,7 +12136,7 @@ glabel var7f1b8fc8 .PB0f197f50: /* f197f50: 06a10006 */ bgez $s5,.PB0f197f6c /* f197f54: 00000000 */ nop -/* f197f58: 0fc65897 */ jal 0xf19625c +/* f197f58: 0fc65897 */ jal botFindAnyPickup /* f197f5c: 02802025 */ move $a0,$s4 /* f197f60: 10400002 */ beqz $v0,.PB0f197f6c /* f197f64: ae420010 */ sw $v0,0x10($s2) @@ -12152,7 +12152,7 @@ glabel var7f1b8fc8 /* f197f88: 02802025 */ move $a0,$s4 /* f197f8c: 50a0007c */ beqzl $a1,.PB0f198180 /* f197f90: 928202a0 */ lbu $v0,0x2a0($s4) -/* f197f94: 0fc0eb21 */ jal 0xf03ac84 +/* f197f94: 0fc0eb21 */ jal chrGoToProp /* f197f98: 24060002 */ li $a2,0x2 /* f197f9c: 10000077 */ b .PB0f19817c /* f197fa0: a29502a0 */ sb $s5,0x2a0($s4) @@ -12181,7 +12181,7 @@ glabel var7f1b8fc8 /* f197ff4: 02802025 */ move $a0,$s4 /* f197ff8: 51c00061 */ beqzl $t6,.PB0f198180 /* f197ffc: 928202a0 */ lbu $v0,0x2a0($s4) -/* f198000: 0fc650c9 */ jal 0xf194324 +/* f198000: 0fc650c9 */ jal botSetTarget /* f198004: 03c02825 */ move $a1,$s8 /* f198008: 1000005d */ b .PB0f198180 /* f19800c: 928202a0 */ lbu $v0,0x2a0($s4) @@ -12194,13 +12194,13 @@ glabel var7f1b8fc8 /* f198024: 02802025 */ move $a0,$s4 /* f198028: 51800004 */ beqzl $t4,.PB0f19803c /* f19802c: 02802025 */ move $a0,$s4 -/* f198030: 0fc650c9 */ jal 0xf194324 +/* f198030: 0fc650c9 */ jal botSetTarget /* f198034: 03c02825 */ move $a1,$s8 /* f198038: 02802025 */ move $a0,$s4 .PB0f19803c: /* f19803c: 2645008c */ addiu $a1,$s2,0x8c /* f198040: 2646007a */ addiu $a2,$s2,0x7a -/* f198044: 0fc0e153 */ jal 0xf03854c +/* f198044: 0fc0e153 */ jal chrGoToPos /* f198048: 24070002 */ li $a3,0x2 /* f19804c: 1000004c */ b .PB0f198180 /* f198050: 928202a0 */ lbu $v0,0x2a0($s4) @@ -12257,12 +12257,12 @@ glabel var7f1b8fc8 /* f19810c: 05e00005 */ bltz $t7,.PB0f198124 /* f198110: 00000000 */ nop .PB0f198114: -/* f198114: 0fc0e153 */ jal 0xf03854c +/* f198114: 0fc0e153 */ jal chrGoToPos /* f198118: a29502a0 */ sb $s5,0x2a0($s4) /* f19811c: 10000018 */ b .PB0f198180 /* f198120: 928202a0 */ lbu $v0,0x2a0($s4) .PB0f198124: -/* f198124: 0fc0bae3 */ jal 0xf02eb8c +/* f198124: 0fc0bae3 */ jal chrStand /* f198128: 02802025 */ move $a0,$s4 /* f19812c: 10000014 */ b .PB0f198180 /* f198130: 928202a0 */ lbu $v0,0x2a0($s4) @@ -12276,7 +12276,7 @@ glabel var7f1b8fc8 /* f19814c: 5320000c */ beqzl $t9,.PB0f198180 /* f198150: 928202a0 */ lbu $v0,0x2a0($s4) /* f198154: a29502a0 */ sb $s5,0x2a0($s4) -/* f198158: 0fc0eb21 */ jal 0xf03ac84 +/* f198158: 0fc0eb21 */ jal chrGoToProp /* f19815c: 8e450010 */ lw $a1,0x10($s2) /* f198160: 10000007 */ b .PB0f198180 /* f198164: 928202a0 */ lbu $v0,0x2a0($s4) @@ -12284,7 +12284,7 @@ glabel var7f1b8fc8 .PB0f19816c: /* f19816c: 16a10003 */ bne $s5,$at,.PB0f19817c /* f198170: 02802025 */ move $a0,$s4 -/* f198174: 0fc0bae3 */ jal 0xf02eb8c +/* f198174: 0fc0bae3 */ jal chrStand /* f198178: a29502a0 */ sb $s5,0x2a0($s4) .PB0f19817c: /* f19817c: 928202a0 */ lbu $v0,0x2a0($s4) @@ -12318,7 +12318,7 @@ glabel var7f1b8fc8 /* f1981e0: 04400011 */ bltz $v0,.PB0f198228 /* f1981e4: 00027080 */ sll $t6,$v0,0x2 /* f1981e8: 008e2021 */ addu $a0,$a0,$t6 -/* f1981ec: 0fc0e6e9 */ jal 0xf039ba4 +/* f1981ec: 0fc0e6e9 */ jal chrIsDead /* f1981f0: 8c840af0 */ lw $a0,0xaf0($a0) /* f1981f4: 5440000a */ bnezl $v0,.PB0f198220 /* f1981f8: 240f0029 */ li $t7,0x29 @@ -12327,7 +12327,7 @@ glabel var7f1b8fc8 /* f198204: 02802025 */ move $a0,$s4 /* f198208: 000cc080 */ sll $t8,$t4,0x2 /* f19820c: 00b82821 */ addu $a1,$a1,$t8 -/* f198210: 0fc65258 */ jal 0xf194960 +/* f198210: 0fc65258 */ jal botPassesCowardCheck /* f198214: 8ca50af0 */ lw $a1,0xaf0($a1) /* f198218: 14400003 */ bnez $v0,.PB0f198228 /* f19821c: 240f0029 */ li $t7,0x29 @@ -12341,16 +12341,16 @@ glabel var7f1b8fc8 /* f198234: 8689017e */ lh $t1,0x17e($s4) /* f198238: 53c9000e */ beql $s8,$t1,.PB0f198274 /* f19823c: 240a0029 */ li $t2,0x29 -/* f198240: 0fc0a255 */ jal 0xf028954 +/* f198240: 0fc0a255 */ jal chrGetTargetProp /* f198244: 02802025 */ move $a0,$s4 -/* f198248: 0fc0e6e9 */ jal 0xf039ba4 +/* f198248: 0fc0e6e9 */ jal chrIsDead /* f19824c: 8c440004 */ lw $a0,0x4($v0) /* f198250: 54400008 */ bnezl $v0,.PB0f198274 /* f198254: 240a0029 */ li $t2,0x29 -/* f198258: 0fc0a255 */ jal 0xf028954 +/* f198258: 0fc0a255 */ jal chrGetTargetProp /* f19825c: 02802025 */ move $a0,$s4 /* f198260: 02802025 */ move $a0,$s4 -/* f198264: 0fc65258 */ jal 0xf194960 +/* f198264: 0fc65258 */ jal botPassesCowardCheck /* f198268: 8c450004 */ lw $a1,0x4($v0) /* f19826c: 14400003 */ bnez $v0,.PB0f19827c /* f198270: 240a0029 */ li $t2,0x29 @@ -12358,9 +12358,9 @@ glabel var7f1b8fc8 /* f198274: 10000134 */ b .PB0f198748 /* f198278: a28a02a0 */ sb $t2,0x2a0($s4) .PB0f19827c: -/* f19827c: 0fc66478 */ jal 0xf1991e0 +/* f19827c: 0fc66478 */ jal botcmdTickDistMode /* f198280: 02802025 */ move $a0,$s4 -/* f198284: 0fc65886 */ jal 0xf196218 +/* f198284: 0fc65886 */ jal botCanDoCriticalPickup /* f198288: 02802025 */ move $a0,$s4 /* f19828c: 10400003 */ beqz $v0,.PB0f19829c /* f198290: 240d0029 */ li $t5,0x29 @@ -12388,7 +12388,7 @@ glabel var7f1b8fc8 /* f1982e0: 04400005 */ bltz $v0,.PB0f1982f8 /* f1982e4: 00027880 */ sll $t7,$v0,0x2 /* f1982e8: 008f2021 */ addu $a0,$a0,$t7 -/* f1982ec: 0fc0e6e9 */ jal 0xf039ba4 +/* f1982ec: 0fc0e6e9 */ jal chrIsDead /* f1982f0: 8c840af0 */ lw $a0,0xaf0($a0) /* f1982f4: 10400003 */ beqz $v0,.PB0f198304 .PB0f1982f8: @@ -12396,7 +12396,7 @@ glabel var7f1b8fc8 /* f1982fc: 10000112 */ b .PB0f198748 /* f198300: a29902a0 */ sb $t9,0x2a0($s4) .PB0f198304: -/* f198304: 0fc66478 */ jal 0xf1991e0 +/* f198304: 0fc66478 */ jal botcmdTickDistMode /* f198308: 02802025 */ move $a0,$s4 /* f19830c: 8e4901e0 */ lw $t1,0x1e0($s2) /* f198310: 11200037 */ beqz $t1,.PB0f1983f0 @@ -12407,10 +12407,10 @@ glabel var7f1b8fc8 /* f198324: 8e4d0128 */ lw $t5,0x128($s2) /* f198328: 11a00031 */ beqz $t5,.PB0f1983f0 /* f19832c: 00000000 */ nop -/* f198330: 0fc0a255 */ jal 0xf028954 +/* f198330: 0fc0a255 */ jal chrGetTargetProp /* f198334: 02802025 */ move $a0,$s4 /* f198338: 02802025 */ move $a0,$s4 -/* f19833c: 0fc65258 */ jal 0xf194960 +/* f19833c: 0fc65258 */ jal botPassesCowardCheck /* f198340: 8c450004 */ lw $a1,0x4($v0) /* f198344: 1040002a */ beqz $v0,.PB0f1983f0 /* f198348: 3c0143fa */ lui $at,0x43fa @@ -12449,16 +12449,16 @@ glabel var7f1b8fc8 /* f1983c4: 02802025 */ move $a0,$s4 /* f1983c8: 45000009 */ bc1f .PB0f1983f0 /* f1983cc: 00000000 */ nop -/* f1983d0: 0fc0a255 */ jal 0xf028954 +/* f1983d0: 0fc0a255 */ jal chrGetTargetProp /* f1983d4: a29802a0 */ sb $t8,0x2a0($s4) -/* f1983d8: 0fc63af1 */ jal 0xf18ebc4 +/* f1983d8: 0fc63af1 */ jal mpPlayerGetIndex /* f1983dc: 8c440004 */ lw $a0,0x4($v0) /* f1983e0: 240f00fa */ li $t7,0xfa /* f1983e4: a6420008 */ sh $v0,0x8($s2) /* f1983e8: ae4f01d8 */ sw $t7,0x1d8($s2) /* f1983ec: a25e0074 */ sb $s8,0x74($s2) .PB0f1983f0: -/* f1983f0: 0fc65886 */ jal 0xf196218 +/* f1983f0: 0fc65886 */ jal botCanDoCriticalPickup /* f1983f4: 02802025 */ move $a0,$s4 /* f1983f8: 104000d3 */ beqz $v0,.PB0f198748 /* f1983fc: 24190029 */ li $t9,0x29 @@ -12530,7 +12530,7 @@ glabel var7f1b8fc8 /* f1984ec: 2645008c */ addiu $a1,$s2,0x8c /* f1984f0: 1d80001e */ bgtz $t4,.PB0f19856c /* f1984f4: 2646007a */ addiu $a2,$s2,0x7a -/* f1984f8: 0fc0e153 */ jal 0xf03854c +/* f1984f8: 0fc0e153 */ jal chrGoToPos /* f1984fc: 24070002 */ li $a3,0x2 /* f198500: 1000001b */ b .PB0f198570 /* f198504: 8e4d00dc */ lw $t5,0xdc($s2) @@ -12544,17 +12544,17 @@ glabel var7f1b8fc8 /* f198520: 8e590128 */ lw $t9,0x128($s2) /* f198524: 53200012 */ beqzl $t9,.PB0f198570 /* f198528: 8e4d00dc */ lw $t5,0xdc($s2) -/* f19852c: 0fc0a255 */ jal 0xf028954 +/* f19852c: 0fc0a255 */ jal chrGetTargetProp /* f198530: 02802025 */ move $a0,$s4 /* f198534: 02802025 */ move $a0,$s4 -/* f198538: 0fc65258 */ jal 0xf194960 +/* f198538: 0fc65258 */ jal botPassesCowardCheck /* f19853c: 8c450004 */ lw $a1,0x4($v0) /* f198540: 1040000a */ beqz $v0,.PB0f19856c /* f198544: 2409002f */ li $t1,0x2f /* f198548: a28902a0 */ sb $t1,0x2a0($s4) -/* f19854c: 0fc0a255 */ jal 0xf028954 +/* f19854c: 0fc0a255 */ jal chrGetTargetProp /* f198550: 02802025 */ move $a0,$s4 -/* f198554: 0fc63af1 */ jal 0xf18ebc4 +/* f198554: 0fc63af1 */ jal mpPlayerGetIndex /* f198558: 8c440004 */ lw $a0,0x4($v0) /* f19855c: 240a00fa */ li $t2,0xfa /* f198560: a6420008 */ sh $v0,0x8($s2) @@ -12568,7 +12568,7 @@ glabel var7f1b8fc8 /* f198578: 00000000 */ nop /* f19857c: ae4e00dc */ sw $t6,0xdc($s2) .PB0f198580: -/* f198580: 0fc65886 */ jal 0xf196218 +/* f198580: 0fc65886 */ jal botCanDoCriticalPickup /* f198584: 02802025 */ move $a0,$s4 /* f198588: 1040006f */ beqz $v0,.PB0f198748 /* f19858c: 240b0029 */ li $t3,0x29 @@ -12603,7 +12603,7 @@ glabel var7f1b8fc8 /* f1985f8: 86440048 */ lh $a0,0x48($s2) /* f1985fc: 04820006 */ bltzl $a0,.PB0f198618 /* f198600: 8644004a */ lh $a0,0x4a($s2) -/* f198604: 0fc45ab8 */ jal 0xf116ae0 +/* f198604: 0fc45ab8 */ jal padSetFlag /* f198608: 3c050002 */ lui $a1,0x2 /* f19860c: 10000007 */ b .PB0f19862c /* f198610: 828b0007 */ lb $t3,0x7($s4) @@ -12611,7 +12611,7 @@ glabel var7f1b8fc8 .PB0f198618: /* f198618: 04820004 */ bltzl $a0,.PB0f19862c /* f19861c: 828b0007 */ lb $t3,0x7($s4) -/* f198620: 0fc45b6a */ jal 0xf116da8 +/* f198620: 0fc45b6a */ jal coverSetFlag /* f198624: 24050100 */ li $a1,0x100 .PB0f198628: /* f198628: 828b0007 */ lb $t3,0x7($s4) @@ -12623,7 +12623,7 @@ glabel var7f1b8fc8 /* f19863c: 10000042 */ b .PB0f198748 /* f198640: a28c02a0 */ sb $t4,0x2a0($s4) .PB0f198644: -/* f198644: 0fc65886 */ jal 0xf196218 +/* f198644: 0fc65886 */ jal botCanDoCriticalPickup /* f198648: 02802025 */ move $a0,$s4 /* f19864c: 1040003e */ beqz $v0,.PB0f198748 /* f198650: 24180029 */ li $t8,0x29 @@ -12633,7 +12633,7 @@ glabel var7f1b8fc8 /* f19865c: 2401002c */ li $at,0x2c /* f198660: 54410029 */ bnel $v0,$at,.PB0f198708 /* f198664: 2401002e */ li $at,0x2e -/* f198668: 0fc65886 */ jal 0xf196218 +/* f198668: 0fc65886 */ jal botCanDoCriticalPickup /* f19866c: 02802025 */ move $a0,$s4 /* f198670: 10400003 */ beqz $v0,.PB0f198680 /* f198674: 240f0029 */ li $t7,0x29 @@ -12666,7 +12666,7 @@ glabel var7f1b8fc8 /* f1986d4: 8e8e001c */ lw $t6,0x1c($s4) /* f1986d8: 15ae001b */ bne $t5,$t6,.PB0f198748 /* f1986dc: 00000000 */ nop -/* f1986e0: 0fc63af1 */ jal 0xf18ebc4 +/* f1986e0: 0fc63af1 */ jal mpPlayerGetIndex /* f1986e4: 02802025 */ move $a0,$s4 /* f1986e8: 3c0b800b */ lui $t3,0x800b /* f1986ec: 856b0802 */ lh $t3,0x802($t3) @@ -12679,14 +12679,14 @@ glabel var7f1b8fc8 .PB0f198708: /* f198708: 1441000f */ bne $v0,$at,.PB0f198748 /* f19870c: 00000000 */ nop -/* f198710: 0fc65886 */ jal 0xf196218 +/* f198710: 0fc65886 */ jal botCanDoCriticalPickup /* f198714: 02802025 */ move $a0,$s4 /* f198718: 10400003 */ beqz $v0,.PB0f198728 /* f19871c: 24180029 */ li $t8,0x29 /* f198720: 10000009 */ b .PB0f198748 /* f198724: a29802a0 */ sb $t8,0x2a0($s4) .PB0f198728: -/* f198728: 0fc63af1 */ jal 0xf18ebc4 +/* f198728: 0fc63af1 */ jal mpPlayerGetIndex /* f19872c: 02802025 */ move $a0,$s4 /* f198730: 3c0f800b */ lui $t7,0x800b /* f198734: 85ef0802 */ lh $t7,0x802($t7) @@ -12695,9 +12695,9 @@ glabel var7f1b8fc8 /* f198740: 00000000 */ nop /* f198744: a29902a0 */ sb $t9,0x2a0($s4) .PB0f198748: -/* f198748: 0fc6528c */ jal 0xf194a30 +/* f198748: 0fc6528c */ jal botChooseGeneralTarget /* f19874c: 02802025 */ move $a0,$s4 -/* f198750: 0fc63af1 */ jal 0xf18ebc4 +/* f198750: 0fc63af1 */ jal mpPlayerGetIndex /* f198754: 02802025 */ move $a0,$s4 /* f198758: 8ec9000c */ lw $t1,0xc($s6) /* f19875c: 8e6a0000 */ lw $t2,0x0($s3) @@ -12719,16 +12719,16 @@ glabel var7f1b8fc8 /* f198794: 868e017e */ lh $t6,0x17e($s4) /* f198798: 13ce0021 */ beq $s8,$t6,.PB0f198820 /* f19879c: 00000000 */ nop -/* f1987a0: 0fc0a255 */ jal 0xf028954 +/* f1987a0: 0fc0a255 */ jal chrGetTargetProp /* f1987a4: 02802025 */ move $a0,$s4 /* f1987a8: 8e83001c */ lw $v1,0x1c($s4) /* f1987ac: 00408025 */ move $s0,$v0 /* f1987b0: 24640008 */ addiu $a0,$v1,0x8 -/* f1987b4: 0fc452bd */ jal 0xf114af4 +/* f1987b4: 0fc452bd */ jal waypointFindClosestToPos /* f1987b8: 24650028 */ addiu $a1,$v1,0x28 /* f1987bc: 00408825 */ move $s1,$v0 /* f1987c0: 26040008 */ addiu $a0,$s0,0x8 -/* f1987c4: 0fc452bd */ jal 0xf114af4 +/* f1987c4: 0fc452bd */ jal waypointFindClosestToPos /* f1987c8: 26050028 */ addiu $a1,$s0,0x28 /* f1987cc: 12200014 */ beqz $s1,.PB0f198820 /* f1987d0: 00408025 */ move $s0,$v0 @@ -12740,19 +12740,19 @@ glabel var7f1b8fc8 /* f1987e8: 000cc1c0 */ sll $t8,$t4,0x7 /* f1987ec: 000fc8c0 */ sll $t9,$t7,0x3 /* f1987f0: 03192021 */ addu $a0,$t8,$t9 -/* f1987f4: 0fc452b8 */ jal 0xf114ae0 +/* f1987f4: 0fc452b8 */ jal waypointSetHashThing /* f1987f8: 00802825 */ move $a1,$a0 /* f1987fc: 02002025 */ move $a0,$s0 /* f198800: 02202825 */ move $a1,$s1 /* f198804: 264601e8 */ addiu $a2,$s2,0x1e8 -/* f198808: 0fc456a3 */ jal 0xf115a8c +/* f198808: 0fc456a3 */ jal waypointFindRoute /* f19880c: 24070008 */ li $a3,0x8 /* f198810: ae420208 */ sw $v0,0x208($s2) /* f198814: 00002025 */ move $a0,$zero -/* f198818: 0fc452b8 */ jal 0xf114ae0 +/* f198818: 0fc452b8 */ jal waypointSetHashThing /* f19881c: 00002825 */ move $a1,$zero .PB0f198820: -/* f198820: 0fc66ab3 */ jal 0xf19aacc +/* f198820: 0fc66ab3 */ jal botinvTick /* f198824: 02802025 */ move $a0,$s4 /* f198828: afa00088 */ sw $zero,0x88($sp) /* f19882c: 00009825 */ move $s3,$zero @@ -12797,7 +12797,7 @@ glabel var7f1b8fc8 /* f1988b8: 2404001c */ li $a0,0x1c /* f1988bc: 1541000d */ bne $t2,$at,.PB0f1988f4 /* f1988c0: 02e02825 */ move $a1,$s7 -/* f1988c4: 0fc26da8 */ jal 0xf09b6a0 +/* f1988c4: 0fc26da8 */ jal bgunGetMinClipQty /* f1988c8: afa30054 */ sw $v1,0x54($sp) /* f1988cc: 8e2d0024 */ lw $t5,0x24($s1) /* f1988d0: 8fa30054 */ lw $v1,0x54($sp) @@ -12805,7 +12805,7 @@ glabel var7f1b8fc8 /* f1988d8: 01a2082a */ slt $at,$t5,$v0 /* f1988dc: 10200005 */ beqz $at,.PB0f1988f4 /* f1988e0: 02602825 */ move $a1,$s3 -/* f1988e4: 0fc6548f */ jal 0xf19523c +/* f1988e4: 0fc6548f */ jal botScheduleReload /* f1988e8: a460003c */ sh $zero,0x3c($v1) /* f1988ec: 100001f2 */ b .PB0f1990b8 /* f1988f0: 00000000 */ nop @@ -12831,7 +12831,7 @@ glabel var7f1b8fc8 /* f19893c: 032e082a */ slt $at,$t9,$t6 /* f198940: 54200034 */ bnezl $at,.PB0f198a14 /* f198944: a460003c */ sh $zero,0x3c($v1) -/* f198948: 0fc64784 */ jal 0xf191e10 +/* f198948: 0fc64784 */ jal botIsDizzy /* f19894c: afa30054 */ sw $v1,0x54($sp) /* f198950: 14400030 */ bnez $v0,.PB0f198a14 /* f198954: 8fa30054 */ lw $v1,0x54($sp) @@ -12843,12 +12843,12 @@ glabel var7f1b8fc8 /* f19896c: 02802025 */ move $a0,$s4 /* f198970: 2405001e */ li $a1,0x1e /* f198974: 00003025 */ move $a2,$zero -/* f198978: 0fc12463 */ jal 0xf04918c +/* f198978: 0fc12463 */ jal chrIsTargetInFov /* f19897c: afa30054 */ sw $v1,0x54($sp) /* f198980: 1040000b */ beqz $v0,.PB0f1989b0 /* f198984: 8fa30054 */ lw $v1,0x54($sp) /* f198988: 02802025 */ move $a0,$s4 -/* f19898c: 0fc124bb */ jal 0xf0492ec +/* f19898c: 0fc124bb */ jal chrGetDistanceToTarget /* f198990: afa30054 */ sw $v1,0x54($sp) /* f198994: 3c014352 */ lui $at,0x4352 /* f198998: 44813000 */ mtc1 $at,$f6 @@ -12862,7 +12862,7 @@ glabel var7f1b8fc8 /* f1989b4: a460003c */ sh $zero,0x3c($v1) .PB0f1989b8: /* f1989b8: 00003025 */ move $a2,$zero -/* f1989bc: 0fc12463 */ jal 0xf04918c +/* f1989bc: 0fc12463 */ jal chrIsTargetInFov /* f1989c0: afa30054 */ sw $v1,0x54($sp) /* f1989c4: 10400010 */ beqz $v0,.PB0f198a08 /* f1989c8: 8fa30054 */ lw $v1,0x54($sp) @@ -12873,7 +12873,7 @@ glabel var7f1b8fc8 /* f1989dc: 02802025 */ move $a0,$s4 /* f1989e0: afa30054 */ sw $v1,0x54($sp) /* f1989e4: 46125100 */ add.s $f4,$f10,$f18 -/* f1989e8: 0fc124bb */ jal 0xf0492ec +/* f1989e8: 0fc124bb */ jal chrGetDistanceToTarget /* f1989ec: e7a40050 */ swc1 $f4,0x50($sp) /* f1989f0: c7a80050 */ lwc1 $f8,0x50($sp) /* f1989f4: 8fa30054 */ lw $v1,0x54($sp) @@ -12895,12 +12895,12 @@ glabel var7f1b8fc8 /* f198a28: 02802025 */ move $a0,$s4 /* f198a2c: 4600328d */ trunc.w.s $f10,$f6 /* f198a30: 44105000 */ mfc1 $s0,$f10 -/* f198a34: 0fc089b4 */ jal 0xf0226d0 +/* f198a34: 0fc089b4 */ jal chrUncloakTemporarily /* f198a38: 00000000 */ nop /* f198a3c: 02802025 */ move $a0,$s4 /* f198a40: 24050002 */ li $a1,0x2 /* f198a44: 02003025 */ move $a2,$s0 -/* f198a48: 0fc0eed5 */ jal 0xf03bb54 +/* f198a48: 0fc0eed5 */ jal chrPunchInflictDamage /* f198a4c: 00003825 */ move $a3,$zero /* f198a50: 16600199 */ bnez $s3,.PB0f1990b8 /* f198a54: 00000000 */ nop @@ -12932,7 +12932,7 @@ glabel var7f1b8fc8 .PB0f198ab4: /* f198ab4: a64b003c */ sh $t3,0x3c($s2) .PB0f198ab8: -/* f198ab8: 0c004be0 */ jal 0x12f80 +/* f198ab8: 0c004be0 */ jal random /* f198abc: 00000000 */ nop /* f198ac0: 24010003 */ li $at,0x3 /* f198ac4: 0041001b */ divu $zero,$v0,$at @@ -12970,7 +12970,7 @@ glabel var7f1b8fc8 /* f198b38: 24180032 */ li $t8,0x32 /* f198b3c: a658003c */ sh $t8,0x3c($s2) /* f198b40: 2404001c */ li $a0,0x1c -/* f198b44: 0fc26da8 */ jal 0xf09b6a0 +/* f198b44: 0fc26da8 */ jal bgunGetMinClipQty /* f198b48: 02e02825 */ move $a1,$s7 /* f198b4c: 8e490024 */ lw $t1,0x24($s2) /* f198b50: 01225023 */ subu $t2,$t1,$v0 @@ -12992,9 +12992,9 @@ glabel var7f1b8fc8 /* f198b8c: 8e4b0024 */ lw $t3,0x24($s2) /* f198b90: 19600149 */ blez $t3,.PB0f1990b8 /* f198b94: 00000000 */ nop -/* f198b98: 0fc089b4 */ jal 0xf0226d0 +/* f198b98: 0fc089b4 */ jal chrUncloakTemporarily /* f198b9c: 02802025 */ move $a0,$s4 -/* f198ba0: 0fc6710c */ jal 0xf19c430 +/* f198ba0: 0fc6710c */ jal botactCreateSlayerRocket /* f198ba4: 02802025 */ move $a0,$s4 /* f198ba8: 8e4c0024 */ lw $t4,0x24($s2) /* f198bac: 258fffff */ addiu $t7,$t4,-1 @@ -13003,7 +13003,7 @@ glabel var7f1b8fc8 .PB0f198bb8: /* f198bb8: 0005c7c2 */ srl $t8,$a1,0x1f .PB0f198bbc: -/* f198bbc: 0fc66f9f */ jal 0xf19be7c +/* f198bbc: 0fc66f9f */ jal botactIsWeaponThrowable /* f198bc0: 03002825 */ move $a1,$t8 /* f198bc4: 1040005b */ beqz $v0,.PB0f198d34 /* f198bc8: 8fb8004c */ lw $t8,0x4c($sp) @@ -13025,7 +13025,7 @@ glabel var7f1b8fc8 /* f198c04: 8e450020 */ lw $a1,0x20($s2) /* f198c08: 00003825 */ move $a3,$zero /* f198c0c: 00067080 */ sll $t6,$a2,0x2 -/* f198c10: 0fc66df1 */ jal 0xf19b7c4 +/* f198c10: 0fc66df1 */ jal botactGetAmmoQuantityByWeapon /* f198c14: 000e37c2 */ srl $a2,$t6,0x1f /* f198c18: 5c400008 */ bgtzl $v0,.PB0f198c3c /* f198c1c: 868c017e */ lh $t4,0x17e($s4) @@ -13054,12 +13054,12 @@ glabel var7f1b8fc8 /* f198c70: 0319082a */ slt $at,$t8,$t9 /* f198c74: 1420000b */ bnez $at,.PB0f198ca4 /* f198c78: 00000000 */ nop -/* f198c7c: 0fc64784 */ jal 0xf191e10 +/* f198c7c: 0fc64784 */ jal botIsDizzy /* f198c80: 02802025 */ move $a0,$s4 /* f198c84: 14400006 */ bnez $v0,.PB0f198ca0 /* f198c88: 02802025 */ move $a0,$s4 /* f198c8c: 2405002d */ li $a1,0x2d -/* f198c90: 0fc12463 */ jal 0xf04918c +/* f198c90: 0fc12463 */ jal chrIsTargetInFov /* f198c94: 00003025 */ move $a2,$zero /* f198c98: 10400002 */ beqz $v0,.PB0f198ca4 /* f198c9c: 00000000 */ nop @@ -13068,21 +13068,21 @@ glabel var7f1b8fc8 .PB0f198ca4: /* f198ca4: 12000104 */ beqz $s0,.PB0f1990b8 /* f198ca8: 00000000 */ nop -/* f198cac: 0fc089b4 */ jal 0xf0226d0 +/* f198cac: 0fc089b4 */ jal chrUncloakTemporarily /* f198cb0: 02802025 */ move $a0,$s4 /* f198cb4: 8e46004c */ lw $a2,0x4c($s2) /* f198cb8: 02402025 */ move $a0,$s2 /* f198cbc: 8e450020 */ lw $a1,0x20($s2) /* f198cc0: 00067080 */ sll $t6,$a2,0x2 /* f198cc4: 000e37c2 */ srl $a2,$t6,0x1f -/* f198cc8: 0fc66e54 */ jal 0xf19b950 +/* f198cc8: 0fc66e54 */ jal botactTryRemoveAmmoFromReserve /* f198ccc: 02e03825 */ move $a3,$s7 -/* f198cd0: 0fc66fd7 */ jal 0xf19bf5c +/* f198cd0: 0fc66fd7 */ jal botact0f19a37c /* f198cd4: 02802025 */ move $a0,$s4 /* f198cd8: 8e45004c */ lw $a1,0x4c($s2) /* f198cdc: 8e440020 */ lw $a0,0x20($s2) /* f198ce0: 00056080 */ sll $t4,$a1,0x2 -/* f198ce4: 0fc2c505 */ jal 0xf0b1414 +/* f198ce4: 0fc2c505 */ jal weaponGetFunctionById /* f198ce8: 000c2fc2 */ srl $a1,$t4,0x1f /* f198cec: 5040000d */ beqzl $v0,.PB0f198d24 /* f198cf0: 8e8d02d4 */ lw $t5,0x2d4($s4) @@ -13091,15 +13091,15 @@ glabel var7f1b8fc8 /* f198cfc: 00095340 */ sll $t2,$t1,0xd /* f198d00: 05430008 */ bgezl $t2,.PB0f198d24 /* f198d04: 8e8d02d4 */ lw $t5,0x2d4($s4) -/* f198d08: 0fc6665d */ jal 0xf199974 +/* f198d08: 0fc6665d */ jal botinvRemoveItem /* f198d0c: 8e450020 */ lw $a1,0x20($s2) /* f198d10: 02802025 */ move $a0,$s4 /* f198d14: 02e02825 */ move $a1,$s7 -/* f198d18: 0fc66c24 */ jal 0xf19b090 +/* f198d18: 0fc66c24 */ jal botinvSwitchToWeapon /* f198d1c: 00003025 */ move $a2,$zero /* f198d20: 8e8d02d4 */ lw $t5,0x2d4($s4) .PB0f198d24: -/* f198d24: 0fc66faf */ jal 0xf19bebc +/* f198d24: 0fc66faf */ jal botactGetProjectileThrowInterval /* f198d28: 8da40020 */ lw $a0,0x20($t5) /* f198d2c: 100000e2 */ b .PB0f1990b8 /* f198d30: ae420034 */ sw $v0,0x34($s2) @@ -13117,7 +13117,7 @@ glabel var7f1b8fc8 /* f198d5c: 00008025 */ move $s0,$zero /* f198d60: 8e440020 */ lw $a0,0x20($s2) /* f198d64: 00056080 */ sll $t4,$a1,0x2 -/* f198d68: 0fc2c8be */ jal 0xf0b22f8 +/* f198d68: 0fc2c8be */ jal weaponGetNumTicksPerShot /* f198d6c: 000c2fc2 */ srl $a1,$t4,0x1f /* f198d70: 5c400030 */ bgtzl $v0,.PB0f198e34 /* f198d74: 02e08025 */ move $s0,$s7 @@ -13201,19 +13201,19 @@ glabel var7f1b8fc8 /* f198e94: 016a082a */ slt $at,$t3,$t2 /* f198e98: 1420002a */ bnez $at,.PB0f198f44 /* f198e9c: 00000000 */ nop -/* f198ea0: 0fc64784 */ jal 0xf191e10 +/* f198ea0: 0fc64784 */ jal botIsDizzy /* f198ea4: 02802025 */ move $a0,$s4 /* f198ea8: 14400006 */ bnez $v0,.PB0f198ec4 /* f198eac: 02802025 */ move $a0,$s4 /* f198eb0: 2405002d */ li $a1,0x2d -/* f198eb4: 0fc12463 */ jal 0xf04918c +/* f198eb4: 0fc12463 */ jal chrIsTargetInFov /* f198eb8: 00003025 */ move $a2,$zero /* f198ebc: 10400021 */ beqz $v0,.PB0f198f44 /* f198ec0: 00000000 */ nop .PB0f198ec4: -/* f198ec4: 0fc0a255 */ jal 0xf028954 +/* f198ec4: 0fc0a255 */ jal chrGetTargetProp /* f198ec8: 02802025 */ move $a0,$s4 -/* f198ecc: 0fc0e6e9 */ jal 0xf039ba4 +/* f198ecc: 0fc0e6e9 */ jal chrIsDead /* f198ed0: 8c440004 */ lw $a0,0x4($v0) /* f198ed4: 1440001b */ bnez $v0,.PB0f198f44 /* f198ed8: 00000000 */ nop @@ -13264,7 +13264,7 @@ glabel var7f1b8fc8 .PB0f198f80: /* f198f80: 8e440020 */ lw $a0,0x20($s2) /* f198f84: 00056080 */ sll $t4,$a1,0x2 -/* f198f88: 0fc2c8be */ jal 0xf0b22f8 +/* f198f88: 0fc2c8be */ jal weaponGetNumTicksPerShot /* f198f8c: 000c2fc2 */ srl $a1,$t4,0x1f /* f198f90: 1c400049 */ bgtz $v0,.PB0f1990b8 /* f198f94: 00000000 */ nop @@ -13273,7 +13273,7 @@ glabel var7f1b8fc8 /* f198fa0: 8e45004c */ lw $a1,0x4c($s2) /* f198fa4: 8e440020 */ lw $a0,0x20($s2) /* f198fa8: 00054880 */ sll $t1,$a1,0x2 -/* f198fac: 0fc6707b */ jal 0xf19c1ec +/* f198fac: 0fc6707b */ jal botactGetShootInterval60 /* f198fb0: 00092fc2 */ srl $a1,$t1,0x1f /* f198fb4: 28410006 */ slti $at,$v0,0x6 /* f198fb8: 1420000b */ bnez $at,.PB0f198fe8 @@ -13292,7 +13292,7 @@ glabel var7f1b8fc8 /* f198fe8: 8e45004c */ lw $a1,0x4c($s2) /* f198fec: 8e440020 */ lw $a0,0x20($s2) /* f198ff0: 0005c880 */ sll $t9,$a1,0x2 -/* f198ff4: 0fc2c505 */ jal 0xf0b1414 +/* f198ff4: 0fc2c505 */ jal weaponGetFunctionById /* f198ff8: 00192fc2 */ srl $a1,$t9,0x1f /* f198ffc: 1040002e */ beqz $v0,.PB0f1990b8 /* f199000: 00000000 */ nop @@ -13349,7 +13349,7 @@ glabel var7f1b8fc8 .PB0f1990b8: /* f1990b8: 52a00007 */ beqzl $s5,.PB0f1990d8 /* f1990bc: 02802025 */ move $a0,$s4 -/* f1990c0: 0fc089b4 */ jal 0xf0226d0 +/* f1990c0: 0fc089b4 */ jal chrUncloakTemporarily /* f1990c4: 02802025 */ move $a0,$s4 /* f1990c8: 56600003 */ bnezl $s3,.PB0f1990d8 /* f1990cc: 02802025 */ move $a0,$s4 @@ -13357,7 +13357,7 @@ glabel var7f1b8fc8 /* f1990d4: 02802025 */ move $a0,$s4 .PB0f1990d8: /* f1990d8: 02602825 */ move $a1,$s3 -/* f1990dc: 0fc0fea6 */ jal 0xf03fa98 +/* f1990dc: 0fc0fea6 */ jal chrSetHandFiring /* f1990e0: 02a03025 */ move $a2,$s5 /* f1990e4: 8fae004c */ lw $t6,0x4c($sp) /* f1990e8: 26730001 */ addiu $s3,$s3,0x1 diff --git a/src/game/chr/chr.c b/src/game/chr/chr.c index e3775ab5c..305ada429 100644 --- a/src/game/chr/chr.c +++ b/src/game/chr/chr.c @@ -8712,7 +8712,7 @@ glabel var7f1a9ba0pf /* f0299d4: 02002025 */ move $a0,$s0 /* f0299d8: c5e60014 */ lwc1 $f6,0x14($t7) /* f0299dc: 46062083 */ div.s $f2,$f4,$f6 -/* f0299e0: 0fc0d025 */ jal 0xf034094 +/* f0299e0: 0fc0d025 */ jal chrGetShield /* f0299e4: e7a20170 */ swc1 $f2,0x170($sp) /* f0299e8: 921402e1 */ lbu $s4,0x2e1($s0) /* f0299ec: 960e0188 */ lhu $t6,0x188($s0) @@ -8745,7 +8745,7 @@ glabel var7f1a9ba0pf .PB0f029a4c: /* f029a4c: 00002825 */ move $a1,$zero /* f029a50: e7a20170 */ swc1 $f2,0x170($sp) -/* f029a54: 0c006bdd */ jal 0x1af74 +/* f029a54: 0c006bdd */ jal model0001a524 /* f029a58: e7ae016c */ swc1 $f14,0x16c($sp) /* f029a5c: c7a20170 */ lwc1 $f2,0x170($sp) /* f029a60: c6680004 */ lwc1 $f8,0x4($s3) @@ -8813,14 +8813,14 @@ glabel var7f1a9ba0pf /* f029b58: afa601c4 */ sw $a2,0x1c4($sp) /* f029b5c: afa701c0 */ sw $a3,0x1c0($sp) /* f029b60: afa801bc */ sw $t0,0x1bc($sp) -/* f029b64: 0c012de0 */ jal 0x4b780 +/* f029b64: 0c012de0 */ jal osVirtualToPhysical /* f029b68: afa901b8 */ sw $t1,0x1b8($sp) /* f029b6c: 8fa80204 */ lw $t0,0x204($sp) /* f029b70: c7ae016c */ lwc1 $f14,0x16c($sp) /* f029b74: 2401fff9 */ li $at,-7 /* f029b78: 15010082 */ bne $t0,$at,.PB0f029d84 /* f029b7c: ae020004 */ sw $v0,0x4($s0) -/* f029b80: 0fc5a40f */ jal 0xf16903c +/* f029b80: 0fc5a40f */ jal gfxAllocateColours /* f029b84: 24040001 */ li $a0,0x1 /* f029b88: 8fb001f0 */ lw $s0,0x1f0($sp) /* f029b8c: 3c0e0700 */ lui $t6,0x700 @@ -8829,7 +8829,7 @@ glabel var7f1a9ba0pf /* f029b98: afb801f0 */ sw $t8,0x1f0($sp) /* f029b9c: ae0e0000 */ sw $t6,0x0($s0) /* f029ba0: afa201d8 */ sw $v0,0x1d8($sp) -/* f029ba4: 0c012de0 */ jal 0x4b780 +/* f029ba4: 0c012de0 */ jal osVirtualToPhysical /* f029ba8: 00402025 */ move $a0,$v0 /* f029bac: 8fa301d8 */ lw $v1,0x1d8($sp) /* f029bb0: ae020004 */ sw $v0,0x4($s0) @@ -8871,7 +8871,7 @@ glabel var7f1a9ba0pf /* f029c3c: 00000000 */ nop /* f029c40: a06e0003 */ sb $t6,0x3($v1) .PB0f029c44: -/* f029c44: 0fc5a3f5 */ jal 0xf168fd4 +/* f029c44: 0fc5a3f5 */ jal gfxAllocateVertices /* f029c48: 24040018 */ li $a0,0x18 /* f029c4c: 00408025 */ move $s0,$v0 /* f029c50: 27a60104 */ addiu $a2,$sp,0x104 @@ -8931,7 +8931,7 @@ glabel var7f1a9ba0pf /* f029d20: af190000 */ sw $t9,0x0($t8) /* f029d24: afa60054 */ sw $a2,0x54($sp) /* f029d28: 02002025 */ move $a0,$s0 -/* f029d2c: 0c012de0 */ jal 0x4b780 +/* f029d2c: 0c012de0 */ jal osVirtualToPhysical /* f029d30: afb800c8 */ sw $t8,0xc8($sp) /* f029d34: 8fa800c8 */ lw $t0,0xc8($sp) /* f029d38: 8fa60054 */ lw $a2,0x54($sp) @@ -8964,7 +8964,7 @@ glabel var7f1a9ba0pf /* f029da0: 24060004 */ li $a2,0x4 /* f029da4: 24070001 */ li $a3,0x1 /* f029da8: afa00018 */ sw $zero,0x18($sp) -/* f029dac: 0fc2cf74 */ jal 0xf0b3dd0 +/* f029dac: 0fc2cf74 */ jal func0f0b39c0 /* f029db0: e7ae016c */ swc1 $f14,0x16c($sp) /* f029db4: 8fa80204 */ lw $t0,0x204($sp) /* f029db8: c7ae016c */ lwc1 $f14,0x16c($sp) @@ -9004,7 +9004,7 @@ glabel var7f1a9ba0pf /* f029e38: 46087302 */ mul.s $f12,$f14,$f8 /* f029e3c: 00000000 */ nop .PB0f029e40: -/* f029e40: 0fc0a5b2 */ jal 0xf0296c8 +/* f029e40: 0fc0a5b2 */ jal chr0f0295f8 /* f029e44: 27a700f8 */ addiu $a3,$sp,0xf8 /* f029e48: 8fac0100 */ lw $t4,0x100($sp) /* f029e4c: 8fad00fc */ lw $t5,0xfc($sp) @@ -9064,7 +9064,7 @@ glabel var7f1a9ba0pf /* f029f04: afaa00f0 */ sw $t2,0xf0($sp) /* f029f08: afab00ec */ sw $t3,0xec($sp) /* f029f0c: 46045302 */ mul.s $f12,$f10,$f4 -/* f029f10: 0c006b8b */ jal 0x1ae2c +/* f029f10: 0c006b8b */ jal sinf /* f029f14: 00000000 */ nop /* f029f18: 3c0f800a */ lui $t7,0x800a /* f029f1c: 8defe528 */ lw $t7,-0x1ad8($t7) @@ -9107,7 +9107,7 @@ glabel var7f1a9ba0pf /* f029fa8: 3c017f1b */ lui $at,0x7f1b /* f029fac: c430a618 */ lwc1 $f16,-0x59e8($at) /* f029fb0: 46104302 */ mul.s $f12,$f8,$f16 -/* f029fb4: 0c006b88 */ jal 0x1ae20 +/* f029fb4: 0c006b88 */ jal cosf /* f029fb8: 00000000 */ nop /* f029fbc: 3c014200 */ lui $at,0x4200 /* f029fc0: 44811000 */ mtc1 $at,$f2 @@ -9149,7 +9149,7 @@ glabel var7f1a9ba0pf .PB0f02a050: /* f02a050: afa700f4 */ sw $a3,0xf4($sp) /* f02a054: afaa00f0 */ sw $t2,0xf0($sp) -/* f02a058: 0fc5a40f */ jal 0xf16903c +/* f02a058: 0fc5a40f */ jal gfxAllocateColours /* f02a05c: afab00ec */ sw $t3,0xec($sp) /* f02a060: 8fb001f0 */ lw $s0,0x1f0($sp) /* f02a064: 3c190700 */ lui $t9,0x700 @@ -9158,7 +9158,7 @@ glabel var7f1a9ba0pf /* f02a070: afae01f0 */ sw $t6,0x1f0($sp) /* f02a074: ae190000 */ sw $t9,0x0($s0) /* f02a078: afa201d8 */ sw $v0,0x1d8($sp) -/* f02a07c: 0c012de0 */ jal 0x4b780 +/* f02a07c: 0c012de0 */ jal osVirtualToPhysical /* f02a080: 00402025 */ move $a0,$v0 /* f02a084: 8fa80204 */ lw $t0,0x204($sp) /* f02a088: 8fa301d8 */ lw $v1,0x1d8($sp) @@ -9243,7 +9243,7 @@ glabel var7f1a9ba0pf /* f02a1ac: afa301d8 */ sw $v1,0x1d8($sp) /* f02a1b0: afa700f4 */ sw $a3,0xf4($sp) /* f02a1b4: afaa00f0 */ sw $t2,0xf0($sp) -/* f02a1b8: 0fc5a3f5 */ jal 0xf168fd4 +/* f02a1b8: 0fc5a3f5 */ jal gfxAllocateVertices /* f02a1bc: afab00ec */ sw $t3,0xec($sp) /* f02a1c0: 8fa501f8 */ lw $a1,0x1f8($sp) /* f02a1c4: 24010001 */ li $at,0x1 @@ -9280,7 +9280,7 @@ glabel var7f1a9ba0pf /* f02a23c: afaa00f0 */ sw $t2,0xf0($sp) /* f02a240: afab00ec */ sw $t3,0xec($sp) /* f02a244: 46089302 */ mul.s $f12,$f18,$f8 -/* f02a248: 0c006b8b */ jal 0x1ae2c +/* f02a248: 0c006b8b */ jal sinf /* f02a24c: 00000000 */ nop /* f02a250: 3c013f80 */ lui $at,0x3f80 /* f02a254: 44818000 */ mtc1 $at,$f16 @@ -9510,7 +9510,7 @@ glabel var7f1a9ba0pf /* f02a594: a7a80176 */ sh $t0,0x176($sp) /* f02a598: afa60054 */ sw $a2,0x54($sp) /* f02a59c: 02002025 */ move $a0,$s0 -/* f02a5a0: 0c012de0 */ jal 0x4b780 +/* f02a5a0: 0c012de0 */ jal osVirtualToPhysical /* f02a5a4: afae00b4 */ sw $t6,0xb4($sp) /* f02a5a8: 8fa700b4 */ lw $a3,0xb4($sp) /* f02a5ac: 8fa60054 */ lw $a2,0x54($sp) @@ -9593,7 +9593,7 @@ glabel var7f1a9ba0pf /* f02a6d0: 00000000 */ nop /* f02a6d4: 46006086 */ mov.s $f2,$f12 .PB0f02a6d8: -/* f02a6d8: 0fc5a40f */ jal 0xf16903c +/* f02a6d8: 0fc5a40f */ jal gfxAllocateColours /* f02a6dc: e7a200ac */ swc1 $f2,0xac($sp) /* f02a6e0: 8fb001f0 */ lw $s0,0x1f0($sp) /* f02a6e4: 3c0f0708 */ lui $t7,0x708 @@ -9602,7 +9602,7 @@ glabel var7f1a9ba0pf /* f02a6f0: afae01f0 */ sw $t6,0x1f0($sp) /* f02a6f4: ae0f0000 */ sw $t7,0x0($s0) /* f02a6f8: afa201d8 */ sw $v0,0x1d8($sp) -/* f02a6fc: 0c012de0 */ jal 0x4b780 +/* f02a6fc: 0c012de0 */ jal osVirtualToPhysical /* f02a700: 00402025 */ move $a0,$v0 /* f02a704: 8fa301d8 */ lw $v1,0x1d8($sp) /* f02a708: c7a200ac */ lwc1 $f2,0xac($sp) @@ -9620,7 +9620,7 @@ glabel var7f1a9ba0pf /* f02a738: a0660005 */ sb $a2,0x5($v1) /* f02a73c: a0670002 */ sb $a3,0x2($v1) /* f02a740: a0670006 */ sb $a3,0x6($v1) -/* f02a744: 0fc5a3f5 */ jal 0xf168fd4 +/* f02a744: 0fc5a3f5 */ jal gfxAllocateVertices /* f02a748: a0780003 */ sb $t8,0x3($v1) /* f02a74c: 87ab0052 */ lh $t3,0x52($sp) /* f02a750: 02747021 */ addu $t6,$s3,$s4 @@ -9729,7 +9729,7 @@ glabel var7f1a9ba0pf /* f02a8e4: af0e0000 */ sw $t6,0x0($t8) /* f02a8e8: afab0044 */ sw $t3,0x44($sp) /* f02a8ec: afa60054 */ sw $a2,0x54($sp) -/* f02a8f0: 0c012de0 */ jal 0x4b780 +/* f02a8f0: 0c012de0 */ jal osVirtualToPhysical /* f02a8f4: afb800a4 */ sw $t8,0xa4($sp) /* f02a8f8: 8fa700a4 */ lw $a3,0xa4($sp) /* f02a8fc: 8fa60054 */ lw $a2,0x54($sp) @@ -9756,7 +9756,7 @@ glabel var7f1a9ba0pf .PB0f02a950: /* f02a950: 05010130 */ bgez $t0,.PB0f02ae14 /* f02a954: 8fae01f8 */ lw $t6,0x1f8($sp) -/* f02a958: 0fc5a3f5 */ jal 0xf168fd4 +/* f02a958: 0fc5a3f5 */ jal gfxAllocateVertices /* f02a95c: 2404000c */ li $a0,0xc /* f02a960: 8fa80204 */ lw $t0,0x204($sp) /* f02a964: 2401ffff */ li $at,-1 @@ -9794,7 +9794,7 @@ glabel var7f1a9ba0pf /* f02a9e4: 10000001 */ b .PB0f02a9ec /* f02a9e8: 01c02825 */ move $a1,$t6 .PB0f02a9ec: -/* f02a9ec: 0fc5a40f */ jal 0xf16903c +/* f02a9ec: 0fc5a40f */ jal gfxAllocateColours /* f02a9f0: a3a5017f */ sb $a1,0x17f($sp) /* f02a9f4: 8fb101f0 */ lw $s1,0x1f0($sp) /* f02a9f8: 3c0f0700 */ lui $t7,0x700 @@ -9803,7 +9803,7 @@ glabel var7f1a9ba0pf /* f02aa04: afb801f0 */ sw $t8,0x1f0($sp) /* f02aa08: ae2f0000 */ sw $t7,0x0($s1) /* f02aa0c: afa201d8 */ sw $v0,0x1d8($sp) -/* f02aa10: 0c012de0 */ jal 0x4b780 +/* f02aa10: 0c012de0 */ jal osVirtualToPhysical /* f02aa14: 00402025 */ move $a0,$v0 /* f02aa18: 8fa301d8 */ lw $v1,0x1d8($sp) /* f02aa1c: 93a5017f */ lbu $a1,0x17f($sp) @@ -9880,7 +9880,7 @@ glabel var7f1a9ba0pf /* f02ab28: 00000000 */ nop /* f02ab2c: 46006086 */ mov.s $f2,$f12 .PB0f02ab30: -/* f02ab30: 0fc5a40f */ jal 0xf16903c +/* f02ab30: 0fc5a40f */ jal gfxAllocateColours /* f02ab34: e7a20094 */ swc1 $f2,0x94($sp) /* f02ab38: 8fb101f0 */ lw $s1,0x1f0($sp) /* f02ab3c: 3c0e0700 */ lui $t6,0x700 @@ -9889,7 +9889,7 @@ glabel var7f1a9ba0pf /* f02ab48: afaf01f0 */ sw $t7,0x1f0($sp) /* f02ab4c: ae2e0000 */ sw $t6,0x0($s1) /* f02ab50: afa201d8 */ sw $v0,0x1d8($sp) -/* f02ab54: 0c012de0 */ jal 0x4b780 +/* f02ab54: 0c012de0 */ jal osVirtualToPhysical /* f02ab58: 00402025 */ move $a0,$v0 /* f02ab5c: 8fa301d8 */ lw $v1,0x1d8($sp) /* f02ab60: c7a20094 */ lwc1 $f2,0x94($sp) @@ -10023,7 +10023,7 @@ glabel var7f1a9ba0pf /* f02ad58: 37390090 */ ori $t9,$t9,0x90 /* f02ad5c: 262e0008 */ addiu $t6,$s1,0x8 /* f02ad60: afae01f0 */ sw $t6,0x1f0($sp) -/* f02ad64: 0c012de0 */ jal 0x4b780 +/* f02ad64: 0c012de0 */ jal osVirtualToPhysical /* f02ad68: ae390000 */ sw $t9,0x0($s1) /* f02ad6c: ae220004 */ sw $v0,0x4($s1) /* f02ad70: 8fb801f0 */ lw $t8,0x1f0($sp) @@ -10128,7 +10128,7 @@ glabel var7f1a9ba0pf /* f02aee8: a3a6017e */ sb $a2,0x17e($sp) /* f02aeec: afa700f4 */ sw $a3,0xf4($sp) /* f02aef0: afaa00f0 */ sw $t2,0xf0($sp) -/* f02aef4: 0fc5a40f */ jal 0xf16903c +/* f02aef4: 0fc5a40f */ jal gfxAllocateColours /* f02aef8: afab00ec */ sw $t3,0xec($sp) /* f02aefc: 8fb001f0 */ lw $s0,0x1f0($sp) /* f02af00: 3c0e0710 */ lui $t6,0x710 @@ -10137,7 +10137,7 @@ glabel var7f1a9ba0pf /* f02af0c: afaf01f0 */ sw $t7,0x1f0($sp) /* f02af10: ae0e0000 */ sw $t6,0x0($s0) /* f02af14: afa201d8 */ sw $v0,0x1d8($sp) -/* f02af18: 0c012de0 */ jal 0x4b780 +/* f02af18: 0c012de0 */ jal osVirtualToPhysical /* f02af1c: 00402025 */ move $a0,$v0 /* f02af20: 8fa301d8 */ lw $v1,0x1d8($sp) /* f02af24: 93a5017f */ lbu $a1,0x17f($sp) @@ -10211,7 +10211,7 @@ glabel var7f1a9ba0pf /* f02b020: 240b00ff */ li $t3,0xff .PB0f02b024: /* f02b024: a06b0012 */ sb $t3,0x12($v1) -/* f02b028: 0fc5a3f5 */ jal 0xf168fd4 +/* f02b028: 0fc5a3f5 */ jal gfxAllocateVertices /* f02b02c: a0650013 */ sb $a1,0x13($v1) /* f02b030: 8fa80204 */ lw $t0,0x204($sp) /* f02b034: 27b80104 */ addiu $t8,$sp,0x104 @@ -10334,7 +10334,7 @@ glabel var7f1a9ba0pf /* f02b1fc: afa30040 */ sw $v1,0x40($sp) /* f02b200: afaf004c */ sw $t7,0x4c($sp) /* f02b204: 02002025 */ move $a0,$s0 -/* f02b208: 0c012de0 */ jal 0x4b780 +/* f02b208: 0c012de0 */ jal osVirtualToPhysical /* f02b20c: afb90078 */ sw $t9,0x78($sp) /* f02b210: 8fa60078 */ lw $a2,0x78($sp) /* f02b214: 8fa80204 */ lw $t0,0x204($sp) @@ -10604,7 +10604,7 @@ glabel var7f1a9ba0pf /* f02b5fc: afab0044 */ sw $t3,0x44($sp) /* f02b600: afaa0058 */ sw $t2,0x58($sp) /* f02b604: afa70054 */ sw $a3,0x54($sp) -/* f02b608: 0c012de0 */ jal 0x4b780 +/* f02b608: 0c012de0 */ jal osVirtualToPhysical /* f02b60c: afaf0068 */ sw $t7,0x68($sp) /* f02b610: 8fa60068 */ lw $a2,0x68($sp) /* f02b614: 8fa70054 */ lw $a3,0x54($sp) @@ -10756,7 +10756,7 @@ glabel var7f1a9ba0pf /* f02b840: 8fb101f0 */ lw $s1,0x1f0($sp) /* f02b844: 26390008 */ addiu $t9,$s1,0x8 /* f02b848: afb901f0 */ sw $t9,0x1f0($sp) -/* f02b84c: 0c012de0 */ jal 0x4b780 +/* f02b84c: 0c012de0 */ jal osVirtualToPhysical /* f02b850: ae2e0000 */ sw $t6,0x0($s1) /* f02b854: ae220004 */ sw $v0,0x4($s1) /* f02b858: 8fb801f0 */ lw $t8,0x1f0($sp) diff --git a/src/game/chr/chraction.c b/src/game/chr/chraction.c index c3c5df8d3..2f2db931b 100644 --- a/src/game/chr/chraction.c +++ b/src/game/chr/chraction.c @@ -12262,14 +12262,14 @@ glabel var7f1a9184 /* f040614: 24020001 */ li $v0,0x1 /* f040618: a3a2026f */ sb $v0,0x26f($sp) .PB0f04061c: -/* f04061c: 0fc0a23d */ jal 0xf0288f4 +/* f04061c: 0fc0a23d */ jal chrGetHeldProp /* f040620: afa40278 */ sw $a0,0x278($sp) /* f040624: 5040055c */ beqzl $v0,.PB0f041b98 /* f040628: 8fbf0044 */ lw $ra,0x44($sp) /* f04062c: afa00268 */ sw $zero,0x268($sp) /* f040630: 8c590004 */ lw $t9,0x4($v0) /* f040634: 8fa40278 */ lw $a0,0x278($sp) -/* f040638: 0fc0a255 */ jal 0xf028954 +/* f040638: 0fc0a255 */ jal chrGetTargetProp /* f04063c: afb90264 */ sw $t9,0x264($sp) /* f040640: 8fab0264 */ lw $t3,0x264($sp) /* f040644: afa2025c */ sw $v0,0x25c($sp) @@ -12298,7 +12298,7 @@ glabel var7f1a9184 /* f040698: 93a40260 */ lbu $a0,0x260($sp) /* f04069c: 93a50263 */ lbu $a1,0x263($sp) /* f0406a0: afa00254 */ sw $zero,0x254($sp) -/* f0406a4: 0fc2c8be */ jal 0xf0b22f8 +/* f0406a4: 0fc2c8be */ jal weaponGetNumTicksPerShot /* f0406a8: afa80258 */ sw $t0,0x258($sp) /* f0406ac: 8fa60254 */ lw $a2,0x254($sp) /* f0406b0: 1c400005 */ bgtz $v0,.PB0f0406c8 @@ -12387,7 +12387,7 @@ glabel var7f1a9184 /* f0407e8: 1541000b */ bne $t2,$at,.PB0f040818 /* f0407ec: 00000000 */ nop /* f0407f0: 8de40020 */ lw $a0,0x20($t7) -/* f0407f4: 0c0076f3 */ jal 0x1dbcc +/* f0407f4: 0c0076f3 */ jal modelGetAnimNum /* f0407f8: afa60254 */ sw $a2,0x254($sp) /* f0407fc: 2401026a */ li $at,0x26a /* f040800: 14410005 */ bne $v0,$at,.PB0f040818 @@ -12399,10 +12399,10 @@ glabel var7f1a9184 .PB0f040818: /* f040818: 50c004a3 */ beqzl $a2,.PB0f041aa8 /* f04081c: 8fa80268 */ lw $t0,0x268($sp) -/* f040820: 0fc0f9c0 */ jal 0xf03e700 +/* f040820: 0fc0f9c0 */ jal chrGetAimAngle /* f040824: 8fa40278 */ lw $a0,0x278($sp) /* f040828: e7a00204 */ swc1 $f0,0x204($sp) -/* f04082c: 0fc0fa19 */ jal 0xf03e864 +/* f04082c: 0fc0fa19 */ jal func0f03e754 /* f040830: 8fa40278 */ lw $a0,0x278($sp) /* f040834: 93ab026f */ lbu $t3,0x26f($sp) /* f040838: e7a00200 */ swc1 $f0,0x200($sp) @@ -12417,7 +12417,7 @@ glabel var7f1a9184 .PB0f040858: /* f040858: afae0268 */ sw $t6,0x268($sp) /* f04085c: 8fa40278 */ lw $a0,0x278($sp) -/* f040860: 0fc0ffbd */ jal 0xf03fef4 +/* f040860: 0fc0ffbd */ jal chrGetGunPos /* f040864: 8fa5027c */ lw $a1,0x27c($sp) /* f040868: 54400032 */ bnezl $v0,.PB0f040934 /* f04086c: 8fa40278 */ lw $a0,0x278($sp) @@ -12434,7 +12434,7 @@ glabel var7f1a9184 /* f040898: c4460010 */ lwc1 $f6,0x10($v0) /* f04089c: 15410013 */ bne $t2,$at,.PB0f0408ec /* f0408a0: e7a6024c */ swc1 $f6,0x24c($sp) -/* f0408a4: 0c006b88 */ jal 0x1ae20 +/* f0408a4: 0c006b88 */ jal cosf /* f0408a8: c7ac0204 */ lwc1 $f12,0x204($sp) /* f0408ac: 3c014120 */ lui $at,0x4120 /* f0408b0: 44815000 */ mtc1 $at,$f10 @@ -12442,7 +12442,7 @@ glabel var7f1a9184 /* f0408b8: c7ac0204 */ lwc1 $f12,0x204($sp) /* f0408bc: 460a0482 */ mul.s $f18,$f0,$f10 /* f0408c0: 46124400 */ add.s $f16,$f8,$f18 -/* f0408c4: 0c006b8b */ jal 0x1ae2c +/* f0408c4: 0c006b8b */ jal sinf /* f0408c8: e7b00244 */ swc1 $f16,0x244($sp) /* f0408cc: 3c014120 */ lui $at,0x4120 /* f0408d0: 44813000 */ mtc1 $at,$f6 @@ -12453,7 +12453,7 @@ glabel var7f1a9184 /* f0408e4: 10000012 */ b .PB0f040930 /* f0408e8: e7b2024c */ swc1 $f18,0x24c($sp) .PB0f0408ec: -/* f0408ec: 0c006b88 */ jal 0x1ae20 +/* f0408ec: 0c006b88 */ jal cosf /* f0408f0: c7ac0204 */ lwc1 $f12,0x204($sp) /* f0408f4: 3c014120 */ lui $at,0x4120 /* f0408f8: 44812000 */ mtc1 $at,$f4 @@ -12462,7 +12462,7 @@ glabel var7f1a9184 /* f040904: 46048182 */ mul.s $f6,$f16,$f4 /* f040908: c7ac0204 */ lwc1 $f12,0x204($sp) /* f04090c: 46064280 */ add.s $f10,$f8,$f6 -/* f040910: 0c006b8b */ jal 0x1ae2c +/* f040910: 0c006b8b */ jal sinf /* f040914: e7aa0244 */ swc1 $f10,0x244($sp) /* f040918: 3c014120 */ lui $at,0x4120 /* f04091c: 44818000 */ mtc1 $at,$f16 @@ -12473,7 +12473,7 @@ glabel var7f1a9184 .PB0f040930: /* f040930: 8fa40278 */ lw $a0,0x278($sp) .PB0f040934: -/* f040934: 0fc07a1f */ jal 0xf01e87c +/* f040934: 0fc07a1f */ jal chrSetPerimEnabled /* f040938: 00002825 */ move $a1,$zero /* f04093c: 8fb801fc */ lw $t8,0x1fc($sp) /* f040940: 8faf0274 */ lw $t7,0x274($sp) @@ -12484,13 +12484,13 @@ glabel var7f1a9184 /* f040954: 27a60244 */ addiu $a2,$sp,0x244 /* f040958: 27a70234 */ addiu $a3,$sp,0x234 /* f04095c: 25e40008 */ addiu $a0,$t7,0x8 -/* f040960: 0c00b8fd */ jal 0x2e3f4 +/* f040960: 0c00b8fd */ jal cd0002de34 /* f040964: 25e50028 */ addiu $a1,$t7,0x28 /* f040968: 14400002 */ bnez $v0,.PB0f040974 /* f04096c: 24050001 */ li $a1,0x1 /* f040970: afa00268 */ sw $zero,0x268($sp) .PB0f040974: -/* f040974: 0fc07a1f */ jal 0xf01e87c +/* f040974: 0fc07a1f */ jal chrSetPerimEnabled /* f040978: 8fa40278 */ lw $a0,0x278($sp) /* f04097c: 8fab0268 */ lw $t3,0x268($sp) /* f040980: 240d0001 */ li $t5,0x1 @@ -12522,7 +12522,7 @@ glabel var7f1a9184 /* f0409dc: 1040000f */ beqz $v0,.PB0f040a1c /* f0409e0: 00401825 */ move $v1,$v0 /* f0409e4: afa2005c */ sw $v0,0x5c($sp) -/* f0409e8: 0fc124bb */ jal 0xf0492ec +/* f0409e8: 0fc124bb */ jal chrGetDistanceToTarget /* f0409ec: 8fa40278 */ lw $a0,0x278($sp) /* f0409f0: 3c014316 */ lui $at,0x4316 /* f0409f4: 44813000 */ mtc1 $at,$f6 @@ -12554,36 +12554,36 @@ glabel var7f1a9184 /* f040a54: e7a601e4 */ swc1 $f6,0x1e4($sp) /* f040a58: c4ea0010 */ lwc1 $f10,0x10($a3) /* f040a5c: 46105481 */ sub.s $f18,$f10,$f16 -/* f040a60: 0c0011d8 */ jal 0x4760 +/* f040a60: 0c0011d8 */ jal guNormalize /* f040a64: e7b201e8 */ swc1 $f18,0x1e8($sp) /* f040a68: 8fa4025c */ lw $a0,0x25c($sp) -/* f040a6c: 0fc190d6 */ jal 0xf064358 +/* f040a6c: 0fc190d6 */ jal propSetPerimEnabled /* f040a70: 24050001 */ li $a1,0x1 /* f040a74: 1000002f */ b .PB0f040b34 /* f040a78: 8fab0278 */ lw $t3,0x278($sp) .PB0f040a7c: -/* f040a7c: 0c006b88 */ jal 0x1ae20 +/* f040a7c: 0c006b88 */ jal cosf /* f040a80: c7ac0200 */ lwc1 $f12,0x200($sp) /* f040a84: e7a00060 */ swc1 $f0,0x60($sp) -/* f040a88: 0c006b8b */ jal 0x1ae2c +/* f040a88: 0c006b8b */ jal sinf /* f040a8c: c7ac0204 */ lwc1 $f12,0x204($sp) /* f040a90: c7a40060 */ lwc1 $f4,0x60($sp) /* f040a94: c7ac0200 */ lwc1 $f12,0x200($sp) /* f040a98: 46040202 */ mul.s $f8,$f0,$f4 -/* f040a9c: 0c006b8b */ jal 0x1ae2c +/* f040a9c: 0c006b8b */ jal sinf /* f040aa0: e7a801e0 */ swc1 $f8,0x1e0($sp) /* f040aa4: e7a001e4 */ swc1 $f0,0x1e4($sp) -/* f040aa8: 0c006b88 */ jal 0x1ae20 +/* f040aa8: 0c006b88 */ jal cosf /* f040aac: c7ac0200 */ lwc1 $f12,0x200($sp) /* f040ab0: e7a00060 */ swc1 $f0,0x60($sp) -/* f040ab4: 0c006b88 */ jal 0x1ae20 +/* f040ab4: 0c006b88 */ jal cosf /* f040ab8: c7ac0204 */ lwc1 $f12,0x204($sp) /* f040abc: c7a60060 */ lwc1 $f6,0x60($sp) /* f040ac0: 93ac026f */ lbu $t4,0x26f($sp) /* f040ac4: 46060282 */ mul.s $f10,$f0,$f6 /* f040ac8: 11800019 */ beqz $t4,.PB0f040b30 /* f040acc: e7aa01e8 */ swc1 $f10,0x1e8($sp) -/* f040ad0: 0fc64be8 */ jal 0xf192fa0 +/* f040ad0: 0fc64be8 */ jal botGuessCrouchPos /* f040ad4: 8fa40278 */ lw $a0,0x278($sp) /* f040ad8: 8fb90278 */ lw $t9,0x278($sp) /* f040adc: 00404825 */ move $t1,$v0 @@ -12606,7 +12606,7 @@ glabel var7f1a9184 /* f040b1c: 00065080 */ sll $t2,$a2,0x2 /* f040b20: 000a37c2 */ srl $a2,$t2,0x1f /* f040b24: afa80014 */ sw $t0,0x14($sp) -/* f040b28: 0fc28488 */ jal 0xf0a1220 +/* f040b28: 0fc28488 */ jal bgun0f0a0fac /* f040b2c: afa90010 */ sw $t1,0x10($sp) .PB0f040b30: /* f040b30: 8fab0278 */ lw $t3,0x278($sp) @@ -12625,12 +12625,12 @@ glabel var7f1a9184 /* f040b60: 00002825 */ move $a1,$zero /* f040b64: afae0250 */ sw $t6,0x250($sp) /* f040b68: 27a601e0 */ addiu $a2,$sp,0x1e0 -/* f040b6c: 0fc66ed9 */ jal 0xf19bb64 +/* f040b6c: 0fc66ed9 */ jal botactShootFarsight /* f040b70: 27a70244 */ addiu $a3,$sp,0x244 /* f040b74: 24010002 */ li $at,0x2 /* f040b78: 5441000a */ bnel $v0,$at,.PB0f040ba4 /* f040b7c: 3c014780 */ lui $at,0x4780 -/* f040b80: 0c004be0 */ jal 0x12f80 +/* f040b80: 0c004be0 */ jal random /* f040b84: 00000000 */ nop /* f040b88: 240100ff */ li $at,0xff /* f040b8c: 0041001b */ divu $zero,$v0,$at @@ -12658,7 +12658,7 @@ glabel var7f1a9184 /* f040bdc: 46002202 */ mul.s $f8,$f4,$f0 /* f040be0: e7b2022c */ swc1 $f18,0x22c($sp) /* f040be4: 46064280 */ add.s $f10,$f8,$f6 -/* f040be8: 0fc07a1f */ jal 0xf01e87c +/* f040be8: 0fc07a1f */ jal chrSetPerimEnabled /* f040bec: e7aa0230 */ swc1 $f10,0x230($sp) /* f040bf0: 93b8026f */ lbu $t8,0x26f($sp) /* f040bf4: 27a40244 */ addiu $a0,$sp,0x244 @@ -12671,7 +12671,7 @@ glabel var7f1a9184 .PB0f040c10: /* f040c10: 24190010 */ li $t9,0x10 /* f040c14: afb90010 */ sw $t9,0x10($sp) -/* f040c18: 0c00b8d4 */ jal 0x2e350 +/* f040c18: 0c00b8d4 */ jal cdTestAToB4 /* f040c1c: 8fa701c8 */ lw $a3,0x1c8($sp) /* f040c20: 1440000a */ bnez $v0,.PB0f040c4c /* f040c24: 240d0001 */ li $t5,0x1 @@ -12679,14 +12679,14 @@ glabel var7f1a9184 /* f040c2c: afad0224 */ sw $t5,0x224($sp) /* f040c30: 24c6a7c4 */ addiu $a2,$a2,-22588 /* f040c34: 27a40228 */ addiu $a0,$sp,0x228 -/* f040c38: 0c00951f */ jal 0x2547c +/* f040c38: 0c00951f */ jal cdGetPos /* f040c3c: 24052f28 */ li $a1,0x2f28 -/* f040c40: 0c00951c */ jal 0x25470 +/* f040c40: 0c00951c */ jal cdGetObstacle /* f040c44: 00000000 */ nop /* f040c48: afa201cc */ sw $v0,0x1cc($sp) .PB0f040c4c: /* f040c4c: 8fa40278 */ lw $a0,0x278($sp) -/* f040c50: 0fc07a1f */ jal 0xf01e87c +/* f040c50: 0fc07a1f */ jal chrSetPerimEnabled /* f040c54: 24050001 */ li $a1,0x1 /* f040c58: 93ae026f */ lbu $t6,0x26f($sp) /* f040c5c: 3c01800a */ lui $at,0x800a @@ -12700,7 +12700,7 @@ glabel var7f1a9184 /* f040c78: c7a80228 */ lwc1 $f8,0x228($sp) /* f040c7c: 51400013 */ beqzl $t2,.PB0f040ccc /* f040c80: c7a80228 */ lwc1 $f8,0x228($sp) -/* f040c84: 0c004be0 */ jal 0x12f80 +/* f040c84: 0c004be0 */ jal random /* f040c88: 00000000 */ nop /* f040c8c: 24010064 */ li $at,0x64 /* f040c90: 0041001b */ divu $zero,$v0,$at @@ -12764,7 +12764,7 @@ glabel var7f1a9184 /* f040d68: 4502016c */ bc1fl .PB0f04131c /* f040d6c: afa00268 */ sw $zero,0x268($sp) .PB0f040d70: -/* f040d70: 0fc2c4f8 */ jal 0xf0b13e0 +/* f040d70: 0fc2c4f8 */ jal weaponFindById /* f040d74: 00000000 */ nop /* f040d78: 93ad0263 */ lbu $t5,0x263($sp) /* f040d7c: 93a40260 */ lbu $a0,0x260($sp) @@ -12788,7 +12788,7 @@ glabel var7f1a9184 /* f040dc0: 24050054 */ li $a1,0x54 /* f040dc4: 8c640040 */ lw $a0,0x40($v1) .PB0f040dc8: -/* f040dc8: 0fc22dbf */ jal 0xf08b6fc +/* f040dc8: 0fc22dbf */ jal func0f08b880 /* f040dcc: afa300d4 */ sw $v1,0xd4($sp) /* f040dd0: 1000002e */ b .PB0f040e8c /* f040dd4: afa201b8 */ sw $v0,0x1b8($sp) @@ -12798,7 +12798,7 @@ glabel var7f1a9184 /* f040de0: 24050056 */ li $a1,0x56 /* f040de4: 8c640040 */ lw $a0,0x40($v1) /* f040de8: afa300d4 */ sw $v1,0xd4($sp) -/* f040dec: 0fc22dbf */ jal 0xf08b6fc +/* f040dec: 0fc22dbf */ jal func0f08b880 /* f040df0: 8fa60278 */ lw $a2,0x278($sp) /* f040df4: 10400025 */ beqz $v0,.PB0f040e8c /* f040df8: afa201b8 */ sw $v0,0x1b8($sp) @@ -12811,7 +12811,7 @@ glabel var7f1a9184 /* f040e10: 24050055 */ li $a1,0x55 /* f040e14: 8c640040 */ lw $a0,0x40($v1) /* f040e18: afa300d4 */ sw $v1,0xd4($sp) -/* f040e1c: 0fc22dbf */ jal 0xf08b6fc +/* f040e1c: 0fc22dbf */ jal func0f08b880 /* f040e20: 8fa60278 */ lw $a2,0x278($sp) /* f040e24: 10400019 */ beqz $v0,.PB0f040e8c /* f040e28: afa201b8 */ sw $v0,0x1b8($sp) @@ -12825,7 +12825,7 @@ glabel var7f1a9184 /* f040e44: 8c640040 */ lw $a0,0x40($v1) /* f040e48: afa300d4 */ sw $v1,0xd4($sp) /* f040e4c: 24050055 */ li $a1,0x55 -/* f040e50: 0fc22dbf */ jal 0xf08b6fc +/* f040e50: 0fc22dbf */ jal func0f08b880 /* f040e54: 8fa60278 */ lw $a2,0x278($sp) /* f040e58: 1040000c */ beqz $v0,.PB0f040e8c /* f040e5c: afa201b8 */ sw $v0,0x1b8($sp) @@ -12838,7 +12838,7 @@ glabel var7f1a9184 /* f040e74: 27a50260 */ addiu $a1,$sp,0x260 /* f040e78: 8dae00bc */ lw $t6,0xbc($t5) /* f040e7c: 8dc60004 */ lw $a2,0x4($t6) -/* f040e80: 0fc22d35 */ jal 0xf08b4d4 +/* f040e80: 0fc22d35 */ jal func0f08b658 /* f040e84: afa300d4 */ sw $v1,0xd4($sp) /* f040e88: afa201b8 */ sw $v0,0x1b8($sp) .PB0f040e8c: @@ -12866,7 +12866,7 @@ glabel var7f1a9184 /* f040ee0: 46105482 */ mul.s $f18,$f10,$f16 /* f040ee4: 13000080 */ beqz $t8,.PB0f0410e8 /* f040ee8: e7b200cc */ swc1 $f18,0xcc($sp) -/* f040eec: 0fc12463 */ jal 0xf04918c +/* f040eec: 0fc12463 */ jal chrIsTargetInFov /* f040ef0: 00003025 */ move $a2,$zero /* f040ef4: 1040007c */ beqz $v0,.PB0f0410e8 /* f040ef8: 00000000 */ nop @@ -12909,7 +12909,7 @@ glabel var7f1a9184 /* f040f84: e7a600c0 */ swc1 $f6,0xc0($sp) /* f040f88: 460a3401 */ sub.s $f16,$f6,$f10 /* f040f8c: e7a401e4 */ swc1 $f4,0x1e4($sp) -/* f040f90: 0c0011d8 */ jal 0x4760 +/* f040f90: 0c0011d8 */ jal guNormalize /* f040f94: e7b001e8 */ swc1 $f16,0x1e8($sp) /* f040f98: 1000003b */ b .PB0f041088 /* f040f9c: 24030001 */ li $v1,0x1 @@ -12945,7 +12945,7 @@ glabel var7f1a9184 /* f041000: c57200b4 */ lwc1 $f18,0xb4($t3) /* f041004: e7b200bc */ swc1 $f18,0xbc($sp) /* f041008: c5440010 */ lwc1 $f4,0x10($t2) -/* f04100c: 0fc1010b */ jal 0xf04042c +/* f04100c: 0fc1010b */ jal func0f04031c /* f041010: e7a400c0 */ swc1 $f4,0xc0($sp) /* f041014: 1000001c */ b .PB0f041088 /* f041018: 24030001 */ li $v1,0x1 @@ -12977,19 +12977,19 @@ glabel var7f1a9184 /* f041074: 46085481 */ sub.s $f18,$f10,$f8 /* f041078: e7b200bc */ swc1 $f18,0xbc($sp) .PB0f04107c: -/* f04107c: 0fc1010b */ jal 0xf04042c +/* f04107c: 0fc1010b */ jal func0f04031c /* f041080: 8fa500cc */ lw $a1,0xcc($sp) /* f041084: 24030001 */ li $v1,0x1 .PB0f041088: /* f041088: 10600017 */ beqz $v1,.PB0f0410e8 /* f04108c: 8fa40278 */ lw $a0,0x278($sp) -/* f041090: 0fc122ea */ jal 0xf048ba8 +/* f041090: 0fc122ea */ jal chrGetAngleToPos /* f041094: 27a500b8 */ addiu $a1,$sp,0xb8 /* f041098: e7a000b4 */ swc1 $f0,0xb4($sp) -/* f04109c: 0c006b88 */ jal 0x1ae20 +/* f04109c: 0c006b88 */ jal cosf /* f0410a0: 46000306 */ mov.s $f12,$f0 /* f0410a4: c7ac00b4 */ lwc1 $f12,0xb4($sp) -/* f0410a8: 0c006b8b */ jal 0x1ae2c +/* f0410a8: 0c006b8b */ jal sinf /* f0410ac: e7a000b0 */ swc1 $f0,0xb0($sp) /* f0410b0: c7ac01e8 */ lwc1 $f12,0x1e8($sp) /* f0410b4: c7ae00b0 */ lwc1 $f14,0xb0($sp) @@ -13006,16 +13006,16 @@ glabel var7f1a9184 /* f0410e0: 46085481 */ sub.s $f18,$f10,$f8 /* f0410e4: e7b201e8 */ swc1 $f18,0x1e8($sp) .PB0f0410e8: -/* f0410e8: 0c005900 */ jal 0x16400 +/* f0410e8: 0c005900 */ jal mtx4LoadIdentity /* f0410ec: 27a40178 */ addiu $a0,$sp,0x178 /* f0410f0: c7ac0200 */ lwc1 $f12,0x200($sp) -/* f0410f4: 0c005b4e */ jal 0x16d38 +/* f0410f4: 0c005b4e */ jal mtx4LoadXRotation /* f0410f8: 27a5011c */ addiu $a1,$sp,0x11c /* f0410fc: c7ac0204 */ lwc1 $f12,0x204($sp) -/* f041100: 0c005b71 */ jal 0x16dc4 +/* f041100: 0c005b71 */ jal mtx4LoadYRotation /* f041104: 27a500dc */ addiu $a1,$sp,0xdc /* f041108: 27a400dc */ addiu $a0,$sp,0xdc -/* f04110c: 0c00598c */ jal 0x16630 +/* f04110c: 0c00598c */ jal mtx00015be0 /* f041110: 27a5011c */ addiu $a1,$sp,0x11c /* f041114: c7ac0168 */ lwc1 $f12,0x168($sp) /* f041118: c7a401e0 */ lwc1 $f4,0x1e0($sp) @@ -13070,7 +13070,7 @@ glabel var7f1a9184 /* f0411d8: afab0010 */ sw $t3,0x10($sp) /* f0411dc: afaa0014 */ sw $t2,0x14($sp) /* f0411e0: afa5001c */ sw $a1,0x1c($sp) -/* f0411e4: 0fc27b80 */ jal 0xf09ee00 +/* f0411e4: 0fc27b80 */ jal bgun0f09ebcc /* f0411e8: afaf0018 */ sw $t7,0x18($sp) /* f0411ec: 8fa301b8 */ lw $v1,0x1b8($sp) /* f0411f0: 8fad00d4 */ lw $t5,0xd4($sp) @@ -13120,7 +13120,7 @@ glabel var7f1a9184 /* f041294: c7060050 */ lwc1 $f6,0x50($t8) /* f041298: 46043402 */ mul.s $f16,$f6,$f4 /* f04129c: e5900098 */ swc1 $f16,0x98($t4) -/* f0412a0: 0fc0a255 */ jal 0xf028954 +/* f0412a0: 0fc0a255 */ jal chrGetTargetProp /* f0412a4: 8fa40278 */ lw $a0,0x278($sp) /* f0412a8: 8fad01b8 */ lw $t5,0x1b8($sp) /* f0412ac: 3c01bf80 */ lui $at,0xbf80 @@ -13146,7 +13146,7 @@ glabel var7f1a9184 /* f0412fc: e7a00024 */ swc1 $f0,0x24($sp) /* f041300: e7a00030 */ swc1 $f0,0x30($sp) /* f041304: e7a00034 */ swc1 $f0,0x34($sp) -/* f041308: 0fc24e0e */ jal 0xf093838 +/* f041308: 0fc24e0e */ jal func0f0939f8 /* f04130c: e7a00038 */ swc1 $f0,0x38($sp) /* f041310: 10000002 */ b .PB0f04131c /* f041314: 00000000 */ nop @@ -13195,13 +13195,13 @@ glabel var7f1a9184 /* f0413b4: 17210047 */ bne $t9,$at,.PB0f0414d4 /* f0413b8: 27a50244 */ addiu $a1,$sp,0x244 /* f0413bc: 27a60234 */ addiu $a2,$sp,0x234 -/* f0413c0: 0fc0e4bf */ jal 0xf0392fc +/* f0413c0: 0fc0e4bf */ jal chrCanSeeAttackTarget /* f0413c4: 00003825 */ move $a3,$zero /* f0413c8: 10400042 */ beqz $v0,.PB0f0414d4 /* f0413cc: 8faf025c */ lw $t7,0x25c($sp) /* f0413d0: 8de40004 */ lw $a0,0x4($t7) /* f0413d4: 8fa50278 */ lw $a1,0x278($sp) -/* f0413d8: 0fc12aec */ jal 0xf04abb0 +/* f0413d8: 0fc12aec */ jal chrCompareTeams /* f0413dc: 24060002 */ li $a2,0x2 /* f0413e0: 1040003c */ beqz $v0,.PB0f0414d4 /* f0413e4: 3c014170 */ lui $at,0x4170 @@ -13239,7 +13239,7 @@ glabel var7f1a9184 /* f041464: 00000000 */ nop /* f041468: 4500002b */ bc1f .PB0f041518 /* f04146c: 00000000 */ nop -/* f041470: 0fc0fef0 */ jal 0xf03fbc0 +/* f041470: 0fc0fef0 */ jal chrCalculateHit /* f041474: 27a70260 */ addiu $a3,$sp,0x260 /* f041478: 8fac01f4 */ lw $t4,0x1f4($sp) /* f04147c: 8fad01f8 */ lw $t5,0x1f8($sp) @@ -13290,7 +13290,7 @@ glabel var7f1a9184 /* f04151c: 8faf01cc */ lw $t7,0x1cc($sp) /* f041520: 11c00065 */ beqz $t6,.PB0f0416b8 /* f041524: 00000000 */ nop -/* f041528: 0fc2c84e */ jal 0xf0b2138 +/* f041528: 0fc2c84e */ jal gsetGetDamage /* f04152c: 27a40260 */ addiu $a0,$sp,0x260 /* f041530: 8faa025c */ lw $t2,0x25c($sp) /* f041534: 240dffff */ li $t5,-1 @@ -13307,12 +13307,12 @@ glabel var7f1a9184 /* f041560: c544000c */ lwc1 $f4,0xc($t2) /* f041564: e7a4022c */ swc1 $f4,0x22c($sp) /* f041568: c54a0010 */ lwc1 $f10,0x10($t2) -/* f04156c: 0c004be0 */ jal 0x12f80 +/* f04156c: 0c004be0 */ jal random /* f041570: e7aa0230 */ swc1 $f10,0x230($sp) /* f041574: 304f0001 */ andi $t7,$v0,0x1 /* f041578: 11e00012 */ beqz $t7,.PB0f0415c4 /* f04157c: 00000000 */ nop -/* f041580: 0c004be0 */ jal 0x12f80 +/* f041580: 0c004be0 */ jal random /* f041584: 00000000 */ nop /* f041588: 2401000a */ li $at,0xa /* f04158c: 0041001b */ divu $zero,$v0,$at @@ -13331,7 +13331,7 @@ glabel var7f1a9184 /* f0415bc: 10000011 */ b .PB0f041604 /* f0415c0: e7a4022c */ swc1 $f4,0x22c($sp) .PB0f0415c4: -/* f0415c4: 0c004be0 */ jal 0x12f80 +/* f0415c4: 0c004be0 */ jal random /* f0415c8: 00000000 */ nop /* f0415cc: 2401000a */ li $at,0xa /* f0415d0: 0041001b */ divu $zero,$v0,$at @@ -13351,13 +13351,13 @@ glabel var7f1a9184 .PB0f041604: /* f041604: 27a40260 */ addiu $a0,$sp,0x260 /* f041608: 8fa5025c */ lw $a1,0x25c($sp) -/* f04160c: 0fc2a04d */ jal 0xf0a8134 +/* f04160c: 0fc2a04d */ jal bgunPlayPropHitSound /* f041610: 2406ffff */ li $a2,-1 /* f041614: 8fa40088 */ lw $a0,0x88($sp) /* f041618: 8c8b0020 */ lw $t3,0x20($a0) /* f04161c: 51600012 */ beqzl $t3,.PB0f041668 /* f041620: 8fb80278 */ lw $t8,0x278($sp) -/* f041624: 0fc0d025 */ jal 0xf034094 +/* f041624: 0fc0d025 */ jal chrGetShield /* f041628: 00000000 */ nop /* f04162c: 44802000 */ mtc1 $zero,$f4 /* f041630: 8fa40088 */ lw $a0,0x88($sp) @@ -13371,7 +13371,7 @@ glabel var7f1a9184 /* f041650: 27af0090 */ addiu $t7,$sp,0x90 /* f041654: afaf0018 */ sw $t7,0x18($sp) /* f041658: afb90010 */ sw $t9,0x10($sp) -/* f04165c: 0fc1000f */ jal 0xf04003c +/* f04165c: 0fc1000f */ jal chrCalculateShieldHit /* f041660: afaa0014 */ sw $t2,0x14($sp) .PB0f041664: /* f041664: 8fb80278 */ lw $t8,0x278($sp) @@ -13392,7 +13392,7 @@ glabel var7f1a9184 /* f04169c: afab001c */ sw $t3,0x1c($sp) /* f0416a0: afac0010 */ sw $t4,0x10($sp) /* f0416a4: afb90020 */ sw $t9,0x20($sp) -/* f0416a8: 0fc0d0b4 */ jal 0xf0342d0 +/* f0416a8: 0fc0d0b4 */ jal func0f0341dc /* f0416ac: afaa0024 */ sw $t2,0x24($sp) /* f0416b0: 10000010 */ b .PB0f0416f4 /* f0416b4: 8fb801f0 */ lw $t8,0x1f0($sp) @@ -13438,7 +13438,7 @@ glabel var7f1a9184 /* f041740: 332a0040 */ andi $t2,$t9,0x40 /* f041744: 11400045 */ beqz $t2,.PB0f04185c /* f041748: 24060002 */ li $a2,0x2 -/* f04174c: 0fc12aec */ jal 0xf04abb0 +/* f04174c: 0fc12aec */ jal chrCompareTeams /* f041750: 8de40004 */ lw $a0,0x4($t7) /* f041754: 10400041 */ beqz $v0,.PB0f04185c .PB0f041758: @@ -13448,20 +13448,20 @@ glabel var7f1a9184 /* f041764: afa00080 */ sw $zero,0x80($sp) /* f041768: afb8007c */ sw $t8,0x7c($sp) /* f04176c: afac0078 */ sw $t4,0x78($sp) -/* f041770: 0fc2c84e */ jal 0xf0b2138 +/* f041770: 0fc2c84e */ jal gsetGetDamage /* f041774: 27a40260 */ addiu $a0,$sp,0x260 /* f041778: 8fa501cc */ lw $a1,0x1cc($sp) /* f04177c: e7a00074 */ swc1 $f0,0x74($sp) /* f041780: 27a40260 */ addiu $a0,$sp,0x260 /* f041784: 8cad0004 */ lw $t5,0x4($a1) /* f041788: 2406ffff */ li $a2,-1 -/* f04178c: 0fc2a04d */ jal 0xf0a8134 +/* f04178c: 0fc2a04d */ jal bgunPlayPropHitSound /* f041790: afad0070 */ sw $t5,0x70($sp) /* f041794: 8fa40070 */ lw $a0,0x70($sp) /* f041798: 8c990020 */ lw $t9,0x20($a0) /* f04179c: 53200012 */ beqzl $t9,.PB0f0417e8 /* f0417a0: 8fac0278 */ lw $t4,0x278($sp) -/* f0417a4: 0fc0d025 */ jal 0xf034094 +/* f0417a4: 0fc0d025 */ jal chrGetShield /* f0417a8: 00000000 */ nop /* f0417ac: 44805000 */ mtc1 $zero,$f10 /* f0417b0: 8fa40070 */ lw $a0,0x70($sp) @@ -13475,7 +13475,7 @@ glabel var7f1a9184 /* f0417d0: 27ab007c */ addiu $t3,$sp,0x7c /* f0417d4: afab0018 */ sw $t3,0x18($sp) /* f0417d8: afaa0010 */ sw $t2,0x10($sp) -/* f0417dc: 0fc1000f */ jal 0xf04003c +/* f0417dc: 0fc1000f */ jal chrCalculateShieldHit /* f0417e0: afaf0014 */ sw $t7,0x14($sp) .PB0f0417e4: /* f0417e4: 8fac0278 */ lw $t4,0x278($sp) @@ -13486,7 +13486,7 @@ glabel var7f1a9184 /* f0417f4: 8fa501cc */ lw $a1,0x1cc($sp) /* f0417f8: 8fa60078 */ lw $a2,0x78($sp) /* f0417fc: 27a70228 */ addiu $a3,$sp,0x228 -/* f041800: 0fc097dd */ jal 0xf025f74 +/* f041800: 0fc097dd */ jal chrEmitSparks /* f041804: afac0014 */ sw $t4,0x14($sp) /* f041808: 8fad0278 */ lw $t5,0x278($sp) /* f04180c: 8faa01cc */ lw $t2,0x1cc($sp) @@ -13505,7 +13505,7 @@ glabel var7f1a9184 /* f041840: afaf001c */ sw $t7,0x1c($sp) /* f041844: afae0010 */ sw $t6,0x10($sp) /* f041848: afab0020 */ sw $t3,0x20($sp) -/* f04184c: 0fc0d0b4 */ jal 0xf0342d0 +/* f04184c: 0fc0d0b4 */ jal func0f0341dc /* f041850: afb80024 */ sw $t8,0x24($sp) /* f041854: 1000006f */ b .PB0f041a14 /* f041858: 93ad0260 */ lbu $t5,0x260($sp) @@ -13529,22 +13529,22 @@ glabel var7f1a9184 /* f041894: afae0068 */ sw $t6,0x68($sp) /* f041898: 13200004 */ beqz $t9,.PB0f0418ac /* f04189c: afad006c */ sw $t5,0x6c($sp) -/* f0418a0: 0fc63af1 */ jal 0xf18ebc4 +/* f0418a0: 0fc63af1 */ jal mpPlayerGetIndex /* f0418a4: 8fa40278 */ lw $a0,0x278($sp) /* f0418a8: afa20068 */ sw $v0,0x68($sp) .PB0f0418ac: /* f0418ac: 27a40260 */ addiu $a0,$sp,0x260 /* f0418b0: 8fa501cc */ lw $a1,0x1cc($sp) -/* f0418b4: 0fc2a04d */ jal 0xf0a8134 +/* f0418b4: 0fc2a04d */ jal bgunPlayPropHitSound /* f0418b8: 2406ffff */ li $a2,-1 /* f0418bc: 27a40244 */ addiu $a0,$sp,0x244 /* f0418c0: 27a50234 */ addiu $a1,$sp,0x234 /* f0418c4: 27a60228 */ addiu $a2,$sp,0x228 -/* f0418c8: 0fc19815 */ jal 0xf066054 +/* f0418c8: 0fc19815 */ jal func0f065e74 /* f0418cc: 27a70214 */ addiu $a3,$sp,0x214 /* f0418d0: 240a0001 */ li $t2,0x1 /* f0418d4: afaa0210 */ sw $t2,0x210($sp) -/* f0418d8: 0fc4fe8e */ jal 0xf13fa38 +/* f0418d8: 0fc4fe8e */ jal chrIsUsingPaintball /* f0418dc: 8fa40278 */ lw $a0,0x278($sp) /* f0418e0: 1040000b */ beqz $v0,.PB0f041910 /* f0418e4: 87a40214 */ lh $a0,0x214($sp) @@ -13554,7 +13554,7 @@ glabel var7f1a9184 /* f0418f4: 8fa501cc */ lw $a1,0x1cc($sp) /* f0418f8: 27a60228 */ addiu $a2,$sp,0x228 /* f0418fc: 00003825 */ move $a3,$zero -/* f041900: 0fc4c3dd */ jal 0xf130f74 +/* f041900: 0fc4c3dd */ jal sparksCreate /* f041904: afa00010 */ sw $zero,0x10($sp) /* f041908: 10000007 */ b .PB0f041928 /* f04190c: 00000000 */ nop @@ -13563,7 +13563,7 @@ glabel var7f1a9184 /* f041914: 27a60228 */ addiu $a2,$sp,0x228 /* f041918: 00003825 */ move $a3,$zero /* f04191c: afa00010 */ sw $zero,0x10($sp) -/* f041920: 0fc4c3dd */ jal 0xf130f74 +/* f041920: 0fc4c3dd */ jal sparksCreate /* f041924: afa00014 */ sw $zero,0x14($sp) .PB0f041928: /* f041928: 3c0b800a */ lui $t3,0x800a @@ -13581,14 +13581,14 @@ glabel var7f1a9184 /* f041958: 5540002e */ bnezl $t2,.PB0f041a14 /* f04195c: 93ad0260 */ lbu $t5,0x260($sp) .PB0f041960: -/* f041960: 0fc2c84e */ jal 0xf0b2138 +/* f041960: 0fc2c84e */ jal gsetGetDamage /* f041964: 27a40260 */ addiu $a0,$sp,0x260 /* f041968: 8faf0068 */ lw $t7,0x68($sp) /* f04196c: 44050000 */ mfc1 $a1,$f0 /* f041970: 8fa4006c */ lw $a0,0x6c($sp) /* f041974: 27a60228 */ addiu $a2,$sp,0x228 /* f041978: 93a70260 */ lbu $a3,0x260($sp) -/* f04197c: 0fc21504 */ jal 0xf085410 +/* f04197c: 0fc21504 */ jal objTakeGunfire /* f041980: afaf0010 */ sw $t7,0x10($sp) /* f041984: 10000023 */ b .PB0f041a14 /* f041988: 93ad0260 */ lbu $t5,0x260($sp) @@ -13597,16 +13597,16 @@ glabel var7f1a9184 /* f041990: 27a40244 */ addiu $a0,$sp,0x244 /* f041994: 27a50234 */ addiu $a1,$sp,0x234 /* f041998: 27a60228 */ addiu $a2,$sp,0x228 -/* f04199c: 0fc19815 */ jal 0xf066054 +/* f04199c: 0fc19815 */ jal func0f065e74 /* f0419a0: 27a70214 */ addiu $a3,$sp,0x214 /* f0419a4: 24180001 */ li $t8,0x1 /* f0419a8: afb80210 */ sw $t8,0x210($sp) /* f0419ac: 27a40260 */ addiu $a0,$sp,0x260 /* f0419b0: 27a50228 */ addiu $a1,$sp,0x228 /* f0419b4: 2406ffff */ li $a2,-1 -/* f0419b8: 0fc2a219 */ jal 0xf0a8864 +/* f0419b8: 0fc2a219 */ jal bgunPlayBgHitSound /* f0419bc: 27a70214 */ addiu $a3,$sp,0x214 -/* f0419c0: 0fc4fe8e */ jal 0xf13fa38 +/* f0419c0: 0fc4fe8e */ jal chrIsUsingPaintball /* f0419c4: 8fa40278 */ lw $a0,0x278($sp) /* f0419c8: 1040000b */ beqz $v0,.PB0f0419f8 /* f0419cc: 87a40214 */ lh $a0,0x214($sp) @@ -13616,7 +13616,7 @@ glabel var7f1a9184 /* f0419dc: 00002825 */ move $a1,$zero /* f0419e0: 27a60228 */ addiu $a2,$sp,0x228 /* f0419e4: 00003825 */ move $a3,$zero -/* f0419e8: 0fc4c3dd */ jal 0xf130f74 +/* f0419e8: 0fc4c3dd */ jal sparksCreate /* f0419ec: afa00010 */ sw $zero,0x10($sp) /* f0419f0: 10000008 */ b .PB0f041a14 /* f0419f4: 93ad0260 */ lbu $t5,0x260($sp) @@ -13625,7 +13625,7 @@ glabel var7f1a9184 /* f0419fc: 27a60228 */ addiu $a2,$sp,0x228 /* f041a00: 00003825 */ move $a3,$zero /* f041a04: afa00010 */ sw $zero,0x10($sp) -/* f041a08: 0fc4c3dd */ jal 0xf130f74 +/* f041a08: 0fc4c3dd */ jal sparksCreate /* f041a0c: afa00014 */ sw $zero,0x14($sp) .PB0f041a10: /* f041a10: 93ad0260 */ lbu $t5,0x260($sp) @@ -13640,7 +13640,7 @@ glabel var7f1a9184 /* f041a30: 3c03800a */ lui $v1,0x800a /* f041a34: 11400005 */ beqz $t2,.PB0f041a4c /* f041a38: 00000000 */ nop -/* f041a3c: 0fc63af1 */ jal 0xf18ebc4 +/* f041a3c: 0fc63af1 */ jal mpPlayerGetIndex /* f041a40: 03202025 */ move $a0,$t9 /* f041a44: 10000002 */ b .PB0f041a50 /* f041a48: 00401825 */ move $v1,$v0 @@ -13653,7 +13653,7 @@ glabel var7f1a9184 /* f041a5c: 15e00005 */ bnez $t7,.PB0f041a74 /* f041a60: 27a60228 */ addiu $a2,$sp,0x228 /* f041a64: 27a70214 */ addiu $a3,$sp,0x214 -/* f041a68: 0fc19815 */ jal 0xf066054 +/* f041a68: 0fc19815 */ jal func0f065e74 /* f041a6c: afa30064 */ sw $v1,0x64($sp) /* f041a70: 8fa30064 */ lw $v1,0x64($sp) .PB0f041a74: @@ -13661,7 +13661,7 @@ glabel var7f1a9184 /* f041a78: 27a50228 */ addiu $a1,$sp,0x228 /* f041a7c: 27a60214 */ addiu $a2,$sp,0x214 /* f041a80: 24070016 */ li $a3,0x16 -/* f041a84: 0fc4ab78 */ jal 0xf12ade0 +/* f041a84: 0fc4ab78 */ jal explosionCreateSimple /* f041a88: afa30010 */ sw $v1,0x10($sp) .PB0f041a8c: /* f041a8c: 8fab01c0 */ lw $t3,0x1c0($sp) @@ -13669,7 +13669,7 @@ glabel var7f1a9184 /* f041a90: 8fa4025c */ lw $a0,0x25c($sp) /* f041a94: 51600004 */ beqzl $t3,.PB0f041aa8 /* f041a98: 8fa80268 */ lw $t0,0x268($sp) -/* f041a9c: 0fc190d6 */ jal 0xf064358 +/* f041a9c: 0fc190d6 */ jal propSetPerimEnabled /* f041aa0: 00002825 */ move $a1,$zero /* f041aa4: 8fa80268 */ lw $t0,0x268($sp) .PB0f041aa8: @@ -13706,7 +13706,7 @@ glabel var7f1a9184 /* f041b14: 8fa40278 */ lw $a0,0x278($sp) /* f041b18: 8fa5027c */ lw $a1,0x27c($sp) /* f041b1c: 8fa60268 */ lw $a2,0x268($sp) -/* f041b20: 0fc0f8eb */ jal 0xf03e3ac +/* f041b20: 0fc0f8eb */ jal chrCreateFireslot /* f041b24: afa80054 */ sw $t0,0x54($sp) /* f041b28: 93b8026f */ lbu $t8,0x26f($sp) /* f041b2c: 8fa80054 */ lw $t0,0x54($sp) @@ -13731,12 +13731,12 @@ glabel var7f1a9184 /* f041b74: 0006782b */ sltu $t7,$zero,$a2 /* f041b78: 01e03025 */ move $a2,$t7 .PB0f041b7c: -/* f041b7c: 0fc0fe56 */ jal 0xf03f958 +/* f041b7c: 0fc0fe56 */ jal chrSetFiring /* f041b80: 8fa5027c */ lw $a1,0x27c($sp) /* f041b84: 10000004 */ b .PB0f041b98 /* f041b88: 8fbf0044 */ lw $ra,0x44($sp) .PB0f041b8c: -/* f041b8c: 0fc0fe56 */ jal 0xf03f958 +/* f041b8c: 0fc0fe56 */ jal chrSetFiring /* f041b90: 8fa60268 */ lw $a2,0x268($sp) /* f041b94: 8fbf0044 */ lw $ra,0x44($sp) .PB0f041b98: @@ -25426,11 +25426,11 @@ glabel var7f1a942c /* f04c9e0: f7b80038 */ sdc1 $f24,0x38($sp) /* f04c9e4: f7b60030 */ sdc1 $f22,0x30($sp) /* f04c9e8: f7b40028 */ sdc1 $f20,0x28($sp) -/* f04c9ec: 0fc0a255 */ jal 0xf028954 +/* f04c9ec: 0fc0a255 */ jal chrGetTargetProp /* f04c9f0: afa700f4 */ sw $a3,0xf4($sp) /* f04c9f4: 4480d000 */ mtc1 $zero,$f26 /* f04c9f8: 00408825 */ move $s1,$v0 -/* f04c9fc: 0fc1322a */ jal 0xf04c8a8 +/* f04c9fc: 0fc1322a */ jal func0f04c784 /* f04ca00: 02602025 */ move $a0,$s3 /* f04ca04: 8e6e001c */ lw $t6,0x1c($s3) /* f04ca08: 3c0143b4 */ lui $at,0x43b4 @@ -25469,10 +25469,10 @@ glabel var7f1a942c .PB0f04ca84: /* f04ca84: c432b118 */ lwc1 $f18,-0x4ee8($at) /* f04ca88: 4612a502 */ mul.s $f20,$f20,$f18 -/* f04ca8c: 0c006b88 */ jal 0x1ae20 +/* f04ca8c: 0c006b88 */ jal cosf /* f04ca90: 4600a306 */ mov.s $f12,$f20 /* f04ca94: 46000586 */ mov.s $f22,$f0 -/* f04ca98: 0c006b8b */ jal 0x1ae2c +/* f04ca98: 0c006b8b */ jal sinf /* f04ca9c: 4600a306 */ mov.s $f12,$f20 /* f04caa0: c62e0008 */ lwc1 $f14,0x8($s1) /* f04caa4: c7a400c8 */ lwc1 $f4,0xc8($sp) @@ -25497,7 +25497,7 @@ glabel var7f1a942c /* f04caf0: c6320010 */ lwc1 $f18,0x10($s1) /* f04caf4: 46109100 */ add.s $f4,$f18,$f16 /* f04caf8: e6040008 */ swc1 $f4,0x8($s0) -/* f04cafc: 0fc0a2ab */ jal 0xf028aac +/* f04cafc: 0fc0a2ab */ jal chrGetBbox /* f04cb00: 8e64001c */ lw $a0,0x1c($s3) /* f04cb04: c7a800cc */ lwc1 $f8,0xcc($sp) /* f04cb08: c7a600a0 */ lwc1 $f6,0xa0($sp) @@ -25512,13 +25512,13 @@ glabel var7f1a942c /* f04cb2c: 02003025 */ move $a2,$s0 /* f04cb30: e7b00018 */ swc1 $f16,0x18($sp) /* f04cb34: 24070023 */ li $a3,0x23 -/* f04cb38: 0c00b760 */ jal 0x2dd80 +/* f04cb38: 0c00b760 */ jal cd0002d7c0 /* f04cb3c: 24a50028 */ addiu $a1,$a1,0x28 /* f04cb40: 1440002a */ bnez $v0,.PB0f04cbec /* f04cb44: 02002025 */ move $a0,$s0 /* f04cb48: 3c067f1b */ lui $a2,0x7f1b /* f04cb4c: 24c6a9b4 */ addiu $a2,$a2,-22092 -/* f04cb50: 0c00951f */ jal 0x2547c +/* f04cb50: 0c00951f */ jal cdGetPos /* f04cb54: 24054901 */ li $a1,0x4901 /* f04cb58: c6040000 */ lwc1 $f4,0x0($s0) /* f04cb5c: c7a600c8 */ lwc1 $f6,0xc8($sp) @@ -25529,7 +25529,7 @@ glabel var7f1a942c /* f04cb70: 4614a202 */ mul.s $f8,$f20,$f20 /* f04cb74: 00000000 */ nop /* f04cb78: 4616b402 */ mul.s $f16,$f22,$f22 -/* f04cb7c: 0c012ae4 */ jal 0x4ab90 +/* f04cb7c: 0c012ae4 */ jal sqrtf /* f04cb80: 46104300 */ add.s $f12,$f8,$f16 /* f04cb84: 3c014248 */ lui $at,0x4248 /* f04cb88: 44812000 */ mtc1 $at,$f4 @@ -25619,7 +25619,7 @@ glabel var7f1a942c /* f04cccc: c7a400b0 */ lwc1 $f4,0xb0($sp) /* f04ccd0: e6040008 */ swc1 $f4,0x8($s0) .PB0f04ccd4: -/* f04ccd4: 0fc0eb38 */ jal 0xf03ace0 +/* f04ccd4: 0fc0eb38 */ jal func0f03abd0 /* f04ccd8: 93a600fb */ lbu $a2,0xfb($sp) /* f04ccdc: 8fbf007c */ lw $ra,0x7c($sp) /* f04cce0: d7b40028 */ ldc1 $f20,0x28($sp) diff --git a/src/game/chr/chraicommands.c b/src/game/chr/chraicommands.c index 2673e90f2..9de5c75c1 100644 --- a/src/game/chr/chraicommands.c +++ b/src/game/chr/chraicommands.c @@ -7932,7 +7932,7 @@ glabel var7f1a9d64 /* f05a3c4: 8e040424 */ lw $a0,0x424($s0) /* f05a3c8: 01cf1021 */ addu $v0,$t6,$t7 /* f05a3cc: 90450002 */ lbu $a1,0x2($v0) -/* f05a3d0: 0fc1271a */ jal 0xf049c68 +/* f05a3d0: 0fc1271a */ jal chrFindById /* f05a3d4: afa2009c */ sw $v0,0x9c($sp) /* f05a3d8: 8e18028c */ lw $t8,0x28c($s0) /* f05a3dc: 8e070424 */ lw $a3,0x424($s0) @@ -7968,7 +7968,7 @@ glabel var7f1a9d64 /* f05a448: 14200020 */ bnez $at,.PB0f05a4cc /* f05a44c: afac0084 */ sw $t4,0x84($sp) /* f05a450: afa60070 */ sw $a2,0x70($sp) -/* f05a454: 0c004be0 */ jal 0x12f80 +/* f05a454: 0c004be0 */ jal random /* f05a458: afa5007c */ sw $a1,0x7c($sp) /* f05a45c: 30460001 */ andi $a2,$v0,0x1 /* f05a460: afa60070 */ sw $a2,0x70($sp) @@ -8018,7 +8018,7 @@ glabel var7f1a9d64 /* f05a504: 90e40125 */ lbu $a0,0x125($a3) .PB0f05a508: /* f05a508: afa60070 */ sw $a2,0x70($sp) -/* f05a50c: 0fc133c9 */ jal 0xf04cf24 +/* f05a50c: 0fc133c9 */ jal teamGetChrIds /* f05a510: afa5007c */ sw $a1,0x7c($sp) /* f05a514: 8fb8009c */ lw $t8,0x9c($sp) /* f05a518: afa20088 */ sw $v0,0x88($sp) @@ -8054,7 +8054,7 @@ glabel var7f1a9d64 /* f05a588: 24010006 */ li $at,0x6 /* f05a58c: 55610015 */ bnel $t3,$at,.PB0f05a5e4 /* f05a590: 90e20126 */ lbu $v0,0x126($a3) -/* f05a594: 0fc4a797 */ jal 0xf129e5c +/* f05a594: 0fc4a797 */ jal playermgrGetPlayerNumByProp /* f05a598: 00000000 */ nop /* f05a59c: 8e030298 */ lw $v1,0x298($s0) /* f05a5a0: 00026080 */ sll $t4,$v0,0x2 @@ -8071,7 +8071,7 @@ glabel var7f1a9d64 /* f05a5cc: 10000001 */ b .PB0f05a5d4 /* f05a5d0: 00602025 */ move $a0,$v1 .PB0f05a5d4: -/* f05a5d4: 0fc4a783 */ jal 0xf129e0c +/* f05a5d4: 0fc4a783 */ jal setCurrentPlayerNum /* f05a5d8: 00000000 */ nop /* f05a5dc: 8e070424 */ lw $a3,0x424($s0) /* f05a5e0: 90e20126 */ lbu $v0,0x126($a3) @@ -8087,7 +8087,7 @@ glabel var7f1a9d64 /* f05a604: 102001c0 */ beqz $at,.PB0f05ad08 /* f05a608: 00000000 */ nop .PB0f05a60c: -/* f05a60c: 0c004be0 */ jal 0x12f80 +/* f05a60c: 0c004be0 */ jal random /* f05a610: 00000000 */ nop /* f05a614: 8faa0090 */ lw $t2,0x90($sp) /* f05a618: 304900ff */ andi $t1,$v0,0xff @@ -8100,7 +8100,7 @@ glabel var7f1a9d64 /* f05a634: 5081003e */ beql $a0,$at,.PB0f05a730 /* f05a638: 8fae0094 */ lw $t6,0x94($sp) .PB0f05a63c: -/* f05a63c: 0fc0a211 */ jal 0xf028844 +/* f05a63c: 0fc0a211 */ jal chrFindByLiteralId /* f05a640: 00000000 */ nop /* f05a644: 50400033 */ beqzl $v0,.PB0f05a714 /* f05a648: 8fa20088 */ lw $v0,0x88($sp) @@ -8108,7 +8108,7 @@ glabel var7f1a9d64 /* f05a650: 00402025 */ move $a0,$v0 /* f05a654: 5180002f */ beqzl $t4,.PB0f05a714 /* f05a658: 8fa20088 */ lw $v0,0x88($sp) -/* f05a65c: 0fc0e6e9 */ jal 0xf039ba4 +/* f05a65c: 0fc0e6e9 */ jal chrIsDead /* f05a660: afa20064 */ sw $v0,0x64($sp) /* f05a664: 1440002a */ bnez $v0,.PB0f05a710 /* f05a668: 8fa60064 */ lw $a2,0x64($sp) @@ -8130,7 +8130,7 @@ glabel var7f1a9d64 /* f05a6a8: 00e02025 */ move $a0,$a3 /* f05a6ac: 50b90019 */ beql $a1,$t9,.PB0f05a714 /* f05a6b0: 8fa20088 */ lw $v0,0x88($sp) -/* f05a6b4: 0fc12775 */ jal 0xf049dd4 +/* f05a6b4: 0fc12775 */ jal chrGetDistanceToChr /* f05a6b8: afa60064 */ sw $a2,0x64($sp) /* f05a6bc: 3c017f1b */ lui $at,0x7f1b /* f05a6c0: c424ba54 */ lwc1 $f4,-0x45ac($at) @@ -8184,7 +8184,7 @@ glabel var7f1a9d64 /* f05a770: 19400165 */ blez $t2,.PB0f05ad08 /* f05a774: 00000000 */ nop .PB0f05a778: -/* f05a778: 0c004be0 */ jal 0x12f80 +/* f05a778: 0c004be0 */ jal random /* f05a77c: 00000000 */ nop /* f05a780: 24010003 */ li $at,0x3 /* f05a784: 0041001b */ divu $zero,$v0,$at @@ -8218,7 +8218,7 @@ glabel var7f1a9d64 /* f05a7f0: afa20058 */ sw $v0,0x58($sp) /* f05a7f4: a7ad00a4 */ sh $t5,0xa4($sp) .PB0f05a7f8: -/* f05a7f8: 0fc13416 */ jal 0xf04d058 +/* f05a7f8: 0fc13416 */ jal audioWasNotPlayedRecently /* f05a7fc: 87a400a4 */ lh $a0,0xa4($sp) /* f05a800: 1440000a */ bnez $v0,.PB0f05a82c /* f05a804: 24010001 */ li $at,0x1 @@ -8233,7 +8233,7 @@ glabel var7f1a9d64 /* f05a824: 54610092 */ bnel $v1,$at,.PB0f05aa70 /* f05a828: 8fad0070 */ lw $t5,0x70($sp) .PB0f05a82c: -/* f05a82c: 0fc13404 */ jal 0xf04d010 +/* f05a82c: 0fc13404 */ jal audioMarkAsRecentlyPlayed /* f05a830: 87a400a4 */ lh $a0,0xa4($sp) /* f05a834: 87b800a4 */ lh $t8,0xa4($sp) /* f05a838: 2401034e */ li $at,0x34e @@ -8265,7 +8265,7 @@ glabel var7f1a9d64 /* f05a898: 24050009 */ li $a1,0x9 /* f05a89c: 8e0e0424 */ lw $t6,0x424($s0) /* f05a8a0: 3406ffff */ li $a2,0xffff -/* f05a8a4: 0fc24943 */ jal 0xf09250c +/* f05a8a4: 0fc24943 */ jal func0f0926bc /* f05a8a8: 8dc4001c */ lw $a0,0x1c($t6) /* f05a8ac: 8e0f0424 */ lw $t7,0x424($s0) /* f05a8b0: 3c01bf80 */ lui $at,0xbf80 @@ -8288,12 +8288,12 @@ glabel var7f1a9d64 /* f05a8f4: e7a00038 */ swc1 $f0,0x38($sp) /* f05a8f8: e7a00034 */ swc1 $f0,0x34($sp) /* f05a8fc: e7a00030 */ swc1 $f0,0x30($sp) -/* f05a900: 0fc24e0e */ jal 0xf093838 +/* f05a900: 0fc24e0e */ jal func0f0939f8 /* f05a904: e7a00024 */ swc1 $f0,0x24($sp) /* f05a908: 10000026 */ b .PB0f05a9a4 /* f05a90c: 8faa009c */ lw $t2,0x9c($sp) .PB0f05a910: -/* f05a910: 0fc131a9 */ jal 0xf04c6a4 +/* f05a910: 0fc131a9 */ jal chrGetDistanceLostToTargetInLastSecond /* f05a914: 8e040424 */ lw $a0,0x424($s0) /* f05a918: 18400003 */ blez $v0,.PB0f05a928 /* f05a91c: 00021823 */ negu $v1,$v0 @@ -8305,7 +8305,7 @@ glabel var7f1a9d64 /* f05a930: 24050009 */ li $a1,0x9 /* f05a934: 8e0c0424 */ lw $t4,0x424($s0) /* f05a938: 3406ffff */ li $a2,0xffff -/* f05a93c: 0fc24943 */ jal 0xf09250c +/* f05a93c: 0fc24943 */ jal func0f0926bc /* f05a940: 8d84001c */ lw $a0,0x1c($t4) /* f05a944: 8e0d0424 */ lw $t5,0x424($s0) /* f05a948: 3c01bf80 */ lui $at,0xbf80 @@ -8328,7 +8328,7 @@ glabel var7f1a9d64 /* f05a98c: e7a00038 */ swc1 $f0,0x38($sp) /* f05a990: e7a00034 */ swc1 $f0,0x34($sp) /* f05a994: e7a00030 */ swc1 $f0,0x30($sp) -/* f05a998: 0fc24e0e */ jal 0xf093838 +/* f05a998: 0fc24e0e */ jal func0f0939f8 /* f05a99c: e7a00024 */ swc1 $f0,0x24($sp) .PB0f05a9a0: /* f05a9a0: 8faa009c */ lw $t2,0x9c($sp) @@ -8349,16 +8349,16 @@ glabel var7f1a9d64 /* f05a9d4: 00036840 */ sll $t5,$v1,0x1 /* f05a9d8: 018dc021 */ addu $t8,$t4,$t5 /* f05a9dc: 00982021 */ addu $a0,$a0,$t8 -/* f05a9e0: 0fc5c06a */ jal 0xf1701a8 +/* f05a9e0: 0fc5c06a */ jal langGet /* f05a9e4: 8484ad52 */ lh $a0,-0x52ae($a0) /* f05a9e8: afa20080 */ sw $v0,0x80($sp) -/* f05a9ec: 0c004116 */ jal 0x10458 +/* f05a9ec: 0c004116 */ jal sndIsFiltered /* f05a9f0: 87a400a4 */ lh $a0,0xa4($sp) /* f05a9f4: 144000c4 */ bnez $v0,.PB0f05ad08 /* f05a9f8: 8fa40080 */ lw $a0,0x80($sp) /* f05a9fc: 8fae009c */ lw $t6,0x9c($sp) /* f05aa00: 24050006 */ li $a1,0x6 -/* f05aa04: 0fc37931 */ jal 0xf0de4c4 +/* f05aa04: 0fc37931 */ jal hudmsgCreateWithColour /* f05aa08: 91c60009 */ lbu $a2,0x9($t6) /* f05aa0c: 100000be */ b .PB0f05ad08 /* f05aa10: 00000000 */ nop @@ -8372,16 +8372,16 @@ glabel var7f1a9d64 /* f05aa2c: 000a4840 */ sll $t1,$t2,0x1 /* f05aa30: 01e95821 */ addu $t3,$t7,$t1 /* f05aa34: 008b2021 */ addu $a0,$a0,$t3 -/* f05aa38: 0fc5c06a */ jal 0xf1701a8 +/* f05aa38: 0fc5c06a */ jal langGet /* f05aa3c: 8484ad52 */ lh $a0,-0x52ae($a0) /* f05aa40: afa20080 */ sw $v0,0x80($sp) -/* f05aa44: 0c004116 */ jal 0x10458 +/* f05aa44: 0c004116 */ jal sndIsFiltered /* f05aa48: 87a400a4 */ lh $a0,0xa4($sp) /* f05aa4c: 144000ae */ bnez $v0,.PB0f05ad08 /* f05aa50: 8fa40080 */ lw $a0,0x80($sp) /* f05aa54: 8fac009c */ lw $t4,0x9c($sp) /* f05aa58: 24050006 */ li $a1,0x6 -/* f05aa5c: 0fc37931 */ jal 0xf0de4c4 +/* f05aa5c: 0fc37931 */ jal hudmsgCreateWithColour /* f05aa60: 91860009 */ lbu $a2,0x9($t4) /* f05aa64: 100000a8 */ b .PB0f05ad08 /* f05aa68: 00000000 */ nop @@ -8398,7 +8398,7 @@ glabel var7f1a9d64 /* f05aa8c: 0043c821 */ addu $t9,$v0,$v1 /* f05aa90: 87240000 */ lh $a0,0x0($t9) /* f05aa94: a3a800a3 */ sb $t0,0xa3($sp) -/* f05aa98: 0fc13416 */ jal 0xf04d058 +/* f05aa98: 0fc13416 */ jal audioWasNotPlayedRecently /* f05aa9c: afa30054 */ sw $v1,0x54($sp) /* f05aaa0: 8fa30054 */ lw $v1,0x54($sp) /* f05aaa4: 1040000d */ beqz $v0,.PB0f05aadc @@ -8407,7 +8407,7 @@ glabel var7f1a9d64 /* f05aab0: 01432821 */ addu $a1,$t2,$v1 /* f05aab4: 84a40000 */ lh $a0,0x0($a1) /* f05aab8: a3a800a3 */ sb $t0,0xa3($sp) -/* f05aabc: 0fc13416 */ jal 0xf04d058 +/* f05aabc: 0fc13416 */ jal audioWasNotPlayedRecently /* f05aac0: afa50050 */ sw $a1,0x50($sp) /* f05aac4: 8fa50050 */ lw $a1,0x50($sp) /* f05aac8: 10400004 */ beqz $v0,.PB0f05aadc @@ -8425,7 +8425,7 @@ glabel var7f1a9d64 /* f05aaf0: 87ab00a4 */ lh $t3,0xa4($sp) /* f05aaf4: 1160007a */ beqz $t3,.PB0f05ace0 /* f05aaf8: 01602025 */ move $a0,$t3 -/* f05aafc: 0fc13404 */ jal 0xf04d010 +/* f05aafc: 0fc13404 */ jal audioMarkAsRecentlyPlayed /* f05ab00: a3a800a3 */ sb $t0,0xa3($sp) /* f05ab04: 87ac00a4 */ lh $t4,0xa4($sp) /* f05ab08: 2401034e */ li $at,0x34e @@ -8458,7 +8458,7 @@ glabel var7f1a9d64 /* f05ab70: 24050009 */ li $a1,0x9 /* f05ab74: 3406ffff */ li $a2,0xffff /* f05ab78: 8da4001c */ lw $a0,0x1c($t5) -/* f05ab7c: 0fc24943 */ jal 0xf09250c +/* f05ab7c: 0fc24943 */ jal func0f0926bc /* f05ab80: a3a800a3 */ sb $t0,0xa3($sp) /* f05ab84: 8e180424 */ lw $t8,0x424($s0) /* f05ab88: 3c01bf80 */ lui $at,0xbf80 @@ -8481,14 +8481,14 @@ glabel var7f1a9d64 /* f05abcc: e7a00038 */ swc1 $f0,0x38($sp) /* f05abd0: e7a00034 */ swc1 $f0,0x34($sp) /* f05abd4: e7a00030 */ swc1 $f0,0x30($sp) -/* f05abd8: 0fc24e0e */ jal 0xf093838 +/* f05abd8: 0fc24e0e */ jal func0f0939f8 /* f05abdc: e7a00024 */ swc1 $f0,0x24($sp) /* f05abe0: 1000002a */ b .PB0f05ac8c /* f05abe4: 93a800a3 */ lbu $t0,0xa3($sp) .PB0f05abe8: /* f05abe8: 8e040424 */ lw $a0,0x424($s0) .PB0f05abec: -/* f05abec: 0fc131a9 */ jal 0xf04c6a4 +/* f05abec: 0fc131a9 */ jal chrGetDistanceLostToTargetInLastSecond /* f05abf0: a3a800a3 */ sb $t0,0xa3($sp) /* f05abf4: 18400003 */ blez $v0,.PB0f05ac04 /* f05abf8: 93a800a3 */ lbu $t0,0xa3($sp) @@ -8504,7 +8504,7 @@ glabel var7f1a9d64 /* f05ac18: 24050009 */ li $a1,0x9 /* f05ac1c: 3406ffff */ li $a2,0xffff /* f05ac20: 8d24001c */ lw $a0,0x1c($t1) -/* f05ac24: 0fc24943 */ jal 0xf09250c +/* f05ac24: 0fc24943 */ jal func0f0926bc /* f05ac28: a3a800a3 */ sb $t0,0xa3($sp) /* f05ac2c: 8e0b0424 */ lw $t3,0x424($s0) /* f05ac30: 3c01bf80 */ lui $at,0xbf80 @@ -8527,7 +8527,7 @@ glabel var7f1a9d64 /* f05ac74: e7a00038 */ swc1 $f0,0x38($sp) /* f05ac78: e7a00034 */ swc1 $f0,0x34($sp) /* f05ac7c: e7a00030 */ swc1 $f0,0x30($sp) -/* f05ac80: 0fc24e0e */ jal 0xf093838 +/* f05ac80: 0fc24e0e */ jal func0f0939f8 /* f05ac84: e7a00024 */ swc1 $f0,0x24($sp) /* f05ac88: 93a800a3 */ lbu $t0,0xa3($sp) .PB0f05ac8c: @@ -8540,16 +8540,16 @@ glabel var7f1a9d64 /* f05aca0: 000250c0 */ sll $t2,$v0,0x3 /* f05aca4: 014f4821 */ addu $t1,$t2,$t7 /* f05aca8: 00892021 */ addu $a0,$a0,$t1 -/* f05acac: 0fc5c06a */ jal 0xf1701a8 +/* f05acac: 0fc5c06a */ jal langGet /* f05acb0: 8484ad50 */ lh $a0,-0x52b0($a0) /* f05acb4: afa20080 */ sw $v0,0x80($sp) -/* f05acb8: 0c004116 */ jal 0x10458 +/* f05acb8: 0c004116 */ jal sndIsFiltered /* f05acbc: 87a400a4 */ lh $a0,0xa4($sp) /* f05acc0: 14400011 */ bnez $v0,.PB0f05ad08 /* f05acc4: 8fa40080 */ lw $a0,0x80($sp) /* f05acc8: 8fab009c */ lw $t3,0x9c($sp) /* f05accc: 24050006 */ li $a1,0x6 -/* f05acd0: 0fc37931 */ jal 0xf0de4c4 +/* f05acd0: 0fc37931 */ jal hudmsgCreateWithColour /* f05acd4: 91660009 */ lbu $a2,0x9($t3) /* f05acd8: 1000000b */ b .PB0f05ad08 /* f05acdc: 00000000 */ nop @@ -8562,10 +8562,10 @@ glabel var7f1a9d64 /* f05acf4: 8e0e0424 */ lw $t6,0x424($s0) /* f05acf8: 91b80005 */ lbu $t8,0x5($t5) /* f05acfc: a1d80126 */ sb $t8,0x126($t6) -/* f05ad00: 0fc127cb */ jal 0xf049f2c +/* f05ad00: 0fc127cb */ jal chrUnsetFlags /* f05ad04: 8e040424 */ lw $a0,0x424($s0) .PB0f05ad08: -/* f05ad08: 0fc4a783 */ jal 0xf129e0c +/* f05ad08: 0fc4a783 */ jal setCurrentPlayerNum /* f05ad0c: 8fa40078 */ lw $a0,0x78($sp) /* f05ad10: 8e190438 */ lw $t9,0x438($s0) /* f05ad14: 00001025 */ move $v0,$zero diff --git a/src/game/debug2.c b/src/game/debug2.c index f8f6712da..64d265a0e 100644 --- a/src/game/debug2.c +++ b/src/game/debug2.c @@ -553,7 +553,7 @@ glabel var7f1b6f38pb /* f11fda4: afa40030 */ sw $a0,0x30($sp) /* f11fda8: afa50034 */ sw $a1,0x34($sp) /* f11fdac: afa60038 */ sw $a2,0x38($sp) -/* f11fdb0: 0fc47ee8 */ jal 0xf11fba0 +/* f11fdb0: 0fc47ee8 */ jal debugUpdateMenu /* f11fdb4: afa7003c */ sw $a3,0x3c($sp) /* f11fdb8: 3c048008 */ lui $a0,0x8008 /* f11fdbc: 24848244 */ addiu $a0,$a0,-32188 @@ -563,13 +563,13 @@ glabel var7f1b6f38pb /* f11fdcc: 244e0001 */ addiu $t6,$v0,0x1 /* f11fdd0: 14c20009 */ bne $a2,$v0,.PB0f11fdf8 /* f11fdd4: ac8e0000 */ sw $t6,0x0($a0) -/* f11fdd8: 0c002f34 */ jal 0xbcd0 +/* f11fdd8: 0c002f34 */ jal viGrabRgb32 /* f11fddc: 00000000 */ nop /* f11fde0: 3c048008 */ lui $a0,0x8008 /* f11fde4: 24848244 */ addiu $a0,$a0,-32188 -/* f11fde8: 0c002a0b */ jal 0xa82c +/* f11fde8: 0c002a0b */ jal viSet16Bit /* f11fdec: ac800000 */ sw $zero,0x0($a0) -/* f11fdf0: 0c0124a8 */ jal 0x492a0 +/* f11fdf0: 0c0124a8 */ jal osViBlack /* f11fdf4: 00002025 */ move $a0,$zero .PB0f11fdf8: /* f11fdf8: 3c048008 */ lui $a0,0x8008 @@ -580,13 +580,13 @@ glabel var7f1b6f38pb /* f11fe0c: 244f0001 */ addiu $t7,$v0,0x1 /* f11fe10: 14c20009 */ bne $a2,$v0,.PB0f11fe38 /* f11fe14: ac8f0000 */ sw $t7,0x0($a0) -/* f11fe18: 0c002f30 */ jal 0xbcc0 +/* f11fe18: 0c002f30 */ jal viGrabJpg32 /* f11fe1c: 00000000 */ nop /* f11fe20: 3c048008 */ lui $a0,0x8008 /* f11fe24: 24848248 */ addiu $a0,$a0,-32184 -/* f11fe28: 0c002a0b */ jal 0xa82c +/* f11fe28: 0c002a0b */ jal viSet16Bit /* f11fe2c: ac800000 */ sw $zero,0x0($a0) -/* f11fe30: 0c0124a8 */ jal 0x492a0 +/* f11fe30: 0c0124a8 */ jal osViBlack /* f11fe34: 00002025 */ move $a0,$zero .PB0f11fe38: /* f11fe38: 3c188008 */ lui $t8,0x8008 @@ -620,7 +620,7 @@ glabel var7f1b6f38pb /* f11fe9c: 312a0200 */ andi $t2,$t1,0x200 /* f11fea0: 11400007 */ beqz $t2,.PB0f11fec0 /* f11fea4: afa9001c */ sw $t1,0x1c($sp) -/* f11fea8: 0fc47ea9 */ jal 0xf11faa4 +/* f11fea8: 0fc47ea9 */ jal dmenuNavigateLeft /* f11feac: 00000000 */ nop /* f11feb0: 3c048007 */ lui $a0,0x8007 /* f11feb4: 24847b78 */ addiu $a0,$a0,0x7b78 @@ -631,7 +631,7 @@ glabel var7f1b6f38pb /* f11fec4: 316c0100 */ andi $t4,$t3,0x100 /* f11fec8: 51800008 */ beqzl $t4,.PB0f11feec /* f11fecc: 8fad001c */ lw $t5,0x1c($sp) -/* f11fed0: 0fc47e6c */ jal 0xf11f9b0 +/* f11fed0: 0fc47e6c */ jal dmenuNavigateRight /* f11fed4: 00000000 */ nop /* f11fed8: 3c048007 */ lui $a0,0x8007 /* f11fedc: 24847b78 */ addiu $a0,$a0,0x7b78 @@ -642,7 +642,7 @@ glabel var7f1b6f38pb /* f11feec: 31ae0800 */ andi $t6,$t5,0x800 /* f11fef0: 51c00008 */ beqzl $t6,.PB0f11ff14 /* f11fef4: 8faf001c */ lw $t7,0x1c($sp) -/* f11fef8: 0fc47e2e */ jal 0xf11f8b8 +/* f11fef8: 0fc47e2e */ jal dmenuNavigateUp /* f11fefc: 00000000 */ nop /* f11ff00: 3c048007 */ lui $a0,0x8007 /* f11ff04: 24847b78 */ addiu $a0,$a0,0x7b78 @@ -653,7 +653,7 @@ glabel var7f1b6f38pb /* f11ff14: 31f80400 */ andi $t8,$t7,0x400 /* f11ff18: 53000008 */ beqzl $t8,.PB0f11ff3c /* f11ff1c: 8fb9001c */ lw $t9,0x1c($sp) -/* f11ff20: 0fc47e4e */ jal 0xf11f938 +/* f11ff20: 0fc47e4e */ jal dmenuNavigateDown /* f11ff24: 00000000 */ nop /* f11ff28: 3c048007 */ lui $a0,0x8007 /* f11ff2c: 24847b78 */ addiu $a0,$a0,0x7b78 @@ -669,27 +669,27 @@ glabel var7f1b6f38pb /* f11ff50: 24010001 */ li $at,0x1 /* f11ff54: 14410011 */ bne $v0,$at,.PB0f11ff9c /* f11ff58: 00000000 */ nop -/* f11ff5c: 0fc47e28 */ jal 0xf11f8a0 +/* f11ff5c: 0fc47e28 */ jal dmenuGetSelectedOption /* f11ff60: 00000000 */ nop /* f11ff64: 14400007 */ bnez $v0,.PB0f11ff84 /* f11ff68: 3c018008 */ lui $at,0x8008 -/* f11ff6c: 0c004f11 */ jal 0x13c44 +/* f11ff6c: 0c004f11 */ jal dhudReset /* f11ff70: ac208118 */ sw $zero,-0x7ee8($at) -/* f11ff74: 0fc47ee8 */ jal 0xf11fba0 +/* f11ff74: 0fc47ee8 */ jal debugUpdateMenu /* f11ff78: 00000000 */ nop /* f11ff7c: 10000077 */ b .PB0f12015c /* f11ff80: 8faf001c */ lw $t7,0x1c($sp) .PB0f11ff84: -/* f11ff84: 0fc47e28 */ jal 0xf11f8a0 +/* f11ff84: 0fc47e28 */ jal dmenuGetSelectedOption /* f11ff88: 00000000 */ nop -/* f11ff8c: 0fc120fc */ jal 0xf0483f0 +/* f11ff8c: 0fc120fc */ jal cutsceneStart /* f11ff90: 24440bff */ addiu $a0,$v0,0xbff /* f11ff94: 10000071 */ b .PB0f12015c /* f11ff98: 8faf001c */ lw $t7,0x1c($sp) .PB0f11ff9c: /* f11ff9c: 5440006f */ bnezl $v0,.PB0f12015c /* f11ffa0: 8faf001c */ lw $t7,0x1c($sp) -/* f11ffa4: 0fc47e28 */ jal 0xf11f8a0 +/* f11ffa4: 0fc47e28 */ jal dmenuGetSelectedOption /* f11ffa8: 00000000 */ nop /* f11ffac: 2841001e */ slti $at,$v0,0x1e /* f11ffb0: 1420000a */ bnez $at,.PB0f11ffdc @@ -766,7 +766,7 @@ glabel var7f1b6f38pb /* f1200bc: 244281c4 */ addiu $v0,$v0,-32316 /* f1200c0: 8c4b0000 */ lw $t3,0x0($v0) /* f1200c4: 396c0001 */ xori $t4,$t3,0x1 -/* f1200c8: 0fc67317 */ jal 0xf19cc5c +/* f1200c8: 0fc67317 */ jal mpDetermineUnlockedFeatures /* f1200cc: ac4c0000 */ sw $t4,0x0($v0) /* f1200d0: 10000022 */ b .PB0f12015c /* f1200d4: 8faf001c */ lw $t7,0x1c($sp) @@ -784,25 +784,25 @@ glabel var7f1b6f38pb /* f1200fc: 24420001 */ addiu $v0,$v0,0x1 /* f120100: 1444fffe */ bne $v0,$a0,.PB0f1200fc /* f120104: a04300ab */ sb $v1,0xab($v0) -/* f120108: 0fc43e23 */ jal 0xf10f88c +/* f120108: 0fc43e23 */ jal gamefileSetFlag /* f12010c: 24040030 */ li $a0,0x30 -/* f120110: 0fc43e23 */ jal 0xf10f88c +/* f120110: 0fc43e23 */ jal gamefileSetFlag /* f120114: 24040031 */ li $a0,0x31 -/* f120118: 0fc43e23 */ jal 0xf10f88c +/* f120118: 0fc43e23 */ jal gamefileSetFlag /* f12011c: 24040032 */ li $a0,0x32 -/* f120120: 0fc43e23 */ jal 0xf10f88c +/* f120120: 0fc43e23 */ jal gamefileSetFlag /* f120124: 24040033 */ li $a0,0x33 -/* f120128: 0fc43e23 */ jal 0xf10f88c +/* f120128: 0fc43e23 */ jal gamefileSetFlag /* f12012c: 24040034 */ li $a0,0x34 -/* f120130: 0fc43e23 */ jal 0xf10f88c +/* f120130: 0fc43e23 */ jal gamefileSetFlag /* f120134: 24040035 */ li $a0,0x35 -/* f120138: 0fc43e23 */ jal 0xf10f88c +/* f120138: 0fc43e23 */ jal gamefileSetFlag /* f12013c: 24040036 */ li $a0,0x36 -/* f120140: 0fc43e23 */ jal 0xf10f88c +/* f120140: 0fc43e23 */ jal gamefileSetFlag /* f120144: 24040037 */ li $a0,0x37 -/* f120148: 0fc43e23 */ jal 0xf10f88c +/* f120148: 0fc43e23 */ jal gamefileSetFlag /* f12014c: 24040038 */ li $a0,0x38 -/* f120150: 0fc43e23 */ jal 0xf10f88c +/* f120150: 0fc43e23 */ jal gamefileSetFlag /* f120154: 24040039 */ li $a0,0x39 .PB0f120158: /* f120158: 8faf001c */ lw $t7,0x1c($sp) @@ -815,13 +815,13 @@ glabel var7f1b6f38pb /* f120170: 24010001 */ li $at,0x1 /* f120174: 17210003 */ bne $t9,$at,.PB0f120184 /* f120178: 00000000 */ nop -/* f12017c: 0c004f11 */ jal 0x13c44 +/* f12017c: 0c004f11 */ jal dhudReset /* f120180: 00000000 */ nop .PB0f120184: /* f120184: 3c018008 */ lui $at,0x8008 /* f120188: ac20824c */ sw $zero,-0x7db4($at) .PB0f12018c: -/* f12018c: 0fc47f38 */ jal 0xf11fce0 +/* f12018c: 0fc47f38 */ jal debugSaveSelectedOption /* f120190: 00000000 */ nop /* f120194: 3c028008 */ lui $v0,0x8008 /* f120198: 8c42824c */ lw $v0,-0x7db4($v0) diff --git a/src/game/endscreen.c b/src/game/endscreen.c index bcf47f98e..e56e5a107 100644 --- a/src/game/endscreen.c +++ b/src/game/endscreen.c @@ -1214,11 +1214,11 @@ glabel endscreenPrepare /* f10eda4: 31ae0001 */ andi $t6,$t5,0x1 /* f10eda8: 15c0002a */ bnez $t6,.PB0f10ee54 /* f10edac: 00000000 */ nop -/* f10edb0: 0fc4214e */ jal 0xf108538 +/* f10edb0: 0fc4214e */ jal cheatGetByTimedStageIndex /* f10edb4: 00022e42 */ srl $a1,$v0,0x19 /* f10edb8: 3c04800a */ lui $a0,0x800a /* f10edbc: 9084251a */ lbu $a0,0x251a($a0) -/* f10edc0: 0fc42166 */ jal 0xf108598 +/* f10edc0: 0fc42166 */ jal cheatGetByCompletedStageIndex /* f10edc4: afa20034 */ sw $v0,0x34($sp) /* f10edc8: 8fa30034 */ lw $v1,0x34($sp) /* f10edcc: 3c188007 */ lui $t8,0x8007 @@ -1265,17 +1265,17 @@ glabel endscreenPrepare /* f10ee68: 8c59048c */ lw $t9,0x48c($v0) /* f10ee6c: 17200005 */ bnez $t9,.PB0f10ee84 /* f10ee70: 00000000 */ nop -/* f10ee74: 0fc25675 */ jal 0xf0959d4 +/* f10ee74: 0fc25675 */ jal objectiveIsAllComplete /* f10ee78: 00000000 */ nop /* f10ee7c: 1440000d */ bnez $v0,.PB0f10eeb4 /* f10ee80: 00000000 */ nop .PB0f10ee84: -/* f10ee84: 0fc4810c */ jal 0xf120430 +/* f10ee84: 0fc4810c */ jal debugIsAllTrainingEnabled /* f10ee88: 00000000 */ nop /* f10ee8c: 14400009 */ bnez $v0,.PB0f10eeb4 /* f10ee90: 3c048007 */ lui $a0,0x8007 /* f10ee94: 2484791c */ addiu $a0,$a0,0x791c -/* f10ee98: 0fc3e223 */ jal 0xf0f888c +/* f10ee98: 0fc3e223 */ jal menuPushRootDialog /* f10ee9c: 24050001 */ li $a1,0x1 /* f10eea0: 3c02800a */ lui $v0,0x800a /* f10eea4: 9042251b */ lbu $v0,0x251b($v0) @@ -1285,14 +1285,14 @@ glabel endscreenPrepare .PB0f10eeb4: /* f10eeb4: 3c048007 */ lui $a0,0x8007 /* f10eeb8: 24847904 */ addiu $a0,$a0,0x7904 -/* f10eebc: 0fc3e223 */ jal 0xf0f888c +/* f10eebc: 0fc3e223 */ jal menuPushRootDialog /* f10eec0: 24050001 */ li $a1,0x1 /* f10eec4: 3c02800a */ lui $v0,0x800a /* f10eec8: 9042251b */ lbu $v0,0x251b($v0) /* f10eecc: 000251c2 */ srl $t2,$v0,0x7 /* f10eed0: 11400007 */ beqz $t2,.PB0f10eef0 /* f10eed4: 01401025 */ move $v0,$t2 -/* f10eed8: 0fc43b1e */ jal 0xf10ec78 +/* f10eed8: 0fc43b1e */ jal endscreenSetCoopCompleted /* f10eedc: 00000000 */ nop /* f10eee0: 3c02800a */ lui $v0,0x800a /* f10eee4: 9042251b */ lbu $v0,0x251b($v0) @@ -1322,7 +1322,7 @@ glabel endscreenPrepare /* f10ef40: 30590100 */ andi $t9,$v0,0x100 /* f10ef44: 13200014 */ beqz $t9,.PB0f10ef98 /* f10ef48: 00000000 */ nop -/* f10ef4c: 0fc41cf0 */ jal 0xf1073c0 +/* f10ef4c: 0fc41cf0 */ jal cheatIsUnlocked /* f10ef50: 304400ff */ andi $a0,$v0,0xff /* f10ef54: 10400010 */ beqz $v0,.PB0f10ef98 /* f10ef58: afa20020 */ sw $v0,0x20($sp) @@ -1358,11 +1358,11 @@ glabel endscreenPrepare /* f10efcc: 11e00005 */ beqz $t7,.PB0f10efe4 /* f10efd0: 00022402 */ srl $a0,$v0,0x10 /* f10efd4: 309900ff */ andi $t9,$a0,0xff -/* f10efd8: 0fc41cf0 */ jal 0xf1073c0 +/* f10efd8: 0fc41cf0 */ jal cheatIsUnlocked /* f10efdc: 03202025 */ move $a0,$t9 /* f10efe0: afa2001c */ sw $v0,0x1c($sp) .PB0f10efe4: -/* f10efe4: 0fc309bd */ jal 0xf0c26f4 +/* f10efe4: 0fc309bd */ jal playerGetMissionTime /* f10efe8: 00000000 */ nop /* f10efec: 2401003c */ li $at,0x3c /* f10eff0: 0041001a */ div $zero,$v0,$at @@ -1421,17 +1421,17 @@ glabel endscreenPrepare /* f10f0b8: 8c4f048c */ lw $t7,0x48c($v0) /* f10f0bc: 15e00005 */ bnez $t7,.PB0f10f0d4 /* f10f0c0: 00000000 */ nop -/* f10f0c4: 0fc25675 */ jal 0xf0959d4 +/* f10f0c4: 0fc25675 */ jal objectiveIsAllComplete /* f10f0c8: 00000000 */ nop /* f10f0cc: 14400005 */ bnez $v0,.PB0f10f0e4 /* f10f0d0: 00000000 */ nop .PB0f10f0d4: -/* f10f0d4: 0fc4810c */ jal 0xf120430 +/* f10f0d4: 0fc4810c */ jal debugIsAllTrainingEnabled /* f10f0d8: 00000000 */ nop /* f10f0dc: 104000a5 */ beqz $v0,.PB0f10f374 /* f10f0e0: 00000000 */ nop .PB0f10f0e4: -/* f10f0e4: 0fc309bd */ jal 0xf0c26f4 +/* f10f0e4: 0fc309bd */ jal playerGetMissionTime /* f10f0e8: 00000000 */ nop /* f10f0ec: 2401003c */ li $at,0x3c /* f10f0f0: 0041001a */ div $zero,$v0,$at @@ -1531,7 +1531,7 @@ glabel endscreenPrepare /* f10f240: 304c0100 */ andi $t4,$v0,0x100 /* f10f244: 11800016 */ beqz $t4,.PB0f10f2a0 /* f10f248: 00000000 */ nop -/* f10f24c: 0fc41cf0 */ jal 0xf1073c0 +/* f10f24c: 0fc41cf0 */ jal cheatIsUnlocked /* f10f250: 304400ff */ andi $a0,$v0,0xff /* f10f254: 8fad0020 */ lw $t5,0x20($sp) /* f10f258: 15a00011 */ bnez $t5,.PB0f10f2a0 @@ -1569,7 +1569,7 @@ glabel endscreenPrepare /* f10f2d4: 11800017 */ beqz $t4,.PB0f10f334 /* f10f2d8: 00022402 */ srl $a0,$v0,0x10 /* f10f2dc: 308d00ff */ andi $t5,$a0,0xff -/* f10f2e0: 0fc41cf0 */ jal 0xf1073c0 +/* f10f2e0: 0fc41cf0 */ jal cheatIsUnlocked /* f10f2e4: 01a02025 */ move $a0,$t5 /* f10f2e8: 8fae001c */ lw $t6,0x1c($sp) /* f10f2ec: 15c00011 */ bnez $t6,.PB0f10f334 @@ -1591,7 +1591,7 @@ glabel endscreenPrepare /* f10f32c: 35390800 */ ori $t9,$t1,0x800 /* f10f330: ad190e20 */ sw $t9,0xe20($t0) .PB0f10f334: -/* f10f334: 0fc67317 */ jal 0xf19cc5c +/* f10f334: 0fc67317 */ jal mpDetermineUnlockedFeatures /* f10f338: 00000000 */ nop /* f10f33c: 3c0b800a */ lui $t3,0x800a /* f10f340: 916b2519 */ lbu $t3,0x2519($t3) @@ -1605,13 +1605,13 @@ glabel endscreenPrepare /* f10f360: 15800004 */ bnez $t4,.PB0f10f374 /* f10f364: 3c01800a */ lui $at,0x800a /* f10f368: a04d0000 */ sb $t5,0x0($v0) -/* f10f36c: 0fc44497 */ jal 0xf11125c +/* f10f36c: 0fc44497 */ jal bossfileSave /* f10f370: a02e685c */ sb $t6,0x685c($at) .PB0f10f374: /* f10f374: 3c04800a */ lui $a0,0x800a /* f10f378: 248467f0 */ addiu $a0,$a0,0x67f0 /* f10f37c: 00002825 */ move $a1,$zero -/* f10f380: 0fc426eb */ jal 0xf109bac +/* f10f380: 0fc426eb */ jal filemgrSaveOrLoad /* f10f384: 00003025 */ move $a2,$zero /* f10f388: 3c03800a */ lui $v1,0x800a /* f10f38c: 8c635ef4 */ lw $v1,0x5ef4($v1) @@ -1620,7 +1620,7 @@ glabel endscreenPrepare .PB0f10f394: /* f10f394: 54610008 */ bnel $v1,$at,.PB0f10f3b8 /* f10f398: 8fbf0014 */ lw $ra,0x14($sp) -/* f10f39c: 0fc5b9a4 */ jal 0xf16e690 +/* f10f39c: 0fc5b9a4 */ jal lvSetPaused /* f10f3a0: 24040001 */ li $a0,0x1 /* f10f3a4: 3c18800a */ lui $t8,0x800a /* f10f3a8: 8f18e754 */ lw $t8,-0x18ac($t8) @@ -2059,7 +2059,7 @@ glabel soloPushCoopModeEndscreen /* f10f3cc: 27bdffe0 */ addiu $sp,$sp,-32 /* f10f3d0: afbf0014 */ sw $ra,0x14($sp) /* f10f3d4: 24040001 */ li $a0,0x1 -/* f10f3d8: 0fc5b9a4 */ jal 0xf16e690 +/* f10f3d8: 0fc5b9a4 */ jal lvSetPaused /* f10f3dc: afae001c */ sw $t6,0x1c($sp) /* f10f3e0: 3c04800a */ lui $a0,0x800a /* f10f3e4: 2484e4d0 */ addiu $a0,$a0,-6960 @@ -2102,50 +2102,50 @@ glabel soloPushCoopModeEndscreen /* f10f474: 8f19048c */ lw $t9,0x48c($t8) /* f10f478: 17200005 */ bnez $t9,.PB0f10f490 /* f10f47c: 00000000 */ nop -/* f10f480: 0fc25675 */ jal 0xf0959d4 +/* f10f480: 0fc25675 */ jal objectiveIsAllComplete /* f10f484: 00000000 */ nop /* f10f488: 14400015 */ bnez $v0,.PB0f10f4e0 /* f10f48c: 00000000 */ nop .PB0f10f490: -/* f10f490: 0fc4810c */ jal 0xf120430 +/* f10f490: 0fc4810c */ jal debugIsAllTrainingEnabled /* f10f494: 00000000 */ nop /* f10f498: 14400011 */ bnez $v0,.PB0f10f4e0 /* f10f49c: 00000000 */ nop -/* f10f4a0: 0fc550b9 */ jal 0xf1542e4 +/* f10f4a0: 0fc550b9 */ jal optionsGetScreenSplit /* f10f4a4: 00000000 */ nop /* f10f4a8: 24010001 */ li $at,0x1 /* f10f4ac: 14410007 */ bne $v0,$at,.PB0f10f4cc /* f10f4b0: 3c048007 */ lui $a0,0x8007 /* f10f4b4: 3c048007 */ lui $a0,0x8007 /* f10f4b8: 2484797c */ addiu $a0,$a0,0x797c -/* f10f4bc: 0fc3e223 */ jal 0xf0f888c +/* f10f4bc: 0fc3e223 */ jal menuPushRootDialog /* f10f4c0: 24050005 */ li $a1,0x5 /* f10f4c4: 10000016 */ b .PB0f10f520 /* f10f4c8: 00000000 */ nop .PB0f10f4cc: /* f10f4cc: 2484794c */ addiu $a0,$a0,0x794c -/* f10f4d0: 0fc3e223 */ jal 0xf0f888c +/* f10f4d0: 0fc3e223 */ jal menuPushRootDialog /* f10f4d4: 24050005 */ li $a1,0x5 /* f10f4d8: 10000011 */ b .PB0f10f520 /* f10f4dc: 00000000 */ nop .PB0f10f4e0: -/* f10f4e0: 0fc550b9 */ jal 0xf1542e4 +/* f10f4e0: 0fc550b9 */ jal optionsGetScreenSplit /* f10f4e4: 00000000 */ nop /* f10f4e8: 24010001 */ li $at,0x1 /* f10f4ec: 14410007 */ bne $v0,$at,.PB0f10f50c /* f10f4f0: 3c048007 */ lui $a0,0x8007 /* f10f4f4: 3c048007 */ lui $a0,0x8007 /* f10f4f8: 24847964 */ addiu $a0,$a0,0x7964 -/* f10f4fc: 0fc3e223 */ jal 0xf0f888c +/* f10f4fc: 0fc3e223 */ jal menuPushRootDialog /* f10f500: 24050005 */ li $a1,0x5 /* f10f504: 10000004 */ b .PB0f10f518 /* f10f508: 00000000 */ nop .PB0f10f50c: /* f10f50c: 24847934 */ addiu $a0,$a0,0x7934 -/* f10f510: 0fc3e223 */ jal 0xf0f888c +/* f10f510: 0fc3e223 */ jal menuPushRootDialog /* f10f514: 24050005 */ li $a1,0x5 .PB0f10f518: -/* f10f518: 0fc43b1e */ jal 0xf10ec78 +/* f10f518: 0fc43b1e */ jal endscreenSetCoopCompleted /* f10f51c: 00000000 */ nop .PB0f10f520: /* f10f520: 3c08800a */ lui $t0,0x800a @@ -2156,7 +2156,7 @@ glabel soloPushCoopModeEndscreen /* f10f534: 248467f0 */ addiu $a0,$a0,0x67f0 /* f10f538: 15090003 */ bne $t0,$t1,.PB0f10f548 /* f10f53c: 00002825 */ move $a1,$zero -/* f10f540: 0fc426eb */ jal 0xf109bac +/* f10f540: 0fc426eb */ jal filemgrSaveOrLoad /* f10f544: 00003025 */ move $a2,$zero .PB0f10f548: /* f10f548: 8fbf0014 */ lw $ra,0x14($sp) @@ -2248,25 +2248,25 @@ glabel soloPushSoloModeEndscreen /* f10f5d4: 8d6c048c */ lw $t4,0x48c($t3) /* f10f5d8: 15800005 */ bnez $t4,.PB0f10f5f0 /* f10f5dc: 00000000 */ nop -/* f10f5e0: 0fc25675 */ jal 0xf0959d4 +/* f10f5e0: 0fc25675 */ jal objectiveIsAllComplete /* f10f5e4: 00000000 */ nop /* f10f5e8: 1440000d */ bnez $v0,.PB0f10f620 /* f10f5ec: 00000000 */ nop .PB0f10f5f0: -/* f10f5f0: 0fc4810c */ jal 0xf120430 +/* f10f5f0: 0fc4810c */ jal debugIsAllTrainingEnabled /* f10f5f4: 00000000 */ nop /* f10f5f8: 14400009 */ bnez $v0,.PB0f10f620 /* f10f5fc: 00000000 */ nop -/* f10f600: 0fc43798 */ jal 0xf10de60 +/* f10f600: 0fc43798 */ jal func0f10d770 /* f10f604: 00000000 */ nop /* f10f608: 3c048007 */ lui $a0,0x8007 /* f10f60c: 24847380 */ addiu $a0,$a0,0x7380 -/* f10f610: 0fc3e223 */ jal 0xf0f888c +/* f10f610: 0fc3e223 */ jal menuPushRootDialog /* f10f614: 24050009 */ li $a1,0x9 /* f10f618: 10000004 */ b .PB0f10f62c /* f10f61c: 8fbf0014 */ lw $ra,0x14($sp) .PB0f10f620: -/* f10f620: 0fc43800 */ jal 0xf10e000 +/* f10f620: 0fc43800 */ jal endscreenHandleContinue /* f10f624: 24040001 */ li $a0,0x1 /* f10f628: 8fbf0014 */ lw $ra,0x14($sp) .PB0f10f62c: @@ -2384,7 +2384,7 @@ glabel soloPushAntiModeEndscreen /* f10f648: 27bdffe0 */ addiu $sp,$sp,-32 /* f10f64c: afbf0014 */ sw $ra,0x14($sp) /* f10f650: 24040001 */ li $a0,0x1 -/* f10f654: 0fc5b9a4 */ jal 0xf16e690 +/* f10f654: 0fc5b9a4 */ jal lvSetPaused /* f10f658: afae001c */ sw $t6,0x1c($sp) /* f10f65c: 3c03800a */ lui $v1,0x800a /* f10f660: 2463e4d0 */ addiu $v1,$v1,-6960 @@ -2424,53 +2424,53 @@ glabel soloPushAntiModeEndscreen /* f10f6e8: 8c98048c */ lw $t8,0x48c($a0) /* f10f6ec: 17000005 */ bnez $t8,.PB0f10f704 /* f10f6f0: 00000000 */ nop -/* f10f6f4: 0fc25675 */ jal 0xf0959d4 +/* f10f6f4: 0fc25675 */ jal objectiveIsAllComplete /* f10f6f8: 00000000 */ nop /* f10f6fc: 14400015 */ bnez $v0,.PB0f10f754 /* f10f700: 00000000 */ nop .PB0f10f704: -/* f10f704: 0fc4810c */ jal 0xf120430 +/* f10f704: 0fc4810c */ jal debugIsAllTrainingEnabled /* f10f708: 00000000 */ nop /* f10f70c: 14400011 */ bnez $v0,.PB0f10f754 /* f10f710: 00000000 */ nop -/* f10f714: 0fc550b9 */ jal 0xf1542e4 +/* f10f714: 0fc550b9 */ jal optionsGetScreenSplit /* f10f718: 00000000 */ nop /* f10f71c: 24010001 */ li $at,0x1 /* f10f720: 14410007 */ bne $v0,$at,.PB0f10f740 /* f10f724: 3c048007 */ lui $a0,0x8007 /* f10f728: 3c048007 */ lui $a0,0x8007 /* f10f72c: 2484797c */ addiu $a0,$a0,0x797c -/* f10f730: 0fc3e223 */ jal 0xf0f888c +/* f10f730: 0fc3e223 */ jal menuPushRootDialog /* f10f734: 24050005 */ li $a1,0x5 /* f10f738: 10000014 */ b .PB0f10f78c /* f10f73c: 00000000 */ nop .PB0f10f740: /* f10f740: 2484794c */ addiu $a0,$a0,0x794c -/* f10f744: 0fc3e223 */ jal 0xf0f888c +/* f10f744: 0fc3e223 */ jal menuPushRootDialog /* f10f748: 24050005 */ li $a1,0x5 /* f10f74c: 1000000f */ b .PB0f10f78c /* f10f750: 00000000 */ nop .PB0f10f754: -/* f10f754: 0fc550b9 */ jal 0xf1542e4 +/* f10f754: 0fc550b9 */ jal optionsGetScreenSplit /* f10f758: 00000000 */ nop /* f10f75c: 24010001 */ li $at,0x1 /* f10f760: 14410007 */ bne $v0,$at,.PB0f10f780 /* f10f764: 3c048007 */ lui $a0,0x8007 /* f10f768: 3c048007 */ lui $a0,0x8007 /* f10f76c: 24847964 */ addiu $a0,$a0,0x7964 -/* f10f770: 0fc3e223 */ jal 0xf0f888c +/* f10f770: 0fc3e223 */ jal menuPushRootDialog /* f10f774: 24050005 */ li $a1,0x5 /* f10f778: 10000004 */ b .PB0f10f78c /* f10f77c: 00000000 */ nop .PB0f10f780: /* f10f780: 24847934 */ addiu $a0,$a0,0x7934 -/* f10f784: 0fc3e223 */ jal 0xf0f888c +/* f10f784: 0fc3e223 */ jal menuPushRootDialog /* f10f788: 24050005 */ li $a1,0x5 .PB0f10f78c: /* f10f78c: 3c04800a */ lui $a0,0x800a /* f10f790: 248467f0 */ addiu $a0,$a0,0x67f0 /* f10f794: 00002825 */ move $a1,$zero -/* f10f798: 0fc426eb */ jal 0xf109bac +/* f10f798: 0fc426eb */ jal filemgrSaveOrLoad /* f10f79c: 00003025 */ move $a2,$zero /* f10f7a0: 10000032 */ b .PB0f10f86c /* f10f7a4: 8fbf0014 */ lw $ra,0x14($sp) @@ -2485,47 +2485,47 @@ glabel soloPushAntiModeEndscreen /* f10f7c4: 8c8a048c */ lw $t2,0x48c($a0) /* f10f7c8: 15400005 */ bnez $t2,.PB0f10f7e0 /* f10f7cc: 00000000 */ nop -/* f10f7d0: 0fc25675 */ jal 0xf0959d4 +/* f10f7d0: 0fc25675 */ jal objectiveIsAllComplete /* f10f7d4: 00000000 */ nop /* f10f7d8: 14400015 */ bnez $v0,.PB0f10f830 /* f10f7dc: 00000000 */ nop .PB0f10f7e0: -/* f10f7e0: 0fc4810c */ jal 0xf120430 +/* f10f7e0: 0fc4810c */ jal debugIsAllTrainingEnabled /* f10f7e4: 00000000 */ nop /* f10f7e8: 14400011 */ bnez $v0,.PB0f10f830 /* f10f7ec: 00000000 */ nop -/* f10f7f0: 0fc550b9 */ jal 0xf1542e4 +/* f10f7f0: 0fc550b9 */ jal optionsGetScreenSplit /* f10f7f4: 00000000 */ nop /* f10f7f8: 24010001 */ li $at,0x1 /* f10f7fc: 14410007 */ bne $v0,$at,.PB0f10f81c /* f10f800: 3c048007 */ lui $a0,0x8007 /* f10f804: 3c048007 */ lui $a0,0x8007 /* f10f808: 24847964 */ addiu $a0,$a0,0x7964 -/* f10f80c: 0fc3e223 */ jal 0xf0f888c +/* f10f80c: 0fc3e223 */ jal menuPushRootDialog /* f10f810: 24050005 */ li $a1,0x5 /* f10f814: 10000015 */ b .PB0f10f86c /* f10f818: 8fbf0014 */ lw $ra,0x14($sp) .PB0f10f81c: /* f10f81c: 24847934 */ addiu $a0,$a0,0x7934 -/* f10f820: 0fc3e223 */ jal 0xf0f888c +/* f10f820: 0fc3e223 */ jal menuPushRootDialog /* f10f824: 24050005 */ li $a1,0x5 /* f10f828: 10000010 */ b .PB0f10f86c /* f10f82c: 8fbf0014 */ lw $ra,0x14($sp) .PB0f10f830: -/* f10f830: 0fc550b9 */ jal 0xf1542e4 +/* f10f830: 0fc550b9 */ jal optionsGetScreenSplit /* f10f834: 00000000 */ nop /* f10f838: 24010001 */ li $at,0x1 /* f10f83c: 14410007 */ bne $v0,$at,.PB0f10f85c /* f10f840: 3c048007 */ lui $a0,0x8007 /* f10f844: 3c048007 */ lui $a0,0x8007 /* f10f848: 2484797c */ addiu $a0,$a0,0x797c -/* f10f84c: 0fc3e223 */ jal 0xf0f888c +/* f10f84c: 0fc3e223 */ jal menuPushRootDialog /* f10f850: 24050005 */ li $a1,0x5 /* f10f854: 10000005 */ b .PB0f10f86c /* f10f858: 8fbf0014 */ lw $ra,0x14($sp) .PB0f10f85c: /* f10f85c: 2484794c */ addiu $a0,$a0,0x794c -/* f10f860: 0fc3e223 */ jal 0xf0f888c +/* f10f860: 0fc3e223 */ jal menuPushRootDialog /* f10f864: 24050005 */ li $a1,0x5 /* f10f868: 8fbf0014 */ lw $ra,0x14($sp) .PB0f10f86c: diff --git a/src/game/explosions/explosions.c b/src/game/explosions/explosions.c index 34dd90d72..7cf0f12c5 100644 --- a/src/game/explosions/explosions.c +++ b/src/game/explosions/explosions.c @@ -2269,7 +2269,7 @@ glabel var7f1b68a0pf /* f12c738: 50410015 */ beql $v0,$at,.PB0f12c790 /* f12c73c: 2401ffff */ li $at,-1 .PB0f12c740: -/* f12c740: 0c004be0 */ jal 0x12f80 +/* f12c740: 0c004be0 */ jal random /* f12c744: 00000000 */ nop /* f12c748: 304b07ff */ andi $t3,$v0,0x7ff /* f12c74c: 2d6100f1 */ sltiu $at,$t3,0xf1 @@ -2280,7 +2280,7 @@ glabel var7f1b68a0pf /* f12c760: 240600ff */ li $a2,0xff /* f12c764: 4600310d */ trunc.w.s $f4,$f6 /* f12c768: 44052000 */ mfc1 $a1,$f4 -/* f12c76c: 0fc010e3 */ jal 0xf00438c +/* f12c76c: 0fc010e3 */ jal roomAdjustLighting /* f12c770: 00000000 */ nop .PB0f12c774: /* f12c774: 86ce002a */ lh $t6,0x2a($s6) @@ -2328,16 +2328,16 @@ glabel var7f1b68a0pf /* f12c814: 4606c601 */ sub.s $f24,$f24,$f6 /* f12c818: 02202025 */ move $a0,$s1 .PB0f12c81c: -/* f12c81c: 0fc003d4 */ jal 0xf000f50 +/* f12c81c: 0fc003d4 */ jal lightIsHealthy /* f12c820: 02002825 */ move $a1,$s0 /* f12c824: 1040001c */ beqz $v0,.PB0f12c898 /* f12c828: 02202025 */ move $a0,$s1 -/* f12c82c: 0fc003e5 */ jal 0xf000f94 +/* f12c82c: 0fc003e5 */ jal lightIsVulnerable /* f12c830: 02002825 */ move $a1,$s0 /* f12c834: 10400018 */ beqz $v0,.PB0f12c898 /* f12c838: 02202025 */ move $a0,$s1 /* f12c83c: 02002825 */ move $a1,$s0 -/* f12c840: 0fc0037f */ jal 0xf000dfc +/* f12c840: 0fc0037f */ jal lightGetBboxCentre /* f12c844: 02603025 */ move $a2,$s3 /* f12c848: 10400013 */ beqz $v0,.PB0f12c898 /* f12c84c: c7a40164 */ lwc1 $f4,0x164($sp) @@ -2353,11 +2353,11 @@ glabel var7f1b68a0pf /* f12c874: e7a80154 */ swc1 $f8,0x154($sp) /* f12c878: 02802025 */ move $a0,$s4 /* f12c87c: 02a02825 */ move $a1,$s5 -/* f12c880: 0fc5e3be */ jal 0xf178ef8 +/* f12c880: 0fc5e3be */ jal func0f1773c8 /* f12c884: e7a60150 */ swc1 $f6,0x150($sp) /* f12c888: 10400003 */ beqz $v0,.PB0f12c898 /* f12c88c: 02202025 */ move $a0,$s1 -/* f12c890: 0fc006de */ jal 0xf001b78 +/* f12c890: 0fc006de */ jal roomSetLightBroken /* f12c894: 02002825 */ move $a1,$s0 .PB0f12c898: /* f12c898: 26100001 */ addiu $s0,$s0,0x1 @@ -2373,7 +2373,7 @@ glabel var7f1b68a0pf /* f12c8b8: 27b00198 */ addiu $s0,$sp,0x198 /* f12c8bc: 02002825 */ move $a1,$s0 /* f12c8c0: 26e40028 */ addiu $a0,$s7,0x28 -/* f12c8c4: 0fc19858 */ jal 0xf066160 +/* f12c8c4: 0fc19858 */ jal roomGetProps /* f12c8c8: 24060100 */ li $a2,0x100 /* f12c8cc: 87aa0198 */ lh $t2,0x198($sp) /* f12c8d0: 0200a025 */ move $s4,$s0 @@ -2445,13 +2445,13 @@ glabel var7f1b68a0pf /* f12c9cc: 27a50130 */ addiu $a1,$sp,0x130 /* f12c9d0: 4500000e */ bc1f .PB0f12ca0c /* f12c9d4: 00000000 */ nop -/* f12c9d8: 0fc24855 */ jal 0xf092154 +/* f12c9d8: 0fc24855 */ jal func0f092304 /* f12c9dc: 27a60124 */ addiu $a2,$sp,0x124 /* f12c9e0: 10400009 */ beqz $v0,.PB0f12ca08 /* f12c9e4: 8fa403a0 */ lw $a0,0x3a0($sp) /* f12c9e8: 02002825 */ move $a1,$s0 /* f12c9ec: 27a60130 */ addiu $a2,$sp,0x130 -/* f12c9f0: 0fc4b115 */ jal 0xf12c454 +/* f12c9f0: 0fc4b115 */ jal func0f12af5c /* f12c9f4: 27a70124 */ addiu $a3,$sp,0x124 /* f12c9f8: 10400004 */ beqz $v0,.PB0f12ca0c /* f12c9fc: 00000000 */ nop @@ -2535,7 +2535,7 @@ glabel var7f1b68a0pf .PB0f12cb14: /* f12cb14: 11c00060 */ beqz $t6,.PB0f12cc98 /* f12cb18: 02202025 */ move $a0,$s1 -/* f12cb1c: 0fc19a2b */ jal 0xf0668ac +/* f12cb1c: 0fc19a2b */ jal objUpdateLinkedScenery /* f12cb20: 02e02825 */ move $a1,$s7 /* f12cb24: 8e220040 */ lw $v0,0x40($s1) /* f12cb28: 30581000 */ andi $t8,$v0,0x1000 @@ -2547,7 +2547,7 @@ glabel var7f1b68a0pf /* f12cb40: 03214024 */ and $t0,$t9,$at /* f12cb44: 5500001d */ bnezl $t0,.PB0f12cbbc /* f12cb48: 00025140 */ sll $t2,$v0,0x5 -/* f12cb4c: 0c004be0 */ jal 0x12f80 +/* f12cb4c: 0c004be0 */ jal random /* f12cb50: 00000000 */ nop /* f12cb54: 44822000 */ mtc1 $v0,$f4 /* f12cb58: 02002025 */ move $a0,$s0 @@ -2572,7 +2572,7 @@ glabel var7f1b68a0pf /* f12cba0: 461e4180 */ add.s $f6,$f8,$f30 /* f12cba4: 46143102 */ mul.s $f4,$f6,$f20 /* f12cba8: 44052000 */ mfc1 $a1,$f4 -/* f12cbac: 0fc2147c */ jal 0xf0851f0 +/* f12cbac: 0fc2147c */ jal func0f085050 /* f12cbb0: 00000000 */ nop /* f12cbb4: 8e220040 */ lw $v0,0x40($s1) /* f12cbb8: 00025140 */ sll $t2,$v0,0x5 @@ -2608,7 +2608,7 @@ glabel var7f1b68a0pf /* f12cc28: 460a5202 */ mul.s $f8,$f10,$f10 /* f12cc2c: 00000000 */ nop /* f12cc30: 460e7182 */ mul.s $f6,$f14,$f14 -/* f12cc34: 0c012ae4 */ jal 0x4ab90 +/* f12cc34: 0c012ae4 */ jal sqrtf /* f12cc38: 46064300 */ add.s $f12,$f8,$f6 /* f12cc3c: 4600e03c */ c.lt.s $f28,$f0 /* f12cc40: 3c014080 */ lui $at,0x4080 @@ -2630,12 +2630,12 @@ glabel var7f1b68a0pf /* f12cc7c: afae0010 */ sw $t6,0x10($sp) /* f12cc80: 02202025 */ move $a0,$s1 /* f12cc84: 27a500f4 */ addiu $a1,$sp,0xf4 -/* f12cc88: 0fc20aef */ jal 0xf082bbc +/* f12cc88: 0fc20aef */ jal func0f082a1c /* f12cc8c: 24070001 */ li $a3,0x1 /* f12cc90: 10000102 */ b .PB0f12d09c /* f12cc94: 86820002 */ lh $v0,0x2($s4) .PB0f12cc98: -/* f12cc98: 0fc21ad2 */ jal 0xf086b48 +/* f12cc98: 0fc21ad2 */ jal objIsHealthy /* f12cc9c: 02202025 */ move $a0,$s1 /* f12cca0: 104000fd */ beqz $v0,.PB0f12d098 /* f12cca4: 3c017f1b */ lui $at,0x7f1b @@ -2653,7 +2653,7 @@ glabel var7f1b68a0pf /* f12ccd4: 01014824 */ and $t1,$t0,$at /* f12ccd8: 552000f0 */ bnezl $t1,.PB0f12d09c /* f12ccdc: 86820002 */ lh $v0,0x2($s4) -/* f12cce0: 0c004be0 */ jal 0x12f80 +/* f12cce0: 0c004be0 */ jal random /* f12cce4: 00000000 */ nop /* f12cce8: 44823000 */ mtc1 $v0,$f6 /* f12ccec: 02002025 */ move $a0,$s0 @@ -2678,7 +2678,7 @@ glabel var7f1b68a0pf /* f12cd34: 461e2200 */ add.s $f8,$f4,$f30 /* f12cd38: 46144182 */ mul.s $f6,$f8,$f20 /* f12cd3c: 44053000 */ mfc1 $a1,$f6 -/* f12cd40: 0fc2147c */ jal 0xf0851f0 +/* f12cd40: 0fc2147c */ jal func0f085050 /* f12cd44: 00000000 */ nop /* f12cd48: 100000d4 */ b .PB0f12d09c /* f12cd4c: 86820002 */ lh $v0,0x2($s4) @@ -2723,7 +2723,7 @@ glabel var7f1b68a0pf /* f12cde0: 27a600dc */ addiu $a2,$sp,0xdc /* f12cde4: 45000026 */ bc1f .PB0f12ce80 /* f12cde8: 00000000 */ nop -/* f12cdec: 0fc198f9 */ jal 0xf0663e4 +/* f12cdec: 0fc198f9 */ jal propGetBbox /* f12cdf0: 27a700d8 */ addiu $a3,$sp,0xd8 /* f12cdf4: 3c0141a0 */ lui $at,0x41a0 /* f12cdf8: c7a000e0 */ lwc1 $f0,0xe0($sp) @@ -2756,7 +2756,7 @@ glabel var7f1b68a0pf /* f12ce60: e7a600c0 */ swc1 $f6,0xc0($sp) /* f12ce64: c6080010 */ lwc1 $f8,0x10($s0) /* f12ce68: 460a4180 */ add.s $f6,$f8,$f10 -/* f12ce6c: 0fc4b115 */ jal 0xf12c454 +/* f12ce6c: 0fc4b115 */ jal func0f12af5c /* f12ce70: e7a600c8 */ swc1 $f6,0xc8($sp) /* f12ce74: 10400002 */ beqz $v0,.PB0f12ce80 /* f12ce78: 00000000 */ nop @@ -2834,7 +2834,7 @@ glabel var7f1b68a0pf /* f12cf7c: 4616b182 */ mul.s $f6,$f22,$f22 /* f12cf80: 00000000 */ nop /* f12cf84: 4618c102 */ mul.s $f4,$f24,$f24 -/* f12cf88: 0c012ae4 */ jal 0x4ab90 +/* f12cf88: 0c012ae4 */ jal sqrtf /* f12cf8c: 46043300 */ add.s $f12,$f6,$f4 /* f12cf90: 4600e03c */ c.lt.s $f28,$f0 /* f12cf94: 00000000 */ nop @@ -2862,7 +2862,7 @@ glabel var7f1b68a0pf /* f12cfe0: 8faf03a0 */ lw $t7,0x3a0($sp) /* f12cfe4: 51000008 */ beqzl $t0,.PB0f12d008 /* f12cfe8: 81e203ce */ lb $v0,0x3ce($t7) -/* f12cfec: 0fc63b03 */ jal 0xf18ec0c +/* f12cfec: 0fc63b03 */ jal mpGetChrFromPlayerIndex /* f12cff0: 812403ce */ lb $a0,0x3ce($t1) /* f12cff4: 5040001a */ beqzl $v0,.PB0f12d060 /* f12cff8: 4405a000 */ mfc1 $a1,$f20 @@ -2899,7 +2899,7 @@ glabel var7f1b68a0pf /* f12d060: 02402025 */ move $a0,$s2 /* f12d064: 27a600a0 */ addiu $a2,$sp,0xa0 /* f12d068: 02203825 */ move $a3,$s1 -/* f12d06c: 0fc0d141 */ jal 0xf034504 +/* f12d06c: 0fc0d141 */ jal chrDamageByExplosion /* f12d070: afb30010 */ sw $s3,0x10($sp) /* f12d074: 920e0000 */ lbu $t6,0x0($s0) /* f12d078: 8fb80194 */ lw $t8,0x194($sp) @@ -2908,7 +2908,7 @@ glabel var7f1b68a0pf /* f12d084: 17000004 */ bnez $t8,.PB0f12d098 /* f12d088: 02402025 */ move $a0,$s2 /* f12d08c: 4406d000 */ mfc1 $a2,$f26 -/* f12d090: 0fc09c71 */ jal 0xf0271c4 +/* f12d090: 0fc09c71 */ jal chrDisfigure /* f12d094: 02602825 */ move $a1,$s3 .PB0f12d098: /* f12d098: 86820002 */ lh $v0,0x2($s4) @@ -5251,11 +5251,11 @@ glabel var7f1b68b0pf /* f12d1cc: 00ca082a */ slt $at,$a2,$t2 /* f12d1d0: 1020013f */ beqz $at,.PB0f12d6d0 /* f12d1d4: 02202025 */ move $a0,$s1 -/* f12d1d8: 0fc4abfa */ jal 0xf12afe8 +/* f12d1d8: 0fc4abfa */ jal explosionGetHorizontalRangeAtFrame /* f12d1dc: 00c02825 */ move $a1,$a2 /* f12d1e0: 46000506 */ mov.s $f20,$f0 /* f12d1e4: 02202025 */ move $a0,$s1 -/* f12d1e8: 0fc4ac24 */ jal 0xf12b090 +/* f12d1e8: 0fc4ac24 */ jal explosionGetVerticalRangeAtFrame /* f12d1ec: 862503c8 */ lh $a1,0x3c8($s1) /* f12d1f0: 3c013f00 */ lui $at,0x3f00 /* f12d1f4: 44815000 */ mtc1 $at,$f10 @@ -5501,7 +5501,7 @@ glabel var7f1b68b0pf /* f12d564: 00000000 */ nop /* f12d568: e7b000f8 */ swc1 $f16,0xf8($sp) .PB0f12d56c: -/* f12d56c: 0c004be0 */ jal 0x12f80 +/* f12d56c: 0c004be0 */ jal random /* f12d570: 00000000 */ nop /* f12d574: c7aa00f0 */ lwc1 $f10,0xf0($sp) /* f12d578: c7b200fc */ lwc1 $f18,0xfc($sp) @@ -5518,7 +5518,7 @@ glabel var7f1b68b0pf /* f12d5a0: 00000000 */ nop /* f12d5a4: 46064282 */ mul.s $f10,$f8,$f6 /* f12d5a8: 46125100 */ add.s $f4,$f10,$f18 -/* f12d5ac: 0c004be0 */ jal 0x12f80 +/* f12d5ac: 0c004be0 */ jal random /* f12d5b0: e6040008 */ swc1 $f4,0x8($s0) /* f12d5b4: c7a800f4 */ lwc1 $f8,0xf4($sp) /* f12d5b8: c7a60100 */ lwc1 $f6,0x100($sp) @@ -5535,7 +5535,7 @@ glabel var7f1b68b0pf /* f12d5e0: 00000000 */ nop /* f12d5e4: 46125202 */ mul.s $f8,$f10,$f18 /* f12d5e8: 46064100 */ add.s $f4,$f8,$f6 -/* f12d5ec: 0c004be0 */ jal 0x12f80 +/* f12d5ec: 0c004be0 */ jal random /* f12d5f0: e604000c */ swc1 $f4,0xc($s0) /* f12d5f4: c7aa00f8 */ lwc1 $f10,0xf8($sp) /* f12d5f8: c7b20104 */ lwc1 $f18,0x104($sp) @@ -5554,7 +5554,7 @@ glabel var7f1b68b0pf /* f12d628: a60b001c */ sh $t3,0x1c($s0) /* f12d62c: 46064282 */ mul.s $f10,$f8,$f6 /* f12d630: 46125100 */ add.s $f4,$f10,$f18 -/* f12d634: 0c004be0 */ jal 0x12f80 +/* f12d634: 0c004be0 */ jal random /* f12d638: e6040010 */ swc1 $f4,0x10($s0) /* f12d63c: 44824000 */ mtc1 $v0,$f8 /* f12d640: 3c014f80 */ lui $at,0x4f80 @@ -5571,7 +5571,7 @@ glabel var7f1b68b0pf /* f12d668: 46049202 */ mul.s $f8,$f18,$f4 /* f12d66c: 46144280 */ add.s $f10,$f8,$f20 /* f12d670: 46065482 */ mul.s $f18,$f10,$f6 -/* f12d674: 0c004be0 */ jal 0x12f80 +/* f12d674: 0c004be0 */ jal random /* f12d678: e6120014 */ swc1 $f18,0x14($s0) /* f12d67c: 44822000 */ mtc1 $v0,$f4 /* f12d680: 3c014f80 */ lui $at,0x4f80 @@ -5604,16 +5604,16 @@ glabel var7f1b68b0pf /* f12d6dc: 27b20130 */ addiu $s2,$sp,0x130 /* f12d6e0: 02402825 */ move $a1,$s2 /* f12d6e4: 02002025 */ move $a0,$s0 -/* f12d6e8: 0fc4ac40 */ jal 0xf12b100 +/* f12d6e8: 0fc4ac40 */ jal explosionGetBboxAtFrame /* f12d6ec: 02e03825 */ move $a3,$s7 /* f12d6f0: 26e60028 */ addiu $a2,$s7,0x28 /* f12d6f4: afa6009c */ sw $a2,0x9c($sp) /* f12d6f8: 02002025 */ move $a0,$s0 /* f12d6fc: 02402825 */ move $a1,$s2 /* f12d700: 24070007 */ li $a3,0x7 -/* f12d704: 0fc599d0 */ jal 0xf166740 +/* f12d704: 0fc599d0 */ jal func0f1650d0 /* f12d708: afa00010 */ sw $zero,0x10($sp) -/* f12d70c: 0fc4b176 */ jal 0xf12c5d8 +/* f12d70c: 0fc4b176 */ jal func0f12b0e0 /* f12d710: 02e02025 */ move $a0,$s7 /* f12d714: 862603c8 */ lh $a2,0x3c8($s1) /* f12d718: 3c01bf80 */ lui $at,0xbf80 @@ -5638,7 +5638,7 @@ glabel var7f1b68b0pf /* f12d764: e7a00024 */ swc1 $f0,0x24($sp) /* f12d768: e7a00030 */ swc1 $f0,0x30($sp) /* f12d76c: e7a00034 */ swc1 $f0,0x34($sp) -/* f12d770: 0fc24e0e */ jal 0xf093838 +/* f12d770: 0fc24e0e */ jal func0f0939f8 /* f12d774: e7a00038 */ swc1 $f0,0x38($sp) /* f12d778: 862603c8 */ lh $a2,0x3c8($s1) .PB0f12d77c: @@ -5686,7 +5686,7 @@ glabel var7f1b68b0pf .PB0f12d810: /* f12d810: 54410007 */ bnel $v0,$at,.PB0f12d830 /* f12d814: 8e220004 */ lw $v0,0x4($s1) -/* f12d818: 0c004be0 */ jal 0x12f80 +/* f12d818: 0c004be0 */ jal random /* f12d81c: 00000000 */ nop /* f12d820: 304f0001 */ andi $t7,$v0,0x1 /* f12d824: 55e0000f */ bnezl $t7,.PB0f12d864 @@ -5699,12 +5699,12 @@ glabel var7f1b68b0pf /* f12d83c: 00000000 */ nop /* f12d840: 24440008 */ addiu $a0,$v0,0x8 /* f12d844: 24450028 */ addiu $a1,$v0,0x28 -/* f12d848: 0fc4bf5c */ jal 0xf12fd70 +/* f12d848: 0fc4bf5c */ jal smokeCreateSimple /* f12d84c: 92c60024 */ lbu $a2,0x24($s6) /* f12d850: 10000004 */ b .PB0f12d864 /* f12d854: 8fb80094 */ lw $t8,0x94($sp) .PB0f12d858: -/* f12d858: 0fc4bf5c */ jal 0xf12fd70 +/* f12d858: 0fc4bf5c */ jal smokeCreateSimple /* f12d85c: 92c60024 */ lbu $a2,0x24($s6) .PB0f12d860: /* f12d860: 8fb80094 */ lw $t8,0x94($sp) @@ -5726,7 +5726,7 @@ glabel var7f1b68b0pf /* f12d89c: 00000000 */ nop /* f12d8a0: 46001506 */ mov.s $f20,$f2 .PB0f12d8a4: -/* f12d8a4: 0c004be0 */ jal 0x12f80 +/* f12d8a4: 0c004be0 */ jal random /* f12d8a8: 00000000 */ nop /* f12d8ac: 44829000 */ mtc1 $v0,$f18 /* f12d8b0: 3c017f1b */ lui $at,0x7f1b @@ -5747,7 +5747,7 @@ glabel var7f1b68b0pf /* f12d8e8: 4604a502 */ mul.s $f20,$f20,$f4 /* f12d8ec: 51200006 */ beqzl $t1,.PB0f12d908 /* f12d8f0: 8ea2029c */ lw $v0,0x29c($s5) -/* f12d8f4: 0fc63b03 */ jal 0xf18ec0c +/* f12d8f4: 0fc63b03 */ jal mpGetChrFromPlayerIndex /* f12d8f8: 822403ce */ lb $a0,0x3ce($s1) /* f12d8fc: 10000018 */ b .PB0f12d960 /* f12d900: 00401825 */ move $v1,$v0 @@ -5800,7 +5800,7 @@ glabel var7f1b68b0pf /* f12d9ac: 11a00009 */ beqz $t5,.PB0f12d9d4 /* f12d9b0: 01602825 */ move $a1,$t3 /* f12d9b4: 27a700b0 */ addiu $a3,$sp,0xb0 -/* f12d9b8: 0fc58ae4 */ jal 0xf162b90 +/* f12d9b8: 0fc58ae4 */ jal func0f161520 /* f12d9bc: afa300e4 */ sw $v1,0xe4($sp) /* f12d9c0: 10400004 */ beqz $v0,.PB0f12d9d4 /* f12d9c4: 8fa300e4 */ lw $v1,0xe4($sp) @@ -5832,7 +5832,7 @@ glabel var7f1b68b0pf /* f12da28: 8fa5008c */ lw $a1,0x8c($sp) /* f12da2c: 02003025 */ move $a2,$s0 /* f12da30: 00003825 */ move $a3,$zero -/* f12da34: 0fc502a5 */ jal 0xf140a94 +/* f12da34: 0fc502a5 */ jal func0f13f504 /* f12da38: afb80018 */ sw $t8,0x18($sp) /* f12da3c: 8faa0098 */ lw $t2,0x98($sp) .PB0f12da40: @@ -5861,7 +5861,7 @@ glabel var7f1b68b0pf /* f12da94: 24010001 */ li $at,0x1 /* f12da98: 51e10004 */ beql $t7,$at,.PB0f12daac /* f12da9c: ae200000 */ sw $zero,0x0($s1) -/* f12daa0: 0fc10eb2 */ jal 0xf043ac8 +/* f12daa0: 0fc10eb2 */ jal propUnsetDangerous /* f12daa4: 8e240000 */ lw $a0,0x0($s1) /* f12daa8: ae200000 */ sw $zero,0x0($s1) .PB0f12daac: diff --git a/src/game/filemgr.c b/src/game/filemgr.c index dfdc5c3a2..4194bdecf 100644 --- a/src/game/filemgr.c +++ b/src/game/filemgr.c @@ -89,9 +89,9 @@ glabel func0f1088d0pf /* f108648: 3c02800a */ lui $v0,0x800a /* f10864c: 2442e4d0 */ addiu $v0,$v0,-6960 /* f108650: a44e0482 */ sh $t6,0x482($v0) -/* f108654: 0fc5c097 */ jal 0xf17025c +/* f108654: 0fc5c097 */ jal func0f16f75c /* f108658: 31c4ffff */ andi $a0,$t6,0xffff -/* f10865c: 0fc3cf12 */ jal 0xf0f3c48 +/* f10865c: 0fc3cf12 */ jal menuPopDialog /* f108660: 00000000 */ nop .PB0f108664: /* f108664: 8fbf0014 */ lw $ra,0x14($sp) @@ -2993,7 +2993,7 @@ glabel filemgrConsiderPushingFileSelectDialog /* f10d008: 3c048007 */ lui $a0,0x8007 /* f10d00c: a040083b */ sb $zero,0x83b($v0) /* f10d010: 24846b8c */ addiu $a0,$a0,0x6b8c -/* f10d014: 0fc3e223 */ jal 0xf0f888c +/* f10d014: 0fc3e223 */ jal menuPushRootDialog /* f10d018: 24050006 */ li $a1,0x6 /* f10d01c: 3c08800a */ lui $t0,0x800a /* f10d020: 9508e952 */ lhu $t0,-0x16ae($t0) @@ -3001,7 +3001,7 @@ glabel filemgrConsiderPushingFileSelectDialog /* f10d028: 29010006 */ slti $at,$t0,0x6 /* f10d02c: 14200003 */ bnez $at,.PB0f10d03c /* f10d030: 00000000 */ nop -/* f10d034: 0fc3cd2e */ jal 0xf0f34b8 +/* f10d034: 0fc3cd2e */ jal menuPushDialog /* f10d038: 24846120 */ addiu $a0,$a0,0x6120 .PB0f10d03c: /* f10d03c: 10000002 */ b .PB0f10d048 diff --git a/src/game/game_005fd0.c b/src/game/game_005fd0.c index 3c7abd4ef..a5b5c18ba 100644 --- a/src/game/game_005fd0.c +++ b/src/game/game_005fd0.c @@ -386,7 +386,7 @@ glabel chrCheckFootstep /* f0061e0: afbf004c */ sw $ra,0x4c($sp) /* f0061e4: afb10048 */ sw $s1,0x48($sp) /* f0061e8: 00808825 */ move $s1,$a0 -/* f0061ec: 0fc48103 */ jal 0xf12040c +/* f0061ec: 0fc48103 */ jal debugIsFootstepsEnabled /* f0061f0: afb00044 */ sw $s0,0x44($sp) /* f0061f4: 104000c2 */ beqz $v0,.PB0f006500 /* f0061f8: 24010001 */ li $at,0x1 @@ -445,7 +445,7 @@ glabel chrCheckFootstep /* f0062bc: e7a0006c */ swc1 $f0,0x6c($sp) .PB0f0062c0: /* f0062c0: 8e240020 */ lw $a0,0x20($s1) -/* f0062c4: 0c0076f3 */ jal 0x1dbcc +/* f0062c4: 0c0076f3 */ jal modelGetAnimNum /* f0062c8: afa30050 */ sw $v1,0x50($sp) /* f0062cc: 8fa30050 */ lw $v1,0x50($sp) /* f0062d0: 24010023 */ li $at,0x23 @@ -561,7 +561,7 @@ glabel chrCheckFootstep /* f006458: 00000000 */ nop /* f00645c: a2390190 */ sb $t9,0x190($s1) .PB0f006460: -/* f006460: 0fc0181d */ jal 0xf006074 +/* f006460: 0fc0181d */ jal chrChooseFootstepSound /* f006464: 02202025 */ move $a0,$s1 /* f006468: 2401ffff */ li $at,-1 /* f00646c: 5041001c */ beql $v0,$at,.PB0f0064e0 @@ -590,7 +590,7 @@ glabel chrCheckFootstep /* f0064c8: e7a00024 */ swc1 $f0,0x24($sp) /* f0064cc: e7a00030 */ swc1 $f0,0x30($sp) /* f0064d0: e7a00034 */ swc1 $f0,0x34($sp) -/* f0064d4: 0fc24e0e */ jal 0xf093838 +/* f0064d4: 0fc24e0e */ jal func0f0939f8 /* f0064d8: e7a00038 */ swc1 $f0,0x38($sp) .PB0f0064dc: /* f0064dc: 8e2e0020 */ lw $t6,0x20($s1) diff --git a/src/game/game_00b320.c b/src/game/game_00b320.c index f091a940a..4bbf10f5b 100644 --- a/src/game/game_00b320.c +++ b/src/game/game_00b320.c @@ -112,13 +112,13 @@ glabel stageLoadCommonLang .PB0f00b3c0: /* f00b3c0: 348f000f */ ori $t7,$a0,0xf /* f00b3c4: 39e4000f */ xori $a0,$t7,0xf -/* f00b3c8: 0c00490a */ jal 0x12428 +/* f00b3c8: 0c00490a */ jal mempAlloc /* f00b3cc: afa30018 */ sw $v1,0x18($sp) /* f00b3d0: 3c018008 */ lui $at,0x8008 /* f00b3d4: 8fa30018 */ lw $v1,0x18($sp) /* f00b3d8: ac2265f4 */ sw $v0,0x65f4($at) /* f00b3dc: 3c018008 */ lui $at,0x8008 -/* f00b3e0: 0fc5c07b */ jal 0xf1701ec +/* f00b3e0: 0fc5c07b */ jal func0f16f6ecpf /* f00b3e4: ac2365fc */ sw $v1,0x65fc($at) /* f00b3e8: 8fbf0014 */ lw $ra,0x14($sp) /* f00b3ec: 27bd0020 */ addiu $sp,$sp,0x20 diff --git a/src/game/game_00c490.c b/src/game/game_00c490.c index 015053f1e..07dfda3af 100644 --- a/src/game/game_00c490.c +++ b/src/game/game_00c490.c @@ -1526,7 +1526,7 @@ glabel var7f1a9258pf /* f00dbe0: 27bdff70 */ addiu $sp,$sp,-144 /* f00dbe4: afbf001c */ sw $ra,0x1c($sp) /* f00dbe8: afb00018 */ sw $s0,0x18($sp) -/* f00dbec: 0fc033b1 */ jal 0xf00cec4 +/* f00dbec: 0fc033b1 */ jal setupGenericObject /* f00dbf0: 00808025 */ move $s0,$a0 /* f00dbf4: 8e0e0080 */ lw $t6,0x80($s0) /* f00dbf8: 3c014780 */ lui $at,0x4780 @@ -1575,7 +1575,7 @@ glabel var7f1a9258pf /* f00dca4: 460c5402 */ mul.s $f16,$f10,$f12 /* f00dca8: 46028483 */ div.s $f18,$f16,$f2 /* f00dcac: e6060064 */ swc1 $f6,0x64($s0) -/* f00dcb0: 0c00490a */ jal 0x12428 +/* f00dcb0: 0c00490a */ jal mempAlloc /* f00dcb4: e6120068 */ swc1 $f18,0x68($s0) /* f00dcb8: 2403ffff */ li $v1,-1 /* f00dcbc: ae02009c */ sw $v0,0x9c($s0) @@ -1588,7 +1588,7 @@ glabel var7f1a9258pf /* f00dcd8: 0480001f */ bltz $a0,.PB0f00dd58 /* f00dcdc: e60000a0 */ swc1 $f0,0xa0($s0) /* f00dce0: 24050002 */ li $a1,0x2 -/* f00dce4: 0fc458d4 */ jal 0xf116350 +/* f00dce4: 0fc458d4 */ jal padUnpack /* f00dce8: 27a60028 */ addiu $a2,$sp,0x28 /* f00dcec: 8e020014 */ lw $v0,0x14($s0) /* f00dcf0: c7a8002c */ lwc1 $f8,0x2c($sp) @@ -1602,7 +1602,7 @@ glabel var7f1a9258pf /* f00dd10: c4440010 */ lwc1 $f4,0x10($v0) /* f00dd14: e7ac0088 */ swc1 $f12,0x88($sp) /* f00dd18: 46049381 */ sub.s $f14,$f18,$f4 -/* f00dd1c: 0fc25970 */ jal 0xf0965c0 +/* f00dd1c: 0fc25970 */ jal atan2f /* f00dd20: e7ae0080 */ swc1 $f14,0x80($sp) /* f00dd24: c7a20088 */ lwc1 $f2,0x88($sp) /* f00dd28: c7ae0080 */ lwc1 $f14,0x80($sp) @@ -1610,10 +1610,10 @@ glabel var7f1a9258pf /* f00dd30: 46021182 */ mul.s $f6,$f2,$f2 /* f00dd34: 00000000 */ nop /* f00dd38: 460e7202 */ mul.s $f8,$f14,$f14 -/* f00dd3c: 0c012ae4 */ jal 0x4ab90 +/* f00dd3c: 0c012ae4 */ jal sqrtf /* f00dd40: 46083300 */ add.s $f12,$f6,$f8 /* f00dd44: c7ac0084 */ lwc1 $f12,0x84($sp) -/* f00dd48: 0fc25970 */ jal 0xf0965c0 +/* f00dd48: 0fc25970 */ jal atan2f /* f00dd4c: 46000386 */ mov.s $f14,$f0 /* f00dd50: 10000007 */ b .PB0f00dd70 /* f00dd54: e6000074 */ swc1 $f0,0x74($s0) @@ -2234,26 +2234,26 @@ glabel var7f1a926cpf /* f00e364: 84840004 */ lh $a0,0x4($a0) /* f00e368: 240effff */ li $t6,-1 /* f00e36c: afae01bc */ sw $t6,0x1bc($sp) -/* f00e370: 0fc24801 */ jal 0xf092004 +/* f00e370: 0fc24801 */ jal modelLoad /* f00e374: afa401c0 */ sw $a0,0x1c0($sp) /* f00e378: 960f0070 */ lhu $t7,0x70($s0) /* f00e37c: 31f80040 */ andi $t8,$t7,0x40 /* f00e380: 53000004 */ beqzl $t8,.PB0f00e394 /* f00e384: 8e190008 */ lw $t9,0x8($s0) -/* f00e388: 0fc45a42 */ jal 0xf116908 +/* f00e388: 0fc45a42 */ jal padRotateForDoor /* f00e38c: 86040006 */ lh $a0,0x6($s0) /* f00e390: 8e190008 */ lw $t9,0x8($s0) .PB0f00e394: /* f00e394: 001940c0 */ sll $t0,$t9,0x3 /* f00e398: 05030005 */ bgezl $t0,.PB0f00e3b0 /* f00e39c: 86040006 */ lh $a0,0x6($s0) -/* f00e3a0: 0fc038a6 */ jal 0xf00e298 +/* f00e3a0: 0fc038a6 */ jal func0f00e2b0 /* f00e3a4: 86040006 */ lh $a0,0x6($s0) /* f00e3a8: afa201bc */ sw $v0,0x1bc($sp) /* f00e3ac: 86040006 */ lh $a0,0x6($s0) .PB0f00e3b0: /* f00e3b0: 2405007e */ li $a1,0x7e -/* f00e3b4: 0fc458d4 */ jal 0xf116350 +/* f00e3b4: 0fc458d4 */ jal padUnpack /* f00e3b8: 27a60168 */ addiu $a2,$sp,0x168 /* f00e3bc: 3c018006 */ lui $at,0x8006 /* f00e3c0: c42c32a0 */ lwc1 $f12,0x32a0($at) @@ -2353,7 +2353,7 @@ glabel var7f1a926cpf /* f00e538: e7a601ac */ swc1 $f6,0x1ac($sp) /* f00e53c: e7a801a8 */ swc1 $f8,0x1a8($sp) .PB0f00e540: -/* f00e540: 0fc45a8c */ jal 0xf116a30 +/* f00e540: 0fc45a8c */ jal padCopyBboxFromPad /* f00e544: 86040006 */ lh $a0,0x6($s0) /* f00e548: 8fab01b0 */ lw $t3,0x1b0($sp) .PB0f00e54c: @@ -2362,7 +2362,7 @@ glabel var7f1a926cpf /* f00e554: 196000e6 */ blez $t3,.PB0f00e8f0 /* f00e558: 000c68c0 */ sll $t5,$t4,0x3 /* f00e55c: 008d2021 */ addu $a0,$a0,$t5 -/* f00e560: 0fc1a2d3 */ jal 0xf068b4c +/* f00e560: 0fc1a2d3 */ jal modelFileDataFindBboxRodata /* f00e564: 8c84d53c */ lw $a0,-0x2ac4($a0) /* f00e568: c7b20174 */ lwc1 $f18,0x174($sp) /* f00e56c: 44800000 */ mtc1 $zero,$f0 @@ -2384,24 +2384,24 @@ glabel var7f1a926cpf /* f00e5ac: 27a40110 */ addiu $a0,$sp,0x110 /* f00e5b0: e7a40020 */ swc1 $f4,0x20($sp) /* f00e5b4: e7aa0024 */ swc1 $f10,0x24($sp) -/* f00e5b8: 0c005dea */ jal 0x177a8 +/* f00e5b8: 0c005dea */ jal mtx00016d58 /* f00e5bc: e7b2001c */ swc1 $f18,0x1c($sp) /* f00e5c0: 3c017f1b */ lui $at,0x7f1b /* f00e5c4: c42c9d10 */ lwc1 $f12,-0x62f0($at) -/* f00e5c8: 0c005b4e */ jal 0x16d38 +/* f00e5c8: 0c005b4e */ jal mtx4LoadXRotation /* f00e5cc: 27a500ac */ addiu $a1,$sp,0xac /* f00e5d0: 3c017f1b */ lui $at,0x7f1b /* f00e5d4: c42c9d14 */ lwc1 $f12,-0x62ec($at) -/* f00e5d8: 0c005b94 */ jal 0x16e50 +/* f00e5d8: 0c005b94 */ jal mtx4LoadZRotation /* f00e5dc: 27a50060 */ addiu $a1,$sp,0x60 /* f00e5e0: 27a40060 */ addiu $a0,$sp,0x60 -/* f00e5e4: 0c005913 */ jal 0x1644c +/* f00e5e4: 0c005913 */ jal mtx4MultMtx4InPlace /* f00e5e8: 27a500ac */ addiu $a1,$sp,0xac /* f00e5ec: 27a40110 */ addiu $a0,$sp,0x110 -/* f00e5f0: 0c005913 */ jal 0x1644c +/* f00e5f0: 0c005913 */ jal mtx4MultMtx4InPlace /* f00e5f4: 27a500ac */ addiu $a1,$sp,0xac /* f00e5f8: 86040006 */ lh $a0,0x6($s0) -/* f00e5fc: 0fc459f5 */ jal 0xf1167d4 +/* f00e5fc: 0fc459f5 */ jal padGetCentre /* f00e600: 27a500a0 */ addiu $a1,$sp,0xa0 /* f00e604: 8fa20044 */ lw $v0,0x44($sp) /* f00e608: c7a801a4 */ lwc1 $f8,0x1a4($sp) @@ -2447,13 +2447,13 @@ glabel var7f1a926cpf .PB0f00e6a0: /* f00e6a0: e7a2004c */ swc1 $f2,0x4c($sp) /* f00e6a4: e7ac0050 */ swc1 $f12,0x50($sp) -/* f00e6a8: 0c005a1d */ jal 0x16874 +/* f00e6a8: 0c005a1d */ jal mtx00015e24 /* f00e6ac: e7ae0048 */ swc1 $f14,0x48($sp) /* f00e6b0: c7ac004c */ lwc1 $f12,0x4c($sp) -/* f00e6b4: 0c005a34 */ jal 0x168d0 +/* f00e6b4: 0c005a34 */ jal mtx00015e80 /* f00e6b8: 27a500ac */ addiu $a1,$sp,0xac /* f00e6bc: c7ac0048 */ lwc1 $f12,0x48($sp) -/* f00e6c0: 0c005a4b */ jal 0x1692c +/* f00e6c0: 0c005a4b */ jal mtx00015edc /* f00e6c4: 27a500ac */ addiu $a1,$sp,0xac /* f00e6c8: c7a80168 */ lwc1 $f8,0x168($sp) /* f00e6cc: c7b0016c */ lwc1 $f16,0x16c($sp) @@ -2540,7 +2540,7 @@ glabel var7f1a926cpf /* f00e804: e608006c */ swc1 $f8,0x6c($s0) /* f00e808: 8e0c00bc */ lw $t4,0xbc($s0) /* f00e80c: 8fad01cc */ lw $t5,0x1cc($sp) -/* f00e810: 0fc24795 */ jal 0xf091e54 +/* f00e810: 0fc24795 */ jal setupGetPtrToCommandByIndex /* f00e814: 018d2021 */ addu $a0,$t4,$t5 /* f00e818: ae0200bc */ sw $v0,0xbc($s0) .PB0f00e81c: @@ -2551,7 +2551,7 @@ glabel var7f1a926cpf /* f00e82c: 02002025 */ move $a0,$s0 /* f00e830: 27a500fc */ addiu $a1,$sp,0xfc /* f00e834: 27a600ac */ addiu $a2,$sp,0xac -/* f00e838: 0fc234ef */ jal 0xf08d3bc +/* f00e838: 0fc234ef */ jal doorInit /* f00e83c: 27a700ec */ addiu $a3,$sp,0xec /* f00e840: afa2010c */ sw $v0,0x10c($sp) /* f00e844: 8e180008 */ lw $t8,0x8($s0) @@ -2569,7 +2569,7 @@ glabel var7f1a926cpf /* f00e874: 00000000 */ nop /* f00e878: 45020004 */ bc1fl .PB0f00e88c /* f00e87c: 8e040018 */ lw $a0,0x18($s0) -/* f00e880: 0fc234e4 */ jal 0xf08d390 +/* f00e880: 0fc234e4 */ jal doorDeactivatePortal /* f00e884: 02002025 */ move $a0,$s0 /* f00e888: 8e040018 */ lw $a0,0x18($s0) .PB0f00e88c: @@ -2592,12 +2592,12 @@ glabel var7f1a926cpf .PB0f00e8c8: /* f00e8c8: 46002282 */ mul.s $f10,$f4,$f0 /* f00e8cc: 44055000 */ mfc1 $a1,$f10 -/* f00e8d0: 0c006e6a */ jal 0x1b9a8 +/* f00e8d0: 0c006e6a */ jal modelSetScale /* f00e8d4: 00000000 */ nop .PB0f00e8d8: -/* f00e8d8: 0fc1819b */ jal 0xf06066c +/* f00e8d8: 0fc1819b */ jal propActivate /* f00e8dc: 8fa4010c */ lw $a0,0x10c($sp) -/* f00e8e0: 0fc18128 */ jal 0xf0604a0 +/* f00e8e0: 0fc18128 */ jal propEnable /* f00e8e4: 8fa4010c */ lw $a0,0x10c($sp) /* f00e8e8: 10000003 */ b .PB0f00e8f8 /* f00e8ec: 8fbf0034 */ lw $ra,0x34($sp) diff --git a/src/game/game_01d860.c b/src/game/game_01d860.c index 2310e4a24..833c2e089 100644 --- a/src/game/game_01d860.c +++ b/src/game/game_01d860.c @@ -68,14 +68,14 @@ glabel func0f01d860 /* f01d8d8: 3c047f1b */ lui $a0,0x7f1b /* f01d8dc: 3c058006 */ lui $a1,0x8006 /* f01d8e0: 24a54020 */ addiu $a1,$a1,0x4020 -/* f01d8e4: 0c003648 */ jal 0xd920 +/* f01d8e4: 0c003648 */ jal mainOverrideVariable /* f01d8e8: 2484a330 */ addiu $a0,$a0,-23760 /* f01d8ec: 3c048006 */ lui $a0,0x8006 /* f01d8f0: 8c844020 */ lw $a0,0x4020($a0) /* f01d8f4: 2c810005 */ sltiu $at,$a0,0x5 /* f01d8f8: 10200006 */ beqz $at,.PB0f01d914 /* f01d8fc: 00000000 */ nop -/* f01d900: 0fc5c097 */ jal 0xf17025c +/* f01d900: 0fc5c097 */ jal func0f16f75c /* f01d904: 00000000 */ nop /* f01d908: 240e0063 */ li $t6,0x63 /* f01d90c: 3c018006 */ lui $at,0x8006 diff --git a/src/game/game_092610.c b/src/game/game_092610.c index 799a0f4e9..35d4fa599 100644 --- a/src/game/game_092610.c +++ b/src/game/game_092610.c @@ -1097,7 +1097,7 @@ glabel var7f1ab740 /* f092aa0: 8e040000 */ lw $a0,0x0($s0) /* f092aa4: 50800006 */ beqzl $a0,.PB0f092ac0 /* f092aa8: 96030030 */ lhu $v1,0x30($s0) -/* f092aac: 0c00cf6c */ jal 0x33db0 +/* f092aac: 0c00cf6c */ jal sndGetState /* f092ab0: 00000000 */ nop /* f092ab4: 54400010 */ bnezl $v0,.PB0f092af8 /* f092ab8: 8e020050 */ lw $v0,0x50($s0) @@ -1112,7 +1112,7 @@ glabel var7f1ab740 /* f092ad8: 306e0010 */ andi $t6,$v1,0x10 /* f092adc: 51c001e2 */ beqzl $t6,.PB0f093268 /* f092ae0: 860e0028 */ lh $t6,0x28($s0) -/* f092ae4: 0c003a80 */ jal 0xea00 +/* f092ae4: 0c003a80 */ jal sndIsPlayingMp3 /* f092ae8: 00000000 */ nop /* f092aec: 504001de */ beqzl $v0,.PB0f093268 /* f092af0: 860e0028 */ lh $t6,0x28($s0) @@ -1182,7 +1182,7 @@ glabel var7f1ab740 /* f092bd0: afa8004c */ sw $t0,0x4c($sp) /* f092bd4: afa40050 */ sw $a0,0x50($sp) /* f092bd8: afb9001c */ sw $t9,0x1c($sp) -/* f092bdc: 0fc25145 */ jal 0xf094514 +/* f092bdc: 0fc25145 */ jal func0f0946b0 /* f092be0: afb80018 */ sw $t8,0x18($sp) /* f092be4: 8fa40050 */ lw $a0,0x50($sp) /* f092be8: 8fa8004c */ lw $t0,0x4c($sp) @@ -1202,7 +1202,7 @@ glabel var7f1ab740 /* f092c1c: afab0014 */ sw $t3,0x14($sp) /* f092c20: afa8004c */ sw $t0,0x4c($sp) /* f092c24: afb00018 */ sw $s0,0x18($sp) -/* f092c28: 0fc252f7 */ jal 0xf094bdc +/* f092c28: 0fc252f7 */ jal propsnd0f094d78 /* f092c2c: e7a40010 */ swc1 $f4,0x10($sp) /* f092c30: 8fa8004c */ lw $t0,0x4c($sp) /* f092c34: 3c09800a */ lui $t1,0x800a @@ -1368,7 +1368,7 @@ glabel var7f1ab740 /* f092e74: afa50048 */ sw $a1,0x48($sp) .PB0f092e78: /* f092e78: afa80040 */ sw $t0,0x40($sp) -/* f092e7c: 0fc5b9b8 */ jal 0xf16e6e0 +/* f092e7c: 0fc5b9b8 */ jal lvIsPaused /* f092e80: e7b2003c */ swc1 $f18,0x3c($sp) /* f092e84: 3c09800a */ lui $t1,0x800a /* f092e88: 2529e4d0 */ addiu $t1,$t1,-6960 @@ -1376,7 +1376,7 @@ glabel var7f1ab740 /* f092e90: 14400031 */ bnez $v0,.PB0f092f58 /* f092e94: c7b2003c */ lwc1 $f18,0x3c($sp) /* f092e98: afa80040 */ sw $t0,0x40($sp) -/* f092e9c: 0fc62c79 */ jal 0xf18b1e4 +/* f092e9c: 0fc62c79 */ jal mpIsPaused /* f092ea0: e7b2003c */ swc1 $f18,0x3c($sp) /* f092ea4: 3c09800a */ lui $t1,0x800a /* f092ea8: 2529e4d0 */ addiu $t1,$t1,-6960 @@ -1389,7 +1389,7 @@ glabel var7f1ab740 /* f092ec4: 240bffff */ li $t3,-1 .PB0f092ec8: /* f092ec8: afa80040 */ sw $t0,0x40($sp) -/* f092ecc: 0fc62c79 */ jal 0xf18b1e4 +/* f092ecc: 0fc62c79 */ jal mpIsPaused /* f092ed0: e7b2003c */ swc1 $f18,0x3c($sp) /* f092ed4: 3c09800a */ lui $t1,0x800a /* f092ed8: 2529e4d0 */ addiu $t1,$t1,-6960 @@ -1554,14 +1554,14 @@ glabel var7f1ab740 /* f0930fc: 5080000e */ beqzl $a0,.PB0f093138 /* f093100: 960a0030 */ lhu $t2,0x30($s0) /* f093104: afa80040 */ sw $t0,0x40($sp) -/* f093108: 0c00cf6c */ jal 0x33db0 +/* f093108: 0c00cf6c */ jal sndGetState /* f09310c: e7b2003c */ swc1 $f18,0x3c($sp) /* f093110: 8fa80040 */ lw $t0,0x40($sp) /* f093114: 10400007 */ beqz $v0,.PB0f093134 /* f093118: c7b2003c */ lwc1 $f18,0x3c($sp) /* f09311c: 8e040000 */ lw $a0,0x0($s0) /* f093120: e7b2003c */ swc1 $f18,0x3c($sp) -/* f093124: 0c00d039 */ jal 0x340e4 +/* f093124: 0c00d039 */ jal audioStop /* f093128: afa80040 */ sw $t0,0x40($sp) /* f09312c: 8fa80040 */ lw $t0,0x40($sp) /* f093130: c7b2003c */ lwc1 $f18,0x3c($sp) @@ -1594,7 +1594,7 @@ glabel var7f1ab740 /* f093188: 10000001 */ b .PB0f093190 /* f09318c: 24070001 */ li $a3,0x1 .PB0f093190: -/* f093190: 0c0042cc */ jal 0x10b30 +/* f093190: 0c0042cc */ jal sndStartMp3 /* f093194: 86040026 */ lh $a0,0x26($s0) /* f093198: 10000021 */ b .PB0f093220 /* f09319c: 96030030 */ lhu $v1,0x30($s0) @@ -1613,7 +1613,7 @@ glabel var7f1ab740 /* f0931cc: 920d001a */ lbu $t5,0x1a($s0) /* f0931d0: afac0020 */ sw $t4,0x20($sp) /* f0931d4: afa8001c */ sw $t0,0x1c($sp) -/* f0931d8: 0c0041d9 */ jal 0x10764 +/* f0931d8: 0c0041d9 */ jal snd00010718 /* f0931dc: afad0018 */ sw $t5,0x18($sp) /* f0931e0: 1000000f */ b .PB0f093220 /* f0931e4: 96030030 */ lhu $v1,0x30($s0) @@ -1629,7 +1629,7 @@ glabel var7f1ab740 /* f093208: afa8001c */ sw $t0,0x1c($sp) /* f09320c: 01c03025 */ move $a2,$t6 /* f093210: 8fa70044 */ lw $a3,0x44($sp) -/* f093214: 0c0041d9 */ jal 0x10764 +/* f093214: 0c0041d9 */ jal snd00010718 /* f093218: afb80018 */ sw $t8,0x18($sp) /* f09321c: 96030030 */ lhu $v1,0x30($s0) .PB0f093220: @@ -1647,7 +1647,7 @@ glabel var7f1ab740 /* f093248: 30650010 */ andi $a1,$v1,0x10 /* f09324c: 8fa60048 */ lw $a2,0x48($sp) /* f093250: 8fa70044 */ lw $a3,0x44($sp) -/* f093254: 0c00413b */ jal 0x104ec +/* f093254: 0c00413b */ jal sndAdjust /* f093258: afad0018 */ sw $t5,0x18($sp) /* f09325c: 10000026 */ b .PB0f0932f8 /* f093260: 00000000 */ nop @@ -1660,7 +1660,7 @@ glabel var7f1ab740 /* f093278: 306f0010 */ andi $t7,$v1,0x10 /* f09327c: 51e00015 */ beqzl $t7,.PB0f0932d4 /* f093280: 8e0b0000 */ lw $t3,0x0($s0) -/* f093284: 0c003a80 */ jal 0xea00 +/* f093284: 0c003a80 */ jal sndIsPlayingMp3 /* f093288: 00000000 */ nop /* f09328c: 5440000e */ bnezl $v0,.PB0f0932c8 /* f093290: 240a0001 */ li $t2,0x1 @@ -1668,14 +1668,14 @@ glabel var7f1ab740 /* f093298: 30780008 */ andi $t8,$v1,0x8 /* f09329c: 53000005 */ beqzl $t8,.PB0f0932b4 /* f0932a0: 30790200 */ andi $t9,$v1,0x200 -/* f0932a4: 0fc16b4d */ jal 0xf05ad34 +/* f0932a4: 0fc16b4d */ jal func0f05abdc /* f0932a8: 8e040050 */ lw $a0,0x50($s0) /* f0932ac: 96030030 */ lhu $v1,0x30($s0) /* f0932b0: 30790200 */ andi $t9,$v1,0x200 .PB0f0932b4: /* f0932b4: 53200004 */ beqzl $t9,.PB0f0932c8 /* f0932b8: 240a0001 */ li $t2,0x1 -/* f0932bc: 0fc37875 */ jal 0xf0de1d4 +/* f0932bc: 0fc37875 */ jal hudmsgsHideByChannel /* f0932c0: 8fa40058 */ lw $a0,0x58($sp) /* f0932c4: 240a0001 */ li $t2,0x1 .PB0f0932c8: @@ -1688,7 +1688,7 @@ glabel var7f1ab740 /* f0932dc: 00000000 */ nop /* f0932e0: 51a00004 */ beqzl $t5,.PB0f0932f4 /* f0932e4: 240c0001 */ li $t4,0x1 -/* f0932e8: 0fc16b4d */ jal 0xf05ad34 +/* f0932e8: 0fc16b4d */ jal func0f05abdc /* f0932ec: 8e040050 */ lw $a0,0x50($s0) /* f0932f0: 240c0001 */ li $t4,0x1 .PB0f0932f4: @@ -1702,7 +1702,7 @@ glabel var7f1ab740 /* f09330c: 31f80004 */ andi $t8,$t7,0x4 /* f093310: 53000004 */ beqzl $t8,.PB0f093324 /* f093314: 96190030 */ lhu $t9,0x30($s0) -/* f093318: 0fc24a68 */ jal 0xf0929a0 +/* f093318: 0fc24a68 */ jal propsndPrintChannel /* f09331c: 02002025 */ move $a0,$s0 /* f093320: 96190030 */ lhu $t9,0x30($s0) .PB0f093324: diff --git a/src/game/game_10c9c0.c b/src/game/game_10c9c0.c index 4a2334232..f2bea8d38 100644 --- a/src/game/game_10c9c0.c +++ b/src/game/game_10c9c0.c @@ -153,7 +153,7 @@ glabel func0f10cb2c /* f10d258: 3c048007 */ lui $a0,0x8007 /* f10d25c: ae190490 */ sw $t9,0x490($s0) /* f10d260: 24847068 */ addiu $a0,$a0,0x7068 -/* f10d264: 0fc3e223 */ jal 0xf0f888c +/* f10d264: 0fc3e223 */ jal menuPushRootDialog /* f10d268: 2405000b */ li $a1,0xb /* f10d26c: 1000001e */ b .PB0f10d2e8 /* f10d270: 8fbf001c */ lw $ra,0x1c($sp) @@ -164,7 +164,7 @@ glabel func0f10cb2c /* f10d280: 24110006 */ li $s1,0x6 /* f10d284: 02002025 */ move $a0,$s0 .PB0f10d288: -/* f10d288: 0fc626a7 */ jal 0xf189a9c +/* f10d288: 0fc626a7 */ jal mpPlayerSetDefaults /* f10d28c: 24050001 */ li $a1,0x1 /* f10d290: 26100001 */ addiu $s0,$s0,0x1 /* f10d294: 5611fffc */ bnel $s0,$s1,.PB0f10d288 @@ -174,18 +174,18 @@ glabel func0f10cb2c /* f10d2a4: 2402ffff */ li $v0,-1 /* f10d2a8: ae000294 */ sw $zero,0x294($s0) /* f10d2ac: ae020298 */ sw $v0,0x298($s0) -/* f10d2b0: 0fc67317 */ jal 0xf19cc5c +/* f10d2b0: 0fc67317 */ jal mpDetermineUnlockedFeatures /* f10d2b4: ae02029c */ sw $v0,0x29c($s0) /* f10d2b8: 3c048007 */ lui $a0,0x8007 /* f10d2bc: 24846cf4 */ addiu $a0,$a0,0x6cf4 -/* f10d2c0: 0fc3e223 */ jal 0xf0f888c +/* f10d2c0: 0fc3e223 */ jal menuPushRootDialog /* f10d2c4: 2405000a */ li $a1,0xa /* f10d2c8: 96090482 */ lhu $t1,0x482($s0) /* f10d2cc: 3c048007 */ lui $a0,0x8007 /* f10d2d0: 29210006 */ slti $at,$t1,0x6 /* f10d2d4: 54200004 */ bnezl $at,.PB0f10d2e8 /* f10d2d8: 8fbf001c */ lw $ra,0x1c($sp) -/* f10d2dc: 0fc3cd2e */ jal 0xf0f34b8 +/* f10d2dc: 0fc3cd2e */ jal menuPushDialog /* f10d2e0: 24846120 */ addiu $a0,$a0,0x6120 .PB0f10d2e4: /* f10d2e4: 8fbf001c */ lw $ra,0x1c($sp) diff --git a/src/game/game_11f000.c b/src/game/game_11f000.c index 1df552057..f72b51d89 100644 --- a/src/game/game_11f000.c +++ b/src/game/game_11f000.c @@ -7888,11 +7888,11 @@ glabel var7f1b5108 /* f126fb8: f7b60040 */ sdc1 $f22,0x40($sp) /* f126fbc: f7b40038 */ sdc1 $f20,0x38($sp) /* f126fc0: afa40170 */ sw $a0,0x170($sp) -/* f126fc4: 0fc2d6c2 */ jal 0xf0b5b08 +/* f126fc4: 0fc2d6c2 */ jal currentPlayerGetMatrix1740 /* f126fc8: afa50174 */ sw $a1,0x174($sp) -/* f126fcc: 0fc2d6ca */ jal 0xf0b5b28 +/* f126fcc: 0fc2d6ca */ jal currentPlayerGetUnk1754 /* f126fd0: afa2016c */ sw $v0,0x16c($sp) -/* f126fd4: 0fc59b8f */ jal 0xf166e3c +/* f126fd4: 0fc59b8f */ jal envGetCurrent /* f126fd8: afa20168 */ sw $v0,0x168($sp) /* f126fdc: afa20144 */ sw $v0,0x144($sp) /* f126fe0: 904e000b */ lbu $t6,0xb($v0) @@ -7910,13 +7910,13 @@ glabel var7f1b5108 /* f12700c: 10000208 */ b .PB0f127830 /* f127010: 8fa20170 */ lw $v0,0x170($sp) .PB0f127014: -/* f127014: 0c002e8b */ jal 0xba2c +/* f127014: 0c002e8b */ jal viGetViewLeft /* f127018: 00000000 */ nop -/* f12701c: 0c002e8f */ jal 0xba3c +/* f12701c: 0c002e8f */ jal viGetViewTop /* f127020: a7a20166 */ sh $v0,0x166($sp) -/* f127024: 0c002e6d */ jal 0xb9b4 +/* f127024: 0c002e6d */ jal viGetViewWidth /* f127028: a7a20164 */ sh $v0,0x164($sp) -/* f12702c: 0c002e71 */ jal 0xb9c4 +/* f12702c: 0c002e71 */ jal viGetViewHeight /* f127030: a7a20162 */ sh $v0,0x162($sp) /* f127034: 87b90162 */ lh $t9,0x162($sp) /* f127038: 44824000 */ mtc1 $v0,$f8 @@ -7954,10 +7954,10 @@ glabel var7f1b5108 /* f1270b4: 92cb0003 */ lbu $t3,0x3($s6) /* f1270b8: 158001d2 */ bnez $t4,.PB0f127804 /* f1270bc: a3ab014a */ sb $t3,0x14a($sp) -/* f1270c0: 0c00596d */ jal 0x165b4 +/* f1270c0: 0c00596d */ jal mtx4TransformVecInPlace /* f1270c4: 02802825 */ move $a1,$s4 /* f1270c8: 8fa40168 */ lw $a0,0x168($sp) -/* f1270cc: 0c00596d */ jal 0x165b4 +/* f1270cc: 0c00596d */ jal mtx4TransformVecInPlace /* f1270d0: 02802825 */ move $a1,$s4 /* f1270d4: c6800008 */ lwc1 $f0,0x8($s4) /* f1270d8: 4600d03c */ c.lt.s $f26,$f0 @@ -8003,7 +8003,7 @@ glabel var7f1b5108 /* f127178: 00000000 */ nop /* f12717c: 460a4402 */ mul.s $f16,$f8,$f10 /* f127180: 46168480 */ add.s $f18,$f16,$f22 -/* f127184: 0c002ee8 */ jal 0xbba0 +/* f127184: 0c002ee8 */ jal viGetFovY /* f127188: e6520000 */ swc1 $f18,0x0($s2) /* f12718c: 3c014270 */ lui $at,0x4270 /* f127190: 44812000 */ mtc1 $at,$f4 @@ -8072,7 +8072,7 @@ glabel var7f1b5108 /* f12728c: 0059b821 */ addu $s7,$v0,$t9 /* f127290: 26e8fff0 */ addiu $t0,$s7,-16 /* f127294: afa800a0 */ sw $t0,0xa0($sp) -/* f127298: 0c00090f */ jal 0x243c +/* f127298: 0c00090f */ jal bbufGetIndex0Buffer /* f12729c: 2455000f */ addiu $s5,$v0,0xf /* f1272a0: c62c0000 */ lwc1 $f12,0x0($s1) /* f1272a4: 3c01447a */ lui $at,0x447a @@ -8158,7 +8158,7 @@ glabel var7f1b5108 /* f1273c0: 2465fff9 */ addiu $a1,$v1,-7 /* f1273c4: 24460001 */ addiu $a2,$v0,0x1 /* f1273c8: 03278021 */ addu $s0,$t9,$a3 -/* f1273cc: 0fc49b96 */ jal 0xf126e58 +/* f1273cc: 0fc49b96 */ jal func0f125948 /* f1273d0: 02002025 */ move $a0,$s0 /* f1273d4: c6280000 */ lwc1 $f8,0x0($s1) /* f1273d8: c64a0000 */ lwc1 $f10,0x0($s2) @@ -8168,7 +8168,7 @@ glabel var7f1b5108 /* f1273e8: 44053000 */ mfc1 $a1,$f6 /* f1273ec: 44068000 */ mfc1 $a2,$f16 /* f1273f0: 24a5fffb */ addiu $a1,$a1,-5 -/* f1273f4: 0fc49b96 */ jal 0xf126e58 +/* f1273f4: 0fc49b96 */ jal func0f125948 /* f1273f8: 24c6fffd */ addiu $a2,$a2,-3 /* f1273fc: c6320000 */ lwc1 $f18,0x0($s1) /* f127400: c6480000 */ lwc1 $f8,0x0($s2) @@ -8178,7 +8178,7 @@ glabel var7f1b5108 /* f127410: 44052000 */ mfc1 $a1,$f4 /* f127414: 44063000 */ mfc1 $a2,$f6 /* f127418: 24a5fffd */ addiu $a1,$a1,-3 -/* f12741c: 0fc49b96 */ jal 0xf126e58 +/* f12741c: 0fc49b96 */ jal func0f125948 /* f127420: 24c60005 */ addiu $a2,$a2,0x5 /* f127424: c62a0000 */ lwc1 $f10,0x0($s1) /* f127428: c6520000 */ lwc1 $f18,0x0($s2) @@ -8188,7 +8188,7 @@ glabel var7f1b5108 /* f127438: 44058000 */ mfc1 $a1,$f16 /* f12743c: 44062000 */ mfc1 $a2,$f4 /* f127440: 24a5ffff */ addiu $a1,$a1,-1 -/* f127444: 0fc49b96 */ jal 0xf126e58 +/* f127444: 0fc49b96 */ jal func0f125948 /* f127448: 24c6fff9 */ addiu $a2,$a2,-7 /* f12744c: c6280000 */ lwc1 $f8,0x0($s1) /* f127450: c64a0000 */ lwc1 $f10,0x0($s2) @@ -8198,7 +8198,7 @@ glabel var7f1b5108 /* f127460: 44053000 */ mfc1 $a1,$f6 /* f127464: 44068000 */ mfc1 $a2,$f16 /* f127468: 24a50001 */ addiu $a1,$a1,0x1 -/* f12746c: 0fc49b96 */ jal 0xf126e58 +/* f12746c: 0fc49b96 */ jal func0f125948 /* f127470: 24c60007 */ addiu $a2,$a2,0x7 /* f127474: c6320000 */ lwc1 $f18,0x0($s1) /* f127478: c6480000 */ lwc1 $f8,0x0($s2) @@ -8208,7 +8208,7 @@ glabel var7f1b5108 /* f127488: 44052000 */ mfc1 $a1,$f4 /* f12748c: 44063000 */ mfc1 $a2,$f6 /* f127490: 24a50003 */ addiu $a1,$a1,0x3 -/* f127494: 0fc49b96 */ jal 0xf126e58 +/* f127494: 0fc49b96 */ jal func0f125948 /* f127498: 24c6fffb */ addiu $a2,$a2,-5 /* f12749c: c62a0000 */ lwc1 $f10,0x0($s1) /* f1274a0: c6520000 */ lwc1 $f18,0x0($s2) @@ -8218,7 +8218,7 @@ glabel var7f1b5108 /* f1274b0: 44058000 */ mfc1 $a1,$f16 /* f1274b4: 44062000 */ mfc1 $a2,$f4 /* f1274b8: 24a50005 */ addiu $a1,$a1,0x5 -/* f1274bc: 0fc49b96 */ jal 0xf126e58 +/* f1274bc: 0fc49b96 */ jal func0f125948 /* f1274c0: 24c60003 */ addiu $a2,$a2,0x3 /* f1274c4: c6280000 */ lwc1 $f8,0x0($s1) /* f1274c8: c64a0000 */ lwc1 $f10,0x0($s2) @@ -8228,7 +8228,7 @@ glabel var7f1b5108 /* f1274d8: 44053000 */ mfc1 $a1,$f6 /* f1274dc: 44068000 */ mfc1 $a2,$f16 /* f1274e0: 24a50007 */ addiu $a1,$a1,0x7 -/* f1274e4: 0fc49b96 */ jal 0xf126e58 +/* f1274e4: 0fc49b96 */ jal func0f125948 /* f1274e8: 24c6ffff */ addiu $a2,$a2,-1 .PB0f1274ec: /* f1274ec: 8fa20094 */ lw $v0,0x94($sp) @@ -8248,7 +8248,7 @@ glabel var7f1b5108 /* f127520: 24060004 */ li $a2,0x4 /* f127524: 00003825 */ move $a3,$zero /* f127528: afa00018 */ sw $zero,0x18($sp) -/* f12752c: 0fc2cf74 */ jal 0xf0b3dd0 +/* f12752c: 0fc2cf74 */ jal func0f0b39c0 /* f127530: 24a5003c */ addiu $a1,$a1,0x3c /* f127534: 8fb90170 */ lw $t9,0x170($sp) /* f127538: 3c09ba00 */ lui $t1,0xba00 @@ -8377,7 +8377,7 @@ glabel var7f1b5108 /* f127724: afae001c */ sw $t6,0x1c($sp) /* f127728: afad0018 */ sw $t5,0x18($sp) /* f12772c: afa00014 */ sw $zero,0x14($sp) -/* f127730: 0fc2c958 */ jal 0xf0b2560 +/* f127730: 0fc2c958 */ jal func0f0b2150 /* f127734: afab0010 */ sw $t3,0x10($sp) /* f127738: 8fb90170 */ lw $t9,0x170($sp) /* f12773c: 3c18e700 */ lui $t8,0xe700 @@ -8408,10 +8408,10 @@ glabel var7f1b5108 /* f1277a0: afb80170 */ sw $t8,0x170($sp) /* f1277a4: 3c080001 */ lui $t0,0x1 /* f1277a8: ad280004 */ sw $t0,0x4($t1) -/* f1277ac: 0c00091c */ jal 0x2470 +/* f1277ac: 0c00091c */ jal bbufGetIndex1Buffer /* f1277b0: ad2a0000 */ sw $t2,0x0($t1) /* f1277b4: 8fab0098 */ lw $t3,0x98($sp) -/* f1277b8: 0fc49bcb */ jal 0xf126f2c +/* f1277b8: 0fc49bcb */ jal func0f125a1c /* f1277bc: 004b2021 */ addu $a0,$v0,$t3 /* f1277c0: e7a00124 */ swc1 $f0,0x124($sp) /* f1277c4: 8fad0120 */ lw $t5,0x120($sp) @@ -9736,7 +9736,7 @@ glabel var7f1b511c /* f127970: 4485d000 */ mtc1 $a1,$f26 /* f127974: 4486e000 */ mtc1 $a2,$f28 /* f127978: af280014 */ sw $t0,0x14($t9) -/* f12797c: 0c002e6d */ jal 0xb9b4 +/* f12797c: 0c002e6d */ jal viGetViewWidth /* f127980: af210010 */ sw $at,0x10($t9) /* f127984: 44822000 */ mtc1 $v0,$f4 /* f127988: 3c017f1b */ lui $at,0x7f1b @@ -9748,7 +9748,7 @@ glabel var7f1b511c /* f1279a0: 461e3202 */ mul.s $f8,$f6,$f30 /* f1279a4: 4608d281 */ sub.s $f10,$f26,$f8 /* f1279a8: 46145102 */ mul.s $f4,$f10,$f20 -/* f1279ac: 0c002e71 */ jal 0xb9c4 +/* f1279ac: 0c002e71 */ jal viGetViewHeight /* f1279b0: e7a40130 */ swc1 $f4,0x130($sp) /* f1279b4: 44823000 */ mtc1 $v0,$f6 /* f1279b8: 3c16800b */ lui $s6,0x800b @@ -9768,7 +9768,7 @@ glabel var7f1b511c /* f1279f0: 24a50048 */ addiu $a1,$a1,0x48 /* f1279f4: 460ae101 */ sub.s $f4,$f28,$f10 /* f1279f8: 46142182 */ mul.s $f6,$f4,$f20 -/* f1279fc: 0fc2cf74 */ jal 0xf0b3dd0 +/* f1279fc: 0fc2cf74 */ jal func0f0b39c0 /* f127a00: e7a6012c */ swc1 $f6,0x12c($sp) /* f127a04: 8fa90198 */ lw $t1,0x198($sp) /* f127a08: 3c10ba00 */ lui $s0,0xba00 @@ -9853,7 +9853,7 @@ glabel var7f1b511c /* f127b44: 354a9bff */ ori $t2,$t2,0x9bff /* f127b48: 35adff7f */ ori $t5,$t5,0xff7f /* f127b4c: ad6d0004 */ sw $t5,0x4($t3) -/* f127b50: 0c002ee8 */ jal 0xbba0 +/* f127b50: 0c002ee8 */ jal viGetFovY /* f127b54: ad6a0000 */ sw $t2,0x0($t3) /* f127b58: 8faf0198 */ lw $t7,0x198($sp) /* f127b5c: 3c17fb00 */ lui $s7,0xfb00 @@ -9914,7 +9914,7 @@ glabel var7f1b511c /* f127c38: afae001c */ sw $t6,0x1c($sp) /* f127c3c: afaf0018 */ sw $t7,0x18($sp) /* f127c40: afa00014 */ sw $zero,0x14($sp) -/* f127c44: 0fc2c958 */ jal 0xf0b2560 +/* f127c44: 0fc2c958 */ jal func0f0b2150 /* f127c48: afad0010 */ sw $t5,0x10($sp) /* f127c4c: 8ec50000 */ lw $a1,0x0($s6) /* f127c50: 24080002 */ li $t0,0x2 @@ -9925,7 +9925,7 @@ glabel var7f1b511c /* f127c64: 24060004 */ li $a2,0x4 /* f127c68: 00003825 */ move $a3,$zero /* f127c6c: afa00018 */ sw $zero,0x18($sp) -/* f127c70: 0fc2cf74 */ jal 0xf0b3dd0 +/* f127c70: 0fc2cf74 */ jal func0f0b39c0 /* f127c74: 24a5000c */ addiu $a1,$a1,0xc /* f127c78: 8fab0198 */ lw $t3,0x198($sp) /* f127c7c: 3c0fba00 */ lui $t7,0xba00 @@ -10119,13 +10119,13 @@ glabel var7f1b511c /* f127f50: afa0001c */ sw $zero,0x1c($sp) /* f127f54: afa00018 */ sw $zero,0x18($sp) /* f127f58: afa00014 */ sw $zero,0x14($sp) -/* f127f5c: 0fc2c958 */ jal 0xf0b2560 +/* f127f5c: 0fc2c958 */ jal func0f0b2150 /* f127f60: afa80010 */ sw $t0,0x10($sp) /* f127f64: 26100004 */ addiu $s0,$s0,0x4 /* f127f68: 26310004 */ addiu $s1,$s1,0x4 /* f127f6c: 1614ff9d */ bne $s0,$s4,.PB0f127de4 /* f127f70: 26520004 */ addiu $s2,$s2,0x4 -/* f127f74: 0c002e6d */ jal 0xb9b4 +/* f127f74: 0c002e6d */ jal viGetViewWidth /* f127f78: 00000000 */ nop /* f127f7c: 44822000 */ mtc1 $v0,$f4 /* f127f80: 3c013f00 */ lui $at,0x3f00 @@ -10133,7 +10133,7 @@ glabel var7f1b511c /* f127f88: 46802220 */ cvt.s.w $f8,$f4 /* f127f8c: c7aa019c */ lwc1 $f10,0x19c($sp) /* f127f90: 46184182 */ mul.s $f6,$f8,$f24 -/* f127f94: 0c002e71 */ jal 0xb9c4 +/* f127f94: 0c002e71 */ jal viGetViewHeight /* f127f98: 460a3501 */ sub.s $f20,$f6,$f10 /* f127f9c: 44822000 */ mtc1 $v0,$f4 /* f127fa0: c7aa01a0 */ lwc1 $f10,0x1a0($sp) @@ -10143,7 +10143,7 @@ glabel var7f1b511c /* f127fb0: 4614a102 */ mul.s $f4,$f20,$f20 /* f127fb4: 00000000 */ nop /* f127fb8: 46000202 */ mul.s $f8,$f0,$f0 -/* f127fbc: 0c012ae4 */ jal 0x4ab90 +/* f127fbc: 0c012ae4 */ jal sqrtf /* f127fc0: 46082300 */ add.s $f12,$f4,$f8 /* f127fc4: 3c014220 */ lui $at,0x4220 /* f127fc8: 44813000 */ mtc1 $at,$f6 @@ -10180,7 +10180,7 @@ glabel var7f1b511c /* f12803c: 44043000 */ mfc1 $a0,$f6 /* f128040: 00000000 */ nop /* f128044: 00802825 */ move $a1,$a0 -/* f128048: 0fc4a205 */ jal 0xf128814 +/* f128048: 0fc4a205 */ jal func0f127334 /* f12804c: 00803025 */ move $a2,$a0 /* f128050: 8fad0198 */ lw $t5,0x198($sp) .PB0f128054: diff --git a/src/game/game_1531a0.c b/src/game/game_1531a0.c index b9eb7a717..839485635 100644 --- a/src/game/game_1531a0.c +++ b/src/game/game_1531a0.c @@ -2633,6 +2633,12 @@ glabel var7f1b88a8pf .PB0f156424: /* f156424: 03e00008 */ jr $ra /* f156428: 00000000 */ nop +); +#endif + +#if VERSION >= VERSION_PAL_BETA +GLOBAL_ASM( +glabel func0f15642cpb /* f15642c: 3c0e8008 */ lui $t6,0x8008 /* f156430: 8dce65f0 */ lw $t6,0x65f0($t6) /* f156434: 27bdffd8 */ addiu $sp,$sp,-40 @@ -2800,7 +2806,7 @@ glabel var7f1b88a8pf /* f1566ac: a3a20026 */ sb $v0,0x26($sp) .PB0f1566b0: /* f1566b0: afa60030 */ sw $a2,0x30($sp) -/* f1566b4: 0fc558d3 */ jal 0xf15634c +/* f1566b4: 0fc558d3 */ jal func0f155d2cpf /* f1566b8: afa70034 */ sw $a3,0x34($sp) /* f1566bc: 93a20026 */ lbu $v0,0x26($sp) /* f1566c0: 8fa60030 */ lw $a2,0x30($sp) @@ -2847,7 +2853,7 @@ glabel var7f1b88a8pf /* f156750: 2548fe74 */ addiu $t0,$t2,-396 /* f156754: 18800004 */ blez $a0,.PB0f156768 /* f156758: acc80000 */ sw $t0,0x0($a2) -/* f15675c: 0fc558d3 */ jal 0xf15634c +/* f15675c: 0fc558d3 */ jal func0f155d2cpf /* f156760: 27a40027 */ addiu $a0,$sp,0x27 /* f156764: 8fa30038 */ lw $v1,0x38($sp) .PB0f156768: @@ -3379,7 +3385,7 @@ glabel func0f1552d4 /* f156bc0: 8fa600e4 */ lw $a2,0xe4($sp) /* f156bc4: afa00014 */ sw $zero,0x14($sp) /* f156bc8: afa200bc */ sw $v0,0xbc($sp) -/* f156bcc: 0fc5625a */ jal 0xf158968 +/* f156bcc: 0fc5625a */ jal textMeasure /* f156bd0: afa80010 */ sw $t0,0x10($sp) /* f156bd4: 8fa900c4 */ lw $t1,0xc4($sp) /* f156bd8: 3c013f80 */ lui $at,0x3f80 @@ -3427,7 +3433,7 @@ glabel func0f1552d4 /* f156c80: ac6d0000 */ sw $t5,0x0($v1) /* f156c84: ae4f0000 */ sw $t7,0x0($s2) /* f156c88: 46124282 */ mul.s $f10,$f8,$f18 -/* f156c8c: 0c012de0 */ jal 0x4b780 +/* f156c8c: 0c012de0 */ jal osVirtualToPhysical /* f156c90: 460a8581 */ sub.s $f22,$f16,$f10 /* f156c94: 02001825 */ move $v1,$s0 /* f156c98: ae420004 */ sw $v0,0x4($s2) @@ -3523,7 +3529,7 @@ glabel func0f1552d4 /* f156de8: afae0010 */ sw $t6,0x10($sp) /* f156dec: 03c02825 */ move $a1,$s8 /* f156df0: 27a60080 */ addiu $a2,$sp,0x80 -/* f156df4: 0fc5590b */ jal 0xf15642c +/* f156df4: 0fc5590b */ jal func0f15642cpb /* f156df8: 8fa700e8 */ lw $a3,0xe8($sp) /* f156dfc: 8faf00ec */ lw $t7,0xec($sp) /* f156e00: 02002025 */ move $a0,$s0 @@ -3534,7 +3540,7 @@ glabel func0f1552d4 /* f156e14: e7b80018 */ swc1 $f24,0x18($sp) /* f156e18: e7b4001c */ swc1 $f20,0x1c($sp) /* f156e1c: e7b60020 */ swc1 $f22,0x20($sp) -/* f156e20: 0fc559e4 */ jal 0xf156790 +/* f156e20: 0fc559e4 */ jal func0f154f38 /* f156e24: afaf0010 */ sw $t7,0x10($sp) /* f156e28: 00408025 */ move $s0,$v0 .PB0f156e2c: @@ -4530,14 +4536,14 @@ glabel func0f15568c /* f156f64: 8e4e0000 */ lw $t6,0x0($s2) /* f156f68: 59c00222 */ blezl $t6,.PB0f1577f4 /* f156f6c: 92390003 */ lbu $t9,0x3($s1) -/* f156f70: 0c002e4d */ jal 0xb934 +/* f156f70: 0c002e4d */ jal viGetWidth /* f156f74: afaa0090 */ sw $t2,0x90($sp) /* f156f78: 8e4d0000 */ lw $t5,0x0($s2) /* f156f7c: 8faa0090 */ lw $t2,0x90($sp) /* f156f80: 004d082a */ slt $at,$v0,$t5 /* f156f84: 5420021b */ bnezl $at,.PB0f1577f4 /* f156f88: 92390003 */ lbu $t9,0x3($s1) -/* f156f8c: 0c002e51 */ jal 0xb944 +/* f156f8c: 0c002e51 */ jal viGetHeight /* f156f90: afaa0090 */ sw $t2,0x90($sp) /* f156f94: 8faa0090 */ lw $t2,0x90($sp) /* f156f98: 822f0001 */ lb $t7,0x1($s1) @@ -4632,7 +4638,7 @@ glabel func0f15568c .PB0f1570ec: /* f1570ec: afaa0090 */ sw $t2,0x90($sp) /* f1570f0: afa80040 */ sw $t0,0x40($sp) -/* f1570f4: 0fc558b8 */ jal 0xf1562e0 +/* f1570f4: 0fc558b8 */ jal func0f154ecc /* f1570f8: 01af3021 */ addu $a2,$t5,$t7 /* f1570fc: 3c0c8008 */ lui $t4,0x8008 /* f157100: 258c1fa0 */ addiu $t4,$t4,0x1fa0 @@ -4831,7 +4837,7 @@ glabel func0f15568c /* f1573ec: 92390003 */ lbu $t9,0x3($s1) /* f1573f0: 8dd90000 */ lw $t9,0x0($t6) /* f1573f4: afaa0090 */ sw $t2,0x90($sp) -/* f1573f8: 0fc553e0 */ jal 0xf154f80 +/* f1573f8: 0fc553e0 */ jal func0f153b6c /* f1573fc: 03382021 */ addu $a0,$t9,$t8 /* f157400: 3c0d8008 */ lui $t5,0x8008 /* f157404: 8dad1f90 */ lw $t5,0x1f90($t5) @@ -4878,7 +4884,7 @@ glabel func0f15568c /* f1574a0: afa0001c */ sw $zero,0x1c($sp) /* f1574a4: 8c848c54 */ lw $a0,-0x73ac($a0) /* f1574a8: afa20014 */ sw $v0,0x14($sp) -/* f1574ac: 0fc3546b */ jal 0xf0d51ac +/* f1574ac: 0fc3546b */ jal func0f0d4d0c /* f1574b0: afa20018 */ sw $v0,0x18($sp) /* f1574b4: 3c01800b */ lui $at,0x800b /* f1574b8: ac228c54 */ sw $v0,-0x73ac($at) @@ -4927,7 +4933,7 @@ glabel func0f15568c /* f157558: afa0001c */ sw $zero,0x1c($sp) /* f15755c: 8c848c54 */ lw $a0,-0x73ac($a0) /* f157560: afa20014 */ sw $v0,0x14($sp) -/* f157564: 0fc3546b */ jal 0xf0d51ac +/* f157564: 0fc3546b */ jal func0f0d4d0c /* f157568: afa20018 */ sw $v0,0x18($sp) /* f15756c: 3c01800b */ lui $at,0x800b /* f157570: 1000009f */ b .PB0f1577f0 @@ -6212,7 +6218,7 @@ glabel textRenderProjected /* f1578cc: 11800064 */ beqz $t4,.PB0f157a60 /* f1578d0: 3c014220 */ lui $at,0x4220 /* f1578d4: 44816000 */ mtc1 $at,$f12 -/* f1578d8: 0fc01abe */ jal 0xf006af8 +/* f1578d8: 0fc01abe */ jal func0f006b08 /* f1578dc: 00000000 */ nop /* f1578e0: 3c0e8008 */ lui $t6,0x8008 /* f1578e4: 8dce1f90 */ lw $t6,0x1f90($t6) @@ -6288,7 +6294,7 @@ glabel textRenderProjected /* f1579e8: 01415824 */ and $t3,$t2,$at /* f1579ec: 01696025 */ or $t4,$t3,$t1 /* f1579f0: 44d9f800 */ ctc1 $t9,$31 -/* f1579f4: 0c003648 */ jal 0xd920 +/* f1579f4: 0c003648 */ jal mainOverrideVariable /* f1579f8: afac0094 */ sw $t4,0x94($sp) /* f1579fc: 3c028008 */ lui $v0,0x8008 /* f157a00: 8c4220a0 */ lw $v0,0x20a0($v0) @@ -6313,7 +6319,7 @@ glabel textRenderProjected /* f157a48: afaf0018 */ sw $t7,0x18($sp) /* f157a4c: afb80020 */ sw $t8,0x20($sp) /* f157a50: afb90024 */ sw $t9,0x24($sp) -/* f157a54: 0fc56160 */ jal 0xf158580 +/* f157a54: 0fc56160 */ jal textRender /* f157a58: afaa0028 */ sw $t2,0x28($sp) /* f157a5c: 00409825 */ move $s3,$v0 .PB0f157a60: @@ -6321,37 +6327,37 @@ glabel textRenderProjected /* f157a64: 3c058008 */ lui $a1,0x8008 /* f157a68: 8fb400d0 */ lw $s4,0xd0($sp) /* f157a6c: 24a5207c */ addiu $a1,$a1,0x207c -/* f157a70: 0c003648 */ jal 0xd920 +/* f157a70: 0c003648 */ jal mainOverrideVariable /* f157a74: 248493f0 */ addiu $a0,$a0,-27664 /* f157a78: 3c047f1c */ lui $a0,0x7f1c /* f157a7c: 3c058008 */ lui $a1,0x8008 /* f157a80: 24a52088 */ addiu $a1,$a1,0x2088 -/* f157a84: 0c003648 */ jal 0xd920 +/* f157a84: 0c003648 */ jal mainOverrideVariable /* f157a88: 248493f8 */ addiu $a0,$a0,-27656 /* f157a8c: 3c047f1c */ lui $a0,0x7f1c /* f157a90: 3c058008 */ lui $a1,0x8008 /* f157a94: 24a5208c */ addiu $a1,$a1,0x208c -/* f157a98: 0c003648 */ jal 0xd920 +/* f157a98: 0c003648 */ jal mainOverrideVariable /* f157a9c: 24849404 */ addiu $a0,$a0,-27644 /* f157aa0: 3c047f1c */ lui $a0,0x7f1c /* f157aa4: 3c058008 */ lui $a1,0x8008 /* f157aa8: 24a52094 */ addiu $a1,$a1,0x2094 -/* f157aac: 0c003648 */ jal 0xd920 +/* f157aac: 0c003648 */ jal mainOverrideVariable /* f157ab0: 24849410 */ addiu $a0,$a0,-27632 /* f157ab4: 3c047f1c */ lui $a0,0x7f1c /* f157ab8: 3c058008 */ lui $a1,0x8008 /* f157abc: 24a52090 */ addiu $a1,$a1,0x2090 -/* f157ac0: 0c003648 */ jal 0xd920 +/* f157ac0: 0c003648 */ jal mainOverrideVariable /* f157ac4: 24849418 */ addiu $a0,$a0,-27624 /* f157ac8: 3c047f1c */ lui $a0,0x7f1c /* f157acc: 3c058008 */ lui $a1,0x8008 /* f157ad0: 24a52080 */ addiu $a1,$a1,0x2080 -/* f157ad4: 0c003648 */ jal 0xd920 +/* f157ad4: 0c003648 */ jal mainOverrideVariable /* f157ad8: 24849420 */ addiu $a0,$a0,-27616 /* f157adc: 3c047f1c */ lui $a0,0x7f1c /* f157ae0: 3c058008 */ lui $a1,0x8008 /* f157ae4: 24a52084 */ addiu $a1,$a1,0x2084 -/* f157ae8: 0c003648 */ jal 0xd920 +/* f157ae8: 0c003648 */ jal mainOverrideVariable /* f157aec: 24849428 */ addiu $a0,$a0,-27608 /* f157af0: 8e0b0000 */ lw $t3,0x0($s0) /* f157af4: 8e320000 */ lw $s2,0x0($s1) @@ -6391,7 +6397,7 @@ glabel textRenderProjected /* f157b70: 3c048008 */ lui $a0,0x8008 /* f157b74: 2484200c */ addiu $a0,$a0,0x200c /* f157b78: afa70078 */ sw $a3,0x78($sp) -/* f157b7c: 0c012de0 */ jal 0x4b780 +/* f157b7c: 0c012de0 */ jal osVirtualToPhysical /* f157b80: 26730008 */ addiu $s3,$s3,0x8 /* f157b84: 8fa70078 */ lw $a3,0x78($sp) /* f157b88: 02601825 */ move $v1,$s3 @@ -6487,7 +6493,7 @@ glabel textRenderProjected /* f157cdc: 27a400b4 */ addiu $a0,$sp,0xb4 /* f157ce0: 27a5005c */ addiu $a1,$sp,0x5c /* f157ce4: 27a60058 */ addiu $a2,$sp,0x58 -/* f157ce8: 0fc5590b */ jal 0xf15642c +/* f157ce8: 0fc5590b */ jal func0f15642cpb /* f157cec: 8fa700b8 */ lw $a3,0xb8($sp) /* f157cf0: 8fb90058 */ lw $t9,0x58($sp) /* f157cf4: 8faa00bc */ lw $t2,0xbc($sp) @@ -6505,7 +6511,7 @@ glabel textRenderProjected /* f157d24: afab001c */ sw $t3,0x1c($sp) /* f157d28: afa90020 */ sw $t1,0x20($sp) /* f157d2c: afac0024 */ sw $t4,0x24($sp) -/* f157d30: 0fc55ba0 */ jal 0xf156e80 +/* f157d30: 0fc55ba0 */ jal func0f15568c /* f157d34: afad0028 */ sw $t5,0x28($sp) /* f157d38: 00409825 */ move $s3,$v0 .PB0f157d3c: @@ -7826,7 +7832,7 @@ glabel textRender /* f15865c: ac6e0000 */ sw $t6,0x0($v1) /* f158660: 3c18fd10 */ lui $t8,0xfd10 /* f158664: ae580000 */ sw $t8,0x0($s2) -/* f158668: 0c012de0 */ jal 0x4b780 +/* f158668: 0c012de0 */ jal osVirtualToPhysical /* f15866c: 2484202c */ addiu $a0,$a0,0x202c /* f158670: 02001825 */ move $v1,$s0 /* f158674: ae420004 */ sw $v0,0x4($s2) @@ -7949,7 +7955,7 @@ glabel textRender /* f15883c: afb80010 */ sw $t8,0x10($sp) /* f158840: 27a50078 */ addiu $a1,$sp,0x78 /* f158844: 27a60074 */ addiu $a2,$sp,0x74 -/* f158848: 0fc5590b */ jal 0xf15642c +/* f158848: 0fc5590b */ jal func0f15642cpb /* f15884c: 8fa700d0 */ lw $a3,0xd0($sp) /* f158850: 8e4c0000 */ lw $t4,0x0($s2) /* f158854: 8fab0074 */ lw $t3,0x74($sp) @@ -7966,7 +7972,7 @@ glabel textRender /* f158880: afab0010 */ sw $t3,0x10($sp) /* f158884: 00006812 */ mflo $t5 /* f158888: afad0020 */ sw $t5,0x20($sp) -/* f15888c: 0fc55fb2 */ jal 0xf157ec8 +/* f15888c: 0fc55fb2 */ jal func0f156790 /* f158890: afb9001c */ sw $t9,0x1c($sp) /* f158894: 00408025 */ move $s0,$v0 .PB0f158898: @@ -8587,7 +8593,7 @@ glabel textMeasure /* f158a9c: afb80010 */ sw $t8,0x10($sp) /* f158aa0: 02e02825 */ move $a1,$s7 /* f158aa4: 03c03025 */ move $a2,$s8 -/* f158aa8: 0fc5590b */ jal 0xf15642c +/* f158aa8: 0fc5590b */ jal func0f15642cpb /* f158aac: 8fa7006c */ lw $a3,0x6c($sp) /* f158ab0: 8fb9004c */ lw $t9,0x4c($sp) /* f158ab4: 8fac0050 */ lw $t4,0x50($sp) diff --git a/src/game/game_19aa80.c b/src/game/game_19aa80.c index 7f053cc6f..38107456a 100644 --- a/src/game/game_19aa80.c +++ b/src/game/game_19aa80.c @@ -1077,7 +1077,7 @@ glabel mpConsiderMarkingCurrentChallengeComplete /* f19e354: 27bdffd8 */ addiu $sp,$sp,-40 /* f19e358: afbf001c */ sw $ra,0x1c($sp) /* f19e35c: afb10018 */ sw $s1,0x18($sp) -/* f19e360: 0fc67875 */ jal 0xf19e1d4 +/* f19e360: 0fc67875 */ jal mpIsChallengeCompleteForEndscreen /* f19e364: afb00014 */ sw $s0,0x14($sp) /* f19e368: 3c0e800a */ lui $t6,0x800a /* f19e36c: 8dce6700 */ lw $t6,0x6700($t6) @@ -1089,7 +1089,7 @@ glabel mpConsiderMarkingCurrentChallengeComplete /* f19e384: 8fbf001c */ lw $ra,0x1c($sp) /* f19e388: 14400004 */ bnez $v0,.PB0f19e39c /* f19e38c: 00000000 */ nop -/* f19e390: 0fc4810c */ jal 0xf120430 +/* f19e390: 0fc4810c */ jal debugIsAllTrainingEnabled /* f19e394: 00000000 */ nop /* f19e398: 10400082 */ beqz $v0,.PB0f19e5a4 .PB0f19e39c: @@ -1128,7 +1128,7 @@ glabel mpConsiderMarkingCurrentChallengeComplete /* f19e40c: 00436021 */ addu $t4,$v0,$v1 /* f19e410: 01886821 */ addu $t5,$t4,$t0 /* f19e414: 01a92821 */ addu $a1,$t5,$t1 -/* f19e418: 0fc67829 */ jal 0xf19e0a4 +/* f19e418: 0fc67829 */ jal mpSetChallengeCompletedByAnyPlayerWithNumPlayers /* f19e41c: 8c84a990 */ lw $a0,-0x5670($a0) /* f19e420: 8e0f006c */ lw $t7,0x6c($s0) /* f19e424: 8e0e028c */ lw $t6,0x28c($s0) @@ -1166,7 +1166,7 @@ glabel mpConsiderMarkingCurrentChallengeComplete /* f19e490: 19a00040 */ blez $t5,.PB0f19e594 /* f19e494: 00000000 */ nop .PB0f19e498: -/* f19e498: 0fc4a783 */ jal 0xf129e0c +/* f19e498: 0fc4a783 */ jal setCurrentPlayerNum /* f19e49c: 02202025 */ move $a0,$s1 /* f19e4a0: 8e0e006c */ lw $t6,0x6c($s0) /* f19e4a4: 3c058009 */ lui $a1,0x8009 @@ -1201,7 +1201,7 @@ glabel mpConsiderMarkingCurrentChallengeComplete /* f19e508: 01686021 */ addu $t4,$t3,$t0 /* f19e50c: 01893021 */ addu $a2,$t4,$t1 /* f19e510: 8ca5a990 */ lw $a1,-0x5670($a1) -/* f19e514: 0fc67854 */ jal 0xf19e150 +/* f19e514: 0fc67854 */ jal mpSetChallengeCompletedByPlayerWithNumPlayers /* f19e518: 8d440070 */ lw $a0,0x70($t2) /* f19e51c: 8e0d006c */ lw $t5,0x6c($s0) /* f19e520: 26310001 */ addiu $s1,$s1,0x1 @@ -1238,9 +1238,9 @@ glabel mpConsiderMarkingCurrentChallengeComplete /* f19e58c: 1420ffc2 */ bnez $at,.PB0f19e498 /* f19e590: 00000000 */ nop .PB0f19e594: -/* f19e594: 0fc4a783 */ jal 0xf129e0c +/* f19e594: 0fc4a783 */ jal setCurrentPlayerNum /* f19e598: 8fa40020 */ lw $a0,0x20($sp) -/* f19e59c: 0fc67317 */ jal 0xf19cc5c +/* f19e59c: 0fc67317 */ jal mpDetermineUnlockedFeatures /* f19e5a0: 00000000 */ nop .PB0f19e5a4: /* f19e5a4: 8fbf001c */ lw $ra,0x1c($sp) diff --git a/src/game/gamefile.c b/src/game/gamefile.c index ad75d7eb2..d3ed8186e 100644 --- a/src/game/gamefile.c +++ b/src/game/gamefile.c @@ -436,172 +436,172 @@ glabel gamefileApplyOptions /* f10f9b0: afa80020 */ sw $t0,0x20($sp) .PB0f10f9b4: /* f10f9b4: 24d00014 */ addiu $s0,$a2,0x14 -/* f10f9b8: 0fc47b90 */ jal 0xf11ee40 +/* f10f9b8: 0fc47b90 */ jal pakHasBitflag /* f10f9bc: 02002825 */ move $a1,$s0 /* f10f9c0: 8fa40024 */ lw $a0,0x24($sp) -/* f10f9c4: 0fc54f3e */ jal 0xf153cf8 +/* f10f9c4: 0fc54f3e */ jal optionsSetForwardPitch /* f10f9c8: 00402825 */ move $a1,$v0 /* f10f9cc: 24040001 */ li $a0,0x1 -/* f10f9d0: 0fc47b90 */ jal 0xf11ee40 +/* f10f9d0: 0fc47b90 */ jal pakHasBitflag /* f10f9d4: 02002825 */ move $a1,$s0 /* f10f9d8: 8fa40024 */ lw $a0,0x24($sp) -/* f10f9dc: 0fc54f54 */ jal 0xf153d50 +/* f10f9dc: 0fc54f54 */ jal optionsSetAutoAim /* f10f9e0: 00402825 */ move $a1,$v0 /* f10f9e4: 24040002 */ li $a0,0x2 -/* f10f9e8: 0fc47b90 */ jal 0xf11ee40 +/* f10f9e8: 0fc47b90 */ jal pakHasBitflag /* f10f9ec: 02002825 */ move $a1,$s0 /* f10f9f0: 8fa40024 */ lw $a0,0x24($sp) -/* f10f9f4: 0fc54f80 */ jal 0xf153e00 +/* f10f9f4: 0fc54f80 */ jal optionsSetAimControl /* f10f9f8: 00402825 */ move $a1,$v0 /* f10f9fc: 24040003 */ li $a0,0x3 -/* f10fa00: 0fc47b90 */ jal 0xf11ee40 +/* f10fa00: 0fc47b90 */ jal pakHasBitflag /* f10fa04: 02002825 */ move $a1,$s0 /* f10fa08: 8fa40024 */ lw $a0,0x24($sp) -/* f10fa0c: 0fc54f96 */ jal 0xf153e58 +/* f10fa0c: 0fc54f96 */ jal optionsSetSightOnScreen /* f10fa10: 00402825 */ move $a1,$v0 /* f10fa14: 24040004 */ li $a0,0x4 -/* f10fa18: 0fc47b90 */ jal 0xf11ee40 +/* f10fa18: 0fc47b90 */ jal pakHasBitflag /* f10fa1c: 02002825 */ move $a1,$s0 /* f10fa20: 8fa40024 */ lw $a0,0x24($sp) -/* f10fa24: 0fc54f6a */ jal 0xf153da8 +/* f10fa24: 0fc54f6a */ jal optionsSetLookAhead /* f10fa28: 00402825 */ move $a1,$v0 /* f10fa2c: 24040005 */ li $a0,0x5 -/* f10fa30: 0fc47b90 */ jal 0xf11ee40 +/* f10fa30: 0fc47b90 */ jal pakHasBitflag /* f10fa34: 02002825 */ move $a1,$s0 /* f10fa38: 8fa40024 */ lw $a0,0x24($sp) -/* f10fa3c: 0fc54fac */ jal 0xf153eb0 +/* f10fa3c: 0fc54fac */ jal optionsSetAmmoOnScreen /* f10fa40: 00402825 */ move $a1,$v0 /* f10fa44: 24040009 */ li $a0,0x9 -/* f10fa48: 0fc47b90 */ jal 0xf11ee40 +/* f10fa48: 0fc47b90 */ jal pakHasBitflag /* f10fa4c: 02002825 */ move $a1,$s0 /* f10fa50: 8fa40024 */ lw $a0,0x24($sp) -/* f10fa54: 0fc55036 */ jal 0xf1540d8 +/* f10fa54: 0fc55036 */ jal optionsSetHeadRoll /* f10fa58: 00402825 */ move $a1,$v0 /* f10fa5c: 2404000a */ li $a0,0xa -/* f10fa60: 0fc47b90 */ jal 0xf11ee40 +/* f10fa60: 0fc47b90 */ jal pakHasBitflag /* f10fa64: 02002825 */ move $a1,$s0 /* f10fa68: 8fa40024 */ lw $a0,0x24($sp) -/* f10fa6c: 0fc54fc2 */ jal 0xf153f08 +/* f10fa6c: 0fc54fc2 */ jal optionsSetShowGunFunction /* f10fa70: 00402825 */ move $a1,$v0 /* f10fa74: 24040015 */ li $a0,0x15 -/* f10fa78: 0fc47b90 */ jal 0xf11ee40 +/* f10fa78: 0fc47b90 */ jal pakHasBitflag /* f10fa7c: 02002825 */ move $a1,$s0 /* f10fa80: 8fa40024 */ lw $a0,0x24($sp) -/* f10fa84: 0fc54fd8 */ jal 0xf153f60 +/* f10fa84: 0fc54fd8 */ jal optionsSetAlwaysShowTarget /* f10fa88: 00402825 */ move $a1,$v0 /* f10fa8c: 24040017 */ li $a0,0x17 -/* f10fa90: 0fc47b90 */ jal 0xf11ee40 +/* f10fa90: 0fc47b90 */ jal pakHasBitflag /* f10fa94: 02002825 */ move $a1,$s0 /* f10fa98: 8fa40024 */ lw $a0,0x24($sp) -/* f10fa9c: 0fc54fee */ jal 0xf153fb8 +/* f10fa9c: 0fc54fee */ jal optionsSetShowZoomRange /* f10faa0: 00402825 */ move $a1,$v0 /* f10faa4: 2404001a */ li $a0,0x1a -/* f10faa8: 0fc47b90 */ jal 0xf11ee40 +/* f10faa8: 0fc47b90 */ jal pakHasBitflag /* f10faac: 02002825 */ move $a1,$s0 /* f10fab0: 8fa40024 */ lw $a0,0x24($sp) -/* f10fab4: 0fc5501a */ jal 0xf154068 +/* f10fab4: 0fc5501a */ jal optionsSetShowMissionTime /* f10fab8: 00402825 */ move $a1,$v0 /* f10fabc: 24040020 */ li $a0,0x20 -/* f10fac0: 0fc47b90 */ jal 0xf11ee40 +/* f10fac0: 0fc47b90 */ jal pakHasBitflag /* f10fac4: 02002825 */ move $a1,$s0 /* f10fac8: 8fa40024 */ lw $a0,0x24($sp) -/* f10facc: 0fc55004 */ jal 0xf154010 +/* f10facc: 0fc55004 */ jal optionsSetPaintball /* f10fad0: 00402825 */ move $a1,$v0 /* f10fad4: 2404000c */ li $a0,0xc -/* f10fad8: 0fc47b90 */ jal 0xf11ee40 +/* f10fad8: 0fc47b90 */ jal pakHasBitflag /* f10fadc: 02002825 */ move $a1,$s0 /* f10fae0: 8fa40020 */ lw $a0,0x20($sp) -/* f10fae4: 0fc54f3e */ jal 0xf153cf8 +/* f10fae4: 0fc54f3e */ jal optionsSetForwardPitch /* f10fae8: 00402825 */ move $a1,$v0 /* f10faec: 2404000d */ li $a0,0xd -/* f10faf0: 0fc47b90 */ jal 0xf11ee40 +/* f10faf0: 0fc47b90 */ jal pakHasBitflag /* f10faf4: 02002825 */ move $a1,$s0 /* f10faf8: 8fa40020 */ lw $a0,0x20($sp) -/* f10fafc: 0fc54f54 */ jal 0xf153d50 +/* f10fafc: 0fc54f54 */ jal optionsSetAutoAim /* f10fb00: 00402825 */ move $a1,$v0 /* f10fb04: 2404000e */ li $a0,0xe -/* f10fb08: 0fc47b90 */ jal 0xf11ee40 +/* f10fb08: 0fc47b90 */ jal pakHasBitflag /* f10fb0c: 02002825 */ move $a1,$s0 /* f10fb10: 8fa40020 */ lw $a0,0x20($sp) -/* f10fb14: 0fc54f80 */ jal 0xf153e00 +/* f10fb14: 0fc54f80 */ jal optionsSetAimControl /* f10fb18: 00402825 */ move $a1,$v0 /* f10fb1c: 2404000f */ li $a0,0xf -/* f10fb20: 0fc47b90 */ jal 0xf11ee40 +/* f10fb20: 0fc47b90 */ jal pakHasBitflag /* f10fb24: 02002825 */ move $a1,$s0 /* f10fb28: 8fa40020 */ lw $a0,0x20($sp) -/* f10fb2c: 0fc54f96 */ jal 0xf153e58 +/* f10fb2c: 0fc54f96 */ jal optionsSetSightOnScreen /* f10fb30: 00402825 */ move $a1,$v0 /* f10fb34: 24040010 */ li $a0,0x10 -/* f10fb38: 0fc47b90 */ jal 0xf11ee40 +/* f10fb38: 0fc47b90 */ jal pakHasBitflag /* f10fb3c: 02002825 */ move $a1,$s0 /* f10fb40: 8fa40020 */ lw $a0,0x20($sp) -/* f10fb44: 0fc54f6a */ jal 0xf153da8 +/* f10fb44: 0fc54f6a */ jal optionsSetLookAhead /* f10fb48: 00402825 */ move $a1,$v0 /* f10fb4c: 24040011 */ li $a0,0x11 -/* f10fb50: 0fc47b90 */ jal 0xf11ee40 +/* f10fb50: 0fc47b90 */ jal pakHasBitflag /* f10fb54: 02002825 */ move $a1,$s0 /* f10fb58: 8fa40020 */ lw $a0,0x20($sp) -/* f10fb5c: 0fc54fac */ jal 0xf153eb0 +/* f10fb5c: 0fc54fac */ jal optionsSetAmmoOnScreen /* f10fb60: 00402825 */ move $a1,$v0 /* f10fb64: 24040012 */ li $a0,0x12 -/* f10fb68: 0fc47b90 */ jal 0xf11ee40 +/* f10fb68: 0fc47b90 */ jal pakHasBitflag /* f10fb6c: 02002825 */ move $a1,$s0 /* f10fb70: 8fa40020 */ lw $a0,0x20($sp) -/* f10fb74: 0fc55036 */ jal 0xf1540d8 +/* f10fb74: 0fc55036 */ jal optionsSetHeadRoll /* f10fb78: 00402825 */ move $a1,$v0 /* f10fb7c: 24040013 */ li $a0,0x13 -/* f10fb80: 0fc47b90 */ jal 0xf11ee40 +/* f10fb80: 0fc47b90 */ jal pakHasBitflag /* f10fb84: 02002825 */ move $a1,$s0 /* f10fb88: 8fa40020 */ lw $a0,0x20($sp) -/* f10fb8c: 0fc54fc2 */ jal 0xf153f08 +/* f10fb8c: 0fc54fc2 */ jal optionsSetShowGunFunction /* f10fb90: 00402825 */ move $a1,$v0 /* f10fb94: 24040016 */ li $a0,0x16 -/* f10fb98: 0fc47b90 */ jal 0xf11ee40 +/* f10fb98: 0fc47b90 */ jal pakHasBitflag /* f10fb9c: 02002825 */ move $a1,$s0 /* f10fba0: 8fa40020 */ lw $a0,0x20($sp) -/* f10fba4: 0fc54fd8 */ jal 0xf153f60 +/* f10fba4: 0fc54fd8 */ jal optionsSetAlwaysShowTarget /* f10fba8: 00402825 */ move $a1,$v0 /* f10fbac: 24040018 */ li $a0,0x18 -/* f10fbb0: 0fc47b90 */ jal 0xf11ee40 +/* f10fbb0: 0fc47b90 */ jal pakHasBitflag /* f10fbb4: 02002825 */ move $a1,$s0 /* f10fbb8: 8fa40020 */ lw $a0,0x20($sp) -/* f10fbbc: 0fc54fee */ jal 0xf153fb8 +/* f10fbbc: 0fc54fee */ jal optionsSetShowZoomRange /* f10fbc0: 00402825 */ move $a1,$v0 /* f10fbc4: 2404001b */ li $a0,0x1b -/* f10fbc8: 0fc47b90 */ jal 0xf11ee40 +/* f10fbc8: 0fc47b90 */ jal pakHasBitflag /* f10fbcc: 02002825 */ move $a1,$s0 /* f10fbd0: 8fa40020 */ lw $a0,0x20($sp) -/* f10fbd4: 0fc5501a */ jal 0xf154068 +/* f10fbd4: 0fc5501a */ jal optionsSetShowMissionTime /* f10fbd8: 00402825 */ move $a1,$v0 /* f10fbdc: 24040021 */ li $a0,0x21 -/* f10fbe0: 0fc47b90 */ jal 0xf11ee40 +/* f10fbe0: 0fc47b90 */ jal pakHasBitflag /* f10fbe4: 02002825 */ move $a1,$s0 /* f10fbe8: 8fa40020 */ lw $a0,0x20($sp) -/* f10fbec: 0fc55004 */ jal 0xf154010 +/* f10fbec: 0fc55004 */ jal optionsSetPaintball /* f10fbf0: 00402825 */ move $a1,$v0 /* f10fbf4: 2404000b */ li $a0,0xb -/* f10fbf8: 0fc47b90 */ jal 0xf11ee40 +/* f10fbf8: 0fc47b90 */ jal pakHasBitflag /* f10fbfc: 02002825 */ move $a1,$s0 -/* f10fc00: 0fc55030 */ jal 0xf1540c0 +/* f10fc00: 0fc55030 */ jal optionsSetInGameSubtitles /* f10fc04: 00402025 */ move $a0,$v0 /* f10fc08: 24040014 */ li $a0,0x14 -/* f10fc0c: 0fc47b90 */ jal 0xf11ee40 +/* f10fc0c: 0fc47b90 */ jal pakHasBitflag /* f10fc10: 02002825 */ move $a1,$s0 -/* f10fc14: 0fc55033 */ jal 0xf1540cc +/* f10fc14: 0fc55033 */ jal optionsSetCutsceneSubtitles /* f10fc18: 00402025 */ move $a0,$v0 /* f10fc1c: 24040021 */ li $a0,0x21 -/* f10fc20: 0fc47b90 */ jal 0xf11ee40 +/* f10fc20: 0fc47b90 */ jal pakHasBitflag /* f10fc24: 02002825 */ move $a1,$s0 /* f10fc28: 8fa40020 */ lw $a0,0x20($sp) -/* f10fc2c: 0fc55004 */ jal 0xf154010 +/* f10fc2c: 0fc55004 */ jal optionsSetPaintball /* f10fc30: 00402825 */ move $a1,$v0 /* f10fc34: 24040040 */ li $a0,0x40 -/* f10fc38: 0fc47b90 */ jal 0xf11ee40 +/* f10fc38: 0fc47b90 */ jal pakHasBitflag /* f10fc3c: 02002825 */ move $a1,$s0 /* f10fc40: 3c01800a */ lui $at,0x800a /* f10fc44: a022e9b3 */ sb $v0,-0x164d($at) /* f10fc48: 24040022 */ li $a0,0x22 -/* f10fc4c: 0fc47b90 */ jal 0xf11ee40 +/* f10fc4c: 0fc47b90 */ jal pakHasBitflag /* f10fc50: 02002825 */ move $a1,$s0 /* f10fc54: 1040000d */ beqz $v0,.PB0f10fc8c /* f10fc58: 3c098009 */ lui $t1,0x8009 @@ -609,17 +609,17 @@ glabel gamefileApplyOptions /* f10fc60: 24010001 */ li $at,0x1 /* f10fc64: 15210005 */ bne $t1,$at,.PB0f10fc7c /* f10fc68: 00000000 */ nop -/* f10fc6c: 0fc2f22b */ jal 0xf0bc8ac +/* f10fc6c: 0fc2f22b */ jal playerSetHiResEnabled /* f10fc70: 00002025 */ move $a0,$zero /* f10fc74: 10000007 */ b .PB0f10fc94 /* f10fc78: 00000000 */ nop .PB0f10fc7c: -/* f10fc7c: 0fc2f22b */ jal 0xf0bc8ac +/* f10fc7c: 0fc2f22b */ jal playerSetHiResEnabled /* f10fc80: 24040001 */ li $a0,0x1 /* f10fc84: 10000003 */ b .PB0f10fc94 /* f10fc88: 00000000 */ nop .PB0f10fc8c: -/* f10fc8c: 0fc2f22b */ jal 0xf0bc8ac +/* f10fc8c: 0fc2f22b */ jal playerSetHiResEnabled /* f10fc90: 00002025 */ move $a0,$zero .PB0f10fc94: /* f10fc94: 3c0a8009 */ lui $t2,0x8009 @@ -627,49 +627,49 @@ glabel gamefileApplyOptions /* f10fc9c: 24010001 */ li $at,0x1 /* f10fca0: 55410008 */ bnel $t2,$at,.PB0f10fcc4 /* f10fca4: 24040019 */ li $a0,0x19 -/* f10fca8: 0fc550bc */ jal 0xf1542f0 +/* f10fca8: 0fc550bc */ jal optionsSetScreenSplit /* f10fcac: 00002025 */ move $a0,$zero -/* f10fcb0: 0fc550b6 */ jal 0xf1542d8 +/* f10fcb0: 0fc550b6 */ jal optionsSetScreenRatio /* f10fcb4: 00002025 */ move $a0,$zero /* f10fcb8: 1000000c */ b .PB0f10fcec /* f10fcbc: 24040008 */ li $a0,0x8 /* f10fcc0: 24040019 */ li $a0,0x19 .PB0f10fcc4: -/* f10fcc4: 0fc47b90 */ jal 0xf11ee40 +/* f10fcc4: 0fc47b90 */ jal pakHasBitflag /* f10fcc8: 02002825 */ move $a1,$s0 -/* f10fccc: 0fc550bc */ jal 0xf1542f0 +/* f10fccc: 0fc550bc */ jal optionsSetScreenSplit /* f10fcd0: 304400ff */ andi $a0,$v0,0xff /* f10fcd4: 24040007 */ li $a0,0x7 -/* f10fcd8: 0fc47b90 */ jal 0xf11ee40 +/* f10fcd8: 0fc47b90 */ jal pakHasBitflag /* f10fcdc: 02002825 */ move $a1,$s0 -/* f10fce0: 0fc550b6 */ jal 0xf1542d8 +/* f10fce0: 0fc550b6 */ jal optionsSetScreenRatio /* f10fce4: 00402025 */ move $a0,$v0 /* f10fce8: 24040008 */ li $a0,0x8 .PB0f10fcec: -/* f10fcec: 0fc47b90 */ jal 0xf11ee40 +/* f10fcec: 0fc47b90 */ jal pakHasBitflag /* f10fcf0: 02002825 */ move $a1,$s0 /* f10fcf4: 50400006 */ beqzl $v0,.PB0f10fd10 /* f10fcf8: 24040006 */ li $a0,0x6 -/* f10fcfc: 0fc550b0 */ jal 0xf1542c0 +/* f10fcfc: 0fc550b0 */ jal optionsSetScreenSize /* f10fd00: 24040002 */ li $a0,0x2 /* f10fd04: 1000000d */ b .PB0f10fd3c /* f10fd08: 2404001f */ li $a0,0x1f /* f10fd0c: 24040006 */ li $a0,0x6 .PB0f10fd10: -/* f10fd10: 0fc47b90 */ jal 0xf11ee40 +/* f10fd10: 0fc47b90 */ jal pakHasBitflag /* f10fd14: 02002825 */ move $a1,$s0 /* f10fd18: 10400005 */ beqz $v0,.PB0f10fd30 /* f10fd1c: 00000000 */ nop -/* f10fd20: 0fc550b0 */ jal 0xf1542c0 +/* f10fd20: 0fc550b0 */ jal optionsSetScreenSize /* f10fd24: 24040001 */ li $a0,0x1 /* f10fd28: 10000004 */ b .PB0f10fd3c /* f10fd2c: 2404001f */ li $a0,0x1f .PB0f10fd30: -/* f10fd30: 0fc550b0 */ jal 0xf1542c0 +/* f10fd30: 0fc550b0 */ jal optionsSetScreenSize /* f10fd34: 00002025 */ move $a0,$zero /* f10fd38: 2404001f */ li $a0,0x1f .PB0f10fd3c: -/* f10fd3c: 0fc47b90 */ jal 0xf11ee40 +/* f10fd3c: 0fc47b90 */ jal pakHasBitflag /* f10fd40: 02002825 */ move $a1,$s0 /* f10fd44: 10400005 */ beqz $v0,.PB0f10fd5c /* f10fd48: 2404001c */ li $a0,0x1c @@ -681,7 +681,7 @@ glabel gamefileApplyOptions /* f10fd5c: 3c01800a */ lui $at,0x800a /* f10fd60: ac20e920 */ sw $zero,-0x16e0($at) .PB0f10fd64: -/* f10fd64: 0fc47b90 */ jal 0xf11ee40 +/* f10fd64: 0fc47b90 */ jal pakHasBitflag /* f10fd68: 02002825 */ move $a1,$s0 /* f10fd6c: 10400005 */ beqz $v0,.PB0f10fd84 /* f10fd70: 2404001d */ li $a0,0x1d @@ -693,7 +693,7 @@ glabel gamefileApplyOptions /* f10fd84: 3c01800a */ lui $at,0x800a /* f10fd88: ac20e918 */ sw $zero,-0x16e8($at) .PB0f10fd8c: -/* f10fd8c: 0fc47b90 */ jal 0xf11ee40 +/* f10fd8c: 0fc47b90 */ jal pakHasBitflag /* f10fd90: 02002825 */ move $a1,$s0 /* f10fd94: 10400005 */ beqz $v0,.PB0f10fdac /* f10fd98: 2404001e */ li $a0,0x1e @@ -705,7 +705,7 @@ glabel gamefileApplyOptions /* f10fdac: 3c01800a */ lui $at,0x800a /* f10fdb0: ac20e924 */ sw $zero,-0x16dc($at) .PB0f10fdb4: -/* f10fdb4: 0fc47b90 */ jal 0xf11ee40 +/* f10fdb4: 0fc47b90 */ jal pakHasBitflag /* f10fdb8: 02002825 */ move $a1,$s0 /* f10fdbc: 10400005 */ beqz $v0,.PB0f10fdd4 /* f10fdc0: 24040044 */ li $a0,0x44 @@ -719,7 +719,7 @@ glabel gamefileApplyOptions .PB0f10fddc: /* f10fddc: 3c01800a */ lui $at,0x800a /* f10fde0: a420e952 */ sh $zero,-0x16ae($at) -/* f10fde4: 0fc47b90 */ jal 0xf11ee40 +/* f10fde4: 0fc47b90 */ jal pakHasBitflag /* f10fde8: 02002825 */ move $a1,$s0 /* f10fdec: 10400006 */ beqz $v0,.PB0f10fe08 /* f10fdf0: 24040045 */ li $a0,0x45 @@ -729,7 +729,7 @@ glabel gamefileApplyOptions /* f10fe00: 35f80001 */ ori $t8,$t7,0x1 /* f10fe04: a438e952 */ sh $t8,-0x16ae($at) .PB0f10fe08: -/* f10fe08: 0fc47b90 */ jal 0xf11ee40 +/* f10fe08: 0fc47b90 */ jal pakHasBitflag /* f10fe0c: 02002825 */ move $a1,$s0 /* f10fe10: 10400006 */ beqz $v0,.PB0f10fe2c /* f10fe14: 24040046 */ li $a0,0x46 @@ -739,7 +739,7 @@ glabel gamefileApplyOptions /* f10fe24: 37280002 */ ori $t0,$t9,0x2 /* f10fe28: a428e952 */ sh $t0,-0x16ae($at) .PB0f10fe2c: -/* f10fe2c: 0fc47b90 */ jal 0xf11ee40 +/* f10fe2c: 0fc47b90 */ jal pakHasBitflag /* f10fe30: 02002825 */ move $a1,$s0 /* f10fe34: 10400006 */ beqz $v0,.PB0f10fe50 /* f10fe38: 3c04800a */ lui $a0,0x800a @@ -749,7 +749,7 @@ glabel gamefileApplyOptions /* f10fe48: 352a0004 */ ori $t2,$t1,0x4 /* f10fe4c: a42ae952 */ sh $t2,-0x16ae($at) .PB0f10fe50: -/* f10fe50: 0fc5c097 */ jal 0xf17025c +/* f10fe50: 0fc5c097 */ jal func0f16f75c /* f10fe54: 9484e952 */ lhu $a0,-0x16ae($a0) /* f10fe58: 8fbf001c */ lw $ra,0x1c($sp) /* f10fe5c: 8fb00018 */ lw $s0,0x18($sp) @@ -1172,7 +1172,7 @@ glabel gamefileLoadDefaults /* f10fec8: 24100001 */ li $s0,0x1 .PB0f10fecc: /* f10fecc: 3c057f1b */ lui $a1,0x7f1b -/* f10fed0: 0c004cbc */ jal 0x132f0 +/* f10fed0: 0c004cbc */ jal strcpy /* f10fed4: 24a55620 */ addiu $a1,$a1,0x5620 /* f10fed8: 8fa20028 */ lw $v0,0x28($sp) /* f10fedc: 24045000 */ li $a0,0x5000 @@ -1182,177 +1182,177 @@ glabel gamefileLoadDefaults /* f10feec: 3308ff07 */ andi $t0,$t8,0xff07 /* f10fef0: 310900f8 */ andi $t1,$t0,0xf8 /* f10fef4: a048000b */ sb $t0,0xb($v0) -/* f10fef8: 0c003a93 */ jal 0xea4c +/* f10fef8: 0c003a93 */ jal sndSetSfxVolume /* f10fefc: a049000b */ sb $t1,0xb($v0) -/* f10ff00: 0fc550c8 */ jal 0xf154320 +/* f10ff00: 0fc550c8 */ jal optionsSetMusicVolume /* f10ff04: 24045000 */ li $a0,0x5000 -/* f10ff08: 0c003cef */ jal 0xf3bc +/* f10ff08: 0c003cef */ jal sndSetSoundMode /* f10ff0c: 24040001 */ li $a0,0x1 /* f10ff10: 02202025 */ move $a0,$s1 -/* f10ff14: 0fc54eb7 */ jal 0xf153adc +/* f10ff14: 0fc54eb7 */ jal optionsSetControlMode /* f10ff18: 00002825 */ move $a1,$zero /* f10ff1c: 02002025 */ move $a0,$s0 -/* f10ff20: 0fc54eb7 */ jal 0xf153adc +/* f10ff20: 0fc54eb7 */ jal optionsSetControlMode /* f10ff24: 00002825 */ move $a1,$zero /* f10ff28: 8fb00028 */ lw $s0,0x28($sp) /* f10ff2c: 26100014 */ addiu $s0,$s0,0x14 -/* f10ff30: 0fc47b9e */ jal 0xf11ee78 +/* f10ff30: 0fc47b9e */ jal pakClearAllBitflags /* f10ff34: 02002025 */ move $a0,$s0 /* f10ff38: 00002025 */ move $a0,$zero /* f10ff3c: 02002825 */ move $a1,$s0 -/* f10ff40: 0fc47b7b */ jal 0xf11edec +/* f10ff40: 0fc47b7b */ jal pakSetBitflag /* f10ff44: 00003025 */ move $a2,$zero /* f10ff48: 24040001 */ li $a0,0x1 /* f10ff4c: 02002825 */ move $a1,$s0 -/* f10ff50: 0fc47b7b */ jal 0xf11edec +/* f10ff50: 0fc47b7b */ jal pakSetBitflag /* f10ff54: 24060001 */ li $a2,0x1 /* f10ff58: 24040002 */ li $a0,0x2 /* f10ff5c: 02002825 */ move $a1,$s0 -/* f10ff60: 0fc47b7b */ jal 0xf11edec +/* f10ff60: 0fc47b7b */ jal pakSetBitflag /* f10ff64: 00003025 */ move $a2,$zero /* f10ff68: 24040003 */ li $a0,0x3 /* f10ff6c: 02002825 */ move $a1,$s0 -/* f10ff70: 0fc47b7b */ jal 0xf11edec +/* f10ff70: 0fc47b7b */ jal pakSetBitflag /* f10ff74: 24060001 */ li $a2,0x1 /* f10ff78: 24040004 */ li $a0,0x4 /* f10ff7c: 02002825 */ move $a1,$s0 -/* f10ff80: 0fc47b7b */ jal 0xf11edec +/* f10ff80: 0fc47b7b */ jal pakSetBitflag /* f10ff84: 24060001 */ li $a2,0x1 /* f10ff88: 24040005 */ li $a0,0x5 /* f10ff8c: 02002825 */ move $a1,$s0 -/* f10ff90: 0fc47b7b */ jal 0xf11edec +/* f10ff90: 0fc47b7b */ jal pakSetBitflag /* f10ff94: 24060001 */ li $a2,0x1 /* f10ff98: 24040009 */ li $a0,0x9 /* f10ff9c: 02002825 */ move $a1,$s0 -/* f10ffa0: 0fc47b7b */ jal 0xf11edec +/* f10ffa0: 0fc47b7b */ jal pakSetBitflag /* f10ffa4: 24060001 */ li $a2,0x1 /* f10ffa8: 2404000a */ li $a0,0xa /* f10ffac: 02002825 */ move $a1,$s0 -/* f10ffb0: 0fc47b7b */ jal 0xf11edec +/* f10ffb0: 0fc47b7b */ jal pakSetBitflag /* f10ffb4: 24060001 */ li $a2,0x1 /* f10ffb8: 2404000b */ li $a0,0xb /* f10ffbc: 02002825 */ move $a1,$s0 -/* f10ffc0: 0fc47b7b */ jal 0xf11edec +/* f10ffc0: 0fc47b7b */ jal pakSetBitflag /* f10ffc4: 24060001 */ li $a2,0x1 /* f10ffc8: 24040015 */ li $a0,0x15 /* f10ffcc: 02002825 */ move $a1,$s0 -/* f10ffd0: 0fc47b7b */ jal 0xf11edec +/* f10ffd0: 0fc47b7b */ jal pakSetBitflag /* f10ffd4: 24060001 */ li $a2,0x1 /* f10ffd8: 24040017 */ li $a0,0x17 /* f10ffdc: 02002825 */ move $a1,$s0 -/* f10ffe0: 0fc47b7b */ jal 0xf11edec +/* f10ffe0: 0fc47b7b */ jal pakSetBitflag /* f10ffe4: 24060001 */ li $a2,0x1 /* f10ffe8: 2404001a */ li $a0,0x1a /* f10ffec: 02002825 */ move $a1,$s0 -/* f10fff0: 0fc47b7b */ jal 0xf11edec +/* f10fff0: 0fc47b7b */ jal pakSetBitflag /* f10fff4: 00003025 */ move $a2,$zero /* f10fff8: 24040020 */ li $a0,0x20 /* f10fffc: 02002825 */ move $a1,$s0 -/* f110000: 0fc47b7b */ jal 0xf11edec +/* f110000: 0fc47b7b */ jal pakSetBitflag /* f110004: 00003025 */ move $a2,$zero /* f110008: 2404000c */ li $a0,0xc /* f11000c: 02002825 */ move $a1,$s0 -/* f110010: 0fc47b7b */ jal 0xf11edec +/* f110010: 0fc47b7b */ jal pakSetBitflag /* f110014: 00003025 */ move $a2,$zero /* f110018: 2404000d */ li $a0,0xd /* f11001c: 02002825 */ move $a1,$s0 -/* f110020: 0fc47b7b */ jal 0xf11edec +/* f110020: 0fc47b7b */ jal pakSetBitflag /* f110024: 24060001 */ li $a2,0x1 /* f110028: 2404000e */ li $a0,0xe /* f11002c: 02002825 */ move $a1,$s0 -/* f110030: 0fc47b7b */ jal 0xf11edec +/* f110030: 0fc47b7b */ jal pakSetBitflag /* f110034: 00003025 */ move $a2,$zero /* f110038: 2404000f */ li $a0,0xf /* f11003c: 02002825 */ move $a1,$s0 -/* f110040: 0fc47b7b */ jal 0xf11edec +/* f110040: 0fc47b7b */ jal pakSetBitflag /* f110044: 24060001 */ li $a2,0x1 /* f110048: 24040010 */ li $a0,0x10 /* f11004c: 02002825 */ move $a1,$s0 -/* f110050: 0fc47b7b */ jal 0xf11edec +/* f110050: 0fc47b7b */ jal pakSetBitflag /* f110054: 24060001 */ li $a2,0x1 /* f110058: 24040011 */ li $a0,0x11 /* f11005c: 02002825 */ move $a1,$s0 -/* f110060: 0fc47b7b */ jal 0xf11edec +/* f110060: 0fc47b7b */ jal pakSetBitflag /* f110064: 24060001 */ li $a2,0x1 /* f110068: 24040012 */ li $a0,0x12 /* f11006c: 02002825 */ move $a1,$s0 -/* f110070: 0fc47b7b */ jal 0xf11edec +/* f110070: 0fc47b7b */ jal pakSetBitflag /* f110074: 24060001 */ li $a2,0x1 /* f110078: 24040013 */ li $a0,0x13 /* f11007c: 02002825 */ move $a1,$s0 -/* f110080: 0fc47b7b */ jal 0xf11edec +/* f110080: 0fc47b7b */ jal pakSetBitflag /* f110084: 24060001 */ li $a2,0x1 /* f110088: 24040014 */ li $a0,0x14 /* f11008c: 02002825 */ move $a1,$s0 -/* f110090: 0fc47b7b */ jal 0xf11edec +/* f110090: 0fc47b7b */ jal pakSetBitflag /* f110094: 00003025 */ move $a2,$zero /* f110098: 24040016 */ li $a0,0x16 /* f11009c: 02002825 */ move $a1,$s0 -/* f1100a0: 0fc47b7b */ jal 0xf11edec +/* f1100a0: 0fc47b7b */ jal pakSetBitflag /* f1100a4: 24060001 */ li $a2,0x1 /* f1100a8: 24040018 */ li $a0,0x18 /* f1100ac: 02002825 */ move $a1,$s0 -/* f1100b0: 0fc47b7b */ jal 0xf11edec +/* f1100b0: 0fc47b7b */ jal pakSetBitflag /* f1100b4: 24060001 */ li $a2,0x1 /* f1100b8: 2404001b */ li $a0,0x1b /* f1100bc: 02002825 */ move $a1,$s0 -/* f1100c0: 0fc47b7b */ jal 0xf11edec +/* f1100c0: 0fc47b7b */ jal pakSetBitflag /* f1100c4: 00003025 */ move $a2,$zero /* f1100c8: 24040021 */ li $a0,0x21 /* f1100cc: 02002825 */ move $a1,$s0 -/* f1100d0: 0fc47b7b */ jal 0xf11edec +/* f1100d0: 0fc47b7b */ jal pakSetBitflag /* f1100d4: 00003025 */ move $a2,$zero /* f1100d8: 24040019 */ li $a0,0x19 /* f1100dc: 02002825 */ move $a1,$s0 -/* f1100e0: 0fc47b7b */ jal 0xf11edec +/* f1100e0: 0fc47b7b */ jal pakSetBitflag /* f1100e4: 00003025 */ move $a2,$zero /* f1100e8: 24040007 */ li $a0,0x7 /* f1100ec: 02002825 */ move $a1,$s0 -/* f1100f0: 0fc47b7b */ jal 0xf11edec +/* f1100f0: 0fc47b7b */ jal pakSetBitflag /* f1100f4: 00003025 */ move $a2,$zero /* f1100f8: 24040008 */ li $a0,0x8 /* f1100fc: 02002825 */ move $a1,$s0 -/* f110100: 0fc47b7b */ jal 0xf11edec +/* f110100: 0fc47b7b */ jal pakSetBitflag /* f110104: 00003025 */ move $a2,$zero /* f110108: 24040006 */ li $a0,0x6 /* f11010c: 02002825 */ move $a1,$s0 -/* f110110: 0fc47b7b */ jal 0xf11edec +/* f110110: 0fc47b7b */ jal pakSetBitflag /* f110114: 00003025 */ move $a2,$zero /* f110118: 24040022 */ li $a0,0x22 /* f11011c: 02002825 */ move $a1,$s0 -/* f110120: 0fc47b7b */ jal 0xf11edec +/* f110120: 0fc47b7b */ jal pakSetBitflag /* f110124: 00003025 */ move $a2,$zero /* f110128: 24040040 */ li $a0,0x40 /* f11012c: 02002825 */ move $a1,$s0 -/* f110130: 0fc47b7b */ jal 0xf11edec +/* f110130: 0fc47b7b */ jal pakSetBitflag /* f110134: 00003025 */ move $a2,$zero /* f110138: 24040041 */ li $a0,0x41 /* f11013c: 02002825 */ move $a1,$s0 -/* f110140: 0fc47b7b */ jal 0xf11edec +/* f110140: 0fc47b7b */ jal pakSetBitflag /* f110144: 00003025 */ move $a2,$zero /* f110148: 24040042 */ li $a0,0x42 /* f11014c: 02002825 */ move $a1,$s0 -/* f110150: 0fc47b7b */ jal 0xf11edec +/* f110150: 0fc47b7b */ jal pakSetBitflag /* f110154: 00003025 */ move $a2,$zero /* f110158: 24040043 */ li $a0,0x43 /* f11015c: 02002825 */ move $a1,$s0 -/* f110160: 0fc47b7b */ jal 0xf11edec +/* f110160: 0fc47b7b */ jal pakSetBitflag /* f110164: 00003025 */ move $a2,$zero /* f110168: 2404001c */ li $a0,0x1c /* f11016c: 02002825 */ move $a1,$s0 -/* f110170: 0fc47b7b */ jal 0xf11edec +/* f110170: 0fc47b7b */ jal pakSetBitflag /* f110174: 24060001 */ li $a2,0x1 /* f110178: 2404001d */ li $a0,0x1d /* f11017c: 02002825 */ move $a1,$s0 -/* f110180: 0fc47b7b */ jal 0xf11edec +/* f110180: 0fc47b7b */ jal pakSetBitflag /* f110184: 24060001 */ li $a2,0x1 /* f110188: 2404001e */ li $a0,0x1e /* f11018c: 02002825 */ move $a1,$s0 -/* f110190: 0fc47b7b */ jal 0xf11edec +/* f110190: 0fc47b7b */ jal pakSetBitflag /* f110194: 24060001 */ li $a2,0x1 /* f110198: 2404001f */ li $a0,0x1f /* f11019c: 02002825 */ move $a1,$s0 -/* f1101a0: 0fc47b7b */ jal 0xf11edec +/* f1101a0: 0fc47b7b */ jal pakSetBitflag /* f1101a4: 24060001 */ li $a2,0x1 /* f1101a8: 96460482 */ lhu $a2,0x482($s2) /* f1101ac: 3c10800a */ lui $s0,0x800a @@ -1361,21 +1361,21 @@ glabel gamefileLoadDefaults /* f1101b8: 394b0001 */ xori $t3,$t2,0x1 /* f1101bc: 2d660001 */ sltiu $a2,$t3,0x1 /* f1101c0: 02002825 */ move $a1,$s0 -/* f1101c4: 0fc47b7b */ jal 0xf11edec +/* f1101c4: 0fc47b7b */ jal pakSetBitflag /* f1101c8: 24040044 */ li $a0,0x44 /* f1101cc: 96460482 */ lhu $a2,0x482($s2) /* f1101d0: 24040045 */ li $a0,0x45 /* f1101d4: 02002825 */ move $a1,$s0 /* f1101d8: 30cc0002 */ andi $t4,$a2,0x2 /* f1101dc: 398d0002 */ xori $t5,$t4,0x2 -/* f1101e0: 0fc47b7b */ jal 0xf11edec +/* f1101e0: 0fc47b7b */ jal pakSetBitflag /* f1101e4: 2da60001 */ sltiu $a2,$t5,0x1 /* f1101e8: 96460482 */ lhu $a2,0x482($s2) /* f1101ec: 24040046 */ li $a0,0x46 /* f1101f0: 02002825 */ move $a1,$s0 /* f1101f4: 30ce0004 */ andi $t6,$a2,0x4 /* f1101f8: 39cf0004 */ xori $t7,$t6,0x4 -/* f1101fc: 0fc47b7b */ jal 0xf11edec +/* f1101fc: 0fc47b7b */ jal pakSetBitflag /* f110200: 2de60001 */ sltiu $a2,$t7,0x1 /* f110204: 8fa40028 */ lw $a0,0x28($sp) /* f110208: 00009025 */ move $s2,$zero @@ -1400,7 +1400,7 @@ glabel gamefileLoadDefaults /* f110248: 02402025 */ move $a0,$s2 .PB0f11024c: /* f11024c: 02002825 */ move $a1,$s0 -/* f110250: 0fc67829 */ jal 0xf19e0a4 +/* f110250: 0fc67829 */ jal mpSetChallengeCompletedByAnyPlayerWithNumPlayers /* f110254: 00003025 */ move $a2,$zero /* f110258: 26100001 */ addiu $s0,$s0,0x1 /* f11025c: 5611fffb */ bnel $s0,$s1,.PB0f11024c @@ -1409,7 +1409,7 @@ glabel gamefileLoadDefaults /* f110268: 2a41001e */ slti $at,$s2,0x1e /* f11026c: 5420fff6 */ bnezl $at,.PB0f110248 /* f110270: 24100001 */ li $s0,0x1 -/* f110274: 0fc67317 */ jal 0xf19cc5c +/* f110274: 0fc67317 */ jal mpDetermineUnlockedFeatures /* f110278: 00000000 */ nop /* f11027c: 3c02800a */ lui $v0,0x800a /* f110280: 3c03800a */ lui $v1,0x800a @@ -1437,7 +1437,7 @@ glabel gamefileLoadDefaults /* f1102cc: 24420001 */ addiu $v0,$v0,0x1 /* f1102d0: 1443fffe */ bne $v0,$v1,.PB0f1102cc /* f1102d4: a04000b4 */ sb $zero,0xb4($v0) -/* f1102d8: 0fc43e55 */ jal 0xf10f954 +/* f1102d8: 0fc43e55 */ jal gamefileApplyOptions /* f1102dc: 8fa40028 */ lw $a0,0x28($sp) /* f1102e0: 8fbf0024 */ lw $ra,0x24($sp) /* f1102e4: 8fb00018 */ lw $s0,0x18($sp) diff --git a/src/game/hudmsg.c b/src/game/hudmsg.c index 205a35859..44613e7b8 100644 --- a/src/game/hudmsg.c +++ b/src/game/hudmsg.c @@ -2431,7 +2431,7 @@ glabel var7f1af1cc /* f0dffb0: f7b40038 */ sdc1 $f20,0x38($sp) /* f0dffb4: afae00e0 */ sw $t6,0xe0($sp) /* f0dffb8: afaf00dc */ sw $t7,0xdc($sp) -/* f0dffbc: 0fc5528f */ jal 0xf154a3c +/* f0dffbc: 0fc5528f */ jal func0f153628 /* f0dffc0: ac381f90 */ sw $t8,0x1f90($at) /* f0dffc4: 3c19800a */ lui $t9,0x800a /* f0dffc8: 8f39e768 */ lw $t9,-0x1898($t9) @@ -2526,7 +2526,7 @@ glabel var7f1af1cc /* f0e0108: 3c014270 */ lui $at,0x4270 /* f0e010c: 44819000 */ mtc1 $at,$f18 /* f0e0110: 460a3402 */ mul.s $f16,$f6,$f10 -/* f0e0114: 0c006b8b */ jal 0x1ae2c +/* f0e0114: 0c006b8b */ jal sinf /* f0e0118: 46128303 */ div.s $f12,$f16,$f18 /* f0e011c: 44802000 */ mtc1 $zero,$f4 /* f0e0120: 3c014340 */ lui $at,0x4340 @@ -2593,11 +2593,11 @@ glabel var7f1af1cc /* f0e01fc: 8e0e01b4 */ lw $t6,0x1b4($s0) /* f0e0200: 55c10011 */ bnel $t6,$at,.PB0f0e0248 /* f0e0204: 8e0901b4 */ lw $t1,0x1b4($s0) -/* f0e0208: 0fc30711 */ jal 0xf0c1c44 +/* f0e0208: 0fc30711 */ jal playerIsHealthVisible /* f0e020c: 00000000 */ nop /* f0e0210: 5040000d */ beqzl $v0,.PB0f0e0248 /* f0e0214: 8e0901b4 */ lw $t1,0x1b4($s0) -/* f0e0218: 0fc306db */ jal 0xf0c1b6c +/* f0e0218: 0fc306db */ jal playerGetHealthBarHeightFrac /* f0e021c: 00000000 */ nop /* f0e0220: 3c014180 */ lui $at,0x4180 /* f0e0224: 44818000 */ mtc1 $at,$f16 @@ -2632,7 +2632,7 @@ glabel var7f1af1cc /* f0e0294: 330f0fff */ andi $t7,$t8,0xfff /* f0e0298: 000fcb00 */ sll $t9,$t7,0xc /* f0e029c: 03214025 */ or $t0,$t9,$at -/* f0e02a0: 0c002e40 */ jal 0xb900 +/* f0e02a0: 0c002e40 */ jal viGetBufHeight /* f0e02a4: ae280000 */ sw $t0,0x0($s1) /* f0e02a8: 8fa900e8 */ lw $t1,0xe8($sp) /* f0e02ac: 960b001c */ lhu $t3,0x1c($s0) @@ -2701,7 +2701,7 @@ glabel var7f1af1cc /* f0e039c: 00005012 */ mflo $t2 /* f0e03a0: 016a4021 */ addu $t0,$t3,$t2 /* f0e03a4: 44884000 */ mtc1 $t0,$f8 -/* f0e03a8: 0c012ae4 */ jal 0x4ab90 +/* f0e03a8: 0c012ae4 */ jal sqrtf /* f0e03ac: 46804320 */ cvt.s.w $f12,$f8 /* f0e03b0: 3c014304 */ lui $at,0x4304 /* f0e03b4: 44813000 */ mtc1 $at,$f6 @@ -2742,7 +2742,7 @@ glabel var7f1af1cc /* f0e0434: 44801000 */ mtc1 $zero,$f2 /* f0e0438: 00000000 */ nop .PB0f0e043c: -/* f0e043c: 0fc5540d */ jal 0xf155034 +/* f0e043c: 0fc5540d */ jal func0f153c20 /* f0e0440: e7a200c0 */ swc1 $f2,0xc0($sp) /* f0e0444: 920d0001 */ lbu $t5,0x1($s0) /* f0e0448: c7a200c0 */ lwc1 $f2,0xc0($sp) @@ -2763,13 +2763,13 @@ glabel var7f1af1cc /* f0e0484: e7b40014 */ swc1 $f20,0x14($sp) /* f0e0488: 02402025 */ move $a0,$s2 /* f0e048c: 2706fffd */ addiu $a2,$t8,-3 -/* f0e0490: 0fc37736 */ jal 0xf0ddcd8 +/* f0e0490: 0fc37736 */ jal hudmsgRenderBox /* f0e0494: 25c5fffd */ addiu $a1,$t6,-3 -/* f0e0498: 0c002e4d */ jal 0xb934 +/* f0e0498: 0c002e4d */ jal viGetWidth /* f0e049c: 00409025 */ move $s2,$v0 /* f0e04a0: 00028c00 */ sll $s1,$v0,0x10 /* f0e04a4: 00115403 */ sra $t2,$s1,0x10 -/* f0e04a8: 0c002e51 */ jal 0xb944 +/* f0e04a8: 0c002e51 */ jal viGetHeight /* f0e04ac: 01408825 */ move $s1,$t2 /* f0e04b0: 8e080008 */ lw $t0,0x8($s0) /* f0e04b4: 02402025 */ move $a0,$s2 @@ -2783,7 +2783,7 @@ glabel var7f1af1cc /* f0e04d4: afb30018 */ sw $s3,0x18($sp) /* f0e04d8: 02e03025 */ move $a2,$s7 /* f0e04dc: 26070020 */ addiu $a3,$s0,0x20 -/* f0e04e0: 0fc55e10 */ jal 0xf157840 +/* f0e04e0: 0fc55e10 */ jal textRenderProjected /* f0e04e4: afac0014 */ sw $t4,0x14($sp) /* f0e04e8: 1000001f */ b .PB0f0e0568 /* f0e04ec: 00409025 */ move $s2,$v0 @@ -2794,13 +2794,13 @@ glabel var7f1af1cc /* f0e04fc: afa00014 */ sw $zero,0x14($sp) /* f0e0500: 0326c021 */ addu $t8,$t9,$a2 /* f0e0504: afb80010 */ sw $t8,0x10($sp) -/* f0e0508: 0fc55392 */ jal 0xf154e48 +/* f0e0508: 0fc55392 */ jal func0f153a34 /* f0e050c: 01c53821 */ addu $a3,$t6,$a1 -/* f0e0510: 0c002e4d */ jal 0xb934 +/* f0e0510: 0c002e4d */ jal viGetWidth /* f0e0514: 00409025 */ move $s2,$v0 /* f0e0518: 00028c00 */ sll $s1,$v0,0x10 /* f0e051c: 00114c03 */ sra $t1,$s1,0x10 -/* f0e0520: 0c002e51 */ jal 0xb944 +/* f0e0520: 0c002e51 */ jal viGetHeight /* f0e0524: 01208825 */ move $s1,$t1 /* f0e0528: 8e0b0008 */ lw $t3,0x8($s0) /* f0e052c: 02402025 */ move $a0,$s2 @@ -2815,7 +2815,7 @@ glabel var7f1af1cc /* f0e0550: afb30018 */ sw $s3,0x18($sp) /* f0e0554: 02e03025 */ move $a2,$s7 /* f0e0558: 26070020 */ addiu $a3,$s0,0x20 -/* f0e055c: 0fc56160 */ jal 0xf158580 +/* f0e055c: 0fc56160 */ jal textRender /* f0e0560: afaa0014 */ sw $t2,0x14($sp) /* f0e0564: 00409025 */ move $s2,$v0 .PB0f0e0568: @@ -2825,7 +2825,7 @@ glabel var7f1af1cc /* f0e0574: 00000000 */ nop /* f0e0578: afa000e0 */ sw $zero,0xe0($sp) .PB0f0e057c: -/* f0e057c: 0fc55498 */ jal 0xf155260 +/* f0e057c: 0fc55498 */ jal func0f153e4c /* f0e0580: 00000000 */ nop /* f0e0584: 100000fe */ b .PB0f0e0980 /* f0e0588: 8e0801b4 */ lw $t0,0x1b4($s0) @@ -2866,13 +2866,13 @@ glabel var7f1af1cc /* f0e060c: afa30018 */ sw $v1,0x18($sp) /* f0e0610: e7b40014 */ swc1 $f20,0x14($sp) /* f0e0614: 02402025 */ move $a0,$s2 -/* f0e0618: 0fc37736 */ jal 0xf0ddcd8 +/* f0e0618: 0fc37736 */ jal hudmsgRenderBox /* f0e061c: 2566fffd */ addiu $a2,$t3,-3 -/* f0e0620: 0c002e4d */ jal 0xb934 +/* f0e0620: 0c002e4d */ jal viGetWidth /* f0e0624: 00409025 */ move $s2,$v0 /* f0e0628: 00028c00 */ sll $s1,$v0,0x10 /* f0e062c: 00116c03 */ sra $t5,$s1,0x10 -/* f0e0630: 0c002e51 */ jal 0xb944 +/* f0e0630: 0c002e51 */ jal viGetHeight /* f0e0634: 01a08825 */ move $s1,$t5 /* f0e0638: 8e190008 */ lw $t9,0x8($s0) /* f0e063c: 02402025 */ move $a0,$s2 @@ -2886,7 +2886,7 @@ glabel var7f1af1cc /* f0e065c: afb30018 */ sw $s3,0x18($sp) /* f0e0660: 02e03025 */ move $a2,$s7 /* f0e0664: 26070020 */ addiu $a3,$s0,0x20 -/* f0e0668: 0fc55e10 */ jal 0xf157840 +/* f0e0668: 0fc55e10 */ jal textRenderProjected /* f0e066c: afaf0014 */ sw $t7,0x14($sp) /* f0e0670: 10000021 */ b .PB0f0e06f8 /* f0e0674: 00409025 */ move $s2,$v0 @@ -2899,13 +2899,13 @@ glabel var7f1af1cc /* f0e068c: afab0010 */ sw $t3,0x10($sp) /* f0e0690: afa00014 */ sw $zero,0x14($sp) /* f0e0694: 02402025 */ move $a0,$s2 -/* f0e0698: 0fc55392 */ jal 0xf154e48 +/* f0e0698: 0fc55392 */ jal func0f153a34 /* f0e069c: 01253821 */ addu $a3,$t1,$a1 -/* f0e06a0: 0c002e4d */ jal 0xb934 +/* f0e06a0: 0c002e4d */ jal viGetWidth /* f0e06a4: 00409025 */ move $s2,$v0 /* f0e06a8: 00028c00 */ sll $s1,$v0,0x10 /* f0e06ac: 00116403 */ sra $t4,$s1,0x10 -/* f0e06b0: 0c002e51 */ jal 0xb944 +/* f0e06b0: 0c002e51 */ jal viGetHeight /* f0e06b4: 01808825 */ move $s1,$t4 /* f0e06b8: 8e0e0008 */ lw $t6,0x8($s0) /* f0e06bc: 02402025 */ move $a0,$s2 @@ -2920,7 +2920,7 @@ glabel var7f1af1cc /* f0e06e0: afb30018 */ sw $s3,0x18($sp) /* f0e06e4: 02e03025 */ move $a2,$s7 /* f0e06e8: 26070020 */ addiu $a3,$s0,0x20 -/* f0e06ec: 0fc56160 */ jal 0xf158580 +/* f0e06ec: 0fc56160 */ jal textRender /* f0e06f0: afad0014 */ sw $t5,0x14($sp) /* f0e06f4: 00409025 */ move $s2,$v0 .PB0f0e06f8: @@ -2940,7 +2940,7 @@ glabel var7f1af1cc /* f0e072c: 00004812 */ mflo $t1 /* f0e0730: 01e9c021 */ addu $t8,$t7,$t1 /* f0e0734: 44984000 */ mtc1 $t8,$f8 -/* f0e0738: 0c012ae4 */ jal 0x4ab90 +/* f0e0738: 0c012ae4 */ jal sqrtf /* f0e073c: 46804320 */ cvt.s.w $f12,$f8 /* f0e0740: 3c0142b8 */ lui $at,0x42b8 /* f0e0744: 44813000 */ mtc1 $at,$f6 @@ -2987,7 +2987,7 @@ glabel var7f1af1cc /* f0e07dc: 032f2021 */ addu $a0,$t9,$t7 /* f0e07e0: 01382821 */ addu $a1,$t1,$t8 /* f0e07e4: 44060000 */ mfc1 $a2,$f0 -/* f0e07e8: 0fc5540d */ jal 0xf155034 +/* f0e07e8: 0fc5540d */ jal func0f153c20 /* f0e07ec: 00000000 */ nop /* f0e07f0: c7a200a8 */ lwc1 $f2,0xa8($sp) /* f0e07f4: 3c014f80 */ lui $at,0x4f80 @@ -3031,13 +3031,13 @@ glabel var7f1af1cc /* f0e0880: e7b40014 */ swc1 $f20,0x14($sp) /* f0e0884: 02402025 */ move $a0,$s2 /* f0e0888: 2565fffd */ addiu $a1,$t3,-3 -/* f0e088c: 0fc37736 */ jal 0xf0ddcd8 +/* f0e088c: 0fc37736 */ jal hudmsgRenderBox /* f0e0890: 2586fffd */ addiu $a2,$t4,-3 -/* f0e0894: 0c002e4d */ jal 0xb934 +/* f0e0894: 0c002e4d */ jal viGetWidth /* f0e0898: 00409025 */ move $s2,$v0 /* f0e089c: 00028c00 */ sll $s1,$v0,0x10 /* f0e08a0: 00114c03 */ sra $t1,$s1,0x10 -/* f0e08a4: 0c002e51 */ jal 0xb944 +/* f0e08a4: 0c002e51 */ jal viGetHeight /* f0e08a8: 01208825 */ move $s1,$t1 /* f0e08ac: 8e180008 */ lw $t8,0x8($s0) /* f0e08b0: 02402025 */ move $a0,$s2 @@ -3051,7 +3051,7 @@ glabel var7f1af1cc /* f0e08d0: afb30018 */ sw $s3,0x18($sp) /* f0e08d4: 02e03025 */ move $a2,$s7 /* f0e08d8: 26070020 */ addiu $a3,$s0,0x20 -/* f0e08dc: 0fc55e10 */ jal 0xf157840 +/* f0e08dc: 0fc55e10 */ jal textRenderProjected /* f0e08e0: afa80014 */ sw $t0,0x14($sp) /* f0e08e4: 1000001e */ b .PB0f0e0960 /* f0e08e8: 00409025 */ move $s2,$v0 @@ -3061,13 +3061,13 @@ glabel var7f1af1cc /* f0e08f4: afa00014 */ sw $zero,0x14($sp) /* f0e08f8: 01a66021 */ addu $t4,$t5,$a2 /* f0e08fc: afac0010 */ sw $t4,0x10($sp) -/* f0e0900: 0fc55392 */ jal 0xf154e48 +/* f0e0900: 0fc55392 */ jal func0f153a34 /* f0e0904: 01653821 */ addu $a3,$t3,$a1 -/* f0e0908: 0c002e4d */ jal 0xb934 +/* f0e0908: 0c002e4d */ jal viGetWidth /* f0e090c: 00409025 */ move $s2,$v0 /* f0e0910: 00028c00 */ sll $s1,$v0,0x10 /* f0e0914: 0011cc03 */ sra $t9,$s1,0x10 -/* f0e0918: 0c002e51 */ jal 0xb944 +/* f0e0918: 0c002e51 */ jal viGetHeight /* f0e091c: 03208825 */ move $s1,$t9 /* f0e0920: 8e0f0008 */ lw $t7,0x8($s0) /* f0e0924: 02402025 */ move $a0,$s2 @@ -3082,7 +3082,7 @@ glabel var7f1af1cc /* f0e0948: afb30018 */ sw $s3,0x18($sp) /* f0e094c: 02e03025 */ move $a2,$s7 /* f0e0950: 26070020 */ addiu $a3,$s0,0x20 -/* f0e0954: 0fc56160 */ jal 0xf158580 +/* f0e0954: 0fc56160 */ jal textRender /* f0e0958: afa90014 */ sw $t1,0x14($sp) /* f0e095c: 00409025 */ move $s2,$v0 .PB0f0e0960: @@ -3092,7 +3092,7 @@ glabel var7f1af1cc /* f0e096c: 00000000 */ nop /* f0e0970: afa000e0 */ sw $zero,0xe0($sp) .PB0f0e0974: -/* f0e0974: 0fc55498 */ jal 0xf155260 +/* f0e0974: 0fc55498 */ jal func0f153e4c /* f0e0978: 00000000 */ nop .PB0f0e097c: /* f0e097c: 8e0801b4 */ lw $t0,0x1b4($s0) @@ -3101,12 +3101,12 @@ glabel var7f1af1cc /* f0e0984: 15010039 */ bne $t0,$at,.PB0f0e0a6c /* f0e0988: 00000000 */ nop /* f0e098c: afb2009c */ sw $s2,0x9c($sp) -/* f0e0990: 0c002e8b */ jal 0xba2c +/* f0e0990: 0c002e8b */ jal viGetViewLeft /* f0e0994: 26520008 */ addiu $s2,$s2,0x8 /* f0e0998: 00028400 */ sll $s0,$v0,0x10 /* f0e099c: 00105c03 */ sra $t3,$s0,0x10 /* f0e09a0: 01608025 */ move $s0,$t3 -/* f0e09a4: 0c002e8f */ jal 0xba3c +/* f0e09a4: 0c002e8f */ jal viGetViewTop /* f0e09a8: 8fb3009c */ lw $s3,0x9c($sp) /* f0e09ac: 44829000 */ mtc1 $v0,$f18 /* f0e09b0: 44905000 */ mtc1 $s0,$f10 @@ -3125,17 +3125,17 @@ glabel var7f1af1cc /* f0e09e4: 31e90fff */ andi $t1,$t7,0xfff /* f0e09e8: 0009c300 */ sll $t8,$t1,0xc /* f0e09ec: 01984025 */ or $t0,$t4,$t8 -/* f0e09f0: 0c002e6d */ jal 0xb9b4 +/* f0e09f0: 0c002e6d */ jal viGetViewWidth /* f0e09f4: ae680000 */ sw $t0,0x0($s3) -/* f0e09f8: 0c002e8b */ jal 0xba2c +/* f0e09f8: 0c002e8b */ jal viGetViewLeft /* f0e09fc: a7a20092 */ sh $v0,0x92($sp) /* f0e0a00: 00028c00 */ sll $s1,$v0,0x10 /* f0e0a04: 00115c03 */ sra $t3,$s1,0x10 -/* f0e0a08: 0c002e8f */ jal 0xba3c +/* f0e0a08: 0c002e8f */ jal viGetViewTop /* f0e0a0c: 01608825 */ move $s1,$t3 /* f0e0a10: 00028400 */ sll $s0,$v0,0x10 /* f0e0a14: 00105403 */ sra $t2,$s0,0x10 -/* f0e0a18: 0c002e71 */ jal 0xb9c4 +/* f0e0a18: 0c002e71 */ jal viGetViewHeight /* f0e0a1c: 01408025 */ move $s0,$t2 /* f0e0a20: 87a90092 */ lh $t1,0x92($sp) /* f0e0a24: 00506821 */ addu $t5,$v0,$s0 @@ -3176,7 +3176,7 @@ glabel var7f1af1cc /* f0e0aa4: 11200028 */ beqz $t1,.PB0f0e0b48 /* f0e0aa8: 00000000 */ nop /* f0e0aac: 8d8ce758 */ lw $t4,-0x18a8($t4) -/* f0e0ab0: 0fc54f26 */ jal 0xf153c98 +/* f0e0ab0: 0fc54f26 */ jal optionsGetShowMissionTime /* f0e0ab4: 8d840070 */ lw $a0,0x70($t4) /* f0e0ab8: 10400019 */ beqz $v0,.PB0f0e0b20 /* f0e0abc: 3c188007 */ lui $t8,0x8007 @@ -3201,23 +3201,23 @@ glabel var7f1af1cc /* f0e0b08: 00000000 */ nop /* f0e0b0c: 10410004 */ beq $v0,$at,.PB0f0e0b20 /* f0e0b10: 02402025 */ move $a0,$s2 -/* f0e0b14: 0fc374e1 */ jal 0xf0dd384 +/* f0e0b14: 0fc374e1 */ jal hudmsgRenderMissionTimer /* f0e0b18: 8fa500e0 */ lw $a1,0xe0($sp) /* f0e0b1c: 00409025 */ move $s2,$v0 .PB0f0e0b20: -/* f0e0b20: 0fc37493 */ jal 0xf0dd24c +/* f0e0b20: 0fc37493 */ jal hudmsgIsZoomRangeVisible /* f0e0b24: 00000000 */ nop /* f0e0b28: 10400004 */ beqz $v0,.PB0f0e0b3c /* f0e0b2c: 02402025 */ move $a0,$s2 -/* f0e0b30: 0fc375cf */ jal 0xf0dd73c +/* f0e0b30: 0fc375cf */ jal hudmsgRenderZoomRange /* f0e0b34: 8fa500e0 */ lw $a1,0xe0($sp) /* f0e0b38: 00409025 */ move $s2,$v0 .PB0f0e0b3c: -/* f0e0b3c: 0fc241cd */ jal 0xf090734 +/* f0e0b3c: 0fc241cd */ jal countdownTimerRender /* f0e0b40: 02402025 */ move $a0,$s2 /* f0e0b44: 00409025 */ move $s2,$v0 .PB0f0e0b48: -/* f0e0b48: 0fc552e5 */ jal 0xf154b94 +/* f0e0b48: 0fc552e5 */ jal func0f153780 /* f0e0b4c: 02402025 */ move $a0,$s2 /* f0e0b50: 8fbf007c */ lw $ra,0x7c($sp) /* f0e0b54: 240a0001 */ li $t2,0x1 diff --git a/src/game/lang.c b/src/game/lang.c index 2d8c32ed9..375e72955 100644 --- a/src/game/lang.c +++ b/src/game/lang.c @@ -465,9 +465,9 @@ GLOBAL_ASM( glabel langSetBankSimple /* f170078: 27bdffe0 */ addiu $sp,$sp,-32 /* f17007c: afbf0014 */ sw $ra,0x14($sp) -/* f170080: 0fc5c011 */ jal 0xf170044 +/* f170080: 0fc5c011 */ jal langGetFileId /* f170084: afa40020 */ sw $a0,0x20($sp) -/* f170088: 0fc5a1b1 */ jal 0xf1686c4 +/* f170088: 0fc5a1b1 */ jal fileGetInflatedLength /* f17008c: 00402025 */ move $a0,$v0 /* f170090: 3c038008 */ lui $v1,0x8008 /* f170094: 8c6365f4 */ lw $v1,0x65f4($v1) @@ -489,13 +489,13 @@ glabel langSetBankSimple .PB0f1700d4: /* f1700d4: 00084940 */ sll $t1,$t0,0x5 /* f1700d8: afa90018 */ sw $t1,0x18($sp) -/* f1700dc: 0fc5c011 */ jal 0xf170044 +/* f1700dc: 0fc5c011 */ jal langGetFileId /* f1700e0: 8fa40020 */ lw $a0,0x20($sp) /* f1700e4: 3c068008 */ lui $a2,0x8008 /* f1700e8: 8cc665f8 */ lw $a2,0x65f8($a2) /* f1700ec: 8fa70018 */ lw $a3,0x18($sp) /* f1700f0: 00402025 */ move $a0,$v0 -/* f1700f4: 0fc5a21c */ jal 0xf168870 +/* f1700f4: 0fc5a21c */ jal func0f167200 /* f1700f8: 24050022 */ li $a1,0x22 /* f1700fc: 8faa0020 */ lw $t2,0x20($sp) /* f170100: 3c0c8008 */ lui $t4,0x8008 @@ -505,7 +505,7 @@ glabel langSetBankSimple /* f170110: 000a5880 */ sll $t3,$t2,0x2 /* f170114: 002b0821 */ addu $at,$at,$t3 /* f170118: ac22f0c0 */ sw $v0,-0xf40($at) -/* f17011c: 0fc5e23c */ jal 0xf1788f0 +/* f17011c: 0fc5e23c */ jal align32 /* f170120: 018d2021 */ addu $a0,$t4,$t5 /* f170124: 3c018008 */ lui $at,0x8008 /* f170128: 10000003 */ b .PB0f170138 @@ -607,7 +607,7 @@ glabel func0f16f6ecpf /* f1701f8: afb20020 */ sw $s2,0x20($sp) /* f1701fc: afb1001c */ sw $s1,0x1c($sp) /* f170200: afb00018 */ sw $s0,0x18($sp) -/* f170204: 0fc5e23c */ jal 0xf1788f0 +/* f170204: 0fc5e23c */ jal align32 /* f170208: 8c8465f4 */ lw $a0,0x65f4($a0) /* f17020c: 3c018008 */ lui $at,0x8008 /* f170210: 3c11800b */ lui $s1,0x800b @@ -619,7 +619,7 @@ glabel func0f16f6ecpf /* f170224: 8e2e0000 */ lw $t6,0x0($s1) /* f170228: 51c00004 */ beqzl $t6,.PB0f17023c /* f17022c: 26100001 */ addiu $s0,$s0,0x1 -/* f170230: 0fc5c01e */ jal 0xf170078 +/* f170230: 0fc5c01e */ jal langSetBankSimple /* f170234: 02002025 */ move $a0,$s0 /* f170238: 26100001 */ addiu $s0,$s0,0x1 .PB0f17023c: @@ -734,7 +734,7 @@ glabel var7f1b9080pf .PB0f17027c: /* f17027c: 10400004 */ beqz $v0,.PB0f170290 /* f170280: 27a4001f */ addiu $a0,$sp,0x1f -/* f170284: 0fc6277f */ jal 0xf189dfc +/* f170284: 0fc6277f */ jal mpGetTeamsWithDefaultName /* f170288: afa20018 */ sw $v0,0x18($sp) /* f17028c: 8fa20018 */ lw $v0,0x18($sp) .PB0f170290: @@ -770,12 +770,12 @@ glabel var7f1b9080pf /* f170304: 3c018008 */ lui $at,0x8008 /* f170308: ac2a6600 */ sw $t2,0x6600($at) .PB0f17030c: -/* f17030c: 0fc5c07b */ jal 0xf1701ec +/* f17030c: 0fc5c07b */ jal func0f16f6ecpf /* f170310: afa20018 */ sw $v0,0x18($sp) /* f170314: 8fa20018 */ lw $v0,0x18($sp) /* f170318: 50400004 */ beqzl $v0,.PB0f17032c /* f17031c: 8fbf0014 */ lw $ra,0x14($sp) -/* f170320: 0fc627a1 */ jal 0xf189e84 +/* f170320: 0fc627a1 */ jal mpSetTeamNamesToDefault /* f170324: 93a4001f */ lbu $a0,0x1f($sp) /* f170328: 8fbf0014 */ lw $ra,0x14($sp) .PB0f17032c: diff --git a/src/game/mainmenu.c b/src/game/mainmenu.c index 1af1a433e..3a42d5f9d 100644 --- a/src/game/mainmenu.c +++ b/src/game/mainmenu.c @@ -370,7 +370,7 @@ glabel func0f1030e4pf /* f102eb4: 8cc90000 */ lw $t1,0x0($a2) /* f102eb8: 00095040 */ sll $t2,$t1,0x1 /* f102ebc: 004a5821 */ addu $t3,$v0,$t2 -/* f102ec0: 0fc5c06a */ jal 0xf1701a8 +/* f102ec0: 0fc5c06a */ jal langGet /* f102ec4: 95640000 */ lhu $a0,0x0($t3) /* f102ec8: 10000015 */ b .PB0f102f20 /* f102ecc: 8fbf0014 */ lw $ra,0x14($sp) @@ -379,7 +379,7 @@ glabel func0f1030e4pf /* f102ed4: 3c02800a */ lui $v0,0x800a /* f102ed8: 2442e4d0 */ addiu $v0,$v0,-6960 /* f102edc: a44c0482 */ sh $t4,0x482($v0) -/* f102ee0: 0fc5c097 */ jal 0xf17025c +/* f102ee0: 0fc5c097 */ jal func0f16f75c /* f102ee4: 3184ffff */ andi $a0,$t4,0xffff /* f102ee8: 3c02800a */ lui $v0,0x800a /* f102eec: 2442e4d0 */ addiu $v0,$v0,-6960 @@ -1709,7 +1709,7 @@ glabel getMaxAiBuddies /* f10475c: 00000000 */ nop /* f104760: 24080001 */ li $t0,0x1 .PB0f104764: -/* f104764: 0fc48109 */ jal 0xf120424 +/* f104764: 0fc48109 */ jal debugIsAllBuddiesEnabled /* f104768: afa8001c */ sw $t0,0x1c($sp) /* f10476c: 10400002 */ beqz $v0,.PB0f104778 /* f104770: 8fa8001c */ lw $t0,0x1c($sp) diff --git a/src/game/menu.c b/src/game/menu.c index 2828a06c7..b2cb1e448 100644 --- a/src/game/menu.c +++ b/src/game/menu.c @@ -710,7 +710,7 @@ glabel menuRenderBanner /* f0f12d0: afa20040 */ sw $v0,0x40($sp) /* f0f12d4: afb90084 */ sw $t9,0x84($sp) /* f0f12d8: afa30064 */ sw $v1,0x64($sp) -/* f0f12dc: 0fc5c06a */ jal 0xf1701a8 +/* f0f12dc: 0fc5c06a */ jal langGet /* f0f12e0: afa80060 */ sw $t0,0x60($sp) /* f0f12e4: 8fac0060 */ lw $t4,0x60($sp) /* f0f12e8: 27a4007c */ addiu $a0,$sp,0x7c @@ -718,9 +718,9 @@ glabel menuRenderBanner /* f0f12f0: 00403025 */ move $a2,$v0 /* f0f12f4: 8fa70064 */ lw $a3,0x64($sp) /* f0f12f8: afa00014 */ sw $zero,0x14($sp) -/* f0f12fc: 0fc5625a */ jal 0xf158968 +/* f0f12fc: 0fc5625a */ jal textMeasure /* f0f1300: afac0010 */ sw $t4,0x10($sp) -/* f0f1304: 0fc5c06a */ jal 0xf1701a8 +/* f0f1304: 0fc5c06a */ jal langGet /* f0f1308: 240451ef */ li $a0,0x51ef /* f0f130c: 8fad0060 */ lw $t5,0x60($sp) /* f0f1310: 27a40074 */ addiu $a0,$sp,0x74 @@ -728,7 +728,7 @@ glabel menuRenderBanner /* f0f1318: 00403025 */ move $a2,$v0 /* f0f131c: 8fa70064 */ lw $a3,0x64($sp) /* f0f1320: afa00014 */ sw $zero,0x14($sp) -/* f0f1324: 0fc5625a */ jal 0xf158968 +/* f0f1324: 0fc5625a */ jal textMeasure /* f0f1328: afad0010 */ sw $t5,0x10($sp) /* f0f132c: 8fae0040 */ lw $t6,0x40($sp) /* f0f1330: 240151eb */ li $at,0x51eb @@ -758,7 +758,7 @@ glabel menuRenderBanner /* f0f1388: afa60080 */ sw $a2,0x80($sp) /* f0f138c: afab006c */ sw $t3,0x6c($sp) /* f0f1390: afae0068 */ sw $t6,0x68($sp) -/* f0f1394: 0fc552fc */ jal 0xf154bf0 +/* f0f1394: 0fc552fc */ jal gfxSetPrimColour /* f0f1398: afa60084 */ sw $a2,0x84($sp) /* f0f139c: 3c038008 */ lui $v1,0x8008 /* f0f13a0: 24631f90 */ addiu $v1,$v1,0x1f90 @@ -787,10 +787,10 @@ glabel menuRenderBanner /* f0f13fc: 312a03ff */ andi $t2,$t1,0x3ff /* f0f1400: 000a6380 */ sll $t4,$t2,0xe /* f0f1404: 018e7825 */ or $t7,$t4,$t6 -/* f0f1408: 0fc55313 */ jal 0xf154c4c +/* f0f1408: 0fc55313 */ jal func0f153838 /* f0f140c: ac4f0004 */ sw $t7,0x4($v0) /* f0f1410: 00402025 */ move $a0,$v0 -/* f0f1414: 0fc552fc */ jal 0xf154bf0 +/* f0f1414: 0fc552fc */ jal gfxSetPrimColour /* f0f1418: 24057f7f */ li $a1,0x7f7f /* f0f141c: 3c038008 */ lui $v1,0x8008 /* f0f1420: 24631f90 */ addiu $v1,$v1,0x1f90 @@ -816,11 +816,11 @@ glabel menuRenderBanner /* f0f1470: 314d03ff */ andi $t5,$t2,0x3ff /* f0f1474: 000d6380 */ sll $t4,$t5,0xe /* f0f1478: 018b7825 */ or $t7,$t4,$t3 -/* f0f147c: 0fc55313 */ jal 0xf154c4c +/* f0f147c: 0fc55313 */ jal func0f153838 /* f0f1480: ac4f0004 */ sw $t7,0x4($v0) /* f0f1484: 3c057f7f */ lui $a1,0x7f7f /* f0f1488: 34a5ff7f */ ori $a1,$a1,0xff7f -/* f0f148c: 0fc552fc */ jal 0xf154bf0 +/* f0f148c: 0fc552fc */ jal gfxSetPrimColour /* f0f1490: 00402025 */ move $a0,$v0 /* f0f1494: 3c038008 */ lui $v1,0x8008 /* f0f1498: 24631f90 */ addiu $v1,$v1,0x1f90 @@ -872,9 +872,9 @@ glabel menuRenderBanner /* f0f1550: 31ee03ff */ andi $t6,$t7,0x3ff /* f0f1554: 000e5b80 */ sll $t3,$t6,0xe /* f0f1558: 01695025 */ or $t2,$t3,$t1 -/* f0f155c: 0fc55313 */ jal 0xf154c4c +/* f0f155c: 0fc55313 */ jal func0f153838 /* f0f1560: ac4a000c */ sw $t2,0xc($v0) -/* f0f1564: 0fc5528f */ jal 0xf154a3c +/* f0f1564: 0fc5528f */ jal func0f153628 /* f0f1568: 00402025 */ move $a0,$v0 /* f0f156c: 8fad0094 */ lw $t5,0x94($sp) /* f0f1570: 8fac00ac */ lw $t4,0xac($sp) @@ -904,13 +904,13 @@ glabel menuRenderBanner /* f0f15c8: 24c60002 */ addiu $a2,$a2,0x2 /* f0f15cc: 95e40000 */ lhu $a0,0x0($t7) /* f0f15d0: afa60084 */ sw $a2,0x84($sp) -/* f0f15d4: 0fc5c06a */ jal 0xf1701a8 +/* f0f15d4: 0fc5c06a */ jal langGet /* f0f15d8: afa30044 */ sw $v1,0x44($sp) -/* f0f15dc: 0c002e4d */ jal 0xb934 +/* f0f15dc: 0c002e4d */ jal viGetWidth /* f0f15e0: afa2004c */ sw $v0,0x4c($sp) /* f0f15e4: 00028400 */ sll $s0,$v0,0x10 /* f0f15e8: 00107403 */ sra $t6,$s0,0x10 -/* f0f15ec: 0c002e4d */ jal 0xb934 +/* f0f15ec: 0c002e4d */ jal viGetWidth /* f0f15f0: 01c08025 */ move $s0,$t6 /* f0f15f4: 8fb90064 */ lw $t9,0x64($sp) /* f0f15f8: 8fb80060 */ lw $t8,0x60($sp) @@ -925,7 +925,7 @@ glabel menuRenderBanner /* f0f161c: afa00024 */ sw $zero,0x24($sp) /* f0f1620: afa00028 */ sw $zero,0x28($sp) /* f0f1624: afb90010 */ sw $t9,0x10($sp) -/* f0f1628: 0fc55e10 */ jal 0xf157840 +/* f0f1628: 0fc55e10 */ jal textRenderProjected /* f0f162c: afb80014 */ sw $t8,0x14($sp) /* f0f1630: 8faa0070 */ lw $t2,0x70($sp) /* f0f1634: 8fa90044 */ lw $t1,0x44($sp) @@ -941,13 +941,13 @@ glabel menuRenderBanner /* f0f1658: 24c60003 */ addiu $a2,$a2,0x3 /* f0f165c: afaf0088 */ sw $t7,0x88($sp) /* f0f1660: afa60084 */ sw $a2,0x84($sp) -/* f0f1664: 0fc5c06a */ jal 0xf1701a8 +/* f0f1664: 0fc5c06a */ jal langGet /* f0f1668: 240451ef */ li $a0,0x51ef -/* f0f166c: 0c002e4d */ jal 0xb934 +/* f0f166c: 0c002e4d */ jal viGetWidth /* f0f1670: afa2004c */ sw $v0,0x4c($sp) /* f0f1674: 00028400 */ sll $s0,$v0,0x10 /* f0f1678: 00107403 */ sra $t6,$s0,0x10 -/* f0f167c: 0c002e4d */ jal 0xb934 +/* f0f167c: 0c002e4d */ jal viGetWidth /* f0f1680: 01c08025 */ move $s0,$t6 /* f0f1684: 8fb90064 */ lw $t9,0x64($sp) /* f0f1688: 8fb80060 */ lw $t8,0x60($sp) @@ -962,7 +962,7 @@ glabel menuRenderBanner /* f0f16ac: afa00024 */ sw $zero,0x24($sp) /* f0f16b0: afa00028 */ sw $zero,0x28($sp) /* f0f16b4: afb90010 */ sw $t9,0x10($sp) -/* f0f16b8: 0fc55e10 */ jal 0xf157840 +/* f0f16b8: 0fc55e10 */ jal textRenderProjected /* f0f16bc: afb80014 */ sw $t8,0x14($sp) /* f0f16c0: 8fa90078 */ lw $t1,0x78($sp) /* f0f16c4: 8faa0044 */ lw $t2,0x44($sp) @@ -977,13 +977,13 @@ glabel menuRenderBanner /* f0f16e4: 014d6023 */ subu $t4,$t2,$t5 /* f0f16e8: afac0088 */ sw $t4,0x88($sp) /* f0f16ec: 95e40000 */ lhu $a0,0x0($t7) -/* f0f16f0: 0fc5c06a */ jal 0xf1701a8 +/* f0f16f0: 0fc5c06a */ jal langGet /* f0f16f4: afa60084 */ sw $a2,0x84($sp) -/* f0f16f8: 0c002e4d */ jal 0xb934 +/* f0f16f8: 0c002e4d */ jal viGetWidth /* f0f16fc: afa2004c */ sw $v0,0x4c($sp) /* f0f1700: 00028400 */ sll $s0,$v0,0x10 /* f0f1704: 00107403 */ sra $t6,$s0,0x10 -/* f0f1708: 0c002e4d */ jal 0xb934 +/* f0f1708: 0c002e4d */ jal viGetWidth /* f0f170c: 01c08025 */ move $s0,$t6 /* f0f1710: 8fb90064 */ lw $t9,0x64($sp) /* f0f1714: 8fb80060 */ lw $t8,0x60($sp) @@ -999,7 +999,7 @@ glabel menuRenderBanner /* f0f173c: afa00024 */ sw $zero,0x24($sp) /* f0f1740: afa00028 */ sw $zero,0x28($sp) /* f0f1744: afb90010 */ sw $t9,0x10($sp) -/* f0f1748: 0fc55e10 */ jal 0xf157840 +/* f0f1748: 0fc55e10 */ jal textRenderProjected /* f0f174c: afb80014 */ sw $t8,0x14($sp) /* f0f1750: 8faa0070 */ lw $t2,0x70($sp) /* f0f1754: 8fa60084 */ lw $a2,0x84($sp) @@ -1014,13 +1014,13 @@ glabel menuRenderBanner /* f0f1774: 012d6023 */ subu $t4,$t1,$t5 /* f0f1778: afac0088 */ sw $t4,0x88($sp) /* f0f177c: afa60084 */ sw $a2,0x84($sp) -/* f0f1780: 0fc5c06a */ jal 0xf1701a8 +/* f0f1780: 0fc5c06a */ jal langGet /* f0f1784: 240451ef */ li $a0,0x51ef -/* f0f1788: 0c002e4d */ jal 0xb934 +/* f0f1788: 0c002e4d */ jal viGetWidth /* f0f178c: afa2004c */ sw $v0,0x4c($sp) /* f0f1790: 00028400 */ sll $s0,$v0,0x10 /* f0f1794: 00107c03 */ sra $t7,$s0,0x10 -/* f0f1798: 0c002e4d */ jal 0xb934 +/* f0f1798: 0c002e4d */ jal viGetWidth /* f0f179c: 01e08025 */ move $s0,$t7 /* f0f17a0: 8fae0064 */ lw $t6,0x64($sp) /* f0f17a4: 8fb90060 */ lw $t9,0x60($sp) @@ -1036,7 +1036,7 @@ glabel menuRenderBanner /* f0f17cc: afa00024 */ sw $zero,0x24($sp) /* f0f17d0: afa00028 */ sw $zero,0x28($sp) /* f0f17d4: afae0010 */ sw $t6,0x10($sp) -/* f0f17d8: 0fc55e10 */ jal 0xf157840 +/* f0f17d8: 0fc55e10 */ jal textRenderProjected /* f0f17dc: afb90014 */ sw $t9,0x14($sp) /* f0f17e0: 8fab0040 */ lw $t3,0x40($sp) /* f0f17e4: 8fa60080 */ lw $a2,0x80($sp) @@ -1055,11 +1055,11 @@ glabel menuRenderBanner /* f0f1814: 01ac7821 */ addu $t7,$t5,$t4 /* f0f1818: 25eefff9 */ addiu $t6,$t7,-7 /* f0f181c: afae0088 */ sw $t6,0x88($sp) -/* f0f1820: 0c002e4d */ jal 0xb934 +/* f0f1820: 0c002e4d */ jal viGetWidth /* f0f1824: afa60084 */ sw $a2,0x84($sp) /* f0f1828: 00028400 */ sll $s0,$v0,0x10 /* f0f182c: 0010cc03 */ sra $t9,$s0,0x10 -/* f0f1830: 0c002e4d */ jal 0xb934 +/* f0f1830: 0c002e4d */ jal viGetWidth /* f0f1834: 03208025 */ move $s0,$t9 /* f0f1838: 3c188008 */ lui $t8,0x8008 /* f0f183c: 3c0b8008 */ lui $t3,0x8008 @@ -1078,11 +1078,11 @@ glabel menuRenderBanner /* f0f1870: afa00024 */ sw $zero,0x24($sp) /* f0f1874: afa00028 */ sw $zero,0x28($sp) /* f0f1878: afab0014 */ sw $t3,0x14($sp) -/* f0f187c: 0fc55e10 */ jal 0xf157840 +/* f0f187c: 0fc55e10 */ jal textRenderProjected /* f0f1880: afb80010 */ sw $t8,0x10($sp) /* f0f1884: 00408825 */ move $s1,$v0 .PB0f0f1888: -/* f0f1888: 0fc552e5 */ jal 0xf154b94 +/* f0f1888: 0fc552e5 */ jal func0f153780 /* f0f188c: 02202025 */ move $a0,$s1 /* f0f1890: 8fbf003c */ lw $ra,0x3c($sp) /* f0f1894: 8fb00034 */ lw $s0,0x34($sp) @@ -5212,13 +5212,13 @@ glabel var7f1b3c40pf .PB0f0f3e80: /* f0f3e80: 5720000e */ bnezl $t9,.PB0f0f3ebc /* f0f3e84: 8e090004 */ lw $t1,0x4($s0) -/* f0f3e88: 0fc27882 */ jal 0xf09e208 +/* f0f3e88: 0fc27882 */ jal bgun0f09e004 /* f0f3e8c: 24040001 */ li $a0,0x1 /* f0f3e90: 10400007 */ beqz $v0,.PB0f0f3eb0 /* f0f3e94: 00000000 */ nop -/* f0f3e98: 0fc277fc */ jal 0xf09dff0 +/* f0f3e98: 0fc277fc */ jal bgunGetGunMem /* f0f3e9c: 00000000 */ nop -/* f0f3ea0: 0fc27800 */ jal 0xf09e000 +/* f0f3ea0: 0fc27800 */ jal bgunCalculateGunMemCapacity /* f0f3ea4: ae020004 */ sw $v0,0x4($s0) /* f0f3ea8: 10000003 */ b .PB0f0f3eb8 /* f0f3eac: ae020008 */ sw $v0,0x8($s0) @@ -5247,7 +5247,7 @@ glabel var7f1b3c40pf .PB0f0f3ef8: /* f0f3ef8: 54610004 */ bnel $v1,$at,.PB0f0f3f0c /* f0f3efc: 92020000 */ lbu $v0,0x0($s0) -/* f0f3f00: 0fc677c0 */ jal 0xf19df00 +/* f0f3f00: 0fc677c0 */ jal mpClearCurrentChallenge /* f0f3f04: 00000000 */ nop /* f0f3f08: 92020000 */ lbu $v0,0x0($s0) .PB0f0f3f0c: @@ -5283,25 +5283,25 @@ glabel var7f1b3c40pf /* f0f3f74: 322a00ff */ andi $t2,$s1,0xff /* f0f3f78: 00025e02 */ srl $t3,$v0,0x18 /* f0f3f7c: 01408825 */ move $s1,$t2 -/* f0f3f80: 0fc635cd */ jal 0xf18d734 +/* f0f3f80: 0fc635cd */ jal mpGetBodyId /* f0f3f84: 316400ff */ andi $a0,$t3,0xff -/* f0f3f88: 0fc635b0 */ jal 0xf18d6c0 +/* f0f3f88: 0fc635b0 */ jal mpGetNumHeads2 /* f0f3f8c: afa20404 */ sw $v0,0x404($sp) /* f0f3f90: 0222082a */ slt $at,$s1,$v0 /* f0f3f94: 10200005 */ beqz $at,.PB0f0f3fac /* f0f3f98: 00000000 */ nop -/* f0f3f9c: 0fc635b4 */ jal 0xf18d6d0 +/* f0f3f9c: 0fc635b4 */ jal mpGetHeadId /* f0f3fa0: 322400ff */ andi $a0,$s1,0xff /* f0f3fa4: 1000000b */ b .PB0f0f3fd4 /* f0f3fa8: afa20400 */ sw $v0,0x400($sp) .PB0f0f3fac: -/* f0f3fac: 0fc635b0 */ jal 0xf18d6c0 +/* f0f3fac: 0fc635b0 */ jal mpGetNumHeads2 /* f0f3fb0: 00000000 */ nop -/* f0f3fb4: 0fc52f6a */ jal 0xf14bda8 +/* f0f3fb4: 0fc52f6a */ jal func0f14a9f8 /* f0f3fb8: 02222023 */ subu $a0,$s1,$v0 -/* f0f3fbc: 0fc635c2 */ jal 0xf18d708 +/* f0f3fbc: 0fc635c2 */ jal mpGetBeauHeadId /* f0f3fc0: 304400ff */ andi $a0,$v0,0xff -/* f0f3fc4: 0fc635b0 */ jal 0xf18d6c0 +/* f0f3fc4: 0fc635b0 */ jal mpGetNumHeads2 /* f0f3fc8: afa20400 */ sw $v0,0x400($sp) /* f0f3fcc: 02226823 */ subu $t5,$s1,$v0 /* f0f3fd0: a20d05b0 */ sb $t5,0x5b0($s0) @@ -5316,7 +5316,7 @@ glabel var7f1b3c40pf /* f0f3ff0: 96220002 */ lhu $v0,0x2($s1) /* f0f3ff4: 00402025 */ move $a0,$v0 /* f0f3ff8: a7a2040a */ sh $v0,0x40a($sp) -/* f0f3ffc: 0fc5a1b1 */ jal 0xf1686c4 +/* f0f3ffc: 0fc5a1b1 */ jal fileGetInflatedLength /* f0f4000: afa2003c */ sw $v0,0x3c($sp) /* f0f4004: 8e2a0000 */ lw $t2,0x0($s1) /* f0f4008: 2443003f */ addiu $v1,$v0,0x3f @@ -5337,7 +5337,7 @@ glabel var7f1b3c40pf /* f0f4040: 000f7880 */ sll $t7,$t7,0x2 /* f0f4044: 022f8821 */ addu $s1,$s1,$t7 /* f0f4048: 9631f3d6 */ lhu $s1,-0xc2a($s1) -/* f0f404c: 0fc5a1b1 */ jal 0xf1686c4 +/* f0f404c: 0fc5a1b1 */ jal fileGetInflatedLength /* f0f4050: 02202025 */ move $a0,$s1 /* f0f4054: 8fb80420 */ lw $t8,0x420($sp) /* f0f4058: 2459003f */ addiu $t9,$v0,0x3f @@ -5352,7 +5352,7 @@ glabel var7f1b3c40pf /* f0f4078: afa30420 */ sw $v1,0x420($sp) /* f0f407c: 27a40410 */ addiu $a0,$sp,0x410 /* f0f4080: 01832821 */ addu $a1,$t4,$v1 -/* f0f4084: 0fc5d268 */ jal 0xf1749a0 +/* f0f4084: 0fc5d268 */ jal func0f172e70 /* f0f4088: 01a33023 */ subu $a2,$t5,$v1 /* f0f408c: 8fae0400 */ lw $t6,0x400($sp) /* f0f4090: 8e050004 */ lw $a1,0x4($s0) @@ -5361,16 +5361,16 @@ glabel var7f1b3c40pf /* f0f409c: 8faf0404 */ lw $t7,0x404($sp) /* f0f40a0: a60f056a */ sh $t7,0x56a($s0) /* f0f40a4: 8fa60420 */ lw $a2,0x420($sp) -/* f0f40a8: 0fc6a511 */ jal 0xf1a9444 +/* f0f40a8: 0fc6a511 */ jal func0f1a7794 /* f0f40ac: 97a4040a */ lhu $a0,0x40a($sp) /* f0f40b0: ae020054 */ sw $v0,0x54($s0) -/* f0f40b4: 0fc5a23c */ jal 0xf1688f0 +/* f0f40b4: 0fc5a23c */ jal fileGetSize /* f0f40b8: 8fa4003c */ lw $a0,0x3c($sp) /* f0f40bc: 2443003f */ addiu $v1,$v0,0x3f /* f0f40c0: 3479003f */ ori $t9,$v1,0x3f /* f0f40c4: 3b29003f */ xori $t1,$t9,0x3f /* f0f40c8: 8e040054 */ lw $a0,0x54($s0) -/* f0f40cc: 0c008cba */ jal 0x232e8 +/* f0f40cc: 0c008cba */ jal modelCalculateRwDataLen /* f0f40d0: afa9040c */ sw $t1,0x40c($sp) /* f0f40d4: 8fb80400 */ lw $t8,0x400($sp) /* f0f40d8: 8fa3040c */ lw $v1,0x40c($sp) @@ -5384,26 +5384,26 @@ glabel var7f1b3c40pf /* f0f40f4: afb10040 */ sw $s1,0x40($sp) /* f0f40f8: 01633023 */ subu $a2,$t3,$v1 /* f0f40fc: 27a70410 */ addiu $a3,$sp,0x410 -/* f0f4100: 0fc6a511 */ jal 0xf1a9444 +/* f0f4100: 0fc6a511 */ jal func0f1a7794 /* f0f4104: 01432821 */ addu $a1,$t2,$v1 /* f0f4108: ae020058 */ sw $v0,0x58($s0) -/* f0f410c: 0fc5a23c */ jal 0xf1688f0 +/* f0f410c: 0fc5a23c */ jal fileGetSize /* f0f4110: 8fa40040 */ lw $a0,0x40($sp) /* f0f4114: 8e040058 */ lw $a0,0x58($s0) /* f0f4118: 8fa50400 */ lw $a1,0x400($sp) -/* f0f411c: 0fc0b7a3 */ jal 0xf02de8c +/* f0f411c: 0fc0b7a3 */ jal bodyCalculateHeadOffset /* f0f4120: 8fa60404 */ lw $a2,0x404($sp) -/* f0f4124: 0c008cba */ jal 0x232e8 +/* f0f4124: 0c008cba */ jal modelCalculateRwDataLen /* f0f4128: 8e040058 */ lw $a0,0x58($s0) .PB0f0f412c: /* f0f412c: 26040060 */ addiu $a0,$s0,0x60 /* f0f4130: 8e050054 */ lw $a1,0x54($s0) /* f0f4134: afa4003c */ sw $a0,0x3c($sp) /* f0f4138: 26060110 */ addiu $a2,$s0,0x110 -/* f0f413c: 0c008d5a */ jal 0x23568 +/* f0f413c: 0c008d5a */ jal modelInit /* f0f4140: 24070001 */ li $a3,0x1 /* f0f4144: 26110084 */ addiu $s1,$s0,0x84 -/* f0f4148: 0c008d99 */ jal 0x23664 +/* f0f4148: 0c008d99 */ jal animInit /* f0f414c: 02202025 */ move $a0,$s1 /* f0f4150: 240c0100 */ li $t4,0x100 /* f0f4154: a60c0062 */ sh $t4,0x62($s0) @@ -5417,12 +5417,12 @@ glabel var7f1b3c40pf /* f0f4174: afa00010 */ sw $zero,0x10($sp) /* f0f4178: 8fa50400 */ lw $a1,0x400($sp) /* f0f417c: 8fa40404 */ lw $a0,0x404($sp) -/* f0f4180: 0fc0b3d7 */ jal 0xf02cf5c +/* f0f4180: 0fc0b3d7 */ jal func0f02ce8c /* f0f4184: afad0014 */ sw $t5,0x14($sp) /* f0f4188: 10000027 */ b .PB0f0f4228 /* f0f418c: 8e0b000c */ lw $t3,0xc($s0) .PB0f0f4190: -/* f0f4190: 0fc5a1b1 */ jal 0xf1686c4 +/* f0f4190: 0fc5a1b1 */ jal fileGetInflatedLength /* f0f4194: 00402025 */ move $a0,$v0 /* f0f4198: 2443003f */ addiu $v1,$v0,0x3f /* f0f419c: 346f003f */ ori $t7,$v1,0x3f @@ -5433,7 +5433,7 @@ glabel var7f1b3c40pf /* f0f41b0: afa30420 */ sw $v1,0x420($sp) /* f0f41b4: 27a40410 */ addiu $a0,$sp,0x410 /* f0f41b8: 01232821 */ addu $a1,$t1,$v1 -/* f0f41bc: 0fc5d268 */ jal 0xf1749a0 +/* f0f41bc: 0fc5d268 */ jal func0f172e70 /* f0f41c0: 03033023 */ subu $a2,$t8,$v1 /* f0f41c4: 2402ffff */ li $v0,-1 /* f0f41c8: a6020002 */ sh $v0,0x2($s0) @@ -5441,20 +5441,20 @@ glabel var7f1b3c40pf /* f0f41d0: 8fa60420 */ lw $a2,0x420($sp) /* f0f41d4: 9604000e */ lhu $a0,0xe($s0) /* f0f41d8: 8e050004 */ lw $a1,0x4($s0) -/* f0f41dc: 0fc6a511 */ jal 0xf1a9444 +/* f0f41dc: 0fc6a511 */ jal func0f1a7794 /* f0f41e0: 27a70410 */ addiu $a3,$sp,0x410 /* f0f41e4: ae020054 */ sw $v0,0x54($s0) -/* f0f41e8: 0fc5a23c */ jal 0xf1688f0 +/* f0f41e8: 0fc5a23c */ jal fileGetSize /* f0f41ec: 8e04000c */ lw $a0,0xc($s0) -/* f0f41f0: 0c008cba */ jal 0x232e8 +/* f0f41f0: 0c008cba */ jal modelCalculateRwDataLen /* f0f41f4: 8e040054 */ lw $a0,0x54($s0) /* f0f41f8: 26040060 */ addiu $a0,$s0,0x60 /* f0f41fc: 8e050054 */ lw $a1,0x54($s0) /* f0f4200: 26060110 */ addiu $a2,$s0,0x110 -/* f0f4204: 0c008d5a */ jal 0x23568 +/* f0f4204: 0c008d5a */ jal modelInit /* f0f4208: 24070001 */ li $a3,0x1 /* f0f420c: 26110084 */ addiu $s1,$s0,0x84 -/* f0f4210: 0c008d99 */ jal 0x23664 +/* f0f4210: 0c008d99 */ jal animInit /* f0f4214: 02202025 */ move $a0,$s1 /* f0f4218: 240a0100 */ li $t2,0x100 /* f0f421c: a60a0062 */ sh $t2,0x62($s0) @@ -5498,10 +5498,10 @@ glabel var7f1b3c40pf /* f0f42a0: 000a6280 */ sll $t4,$t2,0xa /* f0f42a4: 05830018 */ bgezl $t4,.PB0f0f4308 /* f0f42a8: 8faa0440 */ lw $t2,0x440($sp) -/* f0f42ac: 0c002beb */ jal 0xafac +/* f0f42ac: 0c002beb */ jal vi0000b280 /* f0f42b0: 8fa40440 */ lw $a0,0x440($sp) /* f0f42b4: afa20440 */ sw $v0,0x440($sp) -/* f0f42b8: 0c002bbf */ jal 0xaefc +/* f0f42b8: 0c002bbf */ jal vi0000b1d0 /* f0f42bc: 00402025 */ move $a0,$v0 /* f0f42c0: 3c0f800a */ lui $t7,0x800a /* f0f42c4: 91ef64c5 */ lbu $t7,0x64c5($t7) @@ -5512,7 +5512,7 @@ glabel var7f1b3c40pf /* f0f42d8: 24010002 */ li $at,0x2 /* f0f42dc: 11c10003 */ beq $t6,$at,.PB0f0f42ec /* f0f42e0: afa20440 */ sw $v0,0x440($sp) -/* f0f42e4: 0fc3d596 */ jal 0xf0f5658 +/* f0f42e4: 0fc3d596 */ jal menuApplyScissor /* f0f42e8: 00402025 */ move $a0,$v0 .PB0f0f42ec: /* f0f42ec: 244d0008 */ addiu $t5,$v0,0x8 @@ -5555,7 +5555,7 @@ glabel var7f1b3c40pf /* f0f4378: 8c8b0004 */ lw $t3,0x4($a0) /* f0f437c: 554b002f */ bnel $t2,$t3,.PB0f0f443c /* f0f4380: 8fb902f4 */ lw $t9,0x2f4($sp) -/* f0f4384: 0c006cdb */ jal 0x1b36c +/* f0f4384: 0c006cdb */ jal modelGetPart /* f0f4388: 24050006 */ li $a1,0x6 /* f0f438c: 5040002b */ beqzl $v0,.PB0f0f443c /* f0f4390: 8fb902f4 */ lw $t9,0x2f4($sp) @@ -5565,7 +5565,7 @@ glabel var7f1b3c40pf /* f0f43a0: 448c4000 */ mtc1 $t4,$f8 /* f0f43a4: 8c510004 */ lw $s1,0x4($v0) /* f0f43a8: 468042a0 */ cvt.s.w $f10,$f8 -/* f0f43ac: 0fc01af0 */ jal 0xf006bc0 +/* f0f43ac: 0fc01af0 */ jal func0f006bd0 /* f0f43b0: 46105303 */ div.s $f12,$f10,$f16 /* f0f43b4: 44806000 */ mtc1 $zero,$f12 /* f0f43b8: 3c013f80 */ lui $at,0x3f80 @@ -5598,13 +5598,13 @@ glabel var7f1b3c40pf /* f0f4424: 8fa4003c */ lw $a0,0x3c($sp) /* f0f4428: 46128102 */ mul.s $f4,$f16,$f18 /* f0f442c: 46041203 */ div.s $f8,$f2,$f4 -/* f0f4430: 0fc1a322 */ jal 0xf068c88 +/* f0f4430: 0fc1a322 */ jal modelFindBboxRodata /* f0f4434: e7a802f8 */ swc1 $f8,0x2f8($sp) /* f0f4438: 8fb902f4 */ lw $t9,0x2f4($sp) .PB0f0f443c: /* f0f443c: 13200025 */ beqz $t9,.PB0f0f44d4 /* f0f4440: 00000000 */ nop -/* f0f4444: 0fc1a322 */ jal 0xf068c88 +/* f0f4444: 0fc1a322 */ jal modelFindBboxRodata /* f0f4448: 8fa4003c */ lw $a0,0x3c($sp) /* f0f444c: 10400021 */ beqz $v0,.PB0f0f44d4 /* f0f4450: 00000000 */ nop @@ -5641,7 +5641,7 @@ glabel var7f1b3c40pf /* f0f44cc: 46065403 */ div.s $f16,$f10,$f6 /* f0f44d0: e7b002f8 */ swc1 $f16,0x2f8($sp) .PB0f0f44d4: -/* f0f44d4: 0c005900 */ jal 0x16400 +/* f0f44d4: 0c005900 */ jal mtx4LoadIdentity /* f0f44d8: 27a40350 */ addiu $a0,$sp,0x350 /* f0f44dc: 8fad0448 */ lw $t5,0x448($sp) /* f0f44e0: 24010001 */ li $at,0x1 @@ -5775,7 +5775,7 @@ glabel var7f1b3c40pf /* f0f46c0: e6000528 */ swc1 $f0,0x528($s0) /* f0f46c4: e7a20398 */ swc1 $f2,0x398($sp) /* f0f46c8: e7ac039c */ swc1 $f12,0x39c($sp) -/* f0f46cc: 0c005bb7 */ jal 0x16edc +/* f0f46cc: 0c005bb7 */ jal mtx4LoadRotation /* f0f46d0: e7a003a0 */ swc1 $f0,0x3a0($sp) /* f0f46d4: 100000b4 */ b .PB0f0f49a8 /* f0f46d8: 3c01c2c8 */ lui $at,0xc2c8 @@ -5819,7 +5819,7 @@ glabel var7f1b3c40pf .PB0f0f476c: /* f0f476c: c4284688 */ lwc1 $f8,0x4688($at) /* f0f4770: 46080302 */ mul.s $f12,$f0,$f8 -/* f0f4774: 0c006b88 */ jal 0x1ae20 +/* f0f4774: 0c006b88 */ jal cosf /* f0f4778: 00000000 */ nop /* f0f477c: 3c013f00 */ lui $at,0x3f00 /* f0f4780: 44813000 */ mtc1 $at,$f6 @@ -5899,7 +5899,7 @@ glabel var7f1b3c40pf /* f0f4898: e7b00294 */ swc1 $f16,0x294($sp) /* f0f489c: c6060528 */ lwc1 $f6,0x528($s0) /* f0f48a0: e7ae02d0 */ swc1 $f14,0x2d0($sp) -/* f0f48a4: 0fc25ac4 */ jal 0xf096b10 +/* f0f48a4: 0fc25ac4 */ jal quaternion0f096ca0 /* f0f48a8: e7a60298 */ swc1 $f6,0x298($sp) /* f0f48ac: c6040548 */ lwc1 $f4,0x548($s0) /* f0f48b0: 02202025 */ move $a0,$s1 @@ -5908,17 +5908,17 @@ glabel var7f1b3c40pf /* f0f48bc: c612054c */ lwc1 $f18,0x54c($s0) /* f0f48c0: e7b20294 */ swc1 $f18,0x294($sp) /* f0f48c4: c6080550 */ lwc1 $f8,0x550($s0) -/* f0f48c8: 0fc25ac4 */ jal 0xf096b10 +/* f0f48c8: 0fc25ac4 */ jal quaternion0f096ca0 /* f0f48cc: e7a80298 */ swc1 $f8,0x298($sp) /* f0f48d0: c7ae02d0 */ lwc1 $f14,0x2d0($sp) /* f0f48d4: 27b1029c */ addiu $s1,$sp,0x29c /* f0f48d8: 02203825 */ move $a3,$s1 /* f0f48dc: 44067000 */ mfc1 $a2,$f14 /* f0f48e0: 27a402bc */ addiu $a0,$sp,0x2bc -/* f0f48e4: 0fc25c4a */ jal 0xf097128 +/* f0f48e4: 0fc25c4a */ jal quaternionSlerp /* f0f48e8: 27a502ac */ addiu $a1,$sp,0x2ac /* f0f48ec: 02202025 */ move $a0,$s1 -/* f0f48f0: 0fc25b51 */ jal 0xf096d44 +/* f0f48f0: 0fc25b51 */ jal quaternionToMtx /* f0f48f4: 27a50350 */ addiu $a1,$sp,0x350 /* f0f48f8: 8e0205b0 */ lw $v0,0x5b0($s0) /* f0f48fc: 00024b00 */ sll $t1,$v0,0xc @@ -5933,7 +5933,7 @@ glabel var7f1b3c40pf /* f0f491c: e6000528 */ swc1 $f0,0x528($s0) /* f0f4920: e7a20398 */ swc1 $f2,0x398($sp) /* f0f4924: e7ac039c */ swc1 $f12,0x39c($sp) -/* f0f4928: 0c005bb7 */ jal 0x16edc +/* f0f4928: 0c005bb7 */ jal mtx4LoadRotation /* f0f492c: e7a003a0 */ swc1 $f0,0x3a0($sp) /* f0f4930: 8e0205b0 */ lw $v0,0x5b0($s0) /* f0f4934: 00025300 */ sll $t2,$v0,0xc @@ -5963,7 +5963,7 @@ glabel var7f1b3c40pf /* f0f4990: e6000528 */ swc1 $f0,0x528($s0) /* f0f4994: e7a20398 */ swc1 $f2,0x398($sp) /* f0f4998: e7ac039c */ swc1 $f12,0x39c($sp) -/* f0f499c: 0c005bb7 */ jal 0x16edc +/* f0f499c: 0c005bb7 */ jal mtx4LoadRotation /* f0f49a0: e7a003a0 */ swc1 $f0,0x3a0($sp) /* f0f49a4: 3c01c2c8 */ lui $at,0xc2c8 .PB0f0f49a8: @@ -5991,11 +5991,11 @@ glabel var7f1b3c40pf /* f0f49fc: 10000027 */ b .PB0f0f4a9c /* f0f4a00: e7b00394 */ swc1 $f16,0x394($sp) .PB0f0f4a04: -/* f0f4a04: 0c002e8b */ jal 0xba2c +/* f0f4a04: 0c002e8b */ jal viGetViewLeft /* f0f4a08: 00000000 */ nop /* f0f4a0c: 00028c00 */ sll $s1,$v0,0x10 /* f0f4a10: 00117403 */ sra $t6,$s1,0x10 -/* f0f4a14: 0c002e6d */ jal 0xb9b4 +/* f0f4a14: 0c002e6d */ jal viGetViewWidth /* f0f4a18: 01c08825 */ move $s1,$t6 /* f0f4a1c: 44823000 */ mtc1 $v0,$f6 /* f0f4a20: 3c0d8008 */ lui $t5,0x8008 @@ -6012,11 +6012,11 @@ glabel var7f1b3c40pf /* f0f4a4c: 46802420 */ cvt.s.w $f16,$f4 /* f0f4a50: 46109280 */ add.s $f10,$f18,$f16 /* f0f4a54: 460a4180 */ add.s $f6,$f8,$f10 -/* f0f4a58: 0c002e8f */ jal 0xba3c +/* f0f4a58: 0c002e8f */ jal viGetViewTop /* f0f4a5c: e7a60390 */ swc1 $f6,0x390($sp) /* f0f4a60: 00028c00 */ sll $s1,$v0,0x10 /* f0f4a64: 00114c03 */ sra $t1,$s1,0x10 -/* f0f4a68: 0c002e71 */ jal 0xb9c4 +/* f0f4a68: 0c002e71 */ jal viGetViewHeight /* f0f4a6c: 01208825 */ move $s1,$t1 /* f0f4a70: 44822000 */ mtc1 $v0,$f4 /* f0f4a74: 44913000 */ mtc1 $s1,$f6 @@ -6033,9 +6033,9 @@ glabel var7f1b3c40pf /* f0f4a9c: 27a40390 */ addiu $a0,$sp,0x390 .PB0f0f4aa0: /* f0f4aa0: 27a50398 */ addiu $a1,$sp,0x398 -/* f0f4aa4: 0fc2d413 */ jal 0xf0b504c +/* f0f4aa4: 0fc2d413 */ jal func0f0b4c3c /* f0f4aa8: 3c063f80 */ lui $a2,0x3f80 -/* f0f4aac: 0c005900 */ jal 0x16400 +/* f0f4aac: 0c005900 */ jal mtx4LoadIdentity /* f0f4ab0: 27a40310 */ addiu $a0,$sp,0x310 /* f0f4ab4: 8e0205b4 */ lw $v0,0x5b4($s0) /* f0f4ab8: 5040001d */ beqzl $v0,.PB0f0f4b30 @@ -6047,13 +6047,13 @@ glabel var7f1b3c40pf /* f0f4ad0: 8fab0448 */ lw $t3,0x448($sp) /* f0f4ad4: 8e040054 */ lw $a0,0x54($s0) .PB0f0f4ad8: -/* f0f4ad8: 0c006cdb */ jal 0x1b36c +/* f0f4ad8: 0c006cdb */ jal modelGetPart /* f0f4adc: afa3028c */ sw $v1,0x28c($sp) /* f0f4ae0: 8fa3028c */ lw $v1,0x28c($sp) /* f0f4ae4: 1040000d */ beqz $v0,.PB0f0f4b1c /* f0f4ae8: 00402825 */ move $a1,$v0 /* f0f4aec: 8fa4003c */ lw $a0,0x3c($sp) -/* f0f4af0: 0c006d1b */ jal 0x1b46c +/* f0f4af0: 0c006d1b */ jal modelGetNodeRwData /* f0f4af4: afa3028c */ sw $v1,0x28c($sp) /* f0f4af8: 10400008 */ beqz $v0,.PB0f0f4b1c /* f0f4afc: 8fa3028c */ lw $v1,0x28c($sp) @@ -6097,7 +6097,7 @@ glabel var7f1b3c40pf /* f0f4b88: e7aa039c */ swc1 $f10,0x39c($sp) /* f0f4b8c: e7a203a0 */ swc1 $f2,0x3a0($sp) .PB0f0f4b90: -/* f0f4b90: 0c005c4b */ jal 0x1712c +/* f0f4b90: 0c005c4b */ jal mtx4LoadTranslation /* f0f4b94: 27a50310 */ addiu $a1,$sp,0x310 /* f0f4b98: 8fac0308 */ lw $t4,0x308($sp) /* f0f4b9c: 5180000a */ beqzl $t4,.PB0f0f4bc8 @@ -6106,19 +6106,19 @@ glabel var7f1b3c40pf /* f0f4ba8: c7a802f8 */ lwc1 $f8,0x2f8($sp) /* f0f4bac: 27a50310 */ addiu $a1,$sp,0x310 /* f0f4bb0: 46082302 */ mul.s $f12,$f4,$f8 -/* f0f4bb4: 0c005a55 */ jal 0x16954 +/* f0f4bb4: 0c005a55 */ jal mtx00015f04 /* f0f4bb8: 00000000 */ nop /* f0f4bbc: 10000005 */ b .PB0f0f4bd4 /* f0f4bc0: 8faf0308 */ lw $t7,0x308($sp) /* f0f4bc4: c7ac0424 */ lwc1 $f12,0x424($sp) .PB0f0f4bc8: -/* f0f4bc8: 0c005a55 */ jal 0x16954 +/* f0f4bc8: 0c005a55 */ jal mtx00015f04 /* f0f4bcc: 27a50310 */ addiu $a1,$sp,0x310 /* f0f4bd0: 8faf0308 */ lw $t7,0x308($sp) .PB0f0f4bd4: /* f0f4bd4: 11e00005 */ beqz $t7,.PB0f0f4bec /* f0f4bd8: 27a402fc */ addiu $a0,$sp,0x2fc -/* f0f4bdc: 0c005c4b */ jal 0x1712c +/* f0f4bdc: 0c005c4b */ jal mtx4LoadTranslation /* f0f4be0: 27a50204 */ addiu $a1,$sp,0x204 /* f0f4be4: 1000000b */ b .PB0f0f4c14 /* f0f4be8: 27b10244 */ addiu $s1,$sp,0x244 @@ -6130,28 +6130,28 @@ glabel var7f1b3c40pf /* f0f4bfc: c6100530 */ lwc1 $f16,0x530($s0) /* f0f4c00: e7b0039c */ swc1 $f16,0x39c($sp) /* f0f4c04: c6060534 */ lwc1 $f6,0x534($s0) -/* f0f4c08: 0c005c4b */ jal 0x1712c +/* f0f4c08: 0c005c4b */ jal mtx4LoadTranslation /* f0f4c0c: e7a603a0 */ swc1 $f6,0x3a0($sp) /* f0f4c10: 27b10244 */ addiu $s1,$sp,0x244 .PB0f0f4c14: /* f0f4c14: 02203025 */ move $a2,$s1 /* f0f4c18: 27a40310 */ addiu $a0,$sp,0x310 -/* f0f4c1c: 0c005914 */ jal 0x16450 +/* f0f4c1c: 0c005914 */ jal mtx4MultMtx4 /* f0f4c20: 27a50350 */ addiu $a1,$sp,0x350 /* f0f4c24: 8fb90448 */ lw $t9,0x448($sp) /* f0f4c28: 24010003 */ li $at,0x3 /* f0f4c2c: 5721000f */ bnel $t9,$at,.PB0f0f4c6c /* f0f4c30: 26060014 */ addiu $a2,$s0,0x14 -/* f0f4c34: 0fc4f0e5 */ jal 0xf13c394 +/* f0f4c34: 0fc4f0e5 */ jal func0f13ae04 /* f0f4c38: 27a401c4 */ addiu $a0,$sp,0x1c4 /* f0f4c3c: 27a401c4 */ addiu $a0,$sp,0x1c4 /* f0f4c40: 02202825 */ move $a1,$s1 -/* f0f4c44: 0c005914 */ jal 0x16450 +/* f0f4c44: 0c005914 */ jal mtx4MultMtx4 /* f0f4c48: 27a60184 */ addiu $a2,$sp,0x184 /* f0f4c4c: 26060014 */ addiu $a2,$s0,0x14 /* f0f4c50: afa60040 */ sw $a2,0x40($sp) /* f0f4c54: 27a40184 */ addiu $a0,$sp,0x184 -/* f0f4c58: 0c005914 */ jal 0x16450 +/* f0f4c58: 0c005914 */ jal mtx4MultMtx4 /* f0f4c5c: 27a50204 */ addiu $a1,$sp,0x204 /* f0f4c60: 10000006 */ b .PB0f0f4c7c /* f0f4c64: 00000000 */ nop @@ -6159,10 +6159,10 @@ glabel var7f1b3c40pf .PB0f0f4c6c: /* f0f4c6c: afa60040 */ sw $a2,0x40($sp) /* f0f4c70: 02202025 */ move $a0,$s1 -/* f0f4c74: 0c005914 */ jal 0x16450 +/* f0f4c74: 0c005914 */ jal mtx4MultMtx4 /* f0f4c78: 27a50204 */ addiu $a1,$sp,0x204 .PB0f0f4c7c: -/* f0f4c7c: 0fc38a19 */ jal 0xf0e2864 +/* f0f4c7c: 0fc38a19 */ jal menugfx0f0e2348 /* f0f4c80: 8fa40440 */ lw $a0,0x440($sp) /* f0f4c84: 8fae0448 */ lw $t6,0x448($sp) /* f0f4c88: afa20440 */ sw $v0,0x440($sp) @@ -6171,16 +6171,16 @@ glabel var7f1b3c40pf /* f0f4c94: 8e090054 */ lw $t1,0x54($s0) /* f0f4c98: 11c0000e */ beqz $t6,.PB0f0f4cd4 /* f0f4c9c: 3c11800a */ lui $s1,0x800a -/* f0f4ca0: 0fc3539a */ jal 0xf0d4e68 +/* f0f4ca0: 0fc3539a */ jal func0f0d49c8 /* f0f4ca4: 00402025 */ move $a0,$v0 /* f0f4ca8: 244d0008 */ addiu $t5,$v0,0x8 /* f0f4cac: 3c090103 */ lui $t1,0x103 /* f0f4cb0: 35290040 */ ori $t1,$t1,0x40 /* f0f4cb4: afad0440 */ sw $t5,0x440($sp) /* f0f4cb8: ac490000 */ sw $t1,0x0($v0) -/* f0f4cbc: 0fc2d4fe */ jal 0xf0b53f8 +/* f0f4cbc: 0fc2d4fe */ jal currentPlayerGetUnk1750 /* f0f4cc0: 00408825 */ move $s1,$v0 -/* f0f4cc4: 0c012de0 */ jal 0x4b780 +/* f0f4cc4: 0c012de0 */ jal osVirtualToPhysical /* f0f4cc8: 00402025 */ move $a0,$v0 /* f0f4ccc: 1000005f */ b .PB0f0f4e4c /* f0f4cd0: ae220004 */ sw $v0,0x4($s1) @@ -6204,14 +6204,14 @@ glabel var7f1b3c40pf /* f0f4d14: 24844330 */ addiu $a0,$a0,0x4330 /* f0f4d18: 46805120 */ cvt.s.w $f4,$f10 /* f0f4d1c: 46122403 */ div.s $f16,$f4,$f18 -/* f0f4d20: 0c003648 */ jal 0xd920 +/* f0f4d20: 0c003648 */ jal mainOverrideVariable /* f0f4d24: e7b0017c */ swc1 $f16,0x17c($sp) /* f0f4d28: 3c047f1b */ lui $a0,0x7f1b /* f0f4d2c: 3c058007 */ lui $a1,0x8007 /* f0f4d30: 24a53194 */ addiu $a1,$a1,0x3194 -/* f0f4d34: 0c003648 */ jal 0xd920 +/* f0f4d34: 0c003648 */ jal mainOverrideVariable /* f0f4d38: 24844334 */ addiu $a0,$a0,0x4334 -/* f0f4d3c: 0fc3539a */ jal 0xf0d4e68 +/* f0f4d3c: 0fc3539a */ jal func0f0d49c8 /* f0f4d40: 8fa40440 */ lw $a0,0x440($sp) /* f0f4d44: 3c0d8008 */ lui $t5,0x8008 /* f0f4d48: 8dad1f90 */ lw $t5,0x1f90($t5) @@ -6222,7 +6222,7 @@ glabel var7f1b3c40pf /* f0f4d5c: 84a56572 */ lh $a1,0x6572($a1) /* f0f4d60: 00002012 */ mflo $a0 /* f0f4d64: 00044c00 */ sll $t1,$a0,0x10 -/* f0f4d68: 0c002e75 */ jal 0xb9d4 +/* f0f4d68: 0c002e75 */ jal viSetViewPosition /* f0f4d6c: 00092403 */ sra $a0,$t1,0x10 /* f0f4d70: 3c0b800a */ lui $t3,0x800a /* f0f4d74: 8d6b656c */ lw $t3,0x656c($t3) @@ -6244,7 +6244,7 @@ glabel var7f1b3c40pf /* f0f4db4: 00003012 */ mflo $a2 /* f0f4db8: 00067400 */ sll $t6,$a2,0x10 /* f0f4dbc: 000e3403 */ sra $a2,$t6,0x10 -/* f0f4dc0: 0c002ec1 */ jal 0xbb04 +/* f0f4dc0: 0c002ec1 */ jal viSetFovAspectAndSize /* f0f4dc4: 000a3c03 */ sra $a3,$t2,0x10 /* f0f4dc8: 3c0c8007 */ lui $t4,0x8007 /* f0f4dcc: 8d8c3118 */ lw $t4,0x3118($t4) @@ -6252,7 +6252,7 @@ glabel var7f1b3c40pf /* f0f4dd4: 27396578 */ addiu $t9,$t9,0x6578 /* f0f4dd8: 000c7940 */ sll $t7,$t4,0x5 /* f0f4ddc: 01f92821 */ addu $a1,$t7,$t9 -/* f0f4de0: 0c002b0b */ jal 0xac2c +/* f0f4de0: 0c002b0b */ jal vi0000af00 /* f0f4de4: 8fa40440 */ lw $a0,0x440($sp) /* f0f4de8: 3c0e8007 */ lui $t6,0x8007 /* f0f4dec: 8dce3190 */ lw $t6,0x3190($t6) @@ -6278,7 +6278,7 @@ glabel var7f1b3c40pf /* f0f4e38: 46044200 */ add.s $f8,$f8,$f4 .PB0f0f4e3c: /* f0f4e3c: 44064000 */ mfc1 $a2,$f8 -/* f0f4e40: 0c002a74 */ jal 0xa9d0 +/* f0f4e40: 0c002a74 */ jal vi0000aca4 /* f0f4e44: 00000000 */ nop /* f0f4e48: afa20440 */ sw $v0,0x440($sp) .PB0f0f4e4c: @@ -6286,7 +6286,7 @@ glabel var7f1b3c40pf .PB0f0f4e50: /* f0f4e50: 8524000e */ lh $a0,0xe($t1) /* f0f4e54: 0004c180 */ sll $t8,$a0,0x6 -/* f0f4e58: 0fc5a419 */ jal 0xf169064 +/* f0f4e58: 0fc5a419 */ jal gfxAllocate /* f0f4e5c: 03002025 */ move $a0,$t8 /* f0f4e60: afa203b4 */ sw $v0,0x3b4($sp) /* f0f4e64: 8e0a0054 */ lw $t2,0x54($s0) @@ -6297,7 +6297,7 @@ glabel var7f1b3c40pf /* f0f4e78: 8faf03b4 */ lw $t7,0x3b4($sp) .PB0f0f4e7c: /* f0f4e7c: 00116180 */ sll $t4,$s1,0x6 -/* f0f4e80: 0c005900 */ jal 0x16400 +/* f0f4e80: 0c005900 */ jal mtx4LoadIdentity /* f0f4e84: 018f2021 */ addu $a0,$t4,$t7 /* f0f4e88: 8e190054 */ lw $t9,0x54($s0) /* f0f4e8c: 26310001 */ addiu $s1,$s1,0x1 @@ -6327,15 +6327,15 @@ glabel var7f1b3c40pf /* f0f4ee8: 00003025 */ move $a2,$zero /* f0f4eec: 24070000 */ li $a3,0x0 /* f0f4ef0: e7b20010 */ swc1 $f18,0x10($sp) -/* f0f4ef4: 0c0079d7 */ jal 0x1e75c +/* f0f4ef4: 0c0079d7 */ jal modelSetAnimation /* f0f4ef8: e7b00014 */ swc1 $f16,0x14($sp) -/* f0f4efc: 0c00772a */ jal 0x1dca8 +/* f0f4efc: 0c00772a */ jal modelGetNumAnimFrames /* f0f4f00: 8fa4003c */ lw $a0,0x3c($sp) /* f0f4f04: 44823000 */ mtc1 $v0,$f6 /* f0f4f08: 8fa4003c */ lw $a0,0x3c($sp) /* f0f4f0c: 468031a0 */ cvt.s.w $f6,$f6 /* f0f4f10: 44053000 */ mfc1 $a1,$f6 -/* f0f4f14: 0c007aaa */ jal 0x1eaa8 +/* f0f4f14: 0c007aaa */ jal model0001e018 /* f0f4f18: 00000000 */ nop /* f0f4f1c: 10000008 */ b .PB0f0f4f40 /* f0f4f20: 860c005c */ lh $t4,0x5c($s0) @@ -6344,7 +6344,7 @@ glabel var7f1b3c40pf /* f0f4f28: 44804000 */ mtc1 $zero,$f8 /* f0f4f2c: 24070000 */ li $a3,0x0 /* f0f4f30: e7aa0010 */ swc1 $f10,0x10($sp) -/* f0f4f34: 0c0079d7 */ jal 0x1e75c +/* f0f4f34: 0c0079d7 */ jal modelSetAnimation /* f0f4f38: e7a80014 */ swc1 $f8,0x14($sp) /* f0f4f3c: 860c005c */ lh $t4,0x5c($s0) .PB0f0f4f40: @@ -6357,16 +6357,16 @@ glabel var7f1b3c40pf /* f0f4f50: 3c05800a */ lui $a1,0x800a /* f0f4f54: 8ca5e510 */ lw $a1,-0x1af0($a1) /* f0f4f58: 8fa4003c */ lw $a0,0x3c($sp) -/* f0f4f5c: 0c007e2a */ jal 0x1f8a8 +/* f0f4f5c: 0c007e2a */ jal model0001ee18 /* f0f4f60: 24060001 */ li $a2,0x1 /* f0f4f64: 8e1905b0 */ lw $t9,0x5b0($s0) /* f0f4f68: 00196ac0 */ sll $t5,$t9,0xb /* f0f4f6c: 05a1000c */ bgez $t5,.PB0f0f4fa0 /* f0f4f70: 00000000 */ nop -/* f0f4f74: 0c00772a */ jal 0x1dca8 +/* f0f4f74: 0c00772a */ jal modelGetNumAnimFrames /* f0f4f78: 8fa4003c */ lw $a0,0x3c($sp) /* f0f4f7c: afa2004c */ sw $v0,0x4c($sp) -/* f0f4f80: 0c007703 */ jal 0x1dc0c +/* f0f4f80: 0c007703 */ jal modelGetCurAnimFrame /* f0f4f84: 8fa4003c */ lw $a0,0x3c($sp) /* f0f4f88: 8fa9004c */ lw $t1,0x4c($sp) /* f0f4f8c: 44892000 */ mtc1 $t1,$f4 @@ -6375,12 +6375,12 @@ glabel var7f1b3c40pf /* f0f4f98: 10000004 */ b .PB0f0f4fac /* f0f4f9c: 46009081 */ sub.s $f2,$f18,$f0 .PB0f0f4fa0: -/* f0f4fa0: 0c007703 */ jal 0x1dc0c +/* f0f4fa0: 0c007703 */ jal modelGetCurAnimFrame /* f0f4fa4: 8fa4003c */ lw $a0,0x3c($sp) /* f0f4fa8: 46000086 */ mov.s $f2,$f0 .PB0f0f4fac: /* f0f4fac: 8fa4003c */ lw $a0,0x3c($sp) -/* f0f4fb0: 0c00772a */ jal 0x1dca8 +/* f0f4fb0: 0c00772a */ jal modelGetNumAnimFrames /* f0f4fb4: e7a20178 */ swc1 $f2,0x178($sp) /* f0f4fb8: 2458ffff */ addiu $t8,$v0,-1 /* f0f4fbc: 44988000 */ mtc1 $t8,$f16 @@ -6394,14 +6394,14 @@ glabel var7f1b3c40pf .PB0f0f4fdc: /* f0f4fdc: 8fa40040 */ lw $a0,0x40($sp) .PB0f0f4fe0: -/* f0f4fe0: 0c0059da */ jal 0x16768 +/* f0f4fe0: 0c0059da */ jal mtx4Copy /* f0f4fe4: 8fa503b4 */ lw $a1,0x3b4($sp) /* f0f4fe8: 8faa0040 */ lw $t2,0x40($sp) /* f0f4fec: 27a403b8 */ addiu $a0,$sp,0x3b8 /* f0f4ff0: 8fa5003c */ lw $a1,0x3c($sp) /* f0f4ff4: afaa03b8 */ sw $t2,0x3b8($sp) /* f0f4ff8: 8e0b006c */ lw $t3,0x6c($s0) -/* f0f4ffc: 0c007653 */ jal 0x1d94c +/* f0f4ffc: 0c007653 */ jal model0001cebc /* f0f5000: afab03c8 */ sw $t3,0x3c8($sp) /* f0f5004: 8e040054 */ lw $a0,0x54($s0) /* f0f5008: 3c0c8008 */ lui $t4,0x8008 @@ -6409,7 +6409,7 @@ glabel var7f1b3c40pf /* f0f5010: 8c8f0004 */ lw $t7,0x4($a0) /* f0f5014: 558f0096 */ bnel $t4,$t7,.PB0f0f5270 /* f0f5018: 8fad0440 */ lw $t5,0x440($sp) -/* f0f501c: 0c006cdb */ jal 0x1b36c +/* f0f501c: 0c006cdb */ jal modelGetPart /* f0f5020: 00002825 */ move $a1,$zero /* f0f5024: 50400032 */ beqzl $v0,.PB0f0f50f0 /* f0f5028: 8e040054 */ lw $a0,0x54($s0) @@ -6466,21 +6466,21 @@ glabel var7f1b3c40pf /* f0f50e8: c50a0010 */ lwc1 $f10,0x10($t0) /* f0f50ec: 8e040054 */ lw $a0,0x54($s0) .PB0f0f50f0: -/* f0f50f0: 0c006cdb */ jal 0x1b36c +/* f0f50f0: 0c006cdb */ jal modelGetPart /* f0f50f4: 24050002 */ li $a1,0x2 /* f0f50f8: 10400019 */ beqz $v0,.PB0f0f5160 /* f0f50fc: 00402025 */ move $a0,$v0 -/* f0f5100: 0c006bdd */ jal 0x1af74 +/* f0f5100: 0c006bdd */ jal model0001a524 /* f0f5104: 00002825 */ move $a1,$zero /* f0f5108: afa20160 */ sw $v0,0x160($sp) -/* f0f510c: 0c005900 */ jal 0x16400 +/* f0f510c: 0c005900 */ jal mtx4LoadIdentity /* f0f5110: 27a40120 */ addiu $a0,$sp,0x120 /* f0f5114: 3c014080 */ lui $at,0x4080 /* f0f5118: 44816000 */ mtc1 $at,$f12 -/* f0f511c: 0fc01ad1 */ jal 0xf006b44 +/* f0f511c: 0fc01ad1 */ jal func0f006b54 /* f0f5120: 00000000 */ nop /* f0f5124: 46000306 */ mov.s $f12,$f0 -/* f0f5128: 0c005b4e */ jal 0x16d38 +/* f0f5128: 0c005b4e */ jal mtx4LoadXRotation /* f0f512c: 27a50120 */ addiu $a1,$sp,0x120 /* f0f5130: 8fac0160 */ lw $t4,0x160($sp) /* f0f5134: 8fab03b4 */ lw $t3,0x3b4($sp) @@ -6489,14 +6489,14 @@ glabel var7f1b3c40pf /* f0f5140: 016f3821 */ addu $a3,$t3,$t7 /* f0f5144: 00e02025 */ move $a0,$a3 /* f0f5148: afa70040 */ sw $a3,0x40($sp) -/* f0f514c: 0c005914 */ jal 0x16450 +/* f0f514c: 0c005914 */ jal mtx4MultMtx4 /* f0f5150: 27a600e0 */ addiu $a2,$sp,0xe0 /* f0f5154: 8fa50040 */ lw $a1,0x40($sp) -/* f0f5158: 0c0059da */ jal 0x16768 +/* f0f5158: 0c0059da */ jal mtx4Copy /* f0f515c: 27a400e0 */ addiu $a0,$sp,0xe0 .PB0f0f5160: /* f0f5160: 8e040054 */ lw $a0,0x54($s0) -/* f0f5164: 0c006cdb */ jal 0x1b36c +/* f0f5164: 0c006cdb */ jal modelGetPart /* f0f5168: 24050001 */ li $a1,0x1 /* f0f516c: 1040003f */ beqz $v0,.PB0f0f526c /* f0f5170: 00402025 */ move $a0,$v0 @@ -6512,7 +6512,7 @@ glabel var7f1b3c40pf /* f0f5198: 54410035 */ bnel $v0,$at,.PB0f0f5270 /* f0f519c: 8fad0440 */ lw $t5,0x440($sp) .PB0f0f51a0: -/* f0f51a0: 0c006bdd */ jal 0x1af74 +/* f0f51a0: 0c006bdd */ jal model0001a524 /* f0f51a4: 00002825 */ move $a1,$zero /* f0f51a8: 8fb903b4 */ lw $t9,0x3b4($sp) /* f0f51ac: 00027180 */ sll $t6,$v0,0x6 @@ -6524,9 +6524,9 @@ glabel var7f1b3c40pf /* f0f51c4: c4700034 */ lwc1 $f16,0x34($v1) /* f0f51c8: e7b000d4 */ swc1 $f16,0xd4($sp) /* f0f51cc: c4660038 */ lwc1 $f6,0x38($v1) -/* f0f51d0: 0fc2d445 */ jal 0xf0b5114 +/* f0f51d0: 0fc2d445 */ jal func0f0b4d04 /* f0f51d4: e7a600d8 */ swc1 $f6,0xd8($sp) -/* f0f51d8: 0c002e4d */ jal 0xb934 +/* f0f51d8: 0c002e4d */ jal viGetWidth /* f0f51dc: 00000000 */ nop /* f0f51e0: c7aa00c8 */ lwc1 $f10,0xc8($sp) /* f0f51e4: 3c0c8008 */ lui $t4,0x8008 @@ -6554,7 +6554,7 @@ glabel var7f1b3c40pf /* f0f5230: 3c01800a */ lui $at,0x800a /* f0f5234: 00005812 */ mflo $t3 /* f0f5238: ac2b23c8 */ sw $t3,0x23c8($at) -/* f0f523c: 0c002e51 */ jal 0xb944 +/* f0f523c: 0c002e51 */ jal viGetHeight /* f0f5240: 00000000 */ nop /* f0f5244: c7a400cc */ lwc1 $f4,0xcc($sp) /* f0f5248: 4600248d */ trunc.w.s $f18,$f4 @@ -6602,7 +6602,7 @@ glabel var7f1b3c40pf /* f0f52e4: 258b0008 */ addiu $t3,$t4,0x8 /* f0f52e8: afab0440 */ sw $t3,0x440($sp) /* f0f52ec: ad8f0000 */ sw $t7,0x0($t4) -/* f0f52f0: 0fc2d6ee */ jal 0xf0b5bb8 +/* f0f52f0: 0fc2d6ee */ jal currentPlayerGetUnk175c /* f0f52f4: afac00b8 */ sw $t4,0xb8($sp) /* f0f52f8: 8fa500b8 */ lw $a1,0xb8($sp) /* f0f52fc: 3c090382 */ lui $t1,0x382 @@ -6612,7 +6612,7 @@ glabel var7f1b3c40pf /* f0f530c: 272e0008 */ addiu $t6,$t9,0x8 /* f0f5310: afae0440 */ sw $t6,0x440($sp) /* f0f5314: af290000 */ sw $t1,0x0($t9) -/* f0f5318: 0fc2d6ee */ jal 0xf0b5bb8 +/* f0f5318: 0fc2d6ee */ jal currentPlayerGetUnk175c /* f0f531c: afb900b4 */ sw $t9,0xb4($sp) /* f0f5320: 8fa600b4 */ lw $a2,0xb4($sp) /* f0f5324: 244d0010 */ addiu $t5,$v0,0x10 @@ -6635,10 +6635,10 @@ glabel var7f1b3c40pf /* f0f5368: afad03bc */ sw $t5,0x3bc($sp) /* f0f536c: 8fa5003c */ lw $a1,0x3c($sp) /* f0f5370: 27a403b8 */ addiu $a0,$sp,0x3b8 -/* f0f5374: 0c00892e */ jal 0x224b8 +/* f0f5374: 0c00892e */ jal modelRender /* f0f5378: afa903c4 */ sw $t1,0x3c4($sp) /* f0f537c: 8fb803c4 */ lw $t8,0x3c4($sp) -/* f0f5380: 0c005c6c */ jal 0x171b0 +/* f0f5380: 0c005c6c */ jal mtx00016760 /* f0f5384: afb80440 */ sw $t8,0x440($sp) /* f0f5388: 8e0a0054 */ lw $t2,0x54($s0) /* f0f538c: 00001025 */ move $v0,$zero @@ -6649,12 +6649,12 @@ glabel var7f1b3c40pf .PB0f0f53a0: /* f0f53a0: afa20040 */ sw $v0,0x40($sp) /* f0f53a4: 27a50070 */ addiu $a1,$sp,0x70 -/* f0f53a8: 0c0059da */ jal 0x16768 +/* f0f53a8: 0c0059da */ jal mtx4Copy /* f0f53ac: 01622021 */ addu $a0,$t3,$v0 /* f0f53b0: 8e0f006c */ lw $t7,0x6c($s0) /* f0f53b4: 0011c980 */ sll $t9,$s1,0x6 /* f0f53b8: 27a40070 */ addiu $a0,$sp,0x70 -/* f0f53bc: 0c005aa9 */ jal 0x16aa4 +/* f0f53bc: 0c005aa9 */ jal mtx00016054 /* f0f53c0: 01f92821 */ addu $a1,$t7,$t9 /* f0f53c4: 8e0e0054 */ lw $t6,0x54($s0) /* f0f53c8: 8fa20040 */ lw $v0,0x40($sp) @@ -6665,13 +6665,13 @@ glabel var7f1b3c40pf /* f0f53dc: 5420fff0 */ bnezl $at,.PB0f0f53a0 /* f0f53e0: 8e0b006c */ lw $t3,0x6c($s0) .PB0f0f53e4: -/* f0f53e4: 0c005c75 */ jal 0x171d4 +/* f0f53e4: 0c005c75 */ jal mtx00016784 /* f0f53e8: 00000000 */ nop /* f0f53ec: 8fad0448 */ lw $t5,0x448($sp) /* f0f53f0: 29a10003 */ slti $at,$t5,0x3 /* f0f53f4: 50200005 */ beqzl $at,.PB0f0f540c /* f0f53f8: 8fb80440 */ lw $t8,0x440($sp) -/* f0f53fc: 0fc3530f */ jal 0xf0d4c3c +/* f0f53fc: 0fc3530f */ jal func0f0d479c /* f0f5400: 8fa40440 */ lw $a0,0x440($sp) /* f0f5404: afa20440 */ sw $v0,0x440($sp) /* f0f5408: 8fb80440 */ lw $t8,0x440($sp) @@ -6727,7 +6727,7 @@ glabel var7f1b3c40pf /* f0f54cc: afa00018 */ sw $zero,0x18($sp) /* f0f54d0: 00002825 */ move $a1,$zero /* f0f54d4: 24060002 */ li $a2,0x2 -/* f0f54d8: 0fc2cf74 */ jal 0xf0b3dd0 +/* f0f54d8: 0fc2cf74 */ jal func0f0b39c0 /* f0f54dc: 00003825 */ move $a3,$zero /* f0f54e0: 8fb90440 */ lw $t9,0x440($sp) /* f0f54e4: 3c09b900 */ lui $t1,0xb900 @@ -6746,7 +6746,7 @@ glabel var7f1b3c40pf /* f0f5518: 02002025 */ move $a0,$s0 /* f0f551c: 00002825 */ move $a1,$zero /* f0f5520: 24060002 */ li $a2,0x2 -/* f0f5524: 0fc2cf74 */ jal 0xf0b3dd0 +/* f0f5524: 0fc2cf74 */ jal func0f0b39c0 /* f0f5528: 00003825 */ move $a3,$zero /* f0f552c: 8fac0440 */ lw $t4,0x440($sp) /* f0f5530: 3c0f0600 */ lui $t7,0x600 @@ -18284,7 +18284,7 @@ glabel var7f1b2ac8 .PB0f0face8: /* f0face8: afa80124 */ sw $t0,0x124($sp) /* f0facec: afa90128 */ sw $t1,0x128($sp) -/* f0facf0: 0fc3c661 */ jal 0xf0f1984 +/* f0facf0: 0fc3c661 */ jal func0f0f1418 /* f0facf4: afac012c */ sw $t4,0x12c($sp) /* f0facf8: 8eef0000 */ lw $t7,0x0($s7) /* f0facfc: 8fa80124 */ lw $t0,0x124($sp) @@ -18325,7 +18325,7 @@ glabel var7f1b2ac8 /* f0fad84: afa90128 */ sw $t1,0x128($sp) /* f0fad88: afaa00f4 */ sw $t2,0xf4($sp) /* f0fad8c: afab00f0 */ sw $t3,0xf0($sp) -/* f0fad90: 0fc3de81 */ jal 0xf0f7a04 +/* f0fad90: 0fc3de81 */ jal menuGetContPads /* f0fad94: afac012c */ sw $t4,0x12c($sp) /* f0fad98: 83a200d7 */ lb $v0,0xd7($sp) /* f0fad9c: 8fa80124 */ lw $t0,0x124($sp) @@ -18368,7 +18368,7 @@ glabel var7f1b2ac8 /* f0fae28: afab00f0 */ sw $t3,0xf0($sp) /* f0fae2c: afac012c */ sw $t4,0x12c($sp) /* f0fae30: afae00cc */ sw $t6,0xcc($sp) -/* f0fae34: 0fc426eb */ jal 0xf109bac +/* f0fae34: 0fc426eb */ jal filemgrSaveOrLoad /* f0fae38: a7af00d0 */ sh $t7,0xd0($sp) /* f0fae3c: 8fa80124 */ lw $t0,0x124($sp) /* f0fae40: 8fa90128 */ lw $t1,0x128($sp) @@ -18391,22 +18391,22 @@ glabel var7f1b2ac8 /* f0fae78: afab00f0 */ sw $t3,0xf0($sp) /* f0fae7c: afaa00f4 */ sw $t2,0xf4($sp) /* f0fae80: afa90128 */ sw $t1,0x128($sp) -/* f0fae84: 0c005616 */ jal 0x15858 +/* f0fae84: 0c005616 */ jal joyGetStickX /* f0fae88: afa80124 */ sw $t0,0x124($sp) /* f0fae8c: 00028600 */ sll $s0,$v0,0x18 /* f0fae90: 0010c603 */ sra $t8,$s0,0x18 /* f0fae94: 03008025 */ move $s0,$t8 -/* f0fae98: 0c005640 */ jal 0x15900 +/* f0fae98: 0c005640 */ jal joyGetStickY /* f0fae9c: 82640003 */ lb $a0,0x3($s3) /* f0faea0: 00028e00 */ sll $s1,$v0,0x18 /* f0faea4: 0011ce03 */ sra $t9,$s1,0x18 /* f0faea8: 03208825 */ move $s1,$t9 /* f0faeac: 82640003 */ lb $a0,0x3($s3) -/* f0faeb0: 0c00566a */ jal 0x159a8 +/* f0faeb0: 0c00566a */ jal joyGetButtons /* f0faeb4: 3405ffff */ li $a1,0xffff /* f0faeb8: 3052ffff */ andi $s2,$v0,0xffff /* f0faebc: 82640003 */ lb $a0,0x3($s3) -/* f0faec0: 0c00569a */ jal 0x15a68 +/* f0faec0: 0c00569a */ jal joyGetButtonsPressedThisFrame /* f0faec4: 3405ffff */ li $a1,0xffff /* f0faec8: 304e8000 */ andi $t6,$v0,0x8000 /* f0faecc: 8fa80124 */ lw $t0,0x124($sp) @@ -19140,7 +19140,7 @@ glabel var7f1b2ac8 /* f0fb850: 24060001 */ li $a2,0x1 /* f0fb854: 24130001 */ li $s3,0x1 .PB0f0fb858: -/* f0fb858: 0fc3e62e */ jal 0xf0f98b8 +/* f0fb858: 0fc3e62e */ jal dialogTick /* f0fb85c: 8e240000 */ lw $a0,0x0($s1) /* f0fb860: 824e0014 */ lb $t6,0x14($s2) /* f0fb864: 26100001 */ addiu $s0,$s0,0x1 @@ -19199,7 +19199,7 @@ glabel var7f1b2ac8 /* f0fb930: 24847c98 */ addiu $a0,$a0,0x7c98 /* f0fb934: 10820005 */ beq $a0,$v0,.PB0f0fb94c /* f0fb938: 00000000 */ nop -/* f0fb93c: 0fc3cd2e */ jal 0xf0f34b8 +/* f0fb93c: 0fc3cd2e */ jal menuPushDialog /* f0fb940: 00000000 */ nop /* f0fb944: 1000002f */ b .PB0f0fba04 /* f0fb948: 8fbf003c */ lw $ra,0x3c($sp) @@ -19208,7 +19208,7 @@ glabel var7f1b2ac8 /* f0fb950: 27188b60 */ addiu $t8,$t8,-29856 /* f0fb954: 5702002b */ bnel $t8,$v0,.PB0f0fba04 /* f0fb958: 8fbf003c */ lw $ra,0x3c($sp) -/* f0fb95c: 0fc603da */ jal 0xf180f68 +/* f0fb95c: 0fc603da */ jal func0f17f428 /* f0fb960: 00000000 */ nop /* f0fb964: 10000027 */ b .PB0f0fba04 /* f0fb968: 8fbf003c */ lw $ra,0x3c($sp) @@ -19216,7 +19216,7 @@ glabel var7f1b2ac8 /* f0fb970: 8dce2434 */ lw $t6,0x2434($t6) /* f0fb974: 51c00010 */ beqzl $t6,.PB0f0fb9b8 /* f0fb978: 240e000a */ li $t6,0xa -/* f0fb97c: 0fc3e19f */ jal 0xf0f867c +/* f0fb97c: 0fc3e19f */ jal func0f0f8120 /* f0fb980: 00000000 */ nop /* f0fb984: 3c0f8007 */ lui $t7,0x8007 /* f0fb988: 8def3118 */ lw $t7,0x3118($t7) @@ -19248,7 +19248,7 @@ glabel var7f1b2ac8 /* f0fb9ec: 33380020 */ andi $t8,$t9,0x20 /* f0fb9f0: 57000004 */ bnezl $t8,.PB0f0fba04 /* f0fb9f4: 8fbf003c */ lw $ra,0x3c($sp) -/* f0fb9f8: 0fc3e19f */ jal 0xf0f867c +/* f0fb9f8: 0fc3e19f */ jal func0f0f8120 /* f0fb9fc: 00000000 */ nop .PB0f0fba00: /* f0fba00: 8fbf003c */ lw $ra,0x3c($sp) diff --git a/src/game/menugfx.c b/src/game/menugfx.c index 2e529d6d5..c902fdcc0 100644 --- a/src/game/menugfx.c +++ b/src/game/menugfx.c @@ -202,12 +202,12 @@ glabel menugfxCreateBlur /* f0e0c0c: afb30024 */ sw $s3,0x24($sp) /* f0e0c10: afb20020 */ sw $s2,0x20($sp) /* f0e0c14: afb1001c */ sw $s1,0x1c($sp) -/* f0e0c18: 0c002a16 */ jal 0xa858 +/* f0e0c18: 0c002a16 */ jal viGetFrontBuffer /* f0e0c1c: afb00018 */ sw $s0,0x18($sp) -/* f0e0c20: 0c002e4d */ jal 0xb934 +/* f0e0c20: 0c002e4d */ jal viGetWidth /* f0e0c24: 00408025 */ move $s0,$v0 /* f0e0c28: 00026840 */ sll $t5,$v0,0x1 -/* f0e0c2c: 0c002e4d */ jal 0xb934 +/* f0e0c2c: 0c002e4d */ jal viGetWidth /* f0e0c30: afad0070 */ sw $t5,0x70($sp) /* f0e0c34: 44822000 */ mtc1 $v0,$f4 /* f0e0c38: 3c0143a0 */ lui $at,0x43a0 @@ -223,7 +223,7 @@ glabel menugfxCreateBlur /* f0e0c60: 15e10007 */ bne $t7,$at,.PB0f0e0c80 /* f0e0c64: 46083003 */ div.s $f0,$f6,$f8 /* f0e0c68: afad0070 */ sw $t5,0x70($sp) -/* f0e0c6c: 0c002a16 */ jal 0xa858 +/* f0e0c6c: 0c002a16 */ jal viGetFrontBuffer /* f0e0c70: e7a0006c */ swc1 $f0,0x6c($sp) /* f0e0c74: 8fad0070 */ lw $t5,0x70($sp) /* f0e0c78: c7a0006c */ lwc1 $f0,0x6c($sp) @@ -234,7 +234,7 @@ glabel menugfxCreateBlur /* f0e0c88: 24a52e50 */ addiu $a1,$a1,0x2e50 /* f0e0c8c: 2484fc40 */ addiu $a0,$a0,-960 /* f0e0c90: afad0070 */ sw $t5,0x70($sp) -/* f0e0c94: 0c003648 */ jal 0xd920 +/* f0e0c94: 0c003648 */ jal mainOverrideVariable /* f0e0c98: e7a0006c */ swc1 $f0,0x6c($sp) /* f0e0c9c: 8fad0070 */ lw $t5,0x70($sp) /* f0e0ca0: 3c15800a */ lui $s5,0x800a @@ -883,9 +883,9 @@ glabel menugfxRenderBgBlur /* f0e0e98: afa60098 */ sw $a2,0x98($sp) /* f0e0e9c: 15c10013 */ bne $t6,$at,.PB0f0e0eec /* f0e0ea0: afa7009c */ sw $a3,0x9c($sp) -/* f0e0ea4: 0c002e4d */ jal 0xb934 +/* f0e0ea4: 0c002e4d */ jal viGetWidth /* f0e0ea8: 00000000 */ nop -/* f0e0eac: 0c002e51 */ jal 0xb944 +/* f0e0eac: 0c002e51 */ jal viGetHeight /* f0e0eb0: a7a20030 */ sh $v0,0x30($sp) /* f0e0eb4: 240f00ff */ li $t7,0xff /* f0e0eb8: 241800ff */ li $t8,0xff @@ -897,15 +897,15 @@ glabel menugfxRenderBgBlur /* f0e0ed0: 00002825 */ move $a1,$zero /* f0e0ed4: 00003025 */ move $a2,$zero /* f0e0ed8: 87a70030 */ lh $a3,0x30($sp) -/* f0e0edc: 0fc38881 */ jal 0xf0e2204 +/* f0e0edc: 0fc38881 */ jal menugfxRenderGradient /* f0e0ee0: afa20010 */ sw $v0,0x10($sp) /* f0e0ee4: 100000b8 */ b .PB0f0e11c8 /* f0e0ee8: 8fbf002c */ lw $ra,0x2c($sp) .PB0f0e0eec: -/* f0e0eec: 0fc5a40f */ jal 0xf16903c +/* f0e0eec: 0fc5a40f */ jal gfxAllocateColours /* f0e0ef0: 24040001 */ li $a0,0x1 /* f0e0ef4: afa2008c */ sw $v0,0x8c($sp) -/* f0e0ef8: 0fc5a3f5 */ jal 0xf168fd4 +/* f0e0ef8: 0fc5a3f5 */ jal gfxAllocateVertices /* f0e0efc: 24040004 */ li $a0,0x4 /* f0e0f00: 02001825 */ move $v1,$s0 /* f0e0f04: 26100008 */ addiu $s0,$s0,0x8 @@ -1009,12 +1009,12 @@ glabel menugfxRenderBgBlur /* f0e108c: ac4c0004 */ sw $t4,0x4($v0) /* f0e1090: ac4b0000 */ sw $t3,0x0($v0) /* f0e1094: 26100008 */ addiu $s0,$s0,0x8 -/* f0e1098: 0c002e4d */ jal 0xb934 +/* f0e1098: 0c002e4d */ jal viGetWidth /* f0e109c: afa50088 */ sw $a1,0x88($sp) /* f0e10a0: 00026880 */ sll $t5,$v0,0x2 /* f0e10a4: 01a26821 */ addu $t5,$t5,$v0 /* f0e10a8: 000d6840 */ sll $t5,$t5,0x1 -/* f0e10ac: 0c002e51 */ jal 0xb944 +/* f0e10ac: 0c002e51 */ jal viGetHeight /* f0e10b0: afad0084 */ sw $t5,0x84($sp) /* f0e10b4: 8fa50088 */ lw $a1,0x88($sp) /* f0e10b8: 87a9009a */ lh $t1,0x9a($sp) @@ -1064,7 +1064,7 @@ glabel menugfxRenderBgBlur /* f0e1168: afa3003c */ sw $v1,0x3c($sp) /* f0e116c: 26100008 */ addiu $s0,$s0,0x8 /* f0e1170: afa50088 */ sw $a1,0x88($sp) -/* f0e1174: 0c012de0 */ jal 0x4b780 +/* f0e1174: 0c012de0 */ jal osVirtualToPhysical /* f0e1178: 00c02025 */ move $a0,$a2 /* f0e117c: 8fa3003c */ lw $v1,0x3c($sp) /* f0e1180: 8fa40088 */ lw $a0,0x88($sp) @@ -1074,7 +1074,7 @@ glabel menugfxRenderBgBlur /* f0e1190: ac620004 */ sw $v0,0x4($v1) /* f0e1194: accb0000 */ sw $t3,0x0($a2) /* f0e1198: afa60038 */ sw $a2,0x38($sp) -/* f0e119c: 0c012de0 */ jal 0x4b780 +/* f0e119c: 0c012de0 */ jal osVirtualToPhysical /* f0e11a0: 26100008 */ addiu $s0,$s0,0x8 /* f0e11a4: 8fa60038 */ lw $a2,0x38($sp) /* f0e11a8: 3c0cb100 */ lui $t4,0xb100 diff --git a/src/game/mplayer/mplayer.c b/src/game/mplayer/mplayer.c index 827c493ae..5a7b8b998 100644 --- a/src/game/mplayer/mplayer.c +++ b/src/game/mplayer/mplayer.c @@ -4604,18 +4604,18 @@ glabel mpChooseTrack /* f18e078: afb30024 */ sw $s3,0x24($sp) /* f18e07c: afb20020 */ sw $s2,0x20($sp) /* f18e080: afb1001c */ sw $s1,0x1c($sp) -/* f18e084: 0fc63792 */ jal 0xf18de48 +/* f18e084: 0fc63792 */ jal mpGetUsingMultipleTunes /* f18e088: afb00018 */ sw $s0,0x18($sp) /* f18e08c: 1040006f */ beqz $v0,.PB0f18e24c /* f18e090: 00000000 */ nop -/* f18e094: 0fc63769 */ jal 0xf18dda4 +/* f18e094: 0fc63769 */ jal mpGetNumUnlockedTracks /* f18e098: 00000000 */ nop /* f18e09c: 0040a025 */ move $s4,$v0 /* f18e0a0: 0000a825 */ move $s5,$zero /* f18e0a4: 18400009 */ blez $v0,.PB0f18e0cc /* f18e0a8: 00008025 */ move $s0,$zero .PB0f18e0ac: -/* f18e0ac: 0fc63795 */ jal 0xf18de54 +/* f18e0ac: 0fc63795 */ jal mpIsMultiTrackSlotEnabled /* f18e0b0: 02002025 */ move $a0,$s0 /* f18e0b4: 10400002 */ beqz $v0,.PB0f18e0c0 /* f18e0b8: 26100001 */ addiu $s0,$s0,0x1 @@ -4629,7 +4629,7 @@ glabel mpChooseTrack /* f18e0d0: 3c16800b */ lui $s6,0x800b /* f18e0d4: 26d61240 */ addiu $s6,$s6,0x1240 .PB0f18e0d8: -/* f18e0d8: 0c004be0 */ jal 0x12f80 +/* f18e0d8: 0c004be0 */ jal random /* f18e0dc: 00000000 */ nop /* f18e0e0: 0054001b */ divu $zero,$v0,$s4 /* f18e0e4: 00002010 */ mfhi $a0 @@ -4637,7 +4637,7 @@ glabel mpChooseTrack /* f18e0ec: 00000000 */ nop /* f18e0f0: 0007000d */ break 0x7 .PB0f18e0f4: -/* f18e0f4: 0fc6374e */ jal 0xf18dd38 +/* f18e0f4: 0fc6374e */ jal mpGetTrackNumAtSlotIndex /* f18e0f8: 00000000 */ nop /* f18e0fc: 8ece0004 */ lw $t6,0x4($s6) /* f18e100: 00409825 */ move $s3,$v0 @@ -4665,7 +4665,7 @@ glabel mpChooseTrack /* f18e154: 26d61240 */ addiu $s6,$s6,0x1240 /* f18e158: 00008025 */ move $s0,$zero .PB0f18e15c: -/* f18e15c: 0c004be0 */ jal 0x12f80 +/* f18e15c: 0c004be0 */ jal random /* f18e160: 00008825 */ move $s1,$zero /* f18e164: 0055001b */ divu $zero,$v0,$s5 /* f18e168: 00009010 */ mfhi $s2 @@ -4677,7 +4677,7 @@ glabel mpChooseTrack /* f18e17c: 5a80000d */ blezl $s4,.PB0f18e1b4 /* f18e180: 2401ffff */ li $at,-1 .PB0f18e184: -/* f18e184: 0fc63795 */ jal 0xf18de54 +/* f18e184: 0fc63795 */ jal mpIsMultiTrackSlotEnabled /* f18e188: 02002025 */ move $a0,$s0 /* f18e18c: 50400006 */ beqzl $v0,.PB0f18e1a8 /* f18e190: 26100001 */ addiu $s0,$s0,0x1 @@ -4706,7 +4706,7 @@ glabel mpChooseTrack /* f18e1e0: 10000055 */ b .PB0f18e338 /* f18e1e4: 00031242 */ srl $v0,$v1,0x9 .PB0f18e1e8: -/* f18e1e8: 0fc6374e */ jal 0xf18dd38 +/* f18e1e8: 0fc6374e */ jal mpGetTrackNumAtSlotIndex /* f18e1ec: 02602025 */ move $a0,$s3 /* f18e1f0: 2aa10002 */ slti $at,$s5,0x2 /* f18e1f4: 14200004 */ bnez $at,.PB0f18e208 @@ -4733,17 +4733,17 @@ glabel mpChooseTrack /* f18e244: 1000003c */ b .PB0f18e338 /* f18e248: 00031242 */ srl $v0,$v1,0x9 .PB0f18e24c: -/* f18e24c: 0fc6380b */ jal 0xf18e02c +/* f18e24c: 0fc6380b */ jal mpGetCurrentTrackSlotNum /* f18e250: 00000000 */ nop /* f18e254: 04410024 */ bgez $v0,.PB0f18e2e8 /* f18e258: 00409825 */ move $s3,$v0 -/* f18e25c: 0fc63769 */ jal 0xf18dda4 +/* f18e25c: 0fc63769 */ jal mpGetNumUnlockedTracks /* f18e260: 00000000 */ nop /* f18e264: 3c16800b */ lui $s6,0x800b /* f18e268: 00408025 */ move $s0,$v0 /* f18e26c: 26d61240 */ addiu $s6,$s6,0x1240 .PB0f18e270: -/* f18e270: 0c004be0 */ jal 0x12f80 +/* f18e270: 0c004be0 */ jal random /* f18e274: 00000000 */ nop /* f18e278: 0050001b */ divu $zero,$v0,$s0 /* f18e27c: 00002010 */ mfhi $a0 @@ -4751,7 +4751,7 @@ glabel mpChooseTrack /* f18e284: 00000000 */ nop /* f18e288: 0007000d */ break 0x7 .PB0f18e28c: -/* f18e28c: 0fc6374e */ jal 0xf18dd38 +/* f18e28c: 0fc6374e */ jal mpGetTrackNumAtSlotIndex /* f18e290: 00000000 */ nop /* f18e294: 8ece0004 */ lw $t6,0x4($s6) /* f18e298: 00409825 */ move $s3,$v0 @@ -4775,7 +4775,7 @@ glabel mpChooseTrack /* f18e2e0: 10000015 */ b .PB0f18e338 /* f18e2e4: 00031242 */ srl $v0,$v1,0x9 .PB0f18e2e8: -/* f18e2e8: 0fc6374e */ jal 0xf18dd38 +/* f18e2e8: 0fc6374e */ jal mpGetTrackNumAtSlotIndex /* f18e2ec: 02602025 */ move $a0,$s3 /* f18e2f0: 00024080 */ sll $t0,$v0,0x2 /* f18e2f4: 3c16800b */ lui $s6,0x800b diff --git a/src/game/pak/pak.c b/src/game/pak/pak.c index 6115bcb03..46c94c33b 100644 --- a/src/game/pak/pak.c +++ b/src/game/pak/pak.c @@ -3155,7 +3155,7 @@ glabel pakRepairFilesystem /* f11a028: 00008825 */ move $s1,$zero /* f11a02c: aed90260 */ sw $t9,0x260($s6) /* f11a030: a2c002be */ sb $zero,0x2be($s6) -/* f11a034: 0fc45c1e */ jal 0xf117078 +/* f11a034: 0fc45c1e */ jal pak0f1167d8 /* f11a038: 01202025 */ move $a0,$t1 /* f11a03c: 50400004 */ beqzl $v0,.PB0f11a050 /* f11a040: 8eca02a0 */ lw $t2,0x2a0($s6) @@ -3173,7 +3173,7 @@ glabel pakRepairFilesystem /* f11a068: 00045e03 */ sra $t3,$a0,0x18 /* f11a06c: 01602025 */ move $a0,$t3 /* f11a070: 8fa503a4 */ lw $a1,0x3a4($sp) -/* f11a074: 0fc45f70 */ jal 0xf117dc0 +/* f11a074: 0fc45f70 */ jal pakReadHeaderAtOffset /* f11a078: 02a03025 */ move $a2,$s5 /* f11a07c: 14400071 */ bnez $v0,.PB0f11a244 /* f11a080: 24010001 */ li $at,0x1 @@ -3201,7 +3201,7 @@ glabel pakRepairFilesystem /* f11a0d8: afa00010 */ sw $zero,0x10($sp) /* f11a0dc: afa00014 */ sw $zero,0x14($sp) /* f11a0e0: afa00018 */ sw $zero,0x18($sp) -/* f11a0e4: 0fc47144 */ jal 0xf11c510 +/* f11a0e4: 0fc47144 */ jal pakWriteFileAtOffset /* f11a0e8: afa0001c */ sw $zero,0x1c($sp) /* f11a0ec: 50400082 */ beqzl $v0,.PB0f11a2f8 /* f11a0f0: 8fae07a4 */ lw $t6,0x7a4($sp) @@ -3236,7 +3236,7 @@ glabel pakRepairFilesystem /* f11a15c: 00046e03 */ sra $t5,$a0,0x18 /* f11a160: 01a02025 */ move $a0,$t5 /* f11a164: 27a503a4 */ addiu $a1,$sp,0x3a4 -/* f11a168: 0fc46760 */ jal 0xf119d80 +/* f11a168: 0fc46760 */ jal pakRepairAsBlank /* f11a16c: 02a03025 */ move $a2,$s5 /* f11a170: 1000001f */ b .PB0f11a1f0 /* f11a174: 2c570001 */ sltiu $s7,$v0,0x1 @@ -3251,14 +3251,14 @@ glabel pakRepairFilesystem /* f11a194: 03002025 */ move $a0,$t8 /* f11a198: afb90054 */ sw $t9,0x54($sp) /* f11a19c: 00e02825 */ move $a1,$a3 -/* f11a1a0: 0fc46760 */ jal 0xf119d80 +/* f11a1a0: 0fc46760 */ jal pakRepairAsBlank /* f11a1a4: afa7005c */ sw $a3,0x5c($sp) /* f11a1a8: 8fa7005c */ lw $a3,0x5c($sp) /* f11a1ac: 2c570001 */ sltiu $s7,$v0,0x1 /* f11a1b0: 02a02825 */ move $a1,$s5 /* f11a1b4: acf20000 */ sw $s2,0x0($a3) /* f11a1b8: 8fa40054 */ lw $a0,0x54($sp) -/* f11a1bc: 0c012ae8 */ jal 0x4aba0 +/* f11a1bc: 0c012ae8 */ jal memcpy /* f11a1c0: 24060010 */ li $a2,0x10 /* f11a1c4: 8fab03a4 */ lw $t3,0x3a4($sp) /* f11a1c8: 8fa6047c */ lw $a2,0x47c($sp) @@ -3283,7 +3283,7 @@ glabel pakRepairFilesystem /* f11a20c: 03298021 */ addu $s0,$t9,$t1 /* f11a210: 026f2021 */ addu $a0,$s3,$t7 /* f11a214: 02a02825 */ move $a1,$s5 -/* f11a218: 0c012ae8 */ jal 0x4aba0 +/* f11a218: 0c012ae8 */ jal memcpy /* f11a21c: 24060010 */ li $a2,0x10 /* f11a220: 8fae03a4 */ lw $t6,0x3a4($sp) /* f11a224: 8fa6047c */ lw $a2,0x47c($sp) @@ -3305,7 +3305,7 @@ glabel pakRepairFilesystem /* f11a25c: 00046e03 */ sra $t5,$a0,0x18 /* f11a260: 01a02025 */ move $a0,$t5 /* f11a264: 27a503a4 */ addiu $a1,$sp,0x3a4 -/* f11a268: 0fc46760 */ jal 0xf119d80 +/* f11a268: 0fc46760 */ jal pakRepairAsBlank /* f11a26c: 00003025 */ move $a2,$zero /* f11a270: 1000001a */ b .PB0f11a2dc /* f11a274: 2c570001 */ sltiu $s7,$v0,0x1 @@ -3316,7 +3316,7 @@ glabel pakRepairFilesystem /* f11a284: 0004c603 */ sra $t8,$a0,0x18 /* f11a288: 03002025 */ move $a0,$t8 /* f11a28c: 27a503a4 */ addiu $a1,$sp,0x3a4 -/* f11a290: 0fc46760 */ jal 0xf119d80 +/* f11a290: 0fc46760 */ jal pakRepairAsBlank /* f11a294: 02a03025 */ move $a2,$s5 /* f11a298: 14400010 */ bnez $v0,.PB0f11a2dc /* f11a29c: 00000000 */ nop @@ -3360,7 +3360,7 @@ glabel pakRepairFilesystem /* f11a31c: 00045603 */ sra $t2,$a0,0x18 /* f11a320: 01402025 */ move $a0,$t2 /* f11a324: 8fa503a4 */ lw $a1,0x3a4($sp) -/* f11a328: 0fc45f70 */ jal 0xf117dc0 +/* f11a328: 0fc45f70 */ jal pakReadHeaderAtOffset /* f11a32c: 02a03025 */ move $a2,$s5 /* f11a330: 14400017 */ bnez $v0,.PB0f11a390 /* f11a334: 8fa6047c */ lw $a2,0x47c($sp) @@ -3437,7 +3437,7 @@ glabel pakRepairFilesystem /* f11a428: 00047603 */ sra $t6,$a0,0x18 /* f11a42c: 01c02025 */ move $a0,$t6 /* f11a430: 8fa503a4 */ lw $a1,0x3a4($sp) -/* f11a434: 0fc45f70 */ jal 0xf117dc0 +/* f11a434: 0fc45f70 */ jal pakReadHeaderAtOffset /* f11a438: 02a03025 */ move $a2,$s5 /* f11a43c: 14400025 */ bnez $v0,.PB0f11a4d4 /* f11a440: 8fa6047c */ lw $a2,0x47c($sp) @@ -3512,7 +3512,7 @@ glabel pakRepairFilesystem /* f11a534: 2c410010 */ sltiu $at,$v0,0x10 /* f11a538: 10200004 */ beqz $at,.PB0f11a54c /* f11a53c: aec20260 */ sw $v0,0x260($s6) -/* f11a540: 0fc45bcb */ jal 0xf116f2c +/* f11a540: 0fc45bcb */ jal pakGenerateSerial /* f11a544: 01e02025 */ move $a0,$t7 /* f11a548: aec20260 */ sw $v0,0x260($s6) .PB0f11a54c: @@ -3524,7 +3524,7 @@ glabel pakRepairFilesystem /* f11a55c: 00044e03 */ sra $t1,$a0,0x18 /* f11a560: 01202025 */ move $a0,$t1 /* f11a564: 8fa503a4 */ lw $a1,0x3a4($sp) -/* f11a568: 0fc45f70 */ jal 0xf117dc0 +/* f11a568: 0fc45f70 */ jal pakReadHeaderAtOffset /* f11a56c: 02a03025 */ move $a2,$s5 /* f11a570: 1440001c */ bnez $v0,.PB0f11a5e4 /* f11a574: 8fa6047c */ lw $a2,0x47c($sp) @@ -3541,7 +3541,7 @@ glabel pakRepairFilesystem /* f11a5a0: 00046e03 */ sra $t5,$a0,0x18 /* f11a5a4: 01a02025 */ move $a0,$t5 /* f11a5a8: 8fa503a4 */ lw $a1,0x3a4($sp) -/* f11a5ac: 0fc46746 */ jal 0xf119d18 +/* f11a5ac: 0fc46746 */ jal pakWriteBlankFile /* f11a5b0: 02a03025 */ move $a2,$s5 /* f11a5b4: 8fa6047c */ lw $a2,0x47c($sp) .PB0f11a5b8: @@ -3575,7 +3575,7 @@ glabel pakRepairFilesystem /* f11a614: 00046e03 */ sra $t5,$a0,0x18 /* f11a618: 55800007 */ bnezl $t4,.PB0f11a638 /* f11a61c: 00001025 */ move $v0,$zero -/* f11a620: 0fc45bcb */ jal 0xf116f2c +/* f11a620: 0fc45bcb */ jal pakGenerateSerial /* f11a624: 01a02025 */ move $a0,$t5 /* f11a628: aec20260 */ sw $v0,0x260($s6) /* f11a62c: 10000002 */ b .PB0f11a638 diff --git a/src/game/player.c b/src/game/player.c index d519e7af6..51a423f95 100644 --- a/src/game/player.c +++ b/src/game/player.c @@ -3771,14 +3771,14 @@ glabel var7f1af390 /* f0bde3c: 00000000 */ nop /* f0bde40: ae200000 */ sw $zero,0x0($s1) .PB0f0bde44: -/* f0bde44: 0fc55163 */ jal 0xf15458c +/* f0bde44: 0fc55163 */ jal func0f1531dc /* f0bde48: 00002025 */ move $a0,$zero -/* f0bde4c: 0fc550b3 */ jal 0xf1542cc +/* f0bde4c: 0fc550b3 */ jal optionsGetScreenRatio /* f0bde50: 00000000 */ nop /* f0bde54: 24010001 */ li $at,0x1 /* f0bde58: 14410008 */ bne $v0,$at,.PB0f0bde7c /* f0bde5c: 00000000 */ nop -/* f0bde60: 0fc2f5f1 */ jal 0xf0bd7c4 +/* f0bde60: 0fc2f5f1 */ jal player0f0bd358 /* f0bde64: 00000000 */ nop /* f0bde68: 3c017f1b */ lui $at,0x7f1b /* f0bde6c: c424f390 */ lwc1 $f4,-0xc70($at) @@ -3786,7 +3786,7 @@ glabel var7f1af390 /* f0bde74: 10000004 */ b .PB0f0bde88 /* f0bde78: 00000000 */ nop .PB0f0bde7c: -/* f0bde7c: 0fc2f5f1 */ jal 0xf0bd7c4 +/* f0bde7c: 0fc2f5f1 */ jal player0f0bd358 /* f0bde80: 00000000 */ nop /* f0bde84: 46000386 */ mov.s $f14,$f0 .PB0f0bde88: @@ -3798,7 +3798,7 @@ glabel var7f1af390 /* f0bde9c: 3c047f1b */ lui $a0,0x7f1b /* f0bdea0: 2484f224 */ addiu $a0,$a0,-3548 /* f0bdea4: 02002825 */ move $a1,$s0 -/* f0bdea8: 0c003648 */ jal 0xd920 +/* f0bdea8: 0c003648 */ jal mainOverrideVariable /* f0bdeac: e7ae032c */ swc1 $f14,0x32c($sp) /* f0bdeb0: 8e0f0000 */ lw $t7,0x0($s0) /* f0bdeb4: 51e00008 */ beqzl $t7,.PB0f0bded8 @@ -3815,45 +3815,45 @@ glabel var7f1af390 /* f0bdedc: 912a1bfc */ lbu $t2,0x1bfc($t1) /* f0bdee0: 51400004 */ beqzl $t2,.PB0f0bdef4 /* f0bdee4: 8e6b04b4 */ lw $t3,0x4b4($s3) -/* f0bdee8: 0fc2f654 */ jal 0xf0bd950 +/* f0bdee8: 0fc2f654 */ jal playerTickTeleport /* f0bdeec: 27a4032c */ addiu $a0,$sp,0x32c /* f0bdef0: 8e6b04b4 */ lw $t3,0x4b4($s3) .PB0f0bdef4: /* f0bdef4: 2401004e */ li $at,0x4e /* f0bdef8: 5561000a */ bnel $t3,$at,.PB0f0bdf24 /* f0bdefc: 3c014270 */ lui $at,0x4270 -/* f0bdf00: 0fc06b7e */ jal 0xf01adf8 +/* f0bdf00: 0fc06b7e */ jal func0f01ad5c /* f0bdf04: 00000000 */ nop /* f0bdf08: 50400006 */ beqzl $v0,.PB0f0bdf24 /* f0bdf0c: 3c014270 */ lui $at,0x4270 -/* f0bdf10: 0fc06b95 */ jal 0xf01ae54 +/* f0bdf10: 0fc06b95 */ jal func0f01adb8 /* f0bdf14: 00000000 */ nop /* f0bdf18: 1000083b */ b .PB0f0c0008 /* f0bdf1c: 8fbf004c */ lw $ra,0x4c($sp) /* f0bdf20: 3c014270 */ lui $at,0x4270 .PB0f0bdf24: /* f0bdf24: 44816000 */ mtc1 $at,$f12 -/* f0bdf28: 0fc4a7ed */ jal 0xf129fb4 +/* f0bdf28: 0fc4a7ed */ jal playermgrSetFovY /* f0bdf2c: 00000000 */ nop -/* f0bdf30: 0fc4a7f1 */ jal 0xf129fc4 +/* f0bdf30: 0fc4a7f1 */ jal playermgrSetAspectRatio /* f0bdf34: c7ac032c */ lwc1 $f12,0x32c($sp) -/* f0bdf38: 0fc2f270 */ jal 0xf0bc9c0 +/* f0bdf38: 0fc2f270 */ jal playerGetViewportWidth /* f0bdf3c: 00000000 */ nop /* f0bdf40: 00028400 */ sll $s0,$v0,0x10 /* f0bdf44: 00106403 */ sra $t4,$s0,0x10 -/* f0bdf48: 0fc2f3c3 */ jal 0xf0bcf0c +/* f0bdf48: 0fc2f3c3 */ jal playerGetViewportHeight /* f0bdf4c: 01808025 */ move $s0,$t4 /* f0bdf50: 02002025 */ move $a0,$s0 -/* f0bdf54: 0fc4a7df */ jal 0xf129f7c +/* f0bdf54: 0fc4a7df */ jal playermgrSetViewSize /* f0bdf58: 00402825 */ move $a1,$v0 -/* f0bdf5c: 0fc2f306 */ jal 0xf0bcc18 +/* f0bdf5c: 0fc2f306 */ jal playerGetViewportLeft /* f0bdf60: 00000000 */ nop /* f0bdf64: 00028400 */ sll $s0,$v0,0x10 /* f0bdf68: 00106c03 */ sra $t5,$s0,0x10 -/* f0bdf6c: 0fc2f4a4 */ jal 0xf0bd290 +/* f0bdf6c: 0fc2f4a4 */ jal playerGetViewportTop /* f0bdf70: 01a08025 */ move $s0,$t5 /* f0bdf74: 02002025 */ move $a0,$s0 -/* f0bdf78: 0fc4a7e6 */ jal 0xf129f98 +/* f0bdf78: 0fc4a7e6 */ jal playermgrSetViewPosition /* f0bdf7c: 00402825 */ move $a1,$v0 /* f0bdf80: 8e2e0000 */ lw $t6,0x0($s1) /* f0bdf84: 3c048007 */ lui $a0,0x8007 @@ -3863,13 +3863,13 @@ glabel var7f1af390 /* f0bdf94: 01ee7823 */ subu $t7,$t7,$t6 /* f0bdf98: 000f7880 */ sll $t7,$t7,0x2 /* f0bdf9c: 008f2021 */ addu $a0,$a0,$t7 -/* f0bdfa0: 0c0029f7 */ jal 0xa7dc +/* f0bdfa0: 0c0029f7 */ jal viSetMode /* f0bdfa4: 8c842350 */ lw $a0,0x2350($a0) -/* f0bdfa8: 0fc2f270 */ jal 0xf0bc9c0 +/* f0bdfa8: 0fc2f270 */ jal playerGetViewportWidth /* f0bdfac: 00000000 */ nop /* f0bdfb0: 00028400 */ sll $s0,$v0,0x10 /* f0bdfb4: 0010c403 */ sra $t8,$s0,0x10 -/* f0bdfb8: 0fc2f3c3 */ jal 0xf0bcf0c +/* f0bdfb8: 0fc2f3c3 */ jal playerGetViewportHeight /* f0bdfbc: 03008025 */ move $s0,$t8 /* f0bdfc0: 3c014270 */ lui $at,0x4270 /* f0bdfc4: 00103400 */ sll $a2,$s0,0x10 @@ -3879,74 +3879,74 @@ glabel var7f1af390 /* f0bdfd4: 44816000 */ mtc1 $at,$f12 /* f0bdfd8: 03203025 */ move $a2,$t9 /* f0bdfdc: 01203825 */ move $a3,$t1 -/* f0bdfe0: 0c002ec1 */ jal 0xbb04 +/* f0bdfe0: 0c002ec1 */ jal viSetFovAspectAndSize /* f0bdfe4: c7ae032c */ lwc1 $f14,0x32c($sp) -/* f0bdfe8: 0fc2f306 */ jal 0xf0bcc18 +/* f0bdfe8: 0fc2f306 */ jal playerGetViewportLeft /* f0bdfec: 00000000 */ nop /* f0bdff0: 00028400 */ sll $s0,$v0,0x10 /* f0bdff4: 00105403 */ sra $t2,$s0,0x10 -/* f0bdff8: 0fc2f4a4 */ jal 0xf0bd290 +/* f0bdff8: 0fc2f4a4 */ jal playerGetViewportTop /* f0bdffc: 01408025 */ move $s0,$t2 /* f0be000: 00102400 */ sll $a0,$s0,0x10 /* f0be004: 00022c00 */ sll $a1,$v0,0x10 /* f0be008: 00056403 */ sra $t4,$a1,0x10 /* f0be00c: 00045c03 */ sra $t3,$a0,0x10 /* f0be010: 01602025 */ move $a0,$t3 -/* f0be014: 0c002e75 */ jal 0xb9d4 +/* f0be014: 0c002e75 */ jal viSetViewPosition /* f0be018: 01802825 */ move $a1,$t4 -/* f0be01c: 0fc2f22e */ jal 0xf0bc8b8 +/* f0be01c: 0fc2f22e */ jal playerGetFbWidth /* f0be020: 00000000 */ nop /* f0be024: 00028400 */ sll $s0,$v0,0x10 /* f0be028: 00106c03 */ sra $t5,$s0,0x10 -/* f0be02c: 0fc2f239 */ jal 0xf0bc8e4 +/* f0be02c: 0fc2f239 */ jal playerGetFbHeight /* f0be030: 01a08025 */ move $s0,$t5 /* f0be034: 00102400 */ sll $a0,$s0,0x10 /* f0be038: 00022c00 */ sll $a1,$v0,0x10 /* f0be03c: 00057c03 */ sra $t7,$a1,0x10 /* f0be040: 00047403 */ sra $t6,$a0,0x10 /* f0be044: 01c02025 */ move $a0,$t6 -/* f0be048: 0c002e44 */ jal 0xb910 +/* f0be048: 0c002e44 */ jal viSetSize /* f0be04c: 01e02825 */ move $a1,$t7 -/* f0be050: 0fc2f22e */ jal 0xf0bc8b8 +/* f0be050: 0fc2f22e */ jal playerGetFbWidth /* f0be054: 00000000 */ nop /* f0be058: 00028400 */ sll $s0,$v0,0x10 /* f0be05c: 0010c403 */ sra $t8,$s0,0x10 -/* f0be060: 0fc2f239 */ jal 0xf0bc8e4 +/* f0be060: 0fc2f239 */ jal playerGetFbHeight /* f0be064: 03008025 */ move $s0,$t8 /* f0be068: 00102400 */ sll $a0,$s0,0x10 /* f0be06c: 00022c00 */ sll $a1,$v0,0x10 /* f0be070: 00054c03 */ sra $t1,$a1,0x10 /* f0be074: 0004cc03 */ sra $t9,$a0,0x10 /* f0be078: 03202025 */ move $a0,$t9 -/* f0be07c: 0c002e33 */ jal 0xb8cc +/* f0be07c: 0c002e33 */ jal viSetBufSize /* f0be080: 01202825 */ move $a1,$t1 -/* f0be084: 0fc2ee1f */ jal 0xf0bb87c +/* f0be084: 0fc2ee1f */ jal playerUpdateColourScreenProperties /* f0be088: 00000000 */ nop -/* f0be08c: 0fc2ee8f */ jal 0xf0bba3c +/* f0be08c: 0fc2ee8f */ jal playerTickChrFade /* f0be090: 00000000 */ nop /* f0be094: 8e6a0288 */ lw $t2,0x288($s3) -/* f0be098: 0fc54ed5 */ jal 0xf153b54 +/* f0be098: 0fc54ed5 */ jal optionsGetAutoAim /* f0be09c: 8d440070 */ lw $a0,0x70($t2) -/* f0be0a0: 0fc31fac */ jal 0xf0c7eb0 +/* f0be0a0: 0fc31fac */ jal bmoveSetAutoAimY /* f0be0a4: 00402025 */ move $a0,$v0 /* f0be0a8: 8e6b0288 */ lw $t3,0x288($s3) -/* f0be0ac: 0fc54ed5 */ jal 0xf153b54 +/* f0be0ac: 0fc54ed5 */ jal optionsGetAutoAim /* f0be0b0: 8d640070 */ lw $a0,0x70($t3) -/* f0be0b4: 0fc31ffd */ jal 0xf0c7ff4 +/* f0be0b4: 0fc31ffd */ jal bmoveSetAutoAimX /* f0be0b8: 00402025 */ move $a0,$v0 /* f0be0bc: 8e6c0288 */ lw $t4,0x288($s3) -/* f0be0c0: 0fc54ede */ jal 0xf153b78 +/* f0be0c0: 0fc54ede */ jal optionsGetLookAhead /* f0be0c4: 8d840070 */ lw $a0,0x70($t4) -/* f0be0c8: 0fc31fa4 */ jal 0xf0c7e90 +/* f0be0c8: 0fc31fa4 */ jal bmoveSetAutoMoveCentreEnabled /* f0be0cc: 00402025 */ move $a0,$v0 /* f0be0d0: 8e6d0288 */ lw $t5,0x288($s3) -/* f0be0d4: 0fc54ef9 */ jal 0xf153be4 +/* f0be0d4: 0fc54ef9 */ jal optionsGetAmmoOnScreen /* f0be0d8: 8da40070 */ lw $a0,0x70($t5) /* f0be0dc: 02a02025 */ move $a0,$s5 -/* f0be0e0: 0fc2a662 */ jal 0xf0a9988 +/* f0be0e0: 0fc2a662 */ jal bgunSetGunAmmoVisible /* f0be0e4: 00402825 */ move $a1,$v0 /* f0be0e8: 02a02025 */ move $a0,$s5 -/* f0be0ec: 0fc2b020 */ jal 0xf0ac080 +/* f0be0ec: 0fc2b020 */ jal bgunSetSightVisible /* f0be0f0: 24050001 */ li $a1,0x1 /* f0be0f4: 8e6302ac */ lw $v1,0x2ac($s3) /* f0be0f8: 10600002 */ beqz $v1,.PB0f0be104 @@ -3974,12 +3974,12 @@ glabel var7f1af390 /* f0be144: 11800004 */ beqz $t4,.PB0f0be158 /* f0be148: 00000000 */ nop /* f0be14c: 8e64028c */ lw $a0,0x28c($s3) -/* f0be150: 0fc3061f */ jal 0xf0c187c +/* f0be150: 0fc3061f */ jal playerDieByShooter /* f0be154: 24050001 */ li $a1,0x1 .PB0f0be158: -/* f0be158: 0fc2ef19 */ jal 0xf0bbc64 +/* f0be158: 0fc2ef19 */ jal playerTickDamageAndHealth /* f0be15c: 00000000 */ nop -/* f0be160: 0fc2f15c */ jal 0xf0bc570 +/* f0be160: 0fc2f15c */ jal playerTickExplode /* f0be164: 00000000 */ nop /* f0be168: 8e680284 */ lw $t0,0x284($s3) /* f0be16c: 8d020480 */ lw $v0,0x480($t0) @@ -3996,7 +3996,7 @@ glabel var7f1af390 /* f0be198: 8c900004 */ lw $s0,0x4($a0) /* f0be19c: a2200035 */ sb $zero,0x35($s1) /* f0be1a0: a2350034 */ sb $s5,0x34($s1) -/* f0be1a4: 0fc24943 */ jal 0xf09250c +/* f0be1a4: 0fc24943 */ jal func0f0926bc /* f0be1a8: a2200037 */ sb $zero,0x37($s1) /* f0be1ac: 8e0e0018 */ lw $t6,0x18($s0) /* f0be1b0: 2401fffb */ li $at,-5 @@ -4017,14 +4017,14 @@ glabel var7f1af390 /* f0be1e8: 51800022 */ beqzl $t4,.PB0f0be274 /* f0be1ec: 8e6b0034 */ lw $t3,0x34($s3) /* f0be1f0: 8e6d0288 */ lw $t5,0x288($s3) -/* f0be1f4: 0fc54ebe */ jal 0xf153af8 +/* f0be1f4: 0fc54ebe */ jal optionsGetContpadNum1 /* f0be1f8: 8da40070 */ lw $a0,0x70($t5) /* f0be1fc: 8faf0330 */ lw $t7,0x330($sp) /* f0be200: 00022600 */ sll $a0,$v0,0x18 /* f0be204: 00047603 */ sra $t6,$a0,0x18 /* f0be208: 11e00005 */ beqz $t7,.PB0f0be220 /* f0be20c: 01c02025 */ move $a0,$t6 -/* f0be210: 0c00566a */ jal 0x159a8 +/* f0be210: 0c00566a */ jal joyGetButtons /* f0be214: 3405ffff */ li $a1,0xffff /* f0be218: 10000002 */ b .PB0f0be224 /* f0be21c: 3043ffff */ andi $v1,$v0,0xffff @@ -4044,18 +4044,18 @@ glabel var7f1af390 /* f0be24c: 8e6a0314 */ lw $t2,0x314($s3) /* f0be250: 15400005 */ bnez $t2,.PB0f0be268 /* f0be254: 00000000 */ nop -/* f0be258: 0fc2ecd7 */ jal 0xf0bb35c +/* f0be258: 0fc2ecd7 */ jal playerPause /* f0be25c: 24040002 */ li $a0,0x2 /* f0be260: 10000004 */ b .PB0f0be274 /* f0be264: 8e6b0034 */ lw $t3,0x34($s3) .PB0f0be268: -/* f0be268: 0fc5ea40 */ jal 0xf17a900 +/* f0be268: 0fc5ea40 */ jal mpPushPauseDialog /* f0be26c: 00000000 */ nop /* f0be270: 8e6b0034 */ lw $t3,0x34($s3) .PB0f0be274: /* f0be274: 5160001d */ beqzl $t3,.PB0f0be2ec /* f0be278: 922d0035 */ lbu $t5,0x35($s1) -/* f0be27c: 0fc34372 */ jal 0xf0d0dc8 +/* f0be27c: 0fc34372 */ jal eyespyProcessInput /* f0be280: 8fa40330 */ lw $a0,0x330($sp) /* f0be284: 10000019 */ b .PB0f0be2ec /* f0be288: 922d0035 */ lbu $t5,0x35($s1) @@ -4072,7 +4072,7 @@ glabel var7f1af390 /* f0be2b0: 8d292420 */ lw $t1,0x2420($t1) /* f0be2b4: 5120000d */ beqzl $t1,.PB0f0be2ec /* f0be2b8: 922d0035 */ lbu $t5,0x35($s1) -/* f0be2bc: 0fc341ec */ jal 0xf0d07b0 +/* f0be2bc: 0fc341ec */ jal eyespyTryLaunch /* f0be2c0: 00000000 */ nop /* f0be2c4: 54400009 */ bnezl $v0,.PB0f0be2ec /* f0be2c8: 922d0035 */ lbu $t5,0x35($s1) @@ -4127,25 +4127,25 @@ glabel var7f1af390 /* f0be384: 240580ab */ li $a1,-32597 /* f0be388: 00003025 */ move $a2,$zero /* f0be38c: 2407ffff */ li $a3,-1 -/* f0be390: 0c004254 */ jal 0x10950 +/* f0be390: 0c004254 */ jal sndStart /* f0be394: e7a80014 */ swc1 $f8,0x14($sp) /* f0be398: 8e680284 */ lw $t0,0x284($s3) .PB0f0be39c: /* f0be39c: 2410ffdf */ li $s0,-33 /* f0be3a0: a510024c */ sh $s0,0x24c($t0) .PB0f0be3a4: -/* f0be3a4: 0fc5b9b8 */ jal 0xf16e6e0 +/* f0be3a4: 0fc5b9b8 */ jal lvIsPaused /* f0be3a8: 2410ffdf */ li $s0,-33 /* f0be3ac: 50400004 */ beqzl $v0,.PB0f0be3c0 /* f0be3b0: 8e680284 */ lw $t0,0x284($s3) -/* f0be3b4: 0fc2ec4c */ jal 0xf0bb130 +/* f0be3b4: 0fc2ec4c */ jal playerStopAudioForPause /* f0be3b8: 00000000 */ nop /* f0be3bc: 8e680284 */ lw $t0,0x284($s3) .PB0f0be3c0: /* f0be3c0: 8d0b1a24 */ lw $t3,0x1a24($t0) /* f0be3c4: 51600005 */ beqzl $t3,.PB0f0be3dc /* f0be3c8: 950d0010 */ lhu $t5,0x10($t0) -/* f0be3cc: 0fc2ec6f */ jal 0xf0bb1bc +/* f0be3cc: 0fc2ec6f */ jal playerTickPauseMenu /* f0be3d0: 00000000 */ nop /* f0be3d4: 8e680284 */ lw $t0,0x284($s3) /* f0be3d8: 950d0010 */ lhu $t5,0x10($t0) @@ -4174,7 +4174,7 @@ glabel var7f1af390 /* f0be424: 24010006 */ li $at,0x6 /* f0be428: 54610054 */ bnel $v1,$at,.PB0f0be57c /* f0be42c: 8e680284 */ lw $t0,0x284($s3) -/* f0be430: 0fc2e3ec */ jal 0xf0b8fb0 +/* f0be430: 0fc2e3ec */ jal playerTickChrBody /* f0be434: 00000000 */ nop /* f0be438: 8e680284 */ lw $t0,0x284($s3) /* f0be43c: 00002025 */ move $a0,$zero @@ -4184,9 +4184,9 @@ glabel var7f1af390 /* f0be44c: 24070001 */ li $a3,0x1 /* f0be450: 53200008 */ beqzl $t9,.PB0f0be474 /* f0be454: 8e6a006c */ lw $t2,0x6c($s3) -/* f0be458: 0fc3303a */ jal 0xf0cc0e8 +/* f0be458: 0fc3303a */ jal bmoveTick /* f0be45c: a510024c */ sh $s0,0x24c($t0) -/* f0be460: 0fc2e9b2 */ jal 0xf0ba6c8 +/* f0be460: 0fc2e9b2 */ jal playerTickCutscene /* f0be464: 8fa40330 */ lw $a0,0x330($sp) /* f0be468: 8e690284 */ lw $t1,0x284($s3) /* f0be46c: a530024c */ sh $s0,0x24c($t1) @@ -4283,9 +4283,9 @@ glabel var7f1af390 /* f0be5ac: 51800024 */ beqzl $t4,.PB0f0be640 /* f0be5b0: 910d1bfc */ lbu $t5,0x1bfc($t0) /* f0be5b4: 4481a000 */ mtc1 $at,$f20 -/* f0be5b8: 0fc4a7ed */ jal 0xf129fb4 +/* f0be5b8: 0fc4a7ed */ jal playermgrSetFovY /* f0be5bc: 4600a306 */ mov.s $f12,$f20 -/* f0be5c0: 0c002e97 */ jal 0xba5c +/* f0be5c0: 0c002e97 */ jal viSetFovY /* f0be5c4: 4600a306 */ mov.s $f12,$f20 /* f0be5c8: 8e680284 */ lw $t0,0x284($s3) /* f0be5cc: 8d180480 */ lw $t8,0x480($t0) @@ -4299,20 +4299,20 @@ glabel var7f1af390 /* f0be5ec: 8d190480 */ lw $t9,0x480($t0) /* f0be5f0: 8f2a0000 */ lw $t2,0x0($t9) /* f0be5f4: c5440010 */ lwc1 $f4,0x10($t2) -/* f0be5f8: 0fc2e3ec */ jal 0xf0b8fb0 +/* f0be5f8: 0fc2e3ec */ jal playerTickChrBody /* f0be5fc: e7a40310 */ swc1 $f4,0x310($sp) /* f0be600: 00002025 */ move $a0,$zero /* f0be604: 00002825 */ move $a1,$zero /* f0be608: 00003025 */ move $a2,$zero -/* f0be60c: 0fc3303a */ jal 0xf0cc0e8 +/* f0be60c: 0fc3303a */ jal bmoveTick /* f0be610: 24070001 */ li $a3,0x1 -/* f0be614: 0fc3072a */ jal 0xf0c1ca8 +/* f0be614: 0fc3072a */ jal playerSetCameraMode /* f0be618: 24040002 */ li $a0,0x2 /* f0be61c: 8e6b0284 */ lw $t3,0x284($s3) /* f0be620: 27a40308 */ addiu $a0,$sp,0x308 /* f0be624: 8d620480 */ lw $v0,0x480($t3) /* f0be628: 24450010 */ addiu $a1,$v0,0x10 -/* f0be62c: 0fc30814 */ jal 0xf0c2050 +/* f0be62c: 0fc30814 */ jal player0f0c1bd8 /* f0be630: 24460004 */ addiu $a2,$v0,0x4 /* f0be634: 100005d6 */ b .PB0f0bfd90 /* f0be638: 00000000 */ nop @@ -4321,7 +4321,7 @@ glabel var7f1af390 /* f0be640: 24020003 */ li $v0,0x3 /* f0be644: 544d0011 */ bnel $v0,$t5,.PB0f0be68c /* f0be648: 950e0010 */ lhu $t6,0x10($t0) -/* f0be64c: 0fc2e3ec */ jal 0xf0b8fb0 +/* f0be64c: 0fc2e3ec */ jal playerTickChrBody /* f0be650: 00000000 */ nop /* f0be654: 8e6c0284 */ lw $t4,0x284($s3) /* f0be658: 3c01800a */ lui $at,0x800a @@ -4330,9 +4330,9 @@ glabel var7f1af390 /* f0be664: 00002825 */ move $a1,$zero /* f0be668: 00003025 */ move $a2,$zero /* f0be66c: 24070001 */ li $a3,0x1 -/* f0be670: 0fc3303a */ jal 0xf0cc0e8 +/* f0be670: 0fc3303a */ jal bmoveTick /* f0be674: a4382318 */ sh $t8,0x2318($at) -/* f0be678: 0fc2e833 */ jal 0xf0ba0cc +/* f0be678: 0fc2e833 */ jal playerExecutePreparedWarp /* f0be67c: 00000000 */ nop /* f0be680: 100005c3 */ b .PB0f0bfd90 /* f0be684: 00000000 */ nop @@ -4369,16 +4369,16 @@ glabel var7f1af390 /* f0be6fc: 24040001 */ li $a0,0x1 /* f0be700: adc10008 */ sw $at,0x8($t6) /* f0be704: afa002e0 */ sw $zero,0x2e0($sp) -/* f0be708: 0fc3072a */ jal 0xf0c1ca8 +/* f0be708: 0fc3072a */ jal playerSetCameraMode /* f0be70c: 8d110264 */ lw $s1,0x264($t0) -/* f0be710: 0fc2e3ec */ jal 0xf0b8fb0 +/* f0be710: 0fc2e3ec */ jal playerTickChrBody /* f0be714: 00000000 */ nop /* f0be718: 00002025 */ move $a0,$zero /* f0be71c: 00002825 */ move $a1,$zero /* f0be720: 00003025 */ move $a2,$zero -/* f0be724: 0fc3303a */ jal 0xf0cc0e8 +/* f0be724: 0fc3303a */ jal bmoveTick /* f0be728: 24070001 */ li $a3,0x1 -/* f0be72c: 0fc2f60c */ jal 0xf0bd830 +/* f0be72c: 0fc2f60c */ jal playerUpdateShake /* f0be730: 00000000 */ nop /* f0be734: 522001fc */ beqzl $s1,.PB0f0bef28 /* f0be738: 8fa902e0 */ lw $t1,0x2e0($sp) @@ -4393,7 +4393,7 @@ glabel var7f1af390 /* f0be75c: 460e7202 */ mul.s $f8,$f14,$f14 /* f0be760: 46083280 */ add.s $f10,$f6,$f8 /* f0be764: 46000482 */ mul.s $f18,$f0,$f0 -/* f0be768: 0c012ae4 */ jal 0x4ab90 +/* f0be768: 0c012ae4 */ jal sqrtf /* f0be76c: 460a9300 */ add.s $f12,$f18,$f10 /* f0be770: e7a002a8 */ swc1 $f0,0x2a8($sp) /* f0be774: c624001c */ lwc1 $f4,0x1c($s1) @@ -4438,7 +4438,7 @@ glabel var7f1af390 /* f0be810: 8e2d0014 */ lw $t5,0x14($s1) /* f0be814: c5a40010 */ lwc1 $f4,0x10($t5) /* f0be818: afb80010 */ sw $t8,0x10($sp) -/* f0be81c: 0fc58e01 */ jal 0xf163804 +/* f0be81c: 0fc58e01 */ jal func0f162194 /* f0be820: e7a40304 */ swc1 $f4,0x304($sp) /* f0be824: 87af027c */ lh $t7,0x27c($sp) /* f0be828: 2401ffff */ li $at,-1 @@ -4476,10 +4476,10 @@ glabel var7f1af390 /* f0be8a0: 00000000 */ nop /* f0be8a4: ad0000c8 */ sw $zero,0xc8($t0) .PB0f0be8a8: -/* f0be8a8: 0c005b16 */ jal 0x16c58 +/* f0be8a8: 0c005b16 */ jal mtx00016208 /* f0be8ac: 27a502f0 */ addiu $a1,$sp,0x2f0 /* f0be8b0: 27a402b8 */ addiu $a0,$sp,0x2b8 -/* f0be8b4: 0c005b16 */ jal 0x16c58 +/* f0be8b4: 0c005b16 */ jal mtx00016208 /* f0be8b8: 27a502e4 */ addiu $a1,$sp,0x2e4 /* f0be8bc: 8e2f0040 */ lw $t7,0x40($s1) /* f0be8c0: 31ee0080 */ andi $t6,$t7,0x80 @@ -4487,17 +4487,17 @@ glabel var7f1af390 /* f0be8c8: 8fa902e0 */ lw $t1,0x2e0($sp) /* f0be8cc: 8e790288 */ lw $t9,0x288($s3) /* f0be8d0: 8e340048 */ lw $s4,0x48($s1) -/* f0be8d4: 0fc54eb0 */ jal 0xf153ac0 +/* f0be8d4: 0fc54eb0 */ jal optionsGetControlMode /* f0be8d8: 8f240070 */ lw $a0,0x70($t9) /* f0be8dc: 8e690288 */ lw $t1,0x288($s3) /* f0be8e0: 00408025 */ move $s0,$v0 -/* f0be8e4: 0fc54ebe */ jal 0xf153af8 +/* f0be8e4: 0fc54ebe */ jal optionsGetContpadNum1 /* f0be8e8: 8d240070 */ lw $a0,0x70($t1) /* f0be8ec: 8e6c0288 */ lw $t4,0x288($s3) /* f0be8f0: 00029600 */ sll $s2,$v0,0x18 /* f0be8f4: 00125603 */ sra $t2,$s2,0x18 /* f0be8f8: 01409025 */ move $s2,$t2 -/* f0be8fc: 0fc54ec5 */ jal 0xf153b14 +/* f0be8fc: 0fc54ec5 */ jal optionsGetContpadNum2 /* f0be900: 8d840070 */ lw $a0,0x70($t4) /* f0be904: 0002ae00 */ sll $s5,$v0,0x18 /* f0be908: 00155e03 */ sra $t3,$s5,0x18 @@ -4534,19 +4534,19 @@ glabel var7f1af390 .PB0f0be980: /* f0be980: 00047603 */ sra $t6,$a0,0x18 /* f0be984: 01c02025 */ move $a0,$t6 -/* f0be988: 0c00566a */ jal 0x159a8 +/* f0be988: 0c00566a */ jal joyGetButtons /* f0be98c: 3405c000 */ li $a1,0xc000 /* f0be990: 1440000c */ bnez $v0,.PB0f0be9c4 /* f0be994: 00152600 */ sll $a0,$s5,0x18 /* f0be998: 0004ce03 */ sra $t9,$a0,0x18 /* f0be99c: 03202025 */ move $a0,$t9 -/* f0be9a0: 0c00566a */ jal 0x159a8 +/* f0be9a0: 0c00566a */ jal joyGetButtons /* f0be9a4: 3405c000 */ li $a1,0xc000 /* f0be9a8: 14400006 */ bnez $v0,.PB0f0be9c4 /* f0be9ac: 00152600 */ sll $a0,$s5,0x18 /* f0be9b0: 00044e03 */ sra $t1,$a0,0x18 /* f0be9b4: 01202025 */ move $a0,$t1 -/* f0be9b8: 0c00566a */ jal 0x159a8 +/* f0be9b8: 0c00566a */ jal joyGetButtons /* f0be9bc: 24052000 */ li $a1,0x2000 /* f0be9c0: 10400002 */ beqz $v0,.PB0f0be9cc .PB0f0be9c4: @@ -4556,7 +4556,7 @@ glabel var7f1af390 /* f0be9cc: 00122600 */ sll $a0,$s2,0x18 /* f0be9d0: 00046603 */ sra $t4,$a0,0x18 /* f0be9d4: 01802025 */ move $a0,$t4 -/* f0be9d8: 0c00569a */ jal 0x15a68 +/* f0be9d8: 0c00569a */ jal joyGetButtonsPressedThisFrame /* f0be9dc: 24052000 */ li $a1,0x2000 /* f0be9e0: 1040001e */ beqz $v0,.PB0f0bea5c /* f0be9e4: 240b0001 */ li $t3,0x1 @@ -4565,19 +4565,19 @@ glabel var7f1af390 .PB0f0be9f0: /* f0be9f0: 00122600 */ sll $a0,$s2,0x18 /* f0be9f4: 00046e03 */ sra $t5,$a0,0x18 -/* f0be9f8: 0c00566a */ jal 0x159a8 +/* f0be9f8: 0c00566a */ jal joyGetButtons /* f0be9fc: 01a02025 */ move $a0,$t5 /* f0bea00: 1440000c */ bnez $v0,.PB0f0bea34 /* f0bea04: 00152600 */ sll $a0,$s5,0x18 /* f0bea08: 0004c603 */ sra $t8,$a0,0x18 /* f0bea0c: 03002025 */ move $a0,$t8 -/* f0bea10: 0c00566a */ jal 0x159a8 +/* f0bea10: 0c00566a */ jal joyGetButtons /* f0bea14: 3405c000 */ li $a1,0xc000 /* f0bea18: 14400006 */ bnez $v0,.PB0f0bea34 /* f0bea1c: 00122600 */ sll $a0,$s2,0x18 /* f0bea20: 00047e03 */ sra $t7,$a0,0x18 /* f0bea24: 01e02025 */ move $a0,$t7 -/* f0bea28: 0c00566a */ jal 0x159a8 +/* f0bea28: 0c00566a */ jal joyGetButtons /* f0bea2c: 24052000 */ li $a1,0x2000 /* f0bea30: 10400002 */ beqz $v0,.PB0f0bea3c .PB0f0bea34: @@ -4587,7 +4587,7 @@ glabel var7f1af390 /* f0bea3c: 00152600 */ sll $a0,$s5,0x18 /* f0bea40: 0004ce03 */ sra $t9,$a0,0x18 /* f0bea44: 03202025 */ move $a0,$t9 -/* f0bea48: 0c00569a */ jal 0x15a68 +/* f0bea48: 0c00569a */ jal joyGetButtonsPressedThisFrame /* f0bea4c: 24052000 */ li $a1,0x2000 /* f0bea50: 10400002 */ beqz $v0,.PB0f0bea5c /* f0bea54: 24090001 */ li $t1,0x1 @@ -4595,12 +4595,12 @@ glabel var7f1af390 .PB0f0bea5c: /* f0bea5c: 00122600 */ sll $a0,$s2,0x18 /* f0bea60: 00045603 */ sra $t2,$a0,0x18 -/* f0bea64: 0c005616 */ jal 0x15858 +/* f0bea64: 0c005616 */ jal joyGetStickX /* f0bea68: 01402025 */ move $a0,$t2 /* f0bea6c: 00122600 */ sll $a0,$s2,0x18 /* f0bea70: 00046603 */ sra $t4,$a0,0x18 /* f0bea74: a3a2023d */ sb $v0,0x23d($sp) -/* f0bea78: 0c005640 */ jal 0x15900 +/* f0bea78: 0c005640 */ jal joyGetStickY /* f0bea7c: 01802025 */ move $a0,$t4 /* f0bea80: 10000002 */ b .PB0f0bea8c /* f0bea84: a3a2023c */ sb $v0,0x23c($sp) @@ -4609,13 +4609,13 @@ glabel var7f1af390 /* f0bea8c: 00122600 */ sll $a0,$s2,0x18 /* f0bea90: 00046e03 */ sra $t5,$a0,0x18 /* f0bea94: 01a02025 */ move $a0,$t5 -/* f0bea98: 0c00566a */ jal 0x159a8 +/* f0bea98: 0c00566a */ jal joyGetButtons /* f0bea9c: 24051000 */ li $a1,0x1000 /* f0beaa0: 14400006 */ bnez $v0,.PB0f0beabc /* f0beaa4: 00152600 */ sll $a0,$s5,0x18 /* f0beaa8: 0004c603 */ sra $t8,$a0,0x18 /* f0beaac: 03002025 */ move $a0,$t8 -/* f0beab0: 0c00566a */ jal 0x159a8 +/* f0beab0: 0c00566a */ jal joyGetButtons /* f0beab4: 24051000 */ li $a1,0x1000 /* f0beab8: 10400044 */ beqz $v0,.PB0f0bebcc .PB0f0beabc: @@ -4640,7 +4640,7 @@ glabel var7f1af390 .PB0f0beb00: /* f0beb00: 00045603 */ sra $t2,$a0,0x18 /* f0beb04: 01402025 */ move $a0,$t2 -/* f0beb08: 0c00569a */ jal 0x15a68 +/* f0beb08: 0c00569a */ jal joyGetButtonsPressedThisFrame /* f0beb0c: 34058000 */ li $a1,0x8000 /* f0beb10: 10400003 */ beqz $v0,.PB0f0beb20 /* f0beb14: 00122600 */ sll $a0,$s2,0x18 @@ -4649,7 +4649,7 @@ glabel var7f1af390 .PB0f0beb20: /* f0beb20: 00045e03 */ sra $t3,$a0,0x18 /* f0beb24: 01602025 */ move $a0,$t3 -/* f0beb28: 0c00566a */ jal 0x159a8 +/* f0beb28: 0c00566a */ jal joyGetButtons /* f0beb2c: 24056030 */ li $a1,0x6030 /* f0beb30: 10400012 */ beqz $v0,.PB0f0beb7c /* f0beb34: 240d0001 */ li $t5,0x1 @@ -4658,7 +4658,7 @@ glabel var7f1af390 .PB0f0beb40: /* f0beb40: 00122600 */ sll $a0,$s2,0x18 /* f0beb44: 0004c603 */ sra $t8,$a0,0x18 -/* f0beb48: 0c00569a */ jal 0x15a68 +/* f0beb48: 0c00569a */ jal joyGetButtonsPressedThisFrame /* f0beb4c: 03002025 */ move $a0,$t8 /* f0beb50: 10400003 */ beqz $v0,.PB0f0beb60 /* f0beb54: 00122600 */ sll $a0,$s2,0x18 @@ -4667,7 +4667,7 @@ glabel var7f1af390 .PB0f0beb60: /* f0beb60: 00047603 */ sra $t6,$a0,0x18 /* f0beb64: 01c02025 */ move $a0,$t6 -/* f0beb68: 0c00566a */ jal 0x159a8 +/* f0beb68: 0c00566a */ jal joyGetButtons /* f0beb6c: 3405c030 */ li $a1,0xc030 /* f0beb70: 10400002 */ beqz $v0,.PB0f0beb7c /* f0beb74: 24190001 */ li $t9,0x1 @@ -4675,12 +4675,12 @@ glabel var7f1af390 .PB0f0beb7c: /* f0beb7c: 00122600 */ sll $a0,$s2,0x18 /* f0beb80: 00044e03 */ sra $t1,$a0,0x18 -/* f0beb84: 0c005616 */ jal 0x15858 +/* f0beb84: 0c005616 */ jal joyGetStickX /* f0beb88: 01202025 */ move $a0,$t1 /* f0beb8c: 00122600 */ sll $a0,$s2,0x18 /* f0beb90: 00045603 */ sra $t2,$a0,0x18 /* f0beb94: a3a2023d */ sb $v0,0x23d($sp) -/* f0beb98: 0c005640 */ jal 0x15900 +/* f0beb98: 0c005640 */ jal joyGetStickY /* f0beb9c: 01402025 */ move $a0,$t2 /* f0beba0: 10000002 */ b .PB0f0bebac /* f0beba4: a3a2023c */ sb $v0,0x23c($sp) @@ -4689,7 +4689,7 @@ glabel var7f1af390 /* f0bebac: 00122600 */ sll $a0,$s2,0x18 /* f0bebb0: 00045e03 */ sra $t3,$a0,0x18 /* f0bebb4: 01602025 */ move $a0,$t3 -/* f0bebb8: 0c00566a */ jal 0x159a8 +/* f0bebb8: 0c00566a */ jal joyGetButtons /* f0bebbc: 24051000 */ li $a1,0x1000 /* f0bebc0: 10400002 */ beqz $v0,.PB0f0bebcc /* f0bebc4: 240d0001 */ li $t5,0x1 @@ -4701,12 +4701,12 @@ glabel var7f1af390 /* f0bebd8: 8e6f0314 */ lw $t7,0x314($s3) /* f0bebdc: 15e00005 */ bnez $t7,.PB0f0bebf4 /* f0bebe0: 00000000 */ nop -/* f0bebe4: 0fc2ecd7 */ jal 0xf0bb35c +/* f0bebe4: 0fc2ecd7 */ jal playerPause /* f0bebe8: 24040002 */ li $a0,0x2 /* f0bebec: 10000004 */ b .PB0f0bec00 /* f0bebf0: 83b9023c */ lb $t9,0x23c($sp) .PB0f0bebf4: -/* f0bebf4: 0fc5ea40 */ jal 0xf17a900 +/* f0bebf4: 0fc5ea40 */ jal mpPushPauseDialog /* f0bebf8: 00000000 */ nop /* f0bebfc: 83b9023c */ lb $t9,0x23c($sp) .PB0f0bec00: @@ -4736,7 +4736,7 @@ glabel var7f1af390 /* f0bec5c: 00000000 */ nop /* f0bec60: 46021282 */ mul.s $f10,$f2,$f2 /* f0bec64: e7a80174 */ swc1 $f8,0x174($sp) -/* f0bec68: 0c012ae4 */ jal 0x4ab90 +/* f0bec68: 0c012ae4 */ jal sqrtf /* f0bec6c: 460a9300 */ add.s $f12,$f18,$f10 /* f0bec70: c7a202ac */ lwc1 $f2,0x2ac($sp) /* f0bec74: c7ae02b4 */ lwc1 $f14,0x2b4($sp) @@ -4744,10 +4744,10 @@ glabel var7f1af390 /* f0bec7c: 46001083 */ div.s $f2,$f2,$f0 /* f0bec80: 46007383 */ div.s $f14,$f14,$f0 /* f0bec84: e7a202ac */ swc1 $f2,0x2ac($sp) -/* f0bec88: 0c006b8b */ jal 0x1ae2c +/* f0bec88: 0c006b8b */ jal sinf /* f0bec8c: e7ae02b4 */ swc1 $f14,0x2b4($sp) /* f0bec90: 46000506 */ mov.s $f20,$f0 -/* f0bec94: 0c006b88 */ jal 0x1ae20 +/* f0bec94: 0c006b88 */ jal cosf /* f0bec98: 4600b306 */ mov.s $f12,$f22 /* f0bec9c: c7a202ac */ lwc1 $f2,0x2ac($sp) /* f0beca0: c7ae02b4 */ lwc1 $f14,0x2b4($sp) @@ -4758,10 +4758,10 @@ glabel var7f1af390 /* f0becb4: 46147202 */ mul.s $f8,$f14,$f20 /* f0becb8: e7a60154 */ swc1 $f6,0x154($sp) /* f0becbc: e7a40150 */ swc1 $f4,0x150($sp) -/* f0becc0: 0c006b8b */ jal 0x1ae2c +/* f0becc0: 0c006b8b */ jal sinf /* f0becc4: e7a80158 */ swc1 $f8,0x158($sp) /* f0becc8: 46000506 */ mov.s $f20,$f0 -/* f0beccc: 0c006b88 */ jal 0x1ae20 +/* f0beccc: 0c006b88 */ jal cosf /* f0becd0: c7ac0174 */ lwc1 $f12,0x174($sp) /* f0becd4: 44801000 */ mtc1 $zero,$f2 /* f0becd8: c7b202c8 */ lwc1 $f18,0x2c8($sp) @@ -4779,14 +4779,14 @@ glabel var7f1af390 /* f0bed04: 4600a287 */ neg.s $f10,$f20 /* f0bed08: e7aa0164 */ swc1 $f10,0x164($sp) .PB0f0bed0c: -/* f0bed0c: 0fc25d6a */ jal 0xf0975a8 +/* f0bed0c: 0fc25d6a */ jal quaternionMultQuaternion /* f0bed10: e7a20168 */ swc1 $f2,0x168($sp) /* f0bed14: 27b001fc */ addiu $s0,$sp,0x1fc /* f0bed18: 02002825 */ move $a1,$s0 -/* f0bed1c: 0fc25b51 */ jal 0xf096d44 +/* f0bed1c: 0fc25b51 */ jal quaternionToMtx /* f0bed20: 02a02025 */ move $a0,$s5 /* f0bed24: 02002025 */ move $a0,$s0 -/* f0bed28: 0c005958 */ jal 0x16560 +/* f0bed28: 0c005958 */ jal mtx4RotateVecInPlace /* f0bed2c: 26850004 */ addiu $a1,$s4,0x4 /* f0bed30: 8e8b0000 */ lw $t3,0x0($s4) /* f0bed34: 44808000 */ mtc1 $zero,$f16 @@ -4814,7 +4814,7 @@ glabel var7f1af390 /* f0bed84: 460e7182 */ mul.s $f6,$f14,$f14 /* f0bed88: 46062200 */ add.s $f8,$f4,$f6 /* f0bed8c: 46000482 */ mul.s $f18,$f0,$f0 -/* f0bed90: 0c012ae4 */ jal 0x4ab90 +/* f0bed90: 0c012ae4 */ jal sqrtf /* f0bed94: 46089300 */ add.s $f12,$f18,$f8 /* f0bed98: 8fb90114 */ lw $t9,0x114($sp) /* f0bed9c: 46000386 */ mov.s $f14,$f0 @@ -4874,23 +4874,23 @@ glabel var7f1af390 /* f0bee60: 46023482 */ mul.s $f18,$f6,$f2 /* f0bee64: 460e9203 */ div.s $f8,$f18,$f14 /* f0bee68: e6840008 */ swc1 $f4,0x8($s4) -/* f0bee6c: 0c0059e9 */ jal 0x167a4 +/* f0bee6c: 0c0059e9 */ jal mtx3ToMtx4 /* f0bee70: e688000c */ swc1 $f8,0xc($s4) /* f0bee74: 27b2012c */ addiu $s2,$sp,0x12c /* f0bee78: 02402825 */ move $a1,$s2 -/* f0bee7c: 0fc25bad */ jal 0xf096eb4 +/* f0bee7c: 0fc25bad */ jal quaternion0f097044 /* f0bee80: 02002025 */ move $a0,$s0 /* f0bee84: 27b0011c */ addiu $s0,$sp,0x11c /* f0bee88: 02003025 */ move $a2,$s0 /* f0bee8c: 02a02025 */ move $a0,$s5 -/* f0bee90: 0fc25d6a */ jal 0xf0975a8 +/* f0bee90: 0fc25d6a */ jal quaternionMultQuaternion /* f0bee94: 02402825 */ move $a1,$s2 /* f0bee98: 27b2017c */ addiu $s2,$sp,0x17c /* f0bee9c: 02402825 */ move $a1,$s2 -/* f0beea0: 0fc25b51 */ jal 0xf096d44 +/* f0beea0: 0fc25b51 */ jal quaternionToMtx /* f0beea4: 02002025 */ move $a0,$s0 /* f0beea8: 02402025 */ move $a0,$s2 -/* f0beeac: 0c0059fc */ jal 0x167f0 +/* f0beeac: 0c0059fc */ jal mtx4ToMtx3 /* f0beeb0: 27a502b8 */ addiu $a1,$sp,0x2b8 /* f0beeb4: c7a002a8 */ lwc1 $f0,0x2a8($sp) /* f0beeb8: c7aa02b8 */ lwc1 $f10,0x2b8($sp) @@ -4943,13 +4943,13 @@ glabel var7f1af390 /* f0bef6c: afaf0010 */ sw $t7,0x10($sp) /* f0bef70: 27a402fc */ addiu $a0,$sp,0x2fc /* f0bef74: 27a502e4 */ addiu $a1,$sp,0x2e4 -/* f0bef78: 0fc3072e */ jal 0xf0c1cb8 +/* f0bef78: 0fc3072e */ jal player0f0c1840 /* f0bef7c: 27a602f0 */ addiu $a2,$sp,0x2f0 /* f0bef80: 10000383 */ b .PB0f0bfd90 /* f0bef84: 00000000 */ nop .PB0f0bef88: /* f0bef88: 00003825 */ move $a3,$zero -/* f0bef8c: 0fc3072e */ jal 0xf0c1cb8 +/* f0bef8c: 0fc3072e */ jal player0f0c1840 /* f0bef90: afa00010 */ sw $zero,0x10($sp) /* f0bef94: 1000037e */ b .PB0f0bfd90 /* f0bef98: 00000000 */ nop @@ -4957,7 +4957,7 @@ glabel var7f1af390 /* f0bef9c: 24010001 */ li $at,0x1 /* f0befa0: 14610261 */ bne $v1,$at,.PB0f0bf928 /* f0befa4: 00000000 */ nop -/* f0befa8: 0fc2e652 */ jal 0xf0b9948 +/* f0befa8: 0fc2e652 */ jal player0f0b9538 /* f0befac: 00000000 */ nop /* f0befb0: 8e6e028c */ lw $t6,0x28c($s3) /* f0befb4: 3c098007 */ lui $t1,0x8007 @@ -4971,17 +4971,17 @@ glabel var7f1af390 /* f0befd4: 00003025 */ move $a2,$zero /* f0befd8: 24040001 */ li $a0,0x1 /* f0befdc: 24050001 */ li $a1,0x1 -/* f0befe0: 0fc3303a */ jal 0xf0cc0e8 +/* f0befe0: 0fc3303a */ jal bmoveTick /* f0befe4: 8fa60330 */ lw $a2,0x330($sp) /* f0befe8: 10000003 */ b .PB0f0beff8 /* f0befec: 00000000 */ nop .PB0f0beff0: -/* f0beff0: 0fc3303a */ jal 0xf0cc0e8 +/* f0beff0: 0fc3303a */ jal bmoveTick /* f0beff4: 24070001 */ li $a3,0x1 .PB0f0beff8: -/* f0beff8: 0fc2f60c */ jal 0xf0bd830 +/* f0beff8: 0fc2f60c */ jal playerUpdateShake /* f0beffc: 00000000 */ nop -/* f0bf000: 0fc3072a */ jal 0xf0c1ca8 +/* f0bf000: 0fc3072a */ jal playerSetCameraMode /* f0bf004: 00002025 */ move $a0,$zero /* f0bf008: 8e680284 */ lw $t0,0x284($s3) /* f0bf00c: 44802000 */ mtc1 $zero,$f4 @@ -5008,7 +5008,7 @@ glabel var7f1af390 /* f0bf060: 8d0300bc */ lw $v1,0xbc($t0) /* f0bf064: 246a0028 */ addiu $t2,$v1,0x28 /* f0bf068: afaa0010 */ sw $t2,0x10($sp) -/* f0bf06c: 0fc3072e */ jal 0xf0c1cb8 +/* f0bf06c: 0fc3072e */ jal player0f0c1840 /* f0bf070: 24670008 */ addiu $a3,$v1,0x8 /* f0bf074: 8e6c0318 */ lw $t4,0x318($s3) /* f0bf078: 3c0b800a */ lui $t3,0x800a @@ -5052,11 +5052,11 @@ glabel var7f1af390 /* f0bf10c: 01416024 */ and $t4,$t2,$at /* f0bf110: 15800078 */ bnez $t4,.PB0f0bf2f4 /* f0bf114: 00000000 */ nop -/* f0bf118: 0fc59b21 */ jal 0xf166c84 +/* f0bf118: 0fc59b21 */ jal stageGetIndex /* f0bf11c: 8e6404b4 */ lw $a0,0x4b4($s3) /* f0bf120: 14540015 */ bne $v0,$s4,.PB0f0bf178 /* f0bf124: 00000000 */ nop -/* f0bf128: 0c0063c8 */ jal 0x18f20 +/* f0bf128: 0c0063c8 */ jal ailistFindById /* f0bf12c: 24040012 */ li $a0,0x12 /* f0bf130: 8e680284 */ lw $t0,0x284($s3) /* f0bf134: 3c014000 */ lui $at,0x4000 @@ -5072,17 +5072,17 @@ glabel var7f1af390 /* f0bf15c: 24660008 */ addiu $a2,$v1,0x8 /* f0bf160: 24670028 */ addiu $a3,$v1,0x28 /* f0bf164: 46143482 */ mul.s $f18,$f6,$f20 -/* f0bf168: 0fc12d06 */ jal 0xf04b418 +/* f0bf168: 0fc12d06 */ jal chrSpawnAtCoord /* f0bf16c: e7b20010 */ swc1 $f18,0x10($sp) /* f0bf170: 1000002a */ b .PB0f0bf21c /* f0bf174: 00408825 */ move $s1,$v0 .PB0f0bf178: -/* f0bf178: 0fc59b21 */ jal 0xf166c84 +/* f0bf178: 0fc59b21 */ jal stageGetIndex /* f0bf17c: 8e6404b4 */ lw $a0,0x4b4($s3) /* f0bf180: 24010023 */ li $at,0x23 /* f0bf184: 14410012 */ bne $v0,$at,.PB0f0bf1d0 /* f0bf188: 00000000 */ nop -/* f0bf18c: 0c0063c8 */ jal 0x18f20 +/* f0bf18c: 0c0063c8 */ jal ailistFindById /* f0bf190: 24040012 */ li $a0,0x12 /* f0bf194: 8e680284 */ lw $t0,0x284($s3) /* f0bf198: 240d0010 */ li $t5,0x10 @@ -5095,12 +5095,12 @@ glabel var7f1af390 /* f0bf1b4: 24050008 */ li $a1,0x8 /* f0bf1b8: 24660008 */ addiu $a2,$v1,0x8 /* f0bf1bc: 24670028 */ addiu $a3,$v1,0x28 -/* f0bf1c0: 0fc12d06 */ jal 0xf04b418 +/* f0bf1c0: 0fc12d06 */ jal chrSpawnAtCoord /* f0bf1c4: e7aa0010 */ swc1 $f10,0x10($sp) /* f0bf1c8: 10000014 */ b .PB0f0bf21c /* f0bf1cc: 00408825 */ move $s1,$v0 .PB0f0bf1d0: -/* f0bf1d0: 0c0063c8 */ jal 0x18f20 +/* f0bf1d0: 0c0063c8 */ jal ailistFindById /* f0bf1d4: 24040012 */ li $a0,0x12 /* f0bf1d8: 8e680284 */ lw $t0,0x284($s3) /* f0bf1dc: 3c014000 */ lui $at,0x4000 @@ -5116,7 +5116,7 @@ glabel var7f1af390 /* f0bf204: 24660008 */ addiu $a2,$v1,0x8 /* f0bf208: 24670028 */ addiu $a3,$v1,0x28 /* f0bf20c: 46149202 */ mul.s $f8,$f18,$f20 -/* f0bf210: 0fc12d06 */ jal 0xf04b418 +/* f0bf210: 0fc12d06 */ jal chrSpawnAtCoord /* f0bf214: e7a80010 */ swc1 $f8,0x10($sp) /* f0bf218: 00408825 */ move $s1,$v0 .PB0f0bf21c: @@ -5142,21 +5142,21 @@ glabel var7f1af390 /* f0bf268: a21802e2 */ sb $t8,0x2e2($s0) /* f0bf26c: a2120002 */ sb $s2,0x2($s0) /* f0bf270: a2120003 */ sb $s2,0x3($s0) -/* f0bf274: 0fc59b21 */ jal 0xf166c84 +/* f0bf274: 0fc59b21 */ jal stageGetIndex /* f0bf278: 8e6404b4 */ lw $a0,0x4b4($s3) /* f0bf27c: 14540005 */ bne $v0,$s4,.PB0f0bf294 /* f0bf280: 02002025 */ move $a0,$s0 -/* f0bf284: 0fc08196 */ jal 0xf020658 +/* f0bf284: 0fc08196 */ jal chrAddHealth /* f0bf288: 3c054220 */ lui $a1,0x4220 /* f0bf28c: 10000005 */ b .PB0f0bf2a4 /* f0bf290: 02002025 */ move $a0,$s0 .PB0f0bf294: /* f0bf294: 4405b000 */ mfc1 $a1,$f22 -/* f0bf298: 0fc08196 */ jal 0xf020658 +/* f0bf298: 0fc08196 */ jal chrAddHealth /* f0bf29c: 02002025 */ move $a0,$s0 /* f0bf2a0: 02002025 */ move $a0,$s0 .PB0f0bf2a4: -/* f0bf2a4: 0fc08191 */ jal 0xf020644 +/* f0bf2a4: 0fc08191 */ jal chrSetMaxDamage /* f0bf2a8: 3c054080 */ lui $a1,0x4080 /* f0bf2ac: 8e0f0018 */ lw $t7,0x18($s0) /* f0bf2b0: 920c02e1 */ lbu $t4,0x2e1($s0) @@ -5174,19 +5174,19 @@ glabel var7f1af390 /* f0bf2e0: 02002025 */ move $a0,$s0 /* f0bf2e4: 240500f5 */ li $a1,0xf5 /* f0bf2e8: 24060002 */ li $a2,0x2 -/* f0bf2ec: 0fc22e53 */ jal 0xf08b94c +/* f0bf2ec: 0fc22e53 */ jal chrGiveWeapon /* f0bf2f0: 00003825 */ move $a3,$zero .PB0f0bf2f4: -/* f0bf2f4: 0fc41d39 */ jal 0xf1074e4 +/* f0bf2f4: 0fc41d39 */ jal cheatIsActive /* f0bf2f8: 24040016 */ li $a0,0x16 /* f0bf2fc: 10400058 */ beqz $v0,.PB0f0bf460 /* f0bf300: 00000000 */ nop -/* f0bf304: 0fc59b21 */ jal 0xf166c84 +/* f0bf304: 0fc59b21 */ jal stageGetIndex /* f0bf308: 8e6404b4 */ lw $a0,0x4b4($s3) /* f0bf30c: 24010023 */ li $at,0x23 /* f0bf310: 14410012 */ bne $v0,$at,.PB0f0bf35c /* f0bf314: 00000000 */ nop -/* f0bf318: 0c0063c8 */ jal 0x18f20 +/* f0bf318: 0c0063c8 */ jal ailistFindById /* f0bf31c: 24040012 */ li $a0,0x12 /* f0bf320: 8e680284 */ lw $t0,0x284($s3) /* f0bf324: 240f0010 */ li $t7,0x10 @@ -5199,12 +5199,12 @@ glabel var7f1af390 /* f0bf340: 24050008 */ li $a1,0x8 /* f0bf344: 24660008 */ addiu $a2,$v1,0x8 /* f0bf348: 24670028 */ addiu $a3,$v1,0x28 -/* f0bf34c: 0fc12d06 */ jal 0xf04b418 +/* f0bf34c: 0fc12d06 */ jal chrSpawnAtCoord /* f0bf350: e7a40010 */ swc1 $f4,0x10($sp) /* f0bf354: 10000011 */ b .PB0f0bf39c /* f0bf358: 00408825 */ move $s1,$v0 .PB0f0bf35c: -/* f0bf35c: 0c0063c8 */ jal 0x18f20 +/* f0bf35c: 0c0063c8 */ jal ailistFindById /* f0bf360: 02802025 */ move $a0,$s4 /* f0bf364: 8e680284 */ lw $t0,0x284($s3) /* f0bf368: 240e0010 */ li $t6,0x10 @@ -5217,7 +5217,7 @@ glabel var7f1af390 /* f0bf384: 2405001b */ li $a1,0x1b /* f0bf388: 24660008 */ addiu $a2,$v1,0x8 /* f0bf38c: 24670028 */ addiu $a3,$v1,0x28 -/* f0bf390: 0fc12d06 */ jal 0xf04b418 +/* f0bf390: 0fc12d06 */ jal chrSpawnAtCoord /* f0bf394: e7b20010 */ swc1 $f18,0x10($sp) /* f0bf398: 00408825 */ move $s1,$v0 .PB0f0bf39c: @@ -5243,17 +5243,17 @@ glabel var7f1af390 /* f0bf3e8: a21502b1 */ sb $s5,0x2b1($s0) /* f0bf3ec: a2120002 */ sb $s2,0x2($s0) /* f0bf3f0: a2120003 */ sb $s2,0x3($s0) -/* f0bf3f4: 0fc59b21 */ jal 0xf166c84 +/* f0bf3f4: 0fc59b21 */ jal stageGetIndex /* f0bf3f8: 8e6404b4 */ lw $a0,0x4b4($s3) /* f0bf3fc: 14540005 */ bne $v0,$s4,.PB0f0bf414 /* f0bf400: 02002025 */ move $a0,$s0 -/* f0bf404: 0fc08196 */ jal 0xf020658 +/* f0bf404: 0fc08196 */ jal chrAddHealth /* f0bf408: 3c054220 */ lui $a1,0x4220 /* f0bf40c: 10000005 */ b .PB0f0bf424 /* f0bf410: 8e0e0018 */ lw $t6,0x18($s0) .PB0f0bf414: /* f0bf414: 4405b000 */ mfc1 $a1,$f22 -/* f0bf418: 0fc08196 */ jal 0xf020658 +/* f0bf418: 0fc08196 */ jal chrAddHealth /* f0bf41c: 02002025 */ move $a0,$s0 /* f0bf420: 8e0e0018 */ lw $t6,0x18($s0) .PB0f0bf424: @@ -5270,19 +5270,19 @@ glabel var7f1af390 /* f0bf44c: ae190018 */ sw $t9,0x18($s0) /* f0bf450: ae0a0014 */ sw $t2,0x14($s0) /* f0bf454: a20f02e1 */ sb $t7,0x2e1($s0) -/* f0bf458: 0fc08191 */ jal 0xf020644 +/* f0bf458: 0fc08191 */ jal chrSetMaxDamage /* f0bf45c: 02002025 */ move $a0,$s0 .PB0f0bf460: -/* f0bf460: 0fc41d39 */ jal 0xf1074e4 +/* f0bf460: 0fc41d39 */ jal cheatIsActive /* f0bf464: 24040018 */ li $a0,0x18 /* f0bf468: 1040005e */ beqz $v0,.PB0f0bf5e4 /* f0bf46c: 00000000 */ nop -/* f0bf470: 0fc59b21 */ jal 0xf166c84 +/* f0bf470: 0fc59b21 */ jal stageGetIndex /* f0bf474: 8e6404b4 */ lw $a0,0x4b4($s3) /* f0bf478: 24010023 */ li $at,0x23 /* f0bf47c: 14410012 */ bne $v0,$at,.PB0f0bf4c8 /* f0bf480: 00000000 */ nop -/* f0bf484: 0c0063c8 */ jal 0x18f20 +/* f0bf484: 0c0063c8 */ jal ailistFindById /* f0bf488: 24040012 */ li $a0,0x12 /* f0bf48c: 8e680284 */ lw $t0,0x284($s3) /* f0bf490: 240e0010 */ li $t6,0x10 @@ -5295,12 +5295,12 @@ glabel var7f1af390 /* f0bf4ac: 24050008 */ li $a1,0x8 /* f0bf4b0: 24660008 */ addiu $a2,$v1,0x8 /* f0bf4b4: 24670028 */ addiu $a3,$v1,0x28 -/* f0bf4b8: 0fc12d06 */ jal 0xf04b418 +/* f0bf4b8: 0fc12d06 */ jal chrSpawnAtCoord /* f0bf4bc: e7aa0010 */ swc1 $f10,0x10($sp) /* f0bf4c0: 10000011 */ b .PB0f0bf508 /* f0bf4c4: 00408825 */ move $s1,$v0 .PB0f0bf4c8: -/* f0bf4c8: 0c0063c8 */ jal 0x18f20 +/* f0bf4c8: 0c0063c8 */ jal ailistFindById /* f0bf4cc: 24040012 */ li $a0,0x12 /* f0bf4d0: 8e680284 */ lw $t0,0x284($s3) /* f0bf4d4: 24190010 */ li $t9,0x10 @@ -5313,7 +5313,7 @@ glabel var7f1af390 /* f0bf4f0: 24050012 */ li $a1,0x12 /* f0bf4f4: 24660008 */ addiu $a2,$v1,0x8 /* f0bf4f8: 24670028 */ addiu $a3,$v1,0x28 -/* f0bf4fc: 0fc12d06 */ jal 0xf04b418 +/* f0bf4fc: 0fc12d06 */ jal chrSpawnAtCoord /* f0bf500: e7a60010 */ swc1 $f6,0x10($sp) /* f0bf504: 00408825 */ move $s1,$v0 .PB0f0bf508: @@ -5340,21 +5340,21 @@ glabel var7f1af390 /* f0bf558: a21902e2 */ sb $t9,0x2e2($s0) /* f0bf55c: a2090002 */ sb $t1,0x2($s0) /* f0bf560: a2120003 */ sb $s2,0x3($s0) -/* f0bf564: 0fc59b21 */ jal 0xf166c84 +/* f0bf564: 0fc59b21 */ jal stageGetIndex /* f0bf568: 8e6404b4 */ lw $a0,0x4b4($s3) /* f0bf56c: 14540006 */ bne $v0,$s4,.PB0f0bf588 /* f0bf570: 02002025 */ move $a0,$s0 /* f0bf574: 4405b000 */ mfc1 $a1,$f22 -/* f0bf578: 0fc08196 */ jal 0xf020658 +/* f0bf578: 0fc08196 */ jal chrAddHealth /* f0bf57c: 02002025 */ move $a0,$s0 /* f0bf580: 10000004 */ b .PB0f0bf594 /* f0bf584: 02002025 */ move $a0,$s0 .PB0f0bf588: -/* f0bf588: 0fc08196 */ jal 0xf020658 +/* f0bf588: 0fc08196 */ jal chrAddHealth /* f0bf58c: 3c054120 */ lui $a1,0x4120 /* f0bf590: 02002025 */ move $a0,$s0 .PB0f0bf594: -/* f0bf594: 0fc08191 */ jal 0xf020644 +/* f0bf594: 0fc08191 */ jal chrSetMaxDamage /* f0bf598: 3c054120 */ lui $a1,0x4120 /* f0bf59c: 8e0a0018 */ lw $t2,0x18($s0) /* f0bf5a0: 920f02e1 */ lbu $t7,0x2e1($s0) @@ -5372,19 +5372,19 @@ glabel var7f1af390 /* f0bf5d0: 02002025 */ move $a0,$s0 /* f0bf5d4: 24050101 */ li $a1,0x101 /* f0bf5d8: 24060010 */ li $a2,0x10 -/* f0bf5dc: 0fc22e53 */ jal 0xf08b94c +/* f0bf5dc: 0fc22e53 */ jal chrGiveWeapon /* f0bf5e0: 00003825 */ move $a3,$zero .PB0f0bf5e4: -/* f0bf5e4: 0fc41d39 */ jal 0xf1074e4 +/* f0bf5e4: 0fc41d39 */ jal cheatIsActive /* f0bf5e8: 24040017 */ li $a0,0x17 /* f0bf5ec: 10400062 */ beqz $v0,.PB0f0bf778 /* f0bf5f0: 00000000 */ nop -/* f0bf5f4: 0fc59b21 */ jal 0xf166c84 +/* f0bf5f4: 0fc59b21 */ jal stageGetIndex /* f0bf5f8: 8e6404b4 */ lw $a0,0x4b4($s3) /* f0bf5fc: 24010023 */ li $at,0x23 /* f0bf600: 14410012 */ bne $v0,$at,.PB0f0bf64c /* f0bf604: 00000000 */ nop -/* f0bf608: 0c0063c8 */ jal 0x18f20 +/* f0bf608: 0c0063c8 */ jal ailistFindById /* f0bf60c: 24040012 */ li $a0,0x12 /* f0bf610: 8e680284 */ lw $t0,0x284($s3) /* f0bf614: 240a0010 */ li $t2,0x10 @@ -5397,12 +5397,12 @@ glabel var7f1af390 /* f0bf630: 24050008 */ li $a1,0x8 /* f0bf634: 24660008 */ addiu $a2,$v1,0x8 /* f0bf638: 24670028 */ addiu $a3,$v1,0x28 -/* f0bf63c: 0fc12d06 */ jal 0xf04b418 +/* f0bf63c: 0fc12d06 */ jal chrSpawnAtCoord /* f0bf640: e7a80010 */ swc1 $f8,0x10($sp) /* f0bf644: 10000011 */ b .PB0f0bf68c /* f0bf648: 00408825 */ move $s1,$v0 .PB0f0bf64c: -/* f0bf64c: 0c0063c8 */ jal 0x18f20 +/* f0bf64c: 0c0063c8 */ jal ailistFindById /* f0bf650: 24040012 */ li $a0,0x12 /* f0bf654: 8e680284 */ lw $t0,0x284($s3) /* f0bf658: 240c0010 */ li $t4,0x10 @@ -5415,7 +5415,7 @@ glabel var7f1af390 /* f0bf674: 02802825 */ move $a1,$s4 /* f0bf678: 24660008 */ addiu $a2,$v1,0x8 /* f0bf67c: 24670028 */ addiu $a3,$v1,0x28 -/* f0bf680: 0fc12d06 */ jal 0xf04b418 +/* f0bf680: 0fc12d06 */ jal chrSpawnAtCoord /* f0bf684: e7a40010 */ swc1 $f4,0x10($sp) /* f0bf688: 00408825 */ move $s1,$v0 .PB0f0bf68c: @@ -5441,21 +5441,21 @@ glabel var7f1af390 /* f0bf6d8: a20a02e2 */ sb $t2,0x2e2($s0) /* f0bf6dc: a20c0002 */ sb $t4,0x2($s0) /* f0bf6e0: a2120003 */ sb $s2,0x3($s0) -/* f0bf6e4: 0fc59b21 */ jal 0xf166c84 +/* f0bf6e4: 0fc59b21 */ jal stageGetIndex /* f0bf6e8: 8e6404b4 */ lw $a0,0x4b4($s3) /* f0bf6ec: 14540005 */ bne $v0,$s4,.PB0f0bf704 /* f0bf6f0: 02002025 */ move $a0,$s0 -/* f0bf6f4: 0fc08196 */ jal 0xf020658 +/* f0bf6f4: 0fc08196 */ jal chrAddHealth /* f0bf6f8: 3c054220 */ lui $a1,0x4220 /* f0bf6fc: 10000005 */ b .PB0f0bf714 /* f0bf700: 02002025 */ move $a0,$s0 .PB0f0bf704: /* f0bf704: 4405b000 */ mfc1 $a1,$f22 -/* f0bf708: 0fc08196 */ jal 0xf020658 +/* f0bf708: 0fc08196 */ jal chrAddHealth /* f0bf70c: 02002025 */ move $a0,$s0 /* f0bf710: 02002025 */ move $a0,$s0 .PB0f0bf714: -/* f0bf714: 0fc08191 */ jal 0xf020644 +/* f0bf714: 0fc08191 */ jal chrSetMaxDamage /* f0bf718: 3c054120 */ lui $a1,0x4120 /* f0bf71c: 8e0b0018 */ lw $t3,0x18($s0) /* f0bf720: 921902e1 */ lbu $t9,0x2e1($s0) @@ -5473,24 +5473,24 @@ glabel var7f1af390 /* f0bf750: 02002025 */ move $a0,$s0 /* f0bf754: 240500f9 */ li $a1,0xf9 /* f0bf758: 24060009 */ li $a2,0x9 -/* f0bf75c: 0fc22e53 */ jal 0xf08b94c +/* f0bf75c: 0fc22e53 */ jal chrGiveWeapon /* f0bf760: 00003825 */ move $a3,$zero /* f0bf764: 02002025 */ move $a0,$s0 /* f0bf768: 240500f8 */ li $a1,0xf8 /* f0bf76c: 24060008 */ li $a2,0x8 -/* f0bf770: 0fc22e53 */ jal 0xf08b94c +/* f0bf770: 0fc22e53 */ jal chrGiveWeapon /* f0bf774: 3c071000 */ lui $a3,0x1000 .PB0f0bf778: -/* f0bf778: 0fc41d39 */ jal 0xf1074e4 +/* f0bf778: 0fc41d39 */ jal cheatIsActive /* f0bf77c: 24040019 */ li $a0,0x19 /* f0bf780: 5040005d */ beqzl $v0,.PB0f0bf8f8 /* f0bf784: 8fad0058 */ lw $t5,0x58($sp) -/* f0bf788: 0fc59b21 */ jal 0xf166c84 +/* f0bf788: 0fc59b21 */ jal stageGetIndex /* f0bf78c: 8e6404b4 */ lw $a0,0x4b4($s3) /* f0bf790: 24010023 */ li $at,0x23 /* f0bf794: 14410012 */ bne $v0,$at,.PB0f0bf7e0 /* f0bf798: 00000000 */ nop -/* f0bf79c: 0c0063c8 */ jal 0x18f20 +/* f0bf79c: 0c0063c8 */ jal ailistFindById /* f0bf7a0: 24040012 */ li $a0,0x12 /* f0bf7a4: 8e680284 */ lw $t0,0x284($s3) /* f0bf7a8: 240b0010 */ li $t3,0x10 @@ -5503,12 +5503,12 @@ glabel var7f1af390 /* f0bf7c4: 24050008 */ li $a1,0x8 /* f0bf7c8: 24660008 */ addiu $a2,$v1,0x8 /* f0bf7cc: 24670028 */ addiu $a3,$v1,0x28 -/* f0bf7d0: 0fc12d06 */ jal 0xf04b418 +/* f0bf7d0: 0fc12d06 */ jal chrSpawnAtCoord /* f0bf7d4: e7b20010 */ swc1 $f18,0x10($sp) /* f0bf7d8: 10000011 */ b .PB0f0bf820 /* f0bf7dc: 00408825 */ move $s1,$v0 .PB0f0bf7e0: -/* f0bf7e0: 0c0063c8 */ jal 0x18f20 +/* f0bf7e0: 0c0063c8 */ jal ailistFindById /* f0bf7e4: 24040012 */ li $a0,0x12 /* f0bf7e8: 8e680284 */ lw $t0,0x284($s3) /* f0bf7ec: 240d0010 */ li $t5,0x10 @@ -5521,7 +5521,7 @@ glabel var7f1af390 /* f0bf808: 24050029 */ li $a1,0x29 /* f0bf80c: 24660008 */ addiu $a2,$v1,0x8 /* f0bf810: 24670028 */ addiu $a3,$v1,0x28 -/* f0bf814: 0fc12d06 */ jal 0xf04b418 +/* f0bf814: 0fc12d06 */ jal chrSpawnAtCoord /* f0bf818: e7aa0010 */ swc1 $f10,0x10($sp) /* f0bf81c: 00408825 */ move $s1,$v0 .PB0f0bf820: @@ -5546,21 +5546,21 @@ glabel var7f1af390 /* f0bf868: a20b02e2 */ sb $t3,0x2e2($s0) /* f0bf86c: a2120002 */ sb $s2,0x2($s0) /* f0bf870: a2120003 */ sb $s2,0x3($s0) -/* f0bf874: 0fc59b21 */ jal 0xf166c84 +/* f0bf874: 0fc59b21 */ jal stageGetIndex /* f0bf878: 8e6404b4 */ lw $a0,0x4b4($s3) /* f0bf87c: 14540005 */ bne $v0,$s4,.PB0f0bf894 /* f0bf880: 02002025 */ move $a0,$s0 -/* f0bf884: 0fc08196 */ jal 0xf020658 +/* f0bf884: 0fc08196 */ jal chrAddHealth /* f0bf888: 3c054220 */ lui $a1,0x4220 /* f0bf88c: 10000005 */ b .PB0f0bf8a4 /* f0bf890: 02002025 */ move $a0,$s0 .PB0f0bf894: /* f0bf894: 4405b000 */ mfc1 $a1,$f22 -/* f0bf898: 0fc08196 */ jal 0xf020658 +/* f0bf898: 0fc08196 */ jal chrAddHealth /* f0bf89c: 02002025 */ move $a0,$s0 /* f0bf8a0: 02002025 */ move $a0,$s0 .PB0f0bf8a4: -/* f0bf8a4: 0fc08191 */ jal 0xf020644 +/* f0bf8a4: 0fc08191 */ jal chrSetMaxDamage /* f0bf8a8: 3c054120 */ lui $a1,0x4120 /* f0bf8ac: 8e0d0018 */ lw $t5,0x18($s0) /* f0bf8b0: 920902e1 */ lbu $t1,0x2e1($s0) @@ -5578,7 +5578,7 @@ glabel var7f1af390 /* f0bf8e0: 02002025 */ move $a0,$s0 /* f0bf8e4: 24050104 */ li $a1,0x104 /* f0bf8e8: 2406000d */ li $a2,0xd -/* f0bf8ec: 0fc22e53 */ jal 0xf08b94c +/* f0bf8ec: 0fc22e53 */ jal chrGiveWeapon /* f0bf8f0: 00003825 */ move $a3,$zero .PB0f0bf8f4: /* f0bf8f4: 8fad0058 */ lw $t5,0x58($sp) @@ -5601,16 +5601,16 @@ glabel var7f1af390 /* f0bf930: 54610018 */ bnel $v1,$at,.PB0f0bf994 /* f0bf934: 24010004 */ li $at,0x4 .PB0f0bf938: -/* f0bf938: 0fc2e652 */ jal 0xf0b9948 +/* f0bf938: 0fc2e652 */ jal player0f0b9538 /* f0bf93c: 00000000 */ nop /* f0bf940: 24040001 */ li $a0,0x1 /* f0bf944: 24050001 */ li $a1,0x1 /* f0bf948: 8fa60330 */ lw $a2,0x330($sp) -/* f0bf94c: 0fc3303a */ jal 0xf0cc0e8 +/* f0bf94c: 0fc3303a */ jal bmoveTick /* f0bf950: 00003825 */ move $a3,$zero -/* f0bf954: 0fc2f60c */ jal 0xf0bd830 +/* f0bf954: 0fc2f60c */ jal playerUpdateShake /* f0bf958: 00000000 */ nop -/* f0bf95c: 0fc3072a */ jal 0xf0c1ca8 +/* f0bf95c: 0fc3072a */ jal playerSetCameraMode /* f0bf960: 00002025 */ move $a0,$zero /* f0bf964: 8e680284 */ lw $t0,0x284($s3) /* f0bf968: 8d0300bc */ lw $v1,0xbc($t0) @@ -5619,7 +5619,7 @@ glabel var7f1af390 /* f0bf974: 246a0028 */ addiu $t2,$v1,0x28 /* f0bf978: afaa0010 */ sw $t2,0x10($sp) /* f0bf97c: 25060388 */ addiu $a2,$t0,0x388 -/* f0bf980: 0fc3072e */ jal 0xf0c1cb8 +/* f0bf980: 0fc3072e */ jal player0f0c1840 /* f0bf984: 24670008 */ addiu $a3,$v1,0x8 /* f0bf988: 10000101 */ b .PB0f0bfd90 /* f0bf98c: 00000000 */ nop @@ -5627,42 +5627,42 @@ glabel var7f1af390 .PB0f0bf994: /* f0bf994: 1461000c */ bne $v1,$at,.PB0f0bf9c8 /* f0bf998: 00000000 */ nop -/* f0bf99c: 0fc2e3ec */ jal 0xf0b8fb0 +/* f0bf99c: 0fc2e3ec */ jal playerTickChrBody /* f0bf9a0: 00000000 */ nop /* f0bf9a4: 00002025 */ move $a0,$zero /* f0bf9a8: 00002825 */ move $a1,$zero /* f0bf9ac: 00003025 */ move $a2,$zero -/* f0bf9b0: 0fc3303a */ jal 0xf0cc0e8 +/* f0bf9b0: 0fc3303a */ jal bmoveTick /* f0bf9b4: 24070001 */ li $a3,0x1 -/* f0bf9b8: 0fc2e6be */ jal 0xf0b9af8 +/* f0bf9b8: 0fc2e6be */ jal playerTickMpSwirl /* f0bf9bc: 00000000 */ nop /* f0bf9c0: 100000f3 */ b .PB0f0bfd90 /* f0bf9c4: 00000000 */ nop .PB0f0bf9c8: /* f0bf9c8: 1443000c */ bne $v0,$v1,.PB0f0bf9fc /* f0bf9cc: 24010007 */ li $at,0x7 -/* f0bf9d0: 0fc2e3ec */ jal 0xf0b8fb0 +/* f0bf9d0: 0fc2e3ec */ jal playerTickChrBody /* f0bf9d4: 00000000 */ nop /* f0bf9d8: 00002025 */ move $a0,$zero /* f0bf9dc: 00002825 */ move $a1,$zero /* f0bf9e0: 00003025 */ move $a2,$zero -/* f0bf9e4: 0fc3303a */ jal 0xf0cc0e8 +/* f0bf9e4: 0fc3303a */ jal bmoveTick /* f0bf9e8: 24070001 */ li $a3,0x1 -/* f0bf9ec: 0fc2e833 */ jal 0xf0ba0cc +/* f0bf9ec: 0fc2e833 */ jal playerExecutePreparedWarp /* f0bf9f0: 00000000 */ nop /* f0bf9f4: 100000e6 */ b .PB0f0bfd90 /* f0bf9f8: 00000000 */ nop .PB0f0bf9fc: /* f0bf9fc: 146100e4 */ bne $v1,$at,.PB0f0bfd90 /* f0bfa00: 00000000 */ nop -/* f0bfa04: 0fc2e652 */ jal 0xf0b9948 +/* f0bfa04: 0fc2e652 */ jal player0f0b9538 /* f0bfa08: 00000000 */ nop /* f0bfa0c: 8e6c0284 */ lw $t4,0x284($s3) /* f0bfa10: 24050002 */ li $a1,0x2 /* f0bfa14: 27a60078 */ addiu $a2,$sp,0x78 -/* f0bfa18: 0fc458d4 */ jal 0xf116350 +/* f0bfa18: 0fc458d4 */ jal padUnpack /* f0bfa1c: 85841ba4 */ lh $a0,0x1ba4($t4) -/* f0bfa20: 0c003a6e */ jal 0xe9b8 +/* f0bfa20: 0c003a6e */ jal mainGetStageNum /* f0bfa24: 00000000 */ nop /* f0bfa28: 3c0b8008 */ lui $t3,0x8008 /* f0bfa2c: 856b2480 */ lh $t3,0x2480($t3) @@ -5688,7 +5688,7 @@ glabel var7f1af390 /* f0bfa74: 460a4301 */ sub.s $f12,$f8,$f10 /* f0bfa78: 46062381 */ sub.s $f14,$f4,$f6 /* f0bfa7c: e7ac00d8 */ swc1 $f12,0xd8($sp) -/* f0bfa80: 0fc25970 */ jal 0xf0965c0 +/* f0bfa80: 0fc25970 */ jal atan2f /* f0bfa84: e7ae00d4 */ swc1 $f14,0xd4($sp) /* f0bfa88: 3c017f1b */ lui $at,0x7f1b /* f0bfa8c: c436f3a8 */ lwc1 $f22,-0xc58($at) @@ -5708,7 +5708,7 @@ glabel var7f1af390 /* f0bfac0: 8e680284 */ lw $t0,0x284($s3) .PB0f0bfac4: /* f0bfac4: c50c036c */ lwc1 $f12,0x36c($t0) -/* f0bfac8: 0fc25970 */ jal 0xf0965c0 +/* f0bfac8: 0fc25970 */ jal atan2f /* f0bfacc: c50e0374 */ lwc1 $f14,0x374($t0) /* f0bfad0: 4600b03c */ c.lt.s $f22,$f0 /* f0bfad4: 44804000 */ mtc1 $zero,$f8 @@ -5814,7 +5814,7 @@ glabel var7f1af390 /* f0bfc44: 46042182 */ mul.s $f6,$f4,$f4 /* f0bfc48: c7a000d4 */ lwc1 $f0,0xd4($sp) /* f0bfc4c: 46000482 */ mul.s $f18,$f0,$f0 -/* f0bfc50: 0c012ae4 */ jal 0x4ab90 +/* f0bfc50: 0c012ae4 */ jal sqrtf /* f0bfc54: 46123300 */ add.s $f12,$f6,$f18 /* f0bfc58: 8e680284 */ lw $t0,0x284($s3) /* f0bfc5c: e7a000d8 */ swc1 $f0,0xd8($sp) @@ -5826,7 +5826,7 @@ glabel var7f1af390 /* f0bfc74: 00000000 */ nop /* f0bfc78: 45000004 */ bc1f .PB0f0bfc8c /* f0bfc7c: 00000000 */ nop -/* f0bfc80: 0fc2e693 */ jal 0xf0b9a4c +/* f0bfc80: 0fc2e693 */ jal playerSetTickMode /* f0bfc84: 24040001 */ li $a0,0x1 /* f0bfc88: 8e680284 */ lw $t0,0x284($s3) .PB0f0bfc8c: @@ -5844,7 +5844,7 @@ glabel var7f1af390 /* f0bfcb4: 00000000 */ nop /* f0bfcb8: 45020006 */ bc1fl .PB0f0bfcd4 /* f0bfcbc: 850d1ba8 */ lh $t5,0x1ba8($t0) -/* f0bfcc0: 0fc2e693 */ jal 0xf0b9a4c +/* f0bfcc0: 0fc2e693 */ jal playerSetTickMode /* f0bfcc4: 24040001 */ li $a0,0x1 /* f0bfcc8: 8e680284 */ lw $t0,0x284($s3) /* f0bfccc: 85021baa */ lh $v0,0x1baa($t0) @@ -5885,11 +5885,11 @@ glabel var7f1af390 /* f0bfd48: 46022182 */ mul.s $f6,$f4,$f2 /* f0bfd4c: 4600348d */ trunc.w.s $f18,$f6 /* f0bfd50: 440e9000 */ mfc1 $t6,$f18 -/* f0bfd54: 0fc3303a */ jal 0xf0cc0e8 +/* f0bfd54: 0fc3303a */ jal bmoveTick /* f0bfd58: ad0e1bdc */ sw $t6,0x1bdc($t0) -/* f0bfd5c: 0fc2f60c */ jal 0xf0bd830 +/* f0bfd5c: 0fc2f60c */ jal playerUpdateShake /* f0bfd60: 00000000 */ nop -/* f0bfd64: 0fc3072a */ jal 0xf0c1ca8 +/* f0bfd64: 0fc3072a */ jal playerSetCameraMode /* f0bfd68: 00002025 */ move $a0,$zero /* f0bfd6c: 8e680284 */ lw $t0,0x284($s3) /* f0bfd70: 8d0300bc */ lw $v1,0xbc($t0) @@ -5898,14 +5898,14 @@ glabel var7f1af390 /* f0bfd7c: 24790028 */ addiu $t9,$v1,0x28 /* f0bfd80: afb90010 */ sw $t9,0x10($sp) /* f0bfd84: 25060388 */ addiu $a2,$t0,0x388 -/* f0bfd88: 0fc3072e */ jal 0xf0c1cb8 +/* f0bfd88: 0fc3072e */ jal player0f0c1840 /* f0bfd8c: 24670008 */ addiu $a3,$v1,0x8 .PB0f0bfd90: -/* f0bfd90: 0fc48074 */ jal 0xf1201d0 +/* f0bfd90: 0fc48074 */ jal debug0f11990cnb /* f0bfd94: 00000000 */ nop /* f0bfd98: 50400004 */ beqzl $v0,.PB0f0bfdac /* f0bfd9c: 8e680284 */ lw $t0,0x284($s3) -/* f0bfda0: 0fc480b6 */ jal 0xf1202d8 +/* f0bfda0: 0fc480b6 */ jal debug0f119a14nb /* f0bfda4: 00000000 */ nop /* f0bfda8: 8e680284 */ lw $t0,0x284($s3) .PB0f0bfdac: @@ -5919,11 +5919,11 @@ glabel var7f1af390 /* f0bfdc8: 11e00047 */ beqz $t7,.PB0f0bfee8 /* f0bfdcc: 00000000 */ nop /* f0bfdd0: 8e690288 */ lw $t1,0x288($s3) -/* f0bfdd4: 0fc54ebe */ jal 0xf153af8 +/* f0bfdd4: 0fc54ebe */ jal optionsGetContpadNum1 /* f0bfdd8: 8d240070 */ lw $a0,0x70($t1) /* f0bfddc: 00028600 */ sll $s0,$v0,0x18 /* f0bfde0: 00105603 */ sra $t2,$s0,0x18 -/* f0bfde4: 0fc5b9b8 */ jal 0xf16e6e0 +/* f0bfde4: 0fc5b9b8 */ jal lvIsPaused /* f0bfde8: 01408025 */ move $s0,$t2 /* f0bfdec: 1440002c */ bnez $v0,.PB0f0bfea0 /* f0bfdf0: 8fac0330 */ lw $t4,0x330($sp) @@ -5931,11 +5931,11 @@ glabel var7f1af390 /* f0bfdf8: 00102600 */ sll $a0,$s0,0x18 /* f0bfdfc: 00045e03 */ sra $t3,$a0,0x18 /* f0bfe00: 01602025 */ move $a0,$t3 -/* f0bfe04: 0c00569a */ jal 0x15a68 +/* f0bfe04: 0c00569a */ jal joyGetButtonsPressedThisFrame /* f0bfe08: 3405f030 */ li $a1,0xf030 /* f0bfe0c: 10400024 */ beqz $v0,.PB0f0bfea0 /* f0bfe10: 240d0002 */ li $t5,0x2 -/* f0bfe14: 0fc2ee13 */ jal 0xf0bb84c +/* f0bfe14: 0fc2ee13 */ jal playerIsFadeComplete /* f0bfe18: ae2d0000 */ sw $t5,0x0($s1) /* f0bfe1c: 50400016 */ beqzl $v0,.PB0f0bfe78 /* f0bfe20: 8e680284 */ lw $t0,0x284($s3) @@ -5949,13 +5949,13 @@ glabel var7f1af390 /* f0bfe40: 45020018 */ bc1fl .PB0f0bfea4 /* f0bfe44: 8e2e0000 */ lw $t6,0x0($s1) /* f0bfe48: 44070000 */ mfc1 $a3,$f0 -/* f0bfe4c: 0fc2eddc */ jal 0xf0bb770 +/* f0bfe4c: 0fc2eddc */ jal playerSetFadeColour /* f0bfe50: 00003025 */ move $a2,$zero /* f0bfe54: 3c014270 */ lui $at,0x4270 /* f0bfe58: 44816000 */ mtc1 $at,$f12 /* f0bfe5c: 3c013f80 */ lui $at,0x3f80 /* f0bfe60: 44817000 */ mtc1 $at,$f14 -/* f0bfe64: 0fc2ee06 */ jal 0xf0bb818 +/* f0bfe64: 0fc2ee06 */ jal playerSetFadeFrac /* f0bfe68: 00000000 */ nop /* f0bfe6c: 1000000d */ b .PB0f0bfea4 /* f0bfe70: 8e2e0000 */ lw $t6,0x0($s1) @@ -5969,7 +5969,7 @@ glabel var7f1af390 /* f0bfe8c: 45020005 */ bc1fl .PB0f0bfea4 /* f0bfe90: 8e2e0000 */ lw $t6,0x0($s1) /* f0bfe94: 44817000 */ mtc1 $at,$f14 -/* f0bfe98: 0fc2ee06 */ jal 0xf0bb818 +/* f0bfe98: 0fc2ee06 */ jal playerSetFadeFrac /* f0bfe9c: c50c02e8 */ lwc1 $f12,0x2e8($t0) .PB0f0bfea0: /* f0bfea0: 8e2e0000 */ lw $t6,0x0($s1) @@ -5977,7 +5977,7 @@ glabel var7f1af390 /* f0bfea4: 24010002 */ li $at,0x2 /* f0bfea8: 15c1000f */ bne $t6,$at,.PB0f0bfee8 /* f0bfeac: 00000000 */ nop -/* f0bfeb0: 0fc2ee13 */ jal 0xf0bb84c +/* f0bfeb0: 0fc2ee13 */ jal playerIsFadeComplete /* f0bfeb4: 00000000 */ nop /* f0bfeb8: 1040000b */ beqz $v0,.PB0f0bfee8 /* f0bfebc: 00000000 */ nop @@ -5989,14 +5989,14 @@ glabel var7f1af390 /* f0bfed4: 00000000 */ nop /* f0bfed8: 45000003 */ bc1f .PB0f0bfee8 /* f0bfedc: 00000000 */ nop -/* f0bfee0: 0c003a71 */ jal 0xe9c4 +/* f0bfee0: 0c003a71 */ jal func0000e990 /* f0bfee4: 00000000 */ nop .PB0f0bfee8: /* f0bfee8: 3c0f8007 */ lui $t7,0x8007 /* f0bfeec: 8def2414 */ lw $t7,0x2414($t7) /* f0bfef0: 51e00004 */ beqzl $t7,.PB0f0bff04 /* f0bfef4: 8e680284 */ lw $t0,0x284($s3) -/* f0bfef8: 0fc2e698 */ jal 0xf0b9a60 +/* f0bfef8: 0fc2e698 */ jal playerBeginGeFadeIn /* f0bfefc: 00000000 */ nop /* f0bff00: 8e680284 */ lw $t0,0x284($s3) .PB0f0bff04: @@ -6006,7 +6006,7 @@ glabel var7f1af390 /* f0bff10: 8d02032c */ lw $v0,0x32c($t0) /* f0bff14: 14400005 */ bnez $v0,.PB0f0bff2c /* f0bff18: 00000000 */ nop -/* f0bff1c: 0fc28b13 */ jal 0xf0a2c4c +/* f0bff1c: 0fc28b13 */ jal bgun0f0a29c8 /* f0bff20: 00000000 */ nop /* f0bff24: 8e680284 */ lw $t0,0x284($s3) /* f0bff28: 8d02032c */ lw $v0,0x32c($t0) @@ -6019,7 +6019,7 @@ glabel var7f1af390 /* f0bff40: 8e6c0314 */ lw $t4,0x314($s3) /* f0bff44: 55800006 */ bnezl $t4,.PB0f0bff60 /* f0bff48: 8e6b0298 */ lw $t3,0x298($s3) -/* f0bff4c: 0c0039ae */ jal 0xe6b8 +/* f0bff4c: 0c0039ae */ jal mainEndStage /* f0bff50: 00000000 */ nop /* f0bff54: 10000022 */ b .PB0f0bffe0 /* f0bff58: 8e6a02ac */ lw $t2,0x2ac($s3) @@ -6040,12 +6040,12 @@ glabel var7f1af390 /* f0bff90: 8c590330 */ lw $t9,0x330($v0) /* f0bff94: 13200005 */ beqz $t9,.PB0f0bffac /* f0bff98: 00000000 */ nop -/* f0bff9c: 0c0039ae */ jal 0xe6b8 +/* f0bff9c: 0c0039ae */ jal mainEndStage /* f0bffa0: 00000000 */ nop /* f0bffa4: 1000000e */ b .PB0f0bffe0 /* f0bffa8: 8e6a02ac */ lw $t2,0x2ac($s3) .PB0f0bffac: -/* f0bffac: 0fc125da */ jal 0xf049768 +/* f0bffac: 0fc125da */ jal chrsClearRefsToPlayer /* f0bffb0: 8e64028c */ lw $a0,0x28c($s3) /* f0bffb4: 1000000a */ b .PB0f0bffe0 /* f0bffb8: 8e6a02ac */ lw $t2,0x2ac($s3) @@ -6056,18 +6056,18 @@ glabel var7f1af390 /* f0bffc8: 8e6902a0 */ lw $t1,0x2a0($s3) /* f0bffcc: 55280004 */ bnel $t1,$t0,.PB0f0bffe0 /* f0bffd0: 8e6a02ac */ lw $t2,0x2ac($s3) -/* f0bffd4: 0c0039ae */ jal 0xe6b8 +/* f0bffd4: 0c0039ae */ jal mainEndStage /* f0bffd8: 00000000 */ nop /* f0bffdc: 8e6a02ac */ lw $t2,0x2ac($s3) .PB0f0bffe0: /* f0bffe0: 24010005 */ li $at,0x5 /* f0bffe4: 55410008 */ bnel $t2,$at,.PB0f0c0008 /* f0bffe8: 8fbf004c */ lw $ra,0x4c($sp) -/* f0bffec: 0fc2ee13 */ jal 0xf0bb84c +/* f0bffec: 0fc2ee13 */ jal playerIsFadeComplete /* f0bfff0: 00000000 */ nop /* f0bfff4: 50400004 */ beqzl $v0,.PB0f0c0008 /* f0bfff8: 8fbf004c */ lw $ra,0x4c($sp) -/* f0bfffc: 0c0039ae */ jal 0xe6b8 +/* f0bfffc: 0c0039ae */ jal mainEndStage /* f0c0000: 00000000 */ nop /* f0c0004: 8fbf004c */ lw $ra,0x4c($sp) .PB0f0c0008: diff --git a/src/game/prop.c b/src/game/prop.c index 84d372d52..9ac6ea0c1 100644 --- a/src/game/prop.c +++ b/src/game/prop.c @@ -2982,7 +2982,7 @@ glabel var7f1ab190pf /* f063670: 920f003d */ lbu $t7,0x3d($s0) /* f063674: 8e020004 */ lw $v0,0x4($s0) /* f063678: 02002025 */ move $a0,$s0 -/* f06367c: 0fc527cc */ jal 0xf149f30 +/* f06367c: 0fc527cc */ jal splatTick /* f063680: afa20048 */ sw $v0,0x48($sp) /* f063684: 8fa20048 */ lw $v0,0x48($sp) /* f063688: 10400008 */ beqz $v0,.PB0f0636ac @@ -2990,12 +2990,12 @@ glabel var7f1ab190pf /* f063690: 8c4f02d4 */ lw $t7,0x2d4($v0) /* f063694: 11e00005 */ beqz $t7,.PB0f0636ac /* f063698: 00000000 */ nop -/* f06369c: 0fc64d1e */ jal 0xf193478 +/* f06369c: 0fc64d1e */ jal botTick /* f0636a0: 02002025 */ move $a0,$s0 /* f0636a4: 10000004 */ b .PB0f0636b8 /* f0636a8: 00403025 */ move $a2,$v0 .PB0f0636ac: -/* f0636ac: 0fc08c5d */ jal 0xf023174 +/* f0636ac: 0fc08c5d */ jal chrTick /* f0636b0: 02002025 */ move $a0,$s0 /* f0636b4: 00403025 */ move $a2,$v0 .PB0f0636b8: @@ -3026,7 +3026,7 @@ glabel var7f1ab190pf /* f063714: 54610006 */ bnel $v1,$at,.PB0f063730 /* f063718: 24010007 */ li $at,0x7 .PB0f06371c: -/* f06371c: 0fc1fa3e */ jal 0xf07e8f8 +/* f06371c: 0fc1fa3e */ jal objTick /* f063720: 02002025 */ move $a0,$s0 /* f063724: 10000017 */ b .PB0f063784 /* f063728: 00403025 */ move $a2,$v0 @@ -3034,7 +3034,7 @@ glabel var7f1ab190pf .PB0f063730: /* f063730: 54610006 */ bnel $v1,$at,.PB0f06374c /* f063734: 24010008 */ li $at,0x8 -/* f063738: 0fc4b6ba */ jal 0xf12dae8 +/* f063738: 0fc4b6ba */ jal explosionTick /* f06373c: 02002025 */ move $a0,$s0 /* f063740: 10000010 */ b .PB0f063784 /* f063744: 00403025 */ move $a2,$v0 @@ -3042,7 +3042,7 @@ glabel var7f1ab190pf .PB0f06374c: /* f06374c: 54610006 */ bnel $v1,$at,.PB0f063768 /* f063750: 24010006 */ li $at,0x6 -/* f063754: 0fc4c1b5 */ jal 0xf1306d4 +/* f063754: 0fc4c1b5 */ jal smokeTick /* f063758: 02002025 */ move $a0,$s0 /* f06375c: 10000009 */ b .PB0f063784 /* f063760: 00403025 */ move $a2,$v0 @@ -3050,9 +3050,9 @@ glabel var7f1ab190pf .PB0f063768: /* f063768: 54610007 */ bnel $v1,$at,.PB0f063788 /* f06376c: 962e035e */ lhu $t6,0x35e($s1) -/* f063770: 0fc527cc */ jal 0xf149f30 +/* f063770: 0fc527cc */ jal splatTick /* f063774: 02002025 */ move $a0,$s0 -/* f063778: 0fc309fe */ jal 0xf0c27f8 +/* f063778: 0fc309fe */ jal playerTickThirdPerson /* f06377c: 02002025 */ move $a0,$s0 /* f063780: 00403025 */ move $a2,$v0 .PB0f063784: @@ -3152,7 +3152,7 @@ glabel var7f1ab190pf /* f0638dc: 00000000 */ nop /* f0638e0: 8e020004 */ lw $v0,0x4($s0) /* f0638e4: 02002025 */ move $a0,$s0 -/* f0638e8: 0fc527cc */ jal 0xf149f30 +/* f0638e8: 0fc527cc */ jal splatTick /* f0638ec: afa20044 */ sw $v0,0x44($sp) /* f0638f0: 8fa20044 */ lw $v0,0x44($sp) /* f0638f4: 10400008 */ beqz $v0,.PB0f063918 @@ -3160,12 +3160,12 @@ glabel var7f1ab190pf /* f0638fc: 8c4f02d4 */ lw $t7,0x2d4($v0) /* f063900: 11e00005 */ beqz $t7,.PB0f063918 /* f063904: 00000000 */ nop -/* f063908: 0fc64d1e */ jal 0xf193478 +/* f063908: 0fc64d1e */ jal botTick /* f06390c: 02002025 */ move $a0,$s0 /* f063910: 1000003c */ b .PB0f063a04 /* f063914: 00403025 */ move $a2,$v0 .PB0f063918: -/* f063918: 0fc08c5d */ jal 0xf023174 +/* f063918: 0fc08c5d */ jal chrTick /* f06391c: 02002025 */ move $a0,$s0 /* f063920: 10000038 */ b .PB0f063a04 /* f063924: 00403025 */ move $a2,$v0 @@ -3184,7 +3184,7 @@ glabel var7f1ab190pf /* f063950: 9318af54 */ lbu $t8,-0x50ac($t8) /* f063954: 57000006 */ bnezl $t8,.PB0f063970 /* f063958: 860d0002 */ lh $t5,0x2($s0) -/* f06395c: 0fc1fa3e */ jal 0xf07e8f8 +/* f06395c: 0fc1fa3e */ jal objTick /* f063960: 02002025 */ move $a0,$s0 /* f063964: 10000027 */ b .PB0f063a04 /* f063968: 00403025 */ move $a2,$v0 @@ -3201,7 +3201,7 @@ glabel var7f1ab190pf /* f063990: 01b9082a */ slt $at,$t5,$t9 /* f063994: 5020001c */ beqzl $at,.PB0f063a08 /* f063998: 8faf0034 */ lw $t7,0x34($sp) -/* f06399c: 0fc18c2a */ jal 0xf0630a8 +/* f06399c: 0fc18c2a */ jal propPause /* f0639a0: 02002025 */ move $a0,$s0 /* f0639a4: 10000017 */ b .PB0f063a04 /* f0639a8: 24060005 */ li $a2,0x5 @@ -3209,7 +3209,7 @@ glabel var7f1ab190pf .PB0f0639b0: /* f0639b0: 54610006 */ bnel $v1,$at,.PB0f0639cc /* f0639b4: 24010008 */ li $at,0x8 -/* f0639b8: 0fc4b6ba */ jal 0xf12dae8 +/* f0639b8: 0fc4b6ba */ jal explosionTick /* f0639bc: 02002025 */ move $a0,$s0 /* f0639c0: 10000010 */ b .PB0f063a04 /* f0639c4: 00403025 */ move $a2,$v0 @@ -3217,7 +3217,7 @@ glabel var7f1ab190pf .PB0f0639cc: /* f0639cc: 54610006 */ bnel $v1,$at,.PB0f0639e8 /* f0639d0: 24010006 */ li $at,0x6 -/* f0639d4: 0fc4c1b5 */ jal 0xf1306d4 +/* f0639d4: 0fc4c1b5 */ jal smokeTick /* f0639d8: 02002025 */ move $a0,$s0 /* f0639dc: 10000009 */ b .PB0f063a04 /* f0639e0: 00403025 */ move $a2,$v0 @@ -3225,9 +3225,9 @@ glabel var7f1ab190pf .PB0f0639e8: /* f0639e8: 54610007 */ bnel $v1,$at,.PB0f063a08 /* f0639ec: 8faf0034 */ lw $t7,0x34($sp) -/* f0639f0: 0fc527cc */ jal 0xf149f30 +/* f0639f0: 0fc527cc */ jal splatTick /* f0639f4: 02002025 */ move $a0,$s0 -/* f0639f8: 0fc309fe */ jal 0xf0c27f8 +/* f0639f8: 0fc309fe */ jal playerTickThirdPerson /* f0639fc: 02002025 */ move $a0,$s0 /* f063a00: 00403025 */ move $a2,$v0 .PB0f063a04: @@ -3285,9 +3285,9 @@ glabel var7f1ab190pf /* f063abc: 35ee0080 */ ori $t6,$t7,0x80 /* f063ac0: a20e003f */ sb $t6,0x3f($s0) /* f063ac4: afa20060 */ sw $v0,0x60($sp) -/* f063ac8: 0fc181dd */ jal 0xf060774 +/* f063ac8: 0fc181dd */ jal propDelist /* f063acc: 02002025 */ move $a0,$s0 -/* f063ad0: 0fc181ba */ jal 0xf0606e8 +/* f063ad0: 0fc181ba */ jal propActivateThisFrame /* f063ad4: 02002025 */ move $a0,$s0 /* f063ad8: 8fb8004c */ lw $t8,0x4c($sp) /* f063adc: 8fa20060 */ lw $v0,0x60($sp) @@ -3297,7 +3297,7 @@ glabel var7f1ab190pf /* f063aec: 10000004 */ b .PB0f063b00 /* f063af0: afa0004c */ sw $zero,0x4c($sp) .PB0f063af4: -/* f063af4: 0fc18b45 */ jal 0xf062d14 +/* f063af4: 0fc18b45 */ jal propExecuteTickOperation /* f063af8: afa20060 */ sw $v0,0x60($sp) /* f063afc: 8fa20060 */ lw $v0,0x60($sp) .PB0f063b00: @@ -3619,14 +3619,14 @@ glabel var7f1ab190pf /* f063f5c: 9638035c */ lhu $t8,0x35c($s1) /* f063f60: 11a00007 */ beqz $t5,.PB0f063f80 /* f063f64: a5580378 */ sh $t8,0x378($t2) -/* f063f68: 0fc24301 */ jal 0xf090c04 +/* f063f68: 0fc24301 */ jal alarmTick /* f063f6c: 00000000 */ nop -/* f063f70: 0fc24cd2 */ jal 0xf093348 +/* f063f70: 0fc24cd2 */ jal propsndTick /* f063f74: 00000000 */ nop -/* f063f78: 0fc1988d */ jal 0xf066234 +/* f063f78: 0fc1988d */ jal propsDefragRoomProps /* f063f7c: 00000000 */ nop .PB0f063f80: -/* f063f80: 0fc091ff */ jal 0xf0247fc +/* f063f80: 0fc091ff */ jal chr0f02472c /* f063f84: 00000000 */ nop /* f063f88: 8fbf002c */ lw $ra,0x2c($sp) /* f063f8c: 8fb00014 */ lw $s0,0x14($sp) diff --git a/src/game/propobj.c b/src/game/propobj.c index 632fec34a..dc533debe 100644 --- a/src/game/propobj.c +++ b/src/game/propobj.c @@ -2961,7 +2961,7 @@ glabel func0f068c04 /* f068ea8: afa70128 */ sw $a3,0x128($sp) /* f068eac: 2405005e */ li $a1,0x5e /* f068eb0: 27a600b0 */ addiu $a2,$sp,0xb0 -/* f068eb4: 0fc458d4 */ jal 0xf116350 +/* f068eb4: 0fc458d4 */ jal padUnpack /* f068eb8: afa30104 */ sw $v1,0x104($sp) /* f068ebc: 8fab012c */ lw $t3,0x12c($sp) /* f068ec0: 3c010400 */ lui $at,0x400 @@ -2971,10 +2971,10 @@ glabel func0f068c04 /* f068ed0: 01816824 */ and $t5,$t4,$at /* f068ed4: 51a0000f */ beqzl $t5,.PB0f068f14 /* f068ed8: 95cf0070 */ lhu $t7,0x70($t6) -/* f068edc: 0fc002c9 */ jal 0xf000b24 +/* f068edc: 0fc002c9 */ jal func0f000b24 /* f068ee0: 8fa400f8 */ lw $a0,0xf8($sp) /* f068ee4: 02629821 */ addu $s3,$s3,$v0 -/* f068ee8: 0fc00315 */ jal 0xf000c54 +/* f068ee8: 0fc00315 */ jal func0f000c54 /* f068eec: 8fa400f8 */ lw $a0,0xf8($sp) /* f068ef0: 0282a021 */ addu $s4,$s4,$v0 /* f068ef4: 02741821 */ addu $v1,$s3,$s4 @@ -3059,10 +3059,10 @@ glabel func0f068c04 /* f069020: 45020011 */ bc1fl .PB0f069068 /* f069024: 8624002a */ lh $a0,0x2a($s1) .PB0f069028: -/* f069028: 0fc00315 */ jal 0xf000c54 +/* f069028: 0fc00315 */ jal func0f000c54 /* f06902c: 00000000 */ nop /* f069030: 00408025 */ move $s0,$v0 -/* f069034: 0fc002c9 */ jal 0xf000b24 +/* f069034: 0fc002c9 */ jal func0f000b24 /* f069038: 86240028 */ lh $a0,0x28($s1) /* f06903c: 00501821 */ addu $v1,$v0,$s0 /* f069040: 28610100 */ slti $at,$v1,0x100 @@ -3098,11 +3098,11 @@ glabel func0f068c04 /* f0690a4: 8fb00130 */ lw $s0,0x130($sp) /* f0690a8: 00002825 */ move $a1,$zero /* f0690ac: 26100028 */ addiu $s0,$s0,0x28 -/* f0690b0: 0fc1a33d */ jal 0xf068cf4 +/* f0690b0: 0fc1a33d */ jal func0f068b14 /* f0690b4: 02002025 */ move $a0,$s0 /* f0690b8: 00408825 */ move $s1,$v0 /* f0690bc: 02002025 */ move $a0,$s0 -/* f0690c0: 0fc1a33d */ jal 0xf068cf4 +/* f0690c0: 0fc1a33d */ jal func0f068b14 /* f0690c4: 24050001 */ li $a1,0x1 /* f0690c8: 10000017 */ b .PB0f069128 /* f0690cc: 00401825 */ move $v1,$v0 @@ -6687,19 +6687,19 @@ glabel func0f06b488 /* f06b678: afa60050 */ sw $a2,0x50($sp) /* f06b67c: 00c02825 */ move $a1,$a2 /* f06b680: 00e08025 */ move $s0,$a3 -/* f06b684: 0c00b926 */ jal 0x2e498 +/* f06b684: 0c00b926 */ jal cd0002ded8 /* f06b688: 8fa60048 */ lw $a2,0x48($sp) /* f06b68c: 14400050 */ bnez $v0,.PB0f06b7d0 /* f06b690: 27a4003c */ addiu $a0,$sp,0x3c /* f06b694: 3c077f1b */ lui $a3,0x7f1b /* f06b698: 24e7bc70 */ addiu $a3,$a3,-17296 /* f06b69c: 27a50030 */ addiu $a1,$sp,0x30 -/* f06b6a0: 0c009503 */ jal 0x2540c +/* f06b6a0: 0c009503 */ jal cd00024e4c /* f06b6a4: 24060b5e */ li $a2,0xb5e /* f06b6a8: 3c067f1b */ lui $a2,0x7f1b /* f06b6ac: 24c6bc7c */ addiu $a2,$a2,-17284 /* f06b6b0: 27a40020 */ addiu $a0,$sp,0x20 -/* f06b6b4: 0c00951f */ jal 0x2547c +/* f06b6b4: 0c00951f */ jal cdGetPos /* f06b6b8: 24050b5f */ li $a1,0xb5f /* f06b6bc: 8fa2004c */ lw $v0,0x4c($sp) /* f06b6c0: c7a40020 */ lwc1 $f4,0x20($sp) @@ -6753,7 +6753,7 @@ glabel func0f06b488 /* f06b780: 45030006 */ bc1tl .PB0f06b79c /* f06b784: 44815000 */ mtc1 $at,$f10 .PB0f06b788: -/* f06b788: 0c0011d8 */ jal 0x4760 +/* f06b788: 0c0011d8 */ jal guNormalize /* f06b78c: 24860008 */ addiu $a2,$a0,0x8 /* f06b790: 10000005 */ b .PB0f06b7a8 /* f06b794: 8fae0048 */ lw $t6,0x48($sp) @@ -9143,7 +9143,7 @@ glabel var7f1aa268 /* f06cfe4: 240d0014 */ li $t5,0x14 /* f06cfe8: afad0014 */ sw $t5,0x14($sp) /* f06cfec: afac0010 */ sw $t4,0x10($sp) -/* f06cff0: 0c0062e6 */ jal 0x18b98 +/* f06cff0: 0c0062e6 */ jal func00018148 /* f06cff4: afb0020c */ sw $s0,0x20c($sp) /* f06cff8: 87ae00cc */ lh $t6,0xcc($sp) /* f06cffc: 2416ffff */ li $s6,-1 @@ -9156,7 +9156,7 @@ glabel var7f1aa268 /* f06d014: 56cffffe */ bnel $s6,$t7,.PB0f06d010 /* f06d018: 848f0002 */ lh $t7,0x2($a0) .PB0f06d01c: -/* f06d01c: 0fc596e9 */ jal 0xf165ba4 +/* f06d01c: 0fc596e9 */ jal roomsGetActive /* f06d020: 24050064 */ li $a1,0x64 /* f06d024: 87b800cc */ lh $t8,0xcc($sp) /* f06d028: 27b100cc */ addiu $s1,$sp,0xcc @@ -9168,14 +9168,14 @@ glabel var7f1aa268 /* f06d040: 4481a000 */ mtc1 $at,$f20 /* f06d044: 86240000 */ lh $a0,0x0($s1) .PB0f06d048: -/* f06d048: 0fc58c49 */ jal 0xf163124 +/* f06d048: 0fc58c49 */ jal roomIsLoaded /* f06d04c: 00008025 */ move $s0,$zero /* f06d050: 10400045 */ beqz $v0,.PB0f06d168 /* f06d054: 02a02025 */ move $a0,$s5 /* f06d058: 02a02025 */ move $a0,$s5 /* f06d05c: 27a501c4 */ addiu $a1,$sp,0x1c4 /* f06d060: 86260000 */ lh $a2,0x0($s1) -/* f06d064: 0fc58ae4 */ jal 0xf162b90 +/* f06d064: 0fc58ae4 */ jal func0f161520 /* f06d068: 02603825 */ move $a3,$s3 /* f06d06c: 1040004e */ beqz $v0,.PB0f06d1a8 /* f06d070: c7aa01d0 */ lwc1 $f10,0x1d0($sp) @@ -9215,7 +9215,7 @@ glabel var7f1aa268 /* f06d0f8: ace10008 */ sw $at,0x8($a3) /* f06d0fc: 86440028 */ lh $a0,0x28($s2) /* f06d100: afa80014 */ sw $t0,0x14($sp) -/* f06d104: 0fc4c3dd */ jal 0xf130f74 +/* f06d104: 0fc4c3dd */ jal sparksCreate /* f06d108: afb90010 */ sw $t9,0x10($sp) /* f06d10c: 00163c00 */ sll $a3,$s6,0x10 /* f06d110: 00074c03 */ sra $t1,$a3,0x10 @@ -9234,7 +9234,7 @@ glabel var7f1aa268 /* f06d144: afb6002c */ sw $s6,0x2c($sp) /* f06d148: e7b40030 */ swc1 $f20,0x30($sp) /* f06d14c: e7b40034 */ swc1 $f20,0x34($sp) -/* f06d150: 0fc24e0e */ jal 0xf093838 +/* f06d150: 0fc24e0e */ jal func0f0939f8 /* f06d154: e7b40038 */ swc1 $f20,0x38($sp) /* f06d158: 8eeb0040 */ lw $t3,0x40($s7) /* f06d15c: 356c0004 */ ori $t4,$t3,0x4 @@ -9246,16 +9246,16 @@ glabel var7f1aa268 /* f06d170: 27a500a0 */ addiu $a1,$sp,0xa0 /* f06d174: 27a601c4 */ addiu $a2,$sp,0x1c4 /* f06d178: 24070020 */ li $a3,0x20 -/* f06d17c: 0c00b8f4 */ jal 0x2e3d0 +/* f06d17c: 0c00b8f4 */ jal cd0002de10 /* f06d180: a7ad00a0 */ sh $t5,0xa0($sp) /* f06d184: 14400008 */ bnez $v0,.PB0f06d1a8 /* f06d188: 02602025 */ move $a0,$s3 /* f06d18c: 3c067f1b */ lui $a2,0x7f1b /* f06d190: 24100001 */ li $s0,0x1 /* f06d194: 24c6bc88 */ addiu $a2,$a2,-17272 -/* f06d198: 0c00951f */ jal 0x2547c +/* f06d198: 0c00951f */ jal cdGetPos /* f06d19c: 240510a2 */ li $a1,0x10a2 -/* f06d1a0: 0c00952a */ jal 0x254a8 +/* f06d1a0: 0c00952a */ jal cd00024ee8 /* f06d1a4: 27a401dc */ addiu $a0,$sp,0x1dc .PB0f06d1a8: /* f06d1a8: 1200006f */ beqz $s0,.PB0f06d368 @@ -9394,7 +9394,7 @@ glabel var7f1aa268 /* f06d394: 27a601c4 */ addiu $a2,$sp,0x1c4 /* f06d398: 2407003f */ li $a3,0x3f /* f06d39c: afb40014 */ sw $s4,0x14($sp) -/* f06d3a0: 0fc1b2a1 */ jal 0xf06ca84 +/* f06d3a0: 0fc1b2a1 */ jal func0f06c8ac /* f06d3a4: afaf0010 */ sw $t7,0x10($sp) /* f06d3a8: 1440000a */ bnez $v0,.PB0f06d3d4 /* f06d3ac: 8fb80200 */ lw $t8,0x200($sp) @@ -9434,7 +9434,7 @@ glabel var7f1aa268 /* f06d42c: c7b2009c */ lwc1 $f18,0x9c($sp) /* f06d430: 46129102 */ mul.s $f4,$f18,$f18 /* f06d434: 460a3400 */ add.s $f16,$f6,$f10 -/* f06d438: 0c012ae4 */ jal 0x4ab90 +/* f06d438: 0c012ae4 */ jal sqrtf /* f06d43c: 46102300 */ add.s $f12,$f4,$f16 /* f06d440: 3c017f1b */ lui $at,0x7f1b /* f06d444: c42cbf5c */ lwc1 $f12,-0x40a4($at) @@ -9483,7 +9483,7 @@ glabel var7f1aa268 /* f06d4e8: 45030006 */ bc1tl .PB0f06d504 /* f06d4ec: e6960008 */ swc1 $f22,0x8($s4) .PB0f06d4f0: -/* f06d4f0: 0c0011d8 */ jal 0x4760 +/* f06d4f0: 0c0011d8 */ jal guNormalize /* f06d4f4: 26860008 */ addiu $a2,$s4,0x8 /* f06d4f8: 10000002 */ b .PB0f06d504 /* f06d4fc: 00000000 */ nop @@ -10813,7 +10813,7 @@ glabel var7f1aa26c /* f06d568: 8c900014 */ lw $s0,0x14($a0) /* f06d56c: 00c08825 */ move $s1,$a2 /* f06d570: afa500ac */ sw $a1,0xac($sp) -/* f06d574: 0fc1ad51 */ jal 0xf06b544 +/* f06d574: 0fc1ad51 */ jal objGetWidth /* f06d578: afa400a8 */ sw $a0,0xa8($sp) /* f06d57c: 3c018007 */ lui $at,0x8007 /* f06d580: 8fa500ac */ lw $a1,0xac($sp) @@ -10866,13 +10866,13 @@ glabel var7f1aa26c /* f06d638: afa5003c */ sw $a1,0x3c($sp) /* f06d63c: e7a200a0 */ swc1 $f2,0xa0($sp) /* f06d640: e7a0001c */ swc1 $f0,0x1c($sp) -/* f06d644: 0c00b822 */ jal 0x2e088 +/* f06d644: 0c00b822 */ jal cd0002dac8 /* f06d648: e7a00020 */ swc1 $f0,0x20($sp) /* f06d64c: 10400020 */ beqz $v0,.PB0f06d6d0 /* f06d650: 8fa400a8 */ lw $a0,0xa8($sp) /* f06d654: 27a50080 */ addiu $a1,$sp,0x80 /* f06d658: 2486001c */ addiu $a2,$a0,0x1c -/* f06d65c: 0fc24863 */ jal 0xf09218c +/* f06d65c: 0fc24863 */ jal func0f09233c /* f06d660: 27a70070 */ addiu $a3,$sp,0x70 /* f06d664: 44800000 */ mtc1 $zero,$f0 /* f06d668: 2409003f */ li $t1,0x3f @@ -10883,7 +10883,7 @@ glabel var7f1aa26c /* f06d67c: 27a70070 */ addiu $a3,$sp,0x70 /* f06d680: afa00014 */ sw $zero,0x14($sp) /* f06d684: e7a00018 */ swc1 $f0,0x18($sp) -/* f06d688: 0c00abec */ jal 0x2afb0 +/* f06d688: 0c00abec */ jal cdTestAToB1 /* f06d68c: e7a0001c */ swc1 $f0,0x1c($sp) /* f06d690: 1040000d */ beqz $v0,.PB0f06d6c8 /* f06d694: c7aa0080 */ lwc1 $f10,0x80($sp) @@ -10892,10 +10892,10 @@ glabel var7f1aa26c /* f06d6a0: 02002025 */ move $a0,$s0 /* f06d6a4: e610000c */ swc1 $f16,0xc($s0) /* f06d6a8: c7b20088 */ lwc1 $f18,0x88($sp) -/* f06d6ac: 0fc19789 */ jal 0xf065e24 +/* f06d6ac: 0fc19789 */ jal propDeregisterRooms /* f06d6b0: e6120010 */ swc1 $f18,0x10($s0) /* f06d6b4: 27a40070 */ addiu $a0,$sp,0x70 -/* f06d6b8: 0fc19661 */ jal 0xf065984 +/* f06d6b8: 0fc19661 */ jal roomsCopy /* f06d6bc: 8fa5003c */ lw $a1,0x3c($sp) /* f06d6c0: 10000005 */ b .PB0f06d6d8 /* f06d6c4: 8faa009c */ lw $t2,0x9c($sp) @@ -10912,7 +10912,7 @@ glabel var7f1aa26c /* f06d6e0: 154000fa */ bnez $t2,.PB0f06dacc /* f06d6e4: 24061122 */ li $a2,0x1122 /* f06d6e8: 3c077f1b */ lui $a3,0x7f1b -/* f06d6ec: 0c009503 */ jal 0x2540c +/* f06d6ec: 0c009503 */ jal cd00024e4c /* f06d6f0: 24e7bc94 */ addiu $a3,$a3,-17260 /* f06d6f4: c7a40060 */ lwc1 $f4,0x60($sp) /* f06d6f8: c7a6006c */ lwc1 $f6,0x6c($sp) @@ -10936,7 +10936,7 @@ glabel var7f1aa26c /* f06d740: 45030006 */ bc1tl .PB0f06d75c /* f06d744: 44814000 */ mtc1 $at,$f8 .PB0f06d748: -/* f06d748: 0c0011d8 */ jal 0x4760 +/* f06d748: 0c0011d8 */ jal guNormalize /* f06d74c: 24860008 */ addiu $a2,$a0,0x8 /* f06d750: 10000005 */ b .PB0f06d768 /* f06d754: c6020008 */ lwc1 $f2,0x8($s0) @@ -10978,7 +10978,7 @@ glabel var7f1aa26c /* f06d7d8: e7a40090 */ swc1 $f4,0x90($sp) /* f06d7dc: c6080010 */ lwc1 $f8,0x10($s0) /* f06d7e0: 46083281 */ sub.s $f10,$f6,$f8 -/* f06d7e4: 0fc0b972 */ jal 0xf02e5c8 +/* f06d7e4: 0fc0b972 */ jal func0f02e4f8 /* f06d7e8: e7aa0094 */ swc1 $f10,0x94($sp) /* f06d7ec: c6020008 */ lwc1 $f2,0x8($s0) /* f06d7f0: c7b00080 */ lwc1 $f16,0x80($sp) @@ -11090,7 +11090,7 @@ glabel var7f1aa26c /* f06d964: 00000000 */ nop /* f06d968: e62a0008 */ swc1 $f10,0x8($s1) .PB0f06d96c: -/* f06d96c: 0c009516 */ jal 0x25458 +/* f06d96c: 0c009516 */ jal cd00024e98 /* f06d970: 00000000 */ nop /* f06d974: 3c017f1b */ lui $at,0x7f1b /* f06d978: c430bf60 */ lwc1 $f16,-0x40a0($at) @@ -11118,13 +11118,13 @@ glabel var7f1aa26c /* f06d9d0: afab0010 */ sw $t3,0x10($sp) /* f06d9d4: e7aa001c */ swc1 $f10,0x1c($sp) /* f06d9d8: e7a80018 */ swc1 $f8,0x18($sp) -/* f06d9dc: 0c00b804 */ jal 0x2e010 +/* f06d9dc: 0c00b804 */ jal cd0002da50 /* f06d9e0: e7a60054 */ swc1 $f6,0x54($sp) /* f06d9e4: 10400024 */ beqz $v0,.PB0f06da78 /* f06d9e8: 8fa400a8 */ lw $a0,0xa8($sp) /* f06d9ec: 02202825 */ move $a1,$s1 /* f06d9f0: 2486001c */ addiu $a2,$a0,0x1c -/* f06d9f4: 0fc24863 */ jal 0xf09218c +/* f06d9f4: 0fc24863 */ jal func0f09233c /* f06d9f8: 27a70070 */ addiu $a3,$sp,0x70 /* f06d9fc: 44808000 */ mtc1 $zero,$f16 /* f06da00: 44809000 */ mtc1 $zero,$f18 @@ -11134,7 +11134,7 @@ glabel var7f1aa26c /* f06da10: 2407003f */ li $a3,0x3f /* f06da14: afa00010 */ sw $zero,0x10($sp) /* f06da18: e7b00014 */ swc1 $f16,0x14($sp) -/* f06da1c: 0c00ab11 */ jal 0x2ac44 +/* f06da1c: 0c00ab11 */ jal cdTestVolume /* f06da20: e7b20018 */ swc1 $f18,0x18($sp) /* f06da24: 10400014 */ beqz $v0,.PB0f06da78 /* f06da28: c7a4004c */ lwc1 $f4,0x4c($sp) @@ -11143,10 +11143,10 @@ glabel var7f1aa26c /* f06da34: 02002025 */ move $a0,$s0 /* f06da38: e606000c */ swc1 $f6,0xc($s0) /* f06da3c: c7a80054 */ lwc1 $f8,0x54($sp) -/* f06da40: 0fc19789 */ jal 0xf065e24 +/* f06da40: 0fc19789 */ jal propDeregisterRooms /* f06da44: e6080010 */ swc1 $f8,0x10($s0) /* f06da48: 27a40070 */ addiu $a0,$sp,0x70 -/* f06da4c: 0fc19661 */ jal 0xf065984 +/* f06da4c: 0fc19661 */ jal roomsCopy /* f06da50: 8fa5003c */ lw $a1,0x3c($sp) /* f06da54: 240d0001 */ li $t5,0x1 /* f06da58: 10000007 */ b .PB0f06da78 @@ -11171,14 +11171,14 @@ glabel var7f1aa26c /* f06da9c: e7a60050 */ swc1 $f6,0x50($sp) /* f06daa0: c6080010 */ lwc1 $f8,0x10($s0) /* f06daa4: 8fa5003c */ lw $a1,0x3c($sp) -/* f06daa8: 0fc19815 */ jal 0xf066054 +/* f06daa8: 0fc19815 */ jal func0f065e74 /* f06daac: e7a80054 */ swc1 $f8,0x54($sp) /* f06dab0: c7aa0050 */ lwc1 $f10,0x50($sp) /* f06dab4: 02002025 */ move $a0,$s0 -/* f06dab8: 0fc19789 */ jal 0xf065e24 +/* f06dab8: 0fc19789 */ jal propDeregisterRooms /* f06dabc: e60a000c */ swc1 $f10,0xc($s0) /* f06dac0: 27a40070 */ addiu $a0,$sp,0x70 -/* f06dac4: 0fc19661 */ jal 0xf065984 +/* f06dac4: 0fc19661 */ jal roomsCopy /* f06dac8: 8fa5003c */ lw $a1,0x3c($sp) .PB0f06dacc: /* f06dacc: 8fbf0034 */ lw $ra,0x34($sp) @@ -19596,7 +19596,7 @@ glabel var7f1ab5c0pf /* f0716b8: 502002ef */ beqzl $at,.PB0f072278 /* f0716bc: 8fbf004c */ lw $ra,0x4c($sp) /* f0716c0: 8c980014 */ lw $t8,0x14($a0) -/* f0716c4: 0fc1a335 */ jal 0xf068cd4 +/* f0716c4: 0fc1a335 */ jal objFindBboxRodata /* f0716c8: afb801d4 */ sw $t8,0x1d4($sp) /* f0716cc: 92190000 */ lbu $t9,0x0($s0) /* f0716d0: 3c0a8007 */ lui $t2,0x8007 @@ -19623,7 +19623,7 @@ glabel var7f1ab5c0pf /* f071724: 02002825 */ move $a1,$s0 /* f071728: afa801c0 */ sw $t0,0x1c0($sp) /* f07172c: 24460008 */ addiu $a2,$v0,0x8 -/* f071730: 0fc1c56f */ jal 0xf0715bc +/* f071730: 0fc1c56f */ jal hovUpdateGround /* f071734: 24470028 */ addiu $a3,$v0,0x28 /* f071738: 3c03800a */ lui $v1,0x800a /* f07173c: 8c63e4d8 */ lw $v1,-0x1b28($v1) @@ -19650,7 +19650,7 @@ glabel var7f1ab5c0pf /* f071788: 0561000c */ bgez $t3,.PB0f0717bc /* f07178c: 27a50088 */ addiu $a1,$sp,0x88 /* f071790: 27a60084 */ addiu $a2,$sp,0x84 -/* f071794: 0fc21dc3 */ jal 0xf08770c +/* f071794: 0fc21dc3 */ jal propObjGetBbox /* f071798: 27a70080 */ addiu $a3,$sp,0x80 /* f07179c: 3c017f1b */ lui $at,0x7f1b /* f0717a0: c422bfc0 */ lwc1 $f2,-0x4040($at) @@ -19675,10 +19675,10 @@ glabel var7f1ab5c0pf /* f0717e8: 46005102 */ mul.s $f4,$f10,$f0 /* f0717ec: e7a401cc */ swc1 $f4,0x1cc($sp) .PB0f0717f0: -/* f0717f0: 0c006b88 */ jal 0x1ae20 +/* f0717f0: 0c006b88 */ jal cosf /* f0717f4: c60c0010 */ lwc1 $f12,0x10($s0) /* f0717f8: c60c0010 */ lwc1 $f12,0x10($s0) -/* f0717fc: 0c006b8b */ jal 0x1ae2c +/* f0717fc: 0c006b8b */ jal sinf /* f071800: e7a000bc */ swc1 $f0,0xbc($sp) /* f071804: c7ac01d0 */ lwc1 $f12,0x1d0($sp) /* f071808: 8fa201d4 */ lw $v0,0x1d4($sp) @@ -19714,43 +19714,43 @@ glabel var7f1ab5c0pf /* f071880: 46062201 */ sub.s $f8,$f4,$f6 /* f071884: e7a80094 */ swc1 $f8,0x94($sp) /* f071888: c44a0010 */ lwc1 $f10,0x10($v0) -/* f07188c: 0fc19661 */ jal 0xf065984 +/* f07188c: 0fc19661 */ jal roomsCopy /* f071890: e7aa0098 */ swc1 $f10,0x98($sp) /* f071894: 02202025 */ move $a0,$s1 /* f071898: 27a50090 */ addiu $a1,$sp,0x90 /* f07189c: 8fa6005c */ lw $a2,0x5c($sp) -/* f0718a0: 0fc24863 */ jal 0xf09218c +/* f0718a0: 0fc24863 */ jal func0f09233c /* f0718a4: 27a7009c */ addiu $a3,$sp,0x9c /* f0718a8: 8fa40064 */ lw $a0,0x64($sp) /* f0718ac: 8fa50060 */ lw $a1,0x60($sp) /* f0718b0: 27a601b4 */ addiu $a2,$sp,0x1b4 -/* f0718b4: 0fc19815 */ jal 0xf066054 +/* f0718b4: 0fc19815 */ jal func0f065e74 /* f0718b8: 27a70198 */ addiu $a3,$sp,0x198 /* f0718bc: 27a4009c */ addiu $a0,$sp,0x9c /* f0718c0: 27a50198 */ addiu $a1,$sp,0x198 -/* f0718c4: 0fc1966e */ jal 0xf0659b8 +/* f0718c4: 0fc1966e */ jal roomsAppend /* f0718c8: 24060008 */ li $a2,0x8 /* f0718cc: 27a401b4 */ addiu $a0,$sp,0x1b4 /* f0718d0: 3c0540a0 */ lui $a1,0x40a0 /* f0718d4: 27a60198 */ addiu $a2,$sp,0x198 /* f0718d8: 26270058 */ addiu $a3,$s1,0x58 -/* f0718dc: 0c00aa3c */ jal 0x2a8f0 +/* f0718dc: 0c00aa3c */ jal cdFindGroundYSimple /* f0718e0: afa00010 */ sw $zero,0x10($sp) /* f0718e4: 8fa40064 */ lw $a0,0x64($sp) /* f0718e8: 8fa50060 */ lw $a1,0x60($sp) /* f0718ec: 27a601a8 */ addiu $a2,$sp,0x1a8 /* f0718f0: 27a70188 */ addiu $a3,$sp,0x188 -/* f0718f4: 0fc19815 */ jal 0xf066054 +/* f0718f4: 0fc19815 */ jal func0f065e74 /* f0718f8: e7a001c8 */ swc1 $f0,0x1c8($sp) /* f0718fc: 27a4009c */ addiu $a0,$sp,0x9c /* f071900: 27a50188 */ addiu $a1,$sp,0x188 -/* f071904: 0fc1966e */ jal 0xf0659b8 +/* f071904: 0fc1966e */ jal roomsAppend /* f071908: 24060008 */ li $a2,0x8 /* f07190c: 27a401a8 */ addiu $a0,$sp,0x1a8 /* f071910: 3c0540a0 */ lui $a1,0x40a0 /* f071914: 27a60188 */ addiu $a2,$sp,0x188 /* f071918: 00003825 */ move $a3,$zero -/* f07191c: 0c00aa3c */ jal 0x2a8f0 +/* f07191c: 0c00aa3c */ jal cdFindGroundYSimple /* f071920: afa00010 */ sw $zero,0x10($sp) /* f071924: 3c017f1b */ lui $at,0x7f1b /* f071928: c42cbfc8 */ lwc1 $f12,-0x4038($at) @@ -19766,7 +19766,7 @@ glabel var7f1ab5c0pf /* f071950: 45020011 */ bc1fl .PB0f071998 /* f071954: 4602603e */ c.le.s $f12,$f2 /* f071958: 46101301 */ sub.s $f12,$f2,$f16 -/* f07195c: 0fc25970 */ jal 0xf0965c0 +/* f07195c: 0fc25970 */ jal atan2f /* f071960: 46062381 */ sub.s $f14,$f4,$f6 /* f071964: 3c017f1b */ lui $at,0x7f1b /* f071968: c428bfcc */ lwc1 $f8,-0x4034($at) @@ -19788,7 +19788,7 @@ glabel var7f1ab5c0pf /* f0719a0: 4600603e */ c.le.s $f12,$f0 /* f0719a4: c6040034 */ lwc1 $f4,0x34($s0) /* f0719a8: 46007387 */ neg.s $f14,$f14 -/* f0719ac: 0fc25970 */ jal 0xf0965c0 +/* f0719ac: 0fc25970 */ jal atan2f /* f0719b0: 46041301 */ sub.s $f12,$f2,$f4 /* f0719b4: 3c017f1b */ lui $at,0x7f1b /* f0719b8: c426bfd4 */ lwc1 $f6,-0x402c($at) @@ -19810,7 +19810,7 @@ glabel var7f1ab5c0pf /* f0719f0: 44804000 */ mtc1 $zero,$f8 /* f0719f4: c60a0034 */ lwc1 $f10,0x34($s0) /* f0719f8: c7ae01cc */ lwc1 $f14,0x1cc($sp) -/* f0719fc: 0fc25970 */ jal 0xf0965c0 +/* f0719fc: 0fc25970 */ jal atan2f /* f071a00: 46105301 */ sub.s $f12,$f10,$f16 /* f071a04: 3c017f1b */ lui $at,0x7f1b /* f071a08: c424bfdc */ lwc1 $f4,-0x4024($at) @@ -19884,7 +19884,7 @@ glabel var7f1ab5c0pf /* f071b04: e7a00024 */ swc1 $f0,0x24($sp) /* f071b08: e7a00030 */ swc1 $f0,0x30($sp) /* f071b0c: e7a00034 */ swc1 $f0,0x34($sp) -/* f071b10: 0fc24e0e */ jal 0xf093838 +/* f071b10: 0fc24e0e */ jal func0f0939f8 /* f071b14: e7a00038 */ swc1 $f0,0x38($sp) .PB0f071b18: /* f071b18: 8fae00c0 */ lw $t6,0xc0($sp) @@ -19896,7 +19896,7 @@ glabel var7f1ab5c0pf /* f071b2c: e7a00010 */ swc1 $f0,0x10($sp) /* f071b30: c5c60010 */ lwc1 $f6,0x10($t6) /* f071b34: 44070000 */ mfc1 $a3,$f0 -/* f071b38: 0fc1b6b9 */ jal 0xf06dae4 +/* f071b38: 0fc1b6b9 */ jal applySpeed /* f071b3c: e7a60014 */ swc1 $f6,0x14($sp) /* f071b40: 8fa200c0 */ lw $v0,0xc0($sp) /* f071b44: c6000008 */ lwc1 $f0,0x8($s0) @@ -19911,7 +19911,7 @@ glabel var7f1ab5c0pf /* f071b68: 4502001a */ bc1fl .PB0f071bd4 /* f071b6c: 4602003c */ c.lt.s $f0,$f2 /* f071b70: 44804000 */ mtc1 $zero,$f8 -/* f071b74: 0c004be0 */ jal 0x12f80 +/* f071b74: 0c004be0 */ jal random /* f071b78: e608000c */ swc1 $f8,0xc($s0) /* f071b7c: 8fa300c0 */ lw $v1,0xc0($sp) /* f071b80: 44824000 */ mtc1 $v0,$f8 @@ -19946,7 +19946,7 @@ glabel var7f1ab5c0pf /* f071bec: 45020018 */ bc1fl .PB0f071c50 /* f071bf0: c440001c */ lwc1 $f0,0x1c($v0) /* f071bf4: 44802000 */ mtc1 $zero,$f4 -/* f071bf8: 0c004be0 */ jal 0x12f80 +/* f071bf8: 0c004be0 */ jal random /* f071bfc: e604000c */ swc1 $f4,0xc($s0) /* f071c00: 44824000 */ mtc1 $v0,$f8 /* f071c04: 3c014f80 */ lui $at,0x4f80 @@ -19977,7 +19977,7 @@ glabel var7f1ab5c0pf /* f071c5c: c4480020 */ lwc1 $f8,0x20($v0) /* f071c60: 44070000 */ mfc1 $a3,$f0 /* f071c64: 2606001c */ addiu $a2,$s0,0x1c -/* f071c68: 0fc1b736 */ jal 0xf06dcd8 +/* f071c68: 0fc1b736 */ jal applyRotation /* f071c6c: e7a80014 */ swc1 $f8,0x14($sp) /* f071c70: c60c0018 */ lwc1 $f12,0x18($s0) /* f071c74: c6060014 */ lwc1 $f6,0x14($s0) @@ -20007,7 +20007,7 @@ glabel var7f1ab5c0pf /* f071cd4: 00000000 */ nop /* f071cd8: 45000018 */ bc1f .PB0f071d3c /* f071cdc: 00000000 */ nop -/* f071ce0: 0c004be0 */ jal 0x12f80 +/* f071ce0: 0c004be0 */ jal random /* f071ce4: 00000000 */ nop /* f071ce8: 8fa300c0 */ lw $v1,0xc0($sp) /* f071cec: 3c017f1b */ lui $at,0x7f1b @@ -20032,7 +20032,7 @@ glabel var7f1ab5c0pf /* f071d34: 10000013 */ b .PB0f071d84 /* f071d38: e6040018 */ swc1 $f4,0x18($s0) .PB0f071d3c: -/* f071d3c: 0c004be0 */ jal 0x12f80 +/* f071d3c: 0c004be0 */ jal random /* f071d40: 00000000 */ nop /* f071d44: 44825000 */ mtc1 $v0,$f10 /* f071d48: 3c014f80 */ lui $at,0x4f80 @@ -20061,7 +20061,7 @@ glabel var7f1ab5c0pf /* f071d98: e7a00010 */ swc1 $f0,0x10($sp) /* f071d9c: c4460030 */ lwc1 $f6,0x30($v0) /* f071da0: 44070000 */ mfc1 $a3,$f0 -/* f071da4: 0fc1b736 */ jal 0xf06dcd8 +/* f071da4: 0fc1b736 */ jal applyRotation /* f071da8: e7a60014 */ swc1 $f6,0x14($sp) /* f071dac: c60c0024 */ lwc1 $f12,0x24($s0) /* f071db0: c6080020 */ lwc1 $f8,0x20($s0) @@ -20091,7 +20091,7 @@ glabel var7f1ab5c0pf /* f071e10: 00000000 */ nop /* f071e14: 45000018 */ bc1f .PB0f071e78 /* f071e18: 00000000 */ nop -/* f071e1c: 0c004be0 */ jal 0x12f80 +/* f071e1c: 0c004be0 */ jal random /* f071e20: 00000000 */ nop /* f071e24: 8fa900c0 */ lw $t1,0xc0($sp) /* f071e28: 3c017f1b */ lui $at,0x7f1b @@ -20116,7 +20116,7 @@ glabel var7f1ab5c0pf /* f071e70: 10000013 */ b .PB0f071ec0 /* f071e74: e60a0024 */ swc1 $f10,0x24($s0) .PB0f071e78: -/* f071e78: 0c004be0 */ jal 0x12f80 +/* f071e78: 0c004be0 */ jal random /* f071e7c: 00000000 */ nop /* f071e80: 44822000 */ mtc1 $v0,$f4 /* f071e84: 3c014f80 */ lui $at,0x4f80 @@ -20270,7 +20270,7 @@ glabel var7f1ab5c0pf /* f072098: 13000004 */ beqz $t8,.PB0f0720ac /* f07209c: 02202025 */ move $a0,$s1 /* f0720a0: 24050001 */ li $a1,0x1 -/* f0720a4: 0fc1a792 */ jal 0xf069e48 +/* f0720a4: 0fc1a792 */ jal func0f069c70 /* f0720a8: 24060001 */ li $a2,0x1 .PB0f0720ac: /* f0720ac: 3c0140a0 */ lui $at,0x40a0 @@ -20300,14 +20300,14 @@ glabel var7f1ab5c0pf /* f072104: 01415824 */ and $t3,$t2,$at /* f072108: ae2b0008 */ sw $t3,0x8($s1) .PB0f07210c: -/* f07210c: 0fc1c54e */ jal 0xf071538 +/* f07210c: 0fc1c54e */ jal objGetHov04 /* f072110: 02202025 */ move $a0,$s1 /* f072114: c6040030 */ lwc1 $f4,0x30($s0) /* f072118: 8fac01d4 */ lw $t4,0x1d4($sp) /* f07211c: 27a50148 */ addiu $a1,$sp,0x148 /* f072120: 46040280 */ add.s $f10,$f0,$f4 /* f072124: e58a000c */ swc1 $f10,0xc($t4) -/* f072128: 0c005b94 */ jal 0x16e50 +/* f072128: 0c005b94 */ jal mtx4LoadZRotation /* f07212c: c60c0020 */ lwc1 $f12,0x20($s0) /* f072130: c608002c */ lwc1 $f8,0x2c($s0) /* f072134: c6060014 */ lwc1 $f6,0x14($s0) @@ -20332,21 +20332,21 @@ glabel var7f1ab5c0pf /* f07217c: c426c010 */ lwc1 $f6,-0x3ff0($at) /* f072180: 46066300 */ add.s $f12,$f12,$f6 .PB0f072184: -/* f072184: 0c005b4e */ jal 0x16d38 +/* f072184: 0c005b4e */ jal mtx4LoadXRotation /* f072188: 27a50108 */ addiu $a1,$sp,0x108 /* f07218c: 27a40108 */ addiu $a0,$sp,0x108 -/* f072190: 0c00598c */ jal 0x16630 +/* f072190: 0c00598c */ jal mtx00015be0 /* f072194: 27a50148 */ addiu $a1,$sp,0x148 /* f072198: c60c0010 */ lwc1 $f12,0x10($s0) -/* f07219c: 0c005b71 */ jal 0x16dc4 +/* f07219c: 0c005b71 */ jal mtx4LoadYRotation /* f0721a0: 27a50108 */ addiu $a1,$sp,0x108 /* f0721a4: 27b00108 */ addiu $s0,$sp,0x108 /* f0721a8: 02002025 */ move $a0,$s0 -/* f0721ac: 0c00598c */ jal 0x16630 +/* f0721ac: 0c00598c */ jal mtx00015be0 /* f0721b0: 27a50148 */ addiu $a1,$sp,0x148 /* f0721b4: 8e2d0018 */ lw $t5,0x18($s1) /* f0721b8: 27a50148 */ addiu $a1,$sp,0x148 -/* f0721bc: 0c005a55 */ jal 0x16954 +/* f0721bc: 0c005a55 */ jal mtx00015f04 /* f0721c0: c5ac0014 */ lwc1 $f12,0x14($t5) /* f0721c4: 922e0003 */ lbu $t6,0x3($s1) /* f0721c8: 24010033 */ li $at,0x33 @@ -20362,15 +20362,15 @@ glabel var7f1ab5c0pf /* f0721f0: 00000000 */ nop /* f0721f4: 4503000c */ bc1tl .PB0f072228 /* f0721f8: c7a4006c */ lwc1 $f4,0x6c($sp) -/* f0721fc: 0c005b4e */ jal 0x16d38 +/* f0721fc: 0c005b4e */ jal mtx4LoadXRotation /* f072200: 02002825 */ move $a1,$s0 /* f072204: 27b100c8 */ addiu $s1,$sp,0xc8 /* f072208: 02203025 */ move $a2,$s1 /* f07220c: 27a40148 */ addiu $a0,$sp,0x148 -/* f072210: 0c00598d */ jal 0x16634 +/* f072210: 0c00598d */ jal mtx00015be4 /* f072214: 02002825 */ move $a1,$s0 /* f072218: 02202025 */ move $a0,$s1 -/* f07221c: 0c0059da */ jal 0x16768 +/* f07221c: 0c0059da */ jal mtx4Copy /* f072220: 27a50148 */ addiu $a1,$sp,0x148 /* f072224: c7a4006c */ lwc1 $f4,0x6c($sp) .PB0f072228: @@ -20381,18 +20381,18 @@ glabel var7f1ab5c0pf /* f072238: 00000000 */ nop /* f07223c: 4503000b */ bc1tl .PB0f07226c /* f072240: 27a40148 */ addiu $a0,$sp,0x148 -/* f072244: 0c005b94 */ jal 0x16e50 +/* f072244: 0c005b94 */ jal mtx4LoadZRotation /* f072248: 46002306 */ mov.s $f12,$f4 /* f07224c: 27a40148 */ addiu $a0,$sp,0x148 /* f072250: 02002825 */ move $a1,$s0 -/* f072254: 0c00598d */ jal 0x16634 +/* f072254: 0c00598d */ jal mtx00015be4 /* f072258: 02203025 */ move $a2,$s1 /* f07225c: 02202025 */ move $a0,$s1 -/* f072260: 0c0059da */ jal 0x16768 +/* f072260: 0c0059da */ jal mtx4Copy /* f072264: 27a50148 */ addiu $a1,$sp,0x148 /* f072268: 27a40148 */ addiu $a0,$sp,0x148 .PB0f07226c: -/* f07226c: 0c0059fc */ jal 0x167f0 +/* f07226c: 0c0059fc */ jal mtx4ToMtx3 /* f072270: 8fa5005c */ lw $a1,0x5c($sp) /* f072274: 8fbf004c */ lw $ra,0x4c($sp) .PB0f072278: @@ -21936,7 +21936,7 @@ glabel var7f1aa320 /* f0729bc: 00808025 */ move $s0,$a0 /* f0729c0: afa500a4 */ sw $a1,0xa4($sp) /* f0729c4: afa600a8 */ sw $a2,0xa8($sp) -/* f0729c8: 0c00951c */ jal 0x25470 +/* f0729c8: 0c00951c */ jal cdGetObstacle /* f0729cc: e7a4009c */ swc1 $f4,0x9c($sp) /* f0729d0: 104000b2 */ beqz $v0,.PB0f072c9c /* f0729d4: 8faa00a4 */ lw $t2,0xa4($sp) @@ -21990,16 +21990,16 @@ glabel var7f1aa320 /* f072a94: 460c2182 */ mul.s $f6,$f4,$f12 /* f072a98: afaf0010 */ sw $t7,0x10($sp) /* f072a9c: 46003203 */ div.s $f8,$f6,$f0 -/* f072aa0: 0fc20aef */ jal 0xf082bbc +/* f072aa0: 0fc20aef */ jal func0f082a1c /* f072aa4: e7a80084 */ swc1 $f8,0x84($sp) /* f072aa8: 3c077f1b */ lui $a3,0x7f1b /* f072aac: 24e7bca0 */ addiu $a3,$a3,-17248 /* f072ab0: 27a40070 */ addiu $a0,$sp,0x70 /* f072ab4: 27a50064 */ addiu $a1,$sp,0x64 -/* f072ab8: 0c009503 */ jal 0x2540c +/* f072ab8: 0c009503 */ jal cd00024e4c /* f072abc: 24061cbc */ li $a2,0x1cbc /* f072ac0: 27a40058 */ addiu $a0,$sp,0x58 -/* f072ac4: 0c009649 */ jal 0x25924 +/* f072ac4: 0c009649 */ jal cd00025364 /* f072ac8: 27a5004c */ addiu $a1,$sp,0x4c /* f072acc: 1040000e */ beqz $v0,.PB0f072b08 /* f072ad0: 8fa80098 */ lw $t0,0x98($sp) @@ -22047,7 +22047,7 @@ glabel var7f1aa320 /* f072b70: 27a40070 */ addiu $a0,$sp,0x70 /* f072b74: 27a50064 */ addiu $a1,$sp,0x64 /* f072b78: 27a60058 */ addiu $a2,$sp,0x58 -/* f072b7c: 0fc0b92b */ jal 0xf02e4ac +/* f072b7c: 0fc0b92b */ jal func0f02e3dc /* f072b80: 27a7004c */ addiu $a3,$sp,0x4c /* f072b84: 44800000 */ mtc1 $zero,$f0 /* f072b88: c7a600a8 */ lwc1 $f6,0xa8($sp) @@ -22077,7 +22077,7 @@ glabel var7f1aa320 /* f072be8: af0d0004 */ sw $t5,0x4($t8) /* f072bec: e7ae0044 */ swc1 $f14,0x44($sp) /* f072bf0: e7a20048 */ swc1 $f2,0x48($sp) -/* f072bf4: 0c012ae4 */ jal 0x4ab90 +/* f072bf4: 0c012ae4 */ jal sqrtf /* f072bf8: 460a4300 */ add.s $f12,$f8,$f10 /* f072bfc: 3c014120 */ lui $at,0x4120 /* f072c00: 44819000 */ mtc1 $at,$f18 @@ -22117,7 +22117,7 @@ glabel var7f1aa320 /* f072c88: 00000000 */ nop /* f072c8c: 46082400 */ add.s $f16,$f4,$f8 /* f072c90: 44068000 */ mfc1 $a2,$f16 -/* f072c94: 0fc20aef */ jal 0xf082bbc +/* f072c94: 0fc20aef */ jal func0f082a1c /* f072c98: 00000000 */ nop .PB0f072c9c: /* f072c9c: 8fbf0024 */ lw $ra,0x24($sp) @@ -23278,13 +23278,13 @@ glabel var7f1ab654pf /* f072d70: 460a2182 */ mul.s $f6,$f4,$f10 /* f072d74: afa30064 */ sw $v1,0x64($sp) /* f072d78: 4606a200 */ add.s $f8,$f20,$f6 -/* f072d7c: 0fc1c8ab */ jal 0xf0722ac +/* f072d7c: 0fc1c8ab */ jal hoverpropGetTurnAngle /* f072d80: e7a8006c */ swc1 $f8,0x6c($sp) /* f072d84: e7a00080 */ swc1 $f0,0x80($sp) -/* f072d88: 0c006b8b */ jal 0x1ae2c +/* f072d88: 0c006b8b */ jal sinf /* f072d8c: 46000306 */ mov.s $f12,$f0 /* f072d90: e7a0007c */ swc1 $f0,0x7c($sp) -/* f072d94: 0c006b88 */ jal 0x1ae20 +/* f072d94: 0c006b88 */ jal cosf /* f072d98: c7ac0080 */ lwc1 $f12,0x80($sp) /* f072d9c: c7b0008c */ lwc1 $f16,0x8c($sp) /* f072da0: 3c05800a */ lui $a1,0x800a @@ -25224,7 +25224,7 @@ glabel var7f1aa3d0 /* f073710: 00025040 */ sll $t2,$v0,0x1 .PB0f073714: /* f073714: e7ac0094 */ swc1 $f12,0x94($sp) -/* f073718: 0fc0a255 */ jal 0xf028954 +/* f073718: 0fc0a255 */ jal chrGetTargetProp /* f07371c: e7ae008c */ swc1 $f14,0x8c($sp) /* f073720: 24480028 */ addiu $t0,$v0,0x28 /* f073724: afa80010 */ sw $t0,0x10($sp) @@ -25232,7 +25232,7 @@ glabel var7f1aa3d0 /* f07372c: 26650008 */ addiu $a1,$s3,0x8 /* f073730: 24460008 */ addiu $a2,$v0,0x8 /* f073734: 26670028 */ addiu $a3,$s3,0x28 -/* f073738: 0fc670ac */ jal 0xf19c2b0 +/* f073738: 0fc670ac */ jal botactFindRocketRoute /* f07373c: afb20014 */ sw $s2,0x14($sp) /* f073740: c7ac0094 */ lwc1 $f12,0x94($sp) /* f073744: 1440000c */ bnez $v0,.PB0f073778 @@ -25245,7 +25245,7 @@ glabel var7f1aa3d0 /* f07375c: 956400f8 */ lhu $a0,0xf8($t3) /* f073760: e7ae008c */ swc1 $f14,0x8c($sp) /* f073764: e7ac0094 */ swc1 $f12,0x94($sp) -/* f073768: 0fc670ec */ jal 0xf19c3b0 +/* f073768: 0fc670ec */ jal botactGetRocketSpawnPos /* f07376c: 264500c4 */ addiu $a1,$s2,0xc4 /* f073770: c7ac0094 */ lwc1 $f12,0x94($sp) /* f073774: c7ae008c */ lwc1 $f14,0x8c($sp) @@ -25256,15 +25256,15 @@ glabel var7f1aa3d0 /* f073784: 00000000 */ nop /* f073788: 460e7182 */ mul.s $f6,$f14,$f14 /* f07378c: e7a40044 */ swc1 $f4,0x44($sp) -/* f073790: 0fc25970 */ jal 0xf0965c0 +/* f073790: 0fc25970 */ jal atan2f /* f073794: e7a60040 */ swc1 $f6,0x40($sp) /* f073798: c7a80044 */ lwc1 $f8,0x44($sp) /* f07379c: c7aa0040 */ lwc1 $f10,0x40($sp) /* f0737a0: e7a00084 */ swc1 $f0,0x84($sp) -/* f0737a4: 0c012ae4 */ jal 0x4ab90 +/* f0737a4: 0c012ae4 */ jal sqrtf /* f0737a8: 460a4300 */ add.s $f12,$f8,$f10 /* f0737ac: 4600a306 */ mov.s $f12,$f20 -/* f0737b0: 0fc25970 */ jal 0xf0965c0 +/* f0737b0: 0fc25970 */ jal atan2f /* f0737b4: 46000386 */ mov.s $f14,$f0 /* f0737b8: 3c15800a */ lui $s5,0x800a /* f0737bc: 26b5e4d0 */ addiu $s5,$s5,-6960 @@ -25276,13 +25276,13 @@ glabel var7f1aa3d0 .PB0f0737d4: /* f0737d4: 34c6fe09 */ ori $a2,$a2,0xfe09 /* f0737d8: c64c0018 */ lwc1 $f12,0x18($s2) -/* f0737dc: 0c006e8e */ jal 0x1ba38 +/* f0737dc: 0c006e8e */ jal model0001afe8 /* f0737e0: c7ae0084 */ lwc1 $f14,0x84($sp) /* f0737e4: 3c063cb7 */ lui $a2,0x3cb7 /* f0737e8: e6400018 */ swc1 $f0,0x18($s2) /* f0737ec: 34c6fe09 */ ori $a2,$a2,0xfe09 /* f0737f0: c64c0014 */ lwc1 $f12,0x14($s2) -/* f0737f4: 0c006e8e */ jal 0x1ba38 +/* f0737f4: 0c006e8e */ jal model0001afe8 /* f0737f8: 4600a386 */ mov.s $f14,$f20 /* f0737fc: e6400014 */ swc1 $f0,0x14($s2) /* f073800: 8ead0034 */ lw $t5,0x34($s5) @@ -25296,43 +25296,43 @@ glabel var7f1aa3d0 /* f07381c: c6520014 */ lwc1 $f18,0x14($s2) /* f073820: 27b10118 */ addiu $s1,$sp,0x118 /* f073824: 02202825 */ move $a1,$s1 -/* f073828: 0c005b4e */ jal 0x16d38 +/* f073828: 0c005b4e */ jal mtx4LoadXRotation /* f07382c: 46128301 */ sub.s $f12,$f16,$f18 /* f073830: c64c0018 */ lwc1 $f12,0x18($s2) -/* f073834: 0c005b71 */ jal 0x16dc4 +/* f073834: 0c005b71 */ jal mtx4LoadYRotation /* f073838: 27a500d8 */ addiu $a1,$sp,0xd8 /* f07383c: 27b00098 */ addiu $s0,$sp,0x98 /* f073840: 02003025 */ move $a2,$s0 /* f073844: 27a400d8 */ addiu $a0,$sp,0xd8 -/* f073848: 0c005914 */ jal 0x16450 +/* f073848: 0c005914 */ jal mtx4MultMtx4 /* f07384c: 02202825 */ move $a1,$s1 /* f073850: 8fae0188 */ lw $t6,0x188($sp) /* f073854: 02002825 */ move $a1,$s0 /* f073858: 8dcf0018 */ lw $t7,0x18($t6) -/* f07385c: 0c005a55 */ jal 0x16954 +/* f07385c: 0c005a55 */ jal mtx00015f04 /* f073860: c5ec0014 */ lwc1 $f12,0x14($t7) /* f073864: 8fa50188 */ lw $a1,0x188($sp) /* f073868: 02002025 */ move $a0,$s0 -/* f07386c: 0c0059fc */ jal 0x167f0 +/* f07386c: 0c0059fc */ jal mtx4ToMtx3 /* f073870: 24a5001c */ addiu $a1,$a1,0x1c .PB0f073874: /* f073874: 3c15800a */ lui $s5,0x800a /* f073878: 26b5e4d0 */ addiu $s5,$s5,-6960 /* f07387c: c64c0018 */ lwc1 $f12,0x18($s2) -/* f073880: 0c006b8b */ jal 0x1ae2c +/* f073880: 0c006b8b */ jal sinf /* f073884: 00008825 */ move $s1,$zero /* f073888: 46000506 */ mov.s $f20,$f0 -/* f07388c: 0c006b88 */ jal 0x1ae20 +/* f07388c: 0c006b88 */ jal cosf /* f073890: c64c0014 */ lwc1 $f12,0x14($s2) /* f073894: 46140102 */ mul.s $f4,$f0,$f20 /* f073898: e7a40068 */ swc1 $f4,0x68($sp) -/* f07389c: 0c006b8b */ jal 0x1ae2c +/* f07389c: 0c006b8b */ jal sinf /* f0738a0: c64c0014 */ lwc1 $f12,0x14($s2) /* f0738a4: e7a0006c */ swc1 $f0,0x6c($sp) -/* f0738a8: 0c006b88 */ jal 0x1ae20 +/* f0738a8: 0c006b88 */ jal cosf /* f0738ac: c64c0018 */ lwc1 $f12,0x18($s2) /* f0738b0: 46000506 */ mov.s $f20,$f0 -/* f0738b4: 0c006b88 */ jal 0x1ae20 +/* f0738b4: 0c006b88 */ jal cosf /* f0738b8: c64c0014 */ lwc1 $f12,0x14($s2) /* f0738bc: 46140182 */ mul.s $f6,$f0,$f20 /* f0738c0: 8eb80038 */ lw $t8,0x38($s5) @@ -25383,19 +25383,19 @@ glabel var7f1aa3d0 /* f073968: 8e460088 */ lw $a2,0x88($s2) /* f07396c: 10c00003 */ beqz $a2,.PB0f07397c /* f073970: 00c02025 */ move $a0,$a2 -/* f073974: 0fc190d6 */ jal 0xf064358 +/* f073974: 0fc190d6 */ jal propSetPerimEnabled /* f073978: 00002825 */ move $a1,$zero .PB0f07397c: /* f07397c: 8fa40188 */ lw $a0,0x188($sp) /* f073980: 27a50074 */ addiu $a1,$sp,0x74 /* f073984: 27a60164 */ addiu $a2,$sp,0x164 -/* f073988: 0fc1b3b6 */ jal 0xf06ced8 +/* f073988: 0fc1b3b6 */ jal func0f06cd00 /* f07398c: 27a70158 */ addiu $a3,$sp,0x158 /* f073990: afa20184 */ sw $v0,0x184($sp) /* f073994: 8e460088 */ lw $a2,0x88($s2) /* f073998: 10c00003 */ beqz $a2,.PB0f0739a8 /* f07399c: 00c02025 */ move $a0,$a2 -/* f0739a0: 0fc190d6 */ jal 0xf064358 +/* f0739a0: 0fc190d6 */ jal propSetPerimEnabled /* f0739a4: 24050001 */ li $a1,0x1 .PB0f0739a8: /* f0739a8: 8fa90184 */ lw $t1,0x184($sp) @@ -25407,7 +25407,7 @@ glabel var7f1aa3d0 /* f0739c0: 02002825 */ move $a1,$s0 /* f0739c4: 26640008 */ addiu $a0,$s3,0x8 /* f0739c8: 27a60074 */ addiu $a2,$sp,0x74 -/* f0739cc: 0fc19815 */ jal 0xf066054 +/* f0739cc: 0fc19815 */ jal func0f065e74 /* f0739d0: 02203825 */ move $a3,$s1 /* f0739d4: c7a80074 */ lwc1 $f8,0x74($sp) /* f0739d8: 02602025 */ move $a0,$s3 @@ -25415,14 +25415,14 @@ glabel var7f1aa3d0 /* f0739e0: c7a60078 */ lwc1 $f6,0x78($sp) /* f0739e4: e666000c */ swc1 $f6,0xc($s3) /* f0739e8: c7b0007c */ lwc1 $f16,0x7c($sp) -/* f0739ec: 0fc19789 */ jal 0xf065e24 +/* f0739ec: 0fc19789 */ jal propDeregisterRooms /* f0739f0: e6700010 */ swc1 $f16,0x10($s3) /* f0739f4: 02202025 */ move $a0,$s1 -/* f0739f8: 0fc19661 */ jal 0xf065984 +/* f0739f8: 0fc19661 */ jal roomsCopy /* f0739fc: 02002825 */ move $a1,$s0 /* f073a00: 8fa40188 */ lw $a0,0x188($sp) /* f073a04: 24050001 */ li $a1,0x1 -/* f073a08: 0fc1a792 */ jal 0xf069e48 +/* f073a08: 0fc1a792 */ jal func0f069c70 /* f073a0c: 24060001 */ li $a2,0x1 /* f073a10: 10000003 */ b .PB0f073a20 /* f073a14: 8e4200f4 */ lw $v0,0xf4($s2) @@ -25435,7 +25435,7 @@ glabel var7f1aa3d0 /* f073a28: 1c400006 */ bgtz $v0,.PB0f073a44 /* f073a2c: 26650028 */ addiu $a1,$s3,0x28 /* f073a30: ae4b00f4 */ sw $t3,0xf4($s2) -/* f073a34: 0fc4bf5c */ jal 0xf12fd70 +/* f073a34: 0fc4bf5c */ jal smokeCreateSimple /* f073a38: 24060008 */ li $a2,0x8 /* f073a3c: 10000004 */ b .PB0f073a50 /* f073a40: 00000000 */ nop @@ -25465,20 +25465,20 @@ glabel var7f1aa3d0 /* f073a94: 1b20005d */ blez $t9,.PB0f073c0c /* f073a98: 00000000 */ nop .PB0f073a9c: -/* f073a9c: 0fc63b03 */ jal 0xf18ec0c +/* f073a9c: 0fc63b03 */ jal mpGetChrFromPlayerIndex /* f073aa0: 02202025 */ move $a0,$s1 /* f073aa4: 10540053 */ beq $v0,$s4,.PB0f073bf4 /* f073aa8: 00408025 */ move $s0,$v0 -/* f073aac: 0fc0e6e9 */ jal 0xf039ba4 +/* f073aac: 0fc0e6e9 */ jal chrIsDead /* f073ab0: 00402025 */ move $a0,$v0 /* f073ab4: 1440004f */ bnez $v0,.PB0f073bf4 /* f073ab8: 02802025 */ move $a0,$s4 /* f073abc: 02002825 */ move $a1,$s0 -/* f073ac0: 0fc12aec */ jal 0xf04abb0 +/* f073ac0: 0fc12aec */ jal chrCompareTeams /* f073ac4: 24060002 */ li $a2,0x2 /* f073ac8: 1040004a */ beqz $v0,.PB0f073bf4 /* f073acc: 00002025 */ move $a0,$zero -/* f073ad0: 0fc6513d */ jal 0xf1944f4 +/* f073ad0: 0fc6513d */ jal botIsTargetInvisible /* f073ad4: 02002825 */ move $a1,$s0 /* f073ad8: 14400046 */ bnez $v0,.PB0f073bf4 /* f073adc: 00000000 */ nop @@ -25507,12 +25507,12 @@ glabel var7f1aa3d0 /* f073b38: 10000034 */ b .PB0f073c0c /* f073b3c: a5000062 */ sh $zero,0x62($t0) .PB0f073b40: -/* f073b40: 0fc0a255 */ jal 0xf028954 +/* f073b40: 0fc0a255 */ jal chrGetTargetProp /* f073b44: 02802025 */ move $a0,$s4 /* f073b48: 8e09001c */ lw $t1,0x1c($s0) /* f073b4c: 14490029 */ bne $v0,$t1,.PB0f073bf4 /* f073b50: 00000000 */ nop -/* f073b54: 0fc63af1 */ jal 0xf18ebc4 +/* f073b54: 0fc63af1 */ jal mpPlayerGetIndex /* f073b58: 02802025 */ move $a0,$s4 /* f073b5c: 3c0b800b */ lui $t3,0x800b /* f073b60: 8d6b0b50 */ lw $t3,0xb50($t3) @@ -25540,7 +25540,7 @@ glabel var7f1aa3d0 /* f073bb0: afae0014 */ sw $t6,0x14($sp) /* f073bb4: afad0010 */ sw $t5,0x10($sp) /* f073bb8: 24460008 */ addiu $a2,$v0,0x8 -/* f073bbc: 0c00b87f */ jal 0x2e1fc +/* f073bbc: 0c00b87f */ jal cdHasLineOfSight /* f073bc0: 24470028 */ addiu $a3,$v0,0x28 /* f073bc4: 1040000b */ beqz $v0,.PB0f073bf4 /* f073bc8: 00000000 */ nop @@ -25589,7 +25589,7 @@ glabel var7f1aa3d0 /* f073c68: 51e00006 */ beqzl $t7,.PB0f073c84 /* f073c6c: ae400088 */ sw $zero,0x88($s2) .PB0f073c70: -/* f073c70: 0fc0e6e9 */ jal 0xf039ba4 +/* f073c70: 0fc0e6e9 */ jal chrIsDead /* f073c74: 02802025 */ move $a0,$s4 /* f073c78: 50400003 */ beqzl $v0,.PB0f073c88 /* f073c7c: 8fbf003c */ lw $ra,0x3c($sp) @@ -29910,7 +29910,7 @@ glabel var7f1ab6dcpf /* f073e84: 24010058 */ li $at,0x58 /* f073e88: 57010006 */ bnel $t8,$at,.PB0f073ea4 /* f073e8c: 8e020000 */ lw $v0,0x0($s0) -/* f073e90: 0fc1cd90 */ jal 0xf073640 +/* f073e90: 0fc1cd90 */ jal func0f073478 /* f073e94: 00000000 */ nop /* f073e98: 10000c98 */ b .PB0f0770fc /* f073e9c: afa205d8 */ sw $v0,0x5d8($sp) @@ -29937,7 +29937,7 @@ glabel var7f1ab6dcpf /* f073ee8: 31cf0080 */ andi $t7,$t6,0x80 /* f073eec: 11e00005 */ beqz $t7,.PB0f073f04 /* f073ef0: 27a605e8 */ addiu $a2,$sp,0x5e8 -/* f073ef4: 0fc1cf2c */ jal 0xf073cb0 +/* f073ef4: 0fc1cf2c */ jal func0f073ae8 /* f073ef8: 27a705f4 */ addiu $a3,$sp,0x5f4 /* f073efc: 3c03800a */ lui $v1,0x800a /* f073f00: 2463e4d0 */ addiu $v1,$v1,-6960 @@ -29961,11 +29961,11 @@ glabel var7f1ab6dcpf /* f073f40: 30490800 */ andi $t1,$v0,0x800 /* f073f44: 11200379 */ beqz $t1,.PB0f074d2c /* f073f48: 304e0001 */ andi $t6,$v0,0x1 -/* f073f4c: 0c0059e9 */ jal 0x167a4 +/* f073f4c: 0c0059e9 */ jal mtx3ToMtx4 /* f073f50: afa40074 */ sw $a0,0x74($sp) /* f073f54: 26440008 */ addiu $a0,$s2,0x8 /* f073f58: afa40070 */ sw $a0,0x70($sp) -/* f073f5c: 0c005a09 */ jal 0x16824 +/* f073f5c: 0c005a09 */ jal mtx4SetTranslation /* f073f60: 27a50504 */ addiu $a1,$sp,0x504 /* f073f64: 4480a000 */ mtc1 $zero,$f20 /* f073f68: c60000dc */ lwc1 $f0,0xdc($s0) @@ -30090,7 +30090,7 @@ glabel var7f1ab6dcpf /* f07411c: 46021282 */ mul.s $f10,$f2,$f2 /* f074120: 00000000 */ nop /* f074124: 460e7102 */ mul.s $f4,$f14,$f14 -/* f074128: 0c012ae4 */ jal 0x4ab90 +/* f074128: 0c012ae4 */ jal sqrtf /* f07412c: 46045300 */ add.s $f12,$f10,$f4 /* f074130: 4600a03c */ c.lt.s $f20,$f0 /* f074134: 3c03800a */ lui $v1,0x800a @@ -30190,7 +30190,7 @@ glabel var7f1ab6dcpf .PB0f074284: /* f074284: 50800004 */ beqzl $a0,.PB0f074298 /* f074288: 86240006 */ lh $a0,0x6($s1) -/* f07428c: 0fc190d6 */ jal 0xf064358 +/* f07428c: 0fc190d6 */ jal propSetPerimEnabled /* f074290: 00002825 */ move $a1,$zero /* f074294: 86240006 */ lh $a0,0x6($s1) .PB0f074298: @@ -30208,7 +30208,7 @@ glabel var7f1ab6dcpf /* f0742c0: 8fb90088 */ lw $t9,0x88($sp) /* f0742c4: 1320003b */ beqz $t9,.PB0f0743b4 /* f0742c8: 24050002 */ li $a1,0x2 -/* f0742cc: 0fc458d4 */ jal 0xf116350 +/* f0742cc: 0fc458d4 */ jal padUnpack /* f0742d0: 27a60430 */ addiu $a2,$sp,0x430 /* f0742d4: 3c014348 */ lui $at,0x4348 /* f0742d8: 44811000 */ mtc1 $at,$f2 @@ -30246,7 +30246,7 @@ glabel var7f1ab6dcpf /* f074350: 46000282 */ mul.s $f10,$f0,$f0 /* f074354: 00000000 */ nop /* f074358: 46021102 */ mul.s $f4,$f2,$f2 -/* f07435c: 0c012ae4 */ jal 0x4ab90 +/* f07435c: 0c012ae4 */ jal sqrtf /* f074360: 46045300 */ add.s $f12,$f10,$f4 /* f074364: c7a60418 */ lwc1 $f6,0x418($sp) /* f074368: c7a8041c */ lwc1 $f8,0x41c($sp) @@ -30289,7 +30289,7 @@ glabel var7f1ab6dcpf /* f0743f4: acae0004 */ sw $t6,0x4($a1) /* f0743f8: 8d810008 */ lw $at,0x8($t4) /* f0743fc: aca10008 */ sw $at,0x8($a1) -/* f074400: 0fc1c8c6 */ jal 0xf072318 +/* f074400: 0fc1c8c6 */ jal func0f072144 /* f074404: e7a005a8 */ swc1 $f0,0x5a8($sp) /* f074408: 2401ffff */ li $at,-1 /* f07440c: 1041000c */ beq $v0,$at,.PB0f074440 @@ -30303,7 +30303,7 @@ glabel var7f1ab6dcpf /* f07442c: 02202025 */ move $a0,$s1 /* f074430: 46062282 */ mul.s $f10,$f4,$f6 /* f074434: 27a50404 */ addiu $a1,$sp,0x404 -/* f074438: 0fc1ca6a */ jal 0xf0729a8 +/* f074438: 0fc1ca6a */ jal func0f0727d4 /* f07443c: e60a00dc */ swc1 $f10,0xdc($s0) .PB0f074440: /* f074440: 3c01800a */ lui $at,0x800a @@ -30329,7 +30329,7 @@ glabel var7f1ab6dcpf /* f074490: 46000202 */ mul.s $f8,$f0,$f0 /* f074494: 460a3081 */ sub.s $f2,$f6,$f10 /* f074498: 46021102 */ mul.s $f4,$f2,$f2 -/* f07449c: 0c012ae4 */ jal 0x4ab90 +/* f07449c: 0c012ae4 */ jal sqrtf /* f0744a0: 46044300 */ add.s $f12,$f8,$f4 /* f0744a4: c7ac0418 */ lwc1 $f12,0x418($sp) /* f0744a8: c7a6041c */ lwc1 $f6,0x41c($sp) @@ -30371,13 +30371,13 @@ glabel var7f1ab6dcpf .PB0f074530: /* f074530: 02202025 */ move $a0,$s1 /* f074534: 27a5059c */ addiu $a1,$sp,0x59c -/* f074538: 0fc1c8c6 */ jal 0xf072318 +/* f074538: 0fc1c8c6 */ jal func0f072144 /* f07453c: 24070001 */ li $a3,0x1 /* f074540: 144001ae */ bnez $v0,.PB0f074bfc /* f074544: afa20600 */ sw $v0,0x600($sp) /* f074548: 4406a000 */ mfc1 $a2,$f20 /* f07454c: 02202025 */ move $a0,$s1 -/* f074550: 0fc1ca6a */ jal 0xf0729a8 +/* f074550: 0fc1ca6a */ jal func0f0727d4 /* f074554: 27a5059c */ addiu $a1,$sp,0x59c /* f074558: c604008c */ lwc1 $f4,0x8c($s0) /* f07455c: 27a403d0 */ addiu $a0,$sp,0x3d0 @@ -30387,7 +30387,7 @@ glabel var7f1ab6dcpf /* f07456c: 00000000 */ nop /* f074570: 450201a3 */ bc1fl .PB0f074c00 /* f074574: 8fab0600 */ lw $t3,0x600($sp) -/* f074578: 0c009649 */ jal 0x25924 +/* f074578: 0c009649 */ jal cd00025364 /* f07457c: e7b0058c */ swc1 $f16,0x58c($sp) /* f074580: 1040000e */ beqz $v0,.PB0f0745bc /* f074584: c7b0058c */ lwc1 $f16,0x58c($sp) @@ -30410,7 +30410,7 @@ glabel var7f1ab6dcpf /* f0745c4: 27a403d0 */ addiu $a0,$sp,0x3d0 /* f0745c8: 27a503c4 */ addiu $a1,$sp,0x3c4 /* f0745cc: 240620a8 */ li $a2,0x20a8 -/* f0745d0: 0c009503 */ jal 0x2540c +/* f0745d0: 0c009503 */ jal cd00024e4c /* f0745d4: e7b0058c */ swc1 $f16,0x58c($sp) /* f0745d8: c7aa03d0 */ lwc1 $f10,0x3d0($sp) /* f0745dc: c7a803c4 */ lwc1 $f8,0x3c4($sp) @@ -30440,7 +30440,7 @@ glabel var7f1ab6dcpf /* f074638: 27a403d0 */ addiu $a0,$sp,0x3d0 /* f07463c: 27a503c4 */ addiu $a1,$sp,0x3c4 /* f074640: 27a603b8 */ addiu $a2,$sp,0x3b8 -/* f074644: 0fc0b972 */ jal 0xf02e5c8 +/* f074644: 0fc0b972 */ jal func0f02e4f8 /* f074648: e7b0058c */ swc1 $f16,0x58c($sp) /* f07464c: c6460008 */ lwc1 $f6,0x8($s2) /* f074650: c7aa05dc */ lwc1 $f10,0x5dc($sp) @@ -30493,7 +30493,7 @@ glabel var7f1ab6dcpf /* f074700: 27a503dc */ addiu $a1,$sp,0x3dc /* f074704: 240620ce */ li $a2,0x20ce /* f074708: e60600dc */ swc1 $f6,0xdc($s0) -/* f07470c: 0c009503 */ jal 0x2540c +/* f07470c: 0c009503 */ jal cd00024e4c /* f074710: e7b0058c */ swc1 $f16,0x58c($sp) /* f074714: c7aa03e4 */ lwc1 $f10,0x3e4($sp) /* f074718: c7a803f0 */ lwc1 $f8,0x3f0($sp) @@ -30516,7 +30516,7 @@ glabel var7f1ab6dcpf /* f07475c: 45030006 */ bc1tl .PB0f074778 /* f074760: 44815000 */ mtc1 $at,$f10 .PB0f074764: -/* f074764: 0c0011d8 */ jal 0x4760 +/* f074764: 0c0011d8 */ jal guNormalize /* f074768: e7b0058c */ swc1 $f16,0x58c($sp) /* f07476c: 10000004 */ b .PB0f074780 /* f074770: c7b0058c */ lwc1 $f16,0x58c($sp) @@ -30565,7 +30565,7 @@ glabel var7f1ab6dcpf /* f074814: 46000202 */ mul.s $f8,$f0,$f0 /* f074818: 46045081 */ sub.s $f2,$f10,$f4 /* f07481c: 46021182 */ mul.s $f6,$f2,$f2 -/* f074820: 0c012ae4 */ jal 0x4ab90 +/* f074820: 0c012ae4 */ jal sqrtf /* f074824: 46064300 */ add.s $f12,$f8,$f6 /* f074828: c7aa0418 */ lwc1 $f10,0x418($sp) /* f07482c: c7a4041c */ lwc1 $f4,0x41c($sp) @@ -30608,13 +30608,13 @@ glabel var7f1ab6dcpf .PB0f0748b8: /* f0748b8: 02202025 */ move $a0,$s1 /* f0748bc: 27a5059c */ addiu $a1,$sp,0x59c -/* f0748c0: 0fc1c8c6 */ jal 0xf072318 +/* f0748c0: 0fc1c8c6 */ jal func0f072144 /* f0748c4: 24070001 */ li $a3,0x1 /* f0748c8: 144000c2 */ bnez $v0,.PB0f074bd4 /* f0748cc: afa20600 */ sw $v0,0x600($sp) /* f0748d0: 4406a000 */ mfc1 $a2,$f20 /* f0748d4: 02202025 */ move $a0,$s1 -/* f0748d8: 0fc1ca6a */ jal 0xf0729a8 +/* f0748d8: 0fc1ca6a */ jal func0f0727d4 /* f0748dc: 27a5059c */ addiu $a1,$sp,0x59c /* f0748e0: c604008c */ lwc1 $f4,0x8c($s0) /* f0748e4: c6080004 */ lwc1 $f8,0x4($s0) @@ -30647,7 +30647,7 @@ glabel var7f1ab6dcpf /* f074950: 46000182 */ mul.s $f6,$f0,$f0 /* f074954: 46082081 */ sub.s $f2,$f4,$f8 /* f074958: 46021282 */ mul.s $f10,$f2,$f2 -/* f07495c: 0c012ae4 */ jal 0x4ab90 +/* f07495c: 0c012ae4 */ jal sqrtf /* f074960: 460a3300 */ add.s $f12,$f6,$f10 /* f074964: c7a40418 */ lwc1 $f4,0x418($sp) /* f074968: c7a8041c */ lwc1 $f8,0x41c($sp) @@ -30690,13 +30690,13 @@ glabel var7f1ab6dcpf .PB0f0749f4: /* f0749f4: 02202025 */ move $a0,$s1 /* f0749f8: 27a5059c */ addiu $a1,$sp,0x59c -/* f0749fc: 0fc1c8c6 */ jal 0xf072318 +/* f0749fc: 0fc1c8c6 */ jal func0f072144 /* f074a00: 24070001 */ li $a3,0x1 /* f074a04: 14400073 */ bnez $v0,.PB0f074bd4 /* f074a08: afa20600 */ sw $v0,0x600($sp) /* f074a0c: 4406a000 */ mfc1 $a2,$f20 /* f074a10: 02202025 */ move $a0,$s1 -/* f074a14: 0fc1ca6a */ jal 0xf0729a8 +/* f074a14: 0fc1ca6a */ jal func0f0727d4 /* f074a18: 27a5059c */ addiu $a1,$sp,0x59c /* f074a1c: c7ae03e8 */ lwc1 $f14,0x3e8($sp) /* f074a20: c7b203dc */ lwc1 $f18,0x3dc($sp) @@ -30718,7 +30718,7 @@ glabel var7f1ab6dcpf /* f074a5c: e7a203a0 */ swc1 $f2,0x3a0($sp) /* f074a60: 46000182 */ mul.s $f6,$f0,$f0 /* f074a64: e7a00398 */ swc1 $f0,0x398($sp) -/* f074a68: 0c012ae4 */ jal 0x4ab90 +/* f074a68: 0c012ae4 */ jal sqrtf /* f074a6c: 46064300 */ add.s $f12,$f8,$f6 /* f074a70: 3c013f80 */ lui $at,0x3f80 /* f074a74: 44815000 */ mtc1 $at,$f10 @@ -30761,7 +30761,7 @@ glabel var7f1ab6dcpf /* f074b08: 46000102 */ mul.s $f4,$f0,$f0 /* f074b0c: 460a4081 */ sub.s $f2,$f8,$f10 /* f074b10: 46021182 */ mul.s $f6,$f2,$f2 -/* f074b14: 0c012ae4 */ jal 0x4ab90 +/* f074b14: 0c012ae4 */ jal sqrtf /* f074b18: 46062300 */ add.s $f12,$f4,$f6 /* f074b1c: c7a80418 */ lwc1 $f8,0x418($sp) /* f074b20: c7aa041c */ lwc1 $f10,0x41c($sp) @@ -30804,13 +30804,13 @@ glabel var7f1ab6dcpf .PB0f074bac: /* f074bac: 02202025 */ move $a0,$s1 /* f074bb0: 27a5059c */ addiu $a1,$sp,0x59c -/* f074bb4: 0fc1c8c6 */ jal 0xf072318 +/* f074bb4: 0fc1c8c6 */ jal func0f072144 /* f074bb8: 24070001 */ li $a3,0x1 /* f074bbc: 14400005 */ bnez $v0,.PB0f074bd4 /* f074bc0: afa20600 */ sw $v0,0x600($sp) /* f074bc4: 4406a000 */ mfc1 $a2,$f20 /* f074bc8: 02202025 */ move $a0,$s1 -/* f074bcc: 0fc1ca6a */ jal 0xf0729a8 +/* f074bcc: 0fc1ca6a */ jal func0f0727d4 /* f074bd0: 27a5059c */ addiu $a1,$sp,0x59c .PB0f074bd4: /* f074bd4: 8faa0600 */ lw $t2,0x600($sp) @@ -30837,7 +30837,7 @@ glabel var7f1ab6dcpf .PB0f074c1c: /* f074c1c: 50800004 */ beqzl $a0,.PB0f074c30 /* f074c20: c6080004 */ lwc1 $f8,0x4($s0) -/* f074c24: 0fc190d6 */ jal 0xf064358 +/* f074c24: 0fc190d6 */ jal propSetPerimEnabled /* f074c28: 24050001 */ li $a1,0x1 /* f074c2c: c6080004 */ lwc1 $f8,0x4($s0) .PB0f074c30: @@ -30855,7 +30855,7 @@ glabel var7f1ab6dcpf /* f074c5c: 00000000 */ nop /* f074c60: 45020004 */ bc1fl .PB0f074c74 /* f074c64: 8fad0600 */ lw $t5,0x600($sp) -/* f074c68: 0fc1ab86 */ jal 0xf06ae18 +/* f074c68: 0fc1ab86 */ jal objEndFlight /* f074c6c: 02202025 */ move $a0,$s1 /* f074c70: 8fad0600 */ lw $t5,0x600($sp) .PB0f074c74: @@ -30865,7 +30865,7 @@ glabel var7f1ab6dcpf /* f074c80: 3c054000 */ lui $a1,0x4000 /* f074c84: 26460028 */ addiu $a2,$s2,0x28 /* f074c88: 26270058 */ addiu $a3,$s1,0x58 -/* f074c8c: 0c00aa3c */ jal 0x2a8f0 +/* f074c8c: 0c00aa3c */ jal cdFindGroundYSimple /* f074c90: afa00010 */ sw $zero,0x10($sp) /* f074c94: 3c017f1b */ lui $at,0x7f1b /* f074c98: c426c0d8 */ lwc1 $f6,-0x3f28($at) @@ -30875,7 +30875,7 @@ glabel var7f1ab6dcpf /* f074ca8: 00000000 */ nop /* f074cac: 45020007 */ bc1fl .PB0f074ccc /* f074cb0: 02202025 */ move $a0,$s1 -/* f074cb4: 0fc1c54e */ jal 0xf071538 +/* f074cb4: 0fc1c54e */ jal objGetHov04 /* f074cb8: e7a20584 */ swc1 $f2,0x584($sp) /* f074cbc: c7a20584 */ lwc1 $f2,0x584($sp) /* f074cc0: 46020200 */ add.s $f8,$f0,$f2 @@ -30884,25 +30884,25 @@ glabel var7f1ab6dcpf /* f074cc8: 02202025 */ move $a0,$s1 .PB0f074ccc: /* f074ccc: 00002825 */ move $a1,$zero -/* f074cd0: 0fc1a792 */ jal 0xf069e48 +/* f074cd0: 0fc1a792 */ jal func0f069c70 /* f074cd4: 24060001 */ li $a2,0x1 /* f074cd8: 27b00484 */ addiu $s0,$sp,0x484 /* f074cdc: 02002825 */ move $a1,$s0 -/* f074ce0: 0c0059e9 */ jal 0x167a4 +/* f074ce0: 0c0059e9 */ jal mtx3ToMtx4 /* f074ce4: 8fa40074 */ lw $a0,0x74($sp) /* f074ce8: 8fa40070 */ lw $a0,0x70($sp) -/* f074cec: 0c005a09 */ jal 0x16824 +/* f074cec: 0c005a09 */ jal mtx4SetTranslation /* f074cf0: 02002825 */ move $a1,$s0 /* f074cf4: 27b104c4 */ addiu $s1,$sp,0x4c4 /* f074cf8: 02202825 */ move $a1,$s1 -/* f074cfc: 0c005f50 */ jal 0x17d40 +/* f074cfc: 0c005f50 */ jal mtx000172f0 /* f074d00: 27a40504 */ addiu $a0,$sp,0x504 /* f074d04: 02002025 */ move $a0,$s0 /* f074d08: 02202825 */ move $a1,$s1 -/* f074d0c: 0c005914 */ jal 0x16450 +/* f074d0c: 0c005914 */ jal mtx4MultMtx4 /* f074d10: 27a60544 */ addiu $a2,$sp,0x544 /* f074d14: 02402025 */ move $a0,$s2 -/* f074d18: 0fc1cd27 */ jal 0xf07349c +/* f074d18: 0fc1cd27 */ jal func0f0732d4 /* f074d1c: 27a50544 */ addiu $a1,$sp,0x544 /* f074d20: 240c0001 */ li $t4,0x1 /* f074d24: 100008f5 */ b .PB0f0770fc @@ -30967,7 +30967,7 @@ glabel var7f1ab6dcpf /* f074dfc: 27a50358 */ addiu $a1,$sp,0x358 /* f074e00: 018e7821 */ addu $t7,$t4,$t6 /* f074e04: ae0f00a0 */ sw $t7,0xa0($s0) -/* f074e08: 0c0059ca */ jal 0x16728 +/* f074e08: 0c0059ca */ jal mtx3Copy /* f074e0c: afa40074 */ sw $a0,0x74($sp) /* f074e10: 8e180000 */ lw $t8,0x0($s0) /* f074e14: 3c017f1b */ lui $at,0x7f1b @@ -31105,10 +31105,10 @@ glabel var7f1ab6dcpf /* f075010: 460e7282 */ mul.s $f10,$f14,$f14 /* f075014: 460a2180 */ add.s $f6,$f4,$f10 /* f075018: 46000202 */ mul.s $f8,$f0,$f0 -/* f07501c: 0c012ae4 */ jal 0x4ab90 +/* f07501c: 0c012ae4 */ jal sqrtf /* f075020: 46064300 */ add.s $f12,$f8,$f6 /* f075024: 27a402a0 */ addiu $a0,$sp,0x2a0 -/* f075028: 0c005900 */ jal 0x16400 +/* f075028: 0c005900 */ jal mtx4LoadIdentity /* f07502c: e7a0029c */ swc1 $f0,0x29c($sp) /* f075030: c7ae029c */ lwc1 $f14,0x29c($sp) /* f075034: c624001c */ lwc1 $f4,0x1c($s1) @@ -31165,7 +31165,7 @@ glabel var7f1ab6dcpf /* f075100: c7260010 */ lwc1 $f6,0x10($t9) /* f075104: e7ae029c */ swc1 $f14,0x29c($sp) /* f075108: 46043281 */ sub.s $f10,$f6,$f4 -/* f07510c: 0c0011d8 */ jal 0x4760 +/* f07510c: 0c0011d8 */ jal guNormalize /* f075110: e7aa0298 */ swc1 $f10,0x298($sp) /* f075114: c6080004 */ lwc1 $f8,0x4($s0) /* f075118: 27a402ec */ addiu $a0,$sp,0x2ec @@ -31175,7 +31175,7 @@ glabel var7f1ab6dcpf /* f075128: 27a602f4 */ addiu $a2,$sp,0x2f4 /* f07512c: e7a602f0 */ swc1 $f6,0x2f0($sp) /* f075130: c604000c */ lwc1 $f4,0xc($s0) -/* f075134: 0c0011d8 */ jal 0x4760 +/* f075134: 0c0011d8 */ jal guNormalize /* f075138: e7a402f4 */ swc1 $f4,0x2f4($sp) /* f07513c: c7aa0298 */ lwc1 $f10,0x298($sp) /* f075140: c7a802f4 */ lwc1 $f8,0x2f4($sp) @@ -31188,7 +31188,7 @@ glabel var7f1ab6dcpf /* f07515c: 00000000 */ nop /* f075160: 46124102 */ mul.s $f4,$f8,$f18 /* f075164: 46045200 */ add.s $f8,$f10,$f4 -/* f075168: 0fc25a10 */ jal 0xf096840 +/* f075168: 0fc25a10 */ jal acosf /* f07516c: 46083300 */ add.s $f12,$f6,$f8 /* f075170: 3c017f1b */ lui $at,0x7f1b /* f075174: c42ac0f0 */ lwc1 $f10,-0x3f10($at) @@ -31206,17 +31206,17 @@ glabel var7f1ab6dcpf /* f0751a4: 4500009c */ bc1f .PB0f075418 .PB0f0751a8: /* f0751a8: 24a5b294 */ addiu $a1,$a1,-19820 -/* f0751ac: 0c003648 */ jal 0xd920 +/* f0751ac: 0c003648 */ jal mainOverrideVariable /* f0751b0: e7ae029c */ swc1 $f14,0x29c($sp) /* f0751b4: 3c047f1b */ lui $a0,0x7f1b /* f0751b8: 3c058007 */ lui $a1,0x8007 /* f0751bc: 24a5b298 */ addiu $a1,$a1,-19816 -/* f0751c0: 0c003648 */ jal 0xd920 +/* f0751c0: 0c003648 */ jal mainOverrideVariable /* f0751c4: 2484bcc8 */ addiu $a0,$a0,-17208 /* f0751c8: 3c047f1b */ lui $a0,0x7f1b /* f0751cc: 3c058007 */ lui $a1,0x8007 /* f0751d0: 24a5b29c */ addiu $a1,$a1,-19812 -/* f0751d4: 0c003648 */ jal 0xd920 +/* f0751d4: 0c003648 */ jal mainOverrideVariable /* f0751d8: 2484bccc */ addiu $a0,$a0,-17204 /* f0751dc: 3c188007 */ lui $t8,0x8007 /* f0751e0: 8f18b298 */ lw $t8,-0x4d68($t8) @@ -31299,42 +31299,42 @@ glabel var7f1ab6dcpf /* f075308: 46040302 */ mul.s $f12,$f0,$f4 /* f07530c: 460a4181 */ sub.s $f6,$f8,$f10 /* f075310: e7ac0078 */ swc1 $f12,0x78($sp) -/* f075314: 0c006b88 */ jal 0x1ae20 +/* f075314: 0c006b88 */ jal cosf /* f075318: e7a60288 */ swc1 $f6,0x288($sp) /* f07531c: e7a00260 */ swc1 $f0,0x260($sp) -/* f075320: 0c006b8b */ jal 0x1ae2c +/* f075320: 0c006b8b */ jal sinf /* f075324: c7ac0078 */ lwc1 $f12,0x78($sp) /* f075328: c7a80280 */ lwc1 $f8,0x280($sp) /* f07532c: c7ac0078 */ lwc1 $f12,0x78($sp) /* f075330: 46080282 */ mul.s $f10,$f0,$f8 -/* f075334: 0c006b8b */ jal 0x1ae2c +/* f075334: 0c006b8b */ jal sinf /* f075338: e7aa0264 */ swc1 $f10,0x264($sp) /* f07533c: c7a60284 */ lwc1 $f6,0x284($sp) /* f075340: c7ac0078 */ lwc1 $f12,0x78($sp) /* f075344: 46060102 */ mul.s $f4,$f0,$f6 -/* f075348: 0c006b8b */ jal 0x1ae2c +/* f075348: 0c006b8b */ jal sinf /* f07534c: e7a40268 */ swc1 $f4,0x268($sp) /* f075350: c7a80288 */ lwc1 $f8,0x288($sp) /* f075354: 27a40260 */ addiu $a0,$sp,0x260 /* f075358: 27a5020c */ addiu $a1,$sp,0x20c /* f07535c: 46080282 */ mul.s $f10,$f0,$f8 -/* f075360: 0fc25b51 */ jal 0xf096d44 +/* f075360: 0fc25b51 */ jal quaternionToMtx /* f075364: e7aa026c */ swc1 $f10,0x26c($sp) /* f075368: e6140018 */ swc1 $f20,0x18($s0) /* f07536c: e6140014 */ swc1 $f20,0x14($s0) /* f075370: e6140010 */ swc1 $f20,0x10($s0) /* f075374: 27a4020c */ addiu $a0,$sp,0x20c -/* f075378: 0c005958 */ jal 0x16560 +/* f075378: 0c005958 */ jal mtx4RotateVecInPlace /* f07537c: 26050004 */ addiu $a1,$s0,0x4 /* f075380: 27a402a0 */ addiu $a0,$sp,0x2a0 -/* f075384: 0fc25bad */ jal 0xf096eb4 +/* f075384: 0fc25bad */ jal quaternion0f097044 /* f075388: 27a50270 */ addiu $a1,$sp,0x270 /* f07538c: 27a40270 */ addiu $a0,$sp,0x270 /* f075390: 27a50260 */ addiu $a1,$sp,0x260 -/* f075394: 0fc25d6a */ jal 0xf0975a8 +/* f075394: 0fc25d6a */ jal quaternionMultQuaternion /* f075398: 27a60250 */ addiu $a2,$sp,0x250 /* f07539c: 27a40250 */ addiu $a0,$sp,0x250 -/* f0753a0: 0fc25b51 */ jal 0xf096d44 +/* f0753a0: 0fc25b51 */ jal quaternionToMtx /* f0753a4: 27a5020c */ addiu $a1,$sp,0x20c /* f0753a8: c7ae029c */ lwc1 $f14,0x29c($sp) /* f0753ac: c7a6020c */ lwc1 $f6,0x20c($sp) @@ -31443,16 +31443,16 @@ glabel var7f1ab6dcpf /* f075530: c608000c */ lwc1 $f8,0xc($s0) /* f075534: 46024182 */ mul.s $f6,$f8,$f2 /* f075538: 46065100 */ add.s $f4,$f10,$f6 -/* f07553c: 0c0059e9 */ jal 0x167a4 +/* f07553c: 0c0059e9 */ jal mtx3ToMtx4 /* f075540: e7a405e4 */ swc1 $f4,0x5e4($sp) /* f075544: 26050020 */ addiu $a1,$s0,0x20 /* f075548: 3c06800a */ lui $a2,0x800a /* f07554c: 8cc6e504 */ lw $a2,-0x1afc($a2) /* f075550: afa50064 */ sw $a1,0x64($sp) -/* f075554: 0fc25942 */ jal 0xf096508 +/* f075554: 0fc25942 */ jal func0f096698 /* f075558: 27a4030c */ addiu $a0,$sp,0x30c /* f07555c: 27a4030c */ addiu $a0,$sp,0x30c -/* f075560: 0c0059fc */ jal 0x167f0 +/* f075560: 0c0059fc */ jal mtx4ToMtx3 /* f075564: 8fa50074 */ lw $a1,0x74($sp) /* f075568: c6480008 */ lwc1 $f8,0x8($s2) /* f07556c: 26440028 */ addiu $a0,$s2,0x28 @@ -31462,12 +31462,12 @@ glabel var7f1ab6dcpf /* f07557c: e7aa05cc */ swc1 $f10,0x5cc($sp) /* f075580: c6460010 */ lwc1 $f6,0x10($s2) /* f075584: afa4006c */ sw $a0,0x6c($sp) -/* f075588: 0fc19661 */ jal 0xf065984 +/* f075588: 0fc19661 */ jal roomsCopy /* f07558c: e7a605d0 */ swc1 $f6,0x5d0($sp) /* f075590: 8e040088 */ lw $a0,0x88($s0) /* f075594: 50800004 */ beqzl $a0,.PB0f0755a8 /* f075598: 8e0c0000 */ lw $t4,0x0($s0) -/* f07559c: 0fc190d6 */ jal 0xf064358 +/* f07559c: 0fc190d6 */ jal propSetPerimEnabled /* f0755a0: 00002825 */ move $a1,$zero /* f0755a4: 8e0c0000 */ lw $t4,0x0($s0) .PB0f0755a8: @@ -31476,7 +31476,7 @@ glabel var7f1ab6dcpf /* f0755b0: 02202025 */ move $a0,$s1 /* f0755b4: 27a505dc */ addiu $a1,$sp,0x5dc /* f0755b8: 27a605e8 */ addiu $a2,$sp,0x5e8 -/* f0755bc: 0fc1b3b6 */ jal 0xf06ced8 +/* f0755bc: 0fc1b3b6 */ jal func0f06cd00 /* f0755c0: 27a705f4 */ addiu $a3,$sp,0x5f4 /* f0755c4: 10000007 */ b .PB0f0755e4 /* f0755c8: afa20600 */ sw $v0,0x600($sp) @@ -31484,14 +31484,14 @@ glabel var7f1ab6dcpf /* f0755cc: 02202025 */ move $a0,$s1 /* f0755d0: 27a505dc */ addiu $a1,$sp,0x5dc /* f0755d4: 27a605e8 */ addiu $a2,$sp,0x5e8 -/* f0755d8: 0fc1b555 */ jal 0xf06d554 +/* f0755d8: 0fc1b555 */ jal func0f06d37c /* f0755dc: 27a705f4 */ addiu $a3,$sp,0x5f4 /* f0755e0: afa20600 */ sw $v0,0x600($sp) .PB0f0755e4: /* f0755e4: 8e040088 */ lw $a0,0x88($s0) /* f0755e8: 50800004 */ beqzl $a0,.PB0f0755fc /* f0755ec: 240e0001 */ li $t6,0x1 -/* f0755f0: 0fc190d6 */ jal 0xf064358 +/* f0755f0: 0fc190d6 */ jal propSetPerimEnabled /* f0755f4: 24050001 */ li $a1,0x1 /* f0755f8: 240e0001 */ li $t6,0x1 .PB0f0755fc: @@ -31553,7 +31553,7 @@ glabel var7f1ab6dcpf /* f0756c8: 24010035 */ li $at,0x35 /* f0756cc: 10e10006 */ beq $a3,$at,.PB0f0756e8 /* f0756d0: 2624005c */ addiu $a0,$s1,0x5c -/* f0756d4: 0fc2c8ae */ jal 0xf0b22b8 +/* f0756d4: 0fc2c8ae */ jal gsetHasFunctionFlags /* f0756d8: 24050100 */ li $a1,0x100 /* f0756dc: 50400014 */ beqzl $v0,.PB0f075730 /* f0756e0: 8fb801f8 */ lw $t8,0x1f8($sp) @@ -31668,7 +31668,7 @@ glabel var7f1ab6dcpf /* f075860: 2406ffff */ li $a2,-1 /* f075864: afa301e4 */ sw $v1,0x1e4($sp) /* f075868: afa40070 */ sw $a0,0x70($sp) -/* f07586c: 0fc2a1e8 */ jal 0xf0a87a0 +/* f07586c: 0fc2a1e8 */ jal bgun0f0a8404 /* f075870: afa801ec */ sw $t0,0x1ec($sp) /* f075874: 8fa401e4 */ lw $a0,0x1e4($sp) /* f075878: 8fa801ec */ lw $t0,0x1ec($sp) @@ -31682,10 +31682,10 @@ glabel var7f1ab6dcpf /* f075898: 8d6be75c */ lw $t3,-0x18a4($t3) /* f07589c: 9107005c */ lbu $a3,0x5c($t0) /* f0758a0: afa001f8 */ sw $zero,0x1f8($sp) -/* f0758a4: 0fc21504 */ jal 0xf085410 +/* f0758a4: 0fc21504 */ jal objTakeGunfire /* f0758a8: afab0010 */ sw $t3,0x10($sp) /* f0758ac: 8fa401f4 */ lw $a0,0x1f4($sp) -/* f0758b0: 0fc1c21c */ jal 0xf070870 +/* f0758b0: 0fc1c21c */ jal objDropRecursively /* f0758b4: 00002825 */ move $a1,$zero /* f0758b8: 240c0001 */ li $t4,0x1 /* f0758bc: 1000000e */ b .PB0f0758f8 @@ -31698,7 +31698,7 @@ glabel var7f1ab6dcpf /* f0758d4: 54410009 */ bnel $v0,$at,.PB0f0758fc /* f0758d8: 8fae034c */ lw $t6,0x34c($sp) .PB0f0758dc: -/* f0758dc: 0fc0d025 */ jal 0xf034094 +/* f0758dc: 0fc0d025 */ jal chrGetShield /* f0758e0: 8de40004 */ lw $a0,0x4($t7) /* f0758e4: 4600a03c */ c.lt.s $f20,$f0 /* f0758e8: 00000000 */ nop @@ -31750,10 +31750,10 @@ glabel var7f1ab6dcpf /* f075990: 8c4e0088 */ lw $t6,0x88($v0) /* f075994: afa70070 */ sw $a3,0x70($sp) /* f075998: afa401dc */ sw $a0,0x1dc($sp) -/* f07599c: 0fc0d025 */ jal 0xf034094 +/* f07599c: 0fc0d025 */ jal chrGetShield /* f0759a0: afae01d4 */ sw $t6,0x1d4($sp) /* f0759a4: 8fa40070 */ lw $a0,0x70($sp) -/* f0759a8: 0fc2c84e */ jal 0xf0b2138 +/* f0759a8: 0fc2c84e */ jal gsetGetDamage /* f0759ac: e7a001d8 */ swc1 $f0,0x1d8($sp) /* f0759b0: 3c188007 */ lui $t8,0x8007 /* f0759b4: 3c098007 */ lui $t1,0x8007 @@ -31779,7 +31779,7 @@ glabel var7f1ab6dcpf /* f075a04: afad001c */ sw $t5,0x1c($sp) /* f075a08: afa90018 */ sw $t1,0x18($sp) /* f075a0c: afb80014 */ sw $t8,0x14($sp) -/* f075a10: 0fc0d0b4 */ jal 0xf0342d0 +/* f075a10: 0fc0d0b4 */ jal func0f0341dc /* f075a14: afb90010 */ sw $t9,0x10($sp) /* f075a18: c7a401d8 */ lwc1 $f4,0x1d8($sp) /* f075a1c: 8faf01d4 */ lw $t7,0x1d4($sp) @@ -31802,7 +31802,7 @@ glabel var7f1ab6dcpf /* f075a5c: 8ca5b000 */ lw $a1,-0x5000($a1) /* f075a60: 8cc6b004 */ lw $a2,-0x4ffc($a2) /* f075a64: afb90010 */ sw $t9,0x10($sp) -/* f075a68: 0fc097dd */ jal 0xf025f74 +/* f075a68: 0fc097dd */ jal chrEmitSparks /* f075a6c: afb80014 */ sw $t8,0x14($sp) /* f075a70: 3c098007 */ lui $t1,0x8007 /* f075a74: 8d29b000 */ lw $t1,-0x5000($t1) @@ -31822,19 +31822,19 @@ glabel var7f1ab6dcpf /* f075aac: 104100f7 */ beq $v0,$at,.PB0f075e8c /* f075ab0: 3c05800a */ lui $a1,0x800a /* f075ab4: 8ca51394 */ lw $a1,0x1394($a1) -/* f075ab8: 0c006c07 */ jal 0x1b01c +/* f075ab8: 0c006c07 */ jal model0001a5cc /* f075abc: 00003025 */ move $a2,$zero -/* f075ac0: 0fc2d6c2 */ jal 0xf0b5b08 +/* f075ac0: 0fc2d6c2 */ jal currentPlayerGetMatrix1740 /* f075ac4: afa20184 */ sw $v0,0x184($sp) /* f075ac8: 00402025 */ move $a0,$v0 /* f075acc: 27a505e8 */ addiu $a1,$sp,0x5e8 -/* f075ad0: 0c00596e */ jal 0x165b8 +/* f075ad0: 0c00596e */ jal mtx4TransformVec /* f075ad4: 27a601c8 */ addiu $a2,$sp,0x1c8 /* f075ad8: 8fa40184 */ lw $a0,0x184($sp) -/* f075adc: 0c005efb */ jal 0x17bec +/* f075adc: 0c005efb */ jal mtx0001719c /* f075ae0: 27a50188 */ addiu $a1,$sp,0x188 /* f075ae4: 27a40188 */ addiu $a0,$sp,0x188 -/* f075ae8: 0c00596d */ jal 0x165b4 +/* f075ae8: 0c00596d */ jal mtx4TransformVecInPlace /* f075aec: 27a501c8 */ addiu $a1,$sp,0x1c8 /* f075af0: 3c04800a */ lui $a0,0x800a /* f075af4: 3c058007 */ lui $a1,0x8007 @@ -31842,7 +31842,7 @@ glabel var7f1ab6dcpf /* f075afc: 8cc61394 */ lw $a2,0x1394($a2) /* f075b00: 8ca5b004 */ lw $a1,-0x4ffc($a1) /* f075b04: 8c841390 */ lw $a0,0x1390($a0) -/* f075b08: 0fc09865 */ jal 0xf026194 +/* f075b08: 0fc09865 */ jal chr0f0260c4 /* f075b0c: 27a701c8 */ addiu $a3,$sp,0x1c8 /* f075b10: 100000df */ b .PB0f075e90 /* f075b14: 8faf034c */ lw $t7,0x34c($sp) @@ -31881,7 +31881,7 @@ glabel var7f1ab6dcpf /* f075b8c: afad0018 */ sw $t5,0x18($sp) /* f075b90: 8ce71394 */ lw $a3,0x1394($a3) /* f075b94: afa90014 */ sw $t1,0x14($sp) -/* f075b98: 0fc0a413 */ jal 0xf02904c +/* f075b98: 0fc0a413 */ jal shieldhitCreate /* f075b9c: afb80010 */ sw $t8,0x10($sp) .PB0f075ba0: /* f075ba0: 8faa0180 */ lw $t2,0x180($sp) @@ -31896,7 +31896,7 @@ glabel var7f1ab6dcpf /* f075bc4: 55e100b2 */ bnel $t7,$at,.PB0f075e90 /* f075bc8: 8faf034c */ lw $t7,0x34c($sp) /* f075bcc: 4406a000 */ mfc1 $a2,$f20 -/* f075bd0: 0fc68a52 */ jal 0xf1a2948 +/* f075bd0: 0fc68a52 */ jal frCalculateHit /* f075bd4: 27a505e8 */ addiu $a1,$sp,0x5e8 /* f075bd8: 100000ad */ b .PB0f075e90 /* f075bdc: 8faf034c */ lw $t7,0x34c($sp) @@ -31931,7 +31931,7 @@ glabel var7f1ab6dcpf /* f075c44: 11600008 */ beqz $t3,.PB0f075c68 /* f075c48: 8fa4017c */ lw $a0,0x17c($sp) /* f075c4c: afa00178 */ sw $zero,0x178($sp) -/* f075c50: 0fc63b03 */ jal 0xf18ec0c +/* f075c50: 0fc63b03 */ jal mpGetChrFromPlayerIndex /* f075c54: afa70070 */ sw $a3,0x70($sp) /* f075c58: 8fa30178 */ lw $v1,0x178($sp) /* f075c5c: 10400002 */ beqz $v0,.PB0f075c68 @@ -31960,7 +31960,7 @@ glabel var7f1ab6dcpf /* f075cb4: afae0024 */ sw $t6,0x24($sp) /* f075cb8: afac0020 */ sw $t4,0x20($sp) /* f075cbc: afaa001c */ sw $t2,0x1c($sp) -/* f075cc0: 0fc0d0b4 */ jal 0xf0342d0 +/* f075cc0: 0fc0d0b4 */ jal func0f0341dc /* f075cc4: afaf0014 */ sw $t7,0x14($sp) /* f075cc8: 1000002f */ b .PB0f075d88 /* f075ccc: 02202025 */ move $a0,$s1 @@ -32003,7 +32003,7 @@ glabel var7f1ab6dcpf /* f075d4c: afac0018 */ sw $t4,0x18($sp) /* f075d50: 8ce71394 */ lw $a3,0x1394($a3) /* f075d54: afaa0014 */ sw $t2,0x14($sp) -/* f075d58: 0fc0a413 */ jal 0xf02904c +/* f075d58: 0fc0a413 */ jal shieldhitCreate /* f075d5c: afaf0010 */ sw $t7,0x10($sp) /* f075d60: 3c0e8007 */ lui $t6,0x8007 /* f075d64: 8dceb000 */ lw $t6,-0x5000($t6) @@ -32013,13 +32013,13 @@ glabel var7f1ab6dcpf /* f075d70: 8fb9017c */ lw $t9,0x17c($sp) /* f075d74: 3c0542c8 */ lui $a1,0x42c8 /* f075d78: 8fa60070 */ lw $a2,0x70($sp) -/* f075d7c: 0fc21513 */ jal 0xf08544c +/* f075d7c: 0fc21513 */ jal objDamage /* f075d80: afb90010 */ sw $t9,0x10($sp) .PB0f075d84: /* f075d84: 02202025 */ move $a0,$s1 .PB0f075d88: /* f075d88: 24050001 */ li $a1,0x1 -/* f075d8c: 0fc1a792 */ jal 0xf069e48 +/* f075d8c: 0fc1a792 */ jal func0f069c70 /* f075d90: 24060001 */ li $a2,0x1 /* f075d94: 1000003d */ b .PB0f075e8c /* f075d98: a6200062 */ sh $zero,0x62($s1) @@ -32045,7 +32045,7 @@ glabel var7f1ab6dcpf /* f075de0: 8ce71390 */ lw $a3,0x1390($a3) /* f075de4: 8ca51394 */ lw $a1,0x1394($a1) /* f075de8: afaf0014 */ sw $t7,0x14($sp) -/* f075dec: 0fc0d05d */ jal 0xf034174 +/* f075dec: 0fc0d05d */ jal func0f034080 /* f075df0: afab0010 */ sw $t3,0x10($sp) /* f075df4: 10000026 */ b .PB0f075e90 /* f075df8: 8faf034c */ lw $t7,0x34c($sp) @@ -32088,7 +32088,7 @@ glabel var7f1ab6dcpf /* f075e78: afab0018 */ sw $t3,0x18($sp) /* f075e7c: 8ce71394 */ lw $a3,0x1394($a3) /* f075e80: afb80010 */ sw $t8,0x10($sp) -/* f075e84: 0fc0a413 */ jal 0xf02904c +/* f075e84: 0fc0a413 */ jal shieldhitCreate /* f075e88: afad0014 */ sw $t5,0x14($sp) .PB0f075e8c: /* f075e8c: 8faf034c */ lw $t7,0x34c($sp) @@ -32101,7 +32101,7 @@ glabel var7f1ab6dcpf /* f075ea4: afac034c */ sw $t4,0x34c($sp) /* f075ea8: 02202025 */ move $a0,$s1 /* f075eac: 24050001 */ li $a1,0x1 -/* f075eb0: 0fc1a792 */ jal 0xf069e48 +/* f075eb0: 0fc1a792 */ jal func0f069c70 /* f075eb4: 24060001 */ li $a2,0x1 /* f075eb8: 922e0003 */ lbu $t6,0x3($s1) /* f075ebc: 24010008 */ li $at,0x8 @@ -32125,12 +32125,12 @@ glabel var7f1ab6dcpf /* f075f00: 2627005c */ addiu $a3,$s1,0x5c /* f075f04: 8f18e75c */ lw $t8,-0x18a4($t8) /* f075f08: afa70070 */ sw $a3,0x70($sp) -/* f075f0c: 0fc4a797 */ jal 0xf129e5c +/* f075f0c: 0fc4a797 */ jal playermgrGetPlayerNumByProp /* f075f10: afb80164 */ sw $t8,0x164($sp) -/* f075f14: 0fc4a783 */ jal 0xf129e0c +/* f075f14: 0fc4a783 */ jal setCurrentPlayerNum /* f075f18: 00402025 */ move $a0,$v0 /* f075f1c: 8fa40070 */ lw $a0,0x70($sp) -/* f075f20: 0fc2c20c */ jal 0xf0b0830 +/* f075f20: 0fc2c20c */ jal mpstatsIncrementPlayerShotCount /* f075f24: 00002825 */ move $a1,$zero /* f075f28: 3c058007 */ lui $a1,0x8007 /* f075f2c: 8ca5b000 */ lw $a1,-0x5000($a1) @@ -32142,12 +32142,12 @@ glabel var7f1ab6dcpf /* f075f44: 5441000c */ bnel $v0,$at,.PB0f075f78 /* f075f48: 24010003 */ li $at,0x3 /* f075f4c: 8ca40004 */ lw $a0,0x4($a1) -/* f075f50: 0fc21ad2 */ jal 0xf086b48 +/* f075f50: 0fc21ad2 */ jal objIsHealthy /* f075f54: afa70070 */ sw $a3,0x70($sp) /* f075f58: 1040004c */ beqz $v0,.PB0f07608c /* f075f5c: 8fa70070 */ lw $a3,0x70($sp) /* f075f60: 00e02025 */ move $a0,$a3 -/* f075f64: 0fc2c20c */ jal 0xf0b0830 +/* f075f64: 0fc2c20c */ jal mpstatsIncrementPlayerShotCount /* f075f68: 24050006 */ li $a1,0x6 /* f075f6c: 10000047 */ b .PB0f07608c /* f075f70: 00000000 */ nop @@ -32173,7 +32173,7 @@ glabel var7f1ab6dcpf /* f075fb4: 1441000e */ bne $v0,$at,.PB0f075ff0 /* f075fb8: 00000000 */ nop /* f075fbc: afa6015c */ sw $a2,0x15c($sp) -/* f075fc0: 0fc4a797 */ jal 0xf129e5c +/* f075fc0: 0fc4a797 */ jal playermgrGetPlayerNumByProp /* f075fc4: afa70070 */ sw $a3,0x70($sp) /* f075fc8: 00025880 */ sll $t3,$v0,0x2 /* f075fcc: 3c0f800a */ lui $t7,0x800a @@ -32208,30 +32208,30 @@ glabel var7f1ab6dcpf /* f07603c: 10000011 */ b .PB0f076084 /* f076040: 00e02025 */ move $a0,$a3 .PB0f076044: -/* f076044: 0fc2c20c */ jal 0xf0b0830 +/* f076044: 0fc2c20c */ jal mpstatsIncrementPlayerShotCount /* f076048: 00e02025 */ move $a0,$a3 /* f07604c: 1000000f */ b .PB0f07608c /* f076050: 00000000 */ nop .PB0f076054: -/* f076054: 0fc2c20c */ jal 0xf0b0830 +/* f076054: 0fc2c20c */ jal mpstatsIncrementPlayerShotCount /* f076058: 24050004 */ li $a1,0x4 /* f07605c: 1000000b */ b .PB0f07608c /* f076060: 00000000 */ nop .PB0f076064: -/* f076064: 0fc2c20c */ jal 0xf0b0830 +/* f076064: 0fc2c20c */ jal mpstatsIncrementPlayerShotCount /* f076068: 24050005 */ li $a1,0x5 /* f07606c: 10000007 */ b .PB0f07608c /* f076070: 00000000 */ nop .PB0f076074: -/* f076074: 0fc2c20c */ jal 0xf0b0830 +/* f076074: 0fc2c20c */ jal mpstatsIncrementPlayerShotCount /* f076078: 24050002 */ li $a1,0x2 /* f07607c: 10000003 */ b .PB0f07608c /* f076080: 00000000 */ nop .PB0f076084: -/* f076084: 0fc2c20c */ jal 0xf0b0830 +/* f076084: 0fc2c20c */ jal mpstatsIncrementPlayerShotCount /* f076088: 24050003 */ li $a1,0x3 .PB0f07608c: -/* f07608c: 0fc4a783 */ jal 0xf129e0c +/* f07608c: 0fc4a783 */ jal setCurrentPlayerNum /* f076090: 8fa40164 */ lw $a0,0x164($sp) .PB0f076094: /* f076094: 8fae01f4 */ lw $t6,0x1f4($sp) @@ -32259,7 +32259,7 @@ glabel var7f1ab6dcpf /* f0760e0: e7aa0154 */ swc1 $f10,0x154($sp) /* f0760e4: c606000c */ lwc1 $f6,0xc($s0) /* f0760e8: afa2014c */ sw $v0,0x14c($sp) -/* f0760ec: 0c0011d8 */ jal 0x4760 +/* f0760ec: 0c0011d8 */ jal guNormalize /* f0760f0: e7a60158 */ swc1 $f6,0x158($sp) /* f0760f4: 8fa2014c */ lw $v0,0x14c($sp) /* f0760f8: 50400005 */ beqzl $v0,.PB0f076110 @@ -32269,7 +32269,7 @@ glabel var7f1ab6dcpf /* f076108: afa90088 */ sw $t1,0x88($sp) /* f07610c: afa00088 */ sw $zero,0x88($sp) .PB0f076110: -/* f076110: 0fc4fe8e */ jal 0xf13fa38 +/* f076110: 0fc4fe8e */ jal chrIsUsingPaintball /* f076114: 8fa40088 */ lw $a0,0x88($sp) /* f076118: 1040000c */ beqz $v0,.PB0f07614c /* f07611c: 02402825 */ move $a1,$s2 @@ -32280,7 +32280,7 @@ glabel var7f1ab6dcpf /* f076130: afb80010 */ sw $t8,0x10($sp) /* f076134: 02402825 */ move $a1,$s2 /* f076138: 27a605e8 */ addiu $a2,$sp,0x5e8 -/* f07613c: 0fc4c3dd */ jal 0xf130f74 +/* f07613c: 0fc4c3dd */ jal sparksCreate /* f076140: 27a70150 */ addiu $a3,$sp,0x150 /* f076144: 1000000a */ b .PB0f076170 /* f076148: 02402025 */ move $a0,$s2 @@ -32291,13 +32291,13 @@ glabel var7f1ab6dcpf /* f076158: afaf0014 */ sw $t7,0x14($sp) /* f07615c: afab0010 */ sw $t3,0x10($sp) /* f076160: 27a605e8 */ addiu $a2,$sp,0x5e8 -/* f076164: 0fc4c3dd */ jal 0xf130f74 +/* f076164: 0fc4c3dd */ jal sparksCreate /* f076168: 27a70150 */ addiu $a3,$sp,0x150 /* f07616c: 02402025 */ move $a0,$s2 .PB0f076170: /* f076170: 27a505e8 */ addiu $a1,$sp,0x5e8 /* f076174: 27a605f4 */ addiu $a2,$sp,0x5f4 -/* f076178: 0fc1bc9e */ jal 0xf06f278 +/* f076178: 0fc1bc9e */ jal func0f06f0a0 /* f07617c: 8fa7060c */ lw $a3,0x60c($sp) .PB0f076180: /* f076180: 8faa034c */ lw $t2,0x34c($sp) @@ -32309,7 +32309,7 @@ glabel var7f1ab6dcpf /* f076194: 26440008 */ addiu $a0,$s2,0x8 /* f076198: 8fa5006c */ lw $a1,0x6c($sp) /* f07619c: 27a605dc */ addiu $a2,$sp,0x5dc -/* f0761a0: 0fc19815 */ jal 0xf066054 +/* f0761a0: 0fc19815 */ jal func0f065e74 /* f0761a4: 27a7013c */ addiu $a3,$sp,0x13c /* f0761a8: c7a405dc */ lwc1 $f4,0x5dc($sp) /* f0761ac: 02402025 */ move $a0,$s2 @@ -32317,10 +32317,10 @@ glabel var7f1ab6dcpf /* f0761b4: c7a805e0 */ lwc1 $f8,0x5e0($sp) /* f0761b8: e648000c */ swc1 $f8,0xc($s2) /* f0761bc: c7aa05e4 */ lwc1 $f10,0x5e4($sp) -/* f0761c0: 0fc19789 */ jal 0xf065e24 +/* f0761c0: 0fc19789 */ jal propDeregisterRooms /* f0761c4: e64a0010 */ swc1 $f10,0x10($s2) /* f0761c8: 27a4013c */ addiu $a0,$sp,0x13c -/* f0761cc: 0fc19661 */ jal 0xf065984 +/* f0761cc: 0fc19661 */ jal roomsCopy /* f0761d0: 8fa5006c */ lw $a1,0x6c($sp) /* f0761d4: 10000025 */ b .PB0f07626c /* f0761d8: 8fae034c */ lw $t6,0x34c($sp) @@ -32351,7 +32351,7 @@ glabel var7f1ab6dcpf /* f07622c: e7aa05e0 */ swc1 $f10,0x5e0($sp) /* f076230: e7a605e4 */ swc1 $f6,0x5e4($sp) .PB0f076234: -/* f076234: 0fc19815 */ jal 0xf066054 +/* f076234: 0fc19815 */ jal func0f065e74 /* f076238: 8fa5006c */ lw $a1,0x6c($sp) /* f07623c: c7a405dc */ lwc1 $f4,0x5dc($sp) /* f076240: 02402025 */ move $a0,$s2 @@ -32359,19 +32359,19 @@ glabel var7f1ab6dcpf /* f076248: c7a805e0 */ lwc1 $f8,0x5e0($sp) /* f07624c: e648000c */ swc1 $f8,0xc($s2) /* f076250: c7aa05e4 */ lwc1 $f10,0x5e4($sp) -/* f076254: 0fc19789 */ jal 0xf065e24 +/* f076254: 0fc19789 */ jal propDeregisterRooms /* f076258: e64a0010 */ swc1 $f10,0x10($s2) /* f07625c: 27a4012c */ addiu $a0,$sp,0x12c -/* f076260: 0fc19661 */ jal 0xf065984 +/* f076260: 0fc19661 */ jal roomsCopy /* f076264: 8fa5006c */ lw $a1,0x6c($sp) /* f076268: 8fae034c */ lw $t6,0x34c($sp) .PB0f07626c: /* f07626c: 55c003a4 */ bnezl $t6,.PB0f077100 /* f076270: 8fbf005c */ lw $ra,0x5c($sp) -/* f076274: 0fc1a335 */ jal 0xf068cd4 +/* f076274: 0fc1a335 */ jal objFindBboxRodata /* f076278: 02202025 */ move $a0,$s1 /* f07627c: 00402025 */ move $a0,$v0 -/* f076280: 0fc19acf */ jal 0xf066b3c +/* f076280: 0fc19acf */ jal func0f06695c /* f076284: 8fa50074 */ lw $a1,0x74($sp) /* f076288: e7a0037c */ swc1 $f0,0x37c($sp) /* f07628c: c6460008 */ lwc1 $f6,0x8($s2) @@ -32389,7 +32389,7 @@ glabel var7f1ab6dcpf /* f0762bc: afa70074 */ sw $a3,0x74($sp) /* f0762c0: afa90014 */ sw $t1,0x14($sp) /* f0762c4: afb90010 */ sw $t9,0x10($sp) -/* f0762c8: 0c00aae9 */ jal 0x2aba4 +/* f0762c8: 0c00aae9 */ jal cd0002a5e4 /* f0762cc: e7aa05b4 */ swc1 $f10,0x5b4($sp) /* f0762d0: 00021c00 */ sll $v1,$v0,0x10 /* f0762d4: 1840002e */ blez $v0,.PB0f076390 @@ -32407,7 +32407,7 @@ glabel var7f1ab6dcpf /* f076304: 45020023 */ bc1fl .PB0f076394 /* f076308: 26440008 */ addiu $a0,$s2,0x8 /* f07630c: afad0010 */ sw $t5,0x10($sp) -/* f076310: 0c00b856 */ jal 0x2e158 +/* f076310: 0c00b856 */ jal cd0002db98 /* f076314: a7b8038e */ sh $t8,0x38e($sp) /* f076318: 1440001d */ bnez $v0,.PB0f076390 /* f07631c: 87a3038e */ lh $v1,0x38e($sp) @@ -32422,7 +32422,7 @@ glabel var7f1ab6dcpf /* f076340: a7a3038e */ sh $v1,0x38e($sp) /* f076344: e7a605f4 */ swc1 $f6,0x5f4($sp) /* f076348: e7a405f8 */ swc1 $f4,0x5f8($sp) -/* f07634c: 0c0011d8 */ jal 0x4760 +/* f07634c: 0c0011d8 */ jal guNormalize /* f076350: e7a805fc */ swc1 $f8,0x5fc($sp) /* f076354: c64a0008 */ lwc1 $f10,0x8($s2) /* f076358: c7a60390 */ lwc1 $f6,0x390($sp) @@ -32448,7 +32448,7 @@ glabel var7f1ab6dcpf /* f0763a0: 8fa5006c */ lw $a1,0x6c($sp) /* f0763a4: 27a60390 */ addiu $a2,$sp,0x390 /* f0763a8: 8fa70074 */ lw $a3,0x74($sp) -/* f0763ac: 0c00aac9 */ jal 0x2ab24 +/* f0763ac: 0c00aac9 */ jal cd0002a564 /* f0763b0: afa00014 */ sw $zero,0x14($sp) /* f0763b4: 00021c00 */ sll $v1,$v0,0x10 /* f0763b8: 00034c03 */ sra $t1,$v1,0x10 @@ -32464,7 +32464,7 @@ glabel var7f1ab6dcpf /* f0763e0: ae0b0000 */ sw $t3,0x0($s0) /* f0763e4: a7a9038e */ sh $t1,0x38e($sp) /* f0763e8: 27a405c8 */ addiu $a0,$sp,0x5c8 -/* f0763ec: 0c00aa70 */ jal 0x2a9c0 +/* f0763ec: 0c00aa70 */ jal cd0002a400 /* f0763f0: 27a505b8 */ addiu $a1,$sp,0x5b8 /* f0763f4: 18400004 */ blez $v0,.PB0f076408 /* f0763f8: 87a3038e */ lh $v1,0x38e($sp) @@ -32482,16 +32482,16 @@ glabel var7f1ab6dcpf /* f076424: 02402025 */ move $a0,$s2 /* f076428: e64a000c */ swc1 $f10,0xc($s2) /* f07642c: c7a605d0 */ lwc1 $f6,0x5d0($sp) -/* f076430: 0fc19789 */ jal 0xf065e24 +/* f076430: 0fc19789 */ jal propDeregisterRooms /* f076434: e6460010 */ swc1 $f6,0x10($s2) /* f076438: 27a405b8 */ addiu $a0,$sp,0x5b8 -/* f07643c: 0fc19661 */ jal 0xf065984 +/* f07643c: 0fc19661 */ jal roomsCopy /* f076440: 8fa5006c */ lw $a1,0x6c($sp) /* f076444: 8fa40070 */ lw $a0,0x70($sp) /* f076448: 8fa5006c */ lw $a1,0x6c($sp) /* f07644c: 27a60390 */ addiu $a2,$sp,0x390 /* f076450: 8fa70074 */ lw $a3,0x74($sp) -/* f076454: 0c00aa80 */ jal 0x2aa00 +/* f076454: 0c00aa80 */ jal cd0002a440 /* f076458: afa00010 */ sw $zero,0x10($sp) /* f07645c: 00021c00 */ sll $v1,$v0,0x10 /* f076460: 0003cc03 */ sra $t9,$v1,0x10 @@ -32592,7 +32592,7 @@ glabel var7f1ab6dcpf /* f0765b8: 02402025 */ move $a0,$s2 /* f0765bc: 57010004 */ bnel $t8,$at,.PB0f0765d0 /* f0765c0: 8fad0350 */ lw $t5,0x350($sp) -/* f0765c4: 0fc4bf19 */ jal 0xf12fc64 +/* f0765c4: 0fc4bf19 */ jal smokeCreateAtProp /* f0765c8: 24050013 */ li $a1,0x13 /* f0765cc: 8fad0350 */ lw $t5,0x350($sp) .PB0f0765d0: @@ -32605,7 +32605,7 @@ glabel var7f1ab6dcpf /* f0765e8: 8fab0354 */ lw $t3,0x354($sp) /* f0765ec: 51600007 */ beqzl $t3,.PB0f07660c /* f0765f0: 8e0f0000 */ lw $t7,0x0($s0) -/* f0765f4: 0fc1a9fe */ jal 0xf06a7f8 +/* f0765f4: 0fc1a9fe */ jal func0f06a620 /* f0765f8: 02202025 */ move $a0,$s1 /* f0765fc: c646000c */ lwc1 $f6,0xc($s2) /* f076600: 46003200 */ add.s $f8,$f6,$f0 @@ -32625,7 +32625,7 @@ glabel var7f1ab6dcpf /* f076634: 50200004 */ beqzl $at,.PB0f076648 /* f076638: 8e190090 */ lw $t9,0x90($s0) .PB0f07663c: -/* f07663c: 0fc25874 */ jal 0xf0961d0 +/* f07663c: 0fc25874 */ jal func0f096360 /* f076640: 8fa40064 */ lw $a0,0x64($sp) /* f076644: 8e190090 */ lw $t9,0x90($s0) .PB0f076648: @@ -32654,7 +32654,7 @@ glabel var7f1ab6dcpf /* f07669c: c604008c */ lwc1 $f4,0x8c($s0) /* f0766a0: 11c00029 */ beqz $t6,.PB0f076748 /* f0766a4: 02202025 */ move $a0,$s1 -/* f0766a8: 0fc1b76c */ jal 0xf06ddb0 +/* f0766a8: 0fc1b76c */ jal func0f06dbd8 /* f0766ac: 27a50358 */ addiu $a1,$sp,0x358 /* f0766b0: 10000026 */ b .PB0f07674c /* f0766b4: 922b0003 */ lbu $t3,0x3($s1) @@ -32688,14 +32688,14 @@ glabel var7f1ab6dcpf .PB0f076720: /* f076720: 13000009 */ beqz $t8,.PB0f076748 /* f076724: 02202025 */ move $a0,$s1 -/* f076728: 0fc1b76c */ jal 0xf06ddb0 +/* f076728: 0fc1b76c */ jal func0f06dbd8 /* f07672c: 27a50358 */ addiu $a1,$sp,0x358 /* f076730: 10000006 */ b .PB0f07674c /* f076734: 922b0003 */ lbu $t3,0x3($s1) .PB0f076738: /* f076738: 11a00003 */ beqz $t5,.PB0f076748 /* f07673c: 02202025 */ move $a0,$s1 -/* f076740: 0fc1b76c */ jal 0xf06ddb0 +/* f076740: 0fc1b76c */ jal func0f06dbd8 /* f076744: 27a50358 */ addiu $a1,$sp,0x358 .PB0f076748: /* f076748: 922b0003 */ lbu $t3,0x3($s1) @@ -32711,7 +32711,7 @@ glabel var7f1ab6dcpf /* f07676c: 24010001 */ li $at,0x1 /* f076770: 55e10006 */ bnel $t7,$at,.PB0f07678c /* f076774: 24010053 */ li $at,0x53 -/* f076778: 0fc1ba95 */ jal 0xf06ea54 +/* f076778: 0fc1ba95 */ jal func0f06e87c /* f07677c: 02202025 */ move $a0,$s1 /* f076780: 100000b0 */ b .PB0f076a44 /* f076784: 8fac0600 */ lw $t4,0x600($sp) @@ -32764,7 +32764,7 @@ glabel var7f1ab6dcpf /* f076830: 27a60110 */ addiu $a2,$sp,0x110 /* f076834: e7a4010c */ swc1 $f4,0x10c($sp) /* f076838: c608000c */ lwc1 $f8,0xc($s0) -/* f07683c: 0c0011d8 */ jal 0x4760 +/* f07683c: 0c0011d8 */ jal guNormalize /* f076840: e7a80110 */ swc1 $f8,0x110($sp) /* f076844: 3c0141a0 */ lui $at,0x41a0 /* f076848: 44810000 */ mtc1 $at,$f0 @@ -32785,7 +32785,7 @@ glabel var7f1ab6dcpf /* f076884: e7a8010c */ swc1 $f8,0x10c($sp) /* f076888: c64a0010 */ lwc1 $f10,0x10($s2) /* f07688c: 46045201 */ sub.s $f8,$f10,$f4 -/* f076890: 0fc4bf5c */ jal 0xf12fd70 +/* f076890: 0fc4bf5c */ jal smokeCreateSimple /* f076894: e7a80110 */ swc1 $f8,0x110($sp) /* f076898: 1000006a */ b .PB0f076a44 /* f07689c: 8fac0600 */ lw $t4,0x600($sp) @@ -32799,7 +32799,7 @@ glabel var7f1ab6dcpf /* f0768b8: a6200062 */ sh $zero,0x62($s1) .PB0f0768bc: /* f0768bc: 8fa5006c */ lw $a1,0x6c($sp) -/* f0768c0: 0fc4bf5c */ jal 0xf12fd70 +/* f0768c0: 0fc4bf5c */ jal smokeCreateSimple /* f0768c4: 2406000b */ li $a2,0xb /* f0768c8: 1000005e */ b .PB0f076a44 /* f0768cc: 8fac0600 */ lw $t4,0x600($sp) @@ -32899,7 +32899,7 @@ glabel var7f1ab6dcpf /* f076a2c: 10470004 */ beq $v0,$a3,.PB0f076a40 /* f076a30: 26440008 */ addiu $a0,$s2,0x8 /* f076a34: 8fa5006c */ lw $a1,0x6c($sp) -/* f076a38: 0fc4bf5c */ jal 0xf12fd70 +/* f076a38: 0fc4bf5c */ jal smokeCreateSimple /* f076a3c: 24060009 */ li $a2,0x9 .PB0f076a40: /* f076a40: 8fac0600 */ lw $t4,0x600($sp) @@ -32937,7 +32937,7 @@ glabel var7f1ab6dcpf /* f076ab8: e7a00024 */ swc1 $f0,0x24($sp) /* f076abc: e7a00030 */ swc1 $f0,0x30($sp) /* f076ac0: e7a00034 */ swc1 $f0,0x34($sp) -/* f076ac4: 0fc24e0e */ jal 0xf093838 +/* f076ac4: 0fc24e0e */ jal func0f0939f8 /* f076ac8: e7a00038 */ swc1 $f0,0x38($sp) /* f076acc: 3c03800a */ lui $v1,0x800a /* f076ad0: 10000052 */ b .PB0f076c1c @@ -32955,7 +32955,7 @@ glabel var7f1ab6dcpf /* f076afc: 8dec0004 */ lw $t4,0x4($t7) /* f076b00: 27ab0100 */ addiu $t3,$sp,0x100 /* f076b04: ad610000 */ sw $at,0x0($t3) -/* f076b08: 0c004be0 */ jal 0x12f80 +/* f076b08: 0c004be0 */ jal random /* f076b0c: ad6c0004 */ sw $t4,0x4($t3) /* f076b10: 304e0003 */ andi $t6,$v0,0x3 /* f076b14: 000ec840 */ sll $t9,$t6,0x1 @@ -32978,7 +32978,7 @@ glabel var7f1ab6dcpf /* f076b58: e7a00024 */ swc1 $f0,0x24($sp) /* f076b5c: e7a00030 */ swc1 $f0,0x30($sp) /* f076b60: e7a00034 */ swc1 $f0,0x34($sp) -/* f076b64: 0fc24e0e */ jal 0xf093838 +/* f076b64: 0fc24e0e */ jal func0f0939f8 /* f076b68: e7a00038 */ swc1 $f0,0x38($sp) /* f076b6c: 3c01bf80 */ lui $at,0xbf80 /* f076b70: 44810000 */ mtc1 $at,$f0 @@ -32998,7 +32998,7 @@ glabel var7f1ab6dcpf /* f076ba8: e7a00024 */ swc1 $f0,0x24($sp) /* f076bac: e7a00030 */ swc1 $f0,0x30($sp) /* f076bb0: e7a00034 */ swc1 $f0,0x34($sp) -/* f076bb4: 0fc24e0e */ jal 0xf093838 +/* f076bb4: 0fc24e0e */ jal func0f0939f8 /* f076bb8: e7a00038 */ swc1 $f0,0x38($sp) /* f076bbc: 3c03800a */ lui $v1,0x800a /* f076bc0: 10000016 */ b .PB0f076c1c @@ -33021,7 +33021,7 @@ glabel var7f1ab6dcpf /* f076c00: e7a00024 */ swc1 $f0,0x24($sp) /* f076c04: e7a00030 */ swc1 $f0,0x30($sp) /* f076c08: e7a00034 */ swc1 $f0,0x34($sp) -/* f076c0c: 0fc24e0e */ jal 0xf093838 +/* f076c0c: 0fc24e0e */ jal func0f0939f8 /* f076c10: e7a00038 */ swc1 $f0,0x38($sp) /* f076c14: 3c03800a */ lui $v1,0x800a /* f076c18: 8c63e4dc */ lw $v1,-0x1b24($v1) @@ -33031,7 +33031,7 @@ glabel var7f1ab6dcpf /* f076c20: 02202025 */ move $a0,$s1 .PB0f076c24: /* f076c24: 24050001 */ li $a1,0x1 -/* f076c28: 0fc1a792 */ jal 0xf069e48 +/* f076c28: 0fc1a792 */ jal func0f069c70 /* f076c2c: 24060001 */ li $a2,0x1 /* f076c30: 10000133 */ b .PB0f077100 /* f076c34: 8fbf005c */ lw $ra,0x5c($sp) @@ -33070,22 +33070,22 @@ glabel var7f1ab6dcpf /* f076cb0: c6000060 */ lwc1 $f0,0x60($s0) /* f076cb4: 44060000 */ mfc1 $a2,$f0 .PB0f076cb8: -/* f076cb8: 0fc25c4a */ jal 0xf097128 +/* f076cb8: 0fc25c4a */ jal quaternionSlerp /* f076cbc: 27a700ec */ addiu $a3,$sp,0xec /* f076cc0: 27a400ec */ addiu $a0,$sp,0xec -/* f076cc4: 0fc25b51 */ jal 0xf096d44 +/* f076cc4: 0fc25b51 */ jal quaternionToMtx /* f076cc8: 27a500ac */ addiu $a1,$sp,0xac /* f076ccc: c60c00b8 */ lwc1 $f12,0xb8($s0) -/* f076cd0: 0c005a1d */ jal 0x16874 +/* f076cd0: 0c005a1d */ jal mtx00015e24 /* f076cd4: 27a500ac */ addiu $a1,$sp,0xac /* f076cd8: c60c00bc */ lwc1 $f12,0xbc($s0) -/* f076cdc: 0c005a34 */ jal 0x168d0 +/* f076cdc: 0c005a34 */ jal mtx00015e80 /* f076ce0: 27a500ac */ addiu $a1,$sp,0xac /* f076ce4: c60c00c0 */ lwc1 $f12,0xc0($s0) -/* f076ce8: 0c005a4b */ jal 0x1692c +/* f076ce8: 0c005a4b */ jal mtx00015edc /* f076cec: 27a500ac */ addiu $a1,$sp,0xac /* f076cf0: 27a400ac */ addiu $a0,$sp,0xac -/* f076cf4: 0c0059fc */ jal 0x167f0 +/* f076cf4: 0c0059fc */ jal mtx4ToMtx3 /* f076cf8: 2625001c */ addiu $a1,$s1,0x1c /* f076cfc: 3c013f80 */ lui $at,0x3f80 /* f076d00: 44816000 */ mtc1 $at,$f12 @@ -33111,10 +33111,10 @@ glabel var7f1ab6dcpf /* f076d4c: 8faf00fc */ lw $t7,0xfc($sp) /* f076d50: afa90074 */ sw $t1,0x74($sp) .PB0f076d54: -/* f076d54: 0fc1a335 */ jal 0xf068cd4 +/* f076d54: 0fc1a335 */ jal objFindBboxRodata /* f076d58: afa000fc */ sw $zero,0xfc($sp) /* f076d5c: 00402025 */ move $a0,$v0 -/* f076d60: 0fc19acf */ jal 0xf066b3c +/* f076d60: 0fc19acf */ jal func0f06695c /* f076d64: 8fa50074 */ lw $a1,0x74($sp) /* f076d68: 3c03800a */ lui $v1,0x800a /* f076d6c: 8c63e508 */ lw $v1,-0x1af8($v1) @@ -33154,7 +33154,7 @@ glabel var7f1ab6dcpf /* f076df0: 46021282 */ mul.s $f10,$f2,$f2 /* f076df4: 00000000 */ nop /* f076df8: 460e7102 */ mul.s $f4,$f14,$f14 -/* f076dfc: 0c012ae4 */ jal 0x4ab90 +/* f076dfc: 0c012ae4 */ jal sqrtf /* f076e00: 46045300 */ add.s $f12,$f10,$f4 /* f076e04: 4600a03c */ c.lt.s $f20,$f0 /* f076e08: 3c017f1b */ lui $at,0x7f1b @@ -33220,12 +33220,12 @@ glabel var7f1ab6dcpf /* f076edc: e7a605cc */ swc1 $f6,0x5cc($sp) /* f076ee0: c64a0010 */ lwc1 $f10,0x10($s2) /* f076ee4: afa4006c */ sw $a0,0x6c($sp) -/* f076ee8: 0fc19661 */ jal 0xf065984 +/* f076ee8: 0fc19661 */ jal roomsCopy /* f076eec: e7aa05d0 */ swc1 $f10,0x5d0($sp) /* f076ef0: 02202025 */ move $a0,$s1 /* f076ef4: 27a505dc */ addiu $a1,$sp,0x5dc /* f076ef8: 27a605e8 */ addiu $a2,$sp,0x5e8 -/* f076efc: 0fc1b555 */ jal 0xf06d554 +/* f076efc: 0fc1b555 */ jal func0f06d37c /* f076f00: 27a705f4 */ addiu $a3,$sp,0x5f4 /* f076f04: 24180001 */ li $t8,0x1 /* f076f08: afb805d8 */ sw $t8,0x5d8($sp) @@ -33243,7 +33243,7 @@ glabel var7f1ab6dcpf /* f076f38: c6440010 */ lwc1 $f4,0x10($s2) /* f076f3c: afa70074 */ sw $a3,0x74($sp) /* f076f40: afad0010 */ sw $t5,0x10($sp) -/* f076f44: 0c00aaa4 */ jal 0x2aa90 +/* f076f44: 0c00aaa4 */ jal cd0002a4d0 /* f076f48: e7a405b4 */ swc1 $f4,0x5b4($sp) /* f076f4c: 00021c00 */ sll $v1,$v0,0x10 /* f076f50: 1840000b */ blez $v0,.PB0f076f80 @@ -33254,7 +33254,7 @@ glabel var7f1ab6dcpf /* f076f64: 27a505b8 */ addiu $a1,$sp,0x5b8 /* f076f68: 27a605ac */ addiu $a2,$sp,0x5ac /* f076f6c: 24070021 */ li $a3,0x21 -/* f076f70: 0c00b856 */ jal 0x2e158 +/* f076f70: 0c00b856 */ jal cd0002db98 /* f076f74: a7aa00a2 */ sh $t2,0xa2($sp) /* f076f78: 1040000b */ beqz $v0,.PB0f076fa8 /* f076f7c: 87a300a2 */ lh $v1,0xa2($sp) @@ -33264,7 +33264,7 @@ glabel var7f1ab6dcpf /* f076f88: 26440008 */ addiu $a0,$s2,0x8 /* f076f8c: 8fa5006c */ lw $a1,0x6c($sp) /* f076f90: 27a600a4 */ addiu $a2,$sp,0xa4 -/* f076f94: 0c00aa80 */ jal 0x2aa00 +/* f076f94: 0c00aa80 */ jal cd0002a440 /* f076f98: 8fa70074 */ lw $a3,0x74($sp) /* f076f9c: 00021c00 */ sll $v1,$v0,0x10 /* f076fa0: 00036403 */ sra $t4,$v1,0x10 @@ -33277,17 +33277,17 @@ glabel var7f1ab6dcpf /* f076fb8: 264e0008 */ addiu $t6,$s2,0x8 /* f076fbc: 02402025 */ move $a0,$s2 /* f076fc0: e6460010 */ swc1 $f6,0x10($s2) -/* f076fc4: 0fc19789 */ jal 0xf065e24 +/* f076fc4: 0fc19789 */ jal propDeregisterRooms /* f076fc8: afae0070 */ sw $t6,0x70($sp) /* f076fcc: 27a405b8 */ addiu $a0,$sp,0x5b8 -/* f076fd0: 0fc19661 */ jal 0xf065984 +/* f076fd0: 0fc19661 */ jal roomsCopy /* f076fd4: 8fa5006c */ lw $a1,0x6c($sp) /* f076fd8: 27b90096 */ addiu $t9,$sp,0x96 /* f076fdc: afb90010 */ sw $t9,0x10($sp) /* f076fe0: 8fa40070 */ lw $a0,0x70($sp) /* f076fe4: 8fa5006c */ lw $a1,0x6c($sp) /* f076fe8: 27a600a4 */ addiu $a2,$sp,0xa4 -/* f076fec: 0c00aa80 */ jal 0x2aa00 +/* f076fec: 0c00aa80 */ jal cd0002a440 /* f076ff0: 8fa70074 */ lw $a3,0x74($sp) /* f076ff4: 00021c00 */ sll $v1,$v0,0x10 /* f076ff8: 00034c03 */ sra $t1,$v1,0x10 @@ -33297,7 +33297,7 @@ glabel var7f1ab6dcpf .PB0f077008: /* f077008: 18600010 */ blez $v1,.PB0f07704c /* f07700c: c7aa05cc */ lwc1 $f10,0x5cc($sp) -/* f077010: 0fc1a9fe */ jal 0xf06a7f8 +/* f077010: 0fc1a9fe */ jal func0f06a620 /* f077014: 02202025 */ move $a0,$s1 /* f077018: c7aa00a4 */ lwc1 $f10,0xa4($sp) /* f07701c: c7a40098 */ lwc1 $f4,0x98($sp) @@ -33343,14 +33343,14 @@ glabel var7f1ab6dcpf .PB0f0770b4: /* f0770b4: 51e0000b */ beqzl $t7,.PB0f0770e4 /* f0770b8: 8fae05d8 */ lw $t6,0x5d8($sp) -/* f0770bc: 0fc1ab86 */ jal 0xf06ae18 +/* f0770bc: 0fc1ab86 */ jal objEndFlight /* f0770c0: 02202025 */ move $a0,$s1 /* f0770c4: 922c0003 */ lbu $t4,0x3($s1) /* f0770c8: 24010008 */ li $at,0x8 /* f0770cc: 26450028 */ addiu $a1,$s2,0x28 /* f0770d0: 55810004 */ bnel $t4,$at,.PB0f0770e4 /* f0770d4: 8fae05d8 */ lw $t6,0x5d8($sp) -/* f0770d8: 0fc25792 */ jal 0xf095e48 +/* f0770d8: 0fc25792 */ jal objectiveCheckMultiroomEntered /* f0770dc: 9224005c */ lbu $a0,0x5c($s1) /* f0770e0: 8fae05d8 */ lw $t6,0x5d8($sp) .PB0f0770e4: @@ -33358,7 +33358,7 @@ glabel var7f1ab6dcpf /* f0770e8: 24050001 */ li $a1,0x1 /* f0770ec: 51c00004 */ beqzl $t6,.PB0f077100 /* f0770f0: 8fbf005c */ lw $ra,0x5c($sp) -/* f0770f4: 0fc1a792 */ jal 0xf069e48 +/* f0770f4: 0fc1a792 */ jal func0f069c70 /* f0770f8: 24060001 */ li $a2,0x1 .PB0f0770fc: /* f0770fc: 8fbf005c */ lw $ra,0x5c($sp) @@ -45810,7 +45810,7 @@ glabel var7f1aa5a8 .text /* f07a0bc: 27bdfe68 */ addiu $sp,$sp,-408 /* f07a0c0: afbf0044 */ sw $ra,0x44($sp) -/* f07a0c4: 0fc5b9b8 */ jal 0xf16e6e0 +/* f07a0c4: 0fc5b9b8 */ jal lvIsPaused /* f07a0c8: afa40198 */ sw $a0,0x198($sp) /* f07a0cc: 14400363 */ bnez $v0,.PB0f07ae5c /* f07a0d0: 8fae0198 */ lw $t6,0x198($sp) @@ -45837,7 +45837,7 @@ glabel var7f1aa5a8 /* f07a124: afad018c */ sw $t5,0x18c($sp) /* f07a128: 8dc40008 */ lw $a0,0x8($t6) /* f07a12c: afa20194 */ sw $v0,0x194($sp) -/* f07a130: 0c006cdb */ jal 0x1b36c +/* f07a130: 0c006cdb */ jal modelGetPart /* f07a134: afa20190 */ sw $v0,0x190($sp) /* f07a138: 1040000b */ beqz $v0,.PB0f07a168 /* f07a13c: 8fa30190 */ lw $v1,0x190($sp) @@ -45881,7 +45881,7 @@ glabel var7f1aa5a8 /* f07a1c8: 0081c824 */ and $t9,$a0,$at /* f07a1cc: 11200007 */ beqz $t1,.PB0f07a1ec /* f07a1d0: 00192702 */ srl $a0,$t9,0x1c -/* f07a1d4: 0fc63b03 */ jal 0xf18ec0c +/* f07a1d4: 0fc63b03 */ jal mpGetChrFromPlayerIndex /* f07a1d8: 00000000 */ nop /* f07a1dc: 10400003 */ beqz $v0,.PB0f07a1ec /* f07a1e0: afa20110 */ sw $v0,0x110($sp) @@ -45895,14 +45895,14 @@ glabel var7f1aa5a8 /* f07a1fc: 8faf0184 */ lw $t7,0x184($sp) /* f07a200: 8fab0184 */ lw $t3,0x184($sp) /* f07a204: 24050007 */ li $a1,0x7 -/* f07a208: 0c006cdb */ jal 0x1b36c +/* f07a208: 0c006cdb */ jal modelGetPart /* f07a20c: 8d640008 */ lw $a0,0x8($t3) /* f07a210: 14400006 */ bnez $v0,.PB0f07a22c /* f07a214: 00403825 */ move $a3,$v0 /* f07a218: 8faf0184 */ lw $t7,0x184($sp) .PB0f07a21c: /* f07a21c: 24050005 */ li $a1,0x5 -/* f07a220: 0c006cdb */ jal 0x1b36c +/* f07a220: 0c006cdb */ jal modelGetPart /* f07a224: 8de40008 */ lw $a0,0x8($t7) /* f07a228: 00403825 */ move $a3,$v0 .PB0f07a22c: @@ -45911,14 +45911,14 @@ glabel var7f1aa5a8 /* f07a234: 8fb80184 */ lw $t8,0x184($sp) /* f07a238: 24050003 */ li $a1,0x3 /* f07a23c: 8f040008 */ lw $a0,0x8($t8) -/* f07a240: 0c006cdb */ jal 0x1b36c +/* f07a240: 0c006cdb */ jal modelGetPart /* f07a244: afa70120 */ sw $a3,0x120($sp) /* f07a248: 8fa70120 */ lw $a3,0x120($sp) /* f07a24c: afa2011c */ sw $v0,0x11c($sp) /* f07a250: 8fa40198 */ lw $a0,0x198($sp) .PB0f07a254: /* f07a254: 00002825 */ move $a1,$zero -/* f07a258: 0fc190d6 */ jal 0xf064358 +/* f07a258: 0fc190d6 */ jal propSetPerimEnabled /* f07a25c: afa70120 */ sw $a3,0x120($sp) /* f07a260: 8fa20198 */ lw $v0,0x198($sp) /* f07a264: 8fa70120 */ lw $a3,0x120($sp) @@ -45936,7 +45936,7 @@ glabel var7f1aa5a8 /* f07a290: 8fa40184 */ lw $a0,0x184($sp) /* f07a294: 00e02825 */ move $a1,$a3 /* f07a298: 00003025 */ move $a2,$zero -/* f07a29c: 0c006c07 */ jal 0x1b01c +/* f07a29c: 0c006c07 */ jal model0001a5cc /* f07a2a0: afa70120 */ sw $a3,0x120($sp) /* f07a2a4: 8fa70120 */ lw $a3,0x120($sp) /* f07a2a8: 00402825 */ move $a1,$v0 @@ -45950,7 +45950,7 @@ glabel var7f1aa5a8 /* f07a2c8: e7a80170 */ swc1 $f8,0x170($sp) .PB0f07a2cc: /* f07a2cc: 8fa5011c */ lw $a1,0x11c($sp) -/* f07a2d0: 0c006c07 */ jal 0x1b01c +/* f07a2d0: 0c006c07 */ jal model0001a5cc /* f07a2d4: 00003025 */ move $a2,$zero /* f07a2d8: 44805000 */ mtc1 $zero,$f10 /* f07a2dc: 44808000 */ mtc1 $zero,$f16 @@ -45960,14 +45960,14 @@ glabel var7f1aa5a8 /* f07a2ec: e7b0016c */ swc1 $f16,0x16c($sp) /* f07a2f0: e7b20170 */ swc1 $f18,0x170($sp) .PB0f07a2f4: -/* f07a2f4: 0fc2d6e2 */ jal 0xf0b5b88 +/* f07a2f4: 0fc2d6e2 */ jal currentPlayerGetUnk174c /* f07a2f8: afa50108 */ sw $a1,0x108($sp) /* f07a2fc: 8fa50108 */ lw $a1,0x108($sp) /* f07a300: 00402025 */ move $a0,$v0 -/* f07a304: 0c00598d */ jal 0x16634 +/* f07a304: 0c00598d */ jal mtx00015be4 /* f07a308: 27a600c8 */ addiu $a2,$sp,0xc8 /* f07a30c: 27a400c8 */ addiu $a0,$sp,0xc8 -/* f07a310: 0c00596d */ jal 0x165b4 +/* f07a310: 0c00596d */ jal mtx4TransformVecInPlace /* f07a314: 27a50168 */ addiu $a1,$sp,0x168 /* f07a318: 8fa20198 */ lw $v0,0x198($sp) /* f07a31c: 240a0020 */ li $t2,0x20 @@ -45978,7 +45978,7 @@ glabel var7f1aa5a8 /* f07a330: afaa0010 */ sw $t2,0x10($sp) /* f07a334: 27a60168 */ addiu $a2,$sp,0x168 /* f07a338: 27a70158 */ addiu $a3,$sp,0x158 -/* f07a33c: 0c00b8fd */ jal 0x2e3f4 +/* f07a33c: 0c00b8fd */ jal cd0002de34 /* f07a340: 24440008 */ addiu $a0,$v0,0x8 /* f07a344: 14400015 */ bnez $v0,.PB0f07a39c /* f07a348: 8fad0198 */ lw $t5,0x198($sp) @@ -45989,7 +45989,7 @@ glabel var7f1aa5a8 /* f07a35c: c5a6000c */ lwc1 $f6,0xc($t5) /* f07a360: e7a6016c */ swc1 $f6,0x16c($sp) /* f07a364: c5a80010 */ lwc1 $f8,0x10($t5) -/* f07a368: 0fc19661 */ jal 0xf065984 +/* f07a368: 0fc19661 */ jal roomsCopy /* f07a36c: e7a80170 */ swc1 $f8,0x170($sp) /* f07a370: 1000000b */ b .PB0f07a3a0 /* f07a374: 8fae0194 */ lw $t6,0x194($sp) @@ -46001,30 +46001,30 @@ glabel var7f1aa5a8 /* f07a388: c450000c */ lwc1 $f16,0xc($v0) /* f07a38c: e7b0016c */ swc1 $f16,0x16c($sp) /* f07a390: c4520010 */ lwc1 $f18,0x10($v0) -/* f07a394: 0fc19661 */ jal 0xf065984 +/* f07a394: 0fc19661 */ jal roomsCopy /* f07a398: e7b20170 */ swc1 $f18,0x170($sp) .PB0f07a39c: /* f07a39c: 8fae0194 */ lw $t6,0x194($sp) .PB0f07a3a0: -/* f07a3a0: 0c006b88 */ jal 0x1ae20 +/* f07a3a0: 0c006b88 */ jal cosf /* f07a3a4: c5cc0078 */ lwc1 $f12,0x78($t6) /* f07a3a8: 8fab0194 */ lw $t3,0x194($sp) /* f07a3ac: e7a00050 */ swc1 $f0,0x50($sp) -/* f07a3b0: 0c006b8b */ jal 0x1ae2c +/* f07a3b0: 0c006b8b */ jal sinf /* f07a3b4: c56c006c */ lwc1 $f12,0x6c($t3) /* f07a3b8: c7a40050 */ lwc1 $f4,0x50($sp) /* f07a3bc: 8faf0194 */ lw $t7,0x194($sp) /* f07a3c0: 46040182 */ mul.s $f6,$f0,$f4 /* f07a3c4: e7a6014c */ swc1 $f6,0x14c($sp) -/* f07a3c8: 0c006b8b */ jal 0x1ae2c +/* f07a3c8: 0c006b8b */ jal sinf /* f07a3cc: c5ec0078 */ lwc1 $f12,0x78($t7) /* f07a3d0: 8fb80194 */ lw $t8,0x194($sp) /* f07a3d4: e7a00150 */ swc1 $f0,0x150($sp) -/* f07a3d8: 0c006b88 */ jal 0x1ae20 +/* f07a3d8: 0c006b88 */ jal cosf /* f07a3dc: c70c0078 */ lwc1 $f12,0x78($t8) /* f07a3e0: 8fb90194 */ lw $t9,0x194($sp) /* f07a3e4: e7a00050 */ swc1 $f0,0x50($sp) -/* f07a3e8: 0c006b88 */ jal 0x1ae20 +/* f07a3e8: 0c006b88 */ jal cosf /* f07a3ec: c72c006c */ lwc1 $f12,0x6c($t9) /* f07a3f0: c7a80050 */ lwc1 $f8,0x50($sp) /* f07a3f4: 3c014780 */ lui $at,0x4780 @@ -46072,15 +46072,15 @@ glabel var7f1aa5a8 .PB0f07a498: /* f07a498: 240e0010 */ li $t6,0x10 .PB0f07a49c: -/* f07a49c: 0c00b8d4 */ jal 0x2e350 +/* f07a49c: 0c00b8d4 */ jal cdTestAToB4 /* f07a4a0: afae0010 */ sw $t6,0x10($sp) /* f07a4a4: 14400151 */ bnez $v0,.PB0f07a9ec /* f07a4a8: 27a4013c */ addiu $a0,$sp,0x13c /* f07a4ac: 3c067f1b */ lui $a2,0x7f1b /* f07a4b0: 24c6bd08 */ addiu $a2,$a2,-17144 -/* f07a4b4: 0c00951f */ jal 0x2547c +/* f07a4b4: 0c00951f */ jal cdGetPos /* f07a4b8: 24052cd8 */ li $a1,0x2cd8 -/* f07a4bc: 0c00951c */ jal 0x25470 +/* f07a4bc: 0c00951c */ jal cdGetObstacle /* f07a4c0: 00000000 */ nop /* f07a4c4: 1040006a */ beqz $v0,.PB0f07a670 /* f07a4c8: afa20178 */ sw $v0,0x178($sp) @@ -46104,7 +46104,7 @@ glabel var7f1aa5a8 /* f07a508: afa000bc */ sw $zero,0xbc($sp) /* f07a50c: afb800b8 */ sw $t8,0xb8($sp) /* f07a510: afb900b4 */ sw $t9,0xb4($sp) -/* f07a514: 0fc2c84e */ jal 0xf0b2138 +/* f07a514: 0fc2c84e */ jal gsetGetDamage /* f07a518: 27a40118 */ addiu $a0,$sp,0x118 /* f07a51c: 8fa80178 */ lw $t0,0x178($sp) /* f07a520: 3c09800a */ lui $t1,0x800a @@ -46126,7 +46126,7 @@ glabel var7f1aa5a8 /* f07a55c: 240e0001 */ li $t6,0x1 /* f07a560: 11a00009 */ beqz $t5,.PB0f07a588 /* f07a564: 01a02825 */ move $a1,$t5 -/* f07a568: 0fc12aec */ jal 0xf04abb0 +/* f07a568: 0fc12aec */ jal chrCompareTeams /* f07a56c: 24060001 */ li $a2,0x1 /* f07a570: 10400005 */ beqz $v0,.PB0f07a588 /* f07a574: 240e0001 */ li $t6,0x1 @@ -46144,13 +46144,13 @@ glabel var7f1aa5a8 /* f07a59c: 51e00114 */ beqzl $t7,.PB0f07a9f0 /* f07a5a0: 8fa40198 */ lw $a0,0x198($sp) .PB0f07a5a4: -/* f07a5a4: 0fc2a04d */ jal 0xf0a8134 +/* f07a5a4: 0fc2a04d */ jal bgunPlayPropHitSound /* f07a5a8: 2406ffff */ li $a2,-1 /* f07a5ac: 8fa400ac */ lw $a0,0xac($sp) /* f07a5b0: 8c980020 */ lw $t8,0x20($a0) /* f07a5b4: 53000012 */ beqzl $t8,.PB0f07a600 /* f07a5b8: 8fac0110 */ lw $t4,0x110($sp) -/* f07a5bc: 0fc0d025 */ jal 0xf034094 +/* f07a5bc: 0fc0d025 */ jal chrGetShield /* f07a5c0: 00000000 */ nop /* f07a5c4: 44808000 */ mtc1 $zero,$f16 /* f07a5c8: 8fa400ac */ lw $a0,0xac($sp) @@ -46164,7 +46164,7 @@ glabel var7f1aa5a8 /* f07a5e8: 27a900b8 */ addiu $t1,$sp,0xb8 /* f07a5ec: afa90018 */ sw $t1,0x18($sp) /* f07a5f0: afb90010 */ sw $t9,0x10($sp) -/* f07a5f4: 0fc1000f */ jal 0xf04003c +/* f07a5f4: 0fc1000f */ jal chrCalculateShieldHit /* f07a5f8: afa80014 */ sw $t0,0x14($sp) .PB0f07a5fc: /* f07a5fc: 8fac0110 */ lw $t4,0x110($sp) @@ -46175,7 +46175,7 @@ glabel var7f1aa5a8 /* f07a60c: 8fa50178 */ lw $a1,0x178($sp) /* f07a610: 8fa600b4 */ lw $a2,0xb4($sp) /* f07a614: 27a7013c */ addiu $a3,$sp,0x13c -/* f07a618: 0fc097dd */ jal 0xf025f74 +/* f07a618: 0fc097dd */ jal chrEmitSparks /* f07a61c: afac0014 */ sw $t4,0x14($sp) /* f07a620: 8fad0114 */ lw $t5,0x114($sp) /* f07a624: 8fab0178 */ lw $t3,0x178($sp) @@ -46193,7 +46193,7 @@ glabel var7f1aa5a8 /* f07a654: afab0018 */ sw $t3,0x18($sp) /* f07a658: afaf001c */ sw $t7,0x1c($sp) /* f07a65c: afb80020 */ sw $t8,0x20($sp) -/* f07a660: 0fc0d0b4 */ jal 0xf0342d0 +/* f07a660: 0fc0d0b4 */ jal func0f0341dc /* f07a664: afb90024 */ sw $t9,0x24($sp) /* f07a668: 100000e1 */ b .PB0f07a9f0 /* f07a66c: 8fa40198 */ lw $a0,0x198($sp) @@ -46214,15 +46214,15 @@ glabel var7f1aa5a8 /* f07a69c: afa000a8 */ sw $zero,0xa8($sp) /* f07a6a0: afaa0010 */ sw $t2,0x10($sp) /* f07a6a4: 27a40168 */ addiu $a0,$sp,0x168 -/* f07a6a8: 0c00b8d4 */ jal 0x2e350 +/* f07a6a8: 0c00b8d4 */ jal cdTestAToB4 /* f07a6ac: 2407003b */ li $a3,0x3b /* f07a6b0: 1440000a */ bnez $v0,.PB0f07a6dc /* f07a6b4: 27a4013c */ addiu $a0,$sp,0x13c /* f07a6b8: 3c067f1b */ lui $a2,0x7f1b /* f07a6bc: 24c6bd14 */ addiu $a2,$a2,-17132 -/* f07a6c0: 0c00951f */ jal 0x2547c +/* f07a6c0: 0c00951f */ jal cdGetPos /* f07a6c4: 24052d0f */ li $a1,0x2d0f -/* f07a6c8: 0c00951c */ jal 0x25470 +/* f07a6c8: 0c00951c */ jal cdGetObstacle /* f07a6cc: 00000000 */ nop /* f07a6d0: 240c0001 */ li $t4,0x1 /* f07a6d4: afac0148 */ sw $t4,0x148($sp) @@ -46246,9 +46246,9 @@ glabel var7f1aa5a8 /* f07a718: 8d6bb384 */ lw $t3,-0x4c7c($t3) /* f07a71c: afa00148 */ sw $zero,0x148($sp) /* f07a720: afa300a8 */ sw $v1,0xa8($sp) -/* f07a724: 0fc68a52 */ jal 0xf1a2948 +/* f07a724: 0fc68a52 */ jal frCalculateHit /* f07a728: afab00a0 */ sw $t3,0xa0($sp) -/* f07a72c: 0fc4fe8e */ jal 0xf13fa38 +/* f07a72c: 0fc4fe8e */ jal chrIsUsingPaintball /* f07a730: 8fa40110 */ lw $a0,0x110($sp) /* f07a734: 1040000b */ beqz $v0,.PB0f07a764 /* f07a738: 8fa500a8 */ lw $a1,0xa8($sp) @@ -46258,7 +46258,7 @@ glabel var7f1aa5a8 /* f07a748: 84a40028 */ lh $a0,0x28($a1) /* f07a74c: afaf0014 */ sw $t7,0x14($sp) /* f07a750: afa00010 */ sw $zero,0x10($sp) -/* f07a754: 0fc4c3dd */ jal 0xf130f74 +/* f07a754: 0fc4c3dd */ jal sparksCreate /* f07a758: 00003825 */ move $a3,$zero /* f07a75c: 10000008 */ b .PB0f07a780 /* f07a760: 27a400a0 */ addiu $a0,$sp,0xa0 @@ -46267,12 +46267,12 @@ glabel var7f1aa5a8 /* f07a768: afa00014 */ sw $zero,0x14($sp) /* f07a76c: afa00010 */ sw $zero,0x10($sp) /* f07a770: 27a6013c */ addiu $a2,$sp,0x13c -/* f07a774: 0fc4c3dd */ jal 0xf130f74 +/* f07a774: 0fc4c3dd */ jal sparksCreate /* f07a778: 00003825 */ move $a3,$zero /* f07a77c: 27a400a0 */ addiu $a0,$sp,0xa0 .PB0f07a780: /* f07a780: 8fa500a8 */ lw $a1,0xa8($sp) -/* f07a784: 0fc2a04d */ jal 0xf0a8134 +/* f07a784: 0fc2a04d */ jal bgunPlayPropHitSound /* f07a788: 240600f2 */ li $a2,0xf2 /* f07a78c: 10000098 */ b .PB0f07a9f0 /* f07a790: 8fa40198 */ lw $a0,0x198($sp) @@ -46281,13 +46281,13 @@ glabel var7f1aa5a8 /* f07a798: afb90010 */ sw $t9,0x10($sp) /* f07a79c: 27a50158 */ addiu $a1,$sp,0x158 /* f07a7a0: 27a6013c */ addiu $a2,$sp,0x13c -/* f07a7a4: 0c00b8d4 */ jal 0x2e350 +/* f07a7a4: 0c00b8d4 */ jal cdTestAToB4 /* f07a7a8: 24070022 */ li $a3,0x22 /* f07a7ac: 14400007 */ bnez $v0,.PB0f07a7cc /* f07a7b0: 27a4013c */ addiu $a0,$sp,0x13c /* f07a7b4: 3c067f1b */ lui $a2,0x7f1b /* f07a7b8: 24c6bd20 */ addiu $a2,$a2,-17120 -/* f07a7bc: 0c00951f */ jal 0x2547c +/* f07a7bc: 0c00951f */ jal cdGetPos /* f07a7c0: 24052d29 */ li $a1,0x2d29 /* f07a7c4: 24080001 */ li $t0,0x1 /* f07a7c8: afa80148 */ sw $t0,0x148($sp) @@ -46334,7 +46334,7 @@ glabel var7f1aa5a8 /* f07a868: 00000000 */ nop /* f07a86c: 45020060 */ bc1fl .PB0f07a9f0 /* f07a870: 8fa40198 */ lw $a0,0x198($sp) -/* f07a874: 0c012ae4 */ jal 0x4ab90 +/* f07a874: 0c012ae4 */ jal sqrtf /* f07a878: 46007306 */ mov.s $f12,$f14 /* f07a87c: 3c014348 */ lui $at,0x4348 /* f07a880: 44816000 */ mtc1 $at,$f12 @@ -46369,12 +46369,12 @@ glabel var7f1aa5a8 /* f07a8f0: e7aa0140 */ swc1 $f10,0x140($sp) /* f07a8f4: c5680010 */ lwc1 $f8,0x10($t3) /* f07a8f8: afa00148 */ sw $zero,0x148($sp) -/* f07a8fc: 0c004be0 */ jal 0x12f80 +/* f07a8fc: 0c004be0 */ jal random /* f07a900: e7a80144 */ swc1 $f8,0x144($sp) /* f07a904: 304f0001 */ andi $t7,$v0,0x1 /* f07a908: 11e00012 */ beqz $t7,.PB0f07a954 /* f07a90c: 00000000 */ nop -/* f07a910: 0c004be0 */ jal 0x12f80 +/* f07a910: 0c004be0 */ jal random /* f07a914: 00000000 */ nop /* f07a918: 2401000a */ li $at,0xa /* f07a91c: 0041001b */ divu $zero,$v0,$at @@ -46393,7 +46393,7 @@ glabel var7f1aa5a8 /* f07a94c: 10000011 */ b .PB0f07a994 /* f07a950: e7aa0140 */ swc1 $f10,0x140($sp) .PB0f07a954: -/* f07a954: 0c004be0 */ jal 0x12f80 +/* f07a954: 0c004be0 */ jal random /* f07a958: 00000000 */ nop /* f07a95c: 2401000a */ li $at,0xa /* f07a960: 0041001b */ divu $zero,$v0,$at @@ -46413,7 +46413,7 @@ glabel var7f1aa5a8 .PB0f07a994: /* f07a994: 27a40118 */ addiu $a0,$sp,0x118 /* f07a998: 8fa50124 */ lw $a1,0x124($sp) -/* f07a99c: 0fc2a04d */ jal 0xf0a8134 +/* f07a99c: 0fc2a04d */ jal bgunPlayPropHitSound /* f07a9a0: 2406ffff */ li $a2,-1 /* f07a9a4: 3c013f00 */ lui $at,0x3f00 /* f07a9a8: 44815000 */ mtc1 $at,$f10 @@ -46428,7 +46428,7 @@ glabel var7f1aa5a8 /* f07a9cc: 27a6014c */ addiu $a2,$sp,0x14c /* f07a9d0: 27a70118 */ addiu $a3,$sp,0x118 /* f07a9d4: 44050000 */ mfc1 $a1,$f0 -/* f07a9d8: 0fc0d109 */ jal 0xf034424 +/* f07a9d8: 0fc0d109 */ jal chrDamageByImpact /* f07a9dc: 00000000 */ nop /* f07a9e0: 44809000 */ mtc1 $zero,$f18 /* f07a9e4: 8fad0194 */ lw $t5,0x194($sp) @@ -46436,7 +46436,7 @@ glabel var7f1aa5a8 .PB0f07a9ec: /* f07a9ec: 8fa40198 */ lw $a0,0x198($sp) .PB0f07a9f0: -/* f07a9f0: 0fc190d6 */ jal 0xf064358 +/* f07a9f0: 0fc190d6 */ jal propSetPerimEnabled /* f07a9f4: 24050001 */ li $a1,0x1 /* f07a9f8: 8fae018c */ lw $t6,0x18c($sp) /* f07a9fc: 8fab0188 */ lw $t3,0x188($sp) @@ -46461,9 +46461,9 @@ glabel var7f1aa5a8 /* f07aa3c: 13200024 */ beqz $t9,.PB0f07aad0 /* f07aa40: 27a7012c */ addiu $a3,$sp,0x12c /* f07aa44: afa00010 */ sw $zero,0x10($sp) -/* f07aa48: 0c0062e6 */ jal 0x18b98 +/* f07aa48: 0c0062e6 */ jal func00018148 /* f07aa4c: afa00014 */ sw $zero,0x14($sp) -/* f07aa50: 0fc4fe8e */ jal 0xf13fa38 +/* f07aa50: 0fc4fe8e */ jal chrIsUsingPaintball /* f07aa54: 8fa40110 */ lw $a0,0x110($sp) /* f07aa58: 1040000b */ beqz $v0,.PB0f07aa88 /* f07aa5c: 8faa0194 */ lw $t2,0x194($sp) @@ -46473,7 +46473,7 @@ glabel var7f1aa5a8 /* f07aa6c: 00002825 */ move $a1,$zero /* f07aa70: 27a6013c */ addiu $a2,$sp,0x13c /* f07aa74: 00003825 */ move $a3,$zero -/* f07aa78: 0fc4c3dd */ jal 0xf130f74 +/* f07aa78: 0fc4c3dd */ jal sparksCreate /* f07aa7c: afa00010 */ sw $zero,0x10($sp) /* f07aa80: 1000000f */ b .PB0f07aac0 /* f07aa84: 27a40118 */ addiu $a0,$sp,0x118 @@ -46491,13 +46491,13 @@ glabel var7f1aa5a8 /* f07aaa8: 27a6013c */ addiu $a2,$sp,0x13c /* f07aaac: 00003825 */ move $a3,$zero /* f07aab0: afa00010 */ sw $zero,0x10($sp) -/* f07aab4: 0fc4c3dd */ jal 0xf130f74 +/* f07aab4: 0fc4c3dd */ jal sparksCreate /* f07aab8: afa20014 */ sw $v0,0x14($sp) /* f07aabc: 27a40118 */ addiu $a0,$sp,0x118 .PB0f07aac0: /* f07aac0: 27a5013c */ addiu $a1,$sp,0x13c /* f07aac4: 2406ffff */ li $a2,-1 -/* f07aac8: 0fc2a219 */ jal 0xf0a8864 +/* f07aac8: 0fc2a219 */ jal bgunPlayBgHitSound /* f07aacc: 27a7012c */ addiu $a3,$sp,0x12c .PB0f07aad0: /* f07aad0: 8fac0128 */ lw $t4,0x128($sp) @@ -46524,7 +46524,7 @@ glabel var7f1aa5a8 /* f07ab24: afa30078 */ sw $v1,0x78($sp) /* f07ab28: 46065482 */ mul.s $f18,$f10,$f6 /* f07ab2c: 46088100 */ add.s $f4,$f16,$f8 -/* f07ab30: 0c012ae4 */ jal 0x4ab90 +/* f07ab30: 0c012ae4 */ jal sqrtf /* f07ab34: 46049300 */ add.s $f12,$f18,$f4 /* f07ab38: 44808000 */ mtc1 $zero,$f16 /* f07ab3c: 8fa30078 */ lw $v1,0x78($sp) @@ -46604,7 +46604,7 @@ glabel var7f1aa5a8 /* f07ac58: e4620024 */ swc1 $f2,0x24($v1) /* f07ac5c: afa30078 */ sw $v1,0x78($sp) .PB0f07ac60: -/* f07ac60: 0c004be0 */ jal 0x12f80 +/* f07ac60: 0c004be0 */ jal random /* f07ac64: e7ac007c */ swc1 $f12,0x7c($sp) /* f07ac68: 44822000 */ mtc1 $v0,$f4 /* f07ac6c: 8fa30078 */ lw $v1,0x78($sp) @@ -46641,7 +46641,7 @@ glabel var7f1aa5a8 /* f07ace0: 00000000 */ nop /* f07ace4: e4620024 */ swc1 $f2,0x24($v1) .PB0f07ace8: -/* f07ace8: 0c004be0 */ jal 0x12f80 +/* f07ace8: 0c004be0 */ jal random /* f07acec: afa30078 */ sw $v1,0x78($sp) /* f07acf0: 44829000 */ mtc1 $v0,$f18 /* f07acf4: 8fa30078 */ lw $v1,0x78($sp) @@ -46674,7 +46674,7 @@ glabel var7f1aa5a8 /* f07ad54: 1020002d */ beqz $at,.PB0f07ae0c /* f07ad58: 3406ffff */ li $a2,0xffff /* f07ad5c: afac0064 */ sw $t4,0x64($sp) -/* f07ad60: 0fc24943 */ jal 0xf09250c +/* f07ad60: 0fc24943 */ jal func0f0926bc /* f07ad64: 8fa40198 */ lw $a0,0x198($sp) /* f07ad68: 8fad0174 */ lw $t5,0x174($sp) /* f07ad6c: 8fae0194 */ lw $t6,0x194($sp) @@ -46711,7 +46711,7 @@ glabel var7f1aa5a8 /* f07ade0: e7a00024 */ swc1 $f0,0x24($sp) /* f07ade4: e7a00030 */ swc1 $f0,0x30($sp) /* f07ade8: e7a00034 */ swc1 $f0,0x34($sp) -/* f07adec: 0fc24e0e */ jal 0xf093838 +/* f07adec: 0fc24e0e */ jal func0f0939f8 /* f07adf0: e7a00038 */ swc1 $f0,0x38($sp) .PB0f07adf4: /* f07adf4: 3c0a800a */ lui $t2,0x800a @@ -46724,22 +46724,22 @@ glabel var7f1aa5a8 /* f07ae0c: 8fad0184 */ lw $t5,0x184($sp) .PB0f07ae10: /* f07ae10: 24050005 */ li $a1,0x5 -/* f07ae14: 0c006cdb */ jal 0x1b36c +/* f07ae14: 0c006cdb */ jal modelGetPart /* f07ae18: 8da40008 */ lw $a0,0x8($t5) /* f07ae1c: 10400005 */ beqz $v0,.PB0f07ae34 /* f07ae20: 00402825 */ move $a1,$v0 -/* f07ae24: 0c006d1b */ jal 0x1b46c +/* f07ae24: 0c006d1b */ jal modelGetNodeRwData /* f07ae28: 8fa40184 */ lw $a0,0x184($sp) /* f07ae2c: 8fae018c */ lw $t6,0x18c($sp) /* f07ae30: a44e0000 */ sh $t6,0x0($v0) .PB0f07ae34: /* f07ae34: 8fab0184 */ lw $t3,0x184($sp) /* f07ae38: 24050007 */ li $a1,0x7 -/* f07ae3c: 0c006cdb */ jal 0x1b36c +/* f07ae3c: 0c006cdb */ jal modelGetPart /* f07ae40: 8d640008 */ lw $a0,0x8($t3) /* f07ae44: 10400005 */ beqz $v0,.PB0f07ae5c /* f07ae48: 00402825 */ move $a1,$v0 -/* f07ae4c: 0c006d1b */ jal 0x1b46c +/* f07ae4c: 0c006d1b */ jal modelGetNodeRwData /* f07ae50: 8fa40184 */ lw $a0,0x184($sp) /* f07ae54: 8fb80188 */ lw $t8,0x188($sp) /* f07ae58: a4580000 */ sh $t8,0x0($v0) @@ -68350,7 +68350,7 @@ glabel var7f1abdf8pf /* f087858: a7a80098 */ sh $t0,0x98($sp) /* f08785c: afa600b0 */ sw $a2,0xb0($sp) /* f087860: 8fa500bc */ lw $a1,0xbc($sp) -/* f087864: 0fc21df6 */ jal 0xf0877d8 +/* f087864: 0fc21df6 */ jal func0f087888pf /* f087868: 8fa400ac */ lw $a0,0xac($sp) /* f08786c: 8fa600b0 */ lw $a2,0xb0($sp) /* f087870: 97a80098 */ lhu $t0,0x98($sp) @@ -68521,27 +68521,27 @@ glabel var7f1abdf8pf /* f087ab0: 00000000 */ nop /* f087ab4: 01002025 */ move $a0,$t0 /* f087ab8: afa60020 */ sw $a2,0x20($sp) -/* f087abc: 0fc5c06a */ jal 0xf1701a8 +/* f087abc: 0fc5c06a */ jal langGet /* f087ac0: afa90094 */ sw $t1,0x94($sp) /* f087ac4: 8fa40020 */ lw $a0,0x20($sp) -/* f087ac8: 0fc5c06a */ jal 0xf1701a8 +/* f087ac8: 0fc5c06a */ jal langGet /* f087acc: afa20024 */ sw $v0,0x24($sp) /* f087ad0: 3c057f1b */ lui $a1,0x7f1b /* f087ad4: 24a5bd4c */ addiu $a1,$a1,-17076 /* f087ad8: 27a4002c */ addiu $a0,$sp,0x2c /* f087adc: 8fa60024 */ lw $a2,0x24($sp) -/* f087ae0: 0c004e1d */ jal 0x13874 +/* f087ae0: 0c004e1d */ jal sprintf /* f087ae4: 00403825 */ move $a3,$v0 /* f087ae8: 8fa90094 */ lw $t1,0x94($sp) /* f087aec: 1000000a */ b .PB0f087b18 /* f087af0: 8faa00b4 */ lw $t2,0xb4($sp) .PB0f087af4: -/* f087af4: 0fc5c06a */ jal 0xf1701a8 +/* f087af4: 0fc5c06a */ jal langGet /* f087af8: afa90094 */ sw $t1,0x94($sp) /* f087afc: 3c057f1b */ lui $a1,0x7f1b /* f087b00: 24a5bd54 */ addiu $a1,$a1,-17068 /* f087b04: 27a4002c */ addiu $a0,$sp,0x2c -/* f087b08: 0c004e1d */ jal 0x13874 +/* f087b08: 0c004e1d */ jal sprintf /* f087b0c: 00403025 */ move $a2,$v0 /* f087b10: 8fa90094 */ lw $t1,0x94($sp) /* f087b14: 8faa00b4 */ lw $t2,0xb4($sp) @@ -68567,30 +68567,30 @@ glabel var7f1abdf8pf /* f087b54: 8fb900b8 */ lw $t9,0xb8($sp) /* f087b58: 1320000b */ beqz $t9,.PB0f087b88 /* f087b5c: 00000000 */ nop -/* f087b60: 0fc5c06a */ jal 0xf1701a8 +/* f087b60: 0fc5c06a */ jal langGet /* f087b64: 24045208 */ li $a0,0x5208 /* f087b68: 3c057f1b */ lui $a1,0x7f1b /* f087b6c: 24a5bd58 */ addiu $a1,$a1,-17064 /* f087b70: 8fa400a8 */ lw $a0,0xa8($sp) /* f087b74: 00403025 */ move $a2,$v0 -/* f087b78: 0c004e1d */ jal 0x13874 +/* f087b78: 0c004e1d */ jal sprintf /* f087b7c: 27a7002c */ addiu $a3,$sp,0x2c /* f087b80: 1000000f */ b .PB0f087bc0 /* f087b84: 8fbf0014 */ lw $ra,0x14($sp) .PB0f087b88: /* f087b88: 15400009 */ bnez $t2,.PB0f087bb0 /* f087b8c: 8fa400a8 */ lw $a0,0xa8($sp) -/* f087b90: 0fc5c06a */ jal 0xf1701a8 +/* f087b90: 0fc5c06a */ jal langGet /* f087b94: 25245200 */ addiu $a0,$t1,0x5200 /* f087b98: 8fa400a8 */ lw $a0,0xa8($sp) /* f087b9c: 00402825 */ move $a1,$v0 -/* f087ba0: 0c004e1d */ jal 0x13874 +/* f087ba0: 0c004e1d */ jal sprintf /* f087ba4: 27a6002c */ addiu $a2,$sp,0x2c /* f087ba8: 10000005 */ b .PB0f087bc0 /* f087bac: 8fbf0014 */ lw $ra,0x14($sp) .PB0f087bb0: /* f087bb0: 3c057f1b */ lui $a1,0x7f1b -/* f087bb4: 0c004e1d */ jal 0x13874 +/* f087bb4: 0c004e1d */ jal sprintf /* f087bb8: 24a5bd60 */ addiu $a1,$a1,-17056 .PB0f087bbc: /* f087bbc: 8fbf0014 */ lw $ra,0x14($sp) diff --git a/src/game/sight.c b/src/game/sight.c index 7650845e3..c549e766a 100644 --- a/src/game/sight.c +++ b/src/game/sight.c @@ -2520,7 +2520,7 @@ glabel var7f1af0ccpf /* f0d8edc: 02002025 */ move $a0,$s0 /* f0d8ee0: 440f3000 */ mfc1 $t7,$f6 /* f0d8ee4: afb900cc */ sw $t9,0xcc($sp) -/* f0d8ee8: 0fc552fc */ jal 0xf154bf0 +/* f0d8ee8: 0fc552fc */ jal gfxSetPrimColour /* f0d8eec: afaf00c8 */ sw $t7,0xc8($sp) /* f0d8ef0: 3c038008 */ lui $v1,0x8008 /* f0d8ef4: 8fab00d4 */ lw $t3,0xd4($sp) @@ -2586,10 +2586,10 @@ glabel var7f1af0ccpf /* f0d8fe4: 31d803ff */ andi $t8,$t6,0x3ff /* f0d8fe8: 0018cb80 */ sll $t9,$t8,0xe /* f0d8fec: 03297825 */ or $t7,$t9,$t1 -/* f0d8ff0: 0fc55313 */ jal 0xf154c4c +/* f0d8ff0: 0fc55313 */ jal func0f153838 /* f0d8ff4: ac4f0014 */ sw $t7,0x14($v0) /* f0d8ff8: 00402025 */ move $a0,$v0 -/* f0d8ffc: 0fc552fc */ jal 0xf154bf0 +/* f0d8ffc: 0fc552fc */ jal gfxSetPrimColour /* f0d9000: 8fa500e4 */ lw $a1,0xe4($sp) /* f0d9004: 8fb800dc */ lw $t8,0xdc($sp) /* f0d9008: 8fb900c8 */ lw $t9,0xc8($sp) @@ -2840,7 +2840,7 @@ glabel var7f1af0ccpf /* f0d93dc: 332f03ff */ andi $t7,$t9,0x3ff /* f0d93e0: 000f7380 */ sll $t6,$t7,0xe /* f0d93e4: 01dfc025 */ or $t8,$t6,$ra -/* f0d93e8: 0fc55313 */ jal 0xf154c4c +/* f0d93e8: 0fc55313 */ jal func0f153838 /* f0d93ec: ac580004 */ sw $t8,0x4($v0) /* f0d93f0: 8fbf004c */ lw $ra,0x4c($sp) /* f0d93f4: d7b40018 */ ldc1 $f20,0x18($sp) diff --git a/src/game/sparks/sparks.c b/src/game/sparks/sparks.c index c3d1e3719..a79e10104 100644 --- a/src/game/sparks/sparks.c +++ b/src/game/sparks/sparks.c @@ -325,7 +325,7 @@ glabel func0f12f6c0 /* f130c64: e6000004 */ swc1 $f0,0x4($s0) /* f130c68: e6000008 */ swc1 $f0,0x8($s0) /* f130c6c: 00a08825 */ move $s1,$a1 -/* f130c70: 0c004be0 */ jal 0x12f80 +/* f130c70: 0c004be0 */ jal random /* f130c74: e7a00020 */ swc1 $f0,0x20($sp) /* f130c78: 96230000 */ lhu $v1,0x0($s1) /* f130c7c: c7ae0020 */ lwc1 $f14,0x20($sp) @@ -340,7 +340,7 @@ glabel func0f12f6c0 /* f130ca0: 0007000d */ break 0x7 .PB0f130ca4: /* f130ca4: 468021a0 */ cvt.s.w $f6,$f4 -/* f130ca8: 0c004be0 */ jal 0x12f80 +/* f130ca8: 0c004be0 */ jal random /* f130cac: e606000c */ swc1 $f6,0xc($s0) /* f130cb0: 96230000 */ lhu $v1,0x0($s1) /* f130cb4: c7ae0020 */ lwc1 $f14,0x20($sp) @@ -355,7 +355,7 @@ glabel func0f12f6c0 /* f130cd8: 0007000d */ break 0x7 .PB0f130cdc: /* f130cdc: 468042a0 */ cvt.s.w $f10,$f8 -/* f130ce0: 0c004be0 */ jal 0x12f80 +/* f130ce0: 0c004be0 */ jal random /* f130ce4: e60a0010 */ swc1 $f10,0x10($s0) /* f130ce8: 96230000 */ lhu $v1,0x0($s1) /* f130cec: c6100010 */ lwc1 $f16,0x10($s0) @@ -408,7 +408,7 @@ glabel func0f12f6c0 /* f130d94: 46108482 */ mul.s $f18,$f16,$f16 /* f130d98: 46125100 */ add.s $f4,$f10,$f18 /* f130d9c: 46000182 */ mul.s $f6,$f0,$f0 -/* f130da0: 0c012ae4 */ jal 0x4ab90 +/* f130da0: 0c012ae4 */ jal sqrtf /* f130da4: 46043300 */ add.s $f12,$f6,$f4 /* f130da8: c7ae0020 */ lwc1 $f14,0x20($sp) /* f130dac: c608000c */ lwc1 $f8,0xc($s0) @@ -472,7 +472,7 @@ glabel func0f12f6c0 /* f130e8c: 318d0001 */ andi $t5,$t4,0x1 /* f130e90: 51a0000d */ beqzl $t5,.PB0f130ec8 /* f130e94: 96380010 */ lhu $t8,0x10($s1) -/* f130e98: 0c004be0 */ jal 0x12f80 +/* f130e98: 0c004be0 */ jal random /* f130e9c: 00000000 */ nop /* f130ea0: 962e0010 */ lhu $t6,0x10($s1) /* f130ea4: 004e001b */ divu $zero,$v0,$t6 diff --git a/src/game/title.c b/src/game/title.c index 899874500..333b6fda7 100644 --- a/src/game/title.c +++ b/src/game/title.c @@ -304,7 +304,7 @@ GLOBAL_ASM( glabel titleInitLegal /* f016424: 27bdffd8 */ addiu $sp,$sp,-40 /* f016428: afbf0024 */ sw $ra,0x24($sp) -/* f01642c: 0fc5bb4c */ jal 0xf16ed30 +/* f01642c: 0fc5bb4c */ jal musicQueueStopAllEvent /* f016430: 00000000 */ nop /* f016434: 240e0001 */ li $t6,0x1 /* f016438: 3c018006 */ lui $at,0x8006 @@ -331,7 +331,7 @@ glabel titleInitLegal /* f01648c: 24058113 */ li $a1,-32493 /* f016490: 00003025 */ move $a2,$zero /* f016494: 2407ffff */ li $a3,-1 -/* f016498: 0c004254 */ jal 0x10950 +/* f016498: 0c004254 */ jal sndStart /* f01649c: e7a40014 */ swc1 $f4,0x14($sp) .PB0f0164a0: /* f0164a0: 8fbf0024 */ lw $ra,0x24($sp) @@ -524,10 +524,10 @@ glabel var7f1aa08cnb /* f0167cc: 8d8c3dec */ lw $t4,0x3dec($t4) /* f0167d0: 5180016f */ beqzl $t4,.PB0f016d90 /* f0167d4: 8fbf005c */ lw $ra,0x5c($sp) -/* f0167d8: 0fc06c14 */ jal 0xf01b050 +/* f0167d8: 0fc06c14 */ jal func0f01afc0 /* f0167dc: 8fa40128 */ lw $a0,0x128($sp) /* f0167e0: afa20128 */ sw $v0,0x128($sp) -/* f0167e4: 0fc5528f */ jal 0xf154a3c +/* f0167e4: 0fc5528f */ jal func0f153628 /* f0167e8: 00402025 */ move $a0,$v0 /* f0167ec: 3c0d8006 */ lui $t5,0x8006 /* f0167f0: 3c108006 */ lui $s0,0x8006 @@ -600,9 +600,9 @@ glabel var7f1aa08cnb /* f0168e8: 24010003 */ li $at,0x3 /* f0168ec: 54610015 */ bnel $v1,$at,.PB0f016944 /* f0168f0: 24010004 */ li $at,0x4 -/* f0168f4: 0fc552e5 */ jal 0xf154b94 +/* f0168f4: 0fc552e5 */ jal func0f153780 /* f0168f8: 8fa40128 */ lw $a0,0x128($sp) -/* f0168fc: 0c002e4d */ jal 0xb934 +/* f0168fc: 0c002e4d */ jal viGetWidth /* f016900: afa20128 */ sw $v0,0x128($sp) /* f016904: 86060002 */ lh $a2,0x2($s0) /* f016908: 3c0c7f7f */ lui $t4,0x7f7f @@ -612,10 +612,10 @@ glabel var7f1aa08cnb /* f016918: afae0010 */ sw $t6,0x10($sp) /* f01691c: afac0014 */ sw $t4,0x14($sp) /* f016920: 8fa40128 */ lw $a0,0x128($sp) -/* f016924: 0fc55392 */ jal 0xf154e48 +/* f016924: 0fc55392 */ jal func0f153a34 /* f016928: 00403825 */ move $a3,$v0 /* f01692c: afa20128 */ sw $v0,0x128($sp) -/* f016930: 0fc5528f */ jal 0xf154a3c +/* f016930: 0fc5528f */ jal func0f153628 /* f016934: 00402025 */ move $a0,$v0 /* f016938: 1000010c */ b .PB0f016d6c /* f01693c: afa20128 */ sw $v0,0x128($sp) @@ -623,7 +623,7 @@ glabel var7f1aa08cnb .PB0f016944: /* f016944: 54610075 */ bnel $v1,$at,.PB0f016b1c /* f016948: 24010007 */ li $at,0x7 -/* f01694c: 0fc552e5 */ jal 0xf154b94 +/* f01694c: 0fc552e5 */ jal func0f153780 /* f016950: 8fa40128 */ lw $a0,0x128($sp) /* f016954: 244d0008 */ addiu $t5,$v0,0x8 /* f016958: afad0128 */ sw $t5,0x128($sp) @@ -669,7 +669,7 @@ glabel var7f1aa08cnb /* f0169f8: 27a40128 */ addiu $a0,$sp,0x128 /* f0169fc: 24060001 */ li $a2,0x1 /* f016a00: 00003825 */ move $a3,$zero -/* f016a04: 0fc2cf74 */ jal 0xf0b3dd0 +/* f016a04: 0fc2cf74 */ jal func0f0b39c0 /* f016a08: 24a50234 */ addiu $a1,$a1,0x234 /* f016a0c: 8fab0128 */ lw $t3,0x128($sp) /* f016a10: 3c0eba00 */ lui $t6,0xba00 @@ -734,7 +734,7 @@ glabel var7f1aa08cnb /* f016afc: 3c0eb300 */ lui $t6,0xb300 /* f016b00: af0e0000 */ sw $t6,0x0($t8) /* f016b04: af0d0004 */ sw $t5,0x4($t8) -/* f016b08: 0fc5528f */ jal 0xf154a3c +/* f016b08: 0fc5528f */ jal func0f153628 /* f016b0c: 8fa40128 */ lw $a0,0x128($sp) /* f016b10: 10000096 */ b .PB0f016d6c /* f016b14: afa20128 */ sw $v0,0x128($sp) @@ -742,7 +742,7 @@ glabel var7f1aa08cnb .PB0f016b1c: /* f016b1c: 54610075 */ bnel $v1,$at,.PB0f016cf4 /* f016b20: 86020000 */ lh $v0,0x0($s0) -/* f016b24: 0fc552e5 */ jal 0xf154b94 +/* f016b24: 0fc552e5 */ jal func0f153780 /* f016b28: 8fa40128 */ lw $a0,0x128($sp) /* f016b2c: 24590008 */ addiu $t9,$v0,0x8 /* f016b30: afb90128 */ sw $t9,0x128($sp) @@ -788,7 +788,7 @@ glabel var7f1aa08cnb /* f016bd0: 27a40128 */ addiu $a0,$sp,0x128 /* f016bd4: 24060001 */ li $a2,0x1 /* f016bd8: 00003825 */ move $a3,$zero -/* f016bdc: 0fc2cf74 */ jal 0xf0b3dd0 +/* f016bdc: 0fc2cf74 */ jal func0f0b39c0 /* f016be0: 24a5024c */ addiu $a1,$a1,0x24c /* f016be4: 8fb80128 */ lw $t8,0x128($sp) /* f016be8: 3c0eba00 */ lui $t6,0xba00 @@ -853,7 +853,7 @@ glabel var7f1aa08cnb /* f016cd4: 3c0eb300 */ lui $t6,0xb300 /* f016cd8: ad6e0000 */ sw $t6,0x0($t3) /* f016cdc: ad790004 */ sw $t9,0x4($t3) -/* f016ce0: 0fc5528f */ jal 0xf154a3c +/* f016ce0: 0fc5528f */ jal func0f153628 /* f016ce4: 8fa40128 */ lw $a0,0x128($sp) /* f016ce8: 10000020 */ b .PB0f016d6c /* f016cec: afa20128 */ sw $v0,0x128($sp) @@ -868,13 +868,13 @@ glabel var7f1aa08cnb .PB0f016d0c: /* f016d0c: 860c0002 */ lh $t4,0x2($s0) /* f016d10: afac00d4 */ sw $t4,0xd4($sp) -/* f016d14: 0fc5c06a */ jal 0xf1701a8 +/* f016d14: 0fc5c06a */ jal langGet /* f016d18: 9604000a */ lhu $a0,0xa($s0) -/* f016d1c: 0c002e4d */ jal 0xb934 +/* f016d1c: 0c002e4d */ jal viGetWidth /* f016d20: 00409825 */ move $s3,$v0 /* f016d24: 0002a400 */ sll $s4,$v0,0x10 /* f016d28: 00146c03 */ sra $t5,$s4,0x10 -/* f016d2c: 0c002e51 */ jal 0xb944 +/* f016d2c: 0c002e51 */ jal viGetHeight /* f016d30: 01a0a025 */ move $s4,$t5 /* f016d34: 8fa40128 */ lw $a0,0x128($sp) /* f016d38: 27a500d8 */ addiu $a1,$sp,0xd8 @@ -886,7 +886,7 @@ glabel var7f1aa08cnb /* f016d50: afb4001c */ sw $s4,0x1c($sp) /* f016d54: afa20020 */ sw $v0,0x20($sp) /* f016d58: afa00024 */ sw $zero,0x24($sp) -/* f016d5c: 0fc55e10 */ jal 0xf157840 +/* f016d5c: 0fc55e10 */ jal textRenderProjected /* f016d60: afa00028 */ sw $zero,0x28($sp) /* f016d64: afa20128 */ sw $v0,0x128($sp) /* f016d68: 8fb300d8 */ lw $s3,0xd8($sp) @@ -896,7 +896,7 @@ glabel var7f1aa08cnb /* f016d74: 0218082b */ sltu $at,$s0,$t8 /* f016d78: 5420fea9 */ bnezl $at,.PB0f016820 /* f016d7c: 86030008 */ lh $v1,0x8($s0) -/* f016d80: 0fc552e5 */ jal 0xf154b94 +/* f016d80: 0fc552e5 */ jal func0f153780 /* f016d84: 8fa40128 */ lw $a0,0x128($sp) /* f016d88: afa20128 */ sw $v0,0x128($sp) /* f016d8c: 8fbf005c */ lw $ra,0x5c($sp) @@ -3577,7 +3577,7 @@ glabel var7f1a8468 /* f017db8: 44051000 */ mfc1 $a1,$f2 /* f017dbc: 44070000 */ mfc1 $a3,$f0 /* f017dc0: e7a00010 */ swc1 $f0,0x10($sp) -/* f017dc4: 0fc1b6b9 */ jal 0xf06dae4 +/* f017dc4: 0fc1b6b9 */ jal applySpeed /* f017dc8: e7aa0014 */ swc1 $f10,0x14($sp) /* f017dcc: 3c028006 */ lui $v0,0x8006 /* f017dd0: 3c0b8006 */ lui $t3,0x8006 @@ -3760,7 +3760,7 @@ glabel var7f1a8468 /* f018058: 44059000 */ mfc1 $a1,$f18 /* f01805c: 44070000 */ mfc1 $a3,$f0 /* f018060: e7a00010 */ swc1 $f0,0x10($sp) -/* f018064: 0fc1b736 */ jal 0xf06dcd8 +/* f018064: 0fc1b736 */ jal applyRotation /* f018068: e7aa0014 */ swc1 $f10,0x14($sp) /* f01806c: 3c017f1b */ lui $at,0x7f1b /* f018070: c42ca104 */ lwc1 $f12,-0x5efc($at) @@ -4025,9 +4025,9 @@ glabel var7f1a8468 .PB0f018438: /* f018438: 8fa40330 */ lw $a0,0x330($sp) .PB0f01843c: -/* f01843c: 0c002f0c */ jal 0xbc30 +/* f01843c: 0c002f0c */ jal viSetFillColour /* f018440: 00002825 */ move $a1,$zero -/* f018444: 0c002bfc */ jal 0xaff0 +/* f018444: 0c002bfc */ jal viFillBuffer /* f018448: 00402025 */ move $a0,$v0 /* f01844c: 3c0e8006 */ lui $t6,0x8006 /* f018450: 8dce3e8c */ lw $t6,0x3e8c($t6) @@ -4038,7 +4038,7 @@ glabel var7f1a8468 /* f018464: 10000272 */ b .PB0f018e30 /* f018468: 8fbf0034 */ lw $ra,0x34($sp) .PB0f01846c: -/* f01846c: 0fc5a408 */ jal 0xf169020 +/* f01846c: 0fc5a408 */ jal gfxAllocateLookAt /* f018470: afa30330 */ sw $v1,0x330($sp) /* f018474: 44809000 */ mtc1 $zero,$f18 /* f018478: 3c01457a */ lui $at,0x457a @@ -4056,7 +4056,7 @@ glabel var7f1a8468 /* f0184a8: e7b20020 */ swc1 $f18,0x20($sp) /* f0184ac: e7b20028 */ swc1 $f18,0x28($sp) /* f0184b0: e7a40010 */ swc1 $f4,0x10($sp) -/* f0184b4: 0c0011b7 */ jal 0x46dc +/* f0184b4: 0c0011b7 */ jal guLookAtReflect /* f0184b8: e7a60024 */ swc1 $f6,0x24($sp) /* f0184bc: 8fa30330 */ lw $v1,0x330($sp) /* f0184c0: 3c017f1b */ lui $at,0x7f1b @@ -4104,10 +4104,10 @@ glabel var7f1a8468 /* f018568: a0a20008 */ sb $v0,0x8($a1) /* f01856c: e7ac00e4 */ swc1 $f12,0xe4($sp) /* f018570: e7b000e0 */ swc1 $f16,0xe0($sp) -/* f018574: 0c006b8b */ jal 0x1ae2c +/* f018574: 0c006b8b */ jal sinf /* f018578: afa60330 */ sw $a2,0x330($sp) /* f01857c: e7a00050 */ swc1 $f0,0x50($sp) -/* f018580: 0c006b88 */ jal 0x1ae20 +/* f018580: 0c006b88 */ jal cosf /* f018584: c7ac00e0 */ lwc1 $f12,0xe0($sp) /* f018588: 3c0142fe */ lui $at,0x42fe /* f01858c: 44815000 */ mtc1 $at,$f10 @@ -4119,7 +4119,7 @@ glabel var7f1a8468 /* f0185a4: 46060202 */ mul.s $f8,$f0,$f6 /* f0185a8: 4600428d */ trunc.w.s $f10,$f8 /* f0185ac: 44195000 */ mfc1 $t9,$f10 -/* f0185b0: 0c006b8b */ jal 0x1ae2c +/* f0185b0: 0c006b8b */ jal sinf /* f0185b4: a0393c48 */ sb $t9,0x3c48($at) /* f0185b8: 3c0142fe */ lui $at,0x42fe /* f0185bc: 44812000 */ mtc1 $at,$f4 @@ -4128,10 +4128,10 @@ glabel var7f1a8468 /* f0185c8: 46040182 */ mul.s $f6,$f0,$f4 /* f0185cc: 4600320d */ trunc.w.s $f8,$f6 /* f0185d0: 440e4000 */ mfc1 $t6,$f8 -/* f0185d4: 0c006b88 */ jal 0x1ae20 +/* f0185d4: 0c006b88 */ jal cosf /* f0185d8: a02e3c49 */ sb $t6,0x3c49($at) /* f0185dc: e7a00050 */ swc1 $f0,0x50($sp) -/* f0185e0: 0c006b88 */ jal 0x1ae20 +/* f0185e0: 0c006b88 */ jal cosf /* f0185e4: c7ac00e0 */ lwc1 $f12,0xe0($sp) /* f0185e8: 3c0142fe */ lui $at,0x42fe /* f0185ec: 44815000 */ mtc1 $at,$f10 @@ -4155,7 +4155,7 @@ glabel var7f1a8468 /* f018634: a0393c4a */ sb $t9,0x3c4a($at) /* f018638: 3c013f80 */ lui $at,0x3f80 /* f01863c: 44812000 */ mtc1 $at,$f4 -/* f018640: 0c005d4d */ jal 0x17534 +/* f018640: 0c005d4d */ jal mtx00016ae4 /* f018644: e7a40020 */ swc1 $f4,0x20($sp) /* f018648: 3c0f8006 */ lui $t7,0x8006 /* f01864c: 8def3e80 */ lw $t7,0x3e80($t7) @@ -4172,22 +4172,22 @@ glabel var7f1a8468 /* f018674: afb8022c */ sw $t8,0x22c($sp) .PB0f018678: /* f018678: 3c018006 */ lui $at,0x8006 -/* f01867c: 0c005b71 */ jal 0x16dc4 +/* f01867c: 0c005b71 */ jal mtx4LoadYRotation /* f018680: c42c3e68 */ lwc1 $f12,0x3e68($at) /* f018684: 3c018006 */ lui $at,0x8006 /* f018688: c42c3e70 */ lwc1 $f12,0x3e70($at) -/* f01868c: 0c005b4e */ jal 0x16d38 +/* f01868c: 0c005b4e */ jal mtx4LoadXRotation /* f018690: 27a501a8 */ addiu $a1,$sp,0x1a8 /* f018694: 27a401a8 */ addiu $a0,$sp,0x1a8 -/* f018698: 0c005913 */ jal 0x1644c +/* f018698: 0c005913 */ jal mtx4MultMtx4InPlace /* f01869c: 27a501e8 */ addiu $a1,$sp,0x1e8 /* f0186a0: 27a402b0 */ addiu $a0,$sp,0x2b0 /* f0186a4: 27a501e8 */ addiu $a1,$sp,0x1e8 -/* f0186a8: 0c005914 */ jal 0x16450 +/* f0186a8: 0c005914 */ jal mtx4MultMtx4 /* f0186ac: 27a60270 */ addiu $a2,$sp,0x270 /* f0186b0: 3c018006 */ lui $at,0x8006 /* f0186b4: c42c3e78 */ lwc1 $f12,0x3e78($at) -/* f0186b8: 0c005a55 */ jal 0x16954 +/* f0186b8: 0c005a55 */ jal mtx00015f04 /* f0186bc: 27a50270 */ addiu $a1,$sp,0x270 /* f0186c0: 3c01437f */ lui $at,0x437f /* f0186c4: 44813000 */ mtc1 $at,$f6 @@ -4241,7 +4241,7 @@ glabel var7f1a8468 /* f018778: a0620000 */ sb $v0,0x0($v1) /* f01877c: afa000dc */ sw $zero,0xdc($sp) /* f018780: afa000d8 */ sw $zero,0xd8($sp) -/* f018784: 0c006cdb */ jal 0x1b36c +/* f018784: 0c006cdb */ jal modelGetPart /* f018788: 8dc40008 */ lw $a0,0x8($t6) /* f01878c: 10400027 */ beqz $v0,.PB0f01882c /* f018790: 00402825 */ move $a1,$v0 @@ -4253,10 +4253,10 @@ glabel var7f1a8468 /* f0187a8: 94cf0016 */ lhu $t7,0x16($a2) /* f0187ac: afa60164 */ sw $a2,0x164($sp) /* f0187b0: 25ee0001 */ addiu $t6,$t7,0x1 -/* f0187b4: 0c006d1b */ jal 0x1b46c +/* f0187b4: 0c006d1b */ jal modelGetNodeRwData /* f0187b8: afae00d8 */ sw $t6,0xd8($sp) /* f0187bc: afa20160 */ sw $v0,0x160($sp) -/* f0187c0: 0fc5a419 */ jal 0xf169064 +/* f0187c0: 0fc5a419 */ jal gfxAllocate /* f0187c4: 24040028 */ li $a0,0x28 /* f0187c8: 8fb80160 */ lw $t8,0x160($sp) /* f0187cc: 8fa60164 */ lw $a2,0x164($sp) @@ -4286,7 +4286,7 @@ glabel var7f1a8468 .PB0f01882c: /* f01882c: 8fb9022c */ lw $t9,0x22c($sp) /* f018830: 24050004 */ li $a1,0x4 -/* f018834: 0c006cdb */ jal 0x1b36c +/* f018834: 0c006cdb */ jal modelGetPart /* f018838: 8f240008 */ lw $a0,0x8($t9) /* f01883c: 10400037 */ beqz $v0,.PB0f01891c /* f018840: 00402825 */ move $a1,$v0 @@ -4302,10 +4302,10 @@ glabel var7f1a8468 /* f018868: afa60164 */ sw $a2,0x164($sp) /* f01886c: 01eec021 */ addu $t8,$t7,$t6 /* f018870: 27190001 */ addiu $t9,$t8,0x1 -/* f018874: 0c006d1b */ jal 0x1b46c +/* f018874: 0c006d1b */ jal modelGetNodeRwData /* f018878: afb900d8 */ sw $t9,0xd8($sp) /* f01887c: afa20160 */ sw $v0,0x160($sp) -/* f018880: 0fc5a419 */ jal 0xf169064 +/* f018880: 0fc5a419 */ jal gfxAllocate /* f018884: 24040028 */ li $a0,0x28 /* f018888: 8faf0160 */ lw $t7,0x160($sp) /* f01888c: 8fa60164 */ lw $a2,0x164($sp) @@ -4348,7 +4348,7 @@ glabel var7f1a8468 .PB0f01891c: /* f01891c: 8fb8022c */ lw $t8,0x22c($sp) /* f018920: 24050006 */ li $a1,0x6 -/* f018924: 0c006cdb */ jal 0x1b36c +/* f018924: 0c006cdb */ jal modelGetPart /* f018928: 8f040008 */ lw $a0,0x8($t8) /* f01892c: 10400037 */ beqz $v0,.PB0f018a0c /* f018930: 00402825 */ move $a1,$v0 @@ -4364,10 +4364,10 @@ glabel var7f1a8468 /* f018958: afa60164 */ sw $a2,0x164($sp) /* f01895c: 032f7021 */ addu $t6,$t9,$t7 /* f018960: 25d80001 */ addiu $t8,$t6,0x1 -/* f018964: 0c006d1b */ jal 0x1b46c +/* f018964: 0c006d1b */ jal modelGetNodeRwData /* f018968: afb800d8 */ sw $t8,0xd8($sp) /* f01896c: afa20160 */ sw $v0,0x160($sp) -/* f018970: 0fc5a419 */ jal 0xf169064 +/* f018970: 0fc5a419 */ jal gfxAllocate /* f018974: 24040028 */ li $a0,0x28 /* f018978: 8fb90160 */ lw $t9,0x160($sp) /* f01897c: 8fa60164 */ lw $a2,0x164($sp) @@ -4410,7 +4410,7 @@ glabel var7f1a8468 .PB0f018a0c: /* f018a0c: 8fae022c */ lw $t6,0x22c($sp) /* f018a10: 24050008 */ li $a1,0x8 -/* f018a14: 0c006cdb */ jal 0x1b36c +/* f018a14: 0c006cdb */ jal modelGetPart /* f018a18: 8dc40008 */ lw $a0,0x8($t6) /* f018a1c: 10400037 */ beqz $v0,.PB0f018afc /* f018a20: 00402825 */ move $a1,$v0 @@ -4426,10 +4426,10 @@ glabel var7f1a8468 /* f018a48: afa60164 */ sw $a2,0x164($sp) /* f018a4c: 03197821 */ addu $t7,$t8,$t9 /* f018a50: 25ee0001 */ addiu $t6,$t7,0x1 -/* f018a54: 0c006d1b */ jal 0x1b46c +/* f018a54: 0c006d1b */ jal modelGetNodeRwData /* f018a58: afae00d8 */ sw $t6,0xd8($sp) /* f018a5c: afa20160 */ sw $v0,0x160($sp) -/* f018a60: 0fc5a419 */ jal 0xf169064 +/* f018a60: 0fc5a419 */ jal gfxAllocate /* f018a64: 24040028 */ li $a0,0x28 /* f018a68: 8fb80160 */ lw $t8,0x160($sp) /* f018a6c: 8fa60164 */ lw $a2,0x164($sp) @@ -4470,10 +4470,10 @@ glabel var7f1a8468 /* f018af4: ac590000 */ sw $t9,0x0($v0) /* f018af8: ac400004 */ sw $zero,0x4($v0) .PB0f018afc: -/* f018afc: 0fc5a3f5 */ jal 0xf168fd4 +/* f018afc: 0fc5a3f5 */ jal gfxAllocateVertices /* f018b00: 8fa400dc */ lw $a0,0xdc($sp) /* f018b04: afa20044 */ sw $v0,0x44($sp) -/* f018b08: 0fc5a40f */ jal 0xf16903c +/* f018b08: 0fc5a40f */ jal gfxAllocateColours /* f018b0c: 8fa400d8 */ lw $a0,0xd8($sp) /* f018b10: 3c013f80 */ lui $at,0x3f80 /* f018b14: 44812000 */ mtc1 $at,$f4 @@ -4490,7 +4490,7 @@ glabel var7f1a8468 /* f018b40: 8fa5022c */ lw $a1,0x22c($sp) /* f018b44: afa20020 */ sw $v0,0x20($sp) /* f018b48: afb8001c */ sw $t8,0x1c($sp) -/* f018b4c: 0fc05cb5 */ jal 0xf0172d4 +/* f018b4c: 0fc05cb5 */ jal titleRenderPdLogoModel /* f018b50: e7a40014 */ swc1 $f4,0x14($sp) /* f018b54: 3c19bc00 */ lui $t9,0xbc00 /* f018b58: 3c0f8000 */ lui $t7,0x8000 @@ -4521,21 +4521,21 @@ glabel var7f1a8468 /* f018bbc: 8f0f0004 */ lw $t7,0x4($t8) /* f018bc0: ac8f0004 */ sw $t7,0x4($a0) /* f018bc4: 8f010008 */ lw $at,0x8($t8) -/* f018bc8: 0c005c4b */ jal 0x1712c +/* f018bc8: 0c005c4b */ jal mtx4LoadTranslation /* f018bcc: ac810008 */ sw $at,0x8($a0) /* f018bd0: 3c013f80 */ lui $at,0x3f80 /* f018bd4: 44813000 */ mtc1 $at,$f6 /* f018bd8: c7a8013c */ lwc1 $f8,0x13c($sp) /* f018bdc: 27a501e8 */ addiu $a1,$sp,0x1e8 -/* f018be0: 0c005a76 */ jal 0x169d8 +/* f018be0: 0c005a76 */ jal mtx00015f88 /* f018be4: 46083300 */ add.s $f12,$f6,$f8 /* f018be8: 27a402b0 */ addiu $a0,$sp,0x2b0 /* f018bec: 27a501e8 */ addiu $a1,$sp,0x1e8 -/* f018bf0: 0c005914 */ jal 0x16450 +/* f018bf0: 0c005914 */ jal mtx4MultMtx4 /* f018bf4: 27a60230 */ addiu $a2,$sp,0x230 /* f018bf8: 3c017f1b */ lui $at,0x7f1b /* f018bfc: c42ca128 */ lwc1 $f12,-0x5ed8($at) -/* f018c00: 0c005a55 */ jal 0x16954 +/* f018c00: 0c005a55 */ jal mtx00015f04 /* f018c04: 27a50230 */ addiu $a1,$sp,0x230 /* f018c08: 3c028006 */ lui $v0,0x8006 /* f018c0c: 8c423eb8 */ lw $v0,0x3eb8($v0) @@ -4573,7 +4573,7 @@ glabel var7f1a8468 /* f018c88: e7a00014 */ swc1 $f0,0x14($sp) /* f018c8c: afa30018 */ sw $v1,0x18($sp) /* f018c90: afaf0020 */ sw $t7,0x20($sp) -/* f018c94: 0fc05cb5 */ jal 0xf0172d4 +/* f018c94: 0fc05cb5 */ jal titleRenderPdLogoModel /* f018c98: afb8001c */ sw $t8,0x1c($sp) /* f018c9c: 10000062 */ b .PB0f018e28 /* f018ca0: afa20330 */ sw $v0,0x330($sp) @@ -4612,7 +4612,7 @@ glabel var7f1a8468 /* f018d1c: afa30018 */ sw $v1,0x18($sp) /* f018d20: afaf0020 */ sw $t7,0x20($sp) /* f018d24: afb8001c */ sw $t8,0x1c($sp) -/* f018d28: 0fc05cb5 */ jal 0xf0172d4 +/* f018d28: 0fc05cb5 */ jal titleRenderPdLogoModel /* f018d2c: e7aa0014 */ swc1 $f10,0x14($sp) /* f018d30: 1000003d */ b .PB0f018e28 /* f018d34: afa20330 */ sw $v0,0x330($sp) @@ -4650,7 +4650,7 @@ glabel var7f1a8468 /* f018dac: afa30018 */ sw $v1,0x18($sp) /* f018db0: afaf0020 */ sw $t7,0x20($sp) /* f018db4: afb8001c */ sw $t8,0x1c($sp) -/* f018db8: 0fc05cb5 */ jal 0xf0172d4 +/* f018db8: 0fc05cb5 */ jal titleRenderPdLogoModel /* f018dbc: e7a60014 */ swc1 $f6,0x14($sp) /* f018dc0: 10000019 */ b .PB0f018e28 /* f018dc4: afa20330 */ sw $v0,0x330($sp) @@ -4676,7 +4676,7 @@ glabel var7f1a8468 /* f018e10: afa30018 */ sw $v1,0x18($sp) /* f018e14: afaf0020 */ sw $t7,0x20($sp) /* f018e18: e7a80014 */ swc1 $f8,0x14($sp) -/* f018e1c: 0fc05cb5 */ jal 0xf0172d4 +/* f018e1c: 0fc05cb5 */ jal titleRenderPdLogoModel /* f018e20: afb8001c */ sw $t8,0x1c($sp) /* f018e24: afa20330 */ sw $v0,0x330($sp) .PB0f018e28: diff --git a/src/game/training/training.c b/src/game/training/training.c index 4ef100bbe..e68cb998f 100644 --- a/src/game/training/training.c +++ b/src/game/training/training.c @@ -1520,7 +1520,7 @@ glabel var7f1baa50pf /* f19fdd8: 24020001 */ li $v0,0x1 /* f19fddc: 91040001 */ lbu $a0,0x1($t0) /* f19fde0: afa8004c */ sw $t0,0x4c($sp) -/* f19fde4: 0fc67d1e */ jal 0xf19f478 +/* f19fde4: 0fc67d1e */ jal frResolveFrPad /* f19fde8: afa30058 */ sw $v1,0x58($sp) /* f19fdec: 8fa30058 */ lw $v1,0x58($sp) /* f19fdf0: 00403825 */ move $a3,$v0 @@ -1541,7 +1541,7 @@ glabel var7f1baa50pf /* f19fe28: 24050002 */ li $a1,0x2 /* f19fe2c: 27a60070 */ addiu $a2,$sp,0x70 /* f19fe30: afa30058 */ sw $v1,0x58($sp) -/* f19fe34: 0fc458d4 */ jal 0xf116350 +/* f19fe34: 0fc458d4 */ jal padUnpack /* f19fe38: afa8004c */ sw $t0,0x4c($sp) /* f19fe3c: 8fb900d0 */ lw $t9,0xd0($sp) /* f19fe40: 3c0140c0 */ lui $at,0x40c0 @@ -1595,7 +1595,7 @@ glabel var7f1baa50pf /* f19fefc: e7a00024 */ swc1 $f0,0x24($sp) /* f19ff00: e7a00030 */ swc1 $f0,0x30($sp) /* f19ff04: e7a00034 */ swc1 $f0,0x34($sp) -/* f19ff08: 0fc24e0e */ jal 0xf093838 +/* f19ff08: 0fc24e0e */ jal func0f0939f8 /* f19ff0c: e7a00038 */ swc1 $f0,0x38($sp) /* f19ff10: 8fa8004c */ lw $t0,0x4c($sp) /* f19ff14: 8fa30058 */ lw $v1,0x58($sp) @@ -4412,15 +4412,15 @@ glabel var7f1b94e4 /* f1a169c: 00184f00 */ sll $t1,$t8,0x1c /* f1a16a0: 0520000b */ bltz $t1,.PB0f1a16d0 /* f1a16a4: 00000000 */ nop -/* f1a16a8: 0fc67bc2 */ jal 0xf19ef08 +/* f1a16a8: 0fc67bc2 */ jal frGetWeaponBySlot /* f1a16ac: 96a40456 */ lhu $a0,0x456($s5) -/* f1a16b0: 0fc4494f */ jal 0xf11253c +/* f1a16b0: 0fc4494f */ jal invHasSingleWeaponIncAllGuns /* f1a16b4: 00402025 */ move $a0,$v0 /* f1a16b8: 10400005 */ beqz $v0,.PB0f1a16d0 /* f1a16bc: 00000000 */ nop -/* f1a16c0: 0fc67bc2 */ jal 0xf19ef08 +/* f1a16c0: 0fc67bc2 */ jal frGetWeaponBySlot /* f1a16c4: 96a40456 */ lhu $a0,0x456($s5) -/* f1a16c8: 0fc286fc */ jal 0xf0a1bf0 +/* f1a16c8: 0fc286fc */ jal bgunEquipWeapon /* f1a16cc: 00402025 */ move $a0,$v0 .PB0f1a16d0: /* f1a16d0: 3c15800b */ lui $s5,0x800b @@ -4464,7 +4464,7 @@ glabel var7f1b94e4 /* f1a175c: 02602825 */ move $a1,$s3 /* f1a1760: 50800004 */ beqzl $a0,.PB0f1a1774 /* f1a1764: 2610003c */ addiu $s0,$s0,0x3c -/* f1a1768: 0fc24943 */ jal 0xf09250c +/* f1a1768: 0fc24943 */ jal func0f0926bc /* f1a176c: 3406ffff */ li $a2,0xffff /* f1a1770: 2610003c */ addiu $s0,$s0,0x3c .PB0f1a1774: @@ -4486,16 +4486,16 @@ glabel var7f1b94e4 /* f1a17b0: 10000372 */ b .PB0f1a257c /* f1a17b4: 8fbf007c */ lw $ra,0x7c($sp) .PB0f1a17b8: -/* f1a17b8: 0fc6a47e */ jal 0xf1a91f8 +/* f1a17b8: 0fc6a47e */ jal ciGetFrWeaponListMenuDialog /* f1a17bc: 00000000 */ nop /* f1a17c0: 00402025 */ move $a0,$v0 -/* f1a17c4: 0fc3e2cf */ jal 0xf0f8b3c +/* f1a17c4: 0fc3e2cf */ jal func0f0f85e0 /* f1a17c8: 2405000d */ li $a1,0xd /* f1a17cc: 1000036b */ b .PB0f1a257c /* f1a17d0: 8fbf007c */ lw $ra,0x7c($sp) .PB0f1a17d4: /* f1a17d4: 2484b440 */ addiu $a0,$a0,-19392 -/* f1a17d8: 0fc3e2cf */ jal 0xf0f8b3c +/* f1a17d8: 0fc3e2cf */ jal func0f0f85e0 /* f1a17dc: 2405000d */ li $a1,0xd /* f1a17e0: 10000366 */ b .PB0f1a257c /* f1a17e4: 8fbf007c */ lw $ra,0x7c($sp) @@ -4512,11 +4512,11 @@ glabel var7f1b94e4 /* f1a180c: 240505db */ li $a1,0x5db /* f1a1810: 00003025 */ move $a2,$zero /* f1a1814: 2407ffff */ li $a3,-1 -/* f1a1818: 0c004254 */ jal 0x10950 +/* f1a1818: 0c004254 */ jal sndStart /* f1a181c: e7b80014 */ swc1 $f24,0x14($sp) /* f1a1820: 3c048009 */ lui $a0,0x8009 /* f1a1824: 2484b678 */ addiu $a0,$a0,-18824 -/* f1a1828: 0fc3e2cf */ jal 0xf0f8b3c +/* f1a1828: 0fc3e2cf */ jal func0f0f85e0 /* f1a182c: 2405000d */ li $a1,0xd /* f1a1830: 10000352 */ b .PB0f1a257c /* f1a1834: 8fbf007c */ lw $ra,0x7c($sp) @@ -4533,16 +4533,16 @@ glabel var7f1b94e4 /* f1a185c: 240505dc */ li $a1,0x5dc /* f1a1860: 00003025 */ move $a2,$zero /* f1a1864: 2407ffff */ li $a3,-1 -/* f1a1868: 0c004254 */ jal 0x10950 +/* f1a1868: 0c004254 */ jal sndStart /* f1a186c: e7b80014 */ swc1 $f24,0x14($sp) /* f1a1870: 3c048009 */ lui $a0,0x8009 /* f1a1874: 2484b55c */ addiu $a0,$a0,-19108 -/* f1a1878: 0fc3e2cf */ jal 0xf0f8b3c +/* f1a1878: 0fc3e2cf */ jal func0f0f85e0 /* f1a187c: 2405000d */ li $a1,0xd /* f1a1880: 3c04800a */ lui $a0,0x800a /* f1a1884: 248467f0 */ addiu $a0,$a0,0x67f0 /* f1a1888: 00002825 */ move $a1,$zero -/* f1a188c: 0fc426eb */ jal 0xf109bac +/* f1a188c: 0fc426eb */ jal filemgrSaveOrLoad /* f1a1890: 00003025 */ move $a2,$zero /* f1a1894: 10000339 */ b .PB0f1a257c /* f1a1898: 8fbf007c */ lw $ra,0x7c($sp) @@ -4576,7 +4576,7 @@ glabel var7f1b94e4 /* f1a1900: 11400004 */ beqz $t2,.PB0f1a1914 /* f1a1904: 3406ffff */ li $a2,0xffff /* f1a1908: a20b0041 */ sb $t3,0x41($s0) -/* f1a190c: 0fc24943 */ jal 0xf09250c +/* f1a190c: 0fc24943 */ jal func0f0926bc /* f1a1910: 8e040014 */ lw $a0,0x14($s0) .PB0f1a1914: /* f1a1914: 2610003c */ addiu $s0,$s0,0x3c @@ -4586,10 +4586,10 @@ glabel var7f1b94e4 /* f1a1920: 3c02800a */ lui $v0,0x800a /* f1a1924: 8c42e754 */ lw $v0,-0x18ac($v0) /* f1a1928: 24040001 */ li $a0,0x1 -/* f1a192c: 0fc68264 */ jal 0xf1a0990 +/* f1a192c: 0fc68264 */ jal frEndSession /* f1a1930: ac401c08 */ sw $zero,0x1c08($v0) /* f1a1934: 00002025 */ move $a0,$zero -/* f1a1938: 0fc1281b */ jal 0xf04a06c +/* f1a1938: 0fc1281b */ jal chrUnsetStageFlag /* f1a193c: 24050001 */ li $a1,0x1 /* f1a1940: 1000030e */ b .PB0f1a257c /* f1a1944: 8fbf007c */ lw $ra,0x7c($sp) @@ -4599,7 +4599,7 @@ glabel var7f1b94e4 /* f1a1950: 8c4c00d8 */ lw $t4,0xd8($v0) /* f1a1954: 51800004 */ beqzl $t4,.PB0f1a1968 /* f1a1958: 8ecd0034 */ lw $t5,0x34($s6) -/* f1a195c: 0fc68264 */ jal 0xf1a0990 +/* f1a195c: 0fc68264 */ jal frEndSession /* f1a1960: 00002025 */ move $a0,$zero /* f1a1964: 8ecd0034 */ lw $t5,0x34($s6) .PB0f1a1968: @@ -4624,7 +4624,7 @@ glabel var7f1b94e4 /* f1a19ac: 11200004 */ beqz $t1,.PB0f1a19c0 /* f1a19b0: 3406ffff */ li $a2,0xffff /* f1a19b4: a20a0041 */ sb $t2,0x41($s0) -/* f1a19b8: 0fc24943 */ jal 0xf09250c +/* f1a19b8: 0fc24943 */ jal func0f0926bc /* f1a19bc: 8e040014 */ lw $a0,0x14($s0) .PB0f1a19c0: /* f1a19c0: 2610003c */ addiu $s0,$s0,0x3c @@ -4636,23 +4636,23 @@ glabel var7f1b94e4 .PB0f1a19d4: /* f1a19d4: 8ecc0284 */ lw $t4,0x284($s6) /* f1a19d8: 240b0001 */ li $t3,0x1 -/* f1a19dc: 0fc67efe */ jal 0xf19fbf8 +/* f1a19dc: 0fc67efe */ jal frExecuteHelpScript /* f1a19e0: ad8b1c08 */ sw $t3,0x1c08($t4) /* f1a19e4: 92ad045a */ lbu $t5,0x45a($s5) /* f1a19e8: 51a0004b */ beqzl $t5,.PB0f1a1b18 /* f1a19ec: 8eab044c */ lw $t3,0x44c($s5) -/* f1a19f0: 0fc67bc2 */ jal 0xf19ef08 +/* f1a19f0: 0fc67bc2 */ jal frGetWeaponBySlot /* f1a19f4: 96a40456 */ lhu $a0,0x456($s5) /* f1a19f8: 00409025 */ move $s2,$v0 /* f1a19fc: 00402025 */ move $a0,$v0 -/* f1a1a00: 0fc2a76c */ jal 0xf0a9db0 +/* f1a1a00: 0fc2a76c */ jal bgunGetAmmoTypeForWeapon /* f1a1a04: 00002825 */ move $a1,$zero /* f1a1a08: 00408825 */ move $s1,$v0 -/* f1a1a0c: 0fc2a724 */ jal 0xf0a9c90 +/* f1a1a0c: 0fc2a724 */ jal bgunGetCapacityByAmmotype /* f1a1a10: 00402025 */ move $a0,$v0 /* f1a1a14: 00408025 */ move $s0,$v0 /* f1a1a18: 02402025 */ move $a0,$s2 -/* f1a1a1c: 0fc2c57f */ jal 0xf0b15fc +/* f1a1a1c: 0fc2c57f */ jal weaponGetAmmoByFunction /* f1a1a20: 00002825 */ move $a1,$zero /* f1a1a24: 10400003 */ beqz $v0,.PB0f1a1a34 /* f1a1a28: 00001825 */ move $v1,$zero @@ -4664,7 +4664,7 @@ glabel var7f1b94e4 /* f1a1a3c: 2401ffff */ li $at,-1 /* f1a1a40: 18400011 */ blez $v0,.PB0f1a1a88 /* f1a1a44: 00000000 */ nop -/* f1a1a48: 0fc2a6c3 */ jal 0xf0a9b0c +/* f1a1a48: 0fc2a6c3 */ jal bgunGetReservedAmmoCount /* f1a1a4c: 02202025 */ move $a0,$s1 /* f1a1a50: 92a3045a */ lbu $v1,0x45a($s5) /* f1a1a54: 86ae0476 */ lh $t6,0x476($s5) @@ -4677,28 +4677,28 @@ glabel var7f1b94e4 /* f1a1a70: 00000000 */ nop /* f1a1a74: a6a00476 */ sh $zero,0x476($s5) .PB0f1a1a78: -/* f1a1a78: 0fc2a671 */ jal 0xf0a99c4 +/* f1a1a78: 0fc2a671 */ jal bgunSetAmmoQuantity /* f1a1a7c: 02202025 */ move $a0,$s1 /* f1a1a80: 10000006 */ b .PB0f1a1a9c /* f1a1a84: 24010012 */ li $at,0x12 .PB0f1a1a88: /* f1a1a88: 14410003 */ bne $v0,$at,.PB0f1a1a98 /* f1a1a8c: 02202025 */ move $a0,$s1 -/* f1a1a90: 0fc2a671 */ jal 0xf0a99c4 +/* f1a1a90: 0fc2a671 */ jal bgunSetAmmoQuantity /* f1a1a94: 02002825 */ move $a1,$s0 .PB0f1a1a98: /* f1a1a98: 24010012 */ li $at,0x12 .PB0f1a1a9c: /* f1a1a9c: 5641001d */ bnel $s2,$at,.PB0f1a1b14 /* f1a1aa0: a2a0045a */ sb $zero,0x45a($s5) -/* f1a1aa4: 0fc2a724 */ jal 0xf0a9c90 +/* f1a1aa4: 0fc2a724 */ jal bgunGetCapacityByAmmotype /* f1a1aa8: 2404000b */ li $a0,0xb /* f1a1aac: 86a30478 */ lh $v1,0x478($s5) /* f1a1ab0: 00408025 */ move $s0,$v0 /* f1a1ab4: 2401ffff */ li $at,-1 /* f1a1ab8: 18600011 */ blez $v1,.PB0f1a1b00 /* f1a1abc: 00000000 */ nop -/* f1a1ac0: 0fc2a6c3 */ jal 0xf0a9b0c +/* f1a1ac0: 0fc2a6c3 */ jal bgunGetReservedAmmoCount /* f1a1ac4: 2404000b */ li $a0,0xb /* f1a1ac8: 92a3045a */ lbu $v1,0x45a($s5) /* f1a1acc: 86b90478 */ lh $t9,0x478($s5) @@ -4711,14 +4711,14 @@ glabel var7f1b94e4 /* f1a1ae8: 00000000 */ nop /* f1a1aec: a6a00478 */ sh $zero,0x478($s5) .PB0f1a1af0: -/* f1a1af0: 0fc2a671 */ jal 0xf0a99c4 +/* f1a1af0: 0fc2a671 */ jal bgunSetAmmoQuantity /* f1a1af4: 2404000b */ li $a0,0xb /* f1a1af8: 10000006 */ b .PB0f1a1b14 /* f1a1afc: a2a0045a */ sb $zero,0x45a($s5) .PB0f1a1b00: /* f1a1b00: 14610003 */ bne $v1,$at,.PB0f1a1b10 /* f1a1b04: 2404000b */ li $a0,0xb -/* f1a1b08: 0fc2a671 */ jal 0xf0a99c4 +/* f1a1b08: 0fc2a671 */ jal bgunSetAmmoQuantity /* f1a1b0c: 02002825 */ move $a1,$s0 .PB0f1a1b10: /* f1a1b10: a2a0045a */ sb $zero,0x45a($s5) @@ -4754,7 +4754,7 @@ glabel var7f1b94e4 /* f1a1b80: 240505d4 */ li $a1,0x5d4 /* f1a1b84: 00003025 */ move $a2,$zero /* f1a1b88: 2407ffff */ li $a3,-1 -/* f1a1b8c: 0c004254 */ jal 0x10950 +/* f1a1b8c: 0c004254 */ jal sndStart /* f1a1b90: e7b80014 */ swc1 $f24,0x14($sp) /* f1a1b94: 8ea30464 */ lw $v1,0x464($s5) .PB0f1a1b98: @@ -4766,7 +4766,7 @@ glabel var7f1b94e4 /* f1a1ba8: 2b01ff46 */ slti $at,$t8,-186 /* f1a1bac: 54200273 */ bnezl $at,.PB0f1a257c /* f1a1bb0: 8fbf007c */ lw $ra,0x7c($sp) -/* f1a1bb4: 0fc67bf6 */ jal 0xf19efd8 +/* f1a1bb4: 0fc67bf6 */ jal frInitLighting /* f1a1bb8: 00000000 */ nop /* f1a1bbc: 1000026f */ b .PB0f1a257c /* f1a1bc0: 8fbf007c */ lw $ra,0x7c($sp) @@ -4775,7 +4775,7 @@ glabel var7f1b94e4 /* f1a1bc8: 001952c0 */ sll $t2,$t9,0xb /* f1a1bcc: 05420004 */ bltzl $t2,.PB0f1a1be0 /* f1a1bd0: 92ac0465 */ lbu $t4,0x465($s5) -/* f1a1bd4: 0fc67bf6 */ jal 0xf19efd8 +/* f1a1bd4: 0fc67bf6 */ jal frInitLighting /* f1a1bd8: 00000000 */ nop /* f1a1bdc: 92ac0465 */ lbu $t4,0x465($s5) .PB0f1a1be0: @@ -4802,7 +4802,7 @@ glabel var7f1b94e4 /* f1a1c28: 052100d1 */ bgez $t1,.PB0f1a1f70 /* f1a1c2c: 00009025 */ move $s2,$zero /* f1a1c30: a3a00123 */ sb $zero,0x123($sp) -/* f1a1c34: 0fc67bc2 */ jal 0xf19ef08 +/* f1a1c34: 0fc67bc2 */ jal frGetWeaponBySlot /* f1a1c38: 96a40456 */ lhu $a0,0x456($s5) /* f1a1c3c: 8e110014 */ lw $s1,0x14($s0) /* f1a1c40: 304300ff */ andi $v1,$v0,0xff @@ -4813,7 +4813,7 @@ glabel var7f1b94e4 /* f1a1c54: 14610003 */ bne $v1,$at,.PB0f1a1c64 .PB0f1a1c58: /* f1a1c58: 26240008 */ addiu $a0,$s1,0x8 -/* f1a1c5c: 0fc22a94 */ jal 0xf08aa50 +/* f1a1c5c: 0fc22a94 */ jal coordTriggerProxies /* f1a1c60: 24050001 */ li $a1,0x1 .PB0f1a1c64: /* f1a1c64: 920a0043 */ lbu $t2,0x43($s0) @@ -4843,7 +4843,7 @@ glabel var7f1b94e4 /* f1a1cc4: afad002c */ sw $t5,0x2c($sp) /* f1a1cc8: e7b80030 */ swc1 $f24,0x30($sp) /* f1a1ccc: e7b80034 */ swc1 $f24,0x34($sp) -/* f1a1cd0: 0fc24e0e */ jal 0xf093838 +/* f1a1cd0: 0fc24e0e */ jal func0f0939f8 /* f1a1cd4: e7b80038 */ swc1 $f24,0x38($sp) /* f1a1cd8: c6000038 */ lwc1 $f0,0x38($s0) .PB0f1a1cdc: @@ -4895,7 +4895,7 @@ glabel var7f1b94e4 /* f1a1d80: 004b082a */ slt $at,$v0,$t3 /* f1a1d84: 50200007 */ beqzl $at,.PB0f1a1da4 /* f1a1d88: 96ac045c */ lhu $t4,0x45c($s5) -/* f1a1d8c: 0fc67bc2 */ jal 0xf19ef08 +/* f1a1d8c: 0fc67bc2 */ jal frGetWeaponBySlot /* f1a1d90: 96a40456 */ lhu $a0,0x456($s5) /* f1a1d94: 24010007 */ li $at,0x7 /* f1a1d98: 5441000e */ bnel $v0,$at,.PB0f1a1dd4 @@ -4929,7 +4929,7 @@ glabel var7f1b94e4 /* f1a1dfc: 1420005c */ bnez $at,.PB0f1a1f70 /* f1a1e00: 00000000 */ nop .PB0f1a1e04: -/* f1a1e04: 0fc1a335 */ jal 0xf068cd4 +/* f1a1e04: 0fc1a335 */ jal objFindBboxRodata /* f1a1e08: 00001025 */ move $v0,$zero /* f1a1e0c: 3c038009 */ lui $v1,0x8009 /* f1a1e10: 9063acec */ lbu $v1,-0x5314($v1) @@ -4944,7 +4944,7 @@ glabel var7f1b94e4 /* f1a1e34: a02dacec */ sb $t5,-0x5314($at) /* f1a1e38: 24050001 */ li $a1,0x1 /* f1a1e3c: 3406ffff */ li $a2,0xffff -/* f1a1e40: 0fc24943 */ jal 0xf09250c +/* f1a1e40: 0fc24943 */ jal func0f0926bc /* f1a1e44: afa20118 */ sw $v0,0x118($sp) /* f1a1e48: 8fa80118 */ lw $t0,0x118($sp) .PB0f1a1e4c: @@ -4963,7 +4963,7 @@ glabel var7f1b94e4 /* f1a1e78: c5060010 */ lwc1 $f6,0x10($t0) /* f1a1e7c: afb10024 */ sw $s1,0x24($sp) /* f1a1e80: afae0020 */ sw $t6,0x20($sp) -/* f1a1e84: 0fc546f4 */ jal 0xf151bd0 +/* f1a1e84: 0fc546f4 */ jal shardsCreate /* f1a1e88: e7a6001c */ swc1 $f6,0x1c($sp) /* f1a1e8c: 92af0455 */ lbu $t7,0x455($s5) /* f1a1e90: 24070005 */ li $a3,0x5 @@ -4977,7 +4977,7 @@ glabel var7f1b94e4 /* f1a1eb0: 240a0001 */ li $t2,0x1 /* f1a1eb4: afaa0010 */ sw $t2,0x10($sp) /* f1a1eb8: 24850008 */ addiu $a1,$a0,0x8 -/* f1a1ebc: 0fc4ab78 */ jal 0xf12ade0 +/* f1a1ebc: 0fc4ab78 */ jal explosionCreateSimple /* f1a1ec0: 24860028 */ addiu $a2,$a0,0x28 /* f1a1ec4: 920b0010 */ lbu $t3,0x10($s0) .PB0f1a1ec8: @@ -4997,7 +4997,7 @@ glabel var7f1b94e4 /* f1a1efc: c428b8ac */ lwc1 $f8,-0x4754($at) /* f1a1f00: e6360010 */ swc1 $f22,0x10($s1) /* f1a1f04: 00003025 */ move $a2,$zero -/* f1a1f08: 0fc1a792 */ jal 0xf069e48 +/* f1a1f08: 0fc1a792 */ jal func0f069c70 /* f1a1f0c: e628000c */ swc1 $f8,0xc($s1) /* f1a1f10: 3c03800b */ lui $v1,0x800b /* f1a1f14: 24631340 */ addiu $v1,$v1,0x1340 @@ -5044,7 +5044,7 @@ glabel var7f1b94e4 /* f1a1fa8: 0182082a */ slt $at,$t4,$v0 /* f1a1fac: 14200005 */ bnez $at,.PB0f1a1fc4 /* f1a1fb0: 00000000 */ nop -/* f1a1fb4: 0fc68390 */ jal 0xf1a0e40 +/* f1a1fb4: 0fc68390 */ jal frSetCompleted /* f1a1fb8: 00000000 */ nop /* f1a1fbc: 1000016f */ b .PB0f1a257c /* f1a1fc0: 8fbf007c */ lw $ra,0x7c($sp) @@ -5064,7 +5064,7 @@ glabel var7f1b94e4 /* f1a1ff0: 54200006 */ bnezl $at,.PB0f1a200c /* f1a1ff4: 92ae0454 */ lbu $t6,0x454($s5) .PB0f1a1ff8: -/* f1a1ff8: 0fc68390 */ jal 0xf1a0e40 +/* f1a1ff8: 0fc68390 */ jal frSetCompleted /* f1a1ffc: 00000000 */ nop /* f1a2000: 1000015e */ b .PB0f1a257c /* f1a2004: 8fbf007c */ lw $ra,0x7c($sp) @@ -5074,16 +5074,16 @@ glabel var7f1b94e4 /* f1a200c: 004e082a */ slt $at,$v0,$t6 /* f1a2010: 14200005 */ bnez $at,.PB0f1a2028 /* f1a2014: 00000000 */ nop -/* f1a2018: 0fc68376 */ jal 0xf1a0dd8 +/* f1a2018: 0fc68376 */ jal frSetFailReason /* f1a201c: 24040003 */ li $a0,0x3 /* f1a2020: 10000156 */ b .PB0f1a257c /* f1a2024: 8fbf007c */ lw $ra,0x7c($sp) .PB0f1a2028: -/* f1a2028: 0fc68476 */ jal 0xf1a11d8 +/* f1a2028: 0fc68476 */ jal frIsAmmoWasted /* f1a202c: 00000000 */ nop /* f1a2030: 50400006 */ beqzl $v0,.PB0f1a204c /* f1a2034: 92a20005 */ lbu $v0,0x5($s5) -/* f1a2038: 0fc68376 */ jal 0xf1a0dd8 +/* f1a2038: 0fc68376 */ jal frSetFailReason /* f1a203c: 24040001 */ li $a0,0x1 /* f1a2040: 1000014e */ b .PB0f1a257c /* f1a2044: 8fbf007c */ lw $ra,0x7c($sp) @@ -5101,7 +5101,7 @@ glabel var7f1b94e4 /* f1a2070: 01f8082a */ slt $at,$t7,$t8 /* f1a2074: 14200005 */ bnez $at,.PB0f1a208c /* f1a2078: 00000000 */ nop -/* f1a207c: 0fc68376 */ jal 0xf1a0dd8 +/* f1a207c: 0fc68376 */ jal frSetFailReason /* f1a2080: 24040002 */ li $a0,0x2 /* f1a2084: 1000013d */ b .PB0f1a257c /* f1a2088: 8fbf007c */ lw $ra,0x7c($sp) @@ -5158,7 +5158,7 @@ glabel var7f1b94e4 /* f1a2148: c7a40160 */ lwc1 $f4,0x160($sp) /* f1a214c: 46042182 */ mul.s $f6,$f4,$f4 /* f1a2150: 46104480 */ add.s $f18,$f8,$f16 -/* f1a2154: 0c012ae4 */ jal 0x4ab90 +/* f1a2154: 0c012ae4 */ jal sqrtf /* f1a2158: 46123300 */ add.s $f12,$f6,$f18 /* f1a215c: 46160032 */ c.eq.s $f0,$f22 /* f1a2160: c7ae0110 */ lwc1 $f14,0x110($sp) @@ -5227,7 +5227,7 @@ glabel var7f1b94e4 /* f1a2254: a04b0000 */ sb $t3,0x0($v0) .PB0f1a2258: /* f1a2258: 24050001 */ li $a1,0x1 -/* f1a225c: 0fc24943 */ jal 0xf09250c +/* f1a225c: 0fc24943 */ jal func0f0926bc /* f1a2260: 3406ffff */ li $a2,0xffff /* f1a2264: 240cffff */ li $t4,-1 /* f1a2268: 240d0400 */ li $t5,0x400 @@ -5246,7 +5246,7 @@ glabel var7f1b94e4 /* f1a229c: afa00028 */ sw $zero,0x28($sp) /* f1a22a0: e7b80030 */ swc1 $f24,0x30($sp) /* f1a22a4: e7b80034 */ swc1 $f24,0x34($sp) -/* f1a22a8: 0fc24e0e */ jal 0xf093838 +/* f1a22a8: 0fc24e0e */ jal func0f0939f8 /* f1a22ac: e7b80038 */ swc1 $f24,0x38($sp) .PB0f1a22b0: /* f1a22b0: c7a8014c */ lwc1 $f8,0x14c($sp) @@ -5258,7 +5258,7 @@ glabel var7f1b94e4 /* f1a22c4: 00003025 */ move $a2,$zero /* f1a22c8: e62a000c */ swc1 $f10,0xc($s1) /* f1a22cc: c7a60154 */ lwc1 $f6,0x154($sp) -/* f1a22d0: 0fc1a792 */ jal 0xf069e48 +/* f1a22d0: 0fc1a792 */ jal func0f069c70 /* f1a22d4: e6260010 */ swc1 $f6,0x10($s1) /* f1a22d8: 8e020010 */ lw $v0,0x10($s0) .PB0f1a22dc: @@ -5390,17 +5390,17 @@ glabel var7f1b94e4 .PB0f1a24a4: /* f1a24a4: c426b8c4 */ lwc1 $f6,-0x473c($at) /* f1a24a8: 02802825 */ move $a1,$s4 -/* f1a24ac: 0c005b71 */ jal 0x16dc4 +/* f1a24ac: 0c005b71 */ jal mtx4LoadYRotation /* f1a24b0: 46060300 */ add.s $f12,$f0,$f6 /* f1a24b4: 8e6c0018 */ lw $t4,0x18($s3) /* f1a24b8: 02802825 */ move $a1,$s4 -/* f1a24bc: 0c005a55 */ jal 0x16954 +/* f1a24bc: 0c005a55 */ jal mtx00015f04 /* f1a24c0: c58c0014 */ lwc1 $f12,0x14($t4) /* f1a24c4: 02802025 */ move $a0,$s4 -/* f1a24c8: 0c0059fc */ jal 0x167f0 +/* f1a24c8: 0c0059fc */ jal mtx4ToMtx3 /* f1a24cc: 02a02825 */ move $a1,$s5 /* f1a24d0: 02a02025 */ move $a0,$s5 -/* f1a24d4: 0c0059ca */ jal 0x16728 +/* f1a24d4: 0c0059ca */ jal mtx3Copy /* f1a24d8: 2665001c */ addiu $a1,$s3,0x1c /* f1a24dc: 8e020010 */ lw $v0,0x10($s0) .PB0f1a24e0: @@ -5418,26 +5418,26 @@ glabel var7f1b94e4 /* f1a250c: 92090010 */ lbu $t1,0x10($s0) /* f1a2510: 02402025 */ move $a0,$s2 /* f1a2514: 312affef */ andi $t2,$t1,0xffef -/* f1a2518: 0fc67f4e */ jal 0xf19fd38 +/* f1a2518: 0fc67f4e */ jal frExecuteTargetScript /* f1a251c: a20a0010 */ sb $t2,0x10($s0) /* f1a2520: 14400005 */ bnez $v0,.PB0f1a2538 /* f1a2524: 00000000 */ nop .PB0f1a2528: -/* f1a2528: 0fc67f4e */ jal 0xf19fd38 +/* f1a2528: 0fc67f4e */ jal frExecuteTargetScript /* f1a252c: 02402025 */ move $a0,$s2 /* f1a2530: 1040fffd */ beqz $v0,.PB0f1a2528 /* f1a2534: 00000000 */ nop .PB0f1a2538: -/* f1a2538: 0fc67ee5 */ jal 0xf19fb94 +/* f1a2538: 0fc67ee5 */ jal frTargetIsAtScriptStart /* f1a253c: 02402025 */ move $a0,$s2 /* f1a2540: 5040000a */ beqzl $v0,.PB0f1a256c /* f1a2544: 26520001 */ addiu $s2,$s2,0x1 -/* f1a2548: 0fc67f4e */ jal 0xf19fd38 +/* f1a2548: 0fc67f4e */ jal frExecuteTargetScript /* f1a254c: 02402025 */ move $a0,$s2 /* f1a2550: 54400006 */ bnezl $v0,.PB0f1a256c /* f1a2554: 26520001 */ addiu $s2,$s2,0x1 .PB0f1a2558: -/* f1a2558: 0fc67f4e */ jal 0xf19fd38 +/* f1a2558: 0fc67f4e */ jal frExecuteTargetScript /* f1a255c: 02402025 */ move $a0,$s2 /* f1a2560: 1040fffd */ beqz $v0,.PB0f1a2558 /* f1a2564: 00000000 */ nop diff --git a/src/lib/crash.c b/src/lib/crash.c index 91e4afa60..7bfac4647 100644 --- a/src/lib/crash.c +++ b/src/lib/crash.c @@ -200,7 +200,7 @@ glabel faultproc /* bdc8: afa00064 */ sw $zero,0x64($sp) /* bdcc: 2404000c */ li $a0,0xc /* bdd0: 02202825 */ move $a1,$s1 -/* bdd4: 0c0122b8 */ jal 0x48ae0 +/* bdd4: 0c0122b8 */ jal osSetEventMesg /* bdd8: 24060010 */ li $a2,0x10 /* bddc: 3c018009 */ lui $at,0x8009 /* bde0: 3c138006 */ lui $s3,0x8006 @@ -213,16 +213,16 @@ glabel faultproc /* bdf8: 02202025 */ move $a0,$s1 .PB0000bdfc: /* bdfc: 02402825 */ move $a1,$s2 -/* be00: 0c01232c */ jal 0x48cb0 +/* be00: 0c01232c */ jal osRecvMesg /* be04: 24060001 */ li $a2,0x1 -/* be08: 0c012304 */ jal 0x48c10 +/* be08: 0c012304 */ jal osSetIntMask /* be0c: 24040001 */ li $a0,0x1 -/* be10: 0c013b00 */ jal 0x4ec00 +/* be10: 0c013b00 */ jal __osGetCurrFaultedThread /* be14: 00408025 */ move $s0,$v0 /* be18: 3c018009 */ lui $at,0x8009 /* be1c: 1040fff6 */ beqz $v0,.PB0000bdf8 /* be20: ac226fac */ sw $v0,0x6fac($at) -/* be24: 0c012304 */ jal 0x48c10 +/* be24: 0c012304 */ jal osSetIntMask /* be28: 02002025 */ move $a0,$s0 /* be2c: 8e6e0000 */ lw $t6,0x0($s3) /* be30: 51c0fff2 */ beqzl $t6,.PB0000bdfc @@ -230,9 +230,9 @@ glabel faultproc /* be38: 3c048009 */ lui $a0,0x8009 /* be3c: 8c846fac */ lw $a0,0x6fac($a0) /* be40: 02802825 */ move $a1,$s4 -/* be44: 0c0030b1 */ jal 0xc2c4 +/* be44: 0c0030b1 */ jal crashGenerate /* be48: 02a03025 */ move $a2,$s5 -/* be4c: 0c0006c7 */ jal 0x1b1c +/* be4c: 0c0006c7 */ jal schedSetCrashedUnexpectedly /* be50: 24040001 */ li $a0,0x1 /* be54: 1000ffe9 */ b .PB0000bdfc /* be58: 02202025 */ move $a0,$s1 @@ -1484,7 +1484,7 @@ glabel crashRenderChar /* cb48: afbf0014 */ sw $ra,0x14($sp) /* cb4c: afa40018 */ sw $a0,0x18($sp) /* cb50: afa5001c */ sw $a1,0x1c($sp) -/* cb54: 0c002e4d */ jal 0xb934 +/* cb54: 0c002e4d */ jal viGetWidth /* cb58: afa60020 */ sw $a2,0x20($sp) /* cb5c: 93a30023 */ lbu $v1,0x23($sp) /* cb60: 8fa50018 */ lw $a1,0x18($sp) diff --git a/src/lib/main.c b/src/lib/main.c index 9493ded9c..20d34723d 100644 --- a/src/lib/main.c +++ b/src/lib/main.c @@ -700,30 +700,30 @@ GLOBAL_ASM( glabel mainInit /* d2b0: 27bdeb20 */ addiu $sp,$sp,-5344 /* d2b4: afbf002c */ sw $ra,0x2c($sp) -/* d2b8: 0c002f38 */ jal 0xbce0 +/* d2b8: 0c002f38 */ jal faultCreateThread /* d2bc: afb00028 */ sw $s0,0x28($sp) -/* d2c0: 0c00338c */ jal 0xce30 +/* d2c0: 0c00338c */ jal dmaInit /* d2c4: 00000000 */ nop -/* d2c8: 0c002258 */ jal 0x8960 +/* d2c8: 0c002258 */ jal amgrAllocateStack /* d2cc: 00000000 */ nop -/* d2d0: 0c0058ac */ jal 0x162b0 +/* d2d0: 0c0058ac */ jal gvarsInit /* d2d4: 00000000 */ nop -/* d2d8: 0c004890 */ jal 0x12240 +/* d2d8: 0c004890 */ jal memp000121e0 /* d2dc: 00000000 */ nop -/* d2e0: 0c004aaf */ jal 0x12abc +/* d2e0: 0c004aaf */ jal memaInit /* d2e4: 00000000 */ nop -/* d2e8: 0c004e46 */ jal 0x13918 +/* d2e8: 0c004e46 */ jal videbugCreateMesgQueue /* d2ec: 00000000 */ nop -/* d2f0: 0c002668 */ jal 0x99a0 +/* d2f0: 0c002668 */ jal viConfigureForLogos /* d2f4: 00000000 */ nop -/* d2f8: 0c00bff2 */ jal 0x2ffc8 +/* d2f8: 0c00bff2 */ jal rmonIsDisabled /* d2fc: 00000000 */ nop /* d300: 3c018006 */ lui $at,0x8006 -/* d304: 0c0051b7 */ jal 0x146dc +/* d304: 0c0051b7 */ jal joySystemInit /* d308: ac22e4c0 */ sw $v0,-0x1b40($at) /* d30c: 27a41498 */ addiu $a0,$sp,0x1498 /* d310: 27a514d4 */ addiu $a1,$sp,0x14d4 -/* d314: 0c012240 */ jal 0x48900 +/* d314: 0c012240 */ jal osCreateMesgQueue /* d318: 24060001 */ li $a2,0x1 /* d31c: 00008025 */ move $s0,$zero /* d320: 3c070047 */ lui $a3,0x47 @@ -738,16 +738,16 @@ glabel mainInit /* d340: afae0010 */ sw $t6,0x10($sp) /* d344: 34e7868c */ ori $a3,$a3,0x868c /* d348: 27a414b0 */ addiu $a0,$sp,0x14b0 -/* d34c: 0c012438 */ jal 0x490e0 +/* d34c: 0c012438 */ jal osSetTimer /* d350: 24060000 */ li $a2,0x0 /* d354: 27a41498 */ addiu $a0,$sp,0x1498 /* d358: 27a514d4 */ addiu $a1,$sp,0x14d4 -/* d35c: 0c01232c */ jal 0x48cb0 +/* d35c: 0c01232c */ jal osRecvMesg /* d360: 24060001 */ li $a2,0x1 /* d364: 24010001 */ li $at,0x1 /* d368: 56010006 */ bnel $s0,$at,.PB0000d384 /* d36c: 2a010002 */ slti $at,$s0,0x2 -/* d370: 0c005211 */ jal 0x14844 +/* d370: 0c005211 */ jal joy00013dfc /* d374: 00000000 */ nop /* d378: 10000007 */ b .PB0000d398 /* d37c: 26100001 */ addiu $s0,$s0,0x1 @@ -755,7 +755,7 @@ glabel mainInit .PB0000d384: /* d384: 54200004 */ bnezl $at,.PB0000d398 /* d388: 26100001 */ addiu $s0,$s0,0x1 -/* d38c: 0c00534e */ jal 0x14d38 +/* d38c: 0c00534e */ jal joyDebugJoy /* d390: 00000000 */ nop /* d394: 26100001 */ addiu $s0,$s0,0x1 .PB0000d398: @@ -764,7 +764,7 @@ glabel mainInit /* d3a0: 3c070047 */ lui $a3,0x47 /* d3a4: 3c057005 */ lui $a1,0x7005 /* d3a8: 24a543f8 */ addiu $a1,$a1,0x43f8 -/* d3ac: 0c004c74 */ jal 0x131d0 +/* d3ac: 0c004c74 */ jal argFindByPrefix /* d3b0: 24040001 */ li $a0,0x1 /* d3b4: 14400004 */ bnez $v0,.PB0000d3c8 /* d3b8: 00002025 */ move $a0,$zero @@ -772,19 +772,19 @@ glabel mainInit /* d3c0: 3c018006 */ lui $at,0x8006 /* d3c4: ac2be4c0 */ sw $t3,-0x1b40($at) .PB0000d3c8: -/* d3c8: 0c00566a */ jal 0x159a8 +/* d3c8: 0c00566a */ jal joyGetButtons /* d3cc: 24051000 */ li $a1,0x1000 /* d3d0: 1440000f */ bnez $v0,.PB0000d410 /* d3d4: 24040001 */ li $a0,0x1 -/* d3d8: 0c00566a */ jal 0x159a8 +/* d3d8: 0c00566a */ jal joyGetButtons /* d3dc: 24051000 */ li $a1,0x1000 /* d3e0: 1440000b */ bnez $v0,.PB0000d410 /* d3e4: 24040002 */ li $a0,0x2 -/* d3e8: 0c00566a */ jal 0x159a8 +/* d3e8: 0c00566a */ jal joyGetButtons /* d3ec: 24051000 */ li $a1,0x1000 /* d3f0: 14400007 */ bnez $v0,.PB0000d410 /* d3f4: 24040003 */ li $a0,0x3 -/* d3f8: 0c00566a */ jal 0x159a8 +/* d3f8: 0c00566a */ jal joyGetButtons /* d3fc: 24051000 */ li $a1,0x1000 /* d400: 14400003 */ bnez $v0,.PB0000d410 /* d404: 3c018006 */ lui $at,0x8006 @@ -796,20 +796,20 @@ glabel mainInit /* d418: ac2ce4e4 */ sw $t4,-0x1b1c($at) .PB0000d41c: /* d41c: 00002025 */ move $a0,$zero -/* d420: 0c00566a */ jal 0x159a8 +/* d420: 0c00566a */ jal joyGetButtons /* d424: 2405000f */ li $a1,0xf /* d428: 2410000f */ li $s0,0xf /* d42c: 1202000c */ beq $s0,$v0,.PB0000d460 /* d430: 24040001 */ li $a0,0x1 -/* d434: 0c00566a */ jal 0x159a8 +/* d434: 0c00566a */ jal joyGetButtons /* d438: 2405000f */ li $a1,0xf /* d43c: 12020008 */ beq $s0,$v0,.PB0000d460 /* d440: 24040002 */ li $a0,0x2 -/* d444: 0c00566a */ jal 0x159a8 +/* d444: 0c00566a */ jal joyGetButtons /* d448: 2405000f */ li $a1,0xf /* d44c: 12020004 */ beq $s0,$v0,.PB0000d460 /* d450: 24040003 */ li $a0,0x3 -/* d454: 0c00566a */ jal 0x159a8 +/* d454: 0c00566a */ jal joyGetButtons /* d458: 2405000f */ li $a1,0xf /* d45c: 16020003 */ bne $s0,$v0,.PB0000d46c .PB0000d460: @@ -836,7 +836,7 @@ glabel mainInit /* d4ac: 8deb001c */ lw $t3,0x1c($t7) /* d4b0: 8de10018 */ lw $at,0x18($t7) /* d4b4: adcb001c */ sw $t3,0x1c($t6) -/* d4b8: 0c0005b0 */ jal 0x16c0 +/* d4b8: 0c0005b0 */ jal bootGetMemSize /* d4bc: adc10018 */ sw $at,0x18($t6) /* d4c0: 3c010040 */ lui $at,0x40 /* d4c4: 34210001 */ ori $at,$at,0x1 @@ -875,7 +875,7 @@ glabel mainInit /* d540: 258c5a10 */ addiu $t4,$t4,0x5a10 /* d544: 39e4003f */ xori $a0,$t7,0x3f /* d548: 00808025 */ move $s0,$a0 -/* d54c: 0c003468 */ jal 0xd1a0 +/* d54c: 0c003468 */ jal dmaExec /* d550: 01853023 */ subu $a2,$t4,$a1 /* d554: 1000000e */ b .PB0000d590 /* d558: 3c01ffff */ lui $at,0xffff @@ -890,7 +890,7 @@ glabel mainInit /* d578: 27185160 */ addiu $t8,$t8,0x5160 /* d57c: 3b24003f */ xori $a0,$t9,0x3f /* d580: 00808025 */ move $s0,$a0 -/* d584: 0c003468 */ jal 0xd1a0 +/* d584: 0c003468 */ jal dmaExec /* d588: 03053023 */ subu $a2,$t8,$a1 /* d58c: 3c01ffff */ lui $at,0xffff .PB0000d590: @@ -898,7 +898,7 @@ glabel mainInit /* d594: 02012821 */ addu $a1,$s0,$at /* d598: afa50048 */ sw $a1,0x48($sp) /* d59c: 02002025 */ move $a0,$s0 -/* d5a0: 0c001d0c */ jal 0x7430 +/* d5a0: 0c001d0c */ jal rzipInflate /* d5a4: 27a60058 */ addiu $a2,$sp,0x58 /* d5a8: 3c050004 */ lui $a1,0x4 /* d5ac: 8faa0048 */ lw $t2,0x48($sp) @@ -942,9 +942,9 @@ glabel mainInit /* d634: 14c9fff3 */ bne $a2,$t1,.PB0000d604 /* d638: 24e70240 */ addiu $a3,$a3,0x240 .PB0000d63c: -/* d63c: 0c0029f7 */ jal 0xa7dc +/* d63c: 0c0029f7 */ jal viSetMode /* d640: 24040002 */ li $a0,0x2 -/* d644: 0c002690 */ jal 0x9a40 +/* d644: 0c002690 */ jal viConfigureForBanner /* d648: 02002025 */ move $a0,$s0 /* d64c: 8faa0048 */ lw $t2,0x48($sp) /* d650: 3c018006 */ lui $at,0x8006 @@ -955,14 +955,14 @@ glabel mainInit /* d664: ac2f06e0 */ sw $t7,0x6e0($at) /* d668: 24840010 */ addiu $a0,$a0,0x10 /* d66c: 27a51478 */ addiu $a1,$sp,0x1478 -/* d670: 0c01232c */ jal 0x48cb0 +/* d670: 0c01232c */ jal osRecvMesg /* d674: 00003025 */ move $a2,$zero /* d678: 14400007 */ bnez $v0,.PB0000d698 .PB0000d67c: /* d67c: 3c048009 */ lui $a0,0x8009 /* d680: 24840010 */ addiu $a0,$a0,0x10 /* d684: 27a51478 */ addiu $a1,$sp,0x1478 -/* d688: 0c01232c */ jal 0x48cb0 +/* d688: 0c01232c */ jal osRecvMesg /* d68c: 00003025 */ move $a2,$zero /* d690: 1040fffa */ beqz $v0,.PB0000d67c /* d694: 00000000 */ nop @@ -973,7 +973,7 @@ glabel mainInit /* d6a0: 24840010 */ addiu $a0,$a0,0x10 /* d6a4: 27a51478 */ addiu $a1,$sp,0x1478 /* d6a8: 24060001 */ li $a2,0x1 -/* d6ac: 0c01232c */ jal 0x48cb0 +/* d6ac: 0c01232c */ jal osRecvMesg /* d6b0: afa31490 */ sw $v1,0x1490($sp) /* d6b4: 8fab1478 */ lw $t3,0x1478($sp) /* d6b8: 24010001 */ li $at,0x1 @@ -982,14 +982,14 @@ glabel mainInit /* d6c4: 27b01458 */ addiu $s0,$sp,0x1458 /* d6c8: 5581000d */ bnel $t4,$at,.PB0000d700 /* d6cc: 28610006 */ slti $at,$v1,0x6 -/* d6d0: 0c0027d3 */ jal 0x9f4c +/* d6d0: 0c0027d3 */ jal viUpdateMode /* d6d4: afa31490 */ sw $v1,0x1490($sp) /* d6d8: 3c048006 */ lui $a0,0x8006 /* d6dc: 3c058006 */ lui $a1,0x8006 /* d6e0: 24a5e800 */ addiu $a1,$a1,-6144 /* d6e4: 2484e7d8 */ addiu $a0,$a0,-6184 /* d6e8: 00003025 */ move $a2,$zero -/* d6ec: 0c00bfad */ jal 0x2feb4 +/* d6ec: 0c00bfad */ jal rdpCreateTask /* d6f0: 02003825 */ move $a3,$s0 /* d6f4: 8fa31490 */ lw $v1,0x1490($sp) /* d6f8: 24630001 */ addiu $v1,$v1,0x1 @@ -1005,105 +1005,105 @@ glabel mainInit /* d718: 1000ffff */ b .PB0000d718 /* d71c: 00000000 */ nop .PB0000d720: -/* d720: 0c001c04 */ jal 0x7010 +/* d720: 0c001c04 */ jal vmInit /* d724: 00000000 */ nop -/* d728: 0fc6a558 */ jal 0xf1a9560 +/* d728: 0fc6a558 */ jal func0f1a78b0 /* d72c: 00000000 */ nop -/* d730: 0fc5a179 */ jal 0xf1685e4 +/* d730: 0fc5a179 */ jal func0f166f74 /* d734: 00000000 */ nop -/* d738: 0fc5dea0 */ jal 0xf177a80 +/* d738: 0fc5dea0 */ jal stub0f175f50 /* d73c: 00000000 */ nop -/* d740: 0fc5deb0 */ jal 0xf177ac0 +/* d740: 0fc5deb0 */ jal func0f175f90 /* d744: 00000000 */ nop /* d748: 3c0d8006 */ lui $t5,0x8006 /* d74c: 8dade4c0 */ lw $t5,-0x1b40($t5) /* d750: 11a00003 */ beqz $t5,.PB0000d760 /* d754: 3c047005 */ lui $a0,0x7005 -/* d758: 0c004c2f */ jal 0x130bc +/* d758: 0c004c2f */ jal argSetString /* d75c: 24844400 */ addiu $a0,$a0,0x4400 .PB0000d760: /* d760: 3c04800b */ lui $a0,0x800b -/* d764: 0c012de0 */ jal 0x4b780 +/* d764: 0c012de0 */ jal osVirtualToPhysical /* d768: 248417e0 */ addiu $a0,$a0,0x17e0 /* d76c: 3c038009 */ lui $v1,0x8009 /* d770: 8c632fe0 */ lw $v1,0x2fe0($v1) /* d774: 3c018000 */ lui $at,0x8000 /* d778: 00412025 */ or $a0,$v0,$at -/* d77c: 0c004892 */ jal 0x12248 +/* d77c: 0c004892 */ jal mempInit /* d780: 00642823 */ subu $a1,$v1,$a0 -/* d784: 0c004977 */ jal 0x125dc +/* d784: 0c004977 */ jal mempResetPool /* d788: 24040008 */ li $a0,0x8 -/* d78c: 0c004977 */ jal 0x125dc +/* d78c: 0c004977 */ jal mempResetPool /* d790: 24040006 */ li $a0,0x6 -/* d794: 0c003320 */ jal 0xcc80 +/* d794: 0c003320 */ jal crashReset /* d798: 00000000 */ nop -/* d79c: 0fc02c88 */ jal 0xf00b220 +/* d79c: 0fc02c88 */ jal mpInitPresetFeatures /* d7a0: 00000000 */ nop -/* d7a4: 0fc5e243 */ jal 0xf17890c +/* d7a4: 0fc5e243 */ jal func0f176ddc /* d7a8: 00000000 */ nop -/* d7ac: 0c000d28 */ jal 0x34a0 +/* d7ac: 0c000d28 */ jal func000034d0 /* d7b0: 00000000 */ nop -/* d7b4: 0fc02c68 */ jal 0xf00b1a0 +/* d7b4: 0fc02c68 */ jal loadTextureList /* d7b8: 00000000 */ nop -/* d7bc: 0fc00000 */ jal 0xf000000 +/* d7bc: 0fc00000 */ jal func0f000000 /* d7c0: 00000000 */ nop -/* d7c4: 0fc5a45a */ jal 0xf169168 +/* d7c4: 0fc5a45a */ jal lv0f167af8 /* d7c8: 00000000 */ nop -/* d7cc: 0fc41edb */ jal 0xf107b6c +/* d7cc: 0fc41edb */ jal cheatsDisableAll /* d7d0: 00000000 */ nop -/* d7d4: 0c003a7d */ jal 0xe9f4 +/* d7d4: 0c003a7d */ jal func0000e9c0 /* d7d8: 00000000 */ nop -/* d7dc: 0fc55154 */ jal 0xf154550 +/* d7dc: 0fc55154 */ jal func0f1531a0 /* d7e0: 00000000 */ nop -/* d7e4: 0c004e5e */ jal 0x13978 +/* d7e4: 0c004e5e */ jal dhudInit /* d7e8: 00000000 */ nop -/* d7ec: 0fc4a37c */ jal 0xf128df0 +/* d7ec: 0fc4a37c */ jal playermgrInit /* d7f0: 00000000 */ nop -/* d7f4: 0fc5b9d8 */ jal 0xf16e760 +/* d7f4: 0fc5b9d8 */ jal frametimeInit /* d7f8: 00000000 */ nop -/* d7fc: 0fc02c84 */ jal 0xf00b210 +/* d7fc: 0fc02c84 */ jal stub0f00b200 /* d800: 00000000 */ nop -/* d804: 0c00265c */ jal 0x9970 +/* d804: 0c00265c */ jal profileInit /* d808: 00000000 */ nop -/* d80c: 0fc0021c */ jal 0xf000870 +/* d80c: 0fc0021c */ jal stub0f000870 /* d810: 00000000 */ nop -/* d814: 0fc00220 */ jal 0xf000880 +/* d814: 0fc00220 */ jal func0f000880 /* d818: 00000000 */ nop -/* d81c: 0fc00238 */ jal 0xf0008e0 +/* d81c: 0fc00238 */ jal stub0f0008e0 /* d820: 00000000 */ nop -/* d824: 0fc0023c */ jal 0xf0008f0 +/* d824: 0fc0023c */ jal stub0f0008f0 /* d828: 00000000 */ nop -/* d82c: 0fc00240 */ jal 0xf000900 +/* d82c: 0fc00240 */ jal stub0f000900 /* d830: 00000000 */ nop -/* d834: 0fc02c64 */ jal 0xf00b190 +/* d834: 0fc02c64 */ jal stub0f00b180 /* d838: 00000000 */ nop -/* d83c: 0fc00244 */ jal 0xf000910 +/* d83c: 0fc00244 */ jal stub0f000910 /* d840: 00000000 */ nop -/* d844: 0fc00210 */ jal 0xf000840 +/* d844: 0fc00210 */ jal stub0f000840 /* d848: 00000000 */ nop -/* d84c: 0fc62728 */ jal 0xf189ca0 +/* d84c: 0fc62728 */ jal mpSetDefaultSetup /* d850: 00000000 */ nop -/* d854: 0fc52db6 */ jal 0xf14b6d8 +/* d854: 0fc52db6 */ jal phAllocate /* d858: 00000000 */ nop -/* d85c: 0fc4649e */ jal 0xf119278 +/* d85c: 0fc4649e */ jal pakInitAll /* d860: 00000000 */ nop -/* d864: 0fc52ddb */ jal 0xf14b76c +/* d864: 0fc52ddb */ jal func0f14a3bc /* d868: 00000000 */ nop -/* d86c: 0c008e60 */ jal 0x23980 +/* d86c: 0c008e60 */ jal animsInit /* d870: 00000000 */ nop -/* d874: 0fc00040 */ jal 0xf000100 +/* d874: 0fc00040 */ jal func0f000100 /* d878: 00000000 */ nop -/* d87c: 0fc0004c */ jal 0xf000130 +/* d87c: 0fc0004c */ jal func0f000130 /* d880: 00000000 */ nop -/* d884: 0fc00214 */ jal 0xf000850 +/* d884: 0fc00214 */ jal stub0f000850 /* d888: 00000000 */ nop -/* d88c: 0fc00218 */ jal 0xf000860 +/* d88c: 0fc00218 */ jal stub0f000860 /* d890: 00000000 */ nop -/* d894: 0fc00024 */ jal 0xf000090 +/* d894: 0fc00024 */ jal func0f000090 /* d898: 00000000 */ nop -/* d89c: 0c0026ba */ jal 0x9ae8 +/* d89c: 0c0026ba */ jal viConfigureForLegal /* d8a0: 00000000 */ nop -/* d8a4: 0c002773 */ jal 0x9dcc +/* d8a4: 0c002773 */ jal viBlack /* d8a8: 24040001 */ li $a0,0x1 /* d8ac: 3c188006 */ lui $t8,0x8006 /* d8b0: 8f18e4e4 */ lw $t8,-0x1b1c($t8) @@ -1111,7 +1111,7 @@ glabel mainInit /* d8b8: ac20e828 */ sw $zero,-0x17d8($at) /* d8bc: 53000004 */ beqzl $t8,.PB0000d8d0 /* d8c0: 8fbf002c */ lw $ra,0x2c($sp) -/* d8c4: 0c0122b4 */ jal 0x48ad0 +/* d8c4: 0c0122b4 */ jal osGetCount /* d8c8: 00000000 */ nop /* d8cc: 8fbf002c */ lw $ra,0x2c($sp) .PB0000d8d0: @@ -3061,25 +3061,25 @@ glabel mainTick /* e188: 2d410002 */ sltiu $at,$t2,0x2 /* e18c: 50200146 */ beqzl $at,.PB0000e6a8 /* e190: 8fbf001c */ lw $ra,0x1c($sp) -/* e194: 0fc5b9fd */ jal 0xf16e7f4 +/* e194: 0fc5b9fd */ jal frametimeCalculate /* e198: 00000000 */ nop -/* e19c: 0c002662 */ jal 0x9988 +/* e19c: 0c002662 */ jal profile00009a98 /* e1a0: 00000000 */ nop -/* e1a4: 0c002660 */ jal 0x9980 +/* e1a4: 0c002660 */ jal profile00009a90 /* e1a8: 00000000 */ nop -/* e1ac: 0c002664 */ jal 0x9990 +/* e1ac: 0c002664 */ jal profileSetMarker /* e1b0: 3c040002 */ lui $a0,0x2 -/* e1b4: 0c000d2a */ jal 0x34a8 +/* e1b4: 0c000d2a */ jal func000034d8 /* e1b8: 00000000 */ nop -/* e1bc: 0c00534e */ jal 0x14d38 +/* e1bc: 0c00534e */ jal joyDebugJoy /* e1c0: 00000000 */ nop -/* e1c4: 0c0006ca */ jal 0x1b28 +/* e1c4: 0c0006ca */ jal schedSetCrashEnable2 /* e1c8: 00002025 */ move $a0,$zero /* e1cc: 3c048006 */ lui $a0,0x8006 /* e1d0: 8c84e4d8 */ lw $a0,-0x1b28($a0) /* e1d4: 1080011c */ beqz $a0,.PB0000e648 /* e1d8: 00000000 */ nop -/* e1dc: 0fc5a3eb */ jal 0xf168fac +/* e1dc: 0fc5a3eb */ jal gfxGetMasterDisplayList /* e1e0: 00000000 */ nop /* e1e4: 244b0008 */ addiu $t3,$v0,0x8 /* e1e8: afa20090 */ sw $v0,0x90($sp) @@ -3100,39 +3100,39 @@ glabel mainTick /* e224: 8d08e868 */ lw $t0,-0x1798($t0) /* e228: 15000006 */ bnez $t0,.PB0000e244 /* e22c: 00002025 */ move $a0,$zero -/* e230: 0c00566a */ jal 0x159a8 +/* e230: 0c00566a */ jal joyGetButtons /* e234: 2405000c */ li $a1,0xc /* e238: 2401000c */ li $at,0xc /* e23c: 1441001a */ bne $v0,$at,.PB0000e2a8 /* e240: 00002025 */ move $a0,$zero .PB0000e244: -/* e244: 0c005616 */ jal 0x15858 +/* e244: 0c005616 */ jal joyGetStickX /* e248: 00002025 */ move $a0,$zero /* e24c: 00028e00 */ sll $s1,$v0,0x18 /* e250: 00114e03 */ sra $t1,$s1,0x18 /* e254: 01208825 */ move $s1,$t1 -/* e258: 0c005640 */ jal 0x15900 +/* e258: 0c005640 */ jal joyGetStickY /* e25c: 00002025 */ move $a0,$zero /* e260: a3a2003b */ sb $v0,0x3b($sp) /* e264: 00002025 */ move $a0,$zero -/* e268: 0c00566a */ jal 0x159a8 +/* e268: 0c00566a */ jal joyGetButtons /* e26c: 3405ffff */ li $a1,0xffff /* e270: 3050ffff */ andi $s0,$v0,0xffff /* e274: 00002025 */ move $a0,$zero -/* e278: 0c00569a */ jal 0x15a68 +/* e278: 0c00569a */ jal joyGetButtonsPressedThisFrame /* e27c: 3405ffff */ li $a1,0xffff /* e280: 00112600 */ sll $a0,$s1,0x18 /* e284: 00045603 */ sra $t2,$a0,0x18 /* e288: 01402025 */ move $a0,$t2 /* e28c: 83a5003b */ lb $a1,0x3b($sp) /* e290: 3206ffff */ andi $a2,$s0,0xffff -/* e294: 0fc47f67 */ jal 0xf11fd9c +/* e294: 0fc47f67 */ jal debugProcessInput /* e298: 3047ffff */ andi $a3,$v0,0xffff /* e29c: 3c018006 */ lui $at,0x8006 /* e2a0: 10000021 */ b .PB0000e328 /* e2a4: ac22e868 */ sw $v0,-0x1798($at) .PB0000e2a8: -/* e2a8: 0c00566a */ jal 0x159a8 +/* e2a8: 0c00566a */ jal joyGetButtons /* e2ac: 24051000 */ li $a1,0x1000 /* e2b0: 14400005 */ bnez $v0,.PB0000e2c8 /* e2b4: 3c0b8007 */ lui $t3,0x8007 @@ -3141,34 +3141,34 @@ glabel mainTick /* e2c0: 10000019 */ b .PB0000e328 /* e2c4: ac2b7b78 */ sw $t3,0x7b78($at) .PB0000e2c8: -/* e2c8: 0c005616 */ jal 0x15858 +/* e2c8: 0c005616 */ jal joyGetStickX /* e2cc: 00002025 */ move $a0,$zero /* e2d0: 00028e00 */ sll $s1,$v0,0x18 /* e2d4: 00116603 */ sra $t4,$s1,0x18 /* e2d8: 01808825 */ move $s1,$t4 -/* e2dc: 0c005640 */ jal 0x15900 +/* e2dc: 0c005640 */ jal joyGetStickY /* e2e0: 00002025 */ move $a0,$zero /* e2e4: a3a2003b */ sb $v0,0x3b($sp) /* e2e8: 00002025 */ move $a0,$zero -/* e2ec: 0c00566a */ jal 0x159a8 +/* e2ec: 0c00566a */ jal joyGetButtons /* e2f0: 3405ffff */ li $a1,0xffff /* e2f4: 3050ffff */ andi $s0,$v0,0xffff /* e2f8: 00002025 */ move $a0,$zero -/* e2fc: 0c00569a */ jal 0x15a68 +/* e2fc: 0c00569a */ jal joyGetButtonsPressedThisFrame /* e300: 3405ffff */ li $a1,0xffff /* e304: 00112600 */ sll $a0,$s1,0x18 /* e308: 00046e03 */ sra $t5,$a0,0x18 /* e30c: 01a02025 */ move $a0,$t5 /* e310: 83a5003b */ lb $a1,0x3b($sp) /* e314: 3206ffff */ andi $a2,$s0,0xffff -/* e318: 0fc47f67 */ jal 0xf11fd9c +/* e318: 0fc47f67 */ jal debugProcessInput /* e31c: 3047ffff */ andi $a3,$v0,0xffff /* e320: 3c018006 */ lui $at,0x8006 /* e324: ac22e868 */ sw $v0,-0x1798($at) .PB0000e328: -/* e328: 0fc5b487 */ jal 0xf16d21c +/* e328: 0fc5b487 */ jal lvTick /* e32c: 00000000 */ nop -/* e330: 0fc4a8a7 */ jal 0xf12a29c +/* e330: 0fc4a8a7 */ jal playermgrShuffle /* e334: 00000000 */ nop /* e338: 3c198006 */ lui $t9,0x8006 /* e33c: 8f39e4c4 */ lw $t9,-0x1b3c($t9) @@ -3211,32 +3211,32 @@ glabel mainTick /* e3c0: 19600038 */ blez $t3,.PB0000e4a4 /* e3c4: 00000000 */ nop .PB0000e3c8: -/* e3c8: 0fc4a8ea */ jal 0xf12a3a8 +/* e3c8: 0fc4a8ea */ jal playermgrGetPlayerAtOrder /* e3cc: 02202025 */ move $a0,$s1 -/* e3d0: 0fc4a783 */ jal 0xf129e0c +/* e3d0: 0fc4a783 */ jal setCurrentPlayerNum /* e3d4: 00402025 */ move $a0,$v0 /* e3d8: 3c0c8006 */ lui $t4,0x8006 /* e3dc: 8d8ce4c4 */ lw $t4,-0x1b3c($t4) /* e3e0: 2401004e */ li $at,0x4e /* e3e4: 55810006 */ bnel $t4,$at,.PB0000e400 /* e3e8: 8e020284 */ lw $v0,0x284($s0) -/* e3ec: 0fc06b11 */ jal 0xf01ac44 +/* e3ec: 0fc06b11 */ jal titleIsKeepingMode /* e3f0: 00000000 */ nop /* e3f4: 1440000b */ bnez $v0,.PB0000e424 /* e3f8: 00000000 */ nop /* e3fc: 8e020284 */ lw $v0,0x284($s0) .PB0000e400: /* e400: 84440634 */ lh $a0,0x634($v0) -/* e404: 0c002e75 */ jal 0xb9d4 +/* e404: 0c002e75 */ jal viSetViewPosition /* e408: 84450636 */ lh $a1,0x636($v0) /* e40c: 8e020284 */ lw $v0,0x284($s0) /* e410: c44c1854 */ lwc1 $f12,0x1854($v0) /* e414: c44e1858 */ lwc1 $f14,0x1858($v0) /* e418: 84460630 */ lh $a2,0x630($v0) -/* e41c: 0c002ec1 */ jal 0xbb04 +/* e41c: 0c002ec1 */ jal viSetFovAspectAndSize /* e420: 84470632 */ lh $a3,0x632($v0) .PB0000e424: -/* e424: 0fc5b915 */ jal 0xf16e454 +/* e424: 0fc5b915 */ jal lvTickPlayer /* e428: 00000000 */ nop /* e42c: 8e0d006c */ lw $t5,0x6c($s0) /* e430: 26310001 */ addiu $s1,$s1,0x1 @@ -3273,12 +3273,12 @@ glabel mainTick /* e49c: 1420ffca */ bnez $at,.PB0000e3c8 /* e4a0: 00000000 */ nop .PB0000e4a4: -/* e4a4: 0fc5ab7d */ jal 0xf16adf4 +/* e4a4: 0fc5ab7d */ jal lvRender /* e4a8: 8fa40094 */ lw $a0,0x94($sp) /* e4ac: afa20094 */ sw $v0,0x94($sp) -/* e4b0: 0c000d2c */ jal 0x34b0 +/* e4b0: 0c000d2c */ jal func000034e0 /* e4b4: 27a40094 */ addiu $a0,$sp,0x94 -/* e4b8: 0fc4808c */ jal 0xf120230 +/* e4b8: 0fc4808c */ jal debugIsLineModeEnabled /* e4bc: 00000000 */ nop /* e4c0: 1040003e */ beqz $v0,.PB0000e5bc /* e4c4: 2407ffff */ li $a3,-1 @@ -3326,11 +3326,11 @@ glabel mainTick /* e56c: adc80000 */ sw $t0,0x0($t6) /* e570: 8fb00094 */ lw $s0,0x94($sp) /* e574: 260b0008 */ addiu $t3,$s0,0x8 -/* e578: 0c002e4d */ jal 0xb934 +/* e578: 0c002e4d */ jal viGetWidth /* e57c: afab0094 */ sw $t3,0x94($sp) /* e580: 00028c00 */ sll $s1,$v0,0x10 /* e584: 00116403 */ sra $t4,$s1,0x10 -/* e588: 0c002e51 */ jal 0xb944 +/* e588: 0c002e51 */ jal viGetHeight /* e58c: 01808825 */ move $s1,$t4 /* e590: 244dffff */ addiu $t5,$v0,-1 /* e594: 31b903ff */ andi $t9,$t5,0x3ff @@ -3344,16 +3344,16 @@ glabel mainTick /* e5b4: ae0a0000 */ sw $t2,0x0($s0) /* e5b8: ae000004 */ sw $zero,0x4($s0) .PB0000e5bc: -/* e5bc: 0c004fd8 */ jal 0x13f60 +/* e5bc: 0c004fd8 */ jal dhudRender /* e5c0: 8fa40094 */ lw $a0,0x94($sp) -/* e5c4: 0c004f11 */ jal 0x13c44 +/* e5c4: 0c004f11 */ jal dhudReset /* e5c8: afa20094 */ sw $v0,0x94($sp) -/* e5cc: 0fc4806b */ jal 0xf1201ac +/* e5cc: 0fc4806b */ jal debug0f11ed70 /* e5d0: 00000000 */ nop /* e5d4: 28410002 */ slti $at,$v0,0x2 /* e5d8: 14200004 */ bnez $at,.PB0000e5ec /* e5dc: 00000000 */ nop -/* e5e0: 0c002666 */ jal 0x9998 +/* e5e0: 0c002666 */ jal profileRender /* e5e4: 8fa40094 */ lw $a0,0x94($sp) /* e5e8: afa20094 */ sw $v0,0x94($sp) .PB0000e5ec: @@ -3361,9 +3361,9 @@ glabel mainTick /* e5f0: 8d6be868 */ lw $t3,-0x1798($t3) /* e5f4: 51600007 */ beqzl $t3,.PB0000e614 /* e5f8: 8fac0094 */ lw $t4,0x94($sp) -/* e5fc: 0fc47ee8 */ jal 0xf11fba0 +/* e5fc: 0fc47ee8 */ jal debugUpdateMenu /* e600: 00000000 */ nop -/* e604: 0fc47d89 */ jal 0xf11f624 +/* e604: 0fc47d89 */ jal dmenuRender /* e608: 8fa40094 */ lw $a0,0x94($sp) /* e60c: afa20094 */ sw $v0,0x94($sp) /* e610: 8fac0094 */ lw $t4,0x94($sp) @@ -3384,27 +3384,27 @@ glabel mainTick .PB0000e648: /* e648: 50800006 */ beqzl $a0,.PB0000e664 /* e64c: 8fa40090 */ lw $a0,0x90($sp) -/* e650: 0fc5a422 */ jal 0xf169088 +/* e650: 0fc5a422 */ jal gfxSwapBuffers /* e654: 00000000 */ nop -/* e658: 0c0027d3 */ jal 0x9f4c +/* e658: 0c0027d3 */ jal viUpdateMode /* e65c: 00000000 */ nop /* e660: 8fa40090 */ lw $a0,0x90($sp) .PB0000e664: /* e664: 8fa50094 */ lw $a1,0x94($sp) /* e668: 00003025 */ move $a2,$zero -/* e66c: 0c00bfad */ jal 0x2feb4 +/* e66c: 0c00bfad */ jal rdpCreateTask /* e670: 27a70070 */ addiu $a3,$sp,0x70 /* e674: 3c028006 */ lui $v0,0x8006 /* e678: 2442e4dc */ addiu $v0,$v0,-6948 /* e67c: 8c4e0000 */ lw $t6,0x0($v0) /* e680: 25c90001 */ addiu $t1,$t6,0x1 -/* e684: 0c004ad2 */ jal 0x12b48 +/* e684: 0c004ad2 */ jal memaPrint /* e688: ac490000 */ sw $t1,0x0($v0) -/* e68c: 0fc5ba3d */ jal 0xf16e8f4 +/* e68c: 0fc5ba3d */ jal func0f16cf94 /* e690: 00000000 */ nop -/* e694: 0c002664 */ jal 0x9990 +/* e694: 0c002664 */ jal profileSetMarker /* e698: 3c040001 */ lui $a0,0x1 -/* e69c: 0fc480d1 */ jal 0xf120344 +/* e69c: 0fc480d1 */ jal debug0f119a80nb /* e6a0: 00000000 */ nop /* e6a4: 8fbf001c */ lw $ra,0x1c($sp) .PB0000e6a8: diff --git a/src/lib/mema.c b/src/lib/mema.c index 22afd5e95..b0bf18420 100644 --- a/src/lib/mema.c +++ b/src/lib/mema.c @@ -296,76 +296,76 @@ glabel memaPrint /* 12b48: 27bdff58 */ addiu $sp,$sp,-168 /* 12b4c: afbf0014 */ sw $ra,0x14($sp) /* 12b50: 3c04800a */ lui $a0,0x800a -/* 12b54: 0c0049e8 */ jal 0x127a0 +/* 12b54: 0c0049e8 */ jal memaDefragPass /* 12b58: 2484c1a8 */ addiu $a0,$a0,-15960 -/* 12b5c: 0fc48118 */ jal 0xf120460 +/* 12b5c: 0fc48118 */ jal debug0f119b9cnb /* 12b60: 00000000 */ nop /* 12b64: 10400041 */ beqz $v0,.PB00012c6c /* 12b68: 240400ff */ li $a0,0xff /* 12b6c: 240500ff */ li $a1,0xff /* 12b70: 240600ff */ li $a2,0xff -/* 12b74: 0c004f62 */ jal 0x13d88 +/* 12b74: 0c004f62 */ jal dhudSetFgColour /* 12b78: 240700ff */ li $a3,0xff /* 12b7c: 00002025 */ move $a0,$zero /* 12b80: 00002825 */ move $a1,$zero /* 12b84: 00003025 */ move $a2,$zero -/* 12b88: 0c004f71 */ jal 0x13dc4 +/* 12b88: 0c004f71 */ jal dhudSetBgColour /* 12b8c: 240700ff */ li $a3,0xff /* 12b90: 24040004 */ li $a0,0x4 -/* 12b94: 0c00494d */ jal 0x12534 +/* 12b94: 0c00494d */ jal mempGetPoolFree /* 12b98: 00002825 */ move $a1,$zero /* 12b9c: 3c057005 */ lui $a1,0x7005 /* 12ba0: 24a54950 */ addiu $a1,$a1,0x4950 /* 12ba4: 27a4001c */ addiu $a0,$sp,0x1c -/* 12ba8: 0c004e1d */ jal 0x13874 +/* 12ba8: 0c004e1d */ jal sprintf /* 12bac: 00403025 */ move $a2,$v0 /* 12bb0: 2404001f */ li $a0,0x1f -/* 12bb4: 0c004f3b */ jal 0x13cec +/* 12bb4: 0c004f3b */ jal dhudSetPos /* 12bb8: 24050001 */ li $a1,0x1 -/* 12bbc: 0c004fc3 */ jal 0x13f0c +/* 12bbc: 0c004fc3 */ jal dhudPrintString /* 12bc0: 27a4001c */ addiu $a0,$sp,0x1c /* 12bc4: 240e0002 */ li $t6,0x2 /* 12bc8: afae009c */ sw $t6,0x9c($sp) /* 12bcc: 24040004 */ li $a0,0x4 -/* 12bd0: 0c00494d */ jal 0x12534 +/* 12bd0: 0c00494d */ jal mempGetPoolFree /* 12bd4: 24050001 */ li $a1,0x1 /* 12bd8: 3c057005 */ lui $a1,0x7005 /* 12bdc: 24a5495c */ addiu $a1,$a1,0x495c /* 12be0: 27a4001c */ addiu $a0,$sp,0x1c -/* 12be4: 0c004e1d */ jal 0x13874 +/* 12be4: 0c004e1d */ jal sprintf /* 12be8: 00403025 */ move $a2,$v0 /* 12bec: 2404001f */ li $a0,0x1f -/* 12bf0: 0c004f3b */ jal 0x13cec +/* 12bf0: 0c004f3b */ jal dhudSetPos /* 12bf4: 8fa5009c */ lw $a1,0x9c($sp) -/* 12bf8: 0c004fc3 */ jal 0x13f0c +/* 12bf8: 0c004fc3 */ jal dhudPrintString /* 12bfc: 27a4001c */ addiu $a0,$sp,0x1c /* 12c00: 8faf009c */ lw $t7,0x9c($sp) /* 12c04: 25f80001 */ addiu $t8,$t7,0x1 -/* 12c08: 0c004baa */ jal 0x12ea8 +/* 12c08: 0c004baa */ jal memaGetLongestFree /* 12c0c: afb8009c */ sw $t8,0x9c($sp) /* 12c10: 3c198006 */ lui $t9,0x8006 /* 12c14: 8f39f910 */ lw $t9,-0x6f0($t9) /* 12c18: 0059082b */ sltu $at,$v0,$t9 /* 12c1c: 10200005 */ beqz $at,.PB00012c34 /* 12c20: 00000000 */ nop -/* 12c24: 0c004baa */ jal 0x12ea8 +/* 12c24: 0c004baa */ jal memaGetLongestFree /* 12c28: 00000000 */ nop /* 12c2c: 3c018006 */ lui $at,0x8006 /* 12c30: ac22f910 */ sw $v0,-0x6f0($at) .PB00012c34: -/* 12c34: 0c004baa */ jal 0x12ea8 +/* 12c34: 0c004baa */ jal memaGetLongestFree /* 12c38: 00000000 */ nop /* 12c3c: 3c057005 */ lui $a1,0x7005 /* 12c40: 3c078006 */ lui $a3,0x8006 /* 12c44: 8ce7f910 */ lw $a3,-0x6f0($a3) /* 12c48: 24a54968 */ addiu $a1,$a1,0x4968 /* 12c4c: 27a4001c */ addiu $a0,$sp,0x1c -/* 12c50: 0c004e1d */ jal 0x13874 +/* 12c50: 0c004e1d */ jal sprintf /* 12c54: 00403025 */ move $a2,$v0 /* 12c58: 2404001f */ li $a0,0x1f -/* 12c5c: 0c004f3b */ jal 0x13cec +/* 12c5c: 0c004f3b */ jal dhudSetPos /* 12c60: 8fa5009c */ lw $a1,0x9c($sp) -/* 12c64: 0c004fc3 */ jal 0x13f0c +/* 12c64: 0c004fc3 */ jal dhudPrintString /* 12c68: 27a4001c */ addiu $a0,$sp,0x1c .PB00012c6c: /* 12c6c: 8fbf0014 */ lw $ra,0x14($sp) diff --git a/src/lib/model.c b/src/lib/model.c index 773f7ef98..87693b923 100644 --- a/src/lib/model.c +++ b/src/lib/model.c @@ -1807,7 +1807,7 @@ glabel var70053fc0pf /* 1cab8: afb80014 */ sw $t8,0x14($sp) /* 1cabc: 8fa40154 */ lw $a0,0x154($sp) /* 1cac0: 8fa60150 */ lw $a2,0x150($sp) -/* 1cac4: 0c009184 */ jal 0x24610 +/* 1cac4: 0c009184 */ jal anim00024050 /* 1cac8: afb90010 */ sw $t9,0x10($sp) /* 1cacc: 3c0a800a */ lui $t2,0x800a /* 1cad0: 8d4ae99c */ lw $t2,-0x1664($t2) @@ -1823,7 +1823,7 @@ glabel var70053fc0pf /* 1caf8: 3c017005 */ lui $at,0x7005 /* 1cafc: c4284cbc */ lwc1 $f8,0x4cbc($at) /* 1cb00: 46002183 */ div.s $f6,$f4,$f0 -/* 1cb04: 0fc25dc0 */ jal 0xf097700 +/* 1cb04: 0fc25dc0 */ jal floorf /* 1cb08: 46083300 */ add.s $f12,$f6,$f8 /* 1cb0c: c60a001c */ lwc1 $f10,0x1c($s0) /* 1cb10: 44807000 */ mtc1 $zero,$f14 @@ -1848,13 +1848,13 @@ glabel var70053fc0pf /* 1cb54: e7a200e0 */ swc1 $f2,0xe0($sp) /* 1cb58: afad0018 */ sw $t5,0x18($sp) /* 1cb5c: afac0014 */ sw $t4,0x14($sp) -/* 1cb60: 0c009184 */ jal 0x24610 +/* 1cb60: 0c009184 */ jal anim00024050 /* 1cb64: afab0010 */ sw $t3,0x10($sp) /* 1cb68: c7a200e0 */ lwc1 $f2,0xe0($sp) /* 1cb6c: 27a40144 */ addiu $a0,$sp,0x144 /* 1cb70: 27a500d4 */ addiu $a1,$sp,0xd4 /* 1cb74: 44061000 */ mfc1 $a2,$f2 -/* 1cb78: 0c006eb3 */ jal 0x1bacc +/* 1cb78: 0c006eb3 */ jal model0001b07c /* 1cb7c: 00000000 */ nop /* 1cb80: 8faf003c */ lw $t7,0x3c($sp) /* 1cb84: c7a200e0 */ lwc1 $f2,0xe0($sp) @@ -1866,7 +1866,7 @@ glabel var70053fc0pf /* 1cb9c: 44807000 */ mtc1 $zero,$f14 .PB0001cba0: /* 1cba0: 44061000 */ mfc1 $a2,$f2 -/* 1cba4: 0c006e7a */ jal 0x1b9e8 +/* 1cba4: 0c006e7a */ jal model0001af98 /* 1cba8: 27a500c8 */ addiu $a1,$sp,0xc8 .PB0001cbac: /* 1cbac: 44807000 */ mtc1 $zero,$f14 @@ -1904,7 +1904,7 @@ glabel var70053fc0pf /* 1cc20: afaa001c */ sw $t2,0x1c($sp) /* 1cc24: afa90018 */ sw $t1,0x18($sp) /* 1cc28: afa80014 */ sw $t0,0x14($sp) -/* 1cc2c: 0c009184 */ jal 0x24610 +/* 1cc2c: 0c009184 */ jal anim00024050 /* 1cc30: afb80010 */ sw $t8,0x10($sp) /* 1cc34: 44802000 */ mtc1 $zero,$f4 /* 1cc38: c6060034 */ lwc1 $f6,0x34($s0) @@ -1922,26 +1922,26 @@ glabel var70053fc0pf /* 1cc68: afae001c */ sw $t6,0x1c($sp) /* 1cc6c: afad0018 */ sw $t5,0x18($sp) /* 1cc70: afac0014 */ sw $t4,0x14($sp) -/* 1cc74: 0c009184 */ jal 0x24610 +/* 1cc74: 0c009184 */ jal anim00024050 /* 1cc78: afab0010 */ sw $t3,0x10($sp) /* 1cc7c: 27a400b0 */ addiu $a0,$sp,0xb0 /* 1cc80: 27a5005c */ addiu $a1,$sp,0x5c -/* 1cc84: 0c006eb3 */ jal 0x1bacc +/* 1cc84: 0c006eb3 */ jal model0001b07c /* 1cc88: 8e060034 */ lw $a2,0x34($s0) /* 1cc8c: 27a40144 */ addiu $a0,$sp,0x144 .PB0001cc90: -/* 1cc90: 0fc25ac4 */ jal 0xf096b10 +/* 1cc90: 0fc25ac4 */ jal quaternion0f096ca0 /* 1cc94: 27a50088 */ addiu $a1,$sp,0x88 /* 1cc98: 27a400b0 */ addiu $a0,$sp,0xb0 -/* 1cc9c: 0fc25ac4 */ jal 0xf096b10 +/* 1cc9c: 0fc25ac4 */ jal quaternion0f096ca0 /* 1cca0: 27a50078 */ addiu $a1,$sp,0x78 /* 1cca4: 27a40088 */ addiu $a0,$sp,0x88 -/* 1cca8: 0fc25d4c */ jal 0xf097530 +/* 1cca8: 0fc25d4c */ jal quaternion0f0976c0 /* 1ccac: 27a50078 */ addiu $a1,$sp,0x78 /* 1ccb0: 27a70068 */ addiu $a3,$sp,0x68 /* 1ccb4: 27a40088 */ addiu $a0,$sp,0x88 /* 1ccb8: 27a50078 */ addiu $a1,$sp,0x78 -/* 1ccbc: 0fc25c4a */ jal 0xf097128 +/* 1ccbc: 0fc25c4a */ jal quaternionSlerp /* 1ccc0: 8e060054 */ lw $a2,0x54($s0) /* 1ccc4: 44804000 */ mtc1 $zero,$f8 /* 1ccc8: c7aa0138 */ lwc1 $f10,0x138($sp) @@ -1996,7 +1996,7 @@ glabel var70053fc0pf /* 1cd88: 8fa40160 */ lw $a0,0x160($sp) .PB0001cd8c: /* 1cd8c: afb80010 */ sw $t8,0x10($sp) -/* 1cd90: 0c00719f */ jal 0x1c67c +/* 1cd90: 0c00719f */ jal model0001bc14 /* 1cd94: afa80014 */ sw $t0,0x14($sp) /* 1cd98: 100000a2 */ b .PB0001d024 /* 1cd9c: 8fbf002c */ lw $ra,0x2c($sp) @@ -2014,20 +2014,20 @@ glabel var70053fc0pf /* 1cdc8: afad0014 */ sw $t5,0x14($sp) /* 1cdcc: 8fa40160 */ lw $a0,0x160($sp) /* 1cdd0: 01202825 */ move $a1,$t1 -/* 1cdd4: 0c00719f */ jal 0x1c67c +/* 1cdd4: 0c00719f */ jal model0001bc14 /* 1cdd8: afac0010 */ sw $t4,0x10($sp) /* 1cddc: 10000091 */ b .PB0001d024 /* 1cde0: 8fbf002c */ lw $ra,0x2c($sp) .PB0001cde4: /* 1cde4: afae0010 */ sw $t6,0x10($sp) -/* 1cde8: 0c00719f */ jal 0x1c67c +/* 1cde8: 0c00719f */ jal model0001bc14 /* 1cdec: afaf0014 */ sw $t7,0x14($sp) /* 1cdf0: 1000008c */ b .PB0001d024 /* 1cdf4: 8fbf002c */ lw $ra,0x2c($sp) .PB0001cdf8: /* 1cdf8: 13200019 */ beqz $t9,.PB0001ce60 /* 1cdfc: c7a60138 */ lwc1 $f6,0x138($sp) -/* 1ce00: 0fc577be */ jal 0xf15def8 +/* 1ce00: 0fc577be */ jal func0f15c888 /* 1ce04: 00000000 */ nop /* 1ce08: c7a60138 */ lwc1 $f6,0x138($sp) /* 1ce0c: c7b0013c */ lwc1 $f16,0x13c($sp) @@ -2047,7 +2047,7 @@ glabel var70053fc0pf /* 1ce44: 8fa50164 */ lw $a1,0x164($sp) /* 1ce48: e7a80140 */ swc1 $f8,0x140($sp) /* 1ce4c: 8fa60168 */ lw $a2,0x168($sp) -/* 1ce50: 0c00709d */ jal 0x1c274 +/* 1ce50: 0c00709d */ jal model0001b80c /* 1ce54: 27a70144 */ addiu $a3,$sp,0x144 /* 1ce58: 10000072 */ b .PB0001d024 /* 1ce5c: 8fbf002c */ lw $ra,0x2c($sp) @@ -2102,7 +2102,7 @@ glabel var70053fc0pf /* 1cf10: 8fa60168 */ lw $a2,0x168($sp) /* 1cf14: afaf0010 */ sw $t7,0x10($sp) /* 1cf18: afa00014 */ sw $zero,0x14($sp) -/* 1cf1c: 0c00709d */ jal 0x1c274 +/* 1cf1c: 0c00709d */ jal model0001b80c /* 1cf20: afb90018 */ sw $t9,0x18($sp) /* 1cf24: 1000003f */ b .PB0001d024 /* 1cf28: 8fbf002c */ lw $ra,0x2c($sp) @@ -2123,7 +2123,7 @@ glabel var70053fc0pf /* 1cf60: 03003025 */ move $a2,$t8 /* 1cf64: 27a70144 */ addiu $a3,$sp,0x144 /* 1cf68: afa00014 */ sw $zero,0x14($sp) -/* 1cf6c: 0c00709d */ jal 0x1c274 +/* 1cf6c: 0c00709d */ jal model0001b80c /* 1cf70: afac0010 */ sw $t4,0x10($sp) /* 1cf74: 1000002b */ b .PB0001d024 /* 1cf78: 8fbf002c */ lw $ra,0x2c($sp) @@ -2132,7 +2132,7 @@ glabel var70053fc0pf /* 1cf80: 27ae012c */ addiu $t6,$sp,0x12c /* 1cf84: afae0018 */ sw $t6,0x18($sp) /* 1cf88: afad0010 */ sw $t5,0x10($sp) -/* 1cf8c: 0c00709d */ jal 0x1c274 +/* 1cf8c: 0c00709d */ jal model0001b80c /* 1cf90: afa00014 */ sw $zero,0x14($sp) /* 1cf94: 10000023 */ b .PB0001d024 /* 1cf98: 8fbf002c */ lw $ra,0x2c($sp) @@ -2143,7 +2143,7 @@ glabel var70053fc0pf /* 1cfa8: 8de50008 */ lw $a1,0x8($t7) /* 1cfac: 50a00006 */ beqzl $a1,.PB0001cfc8 /* 1cfb0: 8f300000 */ lw $s0,0x0($t9) -/* 1cfb4: 0c006c07 */ jal 0x1b01c +/* 1cfb4: 0c006c07 */ jal model0001a5cc /* 1cfb8: 00003025 */ move $a2,$zero /* 1cfbc: 10000002 */ b .PB0001cfc8 /* 1cfc0: 00408025 */ move $s0,$v0 @@ -2152,7 +2152,7 @@ glabel var70053fc0pf /* 1cfc8: 1200000f */ beqz $s0,.PB0001d008 /* 1cfcc: 8fa40158 */ lw $a0,0x158($sp) /* 1cfd0: 8fa40158 */ lw $a0,0x158($sp) -/* 1cfd4: 0c005c4b */ jal 0x1712c +/* 1cfd4: 0c005c4b */ jal mtx4LoadTranslation /* 1cfd8: 27a500e8 */ addiu $a1,$sp,0xe8 /* 1cfdc: 8fa80158 */ lw $t0,0x158($sp) /* 1cfe0: 8faa0164 */ lw $t2,0x164($sp) @@ -2161,7 +2161,7 @@ glabel var70053fc0pf /* 1cfec: 8d49000c */ lw $t1,0xc($t2) /* 1cff0: 27a500e8 */ addiu $a1,$sp,0xe8 /* 1cff4: 00186180 */ sll $t4,$t8,0x6 -/* 1cff8: 0c00598d */ jal 0x16634 +/* 1cff8: 0c00598d */ jal mtx00015be4 /* 1cffc: 012c3021 */ addu $a2,$t1,$t4 /* 1d000: 10000008 */ b .PB0001d024 /* 1d004: 8fbf002c */ lw $ra,0x2c($sp) @@ -2170,7 +2170,7 @@ glabel var70053fc0pf /* 1d00c: 848f000e */ lh $t7,0xe($a0) /* 1d010: 8dae000c */ lw $t6,0xc($t5) /* 1d014: 000fc980 */ sll $t9,$t7,0x6 -/* 1d018: 0c005c4b */ jal 0x1712c +/* 1d018: 0c005c4b */ jal mtx4LoadTranslation /* 1d01c: 01d92821 */ addu $a1,$t6,$t9 /* 1d020: 8fbf002c */ lw $ra,0x2c($sp) .PB0001d024: diff --git a/src/lib/ultra/os/initialize2.c b/src/lib/ultra/os/initialize2.c index 850370cc7..43380db06 100644 --- a/src/lib/ultra/os/initialize2.c +++ b/src/lib/ultra/os/initialize2.c @@ -219,25 +219,25 @@ glabel osInitialize2 /* 5248c: 3c018009 */ lui $at,0x8009 /* 52490: afb00018 */ sw $s0,0x18($sp) /* 52494: afa00030 */ sw $zero,0x30($sp) -/* 52498: 0c012ca4 */ jal 0x4b290 +/* 52498: 0c012ca4 */ jal __osGetSR /* 5249c: ac2e2f40 */ sw $t6,0x2f40($at) /* 524a0: 00408025 */ move $s0,$v0 /* 524a4: 3c012000 */ lui $at,0x2000 -/* 524a8: 0c012ca0 */ jal 0x4b280 +/* 524a8: 0c012ca0 */ jal __osSetSR /* 524ac: 02012025 */ or $a0,$s0,$at /* 524b0: 3c040100 */ lui $a0,0x100 -/* 524b4: 0c0121e8 */ jal 0x487a0 +/* 524b4: 0c0121e8 */ jal __osSetFpcCsr /* 524b8: 34840800 */ ori $a0,$a0,0x800 /* 524bc: 3c041fc0 */ lui $a0,0x1fc0 /* 524c0: 348407fc */ ori $a0,$a0,0x7fc -/* 524c4: 0c012ca8 */ jal 0x4b2a0 +/* 524c4: 0c012ca8 */ jal __osSiRawReadIo /* 524c8: 27a50034 */ addiu $a1,$sp,0x34 /* 524cc: 10400007 */ beqz $v0,.PB000524ec /* 524d0: 00000000 */ nop .PB000524d4: /* 524d4: 3c041fc0 */ lui $a0,0x1fc0 /* 524d8: 348407fc */ ori $a0,$a0,0x7fc -/* 524dc: 0c012ca8 */ jal 0x4b2a0 +/* 524dc: 0c012ca8 */ jal __osSiRawReadIo /* 524e0: 27a50034 */ addiu $a1,$sp,0x34 /* 524e4: 1440fffb */ bnez $v0,.PB000524d4 /* 524e8: 00000000 */ nop @@ -246,7 +246,7 @@ glabel osInitialize2 /* 524f0: 3c041fc0 */ lui $a0,0x1fc0 /* 524f4: 348407fc */ ori $a0,$a0,0x7fc /* 524f8: 34af0008 */ ori $t7,$a1,0x8 -/* 524fc: 0c012cbc */ jal 0x4b2f0 +/* 524fc: 0c012cbc */ jal __osSiRawWriteIo /* 52500: 01e02825 */ move $a1,$t7 /* 52504: 10400009 */ beqz $v0,.PB0005252c /* 52508: 00000000 */ nop @@ -255,7 +255,7 @@ glabel osInitialize2 /* 52510: 3c041fc0 */ lui $a0,0x1fc0 /* 52514: 348407fc */ ori $a0,$a0,0x7fc /* 52518: 34b80008 */ ori $t8,$a1,0x8 -/* 5251c: 0c012cbc */ jal 0x4b2f0 +/* 5251c: 0c012cbc */ jal __osSiRawWriteIo /* 52520: 03002825 */ move $a1,$t8 /* 52524: 1440fff9 */ bnez $v0,.PB0005250c /* 52528: 00000000 */ nop @@ -308,30 +308,30 @@ glabel osInitialize2 /* 525e0: 8dc10008 */ lw $at,0x8($t6) /* 525e4: ade10008 */ sw $at,0x8($t7) /* 525e8: 8dd8000c */ lw $t8,0xc($t6) -/* 525ec: 0c012cd0 */ jal 0x4b340 +/* 525ec: 0c012cd0 */ jal osWritebackDCache /* 525f0: adf8000c */ sw $t8,0xc($t7) /* 525f4: 3c048000 */ lui $a0,0x8000 -/* 525f8: 0c0121c4 */ jal 0x48710 +/* 525f8: 0c0121c4 */ jal osInvalICache /* 525fc: 24050190 */ li $a1,0x190 -/* 52600: 0c0149ca */ jal 0x52728 +/* 52600: 0c0149ca */ jal osCartRomInit2 /* 52604: 00000000 */ nop -/* 52608: 0c014b50 */ jal 0x52d40 +/* 52608: 0c014b50 */ jal osUnmapTLBAll /* 5260c: 00000000 */ nop -/* 52610: 0c000bf0 */ jal 0x2fc0 +/* 52610: 0c000bf0 */ jal osMapTLBRdb /* 52614: 00000000 */ nop /* 52618: 3c048006 */ lui $a0,0x8006 /* 5261c: 3c058006 */ lui $a1,0x8006 /* 52620: 8ca5d904 */ lw $a1,-0x26fc($a1) /* 52624: 8c84d900 */ lw $a0,-0x2700($a0) /* 52628: 24060000 */ li $a2,0x0 -/* 5262c: 0c013a0a */ jal 0x4e828 +/* 5262c: 0c013a0a */ jal __ll_mul /* 52630: 24070003 */ li $a3,0x3 /* 52634: afa20020 */ sw $v0,0x20($sp) /* 52638: afa30024 */ sw $v1,0x24($sp) /* 5263c: 8fa50024 */ lw $a1,0x24($sp) /* 52640: 8fa40020 */ lw $a0,0x20($sp) /* 52644: 24060000 */ li $a2,0x0 -/* 52648: 0c0139ca */ jal 0x4e728 +/* 52648: 0c0139ca */ jal __ull_div /* 5264c: 24070004 */ li $a3,0x4 /* 52650: 3c088000 */ lui $t0,0x8000 /* 52654: 8d08030c */ lw $t0,0x30c($t0) @@ -341,7 +341,7 @@ glabel osInitialize2 /* 52664: ac23d904 */ sw $v1,-0x26fc($at) /* 52668: 3c048000 */ lui $a0,0x8000 /* 5266c: 2484031c */ addiu $a0,$a0,0x31c -/* 52670: 0c012cf0 */ jal 0x4b3c0 +/* 52670: 0c012cf0 */ jal bzero /* 52674: 24050040 */ li $a1,0x40 .PB00052678: /* 52678: 3c198000 */ lui $t9,0x8000 @@ -370,7 +370,7 @@ glabel osInitialize2 /* 526cc: 3c018006 */ lui $at,0x8006 /* 526d0: ac2d29d8 */ sw $t5,0x29d8($at) .PB000526d4: -/* 526d4: 0c012d18 */ jal 0x4b460 +/* 526d4: 0c012d18 */ jal __osGetCause /* 526d8: 00000000 */ nop /* 526dc: 304c1000 */ andi $t4,$v0,0x1000 /* 526e0: 11800003 */ beqz $t4,.PB000526f0 diff --git a/src/lib/vi.c b/src/lib/vi.c index ce5cf1a5f..3814eb682 100644 --- a/src/lib/vi.c +++ b/src/lib/vi.c @@ -895,9 +895,9 @@ glabel viUpdateMode .PB00009f98: /* 9f98: 3c013f80 */ lui $at,0x3f80 /* 9f9c: 44816000 */ mtc1 $at,$f12 -/* 9fa0: 0c01252c */ jal 0x494b0 +/* 9fa0: 0c01252c */ jal osViSetYScale /* 9fa4: 00000000 */ nop -/* 9fa8: 0c0124a8 */ jal 0x492a0 +/* 9fa8: 0c0124a8 */ jal osViBlack /* 9fac: 24040001 */ li $a0,0x1 /* 9fb0: 3c098006 */ lui $t1,0x8006 /* 9fb4: 8d29df24 */ lw $t1,-0x20dc($t1) @@ -1419,7 +1419,7 @@ glabel viUpdateMode /* a710: 00007812 */ mflo $t7 /* a714: 00ef7021 */ addu $t6,$a3,$t7 /* a718: ac2edf24 */ sw $t6,-0x20dc($at) -/* a71c: 0c012d1c */ jal 0x4b470 +/* a71c: 0c012d1c */ jal bcopy /* a720: 8ca5df24 */ lw $a1,-0x20dc($a1) /* a724: 3c038009 */ lui $v1,0x8009 /* a728: 24634d57 */ addiu $v1,$v1,0x4d57 @@ -1437,7 +1437,7 @@ glabel viUpdateMode /* a758: 53000005 */ beqzl $t8,.PB0000a770 /* a75c: 8fbf0014 */ lw $ra,0x14($sp) /* a760: ac400000 */ sw $zero,0x0($v0) -/* a764: 0c002773 */ jal 0x9dcc +/* a764: 0c002773 */ jal viBlack /* a768: 00002025 */ move $a0,$zero /* a76c: 8fbf0014 */ lw $ra,0x14($sp) .PB0000a770: