From 47b1b537f3436bcdef452e49e7a6aba5c808bd7b Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Wed, 17 Mar 2021 22:59:54 +1000 Subject: [PATCH] ntsc-1.0 and pal-final: Replace hard coded jal addresses --- src/game/activemenu/activemenu.c | 72 ++-- src/game/bondeyespy.c | 68 ++-- src/game/bondview.c | 292 +++++++-------- src/game/bondwalk.c | 46 +-- src/game/cheats.c | 58 +-- src/game/chr/chr.c | 326 ++++++++--------- src/game/chr/chraction.c | 524 +++++++++++++-------------- src/game/chr/chraicommands.c | 72 ++-- src/game/core.c | 578 ++++++++++++++--------------- src/game/credits.c | 78 ++-- src/game/explosions/explosions.c | 86 ++--- src/game/game_005fd0.c | 16 +- src/game/game_00b320.c | 4 +- src/game/game_00c490.c | 54 +-- src/game/game_011110.c | 176 ++++----- src/game/game_01bea0.c | 176 ++++----- src/game/game_01d860.c | 4 +- src/game/game_092610.c | 36 +- src/game/game_097ba0.c | 602 +++++++++++++++---------------- src/game/game_0b69d0.c | 490 ++++++++++++------------- src/game/game_0e0770.c | 28 +- src/game/game_0f09f0.c | 504 +++++++++++++------------- src/game/game_102240.c | 4 +- src/game/game_107fb0.c | 8 +- src/game/game_10c9c0.c | 10 +- src/game/game_110680.c | 4 +- src/game/game_11f000.c | 68 ++-- src/game/game_1531a0.c | 64 ++-- src/game/game_190260.c | 460 +++++++++++------------ src/game/gamefile.c | 460 +++++++++++------------ src/game/hudmsg.c | 198 +++++----- src/game/lang.c | 20 +- src/game/mplayer/mplayer.c | 48 +-- src/game/mplayer/scenarios.c | 188 +++++----- src/game/pak/pak.c | 182 +++++----- src/game/prop.c | 48 +-- src/game/propobj.c | 514 +++++++++++++------------- src/game/room.c | 62 ++-- src/game/sight.c | 8 +- src/game/sparks/sparks.c | 10 +- src/game/title.c | 122 +++---- src/game/training/training.c | 128 +++---- src/lib/audiomgr.c | 44 +-- src/lib/entry.c | 2 +- src/lib/init.c | 6 +- src/lib/lib_09660.c | 4 +- src/lib/lib_09a80.c | 10 +- src/lib/lib_0e9d0.c | 46 +-- src/lib/lib_2fc60.c | 4 +- src/lib/lib_317f0.c | 4 +- src/lib/lib_3d280.c | 10 +- src/lib/main.c | 154 ++++---- src/lib/model.c | 112 +++--- src/lib/reset.c | 20 +- src/lib/ultra/os/initialize2.c | 32 +- 55 files changed, 3672 insertions(+), 3672 deletions(-) diff --git a/src/game/activemenu/activemenu.c b/src/game/activemenu/activemenu.c index d4066af3b..f07f81dd6 100644 --- a/src/game/activemenu/activemenu.c +++ b/src/game/activemenu/activemenu.c @@ -1410,7 +1410,7 @@ glabel amRender /* f1012ac: 90790250 */ lbu $t9,0x250($v1) /* f1012b0: 53200353 */ beqzl $t9,.PF0f102000 /* f1012b4: 8c621c04 */ lw $v0,0x1c04($v1) -/* f1012b8: 0fc550cf */ jal 0xf15433c +/* f1012b8: 0fc550cf */ jal func0f153628 /* f1012bc: 8fa401d8 */ lw $a0,0x1d8($sp) /* f1012c0: 3c08800a */ lui $t0,0x800a /* f1012c4: 2508a510 */ addiu $t0,$t0,-23280 @@ -1467,7 +1467,7 @@ glabel amRender .PF0f101388: /* f101388: 00182403 */ sra $a0,$t8,0x10 /* f10138c: 000e2c03 */ sra $a1,$t6,0x10 -/* f101390: 0fc3fe7d */ jal 0xf0ff9f4 +/* f101390: 0fc3fe7d */ jal amCalculateSlotPosition /* f101394: 26070008 */ addiu $a3,$s0,0x8 /* f101398: 3c18800a */ lui $t8,0x800a /* f10139c: 8f182758 */ lw $t8,0x2758($t8) @@ -1490,16 +1490,16 @@ glabel amRender /* f1013dc: 0004c400 */ sll $t8,$a0,0x10 /* f1013e0: 00182403 */ sra $a0,$t8,0x10 /* f1013e4: 000e2c03 */ sra $a1,$t6,0x10 -/* f1013e8: 0fc3fe7d */ jal 0xf0ff9f4 +/* f1013e8: 0fc3fe7d */ jal amCalculateSlotPosition /* f1013ec: 2607000c */ addiu $a3,$s0,0xc .PF0f1013f0: -/* f1013f0: 0fc3534f */ jal 0xf0d4d3c +/* f1013f0: 0fc3534f */ jal func0f0d479c /* f1013f4: 8fa401d8 */ lw $a0,0x1d8($sp) /* f1013f8: afa201d8 */ sw $v0,0x1d8($sp) -/* f1013fc: 0fc5a253 */ jal 0xf16894c +/* f1013fc: 0fc5a253 */ jal gfxAllocateColours /* f101400: 24040002 */ li $a0,0x2 /* f101404: 0040a825 */ move $s5,$v0 -/* f101408: 0fc5a239 */ jal 0xf1688e4 +/* f101408: 0fc5a239 */ jal gfxAllocateVertices /* f10140c: 24040008 */ li $a0,0x8 /* f101410: 8fb801d8 */ lw $t8,0x1d8($sp) /* f101414: 3c0ee700 */ lui $t6,0xe700 @@ -1553,7 +1553,7 @@ glabel amRender /* f1014d4: 27a401d8 */ addiu $a0,$sp,0x1d8 /* f1014d8: 00002825 */ move $a1,$zero /* f1014dc: 24060002 */ li $a2,0x2 -/* f1014e0: 0fc2cfb8 */ jal 0xf0b3ee0 +/* f1014e0: 0fc2cfb8 */ jal func0f0b39c0 /* f1014e4: 00003825 */ move $a3,$zero /* f1014e8: 8faf01d8 */ lw $t7,0x1d8($sp) /* f1014ec: 3c19b900 */ lui $t9,0xb900 @@ -1569,7 +1569,7 @@ glabel amRender /* f101514: 24040001 */ li $a0,0x1 /* f101518: 00002825 */ move $a1,$zero /* f10151c: adf90000 */ sw $t9,0x0($t7) -/* f101520: 0fc3fe7d */ jal 0xf0ff9f4 +/* f101520: 0fc3fe7d */ jal amCalculateSlotPosition /* f101524: adee0004 */ sw $t6,0x4($t7) /* f101528: 87af01ba */ lh $t7,0x1ba($sp) /* f10152c: 2411000a */ li $s1,0xa @@ -1586,7 +1586,7 @@ glabel amRender /* f101558: 03310019 */ multu $t9,$s1 /* f10155c: 00007012 */ mflo $t6 /* f101560: a60e0002 */ sh $t6,0x2($s0) -/* f101564: 0fc3fe7d */ jal 0xf0ff9f4 +/* f101564: 0fc3fe7d */ jal amCalculateSlotPosition /* f101568: 00000000 */ nop /* f10156c: 87af01ba */ lh $t7,0x1ba($sp) /* f101570: 24040001 */ li $a0,0x1 @@ -1601,7 +1601,7 @@ glabel amRender /* f101594: 03310019 */ multu $t9,$s1 /* f101598: 00007012 */ mflo $t6 /* f10159c: a60e000e */ sh $t6,0xe($s0) -/* f1015a0: 0fc3fe7d */ jal 0xf0ff9f4 +/* f1015a0: 0fc3fe7d */ jal amCalculateSlotPosition /* f1015a4: 00000000 */ nop /* f1015a8: 87af01ba */ lh $t7,0x1ba($sp) /* f1015ac: 00002025 */ move $a0,$zero @@ -1616,7 +1616,7 @@ glabel amRender /* f1015d0: 03310019 */ multu $t9,$s1 /* f1015d4: 00007012 */ mflo $t6 /* f1015d8: a60e001a */ sh $t6,0x1a($s0) -/* f1015dc: 0fc3fe7d */ jal 0xf0ff9f4 +/* f1015dc: 0fc3fe7d */ jal amCalculateSlotPosition /* f1015e0: 00000000 */ nop /* f1015e4: 87af01ba */ lh $t7,0x1ba($sp) /* f1015e8: 8602000c */ lh $v0,0xc($s0) @@ -1687,7 +1687,7 @@ glabel amRender /* f1016e4: 26380008 */ addiu $t8,$s1,0x8 /* f1016e8: afb801d8 */ sw $t8,0x1d8($sp) /* f1016ec: 02a02025 */ move $a0,$s5 -/* f1016f0: 0c012ab0 */ jal 0x4aac0 +/* f1016f0: 0c012ab0 */ jal osVirtualToPhysical /* f1016f4: ae390000 */ sw $t9,0x0($s1) /* f1016f8: ae220004 */ sw $v0,0x4($s1) /* f1016fc: 8fb201d8 */ lw $s2,0x1d8($sp) @@ -1696,7 +1696,7 @@ glabel amRender /* f101708: 264f0008 */ addiu $t7,$s2,0x8 /* f10170c: afaf01d8 */ sw $t7,0x1d8($sp) /* f101710: 02002025 */ move $a0,$s0 -/* f101714: 0c012ab0 */ jal 0x4aac0 +/* f101714: 0c012ab0 */ jal osVirtualToPhysical /* f101718: ae580000 */ sw $t8,0x0($s2) /* f10171c: ae420004 */ sw $v0,0x4($s2) /* f101720: 8fb901d8 */ lw $t9,0x1d8($sp) @@ -1725,7 +1725,7 @@ glabel amRender /* f10177c: 37185621 */ ori $t8,$t8,0x5621 /* f101780: af380004 */ sw $t8,0x4($t9) /* f101784: af2f0000 */ sw $t7,0x0($t9) -/* f101788: 0fc353da */ jal 0xf0d4f68 +/* f101788: 0fc353da */ jal func0f0d49c8 /* f10178c: 8fa401d8 */ lw $a0,0x1d8($sp) /* f101790: 3c168007 */ lui $s6,0x8007 /* f101794: afa201d8 */ sw $v0,0x1d8($sp) @@ -1744,7 +1744,7 @@ glabel amRender /* f1017c0: 01c02825 */ move $a1,$t6 /* f1017c4: 27a60182 */ addiu $a2,$sp,0x182 /* f1017c8: 27a70180 */ addiu $a3,$sp,0x180 -/* f1017cc: 0fc3fe7d */ jal 0xf0ff9f4 +/* f1017cc: 0fc3fe7d */ jal amCalculateSlotPosition /* f1017d0: 2414ffff */ li $s4,-1 /* f1017d4: 3c18800a */ lui $t8,0x800a /* f1017d8: 8f182758 */ lw $t8,0x2758($t8) @@ -1764,7 +1764,7 @@ glabel amRender /* f10180c: 8319e58b */ lb $t9,-0x1a75($t8) /* f101810: 07210029 */ bgez $t9,.PF0f1018b8 /* f101814: 00000000 */ nop -/* f101818: 0fc3f983 */ jal 0xf0fe60c +/* f101818: 0fc3f983 */ jal amGetFirstBuddyIndex /* f10181c: 00000000 */ nop /* f101820: 04400025 */ bltz $v0,.PF0f1018b8 /* f101824: 00000000 */ nop @@ -1849,14 +1849,14 @@ glabel amRender /* f101954: 3c144f4f */ lui $s4,0x4f4f /* f101958: 36944f7f */ ori $s4,$s4,0x4f7f .PF0f10195c: -/* f10195c: 0fc3fa80 */ jal 0xf0fea00 +/* f10195c: 0fc3fa80 */ jal amGetSlotDetails /* f101960: 02a03025 */ move $a2,$s5 /* f101964: 24020001 */ li $v0,0x1 /* f101968: 1662000f */ bne $s3,$v0,.PF0f1019a8 /* f10196c: 8fa401d8 */ lw $a0,0x1d8($sp) /* f101970: 5622000e */ bnel $s1,$v0,.PF0f1019ac /* f101974: 8faf01d0 */ lw $t7,0x1d0($sp) -/* f101978: 0fc3fe0f */ jal 0xf0ff83c +/* f101978: 0fc3fe0f */ jal amIsCramped /* f10197c: 00000000 */ nop /* f101980: 14400011 */ bnez $v0,.PF0f1019c8 /* f101984: 8fa401d8 */ lw $a0,0x1d8($sp) @@ -1864,7 +1864,7 @@ glabel amRender /* f10198c: 02a02825 */ move $a1,$s5 /* f101990: 02803025 */ move $a2,$s4 /* f101994: 87a70182 */ lh $a3,0x182($sp) -/* f101998: 0fc3ff9d */ jal 0xf0ffe74 +/* f101998: 0fc3ff9d */ jal amRenderText /* f10199c: afae0010 */ sw $t6,0x10($sp) /* f1019a0: 10000009 */ b .PF0f1019c8 /* f1019a4: afa201d8 */ sw $v0,0x1d8($sp) @@ -1875,7 +1875,7 @@ glabel amRender /* f1019b0: 87a60182 */ lh $a2,0x182($sp) /* f1019b4: 87a70180 */ lh $a3,0x180($sp) /* f1019b8: afb00010 */ sw $s0,0x10($sp) -/* f1019bc: 0fc4022a */ jal 0xf1008a8 +/* f1019bc: 0fc4022a */ jal amRenderSlot /* f1019c0: afaf0014 */ sw $t7,0x14($sp) /* f1019c4: afa201d8 */ sw $v0,0x1d8($sp) .PF0f1019c8: @@ -1895,7 +1895,7 @@ glabel amRender /* f1019fc: 8319e58b */ lb $t9,-0x1a75($t8) /* f101a00: 07210004 */ bgez $t9,.PF0f101a14 /* f101a04: 00000000 */ nop -/* f101a08: 0fc3f983 */ jal 0xf0fe60c +/* f101a08: 0fc3f983 */ jal amGetFirstBuddyIndex /* f101a0c: 00000000 */ nop /* f101a10: 04410011 */ bgez $v0,.PF0f101a58 .PF0f101a14: @@ -1913,7 +1913,7 @@ glabel amRender /* f101a40: 28410002 */ slti $at,$v0,0x2 /* f101a44: 14200004 */ bnez $at,.PF0f101a58 /* f101a48: 00000000 */ nop -/* f101a4c: 0fc3ffcf */ jal 0xf0fff3c +/* f101a4c: 0fc3ffcf */ jal amRenderAibotInfo /* f101a50: 2445fffe */ addiu $a1,$v0,-2 /* f101a54: afa201d8 */ sw $v0,0x1d8($sp) .PF0f101a58: @@ -1972,7 +1972,7 @@ glabel amRender /* f101b14: 24120005 */ li $s2,0x5 /* f101b18: 24130003 */ li $s3,0x3 .PF0f101b1c: -/* f101b1c: 0c00685b */ jal 0x1a16c +/* f101b1c: 0c00685b */ jal sinf /* f101b20: c60c001c */ lwc1 $f12,0x1c($s0) /* f101b24: 3c013f80 */ lui $at,0x3f80 /* f101b28: 44812000 */ mtc1 $at,$f4 @@ -2031,7 +2031,7 @@ glabel amRender /* f101bf0: 3c144f4f */ lui $s4,0x4f4f /* f101bf4: 36944f7f */ ori $s4,$s4,0x4f7f .PF0f101bf8: -/* f101bf8: 0fc5513c */ jal 0xf1544f0 +/* f101bf8: 0fc5513c */ jal gfxSetPrimColour /* f101bfc: 02802825 */ move $a1,$s4 /* f101c00: 3c0e800a */ lui $t6,0x800a /* f101c04: 8dce2758 */ lw $t6,0x2758($t6) @@ -2049,7 +2049,7 @@ glabel amRender /* f101c30: 24010004 */ li $at,0x4 /* f101c34: 1721003c */ bne $t9,$at,.PF0f101d28 /* f101c38: 03008825 */ move $s1,$t8 -/* f101c3c: 0fc3fe0f */ jal 0xf0ff83c +/* f101c3c: 0fc3fe0f */ jal amIsCramped /* f101c40: 00000000 */ nop /* f101c44: 10400005 */ beqz $v0,.PF0f101c5c /* f101c48: 3c0e800a */ lui $t6,0x800a @@ -2096,7 +2096,7 @@ glabel amRender /* f101cd4: 14200014 */ bnez $at,.PF0f101d28 /* f101cd8: 24040004 */ li $a0,0x4 /* f101cdc: 27a50114 */ addiu $a1,$sp,0x114 -/* f101ce0: 0fc3fa80 */ jal 0xf0fea00 +/* f101ce0: 0fc3fa80 */ jal amGetSlotDetails /* f101ce4: 02003025 */ move $a2,$s0 /* f101ce8: 3c19800a */ lui $t9,0x800a /* f101cec: 8f392754 */ lw $t9,0x2754($t9) @@ -2106,7 +2106,7 @@ glabel amRender /* f101cfc: 27a50138 */ addiu $a1,$sp,0x138 /* f101d00: 02003025 */ move $a2,$s0 /* f101d04: afa00014 */ sw $zero,0x14($sp) -/* f101d08: 0fc5609a */ jal 0xf158268 +/* f101d08: 0fc5609a */ jal textMeasure /* f101d0c: afb90010 */ sw $t9,0x10($sp) /* f101d10: 8fb10138 */ lw $s1,0x138($sp) /* f101d14: 06210003 */ bgez $s1,.PF0f101d24 @@ -2287,11 +2287,11 @@ glabel amRender /* f101fc8: 00187880 */ sll $t7,$t8,0x2 /* f101fcc: 01eec825 */ or $t9,$t7,$t6 /* f101fd0: ac590004 */ sw $t9,0x4($v0) -/* f101fd4: 0fc55153 */ jal 0xf15454c +/* f101fd4: 0fc55153 */ jal func0f153838 /* f101fd8: 8fa401d8 */ lw $a0,0x1d8($sp) /* f101fdc: afa201d8 */ sw $v0,0x1d8($sp) .PF0f101fe0: -/* f101fe0: 0fc55125 */ jal 0xf154494 +/* f101fe0: 0fc55125 */ jal func0f153780 /* f101fe4: 8fa401d8 */ lw $a0,0x1d8($sp) /* f101fe8: 3c03800a */ lui $v1,0x800a /* f101fec: 3c0b800a */ lui $t3,0x800a @@ -2423,7 +2423,7 @@ glabel amRender /* f10219c: 0326c021 */ addu $t8,$t9,$a2 /* f1021a0: 17010011 */ bne $t8,$at,.PF0f1021e8 /* f1021a4: 00000000 */ nop -/* f1021a8: 0fc54ef9 */ jal 0xf153be4 +/* f1021a8: 0fc54ef9 */ jal optionsGetScreenSplit /* f1021ac: 00000000 */ nop /* f1021b0: 24010001 */ li $at,0x1 /* f1021b4: 10410021 */ beq $v0,$at,.PF0f10223c @@ -2510,11 +2510,11 @@ glabel amRender /* f1022c4: 03067821 */ addu $t7,$t8,$a2 /* f1022c8: 15e10019 */ bne $t7,$at,.PF0f102330 /* f1022cc: 00000000 */ nop -/* f1022d0: 0fc54e8c */ jal 0xf153a30 +/* f1022d0: 0fc54e8c */ jal optionsGetEffectiveScreenSize /* f1022d4: 00000000 */ nop /* f1022d8: 10400015 */ beqz $v0,.PF0f102330 /* f1022dc: 00000000 */ nop -/* f1022e0: 0c002e91 */ jal 0xba44 +/* f1022e0: 0c002e91 */ jal viGetViewLeft /* f1022e4: 00000000 */ nop /* f1022e8: 3c0e8008 */ lui $t6,0x8008 /* f1022ec: 8dce0020 */ lw $t6,0x20($t6) @@ -2537,11 +2537,11 @@ glabel amRender /* f102328: 10000031 */ b .PF0f1023f0 /* f10232c: 3c013e80 */ lui $at,0x3e80 .PF0f102330: -/* f102330: 0c002e73 */ jal 0xb9cc +/* f102330: 0c002e73 */ jal viGetViewWidth /* f102334: 00000000 */ nop /* f102338: 00028c00 */ sll $s1,$v0,0x10 /* f10233c: 0011cc03 */ sra $t9,$s1,0x10 -/* f102340: 0c002e91 */ jal 0xba44 +/* f102340: 0c002e91 */ jal viGetViewLeft /* f102344: 03208825 */ move $s1,$t9 /* f102348: 3c038008 */ lui $v1,0x8008 /* f10234c: 8c630020 */ lw $v1,0x20($v1) @@ -2635,11 +2635,11 @@ glabel amRender /* f102494: 35efffff */ ori $t7,$t7,0xffff /* f102498: af2f0000 */ sw $t7,0x0($t9) /* f10249c: af380004 */ sw $t8,0x4($t9) -/* f1024a0: 0c002e77 */ jal 0xb9dc +/* f1024a0: 0c002e77 */ jal viGetViewHeight /* f1024a4: e7a20068 */ swc1 $f2,0x68($sp) /* f1024a8: 0002a400 */ sll $s4,$v0,0x10 /* f1024ac: 0014cc03 */ sra $t9,$s4,0x10 -/* f1024b0: 0c002e95 */ jal 0xba54 +/* f1024b0: 0c002e95 */ jal viGetViewTop /* f1024b4: 0320a025 */ move $s4,$t9 /* f1024b8: 3c04800a */ lui $a0,0x800a /* f1024bc: 2484a510 */ addiu $a0,$a0,-23280 diff --git a/src/game/bondeyespy.c b/src/game/bondeyespy.c index e02d25af6..0248fc590 100644 --- a/src/game/bondeyespy.c +++ b/src/game/bondeyespy.c @@ -741,15 +741,15 @@ glabel var7f1adb00 /* f0d0ef4: 8f190004 */ lw $t9,0x4($t8) /* f0d0ef8: e7a400e0 */ swc1 $f4,0xe0($sp) /* f0d0efc: afb900e4 */ sw $t9,0xe4($sp) -/* f0d0f00: 0fc54cfe */ jal 0xf1533f8 +/* f0d0f00: 0fc54cfe */ jal optionsGetContpadNum1 /* f0d0f04: 8dc40070 */ lw $a0,0x70($t6) /* f0d0f08: 00022600 */ sll $a0,$v0,0x18 /* f0d0f0c: 00047e03 */ sra $t7,$a0,0x18 /* f0d0f10: a3a200c3 */ sb $v0,0xc3($sp) -/* f0d0f14: 0c0052e6 */ jal 0x14b98 +/* f0d0f14: 0c0052e6 */ jal contGetStickX /* f0d0f18: 01e02025 */ move $a0,$t7 /* f0d0f1c: 83a400c3 */ lb $a0,0xc3($sp) -/* f0d0f20: 0c005310 */ jal 0x14c40 +/* f0d0f20: 0c005310 */ jal contGetStickY /* f0d0f24: a3a200c2 */ sb $v0,0xc2($sp) /* f0d0f28: 8fae00e8 */ lw $t6,0xe8($sp) /* f0d0f2c: 00023e00 */ sll $a3,$v0,0x18 @@ -762,7 +762,7 @@ glabel var7f1adb00 /* f0d0f48: a3bf00c2 */ sb $ra,0xc2($sp) /* f0d0f4c: 83a400c3 */ lb $a0,0xc3($sp) /* f0d0f50: 3405ffff */ li $a1,0xffff -/* f0d0f54: 0c00533a */ jal 0x14ce8 +/* f0d0f54: 0c00533a */ jal contGetButtons /* f0d0f58: a3b900c0 */ sb $t9,0xc0($sp) /* f0d0f5c: 3c09800a */ lui $t1,0x800a /* f0d0f60: 2529a510 */ addiu $t1,$t1,-23280 @@ -779,7 +779,7 @@ glabel var7f1adb00 /* f0d0f84: 8f040070 */ lw $a0,0x70($t8) /* f0d0f88: a3bf00c2 */ sb $ra,0xc2($sp) /* f0d0f8c: a7a800bc */ sh $t0,0xbc($sp) -/* f0d0f90: 0fc54cf0 */ jal 0xf1533c0 +/* f0d0f90: 0fc54cf0 */ jal optionsGetControlMode /* f0d0f94: a3a700c0 */ sb $a3,0xc0($sp) /* f0d0f98: 44808000 */ mtc1 $zero,$f16 /* f0d0f9c: 3c09800a */ lui $t1,0x800a @@ -802,18 +802,18 @@ glabel var7f1adb00 /* f0d0fe0: a3bf00c2 */ sb $ra,0xc2($sp) /* f0d0fe4: afa200b0 */ sw $v0,0xb0($sp) /* f0d0fe8: a7a800bc */ sh $t0,0xbc($sp) -/* f0d0fec: 0fc54d05 */ jal 0xf153414 +/* f0d0fec: 0fc54d05 */ jal optionsGetContpadNum2 /* f0d0ff0: a3a700c0 */ sb $a3,0xc0($sp) /* f0d0ff4: 00021e00 */ sll $v1,$v0,0x18 /* f0d0ff8: 00037e03 */ sra $t7,$v1,0x18 /* f0d0ffc: 000f2600 */ sll $a0,$t7,0x18 /* f0d1000: 0004c603 */ sra $t8,$a0,0x18 /* f0d1004: afaf0074 */ sw $t7,0x74($sp) -/* f0d1008: 0c0052e6 */ jal 0x14b98 +/* f0d1008: 0c0052e6 */ jal contGetStickX /* f0d100c: 03002025 */ move $a0,$t8 /* f0d1010: 83a40077 */ lb $a0,0x77($sp) /* f0d1014: a3a200c1 */ sb $v0,0xc1($sp) -/* f0d1018: 0c005310 */ jal 0x14c40 +/* f0d1018: 0c005310 */ jal contGetStickY /* f0d101c: afa4003c */ sw $a0,0x3c($sp) /* f0d1020: 8faf00e8 */ lw $t7,0xe8($sp) /* f0d1024: 00023600 */ sll $a2,$v0,0x18 @@ -834,7 +834,7 @@ glabel var7f1adb00 /* f0d1060: a3a700c0 */ sb $a3,0xc0($sp) /* f0d1064: a7a800bc */ sh $t0,0xbc($sp) /* f0d1068: a3aa00c1 */ sb $t2,0xc1($sp) -/* f0d106c: 0c00533a */ jal 0x14ce8 +/* f0d106c: 0c00533a */ jal contGetButtons /* f0d1070: afab00b0 */ sw $t3,0xb0($sp) /* f0d1074: 3c09800a */ lui $t1,0x800a /* f0d1078: 2529a510 */ addiu $t1,$t1,-23280 @@ -1241,9 +1241,9 @@ glabel var7f1adb00 /* f0d15dc: 8f240000 */ lw $a0,0x0($t9) /* f0d15e0: a3bf00c2 */ sb $ra,0xc2($sp) /* f0d15e4: e7ae00e0 */ swc1 $f14,0xe0($sp) -/* f0d15e8: 0fc1968d */ jal 0xf065a34 +/* f0d15e8: 0fc1968d */ jal roomsCopy /* f0d15ec: 24840028 */ addiu $a0,$a0,0x28 -/* f0d15f0: 0fc449df */ jal 0xf11277c +/* f0d15f0: 0fc449df */ jal invHasSingleWeaponIncAllGuns /* f0d15f4: 2404002e */ li $a0,0x2e /* f0d15f8: 3c09800a */ lui $t1,0x800a /* f0d15fc: 44808000 */ mtc1 $zero,$f16 @@ -1273,7 +1273,7 @@ glabel var7f1adb00 /* f0d165c: 030e2023 */ subu $a0,$t8,$t6 /* f0d1660: 0081001a */ div $zero,$a0,$at /* f0d1664: 00002012 */ mflo $a0 -/* f0d1668: 0fc0842c */ jal 0xf0210b0 +/* f0d1668: 0fc0842c */ jal propClearReferences /* f0d166c: 00000000 */ nop /* f0d1670: 3c09800a */ lui $t1,0x800a /* f0d1674: 44808000 */ mtc1 $zero,$f16 @@ -1346,7 +1346,7 @@ glabel var7f1adb00 .PF0f0d1770: /* f0d1770: c424ed84 */ lwc1 $f4,-0x127c($at) /* f0d1774: 46040302 */ mul.s $f12,$f0,$f4 -/* f0d1778: 0c006858 */ jal 0x1a160 +/* f0d1778: 0c006858 */ jal cosf /* f0d177c: 00000000 */ nop /* f0d1780: 3c09800a */ lui $t1,0x800a /* f0d1784: 2529a510 */ addiu $t1,$t1,-23280 @@ -1359,7 +1359,7 @@ glabel var7f1adb00 /* f0d17a0: 8df90480 */ lw $t9,0x480($t7) /* f0d17a4: c728001c */ lwc1 $f8,0x1c($t9) /* f0d17a8: 460a4302 */ mul.s $f12,$f8,$f10 -/* f0d17ac: 0c00685b */ jal 0x1a16c +/* f0d17ac: 0c00685b */ jal sinf /* f0d17b0: 00000000 */ nop /* f0d17b4: 3c09800a */ lui $t1,0x800a /* f0d17b8: 2529a510 */ addiu $t1,$t1,-23280 @@ -1421,7 +1421,7 @@ glabel var7f1adb00 .PF0f0d188c: /* f0d188c: c428ed8c */ lwc1 $f8,-0x1274($at) /* f0d1890: 46081302 */ mul.s $f12,$f2,$f8 -/* f0d1894: 0c006858 */ jal 0x1a160 +/* f0d1894: 0c006858 */ jal cosf /* f0d1898: 00000000 */ nop /* f0d189c: 3c09800a */ lui $t1,0x800a /* f0d18a0: 2529a510 */ addiu $t1,$t1,-23280 @@ -1434,7 +1434,7 @@ glabel var7f1adb00 /* f0d18bc: 8f0e0480 */ lw $t6,0x480($t8) /* f0d18c0: c5ca0028 */ lwc1 $f10,0x28($t6) /* f0d18c4: 46045302 */ mul.s $f12,$f10,$f4 -/* f0d18c8: 0c00685b */ jal 0x1a16c +/* f0d18c8: 0c00685b */ jal sinf /* f0d18cc: 00000000 */ nop /* f0d18d0: 3c09800a */ lui $t1,0x800a /* f0d18d4: 2529a510 */ addiu $t1,$t1,-23280 @@ -1520,7 +1520,7 @@ glabel var7f1adb00 /* f0d1a00: 3c017f1b */ lui $at,0x7f1b /* f0d1a04: c424ed9c */ lwc1 $f4,-0x1264($at) /* f0d1a08: 46041302 */ mul.s $f12,$f2,$f4 -/* f0d1a0c: 0c006858 */ jal 0x1a160 +/* f0d1a0c: 0c006858 */ jal cosf /* f0d1a10: 00000000 */ nop /* f0d1a14: 3c09800a */ lui $t1,0x800a /* f0d1a18: 2529a510 */ addiu $t1,$t1,-23280 @@ -1533,7 +1533,7 @@ glabel var7f1adb00 /* f0d1a34: 8df90480 */ lw $t9,0x480($t7) /* f0d1a38: c7260028 */ lwc1 $f6,0x28($t9) /* f0d1a3c: 46083302 */ mul.s $f12,$f6,$f8 -/* f0d1a40: 0c00685b */ jal 0x1a16c +/* f0d1a40: 0c00685b */ jal sinf /* f0d1a44: 00000000 */ nop /* f0d1a48: 3c09800a */ lui $t1,0x800a /* f0d1a4c: 2529a510 */ addiu $t1,$t1,-23280 @@ -1665,7 +1665,7 @@ glabel var7f1adb00 /* f0d1c2c: 00000000 */ nop /* f0d1c30: 45000018 */ bc1f .PF0f0d1c94 /* f0d1c34: 00000000 */ nop -/* f0d1c38: 0c0127b4 */ jal 0x49ed0 +/* f0d1c38: 0c0127b4 */ jal sqrtf /* f0d1c3c: 46003306 */ mov.s $f12,$f6 /* f0d1c40: 3c09800a */ lui $t1,0x800a /* f0d1c44: 2529a510 */ addiu $t1,$t1,-23280 @@ -1703,7 +1703,7 @@ glabel var7f1adb00 /* f0d1cc0: 00000000 */ nop /* f0d1cc4: 4502001a */ bc1fl .PF0f0d1d30 /* f0d1cc8: c4660044 */ lwc1 $f6,0x44($v1) -/* f0d1ccc: 0c0127b4 */ jal 0x49ed0 +/* f0d1ccc: 0c0127b4 */ jal sqrtf /* f0d1cd0: 46002306 */ mov.s $f12,$f4 /* f0d1cd4: 3c09800a */ lui $t1,0x800a /* f0d1cd8: 2529a510 */ addiu $t1,$t1,-23280 @@ -1906,7 +1906,7 @@ glabel var7f1adb00 /* f0d1fcc: a03911a8 */ sb $t9,0x11a8($at) /* f0d1fd0: a0400000 */ sb $zero,0x0($v0) /* f0d1fd4: 3c018007 */ lui $at,0x8007 -/* f0d1fd8: 0fc340f1 */ jal 0xf0d03c4 +/* f0d1fd8: 0fc340f1 */ jal eyespyUpdateVertical /* f0d1fdc: a02011ac */ sb $zero,0x11ac($at) /* f0d1fe0: 3c09800a */ lui $t1,0x800a /* f0d1fe4: 2529a510 */ addiu $t1,$t1,-23280 @@ -1950,7 +1950,7 @@ glabel var7f1adb00 /* f0d207c: 00002825 */ move $a1,$zero /* f0d2080: 24063e80 */ li $a2,0x3e80 /* f0d2084: 24070040 */ li $a3,0x40 -/* f0d2088: 0c004125 */ jal 0x10494 +/* f0d2088: 0c004125 */ jal func00010718 /* f0d208c: e7a60014 */ swc1 $f6,0x14($sp) /* f0d2090: 3c09800a */ lui $t1,0x800a /* f0d2094: 2529a510 */ addiu $t1,$t1,-23280 @@ -1971,7 +1971,7 @@ glabel var7f1adb00 /* f0d20d0: 00002825 */ move $a1,$zero /* f0d20d4: 24063e80 */ li $a2,0x3e80 /* f0d20d8: 24070040 */ li $a3,0x40 -/* f0d20dc: 0c004125 */ jal 0x10494 +/* f0d20dc: 0c004125 */ jal func00010718 /* f0d20e0: e7a40014 */ swc1 $f4,0x14($sp) /* f0d20e4: 3c09800a */ lui $t1,0x800a /* f0d20e8: 2529a510 */ addiu $t1,$t1,-23280 @@ -1992,7 +1992,7 @@ glabel var7f1adb00 /* f0d2124: 00002825 */ move $a1,$zero /* f0d2128: 24063e80 */ li $a2,0x3e80 /* f0d212c: 24070040 */ li $a3,0x40 -/* f0d2130: 0c004125 */ jal 0x10494 +/* f0d2130: 0c004125 */ jal func00010718 /* f0d2134: e7aa0014 */ swc1 $f10,0x14($sp) /* f0d2138: 3c09800a */ lui $t1,0x800a /* f0d213c: 2529a510 */ addiu $t1,$t1,-23280 @@ -2013,7 +2013,7 @@ glabel var7f1adb00 /* f0d2178: 00002825 */ move $a1,$zero /* f0d217c: 24063e80 */ li $a2,0x3e80 /* f0d2180: 24070040 */ li $a3,0x40 -/* f0d2184: 0c004125 */ jal 0x10494 +/* f0d2184: 0c004125 */ jal func00010718 /* f0d2188: e7a80014 */ swc1 $f8,0x14($sp) /* f0d218c: 3c09800a */ lui $t1,0x800a /* f0d2190: 2529a510 */ addiu $t1,$t1,-23280 @@ -2033,7 +2033,7 @@ glabel var7f1adb00 /* f0d21c8: 240500f2 */ li $a1,0xf2 /* f0d21cc: 00003025 */ move $a2,$zero /* f0d21d0: 2407ffff */ li $a3,-1 -/* f0d21d4: 0c0041a0 */ jal 0x10680 +/* f0d21d4: 0c0041a0 */ jal audioStart /* f0d21d8: e7a60014 */ swc1 $f6,0x14($sp) /* f0d21dc: 3c09800a */ lui $t1,0x800a /* f0d21e0: 2529a510 */ addiu $t1,$t1,-23280 @@ -2064,7 +2064,7 @@ glabel var7f1adb00 /* f0d2234: 46040282 */ mul.s $f10,$f0,$f4 /* f0d2238: 4600520d */ trunc.w.s $f8,$f10 /* f0d223c: 44054000 */ mfc1 $a1,$f8 -/* f0d2240: 0fc24da0 */ jal 0xf093680 +/* f0d2240: 0fc24da0 */ jal func0f093790 /* f0d2244: 00000000 */ nop /* f0d2248: 3c09800a */ lui $t1,0x800a /* f0d224c: 2529a510 */ addiu $t1,$t1,-23280 @@ -2089,7 +2089,7 @@ glabel var7f1adb00 /* f0d2294: 8fa400e4 */ lw $a0,0xe4($sp) /* f0d2298: 46064002 */ mul.s $f0,$f8,$f6 /* f0d229c: 44050000 */ mfc1 $a1,$f0 -/* f0d22a0: 0fc0f9af */ jal 0xf03e6bc +/* f0d22a0: 0fc0f9af */ jal chrSetLookAngle /* f0d22a4: 00000000 */ nop /* f0d22a8: 3c09800a */ lui $t1,0x800a /* f0d22ac: 2529a510 */ addiu $t1,$t1,-23280 @@ -2212,7 +2212,7 @@ glabel var7f1adb00 /* f0d2460: 25040008 */ addiu $a0,$t0,0x8 /* f0d2464: 25050028 */ addiu $a1,$t0,0x28 /* f0d2468: 24460008 */ addiu $a2,$v0,0x8 -/* f0d246c: 0c00b54f */ jal 0x2d53c +/* f0d246c: 0c00b54f */ jal hasLineOfSight /* f0d2470: 24470028 */ addiu $a3,$v0,0x28 /* f0d2474: 3c09800a */ lui $t1,0x800a /* f0d2478: 14400003 */ bnez $v0,.PF0f0d2488 @@ -2248,10 +2248,10 @@ glabel var7f1adb00 /* f0d24e4: 37380400 */ ori $t8,$t9,0x400 /* f0d24e8: 370e0010 */ ori $t6,$t8,0x10 /* f0d24ec: adf80018 */ sw $t8,0x18($t7) -/* f0d24f0: 0fc21fa0 */ jal 0xf087e80 +/* f0d24f0: 0fc21fa0 */ jal func0f087d10 /* f0d24f4: adee0018 */ sw $t6,0x18($t7) /* f0d24f8: 2404002e */ li $a0,0x2e -/* f0d24fc: 0fc221bd */ jal 0xf0886f4 +/* f0d24fc: 0fc221bd */ jal currentPlayerQueuePickupWeaponHudmsg /* f0d2500: 00002825 */ move $a1,$zero /* f0d2504: 3c09800a */ lui $t1,0x800a /* f0d2508: 2529a510 */ addiu $t1,$t1,-23280 @@ -2259,7 +2259,7 @@ glabel var7f1adb00 /* f0d2510: 24050001 */ li $a1,0x1 /* f0d2514: 3406ffff */ li $a2,0xffff /* f0d2518: 8f380480 */ lw $t8,0x480($t9) -/* f0d251c: 0fc2496f */ jal 0xf0925bc +/* f0d251c: 0fc2496f */ jal func0f0926bc /* f0d2520: 8f040000 */ lw $a0,0x0($t8) /* f0d2524: 3c09800a */ lui $t1,0x800a /* f0d2528: 2529a510 */ addiu $t1,$t1,-23280 @@ -2271,13 +2271,13 @@ glabel var7f1adb00 /* f0d2540: 03382023 */ subu $a0,$t9,$t8 /* f0d2544: 0081001a */ div $zero,$a0,$at /* f0d2548: 00002012 */ mflo $a0 -/* f0d254c: 0fc0842c */ jal 0xf0210b0 +/* f0d254c: 0fc0842c */ jal propClearReferences /* f0d2550: 00000000 */ nop /* f0d2554: 8faf00e4 */ lw $t7,0xe4($sp) .PF0f0d2558: /* f0d2558: 24050001 */ li $a1,0x1 /* f0d255c: 8de4001c */ lw $a0,0x1c($t7) -/* f0d2560: 0fc22ac0 */ jal 0xf08ab00 +/* f0d2560: 0fc22ac0 */ jal func0f08abd4 /* f0d2564: 24840008 */ addiu $a0,$a0,0x8 /* f0d2568: 8fbf002c */ lw $ra,0x2c($sp) .PF0f0d256c: diff --git a/src/game/bondview.c b/src/game/bondview.c index 1cc45779a..da6ba6ead 100644 --- a/src/game/bondview.c +++ b/src/game/bondview.c @@ -737,15 +737,15 @@ glabel var7f1b5f48 /* f1439a8: f7b80038 */ sdc1 $f24,0x38($sp) /* f1439ac: f7b60030 */ sdc1 $f22,0x30($sp) /* f1439b0: f7b40028 */ sdc1 $f20,0x28($sp) -/* f1439b4: 0c002a18 */ jal 0xa860 +/* f1439b4: 0c002a18 */ jal viGetUnk28 /* f1439b8: afa70144 */ sw $a3,0x144($sp) -/* f1439bc: 0c002e95 */ jal 0xba54 +/* f1439bc: 0c002e95 */ jal viGetViewTop /* f1439c0: afa20134 */ sw $v0,0x134($sp) -/* f1439c4: 0c002e77 */ jal 0xb9dc +/* f1439c4: 0c002e77 */ jal viGetViewHeight /* f1439c8: afa20130 */ sw $v0,0x130($sp) -/* f1439cc: 0c002e73 */ jal 0xb9cc +/* f1439cc: 0c002e73 */ jal viGetViewWidth /* f1439d0: afa2012c */ sw $v0,0x12c($sp) -/* f1439d4: 0c002e91 */ jal 0xba44 +/* f1439d4: 0c002e91 */ jal viGetViewLeft /* f1439d8: 0040b025 */ move $s6,$v0 /* f1439dc: 3c06800a */ lui $a2,0x800a /* f1439e0: 24c6a510 */ addiu $a2,$a2,-23280 @@ -787,12 +787,12 @@ glabel var7f1b5f48 /* f143a5c: 29610002 */ slti $at,$t3,0x2 /* f143a60: 5020000c */ beqzl $at,.PF0f143a94 /* f143a64: 8fad0130 */ lw $t5,0x130($sp) -/* f143a68: 0fc54e8c */ jal 0xf153a30 +/* f143a68: 0fc54e8c */ jal optionsGetEffectiveScreenSize /* f143a6c: 00000000 */ nop /* f143a70: 24010001 */ li $at,0x1 /* f143a74: 50410007 */ beql $v0,$at,.PF0f143a94 /* f143a78: 8fad0130 */ lw $t5,0x130($sp) -/* f143a7c: 0fc54e8c */ jal 0xf153a30 +/* f143a7c: 0fc54e8c */ jal optionsGetEffectiveScreenSize /* f143a80: 00000000 */ nop /* f143a84: 24010002 */ li $at,0x2 /* f143a88: 1441000a */ bne $v0,$at,.PF0f143ab4 @@ -837,7 +837,7 @@ glabel var7f1b5f48 /* f143b18: 100001f9 */ b .PF0f144300 /* f143b1c: 02401025 */ move $v0,$s2 .PF0f143b20: -/* f143b20: 0c004bb0 */ jal 0x12ec0 +/* f143b20: 0c004bb0 */ jal strcpy /* f143b24: e7a00084 */ swc1 $f0,0x84($sp) /* f143b28: 83a3014b */ lb $v1,0x14b($sp) /* f143b2c: 24130001 */ li $s3,0x1 @@ -877,7 +877,7 @@ glabel var7f1b5f48 /* f143bb0: ac400004 */ sw $zero,0x4($v0) /* f143bb4: afa70068 */ sw $a3,0x68($sp) /* f143bb8: 03c02825 */ move $a1,$s8 -/* f143bbc: 0fc50b08 */ jal 0xf142c20 +/* f143bbc: 0fc50b08 */ jal bviewPrepareStaticRgba16 /* f143bc0: 02003025 */ move $a2,$s0 /* f143bc4: 8fae0068 */ lw $t6,0x68($sp) /* f143bc8: 00409025 */ move $s2,$v0 @@ -935,7 +935,7 @@ glabel var7f1b5f48 /* f143c90: 02202025 */ move $a0,$s1 /* f143c94: 44074000 */ mfc1 $a3,$f8 /* f143c98: 44053000 */ mfc1 $a1,$f6 -/* f143c9c: 0fc50e39 */ jal 0xf1438e4 +/* f143c9c: 0fc50e39 */ jal bview0f142d74 /* f143ca0: 00000000 */ nop /* f143ca4: c7aa0100 */ lwc1 $f10,0x100($sp) /* f143ca8: 02402025 */ move $a0,$s2 @@ -946,7 +946,7 @@ glabel var7f1b5f48 /* f143cbc: afb00010 */ sw $s0,0x10($sp) /* f143cc0: afb50018 */ sw $s5,0x18($sp) /* f143cc4: afb6001c */ sw $s6,0x1c($sp) -/* f143cc8: 0fc50988 */ jal 0xf142620 +/* f143cc8: 0fc50988 */ jal bviewRenderLensRect /* f143ccc: e7b00014 */ swc1 $f16,0x14($sp) /* f143cd0: 00409025 */ move $s2,$v0 /* f143cd4: 8fa20130 */ lw $v0,0x130($sp) @@ -990,7 +990,7 @@ glabel var7f1b5f48 /* f143d5c: 02401025 */ move $v0,$s2 /* f143d60: 17210020 */ bne $t9,$at,.PF0f143de4 /* f143d64: 240dffff */ li $t5,-1 -/* f143d68: 0c004ad4 */ jal 0x12b50 +/* f143d68: 0c004ad4 */ jal random /* f143d6c: 00000000 */ nop /* f143d70: 24010078 */ li $at,0x78 /* f143d74: 0041001b */ divu $zero,$v0,$at @@ -999,7 +999,7 @@ glabel var7f1b5f48 /* f143d80: 3c01ff33 */ lui $at,0xff33 /* f143d84: 34213300 */ ori $at,$at,0x3300 /* f143d88: 314900ff */ andi $t1,$t2,0xff -/* f143d8c: 0c004ad4 */ jal 0x12b50 +/* f143d8c: 0c004ad4 */ jal random /* f143d90: 0121f025 */ or $s8,$t1,$at /* f143d94: 304c001f */ andi $t4,$v0,0x1f /* f143d98: 448c9000 */ mtc1 $t4,$f18 @@ -1030,7 +1030,7 @@ glabel var7f1b5f48 /* f143df0: 4405a000 */ mfc1 $a1,$f20 /* f143df4: 4406b000 */ mfc1 $a2,$f22 /* f143df8: 4407c000 */ mfc1 $a3,$f24 -/* f143dfc: 0fc50e39 */ jal 0xf1438e4 +/* f143dfc: 0fc50e39 */ jal bview0f142d74 /* f143e00: 02202025 */ move $a0,$s1 /* f143e04: c7a600dc */ lwc1 $f6,0xdc($sp) /* f143e08: 02402025 */ move $a0,$s2 @@ -1041,7 +1041,7 @@ glabel var7f1b5f48 /* f143e1c: afb00010 */ sw $s0,0x10($sp) /* f143e20: afb50018 */ sw $s5,0x18($sp) /* f143e24: afb6001c */ sw $s6,0x1c($sp) -/* f143e28: 0fc50988 */ jal 0xf142620 +/* f143e28: 0fc50988 */ jal bviewRenderLensRect /* f143e2c: e7a40014 */ swc1 $f4,0x14($sp) /* f143e30: 8faf006c */ lw $t7,0x6c($sp) /* f143e34: 24010004 */ li $at,0x4 @@ -1056,7 +1056,7 @@ glabel var7f1b5f48 /* f143e58: ac4e0004 */ sw $t6,0x4($v0) /* f143e5c: ac540000 */ sw $s4,0x0($v0) /* f143e60: 26520008 */ addiu $s2,$s2,0x8 -/* f143e64: 0fc50e39 */ jal 0xf1438e4 +/* f143e64: 0fc50e39 */ jal bview0f142d74 /* f143e68: 02202025 */ move $a0,$s1 /* f143e6c: 3c017f1b */ lui $at,0x7f1b /* f143e70: c4287260 */ lwc1 $f8,0x7260($at) @@ -1068,7 +1068,7 @@ glabel var7f1b5f48 /* f143e88: afb00010 */ sw $s0,0x10($sp) /* f143e8c: afb50018 */ sw $s5,0x18($sp) /* f143e90: afb6001c */ sw $s6,0x1c($sp) -/* f143e94: 0fc50988 */ jal 0xf142620 +/* f143e94: 0fc50988 */ jal bviewRenderLensRect /* f143e98: e7aa0014 */ swc1 $f10,0x14($sp) /* f143e9c: 00409025 */ move $s2,$v0 .PF0f143ea0: @@ -1199,13 +1199,13 @@ glabel var7f1b5f48 /* f144070: 02402025 */ move $a0,$s2 /* f144074: 02002825 */ move $a1,$s0 /* f144078: 02a03825 */ move $a3,$s5 -/* f14407c: 0fc50a91 */ jal 0xf142a44 +/* f14407c: 0fc50a91 */ jal bviewRenderFisheyeRect /* f144080: afb60010 */ sw $s6,0x10($sp) /* f144084: 4406a000 */ mfc1 $a2,$f20 /* f144088: 00402025 */ move $a0,$v0 /* f14408c: 02202825 */ move $a1,$s1 /* f144090: 02a03825 */ move $a3,$s5 -/* f144094: 0fc50a91 */ jal 0xf142a44 +/* f144094: 0fc50a91 */ jal bviewRenderFisheyeRect /* f144098: afb60010 */ sw $s6,0x10($sp) /* f14409c: 26100001 */ addiu $s0,$s0,0x1 /* f1440a0: 2631ffff */ addiu $s1,$s1,-1 @@ -1249,7 +1249,7 @@ glabel var7f1b5f48 /* f144130: 00000000 */ nop /* f144134: 45000006 */ bc1f .PF0f144150 /* f144138: 00000000 */ nop -/* f14413c: 0c0127b4 */ jal 0x49ed0 +/* f14413c: 0c0127b4 */ jal sqrtf /* f144140: 4600c301 */ sub.s $f12,$f24,$f0 /* f144144: 46160082 */ mul.s $f2,$f0,$f22 /* f144148: 10000003 */ b .PF0f144158 @@ -1266,7 +1266,7 @@ glabel var7f1b5f48 /* f14416c: afb60010 */ sw $s6,0x10($sp) /* f144170: 4606a500 */ add.s $f20,$f20,$f6 /* f144174: 44060000 */ mfc1 $a2,$f0 -/* f144178: 0fc50a91 */ jal 0xf142a44 +/* f144178: 0fc50a91 */ jal bviewRenderFisheyeRect /* f14417c: e7a00080 */ swc1 $f0,0x80($sp) /* f144180: c7a00080 */ lwc1 $f0,0x80($sp) /* f144184: 12110008 */ beq $s0,$s1,.PF0f1441a8 @@ -1275,7 +1275,7 @@ glabel var7f1b5f48 /* f144190: 00402025 */ move $a0,$v0 /* f144194: 02202825 */ move $a1,$s1 /* f144198: 02a03825 */ move $a3,$s5 -/* f14419c: 0fc50a91 */ jal 0xf142a44 +/* f14419c: 0fc50a91 */ jal bviewRenderFisheyeRect /* f1441a0: afb60010 */ sw $s6,0x10($sp) /* f1441a4: 00409025 */ move $s2,$v0 .PF0f1441a8: @@ -1300,13 +1300,13 @@ glabel var7f1b5f48 .PF0f1441ec: /* f1441ec: 4406b000 */ mfc1 $a2,$f22 /* f1441f0: 4407c000 */ mfc1 $a3,$f24 -/* f1441f4: 0fc50e39 */ jal 0xf1438e4 +/* f1441f4: 0fc50e39 */ jal bview0f142d74 /* f1441f8: 02202025 */ move $a0,$s1 /* f1441fc: 44060000 */ mfc1 $a2,$f0 /* f144200: 02402025 */ move $a0,$s2 /* f144204: 02002825 */ move $a1,$s0 /* f144208: 02a03825 */ move $a3,$s5 -/* f14420c: 0fc50a91 */ jal 0xf142a44 +/* f14420c: 0fc50a91 */ jal bviewRenderFisheyeRect /* f144210: afb60010 */ sw $s6,0x10($sp) /* f144214: 02338821 */ addu $s1,$s1,$s3 /* f144218: 44918000 */ mtc1 $s1,$f16 @@ -1325,9 +1325,9 @@ glabel var7f1b5f48 /* f144248: 5617ffe8 */ bnel $s0,$s7,.PF0f1441ec /* f14424c: 4405a000 */ mfc1 $a1,$f20 .PF0f144250: -/* f144250: 0c002e95 */ jal 0xba54 +/* f144250: 0c002e95 */ jal viGetViewTop /* f144254: 00000000 */ nop -/* f144258: 0c002e77 */ jal 0xb9dc +/* f144258: 0c002e77 */ jal viGetViewHeight /* f14425c: 00409825 */ move $s3,$v0 /* f144260: 8fa800ec */ lw $t0,0xec($sp) /* f144264: 00537021 */ addu $t6,$v0,$s3 @@ -2056,13 +2056,13 @@ glabel var7f1b5f58 /* f144564: afb30044 */ sw $s3,0x44($sp) /* f144568: afb20040 */ sw $s2,0x40($sp) /* f14456c: afb1003c */ sw $s1,0x3c($sp) -/* f144570: 0c002e91 */ jal 0xba44 +/* f144570: 0c002e91 */ jal viGetViewLeft /* f144574: afb00038 */ sw $s0,0x38($sp) -/* f144578: 0c002e73 */ jal 0xb9cc +/* f144578: 0c002e73 */ jal viGetViewWidth /* f14457c: afa2030c */ sw $v0,0x30c($sp) -/* f144580: 0c002e95 */ jal 0xba54 +/* f144580: 0c002e95 */ jal viGetViewTop /* f144584: afa20308 */ sw $v0,0x308($sp) -/* f144588: 0c002e77 */ jal 0xb9dc +/* f144588: 0c002e77 */ jal viGetViewHeight /* f14458c: afa20304 */ sw $v0,0x304($sp) /* f144590: 8fae0308 */ lw $t6,0x308($sp) /* f144594: 44806000 */ mtc1 $zero,$f12 @@ -2115,12 +2115,12 @@ glabel var7f1b5f58 /* f144638: 2b210002 */ slti $at,$t9,0x2 /* f14463c: 5020000c */ beqzl $at,.PF0f144670 /* f144640: 8fae0304 */ lw $t6,0x304($sp) -/* f144644: 0fc54e8c */ jal 0xf153a30 +/* f144644: 0fc54e8c */ jal optionsGetEffectiveScreenSize /* f144648: e7ac02c4 */ swc1 $f12,0x2c4($sp) /* f14464c: 24010001 */ li $at,0x1 /* f144650: 10410006 */ beq $v0,$at,.PF0f14466c /* f144654: c7ac02c4 */ lwc1 $f12,0x2c4($sp) -/* f144658: 0fc54e8c */ jal 0xf153a30 +/* f144658: 0fc54e8c */ jal optionsGetEffectiveScreenSize /* f14465c: e7ac02c4 */ swc1 $f12,0x2c4($sp) /* f144660: 24010002 */ li $at,0x2 /* f144664: 14410008 */ bne $v0,$at,.PF0f144688 @@ -2156,7 +2156,7 @@ glabel var7f1b5f58 /* f1446c8: 10000e51 */ b .PF0f148010 /* f1446cc: 02801025 */ move $v0,$s4 .PF0f1446d0: -/* f1446d0: 0fc54ef9 */ jal 0xf153be4 +/* f1446d0: 0fc54ef9 */ jal optionsGetScreenSplit /* f1446d4: e7ac02c4 */ swc1 $f12,0x2c4($sp) /* f1446d8: 44800000 */ mtc1 $zero,$f0 /* f1446dc: 24010001 */ li $at,0x1 @@ -2254,7 +2254,7 @@ glabel var7f1b5f58 /* f144830: 00000000 */ nop /* f144834: 45020006 */ bc1fl .PF0f144850 /* f144838: e7a002c8 */ swc1 $f0,0x2c8($sp) -/* f14483c: 0c0127b4 */ jal 0x49ed0 +/* f14483c: 0c0127b4 */ jal sqrtf /* f144840: 00000000 */ nop /* f144844: 10000002 */ b .PF0f144850 /* f144848: e7a002c8 */ swc1 $f0,0x2c8($sp) @@ -2266,7 +2266,7 @@ glabel var7f1b5f58 /* f14485c: 14600006 */ bnez $v1,.PF0f144878 /* f144860: 3c0500ff */ lui $a1,0xff /* f144864: 34a50028 */ ori $a1,$a1,0x28 -/* f144868: 0fc5513c */ jal 0xf1544f0 +/* f144868: 0fc5513c */ jal gfxSetPrimColour /* f14486c: 02802025 */ move $a0,$s4 /* f144870: 1000000e */ b .PF0f1448ac /* f144874: 0040a025 */ move $s4,$v0 @@ -2276,13 +2276,13 @@ glabel var7f1b5f58 /* f144880: 02802025 */ move $a0,$s4 /* f144884: 3c052244 */ lui $a1,0x2244 /* f144888: 34a5ffa0 */ ori $a1,$a1,0xffa0 -/* f14488c: 0fc5513c */ jal 0xf1544f0 +/* f14488c: 0fc5513c */ jal gfxSetPrimColour /* f144890: 02802025 */ move $a0,$s4 /* f144894: 10000005 */ b .PF0f1448ac /* f144898: 0040a025 */ move $s4,$v0 .PF0f14489c: /* f14489c: 3c05ff33 */ lui $a1,0xff33 -/* f1448a0: 0fc5513c */ jal 0xf1544f0 +/* f1448a0: 0fc5513c */ jal gfxSetPrimColour /* f1448a4: 34a500a0 */ ori $a1,$a1,0xa0 /* f1448a8: 0040a025 */ move $s4,$v0 .PF0f1448ac: @@ -2849,7 +2849,7 @@ glabel var7f1b5f58 /* f145114: afa202bc */ sw $v0,0x2bc($sp) /* f145118: afb902b8 */ sw $t9,0x2b8($sp) .PF0f14511c: -/* f14511c: 0fc5bdaa */ jal 0xf16f6a8 +/* f14511c: 0fc5bdaa */ jal langGet /* f145120: 2404580c */ li $a0,0x580c /* f145124: 3c017f1b */ lui $at,0x7f1b /* f145128: c42a7274 */ lwc1 $f10,0x7274($at) @@ -2863,7 +2863,7 @@ glabel var7f1b5f58 /* f145148: 02602025 */ move $a0,$s3 /* f14514c: 00403025 */ move $a2,$v0 /* f145150: 460021a1 */ cvt.d.s $f6,$f4 -/* f145154: 0c004d11 */ jal 0x13444 +/* f145154: 0c004d11 */ jal sprintf /* f145158: f7a60010 */ sdc1 $f6,0x10($sp) /* f14515c: 3c0e8008 */ lui $t6,0x8008 /* f145160: 8dce0064 */ lw $t6,0x64($t6) @@ -2873,7 +2873,7 @@ glabel var7f1b5f58 /* f145170: 27a502ec */ addiu $a1,$sp,0x2ec /* f145174: 02603025 */ move $a2,$s3 /* f145178: afa00014 */ sw $zero,0x14($sp) -/* f14517c: 0fc5609a */ jal 0xf158268 +/* f14517c: 0fc5609a */ jal textMeasure /* f145180: afae0010 */ sw $t6,0x10($sp) /* f145184: 8fb20304 */ lw $s2,0x304($sp) /* f145188: 8fa902ec */ lw $t1,0x2ec($sp) @@ -2890,13 +2890,13 @@ glabel var7f1b5f58 /* f1451b4: 27a502f4 */ addiu $a1,$sp,0x2f4 /* f1451b8: 27a602f0 */ addiu $a2,$sp,0x2f0 /* f1451bc: 27a702e4 */ addiu $a3,$sp,0x2e4 -/* f1451c0: 0fc5515b */ jal 0xf15456c +/* f1451c0: 0fc5515b */ jal func0f153858 /* f1451c4: afb502f4 */ sw $s5,0x2f4($sp) -/* f1451c8: 0c002e53 */ jal 0xb94c +/* f1451c8: 0c002e53 */ jal viGetWidth /* f1451cc: 0040a025 */ move $s4,$v0 /* f1451d0: 00028400 */ sll $s0,$v0,0x10 /* f1451d4: 00107c03 */ sra $t7,$s0,0x10 -/* f1451d8: 0c002e57 */ jal 0xb95c +/* f1451d8: 0c002e57 */ jal viGetHeight /* f1451dc: 01e08025 */ move $s0,$t7 /* f1451e0: 3c188008 */ lui $t8,0x8008 /* f1451e4: 3c198008 */ lui $t9,0x8008 @@ -2915,10 +2915,10 @@ glabel var7f1b5f58 /* f145218: afb90014 */ sw $t9,0x14($sp) /* f14521c: afb80010 */ sw $t8,0x10($sp) /* f145220: afae0018 */ sw $t6,0x18($sp) -/* f145224: 0fc55fa0 */ jal 0xf157e80 +/* f145224: 0fc55fa0 */ jal textRender /* f145228: afaf001c */ sw $t7,0x1c($sp) /* f14522c: 0040a025 */ move $s4,$v0 -/* f145230: 0fc5bdaa */ jal 0xf16f6a8 +/* f145230: 0fc5bdaa */ jal langGet /* f145234: 2404580d */ li $a0,0x580d /* f145238: 8ed80284 */ lw $t8,0x284($s6) /* f14523c: 3c017f1b */ lui $at,0x7f1b @@ -2933,7 +2933,7 @@ glabel var7f1b5f58 /* f145260: 02602025 */ move $a0,$s3 /* f145264: 00403025 */ move $a2,$v0 /* f145268: 460021a1 */ cvt.d.s $f6,$f4 -/* f14526c: 0c004d11 */ jal 0x13444 +/* f14526c: 0c004d11 */ jal sprintf /* f145270: f7a60010 */ sdc1 $f6,0x10($sp) /* f145274: 3c0e8008 */ lui $t6,0x8008 /* f145278: 8dce0064 */ lw $t6,0x64($t6) @@ -2944,7 +2944,7 @@ glabel var7f1b5f58 /* f14528c: 27a502ec */ addiu $a1,$sp,0x2ec /* f145290: 02603025 */ move $a2,$s3 /* f145294: afa00014 */ sw $zero,0x14($sp) -/* f145298: 0fc5609a */ jal 0xf158268 +/* f145298: 0fc5609a */ jal textMeasure /* f14529c: afae0010 */ sw $t6,0x10($sp) /* f1452a0: 8fa902ec */ lw $t1,0x2ec($sp) /* f1452a4: 8fb802e8 */ lw $t8,0x2e8($sp) @@ -2959,13 +2959,13 @@ glabel var7f1b5f58 /* f1452c8: 27a602f0 */ addiu $a2,$sp,0x2f0 /* f1452cc: 27a702e4 */ addiu $a3,$sp,0x2e4 /* f1452d0: afb502f4 */ sw $s5,0x2f4($sp) -/* f1452d4: 0fc5515b */ jal 0xf15456c +/* f1452d4: 0fc5515b */ jal func0f153858 /* f1452d8: afb102f0 */ sw $s1,0x2f0($sp) -/* f1452dc: 0c002e53 */ jal 0xb94c +/* f1452dc: 0c002e53 */ jal viGetWidth /* f1452e0: 0040a025 */ move $s4,$v0 /* f1452e4: 00028400 */ sll $s0,$v0,0x10 /* f1452e8: 00107c03 */ sra $t7,$s0,0x10 -/* f1452ec: 0c002e57 */ jal 0xb95c +/* f1452ec: 0c002e57 */ jal viGetHeight /* f1452f0: 01e08025 */ move $s0,$t7 /* f1452f4: 3c188008 */ lui $t8,0x8008 /* f1452f8: 3c198008 */ lui $t9,0x8008 @@ -2984,10 +2984,10 @@ glabel var7f1b5f58 /* f14532c: afb90014 */ sw $t9,0x14($sp) /* f145330: afb80010 */ sw $t8,0x10($sp) /* f145334: afae0018 */ sw $t6,0x18($sp) -/* f145338: 0fc55fa0 */ jal 0xf157e80 +/* f145338: 0fc55fa0 */ jal textRender /* f14533c: afaf001c */ sw $t7,0x1c($sp) /* f145340: 0040a025 */ move $s4,$v0 -/* f145344: 0fc5bdaa */ jal 0xf16f6a8 +/* f145344: 0fc5bdaa */ jal langGet /* f145348: 2404580e */ li $a0,0x580e /* f14534c: 8ed80284 */ lw $t8,0x284($s6) /* f145350: 3c057f1b */ lui $a1,0x7f1b @@ -2998,7 +2998,7 @@ glabel var7f1b5f58 /* f145364: c728001c */ lwc1 $f8,0x1c($t9) /* f145368: 4600428d */ trunc.w.s $f10,$f8 /* f14536c: 44075000 */ mfc1 $a3,$f10 -/* f145370: 0c004d11 */ jal 0x13444 +/* f145370: 0c004d11 */ jal sprintf /* f145374: 00000000 */ nop /* f145378: 3c0f8008 */ lui $t7,0x8008 /* f14537c: 8def0064 */ lw $t7,0x64($t7) @@ -3009,7 +3009,7 @@ glabel var7f1b5f58 /* f145390: 27a502ec */ addiu $a1,$sp,0x2ec /* f145394: 02603025 */ move $a2,$s3 /* f145398: afa00014 */ sw $zero,0x14($sp) -/* f14539c: 0fc5609a */ jal 0xf158268 +/* f14539c: 0fc5609a */ jal textMeasure /* f1453a0: afaf0010 */ sw $t7,0x10($sp) /* f1453a4: 8fa902ec */ lw $t1,0x2ec($sp) /* f1453a8: 8fb902e8 */ lw $t9,0x2e8($sp) @@ -3024,13 +3024,13 @@ glabel var7f1b5f58 /* f1453cc: 27a602f0 */ addiu $a2,$sp,0x2f0 /* f1453d0: 27a702e4 */ addiu $a3,$sp,0x2e4 /* f1453d4: afb502f4 */ sw $s5,0x2f4($sp) -/* f1453d8: 0fc5515b */ jal 0xf15456c +/* f1453d8: 0fc5515b */ jal func0f153858 /* f1453dc: afb102f0 */ sw $s1,0x2f0($sp) -/* f1453e0: 0c002e53 */ jal 0xb94c +/* f1453e0: 0c002e53 */ jal viGetWidth /* f1453e4: 0040a025 */ move $s4,$v0 /* f1453e8: 00028400 */ sll $s0,$v0,0x10 /* f1453ec: 0010c403 */ sra $t8,$s0,0x10 -/* f1453f0: 0c002e57 */ jal 0xb95c +/* f1453f0: 0c002e57 */ jal viGetHeight /* f1453f4: 03008025 */ move $s0,$t8 /* f1453f8: 3c198008 */ lui $t9,0x8008 /* f1453fc: 3c0e8008 */ lui $t6,0x8008 @@ -3049,10 +3049,10 @@ glabel var7f1b5f58 /* f145430: afae0014 */ sw $t6,0x14($sp) /* f145434: afb90010 */ sw $t9,0x10($sp) /* f145438: afaf0018 */ sw $t7,0x18($sp) -/* f14543c: 0fc55fa0 */ jal 0xf157e80 +/* f14543c: 0fc55fa0 */ jal textRender /* f145440: afb8001c */ sw $t8,0x1c($sp) /* f145444: 0040a025 */ move $s4,$v0 -/* f145448: 0fc5bdaa */ jal 0xf16f6a8 +/* f145448: 0fc5bdaa */ jal langGet /* f14544c: 2404580f */ li $a0,0x580f /* f145450: 8ed90284 */ lw $t9,0x284($s6) /* f145454: 3c057f1b */ lui $a1,0x7f1b @@ -3063,7 +3063,7 @@ glabel var7f1b5f58 /* f145468: c5c40028 */ lwc1 $f4,0x28($t6) /* f14546c: 4600218d */ trunc.w.s $f6,$f4 /* f145470: 44073000 */ mfc1 $a3,$f6 -/* f145474: 0c004d11 */ jal 0x13444 +/* f145474: 0c004d11 */ jal sprintf /* f145478: 00000000 */ nop /* f14547c: 3c188008 */ lui $t8,0x8008 /* f145480: 8f180064 */ lw $t8,0x64($t8) @@ -3074,7 +3074,7 @@ glabel var7f1b5f58 /* f145494: 27a502ec */ addiu $a1,$sp,0x2ec /* f145498: 02603025 */ move $a2,$s3 /* f14549c: afa00014 */ sw $zero,0x14($sp) -/* f1454a0: 0fc5609a */ jal 0xf158268 +/* f1454a0: 0fc5609a */ jal textMeasure /* f1454a4: afb80010 */ sw $t8,0x10($sp) /* f1454a8: 8fa902ec */ lw $t1,0x2ec($sp) /* f1454ac: 8fae02e8 */ lw $t6,0x2e8($sp) @@ -3089,13 +3089,13 @@ glabel var7f1b5f58 /* f1454d0: 27a602f0 */ addiu $a2,$sp,0x2f0 /* f1454d4: 27a702e4 */ addiu $a3,$sp,0x2e4 /* f1454d8: afb502f4 */ sw $s5,0x2f4($sp) -/* f1454dc: 0fc5515b */ jal 0xf15456c +/* f1454dc: 0fc5515b */ jal func0f153858 /* f1454e0: afb102f0 */ sw $s1,0x2f0($sp) -/* f1454e4: 0c002e53 */ jal 0xb94c +/* f1454e4: 0c002e53 */ jal viGetWidth /* f1454e8: 0040a025 */ move $s4,$v0 /* f1454ec: 00028400 */ sll $s0,$v0,0x10 /* f1454f0: 0010cc03 */ sra $t9,$s0,0x10 -/* f1454f4: 0c002e57 */ jal 0xb95c +/* f1454f4: 0c002e57 */ jal viGetHeight /* f1454f8: 03208025 */ move $s0,$t9 /* f1454fc: 3c0e8008 */ lui $t6,0x8008 /* f145500: 3c0f8008 */ lui $t7,0x8008 @@ -3114,15 +3114,15 @@ glabel var7f1b5f58 /* f145534: afaf0014 */ sw $t7,0x14($sp) /* f145538: afae0010 */ sw $t6,0x10($sp) /* f14553c: afb80018 */ sw $t8,0x18($sp) -/* f145540: 0fc55fa0 */ jal 0xf157e80 +/* f145540: 0fc55fa0 */ jal textRender /* f145544: afb9001c */ sw $t9,0x1c($sp) /* f145548: 0040a025 */ move $s4,$v0 -/* f14554c: 0fc5bdaa */ jal 0xf16f6a8 +/* f14554c: 0fc5bdaa */ jal langGet /* f145550: 24045810 */ li $a0,0x5810 /* f145554: 3c057f1b */ lui $a1,0x7f1b /* f145558: 24a57134 */ addiu $a1,$a1,0x7134 /* f14555c: 02602025 */ move $a0,$s3 -/* f145560: 0c004d11 */ jal 0x13444 +/* f145560: 0c004d11 */ jal sprintf /* f145564: 00403025 */ move $a2,$v0 /* f145568: 3c0e8008 */ lui $t6,0x8008 /* f14556c: 8dce0064 */ lw $t6,0x64($t6) @@ -3132,7 +3132,7 @@ glabel var7f1b5f58 /* f14557c: 27a502ec */ addiu $a1,$sp,0x2ec /* f145580: 02603025 */ move $a2,$s3 /* f145584: afa00014 */ sw $zero,0x14($sp) -/* f145588: 0fc5609a */ jal 0xf158268 +/* f145588: 0fc5609a */ jal textMeasure /* f14558c: afae0010 */ sw $t6,0x10($sp) /* f145590: 8fa402ac */ lw $a0,0x2ac($sp) /* f145594: 8faf030c */ lw $t7,0x30c($sp) @@ -3166,13 +3166,13 @@ glabel var7f1b5f58 /* f1455f4: 27a502f4 */ addiu $a1,$sp,0x2f4 /* f1455f8: 27a602f0 */ addiu $a2,$sp,0x2f0 /* f1455fc: 27a702e4 */ addiu $a3,$sp,0x2e4 -/* f145600: 0fc5515b */ jal 0xf15456c +/* f145600: 0fc5515b */ jal func0f153858 /* f145604: afa302f4 */ sw $v1,0x2f4($sp) -/* f145608: 0c002e53 */ jal 0xb94c +/* f145608: 0c002e53 */ jal viGetWidth /* f14560c: 0040a025 */ move $s4,$v0 /* f145610: 00028400 */ sll $s0,$v0,0x10 /* f145614: 0010cc03 */ sra $t9,$s0,0x10 -/* f145618: 0c002e57 */ jal 0xb95c +/* f145618: 0c002e57 */ jal viGetHeight /* f14561c: 03208025 */ move $s0,$t9 /* f145620: 3c0e8008 */ lui $t6,0x8008 /* f145624: 3c0f8008 */ lui $t7,0x8008 @@ -3191,7 +3191,7 @@ glabel var7f1b5f58 /* f145658: afaf0014 */ sw $t7,0x14($sp) /* f14565c: afae0010 */ sw $t6,0x10($sp) /* f145660: afb80018 */ sw $t8,0x18($sp) -/* f145664: 0fc55fa0 */ jal 0xf157e80 +/* f145664: 0fc55fa0 */ jal textRender /* f145668: afb9001c */ sw $t9,0x1c($sp) /* f14566c: 8ece0284 */ lw $t6,0x284($s6) /* f145670: 0040a025 */ move $s4,$v0 @@ -3199,12 +3199,12 @@ glabel var7f1b5f58 /* f145678: 91e3006b */ lbu $v1,0x6b($t7) /* f14567c: 5460000b */ bnezl $v1,.PF0f1456ac /* f145680: 24010001 */ li $at,0x1 -/* f145684: 0fc5bdaa */ jal 0xf16f6a8 +/* f145684: 0fc5bdaa */ jal langGet /* f145688: 24045811 */ li $a0,0x5811 /* f14568c: 3c057f1b */ lui $a1,0x7f1b /* f145690: 24a57138 */ addiu $a1,$a1,0x7138 /* f145694: 02602025 */ move $a0,$s3 -/* f145698: 0c004d11 */ jal 0x13444 +/* f145698: 0c004d11 */ jal sprintf /* f14569c: 00403025 */ move $a2,$v0 /* f1456a0: 10000014 */ b .PF0f1456f4 /* f1456a4: 00000000 */ nop @@ -3212,22 +3212,22 @@ glabel var7f1b5f58 .PF0f1456ac: /* f1456ac: 1461000a */ bne $v1,$at,.PF0f1456d8 /* f1456b0: 00000000 */ nop -/* f1456b4: 0fc5bdaa */ jal 0xf16f6a8 +/* f1456b4: 0fc5bdaa */ jal langGet /* f1456b8: 24045893 */ li $a0,0x5893 /* f1456bc: 3c057f1b */ lui $a1,0x7f1b /* f1456c0: 24a5713c */ addiu $a1,$a1,0x713c /* f1456c4: 02602025 */ move $a0,$s3 -/* f1456c8: 0c004d11 */ jal 0x13444 +/* f1456c8: 0c004d11 */ jal sprintf /* f1456cc: 00403025 */ move $a2,$v0 /* f1456d0: 10000008 */ b .PF0f1456f4 /* f1456d4: 00000000 */ nop .PF0f1456d8: -/* f1456d8: 0fc5bdaa */ jal 0xf16f6a8 +/* f1456d8: 0fc5bdaa */ jal langGet /* f1456dc: 2404589c */ li $a0,0x589c /* f1456e0: 3c057f1b */ lui $a1,0x7f1b /* f1456e4: 24a57140 */ addiu $a1,$a1,0x7140 /* f1456e8: 02602025 */ move $a0,$s3 -/* f1456ec: 0c004d11 */ jal 0x13444 +/* f1456ec: 0c004d11 */ jal sprintf /* f1456f0: 00403025 */ move $a2,$v0 .PF0f1456f4: /* f1456f4: 3c188008 */ lui $t8,0x8008 @@ -3238,7 +3238,7 @@ glabel var7f1b5f58 /* f145708: 27a502ec */ addiu $a1,$sp,0x2ec /* f14570c: 02603025 */ move $a2,$s3 /* f145710: afa00014 */ sw $zero,0x14($sp) -/* f145714: 0fc5609a */ jal 0xf158268 +/* f145714: 0fc5609a */ jal textMeasure /* f145718: afb80010 */ sw $t8,0x10($sp) /* f14571c: 8faa02ac */ lw $t2,0x2ac($sp) /* f145720: 8fb9030c */ lw $t9,0x30c($sp) @@ -3272,13 +3272,13 @@ glabel var7f1b5f58 /* f145780: 27a502f4 */ addiu $a1,$sp,0x2f4 /* f145784: 27a602f0 */ addiu $a2,$sp,0x2f0 /* f145788: 27a702e4 */ addiu $a3,$sp,0x2e4 -/* f14578c: 0fc5515b */ jal 0xf15456c +/* f14578c: 0fc5515b */ jal func0f153858 /* f145790: afa302f4 */ sw $v1,0x2f4($sp) -/* f145794: 0c002e53 */ jal 0xb94c +/* f145794: 0c002e53 */ jal viGetWidth /* f145798: 0040a025 */ move $s4,$v0 /* f14579c: 00028400 */ sll $s0,$v0,0x10 /* f1457a0: 00107c03 */ sra $t7,$s0,0x10 -/* f1457a4: 0c002e57 */ jal 0xb95c +/* f1457a4: 0c002e57 */ jal viGetHeight /* f1457a8: 01e08025 */ move $s0,$t7 /* f1457ac: 3c188008 */ lui $t8,0x8008 /* f1457b0: 3c198008 */ lui $t9,0x8008 @@ -3297,7 +3297,7 @@ glabel var7f1b5f58 /* f1457e4: afb90014 */ sw $t9,0x14($sp) /* f1457e8: afb80010 */ sw $t8,0x10($sp) /* f1457ec: afae0018 */ sw $t6,0x18($sp) -/* f1457f0: 0fc55fa0 */ jal 0xf157e80 +/* f1457f0: 0fc55fa0 */ jal textRender /* f1457f4: afaf001c */ sw $t7,0x1c($sp) /* f1457f8: 8ed80284 */ lw $t8,0x284($s6) /* f1457fc: 0040a025 */ move $s4,$v0 @@ -3305,12 +3305,12 @@ glabel var7f1b5f58 /* f145804: 9323006b */ lbu $v1,0x6b($t9) /* f145808: 54600048 */ bnezl $v1,.PF0f14592c /* f14580c: 24010001 */ li $at,0x1 -/* f145810: 0fc5bdaa */ jal 0xf16f6a8 +/* f145810: 0fc5bdaa */ jal langGet /* f145814: 24045812 */ li $a0,0x5812 /* f145818: 3c057f1b */ lui $a1,0x7f1b /* f14581c: 24a57144 */ addiu $a1,$a1,0x7144 /* f145820: 02602025 */ move $a0,$s3 -/* f145824: 0c004d11 */ jal 0x13444 +/* f145824: 0c004d11 */ jal sprintf /* f145828: 00403025 */ move $a2,$v0 /* f14582c: 3c0e8008 */ lui $t6,0x8008 /* f145830: 8dce0064 */ lw $t6,0x64($t6) @@ -3320,7 +3320,7 @@ glabel var7f1b5f58 /* f145840: 27a502ec */ addiu $a1,$sp,0x2ec /* f145844: 02603025 */ move $a2,$s3 /* f145848: afa00014 */ sw $zero,0x14($sp) -/* f14584c: 0fc5609a */ jal 0xf158268 +/* f14584c: 0fc5609a */ jal textMeasure /* f145850: afae0010 */ sw $t6,0x10($sp) /* f145854: 8fa902ec */ lw $t1,0x2ec($sp) /* f145858: 8faf0090 */ lw $t7,0x90($sp) @@ -3348,13 +3348,13 @@ glabel var7f1b5f58 /* f1458a8: 27a502f4 */ addiu $a1,$sp,0x2f4 /* f1458ac: 27a602f0 */ addiu $a2,$sp,0x2f0 /* f1458b0: 27a702e4 */ addiu $a3,$sp,0x2e4 -/* f1458b4: 0fc5515b */ jal 0xf15456c +/* f1458b4: 0fc5515b */ jal func0f153858 /* f1458b8: afa302f4 */ sw $v1,0x2f4($sp) -/* f1458bc: 0c002e53 */ jal 0xb94c +/* f1458bc: 0c002e53 */ jal viGetWidth /* f1458c0: 0040a025 */ move $s4,$v0 /* f1458c4: 00028400 */ sll $s0,$v0,0x10 /* f1458c8: 00107403 */ sra $t6,$s0,0x10 -/* f1458cc: 0c002e57 */ jal 0xb95c +/* f1458cc: 0c002e57 */ jal viGetHeight /* f1458d0: 01c08025 */ move $s0,$t6 /* f1458d4: 3c0f8008 */ lui $t7,0x8008 /* f1458d8: 3c188008 */ lui $t8,0x8008 @@ -3373,7 +3373,7 @@ glabel var7f1b5f58 /* f14590c: afb80014 */ sw $t8,0x14($sp) /* f145910: afaf0010 */ sw $t7,0x10($sp) /* f145914: afb90018 */ sw $t9,0x18($sp) -/* f145918: 0fc55fa0 */ jal 0xf157e80 +/* f145918: 0fc55fa0 */ jal textRender /* f14591c: afae001c */ sw $t6,0x1c($sp) /* f145920: 1000008f */ b .PF0f145b60 /* f145924: 0040a025 */ move $s4,$v0 @@ -3381,12 +3381,12 @@ glabel var7f1b5f58 .PF0f14592c: /* f14592c: 14610047 */ bne $v1,$at,.PF0f145a4c /* f145930: 00000000 */ nop -/* f145934: 0fc5bdaa */ jal 0xf16f6a8 +/* f145934: 0fc5bdaa */ jal langGet /* f145938: 240458d1 */ li $a0,0x58d1 /* f14593c: 3c057f1b */ lui $a1,0x7f1b /* f145940: 24a5714c */ addiu $a1,$a1,0x714c /* f145944: 02602025 */ move $a0,$s3 -/* f145948: 0c004d11 */ jal 0x13444 +/* f145948: 0c004d11 */ jal sprintf /* f14594c: 00403025 */ move $a2,$v0 /* f145950: 3c0f8008 */ lui $t7,0x8008 /* f145954: 8def0064 */ lw $t7,0x64($t7) @@ -3396,7 +3396,7 @@ glabel var7f1b5f58 /* f145964: 27a502ec */ addiu $a1,$sp,0x2ec /* f145968: 02603025 */ move $a2,$s3 /* f14596c: afa00014 */ sw $zero,0x14($sp) -/* f145970: 0fc5609a */ jal 0xf158268 +/* f145970: 0fc5609a */ jal textMeasure /* f145974: afaf0010 */ sw $t7,0x10($sp) /* f145978: 8fa902ec */ lw $t1,0x2ec($sp) /* f14597c: 8fb80090 */ lw $t8,0x90($sp) @@ -3424,13 +3424,13 @@ glabel var7f1b5f58 /* f1459cc: 27a502f4 */ addiu $a1,$sp,0x2f4 /* f1459d0: 27a602f0 */ addiu $a2,$sp,0x2f0 /* f1459d4: 27a702e4 */ addiu $a3,$sp,0x2e4 -/* f1459d8: 0fc5515b */ jal 0xf15456c +/* f1459d8: 0fc5515b */ jal func0f153858 /* f1459dc: afa302f4 */ sw $v1,0x2f4($sp) -/* f1459e0: 0c002e53 */ jal 0xb94c +/* f1459e0: 0c002e53 */ jal viGetWidth /* f1459e4: 0040a025 */ move $s4,$v0 /* f1459e8: 00028400 */ sll $s0,$v0,0x10 /* f1459ec: 00107c03 */ sra $t7,$s0,0x10 -/* f1459f0: 0c002e57 */ jal 0xb95c +/* f1459f0: 0c002e57 */ jal viGetHeight /* f1459f4: 01e08025 */ move $s0,$t7 /* f1459f8: 3c188008 */ lui $t8,0x8008 /* f1459fc: 3c198008 */ lui $t9,0x8008 @@ -3449,17 +3449,17 @@ glabel var7f1b5f58 /* f145a30: afb90014 */ sw $t9,0x14($sp) /* f145a34: afb80010 */ sw $t8,0x10($sp) /* f145a38: afae0018 */ sw $t6,0x18($sp) -/* f145a3c: 0fc55fa0 */ jal 0xf157e80 +/* f145a3c: 0fc55fa0 */ jal textRender /* f145a40: afaf001c */ sw $t7,0x1c($sp) /* f145a44: 10000046 */ b .PF0f145b60 /* f145a48: 0040a025 */ move $s4,$v0 .PF0f145a4c: -/* f145a4c: 0fc5bdaa */ jal 0xf16f6a8 +/* f145a4c: 0fc5bdaa */ jal langGet /* f145a50: 240458d2 */ li $a0,0x58d2 /* f145a54: 3c057f1b */ lui $a1,0x7f1b /* f145a58: 24a57154 */ addiu $a1,$a1,0x7154 /* f145a5c: 02602025 */ move $a0,$s3 -/* f145a60: 0c004d11 */ jal 0x13444 +/* f145a60: 0c004d11 */ jal sprintf /* f145a64: 00403025 */ move $a2,$v0 /* f145a68: 3c188008 */ lui $t8,0x8008 /* f145a6c: 8f180064 */ lw $t8,0x64($t8) @@ -3469,7 +3469,7 @@ glabel var7f1b5f58 /* f145a7c: 27a502ec */ addiu $a1,$sp,0x2ec /* f145a80: 02603025 */ move $a2,$s3 /* f145a84: afa00014 */ sw $zero,0x14($sp) -/* f145a88: 0fc5609a */ jal 0xf158268 +/* f145a88: 0fc5609a */ jal textMeasure /* f145a8c: afb80010 */ sw $t8,0x10($sp) /* f145a90: 8fa902ec */ lw $t1,0x2ec($sp) /* f145a94: 8fb90090 */ lw $t9,0x90($sp) @@ -3497,13 +3497,13 @@ glabel var7f1b5f58 /* f145ae4: 27a502f4 */ addiu $a1,$sp,0x2f4 /* f145ae8: 27a602f0 */ addiu $a2,$sp,0x2f0 /* f145aec: 27a702e4 */ addiu $a3,$sp,0x2e4 -/* f145af0: 0fc5515b */ jal 0xf15456c +/* f145af0: 0fc5515b */ jal func0f153858 /* f145af4: afa302f4 */ sw $v1,0x2f4($sp) -/* f145af8: 0c002e53 */ jal 0xb94c +/* f145af8: 0c002e53 */ jal viGetWidth /* f145afc: 0040a025 */ move $s4,$v0 /* f145b00: 00028400 */ sll $s0,$v0,0x10 /* f145b04: 0010c403 */ sra $t8,$s0,0x10 -/* f145b08: 0c002e57 */ jal 0xb95c +/* f145b08: 0c002e57 */ jal viGetHeight /* f145b0c: 03008025 */ move $s0,$t8 /* f145b10: 3c198008 */ lui $t9,0x8008 /* f145b14: 3c0e8008 */ lui $t6,0x8008 @@ -3522,7 +3522,7 @@ glabel var7f1b5f58 /* f145b48: afae0014 */ sw $t6,0x14($sp) /* f145b4c: afb90010 */ sw $t9,0x10($sp) /* f145b50: afaf0018 */ sw $t7,0x18($sp) -/* f145b54: 0fc55fa0 */ jal 0xf157e80 +/* f145b54: 0fc55fa0 */ jal textRender /* f145b58: afb8001c */ sw $t8,0x1c($sp) /* f145b5c: 0040a025 */ move $s4,$v0 .PF0f145b60: @@ -3531,12 +3531,12 @@ glabel var7f1b5f58 /* f145b68: 91c3006b */ lbu $v1,0x6b($t6) /* f145b6c: 5460000b */ bnezl $v1,.PF0f145b9c /* f145b70: 24010001 */ li $at,0x1 -/* f145b74: 0fc5bdaa */ jal 0xf16f6a8 +/* f145b74: 0fc5bdaa */ jal langGet /* f145b78: 24045813 */ li $a0,0x5813 /* f145b7c: 3c057f1b */ lui $a1,0x7f1b /* f145b80: 24a5715c */ addiu $a1,$a1,0x715c /* f145b84: 02602025 */ move $a0,$s3 -/* f145b88: 0c004d11 */ jal 0x13444 +/* f145b88: 0c004d11 */ jal sprintf /* f145b8c: 00403025 */ move $a2,$v0 /* f145b90: 10000014 */ b .PF0f145be4 /* f145b94: 00000000 */ nop @@ -3544,22 +3544,22 @@ glabel var7f1b5f58 .PF0f145b9c: /* f145b9c: 1461000a */ bne $v1,$at,.PF0f145bc8 /* f145ba0: 00000000 */ nop -/* f145ba4: 0fc5bdaa */ jal 0xf16f6a8 +/* f145ba4: 0fc5bdaa */ jal langGet /* f145ba8: 24045892 */ li $a0,0x5892 /* f145bac: 3c057f1b */ lui $a1,0x7f1b /* f145bb0: 24a57160 */ addiu $a1,$a1,0x7160 /* f145bb4: 02602025 */ move $a0,$s3 -/* f145bb8: 0c004d11 */ jal 0x13444 +/* f145bb8: 0c004d11 */ jal sprintf /* f145bbc: 00403025 */ move $a2,$v0 /* f145bc0: 10000008 */ b .PF0f145be4 /* f145bc4: 00000000 */ nop .PF0f145bc8: -/* f145bc8: 0fc5bdaa */ jal 0xf16f6a8 +/* f145bc8: 0fc5bdaa */ jal langGet /* f145bcc: 2404589b */ li $a0,0x589b /* f145bd0: 3c057f1b */ lui $a1,0x7f1b /* f145bd4: 24a57164 */ addiu $a1,$a1,0x7164 /* f145bd8: 02602025 */ move $a0,$s3 -/* f145bdc: 0c004d11 */ jal 0x13444 +/* f145bdc: 0c004d11 */ jal sprintf /* f145be0: 00403025 */ move $a2,$v0 .PF0f145be4: /* f145be4: 3c0f8008 */ lui $t7,0x8008 @@ -3570,7 +3570,7 @@ glabel var7f1b5f58 /* f145bf8: 27a502ec */ addiu $a1,$sp,0x2ec /* f145bfc: 02603025 */ move $a2,$s3 /* f145c00: afa00014 */ sw $zero,0x14($sp) -/* f145c04: 0fc5609a */ jal 0xf158268 +/* f145c04: 0fc5609a */ jal textMeasure /* f145c08: afaf0010 */ sw $t7,0x10($sp) /* f145c0c: 8fb802ac */ lw $t8,0x2ac($sp) /* f145c10: 8fb90090 */ lw $t9,0x90($sp) @@ -3606,13 +3606,13 @@ glabel var7f1b5f58 /* f145c78: afb902e4 */ sw $t9,0x2e4($sp) /* f145c7c: 27a602f0 */ addiu $a2,$sp,0x2f0 /* f145c80: 27a702e4 */ addiu $a3,$sp,0x2e4 -/* f145c84: 0fc5515b */ jal 0xf15456c +/* f145c84: 0fc5515b */ jal func0f153858 /* f145c88: afa302f4 */ sw $v1,0x2f4($sp) -/* f145c8c: 0c002e53 */ jal 0xb94c +/* f145c8c: 0c002e53 */ jal viGetWidth /* f145c90: 0040a025 */ move $s4,$v0 /* f145c94: 00028400 */ sll $s0,$v0,0x10 /* f145c98: 0010cc03 */ sra $t9,$s0,0x10 -/* f145c9c: 0c002e57 */ jal 0xb95c +/* f145c9c: 0c002e57 */ jal viGetHeight /* f145ca0: 03208025 */ move $s0,$t9 /* f145ca4: 3c0e8008 */ lui $t6,0x8008 /* f145ca8: 3c0f8008 */ lui $t7,0x8008 @@ -3631,7 +3631,7 @@ glabel var7f1b5f58 /* f145cdc: afaf0014 */ sw $t7,0x14($sp) /* f145ce0: afae0010 */ sw $t6,0x10($sp) /* f145ce4: afb80018 */ sw $t8,0x18($sp) -/* f145ce8: 0fc55fa0 */ jal 0xf157e80 +/* f145ce8: 0fc55fa0 */ jal textRender /* f145cec: afb9001c */ sw $t9,0x1c($sp) /* f145cf0: 8ece0284 */ lw $t6,0x284($s6) /* f145cf4: 0040a025 */ move $s4,$v0 @@ -3642,22 +3642,22 @@ glabel var7f1b5f58 /* f145d08: 1461000a */ bne $v1,$at,.PF0f145d34 /* f145d0c: 00000000 */ nop .PF0f145d10: -/* f145d10: 0fc5bdaa */ jal 0xf16f6a8 +/* f145d10: 0fc5bdaa */ jal langGet /* f145d14: 24045814 */ li $a0,0x5814 /* f145d18: 3c057f1b */ lui $a1,0x7f1b /* f145d1c: 24a57168 */ addiu $a1,$a1,0x7168 /* f145d20: 02602025 */ move $a0,$s3 -/* f145d24: 0c004d11 */ jal 0x13444 +/* f145d24: 0c004d11 */ jal sprintf /* f145d28: 00403025 */ move $a2,$v0 /* f145d2c: 10000008 */ b .PF0f145d50 /* f145d30: 00000000 */ nop .PF0f145d34: -/* f145d34: 0fc5bdaa */ jal 0xf16f6a8 +/* f145d34: 0fc5bdaa */ jal langGet /* f145d38: 24045891 */ li $a0,0x5891 /* f145d3c: 3c057f1b */ lui $a1,0x7f1b /* f145d40: 24a5716c */ addiu $a1,$a1,0x716c /* f145d44: 02602025 */ move $a0,$s3 -/* f145d48: 0c004d11 */ jal 0x13444 +/* f145d48: 0c004d11 */ jal sprintf /* f145d4c: 00403025 */ move $a2,$v0 .PF0f145d50: /* f145d50: 3c188008 */ lui $t8,0x8008 @@ -3668,7 +3668,7 @@ glabel var7f1b5f58 /* f145d64: 27a502ec */ addiu $a1,$sp,0x2ec /* f145d68: 02603025 */ move $a2,$s3 /* f145d6c: afa00014 */ sw $zero,0x14($sp) -/* f145d70: 0fc5609a */ jal 0xf158268 +/* f145d70: 0fc5609a */ jal textMeasure /* f145d74: afb80010 */ sw $t8,0x10($sp) /* f145d78: 8fa902ec */ lw $t1,0x2ec($sp) /* f145d7c: 8fb90090 */ lw $t9,0x90($sp) @@ -3696,13 +3696,13 @@ glabel var7f1b5f58 /* f145dcc: 27a502f4 */ addiu $a1,$sp,0x2f4 /* f145dd0: 27a602f0 */ addiu $a2,$sp,0x2f0 /* f145dd4: 27a702e4 */ addiu $a3,$sp,0x2e4 -/* f145dd8: 0fc5515b */ jal 0xf15456c +/* f145dd8: 0fc5515b */ jal func0f153858 /* f145ddc: afa302f4 */ sw $v1,0x2f4($sp) -/* f145de0: 0c002e53 */ jal 0xb94c +/* f145de0: 0c002e53 */ jal viGetWidth /* f145de4: 0040a025 */ move $s4,$v0 /* f145de8: 00028400 */ sll $s0,$v0,0x10 /* f145dec: 0010c403 */ sra $t8,$s0,0x10 -/* f145df0: 0c002e57 */ jal 0xb95c +/* f145df0: 0c002e57 */ jal viGetHeight /* f145df4: 03008025 */ move $s0,$t8 /* f145df8: 3c198008 */ lui $t9,0x8008 /* f145dfc: 3c0e8008 */ lui $t6,0x8008 @@ -3721,13 +3721,13 @@ glabel var7f1b5f58 /* f145e30: afae0014 */ sw $t6,0x14($sp) /* f145e34: afb90010 */ sw $t9,0x10($sp) /* f145e38: afaf0018 */ sw $t7,0x18($sp) -/* f145e3c: 0fc55fa0 */ jal 0xf157e80 +/* f145e3c: 0fc55fa0 */ jal textRender /* f145e40: afb8001c */ sw $t8,0x1c($sp) -/* f145e44: 0fc55153 */ jal 0xf15454c +/* f145e44: 0fc55153 */ jal func0f153838 /* f145e48: 00402025 */ move $a0,$v0 /* f145e4c: 8ed90288 */ lw $t9,0x288($s6) /* f145e50: 0040a025 */ move $s4,$v0 -/* f145e54: 0fc54cfe */ jal 0xf1533f8 +/* f145e54: 0fc54cfe */ jal optionsGetContpadNum1 /* f145e58: 8f240070 */ lw $a0,0x70($t9) /* f145e5c: 00028600 */ sll $s0,$v0,0x18 /* f145e60: 00022600 */ sll $a0,$v0,0x18 @@ -3735,25 +3735,25 @@ glabel var7f1b5f58 /* f145e68: 00047e03 */ sra $t7,$a0,0x18 /* f145e6c: 01c08025 */ move $s0,$t6 /* f145e70: 01e02025 */ move $a0,$t7 -/* f145e74: 0c00533a */ jal 0x14ce8 +/* f145e74: 0c00533a */ jal contGetButtons /* f145e78: 3405ffff */ li $a1,0xffff /* f145e7c: 00102600 */ sll $a0,$s0,0x18 /* f145e80: 0004c603 */ sra $t8,$a0,0x18 /* f145e84: 03002025 */ move $a0,$t8 /* f145e88: 3051ffff */ andi $s1,$v0,0xffff -/* f145e8c: 0c00536a */ jal 0x14da8 +/* f145e8c: 0c00536a */ jal contGetButtonsPressedThisFrame /* f145e90: 3405ffff */ li $a1,0xffff /* f145e94: 00102600 */ sll $a0,$s0,0x18 /* f145e98: 0004ce03 */ sra $t9,$a0,0x18 /* f145e9c: 3053ffff */ andi $s3,$v0,0xffff -/* f145ea0: 0c0052e6 */ jal 0x14b98 +/* f145ea0: 0c0052e6 */ jal contGetStickX /* f145ea4: 03202025 */ move $a0,$t9 /* f145ea8: 0002ae00 */ sll $s5,$v0,0x18 /* f145eac: 00102600 */ sll $a0,$s0,0x18 /* f145eb0: 00047e03 */ sra $t7,$a0,0x18 /* f145eb4: 00157603 */ sra $t6,$s5,0x18 /* f145eb8: 01c0a825 */ move $s5,$t6 -/* f145ebc: 0c005310 */ jal 0x14c40 +/* f145ebc: 0c005310 */ jal contGetStickY /* f145ec0: 01e02025 */ move $a0,$t7 /* f145ec4: 02801825 */ move $v1,$s4 /* f145ec8: 26940008 */ addiu $s4,$s4,0x8 @@ -5557,7 +5557,7 @@ glabel var7f1b5f58 /* f147978: a3a000cb */ sb $zero,0xcb($sp) .PF0f14797c: /* f14797c: afa500c4 */ sw $a1,0xc4($sp) -/* f147980: 0fc3534f */ jal 0xf0d4d3c +/* f147980: 0fc3534f */ jal func0f0d479c /* f147984: e7ae0078 */ swc1 $f14,0x78($sp) /* f147988: c7ae0078 */ lwc1 $f14,0x78($sp) /* f14798c: 3c0eb600 */ lui $t6,0xb600 @@ -5646,12 +5646,12 @@ glabel var7f1b5f58 /* f147ac0: 2b010002 */ slti $at,$t8,0x2 /* f147ac4: 1020000b */ beqz $at,.PF0f147af4 /* f147ac8: afa802f0 */ sw $t0,0x2f0($sp) -/* f147acc: 0fc54e8c */ jal 0xf153a30 +/* f147acc: 0fc54e8c */ jal optionsGetEffectiveScreenSize /* f147ad0: e7ae0078 */ swc1 $f14,0x78($sp) /* f147ad4: 24010001 */ li $at,0x1 /* f147ad8: 10410006 */ beq $v0,$at,.PF0f147af4 /* f147adc: c7ae0078 */ lwc1 $f14,0x78($sp) -/* f147ae0: 0fc54e8c */ jal 0xf153a30 +/* f147ae0: 0fc54e8c */ jal optionsGetEffectiveScreenSize /* f147ae4: e7ae0078 */ swc1 $f14,0x78($sp) /* f147ae8: 24010002 */ li $at,0x2 /* f147aec: 14410004 */ bne $v0,$at,.PF0f147b00 @@ -5709,7 +5709,7 @@ glabel var7f1b5f58 /* f147ba4: 01f8c823 */ subu $t9,$t7,$t8 /* f147ba8: 44993000 */ mtc1 $t9,$f6 /* f147bac: afa302f4 */ sw $v1,0x2f4($sp) -/* f147bb0: 0c0127b4 */ jal 0x49ed0 +/* f147bb0: 0c0127b4 */ jal sqrtf /* f147bb4: 46803320 */ cvt.s.w $f12,$f6 /* f147bb8: c7aa02b0 */ lwc1 $f10,0x2b0($sp) /* f147bbc: c7a80074 */ lwc1 $f8,0x74($sp) @@ -5733,7 +5733,7 @@ glabel var7f1b5f58 /* f147c04: 44032000 */ mfc1 $v1,$f4 /* f147c08: 46803320 */ cvt.s.w $f12,$f6 /* f147c0c: afa30240 */ sw $v1,0x240($sp) -/* f147c10: 0c0127b4 */ jal 0x49ed0 +/* f147c10: 0c0127b4 */ jal sqrtf /* f147c14: afa302f4 */ sw $v1,0x2f4($sp) /* f147c18: c7a802b0 */ lwc1 $f8,0x2b0($sp) /* f147c1c: c7aa0074 */ lwc1 $f10,0x74($sp) @@ -5763,7 +5763,7 @@ glabel var7f1b5f58 /* f147c7c: 14600006 */ bnez $v1,.PF0f147c98 /* f147c80: 00000000 */ nop /* f147c84: afa00010 */ sw $zero,0x10($sp) -/* f147c88: 0fc510cf */ jal 0xf14433c +/* f147c88: 0fc510cf */ jal bviewRenderEyespySideRect /* f147c8c: afa20014 */ sw $v0,0x14($sp) /* f147c90: 10000017 */ b .PF0f147cf0 /* f147c94: 0040a025 */ move $s4,$v0 @@ -5777,7 +5777,7 @@ glabel var7f1b5f58 /* f147cb0: 27a50228 */ addiu $a1,$sp,0x228 /* f147cb4: 24060010 */ li $a2,0x10 /* f147cb8: 324700ff */ andi $a3,$s2,0xff -/* f147cbc: 0fc510cf */ jal 0xf14433c +/* f147cbc: 0fc510cf */ jal bviewRenderEyespySideRect /* f147cc0: afa20014 */ sw $v0,0x14($sp) /* f147cc4: 1000000a */ b .PF0f147cf0 /* f147cc8: 0040a025 */ move $s4,$v0 @@ -5788,7 +5788,7 @@ glabel var7f1b5f58 /* f147cd8: 27a50228 */ addiu $a1,$sp,0x228 /* f147cdc: 324600ff */ andi $a2,$s2,0xff /* f147ce0: afa00010 */ sw $zero,0x10($sp) -/* f147ce4: 0fc510cf */ jal 0xf14433c +/* f147ce4: 0fc510cf */ jal bviewRenderEyespySideRect /* f147ce8: afa20014 */ sw $v0,0x14($sp) /* f147cec: 0040a025 */ move $s4,$v0 .PF0f147cf0: @@ -5862,12 +5862,12 @@ glabel var7f1b5f58 /* f147de4: afa400c4 */ sw $a0,0xc4($sp) /* f147de8: 1020000b */ beqz $at,.PF0f147e18 /* f147dec: afa802f0 */ sw $t0,0x2f0($sp) -/* f147df0: 0fc54e8c */ jal 0xf153a30 +/* f147df0: 0fc54e8c */ jal optionsGetEffectiveScreenSize /* f147df4: afa400c4 */ sw $a0,0xc4($sp) /* f147df8: 24010001 */ li $at,0x1 /* f147dfc: 50410007 */ beql $v0,$at,.PF0f147e1c /* f147e00: 8fa802f0 */ lw $t0,0x2f0($sp) -/* f147e04: 0fc54e8c */ jal 0xf153a30 +/* f147e04: 0fc54e8c */ jal optionsGetEffectiveScreenSize /* f147e08: 00000000 */ nop /* f147e0c: 24010002 */ li $at,0x2 /* f147e10: 14410004 */ bne $v0,$at,.PF0f147e24 @@ -5916,7 +5916,7 @@ glabel var7f1b5f58 /* f147ea0: 03197023 */ subu $t6,$t8,$t9 /* f147ea4: 448e5000 */ mtc1 $t6,$f10 /* f147ea8: afa802f0 */ sw $t0,0x2f0($sp) -/* f147eac: 0c0127b4 */ jal 0x49ed0 +/* f147eac: 0c0127b4 */ jal sqrtf /* f147eb0: 46805320 */ cvt.s.w $f12,$f10 /* f147eb4: c7a402b0 */ lwc1 $f4,0x2b0($sp) /* f147eb8: c7a80074 */ lwc1 $f8,0x74($sp) @@ -5940,7 +5940,7 @@ glabel var7f1b5f58 /* f147f00: 44034000 */ mfc1 $v1,$f8 /* f147f04: 46805320 */ cvt.s.w $f12,$f10 /* f147f08: afa30240 */ sw $v1,0x240($sp) -/* f147f0c: 0c0127b4 */ jal 0x49ed0 +/* f147f0c: 0c0127b4 */ jal sqrtf /* f147f10: afa302f4 */ sw $v1,0x2f4($sp) /* f147f14: c7a402b0 */ lwc1 $f4,0x2b0($sp) /* f147f18: c7a80074 */ lwc1 $f8,0x74($sp) @@ -5970,7 +5970,7 @@ glabel var7f1b5f58 /* f147f78: 14600006 */ bnez $v1,.PF0f147f94 /* f147f7c: 00000000 */ nop /* f147f80: afa00010 */ sw $zero,0x10($sp) -/* f147f84: 0fc510cf */ jal 0xf14433c +/* f147f84: 0fc510cf */ jal bviewRenderEyespySideRect /* f147f88: afa20014 */ sw $v0,0x14($sp) /* f147f8c: 10000017 */ b .PF0f147fec /* f147f90: 0040a025 */ move $s4,$v0 @@ -5984,7 +5984,7 @@ glabel var7f1b5f58 /* f147fac: 27a50228 */ addiu $a1,$sp,0x228 /* f147fb0: 24060010 */ li $a2,0x10 /* f147fb4: 324700ff */ andi $a3,$s2,0xff -/* f147fb8: 0fc510cf */ jal 0xf14433c +/* f147fb8: 0fc510cf */ jal bviewRenderEyespySideRect /* f147fbc: afa20014 */ sw $v0,0x14($sp) /* f147fc0: 1000000a */ b .PF0f147fec /* f147fc4: 0040a025 */ move $s4,$v0 @@ -5995,7 +5995,7 @@ glabel var7f1b5f58 /* f147fd4: 27a50228 */ addiu $a1,$sp,0x228 /* f147fd8: 324600ff */ andi $a2,$s2,0xff /* f147fdc: afa00010 */ sw $zero,0x10($sp) -/* f147fe0: 0fc510cf */ jal 0xf14433c +/* f147fe0: 0fc510cf */ jal bviewRenderEyespySideRect /* f147fe4: afa20014 */ sw $v0,0x14($sp) /* f147fe8: 0040a025 */ move $s4,$v0 .PF0f147fec: @@ -6007,7 +6007,7 @@ glabel var7f1b5f58 /* f148000: 25080002 */ addiu $t0,$t0,0x2 /* f148004: afa802f0 */ sw $t0,0x2f0($sp) .PF0f148008: -/* f148008: 0fc353da */ jal 0xf0d4f68 +/* f148008: 0fc353da */ jal func0f0d49c8 /* f14800c: 02802025 */ move $a0,$s4 .PF0f148010: /* f148010: 8fbf0054 */ lw $ra,0x54($sp) diff --git a/src/game/bondwalk.c b/src/game/bondwalk.c index 2bd95ef5c..456b1742f 100644 --- a/src/game/bondwalk.c +++ b/src/game/bondwalk.c @@ -2083,7 +2083,7 @@ glabel var7f1ad854 /* f0c6fa0: 44813000 */ mtc1 $at,$f6 /* f0c6fa4: c54419c4 */ lwc1 $f4,0x19c4($t2) /* f0c6fa8: 46062201 */ sub.s $f8,$f4,$f6 -/* f0c6fac: 0fc44cc9 */ jal 0xf113324 +/* f0c6fac: 0fc44cc9 */ jal invHasBriefcase /* f0c6fb0: e7a800c0 */ swc1 $f8,0xc0($sp) /* f0c6fb4: 3c08800a */ lui $t0,0x800a /* f0c6fb8: 1040000a */ beqz $v0,.PF0f0c6fe4 @@ -2120,7 +2120,7 @@ glabel var7f1ad854 /* f0c702c: 46080002 */ mul.s $f0,$f0,$f8 /* f0c7030: 00000000 */ nop .PF0f0c7034: -/* f0c7034: 0fc41dd5 */ jal 0xf107754 +/* f0c7034: 0fc41dd5 */ jal cheatIsActive /* f0c7038: e7a000c0 */ swc1 $f0,0xc0($sp) /* f0c703c: 3c08800a */ lui $t0,0x800a /* f0c7040: 10400006 */ beqz $v0,.PF0f0c705c @@ -2158,7 +2158,7 @@ glabel var7f1ad854 .PF0f0c70bc: /* f0c70bc: c42aeadc */ lwc1 $f10,-0x1524($at) /* f0c70c0: 460a0302 */ mul.s $f12,$f0,$f10 -/* f0c70c4: 0c006858 */ jal 0x1a160 +/* f0c70c4: 0c006858 */ jal cosf /* f0c70c8: 00000000 */ nop /* f0c70cc: 3c013f80 */ lui $at,0x3f80 /* f0c70d0: 44811000 */ mtc1 $at,$f2 @@ -2180,28 +2180,28 @@ glabel var7f1ad854 /* f0c7110: c4661b4c */ lwc1 $f6,0x1b4c($v1) /* f0c7114: 24671b08 */ addiu $a3,$v1,0x1b08 /* f0c7118: 46061101 */ sub.s $f4,$f2,$f6 -/* f0c711c: 0fc33252 */ jal 0xf0cc948 +/* f0c711c: 0fc33252 */ jal bmoveUpdateHead /* f0c7120: e7a40010 */ swc1 $f4,0x10($sp) /* f0c7124: 3c08800a */ lui $t0,0x800a /* f0c7128: 2508a510 */ addiu $t0,$t0,-23280 /* f0c712c: 8d090284 */ lw $t1,0x284($t0) /* f0c7130: 27a400cc */ addiu $a0,$sp,0xcc -/* f0c7134: 0fc33036 */ jal 0xf0cc0d8 +/* f0c7134: 0fc33036 */ jal bmoveUpdateMoveInitSpeed /* f0c7138: e53400cc */ swc1 $f20,0xcc($t1) /* f0c713c: 4405a000 */ mfc1 $a1,$f20 /* f0c7140: 4407a000 */ mfc1 $a3,$f20 /* f0c7144: 240a003f */ li $t2,0x3f /* f0c7148: afaa0010 */ sw $t2,0x10($sp) /* f0c714c: 27a400cc */ addiu $a0,$sp,0xcc -/* f0c7150: 0fc311f8 */ jal 0xf0c47e0 +/* f0c7150: 0fc311f8 */ jal bwalkCalculateNewPositionWithPush /* f0c7154: 24060001 */ li $a2,0x1 /* f0c7158: 3c08800a */ lui $t0,0x800a /* f0c715c: 100002e6 */ b .PF0f0c7cf8 /* f0c7160: 2508a510 */ addiu $t0,$t0,-23280 .PF0f0c7164: -/* f0c7164: 0fc31964 */ jal 0xf0c6590 +/* f0c7164: 0fc31964 */ jal bwalkApplyCrouchSpeed /* f0c7168: 00000000 */ nop -/* f0c716c: 0fc319ca */ jal 0xf0c6728 +/* f0c716c: 0fc319ca */ jal bwalkUpdateCrouchOffset /* f0c7170: 00000000 */ nop /* f0c7174: 3c08800a */ lui $t0,0x800a /* f0c7178: 2508a510 */ addiu $t0,$t0,-23280 @@ -2211,7 +2211,7 @@ glabel var7f1ad854 /* f0c7188: c468014c */ lwc1 $f8,0x14c($v1) /* f0c718c: 8c670150 */ lw $a3,0x150($v1) /* f0c7190: 2466017c */ addiu $a2,$v1,0x17c -/* f0c7194: 0fc33006 */ jal 0xf0cc018 +/* f0c7194: 0fc33006 */ jal bmove0f0cba88 /* f0c7198: e7a80010 */ swc1 $f8,0x10($sp) /* f0c719c: 3c08800a */ lui $t0,0x800a /* f0c71a0: 2508a510 */ addiu $t0,$t0,-23280 @@ -2265,7 +2265,7 @@ glabel var7f1ad854 /* f0c7254: e7b000b4 */ swc1 $f16,0xb4($sp) /* f0c7258: 46129282 */ mul.s $f10,$f18,$f18 /* f0c725c: e7b200b0 */ swc1 $f18,0xb0($sp) -/* f0c7260: 0c0127b4 */ jal 0x49ed0 +/* f0c7260: 0c0127b4 */ jal sqrtf /* f0c7264: 460a4300 */ add.s $f12,$f8,$f10 /* f0c7268: 3c08800a */ lui $t0,0x800a /* f0c726c: 2508a510 */ addiu $t0,$t0,-23280 @@ -2452,7 +2452,7 @@ glabel var7f1ad854 /* f0c74f8: 46085102 */ mul.s $f4,$f10,$f8 /* f0c74fc: 46062280 */ add.s $f10,$f4,$f6 /* f0c7500: 46005082 */ mul.s $f2,$f10,$f0 -/* f0c7504: 0fc41dd5 */ jal 0xf107754 +/* f0c7504: 0fc41dd5 */ jal cheatIsActive /* f0c7508: e7a200e0 */ swc1 $f2,0xe0($sp) /* f0c750c: 3c08800a */ lui $t0,0x800a /* f0c7510: 2508a510 */ addiu $t0,$t0,-23280 @@ -2469,7 +2469,7 @@ glabel var7f1ad854 /* f0c7538: 44061000 */ mfc1 $a2,$f2 /* f0c753c: c7ac0078 */ lwc1 $f12,0x78($sp) /* f0c7540: 46062282 */ mul.s $f10,$f4,$f6 -/* f0c7544: 0fc332f9 */ jal 0xf0ccbe4 +/* f0c7544: 0fc332f9 */ jal bmove0f0cc654 /* f0c7548: 46085380 */ add.s $f14,$f10,$f8 /* f0c754c: 3c08800a */ lui $t0,0x800a /* f0c7550: 2508a510 */ addiu $t0,$t0,-23280 @@ -2481,7 +2481,7 @@ glabel var7f1ad854 /* f0c7568: c46003c0 */ lwc1 $f0,0x3c0($v1) /* f0c756c: c46203c8 */ lwc1 $f2,0x3c8($v1) /* f0c7570: e7a000dc */ swc1 $f0,0xdc($sp) -/* f0c7574: 0fc41dd5 */ jal 0xf107754 +/* f0c7574: 0fc41dd5 */ jal cheatIsActive /* f0c7578: e7a200d8 */ swc1 $f2,0xd8($sp) /* f0c757c: 3c08800a */ lui $t0,0x800a /* f0c7580: 2508a510 */ addiu $t0,$t0,-23280 @@ -2521,9 +2521,9 @@ glabel var7f1ad854 /* f0c7604: e7a400d4 */ swc1 $f4,0xd4($sp) /* f0c7608: 46062280 */ add.s $f10,$f4,$f6 /* f0c760c: e7a800cc */ swc1 $f8,0xcc($sp) -/* f0c7610: 0fc33036 */ jal 0xf0cc0d8 +/* f0c7610: 0fc33036 */ jal bmoveUpdateMoveInitSpeed /* f0c7614: e7aa00d4 */ swc1 $f10,0xd4($sp) -/* f0c7618: 0fc47e42 */ jal 0xf11f908 +/* f0c7618: 0fc47e42 */ jal debugIsTurboModeEnabled /* f0c761c: 00000000 */ nop /* f0c7620: 3c08800a */ lui $t0,0x800a /* f0c7624: 1040001f */ beqz $v0,.PF0f0c76a4 @@ -2587,7 +2587,7 @@ glabel var7f1ad854 /* f0c7700: 246502a4 */ addiu $a1,$v1,0x2a4 /* f0c7704: 51a0006a */ beqzl $t5,.PF0f0c78b0 /* f0c7708: 8c640298 */ lw $a0,0x298($v1) -/* f0c770c: 0c0011d8 */ jal 0x4760 +/* f0c770c: 0c0011d8 */ jal guNormalize /* f0c7710: 246602a8 */ addiu $a2,$v1,0x2a8 /* f0c7714: 3c08800a */ lui $t0,0x800a /* f0c7718: 2508a510 */ addiu $t0,$t0,-23280 @@ -2629,7 +2629,7 @@ glabel var7f1ad854 /* f0c77a8: e46a029c */ swc1 $f10,0x29c($v1) /* f0c77ac: 8c6400bc */ lw $a0,0xbc($v1) .PF0f0c77b0: -/* f0c77b0: 0fc30989 */ jal 0xf0c2624 +/* f0c77b0: 0fc30989 */ jal propPlayerGetBbox /* f0c77b4: e7a00074 */ swc1 $f0,0x74($sp) /* f0c77b8: 3c08800a */ lui $t0,0x800a /* f0c77bc: 3c017f1b */ lui $at,0x7f1b @@ -2655,7 +2655,7 @@ glabel var7f1ad854 /* f0c780c: 460a3200 */ add.s $f8,$f6,$f10 /* f0c7810: 24440008 */ addiu $a0,$v0,0x8 /* f0c7814: 44074000 */ mfc1 $a3,$f8 -/* f0c7818: 0c00a68f */ jal 0x29a3c +/* f0c7818: 0c00a68f */ jal func0002a13c /* f0c781c: 00000000 */ nop /* f0c7820: 3c08800a */ lui $t0,0x800a /* f0c7824: 2508a510 */ addiu $t0,$t0,-23280 @@ -2734,7 +2734,7 @@ glabel var7f1ad854 /* f0c7930: 00000000 */ nop /* f0c7934: 24050001 */ li $a1,0x1 .PF0f0c7938: -/* f0c7938: 0fc31a59 */ jal 0xf0c6964 +/* f0c7938: 0fc31a59 */ jal bwalk0f0c63bc /* f0c793c: 2406003f */ li $a2,0x3f /* f0c7940: 3c08800a */ lui $t0,0x800a /* f0c7944: 2508a510 */ addiu $t0,$t0,-23280 @@ -2975,7 +2975,7 @@ glabel var7f1ad854 /* f0c7cb0: 46082180 */ add.s $f6,$f4,$f8 /* f0c7cb4: 460e3303 */ div.s $f12,$f6,$f14 .PF0f0c7cb8: -/* f0c7cb8: 0c0127b4 */ jal 0x49ed0 +/* f0c7cb8: 0c0127b4 */ jal sqrtf /* f0c7cbc: 00000000 */ nop /* f0c7cc0: c7a400b4 */ lwc1 $f4,0xb4($sp) /* f0c7cc4: 3c08800a */ lui $t0,0x800a @@ -3007,7 +3007,7 @@ glabel var7f1ad854 /* f0c7d28: c46a00cc */ lwc1 $f10,0xcc($v1) /* f0c7d2c: e7aa003c */ swc1 $f10,0x3c($sp) /* f0c7d30: 46083080 */ add.s $f2,$f6,$f8 -/* f0c7d34: 0fc45313 */ jal 0xf114c4c +/* f0c7d34: 0fc45313 */ jal bheadGetBreathingValue /* f0c7d38: e7a20040 */ swc1 $f2,0x40($sp) /* f0c7d3c: 3c013f80 */ lui $at,0x3f80 /* f0c7d40: 44817000 */ mtc1 $at,$f14 @@ -3043,7 +3043,7 @@ glabel var7f1ad854 /* f0c7dac: 46040302 */ mul.s $f12,$f0,$f4 /* f0c7db0: 00000000 */ nop .PF0f0c7db4: -/* f0c7db4: 0fc276e4 */ jal 0xf09db90 +/* f0c7db4: 0fc276e4 */ jal func0f09d8dc /* f0c7db8: e7b40010 */ swc1 $f20,0x10($sp) /* f0c7dbc: 3c08800a */ lui $t0,0x800a /* f0c7dc0: 2508a510 */ addiu $t0,$t0,-23280 @@ -3052,7 +3052,7 @@ glabel var7f1ad854 /* f0c7dcc: c428eb24 */ lwc1 $f8,-0x14dc($at) /* f0c7dd0: c5a60158 */ lwc1 $f6,0x158($t5) /* f0c7dd4: 46083302 */ mul.s $f12,$f6,$f8 -/* f0c7dd8: 0fc28971 */ jal 0xf0a25c4 +/* f0c7dd8: 0fc28971 */ jal handSetAdjustPos /* f0c7ddc: 00000000 */ nop /* f0c7de0: 8fbf0024 */ lw $ra,0x24($sp) /* f0c7de4: d7b40018 */ ldc1 $f20,0x18($sp) diff --git a/src/game/cheats.c b/src/game/cheats.c index bf666bd99..84df41cea 100644 --- a/src/game/cheats.c +++ b/src/game/cheats.c @@ -549,22 +549,22 @@ glabel cheatGetMarquee /* f1083e0: 254a4594 */ addiu $t2,$t2,0x4594 /* f1083e4: 1542000f */ bne $t2,$v0,.PF0f108424 /* f1083e8: 00000000 */ nop -/* f1083ec: 0fc5bdaa */ jal 0xf16f6a8 +/* f1083ec: 0fc5bdaa */ jal langGet /* f1083f0: 24045490 */ li $a0,0x5490 /* f1083f4: afa20054 */ sw $v0,0x54($sp) -/* f1083f8: 0fc5bdaa */ jal 0xf16f6a8 +/* f1083f8: 0fc5bdaa */ jal langGet /* f1083fc: 24045476 */ li $a0,0x5476 /* f108400: 3c04800a */ lui $a0,0x800a /* f108404: 3c057f1b */ lui $a1,0x7f1b /* f108408: 24a541a0 */ addiu $a1,$a1,0x41a0 /* f10840c: 2484e430 */ addiu $a0,$a0,-7120 /* f108410: 8fa60054 */ lw $a2,0x54($sp) -/* f108414: 0c004d11 */ jal 0x13444 +/* f108414: 0c004d11 */ jal sprintf /* f108418: 00403825 */ move $a3,$v0 /* f10841c: 100000cd */ b .PF0f108754 /* f108420: 00000000 */ nop .PF0f108424: -/* f108424: 0fc41d8c */ jal 0xf107630 +/* f108424: 0fc41d8c */ jal cheatIsUnlocked /* f108428: afa40264 */ sw $a0,0x264($sp) /* f10842c: 10400028 */ beqz $v0,.PF0f1084d0 /* f108430: 8fa90264 */ lw $t1,0x264($sp) @@ -585,12 +585,12 @@ glabel cheatGetMarquee /* f10846c: 8dcf0000 */ lw $t7,0x0($t6) /* f108470: 156f0005 */ bne $t3,$t7,.PF0f108488 /* f108474: 00000000 */ nop -/* f108478: 0fc5bdaa */ jal 0xf16f6a8 +/* f108478: 0fc5bdaa */ jal langGet /* f10847c: 24045490 */ li $a0,0x5490 /* f108480: 10000004 */ b .PF0f108494 /* f108484: afa20054 */ sw $v0,0x54($sp) .PF0f108488: -/* f108488: 0fc5bdaa */ jal 0xf16f6a8 +/* f108488: 0fc5bdaa */ jal langGet /* f10848c: 24045489 */ li $a0,0x5489 /* f108490: afa20054 */ sw $v0,0x54($sp) .PF0f108494: @@ -598,14 +598,14 @@ glabel cheatGetMarquee /* f108498: 3c048007 */ lui $a0,0x8007 /* f10849c: 0018c8c0 */ sll $t9,$t8,0x3 /* f1084a0: 00992021 */ addu $a0,$a0,$t9 -/* f1084a4: 0fc5bdaa */ jal 0xf16f6a8 +/* f1084a4: 0fc5bdaa */ jal langGet /* f1084a8: 94843e70 */ lhu $a0,0x3e70($a0) /* f1084ac: 3c04800a */ lui $a0,0x800a /* f1084b0: 3c057f1b */ lui $a1,0x7f1b /* f1084b4: 24a541a8 */ addiu $a1,$a1,0x41a8 /* f1084b8: 2484e430 */ addiu $a0,$a0,-7120 /* f1084bc: 8fa60054 */ lw $a2,0x54($sp) -/* f1084c0: 0c004d11 */ jal 0x13444 +/* f1084c0: 0c004d11 */ jal sprintf /* f1084c4: 00403825 */ move $a3,$v0 /* f1084c8: 100000a2 */ b .PF0f108754 /* f1084cc: 00000000 */ nop @@ -615,10 +615,10 @@ glabel cheatGetMarquee /* f1084d8: 000950c0 */ sll $t2,$t1,0x3 /* f1084dc: 014c1021 */ addu $v0,$t2,$t4 /* f1084e0: 94440000 */ lhu $a0,0x0($v0) -/* f1084e4: 0fc5bdaa */ jal 0xf16f6a8 +/* f1084e4: 0fc5bdaa */ jal langGet /* f1084e8: afa20040 */ sw $v0,0x40($sp) /* f1084ec: 27a40060 */ addiu $a0,$sp,0x60 -/* f1084f0: 0c004bb0 */ jal 0x12ec0 +/* f1084f0: 0c004bb0 */ jal strcpy /* f1084f4: 00402825 */ move $a1,$v0 /* f1084f8: 93ad0060 */ lbu $t5,0x60($sp) /* f1084fc: 2406000a */ li $a2,0xa @@ -636,7 +636,7 @@ glabel cheatGetMarquee /* f108524: 316f0004 */ andi $t7,$t3,0x4 /* f108528: 51e00029 */ beqzl $t7,.PF0f1085d0 /* f10852c: 90440005 */ lbu $a0,0x5($v0) -/* f108530: 0fc5bdaa */ jal 0xf16f6a8 +/* f108530: 0fc5bdaa */ jal langGet /* f108534: 2404548a */ li $a0,0x548a /* f108538: 8fb80040 */ lw $t8,0x40($sp) /* f10853c: afa2004c */ sw $v0,0x4c($sp) @@ -646,7 +646,7 @@ glabel cheatGetMarquee /* f10854c: 01394823 */ subu $t1,$t1,$t9 /* f108550: 00094880 */ sll $t1,$t1,0x2 /* f108554: 00892021 */ addu $a0,$a0,$t1 -/* f108558: 0fc5bdaa */ jal 0xf16f6a8 +/* f108558: 0fc5bdaa */ jal langGet /* f10855c: 94842162 */ lhu $a0,0x2162($a0) /* f108560: 8faa0040 */ lw $t2,0x40($sp) /* f108564: afa20050 */ sw $v0,0x50($sp) @@ -656,10 +656,10 @@ glabel cheatGetMarquee /* f108574: 01ac6823 */ subu $t5,$t5,$t4 /* f108578: 000d6880 */ sll $t5,$t5,0x2 /* f10857c: 008d2021 */ addu $a0,$a0,$t5 -/* f108580: 0fc5bdaa */ jal 0xf16f6a8 +/* f108580: 0fc5bdaa */ jal langGet /* f108584: 94842164 */ lhu $a0,0x2164($a0) /* f108588: afa20054 */ sw $v0,0x54($sp) -/* f10858c: 0fc5bdaa */ jal 0xf16f6a8 +/* f10858c: 0fc5bdaa */ jal langGet /* f108590: 2404548b */ li $a0,0x548b /* f108594: 8fae0054 */ lw $t6,0x54($sp) /* f108598: 3c04800a */ lui $a0,0x800a @@ -671,16 +671,16 @@ glabel cheatGetMarquee /* f1085b0: 8fa6004c */ lw $a2,0x4c($sp) /* f1085b4: 8fa70050 */ lw $a3,0x50($sp) /* f1085b8: afa20014 */ sw $v0,0x14($sp) -/* f1085bc: 0c004d11 */ jal 0x13444 +/* f1085bc: 0c004d11 */ jal sprintf /* f1085c0: afae0010 */ sw $t6,0x10($sp) /* f1085c4: 10000054 */ b .PF0f108718 /* f1085c8: 8fae0040 */ lw $t6,0x40($sp) /* f1085cc: 90440005 */ lbu $a0,0x5($v0) .PF0f1085d0: -/* f1085d0: 0fc5bdaa */ jal 0xf16f6a8 +/* f1085d0: 0fc5bdaa */ jal langGet /* f1085d4: 248456fb */ addiu $a0,$a0,0x56fb /* f1085d8: 27a40160 */ addiu $a0,$sp,0x160 -/* f1085dc: 0c004bb0 */ jal 0x12ec0 +/* f1085dc: 0c004bb0 */ jal strcpy /* f1085e0: 00402825 */ move $a1,$v0 /* f1085e4: 93af0160 */ lbu $t7,0x160($sp) /* f1085e8: 2406000a */ li $a2,0xa @@ -693,7 +693,7 @@ glabel cheatGetMarquee /* f108600: 54d8fffe */ bnel $a2,$t8,.PF0f1085fc /* f108604: 90780001 */ lbu $t8,0x1($v1) .PF0f108608: -/* f108608: 0fc5bdaa */ jal 0xf16f6a8 +/* f108608: 0fc5bdaa */ jal langGet /* f10860c: a0600000 */ sb $zero,0x0($v1) /* f108610: 8fb90040 */ lw $t9,0x40($sp) /* f108614: afa20044 */ sw $v0,0x44($sp) @@ -703,7 +703,7 @@ glabel cheatGetMarquee /* f108624: 01495023 */ subu $t2,$t2,$t1 /* f108628: 000a5080 */ sll $t2,$t2,0x2 /* f10862c: 008a2021 */ addu $a0,$a0,$t2 -/* f108630: 0fc5bdaa */ jal 0xf16f6a8 +/* f108630: 0fc5bdaa */ jal langGet /* f108634: 94842162 */ lhu $a0,0x2162($a0) /* f108638: 8fac0040 */ lw $t4,0x40($sp) /* f10863c: afa20048 */ sw $v0,0x48($sp) @@ -713,16 +713,16 @@ glabel cheatGetMarquee /* f10864c: 01cd7023 */ subu $t6,$t6,$t5 /* f108650: 000e7080 */ sll $t6,$t6,0x2 /* f108654: 008e2021 */ addu $a0,$a0,$t6 -/* f108658: 0fc5bdaa */ jal 0xf16f6a8 +/* f108658: 0fc5bdaa */ jal langGet /* f10865c: 94842164 */ lhu $a0,0x2164($a0) /* f108660: afa2004c */ sw $v0,0x4c($sp) -/* f108664: 0fc5bdaa */ jal 0xf16f6a8 +/* f108664: 0fc5bdaa */ jal langGet /* f108668: 2404548c */ li $a0,0x548c /* f10866c: afa20050 */ sw $v0,0x50($sp) -/* f108670: 0fc5bdaa */ jal 0xf16f6a8 +/* f108670: 0fc5bdaa */ jal langGet /* f108674: 2404548d */ li $a0,0x548d /* f108678: afa20054 */ sw $v0,0x54($sp) -/* f10867c: 0fc5bdaa */ jal 0xf16f6a8 +/* f10867c: 0fc5bdaa */ jal langGet /* f108680: 2404548b */ li $a0,0x548b /* f108684: 8fab004c */ lw $t3,0x4c($sp) /* f108688: 8faf0050 */ lw $t7,0x50($sp) @@ -760,7 +760,7 @@ glabel cheatGetMarquee /* f108704: 00000000 */ nop /* f108708: 0006000d */ break 0x6 .PF0f10870c: -/* f10870c: 0c004d11 */ jal 0x13444 +/* f10870c: 0c004d11 */ jal sprintf /* f108710: 00000000 */ nop /* f108714: 8fae0040 */ lw $t6,0x40($sp) .PF0f108718: @@ -768,21 +768,21 @@ glabel cheatGetMarquee /* f10871c: 316f0002 */ andi $t7,$t3,0x2 /* f108720: 11e00007 */ beqz $t7,.PF0f108740 /* f108724: 00000000 */ nop -/* f108728: 0fc5bdaa */ jal 0xf16f6a8 +/* f108728: 0fc5bdaa */ jal langGet /* f10872c: 2404548e */ li $a0,0x548e /* f108730: 3c04800a */ lui $a0,0x800a /* f108734: 2484e430 */ addiu $a0,$a0,-7120 -/* f108738: 0c004bed */ jal 0x12fb4 +/* f108738: 0c004bed */ jal strcat /* f10873c: 00402825 */ move $a1,$v0 .PF0f108740: /* f108740: 3c04800a */ lui $a0,0x800a /* f108744: 3c057f1b */ lui $a1,0x7f1b /* f108748: 24a541e4 */ addiu $a1,$a1,0x41e4 -/* f10874c: 0c004bed */ jal 0x12fb4 +/* f10874c: 0c004bed */ jal strcat /* f108750: 2484e430 */ addiu $a0,$a0,-7120 .PF0f108754: /* f108754: 3c04800a */ lui $a0,0x800a -/* f108758: 0c0127c3 */ jal 0x49f0c +/* f108758: 0c0127c3 */ jal strlen /* f10875c: 2484e430 */ addiu $a0,$a0,-7120 /* f108760: 3c188007 */ lui $t8,0x8007 /* f108764: 8f18402c */ lw $t8,0x402c($t8) @@ -801,7 +801,7 @@ glabel cheatGetMarquee /* f108794: 10000003 */ b .PF0f1087a4 /* f108798: 2442e430 */ addiu $v0,$v0,-7120 .PF0f10879c: -/* f10879c: 0fc5bdaa */ jal 0xf16f6a8 +/* f10879c: 0fc5bdaa */ jal langGet /* f1087a0: 2404548f */ li $a0,0x548f .PF0f1087a4: /* f1087a4: 8fbf0034 */ lw $ra,0x34($sp) diff --git a/src/game/chr/chr.c b/src/game/chr/chr.c index ecc187f9f..1997a62ed 100644 --- a/src/game/chr/chr.c +++ b/src/game/chr/chr.c @@ -1124,14 +1124,14 @@ glabel var7f1a992cpf /* f01f55c: 27a700fc */ addiu $a3,$sp,0xfc /* f01f560: 25450028 */ addiu $a1,$t2,0x28 /* f01f564: afa50048 */ sw $a1,0x48($sp) -/* f01f568: 0fc1984a */ jal 0xf066128 +/* f01f568: 0fc1984a */ jal func0f065e98 /* f01f56c: 25440008 */ addiu $a0,$t2,0x8 /* f01f570: 10000006 */ b .PF0f01f58c /* f01f574: 8e050024 */ lw $a1,0x24($s0) .PF0f01f578: /* f01f578: 25650028 */ addiu $a1,$t3,0x28 /* f01f57c: afa50048 */ sw $a1,0x48($sp) -/* f01f580: 0fc19841 */ jal 0xf066104 +/* f01f580: 0fc19841 */ jal func0f065e74 /* f01f584: 27a700fc */ addiu $a3,$sp,0xfc /* f01f588: 8e050024 */ lw $a1,0x24($s0) .PF0f01f58c: @@ -1147,7 +1147,7 @@ glabel var7f1a992cpf /* f01f5b0: afb90010 */ sw $t9,0x10($sp) /* f01f5b4: 02202025 */ move $a0,$s1 /* f01f5b8: 27a600fc */ addiu $a2,$sp,0xfc -/* f01f5bc: 0c00a6ac */ jal 0x29ab0 +/* f01f5bc: 0c00a6ac */ jal cdFindGroundY /* f01f5c0: 2607018a */ addiu $a3,$s0,0x18a /* f01f5c4: 3c017f1b */ lui $at,0x7f1b /* f01f5c8: c42898dc */ lwc1 $f8,-0x6724($at) @@ -1231,7 +1231,7 @@ glabel var7f1a992cpf .PF0f01f6f0: /* f01f6f0: 8fa700dc */ lw $a3,0xdc($sp) .PF0f01f6f4: -/* f01f6f4: 0fc64cac */ jal 0xf1932b0 +/* f01f6f4: 0fc64cac */ jal func0f1921f8 /* f01f6f8: e7ac00e0 */ swc1 $f12,0xe0($sp) /* f01f6fc: 3c08800a */ lui $t0,0x800a /* f01f700: 44808000 */ mtc1 $zero,$f16 @@ -1280,7 +1280,7 @@ glabel var7f1a992cpf /* f01f7a0: afad0014 */ sw $t5,0x14($sp) /* f01f7a4: 24440008 */ addiu $a0,$v0,0x8 /* f01f7a8: 44073000 */ mfc1 $a3,$f6 -/* f01f7ac: 0c00a63f */ jal 0x298fc +/* f01f7ac: 0c00a63f */ jal func00029ffc /* f01f7b0: 00000000 */ nop /* f01f7b4: 3c08800a */ lui $t0,0x800a /* f01f7b8: c7ac00e0 */ lwc1 $f12,0xe0($sp) @@ -1344,7 +1344,7 @@ glabel var7f1a992cpf /* f01f890: 44065000 */ mfc1 $a2,$f10 /* f01f894: 24440008 */ addiu $a0,$v0,0x8 /* f01f898: 44073000 */ mfc1 $a3,$f6 -/* f01f89c: 0c00a68f */ jal 0x29a3c +/* f01f89c: 0c00a68f */ jal func0002a13c /* f01f8a0: 00000000 */ nop /* f01f8a4: 10400005 */ beqz $v0,.PF0f01f8bc /* f01f8a8: c7ac00e0 */ lwc1 $f12,0xe0($sp) @@ -1377,7 +1377,7 @@ glabel var7f1a992cpf /* f01f910: 44065000 */ mfc1 $a2,$f10 /* f01f914: 24440008 */ addiu $a0,$v0,0x8 /* f01f918: 44073000 */ mfc1 $a3,$f6 -/* f01f91c: 0c00a68f */ jal 0x29a3c +/* f01f91c: 0c00a68f */ jal func0002a13c /* f01f920: 00000000 */ nop /* f01f924: 10400005 */ beqz $v0,.PF0f01f93c /* f01f928: c7ac00e0 */ lwc1 $f12,0xe0($sp) @@ -1388,7 +1388,7 @@ glabel var7f1a992cpf .PF0f01f93c: /* f01f93c: 8e0402d4 */ lw $a0,0x2d4($s0) /* f01f940: e7ac00e0 */ swc1 $f12,0xe0($sp) -/* f01f944: 0fc32fa5 */ jal 0xf0cbe94 +/* f01f944: 0fc32fa5 */ jal bmove0f0cb904 /* f01f948: 24840108 */ addiu $a0,$a0,0x108 /* f01f94c: 8e0f02d4 */ lw $t7,0x2d4($s0) /* f01f950: 3c028007 */ lui $v0,0x8007 @@ -1557,7 +1557,7 @@ glabel var7f1a992cpf /* f01fbc4: 46021182 */ mul.s $f6,$f2,$f2 /* f01fbc8: 00000000 */ nop /* f01fbcc: 46000202 */ mul.s $f8,$f0,$f0 -/* f01fbd0: 0c0127b4 */ jal 0x49ed0 +/* f01fbd0: 0c0127b4 */ jal sqrtf /* f01fbd4: 46083300 */ add.s $f12,$f6,$f8 /* f01fbd8: 44808000 */ mtc1 $zero,$f16 /* f01fbdc: 3c08800a */ lui $t0,0x800a @@ -1611,7 +1611,7 @@ glabel var7f1a992cpf /* f01fc8c: 8faa00f4 */ lw $t2,0xf4($sp) /* f01fc90: 55410013 */ bnel $t2,$at,.PF0f01fce0 /* f01fc94: 820d0007 */ lb $t5,0x7($s0) -/* f01fc98: 0fc0f072 */ jal 0xf03c1c8 +/* f01fc98: 0fc0f072 */ jal chrToEyespy /* f01fc9c: 02002025 */ move $a0,$s0 /* f01fca0: 50400043 */ beqzl $v0,.PF0f01fdb0 /* f01fca4: 8fac0118 */ lw $t4,0x118($sp) @@ -1667,7 +1667,7 @@ glabel var7f1a992cpf /* f01fd64: c5720008 */ lwc1 $f18,0x8($t3) /* f01fd68: 460e7202 */ mul.s $f8,$f14,$f14 /* f01fd6c: e6320008 */ swc1 $f18,0x8($s1) -/* f01fd70: 0c0127b4 */ jal 0x49ed0 +/* f01fd70: 0c0127b4 */ jal sqrtf /* f01fd74: 46083300 */ add.s $f12,$f6,$f8 /* f01fd78: 3c0142c8 */ lui $at,0x42c8 /* f01fd7c: 44816000 */ mtc1 $at,$f12 @@ -1705,7 +1705,7 @@ glabel var7f1a992cpf /* f01fdf0: e6260008 */ swc1 $f6,0x8($s1) /* f01fdf4: 8fa40118 */ lw $a0,0x118($sp) /* f01fdf8: 24840028 */ addiu $a0,$a0,0x28 -/* f01fdfc: 0fc1968d */ jal 0xf065a34 +/* f01fdfc: 0fc1968d */ jal roomsCopy /* f01fe00: afa40048 */ sw $a0,0x48($sp) /* f01fe04: 3c08800a */ lui $t0,0x800a /* f01fe08: 2508a510 */ addiu $t0,$t0,-23280 @@ -1726,7 +1726,7 @@ glabel var7f1a992cpf /* f01fe40: c7240008 */ lwc1 $f4,0x8($t9) /* f01fe44: e6240008 */ swc1 $f4,0x8($s1) .PF0f01fe48: -/* f01fe48: 0fc07a45 */ jal 0xf01e914 +/* f01fe48: 0fc07a45 */ jal func0f01e7f4 /* f01fe4c: 24070001 */ li $a3,0x1 /* f01fe50: 8fad0118 */ lw $t5,0x118($sp) /* f01fe54: 3c08800a */ lui $t0,0x800a @@ -1753,7 +1753,7 @@ glabel var7f1a992cpf /* f01fea4: 27a600fc */ addiu $a2,$sp,0xfc /* f01fea8: 24090001 */ li $t1,0x1 /* f01feac: afa90010 */ sw $t1,0x10($sp) -/* f01feb0: 0fc07ce1 */ jal 0xf01f384 +/* f01feb0: 0fc07ce1 */ jal func0f01f264 /* f01feb4: 8fa700f0 */ lw $a3,0xf0($sp) /* f01feb8: 10400005 */ beqz $v0,.PF0f01fed0 /* f01febc: 3c017f1b */ lui $at,0x7f1b @@ -1782,7 +1782,7 @@ glabel var7f1a992cpf /* f01ff0c: afb90010 */ sw $t9,0x10($sp) /* f01ff10: 02202825 */ move $a1,$s1 /* f01ff14: 27a600fc */ addiu $a2,$sp,0xfc -/* f01ff18: 0fc07ce1 */ jal 0xf01f384 +/* f01ff18: 0fc07ce1 */ jal func0f01f264 /* f01ff1c: 8fa700f0 */ lw $a3,0xf0($sp) /* f01ff20: 10400005 */ beqz $v0,.PF0f01ff38 /* f01ff24: 3c017f1b */ lui $at,0x7f1b @@ -1811,7 +1811,7 @@ glabel var7f1a992cpf /* f01ff74: c7aa00f8 */ lwc1 $f10,0xf8($sp) /* f01ff78: 55810010 */ bnel $t4,$at,.PF0f01ffbc /* f01ff7c: c6240004 */ lwc1 $f4,0x4($s1) -/* f01ff80: 0fc4a513 */ jal 0xf12944c +/* f01ff80: 0fc4a513 */ jal propGetPlayerNum /* f01ff84: 01c02025 */ move $a0,$t6 /* f01ff88: 3c08800a */ lui $t0,0x800a /* f01ff8c: 2508a510 */ addiu $t0,$t0,-23280 @@ -1846,11 +1846,11 @@ glabel var7f1a992cpf /* f01fffc: e7a60088 */ swc1 $f6,0x88($sp) /* f020000: c6240008 */ lwc1 $f4,0x8($s1) /* f020004: 27a500fc */ addiu $a1,$sp,0xfc -/* f020008: 0fc19841 */ jal 0xf066104 +/* f020008: 0fc19841 */ jal func0f065e74 /* f02000c: e7a40090 */ swc1 $f4,0x90($sp) /* f020010: 02002025 */ move $a0,$s0 /* f020014: 27a50088 */ addiu $a1,$sp,0x88 -/* f020018: 0fc08839 */ jal 0xf0220e4 +/* f020018: 0fc08839 */ jal func0f021fa8 /* f02001c: 27a60078 */ addiu $a2,$sp,0x78 /* f020020: 10000004 */ b .PF0f020034 /* f020024: 8e050024 */ lw $a1,0x24($s0) @@ -1874,7 +1874,7 @@ glabel var7f1a992cpf /* f020064: afa20044 */ sw $v0,0x44($sp) /* f020068: afa7004c */ sw $a3,0x4c($sp) /* f02006c: 8fa40098 */ lw $a0,0x98($sp) -/* f020070: 0c00a6ac */ jal 0x29ab0 +/* f020070: 0c00a6ac */ jal cdFindGroundY /* f020074: 8fa60094 */ lw $a2,0x94($sp) /* f020078: 8e0202d4 */ lw $v0,0x2d4($s0) /* f02007c: 3c08800a */ lui $t0,0x800a @@ -1912,7 +1912,7 @@ glabel var7f1a992cpf /* f0200fc: 8fac0118 */ lw $t4,0x118($sp) /* f020100: c58a0010 */ lwc1 $f10,0x10($t4) /* f020104: e62a0008 */ swc1 $f10,0x8($s1) -/* f020108: 0fc1968d */ jal 0xf065a34 +/* f020108: 0fc1968d */ jal roomsCopy /* f02010c: 8fa40048 */ lw $a0,0x48($sp) /* f020110: 44808000 */ mtc1 $zero,$f16 /* f020114: 8fae0044 */ lw $t6,0x44($sp) @@ -1929,7 +1929,7 @@ glabel var7f1a992cpf /* f020140: 27a600fc */ addiu $a2,$sp,0xfc /* f020144: 8fa7004c */ lw $a3,0x4c($sp) /* f020148: afae0010 */ sw $t6,0x10($sp) -/* f02014c: 0c00a6ac */ jal 0x29ab0 +/* f02014c: 0c00a6ac */ jal cdFindGroundY /* f020150: afb80018 */ sw $t8,0x18($sp) /* f020154: 3c08800a */ lui $t0,0x800a /* f020158: 44808000 */ mtc1 $zero,$f16 @@ -1991,7 +1991,7 @@ glabel var7f1a992cpf /* f020220: 46121182 */ mul.s $f6,$f2,$f18 /* f020224: 15a10005 */ bne $t5,$at,.PF0f02023c /* f020228: e60600b0 */ swc1 $f6,0xb0($s0) -/* f02022c: 0c0069eb */ jal 0x1a7ac +/* f02022c: 0c0069eb */ jal modelGetNodeData /* f020230: 8fa40120 */ lw $a0,0x120($sp) /* f020234: c4480028 */ lwc1 $f8,0x28($v0) /* f020238: e4480038 */ swc1 $f8,0x38($v0) @@ -2029,13 +2029,13 @@ glabel var7f1a992cpf /* f0202a8: e7ac0068 */ swc1 $f12,0x68($sp) .PF0f0202ac: /* f0202ac: 8fa600dc */ lw $a2,0xdc($sp) -/* f0202b0: 0fc25941 */ jal 0xf096504 +/* f0202b0: 0fc25941 */ jal func0f0965e4 /* f0202b4: a3a30067 */ sb $v1,0x67($sp) /* f0202b8: 02002025 */ move $a0,$s0 /* f0202bc: 02202825 */ move $a1,$s1 /* f0202c0: 27a600fc */ addiu $a2,$sp,0xfc /* f0202c4: 8fa700f0 */ lw $a3,0xf0($sp) -/* f0202c8: 0fc07ce1 */ jal 0xf01f384 +/* f0202c8: 0fc07ce1 */ jal func0f01f264 /* f0202cc: afa00010 */ sw $zero,0x10($sp) /* f0202d0: 44808000 */ mtc1 $zero,$f16 /* f0202d4: 10400007 */ beqz $v0,.PF0f0202f4 @@ -2079,11 +2079,11 @@ glabel var7f1a992cpf /* f020364: 10000004 */ b .PF0f020378 /* f020368: 00402825 */ move $a1,$v0 .PF0f02036c: -/* f02036c: 0fc63831 */ jal 0xf18e0c4 +/* f02036c: 0fc63831 */ jal mpPlayerGetIndex /* f020370: 02002025 */ move $a0,$s0 /* f020374: 00402825 */ move $a1,$v0 .PF0f020378: -/* f020378: 0fc0d930 */ jal 0xf0364c0 +/* f020378: 0fc0d930 */ jal chrDie /* f02037c: 02002025 */ move $a0,$s0 /* f020380: 10000049 */ b .PF0f0204a8 /* f020384: c60000b4 */ lwc1 $f0,0xb4($s0) @@ -2178,7 +2178,7 @@ glabel var7f1a992cpf /* f0204cc: c62a0004 */ lwc1 $f10,0x4($s1) /* f0204d0: e7aa00d4 */ swc1 $f10,0xd4($sp) /* f0204d4: c6240008 */ lwc1 $f4,0x8($s1) -/* f0204d8: 0fc1968d */ jal 0xf065a34 +/* f0204d8: 0fc1968d */ jal roomsCopy /* f0204dc: e7a400d8 */ swc1 $f4,0xd8($sp) /* f0204e0: c61200b4 */ lwc1 $f18,0xb4($s0) /* f0204e4: c7a600f8 */ lwc1 $f6,0xf8($sp) @@ -2189,11 +2189,11 @@ glabel var7f1a992cpf /* f0204f8: 02203025 */ move $a2,$s1 /* f0204fc: 27a700fc */ addiu $a3,$sp,0xfc /* f020500: 46085100 */ add.s $f4,$f10,$f8 -/* f020504: 0fc19841 */ jal 0xf066104 +/* f020504: 0fc19841 */ jal func0f065e74 /* f020508: e6240004 */ swc1 $f4,0x4($s1) /* f02050c: 02002025 */ move $a0,$s0 /* f020510: 02202825 */ move $a1,$s1 -/* f020514: 0fc08839 */ jal 0xf0220e4 +/* f020514: 0fc08839 */ jal func0f021fa8 /* f020518: 27a600fc */ addiu $a2,$sp,0xfc /* f02051c: c60000b4 */ lwc1 $f0,0xb4($s0) .PF0f020520: @@ -2230,10 +2230,10 @@ glabel var7f1a992cpf /* f020590: 8fa9012c */ lw $t1,0x12c($sp) /* f020594: e5200000 */ swc1 $f0,0x0($t1) .PF0f020598: -/* f020598: 0fc197b5 */ jal 0xf065ed4 +/* f020598: 0fc197b5 */ jal func0f065c44 /* f02059c: 00000000 */ nop /* f0205a0: 27a400fc */ addiu $a0,$sp,0xfc -/* f0205a4: 0fc1968d */ jal 0xf065a34 +/* f0205a4: 0fc1968d */ jal roomsCopy /* f0205a8: 8fa50048 */ lw $a1,0x48($sp) /* f0205ac: 8fa60118 */ lw $a2,0x118($sp) /* f0205b0: 24010003 */ li $at,0x3 @@ -2250,7 +2250,7 @@ glabel var7f1a992cpf .PF0f0205dc: /* f0205dc: 5483000a */ bnel $a0,$v1,.PF0f020608 /* f0205e0: 8443002a */ lh $v1,0x2a($v0) -/* f0205e4: 0fc197b5 */ jal 0xf065ed4 +/* f0205e4: 0fc197b5 */ jal func0f065c44 /* f0205e8: 00c02025 */ move $a0,$a2 /* f0205ec: 8fac0118 */ lw $t4,0x118($sp) /* f0205f0: 860d02b2 */ lh $t5,0x2b2($s0) @@ -2264,11 +2264,11 @@ glabel var7f1a992cpf /* f02060c: 14a3fff3 */ bne $a1,$v1,.PF0f0205dc /* f020610: 00000000 */ nop .PF0f020614: -/* f020614: 0fc0887a */ jal 0xf0221e8 +/* f020614: 0fc0887a */ jal func0f0220ac /* f020618: 02002025 */ move $a0,$s0 /* f02061c: 8fa40118 */ lw $a0,0x118($sp) /* f020620: 260500fc */ addiu $a1,$s0,0xfc -/* f020624: 0fc1a4f3 */ jal 0xf0693cc +/* f020624: 0fc1a4f3 */ jal func0f069144 /* f020628: 9606018a */ lhu $a2,0x18a($s0) /* f02062c: 8fbf0034 */ lw $ra,0x34($sp) /* f020630: 8fb0002c */ lw $s0,0x2c($sp) @@ -6399,7 +6399,7 @@ glabel var7f1a99ecpf /* f023330: c42699d0 */ lwc1 $f6,-0x6630($at) /* f023334: 46124103 */ div.s $f4,$f8,$f18 /* f023338: 46062302 */ mul.s $f12,$f4,$f6 -/* f02333c: 0c006858 */ jal 0x1a160 +/* f02333c: 0c006858 */ jal cosf /* f023340: 00000000 */ nop /* f023344: 3c0141a0 */ lui $at,0x41a0 /* f023348: 44815000 */ mtc1 $at,$f10 @@ -6460,9 +6460,9 @@ glabel var7f1a99ecpf /* f02341c: 00000000 */ nop /* f023420: e60402dc */ swc1 $f4,0x2dc($s0) .PF0f023424: -/* f023424: 0fc089d8 */ jal 0xf022760 +/* f023424: 0fc089d8 */ jal chrUpdateCloak /* f023428: 02002025 */ move $a0,$s0 -/* f02342c: 0fc08ba7 */ jal 0xf022e9c +/* f02342c: 0fc08ba7 */ jal chrTickPoisoned /* f023430: 02002025 */ move $a0,$s0 /* f023434: 8e020018 */ lw $v0,0x18($s0) /* f023438: 3c0c8006 */ lui $t4,0x8006 @@ -6476,21 +6476,21 @@ glabel var7f1a99ecpf /* f023454: 3c048006 */ lui $a0,0x8006 /* f023458: 11800022 */ beqz $t4,.PF0f0234e4 /* f02345c: 00000000 */ nop -/* f023460: 0c008c25 */ jal 0x23094 +/* f023460: 0c008c25 */ jal func00023794 /* f023464: 84842652 */ lh $a0,0x2652($a0) /* f023468: 10400025 */ beqz $v0,.PF0f023500 /* f02346c: 00000000 */ nop -/* f023470: 0c0073c3 */ jal 0x1cf0c +/* f023470: 0c0073c3 */ jal modelGetAnimNum /* f023474: 8fa40208 */ lw $a0,0x208($sp) /* f023478: 3c038006 */ lui $v1,0x8006 /* f02347c: 8c632650 */ lw $v1,0x2650($v1) /* f023480: 5443000b */ bnel $v0,$v1,.PF0f0234b0 /* f023484: 44800000 */ mtc1 $zero,$f0 -/* f023488: 0c0073c3 */ jal 0x1cf0c +/* f023488: 0c0073c3 */ jal modelGetAnimNum /* f02348c: 8fa40208 */ lw $a0,0x208($sp) /* f023490: 00022400 */ sll $a0,$v0,0x10 /* f023494: 00046c03 */ sra $t5,$a0,0x10 -/* f023498: 0c008c25 */ jal 0x23094 +/* f023498: 0c008c25 */ jal func00023794 /* f02349c: 01a02025 */ move $a0,$t5 /* f0234a0: 14400017 */ bnez $v0,.PF0f023500 /* f0234a4: 3c038006 */ lui $v1,0x8006 @@ -6506,12 +6506,12 @@ glabel var7f1a99ecpf /* f0234c8: 8fa40208 */ lw $a0,0x208($sp) /* f0234cc: 00003025 */ move $a2,$zero /* f0234d0: e7a00014 */ swc1 $f0,0x14($sp) -/* f0234d4: 0c0076a7 */ jal 0x1da9c +/* f0234d4: 0c0076a7 */ jal modelSetAnimation /* f0234d8: e7a60010 */ swc1 $f6,0x10($sp) /* f0234dc: 10000008 */ b .PF0f023500 /* f0234e0: 00000000 */ nop .PF0f0234e4: -/* f0234e4: 0fc11f8d */ jal 0xf047e34 +/* f0234e4: 0fc11f8d */ jal chrTick /* f0234e8: 02002025 */ move $a0,$s0 /* f0234ec: 8e0f0020 */ lw $t7,0x20($s0) /* f0234f0: 15e00003 */ bnez $t7,.PF0f023500 @@ -6537,11 +6537,11 @@ glabel var7f1a99ecpf /* f023538: 304a0001 */ andi $t2,$v0,0x1 /* f02353c: 11400003 */ beqz $t2,.PF0f02354c /* f023540: 8fa40250 */ lw $a0,0x250($sp) -/* f023544: 0fc1c248 */ jal 0xf070920 +/* f023544: 0fc1c248 */ jal func0f070698 /* f023548: 24050001 */ li $a1,0x1 .PF0f02354c: /* f02354c: 8fa40250 */ lw $a0,0x250($sp) -/* f023550: 0fc08399 */ jal 0xf020e64 +/* f023550: 0fc08399 */ jal func0f020d44 /* f023554: 24050001 */ li $a1,0x1 /* f023558: 10000436 */ b .PF0f024634 /* f02355c: 24020001 */ li $v0,0x1 @@ -6551,7 +6551,7 @@ glabel var7f1a99ecpf /* f023564: 24010003 */ li $at,0x3 /* f023568: 55610026 */ bnel $t3,$at,.PF0f023604 /* f02356c: 8e020018 */ lw $v0,0x18($s0) -/* f023570: 0fc0f072 */ jal 0xf03c1c8 +/* f023570: 0fc0f072 */ jal chrToEyespy /* f023574: 02002025 */ move $a0,$s0 /* f023578: 1040001f */ beqz $v0,.PF0f0235f8 /* f02357c: 00000000 */ nop @@ -6569,12 +6569,12 @@ glabel var7f1a99ecpf /* f0235ac: 10000009 */ b .PF0f0235d4 /* f0235b0: 00003825 */ move $a3,$zero .PF0f0235b4: -/* f0235b4: 0c006b44 */ jal 0x1ad10 +/* f0235b4: 0c006b44 */ jal func0001af80 /* f0235b8: 8fa40208 */ lw $a0,0x208($sp) /* f0235bc: 8fa40250 */ lw $a0,0x250($sp) /* f0235c0: 44060000 */ mfc1 $a2,$f0 /* f0235c4: 24070001 */ li $a3,0x1 -/* f0235c8: 0fc239f6 */ jal 0xf08e7d8 +/* f0235c8: 0fc239f6 */ jal func0f08e8ac /* f0235cc: 24850008 */ addiu $a1,$a0,0x8 /* f0235d0: 00403825 */ move $a3,$v0 .PF0f0235d4: @@ -6583,7 +6583,7 @@ glabel var7f1a99ecpf /* f0235dc: 8fa501fc */ lw $a1,0x1fc($sp) /* f0235e0: 132001c9 */ beqz $t9,.PF0f023d08 /* f0235e4: 24060001 */ li $a2,0x1 -/* f0235e8: 0fc0888a */ jal 0xf022228 +/* f0235e8: 0fc0888a */ jal func0f0220ec /* f0235ec: afa70204 */ sw $a3,0x204($sp) /* f0235f0: 100001c5 */ b .PF0f023d08 /* f0235f4: 8fa70204 */ lw $a3,0x204($sp) @@ -6604,7 +6604,7 @@ glabel var7f1a99ecpf /* f023624: 24010006 */ li $at,0x6 /* f023628: 55610068 */ bnel $t3,$at,.PF0f0237cc /* f02362c: 82030007 */ lb $v1,0x7($s0) -/* f023630: 0fc4a513 */ jal 0xf12944c +/* f023630: 0fc4a513 */ jal propGetPlayerNum /* f023634: 01402025 */ move $a0,$t2 /* f023638: 00026080 */ sll $t4,$v0,0x2 /* f02363c: 3c03800a */ lui $v1,0x800a @@ -6646,12 +6646,12 @@ glabel var7f1a99ecpf /* f0236c8: 02002025 */ move $a0,$s0 /* f0236cc: 8fa501fc */ lw $a1,0x1fc($sp) /* f0236d0: 00003025 */ move $a2,$zero -/* f0236d4: 0fc0888a */ jal 0xf022228 +/* f0236d4: 0fc0888a */ jal func0f0220ec /* f0236d8: afa001a0 */ sw $zero,0x1a0($sp) /* f0236dc: 10000004 */ b .PF0f0236f0 /* f0236e0: 8fa701a0 */ lw $a3,0x1a0($sp) .PF0f0236e4: -/* f0236e4: 0fc0888a */ jal 0xf022228 +/* f0236e4: 0fc0888a */ jal func0f0220ec /* f0236e8: afa701a0 */ sw $a3,0x1a0($sp) /* f0236ec: 8fa701a0 */ lw $a3,0x1a0($sp) .PF0f0236f0: @@ -6673,12 +6673,12 @@ glabel var7f1a99ecpf /* f023728: 31e80004 */ andi $t0,$t7,0x4 /* f02372c: 1100001e */ beqz $t0,.PF0f0237a8 /* f023730: 00000000 */ nop -/* f023734: 0c008d8e */ jal 0x23638 +/* f023734: 0c008d8e */ jal func00023d38 /* f023738: 00000000 */ nop /* f02373c: 8e190020 */ lw $t9,0x20($s0) /* f023740: 8f220020 */ lw $v0,0x20($t9) /* f023744: 84440000 */ lh $a0,0x0($v0) -/* f023748: 0c008c53 */ jal 0x2314c +/* f023748: 0c008c53 */ jal func0002384c /* f02374c: 84450014 */ lh $a1,0x14($v0) /* f023750: 28440000 */ slti $a0,$v0,0x0 /* f023754: 54800014 */ bnezl $a0,.PF0f0237a8 @@ -6686,7 +6686,7 @@ glabel var7f1a99ecpf /* f02375c: 8e0e0020 */ lw $t6,0x20($s0) /* f023760: 8dc20020 */ lw $v0,0x20($t6) /* f023764: 84440000 */ lh $a0,0x0($v0) -/* f023768: 0c008c53 */ jal 0x2314c +/* f023768: 0c008c53 */ jal func0002384c /* f02376c: 84450016 */ lh $a1,0x16($v0) /* f023770: 28440000 */ slti $a0,$v0,0x0 /* f023774: 5080000c */ beqzl $a0,.PF0f0237a8 @@ -6708,7 +6708,7 @@ glabel var7f1a99ecpf /* f0237b0: 10000155 */ b .PF0f023d08 /* f0237b4: 00003825 */ move $a3,$zero .PF0f0237b8: -/* f0237b8: 0fc23a44 */ jal 0xf08e910 +/* f0237b8: 0fc23a44 */ jal posIsInDrawDistance /* f0237bc: 24840008 */ addiu $a0,$a0,0x8 /* f0237c0: 10000151 */ b .PF0f023d08 /* f0237c4: 00403825 */ move $a3,$v0 @@ -6734,12 +6734,12 @@ glabel var7f1a99ecpf /* f023808: 15810014 */ bne $t4,$at,.PF0f02385c /* f02380c: 00000000 */ nop .PF0f023810: -/* f023810: 0c006b44 */ jal 0x1ad10 +/* f023810: 0c006b44 */ jal func0001af80 /* f023814: 8fa40208 */ lw $a0,0x208($sp) /* f023818: 8fa40250 */ lw $a0,0x250($sp) /* f02381c: 44060000 */ mfc1 $a2,$f0 /* f023820: 24070001 */ li $a3,0x1 -/* f023824: 0fc239f6 */ jal 0xf08e7d8 +/* f023824: 0fc239f6 */ jal func0f08e8ac /* f023828: 24850008 */ addiu $a1,$a0,0x8 /* f02382c: 10400136 */ beqz $v0,.PF0f023d08 /* f023830: 00403825 */ move $a3,$v0 @@ -6747,9 +6747,9 @@ glabel var7f1a99ecpf /* f023838: 260500c8 */ addiu $a1,$s0,0xc8 /* f02383c: 8c8f0020 */ lw $t7,0x20($a0) /* f023840: a1e0000b */ sb $zero,0xb($t7) -/* f023844: 0c006aa7 */ jal 0x1aa9c +/* f023844: 0c006aa7 */ jal modelGetRootPosition /* f023848: afa20204 */ sw $v0,0x204($sp) -/* f02384c: 0c006c56 */ jal 0x1b158 +/* f02384c: 0c006c56 */ jal func0001b3bc /* f023850: 8fa40208 */ lw $a0,0x208($sp) /* f023854: 1000012c */ b .PF0f023d08 /* f023858: 8fa70204 */ lw $a3,0x204($sp) @@ -6757,15 +6757,15 @@ glabel var7f1a99ecpf /* f02385c: 11000004 */ beqz $t0,.PF0f023870 /* f023860: 02002025 */ move $a0,$s0 /* f023864: 8fa501fc */ lw $a1,0x1fc($sp) -/* f023868: 0fc0888a */ jal 0xf022228 +/* f023868: 0fc0888a */ jal func0f0220ec /* f02386c: 24060001 */ li $a2,0x1 .PF0f023870: -/* f023870: 0c006b44 */ jal 0x1ad10 +/* f023870: 0c006b44 */ jal func0001af80 /* f023874: 8fa40208 */ lw $a0,0x208($sp) /* f023878: 8fa40250 */ lw $a0,0x250($sp) /* f02387c: 44060000 */ mfc1 $a2,$f0 /* f023880: 24070001 */ li $a3,0x1 -/* f023884: 0fc239f6 */ jal 0xf08e7d8 +/* f023884: 0fc239f6 */ jal func0f08e8ac /* f023888: 24850008 */ addiu $a1,$a0,0x8 /* f02388c: 1040000e */ beqz $v0,.PF0f0238c8 /* f023890: 00403825 */ move $a3,$v0 @@ -6803,12 +6803,12 @@ glabel var7f1a99ecpf /* f023900: 8e18002c */ lw $t8,0x2c($s0) /* f023904: 57000022 */ bnezl $t8,.PF0f023990 /* f023908: 24010001 */ li $at,0x1 -/* f02390c: 0c006b44 */ jal 0x1ad10 +/* f02390c: 0c006b44 */ jal func0001af80 /* f023910: 8fa40208 */ lw $a0,0x208($sp) /* f023914: 8fa40250 */ lw $a0,0x250($sp) /* f023918: 44060000 */ mfc1 $a2,$f0 /* f02391c: 24070001 */ li $a3,0x1 -/* f023920: 0fc239f6 */ jal 0xf08e7d8 +/* f023920: 0fc239f6 */ jal func0f08e8ac /* f023924: 24850008 */ addiu $a1,$a0,0x8 /* f023928: 8fb901f0 */ lw $t9,0x1f0($sp) /* f02392c: 00403825 */ move $a3,$v0 @@ -6825,7 +6825,7 @@ glabel var7f1a99ecpf /* f023958: 55600007 */ bnezl $t3,.PF0f023978 /* f02395c: 8fa501fc */ lw $a1,0x1fc($sp) /* f023960: 02002025 */ move $a0,$s0 -/* f023964: 0fc0888a */ jal 0xf022228 +/* f023964: 0fc0888a */ jal func0f0220ec /* f023968: afa20204 */ sw $v0,0x204($sp) /* f02396c: 100000e6 */ b .PF0f023d08 /* f023970: 8fa70204 */ lw $a3,0x204($sp) @@ -6833,7 +6833,7 @@ glabel var7f1a99ecpf /* f023974: 8fa501fc */ lw $a1,0x1fc($sp) .PF0f023978: /* f023978: 00003025 */ move $a2,$zero -/* f02397c: 0fc0888a */ jal 0xf022228 +/* f02397c: 0fc0888a */ jal func0f0220ec /* f023980: afa70204 */ sw $a3,0x204($sp) /* f023984: 100000e0 */ b .PF0f023d08 /* f023988: 8fa70204 */ lw $a3,0x204($sp) @@ -6849,24 +6849,24 @@ glabel var7f1a99ecpf /* f0239ac: 31af0001 */ andi $t7,$t5,0x1 /* f0239b0: 11e0000c */ beqz $t7,.PF0f0239e4 /* f0239b4: 00000000 */ nop -/* f0239b8: 0fc0888a */ jal 0xf022228 +/* f0239b8: 0fc0888a */ jal func0f0220ec /* f0239bc: 24060001 */ li $a2,0x1 -/* f0239c0: 0c006b44 */ jal 0x1ad10 +/* f0239c0: 0c006b44 */ jal func0001af80 /* f0239c4: 8fa40208 */ lw $a0,0x208($sp) /* f0239c8: 8fa40250 */ lw $a0,0x250($sp) /* f0239cc: 44060000 */ mfc1 $a2,$f0 /* f0239d0: 24070001 */ li $a3,0x1 -/* f0239d4: 0fc239f6 */ jal 0xf08e7d8 +/* f0239d4: 0fc239f6 */ jal func0f08e8ac /* f0239d8: 24850008 */ addiu $a1,$a0,0x8 /* f0239dc: 100000ca */ b .PF0f023d08 /* f0239e0: 00403825 */ move $a3,$v0 .PF0f0239e4: -/* f0239e4: 0c006b44 */ jal 0x1ad10 +/* f0239e4: 0c006b44 */ jal func0001af80 /* f0239e8: 8fa40208 */ lw $a0,0x208($sp) /* f0239ec: 8fa40250 */ lw $a0,0x250($sp) /* f0239f0: 44060000 */ mfc1 $a2,$f0 /* f0239f4: 24070001 */ li $a3,0x1 -/* f0239f8: 0fc239f6 */ jal 0xf08e7d8 +/* f0239f8: 0fc239f6 */ jal func0f08e8ac /* f0239fc: 24850008 */ addiu $a1,$a0,0x8 /* f023a00: 3c19800a */ lui $t9,0x800a /* f023a04: 8f39a824 */ lw $t9,-0x57dc($t9) @@ -6891,7 +6891,7 @@ glabel var7f1a99ecpf /* f023a4c: 02002025 */ move $a0,$s0 /* f023a50: 8fa501fc */ lw $a1,0x1fc($sp) /* f023a54: 24060001 */ li $a2,0x1 -/* f023a58: 0fc0888a */ jal 0xf022228 +/* f023a58: 0fc0888a */ jal func0f0220ec /* f023a5c: afa70204 */ sw $a3,0x204($sp) /* f023a60: 100000a9 */ b .PF0f023d08 /* f023a64: 8fa70204 */ lw $a3,0x204($sp) @@ -6903,12 +6903,12 @@ glabel var7f1a99ecpf /* f023a78: 00003025 */ move $a2,$zero /* f023a7c: 51a000a3 */ beqzl $t5,.PF0f023d0c /* f023a80: 8faa01f0 */ lw $t2,0x1f0($sp) -/* f023a84: 0fc0888a */ jal 0xf022228 +/* f023a84: 0fc0888a */ jal func0f0220ec /* f023a88: afa70204 */ sw $a3,0x204($sp) /* f023a8c: 1000009e */ b .PF0f023d08 /* f023a90: 8fa70204 */ lw $a3,0x204($sp) .PF0f023a94: -/* f023a94: 0fc0888a */ jal 0xf022228 +/* f023a94: 0fc0888a */ jal func0f0220ec /* f023a98: afa70204 */ sw $a3,0x204($sp) /* f023a9c: 1000009a */ b .PF0f023d08 /* f023aa0: 8fa70204 */ lw $a3,0x204($sp) @@ -6923,13 +6923,13 @@ glabel var7f1a99ecpf /* f023ac0: 02002025 */ move $a0,$s0 /* f023ac4: 8fa501fc */ lw $a1,0x1fc($sp) /* f023ac8: 00003025 */ move $a2,$zero -/* f023acc: 0fc0888a */ jal 0xf022228 +/* f023acc: 0fc0888a */ jal func0f0220ec /* f023ad0: afa70204 */ sw $a3,0x204($sp) /* f023ad4: 1000008c */ b .PF0f023d08 /* f023ad8: 8fa70204 */ lw $a3,0x204($sp) .PF0f023adc: /* f023adc: 24060001 */ li $a2,0x1 -/* f023ae0: 0fc0888a */ jal 0xf022228 +/* f023ae0: 0fc0888a */ jal func0f0220ec /* f023ae4: afa70204 */ sw $a3,0x204($sp) /* f023ae8: 10000087 */ b .PF0f023d08 /* f023aec: 8fa70204 */ lw $a3,0x204($sp) @@ -6941,7 +6941,7 @@ glabel var7f1a99ecpf /* f023b00: 00003025 */ move $a2,$zero /* f023b04: 53200081 */ beqzl $t9,.PF0f023d0c /* f023b08: 8faa01f0 */ lw $t2,0x1f0($sp) -/* f023b0c: 0fc0888a */ jal 0xf022228 +/* f023b0c: 0fc0888a */ jal func0f0220ec /* f023b10: afa70204 */ sw $a3,0x204($sp) /* f023b14: 1000007c */ b .PF0f023d08 /* f023b18: 8fa70204 */ lw $a3,0x204($sp) @@ -6949,12 +6949,12 @@ glabel var7f1a99ecpf /* f023b1c: 24010005 */ li $at,0x5 /* f023b20: 1461000a */ bne $v1,$at,.PF0f023b4c /* f023b24: 8fa90250 */ lw $t1,0x250($sp) -/* f023b28: 0c006b44 */ jal 0x1ad10 +/* f023b28: 0c006b44 */ jal func0001af80 /* f023b2c: 8fa40208 */ lw $a0,0x208($sp) /* f023b30: 8fa40250 */ lw $a0,0x250($sp) /* f023b34: 44060000 */ mfc1 $a2,$f0 /* f023b38: 24070001 */ li $a3,0x1 -/* f023b3c: 0fc239f6 */ jal 0xf08e7d8 +/* f023b3c: 0fc239f6 */ jal func0f08e8ac /* f023b40: 24850008 */ addiu $a1,$a0,0x8 /* f023b44: 10000070 */ b .PF0f023d08 /* f023b48: 00403825 */ move $a3,$v0 @@ -6967,7 +6967,7 @@ glabel var7f1a99ecpf /* f023b60: 8d4aa824 */ lw $t2,-0x57dc($t2) /* f023b64: 55400012 */ bnezl $t2,.PF0f023bb0 /* f023b68: 8faf0208 */ lw $t7,0x208($sp) -/* f023b6c: 0fc4a513 */ jal 0xf12944c +/* f023b6c: 0fc4a513 */ jal propGetPlayerNum /* f023b70: 01202025 */ move $a0,$t1 /* f023b74: 00026080 */ sll $t4,$v0,0x2 /* f023b78: 3c03800a */ lui $v1,0x800a @@ -6990,14 +6990,14 @@ glabel var7f1a99ecpf /* f023bb4: 24060001 */ li $a2,0x1 /* f023bb8: 8df80020 */ lw $t8,0x20($t7) /* f023bbc: a300000b */ sb $zero,0xb($t8) -/* f023bc0: 0fc0888a */ jal 0xf022228 +/* f023bc0: 0fc0888a */ jal func0f0220ec /* f023bc4: 8fa501fc */ lw $a1,0x1fc($sp) -/* f023bc8: 0c006b44 */ jal 0x1ad10 +/* f023bc8: 0c006b44 */ jal func0001af80 /* f023bcc: 8fa40208 */ lw $a0,0x208($sp) /* f023bd0: 8fa40250 */ lw $a0,0x250($sp) /* f023bd4: 44060000 */ mfc1 $a2,$f0 /* f023bd8: 24070001 */ li $a3,0x1 -/* f023bdc: 0fc239f6 */ jal 0xf08e7d8 +/* f023bdc: 0fc239f6 */ jal func0f08e8ac /* f023be0: 24850008 */ addiu $a1,$a0,0x8 /* f023be4: 10000048 */ b .PF0f023d08 /* f023be8: 00403825 */ move $a3,$v0 @@ -7012,7 +7012,7 @@ glabel var7f1a99ecpf /* f023c08: 24060001 */ li $a2,0x1 /* f023c0c: a160000b */ sb $zero,0xb($t3) /* f023c10: afa0019c */ sw $zero,0x19c($sp) -/* f023c14: 0fc0888a */ jal 0xf022228 +/* f023c14: 0fc0888a */ jal func0f0220ec /* f023c18: 8fa501fc */ lw $a1,0x1fc($sp) /* f023c1c: 8fa7019c */ lw $a3,0x19c($sp) /* f023c20: 8e030020 */ lw $v1,0x20($s0) @@ -7033,12 +7033,12 @@ glabel var7f1a99ecpf /* f023c58: 31af0004 */ andi $t7,$t5,0x4 /* f023c5c: 11e0001e */ beqz $t7,.PF0f023cd8 /* f023c60: 00000000 */ nop -/* f023c64: 0c008d8e */ jal 0x23638 +/* f023c64: 0c008d8e */ jal func00023d38 /* f023c68: 00000000 */ nop /* f023c6c: 8e180020 */ lw $t8,0x20($s0) /* f023c70: 8f020020 */ lw $v0,0x20($t8) /* f023c74: 84440000 */ lh $a0,0x0($v0) -/* f023c78: 0c008c53 */ jal 0x2314c +/* f023c78: 0c008c53 */ jal func0002384c /* f023c7c: 84450014 */ lh $a1,0x14($v0) /* f023c80: 28440000 */ slti $a0,$v0,0x0 /* f023c84: 54800014 */ bnezl $a0,.PF0f023cd8 @@ -7046,7 +7046,7 @@ glabel var7f1a99ecpf /* f023c8c: 8e080020 */ lw $t0,0x20($s0) /* f023c90: 8d020020 */ lw $v0,0x20($t0) /* f023c94: 84440000 */ lh $a0,0x0($v0) -/* f023c98: 0c008c53 */ jal 0x2314c +/* f023c98: 0c008c53 */ jal func0002384c /* f023c9c: 84450016 */ lh $a1,0x16($v0) /* f023ca0: 28440000 */ slti $a0,$v0,0x0 /* f023ca4: 5080000c */ beqzl $a0,.PF0f023cd8 @@ -7068,12 +7068,12 @@ glabel var7f1a99ecpf /* f023ce0: 10000009 */ b .PF0f023d08 /* f023ce4: 00003825 */ move $a3,$zero .PF0f023ce8: -/* f023ce8: 0c006b44 */ jal 0x1ad10 +/* f023ce8: 0c006b44 */ jal func0001af80 /* f023cec: 8fa40208 */ lw $a0,0x208($sp) /* f023cf0: 8fa40250 */ lw $a0,0x250($sp) /* f023cf4: 44060000 */ mfc1 $a2,$f0 /* f023cf8: 24070001 */ li $a3,0x1 -/* f023cfc: 0fc239f6 */ jal 0xf08e7d8 +/* f023cfc: 0fc239f6 */ jal func0f08e8ac /* f023d00: 24850008 */ addiu $a1,$a0,0x8 /* f023d04: 00403825 */ move $a3,$v0 .PF0f023d08: @@ -7101,7 +7101,7 @@ glabel var7f1a99ecpf /* f023d54: 372e0040 */ ori $t6,$t9,0x40 /* f023d58: a60e0192 */ sh $t6,0x192($s0) .PF0f023d5c: -/* f023d5c: 0fc084e5 */ jal 0xf021394 +/* f023d5c: 0fc084e5 */ jal chrUpdateAimProperties /* f023d60: afa70204 */ sw $a3,0x204($sp) /* f023d64: 8fa70204 */ lw $a3,0x204($sp) /* f023d68: 8fab0250 */ lw $t3,0x250($sp) @@ -7139,7 +7139,7 @@ glabel var7f1a99ecpf /* f023ddc: 2841000b */ slti $at,$v0,0xb /* f023de0: 14200009 */ bnez $at,.PF0f023e08 /* f023de4: ac620000 */ sw $v0,0x0($v1) -/* f023de8: 0fc091e3 */ jal 0xf02478c +/* f023de8: 0fc091e3 */ jal chrDropWeapons /* f023dec: afa00204 */ sw $zero,0x204($sp) /* f023df0: 8e180014 */ lw $t8,0x14($s0) /* f023df4: 8fa70204 */ lw $a3,0x204($sp) @@ -7190,12 +7190,12 @@ glabel var7f1a99ecpf /* f023e98: 01c15825 */ or $t3,$t6,$at /* f023e9c: ae0b0014 */ sw $t3,0x14($s0) .PF0f023ea0: -/* f023ea0: 0fc41dd5 */ jal 0xf107754 +/* f023ea0: 0fc41dd5 */ jal cheatIsActive /* f023ea4: 24040007 */ li $a0,0x7 /* f023ea8: 10400004 */ beqz $v0,.PF0f023ebc /* f023eac: 3c013ea0 */ lui $at,0x3ea0 /* f023eb0: 44816000 */ mtc1 $at,$f12 -/* f023eb4: 0c0068a7 */ jal 0x1a29c +/* f023eb4: 0c0068a7 */ jal func0001a50c /* f023eb8: 00000000 */ nop .PF0f023ebc: /* f023ebc: 3c0a7f02 */ lui $t2,0x7f02 @@ -7217,10 +7217,10 @@ glabel var7f1a99ecpf /* f023ef4: 24010006 */ li $at,0x6 /* f023ef8: 5181001e */ beql $t4,$at,.PF0f023f74 /* f023efc: 8fad0250 */ lw $t5,0x250($sp) -/* f023f00: 0fc0f978 */ jal 0xf03e5e0 +/* f023f00: 0fc0f978 */ jal chrGetInverseTheta /* f023f04: 02002025 */ move $a0,$s0 /* f023f08: e7a0018c */ swc1 $f0,0x18c($sp) -/* f023f0c: 0c00685b */ jal 0x1a16c +/* f023f0c: 0c00685b */ jal sinf /* f023f10: 46000306 */ mov.s $f12,$f0 /* f023f14: 3c014198 */ lui $at,0x4198 /* f023f18: 44814000 */ mtc1 $at,$f8 @@ -7228,19 +7228,19 @@ glabel var7f1a99ecpf /* f023f20: c7ac018c */ lwc1 $f12,0x18c($sp) /* f023f24: 46080482 */ mul.s $f18,$f0,$f8 /* f023f28: e7a40194 */ swc1 $f4,0x194($sp) -/* f023f2c: 0c006858 */ jal 0x1a160 +/* f023f2c: 0c006858 */ jal cosf /* f023f30: e7b20190 */ swc1 $f18,0x190($sp) /* f023f34: 3c014198 */ lui $at,0x4198 /* f023f38: 44813000 */ mtc1 $at,$f6 /* f023f3c: 27a40190 */ addiu $a0,$sp,0x190 /* f023f40: 27a501a8 */ addiu $a1,$sp,0x1a8 /* f023f44: 46060282 */ mul.s $f10,$f0,$f6 -/* f023f48: 0c00591b */ jal 0x1646c +/* f023f48: 0c00591b */ jal func000166dc /* f023f4c: e7aa0198 */ swc1 $f10,0x198($sp) -/* f023f50: 0fc2d706 */ jal 0xf0b5c18 +/* f023f50: 0fc2d706 */ jal currentPlayerGetMatrix1740 /* f023f54: 00000000 */ nop /* f023f58: 00402025 */ move $a0,$v0 -/* f023f5c: 0c0055e3 */ jal 0x1578c +/* f023f5c: 0c0055e3 */ jal func000159fc /* f023f60: 27a501a8 */ addiu $a1,$sp,0x1a8 /* f023f64: 27a901a8 */ addiu $t1,$sp,0x1a8 /* f023f68: 1000004b */ b .PF0f024098 @@ -7252,7 +7252,7 @@ glabel var7f1a99ecpf /* f023f78: 91af0000 */ lbu $t7,0x0($t5) /* f023f7c: 15e10043 */ bne $t7,$at,.PF0f02408c /* f023f80: 00000000 */ nop -/* f023f84: 0fc4a513 */ jal 0xf12944c +/* f023f84: 0fc4a513 */ jal propGetPlayerNum /* f023f88: 01a02025 */ move $a0,$t5 /* f023f8c: 0002c080 */ sll $t8,$v0,0x2 /* f023f90: 3c03800a */ lui $v1,0x800a @@ -7263,7 +7263,7 @@ glabel var7f1a99ecpf /* f023fa4: 8c6801b0 */ lw $t0,0x1b0($v1) /* f023fa8: 15010034 */ bne $t0,$at,.PF0f02407c /* f023fac: 00000000 */ nop -/* f023fb0: 0fc0f978 */ jal 0xf03e5e0 +/* f023fb0: 0fc0f978 */ jal chrGetInverseTheta /* f023fb4: afa30188 */ sw $v1,0x188($sp) /* f023fb8: 8fa30188 */ lw $v1,0x188($sp) /* f023fbc: e7a00178 */ swc1 $f0,0x178($sp) @@ -7275,7 +7275,7 @@ glabel var7f1a99ecpf /* f023fd4: c44800ac */ lwc1 $f8,0xac($v0) /* f023fd8: afa20174 */ sw $v0,0x174($sp) /* f023fdc: 46124102 */ mul.s $f4,$f8,$f18 -/* f023fe0: 0c006858 */ jal 0x1a160 +/* f023fe0: 0c006858 */ jal cosf /* f023fe4: e7a40130 */ swc1 $f4,0x130($sp) /* f023fe8: c7a60130 */ lwc1 $f6,0x130($sp) /* f023fec: 8fa20174 */ lw $v0,0x174($sp) @@ -7299,29 +7299,29 @@ glabel var7f1a99ecpf /* f024030: c7ac0178 */ lwc1 $f12,0x178($sp) /* f024034: 46006307 */ neg.s $f12,$f12 /* f024038: 46062280 */ add.s $f10,$f4,$f6 -/* f02403c: 0c00685b */ jal 0x1a16c +/* f02403c: 0c00685b */ jal sinf /* f024040: e7aa0180 */ swc1 $f10,0x180($sp) /* f024044: c7a80130 */ lwc1 $f8,0x130($sp) /* f024048: 27a4017c */ addiu $a0,$sp,0x17c /* f02404c: 27a501a8 */ addiu $a1,$sp,0x1a8 /* f024050: 46080482 */ mul.s $f18,$f0,$f8 -/* f024054: 0c00591b */ jal 0x1646c +/* f024054: 0c00591b */ jal func000166dc /* f024058: e7b20184 */ swc1 $f18,0x184($sp) -/* f02405c: 0fc2d706 */ jal 0xf0b5c18 +/* f02405c: 0fc2d706 */ jal currentPlayerGetMatrix1740 /* f024060: 00000000 */ nop /* f024064: 00402025 */ move $a0,$v0 -/* f024068: 0c0055e3 */ jal 0x1578c +/* f024068: 0c0055e3 */ jal func000159fc /* f02406c: 27a501a8 */ addiu $a1,$sp,0x1a8 /* f024070: 27ae01a8 */ addiu $t6,$sp,0x1a8 /* f024074: 10000008 */ b .PF0f024098 /* f024078: afae0210 */ sw $t6,0x210($sp) .PF0f02407c: -/* f02407c: 0fc2d706 */ jal 0xf0b5c18 +/* f02407c: 0fc2d706 */ jal currentPlayerGetMatrix1740 /* f024080: 00000000 */ nop /* f024084: 10000004 */ b .PF0f024098 /* f024088: afa20210 */ sw $v0,0x210($sp) .PF0f02408c: -/* f02408c: 0fc2d706 */ jal 0xf0b5c18 +/* f02408c: 0fc2d706 */ jal currentPlayerGetMatrix1740 /* f024090: 00000000 */ nop /* f024094: afa20210 */ sw $v0,0x210($sp) .PF0f024098: @@ -7329,7 +7329,7 @@ glabel var7f1a99ecpf /* f02409c: 8d6a0008 */ lw $t2,0x8($t3) /* f0240a0: 8544000e */ lh $a0,0xe($t2) /* f0240a4: 00046180 */ sll $t4,$a0,0x6 -/* f0240a8: 0fc5a25d */ jal 0xf168974 +/* f0240a8: 0fc5a25d */ jal gfxAllocate /* f0240ac: 01802025 */ move $a0,$t4 /* f0240b0: 8fa901f0 */ lw $t1,0x1f0($sp) /* f0240b4: afa20220 */ sw $v0,0x220($sp) @@ -7355,7 +7355,7 @@ glabel var7f1a99ecpf /* f024100: 3c03800a */ lui $v1,0x800a /* f024104: 8c63a794 */ lw $v1,-0x586c($v1) /* f024108: 24631bb0 */ addiu $v1,$v1,0x1bb0 -/* f02410c: 0fc2d736 */ jal 0xf0b5cd8 +/* f02410c: 0fc2d736 */ jal currentPlayerGetLodScaleZ /* f024110: afa30124 */ sw $v1,0x124($sp) /* f024114: 3c19800a */ lui $t9,0x800a /* f024118: 8f39a828 */ lw $t9,-0x57d8($t9) @@ -7378,7 +7378,7 @@ glabel var7f1a99ecpf .PF0f024158: /* f024158: afa30124 */ sw $v1,0x124($sp) /* f02415c: afa60110 */ sw $a2,0x110($sp) -/* f024160: 0fc47e5c */ jal 0xf11f970 +/* f024160: 0fc47e5c */ jal debugGetSlowMotion /* f024164: e7b00114 */ swc1 $f16,0x114($sp) /* f024168: 8fa30124 */ lw $v1,0x124($sp) /* f02416c: 8fa60110 */ lw $a2,0x110($sp) @@ -7487,7 +7487,7 @@ glabel var7f1a99ecpf /* f0242f4: 8fa50208 */ lw $a1,0x208($sp) .PF0f0242f8: /* f0242f8: afa20128 */ sw $v0,0x128($sp) -/* f0242fc: 0c007323 */ jal 0x1cc8c +/* f0242fc: 0c007323 */ jal func0001cebc /* f024300: afa60110 */ sw $a2,0x110($sp) /* f024304: 8fa60110 */ lw $a2,0x110($sp) /* f024308: 8fa20128 */ lw $v0,0x128($sp) @@ -7504,16 +7504,16 @@ glabel var7f1a99ecpf .PF0f024334: /* f024334: ac20ec74 */ sw $zero,-0x138c($at) /* f024338: 3c018006 */ lui $at,0x8006 -/* f02433c: 0c0068a7 */ jal 0x1a29c +/* f02433c: 0c0068a7 */ jal func0001a50c /* f024340: c42c26c8 */ lwc1 $f12,0x26c8($at) /* f024344: 8fab01f0 */ lw $t3,0x1f0($sp) /* f024348: 260400f8 */ addiu $a0,$s0,0xf8 /* f02434c: 11600003 */ beqz $t3,.PF0f02435c /* f024350: 00000000 */ nop -/* f024354: 0fc1a666 */ jal 0xf069998 +/* f024354: 0fc1a666 */ jal colourTween /* f024358: 260500fc */ addiu $a1,$s0,0xfc .PF0f02435c: -/* f02435c: 0c0069de */ jal 0x1a778 +/* f02435c: 0c0069de */ jal func0001a9e8 /* f024360: 8fa40208 */ lw $a0,0x208($sp) /* f024364: 8faa0250 */ lw $t2,0x250($sp) /* f024368: 8d47001c */ lw $a3,0x1c($t2) @@ -7525,7 +7525,7 @@ glabel var7f1a99ecpf /* f02437c: 02002025 */ move $a0,$s0 /* f024380: 00e02825 */ move $a1,$a3 /* f024384: 8fa601f0 */ lw $a2,0x1f0($sp) -/* f024388: 0fc088d4 */ jal 0xf022350 +/* f024388: 0fc088d4 */ jal func0f022214 /* f02438c: afa201f4 */ sw $v0,0x1f4($sp) /* f024390: 8fa701f4 */ lw $a3,0x1f4($sp) /* f024394: 54e0fff9 */ bnezl $a3,.PF0f02437c @@ -7551,7 +7551,7 @@ glabel var7f1a99ecpf /* f0243e0: 8de10008 */ lw $at,0x8($t7) /* f0243e4: ad380004 */ sw $t8,0x4($t1) /* f0243e8: ad210008 */ sw $at,0x8($t1) -/* f0243ec: 0fc22f08 */ jal 0xf08bc20 +/* f0243ec: 0fc22f08 */ jal func0f08bcf4 /* f0243f0: 8e040178 */ lw $a0,0x178($s0) /* f0243f4: afa20058 */ sw $v0,0x58($sp) /* f0243f8: 82060006 */ lb $a2,0x6($s0) @@ -7584,25 +7584,25 @@ glabel var7f1a99ecpf /* f024464: e7ae00ec */ swc1 $f14,0xec($sp) /* f024468: 27a400e8 */ addiu $a0,$sp,0xe8 /* f02446c: 27a5009c */ addiu $a1,$sp,0x9c -/* f024470: 0c00591b */ jal 0x1646c +/* f024470: 0c00591b */ jal func000166dc /* f024474: e7b200f0 */ swc1 $f18,0xf0($sp) /* f024478: c7ac00e4 */ lwc1 $f12,0xe4($sp) -/* f02447c: 0c0056ed */ jal 0x15bb4 +/* f02447c: 0c0056ed */ jal func00015e24 /* f024480: 27a5009c */ addiu $a1,$sp,0x9c /* f024484: c7ac00e0 */ lwc1 $f12,0xe0($sp) -/* f024488: 0c005704 */ jal 0x15c10 +/* f024488: 0c005704 */ jal func00015e80 /* f02448c: 27a5009c */ addiu $a1,$sp,0x9c /* f024490: c7ac00dc */ lwc1 $f12,0xdc($sp) -/* f024494: 0c00571b */ jal 0x15c6c +/* f024494: 0c00571b */ jal func00015edc /* f024498: 27a5009c */ addiu $a1,$sp,0x9c /* f02449c: 8faa00f4 */ lw $t2,0xf4($sp) /* f0244a0: 27a5009c */ addiu $a1,$sp,0x9c /* f0244a4: 27a6005c */ addiu $a2,$sp,0x5c -/* f0244a8: 0c00565d */ jal 0x15974 +/* f0244a8: 0c00565d */ jal func00015be4 /* f0244ac: 8d44000c */ lw $a0,0xc($t2) /* f0244b0: 8fac00f4 */ lw $t4,0xf4($sp) /* f0244b4: 27a4005c */ addiu $a0,$sp,0x5c -/* f0244b8: 0c0056aa */ jal 0x15aa8 +/* f0244b8: 0c0056aa */ jal func00015d18 /* f0244bc: 8d85000c */ lw $a1,0xc($t4) /* f0244c0: 8fad0058 */ lw $t5,0x58($sp) /* f0244c4: 24010002 */ li $at,0x2 @@ -7618,7 +7618,7 @@ glabel var7f1a99ecpf /* f0244e4: 8c980004 */ lw $t8,0x4($a0) /* f0244e8: 55f8003e */ bnel $t7,$t8,.PF0f0245e4 /* f0244ec: 8fac01f0 */ lw $t4,0x1f0($sp) -/* f0244f0: 0c0069ab */ jal 0x1a6ac +/* f0244f0: 0c0069ab */ jal modelGetPart /* f0244f4: 24050004 */ li $a1,0x4 /* f0244f8: 10400039 */ beqz $v0,.PF0f0245e0 /* f0244fc: 00402825 */ move $a1,$v0 @@ -7626,17 +7626,17 @@ glabel var7f1a99ecpf /* f024504: 24010017 */ li $at,0x17 /* f024508: 55010036 */ bnel $t0,$at,.PF0f0245e4 /* f02450c: 8fac01f0 */ lw $t4,0x1f0($sp) -/* f024510: 0c0069eb */ jal 0x1a7ac +/* f024510: 0c0069eb */ jal modelGetNodeData /* f024514: 8fa40208 */ lw $a0,0x208($sp) /* f024518: 8c590000 */ lw $t9,0x0($v0) /* f02451c: 24050001 */ li $a1,0x1 /* f024520: 53200030 */ beqzl $t9,.PF0f0245e4 /* f024524: 8fac01f0 */ lw $t4,0x1f0($sp) -/* f024528: 0c0069ab */ jal 0x1a6ac +/* f024528: 0c0069ab */ jal modelGetPart /* f02452c: 8c440000 */ lw $a0,0x0($v0) /* f024530: 1040002b */ beqz $v0,.PF0f0245e0 /* f024534: 00402825 */ move $a1,$v0 -/* f024538: 0c0069eb */ jal 0x1a7ac +/* f024538: 0c0069eb */ jal modelGetNodeData /* f02453c: 8fa40208 */ lw $a0,0x208($sp) /* f024540: 8fae0200 */ lw $t6,0x200($sp) /* f024544: 10000026 */ b .PF0f0245e0 @@ -7668,7 +7668,7 @@ glabel var7f1a99ecpf .PF0f0245a4: /* f0245a4: 00e02025 */ move $a0,$a3 /* f0245a8: 8fa501f0 */ lw $a1,0x1f0($sp) -/* f0245ac: 0fc1c260 */ jal 0xf070980 +/* f0245ac: 0fc1c260 */ jal func0f0706f8 /* f0245b0: afa201f4 */ sw $v0,0x1f4($sp) /* f0245b4: 8fa701f4 */ lw $a3,0x1f4($sp) /* f0245b8: 54e0fffa */ bnezl $a3,.PF0f0245a4 @@ -7696,14 +7696,14 @@ glabel var7f1a99ecpf /* f024604: 31f80001 */ andi $t8,$t7,0x1 /* f024608: 13000007 */ beqz $t8,.PF0f024628 /* f02460c: 00000000 */ nop -/* f024610: 0fc1c248 */ jal 0xf070920 +/* f024610: 0fc1c248 */ jal func0f070698 /* f024614: 00002825 */ move $a1,$zero /* f024618: 8e080014 */ lw $t0,0x14($s0) /* f02461c: 2401fffe */ li $at,-2 /* f024620: 0101c824 */ and $t9,$t0,$at /* f024624: ae190014 */ sw $t9,0x14($s0) .PF0f024628: -/* f024628: 0fc10706 */ jal 0xf041c18 +/* f024628: 0fc10706 */ jal func0f041a74 /* f02462c: 02002025 */ move $a0,$s0 /* f024630: 00001025 */ move $v0,$zero .PF0f024634: @@ -14019,7 +14019,7 @@ glabel var7f1a9ba0pf /* f029a28: 02002025 */ move $a0,$s0 /* f029a2c: c5e60014 */ lwc1 $f6,0x14($t7) /* f029a30: 46062083 */ div.s $f2,$f4,$f6 -/* f029a34: 0fc0d042 */ jal 0xf034108 +/* f029a34: 0fc0d042 */ jal chrGetShield /* f029a38: e7a20170 */ swc1 $f2,0x170($sp) /* f029a3c: 921402e1 */ lbu $s4,0x2e1($s0) /* f029a40: 960e0188 */ lhu $t6,0x188($s0) @@ -14052,7 +14052,7 @@ glabel var7f1a9ba0pf .PF0f029aa0: /* f029aa0: 00002825 */ move $a1,$zero /* f029aa4: e7a20170 */ swc1 $f2,0x170($sp) -/* f029aa8: 0c0068ad */ jal 0x1a2b4 +/* f029aa8: 0c0068ad */ jal func0001a524 /* f029aac: e7ae016c */ swc1 $f14,0x16c($sp) /* f029ab0: c7a20170 */ lwc1 $f2,0x170($sp) /* f029ab4: c6680004 */ lwc1 $f8,0x4($s3) @@ -14120,14 +14120,14 @@ glabel var7f1a9ba0pf /* f029bac: afa601c4 */ sw $a2,0x1c4($sp) /* f029bb0: afa701c0 */ sw $a3,0x1c0($sp) /* f029bb4: afa801bc */ sw $t0,0x1bc($sp) -/* f029bb8: 0c012ab0 */ jal 0x4aac0 +/* f029bb8: 0c012ab0 */ jal osVirtualToPhysical /* f029bbc: afa901b8 */ sw $t1,0x1b8($sp) /* f029bc0: 8fa80204 */ lw $t0,0x204($sp) /* f029bc4: c7ae016c */ lwc1 $f14,0x16c($sp) /* f029bc8: 2401fff9 */ li $at,-7 /* f029bcc: 15010082 */ bne $t0,$at,.PF0f029dd8 /* f029bd0: ae020004 */ sw $v0,0x4($s0) -/* f029bd4: 0fc5a253 */ jal 0xf16894c +/* f029bd4: 0fc5a253 */ jal gfxAllocateColours /* f029bd8: 24040001 */ li $a0,0x1 /* f029bdc: 8fb001f0 */ lw $s0,0x1f0($sp) /* f029be0: 3c0e0700 */ lui $t6,0x700 @@ -14136,7 +14136,7 @@ glabel var7f1a9ba0pf /* f029bec: afb801f0 */ sw $t8,0x1f0($sp) /* f029bf0: ae0e0000 */ sw $t6,0x0($s0) /* f029bf4: afa201d8 */ sw $v0,0x1d8($sp) -/* f029bf8: 0c012ab0 */ jal 0x4aac0 +/* f029bf8: 0c012ab0 */ jal osVirtualToPhysical /* f029bfc: 00402025 */ move $a0,$v0 /* f029c00: 8fa301d8 */ lw $v1,0x1d8($sp) /* f029c04: ae020004 */ sw $v0,0x4($s0) @@ -14178,7 +14178,7 @@ glabel var7f1a9ba0pf /* f029c90: 00000000 */ nop /* f029c94: a06e0003 */ sb $t6,0x3($v1) .PF0f029c98: -/* f029c98: 0fc5a239 */ jal 0xf1688e4 +/* f029c98: 0fc5a239 */ jal gfxAllocateVertices /* f029c9c: 24040018 */ li $a0,0x18 /* f029ca0: 00408025 */ move $s0,$v0 /* f029ca4: 27a60104 */ addiu $a2,$sp,0x104 @@ -14238,7 +14238,7 @@ glabel var7f1a9ba0pf /* f029d74: af190000 */ sw $t9,0x0($t8) /* f029d78: afa60054 */ sw $a2,0x54($sp) /* f029d7c: 02002025 */ move $a0,$s0 -/* f029d80: 0c012ab0 */ jal 0x4aac0 +/* f029d80: 0c012ab0 */ jal osVirtualToPhysical /* f029d84: afb800c8 */ sw $t8,0xc8($sp) /* f029d88: 8fa800c8 */ lw $t0,0xc8($sp) /* f029d8c: 8fa60054 */ lw $a2,0x54($sp) @@ -14271,7 +14271,7 @@ glabel var7f1a9ba0pf /* f029df4: 24060004 */ li $a2,0x4 /* f029df8: 24070001 */ li $a3,0x1 /* f029dfc: afa00018 */ sw $zero,0x18($sp) -/* f029e00: 0fc2cfb8 */ jal 0xf0b3ee0 +/* f029e00: 0fc2cfb8 */ jal func0f0b39c0 /* f029e04: e7ae016c */ swc1 $f14,0x16c($sp) /* f029e08: 8fa80204 */ lw $t0,0x204($sp) /* f029e0c: c7ae016c */ lwc1 $f14,0x16c($sp) @@ -14311,7 +14311,7 @@ glabel var7f1a9ba0pf /* f029e8c: 46087302 */ mul.s $f12,$f14,$f8 /* f029e90: 00000000 */ nop .PF0f029e94: -/* f029e94: 0fc0a5c7 */ jal 0xf02971c +/* f029e94: 0fc0a5c7 */ jal func0f0295f8 /* f029e98: 27a700f8 */ addiu $a3,$sp,0xf8 /* f029e9c: 8fac0100 */ lw $t4,0x100($sp) /* f029ea0: 8fad00fc */ lw $t5,0xfc($sp) @@ -14371,7 +14371,7 @@ glabel var7f1a9ba0pf /* f029f58: afaa00f0 */ sw $t2,0xf0($sp) /* f029f5c: afab00ec */ sw $t3,0xec($sp) /* f029f60: 46045302 */ mul.s $f12,$f10,$f4 -/* f029f64: 0c00685b */ jal 0x1a16c +/* f029f64: 0c00685b */ jal sinf /* f029f68: 00000000 */ nop /* f029f6c: 3c0f800a */ lui $t7,0x800a /* f029f70: 8defa568 */ lw $t7,-0x5a98($t7) @@ -14414,7 +14414,7 @@ glabel var7f1a9ba0pf /* f029ffc: 3c017f1b */ lui $at,0x7f1b /* f02a000: c4309b6c */ lwc1 $f16,-0x6494($at) /* f02a004: 46104302 */ mul.s $f12,$f8,$f16 -/* f02a008: 0c006858 */ jal 0x1a160 +/* f02a008: 0c006858 */ jal cosf /* f02a00c: 00000000 */ nop /* f02a010: 3c014200 */ lui $at,0x4200 /* f02a014: 44811000 */ mtc1 $at,$f2 @@ -14456,7 +14456,7 @@ glabel var7f1a9ba0pf .PF0f02a0a4: /* f02a0a4: afa700f4 */ sw $a3,0xf4($sp) /* f02a0a8: afaa00f0 */ sw $t2,0xf0($sp) -/* f02a0ac: 0fc5a253 */ jal 0xf16894c +/* f02a0ac: 0fc5a253 */ jal gfxAllocateColours /* f02a0b0: afab00ec */ sw $t3,0xec($sp) /* f02a0b4: 8fb001f0 */ lw $s0,0x1f0($sp) /* f02a0b8: 3c190700 */ lui $t9,0x700 @@ -14465,7 +14465,7 @@ glabel var7f1a9ba0pf /* f02a0c4: afae01f0 */ sw $t6,0x1f0($sp) /* f02a0c8: ae190000 */ sw $t9,0x0($s0) /* f02a0cc: afa201d8 */ sw $v0,0x1d8($sp) -/* f02a0d0: 0c012ab0 */ jal 0x4aac0 +/* f02a0d0: 0c012ab0 */ jal osVirtualToPhysical /* f02a0d4: 00402025 */ move $a0,$v0 /* f02a0d8: 8fa80204 */ lw $t0,0x204($sp) /* f02a0dc: 8fa301d8 */ lw $v1,0x1d8($sp) @@ -14550,7 +14550,7 @@ glabel var7f1a9ba0pf /* f02a200: afa301d8 */ sw $v1,0x1d8($sp) /* f02a204: afa700f4 */ sw $a3,0xf4($sp) /* f02a208: afaa00f0 */ sw $t2,0xf0($sp) -/* f02a20c: 0fc5a239 */ jal 0xf1688e4 +/* f02a20c: 0fc5a239 */ jal gfxAllocateVertices /* f02a210: afab00ec */ sw $t3,0xec($sp) /* f02a214: 8fa501f8 */ lw $a1,0x1f8($sp) /* f02a218: 24010001 */ li $at,0x1 @@ -14587,7 +14587,7 @@ glabel var7f1a9ba0pf /* f02a290: afaa00f0 */ sw $t2,0xf0($sp) /* f02a294: afab00ec */ sw $t3,0xec($sp) /* f02a298: 46089302 */ mul.s $f12,$f18,$f8 -/* f02a29c: 0c00685b */ jal 0x1a16c +/* f02a29c: 0c00685b */ jal sinf /* f02a2a0: 00000000 */ nop /* f02a2a4: 3c013f80 */ lui $at,0x3f80 /* f02a2a8: 44818000 */ mtc1 $at,$f16 @@ -14817,7 +14817,7 @@ glabel var7f1a9ba0pf /* f02a5e8: a7a80176 */ sh $t0,0x176($sp) /* f02a5ec: afa60054 */ sw $a2,0x54($sp) /* f02a5f0: 02002025 */ move $a0,$s0 -/* f02a5f4: 0c012ab0 */ jal 0x4aac0 +/* f02a5f4: 0c012ab0 */ jal osVirtualToPhysical /* f02a5f8: afae00b4 */ sw $t6,0xb4($sp) /* f02a5fc: 8fa700b4 */ lw $a3,0xb4($sp) /* f02a600: 8fa60054 */ lw $a2,0x54($sp) @@ -14900,7 +14900,7 @@ glabel var7f1a9ba0pf /* f02a724: 00000000 */ nop /* f02a728: 46006086 */ mov.s $f2,$f12 .PF0f02a72c: -/* f02a72c: 0fc5a253 */ jal 0xf16894c +/* f02a72c: 0fc5a253 */ jal gfxAllocateColours /* f02a730: e7a200ac */ swc1 $f2,0xac($sp) /* f02a734: 8fb001f0 */ lw $s0,0x1f0($sp) /* f02a738: 3c0f0708 */ lui $t7,0x708 @@ -14909,7 +14909,7 @@ glabel var7f1a9ba0pf /* f02a744: afae01f0 */ sw $t6,0x1f0($sp) /* f02a748: ae0f0000 */ sw $t7,0x0($s0) /* f02a74c: afa201d8 */ sw $v0,0x1d8($sp) -/* f02a750: 0c012ab0 */ jal 0x4aac0 +/* f02a750: 0c012ab0 */ jal osVirtualToPhysical /* f02a754: 00402025 */ move $a0,$v0 /* f02a758: 8fa301d8 */ lw $v1,0x1d8($sp) /* f02a75c: c7a200ac */ lwc1 $f2,0xac($sp) @@ -14927,7 +14927,7 @@ glabel var7f1a9ba0pf /* f02a78c: a0660005 */ sb $a2,0x5($v1) /* f02a790: a0670002 */ sb $a3,0x2($v1) /* f02a794: a0670006 */ sb $a3,0x6($v1) -/* f02a798: 0fc5a239 */ jal 0xf1688e4 +/* f02a798: 0fc5a239 */ jal gfxAllocateVertices /* f02a79c: a0780003 */ sb $t8,0x3($v1) /* f02a7a0: 87ab0052 */ lh $t3,0x52($sp) /* f02a7a4: 02747021 */ addu $t6,$s3,$s4 @@ -15036,7 +15036,7 @@ glabel var7f1a9ba0pf /* f02a938: af0e0000 */ sw $t6,0x0($t8) /* f02a93c: afab0044 */ sw $t3,0x44($sp) /* f02a940: afa60054 */ sw $a2,0x54($sp) -/* f02a944: 0c012ab0 */ jal 0x4aac0 +/* f02a944: 0c012ab0 */ jal osVirtualToPhysical /* f02a948: afb800a4 */ sw $t8,0xa4($sp) /* f02a94c: 8fa700a4 */ lw $a3,0xa4($sp) /* f02a950: 8fa60054 */ lw $a2,0x54($sp) @@ -15063,7 +15063,7 @@ glabel var7f1a9ba0pf .PF0f02a9a4: /* f02a9a4: 05010130 */ bgez $t0,.PF0f02ae68 /* f02a9a8: 8fae01f8 */ lw $t6,0x1f8($sp) -/* f02a9ac: 0fc5a239 */ jal 0xf1688e4 +/* f02a9ac: 0fc5a239 */ jal gfxAllocateVertices /* f02a9b0: 2404000c */ li $a0,0xc /* f02a9b4: 8fa80204 */ lw $t0,0x204($sp) /* f02a9b8: 2401ffff */ li $at,-1 @@ -15101,7 +15101,7 @@ glabel var7f1a9ba0pf /* f02aa38: 10000001 */ b .PF0f02aa40 /* f02aa3c: 01c02825 */ move $a1,$t6 .PF0f02aa40: -/* f02aa40: 0fc5a253 */ jal 0xf16894c +/* f02aa40: 0fc5a253 */ jal gfxAllocateColours /* f02aa44: a3a5017f */ sb $a1,0x17f($sp) /* f02aa48: 8fb101f0 */ lw $s1,0x1f0($sp) /* f02aa4c: 3c0f0700 */ lui $t7,0x700 @@ -15110,7 +15110,7 @@ glabel var7f1a9ba0pf /* f02aa58: afb801f0 */ sw $t8,0x1f0($sp) /* f02aa5c: ae2f0000 */ sw $t7,0x0($s1) /* f02aa60: afa201d8 */ sw $v0,0x1d8($sp) -/* f02aa64: 0c012ab0 */ jal 0x4aac0 +/* f02aa64: 0c012ab0 */ jal osVirtualToPhysical /* f02aa68: 00402025 */ move $a0,$v0 /* f02aa6c: 8fa301d8 */ lw $v1,0x1d8($sp) /* f02aa70: 93a5017f */ lbu $a1,0x17f($sp) @@ -15187,7 +15187,7 @@ glabel var7f1a9ba0pf /* f02ab7c: 00000000 */ nop /* f02ab80: 46006086 */ mov.s $f2,$f12 .PF0f02ab84: -/* f02ab84: 0fc5a253 */ jal 0xf16894c +/* f02ab84: 0fc5a253 */ jal gfxAllocateColours /* f02ab88: e7a20094 */ swc1 $f2,0x94($sp) /* f02ab8c: 8fb101f0 */ lw $s1,0x1f0($sp) /* f02ab90: 3c0e0700 */ lui $t6,0x700 @@ -15196,7 +15196,7 @@ glabel var7f1a9ba0pf /* f02ab9c: afaf01f0 */ sw $t7,0x1f0($sp) /* f02aba0: ae2e0000 */ sw $t6,0x0($s1) /* f02aba4: afa201d8 */ sw $v0,0x1d8($sp) -/* f02aba8: 0c012ab0 */ jal 0x4aac0 +/* f02aba8: 0c012ab0 */ jal osVirtualToPhysical /* f02abac: 00402025 */ move $a0,$v0 /* f02abb0: 8fa301d8 */ lw $v1,0x1d8($sp) /* f02abb4: c7a20094 */ lwc1 $f2,0x94($sp) @@ -15330,7 +15330,7 @@ glabel var7f1a9ba0pf /* f02adac: 37390090 */ ori $t9,$t9,0x90 /* f02adb0: 262e0008 */ addiu $t6,$s1,0x8 /* f02adb4: afae01f0 */ sw $t6,0x1f0($sp) -/* f02adb8: 0c012ab0 */ jal 0x4aac0 +/* f02adb8: 0c012ab0 */ jal osVirtualToPhysical /* f02adbc: ae390000 */ sw $t9,0x0($s1) /* f02adc0: ae220004 */ sw $v0,0x4($s1) /* f02adc4: 8fb801f0 */ lw $t8,0x1f0($sp) @@ -15435,7 +15435,7 @@ glabel var7f1a9ba0pf /* f02af3c: a3a6017e */ sb $a2,0x17e($sp) /* f02af40: afa700f4 */ sw $a3,0xf4($sp) /* f02af44: afaa00f0 */ sw $t2,0xf0($sp) -/* f02af48: 0fc5a253 */ jal 0xf16894c +/* f02af48: 0fc5a253 */ jal gfxAllocateColours /* f02af4c: afab00ec */ sw $t3,0xec($sp) /* f02af50: 8fb001f0 */ lw $s0,0x1f0($sp) /* f02af54: 3c0e0710 */ lui $t6,0x710 @@ -15444,7 +15444,7 @@ glabel var7f1a9ba0pf /* f02af60: afaf01f0 */ sw $t7,0x1f0($sp) /* f02af64: ae0e0000 */ sw $t6,0x0($s0) /* f02af68: afa201d8 */ sw $v0,0x1d8($sp) -/* f02af6c: 0c012ab0 */ jal 0x4aac0 +/* f02af6c: 0c012ab0 */ jal osVirtualToPhysical /* f02af70: 00402025 */ move $a0,$v0 /* f02af74: 8fa301d8 */ lw $v1,0x1d8($sp) /* f02af78: 93a5017f */ lbu $a1,0x17f($sp) @@ -15518,7 +15518,7 @@ glabel var7f1a9ba0pf /* f02b074: 240b00ff */ li $t3,0xff .PF0f02b078: /* f02b078: a06b0012 */ sb $t3,0x12($v1) -/* f02b07c: 0fc5a239 */ jal 0xf1688e4 +/* f02b07c: 0fc5a239 */ jal gfxAllocateVertices /* f02b080: a0650013 */ sb $a1,0x13($v1) /* f02b084: 8fa80204 */ lw $t0,0x204($sp) /* f02b088: 27b80104 */ addiu $t8,$sp,0x104 @@ -15641,7 +15641,7 @@ glabel var7f1a9ba0pf /* f02b250: afa30040 */ sw $v1,0x40($sp) /* f02b254: afaf004c */ sw $t7,0x4c($sp) /* f02b258: 02002025 */ move $a0,$s0 -/* f02b25c: 0c012ab0 */ jal 0x4aac0 +/* f02b25c: 0c012ab0 */ jal osVirtualToPhysical /* f02b260: afb90078 */ sw $t9,0x78($sp) /* f02b264: 8fa60078 */ lw $a2,0x78($sp) /* f02b268: 8fa80204 */ lw $t0,0x204($sp) @@ -15911,7 +15911,7 @@ glabel var7f1a9ba0pf /* f02b650: afab0044 */ sw $t3,0x44($sp) /* f02b654: afaa0058 */ sw $t2,0x58($sp) /* f02b658: afa70054 */ sw $a3,0x54($sp) -/* f02b65c: 0c012ab0 */ jal 0x4aac0 +/* f02b65c: 0c012ab0 */ jal osVirtualToPhysical /* f02b660: afaf0068 */ sw $t7,0x68($sp) /* f02b664: 8fa60068 */ lw $a2,0x68($sp) /* f02b668: 8fa70054 */ lw $a3,0x54($sp) @@ -16063,7 +16063,7 @@ glabel var7f1a9ba0pf /* f02b894: 8fb101f0 */ lw $s1,0x1f0($sp) /* f02b898: 26390008 */ addiu $t9,$s1,0x8 /* f02b89c: afb901f0 */ sw $t9,0x1f0($sp) -/* f02b8a0: 0c012ab0 */ jal 0x4aac0 +/* f02b8a0: 0c012ab0 */ jal osVirtualToPhysical /* f02b8a4: ae2e0000 */ sw $t6,0x0($s1) /* f02b8a8: ae220004 */ sw $v0,0x4($s1) /* f02b8ac: 8fb801f0 */ lw $t8,0x1f0($sp) diff --git a/src/game/chr/chraction.c b/src/game/chr/chraction.c index 679b8bff7..8427562a7 100644 --- a/src/game/chr/chraction.c +++ b/src/game/chr/chraction.c @@ -2779,11 +2779,11 @@ glabel var7f1a9f70pf /* f030730: afa5007c */ sw $a1,0x7c($sp) /* f030734: 00808825 */ move $s1,$a0 /* f030738: afb00014 */ sw $s0,0x14($sp) -/* f03073c: 0fc0a252 */ jal 0xf028948 +/* f03073c: 0fc0a252 */ jal chrGetEquippedWeaponProp /* f030740: 24050001 */ li $a1,0x1 /* f030744: 00408025 */ move $s0,$v0 /* f030748: 02202025 */ move $a0,$s1 -/* f03074c: 0fc0a252 */ jal 0xf028948 +/* f03074c: 0fc0a252 */ jal chrGetEquippedWeaponProp /* f030750: 00002825 */ move $a1,$zero /* f030754: 3c0f8006 */ lui $t7,0x8006 /* f030758: 25ef7d14 */ addiu $t7,$t7,0x7d14 @@ -2810,20 +2810,20 @@ glabel var7f1a9f70pf /* f0307ac: af210000 */ sw $at,0x0($t9) /* f0307b0: 10400046 */ beqz $v0,.PF0f0308cc /* f0307b4: 02202025 */ move $a0,$s1 -/* f0307b8: 0fc0a256 */ jal 0xf028958 +/* f0307b8: 0fc0a256 */ jal chrGetEquippedWeaponPropWithCheck /* f0307bc: 24050001 */ li $a1,0x1 /* f0307c0: 00408025 */ move $s0,$v0 /* f0307c4: 02202025 */ move $a0,$s1 -/* f0307c8: 0fc0a256 */ jal 0xf028958 +/* f0307c8: 0fc0a256 */ jal chrGetEquippedWeaponPropWithCheck /* f0307cc: 00002825 */ move $a1,$zero /* f0307d0: 1200000d */ beqz $s0,.PF0f030808 /* f0307d4: 00001825 */ move $v1,$zero /* f0307d8: 5040000c */ beqzl $v0,.PF0f03080c /* f0307dc: 2c4b0001 */ sltiu $t3,$v0,0x1 -/* f0307e0: 0c004ad4 */ jal 0x12b50 +/* f0307e0: 0c004ad4 */ jal random /* f0307e4: 00000000 */ nop /* f0307e8: 304c0001 */ andi $t4,$v0,0x1 -/* f0307ec: 0c004ad4 */ jal 0x12b50 +/* f0307ec: 0c004ad4 */ jal random /* f0307f0: afac0068 */ sw $t4,0x68($sp) /* f0307f4: 24010003 */ li $at,0x3 /* f0307f8: 0041001b */ divu $zero,$v0,$at @@ -2893,11 +2893,11 @@ glabel var7f1a9f70pf /* f0308c8: afa20060 */ sw $v0,0x60($sp) .PF0f0308cc: /* f0308cc: 02002025 */ move $a0,$s0 -/* f0308d0: 0fc0b891 */ jal 0xf02e244 +/* f0308d0: 0fc0b891 */ jal weaponIsOneHanded /* f0308d4: afa5006c */ sw $a1,0x6c($sp) /* f0308d8: 14400005 */ bnez $v0,.PF0f0308f0 /* f0308dc: 8fa5006c */ lw $a1,0x6c($sp) -/* f0308e0: 0fc0b891 */ jal 0xf02e244 +/* f0308e0: 0fc0b891 */ jal weaponIsOneHanded /* f0308e4: 00a02025 */ move $a0,$a1 /* f0308e8: 50400014 */ beqzl $v0,.PF0f03093c /* f0308ec: 8fb9007c */ lw $t9,0x7c($sp) @@ -2955,12 +2955,12 @@ glabel var7f1a9f70pf /* f030994: 51600032 */ beqzl $t3,.PF0f030a60 /* f030998: 26100001 */ addiu $s0,$s0,0x1 /* f03099c: afa60034 */ sw $a2,0x34($sp) -/* f0309a0: 0fc0a252 */ jal 0xf028948 +/* f0309a0: 0fc0a252 */ jal chrGetEquippedWeaponProp /* f0309a4: afa70030 */ sw $a3,0x30($sp) /* f0309a8: 8c430004 */ lw $v1,0x4($v0) /* f0309ac: 9064005c */ lbu $a0,0x5c($v1) /* f0309b0: 9065005f */ lbu $a1,0x5f($v1) -/* f0309b4: 0fc2c8f8 */ jal 0xf0b23e0 +/* f0309b4: 0fc2c8f8 */ jal weaponGetMaxFireRatePerTick /* f0309b8: afa30044 */ sw $v1,0x44($sp) /* f0309bc: 8fa30044 */ lw $v1,0x44($sp) /* f0309c0: 8fa60034 */ lw $a2,0x34($sp) @@ -3015,7 +3015,7 @@ glabel var7f1a9f70pf /* f030a6c: 24e70004 */ addiu $a3,$a3,0x4 /* f030a70: 240e0009 */ li $t6,0x9 /* f030a74: a22e0007 */ sb $t6,0x7($s1) -/* f030a78: 0c004ad4 */ jal 0x12b50 +/* f030a78: 0c004ad4 */ jal random /* f030a7c: ae200030 */ sw $zero,0x30($s1) /* f030a80: 3c017f1b */ lui $at,0x7f1b /* f030a84: c4249f70 */ lwc1 $f4,-0x6090($at) @@ -3036,7 +3036,7 @@ glabel var7f1a9f70pf /* f030ac0: 0007000d */ break 0x7 .PF0f030ac4: /* f030ac4: ae200040 */ sw $zero,0x40($s1) -/* f030ac8: 0c004ad4 */ jal 0x12b50 +/* f030ac8: 0c004ad4 */ jal random /* f030acc: ae2b003c */ sw $t3,0x3c($s1) /* f030ad0: 30490001 */ andi $t1,$v0,0x1 /* f030ad4: ae290044 */ sw $t1,0x44($s1) @@ -3062,7 +3062,7 @@ glabel var7f1a9f70pf /* f030b24: 8fa80068 */ lw $t0,0x68($sp) /* f030b28: a2200008 */ sb $zero,0x8($s1) /* f030b2c: ae2b0018 */ sw $t3,0x18($s1) -/* f030b30: 0c007659 */ jal 0x1d964 +/* f030b30: 0c007659 */ jal modelIsAnimMerging /* f030b34: a228004e */ sb $t0,0x4e($s1) /* f030b38: 10400006 */ beqz $v0,.PF0f030b54 /* f030b3c: 00000000 */ nop @@ -3072,7 +3072,7 @@ glabel var7f1a9f70pf /* f030b4c: 10000008 */ b .PF0f030b70 /* f030b50: ae2a0014 */ sw $t2,0x14($s1) .PF0f030b54: -/* f030b54: 0fc0c1b2 */ jal 0xf0306c8 +/* f030b54: 0fc0c1b2 */ jal chrAttackWalkChooseAnimation /* f030b58: 02202025 */ move $a0,$s1 /* f030b5c: 8e2d0014 */ lw $t5,0x14($s1) /* f030b60: 3c01ffdf */ lui $at,0xffdf @@ -9394,7 +9394,7 @@ glabel var7f1a8d98 /* f0347b8: 8c591c08 */ lw $t9,0x1c08($v0) /* f0347bc: 17200005 */ bnez $t9,.PF0f0347d4 /* f0347c0: 00000000 */ nop -/* f0347c4: 0c0039b9 */ jal 0xe6e4 +/* f0347c4: 0c0039b9 */ jal mainGetStageNum /* f0347c8: afa7014c */ sw $a3,0x14c($sp) /* f0347cc: 24010026 */ li $at,0x26 /* f0347d0: 10410735 */ beq $v0,$at,.PF0f0364a8 @@ -9489,7 +9489,7 @@ glabel var7f1a8d98 /* f03491c: 27a70114 */ addiu $a3,$sp,0x114 /* f034920: 00e02025 */ move $a0,$a3 .PF0f034924: -/* f034924: 0fc2c54f */ jal 0xf0b153c +/* f034924: 0fc2c54f */ jal handGetWeaponFunction /* f034928: afa7014c */ sw $a3,0x14c($sp) /* f03492c: 0002182b */ sltu $v1,$zero,$v0 /* f034930: 10600005 */ beqz $v1,.PF0f034948 @@ -9505,7 +9505,7 @@ glabel var7f1a8d98 /* f034954: 000d182b */ sltu $v1,$zero,$t5 /* f034958: 10600004 */ beqz $v1,.PF0f03496c /* f03495c: afa3005c */ sw $v1,0x5c($sp) -/* f034960: 0fc2c8e8 */ jal 0xf0b23a0 +/* f034960: 0fc2c8e8 */ jal handHasFunctionFlags /* f034964: 8fa4014c */ lw $a0,0x14c($sp) /* f034968: 0002182b */ sltu $v1,$zero,$v0 .PF0f03496c: @@ -9534,7 +9534,7 @@ glabel var7f1a8d98 /* f0349bc: 24010003 */ li $at,0x3 /* f0349c0: 5541000c */ bnel $t2,$at,.PF0f0349f4 /* f0349c4: 8fa4014c */ lw $a0,0x14c($sp) -/* f0349c8: 0fc0a26a */ jal 0xf0289a8 +/* f0349c8: 0fc0a26a */ jal chrGetTargetProp /* f0349cc: 8e240004 */ lw $a0,0x4($s1) /* f0349d0: 8e0b001c */ lw $t3,0x1c($s0) /* f0349d4: 544b0007 */ bnel $v0,$t3,.PF0f0349f4 @@ -9547,7 +9547,7 @@ glabel var7f1a8d98 .PF0f0349f0: /* f0349f0: 8fa4014c */ lw $a0,0x14c($sp) .PF0f0349f4: -/* f0349f4: 0fc2c8e8 */ jal 0xf0b23a0 +/* f0349f4: 0fc2c8e8 */ jal handHasFunctionFlags /* f0349f8: 24050400 */ li $a1,0x400 /* f0349fc: 10400011 */ beqz $v0,.PF0f034a44 /* f034a00: 3c08800a */ lui $t0,0x800a @@ -9607,7 +9607,7 @@ glabel var7f1a8d98 /* f034ac8: 24010006 */ li $at,0x6 /* f034acc: 5461000b */ bnel $v1,$at,.PF0f034afc /* f034ad0: 24010006 */ li $at,0x6 -/* f034ad4: 0fc06c74 */ jal 0xf01b1d0 +/* f034ad4: 0fc06c74 */ jal pdmodeGetDamage /* f034ad8: 00000000 */ nop /* f034adc: 3c018006 */ lui $at,0x8006 /* f034ae0: c42a2984 */ lwc1 $f10,0x2984($at) @@ -9621,7 +9621,7 @@ glabel var7f1a8d98 .PF0f034afc: /* f034afc: 50610007 */ beql $v1,$at,.PF0f034b1c /* f034b00: 24010006 */ li $at,0x6 -/* f034b04: 0fc06c67 */ jal 0xf01b19c +/* f034b04: 0fc06c67 */ jal pdmodeGetHealth /* f034b08: 00000000 */ nop /* f034b0c: 8fa50128 */ lw $a1,0x128($sp) /* f034b10: 4600a503 */ div.s $f20,$f20,$f0 @@ -9630,7 +9630,7 @@ glabel var7f1a8d98 .PF0f034b1c: /* f034b1c: 546100d2 */ bnel $v1,$at,.PF0f034e68 /* f034b20: 24010006 */ li $at,0x6 -/* f034b24: 0fc4a513 */ jal 0xf12944c +/* f034b24: 0fc4a513 */ jal propGetPlayerNum /* f034b28: 00a02025 */ move $a0,$a1 /* f034b2c: 00027080 */ sll $t6,$v0,0x2 /* f034b30: 3c18800a */ lui $t8,0x800a @@ -9638,7 +9638,7 @@ glabel var7f1a8d98 /* f034b38: 8f18a574 */ lw $t8,-0x5a8c($t8) /* f034b3c: 8fa40128 */ lw $a0,0x128($sp) /* f034b40: c712199c */ lwc1 $f18,0x199c($t8) -/* f034b44: 0fc4a513 */ jal 0xf12944c +/* f034b44: 0fc4a513 */ jal propGetPlayerNum /* f034b48: e7b2010c */ swc1 $f18,0x10c($sp) /* f034b4c: 00027880 */ sll $t7,$v0,0x2 /* f034b50: 3c19800a */ lui $t9,0x800a @@ -9689,7 +9689,7 @@ glabel var7f1a8d98 /* f034bf8: 24010006 */ li $at,0x6 /* f034bfc: 5461000b */ bnel $v1,$at,.PF0f034c2c /* f034c00: 24010006 */ li $at,0x6 -/* f034c04: 0fc06c74 */ jal 0xf01b1d0 +/* f034c04: 0fc06c74 */ jal pdmodeGetDamage /* f034c08: 00000000 */ nop /* f034c0c: 3c018006 */ lui $at,0x8006 /* f034c10: c4302984 */ lwc1 $f16,0x2984($at) @@ -9703,7 +9703,7 @@ glabel var7f1a8d98 .PF0f034c2c: /* f034c2c: 50610007 */ beql $v1,$at,.PF0f034c4c /* f034c30: 24010006 */ li $at,0x6 -/* f034c34: 0fc06c67 */ jal 0xf01b19c +/* f034c34: 0fc06c67 */ jal pdmodeGetHealth /* f034c38: 00000000 */ nop /* f034c3c: 8fa50128 */ lw $a1,0x128($sp) /* f034c40: 4600a503 */ div.s $f20,$f20,$f0 @@ -9712,7 +9712,7 @@ glabel var7f1a8d98 .PF0f034c4c: /* f034c4c: 54610086 */ bnel $v1,$at,.PF0f034e68 /* f034c50: 24010006 */ li $at,0x6 -/* f034c54: 0fc4a513 */ jal 0xf12944c +/* f034c54: 0fc4a513 */ jal propGetPlayerNum /* f034c58: 00a02025 */ move $a0,$a1 /* f034c5c: 0002c080 */ sll $t8,$v0,0x2 /* f034c60: 3c0f800a */ lui $t7,0x800a @@ -9720,7 +9720,7 @@ glabel var7f1a8d98 /* f034c68: 8defa574 */ lw $t7,-0x5a8c($t7) /* f034c6c: 8fa40128 */ lw $a0,0x128($sp) /* f034c70: c5e4199c */ lwc1 $f4,0x199c($t7) -/* f034c74: 0fc4a513 */ jal 0xf12944c +/* f034c74: 0fc4a513 */ jal propGetPlayerNum /* f034c78: e7a4010c */ swc1 $f4,0x10c($sp) /* f034c7c: 0002c880 */ sll $t9,$v0,0x2 /* f034c80: 3c08800a */ lui $t0,0x800a @@ -9770,7 +9770,7 @@ glabel var7f1a8d98 /* f034d24: 00000000 */ nop /* f034d28: 14a2000c */ bne $a1,$v0,.PF0f034d5c /* f034d2c: 00000000 */ nop -/* f034d30: 0fc06c74 */ jal 0xf01b1d0 +/* f034d30: 0fc06c74 */ jal pdmodeGetDamage /* f034d34: 00000000 */ nop /* f034d38: 3c018006 */ lui $at,0x8006 /* f034d3c: c4322984 */ lwc1 $f18,0x2984($at) @@ -9784,7 +9784,7 @@ glabel var7f1a8d98 .PF0f034d5c: /* f034d5c: 10a20008 */ beq $a1,$v0,.PF0f034d80 /* f034d60: 00000000 */ nop -/* f034d64: 0fc06c67 */ jal 0xf01b19c +/* f034d64: 0fc06c67 */ jal pdmodeGetHealth /* f034d68: 00000000 */ nop /* f034d6c: 3c0f800a */ lui $t7,0x800a /* f034d70: 8defa7b0 */ lw $t7,-0x5850($t7) @@ -9794,7 +9794,7 @@ glabel var7f1a8d98 .PF0f034d80: /* f034d80: 14a20012 */ bne $a1,$v0,.PF0f034dcc /* f034d84: 00000000 */ nop -/* f034d88: 0fc4a513 */ jal 0xf12944c +/* f034d88: 0fc4a513 */ jal propGetPlayerNum /* f034d8c: 00a02025 */ move $a0,$a1 /* f034d90: 0002c880 */ sll $t9,$v0,0x2 /* f034d94: 3c08800a */ lui $t0,0x800a @@ -9802,7 +9802,7 @@ glabel var7f1a8d98 /* f034d9c: 8d08a574 */ lw $t0,-0x5a8c($t0) /* f034da0: 8fa40128 */ lw $a0,0x128($sp) /* f034da4: c506199c */ lwc1 $f6,0x199c($t0) -/* f034da8: 0fc4a513 */ jal 0xf12944c +/* f034da8: 0fc4a513 */ jal propGetPlayerNum /* f034dac: e7a6010c */ swc1 $f6,0x10c($sp) /* f034db0: 00024880 */ sll $t1,$v0,0x2 /* f034db4: 3c0a800a */ lui $t2,0x800a @@ -9838,16 +9838,16 @@ glabel var7f1a8d98 /* f034e24: 24010006 */ li $at,0x6 /* f034e28: 8f18a79c */ lw $t8,-0x5864($t8) /* f034e2c: 00a02025 */ move $a0,$a1 -/* f034e30: 0fc4a513 */ jal 0xf12944c +/* f034e30: 0fc4a513 */ jal propGetPlayerNum /* f034e34: afb800e8 */ sw $t8,0xe8($sp) -/* f034e38: 0fc4a4ff */ jal 0xf1293fc +/* f034e38: 0fc4a4ff */ jal setCurrentPlayerNum /* f034e3c: 00402025 */ move $a0,$v0 /* f034e40: 3c0f800a */ lui $t7,0x800a /* f034e44: 8defa798 */ lw $t7,-0x5868($t7) /* f034e48: 8fa400e8 */ lw $a0,0xe8($sp) /* f034e4c: c5f0005c */ lwc1 $f16,0x5c($t7) /* f034e50: 4610a502 */ mul.s $f20,$f20,$f16 -/* f034e54: 0fc4a4ff */ jal 0xf1293fc +/* f034e54: 0fc4a4ff */ jal setCurrentPlayerNum /* f034e58: 00000000 */ nop /* f034e5c: 8fa50128 */ lw $a1,0x128($sp) /* f034e60: 90a30000 */ lbu $v1,0x0($a1) @@ -9858,21 +9858,21 @@ glabel var7f1a8d98 /* f034e6c: 3c08800a */ lui $t0,0x800a /* f034e70: 8d08a79c */ lw $t0,-0x5864($t0) /* f034e74: 00a02025 */ move $a0,$a1 -/* f034e78: 0fc4a513 */ jal 0xf12944c +/* f034e78: 0fc4a513 */ jal propGetPlayerNum /* f034e7c: afa800e4 */ sw $t0,0xe4($sp) -/* f034e80: 0fc4a4ff */ jal 0xf1293fc +/* f034e80: 0fc4a4ff */ jal setCurrentPlayerNum /* f034e84: 00402025 */ move $a0,$v0 /* f034e88: 3c04800a */ lui $a0,0x800a /* f034e8c: 8084a79f */ lb $a0,-0x5861($a0) /* f034e90: 27a500e0 */ addiu $a1,$sp,0xe0 -/* f034e94: 0c005416 */ jal 0x15058 +/* f034e94: 0c005416 */ jal func000152d0 /* f034e98: 27a600dc */ addiu $a2,$sp,0xdc /* f034e9c: 8fa400e0 */ lw $a0,0xe0($sp) /* f034ea0: 3c053e80 */ lui $a1,0x3e80 /* f034ea4: 2406ffff */ li $a2,-1 /* f034ea8: 04820004 */ bltzl $a0,.PF0f034ebc /* f034eac: 8fa400dc */ lw $a0,0xdc($sp) -/* f034eb0: 0fc479c0 */ jal 0xf11e700 +/* f034eb0: 0fc479c0 */ jal func0f11dc04 /* f034eb4: 2407ffff */ li $a3,-1 /* f034eb8: 8fa400dc */ lw $a0,0xdc($sp) .PF0f034ebc: @@ -9880,10 +9880,10 @@ glabel var7f1a8d98 /* f034ec0: 2406ffff */ li $a2,-1 /* f034ec4: 04800003 */ bltz $a0,.PF0f034ed4 /* f034ec8: 00000000 */ nop -/* f034ecc: 0fc479c0 */ jal 0xf11e700 +/* f034ecc: 0fc479c0 */ jal func0f11dc04 /* f034ed0: 2407ffff */ li $a3,-1 .PF0f034ed4: -/* f034ed4: 0fc4a4ff */ jal 0xf1293fc +/* f034ed4: 0fc4a4ff */ jal setCurrentPlayerNum /* f034ed8: 8fa400e4 */ lw $a0,0xe4($sp) /* f034edc: 8fa50128 */ lw $a1,0x128($sp) .PF0f034ee0: @@ -9900,7 +9900,7 @@ glabel var7f1a8d98 /* f034f08: 14410010 */ bne $v0,$at,.PF0f034f4c /* f034f0c: 00000000 */ nop .PF0f034f10: -/* f034f10: 0fc63831 */ jal 0xf18e0c4 +/* f034f10: 0fc63831 */ jal mpPlayerGetIndex /* f034f14: 8e240004 */ lw $a0,0x4($s1) /* f034f18: afa200f0 */ sw $v0,0xf0($sp) /* f034f1c: 1000000b */ b .PF0f034f4c @@ -9912,7 +9912,7 @@ glabel var7f1a8d98 /* f034f30: 24010006 */ li $at,0x6 /* f034f34: 15410005 */ bne $t2,$at,.PF0f034f4c /* f034f38: 00000000 */ nop -/* f034f3c: 0fc4a513 */ jal 0xf12944c +/* f034f3c: 0fc4a513 */ jal propGetPlayerNum /* f034f40: 02202025 */ move $a0,$s1 /* f034f44: afa200f0 */ sw $v0,0xf0($sp) /* f034f48: 8fa50128 */ lw $a1,0x128($sp) @@ -9949,7 +9949,7 @@ glabel var7f1a8d98 /* f034fc0: 00000000 */ nop /* f034fc4: 4500000f */ bc1f .PF0f035004 /* f034fc8: 00000000 */ nop -/* f034fcc: 0c004ad4 */ jal 0x12b50 +/* f034fcc: 0c004ad4 */ jal random /* f034fd0: 00000000 */ nop /* f034fd4: 3c014080 */ lui $at,0x4080 /* f034fd8: 44818000 */ mtc1 $at,$f16 @@ -9970,7 +9970,7 @@ glabel var7f1a8d98 /* f035010: 00000000 */ nop /* f035014: 4500000c */ bc1f .PF0f035048 /* f035018: 00000000 */ nop -/* f03501c: 0c004ad4 */ jal 0x12b50 +/* f03501c: 0c004ad4 */ jal random /* f035020: 00000000 */ nop /* f035024: 30580001 */ andi $t8,$v0,0x1 /* f035028: 44989000 */ mtc1 $t8,$f18 @@ -9988,7 +9988,7 @@ glabel var7f1a8d98 /* f035054: 00000000 */ nop /* f035058: 4500000c */ bc1f .PF0f03508c /* f03505c: 00000000 */ nop -/* f035060: 0c004ad4 */ jal 0x12b50 +/* f035060: 0c004ad4 */ jal random /* f035064: 00000000 */ nop /* f035068: 304f0001 */ andi $t7,$v0,0x1 /* f03506c: 448f9000 */ mtc1 $t7,$f18 @@ -10005,7 +10005,7 @@ glabel var7f1a8d98 /* f035094: 00000000 */ nop /* f035098: 4502000c */ bc1fl .PF0f0350cc /* f03509c: 8fa8014c */ lw $t0,0x14c($sp) -/* f0350a0: 0c004ad4 */ jal 0x12b50 +/* f0350a0: 0c004ad4 */ jal random /* f0350a4: 00000000 */ nop /* f0350a8: 30590001 */ andi $t9,$v0,0x1 /* f0350ac: 44999000 */ mtc1 $t9,$f18 @@ -10033,7 +10033,7 @@ glabel var7f1a8d98 .PF0f0350fc: /* f0350fc: 5160006b */ beqzl $t3,.PF0f0352ac /* f035100: 44804000 */ mtc1 $zero,$f8 -/* f035104: 0fc0d042 */ jal 0xf034108 +/* f035104: 0fc0d042 */ jal chrGetShield /* f035108: 02002025 */ move $a0,$s0 /* f03510c: 8e0202d4 */ lw $v0,0x2d4($s0) /* f035110: 44809000 */ mtc1 $zero,$f18 @@ -10065,7 +10065,7 @@ glabel var7f1a8d98 /* f035174: 032fc821 */ addu $t9,$t9,$t7 /* f035178: 0019c940 */ sll $t9,$t9,0x5 /* f03517c: 00992021 */ addu $a0,$a0,$t9 -/* f035180: 0fc621c0 */ jal 0xf188700 +/* f035180: 0fc621c0 */ jal func0f187770 /* f035184: 9084cdf5 */ lbu $a0,-0x320b($a0) /* f035188: 46140502 */ mul.s $f20,$f0,$f20 /* f03518c: c7a20134 */ lwc1 $f2,0x134($sp) @@ -10087,14 +10087,14 @@ glabel var7f1a8d98 /* f0351c8: 8fac016c */ lw $t4,0x16c($sp) /* f0351cc: afab0010 */ sw $t3,0x10($sp) /* f0351d0: e7a20134 */ swc1 $f2,0x134($sp) -/* f0351d4: 0fc0d07a */ jal 0xf0341e8 +/* f0351d4: 0fc0d07a */ jal func0f034080 /* f0351d8: afac0014 */ sw $t4,0x14($sp) /* f0351dc: 1000000d */ b .PF0f035214 /* f0351e0: c7a20134 */ lwc1 $f2,0x134($sp) .PF0f0351e4: /* f0351e4: 02002025 */ move $a0,$s0 .PF0f0351e8: -/* f0351e8: 0fc0d042 */ jal 0xf034108 +/* f0351e8: 0fc0d042 */ jal chrGetShield /* f0351ec: e7a20134 */ swc1 $f2,0x134($sp) /* f0351f0: 8e04001c */ lw $a0,0x1c($s0) /* f0351f4: 44050000 */ mfc1 $a1,$f0 @@ -10102,7 +10102,7 @@ glabel var7f1a8d98 /* f0351fc: afa00014 */ sw $zero,0x14($sp) /* f035200: afa00010 */ sw $zero,0x10($sp) /* f035204: 00003025 */ move $a2,$zero -/* f035208: 0fc0a428 */ jal 0xf0290a0 +/* f035208: 0fc0a428 */ jal func0f028f7c /* f03520c: 00003825 */ move $a3,$zero /* f035210: c7a20134 */ lwc1 $f2,0x134($sp) .PF0f035214: @@ -10118,7 +10118,7 @@ glabel var7f1a8d98 /* f035238: 53000007 */ beqzl $t8,.PF0f035258 /* f03523c: 4606a003 */ div.s $f0,$f20,$f6 /* f035240: 4480a000 */ mtc1 $zero,$f20 -/* f035244: 0fc0d044 */ jal 0xf034110 +/* f035244: 0fc0d044 */ jal chrSetShield /* f035248: 24050000 */ li $a1,0x0 /* f03524c: 10000013 */ b .PF0f03529c /* f035250: 240f0001 */ li $t7,0x1 @@ -10133,13 +10133,13 @@ glabel var7f1a8d98 /* f035270: 4480a000 */ mtc1 $zero,$f20 /* f035274: 02002025 */ move $a0,$s0 /* f035278: 44051000 */ mfc1 $a1,$f2 -/* f03527c: 0fc0d044 */ jal 0xf034110 +/* f03527c: 0fc0d044 */ jal chrSetShield /* f035280: 00000000 */ nop /* f035284: 10000005 */ b .PF0f03529c /* f035288: 240f0001 */ li $t7,0x1 /* f03528c: 4480a000 */ mtc1 $zero,$f20 .PF0f035290: -/* f035290: 0fc0d044 */ jal 0xf034110 +/* f035290: 0fc0d044 */ jal chrSetShield /* f035294: 24050000 */ li $a1,0x0 /* f035298: 240f0001 */ li $t7,0x1 .PF0f03529c: @@ -10159,7 +10159,7 @@ glabel var7f1a8d98 /* f0352cc: 8e040178 */ lw $a0,0x178($s0) /* f0352d0: 10800033 */ beqz $a0,.PF0f0353a0 /* f0352d4: 00000000 */ nop -/* f0352d8: 0fc22f08 */ jal 0xf08bc20 +/* f0352d8: 0fc22f08 */ jal func0f08bcf4 /* f0352dc: 00000000 */ nop /* f0352e0: 24010005 */ li $at,0x5 /* f0352e4: 14410003 */ bne $v0,$at,.PF0f0352f4 @@ -10172,7 +10172,7 @@ glabel var7f1a8d98 /* f0352fc: 10410008 */ beq $v0,$at,.PF0f035320 /* f035300: 3c0d8006 */ lui $t5,0x8006 /* f035304: 8e040178 */ lw $a0,0x178($s0) -/* f035308: 0fc20aed */ jal 0xf082bb4 +/* f035308: 0fc20aed */ jal propobjSetDropped /* f03530c: 24050004 */ li $a1,0x4 /* f035310: 8e0a0014 */ lw $t2,0x14($s0) /* f035314: 354b0001 */ ori $t3,$t2,0x1 @@ -10184,7 +10184,7 @@ glabel var7f1a8d98 /* f035328: 27ac00c0 */ addiu $t4,$sp,0xc0 /* f03532c: ad810000 */ sw $at,0x0($t4) /* f035330: 95a10004 */ lhu $at,0x4($t5) -/* f035334: 0c004ad4 */ jal 0x12b50 +/* f035334: 0c004ad4 */ jal random /* f035338: a5810004 */ sh $at,0x4($t4) /* f03533c: 3c01bf80 */ lui $at,0xbf80 /* f035340: 44810000 */ mtc1 $at,$f0 @@ -10209,7 +10209,7 @@ glabel var7f1a8d98 /* f03538c: e7a00038 */ swc1 $f0,0x38($sp) /* f035390: e7a00034 */ swc1 $f0,0x34($sp) /* f035394: e7a00030 */ swc1 $f0,0x30($sp) -/* f035398: 0fc24e3a */ jal 0xf0938e8 +/* f035398: 0fc24e3a */ jal func0f0939f8 /* f03539c: e7a00024 */ swc1 $f0,0x24($sp) .PF0f0353a0: /* f0353a0: 52200051 */ beqzl $s1,.PF0f0354e8 @@ -10224,9 +10224,9 @@ glabel var7f1a8d98 /* f0353c4: 8dcea79c */ lw $t6,-0x5864($t6) /* f0353c8: afa000bc */ sw $zero,0xbc($sp) /* f0353cc: 02202025 */ move $a0,$s1 -/* f0353d0: 0fc4a513 */ jal 0xf12944c +/* f0353d0: 0fc4a513 */ jal propGetPlayerNum /* f0353d4: afae00b8 */ sw $t6,0xb8($sp) -/* f0353d8: 0fc4a4ff */ jal 0xf1293fc +/* f0353d8: 0fc4a4ff */ jal setCurrentPlayerNum /* f0353dc: 00402025 */ move $a0,$v0 /* f0353e0: 52000008 */ beqzl $s0,.PF0f035404 /* f0353e4: 8fb80128 */ lw $t8,0x128($sp) @@ -10242,7 +10242,7 @@ glabel var7f1a8d98 /* f035408: 930f0000 */ lbu $t7,0x0($t8) /* f03540c: 55e1000d */ bnel $t7,$at,.PF0f035444 /* f035410: 8fab00bc */ lw $t3,0xbc($sp) -/* f035414: 0fc4a513 */ jal 0xf12944c +/* f035414: 0fc4a513 */ jal propGetPlayerNum /* f035418: 03002025 */ move $a0,$t8 /* f03541c: 0002c880 */ sll $t9,$v0,0x2 /* f035420: 3c08800a */ lui $t0,0x800a @@ -10276,30 +10276,30 @@ glabel var7f1a8d98 /* f03548c: 10000011 */ b .PF0f0354d4 /* f035490: 8fa4014c */ lw $a0,0x14c($sp) .PF0f035494: -/* f035494: 0fc2c24b */ jal 0xf0b092c +/* f035494: 0fc2c24b */ jal mpstatsIncrementPlayerShotCount2 /* f035498: 8fa4014c */ lw $a0,0x14c($sp) /* f03549c: 1000000f */ b .PF0f0354dc /* f0354a0: 00000000 */ nop .PF0f0354a4: -/* f0354a4: 0fc2c24b */ jal 0xf0b092c +/* f0354a4: 0fc2c24b */ jal mpstatsIncrementPlayerShotCount2 /* f0354a8: 24050004 */ li $a1,0x4 /* f0354ac: 1000000b */ b .PF0f0354dc /* f0354b0: 00000000 */ nop .PF0f0354b4: -/* f0354b4: 0fc2c24b */ jal 0xf0b092c +/* f0354b4: 0fc2c24b */ jal mpstatsIncrementPlayerShotCount2 /* f0354b8: 24050005 */ li $a1,0x5 /* f0354bc: 10000007 */ b .PF0f0354dc /* f0354c0: 00000000 */ nop .PF0f0354c4: -/* f0354c4: 0fc2c24b */ jal 0xf0b092c +/* f0354c4: 0fc2c24b */ jal mpstatsIncrementPlayerShotCount2 /* f0354c8: 24050002 */ li $a1,0x2 /* f0354cc: 10000003 */ b .PF0f0354dc /* f0354d0: 00000000 */ nop .PF0f0354d4: -/* f0354d4: 0fc2c24b */ jal 0xf0b092c +/* f0354d4: 0fc2c24b */ jal mpstatsIncrementPlayerShotCount2 /* f0354d8: 24050003 */ li $a1,0x3 .PF0f0354dc: -/* f0354dc: 0fc4a4ff */ jal 0xf1293fc +/* f0354dc: 0fc4a4ff */ jal setCurrentPlayerNum /* f0354e0: 8fa400b8 */ lw $a0,0xb8($sp) .PF0f0354e4: /* f0354e4: 8e0e0018 */ lw $t6,0x18($s0) @@ -10307,7 +10307,7 @@ glabel var7f1a8d98 /* f0354e8: 31cc0010 */ andi $t4,$t6,0x10 /* f0354ec: 51800006 */ beqzl $t4,.PF0f035508 /* f0354f0: 82020007 */ lb $v0,0x7($s0) -/* f0354f4: 0fc0851e */ jal 0xf021478 +/* f0354f4: 0fc0851e */ jal func0f02133c /* f0354f8: 02002025 */ move $a0,$s0 /* f0354fc: 100003eb */ b .PF0f0364ac /* f035500: 8fbf0054 */ lw $ra,0x54($sp) @@ -10344,10 +10344,10 @@ glabel var7f1a8d98 /* f035574: c4500008 */ lwc1 $f16,0x8($v0) /* f035578: c72a0010 */ lwc1 $f10,0x10($t9) /* f03557c: 46105101 */ sub.s $f4,$f10,$f16 -/* f035580: 0fc12307 */ jal 0xf048c1c +/* f035580: 0fc12307 */ jal chrGetAngleToPos /* f035584: e7a400b4 */ swc1 $f4,0xb4($sp) /* f035588: 44050000 */ mfc1 $a1,$f0 -/* f03558c: 0fc08537 */ jal 0xf0214dc +/* f03558c: 0fc08537 */ jal chrDoFlinchcntThing /* f035590: 02002025 */ move $a0,$s0 /* f035594: 100003c5 */ b .PF0f0364ac /* f035598: 8fbf0054 */ lw $ra,0x54($sp) @@ -10366,7 +10366,7 @@ glabel var7f1a8d98 /* f0355c8: c5120010 */ lwc1 $f18,0x10($t0) /* f0355cc: c4460008 */ lwc1 $f6,0x8($v0) /* f0355d0: 46069201 */ sub.s $f8,$f18,$f6 -/* f0355d4: 0fc12307 */ jal 0xf048c1c +/* f0355d4: 0fc12307 */ jal chrGetAngleToPos /* f0355d8: e7a800a4 */ swc1 $f8,0xa4($sp) /* f0355dc: 8fa4014c */ lw $a0,0x14c($sp) /* f0355e0: e7a00098 */ swc1 $f0,0x98($sp) @@ -10402,7 +10402,7 @@ glabel var7f1a8d98 /* f035654: 4604a502 */ mul.s $f20,$f20,$f4 /* f035658: 00000000 */ nop .PF0f03565c: -/* f03565c: 0fc2c8e8 */ jal 0xf0b23a0 +/* f03565c: 0fc2c8e8 */ jal handHasFunctionFlags /* f035660: 34058000 */ li $a1,0x8000 /* f035664: 1040003e */ beqz $v0,.PF0f035760 /* f035668: c7a00098 */ lwc1 $f0,0x98($sp) @@ -10451,11 +10451,11 @@ glabel var7f1a8d98 /* f035704: 00000000 */ nop /* f035708: afad013c */ sw $t5,0x13c($sp) .PF0f03570c: -/* f03570c: 0fc0a252 */ jal 0xf028948 +/* f03570c: 0fc0a252 */ jal chrGetEquippedWeaponProp /* f035710: 00002825 */ move $a1,$zero /* f035714: 14400010 */ bnez $v0,.PF0f035758 /* f035718: 02002025 */ move $a0,$s0 -/* f03571c: 0fc0a252 */ jal 0xf028948 +/* f03571c: 0fc0a252 */ jal chrGetEquippedWeaponProp /* f035720: 24050001 */ li $a1,0x1 /* f035724: 5440000d */ bnezl $v0,.PF0f03575c /* f035728: 24190001 */ li $t9,0x1 @@ -10519,7 +10519,7 @@ glabel var7f1a8d98 /* f0357f0: 02002025 */ move $a0,$s0 /* f0357f4: 15e10005 */ bne $t7,$at,.PF0f03580c /* f0357f8: 8fa50098 */ lw $a1,0x98($sp) -/* f0357fc: 0fc08537 */ jal 0xf0214dc +/* f0357fc: 0fc08537 */ jal chrDoFlinchcntThing /* f035800: 4614a500 */ add.s $f20,$f20,$f20 /* f035804: 1000002a */ b .PF0f0358b0 /* f035808: 8fad0128 */ lw $t5,0x128($sp) @@ -10533,7 +10533,7 @@ glabel var7f1a8d98 /* f035824: 8fad0128 */ lw $t5,0x128($sp) /* f035828: 17200020 */ bnez $t9,.PF0f0358ac /* f03582c: 02002025 */ move $a0,$s0 -/* f035830: 0fc08537 */ jal 0xf0214dc +/* f035830: 0fc08537 */ jal chrDoFlinchcntThing /* f035834: 8fa50098 */ lw $a1,0x98($sp) /* f035838: 8fa8014c */ lw $t0,0x14c($sp) /* f03583c: c7b00124 */ lwc1 $f16,0x124($sp) @@ -10577,9 +10577,9 @@ glabel var7f1a8d98 /* f0358c0: 82020007 */ lb $v0,0x7($s0) /* f0358c4: 8f18a79c */ lw $t8,-0x5864($t8) /* f0358c8: 01a02025 */ move $a0,$t5 -/* f0358cc: 0fc4a513 */ jal 0xf12944c +/* f0358cc: 0fc4a513 */ jal propGetPlayerNum /* f0358d0: afb80094 */ sw $t8,0x94($sp) -/* f0358d4: 0fc4a4ff */ jal 0xf1293fc +/* f0358d4: 0fc4a4ff */ jal setCurrentPlayerNum /* f0358d8: 00402025 */ move $a0,$v0 /* f0358dc: 3c19800a */ lui $t9,0x800a /* f0358e0: 8f39a828 */ lw $t9,-0x57d8($t9) @@ -10593,7 +10593,7 @@ glabel var7f1a8d98 /* f035900: 01485021 */ addu $t2,$t2,$t0 /* f035904: 000a5140 */ sll $t2,$t2,0x5 /* f035908: 008a2021 */ addu $a0,$a0,$t2 -/* f03590c: 0fc621c0 */ jal 0xf188700 +/* f03590c: 0fc621c0 */ jal func0f187770 /* f035910: 9084cdf5 */ lbu $a0,-0x320b($a0) /* f035914: 4600a503 */ div.s $f20,$f20,$f0 .PF0f035918: @@ -10607,11 +10607,11 @@ glabel var7f1a8d98 /* f035934: 8fa4014c */ lw $a0,0x14c($sp) /* f035938: 158000d3 */ bnez $t4,.PF0f035c88 /* f03593c: 00000000 */ nop -/* f035940: 0fc2c8e8 */ jal 0xf0b23a0 +/* f035940: 0fc2c8e8 */ jal handHasFunctionFlags /* f035944: 24050400 */ li $a1,0x400 /* f035948: 50400004 */ beqzl $v0,.PF0f03595c /* f03594c: 8faf0130 */ lw $t7,0x130($sp) -/* f035950: 0fc28b86 */ jal 0xf0a2e18 +/* f035950: 0fc28b86 */ jal currentPlayerLoseGunInNbombStorm /* f035954: 02202025 */ move $a0,$s1 /* f035958: 8faf0130 */ lw $t7,0x130($sp) .PF0f03595c: @@ -10643,7 +10643,7 @@ glabel var7f1a8d98 /* f0359bc: 3c050040 */ lui $a1,0x40 /* f0359c0: 5120000a */ beqzl $t1,.PF0f0359ec /* f0359c4: 8fa4014c */ lw $a0,0x14c($sp) -/* f0359c8: 0fc2c8e8 */ jal 0xf0b23a0 +/* f0359c8: 0fc2c8e8 */ jal handHasFunctionFlags /* f0359cc: e7a0008c */ swc1 $f0,0x8c($sp) /* f0359d0: 10400005 */ beqz $v0,.PF0f0359e8 /* f0359d4: c7a0008c */ lwc1 $f0,0x8c($sp) @@ -10654,7 +10654,7 @@ glabel var7f1a8d98 .PF0f0359e8: /* f0359e8: 8fa4014c */ lw $a0,0x14c($sp) .PF0f0359ec: -/* f0359ec: 0fc0cde6 */ jal 0xf033798 +/* f0359ec: 0fc0cde6 */ jal func0f033654 /* f0359f0: e7a0008c */ swc1 $f0,0x8c($sp) /* f0359f4: 44823000 */ mtc1 $v0,$f6 /* f0359f8: 860a02d8 */ lh $t2,0x2d8($s0) @@ -10704,9 +10704,9 @@ glabel var7f1a8d98 /* f035aa0: 46000086 */ mov.s $f2,$f0 /* f035aa4: 44061000 */ mfc1 $a2,$f2 .PF0f035aa8: -/* f035aa8: 0fc0d17a */ jal 0xf0345e8 +/* f035aa8: 0fc0d17a */ jal playerUpdateDamageStats /* f035aac: e7ac005c */ swc1 $f12,0x5c($sp) -/* f035ab0: 0fc2eeff */ jal 0xf0bbbfc +/* f035ab0: 0fc2eeff */ jal func0f0bb69c /* f035ab4: 00000000 */ nop /* f035ab8: 3c19800a */ lui $t9,0x800a /* f035abc: 8f39a828 */ lw $t9,-0x57d8($t9) @@ -10751,22 +10751,22 @@ glabel var7f1a8d98 /* f035b4c: 00000000 */ nop /* f035b50: 45000006 */ bc1f .PF0f035b6c /* f035b54: 00000000 */ nop -/* f035b58: 0fc3065c */ jal 0xf0c1970 +/* f035b58: 0fc3065c */ jal currentPlayerDieByShooter /* f035b5c: 00002825 */ move $a1,$zero /* f035b60: 920f02ff */ lbu $t7,0x2ff($s0) /* f035b64: 25f80001 */ addiu $t8,$t7,0x1 /* f035b68: a21802ff */ sb $t8,0x2ff($s0) .PF0f035b6c: -/* f035b6c: 0fc5b6f7 */ jal 0xf16dbdc +/* f035b6c: 0fc5b6f7 */ jal coreIsPaused /* f035b70: 00000000 */ nop /* f035b74: 14400005 */ bnez $v0,.PF0f035b8c /* f035b78: 8fad00f4 */ lw $t5,0xf4($sp) /* f035b7c: 11a00003 */ beqz $t5,.PF0f035b8c /* f035b80: 02002025 */ move $a0,$s0 -/* f035b84: 0fc0ce92 */ jal 0xf033a48 +/* f035b84: 0fc0ce92 */ jal func0f0338e0 /* f035b88: 8fa500ec */ lw $a1,0xec($sp) .PF0f035b8c: -/* f035b8c: 0fc0851e */ jal 0xf021478 +/* f035b8c: 0fc0851e */ jal func0f02133c /* f035b90: 02002025 */ move $a0,$s0 /* f035b94: 3c02800a */ lui $v0,0x800a /* f035b98: 8c42a794 */ lw $v0,-0x586c($v0) @@ -10811,14 +10811,14 @@ glabel var7f1a8d98 /* f035c20: 8fab0118 */ lw $t3,0x118($sp) /* f035c24: 51600005 */ beqzl $t3,.PF0f035c3c /* f035c28: 8fae011c */ lw $t6,0x11c($sp) -/* f035c2c: 0fc2f11d */ jal 0xf0bc474 +/* f035c2c: 0fc2f11d */ jal func0f0bbf14 /* f035c30: 00000000 */ nop /* f035c34: 8fa30148 */ lw $v1,0x148($sp) /* f035c38: 8fae011c */ lw $t6,0x11c($sp) .PF0f035c3c: /* f035c3c: 11c00004 */ beqz $t6,.PF0f035c50 /* f035c40: 00000000 */ nop -/* f035c44: 0fc3018e */ jal 0xf0c0638 +/* f035c44: 0fc3018e */ jal currentPlayerUpdateShieldShow /* f035c48: 00000000 */ nop /* f035c4c: 8fa30148 */ lw $v1,0x148($sp) .PF0f035c50: @@ -10834,10 +10834,10 @@ glabel var7f1a8d98 /* f035c74: 15e10004 */ bne $t7,$at,.PF0f035c88 /* f035c78: 00000000 */ nop /* f035c7c: 8c650000 */ lw $a1,0x0($v1) -/* f035c80: 0fc306de */ jal 0xf0c1b78 +/* f035c80: 0fc306de */ jal currentPlayerCheckIfShotInBack /* f035c84: 8c660008 */ lw $a2,0x8($v1) .PF0f035c88: -/* f035c88: 0fc4a4ff */ jal 0xf1293fc +/* f035c88: 0fc4a4ff */ jal setCurrentPlayerNum /* f035c8c: 8fa40094 */ lw $a0,0x94($sp) /* f035c90: 10000206 */ b .PF0f0364ac /* f035c94: 8fbf0054 */ lw $ra,0x54($sp) @@ -10848,7 +10848,7 @@ glabel var7f1a8d98 /* f035ca4: 24010005 */ li $at,0x5 /* f035ca8: 104101ff */ beq $v0,$at,.PF0f0364a8 /* f035cac: 8fa4014c */ lw $a0,0x14c($sp) -/* f035cb0: 0fc2c8e8 */ jal 0xf0b23a0 +/* f035cb0: 0fc2c8e8 */ jal handHasFunctionFlags /* f035cb4: 24050400 */ li $a1,0x400 /* f035cb8: 50400027 */ beqzl $v0,.PF0f035d58 /* f035cbc: c6040100 */ lwc1 $f4,0x100($s0) @@ -10865,29 +10865,29 @@ glabel var7f1a8d98 /* f035ce4: 02002025 */ move $a0,$s0 /* f035ce8: 11200005 */ beqz $t1,.PF0f035d00 /* f035cec: 00000000 */ nop -/* f035cf0: 0fc64db8 */ jal 0xf1936e0 +/* f035cf0: 0fc64db8 */ jal func0f192628 /* f035cf4: 02002025 */ move $a0,$s0 /* f035cf8: 10000017 */ b .PF0f035d58 /* f035cfc: c6040100 */ lwc1 $f4,0x100($s0) .PF0f035d00: -/* f035d00: 0fc0a252 */ jal 0xf028948 +/* f035d00: 0fc0a252 */ jal chrGetEquippedWeaponProp /* f035d04: 00002825 */ move $a1,$zero /* f035d08: 10400007 */ beqz $v0,.PF0f035d28 /* f035d0c: 00402025 */ move $a0,$v0 /* f035d10: ae020300 */ sw $v0,0x300($s0) -/* f035d14: 0fc20aed */ jal 0xf082bb4 +/* f035d14: 0fc20aed */ jal propobjSetDropped /* f035d18: 24050001 */ li $a1,0x1 /* f035d1c: 8e080014 */ lw $t0,0x14($s0) /* f035d20: 350a0001 */ ori $t2,$t0,0x1 /* f035d24: ae0a0014 */ sw $t2,0x14($s0) .PF0f035d28: /* f035d28: 02002025 */ move $a0,$s0 -/* f035d2c: 0fc0a252 */ jal 0xf028948 +/* f035d2c: 0fc0a252 */ jal chrGetEquippedWeaponProp /* f035d30: 24050001 */ li $a1,0x1 /* f035d34: 10400007 */ beqz $v0,.PF0f035d54 /* f035d38: 00402025 */ move $a0,$v0 /* f035d3c: ae020300 */ sw $v0,0x300($s0) -/* f035d40: 0fc20aed */ jal 0xf082bb4 +/* f035d40: 0fc20aed */ jal propobjSetDropped /* f035d44: 24050001 */ li $a1,0x1 /* f035d48: 8e0b0014 */ lw $t3,0x14($s0) /* f035d4c: 356e0001 */ ori $t6,$t3,0x1 @@ -10924,7 +10924,7 @@ glabel var7f1a8d98 /* f035dbc: 24010004 */ li $at,0x4 /* f035dc0: 11010018 */ beq $t0,$at,.PF0f035e24 /* f035dc4: 8fa4014c */ lw $a0,0x14c($sp) -/* f035dc8: 0fc2c8e8 */ jal 0xf0b23a0 +/* f035dc8: 0fc2c8e8 */ jal handHasFunctionFlags /* f035dcc: 3c050020 */ lui $a1,0x20 /* f035dd0: 10400006 */ beqz $v0,.PF0f035dec /* f035dd4: 00000000 */ nop @@ -10934,7 +10934,7 @@ glabel var7f1a8d98 /* f035de4: 1000000f */ b .PF0f035e24 /* f035de8: ae0b0014 */ sw $t3,0x14($s0) .PF0f035dec: -/* f035dec: 0fc0cde6 */ jal 0xf033798 +/* f035dec: 0fc0cde6 */ jal func0f033654 /* f035df0: 8fa4014c */ lw $a0,0x14c($sp) /* f035df4: 860e02d8 */ lh $t6,0x2d8($s0) /* f035df8: 8e0f02d4 */ lw $t7,0x2d4($s0) @@ -11009,17 +11009,17 @@ glabel var7f1a8d98 /* f035eec: 02002025 */ move $a0,$s0 /* f035ef0: 8fa50098 */ lw $a1,0x98($sp) /* f035ef4: 8fa60154 */ lw $a2,0x154($sp) -/* f035ef8: 0fc0cdfb */ jal 0xf0337ec +/* f035ef8: 0fc0cdfb */ jal func0f0336a8 /* f035efc: 8fa7014c */ lw $a3,0x14c($sp) /* f035f00: 8e04001c */ lw $a0,0x1c($s0) /* f035f04: 24050009 */ li $a1,0x9 -/* f035f08: 0fc2496f */ jal 0xf0925bc +/* f035f08: 0fc2496f */ jal func0f0926bc /* f035f0c: 00003025 */ move $a2,$zero /* f035f10: 8fb900f4 */ lw $t9,0xf4($sp) /* f035f14: 02002025 */ move $a0,$s0 /* f035f18: 53200004 */ beqzl $t9,.PF0f035f2c /* f035f1c: 8fa9014c */ lw $t1,0x14c($sp) -/* f035f20: 0fc0ce92 */ jal 0xf033a48 +/* f035f20: 0fc0ce92 */ jal func0f0338e0 /* f035f24: 8fa500ec */ lw $a1,0xec($sp) /* f035f28: 8fa9014c */ lw $t1,0x14c($sp) .PF0f035f2c: @@ -11067,7 +11067,7 @@ glabel var7f1a8d98 /* f035fbc: 02202025 */ move $a0,$s1 /* f035fc0: 8fa50128 */ lw $a1,0x128($sp) /* f035fc4: 44061000 */ mfc1 $a2,$f2 -/* f035fc8: 0fc0d17a */ jal 0xf0345e8 +/* f035fc8: 0fc0d17a */ jal playerUpdateDamageStats /* f035fcc: 00000000 */ nop /* f035fd0: c60a0100 */ lwc1 $f10,0x100($s0) /* f035fd4: 3c09800a */ lui $t1,0x800a @@ -11100,10 +11100,10 @@ glabel var7f1a8d98 .PF0f036038: /* f036038: 11600003 */ beqz $t3,.PF0f036048 /* f03603c: 00000000 */ nop -/* f036040: 0fc0ce92 */ jal 0xf033a48 +/* f036040: 0fc0ce92 */ jal func0f0338e0 /* f036044: 8fa500ec */ lw $a1,0xec($sp) .PF0f036048: -/* f036048: 0fc0851e */ jal 0xf021478 +/* f036048: 0fc0851e */ jal func0f02133c /* f03604c: 02002025 */ move $a0,$s0 /* f036050: c6040100 */ lwc1 $f4,0x100($s0) /* f036054: c6120104 */ lwc1 $f18,0x104($s0) @@ -11112,7 +11112,7 @@ glabel var7f1a8d98 /* f036060: 00000000 */ nop /* f036064: 450200e6 */ bc1fl .PF0f036400 /* f036068: c7a00080 */ lwc1 $f0,0x80($sp) -/* f03606c: 0fc0d930 */ jal 0xf0364c0 +/* f03606c: 0fc0d930 */ jal chrDie /* f036070: 8fa500f0 */ lw $a1,0xf0($sp) /* f036074: 100000e2 */ b .PF0f036400 /* f036078: c7a00080 */ lwc1 $f0,0x80($sp) @@ -11145,31 +11145,31 @@ glabel var7f1a8d98 /* f0360dc: 8fb800f0 */ lw $t8,0xf0($sp) /* f0360e0: afa00014 */ sw $zero,0x14($sp) /* f0360e4: afaf0010 */ sw $t7,0x10($sp) -/* f0360e8: 0fc0c6bb */ jal 0xf031aec +/* f0360e8: 0fc0c6bb */ jal func0f0319a8 /* f0360ec: afb80018 */ sw $t8,0x18($sp) /* f0360f0: 10000006 */ b .PF0f03610c /* f0360f4: 8fad00f4 */ lw $t5,0xf4($sp) /* f0360f8: 02002025 */ move $a0,$s0 .PF0f0360fc: /* f0360fc: 8fa50174 */ lw $a1,0x174($sp) -/* f036100: 0fc0cce0 */ jal 0xf033380 +/* f036100: 0fc0cce0 */ jal func0f03323c /* f036104: 8fa60110 */ lw $a2,0x110($sp) /* f036108: 8fad00f4 */ lw $t5,0xf4($sp) .PF0f03610c: /* f03610c: 02002025 */ move $a0,$s0 /* f036110: 11a00003 */ beqz $t5,.PF0f036120 /* f036114: 00000000 */ nop -/* f036118: 0fc0ce92 */ jal 0xf033a48 +/* f036118: 0fc0ce92 */ jal func0f0338e0 /* f03611c: 8fa500ec */ lw $a1,0xec($sp) .PF0f036120: /* f036120: 3c19800a */ lui $t9,0x800a /* f036124: 8f39a824 */ lw $t9,-0x57dc($t9) /* f036128: 13200008 */ beqz $t9,.PF0f03614c /* f03612c: 00000000 */ nop -/* f036130: 0fc63831 */ jal 0xf18e0c4 +/* f036130: 0fc63831 */ jal mpPlayerGetIndex /* f036134: 02002025 */ move $a0,$s0 /* f036138: 8fa400f0 */ lw $a0,0xf0($sp) -/* f03613c: 0fc2c3ad */ jal 0xf0b0eb4 +/* f03613c: 0fc2c3ad */ jal mpstatsRecordDeath /* f036140: 00402825 */ move $a1,$v0 /* f036144: 10000013 */ b .PF0f036194 /* f036148: 8e0a0018 */ lw $t2,0x18($s0) @@ -11183,26 +11183,26 @@ glabel var7f1a8d98 /* f036164: 8e0a0018 */ lw $t2,0x18($s0) /* f036168: 8d08a79c */ lw $t0,-0x5864($t0) /* f03616c: 02202025 */ move $a0,$s1 -/* f036170: 0fc4a513 */ jal 0xf12944c +/* f036170: 0fc4a513 */ jal propGetPlayerNum /* f036174: afa80074 */ sw $t0,0x74($sp) -/* f036178: 0fc4a4ff */ jal 0xf1293fc +/* f036178: 0fc4a4ff */ jal setCurrentPlayerNum /* f03617c: 00402025 */ move $a0,$v0 -/* f036180: 0fc2c299 */ jal 0xf0b0a64 +/* f036180: 0fc2c299 */ jal mpstatsRecordPlayerKill /* f036184: 00000000 */ nop -/* f036188: 0fc4a4ff */ jal 0xf1293fc +/* f036188: 0fc4a4ff */ jal setCurrentPlayerNum /* f03618c: 8fa40074 */ lw $a0,0x74($sp) /* f036190: 8e0a0018 */ lw $t2,0x18($s0) .PF0f036194: /* f036194: 000a5ac0 */ sll $t3,$t2,0xb /* f036198: 05630004 */ bgezl $t3,.PF0f0361ac /* f03619c: 8e0202d4 */ lw $v0,0x2d4($s0) -/* f0361a0: 0fc2c281 */ jal 0xf0b0a04 +/* f0361a0: 0fc2c281 */ jal mpstatsIncrementTotalKillCount /* f0361a4: 00000000 */ nop /* f0361a8: 8e0202d4 */ lw $v0,0x2d4($s0) .PF0f0361ac: /* f0361ac: 14400004 */ bnez $v0,.PF0f0361c0 /* f0361b0: 00000000 */ nop -/* f0361b4: 0fc09192 */ jal 0xf024648 +/* f0361b4: 0fc09192 */ jal chrDropItems /* f0361b8: 02002025 */ move $a0,$s0 /* f0361bc: 8e0202d4 */ lw $v0,0x2d4($s0) .PF0f0361c0: @@ -11216,7 +11216,7 @@ glabel var7f1a8d98 /* f0361dc: 318f2000 */ andi $t7,$t4,0x2000 /* f0361e0: 55e00007 */ bnezl $t7,.PF0f036200 /* f0361e4: 8e040174 */ lw $a0,0x174($s0) -/* f0361e8: 0fc20aed */ jal 0xf082bb4 +/* f0361e8: 0fc20aed */ jal propobjSetDropped /* f0361ec: 24050001 */ li $a1,0x1 /* f0361f0: 8e180014 */ lw $t8,0x14($s0) /* f0361f4: 370d0001 */ ori $t5,$t8,0x1 @@ -11230,7 +11230,7 @@ glabel var7f1a8d98 /* f036210: 31282000 */ andi $t0,$t1,0x2000 /* f036214: 5500007a */ bnezl $t0,.PF0f036400 /* f036218: c7a00080 */ lwc1 $f0,0x80($sp) -/* f03621c: 0fc20aed */ jal 0xf082bb4 +/* f03621c: 0fc20aed */ jal propobjSetDropped /* f036220: 24050001 */ li $a1,0x1 /* f036224: 8e0a0014 */ lw $t2,0x14($s0) /* f036228: 354b0001 */ ori $t3,$t2,0x1 @@ -11244,7 +11244,7 @@ glabel var7f1a8d98 /* f036244: 8faf0130 */ lw $t7,0x130($sp) /* f036248: 11800003 */ beqz $t4,.PF0f036258 /* f03624c: 02002025 */ move $a0,$s0 -/* f036250: 0fc0ce92 */ jal 0xf033a48 +/* f036250: 0fc0ce92 */ jal func0f0338e0 /* f036254: 8fa500ec */ lw $a1,0xec($sp) .PF0f036258: /* f036258: 8faf0130 */ lw $t7,0x130($sp) @@ -11264,7 +11264,7 @@ glabel var7f1a8d98 /* f03628c: e6120100 */ swc1 $f18,0x100($s0) /* f036290: 8fa7014c */ lw $a3,0x14c($sp) /* f036294: 8fa60154 */ lw $a2,0x154($sp) -/* f036298: 0fc0cdfb */ jal 0xf0337ec +/* f036298: 0fc0cdfb */ jal func0f0336a8 /* f03629c: 8fa50098 */ lw $a1,0x98($sp) /* f0362a0: c6060100 */ lwc1 $f6,0x100($s0) .PF0f0362a4: @@ -11274,7 +11274,7 @@ glabel var7f1a8d98 /* f0362b0: 00000000 */ nop /* f0362b4: 4503000b */ bc1tl .PF0f0362e4 /* f0362b8: 3c01bf80 */ lui $at,0xbf80 -/* f0362bc: 0fc2c8e8 */ jal 0xf0b23a0 +/* f0362bc: 0fc2c8e8 */ jal handHasFunctionFlags /* f0362c0: 3c050001 */ lui $a1,0x1 /* f0362c4: 10400012 */ beqz $v0,.PF0f036310 /* f0362c8: 8fb80154 */ lw $t8,0x154($sp) @@ -11288,11 +11288,11 @@ glabel var7f1a8d98 /* f0362e4: 44812000 */ mtc1 $at,$f4 /* f0362e8: 02002025 */ move $a0,$s0 /* f0362ec: 27a50070 */ addiu $a1,$sp,0x70 -/* f0362f0: 0fc0ce24 */ jal 0xf033890 +/* f0362f0: 0fc0ce24 */ jal func0f033728 /* f0362f4: e7a40070 */ swc1 $f4,0x70($sp) /* f0362f8: 54400041 */ bnezl $v0,.PF0f036400 /* f0362fc: c7a00080 */ lwc1 $f0,0x80($sp) -/* f036300: 0fc0851e */ jal 0xf021478 +/* f036300: 0fc0851e */ jal func0f02133c /* f036304: 02002025 */ move $a0,$s0 /* f036308: 1000003d */ b .PF0f036400 /* f03630c: c7a00080 */ lwc1 $f0,0x80($sp) @@ -11303,7 +11303,7 @@ glabel var7f1a8d98 /* f03631c: 3c01bf80 */ lui $at,0xbf80 /* f036320: 44819000 */ mtc1 $at,$f18 /* f036324: 27a5006c */ addiu $a1,$sp,0x6c -/* f036328: 0fc0ce24 */ jal 0xf033890 +/* f036328: 0fc0ce24 */ jal func0f033728 /* f03632c: e7b2006c */ swc1 $f18,0x6c($sp) /* f036330: 1040002a */ beqz $v0,.PF0f0363dc /* f036334: 02002025 */ move $a0,$s0 @@ -11315,7 +11315,7 @@ glabel var7f1a8d98 /* f03634c: 45020005 */ bc1fl .PF0f036364 /* f036350: 240d0007 */ li $t5,0x7 /* f036354: 44053000 */ mfc1 $a1,$f6 -/* f036358: 0c0076fb */ jal 0x1dbec +/* f036358: 0c0076fb */ jal modelSetAnimEndFrame /* f03635c: 8e040020 */ lw $a0,0x20($s0) /* f036360: 240d0007 */ li $t5,0x7 .PF0f036364: @@ -11356,7 +11356,7 @@ glabel var7f1a8d98 /* f0363e8: 8fa60098 */ lw $a2,0x98($sp) /* f0363ec: 8fa70154 */ lw $a3,0x154($sp) /* f0363f0: afaa0010 */ sw $t2,0x10($sp) -/* f0363f4: 0fc0cc4a */ jal 0xf033128 +/* f0363f4: 0fc0cc4a */ jal func0f032fe4 /* f0363f8: afab0014 */ sw $t3,0x14($sp) .PF0f0363fc: /* f0363fc: c7a00080 */ lwc1 $f0,0x80($sp) @@ -11389,7 +11389,7 @@ glabel var7f1a8d98 /* f036464: c6320010 */ lwc1 $f18,0x10($s1) /* f036468: c5e40010 */ lwc1 $f4,0x10($t7) /* f03646c: 46122281 */ sub.s $f10,$f4,$f18 -/* f036470: 0c0011d8 */ jal 0x4760 +/* f036470: 0c0011d8 */ jal guNormalize /* f036474: e60a02f8 */ swc1 $f10,0x2f8($s0) /* f036478: c60602f0 */ lwc1 $f6,0x2f0($s0) /* f03647c: c7a80080 */ lwc1 $f8,0x80($sp) @@ -21984,14 +21984,14 @@ glabel var7f1a9184 /* f040688: 24020001 */ li $v0,0x1 /* f04068c: a3a2026f */ sb $v0,0x26f($sp) .PF0f040690: -/* f040690: 0fc0a252 */ jal 0xf028948 +/* f040690: 0fc0a252 */ jal chrGetEquippedWeaponProp /* f040694: afa40278 */ sw $a0,0x278($sp) /* f040698: 5040055c */ beqzl $v0,.PF0f041c0c /* f04069c: 8fbf0044 */ lw $ra,0x44($sp) /* f0406a0: afa00268 */ sw $zero,0x268($sp) /* f0406a4: 8c590004 */ lw $t9,0x4($v0) /* f0406a8: 8fa40278 */ lw $a0,0x278($sp) -/* f0406ac: 0fc0a26a */ jal 0xf0289a8 +/* f0406ac: 0fc0a26a */ jal chrGetTargetProp /* f0406b0: afb90264 */ sw $t9,0x264($sp) /* f0406b4: 8fab0264 */ lw $t3,0x264($sp) /* f0406b8: afa2025c */ sw $v0,0x25c($sp) @@ -22020,7 +22020,7 @@ glabel var7f1a9184 /* f04070c: 93a40260 */ lbu $a0,0x260($sp) /* f040710: 93a50263 */ lbu $a1,0x263($sp) /* f040714: afa00254 */ sw $zero,0x254($sp) -/* f040718: 0fc2c8f8 */ jal 0xf0b23e0 +/* f040718: 0fc2c8f8 */ jal weaponGetMaxFireRatePerTick /* f04071c: afa80258 */ sw $t0,0x258($sp) /* f040720: 8fa60254 */ lw $a2,0x254($sp) /* f040724: 1c400005 */ bgtz $v0,.PF0f04073c @@ -22109,7 +22109,7 @@ glabel var7f1a9184 /* f04085c: 1541000b */ bne $t2,$at,.PF0f04088c /* f040860: 00000000 */ nop /* f040864: 8de40020 */ lw $a0,0x20($t7) -/* f040868: 0c0073c3 */ jal 0x1cf0c +/* f040868: 0c0073c3 */ jal modelGetAnimNum /* f04086c: afa60254 */ sw $a2,0x254($sp) /* f040870: 2401026a */ li $at,0x26a /* f040874: 14410005 */ bne $v0,$at,.PF0f04088c @@ -22121,10 +22121,10 @@ glabel var7f1a9184 .PF0f04088c: /* f04088c: 50c004a3 */ beqzl $a2,.PF0f041b1c /* f040890: 8fa80268 */ lw $t0,0x268($sp) -/* f040894: 0fc0f9dd */ jal 0xf03e774 +/* f040894: 0fc0f9dd */ jal func0f03e5f0 /* f040898: 8fa40278 */ lw $a0,0x278($sp) /* f04089c: e7a00204 */ swc1 $f0,0x204($sp) -/* f0408a0: 0fc0fa36 */ jal 0xf03e8d8 +/* f0408a0: 0fc0fa36 */ jal func0f03e754 /* f0408a4: 8fa40278 */ lw $a0,0x278($sp) /* f0408a8: 93ab026f */ lbu $t3,0x26f($sp) /* f0408ac: e7a00200 */ swc1 $f0,0x200($sp) @@ -22139,7 +22139,7 @@ glabel var7f1a9184 .PF0f0408cc: /* f0408cc: afae0268 */ sw $t6,0x268($sp) /* f0408d0: 8fa40278 */ lw $a0,0x278($sp) -/* f0408d4: 0fc0ffda */ jal 0xf03ff68 +/* f0408d4: 0fc0ffda */ jal func0f03fde4 /* f0408d8: 8fa5027c */ lw $a1,0x27c($sp) /* f0408dc: 54400032 */ bnezl $v0,.PF0f0409a8 /* f0408e0: 8fa40278 */ lw $a0,0x278($sp) @@ -22156,7 +22156,7 @@ glabel var7f1a9184 /* f04090c: c4460010 */ lwc1 $f6,0x10($v0) /* f040910: 15410013 */ bne $t2,$at,.PF0f040960 /* f040914: e7a6024c */ swc1 $f6,0x24c($sp) -/* f040918: 0c006858 */ jal 0x1a160 +/* f040918: 0c006858 */ jal cosf /* f04091c: c7ac0204 */ lwc1 $f12,0x204($sp) /* f040920: 3c014120 */ lui $at,0x4120 /* f040924: 44815000 */ mtc1 $at,$f10 @@ -22164,7 +22164,7 @@ glabel var7f1a9184 /* f04092c: c7ac0204 */ lwc1 $f12,0x204($sp) /* f040930: 460a0482 */ mul.s $f18,$f0,$f10 /* f040934: 46124400 */ add.s $f16,$f8,$f18 -/* f040938: 0c00685b */ jal 0x1a16c +/* f040938: 0c00685b */ jal sinf /* f04093c: e7b00244 */ swc1 $f16,0x244($sp) /* f040940: 3c014120 */ lui $at,0x4120 /* f040944: 44813000 */ mtc1 $at,$f6 @@ -22175,7 +22175,7 @@ glabel var7f1a9184 /* f040958: 10000012 */ b .PF0f0409a4 /* f04095c: e7b2024c */ swc1 $f18,0x24c($sp) .PF0f040960: -/* f040960: 0c006858 */ jal 0x1a160 +/* f040960: 0c006858 */ jal cosf /* f040964: c7ac0204 */ lwc1 $f12,0x204($sp) /* f040968: 3c014120 */ lui $at,0x4120 /* f04096c: 44812000 */ mtc1 $at,$f4 @@ -22184,7 +22184,7 @@ glabel var7f1a9184 /* f040978: 46048182 */ mul.s $f6,$f16,$f4 /* f04097c: c7ac0204 */ lwc1 $f12,0x204($sp) /* f040980: 46064280 */ add.s $f10,$f8,$f6 -/* f040984: 0c00685b */ jal 0x1a16c +/* f040984: 0c00685b */ jal sinf /* f040988: e7aa0244 */ swc1 $f10,0x244($sp) /* f04098c: 3c014120 */ lui $at,0x4120 /* f040990: 44818000 */ mtc1 $at,$f16 @@ -22195,7 +22195,7 @@ glabel var7f1a9184 .PF0f0409a4: /* f0409a4: 8fa40278 */ lw $a0,0x278($sp) .PF0f0409a8: -/* f0409a8: 0fc07a37 */ jal 0xf01e8dc +/* f0409a8: 0fc07a37 */ jal chrSetOrUnsetHiddenFlag00000100 /* f0409ac: 00002825 */ move $a1,$zero /* f0409b0: 8fb801fc */ lw $t8,0x1fc($sp) /* f0409b4: 8faf0274 */ lw $t7,0x274($sp) @@ -22206,13 +22206,13 @@ glabel var7f1a9184 /* f0409c8: 27a60244 */ addiu $a2,$sp,0x244 /* f0409cc: 27a70234 */ addiu $a3,$sp,0x234 /* f0409d0: 25e40008 */ addiu $a0,$t7,0x8 -/* f0409d4: 0c00b5cd */ jal 0x2d734 +/* f0409d4: 0c00b5cd */ jal func0002de34 /* f0409d8: 25e50028 */ addiu $a1,$t7,0x28 /* f0409dc: 14400002 */ bnez $v0,.PF0f0409e8 /* f0409e0: 24050001 */ li $a1,0x1 /* f0409e4: afa00268 */ sw $zero,0x268($sp) .PF0f0409e8: -/* f0409e8: 0fc07a37 */ jal 0xf01e8dc +/* f0409e8: 0fc07a37 */ jal chrSetOrUnsetHiddenFlag00000100 /* f0409ec: 8fa40278 */ lw $a0,0x278($sp) /* f0409f0: 8fab0268 */ lw $t3,0x268($sp) /* f0409f4: 240d0001 */ li $t5,0x1 @@ -22244,7 +22244,7 @@ glabel var7f1a9184 /* f040a50: 1040000f */ beqz $v0,.PF0f040a90 /* f040a54: 00401825 */ move $v1,$v0 /* f040a58: afa2005c */ sw $v0,0x5c($sp) -/* f040a5c: 0fc124d8 */ jal 0xf049360 +/* f040a5c: 0fc124d8 */ jal chrGetDistanceToTarget /* f040a60: 8fa40278 */ lw $a0,0x278($sp) /* f040a64: 3c014316 */ lui $at,0x4316 /* f040a68: 44813000 */ mtc1 $at,$f6 @@ -22276,36 +22276,36 @@ glabel var7f1a9184 /* f040ac8: e7a601e4 */ swc1 $f6,0x1e4($sp) /* f040acc: c4ea0010 */ lwc1 $f10,0x10($a3) /* f040ad0: 46105481 */ sub.s $f18,$f10,$f16 -/* f040ad4: 0c0011d8 */ jal 0x4760 +/* f040ad4: 0c0011d8 */ jal guNormalize /* f040ad8: e7b201e8 */ swc1 $f18,0x1e8($sp) /* f040adc: 8fa4025c */ lw $a0,0x25c($sp) -/* f040ae0: 0fc19102 */ jal 0xf064408 +/* f040ae0: 0fc19102 */ jal propSetCollisionsEnabled /* f040ae4: 24050001 */ li $a1,0x1 /* f040ae8: 1000002f */ b .PF0f040ba8 /* f040aec: 8fab0278 */ lw $t3,0x278($sp) .PF0f040af0: -/* f040af0: 0c006858 */ jal 0x1a160 +/* f040af0: 0c006858 */ jal cosf /* f040af4: c7ac0200 */ lwc1 $f12,0x200($sp) /* f040af8: e7a00060 */ swc1 $f0,0x60($sp) -/* f040afc: 0c00685b */ jal 0x1a16c +/* f040afc: 0c00685b */ jal sinf /* f040b00: c7ac0204 */ lwc1 $f12,0x204($sp) /* f040b04: c7a40060 */ lwc1 $f4,0x60($sp) /* f040b08: c7ac0200 */ lwc1 $f12,0x200($sp) /* f040b0c: 46040202 */ mul.s $f8,$f0,$f4 -/* f040b10: 0c00685b */ jal 0x1a16c +/* f040b10: 0c00685b */ jal sinf /* f040b14: e7a801e0 */ swc1 $f8,0x1e0($sp) /* f040b18: e7a001e4 */ swc1 $f0,0x1e4($sp) -/* f040b1c: 0c006858 */ jal 0x1a160 +/* f040b1c: 0c006858 */ jal cosf /* f040b20: c7ac0200 */ lwc1 $f12,0x200($sp) /* f040b24: e7a00060 */ swc1 $f0,0x60($sp) -/* f040b28: 0c006858 */ jal 0x1a160 +/* f040b28: 0c006858 */ jal cosf /* f040b2c: c7ac0204 */ lwc1 $f12,0x204($sp) /* f040b30: c7a60060 */ lwc1 $f6,0x60($sp) /* f040b34: 93ac026f */ lbu $t4,0x26f($sp) /* f040b38: 46060282 */ mul.s $f10,$f0,$f6 /* f040b3c: 11800019 */ beqz $t4,.PF0f040ba4 /* f040b40: e7aa01e8 */ swc1 $f10,0x1e8($sp) -/* f040b44: 0fc6492c */ jal 0xf1924b0 +/* f040b44: 0fc6492c */ jal chrGuessCrouchPos /* f040b48: 8fa40278 */ lw $a0,0x278($sp) /* f040b4c: 8fb90278 */ lw $t9,0x278($sp) /* f040b50: 00404825 */ move $t1,$v0 @@ -22328,7 +22328,7 @@ glabel var7f1a9184 /* f040b90: 00065080 */ sll $t2,$a2,0x2 /* f040b94: 000a37c2 */ srl $a2,$t2,0x1f /* f040b98: afa80014 */ sw $t0,0x14($sp) -/* f040b9c: 0fc284b4 */ jal 0xf0a12d0 +/* f040b9c: 0fc284b4 */ jal func0f0a0fac /* f040ba0: afa90010 */ sw $t1,0x10($sp) .PF0f040ba4: /* f040ba4: 8fab0278 */ lw $t3,0x278($sp) @@ -22347,12 +22347,12 @@ glabel var7f1a9184 /* f040bd4: 00002825 */ move $a1,$zero /* f040bd8: afae0250 */ sw $t6,0x250($sp) /* f040bdc: 27a601e0 */ addiu $a2,$sp,0x1e0 -/* f040be0: 0fc66c21 */ jal 0xf19b084 +/* f040be0: 0fc66c21 */ jal aibotDoFarsightThing /* f040be4: 27a70244 */ addiu $a3,$sp,0x244 /* f040be8: 24010002 */ li $at,0x2 /* f040bec: 5441000a */ bnel $v0,$at,.PF0f040c18 /* f040bf0: 3c014780 */ lui $at,0x4780 -/* f040bf4: 0c004ad4 */ jal 0x12b50 +/* f040bf4: 0c004ad4 */ jal random /* f040bf8: 00000000 */ nop /* f040bfc: 240100ff */ li $at,0xff /* f040c00: 0041001b */ divu $zero,$v0,$at @@ -22380,7 +22380,7 @@ glabel var7f1a9184 /* f040c50: 46002202 */ mul.s $f8,$f4,$f0 /* f040c54: e7b2022c */ swc1 $f18,0x22c($sp) /* f040c58: 46064280 */ add.s $f10,$f8,$f6 -/* f040c5c: 0fc07a37 */ jal 0xf01e8dc +/* f040c5c: 0fc07a37 */ jal chrSetOrUnsetHiddenFlag00000100 /* f040c60: e7aa0230 */ swc1 $f10,0x230($sp) /* f040c64: 93b8026f */ lbu $t8,0x26f($sp) /* f040c68: 27a40244 */ addiu $a0,$sp,0x244 @@ -22393,7 +22393,7 @@ glabel var7f1a9184 .PF0f040c84: /* f040c84: 24190010 */ li $t9,0x10 /* f040c88: afb90010 */ sw $t9,0x10($sp) -/* f040c8c: 0c00b5a4 */ jal 0x2d690 +/* f040c8c: 0c00b5a4 */ jal cdTestAToB4 /* f040c90: 8fa701c8 */ lw $a3,0x1c8($sp) /* f040c94: 1440000a */ bnez $v0,.PF0f040cc0 /* f040c98: 240d0001 */ li $t5,0x1 @@ -22401,14 +22401,14 @@ glabel var7f1a9184 /* f040ca0: afad0224 */ sw $t5,0x224($sp) /* f040ca4: 24c69d20 */ addiu $a2,$a2,-25312 /* f040ca8: 27a40228 */ addiu $a0,$sp,0x228 -/* f040cac: 0c0091ef */ jal 0x247bc +/* f040cac: 0c0091ef */ jal cdGetPos /* f040cb0: 24052f2d */ li $a1,0x2f2d -/* f040cb4: 0c0091ec */ jal 0x247b0 +/* f040cb4: 0c0091ec */ jal cdGetObstacle /* f040cb8: 00000000 */ nop /* f040cbc: afa201cc */ sw $v0,0x1cc($sp) .PF0f040cc0: /* f040cc0: 8fa40278 */ lw $a0,0x278($sp) -/* f040cc4: 0fc07a37 */ jal 0xf01e8dc +/* f040cc4: 0fc07a37 */ jal chrSetOrUnsetHiddenFlag00000100 /* f040cc8: 24050001 */ li $a1,0x1 /* f040ccc: 93ae026f */ lbu $t6,0x26f($sp) /* f040cd0: 3c01800a */ lui $at,0x800a @@ -22422,7 +22422,7 @@ glabel var7f1a9184 /* f040cec: c7a80228 */ lwc1 $f8,0x228($sp) /* f040cf0: 51400013 */ beqzl $t2,.PF0f040d40 /* f040cf4: c7a80228 */ lwc1 $f8,0x228($sp) -/* f040cf8: 0c004ad4 */ jal 0x12b50 +/* f040cf8: 0c004ad4 */ jal random /* f040cfc: 00000000 */ nop /* f040d00: 24010064 */ li $at,0x64 /* f040d04: 0041001b */ divu $zero,$v0,$at @@ -22486,7 +22486,7 @@ glabel var7f1a9184 /* f040ddc: 4502016c */ bc1fl .PF0f041390 /* f040de0: afa00268 */ sw $zero,0x268($sp) .PF0f040de4: -/* f040de4: 0fc2c524 */ jal 0xf0b1490 +/* f040de4: 0fc2c524 */ jal weaponFindById /* f040de8: 00000000 */ nop /* f040dec: 93ad0263 */ lbu $t5,0x263($sp) /* f040df0: 93a40260 */ lbu $a0,0x260($sp) @@ -22510,7 +22510,7 @@ glabel var7f1a9184 /* f040e34: 24050054 */ li $a1,0x54 /* f040e38: 8c640040 */ lw $a0,0x40($v1) .PF0f040e3c: -/* f040e3c: 0fc22deb */ jal 0xf08b7ac +/* f040e3c: 0fc22deb */ jal func0f08b880 /* f040e40: afa300d4 */ sw $v1,0xd4($sp) /* f040e44: 1000002e */ b .PF0f040f00 /* f040e48: afa201b8 */ sw $v0,0x1b8($sp) @@ -22520,7 +22520,7 @@ glabel var7f1a9184 /* f040e54: 24050056 */ li $a1,0x56 /* f040e58: 8c640040 */ lw $a0,0x40($v1) /* f040e5c: afa300d4 */ sw $v1,0xd4($sp) -/* f040e60: 0fc22deb */ jal 0xf08b7ac +/* f040e60: 0fc22deb */ jal func0f08b880 /* f040e64: 8fa60278 */ lw $a2,0x278($sp) /* f040e68: 10400025 */ beqz $v0,.PF0f040f00 /* f040e6c: afa201b8 */ sw $v0,0x1b8($sp) @@ -22533,7 +22533,7 @@ glabel var7f1a9184 /* f040e84: 24050055 */ li $a1,0x55 /* f040e88: 8c640040 */ lw $a0,0x40($v1) /* f040e8c: afa300d4 */ sw $v1,0xd4($sp) -/* f040e90: 0fc22deb */ jal 0xf08b7ac +/* f040e90: 0fc22deb */ jal func0f08b880 /* f040e94: 8fa60278 */ lw $a2,0x278($sp) /* f040e98: 10400019 */ beqz $v0,.PF0f040f00 /* f040e9c: afa201b8 */ sw $v0,0x1b8($sp) @@ -22547,7 +22547,7 @@ glabel var7f1a9184 /* f040eb8: 8c640040 */ lw $a0,0x40($v1) /* f040ebc: afa300d4 */ sw $v1,0xd4($sp) /* f040ec0: 24050055 */ li $a1,0x55 -/* f040ec4: 0fc22deb */ jal 0xf08b7ac +/* f040ec4: 0fc22deb */ jal func0f08b880 /* f040ec8: 8fa60278 */ lw $a2,0x278($sp) /* f040ecc: 1040000c */ beqz $v0,.PF0f040f00 /* f040ed0: afa201b8 */ sw $v0,0x1b8($sp) @@ -22560,7 +22560,7 @@ glabel var7f1a9184 /* f040ee8: 27a50260 */ addiu $a1,$sp,0x260 /* f040eec: 8dae00bc */ lw $t6,0xbc($t5) /* f040ef0: 8dc60004 */ lw $a2,0x4($t6) -/* f040ef4: 0fc22d61 */ jal 0xf08b584 +/* f040ef4: 0fc22d61 */ jal func0f08b658 /* f040ef8: afa300d4 */ sw $v1,0xd4($sp) /* f040efc: afa201b8 */ sw $v0,0x1b8($sp) .PF0f040f00: @@ -22588,7 +22588,7 @@ glabel var7f1a9184 /* f040f54: 46105482 */ mul.s $f18,$f10,$f16 /* f040f58: 13000080 */ beqz $t8,.PF0f04115c /* f040f5c: e7b200cc */ swc1 $f18,0xcc($sp) -/* f040f60: 0fc12480 */ jal 0xf049200 +/* f040f60: 0fc12480 */ jal chrIsTargetInFov /* f040f64: 00003025 */ move $a2,$zero /* f040f68: 1040007c */ beqz $v0,.PF0f04115c /* f040f6c: 00000000 */ nop @@ -22631,7 +22631,7 @@ glabel var7f1a9184 /* f040ff8: e7a600c0 */ swc1 $f6,0xc0($sp) /* f040ffc: 460a3401 */ sub.s $f16,$f6,$f10 /* f041000: e7a401e4 */ swc1 $f4,0x1e4($sp) -/* f041004: 0c0011d8 */ jal 0x4760 +/* f041004: 0c0011d8 */ jal guNormalize /* f041008: e7b001e8 */ swc1 $f16,0x1e8($sp) /* f04100c: 1000003b */ b .PF0f0410fc /* f041010: 24030001 */ li $v1,0x1 @@ -22667,7 +22667,7 @@ glabel var7f1a9184 /* f041074: c57200b4 */ lwc1 $f18,0xb4($t3) /* f041078: e7b200bc */ swc1 $f18,0xbc($sp) /* f04107c: c5440010 */ lwc1 $f4,0x10($t2) -/* f041080: 0fc10128 */ jal 0xf0404a0 +/* f041080: 0fc10128 */ jal func0f04031c /* f041084: e7a400c0 */ swc1 $f4,0xc0($sp) /* f041088: 1000001c */ b .PF0f0410fc /* f04108c: 24030001 */ li $v1,0x1 @@ -22699,19 +22699,19 @@ glabel var7f1a9184 /* f0410e8: 46085481 */ sub.s $f18,$f10,$f8 /* f0410ec: e7b200bc */ swc1 $f18,0xbc($sp) .PF0f0410f0: -/* f0410f0: 0fc10128 */ jal 0xf0404a0 +/* f0410f0: 0fc10128 */ jal func0f04031c /* f0410f4: 8fa500cc */ lw $a1,0xcc($sp) /* f0410f8: 24030001 */ li $v1,0x1 .PF0f0410fc: /* f0410fc: 10600017 */ beqz $v1,.PF0f04115c /* f041100: 8fa40278 */ lw $a0,0x278($sp) -/* f041104: 0fc12307 */ jal 0xf048c1c +/* f041104: 0fc12307 */ jal chrGetAngleToPos /* f041108: 27a500b8 */ addiu $a1,$sp,0xb8 /* f04110c: e7a000b4 */ swc1 $f0,0xb4($sp) -/* f041110: 0c006858 */ jal 0x1a160 +/* f041110: 0c006858 */ jal cosf /* f041114: 46000306 */ mov.s $f12,$f0 /* f041118: c7ac00b4 */ lwc1 $f12,0xb4($sp) -/* f04111c: 0c00685b */ jal 0x1a16c +/* f04111c: 0c00685b */ jal sinf /* f041120: e7a000b0 */ swc1 $f0,0xb0($sp) /* f041124: c7ac01e8 */ lwc1 $f12,0x1e8($sp) /* f041128: c7ae00b0 */ lwc1 $f14,0xb0($sp) @@ -22728,16 +22728,16 @@ glabel var7f1a9184 /* f041154: 46085481 */ sub.s $f18,$f10,$f8 /* f041158: e7b201e8 */ swc1 $f18,0x1e8($sp) .PF0f04115c: -/* f04115c: 0c0055d0 */ jal 0x15740 +/* f04115c: 0c0055d0 */ jal func000159b0 /* f041160: 27a40178 */ addiu $a0,$sp,0x178 /* f041164: c7ac0200 */ lwc1 $f12,0x200($sp) -/* f041168: 0c00581e */ jal 0x16078 +/* f041168: 0c00581e */ jal func000162e8 /* f04116c: 27a5011c */ addiu $a1,$sp,0x11c /* f041170: c7ac0204 */ lwc1 $f12,0x204($sp) -/* f041174: 0c005841 */ jal 0x16104 +/* f041174: 0c005841 */ jal func00016374 /* f041178: 27a500dc */ addiu $a1,$sp,0xdc /* f04117c: 27a400dc */ addiu $a0,$sp,0xdc -/* f041180: 0c00565c */ jal 0x15970 +/* f041180: 0c00565c */ jal func00015be0 /* f041184: 27a5011c */ addiu $a1,$sp,0x11c /* f041188: c7ac0168 */ lwc1 $f12,0x168($sp) /* f04118c: c7a401e0 */ lwc1 $f4,0x1e0($sp) @@ -22792,7 +22792,7 @@ glabel var7f1a9184 /* f04124c: afab0010 */ sw $t3,0x10($sp) /* f041250: afaa0014 */ sw $t2,0x14($sp) /* f041254: afa5001c */ sw $a1,0x1c($sp) -/* f041258: 0fc27bac */ jal 0xf09eeb0 +/* f041258: 0fc27bac */ jal func0f09ebcc /* f04125c: afaf0018 */ sw $t7,0x18($sp) /* f041260: 8fa301b8 */ lw $v1,0x1b8($sp) /* f041264: 8fad00d4 */ lw $t5,0xd4($sp) @@ -22842,7 +22842,7 @@ glabel var7f1a9184 /* f041308: c7060050 */ lwc1 $f6,0x50($t8) /* f04130c: 46043402 */ mul.s $f16,$f6,$f4 /* f041310: e5900098 */ swc1 $f16,0x98($t4) -/* f041314: 0fc0a26a */ jal 0xf0289a8 +/* f041314: 0fc0a26a */ jal chrGetTargetProp /* f041318: 8fa40278 */ lw $a0,0x278($sp) /* f04131c: 8fad01b8 */ lw $t5,0x1b8($sp) /* f041320: 3c01bf80 */ lui $at,0xbf80 @@ -22868,7 +22868,7 @@ glabel var7f1a9184 /* f041370: e7a00024 */ swc1 $f0,0x24($sp) /* f041374: e7a00030 */ swc1 $f0,0x30($sp) /* f041378: e7a00034 */ swc1 $f0,0x34($sp) -/* f04137c: 0fc24e3a */ jal 0xf0938e8 +/* f04137c: 0fc24e3a */ jal func0f0939f8 /* f041380: e7a00038 */ swc1 $f0,0x38($sp) /* f041384: 10000002 */ b .PF0f041390 /* f041388: 00000000 */ nop @@ -22917,13 +22917,13 @@ glabel var7f1a9184 /* f041428: 17210047 */ bne $t9,$at,.PF0f041548 /* f04142c: 27a50244 */ addiu $a1,$sp,0x244 /* f041430: 27a60234 */ addiu $a2,$sp,0x234 -/* f041434: 0fc0e4dc */ jal 0xf039370 +/* f041434: 0fc0e4dc */ jal chrCanSeeAttackTarget /* f041438: 00003825 */ move $a3,$zero /* f04143c: 10400042 */ beqz $v0,.PF0f041548 /* f041440: 8faf025c */ lw $t7,0x25c($sp) /* f041444: 8de40004 */ lw $a0,0x4($t7) /* f041448: 8fa50278 */ lw $a1,0x278($sp) -/* f04144c: 0fc12b09 */ jal 0xf04ac24 +/* f04144c: 0fc12b09 */ jal chrCompareTeams /* f041450: 24060002 */ li $a2,0x2 /* f041454: 1040003c */ beqz $v0,.PF0f041548 /* f041458: 3c014170 */ lui $at,0x4170 @@ -22961,7 +22961,7 @@ glabel var7f1a9184 /* f0414d8: 00000000 */ nop /* f0414dc: 4500002b */ bc1f .PF0f04158c /* f0414e0: 00000000 */ nop -/* f0414e4: 0fc0ff0d */ jal 0xf03fc34 +/* f0414e4: 0fc0ff0d */ jal func0f03fab0 /* f0414e8: 27a70260 */ addiu $a3,$sp,0x260 /* f0414ec: 8fac01f4 */ lw $t4,0x1f4($sp) /* f0414f0: 8fad01f8 */ lw $t5,0x1f8($sp) @@ -23012,7 +23012,7 @@ glabel var7f1a9184 /* f041590: 8faf01cc */ lw $t7,0x1cc($sp) /* f041594: 11c00065 */ beqz $t6,.PF0f04172c /* f041598: 00000000 */ nop -/* f04159c: 0fc2c87a */ jal 0xf0b21e8 +/* f04159c: 0fc2c87a */ jal handGetDamage /* f0415a0: 27a40260 */ addiu $a0,$sp,0x260 /* f0415a4: 8faa025c */ lw $t2,0x25c($sp) /* f0415a8: 240dffff */ li $t5,-1 @@ -23029,12 +23029,12 @@ glabel var7f1a9184 /* f0415d4: c544000c */ lwc1 $f4,0xc($t2) /* f0415d8: e7a4022c */ swc1 $f4,0x22c($sp) /* f0415dc: c54a0010 */ lwc1 $f10,0x10($t2) -/* f0415e0: 0c004ad4 */ jal 0x12b50 +/* f0415e0: 0c004ad4 */ jal random /* f0415e4: e7aa0230 */ swc1 $f10,0x230($sp) /* f0415e8: 304f0001 */ andi $t7,$v0,0x1 /* f0415ec: 11e00012 */ beqz $t7,.PF0f041638 /* f0415f0: 00000000 */ nop -/* f0415f4: 0c004ad4 */ jal 0x12b50 +/* f0415f4: 0c004ad4 */ jal random /* f0415f8: 00000000 */ nop /* f0415fc: 2401000a */ li $at,0xa /* f041600: 0041001b */ divu $zero,$v0,$at @@ -23053,7 +23053,7 @@ glabel var7f1a9184 /* f041630: 10000011 */ b .PF0f041678 /* f041634: e7a4022c */ swc1 $f4,0x22c($sp) .PF0f041638: -/* f041638: 0c004ad4 */ jal 0x12b50 +/* f041638: 0c004ad4 */ jal random /* f04163c: 00000000 */ nop /* f041640: 2401000a */ li $at,0xa /* f041644: 0041001b */ divu $zero,$v0,$at @@ -23073,13 +23073,13 @@ glabel var7f1a9184 .PF0f041678: /* f041678: 27a40260 */ addiu $a0,$sp,0x260 /* f04167c: 8fa5025c */ lw $a1,0x25c($sp) -/* f041680: 0fc2a079 */ jal 0xf0a81e4 +/* f041680: 0fc2a079 */ jal func0f0a7d98 /* f041684: 2406ffff */ li $a2,-1 /* f041688: 8fa40088 */ lw $a0,0x88($sp) /* f04168c: 8c8b0020 */ lw $t3,0x20($a0) /* f041690: 51600012 */ beqzl $t3,.PF0f0416dc /* f041694: 8fb80278 */ lw $t8,0x278($sp) -/* f041698: 0fc0d042 */ jal 0xf034108 +/* f041698: 0fc0d042 */ jal chrGetShield /* f04169c: 00000000 */ nop /* f0416a0: 44802000 */ mtc1 $zero,$f4 /* f0416a4: 8fa40088 */ lw $a0,0x88($sp) @@ -23093,7 +23093,7 @@ glabel var7f1a9184 /* f0416c4: 27af0090 */ addiu $t7,$sp,0x90 /* f0416c8: afaf0018 */ sw $t7,0x18($sp) /* f0416cc: afb90010 */ sw $t9,0x10($sp) -/* f0416d0: 0fc1002c */ jal 0xf0400b0 +/* f0416d0: 0fc1002c */ jal func0f03ff2c /* f0416d4: afaa0014 */ sw $t2,0x14($sp) .PF0f0416d8: /* f0416d8: 8fb80278 */ lw $t8,0x278($sp) @@ -23114,7 +23114,7 @@ glabel var7f1a9184 /* f041710: afab001c */ sw $t3,0x1c($sp) /* f041714: afac0010 */ sw $t4,0x10($sp) /* f041718: afb90020 */ sw $t9,0x20($sp) -/* f04171c: 0fc0d0d1 */ jal 0xf034344 +/* f04171c: 0fc0d0d1 */ jal func0f0341dc /* f041720: afaa0024 */ sw $t2,0x24($sp) /* f041724: 10000010 */ b .PF0f041768 /* f041728: 8fb801f0 */ lw $t8,0x1f0($sp) @@ -23160,7 +23160,7 @@ glabel var7f1a9184 /* f0417b4: 332a0040 */ andi $t2,$t9,0x40 /* f0417b8: 11400045 */ beqz $t2,.PF0f0418d0 /* f0417bc: 24060002 */ li $a2,0x2 -/* f0417c0: 0fc12b09 */ jal 0xf04ac24 +/* f0417c0: 0fc12b09 */ jal chrCompareTeams /* f0417c4: 8de40004 */ lw $a0,0x4($t7) /* f0417c8: 10400041 */ beqz $v0,.PF0f0418d0 .PF0f0417cc: @@ -23170,20 +23170,20 @@ glabel var7f1a9184 /* f0417d8: afa00080 */ sw $zero,0x80($sp) /* f0417dc: afb8007c */ sw $t8,0x7c($sp) /* f0417e0: afac0078 */ sw $t4,0x78($sp) -/* f0417e4: 0fc2c87a */ jal 0xf0b21e8 +/* f0417e4: 0fc2c87a */ jal handGetDamage /* f0417e8: 27a40260 */ addiu $a0,$sp,0x260 /* f0417ec: 8fa501cc */ lw $a1,0x1cc($sp) /* f0417f0: e7a00074 */ swc1 $f0,0x74($sp) /* f0417f4: 27a40260 */ addiu $a0,$sp,0x260 /* f0417f8: 8cad0004 */ lw $t5,0x4($a1) /* f0417fc: 2406ffff */ li $a2,-1 -/* f041800: 0fc2a079 */ jal 0xf0a81e4 +/* f041800: 0fc2a079 */ jal func0f0a7d98 /* f041804: afad0070 */ sw $t5,0x70($sp) /* f041808: 8fa40070 */ lw $a0,0x70($sp) /* f04180c: 8c990020 */ lw $t9,0x20($a0) /* f041810: 53200012 */ beqzl $t9,.PF0f04185c /* f041814: 8fac0278 */ lw $t4,0x278($sp) -/* f041818: 0fc0d042 */ jal 0xf034108 +/* f041818: 0fc0d042 */ jal chrGetShield /* f04181c: 00000000 */ nop /* f041820: 44805000 */ mtc1 $zero,$f10 /* f041824: 8fa40070 */ lw $a0,0x70($sp) @@ -23197,7 +23197,7 @@ glabel var7f1a9184 /* f041844: 27ab007c */ addiu $t3,$sp,0x7c /* f041848: afab0018 */ sw $t3,0x18($sp) /* f04184c: afaa0010 */ sw $t2,0x10($sp) -/* f041850: 0fc1002c */ jal 0xf0400b0 +/* f041850: 0fc1002c */ jal func0f03ff2c /* f041854: afaf0014 */ sw $t7,0x14($sp) .PF0f041858: /* f041858: 8fac0278 */ lw $t4,0x278($sp) @@ -23208,7 +23208,7 @@ glabel var7f1a9184 /* f041868: 8fa501cc */ lw $a1,0x1cc($sp) /* f04186c: 8fa60078 */ lw $a2,0x78($sp) /* f041870: 27a70228 */ addiu $a3,$sp,0x228 -/* f041874: 0fc097f2 */ jal 0xf025fc8 +/* f041874: 0fc097f2 */ jal chrEmitSparks /* f041878: afac0014 */ sw $t4,0x14($sp) /* f04187c: 8fad0278 */ lw $t5,0x278($sp) /* f041880: 8faa01cc */ lw $t2,0x1cc($sp) @@ -23227,7 +23227,7 @@ glabel var7f1a9184 /* f0418b4: afaf001c */ sw $t7,0x1c($sp) /* f0418b8: afae0010 */ sw $t6,0x10($sp) /* f0418bc: afab0020 */ sw $t3,0x20($sp) -/* f0418c0: 0fc0d0d1 */ jal 0xf034344 +/* f0418c0: 0fc0d0d1 */ jal func0f0341dc /* f0418c4: afb80024 */ sw $t8,0x24($sp) /* f0418c8: 1000006f */ b .PF0f041a88 /* f0418cc: 93ad0260 */ lbu $t5,0x260($sp) @@ -23251,22 +23251,22 @@ glabel var7f1a9184 /* f041908: afae0068 */ sw $t6,0x68($sp) /* f04190c: 13200004 */ beqz $t9,.PF0f041920 /* f041910: afad006c */ sw $t5,0x6c($sp) -/* f041914: 0fc63831 */ jal 0xf18e0c4 +/* f041914: 0fc63831 */ jal mpPlayerGetIndex /* f041918: 8fa40278 */ lw $a0,0x278($sp) /* f04191c: afa20068 */ sw $v0,0x68($sp) .PF0f041920: /* f041920: 27a40260 */ addiu $a0,$sp,0x260 /* f041924: 8fa501cc */ lw $a1,0x1cc($sp) -/* f041928: 0fc2a079 */ jal 0xf0a81e4 +/* f041928: 0fc2a079 */ jal func0f0a7d98 /* f04192c: 2406ffff */ li $a2,-1 /* f041930: 27a40244 */ addiu $a0,$sp,0x244 /* f041934: 27a50234 */ addiu $a1,$sp,0x234 /* f041938: 27a60228 */ addiu $a2,$sp,0x228 -/* f04193c: 0fc19841 */ jal 0xf066104 +/* f04193c: 0fc19841 */ jal func0f065e74 /* f041940: 27a70214 */ addiu $a3,$sp,0x214 /* f041944: 240a0001 */ li $t2,0x1 /* f041948: afaa0210 */ sw $t2,0x210($sp) -/* f04194c: 0fc4fc06 */ jal 0xf13f018 +/* f04194c: 0fc4fc06 */ jal chrIsUsingPaintball /* f041950: 8fa40278 */ lw $a0,0x278($sp) /* f041954: 1040000b */ beqz $v0,.PF0f041984 /* f041958: 87a40214 */ lh $a0,0x214($sp) @@ -23276,7 +23276,7 @@ glabel var7f1a9184 /* f041968: 8fa501cc */ lw $a1,0x1cc($sp) /* f04196c: 27a60228 */ addiu $a2,$sp,0x228 /* f041970: 00003825 */ move $a3,$zero -/* f041974: 0fc4c159 */ jal 0xf130564 +/* f041974: 0fc4c159 */ jal sparksCreate /* f041978: afa00010 */ sw $zero,0x10($sp) /* f04197c: 10000007 */ b .PF0f04199c /* f041980: 00000000 */ nop @@ -23285,7 +23285,7 @@ glabel var7f1a9184 /* f041988: 27a60228 */ addiu $a2,$sp,0x228 /* f04198c: 00003825 */ move $a3,$zero /* f041990: afa00010 */ sw $zero,0x10($sp) -/* f041994: 0fc4c159 */ jal 0xf130564 +/* f041994: 0fc4c159 */ jal sparksCreate /* f041998: afa00014 */ sw $zero,0x14($sp) .PF0f04199c: /* f04199c: 3c0b800a */ lui $t3,0x800a @@ -23303,14 +23303,14 @@ glabel var7f1a9184 /* f0419cc: 5540002e */ bnezl $t2,.PF0f041a88 /* f0419d0: 93ad0260 */ lbu $t5,0x260($sp) .PF0f0419d4: -/* f0419d4: 0fc2c87a */ jal 0xf0b21e8 +/* f0419d4: 0fc2c87a */ jal handGetDamage /* f0419d8: 27a40260 */ addiu $a0,$sp,0x260 /* f0419dc: 8faf0068 */ lw $t7,0x68($sp) /* f0419e0: 44050000 */ mfc1 $a1,$f0 /* f0419e4: 8fa4006c */ lw $a0,0x6c($sp) /* f0419e8: 27a60228 */ addiu $a2,$sp,0x228 /* f0419ec: 93a70260 */ lbu $a3,0x260($sp) -/* f0419f0: 0fc21530 */ jal 0xf0854c0 +/* f0419f0: 0fc21530 */ jal func0f085270 /* f0419f4: afaf0010 */ sw $t7,0x10($sp) /* f0419f8: 10000023 */ b .PF0f041a88 /* f0419fc: 93ad0260 */ lbu $t5,0x260($sp) @@ -23319,16 +23319,16 @@ glabel var7f1a9184 /* f041a04: 27a40244 */ addiu $a0,$sp,0x244 /* f041a08: 27a50234 */ addiu $a1,$sp,0x234 /* f041a0c: 27a60228 */ addiu $a2,$sp,0x228 -/* f041a10: 0fc19841 */ jal 0xf066104 +/* f041a10: 0fc19841 */ jal func0f065e74 /* f041a14: 27a70214 */ addiu $a3,$sp,0x214 /* f041a18: 24180001 */ li $t8,0x1 /* f041a1c: afb80210 */ sw $t8,0x210($sp) /* f041a20: 27a40260 */ addiu $a0,$sp,0x260 /* f041a24: 27a50228 */ addiu $a1,$sp,0x228 /* f041a28: 2406ffff */ li $a2,-1 -/* f041a2c: 0fc2a245 */ jal 0xf0a8914 +/* f041a2c: 0fc2a245 */ jal func0f0a84c8 /* f041a30: 27a70214 */ addiu $a3,$sp,0x214 -/* f041a34: 0fc4fc06 */ jal 0xf13f018 +/* f041a34: 0fc4fc06 */ jal chrIsUsingPaintball /* f041a38: 8fa40278 */ lw $a0,0x278($sp) /* f041a3c: 1040000b */ beqz $v0,.PF0f041a6c /* f041a40: 87a40214 */ lh $a0,0x214($sp) @@ -23338,7 +23338,7 @@ glabel var7f1a9184 /* f041a50: 00002825 */ move $a1,$zero /* f041a54: 27a60228 */ addiu $a2,$sp,0x228 /* f041a58: 00003825 */ move $a3,$zero -/* f041a5c: 0fc4c159 */ jal 0xf130564 +/* f041a5c: 0fc4c159 */ jal sparksCreate /* f041a60: afa00010 */ sw $zero,0x10($sp) /* f041a64: 10000008 */ b .PF0f041a88 /* f041a68: 93ad0260 */ lbu $t5,0x260($sp) @@ -23347,7 +23347,7 @@ glabel var7f1a9184 /* f041a70: 27a60228 */ addiu $a2,$sp,0x228 /* f041a74: 00003825 */ move $a3,$zero /* f041a78: afa00010 */ sw $zero,0x10($sp) -/* f041a7c: 0fc4c159 */ jal 0xf130564 +/* f041a7c: 0fc4c159 */ jal sparksCreate /* f041a80: afa00014 */ sw $zero,0x14($sp) .PF0f041a84: /* f041a84: 93ad0260 */ lbu $t5,0x260($sp) @@ -23362,7 +23362,7 @@ glabel var7f1a9184 /* f041aa4: 3c03800a */ lui $v1,0x800a /* f041aa8: 11400005 */ beqz $t2,.PF0f041ac0 /* f041aac: 00000000 */ nop -/* f041ab0: 0fc63831 */ jal 0xf18e0c4 +/* f041ab0: 0fc63831 */ jal mpPlayerGetIndex /* f041ab4: 03202025 */ move $a0,$t9 /* f041ab8: 10000002 */ b .PF0f041ac4 /* f041abc: 00401825 */ move $v1,$v0 @@ -23375,7 +23375,7 @@ glabel var7f1a9184 /* f041ad0: 15e00005 */ bnez $t7,.PF0f041ae8 /* f041ad4: 27a60228 */ addiu $a2,$sp,0x228 /* f041ad8: 27a70214 */ addiu $a3,$sp,0x214 -/* f041adc: 0fc19841 */ jal 0xf066104 +/* f041adc: 0fc19841 */ jal func0f065e74 /* f041ae0: afa30064 */ sw $v1,0x64($sp) /* f041ae4: 8fa30064 */ lw $v1,0x64($sp) .PF0f041ae8: @@ -23383,7 +23383,7 @@ glabel var7f1a9184 /* f041aec: 27a50228 */ addiu $a1,$sp,0x228 /* f041af0: 27a60214 */ addiu $a2,$sp,0x214 /* f041af4: 24070016 */ li $a3,0x16 -/* f041af8: 0fc4a8f4 */ jal 0xf12a3d0 +/* f041af8: 0fc4a8f4 */ jal explosionCreateSimple /* f041afc: afa30010 */ sw $v1,0x10($sp) .PF0f041b00: /* f041b00: 8fab01c0 */ lw $t3,0x1c0($sp) @@ -23391,7 +23391,7 @@ glabel var7f1a9184 /* f041b04: 8fa4025c */ lw $a0,0x25c($sp) /* f041b08: 51600004 */ beqzl $t3,.PF0f041b1c /* f041b0c: 8fa80268 */ lw $t0,0x268($sp) -/* f041b10: 0fc19102 */ jal 0xf064408 +/* f041b10: 0fc19102 */ jal propSetCollisionsEnabled /* f041b14: 00002825 */ move $a1,$zero /* f041b18: 8fa80268 */ lw $t0,0x268($sp) .PF0f041b1c: @@ -23428,7 +23428,7 @@ glabel var7f1a9184 /* f041b88: 8fa40278 */ lw $a0,0x278($sp) /* f041b8c: 8fa5027c */ lw $a1,0x27c($sp) /* f041b90: 8fa60268 */ lw $a2,0x268($sp) -/* f041b94: 0fc0f908 */ jal 0xf03e420 +/* f041b94: 0fc0f908 */ jal func0f03e29c /* f041b98: afa80054 */ sw $t0,0x54($sp) /* f041b9c: 93b8026f */ lbu $t8,0x26f($sp) /* f041ba0: 8fa80054 */ lw $t0,0x54($sp) @@ -23453,12 +23453,12 @@ glabel var7f1a9184 /* f041be8: 0006782b */ sltu $t7,$zero,$a2 /* f041bec: 01e03025 */ move $a2,$t7 .PF0f041bf0: -/* f041bf0: 0fc0fe73 */ jal 0xf03f9cc +/* f041bf0: 0fc0fe73 */ jal chrSetFiring /* f041bf4: 8fa5027c */ lw $a1,0x27c($sp) /* f041bf8: 10000004 */ b .PF0f041c0c /* f041bfc: 8fbf0044 */ lw $ra,0x44($sp) .PF0f041c00: -/* f041c00: 0fc0fe73 */ jal 0xf03f9cc +/* f041c00: 0fc0fe73 */ jal chrSetFiring /* f041c04: 8fa60268 */ lw $a2,0x268($sp) /* f041c08: 8fbf0044 */ lw $ra,0x44($sp) .PF0f041c0c: @@ -25304,10 +25304,10 @@ glabel var7f1aa3f4pf /* f04200c: f7b40018 */ sdc1 $f20,0x18($sp) /* f042010: 8c930020 */ lw $s3,0x20($a0) /* f042014: 00808025 */ move $s0,$a0 -/* f042018: 0c0073d3 */ jal 0x1cf4c +/* f042018: 0c0073d3 */ jal modelGetCurAnimFrame /* f04201c: 02602025 */ move $a0,$s3 /* f042020: 46000506 */ mov.s $f20,$f0 -/* f042024: 0c0073c3 */ jal 0x1cf0c +/* f042024: 0c0073c3 */ jal modelGetAnimNum /* f042028: 02602025 */ move $a0,$s3 /* f04202c: 24010269 */ li $at,0x269 /* f042030: 504101e2 */ beql $v0,$at,.PF0f0427bc @@ -25350,11 +25350,11 @@ glabel var7f1aa3f4pf .PF0f0420c4: /* f0420c4: 15200029 */ bnez $t1,.PF0f04216c /* f0420c8: 00000000 */ nop -/* f0420cc: 0fc1077a */ jal 0xf041de8 +/* f0420cc: 0fc1077a */ jal func0f041c44 /* f0420d0: 02002025 */ move $a0,$s0 /* f0420d4: 14400023 */ bnez $v0,.PF0f042164 /* f0420d8: 00000000 */ nop -/* f0420dc: 0c0073c3 */ jal 0x1cf0c +/* f0420dc: 0c0073c3 */ jal modelGetAnimNum /* f0420e0: 02602025 */ move $a0,$s3 /* f0420e4: 3c013f00 */ lui $at,0x3f00 /* f0420e8: 4481c000 */ mtc1 $at,$f24 @@ -25364,7 +25364,7 @@ glabel var7f1aa3f4pf /* f0420f8: 4405c000 */ mfc1 $a1,$f24 /* f0420fc: 34c6cccd */ ori $a2,$a2,0xcccd /* f042100: 01408825 */ move $s1,$t2 -/* f042104: 0fc0b89f */ jal 0xf02e27c +/* f042104: 0fc0b89f */ jal chrGetRangedSpeed /* f042108: 02002025 */ move $a0,$s0 /* f04210c: 8e6c0020 */ lw $t4,0x20($s3) /* f042110: 8e0d002c */ lw $t5,0x2c($s0) @@ -25377,7 +25377,7 @@ glabel var7f1aa3f4pf /* f04212c: e7a00010 */ swc1 $f0,0x10($sp) /* f042130: 01602825 */ move $a1,$t3 /* f042134: 02602025 */ move $a0,$s3 -/* f042138: 0c0076a7 */ jal 0x1da9c +/* f042138: 0c0076a7 */ jal modelSetAnimation /* f04213c: e7b00014 */ swc1 $f16,0x14($sp) /* f042140: 8e0f002c */ lw $t7,0x2c($s0) /* f042144: c5e00014 */ lwc1 $f0,0x14($t7) @@ -25386,32 +25386,32 @@ glabel var7f1aa3f4pf /* f042150: 45000004 */ bc1f .PF0f042164 /* f042154: 00000000 */ nop /* f042158: 44050000 */ mfc1 $a1,$f0 -/* f04215c: 0c0076fb */ jal 0x1dbec +/* f04215c: 0c0076fb */ jal modelSetAnimEndFrame /* f042160: 02602025 */ move $a0,$s3 .PF0f042164: /* f042164: 10000004 */ b .PF0f042178 /* f042168: 820e0034 */ lb $t6,0x34($s0) .PF0f04216c: -/* f04216c: 0fc107b7 */ jal 0xf041edc +/* f04216c: 0fc107b7 */ jal chrAttackAmountUpdateAnimation /* f042170: 02002025 */ move $a0,$s0 /* f042174: 820e0034 */ lb $t6,0x34($s0) .PF0f042178: /* f042178: 02602025 */ move $a0,$s3 /* f04217c: 25d80001 */ addiu $t8,$t6,0x1 -/* f042180: 0c0073d3 */ jal 0x1cf4c +/* f042180: 0c0073d3 */ jal modelGetCurAnimFrame /* f042184: a2180033 */ sb $t8,0x33($s0) /* f042188: 46000506 */ mov.s $f20,$f0 /* f04218c: 3c013f00 */ lui $at,0x3f00 .PF0f042190: /* f042190: 4481c000 */ mtc1 $at,$f24 /* f042194: 4480b000 */ mtc1 $zero,$f22 -/* f042198: 0c0073dc */ jal 0x1cf70 +/* f042198: 0c0073dc */ jal modelGetAnimEndFrame /* f04219c: 02602025 */ move $a0,$s3 /* f0421a0: 4614003e */ c.le.s $f0,$f20 /* f0421a4: 00000000 */ nop /* f0421a8: 45000080 */ bc1f .PF0f0423ac /* f0421ac: 00000000 */ nop -/* f0421b0: 0c0073c3 */ jal 0x1cf0c +/* f0421b0: 0c0073c3 */ jal modelGetAnimNum /* f0421b4: 02602025 */ move $a0,$s3 /* f0421b8: 2401026a */ li $at,0x26a /* f0421bc: 50410018 */ beql $v0,$at,.PF0f042220 @@ -25425,7 +25425,7 @@ glabel var7f1aa3f4pf /* f0421dc: 50200010 */ beqzl $at,.PF0f042220 /* f0421e0: 82020033 */ lb $v0,0x33($s0) .PF0f0421e4: -/* f0421e4: 0fc1077a */ jal 0xf041de8 +/* f0421e4: 0fc1077a */ jal func0f041c44 /* f0421e8: 02002025 */ move $a0,$s0 /* f0421ec: 1440006c */ bnez $v0,.PF0f0423a0 /* f0421f0: 00000000 */ nop @@ -25433,10 +25433,10 @@ glabel var7f1aa3f4pf /* f0421f8: 314b0200 */ andi $t3,$t2,0x200 /* f0421fc: 11600003 */ beqz $t3,.PF0f04220c /* f042200: 00000000 */ nop -/* f042204: 0fc0e5cc */ jal 0xf039730 +/* f042204: 0fc0e5cc */ jal chrRecordLastSeeTargetTime /* f042208: 02002025 */ move $a0,$s0 .PF0f04220c: -/* f04220c: 0fc0bb9f */ jal 0xf02ee7c +/* f04220c: 0fc0bb9f */ jal chrStop /* f042210: 02002025 */ move $a0,$s0 /* f042214: 10000169 */ b .PF0f0427bc /* f042218: 8fbf0044 */ lw $ra,0x44($sp) @@ -25447,7 +25447,7 @@ glabel var7f1aa3f4pf /* f042228: 244d0001 */ addiu $t5,$v0,0x1 /* f04222c: 55820006 */ bnel $t4,$v0,.PF0f042248 /* f042230: 820f0031 */ lb $t7,0x31($s0) -/* f042234: 0fc107b7 */ jal 0xf041edc +/* f042234: 0fc107b7 */ jal chrAttackAmountUpdateAnimation /* f042238: a20d0033 */ sb $t5,0x33($s0) /* f04223c: 10000058 */ b .PF0f0423a0 /* f042240: 00000000 */ nop @@ -25527,7 +25527,7 @@ glabel var7f1aa3f4pf /* f04234c: a2000031 */ sb $zero,0x31($s0) .PF0f042350: /* f042350: e7ac005c */ swc1 $f12,0x5c($sp) -/* f042354: 0c0073c3 */ jal 0x1cf0c +/* f042354: 0c0073c3 */ jal modelGetAnimNum /* f042358: e7a20060 */ swc1 $f2,0x60($sp) /* f04235c: c7ac005c */ lwc1 $f12,0x5c($sp) /* f042360: 8e690020 */ lw $t1,0x20($s3) @@ -25541,17 +25541,17 @@ glabel var7f1aa3f4pf /* f042380: 01002825 */ move $a1,$t0 /* f042384: 02602025 */ move $a0,$s3 /* f042388: e7aa0014 */ swc1 $f10,0x14($sp) -/* f04238c: 0c0076a7 */ jal 0x1da9c +/* f04238c: 0c0076a7 */ jal modelSetAnimation /* f042390: e7a20010 */ swc1 $f2,0x10($sp) /* f042394: 4405a000 */ mfc1 $a1,$f20 -/* f042398: 0c0076fb */ jal 0x1dbec +/* f042398: 0c0076fb */ jal modelSetAnimEndFrame /* f04239c: 02602025 */ move $a0,$s3 .PF0f0423a0: -/* f0423a0: 0c0073d3 */ jal 0x1cf4c +/* f0423a0: 0c0073d3 */ jal modelGetCurAnimFrame /* f0423a4: 02602025 */ move $a0,$s3 /* f0423a8: 46000506 */ mov.s $f20,$f0 .PF0f0423ac: -/* f0423ac: 0c0073c3 */ jal 0x1cf0c +/* f0423ac: 0c0073c3 */ jal modelGetAnimNum /* f0423b0: 02602025 */ move $a0,$s3 /* f0423b4: 2401026a */ li $at,0x26a /* f0423b8: 50410030 */ beql $v0,$at,.PF0f04247c @@ -25567,7 +25567,7 @@ glabel var7f1aa3f4pf /* f0423e0: 1160000f */ beqz $t3,.PF0f042420 /* f0423e4: c4ac0004 */ lwc1 $f12,0x4($a1) /* f0423e8: e7a20050 */ swc1 $f2,0x50($sp) -/* f0423ec: 0c0073dc */ jal 0x1cf70 +/* f0423ec: 0c0073dc */ jal modelGetAnimEndFrame /* f0423f0: e7ac004c */ swc1 $f12,0x4c($sp) /* f0423f4: c7ac004c */ lwc1 $f12,0x4c($sp) /* f0423f8: c7a20050 */ lwc1 $f2,0x50($sp) @@ -25576,7 +25576,7 @@ glabel var7f1aa3f4pf /* f042404: 00000000 */ nop /* f042408: 45020006 */ bc1fl .PF0f042424 /* f04240c: 8e6c0020 */ lw $t4,0x20($s3) -/* f042410: 0c0073dc */ jal 0x1cf70 +/* f042410: 0c0073dc */ jal modelGetAnimEndFrame /* f042414: e7a20050 */ swc1 $f2,0x50($sp) /* f042418: c7a20050 */ lwc1 $f2,0x50($sp) /* f04241c: 46000306 */ mov.s $f12,$f0 @@ -25594,7 +25594,7 @@ glabel var7f1aa3f4pf /* f042444: 46028081 */ sub.s $f2,$f16,$f2 .PF0f042448: /* f042448: e7a20050 */ swc1 $f2,0x50($sp) -/* f04244c: 0fc0b89f */ jal 0xf02e27c +/* f04244c: 0fc0b89f */ jal chrGetRangedSpeed /* f042450: e7ac004c */ swc1 $f12,0x4c($sp) /* f042454: c7ac004c */ lwc1 $f12,0x4c($sp) /* f042458: c7a20050 */ lwc1 $f2,0x50($sp) @@ -25602,7 +25602,7 @@ glabel var7f1aa3f4pf /* f042460: 44070000 */ mfc1 $a3,$f0 /* f042464: 44066000 */ mfc1 $a2,$f12 /* f042468: 02002025 */ move $a0,$s0 -/* f04246c: 0fc0fa43 */ jal 0xf03e90c +/* f04246c: 0fc0fa43 */ jal func0f03e788 /* f042470: e7a20010 */ swc1 $f2,0x10($sp) /* f042474: a2020030 */ sb $v0,0x30($s0) /* f042478: 8e05002c */ lw $a1,0x2c($s0) @@ -25618,7 +25618,7 @@ glabel var7f1aa3f4pf /* f04249c: 45030008 */ bc1tl .PF0f0424c0 /* f0424a0: 3c013f80 */ lui $at,0x3f80 .PF0f0424a4: -/* f0424a4: 0c0073c3 */ jal 0x1cf0c +/* f0424a4: 0c0073c3 */ jal modelGetAnimNum /* f0424a8: 02602025 */ move $a0,$s3 /* f0424ac: 2401026a */ li $at,0x26a /* f0424b0: 1441000b */ bne $v0,$at,.PF0f0424e0 @@ -25630,12 +25630,12 @@ glabel var7f1aa3f4pf /* f0424c4: 82060039 */ lb $a2,0x39($s0) /* f0424c8: 82070038 */ lb $a3,0x38($s0) /* f0424cc: 02002025 */ move $a0,$s0 -/* f0424d0: 0fc0fade */ jal 0xf03eb78 +/* f0424d0: 0fc0fade */ jal func0f03e9f4 /* f0424d4: e7a60010 */ swc1 $f6,0x10($sp) /* f0424d8: 10000004 */ b .PF0f0424ec /* f0424dc: 00008825 */ move $s1,$zero .PF0f0424e0: -/* f0424e0: 0fc0fe6b */ jal 0xf03f9ac +/* f0424e0: 0fc0fe6b */ jal chrResetAimEndProperties /* f0424e4: 02002025 */ move $a0,$s0 /* f0424e8: 00008825 */ move $s1,$zero .PF0f0424ec: @@ -25649,7 +25649,7 @@ glabel var7f1aa3f4pf /* f042504: 824e003a */ lb $t6,0x3a($s2) /* f042508: 15c0006a */ bnez $t6,.PF0f0426b4 /* f04250c: 00000000 */ nop -/* f042510: 0c0073c3 */ jal 0x1cf0c +/* f042510: 0c0073c3 */ jal modelGetAnimNum /* f042514: 02602025 */ move $a0,$s3 /* f042518: 2401026a */ li $at,0x26a /* f04251c: 1041000c */ beq $v0,$at,.PF0f042550 @@ -25667,7 +25667,7 @@ glabel var7f1aa3f4pf /* f04254c: 4500003d */ bc1f .PF0f042644 .PF0f042550: /* f042550: 02202825 */ move $a1,$s1 -/* f042554: 0fc0fec3 */ jal 0xf03fb0c +/* f042554: 0fc0fec3 */ jal func0f03f988 /* f042558: 24060001 */ li $a2,0x1 /* f04255c: 82190007 */ lb $t9,0x7($s0) /* f042560: 3c18800a */ lui $t8,0x800a @@ -25702,13 +25702,13 @@ glabel var7f1aa3f4pf /* f0425d4: 4406b000 */ mfc1 $a2,$f22 /* f0425d8: 4405c000 */ mfc1 $a1,$f24 /* f0425dc: 4406b000 */ mfc1 $a2,$f22 -/* f0425e0: 0c007720 */ jal 0x1dc80 +/* f0425e0: 0c007720 */ jal modelSetAnimSpeed /* f0425e4: 02602025 */ move $a0,$s3 /* f0425e8: 10000070 */ b .PF0f0427ac /* f0425ec: 26310001 */ addiu $s1,$s1,0x1 /* f0425f0: 4406b000 */ mfc1 $a2,$f22 .PF0f0425f4: -/* f0425f4: 0c007720 */ jal 0x1dc80 +/* f0425f4: 0c007720 */ jal modelSetAnimSpeed /* f0425f8: 34a5cccd */ ori $a1,$a1,0xcccd /* f0425fc: 3c0e800a */ lui $t6,0x800a /* f042600: 8dcea548 */ lw $t6,-0x5ab8($t6) @@ -25719,21 +25719,21 @@ glabel var7f1aa3f4pf /* f042614: 4405c000 */ mfc1 $a1,$f24 .PF0f042618: /* f042618: 4406b000 */ mfc1 $a2,$f22 -/* f04261c: 0c007720 */ jal 0x1dc80 +/* f04261c: 0c007720 */ jal modelSetAnimSpeed /* f042620: 02602025 */ move $a0,$s3 /* f042624: 10000061 */ b .PF0f0427ac /* f042628: 26310001 */ addiu $s1,$s1,0x1 .PF0f04262c: /* f04262c: 4405c000 */ mfc1 $a1,$f24 /* f042630: 4406b000 */ mfc1 $a2,$f22 -/* f042634: 0c007720 */ jal 0x1dc80 +/* f042634: 0c007720 */ jal modelSetAnimSpeed /* f042638: 02602025 */ move $a0,$s3 /* f04263c: 1000005b */ b .PF0f0427ac /* f042640: 26310001 */ addiu $s1,$s1,0x1 .PF0f042644: /* f042644: 02002025 */ move $a0,$s0 .PF0f042648: -/* f042648: 0fc0fec3 */ jal 0xf03fb0c +/* f042648: 0fc0fec3 */ jal func0f03f988 /* f04264c: 02202825 */ move $a1,$s1 /* f042650: 82190007 */ lb $t9,0x7($s0) /* f042654: 2401000a */ li $at,0xa @@ -25743,26 +25743,26 @@ glabel var7f1aa3f4pf /* f042664: 4405c000 */ mfc1 $a1,$f24 /* f042668: 3c063f4c */ lui $a2,0x3f4c /* f04266c: 34c6cccd */ ori $a2,$a2,0xcccd -/* f042670: 0fc0b89f */ jal 0xf02e27c +/* f042670: 0fc0b89f */ jal chrGetRangedSpeed /* f042674: 02002025 */ move $a0,$s0 /* f042678: 44050000 */ mfc1 $a1,$f0 /* f04267c: 4406b000 */ mfc1 $a2,$f22 -/* f042680: 0c007720 */ jal 0x1dc80 +/* f042680: 0c007720 */ jal modelSetAnimSpeed /* f042684: 02602025 */ move $a0,$s3 /* f042688: 10000048 */ b .PF0f0427ac /* f04268c: 26310001 */ addiu $s1,$s1,0x1 .PF0f042690: /* f042690: 4405c000 */ mfc1 $a1,$f24 -/* f042694: 0fc0b89f */ jal 0xf02e27c +/* f042694: 0fc0b89f */ jal chrGetRangedSpeed /* f042698: 34c6cccd */ ori $a2,$a2,0xcccd /* f04269c: 44050000 */ mfc1 $a1,$f0 /* f0426a0: 4406b000 */ mfc1 $a2,$f22 -/* f0426a4: 0c007720 */ jal 0x1dc80 +/* f0426a4: 0c007720 */ jal modelSetAnimSpeed /* f0426a8: 02602025 */ move $a0,$s3 /* f0426ac: 1000003f */ b .PF0f0427ac /* f0426b0: 26310001 */ addiu $s1,$s1,0x1 .PF0f0426b4: -/* f0426b4: 0c0073c3 */ jal 0x1cf0c +/* f0426b4: 0c0073c3 */ jal modelGetAnimNum /* f0426b8: 02602025 */ move $a0,$s3 /* f0426bc: 2401026a */ li $at,0x26a /* f0426c0: 10410023 */ beq $v0,$at,.PF0f042750 @@ -25816,18 +25816,18 @@ glabel var7f1aa3f4pf /* f042770: 8dcea518 */ lw $t6,-0x5ae8($t6) /* f042774: 02002025 */ move $a0,$s0 /* f042778: 02202825 */ move $a1,$s1 -/* f04277c: 0fc0fec3 */ jal 0xf03fb0c +/* f04277c: 0fc0fec3 */ jal func0f03f988 /* f042780: ae0e0044 */ sw $t6,0x44($s0) /* f042784: 10000009 */ b .PF0f0427ac /* f042788: 26310001 */ addiu $s1,$s1,0x1 /* f04278c: 02202825 */ move $a1,$s1 .PF0f042790: -/* f042790: 0fc0fec3 */ jal 0xf03fb0c +/* f042790: 0fc0fec3 */ jal func0f03f988 /* f042794: 00003025 */ move $a2,$zero /* f042798: 10000004 */ b .PF0f0427ac /* f04279c: 26310001 */ addiu $s1,$s1,0x1 .PF0f0427a0: -/* f0427a0: 0fc0fec3 */ jal 0xf03fb0c +/* f0427a0: 0fc0fec3 */ jal func0f03f988 /* f0427a4: 00003025 */ move $a2,$zero .PF0f0427a8: /* f0427a8: 26310001 */ addiu $s1,$s1,0x1 diff --git a/src/game/chr/chraicommands.c b/src/game/chr/chraicommands.c index afe282585..622da081a 100644 --- a/src/game/chr/chraicommands.c +++ b/src/game/chr/chraicommands.c @@ -7239,7 +7239,7 @@ glabel var7f1a9d64 /* f05a470: 8e040424 */ lw $a0,0x424($s0) /* f05a474: 01cf1021 */ addu $v0,$t6,$t7 /* f05a478: 90450002 */ lbu $a1,0x2($v0) -/* f05a47c: 0fc12737 */ jal 0xf049cdc +/* f05a47c: 0fc12737 */ jal chrFindById /* f05a480: afa2009c */ sw $v0,0x9c($sp) /* f05a484: 8e18028c */ lw $t8,0x28c($s0) /* f05a488: 8e070424 */ lw $a3,0x424($s0) @@ -7275,7 +7275,7 @@ glabel var7f1a9d64 /* f05a4f4: 14200020 */ bnez $at,.PF0f05a578 /* f05a4f8: afac0084 */ sw $t4,0x84($sp) /* f05a4fc: afa60070 */ sw $a2,0x70($sp) -/* f05a500: 0c004ad4 */ jal 0x12b50 +/* f05a500: 0c004ad4 */ jal random /* f05a504: afa5007c */ sw $a1,0x7c($sp) /* f05a508: 30460001 */ andi $a2,$v0,0x1 /* f05a50c: afa60070 */ sw $a2,0x70($sp) @@ -7325,7 +7325,7 @@ glabel var7f1a9d64 /* f05a5b0: 90e40125 */ lbu $a0,0x125($a3) .PF0f05a5b4: /* f05a5b4: afa60070 */ sw $a2,0x70($sp) -/* f05a5b8: 0fc133e6 */ jal 0xf04cf98 +/* f05a5b8: 0fc133e6 */ jal teamGetChrIds /* f05a5bc: afa5007c */ sw $a1,0x7c($sp) /* f05a5c0: 8fb8009c */ lw $t8,0x9c($sp) /* f05a5c4: afa20088 */ sw $v0,0x88($sp) @@ -7361,7 +7361,7 @@ glabel var7f1a9d64 /* f05a634: 24010006 */ li $at,0x6 /* f05a638: 55610015 */ bnel $t3,$at,.PF0f05a690 /* f05a63c: 90e20126 */ lbu $v0,0x126($a3) -/* f05a640: 0fc4a513 */ jal 0xf12944c +/* f05a640: 0fc4a513 */ jal propGetPlayerNum /* f05a644: 00000000 */ nop /* f05a648: 8e030298 */ lw $v1,0x298($s0) /* f05a64c: 00026080 */ sll $t4,$v0,0x2 @@ -7378,7 +7378,7 @@ glabel var7f1a9d64 /* f05a678: 10000001 */ b .PF0f05a680 /* f05a67c: 00602025 */ move $a0,$v1 .PF0f05a680: -/* f05a680: 0fc4a4ff */ jal 0xf1293fc +/* f05a680: 0fc4a4ff */ jal setCurrentPlayerNum /* f05a684: 00000000 */ nop /* f05a688: 8e070424 */ lw $a3,0x424($s0) /* f05a68c: 90e20126 */ lbu $v0,0x126($a3) @@ -7394,7 +7394,7 @@ glabel var7f1a9d64 /* f05a6b0: 102001c0 */ beqz $at,.PF0f05adb4 /* f05a6b4: 00000000 */ nop .PF0f05a6b8: -/* f05a6b8: 0c004ad4 */ jal 0x12b50 +/* f05a6b8: 0c004ad4 */ jal random /* f05a6bc: 00000000 */ nop /* f05a6c0: 8faa0090 */ lw $t2,0x90($sp) /* f05a6c4: 304900ff */ andi $t1,$v0,0xff @@ -7407,7 +7407,7 @@ glabel var7f1a9d64 /* f05a6e0: 5081003e */ beql $a0,$at,.PF0f05a7dc /* f05a6e4: 8fae0094 */ lw $t6,0x94($sp) .PF0f05a6e8: -/* f05a6e8: 0fc0a226 */ jal 0xf028898 +/* f05a6e8: 0fc0a226 */ jal chrFindByLiteralId /* f05a6ec: 00000000 */ nop /* f05a6f0: 50400033 */ beqzl $v0,.PF0f05a7c0 /* f05a6f4: 8fa20088 */ lw $v0,0x88($sp) @@ -7415,7 +7415,7 @@ glabel var7f1a9d64 /* f05a6fc: 00402025 */ move $a0,$v0 /* f05a700: 5180002f */ beqzl $t4,.PF0f05a7c0 /* f05a704: 8fa20088 */ lw $v0,0x88($sp) -/* f05a708: 0fc0e706 */ jal 0xf039c18 +/* f05a708: 0fc0e706 */ jal chrIsDead /* f05a70c: afa20064 */ sw $v0,0x64($sp) /* f05a710: 1440002a */ bnez $v0,.PF0f05a7bc /* f05a714: 8fa60064 */ lw $a2,0x64($sp) @@ -7437,7 +7437,7 @@ glabel var7f1a9d64 /* f05a754: 00e02025 */ move $a0,$a3 /* f05a758: 50b90019 */ beql $a1,$t9,.PF0f05a7c0 /* f05a75c: 8fa20088 */ lw $v0,0x88($sp) -/* f05a760: 0fc12792 */ jal 0xf049e48 +/* f05a760: 0fc12792 */ jal chrGetDistanceToChr /* f05a764: afa60064 */ sw $a2,0x64($sp) /* f05a768: 3c017f1b */ lui $at,0x7f1b /* f05a76c: c424afd4 */ lwc1 $f4,-0x502c($at) @@ -7491,7 +7491,7 @@ glabel var7f1a9d64 /* f05a81c: 19400165 */ blez $t2,.PF0f05adb4 /* f05a820: 00000000 */ nop .PF0f05a824: -/* f05a824: 0c004ad4 */ jal 0x12b50 +/* f05a824: 0c004ad4 */ jal random /* f05a828: 00000000 */ nop /* f05a82c: 24010003 */ li $at,0x3 /* f05a830: 0041001b */ divu $zero,$v0,$at @@ -7525,7 +7525,7 @@ glabel var7f1a9d64 /* f05a89c: afa20058 */ sw $v0,0x58($sp) /* f05a8a0: a7ad00a4 */ sh $t5,0xa4($sp) .PF0f05a8a4: -/* f05a8a4: 0fc13433 */ jal 0xf04d0cc +/* f05a8a4: 0fc13433 */ jal audioWasNotPlayedRecently /* f05a8a8: 87a400a4 */ lh $a0,0xa4($sp) /* f05a8ac: 1440000a */ bnez $v0,.PF0f05a8d8 /* f05a8b0: 24010001 */ li $at,0x1 @@ -7540,7 +7540,7 @@ glabel var7f1a9d64 /* f05a8d0: 54610092 */ bnel $v1,$at,.PF0f05ab1c /* f05a8d4: 8fad0070 */ lw $t5,0x70($sp) .PF0f05a8d8: -/* f05a8d8: 0fc13421 */ jal 0xf04d084 +/* f05a8d8: 0fc13421 */ jal audioMarkAsRecentlyPlayed /* f05a8dc: 87a400a4 */ lh $a0,0xa4($sp) /* f05a8e0: 87b800a4 */ lh $t8,0xa4($sp) /* f05a8e4: 2401034e */ li $at,0x34e @@ -7572,7 +7572,7 @@ glabel var7f1a9d64 /* f05a944: 24050009 */ li $a1,0x9 /* f05a948: 8e0e0424 */ lw $t6,0x424($s0) /* f05a94c: 3406ffff */ li $a2,0xffff -/* f05a950: 0fc2496f */ jal 0xf0925bc +/* f05a950: 0fc2496f */ jal func0f0926bc /* f05a954: 8dc4001c */ lw $a0,0x1c($t6) /* f05a958: 8e0f0424 */ lw $t7,0x424($s0) /* f05a95c: 3c01bf80 */ lui $at,0xbf80 @@ -7595,12 +7595,12 @@ glabel var7f1a9d64 /* f05a9a0: e7a00038 */ swc1 $f0,0x38($sp) /* f05a9a4: e7a00034 */ swc1 $f0,0x34($sp) /* f05a9a8: e7a00030 */ swc1 $f0,0x30($sp) -/* f05a9ac: 0fc24e3a */ jal 0xf0938e8 +/* f05a9ac: 0fc24e3a */ jal func0f0939f8 /* f05a9b0: e7a00024 */ swc1 $f0,0x24($sp) /* f05a9b4: 10000026 */ b .PF0f05aa50 /* f05a9b8: 8faa009c */ lw $t2,0x9c($sp) .PF0f05a9bc: -/* f05a9bc: 0fc131c6 */ jal 0xf04c718 +/* f05a9bc: 0fc131c6 */ jal chrGetDistanceLostToTargetInLastSecond /* f05a9c0: 8e040424 */ lw $a0,0x424($s0) /* f05a9c4: 18400003 */ blez $v0,.PF0f05a9d4 /* f05a9c8: 00021823 */ negu $v1,$v0 @@ -7612,7 +7612,7 @@ glabel var7f1a9d64 /* f05a9dc: 24050009 */ li $a1,0x9 /* f05a9e0: 8e0c0424 */ lw $t4,0x424($s0) /* f05a9e4: 3406ffff */ li $a2,0xffff -/* f05a9e8: 0fc2496f */ jal 0xf0925bc +/* f05a9e8: 0fc2496f */ jal func0f0926bc /* f05a9ec: 8d84001c */ lw $a0,0x1c($t4) /* f05a9f0: 8e0d0424 */ lw $t5,0x424($s0) /* f05a9f4: 3c01bf80 */ lui $at,0xbf80 @@ -7635,7 +7635,7 @@ glabel var7f1a9d64 /* f05aa38: e7a00038 */ swc1 $f0,0x38($sp) /* f05aa3c: e7a00034 */ swc1 $f0,0x34($sp) /* f05aa40: e7a00030 */ swc1 $f0,0x30($sp) -/* f05aa44: 0fc24e3a */ jal 0xf0938e8 +/* f05aa44: 0fc24e3a */ jal func0f0939f8 /* f05aa48: e7a00024 */ swc1 $f0,0x24($sp) .PF0f05aa4c: /* f05aa4c: 8faa009c */ lw $t2,0x9c($sp) @@ -7656,16 +7656,16 @@ glabel var7f1a9d64 /* f05aa80: 00036840 */ sll $t5,$v1,0x1 /* f05aa84: 018dc021 */ addu $t8,$t4,$t5 /* f05aa88: 00982021 */ addu $a0,$a0,$t8 -/* f05aa8c: 0fc5bdaa */ jal 0xf16f6a8 +/* f05aa8c: 0fc5bdaa */ jal langGet /* f05aa90: 84849362 */ lh $a0,-0x6c9e($a0) /* f05aa94: afa20080 */ sw $v0,0x80($sp) -/* f05aa98: 0c004062 */ jal 0x10188 +/* f05aa98: 0c004062 */ jal audioIsFiltered /* f05aa9c: 87a400a4 */ lh $a0,0xa4($sp) /* f05aaa0: 144000c4 */ bnez $v0,.PF0f05adb4 /* f05aaa4: 8fa40080 */ lw $a0,0x80($sp) /* f05aaa8: 8fae009c */ lw $t6,0x9c($sp) /* f05aaac: 24050006 */ li $a1,0x6 -/* f05aab0: 0fc3799a */ jal 0xf0de668 +/* f05aab0: 0fc3799a */ jal hudmsgCreateViaPresetWithColour /* f05aab4: 91c60009 */ lbu $a2,0x9($t6) /* f05aab8: 100000be */ b .PF0f05adb4 /* f05aabc: 00000000 */ nop @@ -7679,16 +7679,16 @@ glabel var7f1a9d64 /* f05aad8: 000a4840 */ sll $t1,$t2,0x1 /* f05aadc: 01e95821 */ addu $t3,$t7,$t1 /* f05aae0: 008b2021 */ addu $a0,$a0,$t3 -/* f05aae4: 0fc5bdaa */ jal 0xf16f6a8 +/* f05aae4: 0fc5bdaa */ jal langGet /* f05aae8: 84849362 */ lh $a0,-0x6c9e($a0) /* f05aaec: afa20080 */ sw $v0,0x80($sp) -/* f05aaf0: 0c004062 */ jal 0x10188 +/* f05aaf0: 0c004062 */ jal audioIsFiltered /* f05aaf4: 87a400a4 */ lh $a0,0xa4($sp) /* f05aaf8: 144000ae */ bnez $v0,.PF0f05adb4 /* f05aafc: 8fa40080 */ lw $a0,0x80($sp) /* f05ab00: 8fac009c */ lw $t4,0x9c($sp) /* f05ab04: 24050006 */ li $a1,0x6 -/* f05ab08: 0fc3799a */ jal 0xf0de668 +/* f05ab08: 0fc3799a */ jal hudmsgCreateViaPresetWithColour /* f05ab0c: 91860009 */ lbu $a2,0x9($t4) /* f05ab10: 100000a8 */ b .PF0f05adb4 /* f05ab14: 00000000 */ nop @@ -7705,7 +7705,7 @@ glabel var7f1a9d64 /* f05ab38: 0043c821 */ addu $t9,$v0,$v1 /* f05ab3c: 87240000 */ lh $a0,0x0($t9) /* f05ab40: a3a800a3 */ sb $t0,0xa3($sp) -/* f05ab44: 0fc13433 */ jal 0xf04d0cc +/* f05ab44: 0fc13433 */ jal audioWasNotPlayedRecently /* f05ab48: afa30054 */ sw $v1,0x54($sp) /* f05ab4c: 8fa30054 */ lw $v1,0x54($sp) /* f05ab50: 1040000d */ beqz $v0,.PF0f05ab88 @@ -7714,7 +7714,7 @@ glabel var7f1a9d64 /* f05ab5c: 01432821 */ addu $a1,$t2,$v1 /* f05ab60: 84a40000 */ lh $a0,0x0($a1) /* f05ab64: a3a800a3 */ sb $t0,0xa3($sp) -/* f05ab68: 0fc13433 */ jal 0xf04d0cc +/* f05ab68: 0fc13433 */ jal audioWasNotPlayedRecently /* f05ab6c: afa50050 */ sw $a1,0x50($sp) /* f05ab70: 8fa50050 */ lw $a1,0x50($sp) /* f05ab74: 10400004 */ beqz $v0,.PF0f05ab88 @@ -7732,7 +7732,7 @@ glabel var7f1a9d64 /* f05ab9c: 87ab00a4 */ lh $t3,0xa4($sp) /* f05aba0: 1160007a */ beqz $t3,.PF0f05ad8c /* f05aba4: 01602025 */ move $a0,$t3 -/* f05aba8: 0fc13421 */ jal 0xf04d084 +/* f05aba8: 0fc13421 */ jal audioMarkAsRecentlyPlayed /* f05abac: a3a800a3 */ sb $t0,0xa3($sp) /* f05abb0: 87ac00a4 */ lh $t4,0xa4($sp) /* f05abb4: 2401034e */ li $at,0x34e @@ -7765,7 +7765,7 @@ glabel var7f1a9d64 /* f05ac1c: 24050009 */ li $a1,0x9 /* f05ac20: 3406ffff */ li $a2,0xffff /* f05ac24: 8da4001c */ lw $a0,0x1c($t5) -/* f05ac28: 0fc2496f */ jal 0xf0925bc +/* f05ac28: 0fc2496f */ jal func0f0926bc /* f05ac2c: a3a800a3 */ sb $t0,0xa3($sp) /* f05ac30: 8e180424 */ lw $t8,0x424($s0) /* f05ac34: 3c01bf80 */ lui $at,0xbf80 @@ -7788,14 +7788,14 @@ glabel var7f1a9d64 /* f05ac78: e7a00038 */ swc1 $f0,0x38($sp) /* f05ac7c: e7a00034 */ swc1 $f0,0x34($sp) /* f05ac80: e7a00030 */ swc1 $f0,0x30($sp) -/* f05ac84: 0fc24e3a */ jal 0xf0938e8 +/* f05ac84: 0fc24e3a */ jal func0f0939f8 /* f05ac88: e7a00024 */ swc1 $f0,0x24($sp) /* f05ac8c: 1000002a */ b .PF0f05ad38 /* f05ac90: 93a800a3 */ lbu $t0,0xa3($sp) .PF0f05ac94: /* f05ac94: 8e040424 */ lw $a0,0x424($s0) .PF0f05ac98: -/* f05ac98: 0fc131c6 */ jal 0xf04c718 +/* f05ac98: 0fc131c6 */ jal chrGetDistanceLostToTargetInLastSecond /* f05ac9c: a3a800a3 */ sb $t0,0xa3($sp) /* f05aca0: 18400003 */ blez $v0,.PF0f05acb0 /* f05aca4: 93a800a3 */ lbu $t0,0xa3($sp) @@ -7811,7 +7811,7 @@ glabel var7f1a9d64 /* f05acc4: 24050009 */ li $a1,0x9 /* f05acc8: 3406ffff */ li $a2,0xffff /* f05accc: 8d24001c */ lw $a0,0x1c($t1) -/* f05acd0: 0fc2496f */ jal 0xf0925bc +/* f05acd0: 0fc2496f */ jal func0f0926bc /* f05acd4: a3a800a3 */ sb $t0,0xa3($sp) /* f05acd8: 8e0b0424 */ lw $t3,0x424($s0) /* f05acdc: 3c01bf80 */ lui $at,0xbf80 @@ -7834,7 +7834,7 @@ glabel var7f1a9d64 /* f05ad20: e7a00038 */ swc1 $f0,0x38($sp) /* f05ad24: e7a00034 */ swc1 $f0,0x34($sp) /* f05ad28: e7a00030 */ swc1 $f0,0x30($sp) -/* f05ad2c: 0fc24e3a */ jal 0xf0938e8 +/* f05ad2c: 0fc24e3a */ jal func0f0939f8 /* f05ad30: e7a00024 */ swc1 $f0,0x24($sp) /* f05ad34: 93a800a3 */ lbu $t0,0xa3($sp) .PF0f05ad38: @@ -7847,16 +7847,16 @@ glabel var7f1a9d64 /* f05ad4c: 000250c0 */ sll $t2,$v0,0x3 /* f05ad50: 014f4821 */ addu $t1,$t2,$t7 /* f05ad54: 00892021 */ addu $a0,$a0,$t1 -/* f05ad58: 0fc5bdaa */ jal 0xf16f6a8 +/* f05ad58: 0fc5bdaa */ jal langGet /* f05ad5c: 84849360 */ lh $a0,-0x6ca0($a0) /* f05ad60: afa20080 */ sw $v0,0x80($sp) -/* f05ad64: 0c004062 */ jal 0x10188 +/* f05ad64: 0c004062 */ jal audioIsFiltered /* f05ad68: 87a400a4 */ lh $a0,0xa4($sp) /* f05ad6c: 14400011 */ bnez $v0,.PF0f05adb4 /* f05ad70: 8fa40080 */ lw $a0,0x80($sp) /* f05ad74: 8fab009c */ lw $t3,0x9c($sp) /* f05ad78: 24050006 */ li $a1,0x6 -/* f05ad7c: 0fc3799a */ jal 0xf0de668 +/* f05ad7c: 0fc3799a */ jal hudmsgCreateViaPresetWithColour /* f05ad80: 91660009 */ lbu $a2,0x9($t3) /* f05ad84: 1000000b */ b .PF0f05adb4 /* f05ad88: 00000000 */ nop @@ -7869,10 +7869,10 @@ glabel var7f1a9d64 /* f05ada0: 8e0e0424 */ lw $t6,0x424($s0) /* f05ada4: 91b80005 */ lbu $t8,0x5($t5) /* f05ada8: a1d80126 */ sb $t8,0x126($t6) -/* f05adac: 0fc127e8 */ jal 0xf049fa0 +/* f05adac: 0fc127e8 */ jal chrUnsetFlags /* f05adb0: 8e040424 */ lw $a0,0x424($s0) .PF0f05adb4: -/* f05adb4: 0fc4a4ff */ jal 0xf1293fc +/* f05adb4: 0fc4a4ff */ jal setCurrentPlayerNum /* f05adb8: 8fa40078 */ lw $a0,0x78($sp) /* f05adbc: 8e190438 */ lw $t9,0x438($s0) /* f05adc0: 00001025 */ move $v0,$zero diff --git a/src/game/core.c b/src/game/core.c index 9f6a5aab7..429e4045f 100644 --- a/src/game/core.c +++ b/src/game/core.c @@ -914,7 +914,7 @@ glabel var7f1b8e7cpf /* f16a32c: 35ce0006 */ ori $t6,$t6,0x6 /* f16a330: ac8e0000 */ sw $t6,0x0($a0) /* f16a334: ac800004 */ sw $zero,0x4($a0) -/* f16a338: 0fc35807 */ jal 0xf0d601c +/* f16a338: 0fc35807 */ jal func0f0d5a7c /* f16a33c: 24930008 */ addiu $s3,$a0,0x8 /* f16a340: 3c12800a */ lui $s2,0x800a /* f16a344: 2652a510 */ addiu $s2,$s2,-23280 @@ -924,7 +924,7 @@ glabel var7f1b8e7cpf /* f16a354: 2401004e */ li $at,0x4e /* f16a358: 5441005f */ bnel $v0,$at,.PF0f16a4d8 /* f16a35c: 8e4204b4 */ lw $v0,0x4b4($s2) -/* f16a360: 0fc06b27 */ jal 0xf01ac9c +/* f16a360: 0fc06b27 */ jal titleIsKeepingMode /* f16a364: 00000000 */ nop /* f16a368: 1040005a */ beqz $v0,.PF0f16a4d4 .PF0f16a36c: @@ -934,7 +934,7 @@ glabel var7f1b8e7cpf /* f16a378: 3c0f0600 */ lui $t7,0x600 /* f16a37c: ac4f0000 */ sw $t7,0x0($v0) /* f16a380: ac580004 */ sw $t8,0x4($v0) -/* f16a384: 0fc47e4a */ jal 0xf11f928 +/* f16a384: 0fc47e4a */ jal debug0f11ee28 /* f16a388: 26730008 */ addiu $s3,$s3,0x8 /* f16a38c: 10400008 */ beqz $v0,.PF0f16a3b0 /* f16a390: 02601025 */ move $v0,$s3 @@ -954,16 +954,16 @@ glabel var7f1b8e7cpf /* f16a3c4: ac4c0004 */ sw $t4,0x4($v0) /* f16a3c8: 26730008 */ addiu $s3,$s3,0x8 .PF0f16a3cc: -/* f16a3cc: 0c002bf1 */ jal 0xafc4 +/* f16a3cc: 0c002bf1 */ jal func0000b280 /* f16a3d0: 02602025 */ move $a0,$s3 -/* f16a3d4: 0c002bc5 */ jal 0xaf14 +/* f16a3d4: 0c002bc5 */ jal func0000b1d0 /* f16a3d8: 00402025 */ move $a0,$v0 /* f16a3dc: 00408825 */ move $s1,$v0 -/* f16a3e0: 0c002e91 */ jal 0xba44 +/* f16a3e0: 0c002e91 */ jal viGetViewLeft /* f16a3e4: 24530008 */ addiu $s3,$v0,0x8 /* f16a3e8: 00028400 */ sll $s0,$v0,0x10 /* f16a3ec: 00106c03 */ sra $t5,$s0,0x10 -/* f16a3f0: 0c002e95 */ jal 0xba54 +/* f16a3f0: 0c002e95 */ jal viGetViewTop /* f16a3f4: 01a08025 */ move $s0,$t5 /* f16a3f8: 44822000 */ mtc1 $v0,$f4 /* f16a3fc: 44908000 */ mtc1 $s0,$f16 @@ -984,15 +984,15 @@ glabel var7f1b8e7cpf /* f16a438: 316c0fff */ andi $t4,$t3,0xfff /* f16a43c: 000c6b00 */ sll $t5,$t4,0xc /* f16a440: 032d7025 */ or $t6,$t9,$t5 -/* f16a444: 0c002e73 */ jal 0xb9cc +/* f16a444: 0c002e73 */ jal viGetViewWidth /* f16a448: ae2e0000 */ sw $t6,0x0($s1) -/* f16a44c: 0c002e91 */ jal 0xba44 +/* f16a44c: 0c002e91 */ jal viGetViewLeft /* f16a450: a7a2008e */ sh $v0,0x8e($sp) -/* f16a454: 0c002e95 */ jal 0xba54 +/* f16a454: 0c002e95 */ jal viGetViewTop /* f16a458: a7a20090 */ sh $v0,0x90($sp) /* f16a45c: 00028400 */ sll $s0,$v0,0x10 /* f16a460: 00107c03 */ sra $t7,$s0,0x10 -/* f16a464: 0c002e77 */ jal 0xb9dc +/* f16a464: 0c002e77 */ jal viGetViewHeight /* f16a468: 01e08025 */ move $s0,$t7 /* f16a46c: 87b80090 */ lh $t8,0x90($sp) /* f16a470: 87aa008e */ lh $t2,0x8e($sp) @@ -1014,9 +1014,9 @@ glabel var7f1b8e7cpf /* f16a4b0: 000d7300 */ sll $t6,$t5,0xc /* f16a4b4: 314b0fff */ andi $t3,$t2,0xfff /* f16a4b8: 016e6025 */ or $t4,$t3,$t6 -/* f16a4bc: 0fc06bf9 */ jal 0xf01afe4 +/* f16a4bc: 0fc06bf9 */ jal titleRender /* f16a4c0: ae2c0004 */ sw $t4,0x4($s1) -/* f16a4c4: 0fc5a557 */ jal 0xf16955c +/* f16a4c4: 0fc5a557 */ jal coreRenderFade /* f16a4c8: 00402025 */ move $a0,$v0 /* f16a4cc: 100005e8 */ b .PF0f16bc70 /* f16a4d0: 00409825 */ move $s3,$v0 @@ -1064,29 +1064,29 @@ glabel var7f1b8e7cpf /* f16a570: ac4b0004 */ sw $t3,0x4($v0) /* f16a574: ac490000 */ sw $t1,0x0($v0) /* f16a578: 26730008 */ addiu $s3,$s3,0x8 -/* f16a57c: 0fc4a4ff */ jal 0xf1293fc +/* f16a57c: 0fc4a4ff */ jal setCurrentPlayerNum /* f16a580: 00002025 */ move $a0,$zero /* f16a584: 8e500284 */ lw $s0,0x284($s2) /* f16a588: 86040634 */ lh $a0,0x634($s0) -/* f16a58c: 0c002e7b */ jal 0xb9ec +/* f16a58c: 0c002e7b */ jal viSetViewPosition /* f16a590: 86050636 */ lh $a1,0x636($s0) /* f16a594: 8e500284 */ lw $s0,0x284($s2) /* f16a598: c60c1854 */ lwc1 $f12,0x1854($s0) /* f16a59c: c60e1858 */ lwc1 $f14,0x1858($s0) /* f16a5a0: 86060630 */ lh $a2,0x630($s0) -/* f16a5a4: 0c002ec7 */ jal 0xbb1c +/* f16a5a4: 0c002ec7 */ jal viSetFovAspectAndSize /* f16a5a8: 86070632 */ lh $a3,0x632($s0) /* f16a5ac: 3c013f80 */ lui $at,0x3f80 /* f16a5b0: 44816000 */ mtc1 $at,$f12 -/* f16a5b4: 0c005936 */ jal 0x164d8 +/* f16a5b4: 0c005936 */ jal func00016748 /* f16a5b8: 00000000 */ nop -/* f16a5bc: 0c002bc5 */ jal 0xaf14 +/* f16a5bc: 0c002bc5 */ jal func0000b1d0 /* f16a5c0: 02602025 */ move $a0,$s3 -/* f16a5c4: 0c002c1d */ jal 0xb074 +/* f16a5c4: 0c002c1d */ jal func0000b330 /* f16a5c8: 00402025 */ move $a0,$v0 -/* f16a5cc: 0fc576bd */ jal 0xf15daf4 +/* f16a5cc: 0fc576bd */ jal currentPlayerScissorToViewport /* f16a5d0: 00402025 */ move $a0,$v0 -/* f16a5d4: 0fc3f0f0 */ jal 0xf0fc3c0 +/* f16a5d4: 0fc3f0f0 */ jal func0f0fbc30 /* f16a5d8: 00402025 */ move $a0,$v0 /* f16a5dc: 100005a4 */ b .PF0f16bc70 /* f16a5e0: 00409825 */ move $s3,$v0 @@ -1132,63 +1132,63 @@ glabel var7f1b8e7cpf /* f16a67c: ac580004 */ sw $t8,0x4($v0) /* f16a680: ac490000 */ sw $t1,0x0($v0) /* f16a684: 26730008 */ addiu $s3,$s3,0x8 -/* f16a688: 0fc4a4ff */ jal 0xf1293fc +/* f16a688: 0fc4a4ff */ jal setCurrentPlayerNum /* f16a68c: 00002025 */ move $a0,$zero -/* f16a690: 0c0029fd */ jal 0xa7f4 +/* f16a690: 0c0029fd */ jal func0000aab0 /* f16a694: 24040001 */ li $a0,0x1 /* f16a698: 8e500284 */ lw $s0,0x284($s2) /* f16a69c: 86040634 */ lh $a0,0x634($s0) -/* f16a6a0: 0c002e7b */ jal 0xb9ec +/* f16a6a0: 0c002e7b */ jal viSetViewPosition /* f16a6a4: 86050636 */ lh $a1,0x636($s0) -/* f16a6a8: 0fc2f272 */ jal 0xf0bc9c8 +/* f16a6a8: 0fc2f272 */ jal viGetFbWidth /* f16a6ac: 00000000 */ nop -/* f16a6b0: 0fc2f27d */ jal 0xf0bc9f4 +/* f16a6b0: 0fc2f27d */ jal viGetFbHeight /* f16a6b4: a7a20090 */ sh $v0,0x90($sp) /* f16a6b8: 00022c00 */ sll $a1,$v0,0x10 /* f16a6bc: 00055403 */ sra $t2,$a1,0x10 /* f16a6c0: 01402825 */ move $a1,$t2 -/* f16a6c4: 0c002e4a */ jal 0xb928 +/* f16a6c4: 0c002e4a */ jal viSetXY /* f16a6c8: 87a40090 */ lh $a0,0x90($sp) -/* f16a6cc: 0fc2f272 */ jal 0xf0bc9c8 +/* f16a6cc: 0fc2f272 */ jal viGetFbWidth /* f16a6d0: 00000000 */ nop -/* f16a6d4: 0fc2f27d */ jal 0xf0bc9f4 +/* f16a6d4: 0fc2f27d */ jal viGetFbHeight /* f16a6d8: a7a20090 */ sh $v0,0x90($sp) /* f16a6dc: 00022c00 */ sll $a1,$v0,0x10 /* f16a6e0: 00055c03 */ sra $t3,$a1,0x10 /* f16a6e4: 01602825 */ move $a1,$t3 -/* f16a6e8: 0c002e39 */ jal 0xb8e4 +/* f16a6e8: 0c002e39 */ jal viSetBuf /* f16a6ec: 87a40090 */ lh $a0,0x90($sp) -/* f16a6f0: 0fc2f272 */ jal 0xf0bc9c8 +/* f16a6f0: 0fc2f272 */ jal viGetFbWidth /* f16a6f4: 00000000 */ nop -/* f16a6f8: 0fc2f27d */ jal 0xf0bc9f4 +/* f16a6f8: 0fc2f27d */ jal viGetFbHeight /* f16a6fc: a7a20090 */ sh $v0,0x90($sp) /* f16a700: 00022c00 */ sll $a1,$v0,0x10 /* f16a704: 00057403 */ sra $t6,$a1,0x10 /* f16a708: 01c02825 */ move $a1,$t6 -/* f16a70c: 0c002e5b */ jal 0xb96c +/* f16a70c: 0c002e5b */ jal viSetViewSize /* f16a710: 87a40090 */ lh $a0,0x90($sp) /* f16a714: 8e500284 */ lw $s0,0x284($s2) /* f16a718: c60c1854 */ lwc1 $f12,0x1854($s0) /* f16a71c: c60e1858 */ lwc1 $f14,0x1858($s0) /* f16a720: 86060630 */ lh $a2,0x630($s0) -/* f16a724: 0c002ec7 */ jal 0xbb1c +/* f16a724: 0c002ec7 */ jal viSetFovAspectAndSize /* f16a728: 86070632 */ lh $a3,0x632($s0) /* f16a72c: 3c013f80 */ lui $at,0x3f80 /* f16a730: 44816000 */ mtc1 $at,$f12 -/* f16a734: 0c005936 */ jal 0x164d8 +/* f16a734: 0c005936 */ jal func00016748 /* f16a738: 00000000 */ nop -/* f16a73c: 0c002bc5 */ jal 0xaf14 +/* f16a73c: 0c002bc5 */ jal func0000b1d0 /* f16a740: 02602025 */ move $a0,$s3 -/* f16a744: 0fc576bd */ jal 0xf15daf4 +/* f16a744: 0fc576bd */ jal currentPlayerScissorToViewport /* f16a748: 00402025 */ move $a0,$v0 -/* f16a74c: 0fc3f0f0 */ jal 0xf0fc3c0 +/* f16a74c: 0fc3f0f0 */ jal func0f0fbc30 /* f16a750: 00402025 */ move $a0,$v0 /* f16a754: 8e4c0284 */ lw $t4,0x284($s2) /* f16a758: 00409825 */ move $s3,$v0 /* f16a75c: 8d991a24 */ lw $t9,0x1a24($t4) /* f16a760: 53200544 */ beqzl $t9,.PF0f16bc74 /* f16a764: 824b04d3 */ lb $t3,0x4d3($s2) -/* f16a768: 0fc2ecb3 */ jal 0xf0bb2cc +/* f16a768: 0fc2ecb3 */ jal currentPlayerTickPauseMenu /* f16a76c: 00000000 */ nop /* f16a770: 10000540 */ b .PF0f16bc74 /* f16a774: 824b04d3 */ lb $t3,0x4d3($s2) @@ -1234,29 +1234,29 @@ glabel var7f1b8e7cpf /* f16a810: ac4e0004 */ sw $t6,0x4($v0) /* f16a814: ac490000 */ sw $t1,0x0($v0) /* f16a818: 26730008 */ addiu $s3,$s3,0x8 -/* f16a81c: 0fc4a4ff */ jal 0xf1293fc +/* f16a81c: 0fc4a4ff */ jal setCurrentPlayerNum /* f16a820: 00002025 */ move $a0,$zero /* f16a824: 8e500284 */ lw $s0,0x284($s2) /* f16a828: 86040634 */ lh $a0,0x634($s0) -/* f16a82c: 0c002e7b */ jal 0xb9ec +/* f16a82c: 0c002e7b */ jal viSetViewPosition /* f16a830: 86050636 */ lh $a1,0x636($s0) /* f16a834: 8e500284 */ lw $s0,0x284($s2) /* f16a838: c60c1854 */ lwc1 $f12,0x1854($s0) /* f16a83c: c60e1858 */ lwc1 $f14,0x1858($s0) /* f16a840: 86060630 */ lh $a2,0x630($s0) -/* f16a844: 0c002ec7 */ jal 0xbb1c +/* f16a844: 0c002ec7 */ jal viSetFovAspectAndSize /* f16a848: 86070632 */ lh $a3,0x632($s0) /* f16a84c: 3c013f80 */ lui $at,0x3f80 /* f16a850: 44816000 */ mtc1 $at,$f12 -/* f16a854: 0c005936 */ jal 0x164d8 +/* f16a854: 0c005936 */ jal func00016748 /* f16a858: 00000000 */ nop -/* f16a85c: 0c002bbb */ jal 0xaeec +/* f16a85c: 0c002bbb */ jal func0000b1a8 /* f16a860: 02602025 */ move $a0,$s3 -/* f16a864: 0c002bc5 */ jal 0xaf14 +/* f16a864: 0c002bc5 */ jal func0000b1d0 /* f16a868: 00402025 */ move $a0,$v0 -/* f16a86c: 0c002c1d */ jal 0xb074 +/* f16a86c: 0c002c1d */ jal func0000b330 /* f16a870: 00402025 */ move $a0,$v0 -/* f16a874: 0fc4eef2 */ jal 0xf13bbc8 +/* f16a874: 0fc4eef2 */ jal creditsRender /* f16a878: 00402025 */ move $a0,$v0 /* f16a87c: 100004fc */ b .PF0f16bc70 /* f16a880: 00409825 */ move $s3,$v0 @@ -1270,7 +1270,7 @@ glabel var7f1b8e7cpf /* f16a89c: 12000004 */ beqz $s0,.PF0f16a8b0 /* f16a8a0: 00000000 */ nop .PF0f16a8a4: -/* f16a8a4: 0fc2f28f */ jal 0xf0bca3c +/* f16a8a4: 0fc2f28f */ jal func0f0bc4c0 /* f16a8a8: 00000000 */ nop /* f16a8ac: 0002802b */ sltu $s0,$zero,$v0 .PF0f16a8b0: @@ -1356,16 +1356,16 @@ glabel var7f1b8e7cpf /* f16a9d0: afb30108 */ sw $s3,0x108($sp) /* f16a9d4: 11800007 */ beqz $t4,.PF0f16a9f4 /* f16a9d8: 00002025 */ move $a0,$zero -/* f16a9dc: 0fc4a4ff */ jal 0xf1293fc +/* f16a9dc: 0fc4a4ff */ jal setCurrentPlayerNum /* f16a9e0: 24110001 */ li $s1,0x1 /* f16a9e4: 26190001 */ addiu $t9,$s0,0x1 /* f16a9e8: ae400290 */ sw $zero,0x290($s2) /* f16a9ec: 1000000a */ b .PF0f16aa18 /* f16a9f0: afb90064 */ sw $t9,0x64($sp) .PF0f16a9f4: -/* f16a9f4: 0fc4a666 */ jal 0xf129998 +/* f16a9f4: 0fc4a666 */ jal getPlayerByOrderNum /* f16a9f8: 02002025 */ move $a0,$s0 -/* f16a9fc: 0fc4a4ff */ jal 0xf1293fc +/* f16a9fc: 0fc4a4ff */ jal setCurrentPlayerNum /* f16aa00: 00402025 */ move $a0,$v0 /* f16aa04: 8fad010c */ lw $t5,0x10c($sp) /* f16aa08: 26020001 */ addiu $v0,$s0,0x1 @@ -1420,14 +1420,14 @@ glabel var7f1b8e7cpf /* f16aac0: a44002d8 */ sh $zero,0x2d8($v0) /* f16aac4: a04002ff */ sb $zero,0x2ff($v0) .PF0f16aac8: -/* f16aac8: 0fc525fd */ jal 0xf1497f4 +/* f16aac8: 0fc525fd */ jal bviewSetBlur /* f16aacc: 02802025 */ move $a0,$s4 /* f16aad0: 02601025 */ move $v0,$s3 /* f16aad4: 3c0e0600 */ lui $t6,0x600 /* f16aad8: ac4e0000 */ sw $t6,0x0($v0) /* f16aadc: 8fac006c */ lw $t4,0x6c($sp) /* f16aae0: 26730008 */ addiu $s3,$s3,0x8 -/* f16aae4: 0fc47e4a */ jal 0xf11f928 +/* f16aae4: 0fc47e4a */ jal debug0f11ee28 /* f16aae8: ac4c0004 */ sw $t4,0x4($v0) /* f16aaec: 10400009 */ beqz $v0,.PF0f16ab14 /* f16aaf0: 3c0f0600 */ lui $t7,0x600 @@ -1449,28 +1449,28 @@ glabel var7f1b8e7cpf .PF0f16ab2c: /* f16ab2c: 8e500284 */ lw $s0,0x284($s2) /* f16ab30: 86040634 */ lh $a0,0x634($s0) -/* f16ab34: 0c002e7b */ jal 0xb9ec +/* f16ab34: 0c002e7b */ jal viSetViewPosition /* f16ab38: 86050636 */ lh $a1,0x636($s0) /* f16ab3c: 8e500284 */ lw $s0,0x284($s2) /* f16ab40: c60c1854 */ lwc1 $f12,0x1854($s0) /* f16ab44: c60e1858 */ lwc1 $f14,0x1858($s0) /* f16ab48: 86060630 */ lh $a2,0x630($s0) -/* f16ab4c: 0c002ec7 */ jal 0xbb1c +/* f16ab4c: 0c002ec7 */ jal viSetFovAspectAndSize /* f16ab50: 86070632 */ lh $a3,0x632($s0) /* f16ab54: 8e4a0288 */ lw $t2,0x288($s2) -/* f16ab58: 0c005936 */ jal 0x164d8 +/* f16ab58: 0c005936 */ jal func00016748 /* f16ab5c: c54c0074 */ lwc1 $f12,0x74($t2) -/* f16ab60: 0fc599de */ jal 0xf166778 +/* f16ab60: 0fc599de */ jal func0f1657f8 /* f16ab64: 00000000 */ nop -/* f16ab68: 0fc5dcb2 */ jal 0xf1772c8 +/* f16ab68: 0fc5dcb2 */ jal func0f176298 /* f16ab6c: 00000000 */ nop -/* f16ab70: 0c002bf1 */ jal 0xafc4 +/* f16ab70: 0c002bf1 */ jal func0000b280 /* f16ab74: 02602025 */ move $a0,$s3 -/* f16ab78: 0c002bc5 */ jal 0xaf14 +/* f16ab78: 0c002bc5 */ jal func0000b1d0 /* f16ab7c: 00402025 */ move $a0,$v0 -/* f16ab80: 0fc576bd */ jal 0xf15daf4 +/* f16ab80: 0fc576bd */ jal currentPlayerScissorToViewport /* f16ab84: 00402025 */ move $a0,$v0 -/* f16ab88: 0fc4f420 */ jal 0xf13d080 +/* f16ab88: 0fc4f420 */ jal func0f13c510 /* f16ab8c: 00409825 */ move $s3,$v0 /* f16ab90: 8e4b04b4 */ lw $t3,0x4b4($s2) /* f16ab94: 24010026 */ li $at,0x26 @@ -1527,7 +1527,7 @@ glabel var7f1b8e7cpf /* f16ac54: 8dade560 */ lw $t5,-0x1aa0($t5) /* f16ac58: 55a0000b */ bnezl $t5,.PF0f16ac88 /* f16ac5c: 8e4c0320 */ lw $t4,0x320($s2) -/* f16ac60: 0fc27b66 */ jal 0xf09ed98 +/* f16ac60: 0fc27b66 */ jal func0f09eae4 /* f16ac64: 00000000 */ nop /* f16ac68: 8e500284 */ lw $s0,0x284($s2) /* f16ac6c: 00027840 */ sll $t7,$v0,0x1 @@ -1543,7 +1543,7 @@ glabel var7f1b8e7cpf /* f16ac8c: 2405ffff */ li $a1,-1 /* f16ac90: 11800008 */ beqz $t4,.PF0f16acb4 /* f16ac94: 3c0f800a */ lui $t7,0x800a -/* f16ac98: 0fc50bea */ jal 0xf142fa8 +/* f16ac98: 0fc50bea */ jal bviewRenderMotionBlur /* f16ac9c: 240600ff */ li $a2,0xff /* f16aca0: 8e4d0320 */ lw $t5,0x320($s2) /* f16aca4: 00409825 */ move $s3,$v0 @@ -1555,20 +1555,20 @@ glabel var7f1b8e7cpf /* f16acb8: 3c0e8007 */ lui $t6,0x8007 /* f16acbc: 11e00012 */ beqz $t7,.PF0f16ad08 /* f16acc0: 00000000 */ nop -/* f16acc4: 0c002c1d */ jal 0xb074 +/* f16acc4: 0c002c1d */ jal func0000b330 /* f16acc8: 02602025 */ move $a0,$s3 -/* f16accc: 0fc576bd */ jal 0xf15daf4 +/* f16accc: 0fc576bd */ jal currentPlayerScissorToViewport /* f16acd0: 00402025 */ move $a0,$v0 /* f16acd4: 3c013f80 */ lui $at,0x3f80 /* f16acd8: 44816000 */ mtc1 $at,$f12 -/* f16acdc: 0c005936 */ jal 0x164d8 +/* f16acdc: 0c005936 */ jal func00016748 /* f16ace0: 00409825 */ move $s3,$v0 /* f16ace4: 8e4a0284 */ lw $t2,0x284($s2) /* f16ace8: 8d581c50 */ lw $t8,0x1c50($t2) /* f16acec: 00185fc2 */ srl $t3,$t8,0x1f /* f16acf0: 116003cb */ beqz $t3,.PF0f16bc20 /* f16acf4: 00000000 */ nop -/* f16acf8: 0fc3f0f0 */ jal 0xf0fc3c0 +/* f16acf8: 0fc3f0f0 */ jal func0f0fbc30 /* f16acfc: 02602025 */ move $a0,$s3 /* f16ad00: 100003c7 */ b .PF0f16bc20 /* f16ad04: 00409825 */ move $s3,$v0 @@ -1577,27 +1577,27 @@ glabel var7f1b8e7cpf /* f16ad0c: 24010002 */ li $at,0x2 /* f16ad10: 15c10004 */ bne $t6,$at,.PF0f16ad24 /* f16ad14: 00000000 */ nop -/* f16ad18: 0fc3014e */ jal 0xf0c0538 +/* f16ad18: 0fc3014e */ jal currentPlayerUpdateShootRot /* f16ad1c: 02602025 */ move $a0,$s3 /* f16ad20: 00409825 */ move $s3,$v0 .PF0f16ad24: -/* f16ad24: 0c002c1d */ jal 0xb074 +/* f16ad24: 0c002c1d */ jal func0000b330 /* f16ad28: 02602025 */ move $a0,$s3 -/* f16ad2c: 0fc48121 */ jal 0xf120484 +/* f16ad2c: 0fc48121 */ jal func0f11f984 /* f16ad30: 00402025 */ move $a0,$v0 -/* f16ad34: 0fc57660 */ jal 0xf15d980 +/* f16ad34: 0fc57660 */ jal roomsTick /* f16ad38: 00409825 */ move $s3,$v0 -/* f16ad3c: 0fc010c5 */ jal 0xf004314 +/* f16ad3c: 0fc010c5 */ jal func0f004314 /* f16ad40: 00000000 */ nop -/* f16ad44: 0fc18ca3 */ jal 0xf06328c +/* f16ad44: 0fc18ca3 */ jal func0f06302c /* f16ad48: 02202025 */ move $a0,$s1 -/* f16ad4c: 0fc619c9 */ jal 0xf186724 +/* f16ad4c: 0fc619c9 */ jal scenarioCallback14 /* f16ad50: 00002025 */ move $a0,$zero -/* f16ad54: 0fc18104 */ jal 0xf060410 +/* f16ad54: 0fc18104 */ jal func0f0601b0 /* f16ad58: 00000000 */ nop -/* f16ad5c: 0fc193de */ jal 0xf064f78 +/* f16ad5c: 0fc193de */ jal func0f064ce8 /* f16ad60: 00000000 */ nop -/* f16ad64: 0fc18b63 */ jal 0xf062d8c +/* f16ad64: 0fc18b63 */ jal handsTickAttack /* f16ad68: 00000000 */ nop /* f16ad6c: 8e4c006c */ lw $t4,0x6c($s2) /* f16ad70: 00002025 */ move $a0,$zero @@ -1637,20 +1637,20 @@ glabel var7f1b8e7cpf /* f16ade8: 8e4c029c */ lw $t4,0x29c($s2) /* f16adec: 0583000c */ bgezl $t4,.PF0f16ae20 /* f16adf0: 00002025 */ move $a0,$zero -/* f16adf4: 0fc28737 */ jal 0xf0a1cdc +/* f16adf4: 0fc28737 */ jal handGetWeaponNum /* f16adf8: 00002025 */ move $a0,$zero /* f16adfc: 00402025 */ move $a0,$v0 -/* f16ae00: 0fc2c720 */ jal 0xf0b1c80 +/* f16ae00: 0fc2c720 */ jal weaponHasFlag /* f16ae04: 3c054000 */ lui $a1,0x4000 /* f16ae08: 50400050 */ beqzl $v0,.PF0f16af4c /* f16ae0c: 8e4c0284 */ lw $t4,0x284($s2) -/* f16ae10: 0fc32020 */ jal 0xf0c8080 +/* f16ae10: 0fc32020 */ jal bmoveIsInSightAimMode /* f16ae14: 00000000 */ nop /* f16ae18: 1040004b */ beqz $v0,.PF0f16af48 /* f16ae1c: 00002025 */ move $a0,$zero .PF0f16ae20: /* f16ae20: 00002825 */ move $a1,$zero -/* f16ae24: 0fc187ed */ jal 0xf061fb4 +/* f16ae24: 0fc187ed */ jal func0f061d54 /* f16ae28: 00003025 */ move $a2,$zero /* f16ae2c: 8e4d0284 */ lw $t5,0x284($s2) /* f16ae30: ada21624 */ sw $v0,0x1624($t5) @@ -1739,23 +1739,23 @@ glabel var7f1b8e7cpf .PF0f16af54: /* f16af54: 26040638 */ addiu $a0,$s0,0x638 .PF0f16af58: -/* f16af58: 0fc2c8e8 */ jal 0xf0b23a0 +/* f16af58: 0fc2c8e8 */ jal handHasFunctionFlags /* f16af5c: 3c050008 */ lui $a1,0x8 /* f16af60: 10400005 */ beqz $v0,.PF0f16af78 /* f16af64: 00000000 */ nop -/* f16af68: 0fc5a851 */ jal 0xf16a144 +/* f16af68: 0fc5a851 */ jal coreFindThreats /* f16af6c: 00000000 */ nop /* f16af70: 10000033 */ b .PF0f16b040 /* f16af74: 8e500284 */ lw $s0,0x284($s2) .PF0f16af78: -/* f16af78: 0fc28737 */ jal 0xf0a1cdc +/* f16af78: 0fc28737 */ jal handGetWeaponNum /* f16af7c: 00002025 */ move $a0,$zero /* f16af80: 00402025 */ move $a0,$v0 -/* f16af84: 0fc2c720 */ jal 0xf0b1c80 +/* f16af84: 0fc2c720 */ jal weaponHasFlag /* f16af88: 3c054000 */ lui $a1,0x4000 /* f16af8c: 5040002c */ beqzl $v0,.PF0f16b040 /* f16af90: 8e500284 */ lw $s0,0x284($s2) -/* f16af94: 0fc68746 */ jal 0xf1a1d18 +/* f16af94: 0fc68746 */ jal frIsInTraining /* f16af98: 00000000 */ nop /* f16af9c: 5040000f */ beqzl $v0,.PF0f16afdc /* f16afa0: 8e440284 */ lw $a0,0x284($s2) @@ -1763,19 +1763,19 @@ glabel var7f1b8e7cpf /* f16afa8: 8dcd1624 */ lw $t5,0x1624($t6) /* f16afac: 51a0000b */ beqzl $t5,.PF0f16afdc /* f16afb0: 8e440284 */ lw $a0,0x284($s2) -/* f16afb4: 0fc32020 */ jal 0xf0c8080 +/* f16afb4: 0fc32020 */ jal bmoveIsInSightAimMode /* f16afb8: 00000000 */ nop /* f16afbc: 50400007 */ beqzl $v0,.PF0f16afdc /* f16afc0: 8e440284 */ lw $a0,0x284($s2) /* f16afc4: 8e590284 */ lw $t9,0x284($s2) -/* f16afc8: 0fc68683 */ jal 0xf1a1a0c +/* f16afc8: 0fc68683 */ jal func0f1a0924 /* f16afcc: 8f241624 */ lw $a0,0x1624($t9) /* f16afd0: 1000000a */ b .PF0f16affc /* f16afd4: 00008825 */ move $s1,$zero /* f16afd8: 8e440284 */ lw $a0,0x284($s2) .PF0f16afdc: /* f16afdc: 02e02825 */ move $a1,$s7 -/* f16afe0: 0fc5a620 */ jal 0xf169880 +/* f16afe0: 0fc5a620 */ jal coreCheckCmpFollowThreat /* f16afe4: 24841624 */ addiu $a0,$a0,0x1624 /* f16afe8: 54400004 */ bnezl $v0,.PF0f16affc /* f16afec: 00008825 */ move $s1,$zero @@ -1788,7 +1788,7 @@ glabel var7f1b8e7cpf /* f16b000: 8e4a0284 */ lw $t2,0x284($s2) /* f16b004: 02202825 */ move $a1,$s1 /* f16b008: 01502021 */ addu $a0,$t2,$s0 -/* f16b00c: 0fc5a620 */ jal 0xf169880 +/* f16b00c: 0fc5a620 */ jal coreCheckCmpFollowThreat /* f16b010: 24841630 */ addiu $a0,$a0,0x1630 /* f16b014: 14400007 */ bnez $v0,.PF0f16b034 /* f16b018: 26310001 */ addiu $s1,$s1,0x1 @@ -1821,7 +1821,7 @@ glabel var7f1b8e7cpf /* f16b07c: 14600010 */ bnez $v1,.PF0f16b0c0 /* f16b080: 00000000 */ nop /* f16b084: 44816000 */ mtc1 $at,$f12 -/* f16b088: 0fc257ea */ jal 0xf095fa8 +/* f16b088: 0fc257ea */ jal objectiveCheckHolograph /* f16b08c: 00000000 */ nop /* f16b090: 3c048009 */ lui $a0,0x8009 /* f16b094: 8c845750 */ lw $a0,0x5750($a0) @@ -1831,7 +1831,7 @@ glabel var7f1b8e7cpf /* f16b0a4: afb70010 */ sw $s7,0x10($sp) /* f16b0a8: e7b40014 */ swc1 $f20,0x14($sp) /* f16b0ac: afb70018 */ sw $s7,0x18($sp) -/* f16b0b0: 0c0041a0 */ jal 0x10680 +/* f16b0b0: 0c0041a0 */ jal audioStart /* f16b0b4: afb7001c */ sw $s7,0x1c($sp) /* f16b0b8: 10000053 */ b .PF0f16b208 /* f16b0bc: 8e500284 */ lw $s0,0x284($s2) @@ -1851,7 +1851,7 @@ glabel var7f1b8e7cpf /* f16b0f0: afb70010 */ sw $s7,0x10($sp) /* f16b0f4: e7b40014 */ swc1 $f20,0x14($sp) /* f16b0f8: afb70018 */ sw $s7,0x18($sp) -/* f16b0fc: 0c0041a0 */ jal 0x10680 +/* f16b0fc: 0c0041a0 */ jal audioStart /* f16b100: afb7001c */ sw $s7,0x1c($sp) /* f16b104: 8e500284 */ lw $s0,0x284($s2) /* f16b108: 240b001c */ li $t3,0x1c @@ -1874,7 +1874,7 @@ glabel var7f1b8e7cpf /* f16b14c: 8f040000 */ lw $a0,0x0($t8) /* f16b150: afa00014 */ sw $zero,0x14($sp) /* f16b154: afab0010 */ sw $t3,0x10($sp) -/* f16b158: 0fc24477 */ jal 0xf0911dc +/* f16b158: 0fc24477 */ jal projectileCreate /* f16b15c: 24860008 */ addiu $a2,$a0,0x8 /* f16b160: 10000008 */ b .PF0f16b184 /* f16b164: 00000000 */ nop @@ -1884,7 +1884,7 @@ glabel var7f1b8e7cpf /* f16b170: afb70010 */ sw $s7,0x10($sp) /* f16b174: e7b40014 */ swc1 $f20,0x14($sp) /* f16b178: afb70018 */ sw $s7,0x18($sp) -/* f16b17c: 0c0041a0 */ jal 0x10680 +/* f16b17c: 0c0041a0 */ jal audioStart /* f16b180: afb7001c */ sw $s7,0x1c($sp) .PF0f16b184: /* f16b184: 10000020 */ b .PF0f16b208 @@ -1906,7 +1906,7 @@ glabel var7f1b8e7cpf /* f16b1c0: 8f040000 */ lw $a0,0x0($t8) /* f16b1c4: afa00010 */ sw $zero,0x10($sp) /* f16b1c8: 24850008 */ addiu $a1,$a0,0x8 -/* f16b1cc: 0fc4a8f4 */ jal 0xf12a3d0 +/* f16b1cc: 0fc4a8f4 */ jal explosionCreateSimple /* f16b1d0: 24860028 */ addiu $a2,$a0,0x28 /* f16b1d4: 8e4b0284 */ lw $t3,0x284($s2) /* f16b1d8: 27ac00b0 */ addiu $t4,$sp,0xb0 @@ -1918,7 +1918,7 @@ glabel var7f1b8e7cpf /* f16b1f0: 8f240004 */ lw $a0,0x4($t9) /* f16b1f4: afa00018 */ sw $zero,0x18($sp) /* f16b1f8: afa00014 */ sw $zero,0x14($sp) -/* f16b1fc: 0fc0c6bb */ jal 0xf031aec +/* f16b1fc: 0fc0c6bb */ jal func0f0319a8 /* f16b200: afac0010 */ sw $t4,0x10($sp) /* f16b204: 8e500284 */ lw $s0,0x284($s2) .PF0f16b208: @@ -1926,13 +1926,13 @@ glabel var7f1b8e7cpf .PF0f16b20c: /* f16b20c: 51c0000c */ beqzl $t6,.PF0f16b240 /* f16b210: 8e020480 */ lw $v0,0x480($s0) -/* f16b214: 0fc18c35 */ jal 0xf0630d4 +/* f16b214: 0fc18c35 */ jal currentPlayerInteract /* f16b218: 00002025 */ move $a0,$zero /* f16b21c: 10400012 */ beqz $v0,.PF0f16b268 /* f16b220: 00000000 */ nop -/* f16b224: 0fc28953 */ jal 0xf0a254c +/* f16b224: 0fc28953 */ jal currentPlayerReloadHandIfPossible /* f16b228: 00002025 */ move $a0,$zero -/* f16b22c: 0fc28953 */ jal 0xf0a254c +/* f16b22c: 0fc28953 */ jal currentPlayerReloadHandIfPossible /* f16b230: 03c02025 */ move $a0,$s8 /* f16b234: 1000000c */ b .PF0f16b268 /* f16b238: 00000000 */ nop @@ -1946,12 +1946,12 @@ glabel var7f1b8e7cpf /* f16b254: 904a006a */ lbu $t2,0x6a($v0) /* f16b258: 11400003 */ beqz $t2,.PF0f16b268 /* f16b25c: 00000000 */ nop -/* f16b260: 0fc18c35 */ jal 0xf0630d4 +/* f16b260: 0fc18c35 */ jal currentPlayerInteract /* f16b264: 03c02025 */ move $a0,$s8 .PF0f16b268: -/* f16b268: 0fc19121 */ jal 0xf064484 +/* f16b268: 0fc19121 */ jal func0f0641f4 /* f16b26c: 00000000 */ nop -/* f16b270: 0fc57698 */ jal 0xf15da60 +/* f16b270: 0fc57698 */ jal bgRender /* f16b274: 02602025 */ move $a0,$s3 /* f16b278: 3c108007 */ lui $s0,0x8007 /* f16b27c: 8e106238 */ lw $s0,0x6238($s0) @@ -1965,22 +1965,22 @@ glabel var7f1b8e7cpf /* f16b29c: 0010582b */ sltu $t3,$zero,$s0 /* f16b2a0: 01608025 */ move $s0,$t3 .PF0f16b2a4: -/* f16b2a4: 0fc0a16f */ jal 0xf0285bc +/* f16b2a4: 0fc0a16f */ jal func0f028498 /* f16b2a8: 02002025 */ move $a0,$s0 -/* f16b2ac: 0fc1fe48 */ jal 0xf07f920 +/* f16b2ac: 0fc1fe48 */ jal propsRenderBeams /* f16b2b0: 02602025 */ move $a0,$s3 -/* f16b2b4: 0fc54ce5 */ jal 0xf153394 +/* f16b2b4: 0fc54ce5 */ jal shardsRender /* f16b2b8: 00402025 */ move $a0,$v0 -/* f16b2bc: 0fc4c2ee */ jal 0xf130bb8 +/* f16b2bc: 0fc4c2ee */ jal sparksRender /* f16b2c0: 00402025 */ move $a0,$v0 -/* f16b2c4: 0fc4c6f4 */ jal 0xf131bd0 +/* f16b2c4: 0fc4c6f4 */ jal weatherRender /* f16b2c8: 00402025 */ move $a0,$v0 /* f16b2cc: 3c0d8006 */ lui $t5,0x8006 /* f16b2d0: 8dad1310 */ lw $t5,0x1310($t5) /* f16b2d4: 00409825 */ move $s3,$v0 /* f16b2d8: 11a00004 */ beqz $t5,.PF0f16b2ec /* f16b2dc: 00000000 */ nop -/* f16b2e0: 0fc0285e */ jal 0xf00a178 +/* f16b2e0: 0fc0285e */ jal nbombsRender /* f16b2e4: 00402025 */ move $a0,$v0 /* f16b2e8: 00409825 */ move $s3,$v0 .PF0f16b2ec: @@ -1989,19 +1989,19 @@ glabel var7f1b8e7cpf /* f16b2f4: 24010002 */ li $at,0x2 /* f16b2f8: 17210005 */ bne $t9,$at,.PF0f16b310 /* f16b2fc: 00000000 */ nop -/* f16b300: 0fc3034d */ jal 0xf0c0d34 +/* f16b300: 0fc3034d */ jal func0f0c07c8 /* f16b304: 02602025 */ move $a0,$s3 /* f16b308: 1000000b */ b .PF0f16b338 /* f16b30c: 00409825 */ move $s3,$v0 .PF0f16b310: -/* f16b310: 0fc2bce6 */ jal 0xf0af398 +/* f16b310: 0fc2bce6 */ jal func0f0aeed8 /* f16b314: 02602025 */ move $a0,$s3 /* f16b318: 8e4c0284 */ lw $t4,0x284($s2) /* f16b31c: 00409825 */ move $s3,$v0 /* f16b320: 958e0010 */ lhu $t6,0x10($t4) /* f16b324: 13ce0004 */ beq $s8,$t6,.PF0f16b338 /* f16b328: 00000000 */ nop -/* f16b32c: 0fc57025 */ jal 0xf15c094 +/* f16b32c: 0fc57025 */ jal func0f15b114 /* f16b330: 00402025 */ move $a0,$v0 /* f16b334: 00409825 */ move $s3,$v0 .PF0f16b338: @@ -2031,7 +2031,7 @@ glabel var7f1b8e7cpf /* f16b394: 28410583 */ slti $at,$v0,0x583 /* f16b398: 1020005e */ beqz $at,.PF0f16b514 /* f16b39c: 00000000 */ nop -/* f16b3a0: 0fc522da */ jal 0xf148b68 +/* f16b3a0: 0fc522da */ jal bviewRenderHorizonScanner /* f16b3a4: 02602025 */ move $a0,$s3 /* f16b3a8: 1000005a */ b .PF0f16b514 /* f16b3ac: 00409825 */ move $s3,$v0 @@ -2049,7 +2049,7 @@ glabel var7f1b8e7cpf /* f16b3d8: afb70010 */ sw $s7,0x10($sp) /* f16b3dc: e7b40014 */ swc1 $f20,0x14($sp) /* f16b3e0: afb70018 */ sw $s7,0x18($sp) -/* f16b3e4: 0c0041a0 */ jal 0x10680 +/* f16b3e4: 0c0041a0 */ jal audioStart /* f16b3e8: afb7001c */ sw $s7,0x1c($sp) .PF0f16b3ec: /* f16b3ec: 3c188008 */ lui $t8,0x8008 @@ -2059,7 +2059,7 @@ glabel var7f1b8e7cpf /* f16b3fc: 030b6823 */ subu $t5,$t8,$t3 /* f16b400: 05a1000b */ bgez $t5,.PF0f16b430 /* f16b404: ac2d45dc */ sw $t5,0x45dc($at) -/* f16b408: 0c004ad4 */ jal 0x12b50 +/* f16b408: 0c004ad4 */ jal random /* f16b40c: 00000000 */ nop /* f16b410: 240100a6 */ li $at,0xa6 /* f16b414: 0041001b */ divu $zero,$v0,$at @@ -2072,7 +2072,7 @@ glabel var7f1b8e7cpf .PF0f16b430: /* f16b430: 02602025 */ move $a0,$s3 /* f16b434: 2405ffff */ li $a1,-1 -/* f16b438: 0fc50d3f */ jal 0xf1434fc +/* f16b438: 0fc50d3f */ jal bviewRenderFilmLens /* f16b43c: 2406ffff */ li $a2,-1 /* f16b440: 3c0e8008 */ lui $t6,0x8008 /* f16b444: 8dce45dc */ lw $t6,0x45dc($t6) @@ -2094,7 +2094,7 @@ glabel var7f1b8e7cpf /* f16b484: afb70010 */ sw $s7,0x10($sp) /* f16b488: e7b40014 */ swc1 $f20,0x14($sp) /* f16b48c: afb70018 */ sw $s7,0x18($sp) -/* f16b490: 0c0041a0 */ jal 0x10680 +/* f16b490: 0c0041a0 */ jal audioStart /* f16b494: afb7001c */ sw $s7,0x1c($sp) .PF0f16b498: /* f16b498: 3c188008 */ lui $t8,0x8008 @@ -2105,7 +2105,7 @@ glabel var7f1b8e7cpf /* f16b4ac: 000b5880 */ sll $t3,$t3,0x2 /* f16b4b0: 01ab8023 */ subu $s0,$t5,$t3 .PF0f16b4b4: -/* f16b4b4: 0c004ad4 */ jal 0x12b50 +/* f16b4b4: 0c004ad4 */ jal random /* f16b4b8: 00000000 */ nop /* f16b4bc: 2401003c */ li $at,0x3c /* f16b4c0: 0041001b */ divu $zero,$v0,$at @@ -2121,13 +2121,13 @@ glabel var7f1b8e7cpf /* f16b4e8: afb70010 */ sw $s7,0x10($sp) /* f16b4ec: e7b40014 */ swc1 $f20,0x14($sp) /* f16b4f0: afb70018 */ sw $s7,0x18($sp) -/* f16b4f4: 0c0041a0 */ jal 0x10680 +/* f16b4f4: 0c0041a0 */ jal audioStart /* f16b4f8: afb7001c */ sw $s7,0x1c($sp) .PF0f16b4fc: /* f16b4fc: 12000005 */ beqz $s0,.PF0f16b514 /* f16b500: 02602025 */ move $a0,$s3 /* f16b504: 2405ffff */ li $a1,-1 -/* f16b508: 0fc50c6d */ jal 0xf1431b4 +/* f16b508: 0fc50c6d */ jal bviewRenderStatic /* f16b50c: 02003025 */ move $a2,$s0 /* f16b510: 00409825 */ move $s3,$v0 .PF0f16b514: @@ -2137,7 +2137,7 @@ glabel var7f1b8e7cpf /* f16b520: 8e500284 */ lw $s0,0x284($s2) /* f16b524: 56200004 */ bnezl $s1,.PF0f16b538 /* f16b528: 8e500284 */ lw $s0,0x284($s2) -/* f16b52c: 0c00cd09 */ jal 0x33424 +/* f16b52c: 0c00cd09 */ jal audioStop /* f16b530: 00000000 */ nop /* f16b534: 8e500284 */ lw $s0,0x284($s2) .PF0f16b538: @@ -2150,7 +2150,7 @@ glabel var7f1b8e7cpf /* f16b550: 02602025 */ move $a0,$s3 /* f16b554: 11c10016 */ beq $t6,$at,.PF0f16b5b0 /* f16b558: 2405ffff */ li $a1,-1 -/* f16b55c: 0fc50cb9 */ jal 0xf1432e4 +/* f16b55c: 0fc50cb9 */ jal bviewRenderSlayerRocketLens /* f16b560: 2406ffff */ li $a2,-1 /* f16b564: 8e500284 */ lw $s0,0x284($s2) /* f16b568: 00409825 */ move $s3,$v0 @@ -2168,7 +2168,7 @@ glabel var7f1b8e7cpf /* f16b598: 00000000 */ nop /* f16b59c: 240600ff */ li $a2,0xff .PF0f16b5a0: -/* f16b5a0: 0fc50c6d */ jal 0xf1431b4 +/* f16b5a0: 0fc50c6d */ jal bviewRenderStatic /* f16b5a4: 34a5ffff */ ori $a1,$a1,0xffff /* f16b5a8: 00409825 */ move $s3,$v0 /* f16b5ac: 8e500284 */ lw $s0,0x284($s2) @@ -2180,7 +2180,7 @@ glabel var7f1b8e7cpf /* f16b5bc: 14610009 */ bne $v1,$at,.PF0f16b5e4 /* f16b5c0: 3c054fff */ lui $a1,0x4fff /* f16b5c4: 34a5ffff */ ori $a1,$a1,0xffff -/* f16b5c8: 0fc50c6d */ jal 0xf1431b4 +/* f16b5c8: 0fc50c6d */ jal bviewRenderStatic /* f16b5cc: 240600ff */ li $a2,0xff /* f16b5d0: 8e4a0284 */ lw $t2,0x284($s2) /* f16b5d4: 00409825 */ move $s3,$v0 @@ -2217,7 +2217,7 @@ glabel var7f1b8e7cpf /* f16b648: 02602025 */ move $a0,$s3 /* f16b64c: 2405ffff */ li $a1,-1 /* f16b650: 44070000 */ mfc1 $a3,$f0 -/* f16b654: 0fc50dd8 */ jal 0xf143760 +/* f16b654: 0fc50dd8 */ jal bviewRenderZoomBlur /* f16b658: e7a00010 */ swc1 $f0,0x10($sp) /* f16b65c: 00409825 */ move $s3,$v0 /* f16b660: 8e430460 */ lw $v1,0x460($s2) @@ -2245,7 +2245,7 @@ glabel var7f1b8e7cpf /* f16b6a8: 8e4a0464 */ lw $t2,0x464($s2) /* f16b6ac: 55400015 */ bnezl $t2,.PF0f16b704 /* f16b6b0: 2861000d */ slti $at,$v1,0xd -/* f16b6b4: 0fc5b180 */ jal 0xf16c600 +/* f16b6b4: 0fc5b180 */ jal coreGetSlowMotionType /* f16b6b8: 00000000 */ nop /* f16b6bc: 10400003 */ beqz $v0,.PF0f16b6cc /* f16b6c0: 3c048009 */ lui $a0,0x8009 @@ -2263,7 +2263,7 @@ glabel var7f1b8e7cpf /* f16b6e8: afb70010 */ sw $s7,0x10($sp) /* f16b6ec: e7b40014 */ swc1 $f20,0x14($sp) /* f16b6f0: afb70018 */ sw $s7,0x18($sp) -/* f16b6f4: 0c0041a0 */ jal 0x10680 +/* f16b6f4: 0c0041a0 */ jal audioStart /* f16b6f8: afb7001c */ sw $s7,0x1c($sp) /* f16b6fc: 8e430460 */ lw $v1,0x460($s2) /* f16b700: 2861000d */ slti $at,$v1,0xd @@ -2291,7 +2291,7 @@ glabel var7f1b8e7cpf /* f16b754: 460a4402 */ mul.s $f16,$f8,$f10 /* f16b758: 46128000 */ add.s $f0,$f16,$f18 /* f16b75c: 44070000 */ mfc1 $a3,$f0 -/* f16b760: 0fc50dd8 */ jal 0xf143760 +/* f16b760: 0fc50dd8 */ jal bviewRenderZoomBlur /* f16b764: e7a00010 */ swc1 $f0,0x10($sp) /* f16b768: 8e4b0460 */ lw $t3,0x460($s2) /* f16b76c: 3c017f1c */ lui $at,0x7f1c @@ -2303,7 +2303,7 @@ glabel var7f1b8e7cpf /* f16b784: 240600ff */ li $a2,0xff /* f16b788: 240700ff */ li $a3,0xff /* f16b78c: 46083282 */ mul.s $f10,$f6,$f8 -/* f16b790: 0fc2ed6b */ jal 0xf0bb5ac +/* f16b790: 0fc2ed6b */ jal fadeDraw /* f16b794: e7aa0010 */ swc1 $f10,0x10($sp) /* f16b798: 10000029 */ b .PF0f16b840 /* f16b79c: 00409825 */ move $s3,$v0 @@ -2330,7 +2330,7 @@ glabel var7f1b8e7cpf /* f16b7ec: 46049182 */ mul.s $f6,$f18,$f4 /* f16b7f0: 46083000 */ add.s $f0,$f6,$f8 /* f16b7f4: 44070000 */ mfc1 $a3,$f0 -/* f16b7f8: 0fc50dd8 */ jal 0xf143760 +/* f16b7f8: 0fc50dd8 */ jal bviewRenderZoomBlur /* f16b7fc: e7a00010 */ swc1 $f0,0x10($sp) /* f16b800: 8e4e0460 */ lw $t6,0x460($s2) /* f16b804: 3c0141d0 */ lui $at,0x41d0 @@ -2345,7 +2345,7 @@ glabel var7f1b8e7cpf /* f16b828: 240700ff */ li $a3,0xff /* f16b82c: 46125101 */ sub.s $f4,$f10,$f18 /* f16b830: 46062202 */ mul.s $f8,$f4,$f6 -/* f16b834: 0fc2ed6b */ jal 0xf0bb5ac +/* f16b834: 0fc2ed6b */ jal fadeDraw /* f16b838: e7a80010 */ swc1 $f8,0x10($sp) /* f16b83c: 00409825 */ move $s3,$v0 .PF0f16b840: @@ -2388,11 +2388,11 @@ glabel var7f1b8e7cpf .PF0f16b8b8: /* f16b8b8: 52800009 */ beqzl $s4,.PF0f16b8e0 /* f16b8bc: 8e4e02ac */ lw $t6,0x2ac($s2) -/* f16b8c0: 0fc52608 */ jal 0xf149820 +/* f16b8c0: 0fc52608 */ jal bviewClearBlur /* f16b8c4: 00000000 */ nop /* f16b8c8: 02602025 */ move $a0,$s3 /* f16b8cc: 2405ffff */ li $a1,-1 -/* f16b8d0: 0fc50bea */ jal 0xf142fa8 +/* f16b8d0: 0fc50bea */ jal bviewRenderMotionBlur /* f16b8d4: 02803025 */ move $a2,$s4 /* f16b8d8: 00409825 */ move $s3,$v0 /* f16b8dc: 8e4e02ac */ lw $t6,0x2ac($s2) @@ -2400,7 +2400,7 @@ glabel var7f1b8e7cpf /* f16b8e0: 24010006 */ li $at,0x6 /* f16b8e4: 15c10031 */ bne $t6,$at,.PF0f16b9ac /* f16b8e8: 00000000 */ nop -/* f16b8ec: 0fc2eb66 */ jal 0xf0bad98 +/* f16b8ec: 0fc2eb66 */ jal cutsceneGetBlurFrac /* f16b8f0: 00000000 */ nop /* f16b8f4: 44808000 */ mtc1 $zero,$f16 /* f16b8f8: 3c01437f */ lui $at,0x437f @@ -2448,38 +2448,38 @@ glabel var7f1b8e7cpf /* f16b998: 00000000 */ nop .PF0f16b99c: /* f16b99c: 44cff800 */ ctc1 $t7,$31 -/* f16b9a0: 0fc50bea */ jal 0xf142fa8 +/* f16b9a0: 0fc50bea */ jal bviewRenderMotionBlur /* f16b9a4: 00000000 */ nop /* f16b9a8: 00409825 */ move $s3,$v0 .PF0f16b9ac: -/* f16b9ac: 0fc47e76 */ jal 0xf11f9d8 +/* f16b9ac: 0fc47e76 */ jal debugGetMotionBlur /* f16b9b0: 00000000 */ nop /* f16b9b4: 145e0006 */ bne $v0,$s8,.PF0f16b9d0 /* f16b9b8: 02602025 */ move $a0,$s3 /* f16b9bc: 2405ff00 */ li $a1,-256 -/* f16b9c0: 0fc50bea */ jal 0xf142fa8 +/* f16b9c0: 0fc50bea */ jal bviewRenderMotionBlur /* f16b9c4: 24060080 */ li $a2,0x80 /* f16b9c8: 10000014 */ b .PF0f16ba1c /* f16b9cc: 00409825 */ move $s3,$v0 .PF0f16b9d0: -/* f16b9d0: 0fc47e76 */ jal 0xf11f9d8 +/* f16b9d0: 0fc47e76 */ jal debugGetMotionBlur /* f16b9d4: 00000000 */ nop /* f16b9d8: 24010002 */ li $at,0x2 /* f16b9dc: 14410006 */ bne $v0,$at,.PF0f16b9f8 /* f16b9e0: 02602025 */ move $a0,$s3 /* f16b9e4: 2405ff00 */ li $a1,-256 -/* f16b9e8: 0fc50bea */ jal 0xf142fa8 +/* f16b9e8: 0fc50bea */ jal bviewRenderMotionBlur /* f16b9ec: 240600c0 */ li $a2,0xc0 /* f16b9f0: 1000000a */ b .PF0f16ba1c /* f16b9f4: 00409825 */ move $s3,$v0 .PF0f16b9f8: -/* f16b9f8: 0fc47e76 */ jal 0xf11f9d8 +/* f16b9f8: 0fc47e76 */ jal debugGetMotionBlur /* f16b9fc: 00000000 */ nop /* f16ba00: 24010003 */ li $at,0x3 /* f16ba04: 14410005 */ bne $v0,$at,.PF0f16ba1c /* f16ba08: 02602025 */ move $a0,$s3 /* f16ba0c: 2405ff00 */ li $a1,-256 -/* f16ba10: 0fc50bea */ jal 0xf142fa8 +/* f16ba10: 0fc50bea */ jal bviewRenderMotionBlur /* f16ba14: 240600e6 */ li $a2,0xe6 /* f16ba18: 00409825 */ move $s3,$v0 .PF0f16ba1c: @@ -2519,21 +2519,21 @@ glabel var7f1b8e7cpf .PF0f16ba94: /* f16ba94: 12200021 */ beqz $s1,.PF0f16bb1c /* f16ba98: 00000000 */ nop -/* f16ba9c: 0fc550cf */ jal 0xf15433c +/* f16ba9c: 0fc550cf */ jal func0f153628 /* f16baa0: 02602025 */ move $a0,$s3 -/* f16baa4: 0c002e91 */ jal 0xba44 +/* f16baa4: 0c002e91 */ jal viGetViewLeft /* f16baa8: 00409825 */ move $s3,$v0 -/* f16baac: 0c002e95 */ jal 0xba54 +/* f16baac: 0c002e95 */ jal viGetViewTop /* f16bab0: a7a20072 */ sh $v0,0x72($sp) /* f16bab4: 00028400 */ sll $s0,$v0,0x10 /* f16bab8: 0010c403 */ sra $t8,$s0,0x10 -/* f16babc: 0c002e91 */ jal 0xba44 +/* f16babc: 0c002e91 */ jal viGetViewLeft /* f16bac0: 03008025 */ move $s0,$t8 -/* f16bac4: 0c002e73 */ jal 0xb9cc +/* f16bac4: 0c002e73 */ jal viGetViewWidth /* f16bac8: a7a20076 */ sh $v0,0x76($sp) -/* f16bacc: 0c002e95 */ jal 0xba54 +/* f16bacc: 0c002e95 */ jal viGetViewTop /* f16bad0: a7a2008e */ sh $v0,0x8e($sp) -/* f16bad4: 0c002e77 */ jal 0xb9dc +/* f16bad4: 0c002e77 */ jal viGetViewHeight /* f16bad8: a7a20090 */ sh $v0,0x90($sp) /* f16badc: 87ac0090 */ lh $t4,0x90($sp) /* f16bae0: 87ad008e */ lh $t5,0x8e($sp) @@ -2546,72 +2546,72 @@ glabel var7f1b8e7cpf /* f16bafc: 02602025 */ move $a0,$s3 /* f16bb00: 87a50072 */ lh $a1,0x72($sp) /* f16bb04: 02003025 */ move $a2,$s0 -/* f16bb08: 0fc551d2 */ jal 0xf154748 +/* f16bb08: 0fc551d2 */ jal func0f153a34 /* f16bb0c: 01ab3821 */ addu $a3,$t5,$t3 -/* f16bb10: 0fc55125 */ jal 0xf154494 +/* f16bb10: 0fc55125 */ jal func0f153780 /* f16bb14: 00402025 */ move $a0,$v0 /* f16bb18: 00409825 */ move $s3,$v0 .PF0f16bb1c: -/* f16bb1c: 0fc619de */ jal 0xf186778 +/* f16bb1c: 0fc619de */ jal func0f185774 /* f16bb20: 02602025 */ move $a0,$s3 -/* f16bb24: 0fc5a557 */ jal 0xf16955c +/* f16bb24: 0fc5a557 */ jal coreRenderFade /* f16bb28: 00402025 */ move $a0,$v0 /* f16bb2c: 3c0f8009 */ lui $t7,0x8009 /* f16bb30: 91ef8d54 */ lbu $t7,-0x72ac($t7) /* f16bb34: 00409825 */ move $s3,$v0 /* f16bb38: 11e00004 */ beqz $t7,.PF0f16bb4c /* f16bb3c: 00000000 */ nop -/* f16bb40: 0fc69012 */ jal 0xf1a4048 +/* f16bb40: 0fc69012 */ jal frRenderHud /* f16bb44: 00402025 */ move $a0,$v0 /* f16bb48: 00409825 */ move $s3,$v0 .PF0f16bb4c: -/* f16bb4c: 0fc47e62 */ jal 0xf11f988 +/* f16bb4c: 0fc47e62 */ jal debug0f11ee88 /* f16bb50: 00000000 */ nop /* f16bb54: 14400013 */ bnez $v0,.PF0f16bba4 /* f16bb58: 00000000 */ nop -/* f16bb5c: 0fc47e64 */ jal 0xf11f990 +/* f16bb5c: 0fc47e64 */ jal debug0f11ee90 /* f16bb60: 00000000 */ nop /* f16bb64: 1440000f */ bnez $v0,.PF0f16bba4 /* f16bb68: 00000000 */ nop -/* f16bb6c: 0fc47e6a */ jal 0xf11f9a8 +/* f16bb6c: 0fc47e6a */ jal debug0f11eea8 /* f16bb70: 00000000 */ nop /* f16bb74: 1440000b */ bnez $v0,.PF0f16bba4 /* f16bb78: 00000000 */ nop -/* f16bb7c: 0fc47ea0 */ jal 0xf11fa80 +/* f16bb7c: 0fc47ea0 */ jal debug0f11ef80 /* f16bb80: 00000000 */ nop /* f16bb84: 14400007 */ bnez $v0,.PF0f16bba4 /* f16bb88: 00000000 */ nop -/* f16bb8c: 0fc47e9e */ jal 0xf11fa78 +/* f16bb8c: 0fc47e9e */ jal debug0f11ef78 /* f16bb90: 00000000 */ nop /* f16bb94: 14400003 */ bnez $v0,.PF0f16bba4 /* f16bb98: 00000000 */ nop -/* f16bb9c: 0fc47e50 */ jal 0xf11f940 +/* f16bb9c: 0fc47e50 */ jal debug0f11ee40 /* f16bba0: 00000000 */ nop .PF0f16bba4: -/* f16bba4: 0fc49fea */ jal 0xf127fa8 +/* f16bba4: 0fc49fea */ jal func0f1274d8 /* f16bba8: 02602025 */ move $a0,$s3 -/* f16bbac: 0fc40494 */ jal 0xf101250 +/* f16bbac: 0fc40494 */ jal amRender /* f16bbb0: 00402025 */ move $a0,$v0 /* f16bbb4: 3c013f80 */ lui $at,0x3f80 /* f16bbb8: 44816000 */ mtc1 $at,$f12 -/* f16bbbc: 0c005936 */ jal 0x164d8 +/* f16bbbc: 0c005936 */ jal func00016748 /* f16bbc0: 00409825 */ move $s3,$v0 /* f16bbc4: 8e4a0284 */ lw $t2,0x284($s2) /* f16bbc8: 8d581c50 */ lw $t8,0x1c50($t2) /* f16bbcc: 00186fc2 */ srl $t5,$t8,0x1f /* f16bbd0: 51a00005 */ beqzl $t5,.PF0f16bbe8 /* f16bbd4: 8e4b0288 */ lw $t3,0x288($s2) -/* f16bbd8: 0fc3f0f0 */ jal 0xf0fc3c0 +/* f16bbd8: 0fc3f0f0 */ jal func0f0fbc30 /* f16bbdc: 02602025 */ move $a0,$s3 /* f16bbe0: 00409825 */ move $s3,$v0 /* f16bbe4: 8e4b0288 */ lw $t3,0x288($s2) .PF0f16bbe8: -/* f16bbe8: 0c005936 */ jal 0x164d8 +/* f16bbe8: 0c005936 */ jal func00016748 /* f16bbec: c56c0074 */ lwc1 $f12,0x74($t3) /* f16bbf0: 8e4c0314 */ lw $t4,0x314($s2) /* f16bbf4: 51800005 */ beqzl $t4,.PF0f16bc0c /* f16bbf8: 8e590284 */ lw $t9,0x284($s2) -/* f16bbfc: 0fc629f8 */ jal 0xf18a7e0 +/* f16bbfc: 0fc629f8 */ jal mpRenderModalText /* f16bc00: 02602025 */ move $a0,$s3 /* f16bc04: 00409825 */ move $s3,$v0 /* f16bc08: 8e590284 */ lw $t9,0x284($s2) @@ -2619,10 +2619,10 @@ glabel var7f1b8e7cpf /* f16bc0c: 932e19b3 */ lbu $t6,0x19b3($t9) /* f16bc10: 11c00003 */ beqz $t6,.PF0f16bc20 /* f16bc14: 00000000 */ nop -/* f16bc18: 0fc2ddff */ jal 0xf0b77fc +/* f16bc18: 0fc2ddff */ jal currentPlayerStartNewLife /* f16bc1c: 00000000 */ nop .PF0f16bc20: -/* f16bc20: 0fc4f42f */ jal 0xf13d0bc +/* f16bc20: 0fc4f42f */ jal func0f13c54c /* f16bc24: 00000000 */ nop /* f16bc28: 8e4f0298 */ lw $t7,0x298($s2) /* f16bc2c: 05e10004 */ bgez $t7,.PF0f16bc40 @@ -2631,7 +2631,7 @@ glabel var7f1b8e7cpf /* f16bc38: 0542000a */ bltzl $t2,.PF0f16bc64 /* f16bc3c: 8fb00064 */ lw $s0,0x64($sp) .PF0f16bc40: -/* f16bc40: 0fc2f28f */ jal 0xf0bca3c +/* f16bc40: 0fc2f28f */ jal func0f0bc4c0 /* f16bc44: 00000000 */ nop /* f16bc48: 50400006 */ beqzl $v0,.PF0f16bc64 /* f16bc4c: 8fb00064 */ lw $s0,0x64($sp) @@ -2668,7 +2668,7 @@ glabel var7f1b8e7cpf /* f16bcb8: 824f04d5 */ lb $t7,0x4d5($s2) /* f16bcbc: 5de00004 */ bgtzl $t7,.PF0f16bcd0 /* f16bcc0: 824a04d3 */ lb $t2,0x4d3($s2) -/* f16bcc4: 0c0039af */ jal 0xe6bc +/* f16bcc4: 0c0039af */ jal mainSetStageNum /* f16bcc8: 2404005a */ li $a0,0x5a .PF0f16bccc: /* f16bccc: 824a04d3 */ lb $t2,0x4d3($s2) @@ -2681,7 +2681,7 @@ glabel var7f1b8e7cpf /* f16bce4: 824d04d5 */ lb $t5,0x4d5($s2) /* f16bce8: 59a0003e */ blezl $t5,.PF0f16bde4 /* f16bcec: 02608825 */ move $s1,$s3 -/* f16bcf0: 0fc37925 */ jal 0xf0de494 +/* f16bcf0: 0fc37925 */ jal hudmsgRemoveAll /* f16bcf4: 00000000 */ nop /* f16bcf8: 824b04d4 */ lb $t3,0x4d4($s2) /* f16bcfc: 3c118007 */ lui $s1,0x8007 @@ -2704,14 +2704,14 @@ glabel var7f1b8e7cpf /* f16bd40: ae57029c */ sw $s7,0x29c($s2) /* f16bd44: a20d0003 */ sb $t5,0x3($s0) /* f16bd48: 24040001 */ li $a0,0x1 -/* f16bd4c: 0fc0690e */ jal 0xf01a438 +/* f16bd4c: 0fc0690e */ jal setNumPlayers /* f16bd50: a24e04d2 */ sb $t6,0x4d2($s2) -/* f16bd54: 0fc06a32 */ jal 0xf01a8c8 +/* f16bd54: 0fc06a32 */ jal titleSetNextMode /* f16bd58: 24040005 */ li $a0,0x5 /* f16bd5c: 920b0000 */ lbu $t3,0x0($s0) /* f16bd60: 00002025 */ move $a0,$zero /* f16bd64: 316cff01 */ andi $t4,$t3,0xff01 -/* f16bd68: 0fc5b6fd */ jal 0xf16dbf4 +/* f16bd68: 0fc5b6fd */ jal coreSetDifficulty /* f16bd6c: a20c0000 */ sb $t4,0x0($s0) /* f16bd70: 825904d4 */ lb $t9,0x4d4($s2) /* f16bd74: 00197080 */ sll $t6,$t9,0x2 @@ -2721,14 +2721,14 @@ glabel var7f1b8e7cpf /* f16bd84: 844f0002 */ lh $t7,0x2($v0) /* f16bd88: 84440000 */ lh $a0,0x0($v0) /* f16bd8c: a20f0002 */ sb $t7,0x2($s0) -/* f16bd90: 0fc06c91 */ jal 0xf01b244 +/* f16bd90: 0fc06c91 */ jal titleSetNextStage /* f16bd94: a2040001 */ sb $a0,0x1($s0) /* f16bd98: 824a04d4 */ lb $t2,0x4d4($s2) /* f16bd9c: 000ac080 */ sll $t8,$t2,0x2 /* f16bda0: 030ac023 */ subu $t8,$t8,$t2 /* f16bda4: 0018c080 */ sll $t8,$t8,0x2 /* f16bda8: 02386821 */ addu $t5,$s1,$t8 -/* f16bdac: 0c0039af */ jal 0xe6bc +/* f16bdac: 0c0039af */ jal mainSetStageNum /* f16bdb0: 85a40000 */ lh $a0,0x0($t5) /* f16bdb4: 824b04d5 */ lb $t3,0x4d5($s2) /* f16bdb8: 256cffff */ addiu $t4,$t3,-1 @@ -2746,11 +2746,11 @@ glabel var7f1b8e7cpf .PF0f16bde4: /* f16bde4: 3c0aed00 */ lui $t2,0xed00 /* f16bde8: ae2a0000 */ sw $t2,0x0($s1) -/* f16bdec: 0c002e53 */ jal 0xb94c +/* f16bdec: 0c002e53 */ jal viGetWidth /* f16bdf0: 26730008 */ addiu $s3,$s3,0x8 /* f16bdf4: 00028400 */ sll $s0,$v0,0x10 /* f16bdf8: 0010c403 */ sra $t8,$s0,0x10 -/* f16bdfc: 0c002e57 */ jal 0xb95c +/* f16bdfc: 0c002e57 */ jal viGetHeight /* f16be00: 03008025 */ move $s0,$t8 /* f16be04: 44823000 */ mtc1 $v0,$f6 /* f16be08: 44909000 */ mtc1 $s0,$f18 @@ -3901,14 +3901,14 @@ glabel var7f1b8ed0pf /* f16c728: afb30038 */ sw $s3,0x38($sp) /* f16c72c: afb20034 */ sw $s2,0x34($sp) /* f16c730: afb10030 */ sw $s1,0x30($sp) -/* f16c734: 0fc5b6cc */ jal 0xf16db30 +/* f16c734: 0fc5b6cc */ jal coreCheckPauseStateChanged /* f16c738: afb0002c */ sw $s0,0x2c($sp) /* f16c73c: 3c14800a */ lui $s4,0x800a /* f16c740: 2694a510 */ addiu $s4,$s4,-23280 /* f16c744: 968e04e4 */ lhu $t6,0x4e4($s4) /* f16c748: 51c00004 */ beqzl $t6,.PF0f16c75c /* f16c74c: 8e8204d8 */ lw $v0,0x4d8($s4) -/* f16c750: 0fc47412 */ jal 0xf11d048 +/* f16c750: 0fc47412 */ jal func0f11c54c /* f16c754: 00000000 */ nop /* f16c758: 8e8204d8 */ lw $v0,0x4d8($s4) .PF0f16c75c: @@ -3919,7 +3919,7 @@ glabel var7f1b8ed0pf .PF0f16c76c: /* f16c76c: 14400013 */ bnez $v0,.PF0f16c7bc /* f16c770: 00000000 */ nop -/* f16c774: 0c004db2 */ jal 0x136c8 +/* f16c774: 0c004db2 */ jal func00013938 /* f16c778: 00000000 */ nop /* f16c77c: 8e8204b4 */ lw $v0,0x4b4($s4) /* f16c780: 2401005a */ li $at,0x5a @@ -3935,7 +3935,7 @@ glabel var7f1b8ed0pf /* f16c7a4: 10000003 */ b .PF0f16c7b4 /* f16c7a8: a28004d1 */ sb $zero,0x4d1($s4) .PF0f16c7ac: -/* f16c7ac: 0fc47a8d */ jal 0xf11ea34 +/* f16c7ac: 0fc47a8d */ jal func0f11df38 /* f16c7b0: a29804d1 */ sb $t8,0x4d1($s4) .PF0f16c7b4: /* f16c7b4: 2415ffff */ li $s5,-1 @@ -3947,7 +3947,7 @@ glabel var7f1b8ed0pf /* f16c7c8: 2415ffff */ li $s5,-1 /* f16c7cc: 56190004 */ bnel $s0,$t9,.PF0f16c7e0 /* f16c7d0: 8e8c006c */ lw $t4,0x6c($s4) -/* f16c7d4: 0fc66f10 */ jal 0xf19bc40 +/* f16c7d4: 0fc66f10 */ jal func0f19ab40 /* f16c7d8: 00000000 */ nop /* f16c7dc: 8e8c006c */ lw $t4,0x6c($s4) .PF0f16c7e0: @@ -4027,14 +4027,14 @@ glabel var7f1b8ed0pf /* f16c8e0: 5420ffde */ bnezl $at,.PF0f16c85c /* f16c8e4: 8cce0064 */ lw $t6,0x64($a2) .PF0f16c8e8: -/* f16c8e8: 0fc5b6f7 */ jal 0xf16dbdc +/* f16c8e8: 0fc5b6f7 */ jal coreIsPaused /* f16c8ec: 00000000 */ nop /* f16c8f0: 10400003 */ beqz $v0,.PF0f16c900 /* f16c8f4: 00000000 */ nop /* f16c8f8: 1000011a */ b .PF0f16cd64 /* f16c8fc: ae800034 */ sw $zero,0x34($s4) .PF0f16c900: -/* f16c900: 0fc629b9 */ jal 0xf18a6e4 +/* f16c900: 0fc629b9 */ jal mpIsPaused /* f16c904: 00000000 */ nop /* f16c908: 10400044 */ beqz $v0,.PF0f16ca1c /* f16c90c: 00000000 */ nop @@ -4115,7 +4115,7 @@ glabel var7f1b8ed0pf /* f16ca14: 100000d4 */ b .PF0f16cd68 /* f16ca18: 8e830034 */ lw $v1,0x34($s4) .PF0f16ca1c: -/* f16ca1c: 0fc5b180 */ jal 0xf16c600 +/* f16ca1c: 0fc5b180 */ jal coreGetSlowMotionType /* f16ca20: 00000000 */ nop /* f16ca24: 8e8f0040 */ lw $t7,0x40($s4) /* f16ca28: 24010002 */ li $at,0x2 @@ -4237,7 +4237,7 @@ glabel var7f1b8ed0pf /* f16cbb8: 8d8d00d8 */ lw $t5,0xd8($t4) /* f16cbbc: 55a00007 */ bnezl $t5,.PF0f16cbdc /* f16cbc0: 8e89006c */ lw $t1,0x6c($s4) -/* f16cbc4: 0fc579c8 */ jal 0xf15e720 +/* f16cbc4: 0fc579c8 */ jal roomIsVisibleByPlayer /* f16cbc8: 86240000 */ lh $a0,0x0($s1) /* f16cbcc: 50400003 */ beqzl $v0,.PF0f16cbdc /* f16cbd0: 8e89006c */ lw $t1,0x6c($s4) @@ -4397,103 +4397,103 @@ glabel var7f1b8ed0pf /* f16cdd8: c4248ed0 */ lwc1 $f4,-0x7130($at) /* f16cddc: c6920044 */ lwc1 $f18,0x44($s4) /* f16cde0: 46049182 */ mul.s $f6,$f18,$f4 -/* f16cde4: 0fc2b039 */ jal 0xf0ac0e4 +/* f16cde4: 0fc2b039 */ jal speedpillTick /* f16cde8: e686004c */ swc1 $f6,0x4c($s4) -/* f16cdec: 0fc37e77 */ jal 0xf0df9dc +/* f16cdec: 0fc37e77 */ jal hudmsgsTick /* f16cdf0: 00000000 */ nop /* f16cdf4: 00002025 */ move $a0,$zero -/* f16cdf8: 0c00536a */ jal 0x14da8 +/* f16cdf8: 0c00536a */ jal contGetButtonsPressedThisFrame /* f16cdfc: 3405ffff */ li $a1,0xffff /* f16ce00: 1440005c */ bnez $v0,.PF0f16cf74 /* f16ce04: 00000000 */ nop -/* f16ce08: 0c0052e6 */ jal 0x14b98 +/* f16ce08: 0c0052e6 */ jal contGetStickX /* f16ce0c: 00002025 */ move $a0,$zero /* f16ce10: 2841000b */ slti $at,$v0,0xb /* f16ce14: 10200057 */ beqz $at,.PF0f16cf74 /* f16ce18: 00000000 */ nop -/* f16ce1c: 0c0052e6 */ jal 0x14b98 +/* f16ce1c: 0c0052e6 */ jal contGetStickX /* f16ce20: 00002025 */ move $a0,$zero /* f16ce24: 2841fff6 */ slti $at,$v0,-10 /* f16ce28: 14200052 */ bnez $at,.PF0f16cf74 /* f16ce2c: 00000000 */ nop -/* f16ce30: 0c005310 */ jal 0x14c40 +/* f16ce30: 0c005310 */ jal contGetStickY /* f16ce34: 00002025 */ move $a0,$zero /* f16ce38: 2841000b */ slti $at,$v0,0xb /* f16ce3c: 1020004d */ beqz $at,.PF0f16cf74 /* f16ce40: 00000000 */ nop -/* f16ce44: 0c005310 */ jal 0x14c40 +/* f16ce44: 0c005310 */ jal contGetStickY /* f16ce48: 00002025 */ move $a0,$zero /* f16ce4c: 2841fff6 */ slti $at,$v0,-10 /* f16ce50: 14200048 */ bnez $at,.PF0f16cf74 /* f16ce54: 24040001 */ li $a0,0x1 -/* f16ce58: 0c00536a */ jal 0x14da8 +/* f16ce58: 0c00536a */ jal contGetButtonsPressedThisFrame /* f16ce5c: 3405ffff */ li $a1,0xffff /* f16ce60: 14400044 */ bnez $v0,.PF0f16cf74 /* f16ce64: 00000000 */ nop -/* f16ce68: 0c0052e6 */ jal 0x14b98 +/* f16ce68: 0c0052e6 */ jal contGetStickX /* f16ce6c: 24040001 */ li $a0,0x1 /* f16ce70: 2841000b */ slti $at,$v0,0xb /* f16ce74: 1020003f */ beqz $at,.PF0f16cf74 /* f16ce78: 00000000 */ nop -/* f16ce7c: 0c0052e6 */ jal 0x14b98 +/* f16ce7c: 0c0052e6 */ jal contGetStickX /* f16ce80: 24040001 */ li $a0,0x1 /* f16ce84: 2841fff6 */ slti $at,$v0,-10 /* f16ce88: 1420003a */ bnez $at,.PF0f16cf74 /* f16ce8c: 00000000 */ nop -/* f16ce90: 0c005310 */ jal 0x14c40 +/* f16ce90: 0c005310 */ jal contGetStickY /* f16ce94: 24040001 */ li $a0,0x1 /* f16ce98: 2841000b */ slti $at,$v0,0xb /* f16ce9c: 10200035 */ beqz $at,.PF0f16cf74 /* f16cea0: 00000000 */ nop -/* f16cea4: 0c005310 */ jal 0x14c40 +/* f16cea4: 0c005310 */ jal contGetStickY /* f16cea8: 24040001 */ li $a0,0x1 /* f16ceac: 2841fff6 */ slti $at,$v0,-10 /* f16ceb0: 14200030 */ bnez $at,.PF0f16cf74 /* f16ceb4: 24040002 */ li $a0,0x2 -/* f16ceb8: 0c00536a */ jal 0x14da8 +/* f16ceb8: 0c00536a */ jal contGetButtonsPressedThisFrame /* f16cebc: 3405ffff */ li $a1,0xffff /* f16cec0: 1440002c */ bnez $v0,.PF0f16cf74 /* f16cec4: 00000000 */ nop -/* f16cec8: 0c0052e6 */ jal 0x14b98 +/* f16cec8: 0c0052e6 */ jal contGetStickX /* f16cecc: 24040002 */ li $a0,0x2 /* f16ced0: 2841000b */ slti $at,$v0,0xb /* f16ced4: 10200027 */ beqz $at,.PF0f16cf74 /* f16ced8: 00000000 */ nop -/* f16cedc: 0c0052e6 */ jal 0x14b98 +/* f16cedc: 0c0052e6 */ jal contGetStickX /* f16cee0: 24040002 */ li $a0,0x2 /* f16cee4: 2841fff6 */ slti $at,$v0,-10 /* f16cee8: 14200022 */ bnez $at,.PF0f16cf74 /* f16ceec: 00000000 */ nop -/* f16cef0: 0c005310 */ jal 0x14c40 +/* f16cef0: 0c005310 */ jal contGetStickY /* f16cef4: 24040002 */ li $a0,0x2 /* f16cef8: 2841000b */ slti $at,$v0,0xb /* f16cefc: 1020001d */ beqz $at,.PF0f16cf74 /* f16cf00: 00000000 */ nop -/* f16cf04: 0c005310 */ jal 0x14c40 +/* f16cf04: 0c005310 */ jal contGetStickY /* f16cf08: 24040002 */ li $a0,0x2 /* f16cf0c: 2841fff6 */ slti $at,$v0,-10 /* f16cf10: 14200018 */ bnez $at,.PF0f16cf74 /* f16cf14: 24040003 */ li $a0,0x3 -/* f16cf18: 0c00536a */ jal 0x14da8 +/* f16cf18: 0c00536a */ jal contGetButtonsPressedThisFrame /* f16cf1c: 3405ffff */ li $a1,0xffff /* f16cf20: 14400014 */ bnez $v0,.PF0f16cf74 /* f16cf24: 00000000 */ nop -/* f16cf28: 0c0052e6 */ jal 0x14b98 +/* f16cf28: 0c0052e6 */ jal contGetStickX /* f16cf2c: 24040003 */ li $a0,0x3 /* f16cf30: 2841000b */ slti $at,$v0,0xb /* f16cf34: 1020000f */ beqz $at,.PF0f16cf74 /* f16cf38: 00000000 */ nop -/* f16cf3c: 0c0052e6 */ jal 0x14b98 +/* f16cf3c: 0c0052e6 */ jal contGetStickX /* f16cf40: 24040003 */ li $a0,0x3 /* f16cf44: 2841fff6 */ slti $at,$v0,-10 /* f16cf48: 1420000a */ bnez $at,.PF0f16cf74 /* f16cf4c: 00000000 */ nop -/* f16cf50: 0c005310 */ jal 0x14c40 +/* f16cf50: 0c005310 */ jal contGetStickY /* f16cf54: 24040003 */ li $a0,0x3 /* f16cf58: 2841000b */ slti $at,$v0,0xb /* f16cf5c: 10200005 */ beqz $at,.PF0f16cf74 /* f16cf60: 00000000 */ nop -/* f16cf64: 0c005310 */ jal 0x14c40 +/* f16cf64: 0c005310 */ jal contGetStickY /* f16cf68: 24040003 */ li $a0,0x3 /* f16cf6c: 2841fff6 */ slti $at,$v0,-10 /* f16cf70: 1020000e */ beqz $at,.PF0f16cfac @@ -4507,9 +4507,9 @@ glabel var7f1b8ed0pf /* f16cf8c: 2401005a */ li $at,0x5a /* f16cf90: 51810006 */ beql $t4,$at,.PF0f16cfac /* f16cf94: ae000000 */ sw $zero,0x0($s0) -/* f16cf98: 0fc06a32 */ jal 0xf01a8c8 +/* f16cf98: 0fc06a32 */ jal titleSetNextMode /* f16cf9c: 24040005 */ li $a0,0x5 -/* f16cfa0: 0c0039af */ jal 0xe6bc +/* f16cfa0: 0c0039af */ jal mainSetStageNum /* f16cfa4: 2404005a */ li $a0,0x5a /* f16cfa8: ae000000 */ sw $zero,0x0($s0) .PF0f16cfac: @@ -4527,98 +4527,98 @@ glabel var7f1b8ed0pf /* f16cfd4: 00002025 */ move $a0,$zero /* f16cfd8: 15e0006b */ bnez $t7,.PF0f16d188 /* f16cfdc: 00000000 */ nop -/* f16cfe0: 0c00533a */ jal 0x14ce8 +/* f16cfe0: 0c00533a */ jal contGetButtons /* f16cfe4: 3405ffff */ li $a1,0xffff /* f16cfe8: 14400063 */ bnez $v0,.PF0f16d178 /* f16cfec: 00000000 */ nop -/* f16cff0: 0c0052e6 */ jal 0x14b98 +/* f16cff0: 0c0052e6 */ jal contGetStickX /* f16cff4: 00002025 */ move $a0,$zero /* f16cff8: 2841000a */ slti $at,$v0,0xa /* f16cffc: 1020005e */ beqz $at,.PF0f16d178 /* f16d000: 00000000 */ nop -/* f16d004: 0c0052e6 */ jal 0x14b98 +/* f16d004: 0c0052e6 */ jal contGetStickX /* f16d008: 00002025 */ move $a0,$zero /* f16d00c: 2841fff7 */ slti $at,$v0,-9 /* f16d010: 14200059 */ bnez $at,.PF0f16d178 /* f16d014: 00000000 */ nop -/* f16d018: 0c005310 */ jal 0x14c40 +/* f16d018: 0c005310 */ jal contGetStickY /* f16d01c: 00002025 */ move $a0,$zero /* f16d020: 2841000a */ slti $at,$v0,0xa /* f16d024: 10200054 */ beqz $at,.PF0f16d178 /* f16d028: 00000000 */ nop -/* f16d02c: 0c005310 */ jal 0x14c40 +/* f16d02c: 0c005310 */ jal contGetStickY /* f16d030: 00002025 */ move $a0,$zero /* f16d034: 2841fff7 */ slti $at,$v0,-9 /* f16d038: 1420004f */ bnez $at,.PF0f16d178 /* f16d03c: 24040001 */ li $a0,0x1 -/* f16d040: 0c00533a */ jal 0x14ce8 +/* f16d040: 0c00533a */ jal contGetButtons /* f16d044: 3405ffff */ li $a1,0xffff /* f16d048: 1440004b */ bnez $v0,.PF0f16d178 /* f16d04c: 00000000 */ nop -/* f16d050: 0c0052e6 */ jal 0x14b98 +/* f16d050: 0c0052e6 */ jal contGetStickX /* f16d054: 24040001 */ li $a0,0x1 /* f16d058: 2841000a */ slti $at,$v0,0xa /* f16d05c: 10200046 */ beqz $at,.PF0f16d178 /* f16d060: 00000000 */ nop -/* f16d064: 0c0052e6 */ jal 0x14b98 +/* f16d064: 0c0052e6 */ jal contGetStickX /* f16d068: 24040001 */ li $a0,0x1 /* f16d06c: 2841fff7 */ slti $at,$v0,-9 /* f16d070: 14200041 */ bnez $at,.PF0f16d178 /* f16d074: 00000000 */ nop -/* f16d078: 0c005310 */ jal 0x14c40 +/* f16d078: 0c005310 */ jal contGetStickY /* f16d07c: 24040001 */ li $a0,0x1 /* f16d080: 2841000a */ slti $at,$v0,0xa /* f16d084: 1020003c */ beqz $at,.PF0f16d178 /* f16d088: 00000000 */ nop -/* f16d08c: 0c005310 */ jal 0x14c40 +/* f16d08c: 0c005310 */ jal contGetStickY /* f16d090: 24040001 */ li $a0,0x1 /* f16d094: 2841fff7 */ slti $at,$v0,-9 /* f16d098: 14200037 */ bnez $at,.PF0f16d178 /* f16d09c: 24040002 */ li $a0,0x2 -/* f16d0a0: 0c00533a */ jal 0x14ce8 +/* f16d0a0: 0c00533a */ jal contGetButtons /* f16d0a4: 3405ffff */ li $a1,0xffff /* f16d0a8: 14400033 */ bnez $v0,.PF0f16d178 /* f16d0ac: 00000000 */ nop -/* f16d0b0: 0c0052e6 */ jal 0x14b98 +/* f16d0b0: 0c0052e6 */ jal contGetStickX /* f16d0b4: 24040002 */ li $a0,0x2 /* f16d0b8: 2841000a */ slti $at,$v0,0xa /* f16d0bc: 1020002e */ beqz $at,.PF0f16d178 /* f16d0c0: 00000000 */ nop -/* f16d0c4: 0c0052e6 */ jal 0x14b98 +/* f16d0c4: 0c0052e6 */ jal contGetStickX /* f16d0c8: 24040002 */ li $a0,0x2 /* f16d0cc: 2841fff7 */ slti $at,$v0,-9 /* f16d0d0: 14200029 */ bnez $at,.PF0f16d178 /* f16d0d4: 00000000 */ nop -/* f16d0d8: 0c005310 */ jal 0x14c40 +/* f16d0d8: 0c005310 */ jal contGetStickY /* f16d0dc: 24040002 */ li $a0,0x2 /* f16d0e0: 2841000a */ slti $at,$v0,0xa /* f16d0e4: 10200024 */ beqz $at,.PF0f16d178 /* f16d0e8: 00000000 */ nop -/* f16d0ec: 0c005310 */ jal 0x14c40 +/* f16d0ec: 0c005310 */ jal contGetStickY /* f16d0f0: 24040002 */ li $a0,0x2 /* f16d0f4: 2841fff7 */ slti $at,$v0,-9 /* f16d0f8: 1420001f */ bnez $at,.PF0f16d178 /* f16d0fc: 24040003 */ li $a0,0x3 -/* f16d100: 0c00533a */ jal 0x14ce8 +/* f16d100: 0c00533a */ jal contGetButtons /* f16d104: 3405ffff */ li $a1,0xffff /* f16d108: 1440001b */ bnez $v0,.PF0f16d178 /* f16d10c: 00000000 */ nop -/* f16d110: 0c0052e6 */ jal 0x14b98 +/* f16d110: 0c0052e6 */ jal contGetStickX /* f16d114: 24040003 */ li $a0,0x3 /* f16d118: 2841000a */ slti $at,$v0,0xa /* f16d11c: 10200016 */ beqz $at,.PF0f16d178 /* f16d120: 00000000 */ nop -/* f16d124: 0c0052e6 */ jal 0x14b98 +/* f16d124: 0c0052e6 */ jal contGetStickX /* f16d128: 24040003 */ li $a0,0x3 /* f16d12c: 2841fff7 */ slti $at,$v0,-9 /* f16d130: 14200011 */ bnez $at,.PF0f16d178 /* f16d134: 00000000 */ nop -/* f16d138: 0c005310 */ jal 0x14c40 +/* f16d138: 0c005310 */ jal contGetStickY /* f16d13c: 24040003 */ li $a0,0x3 /* f16d140: 2841000a */ slti $at,$v0,0xa /* f16d144: 1020000c */ beqz $at,.PF0f16d178 /* f16d148: 00000000 */ nop -/* f16d14c: 0c005310 */ jal 0x14c40 +/* f16d14c: 0c005310 */ jal contGetStickY /* f16d150: 24040003 */ li $a0,0x3 /* f16d154: 2841fff7 */ slti $at,$v0,-9 /* f16d158: 14200007 */ bnez $at,.PF0f16d178 @@ -4702,12 +4702,12 @@ glabel var7f1b8ed0pf /* f16d274: 5b200033 */ blezl $t9,.PF0f16d344 /* f16d278: 0266082a */ slt $at,$s3,$a2 .PF0f16d27c: -/* f16d27c: 0fc4a4ff */ jal 0xf1293fc +/* f16d27c: 0fc4a4ff */ jal setCurrentPlayerNum /* f16d280: 02002025 */ move $a0,$s0 -/* f16d284: 0fc5bdaa */ jal 0xf16f6a8 +/* f16d284: 0fc5bdaa */ jal langGet /* f16d288: 24045807 */ li $a0,0x5807 /* f16d28c: 00402025 */ move $a0,$v0 -/* f16d290: 0fc37954 */ jal 0xf0de550 +/* f16d290: 0fc37954 */ jal hudmsgCreateViaPreset /* f16d294: 00002825 */ move $a1,$zero /* f16d298: 8e8c006c */ lw $t4,0x6c($s4) /* f16d29c: 26100001 */ addiu $s0,$s0,0x1 @@ -4762,7 +4762,7 @@ glabel var7f1b8ed0pf /* f16d348: 0246082a */ slt $at,$s2,$a2 /* f16d34c: 54200010 */ bnezl $at,.PF0f16d390 /* f16d350: 24d9fe0c */ addiu $t9,$a2,-500 -/* f16d354: 0c0038f9 */ jal 0xe3e4 +/* f16d354: 0c0038f9 */ jal mainEndStage /* f16d358: 00000000 */ nop /* f16d35c: 3c068008 */ lui $a2,0x8008 /* f16d360: 8cc64568 */ lw $a2,0x4568($a2) @@ -4786,7 +4786,7 @@ glabel var7f1b8ed0pf /* f16d3a0: 8e0c0000 */ lw $t4,0x0($s0) /* f16d3a4: 55800021 */ bnezl $t4,.PF0f16d42c /* f16d3a8: 8e8e0034 */ lw $t6,0x34($s4) -/* f16d3ac: 0fc5b6f7 */ jal 0xf16dbdc +/* f16d3ac: 0fc5b6f7 */ jal coreIsPaused /* f16d3b0: 00000000 */ nop /* f16d3b4: 1440001c */ bnez $v0,.PF0f16d428 /* f16d3b8: 3c0d8008 */ lui $t5,0x8008 @@ -4815,7 +4815,7 @@ glabel var7f1b8ed0pf /* f16d414: afb80010 */ sw $t8,0x10($sp) /* f16d418: 24067fff */ li $a2,0x7fff /* f16d41c: 24070040 */ li $a3,0x40 -/* f16d420: 0c004125 */ jal 0x10494 +/* f16d420: 0c004125 */ jal func00010718 /* f16d424: e7a80014 */ swc1 $f8,0x14($sp) .PF0f16d428: /* f16d428: 8e8e0034 */ lw $t6,0x34($s4) @@ -4929,7 +4929,7 @@ glabel var7f1b8ed0pf /* f16d598: 27a4016c */ addiu $a0,$sp,0x16c /* f16d59c: 1b200017 */ blez $t9,.PF0f16d5fc /* f16d5a0: 00000000 */ nop -/* f16d5a4: 0fc625a2 */ jal 0xf189688 +/* f16d5a4: 0fc625a2 */ jal mpGetPlayerRankings /* f16d5a8: 00005825 */ move $t3,$zero /* f16d5ac: 18400013 */ blez $v0,.PF0f16d5fc /* f16d5b0: 00401825 */ move $v1,$v0 @@ -4959,7 +4959,7 @@ glabel var7f1b8ed0pf /* f16d604: 27a40078 */ addiu $a0,$sp,0x78 /* f16d608: 5b200018 */ blezl $t9,.PF0f16d66c /* f16d60c: 8e390000 */ lw $t9,0x0($s1) -/* f16d610: 0fc626ca */ jal 0xf189b28 +/* f16d610: 0fc626ca */ jal mpGetTeamRankings /* f16d614: 00005825 */ move $t3,$zero /* f16d618: 18400013 */ blez $v0,.PF0f16d668 /* f16d61c: 00401825 */ move $v1,$v0 @@ -4990,7 +4990,7 @@ glabel var7f1b8ed0pf /* f16d670: 00000000 */ nop /* f16d674: 16000003 */ bnez $s0,.PF0f16d684 /* f16d678: 00000000 */ nop -/* f16d67c: 0c0038f9 */ jal 0xe3e4 +/* f16d67c: 0c0038f9 */ jal mainEndStage /* f16d680: 00000000 */ nop .PF0f16d684: /* f16d684: 3c0c8008 */ lui $t4,0x8008 @@ -5006,26 +5006,26 @@ glabel var7f1b8ed0pf /* f16d6ac: 44812000 */ mtc1 $at,$f4 /* f16d6b0: 3c018008 */ lui $at,0x8008 /* f16d6b4: 46049183 */ div.s $f6,$f18,$f4 -/* f16d6b8: 0c002e99 */ jal 0xba64 +/* f16d6b8: 0c002e99 */ jal viSetUseZBuf /* f16d6bc: e426457c */ swc1 $f6,0x457c($at) /* f16d6c0: 8e8204b4 */ lw $v0,0x4b4($s4) /* f16d6c4: 2401004e */ li $at,0x4e /* f16d6c8: 54410007 */ bnel $v0,$at,.PF0f16d6e8 /* f16d6cc: 2401005a */ li $at,0x5a -/* f16d6d0: 0fc06bc9 */ jal 0xf01af24 +/* f16d6d0: 0fc06bc9 */ jal titleTickOld /* f16d6d4: 00000000 */ nop -/* f16d6d8: 0c0046c5 */ jal 0x11b14 +/* f16d6d8: 0c0046c5 */ jal func00011d84 /* f16d6dc: 00000000 */ nop /* f16d6e0: 8e8204b4 */ lw $v0,0x4b4($s4) /* f16d6e4: 2401005a */ li $at,0x5a .PF0f16d6e8: /* f16d6e8: 5441000a */ bnel $v0,$at,.PF0f16d714 /* f16d6ec: 2401005b */ li $at,0x5b -/* f16d6f0: 0fc06a3d */ jal 0xf01a8f4 +/* f16d6f0: 0fc06a3d */ jal titleTick /* f16d6f4: 00000000 */ nop -/* f16d6f8: 0fc0764c */ jal 0xf01d930 +/* f16d6f8: 0fc0764c */ jal func0f01d860 /* f16d6fc: 00000000 */ nop -/* f16d700: 0c0046c5 */ jal 0x11b14 +/* f16d700: 0c0046c5 */ jal func00011d84 /* f16d704: 00000000 */ nop /* f16d708: 10000089 */ b .PF0f16d930 /* f16d70c: 8fbf0044 */ lw $ra,0x44($sp) @@ -5033,17 +5033,17 @@ glabel var7f1b8ed0pf .PF0f16d714: /* f16d714: 54410010 */ bnel $v0,$at,.PF0f16d758 /* f16d718: 2401005d */ li $at,0x5d -/* f16d71c: 0fc4a4ff */ jal 0xf1293fc +/* f16d71c: 0fc4a4ff */ jal setCurrentPlayerNum /* f16d720: 00002025 */ move $a0,$zero -/* f16d724: 0fc2f738 */ jal 0xf0bdce0 +/* f16d724: 0fc2f738 */ jal currentPlayerConfigureVi /* f16d728: 00000000 */ nop -/* f16d72c: 0fc07006 */ jal 0xf01c018 +/* f16d72c: 0fc07006 */ jal menuTickAll /* f16d730: 00000000 */ nop -/* f16d734: 0c0046c5 */ jal 0x11b14 +/* f16d734: 0c0046c5 */ jal func00011d84 /* f16d738: 00000000 */ nop -/* f16d73c: 0fc0764c */ jal 0xf01d930 +/* f16d73c: 0fc0764c */ jal func0f01d860 /* f16d740: 00000000 */ nop -/* f16d744: 0fc474a7 */ jal 0xf11d29c +/* f16d744: 0fc474a7 */ jal pakExecuteDebugOperations /* f16d748: 00000000 */ nop /* f16d74c: 10000078 */ b .PF0f16d930 /* f16d750: 8fbf0044 */ lw $ra,0x44($sp) @@ -5051,13 +5051,13 @@ glabel var7f1b8ed0pf .PF0f16d758: /* f16d758: 5441000c */ bnel $v0,$at,.PF0f16d78c /* f16d75c: 2401005c */ li $at,0x5c -/* f16d760: 0fc07006 */ jal 0xf01c018 +/* f16d760: 0fc07006 */ jal menuTickAll /* f16d764: 00000000 */ nop -/* f16d768: 0c0046c5 */ jal 0x11b14 +/* f16d768: 0c0046c5 */ jal func00011d84 /* f16d76c: 00000000 */ nop -/* f16d770: 0fc0764c */ jal 0xf01d930 +/* f16d770: 0fc0764c */ jal func0f01d860 /* f16d774: 00000000 */ nop -/* f16d778: 0fc474a7 */ jal 0xf11d29c +/* f16d778: 0fc474a7 */ jal pakExecuteDebugOperations /* f16d77c: 00000000 */ nop /* f16d780: 1000006b */ b .PF0f16d930 /* f16d784: 8fbf0044 */ lw $ra,0x44($sp) @@ -5065,84 +5065,84 @@ glabel var7f1b8ed0pf .PF0f16d78c: /* f16d78c: 14410007 */ bne $v0,$at,.PF0f16d7ac /* f16d790: 00000000 */ nop -/* f16d794: 0c0046c5 */ jal 0x11b14 +/* f16d794: 0c0046c5 */ jal func00011d84 /* f16d798: 00000000 */ nop -/* f16d79c: 0fc0764c */ jal 0xf01d930 +/* f16d79c: 0fc0764c */ jal func0f01d860 /* f16d7a0: 00000000 */ nop /* f16d7a4: 10000062 */ b .PF0f16d930 /* f16d7a8: 8fbf0044 */ lw $ra,0x44($sp) .PF0f16d7ac: -/* f16d7ac: 0fc5b16f */ jal 0xf16c5bc +/* f16d7ac: 0fc5b16f */ jal coreUpdateCutsceneTime /* f16d7b0: 00000000 */ nop -/* f16d7b4: 0fc4a79b */ jal 0xf129e6c +/* f16d7b4: 0fc4a79b */ jal func0f12939c /* f16d7b8: 00000000 */ nop -/* f16d7bc: 0fc5af9f */ jal 0xf16be7c +/* f16d7bc: 0fc5af9f */ jal coreUpdateSoloHandicaps /* f16d7c0: 00000000 */ nop -/* f16d7c4: 0fc07678 */ jal 0xf01d9e0 +/* f16d7c4: 0fc07678 */ jal func0f01d8c0 /* f16d7c8: 00000000 */ nop -/* f16d7cc: 0fc076ac */ jal 0xf01dab0 +/* f16d7cc: 0fc076ac */ jal func0f01d990 /* f16d7d0: 00000000 */ nop -/* f16d7d4: 0fc077a3 */ jal 0xf01de8c +/* f16d7d4: 0fc077a3 */ jal casingsTick /* f16d7d8: 00000000 */ nop -/* f16d7dc: 0fc077d4 */ jal 0xf01df50 +/* f16d7dc: 0fc077d4 */ jal shardsTick /* f16d7e0: 00000000 */ nop -/* f16d7e4: 0fc0785c */ jal 0xf01e170 +/* f16d7e4: 0fc0785c */ jal sparksTick /* f16d7e8: 00000000 */ nop -/* f16d7ec: 0fc4fdad */ jal 0xf13f6b4 +/* f16d7ec: 0fc4fdad */ jal func0f13eb44 /* f16d7f0: 00000000 */ nop -/* f16d7f4: 0fc52945 */ jal 0xf14a514 +/* f16d7f4: 0fc52945 */ jal func0f149864 /* f16d7f8: 00000000 */ nop /* f16d7fc: 3c0f8006 */ lui $t7,0x8006 /* f16d800: 8def20c0 */ lw $t7,0x20c0($t7) /* f16d804: 11e00003 */ beqz $t7,.PF0f16d814 /* f16d808: 00000000 */ nop -/* f16d80c: 0fc07610 */ jal 0xf01d840 +/* f16d80c: 0fc07610 */ jal weatherTick /* f16d810: 00000000 */ nop .PF0f16d814: /* f16d814: 3c188006 */ lui $t8,0x8006 /* f16d818: 8f181310 */ lw $t8,0x1310($t8) /* f16d81c: 13000003 */ beqz $t8,.PF0f16d82c /* f16d820: 00000000 */ nop -/* f16d824: 0fc027af */ jal 0xf009ebc +/* f16d824: 0fc027af */ jal nbombsTick /* f16d828: 00000000 */ nop .PF0f16d82c: -/* f16d82c: 0fc5a302 */ jal 0xf168c08 +/* f16d82c: 0fc5a302 */ jal coreUpdateMiscSfx /* f16d830: 00000000 */ nop -/* f16d834: 0c003f01 */ jal 0xfc04 +/* f16d834: 0c003f01 */ jal func0000fe88 /* f16d838: 00000000 */ nop -/* f16d83c: 0fc474a7 */ jal 0xf11d29c +/* f16d83c: 0fc474a7 */ jal pakExecuteDebugOperations /* f16d840: 00000000 */ nop -/* f16d844: 0fc00cec */ jal 0xf0033b0 +/* f16d844: 0fc00cec */ jal lightingTick /* f16d848: 00000000 */ nop -/* f16d84c: 0fc2cb89 */ jal 0xf0b2e24 +/* f16d84c: 0fc2cb89 */ jal func0f0b2904 /* f16d850: 00000000 */ nop -/* f16d854: 0fc2bd1e */ jal 0xf0af478 +/* f16d854: 0fc2bd1e */ jal func0f0aefb8 /* f16d858: 00000000 */ nop -/* f16d85c: 0fc06c94 */ jal 0xf01b250 +/* f16d85c: 0fc06c94 */ jal amTick /* f16d860: 00000000 */ nop -/* f16d864: 0fc07006 */ jal 0xf01c018 +/* f16d864: 0fc07006 */ jal menuTickAll /* f16d868: 00000000 */ nop -/* f16d86c: 0fc619ac */ jal 0xf1866b0 +/* f16d86c: 0fc619ac */ jal scenarioTick /* f16d870: 00000000 */ nop /* f16d874: 3c198006 */ lui $t9,0x8006 /* f16d878: 8f39d670 */ lw $t9,-0x2990($t9) /* f16d87c: 17200003 */ bnez $t9,.PF0f16d88c /* f16d880: 00000000 */ nop -/* f16d884: 0fc078dc */ jal 0xf01e370 +/* f16d884: 0fc078dc */ jal func0f01e250 /* f16d888: 00000000 */ nop .PF0f16d88c: -/* f16d88c: 0c0046c5 */ jal 0x11b14 +/* f16d88c: 0c0046c5 */ jal func00011d84 /* f16d890: 00000000 */ nop -/* f16d894: 0fc0764c */ jal 0xf01d930 +/* f16d894: 0fc0764c */ jal func0f01d860 /* f16d898: 00000000 */ nop -/* f16d89c: 0fc19017 */ jal 0xf06405c +/* f16d89c: 0fc19017 */ jal func0f063dcc /* f16d8a0: 00000000 */ nop -/* f16d8a4: 0c0039b9 */ jal 0xe6e4 +/* f16d8a4: 0c0039b9 */ jal mainGetStageNum /* f16d8a8: 00000000 */ nop /* f16d8ac: 24010026 */ li $at,0x26 /* f16d8b0: 5441001f */ bnel $v0,$at,.PF0f16d930 /* f16d8b4: 8fbf0044 */ lw $ra,0x44($sp) -/* f16d8b8: 0fc68a40 */ jal 0xf1a2900 +/* f16d8b8: 0fc68a40 */ jal dtGetData /* f16d8bc: 00000000 */ nop /* f16d8c0: 8e8c0284 */ lw $t4,0x284($s4) /* f16d8c4: 8d8e00bc */ lw $t6,0xbc($t4) @@ -5162,17 +5162,17 @@ glabel var7f1b8ed0pf /* f16d8f8: 15e00003 */ bnez $t7,.PF0f16d908 /* f16d8fc: 00000000 */ nop .PF0f16d900: -/* f16d900: 0fc12838 */ jal 0xf04a0e0 +/* f16d900: 0fc12838 */ jal chrUnsetStageFlag /* f16d904: 24050001 */ li $a1,0x1 .PF0f16d908: -/* f16d908: 0fc682aa */ jal 0xf1a0aa8 +/* f16d908: 0fc682aa */ jal frTick /* f16d90c: 00000000 */ nop /* f16d910: 8e980034 */ lw $t8,0x34($s4) /* f16d914: 53000006 */ beqzl $t8,.PF0f16d930 /* f16d918: 8fbf0044 */ lw $ra,0x44($sp) -/* f16d91c: 0fc68aa0 */ jal 0xf1a2a80 +/* f16d91c: 0fc68aa0 */ jal dtTick /* f16d920: 00000000 */ nop -/* f16d924: 0fc68c56 */ jal 0xf1a3158 +/* f16d924: 0fc68c56 */ jal htTick /* f16d928: 00000000 */ nop /* f16d92c: 8fbf0044 */ lw $ra,0x44($sp) .PF0f16d930: diff --git a/src/game/credits.c b/src/game/credits.c index 474b83ffb..c5ba05bda 100644 --- a/src/game/credits.c +++ b/src/game/credits.c @@ -3008,7 +3008,7 @@ glabel var7f1b6c50pf /* f13afc8: 4481a000 */ mtc1 $at,$f20 /* f13afcc: 27b601c4 */ addiu $s6,$sp,0x1c4 .PF0f13afd0: -/* f13afd0: 0fc4eb19 */ jal 0xf13ac64 +/* f13afd0: 0fc4eb19 */ jal creditGetByRow /* f13afd4: 02a02025 */ move $a0,$s5 /* f13afd8: 1440000d */ bnez $v0,.PF0f13b010 /* f13afdc: aec20000 */ sw $v0,0x0($s6) @@ -3048,11 +3048,11 @@ glabel var7f1b6c50pf /* f13b060: 0058a021 */ addu $s4,$v0,$t8 /* f13b064: afaf0074 */ sw $t7,0x74($sp) /* f13b068: afae0078 */ sw $t6,0x78($sp) -/* f13b06c: 0fc5bdaa */ jal 0xf16f6a8 +/* f13b06c: 0fc5bdaa */ jal langGet /* f13b070: afac0080 */ sw $t4,0x80($sp) /* f13b074: 8ed90000 */ lw $t9,0x0($s6) /* f13b078: ae820000 */ sw $v0,0x0($s4) -/* f13b07c: 0fc5bdaa */ jal 0xf16f6a8 +/* f13b07c: 0fc5bdaa */ jal langGet /* f13b080: 97240004 */ lhu $a0,0x4($t9) /* f13b084: 8ec30000 */ lw $v1,0x0($s6) /* f13b088: ae820004 */ sw $v0,0x4($s4) @@ -3144,7 +3144,7 @@ glabel var7f1b6c50pf /* f13b1c4: afb800d8 */ sw $t8,0xd8($sp) /* f13b1c8: 8e860000 */ lw $a2,0x0($s4) /* f13b1cc: afa00014 */ sw $zero,0x14($sp) -/* f13b1d0: 0fc5609a */ jal 0xf158268 +/* f13b1d0: 0fc5609a */ jal textMeasure /* f13b1d4: afa20010 */ sw $v0,0x10($sp) /* f13b1d8: 8e390004 */ lw $t9,0x4($s1) /* f13b1dc: 8e860004 */ lw $a2,0x4($s4) @@ -3152,7 +3152,7 @@ glabel var7f1b6c50pf /* f13b1e4: afa00014 */ sw $zero,0x14($sp) /* f13b1e8: 8fa40078 */ lw $a0,0x78($sp) /* f13b1ec: 8fa50074 */ lw $a1,0x74($sp) -/* f13b1f0: 0fc5609a */ jal 0xf158268 +/* f13b1f0: 0fc5609a */ jal textMeasure /* f13b1f4: afb90010 */ sw $t9,0x10($sp) /* f13b1f8: 8ec30000 */ lw $v1,0x0($s6) /* f13b1fc: 906a0001 */ lbu $t2,0x1($v1) @@ -3242,7 +3242,7 @@ glabel var7f1b6c50pf /* f13b330: 00000000 */ nop /* f13b334: 0000a825 */ move $s5,$zero .PF0f13b338: -/* f13b338: 0fc550cf */ jal 0xf15433c +/* f13b338: 0fc550cf */ jal func0f153628 /* f13b33c: 8fa401d8 */ lw $a0,0x1d8($sp) /* f13b340: 3c04800a */ lui $a0,0x800a /* f13b344: 8c844710 */ lw $a0,0x4710($a0) @@ -3397,7 +3397,7 @@ glabel var7f1b6c50pf /* f13b55c: e7ae001c */ swc1 $f14,0x1c($sp) /* f13b560: e7ac0018 */ swc1 $f12,0x18($sp) /* f13b564: 03133021 */ addu $a2,$t8,$s3 -/* f13b568: 0fc4e954 */ jal 0xf13a550 +/* f13b568: 0fc4e954 */ jal func0f1399d0 /* f13b56c: afaa0014 */ sw $t2,0x14($sp) /* f13b570: 3c04800a */ lui $a0,0x800a /* f13b574: 8c844710 */ lw $a0,0x4710($a0) @@ -3588,7 +3588,7 @@ glabel var7f1b6c50pf .PF0f13b810: /* f13b810: 50e0002c */ beqzl $a3,.PF0f13b8c4 /* f13b814: 8fad0074 */ lw $t5,0x74($sp) -/* f13b818: 0c004ad4 */ jal 0x12b50 +/* f13b818: 0c004ad4 */ jal random /* f13b81c: 00000000 */ nop /* f13b820: 3c18800a */ lui $t8,0x800a /* f13b824: 8f184710 */ lw $t8,0x4710($t8) @@ -3603,7 +3603,7 @@ glabel var7f1b6c50pf .PF0f13b848: /* f13b848: 5581001e */ bnel $t4,$at,.PF0f13b8c4 /* f13b84c: 8fad0074 */ lw $t5,0x74($sp) -/* f13b850: 0c004ad4 */ jal 0x12b50 +/* f13b850: 0c004ad4 */ jal random /* f13b854: 00000000 */ nop /* f13b858: 44823000 */ mtc1 $v0,$f6 /* f13b85c: 3c014f80 */ lui $at,0x4f80 @@ -3620,12 +3620,12 @@ glabel var7f1b6c50pf /* f13b884: 46082182 */ mul.s $f6,$f4,$f8 /* f13b888: 00000000 */ nop /* f13b88c: 460a3582 */ mul.s $f22,$f6,$f10 -/* f13b890: 0c004ad4 */ jal 0x12b50 +/* f13b890: 0c004ad4 */ jal random /* f13b894: 00000000 */ nop /* f13b898: 24010003 */ li $at,0x3 /* f13b89c: 0041001b */ divu $zero,$v0,$at /* f13b8a0: 00008010 */ mfhi $s0 -/* f13b8a4: 0c004ad4 */ jal 0x12b50 +/* f13b8a4: 0c004ad4 */ jal random /* f13b8a8: 00000000 */ nop /* f13b8ac: 24010003 */ li $at,0x3 /* f13b8b0: 0041001b */ divu $zero,$v0,$at @@ -3647,7 +3647,7 @@ glabel var7f1b6c50pf /* f13b8ec: e7b60018 */ swc1 $f22,0x18($sp) /* f13b8f0: 8fa401d8 */ lw $a0,0x1d8($sp) /* f13b8f4: 01733021 */ addu $a2,$t3,$s3 -/* f13b8f8: 0fc4ea47 */ jal 0xf13a91c +/* f13b8f8: 0fc4ea47 */ jal func0f139d9c /* f13b8fc: afb80014 */ sw $t8,0x14($sp) /* f13b900: 3c04800a */ lui $a0,0x800a /* f13b904: 8c844710 */ lw $a0,0x4710($a0) @@ -3661,7 +3661,7 @@ glabel var7f1b6c50pf /* f13b920: 1420ff24 */ bnez $at,.PF0f13b5b4 /* f13b924: 24050002 */ li $a1,0x2 .PF0f13b928: -/* f13b928: 0fc55125 */ jal 0xf154494 +/* f13b928: 0fc55125 */ jal func0f153780 /* f13b92c: 8fa401d8 */ lw $a0,0x1d8($sp) .PF0f13b930: /* f13b930: 8fbf0064 */ lw $ra,0x64($sp) @@ -4563,28 +4563,28 @@ glabel var7f1b5948 /* f13bbc8: 27bdff58 */ addiu $sp,$sp,-168 /* f13bbcc: afbf001c */ sw $ra,0x1c($sp) /* f13bbd0: afb00018 */ sw $s0,0x18($sp) -/* f13bbd4: 0fc5a246 */ jal 0xf168918 +/* f13bbd4: 0fc5a246 */ jal gfxAllocateMatrix /* f13bbd8: 00808025 */ move $s0,$a0 /* f13bbdc: afa20064 */ sw $v0,0x64($sp) -/* f13bbe0: 0fc54fa3 */ jal 0xf153e8c +/* f13bbe0: 0fc54fa3 */ jal func0f1531dc /* f13bbe4: 00002025 */ move $a0,$zero /* f13bbe8: 240e0001 */ li $t6,0x1 /* f13bbec: 3c018008 */ lui $at,0x8008 /* f13bbf0: ac2e0020 */ sw $t6,0x20($at) -/* f13bbf4: 0c002bf1 */ jal 0xafc4 +/* f13bbf4: 0c002bf1 */ jal func0000b280 /* f13bbf8: 02002025 */ move $a0,$s0 -/* f13bbfc: 0c002bc5 */ jal 0xaf14 +/* f13bbfc: 0c002bc5 */ jal func0000b1d0 /* f13bc00: 00402025 */ move $a0,$v0 /* f13bc04: 00402025 */ move $a0,$v0 -/* f13bc08: 0fc4e40d */ jal 0xf139034 +/* f13bc08: 0fc4e40d */ jal creditsClearFramebuffer /* f13bc0c: 240500ff */ li $a1,0xff /* f13bc10: 3c0fed00 */ lui $t7,0xed00 /* f13bc14: 35ef0078 */ ori $t7,$t7,0x78 /* f13bc18: afa20048 */ sw $v0,0x48($sp) /* f13bc1c: ac4f0000 */ sw $t7,0x0($v0) -/* f13bc20: 0c002e53 */ jal 0xb94c +/* f13bc20: 0c002e53 */ jal viGetWidth /* f13bc24: 24500008 */ addiu $s0,$v0,0x8 -/* f13bc28: 0c002e57 */ jal 0xb95c +/* f13bc28: 0c002e57 */ jal viGetHeight /* f13bc2c: a7a20036 */ sh $v0,0x36($sp) /* f13bc30: 2458ffe2 */ addiu $t8,$v0,-30 /* f13bc34: 44982000 */ mtc1 $t8,$f4 @@ -4606,7 +4606,7 @@ glabel var7f1b5948 /* f13bc74: 318d0fff */ andi $t5,$t4,0xfff /* f13bc78: 000d7300 */ sll $t6,$t5,0xc /* f13bc7c: 012e7825 */ or $t7,$t1,$t6 -/* f13bc80: 0fc4ee5c */ jal 0xf13b970 +/* f13bc80: 0fc4ee5c */ jal creditsTick /* f13bc84: af0f0004 */ sw $t7,0x4($t8) /* f13bc88: 3c07800a */ lui $a3,0x800a /* f13bc8c: 24e74710 */ addiu $a3,$a3,0x4710 @@ -4635,7 +4635,7 @@ glabel var7f1b5948 /* f13bce4: 15000007 */ bnez $t0,.PF0f13bd04 /* f13bce8: 3c018008 */ lui $at,0x8008 /* f13bcec: acaa0000 */ sw $t2,0x0($a1) -/* f13bcf0: 0fc3cfbe */ jal 0xf0f3ef8 +/* f13bcf0: 0fc3cfbe */ jal func0f0f37a4 /* f13bcf4: ac20fc3c */ sw $zero,-0x3c4($at) /* f13bcf8: 3c07800a */ lui $a3,0x800a /* f13bcfc: 24e74710 */ addiu $a3,$a3,0x4710 @@ -4712,28 +4712,28 @@ glabel var7f1b5948 /* f13be0c: ad2034a4 */ sw $zero,0x34a4($t1) /* f13be10: 8ce50000 */ lw $a1,0x0($a3) /* f13be14: ac22fc3c */ sw $v0,-0x3c4($at) -/* f13be18: 0fc3d001 */ jal 0xf0f4004 +/* f13be18: 0fc3d001 */ jal func0f0f38b0 /* f13be1c: 24a52ef0 */ addiu $a1,$a1,0x2ef0 /* f13be20: 3c0e0102 */ lui $t6,0x102 /* f13be24: 35ce0040 */ ori $t6,$t6,0x40 /* f13be28: afa20040 */ sw $v0,0x40($sp) /* f13be2c: ac4e0000 */ sw $t6,0x0($v0) /* f13be30: 8fa40064 */ lw $a0,0x64($sp) -/* f13be34: 0c012ab0 */ jal 0x4aac0 +/* f13be34: 0c012ab0 */ jal osVirtualToPhysical /* f13be38: 24500008 */ addiu $s0,$v0,0x8 /* f13be3c: 8faf0040 */ lw $t7,0x40($sp) /* f13be40: 02002025 */ move $a0,$s0 /* f13be44: 240500d8 */ li $a1,0xd8 -/* f13be48: 0fc4e40d */ jal 0xf139034 +/* f13be48: 0fc4e40d */ jal creditsClearFramebuffer /* f13be4c: ade20004 */ sw $v0,0x4($t7) /* f13be50: 00408025 */ move $s0,$v0 .PF0f13be54: -/* f13be54: 0c0055d0 */ jal 0x15740 +/* f13be54: 0c0055d0 */ jal func000159b0 /* f13be58: 27a40068 */ addiu $a0,$sp,0x68 /* f13be5c: 27a40068 */ addiu $a0,$sp,0x68 -/* f13be60: 0c005779 */ jal 0x15de4 +/* f13be60: 0c005779 */ jal func00016054 /* f13be64: 8fa50064 */ lw $a1,0x64($sp) -/* f13be68: 0fc2d54e */ jal 0xf0b5538 +/* f13be68: 0fc2d54e */ jal currentPlayerSetMatrix1740 /* f13be6c: 27a40068 */ addiu $a0,$sp,0x68 /* f13be70: 3c180102 */ lui $t8,0x102 /* f13be74: 37180040 */ ori $t8,$t8,0x40 @@ -4741,7 +4741,7 @@ glabel var7f1b5948 /* f13be7c: ac780000 */ sw $t8,0x0($v1) /* f13be80: afa3003c */ sw $v1,0x3c($sp) /* f13be84: 8fa40064 */ lw $a0,0x64($sp) -/* f13be88: 0c012ab0 */ jal 0x4aac0 +/* f13be88: 0c012ab0 */ jal osVirtualToPhysical /* f13be8c: 26100008 */ addiu $s0,$s0,0x8 /* f13be90: 8fa3003c */ lw $v1,0x3c($sp) /* f13be94: 3c01c47a */ lui $at,0xc47a @@ -4757,9 +4757,9 @@ glabel var7f1b5948 /* f13bebc: e7a00060 */ swc1 $f0,0x60($sp) /* f13bec0: e7a6004c */ swc1 $f6,0x4c($sp) /* f13bec4: e7b20050 */ swc1 $f18,0x50($sp) -/* f13bec8: 0fc4e2a9 */ jal 0xf138aa4 +/* f13bec8: 0fc4e2a9 */ jal creditsRenderBackground /* f13becc: e7a40054 */ swc1 $f4,0x54($sp) -/* f13bed0: 0fc4e784 */ jal 0xf139e10 +/* f13bed0: 0fc4e784 */ jal creditsRenderSprites /* f13bed4: 00402025 */ move $a0,$v0 /* f13bed8: 3c07800a */ lui $a3,0x800a /* f13bedc: 24e74710 */ addiu $a3,$a3,0x4710 @@ -4768,9 +4768,9 @@ glabel var7f1b5948 /* f13bee8: 906441f4 */ lbu $a0,0x41f4($v1) /* f13beec: 10800009 */ beqz $a0,.PF0f13bf14 /* f13bef0: 00000000 */ nop -/* f13bef4: 0fc3534f */ jal 0xf0d4d3c +/* f13bef4: 0fc3534f */ jal func0f0d479c /* f13bef8: 00402025 */ move $a0,$v0 -/* f13befc: 0fc4ebdb */ jal 0xf13af6c +/* f13befc: 0fc4ebdb */ jal func0f13a3ec /* f13bf00: 00402025 */ move $a0,$v0 /* f13bf04: 3c03800a */ lui $v1,0x800a /* f13bf08: 8c634710 */ lw $v1,0x4710($v1) @@ -4813,7 +4813,7 @@ glabel var7f1b5948 .PF0f13bf94: /* f13bf94: 10a00004 */ beqz $a1,.PF0f13bfa8 /* f13bf98: 00000000 */ nop -/* f13bf9c: 0fc4e40d */ jal 0xf139034 +/* f13bf9c: 0fc4e40d */ jal creditsClearFramebuffer /* f13bfa0: 02002025 */ move $a0,$s0 /* f13bfa4: 00408025 */ move $s0,$v0 .PF0f13bfa8: @@ -4822,16 +4822,16 @@ glabel var7f1b5948 /* f13bfb0: 00002025 */ move $a0,$zero /* f13bfb4: 51800018 */ beqzl $t4,.PF0f13c018 /* f13bfb8: 8fbf001c */ lw $ra,0x1c($sp) -/* f13bfbc: 0c00536a */ jal 0x14da8 +/* f13bfbc: 0c00536a */ jal contGetButtonsPressedThisFrame /* f13bfc0: 3405ffcf */ li $a1,0xffcf /* f13bfc4: 10400013 */ beqz $v0,.PF0f13c014 /* f13bfc8: 240d0026 */ li $t5,0x26 /* f13bfcc: 3c018006 */ lui $at,0x8006 /* f13bfd0: ac2d21b4 */ sw $t5,0x21b4($at) -/* f13bfd4: 0fc0690e */ jal 0xf01a438 +/* f13bfd4: 0fc0690e */ jal setNumPlayers /* f13bfd8: 24040001 */ li $a0,0x1 /* f13bfdc: 3c048006 */ lui $a0,0x8006 -/* f13bfe0: 0c0039af */ jal 0xe6bc +/* f13bfe0: 0c0039af */ jal mainSetStageNum /* f13bfe4: 8c8421b4 */ lw $a0,0x21b4($a0) /* f13bfe8: 3c01800a */ lui $at,0x800a /* f13bfec: ac20a7a4 */ sw $zero,-0x585c($at) @@ -4840,9 +4840,9 @@ glabel var7f1b5948 /* f13bff8: ac22a7a8 */ sw $v0,-0x5858($at) /* f13bffc: 3c01800a */ lui $at,0x800a /* f13c000: ac22a7ac */ sw $v0,-0x5854($at) -/* f13c004: 0fc5b6fd */ jal 0xf16dbf4 +/* f13c004: 0fc5b6fd */ jal coreSetDifficulty /* f13c008: 00002025 */ move $a0,$zero -/* f13c00c: 0c002779 */ jal 0x9de4 +/* f13c00c: 0c002779 */ jal func00009ec4 /* f13c010: 24040001 */ li $a0,0x1 .PF0f13c014: /* f13c014: 8fbf001c */ lw $ra,0x1c($sp) diff --git a/src/game/explosions/explosions.c b/src/game/explosions/explosions.c index 1a806b6b9..afd988517 100644 --- a/src/game/explosions/explosions.c +++ b/src/game/explosions/explosions.c @@ -1512,7 +1512,7 @@ glabel var7f1b68a0pf /* f12bd28: 50410015 */ beql $v0,$at,.PF0f12bd80 /* f12bd2c: 2401ffff */ li $at,-1 .PF0f12bd30: -/* f12bd30: 0c004ad4 */ jal 0x12b50 +/* f12bd30: 0c004ad4 */ jal random /* f12bd34: 00000000 */ nop /* f12bd38: 304b07ff */ andi $t3,$v0,0x7ff /* f12bd3c: 2d6100f1 */ sltiu $at,$t3,0xf1 @@ -1523,7 +1523,7 @@ glabel var7f1b68a0pf /* f12bd50: 240600ff */ li $a2,0xff /* f12bd54: 4600310d */ trunc.w.s $f4,$f6 /* f12bd58: 44052000 */ mfc1 $a1,$f4 -/* f12bd5c: 0fc010e3 */ jal 0xf00438c +/* f12bd5c: 0fc010e3 */ jal roomAdjustLighting /* f12bd60: 00000000 */ nop .PF0f12bd64: /* f12bd64: 86ce002a */ lh $t6,0x2a($s6) @@ -1571,16 +1571,16 @@ glabel var7f1b68a0pf /* f12be04: 4606c601 */ sub.s $f24,$f24,$f6 /* f12be08: 02202025 */ move $a0,$s1 .PF0f12be0c: -/* f12be0c: 0fc003d4 */ jal 0xf000f50 +/* f12be0c: 0fc003d4 */ jal lightIsHealthy /* f12be10: 02002825 */ move $a1,$s0 /* f12be14: 1040001c */ beqz $v0,.PF0f12be88 /* f12be18: 02202025 */ move $a0,$s1 -/* f12be1c: 0fc003e5 */ jal 0xf000f94 +/* f12be1c: 0fc003e5 */ jal lightIsVulnerable /* f12be20: 02002825 */ move $a1,$s0 /* f12be24: 10400018 */ beqz $v0,.PF0f12be88 /* f12be28: 02202025 */ move $a0,$s1 /* f12be2c: 02002825 */ move $a1,$s0 -/* f12be30: 0fc0037f */ jal 0xf000dfc +/* f12be30: 0fc0037f */ jal lightGetBboxCentre /* f12be34: 02603025 */ move $a2,$s3 /* f12be38: 10400013 */ beqz $v0,.PF0f12be88 /* f12be3c: c7a40164 */ lwc1 $f4,0x164($sp) @@ -1596,11 +1596,11 @@ glabel var7f1b68a0pf /* f12be64: e7a80154 */ swc1 $f8,0x154($sp) /* f12be68: 02802025 */ move $a0,$s4 /* f12be6c: 02a02825 */ move $a1,$s5 -/* f12be70: 0fc5e0fe */ jal 0xf1783f8 +/* f12be70: 0fc5e0fe */ jal func0f1773c8 /* f12be74: e7a60150 */ swc1 $f6,0x150($sp) /* f12be78: 10400003 */ beqz $v0,.PF0f12be88 /* f12be7c: 02202025 */ move $a0,$s1 -/* f12be80: 0fc006de */ jal 0xf001b78 +/* f12be80: 0fc006de */ jal roomSetLightBroken /* f12be84: 02002825 */ move $a1,$s0 .PF0f12be88: /* f12be88: 26100001 */ addiu $s0,$s0,0x1 @@ -1616,7 +1616,7 @@ glabel var7f1b68a0pf /* f12bea8: 27b00198 */ addiu $s0,$sp,0x198 /* f12beac: 02002825 */ move $a1,$s0 /* f12beb0: 26e40028 */ addiu $a0,$s7,0x28 -/* f12beb4: 0fc19884 */ jal 0xf066210 +/* f12beb4: 0fc19884 */ jal roomGetProps /* f12beb8: 24060100 */ li $a2,0x100 /* f12bebc: 87aa0198 */ lh $t2,0x198($sp) /* f12bec0: 0200a025 */ move $s4,$s0 @@ -1688,13 +1688,13 @@ glabel var7f1b68a0pf /* f12bfbc: 27a50130 */ addiu $a1,$sp,0x130 /* f12bfc0: 4500000e */ bc1f .PF0f12bffc /* f12bfc4: 00000000 */ nop -/* f12bfc8: 0fc24881 */ jal 0xf092204 +/* f12bfc8: 0fc24881 */ jal func0f092304 /* f12bfcc: 27a60124 */ addiu $a2,$sp,0x124 /* f12bfd0: 10400009 */ beqz $v0,.PF0f12bff8 /* f12bfd4: 8fa403a0 */ lw $a0,0x3a0($sp) /* f12bfd8: 02002825 */ move $a1,$s0 /* f12bfdc: 27a60130 */ addiu $a2,$sp,0x130 -/* f12bfe0: 0fc4ae91 */ jal 0xf12ba44 +/* f12bfe0: 0fc4ae91 */ jal func0f12af5c /* f12bfe4: 27a70124 */ addiu $a3,$sp,0x124 /* f12bfe8: 10400004 */ beqz $v0,.PF0f12bffc /* f12bfec: 00000000 */ nop @@ -1778,7 +1778,7 @@ glabel var7f1b68a0pf .PF0f12c104: /* f12c104: 11c00060 */ beqz $t6,.PF0f12c288 /* f12c108: 02202025 */ move $a0,$s1 -/* f12c10c: 0fc19a57 */ jal 0xf06695c +/* f12c10c: 0fc19a57 */ jal objUpdateLinkedScenery /* f12c110: 02e02825 */ move $a1,$s7 /* f12c114: 8e220040 */ lw $v0,0x40($s1) /* f12c118: 30581000 */ andi $t8,$v0,0x1000 @@ -1790,7 +1790,7 @@ glabel var7f1b68a0pf /* f12c130: 03214024 */ and $t0,$t9,$at /* f12c134: 5500001d */ bnezl $t0,.PF0f12c1ac /* f12c138: 00025140 */ sll $t2,$v0,0x5 -/* f12c13c: 0c004ad4 */ jal 0x12b50 +/* f12c13c: 0c004ad4 */ jal random /* f12c140: 00000000 */ nop /* f12c144: 44822000 */ mtc1 $v0,$f4 /* f12c148: 02002025 */ move $a0,$s0 @@ -1815,7 +1815,7 @@ glabel var7f1b68a0pf /* f12c190: 461e4180 */ add.s $f6,$f8,$f30 /* f12c194: 46143102 */ mul.s $f4,$f6,$f20 /* f12c198: 44052000 */ mfc1 $a1,$f4 -/* f12c19c: 0fc214a8 */ jal 0xf0852a0 +/* f12c19c: 0fc214a8 */ jal func0f085050 /* f12c1a0: 00000000 */ nop /* f12c1a4: 8e220040 */ lw $v0,0x40($s1) /* f12c1a8: 00025140 */ sll $t2,$v0,0x5 @@ -1851,7 +1851,7 @@ glabel var7f1b68a0pf /* f12c218: 460a5202 */ mul.s $f8,$f10,$f10 /* f12c21c: 00000000 */ nop /* f12c220: 460e7182 */ mul.s $f6,$f14,$f14 -/* f12c224: 0c0127b4 */ jal 0x49ed0 +/* f12c224: 0c0127b4 */ jal sqrtf /* f12c228: 46064300 */ add.s $f12,$f8,$f6 /* f12c22c: 4600e03c */ c.lt.s $f28,$f0 /* f12c230: 3c014080 */ lui $at,0x4080 @@ -1873,12 +1873,12 @@ glabel var7f1b68a0pf /* f12c26c: afae0010 */ sw $t6,0x10($sp) /* f12c270: 02202025 */ move $a0,$s1 /* f12c274: 27a500f4 */ addiu $a1,$sp,0xf4 -/* f12c278: 0fc20b1b */ jal 0xf082c6c +/* f12c278: 0fc20b1b */ jal func0f082a1c /* f12c27c: 24070001 */ li $a3,0x1 /* f12c280: 10000102 */ b .PF0f12c68c /* f12c284: 86820002 */ lh $v0,0x2($s4) .PF0f12c288: -/* f12c288: 0fc21afe */ jal 0xf086bf8 +/* f12c288: 0fc21afe */ jal objIsHealthy /* f12c28c: 02202025 */ move $a0,$s1 /* f12c290: 104000fd */ beqz $v0,.PF0f12c688 /* f12c294: 3c017f1b */ lui $at,0x7f1b @@ -1896,7 +1896,7 @@ glabel var7f1b68a0pf /* f12c2c4: 01014824 */ and $t1,$t0,$at /* f12c2c8: 552000f0 */ bnezl $t1,.PF0f12c68c /* f12c2cc: 86820002 */ lh $v0,0x2($s4) -/* f12c2d0: 0c004ad4 */ jal 0x12b50 +/* f12c2d0: 0c004ad4 */ jal random /* f12c2d4: 00000000 */ nop /* f12c2d8: 44823000 */ mtc1 $v0,$f6 /* f12c2dc: 02002025 */ move $a0,$s0 @@ -1921,7 +1921,7 @@ glabel var7f1b68a0pf /* f12c324: 461e2200 */ add.s $f8,$f4,$f30 /* f12c328: 46144182 */ mul.s $f6,$f8,$f20 /* f12c32c: 44053000 */ mfc1 $a1,$f6 -/* f12c330: 0fc214a8 */ jal 0xf0852a0 +/* f12c330: 0fc214a8 */ jal func0f085050 /* f12c334: 00000000 */ nop /* f12c338: 100000d4 */ b .PF0f12c68c /* f12c33c: 86820002 */ lh $v0,0x2($s4) @@ -1966,7 +1966,7 @@ glabel var7f1b68a0pf /* f12c3d0: 27a600dc */ addiu $a2,$sp,0xdc /* f12c3d4: 45000026 */ bc1f .PF0f12c470 /* f12c3d8: 00000000 */ nop -/* f12c3dc: 0fc19925 */ jal 0xf066494 +/* f12c3dc: 0fc19925 */ jal propGetBbox /* f12c3e0: 27a700d8 */ addiu $a3,$sp,0xd8 /* f12c3e4: 3c0141a0 */ lui $at,0x41a0 /* f12c3e8: c7a000e0 */ lwc1 $f0,0xe0($sp) @@ -1999,7 +1999,7 @@ glabel var7f1b68a0pf /* f12c450: e7a600c0 */ swc1 $f6,0xc0($sp) /* f12c454: c6080010 */ lwc1 $f8,0x10($s0) /* f12c458: 460a4180 */ add.s $f6,$f8,$f10 -/* f12c45c: 0fc4ae91 */ jal 0xf12ba44 +/* f12c45c: 0fc4ae91 */ jal func0f12af5c /* f12c460: e7a600c8 */ swc1 $f6,0xc8($sp) /* f12c464: 10400002 */ beqz $v0,.PF0f12c470 /* f12c468: 00000000 */ nop @@ -2077,7 +2077,7 @@ glabel var7f1b68a0pf /* f12c56c: 4616b182 */ mul.s $f6,$f22,$f22 /* f12c570: 00000000 */ nop /* f12c574: 4618c102 */ mul.s $f4,$f24,$f24 -/* f12c578: 0c0127b4 */ jal 0x49ed0 +/* f12c578: 0c0127b4 */ jal sqrtf /* f12c57c: 46043300 */ add.s $f12,$f6,$f4 /* f12c580: 4600e03c */ c.lt.s $f28,$f0 /* f12c584: 00000000 */ nop @@ -2105,7 +2105,7 @@ glabel var7f1b68a0pf /* f12c5d0: 8faf03a0 */ lw $t7,0x3a0($sp) /* f12c5d4: 51000008 */ beqzl $t0,.PF0f12c5f8 /* f12c5d8: 81e203ce */ lb $v0,0x3ce($t7) -/* f12c5dc: 0fc63843 */ jal 0xf18e10c +/* f12c5dc: 0fc63843 */ jal mpGetChrFromPlayerIndex /* f12c5e0: 812403ce */ lb $a0,0x3ce($t1) /* f12c5e4: 5040001a */ beqzl $v0,.PF0f12c650 /* f12c5e8: 4405a000 */ mfc1 $a1,$f20 @@ -2142,7 +2142,7 @@ glabel var7f1b68a0pf /* f12c650: 02402025 */ move $a0,$s2 /* f12c654: 27a600a0 */ addiu $a2,$sp,0xa0 /* f12c658: 02203825 */ move $a3,$s1 -/* f12c65c: 0fc0d15e */ jal 0xf034578 +/* f12c65c: 0fc0d15e */ jal func0f034410 /* f12c660: afb30010 */ sw $s3,0x10($sp) /* f12c664: 920e0000 */ lbu $t6,0x0($s0) /* f12c668: 8fb80194 */ lw $t8,0x194($sp) @@ -2151,7 +2151,7 @@ glabel var7f1b68a0pf /* f12c674: 17000004 */ bnez $t8,.PF0f12c688 /* f12c678: 02402025 */ move $a0,$s2 /* f12c67c: 4406d000 */ mfc1 $a2,$f26 -/* f12c680: 0fc09c86 */ jal 0xf027218 +/* f12c680: 0fc09c86 */ jal func0f0270f4 /* f12c684: 02602825 */ move $a1,$s3 .PF0f12c688: /* f12c688: 86820002 */ lh $v0,0x2($s4) @@ -3024,11 +3024,11 @@ glabel var7f1b68b0pf /* f12c7bc: 00ca082a */ slt $at,$a2,$t2 /* f12c7c0: 1020013f */ beqz $at,.PF0f12ccc0 /* f12c7c4: 02202025 */ move $a0,$s1 -/* f12c7c8: 0fc4a976 */ jal 0xf12a5d8 +/* f12c7c8: 0fc4a976 */ jal explosionGetHorizontalRangeAtFrame /* f12c7cc: 00c02825 */ move $a1,$a2 /* f12c7d0: 46000506 */ mov.s $f20,$f0 /* f12c7d4: 02202025 */ move $a0,$s1 -/* f12c7d8: 0fc4a9a0 */ jal 0xf12a680 +/* f12c7d8: 0fc4a9a0 */ jal explosionGetVerticalRangeAtFrame /* f12c7dc: 862503c8 */ lh $a1,0x3c8($s1) /* f12c7e0: 3c013f00 */ lui $at,0x3f00 /* f12c7e4: 44815000 */ mtc1 $at,$f10 @@ -3274,7 +3274,7 @@ glabel var7f1b68b0pf /* f12cb54: 00000000 */ nop /* f12cb58: e7b000f8 */ swc1 $f16,0xf8($sp) .PF0f12cb5c: -/* f12cb5c: 0c004ad4 */ jal 0x12b50 +/* f12cb5c: 0c004ad4 */ jal random /* f12cb60: 00000000 */ nop /* f12cb64: c7aa00f0 */ lwc1 $f10,0xf0($sp) /* f12cb68: c7b200fc */ lwc1 $f18,0xfc($sp) @@ -3291,7 +3291,7 @@ glabel var7f1b68b0pf /* f12cb90: 00000000 */ nop /* f12cb94: 46064282 */ mul.s $f10,$f8,$f6 /* f12cb98: 46125100 */ add.s $f4,$f10,$f18 -/* f12cb9c: 0c004ad4 */ jal 0x12b50 +/* f12cb9c: 0c004ad4 */ jal random /* f12cba0: e6040008 */ swc1 $f4,0x8($s0) /* f12cba4: c7a800f4 */ lwc1 $f8,0xf4($sp) /* f12cba8: c7a60100 */ lwc1 $f6,0x100($sp) @@ -3308,7 +3308,7 @@ glabel var7f1b68b0pf /* f12cbd0: 00000000 */ nop /* f12cbd4: 46125202 */ mul.s $f8,$f10,$f18 /* f12cbd8: 46064100 */ add.s $f4,$f8,$f6 -/* f12cbdc: 0c004ad4 */ jal 0x12b50 +/* f12cbdc: 0c004ad4 */ jal random /* f12cbe0: e604000c */ swc1 $f4,0xc($s0) /* f12cbe4: c7aa00f8 */ lwc1 $f10,0xf8($sp) /* f12cbe8: c7b20104 */ lwc1 $f18,0x104($sp) @@ -3327,7 +3327,7 @@ glabel var7f1b68b0pf /* f12cc18: a60b001c */ sh $t3,0x1c($s0) /* f12cc1c: 46064282 */ mul.s $f10,$f8,$f6 /* f12cc20: 46125100 */ add.s $f4,$f10,$f18 -/* f12cc24: 0c004ad4 */ jal 0x12b50 +/* f12cc24: 0c004ad4 */ jal random /* f12cc28: e6040010 */ swc1 $f4,0x10($s0) /* f12cc2c: 44824000 */ mtc1 $v0,$f8 /* f12cc30: 3c014f80 */ lui $at,0x4f80 @@ -3344,7 +3344,7 @@ glabel var7f1b68b0pf /* f12cc58: 46049202 */ mul.s $f8,$f18,$f4 /* f12cc5c: 46144280 */ add.s $f10,$f8,$f20 /* f12cc60: 46065482 */ mul.s $f18,$f10,$f6 -/* f12cc64: 0c004ad4 */ jal 0x12b50 +/* f12cc64: 0c004ad4 */ jal random /* f12cc68: e6120014 */ swc1 $f18,0x14($s0) /* f12cc6c: 44822000 */ mtc1 $v0,$f4 /* f12cc70: 3c014f80 */ lui $at,0x4f80 @@ -3377,16 +3377,16 @@ glabel var7f1b68b0pf /* f12cccc: 27b20130 */ addiu $s2,$sp,0x130 /* f12ccd0: 02402825 */ move $a1,$s2 /* f12ccd4: 02002025 */ move $a0,$s0 -/* f12ccd8: 0fc4a9bc */ jal 0xf12a6f0 +/* f12ccd8: 0fc4a9bc */ jal explosionGetBboxAtFrame /* f12ccdc: 02e03825 */ move $a3,$s7 /* f12cce0: 26e60028 */ addiu $a2,$s7,0x28 /* f12cce4: afa6009c */ sw $a2,0x9c($sp) /* f12cce8: 02002025 */ move $a0,$s0 /* f12ccec: 02402825 */ move $a1,$s2 /* f12ccf0: 24070007 */ li $a3,0x7 -/* f12ccf4: 0fc59814 */ jal 0xf166050 +/* f12ccf4: 0fc59814 */ jal func0f1650d0 /* f12ccf8: afa00010 */ sw $zero,0x10($sp) -/* f12ccfc: 0fc4aef2 */ jal 0xf12bbc8 +/* f12ccfc: 0fc4aef2 */ jal func0f12b0e0 /* f12cd00: 02e02025 */ move $a0,$s7 /* f12cd04: 862603c8 */ lh $a2,0x3c8($s1) /* f12cd08: 3c01bf80 */ lui $at,0xbf80 @@ -3411,7 +3411,7 @@ glabel var7f1b68b0pf /* f12cd54: e7a00024 */ swc1 $f0,0x24($sp) /* f12cd58: e7a00030 */ swc1 $f0,0x30($sp) /* f12cd5c: e7a00034 */ swc1 $f0,0x34($sp) -/* f12cd60: 0fc24e3a */ jal 0xf0938e8 +/* f12cd60: 0fc24e3a */ jal func0f0939f8 /* f12cd64: e7a00038 */ swc1 $f0,0x38($sp) /* f12cd68: 862603c8 */ lh $a2,0x3c8($s1) .PF0f12cd6c: @@ -3459,7 +3459,7 @@ glabel var7f1b68b0pf .PF0f12ce00: /* f12ce00: 54410007 */ bnel $v0,$at,.PF0f12ce20 /* f12ce04: 8e220004 */ lw $v0,0x4($s1) -/* f12ce08: 0c004ad4 */ jal 0x12b50 +/* f12ce08: 0c004ad4 */ jal random /* f12ce0c: 00000000 */ nop /* f12ce10: 304f0001 */ andi $t7,$v0,0x1 /* f12ce14: 55e0000f */ bnezl $t7,.PF0f12ce54 @@ -3472,12 +3472,12 @@ glabel var7f1b68b0pf /* f12ce2c: 00000000 */ nop /* f12ce30: 24440008 */ addiu $a0,$v0,0x8 /* f12ce34: 24450028 */ addiu $a1,$v0,0x28 -/* f12ce38: 0fc4bcd8 */ jal 0xf12f360 +/* f12ce38: 0fc4bcd8 */ jal smokeCreateSimple /* f12ce3c: 92c60024 */ lbu $a2,0x24($s6) /* f12ce40: 10000004 */ b .PF0f12ce54 /* f12ce44: 8fb80094 */ lw $t8,0x94($sp) .PF0f12ce48: -/* f12ce48: 0fc4bcd8 */ jal 0xf12f360 +/* f12ce48: 0fc4bcd8 */ jal smokeCreateSimple /* f12ce4c: 92c60024 */ lbu $a2,0x24($s6) .PF0f12ce50: /* f12ce50: 8fb80094 */ lw $t8,0x94($sp) @@ -3499,7 +3499,7 @@ glabel var7f1b68b0pf /* f12ce8c: 00000000 */ nop /* f12ce90: 46001506 */ mov.s $f20,$f2 .PF0f12ce94: -/* f12ce94: 0c004ad4 */ jal 0x12b50 +/* f12ce94: 0c004ad4 */ jal random /* f12ce98: 00000000 */ nop /* f12ce9c: 44829000 */ mtc1 $v0,$f18 /* f12cea0: 3c017f1b */ lui $at,0x7f1b @@ -3520,7 +3520,7 @@ glabel var7f1b68b0pf /* f12ced8: 4604a502 */ mul.s $f20,$f20,$f4 /* f12cedc: 51200006 */ beqzl $t1,.PF0f12cef8 /* f12cee0: 8ea2029c */ lw $v0,0x29c($s5) -/* f12cee4: 0fc63843 */ jal 0xf18e10c +/* f12cee4: 0fc63843 */ jal mpGetChrFromPlayerIndex /* f12cee8: 822403ce */ lb $a0,0x3ce($s1) /* f12ceec: 10000018 */ b .PF0f12cf50 /* f12cef0: 00401825 */ move $v1,$v0 @@ -3573,7 +3573,7 @@ glabel var7f1b68b0pf /* f12cf9c: 11a00009 */ beqz $t5,.PF0f12cfc4 /* f12cfa0: 01602825 */ move $a1,$t3 /* f12cfa4: 27a700b0 */ addiu $a3,$sp,0xb0 -/* f12cfa8: 0fc58928 */ jal 0xf1624a0 +/* f12cfa8: 0fc58928 */ jal func0f161520 /* f12cfac: afa300e4 */ sw $v1,0xe4($sp) /* f12cfb0: 10400004 */ beqz $v0,.PF0f12cfc4 /* f12cfb4: 8fa300e4 */ lw $v1,0xe4($sp) @@ -3605,7 +3605,7 @@ glabel var7f1b68b0pf /* f12d018: 8fa5008c */ lw $a1,0x8c($sp) /* f12d01c: 02003025 */ move $a2,$s0 /* f12d020: 00003825 */ move $a3,$zero -/* f12d024: 0fc5001d */ jal 0xf140074 +/* f12d024: 0fc5001d */ jal func0f13f504 /* f12d028: afb80018 */ sw $t8,0x18($sp) /* f12d02c: 8faa0098 */ lw $t2,0x98($sp) .PF0f12d030: @@ -3634,7 +3634,7 @@ glabel var7f1b68b0pf /* f12d084: 24010001 */ li $at,0x1 /* f12d088: 51e10004 */ beql $t7,$at,.PF0f12d09c /* f12d08c: ae200000 */ sw $zero,0x0($s1) -/* f12d090: 0fc10ecf */ jal 0xf043b3c +/* f12d090: 0fc10ecf */ jal propUnsetDangerous /* f12d094: 8e240000 */ lw $a0,0x0($s1) /* f12d098: ae200000 */ sw $zero,0x0($s1) .PF0f12d09c: diff --git a/src/game/game_005fd0.c b/src/game/game_005fd0.c index 920d4fc61..d6c80fc84 100644 --- a/src/game/game_005fd0.c +++ b/src/game/game_005fd0.c @@ -154,7 +154,7 @@ glabel func0f0061dc /* f0061e0: afbf004c */ sw $ra,0x4c($sp) /* f0061e4: afb10048 */ sw $s1,0x48($sp) /* f0061e8: 00808825 */ move $s1,$a0 -/* f0061ec: 0fc47e7e */ jal 0xf11f9f8 +/* f0061ec: 0fc47e7e */ jal debugEnableFootsteps /* f0061f0: afb00044 */ sw $s0,0x44($sp) /* f0061f4: 104000c2 */ beqz $v0,.PF0f006500 /* f0061f8: 24010001 */ li $at,0x1 @@ -213,7 +213,7 @@ glabel func0f0061dc /* f0062bc: e7a0006c */ swc1 $f0,0x6c($sp) .PF0f0062c0: /* f0062c0: 8e240020 */ lw $a0,0x20($s1) -/* f0062c4: 0c0073c3 */ jal 0x1cf0c +/* f0062c4: 0c0073c3 */ jal modelGetAnimNum /* f0062c8: afa30050 */ sw $v1,0x50($sp) /* f0062cc: 8fa30050 */ lw $v1,0x50($sp) /* f0062d0: 24010023 */ li $at,0x23 @@ -329,7 +329,7 @@ glabel func0f0061dc /* f006458: 00000000 */ nop /* f00645c: a2390190 */ sb $t9,0x190($s1) .PF0f006460: -/* f006460: 0fc0181d */ jal 0xf006074 +/* f006460: 0fc0181d */ jal chrChooseFootstepSound /* f006464: 02202025 */ move $a0,$s1 /* f006468: 2401ffff */ li $at,-1 /* f00646c: 5041001c */ beql $v0,$at,.PF0f0064e0 @@ -358,7 +358,7 @@ glabel func0f0061dc /* f0064c8: e7a00024 */ swc1 $f0,0x24($sp) /* f0064cc: e7a00030 */ swc1 $f0,0x30($sp) /* f0064d0: e7a00034 */ swc1 $f0,0x34($sp) -/* f0064d4: 0fc24e3a */ jal 0xf0938e8 +/* f0064d4: 0fc24e3a */ jal func0f0939f8 /* f0064d8: e7a00038 */ swc1 $f0,0x38($sp) .PF0f0064dc: /* f0064dc: 8e2e0020 */ lw $t6,0x20($s1) @@ -686,7 +686,7 @@ glabel var7f1a7e6c /* f006528: afb00048 */ sw $s0,0x48($sp) /* f00652c: 8dc700bc */ lw $a3,0xbc($t6) /* f006530: 00808025 */ move $s0,$a0 -/* f006534: 0fc47e7e */ jal 0xf11f9f8 +/* f006534: 0fc47e7e */ jal debugEnableFootsteps /* f006538: afa70050 */ sw $a3,0x50($sp) /* f00653c: 3c05800a */ lui $a1,0x800a /* f006540: 24a5a510 */ addiu $a1,$a1,-23280 @@ -878,7 +878,7 @@ glabel var7f1a7e6c /* f0067ec: 00000000 */ nop /* f0067f0: a20c0190 */ sb $t4,0x190($s0) .PF0f0067f4: -/* f0067f4: 0fc0181d */ jal 0xf006074 +/* f0067f4: 0fc0181d */ jal chrChooseFootstepSound /* f0067f8: afa5005c */ sw $a1,0x5c($sp) /* f0067fc: 2401ffff */ li $at,-1 /* f006800: 5041001c */ beql $v0,$at,.PF0f006874 @@ -907,7 +907,7 @@ glabel var7f1a7e6c /* f00685c: e7a00024 */ swc1 $f0,0x24($sp) /* f006860: e7a00030 */ swc1 $f0,0x30($sp) /* f006864: e7a00034 */ swc1 $f0,0x34($sp) -/* f006868: 0fc24e3a */ jal 0xf0938e8 +/* f006868: 0fc24e3a */ jal func0f0939f8 /* f00686c: e7a00038 */ swc1 $f0,0x38($sp) .PF0f006870: /* f006870: 8fa5005c */ lw $a1,0x5c($sp) @@ -915,7 +915,7 @@ glabel var7f1a7e6c /* f006874: 3c048006 */ lui $a0,0x8006 /* f006878: 00055080 */ sll $t2,$a1,0x2 /* f00687c: 008a2021 */ addu $a0,$a0,$t2 -/* f006880: 0fc017f4 */ jal 0xf005fd0 +/* f006880: 0fc017f4 */ jal func0f005fd0 /* f006884: 94841270 */ lhu $a0,0x1270($a0) /* f006888: 1040000b */ beqz $v0,.PF0f0068b8 /* f00688c: 3c014208 */ lui $at,0x4208 diff --git a/src/game/game_00b320.c b/src/game/game_00b320.c index 708e1518a..a4820a462 100644 --- a/src/game/game_00b320.c +++ b/src/game/game_00b320.c @@ -53,13 +53,13 @@ glabel stageLoadCommonLang .PF0f00b3c0: /* f00b3c0: 348f000f */ ori $t7,$a0,0xf /* f00b3c4: 39e4000f */ xori $a0,$t7,0xf -/* f00b3c8: 0c004856 */ jal 0x12158 +/* f00b3c8: 0c004856 */ jal malloc /* f00b3cc: afa30018 */ sw $v1,0x18($sp) /* f00b3d0: 3c018008 */ lui $at,0x8008 /* f00b3d4: 8fa30018 */ lw $v1,0x18($sp) /* f00b3d8: ac224664 */ sw $v0,0x4664($at) /* f00b3dc: 3c018008 */ lui $at,0x8008 -/* f00b3e0: 0fc5bdbb */ jal 0xf16f6ec +/* f00b3e0: 0fc5bdbb */ jal func0f16f6ecpf /* f00b3e4: ac23466c */ sw $v1,0x466c($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 bd2ef105d..cf6700a45 100644 --- a/src/game/game_00c490.c +++ b/src/game/game_00c490.c @@ -1123,7 +1123,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 @@ -1172,7 +1172,7 @@ glabel var7f1a9258pf /* f00dca4: 460c5402 */ mul.s $f16,$f10,$f12 /* f00dca8: 46028483 */ div.s $f18,$f16,$f2 /* f00dcac: e6060064 */ swc1 $f6,0x64($s0) -/* f00dcb0: 0c004856 */ jal 0x12158 +/* f00dcb0: 0c004856 */ jal malloc /* f00dcb4: e6120068 */ swc1 $f18,0x68($s0) /* f00dcb8: 2403ffff */ li $v1,-1 /* f00dcbc: ae02009c */ sw $v0,0x9c($s0) @@ -1185,7 +1185,7 @@ glabel var7f1a9258pf /* f00dcd8: 0480001f */ bltz $a0,.PF0f00dd58 /* f00dcdc: e60000a0 */ swc1 $f0,0xa0($s0) /* f00dce0: 24050002 */ li $a1,0x2 -/* f00dce4: 0fc45964 */ jal 0xf116590 +/* f00dce4: 0fc45964 */ jal padUnpack /* f00dce8: 27a60028 */ addiu $a2,$sp,0x28 /* f00dcec: 8e020014 */ lw $v0,0x14($s0) /* f00dcf0: c7a8002c */ lwc1 $f8,0x2c($sp) @@ -1199,7 +1199,7 @@ glabel var7f1a9258pf /* f00dd10: c4440010 */ lwc1 $f4,0x10($v0) /* f00dd14: e7ac0088 */ swc1 $f12,0x88($sp) /* f00dd18: 46049381 */ sub.s $f14,$f18,$f4 -/* f00dd1c: 0fc2599c */ jal 0xf096670 +/* f00dd1c: 0fc2599c */ jal atan2f /* f00dd20: e7ae0080 */ swc1 $f14,0x80($sp) /* f00dd24: c7a20088 */ lwc1 $f2,0x88($sp) /* f00dd28: c7ae0080 */ lwc1 $f14,0x80($sp) @@ -1207,10 +1207,10 @@ glabel var7f1a9258pf /* f00dd30: 46021182 */ mul.s $f6,$f2,$f2 /* f00dd34: 00000000 */ nop /* f00dd38: 460e7202 */ mul.s $f8,$f14,$f14 -/* f00dd3c: 0c0127b4 */ jal 0x49ed0 +/* f00dd3c: 0c0127b4 */ jal sqrtf /* f00dd40: 46083300 */ add.s $f12,$f6,$f8 /* f00dd44: c7ac0084 */ lwc1 $f12,0x84($sp) -/* f00dd48: 0fc2599c */ jal 0xf096670 +/* f00dd48: 0fc2599c */ jal atan2f /* f00dd4c: 46000386 */ mov.s $f14,$f0 /* f00dd50: 10000007 */ b .PF0f00dd70 /* f00dd54: e6000074 */ swc1 $f0,0x74($s0) @@ -1434,26 +1434,26 @@ glabel var7f1a926cpf /* f00e364: 84840004 */ lh $a0,0x4($a0) /* f00e368: 240effff */ li $t6,-1 /* f00e36c: afae01bc */ sw $t6,0x1bc($sp) -/* f00e370: 0fc2482d */ jal 0xf0920b4 +/* f00e370: 0fc2482d */ jal propLoad /* f00e374: afa401c0 */ sw $a0,0x1c0($sp) /* f00e378: 960f0070 */ lhu $t7,0x70($s0) /* f00e37c: 31f80040 */ andi $t8,$t7,0x40 /* f00e380: 53000004 */ beqzl $t8,.PF0f00e394 /* f00e384: 8e190008 */ lw $t9,0x8($s0) -/* f00e388: 0fc45ad2 */ jal 0xf116b48 +/* f00e388: 0fc45ad2 */ jal func0f116068 /* f00e38c: 86040006 */ lh $a0,0x6($s0) /* f00e390: 8e190008 */ lw $t9,0x8($s0) .PF0f00e394: /* f00e394: 001940c0 */ sll $t0,$t9,0x3 /* f00e398: 05030005 */ bgezl $t0,.PF0f00e3b0 /* 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) .PF0f00e3b0: /* f00e3b0: 2405007e */ li $a1,0x7e -/* f00e3b4: 0fc45964 */ jal 0xf116590 +/* f00e3b4: 0fc45964 */ jal padUnpack /* f00e3b8: 27a60168 */ addiu $a2,$sp,0x168 /* f00e3bc: 3c018006 */ lui $at,0x8006 /* f00e3c0: c42c18b0 */ lwc1 $f12,0x18b0($at) @@ -1553,7 +1553,7 @@ glabel var7f1a926cpf /* f00e538: e7a601ac */ swc1 $f6,0x1ac($sp) /* f00e53c: e7a801a8 */ swc1 $f8,0x1a8($sp) .PF0f00e540: -/* f00e540: 0fc45b1c */ jal 0xf116c70 +/* f00e540: 0fc45b1c */ jal padCopyBboxFromPad /* f00e544: 86040006 */ lh $a0,0x6($s0) /* f00e548: 8fab01b0 */ lw $t3,0x1b0($sp) .PF0f00e54c: @@ -1562,7 +1562,7 @@ glabel var7f1a926cpf /* f00e554: 196000e6 */ blez $t3,.PF0f00e8f0 /* f00e558: 000c68c0 */ sll $t5,$t4,0x3 /* f00e55c: 008d2021 */ addu $a0,$a0,$t5 -/* f00e560: 0fc1a2ff */ jal 0xf068bfc +/* f00e560: 0fc1a2ff */ jal func0f06896c /* f00e564: 8c84b53c */ lw $a0,-0x4ac4($a0) /* f00e568: c7b20174 */ lwc1 $f18,0x174($sp) /* f00e56c: 44800000 */ mtc1 $zero,$f0 @@ -1584,24 +1584,24 @@ glabel var7f1a926cpf /* f00e5ac: 27a40110 */ addiu $a0,$sp,0x110 /* f00e5b0: e7a40020 */ swc1 $f4,0x20($sp) /* f00e5b4: e7aa0024 */ swc1 $f10,0x24($sp) -/* f00e5b8: 0c005aba */ jal 0x16ae8 +/* f00e5b8: 0c005aba */ jal func00016d58 /* f00e5bc: e7b2001c */ swc1 $f18,0x1c($sp) /* f00e5c0: 3c017f1b */ lui $at,0x7f1b /* f00e5c4: c42c9260 */ lwc1 $f12,-0x6da0($at) -/* f00e5c8: 0c00581e */ jal 0x16078 +/* f00e5c8: 0c00581e */ jal func000162e8 /* f00e5cc: 27a500ac */ addiu $a1,$sp,0xac /* f00e5d0: 3c017f1b */ lui $at,0x7f1b /* f00e5d4: c42c9264 */ lwc1 $f12,-0x6d9c($at) -/* f00e5d8: 0c005864 */ jal 0x16190 +/* f00e5d8: 0c005864 */ jal func00016400 /* f00e5dc: 27a50060 */ addiu $a1,$sp,0x60 /* f00e5e0: 27a40060 */ addiu $a0,$sp,0x60 -/* f00e5e4: 0c0055e3 */ jal 0x1578c +/* f00e5e4: 0c0055e3 */ jal func000159fc /* f00e5e8: 27a500ac */ addiu $a1,$sp,0xac /* f00e5ec: 27a40110 */ addiu $a0,$sp,0x110 -/* f00e5f0: 0c0055e3 */ jal 0x1578c +/* f00e5f0: 0c0055e3 */ jal func000159fc /* f00e5f4: 27a500ac */ addiu $a1,$sp,0xac /* f00e5f8: 86040006 */ lh $a0,0x6($s0) -/* f00e5fc: 0fc45a85 */ jal 0xf116a14 +/* f00e5fc: 0fc45a85 */ jal padGetCentre /* f00e600: 27a500a0 */ addiu $a1,$sp,0xa0 /* f00e604: 8fa20044 */ lw $v0,0x44($sp) /* f00e608: c7a801a4 */ lwc1 $f8,0x1a4($sp) @@ -1647,13 +1647,13 @@ glabel var7f1a926cpf .PF0f00e6a0: /* f00e6a0: e7a2004c */ swc1 $f2,0x4c($sp) /* f00e6a4: e7ac0050 */ swc1 $f12,0x50($sp) -/* f00e6a8: 0c0056ed */ jal 0x15bb4 +/* f00e6a8: 0c0056ed */ jal func00015e24 /* f00e6ac: e7ae0048 */ swc1 $f14,0x48($sp) /* f00e6b0: c7ac004c */ lwc1 $f12,0x4c($sp) -/* f00e6b4: 0c005704 */ jal 0x15c10 +/* f00e6b4: 0c005704 */ jal func00015e80 /* f00e6b8: 27a500ac */ addiu $a1,$sp,0xac /* f00e6bc: c7ac0048 */ lwc1 $f12,0x48($sp) -/* f00e6c0: 0c00571b */ jal 0x15c6c +/* f00e6c0: 0c00571b */ jal func00015edc /* f00e6c4: 27a500ac */ addiu $a1,$sp,0xac /* f00e6c8: c7a80168 */ lwc1 $f8,0x168($sp) /* f00e6cc: c7b0016c */ lwc1 $f16,0x16c($sp) @@ -1740,7 +1740,7 @@ glabel var7f1a926cpf /* f00e804: e608006c */ swc1 $f8,0x6c($s0) /* f00e808: 8e0c00bc */ lw $t4,0xbc($s0) /* f00e80c: 8fad01cc */ lw $t5,0x1cc($sp) -/* f00e810: 0fc247c1 */ jal 0xf091f04 +/* f00e810: 0fc247c1 */ jal setupGetPtrToCommandByIndex /* f00e814: 018d2021 */ addu $a0,$t4,$t5 /* f00e818: ae0200bc */ sw $v0,0xbc($s0) .PF0f00e81c: @@ -1751,7 +1751,7 @@ glabel var7f1a926cpf /* f00e82c: 02002025 */ move $a0,$s0 /* f00e830: 27a500fc */ addiu $a1,$sp,0xfc /* f00e834: 27a600ac */ addiu $a2,$sp,0xac -/* f00e838: 0fc2351b */ jal 0xf08d46c +/* f00e838: 0fc2351b */ jal func0f08d540 /* f00e83c: 27a700ec */ addiu $a3,$sp,0xec /* f00e840: afa2010c */ sw $v0,0x10c($sp) /* f00e844: 8e180008 */ lw $t8,0x8($s0) @@ -1769,7 +1769,7 @@ glabel var7f1a926cpf /* f00e874: 00000000 */ nop /* f00e878: 45020004 */ bc1fl .PF0f00e88c /* f00e87c: 8e040018 */ lw $a0,0x18($s0) -/* f00e880: 0fc23510 */ jal 0xf08d440 +/* f00e880: 0fc23510 */ jal doorDeactivatePortal /* f00e884: 02002025 */ move $a0,$s0 /* f00e888: 8e040018 */ lw $a0,0x18($s0) .PF0f00e88c: @@ -1792,12 +1792,12 @@ glabel var7f1a926cpf .PF0f00e8c8: /* f00e8c8: 46002282 */ mul.s $f10,$f4,$f0 /* f00e8cc: 44055000 */ mfc1 $a1,$f10 -/* f00e8d0: 0c006b3a */ jal 0x1ace8 +/* f00e8d0: 0c006b3a */ jal modelSetUnk14 /* f00e8d4: 00000000 */ nop .PF0f00e8d8: -/* f00e8d8: 0fc181c7 */ jal 0xf06071c +/* f00e8d8: 0fc181c7 */ jal propPrependToList1 /* f00e8dc: 8fa4010c */ lw $a0,0x10c($sp) -/* f00e8e0: 0fc18154 */ jal 0xf060550 +/* f00e8e0: 0fc18154 */ jal propShow /* f00e8e4: 8fa4010c */ lw $a0,0x10c($sp) /* f00e8e8: 10000003 */ b .PF0f00e8f8 /* f00e8ec: 8fbf0034 */ lw $ra,0x34($sp) diff --git a/src/game/game_011110.c b/src/game/game_011110.c index 34e6e371c..c53c845e3 100644 --- a/src/game/game_011110.c +++ b/src/game/game_011110.c @@ -513,9 +513,9 @@ glabel var7f1a827c /* f011950: afa00080 */ sw $zero,0x80($sp) /* f011954: 8e10d59c */ lw $s0,-0x2a64($s0) /* f011958: a3a0007b */ sb $zero,0x7b($sp) -/* f01195c: 0fc2f254 */ jal 0xf0bc950 +/* f01195c: 0fc2f254 */ jal viResetDefaultModeIf4Mb /* f011960: e7a40088 */ swc1 $f4,0x88($sp) -/* f011964: 0fc63d8b */ jal 0xf18f62c +/* f011964: 0fc63d8b */ jal func0f18e558 /* f011968: 00000000 */ nop /* f01196c: 44803000 */ mtc1 $zero,$f6 /* f011970: 3c018007 */ lui $at,0x8007 @@ -549,7 +549,7 @@ glabel var7f1a827c /* f0119e0: ac430004 */ sw $v1,0x4($v0) /* f0119e4: ac430008 */ sw $v1,0x8($v0) /* f0119e8: ac43000c */ sw $v1,0xc($v0) -/* f0119ec: 0fc2e6d7 */ jal 0xf0b9b5c +/* f0119ec: 0fc2e6d7 */ jal setTickMode /* f0119f0: ac200a40 */ sw $zero,0xa40($at) /* f0119f4: 3c018007 */ lui $at,0x8007 /* f0119f8: ac200a24 */ sw $zero,0xa24($at) @@ -608,20 +608,20 @@ glabel var7f1a827c /* f011ac4: 8e390284 */ lw $t9,0x284($s1) /* f011ac8: 11b90022 */ beq $t5,$t9,.PF0f011b54 /* f011acc: 00000000 */ nop -/* f011ad0: 0fc04560 */ jal 0xf011580 +/* f011ad0: 0fc04560 */ jal weaponLoadProjectileModels /* f011ad4: 8e040004 */ lw $a0,0x4($s0) /* f011ad8: 8e040008 */ lw $a0,0x8($s0) /* f011adc: 04800008 */ bltz $a0,.PF0f011b00 /* f011ae0: 00000000 */ nop -/* f011ae4: 0fc04560 */ jal 0xf011580 +/* f011ae4: 0fc04560 */ jal weaponLoadProjectileModels /* f011ae8: 00000000 */ nop /* f011aec: 8e040004 */ lw $a0,0x4($s0) -/* f011af0: 0fc44a42 */ jal 0xf112908 +/* f011af0: 0fc44a42 */ jal invGiveDoubleWeapon /* f011af4: 8e050008 */ lw $a1,0x8($s0) /* f011af8: 10000004 */ b .PF0f011b0c /* f011afc: 8fb80080 */ lw $t8,0x80($sp) .PF0f011b00: -/* f011b00: 0fc44a1a */ jal 0xf112868 +/* f011b00: 0fc44a1a */ jal invGiveSingleWeapon /* f011b04: 8e040004 */ lw $a0,0x4($s0) /* f011b08: 8fb80080 */ lw $t8,0x80($sp) .PF0f011b0c: @@ -655,7 +655,7 @@ glabel var7f1a827c /* f011b70: 118d0004 */ beq $t4,$t5,.PF0f011b84 /* f011b74: 00000000 */ nop /* f011b78: 8e040004 */ lw $a0,0x4($s0) -/* f011b7c: 0fc2a69d */ jal 0xf0a9a74 +/* f011b7c: 0fc2a69d */ jal currentPlayerSetAmmoQuantity /* f011b80: 8e050008 */ lw $a1,0x8($s0) .PF0f011b84: /* f011b84: 10000049 */ b .PF0f011cac @@ -743,208 +743,208 @@ glabel var7f1a827c /* f011cb4: 5441ff65 */ bnel $v0,$at,.PF0f011a4c /* f011cb8: 2c41000c */ sltiu $at,$v0,0xc .PF0f011cbc: -/* f011cbc: 0fc44a1a */ jal 0xf112868 +/* f011cbc: 0fc44a1a */ jal invGiveSingleWeapon /* f011cc0: 24040001 */ li $a0,0x1 -/* f011cc4: 0fc41dd5 */ jal 0xf107754 +/* f011cc4: 0fc41dd5 */ jal cheatIsActive /* f011cc8: 24040008 */ li $a0,0x8 /* f011ccc: 10400006 */ beqz $v0,.PF0f011ce8 /* f011cd0: 00000000 */ nop -/* f011cd4: 0fc44a1a */ jal 0xf112868 +/* f011cd4: 0fc44a1a */ jal invGiveSingleWeapon /* f011cd8: 24040009 */ li $a0,0x9 /* f011cdc: 2404000a */ li $a0,0xa -/* f011ce0: 0fc2a69d */ jal 0xf0a9a74 +/* f011ce0: 0fc2a69d */ jal currentPlayerSetAmmoQuantity /* f011ce4: 24050050 */ li $a1,0x50 .PF0f011ce8: -/* f011ce8: 0fc41dd5 */ jal 0xf107754 +/* f011ce8: 0fc41dd5 */ jal cheatIsActive /* f011cec: 24040009 */ li $a0,0x9 /* f011cf0: 10400006 */ beqz $v0,.PF0f011d0c /* f011cf4: 00000000 */ nop -/* f011cf8: 0fc44a1a */ jal 0xf112868 +/* f011cf8: 0fc44a1a */ jal invGiveSingleWeapon /* f011cfc: 24040016 */ li $a0,0x16 /* f011d00: 24040006 */ li $a0,0x6 -/* f011d04: 0fc2a69d */ jal 0xf0a9a74 +/* f011d04: 0fc2a69d */ jal currentPlayerSetAmmoQuantity /* f011d08: 24050050 */ li $a1,0x50 .PF0f011d0c: -/* f011d0c: 0fc41dd5 */ jal 0xf107754 +/* f011d0c: 0fc41dd5 */ jal cheatIsActive /* f011d10: 24040001 */ li $a0,0x1 /* f011d14: 10400006 */ beqz $v0,.PF0f011d30 /* f011d18: 00000000 */ nop -/* f011d1c: 0fc44a1a */ jal 0xf112868 +/* f011d1c: 0fc44a1a */ jal invGiveSingleWeapon /* f011d20: 24040031 */ li $a0,0x31 /* f011d24: 24040014 */ li $a0,0x14 -/* f011d28: 0fc2a69d */ jal 0xf0a9a74 +/* f011d28: 0fc2a69d */ jal currentPlayerSetAmmoQuantity /* f011d2c: 24051770 */ li $a1,0x1770 .PF0f011d30: -/* f011d30: 0fc41dd5 */ jal 0xf107754 +/* f011d30: 0fc41dd5 */ jal cheatIsActive /* f011d34: 24040015 */ li $a0,0x15 /* f011d38: 10400003 */ beqz $v0,.PF0f011d48 /* f011d3c: 00000000 */ nop -/* f011d40: 0fc44a1a */ jal 0xf112868 +/* f011d40: 0fc44a1a */ jal invGiveSingleWeapon /* f011d44: 2404002d */ li $a0,0x2d .PF0f011d48: -/* f011d48: 0fc41dd5 */ jal 0xf107754 +/* f011d48: 0fc41dd5 */ jal cheatIsActive /* f011d4c: 2404001a */ li $a0,0x1a /* f011d50: 10400003 */ beqz $v0,.PF0f011d60 /* f011d54: 00000000 */ nop -/* f011d58: 0fc44a1a */ jal 0xf112868 +/* f011d58: 0fc44a1a */ jal invGiveSingleWeapon /* f011d5c: 24040037 */ li $a0,0x37 .PF0f011d60: -/* f011d60: 0fc41dd5 */ jal 0xf107754 +/* f011d60: 0fc41dd5 */ jal cheatIsActive /* f011d64: 2404001b */ li $a0,0x1b /* f011d68: 10400006 */ beqz $v0,.PF0f011d84 /* f011d6c: 00000000 */ nop -/* f011d70: 0fc44a1a */ jal 0xf112868 +/* f011d70: 0fc44a1a */ jal invGiveSingleWeapon /* f011d74: 24040018 */ li $a0,0x18 /* f011d78: 24040008 */ li $a0,0x8 -/* f011d7c: 0fc2a69d */ jal 0xf0a9a74 +/* f011d7c: 0fc2a69d */ jal currentPlayerSetAmmoQuantity /* f011d80: 2405000a */ li $a1,0xa .PF0f011d84: -/* f011d84: 0fc41dd5 */ jal 0xf107754 +/* f011d84: 0fc41dd5 */ jal cheatIsActive /* f011d88: 2404001c */ li $a0,0x1c /* f011d8c: 10400006 */ beqz $v0,.PF0f011da8 /* f011d90: 00000000 */ nop -/* f011d94: 0fc44a1a */ jal 0xf112868 +/* f011d94: 0fc44a1a */ jal invGiveSingleWeapon /* f011d98: 24040015 */ li $a0,0x15 /* f011d9c: 24040004 */ li $a0,0x4 -/* f011da0: 0fc2a69d */ jal 0xf0a9a74 +/* f011da0: 0fc2a69d */ jal currentPlayerSetAmmoQuantity /* f011da4: 240500c8 */ li $a1,0xc8 .PF0f011da8: -/* f011da8: 0fc41dd5 */ jal 0xf107754 +/* f011da8: 0fc41dd5 */ jal cheatIsActive /* f011dac: 2404001d */ li $a0,0x1d /* f011db0: 10400003 */ beqz $v0,.PF0f011dc0 /* f011db4: 00000000 */ nop -/* f011db8: 0fc44a1a */ jal 0xf112868 +/* f011db8: 0fc44a1a */ jal invGiveSingleWeapon /* f011dbc: 2404002f */ li $a0,0x2f .PF0f011dc0: -/* f011dc0: 0fc41dd5 */ jal 0xf107754 +/* f011dc0: 0fc41dd5 */ jal cheatIsActive /* f011dc4: 2404001e */ li $a0,0x1e /* f011dc8: 10400009 */ beqz $v0,.PF0f011df0 /* f011dcc: 00000000 */ nop -/* f011dd0: 0fc44a1a */ jal 0xf112868 +/* f011dd0: 0fc44a1a */ jal invGiveSingleWeapon /* f011dd4: 24040012 */ li $a0,0x12 /* f011dd8: 24040004 */ li $a0,0x4 -/* f011ddc: 0fc2a69d */ jal 0xf0a9a74 +/* f011ddc: 0fc2a69d */ jal currentPlayerSetAmmoQuantity /* f011de0: 240500c8 */ li $a1,0xc8 /* f011de4: 2404000b */ li $a0,0xb -/* f011de8: 0fc2a69d */ jal 0xf0a9a74 +/* f011de8: 0fc2a69d */ jal currentPlayerSetAmmoQuantity /* f011dec: 24050014 */ li $a1,0x14 .PF0f011df0: -/* f011df0: 0fc41dd5 */ jal 0xf107754 +/* f011df0: 0fc41dd5 */ jal cheatIsActive /* f011df4: 2404001f */ li $a0,0x1f /* f011df8: 10400006 */ beqz $v0,.PF0f011e14 /* f011dfc: 00000000 */ nop -/* f011e00: 0fc44a1a */ jal 0xf112868 +/* f011e00: 0fc44a1a */ jal invGiveSingleWeapon /* f011e04: 2404000e */ li $a0,0xe /* f011e08: 24040002 */ li $a0,0x2 -/* f011e0c: 0fc2a69d */ jal 0xf0a9a74 +/* f011e0c: 0fc2a69d */ jal currentPlayerSetAmmoQuantity /* f011e10: 240500c8 */ li $a1,0xc8 .PF0f011e14: -/* f011e14: 0fc41dd5 */ jal 0xf107754 +/* f011e14: 0fc41dd5 */ jal cheatIsActive /* f011e18: 24040020 */ li $a0,0x20 /* f011e1c: 10400006 */ beqz $v0,.PF0f011e38 /* f011e20: 00000000 */ nop -/* f011e24: 0fc44a1a */ jal 0xf112868 +/* f011e24: 0fc44a1a */ jal invGiveSingleWeapon /* f011e28: 24040007 */ li $a0,0x7 /* f011e2c: 24040001 */ li $a0,0x1 -/* f011e30: 0fc2a69d */ jal 0xf0a9a74 +/* f011e30: 0fc2a69d */ jal currentPlayerSetAmmoQuantity /* f011e34: 240500c8 */ li $a1,0xc8 .PF0f011e38: -/* f011e38: 0fc41dd5 */ jal 0xf107754 +/* f011e38: 0fc41dd5 */ jal cheatIsActive /* f011e3c: 24040021 */ li $a0,0x21 /* f011e40: 54400005 */ bnezl $v0,.PF0f011e58 /* f011e44: 24040016 */ li $a0,0x16 -/* f011e48: 0fc41dd5 */ jal 0xf107754 +/* f011e48: 0fc41dd5 */ jal cheatIsActive /* f011e4c: 24040003 */ li $a0,0x3 /* f011e50: 10400009 */ beqz $v0,.PF0f011e78 /* f011e54: 24040016 */ li $a0,0x16 .PF0f011e58: -/* f011e58: 0fc2a69d */ jal 0xf0a9a74 +/* f011e58: 0fc2a69d */ jal currentPlayerSetAmmoQuantity /* f011e5c: 24050004 */ li $a1,0x4 -/* f011e60: 0fc41dd5 */ jal 0xf107754 +/* f011e60: 0fc41dd5 */ jal cheatIsActive /* f011e64: 24040021 */ li $a0,0x21 /* f011e68: 10400003 */ beqz $v0,.PF0f011e78 /* f011e6c: 00000000 */ nop -/* f011e70: 0fc44a1a */ jal 0xf112868 +/* f011e70: 0fc44a1a */ jal invGiveSingleWeapon /* f011e74: 2404002c */ li $a0,0x2c .PF0f011e78: -/* f011e78: 0fc41dd5 */ jal 0xf107754 +/* f011e78: 0fc41dd5 */ jal cheatIsActive /* f011e7c: 24040022 */ li $a0,0x22 /* f011e80: 10400006 */ beqz $v0,.PF0f011e9c /* f011e84: 00000000 */ nop -/* f011e88: 0fc44a1a */ jal 0xf112868 +/* f011e88: 0fc44a1a */ jal invGiveSingleWeapon /* f011e8c: 24040024 */ li $a0,0x24 /* f011e90: 24040001 */ li $a0,0x1 -/* f011e94: 0fc2a69d */ jal 0xf0a9a74 +/* f011e94: 0fc2a69d */ jal currentPlayerSetAmmoQuantity /* f011e98: 240500c8 */ li $a1,0xc8 .PF0f011e9c: -/* f011e9c: 0fc41dd5 */ jal 0xf107754 +/* f011e9c: 0fc41dd5 */ jal cheatIsActive /* f011ea0: 24040023 */ li $a0,0x23 /* f011ea4: 10400006 */ beqz $v0,.PF0f011ec0 /* f011ea8: 00000000 */ nop -/* f011eac: 0fc44a1a */ jal 0xf112868 +/* f011eac: 0fc44a1a */ jal invGiveSingleWeapon /* f011eb0: 24040025 */ li $a0,0x25 /* f011eb4: 24040004 */ li $a0,0x4 -/* f011eb8: 0fc2a69d */ jal 0xf0a9a74 +/* f011eb8: 0fc2a69d */ jal currentPlayerSetAmmoQuantity /* f011ebc: 240500c8 */ li $a1,0xc8 .PF0f011ec0: -/* f011ec0: 0fc41dd5 */ jal 0xf107754 +/* f011ec0: 0fc41dd5 */ jal cheatIsActive /* f011ec4: 24040024 */ li $a0,0x24 /* f011ec8: 10400006 */ beqz $v0,.PF0f011ee4 /* f011ecc: 00000000 */ nop -/* f011ed0: 0fc44a1a */ jal 0xf112868 +/* f011ed0: 0fc44a1a */ jal invGiveSingleWeapon /* f011ed4: 24040026 */ li $a0,0x26 /* f011ed8: 24040002 */ li $a0,0x2 -/* f011edc: 0fc2a69d */ jal 0xf0a9a74 +/* f011edc: 0fc2a69d */ jal currentPlayerSetAmmoQuantity /* f011ee0: 240500c8 */ li $a1,0xc8 .PF0f011ee4: -/* f011ee4: 0fc41dd5 */ jal 0xf107754 +/* f011ee4: 0fc41dd5 */ jal cheatIsActive /* f011ee8: 24040025 */ li $a0,0x25 /* f011eec: 10400006 */ beqz $v0,.PF0f011f08 /* f011ef0: 00000000 */ nop -/* f011ef4: 0fc44a1a */ jal 0xf112868 +/* f011ef4: 0fc44a1a */ jal invGiveSingleWeapon /* f011ef8: 24040027 */ li $a0,0x27 /* f011efc: 24040004 */ li $a0,0x4 -/* f011f00: 0fc2a69d */ jal 0xf0a9a74 +/* f011f00: 0fc2a69d */ jal currentPlayerSetAmmoQuantity /* f011f04: 240500c8 */ li $a1,0xc8 .PF0f011f08: -/* f011f08: 0fc41dd5 */ jal 0xf107754 +/* f011f08: 0fc41dd5 */ jal cheatIsActive /* f011f0c: 24040026 */ li $a0,0x26 /* f011f10: 10400006 */ beqz $v0,.PF0f011f2c /* f011f14: 00000000 */ nop -/* f011f18: 0fc44a1a */ jal 0xf112868 +/* f011f18: 0fc44a1a */ jal invGiveSingleWeapon /* f011f1c: 24040028 */ li $a0,0x28 /* f011f20: 24040002 */ li $a0,0x2 -/* f011f24: 0fc2a69d */ jal 0xf0a9a74 +/* f011f24: 0fc2a69d */ jal currentPlayerSetAmmoQuantity /* f011f28: 240500c8 */ li $a1,0xc8 .PF0f011f2c: -/* f011f2c: 0fc41dd5 */ jal 0xf107754 +/* f011f2c: 0fc41dd5 */ jal cheatIsActive /* f011f30: 24040027 */ li $a0,0x27 /* f011f34: 10400006 */ beqz $v0,.PF0f011f50 /* f011f38: 00000000 */ nop -/* f011f3c: 0fc44a1a */ jal 0xf112868 +/* f011f3c: 0fc44a1a */ jal invGiveSingleWeapon /* f011f40: 24040029 */ li $a0,0x29 /* f011f44: 24040002 */ li $a0,0x2 -/* f011f48: 0fc2a69d */ jal 0xf0a9a74 +/* f011f48: 0fc2a69d */ jal currentPlayerSetAmmoQuantity /* f011f4c: 240500c8 */ li $a1,0xc8 .PF0f011f50: -/* f011f50: 0fc41dd5 */ jal 0xf107754 +/* f011f50: 0fc41dd5 */ jal cheatIsActive /* f011f54: 24040028 */ li $a0,0x28 /* f011f58: 10400006 */ beqz $v0,.PF0f011f74 /* f011f5c: 00000000 */ nop -/* f011f60: 0fc44a1a */ jal 0xf112868 +/* f011f60: 0fc44a1a */ jal invGiveSingleWeapon /* f011f64: 2404002a */ li $a0,0x2a /* f011f68: 24040004 */ li $a0,0x4 -/* f011f6c: 0fc2a69d */ jal 0xf0a9a74 +/* f011f6c: 0fc2a69d */ jal currentPlayerSetAmmoQuantity /* f011f70: 240500c8 */ li $a1,0xc8 .PF0f011f74: -/* f011f74: 0fc41dd5 */ jal 0xf107754 +/* f011f74: 0fc41dd5 */ jal cheatIsActive /* f011f78: 24040029 */ li $a0,0x29 /* f011f7c: 50400007 */ beqzl $v0,.PF0f011f9c /* f011f80: 8fa90080 */ lw $t1,0x80($sp) -/* f011f84: 0fc44a1a */ jal 0xf112868 +/* f011f84: 0fc44a1a */ jal invGiveSingleWeapon /* f011f88: 2404002b */ li $a0,0x2b /* f011f8c: 24040002 */ li $a0,0x2 -/* f011f90: 0fc2a69d */ jal 0xf0a9a74 +/* f011f90: 0fc2a69d */ jal currentPlayerSetAmmoQuantity /* f011f94: 240500c8 */ li $a1,0xc8 /* f011f98: 8fa90080 */ lw $t1,0x80($sp) .PF0f011f9c: @@ -953,7 +953,7 @@ glabel var7f1a827c /* f011fa4: 3c01800a */ lui $at,0x800a /* f011fa8: ac2ae340 */ sw $t2,-0x1cc0($at) .PF0f011fac: -/* f011fac: 0fc1816e */ jal 0xf0605b8 +/* f011fac: 0fc1816e */ jal propAllocate /* f011fb0: 00000000 */ nop /* f011fb4: 8e2b0284 */ lw $t3,0x284($s1) /* f011fb8: 24190006 */ li $t9,0x6 @@ -965,14 +965,14 @@ glabel var7f1a827c /* f011fd0: 8f0e00bc */ lw $t6,0xbc($t8) /* f011fd4: a1d90000 */ sb $t9,0x0($t6) /* f011fd8: 8e2f0284 */ lw $t7,0x284($s1) -/* f011fdc: 0fc181c7 */ jal 0xf06071c +/* f011fdc: 0fc181c7 */ jal propPrependToList1 /* f011fe0: 8de400bc */ lw $a0,0xbc($t7) /* f011fe4: 8e290284 */ lw $t1,0x284($s1) -/* f011fe8: 0fc18154 */ jal 0xf060550 +/* f011fe8: 0fc18154 */ jal propShow /* f011fec: 8d2400bc */ lw $a0,0xbc($t1) /* f011ff0: 8e2a0284 */ lw $t2,0x284($s1) /* f011ff4: 00002825 */ move $a1,$zero -/* f011ff8: 0fc081dd */ jal 0xf020774 +/* f011ff8: 0fc081dd */ jal chrInit /* f011ffc: 8d4400bc */ lw $a0,0xbc($t2) /* f012000: 8e2b0298 */ lw $t3,0x298($s1) /* f012004: 05620008 */ bltzl $t3,.PF0f012028 @@ -1031,7 +1031,7 @@ glabel var7f1a827c /* f0120c4: 93a9007b */ lbu $t1,0x7b($sp) /* f0120c8: 11200003 */ beqz $t1,.PF0f0120d8 /* f0120cc: 00000000 */ nop -/* f0120d0: 0fc04594 */ jal 0xf011650 +/* f0120d0: 0fc04594 */ jal currentPlayerInitEyespy /* f0120d4: 00000000 */ nop .PF0f0120d8: /* f0120d8: 3c0d800a */ lui $t5,0x800a @@ -1045,7 +1045,7 @@ glabel var7f1a827c /* f0120f8: 27a6008c */ addiu $a2,$sp,0x8c /* f0120fc: 8e380284 */ lw $t8,0x284($s1) /* f012100: 44816000 */ mtc1 $at,$f12 -/* f012104: 0fc61c60 */ jal 0xf187180 +/* f012104: 0fc61c60 */ jal scenarioChooseSpawnLocation /* f012108: 8f0700bc */ lw $a3,0xbc($t8) /* f01210c: 3c017f1b */ lui $at,0x7f1b /* f012110: c4249480 */ lwc1 $f4,-0x6b80($at) @@ -1062,7 +1062,7 @@ glabel var7f1a827c /* f012138: 44816000 */ mtc1 $at,$f12 /* f01213c: 27a5009c */ addiu $a1,$sp,0x9c /* f012140: 27a6008c */ addiu $a2,$sp,0x8c -/* f012144: 0fc61c60 */ jal 0xf187180 +/* f012144: 0fc61c60 */ jal scenarioChooseSpawnLocation /* f012148: 8de700bc */ lw $a3,0xbc($t7) /* f01214c: 3c017f1b */ lui $at,0x7f1b /* f012150: c42a9484 */ lwc1 $f10,-0x6b7c($at) @@ -1080,7 +1080,7 @@ glabel var7f1a827c .PF0f01217c: /* f01217c: 3c0141f0 */ lui $at,0x41f0 /* f012180: 44816000 */ mtc1 $at,$f12 -/* f012184: 0fc61c60 */ jal 0xf187180 +/* f012184: 0fc61c60 */ jal scenarioChooseSpawnLocation /* f012188: 8d6700bc */ lw $a3,0xbc($t3) /* f01218c: 3c017f1b */ lui $at,0x7f1b /* f012190: c4329488 */ lwc1 $f18,-0x6b78($at) @@ -1100,7 +1100,7 @@ glabel var7f1a827c /* f0121c0: 27a6008c */ addiu $a2,$sp,0x8c /* f0121c4: afa0001c */ sw $zero,0x1c($sp) /* f0121c8: afa00020 */ sw $zero,0x20($sp) -/* f0121cc: 0c00a6ac */ jal 0x29ab0 +/* f0121cc: 0c00a6ac */ jal cdFindGroundY /* f0121d0: 2447161a */ addiu $a3,$v0,0x161a /* f0121d4: 8e220284 */ lw $v0,0x284($s1) /* f0121d8: 3c0143b4 */ lui $at,0x43b4 @@ -1120,9 +1120,9 @@ glabel var7f1a827c /* f012210: 46109103 */ div.s $f4,$f18,$f16 /* f012214: e7240144 */ swc1 $f4,0x144($t9) /* f012218: 8e240284 */ lw $a0,0x284($s1) -/* f01221c: 0fc2e2b0 */ jal 0xf0b8ac0 +/* f01221c: 0fc2e2b0 */ jal func0f0b85a0 /* f012220: 2484036c */ addiu $a0,$a0,0x36c -/* f012224: 0c00685b */ jal 0x1a16c +/* f012224: 0c00685b */ jal sinf /* f012228: c7ac0088 */ lwc1 $f12,0x88($sp) /* f01222c: 8e2f0284 */ lw $t7,0x284($s1) /* f012230: 46000187 */ neg.s $f6,$f0 @@ -1130,7 +1130,7 @@ glabel var7f1a827c /* f012238: e5e6036c */ swc1 $f6,0x36c($t7) /* f01223c: 8e2a0284 */ lw $t2,0x284($s1) /* f012240: e54a0370 */ swc1 $f10,0x370($t2) -/* f012244: 0c006858 */ jal 0x1a160 +/* f012244: 0c006858 */ jal cosf /* f012248: c7ac0088 */ lwc1 $f12,0x88($sp) /* f01224c: 8e2e0284 */ lw $t6,0x284($s1) /* f012250: e5c00374 */ swc1 $f0,0x374($t6) @@ -1153,7 +1153,7 @@ glabel var7f1a827c /* f012294: 8d4e00bc */ lw $t6,0xbc($t2) /* f012298: e5c20010 */ swc1 $f2,0x10($t6) /* f01229c: 8e2b0284 */ lw $t3,0x284($s1) -/* f0122a0: 0fc197b5 */ jal 0xf065ed4 +/* f0122a0: 0fc197b5 */ jal func0f065c44 /* f0122a4: 8d6400bc */ lw $a0,0xbc($t3) /* f0122a8: 8e2d0284 */ lw $t5,0x284($s1) /* f0122ac: 87a9008c */ lh $t1,0x8c($sp) @@ -1167,9 +1167,9 @@ glabel var7f1a827c /* f0122cc: 8e220284 */ lw $v0,0x284($s1) /* f0122d0: 87a7008c */ lh $a3,0x8c($sp) /* f0122d4: 24450394 */ addiu $a1,$v0,0x394 -/* f0122d8: 0fc30864 */ jal 0xf0c2190 +/* f0122d8: 0fc30864 */ jal currentPlayerSetCamPropertiesWithRoom /* f0122dc: 24460388 */ addiu $a2,$v0,0x388 -/* f0122e0: 0fc0797c */ jal 0xf01e5f0 +/* f0122e0: 0fc0797c */ jal getNumChrSlots /* f0122e4: 00000000 */ nop /* f0122e8: 18400026 */ blez $v0,.PF0f012384 /* f0122ec: 00402025 */ move $a0,$v0 @@ -1215,17 +1215,17 @@ glabel var7f1a827c /* f01237c: 5420ffe9 */ bnezl $at,.PF0f012324 /* f012380: 8cca0000 */ lw $t2,0x0($a2) .PF0f012384: -/* f012384: 0fc32f95 */ jal 0xf0cbe54 +/* f012384: 0fc32f95 */ jal bmove0f0cb8c4 /* f012388: 8e240284 */ lw $a0,0x284($s1) /* f01238c: 8e380318 */ lw $t8,0x318($s1) /* f012390: 13000005 */ beqz $t8,.PF0f0123a8 /* f012394: 00000000 */ nop -/* f012398: 0fc2e6e5 */ jal 0xf0b9b94 +/* f012398: 0fc2e6e5 */ jal func0f0b9674 /* f01239c: 00000000 */ nop /* f0123a0: 10000003 */ b .PF0f0123b0 /* f0123a4: 00000000 */ nop .PF0f0123a8: -/* f0123a8: 0fc2e7d0 */ jal 0xf0b9f40 +/* f0123a8: 0fc2e7d0 */ jal func0f0b9a20 /* f0123ac: 00000000 */ nop .PF0f0123b0: /* f0123b0: 3c048007 */ lui $a0,0x8007 @@ -1262,7 +1262,7 @@ glabel var7f1a827c /* f012420: ac4004b4 */ sw $zero,0x4b4($v0) /* f012424: 27a40048 */ addiu $a0,$sp,0x48 /* f012428: 27a50044 */ addiu $a1,$sp,0x44 -/* f01242c: 0fc2e313 */ jal 0xf0b8c4c +/* f01242c: 0fc2e313 */ jal currentPlayerChooseBodyAndHead /* f012430: 00003025 */ move $a2,$zero /* f012434: 8e2a0284 */ lw $t2,0x284($s1) /* f012438: 8faf0048 */ lw $t7,0x48($sp) diff --git a/src/game/game_01bea0.c b/src/game/game_01bea0.c index b98857757..223d4fbe7 100644 --- a/src/game/game_01bea0.c +++ b/src/game/game_01bea0.c @@ -103,10 +103,10 @@ glabel var7f1a863c /* f01c040: afb1002c */ sw $s1,0x2c($sp) /* f01c044: afb60154 */ sw $s6,0x154($sp) /* f01c048: 00008025 */ move $s0,$zero -/* f01c04c: 0fc01a73 */ jal 0xf0069cc +/* f01c04c: 0fc01a73 */ jal func0f0069dc /* f01c050: ac360020 */ sw $s6,0x20($at) /* f01c054: 3c15800a */ lui $s5,0x800a -/* f01c058: 0fc06ff4 */ jal 0xf01bfd0 +/* f01c058: 0fc06ff4 */ jal menuCountDialogs /* f01c05c: 26b51f60 */ addiu $s5,$s5,0x1f60 /* f01c060: 3c03800a */ lui $v1,0x800a /* f01c064: 3c05800a */ lui $a1,0x800a @@ -183,7 +183,7 @@ glabel var7f1a863c /* f01c164: 14c00005 */ bnez $a2,.PF0f01c17c /* f01c168: 244f0001 */ addiu $t7,$v0,0x1 .PF0f01c16c: -/* f01c16c: 0fc3ce5d */ jal 0xf0f3974 +/* f01c16c: 0fc3ce5d */ jal func0f0f3220 /* f01c170: 2504ffff */ addiu $a0,$t0,-1 /* f01c174: 10000003 */ b .PF0f01c184 /* f01c178: 92a30015 */ lbu $v1,0x15($s5) @@ -294,7 +294,7 @@ glabel var7f1a863c .PF0f01c2e0: /* f01c2e0: 14410008 */ bne $v0,$at,.PF0f01c304 /* f01c2e4: 00000000 */ nop -/* f01c2e8: 0fc395ac */ jal 0xf0e56b0 +/* f01c2e8: 0fc395ac */ jal func0f0e4fd4 /* f01c2ec: 00000000 */ nop /* f01c2f0: 24180001 */ li $t8,0x1 /* f01c2f4: 24190008 */ li $t9,0x8 @@ -309,7 +309,7 @@ glabel var7f1a863c /* f01c310: 92ae0014 */ lbu $t6,0x14($s5) /* f01c314: 55c00004 */ bnezl $t6,.PF0f01c328 /* f01c318: 92af0015 */ lbu $t7,0x15($s5) -/* f01c31c: 0fc3eb7a */ jal 0xf0fade8 +/* f01c31c: 0fc3eb7a */ jal func0f0fa6ac /* f01c320: 00000000 */ nop /* f01c324: 92af0015 */ lbu $t7,0x15($s5) .PF0f01c328: @@ -325,7 +325,7 @@ glabel var7f1a863c /* f01c348: 8f2d1bd4 */ lw $t5,0x1bd4($t9) /* f01c34c: 11a00003 */ beqz $t5,.PF0f01c35c /* f01c350: 00000000 */ nop -/* f01c354: 0fc2e696 */ jal 0xf0b9a58 +/* f01c354: 0fc2e696 */ jal func0f0b9538 /* f01c358: 00000000 */ nop .PF0f01c35c: /* f01c35c: 10000007 */ b .PF0f01c37c @@ -354,7 +354,7 @@ glabel var7f1a863c /* f01c3ac: 1461005b */ bne $v1,$at,.PF0f01c51c /* f01c3b0: 00000000 */ nop .PF0f01c3b4: -/* f01c3b4: 0c002779 */ jal 0x9de4 +/* f01c3b4: 0c002779 */ jal func00009ec4 /* f01c3b8: 00002025 */ move $a0,$zero /* f01c3bc: 8e78049c */ lw $t8,0x49c($s3) /* f01c3c0: 3c148007 */ lui $s4,0x8007 @@ -386,7 +386,7 @@ glabel var7f1a863c /* f01c41c: 16d80008 */ bne $s6,$t8,.PF0f01c440 /* f01c420: 24590001 */ addiu $t9,$v0,0x1 /* f01c424: ae990000 */ sw $t9,0x0($s4) -/* f01c428: 0fc6033c */ jal 0xf180cf0 +/* f01c428: 0fc6033c */ jal func0f17fcb0 /* f01c42c: afa80058 */ sw $t0,0x58($sp) /* f01c430: 3c03800b */ lui $v1,0x800b /* f01c434: 9463d13e */ lhu $v1,-0x2ec2($v1) @@ -405,12 +405,12 @@ glabel var7f1a863c /* f01c464: 3c048007 */ lui $a0,0x8007 /* f01c468: 24845758 */ addiu $a0,$a0,0x5758 /* f01c46c: 2405000b */ li $a1,0xb -/* f01c470: 0fc3e29d */ jal 0xf0f8a74 +/* f01c470: 0fc3e29d */ jal menuPushRootDialog /* f01c474: afa80058 */ sw $t0,0x58($sp) /* f01c478: 10000004 */ b .PF0f01c48c /* f01c47c: 8fa80058 */ lw $t0,0x58($sp) .PF0f01c480: -/* f01c480: 0fc3e29d */ jal 0xf0f8a74 +/* f01c480: 0fc3e29d */ jal menuPushRootDialog /* f01c484: afa80058 */ sw $t0,0x58($sp) /* f01c488: 8fa80058 */ lw $t0,0x58($sp) .PF0f01c48c: @@ -441,7 +441,7 @@ glabel var7f1a863c /* f01c4e4: 24058098 */ li $a1,-32616 /* f01c4e8: 00003025 */ move $a2,$zero /* f01c4ec: 2407ffff */ li $a3,-1 -/* f01c4f0: 0c0041a0 */ jal 0x10680 +/* f01c4f0: 0c0041a0 */ jal audioStart /* f01c4f4: e7b00014 */ swc1 $f16,0x14($sp) /* f01c4f8: 3c0e8009 */ lui $t6,0x8009 /* f01c4fc: 91ce1040 */ lbu $t6,0x1040($t6) @@ -451,14 +451,14 @@ glabel var7f1a863c /* f01c50c: 10000001 */ b .PF0f01c514 /* f01c510: 2404000b */ li $a0,0xb .PF0f01c514: -/* f01c514: 0fc2ed1b */ jal 0xf0bb46c +/* f01c514: 0fc2ed1b */ jal currentPlayerPause /* f01c518: 00000000 */ nop .PF0f01c51c: /* f01c51c: 3c018008 */ lui $at,0x8008 /* f01c520: 10000005 */ b .PF0f01c538 /* f01c524: ac2077b0 */ sw $zero,0x77b0($at) .PF0f01c528: -/* f01c528: 0c002779 */ jal 0x9de4 +/* f01c528: 0c002779 */ jal func00009ec4 /* f01c52c: 02c02025 */ move $a0,$s6 /* f01c530: 3c018007 */ lui $at,0x8007 /* f01c534: ac200a30 */ sw $zero,0xa30($at) @@ -489,7 +489,7 @@ glabel var7f1a863c /* f01c594: a040251c */ sb $zero,0x251c($v0) /* f01c598: a040338c */ sb $zero,0x338c($v0) /* f01c59c: 24040006 */ li $a0,0x6 -/* f01c5a0: 0fc2ed1b */ jal 0xf0bb46c +/* f01c5a0: 0fc2ed1b */ jal currentPlayerPause /* f01c5a4: adc01a24 */ sw $zero,0x1a24($t6) /* f01c5a8: 240f0001 */ li $t7,0x1 /* f01c5ac: 3c018006 */ lui $at,0x8006 @@ -544,9 +544,9 @@ glabel var7f1a863c .PF0f01c658: /* f01c658: 1621fff0 */ bne $s1,$at,.PF0f01c61c /* f01c65c: 24630e70 */ addiu $v1,$v1,0xe70 -/* f01c660: 0fc6342e */ jal 0xf18d0b8 +/* f01c660: 0fc6342e */ jal mpCalculateLockIfLastWinnerOrLoser /* f01c664: 00000000 */ nop -/* f01c668: 0fc67190 */ jal 0xf19c640 +/* f01c668: 0fc67190 */ jal mpPerformSanityChecks /* f01c66c: 00000000 */ nop .PF0f01c670: /* f01c670: 3c068007 */ lui $a2,0x8007 @@ -628,12 +628,12 @@ glabel var7f1a863c /* f01c780: 004d082a */ slt $at,$v0,$t5 /* f01c784: 10200003 */ beqz $at,.PF0f01c794 /* f01c788: afa20054 */ sw $v0,0x54($sp) -/* f01c78c: 0fc4a4ff */ jal 0xf1293fc +/* f01c78c: 0fc4a4ff */ jal setCurrentPlayerNum /* f01c790: 00402025 */ move $a0,$v0 .PF0f01c794: -/* f01c794: 0fc3eb90 */ jal 0xf0fae40 +/* f01c794: 0fc3eb90 */ jal func0f0fa704 /* f01c798: 00000000 */ nop -/* f01c79c: 0fc4a4ff */ jal 0xf1293fc +/* f01c79c: 0fc4a4ff */ jal setCurrentPlayerNum /* f01c7a0: 02002025 */ move $a0,$s0 /* f01c7a4: 10000104 */ b .PF0f01cbb8 /* f01c7a8: 26310001 */ addiu $s1,$s1,0x1 @@ -648,7 +648,7 @@ glabel var7f1a863c /* f01c7c8: 02717821 */ addu $t7,$s3,$s1 .PF0f01c7cc: /* f01c7cc: 03202025 */ move $a0,$t9 -/* f01c7d0: 0c00536a */ jal 0x14da8 +/* f01c7d0: 0c00536a */ jal contGetButtonsPressedThisFrame /* f01c7d4: 3405ffff */ li $a1,0xffff /* f01c7d8: 8eae0004 */ lw $t6,0x4($s5) /* f01c7dc: 2401000b */ li $at,0xb @@ -721,7 +721,7 @@ glabel var7f1a863c /* f01c8d0: 8c845750 */ lw $a0,0x5750($a0) /* f01c8d4: 2407ffff */ li $a3,-1 /* f01c8d8: afa80058 */ sw $t0,0x58($sp) -/* f01c8dc: 0c0041a0 */ jal 0x10680 +/* f01c8dc: 0c0041a0 */ jal audioStart /* f01c8e0: e7b20014 */ swc1 $f18,0x14($sp) /* f01c8e4: 8fa80058 */ lw $t0,0x58($sp) .PF0f01c8e8: @@ -740,19 +740,19 @@ glabel var7f1a863c /* f01c914: 16d90006 */ bne $s6,$t9,.PF0f01c930 /* f01c918: 24846a50 */ addiu $a0,$a0,0x6a50 /* f01c91c: 3c048007 */ lui $a0,0x8007 -/* f01c920: 0fc3e29d */ jal 0xf0f8a74 +/* f01c920: 0fc3e29d */ jal menuPushRootDialog /* f01c924: 248455e4 */ addiu $a0,$a0,0x55e4 /* f01c928: 1000000a */ b .PF0f01c954 /* f01c92c: 320f1000 */ andi $t7,$s0,0x1000 .PF0f01c930: -/* f01c930: 0fc3e29d */ jal 0xf0f8a74 +/* f01c930: 0fc3e29d */ jal menuPushRootDialog /* f01c934: 24050003 */ li $a1,0x3 /* f01c938: 10000006 */ b .PF0f01c954 /* f01c93c: 320f1000 */ andi $t7,$s0,0x1000 .PF0f01c940: /* f01c940: 244e0001 */ addiu $t6,$v0,0x1 /* f01c944: ae8e0000 */ sw $t6,0x0($s4) -/* f01c948: 0fc6033c */ jal 0xf180cf0 +/* f01c948: 0fc6033c */ jal func0f17fcb0 /* f01c94c: 00002025 */ move $a0,$zero .PF0f01c950: /* f01c950: 320f1000 */ andi $t7,$s0,0x1000 @@ -787,12 +787,12 @@ glabel var7f1a863c /* f01c9bc: 16cd0006 */ bne $s6,$t5,.PF0f01c9d8 /* f01c9c0: 24846a50 */ addiu $a0,$a0,0x6a50 /* f01c9c4: 3c048007 */ lui $a0,0x8007 -/* f01c9c8: 0fc3e29d */ jal 0xf0f8a74 +/* f01c9c8: 0fc3e29d */ jal menuPushRootDialog /* f01c9cc: 248455e4 */ addiu $a0,$a0,0x55e4 /* f01c9d0: 1000000d */ b .PF0f01ca08 /* f01c9d4: 00000000 */ nop .PF0f01c9d8: -/* f01c9d8: 0fc3e29d */ jal 0xf0f8a74 +/* f01c9d8: 0fc3e29d */ jal menuPushRootDialog /* f01c9dc: 24050003 */ li $a1,0x3 /* f01c9e0: 10000009 */ b .PF0f01ca08 /* f01c9e4: 00000000 */ nop @@ -803,7 +803,7 @@ glabel var7f1a863c /* f01c9f4: a1000494 */ sb $zero,0x494($t0) /* f01c9f8: 00002025 */ move $a0,$zero /* f01c9fc: 272e0001 */ addiu $t6,$t9,0x1 -/* f01ca00: 0fc6033c */ jal 0xf180cf0 +/* f01ca00: 0fc6033c */ jal func0f17fcb0 /* f01ca04: ae8e0000 */ sw $t6,0x0($s4) .PF0f01ca08: /* f01ca08: 10000003 */ b .PF0f01ca18 @@ -820,7 +820,7 @@ glabel var7f1a863c /* f01ca2c: 3c04800b */ lui $a0,0x800b /* f01ca30: 00982021 */ addu $a0,$a0,$t8 /* f01ca34: 8084cd9d */ lb $a0,-0x3263($a0) -/* f01ca38: 0c00536a */ jal 0x14da8 +/* f01ca38: 0c00536a */ jal contGetButtonsPressedThisFrame /* f01ca3c: 3405ffff */ li $a1,0xffff /* f01ca40: 304d4000 */ andi $t5,$v0,0x4000 /* f01ca44: 51a0005c */ beqzl $t5,.PF0f01cbb8 @@ -902,11 +902,11 @@ glabel var7f1a863c /* f01cb48: 8e79029c */ lw $t9,0x29c($s3) /* f01cb4c: 8e6d028c */ lw $t5,0x28c($s3) /* f01cb50: 02002025 */ move $a0,$s0 -/* f01cb54: 0fc4a4ff */ jal 0xf1293fc +/* f01cb54: 0fc4a4ff */ jal setCurrentPlayerNum /* f01cb58: afad0128 */ sw $t5,0x128($sp) -/* f01cb5c: 0fc43d91 */ jal 0xf10f644 +/* f01cb5c: 0fc43d91 */ jal soloPushCoopModeEndscreen /* f01cb60: 00000000 */ nop -/* f01cb64: 0fc4a4ff */ jal 0xf1293fc +/* f01cb64: 0fc4a4ff */ jal setCurrentPlayerNum /* f01cb68: 8fa40128 */ lw $a0,0x128($sp) /* f01cb6c: 10000012 */ b .PF0f01cbb8 /* f01cb70: 26310001 */ addiu $s1,$s1,0x1 @@ -917,16 +917,16 @@ glabel var7f1a863c /* f01cb80: 00000000 */ nop /* f01cb84: 8e6e028c */ lw $t6,0x28c($s3) /* f01cb88: 02002025 */ move $a0,$s0 -/* f01cb8c: 0fc4a4ff */ jal 0xf1293fc +/* f01cb8c: 0fc4a4ff */ jal setCurrentPlayerNum /* f01cb90: afae0124 */ sw $t6,0x124($sp) -/* f01cb94: 0fc43e28 */ jal 0xf10f8a0 +/* f01cb94: 0fc43e28 */ jal soloPushAntiModeEndscreen /* f01cb98: 00000000 */ nop -/* f01cb9c: 0fc4a4ff */ jal 0xf1293fc +/* f01cb9c: 0fc4a4ff */ jal setCurrentPlayerNum /* f01cba0: 8fa40124 */ lw $a0,0x124($sp) /* f01cba4: 10000004 */ b .PF0f01cbb8 /* f01cba8: 26310001 */ addiu $s1,$s1,0x1 .PF0f01cbac: -/* f01cbac: 0fc5e7cd */ jal 0xf179f34 +/* f01cbac: 0fc5e7cd */ jal mpPushEndscreenDialog /* f01cbb0: 02202825 */ move $a1,$s1 .PF0f01cbb4: /* f01cbb4: 26310001 */ addiu $s1,$s1,0x1 @@ -944,7 +944,7 @@ glabel var7f1a863c /* f01cbe0: 14610007 */ bne $v1,$at,.PF0f01cc00 /* f01cbe4: 00000000 */ nop .PF0f01cbe8: -/* f01cbe8: 0fc3e254 */ jal 0xf0f8950 +/* f01cbe8: 0fc3e254 */ jal func0f0f820c /* f01cbec: 2405fffb */ li $a1,-5 /* f01cbf0: 10000003 */ b .PF0f01cc00 /* f01cbf4: 00000000 */ nop @@ -970,17 +970,17 @@ glabel var7f1a863c /* f01cc3c: 00000000 */ nop .PF0f01cc40: /* f01cc40: a0590000 */ sb $t9,0x0($v0) -/* f01cc44: 0fc445cf */ jal 0xf11173c +/* f01cc44: 0fc445cf */ jal func0f110c5c /* f01cc48: 24050002 */ li $a1,0x2 /* f01cc4c: 02c02025 */ move $a0,$s6 -/* f01cc50: 0fc445cf */ jal 0xf11173c +/* f01cc50: 0fc445cf */ jal func0f110c5c /* f01cc54: 24050001 */ li $a1,0x1 .PF0f01cc58: /* f01cc58: 3c0e8006 */ lui $t6,0x8006 /* f01cc5c: 91ce2614 */ lbu $t6,0x2614($t6) /* f01cc60: 11c0000b */ beqz $t6,.PF0f01cc90 /* f01cc64: 00000000 */ nop -/* f01cc68: 0fc44622 */ jal 0xf111888 +/* f01cc68: 0fc44622 */ jal func0f110da8 /* f01cc6c: 00000000 */ nop /* f01cc70: 10000007 */ b .PF0f01cc90 /* f01cc74: 00000000 */ nop @@ -989,7 +989,7 @@ glabel var7f1a863c /* f01cc7c: 91ef2614 */ lbu $t7,0x2614($t7) /* f01cc80: 16cf0003 */ bne $s6,$t7,.PF0f01cc90 /* f01cc84: 00000000 */ nop -/* f01cc88: 0fc06fe4 */ jal 0xf01bf90 +/* f01cc88: 0fc06fe4 */ jal func0f01bea0 /* f01cc8c: 00000000 */ nop .PF0f01cc90: /* f01cc90: 3c018007 */ lui $at,0x8007 @@ -1073,15 +1073,15 @@ glabel var7f1a863c /* f01cda0: 2401fffb */ li $at,-5 /* f01cda4: 54a10011 */ bnel $a1,$at,.PF0f01cdec /* f01cda8: 2401fffa */ li $at,-6 -/* f01cdac: 0fc621fd */ jal 0xf1887f4 +/* f01cdac: 0fc621fd */ jal mpStartMatch /* f01cdb0: afa40158 */ sw $a0,0x158($sp) -/* f01cdb4: 0fc06fe4 */ jal 0xf01bf90 +/* f01cdb4: 0fc06fe4 */ jal func0f01bea0 /* f01cdb8: 00000000 */ nop /* f01cdbc: 8e6f0458 */ lw $t7,0x458($s3) /* f01cdc0: 31f80002 */ andi $t8,$t7,0x2 /* f01cdc4: 530000ca */ beqzl $t8,.PF0f01d0f0 /* f01cdc8: 240fffff */ li $t7,-1 -/* f01cdcc: 0fc44527 */ jal 0xf11149c +/* f01cdcc: 0fc44527 */ jal func0f1109c0 /* f01cdd0: 00000000 */ nop /* f01cdd4: 8e6d0458 */ lw $t5,0x458($s3) /* f01cdd8: 2401fffd */ li $at,-3 @@ -1097,7 +1097,7 @@ glabel var7f1a863c /* f01cdfc: afa40158 */ sw $a0,0x158($sp) /* f01ce00: 11c00003 */ beqz $t6,.PF0f01ce10 /* f01ce04: 00000000 */ nop -/* f01ce08: 0fc3f732 */ jal 0xf0fdcc8 +/* f01ce08: 0fc3f732 */ jal func0f0fd548 /* f01ce0c: 24040004 */ li $a0,0x4 .PF0f01ce10: /* f01ce10: 3c12800a */ lui $s2,0x800a @@ -1131,25 +1131,25 @@ glabel var7f1a863c /* f01ce7c: 030ec021 */ addu $t8,$t8,$t6 /* f01ce80: 8f18215c */ lw $t8,0x215c($t8) /* f01ce84: a2580001 */ sb $t8,0x1($s2) -/* f01ce88: 0fc06c91 */ jal 0xf01b244 +/* f01ce88: 0fc06c91 */ jal titleSetNextStage /* f01ce8c: 330400ff */ andi $a0,$t8,0xff /* f01ce90: 8e440000 */ lw $a0,0x0($s2) /* f01ce94: 00047e42 */ srl $t7,$a0,0x19 -/* f01ce98: 0fc5b6fd */ jal 0xf16dbf4 +/* f01ce98: 0fc5b6fd */ jal coreSetDifficulty /* f01ce9c: 01e02025 */ move $a0,$t7 -/* f01cea0: 0fc06a32 */ jal 0xf01a8c8 +/* f01cea0: 0fc06a32 */ jal titleSetNextMode /* f01cea4: 24040005 */ li $a0,0x5 -/* f01cea8: 0c0039af */ jal 0xe6bc +/* f01cea8: 0c0039af */ jal mainSetStageNum /* f01ceac: 92440001 */ lbu $a0,0x1($s2) /* f01ceb0: 1000002b */ b .PF0f01cf60 /* f01ceb4: 8fae0120 */ lw $t6,0x120($sp) /* f01ceb8: 8e70028c */ lw $s0,0x28c($s3) .PF0f01cebc: -/* f01cebc: 0fc4a4ff */ jal 0xf1293fc +/* f01cebc: 0fc4a4ff */ jal setCurrentPlayerNum /* f01cec0: afad0158 */ sw $t5,0x158($sp) -/* f01cec4: 0fc43d91 */ jal 0xf10f644 +/* f01cec4: 0fc43d91 */ jal soloPushCoopModeEndscreen /* f01cec8: 00000000 */ nop -/* f01cecc: 0fc4a4ff */ jal 0xf1293fc +/* f01cecc: 0fc4a4ff */ jal setCurrentPlayerNum /* f01ced0: 02002025 */ move $a0,$s0 /* f01ced4: 10000022 */ b .PF0f01cf60 /* f01ced8: 8fae0120 */ lw $t6,0x120($sp) @@ -1160,11 +1160,11 @@ glabel var7f1a863c /* f01cee8: 05c0000a */ bltz $t6,.PF0f01cf14 /* f01ceec: 8fa40120 */ lw $a0,0x120($sp) /* f01cef0: 8e70028c */ lw $s0,0x28c($s3) -/* f01cef4: 0fc4a4ff */ jal 0xf1293fc +/* f01cef4: 0fc4a4ff */ jal setCurrentPlayerNum /* f01cef8: 8fa40120 */ lw $a0,0x120($sp) -/* f01cefc: 0fc43e28 */ jal 0xf10f8a0 +/* f01cefc: 0fc43e28 */ jal soloPushAntiModeEndscreen /* f01cf00: 00000000 */ nop -/* f01cf04: 0fc4a4ff */ jal 0xf1293fc +/* f01cf04: 0fc4a4ff */ jal setCurrentPlayerNum /* f01cf08: 02002025 */ move $a0,$s0 /* f01cf0c: 10000014 */ b .PF0f01cf60 /* f01cf10: 8fae0120 */ lw $t6,0x120($sp) @@ -1176,7 +1176,7 @@ glabel var7f1a863c /* f01cf24: 0018c140 */ sll $t8,$t8,0x5 /* f01cf28: 030f1021 */ addu $v0,$t8,$t7 /* f01cf2c: afa20058 */ sw $v0,0x58($sp) -/* f01cf30: 0fc5e7cd */ jal 0xf179f34 +/* f01cf30: 0fc5e7cd */ jal mpPushEndscreenDialog /* f01cf34: 02202825 */ move $a1,$s1 /* f01cf38: 8fa20058 */ lw $v0,0x58($sp) /* f01cf3c: 8c4d004c */ lw $t5,0x4c($v0) @@ -1185,7 +1185,7 @@ glabel var7f1a863c /* f01cf48: 94590050 */ lhu $t9,0x50($v0) /* f01cf4c: 53200004 */ beqzl $t9,.PF0f01cf60 /* f01cf50: 8fae0120 */ lw $t6,0x120($sp) -/* f01cf54: 0fc3f732 */ jal 0xf0fdcc8 +/* f01cf54: 0fc3f732 */ jal func0f0fd548 /* f01cf58: 02202025 */ move $a0,$s1 /* f01cf5c: 8fae0120 */ lw $t6,0x120($sp) .PF0f01cf60: @@ -1202,16 +1202,16 @@ glabel var7f1a863c .PF0f01cf84: /* f01cf84: 14a10019 */ bne $a1,$at,.PF0f01cfec /* f01cf88: 00008025 */ move $s0,$zero -/* f01cf8c: 0fc06fe4 */ jal 0xf01bf90 +/* f01cf8c: 0fc06fe4 */ jal func0f01bea0 /* f01cf90: afa40158 */ sw $a0,0x158($sp) /* f01cf94: 3c10800a */ lui $s0,0x800a /* f01cf98: 261027a0 */ addiu $s0,$s0,0x27a0 /* f01cf9c: 240f0002 */ li $t7,0x2 /* f01cfa0: 3c018006 */ lui $at,0x8006 /* f01cfa4: a02f2610 */ sb $t7,0x2610($at) -/* f01cfa8: 0fc4402b */ jal 0xf1100ac +/* f01cfa8: 0fc4402b */ jal savefileLoadDefaults /* f01cfac: 02002025 */ move $a0,$s0 -/* f01cfb0: 0fc43ee5 */ jal 0xf10fb94 +/* f01cfb0: 0fc43ee5 */ jal savefileApplyOptions /* f01cfb4: 02002025 */ move $a0,$s0 /* f01cfb8: 3c0d8009 */ lui $t5,0x8009 /* f01cfbc: 91ad1040 */ lbu $t5,0x1040($t5) @@ -1221,16 +1221,16 @@ glabel var7f1a863c /* f01cfcc: 10000001 */ b .PF0f01cfd4 /* f01cfd0: 2404005d */ li $a0,0x5d .PF0f01cfd4: -/* f01cfd4: 0c0039af */ jal 0xe6bc +/* f01cfd4: 0c0039af */ jal mainSetStageNum /* f01cfd8: 00000000 */ nop -/* f01cfdc: 0fc5b88c */ jal 0xf16e230 +/* f01cfdc: 0fc5b88c */ jal func0f16d3d0 /* f01cfe0: 00000000 */ nop /* f01cfe4: 10000042 */ b .PF0f01d0f0 /* f01cfe8: 240fffff */ li $t7,-1 .PF0f01cfec: /* f01cfec: 24190001 */ li $t9,0x1 /* f01cff0: afb90158 */ sw $t9,0x158($sp) -/* f01cff4: 0fc3e29d */ jal 0xf0f8a74 +/* f01cff4: 0fc3e29d */ jal menuPushRootDialog /* f01cff8: 8ea4000c */ lw $a0,0xc($s5) /* f01cffc: 8ea30004 */ lw $v1,0x4($s5) /* f01d000: 24010003 */ li $at,0x3 @@ -1252,7 +1252,7 @@ glabel var7f1a863c /* f01d03c: 8c845750 */ lw $a0,0x5750($a0) /* f01d040: 00003025 */ move $a2,$zero /* f01d044: 2407ffff */ li $a3,-1 -/* f01d048: 0c0041a0 */ jal 0x10680 +/* f01d048: 0c0041a0 */ jal audioStart /* f01d04c: e7a40014 */ swc1 $f4,0x14($sp) /* f01d050: 8ea30004 */ lw $v1,0x4($s5) .PF0f01d054: @@ -1262,7 +1262,7 @@ glabel var7f1a863c /* f01d060: 1461001e */ bne $v1,$at,.PF0f01d0dc /* f01d064: 00000000 */ nop .PF0f01d068: -/* f01d068: 0fc68a40 */ jal 0xf1a2900 +/* f01d068: 0fc68a40 */ jal dtGetData /* f01d06c: 00000000 */ nop /* f01d070: 8e6304b4 */ lw $v1,0x4b4($s3) /* f01d074: 24010026 */ li $at,0x26 @@ -1297,7 +1297,7 @@ glabel var7f1a863c .PF0f01d0dc: /* f01d0dc: 52000004 */ beqzl $s0,.PF0f01d0f0 /* f01d0e0: 240fffff */ li $t7,-1 -/* f01d0e4: 0fc5ba5d */ jal 0xf16e974 +/* f01d0e4: 0fc5ba5d */ jal musicStartForMenu /* f01d0e8: 00000000 */ nop .PF0f01d0ec: /* f01d0ec: 240fffff */ li $t7,-1 @@ -1321,14 +1321,14 @@ glabel var7f1a863c /* f01d128: 8e6d046c */ lw $t5,0x46c($s3) /* f01d12c: 11a00007 */ beqz $t5,.PF0f01d14c /* f01d130: 00000000 */ nop -/* f01d134: 0c0039b9 */ jal 0xe6e4 +/* f01d134: 0c0039b9 */ jal mainGetStageNum /* f01d138: 00000000 */ nop -/* f01d13c: 0c0039af */ jal 0xe6bc +/* f01d13c: 0c0039af */ jal mainSetStageNum /* f01d140: 00402025 */ move $a0,$v0 /* f01d144: 100000c8 */ b .PF0f01d468 /* f01d148: 00000000 */ nop .PF0f01d14c: -/* f01d14c: 0c0039af */ jal 0xe6bc +/* f01d14c: 0c0039af */ jal mainSetStageNum /* f01d150: 2404005a */ li $a0,0x5a /* f01d154: 100000c4 */ b .PF0f01d468 /* f01d158: 00000000 */ nop @@ -1465,12 +1465,12 @@ glabel var7f1a863c .PF0f01d33c: /* f01d33c: 24440001 */ addiu $a0,$v0,0x1 /* f01d340: 00057e42 */ srl $t7,$a1,0x19 -/* f01d344: 0fc41079 */ jal 0xf1041e4 +/* f01d344: 0fc41079 */ jal isStageDifficultyUnlocked /* f01d348: 01e02825 */ move $a1,$t7 /* f01d34c: 50400006 */ beqzl $v0,.PF0f01d368 /* f01d350: 8e6d046c */ lw $t5,0x46c($s3) .PF0f01d354: -/* f01d354: 0fc43df4 */ jal 0xf10f7d0 +/* f01d354: 0fc43df4 */ jal soloPushSoloModeEndscreen /* f01d358: 00000000 */ nop /* f01d35c: 10000042 */ b .PF0f01d468 /* f01d360: 00000000 */ nop @@ -1478,14 +1478,14 @@ glabel var7f1a863c .PF0f01d368: /* f01d368: 11a00007 */ beqz $t5,.PF0f01d388 /* f01d36c: 00000000 */ nop -/* f01d370: 0c0039b9 */ jal 0xe6e4 +/* f01d370: 0c0039b9 */ jal mainGetStageNum /* f01d374: 00000000 */ nop -/* f01d378: 0c0039af */ jal 0xe6bc +/* f01d378: 0c0039af */ jal mainSetStageNum /* f01d37c: 00402025 */ move $a0,$v0 /* f01d380: 10000039 */ b .PF0f01d468 /* f01d384: 00000000 */ nop .PF0f01d388: -/* f01d388: 0fc629f4 */ jal 0xf18a7d0 +/* f01d388: 0fc629f4 */ jal mpSetPaused /* f01d38c: 00002025 */ move $a0,$zero /* f01d390: 3c02800b */ lui $v0,0x800b /* f01d394: 2442d150 */ addiu $v0,$v0,-11952 @@ -1501,24 +1501,24 @@ glabel var7f1a863c /* f01d3b8: 91ce1040 */ lbu $t6,0x1040($t6) /* f01d3bc: 12ce000b */ beq $s6,$t6,.PF0f01d3ec /* f01d3c0: 00000000 */ nop -/* f01d3c4: 0fc06c91 */ jal 0xf01b244 +/* f01d3c4: 0fc06c91 */ jal titleSetNextStage /* f01d3c8: 24040026 */ li $a0,0x26 -/* f01d3cc: 0fc0690e */ jal 0xf01a438 +/* f01d3cc: 0fc0690e */ jal setNumPlayers /* f01d3d0: 02c02025 */ move $a0,$s6 -/* f01d3d4: 0fc06a32 */ jal 0xf01a8c8 +/* f01d3d4: 0fc06a32 */ jal titleSetNextMode /* f01d3d8: 24040005 */ li $a0,0x5 -/* f01d3dc: 0c0039af */ jal 0xe6bc +/* f01d3dc: 0c0039af */ jal mainSetStageNum /* f01d3e0: 24040026 */ li $a0,0x26 /* f01d3e4: 10000020 */ b .PF0f01d468 /* f01d3e8: 00000000 */ nop .PF0f01d3ec: -/* f01d3ec: 0fc06c91 */ jal 0xf01b244 +/* f01d3ec: 0fc06c91 */ jal titleSetNextStage /* f01d3f0: 2404005d */ li $a0,0x5d -/* f01d3f4: 0fc0690e */ jal 0xf01a438 +/* f01d3f4: 0fc0690e */ jal setNumPlayers /* f01d3f8: 02c02025 */ move $a0,$s6 -/* f01d3fc: 0fc06a32 */ jal 0xf01a8c8 +/* f01d3fc: 0fc06a32 */ jal titleSetNextMode /* f01d400: 24040005 */ li $a0,0x5 -/* f01d404: 0c0039af */ jal 0xe6bc +/* f01d404: 0c0039af */ jal mainSetStageNum /* f01d408: 2404005d */ li $a0,0x5d /* f01d40c: 10000016 */ b .PF0f01d468 /* f01d410: 00000000 */ nop @@ -1526,18 +1526,18 @@ glabel var7f1a863c .PF0f01d418: /* f01d418: 07000013 */ bltz $t8,.PF0f01d468 /* f01d41c: 00000000 */ nop -/* f01d420: 0fc629f4 */ jal 0xf18a7d0 +/* f01d420: 0fc629f4 */ jal mpSetPaused /* f01d424: 00002025 */ move $a0,$zero /* f01d428: ae600314 */ sw $zero,0x314($s3) /* f01d42c: ae600318 */ sw $zero,0x318($s3) /* f01d430: ae60031c */ sw $zero,0x31c($s3) -/* f01d434: 0fc06c91 */ jal 0xf01b244 +/* f01d434: 0fc06c91 */ jal titleSetNextStage /* f01d438: 24040026 */ li $a0,0x26 -/* f01d43c: 0fc0690e */ jal 0xf01a438 +/* f01d43c: 0fc0690e */ jal setNumPlayers /* f01d440: 02c02025 */ move $a0,$s6 -/* f01d444: 0fc06a32 */ jal 0xf01a8c8 +/* f01d444: 0fc06a32 */ jal titleSetNextMode /* f01d448: 24040005 */ li $a0,0x5 -/* f01d44c: 0c0039af */ jal 0xe6bc +/* f01d44c: 0c0039af */ jal mainSetStageNum /* f01d450: 24040026 */ li $a0,0x26 /* f01d454: 3c12800a */ lui $s2,0x800a /* f01d458: 2652e588 */ addiu $s2,$s2,-6776 @@ -1545,7 +1545,7 @@ glabel var7f1a863c /* f01d460: 31edff7f */ andi $t5,$t7,0xff7f /* f01d464: a24d0003 */ sb $t5,0x3($s2) .PF0f01d468: -/* f01d468: 0fc06ff4 */ jal 0xf01bfd0 +/* f01d468: 0fc06ff4 */ jal menuCountDialogs /* f01d46c: 00000000 */ nop /* f01d470: 8eb90000 */ lw $t9,0x0($s5) /* f01d474: 57200026 */ bnezl $t9,.PF0f01d510 @@ -1585,7 +1585,7 @@ glabel var7f1a863c /* f01d4f0: 8defede4 */ lw $t7,-0x121c($t7) /* f01d4f4: 51e00006 */ beqzl $t7,.PF0f01d510 /* f01d4f8: 8e6d006c */ lw $t5,0x6c($s3) -/* f01d4fc: 0fc27881 */ jal 0xf09e204 +/* f01d4fc: 0fc27881 */ jal func0f09df50 /* f01d500: 00000000 */ nop /* f01d504: 3c01800a */ lui $at,0x800a /* f01d508: ac20ede4 */ sw $zero,-0x121c($at) diff --git a/src/game/game_01d860.c b/src/game/game_01d860.c index 6769d7d1d..c6c2c897e 100644 --- a/src/game/game_01d860.c +++ b/src/game/game_01d860.c @@ -15,14 +15,14 @@ glabel func0f01d860 /* f01d938: 3c047f1b */ lui $a0,0x7f1b /* f01d93c: 3c058006 */ lui $a1,0x8006 /* f01d940: 24a52630 */ addiu $a1,$a1,0x2630 -/* f01d944: 0c003624 */ jal 0xd890 +/* f01d944: 0c003624 */ jal func0000db30 /* f01d948: 24849880 */ addiu $a0,$a0,-26496 /* f01d94c: 3c048006 */ lui $a0,0x8006 /* f01d950: 8c842630 */ lw $a0,0x2630($a0) /* f01d954: 2c810005 */ sltiu $at,$a0,0x5 /* f01d958: 10200006 */ beqz $at,.PF0f01d974 /* f01d95c: 00000000 */ nop -/* f01d960: 0fc5bdd7 */ jal 0xf16f75c +/* f01d960: 0fc5bdd7 */ jal func0f16f75c /* f01d964: 00000000 */ nop /* f01d968: 240e0063 */ li $t6,0x63 /* f01d96c: 3c018006 */ lui $at,0x8006 diff --git a/src/game/game_092610.c b/src/game/game_092610.c index 5ab6d3cbb..24e8b509e 100644 --- a/src/game/game_092610.c +++ b/src/game/game_092610.c @@ -339,7 +339,7 @@ glabel var7f1ab740 /* f092b50: 8e040000 */ lw $a0,0x0($s0) /* f092b54: 50800006 */ beqzl $a0,.PF0f092b70 /* f092b58: 96030030 */ lhu $v1,0x30($s0) -/* f092b5c: 0c00cc3c */ jal 0x330f0 +/* f092b5c: 0c00cc3c */ jal audioIsPlaying /* f092b60: 00000000 */ nop /* f092b64: 54400010 */ bnezl $v0,.PF0f092ba8 /* f092b68: 8e020050 */ lw $v0,0x50($s0) @@ -354,7 +354,7 @@ glabel var7f1ab740 /* f092b88: 306e0010 */ andi $t6,$v1,0x10 /* f092b8c: 51c001e2 */ beqzl $t6,.PF0f093318 /* f092b90: 860e0028 */ lh $t6,0x28($s0) -/* f092b94: 0c0039cc */ jal 0xe730 +/* f092b94: 0c0039cc */ jal func0000e9d0 /* f092b98: 00000000 */ nop /* f092b9c: 504001de */ beqzl $v0,.PF0f093318 /* f092ba0: 860e0028 */ lh $t6,0x28($s0) @@ -424,7 +424,7 @@ glabel var7f1ab740 /* f092c80: afa8004c */ sw $t0,0x4c($sp) /* f092c84: afa40050 */ sw $a0,0x50($sp) /* f092c88: afb9001c */ sw $t9,0x1c($sp) -/* f092c8c: 0fc25171 */ jal 0xf0945c4 +/* f092c8c: 0fc25171 */ jal func0f0946b0 /* f092c90: afb80018 */ sw $t8,0x18($sp) /* f092c94: 8fa40050 */ lw $a0,0x50($sp) /* f092c98: 8fa8004c */ lw $t0,0x4c($sp) @@ -444,7 +444,7 @@ glabel var7f1ab740 /* f092ccc: afab0014 */ sw $t3,0x14($sp) /* f092cd0: afa8004c */ sw $t0,0x4c($sp) /* f092cd4: afb00018 */ sw $s0,0x18($sp) -/* f092cd8: 0fc25323 */ jal 0xf094c8c +/* f092cd8: 0fc25323 */ jal func0f094d78 /* f092cdc: e7a40010 */ swc1 $f4,0x10($sp) /* f092ce0: 8fa8004c */ lw $t0,0x4c($sp) /* f092ce4: 3c09800a */ lui $t1,0x800a @@ -610,7 +610,7 @@ glabel var7f1ab740 /* f092f24: afa50048 */ sw $a1,0x48($sp) .PF0f092f28: /* f092f28: afa80040 */ sw $t0,0x40($sp) -/* f092f2c: 0fc5b6f7 */ jal 0xf16dbdc +/* f092f2c: 0fc5b6f7 */ jal coreIsPaused /* f092f30: e7b2003c */ swc1 $f18,0x3c($sp) /* f092f34: 3c09800a */ lui $t1,0x800a /* f092f38: 2529a510 */ addiu $t1,$t1,-23280 @@ -618,7 +618,7 @@ glabel var7f1ab740 /* f092f40: 14400031 */ bnez $v0,.PF0f093008 /* f092f44: c7b2003c */ lwc1 $f18,0x3c($sp) /* f092f48: afa80040 */ sw $t0,0x40($sp) -/* f092f4c: 0fc629b9 */ jal 0xf18a6e4 +/* f092f4c: 0fc629b9 */ jal mpIsPaused /* f092f50: e7b2003c */ swc1 $f18,0x3c($sp) /* f092f54: 3c09800a */ lui $t1,0x800a /* f092f58: 2529a510 */ addiu $t1,$t1,-23280 @@ -631,7 +631,7 @@ glabel var7f1ab740 /* f092f74: 240bffff */ li $t3,-1 .PF0f092f78: /* f092f78: afa80040 */ sw $t0,0x40($sp) -/* f092f7c: 0fc629b9 */ jal 0xf18a6e4 +/* f092f7c: 0fc629b9 */ jal mpIsPaused /* f092f80: e7b2003c */ swc1 $f18,0x3c($sp) /* f092f84: 3c09800a */ lui $t1,0x800a /* f092f88: 2529a510 */ addiu $t1,$t1,-23280 @@ -796,14 +796,14 @@ glabel var7f1ab740 /* f0931ac: 5080000e */ beqzl $a0,.PF0f0931e8 /* f0931b0: 960a0030 */ lhu $t2,0x30($s0) /* f0931b4: afa80040 */ sw $t0,0x40($sp) -/* f0931b8: 0c00cc3c */ jal 0x330f0 +/* f0931b8: 0c00cc3c */ jal audioIsPlaying /* f0931bc: e7b2003c */ swc1 $f18,0x3c($sp) /* f0931c0: 8fa80040 */ lw $t0,0x40($sp) /* f0931c4: 10400007 */ beqz $v0,.PF0f0931e4 /* f0931c8: c7b2003c */ lwc1 $f18,0x3c($sp) /* f0931cc: 8e040000 */ lw $a0,0x0($s0) /* f0931d0: e7b2003c */ swc1 $f18,0x3c($sp) -/* f0931d4: 0c00cd09 */ jal 0x33424 +/* f0931d4: 0c00cd09 */ jal audioStop /* f0931d8: afa80040 */ sw $t0,0x40($sp) /* f0931dc: 8fa80040 */ lw $t0,0x40($sp) /* f0931e0: c7b2003c */ lwc1 $f18,0x3c($sp) @@ -836,7 +836,7 @@ glabel var7f1ab740 /* f093238: 10000001 */ b .PF0f093240 /* f09323c: 24070001 */ li $a3,0x1 .PF0f093240: -/* f093240: 0c004218 */ jal 0x10860 +/* f093240: 0c004218 */ jal func00010ae4 /* f093244: 86040026 */ lh $a0,0x26($s0) /* f093248: 10000021 */ b .PF0f0932d0 /* f09324c: 96030030 */ lhu $v1,0x30($s0) @@ -855,7 +855,7 @@ glabel var7f1ab740 /* f09327c: 920d001a */ lbu $t5,0x1a($s0) /* f093280: afac0020 */ sw $t4,0x20($sp) /* f093284: afa8001c */ sw $t0,0x1c($sp) -/* f093288: 0c004125 */ jal 0x10494 +/* f093288: 0c004125 */ jal func00010718 /* f09328c: afad0018 */ sw $t5,0x18($sp) /* f093290: 1000000f */ b .PF0f0932d0 /* f093294: 96030030 */ lhu $v1,0x30($s0) @@ -871,7 +871,7 @@ glabel var7f1ab740 /* f0932b8: afa8001c */ sw $t0,0x1c($sp) /* f0932bc: 01c03025 */ move $a2,$t6 /* f0932c0: 8fa70044 */ lw $a3,0x44($sp) -/* f0932c4: 0c004125 */ jal 0x10494 +/* f0932c4: 0c004125 */ jal func00010718 /* f0932c8: afb80018 */ sw $t8,0x18($sp) /* f0932cc: 96030030 */ lhu $v1,0x30($s0) .PF0f0932d0: @@ -889,7 +889,7 @@ glabel var7f1ab740 /* f0932f8: 30650010 */ andi $a1,$v1,0x10 /* f0932fc: 8fa60048 */ lw $a2,0x48($sp) /* f093300: 8fa70044 */ lw $a3,0x44($sp) -/* f093304: 0c004087 */ jal 0x1021c +/* f093304: 0c004087 */ jal audioAdjust /* f093308: afad0018 */ sw $t5,0x18($sp) /* f09330c: 10000026 */ b .PF0f0933a8 /* f093310: 00000000 */ nop @@ -902,7 +902,7 @@ glabel var7f1ab740 /* f093328: 306f0010 */ andi $t7,$v1,0x10 /* f09332c: 51e00015 */ beqzl $t7,.PF0f093384 /* f093330: 8e0b0000 */ lw $t3,0x0($s0) -/* f093334: 0c0039cc */ jal 0xe730 +/* f093334: 0c0039cc */ jal func0000e9d0 /* f093338: 00000000 */ nop /* f09333c: 5440000e */ bnezl $v0,.PF0f093378 /* f093340: 240a0001 */ li $t2,0x1 @@ -910,14 +910,14 @@ glabel var7f1ab740 /* f093348: 30780008 */ andi $t8,$v1,0x8 /* f09334c: 53000005 */ beqzl $t8,.PF0f093364 /* f093350: 30790200 */ andi $t9,$v1,0x200 -/* f093354: 0fc16b78 */ jal 0xf05ade0 +/* f093354: 0fc16b78 */ jal func0f05abdc /* f093358: 8e040050 */ lw $a0,0x50($s0) /* f09335c: 96030030 */ lhu $v1,0x30($s0) /* f093360: 30790200 */ andi $t9,$v1,0x200 .PF0f093364: /* f093364: 53200004 */ beqzl $t9,.PF0f093378 /* f093368: 240a0001 */ li $t2,0x1 -/* f09336c: 0fc378de */ jal 0xf0de378 +/* f09336c: 0fc378de */ jal func0f0ddd44 /* f093370: 8fa40058 */ lw $a0,0x58($sp) /* f093374: 240a0001 */ li $t2,0x1 .PF0f093378: @@ -930,7 +930,7 @@ glabel var7f1ab740 /* f09338c: 00000000 */ nop /* f093390: 51a00004 */ beqzl $t5,.PF0f0933a4 /* f093394: 240c0001 */ li $t4,0x1 -/* f093398: 0fc16b78 */ jal 0xf05ade0 +/* f093398: 0fc16b78 */ jal func0f05abdc /* f09339c: 8e040050 */ lw $a0,0x50($s0) /* f0933a0: 240c0001 */ li $t4,0x1 .PF0f0933a4: @@ -944,7 +944,7 @@ glabel var7f1ab740 /* f0933bc: 31f80004 */ andi $t8,$t7,0x4 /* f0933c0: 53000004 */ beqzl $t8,.PF0f0933d4 /* f0933c4: 96190030 */ lhu $t9,0x30($s0) -/* f0933c8: 0fc24a94 */ jal 0xf092a50 +/* f0933c8: 0fc24a94 */ jal func0f092b50 /* f0933cc: 02002025 */ move $a0,$s0 /* f0933d0: 96190030 */ lhu $t9,0x30($s0) .PF0f0933d4: diff --git a/src/game/game_097ba0.c b/src/game/game_097ba0.c index d9398bc58..00f21cfe2 100644 --- a/src/game/game_097ba0.c +++ b/src/game/game_097ba0.c @@ -825,10 +825,10 @@ glabel var7f1ad3acpf /* f09813c: 00809025 */ move $s2,$a0 /* f098140: 1701000f */ bne $t8,$at,.PF0f098180 /* f098144: a08f0690 */ sb $t7,0x690($a0) -/* f098148: 0fc2601f */ jal 0xf09807c +/* f098148: 0fc2601f */ jal func0f09815c /* f09814c: 00000000 */ nop /* f098150: 46000506 */ mov.s $f20,$f0 -/* f098154: 0c0073fa */ jal 0x1cfe8 +/* f098154: 0c0073fa */ jal modelGetNumAnimFrames /* f098158: 26440384 */ addiu $a0,$s2,0x384 /* f09815c: 2459ffff */ addiu $t9,$v0,-1 /* f098160: 44992000 */ mtc1 $t9,$f4 @@ -882,7 +882,7 @@ glabel var7f1ad3acpf /* f098214: 81f80de4 */ lb $t8,0xde4($t7) /* f098218: 13000016 */ beqz $t8,.PF0f098274 /* f09821c: 00000000 */ nop -/* f098220: 0c004ad4 */ jal 0x12b50 +/* f098220: 0c004ad4 */ jal random /* f098224: 00000000 */ nop /* f098228: 44822000 */ mtc1 $v0,$f4 /* f09822c: 3c014f80 */ lui $at,0x4f80 @@ -918,15 +918,15 @@ glabel var7f1ad3acpf /* f09829c: 03202825 */ move $a1,$t9 /* f0982a0: 00003025 */ move $a2,$zero /* f0982a4: e7a20014 */ swc1 $f2,0x14($sp) -/* f0982a8: 0c0076a7 */ jal 0x1da9c +/* f0982a8: 0c0076a7 */ jal modelSetAnimation /* f0982ac: e7a60010 */ swc1 $f6,0x10($sp) -/* f0982b0: 0c0073fa */ jal 0x1cfe8 +/* f0982b0: 0c0073fa */ jal modelGetNumAnimFrames /* f0982b4: 02802025 */ move $a0,$s4 /* f0982b8: 44825000 */ mtc1 $v0,$f10 /* f0982bc: 02802025 */ move $a0,$s4 /* f0982c0: 468052a0 */ cvt.s.w $f10,$f10 /* f0982c4: 44055000 */ mfc1 $a1,$f10 -/* f0982c8: 0c00777a */ jal 0x1dde8 +/* f0982c8: 0c00777a */ jal func0001e018 /* f0982cc: 00000000 */ nop /* f0982d0: 1000000b */ b .PF0f098300 /* f0982d4: 240affff */ li $t2,-1 @@ -938,14 +938,14 @@ glabel var7f1ad3acpf /* f0982e8: 01202825 */ move $a1,$t1 /* f0982ec: 00003025 */ move $a2,$zero /* f0982f0: e7a20014 */ swc1 $f2,0x14($sp) -/* f0982f4: 0c0076a7 */ jal 0x1da9c +/* f0982f4: 0c0076a7 */ jal modelSetAnimation /* f0982f8: e7b00010 */ swc1 $f16,0x10($sp) /* f0982fc: 240affff */ li $t2,-1 .PF0f098300: /* f098300: 240b0002 */ li $t3,0x2 /* f098304: ae4a0680 */ sw $t2,0x680($s2) /* f098308: ae4b068c */ sw $t3,0x68c($s2) -/* f09830c: 0c007416 */ jal 0x1d058 +/* f09830c: 0c007416 */ jal modelGetAbsAnimSpeed /* f098310: 02802025 */ move $a0,$s4 /* f098314: 8e4c0684 */ lw $t4,0x684($s2) /* f098318: 3c017f1b */ lui $at,0x7f1b @@ -965,7 +965,7 @@ glabel var7f1ad3acpf /* f09834c: ae400684 */ sw $zero,0x684($s2) /* f098350: e6420688 */ swc1 $f2,0x688($s2) .PF0f098354: -/* f098354: 0fc2601f */ jal 0xf09807c +/* f098354: 0fc2601f */ jal func0f09815c /* f098358: 02402025 */ move $a0,$s2 /* f09835c: 44809000 */ mtc1 $zero,$f18 /* f098360: c6500688 */ lwc1 $f16,0x688($s2) @@ -1095,7 +1095,7 @@ glabel var7f1ad3acpf /* f09851c: 00000000 */ nop /* f098520: 45020060 */ bc1fl .PF0f0986a4 /* f098524: 8fac014c */ lw $t4,0x14c($sp) -/* f098528: 0fc2601f */ jal 0xf09807c +/* f098528: 0fc2601f */ jal func0f09815c /* f09852c: 02402025 */ move $a0,$s2 /* f098530: 962a0002 */ lhu $t2,0x2($s1) /* f098534: 3c014f80 */ lui $at,0x4f80 @@ -1116,7 +1116,7 @@ glabel var7f1ad3acpf /* f09856c: 00000000 */ nop /* f098570: 45000018 */ bc1f .PF0f0985d4 /* f098574: 00000000 */ nop -/* f098578: 0c007416 */ jal 0x1d058 +/* f098578: 0c007416 */ jal modelGetAbsAnimSpeed /* f09857c: e7a20084 */ swc1 $f2,0x84($sp) /* f098580: 3c017f1b */ lui $at,0x7f1b /* f098584: c432d3a8 */ lwc1 $f18,-0x2c58($at) @@ -1126,7 +1126,7 @@ glabel var7f1ad3acpf /* f098594: 46002203 */ div.s $f8,$f4,$f0 /* f098598: 4600440d */ trunc.w.s $f16,$f8 /* f09859c: 440c8000 */ mfc1 $t4,$f16 -/* f0985a0: 0c007416 */ jal 0x1d058 +/* f0985a0: 0c007416 */ jal modelGetAbsAnimSpeed /* f0985a4: ae4c0684 */ sw $t4,0x684($s2) /* f0985a8: 8e4d0684 */ lw $t5,0x684($s2) /* f0985ac: 3c017f1b */ lui $at,0x7f1b @@ -1189,7 +1189,7 @@ glabel var7f1ad3acpf /* f09867c: e6520688 */ swc1 $f18,0x688($s2) /* f098680: 44050000 */ mfc1 $a1,$f0 /* f098684: 46000506 */ mov.s $f20,$f0 -/* f098688: 0c00777a */ jal 0x1dde8 +/* f098688: 0c00777a */ jal func0001e018 /* f09868c: e7a00080 */ swc1 $f0,0x80($sp) /* f098690: 924a0691 */ lbu $t2,0x691($s2) /* f098694: c7ae0080 */ lwc1 $f14,0x80($sp) @@ -1214,7 +1214,7 @@ glabel var7f1ad3acpf /* f0986d4: afa3005c */ sw $v1,0x5c($sp) /* f0986d8: afa2007c */ sw $v0,0x7c($sp) /* f0986dc: 02403025 */ move $a2,$s2 -/* f0986e0: 0fc25f65 */ jal 0xf097d94 +/* f0986e0: 0fc25f65 */ jal func0f097e74 /* f0986e4: 8fa70164 */ lw $a3,0x164($sp) /* f0986e8: 8fa2007c */ lw $v0,0x7c($sp) /* f0986ec: 8fa3005c */ lw $v1,0x5c($sp) @@ -1228,13 +1228,13 @@ glabel var7f1ad3acpf .PF0f098708: /* f098708: 34a5999a */ ori $a1,$a1,0x999a /* f09870c: 02802025 */ move $a0,$s4 -/* f098710: 0c00775f */ jal 0x1dd7c +/* f098710: 0c00775f */ jal modelSetAnimPlaySpeed /* f098714: 24060000 */ li $a2,0x0 /* f098718: 02802025 */ move $a0,$s4 /* f09871c: 8e450684 */ lw $a1,0x684($s2) -/* f098720: 0c007afa */ jal 0x1ebe8 +/* f098720: 0c007afa */ jal func0001ee18 /* f098724: 24060001 */ li $a2,0x1 -/* f098728: 0fc2601f */ jal 0xf09807c +/* f098728: 0fc2601f */ jal func0f09815c /* f09872c: 02402025 */ move $a0,$s2 /* f098730: 8e4306b0 */ lw $v1,0x6b0($s2) /* f098734: 46000386 */ mov.s $f14,$f0 @@ -1303,7 +1303,7 @@ glabel var7f1ad3acpf /* f098820: 24070040 */ li $a3,0x40 /* f098824: 00008825 */ move $s1,$zero /* f098828: afae0010 */ sw $t6,0x10($sp) -/* f09882c: 0c004125 */ jal 0x10494 +/* f09882c: 0c004125 */ jal func00010718 /* f098830: e7a60014 */ swc1 $f6,0x14($sp) /* f098834: 8fa80078 */ lw $t0,0x78($sp) /* f098838: 10000028 */ b .PF0f0988dc @@ -1324,7 +1324,7 @@ glabel var7f1ad3acpf /* f098870: 24067fff */ li $a2,0x7fff /* f098874: 24070040 */ li $a3,0x40 /* f098878: afa90010 */ sw $t1,0x10($sp) -/* f09887c: 0c004125 */ jal 0x10494 +/* f09887c: 0c004125 */ jal func00010718 /* f098880: e7aa0014 */ swc1 $f10,0x14($sp) /* f098884: 8fa80078 */ lw $t0,0x78($sp) /* f098888: 10000014 */ b .PF0f0988dc @@ -2067,7 +2067,7 @@ glabel func0f098df8 /* f098e8c: afa40038 */ sw $a0,0x38($sp) /* f098e90: afa60040 */ sw $a2,0x40($sp) /* f098e94: afa70044 */ sw $a3,0x44($sp) -/* f098e98: 0fc2c55e */ jal 0xf0b1578 +/* f098e98: 0fc2c55e */ jal weaponGetFunction /* f098e9c: 00c02025 */ move $a0,$a2 /* f098ea0: 50400059 */ beqzl $v0,.PF0f099008 /* f098ea4: 8fbf001c */ lw $ra,0x1c($sp) @@ -2091,7 +2091,7 @@ glabel func0f098df8 /* f098eec: afa3002c */ sw $v1,0x2c($sp) /* f098ef0: afa70024 */ sw $a3,0x24($sp) /* f098ef4: afa60020 */ sw $a2,0x20($sp) -/* f098ef8: 0fc25f0b */ jal 0xf097c2c +/* f098ef8: 0fc25f0b */ jal func0f097d0c /* f098efc: afa50030 */ sw $a1,0x30($sp) /* f098f00: 3c0b8009 */ lui $t3,0x8009 /* f098f04: 916b8d54 */ lbu $t3,-0x72ac($t3) @@ -2414,18 +2414,18 @@ glabel func0f0991e4 /* f09927c: 00c08025 */ move $s0,$a2 /* f099280: afa40040 */ sw $a0,0x40($sp) /* f099284: afa50044 */ sw $a1,0x44($sp) -/* f099288: 0fc2a432 */ jal 0xf0a90c8 +/* f099288: 0fc2a432 */ jal currentPlayerIsUsingSecondaryFunction /* f09928c: afa7004c */ sw $a3,0x4c($sp) /* f099290: 44802000 */ mtc1 $zero,$f4 /* f099294: afa20038 */ sw $v0,0x38($sp) /* f099298: a20005dc */ sb $zero,0x5dc($s0) /* f09929c: ae000558 */ sw $zero,0x558($s0) /* f0992a0: e60405fc */ swc1 $f4,0x5fc($s0) -/* f0992a4: 0fc26ffc */ jal 0xf09bff0 +/* f0992a4: 0fc26ffc */ jal func0f09bd58 /* f0992a8: 8fa40044 */ lw $a0,0x44($sp) /* f0992ac: 10400007 */ beqz $v0,.PF0f0992cc /* f0992b0: 8fa40044 */ lw $a0,0x44($sp) -/* f0992b4: 0fc273ec */ jal 0xf09cfb0 +/* f0992b4: 0fc273ec */ jal func0f09cd18 /* f0992b8: 24050005 */ li $a1,0x5 /* f0992bc: 50400004 */ beqzl $v0,.PF0f0992d0 /* f0992c0: 8fae0038 */ lw $t6,0x38($sp) @@ -2448,7 +2448,7 @@ glabel func0f0991e4 /* f0992f8: 11600106 */ beqz $t3,.PF0f099714 /* f0992fc: a20a0690 */ sb $t2,0x690($s0) /* f099300: 92040003 */ lbu $a0,0x3($s0) -/* f099304: 0fc26348 */ jal 0xf098d20 +/* f099304: 0fc26348 */ jal func0f098ca0 /* f099308: 8fa50040 */ lw $a1,0x40($sp) /* f09930c: 92030003 */ lbu $v1,0x3($s0) /* f099310: 8fac0038 */ lw $t4,0x38($sp) @@ -2468,7 +2468,7 @@ glabel func0f0991e4 /* f099348: 8fa50040 */ lw $a1,0x40($sp) /* f09934c: 02003025 */ move $a2,$s0 /* f099350: afa7002c */ sw $a3,0x2c($sp) -/* f099354: 0fc26348 */ jal 0xf098d20 +/* f099354: 0fc26348 */ jal func0f098ca0 /* f099358: afa20034 */ sw $v0,0x34($sp) /* f09935c: 8fa7002c */ lw $a3,0x2c($sp) /* f099360: 04410002 */ bgez $v0,.PF0f09936c @@ -2490,7 +2490,7 @@ glabel func0f0991e4 /* f09939c: a20b0003 */ sb $t3,0x3($s0) /* f0993a0: afa80034 */ sw $t0,0x34($sp) /* f0993a4: afa7002c */ sw $a3,0x2c($sp) -/* f0993a8: 0fc273ec */ jal 0xf09cfb0 +/* f0993a8: 0fc273ec */ jal func0f09cd18 /* f0993ac: 8fa40044 */ lw $a0,0x44($sp) /* f0993b0: 8fa7002c */ lw $a3,0x2c($sp) /* f0993b4: 10400006 */ beqz $v0,.PF0f0993d0 @@ -2509,7 +2509,7 @@ glabel func0f0991e4 /* f0993e0: 318dfffd */ andi $t5,$t4,0xfffd /* f0993e4: a20d0690 */ sb $t5,0x690($s0) /* f0993e8: afa80034 */ sw $t0,0x34($sp) -/* f0993ec: 0fc273ec */ jal 0xf09cfb0 +/* f0993ec: 0fc273ec */ jal func0f09cd18 /* f0993f0: 8fa40044 */ lw $a0,0x44($sp) /* f0993f4: 10400003 */ beqz $v0,.PF0f099404 /* f0993f8: 8fa80034 */ lw $t0,0x34($sp) @@ -2519,7 +2519,7 @@ glabel func0f0991e4 /* f099404: 05010071 */ bgez $t0,.PF0f0995cc /* f099408: 8fae0040 */ lw $t6,0x40($sp) /* f09940c: 8dc40000 */ lw $a0,0x0($t6) -/* f099410: 0fc2c720 */ jal 0xf0b1c80 +/* f099410: 0fc2c720 */ jal weaponHasFlag /* f099414: 24050001 */ li $a1,0x1 /* f099418: 1040000f */ beqz $v0,.PF0f099458 /* f09941c: 8faf0040 */ lw $t7,0x40($sp) @@ -2532,7 +2532,7 @@ glabel func0f0991e4 /* f099438: 13210007 */ beq $t9,$at,.PF0f099458 /* f09943c: 00000000 */ nop .PF0f099440: -/* f099440: 0fc273ec */ jal 0xf09cfb0 +/* f099440: 0fc273ec */ jal func0f09cd18 /* f099444: 24050008 */ li $a1,0x8 /* f099448: 10400003 */ beqz $v0,.PF0f099458 /* f09944c: 00000000 */ nop @@ -2574,13 +2574,13 @@ glabel func0f0991e4 /* f0994d0: 8fae0044 */ lw $t6,0x44($sp) /* f0994d4: 920c0003 */ lbu $t4,0x3($s0) /* f0994d8: 240d0001 */ li $t5,0x1 -/* f0994dc: 0fc26348 */ jal 0xf098d20 +/* f0994dc: 0fc26348 */ jal func0f098ca0 /* f0994e0: 01ac2023 */ subu $a0,$t5,$t4 /* f0994e4: 920e0003 */ lbu $t6,0x3($s0) /* f0994e8: 24190001 */ li $t9,0x1 /* f0994ec: afa20030 */ sw $v0,0x30($sp) /* f0994f0: 02002025 */ move $a0,$s0 -/* f0994f4: 0fc26485 */ jal 0xf099214 +/* f0994f4: 0fc26485 */ jal func0f099188 /* f0994f8: 032e2823 */ subu $a1,$t9,$t6 /* f0994fc: 1040001a */ beqz $v0,.PF0f099568 /* f099500: 8fa30030 */ lw $v1,0x30($sp) @@ -2598,7 +2598,7 @@ glabel func0f0991e4 /* f099530: 2403ffff */ li $v1,-1 /* f099534: 920c0003 */ lbu $t4,0x3($s0) /* f099538: afa30030 */ sw $v1,0x30($sp) -/* f09953c: 0fc2c55e */ jal 0xf0b1578 +/* f09953c: 0fc2c55e */ jal weaponGetFunction /* f099540: 032c2823 */ subu $a1,$t9,$t4 /* f099544: 8c4e0000 */ lw $t6,0x0($v0) /* f099548: 24010003 */ li $at,0x3 @@ -2618,7 +2618,7 @@ glabel func0f0991e4 /* f09957c: a20a0690 */ sb $t2,0x690($s0) .PF0f099580: /* f099580: 8d640000 */ lw $a0,0x0($t3) -/* f099584: 0fc2c720 */ jal 0xf0b1c80 +/* f099584: 0fc2c720 */ jal weaponHasFlag /* f099588: 3c050400 */ lui $a1,0x400 /* f09958c: 50400006 */ beqzl $v0,.PF0f0995a8 /* f099590: 920c0690 */ lbu $t4,0x690($s0) @@ -2631,7 +2631,7 @@ glabel func0f0991e4 /* f0995a8: 24050007 */ li $a1,0x7 /* f0995ac: 358e0002 */ ori $t6,$t4,0x2 /* f0995b0: a20e0690 */ sb $t6,0x690($s0) -/* f0995b4: 0fc273ec */ jal 0xf09cfb0 +/* f0995b4: 0fc273ec */ jal func0f09cd18 /* f0995b8: 8fa40044 */ lw $a0,0x44($sp) /* f0995bc: 50400056 */ beqzl $v0,.PF0f099718 /* f0995c0: 8fae0044 */ lw $t6,0x44($sp) @@ -2652,7 +2652,7 @@ glabel func0f0991e4 /* f0995f8: 24050003 */ li $a1,0x3 /* f0995fc: 314bff7f */ andi $t3,$t2,0xff7f /* f099600: a20b0690 */ sb $t3,0x690($s0) -/* f099604: 0fc273ec */ jal 0xf09cfb0 +/* f099604: 0fc273ec */ jal func0f09cd18 /* f099608: 8fa40044 */ lw $a0,0x44($sp) /* f09960c: 50400042 */ beqzl $v0,.PF0f099718 /* f099610: 8fae0044 */ lw $t6,0x44($sp) @@ -2661,7 +2661,7 @@ glabel func0f0991e4 /* f09961c: ae00001c */ sw $zero,0x1c($s0) .PF0f099620: /* f099620: ae000018 */ sw $zero,0x18($s0) -/* f099624: 0fc273ec */ jal 0xf09cfb0 +/* f099624: 0fc273ec */ jal func0f09cd18 /* f099628: 8fa40044 */ lw $a0,0x44($sp) /* f09962c: 5040003a */ beqzl $v0,.PF0f099718 /* f099630: 8fae0044 */ lw $t6,0x44($sp) @@ -2697,7 +2697,7 @@ glabel func0f0991e4 /* f0996a0: ae000014 */ sw $zero,0x14($s0) /* f0996a4: a21906d7 */ sb $t9,0x6d7($s0) /* f0996a8: afa80034 */ sw $t0,0x34($sp) -/* f0996ac: 0fc273ec */ jal 0xf09cfb0 +/* f0996ac: 0fc273ec */ jal func0f09cd18 /* f0996b0: 8fa40044 */ lw $a0,0x44($sp) /* f0996b4: 10400003 */ beqz $v0,.PF0f0996c4 /* f0996b8: 8fa80034 */ lw $t0,0x34($sp) @@ -2719,7 +2719,7 @@ glabel func0f0991e4 /* f0996f0: 8fae0044 */ lw $t6,0x44($sp) /* f0996f4: 05000007 */ bltz $t0,.PF0f099714 /* f0996f8: 8fa40044 */ lw $a0,0x44($sp) -/* f0996fc: 0fc273ec */ jal 0xf09cfb0 +/* f0996fc: 0fc273ec */ jal func0f09cd18 /* f099700: 24050001 */ li $a1,0x1 /* f099704: 50400004 */ beqzl $v0,.PF0f099718 /* f099708: 8fae0044 */ lw $t6,0x44($sp) @@ -2740,7 +2740,7 @@ glabel func0f0991e4 /* f09973c: 00095f40 */ sll $t3,$t1,0x1d /* f099740: 05610005 */ bgez $t3,.PF0f099758 /* f099744: 000c6080 */ sll $t4,$t4,0x2 -/* f099748: 0fc2884a */ jal 0xf0a2128 +/* f099748: 0fc2884a */ jal func0f0a1df4 /* f09974c: 00000000 */ nop /* f099750: 10000027 */ b .PF0f0997f0 /* f099754: 00001025 */ move $v0,$zero @@ -2774,7 +2774,7 @@ glabel func0f0991e4 /* f0997b8: 51a00005 */ beqzl $t5,.PF0f0997d0 /* f0997bc: 904c0690 */ lbu $t4,0x690($v0) .PF0f0997c0: -/* f0997c0: 0fc2884a */ jal 0xf0a2128 +/* f0997c0: 0fc2884a */ jal func0f0a1df4 /* f0997c4: afa20024 */ sw $v0,0x24($sp) /* f0997c8: 8fa20024 */ lw $v0,0x24($sp) /* f0997cc: 904c0690 */ lbu $t4,0x690($v0) @@ -3238,14 +3238,14 @@ glabel var7f1ac1b4 /* f099898: 00c08025 */ move $s0,$a2 /* f09989c: afa40060 */ sw $a0,0x60($sp) /* f0998a0: afa50064 */ sw $a1,0x64($sp) -/* f0998a4: 0fc2a432 */ jal 0xf0a90c8 +/* f0998a4: 0fc2a432 */ jal currentPlayerIsUsingSecondaryFunction /* f0998a8: afa7006c */ sw $a3,0x6c($sp) /* f0998ac: afa20054 */ sw $v0,0x54($sp) /* f0998b0: 820e0008 */ lb $t6,0x8($s0) /* f0998b4: 8fa40064 */ lw $a0,0x64($sp) /* f0998b8: 55c00008 */ bnezl $t6,.PF0f0998dc /* f0998bc: 8e020608 */ lw $v0,0x608($s0) -/* f0998c0: 0fc273ec */ jal 0xf09cfb0 +/* f0998c0: 0fc273ec */ jal func0f09cd18 /* f0998c4: 00002825 */ move $a1,$zero /* f0998c8: 50400004 */ beqzl $v0,.PF0f0998dc /* f0998cc: 8e020608 */ lw $v0,0x608($s0) @@ -3280,7 +3280,7 @@ glabel var7f1ac1b4 /* f099934: 46083282 */ mul.s $f10,$f6,$f8 /* f099938: 46125103 */ div.s $f4,$f10,$f18 /* f09993c: 44052000 */ mfc1 $a1,$f4 -/* f099940: 0fc26601 */ jal 0xf099804 +/* f099940: 0fc26601 */ jal func0f099780 /* f099944: 00000000 */ nop /* f099948: 8e020608 */ lw $v0,0x608($s0) .PF0f09994c: @@ -3291,11 +3291,11 @@ glabel var7f1ac1b4 /* f099958: 44803000 */ mtc1 $zero,$f6 /* f09995c: a20005dc */ sb $zero,0x5dc($s0) /* f099960: e60605fc */ swc1 $f6,0x5fc($s0) -/* f099964: 0fc26ffc */ jal 0xf09bff0 +/* f099964: 0fc26ffc */ jal func0f09bd58 /* f099968: 8fa40064 */ lw $a0,0x64($sp) /* f09996c: 10400035 */ beqz $v0,.PF0f099a44 /* f099970: 8fa40064 */ lw $a0,0x64($sp) -/* f099974: 0fc273ec */ jal 0xf09cfb0 +/* f099974: 0fc273ec */ jal func0f09cd18 /* f099978: 24050005 */ li $a1,0x5 /* f09997c: 10400031 */ beqz $v0,.PF0f099a44 /* f099980: 3c02800a */ lui $v0,0x800a @@ -3341,10 +3341,10 @@ glabel var7f1ac1b4 /* f099a10: 10cf0003 */ beq $a2,$t7,.PF0f099a20 /* f099a14: 00000000 */ nop .PF0f099a18: -/* f099a18: 0fc4a5f0 */ jal 0xf1297c0 +/* f099a18: 0fc4a5f0 */ jal currentPlayerSetWeaponFlag4 /* f099a1c: 8fa40064 */ lw $a0,0x64($sp) .PF0f099a20: -/* f099a20: 0fc27f49 */ jal 0xf09fd24 +/* f099a20: 0fc27f49 */ jal func0f09fa20 /* f099a24: 8fa40064 */ lw $a0,0x64($sp) /* f099a28: 24180006 */ li $t8,0x6 /* f099a2c: 24190002 */ li $t9,0x2 @@ -3359,7 +3359,7 @@ glabel var7f1ac1b4 /* f099a4c: 8fa50060 */ lw $a1,0x60($sp) /* f099a50: 5100008a */ beqzl $t0,.PF0f099c7c /* f099a54: 3c053f5f */ lui $a1,0x3f5f -/* f099a58: 0fc26348 */ jal 0xf098d20 +/* f099a58: 0fc26348 */ jal func0f098ca0 /* f099a5c: 02003025 */ move $a2,$s0 /* f099a60: 8fa90060 */ lw $t1,0x60($sp) /* f099a64: afa20058 */ sw $v0,0x58($sp) @@ -3382,7 +3382,7 @@ glabel var7f1ac1b4 /* f099aa0: 8fa40064 */ lw $a0,0x64($sp) /* f099aa4: 118d0007 */ beq $t4,$t5,.PF0f099ac4 /* f099aa8: 00000000 */ nop -/* f099aac: 0fc273ec */ jal 0xf09cfb0 +/* f099aac: 0fc273ec */ jal func0f09cd18 /* f099ab0: 24050007 */ li $a1,0x7 /* f099ab4: 10400003 */ beqz $v0,.PF0f099ac4 /* f099ab8: 00000000 */ nop @@ -3408,7 +3408,7 @@ glabel var7f1ac1b4 /* f099b04: 24030001 */ li $v1,0x1 /* f099b08: afa9004c */ sw $t1,0x4c($sp) /* f099b0c: afa3003c */ sw $v1,0x3c($sp) -/* f099b10: 0fc26333 */ jal 0xf098ccc +/* f099b10: 0fc26333 */ jal handGetWeaponInfo /* f099b14: 27a40040 */ addiu $a0,$sp,0x40 /* f099b18: 8fa6004c */ lw $a2,0x4c($sp) /* f099b1c: 8fa3003c */ lw $v1,0x3c($sp) @@ -3417,7 +3417,7 @@ glabel var7f1ac1b4 /* f099b28: 27a50040 */ addiu $a1,$sp,0x40 /* f099b2c: 51400016 */ beqzl $t2,.PF0f099b88 /* f099b30: 8fa6004c */ lw $a2,0x4c($sp) -/* f099b34: 0fc26348 */ jal 0xf098d20 +/* f099b34: 0fc26348 */ jal func0f098ca0 /* f099b38: afa3003c */ sw $v1,0x3c($sp) /* f099b3c: 04400002 */ bltz $v0,.PF0f099b48 /* f099b40: 8fa3003c */ lw $v1,0x3c($sp) @@ -3426,7 +3426,7 @@ glabel var7f1ac1b4 /* f099b48: 24040001 */ li $a0,0x1 /* f099b4c: 27a50040 */ addiu $a1,$sp,0x40 /* f099b50: 8fa6004c */ lw $a2,0x4c($sp) -/* f099b54: 0fc26348 */ jal 0xf098d20 +/* f099b54: 0fc26348 */ jal func0f098ca0 /* f099b58: afa3003c */ sw $v1,0x3c($sp) /* f099b5c: 04400002 */ bltz $v0,.PF0f099b68 /* f099b60: 8fa3003c */ lw $v1,0x3c($sp) @@ -3434,7 +3434,7 @@ glabel var7f1ac1b4 .PF0f099b68: /* f099b68: 8fa4004c */ lw $a0,0x4c($sp) /* f099b6c: 90850003 */ lbu $a1,0x3($a0) -/* f099b70: 0fc26485 */ jal 0xf099214 +/* f099b70: 0fc26485 */ jal func0f099188 /* f099b74: afa3003c */ sw $v1,0x3c($sp) /* f099b78: 10400002 */ beqz $v0,.PF0f099b84 /* f099b7c: 8fa3003c */ lw $v1,0x3c($sp) @@ -3452,7 +3452,7 @@ glabel var7f1ac1b4 .PF0f099ba4: /* f099ba4: 50600004 */ beqzl $v1,.PF0f099bb8 /* f099ba8: 8fac0058 */ lw $t4,0x58($sp) -/* f099bac: 0fc2884a */ jal 0xf0a2128 +/* f099bac: 0fc2884a */ jal func0f0a1df4 /* f099bb0: 00000000 */ nop .PF0f099bb4: /* f099bb4: 8fac0058 */ lw $t4,0x58($sp) @@ -3480,7 +3480,7 @@ glabel var7f1ac1b4 /* f099c08: 8e020024 */ lw $v0,0x24($s0) /* f099c0c: ae00001c */ sw $zero,0x1c($s0) /* f099c10: ae000018 */ sw $zero,0x18($s0) -/* f099c14: 0fc273ec */ jal 0xf09cfb0 +/* f099c14: 0fc273ec */ jal func0f09cd18 /* f099c18: 8fa40064 */ lw $a0,0x64($sp) /* f099c1c: 1040000f */ beqz $v0,.PF0f099c5c /* f099c20: 8fa90060 */ lw $t1,0x60($sp) @@ -3511,7 +3511,7 @@ glabel var7f1ac1b4 /* f099c78: 3c053f5f */ lui $a1,0x3f5f .PF0f099c7c: /* f099c7c: 34a55dd8 */ ori $a1,$a1,0x5dd8 -/* f099c80: 0fc26601 */ jal 0xf099804 +/* f099c80: 0fc26601 */ jal func0f099780 /* f099c84: 02002025 */ move $a0,$s0 /* f099c88: 00001025 */ move $v0,$zero .PF0f099c8c: @@ -6498,7 +6498,7 @@ glabel var7f1ac330 /* f09aed0: afa90058 */ sw $t1,0x58($sp) /* f09aed4: afaa004c */ sw $t2,0x4c($sp) /* f09aed8: 468021a0 */ cvt.s.w $f6,$f4 -/* f09aedc: 0c006858 */ jal 0x1a160 +/* f09aedc: 0c006858 */ jal cosf /* f09aee0: 46065303 */ div.s $f12,$f10,$f6 /* f09aee4: 3c013f00 */ lui $at,0x3f00 /* f09aee8: 44818000 */ mtc1 $at,$f16 @@ -6507,7 +6507,7 @@ glabel var7f1ac330 /* f09aef4: 46100202 */ mul.s $f8,$f0,$f16 /* f09aef8: 46104480 */ add.s $f18,$f8,$f16 /* f09aefc: 44069000 */ mfc1 $a2,$f18 -/* f09af00: 0c006b5e */ jal 0x1ad78 +/* f09af00: 0c006b5e */ jal func0001afe8 /* f09af04: e7b2003c */ swc1 $f18,0x3c($sp) /* f09af08: c6020044 */ lwc1 $f2,0x44($s0) /* f09af0c: c6040054 */ lwc1 $f4,0x54($s0) @@ -6533,10 +6533,10 @@ glabel var7f1ac330 /* f09af5c: e6080068 */ swc1 $f8,0x68($s0) /* f09af60: 46103200 */ add.s $f8,$f6,$f16 /* f09af64: e608006c */ swc1 $f8,0x6c($s0) -/* f09af68: 0c00581e */ jal 0x16078 +/* f09af68: 0c00581e */ jal func000162e8 /* f09af6c: afa50020 */ sw $a1,0x20($sp) /* f09af70: 26040064 */ addiu $a0,$s0,0x64 -/* f09af74: 0c0056d9 */ jal 0x15b64 +/* f09af74: 0c0056d9 */ jal func00015dd4 /* f09af78: 8fa50020 */ lw $a1,0x20($sp) /* f09af7c: 8fa30028 */ lw $v1,0x28($sp) /* f09af80: 8fa7006c */ lw $a3,0x6c($sp) @@ -6544,7 +6544,7 @@ glabel var7f1ac330 /* f09af88: 10000006 */ b .PF0f09afa4 /* f09af8c: 8fa90058 */ lw $t1,0x58($sp) .PF0f09af90: -/* f09af90: 0c0055d0 */ jal 0x15740 +/* f09af90: 0c0055d0 */ jal func000159b0 /* f09af94: 26040074 */ addiu $a0,$s0,0x74 /* f09af98: ae0000b4 */ sw $zero,0xb4($s0) /* f09af9c: 10000093 */ b .PF0f09b1ec @@ -6591,7 +6591,7 @@ glabel var7f1ac330 /* f09b034: afa90058 */ sw $t1,0x58($sp) /* f09b038: afa8005c */ sw $t0,0x5c($sp) /* f09b03c: afa50044 */ sw $a1,0x44($sp) -/* f09b040: 0fc2c5f7 */ jal 0xf0b17dc +/* f09b040: 0fc2c5f7 */ jal func0f0b131c /* f09b044: 8fa40068 */ lw $a0,0x68($sp) /* f09b048: c60401c0 */ lwc1 $f4,0x1c0($s0) /* f09b04c: c7a20038 */ lwc1 $f2,0x38($sp) @@ -6623,7 +6623,7 @@ glabel var7f1ac330 /* f09b0b4: 44883000 */ mtc1 $t0,$f6 /* f09b0b8: 46044282 */ mul.s $f10,$f8,$f4 /* f09b0bc: 46803220 */ cvt.s.w $f8,$f6 -/* f09b0c0: 0c00685b */ jal 0x1a16c +/* f09b0c0: 0c00685b */ jal sinf /* f09b0c4: 46085303 */ div.s $f12,$f10,$f8 /* f09b0c8: 1000000f */ b .PF0f09b108 /* f09b0cc: 46000486 */ mov.s $f18,$f0 @@ -6635,7 +6635,7 @@ glabel var7f1ac330 /* f09b0e0: 44892000 */ mtc1 $t1,$f4 /* f09b0e4: 460a3202 */ mul.s $f8,$f6,$f10 /* f09b0e8: 468021a0 */ cvt.s.w $f6,$f4 -/* f09b0ec: 0c006858 */ jal 0x1a160 +/* f09b0ec: 0c006858 */ jal cosf /* f09b0f0: 46064303 */ div.s $f12,$f8,$f6 /* f09b0f4: 3c013f00 */ lui $at,0x3f00 /* f09b0f8: 44815000 */ mtc1 $at,$f10 @@ -6646,7 +6646,7 @@ glabel var7f1ac330 /* f09b108: c60c0050 */ lwc1 $f12,0x50($s0) /* f09b10c: c60e0060 */ lwc1 $f14,0x60($s0) /* f09b110: 44069000 */ mfc1 $a2,$f18 -/* f09b114: 0c006b5e */ jal 0x1ad78 +/* f09b114: 0c006b5e */ jal func0001afe8 /* f09b118: e7b20030 */ swc1 $f18,0x30($sp) /* f09b11c: c6020044 */ lwc1 $f2,0x44($s0) /* f09b120: c6060054 */ lwc1 $f6,0x54($s0) @@ -6671,10 +6671,10 @@ glabel var7f1ac330 /* f09b16c: e6080068 */ swc1 $f8,0x68($s0) /* f09b170: 46102200 */ add.s $f8,$f4,$f16 /* f09b174: e608006c */ swc1 $f8,0x6c($s0) -/* f09b178: 0c00581e */ jal 0x16078 +/* f09b178: 0c00581e */ jal func000162e8 /* f09b17c: 8fa50020 */ lw $a1,0x20($sp) /* f09b180: 8fa40028 */ lw $a0,0x28($sp) -/* f09b184: 0c0056d9 */ jal 0x15b64 +/* f09b184: 0c0056d9 */ jal func00015dd4 /* f09b188: 8fa50020 */ lw $a1,0x20($sp) /* f09b18c: 8faa004c */ lw $t2,0x4c($sp) /* f09b190: 8fa50044 */ lw $a1,0x44($sp) @@ -7209,7 +7209,7 @@ glabel func0f09b260 /* f09b484: afb00018 */ sw $s0,0x18($sp) /* f09b488: afa40028 */ sw $a0,0x28($sp) /* f09b48c: 00a08025 */ move $s0,$a1 -/* f09b490: 0fc2c54f */ jal 0xf0b153c +/* f09b490: 0fc2c54f */ jal handGetWeaponFunction /* f09b494: 00a02025 */ move $a0,$a1 /* f09b498: 14400003 */ bnez $v0,.PF0f09b4a8 /* f09b49c: 00403825 */ move $a3,$v0 @@ -7226,13 +7226,13 @@ glabel func0f09b260 /* f09b4c4: 000fc340 */ sll $t8,$t7,0xd /* f09b4c8: 0703000d */ bgezl $t8,.PF0f09b500 /* f09b4cc: 8c4a000c */ lw $t2,0xc($v0) -/* f09b4d0: 0fc44a61 */ jal 0xf112984 +/* f09b4d0: 0fc44a61 */ jal invRemoveItemByNum /* f09b4d4: 92040000 */ lbu $a0,0x0($s0) /* f09b4d8: 3c02800a */ lui $v0,0x800a /* f09b4dc: 8c42a794 */ lw $v0,-0x586c($v0) /* f09b4e0: 90481583 */ lbu $t0,0x1583($v0) /* f09b4e4: 35090008 */ ori $t1,$t0,0x8 -/* f09b4e8: 0fc28779 */ jal 0xf0a1de4 +/* f09b4e8: 0fc28779 */ jal func0f0a1ab0 /* f09b4ec: a0491583 */ sb $t1,0x1583($v0) /* f09b4f0: a60006d4 */ sh $zero,0x6d4($s0) /* f09b4f4: 10000091 */ b .PF0f09b73c @@ -7244,7 +7244,7 @@ glabel func0f09b260 /* f09b508: 51400009 */ beqzl $t2,.PF0f09b530 /* f09b50c: 8cee000c */ lw $t6,0xc($a3) /* f09b510: 8ce4000c */ lw $a0,0xc($a3) -/* f09b514: 0fc26259 */ jal 0xf098964 +/* f09b514: 0fc26259 */ jal func0f0988e0 /* f09b518: afa70024 */ sw $a3,0x24($sp) /* f09b51c: 920c0690 */ lbu $t4,0x690($s0) /* f09b520: 8fa70024 */ lw $a3,0x24($sp) @@ -7263,7 +7263,7 @@ glabel func0f09b260 /* f09b550: 3319ff7f */ andi $t9,$t8,0xff7f /* f09b554: a2190690 */ sb $t9,0x690($s0) .PF0f09b558: -/* f09b558: 0fc262b2 */ jal 0xf098ac8 +/* f09b558: 0fc262b2 */ jal func0f098a44 /* f09b55c: afa70024 */ sw $a3,0x24($sp) /* f09b560: 10400006 */ beqz $v0,.PF0f09b57c /* f09b564: 8fa70024 */ lw $a3,0x24($sp) @@ -7318,7 +7318,7 @@ glabel func0f09b260 /* f09b610: 24010022 */ li $at,0x22 /* f09b614: 1541000e */ bne $t2,$at,.PF0f09b650 /* f09b618: 00000000 */ nop -/* f09b61c: 0fc2a432 */ jal 0xf0a90c8 +/* f09b61c: 0fc2a432 */ jal currentPlayerIsUsingSecondaryFunction /* f09b620: 00000000 */ nop /* f09b624: 24050001 */ li $a1,0x1 /* f09b628: 14450009 */ bne $v0,$a1,.PF0f09b650 @@ -7338,7 +7338,7 @@ glabel func0f09b260 /* f09b658: 54830018 */ bnel $a0,$v1,.PF0f09b6bc /* f09b65c: 92090000 */ lbu $t1,0x0($s0) /* f09b660: 02002025 */ move $a0,$s0 -/* f09b664: 0fc26323 */ jal 0xf098c8c +/* f09b664: 0fc26323 */ jal func0f098c0c /* f09b668: afa70024 */ sw $a3,0x24($sp) /* f09b66c: 8fa70024 */ lw $a3,0x24($sp) /* f09b670: 2401003c */ li $at,0x3c @@ -11200,13 +11200,13 @@ glabel var7f1ad810pf /* f09d0a8: 24110014 */ li $s1,0x14 /* f09d0ac: 02602025 */ move $a0,$s3 /* f09d0b0: afa3003c */ sw $v1,0x3c($sp) -/* f09d0b4: 0fc26333 */ jal 0xf098ccc +/* f09d0b4: 0fc26333 */ jal handGetWeaponInfo /* f09d0b8: 02402825 */ move $a1,$s2 /* f09d0bc: 8fa3003c */ lw $v1,0x3c($sp) /* f09d0c0: 3c02800a */ lui $v0,0x800a /* f09d0c4: 8c50a548 */ lw $s0,-0x5ab8($v0) /* f09d0c8: 24640384 */ addiu $a0,$v1,0x384 -/* f09d0cc: 0c007416 */ jal 0x1d058 +/* f09d0cc: 0c007416 */ jal modelGetAbsAnimSpeed /* f09d0d0: ac700684 */ sw $s0,0x684($v1) /* f09d0d4: 8fa3003c */ lw $v1,0x3c($sp) /* f09d0d8: 3c017f1b */ lui $at,0x7f1b @@ -11222,7 +11222,7 @@ glabel var7f1ad810pf /* f09d100: 02602025 */ move $a0,$s3 .PF0f09d104: /* f09d104: 02402825 */ move $a1,$s2 -/* f09d108: 0fc2737d */ jal 0xf09cdf4 +/* f09d108: 0fc2737d */ jal func0f09cb5c /* f09d10c: 02003025 */ move $a2,$s0 /* f09d110: 00408025 */ move $s0,$v0 /* f09d114: 18400003 */ blez $v0,.PF0f09d124 @@ -14020,7 +14020,7 @@ glabel var7f1ac704 /* f09f110: afa600c0 */ sw $a2,0xc0($sp) /* f09f114: afa700c4 */ sw $a3,0xc4($sp) /* f09f118: 00008025 */ move $s0,$zero -/* f09f11c: 0fc2c524 */ jal 0xf0b1490 +/* f09f11c: 0fc2c524 */ jal weaponFindById /* f09f120: 90a40000 */ lbu $a0,0x0($a1) /* f09f124: 14400003 */ bnez $v0,.PF0f09f134 /* f09f128: 8fa300bc */ lw $v1,0xbc($sp) @@ -14041,7 +14041,7 @@ glabel var7f1ac704 /* f09f15c: 27a40060 */ addiu $a0,$sp,0x60 /* f09f160: 1521001e */ bne $t1,$at,.PF0f09f1dc /* f09f164: 00000000 */ nop -/* f09f168: 0c004ad4 */ jal 0x12b50 +/* f09f168: 0c004ad4 */ jal random /* f09f16c: afa800b0 */ sw $t0,0xb0($sp) /* f09f170: 44822000 */ mtc1 $v0,$f4 /* f09f174: 8fa300c8 */ lw $v1,0xc8($sp) @@ -14067,12 +14067,12 @@ glabel var7f1ac704 /* f09f1c0: 46128100 */ add.s $f4,$f16,$f18 /* f09f1c4: 46044183 */ div.s $f6,$f8,$f4 /* f09f1c8: 44053000 */ mfc1 $a1,$f6 -/* f09f1cc: 0c001294 */ jal 0x4a50 +/* f09f1cc: 0c001294 */ jal guRotateF /* f09f1d0: 00000000 */ nop /* f09f1d4: 10000004 */ b .PF0f09f1e8 /* f09f1d8: 8fa800b0 */ lw $t0,0xb0($sp) .PF0f09f1dc: -/* f09f1dc: 0fc258a0 */ jal 0xf096280 +/* f09f1dc: 0fc258a0 */ jal func0f096360 /* f09f1e0: afa800b0 */ sw $t0,0xb0($sp) /* f09f1e4: 8fa800b0 */ lw $t0,0xb0($sp) .PF0f09f1e8: @@ -14085,7 +14085,7 @@ glabel var7f1ac704 /* f09f200: 8d040014 */ lw $a0,0x14($t0) /* f09f204: 8d040014 */ lw $a0,0x14($t0) /* f09f208: 01402825 */ move $a1,$t2 -/* f09f20c: 0fc22c6a */ jal 0xf08b1a8 +/* f09f20c: 0fc22c6a */ jal func0f08b27c /* f09f210: 8fa600b8 */ lw $a2,0xb8($sp) /* f09f214: 10400032 */ beqz $v0,.PF0f09f2e0 /* f09f218: 00000000 */ nop @@ -14093,7 +14093,7 @@ glabel var7f1ac704 /* f09f220: 00408025 */ move $s0,$v0 /* f09f224: 8d040014 */ lw $a0,0x14($t0) .PF0f09f228: -/* f09f228: 0fc22d61 */ jal 0xf08b584 +/* f09f228: 0fc22d61 */ jal func0f08b658 /* f09f22c: afa800b0 */ sw $t0,0xb0($sp) /* f09f230: 8fa800b0 */ lw $t0,0xb0($sp) /* f09f234: 1040002a */ beqz $v0,.PF0f09f2e0 @@ -14124,7 +14124,7 @@ glabel var7f1ac704 .PF0f09f294: /* f09f294: 8ca40014 */ lw $a0,0x14($a1) /* f09f298: afa800b0 */ sw $t0,0xb0($sp) -/* f09f29c: 0fc10edd */ jal 0xf043b74 +/* f09f29c: 0fc10edd */ jal propSetDangerous /* f09f2a0: afa500a4 */ sw $a1,0xa4($sp) /* f09f2a4: 8fa500a4 */ lw $a1,0xa4($sp) /* f09f2a8: 8fa800b0 */ lw $t0,0xb0($sp) @@ -14156,7 +14156,7 @@ glabel var7f1ac704 /* f09f304: 02002025 */ move $a0,$s0 /* f09f308: 8fa600c4 */ lw $a2,0xc4($sp) /* f09f30c: 8fa700c8 */ lw $a3,0xc8($sp) -/* f09f310: 0fc27bac */ jal 0xf09eeb0 +/* f09f310: 0fc27bac */ jal func0f09ebcc /* f09f314: afaa0018 */ sw $t2,0x18($sp) /* f09f318: 8e0c0040 */ lw $t4,0x40($s0) /* f09f31c: 3c010fff */ lui $at,0xfff @@ -14168,12 +14168,12 @@ glabel var7f1ac704 /* f09f334: 8faf00b8 */ lw $t7,0xb8($sp) /* f09f338: 11c00005 */ beqz $t6,.PF0f09f350 /* f09f33c: 00000000 */ nop -/* f09f340: 0fc63831 */ jal 0xf18e0c4 +/* f09f340: 0fc63831 */ jal mpPlayerGetIndex /* f09f344: 8fa400b8 */ lw $a0,0xb8($sp) /* f09f348: 10000004 */ b .PF0f09f35c /* f09f34c: 8e180040 */ lw $t8,0x40($s0) .PF0f09f350: -/* f09f350: 0fc4a513 */ jal 0xf12944c +/* f09f350: 0fc4a513 */ jal propGetPlayerNum /* f09f354: 8de4001c */ lw $a0,0x1c($t7) /* f09f358: 8e180040 */ lw $t8,0x40($s0) .PF0f09f35c: @@ -14211,7 +14211,7 @@ glabel var7f1ac704 /* f09f3d8: e7a00038 */ swc1 $f0,0x38($sp) /* f09f3dc: e7a00034 */ swc1 $f0,0x34($sp) /* f09f3e0: e7a00030 */ swc1 $f0,0x30($sp) -/* f09f3e4: 0fc24e3a */ jal 0xf0938e8 +/* f09f3e4: 0fc24e3a */ jal func0f0939f8 /* f09f3e8: e7a00024 */ swc1 $f0,0x24($sp) .PF0f09f3ec: /* f09f3ec: 02001025 */ move $v0,$s0 @@ -15647,7 +15647,7 @@ glabel var7f1ac740 /* f09fdd8: 24630638 */ addiu $v1,$v1,0x638 /* f09fddc: 90640000 */ lbu $a0,0x0($v1) /* f09fde0: afa50058 */ sw $a1,0x58($sp) -/* f09fde4: 0fc2c524 */ jal 0xf0b1490 +/* f09fde4: 0fc2c524 */ jal weaponFindById /* f09fde8: afa302b0 */ sw $v1,0x2b0($sp) /* f09fdec: 1040022d */ beqz $v0,.PF0f0a06a4 /* f09fdf0: 8fb902b0 */ lw $t9,0x2b0($sp) @@ -15662,17 +15662,17 @@ glabel var7f1ac740 /* f09fe14: 27a40270 */ addiu $a0,$sp,0x270 /* f09fe18: 55610223 */ bnel $t3,$at,.PF0f0a06a8 /* f09fe1c: 8fbf004c */ lw $ra,0x4c($sp) -/* f09fe20: 0c0055d0 */ jal 0x15740 +/* f09fe20: 0c0055d0 */ jal func000159b0 /* f09fe24: afa301d8 */ sw $v1,0x1d8($sp) /* f09fe28: 27a40204 */ addiu $a0,$sp,0x204 /* f09fe2c: 27a501f8 */ addiu $a1,$sp,0x1f8 /* f09fe30: 02003025 */ move $a2,$s0 -/* f09fe34: 0fc283f5 */ jal 0xf0a0fd4 +/* f09fe34: 0fc283f5 */ jal func0f0a0cb0 /* f09fe38: 24070001 */ li $a3,0x1 -/* f09fe3c: 0fc2d726 */ jal 0xf0b5c98 +/* f09fe3c: 0fc2d726 */ jal currentPlayerGetUnk174c /* f09fe40: 00000000 */ nop /* f09fe44: 00402025 */ move $a0,$v0 -/* f09fe48: 0c005628 */ jal 0x158a0 +/* f09fe48: 0c005628 */ jal func00015b10 /* f09fe4c: 27a501f8 */ addiu $a1,$sp,0x1f8 /* f09fe50: 8fa402b0 */ lw $a0,0x2b0($sp) /* f09fe54: 24010019 */ li $at,0x19 @@ -15724,12 +15724,12 @@ glabel var7f1ac740 /* f09ff04: 00000000 */ nop /* f09ff08: 46803420 */ cvt.s.w $f16,$f6 /* f09ff0c: 46008282 */ mul.s $f10,$f16,$f0 -/* f09ff10: 0fc2c8e8 */ jal 0xf0b23a0 +/* f09ff10: 0fc2c8e8 */ jal handHasFunctionFlags /* f09ff14: e7aa025c */ swc1 $f10,0x25c($sp) /* f09ff18: 1040007a */ beqz $v0,.PF0f0a0104 /* f09ff1c: 00002025 */ move $a0,$zero /* f09ff20: 00002825 */ move $a1,$zero -/* f09ff24: 0fc187ed */ jal 0xf061fb4 +/* f09ff24: 0fc187ed */ jal func0f061d54 /* f09ff28: 00003025 */ move $a2,$zero /* f09ff2c: 8fa302b0 */ lw $v1,0x2b0($sp) /* f09ff30: 8c7806b4 */ lw $t8,0x6b4($v1) @@ -15744,7 +15744,7 @@ glabel var7f1ac740 /* f09ff54: 27a701bc */ addiu $a3,$sp,0x1bc /* f09ff58: e7b201cc */ swc1 $f18,0x1cc($sp) /* f09ff5c: c46806c0 */ lwc1 $f8,0x6c0($v1) -/* f09ff60: 0fc10128 */ jal 0xf0404a0 +/* f09ff60: 0fc10128 */ jal func0f04031c /* f09ff64: e7a801d0 */ swc1 $f8,0x1d0($sp) /* f09ff68: c7a601f8 */ lwc1 $f6,0x1f8($sp) /* f09ff6c: c7b001bc */ lwc1 $f16,0x1bc($sp) @@ -15756,7 +15756,7 @@ glabel var7f1ac740 /* f09ff84: c7a40200 */ lwc1 $f4,0x200($sp) /* f09ff88: 46048482 */ mul.s $f18,$f16,$f4 /* f09ff8c: 46085180 */ add.s $f6,$f10,$f8 -/* f09ff90: 0fc25a3c */ jal 0xf0968f0 +/* f09ff90: 0fc25a3c */ jal func0f0969d0 /* f09ff94: 46069300 */ add.s $f12,$f18,$f6 /* f09ff98: 3c017f1b */ lui $at,0x7f1b /* f09ff9c: c42ad934 */ lwc1 $f10,-0x26cc($at) @@ -15788,7 +15788,7 @@ glabel var7f1ac740 /* f0a0000: e7a20024 */ swc1 $f2,0x24($sp) /* f0a0004: e7a40014 */ swc1 $f4,0x14($sp) /* f0a0008: e7a60020 */ swc1 $f6,0x20($sp) -/* f0a000c: 0c005a3a */ jal 0x168e8 +/* f0a000c: 0c005a3a */ jal func00016b58 /* f0a0010: e7b20018 */ swc1 $f18,0x18($sp) /* f0a0014: 44801000 */ mtc1 $zero,$f2 /* f0a0018: 3c013f80 */ lui $at,0x3f80 @@ -15805,17 +15805,17 @@ glabel var7f1ac740 /* f0a0044: e7aa0010 */ swc1 $f10,0x10($sp) /* f0a0048: e7a40020 */ swc1 $f4,0x20($sp) /* f0a004c: e7a80014 */ swc1 $f8,0x14($sp) -/* f0a0050: 0c005a3a */ jal 0x168e8 +/* f0a0050: 0c005a3a */ jal func00016b58 /* f0a0054: e7b00018 */ swc1 $f16,0x18($sp) /* f0a0058: 02002025 */ move $a0,$s0 -/* f0a005c: 0fc25bd9 */ jal 0xf096f64 +/* f0a005c: 0fc25bd9 */ jal func0f097044 /* f0a0060: 27a500e4 */ addiu $a1,$sp,0xe4 /* f0a0064: 27b000d4 */ addiu $s0,$sp,0xd4 /* f0a0068: 02002825 */ move $a1,$s0 -/* f0a006c: 0fc25bd9 */ jal 0xf096f64 +/* f0a006c: 0fc25bd9 */ jal func0f097044 /* f0a0070: 27a40134 */ addiu $a0,$sp,0x134 /* f0a0074: 27a400e4 */ addiu $a0,$sp,0xe4 -/* f0a0078: 0fc25d78 */ jal 0xf0975e0 +/* f0a0078: 0fc25d78 */ jal func0f0976c0 /* f0a007c: 02002825 */ move $a1,$s0 /* f0a0080: 3c017f1b */ lui $at,0x7f1b /* f0a0084: c432d93c */ lwc1 $f18,-0x26c4($at) @@ -15831,10 +15831,10 @@ glabel var7f1ac740 /* f0a00ac: 46000307 */ neg.s $f12,$f0 /* f0a00b0: 44066000 */ mfc1 $a2,$f12 .PF0f0a00b4: -/* f0a00b4: 0fc25c76 */ jal 0xf0971d8 +/* f0a00b4: 0fc25c76 */ jal func0f0972b8 /* f0a00b8: 27a700c4 */ addiu $a3,$sp,0xc4 /* f0a00bc: 27a400c4 */ addiu $a0,$sp,0xc4 -/* f0a00c0: 0fc25b7d */ jal 0xf096df4 +/* f0a00c0: 0fc25b7d */ jal func0f096ed4 /* f0a00c4: 27a500f4 */ addiu $a1,$sp,0xf4 /* f0a00c8: c7aa0114 */ lwc1 $f10,0x114($sp) /* f0a00cc: c7b00118 */ lwc1 $f16,0x118($sp) @@ -15925,7 +15925,7 @@ glabel var7f1ac740 /* f0a020c: 8fac0058 */ lw $t4,0x58($sp) /* f0a0210: 27a50210 */ addiu $a1,$sp,0x210 /* f0a0214: 016c2021 */ addu $a0,$t3,$t4 -/* f0a0218: 0c0056aa */ jal 0x15aa8 +/* f0a0218: 0c0056aa */ jal func00015d18 /* f0a021c: 2484092c */ addiu $a0,$a0,0x92c /* f0a0220: 44801000 */ mtc1 $zero,$f2 /* f0a0224: 8fa702b0 */ lw $a3,0x2b0($sp) @@ -15977,7 +15977,7 @@ glabel var7f1ac740 /* f0a02d0: 8faf01d8 */ lw $t7,0x1d8($sp) /* f0a02d4: 8f1900bc */ lw $t9,0xbc($t8) /* f0a02d8: 8de40040 */ lw $a0,0x40($t7) -/* f0a02dc: 0fc22deb */ jal 0xf08b7ac +/* f0a02dc: 0fc22deb */ jal func0f08b880 /* f0a02e0: 8f260004 */ lw $a2,0x4($t9) /* f0a02e4: 10000039 */ b .PF0f0a03cc /* f0a02e8: 00408025 */ move $s0,$v0 @@ -15990,7 +15990,7 @@ glabel var7f1ac740 /* f0a0300: 24050056 */ li $a1,0x56 /* f0a0304: 8d2a00bc */ lw $t2,0xbc($t1) /* f0a0308: 8d040040 */ lw $a0,0x40($t0) -/* f0a030c: 0fc22deb */ jal 0xf08b7ac +/* f0a030c: 0fc22deb */ jal func0f08b880 /* f0a0310: 8d460004 */ lw $a2,0x4($t2) /* f0a0314: 1040002d */ beqz $v0,.PF0f0a03cc /* f0a0318: 00408025 */ move $s0,$v0 @@ -16007,7 +16007,7 @@ glabel var7f1ac740 /* f0a0340: 24050055 */ li $a1,0x55 /* f0a0344: 8dcf00bc */ lw $t7,0xbc($t6) /* f0a0348: 8da40040 */ lw $a0,0x40($t5) -/* f0a034c: 0fc22deb */ jal 0xf08b7ac +/* f0a034c: 0fc22deb */ jal func0f08b880 /* f0a0350: 8de60004 */ lw $a2,0x4($t7) /* f0a0354: 1040001d */ beqz $v0,.PF0f0a03cc /* f0a0358: 00408025 */ move $s0,$v0 @@ -16025,7 +16025,7 @@ glabel var7f1ac740 /* f0a0384: 24050055 */ li $a1,0x55 /* f0a0388: 8d2a00bc */ lw $t2,0xbc($t1) /* f0a038c: 8d040040 */ lw $a0,0x40($t0) -/* f0a0390: 0fc22deb */ jal 0xf08b7ac +/* f0a0390: 0fc22deb */ jal func0f08b880 /* f0a0394: 8d460004 */ lw $a2,0x4($t2) /* f0a0398: 1040000c */ beqz $v0,.PF0f0a03cc /* f0a039c: 00408025 */ move $s0,$v0 @@ -16038,7 +16038,7 @@ glabel var7f1ac740 /* f0a03b4: 00e02825 */ move $a1,$a3 /* f0a03b8: 8dae00bc */ lw $t6,0xbc($t5) /* f0a03bc: 8d840040 */ lw $a0,0x40($t4) -/* f0a03c0: 0fc22d61 */ jal 0xf08b584 +/* f0a03c0: 0fc22d61 */ jal func0f08b658 /* f0a03c4: 8dc60004 */ lw $a2,0x4($t6) /* f0a03c8: 00408025 */ move $s0,$v0 .PF0f0a03cc: @@ -16083,7 +16083,7 @@ glabel var7f1ac740 /* f0a0460: 000d7700 */ sll $t6,$t5,0x1c /* f0a0464: 016e7825 */ or $t7,$t3,$t6 /* f0a0468: ae0f0040 */ sw $t7,0x40($s0) -/* f0a046c: 0fc27c04 */ jal 0xf09f010 +/* f0a046c: 0fc27c04 */ jal func0f09ed2c /* f0a0470: afb80010 */ sw $t8,0x10($sp) /* f0a0474: 8e190040 */ lw $t9,0x40($s0) /* f0a0478: 8fa301d8 */ lw $v1,0x1d8($sp) @@ -16126,14 +16126,14 @@ glabel var7f1ac740 /* f0a0504: c4d20014 */ lwc1 $f18,0x14($a2) /* f0a0508: 46009402 */ mul.s $f16,$f18,$f0 /* f0a050c: e4d00014 */ swc1 $f16,0x14($a2) -/* f0a0510: 0c0056b9 */ jal 0x15ae4 +/* f0a0510: 0c0056b9 */ jal func00015d54 /* f0a0514: afa40058 */ sw $a0,0x58($sp) /* f0a0518: 8fa801d8 */ lw $t0,0x1d8($sp) /* f0a051c: 27a50078 */ addiu $a1,$sp,0x78 -/* f0a0520: 0c005725 */ jal 0x15c94 +/* f0a0520: 0c005725 */ jal func00015f04 /* f0a0524: c50c0048 */ lwc1 $f12,0x48($t0) /* f0a0528: 27a40078 */ addiu $a0,$sp,0x78 -/* f0a052c: 0c0056cc */ jal 0x15b30 +/* f0a052c: 0c0056cc */ jal func00015da0 /* f0a0530: 8fa50058 */ lw $a1,0x58($sp) /* f0a0534: 8fa301d8 */ lw $v1,0x1d8($sp) /* f0a0538: 8e0a0048 */ lw $t2,0x48($s0) @@ -16188,7 +16188,7 @@ glabel var7f1ac740 /* f0a05f8: e7a00024 */ swc1 $f0,0x24($sp) /* f0a05fc: e7a00030 */ swc1 $f0,0x30($sp) /* f0a0600: e7a00034 */ swc1 $f0,0x34($sp) -/* f0a0604: 0fc24e3a */ jal 0xf0938e8 +/* f0a0604: 0fc24e3a */ jal func0f0939f8 /* f0a0608: e7a00038 */ swc1 $f0,0x38($sp) /* f0a060c: 8fa301d8 */ lw $v1,0x1d8($sp) /* f0a0610: 8c6d0010 */ lw $t5,0x10($v1) @@ -16196,7 +16196,7 @@ glabel var7f1ac740 /* f0a0614: 31ac0800 */ andi $t4,$t5,0x800 /* f0a0618: 51800004 */ beqzl $t4,.PF0f0a062c /* f0a061c: 8e050048 */ lw $a1,0x48($s0) -/* f0a0620: 0fc2f689 */ jal 0xf0bda24 +/* f0a0620: 0fc2f689 */ jal currentPlayerLaunchSlayerRocket /* f0a0624: 02002025 */ move $a0,$s0 /* f0a0628: 8e050048 */ lw $a1,0x48($s0) .PF0f0a062c: @@ -16206,7 +16206,7 @@ glabel var7f1ac740 /* f0a0638: 31cf0080 */ andi $t7,$t6,0x80 /* f0a063c: 51e00009 */ beqzl $t7,.PF0f0a0664 /* f0a0640: 8fa800b8 */ lw $t0,0xb8($sp) -/* f0a0644: 0fc1cf58 */ jal 0xf073d60 +/* f0a0644: 0fc1cf58 */ jal func0f073ae8 /* f0a0648: 27a70060 */ addiu $a3,$sp,0x60 /* f0a064c: 10000005 */ b .PF0f0a0664 /* f0a0650: 8fa800b8 */ lw $t0,0xb8($sp) @@ -16225,13 +16225,13 @@ glabel var7f1ac740 /* f0a0674: a6090062 */ sh $t1,0x62($s0) /* f0a0678: 50800004 */ beqzl $a0,.PF0f0a068c /* f0a067c: 8e060018 */ lw $a2,0x18($s0) -/* f0a0680: 0fc181a6 */ jal 0xf060698 +/* f0a0680: 0fc181a6 */ jal propFree /* f0a0684: 00000000 */ nop /* f0a0688: 8e060018 */ lw $a2,0x18($s0) .PF0f0a068c: /* f0a068c: 50c00004 */ beqzl $a2,.PF0f0a06a0 /* f0a0690: ae000014 */ sw $zero,0x14($s0) -/* f0a0694: 0fc2cd7b */ jal 0xf0b35ec +/* f0a0694: 0fc2cd7b */ jal modelFree /* f0a0698: 00c02025 */ move $a0,$a2 /* f0a069c: ae000014 */ sw $zero,0x14($s0) .PF0f0a06a0: @@ -22978,7 +22978,7 @@ glabel var7f1ac918 /* f0a4a3c: 10000140 */ b .PF0f0a4f40 /* f0a4a40: 3c014348 */ lui $at,0x4348 .PF0f0a4a44: -/* f0a4a44: 0c004ad4 */ jal 0x12b50 +/* f0a4a44: 0c004ad4 */ jal random /* f0a4a48: 00000000 */ nop /* f0a4a4c: 3c017f1b */ lui $at,0x7f1b /* f0a4a50: c420dacc */ lwc1 $f0,-0x2534($at) @@ -23002,7 +23002,7 @@ glabel var7f1ac918 /* f0a4a94: 00000000 */ nop /* f0a4a98: 46082182 */ mul.s $f6,$f4,$f8 /* f0a4a9c: 46003280 */ add.s $f10,$f6,$f0 -/* f0a4aa0: 0c004ad4 */ jal 0x12b50 +/* f0a4aa0: 0c004ad4 */ jal random /* f0a4aa4: e60a06e8 */ swc1 $f10,0x6e8($s0) /* f0a4aa8: 44828000 */ mtc1 $v0,$f16 /* f0a4aac: 3c014020 */ lui $at,0x4020 @@ -23024,7 +23024,7 @@ glabel var7f1ac918 /* f0a4ae8: 00000000 */ nop /* f0a4aec: 460a3402 */ mul.s $f16,$f6,$f10 /* f0a4af0: 46008100 */ add.s $f4,$f16,$f0 -/* f0a4af4: 0c004ad4 */ jal 0x12b50 +/* f0a4af4: 0c004ad4 */ jal random /* f0a4af8: e60406ec */ swc1 $f4,0x6ec($s0) /* f0a4afc: 44824000 */ mtc1 $v0,$f8 /* f0a4b00: 3c014f80 */ lui $at,0x4f80 @@ -23044,7 +23044,7 @@ glabel var7f1ac918 /* f0a4b34: 46048482 */ mul.s $f18,$f16,$f4 /* f0a4b38: 46089283 */ div.s $f10,$f18,$f8 /* f0a4b3c: 46065401 */ sub.s $f16,$f10,$f6 -/* f0a4b40: 0c004ad4 */ jal 0x12b50 +/* f0a4b40: 0c004ad4 */ jal random /* f0a4b44: e7b000d0 */ swc1 $f16,0xd0($sp) /* f0a4b48: 44822000 */ mtc1 $v0,$f4 /* f0a4b4c: 3c014f80 */ lui $at,0x4f80 @@ -23064,7 +23064,7 @@ glabel var7f1ac918 /* f0a4b80: 46065402 */ mul.s $f16,$f10,$f6 /* f0a4b84: 46048203 */ div.s $f8,$f16,$f4 /* f0a4b88: 46124281 */ sub.s $f10,$f8,$f18 -/* f0a4b8c: 0c004ad4 */ jal 0x12b50 +/* f0a4b8c: 0c004ad4 */ jal random /* f0a4b90: e7aa00d4 */ swc1 $f10,0xd4($sp) /* f0a4b94: 44823000 */ mtc1 $v0,$f6 /* f0a4b98: 3c014f80 */ lui $at,0x4f80 @@ -23087,7 +23087,7 @@ glabel var7f1ac918 /* f0a4bd8: 100000d8 */ b .PF0f0a4f3c /* f0a4bdc: e7a800d8 */ swc1 $f8,0xd8($sp) .PF0f0a4be0: -/* f0a4be0: 0c004ad4 */ jal 0x12b50 +/* f0a4be0: 0c004ad4 */ jal random /* f0a4be4: 00000000 */ nop /* f0a4be8: 3c017f1b */ lui $at,0x7f1b /* f0a4bec: c420dae8 */ lwc1 $f0,-0x2518($at) @@ -23116,7 +23116,7 @@ glabel var7f1ac918 /* f0a4c44: 46002402 */ mul.s $f16,$f4,$f0 /* f0a4c48: 46105200 */ add.s $f8,$f10,$f16 /* f0a4c4c: 46004487 */ neg.s $f18,$f8 -/* f0a4c50: 0c004ad4 */ jal 0x12b50 +/* f0a4c50: 0c004ad4 */ jal random /* f0a4c54: e61206e8 */ swc1 $f18,0x6e8($s0) /* f0a4c58: 44823000 */ mtc1 $v0,$f6 /* f0a4c5c: 3c014020 */ lui $at,0x4020 @@ -23135,7 +23135,7 @@ glabel var7f1ac918 /* f0a4c8c: 00000000 */ nop /* f0a4c90: 46124182 */ mul.s $f6,$f8,$f18 /* f0a4c94: 46003280 */ add.s $f10,$f6,$f0 -/* f0a4c98: 0c004ad4 */ jal 0x12b50 +/* f0a4c98: 0c004ad4 */ jal random /* f0a4c9c: e60a06ec */ swc1 $f10,0x6ec($s0) /* f0a4ca0: 44822000 */ mtc1 $v0,$f4 /* f0a4ca4: 3c014f80 */ lui $at,0x4f80 @@ -23151,7 +23151,7 @@ glabel var7f1ac918 /* f0a4cc8: 00000000 */ nop /* f0a4ccc: 46069280 */ add.s $f10,$f18,$f6 /* f0a4cd0: 46005107 */ neg.s $f4,$f10 -/* f0a4cd4: 0c004ad4 */ jal 0x12b50 +/* f0a4cd4: 0c004ad4 */ jal random /* f0a4cd8: e60406f0 */ swc1 $f4,0x6f0($s0) /* f0a4cdc: 44824000 */ mtc1 $v0,$f8 /* f0a4ce0: 3c014f80 */ lui $at,0x4f80 @@ -23171,7 +23171,7 @@ glabel var7f1ac918 /* f0a4d14: 460a3100 */ add.s $f4,$f6,$f10 /* f0a4d18: 46082482 */ mul.s $f18,$f4,$f8 /* f0a4d1c: 46109183 */ div.s $f6,$f18,$f16 -/* f0a4d20: 0c004ad4 */ jal 0x12b50 +/* f0a4d20: 0c004ad4 */ jal random /* f0a4d24: e7a600d0 */ swc1 $f6,0xd0($sp) /* f0a4d28: 44825000 */ mtc1 $v0,$f10 /* f0a4d2c: 3c014f80 */ lui $at,0x4f80 @@ -23191,7 +23191,7 @@ glabel var7f1ac918 /* f0a4d60: 46109182 */ mul.s $f6,$f18,$f16 /* f0a4d64: 460a3203 */ div.s $f8,$f6,$f10 /* f0a4d68: 46044481 */ sub.s $f18,$f8,$f4 -/* f0a4d6c: 0c004ad4 */ jal 0x12b50 +/* f0a4d6c: 0c004ad4 */ jal random /* f0a4d70: e7b200d4 */ swc1 $f18,0xd4($sp) /* f0a4d74: 44828000 */ mtc1 $v0,$f16 /* f0a4d78: 3c014f80 */ lui $at,0x4f80 @@ -23215,7 +23215,7 @@ glabel var7f1ac918 /* f0a4dbc: e7a800d8 */ swc1 $f8,0xd8($sp) /* f0a4dc0: 44802000 */ mtc1 $zero,$f4 .PF0f0a4dc4: -/* f0a4dc4: 0c004ad4 */ jal 0x12b50 +/* f0a4dc4: 0c004ad4 */ jal random /* f0a4dc8: e60406e8 */ swc1 $f4,0x6e8($s0) /* f0a4dcc: 3c014020 */ lui $at,0x4020 /* f0a4dd0: 44810000 */ mtc1 $at,$f0 @@ -23236,7 +23236,7 @@ glabel var7f1ac918 /* f0a4e08: 00000000 */ nop /* f0a4e0c: 46044482 */ mul.s $f18,$f8,$f4 /* f0a4e10: 46009280 */ add.s $f10,$f18,$f0 -/* f0a4e14: 0c004ad4 */ jal 0x12b50 +/* f0a4e14: 0c004ad4 */ jal random /* f0a4e18: e60a06ec */ swc1 $f10,0x6ec($s0) /* f0a4e1c: 44828000 */ mtc1 $v0,$f16 /* f0a4e20: 3c014f80 */ lui $at,0x4f80 @@ -23253,7 +23253,7 @@ glabel var7f1ac918 /* f0a4e48: 44818000 */ mtc1 $at,$f16 /* f0a4e4c: 46122280 */ add.s $f10,$f4,$f18 /* f0a4e50: 46105202 */ mul.s $f8,$f10,$f16 -/* f0a4e54: 0c004ad4 */ jal 0x12b50 +/* f0a4e54: 0c004ad4 */ jal random /* f0a4e58: e60806f0 */ swc1 $f8,0x6f0($s0) /* f0a4e5c: 44823000 */ mtc1 $v0,$f6 /* f0a4e60: 3c014f80 */ lui $at,0x4f80 @@ -23273,7 +23273,7 @@ glabel var7f1ac918 /* f0a4e94: 46105200 */ add.s $f8,$f10,$f16 /* f0a4e98: 46064482 */ mul.s $f18,$f8,$f6 /* f0a4e9c: 46049283 */ div.s $f10,$f18,$f4 -/* f0a4ea0: 0c004ad4 */ jal 0x12b50 +/* f0a4ea0: 0c004ad4 */ jal random /* f0a4ea4: e7aa00d0 */ swc1 $f10,0xd0($sp) /* f0a4ea8: 44828000 */ mtc1 $v0,$f16 /* f0a4eac: 3c014f80 */ lui $at,0x4f80 @@ -23293,7 +23293,7 @@ glabel var7f1ac918 /* f0a4ee0: 46049282 */ mul.s $f10,$f18,$f4 /* f0a4ee4: 46105183 */ div.s $f6,$f10,$f16 /* f0a4ee8: 46083481 */ sub.s $f18,$f6,$f8 -/* f0a4eec: 0c004ad4 */ jal 0x12b50 +/* f0a4eec: 0c004ad4 */ jal random /* f0a4ef0: e7b200d4 */ swc1 $f18,0xd4($sp) /* f0a4ef4: 44822000 */ mtc1 $v0,$f4 /* f0a4ef8: 3c014f80 */ lui $at,0x4f80 @@ -23322,10 +23322,10 @@ glabel var7f1ac918 /* f0a4f48: 27a400d0 */ addiu $a0,$sp,0xd0 /* f0a4f4c: 27a50090 */ addiu $a1,$sp,0x90 /* f0a4f50: 46124101 */ sub.s $f4,$f8,$f18 -/* f0a4f54: 0c005887 */ jal 0x1621c +/* f0a4f54: 0c005887 */ jal func0001648c /* f0a4f58: e60406d8 */ swc1 $f4,0x6d8($s0) /* f0a4f5c: 27a40090 */ addiu $a0,$sp,0x90 -/* f0a4f60: 0c0056cc */ jal 0x15b30 +/* f0a4f60: 0c0056cc */ jal func00015da0 /* f0a4f64: 26050718 */ addiu $a1,$s0,0x718 /* f0a4f68: 3c03800a */ lui $v1,0x800a /* f0a4f6c: 2463a510 */ addiu $v1,$v1,-23280 @@ -23354,10 +23354,10 @@ glabel var7f1ac918 /* f0a4fc8: c606032c */ lwc1 $f6,0x32c($s0) /* f0a4fcc: 46083481 */ sub.s $f18,$f6,$f8 /* f0a4fd0: 46009103 */ div.s $f4,$f18,$f0 -/* f0a4fd4: 0c005cc6 */ jal 0x17318 +/* f0a4fd4: 0c005cc6 */ jal func00017588 /* f0a4fd8: e7a4008c */ swc1 $f4,0x8c($sp) /* f0a4fdc: 27a40044 */ addiu $a0,$sp,0x44 -/* f0a4fe0: 0c005628 */ jal 0x158a0 +/* f0a4fe0: 0c005628 */ jal func00015b10 /* f0a4fe4: 27a50084 */ addiu $a1,$sp,0x84 /* f0a4fe8: 3c017f1b */ lui $at,0x7f1b /* f0a4fec: c420db14 */ lwc1 $f0,-0x24ec($at) @@ -23442,7 +23442,7 @@ glabel var7f1ac918 /* f0a5118: 8fa40030 */ lw $a0,0x30($sp) .PF0f0a511c: /* f0a511c: 8fa5002c */ lw $a1,0x2c($sp) -/* f0a5120: 0c0057a8 */ jal 0x15ea0 +/* f0a5120: 0c0057a8 */ jal func00016110 /* f0a5124: afa20040 */ sw $v0,0x40($sp) /* f0a5128: 3c03800a */ lui $v1,0x800a /* f0a512c: 8fa20040 */ lw $v0,0x40($sp) @@ -24818,11 +24818,11 @@ glabel var7f1add20pf /* f0a58f4: afa001d4 */ sw $zero,0x1d4($sp) /* f0a58f8: afa30054 */ sw $v1,0x54($sp) /* f0a58fc: afa40310 */ sw $a0,0x310($sp) -/* f0a5900: 0fc28749 */ jal 0xf0a1d24 +/* f0a5900: 0fc28749 */ jal getCurrentPlayerWeaponIdWrapper /* f0a5904: afa201e0 */ sw $v0,0x1e0($sp) /* f0a5908: afa201cc */ sw $v0,0x1cc($sp) /* f0a590c: afa001c0 */ sw $zero,0x1c0($sp) -/* f0a5910: 0fc2c524 */ jal 0xf0b1490 +/* f0a5910: 0fc2c524 */ jal weaponFindById /* f0a5914: 00402025 */ move $a0,$v0 /* f0a5918: 8fb80310 */ lw $t8,0x310($sp) /* f0a591c: 24010001 */ li $at,0x1 @@ -24836,7 +24836,7 @@ glabel var7f1add20pf /* f0a593c: 00000000 */ nop /* f0a5940: afaf01c0 */ sw $t7,0x1c0($sp) .PF0f0a5944: -/* f0a5944: 0fc2c53f */ jal 0xf0b14fc +/* f0a5944: 0fc2c53f */ jal handGetWeaponFunction2 /* f0a5948: 02002025 */ move $a0,$s0 /* f0a594c: 10400007 */ beqz $v0,.PF0f0a596c /* f0a5950: afa201d8 */ sw $v0,0x1d8($sp) @@ -24849,15 +24849,15 @@ glabel var7f1add20pf .PF0f0a596c: /* f0a596c: 02002025 */ move $a0,$s0 .PF0f0a5970: -/* f0a5970: 0fc27601 */ jal 0xf09d804 +/* f0a5970: 0fc27601 */ jal func0f09d550 /* f0a5974: 8fa50310 */ lw $a1,0x310($sp) /* f0a5978: 8fac0310 */ lw $t4,0x310($sp) /* f0a597c: 1580002b */ bnez $t4,.PF0f0a5a2c /* f0a5980: 00000000 */ nop -/* f0a5984: 0fc28749 */ jal 0xf0a1d24 +/* f0a5984: 0fc28749 */ jal getCurrentPlayerWeaponIdWrapper /* f0a5988: 24040001 */ li $a0,0x1 /* f0a598c: 00402025 */ move $a0,$v0 -/* f0a5990: 0fc2c720 */ jal 0xf0b1c80 +/* f0a5990: 0fc2c720 */ jal weaponHasFlag /* f0a5994: 24050040 */ li $a1,0x40 /* f0a5998: 10400013 */ beqz $v0,.PF0f0a59e8 /* f0a599c: 3c01800a */ lui $at,0x800a @@ -24898,10 +24898,10 @@ glabel var7f1add20pf /* f0a5a24: 1000002b */ b .PF0f0a5ad4 /* f0a5a28: e60601bc */ swc1 $f6,0x1bc($s0) .PF0f0a5a2c: -/* f0a5a2c: 0fc28749 */ jal 0xf0a1d24 +/* f0a5a2c: 0fc28749 */ jal getCurrentPlayerWeaponIdWrapper /* f0a5a30: 00002025 */ move $a0,$zero /* f0a5a34: 00402025 */ move $a0,$v0 -/* f0a5a38: 0fc2c720 */ jal 0xf0b1c80 +/* f0a5a38: 0fc2c720 */ jal weaponHasFlag /* f0a5a3c: 24050040 */ li $a1,0x40 /* f0a5a40: 10400013 */ beqz $v0,.PF0f0a5a90 /* f0a5a44: 3c01800a */ lui $at,0x800a @@ -24946,7 +24946,7 @@ glabel var7f1add20pf .PF0f0a5ad8: /* f0a5ad8: 55400017 */ bnezl $t2,.PF0f0a5b38 /* f0a5adc: 8fb901c0 */ lw $t9,0x1c0($sp) -/* f0a5ae0: 0fc2c5f7 */ jal 0xf0b17dc +/* f0a5ae0: 0fc2c5f7 */ jal func0f0b131c /* f0a5ae4: 01402025 */ move $a0,$t2 /* f0a5ae8: c61200b8 */ lwc1 $f18,0xb8($s0) /* f0a5aec: c61001b0 */ lwc1 $f16,0x1b0($s0) @@ -24994,7 +24994,7 @@ glabel var7f1add20pf /* f0a5b90: 10000015 */ b .PF0f0a5be8 /* f0a5b94: e7a60284 */ swc1 $f6,0x284($sp) .PF0f0a5b98: -/* f0a5b98: 0fc2c5f7 */ jal 0xf0b17dc +/* f0a5b98: 0fc2c5f7 */ jal func0f0b131c /* f0a5b9c: 8fa40310 */ lw $a0,0x310($sp) /* f0a5ba0: c61000b8 */ lwc1 $f16,0xb8($s0) /* f0a5ba4: c61201b0 */ lwc1 $f18,0x1b0($s0) @@ -25051,7 +25051,7 @@ glabel var7f1add20pf /* f0a5c6c: 8c4d0014 */ lw $t5,0x14($v0) /* f0a5c70: 11a0004a */ beqz $t5,.PF0f0a5d9c /* f0a5c74: 00000000 */ nop -/* f0a5c78: 0c004ad4 */ jal 0x12b50 +/* f0a5c78: 0c004ad4 */ jal random /* f0a5c7c: 00000000 */ nop /* f0a5c80: 44822000 */ mtc1 $v0,$f4 /* f0a5c84: 3c014f80 */ lui $at,0x4f80 @@ -25076,7 +25076,7 @@ glabel var7f1add20pf /* f0a5ccc: 00000000 */ nop /* f0a5cd0: 46125182 */ mul.s $f6,$f10,$f18 /* f0a5cd4: 46064100 */ add.s $f4,$f8,$f6 -/* f0a5cd8: 0c004ad4 */ jal 0x12b50 +/* f0a5cd8: 0c004ad4 */ jal random /* f0a5cdc: e7a4027c */ swc1 $f4,0x27c($sp) /* f0a5ce0: 44828000 */ mtc1 $v0,$f16 /* f0a5ce4: 3c014f80 */ lui $at,0x4f80 @@ -25101,7 +25101,7 @@ glabel var7f1add20pf /* f0a5d2c: 00000000 */ nop /* f0a5d30: 46085182 */ mul.s $f6,$f10,$f8 /* f0a5d34: 46062400 */ add.s $f16,$f4,$f6 -/* f0a5d38: 0c004ad4 */ jal 0x12b50 +/* f0a5d38: 0c004ad4 */ jal random /* f0a5d3c: e7b00280 */ swc1 $f16,0x280($sp) /* f0a5d40: 44829000 */ mtc1 $v0,$f18 /* f0a5d44: 3c014f80 */ lui $at,0x4f80 @@ -25128,11 +25128,11 @@ glabel var7f1add20pf /* f0a5d94: 46068480 */ add.s $f18,$f16,$f6 /* f0a5d98: e7b20284 */ swc1 $f18,0x284($sp) .PF0f0a5d9c: -/* f0a5d9c: 0fc2d73e */ jal 0xf0b5cf8 +/* f0a5d9c: 0fc2d73e */ jal currentPlayerGetScreenWidth /* f0a5da0: 00000000 */ nop -/* f0a5da4: 0fc2d746 */ jal 0xf0b5d18 +/* f0a5da4: 0fc2d746 */ jal currentPlayerGetScreenLeft /* f0a5da8: e7a00064 */ swc1 $f0,0x64($sp) -/* f0a5dac: 0fc2d73e */ jal 0xf0b5cf8 +/* f0a5dac: 0fc2d73e */ jal currentPlayerGetScreenWidth /* f0a5db0: e7a00068 */ swc1 $f0,0x68($sp) /* f0a5db4: 3c013f00 */ lui $at,0x3f00 /* f0a5db8: 44811000 */ mtc1 $at,$f2 @@ -25150,9 +25150,9 @@ glabel var7f1add20pf /* f0a5de8: 00000000 */ nop /* f0a5dec: 46020402 */ mul.s $f16,$f0,$f2 /* f0a5df0: 46105103 */ div.s $f4,$f10,$f16 -/* f0a5df4: 0fc2d74a */ jal 0xf0b5d28 +/* f0a5df4: 0fc2d74a */ jal currentPlayerGetScreenTop /* f0a5df8: e604076c */ swc1 $f4,0x76c($s0) -/* f0a5dfc: 0fc2d742 */ jal 0xf0b5d08 +/* f0a5dfc: 0fc2d742 */ jal currentPlayerGetScreenHeight /* f0a5e00: e7a00068 */ swc1 $f0,0x68($sp) /* f0a5e04: 3c013f00 */ lui $at,0x3f00 /* f0a5e08: 44813000 */ mtc1 $at,$f6 @@ -25165,11 +25165,11 @@ glabel var7f1add20pf /* f0a5e24: 00000000 */ nop /* f0a5e28: 4500001a */ bc1f .PF0f0a5e94 /* f0a5e2c: 00000000 */ nop -/* f0a5e30: 0fc2d742 */ jal 0xf0b5d08 +/* f0a5e30: 0fc2d742 */ jal currentPlayerGetScreenHeight /* f0a5e34: 00000000 */ nop -/* f0a5e38: 0fc2d74a */ jal 0xf0b5d28 +/* f0a5e38: 0fc2d74a */ jal currentPlayerGetScreenTop /* f0a5e3c: e7a00064 */ swc1 $f0,0x64($sp) -/* f0a5e40: 0fc2d742 */ jal 0xf0b5d08 +/* f0a5e40: 0fc2d742 */ jal currentPlayerGetScreenHeight /* f0a5e44: e7a00068 */ swc1 $f0,0x68($sp) /* f0a5e48: 3c013f00 */ lui $at,0x3f00 /* f0a5e4c: 44819000 */ mtc1 $at,$f18 @@ -25191,11 +25191,11 @@ glabel var7f1add20pf /* f0a5e8c: 10000019 */ b .PF0f0a5ef4 /* f0a5e90: e6100770 */ swc1 $f16,0x770($s0) .PF0f0a5e94: -/* f0a5e94: 0fc2d742 */ jal 0xf0b5d08 +/* f0a5e94: 0fc2d742 */ jal currentPlayerGetScreenHeight /* f0a5e98: 00000000 */ nop -/* f0a5e9c: 0fc2d74a */ jal 0xf0b5d28 +/* f0a5e9c: 0fc2d74a */ jal currentPlayerGetScreenTop /* f0a5ea0: e7a00064 */ swc1 $f0,0x64($sp) -/* f0a5ea4: 0fc2d742 */ jal 0xf0b5d08 +/* f0a5ea4: 0fc2d742 */ jal currentPlayerGetScreenHeight /* f0a5ea8: e7a00068 */ swc1 $f0,0x68($sp) /* f0a5eac: 3c013f00 */ lui $at,0x3f00 /* f0a5eb0: 44814000 */ mtc1 $at,$f8 @@ -25227,12 +25227,12 @@ glabel var7f1add20pf /* f0a5f14: e7a6027c */ swc1 $f6,0x27c($sp) /* f0a5f18: e7aa0280 */ swc1 $f10,0x280($sp) /* f0a5f1c: a2090007 */ sb $t1,0x7($s0) -/* f0a5f20: 0fc2c720 */ jal 0xf0b1c80 +/* f0a5f20: 0fc2c720 */ jal weaponHasFlag /* f0a5f24: 8fa401cc */ lw $a0,0x1cc($sp) /* f0a5f28: 50400018 */ beqzl $v0,.PF0f0a5f8c /* f0a5f2c: a2000007 */ sb $zero,0x7($s0) /* f0a5f30: 8fa401cc */ lw $a0,0x1cc($sp) -/* f0a5f34: 0fc2c720 */ jal 0xf0b1c80 +/* f0a5f34: 0fc2c720 */ jal weaponHasFlag /* f0a5f38: 24050080 */ li $a1,0x80 /* f0a5f3c: 54400013 */ bnezl $v0,.PF0f0a5f8c /* f0a5f40: a2000007 */ sb $zero,0x7($s0) @@ -25242,14 +25242,14 @@ glabel var7f1add20pf /* f0a5f50: 24010007 */ li $at,0x7 /* f0a5f54: 5041000d */ beql $v0,$at,.PF0f0a5f8c /* f0a5f58: a2000007 */ sb $zero,0x7($s0) -/* f0a5f5c: 0fc2780c */ jal 0xf09e030 +/* f0a5f5c: 0fc2780c */ jal func0f09dd7c /* f0a5f60: 00000000 */ nop /* f0a5f64: 50400009 */ beqzl $v0,.PF0f0a5f8c /* f0a5f68: a2000007 */ sb $zero,0x7($s0) /* f0a5f6c: 820d0008 */ lb $t5,0x8($s0) /* f0a5f70: 51a00006 */ beqzl $t5,.PF0f0a5f8c /* f0a5f74: a2000007 */ sb $zero,0x7($s0) -/* f0a5f78: 0fc27820 */ jal 0xf09e080 +/* f0a5f78: 0fc27820 */ jal func0f09ddcc /* f0a5f7c: 00000000 */ nop /* f0a5f80: 54400003 */ bnezl $v0,.PF0f0a5f90 /* f0a5f84: 820c0007 */ lb $t4,0x7($s0) @@ -25265,11 +25265,11 @@ glabel var7f1add20pf /* f0a5fa0: 8444000e */ lh $a0,0xe($v0) /* f0a5fa4: afa20288 */ sw $v0,0x288($sp) /* f0a5fa8: 00045980 */ sll $t3,$a0,0x6 -/* f0a5fac: 0fc5a25d */ jal 0xf168974 +/* f0a5fac: 0fc5a25d */ jal gfxAllocate /* f0a5fb0: 01602025 */ move $a0,$t3 /* f0a5fb4: afa2030c */ sw $v0,0x30c($sp) /* f0a5fb8: 8fa401cc */ lw $a0,0x1cc($sp) -/* f0a5fbc: 0fc2c720 */ jal 0xf0b1c80 +/* f0a5fbc: 0fc2c720 */ jal weaponHasFlag /* f0a5fc0: 3c050200 */ lui $a1,0x200 /* f0a5fc4: 10400012 */ beqz $v0,.PF0f0a6010 /* f0a5fc8: 8fb90288 */ lw $t9,0x288($sp) @@ -25280,7 +25280,7 @@ glabel var7f1add20pf /* f0a5fdc: 00000000 */ nop /* f0a5fe0: afa201d0 */ sw $v0,0x1d0($sp) .PF0f0a5fe4: -/* f0a5fe4: 0c0055d0 */ jal 0x15740 +/* f0a5fe4: 0c0055d0 */ jal func000159b0 /* f0a5fe8: afa4004c */ sw $a0,0x4c($sp) /* f0a5fec: 8fae0288 */ lw $t6,0x288($sp) /* f0a5ff0: 8fa201d0 */ lw $v0,0x1d0($sp) @@ -25292,27 +25292,27 @@ glabel var7f1add20pf /* f0a6008: 5420fff6 */ bnezl $at,.PF0f0a5fe4 /* f0a600c: afa201d0 */ sw $v0,0x1d0($sp) .PF0f0a6010: -/* f0a6010: 0fc28c37 */ jal 0xf0a30dc +/* f0a6010: 0fc28c37 */ jal func0f0a2da8 /* f0a6014: 8e040794 */ lw $a0,0x794($s0) /* f0a6018: 8fa901e0 */ lw $t1,0x1e0($sp) /* f0a601c: 8d2d1594 */ lw $t5,0x1594($t1) /* f0a6020: 51a00004 */ beqzl $t5,.PF0f0a6034 /* f0a6024: 02002025 */ move $a0,$s0 -/* f0a6028: 0fc28c37 */ jal 0xf0a30dc +/* f0a6028: 0fc28c37 */ jal func0f0a2da8 /* f0a602c: 8e040798 */ lw $a0,0x798($s0) /* f0a6030: 02002025 */ move $a0,$s0 .PF0f0a6034: -/* f0a6034: 0fc25fd4 */ jal 0xf097f50 +/* f0a6034: 0fc25fd4 */ jal func0f098030 /* f0a6038: 8fa50288 */ lw $a1,0x288($sp) /* f0a603c: 8fa401cc */ lw $a0,0x1cc($sp) -/* f0a6040: 0fc2c720 */ jal 0xf0b1c80 +/* f0a6040: 0fc2c720 */ jal weaponHasFlag /* f0a6044: 24052000 */ li $a1,0x2000 /* f0a6048: 10400003 */ beqz $v0,.PF0f0a6058 /* f0a604c: 02002025 */ move $a0,$s0 -/* f0a6050: 0fc26042 */ jal 0xf098108 +/* f0a6050: 0fc26042 */ jal func0f0981e8 /* f0a6054: 8fa50288 */ lw $a1,0x288($sp) .PF0f0a6058: -/* f0a6058: 0c0055d0 */ jal 0x15740 +/* f0a6058: 0c0055d0 */ jal func000159b0 /* f0a605c: 27a4023c */ addiu $a0,$sp,0x23c /* f0a6060: 3c08800a */ lui $t0,0x800a /* f0a6064: 2508a510 */ addiu $t0,$t0,-23280 @@ -25355,7 +25355,7 @@ glabel var7f1add20pf /* f0a60e8: 8fa401cc */ lw $a0,0x1cc($sp) /* f0a60ec: 5121000e */ beql $t1,$at,.PF0f0a6128 /* f0a60f0: 8e0a00b4 */ lw $t2,0xb4($s0) -/* f0a60f4: 0fc2c720 */ jal 0xf0b1c80 +/* f0a60f4: 0fc2c720 */ jal weaponHasFlag /* f0a60f8: 3c050008 */ lui $a1,0x8 /* f0a60fc: 10400009 */ beqz $v0,.PF0f0a6124 /* f0a6100: 02002025 */ move $a0,$s0 @@ -25365,7 +25365,7 @@ glabel var7f1add20pf /* f0a6110: afad0010 */ sw $t5,0x10($sp) /* f0a6114: 8fa50310 */ lw $a1,0x310($sp) /* f0a6118: 27a6027c */ addiu $a2,$sp,0x27c -/* f0a611c: 0fc28d25 */ jal 0xf0a3494 +/* f0a611c: 0fc28d25 */ jal func0f0a3160 /* f0a6120: 8fa701d8 */ lw $a3,0x1d8($sp) .PF0f0a6124: /* f0a6124: 8e0a00b4 */ lw $t2,0xb4($s0) @@ -25385,7 +25385,7 @@ glabel var7f1add20pf /* f0a6158: e7aa0280 */ swc1 $f10,0x280($sp) /* f0a615c: c61000ac */ lwc1 $f16,0xac($s0) /* f0a6160: 46109100 */ add.s $f4,$f18,$f16 -/* f0a6164: 0c00565c */ jal 0x15970 +/* f0a6164: 0c00565c */ jal func00015be0 /* f0a6168: e7a40284 */ swc1 $f4,0x284($sp) /* f0a616c: 44800000 */ mtc1 $zero,$f0 /* f0a6170: 00000000 */ nop @@ -25416,10 +25416,10 @@ glabel var7f1add20pf /* f0a61cc: c61000d4 */ lwc1 $f16,0xd4($s0) /* f0a61d0: e7b00020 */ swc1 $f16,0x20($sp) /* f0a61d4: c60400d8 */ lwc1 $f4,0xd8($s0) -/* f0a61d8: 0c005aba */ jal 0x16ae8 +/* f0a61d8: 0c005aba */ jal func00016d58 /* f0a61dc: e7a40024 */ swc1 $f4,0x24($sp) /* f0a61e0: 27a4028c */ addiu $a0,$sp,0x28c -/* f0a61e4: 0c00565c */ jal 0x15970 +/* f0a61e4: 0c00565c */ jal func00015be0 /* f0a61e8: 27a5023c */ addiu $a1,$sp,0x23c /* f0a61ec: 44800000 */ mtc1 $zero,$f0 /* f0a61f0: 3c017f1b */ lui $at,0x7f1b @@ -25428,24 +25428,24 @@ glabel var7f1add20pf /* f0a61fc: 27a5016c */ addiu $a1,$sp,0x16c /* f0a6200: e7a001ac */ swc1 $f0,0x1ac($sp) /* f0a6204: e7a001b4 */ swc1 $f0,0x1b4($sp) -/* f0a6208: 0c005887 */ jal 0x1621c +/* f0a6208: 0c005887 */ jal func0001648c /* f0a620c: e7a601b0 */ swc1 $f6,0x1b0($sp) /* f0a6210: 44804000 */ mtc1 $zero,$f8 /* f0a6214: 27a40120 */ addiu $a0,$sp,0x120 /* f0a6218: 8fa50310 */ lw $a1,0x310($sp) -/* f0a621c: 0fc28a09 */ jal 0xf0a2824 +/* f0a621c: 0fc28a09 */ jal func0f0a24f0 /* f0a6220: e7a801b0 */ swc1 $f8,0x1b0($sp) /* f0a6224: c7ac0120 */ lwc1 $f12,0x120($sp) /* f0a6228: c7ae0128 */ lwc1 $f14,0x128($sp) /* f0a622c: 8fa6027c */ lw $a2,0x27c($sp) -/* f0a6230: 0fc289f3 */ jal 0xf0a27cc +/* f0a6230: 0fc289f3 */ jal func0f0a2498 /* f0a6234: 8fa70284 */ lw $a3,0x284($sp) /* f0a6238: 46000287 */ neg.s $f10,$f0 /* f0a623c: c7ac0124 */ lwc1 $f12,0x124($sp) /* f0a6240: e7aa01b0 */ swc1 $f10,0x1b0($sp) /* f0a6244: c7ae0128 */ lwc1 $f14,0x128($sp) /* f0a6248: 8fa60280 */ lw $a2,0x280($sp) -/* f0a624c: 0fc289f3 */ jal 0xf0a27cc +/* f0a624c: 0fc289f3 */ jal func0f0a2498 /* f0a6250: 8fa70284 */ lw $a3,0x284($sp) /* f0a6254: e7a001ac */ swc1 $f0,0x1ac($sp) /* f0a6258: c7b201ac */ lwc1 $f18,0x1ac($sp) @@ -25453,41 +25453,41 @@ glabel var7f1add20pf /* f0a6260: 27a5012c */ addiu $a1,$sp,0x12c /* f0a6264: e6120234 */ swc1 $f18,0x234($s0) /* f0a6268: c7b001b0 */ lwc1 $f16,0x1b0($sp) -/* f0a626c: 0c005887 */ jal 0x1621c +/* f0a626c: 0c005887 */ jal func0001648c /* f0a6270: e6100238 */ swc1 $f16,0x238($s0) /* f0a6274: 27a4012c */ addiu $a0,$sp,0x12c /* f0a6278: 27a5016c */ addiu $a1,$sp,0x16c -/* f0a627c: 0c0055e4 */ jal 0x15790 +/* f0a627c: 0c0055e4 */ jal func00015a00 /* f0a6280: 27a6028c */ addiu $a2,$sp,0x28c /* f0a6284: 27a4028c */ addiu $a0,$sp,0x28c -/* f0a6288: 0c0055e3 */ jal 0x1578c +/* f0a6288: 0c0055e3 */ jal func000159fc /* f0a628c: 27a5023c */ addiu $a1,$sp,0x23c /* f0a6290: 27a4023c */ addiu $a0,$sp,0x23c -/* f0a6294: 0c0056aa */ jal 0x15aa8 +/* f0a6294: 0c0056aa */ jal func00015d18 /* f0a6298: 27a502cc */ addiu $a1,$sp,0x2cc /* f0a629c: 27a4027c */ addiu $a0,$sp,0x27c -/* f0a62a0: 0c0056d9 */ jal 0x15b64 +/* f0a62a0: 0c0056d9 */ jal func00015dd4 /* f0a62a4: 27a502cc */ addiu $a1,$sp,0x2cc /* f0a62a8: 260502b4 */ addiu $a1,$s0,0x2b4 /* f0a62ac: afa5004c */ sw $a1,0x4c($sp) -/* f0a62b0: 0c0056aa */ jal 0x15aa8 +/* f0a62b0: 0c0056aa */ jal func00015d18 /* f0a62b4: 27a402cc */ addiu $a0,$sp,0x2cc /* f0a62b8: 260402f4 */ addiu $a0,$s0,0x2f4 /* f0a62bc: afa40044 */ sw $a0,0x44($sp) -/* f0a62c0: 0c0056aa */ jal 0x15aa8 +/* f0a62c0: 0c0056aa */ jal func00015d18 /* f0a62c4: 26050334 */ addiu $a1,$s0,0x334 -/* f0a62c8: 0fc2d726 */ jal 0xf0b5c98 +/* f0a62c8: 0fc2d726 */ jal currentPlayerGetUnk174c /* f0a62cc: 00000000 */ nop /* f0a62d0: 00402025 */ move $a0,$v0 /* f0a62d4: 8fa5004c */ lw $a1,0x4c($sp) -/* f0a62d8: 0c00565d */ jal 0x15974 +/* f0a62d8: 0c00565d */ jal func00015be4 /* f0a62dc: 8fa60044 */ lw $a2,0x44($sp) /* f0a62e0: 820b0007 */ lb $t3,0x7($s0) /* f0a62e4: 1160020f */ beqz $t3,.PF0f0a6b24 /* f0a62e8: 2405005a */ li $a1,0x5a /* f0a62ec: 8fa40288 */ lw $a0,0x288($sp) .PF0f0a62f0: -/* f0a62f0: 0c0069ab */ jal 0x1a6ac +/* f0a62f0: 0c0069ab */ jal modelGetPart /* f0a62f4: afa5011c */ sw $a1,0x11c($sp) /* f0a62f8: 1040000c */ beqz $v0,.PF0f0a632c /* f0a62fc: 8fa5011c */ lw $a1,0x11c($sp) @@ -25511,7 +25511,7 @@ glabel var7f1add20pf /* f0a6340: 24050020 */ li $a1,0x20 /* f0a6344: ae020390 */ sw $v0,0x390($s0) /* f0a6348: ae020540 */ sw $v0,0x540($s0) -/* f0a634c: 0fc2c720 */ jal 0xf0b1c80 +/* f0a634c: 0fc2c720 */ jal weaponHasFlag /* f0a6350: 8fa401cc */ lw $a0,0x1cc($sp) /* f0a6354: 10400008 */ beqz $v0,.PF0f0a6378 /* f0a6358: 00000000 */ nop @@ -25520,15 +25520,15 @@ glabel var7f1add20pf /* f0a6364: 15610004 */ bne $t3,$at,.PF0f0a6378 /* f0a6368: 3c01bf80 */ lui $at,0xbf80 /* f0a636c: 44816000 */ mtc1 $at,$f12 -/* f0a6370: 0c0056ed */ jal 0x15bb4 +/* f0a6370: 0c0056ed */ jal func00015e24 /* f0a6374: 27a502cc */ addiu $a1,$sp,0x2cc .PF0f0a6378: /* f0a6378: 3c017f1b */ lui $at,0x7f1b /* f0a637c: c42cdbe8 */ lwc1 $f12,-0x2418($at) -/* f0a6380: 0c005725 */ jal 0x15c94 +/* f0a6380: 0c005725 */ jal func00015f04 /* f0a6384: 27a502cc */ addiu $a1,$sp,0x2cc /* f0a6388: 27a402cc */ addiu $a0,$sp,0x2cc -/* f0a638c: 0c0056aa */ jal 0x15aa8 +/* f0a638c: 0c0056aa */ jal func00015d18 /* f0a6390: 8fa5030c */ lw $a1,0x30c($sp) /* f0a6394: 8e190690 */ lw $t9,0x690($s0) /* f0a6398: 0019c0c0 */ sll $t8,$t9,0x3 @@ -25569,7 +25569,7 @@ glabel var7f1add20pf /* f0a6418: 19400005 */ blez $t2,.PF0f0a6430 /* f0a641c: 02002025 */ move $a0,$s0 /* f0a6420: 8fa50288 */ lw $a1,0x288($sp) -/* f0a6424: 0fc29241 */ jal 0xf0a4904 +/* f0a6424: 0fc29241 */ jal func0f0a45d0 /* f0a6428: 8fa601c0 */ lw $a2,0x1c0($sp) /* f0a642c: 8fa801cc */ lw $t0,0x1cc($sp) .PF0f0a6430: @@ -25587,13 +25587,13 @@ glabel var7f1add20pf /* f0a645c: 2401001d */ li $at,0x1d /* f0a6460: 15010009 */ bne $t0,$at,.PF0f0a6488 /* f0a6464: 00000000 */ nop -/* f0a6468: 0fc2919a */ jal 0xf0a4668 +/* f0a6468: 0fc2919a */ jal func0f0a4334 /* f0a646c: 02002025 */ move $a0,$s0 /* f0a6470: 10000005 */ b .PF0f0a6488 /* f0a6474: 8fa801cc */ lw $t0,0x1cc($sp) .PF0f0a6478: /* f0a6478: 02002025 */ move $a0,$s0 -/* f0a647c: 0fc28f76 */ jal 0xf0a3dd8 +/* f0a647c: 0fc28f76 */ jal func0f0a3aa4 /* f0a6480: 8fa50288 */ lw $a1,0x288($sp) /* f0a6484: 8fa801cc */ lw $t0,0x1cc($sp) .PF0f0a6488: @@ -25687,7 +25687,7 @@ glabel var7f1add20pf /* f0a65c0: afa40054 */ sw $a0,0x54($sp) .PF0f0a65c4: /* f0a65c4: afa50118 */ sw $a1,0x118($sp) -/* f0a65c8: 0c0073c3 */ jal 0x1cf0c +/* f0a65c8: 0c0073c3 */ jal modelGetAnimNum /* f0a65cc: afa700d4 */ sw $a3,0xd4($sp) /* f0a65d0: 284100e5 */ slti $at,$v0,0xe5 /* f0a65d4: 8fa50118 */ lw $a1,0x118($sp) @@ -25741,7 +25741,7 @@ glabel var7f1add20pf /* f0a6680: 8d2a0dd4 */ lw $t2,0xdd4($t1) /* f0a6684: 55410022 */ bnel $t2,$at,.PF0f0a6710 /* f0a6688: 8e0a038c */ lw $t2,0x38c($s0) -/* f0a668c: 0c0055d0 */ jal 0x15740 +/* f0a668c: 0c0055d0 */ jal func000159b0 /* f0a6690: afa700d4 */ sw $a3,0xd4($sp) /* f0a6694: 8fb901e0 */ lw $t9,0x1e0($sp) /* f0a6698: 8e060390 */ lw $a2,0x390($s0) @@ -25761,7 +25761,7 @@ glabel var7f1add20pf /* f0a66cc: 27a400d8 */ addiu $a0,$sp,0xd8 /* f0a66d0: 8fa50054 */ lw $a1,0x54($sp) /* f0a66d4: afa600c8 */ sw $a2,0xc8($sp) -/* f0a66d8: 0c007323 */ jal 0x1cc8c +/* f0a66d8: 0c007323 */ jal func0001cebc /* f0a66dc: afa700d4 */ sw $a3,0xd4($sp) /* f0a66e0: 8fa700d4 */ lw $a3,0xd4($sp) /* f0a66e4: 3c018006 */ lui $at,0x8006 @@ -25787,7 +25787,7 @@ glabel var7f1add20pf .PF0f0a672c: /* f0a672c: afa200d0 */ sw $v0,0xd0($sp) /* f0a6730: afa500cc */ sw $a1,0xcc($sp) -/* f0a6734: 0c00565d */ jal 0x15974 +/* f0a6734: 0c00565d */ jal func00015be4 /* f0a6738: afa600c8 */ sw $a2,0xc8($sp) /* f0a673c: 8fb901dc */ lw $t9,0x1dc($sp) /* f0a6740: 8fa200d0 */ lw $v0,0xd0($sp) @@ -25813,7 +25813,7 @@ glabel var7f1add20pf .PF0f0a678c: /* f0a678c: 27a400d8 */ addiu $a0,$sp,0xd8 /* f0a6790: 8fa50054 */ lw $a1,0x54($sp) -/* f0a6794: 0c007323 */ jal 0x1cc8c +/* f0a6794: 0c007323 */ jal func0001cebc /* f0a6798: afa700d4 */ sw $a3,0xd4($sp) /* f0a679c: 8fa700d4 */ lw $a3,0xd4($sp) /* f0a67a0: 3c018006 */ lui $at,0x8006 @@ -25825,14 +25825,14 @@ glabel var7f1add20pf /* f0a67b4: 3c018006 */ lui $at,0x8006 /* f0a67b8: ac20ec74 */ sw $zero,-0x138c($at) /* f0a67bc: 8fa40288 */ lw $a0,0x288($sp) -/* f0a67c0: 0c0069ab */ jal 0x1a6ac +/* f0a67c0: 0c0069ab */ jal modelGetPart /* f0a67c4: 24050033 */ li $a1,0x33 /* f0a67c8: 10400020 */ beqz $v0,.PF0f0a684c /* f0a67cc: 00402025 */ move $a0,$v0 -/* f0a67d0: 0c0068ad */ jal 0x1a2b4 +/* f0a67d0: 0c0068ad */ jal func0001a524 /* f0a67d4: 00002825 */ move $a1,$zero /* f0a67d8: afa20084 */ sw $v0,0x84($sp) -/* f0a67dc: 0fc2899c */ jal 0xf0a2670 +/* f0a67dc: 0fc2899c */ jal func0f0a233c /* f0a67e0: 8fa40310 */ lw $a0,0x310($sp) /* f0a67e4: 44800000 */ mtc1 $zero,$f0 /* f0a67e8: 8fa90084 */ lw $t1,0x84($sp) @@ -25845,7 +25845,7 @@ glabel var7f1add20pf /* f0a6804: 46002187 */ neg.s $f6,$f4 /* f0a6808: afa40054 */ sw $a0,0x54($sp) /* f0a680c: e7a60080 */ swc1 $f6,0x80($sp) -/* f0a6810: 0c005628 */ jal 0x158a0 +/* f0a6810: 0c005628 */ jal func00015b10 /* f0a6814: 27a50078 */ addiu $a1,$sp,0x78 /* f0a6818: 8fa40054 */ lw $a0,0x54($sp) /* f0a681c: c7aa0078 */ lwc1 $f10,0x78($sp) @@ -25891,22 +25891,22 @@ glabel var7f1add20pf /* f0a68ac: 1000000d */ b .PF0f0a68e4 /* f0a68b0: 8fa40288 */ lw $a0,0x288($sp) .PF0f0a68b4: -/* f0a68b4: 0fc29078 */ jal 0xf0a41e0 +/* f0a68b4: 0fc29078 */ jal func0f0a3eac /* f0a68b8: 8fa5030c */ lw $a1,0x30c($sp) /* f0a68bc: 10000009 */ b .PF0f0a68e4 /* f0a68c0: 8fa40288 */ lw $a0,0x288($sp) .PF0f0a68c4: /* f0a68c4: 8fa5030c */ lw $a1,0x30c($sp) -/* f0a68c8: 0fc290f2 */ jal 0xf0a43c8 +/* f0a68c8: 0fc290f2 */ jal func0f0a4094 /* f0a68cc: 8fa60288 */ lw $a2,0x288($sp) /* f0a68d0: 10000004 */ b .PF0f0a68e4 /* f0a68d4: 8fa40288 */ lw $a0,0x288($sp) .PF0f0a68d8: -/* f0a68d8: 0fc29134 */ jal 0xf0a44d0 +/* f0a68d8: 0fc29134 */ jal func0f0a419c /* f0a68dc: 8fa70288 */ lw $a3,0x288($sp) /* f0a68e0: 8fa40288 */ lw $a0,0x288($sp) .PF0f0a68e4: -/* f0a68e4: 0c0069ab */ jal 0x1a6ac +/* f0a68e4: 0c0069ab */ jal modelGetPart /* f0a68e8: 24050032 */ li $a1,0x32 /* f0a68ec: 8fad01cc */ lw $t5,0x1cc($sp) /* f0a68f0: 24010014 */ li $at,0x14 @@ -25927,7 +25927,7 @@ glabel var7f1add20pf /* f0a6928: 00a1001a */ div $zero,$a1,$at /* f0a692c: 00004810 */ mfhi $t1 /* f0a6930: 2525001e */ addiu $a1,$t1,0x1e -/* f0a6934: 0c0069ab */ jal 0x1a6ac +/* f0a6934: 0c0069ab */ jal modelGetPart /* f0a6938: 00000000 */ nop /* f0a693c: 1000000a */ b .PF0f0a6968 /* f0a6940: 00402025 */ move $a0,$v0 @@ -25938,13 +25938,13 @@ glabel var7f1add20pf /* f0a6950: 00a1001a */ div $zero,$a1,$at /* f0a6954: 00006010 */ mfhi $t4 /* f0a6958: 2585001e */ addiu $a1,$t4,0x1e -/* f0a695c: 0c0069ab */ jal 0x1a6ac +/* f0a695c: 0c0069ab */ jal modelGetPart /* f0a6960: 00000000 */ nop /* f0a6964: 00402025 */ move $a0,$v0 .PF0f0a6968: /* f0a6968: 10400038 */ beqz $v0,.PF0f0a6a4c /* f0a696c: 8fad01cc */ lw $t5,0x1cc($sp) -/* f0a6970: 0c0068ad */ jal 0x1a2b4 +/* f0a6970: 0c0068ad */ jal func0001a524 /* f0a6974: 00002825 */ move $a1,$zero /* f0a6978: 8faa030c */ lw $t2,0x30c($sp) /* f0a697c: 00025980 */ sll $t3,$v0,0x6 @@ -25956,12 +25956,12 @@ glabel var7f1add20pf /* f0a6994: c4840034 */ lwc1 $f4,0x34($a0) /* f0a6998: e6040378 */ swc1 $f4,0x378($s0) /* f0a699c: c4860038 */ lwc1 $f6,0x38($a0) -/* f0a69a0: 0c0056aa */ jal 0x15aa8 +/* f0a69a0: 0c0056aa */ jal func00015d18 /* f0a69a4: e606037c */ swc1 $f6,0x37c($s0) -/* f0a69a8: 0fc2d726 */ jal 0xf0b5c98 +/* f0a69a8: 0fc2d726 */ jal currentPlayerGetUnk174c /* f0a69ac: 00000000 */ nop /* f0a69b0: 00402025 */ move $a0,$v0 -/* f0a69b4: 0c00563d */ jal 0x158f4 +/* f0a69b4: 0c00563d */ jal func00015b64 /* f0a69b8: 26050374 */ addiu $a1,$s0,0x374 /* f0a69bc: 8fa20070 */ lw $v0,0x70($sp) /* f0a69c0: 8fb9030c */ lw $t9,0x30c($sp) @@ -25995,7 +25995,7 @@ glabel var7f1add20pf /* f0a6a30: afb80010 */ sw $t8,0x10($sp) /* f0a6a34: afa90018 */ sw $t1,0x18($sp) /* f0a6a38: afa20020 */ sw $v0,0x20($sp) -/* f0a6a3c: 0fc29457 */ jal 0xf0a515c +/* f0a6a3c: 0fc29457 */ jal func0f0a4e44 /* f0a6a40: afaa0014 */ sw $t2,0x14($sp) /* f0a6a44: 10000044 */ b .PF0f0a6b58 /* f0a6a48: 8fb901cc */ lw $t9,0x1cc($sp) @@ -26013,10 +26013,10 @@ glabel var7f1add20pf /* f0a6a74: 15a1001f */ bne $t5,$at,.PF0f0a6af4 /* f0a6a78: 26050620 */ addiu $a1,$s0,0x620 .PF0f0a6a7c: -/* f0a6a7c: 0c0069ab */ jal 0x1a6ac +/* f0a6a7c: 0c0069ab */ jal modelGetPart /* f0a6a80: 24050037 */ li $a1,0x37 /* f0a6a84: 00402025 */ move $a0,$v0 -/* f0a6a88: 0c0068ad */ jal 0x1a2b4 +/* f0a6a88: 0c0068ad */ jal func0001a524 /* f0a6a8c: 00002825 */ move $a1,$zero /* f0a6a90: 8fae030c */ lw $t6,0x30c($sp) /* f0a6a94: 00026180 */ sll $t4,$v0,0x6 @@ -26028,12 +26028,12 @@ glabel var7f1add20pf /* f0a6aac: c4900034 */ lwc1 $f16,0x34($a0) /* f0a6ab0: e6100378 */ swc1 $f16,0x378($s0) /* f0a6ab4: c4840038 */ lwc1 $f4,0x38($a0) -/* f0a6ab8: 0c0056aa */ jal 0x15aa8 +/* f0a6ab8: 0c0056aa */ jal func00015d18 /* f0a6abc: e604037c */ swc1 $f4,0x37c($s0) -/* f0a6ac0: 0fc2d726 */ jal 0xf0b5c98 +/* f0a6ac0: 0fc2d726 */ jal currentPlayerGetUnk174c /* f0a6ac4: 00000000 */ nop /* f0a6ac8: 00402025 */ move $a0,$v0 -/* f0a6acc: 0c00563d */ jal 0x158f4 +/* f0a6acc: 0c00563d */ jal func00015b64 /* f0a6ad0: 26050374 */ addiu $a1,$s0,0x374 /* f0a6ad4: 8faa0070 */ lw $t2,0x70($sp) /* f0a6ad8: 8fb8030c */ lw $t8,0x30c($sp) @@ -26050,7 +26050,7 @@ glabel var7f1add20pf /* f0a6b00: e60a0374 */ swc1 $f10,0x374($s0) /* f0a6b04: e6120378 */ swc1 $f18,0x378($s0) /* f0a6b08: e610037c */ swc1 $f16,0x37c($s0) -/* f0a6b0c: 0c0056aa */ jal 0x15aa8 +/* f0a6b0c: 0c0056aa */ jal func00015d18 /* f0a6b10: 8fa40044 */ lw $a0,0x44($sp) /* f0a6b14: c60402ec */ lwc1 $f4,0x2ec($s0) /* f0a6b18: 46002187 */ neg.s $f6,$f4 @@ -26064,7 +26064,7 @@ glabel var7f1add20pf /* f0a6b34: e60a0378 */ swc1 $f10,0x378($s0) /* f0a6b38: e612037c */ swc1 $f18,0x37c($s0) /* f0a6b3c: 8fa40044 */ lw $a0,0x44($sp) -/* f0a6b40: 0c0056aa */ jal 0x15aa8 +/* f0a6b40: 0c0056aa */ jal func00015d18 /* f0a6b44: 26050620 */ addiu $a1,$s0,0x620 /* f0a6b48: c61002ec */ lwc1 $f16,0x2ec($s0) /* f0a6b4c: 46008107 */ neg.s $f4,$f16 @@ -26080,7 +26080,7 @@ glabel var7f1add20pf /* f0a6b6c: 1721000f */ bne $t9,$at,.PF0f0a6bac /* f0a6b70: 02002025 */ move $a0,$s0 /* f0a6b74: 8fa50310 */ lw $a1,0x310($sp) -/* f0a6b78: 0fc29229 */ jal 0xf0a48a4 +/* f0a6b78: 0fc29229 */ jal func0f0a4570 /* f0a6b7c: 8fa601d8 */ lw $a2,0x1d8($sp) /* f0a6b80: 1000000b */ b .PF0f0a6bb0 /* f0a6b84: 820c0004 */ lb $t4,0x4($s0) @@ -26092,7 +26092,7 @@ glabel var7f1add20pf /* f0a6b98: 000d7742 */ srl $t6,$t5,0x1d /* f0a6b9c: 19c00003 */ blez $t6,.PF0f0a6bac /* f0a6ba0: 8fa60288 */ lw $a2,0x288($sp) -/* f0a6ba4: 0fc291db */ jal 0xf0a476c +/* f0a6ba4: 0fc291db */ jal func0f0a4438 /* f0a6ba8: 8fa7030c */ lw $a3,0x30c($sp) .PF0f0a6bac: /* f0a6bac: 820c0004 */ lb $t4,0x4($s0) @@ -26108,7 +26108,7 @@ glabel var7f1add20pf /* f0a6bd0: 8fa9030c */ lw $t1,0x30c($sp) /* f0a6bd4: 8fa701cc */ lw $a3,0x1cc($sp) /* f0a6bd8: afb80010 */ sw $t8,0x10($sp) -/* f0a6bdc: 0fc29586 */ jal 0xf0a5618 +/* f0a6bdc: 0fc29586 */ jal func0f0a5300 /* f0a6be0: afa90014 */ sw $t1,0x14($sp) .PF0f0a6be4: /* f0a6be4: 3c0b800a */ lui $t3,0x800a @@ -26160,7 +26160,7 @@ glabel var7f1add20pf /* f0a6c88: 8fa50310 */ lw $a1,0x310($sp) /* f0a6c8c: 11200003 */ beqz $t1,.PF0f0a6c9c /* f0a6c90: 8fa601cc */ lw $a2,0x1cc($sp) -/* f0a6c94: 0fc28df1 */ jal 0xf0a37c4 +/* f0a6c94: 0fc28df1 */ jal func0f0a3490 /* f0a6c98: 8fa701d8 */ lw $a3,0x1d8($sp) .PF0f0a6c9c: /* f0a6c9c: 960b06d6 */ lhu $t3,0x6d6($s0) @@ -26170,7 +26170,7 @@ glabel var7f1add20pf /* f0a6ca8: 000bcb02 */ srl $t9,$t3,0xc /* f0a6cac: 1b200003 */ blez $t9,.PF0f0a6cbc /* f0a6cb0: 00000000 */ nop -/* f0a6cb4: 0fc29276 */ jal 0xf0a49d8 +/* f0a6cb4: 0fc29276 */ jal func0f0a46a4 /* f0a6cb8: 8fa601c0 */ lw $a2,0x1c0($sp) .PF0f0a6cbc: /* f0a6cbc: 3c0f800a */ lui $t7,0x800a @@ -26225,12 +26225,12 @@ glabel var7f1add20pf /* f0a6d64: 02002025 */ move $a0,$s0 /* f0a6d68: 8fa50288 */ lw $a1,0x288($sp) /* f0a6d6c: 8fa60310 */ lw $a2,0x310($sp) -/* f0a6d70: 0fc28eba */ jal 0xf0a3ae8 +/* f0a6d70: 0fc28eba */ jal func0f0a37b4 /* f0a6d74: 8fa7030c */ lw $a3,0x30c($sp) /* f0a6d78: 10000004 */ b .PF0f0a6d8c /* f0a6d7c: 44803000 */ mtc1 $zero,$f6 .PF0f0a6d80: -/* f0a6d80: 0fc2c226 */ jal 0xf0b0898 +/* f0a6d80: 0fc2c226 */ jal lasersightFree /* f0a6d84: 8fa40310 */ lw $a0,0x310($sp) /* f0a6d88: 44803000 */ mtc1 $zero,$f6 .PF0f0a6d8c: @@ -32769,7 +32769,7 @@ glabel func0f0a9fc0 /* f0aa46c: 8fa500f0 */ lw $a1,0xf0($sp) /* f0aa470: 8fa400ec */ lw $a0,0xec($sp) /* f0aa474: afb000bc */ sw $s0,0xbc($sp) -/* f0aa478: 0fc2a87d */ jal 0xf0aa1f4 +/* f0aa478: 0fc2a87d */ jal func0f0a9da8 /* f0aa47c: 02003025 */ move $a2,$s0 /* f0aa480: 2a010015 */ slti $at,$s0,0x15 /* f0aa484: 8fa800ec */ lw $t0,0xec($sp) @@ -32854,7 +32854,7 @@ glabel func0f0a9fc0 /* f0aa5a4: 00d2082a */ slt $at,$a2,$s2 /* f0aa5a8: 1020003e */ beqz $at,.PF0f0aa6a4 /* f0aa5ac: 00000000 */ nop -/* f0aa5b0: 0fc5513c */ jal 0xf1544f0 +/* f0aa5b0: 0fc5513c */ jal gfxSetPrimColour /* f0aa5b4: afa600c4 */ sw $a2,0xc4($sp) /* f0aa5b8: 8fb90100 */ lw $t9,0x100($sp) /* f0aa5bc: 8fa600c4 */ lw $a2,0xc4($sp) @@ -32914,14 +32914,14 @@ glabel func0f0a9fc0 /* f0aa690: 01d96825 */ or $t5,$t6,$t9 /* f0aa694: ac4d0004 */ sw $t5,0x4($v0) .PF0f0aa698: -/* f0aa698: 0fc55153 */ jal 0xf15454c +/* f0aa698: 0fc55153 */ jal func0f153838 /* f0aa69c: 02202025 */ move $a0,$s1 /* f0aa6a0: 00408825 */ move $s1,$v0 .PF0f0aa6a4: /* f0aa6a4: 3c138008 */ lui $s3,0x8008 /* f0aa6a8: 26730020 */ addiu $s3,$s3,0x20 /* f0aa6ac: 02202025 */ move $a0,$s1 -/* f0aa6b0: 0fc5513c */ jal 0xf1544f0 +/* f0aa6b0: 0fc5513c */ jal gfxSetPrimColour /* f0aa6b4: 8fa500fc */ lw $a1,0xfc($sp) /* f0aa6b8: 8fb80100 */ lw $t8,0x100($sp) /* f0aa6bc: 3c09f600 */ lui $t1,0xf600 @@ -32979,7 +32979,7 @@ glabel func0f0a9fc0 .PF0f0aa788: /* f0aa788: 8fa500f8 */ lw $a1,0xf8($sp) /* f0aa78c: afa600c4 */ sw $a2,0xc4($sp) -/* f0aa790: 0fc5513c */ jal 0xf1544f0 +/* f0aa790: 0fc5513c */ jal gfxSetPrimColour /* f0aa794: e7a000c0 */ swc1 $f0,0xc0($sp) /* f0aa798: 8faf00bc */ lw $t7,0xbc($sp) /* f0aa79c: 8fa600c4 */ lw $a2,0xc4($sp) @@ -33045,7 +33045,7 @@ glabel func0f0a9fc0 /* f0aa888: 240600ff */ li $a2,0xff .PF0f0aa88c: /* f0aa88c: 2405ffbf */ li $a1,-65 -/* f0aa890: 0fc01a3c */ jal 0xf0068f0 +/* f0aa890: 0fc01a3c */ jal colourBlend /* f0aa894: afa70048 */ sw $a3,0x48($sp) /* f0aa898: 8fa70048 */ lw $a3,0x48($sp) /* f0aa89c: 8fa800ec */ lw $t0,0xec($sp) @@ -33068,7 +33068,7 @@ glabel func0f0a9fc0 /* f0aa8dc: 240600ff */ li $a2,0xff .PF0f0aa8e0: /* f0aa8e0: 8fa500f8 */ lw $a1,0xf8($sp) -/* f0aa8e4: 0fc01a3c */ jal 0xf0068f0 +/* f0aa8e4: 0fc01a3c */ jal colourBlend /* f0aa8e8: afa70048 */ sw $a3,0x48($sp) /* f0aa8ec: 8fa70048 */ lw $a3,0x48($sp) /* f0aa8f0: 8fa800ec */ lw $t0,0xec($sp) @@ -33116,7 +33116,7 @@ glabel func0f0a9fc0 /* f0aa98c: 34ae00ff */ ori $t6,$a1,0xff /* f0aa990: 01c02825 */ move $a1,$t6 /* f0aa994: 8fa400f8 */ lw $a0,0xf8($sp) -/* f0aa998: 0fc01a3c */ jal 0xf0068f0 +/* f0aa998: 0fc01a3c */ jal colourBlend /* f0aa99c: afa70048 */ sw $a3,0x48($sp) /* f0aa9a0: 8fa800ec */ lw $t0,0xec($sp) /* f0aa9a4: 8fa70048 */ lw $a3,0x48($sp) @@ -33344,7 +33344,7 @@ glabel func0f0a9fc0 /* f0aacd8: 01af7025 */ or $t6,$t5,$t7 /* f0aacdc: ac4e0004 */ sw $t6,0x4($v0) .PF0f0aace0: -/* f0aace0: 0fc55153 */ jal 0xf15454c +/* f0aace0: 0fc55153 */ jal func0f153838 /* f0aace4: 02202025 */ move $a0,$s1 /* f0aace8: 3c19b900 */ lui $t9,0xb900 /* f0aacec: 3c180050 */ lui $t8,0x50 @@ -33971,9 +33971,9 @@ glabel hudRenderAmmo /* f0aad3c: 27bdfed0 */ addiu $sp,$sp,-304 /* f0aad40: afbf0034 */ sw $ra,0x34($sp) /* f0aad44: afa40130 */ sw $a0,0x130($sp) -/* f0aad48: 0c002e95 */ jal 0xba54 +/* f0aad48: 0c002e95 */ jal viGetViewTop /* f0aad4c: afae012c */ sw $t6,0x12c($sp) -/* f0aad50: 0c002e77 */ jal 0xb9dc +/* f0aad50: 0c002e77 */ jal viGetViewHeight /* f0aad54: a7a20076 */ sh $v0,0x76($sp) /* f0aad58: 87af0076 */ lh $t7,0x76($sp) /* f0aad5c: 3c08800a */ lui $t0,0x800a @@ -34023,7 +34023,7 @@ glabel hudRenderAmmo /* f0aadf8: afae0108 */ sw $t6,0x108($sp) /* f0aadfc: afaf0104 */ sw $t7,0x104($sp) /* f0aae00: 83041580 */ lb $a0,0x1580($t8) -/* f0aae04: 0fc2c524 */ jal 0xf0b1490 +/* f0aae04: 0fc2c524 */ jal weaponFindById /* f0aae08: afa70060 */ sw $a3,0x60($sp) /* f0aae0c: 8fb9012c */ lw $t9,0x12c($sp) /* f0aae10: afa200fc */ sw $v0,0xfc($sp) @@ -34053,7 +34053,7 @@ glabel hudRenderAmmo .PF0f0aae68: /* f0aae68: 3c018008 */ lui $at,0x8008 /* f0aae6c: ac2f0020 */ sw $t7,0x20($at) -/* f0aae70: 0fc550cf */ jal 0xf15433c +/* f0aae70: 0fc550cf */ jal func0f153628 /* f0aae74: 8fa40130 */ lw $a0,0x130($sp) /* f0aae78: 8fb80060 */ lw $t8,0x60($sp) /* f0aae7c: afa20130 */ sw $v0,0x130($sp) @@ -34072,7 +34072,7 @@ glabel hudRenderAmmo /* f0aaeb0: 24010001 */ li $at,0x1 /* f0aaeb4: 53210009 */ beql $t9,$at,.PF0f0aaedc /* f0aaeb8: 8faf0128 */ lw $t7,0x128($sp) -/* f0aaebc: 0fc54ef9 */ jal 0xf153be4 +/* f0aaebc: 0fc54ef9 */ jal optionsGetScreenSplit /* f0aaec0: 00000000 */ nop /* f0aaec4: 24010001 */ li $at,0x1 /* f0aaec8: 10410007 */ beq $v0,$at,.PF0f0aaee8 @@ -34107,7 +34107,7 @@ glabel hudRenderAmmo /* f0aaf28: 10000007 */ b .PF0f0aaf48 /* f0aaf2c: afb80128 */ sw $t8,0x128($sp) .PF0f0aaf30: -/* f0aaf30: 0fc54e8c */ jal 0xf153a30 +/* f0aaf30: 0fc54e8c */ jal optionsGetEffectiveScreenSize /* f0aaf34: 00000000 */ nop /* f0aaf38: 10400003 */ beqz $v0,.PF0f0aaf48 /* f0aaf3c: 8fb90128 */ lw $t9,0x128($sp) @@ -34132,23 +34132,23 @@ glabel hudRenderAmmo /* f0aaf84: afa2005c */ sw $v0,0x5c($sp) /* f0aaf88: 27a400dc */ addiu $a0,$sp,0xdc /* f0aaf8c: 00002825 */ move $a1,$zero -/* f0aaf90: 0fc26333 */ jal 0xf098ccc +/* f0aaf90: 0fc26333 */ jal handGetWeaponInfo /* f0aaf94: afb800f0 */ sw $t8,0xf0($sp) -/* f0aaf98: 0fc2a432 */ jal 0xf0a90c8 +/* f0aaf98: 0fc2a432 */ jal currentPlayerIsUsingSecondaryFunction /* f0aaf9c: 00000000 */ nop /* f0aafa0: afa200e8 */ sw $v0,0xe8($sp) /* f0aafa4: 00402025 */ move $a0,$v0 /* f0aafa8: 27a500dc */ addiu $a1,$sp,0xdc -/* f0aafac: 0fc26348 */ jal 0xf098d20 +/* f0aafac: 0fc26348 */ jal func0f098ca0 /* f0aafb0: 8fa6005c */ lw $a2,0x5c($sp) /* f0aafb4: 04400003 */ bltz $v0,.PF0f0aafc4 /* f0aafb8: 00000000 */ nop /* f0aafbc: 8fb800e8 */ lw $t8,0xe8($sp) /* f0aafc0: afb800f0 */ sw $t8,0xf0($sp) .PF0f0aafc4: -/* f0aafc4: 0c002e91 */ jal 0xba44 +/* f0aafc4: 0c002e91 */ jal viGetViewLeft /* f0aafc8: 00000000 */ nop -/* f0aafcc: 0c002e73 */ jal 0xb9cc +/* f0aafcc: 0c002e73 */ jal viGetViewWidth /* f0aafd0: a7a20076 */ sh $v0,0x76($sp) /* f0aafd4: 87b90076 */ lh $t9,0x76($sp) /* f0aafd8: 3c0f8008 */ lui $t7,0x8008 @@ -34174,7 +34174,7 @@ glabel hudRenderAmmo /* f0ab020: 24010002 */ li $at,0x2 /* f0ab024: 1701000f */ bne $t8,$at,.PF0f0ab064 /* f0ab028: afaf0100 */ sw $t7,0x100($sp) -/* f0ab02c: 0fc54ef9 */ jal 0xf153be4 +/* f0ab02c: 0fc54ef9 */ jal optionsGetScreenSplit /* f0ab030: 00000000 */ nop /* f0ab034: 24070001 */ li $a3,0x1 /* f0ab038: 10e20004 */ beq $a3,$v0,.PF0f0ab04c @@ -34254,7 +34254,7 @@ glabel hudRenderAmmo .PF0f0ab13c: /* f0ab13c: 8fa40130 */ lw $a0,0x130($sp) /* f0ab140: 8fa500f4 */ lw $a1,0xf4($sp) -/* f0ab144: 0fc5513c */ jal 0xf1544f0 +/* f0ab144: 0fc5513c */ jal gfxSetPrimColour /* f0ab148: afaa0058 */ sw $t2,0x58($sp) /* f0ab14c: 3c068008 */ lui $a2,0x8008 /* f0ab150: 8fa70100 */ lw $a3,0x100($sp) @@ -34285,26 +34285,26 @@ glabel hudRenderAmmo /* f0ab1b4: 0018c880 */ sll $t9,$t8,0x2 /* f0ab1b8: 01d97825 */ or $t7,$t6,$t9 /* f0ab1bc: ac4f0004 */ sw $t7,0x4($v0) -/* f0ab1c0: 0fc55153 */ jal 0xf15454c +/* f0ab1c0: 0fc55153 */ jal func0f153838 /* f0ab1c4: afa30060 */ sw $v1,0x60($sp) /* f0ab1c8: 3c18800a */ lui $t8,0x800a /* f0ab1cc: 8f18a798 */ lw $t8,-0x5868($t8) /* f0ab1d0: afa20130 */ sw $v0,0x130($sp) -/* f0ab1d4: 0fc54d42 */ jal 0xf153508 +/* f0ab1d4: 0fc54d42 */ jal optionsGetShowGunFunction /* f0ab1d8: 8f040070 */ lw $a0,0x70($t8) /* f0ab1dc: 10400163 */ beqz $v0,.PF0f0ab76c /* f0ab1e0: 8faa0058 */ lw $t2,0x58($sp) /* f0ab1e4: 8fae005c */ lw $t6,0x5c($sp) /* f0ab1e8: 8fa500f0 */ lw $a1,0xf0($sp) /* f0ab1ec: 91c40000 */ lbu $a0,0x0($t6) -/* f0ab1f0: 0fc2c531 */ jal 0xf0b14c4 +/* f0ab1f0: 0fc2c531 */ jal weaponGetFunctionById /* f0ab1f4: afaa0058 */ sw $t2,0x58($sp) -/* f0ab1f8: 0fc44e8c */ jal 0xf113a30 +/* f0ab1f8: 0fc44e8c */ jal invGetCurrentIndex /* f0ab1fc: afa200bc */ sw $v0,0xbc($sp) -/* f0ab200: 0fc44df6 */ jal 0xf1137d8 +/* f0ab200: 0fc44df6 */ jal invGetNameIdByIndex /* f0ab204: 00402025 */ move $a0,$v0 /* f0ab208: 00402025 */ move $a0,$v0 -/* f0ab20c: 0fc5bdaa */ jal 0xf16f6a8 +/* f0ab20c: 0fc5bdaa */ jal langGet /* f0ab210: a7a200ba */ sh $v0,0xba($sp) /* f0ab214: 8faa0058 */ lw $t2,0x58($sp) /* f0ab218: 97a300ba */ lhu $v1,0xba($sp) @@ -34342,7 +34342,7 @@ glabel hudRenderAmmo /* f0ab28c: afa00014 */ sw $zero,0x14($sp) /* f0ab290: afa600d4 */ sw $a2,0xd4($sp) /* f0ab294: afaa0058 */ sw $t2,0x58($sp) -/* f0ab298: 0fc5609a */ jal 0xf158268 +/* f0ab298: 0fc5609a */ jal textMeasure /* f0ab29c: afb80010 */ sw $t8,0x10($sp) /* f0ab2a0: 8fae00c0 */ lw $t6,0xc0($sp) /* f0ab2a4: 8faa0058 */ lw $t2,0x58($sp) @@ -34397,7 +34397,7 @@ glabel hudRenderAmmo /* f0ab35c: afae00d0 */ sw $t6,0xd0($sp) .PF0f0ab360: /* f0ab360: 8fa40130 */ lw $a0,0x130($sp) -/* f0ab364: 0fc5513c */ jal 0xf1544f0 +/* f0ab364: 0fc5513c */ jal gfxSetPrimColour /* f0ab368: afaa0058 */ sw $t2,0x58($sp) /* f0ab36c: 3c038008 */ lui $v1,0x8008 /* f0ab370: 8faf0100 */ lw $t7,0x100($sp) @@ -34426,7 +34426,7 @@ glabel hudRenderAmmo /* f0ab3cc: 31f803ff */ andi $t8,$t7,0x3ff /* f0ab3d0: 00187080 */ sll $t6,$t8,0x2 /* f0ab3d4: 032e7825 */ or $t7,$t9,$t6 -/* f0ab3d8: 0fc55153 */ jal 0xf15454c +/* f0ab3d8: 0fc55153 */ jal func0f153838 /* f0ab3dc: ac4f0004 */ sw $t7,0x4($v0) /* f0ab3e0: 3c018006 */ lui $at,0x8006 /* f0ab3e4: c4241300 */ lwc1 $f4,0x1300($at) @@ -34438,10 +34438,10 @@ glabel hudRenderAmmo /* f0ab3fc: 24060032 */ li $a2,0x32 /* f0ab400: 4600428d */ trunc.w.s $f10,$f8 /* f0ab404: 44045000 */ mfc1 $a0,$f10 -/* f0ab408: 0fc55299 */ jal 0xf154a64 +/* f0ab408: 0fc55299 */ jal func0f153d50 /* f0ab40c: 00000000 */ nop /* f0ab410: 2404ffff */ li $a0,-1 -/* f0ab414: 0fc552d3 */ jal 0xf154b4c +/* f0ab414: 0fc552d3 */ jal func0f153e38 /* f0ab418: 2405ffff */ li $a1,-1 /* f0ab41c: 3c198008 */ lui $t9,0x8008 /* f0ab420: 8f390068 */ lw $t9,0x68($t9) @@ -34460,9 +34460,9 @@ glabel hudRenderAmmo /* f0ab454: afa00028 */ sw $zero,0x28($sp) /* f0ab458: afae0014 */ sw $t6,0x14($sp) /* f0ab45c: afaf0018 */ sw $t7,0x18($sp) -/* f0ab460: 0fc55c50 */ jal 0xf157140 +/* f0ab460: 0fc55c50 */ jal textRenderProjected /* f0ab464: afb8001c */ sw $t8,0x1c($sp) -/* f0ab468: 0fc552d8 */ jal 0xf154b60 +/* f0ab468: 0fc552d8 */ jal func0f153e4c /* f0ab46c: afa20130 */ sw $v0,0x130($sp) /* f0ab470: 8faa0058 */ lw $t2,0x58($sp) /* f0ab474: 8fa200bc */ lw $v0,0xbc($sp) @@ -34470,7 +34470,7 @@ glabel hudRenderAmmo /* f0ab478: 504000bd */ beqzl $v0,.PF0f0ab770 /* f0ab47c: 8fa500fc */ lw $a1,0xfc($sp) /* f0ab480: 94440004 */ lhu $a0,0x4($v0) -/* f0ab484: 0fc5bdaa */ jal 0xf16f6a8 +/* f0ab484: 0fc5bdaa */ jal langGet /* f0ab488: afaa0058 */ sw $t2,0x58($sp) /* f0ab48c: 3c0eff55 */ lui $t6,0xff55 /* f0ab490: 8fa300bc */ lw $v1,0xbc($sp) @@ -34494,7 +34494,7 @@ glabel hudRenderAmmo /* f0ab4d0: a559006c */ sh $t9,0x6c($t2) /* f0ab4d4: 3324ffff */ andi $a0,$t9,0xffff .PF0f0ab4d8: -/* f0ab4d8: 0fc5bdaa */ jal 0xf16f6a8 +/* f0ab4d8: 0fc5bdaa */ jal langGet /* f0ab4dc: afaa0058 */ sw $t2,0x58($sp) /* f0ab4e0: 8faa0058 */ lw $t2,0x58($sp) /* f0ab4e4: 00403025 */ move $a2,$v0 @@ -34550,7 +34550,7 @@ glabel hudRenderAmmo /* f0ab59c: afa00014 */ sw $zero,0x14($sp) /* f0ab5a0: afa600d4 */ sw $a2,0xd4($sp) /* f0ab5a4: afaa0058 */ sw $t2,0x58($sp) -/* f0ab5a8: 0fc5609a */ jal 0xf158268 +/* f0ab5a8: 0fc5609a */ jal textMeasure /* f0ab5ac: afb90010 */ sw $t9,0x10($sp) /* f0ab5b0: 8fb800c0 */ lw $t8,0xc0($sp) /* f0ab5b4: 8faa0058 */ lw $t2,0x58($sp) @@ -34595,7 +34595,7 @@ glabel hudRenderAmmo /* f0ab64c: afae00d0 */ sw $t6,0xd0($sp) .PF0f0ab650: /* f0ab650: 8fa40130 */ lw $a0,0x130($sp) -/* f0ab654: 0fc5513c */ jal 0xf1544f0 +/* f0ab654: 0fc5513c */ jal gfxSetPrimColour /* f0ab658: afaa0058 */ sw $t2,0x58($sp) /* f0ab65c: 3c038008 */ lui $v1,0x8008 /* f0ab660: 24630020 */ addiu $v1,$v1,0x20 @@ -34626,7 +34626,7 @@ glabel hudRenderAmmo /* f0ab6c4: 31cf03ff */ andi $t7,$t6,0x3ff /* f0ab6c8: 000fc080 */ sll $t8,$t7,0x2 /* f0ab6cc: 03387025 */ or $t6,$t9,$t8 -/* f0ab6d0: 0fc55153 */ jal 0xf15454c +/* f0ab6d0: 0fc55153 */ jal func0f153838 /* f0ab6d4: ac4e0004 */ sw $t6,0x4($v0) /* f0ab6d8: 3c018006 */ lui $at,0x8006 /* f0ab6dc: c4301300 */ lwc1 $f16,0x1300($at) @@ -34638,10 +34638,10 @@ glabel hudRenderAmmo /* f0ab6f4: 24060032 */ li $a2,0x32 /* f0ab6f8: 4600218d */ trunc.w.s $f6,$f4 /* f0ab6fc: 44043000 */ mfc1 $a0,$f6 -/* f0ab700: 0fc55299 */ jal 0xf154a64 +/* f0ab700: 0fc55299 */ jal func0f153d50 /* f0ab704: 00000000 */ nop /* f0ab708: 2404ffff */ li $a0,-1 -/* f0ab70c: 0fc552d3 */ jal 0xf154b4c +/* f0ab70c: 0fc552d3 */ jal func0f153e38 /* f0ab710: 2405ffff */ li $a1,-1 /* f0ab714: 3c198008 */ lui $t9,0x8008 /* f0ab718: 8f390068 */ lw $t9,0x68($t9) @@ -34660,9 +34660,9 @@ glabel hudRenderAmmo /* f0ab74c: afa00028 */ sw $zero,0x28($sp) /* f0ab750: afb80014 */ sw $t8,0x14($sp) /* f0ab754: afae0018 */ sw $t6,0x18($sp) -/* f0ab758: 0fc55c50 */ jal 0xf157140 +/* f0ab758: 0fc55c50 */ jal textRenderProjected /* f0ab75c: afaf001c */ sw $t7,0x1c($sp) -/* f0ab760: 0fc552d8 */ jal 0xf154b60 +/* f0ab760: 0fc552d8 */ jal func0f153e4c /* f0ab764: afa20130 */ sw $v0,0x130($sp) /* f0ab768: 8faa0058 */ lw $t2,0x58($sp) .PF0f0ab76c: @@ -34698,7 +34698,7 @@ glabel hudRenderAmmo .PF0f0ab7d8: /* f0ab7d8: 57030008 */ bnel $t8,$v1,.PF0f0ab7fc /* f0ab7dc: 8faf0110 */ lw $t7,0x110($sp) -/* f0ab7e0: 0fc55125 */ jal 0xf154494 +/* f0ab7e0: 0fc55125 */ jal func0f153780 /* f0ab7e4: 8fa40130 */ lw $a0,0x130($sp) /* f0ab7e8: 240e0001 */ li $t6,0x1 /* f0ab7ec: 3c018008 */ lui $at,0x8008 @@ -34710,13 +34710,13 @@ glabel hudRenderAmmo /* f0ab800: 8fa4012c */ lw $a0,0x12c($sp) /* f0ab804: 11f9000d */ beq $t7,$t9,.PF0f0ab83c /* f0ab808: 24841568 */ addiu $a0,$a0,0x1568 -/* f0ab80c: 0fc2a878 */ jal 0xf0aa1e0 +/* f0ab80c: 0fc2a878 */ jal abmagReset /* f0ab810: afaa0058 */ sw $t2,0x58($sp) /* f0ab814: 8fa4005c */ lw $a0,0x5c($sp) -/* f0ab818: 0fc2a878 */ jal 0xf0aa1e0 +/* f0ab818: 0fc2a878 */ jal abmagReset /* f0ab81c: 2484078c */ addiu $a0,$a0,0x78c /* f0ab820: 8faa0058 */ lw $t2,0x58($sp) -/* f0ab824: 0fc2a878 */ jal 0xf0aa1e0 +/* f0ab824: 0fc2a878 */ jal abmagReset /* f0ab828: 2544005c */ addiu $a0,$t2,0x5c /* f0ab82c: 8faa0058 */ lw $t2,0x58($sp) /* f0ab830: 8fb80110 */ lw $t8,0x110($sp) @@ -34741,7 +34741,7 @@ glabel hudRenderAmmo /* f0ab878: 8fb9005c */ lw $t9,0x5c($sp) /* f0ab87c: afb80050 */ sw $t8,0x50($sp) /* f0ab880: afa40054 */ sw $a0,0x54($sp) -/* f0ab884: 0c002e91 */ jal 0xba44 +/* f0ab884: 0c002e91 */ jal viGetViewLeft /* f0ab888: afaa0058 */ sw $t2,0x58($sp) /* f0ab88c: 3c188008 */ lui $t8,0x8008 /* f0ab890: 8f180020 */ lw $t8,0x20($t8) @@ -34767,7 +34767,7 @@ glabel hudRenderAmmo /* f0ab8d8: 57210015 */ bnel $t9,$at,.PF0f0ab930 /* f0ab8dc: 8fb80124 */ lw $t8,0x124($sp) /* f0ab8e0: afa40054 */ sw $a0,0x54($sp) -/* f0ab8e4: 0fc54ef9 */ jal 0xf153be4 +/* f0ab8e4: 0fc54ef9 */ jal optionsGetScreenSplit /* f0ab8e8: afaa0058 */ sw $t2,0x58($sp) /* f0ab8ec: 24010001 */ li $at,0x1 /* f0ab8f0: 8fa40054 */ lw $a0,0x54($sp) @@ -34836,7 +34836,7 @@ glabel hudRenderAmmo /* f0ab9dc: afa00028 */ sw $zero,0x28($sp) /* f0ab9e0: afa8001c */ sw $t0,0x1c($sp) /* f0ab9e4: 24c6fffd */ addiu $a2,$a2,-3 -/* f0ab9e8: 0fc2a907 */ jal 0xf0aa41c +/* f0ab9e8: 0fc2a907 */ jal func0f0a9fc0 /* f0ab9ec: afaf0018 */ sw $t7,0x18($sp) /* f0ab9f0: 8fa3004c */ lw $v1,0x4c($sp) /* f0ab9f4: 8fb80048 */ lw $t8,0x48($sp) @@ -34850,7 +34850,7 @@ glabel hudRenderAmmo /* f0aba14: afa00014 */ sw $zero,0x14($sp) /* f0aba18: 00402025 */ move $a0,$v0 /* f0aba1c: 24070001 */ li $a3,0x1 -/* f0aba20: 0fc2a85e */ jal 0xf0aa178 +/* f0aba20: 0fc2a85e */ jal func0f0a9d2c /* f0aba24: 24c60002 */ addiu $a2,$a2,0x2 /* f0aba28: 8faa0058 */ lw $t2,0x58($sp) /* f0aba2c: afa20130 */ sw $v0,0x130($sp) @@ -34870,9 +34870,9 @@ glabel hudRenderAmmo /* f0aba5c: 000fc080 */ sll $t8,$t7,0x2 /* f0aba60: afb80050 */ sw $t8,0x50($sp) /* f0aba64: afaa0058 */ sw $t2,0x58($sp) -/* f0aba68: 0c002e91 */ jal 0xba44 +/* f0aba68: 0c002e91 */ jal viGetViewLeft /* f0aba6c: afb900a4 */ sw $t9,0xa4($sp) -/* f0aba70: 0c002e73 */ jal 0xb9cc +/* f0aba70: 0c002e73 */ jal viGetViewWidth /* f0aba74: a7a20076 */ sh $v0,0x76($sp) /* f0aba78: 87ae0076 */ lh $t6,0x76($sp) /* f0aba7c: 3c0f8008 */ lui $t7,0x8008 @@ -34899,7 +34899,7 @@ glabel hudRenderAmmo /* f0abac8: 24010002 */ li $at,0x2 /* f0abacc: 17010011 */ bne $t8,$at,.PF0f0abb14 /* f0abad0: afaf0100 */ sw $t7,0x100($sp) -/* f0abad4: 0fc54ef9 */ jal 0xf153be4 +/* f0abad4: 0fc54ef9 */ jal optionsGetScreenSplit /* f0abad8: afaa0058 */ sw $t2,0x58($sp) /* f0abadc: 24010001 */ li $at,0x1 /* f0abae0: 10410006 */ beq $v0,$at,.PF0f0abafc @@ -34975,7 +34975,7 @@ glabel hudRenderAmmo /* f0abbe8: afa3001c */ sw $v1,0x1c($sp) /* f0abbec: 24c6fffd */ addiu $a2,$a2,-3 /* f0abbf0: 8fa40130 */ lw $a0,0x130($sp) -/* f0abbf4: 0fc2a907 */ jal 0xf0aa41c +/* f0abbf4: 0fc2a907 */ jal func0f0a9fc0 /* f0abbf8: afb90018 */ sw $t9,0x18($sp) /* f0abbfc: 8fa80038 */ lw $t0,0x38($sp) /* f0abc00: 8fa60100 */ lw $a2,0x100($sp) @@ -34988,7 +34988,7 @@ glabel hudRenderAmmo /* f0abc1c: 00402025 */ move $a0,$v0 /* f0abc20: 00003825 */ move $a3,$zero /* f0abc24: 24c6fffe */ addiu $a2,$a2,-2 -/* f0abc28: 0fc2a85e */ jal 0xf0aa178 +/* f0abc28: 0fc2a85e */ jal func0f0a9d2c /* f0abc2c: afb90010 */ sw $t9,0x10($sp) /* f0abc30: 8fa80038 */ lw $t0,0x38($sp) /* f0abc34: 8faa0058 */ lw $t2,0x58($sp) @@ -35056,7 +35056,7 @@ glabel hudRenderAmmo /* f0abd18: afab001c */ sw $t3,0x1c($sp) /* f0abd1c: afa60048 */ sw $a2,0x48($sp) /* f0abd20: afa9009c */ sw $t1,0x9c($sp) -/* f0abd24: 0fc2a907 */ jal 0xf0aa41c +/* f0abd24: 0fc2a907 */ jal func0f0a9fc0 /* f0abd28: afae0010 */ sw $t6,0x10($sp) /* f0abd2c: 8fae0048 */ lw $t6,0x48($sp) /* f0abd30: 3c1800ff */ lui $t8,0xff @@ -35068,7 +35068,7 @@ glabel hudRenderAmmo /* f0abd48: 8fa5009c */ lw $a1,0x9c($sp) /* f0abd4c: 8fa60054 */ lw $a2,0x54($sp) /* f0abd50: 00003825 */ move $a3,$zero -/* f0abd54: 0fc2a85e */ jal 0xf0aa178 +/* f0abd54: 0fc2a85e */ jal func0f0a9d2c /* f0abd58: afa00014 */ sw $zero,0x14($sp) /* f0abd5c: afa20130 */ sw $v0,0x130($sp) /* f0abd60: 8fb9005c */ lw $t9,0x5c($sp) @@ -35150,7 +35150,7 @@ glabel hudRenderAmmo /* f0abe78: 00000000 */ nop /* f0abe7c: 0006000d */ break 0x6 .PF0f0abe80: -/* f0abe80: 0c004d11 */ jal 0x13444 +/* f0abe80: 0c004d11 */ jal sprintf /* f0abe84: 00000000 */ nop /* f0abe88: 1000002b */ b .PF0f0abf38 /* f0abe8c: 8fa60044 */ lw $a2,0x44($sp) @@ -35198,7 +35198,7 @@ glabel hudRenderAmmo /* f0abf24: 00000000 */ nop /* f0abf28: 0006000d */ break 0x6 .PF0f0abf2c: -/* f0abf2c: 0c004d11 */ jal 0x13444 +/* f0abf2c: 0c004d11 */ jal sprintf /* f0abf30: 00000000 */ nop /* f0abf34: 8fa60044 */ lw $a2,0x44($sp) .PF0f0abf38: @@ -35211,11 +35211,11 @@ glabel hudRenderAmmo /* f0abf50: 00003825 */ move $a3,$zero /* f0abf54: afa00014 */ sw $zero,0x14($sp) /* f0abf58: 24c6fffe */ addiu $a2,$a2,-2 -/* f0abf5c: 0fc2a7ed */ jal 0xf0a9fb4 +/* f0abf5c: 0fc2a7ed */ jal func0f0a9b68 /* f0abf60: afae0010 */ sw $t6,0x10($sp) /* f0abf64: afa20130 */ sw $v0,0x130($sp) .PF0f0abf68: -/* f0abf68: 0fc55125 */ jal 0xf154494 +/* f0abf68: 0fc55125 */ jal func0f153780 /* f0abf6c: 8fa40130 */ lw $a0,0x130($sp) /* f0abf70: 24180001 */ li $t8,0x1 /* f0abf74: 3c018008 */ lui $at,0x8008 diff --git a/src/game/game_0b69d0.c b/src/game/game_0b69d0.c index 7ef183cc5..46f6da1d0 100644 --- a/src/game/game_0b69d0.c +++ b/src/game/game_0b69d0.c @@ -2991,19 +2991,19 @@ glabel var7f1ae89cpf /* f0ba7e8: afb40040 */ sw $s4,0x40($sp) /* f0ba7ec: afb3003c */ sw $s3,0x3c($sp) /* f0ba7f0: afb20038 */ sw $s2,0x38($sp) -/* f0ba7f4: 0fc57602 */ jal 0xf15d808 +/* f0ba7f4: 0fc57602 */ jal func0f15c888 /* f0ba7f8: afb10034 */ sw $s1,0x34($sp) /* f0ba7fc: 3c13800a */ lui $s3,0x800a /* f0ba800: 2673a510 */ addiu $s3,$s3,-23280 /* f0ba804: 8e6e0288 */ lw $t6,0x288($s3) /* f0ba808: e7a00148 */ swc1 $f0,0x148($sp) -/* f0ba80c: 0fc54cfe */ jal 0xf1533f8 +/* f0ba80c: 0fc54cfe */ jal optionsGetContpadNum1 /* f0ba810: 8dc40070 */ lw $a0,0x70($t6) /* f0ba814: 00022600 */ sll $a0,$v0,0x18 /* f0ba818: 00047e03 */ sra $t7,$a0,0x18 /* f0ba81c: 12000005 */ beqz $s0,.PF0f0ba834 /* f0ba820: 01e02025 */ move $a0,$t7 -/* f0ba824: 0c00533a */ jal 0x14ce8 +/* f0ba824: 0c00533a */ jal contGetButtons /* f0ba828: 3405ffff */ li $a1,0xffff /* f0ba82c: 10000002 */ b .PF0f0ba838 /* f0ba830: a7a2013c */ sh $v0,0x13c($sp) @@ -3012,9 +3012,9 @@ glabel var7f1ae89cpf .PF0f0ba838: /* f0ba838: 3c14800a */ lui $s4,0x800a /* f0ba83c: 2694e38c */ addiu $s4,$s4,-7284 -/* f0ba840: 0c008d8e */ jal 0x23638 +/* f0ba840: 0c008d8e */ jal func00023d38 /* f0ba844: 86840000 */ lh $a0,0x0($s4) -/* f0ba848: 0c008c1a */ jal 0x23068 +/* f0ba848: 0c008c1a */ jal animGetNumFrames /* f0ba84c: 86840000 */ lh $a0,0x0($s4) /* f0ba850: 8e780290 */ lw $t8,0x290($s3) /* f0ba854: 2443ffff */ addiu $v1,$v0,-1 @@ -3035,7 +3035,7 @@ glabel var7f1ae89cpf /* f0ba890: e6080000 */ swc1 $f8,0x0($s0) /* f0ba894: c430e890 */ lwc1 $f16,-0x1770($at) /* f0ba898: c60a0000 */ lwc1 $f10,0x0($s0) -/* f0ba89c: 0fc25dec */ jal 0xf0977b0 +/* f0ba89c: 0fc25dec */ jal floorf /* f0ba8a0: 46105300 */ add.s $f12,$f10,$f16 /* f0ba8a4: 4600048d */ trunc.w.s $f18,$f0 /* f0ba8a8: 86840000 */ lh $a0,0x0($s4) @@ -3054,7 +3054,7 @@ glabel var7f1ae89cpf /* f0ba8dc: 8e250000 */ lw $a1,0x0($s1) /* f0ba8e0: 1020001a */ beqz $at,.PF0f0ba94c /* f0ba8e4: 01202825 */ move $a1,$t1 -/* f0ba8e8: 0c008cb8 */ jal 0x232e0 +/* f0ba8e8: 0c008cb8 */ jal func000239e0 /* f0ba8ec: 00000000 */ nop /* f0ba8f0: 10400016 */ beqz $v0,.PF0f0ba94c .PF0f0ba8f4: @@ -3066,7 +3066,7 @@ glabel var7f1ae89cpf /* f0ba908: e6080000 */ swc1 $f8,0x0($s0) /* f0ba90c: c430e898 */ lwc1 $f16,-0x1768($at) /* f0ba910: c60a0000 */ lwc1 $f10,0x0($s0) -/* f0ba914: 0fc25dec */ jal 0xf0977b0 +/* f0ba914: 0fc25dec */ jal floorf /* f0ba918: 46105300 */ add.s $f12,$f10,$f16 /* f0ba91c: 4600048d */ trunc.w.s $f18,$f0 /* f0ba920: 927904e2 */ lbu $t9,0x4e2($s3) @@ -3076,7 +3076,7 @@ glabel var7f1ae89cpf /* f0ba930: 00b2082a */ slt $at,$a1,$s2 /* f0ba934: 10200005 */ beqz $at,.PF0f0ba94c /* f0ba938: ae250000 */ sw $a1,0x0($s1) -/* f0ba93c: 0c008cb8 */ jal 0x232e0 +/* f0ba93c: 0c008cb8 */ jal func000239e0 /* f0ba940: 86840000 */ lh $a0,0x0($s4) /* f0ba944: 1440ffeb */ bnez $v0,.PF0f0ba8f4 /* f0ba948: 00000000 */ nop @@ -3109,9 +3109,9 @@ glabel var7f1ae89cpf /* f0ba9a0: 86840000 */ lh $a0,0x0($s4) /* f0ba9a4: 00b2102a */ slt $v0,$a1,$s2 .PF0f0ba9a8: -/* f0ba9a8: 0c008cec */ jal 0x233b0 +/* f0ba9a8: 0c008cec */ jal func00023ab0 /* f0ba9ac: ae6204cc */ sw $v0,0x4cc($s3) -/* f0ba9b0: 0c008d83 */ jal 0x2360c +/* f0ba9b0: 0c008d83 */ jal func00023d0c /* f0ba9b4: 305000ff */ andi $s0,$v0,0xff /* f0ba9b8: 3c068008 */ lui $a2,0x8008 /* f0ba9bc: 27aa01a8 */ addiu $t2,$sp,0x1a8 @@ -3124,7 +3124,7 @@ glabel var7f1ae89cpf /* f0ba9d8: 00002025 */ move $a0,$zero /* f0ba9dc: 00002825 */ move $a1,$zero /* f0ba9e0: 86870000 */ lh $a3,0x0($s4) -/* f0ba9e4: 0c008e54 */ jal 0x23950 +/* f0ba9e4: 0c008e54 */ jal func00024050 /* f0ba9e8: afb00010 */ sw $s0,0x10($sp) /* f0ba9ec: c7a00148 */ lwc1 $f0,0x148($sp) /* f0ba9f0: c7b0019c */ lwc1 $f16,0x19c($sp) @@ -3138,7 +3138,7 @@ glabel var7f1ae89cpf /* f0baa10: 46004282 */ mul.s $f10,$f8,$f0 /* f0baa14: e7b201cc */ swc1 $f18,0x1cc($sp) /* f0baa18: e7a401d0 */ swc1 $f4,0x1d0($sp) -/* f0baa1c: 0c005887 */ jal 0x1621c +/* f0baa1c: 0c005887 */ jal func0001648c /* f0baa20: e7aa01d4 */ swc1 $f10,0x1d4($sp) /* f0baa24: c7b20160 */ lwc1 $f18,0x160($sp) /* f0baa28: c7b0015c */ lwc1 $f16,0x15c($sp) @@ -3157,12 +3157,12 @@ glabel var7f1ae89cpf /* f0baa5c: e7a601bc */ swc1 $f6,0x1bc($sp) /* f0baa60: 24040001 */ li $a0,0x1 /* f0baa64: 86850000 */ lh $a1,0x0($s4) -/* f0baa68: 0c009145 */ jal 0x24514 +/* f0baa68: 0c009145 */ jal func00024c14 /* f0baa6c: 320600ff */ andi $a2,$s0,0xff /* f0baa70: e7a00144 */ swc1 $f0,0x144($sp) /* f0baa74: 24040002 */ li $a0,0x2 /* f0baa78: 86850000 */ lh $a1,0x0($s4) -/* f0baa7c: 0c009145 */ jal 0x24514 +/* f0baa7c: 0c009145 */ jal func00024c14 /* f0baa80: 320600ff */ andi $a2,$s0,0xff /* f0baa84: 44802000 */ mtc1 $zero,$f4 /* f0baa88: 3c04800a */ lui $a0,0x800a @@ -3193,13 +3193,13 @@ glabel var7f1ae89cpf /* f0baaec: c428e89c */ lwc1 $f8,-0x1764($at) /* f0baaf0: e7a0010c */ swc1 $f0,0x10c($sp) /* f0baaf4: 46004302 */ mul.s $f12,$f8,$f0 -/* f0baaf8: 0c006858 */ jal 0x1a160 +/* f0baaf8: 0c006858 */ jal cosf /* f0baafc: 00000000 */ nop /* f0bab00: 3c013f80 */ lui $at,0x3f80 /* f0bab04: 44818000 */ mtc1 $at,$f16 /* f0bab08: 00002025 */ move $a0,$zero /* f0bab0c: 46008281 */ sub.s $f10,$f16,$f0 -/* f0bab10: 0fc320b0 */ jal 0xf0c82c0 +/* f0bab10: 0fc320b0 */ jal bmoveSetMode /* f0bab14: e7aa0108 */ swc1 $f10,0x108($sp) /* f0bab18: 8e7002a0 */ lw $s0,0x2a0($s3) /* f0bab1c: c7a401cc */ lwc1 $f4,0x1cc($sp) @@ -3241,7 +3241,7 @@ glabel var7f1ae89cpf /* f0babac: 46009107 */ neg.s $f4,$f18 /* f0babb0: e7aa0014 */ swc1 $f10,0x14($sp) /* f0babb4: e7a40018 */ swc1 $f4,0x18($sp) -/* f0babb8: 0c005aba */ jal 0x16ae8 +/* f0babb8: 0c005aba */ jal func00016d58 /* f0babbc: e7a60024 */ swc1 $f6,0x24($sp) /* f0babc0: 8e7002a0 */ lw $s0,0x2a0($s3) /* f0babc4: 44800000 */ mtc1 $zero,$f0 @@ -3264,27 +3264,27 @@ glabel var7f1ae89cpf /* f0bac08: c6120398 */ lwc1 $f18,0x398($s0) /* f0bac0c: e7b20020 */ swc1 $f18,0x20($sp) /* f0bac10: c604039c */ lwc1 $f4,0x39c($s0) -/* f0bac14: 0c005aba */ jal 0x16ae8 +/* f0bac14: 0c005aba */ jal func00016d58 /* f0bac18: e7a40024 */ swc1 $f4,0x24($sp) /* f0bac1c: 27b00078 */ addiu $s0,$sp,0x78 /* f0bac20: 02002825 */ move $a1,$s0 -/* f0bac24: 0fc25bd9 */ jal 0xf096f64 +/* f0bac24: 0fc25bd9 */ jal func0f097044 /* f0bac28: 02202025 */ move $a0,$s1 /* f0bac2c: 27b10068 */ addiu $s1,$sp,0x68 /* f0bac30: 02202825 */ move $a1,$s1 -/* f0bac34: 0fc25bd9 */ jal 0xf096f64 +/* f0bac34: 0fc25bd9 */ jal func0f097044 /* f0bac38: 02402025 */ move $a0,$s2 /* f0bac3c: 02202025 */ move $a0,$s1 -/* f0bac40: 0fc25d78 */ jal 0xf0975e0 +/* f0bac40: 0fc25d78 */ jal func0f0976c0 /* f0bac44: 02002825 */ move $a1,$s0 /* f0bac48: 27b20058 */ addiu $s2,$sp,0x58 /* f0bac4c: 02403825 */ move $a3,$s2 /* f0bac50: 02002025 */ move $a0,$s0 /* f0bac54: 02202825 */ move $a1,$s1 -/* f0bac58: 0fc25c76 */ jal 0xf0971d8 +/* f0bac58: 0fc25c76 */ jal func0f0972b8 /* f0bac5c: 8fa60108 */ lw $a2,0x108($sp) /* f0bac60: 02402025 */ move $a0,$s2 -/* f0bac64: 0fc25b7d */ jal 0xf096df4 +/* f0bac64: 0fc25b7d */ jal func0f096ed4 /* f0bac68: 27a5014c */ addiu $a1,$sp,0x14c /* f0bac6c: c7a8015c */ lwc1 $f8,0x15c($sp) /* f0bac70: c7b00160 */ lwc1 $f16,0x160($sp) @@ -3313,15 +3313,15 @@ glabel var7f1ae89cpf /* f0baccc: e68a0000 */ swc1 $f10,0x0($s4) /* f0bacd0: e7a60144 */ swc1 $f6,0x144($sp) .PF0f0bacd4: -/* f0bacd4: 0fc30767 */ jal 0xf0c1d9c +/* f0bacd4: 0fc30767 */ jal currentPlayerSetCameraMode /* f0bacd8: 24040001 */ li $a0,0x1 /* f0bacdc: 27a401cc */ addiu $a0,$sp,0x1cc /* f0bace0: 27a501c0 */ addiu $a1,$sp,0x1c0 -/* f0bace4: 0fc30851 */ jal 0xf0c2144 +/* f0bace4: 0fc30851 */ jal func0f0c1bd8 /* f0bace8: 27a601b4 */ addiu $a2,$sp,0x1b4 -/* f0bacec: 0fc4a569 */ jal 0xf1295a4 +/* f0bacec: 0fc4a569 */ jal currentPlayerSetFovY /* f0bacf0: c7ac0144 */ lwc1 $f12,0x144($sp) -/* f0bacf4: 0c002e9d */ jal 0xba74 +/* f0bacf4: 0c002e9d */ jal viSetFovY /* f0bacf8: c7ac0144 */ lwc1 $f12,0x144($sp) /* f0bacfc: 8e6e0290 */ lw $t6,0x290($s3) /* f0bad00: 3c0141f0 */ lui $at,0x41f0 @@ -5151,14 +5151,14 @@ glabel var7f1ad6ac /* f0bdf4c: 00000000 */ nop /* f0bdf50: ae200000 */ sw $zero,0x0($s1) .PF0f0bdf54: -/* f0bdf54: 0fc54fa3 */ jal 0xf153e8c +/* f0bdf54: 0fc54fa3 */ jal func0f1531dc /* f0bdf58: 00002025 */ move $a0,$zero -/* f0bdf5c: 0fc54ef3 */ jal 0xf153bcc +/* f0bdf5c: 0fc54ef3 */ jal optionsGetScreenRatio /* f0bdf60: 00000000 */ nop /* f0bdf64: 24010001 */ li $at,0x1 /* f0bdf68: 14410008 */ bne $v0,$at,.PF0f0bdf8c /* f0bdf6c: 00000000 */ nop -/* f0bdf70: 0fc2f635 */ jal 0xf0bd8d4 +/* f0bdf70: 0fc2f635 */ jal func0f0bd358 /* f0bdf74: 00000000 */ nop /* f0bdf78: 3c017f1b */ lui $at,0x7f1b /* f0bdf7c: c424e940 */ lwc1 $f4,-0x16c0($at) @@ -5166,7 +5166,7 @@ glabel var7f1ad6ac /* f0bdf84: 10000004 */ b .PF0f0bdf98 /* f0bdf88: 00000000 */ nop .PF0f0bdf8c: -/* f0bdf8c: 0fc2f635 */ jal 0xf0bd8d4 +/* f0bdf8c: 0fc2f635 */ jal func0f0bd358 /* f0bdf90: 00000000 */ nop /* f0bdf94: 46000386 */ mov.s $f14,$f0 .PF0f0bdf98: @@ -5178,7 +5178,7 @@ glabel var7f1ad6ac /* f0bdfac: 3c047f1b */ lui $a0,0x7f1b /* f0bdfb0: 2484e7d4 */ addiu $a0,$a0,-6188 /* f0bdfb4: 02002825 */ move $a1,$s0 -/* f0bdfb8: 0c003624 */ jal 0xd890 +/* f0bdfb8: 0c003624 */ jal func0000db30 /* f0bdfbc: e7ae032c */ swc1 $f14,0x32c($sp) /* f0bdfc0: 8e0f0000 */ lw $t7,0x0($s0) /* f0bdfc4: 51e00008 */ beqzl $t7,.PF0f0bdfe8 @@ -5195,45 +5195,45 @@ glabel var7f1ad6ac /* f0bdfec: 912a1bfc */ lbu $t2,0x1bfc($t1) /* f0bdff0: 51400004 */ beqzl $t2,.PF0f0be004 /* f0bdff4: 8e6b04b4 */ lw $t3,0x4b4($s3) -/* f0bdff8: 0fc2f698 */ jal 0xf0bda60 +/* f0bdff8: 0fc2f698 */ jal currentPlayerTickTeleport /* f0bdffc: 27a4032c */ addiu $a0,$sp,0x32c /* f0be000: 8e6b04b4 */ lw $t3,0x4b4($s3) .PF0f0be004: /* f0be004: 2401004e */ li $at,0x4e /* f0be008: 5561000a */ bnel $t3,$at,.PF0f0be034 /* f0be00c: 3c014270 */ lui $at,0x4270 -/* f0be010: 0fc06b94 */ jal 0xf01ae50 +/* f0be010: 0fc06b94 */ jal func0f01ad5c /* f0be014: 00000000 */ nop /* f0be018: 50400006 */ beqzl $v0,.PF0f0be034 /* f0be01c: 3c014270 */ lui $at,0x4270 -/* f0be020: 0fc06bab */ jal 0xf01aeac +/* f0be020: 0fc06bab */ jal func0f01adb8 /* f0be024: 00000000 */ nop /* f0be028: 10000834 */ b .PF0f0c00fc /* f0be02c: 8fbf004c */ lw $ra,0x4c($sp) /* f0be030: 3c014270 */ lui $at,0x4270 .PF0f0be034: /* f0be034: 44816000 */ mtc1 $at,$f12 -/* f0be038: 0fc4a569 */ jal 0xf1295a4 +/* f0be038: 0fc4a569 */ jal currentPlayerSetFovY /* f0be03c: 00000000 */ nop -/* f0be040: 0fc4a56d */ jal 0xf1295b4 +/* f0be040: 0fc4a56d */ jal currentPlayerSetAspectRatio /* f0be044: c7ac032c */ lwc1 $f12,0x32c($sp) -/* f0be048: 0fc2f2b4 */ jal 0xf0bcad0 +/* f0be048: 0fc2f2b4 */ jal currentPlayerGetViewportWidth /* f0be04c: 00000000 */ nop /* f0be050: 00028400 */ sll $s0,$v0,0x10 /* f0be054: 00106403 */ sra $t4,$s0,0x10 -/* f0be058: 0fc2f407 */ jal 0xf0bd01c +/* f0be058: 0fc2f407 */ jal currentPlayerGetViewportHeight /* f0be05c: 01808025 */ move $s0,$t4 /* f0be060: 02002025 */ move $a0,$s0 -/* f0be064: 0fc4a55b */ jal 0xf12956c +/* f0be064: 0fc4a55b */ jal currentPlayerSetViewSize /* f0be068: 00402825 */ move $a1,$v0 -/* f0be06c: 0fc2f34a */ jal 0xf0bcd28 +/* f0be06c: 0fc2f34a */ jal currentPlayerGetViewportLeft /* f0be070: 00000000 */ nop /* f0be074: 00028400 */ sll $s0,$v0,0x10 /* f0be078: 00106c03 */ sra $t5,$s0,0x10 -/* f0be07c: 0fc2f4e8 */ jal 0xf0bd3a0 +/* f0be07c: 0fc2f4e8 */ jal currentPlayerGetViewportTop /* f0be080: 01a08025 */ move $s0,$t5 /* f0be084: 02002025 */ move $a0,$s0 -/* f0be088: 0fc4a562 */ jal 0xf129588 +/* f0be088: 0fc4a562 */ jal currentPlayerSetViewPosition /* f0be08c: 00402825 */ move $a1,$v0 /* f0be090: 8e2e0000 */ lw $t6,0x0($s1) /* f0be094: 3c048007 */ lui $a0,0x8007 @@ -5243,13 +5243,13 @@ glabel var7f1ad6ac /* f0be0a4: 01ee7823 */ subu $t7,$t7,$t6 /* f0be0a8: 000f7880 */ sll $t7,$t7,0x2 /* f0be0ac: 008f2021 */ addu $a0,$a0,$t7 -/* f0be0b0: 0c0029fd */ jal 0xa7f4 +/* f0be0b0: 0c0029fd */ jal func0000aab0 /* f0be0b4: 8c840960 */ lw $a0,0x960($a0) -/* f0be0b8: 0fc2f2b4 */ jal 0xf0bcad0 +/* f0be0b8: 0fc2f2b4 */ jal currentPlayerGetViewportWidth /* f0be0bc: 00000000 */ nop /* f0be0c0: 00028400 */ sll $s0,$v0,0x10 /* f0be0c4: 0010c403 */ sra $t8,$s0,0x10 -/* f0be0c8: 0fc2f407 */ jal 0xf0bd01c +/* f0be0c8: 0fc2f407 */ jal currentPlayerGetViewportHeight /* f0be0cc: 03008025 */ move $s0,$t8 /* f0be0d0: 3c014270 */ lui $at,0x4270 /* f0be0d4: 00103400 */ sll $a2,$s0,0x10 @@ -5259,74 +5259,74 @@ glabel var7f1ad6ac /* f0be0e4: 44816000 */ mtc1 $at,$f12 /* f0be0e8: 03203025 */ move $a2,$t9 /* f0be0ec: 01203825 */ move $a3,$t1 -/* f0be0f0: 0c002ec7 */ jal 0xbb1c +/* f0be0f0: 0c002ec7 */ jal viSetFovAspectAndSize /* f0be0f4: c7ae032c */ lwc1 $f14,0x32c($sp) -/* f0be0f8: 0fc2f34a */ jal 0xf0bcd28 +/* f0be0f8: 0fc2f34a */ jal currentPlayerGetViewportLeft /* f0be0fc: 00000000 */ nop /* f0be100: 00028400 */ sll $s0,$v0,0x10 /* f0be104: 00105403 */ sra $t2,$s0,0x10 -/* f0be108: 0fc2f4e8 */ jal 0xf0bd3a0 +/* f0be108: 0fc2f4e8 */ jal currentPlayerGetViewportTop /* f0be10c: 01408025 */ move $s0,$t2 /* f0be110: 00102400 */ sll $a0,$s0,0x10 /* f0be114: 00022c00 */ sll $a1,$v0,0x10 /* f0be118: 00056403 */ sra $t4,$a1,0x10 /* f0be11c: 00045c03 */ sra $t3,$a0,0x10 /* f0be120: 01602025 */ move $a0,$t3 -/* f0be124: 0c002e7b */ jal 0xb9ec +/* f0be124: 0c002e7b */ jal viSetViewPosition /* f0be128: 01802825 */ move $a1,$t4 -/* f0be12c: 0fc2f272 */ jal 0xf0bc9c8 +/* f0be12c: 0fc2f272 */ jal viGetFbWidth /* f0be130: 00000000 */ nop /* f0be134: 00028400 */ sll $s0,$v0,0x10 /* f0be138: 00106c03 */ sra $t5,$s0,0x10 -/* f0be13c: 0fc2f27d */ jal 0xf0bc9f4 +/* f0be13c: 0fc2f27d */ jal viGetFbHeight /* f0be140: 01a08025 */ move $s0,$t5 /* f0be144: 00102400 */ sll $a0,$s0,0x10 /* f0be148: 00022c00 */ sll $a1,$v0,0x10 /* f0be14c: 00057c03 */ sra $t7,$a1,0x10 /* f0be150: 00047403 */ sra $t6,$a0,0x10 /* f0be154: 01c02025 */ move $a0,$t6 -/* f0be158: 0c002e4a */ jal 0xb928 +/* f0be158: 0c002e4a */ jal viSetXY /* f0be15c: 01e02825 */ move $a1,$t7 -/* f0be160: 0fc2f272 */ jal 0xf0bc9c8 +/* f0be160: 0fc2f272 */ jal viGetFbWidth /* f0be164: 00000000 */ nop /* f0be168: 00028400 */ sll $s0,$v0,0x10 /* f0be16c: 0010c403 */ sra $t8,$s0,0x10 -/* f0be170: 0fc2f27d */ jal 0xf0bc9f4 +/* f0be170: 0fc2f27d */ jal viGetFbHeight /* f0be174: 03008025 */ move $s0,$t8 /* f0be178: 00102400 */ sll $a0,$s0,0x10 /* f0be17c: 00022c00 */ sll $a1,$v0,0x10 /* f0be180: 00054c03 */ sra $t1,$a1,0x10 /* f0be184: 0004cc03 */ sra $t9,$a0,0x10 /* f0be188: 03202025 */ move $a0,$t9 -/* f0be18c: 0c002e39 */ jal 0xb8e4 +/* f0be18c: 0c002e39 */ jal viSetBuf /* f0be190: 01202825 */ move $a1,$t1 -/* f0be194: 0fc2ee63 */ jal 0xf0bb98c +/* f0be194: 0fc2ee63 */ jal currentPlayerUpdateColourScreenProperties /* f0be198: 00000000 */ nop -/* f0be19c: 0fc2eed3 */ jal 0xf0bbb4c +/* f0be19c: 0fc2eed3 */ jal currentPlayerTickChrFade /* f0be1a0: 00000000 */ nop /* f0be1a4: 8e6a0288 */ lw $t2,0x288($s3) -/* f0be1a8: 0fc54d15 */ jal 0xf153454 +/* f0be1a8: 0fc54d15 */ jal optionsGetAutoAim /* f0be1ac: 8d440070 */ lw $a0,0x70($t2) -/* f0be1b0: 0fc31fec */ jal 0xf0c7fb0 +/* f0be1b0: 0fc31fec */ jal bmoveSetAutoAimY /* f0be1b4: 00402025 */ move $a0,$v0 /* f0be1b8: 8e6b0288 */ lw $t3,0x288($s3) -/* f0be1bc: 0fc54d15 */ jal 0xf153454 +/* f0be1bc: 0fc54d15 */ jal optionsGetAutoAim /* f0be1c0: 8d640070 */ lw $a0,0x70($t3) -/* f0be1c4: 0fc3203d */ jal 0xf0c80f4 +/* f0be1c4: 0fc3203d */ jal bmoveSetAutoAimX /* f0be1c8: 00402025 */ move $a0,$v0 /* f0be1cc: 8e6c0288 */ lw $t4,0x288($s3) -/* f0be1d0: 0fc54d1e */ jal 0xf153478 +/* f0be1d0: 0fc54d1e */ jal optionsGetLookAhead /* f0be1d4: 8d840070 */ lw $a0,0x70($t4) -/* f0be1d8: 0fc31fe4 */ jal 0xf0c7f90 +/* f0be1d8: 0fc31fe4 */ jal bmoveSetAutoMoveCentreEnabled /* f0be1dc: 00402025 */ move $a0,$v0 /* f0be1e0: 8e6d0288 */ lw $t5,0x288($s3) -/* f0be1e4: 0fc54d39 */ jal 0xf1534e4 +/* f0be1e4: 0fc54d39 */ jal optionsGetAmmoOnScreen /* f0be1e8: 8da40070 */ lw $a0,0x70($t5) /* f0be1ec: 02a02025 */ move $a0,$s5 -/* f0be1f0: 0fc2a68e */ jal 0xf0a9a38 +/* f0be1f0: 0fc2a68e */ jal func0f0a95ec /* f0be1f4: 00402825 */ move $a1,$v0 /* f0be1f8: 02a02025 */ move $a0,$s5 -/* f0be1fc: 0fc2b04c */ jal 0xf0ac130 +/* f0be1fc: 0fc2b04c */ jal currentPlayerSetGunSightVisible /* f0be200: 24050001 */ li $a1,0x1 /* f0be204: 8e6302ac */ lw $v1,0x2ac($s3) /* f0be208: 10600002 */ beqz $v1,.PF0f0be214 @@ -5354,12 +5354,12 @@ glabel var7f1ad6ac /* f0be254: 11800004 */ beqz $t4,.PF0f0be268 /* f0be258: 00000000 */ nop /* f0be25c: 8e64028c */ lw $a0,0x28c($s3) -/* f0be260: 0fc3065c */ jal 0xf0c1970 +/* f0be260: 0fc3065c */ jal currentPlayerDieByShooter /* f0be264: 24050001 */ li $a1,0x1 .PF0f0be268: -/* f0be268: 0fc2ef5d */ jal 0xf0bbd74 +/* f0be268: 0fc2ef5d */ jal func0f0bb814 /* f0be26c: 00000000 */ nop -/* f0be270: 0fc2f1a0 */ jal 0xf0bc680 +/* f0be270: 0fc2f1a0 */ jal currentPlayerTickExplode /* f0be274: 00000000 */ nop /* f0be278: 8e700284 */ lw $s0,0x284($s3) /* f0be27c: 8e020480 */ lw $v0,0x480($s0) @@ -5376,7 +5376,7 @@ glabel var7f1ad6ac /* f0be2a8: 8c910004 */ lw $s1,0x4($a0) /* f0be2ac: a2400035 */ sb $zero,0x35($s2) /* f0be2b0: a2550034 */ sb $s5,0x34($s2) -/* f0be2b4: 0fc2496f */ jal 0xf0925bc +/* f0be2b4: 0fc2496f */ jal func0f0926bc /* f0be2b8: a2400037 */ sb $zero,0x37($s2) /* f0be2bc: 8e2e0018 */ lw $t6,0x18($s1) /* f0be2c0: 2401fffb */ li $at,-5 @@ -5397,14 +5397,14 @@ glabel var7f1ad6ac /* f0be2f8: 51800022 */ beqzl $t4,.PF0f0be384 /* f0be2fc: 8e6b0034 */ lw $t3,0x34($s3) /* f0be300: 8e6d0288 */ lw $t5,0x288($s3) -/* f0be304: 0fc54cfe */ jal 0xf1533f8 +/* f0be304: 0fc54cfe */ jal optionsGetContpadNum1 /* f0be308: 8da40070 */ lw $a0,0x70($t5) /* f0be30c: 8faf0330 */ lw $t7,0x330($sp) /* f0be310: 00022600 */ sll $a0,$v0,0x18 /* f0be314: 00047603 */ sra $t6,$a0,0x18 /* f0be318: 11e00005 */ beqz $t7,.PF0f0be330 /* f0be31c: 01c02025 */ move $a0,$t6 -/* f0be320: 0c00533a */ jal 0x14ce8 +/* f0be320: 0c00533a */ jal contGetButtons /* f0be324: 3405ffff */ li $a1,0xffff /* f0be328: 10000002 */ b .PF0f0be334 /* f0be32c: 3043ffff */ andi $v1,$v0,0xffff @@ -5424,18 +5424,18 @@ glabel var7f1ad6ac /* f0be35c: 8e6a0314 */ lw $t2,0x314($s3) /* f0be360: 15400005 */ bnez $t2,.PF0f0be378 /* f0be364: 00000000 */ nop -/* f0be368: 0fc2ed1b */ jal 0xf0bb46c +/* f0be368: 0fc2ed1b */ jal currentPlayerPause /* f0be36c: 24040002 */ li $a0,0x2 /* f0be370: 10000004 */ b .PF0f0be384 /* f0be374: 8e6b0034 */ lw $t3,0x34($s3) .PF0f0be378: -/* f0be378: 0fc5e780 */ jal 0xf179e00 +/* f0be378: 0fc5e780 */ jal mpPushPauseDialog /* f0be37c: 00000000 */ nop /* f0be380: 8e6b0034 */ lw $t3,0x34($s3) .PF0f0be384: /* f0be384: 5160001d */ beqzl $t3,.PF0f0be3fc /* f0be388: 924d0035 */ lbu $t5,0x35($s2) -/* f0be38c: 0fc343b2 */ jal 0xf0d0ec8 +/* f0be38c: 0fc343b2 */ jal eyespyProcessInput /* f0be390: 8fa40330 */ lw $a0,0x330($sp) /* f0be394: 10000019 */ b .PF0f0be3fc /* f0be398: 924d0035 */ lbu $t5,0x35($s2) @@ -5452,7 +5452,7 @@ glabel var7f1ad6ac /* f0be3c0: 8d290a30 */ lw $t1,0xa30($t1) /* f0be3c4: 5120000d */ beqzl $t1,.PF0f0be3fc /* f0be3c8: 924d0035 */ lbu $t5,0x35($s2) -/* f0be3cc: 0fc3422c */ jal 0xf0d08b0 +/* f0be3cc: 0fc3422c */ jal eyespyTryLaunch /* f0be3d0: 00000000 */ nop /* f0be3d4: 54400009 */ bnezl $v0,.PF0f0be3fc /* f0be3d8: 924d0035 */ lbu $t5,0x35($s2) @@ -5507,25 +5507,25 @@ glabel var7f1ad6ac /* f0be494: 240580ab */ li $a1,-32597 /* f0be498: 00003025 */ move $a2,$zero /* f0be49c: 2407ffff */ li $a3,-1 -/* f0be4a0: 0c0041a0 */ jal 0x10680 +/* f0be4a0: 0c0041a0 */ jal audioStart /* f0be4a4: e7a80014 */ swc1 $f8,0x14($sp) /* f0be4a8: 8e700284 */ lw $s0,0x284($s3) .PF0f0be4ac: /* f0be4ac: 2411ffdf */ li $s1,-33 /* f0be4b0: a611024c */ sh $s1,0x24c($s0) .PF0f0be4b4: -/* f0be4b4: 0fc5b6f7 */ jal 0xf16dbdc +/* f0be4b4: 0fc5b6f7 */ jal coreIsPaused /* f0be4b8: 2411ffdf */ li $s1,-33 /* f0be4bc: 50400004 */ beqzl $v0,.PF0f0be4d0 /* f0be4c0: 8e700284 */ lw $s0,0x284($s3) -/* f0be4c4: 0fc2ec90 */ jal 0xf0bb240 +/* f0be4c4: 0fc2ec90 */ jal func0f0bace0 /* f0be4c8: 00000000 */ nop /* f0be4cc: 8e700284 */ lw $s0,0x284($s3) .PF0f0be4d0: /* f0be4d0: 8e0b1a24 */ lw $t3,0x1a24($s0) /* f0be4d4: 51600005 */ beqzl $t3,.PF0f0be4ec /* f0be4d8: 960d0010 */ lhu $t5,0x10($s0) -/* f0be4dc: 0fc2ecb3 */ jal 0xf0bb2cc +/* f0be4dc: 0fc2ecb3 */ jal currentPlayerTickPauseMenu /* f0be4e0: 00000000 */ nop /* f0be4e4: 8e700284 */ lw $s0,0x284($s3) /* f0be4e8: 960d0010 */ lhu $t5,0x10($s0) @@ -5554,7 +5554,7 @@ glabel var7f1ad6ac /* f0be534: 24010006 */ li $at,0x6 /* f0be538: 54610054 */ bnel $v1,$at,.PF0f0be68c /* f0be53c: 8e700284 */ lw $s0,0x284($s3) -/* f0be540: 0fc2e430 */ jal 0xf0b90c0 +/* f0be540: 0fc2e430 */ jal func0f0b8ba0 /* f0be544: 00000000 */ nop /* f0be548: 8e700284 */ lw $s0,0x284($s3) /* f0be54c: 00002025 */ move $a0,$zero @@ -5564,9 +5564,9 @@ glabel var7f1ad6ac /* f0be55c: 24070001 */ li $a3,0x1 /* f0be560: 53200008 */ beqzl $t9,.PF0f0be584 /* f0be564: 8e6a006c */ lw $t2,0x6c($s3) -/* f0be568: 0fc3307a */ jal 0xf0cc1e8 +/* f0be568: 0fc3307a */ jal bmoveTick /* f0be56c: a611024c */ sh $s1,0x24c($s0) -/* f0be570: 0fc2e9f6 */ jal 0xf0ba7d8 +/* f0be570: 0fc2e9f6 */ jal func0f0ba29c /* f0be574: 8fa40330 */ lw $a0,0x330($sp) /* f0be578: 8e690284 */ lw $t1,0x284($s3) /* f0be57c: a531024c */ sh $s1,0x24c($t1) @@ -5664,9 +5664,9 @@ glabel var7f1ad6ac /* f0be6bc: 51800024 */ beqzl $t4,.PF0f0be750 /* f0be6c0: 920d1bfc */ lbu $t5,0x1bfc($s0) /* f0be6c4: 4481a000 */ mtc1 $at,$f20 -/* f0be6c8: 0fc4a569 */ jal 0xf1295a4 +/* f0be6c8: 0fc4a569 */ jal currentPlayerSetFovY /* f0be6cc: 4600a306 */ mov.s $f12,$f20 -/* f0be6d0: 0c002e9d */ jal 0xba74 +/* f0be6d0: 0c002e9d */ jal viSetFovY /* f0be6d4: 4600a306 */ mov.s $f12,$f20 /* f0be6d8: 8e700284 */ lw $s0,0x284($s3) /* f0be6dc: 8e180480 */ lw $t8,0x480($s0) @@ -5680,20 +5680,20 @@ glabel var7f1ad6ac /* f0be6fc: 8e190480 */ lw $t9,0x480($s0) /* f0be700: 8f2a0000 */ lw $t2,0x0($t9) /* f0be704: c5440010 */ lwc1 $f4,0x10($t2) -/* f0be708: 0fc2e430 */ jal 0xf0b90c0 +/* f0be708: 0fc2e430 */ jal func0f0b8ba0 /* f0be70c: e7a40310 */ swc1 $f4,0x310($sp) /* f0be710: 00002025 */ move $a0,$zero /* f0be714: 00002825 */ move $a1,$zero /* f0be718: 00003025 */ move $a2,$zero -/* f0be71c: 0fc3307a */ jal 0xf0cc1e8 +/* f0be71c: 0fc3307a */ jal bmoveTick /* f0be720: 24070001 */ li $a3,0x1 -/* f0be724: 0fc30767 */ jal 0xf0c1d9c +/* f0be724: 0fc30767 */ jal currentPlayerSetCameraMode /* f0be728: 24040002 */ li $a0,0x2 /* f0be72c: 8e6b0284 */ lw $t3,0x284($s3) /* f0be730: 27a40308 */ addiu $a0,$sp,0x308 /* f0be734: 8d620480 */ lw $v0,0x480($t3) /* f0be738: 24450010 */ addiu $a1,$v0,0x10 -/* f0be73c: 0fc30851 */ jal 0xf0c2144 +/* f0be73c: 0fc30851 */ jal func0f0c1bd8 /* f0be740: 24460004 */ addiu $a2,$v0,0x4 /* f0be744: 100005d6 */ b .PF0f0bfea0 /* f0be748: 8e700284 */ lw $s0,0x284($s3) @@ -5702,7 +5702,7 @@ glabel var7f1ad6ac /* f0be750: 24020003 */ li $v0,0x3 /* f0be754: 544d0011 */ bnel $v0,$t5,.PF0f0be79c /* f0be758: 960e0010 */ lhu $t6,0x10($s0) -/* f0be75c: 0fc2e430 */ jal 0xf0b90c0 +/* f0be75c: 0fc2e430 */ jal func0f0b8ba0 /* f0be760: 00000000 */ nop /* f0be764: 8e6c0284 */ lw $t4,0x284($s3) /* f0be768: 3c01800a */ lui $at,0x800a @@ -5711,9 +5711,9 @@ glabel var7f1ad6ac /* f0be774: 00002825 */ move $a1,$zero /* f0be778: 00003025 */ move $a2,$zero /* f0be77c: 24070001 */ li $a3,0x1 -/* f0be780: 0fc3307a */ jal 0xf0cc1e8 +/* f0be780: 0fc3307a */ jal bmoveTick /* f0be784: a438e358 */ sh $t8,-0x1ca8($at) -/* f0be788: 0fc2e877 */ jal 0xf0ba1dc +/* f0be788: 0fc2e877 */ jal func0f0b9cbc /* f0be78c: 00000000 */ nop /* f0be790: 100005c3 */ b .PF0f0bfea0 /* f0be794: 8e700284 */ lw $s0,0x284($s3) @@ -5750,16 +5750,16 @@ glabel var7f1ad6ac /* f0be80c: 24040001 */ li $a0,0x1 /* f0be810: adc10008 */ sw $at,0x8($t6) /* f0be814: afa002e0 */ sw $zero,0x2e0($sp) -/* f0be818: 0fc30767 */ jal 0xf0c1d9c +/* f0be818: 0fc30767 */ jal currentPlayerSetCameraMode /* f0be81c: 8e110264 */ lw $s1,0x264($s0) -/* f0be820: 0fc2e430 */ jal 0xf0b90c0 +/* f0be820: 0fc2e430 */ jal func0f0b8ba0 /* f0be824: 00000000 */ nop /* f0be828: 00002025 */ move $a0,$zero /* f0be82c: 00002825 */ move $a1,$zero /* f0be830: 00003025 */ move $a2,$zero -/* f0be834: 0fc3307a */ jal 0xf0cc1e8 +/* f0be834: 0fc3307a */ jal bmoveTick /* f0be838: 24070001 */ li $a3,0x1 -/* f0be83c: 0fc2f650 */ jal 0xf0bd940 +/* f0be83c: 0fc2f650 */ jal func0f0bd3c4 /* f0be840: 00000000 */ nop /* f0be844: 522001fc */ beqzl $s1,.PF0f0bf038 /* f0be848: 8fa902e0 */ lw $t1,0x2e0($sp) @@ -5774,7 +5774,7 @@ glabel var7f1ad6ac /* f0be86c: 460e7202 */ mul.s $f8,$f14,$f14 /* f0be870: 46083280 */ add.s $f10,$f6,$f8 /* f0be874: 46000482 */ mul.s $f18,$f0,$f0 -/* f0be878: 0c0127b4 */ jal 0x49ed0 +/* f0be878: 0c0127b4 */ jal sqrtf /* f0be87c: 460a9300 */ add.s $f12,$f18,$f10 /* f0be880: e7a002a8 */ swc1 $f0,0x2a8($sp) /* f0be884: c624001c */ lwc1 $f4,0x1c($s1) @@ -5819,7 +5819,7 @@ glabel var7f1ad6ac /* f0be920: 8e2d0014 */ lw $t5,0x14($s1) /* f0be924: c5a40010 */ lwc1 $f4,0x10($t5) /* f0be928: afb80010 */ sw $t8,0x10($sp) -/* f0be92c: 0fc58c45 */ jal 0xf163114 +/* f0be92c: 0fc58c45 */ jal func0f162194 /* f0be930: e7a40304 */ swc1 $f4,0x304($sp) /* f0be934: 87af027c */ lh $t7,0x27c($sp) /* f0be938: 2401ffff */ li $at,-1 @@ -5857,10 +5857,10 @@ glabel var7f1ad6ac /* f0be9b0: 00000000 */ nop /* f0be9b4: ae0000c8 */ sw $zero,0xc8($s0) .PF0f0be9b8: -/* f0be9b8: 0c0057e6 */ jal 0x15f98 +/* f0be9b8: 0c0057e6 */ jal func00016208 /* f0be9bc: 27a502f0 */ addiu $a1,$sp,0x2f0 /* f0be9c0: 27a402b8 */ addiu $a0,$sp,0x2b8 -/* f0be9c4: 0c0057e6 */ jal 0x15f98 +/* f0be9c4: 0c0057e6 */ jal func00016208 /* f0be9c8: 27a502e4 */ addiu $a1,$sp,0x2e4 /* f0be9cc: 8e2f0040 */ lw $t7,0x40($s1) /* f0be9d0: 31ee0080 */ andi $t6,$t7,0x80 @@ -5868,17 +5868,17 @@ glabel var7f1ad6ac /* f0be9d8: 8fa902e0 */ lw $t1,0x2e0($sp) /* f0be9dc: 8e790288 */ lw $t9,0x288($s3) /* f0be9e0: 8e340048 */ lw $s4,0x48($s1) -/* f0be9e4: 0fc54cf0 */ jal 0xf1533c0 +/* f0be9e4: 0fc54cf0 */ jal optionsGetControlMode /* f0be9e8: 8f240070 */ lw $a0,0x70($t9) /* f0be9ec: 8e690288 */ lw $t1,0x288($s3) /* f0be9f0: 00408025 */ move $s0,$v0 -/* f0be9f4: 0fc54cfe */ jal 0xf1533f8 +/* f0be9f4: 0fc54cfe */ jal optionsGetContpadNum1 /* f0be9f8: 8d240070 */ lw $a0,0x70($t1) /* f0be9fc: 8e6c0288 */ lw $t4,0x288($s3) /* f0bea00: 00029600 */ sll $s2,$v0,0x18 /* f0bea04: 00125603 */ sra $t2,$s2,0x18 /* f0bea08: 01409025 */ move $s2,$t2 -/* f0bea0c: 0fc54d05 */ jal 0xf153414 +/* f0bea0c: 0fc54d05 */ jal optionsGetContpadNum2 /* f0bea10: 8d840070 */ lw $a0,0x70($t4) /* f0bea14: 0002ae00 */ sll $s5,$v0,0x18 /* f0bea18: 00155e03 */ sra $t3,$s5,0x18 @@ -5915,19 +5915,19 @@ glabel var7f1ad6ac .PF0f0bea90: /* f0bea90: 00047603 */ sra $t6,$a0,0x18 /* f0bea94: 01c02025 */ move $a0,$t6 -/* f0bea98: 0c00533a */ jal 0x14ce8 +/* f0bea98: 0c00533a */ jal contGetButtons /* f0bea9c: 3405c000 */ li $a1,0xc000 /* f0beaa0: 1440000c */ bnez $v0,.PF0f0bead4 /* f0beaa4: 00152600 */ sll $a0,$s5,0x18 /* f0beaa8: 0004ce03 */ sra $t9,$a0,0x18 /* f0beaac: 03202025 */ move $a0,$t9 -/* f0beab0: 0c00533a */ jal 0x14ce8 +/* f0beab0: 0c00533a */ jal contGetButtons /* f0beab4: 3405c000 */ li $a1,0xc000 /* f0beab8: 14400006 */ bnez $v0,.PF0f0bead4 /* f0beabc: 00152600 */ sll $a0,$s5,0x18 /* f0beac0: 00044e03 */ sra $t1,$a0,0x18 /* f0beac4: 01202025 */ move $a0,$t1 -/* f0beac8: 0c00533a */ jal 0x14ce8 +/* f0beac8: 0c00533a */ jal contGetButtons /* f0beacc: 24052000 */ li $a1,0x2000 /* f0bead0: 10400002 */ beqz $v0,.PF0f0beadc .PF0f0bead4: @@ -5937,7 +5937,7 @@ glabel var7f1ad6ac /* f0beadc: 00122600 */ sll $a0,$s2,0x18 /* f0beae0: 00046603 */ sra $t4,$a0,0x18 /* f0beae4: 01802025 */ move $a0,$t4 -/* f0beae8: 0c00536a */ jal 0x14da8 +/* f0beae8: 0c00536a */ jal contGetButtonsPressedThisFrame /* f0beaec: 24052000 */ li $a1,0x2000 /* f0beaf0: 1040001e */ beqz $v0,.PF0f0beb6c /* f0beaf4: 240b0001 */ li $t3,0x1 @@ -5946,19 +5946,19 @@ glabel var7f1ad6ac .PF0f0beb00: /* f0beb00: 00122600 */ sll $a0,$s2,0x18 /* f0beb04: 00046e03 */ sra $t5,$a0,0x18 -/* f0beb08: 0c00533a */ jal 0x14ce8 +/* f0beb08: 0c00533a */ jal contGetButtons /* f0beb0c: 01a02025 */ move $a0,$t5 /* f0beb10: 1440000c */ bnez $v0,.PF0f0beb44 /* f0beb14: 00152600 */ sll $a0,$s5,0x18 /* f0beb18: 0004c603 */ sra $t8,$a0,0x18 /* f0beb1c: 03002025 */ move $a0,$t8 -/* f0beb20: 0c00533a */ jal 0x14ce8 +/* f0beb20: 0c00533a */ jal contGetButtons /* f0beb24: 3405c000 */ li $a1,0xc000 /* f0beb28: 14400006 */ bnez $v0,.PF0f0beb44 /* f0beb2c: 00122600 */ sll $a0,$s2,0x18 /* f0beb30: 00047e03 */ sra $t7,$a0,0x18 /* f0beb34: 01e02025 */ move $a0,$t7 -/* f0beb38: 0c00533a */ jal 0x14ce8 +/* f0beb38: 0c00533a */ jal contGetButtons /* f0beb3c: 24052000 */ li $a1,0x2000 /* f0beb40: 10400002 */ beqz $v0,.PF0f0beb4c .PF0f0beb44: @@ -5968,7 +5968,7 @@ glabel var7f1ad6ac /* f0beb4c: 00152600 */ sll $a0,$s5,0x18 /* f0beb50: 0004ce03 */ sra $t9,$a0,0x18 /* f0beb54: 03202025 */ move $a0,$t9 -/* f0beb58: 0c00536a */ jal 0x14da8 +/* f0beb58: 0c00536a */ jal contGetButtonsPressedThisFrame /* f0beb5c: 24052000 */ li $a1,0x2000 /* f0beb60: 10400002 */ beqz $v0,.PF0f0beb6c /* f0beb64: 24090001 */ li $t1,0x1 @@ -5976,12 +5976,12 @@ glabel var7f1ad6ac .PF0f0beb6c: /* f0beb6c: 00122600 */ sll $a0,$s2,0x18 /* f0beb70: 00045603 */ sra $t2,$a0,0x18 -/* f0beb74: 0c0052e6 */ jal 0x14b98 +/* f0beb74: 0c0052e6 */ jal contGetStickX /* f0beb78: 01402025 */ move $a0,$t2 /* f0beb7c: 00122600 */ sll $a0,$s2,0x18 /* f0beb80: 00046603 */ sra $t4,$a0,0x18 /* f0beb84: a3a2023d */ sb $v0,0x23d($sp) -/* f0beb88: 0c005310 */ jal 0x14c40 +/* f0beb88: 0c005310 */ jal contGetStickY /* f0beb8c: 01802025 */ move $a0,$t4 /* f0beb90: 10000002 */ b .PF0f0beb9c /* f0beb94: a3a2023c */ sb $v0,0x23c($sp) @@ -5990,13 +5990,13 @@ glabel var7f1ad6ac /* f0beb9c: 00122600 */ sll $a0,$s2,0x18 /* f0beba0: 00046e03 */ sra $t5,$a0,0x18 /* f0beba4: 01a02025 */ move $a0,$t5 -/* f0beba8: 0c00533a */ jal 0x14ce8 +/* f0beba8: 0c00533a */ jal contGetButtons /* f0bebac: 24051000 */ li $a1,0x1000 /* f0bebb0: 14400006 */ bnez $v0,.PF0f0bebcc /* f0bebb4: 00152600 */ sll $a0,$s5,0x18 /* f0bebb8: 0004c603 */ sra $t8,$a0,0x18 /* f0bebbc: 03002025 */ move $a0,$t8 -/* f0bebc0: 0c00533a */ jal 0x14ce8 +/* f0bebc0: 0c00533a */ jal contGetButtons /* f0bebc4: 24051000 */ li $a1,0x1000 /* f0bebc8: 10400044 */ beqz $v0,.PF0f0becdc .PF0f0bebcc: @@ -6021,7 +6021,7 @@ glabel var7f1ad6ac .PF0f0bec10: /* f0bec10: 00045603 */ sra $t2,$a0,0x18 /* f0bec14: 01402025 */ move $a0,$t2 -/* f0bec18: 0c00536a */ jal 0x14da8 +/* f0bec18: 0c00536a */ jal contGetButtonsPressedThisFrame /* f0bec1c: 34058000 */ li $a1,0x8000 /* f0bec20: 10400003 */ beqz $v0,.PF0f0bec30 /* f0bec24: 00122600 */ sll $a0,$s2,0x18 @@ -6030,7 +6030,7 @@ glabel var7f1ad6ac .PF0f0bec30: /* f0bec30: 00045e03 */ sra $t3,$a0,0x18 /* f0bec34: 01602025 */ move $a0,$t3 -/* f0bec38: 0c00533a */ jal 0x14ce8 +/* f0bec38: 0c00533a */ jal contGetButtons /* f0bec3c: 24056030 */ li $a1,0x6030 /* f0bec40: 10400012 */ beqz $v0,.PF0f0bec8c /* f0bec44: 240d0001 */ li $t5,0x1 @@ -6039,7 +6039,7 @@ glabel var7f1ad6ac .PF0f0bec50: /* f0bec50: 00122600 */ sll $a0,$s2,0x18 /* f0bec54: 0004c603 */ sra $t8,$a0,0x18 -/* f0bec58: 0c00536a */ jal 0x14da8 +/* f0bec58: 0c00536a */ jal contGetButtonsPressedThisFrame /* f0bec5c: 03002025 */ move $a0,$t8 /* f0bec60: 10400003 */ beqz $v0,.PF0f0bec70 /* f0bec64: 00122600 */ sll $a0,$s2,0x18 @@ -6048,7 +6048,7 @@ glabel var7f1ad6ac .PF0f0bec70: /* f0bec70: 00047603 */ sra $t6,$a0,0x18 /* f0bec74: 01c02025 */ move $a0,$t6 -/* f0bec78: 0c00533a */ jal 0x14ce8 +/* f0bec78: 0c00533a */ jal contGetButtons /* f0bec7c: 3405c030 */ li $a1,0xc030 /* f0bec80: 10400002 */ beqz $v0,.PF0f0bec8c /* f0bec84: 24190001 */ li $t9,0x1 @@ -6056,12 +6056,12 @@ glabel var7f1ad6ac .PF0f0bec8c: /* f0bec8c: 00122600 */ sll $a0,$s2,0x18 /* f0bec90: 00044e03 */ sra $t1,$a0,0x18 -/* f0bec94: 0c0052e6 */ jal 0x14b98 +/* f0bec94: 0c0052e6 */ jal contGetStickX /* f0bec98: 01202025 */ move $a0,$t1 /* f0bec9c: 00122600 */ sll $a0,$s2,0x18 /* f0beca0: 00045603 */ sra $t2,$a0,0x18 /* f0beca4: a3a2023d */ sb $v0,0x23d($sp) -/* f0beca8: 0c005310 */ jal 0x14c40 +/* f0beca8: 0c005310 */ jal contGetStickY /* f0becac: 01402025 */ move $a0,$t2 /* f0becb0: 10000002 */ b .PF0f0becbc /* f0becb4: a3a2023c */ sb $v0,0x23c($sp) @@ -6070,7 +6070,7 @@ glabel var7f1ad6ac /* f0becbc: 00122600 */ sll $a0,$s2,0x18 /* f0becc0: 00045e03 */ sra $t3,$a0,0x18 /* f0becc4: 01602025 */ move $a0,$t3 -/* f0becc8: 0c00533a */ jal 0x14ce8 +/* f0becc8: 0c00533a */ jal contGetButtons /* f0beccc: 24051000 */ li $a1,0x1000 /* f0becd0: 10400002 */ beqz $v0,.PF0f0becdc /* f0becd4: 240d0001 */ li $t5,0x1 @@ -6082,12 +6082,12 @@ glabel var7f1ad6ac /* f0bece8: 8e6f0314 */ lw $t7,0x314($s3) /* f0becec: 15e00005 */ bnez $t7,.PF0f0bed04 /* f0becf0: 00000000 */ nop -/* f0becf4: 0fc2ed1b */ jal 0xf0bb46c +/* f0becf4: 0fc2ed1b */ jal currentPlayerPause /* f0becf8: 24040002 */ li $a0,0x2 /* f0becfc: 10000004 */ b .PF0f0bed10 /* f0bed00: 83b9023c */ lb $t9,0x23c($sp) .PF0f0bed04: -/* f0bed04: 0fc5e780 */ jal 0xf179e00 +/* f0bed04: 0fc5e780 */ jal mpPushPauseDialog /* f0bed08: 00000000 */ nop /* f0bed0c: 83b9023c */ lb $t9,0x23c($sp) .PF0f0bed10: @@ -6117,7 +6117,7 @@ glabel var7f1ad6ac /* f0bed6c: 00000000 */ nop /* f0bed70: 46021282 */ mul.s $f10,$f2,$f2 /* f0bed74: e7a80174 */ swc1 $f8,0x174($sp) -/* f0bed78: 0c0127b4 */ jal 0x49ed0 +/* f0bed78: 0c0127b4 */ jal sqrtf /* f0bed7c: 460a9300 */ add.s $f12,$f18,$f10 /* f0bed80: c7a202ac */ lwc1 $f2,0x2ac($sp) /* f0bed84: c7ae02b4 */ lwc1 $f14,0x2b4($sp) @@ -6125,10 +6125,10 @@ glabel var7f1ad6ac /* f0bed8c: 46001083 */ div.s $f2,$f2,$f0 /* f0bed90: 46007383 */ div.s $f14,$f14,$f0 /* f0bed94: e7a202ac */ swc1 $f2,0x2ac($sp) -/* f0bed98: 0c00685b */ jal 0x1a16c +/* f0bed98: 0c00685b */ jal sinf /* f0bed9c: e7ae02b4 */ swc1 $f14,0x2b4($sp) /* f0beda0: 46000506 */ mov.s $f20,$f0 -/* f0beda4: 0c006858 */ jal 0x1a160 +/* f0beda4: 0c006858 */ jal cosf /* f0beda8: 4600b306 */ mov.s $f12,$f22 /* f0bedac: c7a202ac */ lwc1 $f2,0x2ac($sp) /* f0bedb0: c7ae02b4 */ lwc1 $f14,0x2b4($sp) @@ -6139,10 +6139,10 @@ glabel var7f1ad6ac /* f0bedc4: 46147202 */ mul.s $f8,$f14,$f20 /* f0bedc8: e7a60154 */ swc1 $f6,0x154($sp) /* f0bedcc: e7a40150 */ swc1 $f4,0x150($sp) -/* f0bedd0: 0c00685b */ jal 0x1a16c +/* f0bedd0: 0c00685b */ jal sinf /* f0bedd4: e7a80158 */ swc1 $f8,0x158($sp) /* f0bedd8: 46000506 */ mov.s $f20,$f0 -/* f0beddc: 0c006858 */ jal 0x1a160 +/* f0beddc: 0c006858 */ jal cosf /* f0bede0: c7ac0174 */ lwc1 $f12,0x174($sp) /* f0bede4: 44801000 */ mtc1 $zero,$f2 /* f0bede8: c7b202c8 */ lwc1 $f18,0x2c8($sp) @@ -6160,14 +6160,14 @@ glabel var7f1ad6ac /* f0bee14: 4600a287 */ neg.s $f10,$f20 /* f0bee18: e7aa0164 */ swc1 $f10,0x164($sp) .PF0f0bee1c: -/* f0bee1c: 0fc25d96 */ jal 0xf097658 +/* f0bee1c: 0fc25d96 */ jal func0f097738 /* f0bee20: e7a20168 */ swc1 $f2,0x168($sp) /* f0bee24: 27b001fc */ addiu $s0,$sp,0x1fc /* f0bee28: 02002825 */ move $a1,$s0 -/* f0bee2c: 0fc25b7d */ jal 0xf096df4 +/* f0bee2c: 0fc25b7d */ jal func0f096ed4 /* f0bee30: 02a02025 */ move $a0,$s5 /* f0bee34: 02002025 */ move $a0,$s0 -/* f0bee38: 0c005628 */ jal 0x158a0 +/* f0bee38: 0c005628 */ jal func00015b10 /* f0bee3c: 26850004 */ addiu $a1,$s4,0x4 /* f0bee40: 8e8b0000 */ lw $t3,0x0($s4) /* f0bee44: 44808000 */ mtc1 $zero,$f16 @@ -6195,7 +6195,7 @@ glabel var7f1ad6ac /* f0bee94: 460e7182 */ mul.s $f6,$f14,$f14 /* f0bee98: 46062200 */ add.s $f8,$f4,$f6 /* f0bee9c: 46000482 */ mul.s $f18,$f0,$f0 -/* f0beea0: 0c0127b4 */ jal 0x49ed0 +/* f0beea0: 0c0127b4 */ jal sqrtf /* f0beea4: 46089300 */ add.s $f12,$f18,$f8 /* f0beea8: 8fb90114 */ lw $t9,0x114($sp) /* f0beeac: 46000386 */ mov.s $f14,$f0 @@ -6255,23 +6255,23 @@ glabel var7f1ad6ac /* f0bef70: 46023482 */ mul.s $f18,$f6,$f2 /* f0bef74: 460e9203 */ div.s $f8,$f18,$f14 /* f0bef78: e6840008 */ swc1 $f4,0x8($s4) -/* f0bef7c: 0c0056b9 */ jal 0x15ae4 +/* f0bef7c: 0c0056b9 */ jal func00015d54 /* f0bef80: e688000c */ swc1 $f8,0xc($s4) /* f0bef84: 27b2012c */ addiu $s2,$sp,0x12c /* f0bef88: 02402825 */ move $a1,$s2 -/* f0bef8c: 0fc25bd9 */ jal 0xf096f64 +/* f0bef8c: 0fc25bd9 */ jal func0f097044 /* f0bef90: 02002025 */ move $a0,$s0 /* f0bef94: 27b0011c */ addiu $s0,$sp,0x11c /* f0bef98: 02003025 */ move $a2,$s0 /* f0bef9c: 02a02025 */ move $a0,$s5 -/* f0befa0: 0fc25d96 */ jal 0xf097658 +/* f0befa0: 0fc25d96 */ jal func0f097738 /* f0befa4: 02402825 */ move $a1,$s2 /* f0befa8: 27b2017c */ addiu $s2,$sp,0x17c /* f0befac: 02402825 */ move $a1,$s2 -/* f0befb0: 0fc25b7d */ jal 0xf096df4 +/* f0befb0: 0fc25b7d */ jal func0f096ed4 /* f0befb4: 02002025 */ move $a0,$s0 /* f0befb8: 02402025 */ move $a0,$s2 -/* f0befbc: 0c0056cc */ jal 0x15b30 +/* f0befbc: 0c0056cc */ jal func00015da0 /* f0befc0: 27a502b8 */ addiu $a1,$sp,0x2b8 /* f0befc4: c7a002a8 */ lwc1 $f0,0x2a8($sp) /* f0befc8: c7aa02b8 */ lwc1 $f10,0x2b8($sp) @@ -6324,13 +6324,13 @@ glabel var7f1ad6ac /* f0bf07c: afaf0010 */ sw $t7,0x10($sp) /* f0bf080: 27a402fc */ addiu $a0,$sp,0x2fc /* f0bf084: 27a502e4 */ addiu $a1,$sp,0x2e4 -/* f0bf088: 0fc3076b */ jal 0xf0c1dac +/* f0bf088: 0fc3076b */ jal func0f0c1840 /* f0bf08c: 27a602f0 */ addiu $a2,$sp,0x2f0 /* f0bf090: 10000004 */ b .PF0f0bf0a4 /* f0bf094: 00000000 */ nop .PF0f0bf098: /* f0bf098: 00003825 */ move $a3,$zero -/* f0bf09c: 0fc3076b */ jal 0xf0c1dac +/* f0bf09c: 0fc3076b */ jal func0f0c1840 /* f0bf0a0: afa00010 */ sw $zero,0x10($sp) .PF0f0bf0a4: /* f0bf0a4: 1000037e */ b .PF0f0bfea0 @@ -6339,7 +6339,7 @@ glabel var7f1ad6ac /* f0bf0ac: 24010001 */ li $at,0x1 /* f0bf0b0: 14610261 */ bne $v1,$at,.PF0f0bfa38 /* f0bf0b4: 00000000 */ nop -/* f0bf0b8: 0fc2e696 */ jal 0xf0b9a58 +/* f0bf0b8: 0fc2e696 */ jal func0f0b9538 /* f0bf0bc: 00000000 */ nop /* f0bf0c0: 8e6e028c */ lw $t6,0x28c($s3) /* f0bf0c4: 3c098007 */ lui $t1,0x8007 @@ -6353,17 +6353,17 @@ glabel var7f1ad6ac /* f0bf0e4: 00003025 */ move $a2,$zero /* f0bf0e8: 24040001 */ li $a0,0x1 /* f0bf0ec: 24050001 */ li $a1,0x1 -/* f0bf0f0: 0fc3307a */ jal 0xf0cc1e8 +/* f0bf0f0: 0fc3307a */ jal bmoveTick /* f0bf0f4: 8fa60330 */ lw $a2,0x330($sp) /* f0bf0f8: 10000003 */ b .PF0f0bf108 /* f0bf0fc: 00000000 */ nop .PF0f0bf100: -/* f0bf100: 0fc3307a */ jal 0xf0cc1e8 +/* f0bf100: 0fc3307a */ jal bmoveTick /* f0bf104: 24070001 */ li $a3,0x1 .PF0f0bf108: -/* f0bf108: 0fc2f650 */ jal 0xf0bd940 +/* f0bf108: 0fc2f650 */ jal func0f0bd3c4 /* f0bf10c: 00000000 */ nop -/* f0bf110: 0fc30767 */ jal 0xf0c1d9c +/* f0bf110: 0fc30767 */ jal currentPlayerSetCameraMode /* f0bf114: 00002025 */ move $a0,$zero /* f0bf118: 8e700284 */ lw $s0,0x284($s3) /* f0bf11c: 44802000 */ mtc1 $zero,$f4 @@ -6390,7 +6390,7 @@ glabel var7f1ad6ac /* f0bf170: 8e0300bc */ lw $v1,0xbc($s0) /* f0bf174: 246a0028 */ addiu $t2,$v1,0x28 /* f0bf178: afaa0010 */ sw $t2,0x10($sp) -/* f0bf17c: 0fc3076b */ jal 0xf0c1dac +/* f0bf17c: 0fc3076b */ jal func0f0c1840 /* f0bf180: 24670008 */ addiu $a3,$v1,0x8 /* f0bf184: 8e6c0318 */ lw $t4,0x318($s3) /* f0bf188: 3c0b800a */ lui $t3,0x800a @@ -6434,11 +6434,11 @@ glabel var7f1ad6ac /* f0bf21c: 01416024 */ and $t4,$t2,$at /* f0bf220: 15800078 */ bnez $t4,.PF0f0bf404 /* f0bf224: 00000000 */ nop -/* f0bf228: 0fc59965 */ jal 0xf166594 +/* f0bf228: 0fc59965 */ jal stageGetIndex /* f0bf22c: 8e6404b4 */ lw $a0,0x4b4($s3) /* f0bf230: 14540015 */ bne $v0,$s4,.PF0f0bf288 /* f0bf234: 00000000 */ nop -/* f0bf238: 0c006098 */ jal 0x18260 +/* f0bf238: 0c006098 */ jal ailistFindById /* f0bf23c: 24040012 */ li $a0,0x12 /* f0bf240: 8e700284 */ lw $s0,0x284($s3) /* f0bf244: 3c014000 */ lui $at,0x4000 @@ -6454,17 +6454,17 @@ glabel var7f1ad6ac /* f0bf26c: 24660008 */ addiu $a2,$v1,0x8 /* f0bf270: 24670028 */ addiu $a3,$v1,0x28 /* f0bf274: 46143482 */ mul.s $f18,$f6,$f20 -/* f0bf278: 0fc12d23 */ jal 0xf04b48c +/* f0bf278: 0fc12d23 */ jal chrSpawnAtCoord /* f0bf27c: e7b20010 */ swc1 $f18,0x10($sp) /* f0bf280: 1000002a */ b .PF0f0bf32c /* f0bf284: 00408825 */ move $s1,$v0 .PF0f0bf288: -/* f0bf288: 0fc59965 */ jal 0xf166594 +/* f0bf288: 0fc59965 */ jal stageGetIndex /* f0bf28c: 8e6404b4 */ lw $a0,0x4b4($s3) /* f0bf290: 24010023 */ li $at,0x23 /* f0bf294: 14410012 */ bne $v0,$at,.PF0f0bf2e0 /* f0bf298: 00000000 */ nop -/* f0bf29c: 0c006098 */ jal 0x18260 +/* f0bf29c: 0c006098 */ jal ailistFindById /* f0bf2a0: 24040012 */ li $a0,0x12 /* f0bf2a4: 8e700284 */ lw $s0,0x284($s3) /* f0bf2a8: 240d0010 */ li $t5,0x10 @@ -6477,12 +6477,12 @@ glabel var7f1ad6ac /* f0bf2c4: 24050008 */ li $a1,0x8 /* f0bf2c8: 24660008 */ addiu $a2,$v1,0x8 /* f0bf2cc: 24670028 */ addiu $a3,$v1,0x28 -/* f0bf2d0: 0fc12d23 */ jal 0xf04b48c +/* f0bf2d0: 0fc12d23 */ jal chrSpawnAtCoord /* f0bf2d4: e7aa0010 */ swc1 $f10,0x10($sp) /* f0bf2d8: 10000014 */ b .PF0f0bf32c /* f0bf2dc: 00408825 */ move $s1,$v0 .PF0f0bf2e0: -/* f0bf2e0: 0c006098 */ jal 0x18260 +/* f0bf2e0: 0c006098 */ jal ailistFindById /* f0bf2e4: 24040012 */ li $a0,0x12 /* f0bf2e8: 8e700284 */ lw $s0,0x284($s3) /* f0bf2ec: 3c014000 */ lui $at,0x4000 @@ -6498,7 +6498,7 @@ glabel var7f1ad6ac /* f0bf314: 24660008 */ addiu $a2,$v1,0x8 /* f0bf318: 24670028 */ addiu $a3,$v1,0x28 /* f0bf31c: 46149202 */ mul.s $f8,$f18,$f20 -/* f0bf320: 0fc12d23 */ jal 0xf04b48c +/* f0bf320: 0fc12d23 */ jal chrSpawnAtCoord /* f0bf324: e7a80010 */ swc1 $f8,0x10($sp) /* f0bf328: 00408825 */ move $s1,$v0 .PF0f0bf32c: @@ -6524,21 +6524,21 @@ glabel var7f1ad6ac /* f0bf378: a21802e2 */ sb $t8,0x2e2($s0) /* f0bf37c: a2120002 */ sb $s2,0x2($s0) /* f0bf380: a2120003 */ sb $s2,0x3($s0) -/* f0bf384: 0fc59965 */ jal 0xf166594 +/* f0bf384: 0fc59965 */ jal stageGetIndex /* f0bf388: 8e6404b4 */ lw $a0,0x4b4($s3) /* f0bf38c: 14540005 */ bne $v0,$s4,.PF0f0bf3a4 /* f0bf390: 02002025 */ move $a0,$s0 -/* f0bf394: 0fc081ae */ jal 0xf0206b8 +/* f0bf394: 0fc081ae */ jal chrAddHealth /* f0bf398: 3c054220 */ lui $a1,0x4220 /* f0bf39c: 10000005 */ b .PF0f0bf3b4 /* f0bf3a0: 02002025 */ move $a0,$s0 .PF0f0bf3a4: /* f0bf3a4: 4405b000 */ mfc1 $a1,$f22 -/* f0bf3a8: 0fc081ae */ jal 0xf0206b8 +/* f0bf3a8: 0fc081ae */ jal chrAddHealth /* f0bf3ac: 02002025 */ move $a0,$s0 /* f0bf3b0: 02002025 */ move $a0,$s0 .PF0f0bf3b4: -/* f0bf3b4: 0fc081a9 */ jal 0xf0206a4 +/* f0bf3b4: 0fc081a9 */ jal chrSetMaxDamage /* f0bf3b8: 3c054080 */ lui $a1,0x4080 /* f0bf3bc: 8e0f0018 */ lw $t7,0x18($s0) /* f0bf3c0: 920c02e1 */ lbu $t4,0x2e1($s0) @@ -6556,19 +6556,19 @@ glabel var7f1ad6ac /* f0bf3f0: 02002025 */ move $a0,$s0 /* f0bf3f4: 240500f5 */ li $a1,0xf5 /* f0bf3f8: 24060002 */ li $a2,0x2 -/* f0bf3fc: 0fc22e7f */ jal 0xf08b9fc +/* f0bf3fc: 0fc22e7f */ jal chrGiveWeapon /* f0bf400: 00003825 */ move $a3,$zero .PF0f0bf404: -/* f0bf404: 0fc41dd5 */ jal 0xf107754 +/* f0bf404: 0fc41dd5 */ jal cheatIsActive /* f0bf408: 24040016 */ li $a0,0x16 /* f0bf40c: 10400058 */ beqz $v0,.PF0f0bf570 /* f0bf410: 00000000 */ nop -/* f0bf414: 0fc59965 */ jal 0xf166594 +/* f0bf414: 0fc59965 */ jal stageGetIndex /* f0bf418: 8e6404b4 */ lw $a0,0x4b4($s3) /* f0bf41c: 24010023 */ li $at,0x23 /* f0bf420: 14410012 */ bne $v0,$at,.PF0f0bf46c /* f0bf424: 00000000 */ nop -/* f0bf428: 0c006098 */ jal 0x18260 +/* f0bf428: 0c006098 */ jal ailistFindById /* f0bf42c: 24040012 */ li $a0,0x12 /* f0bf430: 8e700284 */ lw $s0,0x284($s3) /* f0bf434: 240f0010 */ li $t7,0x10 @@ -6581,12 +6581,12 @@ glabel var7f1ad6ac /* f0bf450: 24050008 */ li $a1,0x8 /* f0bf454: 24660008 */ addiu $a2,$v1,0x8 /* f0bf458: 24670028 */ addiu $a3,$v1,0x28 -/* f0bf45c: 0fc12d23 */ jal 0xf04b48c +/* f0bf45c: 0fc12d23 */ jal chrSpawnAtCoord /* f0bf460: e7a40010 */ swc1 $f4,0x10($sp) /* f0bf464: 10000011 */ b .PF0f0bf4ac /* f0bf468: 00408825 */ move $s1,$v0 .PF0f0bf46c: -/* f0bf46c: 0c006098 */ jal 0x18260 +/* f0bf46c: 0c006098 */ jal ailistFindById /* f0bf470: 02802025 */ move $a0,$s4 /* f0bf474: 8e700284 */ lw $s0,0x284($s3) /* f0bf478: 240e0010 */ li $t6,0x10 @@ -6599,7 +6599,7 @@ glabel var7f1ad6ac /* f0bf494: 2405001b */ li $a1,0x1b /* f0bf498: 24660008 */ addiu $a2,$v1,0x8 /* f0bf49c: 24670028 */ addiu $a3,$v1,0x28 -/* f0bf4a0: 0fc12d23 */ jal 0xf04b48c +/* f0bf4a0: 0fc12d23 */ jal chrSpawnAtCoord /* f0bf4a4: e7b20010 */ swc1 $f18,0x10($sp) /* f0bf4a8: 00408825 */ move $s1,$v0 .PF0f0bf4ac: @@ -6625,17 +6625,17 @@ glabel var7f1ad6ac /* f0bf4f8: a21502b1 */ sb $s5,0x2b1($s0) /* f0bf4fc: a2120002 */ sb $s2,0x2($s0) /* f0bf500: a2120003 */ sb $s2,0x3($s0) -/* f0bf504: 0fc59965 */ jal 0xf166594 +/* f0bf504: 0fc59965 */ jal stageGetIndex /* f0bf508: 8e6404b4 */ lw $a0,0x4b4($s3) /* f0bf50c: 14540005 */ bne $v0,$s4,.PF0f0bf524 /* f0bf510: 02002025 */ move $a0,$s0 -/* f0bf514: 0fc081ae */ jal 0xf0206b8 +/* f0bf514: 0fc081ae */ jal chrAddHealth /* f0bf518: 3c054220 */ lui $a1,0x4220 /* f0bf51c: 10000005 */ b .PF0f0bf534 /* f0bf520: 8e0e0018 */ lw $t6,0x18($s0) .PF0f0bf524: /* f0bf524: 4405b000 */ mfc1 $a1,$f22 -/* f0bf528: 0fc081ae */ jal 0xf0206b8 +/* f0bf528: 0fc081ae */ jal chrAddHealth /* f0bf52c: 02002025 */ move $a0,$s0 /* f0bf530: 8e0e0018 */ lw $t6,0x18($s0) .PF0f0bf534: @@ -6652,19 +6652,19 @@ glabel var7f1ad6ac /* f0bf55c: ae190018 */ sw $t9,0x18($s0) /* f0bf560: ae0a0014 */ sw $t2,0x14($s0) /* f0bf564: a20f02e1 */ sb $t7,0x2e1($s0) -/* f0bf568: 0fc081a9 */ jal 0xf0206a4 +/* f0bf568: 0fc081a9 */ jal chrSetMaxDamage /* f0bf56c: 02002025 */ move $a0,$s0 .PF0f0bf570: -/* f0bf570: 0fc41dd5 */ jal 0xf107754 +/* f0bf570: 0fc41dd5 */ jal cheatIsActive /* f0bf574: 24040018 */ li $a0,0x18 /* f0bf578: 1040005e */ beqz $v0,.PF0f0bf6f4 /* f0bf57c: 00000000 */ nop -/* f0bf580: 0fc59965 */ jal 0xf166594 +/* f0bf580: 0fc59965 */ jal stageGetIndex /* f0bf584: 8e6404b4 */ lw $a0,0x4b4($s3) /* f0bf588: 24010023 */ li $at,0x23 /* f0bf58c: 14410012 */ bne $v0,$at,.PF0f0bf5d8 /* f0bf590: 00000000 */ nop -/* f0bf594: 0c006098 */ jal 0x18260 +/* f0bf594: 0c006098 */ jal ailistFindById /* f0bf598: 24040012 */ li $a0,0x12 /* f0bf59c: 8e700284 */ lw $s0,0x284($s3) /* f0bf5a0: 240e0010 */ li $t6,0x10 @@ -6677,12 +6677,12 @@ glabel var7f1ad6ac /* f0bf5bc: 24050008 */ li $a1,0x8 /* f0bf5c0: 24660008 */ addiu $a2,$v1,0x8 /* f0bf5c4: 24670028 */ addiu $a3,$v1,0x28 -/* f0bf5c8: 0fc12d23 */ jal 0xf04b48c +/* f0bf5c8: 0fc12d23 */ jal chrSpawnAtCoord /* f0bf5cc: e7aa0010 */ swc1 $f10,0x10($sp) /* f0bf5d0: 10000011 */ b .PF0f0bf618 /* f0bf5d4: 00408825 */ move $s1,$v0 .PF0f0bf5d8: -/* f0bf5d8: 0c006098 */ jal 0x18260 +/* f0bf5d8: 0c006098 */ jal ailistFindById /* f0bf5dc: 24040012 */ li $a0,0x12 /* f0bf5e0: 8e700284 */ lw $s0,0x284($s3) /* f0bf5e4: 24190010 */ li $t9,0x10 @@ -6695,7 +6695,7 @@ glabel var7f1ad6ac /* f0bf600: 24050012 */ li $a1,0x12 /* f0bf604: 24660008 */ addiu $a2,$v1,0x8 /* f0bf608: 24670028 */ addiu $a3,$v1,0x28 -/* f0bf60c: 0fc12d23 */ jal 0xf04b48c +/* f0bf60c: 0fc12d23 */ jal chrSpawnAtCoord /* f0bf610: e7a60010 */ swc1 $f6,0x10($sp) /* f0bf614: 00408825 */ move $s1,$v0 .PF0f0bf618: @@ -6722,21 +6722,21 @@ glabel var7f1ad6ac /* f0bf668: a21902e2 */ sb $t9,0x2e2($s0) /* f0bf66c: a2090002 */ sb $t1,0x2($s0) /* f0bf670: a2120003 */ sb $s2,0x3($s0) -/* f0bf674: 0fc59965 */ jal 0xf166594 +/* f0bf674: 0fc59965 */ jal stageGetIndex /* f0bf678: 8e6404b4 */ lw $a0,0x4b4($s3) /* f0bf67c: 14540006 */ bne $v0,$s4,.PF0f0bf698 /* f0bf680: 02002025 */ move $a0,$s0 /* f0bf684: 4405b000 */ mfc1 $a1,$f22 -/* f0bf688: 0fc081ae */ jal 0xf0206b8 +/* f0bf688: 0fc081ae */ jal chrAddHealth /* f0bf68c: 02002025 */ move $a0,$s0 /* f0bf690: 10000004 */ b .PF0f0bf6a4 /* f0bf694: 02002025 */ move $a0,$s0 .PF0f0bf698: -/* f0bf698: 0fc081ae */ jal 0xf0206b8 +/* f0bf698: 0fc081ae */ jal chrAddHealth /* f0bf69c: 3c054120 */ lui $a1,0x4120 /* f0bf6a0: 02002025 */ move $a0,$s0 .PF0f0bf6a4: -/* f0bf6a4: 0fc081a9 */ jal 0xf0206a4 +/* f0bf6a4: 0fc081a9 */ jal chrSetMaxDamage /* f0bf6a8: 3c054120 */ lui $a1,0x4120 /* f0bf6ac: 8e0a0018 */ lw $t2,0x18($s0) /* f0bf6b0: 920f02e1 */ lbu $t7,0x2e1($s0) @@ -6754,19 +6754,19 @@ glabel var7f1ad6ac /* f0bf6e0: 02002025 */ move $a0,$s0 /* f0bf6e4: 24050101 */ li $a1,0x101 /* f0bf6e8: 24060010 */ li $a2,0x10 -/* f0bf6ec: 0fc22e7f */ jal 0xf08b9fc +/* f0bf6ec: 0fc22e7f */ jal chrGiveWeapon /* f0bf6f0: 00003825 */ move $a3,$zero .PF0f0bf6f4: -/* f0bf6f4: 0fc41dd5 */ jal 0xf107754 +/* f0bf6f4: 0fc41dd5 */ jal cheatIsActive /* f0bf6f8: 24040017 */ li $a0,0x17 /* f0bf6fc: 10400062 */ beqz $v0,.PF0f0bf888 /* f0bf700: 00000000 */ nop -/* f0bf704: 0fc59965 */ jal 0xf166594 +/* f0bf704: 0fc59965 */ jal stageGetIndex /* f0bf708: 8e6404b4 */ lw $a0,0x4b4($s3) /* f0bf70c: 24010023 */ li $at,0x23 /* f0bf710: 14410012 */ bne $v0,$at,.PF0f0bf75c /* f0bf714: 00000000 */ nop -/* f0bf718: 0c006098 */ jal 0x18260 +/* f0bf718: 0c006098 */ jal ailistFindById /* f0bf71c: 24040012 */ li $a0,0x12 /* f0bf720: 8e700284 */ lw $s0,0x284($s3) /* f0bf724: 240a0010 */ li $t2,0x10 @@ -6779,12 +6779,12 @@ glabel var7f1ad6ac /* f0bf740: 24050008 */ li $a1,0x8 /* f0bf744: 24660008 */ addiu $a2,$v1,0x8 /* f0bf748: 24670028 */ addiu $a3,$v1,0x28 -/* f0bf74c: 0fc12d23 */ jal 0xf04b48c +/* f0bf74c: 0fc12d23 */ jal chrSpawnAtCoord /* f0bf750: e7a80010 */ swc1 $f8,0x10($sp) /* f0bf754: 10000011 */ b .PF0f0bf79c /* f0bf758: 00408825 */ move $s1,$v0 .PF0f0bf75c: -/* f0bf75c: 0c006098 */ jal 0x18260 +/* f0bf75c: 0c006098 */ jal ailistFindById /* f0bf760: 24040012 */ li $a0,0x12 /* f0bf764: 8e700284 */ lw $s0,0x284($s3) /* f0bf768: 240c0010 */ li $t4,0x10 @@ -6797,7 +6797,7 @@ glabel var7f1ad6ac /* f0bf784: 02802825 */ move $a1,$s4 /* f0bf788: 24660008 */ addiu $a2,$v1,0x8 /* f0bf78c: 24670028 */ addiu $a3,$v1,0x28 -/* f0bf790: 0fc12d23 */ jal 0xf04b48c +/* f0bf790: 0fc12d23 */ jal chrSpawnAtCoord /* f0bf794: e7a40010 */ swc1 $f4,0x10($sp) /* f0bf798: 00408825 */ move $s1,$v0 .PF0f0bf79c: @@ -6823,21 +6823,21 @@ glabel var7f1ad6ac /* f0bf7e8: a20a02e2 */ sb $t2,0x2e2($s0) /* f0bf7ec: a20c0002 */ sb $t4,0x2($s0) /* f0bf7f0: a2120003 */ sb $s2,0x3($s0) -/* f0bf7f4: 0fc59965 */ jal 0xf166594 +/* f0bf7f4: 0fc59965 */ jal stageGetIndex /* f0bf7f8: 8e6404b4 */ lw $a0,0x4b4($s3) /* f0bf7fc: 14540005 */ bne $v0,$s4,.PF0f0bf814 /* f0bf800: 02002025 */ move $a0,$s0 -/* f0bf804: 0fc081ae */ jal 0xf0206b8 +/* f0bf804: 0fc081ae */ jal chrAddHealth /* f0bf808: 3c054220 */ lui $a1,0x4220 /* f0bf80c: 10000005 */ b .PF0f0bf824 /* f0bf810: 02002025 */ move $a0,$s0 .PF0f0bf814: /* f0bf814: 4405b000 */ mfc1 $a1,$f22 -/* f0bf818: 0fc081ae */ jal 0xf0206b8 +/* f0bf818: 0fc081ae */ jal chrAddHealth /* f0bf81c: 02002025 */ move $a0,$s0 /* f0bf820: 02002025 */ move $a0,$s0 .PF0f0bf824: -/* f0bf824: 0fc081a9 */ jal 0xf0206a4 +/* f0bf824: 0fc081a9 */ jal chrSetMaxDamage /* f0bf828: 3c054120 */ lui $a1,0x4120 /* f0bf82c: 8e0b0018 */ lw $t3,0x18($s0) /* f0bf830: 921902e1 */ lbu $t9,0x2e1($s0) @@ -6855,24 +6855,24 @@ glabel var7f1ad6ac /* f0bf860: 02002025 */ move $a0,$s0 /* f0bf864: 240500f9 */ li $a1,0xf9 /* f0bf868: 24060009 */ li $a2,0x9 -/* f0bf86c: 0fc22e7f */ jal 0xf08b9fc +/* f0bf86c: 0fc22e7f */ jal chrGiveWeapon /* f0bf870: 00003825 */ move $a3,$zero /* f0bf874: 02002025 */ move $a0,$s0 /* f0bf878: 240500f8 */ li $a1,0xf8 /* f0bf87c: 24060008 */ li $a2,0x8 -/* f0bf880: 0fc22e7f */ jal 0xf08b9fc +/* f0bf880: 0fc22e7f */ jal chrGiveWeapon /* f0bf884: 3c071000 */ lui $a3,0x1000 .PF0f0bf888: -/* f0bf888: 0fc41dd5 */ jal 0xf107754 +/* f0bf888: 0fc41dd5 */ jal cheatIsActive /* f0bf88c: 24040019 */ li $a0,0x19 /* f0bf890: 5040005d */ beqzl $v0,.PF0f0bfa08 /* f0bf894: 8fad0058 */ lw $t5,0x58($sp) -/* f0bf898: 0fc59965 */ jal 0xf166594 +/* f0bf898: 0fc59965 */ jal stageGetIndex /* f0bf89c: 8e6404b4 */ lw $a0,0x4b4($s3) /* f0bf8a0: 24010023 */ li $at,0x23 /* f0bf8a4: 14410012 */ bne $v0,$at,.PF0f0bf8f0 /* f0bf8a8: 00000000 */ nop -/* f0bf8ac: 0c006098 */ jal 0x18260 +/* f0bf8ac: 0c006098 */ jal ailistFindById /* f0bf8b0: 24040012 */ li $a0,0x12 /* f0bf8b4: 8e700284 */ lw $s0,0x284($s3) /* f0bf8b8: 240b0010 */ li $t3,0x10 @@ -6885,12 +6885,12 @@ glabel var7f1ad6ac /* f0bf8d4: 24050008 */ li $a1,0x8 /* f0bf8d8: 24660008 */ addiu $a2,$v1,0x8 /* f0bf8dc: 24670028 */ addiu $a3,$v1,0x28 -/* f0bf8e0: 0fc12d23 */ jal 0xf04b48c +/* f0bf8e0: 0fc12d23 */ jal chrSpawnAtCoord /* f0bf8e4: e7b20010 */ swc1 $f18,0x10($sp) /* f0bf8e8: 10000011 */ b .PF0f0bf930 /* f0bf8ec: 00408825 */ move $s1,$v0 .PF0f0bf8f0: -/* f0bf8f0: 0c006098 */ jal 0x18260 +/* f0bf8f0: 0c006098 */ jal ailistFindById /* f0bf8f4: 24040012 */ li $a0,0x12 /* f0bf8f8: 8e700284 */ lw $s0,0x284($s3) /* f0bf8fc: 240d0010 */ li $t5,0x10 @@ -6903,7 +6903,7 @@ glabel var7f1ad6ac /* f0bf918: 24050029 */ li $a1,0x29 /* f0bf91c: 24660008 */ addiu $a2,$v1,0x8 /* f0bf920: 24670028 */ addiu $a3,$v1,0x28 -/* f0bf924: 0fc12d23 */ jal 0xf04b48c +/* f0bf924: 0fc12d23 */ jal chrSpawnAtCoord /* f0bf928: e7aa0010 */ swc1 $f10,0x10($sp) /* f0bf92c: 00408825 */ move $s1,$v0 .PF0f0bf930: @@ -6928,21 +6928,21 @@ glabel var7f1ad6ac /* f0bf978: a20b02e2 */ sb $t3,0x2e2($s0) /* f0bf97c: a2120002 */ sb $s2,0x2($s0) /* f0bf980: a2120003 */ sb $s2,0x3($s0) -/* f0bf984: 0fc59965 */ jal 0xf166594 +/* f0bf984: 0fc59965 */ jal stageGetIndex /* f0bf988: 8e6404b4 */ lw $a0,0x4b4($s3) /* f0bf98c: 14540005 */ bne $v0,$s4,.PF0f0bf9a4 /* f0bf990: 02002025 */ move $a0,$s0 -/* f0bf994: 0fc081ae */ jal 0xf0206b8 +/* f0bf994: 0fc081ae */ jal chrAddHealth /* f0bf998: 3c054220 */ lui $a1,0x4220 /* f0bf99c: 10000005 */ b .PF0f0bf9b4 /* f0bf9a0: 02002025 */ move $a0,$s0 .PF0f0bf9a4: /* f0bf9a4: 4405b000 */ mfc1 $a1,$f22 -/* f0bf9a8: 0fc081ae */ jal 0xf0206b8 +/* f0bf9a8: 0fc081ae */ jal chrAddHealth /* f0bf9ac: 02002025 */ move $a0,$s0 /* f0bf9b0: 02002025 */ move $a0,$s0 .PF0f0bf9b4: -/* f0bf9b4: 0fc081a9 */ jal 0xf0206a4 +/* f0bf9b4: 0fc081a9 */ jal chrSetMaxDamage /* f0bf9b8: 3c054120 */ lui $a1,0x4120 /* f0bf9bc: 8e0d0018 */ lw $t5,0x18($s0) /* f0bf9c0: 920902e1 */ lbu $t1,0x2e1($s0) @@ -6960,7 +6960,7 @@ glabel var7f1ad6ac /* f0bf9f0: 02002025 */ move $a0,$s0 /* f0bf9f4: 24050104 */ li $a1,0x104 /* f0bf9f8: 2406000d */ li $a2,0xd -/* f0bf9fc: 0fc22e7f */ jal 0xf08b9fc +/* f0bf9fc: 0fc22e7f */ jal chrGiveWeapon /* f0bfa00: 00003825 */ move $a3,$zero .PF0f0bfa04: /* f0bfa04: 8fad0058 */ lw $t5,0x58($sp) @@ -6984,16 +6984,16 @@ glabel var7f1ad6ac /* f0bfa40: 54610018 */ bnel $v1,$at,.PF0f0bfaa4 /* f0bfa44: 24010004 */ li $at,0x4 .PF0f0bfa48: -/* f0bfa48: 0fc2e696 */ jal 0xf0b9a58 +/* f0bfa48: 0fc2e696 */ jal func0f0b9538 /* f0bfa4c: 00000000 */ nop /* f0bfa50: 24040001 */ li $a0,0x1 /* f0bfa54: 24050001 */ li $a1,0x1 /* f0bfa58: 8fa60330 */ lw $a2,0x330($sp) -/* f0bfa5c: 0fc3307a */ jal 0xf0cc1e8 +/* f0bfa5c: 0fc3307a */ jal bmoveTick /* f0bfa60: 00003825 */ move $a3,$zero -/* f0bfa64: 0fc2f650 */ jal 0xf0bd940 +/* f0bfa64: 0fc2f650 */ jal func0f0bd3c4 /* f0bfa68: 00000000 */ nop -/* f0bfa6c: 0fc30767 */ jal 0xf0c1d9c +/* f0bfa6c: 0fc30767 */ jal currentPlayerSetCameraMode /* f0bfa70: 00002025 */ move $a0,$zero /* f0bfa74: 8e700284 */ lw $s0,0x284($s3) /* f0bfa78: 8e0300bc */ lw $v1,0xbc($s0) @@ -7002,7 +7002,7 @@ glabel var7f1ad6ac /* f0bfa84: 246a0028 */ addiu $t2,$v1,0x28 /* f0bfa88: afaa0010 */ sw $t2,0x10($sp) /* f0bfa8c: 26060388 */ addiu $a2,$s0,0x388 -/* f0bfa90: 0fc3076b */ jal 0xf0c1dac +/* f0bfa90: 0fc3076b */ jal func0f0c1840 /* f0bfa94: 24670008 */ addiu $a3,$v1,0x8 /* f0bfa98: 10000101 */ b .PF0f0bfea0 /* f0bfa9c: 8e700284 */ lw $s0,0x284($s3) @@ -7010,42 +7010,42 @@ glabel var7f1ad6ac .PF0f0bfaa4: /* f0bfaa4: 1461000c */ bne $v1,$at,.PF0f0bfad8 /* f0bfaa8: 00000000 */ nop -/* f0bfaac: 0fc2e430 */ jal 0xf0b90c0 +/* f0bfaac: 0fc2e430 */ jal func0f0b8ba0 /* f0bfab0: 00000000 */ nop /* f0bfab4: 00002025 */ move $a0,$zero /* f0bfab8: 00002825 */ move $a1,$zero /* f0bfabc: 00003025 */ move $a2,$zero -/* f0bfac0: 0fc3307a */ jal 0xf0cc1e8 +/* f0bfac0: 0fc3307a */ jal bmoveTick /* f0bfac4: 24070001 */ li $a3,0x1 -/* f0bfac8: 0fc2e702 */ jal 0xf0b9c08 +/* f0bfac8: 0fc2e702 */ jal func0f0b96e8 /* f0bfacc: 00000000 */ nop /* f0bfad0: 100000f3 */ b .PF0f0bfea0 /* f0bfad4: 8e700284 */ lw $s0,0x284($s3) .PF0f0bfad8: /* f0bfad8: 1443000c */ bne $v0,$v1,.PF0f0bfb0c /* f0bfadc: 24010007 */ li $at,0x7 -/* f0bfae0: 0fc2e430 */ jal 0xf0b90c0 +/* f0bfae0: 0fc2e430 */ jal func0f0b8ba0 /* f0bfae4: 00000000 */ nop /* f0bfae8: 00002025 */ move $a0,$zero /* f0bfaec: 00002825 */ move $a1,$zero /* f0bfaf0: 00003025 */ move $a2,$zero -/* f0bfaf4: 0fc3307a */ jal 0xf0cc1e8 +/* f0bfaf4: 0fc3307a */ jal bmoveTick /* f0bfaf8: 24070001 */ li $a3,0x1 -/* f0bfafc: 0fc2e877 */ jal 0xf0ba1dc +/* f0bfafc: 0fc2e877 */ jal func0f0b9cbc /* f0bfb00: 00000000 */ nop /* f0bfb04: 100000e6 */ b .PF0f0bfea0 /* f0bfb08: 8e700284 */ lw $s0,0x284($s3) .PF0f0bfb0c: /* f0bfb0c: 546100e5 */ bnel $v1,$at,.PF0f0bfea4 /* f0bfb10: c60a1b80 */ lwc1 $f10,0x1b80($s0) -/* f0bfb14: 0fc2e696 */ jal 0xf0b9a58 +/* f0bfb14: 0fc2e696 */ jal func0f0b9538 /* f0bfb18: 00000000 */ nop /* f0bfb1c: 8e6c0284 */ lw $t4,0x284($s3) /* f0bfb20: 24050002 */ li $a1,0x2 /* f0bfb24: 27a60078 */ addiu $a2,$sp,0x78 -/* f0bfb28: 0fc45964 */ jal 0xf116590 +/* f0bfb28: 0fc45964 */ jal padUnpack /* f0bfb2c: 85841ba4 */ lh $a0,0x1ba4($t4) -/* f0bfb30: 0c0039b9 */ jal 0xe6e4 +/* f0bfb30: 0c0039b9 */ jal mainGetStageNum /* f0bfb34: 00000000 */ nop /* f0bfb38: 3c0b8008 */ lui $t3,0x8008 /* f0bfb3c: 856b0510 */ lh $t3,0x510($t3) @@ -7071,7 +7071,7 @@ glabel var7f1ad6ac /* f0bfb84: 460a4301 */ sub.s $f12,$f8,$f10 /* f0bfb88: 46062381 */ sub.s $f14,$f4,$f6 /* f0bfb8c: e7ac00d8 */ swc1 $f12,0xd8($sp) -/* f0bfb90: 0fc2599c */ jal 0xf096670 +/* f0bfb90: 0fc2599c */ jal atan2f /* f0bfb94: e7ae00d4 */ swc1 $f14,0xd4($sp) /* f0bfb98: 3c017f1b */ lui $at,0x7f1b /* f0bfb9c: c436e958 */ lwc1 $f22,-0x16a8($at) @@ -7091,7 +7091,7 @@ glabel var7f1ad6ac /* f0bfbd0: 8e700284 */ lw $s0,0x284($s3) .PF0f0bfbd4: /* f0bfbd4: c60c036c */ lwc1 $f12,0x36c($s0) -/* f0bfbd8: 0fc2599c */ jal 0xf096670 +/* f0bfbd8: 0fc2599c */ jal atan2f /* f0bfbdc: c60e0374 */ lwc1 $f14,0x374($s0) /* f0bfbe0: 4600b03c */ c.lt.s $f22,$f0 /* f0bfbe4: 44804000 */ mtc1 $zero,$f8 @@ -7196,7 +7196,7 @@ glabel var7f1ad6ac /* f0bfd50: 46042182 */ mul.s $f6,$f4,$f4 /* f0bfd54: c7a000d4 */ lwc1 $f0,0xd4($sp) /* f0bfd58: 46000482 */ mul.s $f18,$f0,$f0 -/* f0bfd5c: 0c0127b4 */ jal 0x49ed0 +/* f0bfd5c: 0c0127b4 */ jal sqrtf /* f0bfd60: 46123300 */ add.s $f12,$f6,$f18 /* f0bfd64: 8e700284 */ lw $s0,0x284($s3) /* f0bfd68: e7a000d8 */ swc1 $f0,0xd8($sp) @@ -7208,7 +7208,7 @@ glabel var7f1ad6ac /* f0bfd80: 00000000 */ nop /* f0bfd84: 45000004 */ bc1f .PF0f0bfd98 /* f0bfd88: 00000000 */ nop -/* f0bfd8c: 0fc2e6d7 */ jal 0xf0b9b5c +/* f0bfd8c: 0fc2e6d7 */ jal setTickMode /* f0bfd90: 24040001 */ li $a0,0x1 /* f0bfd94: 8e700284 */ lw $s0,0x284($s3) .PF0f0bfd98: @@ -7226,7 +7226,7 @@ glabel var7f1ad6ac /* f0bfdc0: 00000000 */ nop /* f0bfdc4: 45020006 */ bc1fl .PF0f0bfde0 /* f0bfdc8: 860d1ba8 */ lh $t5,0x1ba8($s0) -/* f0bfdcc: 0fc2e6d7 */ jal 0xf0b9b5c +/* f0bfdcc: 0fc2e6d7 */ jal setTickMode /* f0bfdd0: 24040001 */ li $a0,0x1 /* f0bfdd4: 8e700284 */ lw $s0,0x284($s3) /* f0bfdd8: 86021baa */ lh $v0,0x1baa($s0) @@ -7267,11 +7267,11 @@ glabel var7f1ad6ac /* f0bfe54: 46022182 */ mul.s $f6,$f4,$f2 /* f0bfe58: 4600348d */ trunc.w.s $f18,$f6 /* f0bfe5c: 440e9000 */ mfc1 $t6,$f18 -/* f0bfe60: 0fc3307a */ jal 0xf0cc1e8 +/* f0bfe60: 0fc3307a */ jal bmoveTick /* f0bfe64: ae0e1bdc */ sw $t6,0x1bdc($s0) -/* f0bfe68: 0fc2f650 */ jal 0xf0bd940 +/* f0bfe68: 0fc2f650 */ jal func0f0bd3c4 /* f0bfe6c: 00000000 */ nop -/* f0bfe70: 0fc30767 */ jal 0xf0c1d9c +/* f0bfe70: 0fc30767 */ jal currentPlayerSetCameraMode /* f0bfe74: 00002025 */ move $a0,$zero /* f0bfe78: 8e700284 */ lw $s0,0x284($s3) /* f0bfe7c: 8e0300bc */ lw $v1,0xbc($s0) @@ -7280,7 +7280,7 @@ glabel var7f1ad6ac /* f0bfe88: 24790028 */ addiu $t9,$v1,0x28 /* f0bfe8c: afb90010 */ sw $t9,0x10($sp) /* f0bfe90: 26060388 */ addiu $a2,$s0,0x388 -/* f0bfe94: 0fc3076b */ jal 0xf0c1dac +/* f0bfe94: 0fc3076b */ jal func0f0c1840 /* f0bfe98: 24670008 */ addiu $a3,$v1,0x8 /* f0bfe9c: 8e700284 */ lw $s0,0x284($s3) .PF0f0bfea0: @@ -7295,11 +7295,11 @@ glabel var7f1ad6ac /* f0bfebc: 11e00047 */ beqz $t7,.PF0f0bffdc /* f0bfec0: 00000000 */ nop /* f0bfec4: 8e690288 */ lw $t1,0x288($s3) -/* f0bfec8: 0fc54cfe */ jal 0xf1533f8 +/* f0bfec8: 0fc54cfe */ jal optionsGetContpadNum1 /* f0bfecc: 8d240070 */ lw $a0,0x70($t1) /* f0bfed0: 00028600 */ sll $s0,$v0,0x18 /* f0bfed4: 00105603 */ sra $t2,$s0,0x18 -/* f0bfed8: 0fc5b6f7 */ jal 0xf16dbdc +/* f0bfed8: 0fc5b6f7 */ jal coreIsPaused /* f0bfedc: 01408025 */ move $s0,$t2 /* f0bfee0: 1440002c */ bnez $v0,.PF0f0bff94 /* f0bfee4: 8fac0330 */ lw $t4,0x330($sp) @@ -7307,11 +7307,11 @@ glabel var7f1ad6ac /* f0bfeec: 00102600 */ sll $a0,$s0,0x18 /* f0bfef0: 00045e03 */ sra $t3,$a0,0x18 /* f0bfef4: 01602025 */ move $a0,$t3 -/* f0bfef8: 0c00536a */ jal 0x14da8 +/* f0bfef8: 0c00536a */ jal contGetButtonsPressedThisFrame /* f0bfefc: 3405f030 */ li $a1,0xf030 /* f0bff00: 10400024 */ beqz $v0,.PF0f0bff94 /* f0bff04: 240d0002 */ li $t5,0x2 -/* f0bff08: 0fc2ee57 */ jal 0xf0bb95c +/* f0bff08: 0fc2ee57 */ jal currentPlayerIsFadeComplete /* f0bff0c: ae2d0000 */ sw $t5,0x0($s1) /* f0bff10: 50400016 */ beqzl $v0,.PF0f0bff6c /* f0bff14: 8e700284 */ lw $s0,0x284($s3) @@ -7325,13 +7325,13 @@ glabel var7f1ad6ac /* f0bff34: 45020018 */ bc1fl .PF0f0bff98 /* f0bff38: 8e2e0000 */ lw $t6,0x0($s1) /* f0bff3c: 44070000 */ mfc1 $a3,$f0 -/* f0bff40: 0fc2ee20 */ jal 0xf0bb880 +/* f0bff40: 0fc2ee20 */ jal currentPlayerSetFadeColour /* f0bff44: 00003025 */ move $a2,$zero /* f0bff48: 3c014270 */ lui $at,0x4270 /* f0bff4c: 44816000 */ mtc1 $at,$f12 /* f0bff50: 3c013f80 */ lui $at,0x3f80 /* f0bff54: 44817000 */ mtc1 $at,$f14 -/* f0bff58: 0fc2ee4a */ jal 0xf0bb928 +/* f0bff58: 0fc2ee4a */ jal currentPlayerSetFadeFrac /* f0bff5c: 00000000 */ nop /* f0bff60: 1000000d */ b .PF0f0bff98 /* f0bff64: 8e2e0000 */ lw $t6,0x0($s1) @@ -7345,7 +7345,7 @@ glabel var7f1ad6ac /* f0bff80: 45020005 */ bc1fl .PF0f0bff98 /* f0bff84: 8e2e0000 */ lw $t6,0x0($s1) /* f0bff88: 44817000 */ mtc1 $at,$f14 -/* f0bff8c: 0fc2ee4a */ jal 0xf0bb928 +/* f0bff8c: 0fc2ee4a */ jal currentPlayerSetFadeFrac /* f0bff90: c60c02e8 */ lwc1 $f12,0x2e8($s0) .PF0f0bff94: /* f0bff94: 8e2e0000 */ lw $t6,0x0($s1) @@ -7353,7 +7353,7 @@ glabel var7f1ad6ac /* f0bff98: 24010002 */ li $at,0x2 /* f0bff9c: 15c1000f */ bne $t6,$at,.PF0f0bffdc /* f0bffa0: 00000000 */ nop -/* f0bffa4: 0fc2ee57 */ jal 0xf0bb95c +/* f0bffa4: 0fc2ee57 */ jal currentPlayerIsFadeComplete /* f0bffa8: 00000000 */ nop /* f0bffac: 1040000b */ beqz $v0,.PF0f0bffdc /* f0bffb0: 00000000 */ nop @@ -7365,14 +7365,14 @@ glabel var7f1ad6ac /* f0bffc8: 00000000 */ nop /* f0bffcc: 45000003 */ bc1f .PF0f0bffdc /* f0bffd0: 00000000 */ nop -/* f0bffd4: 0c0039bc */ jal 0xe6f0 +/* f0bffd4: 0c0039bc */ jal func0000e990 /* f0bffd8: 00000000 */ nop .PF0f0bffdc: /* f0bffdc: 3c0f8007 */ lui $t7,0x8007 /* f0bffe0: 8def0a24 */ lw $t7,0xa24($t7) /* f0bffe4: 51e00004 */ beqzl $t7,.PF0f0bfff8 /* f0bffe8: 8e700284 */ lw $s0,0x284($s3) -/* f0bffec: 0fc2e6dc */ jal 0xf0b9b70 +/* f0bffec: 0fc2e6dc */ jal func0f0b9650 /* f0bfff0: 00000000 */ nop /* f0bfff4: 8e700284 */ lw $s0,0x284($s3) .PF0f0bfff8: @@ -7382,7 +7382,7 @@ glabel var7f1ad6ac /* f0c0004: 8e02032c */ lw $v0,0x32c($s0) /* f0c0008: 14400005 */ bnez $v0,.PF0f0c0020 /* f0c000c: 00000000 */ nop -/* f0c0010: 0fc28b3f */ jal 0xf0a2cfc +/* f0c0010: 0fc28b3f */ jal func0f0a29c8 /* f0c0014: 00000000 */ nop /* f0c0018: 8e700284 */ lw $s0,0x284($s3) /* f0c001c: 8e02032c */ lw $v0,0x32c($s0) @@ -7395,7 +7395,7 @@ glabel var7f1ad6ac /* f0c0034: 8e6c0314 */ lw $t4,0x314($s3) /* f0c0038: 55800006 */ bnezl $t4,.PF0f0c0054 /* f0c003c: 8e6b0298 */ lw $t3,0x298($s3) -/* f0c0040: 0c0038f9 */ jal 0xe3e4 +/* f0c0040: 0c0038f9 */ jal mainEndStage /* f0c0044: 00000000 */ nop /* f0c0048: 10000022 */ b .PF0f0c00d4 /* f0c004c: 8e6a02ac */ lw $t2,0x2ac($s3) @@ -7416,12 +7416,12 @@ glabel var7f1ad6ac /* f0c0084: 8c590330 */ lw $t9,0x330($v0) /* f0c0088: 13200005 */ beqz $t9,.PF0f0c00a0 /* f0c008c: 00000000 */ nop -/* f0c0090: 0c0038f9 */ jal 0xe3e4 +/* f0c0090: 0c0038f9 */ jal mainEndStage /* f0c0094: 00000000 */ nop /* f0c0098: 1000000e */ b .PF0f0c00d4 /* f0c009c: 8e6a02ac */ lw $t2,0x2ac($s3) .PF0f0c00a0: -/* f0c00a0: 0fc125f7 */ jal 0xf0497dc +/* f0c00a0: 0fc125f7 */ jal chrsClearRefsToPlayer /* f0c00a4: 8e64028c */ lw $a0,0x28c($s3) /* f0c00a8: 1000000a */ b .PF0f0c00d4 /* f0c00ac: 8e6a02ac */ lw $t2,0x2ac($s3) @@ -7432,18 +7432,18 @@ glabel var7f1ad6ac /* f0c00bc: 8e6902a0 */ lw $t1,0x2a0($s3) /* f0c00c0: 55300004 */ bnel $t1,$s0,.PF0f0c00d4 /* f0c00c4: 8e6a02ac */ lw $t2,0x2ac($s3) -/* f0c00c8: 0c0038f9 */ jal 0xe3e4 +/* f0c00c8: 0c0038f9 */ jal mainEndStage /* f0c00cc: 00000000 */ nop /* f0c00d0: 8e6a02ac */ lw $t2,0x2ac($s3) .PF0f0c00d4: /* f0c00d4: 24010005 */ li $at,0x5 /* f0c00d8: 55410008 */ bnel $t2,$at,.PF0f0c00fc /* f0c00dc: 8fbf004c */ lw $ra,0x4c($sp) -/* f0c00e0: 0fc2ee57 */ jal 0xf0bb95c +/* f0c00e0: 0fc2ee57 */ jal currentPlayerIsFadeComplete /* f0c00e4: 00000000 */ nop /* f0c00e8: 50400004 */ beqzl $v0,.PF0f0c00fc /* f0c00ec: 8fbf004c */ lw $ra,0x4c($sp) -/* f0c00f0: 0c0038f9 */ jal 0xe3e4 +/* f0c00f0: 0c0038f9 */ jal mainEndStage /* f0c00f4: 00000000 */ nop /* f0c00f8: 8fbf004c */ lw $ra,0x4c($sp) .PF0f0c00fc: diff --git a/src/game/game_0e0770.c b/src/game/game_0e0770.c index fabc5e7f0..ee4197338 100644 --- a/src/game/game_0e0770.c +++ b/src/game/game_0e0770.c @@ -72,12 +72,12 @@ glabel func0f0e0770 /* f0e0dcc: afb30024 */ sw $s3,0x24($sp) /* f0e0dd0: afb20020 */ sw $s2,0x20($sp) /* f0e0dd4: afb1001c */ sw $s1,0x1c($sp) -/* f0e0dd8: 0c002a1c */ jal 0xa870 +/* f0e0dd8: 0c002a1c */ jal vi2GetUnk28 /* f0e0ddc: afb00018 */ sw $s0,0x18($sp) -/* f0e0de0: 0c002e53 */ jal 0xb94c +/* f0e0de0: 0c002e53 */ jal viGetWidth /* f0e0de4: 00408025 */ move $s0,$v0 /* f0e0de8: 00026840 */ sll $t5,$v0,0x1 -/* f0e0dec: 0c002e53 */ jal 0xb94c +/* f0e0dec: 0c002e53 */ jal viGetWidth /* f0e0df0: afad0070 */ sw $t5,0x70($sp) /* f0e0df4: 44822000 */ mtc1 $v0,$f4 /* f0e0df8: 3c0143a0 */ lui $at,0x43a0 @@ -93,7 +93,7 @@ glabel func0f0e0770 /* f0e0e20: 15e10007 */ bne $t7,$at,.PF0f0e0e40 /* f0e0e24: 46083003 */ div.s $f0,$f6,$f8 /* f0e0e28: afad0070 */ sw $t5,0x70($sp) -/* f0e0e2c: 0c002a1c */ jal 0xa870 +/* f0e0e2c: 0c002a1c */ jal vi2GetUnk28 /* f0e0e30: e7a0006c */ swc1 $f0,0x6c($sp) /* f0e0e34: 8fad0070 */ lw $t5,0x70($sp) /* f0e0e38: c7a0006c */ lwc1 $f0,0x6c($sp) @@ -104,7 +104,7 @@ glabel func0f0e0770 /* f0e0e48: 24a51460 */ addiu $a1,$a1,0x1460 /* f0e0e4c: 2484f1f0 */ addiu $a0,$a0,-3600 /* f0e0e50: afad0070 */ sw $t5,0x70($sp) -/* f0e0e54: 0c003624 */ jal 0xd890 +/* f0e0e54: 0c003624 */ jal func0000db30 /* f0e0e58: e7a0006c */ swc1 $f0,0x6c($sp) /* f0e0e5c: 8fad0070 */ lw $t5,0x70($sp) /* f0e0e60: 3c15800a */ lui $s5,0x800a @@ -395,9 +395,9 @@ glabel func0f0e0998 /* f0e1058: afa60098 */ sw $a2,0x98($sp) /* f0e105c: 15c10013 */ bne $t6,$at,.PF0f0e10ac /* f0e1060: afa7009c */ sw $a3,0x9c($sp) -/* f0e1064: 0c002e53 */ jal 0xb94c +/* f0e1064: 0c002e53 */ jal viGetWidth /* f0e1068: 00000000 */ nop -/* f0e106c: 0c002e57 */ jal 0xb95c +/* f0e106c: 0c002e57 */ jal viGetHeight /* f0e1070: a7a20030 */ sh $v0,0x30($sp) /* f0e1074: 240f00ff */ li $t7,0xff /* f0e1078: 241800ff */ li $t8,0xff @@ -409,15 +409,15 @@ glabel func0f0e0998 /* f0e1090: 00002825 */ move $a1,$zero /* f0e1094: 00003025 */ move $a2,$zero /* f0e1098: 87a70030 */ lh $a3,0x30($sp) -/* f0e109c: 0fc388f1 */ jal 0xf0e23c4 +/* f0e109c: 0fc388f1 */ jal func0f0e1ce8 /* f0e10a0: afa20010 */ sw $v0,0x10($sp) /* f0e10a4: 100000b8 */ b .PF0f0e1388 /* f0e10a8: 8fbf002c */ lw $ra,0x2c($sp) .PF0f0e10ac: -/* f0e10ac: 0fc5a253 */ jal 0xf16894c +/* f0e10ac: 0fc5a253 */ jal gfxAllocateColours /* f0e10b0: 24040001 */ li $a0,0x1 /* f0e10b4: afa2008c */ sw $v0,0x8c($sp) -/* f0e10b8: 0fc5a239 */ jal 0xf1688e4 +/* f0e10b8: 0fc5a239 */ jal gfxAllocateVertices /* f0e10bc: 24040004 */ li $a0,0x4 /* f0e10c0: 02001825 */ move $v1,$s0 /* f0e10c4: 26100008 */ addiu $s0,$s0,0x8 @@ -521,12 +521,12 @@ glabel func0f0e0998 /* f0e124c: ac4c0004 */ sw $t4,0x4($v0) /* f0e1250: ac4b0000 */ sw $t3,0x0($v0) /* f0e1254: 26100008 */ addiu $s0,$s0,0x8 -/* f0e1258: 0c002e53 */ jal 0xb94c +/* f0e1258: 0c002e53 */ jal viGetWidth /* f0e125c: afa50088 */ sw $a1,0x88($sp) /* f0e1260: 00026880 */ sll $t5,$v0,0x2 /* f0e1264: 01a26821 */ addu $t5,$t5,$v0 /* f0e1268: 000d6840 */ sll $t5,$t5,0x1 -/* f0e126c: 0c002e57 */ jal 0xb95c +/* f0e126c: 0c002e57 */ jal viGetHeight /* f0e1270: afad0084 */ sw $t5,0x84($sp) /* f0e1274: 8fa50088 */ lw $a1,0x88($sp) /* f0e1278: 87a9009a */ lh $t1,0x9a($sp) @@ -576,7 +576,7 @@ glabel func0f0e0998 /* f0e1328: afa3003c */ sw $v1,0x3c($sp) /* f0e132c: 26100008 */ addiu $s0,$s0,0x8 /* f0e1330: afa50088 */ sw $a1,0x88($sp) -/* f0e1334: 0c012ab0 */ jal 0x4aac0 +/* f0e1334: 0c012ab0 */ jal osVirtualToPhysical /* f0e1338: 00c02025 */ move $a0,$a2 /* f0e133c: 8fa3003c */ lw $v1,0x3c($sp) /* f0e1340: 8fa40088 */ lw $a0,0x88($sp) @@ -586,7 +586,7 @@ glabel func0f0e0998 /* f0e1350: ac620004 */ sw $v0,0x4($v1) /* f0e1354: accb0000 */ sw $t3,0x0($a2) /* f0e1358: afa60038 */ sw $a2,0x38($sp) -/* f0e135c: 0c012ab0 */ jal 0x4aac0 +/* f0e135c: 0c012ab0 */ jal osVirtualToPhysical /* f0e1360: 26100008 */ addiu $s0,$s0,0x8 /* f0e1364: 8fa60038 */ lw $a2,0x38($sp) /* f0e1368: 3c0cb100 */ lui $t4,0xb100 diff --git a/src/game/game_0f09f0.c b/src/game/game_0f09f0.c index 70e384abb..ecdaa01a2 100644 --- a/src/game/game_0f09f0.c +++ b/src/game/game_0f09f0.c @@ -309,7 +309,7 @@ glabel func0f0f0ce8 /* f0f1490: afa20040 */ sw $v0,0x40($sp) /* f0f1494: afb90084 */ sw $t9,0x84($sp) /* f0f1498: afa30064 */ sw $v1,0x64($sp) -/* f0f149c: 0fc5bdaa */ jal 0xf16f6a8 +/* f0f149c: 0fc5bdaa */ jal langGet /* f0f14a0: afa80060 */ sw $t0,0x60($sp) /* f0f14a4: 8fac0060 */ lw $t4,0x60($sp) /* f0f14a8: 27a4007c */ addiu $a0,$sp,0x7c @@ -317,9 +317,9 @@ glabel func0f0f0ce8 /* f0f14b0: 00403025 */ move $a2,$v0 /* f0f14b4: 8fa70064 */ lw $a3,0x64($sp) /* f0f14b8: afa00014 */ sw $zero,0x14($sp) -/* f0f14bc: 0fc5609a */ jal 0xf158268 +/* f0f14bc: 0fc5609a */ jal textMeasure /* f0f14c0: afac0010 */ sw $t4,0x10($sp) -/* f0f14c4: 0fc5bdaa */ jal 0xf16f6a8 +/* f0f14c4: 0fc5bdaa */ jal langGet /* f0f14c8: 240451ef */ li $a0,0x51ef /* f0f14cc: 8fad0060 */ lw $t5,0x60($sp) /* f0f14d0: 27a40074 */ addiu $a0,$sp,0x74 @@ -327,7 +327,7 @@ glabel func0f0f0ce8 /* f0f14d8: 00403025 */ move $a2,$v0 /* f0f14dc: 8fa70064 */ lw $a3,0x64($sp) /* f0f14e0: afa00014 */ sw $zero,0x14($sp) -/* f0f14e4: 0fc5609a */ jal 0xf158268 +/* f0f14e4: 0fc5609a */ jal textMeasure /* f0f14e8: afad0010 */ sw $t5,0x10($sp) /* f0f14ec: 8fae0040 */ lw $t6,0x40($sp) /* f0f14f0: 240151eb */ li $at,0x51eb @@ -357,7 +357,7 @@ glabel func0f0f0ce8 /* f0f1548: afa60080 */ sw $a2,0x80($sp) /* f0f154c: afab006c */ sw $t3,0x6c($sp) /* f0f1550: afae0068 */ sw $t6,0x68($sp) -/* f0f1554: 0fc5513c */ jal 0xf1544f0 +/* f0f1554: 0fc5513c */ jal gfxSetPrimColour /* f0f1558: afa60084 */ sw $a2,0x84($sp) /* f0f155c: 3c038008 */ lui $v1,0x8008 /* f0f1560: 24630020 */ addiu $v1,$v1,0x20 @@ -386,10 +386,10 @@ glabel func0f0f0ce8 /* f0f15bc: 312a03ff */ andi $t2,$t1,0x3ff /* f0f15c0: 000a6380 */ sll $t4,$t2,0xe /* f0f15c4: 018e7825 */ or $t7,$t4,$t6 -/* f0f15c8: 0fc55153 */ jal 0xf15454c +/* f0f15c8: 0fc55153 */ jal func0f153838 /* f0f15cc: ac4f0004 */ sw $t7,0x4($v0) /* f0f15d0: 00402025 */ move $a0,$v0 -/* f0f15d4: 0fc5513c */ jal 0xf1544f0 +/* f0f15d4: 0fc5513c */ jal gfxSetPrimColour /* f0f15d8: 24057f7f */ li $a1,0x7f7f /* f0f15dc: 3c038008 */ lui $v1,0x8008 /* f0f15e0: 24630020 */ addiu $v1,$v1,0x20 @@ -415,11 +415,11 @@ glabel func0f0f0ce8 /* f0f1630: 314d03ff */ andi $t5,$t2,0x3ff /* f0f1634: 000d6380 */ sll $t4,$t5,0xe /* f0f1638: 018b7825 */ or $t7,$t4,$t3 -/* f0f163c: 0fc55153 */ jal 0xf15454c +/* f0f163c: 0fc55153 */ jal func0f153838 /* f0f1640: ac4f0004 */ sw $t7,0x4($v0) /* f0f1644: 3c057f7f */ lui $a1,0x7f7f /* f0f1648: 34a5ff7f */ ori $a1,$a1,0xff7f -/* f0f164c: 0fc5513c */ jal 0xf1544f0 +/* f0f164c: 0fc5513c */ jal gfxSetPrimColour /* f0f1650: 00402025 */ move $a0,$v0 /* f0f1654: 3c038008 */ lui $v1,0x8008 /* f0f1658: 24630020 */ addiu $v1,$v1,0x20 @@ -471,9 +471,9 @@ glabel func0f0f0ce8 /* f0f1710: 31ee03ff */ andi $t6,$t7,0x3ff /* f0f1714: 000e5b80 */ sll $t3,$t6,0xe /* f0f1718: 01695025 */ or $t2,$t3,$t1 -/* f0f171c: 0fc55153 */ jal 0xf15454c +/* f0f171c: 0fc55153 */ jal func0f153838 /* f0f1720: ac4a000c */ sw $t2,0xc($v0) -/* f0f1724: 0fc550cf */ jal 0xf15433c +/* f0f1724: 0fc550cf */ jal func0f153628 /* f0f1728: 00402025 */ move $a0,$v0 /* f0f172c: 8fad0094 */ lw $t5,0x94($sp) /* f0f1730: 8fac00ac */ lw $t4,0xac($sp) @@ -503,13 +503,13 @@ glabel func0f0f0ce8 /* f0f1788: 24c60002 */ addiu $a2,$a2,0x2 /* f0f178c: 95e40000 */ lhu $a0,0x0($t7) /* f0f1790: afa60084 */ sw $a2,0x84($sp) -/* f0f1794: 0fc5bdaa */ jal 0xf16f6a8 +/* f0f1794: 0fc5bdaa */ jal langGet /* f0f1798: afa30044 */ sw $v1,0x44($sp) -/* f0f179c: 0c002e53 */ jal 0xb94c +/* f0f179c: 0c002e53 */ jal viGetWidth /* f0f17a0: afa2004c */ sw $v0,0x4c($sp) /* f0f17a4: 00028400 */ sll $s0,$v0,0x10 /* f0f17a8: 00107403 */ sra $t6,$s0,0x10 -/* f0f17ac: 0c002e53 */ jal 0xb94c +/* f0f17ac: 0c002e53 */ jal viGetWidth /* f0f17b0: 01c08025 */ move $s0,$t6 /* f0f17b4: 8fb90064 */ lw $t9,0x64($sp) /* f0f17b8: 8fb80060 */ lw $t8,0x60($sp) @@ -524,7 +524,7 @@ glabel func0f0f0ce8 /* f0f17dc: afa00024 */ sw $zero,0x24($sp) /* f0f17e0: afa00028 */ sw $zero,0x28($sp) /* f0f17e4: afb90010 */ sw $t9,0x10($sp) -/* f0f17e8: 0fc55c50 */ jal 0xf157140 +/* f0f17e8: 0fc55c50 */ jal textRenderProjected /* f0f17ec: afb80014 */ sw $t8,0x14($sp) /* f0f17f0: 8faa0070 */ lw $t2,0x70($sp) /* f0f17f4: 8fa90044 */ lw $t1,0x44($sp) @@ -540,13 +540,13 @@ glabel func0f0f0ce8 /* f0f1818: 24c60003 */ addiu $a2,$a2,0x3 /* f0f181c: afaf0088 */ sw $t7,0x88($sp) /* f0f1820: afa60084 */ sw $a2,0x84($sp) -/* f0f1824: 0fc5bdaa */ jal 0xf16f6a8 +/* f0f1824: 0fc5bdaa */ jal langGet /* f0f1828: 240451ef */ li $a0,0x51ef -/* f0f182c: 0c002e53 */ jal 0xb94c +/* f0f182c: 0c002e53 */ jal viGetWidth /* f0f1830: afa2004c */ sw $v0,0x4c($sp) /* f0f1834: 00028400 */ sll $s0,$v0,0x10 /* f0f1838: 00107403 */ sra $t6,$s0,0x10 -/* f0f183c: 0c002e53 */ jal 0xb94c +/* f0f183c: 0c002e53 */ jal viGetWidth /* f0f1840: 01c08025 */ move $s0,$t6 /* f0f1844: 8fb90064 */ lw $t9,0x64($sp) /* f0f1848: 8fb80060 */ lw $t8,0x60($sp) @@ -561,7 +561,7 @@ glabel func0f0f0ce8 /* f0f186c: afa00024 */ sw $zero,0x24($sp) /* f0f1870: afa00028 */ sw $zero,0x28($sp) /* f0f1874: afb90010 */ sw $t9,0x10($sp) -/* f0f1878: 0fc55c50 */ jal 0xf157140 +/* f0f1878: 0fc55c50 */ jal textRenderProjected /* f0f187c: afb80014 */ sw $t8,0x14($sp) /* f0f1880: 8fa90078 */ lw $t1,0x78($sp) /* f0f1884: 8faa0044 */ lw $t2,0x44($sp) @@ -576,13 +576,13 @@ glabel func0f0f0ce8 /* f0f18a4: 014d6023 */ subu $t4,$t2,$t5 /* f0f18a8: afac0088 */ sw $t4,0x88($sp) /* f0f18ac: 95e40000 */ lhu $a0,0x0($t7) -/* f0f18b0: 0fc5bdaa */ jal 0xf16f6a8 +/* f0f18b0: 0fc5bdaa */ jal langGet /* f0f18b4: afa60084 */ sw $a2,0x84($sp) -/* f0f18b8: 0c002e53 */ jal 0xb94c +/* f0f18b8: 0c002e53 */ jal viGetWidth /* f0f18bc: afa2004c */ sw $v0,0x4c($sp) /* f0f18c0: 00028400 */ sll $s0,$v0,0x10 /* f0f18c4: 00107403 */ sra $t6,$s0,0x10 -/* f0f18c8: 0c002e53 */ jal 0xb94c +/* f0f18c8: 0c002e53 */ jal viGetWidth /* f0f18cc: 01c08025 */ move $s0,$t6 /* f0f18d0: 8fb90064 */ lw $t9,0x64($sp) /* f0f18d4: 8fb80060 */ lw $t8,0x60($sp) @@ -598,7 +598,7 @@ glabel func0f0f0ce8 /* f0f18fc: afa00024 */ sw $zero,0x24($sp) /* f0f1900: afa00028 */ sw $zero,0x28($sp) /* f0f1904: afb90010 */ sw $t9,0x10($sp) -/* f0f1908: 0fc55c50 */ jal 0xf157140 +/* f0f1908: 0fc55c50 */ jal textRenderProjected /* f0f190c: afb80014 */ sw $t8,0x14($sp) /* f0f1910: 8faa0070 */ lw $t2,0x70($sp) /* f0f1914: 8fa60084 */ lw $a2,0x84($sp) @@ -613,13 +613,13 @@ glabel func0f0f0ce8 /* f0f1934: 012d6023 */ subu $t4,$t1,$t5 /* f0f1938: afac0088 */ sw $t4,0x88($sp) /* f0f193c: afa60084 */ sw $a2,0x84($sp) -/* f0f1940: 0fc5bdaa */ jal 0xf16f6a8 +/* f0f1940: 0fc5bdaa */ jal langGet /* f0f1944: 240451ef */ li $a0,0x51ef -/* f0f1948: 0c002e53 */ jal 0xb94c +/* f0f1948: 0c002e53 */ jal viGetWidth /* f0f194c: afa2004c */ sw $v0,0x4c($sp) /* f0f1950: 00028400 */ sll $s0,$v0,0x10 /* f0f1954: 00107c03 */ sra $t7,$s0,0x10 -/* f0f1958: 0c002e53 */ jal 0xb94c +/* f0f1958: 0c002e53 */ jal viGetWidth /* f0f195c: 01e08025 */ move $s0,$t7 /* f0f1960: 8fae0064 */ lw $t6,0x64($sp) /* f0f1964: 8fb90060 */ lw $t9,0x60($sp) @@ -635,7 +635,7 @@ glabel func0f0f0ce8 /* f0f198c: afa00024 */ sw $zero,0x24($sp) /* f0f1990: afa00028 */ sw $zero,0x28($sp) /* f0f1994: afae0010 */ sw $t6,0x10($sp) -/* f0f1998: 0fc55c50 */ jal 0xf157140 +/* f0f1998: 0fc55c50 */ jal textRenderProjected /* f0f199c: afb90014 */ sw $t9,0x14($sp) /* f0f19a0: 8fab0040 */ lw $t3,0x40($sp) /* f0f19a4: 8fa60080 */ lw $a2,0x80($sp) @@ -654,11 +654,11 @@ glabel func0f0f0ce8 /* f0f19d4: 01ac7821 */ addu $t7,$t5,$t4 /* f0f19d8: 25eefff9 */ addiu $t6,$t7,-7 /* f0f19dc: afae0088 */ sw $t6,0x88($sp) -/* f0f19e0: 0c002e53 */ jal 0xb94c +/* f0f19e0: 0c002e53 */ jal viGetWidth /* f0f19e4: afa60084 */ sw $a2,0x84($sp) /* f0f19e8: 00028400 */ sll $s0,$v0,0x10 /* f0f19ec: 0010cc03 */ sra $t9,$s0,0x10 -/* f0f19f0: 0c002e53 */ jal 0xb94c +/* f0f19f0: 0c002e53 */ jal viGetWidth /* f0f19f4: 03208025 */ move $s0,$t9 /* f0f19f8: 3c188008 */ lui $t8,0x8008 /* f0f19fc: 3c0b8008 */ lui $t3,0x8008 @@ -677,11 +677,11 @@ glabel func0f0f0ce8 /* f0f1a30: afa00024 */ sw $zero,0x24($sp) /* f0f1a34: afa00028 */ sw $zero,0x28($sp) /* f0f1a38: afab0014 */ sw $t3,0x14($sp) -/* f0f1a3c: 0fc55c50 */ jal 0xf157140 +/* f0f1a3c: 0fc55c50 */ jal textRenderProjected /* f0f1a40: afb80010 */ sw $t8,0x10($sp) /* f0f1a44: 00408825 */ move $s1,$v0 .PF0f0f1a48: -/* f0f1a48: 0fc55125 */ jal 0xf154494 +/* f0f1a48: 0fc55125 */ jal func0f153780 /* f0f1a4c: 02202025 */ move $a0,$s1 /* f0f1a50: 8fbf003c */ lw $ra,0x3c($sp) /* f0f1a54: 8fb00034 */ lw $s0,0x34($sp) @@ -1445,14 +1445,14 @@ glabel var7f1b3610pf .PF0f0f1ea8: /* f0f1ea8: 1000017f */ b .PF0f0f24a8 /* f0f1eac: a6580000 */ sh $t8,0x0($s2) -/* f0f1eb0: 0fc3c722 */ jal 0xf0f1c88 +/* f0f1eb0: 0fc3c722 */ jal menuResolveParam2Text /* f0f1eb4: 02002025 */ move $a0,$s0 /* f0f1eb8: 1040000b */ beqz $v0,.PF0f0f1ee8 /* f0f1ebc: 00403025 */ move $a2,$v0 /* f0f1ec0: 3c057f1b */ lui $a1,0x7f1b /* f0f1ec4: 24a536e0 */ addiu $a1,$a1,0x36e0 /* f0f1ec8: 00402025 */ move $a0,$v0 -/* f0f1ecc: 0c004c01 */ jal 0x13004 +/* f0f1ecc: 0c004c01 */ jal strcmp /* f0f1ed0: afa20074 */ sw $v0,0x74($sp) /* f0f1ed4: 14400004 */ bnez $v0,.PF0f0f1ee8 /* f0f1ed8: 8fa60074 */ lw $a2,0x74($sp) @@ -1470,7 +1470,7 @@ glabel var7f1b3610pf /* f0f1f04: 27a4006c */ addiu $a0,$sp,0x6c /* f0f1f08: 27a50070 */ addiu $a1,$sp,0x70 /* f0f1f0c: afa00014 */ sw $zero,0x14($sp) -/* f0f1f10: 0fc5609a */ jal 0xf158268 +/* f0f1f10: 0fc5609a */ jal textMeasure /* f0f1f14: afb90010 */ sw $t9,0x10($sp) .PF0f0f1f18: /* f0f1f18: 8fa80070 */ lw $t0,0x70($sp) @@ -1502,7 +1502,7 @@ glabel var7f1b3610pf /* f0f1f80: 27a50070 */ addiu $a1,$sp,0x70 /* f0f1f84: 00403025 */ move $a2,$v0 /* f0f1f88: afa00014 */ sw $zero,0x14($sp) -/* f0f1f8c: 0fc5609a */ jal 0xf158268 +/* f0f1f8c: 0fc5609a */ jal textMeasure /* f0f1f90: afac0010 */ sw $t4,0x10($sp) /* f0f1f94: 8e0d0004 */ lw $t5,0x4($s0) /* f0f1f98: 8fb80070 */ lw $t8,0x70($sp) @@ -1561,7 +1561,7 @@ glabel var7f1b3610pf /* f0f2060: afae0068 */ sw $t6,0x68($sp) /* f0f2064: afaf0064 */ sw $t7,0x64($sp) .PF0f0f2068: -/* f0f2068: 0fc3c722 */ jal 0xf0f1c88 +/* f0f2068: 0fc3c722 */ jal menuResolveParam2Text /* f0f206c: 02002025 */ move $a0,$s0 /* f0f2070: 14400004 */ bnez $v0,.PF0f0f2084 /* f0f2074: 00403025 */ move $a2,$v0 @@ -1572,7 +1572,7 @@ glabel var7f1b3610pf /* f0f2084: 3c057f1b */ lui $a1,0x7f1b /* f0f2088: 24a536e4 */ addiu $a1,$a1,0x36e4 /* f0f208c: 00c02025 */ move $a0,$a2 -/* f0f2090: 0c004c01 */ jal 0x13004 +/* f0f2090: 0c004c01 */ jal strcmp /* f0f2094: afa60074 */ sw $a2,0x74($sp) /* f0f2098: 14400004 */ bnez $v0,.PF0f0f20ac /* f0f209c: 8fa60074 */ lw $a2,0x74($sp) @@ -1585,7 +1585,7 @@ glabel var7f1b3610pf /* f0f20b4: 27a50070 */ addiu $a1,$sp,0x70 /* f0f20b8: 8fa70068 */ lw $a3,0x68($sp) /* f0f20bc: afa00014 */ sw $zero,0x14($sp) -/* f0f20c0: 0fc5609a */ jal 0xf158268 +/* f0f20c0: 0fc5609a */ jal textMeasure /* f0f20c4: afb80010 */ sw $t8,0x10($sp) /* f0f20c8: 87a80072 */ lh $t0,0x72($sp) /* f0f20cc: 25090022 */ addiu $t1,$t0,0x22 @@ -1622,7 +1622,7 @@ glabel var7f1b3610pf .PF0f0f2140: /* f0f2140: 100000d9 */ b .PF0f0f24a8 /* f0f2144: a6490000 */ sh $t1,0x0($s2) -/* f0f2148: 0fc3c722 */ jal 0xf0f1c88 +/* f0f2148: 0fc3c722 */ jal menuResolveParam2Text /* f0f214c: 02002025 */ move $a0,$s0 /* f0f2150: 14400004 */ bnez $v0,.PF0f0f2164 /* f0f2154: 00403025 */ move $a2,$v0 @@ -1652,7 +1652,7 @@ glabel var7f1b3610pf /* f0f21ac: afad0068 */ sw $t5,0x68($sp) /* f0f21b0: afae0064 */ sw $t6,0x64($sp) .PF0f0f21b4: -/* f0f21b4: 0c004c01 */ jal 0x13004 +/* f0f21b4: 0c004c01 */ jal strcmp /* f0f21b8: afa60074 */ sw $a2,0x74($sp) /* f0f21bc: 14400005 */ bnez $v0,.PF0f0f21d4 /* f0f21c0: 8fa60074 */ lw $a2,0x74($sp) @@ -1666,7 +1666,7 @@ glabel var7f1b3610pf /* f0f21dc: 27a50070 */ addiu $a1,$sp,0x70 /* f0f21e0: 8fa70068 */ lw $a3,0x68($sp) /* f0f21e4: afa00014 */ sw $zero,0x14($sp) -/* f0f21e8: 0fc5609a */ jal 0xf158268 +/* f0f21e8: 0fc5609a */ jal textMeasure /* f0f21ec: afb80010 */ sw $t8,0x10($sp) /* f0f21f0: 87a80072 */ lh $t0,0x72($sp) /* f0f21f4: 3c010040 */ lui $at,0x40 @@ -1697,7 +1697,7 @@ glabel var7f1b3610pf .PF0f0f2254: /* f0f2254: 5520001c */ bnezl $t1,.PF0f0f22c8 /* f0f2258: 8e020004 */ lw $v0,0x4($s0) -/* f0f225c: 0fc3c704 */ jal 0xf0f1c10 +/* f0f225c: 0fc3c704 */ jal menuResolveText /* f0f2260: 8e04000c */ lw $a0,0xc($s0) /* f0f2264: 10400017 */ beqz $v0,.PF0f0f22c4 /* f0f2268: 00403025 */ move $a2,$v0 @@ -1709,7 +1709,7 @@ glabel var7f1b3610pf /* f0f2280: 27a50070 */ addiu $a1,$sp,0x70 /* f0f2284: 8fa70068 */ lw $a3,0x68($sp) /* f0f2288: afa00014 */ sw $zero,0x14($sp) -/* f0f228c: 0fc5609a */ jal 0xf158268 +/* f0f228c: 0fc5609a */ jal textMeasure /* f0f2290: afab0010 */ sw $t3,0x10($sp) /* f0f2294: 86390000 */ lh $t9,0x0($s1) /* f0f2298: 8fac0070 */ lw $t4,0x70($sp) @@ -1770,7 +1770,7 @@ glabel var7f1b3610pf /* f0f235c: 1140000d */ beqz $t2,.PF0f0f2394 /* f0f2360: 00000000 */ nop /* f0f2364: afa30034 */ sw $v1,0x34($sp) -/* f0f2368: 0fc5b6fa */ jal 0xf16dbe8 +/* f0f2368: 0fc5b6fa */ jal coreGetDifficulty /* f0f236c: afa40038 */ sw $a0,0x38($sp) /* f0f2370: 8fa30034 */ lw $v1,0x34($sp) /* f0f2374: 240b0001 */ li $t3,0x1 @@ -4213,13 +4213,13 @@ glabel var7f1b3c40pf .PF0f0f4068: /* f0f4068: 5720000e */ bnezl $t9,.PF0f0f40a4 /* f0f406c: 8e090004 */ lw $t1,0x4($s0) -/* f0f4070: 0fc278ae */ jal 0xf09e2b8 +/* f0f4070: 0fc278ae */ jal func0f09e004 /* f0f4074: 24040001 */ li $a0,0x1 /* f0f4078: 10400007 */ beqz $v0,.PF0f0f4098 /* f0f407c: 00000000 */ nop -/* f0f4080: 0fc27828 */ jal 0xf09e0a0 +/* f0f4080: 0fc27828 */ jal func0f09ddec /* f0f4084: 00000000 */ nop -/* f0f4088: 0fc2782c */ jal 0xf09e0b0 +/* f0f4088: 0fc2782c */ jal func0f09ddfc /* f0f408c: ae020004 */ sw $v0,0x4($s0) /* f0f4090: 10000003 */ b .PF0f0f40a0 /* f0f4094: ae020008 */ sw $v0,0x8($s0) @@ -4248,7 +4248,7 @@ glabel var7f1b3c40pf .PF0f0f40e0: /* f0f40e0: 54610004 */ bnel $v1,$at,.PF0f0f40f4 /* f0f40e4: 92020000 */ lbu $v0,0x0($s0) -/* f0f40e8: 0fc674da */ jal 0xf19d368 +/* f0f40e8: 0fc674da */ jal mpClearCurrentChallenge /* f0f40ec: 00000000 */ nop /* f0f40f0: 92020000 */ lbu $v0,0x0($s0) .PF0f0f40f4: @@ -4284,25 +4284,25 @@ glabel var7f1b3c40pf /* f0f415c: 322a00ff */ andi $t2,$s1,0xff /* f0f4160: 00025e02 */ srl $t3,$v0,0x18 /* f0f4164: 01408825 */ move $s1,$t2 -/* f0f4168: 0fc6330d */ jal 0xf18cc34 +/* f0f4168: 0fc6330d */ jal mpGetBodyId /* f0f416c: 316400ff */ andi $a0,$t3,0xff -/* f0f4170: 0fc632f0 */ jal 0xf18cbc0 +/* f0f4170: 0fc632f0 */ jal func0f18bb1c /* f0f4174: afa20404 */ sw $v0,0x404($sp) /* f0f4178: 0222082a */ slt $at,$s1,$v0 /* f0f417c: 10200005 */ beqz $at,.PF0f0f4194 /* f0f4180: 00000000 */ nop -/* f0f4184: 0fc632f4 */ jal 0xf18cbd0 +/* f0f4184: 0fc632f4 */ jal mpGetHeadId /* f0f4188: 322400ff */ andi $a0,$s1,0xff /* f0f418c: 1000000b */ b .PF0f0f41bc /* f0f4190: afa20400 */ sw $v0,0x400($sp) .PF0f0f4194: -/* f0f4194: 0fc632f0 */ jal 0xf18cbc0 +/* f0f4194: 0fc632f0 */ jal func0f18bb1c /* f0f4198: 00000000 */ nop -/* f0f419c: 0fc52daa */ jal 0xf14b6a8 +/* f0f419c: 0fc52daa */ jal func0f14a9f8 /* f0f41a0: 02222023 */ subu $a0,$s1,$v0 -/* f0f41a4: 0fc63302 */ jal 0xf18cc08 +/* f0f41a4: 0fc63302 */ jal mpGetBeauHeadId /* f0f41a8: 304400ff */ andi $a0,$v0,0xff -/* f0f41ac: 0fc632f0 */ jal 0xf18cbc0 +/* f0f41ac: 0fc632f0 */ jal func0f18bb1c /* f0f41b0: afa20400 */ sw $v0,0x400($sp) /* f0f41b4: 02226823 */ subu $t5,$s1,$v0 /* f0f41b8: a20d05b0 */ sb $t5,0x5b0($s0) @@ -4317,7 +4317,7 @@ glabel var7f1b3c40pf /* f0f41d8: 96220002 */ lhu $v0,0x2($s1) /* f0f41dc: 00402025 */ move $a0,$v0 /* f0f41e0: a7a2040a */ sh $v0,0x40a($sp) -/* f0f41e4: 0fc59ff5 */ jal 0xf167fd4 +/* f0f41e4: 0fc59ff5 */ jal fileGetInflatedLength /* f0f41e8: afa2003c */ sw $v0,0x3c($sp) /* f0f41ec: 8e2a0000 */ lw $t2,0x0($s1) /* f0f41f0: 2443003f */ addiu $v1,$v0,0x3f @@ -4338,7 +4338,7 @@ glabel var7f1b3c40pf /* f0f4228: 000f7880 */ sll $t7,$t7,0x2 /* f0f422c: 022f8821 */ addu $s1,$s1,$t7 /* f0f4230: 9631d3d6 */ lhu $s1,-0x2c2a($s1) -/* f0f4234: 0fc59ff5 */ jal 0xf167fd4 +/* f0f4234: 0fc59ff5 */ jal fileGetInflatedLength /* f0f4238: 02202025 */ move $a0,$s1 /* f0f423c: 8fb80420 */ lw $t8,0x420($sp) /* f0f4240: 2459003f */ addiu $t9,$v0,0x3f @@ -4353,7 +4353,7 @@ glabel var7f1b3c40pf /* f0f4260: afa30420 */ sw $v1,0x420($sp) /* f0f4264: 27a40410 */ addiu $a0,$sp,0x410 /* f0f4268: 01832821 */ addu $a1,$t4,$v1 -/* f0f426c: 0fc5cfa8 */ jal 0xf173ea0 +/* f0f426c: 0fc5cfa8 */ jal func0f172e70 /* f0f4270: 01a33023 */ subu $a2,$t5,$v1 /* f0f4274: 8fae0400 */ lw $t6,0x400($sp) /* f0f4278: 8e050004 */ lw $a1,0x4($s0) @@ -4362,16 +4362,16 @@ glabel var7f1b3c40pf /* f0f4284: 8faf0404 */ lw $t7,0x404($sp) /* f0f4288: a60f056a */ sh $t7,0x56a($s0) /* f0f428c: 8fa60420 */ lw $a2,0x420($sp) -/* f0f4290: 0fc6a265 */ jal 0xf1a8994 +/* f0f4290: 0fc6a265 */ jal func0f1a7794 /* f0f4294: 97a4040a */ lhu $a0,0x40a($sp) /* f0f4298: ae020054 */ sw $v0,0x54($s0) -/* f0f429c: 0fc5a080 */ jal 0xf168200 +/* f0f429c: 0fc5a080 */ jal fileGetSize /* f0f42a0: 8fa4003c */ lw $a0,0x3c($sp) /* f0f42a4: 2443003f */ addiu $v1,$v0,0x3f /* f0f42a8: 3479003f */ ori $t9,$v1,0x3f /* f0f42ac: 3b29003f */ xori $t1,$t9,0x3f /* f0f42b0: 8e040054 */ lw $a0,0x54($s0) -/* f0f42b4: 0c00898a */ jal 0x22628 +/* f0f42b4: 0c00898a */ jal func00022d24 /* f0f42b8: afa9040c */ sw $t1,0x40c($sp) /* f0f42bc: 8fb80400 */ lw $t8,0x400($sp) /* f0f42c0: 8fa3040c */ lw $v1,0x40c($sp) @@ -4385,26 +4385,26 @@ glabel var7f1b3c40pf /* f0f42dc: afb10040 */ sw $s1,0x40($sp) /* f0f42e0: 01633023 */ subu $a2,$t3,$v1 /* f0f42e4: 27a70410 */ addiu $a3,$sp,0x410 -/* f0f42e8: 0fc6a265 */ jal 0xf1a8994 +/* f0f42e8: 0fc6a265 */ jal func0f1a7794 /* f0f42ec: 01432821 */ addu $a1,$t2,$v1 /* f0f42f0: ae020058 */ sw $v0,0x58($s0) -/* f0f42f4: 0fc5a080 */ jal 0xf168200 +/* f0f42f4: 0fc5a080 */ jal fileGetSize /* f0f42f8: 8fa40040 */ lw $a0,0x40($sp) /* f0f42fc: 8e040058 */ lw $a0,0x58($s0) /* f0f4300: 8fa50400 */ lw $a1,0x400($sp) -/* f0f4304: 0fc0b7b7 */ jal 0xf02dedc +/* f0f4304: 0fc0b7b7 */ jal func0f02ddbc /* f0f4308: 8fa60404 */ lw $a2,0x404($sp) -/* f0f430c: 0c00898a */ jal 0x22628 +/* f0f430c: 0c00898a */ jal func00022d24 /* f0f4310: 8e040058 */ lw $a0,0x58($s0) .PF0f0f4314: /* f0f4314: 26040060 */ addiu $a0,$s0,0x60 /* f0f4318: 8e050054 */ lw $a1,0x54($s0) /* f0f431c: afa4003c */ sw $a0,0x3c($sp) /* f0f4320: 26060110 */ addiu $a2,$s0,0x110 -/* f0f4324: 0c008a2a */ jal 0x228a8 +/* f0f4324: 0c008a2a */ jal func00022fa4 /* f0f4328: 24070001 */ li $a3,0x1 /* f0f432c: 26110084 */ addiu $s1,$s0,0x84 -/* f0f4330: 0c008a69 */ jal 0x229a4 +/* f0f4330: 0c008a69 */ jal animInitialise /* f0f4334: 02202025 */ move $a0,$s1 /* f0f4338: 240c0100 */ li $t4,0x100 /* f0f433c: a60c0062 */ sh $t4,0x62($s0) @@ -4418,12 +4418,12 @@ glabel var7f1b3c40pf /* f0f435c: afa00010 */ sw $zero,0x10($sp) /* f0f4360: 8fa50400 */ lw $a1,0x400($sp) /* f0f4364: 8fa40404 */ lw $a0,0x404($sp) -/* f0f4368: 0fc0b3eb */ jal 0xf02cfac +/* f0f4368: 0fc0b3eb */ jal func0f02ce8c /* f0f436c: afad0014 */ sw $t5,0x14($sp) /* f0f4370: 10000027 */ b .PF0f0f4410 /* f0f4374: 8e0b000c */ lw $t3,0xc($s0) .PF0f0f4378: -/* f0f4378: 0fc59ff5 */ jal 0xf167fd4 +/* f0f4378: 0fc59ff5 */ jal fileGetInflatedLength /* f0f437c: 00402025 */ move $a0,$v0 /* f0f4380: 2443003f */ addiu $v1,$v0,0x3f /* f0f4384: 346f003f */ ori $t7,$v1,0x3f @@ -4434,7 +4434,7 @@ glabel var7f1b3c40pf /* f0f4398: afa30420 */ sw $v1,0x420($sp) /* f0f439c: 27a40410 */ addiu $a0,$sp,0x410 /* f0f43a0: 01232821 */ addu $a1,$t1,$v1 -/* f0f43a4: 0fc5cfa8 */ jal 0xf173ea0 +/* f0f43a4: 0fc5cfa8 */ jal func0f172e70 /* f0f43a8: 03033023 */ subu $a2,$t8,$v1 /* f0f43ac: 2402ffff */ li $v0,-1 /* f0f43b0: a6020002 */ sh $v0,0x2($s0) @@ -4442,20 +4442,20 @@ glabel var7f1b3c40pf /* f0f43b8: 8fa60420 */ lw $a2,0x420($sp) /* f0f43bc: 9604000e */ lhu $a0,0xe($s0) /* f0f43c0: 8e050004 */ lw $a1,0x4($s0) -/* f0f43c4: 0fc6a265 */ jal 0xf1a8994 +/* f0f43c4: 0fc6a265 */ jal func0f1a7794 /* f0f43c8: 27a70410 */ addiu $a3,$sp,0x410 /* f0f43cc: ae020054 */ sw $v0,0x54($s0) -/* f0f43d0: 0fc5a080 */ jal 0xf168200 +/* f0f43d0: 0fc5a080 */ jal fileGetSize /* f0f43d4: 8e04000c */ lw $a0,0xc($s0) -/* f0f43d8: 0c00898a */ jal 0x22628 +/* f0f43d8: 0c00898a */ jal func00022d24 /* f0f43dc: 8e040054 */ lw $a0,0x54($s0) /* f0f43e0: 26040060 */ addiu $a0,$s0,0x60 /* f0f43e4: 8e050054 */ lw $a1,0x54($s0) /* f0f43e8: 26060110 */ addiu $a2,$s0,0x110 -/* f0f43ec: 0c008a2a */ jal 0x228a8 +/* f0f43ec: 0c008a2a */ jal func00022fa4 /* f0f43f0: 24070001 */ li $a3,0x1 /* f0f43f4: 26110084 */ addiu $s1,$s0,0x84 -/* f0f43f8: 0c008a69 */ jal 0x229a4 +/* f0f43f8: 0c008a69 */ jal animInitialise /* f0f43fc: 02202025 */ move $a0,$s1 /* f0f4400: 240a0100 */ li $t2,0x100 /* f0f4404: a60a0062 */ sh $t2,0x62($s0) @@ -4499,10 +4499,10 @@ glabel var7f1b3c40pf /* f0f4488: 000a6280 */ sll $t4,$t2,0xa /* f0f448c: 05830018 */ bgezl $t4,.PF0f0f44f0 /* f0f4490: 8faa0440 */ lw $t2,0x440($sp) -/* f0f4494: 0c002bf1 */ jal 0xafc4 +/* f0f4494: 0c002bf1 */ jal func0000b280 /* f0f4498: 8fa40440 */ lw $a0,0x440($sp) /* f0f449c: afa20440 */ sw $v0,0x440($sp) -/* f0f44a0: 0c002bc5 */ jal 0xaf14 +/* f0f44a0: 0c002bc5 */ jal func0000b1d0 /* f0f44a4: 00402025 */ move $a0,$v0 /* f0f44a8: 3c0f800a */ lui $t7,0x800a /* f0f44ac: 91ef2535 */ lbu $t7,0x2535($t7) @@ -4513,7 +4513,7 @@ glabel var7f1b3c40pf /* f0f44c0: 24010002 */ li $at,0x2 /* f0f44c4: 11c10003 */ beq $t6,$at,.PF0f0f44d4 /* f0f44c8: afa20440 */ sw $v0,0x440($sp) -/* f0f44cc: 0fc3d610 */ jal 0xf0f5840 +/* f0f44cc: 0fc3d610 */ jal func0f0f50fc /* f0f44d0: 00402025 */ move $a0,$v0 .PF0f0f44d4: /* f0f44d4: 244d0008 */ addiu $t5,$v0,0x8 @@ -4556,7 +4556,7 @@ glabel var7f1b3c40pf /* f0f4560: 8c8b0004 */ lw $t3,0x4($a0) /* f0f4564: 554b002f */ bnel $t2,$t3,.PF0f0f4624 /* f0f4568: 8fb902f4 */ lw $t9,0x2f4($sp) -/* f0f456c: 0c0069ab */ jal 0x1a6ac +/* f0f456c: 0c0069ab */ jal modelGetPart /* f0f4570: 24050006 */ li $a1,0x6 /* f0f4574: 5040002b */ beqzl $v0,.PF0f0f4624 /* f0f4578: 8fb902f4 */ lw $t9,0x2f4($sp) @@ -4566,7 +4566,7 @@ glabel var7f1b3c40pf /* f0f4588: 448c4000 */ mtc1 $t4,$f8 /* f0f458c: 8c510004 */ lw $s1,0x4($v0) /* f0f4590: 468042a0 */ cvt.s.w $f10,$f8 -/* f0f4594: 0fc01af0 */ jal 0xf006bc0 +/* f0f4594: 0fc01af0 */ jal func0f006bd0 /* f0f4598: 46105303 */ div.s $f12,$f10,$f16 /* f0f459c: 44806000 */ mtc1 $zero,$f12 /* f0f45a0: 3c013f80 */ lui $at,0x3f80 @@ -4599,13 +4599,13 @@ glabel var7f1b3c40pf /* f0f460c: 8fa4003c */ lw $a0,0x3c($sp) /* f0f4610: 46128102 */ mul.s $f4,$f16,$f18 /* f0f4614: 46041203 */ div.s $f8,$f2,$f4 -/* f0f4618: 0fc1a34e */ jal 0xf068d38 +/* f0f4618: 0fc1a34e */ jal func0f068aa8 /* f0f461c: e7a802f8 */ swc1 $f8,0x2f8($sp) /* f0f4620: 8fb902f4 */ lw $t9,0x2f4($sp) .PF0f0f4624: /* f0f4624: 13200025 */ beqz $t9,.PF0f0f46bc /* f0f4628: 00000000 */ nop -/* f0f462c: 0fc1a34e */ jal 0xf068d38 +/* f0f462c: 0fc1a34e */ jal func0f068aa8 /* f0f4630: 8fa4003c */ lw $a0,0x3c($sp) /* f0f4634: 10400021 */ beqz $v0,.PF0f0f46bc /* f0f4638: 00000000 */ nop @@ -4642,7 +4642,7 @@ glabel var7f1b3c40pf /* f0f46b4: 46065403 */ div.s $f16,$f10,$f6 /* f0f46b8: e7b002f8 */ swc1 $f16,0x2f8($sp) .PF0f0f46bc: -/* f0f46bc: 0c0055d0 */ jal 0x15740 +/* f0f46bc: 0c0055d0 */ jal func000159b0 /* f0f46c0: 27a40350 */ addiu $a0,$sp,0x350 /* f0f46c4: 8fad0448 */ lw $t5,0x448($sp) /* f0f46c8: 24010001 */ li $at,0x1 @@ -4776,7 +4776,7 @@ glabel var7f1b3c40pf /* f0f48a8: e6000528 */ swc1 $f0,0x528($s0) /* f0f48ac: e7a20398 */ swc1 $f2,0x398($sp) /* f0f48b0: e7ac039c */ swc1 $f12,0x39c($sp) -/* f0f48b4: 0c005887 */ jal 0x1621c +/* f0f48b4: 0c005887 */ jal func0001648c /* f0f48b8: e7a003a0 */ swc1 $f0,0x3a0($sp) /* f0f48bc: 100000b4 */ b .PF0f0f4b90 /* f0f48c0: 3c01c2c8 */ lui $at,0xc2c8 @@ -4820,7 +4820,7 @@ glabel var7f1b3c40pf .PF0f0f4954: /* f0f4954: c4283c38 */ lwc1 $f8,0x3c38($at) /* f0f4958: 46080302 */ mul.s $f12,$f0,$f8 -/* f0f495c: 0c006858 */ jal 0x1a160 +/* f0f495c: 0c006858 */ jal cosf /* f0f4960: 00000000 */ nop /* f0f4964: 3c013f00 */ lui $at,0x3f00 /* f0f4968: 44813000 */ mtc1 $at,$f6 @@ -4900,7 +4900,7 @@ glabel var7f1b3c40pf /* f0f4a80: e7b00294 */ swc1 $f16,0x294($sp) /* f0f4a84: c6060528 */ lwc1 $f6,0x528($s0) /* f0f4a88: e7ae02d0 */ swc1 $f14,0x2d0($sp) -/* f0f4a8c: 0fc25af0 */ jal 0xf096bc0 +/* f0f4a8c: 0fc25af0 */ jal func0f096ca0 /* f0f4a90: e7a60298 */ swc1 $f6,0x298($sp) /* f0f4a94: c6040548 */ lwc1 $f4,0x548($s0) /* f0f4a98: 02202025 */ move $a0,$s1 @@ -4909,17 +4909,17 @@ glabel var7f1b3c40pf /* f0f4aa4: c612054c */ lwc1 $f18,0x54c($s0) /* f0f4aa8: e7b20294 */ swc1 $f18,0x294($sp) /* f0f4aac: c6080550 */ lwc1 $f8,0x550($s0) -/* f0f4ab0: 0fc25af0 */ jal 0xf096bc0 +/* f0f4ab0: 0fc25af0 */ jal func0f096ca0 /* f0f4ab4: e7a80298 */ swc1 $f8,0x298($sp) /* f0f4ab8: c7ae02d0 */ lwc1 $f14,0x2d0($sp) /* f0f4abc: 27b1029c */ addiu $s1,$sp,0x29c /* f0f4ac0: 02203825 */ move $a3,$s1 /* f0f4ac4: 44067000 */ mfc1 $a2,$f14 /* f0f4ac8: 27a402bc */ addiu $a0,$sp,0x2bc -/* f0f4acc: 0fc25c76 */ jal 0xf0971d8 +/* f0f4acc: 0fc25c76 */ jal func0f0972b8 /* f0f4ad0: 27a502ac */ addiu $a1,$sp,0x2ac /* f0f4ad4: 02202025 */ move $a0,$s1 -/* f0f4ad8: 0fc25b7d */ jal 0xf096df4 +/* f0f4ad8: 0fc25b7d */ jal func0f096ed4 /* f0f4adc: 27a50350 */ addiu $a1,$sp,0x350 /* f0f4ae0: 8e0205b0 */ lw $v0,0x5b0($s0) /* f0f4ae4: 00024b00 */ sll $t1,$v0,0xc @@ -4934,7 +4934,7 @@ glabel var7f1b3c40pf /* f0f4b04: e6000528 */ swc1 $f0,0x528($s0) /* f0f4b08: e7a20398 */ swc1 $f2,0x398($sp) /* f0f4b0c: e7ac039c */ swc1 $f12,0x39c($sp) -/* f0f4b10: 0c005887 */ jal 0x1621c +/* f0f4b10: 0c005887 */ jal func0001648c /* f0f4b14: e7a003a0 */ swc1 $f0,0x3a0($sp) /* f0f4b18: 8e0205b0 */ lw $v0,0x5b0($s0) /* f0f4b1c: 00025300 */ sll $t2,$v0,0xc @@ -4964,7 +4964,7 @@ glabel var7f1b3c40pf /* f0f4b78: e6000528 */ swc1 $f0,0x528($s0) /* f0f4b7c: e7a20398 */ swc1 $f2,0x398($sp) /* f0f4b80: e7ac039c */ swc1 $f12,0x39c($sp) -/* f0f4b84: 0c005887 */ jal 0x1621c +/* f0f4b84: 0c005887 */ jal func0001648c /* f0f4b88: e7a003a0 */ swc1 $f0,0x3a0($sp) /* f0f4b8c: 3c01c2c8 */ lui $at,0xc2c8 .PF0f0f4b90: @@ -4992,11 +4992,11 @@ glabel var7f1b3c40pf /* f0f4be4: 10000027 */ b .PF0f0f4c84 /* f0f4be8: e7b00394 */ swc1 $f16,0x394($sp) .PF0f0f4bec: -/* f0f4bec: 0c002e91 */ jal 0xba44 +/* f0f4bec: 0c002e91 */ jal viGetViewLeft /* f0f4bf0: 00000000 */ nop /* f0f4bf4: 00028c00 */ sll $s1,$v0,0x10 /* f0f4bf8: 00117403 */ sra $t6,$s1,0x10 -/* f0f4bfc: 0c002e73 */ jal 0xb9cc +/* f0f4bfc: 0c002e73 */ jal viGetViewWidth /* f0f4c00: 01c08825 */ move $s1,$t6 /* f0f4c04: 44823000 */ mtc1 $v0,$f6 /* f0f4c08: 3c0d8008 */ lui $t5,0x8008 @@ -5013,11 +5013,11 @@ glabel var7f1b3c40pf /* f0f4c34: 46802420 */ cvt.s.w $f16,$f4 /* f0f4c38: 46109280 */ add.s $f10,$f18,$f16 /* f0f4c3c: 460a4180 */ add.s $f6,$f8,$f10 -/* f0f4c40: 0c002e95 */ jal 0xba54 +/* f0f4c40: 0c002e95 */ jal viGetViewTop /* f0f4c44: e7a60390 */ swc1 $f6,0x390($sp) /* f0f4c48: 00028c00 */ sll $s1,$v0,0x10 /* f0f4c4c: 00114c03 */ sra $t1,$s1,0x10 -/* f0f4c50: 0c002e77 */ jal 0xb9dc +/* f0f4c50: 0c002e77 */ jal viGetViewHeight /* f0f4c54: 01208825 */ move $s1,$t1 /* f0f4c58: 44822000 */ mtc1 $v0,$f4 /* f0f4c5c: 44913000 */ mtc1 $s1,$f6 @@ -5034,9 +5034,9 @@ glabel var7f1b3c40pf /* f0f4c84: 27a40390 */ addiu $a0,$sp,0x390 .PF0f0f4c88: /* f0f4c88: 27a50398 */ addiu $a1,$sp,0x398 -/* f0f4c8c: 0fc2d457 */ jal 0xf0b515c +/* f0f4c8c: 0fc2d457 */ jal func0f0b4c3c /* f0f4c90: 3c063f80 */ lui $a2,0x3f80 -/* f0f4c94: 0c0055d0 */ jal 0x15740 +/* f0f4c94: 0c0055d0 */ jal func000159b0 /* f0f4c98: 27a40310 */ addiu $a0,$sp,0x310 /* f0f4c9c: 8e0205b4 */ lw $v0,0x5b4($s0) /* f0f4ca0: 5040001d */ beqzl $v0,.PF0f0f4d18 @@ -5048,13 +5048,13 @@ glabel var7f1b3c40pf /* f0f4cb8: 8fab0448 */ lw $t3,0x448($sp) /* f0f4cbc: 8e040054 */ lw $a0,0x54($s0) .PF0f0f4cc0: -/* f0f4cc0: 0c0069ab */ jal 0x1a6ac +/* f0f4cc0: 0c0069ab */ jal modelGetPart /* f0f4cc4: afa3028c */ sw $v1,0x28c($sp) /* f0f4cc8: 8fa3028c */ lw $v1,0x28c($sp) /* f0f4ccc: 1040000d */ beqz $v0,.PF0f0f4d04 /* f0f4cd0: 00402825 */ move $a1,$v0 /* f0f4cd4: 8fa4003c */ lw $a0,0x3c($sp) -/* f0f4cd8: 0c0069eb */ jal 0x1a7ac +/* f0f4cd8: 0c0069eb */ jal modelGetNodeData /* f0f4cdc: afa3028c */ sw $v1,0x28c($sp) /* f0f4ce0: 10400008 */ beqz $v0,.PF0f0f4d04 /* f0f4ce4: 8fa3028c */ lw $v1,0x28c($sp) @@ -5098,7 +5098,7 @@ glabel var7f1b3c40pf /* f0f4d70: e7aa039c */ swc1 $f10,0x39c($sp) /* f0f4d74: e7a203a0 */ swc1 $f2,0x3a0($sp) .PF0f0f4d78: -/* f0f4d78: 0c00591b */ jal 0x1646c +/* f0f4d78: 0c00591b */ jal func000166dc /* f0f4d7c: 27a50310 */ addiu $a1,$sp,0x310 /* f0f4d80: 8fac0308 */ lw $t4,0x308($sp) /* f0f4d84: 5180000a */ beqzl $t4,.PF0f0f4db0 @@ -5107,19 +5107,19 @@ glabel var7f1b3c40pf /* f0f4d90: c7a802f8 */ lwc1 $f8,0x2f8($sp) /* f0f4d94: 27a50310 */ addiu $a1,$sp,0x310 /* f0f4d98: 46082302 */ mul.s $f12,$f4,$f8 -/* f0f4d9c: 0c005725 */ jal 0x15c94 +/* f0f4d9c: 0c005725 */ jal func00015f04 /* f0f4da0: 00000000 */ nop /* f0f4da4: 10000005 */ b .PF0f0f4dbc /* f0f4da8: 8faf0308 */ lw $t7,0x308($sp) /* f0f4dac: c7ac0424 */ lwc1 $f12,0x424($sp) .PF0f0f4db0: -/* f0f4db0: 0c005725 */ jal 0x15c94 +/* f0f4db0: 0c005725 */ jal func00015f04 /* f0f4db4: 27a50310 */ addiu $a1,$sp,0x310 /* f0f4db8: 8faf0308 */ lw $t7,0x308($sp) .PF0f0f4dbc: /* f0f4dbc: 11e00005 */ beqz $t7,.PF0f0f4dd4 /* f0f4dc0: 27a402fc */ addiu $a0,$sp,0x2fc -/* f0f4dc4: 0c00591b */ jal 0x1646c +/* f0f4dc4: 0c00591b */ jal func000166dc /* f0f4dc8: 27a50204 */ addiu $a1,$sp,0x204 /* f0f4dcc: 1000000b */ b .PF0f0f4dfc /* f0f4dd0: 27b10244 */ addiu $s1,$sp,0x244 @@ -5131,28 +5131,28 @@ glabel var7f1b3c40pf /* f0f4de4: c6100530 */ lwc1 $f16,0x530($s0) /* f0f4de8: e7b0039c */ swc1 $f16,0x39c($sp) /* f0f4dec: c6060534 */ lwc1 $f6,0x534($s0) -/* f0f4df0: 0c00591b */ jal 0x1646c +/* f0f4df0: 0c00591b */ jal func000166dc /* f0f4df4: e7a603a0 */ swc1 $f6,0x3a0($sp) /* f0f4df8: 27b10244 */ addiu $s1,$sp,0x244 .PF0f0f4dfc: /* f0f4dfc: 02203025 */ move $a2,$s1 /* f0f4e00: 27a40310 */ addiu $a0,$sp,0x310 -/* f0f4e04: 0c0055e4 */ jal 0x15790 +/* f0f4e04: 0c0055e4 */ jal func00015a00 /* f0f4e08: 27a50350 */ addiu $a1,$sp,0x350 /* f0f4e0c: 8fb90448 */ lw $t9,0x448($sp) /* f0f4e10: 24010003 */ li $at,0x3 /* f0f4e14: 5721000f */ bnel $t9,$at,.PF0f0f4e54 /* f0f4e18: 26060014 */ addiu $a2,$s0,0x14 -/* f0f4e1c: 0fc4ee5a */ jal 0xf13b968 +/* f0f4e1c: 0fc4ee5a */ jal func0f13ae04 /* f0f4e20: 27a401c4 */ addiu $a0,$sp,0x1c4 /* f0f4e24: 27a401c4 */ addiu $a0,$sp,0x1c4 /* f0f4e28: 02202825 */ move $a1,$s1 -/* f0f4e2c: 0c0055e4 */ jal 0x15790 +/* f0f4e2c: 0c0055e4 */ jal func00015a00 /* f0f4e30: 27a60184 */ addiu $a2,$sp,0x184 /* f0f4e34: 26060014 */ addiu $a2,$s0,0x14 /* f0f4e38: afa60040 */ sw $a2,0x40($sp) /* f0f4e3c: 27a40184 */ addiu $a0,$sp,0x184 -/* f0f4e40: 0c0055e4 */ jal 0x15790 +/* f0f4e40: 0c0055e4 */ jal func00015a00 /* f0f4e44: 27a50204 */ addiu $a1,$sp,0x204 /* f0f4e48: 10000006 */ b .PF0f0f4e64 /* f0f4e4c: 00000000 */ nop @@ -5160,10 +5160,10 @@ glabel var7f1b3c40pf .PF0f0f4e54: /* f0f4e54: afa60040 */ sw $a2,0x40($sp) /* f0f4e58: 02202025 */ move $a0,$s1 -/* f0f4e5c: 0c0055e4 */ jal 0x15790 +/* f0f4e5c: 0c0055e4 */ jal func00015a00 /* f0f4e60: 27a50204 */ addiu $a1,$sp,0x204 .PF0f0f4e64: -/* f0f4e64: 0fc38a89 */ jal 0xf0e2a24 +/* f0f4e64: 0fc38a89 */ jal func0f0e2348 /* f0f4e68: 8fa40440 */ lw $a0,0x440($sp) /* f0f4e6c: 8fae0448 */ lw $t6,0x448($sp) /* f0f4e70: afa20440 */ sw $v0,0x440($sp) @@ -5172,16 +5172,16 @@ glabel var7f1b3c40pf /* f0f4e7c: 8e090054 */ lw $t1,0x54($s0) /* f0f4e80: 11c0000e */ beqz $t6,.PF0f0f4ebc /* f0f4e84: 3c11800a */ lui $s1,0x800a -/* f0f4e88: 0fc353da */ jal 0xf0d4f68 +/* f0f4e88: 0fc353da */ jal func0f0d49c8 /* f0f4e8c: 00402025 */ move $a0,$v0 /* f0f4e90: 244d0008 */ addiu $t5,$v0,0x8 /* f0f4e94: 3c090103 */ lui $t1,0x103 /* f0f4e98: 35290040 */ ori $t1,$t1,0x40 /* f0f4e9c: afad0440 */ sw $t5,0x440($sp) /* f0f4ea0: ac490000 */ sw $t1,0x0($v0) -/* f0f4ea4: 0fc2d542 */ jal 0xf0b5508 +/* f0f4ea4: 0fc2d542 */ jal currentPlayerGetUnk1750 /* f0f4ea8: 00408825 */ move $s1,$v0 -/* f0f4eac: 0c012ab0 */ jal 0x4aac0 +/* f0f4eac: 0c012ab0 */ jal osVirtualToPhysical /* f0f4eb0: 00402025 */ move $a0,$v0 /* f0f4eb4: 1000005f */ b .PF0f0f5034 /* f0f4eb8: ae220004 */ sw $v0,0x4($s1) @@ -5205,14 +5205,14 @@ glabel var7f1b3c40pf /* f0f4efc: 248438e0 */ addiu $a0,$a0,0x38e0 /* f0f4f00: 46805120 */ cvt.s.w $f4,$f10 /* f0f4f04: 46122403 */ div.s $f16,$f4,$f18 -/* f0f4f08: 0c003624 */ jal 0xd890 +/* f0f4f08: 0c003624 */ jal func0000db30 /* f0f4f0c: e7b0017c */ swc1 $f16,0x17c($sp) /* f0f4f10: 3c047f1b */ lui $a0,0x7f1b /* f0f4f14: 3c058007 */ lui $a1,0x8007 /* f0f4f18: 24a517a4 */ addiu $a1,$a1,0x17a4 -/* f0f4f1c: 0c003624 */ jal 0xd890 +/* f0f4f1c: 0c003624 */ jal func0000db30 /* f0f4f20: 248438e4 */ addiu $a0,$a0,0x38e4 -/* f0f4f24: 0fc353da */ jal 0xf0d4f68 +/* f0f4f24: 0fc353da */ jal func0f0d49c8 /* f0f4f28: 8fa40440 */ lw $a0,0x440($sp) /* f0f4f2c: 3c0d8008 */ lui $t5,0x8008 /* f0f4f30: 8dad0020 */ lw $t5,0x20($t5) @@ -5223,7 +5223,7 @@ glabel var7f1b3c40pf /* f0f4f44: 84a525e2 */ lh $a1,0x25e2($a1) /* f0f4f48: 00002012 */ mflo $a0 /* f0f4f4c: 00044c00 */ sll $t1,$a0,0x10 -/* f0f4f50: 0c002e7b */ jal 0xb9ec +/* f0f4f50: 0c002e7b */ jal viSetViewPosition /* f0f4f54: 00092403 */ sra $a0,$t1,0x10 /* f0f4f58: 3c0b800a */ lui $t3,0x800a /* f0f4f5c: 8d6b25dc */ lw $t3,0x25dc($t3) @@ -5245,7 +5245,7 @@ glabel var7f1b3c40pf /* f0f4f9c: 00003012 */ mflo $a2 /* f0f4fa0: 00067400 */ sll $t6,$a2,0x10 /* f0f4fa4: 000e3403 */ sra $a2,$t6,0x10 -/* f0f4fa8: 0c002ec7 */ jal 0xbb1c +/* f0f4fa8: 0c002ec7 */ jal viSetFovAspectAndSize /* f0f4fac: 000a3c03 */ sra $a3,$t2,0x10 /* f0f4fb0: 3c0c8007 */ lui $t4,0x8007 /* f0f4fb4: 8d8c1728 */ lw $t4,0x1728($t4) @@ -5253,7 +5253,7 @@ glabel var7f1b3c40pf /* f0f4fbc: 273925e8 */ addiu $t9,$t9,0x25e8 /* f0f4fc0: 000c7940 */ sll $t7,$t4,0x5 /* f0f4fc4: 01f92821 */ addu $a1,$t7,$t9 -/* f0f4fc8: 0c002b11 */ jal 0xac44 +/* f0f4fc8: 0c002b11 */ jal func0000af00 /* f0f4fcc: 8fa40440 */ lw $a0,0x440($sp) /* f0f4fd0: 3c0e8007 */ lui $t6,0x8007 /* f0f4fd4: 8dce17a0 */ lw $t6,0x17a0($t6) @@ -5279,7 +5279,7 @@ glabel var7f1b3c40pf /* f0f5020: 46044200 */ add.s $f8,$f8,$f4 .PF0f0f5024: /* f0f5024: 44064000 */ mfc1 $a2,$f8 -/* f0f5028: 0c002a7a */ jal 0xa9e8 +/* f0f5028: 0c002a7a */ jal func0000aca4 /* f0f502c: 00000000 */ nop /* f0f5030: afa20440 */ sw $v0,0x440($sp) .PF0f0f5034: @@ -5287,7 +5287,7 @@ glabel var7f1b3c40pf .PF0f0f5038: /* f0f5038: 8524000e */ lh $a0,0xe($t1) /* f0f503c: 0004c180 */ sll $t8,$a0,0x6 -/* f0f5040: 0fc5a25d */ jal 0xf168974 +/* f0f5040: 0fc5a25d */ jal gfxAllocate /* f0f5044: 03002025 */ move $a0,$t8 /* f0f5048: afa203b4 */ sw $v0,0x3b4($sp) /* f0f504c: 8e0a0054 */ lw $t2,0x54($s0) @@ -5298,7 +5298,7 @@ glabel var7f1b3c40pf /* f0f5060: 8faf03b4 */ lw $t7,0x3b4($sp) .PF0f0f5064: /* f0f5064: 00116180 */ sll $t4,$s1,0x6 -/* f0f5068: 0c0055d0 */ jal 0x15740 +/* f0f5068: 0c0055d0 */ jal func000159b0 /* f0f506c: 018f2021 */ addu $a0,$t4,$t7 /* f0f5070: 8e190054 */ lw $t9,0x54($s0) /* f0f5074: 26310001 */ addiu $s1,$s1,0x1 @@ -5328,15 +5328,15 @@ glabel var7f1b3c40pf /* f0f50d0: 00003025 */ move $a2,$zero /* f0f50d4: 24070000 */ li $a3,0x0 /* f0f50d8: e7b20010 */ swc1 $f18,0x10($sp) -/* f0f50dc: 0c0076a7 */ jal 0x1da9c +/* f0f50dc: 0c0076a7 */ jal modelSetAnimation /* f0f50e0: e7b00014 */ swc1 $f16,0x14($sp) -/* f0f50e4: 0c0073fa */ jal 0x1cfe8 +/* f0f50e4: 0c0073fa */ jal modelGetNumAnimFrames /* f0f50e8: 8fa4003c */ lw $a0,0x3c($sp) /* f0f50ec: 44823000 */ mtc1 $v0,$f6 /* f0f50f0: 8fa4003c */ lw $a0,0x3c($sp) /* f0f50f4: 468031a0 */ cvt.s.w $f6,$f6 /* f0f50f8: 44053000 */ mfc1 $a1,$f6 -/* f0f50fc: 0c00777a */ jal 0x1dde8 +/* f0f50fc: 0c00777a */ jal func0001e018 /* f0f5100: 00000000 */ nop /* f0f5104: 10000008 */ b .PF0f0f5128 /* f0f5108: 860c005c */ lh $t4,0x5c($s0) @@ -5345,7 +5345,7 @@ glabel var7f1b3c40pf /* f0f5110: 44804000 */ mtc1 $zero,$f8 /* f0f5114: 24070000 */ li $a3,0x0 /* f0f5118: e7aa0010 */ swc1 $f10,0x10($sp) -/* f0f511c: 0c0076a7 */ jal 0x1da9c +/* f0f511c: 0c0076a7 */ jal modelSetAnimation /* f0f5120: e7a80014 */ swc1 $f8,0x14($sp) /* f0f5124: 860c005c */ lh $t4,0x5c($s0) .PF0f0f5128: @@ -5358,16 +5358,16 @@ glabel var7f1b3c40pf /* f0f5138: 3c05800a */ lui $a1,0x800a /* f0f513c: 8ca5a550 */ lw $a1,-0x5ab0($a1) /* f0f5140: 8fa4003c */ lw $a0,0x3c($sp) -/* f0f5144: 0c007afa */ jal 0x1ebe8 +/* f0f5144: 0c007afa */ jal func0001ee18 /* f0f5148: 24060001 */ li $a2,0x1 /* f0f514c: 8e1905b0 */ lw $t9,0x5b0($s0) /* f0f5150: 00196ac0 */ sll $t5,$t9,0xb /* f0f5154: 05a1000c */ bgez $t5,.PF0f0f5188 /* f0f5158: 00000000 */ nop -/* f0f515c: 0c0073fa */ jal 0x1cfe8 +/* f0f515c: 0c0073fa */ jal modelGetNumAnimFrames /* f0f5160: 8fa4003c */ lw $a0,0x3c($sp) /* f0f5164: afa2004c */ sw $v0,0x4c($sp) -/* f0f5168: 0c0073d3 */ jal 0x1cf4c +/* f0f5168: 0c0073d3 */ jal modelGetCurAnimFrame /* f0f516c: 8fa4003c */ lw $a0,0x3c($sp) /* f0f5170: 8fa9004c */ lw $t1,0x4c($sp) /* f0f5174: 44892000 */ mtc1 $t1,$f4 @@ -5376,12 +5376,12 @@ glabel var7f1b3c40pf /* f0f5180: 10000004 */ b .PF0f0f5194 /* f0f5184: 46009081 */ sub.s $f2,$f18,$f0 .PF0f0f5188: -/* f0f5188: 0c0073d3 */ jal 0x1cf4c +/* f0f5188: 0c0073d3 */ jal modelGetCurAnimFrame /* f0f518c: 8fa4003c */ lw $a0,0x3c($sp) /* f0f5190: 46000086 */ mov.s $f2,$f0 .PF0f0f5194: /* f0f5194: 8fa4003c */ lw $a0,0x3c($sp) -/* f0f5198: 0c0073fa */ jal 0x1cfe8 +/* f0f5198: 0c0073fa */ jal modelGetNumAnimFrames /* f0f519c: e7a20178 */ swc1 $f2,0x178($sp) /* f0f51a0: 2458ffff */ addiu $t8,$v0,-1 /* f0f51a4: 44988000 */ mtc1 $t8,$f16 @@ -5395,14 +5395,14 @@ glabel var7f1b3c40pf .PF0f0f51c4: /* f0f51c4: 8fa40040 */ lw $a0,0x40($sp) .PF0f0f51c8: -/* f0f51c8: 0c0056aa */ jal 0x15aa8 +/* f0f51c8: 0c0056aa */ jal func00015d18 /* f0f51cc: 8fa503b4 */ lw $a1,0x3b4($sp) /* f0f51d0: 8faa0040 */ lw $t2,0x40($sp) /* f0f51d4: 27a403b8 */ addiu $a0,$sp,0x3b8 /* f0f51d8: 8fa5003c */ lw $a1,0x3c($sp) /* f0f51dc: afaa03b8 */ sw $t2,0x3b8($sp) /* f0f51e0: 8e0b006c */ lw $t3,0x6c($s0) -/* f0f51e4: 0c007323 */ jal 0x1cc8c +/* f0f51e4: 0c007323 */ jal func0001cebc /* f0f51e8: afab03c8 */ sw $t3,0x3c8($sp) /* f0f51ec: 8e040054 */ lw $a0,0x54($s0) /* f0f51f0: 3c0c8008 */ lui $t4,0x8008 @@ -5410,7 +5410,7 @@ glabel var7f1b3c40pf /* f0f51f8: 8c8f0004 */ lw $t7,0x4($a0) /* f0f51fc: 558f0096 */ bnel $t4,$t7,.PF0f0f5458 /* f0f5200: 8fad0440 */ lw $t5,0x440($sp) -/* f0f5204: 0c0069ab */ jal 0x1a6ac +/* f0f5204: 0c0069ab */ jal modelGetPart /* f0f5208: 00002825 */ move $a1,$zero /* f0f520c: 50400032 */ beqzl $v0,.PF0f0f52d8 /* f0f5210: 8e040054 */ lw $a0,0x54($s0) @@ -5467,21 +5467,21 @@ glabel var7f1b3c40pf /* f0f52d0: c50a0010 */ lwc1 $f10,0x10($t0) /* f0f52d4: 8e040054 */ lw $a0,0x54($s0) .PF0f0f52d8: -/* f0f52d8: 0c0069ab */ jal 0x1a6ac +/* f0f52d8: 0c0069ab */ jal modelGetPart /* f0f52dc: 24050002 */ li $a1,0x2 /* f0f52e0: 10400019 */ beqz $v0,.PF0f0f5348 /* f0f52e4: 00402025 */ move $a0,$v0 -/* f0f52e8: 0c0068ad */ jal 0x1a2b4 +/* f0f52e8: 0c0068ad */ jal func0001a524 /* f0f52ec: 00002825 */ move $a1,$zero /* f0f52f0: afa20160 */ sw $v0,0x160($sp) -/* f0f52f4: 0c0055d0 */ jal 0x15740 +/* f0f52f4: 0c0055d0 */ jal func000159b0 /* f0f52f8: 27a40120 */ addiu $a0,$sp,0x120 /* f0f52fc: 3c014080 */ lui $at,0x4080 /* f0f5300: 44816000 */ mtc1 $at,$f12 -/* f0f5304: 0fc01ad1 */ jal 0xf006b44 +/* f0f5304: 0fc01ad1 */ jal func0f006b54 /* f0f5308: 00000000 */ nop /* f0f530c: 46000306 */ mov.s $f12,$f0 -/* f0f5310: 0c00581e */ jal 0x16078 +/* f0f5310: 0c00581e */ jal func000162e8 /* f0f5314: 27a50120 */ addiu $a1,$sp,0x120 /* f0f5318: 8fac0160 */ lw $t4,0x160($sp) /* f0f531c: 8fab03b4 */ lw $t3,0x3b4($sp) @@ -5490,14 +5490,14 @@ glabel var7f1b3c40pf /* f0f5328: 016f3821 */ addu $a3,$t3,$t7 /* f0f532c: 00e02025 */ move $a0,$a3 /* f0f5330: afa70040 */ sw $a3,0x40($sp) -/* f0f5334: 0c0055e4 */ jal 0x15790 +/* f0f5334: 0c0055e4 */ jal func00015a00 /* f0f5338: 27a600e0 */ addiu $a2,$sp,0xe0 /* f0f533c: 8fa50040 */ lw $a1,0x40($sp) -/* f0f5340: 0c0056aa */ jal 0x15aa8 +/* f0f5340: 0c0056aa */ jal func00015d18 /* f0f5344: 27a400e0 */ addiu $a0,$sp,0xe0 .PF0f0f5348: /* f0f5348: 8e040054 */ lw $a0,0x54($s0) -/* f0f534c: 0c0069ab */ jal 0x1a6ac +/* f0f534c: 0c0069ab */ jal modelGetPart /* f0f5350: 24050001 */ li $a1,0x1 /* f0f5354: 1040003f */ beqz $v0,.PF0f0f5454 /* f0f5358: 00402025 */ move $a0,$v0 @@ -5513,7 +5513,7 @@ glabel var7f1b3c40pf /* f0f5380: 54410035 */ bnel $v0,$at,.PF0f0f5458 /* f0f5384: 8fad0440 */ lw $t5,0x440($sp) .PF0f0f5388: -/* f0f5388: 0c0068ad */ jal 0x1a2b4 +/* f0f5388: 0c0068ad */ jal func0001a524 /* f0f538c: 00002825 */ move $a1,$zero /* f0f5390: 8fb903b4 */ lw $t9,0x3b4($sp) /* f0f5394: 00027180 */ sll $t6,$v0,0x6 @@ -5525,9 +5525,9 @@ glabel var7f1b3c40pf /* f0f53ac: c4700034 */ lwc1 $f16,0x34($v1) /* f0f53b0: e7b000d4 */ swc1 $f16,0xd4($sp) /* f0f53b4: c4660038 */ lwc1 $f6,0x38($v1) -/* f0f53b8: 0fc2d489 */ jal 0xf0b5224 +/* f0f53b8: 0fc2d489 */ jal func0f0b4d04 /* f0f53bc: e7a600d8 */ swc1 $f6,0xd8($sp) -/* f0f53c0: 0c002e53 */ jal 0xb94c +/* f0f53c0: 0c002e53 */ jal viGetWidth /* f0f53c4: 00000000 */ nop /* f0f53c8: c7aa00c8 */ lwc1 $f10,0xc8($sp) /* f0f53cc: 3c0c8008 */ lui $t4,0x8008 @@ -5555,7 +5555,7 @@ glabel var7f1b3c40pf /* f0f5418: 3c01800a */ lui $at,0x800a /* f0f541c: 00005812 */ mflo $t3 /* f0f5420: ac2be408 */ sw $t3,-0x1bf8($at) -/* f0f5424: 0c002e57 */ jal 0xb95c +/* f0f5424: 0c002e57 */ jal viGetHeight /* f0f5428: 00000000 */ nop /* f0f542c: c7a400cc */ lwc1 $f4,0xcc($sp) /* f0f5430: 4600248d */ trunc.w.s $f18,$f4 @@ -5603,7 +5603,7 @@ glabel var7f1b3c40pf /* f0f54cc: 258b0008 */ addiu $t3,$t4,0x8 /* f0f54d0: afab0440 */ sw $t3,0x440($sp) /* f0f54d4: ad8f0000 */ sw $t7,0x0($t4) -/* f0f54d8: 0fc2d732 */ jal 0xf0b5cc8 +/* f0f54d8: 0fc2d732 */ jal currentPlayerGetUnk175c /* f0f54dc: afac00b8 */ sw $t4,0xb8($sp) /* f0f54e0: 8fa500b8 */ lw $a1,0xb8($sp) /* f0f54e4: 3c090382 */ lui $t1,0x382 @@ -5613,7 +5613,7 @@ glabel var7f1b3c40pf /* f0f54f4: 272e0008 */ addiu $t6,$t9,0x8 /* f0f54f8: afae0440 */ sw $t6,0x440($sp) /* f0f54fc: af290000 */ sw $t1,0x0($t9) -/* f0f5500: 0fc2d732 */ jal 0xf0b5cc8 +/* f0f5500: 0fc2d732 */ jal currentPlayerGetUnk175c /* f0f5504: afb900b4 */ sw $t9,0xb4($sp) /* f0f5508: 8fa600b4 */ lw $a2,0xb4($sp) /* f0f550c: 244d0010 */ addiu $t5,$v0,0x10 @@ -5636,10 +5636,10 @@ glabel var7f1b3c40pf /* f0f5550: afad03bc */ sw $t5,0x3bc($sp) /* f0f5554: 8fa5003c */ lw $a1,0x3c($sp) /* f0f5558: 27a403b8 */ addiu $a0,$sp,0x3b8 -/* f0f555c: 0c0085fe */ jal 0x217f8 +/* f0f555c: 0c0085fe */ jal modelRender /* f0f5560: afa903c4 */ sw $t1,0x3c4($sp) /* f0f5564: 8fb803c4 */ lw $t8,0x3c4($sp) -/* f0f5568: 0c00593c */ jal 0x164f0 +/* f0f5568: 0c00593c */ jal func00016760 /* f0f556c: afb80440 */ sw $t8,0x440($sp) /* f0f5570: 8e0a0054 */ lw $t2,0x54($s0) /* f0f5574: 00001025 */ move $v0,$zero @@ -5650,12 +5650,12 @@ glabel var7f1b3c40pf .PF0f0f5588: /* f0f5588: afa20040 */ sw $v0,0x40($sp) /* f0f558c: 27a50070 */ addiu $a1,$sp,0x70 -/* f0f5590: 0c0056aa */ jal 0x15aa8 +/* f0f5590: 0c0056aa */ jal func00015d18 /* f0f5594: 01622021 */ addu $a0,$t3,$v0 /* f0f5598: 8e0f006c */ lw $t7,0x6c($s0) /* f0f559c: 0011c980 */ sll $t9,$s1,0x6 /* f0f55a0: 27a40070 */ addiu $a0,$sp,0x70 -/* f0f55a4: 0c005779 */ jal 0x15de4 +/* f0f55a4: 0c005779 */ jal func00016054 /* f0f55a8: 01f92821 */ addu $a1,$t7,$t9 /* f0f55ac: 8e0e0054 */ lw $t6,0x54($s0) /* f0f55b0: 8fa20040 */ lw $v0,0x40($sp) @@ -5666,13 +5666,13 @@ glabel var7f1b3c40pf /* f0f55c4: 5420fff0 */ bnezl $at,.PF0f0f5588 /* f0f55c8: 8e0b006c */ lw $t3,0x6c($s0) .PF0f0f55cc: -/* f0f55cc: 0c005945 */ jal 0x16514 +/* f0f55cc: 0c005945 */ jal func00016784 /* f0f55d0: 00000000 */ nop /* f0f55d4: 8fad0448 */ lw $t5,0x448($sp) /* f0f55d8: 29a10003 */ slti $at,$t5,0x3 /* f0f55dc: 50200005 */ beqzl $at,.PF0f0f55f4 /* f0f55e0: 8fb80440 */ lw $t8,0x440($sp) -/* f0f55e4: 0fc3534f */ jal 0xf0d4d3c +/* f0f55e4: 0fc3534f */ jal func0f0d479c /* f0f55e8: 8fa40440 */ lw $a0,0x440($sp) /* f0f55ec: afa20440 */ sw $v0,0x440($sp) /* f0f55f0: 8fb80440 */ lw $t8,0x440($sp) @@ -5728,7 +5728,7 @@ glabel var7f1b3c40pf /* f0f56b4: afa00018 */ sw $zero,0x18($sp) /* f0f56b8: 00002825 */ move $a1,$zero /* f0f56bc: 24060002 */ li $a2,0x2 -/* f0f56c0: 0fc2cfb8 */ jal 0xf0b3ee0 +/* f0f56c0: 0fc2cfb8 */ jal func0f0b39c0 /* f0f56c4: 00003825 */ move $a3,$zero /* f0f56c8: 8fb90440 */ lw $t9,0x440($sp) /* f0f56cc: 3c09b900 */ lui $t1,0xb900 @@ -5747,7 +5747,7 @@ glabel var7f1b3c40pf /* f0f5700: 02002025 */ move $a0,$s0 /* f0f5704: 00002825 */ move $a1,$zero /* f0f5708: 24060002 */ li $a2,0x2 -/* f0f570c: 0fc2cfb8 */ jal 0xf0b3ee0 +/* f0f570c: 0fc2cfb8 */ jal func0f0b39c0 /* f0f5710: 00003825 */ move $a3,$zero /* f0f5714: 8fac0440 */ lw $t4,0x440($sp) /* f0f5718: 3c0f0600 */ lui $t7,0x600 @@ -12273,7 +12273,7 @@ glabel var7f1b3d5cpf /* f0f9cd0: 57ca0034 */ bnel $s8,$t2,.PF0f0f9da4 /* f0f9cd4: 93c9003c */ lbu $t1,0x3c($s8) /* f0f9cd8: 92700000 */ lbu $s0,0x0($s3) -/* f0f9cdc: 0fc6341f */ jal 0xf18d07c +/* f0f9cdc: 0fc6341f */ jal mpIsPlayerLockedOut /* f0f9ce0: afb10124 */ sw $s1,0x124($sp) /* f0f9ce4: 44807000 */ mtc1 $zero,$f14 /* f0f9ce8: 10400007 */ beqz $v0,.PF0f0f9d08 @@ -12613,7 +12613,7 @@ glabel var7f1b3d5cpf /* f0fa1a8: 05c00022 */ bltz $t6,.PF0f0fa234 /* f0fa1ac: 00000000 */ nop .PF0f0fa1b0: -/* f0fa1b0: 0fc3f4e3 */ jal 0xf0fd38c +/* f0fa1b0: 0fc3f4e3 */ jal menuGetRoot /* f0fa1b4: afb10124 */ sw $s1,0x124($sp) /* f0fa1b8: 3c013f80 */ lui $at,0x3f80 /* f0fa1bc: 44816000 */ mtc1 $at,$f12 @@ -12707,12 +12707,12 @@ glabel var7f1b3d5cpf /* f0fa2fc: 15800004 */ bnez $t4,.PF0f0fa310 /* f0fa300: 03c02825 */ move $a1,$s8 /* f0fa304: 8fa60114 */ lw $a2,0x114($sp) -/* f0fa308: 0fc3ca22 */ jal 0xf0f2888 +/* f0fa308: 0fc3ca22 */ jal func0f0f2134 /* f0fa30c: afb10124 */ sw $s1,0x124($sp) .PF0f0fa310: -/* f0fa310: 0fc3e177 */ jal 0xf0f85dc +/* f0fa310: 0fc3e177 */ jal func0f0f7e98 /* f0fa314: 03c02025 */ move $a0,$s8 -/* f0fa318: 0fc3c992 */ jal 0xf0f2648 +/* f0fa318: 0fc3c992 */ jal func0f0f1ef4 /* f0fa31c: 03c02025 */ move $a0,$s8 /* f0fa320: 3c02800a */ lui $v0,0x800a /* f0fa324: 8c421f64 */ lw $v0,0x1f64($v0) @@ -12947,7 +12947,7 @@ glabel var7f1b3d5cpf /* f0fa660: 00009825 */ move $s3,$zero /* f0fa664: 8fb10124 */ lw $s1,0x124($sp) /* f0fa668: 8c841728 */ lw $a0,0x1728($a0) -/* f0fa66c: 0fc6341f */ jal 0xf18d07c +/* f0fa66c: 0fc6341f */ jal mpIsPlayerLockedOut /* f0fa670: 010a9021 */ addu $s2,$t0,$t2 /* f0fa674: 50400008 */ beqzl $v0,.PF0f0fa698 /* f0fa678: 8e4d0004 */ lw $t5,0x4($s2) @@ -12962,9 +12962,9 @@ glabel var7f1b3d5cpf /* f0fa698: 000d7300 */ sll $t6,$t5,0xc /* f0fa69c: 05c10009 */ bgez $t6,.PF0f0fa6c4 /* f0fa6a0: 00000000 */ nop -/* f0fa6a4: 0fc629b0 */ jal 0xf18a6c0 +/* f0fa6a4: 0fc629b0 */ jal mpGetWeaponSet /* f0fa6a8: 00000000 */ nop -/* f0fa6ac: 0fc6284b */ jal 0xf18a12c +/* f0fa6ac: 0fc6284b */ jal func0f189088 /* f0fa6b0: 00408025 */ move $s0,$v0 /* f0fa6b4: 10500003 */ beq $v0,$s0,.PF0f0fa6c4 /* f0fa6b8: 00000000 */ nop @@ -13021,14 +13021,14 @@ glabel var7f1b3d5cpf /* f0fa774: 03c02825 */ move $a1,$s8 /* f0fa778: 02203025 */ move $a2,$s1 /* f0fa77c: 36070004 */ ori $a3,$s0,0x4 -/* f0fa780: 0fc3c389 */ jal 0xf0f0e24 +/* f0fa780: 0fc3c389 */ jal menuTickItem /* f0fa784: afb30010 */ sw $s3,0x10($sp) /* f0fa788: 1000000c */ b .PF0f0fa7bc /* f0fa78c: afa2011c */ sw $v0,0x11c($sp) .PF0f0fa790: /* f0fa790: 02203025 */ move $a2,$s1 /* f0fa794: 02003825 */ move $a3,$s0 -/* f0fa798: 0fc3c389 */ jal 0xf0f0e24 +/* f0fa798: 0fc3c389 */ jal menuTickItem /* f0fa79c: afb30010 */ sw $s3,0x10($sp) /* f0fa7a0: 10000006 */ b .PF0f0fa7bc /* f0fa7a4: afa2011c */ sw $v0,0x11c($sp) @@ -13037,7 +13037,7 @@ glabel var7f1b3d5cpf .PF0f0fa7ac: /* f0fa7ac: 02203025 */ move $a2,$s1 /* f0fa7b0: 02803825 */ move $a3,$s4 -/* f0fa7b4: 0fc3c389 */ jal 0xf0f0e24 +/* f0fa7b4: 0fc3c389 */ jal menuTickItem /* f0fa7b8: afb30010 */ sw $s3,0x10($sp) .PF0f0fa7bc: /* f0fa7bc: 92f80668 */ lbu $t8,0x668($s7) @@ -13058,7 +13058,7 @@ glabel var7f1b3d5cpf .PF0f0fa7f0: /* f0fa7f0: 1200000d */ beqz $s0,.PF0f0fa828 /* f0fa7f4: 02002025 */ move $a0,$s0 -/* f0fa7f8: 0fc3cb37 */ jal 0xf0f2cdc +/* f0fa7f8: 0fc3cb37 */ jal menuIsItemDisabled /* f0fa7fc: 03c02825 */ move $a1,$s8 /* f0fa800: 10400009 */ beqz $v0,.PF0f0fa828 /* f0fa804: 8fb90128 */ lw $t9,0x128($sp) @@ -13107,12 +13107,12 @@ glabel var7f1b3d5cpf /* f0fa8ac: 02008825 */ move $s1,$s0 /* f0fa8b0: 03c02025 */ move $a0,$s8 /* f0fa8b4: 81850000 */ lb $a1,0x0($t4) -/* f0fa8b8: 0fc3cce6 */ jal 0xf0f3398 +/* f0fa8b8: 0fc3cce6 */ jal func0f0f2c44 /* f0fa8bc: 81860001 */ lb $a2,0x1($t4) /* f0fa8c0: 8fcd0008 */ lw $t5,0x8($s8) /* f0fa8c4: 522d0016 */ beql $s1,$t5,.PF0f0fa920 /* f0fa8c8: 8fb80124 */ lw $t8,0x124($sp) -/* f0fa8cc: 0fc3c444 */ jal 0xf0f1110 +/* f0fa8cc: 0fc3c444 */ jal menuPlaySound /* f0fa8d0: 24040002 */ li $a0,0x2 /* f0fa8d4: 10000012 */ b .PF0f0fa920 /* f0fa8d8: 8fb80124 */ lw $t8,0x124($sp) @@ -13120,11 +13120,11 @@ glabel var7f1b3d5cpf /* f0fa8dc: 02008825 */ move $s1,$s0 /* f0fa8e0: 03c02025 */ move $a0,$s8 /* f0fa8e4: 81c50000 */ lb $a1,0x0($t6) -/* f0fa8e8: 0fc3cce6 */ jal 0xf0f3398 +/* f0fa8e8: 0fc3cce6 */ jal func0f0f2c44 /* f0fa8ec: 81c60001 */ lb $a2,0x1($t6) /* f0fa8f0: 10400005 */ beqz $v0,.PF0f0fa908 /* f0fa8f4: 00402025 */ move $a0,$v0 -/* f0fa8f8: 0fc3e5dd */ jal 0xf0f9774 +/* f0fa8f8: 0fc3e5dd */ jal func0f0f9030 /* f0fa8fc: 00000000 */ nop /* f0fa900: 10000007 */ b .PF0f0fa920 /* f0fa904: 8fb80124 */ lw $t8,0x124($sp) @@ -13132,7 +13132,7 @@ glabel var7f1b3d5cpf /* f0fa908: 8fcf0008 */ lw $t7,0x8($s8) /* f0fa90c: 522f0004 */ beql $s1,$t7,.PF0f0fa920 /* f0fa910: 8fb80124 */ lw $t8,0x124($sp) -/* f0fa914: 0fc3c444 */ jal 0xf0f1110 +/* f0fa914: 0fc3c444 */ jal menuPlaySound /* f0fa918: 24040002 */ li $a0,0x2 /* f0fa91c: 8fb80124 */ lw $t8,0x124($sp) .PF0f0fa920: @@ -13155,19 +13155,19 @@ glabel var7f1b3d5cpf /* f0fa960: 15410006 */ bne $t2,$at,.PF0f0fa97c /* f0fa964: 00000000 */ nop /* f0fa968: 3c048007 */ lui $a0,0x8007 -/* f0fa96c: 0fc3cda8 */ jal 0xf0f36a0 +/* f0fa96c: 0fc3cda8 */ jal menuPushDialog /* f0fa970: 248457c0 */ addiu $a0,$a0,0x57c0 /* f0fa974: 1000001f */ b .PF0f0fa9f4 /* f0fa978: 8fd00008 */ lw $s0,0x8($s8) .PF0f0fa97c: -/* f0fa97c: 0fc3cda8 */ jal 0xf0f36a0 +/* f0fa97c: 0fc3cda8 */ jal menuPushDialog /* f0fa980: 248450d0 */ addiu $a0,$a0,0x50d0 /* f0fa984: 1000001b */ b .PF0f0fa9f4 /* f0fa988: 8fd00008 */ lw $s0,0x8($s8) .PF0f0fa98c: /* f0fa98c: 55600019 */ bnezl $t3,.PF0f0fa9f4 /* f0fa990: 8fd00008 */ lw $s0,0x8($s8) -/* f0fa994: 0fc3cf8c */ jal 0xf0f3e30 +/* f0fa994: 0fc3cf8c */ jal menuPopDialog /* f0fa998: 00000000 */ nop /* f0fa99c: 10000015 */ b .PF0f0fa9f4 /* f0fa9a0: 8fd00008 */ lw $s0,0x8($s8) @@ -13190,7 +13190,7 @@ glabel var7f1b3d5cpf /* f0fa9e0: 55010004 */ bnel $t0,$at,.PF0f0fa9f4 /* f0fa9e4: 8fd00008 */ lw $s0,0x8($s8) .PF0f0fa9e8: -/* f0fa9e8: 0fc3cf8c */ jal 0xf0f3e30 +/* f0fa9e8: 0fc3cf8c */ jal menuPopDialog /* f0fa9ec: 00000000 */ nop .PF0f0fa9f0: /* f0fa9f0: 8fd00008 */ lw $s0,0x8($s8) @@ -13203,7 +13203,7 @@ glabel var7f1b3d5cpf /* f0faa08: 03c02025 */ move $a0,$s8 /* f0faa0c: 02002825 */ move $a1,$s0 /* f0faa10: 27a6007c */ addiu $a2,$sp,0x7c -/* f0faa14: 0fc3caaa */ jal 0xf0f2aa8 +/* f0faa14: 0fc3caaa */ jal func0f0f2354 /* f0faa18: 27a70078 */ addiu $a3,$sp,0x78 /* f0faa1c: 8fcc0008 */ lw $t4,0x8($s8) /* f0faa20: 8fb8007c */ lw $t8,0x7c($sp) @@ -14868,7 +14868,7 @@ glabel var7f1b2ac8 .PF0f0faed0: /* f0faed0: afa80124 */ sw $t0,0x124($sp) /* f0faed4: afa90128 */ sw $t1,0x128($sp) -/* f0faed8: 0fc3c6d1 */ jal 0xf0f1b44 +/* f0faed8: 0fc3c6d1 */ jal func0f0f1418 /* f0faedc: afac012c */ sw $t4,0x12c($sp) /* f0faee0: 8eef0000 */ lw $t7,0x0($s7) /* f0faee4: 8fa80124 */ lw $t0,0x124($sp) @@ -14909,7 +14909,7 @@ glabel var7f1b2ac8 /* f0faf6c: afa90128 */ sw $t1,0x128($sp) /* f0faf70: afaa00f4 */ sw $t2,0xf4($sp) /* f0faf74: afab00f0 */ sw $t3,0xf0($sp) -/* f0faf78: 0fc3defb */ jal 0xf0f7bec +/* f0faf78: 0fc3defb */ jal func0f0f74a8 /* f0faf7c: afac012c */ sw $t4,0x12c($sp) /* f0faf80: 83a200d7 */ lb $v0,0xd7($sp) /* f0faf84: 8fa80124 */ lw $t0,0x124($sp) @@ -14952,7 +14952,7 @@ glabel var7f1b2ac8 /* f0fb010: afab00f0 */ sw $t3,0xf0($sp) /* f0fb014: afac012c */ sw $t4,0x12c($sp) /* f0fb018: afae00cc */ sw $t6,0xcc($sp) -/* f0fb01c: 0fc42793 */ jal 0xf109e4c +/* f0fb01c: 0fc42793 */ jal func0f1094e4 /* f0fb020: a7af00d0 */ sh $t7,0xd0($sp) /* f0fb024: 8fa80124 */ lw $t0,0x124($sp) /* f0fb028: 8fa90128 */ lw $t1,0x128($sp) @@ -14975,22 +14975,22 @@ glabel var7f1b2ac8 /* f0fb060: afab00f0 */ sw $t3,0xf0($sp) /* f0fb064: afaa00f4 */ sw $t2,0xf4($sp) /* f0fb068: afa90128 */ sw $t1,0x128($sp) -/* f0fb06c: 0c0052e6 */ jal 0x14b98 +/* f0fb06c: 0c0052e6 */ jal contGetStickX /* f0fb070: afa80124 */ sw $t0,0x124($sp) /* f0fb074: 00028600 */ sll $s0,$v0,0x18 /* f0fb078: 0010c603 */ sra $t8,$s0,0x18 /* f0fb07c: 03008025 */ move $s0,$t8 -/* f0fb080: 0c005310 */ jal 0x14c40 +/* f0fb080: 0c005310 */ jal contGetStickY /* f0fb084: 82640003 */ lb $a0,0x3($s3) /* f0fb088: 00028e00 */ sll $s1,$v0,0x18 /* f0fb08c: 0011ce03 */ sra $t9,$s1,0x18 /* f0fb090: 03208825 */ move $s1,$t9 /* f0fb094: 82640003 */ lb $a0,0x3($s3) -/* f0fb098: 0c00533a */ jal 0x14ce8 +/* f0fb098: 0c00533a */ jal contGetButtons /* f0fb09c: 3405ffff */ li $a1,0xffff /* f0fb0a0: 3052ffff */ andi $s2,$v0,0xffff /* f0fb0a4: 82640003 */ lb $a0,0x3($s3) -/* f0fb0a8: 0c00536a */ jal 0x14da8 +/* f0fb0a8: 0c00536a */ jal contGetButtonsPressedThisFrame /* f0fb0ac: 3405ffff */ li $a1,0xffff /* f0fb0b0: 304e8000 */ andi $t6,$v0,0x8000 /* f0fb0b4: 8fa80124 */ lw $t0,0x124($sp) @@ -15724,7 +15724,7 @@ glabel var7f1b2ac8 /* f0fba38: 24060001 */ li $a2,0x1 /* f0fba3c: 24130001 */ li $s3,0x1 .PF0f0fba40: -/* f0fba40: 0fc3e6a8 */ jal 0xf0f9aa0 +/* f0fba40: 0fc3e6a8 */ jal func0f0f935c /* f0fba44: 8e240000 */ lw $a0,0x0($s1) /* f0fba48: 824e0014 */ lb $t6,0x14($s2) /* f0fba4c: 26100001 */ addiu $s0,$s0,0x1 @@ -15783,7 +15783,7 @@ glabel var7f1b2ac8 /* f0fbb18: 24845d08 */ addiu $a0,$a0,0x5d08 /* f0fbb1c: 10820005 */ beq $a0,$v0,.PF0f0fbb34 /* f0fbb20: 00000000 */ nop -/* f0fbb24: 0fc3cda8 */ jal 0xf0f36a0 +/* f0fbb24: 0fc3cda8 */ jal menuPushDialog /* f0fbb28: 00000000 */ nop /* f0fbb2c: 1000002f */ b .PF0f0fbbec /* f0fbb30: 8fbf003c */ lw $ra,0x3c($sp) @@ -15792,7 +15792,7 @@ glabel var7f1b2ac8 /* f0fbb38: 27186bd0 */ addiu $t8,$t8,0x6bd0 /* f0fbb3c: 5702002b */ bnel $t8,$v0,.PF0f0fbbec /* f0fbb40: 8fbf003c */ lw $ra,0x3c($sp) -/* f0fbb44: 0fc6011a */ jal 0xf180468 +/* f0fbb44: 0fc6011a */ jal func0f17f428 /* f0fbb48: 00000000 */ nop /* f0fbb4c: 10000027 */ b .PF0f0fbbec /* f0fbb50: 8fbf003c */ lw $ra,0x3c($sp) @@ -15800,7 +15800,7 @@ glabel var7f1b2ac8 /* f0fbb58: 8dce0a44 */ lw $t6,0xa44($t6) /* f0fbb5c: 51c00010 */ beqzl $t6,.PF0f0fbba0 /* f0fbb60: 240e000a */ li $t6,0xa -/* f0fbb64: 0fc3e219 */ jal 0xf0f8864 +/* f0fbb64: 0fc3e219 */ jal func0f0f8120 /* f0fbb68: 00000000 */ nop /* f0fbb6c: 3c0f8007 */ lui $t7,0x8007 /* f0fbb70: 8def1728 */ lw $t7,0x1728($t7) @@ -15832,7 +15832,7 @@ glabel var7f1b2ac8 /* f0fbbd4: 33380020 */ andi $t8,$t9,0x20 /* f0fbbd8: 57000004 */ bnezl $t8,.PF0f0fbbec /* f0fbbdc: 8fbf003c */ lw $ra,0x3c($sp) -/* f0fbbe0: 0fc3e219 */ jal 0xf0f8864 +/* f0fbbe0: 0fc3e219 */ jal func0f0f8120 /* f0fbbe4: 00000000 */ nop .PF0f0fbbe8: /* f0fbbe8: 8fbf003c */ lw $ra,0x3c($sp) @@ -17426,7 +17426,7 @@ glabel var7f1b2afc /* f0fc3f0: afb30040 */ sw $s3,0x40($sp) /* f0fc3f4: afb2003c */ sw $s2,0x3c($sp) /* f0fc3f8: afb00034 */ sw $s0,0x34($sp) -/* f0fc3fc: 0fc3534f */ jal 0xf0d4d3c +/* f0fc3fc: 0fc3534f */ jal func0f0d479c /* f0fc400: ac2e0020 */ sw $t6,0x20($at) /* f0fc404: 3c138006 */ lui $s3,0x8006 /* f0fc408: 3c17800a */ lui $s7,0x800a @@ -17449,23 +17449,23 @@ glabel var7f1b2afc /* f0fc44c: 92e50014 */ lbu $a1,0x14($s7) /* f0fc450: 46062201 */ sub.s $f8,$f4,$f6 /* f0fc454: 44064000 */ mfc1 $a2,$f8 -/* f0fc458: 0fc3ef06 */ jal 0xf0fbc18 +/* f0fc458: 0fc3ef06 */ jal func0f0fb488 /* f0fc45c: 00000000 */ nop /* f0fc460: 1000000e */ b .PF0f0fc49c /* f0fc464: 0040a825 */ move $s5,$v0 .PF0f0fc468: /* f0fc468: 92e50014 */ lbu $a1,0x14($s7) -/* f0fc46c: 0fc3ef06 */ jal 0xf0fbc18 +/* f0fc46c: 0fc3ef06 */ jal func0f0fb488 /* f0fc470: 3c063f80 */ lui $a2,0x3f80 /* f0fc474: 00402025 */ move $a0,$v0 /* f0fc478: 92e50015 */ lbu $a1,0x15($s7) -/* f0fc47c: 0fc3ef06 */ jal 0xf0fbc18 +/* f0fc47c: 0fc3ef06 */ jal func0f0fb488 /* f0fc480: 8ee60010 */ lw $a2,0x10($s7) /* f0fc484: 10000005 */ b .PF0f0fc49c /* f0fc488: 0040a825 */ move $s5,$v0 .PF0f0fc48c: /* f0fc48c: 92e50014 */ lbu $a1,0x14($s7) -/* f0fc490: 0fc3ef06 */ jal 0xf0fbc18 +/* f0fc490: 0fc3ef06 */ jal func0f0fb488 /* f0fc494: 3c063f80 */ lui $a2,0x3f80 /* f0fc498: 0040a825 */ move $s5,$v0 .PF0f0fc49c: @@ -17498,7 +17498,7 @@ glabel var7f1b2afc /* f0fc500: 00008025 */ move $s0,$zero /* f0fc504: 26b50008 */ addiu $s5,$s5,0x8 /* f0fc508: ac4b0000 */ sw $t3,0x0($v0) -/* f0fc50c: 0c004ad4 */ jal 0x12b50 +/* f0fc50c: 0c004ad4 */ jal random /* f0fc510: ac4c0004 */ sw $t4,0x4($v0) /* f0fc514: 44825000 */ mtc1 $v0,$f10 /* f0fc518: 3c014f80 */ lui $at,0x4f80 @@ -17518,7 +17518,7 @@ glabel var7f1b2afc /* f0fc54c: 00000000 */ nop /* f0fc550: 4502002d */ bc1fl .PF0f0fc608 /* f0fc554: 8ee30004 */ lw $v1,0x4($s7) -/* f0fc558: 0c004ad4 */ jal 0x12b50 +/* f0fc558: 0c004ad4 */ jal random /* f0fc55c: 00000000 */ nop /* f0fc560: 44829000 */ mtc1 $v0,$f18 /* f0fc564: 3c014f80 */ lui $at,0x4f80 @@ -17540,7 +17540,7 @@ glabel var7f1b2afc /* f0fc5a0: 460a4482 */ mul.s $f18,$f8,$f10 /* f0fc5a4: 46049400 */ add.s $f16,$f18,$f4 /* f0fc5a8: 46068201 */ sub.s $f8,$f16,$f6 -/* f0fc5ac: 0c004ad4 */ jal 0x12b50 +/* f0fc5ac: 0c004ad4 */ jal random /* f0fc5b0: e6e80554 */ swc1 $f8,0x554($s7) /* f0fc5b4: 44825000 */ mtc1 $v0,$f10 /* f0fc5b8: 3c014f80 */ lui $at,0x4f80 @@ -17649,7 +17649,7 @@ glabel var7f1b2afc /* f0fc72c: aee0059c */ sw $zero,0x59c($s7) /* f0fc730: a2e005d4 */ sb $zero,0x5d4($s7) .PF0f0fc734: -/* f0fc734: 0c003624 */ jal 0xd890 +/* f0fc734: 0c003624 */ jal func0000db30 /* f0fc738: 24a517d4 */ addiu $a1,$a1,0x17d4 /* f0fc73c: 3c0f8007 */ lui $t7,0x8007 /* f0fc740: 8def17d4 */ lw $t7,0x17d4($t7) @@ -17661,7 +17661,7 @@ glabel var7f1b2afc /* f0fc758: 24a51f7c */ addiu $a1,$a1,0x1f7c /* f0fc75c: 24060001 */ li $a2,0x1 /* f0fc760: 3319ffdf */ andi $t9,$t8,0xffdf -/* f0fc764: 0fc3d001 */ jal 0xf0f4004 +/* f0fc764: 0fc3d001 */ jal func0f0f38b0 /* f0fc768: a2f905d5 */ sb $t9,0x5d5($s7) /* f0fc76c: 3c0bb600 */ lui $t3,0xb600 /* f0fc770: 240a0001 */ li $t2,0x1 @@ -17707,22 +17707,22 @@ glabel var7f1b2afc /* f0fc800: 92e50014 */ lbu $a1,0x14($s7) /* f0fc804: 460a4101 */ sub.s $f4,$f8,$f10 /* f0fc808: 44062000 */ mfc1 $a2,$f4 -/* f0fc80c: 0fc3f0cc */ jal 0xf0fc330 +/* f0fc80c: 0fc3f0cc */ jal func0f0fbba0 /* f0fc810: 00000000 */ nop /* f0fc814: 1000000d */ b .PF0f0fc84c /* f0fc818: 0040a825 */ move $s5,$v0 .PF0f0fc81c: /* f0fc81c: 92e50014 */ lbu $a1,0x14($s7) -/* f0fc820: 0fc3f0cc */ jal 0xf0fc330 +/* f0fc820: 0fc3f0cc */ jal func0f0fbba0 /* f0fc824: 3c063f80 */ lui $a2,0x3f80 /* f0fc828: 00402025 */ move $a0,$v0 /* f0fc82c: 92e50015 */ lbu $a1,0x15($s7) -/* f0fc830: 0fc3f0cc */ jal 0xf0fc330 +/* f0fc830: 0fc3f0cc */ jal func0f0fbba0 /* f0fc834: 8ee60010 */ lw $a2,0x10($s7) /* f0fc838: 10000004 */ b .PF0f0fc84c /* f0fc83c: 0040a825 */ move $s5,$v0 .PF0f0fc840: -/* f0fc840: 0fc3f0cc */ jal 0xf0fc330 +/* f0fc840: 0fc3f0cc */ jal func0f0fbba0 /* f0fc844: 92e50014 */ lbu $a1,0x14($s7) /* f0fc848: 0040a825 */ move $s5,$v0 .PF0f0fc84c: @@ -17742,18 +17742,18 @@ glabel var7f1b2afc /* f0fc87c: 55e00009 */ bnezl $t7,.PF0f0fc8a4 /* f0fc880: 8ef80000 */ lw $t8,0x0($s7) .PF0f0fc884: -/* f0fc884: 0fc353da */ jal 0xf0d4f68 +/* f0fc884: 0fc353da */ jal func0f0d49c8 /* f0fc888: 02a02025 */ move $a0,$s5 -/* f0fc88c: 0fc2f136 */ jal 0xf0bc4d8 +/* f0fc88c: 0fc2f136 */ jal hudRenderHealthBar /* f0fc890: 00402025 */ move $a0,$v0 -/* f0fc894: 0fc3534f */ jal 0xf0d4d3c +/* f0fc894: 0fc3534f */ jal func0f0d479c /* f0fc898: 00402025 */ move $a0,$v0 /* f0fc89c: 0040a825 */ move $s5,$v0 /* f0fc8a0: 8ef80000 */ lw $t8,0x0($s7) .PF0f0fc8a4: /* f0fc8a4: 5b000180 */ blezl $t8,.PF0f0fcea8 /* f0fc8a8: 82ef001b */ lb $t7,0x1b($s7) -/* f0fc8ac: 0fc551f1 */ jal 0xf1547c4 +/* f0fc8ac: 0fc551f1 */ jal func0f153ab0 /* f0fc8b0: 02a02025 */ move $a0,$s5 /* f0fc8b4: 8ee30004 */ lw $v1,0x4($s7) /* f0fc8b8: 24010004 */ li $at,0x4 @@ -17766,13 +17766,13 @@ glabel var7f1b2afc /* f0fc8d0: 8ed90288 */ lw $t9,0x288($s6) /* f0fc8d4: 02a02025 */ move $a0,$s5 /* f0fc8d8: 8f2b0070 */ lw $t3,0x70($t9) -/* f0fc8dc: 0fc3e37b */ jal 0xf0f8dec +/* f0fc8dc: 0fc3e37b */ jal func0f0f86a8 /* f0fc8e0: ae2b0000 */ sw $t3,0x0($s1) /* f0fc8e4: 10000008 */ b .PF0f0fc908 /* f0fc8e8: 0040a825 */ move $s5,$v0 .PF0f0fc8ec: /* f0fc8ec: ae300000 */ sw $s0,0x0($s1) -/* f0fc8f0: 0fc3e37b */ jal 0xf0f8dec +/* f0fc8f0: 0fc3e37b */ jal func0f0f86a8 /* f0fc8f4: 02a02025 */ move $a0,$s5 /* f0fc8f8: 26100001 */ addiu $s0,$s0,0x1 /* f0fc8fc: 24010004 */ li $at,0x4 @@ -17784,16 +17784,16 @@ glabel var7f1b2afc /* f0fc910: 354a0040 */ ori $t2,$t2,0x40 /* f0fc914: 02a08025 */ move $s0,$s5 /* f0fc918: ae0a0000 */ sw $t2,0x0($s0) -/* f0fc91c: 0fc2d542 */ jal 0xf0b5508 +/* f0fc91c: 0fc2d542 */ jal currentPlayerGetUnk1750 /* f0fc920: 26b50008 */ addiu $s5,$s5,0x8 -/* f0fc924: 0c012ab0 */ jal 0x4aac0 +/* f0fc924: 0c012ab0 */ jal osVirtualToPhysical /* f0fc928: 00402025 */ move $a0,$v0 /* f0fc92c: 02a01825 */ move $v1,$s5 /* f0fc930: ae020004 */ sw $v0,0x4($s0) /* f0fc934: 3c0c0600 */ lui $t4,0x600 /* f0fc938: ac6c0000 */ sw $t4,0x0($v1) /* f0fc93c: ac730004 */ sw $s3,0x4($v1) -/* f0fc940: 0fc55215 */ jal 0xf154854 +/* f0fc940: 0fc55215 */ jal func0f153b40 /* f0fc944: 26b50008 */ addiu $s5,$s5,0x8 /* f0fc948: 8ee30004 */ lw $v1,0x4($s7) /* f0fc94c: 24010003 */ li $at,0x3 @@ -17802,7 +17802,7 @@ glabel var7f1b2afc /* f0fc958: 5461014d */ bnel $v1,$at,.PF0f0fce90 /* f0fc95c: 02a01025 */ move $v0,$s5 .PF0f0fc960: -/* f0fc960: 0c002e91 */ jal 0xba44 +/* f0fc960: 0c002e91 */ jal viGetViewLeft /* f0fc964: 00000000 */ nop /* f0fc968: 3c0d8008 */ lui $t5,0x8008 /* f0fc96c: 8dad0020 */ lw $t5,0x20($t5) @@ -17821,14 +17821,14 @@ glabel var7f1b2afc /* f0fc99c: 0006000d */ break 0x6 .PF0f0fc9a0: /* f0fc9a0: afaf00f0 */ sw $t7,0xf0($sp) -/* f0fc9a4: 0c002e95 */ jal 0xba54 +/* f0fc9a4: 0c002e95 */ jal viGetViewTop /* f0fc9a8: 00000000 */ nop /* f0fc9ac: 24580004 */ addiu $t8,$v0,0x4 -/* f0fc9b0: 0c002e91 */ jal 0xba44 +/* f0fc9b0: 0c002e91 */ jal viGetViewLeft /* f0fc9b4: afb800ec */ sw $t8,0xec($sp) /* f0fc9b8: 00028400 */ sll $s0,$v0,0x10 /* f0fc9bc: 0010cc03 */ sra $t9,$s0,0x10 -/* f0fc9c0: 0c002e73 */ jal 0xb9cc +/* f0fc9c0: 0c002e73 */ jal viGetViewWidth /* f0fc9c4: 03208025 */ move $s0,$t9 /* f0fc9c8: 3c0a8008 */ lui $t2,0x8008 /* f0fc9cc: 8d4a0020 */ lw $t2,0x20($t2) @@ -17848,16 +17848,16 @@ glabel var7f1b2afc /* f0fca00: 0006000d */ break 0x6 .PF0f0fca04: /* f0fca04: afad00e8 */ sw $t5,0xe8($sp) -/* f0fca08: 0c002e95 */ jal 0xba54 +/* f0fca08: 0c002e95 */ jal viGetViewTop /* f0fca0c: 00000000 */ nop /* f0fca10: 00028400 */ sll $s0,$v0,0x10 /* f0fca14: 00107403 */ sra $t6,$s0,0x10 -/* f0fca18: 0c002e77 */ jal 0xb9dc +/* f0fca18: 0c002e77 */ jal viGetViewHeight /* f0fca1c: 01c08025 */ move $s0,$t6 /* f0fca20: 00507821 */ addu $t7,$v0,$s0 /* f0fca24: 25f8fffc */ addiu $t8,$t7,-4 /* f0fca28: afb800e4 */ sw $t8,0xe4($sp) -/* f0fca2c: 0fc550cf */ jal 0xf15433c +/* f0fca2c: 0fc550cf */ jal func0f153628 /* f0fca30: 02a02025 */ move $a0,$s5 /* f0fca34: 3c13800a */ lui $s3,0x800a /* f0fca38: 0040a825 */ move $s5,$v0 @@ -17874,16 +17874,16 @@ glabel var7f1b2afc /* f0fca60: 24100001 */ li $s0,0x1 /* f0fca64: 5160000f */ beqzl $t3,.PF0f0fcaa4 /* f0fca68: 8eea0004 */ lw $t2,0x4($s7) -/* f0fca6c: 0fc5bdaa */ jal 0xf16f6a8 +/* f0fca6c: 0fc5bdaa */ jal langGet /* f0fca70: 240451e2 */ li $a0,0x51e2 /* f0fca74: 00408825 */ move $s1,$v0 -/* f0fca78: 0fc5bdaa */ jal 0xf16f6a8 +/* f0fca78: 0fc5bdaa */ jal langGet /* f0fca7c: 240458ca */ li $a0,0x58ca /* f0fca80: 3c057f1b */ lui $a1,0x7f1b /* f0fca84: 24a53a84 */ addiu $a1,$a1,0x3a84 /* f0fca88: 02802025 */ move $a0,$s4 /* f0fca8c: 02203025 */ move $a2,$s1 -/* f0fca90: 0c004d11 */ jal 0x13444 +/* f0fca90: 0c004d11 */ jal sprintf /* f0fca94: 00403825 */ move $a3,$v0 /* f0fca98: 10000023 */ b .PF0f0fcb28 /* f0fca9c: 00000000 */ nop @@ -17915,16 +17915,16 @@ glabel var7f1b2afc /* f0fcaf4: 10000001 */ b .PF0f0fcafc /* f0fcaf8: 01a08025 */ move $s0,$t5 .PF0f0fcafc: -/* f0fcafc: 0fc5bdaa */ jal 0xf16f6a8 +/* f0fcafc: 0fc5bdaa */ jal langGet /* f0fcb00: 240451e2 */ li $a0,0x51e2 /* f0fcb04: 00408825 */ move $s1,$v0 -/* f0fcb08: 0fc5bdaa */ jal 0xf16f6a8 +/* f0fcb08: 0fc5bdaa */ jal langGet /* f0fcb0c: 240451e3 */ li $a0,0x51e3 /* f0fcb10: 3c057f1b */ lui $a1,0x7f1b /* f0fcb14: 24a53a8c */ addiu $a1,$a1,0x3a8c /* f0fcb18: 02802025 */ move $a0,$s4 /* f0fcb1c: 02203025 */ move $a2,$s1 -/* f0fcb20: 0c004d11 */ jal 0x13444 +/* f0fcb20: 0c004d11 */ jal sprintf /* f0fcb24: 00403825 */ move $a3,$v0 .PF0f0fcb28: /* f0fcb28: 120000d1 */ beqz $s0,.PF0f0fce70 @@ -17937,9 +17937,9 @@ glabel var7f1b2afc /* f0fcb44: 02803025 */ move $a2,$s4 /* f0fcb48: afa00014 */ sw $zero,0x14($sp) /* f0fcb4c: 02f28821 */ addu $s1,$s7,$s2 -/* f0fcb50: 0fc5609a */ jal 0xf158268 +/* f0fcb50: 0fc5609a */ jal textMeasure /* f0fcb54: afae0010 */ sw $t6,0x10($sp) -/* f0fcb58: 0c004f75 */ jal 0x13dd4 +/* f0fcb58: 0c004f75 */ jal contGetConnectedControllers /* f0fcb5c: 00000000 */ nop /* f0fcb60: 3c18800b */ lui $t8,0x800b /* f0fcb64: 9718d13e */ lhu $t8,-0x2ec2($t8) @@ -17993,7 +17993,7 @@ glabel var7f1b2afc /* f0fcc14: 18400096 */ blez $v0,.PF0f0fce70 /* f0fcc18: 3c0141a0 */ lui $at,0x41a0 /* f0fcc1c: 44816000 */ mtc1 $at,$f12 -/* f0fcc20: 0fc01abe */ jal 0xf006af8 +/* f0fcc20: 0fc01abe */ jal func0f006b08 /* f0fcc24: 00000000 */ nop /* f0fcc28: 3c01437f */ lui $at,0x437f /* f0fcc2c: 44813000 */ mtc1 $at,$f6 @@ -18035,11 +18035,11 @@ glabel var7f1b2afc /* f0fccb4: 00000000 */ nop .PF0f0fccb8: /* f0fccb8: 44ccf800 */ ctc1 $t4,$31 -/* f0fccbc: 0fc5bdaa */ jal 0xf16f6a8 +/* f0fccbc: 0fc5bdaa */ jal langGet /* f0fccc0: afad00a0 */ sw $t5,0xa0($sp) /* f0fccc4: 02802025 */ move $a0,$s4 /* f0fccc8: 00402825 */ move $a1,$v0 -/* f0fcccc: 0c004d11 */ jal 0x13444 +/* f0fcccc: 0c004d11 */ jal sprintf /* f0fccd0: 26460001 */ addiu $a2,$s2,0x1 /* f0fccd4: 2a410002 */ slti $at,$s2,0x2 /* f0fccd8: 10200005 */ beqz $at,.PF0f0fccf0 @@ -18068,11 +18068,11 @@ glabel var7f1b2afc /* f0fcd24: 25cf0002 */ addiu $t7,$t6,0x2 /* f0fcd28: afaf00ac */ sw $t7,0xac($sp) .PF0f0fcd2c: -/* f0fcd2c: 0c002e53 */ jal 0xb94c +/* f0fcd2c: 0c002e53 */ jal viGetWidth /* f0fcd30: 00000000 */ nop /* f0fcd34: 00028400 */ sll $s0,$v0,0x10 /* f0fcd38: 0010c403 */ sra $t8,$s0,0x10 -/* f0fcd3c: 0c002e57 */ jal 0xb95c +/* f0fcd3c: 0c002e57 */ jal viGetHeight /* f0fcd40: 03008025 */ move $s0,$t8 /* f0fcd44: 922a0017 */ lbu $t2,0x17($s1) /* f0fcd48: 3c0b8008 */ lui $t3,0x8008 @@ -18092,7 +18092,7 @@ glabel var7f1b2afc /* f0fcd80: afa00024 */ sw $zero,0x24($sp) /* f0fcd84: afa00028 */ sw $zero,0x28($sp) /* f0fcd88: afb90014 */ sw $t9,0x14($sp) -/* f0fcd8c: 0fc55c50 */ jal 0xf157140 +/* f0fcd8c: 0fc55c50 */ jal textRenderProjected /* f0fcd90: afab0010 */ sw $t3,0x10($sp) /* f0fcd94: 8ecd0490 */ lw $t5,0x490($s6) /* f0fcd98: 24010002 */ li $at,0x2 @@ -18102,10 +18102,10 @@ glabel var7f1b2afc /* f0fcda8: 81cf0494 */ lb $t7,0x494($t6) /* f0fcdac: 11e0000c */ beqz $t7,.PF0f0fcde0 /* f0fcdb0: 00000000 */ nop -/* f0fcdb4: 0fc5bdaa */ jal 0xf16f6a8 +/* f0fcdb4: 0fc5bdaa */ jal langGet /* f0fcdb8: 240458ca */ li $a0,0x58ca /* f0fcdbc: 02802025 */ move $a0,$s4 -/* f0fcdc0: 0c004bb0 */ jal 0x12ec0 +/* f0fcdc0: 0c004bb0 */ jal strcpy /* f0fcdc4: 00402825 */ move $a1,$v0 /* f0fcdc8: 92230017 */ lbu $v1,0x17($s1) /* f0fcdcc: 3c01d000 */ lui $at,0xd000 @@ -18114,24 +18114,24 @@ glabel var7f1b2afc /* f0fcdd8: 1000000d */ b .PF0f0fce10 /* f0fcddc: 03001825 */ move $v1,$t8 .PF0f0fcde0: -/* f0fcde0: 0fc5bdaa */ jal 0xf16f6a8 +/* f0fcde0: 0fc5bdaa */ jal langGet /* f0fcde4: 240451e3 */ li $a0,0x51e3 /* f0fcde8: 02802025 */ move $a0,$s4 -/* f0fcdec: 0c004bb0 */ jal 0x12ec0 +/* f0fcdec: 0c004bb0 */ jal strcpy /* f0fcdf0: 00402825 */ move $a1,$v0 /* f0fcdf4: 3c0400ff */ lui $a0,0xff /* f0fcdf8: 3484ff00 */ ori $a0,$a0,0xff00 /* f0fcdfc: 2405ff00 */ li $a1,-256 -/* f0fce00: 0fc01a3c */ jal 0xf0068f0 +/* f0fce00: 0fc01a3c */ jal colourBlend /* f0fce04: 8fa600a0 */ lw $a2,0xa0($sp) /* f0fce08: 922b0017 */ lbu $t3,0x17($s1) /* f0fce0c: 01621825 */ or $v1,$t3,$v0 .PF0f0fce10: -/* f0fce10: 0c002e53 */ jal 0xb94c +/* f0fce10: 0c002e53 */ jal viGetWidth /* f0fce14: afa300a4 */ sw $v1,0xa4($sp) /* f0fce18: 00028400 */ sll $s0,$v0,0x10 /* f0fce1c: 0010cc03 */ sra $t9,$s0,0x10 -/* f0fce20: 0c002e57 */ jal 0xb95c +/* f0fce20: 0c002e57 */ jal viGetHeight /* f0fce24: 03208025 */ move $s0,$t9 /* f0fce28: 3c0a8008 */ lui $t2,0x8008 /* f0fce2c: 3c0c8008 */ lui $t4,0x8008 @@ -18148,7 +18148,7 @@ glabel var7f1b2afc /* f0fce58: afa00028 */ sw $zero,0x28($sp) /* f0fce5c: afac0014 */ sw $t4,0x14($sp) /* f0fce60: afaa0010 */ sw $t2,0x10($sp) -/* f0fce64: 0fc55c50 */ jal 0xf157140 +/* f0fce64: 0fc55c50 */ jal textRenderProjected /* f0fce68: afa30018 */ sw $v1,0x18($sp) /* f0fce6c: 0040a825 */ move $s5,$v0 .PF0f0fce70: @@ -18156,7 +18156,7 @@ glabel var7f1b2afc /* f0fce74: 24010004 */ li $at,0x4 /* f0fce78: 5641fef4 */ bnel $s2,$at,.PF0f0fca4c /* f0fce7c: 8ec20490 */ lw $v0,0x490($s6) -/* f0fce80: 0fc55125 */ jal 0xf154494 +/* f0fce80: 0fc55125 */ jal func0f153780 /* f0fce84: 02a02025 */ move $a0,$s5 /* f0fce88: 0040a825 */ move $s5,$v0 /* f0fce8c: 02a01025 */ move $v0,$s5 @@ -18171,7 +18171,7 @@ glabel var7f1b2afc /* f0fcea8: 2401ffff */ li $at,-1 /* f0fceac: 11e100a1 */ beq $t7,$at,.PF0f0fd134 /* f0fceb0: 00000000 */ nop -/* f0fceb4: 0c002e91 */ jal 0xba44 +/* f0fceb4: 0c002e91 */ jal viGetViewLeft /* f0fceb8: 00000000 */ nop /* f0fcebc: 3c188008 */ lui $t8,0x8008 /* f0fcec0: 8f180020 */ lw $t8,0x20($t8) @@ -18189,13 +18189,13 @@ glabel var7f1b2afc /* f0fceec: 00000000 */ nop /* f0fcef0: 0006000d */ break 0x6 .PF0f0fcef4: -/* f0fcef4: 0c002e95 */ jal 0xba54 +/* f0fcef4: 0c002e95 */ jal viGetViewTop /* f0fcef8: 00000000 */ nop -/* f0fcefc: 0c002e91 */ jal 0xba44 +/* f0fcefc: 0c002e91 */ jal viGetViewLeft /* f0fcf00: afa20094 */ sw $v0,0x94($sp) /* f0fcf04: 00028400 */ sll $s0,$v0,0x10 /* f0fcf08: 0010cc03 */ sra $t9,$s0,0x10 -/* f0fcf0c: 0c002e73 */ jal 0xb9cc +/* f0fcf0c: 0c002e73 */ jal viGetViewWidth /* f0fcf10: 03208025 */ move $s0,$t9 /* f0fcf14: 3c0c8008 */ lui $t4,0x8008 /* f0fcf18: 8d8c0020 */ lw $t4,0x20($t4) @@ -18213,11 +18213,11 @@ glabel var7f1b2afc /* f0fcf44: 00000000 */ nop /* f0fcf48: 0006000d */ break 0x6 .PF0f0fcf4c: -/* f0fcf4c: 0c002e95 */ jal 0xba54 +/* f0fcf4c: 0c002e95 */ jal viGetViewTop /* f0fcf50: 00000000 */ nop /* f0fcf54: 00028400 */ sll $s0,$v0,0x10 /* f0fcf58: 00106c03 */ sra $t5,$s0,0x10 -/* f0fcf5c: 0c002e77 */ jal 0xb9dc +/* f0fcf5c: 0c002e77 */ jal viGetViewHeight /* f0fcf60: 01a08025 */ move $s0,$t5 /* f0fcf64: 8ec7006c */ lw $a3,0x6c($s6) /* f0fcf68: 00504821 */ addu $t1,$v0,$s0 @@ -18294,7 +18294,7 @@ glabel var7f1b2afc /* f0fd054: 03285021 */ addu $t2,$t9,$t0 /* f0fd058: 55410013 */ bnel $t2,$at,.PF0f0fd0a8 /* f0fd05c: 8ece006c */ lw $t6,0x6c($s6) -/* f0fd060: 0fc54ef9 */ jal 0xf153be4 +/* f0fd060: 0fc54ef9 */ jal optionsGetScreenSplit /* f0fd064: afa9008c */ sw $t1,0x8c($sp) /* f0fd068: 24010001 */ li $at,0x1 /* f0fd06c: 10410006 */ beq $v0,$at,.PF0f0fd088 @@ -18355,11 +18355,11 @@ glabel var7f1b2afc /* f0fd11c: afa90010 */ sw $t1,0x10($sp) /* f0fd120: afb2001c */ sw $s2,0x1c($sp) /* f0fd124: afb30020 */ sw $s3,0x20($sp) -/* f0fd128: 0fc3c502 */ jal 0xf0f1408 +/* f0fd128: 0fc3c502 */ jal func0f0f0ce8 /* f0fd12c: afaa0018 */ sw $t2,0x18($sp) /* f0fd130: 0040a825 */ move $s5,$v0 .PF0f0fd134: -/* f0fd134: 0fc353da */ jal 0xf0d4f68 +/* f0fd134: 0fc353da */ jal func0f0d49c8 /* f0fd138: 02a02025 */ move $a0,$s5 /* f0fd13c: 8fbf0054 */ lw $ra,0x54($sp) /* f0fd140: 240c0001 */ li $t4,0x1 diff --git a/src/game/game_102240.c b/src/game/game_102240.c index 06e9e62c8..800ccc2be 100644 --- a/src/game/game_102240.c +++ b/src/game/game_102240.c @@ -299,7 +299,7 @@ glabel func0f1030e4pf /* f10314c: 8cc90000 */ lw $t1,0x0($a2) /* f103150: 00095040 */ sll $t2,$t1,0x1 /* f103154: 004a5821 */ addu $t3,$v0,$t2 -/* f103158: 0fc5bdaa */ jal 0xf16f6a8 +/* f103158: 0fc5bdaa */ jal langGet /* f10315c: 95640000 */ lhu $a0,0x0($t3) /* f103160: 10000015 */ b .PF0f1031b8 /* f103164: 8fbf0014 */ lw $ra,0x14($sp) @@ -308,7 +308,7 @@ glabel func0f1030e4pf /* f10316c: 3c02800a */ lui $v0,0x800a /* f103170: 2442a510 */ addiu $v0,$v0,-23280 /* f103174: a44c0482 */ sh $t4,0x482($v0) -/* f103178: 0fc5bdd7 */ jal 0xf16f75c +/* f103178: 0fc5bdd7 */ jal func0f16f75c /* f10317c: 3184ffff */ andi $a0,$t4,0xffff /* f103180: 3c02800a */ lui $v0,0x800a /* f103184: 2442a510 */ addiu $v0,$v0,-23280 diff --git a/src/game/game_107fb0.c b/src/game/game_107fb0.c index f9c7945bb..5e34ad072 100644 --- a/src/game/game_107fb0.c +++ b/src/game/game_107fb0.c @@ -59,9 +59,9 @@ glabel func0f1088d0pf /* f1088e8: 3c02800a */ lui $v0,0x800a /* f1088ec: 2442a510 */ addiu $v0,$v0,-23280 /* f1088f0: a44e0482 */ sh $t6,0x482($v0) -/* f1088f4: 0fc5bdd7 */ jal 0xf16f75c +/* f1088f4: 0fc5bdd7 */ jal func0f16f75c /* f1088f8: 31c4ffff */ andi $a0,$t6,0xffff -/* f1088fc: 0fc3cf8c */ jal 0xf0f3e30 +/* f1088fc: 0fc3cf8c */ jal menuPopDialog /* f108900: 00000000 */ nop .PF0f108904: /* f108904: 8fbf0014 */ lw $ra,0x14($sp) @@ -2302,7 +2302,7 @@ glabel filemgrConsiderPushingFileSelectDialog /* f10d2a8: 3c048007 */ lui $a0,0x8007 /* f10d2ac: a040083b */ sb $zero,0x83b($v0) /* f10d2b0: 2484527c */ addiu $a0,$a0,0x527c -/* f10d2b4: 0fc3e29d */ jal 0xf0f8a74 +/* f10d2b4: 0fc3e29d */ jal menuPushRootDialog /* f10d2b8: 24050006 */ li $a1,0x6 /* f10d2bc: 3c08800a */ lui $t0,0x800a /* f10d2c0: 9508a992 */ lhu $t0,-0x566e($t0) @@ -2310,7 +2310,7 @@ glabel filemgrConsiderPushingFileSelectDialog /* f10d2c8: 29010006 */ slti $at,$t0,0x6 /* f10d2cc: 14200003 */ bnez $at,.PF0f10d2dc /* f10d2d0: 00000000 */ nop -/* f10d2d4: 0fc3cda8 */ jal 0xf0f36a0 +/* f10d2d4: 0fc3cda8 */ jal menuPushDialog /* f10d2d8: 24844810 */ addiu $a0,$a0,0x4810 .PF0f10d2dc: /* f10d2dc: 10000002 */ b .PF0f10d2e8 diff --git a/src/game/game_10c9c0.c b/src/game/game_10c9c0.c index dd9552869..632270ff7 100644 --- a/src/game/game_10c9c0.c +++ b/src/game/game_10c9c0.c @@ -83,7 +83,7 @@ glabel func0f10cb2c /* f10d4f8: 3c048007 */ lui $a0,0x8007 /* f10d4fc: ae190490 */ sw $t9,0x490($s0) /* f10d500: 24845758 */ addiu $a0,$a0,0x5758 -/* f10d504: 0fc3e29d */ jal 0xf0f8a74 +/* f10d504: 0fc3e29d */ jal menuPushRootDialog /* f10d508: 2405000b */ li $a1,0xb /* f10d50c: 1000001e */ b .PF0f10d588 /* f10d510: 8fbf001c */ lw $ra,0x1c($sp) @@ -94,7 +94,7 @@ glabel func0f10cb2c /* f10d520: 24110006 */ li $s1,0x6 /* f10d524: 02002025 */ move $a0,$s0 .PF0f10d528: -/* f10d528: 0fc623e7 */ jal 0xf188f9c +/* f10d528: 0fc623e7 */ jal mpPlayerSetDefaults /* f10d52c: 24050001 */ li $a1,0x1 /* f10d530: 26100001 */ addiu $s0,$s0,0x1 /* f10d534: 5611fffc */ bnel $s0,$s1,.PF0f10d528 @@ -104,18 +104,18 @@ glabel func0f10cb2c /* f10d544: 2402ffff */ li $v0,-1 /* f10d548: ae000294 */ sw $zero,0x294($s0) /* f10d54c: ae020298 */ sw $v0,0x298($s0) -/* f10d550: 0fc67037 */ jal 0xf19c0dc +/* f10d550: 0fc67037 */ jal mpDetermineUnlockedFeatures /* f10d554: ae02029c */ sw $v0,0x29c($s0) /* f10d558: 3c048007 */ lui $a0,0x8007 /* f10d55c: 248453e4 */ addiu $a0,$a0,0x53e4 -/* f10d560: 0fc3e29d */ jal 0xf0f8a74 +/* f10d560: 0fc3e29d */ jal menuPushRootDialog /* f10d564: 2405000a */ li $a1,0xa /* f10d568: 96090482 */ lhu $t1,0x482($s0) /* f10d56c: 3c048007 */ lui $a0,0x8007 /* f10d570: 29210006 */ slti $at,$t1,0x6 /* f10d574: 54200004 */ bnezl $at,.PF0f10d588 /* f10d578: 8fbf001c */ lw $ra,0x1c($sp) -/* f10d57c: 0fc3cda8 */ jal 0xf0f36a0 +/* f10d57c: 0fc3cda8 */ jal menuPushDialog /* f10d580: 24844810 */ addiu $a0,$a0,0x4810 .PF0f10d584: /* f10d584: 8fbf001c */ lw $ra,0x1c($sp) diff --git a/src/game/game_110680.c b/src/game/game_110680.c index 311c28976..7b97dd08a 100644 --- a/src/game/game_110680.c +++ b/src/game/game_110680.c @@ -82,10 +82,10 @@ GLOBAL_ASM( glabel func0f1106c8 /* f111198: 27bdffe8 */ addiu $sp,$sp,-24 /* f11119c: afbf0014 */ sw $ra,0x14($sp) -/* f1111a0: 0fc444ba */ jal 0xf1112e8 +/* f1111a0: 0fc444ba */ jal func0f11080c /* f1111a4: 00000000 */ nop /* f1111a8: 3c04800a */ lui $a0,0x800a -/* f1111ac: 0fc5bdd7 */ jal 0xf16f75c +/* f1111ac: 0fc5bdd7 */ jal func0f16f75c /* f1111b0: 9484a992 */ lhu $a0,-0x566e($a0) /* f1111b4: 8fbf0014 */ lw $ra,0x14($sp) /* f1111b8: 27bd0018 */ addiu $sp,$sp,0x18 diff --git a/src/game/game_11f000.c b/src/game/game_11f000.c index 0d01f0fe8..32e257be3 100644 --- a/src/game/game_11f000.c +++ b/src/game/game_11f000.c @@ -7293,11 +7293,11 @@ glabel var7f1b5108 /* f1265a8: f7b60040 */ sdc1 $f22,0x40($sp) /* f1265ac: f7b40038 */ sdc1 $f20,0x38($sp) /* f1265b0: afa40170 */ sw $a0,0x170($sp) -/* f1265b4: 0fc2d706 */ jal 0xf0b5c18 +/* f1265b4: 0fc2d706 */ jal currentPlayerGetMatrix1740 /* f1265b8: afa50174 */ sw $a1,0x174($sp) -/* f1265bc: 0fc2d70e */ jal 0xf0b5c38 +/* f1265bc: 0fc2d70e */ jal currentPlayerGetUnk1754 /* f1265c0: afa2016c */ sw $v0,0x16c($sp) -/* f1265c4: 0fc599d3 */ jal 0xf16674c +/* f1265c4: 0fc599d3 */ jal func0f1657cc /* f1265c8: afa20168 */ sw $v0,0x168($sp) /* f1265cc: afa20144 */ sw $v0,0x144($sp) /* f1265d0: 904e000b */ lbu $t6,0xb($v0) @@ -7315,13 +7315,13 @@ glabel var7f1b5108 /* f1265fc: 10000208 */ b .PF0f126e20 /* f126600: 8fa20170 */ lw $v0,0x170($sp) .PF0f126604: -/* f126604: 0c002e91 */ jal 0xba44 +/* f126604: 0c002e91 */ jal viGetViewLeft /* f126608: 00000000 */ nop -/* f12660c: 0c002e95 */ jal 0xba54 +/* f12660c: 0c002e95 */ jal viGetViewTop /* f126610: a7a20166 */ sh $v0,0x166($sp) -/* f126614: 0c002e73 */ jal 0xb9cc +/* f126614: 0c002e73 */ jal viGetViewWidth /* f126618: a7a20164 */ sh $v0,0x164($sp) -/* f12661c: 0c002e77 */ jal 0xb9dc +/* f12661c: 0c002e77 */ jal viGetViewHeight /* f126620: a7a20162 */ sh $v0,0x162($sp) /* f126624: 87b90162 */ lh $t9,0x162($sp) /* f126628: 44824000 */ mtc1 $v0,$f8 @@ -7359,10 +7359,10 @@ glabel var7f1b5108 /* f1266a4: 92cb0003 */ lbu $t3,0x3($s6) /* f1266a8: 158001d2 */ bnez $t4,.PF0f126df4 /* f1266ac: a3ab014a */ sb $t3,0x14a($sp) -/* f1266b0: 0c00563d */ jal 0x158f4 +/* f1266b0: 0c00563d */ jal func00015b64 /* f1266b4: 02802825 */ move $a1,$s4 /* f1266b8: 8fa40168 */ lw $a0,0x168($sp) -/* f1266bc: 0c00563d */ jal 0x158f4 +/* f1266bc: 0c00563d */ jal func00015b64 /* f1266c0: 02802825 */ move $a1,$s4 /* f1266c4: c6800008 */ lwc1 $f0,0x8($s4) /* f1266c8: 4600d03c */ c.lt.s $f26,$f0 @@ -7408,7 +7408,7 @@ glabel var7f1b5108 /* f126768: 00000000 */ nop /* f12676c: 460a4402 */ mul.s $f16,$f8,$f10 /* f126770: 46168480 */ add.s $f18,$f16,$f22 -/* f126774: 0c002eee */ jal 0xbbb8 +/* f126774: 0c002eee */ jal viGetFovY /* f126778: e6520000 */ swc1 $f18,0x0($s2) /* f12677c: 3c014270 */ lui $at,0x4270 /* f126780: 44812000 */ mtc1 $at,$f4 @@ -7477,7 +7477,7 @@ glabel var7f1b5108 /* f12687c: 0059b821 */ addu $s7,$v0,$t9 /* f126880: 26e8fff0 */ addiu $t0,$s7,-16 /* f126884: afa800a0 */ sw $t0,0xa0($sp) -/* f126888: 0c00090f */ jal 0x243c +/* f126888: 0c00090f */ jal bbufGetIndex0Buffer /* f12688c: 2455000f */ addiu $s5,$v0,0xf /* f126890: c62c0000 */ lwc1 $f12,0x0($s1) /* f126894: 3c01447a */ lui $at,0x447a @@ -7563,7 +7563,7 @@ glabel var7f1b5108 /* f1269b0: 2465fff9 */ addiu $a1,$v1,-7 /* f1269b4: 24460001 */ addiu $a2,$v0,0x1 /* f1269b8: 03278021 */ addu $s0,$t9,$a3 -/* f1269bc: 0fc49912 */ jal 0xf126448 +/* f1269bc: 0fc49912 */ jal func0f125948 /* f1269c0: 02002025 */ move $a0,$s0 /* f1269c4: c6280000 */ lwc1 $f8,0x0($s1) /* f1269c8: c64a0000 */ lwc1 $f10,0x0($s2) @@ -7573,7 +7573,7 @@ glabel var7f1b5108 /* f1269d8: 44053000 */ mfc1 $a1,$f6 /* f1269dc: 44068000 */ mfc1 $a2,$f16 /* f1269e0: 24a5fffb */ addiu $a1,$a1,-5 -/* f1269e4: 0fc49912 */ jal 0xf126448 +/* f1269e4: 0fc49912 */ jal func0f125948 /* f1269e8: 24c6fffd */ addiu $a2,$a2,-3 /* f1269ec: c6320000 */ lwc1 $f18,0x0($s1) /* f1269f0: c6480000 */ lwc1 $f8,0x0($s2) @@ -7583,7 +7583,7 @@ glabel var7f1b5108 /* f126a00: 44052000 */ mfc1 $a1,$f4 /* f126a04: 44063000 */ mfc1 $a2,$f6 /* f126a08: 24a5fffd */ addiu $a1,$a1,-3 -/* f126a0c: 0fc49912 */ jal 0xf126448 +/* f126a0c: 0fc49912 */ jal func0f125948 /* f126a10: 24c60005 */ addiu $a2,$a2,0x5 /* f126a14: c62a0000 */ lwc1 $f10,0x0($s1) /* f126a18: c6520000 */ lwc1 $f18,0x0($s2) @@ -7593,7 +7593,7 @@ glabel var7f1b5108 /* f126a28: 44058000 */ mfc1 $a1,$f16 /* f126a2c: 44062000 */ mfc1 $a2,$f4 /* f126a30: 24a5ffff */ addiu $a1,$a1,-1 -/* f126a34: 0fc49912 */ jal 0xf126448 +/* f126a34: 0fc49912 */ jal func0f125948 /* f126a38: 24c6fff9 */ addiu $a2,$a2,-7 /* f126a3c: c6280000 */ lwc1 $f8,0x0($s1) /* f126a40: c64a0000 */ lwc1 $f10,0x0($s2) @@ -7603,7 +7603,7 @@ glabel var7f1b5108 /* f126a50: 44053000 */ mfc1 $a1,$f6 /* f126a54: 44068000 */ mfc1 $a2,$f16 /* f126a58: 24a50001 */ addiu $a1,$a1,0x1 -/* f126a5c: 0fc49912 */ jal 0xf126448 +/* f126a5c: 0fc49912 */ jal func0f125948 /* f126a60: 24c60007 */ addiu $a2,$a2,0x7 /* f126a64: c6320000 */ lwc1 $f18,0x0($s1) /* f126a68: c6480000 */ lwc1 $f8,0x0($s2) @@ -7613,7 +7613,7 @@ glabel var7f1b5108 /* f126a78: 44052000 */ mfc1 $a1,$f4 /* f126a7c: 44063000 */ mfc1 $a2,$f6 /* f126a80: 24a50003 */ addiu $a1,$a1,0x3 -/* f126a84: 0fc49912 */ jal 0xf126448 +/* f126a84: 0fc49912 */ jal func0f125948 /* f126a88: 24c6fffb */ addiu $a2,$a2,-5 /* f126a8c: c62a0000 */ lwc1 $f10,0x0($s1) /* f126a90: c6520000 */ lwc1 $f18,0x0($s2) @@ -7623,7 +7623,7 @@ glabel var7f1b5108 /* f126aa0: 44058000 */ mfc1 $a1,$f16 /* f126aa4: 44062000 */ mfc1 $a2,$f4 /* f126aa8: 24a50005 */ addiu $a1,$a1,0x5 -/* f126aac: 0fc49912 */ jal 0xf126448 +/* f126aac: 0fc49912 */ jal func0f125948 /* f126ab0: 24c60003 */ addiu $a2,$a2,0x3 /* f126ab4: c6280000 */ lwc1 $f8,0x0($s1) /* f126ab8: c64a0000 */ lwc1 $f10,0x0($s2) @@ -7633,7 +7633,7 @@ glabel var7f1b5108 /* f126ac8: 44053000 */ mfc1 $a1,$f6 /* f126acc: 44068000 */ mfc1 $a2,$f16 /* f126ad0: 24a50007 */ addiu $a1,$a1,0x7 -/* f126ad4: 0fc49912 */ jal 0xf126448 +/* f126ad4: 0fc49912 */ jal func0f125948 /* f126ad8: 24c6ffff */ addiu $a2,$a2,-1 .PF0f126adc: /* f126adc: 8fa20094 */ lw $v0,0x94($sp) @@ -7653,7 +7653,7 @@ glabel var7f1b5108 /* f126b10: 24060004 */ li $a2,0x4 /* f126b14: 00003825 */ move $a3,$zero /* f126b18: afa00018 */ sw $zero,0x18($sp) -/* f126b1c: 0fc2cfb8 */ jal 0xf0b3ee0 +/* f126b1c: 0fc2cfb8 */ jal func0f0b39c0 /* f126b20: 24a5003c */ addiu $a1,$a1,0x3c /* f126b24: 8fb90170 */ lw $t9,0x170($sp) /* f126b28: 3c09ba00 */ lui $t1,0xba00 @@ -7782,7 +7782,7 @@ glabel var7f1b5108 /* f126d14: afae001c */ sw $t6,0x1c($sp) /* f126d18: afad0018 */ sw $t5,0x18($sp) /* f126d1c: afa00014 */ sw $zero,0x14($sp) -/* f126d20: 0fc2c99c */ jal 0xf0b2670 +/* f126d20: 0fc2c99c */ jal func0f0b2150 /* f126d24: afab0010 */ sw $t3,0x10($sp) /* f126d28: 8fb90170 */ lw $t9,0x170($sp) /* f126d2c: 3c18e700 */ lui $t8,0xe700 @@ -7813,10 +7813,10 @@ glabel var7f1b5108 /* f126d90: afb80170 */ sw $t8,0x170($sp) /* f126d94: 3c080001 */ lui $t0,0x1 /* f126d98: ad280004 */ sw $t0,0x4($t1) -/* f126d9c: 0c00091c */ jal 0x2470 +/* f126d9c: 0c00091c */ jal bbufGetIndex1Buffer /* f126da0: ad2a0000 */ sw $t2,0x0($t1) /* f126da4: 8fab0098 */ lw $t3,0x98($sp) -/* f126da8: 0fc49947 */ jal 0xf12651c +/* f126da8: 0fc49947 */ jal func0f125a1c /* f126dac: 004b2021 */ addu $a0,$v0,$t3 /* f126db0: e7a00124 */ swc1 $f0,0x124($sp) /* f126db4: 8fad0120 */ lw $t5,0x120($sp) @@ -8562,7 +8562,7 @@ glabel var7f1b511c /* f126f60: 4485d000 */ mtc1 $a1,$f26 /* f126f64: 4486e000 */ mtc1 $a2,$f28 /* f126f68: af280014 */ sw $t0,0x14($t9) -/* f126f6c: 0c002e73 */ jal 0xb9cc +/* f126f6c: 0c002e73 */ jal viGetViewWidth /* f126f70: af210010 */ sw $at,0x10($t9) /* f126f74: 44822000 */ mtc1 $v0,$f4 /* f126f78: 3c017f1b */ lui $at,0x7f1b @@ -8574,7 +8574,7 @@ glabel var7f1b511c /* f126f90: 461e3202 */ mul.s $f8,$f6,$f30 /* f126f94: 4608d281 */ sub.s $f10,$f26,$f8 /* f126f98: 46145102 */ mul.s $f4,$f10,$f20 -/* f126f9c: 0c002e77 */ jal 0xb9dc +/* f126f9c: 0c002e77 */ jal viGetViewHeight /* f126fa0: e7a40130 */ swc1 $f4,0x130($sp) /* f126fa4: 44823000 */ mtc1 $v0,$f6 /* f126fa8: 3c16800b */ lui $s6,0x800b @@ -8594,7 +8594,7 @@ glabel var7f1b511c /* f126fe0: 24a50048 */ addiu $a1,$a1,0x48 /* f126fe4: 460ae101 */ sub.s $f4,$f28,$f10 /* f126fe8: 46142182 */ mul.s $f6,$f4,$f20 -/* f126fec: 0fc2cfb8 */ jal 0xf0b3ee0 +/* f126fec: 0fc2cfb8 */ jal func0f0b39c0 /* f126ff0: e7a6012c */ swc1 $f6,0x12c($sp) /* f126ff4: 8fa90198 */ lw $t1,0x198($sp) /* f126ff8: 3c10ba00 */ lui $s0,0xba00 @@ -8679,7 +8679,7 @@ glabel var7f1b511c /* f127134: 354a9bff */ ori $t2,$t2,0x9bff /* f127138: 35adff7f */ ori $t5,$t5,0xff7f /* f12713c: ad6d0004 */ sw $t5,0x4($t3) -/* f127140: 0c002eee */ jal 0xbbb8 +/* f127140: 0c002eee */ jal viGetFovY /* f127144: ad6a0000 */ sw $t2,0x0($t3) /* f127148: 8faf0198 */ lw $t7,0x198($sp) /* f12714c: 3c17fb00 */ lui $s7,0xfb00 @@ -8740,7 +8740,7 @@ glabel var7f1b511c /* f127228: afae001c */ sw $t6,0x1c($sp) /* f12722c: afaf0018 */ sw $t7,0x18($sp) /* f127230: afa00014 */ sw $zero,0x14($sp) -/* f127234: 0fc2c99c */ jal 0xf0b2670 +/* f127234: 0fc2c99c */ jal func0f0b2150 /* f127238: afad0010 */ sw $t5,0x10($sp) /* f12723c: 8ec50000 */ lw $a1,0x0($s6) /* f127240: 24080002 */ li $t0,0x2 @@ -8751,7 +8751,7 @@ glabel var7f1b511c /* f127254: 24060004 */ li $a2,0x4 /* f127258: 00003825 */ move $a3,$zero /* f12725c: afa00018 */ sw $zero,0x18($sp) -/* f127260: 0fc2cfb8 */ jal 0xf0b3ee0 +/* f127260: 0fc2cfb8 */ jal func0f0b39c0 /* f127264: 24a5000c */ addiu $a1,$a1,0xc /* f127268: 8fab0198 */ lw $t3,0x198($sp) /* f12726c: 3c0fba00 */ lui $t7,0xba00 @@ -8945,13 +8945,13 @@ glabel var7f1b511c /* f127540: afa0001c */ sw $zero,0x1c($sp) /* f127544: afa00018 */ sw $zero,0x18($sp) /* f127548: afa00014 */ sw $zero,0x14($sp) -/* f12754c: 0fc2c99c */ jal 0xf0b2670 +/* f12754c: 0fc2c99c */ jal func0f0b2150 /* f127550: afa80010 */ sw $t0,0x10($sp) /* f127554: 26100004 */ addiu $s0,$s0,0x4 /* f127558: 26310004 */ addiu $s1,$s1,0x4 /* f12755c: 1614ff9d */ bne $s0,$s4,.PF0f1273d4 /* f127560: 26520004 */ addiu $s2,$s2,0x4 -/* f127564: 0c002e73 */ jal 0xb9cc +/* f127564: 0c002e73 */ jal viGetViewWidth /* f127568: 00000000 */ nop /* f12756c: 44822000 */ mtc1 $v0,$f4 /* f127570: 3c013f00 */ lui $at,0x3f00 @@ -8959,7 +8959,7 @@ glabel var7f1b511c /* f127578: 46802220 */ cvt.s.w $f8,$f4 /* f12757c: c7aa019c */ lwc1 $f10,0x19c($sp) /* f127580: 46184182 */ mul.s $f6,$f8,$f24 -/* f127584: 0c002e77 */ jal 0xb9dc +/* f127584: 0c002e77 */ jal viGetViewHeight /* f127588: 460a3501 */ sub.s $f20,$f6,$f10 /* f12758c: 44822000 */ mtc1 $v0,$f4 /* f127590: c7aa01a0 */ lwc1 $f10,0x1a0($sp) @@ -8969,7 +8969,7 @@ glabel var7f1b511c /* f1275a0: 4614a102 */ mul.s $f4,$f20,$f20 /* f1275a4: 00000000 */ nop /* f1275a8: 46000202 */ mul.s $f8,$f0,$f0 -/* f1275ac: 0c0127b4 */ jal 0x49ed0 +/* f1275ac: 0c0127b4 */ jal sqrtf /* f1275b0: 46082300 */ add.s $f12,$f4,$f8 /* f1275b4: 3c014220 */ lui $at,0x4220 /* f1275b8: 44813000 */ mtc1 $at,$f6 @@ -9006,7 +9006,7 @@ glabel var7f1b511c /* f12762c: 44043000 */ mfc1 $a0,$f6 /* f127630: 00000000 */ nop /* f127634: 00802825 */ move $a1,$a0 -/* f127638: 0fc49f81 */ jal 0xf127e04 +/* f127638: 0fc49f81 */ jal func0f127334 /* f12763c: 00803025 */ move $a2,$a0 /* f127640: 8fad0198 */ lw $t5,0x198($sp) .PF0f127644: diff --git a/src/game/game_1531a0.c b/src/game/game_1531a0.c index fa5e931fb..35a255fd4 100644 --- a/src/game/game_1531a0.c +++ b/src/game/game_1531a0.c @@ -184,14 +184,14 @@ glabel fontLoad /* f153f08: afa80028 */ sw $t0,0x28($sp) /* f153f0c: 03303023 */ subu $a2,$t9,$s0 /* f153f10: 00c02025 */ move $a0,$a2 -/* f153f14: 0c004856 */ jal 0x12158 +/* f153f14: 0c004856 */ jal malloc /* f153f18: afa60024 */ sw $a2,0x24($sp) /* f153f1c: 244902a4 */ addiu $t1,$v0,0x2a4 /* f153f20: 8fa60024 */ lw $a2,0x24($sp) /* f153f24: afa9002c */ sw $t1,0x2c($sp) /* f153f28: 00402025 */ move $a0,$v0 /* f153f2c: 02002825 */ move $a1,$s0 -/* f153f30: 0c003454 */ jal 0xd150 +/* f153f30: 0c003454 */ jal dmaExec /* f153f34: afa20030 */ sw $v0,0x30($sp) /* f153f38: 8fa80028 */ lw $t0,0x28($sp) /* f153f3c: 8fa70030 */ lw $a3,0x30($sp) @@ -2377,7 +2377,7 @@ glabel var7f1b8a14pf /* f155fac: a3a20026 */ sb $v0,0x26($sp) .PF0f155fb0: /* f155fb0: afa60030 */ sw $a2,0x30($sp) -/* f155fb4: 0fc55713 */ jal 0xf155c4c +/* f155fb4: 0fc55713 */ jal func0f155c4cpf /* f155fb8: afa70034 */ sw $a3,0x34($sp) /* f155fbc: 93a20026 */ lbu $v0,0x26($sp) /* f155fc0: 8fa60030 */ lw $a2,0x30($sp) @@ -2424,7 +2424,7 @@ glabel var7f1b8a14pf /* f156050: 2548fe74 */ addiu $t0,$t2,-396 /* f156054: 18800004 */ blez $a0,.PF0f156068 /* f156058: acc80000 */ sw $t0,0x0($a2) -/* f15605c: 0fc55713 */ jal 0xf155c4c +/* f15605c: 0fc55713 */ jal func0f155c4cpf /* f156060: 27a40027 */ addiu $a0,$sp,0x27 /* f156064: 8fa30038 */ lw $v1,0x38($sp) .PF0f156068: @@ -2728,7 +2728,7 @@ glabel func0f1552d4 /* f1564c0: 8fa600e4 */ lw $a2,0xe4($sp) /* f1564c4: afa00014 */ sw $zero,0x14($sp) /* f1564c8: afa200bc */ sw $v0,0xbc($sp) -/* f1564cc: 0fc5609a */ jal 0xf158268 +/* f1564cc: 0fc5609a */ jal textMeasure /* f1564d0: afa80010 */ sw $t0,0x10($sp) /* f1564d4: 8fa900c4 */ lw $t1,0xc4($sp) /* f1564d8: 3c013f80 */ lui $at,0x3f80 @@ -2776,7 +2776,7 @@ glabel func0f1552d4 /* f156580: ac6d0000 */ sw $t5,0x0($v1) /* f156584: ae4f0000 */ sw $t7,0x0($s2) /* f156588: 46124282 */ mul.s $f10,$f8,$f18 -/* f15658c: 0c012ab0 */ jal 0x4aac0 +/* f15658c: 0c012ab0 */ jal osVirtualToPhysical /* f156590: 460a8581 */ sub.s $f22,$f16,$f10 /* f156594: 02001825 */ move $v1,$s0 /* f156598: ae420004 */ sw $v0,0x4($s2) @@ -2872,7 +2872,7 @@ glabel func0f1552d4 /* f1566e8: afae0010 */ sw $t6,0x10($sp) /* f1566ec: 03c02825 */ move $a1,$s8 /* f1566f0: 27a60080 */ addiu $a2,$sp,0x80 -/* f1566f4: 0fc5574b */ jal 0xf155d2c +/* f1566f4: 0fc5574b */ jal func0f155d2cpf /* f1566f8: 8fa700e8 */ lw $a3,0xe8($sp) /* f1566fc: 8faf00ec */ lw $t7,0xec($sp) /* f156700: 02002025 */ move $a0,$s0 @@ -2883,7 +2883,7 @@ glabel func0f1552d4 /* f156714: e7b80018 */ swc1 $f24,0x18($sp) /* f156718: e7b4001c */ swc1 $f20,0x1c($sp) /* f15671c: e7b60020 */ swc1 $f22,0x20($sp) -/* f156720: 0fc55824 */ jal 0xf156090 +/* f156720: 0fc55824 */ jal func0f154f38 /* f156724: afaf0010 */ sw $t7,0x10($sp) /* f156728: 00408025 */ move $s0,$v0 .PF0f15672c: @@ -3232,14 +3232,14 @@ glabel func0f15568c /* f156864: 8e4e0000 */ lw $t6,0x0($s2) /* f156868: 59c00222 */ blezl $t6,.PF0f1570f4 /* f15686c: 92390003 */ lbu $t9,0x3($s1) -/* f156870: 0c002e53 */ jal 0xb94c +/* f156870: 0c002e53 */ jal viGetWidth /* f156874: afaa0090 */ sw $t2,0x90($sp) /* f156878: 8e4d0000 */ lw $t5,0x0($s2) /* f15687c: 8faa0090 */ lw $t2,0x90($sp) /* f156880: 004d082a */ slt $at,$v0,$t5 /* f156884: 5420021b */ bnezl $at,.PF0f1570f4 /* f156888: 92390003 */ lbu $t9,0x3($s1) -/* f15688c: 0c002e57 */ jal 0xb95c +/* f15688c: 0c002e57 */ jal viGetHeight /* f156890: afaa0090 */ sw $t2,0x90($sp) /* f156894: 8faa0090 */ lw $t2,0x90($sp) /* f156898: 822f0001 */ lb $t7,0x1($s1) @@ -3334,7 +3334,7 @@ glabel func0f15568c .PF0f1569ec: /* f1569ec: afaa0090 */ sw $t2,0x90($sp) /* f1569f0: afa80040 */ sw $t0,0x40($sp) -/* f1569f4: 0fc556f8 */ jal 0xf155be0 +/* f1569f4: 0fc556f8 */ jal func0f154ecc /* f1569f8: 01af3021 */ addu $a2,$t5,$t7 /* f1569fc: 3c0c8008 */ lui $t4,0x8008 /* f156a00: 258c0030 */ addiu $t4,$t4,0x30 @@ -3533,7 +3533,7 @@ glabel func0f15568c /* f156cec: 92390003 */ lbu $t9,0x3($s1) /* f156cf0: 8dd90000 */ lw $t9,0x0($t6) /* f156cf4: afaa0090 */ sw $t2,0x90($sp) -/* f156cf8: 0fc55220 */ jal 0xf154880 +/* f156cf8: 0fc55220 */ jal func0f153b6c /* f156cfc: 03382021 */ addu $a0,$t9,$t8 /* f156d00: 3c0d8008 */ lui $t5,0x8008 /* f156d04: 8dad0020 */ lw $t5,0x20($t5) @@ -3580,7 +3580,7 @@ glabel func0f15568c /* f156da0: afa0001c */ sw $zero,0x1c($sp) /* f156da4: 8c844bd4 */ lw $a0,0x4bd4($a0) /* f156da8: afa20014 */ sw $v0,0x14($sp) -/* f156dac: 0fc354ab */ jal 0xf0d52ac +/* f156dac: 0fc354ab */ jal func0f0d4d0c /* f156db0: afa20018 */ sw $v0,0x18($sp) /* f156db4: 3c01800a */ lui $at,0x800a /* f156db8: ac224bd4 */ sw $v0,0x4bd4($at) @@ -3629,7 +3629,7 @@ glabel func0f15568c /* f156e58: afa0001c */ sw $zero,0x1c($sp) /* f156e5c: 8c844bd4 */ lw $a0,0x4bd4($a0) /* f156e60: afa20014 */ sw $v0,0x14($sp) -/* f156e64: 0fc354ab */ jal 0xf0d52ac +/* f156e64: 0fc354ab */ jal func0f0d4d0c /* f156e68: afa20018 */ sw $v0,0x18($sp) /* f156e6c: 3c01800a */ lui $at,0x800a /* f156e70: 1000009f */ b .PF0f1570f0 @@ -4516,7 +4516,7 @@ glabel textRenderProjected /* f1571cc: 11800064 */ beqz $t4,.PF0f157360 /* f1571d0: 3c014220 */ lui $at,0x4220 /* f1571d4: 44816000 */ mtc1 $at,$f12 -/* f1571d8: 0fc01abe */ jal 0xf006af8 +/* f1571d8: 0fc01abe */ jal func0f006b08 /* f1571dc: 00000000 */ nop /* f1571e0: 3c0e8008 */ lui $t6,0x8008 /* f1571e4: 8dce0020 */ lw $t6,0x20($t6) @@ -4592,7 +4592,7 @@ glabel textRenderProjected /* f1572e8: 01415824 */ and $t3,$t2,$at /* f1572ec: 01696025 */ or $t4,$t3,$t1 /* f1572f0: 44d9f800 */ ctc1 $t9,$31 -/* f1572f4: 0c003624 */ jal 0xd890 +/* f1572f4: 0c003624 */ jal func0000db30 /* f1572f8: afac0094 */ sw $t4,0x94($sp) /* f1572fc: 3c028008 */ lui $v0,0x8008 /* f157300: 8c420130 */ lw $v0,0x130($v0) @@ -4617,7 +4617,7 @@ glabel textRenderProjected /* f157348: afaf0018 */ sw $t7,0x18($sp) /* f15734c: afb80020 */ sw $t8,0x20($sp) /* f157350: afb90024 */ sw $t9,0x24($sp) -/* f157354: 0fc55fa0 */ jal 0xf157e80 +/* f157354: 0fc55fa0 */ jal textRender /* f157358: afaa0028 */ sw $t2,0x28($sp) /* f15735c: 00409825 */ move $s3,$v0 .PF0f157360: @@ -4625,37 +4625,37 @@ glabel textRenderProjected /* f157364: 3c058008 */ lui $a1,0x8008 /* f157368: 8fb400d0 */ lw $s4,0xd0($sp) /* f15736c: 24a5010c */ addiu $a1,$a1,0x10c -/* f157370: 0c003624 */ jal 0xd890 +/* f157370: 0c003624 */ jal func0000db30 /* f157374: 248486f0 */ addiu $a0,$a0,-30992 /* f157378: 3c047f1c */ lui $a0,0x7f1c /* f15737c: 3c058008 */ lui $a1,0x8008 /* f157380: 24a50118 */ addiu $a1,$a1,0x118 -/* f157384: 0c003624 */ jal 0xd890 +/* f157384: 0c003624 */ jal func0000db30 /* f157388: 248486f8 */ addiu $a0,$a0,-30984 /* f15738c: 3c047f1c */ lui $a0,0x7f1c /* f157390: 3c058008 */ lui $a1,0x8008 /* f157394: 24a5011c */ addiu $a1,$a1,0x11c -/* f157398: 0c003624 */ jal 0xd890 +/* f157398: 0c003624 */ jal func0000db30 /* f15739c: 24848704 */ addiu $a0,$a0,-30972 /* f1573a0: 3c047f1c */ lui $a0,0x7f1c /* f1573a4: 3c058008 */ lui $a1,0x8008 /* f1573a8: 24a50124 */ addiu $a1,$a1,0x124 -/* f1573ac: 0c003624 */ jal 0xd890 +/* f1573ac: 0c003624 */ jal func0000db30 /* f1573b0: 24848710 */ addiu $a0,$a0,-30960 /* f1573b4: 3c047f1c */ lui $a0,0x7f1c /* f1573b8: 3c058008 */ lui $a1,0x8008 /* f1573bc: 24a50120 */ addiu $a1,$a1,0x120 -/* f1573c0: 0c003624 */ jal 0xd890 +/* f1573c0: 0c003624 */ jal func0000db30 /* f1573c4: 24848718 */ addiu $a0,$a0,-30952 /* f1573c8: 3c047f1c */ lui $a0,0x7f1c /* f1573cc: 3c058008 */ lui $a1,0x8008 /* f1573d0: 24a50110 */ addiu $a1,$a1,0x110 -/* f1573d4: 0c003624 */ jal 0xd890 +/* f1573d4: 0c003624 */ jal func0000db30 /* f1573d8: 24848720 */ addiu $a0,$a0,-30944 /* f1573dc: 3c047f1c */ lui $a0,0x7f1c /* f1573e0: 3c058008 */ lui $a1,0x8008 /* f1573e4: 24a50114 */ addiu $a1,$a1,0x114 -/* f1573e8: 0c003624 */ jal 0xd890 +/* f1573e8: 0c003624 */ jal func0000db30 /* f1573ec: 24848728 */ addiu $a0,$a0,-30936 /* f1573f0: 8e0b0000 */ lw $t3,0x0($s0) /* f1573f4: 8e320000 */ lw $s2,0x0($s1) @@ -4695,7 +4695,7 @@ glabel textRenderProjected /* f157470: 3c048008 */ lui $a0,0x8008 /* f157474: 2484009c */ addiu $a0,$a0,0x9c /* f157478: afa70078 */ sw $a3,0x78($sp) -/* f15747c: 0c012ab0 */ jal 0x4aac0 +/* f15747c: 0c012ab0 */ jal osVirtualToPhysical /* f157480: 26730008 */ addiu $s3,$s3,0x8 /* f157484: 8fa70078 */ lw $a3,0x78($sp) /* f157488: 02601825 */ move $v1,$s3 @@ -4791,7 +4791,7 @@ glabel textRenderProjected /* f1575dc: 27a400b4 */ addiu $a0,$sp,0xb4 /* f1575e0: 27a5005c */ addiu $a1,$sp,0x5c /* f1575e4: 27a60058 */ addiu $a2,$sp,0x58 -/* f1575e8: 0fc5574b */ jal 0xf155d2c +/* f1575e8: 0fc5574b */ jal func0f155d2cpf /* f1575ec: 8fa700b8 */ lw $a3,0xb8($sp) /* f1575f0: 8fb90058 */ lw $t9,0x58($sp) /* f1575f4: 8faa00bc */ lw $t2,0xbc($sp) @@ -4809,7 +4809,7 @@ glabel textRenderProjected /* f157624: afab001c */ sw $t3,0x1c($sp) /* f157628: afa90020 */ sw $t1,0x20($sp) /* f15762c: afac0024 */ sw $t4,0x24($sp) -/* f157630: 0fc559e0 */ jal 0xf156780 +/* f157630: 0fc559e0 */ jal func0f15568c /* f157634: afad0028 */ sw $t5,0x28($sp) /* f157638: 00409825 */ move $s3,$v0 .PF0f15763c: @@ -5866,7 +5866,7 @@ glabel textRender /* f157f5c: ac6e0000 */ sw $t6,0x0($v1) /* f157f60: 3c18fd10 */ lui $t8,0xfd10 /* f157f64: ae580000 */ sw $t8,0x0($s2) -/* f157f68: 0c012ab0 */ jal 0x4aac0 +/* f157f68: 0c012ab0 */ jal osVirtualToPhysical /* f157f6c: 248400bc */ addiu $a0,$a0,0xbc /* f157f70: 02001825 */ move $v1,$s0 /* f157f74: ae420004 */ sw $v0,0x4($s2) @@ -5989,7 +5989,7 @@ glabel textRender /* f15813c: afb80010 */ sw $t8,0x10($sp) /* f158140: 27a50078 */ addiu $a1,$sp,0x78 /* f158144: 27a60074 */ addiu $a2,$sp,0x74 -/* f158148: 0fc5574b */ jal 0xf155d2c +/* f158148: 0fc5574b */ jal func0f155d2cpf /* f15814c: 8fa700d0 */ lw $a3,0xd0($sp) /* f158150: 8e4c0000 */ lw $t4,0x0($s2) /* f158154: 8fab0074 */ lw $t3,0x74($sp) @@ -6006,7 +6006,7 @@ glabel textRender /* f158180: afab0010 */ sw $t3,0x10($sp) /* f158184: 00006812 */ mflo $t5 /* f158188: afad0020 */ sw $t5,0x20($sp) -/* f15818c: 0fc55df2 */ jal 0xf1577c8 +/* f15818c: 0fc55df2 */ jal func0f156790 /* f158190: afb9001c */ sw $t9,0x1c($sp) /* f158194: 00408025 */ move $s0,$v0 .PF0f158198: @@ -6475,7 +6475,7 @@ glabel textMeasure /* f15839c: afb80010 */ sw $t8,0x10($sp) /* f1583a0: 02e02825 */ move $a1,$s7 /* f1583a4: 03c03025 */ move $a2,$s8 -/* f1583a8: 0fc5574b */ jal 0xf155d2c +/* f1583a8: 0fc5574b */ jal func0f155d2cpf /* f1583ac: 8fa7006c */ lw $a3,0x6c($sp) /* f1583b0: 8fb9004c */ lw $t9,0x4c($sp) /* f1583b4: 8fac0050 */ lw $t4,0x50($sp) @@ -6860,7 +6860,7 @@ glabel textWrap /* f158584: 27a40074 */ addiu $a0,$sp,0x74 /* f158588: 27a50078 */ addiu $a1,$sp,0x78 /* f15858c: 02603825 */ move $a3,$s3 -/* f158590: 0fc5609a */ jal 0xf158268 +/* f158590: 0fc5609a */ jal textMeasure /* f158594: afb90010 */ sw $t9,0x10($sp) /* f158598: 8fab0084 */ lw $t3,0x84($sp) /* f15859c: 8fae0078 */ lw $t6,0x78($sp) diff --git a/src/game/game_190260.c b/src/game/game_190260.c index dc2a3ce7c..cbdfacfde 100644 --- a/src/game/game_190260.c +++ b/src/game/game_190260.c @@ -112,13 +112,13 @@ glabel mpChrReset /* f1913bc: e4820100 */ swc1 $f2,0x100($a0) /* f1913c0: a486017e */ sh $a2,0x17e($a0) /* f1913c4: a486012a */ sh $a2,0x12a($a0) -/* f1913c8: 0fc0d044 */ jal 0xf034110 +/* f1913c8: 0fc0d044 */ jal chrSetShield /* f1913cc: a4860292 */ sh $a2,0x292($a0) /* f1913d0: a2200184 */ sb $zero,0x184($s1) /* f1913d4: a2200185 */ sb $zero,0x185($s1) -/* f1913d8: 0fc29d45 */ jal 0xf0a7514 +/* f1913d8: 0fc29d45 */ jal freeFireslot /* f1913dc: 8224017c */ lb $a0,0x17c($s1) -/* f1913e0: 0fc29d45 */ jal 0xf0a7514 +/* f1913e0: 0fc29d45 */ jal freeFireslot /* f1913e4: 8224017d */ lb $a0,0x17d($s1) /* f1913e8: 922b032d */ lbu $t3,0x32d($s1) /* f1913ec: 3c014339 */ lui $at,0x4339 @@ -146,7 +146,7 @@ glabel mpChrReset /* f191440: 28610084 */ slti $at,$v1,0x84 /* f191444: 1420fffb */ bnez $at,.PF0f191434 /* f191448: af000000 */ sw $zero,0x0($t8) -/* f19144c: 0fc66340 */ jal 0xf198d00 +/* f19144c: 0fc66340 */ jal aibotClearInventory /* f191450: 02202025 */ move $a0,$s1 /* f191454: 9208004c */ lbu $t0,0x4c($s0) /* f191458: 920d009c */ lbu $t5,0x9c($s0) @@ -234,7 +234,7 @@ glabel mpChrReset /* f19159c: 1487fff7 */ bne $a0,$a3,.PF0f19157c /* f1915a0: a4a601a6 */ sh $a2,0x1a6($a1) /* f1915a4: ae0001e8 */ sw $zero,0x1e8($s0) -/* f1915a8: 0c004ad4 */ jal 0x12b50 +/* f1915a8: 0c004ad4 */ jal random /* f1915ac: ae000208 */ sw $zero,0x208($s0) /* f1915b0: 9209009c */ lbu $t1,0x9c($s0) /* f1915b4: 44801000 */ mtc1 $zero,$f2 @@ -244,9 +244,9 @@ glabel mpChrReset /* f1915c4: ae0002c8 */ sw $zero,0x2c8($s0) /* f1915c8: a20a009c */ sb $t2,0x9c($s0) /* f1915cc: ae0002cc */ sw $zero,0x2cc($s0) -/* f1915d0: 0c004ad4 */ jal 0x12b50 +/* f1915d0: 0c004ad4 */ jal random /* f1915d4: e60202c4 */ swc1 $f2,0x2c4($s0) -/* f1915d8: 0c004ad4 */ jal 0x12b50 +/* f1915d8: 0c004ad4 */ jal random /* f1915dc: ae0202d0 */ sw $v0,0x2d0($s0) /* f1915e0: 44823000 */ mtc1 $v0,$f6 /* f1915e4: 3c014f80 */ lui $at,0x4f80 @@ -286,7 +286,7 @@ glabel mpChrReset /* f19165c: 24180001 */ li $t8,0x1 /* f191660: 960e0064 */ lhu $t6,0x64($s0) /* f191664: 31cffffe */ andi $t7,$t6,0xfffe -/* f191668: 0fc664de */ jal 0xf199378 +/* f191668: 0fc664de */ jal mpHasShield /* f19166c: a60f0064 */ sh $t7,0x64($s0) /* f191670: 10400004 */ beqz $v0,.PF0f191684 /* f191674: 3c014100 */ lui $at,0x4100 @@ -5573,7 +5573,7 @@ glabel var7f1b8fc8 /* f195c1c: afb20028 */ sw $s2,0x28($sp) /* f195c20: afb10024 */ sw $s1,0x24($sp) /* f195c24: afb00020 */ sw $s0,0x20($sp) -/* f195c28: 0fc0e706 */ jal 0xf039c18 +/* f195c28: 0fc0e706 */ jal chrIsDead /* f195c2c: 2415ffff */ li $s5,-1 /* f195c30: 14400a77 */ bnez $v0,.PF0f198610 /* f195c34: 3c16800a */ lui $s6,0x800a @@ -5584,15 +5584,15 @@ glabel var7f1b8fc8 /* f195c48: 01cfc823 */ subu $t9,$t6,$t7 /* f195c4c: 07210017 */ bgez $t9,.PF0f195cac /* f195c50: ae5902cc */ sw $t9,0x2cc($s2) -/* f195c54: 0c004ad4 */ jal 0x12b50 +/* f195c54: 0c004ad4 */ jal random /* f195c58: 00000000 */ nop /* f195c5c: 24012ee0 */ li $at,0x2ee0 /* f195c60: 0041001b */ divu $zero,$v0,$at /* f195c64: 00004810 */ mfhi $t1 /* f195c68: 252a05dc */ addiu $t2,$t1,0x5dc -/* f195c6c: 0c004ad4 */ jal 0x12b50 +/* f195c6c: 0c004ad4 */ jal random /* f195c70: ae4a02cc */ sw $t2,0x2cc($s2) -/* f195c74: 0c004ad4 */ jal 0x12b50 +/* f195c74: 0c004ad4 */ jal random /* f195c78: ae4202d0 */ sw $v0,0x2d0($s2) /* f195c7c: 44822000 */ mtc1 $v0,$f4 /* f195c80: 3c014f80 */ lui $at,0x4f80 @@ -5623,7 +5623,7 @@ glabel var7f1b8fc8 /* f195cd8: 26100001 */ addiu $s0,$s0,0x1 /* f195cdc: 02002825 */ move $a1,$s0 /* f195ce0: 24060001 */ li $a2,0x1 -/* f195ce4: 0fc66ad0 */ jal 0xf19ab40 +/* f195ce4: 0fc66ad0 */ jal aibotReloadWeapon /* f195ce8: afa70054 */ sw $a3,0x54($sp) /* f195cec: 10000030 */ b .PF0f195db0 /* f195cf0: 8fa70054 */ lw $a3,0x54($sp) @@ -5632,7 +5632,7 @@ glabel var7f1b8fc8 /* f195cf8: 8e440020 */ lw $a0,0x20($s2) /* f195cfc: afa70054 */ sw $a3,0x54($sp) /* f195d00: 00057080 */ sll $t6,$a1,0x2 -/* f195d04: 0fc66ce7 */ jal 0xf19b39c +/* f195d04: 0fc66ce7 */ jal func0f19a29c /* f195d08: 000e2fc2 */ srl $a1,$t6,0x1f /* f195d0c: 14400028 */ bnez $v0,.PF0f195db0 /* f195d10: 8fa70054 */ lw $a3,0x54($sp) @@ -5644,7 +5644,7 @@ glabel var7f1b8fc8 /* f195d28: 00054880 */ sll $t1,$a1,0x2 /* f195d2c: 00092fc2 */ srl $a1,$t1,0x1f /* f195d30: afa70054 */ sw $a3,0x54($sp) -/* f195d34: 0fc66abe */ jal 0xf19aaf8 +/* f195d34: 0fc66abe */ jal weaponGetClipCapacityByFunction /* f195d38: afa302e8 */ sw $v1,0x2e8($sp) /* f195d3c: 8fa302e8 */ lw $v1,0x2e8($sp) /* f195d40: 8fa70054 */ lw $a3,0x54($sp) @@ -5653,7 +5653,7 @@ glabel var7f1b8fc8 /* f195d4c: 18400006 */ blez $v0,.PF0f195d68 /* f195d50: 02802025 */ move $a0,$s4 /* f195d54: 02002825 */ move $a1,$s0 -/* f195d58: 0fc651d3 */ jal 0xf19474c +/* f195d58: 0fc651d3 */ jal func0f19369c /* f195d5c: afa70054 */ sw $a3,0x54($sp) /* f195d60: 10000013 */ b .PF0f195db0 /* f195d64: 8fa70054 */ lw $a3,0x54($sp) @@ -5674,7 +5674,7 @@ glabel var7f1b8fc8 /* f195d98: 50200006 */ beqzl $at,.PF0f195db4 /* f195d9c: 26100001 */ addiu $s0,$s0,0x1 /* f195da0: 02002825 */ move $a1,$s0 -/* f195da4: 0fc651d3 */ jal 0xf19474c +/* f195da4: 0fc651d3 */ jal func0f19369c /* f195da8: afa70054 */ sw $a3,0x54($sp) /* f195dac: 8fa70054 */ lw $a3,0x54($sp) .PF0f195db0: @@ -5691,10 +5691,10 @@ glabel var7f1b8fc8 /* f195dd4: 004fc823 */ subu $t9,$v0,$t7 /* f195dd8: 1f20003f */ bgtz $t9,.PF0f195ed8 /* f195ddc: ae5900cc */ sw $t9,0xcc($s2) -/* f195de0: 0fc6637c */ jal 0xf198df0 +/* f195de0: 0fc6637c */ jal aibotGetInvItem /* f195de4: 8e450020 */ lw $a1,0x20($s2) /* f195de8: 00408025 */ move $s0,$v0 -/* f195dec: 0fc4a571 */ jal 0xf1295c4 +/* f195dec: 0fc4a571 */ jal weaponGetModel /* f195df0: 8e440020 */ lw $a0,0x20($s2) /* f195df4: 12000019 */ beqz $s0,.PF0f195e5c /* f195df8: 00408825 */ move $s1,$v0 @@ -5702,11 +5702,11 @@ glabel var7f1b8fc8 /* f195e00: 02802025 */ move $a0,$s4 /* f195e04: 00402825 */ move $a1,$v0 /* f195e08: 8e460020 */ lw $a2,0x20($s2) -/* f195e0c: 0fc22e7f */ jal 0xf08b9fc +/* f195e0c: 0fc22e7f */ jal chrGiveWeapon /* f195e10: 00003825 */ move $a3,$zero /* f195e14: 02802025 */ move $a0,$s4 /* f195e18: 00002825 */ move $a1,$zero -/* f195e1c: 0fc66ad0 */ jal 0xf19ab40 +/* f195e1c: 0fc66ad0 */ jal aibotReloadWeapon /* f195e20: 00003025 */ move $a2,$zero /* f195e24: 8e090000 */ lw $t1,0x0($s0) /* f195e28: 24010003 */ li $at,0x3 @@ -5714,11 +5714,11 @@ glabel var7f1b8fc8 /* f195e30: 15210008 */ bne $t1,$at,.PF0f195e54 /* f195e34: 02202825 */ move $a1,$s1 /* f195e38: 8e460020 */ lw $a2,0x20($s2) -/* f195e3c: 0fc22e7f */ jal 0xf08b9fc +/* f195e3c: 0fc22e7f */ jal chrGiveWeapon /* f195e40: 3c071000 */ lui $a3,0x1000 /* f195e44: 02802025 */ move $a0,$s4 /* f195e48: 24050001 */ li $a1,0x1 -/* f195e4c: 0fc66ad0 */ jal 0xf19ab40 +/* f195e4c: 0fc66ad0 */ jal aibotReloadWeapon /* f195e50: 00003025 */ move $a2,$zero .PF0f195e54: /* f195e54: 1000000e */ b .PF0f195e90 @@ -5773,7 +5773,7 @@ glabel var7f1b8fc8 /* f195efc: 8df80050 */ lw $t8,0x50($t7) /* f195f00: 1b00000d */ blez $t8,.PF0f195f38 /* f195f04: 02802025 */ move $a0,$s4 -/* f195f08: 0fc649bc */ jal 0xf1926f0 +/* f195f08: 0fc649bc */ jal func0f191638 /* f195f0c: 02e02825 */ move $a1,$s7 /* f195f10: 54400006 */ bnezl $v0,.PF0f195f2c /* f195f14: 924a004c */ lbu $t2,0x4c($s2) @@ -5832,11 +5832,11 @@ glabel var7f1b8fc8 /* f195fc8: 17210033 */ bne $t9,$at,.PF0f196098 /* f195fcc: 2405000d */ li $a1,0xd /* f195fd0: 00003025 */ move $a2,$zero -/* f195fd4: 0fc66b39 */ jal 0xf19ace4 +/* f195fd4: 0fc66b39 */ jal aibotGetAmmoQuantityByWeapon /* f195fd8: 02e03825 */ move $a3,$s7 /* f195fdc: 00408025 */ move $s0,$v0 /* f195fe0: 02802025 */ move $a0,$s4 -/* f195fe4: 0fc649bc */ jal 0xf1926f0 +/* f195fe4: 0fc649bc */ jal func0f191638 /* f195fe8: 02e02825 */ move $a1,$s7 /* f195fec: 5040001a */ beqzl $v0,.PF0f196058 /* f195ff0: 8e4b0210 */ lw $t3,0x210($s2) @@ -5923,7 +5923,7 @@ glabel var7f1b8fc8 .PF0f196114: /* f196114: 5c40013a */ bgtzl $v0,.PF0f196600 /* f196118: 928d02a0 */ lbu $t5,0x2a0($s4) -/* f19611c: 0fc655e3 */ jal 0xf19578c +/* f19611c: 0fc655e3 */ jal mpGetNumPlayerTeammates /* f196120: 02802025 */ move $a0,$s4 /* f196124: 3c03800b */ lui $v1,0x800b /* f196128: 9063d138 */ lbu $v1,-0x2ec8($v1) @@ -5932,7 +5932,7 @@ glabel var7f1b8fc8 /* f196134: 16e3001e */ bne $s7,$v1,.PF0f1961b0 /* f196138: 24010002 */ li $at,0x2 /* f19613c: 2405000b */ li $a1,0xb -/* f196140: 0fc655f7 */ jal 0xf1957dc +/* f196140: 0fc655f7 */ jal mpCountAibotsWithCommand /* f196144: 00003025 */ move $a2,$zero /* f196148: 18400010 */ blez $v0,.PF0f19618c /* f19614c: 266c0001 */ addiu $t4,$s3,0x1 @@ -5944,7 +5944,7 @@ glabel var7f1b8fc8 /* f196160: 004e082a */ slt $at,$v0,$t6 /* f196164: 5420000a */ bnezl $at,.PF0f196190 /* f196168: 02802025 */ move $a0,$s4 -/* f19616c: 0c004ad4 */ jal 0x12b50 +/* f19616c: 0c004ad4 */ jal random /* f196170: 00000000 */ nop /* f196174: 24010064 */ li $at,0x64 /* f196178: 0041001b */ divu $zero,$v0,$at @@ -5955,12 +5955,12 @@ glabel var7f1b8fc8 .PF0f19618c: /* f19618c: 02802025 */ move $a0,$s4 .PF0f196190: -/* f196190: 0fc64db2 */ jal 0xf1936c8 +/* f196190: 0fc64db2 */ jal mpAibotApplyScenarioCommand /* f196194: 2405000b */ li $a1,0xb /* f196198: 10000111 */ b .PF0f1965e0 /* f19619c: 00000000 */ nop .PF0f1961a0: -/* f1961a0: 0fc64db2 */ jal 0xf1936c8 +/* f1961a0: 0fc64db2 */ jal mpAibotApplyScenarioCommand /* f1961a4: 24050004 */ li $a1,0x4 /* f1961a8: 1000010d */ b .PF0f1965e0 /* f1961ac: 00000000 */ nop @@ -5968,7 +5968,7 @@ glabel var7f1b8fc8 /* f1961b0: 14610022 */ bne $v1,$at,.PF0f19623c /* f1961b4: 02802025 */ move $a0,$s4 /* f1961b8: 24050005 */ li $a1,0x5 -/* f1961bc: 0fc655f7 */ jal 0xf1957dc +/* f1961bc: 0fc655f7 */ jal mpCountAibotsWithCommand /* f1961c0: 00003025 */ move $a2,$zero /* f1961c4: 8e58004c */ lw $t8,0x4c($s2) /* f1961c8: 00184940 */ sll $t1,$t8,0x5 @@ -5984,7 +5984,7 @@ glabel var7f1b8fc8 /* f1961ec: 004b082a */ slt $at,$v0,$t3 /* f1961f0: 5420000a */ bnezl $at,.PF0f19621c /* f1961f4: 02802025 */ move $a0,$s4 -/* f1961f8: 0c004ad4 */ jal 0x12b50 +/* f1961f8: 0c004ad4 */ jal random /* f1961fc: 00000000 */ nop /* f196200: 24010064 */ li $at,0x64 /* f196204: 0041001b */ divu $zero,$v0,$at @@ -5995,12 +5995,12 @@ glabel var7f1b8fc8 .PF0f196218: /* f196218: 02802025 */ move $a0,$s4 .PF0f19621c: -/* f19621c: 0fc64db2 */ jal 0xf1936c8 +/* f19621c: 0fc64db2 */ jal mpAibotApplyScenarioCommand /* f196220: 24050005 */ li $a1,0x5 /* f196224: 100000ee */ b .PF0f1965e0 /* f196228: 00000000 */ nop .PF0f19622c: -/* f19622c: 0fc64db2 */ jal 0xf1936c8 +/* f19622c: 0fc64db2 */ jal mpAibotApplyScenarioCommand /* f196230: 24050004 */ li $a1,0x4 /* f196234: 100000ea */ b .PF0f1965e0 /* f196238: 00000000 */ nop @@ -6009,7 +6009,7 @@ glabel var7f1b8fc8 /* f196240: 1461001e */ bne $v1,$at,.PF0f1962bc /* f196244: 02802025 */ move $a0,$s4 /* f196248: 2405000c */ li $a1,0xc -/* f19624c: 0fc655f7 */ jal 0xf1957dc +/* f19624c: 0fc655f7 */ jal mpCountAibotsWithCommand /* f196250: 00003025 */ move $a2,$zero /* f196254: 18400010 */ blez $v0,.PF0f196298 /* f196258: 266c0001 */ addiu $t4,$s3,0x1 @@ -6021,7 +6021,7 @@ glabel var7f1b8fc8 /* f19626c: 004e082a */ slt $at,$v0,$t6 /* f196270: 5420000a */ bnezl $at,.PF0f19629c /* f196274: 02802025 */ move $a0,$s4 -/* f196278: 0c004ad4 */ jal 0x12b50 +/* f196278: 0c004ad4 */ jal random /* f19627c: 00000000 */ nop /* f196280: 24010064 */ li $at,0x64 /* f196284: 0041001b */ divu $zero,$v0,$at @@ -6032,12 +6032,12 @@ glabel var7f1b8fc8 .PF0f196298: /* f196298: 02802025 */ move $a0,$s4 .PF0f19629c: -/* f19629c: 0fc64db2 */ jal 0xf1936c8 +/* f19629c: 0fc64db2 */ jal mpAibotApplyScenarioCommand /* f1962a0: 2405000c */ li $a1,0xc /* f1962a4: 100000ce */ b .PF0f1965e0 /* f1962a8: 00000000 */ nop .PF0f1962ac: -/* f1962ac: 0fc64db2 */ jal 0xf1936c8 +/* f1962ac: 0fc64db2 */ jal mpAibotApplyScenarioCommand /* f1962b0: 24050004 */ li $a1,0x4 /* f1962b4: 100000ca */ b .PF0f1965e0 /* f1962b8: 00000000 */ nop @@ -6045,7 +6045,7 @@ glabel var7f1b8fc8 /* f1962bc: 24010004 */ li $at,0x4 /* f1962c0: 54610034 */ bnel $v1,$at,.PF0f196394 /* f1962c4: 24010005 */ li $at,0x5 -/* f1962c8: 0fc6566f */ jal 0xf1959bc +/* f1962c8: 0fc6566f */ jal mpGetNumTeammatesDefendingHill /* f1962cc: 02802025 */ move $a0,$s4 /* f1962d0: 8e98001c */ lw $t8,0x1c($s4) /* f1962d4: 3c09800b */ lui $t1,0x800b @@ -6068,17 +6068,17 @@ glabel var7f1b8fc8 /* f196310: 10200005 */ beqz $at,.PF0f196328 /* f196314: 00000000 */ nop .PF0f196318: -/* f196318: 0fc64db2 */ jal 0xf1936c8 +/* f196318: 0fc64db2 */ jal mpAibotApplyScenarioCommand /* f19631c: 2405000a */ li $a1,0xa /* f196320: 100000af */ b .PF0f1965e0 /* f196324: 00000000 */ nop .PF0f196328: -/* f196328: 0fc65692 */ jal 0xf195a48 +/* f196328: 0fc65692 */ jal mpGetNumOpponentsInHill /* f19632c: 02802025 */ move $a0,$s4 /* f196330: 0050082a */ slt $at,$v0,$s0 /* f196334: 10200012 */ beqz $at,.PF0f196380 /* f196338: 02802025 */ move $a0,$s4 -/* f19633c: 0c004ad4 */ jal 0x12b50 +/* f19633c: 0c004ad4 */ jal random /* f196340: 00000000 */ nop /* f196344: 24010064 */ li $at,0x64 /* f196348: 0041001b */ divu $zero,$v0,$at @@ -6087,17 +6087,17 @@ glabel var7f1b8fc8 /* f196354: 10200006 */ beqz $at,.PF0f196370 /* f196358: 02802025 */ move $a0,$s4 /* f19635c: 02802025 */ move $a0,$s4 -/* f196360: 0fc64db2 */ jal 0xf1936c8 +/* f196360: 0fc64db2 */ jal mpAibotApplyScenarioCommand /* f196364: 24050009 */ li $a1,0x9 /* f196368: 1000009d */ b .PF0f1965e0 /* f19636c: 00000000 */ nop .PF0f196370: -/* f196370: 0fc64db2 */ jal 0xf1936c8 +/* f196370: 0fc64db2 */ jal mpAibotApplyScenarioCommand /* f196374: 24050004 */ li $a1,0x4 /* f196378: 10000099 */ b .PF0f1965e0 /* f19637c: 00000000 */ nop .PF0f196380: -/* f196380: 0fc64db2 */ jal 0xf1936c8 +/* f196380: 0fc64db2 */ jal mpAibotApplyScenarioCommand /* f196384: 2405000a */ li $a1,0xa /* f196388: 10000095 */ b .PF0f1965e0 /* f19638c: 00000000 */ nop @@ -6109,23 +6109,23 @@ glabel var7f1b8fc8 /* f1963a0: 02802025 */ move $a0,$s4 /* f1963a4: 02802025 */ move $a0,$s4 /* f1963a8: 24050006 */ li $a1,0x6 -/* f1963ac: 0fc655f7 */ jal 0xf1957dc +/* f1963ac: 0fc655f7 */ jal mpCountAibotsWithCommand /* f1963b0: 02e03025 */ move $a2,$s7 /* f1963b4: 00408025 */ move $s0,$v0 -/* f1963b8: 0fc65655 */ jal 0xf195954 +/* f1963b8: 0fc65655 */ jal func0f19489c /* f1963bc: 02802025 */ move $a0,$s4 /* f1963c0: 10400005 */ beqz $v0,.PF0f1963d8 /* f1963c4: 02802025 */ move $a0,$s4 -/* f1963c8: 0fc64db2 */ jal 0xf1936c8 +/* f1963c8: 0fc64db2 */ jal mpAibotApplyScenarioCommand /* f1963cc: 24050006 */ li $a1,0x6 /* f1963d0: 10000083 */ b .PF0f1965e0 /* f1963d4: 00000000 */ nop .PF0f1963d8: -/* f1963d8: 0fc6563b */ jal 0xf1958ec +/* f1963d8: 0fc6563b */ jal scenarioCtcIsChrsTokenHeld /* f1963dc: 02802025 */ move $a0,$s4 /* f1963e0: 10400012 */ beqz $v0,.PF0f19642c /* f1963e4: 00000000 */ nop -/* f1963e8: 0c004ad4 */ jal 0x12b50 +/* f1963e8: 0c004ad4 */ jal random /* f1963ec: 00000000 */ nop /* f1963f0: 24010064 */ li $at,0x64 /* f1963f4: 0041001b */ divu $zero,$v0,$at @@ -6134,17 +6134,17 @@ glabel var7f1b8fc8 /* f196400: 10200006 */ beqz $at,.PF0f19641c /* f196404: 02802025 */ move $a0,$s4 /* f196408: 02802025 */ move $a0,$s4 -/* f19640c: 0fc64db2 */ jal 0xf1936c8 +/* f19640c: 0fc64db2 */ jal mpAibotApplyScenarioCommand /* f196410: 24050006 */ li $a1,0x6 /* f196414: 10000072 */ b .PF0f1965e0 /* f196418: 00000000 */ nop .PF0f19641c: -/* f19641c: 0fc64db2 */ jal 0xf1936c8 +/* f19641c: 0fc64db2 */ jal mpAibotApplyScenarioCommand /* f196420: 24050008 */ li $a1,0x8 /* f196424: 1000006e */ b .PF0f1965e0 /* f196428: 00000000 */ nop .PF0f19642c: -/* f19642c: 0c004ad4 */ jal 0x12b50 +/* f19642c: 0c004ad4 */ jal random /* f196430: 00000000 */ nop /* f196434: 24010064 */ li $at,0x64 /* f196438: 0041001b */ divu $zero,$v0,$at @@ -6155,41 +6155,41 @@ glabel var7f1b8fc8 /* f19644c: 1e000005 */ bgtz $s0,.PF0f196464 /* f196450: 24050008 */ li $a1,0x8 .PF0f196454: -/* f196454: 0fc64db2 */ jal 0xf1936c8 +/* f196454: 0fc64db2 */ jal mpAibotApplyScenarioCommand /* f196458: 24050006 */ li $a1,0x6 /* f19645c: 10000060 */ b .PF0f1965e0 /* f196460: 00000000 */ nop .PF0f196464: -/* f196464: 0fc64db2 */ jal 0xf1936c8 +/* f196464: 0fc64db2 */ jal mpAibotApplyScenarioCommand /* f196468: 02802025 */ move $a0,$s4 /* f19646c: 1000005c */ b .PF0f1965e0 /* f196470: 00000000 */ nop .PF0f196474: /* f196474: 24050006 */ li $a1,0x6 -/* f196478: 0fc655f7 */ jal 0xf1957dc +/* f196478: 0fc655f7 */ jal mpCountAibotsWithCommand /* f19647c: 00003025 */ move $a2,$zero /* f196480: 00408825 */ move $s1,$v0 /* f196484: 02802025 */ move $a0,$s4 /* f196488: 24050008 */ li $a1,0x8 -/* f19648c: 0fc655f7 */ jal 0xf1957dc +/* f19648c: 0fc655f7 */ jal mpCountAibotsWithCommand /* f196490: 00003025 */ move $a2,$zero /* f196494: 00408025 */ move $s0,$v0 -/* f196498: 0fc65655 */ jal 0xf195954 +/* f196498: 0fc65655 */ jal func0f19489c /* f19649c: 02802025 */ move $a0,$s4 /* f1964a0: 10400005 */ beqz $v0,.PF0f1964b8 /* f1964a4: 02802025 */ move $a0,$s4 -/* f1964a8: 0fc64db2 */ jal 0xf1936c8 +/* f1964a8: 0fc64db2 */ jal mpAibotApplyScenarioCommand /* f1964ac: 24050006 */ li $a1,0x6 /* f1964b0: 1000004b */ b .PF0f1965e0 /* f1964b4: 00000000 */ nop .PF0f1964b8: -/* f1964b8: 0fc6563b */ jal 0xf1958ec +/* f1964b8: 0fc6563b */ jal scenarioCtcIsChrsTokenHeld /* f1964bc: 02802025 */ move $a0,$s4 /* f1964c0: 10400014 */ beqz $v0,.PF0f196514 /* f1964c4: 00000000 */ nop /* f1964c8: 5a00000a */ blezl $s0,.PF0f1964f4 /* f1964cc: 02802025 */ move $a0,$s4 -/* f1964d0: 0c004ad4 */ jal 0x12b50 +/* f1964d0: 0c004ad4 */ jal random /* f1964d4: 00000000 */ nop /* f1964d8: 24010064 */ li $at,0x64 /* f1964dc: 0041001b */ divu $zero,$v0,$at @@ -6199,12 +6199,12 @@ glabel var7f1b8fc8 /* f1964ec: 02802025 */ move $a0,$s4 /* f1964f0: 02802025 */ move $a0,$s4 .PF0f1964f4: -/* f1964f4: 0fc64db2 */ jal 0xf1936c8 +/* f1964f4: 0fc64db2 */ jal mpAibotApplyScenarioCommand /* f1964f8: 24050008 */ li $a1,0x8 /* f1964fc: 10000038 */ b .PF0f1965e0 /* f196500: 00000000 */ nop .PF0f196504: -/* f196504: 0fc64db2 */ jal 0xf1936c8 +/* f196504: 0fc64db2 */ jal mpAibotApplyScenarioCommand /* f196508: 24050006 */ li $a1,0x6 /* f19650c: 10000034 */ b .PF0f1965e0 /* f196510: 00000000 */ nop @@ -6217,7 +6217,7 @@ glabel var7f1b8fc8 /* f196528: 10200005 */ beqz $at,.PF0f196540 .PF0f19652c: /* f19652c: 02802025 */ move $a0,$s4 -/* f196530: 0fc64db2 */ jal 0xf1936c8 +/* f196530: 0fc64db2 */ jal mpAibotApplyScenarioCommand /* f196534: 24050006 */ li $a1,0x6 /* f196538: 10000029 */ b .PF0f1965e0 /* f19653c: 00000000 */ nop @@ -6233,12 +6233,12 @@ glabel var7f1b8fc8 /* f19655c: 10200005 */ beqz $at,.PF0f196574 /* f196560: 00000000 */ nop .PF0f196564: -/* f196564: 0fc64db2 */ jal 0xf1936c8 +/* f196564: 0fc64db2 */ jal mpAibotApplyScenarioCommand /* f196568: 24050008 */ li $a1,0x8 /* f19656c: 1000001c */ b .PF0f1965e0 /* f196570: 00000000 */ nop .PF0f196574: -/* f196574: 0c004ad4 */ jal 0x12b50 +/* f196574: 0c004ad4 */ jal random /* f196578: 00000000 */ nop /* f19657c: 24010064 */ li $at,0x64 /* f196580: 0041001b */ divu $zero,$v0,$at @@ -6246,12 +6246,12 @@ glabel var7f1b8fc8 /* f196588: 2f21001e */ sltiu $at,$t9,0x1e /* f19658c: 10200005 */ beqz $at,.PF0f1965a4 /* f196590: 02802025 */ move $a0,$s4 -/* f196594: 0fc64db2 */ jal 0xf1936c8 +/* f196594: 0fc64db2 */ jal mpAibotApplyScenarioCommand /* f196598: 24050006 */ li $a1,0x6 /* f19659c: 10000010 */ b .PF0f1965e0 /* f1965a0: 00000000 */ nop .PF0f1965a4: -/* f1965a4: 0c004ad4 */ jal 0x12b50 +/* f1965a4: 0c004ad4 */ jal random /* f1965a8: 00000000 */ nop /* f1965ac: 24010064 */ li $at,0x64 /* f1965b0: 0041001b */ divu $zero,$v0,$at @@ -6260,15 +6260,15 @@ glabel var7f1b8fc8 /* f1965bc: 10200006 */ beqz $at,.PF0f1965d8 /* f1965c0: 02802025 */ move $a0,$s4 /* f1965c4: 02802025 */ move $a0,$s4 -/* f1965c8: 0fc64db2 */ jal 0xf1936c8 +/* f1965c8: 0fc64db2 */ jal mpAibotApplyScenarioCommand /* f1965cc: 24050008 */ li $a1,0x8 /* f1965d0: 10000003 */ b .PF0f1965e0 /* f1965d4: 00000000 */ nop .PF0f1965d8: -/* f1965d8: 0fc64db2 */ jal 0xf1936c8 +/* f1965d8: 0fc64db2 */ jal mpAibotApplyScenarioCommand /* f1965dc: 24050004 */ li $a1,0x4 .PF0f1965e0: -/* f1965e0: 0c004ad4 */ jal 0x12b50 +/* f1965e0: 0c004ad4 */ jal random /* f1965e4: 00000000 */ nop /* f1965e8: 240107d0 */ li $at,0x7d0 /* f1965ec: 0041001b */ divu $zero,$v0,$at @@ -6298,16 +6298,16 @@ glabel var7f1b8fc8 /* f196644: 02802025 */ move $a0,$s4 /* f196648: 13200007 */ beqz $t9,.PF0f196668 /* f19664c: 00000000 */ nop -/* f196650: 0fc0a26a */ jal 0xf0289a8 +/* f196650: 0fc0a26a */ jal chrGetTargetProp /* f196654: 2415002f */ li $s5,0x2f -/* f196658: 0fc63831 */ jal 0xf18e0c4 +/* f196658: 0fc63831 */ jal mpPlayerGetIndex /* f19665c: 8c440004 */ lw $a0,0x4($v0) /* f196660: a6420008 */ sh $v0,0x8($s2) /* f196664: ae5e01d8 */ sw $s8,0x1d8($s2) .PF0f196668: /* f196668: 06a10006 */ bgez $s5,.PF0f196684 /* f19666c: 00000000 */ nop -/* f196670: 0fc655d3 */ jal 0xf19574c +/* f196670: 0fc655d3 */ jal func0f194694 /* f196674: 02802025 */ move $a0,$s4 /* f196678: 10400002 */ beqz $v0,.PF0f196684 /* f19667c: ae420010 */ sw $v0,0x10($s2) @@ -6325,19 +6325,19 @@ glabel var7f1b8fc8 /* f1966a8: 000a50c0 */ sll $t2,$t2,0x3 /* f1966ac: 014b6821 */ addu $t5,$t2,$t3 /* f1966b0: 8db00004 */ lw $s0,0x4($t5) -/* f1966b4: 0fc0e706 */ jal 0xf039c18 +/* f1966b4: 0fc0e706 */ jal chrIsDead /* f1966b8: 02002025 */ move $a0,$s0 /* f1966bc: 14400232 */ bnez $v0,.PF0f196f88 /* f1966c0: 02802025 */ move $a0,$s4 -/* f1966c4: 0fc64e81 */ jal 0xf193a04 +/* f1966c4: 0fc64e81 */ jal func0f19294c /* f1966c8: 02002825 */ move $a1,$s0 /* f1966cc: 1440022e */ bnez $v0,.PF0f196f88 /* f1966d0: 02802025 */ move $a0,$s4 -/* f1966d4: 0fc64f9c */ jal 0xf193e70 +/* f1966d4: 0fc64f9c */ jal func0f192dc0 /* f1966d8: 02002825 */ move $a1,$s0 /* f1966dc: 1040022a */ beqz $v0,.PF0f196f88 /* f1966e0: 02002025 */ move $a0,$s0 -/* f1966e4: 0fc63831 */ jal 0xf18e0c4 +/* f1966e4: 0fc63831 */ jal mpPlayerGetIndex /* f1966e8: 2415002f */ li $s5,0x2f /* f1966ec: a6420008 */ sh $v0,0x8($s2) /* f1966f0: 10000225 */ b .PF0f196f88 @@ -6353,7 +6353,7 @@ glabel var7f1b8fc8 /* f196714: 000e70c0 */ sll $t6,$t6,0x3 /* f196718: 01cfc021 */ addu $t8,$t6,$t7 /* f19671c: 24150032 */ li $s5,0x32 -/* f196720: 0fc63831 */ jal 0xf18e0c4 +/* f196720: 0fc63831 */ jal mpPlayerGetIndex /* f196724: 8f040004 */ lw $a0,0x4($t8) /* f196728: 10000217 */ b .PF0f196f88 /* f19672c: a642000a */ sh $v0,0xa($s2) @@ -6368,7 +6368,7 @@ glabel var7f1b8fc8 /* f19674c: 000948c0 */ sll $t1,$t1,0x3 /* f196750: 012a5821 */ addu $t3,$t1,$t2 /* f196754: 24150032 */ li $s5,0x32 -/* f196758: 0fc63831 */ jal 0xf18e0c4 +/* f196758: 0fc63831 */ jal mpPlayerGetIndex /* f19675c: 8d640004 */ lw $a0,0x4($t3) /* f196760: 10000209 */ b .PF0f196f88 /* f196764: a642000a */ sh $v0,0xa($s2) @@ -6398,7 +6398,7 @@ glabel var7f1b8fc8 /* f1967b8: 000c7840 */ sll $t7,$t4,0x1 /* f1967bc: 05e0007f */ bltz $t7,.PF0f1969bc /* f1967c0: 00000000 */ nop -/* f1967c4: 0fc63e8e */ jal 0xf18fa38 +/* f1967c4: 0fc63e8e */ jal radarGetTeamIndex /* f1967c8: 92840125 */ lbu $a0,0x125($s4) /* f1967cc: 3c07800b */ lui $a3,0x800b /* f1967d0: 00003025 */ move $a2,$zero @@ -6451,7 +6451,7 @@ glabel var7f1b8fc8 /* f196874: 00000000 */ nop /* f196878: 18c00050 */ blez $a2,.PF0f1969bc /* f19687c: 00000000 */ nop -/* f196880: 0c004ad4 */ jal 0x12b50 +/* f196880: 0c004ad4 */ jal random /* f196884: afa60294 */ sw $a2,0x294($sp) /* f196888: 8fa60294 */ lw $a2,0x294($sp) /* f19688c: 0046001b */ divu $zero,$v0,$a2 @@ -6482,7 +6482,7 @@ glabel var7f1b8fc8 /* f1968e0: afa60294 */ sw $a2,0x294($sp) /* f1968e4: afa30288 */ sw $v1,0x288($sp) /* f1968e8: 02802025 */ move $a0,$s4 -/* f1968ec: 0fc125bb */ jal 0xf0496ec +/* f1968ec: 0fc125bb */ jal chrGetSquaredDistanceToCoord /* f1968f0: 24a50008 */ addiu $a1,$a1,0x8 /* f1968f4: 3c017f1c */ lui $at,0x7f1c /* f1968f8: c424a5b4 */ lwc1 $f4,-0x5a4c($at) @@ -6528,17 +6528,17 @@ glabel var7f1b8fc8 /* f196980: 10000181 */ b .PF0f196f88 /* f196984: ae420010 */ sw $v0,0x10($s2) .PF0f196988: -/* f196988: 0fc65163 */ jal 0xf19458c +/* f196988: 0fc65163 */ jal mpIsChrFollowedByChr /* f19698c: 8c450004 */ lw $a1,0x4($v0) /* f196990: 1040000a */ beqz $v0,.PF0f1969bc /* f196994: 00000000 */ nop -/* f196998: 0c004ad4 */ jal 0x12b50 +/* f196998: 0c004ad4 */ jal random /* f19699c: 24150032 */ li $s5,0x32 /* f1969a0: 304e0003 */ andi $t6,$v0,0x3 /* f1969a4: 2dcf0001 */ sltiu $t7,$t6,0x1 /* f1969a8: ae4f01e0 */ sw $t7,0x1e0($s2) /* f1969ac: 8e780000 */ lw $t8,0x0($s3) -/* f1969b0: 0fc63831 */ jal 0xf18e0c4 +/* f1969b0: 0fc63831 */ jal mpPlayerGetIndex /* f1969b4: 8f040004 */ lw $a0,0x4($t8) /* f1969b8: a642000a */ sh $v0,0xa($s2) .PF0f1969bc: @@ -6552,7 +6552,7 @@ glabel var7f1b8fc8 /* f1969d4: 24010005 */ li $at,0x5 /* f1969d8: 1721016b */ bne $t9,$at,.PF0f196f88 /* f1969dc: 00000000 */ nop -/* f1969e0: 0fc63e8e */ jal 0xf18fa38 +/* f1969e0: 0fc63e8e */ jal radarGetTeamIndex /* f1969e4: 92840125 */ lbu $a0,0x125($s4) /* f1969e8: 00024880 */ sll $t1,$v0,0x2 /* f1969ec: 3c03800b */ lui $v1,0x800b @@ -6571,33 +6571,33 @@ glabel var7f1b8fc8 /* f196a1c: 920b0125 */ lbu $t3,0x125($s0) /* f196a20: 154b000e */ bne $t2,$t3,.PF0f196a5c /* f196a24: 00000000 */ nop -/* f196a28: 0fc65163 */ jal 0xf19458c +/* f196a28: 0fc65163 */ jal mpIsChrFollowedByChr /* f196a2c: 02002825 */ move $a1,$s0 /* f196a30: 10400155 */ beqz $v0,.PF0f196f88 /* f196a34: 00000000 */ nop -/* f196a38: 0c004ad4 */ jal 0x12b50 +/* f196a38: 0c004ad4 */ jal random /* f196a3c: 24150032 */ li $s5,0x32 /* f196a40: 304d0003 */ andi $t5,$v0,0x3 /* f196a44: 2dac0001 */ sltiu $t4,$t5,0x1 /* f196a48: ae4c01e0 */ sw $t4,0x1e0($s2) -/* f196a4c: 0fc63831 */ jal 0xf18e0c4 +/* f196a4c: 0fc63831 */ jal mpPlayerGetIndex /* f196a50: 02002025 */ move $a0,$s0 /* f196a54: 1000014c */ b .PF0f196f88 /* f196a58: a642000a */ sh $v0,0xa($s2) .PF0f196a5c: -/* f196a5c: 0fc0e706 */ jal 0xf039c18 +/* f196a5c: 0fc0e706 */ jal chrIsDead /* f196a60: 02002025 */ move $a0,$s0 /* f196a64: 14400148 */ bnez $v0,.PF0f196f88 /* f196a68: 02802025 */ move $a0,$s4 -/* f196a6c: 0fc64e81 */ jal 0xf193a04 +/* f196a6c: 0fc64e81 */ jal func0f19294c /* f196a70: 02002825 */ move $a1,$s0 /* f196a74: 14400144 */ bnez $v0,.PF0f196f88 /* f196a78: 02802025 */ move $a0,$s4 -/* f196a7c: 0fc64f9c */ jal 0xf193e70 +/* f196a7c: 0fc64f9c */ jal func0f192dc0 /* f196a80: 02002825 */ move $a1,$s0 /* f196a84: 10400140 */ beqz $v0,.PF0f196f88 /* f196a88: 02002025 */ move $a0,$s0 -/* f196a8c: 0fc63831 */ jal 0xf18e0c4 +/* f196a8c: 0fc63831 */ jal mpPlayerGetIndex /* f196a90: 2415002f */ li $s5,0x2f /* f196a94: a6420008 */ sh $v0,0x8($s2) /* f196a98: 1000013b */ b .PF0f196f88 @@ -6611,7 +6611,7 @@ glabel var7f1b8fc8 /* f196ab4: 264500f8 */ addiu $a1,$s2,0xf8 /* f196ab8: e64600f0 */ swc1 $f6,0xf0($s2) /* f196abc: c46a0010 */ lwc1 $f10,0x10($v1) -/* f196ac0: 0fc1968d */ jal 0xf065a34 +/* f196ac0: 0fc1968d */ jal roomsCopy /* f196ac4: e64a00f4 */ swc1 $f10,0xf4($s2) /* f196ac8: 924e004c */ lbu $t6,0x4c($s2) /* f196acc: 31cfff7f */ andi $t7,$t6,0xff7f @@ -6637,16 +6637,16 @@ glabel var7f1b8fc8 /* f196b18: 8e4d0128 */ lw $t5,0x128($s2) /* f196b1c: 11a00010 */ beqz $t5,.PF0f196b60 /* f196b20: 00000000 */ nop -/* f196b24: 0fc0a26a */ jal 0xf0289a8 +/* f196b24: 0fc0a26a */ jal chrGetTargetProp /* f196b28: 02802025 */ move $a0,$s4 /* f196b2c: 02802025 */ move $a0,$s4 -/* f196b30: 0fc64f9c */ jal 0xf193e70 +/* f196b30: 0fc64f9c */ jal func0f192dc0 /* f196b34: 8c450004 */ lw $a1,0x4($v0) /* f196b38: 10400009 */ beqz $v0,.PF0f196b60 /* f196b3c: 02802025 */ move $a0,$s4 -/* f196b40: 0fc0a26a */ jal 0xf0289a8 +/* f196b40: 0fc0a26a */ jal chrGetTargetProp /* f196b44: 2415002f */ li $s5,0x2f -/* f196b48: 0fc63831 */ jal 0xf18e0c4 +/* f196b48: 0fc63831 */ jal mpPlayerGetIndex /* f196b4c: 8c440004 */ lw $a0,0x4($v0) /* f196b50: 240c00fa */ li $t4,0xfa /* f196b54: a6420008 */ sh $v0,0x8($s2) @@ -6659,7 +6659,7 @@ glabel var7f1b8fc8 /* f196b6c: 8484c6be */ lh $a0,-0x3942($a0) /* f196b70: 27a5026c */ addiu $a1,$sp,0x26c /* f196b74: 27a60268 */ addiu $a2,$sp,0x268 -/* f196b78: 0fc66f1c */ jal 0xf19bc70 +/* f196b78: 0fc66f1c */ jal func0f19ab70 /* f196b7c: 27a70264 */ addiu $a3,$sp,0x264 /* f196b80: 10400101 */ beqz $v0,.PF0f196f88 /* f196b84: c7b2026c */ lwc1 $f18,0x26c($sp) @@ -6671,7 +6671,7 @@ glabel var7f1b8fc8 /* f196b9c: c7a80274 */ lwc1 $f8,0x274($sp) /* f196ba0: 2484c6be */ addiu $a0,$a0,-14658 /* f196ba4: 264500f8 */ addiu $a1,$s2,0xf8 -/* f196ba8: 0fc1968d */ jal 0xf065a34 +/* f196ba8: 0fc1968d */ jal roomsCopy /* f196bac: e64800f4 */ swc1 $f8,0xf4($s2) /* f196bb0: 8e8f001c */ lw $t7,0x1c($s4) /* f196bb4: 3c19800b */ lui $t9,0x800b @@ -6706,7 +6706,7 @@ glabel var7f1b8fc8 /* f196c24: afad0010 */ sw $t5,0x10($sp) /* f196c28: 8484c6be */ lh $a0,-0x3942($a0) /* f196c2c: 27a60250 */ addiu $a2,$sp,0x250 -/* f196c30: 0fc66f1c */ jal 0xf19bc70 +/* f196c30: 0fc66f1c */ jal func0f19ab70 /* f196c34: 27a7024c */ addiu $a3,$sp,0x24c /* f196c38: 104000d3 */ beqz $v0,.PF0f196f88 /* f196c3c: c7a60254 */ lwc1 $f6,0x254($sp) @@ -6718,7 +6718,7 @@ glabel var7f1b8fc8 /* f196c54: c7b2025c */ lwc1 $f18,0x25c($sp) /* f196c58: 2484c6be */ addiu $a0,$a0,-14658 /* f196c5c: 264500f8 */ addiu $a1,$s2,0xf8 -/* f196c60: 0fc1968d */ jal 0xf065a34 +/* f196c60: 0fc1968d */ jal roomsCopy /* f196c64: e65200f4 */ swc1 $f18,0xf4($s2) /* f196c68: 8e8e001c */ lw $t6,0x1c($s4) /* f196c6c: 3c0f800b */ lui $t7,0x800b @@ -6774,29 +6774,29 @@ glabel var7f1b8fc8 /* f196d2c: 02002825 */ move $a1,$s0 /* f196d30: 15cc000e */ bne $t6,$t4,.PF0f196d6c /* f196d34: 00000000 */ nop -/* f196d38: 0fc65163 */ jal 0xf19458c +/* f196d38: 0fc65163 */ jal mpIsChrFollowedByChr /* f196d3c: 02802025 */ move $a0,$s4 /* f196d40: 10400091 */ beqz $v0,.PF0f196f88 /* f196d44: 00000000 */ nop -/* f196d48: 0c004ad4 */ jal 0x12b50 +/* f196d48: 0c004ad4 */ jal random /* f196d4c: 24150032 */ li $s5,0x32 /* f196d50: 304f0003 */ andi $t7,$v0,0x3 /* f196d54: 2df80001 */ sltiu $t8,$t7,0x1 /* f196d58: ae5801e0 */ sw $t8,0x1e0($s2) -/* f196d5c: 0fc63831 */ jal 0xf18e0c4 +/* f196d5c: 0fc63831 */ jal mpPlayerGetIndex /* f196d60: 02002025 */ move $a0,$s0 /* f196d64: 10000088 */ b .PF0f196f88 /* f196d68: a642000a */ sh $v0,0xa($s2) .PF0f196d6c: -/* f196d6c: 0fc64e81 */ jal 0xf193a04 +/* f196d6c: 0fc64e81 */ jal func0f19294c /* f196d70: 02002825 */ move $a1,$s0 /* f196d74: 14400084 */ bnez $v0,.PF0f196f88 /* f196d78: 02802025 */ move $a0,$s4 -/* f196d7c: 0fc64f9c */ jal 0xf193e70 +/* f196d7c: 0fc64f9c */ jal func0f192dc0 /* f196d80: 02002825 */ move $a1,$s0 /* f196d84: 10400080 */ beqz $v0,.PF0f196f88 /* f196d88: 02002025 */ move $a0,$s0 -/* f196d8c: 0fc63831 */ jal 0xf18e0c4 +/* f196d8c: 0fc63831 */ jal mpPlayerGetIndex /* f196d90: 2415002f */ li $s5,0x2f /* f196d94: a6420008 */ sh $v0,0x8($s2) /* f196d98: 1000007b */ b .PF0f196f88 @@ -6838,29 +6838,29 @@ glabel var7f1b8fc8 /* f196e1c: 02002825 */ move $a1,$s0 /* f196e20: 156e000e */ bne $t3,$t6,.PF0f196e5c /* f196e24: 00000000 */ nop -/* f196e28: 0fc65163 */ jal 0xf19458c +/* f196e28: 0fc65163 */ jal mpIsChrFollowedByChr /* f196e2c: 02802025 */ move $a0,$s4 /* f196e30: 10400055 */ beqz $v0,.PF0f196f88 /* f196e34: 00000000 */ nop -/* f196e38: 0c004ad4 */ jal 0x12b50 +/* f196e38: 0c004ad4 */ jal random /* f196e3c: 24150032 */ li $s5,0x32 /* f196e40: 304c0003 */ andi $t4,$v0,0x3 /* f196e44: 2d8f0001 */ sltiu $t7,$t4,0x1 /* f196e48: ae4f01e0 */ sw $t7,0x1e0($s2) -/* f196e4c: 0fc63831 */ jal 0xf18e0c4 +/* f196e4c: 0fc63831 */ jal mpPlayerGetIndex /* f196e50: 02002025 */ move $a0,$s0 /* f196e54: 1000004c */ b .PF0f196f88 /* f196e58: a642000a */ sh $v0,0xa($s2) .PF0f196e5c: -/* f196e5c: 0fc64e81 */ jal 0xf193a04 +/* f196e5c: 0fc64e81 */ jal func0f19294c /* f196e60: 02002825 */ move $a1,$s0 /* f196e64: 14400048 */ bnez $v0,.PF0f196f88 /* f196e68: 02802025 */ move $a0,$s4 -/* f196e6c: 0fc64f9c */ jal 0xf193e70 +/* f196e6c: 0fc64f9c */ jal func0f192dc0 /* f196e70: 02002825 */ move $a1,$s0 /* f196e74: 10400044 */ beqz $v0,.PF0f196f88 /* f196e78: 02002025 */ move $a0,$s0 -/* f196e7c: 0fc63831 */ jal 0xf18e0c4 +/* f196e7c: 0fc63831 */ jal mpPlayerGetIndex /* f196e80: 2415002f */ li $s5,0x2f /* f196e84: a6420008 */ sh $v0,0x8($s2) /* f196e88: 1000003f */ b .PF0f196f88 @@ -6904,29 +6904,29 @@ glabel var7f1b8fc8 /* f196f18: 02002825 */ move $a1,$s0 /* f196f1c: 15f8000e */ bne $t7,$t8,.PF0f196f58 /* f196f20: 00000000 */ nop -/* f196f24: 0fc65163 */ jal 0xf19458c +/* f196f24: 0fc65163 */ jal mpIsChrFollowedByChr /* f196f28: 02802025 */ move $a0,$s4 /* f196f2c: 10400016 */ beqz $v0,.PF0f196f88 /* f196f30: 00000000 */ nop -/* f196f34: 0c004ad4 */ jal 0x12b50 +/* f196f34: 0c004ad4 */ jal random /* f196f38: 24150032 */ li $s5,0x32 /* f196f3c: 30590003 */ andi $t9,$v0,0x3 /* f196f40: 2f290001 */ sltiu $t1,$t9,0x1 /* f196f44: ae4901e0 */ sw $t1,0x1e0($s2) -/* f196f48: 0fc63831 */ jal 0xf18e0c4 +/* f196f48: 0fc63831 */ jal mpPlayerGetIndex /* f196f4c: 02002025 */ move $a0,$s0 /* f196f50: 1000000d */ b .PF0f196f88 /* f196f54: a642000a */ sh $v0,0xa($s2) .PF0f196f58: -/* f196f58: 0fc64e81 */ jal 0xf193a04 +/* f196f58: 0fc64e81 */ jal func0f19294c /* f196f5c: 02002825 */ move $a1,$s0 /* f196f60: 14400009 */ bnez $v0,.PF0f196f88 /* f196f64: 02802025 */ move $a0,$s4 -/* f196f68: 0fc64f9c */ jal 0xf193e70 +/* f196f68: 0fc64f9c */ jal func0f192dc0 /* f196f6c: 02002825 */ move $a1,$s0 /* f196f70: 10400005 */ beqz $v0,.PF0f196f88 /* f196f74: 02002025 */ move $a0,$s0 -/* f196f78: 0fc63831 */ jal 0xf18e0c4 +/* f196f78: 0fc63831 */ jal mpPlayerGetIndex /* f196f7c: 2415002f */ li $s5,0x2f /* f196f80: a6420008 */ sh $v0,0x8($s2) /* f196f84: ae5e01d8 */ sw $s8,0x1d8($s2) @@ -6941,7 +6941,7 @@ glabel var7f1b8fc8 /* f196fa4: 000a6fc2 */ srl $t5,$t2,0x1f /* f196fa8: 11a00070 */ beqz $t5,.PF0f19716c /* f196fac: 00000000 */ nop -/* f196fb0: 0c004ad4 */ jal 0x12b50 +/* f196fb0: 0c004ad4 */ jal random /* f196fb4: 03c08025 */ move $s0,$s8 /* f196fb8: 24010064 */ li $at,0x64 /* f196fbc: 0041001b */ divu $zero,$v0,$at @@ -6950,13 +6950,13 @@ glabel var7f1b8fc8 /* f196fc8: 10200005 */ beqz $at,.PF0f196fe0 /* f196fcc: 02802025 */ move $a0,$s4 /* f196fd0: 3c0547c3 */ lui $a1,0x47c3 -/* f196fd4: 0fc65178 */ jal 0xf1945e0 +/* f196fd4: 0fc65178 */ jal func0f193530 /* f196fd8: 34a55000 */ ori $a1,$a1,0x5000 /* f196fdc: 00408025 */ move $s0,$v0 .PF0f196fe0: /* f196fe0: 06000062 */ bltz $s0,.PF0f19716c /* f196fe4: 00000000 */ nop -/* f196fe8: 0c004ad4 */ jal 0x12b50 +/* f196fe8: 0c004ad4 */ jal random /* f196fec: 24150032 */ li $s5,0x32 /* f196ff0: 304e0003 */ andi $t6,$v0,0x3 /* f196ff4: 2dcc0001 */ sltiu $t4,$t6,0x1 @@ -6980,7 +6980,7 @@ glabel var7f1b8fc8 /* f197038: 8d23001c */ lw $v1,0x1c($t1) /* f19703c: 146a004b */ bne $v1,$t2,.PF0f19716c /* f197040: 00000000 */ nop -/* f197044: 0c004ad4 */ jal 0x12b50 +/* f197044: 0c004ad4 */ jal random /* f197048: 03c08025 */ move $s0,$s8 /* f19704c: 24010064 */ li $at,0x64 /* f197050: 0041001b */ divu $zero,$v0,$at @@ -6989,13 +6989,13 @@ glabel var7f1b8fc8 /* f19705c: 10200005 */ beqz $at,.PF0f197074 /* f197060: 02802025 */ move $a0,$s4 /* f197064: 3c0547c3 */ lui $a1,0x47c3 -/* f197068: 0fc65178 */ jal 0xf1945e0 +/* f197068: 0fc65178 */ jal func0f193530 /* f19706c: 34a55000 */ ori $a1,$a1,0x5000 /* f197070: 00408025 */ move $s0,$v0 .PF0f197074: /* f197074: 0600003d */ bltz $s0,.PF0f19716c /* f197078: 00000000 */ nop -/* f19707c: 0c004ad4 */ jal 0x12b50 +/* f19707c: 0c004ad4 */ jal random /* f197080: 24150032 */ li $s5,0x32 /* f197084: 304b0003 */ andi $t3,$v0,0x3 /* f197088: 2d6e0001 */ sltiu $t6,$t3,0x1 @@ -7006,12 +7006,12 @@ glabel var7f1b8fc8 /* f197098: 24010005 */ li $at,0x5 /* f19709c: 54610021 */ bnel $v1,$at,.PF0f197124 /* f1970a0: 24010002 */ li $at,0x2 -/* f1970a4: 0fc65655 */ jal 0xf195954 +/* f1970a4: 0fc65655 */ jal func0f19489c /* f1970a8: 02802025 */ move $a0,$s4 /* f1970ac: 1040002f */ beqz $v0,.PF0f19716c /* f1970b0: 00000000 */ nop /* f1970b4: 92840125 */ lbu $a0,0x125($s4) -/* f1970b8: 0fc63e8e */ jal 0xf18fa38 +/* f1970b8: 0fc63e8e */ jal radarGetTeamIndex /* f1970bc: 2415002b */ li $s5,0x2b /* f1970c0: 3c07800b */ lui $a3,0x800b /* f1970c4: 24e7c6b0 */ addiu $a3,$a3,-14672 @@ -7022,7 +7022,7 @@ glabel var7f1b8fc8 /* f1970d8: 27a601d8 */ addiu $a2,$sp,0x1d8 /* f1970dc: 0003c100 */ sll $t8,$v1,0x4 /* f1970e0: 00f8c821 */ addu $t9,$a3,$t8 -/* f1970e4: 0fc45964 */ jal 0xf116590 +/* f1970e4: 0fc45964 */ jal padUnpack /* f1970e8: 87240018 */ lh $a0,0x18($t9) /* f1970ec: c7a401d8 */ lwc1 $f4,0x1d8($sp) /* f1970f0: 924a004c */ lbu $t2,0x4c($s2) @@ -7045,7 +7045,7 @@ glabel var7f1b8fc8 /* f197130: 8e8e001c */ lw $t6,0x1c($s4) /* f197134: 156e000d */ bne $t3,$t6,.PF0f19716c /* f197138: 00000000 */ nop -/* f19713c: 0fc63831 */ jal 0xf18e0c4 +/* f19713c: 0fc63831 */ jal mpPlayerGetIndex /* f197140: 02802025 */ move $a0,$s4 /* f197144: 3c03800b */ lui $v1,0x800b /* f197148: 2463c6b0 */ addiu $v1,$v1,-14672 @@ -7071,7 +7071,7 @@ glabel var7f1b8fc8 /* f197194: 04400098 */ bltz $v0,.PF0f1973f8 /* f197198: 0002c880 */ sll $t9,$v0,0x2 /* f19719c: 00b92821 */ addu $a1,$a1,$t9 -/* f1971a0: 0fc64e81 */ jal 0xf193a04 +/* f1971a0: 0fc64e81 */ jal func0f19294c /* f1971a4: 8ca5ca70 */ lw $a1,-0x3590($a1) /* f1971a8: 14400093 */ bnez $v0,.PF0f1973f8 /* f1971ac: 00000000 */ nop @@ -7094,7 +7094,7 @@ glabel var7f1b8fc8 /* f1971ec: 00026880 */ sll $t5,$v0,0x2 /* f1971f0: 00ad2821 */ addu $a1,$a1,$t5 /* f1971f4: 8ca5ca70 */ lw $a1,-0x3590($a1) -/* f1971f8: 0fc12b09 */ jal 0xf04ac24 +/* f1971f8: 0fc12b09 */ jal chrCompareTeams /* f1971fc: 24060001 */ li $a2,0x1 /* f197200: 54400004 */ bnezl $v0,.PF0f197214 /* f197204: 8e420114 */ lw $v0,0x114($s2) @@ -7108,7 +7108,7 @@ glabel var7f1b8fc8 /* f19721c: 04400076 */ bltz $v0,.PF0f1973f8 /* f197220: 00027080 */ sll $t6,$v0,0x2 /* f197224: 00ae2821 */ addu $a1,$a1,$t6 -/* f197228: 0fc64e81 */ jal 0xf193a04 +/* f197228: 0fc64e81 */ jal func0f19294c /* f19722c: 8ca5ca70 */ lw $a1,-0x3590($a1) /* f197230: 14400071 */ bnez $v0,.PF0f1973f8 /* f197234: 00000000 */ nop @@ -7121,7 +7121,7 @@ glabel var7f1b8fc8 .PF0f197250: /* f197250: 5441002a */ bnel $v0,$at,.PF0f1972fc /* f197254: 24010006 */ li $at,0x6 -/* f197258: 0fc625a2 */ jal 0xf189688 +/* f197258: 0fc625a2 */ jal mpGetPlayerRankings /* f19725c: 27a400e4 */ addiu $a0,$sp,0xe4 /* f197260: 18400065 */ blez $v0,.PF0f1973f8 /* f197264: 0002c080 */ sll $t8,$v0,0x2 @@ -7131,24 +7131,24 @@ glabel var7f1b8fc8 /* f197274: 0310c821 */ addu $t9,$t8,$s0 /* f197278: afb90050 */ sw $t9,0x50($sp) .PF0f19727c: -/* f19727c: 0fc6386d */ jal 0xf18e1b4 +/* f19727c: 0fc6386d */ jal func0f18d0e8 /* f197280: 8e040004 */ lw $a0,0x4($s0) /* f197284: afa200d8 */ sw $v0,0xd8($sp) -/* f197288: 0fc63843 */ jal 0xf18e10c +/* f197288: 0fc63843 */ jal mpGetChrFromPlayerIndex /* f19728c: 00402025 */ move $a0,$v0 /* f197290: 10540012 */ beq $v0,$s4,.PF0f1972dc /* f197294: 00402025 */ move $a0,$v0 -/* f197298: 0fc0e706 */ jal 0xf039c18 +/* f197298: 0fc0e706 */ jal chrIsDead /* f19729c: afa200d4 */ sw $v0,0xd4($sp) /* f1972a0: 1440000e */ bnez $v0,.PF0f1972dc /* f1972a4: 8fb100d4 */ lw $s1,0xd4($sp) /* f1972a8: 02802025 */ move $a0,$s4 /* f1972ac: 02202825 */ move $a1,$s1 -/* f1972b0: 0fc12b09 */ jal 0xf04ac24 +/* f1972b0: 0fc12b09 */ jal chrCompareTeams /* f1972b4: 24060002 */ li $a2,0x2 /* f1972b8: 10400008 */ beqz $v0,.PF0f1972dc /* f1972bc: 02802025 */ move $a0,$s4 -/* f1972c0: 0fc64e81 */ jal 0xf193a04 +/* f1972c0: 0fc64e81 */ jal func0f19294c /* f1972c4: 02202825 */ move $a1,$s1 /* f1972c8: 14400004 */ bnez $v0,.PF0f1972dc /* f1972cc: 8fa900d8 */ lw $t1,0xd8($sp) @@ -7175,22 +7175,22 @@ glabel var7f1b8fc8 /* f197318: 19a00032 */ blez $t5,.PF0f1973e4 /* f19731c: e7aa00d0 */ swc1 $f10,0xd0($sp) .PF0f197320: -/* f197320: 0fc63843 */ jal 0xf18e10c +/* f197320: 0fc63843 */ jal mpGetChrFromPlayerIndex /* f197324: 02002025 */ move $a0,$s0 /* f197328: 10540029 */ beq $v0,$s4,.PF0f1973d0 /* f19732c: 00402025 */ move $a0,$v0 -/* f197330: 0fc0e706 */ jal 0xf039c18 +/* f197330: 0fc0e706 */ jal chrIsDead /* f197334: afa200c0 */ sw $v0,0xc0($sp) /* f197338: 14400025 */ bnez $v0,.PF0f1973d0 /* f19733c: 8fa500c0 */ lw $a1,0xc0($sp) /* f197340: 02802025 */ move $a0,$s4 /* f197344: 24060002 */ li $a2,0x2 -/* f197348: 0fc12b09 */ jal 0xf04ac24 +/* f197348: 0fc12b09 */ jal chrCompareTeams /* f19734c: afa500c0 */ sw $a1,0xc0($sp) /* f197350: 1040001f */ beqz $v0,.PF0f1973d0 /* f197354: 8fa500c0 */ lw $a1,0xc0($sp) /* f197358: 02802025 */ move $a0,$s4 -/* f19735c: 0fc64e81 */ jal 0xf193a04 +/* f19735c: 0fc64e81 */ jal func0f19294c /* f197360: afa500c0 */ sw $a1,0xc0($sp) /* f197364: 1440001a */ bnez $v0,.PF0f1973d0 /* f197368: 8fa500c0 */ lw $a1,0xc0($sp) @@ -7202,7 +7202,7 @@ glabel var7f1b8fc8 /* f197380: 1000000b */ b .PF0f1973b0 /* f197384: 46049001 */ sub.s $f0,$f18,$f4 .PF0f197388: -/* f197388: 0fc4a513 */ jal 0xf12944c +/* f197388: 0fc4a513 */ jal propGetPlayerNum /* f19738c: 8ca4001c */ lw $a0,0x1c($a1) /* f197390: 00027080 */ sll $t6,$v0,0x2 /* f197394: 02ce6021 */ addu $t4,$s6,$t6 @@ -7241,10 +7241,10 @@ glabel var7f1b8fc8 /* f197400: 8699017e */ lh $t9,0x17e($s4) /* f197404: 13d9000a */ beq $s8,$t9,.PF0f197430 /* f197408: 00000000 */ nop -/* f19740c: 0fc0a26a */ jal 0xf0289a8 +/* f19740c: 0fc0a26a */ jal chrGetTargetProp /* f197410: 02802025 */ move $a0,$s4 /* f197414: 02802025 */ move $a0,$s4 -/* f197418: 0fc64f9c */ jal 0xf193e70 +/* f197418: 0fc64f9c */ jal func0f192dc0 /* f19741c: 8c450004 */ lw $a1,0x4($v0) /* f197420: 10400003 */ beqz $v0,.PF0f197430 /* f197424: 00000000 */ nop @@ -7253,11 +7253,11 @@ glabel var7f1b8fc8 .PF0f197430: /* f197430: 06a1000b */ bgez $s5,.PF0f197460 /* f197434: 02802025 */ move $a0,$s4 -/* f197438: 0fc65178 */ jal 0xf1945e0 +/* f197438: 0fc65178 */ jal func0f193530 /* f19743c: 3c054396 */ lui $a1,0x4396 /* f197440: 04400007 */ bltz $v0,.PF0f197460 /* f197444: 00408025 */ move $s0,$v0 -/* f197448: 0c004ad4 */ jal 0x12b50 +/* f197448: 0c004ad4 */ jal random /* f19744c: 24150032 */ li $s5,0x32 /* f197450: 30490003 */ andi $t1,$v0,0x3 /* f197454: 2d2a0001 */ sltiu $t2,$t1,0x1 @@ -7266,7 +7266,7 @@ glabel var7f1b8fc8 .PF0f197460: /* f197460: 06a10006 */ bgez $s5,.PF0f19747c /* f197464: 00000000 */ nop -/* f197468: 0fc655db */ jal 0xf19576c +/* f197468: 0fc655db */ jal func0f1946b4 /* f19746c: 02802025 */ move $a0,$s4 /* f197470: 10400002 */ beqz $v0,.PF0f19747c /* f197474: ae420010 */ sw $v0,0x10($s2) @@ -7282,7 +7282,7 @@ glabel var7f1b8fc8 /* f197498: 02802025 */ move $a0,$s4 /* f19749c: 50a0007c */ beqzl $a1,.PF0f197690 /* f1974a0: 928202a0 */ lbu $v0,0x2a0($s4) -/* f1974a4: 0fc0eb3e */ jal 0xf03acf8 +/* f1974a4: 0fc0eb3e */ jal chrGoToProp /* f1974a8: 24060002 */ li $a2,0x2 /* f1974ac: 10000077 */ b .PF0f19768c /* f1974b0: a29502a0 */ sb $s5,0x2a0($s4) @@ -7311,7 +7311,7 @@ glabel var7f1b8fc8 /* f197504: 02802025 */ move $a0,$s4 /* f197508: 51c00061 */ beqzl $t6,.PF0f197690 /* f19750c: 928202a0 */ lbu $v0,0x2a0($s4) -/* f197510: 0fc64e0d */ jal 0xf193834 +/* f197510: 0fc64e0d */ jal func0f19277c /* f197514: 03c02825 */ move $a1,$s8 /* f197518: 1000005d */ b .PF0f197690 /* f19751c: 928202a0 */ lbu $v0,0x2a0($s4) @@ -7324,13 +7324,13 @@ glabel var7f1b8fc8 /* f197534: 02802025 */ move $a0,$s4 /* f197538: 51800004 */ beqzl $t4,.PF0f19754c /* f19753c: 02802025 */ move $a0,$s4 -/* f197540: 0fc64e0d */ jal 0xf193834 +/* f197540: 0fc64e0d */ jal func0f19277c /* f197544: 03c02825 */ move $a1,$s8 /* f197548: 02802025 */ move $a0,$s4 .PF0f19754c: /* f19754c: 2645008c */ addiu $a1,$s2,0x8c /* f197550: 2646007a */ addiu $a2,$s2,0x7a -/* f197554: 0fc0e170 */ jal 0xf0385c0 +/* f197554: 0fc0e170 */ jal chrGoToPos /* f197558: 24070002 */ li $a3,0x2 /* f19755c: 1000004c */ b .PF0f197690 /* f197560: 928202a0 */ lbu $v0,0x2a0($s4) @@ -7387,12 +7387,12 @@ glabel var7f1b8fc8 /* f19761c: 05e00005 */ bltz $t7,.PF0f197634 /* f197620: 00000000 */ nop .PF0f197624: -/* f197624: 0fc0e170 */ jal 0xf0385c0 +/* f197624: 0fc0e170 */ jal chrGoToPos /* f197628: a29502a0 */ sb $s5,0x2a0($s4) /* f19762c: 10000018 */ b .PF0f197690 /* f197630: 928202a0 */ lbu $v0,0x2a0($s4) .PF0f197634: -/* f197634: 0fc0baf7 */ jal 0xf02ebdc +/* f197634: 0fc0baf7 */ jal chrStand /* f197638: 02802025 */ move $a0,$s4 /* f19763c: 10000014 */ b .PF0f197690 /* f197640: 928202a0 */ lbu $v0,0x2a0($s4) @@ -7406,7 +7406,7 @@ glabel var7f1b8fc8 /* f19765c: 5320000c */ beqzl $t9,.PF0f197690 /* f197660: 928202a0 */ lbu $v0,0x2a0($s4) /* f197664: a29502a0 */ sb $s5,0x2a0($s4) -/* f197668: 0fc0eb3e */ jal 0xf03acf8 +/* f197668: 0fc0eb3e */ jal chrGoToProp /* f19766c: 8e450010 */ lw $a1,0x10($s2) /* f197670: 10000007 */ b .PF0f197690 /* f197674: 928202a0 */ lbu $v0,0x2a0($s4) @@ -7414,7 +7414,7 @@ glabel var7f1b8fc8 .PF0f19767c: /* f19767c: 16a10003 */ bne $s5,$at,.PF0f19768c /* f197680: 02802025 */ move $a0,$s4 -/* f197684: 0fc0baf7 */ jal 0xf02ebdc +/* f197684: 0fc0baf7 */ jal chrStand /* f197688: a29502a0 */ sb $s5,0x2a0($s4) .PF0f19768c: /* f19768c: 928202a0 */ lbu $v0,0x2a0($s4) @@ -7448,7 +7448,7 @@ glabel var7f1b8fc8 /* f1976f0: 04400011 */ bltz $v0,.PF0f197738 /* f1976f4: 00027080 */ sll $t6,$v0,0x2 /* f1976f8: 008e2021 */ addu $a0,$a0,$t6 -/* f1976fc: 0fc0e706 */ jal 0xf039c18 +/* f1976fc: 0fc0e706 */ jal chrIsDead /* f197700: 8c84ca70 */ lw $a0,-0x3590($a0) /* f197704: 5440000a */ bnezl $v0,.PF0f197730 /* f197708: 240f0029 */ li $t7,0x29 @@ -7457,7 +7457,7 @@ glabel var7f1b8fc8 /* f197714: 02802025 */ move $a0,$s4 /* f197718: 000cc080 */ sll $t8,$t4,0x2 /* f19771c: 00b82821 */ addu $a1,$a1,$t8 -/* f197720: 0fc64f9c */ jal 0xf193e70 +/* f197720: 0fc64f9c */ jal func0f192dc0 /* f197724: 8ca5ca70 */ lw $a1,-0x3590($a1) /* f197728: 14400003 */ bnez $v0,.PF0f197738 /* f19772c: 240f0029 */ li $t7,0x29 @@ -7471,16 +7471,16 @@ glabel var7f1b8fc8 /* f197744: 8689017e */ lh $t1,0x17e($s4) /* f197748: 53c9000e */ beql $s8,$t1,.PF0f197784 /* f19774c: 240a0029 */ li $t2,0x29 -/* f197750: 0fc0a26a */ jal 0xf0289a8 +/* f197750: 0fc0a26a */ jal chrGetTargetProp /* f197754: 02802025 */ move $a0,$s4 -/* f197758: 0fc0e706 */ jal 0xf039c18 +/* f197758: 0fc0e706 */ jal chrIsDead /* f19775c: 8c440004 */ lw $a0,0x4($v0) /* f197760: 54400008 */ bnezl $v0,.PF0f197784 /* f197764: 240a0029 */ li $t2,0x29 -/* f197768: 0fc0a26a */ jal 0xf0289a8 +/* f197768: 0fc0a26a */ jal chrGetTargetProp /* f19776c: 02802025 */ move $a0,$s4 /* f197770: 02802025 */ move $a0,$s4 -/* f197774: 0fc64f9c */ jal 0xf193e70 +/* f197774: 0fc64f9c */ jal func0f192dc0 /* f197778: 8c450004 */ lw $a1,0x4($v0) /* f19777c: 14400003 */ bnez $v0,.PF0f19778c /* f197780: 240a0029 */ li $t2,0x29 @@ -7488,9 +7488,9 @@ glabel var7f1b8fc8 /* f197784: 10000134 */ b .PF0f197c58 /* f197788: a28a02a0 */ sb $t2,0x2a0($s4) .PF0f19778c: -/* f19778c: 0fc661c0 */ jal 0xf198700 +/* f19778c: 0fc661c0 */ jal func0f197600 /* f197790: 02802025 */ move $a0,$s4 -/* f197794: 0fc655ca */ jal 0xf195728 +/* f197794: 0fc655ca */ jal func0f194670 /* f197798: 02802025 */ move $a0,$s4 /* f19779c: 10400003 */ beqz $v0,.PF0f1977ac /* f1977a0: 240d0029 */ li $t5,0x29 @@ -7518,7 +7518,7 @@ glabel var7f1b8fc8 /* f1977f0: 04400005 */ bltz $v0,.PF0f197808 /* f1977f4: 00027880 */ sll $t7,$v0,0x2 /* f1977f8: 008f2021 */ addu $a0,$a0,$t7 -/* f1977fc: 0fc0e706 */ jal 0xf039c18 +/* f1977fc: 0fc0e706 */ jal chrIsDead /* f197800: 8c84ca70 */ lw $a0,-0x3590($a0) /* f197804: 10400003 */ beqz $v0,.PF0f197814 .PF0f197808: @@ -7526,7 +7526,7 @@ glabel var7f1b8fc8 /* f19780c: 10000112 */ b .PF0f197c58 /* f197810: a29902a0 */ sb $t9,0x2a0($s4) .PF0f197814: -/* f197814: 0fc661c0 */ jal 0xf198700 +/* f197814: 0fc661c0 */ jal func0f197600 /* f197818: 02802025 */ move $a0,$s4 /* f19781c: 8e4901e0 */ lw $t1,0x1e0($s2) /* f197820: 11200037 */ beqz $t1,.PF0f197900 @@ -7537,10 +7537,10 @@ glabel var7f1b8fc8 /* f197834: 8e4d0128 */ lw $t5,0x128($s2) /* f197838: 11a00031 */ beqz $t5,.PF0f197900 /* f19783c: 00000000 */ nop -/* f197840: 0fc0a26a */ jal 0xf0289a8 +/* f197840: 0fc0a26a */ jal chrGetTargetProp /* f197844: 02802025 */ move $a0,$s4 /* f197848: 02802025 */ move $a0,$s4 -/* f19784c: 0fc64f9c */ jal 0xf193e70 +/* f19784c: 0fc64f9c */ jal func0f192dc0 /* f197850: 8c450004 */ lw $a1,0x4($v0) /* f197854: 1040002a */ beqz $v0,.PF0f197900 /* f197858: 3c0143fa */ lui $at,0x43fa @@ -7579,16 +7579,16 @@ glabel var7f1b8fc8 /* f1978d4: 02802025 */ move $a0,$s4 /* f1978d8: 45000009 */ bc1f .PF0f197900 /* f1978dc: 00000000 */ nop -/* f1978e0: 0fc0a26a */ jal 0xf0289a8 +/* f1978e0: 0fc0a26a */ jal chrGetTargetProp /* f1978e4: a29802a0 */ sb $t8,0x2a0($s4) -/* f1978e8: 0fc63831 */ jal 0xf18e0c4 +/* f1978e8: 0fc63831 */ jal mpPlayerGetIndex /* f1978ec: 8c440004 */ lw $a0,0x4($v0) /* f1978f0: 240f00fa */ li $t7,0xfa /* f1978f4: a6420008 */ sh $v0,0x8($s2) /* f1978f8: ae4f01d8 */ sw $t7,0x1d8($s2) /* f1978fc: a25e0074 */ sb $s8,0x74($s2) .PF0f197900: -/* f197900: 0fc655ca */ jal 0xf195728 +/* f197900: 0fc655ca */ jal func0f194670 /* f197904: 02802025 */ move $a0,$s4 /* f197908: 104000d3 */ beqz $v0,.PF0f197c58 /* f19790c: 24190029 */ li $t9,0x29 @@ -7660,7 +7660,7 @@ glabel var7f1b8fc8 /* f1979fc: 2645008c */ addiu $a1,$s2,0x8c /* f197a00: 1d80001e */ bgtz $t4,.PF0f197a7c /* f197a04: 2646007a */ addiu $a2,$s2,0x7a -/* f197a08: 0fc0e170 */ jal 0xf0385c0 +/* f197a08: 0fc0e170 */ jal chrGoToPos /* f197a0c: 24070002 */ li $a3,0x2 /* f197a10: 1000001b */ b .PF0f197a80 /* f197a14: 8e4d00dc */ lw $t5,0xdc($s2) @@ -7674,17 +7674,17 @@ glabel var7f1b8fc8 /* f197a30: 8e590128 */ lw $t9,0x128($s2) /* f197a34: 53200012 */ beqzl $t9,.PF0f197a80 /* f197a38: 8e4d00dc */ lw $t5,0xdc($s2) -/* f197a3c: 0fc0a26a */ jal 0xf0289a8 +/* f197a3c: 0fc0a26a */ jal chrGetTargetProp /* f197a40: 02802025 */ move $a0,$s4 /* f197a44: 02802025 */ move $a0,$s4 -/* f197a48: 0fc64f9c */ jal 0xf193e70 +/* f197a48: 0fc64f9c */ jal func0f192dc0 /* f197a4c: 8c450004 */ lw $a1,0x4($v0) /* f197a50: 1040000a */ beqz $v0,.PF0f197a7c /* f197a54: 2409002f */ li $t1,0x2f /* f197a58: a28902a0 */ sb $t1,0x2a0($s4) -/* f197a5c: 0fc0a26a */ jal 0xf0289a8 +/* f197a5c: 0fc0a26a */ jal chrGetTargetProp /* f197a60: 02802025 */ move $a0,$s4 -/* f197a64: 0fc63831 */ jal 0xf18e0c4 +/* f197a64: 0fc63831 */ jal mpPlayerGetIndex /* f197a68: 8c440004 */ lw $a0,0x4($v0) /* f197a6c: 240a00fa */ li $t2,0xfa /* f197a70: a6420008 */ sh $v0,0x8($s2) @@ -7698,7 +7698,7 @@ glabel var7f1b8fc8 /* f197a88: 00000000 */ nop /* f197a8c: ae4e00dc */ sw $t6,0xdc($s2) .PF0f197a90: -/* f197a90: 0fc655ca */ jal 0xf195728 +/* f197a90: 0fc655ca */ jal func0f194670 /* f197a94: 02802025 */ move $a0,$s4 /* f197a98: 1040006f */ beqz $v0,.PF0f197c58 /* f197a9c: 240b0029 */ li $t3,0x29 @@ -7733,7 +7733,7 @@ glabel var7f1b8fc8 /* f197b08: 86440048 */ lh $a0,0x48($s2) /* f197b0c: 04820006 */ bltzl $a0,.PF0f197b28 /* f197b10: 8644004a */ lh $a0,0x4a($s2) -/* f197b14: 0fc45b48 */ jal 0xf116d20 +/* f197b14: 0fc45b48 */ jal padSetFlag /* f197b18: 3c050002 */ lui $a1,0x2 /* f197b1c: 10000007 */ b .PF0f197b3c /* f197b20: 828b0007 */ lb $t3,0x7($s4) @@ -7741,7 +7741,7 @@ glabel var7f1b8fc8 .PF0f197b28: /* f197b28: 04820004 */ bltzl $a0,.PF0f197b3c /* f197b2c: 828b0007 */ lb $t3,0x7($s4) -/* f197b30: 0fc45bfa */ jal 0xf116fe8 +/* f197b30: 0fc45bfa */ jal coverSetFlag /* f197b34: 24050100 */ li $a1,0x100 .PF0f197b38: /* f197b38: 828b0007 */ lb $t3,0x7($s4) @@ -7753,7 +7753,7 @@ glabel var7f1b8fc8 /* f197b4c: 10000042 */ b .PF0f197c58 /* f197b50: a28c02a0 */ sb $t4,0x2a0($s4) .PF0f197b54: -/* f197b54: 0fc655ca */ jal 0xf195728 +/* f197b54: 0fc655ca */ jal func0f194670 /* f197b58: 02802025 */ move $a0,$s4 /* f197b5c: 1040003e */ beqz $v0,.PF0f197c58 /* f197b60: 24180029 */ li $t8,0x29 @@ -7763,7 +7763,7 @@ glabel var7f1b8fc8 /* f197b6c: 2401002c */ li $at,0x2c /* f197b70: 54410029 */ bnel $v0,$at,.PF0f197c18 /* f197b74: 2401002e */ li $at,0x2e -/* f197b78: 0fc655ca */ jal 0xf195728 +/* f197b78: 0fc655ca */ jal func0f194670 /* f197b7c: 02802025 */ move $a0,$s4 /* f197b80: 10400003 */ beqz $v0,.PF0f197b90 /* f197b84: 240f0029 */ li $t7,0x29 @@ -7796,7 +7796,7 @@ glabel var7f1b8fc8 /* f197be4: 8e8e001c */ lw $t6,0x1c($s4) /* f197be8: 15ae001b */ bne $t5,$t6,.PF0f197c58 /* f197bec: 00000000 */ nop -/* f197bf0: 0fc63831 */ jal 0xf18e0c4 +/* f197bf0: 0fc63831 */ jal mpPlayerGetIndex /* f197bf4: 02802025 */ move $a0,$s4 /* f197bf8: 3c0b800b */ lui $t3,0x800b /* f197bfc: 856bc782 */ lh $t3,-0x387e($t3) @@ -7809,14 +7809,14 @@ glabel var7f1b8fc8 .PF0f197c18: /* f197c18: 1441000f */ bne $v0,$at,.PF0f197c58 /* f197c1c: 00000000 */ nop -/* f197c20: 0fc655ca */ jal 0xf195728 +/* f197c20: 0fc655ca */ jal func0f194670 /* f197c24: 02802025 */ move $a0,$s4 /* f197c28: 10400003 */ beqz $v0,.PF0f197c38 /* f197c2c: 24180029 */ li $t8,0x29 /* f197c30: 10000009 */ b .PF0f197c58 /* f197c34: a29802a0 */ sb $t8,0x2a0($s4) .PF0f197c38: -/* f197c38: 0fc63831 */ jal 0xf18e0c4 +/* f197c38: 0fc63831 */ jal mpPlayerGetIndex /* f197c3c: 02802025 */ move $a0,$s4 /* f197c40: 3c0f800b */ lui $t7,0x800b /* f197c44: 85efc782 */ lh $t7,-0x387e($t7) @@ -7825,9 +7825,9 @@ glabel var7f1b8fc8 /* f197c50: 00000000 */ nop /* f197c54: a29902a0 */ sb $t9,0x2a0($s4) .PF0f197c58: -/* f197c58: 0fc64fd0 */ jal 0xf193f40 +/* f197c58: 0fc64fd0 */ jal func0f192e90 /* f197c5c: 02802025 */ move $a0,$s4 -/* f197c60: 0fc63831 */ jal 0xf18e0c4 +/* f197c60: 0fc63831 */ jal mpPlayerGetIndex /* f197c64: 02802025 */ move $a0,$s4 /* f197c68: 8ec9000c */ lw $t1,0xc($s6) /* f197c6c: 8e6a0000 */ lw $t2,0x0($s3) @@ -7849,16 +7849,16 @@ glabel var7f1b8fc8 /* f197ca4: 868e017e */ lh $t6,0x17e($s4) /* f197ca8: 13ce0021 */ beq $s8,$t6,.PF0f197d30 /* f197cac: 00000000 */ nop -/* f197cb0: 0fc0a26a */ jal 0xf0289a8 +/* f197cb0: 0fc0a26a */ jal chrGetTargetProp /* f197cb4: 02802025 */ move $a0,$s4 /* f197cb8: 8e83001c */ lw $v1,0x1c($s4) /* f197cbc: 00408025 */ move $s0,$v0 /* f197cc0: 24640008 */ addiu $a0,$v1,0x8 -/* f197cc4: 0fc4534d */ jal 0xf114d34 +/* f197cc4: 0fc4534d */ jal waypointFindClosestToPos /* f197cc8: 24650028 */ addiu $a1,$v1,0x28 /* f197ccc: 00408825 */ move $s1,$v0 /* f197cd0: 26040008 */ addiu $a0,$s0,0x8 -/* f197cd4: 0fc4534d */ jal 0xf114d34 +/* f197cd4: 0fc4534d */ jal waypointFindClosestToPos /* f197cd8: 26050028 */ addiu $a1,$s0,0x28 /* f197cdc: 12200014 */ beqz $s1,.PF0f197d30 /* f197ce0: 00408025 */ move $s0,$v0 @@ -7870,19 +7870,19 @@ glabel var7f1b8fc8 /* f197cf8: 000cc1c0 */ sll $t8,$t4,0x7 /* f197cfc: 000fc8c0 */ sll $t9,$t7,0x3 /* f197d00: 03192021 */ addu $a0,$t8,$t9 -/* f197d04: 0fc45348 */ jal 0xf114d20 +/* f197d04: 0fc45348 */ jal waypointSetHashThing /* f197d08: 00802825 */ move $a1,$a0 /* f197d0c: 02002025 */ move $a0,$s0 /* f197d10: 02202825 */ move $a1,$s1 /* f197d14: 264601e8 */ addiu $a2,$s2,0x1e8 -/* f197d18: 0fc45733 */ jal 0xf115ccc +/* f197d18: 0fc45733 */ jal waypointFindRoute /* f197d1c: 24070008 */ li $a3,0x8 /* f197d20: ae420208 */ sw $v0,0x208($s2) /* f197d24: 00002025 */ move $a0,$zero -/* f197d28: 0fc45348 */ jal 0xf114d20 +/* f197d28: 0fc45348 */ jal waypointSetHashThing /* f197d2c: 00002825 */ move $a1,$zero .PF0f197d30: -/* f197d30: 0fc667fb */ jal 0xf199fec +/* f197d30: 0fc667fb */ jal aibotTickInventory /* f197d34: 02802025 */ move $a0,$s4 /* f197d38: afa00088 */ sw $zero,0x88($sp) /* f197d3c: 00009825 */ move $s3,$zero @@ -7927,7 +7927,7 @@ glabel var7f1b8fc8 /* f197dc8: 2404001c */ li $a0,0x1c /* f197dcc: 1541000d */ bne $t2,$at,.PF0f197e04 /* f197dd0: 02e02825 */ move $a1,$s7 -/* f197dd4: 0fc26dd4 */ jal 0xf09b750 +/* f197dd4: 0fc26dd4 */ jal weaponGetMinClipQty /* f197dd8: afa30054 */ sw $v1,0x54($sp) /* f197ddc: 8e2d0024 */ lw $t5,0x24($s1) /* f197de0: 8fa30054 */ lw $v1,0x54($sp) @@ -7935,7 +7935,7 @@ glabel var7f1b8fc8 /* f197de8: 01a2082a */ slt $at,$t5,$v0 /* f197dec: 10200005 */ beqz $at,.PF0f197e04 /* f197df0: 02602825 */ move $a1,$s3 -/* f197df4: 0fc651d3 */ jal 0xf19474c +/* f197df4: 0fc651d3 */ jal func0f19369c /* f197df8: a460003c */ sh $zero,0x3c($v1) /* f197dfc: 100001f2 */ b .PF0f1985c8 /* f197e00: 00000000 */ nop @@ -7961,7 +7961,7 @@ glabel var7f1b8fc8 /* f197e4c: 032e082a */ slt $at,$t9,$t6 /* f197e50: 54200034 */ bnezl $at,.PF0f197f24 /* f197e54: a460003c */ sh $zero,0x3c($v1) -/* f197e58: 0fc644c8 */ jal 0xf191320 +/* f197e58: 0fc644c8 */ jal func0f190260 /* f197e5c: afa30054 */ sw $v1,0x54($sp) /* f197e60: 14400030 */ bnez $v0,.PF0f197f24 /* f197e64: 8fa30054 */ lw $v1,0x54($sp) @@ -7973,12 +7973,12 @@ glabel var7f1b8fc8 /* f197e7c: 02802025 */ move $a0,$s4 /* f197e80: 2405001e */ li $a1,0x1e /* f197e84: 00003025 */ move $a2,$zero -/* f197e88: 0fc12480 */ jal 0xf049200 +/* f197e88: 0fc12480 */ jal chrIsTargetInFov /* f197e8c: afa30054 */ sw $v1,0x54($sp) /* f197e90: 1040000b */ beqz $v0,.PF0f197ec0 /* f197e94: 8fa30054 */ lw $v1,0x54($sp) /* f197e98: 02802025 */ move $a0,$s4 -/* f197e9c: 0fc124d8 */ jal 0xf049360 +/* f197e9c: 0fc124d8 */ jal chrGetDistanceToTarget /* f197ea0: afa30054 */ sw $v1,0x54($sp) /* f197ea4: 3c014352 */ lui $at,0x4352 /* f197ea8: 44813000 */ mtc1 $at,$f6 @@ -7992,7 +7992,7 @@ glabel var7f1b8fc8 /* f197ec4: a460003c */ sh $zero,0x3c($v1) .PF0f197ec8: /* f197ec8: 00003025 */ move $a2,$zero -/* f197ecc: 0fc12480 */ jal 0xf049200 +/* f197ecc: 0fc12480 */ jal chrIsTargetInFov /* f197ed0: afa30054 */ sw $v1,0x54($sp) /* f197ed4: 10400010 */ beqz $v0,.PF0f197f18 /* f197ed8: 8fa30054 */ lw $v1,0x54($sp) @@ -8003,7 +8003,7 @@ glabel var7f1b8fc8 /* f197eec: 02802025 */ move $a0,$s4 /* f197ef0: afa30054 */ sw $v1,0x54($sp) /* f197ef4: 46125100 */ add.s $f4,$f10,$f18 -/* f197ef8: 0fc124d8 */ jal 0xf049360 +/* f197ef8: 0fc124d8 */ jal chrGetDistanceToTarget /* f197efc: e7a40050 */ swc1 $f4,0x50($sp) /* f197f00: c7a80050 */ lwc1 $f8,0x50($sp) /* f197f04: 8fa30054 */ lw $v1,0x54($sp) @@ -8025,12 +8025,12 @@ glabel var7f1b8fc8 /* f197f38: 02802025 */ move $a0,$s4 /* f197f3c: 4600328d */ trunc.w.s $f10,$f6 /* f197f40: 44105000 */ mfc1 $s0,$f10 -/* f197f44: 0fc089cc */ jal 0xf022730 +/* f197f44: 0fc089cc */ jal chrUncloakTemporarily /* f197f48: 00000000 */ nop /* f197f4c: 02802025 */ move $a0,$s4 /* f197f50: 24050002 */ li $a1,0x2 /* f197f54: 02003025 */ move $a2,$s0 -/* f197f58: 0fc0eef2 */ jal 0xf03bbc8 +/* f197f58: 0fc0eef2 */ jal func0f03ba44 /* f197f5c: 00003825 */ move $a3,$zero /* f197f60: 16600199 */ bnez $s3,.PF0f1985c8 /* f197f64: 00000000 */ nop @@ -8062,7 +8062,7 @@ glabel var7f1b8fc8 .PF0f197fc4: /* f197fc4: a64b003c */ sh $t3,0x3c($s2) .PF0f197fc8: -/* f197fc8: 0c004ad4 */ jal 0x12b50 +/* f197fc8: 0c004ad4 */ jal random /* f197fcc: 00000000 */ nop /* f197fd0: 24010003 */ li $at,0x3 /* f197fd4: 0041001b */ divu $zero,$v0,$at @@ -8100,7 +8100,7 @@ glabel var7f1b8fc8 /* f198048: 24180032 */ li $t8,0x32 /* f19804c: a658003c */ sh $t8,0x3c($s2) /* f198050: 2404001c */ li $a0,0x1c -/* f198054: 0fc26dd4 */ jal 0xf09b750 +/* f198054: 0fc26dd4 */ jal weaponGetMinClipQty /* f198058: 02e02825 */ move $a1,$s7 /* f19805c: 8e490024 */ lw $t1,0x24($s2) /* f198060: 01225023 */ subu $t2,$t1,$v0 @@ -8122,9 +8122,9 @@ glabel var7f1b8fc8 /* f19809c: 8e4b0024 */ lw $t3,0x24($s2) /* f1980a0: 19600149 */ blez $t3,.PF0f1985c8 /* f1980a4: 00000000 */ nop -/* f1980a8: 0fc089cc */ jal 0xf022730 +/* f1980a8: 0fc089cc */ jal chrUncloakTemporarily /* f1980ac: 02802025 */ move $a0,$s4 -/* f1980b0: 0fc66e54 */ jal 0xf19b950 +/* f1980b0: 0fc66e54 */ jal aibotCreateSlayerRocket /* f1980b4: 02802025 */ move $a0,$s4 /* f1980b8: 8e4c0024 */ lw $t4,0x24($s2) /* f1980bc: 258fffff */ addiu $t7,$t4,-1 @@ -8133,7 +8133,7 @@ glabel var7f1b8fc8 .PF0f1980c8: /* f1980c8: 0005c7c2 */ srl $t8,$a1,0x1f .PF0f1980cc: -/* f1980cc: 0fc66ce7 */ jal 0xf19b39c +/* f1980cc: 0fc66ce7 */ jal func0f19a29c /* f1980d0: 03002825 */ move $a1,$t8 /* f1980d4: 1040005b */ beqz $v0,.PF0f198244 /* f1980d8: 8fb8004c */ lw $t8,0x4c($sp) @@ -8155,7 +8155,7 @@ glabel var7f1b8fc8 /* f198114: 8e450020 */ lw $a1,0x20($s2) /* f198118: 00003825 */ move $a3,$zero /* f19811c: 00067080 */ sll $t6,$a2,0x2 -/* f198120: 0fc66b39 */ jal 0xf19ace4 +/* f198120: 0fc66b39 */ jal aibotGetAmmoQuantityByWeapon /* f198124: 000e37c2 */ srl $a2,$t6,0x1f /* f198128: 5c400008 */ bgtzl $v0,.PF0f19814c /* f19812c: 868c017e */ lh $t4,0x17e($s4) @@ -8184,12 +8184,12 @@ glabel var7f1b8fc8 /* f198180: 0319082a */ slt $at,$t8,$t9 /* f198184: 1420000b */ bnez $at,.PF0f1981b4 /* f198188: 00000000 */ nop -/* f19818c: 0fc644c8 */ jal 0xf191320 +/* f19818c: 0fc644c8 */ jal func0f190260 /* f198190: 02802025 */ move $a0,$s4 /* f198194: 14400006 */ bnez $v0,.PF0f1981b0 /* f198198: 02802025 */ move $a0,$s4 /* f19819c: 2405002d */ li $a1,0x2d -/* f1981a0: 0fc12480 */ jal 0xf049200 +/* f1981a0: 0fc12480 */ jal chrIsTargetInFov /* f1981a4: 00003025 */ move $a2,$zero /* f1981a8: 10400002 */ beqz $v0,.PF0f1981b4 /* f1981ac: 00000000 */ nop @@ -8198,21 +8198,21 @@ glabel var7f1b8fc8 .PF0f1981b4: /* f1981b4: 12000104 */ beqz $s0,.PF0f1985c8 /* f1981b8: 00000000 */ nop -/* f1981bc: 0fc089cc */ jal 0xf022730 +/* f1981bc: 0fc089cc */ jal chrUncloakTemporarily /* f1981c0: 02802025 */ move $a0,$s4 /* f1981c4: 8e46004c */ lw $a2,0x4c($s2) /* f1981c8: 02402025 */ move $a0,$s2 /* f1981cc: 8e450020 */ lw $a1,0x20($s2) /* f1981d0: 00067080 */ sll $t6,$a2,0x2 /* f1981d4: 000e37c2 */ srl $a2,$t6,0x1f -/* f1981d8: 0fc66b9c */ jal 0xf19ae70 +/* f1981d8: 0fc66b9c */ jal aibotTryRemoveAmmoFromReserve /* f1981dc: 02e03825 */ move $a3,$s7 -/* f1981e0: 0fc66d1f */ jal 0xf19b47c +/* f1981e0: 0fc66d1f */ jal func0f19a37c /* f1981e4: 02802025 */ move $a0,$s4 /* f1981e8: 8e45004c */ lw $a1,0x4c($s2) /* f1981ec: 8e440020 */ lw $a0,0x20($s2) /* f1981f0: 00056080 */ sll $t4,$a1,0x2 -/* f1981f4: 0fc2c531 */ jal 0xf0b14c4 +/* f1981f4: 0fc2c531 */ jal weaponGetFunctionById /* f1981f8: 000c2fc2 */ srl $a1,$t4,0x1f /* f1981fc: 5040000d */ beqzl $v0,.PF0f198234 /* f198200: 8e8d02d4 */ lw $t5,0x2d4($s4) @@ -8221,15 +8221,15 @@ glabel var7f1b8fc8 /* f19820c: 00095340 */ sll $t2,$t1,0xd /* f198210: 05430008 */ bgezl $t2,.PF0f198234 /* f198214: 8e8d02d4 */ lw $t5,0x2d4($s4) -/* f198218: 0fc663a5 */ jal 0xf198e94 +/* f198218: 0fc663a5 */ jal aibotRemoveInvItem /* f19821c: 8e450020 */ lw $a1,0x20($s2) /* f198220: 02802025 */ move $a0,$s4 /* f198224: 02e02825 */ move $a1,$s7 -/* f198228: 0fc6696c */ jal 0xf19a5b0 +/* f198228: 0fc6696c */ jal aibotSwitchToWeapon /* f19822c: 00003025 */ move $a2,$zero /* f198230: 8e8d02d4 */ lw $t5,0x2d4($s4) .PF0f198234: -/* f198234: 0fc66cf7 */ jal 0xf19b3dc +/* f198234: 0fc66cf7 */ jal aibotGetProjectileThrowInterval /* f198238: 8da40020 */ lw $a0,0x20($t5) /* f19823c: 100000e2 */ b .PF0f1985c8 /* f198240: ae420034 */ sw $v0,0x34($s2) @@ -8247,7 +8247,7 @@ glabel var7f1b8fc8 /* f19826c: 00008025 */ move $s0,$zero /* f198270: 8e440020 */ lw $a0,0x20($s2) /* f198274: 00056080 */ sll $t4,$a1,0x2 -/* f198278: 0fc2c8f8 */ jal 0xf0b23e0 +/* f198278: 0fc2c8f8 */ jal weaponGetMaxFireRatePerTick /* f19827c: 000c2fc2 */ srl $a1,$t4,0x1f /* f198280: 5c400030 */ bgtzl $v0,.PF0f198344 /* f198284: 02e08025 */ move $s0,$s7 @@ -8331,19 +8331,19 @@ glabel var7f1b8fc8 /* f1983a4: 016a082a */ slt $at,$t3,$t2 /* f1983a8: 1420002a */ bnez $at,.PF0f198454 /* f1983ac: 00000000 */ nop -/* f1983b0: 0fc644c8 */ jal 0xf191320 +/* f1983b0: 0fc644c8 */ jal func0f190260 /* f1983b4: 02802025 */ move $a0,$s4 /* f1983b8: 14400006 */ bnez $v0,.PF0f1983d4 /* f1983bc: 02802025 */ move $a0,$s4 /* f1983c0: 2405002d */ li $a1,0x2d -/* f1983c4: 0fc12480 */ jal 0xf049200 +/* f1983c4: 0fc12480 */ jal chrIsTargetInFov /* f1983c8: 00003025 */ move $a2,$zero /* f1983cc: 10400021 */ beqz $v0,.PF0f198454 /* f1983d0: 00000000 */ nop .PF0f1983d4: -/* f1983d4: 0fc0a26a */ jal 0xf0289a8 +/* f1983d4: 0fc0a26a */ jal chrGetTargetProp /* f1983d8: 02802025 */ move $a0,$s4 -/* f1983dc: 0fc0e706 */ jal 0xf039c18 +/* f1983dc: 0fc0e706 */ jal chrIsDead /* f1983e0: 8c440004 */ lw $a0,0x4($v0) /* f1983e4: 1440001b */ bnez $v0,.PF0f198454 /* f1983e8: 00000000 */ nop @@ -8394,7 +8394,7 @@ glabel var7f1b8fc8 .PF0f198490: /* f198490: 8e440020 */ lw $a0,0x20($s2) /* f198494: 00056080 */ sll $t4,$a1,0x2 -/* f198498: 0fc2c8f8 */ jal 0xf0b23e0 +/* f198498: 0fc2c8f8 */ jal weaponGetMaxFireRatePerTick /* f19849c: 000c2fc2 */ srl $a1,$t4,0x1f /* f1984a0: 1c400049 */ bgtz $v0,.PF0f1985c8 /* f1984a4: 00000000 */ nop @@ -8403,7 +8403,7 @@ glabel var7f1b8fc8 /* f1984b0: 8e45004c */ lw $a1,0x4c($s2) /* f1984b4: 8e440020 */ lw $a0,0x20($s2) /* f1984b8: 00054880 */ sll $t1,$a1,0x2 -/* f1984bc: 0fc66dc3 */ jal 0xf19b70c +/* f1984bc: 0fc66dc3 */ jal func0f19a60c /* f1984c0: 00092fc2 */ srl $a1,$t1,0x1f /* f1984c4: 28410006 */ slti $at,$v0,0x6 /* f1984c8: 1420000b */ bnez $at,.PF0f1984f8 @@ -8422,7 +8422,7 @@ glabel var7f1b8fc8 /* f1984f8: 8e45004c */ lw $a1,0x4c($s2) /* f1984fc: 8e440020 */ lw $a0,0x20($s2) /* f198500: 0005c880 */ sll $t9,$a1,0x2 -/* f198504: 0fc2c531 */ jal 0xf0b14c4 +/* f198504: 0fc2c531 */ jal weaponGetFunctionById /* f198508: 00192fc2 */ srl $a1,$t9,0x1f /* f19850c: 1040002e */ beqz $v0,.PF0f1985c8 /* f198510: 00000000 */ nop @@ -8479,7 +8479,7 @@ glabel var7f1b8fc8 .PF0f1985c8: /* f1985c8: 52a00007 */ beqzl $s5,.PF0f1985e8 /* f1985cc: 02802025 */ move $a0,$s4 -/* f1985d0: 0fc089cc */ jal 0xf022730 +/* f1985d0: 0fc089cc */ jal chrUncloakTemporarily /* f1985d4: 02802025 */ move $a0,$s4 /* f1985d8: 56600003 */ bnezl $s3,.PF0f1985e8 /* f1985dc: 02802025 */ move $a0,$s4 @@ -8487,7 +8487,7 @@ glabel var7f1b8fc8 /* f1985e4: 02802025 */ move $a0,$s4 .PF0f1985e8: /* f1985e8: 02602825 */ move $a1,$s3 -/* f1985ec: 0fc0fec3 */ jal 0xf03fb0c +/* f1985ec: 0fc0fec3 */ jal func0f03f988 /* f1985f0: 02a03025 */ move $a2,$s5 /* f1985f4: 8fae004c */ lw $t6,0x4c($sp) /* f1985f8: 26730001 */ addiu $s3,$s3,0x1 diff --git a/src/game/gamefile.c b/src/game/gamefile.c index c29482012..2d7afa3cb 100644 --- a/src/game/gamefile.c +++ b/src/game/gamefile.c @@ -84,172 +84,172 @@ glabel savefileApplyOptions /* f10fbf0: afa80020 */ sw $t0,0x20($sp) .PF0f10fbf4: /* f10fbf4: 24d00014 */ addiu $s0,$a2,0x14 -/* f10fbf8: 0fc47c20 */ jal 0xf11f080 +/* f10fbf8: 0fc47c20 */ jal bitGetByIndex /* f10fbfc: 02002825 */ move $a1,$s0 /* f10fc00: 8fa40024 */ lw $a0,0x24($sp) -/* f10fc04: 0fc54d7e */ jal 0xf1535f8 +/* f10fc04: 0fc54d7e */ jal optionsSetForwardPitch /* f10fc08: 00402825 */ move $a1,$v0 /* f10fc0c: 24040001 */ li $a0,0x1 -/* f10fc10: 0fc47c20 */ jal 0xf11f080 +/* f10fc10: 0fc47c20 */ jal bitGetByIndex /* f10fc14: 02002825 */ move $a1,$s0 /* f10fc18: 8fa40024 */ lw $a0,0x24($sp) -/* f10fc1c: 0fc54d94 */ jal 0xf153650 +/* f10fc1c: 0fc54d94 */ jal optionsSetAutoAim /* f10fc20: 00402825 */ move $a1,$v0 /* f10fc24: 24040002 */ li $a0,0x2 -/* f10fc28: 0fc47c20 */ jal 0xf11f080 +/* f10fc28: 0fc47c20 */ jal bitGetByIndex /* f10fc2c: 02002825 */ move $a1,$s0 /* f10fc30: 8fa40024 */ lw $a0,0x24($sp) -/* f10fc34: 0fc54dc0 */ jal 0xf153700 +/* f10fc34: 0fc54dc0 */ jal optionsSetAimControl /* f10fc38: 00402825 */ move $a1,$v0 /* f10fc3c: 24040003 */ li $a0,0x3 -/* f10fc40: 0fc47c20 */ jal 0xf11f080 +/* f10fc40: 0fc47c20 */ jal bitGetByIndex /* f10fc44: 02002825 */ move $a1,$s0 /* f10fc48: 8fa40024 */ lw $a0,0x24($sp) -/* f10fc4c: 0fc54dd6 */ jal 0xf153758 +/* f10fc4c: 0fc54dd6 */ jal optionsSetSightOnScreen /* f10fc50: 00402825 */ move $a1,$v0 /* f10fc54: 24040004 */ li $a0,0x4 -/* f10fc58: 0fc47c20 */ jal 0xf11f080 +/* f10fc58: 0fc47c20 */ jal bitGetByIndex /* f10fc5c: 02002825 */ move $a1,$s0 /* f10fc60: 8fa40024 */ lw $a0,0x24($sp) -/* f10fc64: 0fc54daa */ jal 0xf1536a8 +/* f10fc64: 0fc54daa */ jal optionsSetLookAhead /* f10fc68: 00402825 */ move $a1,$v0 /* f10fc6c: 24040005 */ li $a0,0x5 -/* f10fc70: 0fc47c20 */ jal 0xf11f080 +/* f10fc70: 0fc47c20 */ jal bitGetByIndex /* f10fc74: 02002825 */ move $a1,$s0 /* f10fc78: 8fa40024 */ lw $a0,0x24($sp) -/* f10fc7c: 0fc54dec */ jal 0xf1537b0 +/* f10fc7c: 0fc54dec */ jal optionsSetAmmoOnScreen /* f10fc80: 00402825 */ move $a1,$v0 /* f10fc84: 24040009 */ li $a0,0x9 -/* f10fc88: 0fc47c20 */ jal 0xf11f080 +/* f10fc88: 0fc47c20 */ jal bitGetByIndex /* f10fc8c: 02002825 */ move $a1,$s0 /* f10fc90: 8fa40024 */ lw $a0,0x24($sp) -/* f10fc94: 0fc54e76 */ jal 0xf1539d8 +/* f10fc94: 0fc54e76 */ jal optionsSetHeadRoll /* f10fc98: 00402825 */ move $a1,$v0 /* f10fc9c: 2404000a */ li $a0,0xa -/* f10fca0: 0fc47c20 */ jal 0xf11f080 +/* f10fca0: 0fc47c20 */ jal bitGetByIndex /* f10fca4: 02002825 */ move $a1,$s0 /* f10fca8: 8fa40024 */ lw $a0,0x24($sp) -/* f10fcac: 0fc54e02 */ jal 0xf153808 +/* f10fcac: 0fc54e02 */ jal optionsSetShowGunFunction /* f10fcb0: 00402825 */ move $a1,$v0 /* f10fcb4: 24040015 */ li $a0,0x15 -/* f10fcb8: 0fc47c20 */ jal 0xf11f080 +/* f10fcb8: 0fc47c20 */ jal bitGetByIndex /* f10fcbc: 02002825 */ move $a1,$s0 /* f10fcc0: 8fa40024 */ lw $a0,0x24($sp) -/* f10fcc4: 0fc54e18 */ jal 0xf153860 +/* f10fcc4: 0fc54e18 */ jal optionsSetAlwaysShowTarget /* f10fcc8: 00402825 */ move $a1,$v0 /* f10fccc: 24040017 */ li $a0,0x17 -/* f10fcd0: 0fc47c20 */ jal 0xf11f080 +/* f10fcd0: 0fc47c20 */ jal bitGetByIndex /* f10fcd4: 02002825 */ move $a1,$s0 /* f10fcd8: 8fa40024 */ lw $a0,0x24($sp) -/* f10fcdc: 0fc54e2e */ jal 0xf1538b8 +/* f10fcdc: 0fc54e2e */ jal optionsSetShowZoomRange /* f10fce0: 00402825 */ move $a1,$v0 /* f10fce4: 2404001a */ li $a0,0x1a -/* f10fce8: 0fc47c20 */ jal 0xf11f080 +/* f10fce8: 0fc47c20 */ jal bitGetByIndex /* f10fcec: 02002825 */ move $a1,$s0 /* f10fcf0: 8fa40024 */ lw $a0,0x24($sp) -/* f10fcf4: 0fc54e5a */ jal 0xf153968 +/* f10fcf4: 0fc54e5a */ jal optionsSetShowMissionTime /* f10fcf8: 00402825 */ move $a1,$v0 /* f10fcfc: 24040020 */ li $a0,0x20 -/* f10fd00: 0fc47c20 */ jal 0xf11f080 +/* f10fd00: 0fc47c20 */ jal bitGetByIndex /* f10fd04: 02002825 */ move $a1,$s0 /* f10fd08: 8fa40024 */ lw $a0,0x24($sp) -/* f10fd0c: 0fc54e44 */ jal 0xf153910 +/* f10fd0c: 0fc54e44 */ jal optionsSetPaintball /* f10fd10: 00402825 */ move $a1,$v0 /* f10fd14: 2404000c */ li $a0,0xc -/* f10fd18: 0fc47c20 */ jal 0xf11f080 +/* f10fd18: 0fc47c20 */ jal bitGetByIndex /* f10fd1c: 02002825 */ move $a1,$s0 /* f10fd20: 8fa40020 */ lw $a0,0x20($sp) -/* f10fd24: 0fc54d7e */ jal 0xf1535f8 +/* f10fd24: 0fc54d7e */ jal optionsSetForwardPitch /* f10fd28: 00402825 */ move $a1,$v0 /* f10fd2c: 2404000d */ li $a0,0xd -/* f10fd30: 0fc47c20 */ jal 0xf11f080 +/* f10fd30: 0fc47c20 */ jal bitGetByIndex /* f10fd34: 02002825 */ move $a1,$s0 /* f10fd38: 8fa40020 */ lw $a0,0x20($sp) -/* f10fd3c: 0fc54d94 */ jal 0xf153650 +/* f10fd3c: 0fc54d94 */ jal optionsSetAutoAim /* f10fd40: 00402825 */ move $a1,$v0 /* f10fd44: 2404000e */ li $a0,0xe -/* f10fd48: 0fc47c20 */ jal 0xf11f080 +/* f10fd48: 0fc47c20 */ jal bitGetByIndex /* f10fd4c: 02002825 */ move $a1,$s0 /* f10fd50: 8fa40020 */ lw $a0,0x20($sp) -/* f10fd54: 0fc54dc0 */ jal 0xf153700 +/* f10fd54: 0fc54dc0 */ jal optionsSetAimControl /* f10fd58: 00402825 */ move $a1,$v0 /* f10fd5c: 2404000f */ li $a0,0xf -/* f10fd60: 0fc47c20 */ jal 0xf11f080 +/* f10fd60: 0fc47c20 */ jal bitGetByIndex /* f10fd64: 02002825 */ move $a1,$s0 /* f10fd68: 8fa40020 */ lw $a0,0x20($sp) -/* f10fd6c: 0fc54dd6 */ jal 0xf153758 +/* f10fd6c: 0fc54dd6 */ jal optionsSetSightOnScreen /* f10fd70: 00402825 */ move $a1,$v0 /* f10fd74: 24040010 */ li $a0,0x10 -/* f10fd78: 0fc47c20 */ jal 0xf11f080 +/* f10fd78: 0fc47c20 */ jal bitGetByIndex /* f10fd7c: 02002825 */ move $a1,$s0 /* f10fd80: 8fa40020 */ lw $a0,0x20($sp) -/* f10fd84: 0fc54daa */ jal 0xf1536a8 +/* f10fd84: 0fc54daa */ jal optionsSetLookAhead /* f10fd88: 00402825 */ move $a1,$v0 /* f10fd8c: 24040011 */ li $a0,0x11 -/* f10fd90: 0fc47c20 */ jal 0xf11f080 +/* f10fd90: 0fc47c20 */ jal bitGetByIndex /* f10fd94: 02002825 */ move $a1,$s0 /* f10fd98: 8fa40020 */ lw $a0,0x20($sp) -/* f10fd9c: 0fc54dec */ jal 0xf1537b0 +/* f10fd9c: 0fc54dec */ jal optionsSetAmmoOnScreen /* f10fda0: 00402825 */ move $a1,$v0 /* f10fda4: 24040012 */ li $a0,0x12 -/* f10fda8: 0fc47c20 */ jal 0xf11f080 +/* f10fda8: 0fc47c20 */ jal bitGetByIndex /* f10fdac: 02002825 */ move $a1,$s0 /* f10fdb0: 8fa40020 */ lw $a0,0x20($sp) -/* f10fdb4: 0fc54e76 */ jal 0xf1539d8 +/* f10fdb4: 0fc54e76 */ jal optionsSetHeadRoll /* f10fdb8: 00402825 */ move $a1,$v0 /* f10fdbc: 24040013 */ li $a0,0x13 -/* f10fdc0: 0fc47c20 */ jal 0xf11f080 +/* f10fdc0: 0fc47c20 */ jal bitGetByIndex /* f10fdc4: 02002825 */ move $a1,$s0 /* f10fdc8: 8fa40020 */ lw $a0,0x20($sp) -/* f10fdcc: 0fc54e02 */ jal 0xf153808 +/* f10fdcc: 0fc54e02 */ jal optionsSetShowGunFunction /* f10fdd0: 00402825 */ move $a1,$v0 /* f10fdd4: 24040016 */ li $a0,0x16 -/* f10fdd8: 0fc47c20 */ jal 0xf11f080 +/* f10fdd8: 0fc47c20 */ jal bitGetByIndex /* f10fddc: 02002825 */ move $a1,$s0 /* f10fde0: 8fa40020 */ lw $a0,0x20($sp) -/* f10fde4: 0fc54e18 */ jal 0xf153860 +/* f10fde4: 0fc54e18 */ jal optionsSetAlwaysShowTarget /* f10fde8: 00402825 */ move $a1,$v0 /* f10fdec: 24040018 */ li $a0,0x18 -/* f10fdf0: 0fc47c20 */ jal 0xf11f080 +/* f10fdf0: 0fc47c20 */ jal bitGetByIndex /* f10fdf4: 02002825 */ move $a1,$s0 /* f10fdf8: 8fa40020 */ lw $a0,0x20($sp) -/* f10fdfc: 0fc54e2e */ jal 0xf1538b8 +/* f10fdfc: 0fc54e2e */ jal optionsSetShowZoomRange /* f10fe00: 00402825 */ move $a1,$v0 /* f10fe04: 2404001b */ li $a0,0x1b -/* f10fe08: 0fc47c20 */ jal 0xf11f080 +/* f10fe08: 0fc47c20 */ jal bitGetByIndex /* f10fe0c: 02002825 */ move $a1,$s0 /* f10fe10: 8fa40020 */ lw $a0,0x20($sp) -/* f10fe14: 0fc54e5a */ jal 0xf153968 +/* f10fe14: 0fc54e5a */ jal optionsSetShowMissionTime /* f10fe18: 00402825 */ move $a1,$v0 /* f10fe1c: 24040021 */ li $a0,0x21 -/* f10fe20: 0fc47c20 */ jal 0xf11f080 +/* f10fe20: 0fc47c20 */ jal bitGetByIndex /* f10fe24: 02002825 */ move $a1,$s0 /* f10fe28: 8fa40020 */ lw $a0,0x20($sp) -/* f10fe2c: 0fc54e44 */ jal 0xf153910 +/* f10fe2c: 0fc54e44 */ jal optionsSetPaintball /* f10fe30: 00402825 */ move $a1,$v0 /* f10fe34: 2404000b */ li $a0,0xb -/* f10fe38: 0fc47c20 */ jal 0xf11f080 +/* f10fe38: 0fc47c20 */ jal bitGetByIndex /* f10fe3c: 02002825 */ move $a1,$s0 -/* f10fe40: 0fc54e70 */ jal 0xf1539c0 +/* f10fe40: 0fc54e70 */ jal optionsSetInGameSubtitles /* f10fe44: 00402025 */ move $a0,$v0 /* f10fe48: 24040014 */ li $a0,0x14 -/* f10fe4c: 0fc47c20 */ jal 0xf11f080 +/* f10fe4c: 0fc47c20 */ jal bitGetByIndex /* f10fe50: 02002825 */ move $a1,$s0 -/* f10fe54: 0fc54e73 */ jal 0xf1539cc +/* f10fe54: 0fc54e73 */ jal optionsSetCutsceneSubtitles /* f10fe58: 00402025 */ move $a0,$v0 /* f10fe5c: 24040021 */ li $a0,0x21 -/* f10fe60: 0fc47c20 */ jal 0xf11f080 +/* f10fe60: 0fc47c20 */ jal bitGetByIndex /* f10fe64: 02002825 */ move $a1,$s0 /* f10fe68: 8fa40020 */ lw $a0,0x20($sp) -/* f10fe6c: 0fc54e44 */ jal 0xf153910 +/* f10fe6c: 0fc54e44 */ jal optionsSetPaintball /* f10fe70: 00402825 */ move $a1,$v0 /* f10fe74: 24040040 */ li $a0,0x40 -/* f10fe78: 0fc47c20 */ jal 0xf11f080 +/* f10fe78: 0fc47c20 */ jal bitGetByIndex /* f10fe7c: 02002825 */ move $a1,$s0 /* f10fe80: 3c01800a */ lui $at,0x800a /* f10fe84: a022a9f3 */ sb $v0,-0x560d($at) /* f10fe88: 24040022 */ li $a0,0x22 -/* f10fe8c: 0fc47c20 */ jal 0xf11f080 +/* f10fe8c: 0fc47c20 */ jal bitGetByIndex /* f10fe90: 02002825 */ move $a1,$s0 /* f10fe94: 1040000d */ beqz $v0,.PF0f10fecc /* f10fe98: 3c098009 */ lui $t1,0x8009 @@ -257,17 +257,17 @@ glabel savefileApplyOptions /* f10fea0: 24010001 */ li $at,0x1 /* f10fea4: 15210005 */ bne $t1,$at,.PF0f10febc /* f10fea8: 00000000 */ nop -/* f10feac: 0fc2f26f */ jal 0xf0bc9bc +/* f10feac: 0fc2f26f */ jal optionsSetHiRes /* f10feb0: 00002025 */ move $a0,$zero /* f10feb4: 10000007 */ b .PF0f10fed4 /* f10feb8: 00000000 */ nop .PF0f10febc: -/* f10febc: 0fc2f26f */ jal 0xf0bc9bc +/* f10febc: 0fc2f26f */ jal optionsSetHiRes /* f10fec0: 24040001 */ li $a0,0x1 /* f10fec4: 10000003 */ b .PF0f10fed4 /* f10fec8: 00000000 */ nop .PF0f10fecc: -/* f10fecc: 0fc2f26f */ jal 0xf0bc9bc +/* f10fecc: 0fc2f26f */ jal optionsSetHiRes /* f10fed0: 00002025 */ move $a0,$zero .PF0f10fed4: /* f10fed4: 3c0a8009 */ lui $t2,0x8009 @@ -275,49 +275,49 @@ glabel savefileApplyOptions /* f10fedc: 24010001 */ li $at,0x1 /* f10fee0: 55410008 */ bnel $t2,$at,.PF0f10ff04 /* f10fee4: 24040019 */ li $a0,0x19 -/* f10fee8: 0fc54efc */ jal 0xf153bf0 +/* f10fee8: 0fc54efc */ jal optionsSetScreenSplit /* f10feec: 00002025 */ move $a0,$zero -/* f10fef0: 0fc54ef6 */ jal 0xf153bd8 +/* f10fef0: 0fc54ef6 */ jal optionsSetScreenRatio /* f10fef4: 00002025 */ move $a0,$zero /* f10fef8: 1000000c */ b .PF0f10ff2c /* f10fefc: 24040008 */ li $a0,0x8 /* f10ff00: 24040019 */ li $a0,0x19 .PF0f10ff04: -/* f10ff04: 0fc47c20 */ jal 0xf11f080 +/* f10ff04: 0fc47c20 */ jal bitGetByIndex /* f10ff08: 02002825 */ move $a1,$s0 -/* f10ff0c: 0fc54efc */ jal 0xf153bf0 +/* f10ff0c: 0fc54efc */ jal optionsSetScreenSplit /* f10ff10: 304400ff */ andi $a0,$v0,0xff /* f10ff14: 24040007 */ li $a0,0x7 -/* f10ff18: 0fc47c20 */ jal 0xf11f080 +/* f10ff18: 0fc47c20 */ jal bitGetByIndex /* f10ff1c: 02002825 */ move $a1,$s0 -/* f10ff20: 0fc54ef6 */ jal 0xf153bd8 +/* f10ff20: 0fc54ef6 */ jal optionsSetScreenRatio /* f10ff24: 00402025 */ move $a0,$v0 /* f10ff28: 24040008 */ li $a0,0x8 .PF0f10ff2c: -/* f10ff2c: 0fc47c20 */ jal 0xf11f080 +/* f10ff2c: 0fc47c20 */ jal bitGetByIndex /* f10ff30: 02002825 */ move $a1,$s0 /* f10ff34: 50400006 */ beqzl $v0,.PF0f10ff50 /* f10ff38: 24040006 */ li $a0,0x6 -/* f10ff3c: 0fc54ef0 */ jal 0xf153bc0 +/* f10ff3c: 0fc54ef0 */ jal optionsSetScreenSize /* f10ff40: 24040002 */ li $a0,0x2 /* f10ff44: 1000000d */ b .PF0f10ff7c /* f10ff48: 2404001f */ li $a0,0x1f /* f10ff4c: 24040006 */ li $a0,0x6 .PF0f10ff50: -/* f10ff50: 0fc47c20 */ jal 0xf11f080 +/* f10ff50: 0fc47c20 */ jal bitGetByIndex /* f10ff54: 02002825 */ move $a1,$s0 /* f10ff58: 10400005 */ beqz $v0,.PF0f10ff70 /* f10ff5c: 00000000 */ nop -/* f10ff60: 0fc54ef0 */ jal 0xf153bc0 +/* f10ff60: 0fc54ef0 */ jal optionsSetScreenSize /* f10ff64: 24040001 */ li $a0,0x1 /* f10ff68: 10000004 */ b .PF0f10ff7c /* f10ff6c: 2404001f */ li $a0,0x1f .PF0f10ff70: -/* f10ff70: 0fc54ef0 */ jal 0xf153bc0 +/* f10ff70: 0fc54ef0 */ jal optionsSetScreenSize /* f10ff74: 00002025 */ move $a0,$zero /* f10ff78: 2404001f */ li $a0,0x1f .PF0f10ff7c: -/* f10ff7c: 0fc47c20 */ jal 0xf11f080 +/* f10ff7c: 0fc47c20 */ jal bitGetByIndex /* f10ff80: 02002825 */ move $a1,$s0 /* f10ff84: 10400005 */ beqz $v0,.PF0f10ff9c /* f10ff88: 2404001c */ li $a0,0x1c @@ -329,7 +329,7 @@ glabel savefileApplyOptions /* f10ff9c: 3c01800a */ lui $at,0x800a /* f10ffa0: ac20a960 */ sw $zero,-0x56a0($at) .PF0f10ffa4: -/* f10ffa4: 0fc47c20 */ jal 0xf11f080 +/* f10ffa4: 0fc47c20 */ jal bitGetByIndex /* f10ffa8: 02002825 */ move $a1,$s0 /* f10ffac: 10400005 */ beqz $v0,.PF0f10ffc4 /* f10ffb0: 2404001d */ li $a0,0x1d @@ -341,7 +341,7 @@ glabel savefileApplyOptions /* f10ffc4: 3c01800a */ lui $at,0x800a /* f10ffc8: ac20a958 */ sw $zero,-0x56a8($at) .PF0f10ffcc: -/* f10ffcc: 0fc47c20 */ jal 0xf11f080 +/* f10ffcc: 0fc47c20 */ jal bitGetByIndex /* f10ffd0: 02002825 */ move $a1,$s0 /* f10ffd4: 10400005 */ beqz $v0,.PF0f10ffec /* f10ffd8: 2404001e */ li $a0,0x1e @@ -353,7 +353,7 @@ glabel savefileApplyOptions /* f10ffec: 3c01800a */ lui $at,0x800a /* f10fff0: ac20a964 */ sw $zero,-0x569c($at) .PF0f10fff4: -/* f10fff4: 0fc47c20 */ jal 0xf11f080 +/* f10fff4: 0fc47c20 */ jal bitGetByIndex /* f10fff8: 02002825 */ move $a1,$s0 /* f10fffc: 10400005 */ beqz $v0,.PF0f110014 /* f110000: 24040044 */ li $a0,0x44 @@ -367,7 +367,7 @@ glabel savefileApplyOptions .PF0f11001c: /* f11001c: 3c01800a */ lui $at,0x800a /* f110020: a420a992 */ sh $zero,-0x566e($at) -/* f110024: 0fc47c20 */ jal 0xf11f080 +/* f110024: 0fc47c20 */ jal bitGetByIndex /* f110028: 02002825 */ move $a1,$s0 /* f11002c: 10400006 */ beqz $v0,.PF0f110048 /* f110030: 24040045 */ li $a0,0x45 @@ -377,7 +377,7 @@ glabel savefileApplyOptions /* f110040: 35f80001 */ ori $t8,$t7,0x1 /* f110044: a438a992 */ sh $t8,-0x566e($at) .PF0f110048: -/* f110048: 0fc47c20 */ jal 0xf11f080 +/* f110048: 0fc47c20 */ jal bitGetByIndex /* f11004c: 02002825 */ move $a1,$s0 /* f110050: 10400006 */ beqz $v0,.PF0f11006c /* f110054: 24040046 */ li $a0,0x46 @@ -387,7 +387,7 @@ glabel savefileApplyOptions /* f110064: 37280002 */ ori $t0,$t9,0x2 /* f110068: a428a992 */ sh $t0,-0x566e($at) .PF0f11006c: -/* f11006c: 0fc47c20 */ jal 0xf11f080 +/* f11006c: 0fc47c20 */ jal bitGetByIndex /* f110070: 02002825 */ move $a1,$s0 /* f110074: 10400006 */ beqz $v0,.PF0f110090 /* f110078: 3c04800a */ lui $a0,0x800a @@ -397,7 +397,7 @@ glabel savefileApplyOptions /* f110088: 352a0004 */ ori $t2,$t1,0x4 /* f11008c: a42aa992 */ sh $t2,-0x566e($at) .PF0f110090: -/* f110090: 0fc5bdd7 */ jal 0xf16f75c +/* f110090: 0fc5bdd7 */ jal func0f16f75c /* f110094: 9484a992 */ lhu $a0,-0x566e($a0) /* f110098: 8fbf001c */ lw $ra,0x1c($sp) /* f11009c: 8fb00018 */ lw $s0,0x18($sp) @@ -512,7 +512,7 @@ glabel savefileLoadDefaults /* f110108: 24100001 */ li $s0,0x1 .PF0f11010c: /* f11010c: 3c057f1b */ lui $a1,0x7f1b -/* f110110: 0c004bb0 */ jal 0x12ec0 +/* f110110: 0c004bb0 */ jal strcpy /* f110114: 24a54bd0 */ addiu $a1,$a1,0x4bd0 /* f110118: 8fa20028 */ lw $v0,0x28($sp) /* f11011c: 24045000 */ li $a0,0x5000 @@ -522,177 +522,177 @@ glabel savefileLoadDefaults /* f11012c: 3308ff07 */ andi $t0,$t8,0xff07 /* f110130: 310900f8 */ andi $t1,$t0,0xf8 /* f110134: a048000b */ sb $t0,0xb($v0) -/* f110138: 0c0039df */ jal 0xe77c +/* f110138: 0c0039df */ jal audioSetSfxVolume /* f11013c: a049000b */ sb $t1,0xb($v0) -/* f110140: 0fc54f08 */ jal 0xf153c20 +/* f110140: 0fc54f08 */ jal optionsSetMusicVolume /* f110144: 24045000 */ li $a0,0x5000 -/* f110148: 0c003c3b */ jal 0xf0ec +/* f110148: 0c003c3b */ jal audioSetSoundMode /* f11014c: 24040001 */ li $a0,0x1 /* f110150: 02202025 */ move $a0,$s1 -/* f110154: 0fc54cf7 */ jal 0xf1533dc +/* f110154: 0fc54cf7 */ jal optionsSetControlMode /* f110158: 00002825 */ move $a1,$zero /* f11015c: 02002025 */ move $a0,$s0 -/* f110160: 0fc54cf7 */ jal 0xf1533dc +/* f110160: 0fc54cf7 */ jal optionsSetControlMode /* f110164: 00002825 */ move $a1,$zero /* f110168: 8fb00028 */ lw $s0,0x28($sp) /* f11016c: 26100014 */ addiu $s0,$s0,0x14 -/* f110170: 0fc47c2e */ jal 0xf11f0b8 +/* f110170: 0fc47c2e */ jal savefileClearAllFlags /* f110174: 02002025 */ move $a0,$s0 /* f110178: 00002025 */ move $a0,$zero /* f11017c: 02002825 */ move $a1,$s0 -/* f110180: 0fc47c0b */ jal 0xf11f02c +/* f110180: 0fc47c0b */ jal bitSetByIndex /* f110184: 00003025 */ move $a2,$zero /* f110188: 24040001 */ li $a0,0x1 /* f11018c: 02002825 */ move $a1,$s0 -/* f110190: 0fc47c0b */ jal 0xf11f02c +/* f110190: 0fc47c0b */ jal bitSetByIndex /* f110194: 24060001 */ li $a2,0x1 /* f110198: 24040002 */ li $a0,0x2 /* f11019c: 02002825 */ move $a1,$s0 -/* f1101a0: 0fc47c0b */ jal 0xf11f02c +/* f1101a0: 0fc47c0b */ jal bitSetByIndex /* f1101a4: 00003025 */ move $a2,$zero /* f1101a8: 24040003 */ li $a0,0x3 /* f1101ac: 02002825 */ move $a1,$s0 -/* f1101b0: 0fc47c0b */ jal 0xf11f02c +/* f1101b0: 0fc47c0b */ jal bitSetByIndex /* f1101b4: 24060001 */ li $a2,0x1 /* f1101b8: 24040004 */ li $a0,0x4 /* f1101bc: 02002825 */ move $a1,$s0 -/* f1101c0: 0fc47c0b */ jal 0xf11f02c +/* f1101c0: 0fc47c0b */ jal bitSetByIndex /* f1101c4: 24060001 */ li $a2,0x1 /* f1101c8: 24040005 */ li $a0,0x5 /* f1101cc: 02002825 */ move $a1,$s0 -/* f1101d0: 0fc47c0b */ jal 0xf11f02c +/* f1101d0: 0fc47c0b */ jal bitSetByIndex /* f1101d4: 24060001 */ li $a2,0x1 /* f1101d8: 24040009 */ li $a0,0x9 /* f1101dc: 02002825 */ move $a1,$s0 -/* f1101e0: 0fc47c0b */ jal 0xf11f02c +/* f1101e0: 0fc47c0b */ jal bitSetByIndex /* f1101e4: 24060001 */ li $a2,0x1 /* f1101e8: 2404000a */ li $a0,0xa /* f1101ec: 02002825 */ move $a1,$s0 -/* f1101f0: 0fc47c0b */ jal 0xf11f02c +/* f1101f0: 0fc47c0b */ jal bitSetByIndex /* f1101f4: 24060001 */ li $a2,0x1 /* f1101f8: 2404000b */ li $a0,0xb /* f1101fc: 02002825 */ move $a1,$s0 -/* f110200: 0fc47c0b */ jal 0xf11f02c +/* f110200: 0fc47c0b */ jal bitSetByIndex /* f110204: 24060001 */ li $a2,0x1 /* f110208: 24040015 */ li $a0,0x15 /* f11020c: 02002825 */ move $a1,$s0 -/* f110210: 0fc47c0b */ jal 0xf11f02c +/* f110210: 0fc47c0b */ jal bitSetByIndex /* f110214: 24060001 */ li $a2,0x1 /* f110218: 24040017 */ li $a0,0x17 /* f11021c: 02002825 */ move $a1,$s0 -/* f110220: 0fc47c0b */ jal 0xf11f02c +/* f110220: 0fc47c0b */ jal bitSetByIndex /* f110224: 24060001 */ li $a2,0x1 /* f110228: 2404001a */ li $a0,0x1a /* f11022c: 02002825 */ move $a1,$s0 -/* f110230: 0fc47c0b */ jal 0xf11f02c +/* f110230: 0fc47c0b */ jal bitSetByIndex /* f110234: 00003025 */ move $a2,$zero /* f110238: 24040020 */ li $a0,0x20 /* f11023c: 02002825 */ move $a1,$s0 -/* f110240: 0fc47c0b */ jal 0xf11f02c +/* f110240: 0fc47c0b */ jal bitSetByIndex /* f110244: 00003025 */ move $a2,$zero /* f110248: 2404000c */ li $a0,0xc /* f11024c: 02002825 */ move $a1,$s0 -/* f110250: 0fc47c0b */ jal 0xf11f02c +/* f110250: 0fc47c0b */ jal bitSetByIndex /* f110254: 00003025 */ move $a2,$zero /* f110258: 2404000d */ li $a0,0xd /* f11025c: 02002825 */ move $a1,$s0 -/* f110260: 0fc47c0b */ jal 0xf11f02c +/* f110260: 0fc47c0b */ jal bitSetByIndex /* f110264: 24060001 */ li $a2,0x1 /* f110268: 2404000e */ li $a0,0xe /* f11026c: 02002825 */ move $a1,$s0 -/* f110270: 0fc47c0b */ jal 0xf11f02c +/* f110270: 0fc47c0b */ jal bitSetByIndex /* f110274: 00003025 */ move $a2,$zero /* f110278: 2404000f */ li $a0,0xf /* f11027c: 02002825 */ move $a1,$s0 -/* f110280: 0fc47c0b */ jal 0xf11f02c +/* f110280: 0fc47c0b */ jal bitSetByIndex /* f110284: 24060001 */ li $a2,0x1 /* f110288: 24040010 */ li $a0,0x10 /* f11028c: 02002825 */ move $a1,$s0 -/* f110290: 0fc47c0b */ jal 0xf11f02c +/* f110290: 0fc47c0b */ jal bitSetByIndex /* f110294: 24060001 */ li $a2,0x1 /* f110298: 24040011 */ li $a0,0x11 /* f11029c: 02002825 */ move $a1,$s0 -/* f1102a0: 0fc47c0b */ jal 0xf11f02c +/* f1102a0: 0fc47c0b */ jal bitSetByIndex /* f1102a4: 24060001 */ li $a2,0x1 /* f1102a8: 24040012 */ li $a0,0x12 /* f1102ac: 02002825 */ move $a1,$s0 -/* f1102b0: 0fc47c0b */ jal 0xf11f02c +/* f1102b0: 0fc47c0b */ jal bitSetByIndex /* f1102b4: 24060001 */ li $a2,0x1 /* f1102b8: 24040013 */ li $a0,0x13 /* f1102bc: 02002825 */ move $a1,$s0 -/* f1102c0: 0fc47c0b */ jal 0xf11f02c +/* f1102c0: 0fc47c0b */ jal bitSetByIndex /* f1102c4: 24060001 */ li $a2,0x1 /* f1102c8: 24040014 */ li $a0,0x14 /* f1102cc: 02002825 */ move $a1,$s0 -/* f1102d0: 0fc47c0b */ jal 0xf11f02c +/* f1102d0: 0fc47c0b */ jal bitSetByIndex /* f1102d4: 00003025 */ move $a2,$zero /* f1102d8: 24040016 */ li $a0,0x16 /* f1102dc: 02002825 */ move $a1,$s0 -/* f1102e0: 0fc47c0b */ jal 0xf11f02c +/* f1102e0: 0fc47c0b */ jal bitSetByIndex /* f1102e4: 24060001 */ li $a2,0x1 /* f1102e8: 24040018 */ li $a0,0x18 /* f1102ec: 02002825 */ move $a1,$s0 -/* f1102f0: 0fc47c0b */ jal 0xf11f02c +/* f1102f0: 0fc47c0b */ jal bitSetByIndex /* f1102f4: 24060001 */ li $a2,0x1 /* f1102f8: 2404001b */ li $a0,0x1b /* f1102fc: 02002825 */ move $a1,$s0 -/* f110300: 0fc47c0b */ jal 0xf11f02c +/* f110300: 0fc47c0b */ jal bitSetByIndex /* f110304: 00003025 */ move $a2,$zero /* f110308: 24040021 */ li $a0,0x21 /* f11030c: 02002825 */ move $a1,$s0 -/* f110310: 0fc47c0b */ jal 0xf11f02c +/* f110310: 0fc47c0b */ jal bitSetByIndex /* f110314: 00003025 */ move $a2,$zero /* f110318: 24040019 */ li $a0,0x19 /* f11031c: 02002825 */ move $a1,$s0 -/* f110320: 0fc47c0b */ jal 0xf11f02c +/* f110320: 0fc47c0b */ jal bitSetByIndex /* f110324: 00003025 */ move $a2,$zero /* f110328: 24040007 */ li $a0,0x7 /* f11032c: 02002825 */ move $a1,$s0 -/* f110330: 0fc47c0b */ jal 0xf11f02c +/* f110330: 0fc47c0b */ jal bitSetByIndex /* f110334: 00003025 */ move $a2,$zero /* f110338: 24040008 */ li $a0,0x8 /* f11033c: 02002825 */ move $a1,$s0 -/* f110340: 0fc47c0b */ jal 0xf11f02c +/* f110340: 0fc47c0b */ jal bitSetByIndex /* f110344: 00003025 */ move $a2,$zero /* f110348: 24040006 */ li $a0,0x6 /* f11034c: 02002825 */ move $a1,$s0 -/* f110350: 0fc47c0b */ jal 0xf11f02c +/* f110350: 0fc47c0b */ jal bitSetByIndex /* f110354: 00003025 */ move $a2,$zero /* f110358: 24040022 */ li $a0,0x22 /* f11035c: 02002825 */ move $a1,$s0 -/* f110360: 0fc47c0b */ jal 0xf11f02c +/* f110360: 0fc47c0b */ jal bitSetByIndex /* f110364: 00003025 */ move $a2,$zero /* f110368: 24040040 */ li $a0,0x40 /* f11036c: 02002825 */ move $a1,$s0 -/* f110370: 0fc47c0b */ jal 0xf11f02c +/* f110370: 0fc47c0b */ jal bitSetByIndex /* f110374: 00003025 */ move $a2,$zero /* f110378: 24040041 */ li $a0,0x41 /* f11037c: 02002825 */ move $a1,$s0 -/* f110380: 0fc47c0b */ jal 0xf11f02c +/* f110380: 0fc47c0b */ jal bitSetByIndex /* f110384: 00003025 */ move $a2,$zero /* f110388: 24040042 */ li $a0,0x42 /* f11038c: 02002825 */ move $a1,$s0 -/* f110390: 0fc47c0b */ jal 0xf11f02c +/* f110390: 0fc47c0b */ jal bitSetByIndex /* f110394: 00003025 */ move $a2,$zero /* f110398: 24040043 */ li $a0,0x43 /* f11039c: 02002825 */ move $a1,$s0 -/* f1103a0: 0fc47c0b */ jal 0xf11f02c +/* f1103a0: 0fc47c0b */ jal bitSetByIndex /* f1103a4: 00003025 */ move $a2,$zero /* f1103a8: 2404001c */ li $a0,0x1c /* f1103ac: 02002825 */ move $a1,$s0 -/* f1103b0: 0fc47c0b */ jal 0xf11f02c +/* f1103b0: 0fc47c0b */ jal bitSetByIndex /* f1103b4: 24060001 */ li $a2,0x1 /* f1103b8: 2404001d */ li $a0,0x1d /* f1103bc: 02002825 */ move $a1,$s0 -/* f1103c0: 0fc47c0b */ jal 0xf11f02c +/* f1103c0: 0fc47c0b */ jal bitSetByIndex /* f1103c4: 24060001 */ li $a2,0x1 /* f1103c8: 2404001e */ li $a0,0x1e /* f1103cc: 02002825 */ move $a1,$s0 -/* f1103d0: 0fc47c0b */ jal 0xf11f02c +/* f1103d0: 0fc47c0b */ jal bitSetByIndex /* f1103d4: 24060001 */ li $a2,0x1 /* f1103d8: 2404001f */ li $a0,0x1f /* f1103dc: 02002825 */ move $a1,$s0 -/* f1103e0: 0fc47c0b */ jal 0xf11f02c +/* f1103e0: 0fc47c0b */ jal bitSetByIndex /* f1103e4: 24060001 */ li $a2,0x1 /* f1103e8: 96460482 */ lhu $a2,0x482($s2) /* f1103ec: 3c10800a */ lui $s0,0x800a @@ -701,21 +701,21 @@ glabel savefileLoadDefaults /* f1103f8: 394b0001 */ xori $t3,$t2,0x1 /* f1103fc: 2d660001 */ sltiu $a2,$t3,0x1 /* f110400: 02002825 */ move $a1,$s0 -/* f110404: 0fc47c0b */ jal 0xf11f02c +/* f110404: 0fc47c0b */ jal bitSetByIndex /* f110408: 24040044 */ li $a0,0x44 /* f11040c: 96460482 */ lhu $a2,0x482($s2) /* f110410: 24040045 */ li $a0,0x45 /* f110414: 02002825 */ move $a1,$s0 /* f110418: 30cc0002 */ andi $t4,$a2,0x2 /* f11041c: 398d0002 */ xori $t5,$t4,0x2 -/* f110420: 0fc47c0b */ jal 0xf11f02c +/* f110420: 0fc47c0b */ jal bitSetByIndex /* f110424: 2da60001 */ sltiu $a2,$t5,0x1 /* f110428: 96460482 */ lhu $a2,0x482($s2) /* f11042c: 24040046 */ li $a0,0x46 /* f110430: 02002825 */ move $a1,$s0 /* f110434: 30ce0004 */ andi $t6,$a2,0x4 /* f110438: 39cf0004 */ xori $t7,$t6,0x4 -/* f11043c: 0fc47c0b */ jal 0xf11f02c +/* f11043c: 0fc47c0b */ jal bitSetByIndex /* f110440: 2de60001 */ sltiu $a2,$t7,0x1 /* f110444: 8fa40028 */ lw $a0,0x28($sp) /* f110448: 00009025 */ move $s2,$zero @@ -740,7 +740,7 @@ glabel savefileLoadDefaults /* f110488: 02402025 */ move $a0,$s2 .PF0f11048c: /* f11048c: 02002825 */ move $a1,$s0 -/* f110490: 0fc67543 */ jal 0xf19d50c +/* f110490: 0fc67543 */ jal mpSetChallengeCompletedByAnyPlayerWithNumPlayers /* f110494: 00003025 */ move $a2,$zero /* f110498: 26100001 */ addiu $s0,$s0,0x1 /* f11049c: 5611fffb */ bnel $s0,$s1,.PF0f11048c @@ -749,7 +749,7 @@ glabel savefileLoadDefaults /* f1104a8: 2a41001e */ slti $at,$s2,0x1e /* f1104ac: 5420fff6 */ bnezl $at,.PF0f110488 /* f1104b0: 24100001 */ li $s0,0x1 -/* f1104b4: 0fc67037 */ jal 0xf19c0dc +/* f1104b4: 0fc67037 */ jal mpDetermineUnlockedFeatures /* f1104b8: 00000000 */ nop /* f1104bc: 3c02800a */ lui $v0,0x800a /* f1104c0: 3c03800a */ lui $v1,0x800a @@ -777,7 +777,7 @@ glabel savefileLoadDefaults /* f11050c: 24420001 */ addiu $v0,$v0,0x1 /* f110510: 1443fffe */ bne $v0,$v1,.PF0f11050c /* f110514: a04000b4 */ sb $zero,0xb4($v0) -/* f110518: 0fc43ee5 */ jal 0xf10fb94 +/* f110518: 0fc43ee5 */ jal savefileApplyOptions /* f11051c: 8fa40028 */ lw $a0,0x28($sp) /* f110520: 8fbf0024 */ lw $ra,0x24($sp) /* f110524: 8fb00018 */ lw $s0,0x18($sp) @@ -1218,221 +1218,221 @@ glabel func0f10feac .PF0f110990: /* f110990: 3c018007 */ lui $at,0x8007 /* f110994: ac3460a0 */ sw $s4,0x60a0($at) -/* f110998: 0fc54d0c */ jal 0xf153430 +/* f110998: 0fc54d0c */ jal optionsGetForwardPitch /* f11099c: 02202025 */ move $a0,$s1 /* f1109a0: 3c10800a */ lui $s0,0x800a /* f1109a4: 261027b4 */ addiu $s0,$s0,0x27b4 /* f1109a8: 02002825 */ move $a1,$s0 /* f1109ac: 00002025 */ move $a0,$zero -/* f1109b0: 0fc47c0b */ jal 0xf11f02c +/* f1109b0: 0fc47c0b */ jal bitSetByIndex /* f1109b4: 00403025 */ move $a2,$v0 -/* f1109b8: 0fc54d15 */ jal 0xf153454 +/* f1109b8: 0fc54d15 */ jal optionsGetAutoAim /* f1109bc: 02202025 */ move $a0,$s1 /* f1109c0: 02802025 */ move $a0,$s4 /* f1109c4: 02002825 */ move $a1,$s0 -/* f1109c8: 0fc47c0b */ jal 0xf11f02c +/* f1109c8: 0fc47c0b */ jal bitSetByIndex /* f1109cc: 00403025 */ move $a2,$v0 -/* f1109d0: 0fc54d27 */ jal 0xf15349c +/* f1109d0: 0fc54d27 */ jal optionsGetAimControl /* f1109d4: 02202025 */ move $a0,$s1 /* f1109d8: 24040002 */ li $a0,0x2 /* f1109dc: 02002825 */ move $a1,$s0 -/* f1109e0: 0fc47c0b */ jal 0xf11f02c +/* f1109e0: 0fc47c0b */ jal bitSetByIndex /* f1109e4: 00403025 */ move $a2,$v0 -/* f1109e8: 0fc54d30 */ jal 0xf1534c0 +/* f1109e8: 0fc54d30 */ jal optionsGetSightOnScreen /* f1109ec: 02202025 */ move $a0,$s1 /* f1109f0: 24040003 */ li $a0,0x3 /* f1109f4: 02002825 */ move $a1,$s0 -/* f1109f8: 0fc47c0b */ jal 0xf11f02c +/* f1109f8: 0fc47c0b */ jal bitSetByIndex /* f1109fc: 00403025 */ move $a2,$v0 -/* f110a00: 0fc54d1e */ jal 0xf153478 +/* f110a00: 0fc54d1e */ jal optionsGetLookAhead /* f110a04: 02202025 */ move $a0,$s1 /* f110a08: 24040004 */ li $a0,0x4 /* f110a0c: 02002825 */ move $a1,$s0 -/* f110a10: 0fc47c0b */ jal 0xf11f02c +/* f110a10: 0fc47c0b */ jal bitSetByIndex /* f110a14: 00403025 */ move $a2,$v0 -/* f110a18: 0fc54d39 */ jal 0xf1534e4 +/* f110a18: 0fc54d39 */ jal optionsGetAmmoOnScreen /* f110a1c: 02202025 */ move $a0,$s1 /* f110a20: 24040005 */ li $a0,0x5 /* f110a24: 02002825 */ move $a1,$s0 -/* f110a28: 0fc47c0b */ jal 0xf11f02c +/* f110a28: 0fc47c0b */ jal bitSetByIndex /* f110a2c: 00403025 */ move $a2,$v0 -/* f110a30: 0fc54d75 */ jal 0xf1535d4 +/* f110a30: 0fc54d75 */ jal optionsGetHeadRoll /* f110a34: 02202025 */ move $a0,$s1 /* f110a38: 24040009 */ li $a0,0x9 /* f110a3c: 02002825 */ move $a1,$s0 -/* f110a40: 0fc47c0b */ jal 0xf11f02c +/* f110a40: 0fc47c0b */ jal bitSetByIndex /* f110a44: 00403025 */ move $a2,$v0 -/* f110a48: 0fc54d42 */ jal 0xf153508 +/* f110a48: 0fc54d42 */ jal optionsGetShowGunFunction /* f110a4c: 02202025 */ move $a0,$s1 /* f110a50: 2404000a */ li $a0,0xa /* f110a54: 02002825 */ move $a1,$s0 -/* f110a58: 0fc47c0b */ jal 0xf11f02c +/* f110a58: 0fc47c0b */ jal bitSetByIndex /* f110a5c: 00403025 */ move $a2,$v0 -/* f110a60: 0fc54d4b */ jal 0xf15352c +/* f110a60: 0fc54d4b */ jal optionsGetAlwaysShowTarget /* f110a64: 02202025 */ move $a0,$s1 /* f110a68: 24040015 */ li $a0,0x15 /* f110a6c: 02002825 */ move $a1,$s0 -/* f110a70: 0fc47c0b */ jal 0xf11f02c +/* f110a70: 0fc47c0b */ jal bitSetByIndex /* f110a74: 00403025 */ move $a2,$v0 -/* f110a78: 0fc54d54 */ jal 0xf153550 +/* f110a78: 0fc54d54 */ jal optionsGetShowZoomRange /* f110a7c: 02202025 */ move $a0,$s1 /* f110a80: 24040017 */ li $a0,0x17 /* f110a84: 02002825 */ move $a1,$s0 -/* f110a88: 0fc47c0b */ jal 0xf11f02c +/* f110a88: 0fc47c0b */ jal bitSetByIndex /* f110a8c: 00403025 */ move $a2,$v0 -/* f110a90: 0fc54d66 */ jal 0xf153598 +/* f110a90: 0fc54d66 */ jal optionsGetShowMissionTime /* f110a94: 02202025 */ move $a0,$s1 /* f110a98: 2404001a */ li $a0,0x1a /* f110a9c: 02002825 */ move $a1,$s0 -/* f110aa0: 0fc47c0b */ jal 0xf11f02c +/* f110aa0: 0fc47c0b */ jal bitSetByIndex /* f110aa4: 00403025 */ move $a2,$v0 -/* f110aa8: 0fc54d5d */ jal 0xf153574 +/* f110aa8: 0fc54d5d */ jal optionsGetPaintball /* f110aac: 02202025 */ move $a0,$s1 /* f110ab0: 24040020 */ li $a0,0x20 /* f110ab4: 02002825 */ move $a1,$s0 -/* f110ab8: 0fc47c0b */ jal 0xf11f02c +/* f110ab8: 0fc47c0b */ jal bitSetByIndex /* f110abc: 00403025 */ move $a2,$v0 -/* f110ac0: 0fc54d0c */ jal 0xf153430 +/* f110ac0: 0fc54d0c */ jal optionsGetForwardPitch /* f110ac4: 02602025 */ move $a0,$s3 /* f110ac8: 2404000c */ li $a0,0xc /* f110acc: 02002825 */ move $a1,$s0 -/* f110ad0: 0fc47c0b */ jal 0xf11f02c +/* f110ad0: 0fc47c0b */ jal bitSetByIndex /* f110ad4: 00403025 */ move $a2,$v0 -/* f110ad8: 0fc54d15 */ jal 0xf153454 +/* f110ad8: 0fc54d15 */ jal optionsGetAutoAim /* f110adc: 02602025 */ move $a0,$s3 /* f110ae0: 2404000d */ li $a0,0xd /* f110ae4: 02002825 */ move $a1,$s0 -/* f110ae8: 0fc47c0b */ jal 0xf11f02c +/* f110ae8: 0fc47c0b */ jal bitSetByIndex /* f110aec: 00403025 */ move $a2,$v0 -/* f110af0: 0fc54d27 */ jal 0xf15349c +/* f110af0: 0fc54d27 */ jal optionsGetAimControl /* f110af4: 02602025 */ move $a0,$s3 /* f110af8: 2404000e */ li $a0,0xe /* f110afc: 02002825 */ move $a1,$s0 -/* f110b00: 0fc47c0b */ jal 0xf11f02c +/* f110b00: 0fc47c0b */ jal bitSetByIndex /* f110b04: 00403025 */ move $a2,$v0 -/* f110b08: 0fc54d30 */ jal 0xf1534c0 +/* f110b08: 0fc54d30 */ jal optionsGetSightOnScreen /* f110b0c: 02602025 */ move $a0,$s3 /* f110b10: 2404000f */ li $a0,0xf /* f110b14: 02002825 */ move $a1,$s0 -/* f110b18: 0fc47c0b */ jal 0xf11f02c +/* f110b18: 0fc47c0b */ jal bitSetByIndex /* f110b1c: 00403025 */ move $a2,$v0 -/* f110b20: 0fc54d1e */ jal 0xf153478 +/* f110b20: 0fc54d1e */ jal optionsGetLookAhead /* f110b24: 02602025 */ move $a0,$s3 /* f110b28: 24040010 */ li $a0,0x10 /* f110b2c: 02002825 */ move $a1,$s0 -/* f110b30: 0fc47c0b */ jal 0xf11f02c +/* f110b30: 0fc47c0b */ jal bitSetByIndex /* f110b34: 00403025 */ move $a2,$v0 -/* f110b38: 0fc54d39 */ jal 0xf1534e4 +/* f110b38: 0fc54d39 */ jal optionsGetAmmoOnScreen /* f110b3c: 02602025 */ move $a0,$s3 /* f110b40: 24040011 */ li $a0,0x11 /* f110b44: 02002825 */ move $a1,$s0 -/* f110b48: 0fc47c0b */ jal 0xf11f02c +/* f110b48: 0fc47c0b */ jal bitSetByIndex /* f110b4c: 00403025 */ move $a2,$v0 -/* f110b50: 0fc54d75 */ jal 0xf1535d4 +/* f110b50: 0fc54d75 */ jal optionsGetHeadRoll /* f110b54: 02602025 */ move $a0,$s3 /* f110b58: 24040012 */ li $a0,0x12 /* f110b5c: 02002825 */ move $a1,$s0 -/* f110b60: 0fc47c0b */ jal 0xf11f02c +/* f110b60: 0fc47c0b */ jal bitSetByIndex /* f110b64: 00403025 */ move $a2,$v0 -/* f110b68: 0fc54d42 */ jal 0xf153508 +/* f110b68: 0fc54d42 */ jal optionsGetShowGunFunction /* f110b6c: 02602025 */ move $a0,$s3 /* f110b70: 24040013 */ li $a0,0x13 /* f110b74: 02002825 */ move $a1,$s0 -/* f110b78: 0fc47c0b */ jal 0xf11f02c +/* f110b78: 0fc47c0b */ jal bitSetByIndex /* f110b7c: 00403025 */ move $a2,$v0 -/* f110b80: 0fc54d4b */ jal 0xf15352c +/* f110b80: 0fc54d4b */ jal optionsGetAlwaysShowTarget /* f110b84: 02602025 */ move $a0,$s3 /* f110b88: 24040016 */ li $a0,0x16 /* f110b8c: 02002825 */ move $a1,$s0 -/* f110b90: 0fc47c0b */ jal 0xf11f02c +/* f110b90: 0fc47c0b */ jal bitSetByIndex /* f110b94: 00403025 */ move $a2,$v0 -/* f110b98: 0fc54d54 */ jal 0xf153550 +/* f110b98: 0fc54d54 */ jal optionsGetShowZoomRange /* f110b9c: 02602025 */ move $a0,$s3 /* f110ba0: 24040018 */ li $a0,0x18 /* f110ba4: 02002825 */ move $a1,$s0 -/* f110ba8: 0fc47c0b */ jal 0xf11f02c +/* f110ba8: 0fc47c0b */ jal bitSetByIndex /* f110bac: 00403025 */ move $a2,$v0 -/* f110bb0: 0fc54d66 */ jal 0xf153598 +/* f110bb0: 0fc54d66 */ jal optionsGetShowMissionTime /* f110bb4: 02602025 */ move $a0,$s3 /* f110bb8: 2404001b */ li $a0,0x1b /* f110bbc: 02002825 */ move $a1,$s0 -/* f110bc0: 0fc47c0b */ jal 0xf11f02c +/* f110bc0: 0fc47c0b */ jal bitSetByIndex /* f110bc4: 00403025 */ move $a2,$v0 -/* f110bc8: 0fc54d5d */ jal 0xf153574 +/* f110bc8: 0fc54d5d */ jal optionsGetPaintball /* f110bcc: 02602025 */ move $a0,$s3 /* f110bd0: 24040021 */ li $a0,0x21 /* f110bd4: 02002825 */ move $a1,$s0 -/* f110bd8: 0fc47c0b */ jal 0xf11f02c +/* f110bd8: 0fc47c0b */ jal bitSetByIndex /* f110bdc: 00403025 */ move $a2,$v0 -/* f110be0: 0fc54ef9 */ jal 0xf153be4 +/* f110be0: 0fc54ef9 */ jal optionsGetScreenSplit /* f110be4: 00000000 */ nop /* f110be8: 24040019 */ li $a0,0x19 /* f110bec: 02002825 */ move $a1,$s0 -/* f110bf0: 0fc47c0b */ jal 0xf11f02c +/* f110bf0: 0fc47c0b */ jal bitSetByIndex /* f110bf4: 00403025 */ move $a2,$v0 -/* f110bf8: 0fc54ef3 */ jal 0xf153bcc +/* f110bf8: 0fc54ef3 */ jal optionsGetScreenRatio /* f110bfc: 00000000 */ nop /* f110c00: 24040007 */ li $a0,0x7 /* f110c04: 02002825 */ move $a1,$s0 -/* f110c08: 0fc47c0b */ jal 0xf11f02c +/* f110c08: 0fc47c0b */ jal bitSetByIndex /* f110c0c: 00403025 */ move $a2,$v0 -/* f110c10: 0fc54eed */ jal 0xf153bb4 +/* f110c10: 0fc54eed */ jal optionsGetScreenSize /* f110c14: 00000000 */ nop /* f110c18: 00543026 */ xor $a2,$v0,$s4 /* f110c1c: 2cc60001 */ sltiu $a2,$a2,0x1 /* f110c20: 24040006 */ li $a0,0x6 -/* f110c24: 0fc47c0b */ jal 0xf11f02c +/* f110c24: 0fc47c0b */ jal bitSetByIndex /* f110c28: 02002825 */ move $a1,$s0 -/* f110c2c: 0fc54eed */ jal 0xf153bb4 +/* f110c2c: 0fc54eed */ jal optionsGetScreenSize /* f110c30: 00000000 */ nop /* f110c34: 24150002 */ li $s5,0x2 /* f110c38: 00553026 */ xor $a2,$v0,$s5 /* f110c3c: 2cc60001 */ sltiu $a2,$a2,0x1 /* f110c40: 24040008 */ li $a0,0x8 -/* f110c44: 0fc47c0b */ jal 0xf11f02c +/* f110c44: 0fc47c0b */ jal bitSetByIndex /* f110c48: 02002825 */ move $a1,$s0 /* f110c4c: 3c188007 */ lui $t8,0x8007 /* f110c50: 8f1809a8 */ lw $t8,0x9a8($t8) /* f110c54: 24040022 */ li $a0,0x22 /* f110c58: 02002825 */ move $a1,$s0 /* f110c5c: 02983026 */ xor $a2,$s4,$t8 -/* f110c60: 0fc47c0b */ jal 0xf11f02c +/* f110c60: 0fc47c0b */ jal bitSetByIndex /* f110c64: 2cc60001 */ sltiu $a2,$a2,0x1 -/* f110c68: 0fc54d6f */ jal 0xf1535bc +/* f110c68: 0fc54d6f */ jal optionsGetInGameSubtitles /* f110c6c: 00000000 */ nop /* f110c70: 2404000b */ li $a0,0xb /* f110c74: 02002825 */ move $a1,$s0 -/* f110c78: 0fc47c0b */ jal 0xf11f02c +/* f110c78: 0fc47c0b */ jal bitSetByIndex /* f110c7c: 00403025 */ move $a2,$v0 -/* f110c80: 0fc54d72 */ jal 0xf1535c8 +/* f110c80: 0fc54d72 */ jal optionsGetCutsceneSubtitles /* f110c84: 00000000 */ nop /* f110c88: 24040014 */ li $a0,0x14 /* f110c8c: 02002825 */ move $a1,$s0 -/* f110c90: 0fc47c0b */ jal 0xf11f02c +/* f110c90: 0fc47c0b */ jal bitSetByIndex /* f110c94: 00403025 */ move $a2,$v0 /* f110c98: 24040040 */ li $a0,0x40 /* f110c9c: 02002825 */ move $a1,$s0 -/* f110ca0: 0fc47c0b */ jal 0xf11f02c +/* f110ca0: 0fc47c0b */ jal bitSetByIndex /* f110ca4: 924604e3 */ lbu $a2,0x4e3($s2) -/* f110ca8: 0fc676f5 */ jal 0xf19dbd4 +/* f110ca8: 0fc676f5 */ jal frIsWeaponFound /* f110cac: 24040020 */ li $a0,0x20 /* f110cb0: 24040041 */ li $a0,0x41 /* f110cb4: 02002825 */ move $a1,$s0 -/* f110cb8: 0fc47c0b */ jal 0xf11f02c +/* f110cb8: 0fc47c0b */ jal bitSetByIndex /* f110cbc: 00403025 */ move $a2,$v0 -/* f110cc0: 0fc676f5 */ jal 0xf19dbd4 +/* f110cc0: 0fc676f5 */ jal frIsWeaponFound /* f110cc4: 24040021 */ li $a0,0x21 /* f110cc8: 24040042 */ li $a0,0x42 /* f110ccc: 02002825 */ move $a1,$s0 -/* f110cd0: 0fc47c0b */ jal 0xf11f02c +/* f110cd0: 0fc47c0b */ jal bitSetByIndex /* f110cd4: 00403025 */ move $a2,$v0 -/* f110cd8: 0fc676f5 */ jal 0xf19dbd4 +/* f110cd8: 0fc676f5 */ jal frIsWeaponFound /* f110cdc: 24040022 */ li $a0,0x22 /* f110ce0: 24040043 */ li $a0,0x43 /* f110ce4: 02002825 */ move $a1,$s0 -/* f110ce8: 0fc47c0b */ jal 0xf11f02c +/* f110ce8: 0fc47c0b */ jal bitSetByIndex /* f110cec: 00403025 */ move $a2,$v0 -/* f110cf0: 0fc54eed */ jal 0xf153bb4 +/* f110cf0: 0fc54eed */ jal optionsGetScreenSize /* f110cf4: 00000000 */ nop /* f110cf8: 50400002 */ beqzl $v0,.PF0f110d04 /* f110cfc: 8e590450 */ lw $t9,0x450($s2) @@ -1441,78 +1441,78 @@ glabel func0f10feac /* f110d04: 2404001f */ li $a0,0x1f /* f110d08: 02002825 */ move $a1,$s0 /* f110d0c: 02993026 */ xor $a2,$s4,$t9 -/* f110d10: 0fc47c0b */ jal 0xf11f02c +/* f110d10: 0fc47c0b */ jal bitSetByIndex /* f110d14: 2cc60001 */ sltiu $a2,$a2,0x1 /* f110d18: 8e480448 */ lw $t0,0x448($s2) /* f110d1c: 2404001c */ li $a0,0x1c /* f110d20: 02002825 */ move $a1,$s0 /* f110d24: 02883026 */ xor $a2,$s4,$t0 -/* f110d28: 0fc47c0b */ jal 0xf11f02c +/* f110d28: 0fc47c0b */ jal bitSetByIndex /* f110d2c: 2cc60001 */ sltiu $a2,$a2,0x1 /* f110d30: 8e490454 */ lw $t1,0x454($s2) /* f110d34: 2404001d */ li $a0,0x1d /* f110d38: 02002825 */ move $a1,$s0 /* f110d3c: 02893026 */ xor $a2,$s4,$t1 -/* f110d40: 0fc47c0b */ jal 0xf11f02c +/* f110d40: 0fc47c0b */ jal bitSetByIndex /* f110d44: 2cc60001 */ sltiu $a2,$a2,0x1 /* f110d48: 8e4a044c */ lw $t2,0x44c($s2) /* f110d4c: 2404001e */ li $a0,0x1e /* f110d50: 02002825 */ move $a1,$s0 /* f110d54: 028a3026 */ xor $a2,$s4,$t2 -/* f110d58: 0fc47c0b */ jal 0xf11f02c +/* f110d58: 0fc47c0b */ jal bitSetByIndex /* f110d5c: 2cc60001 */ sltiu $a2,$a2,0x1 /* f110d60: 964b0482 */ lhu $t3,0x482($s2) /* f110d64: 24040044 */ li $a0,0x44 /* f110d68: 02002825 */ move $a1,$s0 /* f110d6c: 316c0001 */ andi $t4,$t3,0x1 /* f110d70: 028c3026 */ xor $a2,$s4,$t4 -/* f110d74: 0fc47c0b */ jal 0xf11f02c +/* f110d74: 0fc47c0b */ jal bitSetByIndex /* f110d78: 2cc60001 */ sltiu $a2,$a2,0x1 /* f110d7c: 964d0482 */ lhu $t5,0x482($s2) /* f110d80: 24040045 */ li $a0,0x45 /* f110d84: 02002825 */ move $a1,$s0 /* f110d88: 31ae0002 */ andi $t6,$t5,0x2 /* f110d8c: 02ae3026 */ xor $a2,$s5,$t6 -/* f110d90: 0fc47c0b */ jal 0xf11f02c +/* f110d90: 0fc47c0b */ jal bitSetByIndex /* f110d94: 2cc60001 */ sltiu $a2,$a2,0x1 /* f110d98: 96460482 */ lhu $a2,0x482($s2) /* f110d9c: 24040046 */ li $a0,0x46 /* f110da0: 02002825 */ move $a1,$s0 /* f110da4: 30cf0004 */ andi $t7,$a2,0x4 /* f110da8: 39f80004 */ xori $t8,$t7,0x4 -/* f110dac: 0fc47c0b */ jal 0xf11f02c +/* f110dac: 0fc47c0b */ jal bitSetByIndex /* f110db0: 2f060001 */ sltiu $a2,$t8,0x1 /* f110db4: 8fb90148 */ lw $t9,0x148($sp) /* f110db8: 27b4004c */ addiu $s4,$sp,0x4c /* f110dbc: 2402ffff */ li $v0,-1 /* f110dc0: 072000b6 */ bltz $t9,.PF0f11109c /* f110dc4: 00000000 */ nop -/* f110dc8: 0fc3567f */ jal 0xf0d59fc +/* f110dc8: 0fc3567f */ jal func0f0d545c /* f110dcc: 02802025 */ move $a0,$s4 /* f110dd0: 3c12800a */ lui $s2,0x800a /* f110dd4: 265227a0 */ addiu $s2,$s2,0x27a0 /* f110dd8: 02402825 */ move $a1,$s2 -/* f110ddc: 0fc356d1 */ jal 0xf0d5b44 +/* f110ddc: 0fc356d1 */ jal func0f0d55a4 /* f110de0: 02802025 */ move $a0,$s4 /* f110de4: 9245000b */ lbu $a1,0xb($s2) /* f110de8: 02802025 */ move $a0,$s4 /* f110dec: 24060005 */ li $a2,0x5 /* f110df0: 000540c2 */ srl $t0,$a1,0x3 -/* f110df4: 0fc35626 */ jal 0xf0d5898 +/* f110df4: 0fc35626 */ jal savefileGetSomething /* f110df8: 01002825 */ move $a1,$t0 /* f110dfc: 02802025 */ move $a0,$s4 /* f110e00: 8e450010 */ lw $a1,0x10($s2) -/* f110e04: 0fc35626 */ jal 0xf0d5898 +/* f110e04: 0fc35626 */ jal savefileGetSomething /* f110e08: 24060020 */ li $a2,0x20 /* f110e0c: 8e450008 */ lw $a1,0x8($s2) /* f110e10: 02802025 */ move $a0,$s4 /* f110e14: 24060002 */ li $a2,0x2 /* f110e18: 30a90007 */ andi $t1,$a1,0x7 -/* f110e1c: 0fc35626 */ jal 0xf0d5898 +/* f110e1c: 0fc35626 */ jal savefileGetSomething /* f110e20: 01202825 */ move $a1,$t1 /* f110e24: 02802025 */ move $a0,$s4 /* f110e28: 9245000c */ lbu $a1,0xc($s2) -/* f110e2c: 0fc35626 */ jal 0xf0d5898 +/* f110e2c: 0fc35626 */ jal savefileGetSomething /* f110e30: 24060005 */ li $a2,0x5 /* f110e34: 3c028006 */ lui $v0,0x8006 /* f110e38: 9442da68 */ lhu $v0,-0x2598($v0) @@ -1527,32 +1527,32 @@ glabel func0f10feac .PF0f110e5c: /* f110e5c: 000729c3 */ sra $a1,$a3,0x7 /* f110e60: 00055082 */ srl $t2,$a1,0x2 -/* f110e64: 0fc35626 */ jal 0xf0d5898 +/* f110e64: 0fc35626 */ jal savefileGetSomething /* f110e68: 01402825 */ move $a1,$t2 -/* f110e6c: 0fc54f00 */ jal 0xf153c00 +/* f110e6c: 0fc54f00 */ jal optionsGetMusicVolume /* f110e70: 00000000 */ nop /* f110e74: 000229c3 */ sra $a1,$v0,0x7 /* f110e78: 00055882 */ srl $t3,$a1,0x2 /* f110e7c: 01602825 */ move $a1,$t3 /* f110e80: 02802025 */ move $a0,$s4 -/* f110e84: 0fc35626 */ jal 0xf0d5898 +/* f110e84: 0fc35626 */ jal savefileGetSomething /* f110e88: 24060006 */ li $a2,0x6 /* f110e8c: 3c058006 */ lui $a1,0x8006 /* f110e90: 8ca5da6c */ lw $a1,-0x2594($a1) /* f110e94: 02802025 */ move $a0,$s4 -/* f110e98: 0fc35626 */ jal 0xf0d5898 +/* f110e98: 0fc35626 */ jal savefileGetSomething /* f110e9c: 24060002 */ li $a2,0x2 -/* f110ea0: 0fc54cf0 */ jal 0xf1533c0 +/* f110ea0: 0fc54cf0 */ jal optionsGetControlMode /* f110ea4: 02202025 */ move $a0,$s1 /* f110ea8: 02802025 */ move $a0,$s4 /* f110eac: 00402825 */ move $a1,$v0 -/* f110eb0: 0fc35626 */ jal 0xf0d5898 +/* f110eb0: 0fc35626 */ jal savefileGetSomething /* f110eb4: 24060003 */ li $a2,0x3 -/* f110eb8: 0fc54cf0 */ jal 0xf1533c0 +/* f110eb8: 0fc54cf0 */ jal optionsGetControlMode /* f110ebc: 02602025 */ move $a0,$s3 /* f110ec0: 02802025 */ move $a0,$s4 /* f110ec4: 00402825 */ move $a1,$v0 -/* f110ec8: 0fc35626 */ jal 0xf0d5898 +/* f110ec8: 0fc35626 */ jal savefileGetSomething /* f110ecc: 24060003 */ li $a2,0x3 /* f110ed0: 3c10800a */ lui $s0,0x800a /* f110ed4: 3c11800a */ lui $s1,0x800a @@ -1561,7 +1561,7 @@ glabel func0f10feac /* f110ee0: 02802025 */ move $a0,$s4 .PF0f110ee4: /* f110ee4: 92050014 */ lbu $a1,0x14($s0) -/* f110ee8: 0fc35626 */ jal 0xf0d5898 +/* f110ee8: 0fc35626 */ jal savefileGetSomething /* f110eec: 24060008 */ li $a2,0x8 /* f110ef0: 26100001 */ addiu $s0,$s0,0x1 /* f110ef4: 0211082b */ sltu $at,$s0,$s1 @@ -1569,7 +1569,7 @@ glabel func0f10feac /* f110efc: 02802025 */ move $a0,$s4 /* f110f00: 02802025 */ move $a0,$s4 /* f110f04: 9645001e */ lhu $a1,0x1e($s2) -/* f110f08: 0fc35626 */ jal 0xf0d5898 +/* f110f08: 0fc35626 */ jal savefileGetSomething /* f110f0c: 24060010 */ li $a2,0x10 /* f110f10: 3c15800a */ lui $s5,0x800a /* f110f14: 26b527a0 */ addiu $s5,$s5,0x27a0 @@ -1580,7 +1580,7 @@ glabel func0f10feac .PF0f110f24: /* f110f24: 02802025 */ move $a0,$s4 /* f110f28: 96450020 */ lhu $a1,0x20($s2) -/* f110f2c: 0fc35626 */ jal 0xf0d5898 +/* f110f2c: 0fc35626 */ jal savefileGetSomething /* f110f30: 2406000c */ li $a2,0xc /* f110f34: 26310002 */ addiu $s1,$s1,0x2 /* f110f38: 1633fffa */ bne $s1,$s3,.PF0f110f24 @@ -1597,11 +1597,11 @@ glabel func0f10feac .PF0f110f64: /* f110f64: 02202025 */ move $a0,$s1 .PF0f110f68: -/* f110f68: 0fc67537 */ jal 0xf19d4dc +/* f110f68: 0fc67537 */ jal mpIsChallengeCompletedByAnyPlayerWithNumPlayers /* f110f6c: 02002825 */ move $a1,$s0 /* f110f70: 02802025 */ move $a0,$s4 /* f110f74: 00402825 */ move $a1,$v0 -/* f110f78: 0fc35626 */ jal 0xf0d5898 +/* f110f78: 0fc35626 */ jal savefileGetSomething /* f110f7c: 24060001 */ li $a2,0x1 /* f110f80: 26100001 */ addiu $s0,$s0,0x1 /* f110f84: 5612fff8 */ bnel $s0,$s2,.PF0f110f68 @@ -1617,7 +1617,7 @@ glabel func0f10feac /* f110fac: 02802025 */ move $a0,$s4 .PF0f110fb0: /* f110fb0: 8e0500a0 */ lw $a1,0xa0($s0) -/* f110fb4: 0fc35626 */ jal 0xf0d5898 +/* f110fb4: 0fc35626 */ jal savefileGetSomething /* f110fb8: 24060015 */ li $a2,0x15 /* f110fbc: 26100004 */ addiu $s0,$s0,0x4 /* f110fc0: 0211082b */ sltu $at,$s0,$s1 @@ -1638,7 +1638,7 @@ glabel func0f10feac /* f110ff4: 24070008 */ li $a3,0x8 .PF0f110ff8: /* f110ff8: 920500ac */ lbu $a1,0xac($s0) -/* f110ffc: 0fc35626 */ jal 0xf0d5898 +/* f110ffc: 0fc35626 */ jal savefileGetSomething /* f111000: 00e03025 */ move $a2,$a3 /* f111004: 26100001 */ addiu $s0,$s0,0x1 /* f111008: 0212082b */ sltu $at,$s0,$s2 @@ -1651,12 +1651,12 @@ glabel func0f10feac /* f111024: 02802025 */ move $a0,$s4 .PF0f111028: /* f111028: 920500b5 */ lbu $a1,0xb5($s0) -/* f11102c: 0fc35626 */ jal 0xf0d5898 +/* f11102c: 0fc35626 */ jal savefileGetSomething /* f111030: 24060008 */ li $a2,0x8 /* f111034: 26100001 */ addiu $s0,$s0,0x1 /* f111038: 5611fffb */ bnel $s0,$s1,.PF0f111028 /* f11103c: 02802025 */ move $a0,$s4 -/* f111040: 0fc35699 */ jal 0xf0d5a64 +/* f111040: 0fc35699 */ jal func0f0d54c4 /* f111044: 02802025 */ move $a0,$s4 /* f111048: 27ad0140 */ addiu $t5,$sp,0x140 /* f11104c: afad0010 */ sw $t5,0x10($sp) @@ -1664,7 +1664,7 @@ glabel func0f10feac /* f111054: 8fa5014c */ lw $a1,0x14c($sp) /* f111058: 24060080 */ li $a2,0x80 /* f11105c: 27a70050 */ addiu $a3,$sp,0x50 -/* f111060: 0fc45cc2 */ jal 0xf117308 +/* f111060: 0fc45cc2 */ jal func0f116828 /* f111064: afa00014 */ sw $zero,0x14($sp) /* f111068: 3c01800a */ lui $at,0x800a /* f11106c: 14400009 */ bnez $v0,.PF0f111094 diff --git a/src/game/hudmsg.c b/src/game/hudmsg.c index 8565b5497..aef0638e2 100644 --- a/src/game/hudmsg.c +++ b/src/game/hudmsg.c @@ -828,9 +828,9 @@ glabel hudRenderZoomRange /* f0dd290: afbf003c */ sw $ra,0x3c($sp) /* f0dd294: afb00038 */ sw $s0,0x38($sp) /* f0dd298: afa400c0 */ sw $a0,0xc0($sp) -/* f0dd29c: 0c002f44 */ jal 0xbd10 +/* f0dd29c: 0c002f44 */ jal viGetViewTop /* f0dd2a0: afa500c4 */ sw $a1,0xc4($sp) -/* f0dd2a4: 0c002f40 */ jal 0xbd00 +/* f0dd2a4: 0c002f40 */ jal viGetViewLeft /* f0dd2a8: afa200bc */ sw $v0,0xbc($sp) /* f0dd2ac: 3c108008 */ lui $s0,%hi(g_ScaleX) /* f0dd2b0: 2610fac0 */ addiu $s0,$s0,%lo(g_ScaleX) @@ -849,7 +849,7 @@ glabel hudRenderZoomRange /* f0dd2e0: 00000000 */ nop /* f0dd2e4: 0006000d */ break 0x6 .L0f0dd2e8_2: -/* f0dd2e8: 0c002f22 */ jal 0xbc88 +/* f0dd2e8: 0c002f22 */ jal viGetViewWidth /* f0dd2ec: 00000000 */ nop /* f0dd2f0: 8e180000 */ lw $t8,0x0($s0) /* f0dd2f4: 0058001a */ div $zero,$v0,$t8 @@ -867,7 +867,7 @@ glabel hudRenderZoomRange /* f0dd320: 0006000d */ break 0x6 .L0f0dd324_2: /* f0dd324: afa900b4 */ sw $t1,0xb4($sp) -/* f0dd328: 0c002f26 */ jal 0xbc98 +/* f0dd328: 0c002f26 */ jal viGetViewHeight /* f0dd32c: 00000000 */ nop /* f0dd330: 3c06800a */ lui $a2,%hi(g_Vars) /* f0dd334: 3c013f80 */ lui $at,0x3f80 @@ -911,7 +911,7 @@ glabel hudRenderZoomRange /* f0dd3b8: afa30058 */ sw $v1,0x58($sp) /* f0dd3bc: afa4005c */ sw $a0,0x5c($sp) /* f0dd3c0: afa50054 */ sw $a1,0x54($sp) -/* f0dd3c4: 0fc24211 */ jal 0xf090844 +/* f0dd3c4: 0fc24211 */ jal countdownTimerIsHidden /* f0dd3c8: afa70050 */ sw $a3,0x50($sp) /* f0dd3cc: 3c06800a */ lui $a2,%hi(g_Vars) /* f0dd3d0: 24c69fc0 */ addiu $a2,$a2,%lo(g_Vars) @@ -932,7 +932,7 @@ glabel hudRenderZoomRange /* f0dd408: 24010001 */ addiu $at,$zero,0x1 /* f0dd40c: 1141000a */ beq $t2,$at,.L0f0dd438_2 /* f0dd410: 00000000 */ nop -/* f0dd414: 0fc54b41 */ jal 0xf152d04 +/* f0dd414: 0fc54b41 */ jal optionsGetScreenSplit /* f0dd418: 00000000 */ nop /* f0dd41c: 3c06800a */ lui $a2,%hi(g_Vars) /* f0dd420: 24010001 */ addiu $at,$zero,0x1 @@ -961,13 +961,13 @@ glabel hudRenderZoomRange /* f0dd46c: 10000006 */ b .L0f0dd488_2 /* f0dd470: 26100002 */ addiu $s0,$s0,0x2 .L0f0dd474_2: -/* f0dd474: 0fc54ad4 */ jal 0xf152b50 +/* f0dd474: 0fc54ad4 */ jal optionsGetEffectiveScreenSize /* f0dd478: 00000000 */ nop /* f0dd47c: 10400002 */ beqz $v0,.L0f0dd488_2 /* f0dd480: 00000000 */ nop /* f0dd484: 26100008 */ addiu $s0,$s0,0x8 .L0f0dd488_2: -/* f0dd488: 0fc2c536 */ jal 0xf0b14d8 +/* f0dd488: 0fc2c536 */ jal currentPlayerGetGunZoomFov /* f0dd48c: 00000000 */ nop /* f0dd490: 44803000 */ mtc1 $zero,$f6 /* f0dd494: 3c06800a */ lui $a2,%hi(g_Vars) @@ -1012,7 +1012,7 @@ glabel hudRenderZoomRange /* f0dd520: 24c6dc4c */ addiu $a2,$a2,-9140 /* f0dd524: 24a5dc40 */ addiu $a1,$a1,-9152 /* f0dd528: f7a80010 */ sdc1 $f8,0x10($sp) -/* f0dd52c: 0c004dad */ jal 0x136b4 +/* f0dd52c: 0c004dad */ jal sprintf /* f0dd530: 27a40084 */ addiu $a0,$sp,0x84 /* f0dd534: 3c0f8008 */ lui $t7,%hi(g_FontNumeric2) /* f0dd538: 8deffafc */ lw $t7,%lo(g_FontNumeric2)($t7) @@ -1022,7 +1022,7 @@ glabel hudRenderZoomRange /* f0dd548: 27a50070 */ addiu $a1,$sp,0x70 /* f0dd54c: 27a60084 */ addiu $a2,$sp,0x84 /* f0dd550: afa00014 */ sw $zero,0x14($sp) -/* f0dd554: 0fc55c32 */ jal 0xf1570c8 +/* f0dd554: 0fc55c32 */ jal textMeasure /* f0dd558: afaf0010 */ sw $t7,0x10($sp) /* f0dd55c: 8fb800b8 */ lw $t8,0xb8($sp) /* f0dd560: 8fb900b4 */ lw $t9,0xb4($sp) @@ -1043,11 +1043,11 @@ glabel hudRenderZoomRange /* f0dd59c: 8fa400c0 */ lw $a0,0xc0($sp) /* f0dd5a0: 27a50078 */ addiu $a1,$sp,0x78 /* f0dd5a4: 27a60074 */ addiu $a2,$sp,0x74 -/* f0dd5a8: 0fc54dad */ jal 0xf1536b4 +/* f0dd5a8: 0fc54dad */ jal func0f1538e4 /* f0dd5ac: 27a70068 */ addiu $a3,$sp,0x68 -/* f0dd5b0: 0c002f02 */ jal 0xbc08 +/* f0dd5b0: 0c002f02 */ jal viGetWidth /* f0dd5b4: afa200c0 */ sw $v0,0xc0($sp) -/* f0dd5b8: 0c002f06 */ jal 0xbc18 +/* f0dd5b8: 0c002f06 */ jal viGetHeight /* f0dd5bc: a7a2004c */ sh $v0,0x4c($sp) /* f0dd5c0: 8fa300c4 */ lw $v1,0xc4($sp) /* f0dd5c4: 240100ff */ addiu $at,$zero,0xff @@ -1076,12 +1076,12 @@ glabel hudRenderZoomRange /* f0dd620: afa0002c */ sw $zero,0x2c($sp) /* f0dd624: afae0014 */ sw $t6,0x14($sp) /* f0dd628: afad0010 */ sw $t5,0x10($sp) -/* f0dd62c: 0fc55b06 */ jal 0xf156c18 +/* f0dd62c: 0fc55b06 */ jal textRender /* f0dd630: afaa0020 */ sw $t2,0x20($sp) /* f0dd634: 3c057f1b */ lui $a1,0x7f1b /* f0dd638: afa200c0 */ sw $v0,0xc0($sp) /* f0dd63c: 24a5dc54 */ addiu $a1,$a1,-9132 -/* f0dd640: 0c004dad */ jal 0x136b4 +/* f0dd640: 0c004dad */ jal sprintf /* f0dd644: 27a40084 */ addiu $a0,$sp,0x84 /* f0dd648: 3c0b8008 */ lui $t3,%hi(g_FontNumeric2) /* f0dd64c: 8d6bfafc */ lw $t3,%lo(g_FontNumeric2)($t3) @@ -1091,7 +1091,7 @@ glabel hudRenderZoomRange /* f0dd65c: 27a50070 */ addiu $a1,$sp,0x70 /* f0dd660: 27a60084 */ addiu $a2,$sp,0x84 /* f0dd664: afa00014 */ sw $zero,0x14($sp) -/* f0dd668: 0fc55c32 */ jal 0xf1570c8 +/* f0dd668: 0fc55c32 */ jal textMeasure /* f0dd66c: afab0010 */ sw $t3,0x10($sp) /* f0dd670: 8fa80070 */ lw $t0,0x70($sp) /* f0dd674: 8fac0044 */ lw $t4,0x44($sp) @@ -1109,11 +1109,11 @@ glabel hudRenderZoomRange /* f0dd6a4: 8fa400c0 */ lw $a0,0xc0($sp) /* f0dd6a8: 27a50078 */ addiu $a1,$sp,0x78 /* f0dd6ac: 27a60074 */ addiu $a2,$sp,0x74 -/* f0dd6b0: 0fc54dad */ jal 0xf1536b4 +/* f0dd6b0: 0fc54dad */ jal func0f1538e4 /* f0dd6b4: 27a70068 */ addiu $a3,$sp,0x68 -/* f0dd6b8: 0c002f02 */ jal 0xbc08 +/* f0dd6b8: 0c002f02 */ jal viGetWidth /* f0dd6bc: afa200c0 */ sw $v0,0xc0($sp) -/* f0dd6c0: 0c002f06 */ jal 0xbc18 +/* f0dd6c0: 0c002f06 */ jal viGetHeight /* f0dd6c4: a7a2004c */ sh $v0,0x4c($sp) /* f0dd6c8: 3c098008 */ lui $t1,%hi(g_FontNumeric1) /* f0dd6cc: 3c0a8008 */ lui $t2,%hi(g_FontNumeric2) @@ -1133,7 +1133,7 @@ glabel hudRenderZoomRange /* f0dd704: afaa0014 */ sw $t2,0x14($sp) /* f0dd708: afa90010 */ sw $t1,0x10($sp) /* f0dd70c: afab0018 */ sw $t3,0x18($sp) -/* f0dd710: 0fc55b06 */ jal 0xf156c18 +/* f0dd710: 0fc55b06 */ jal textRender /* f0dd714: afad0020 */ sw $t5,0x20($sp) /* f0dd718: c7aa009c */ lwc1 $f10,0x9c($sp) /* f0dd71c: 3c057f1b */ lui $a1,0x7f1b @@ -1145,7 +1145,7 @@ glabel hudRenderZoomRange /* f0dd734: f7b20010 */ sdc1 $f18,0x10($sp) /* f0dd738: 24c6dc64 */ addiu $a2,$a2,-9116 /* f0dd73c: 24a5dc58 */ addiu $a1,$a1,-9128 -/* f0dd740: 0c004dad */ jal 0x136b4 +/* f0dd740: 0c004dad */ jal sprintf /* f0dd744: 27a40084 */ addiu $a0,$sp,0x84 /* f0dd748: 3c0e8008 */ lui $t6,%hi(g_FontNumeric2) /* f0dd74c: 8dcefafc */ lw $t6,%lo(g_FontNumeric2)($t6) @@ -1155,7 +1155,7 @@ glabel hudRenderZoomRange /* f0dd75c: 27a50070 */ addiu $a1,$sp,0x70 /* f0dd760: 27a60084 */ addiu $a2,$sp,0x84 /* f0dd764: afa00014 */ sw $zero,0x14($sp) -/* f0dd768: 0fc55c32 */ jal 0xf1570c8 +/* f0dd768: 0fc55c32 */ jal textMeasure /* f0dd76c: afae0010 */ sw $t6,0x10($sp) /* f0dd770: 8fa20044 */ lw $v0,0x44($sp) /* f0dd774: 8fa80070 */ lw $t0,0x70($sp) @@ -1172,11 +1172,11 @@ glabel hudRenderZoomRange /* f0dd7a0: 8fa400c0 */ lw $a0,0xc0($sp) /* f0dd7a4: 27a50078 */ addiu $a1,$sp,0x78 /* f0dd7a8: 27a60074 */ addiu $a2,$sp,0x74 -/* f0dd7ac: 0fc54dad */ jal 0xf1536b4 +/* f0dd7ac: 0fc54dad */ jal func0f1538e4 /* f0dd7b0: 27a70068 */ addiu $a3,$sp,0x68 -/* f0dd7b4: 0c002f02 */ jal 0xbc08 +/* f0dd7b4: 0c002f02 */ jal viGetWidth /* f0dd7b8: afa200c0 */ sw $v0,0xc0($sp) -/* f0dd7bc: 0c002f06 */ jal 0xbc18 +/* f0dd7bc: 0c002f06 */ jal viGetHeight /* f0dd7c0: a7a2004c */ sh $v0,0x4c($sp) /* f0dd7c4: 3c0a8008 */ lui $t2,%hi(g_FontNumeric1) /* f0dd7c8: 3c0b8008 */ lui $t3,%hi(g_FontNumeric2) @@ -1196,7 +1196,7 @@ glabel hudRenderZoomRange /* f0dd800: afab0014 */ sw $t3,0x14($sp) /* f0dd804: afaa0010 */ sw $t2,0x10($sp) /* f0dd808: afac0018 */ sw $t4,0x18($sp) -/* f0dd80c: 0fc55b06 */ jal 0xf156c18 +/* f0dd80c: 0fc55b06 */ jal textRender /* f0dd810: afae0020 */ sw $t6,0x20($sp) .L0f0dd814_2: /* f0dd814: 8fbf003c */ lw $ra,0x3c($sp) @@ -1408,7 +1408,7 @@ glabel func0f0ddb1c /* f0de0ac: 27bdffe0 */ addiu $sp,$sp,-32 /* f0de0b0: afbf0014 */ sw $ra,0x14($sp) /* f0de0b4: afa50024 */ sw $a1,0x24($sp) -/* f0de0b8: 0c002e73 */ jal 0xb9cc +/* f0de0b8: 0c002e73 */ jal viGetViewWidth /* f0de0bc: afa40020 */ sw $a0,0x20($sp) /* f0de0c0: 3c0e8008 */ lui $t6,0x8008 /* f0de0c4: 8dce0020 */ lw $t6,0x20($t6) @@ -1467,7 +1467,7 @@ glabel func0f0ddb1c /* f0de17c: 8cce0000 */ lw $t6,0x0($a2) /* f0de180: afa60020 */ sw $a2,0x20($sp) /* f0de184: afa80018 */ sw $t0,0x18($sp) -/* f0de188: 0fc54ef9 */ jal 0xf153be4 +/* f0de188: 0fc54ef9 */ jal optionsGetScreenSplit /* f0de18c: afad001c */ sw $t5,0x1c($sp) /* f0de190: 3c07800a */ lui $a3,0x800a /* f0de194: 241f0001 */ li $ra,0x1 @@ -2520,7 +2520,7 @@ glabel var7f1af1b8 /* f0defd4: 8fa30038 */ lw $v1,0x38($sp) /* f0defd8: afa40018 */ sw $a0,0x18($sp) /* f0defdc: afab002c */ sw $t3,0x2c($sp) -/* f0defe0: 0fc54ef9 */ jal 0xf153be4 +/* f0defe0: 0fc54ef9 */ jal optionsGetScreenSplit /* f0defe4: afad0024 */ sw $t5,0x24($sp) /* f0defe8: 241f0001 */ li $ra,0x1 /* f0defec: 8fa40018 */ lw $a0,0x18($sp) @@ -2616,7 +2616,7 @@ glabel var7f1af1b8 /* f0df120: 0306c821 */ addu $t9,$t8,$a2 /* f0df124: 17210029 */ bne $t9,$at,.PF0f0df1cc /* f0df128: 00000000 */ nop -/* f0df12c: 0fc54ef9 */ jal 0xf153be4 +/* f0df12c: 0fc54ef9 */ jal optionsGetScreenSplit /* f0df130: afa90034 */ sw $t1,0x34($sp) /* f0df134: 3c038009 */ lui $v1,0x8009 /* f0df138: 241f0001 */ li $ra,0x1 @@ -2805,7 +2805,7 @@ glabel var7f1af1b8 /* f0df3b8: 13ee000c */ beq $ra,$t6,.PF0f0df3ec /* f0df3bc: 00000000 */ nop /* f0df3c0: afa40030 */ sw $a0,0x30($sp) -/* f0df3c4: 0fc54ef9 */ jal 0xf153be4 +/* f0df3c4: 0fc54ef9 */ jal optionsGetScreenSplit /* f0df3c8: afa90034 */ sw $t1,0x34($sp) /* f0df3cc: 241f0001 */ li $ra,0x1 /* f0df3d0: 8fa40030 */ lw $a0,0x30($sp) @@ -2859,7 +2859,7 @@ glabel var7f1af1b8 /* f0df470: 24840003 */ addiu $a0,$a0,0x3 .PF0f0df474: /* f0df474: afa40030 */ sw $a0,0x30($sp) -/* f0df478: 0fc54e8c */ jal 0xf153a30 +/* f0df478: 0fc54e8c */ jal optionsGetEffectiveScreenSize /* f0df47c: afa90034 */ sw $t1,0x34($sp) /* f0df480: 8fa40030 */ lw $a0,0x30($sp) /* f0df484: 10400002 */ beqz $v0,.PF0f0df490 @@ -3431,7 +3431,7 @@ glabel hudmsgCreate /* f0df534: afa70204 */ sw $a3,0x204($sp) /* f0df538: 14b10005 */ bne $a1,$s1,.PF0f0df550 /* f0df53c: 00004825 */ move $t1,$zero -/* f0df540: 0fc54d6f */ jal 0xf1535bc +/* f0df540: 0fc54d6f */ jal optionsGetInGameSubtitles /* f0df544: afa001ec */ sw $zero,0x1ec($sp) /* f0df548: 1040011e */ beqz $v0,.PF0f0df9c4 /* f0df54c: 8fa901ec */ lw $t1,0x1ec($sp) @@ -3523,7 +3523,7 @@ glabel hudmsgCreate /* f0df678: 15910022 */ bne $t4,$s1,.PF0f0df704 /* f0df67c: 00000000 */ nop .PF0f0df680: -/* f0df680: 0fc37938 */ jal 0xf0de4e0 +/* f0df680: 0fc37938 */ jal hudmsgGetNext /* f0df684: afa901ec */ sw $t1,0x1ec($sp) /* f0df688: 8fa901ec */ lw $t1,0x1ec($sp) /* f0df68c: 0440001d */ bltz $v0,.PF0f0df704 @@ -3553,7 +3553,7 @@ glabel hudmsgCreate /* f0df6e4: 0000c012 */ mflo $t8 /* f0df6e8: 00b87821 */ addu $t7,$a1,$t8 /* f0df6ec: 8de401b8 */ lw $a0,0x1b8($t7) -/* f0df6f0: 0fc37938 */ jal 0xf0de4e0 +/* f0df6f0: 0fc37938 */ jal hudmsgGetNext /* f0df6f4: afa901ec */ sw $t1,0x1ec($sp) /* f0df6f8: 8fa901ec */ lw $t1,0x1ec($sp) /* f0df6fc: 0441ffe7 */ bgez $v0,.PF0f0df69c @@ -3575,7 +3575,7 @@ glabel hudmsgCreate /* f0df738: afa901ec */ sw $t1,0x1ec($sp) /* f0df73c: 00005012 */ mflo $t2 /* f0df740: 014b8821 */ addu $s1,$t2,$t3 -/* f0df744: 0fc3782b */ jal 0xf0de0ac +/* f0df744: 0fc3782b */ jal func0f0ddb1c /* f0df748: 00000000 */ nop /* f0df74c: 8fad0210 */ lw $t5,0x210($sp) /* f0df750: 8fac020c */ lw $t4,0x20c($sp) @@ -3586,7 +3586,7 @@ glabel hudmsgCreate /* f0df764: 27a401dc */ addiu $a0,$sp,0x1dc /* f0df768: 27a501e0 */ addiu $a1,$sp,0x1e0 /* f0df76c: 8fa601f8 */ lw $a2,0x1f8($sp) -/* f0df770: 0fc5609a */ jal 0xf158268 +/* f0df770: 0fc5609a */ jal textMeasure /* f0df774: afae0010 */ sw $t6,0x10($sp) /* f0df778: 8fb801d4 */ lw $t8,0x1d4($sp) /* f0df77c: 8faf01e0 */ lw $t7,0x1e0($sp) @@ -3634,7 +3634,7 @@ glabel hudmsgCreate /* f0df818: 8f070000 */ lw $a3,0x0($t8) /* f0df81c: afa901ec */ sw $t1,0x1ec($sp) /* f0df820: 02403025 */ move $a2,$s2 -/* f0df824: 0fc56123 */ jal 0xf15848c +/* f0df824: 0fc56123 */ jal textWrap /* f0df828: afaa0010 */ sw $t2,0x10($sp) /* f0df82c: 8fab0210 */ lw $t3,0x210($sp) /* f0df830: 8fb9020c */ lw $t9,0x20c($sp) @@ -3644,13 +3644,13 @@ glabel hudmsgCreate /* f0df840: afa00014 */ sw $zero,0x14($sp) /* f0df844: 27a501e0 */ addiu $a1,$sp,0x1e0 /* f0df848: 02403025 */ move $a2,$s2 -/* f0df84c: 0fc5609a */ jal 0xf158268 +/* f0df84c: 0fc5609a */ jal textMeasure /* f0df850: afac0010 */ sw $t4,0x10($sp) /* f0df854: 10000006 */ b .PF0f0df870 /* f0df858: 8fa901ec */ lw $t1,0x1ec($sp) .PF0f0df85c: /* f0df85c: 2406018f */ li $a2,0x18f -/* f0df860: 0c004bd6 */ jal 0x12f58 +/* f0df860: 0c004bd6 */ jal strncpy /* f0df864: afa901ec */ sw $t1,0x1ec($sp) /* f0df868: 8fa901ec */ lw $t1,0x1ec($sp) /* f0df86c: a22001af */ sb $zero,0x1af($s1) @@ -3703,7 +3703,7 @@ glabel hudmsgCreate /* f0df924: ae3901d0 */ sw $t9,0x1d0($s1) /* f0df928: 8fab0228 */ lw $t3,0x228($sp) /* f0df92c: ae2901d8 */ sw $t1,0x1d8($s1) -/* f0df930: 0fc37b8c */ jal 0xf0dee30 +/* f0df930: 0fc37b8c */ jal func0f0de7fc /* f0df934: ae2b01d4 */ sw $t3,0x1d4($s1) /* f0df938: 8fac0230 */ lw $t4,0x230($sp) /* f0df93c: 8fb901fc */ lw $t9,0x1fc($sp) @@ -4315,10 +4315,10 @@ glabel var7f1af1e0 .PF0f0dfac0: /* f0dfac0: 8ca401c0 */ lw $a0,0x1c0($a1) .PF0f0dfac4: -/* f0dfac4: 0fc4a4ff */ jal 0xf1293fc +/* f0dfac4: 0fc4a4ff */ jal setCurrentPlayerNum /* f0dfac8: afa6006c */ sw $a2,0x6c($sp) /* f0dfacc: 8ecc0000 */ lw $t4,0x0($s6) -/* f0dfad0: 0fc37b8c */ jal 0xf0dee30 +/* f0dfad0: 0fc37b8c */ jal func0f0de7fc /* f0dfad4: 020c2021 */ addu $a0,$s0,$t4 /* f0dfad8: 3c088007 */ lui $t0,0x8007 /* f0dfadc: 8d0812c8 */ lw $t0,0x12c8($t0) @@ -4332,13 +4332,13 @@ glabel var7f1af1e0 /* f0dfaf4: 3c168007 */ lui $s6,0x8007 /* f0dfaf8: 26d612cc */ addiu $s6,$s6,0x12cc /* f0dfafc: 241101dc */ li $s1,0x1dc -/* f0dfb00: 0fc4a4ff */ jal 0xf1293fc +/* f0dfb00: 0fc4a4ff */ jal setCurrentPlayerNum /* f0dfb04: 02802025 */ move $a0,$s4 /* f0dfb08: 2404ffff */ li $a0,-1 /* f0dfb0c: 24150004 */ li $s5,0x4 /* f0dfb10: 2414000b */ li $s4,0xb .PF0f0dfb14: -/* f0dfb14: 0fc37938 */ jal 0xf0de4e0 +/* f0dfb14: 0fc37938 */ jal hudmsgGetNext /* f0dfb18: 00000000 */ nop /* f0dfb1c: 0440014a */ bltz $v0,.PF0f0e0048 /* f0dfb20: 241800ff */ li $t8,0xff @@ -4351,7 +4351,7 @@ glabel var7f1af1e0 /* f0dfb3c: 8e0401b0 */ lw $a0,0x1b0($s0) /* f0dfb40: 04820006 */ bltzl $a0,.PF0f0dfb5c /* f0dfb44: a2180004 */ sb $t8,0x4($s0) -/* f0dfb48: 0fc24a9f */ jal 0xf092a7c +/* f0dfb48: 0fc24a9f */ jal func0f092b7c /* f0dfb4c: 00000000 */ nop /* f0dfb50: 10000002 */ b .PF0f0dfb5c /* f0dfb54: a2020004 */ sb $v0,0x4($s0) @@ -4521,11 +4521,11 @@ glabel var7f1af1e0 .PF0f0dfdb8: /* f0dfdb8: 57200038 */ bnezl $t9,.PF0f0dfe9c /* f0dfdbc: 9602001c */ lhu $v0,0x1c($s0) -/* f0dfdc0: 0fc5b6f7 */ jal 0xf16dbdc +/* f0dfdc0: 0fc5b6f7 */ jal coreIsPaused /* f0dfdc4: 00000000 */ nop /* f0dfdc8: 54400034 */ bnezl $v0,.PF0f0dfe9c /* f0dfdcc: 9602001c */ lhu $v0,0x1c($s0) -/* f0dfdd0: 0fc629b9 */ jal 0xf18a6e4 +/* f0dfdd0: 0fc629b9 */ jal mpIsPaused /* f0dfdd4: 00000000 */ nop /* f0dfdd8: 54400030 */ bnezl $v0,.PF0f0dfe9c /* f0dfddc: 9602001c */ lhu $v0,0x1c($s0) @@ -4577,7 +4577,7 @@ glabel var7f1af1e0 /* f0dfe84: afb90010 */ sw $t9,0x10($sp) /* f0dfe88: afaa0018 */ sw $t2,0x18($sp) /* f0dfe8c: afab001c */ sw $t3,0x1c($sp) -/* f0dfe90: 0c0041a0 */ jal 0x10680 +/* f0dfe90: 0c0041a0 */ jal audioStart /* f0dfe94: e7a40014 */ swc1 $f4,0x14($sp) .PF0f0dfe98: /* f0dfe98: 9602001c */ lhu $v0,0x1c($s0) @@ -4591,7 +4591,7 @@ glabel var7f1af1e0 /* f0dfeb4: 00006812 */ mflo $t5 /* f0dfeb8: 018d7021 */ addu $t6,$t4,$t5 /* f0dfebc: 448e3000 */ mtc1 $t6,$f6 -/* f0dfec0: 0c0127b4 */ jal 0x49ed0 +/* f0dfec0: 0c0127b4 */ jal sqrtf /* f0dfec4: 46803320 */ cvt.s.w $f12,$f6 /* f0dfec8: 960f0006 */ lhu $t7,0x6($s0) /* f0dfecc: 8e780038 */ lw $t8,0x38($s3) @@ -4624,7 +4624,7 @@ glabel var7f1af1e0 /* f0dff34: 01cfc021 */ addu $t8,$t6,$t7 /* f0dff38: 0480000f */ bltz $a0,.PF0f0dff78 /* f0dff3c: a6180006 */ sh $t8,0x6($s0) -/* f0dff40: 0fc250ab */ jal 0xf0942ac +/* f0dff40: 0fc250ab */ jal audioIsChannelIdle /* f0dff44: afa0004c */ sw $zero,0x4c($sp) /* f0dff48: 10400003 */ beqz $v0,.PF0f0dff58 /* f0dff4c: 8fa3004c */ lw $v1,0x4c($sp) @@ -4671,7 +4671,7 @@ glabel var7f1af1e0 /* f0dffe0: 00007812 */ mflo $t7 /* f0dffe4: 01cfc021 */ addu $t8,$t6,$t7 /* f0dffe8: 44983000 */ mtc1 $t8,$f6 -/* f0dffec: 0c0127b4 */ jal 0x49ed0 +/* f0dffec: 0c0127b4 */ jal sqrtf /* f0dfff0: 46803320 */ cvt.s.w $f12,$f6 /* f0dfff4: 96190006 */ lhu $t9,0x6($s0) /* f0dfff8: 8e6b0038 */ lw $t3,0x38($s3) @@ -5242,7 +5242,7 @@ glabel hudmsgsRender /* f0e0174: f7b40038 */ sdc1 $f20,0x38($sp) /* f0e0178: afae00e0 */ sw $t6,0xe0($sp) /* f0e017c: afaf00dc */ sw $t7,0xdc($sp) -/* f0e0180: 0fc550cf */ jal 0xf15433c +/* f0e0180: 0fc550cf */ jal func0f153628 /* f0e0184: ac380020 */ sw $t8,0x20($at) /* f0e0188: 3c19800a */ lui $t9,0x800a /* f0e018c: 8f39a7a8 */ lw $t9,-0x5858($t9) @@ -5337,7 +5337,7 @@ glabel hudmsgsRender /* f0e02cc: 3c014270 */ lui $at,0x4270 /* f0e02d0: 44819000 */ mtc1 $at,$f18 /* f0e02d4: 460a3402 */ mul.s $f16,$f6,$f10 -/* f0e02d8: 0c00685b */ jal 0x1a16c +/* f0e02d8: 0c00685b */ jal sinf /* f0e02dc: 46128303 */ div.s $f12,$f16,$f18 /* f0e02e0: 44802000 */ mtc1 $zero,$f4 /* f0e02e4: 3c014340 */ lui $at,0x4340 @@ -5404,11 +5404,11 @@ glabel hudmsgsRender /* f0e03c0: 8e0e01b4 */ lw $t6,0x1b4($s0) /* f0e03c4: 55c10011 */ bnel $t6,$at,.PF0f0e040c /* f0e03c8: 8e0901b4 */ lw $t1,0x1b4($s0) -/* f0e03cc: 0fc3074e */ jal 0xf0c1d38 +/* f0e03cc: 0fc3074e */ jal currentPlayerIsHealthVisible /* f0e03d0: 00000000 */ nop /* f0e03d4: 5040000d */ beqzl $v0,.PF0f0e040c /* f0e03d8: 8e0901b4 */ lw $t1,0x1b4($s0) -/* f0e03dc: 0fc30718 */ jal 0xf0c1c60 +/* f0e03dc: 0fc30718 */ jal currentPlayerGetHealthBarHeightFrac /* f0e03e0: 00000000 */ nop /* f0e03e4: 3c014180 */ lui $at,0x4180 /* f0e03e8: 44818000 */ mtc1 $at,$f16 @@ -5443,7 +5443,7 @@ glabel hudmsgsRender /* f0e0458: 330f0fff */ andi $t7,$t8,0xfff /* f0e045c: 000fcb00 */ sll $t9,$t7,0xc /* f0e0460: 03214025 */ or $t0,$t9,$at -/* f0e0464: 0c002e46 */ jal 0xb918 +/* f0e0464: 0c002e46 */ jal viGetBufY /* f0e0468: ae280000 */ sw $t0,0x0($s1) /* f0e046c: 8fa900e8 */ lw $t1,0xe8($sp) /* f0e0470: 960b001c */ lhu $t3,0x1c($s0) @@ -5512,7 +5512,7 @@ glabel hudmsgsRender /* f0e0560: 00005012 */ mflo $t2 /* f0e0564: 016a4021 */ addu $t0,$t3,$t2 /* f0e0568: 44884000 */ mtc1 $t0,$f8 -/* f0e056c: 0c0127b4 */ jal 0x49ed0 +/* f0e056c: 0c0127b4 */ jal sqrtf /* f0e0570: 46804320 */ cvt.s.w $f12,$f8 /* f0e0574: 3c014304 */ lui $at,0x4304 /* f0e0578: 44813000 */ mtc1 $at,$f6 @@ -5553,7 +5553,7 @@ glabel hudmsgsRender /* f0e05f8: 44801000 */ mtc1 $zero,$f2 /* f0e05fc: 00000000 */ nop .PF0f0e0600: -/* f0e0600: 0fc5524d */ jal 0xf154934 +/* f0e0600: 0fc5524d */ jal func0f153c20 /* f0e0604: e7a200c0 */ swc1 $f2,0xc0($sp) /* f0e0608: 920d0001 */ lbu $t5,0x1($s0) /* f0e060c: c7a200c0 */ lwc1 $f2,0xc0($sp) @@ -5574,13 +5574,13 @@ glabel hudmsgsRender /* f0e0648: e7b40014 */ swc1 $f20,0x14($sp) /* f0e064c: 02402025 */ move $a0,$s2 /* f0e0650: 2706fffd */ addiu $a2,$t8,-3 -/* f0e0654: 0fc37776 */ jal 0xf0dddd8 +/* f0e0654: 0fc37776 */ jal hudRenderMessageBox /* f0e0658: 25c5fffd */ addiu $a1,$t6,-3 -/* f0e065c: 0c002e53 */ jal 0xb94c +/* f0e065c: 0c002e53 */ jal viGetWidth /* f0e0660: 00409025 */ move $s2,$v0 /* f0e0664: 00028c00 */ sll $s1,$v0,0x10 /* f0e0668: 00115403 */ sra $t2,$s1,0x10 -/* f0e066c: 0c002e57 */ jal 0xb95c +/* f0e066c: 0c002e57 */ jal viGetHeight /* f0e0670: 01408825 */ move $s1,$t2 /* f0e0674: 8e080008 */ lw $t0,0x8($s0) /* f0e0678: 02402025 */ move $a0,$s2 @@ -5594,7 +5594,7 @@ glabel hudmsgsRender /* f0e0698: afb30018 */ sw $s3,0x18($sp) /* f0e069c: 02e03025 */ move $a2,$s7 /* f0e06a0: 26070020 */ addiu $a3,$s0,0x20 -/* f0e06a4: 0fc55c50 */ jal 0xf157140 +/* f0e06a4: 0fc55c50 */ jal textRenderProjected /* f0e06a8: afac0014 */ sw $t4,0x14($sp) /* f0e06ac: 1000001f */ b .PF0f0e072c /* f0e06b0: 00409025 */ move $s2,$v0 @@ -5605,13 +5605,13 @@ glabel hudmsgsRender /* f0e06c0: afa00014 */ sw $zero,0x14($sp) /* f0e06c4: 0326c021 */ addu $t8,$t9,$a2 /* f0e06c8: afb80010 */ sw $t8,0x10($sp) -/* f0e06cc: 0fc551d2 */ jal 0xf154748 +/* f0e06cc: 0fc551d2 */ jal func0f153a34 /* f0e06d0: 01c53821 */ addu $a3,$t6,$a1 -/* f0e06d4: 0c002e53 */ jal 0xb94c +/* f0e06d4: 0c002e53 */ jal viGetWidth /* f0e06d8: 00409025 */ move $s2,$v0 /* f0e06dc: 00028c00 */ sll $s1,$v0,0x10 /* f0e06e0: 00114c03 */ sra $t1,$s1,0x10 -/* f0e06e4: 0c002e57 */ jal 0xb95c +/* f0e06e4: 0c002e57 */ jal viGetHeight /* f0e06e8: 01208825 */ move $s1,$t1 /* f0e06ec: 8e0b0008 */ lw $t3,0x8($s0) /* f0e06f0: 02402025 */ move $a0,$s2 @@ -5626,7 +5626,7 @@ glabel hudmsgsRender /* f0e0714: afb30018 */ sw $s3,0x18($sp) /* f0e0718: 02e03025 */ move $a2,$s7 /* f0e071c: 26070020 */ addiu $a3,$s0,0x20 -/* f0e0720: 0fc55fa0 */ jal 0xf157e80 +/* f0e0720: 0fc55fa0 */ jal textRender /* f0e0724: afaa0014 */ sw $t2,0x14($sp) /* f0e0728: 00409025 */ move $s2,$v0 .PF0f0e072c: @@ -5636,7 +5636,7 @@ glabel hudmsgsRender /* f0e0738: 00000000 */ nop /* f0e073c: afa000e0 */ sw $zero,0xe0($sp) .PF0f0e0740: -/* f0e0740: 0fc552d8 */ jal 0xf154b60 +/* f0e0740: 0fc552d8 */ jal func0f153e4c /* f0e0744: 00000000 */ nop /* f0e0748: 100000fe */ b .PF0f0e0b44 /* f0e074c: 8e0801b4 */ lw $t0,0x1b4($s0) @@ -5677,13 +5677,13 @@ glabel hudmsgsRender /* f0e07d0: afa30018 */ sw $v1,0x18($sp) /* f0e07d4: e7b40014 */ swc1 $f20,0x14($sp) /* f0e07d8: 02402025 */ move $a0,$s2 -/* f0e07dc: 0fc37776 */ jal 0xf0dddd8 +/* f0e07dc: 0fc37776 */ jal hudRenderMessageBox /* f0e07e0: 2566fffd */ addiu $a2,$t3,-3 -/* f0e07e4: 0c002e53 */ jal 0xb94c +/* f0e07e4: 0c002e53 */ jal viGetWidth /* f0e07e8: 00409025 */ move $s2,$v0 /* f0e07ec: 00028c00 */ sll $s1,$v0,0x10 /* f0e07f0: 00116c03 */ sra $t5,$s1,0x10 -/* f0e07f4: 0c002e57 */ jal 0xb95c +/* f0e07f4: 0c002e57 */ jal viGetHeight /* f0e07f8: 01a08825 */ move $s1,$t5 /* f0e07fc: 8e190008 */ lw $t9,0x8($s0) /* f0e0800: 02402025 */ move $a0,$s2 @@ -5697,7 +5697,7 @@ glabel hudmsgsRender /* f0e0820: afb30018 */ sw $s3,0x18($sp) /* f0e0824: 02e03025 */ move $a2,$s7 /* f0e0828: 26070020 */ addiu $a3,$s0,0x20 -/* f0e082c: 0fc55c50 */ jal 0xf157140 +/* f0e082c: 0fc55c50 */ jal textRenderProjected /* f0e0830: afaf0014 */ sw $t7,0x14($sp) /* f0e0834: 10000021 */ b .PF0f0e08bc /* f0e0838: 00409025 */ move $s2,$v0 @@ -5710,13 +5710,13 @@ glabel hudmsgsRender /* f0e0850: afab0010 */ sw $t3,0x10($sp) /* f0e0854: afa00014 */ sw $zero,0x14($sp) /* f0e0858: 02402025 */ move $a0,$s2 -/* f0e085c: 0fc551d2 */ jal 0xf154748 +/* f0e085c: 0fc551d2 */ jal func0f153a34 /* f0e0860: 01253821 */ addu $a3,$t1,$a1 -/* f0e0864: 0c002e53 */ jal 0xb94c +/* f0e0864: 0c002e53 */ jal viGetWidth /* f0e0868: 00409025 */ move $s2,$v0 /* f0e086c: 00028c00 */ sll $s1,$v0,0x10 /* f0e0870: 00116403 */ sra $t4,$s1,0x10 -/* f0e0874: 0c002e57 */ jal 0xb95c +/* f0e0874: 0c002e57 */ jal viGetHeight /* f0e0878: 01808825 */ move $s1,$t4 /* f0e087c: 8e0e0008 */ lw $t6,0x8($s0) /* f0e0880: 02402025 */ move $a0,$s2 @@ -5731,7 +5731,7 @@ glabel hudmsgsRender /* f0e08a4: afb30018 */ sw $s3,0x18($sp) /* f0e08a8: 02e03025 */ move $a2,$s7 /* f0e08ac: 26070020 */ addiu $a3,$s0,0x20 -/* f0e08b0: 0fc55fa0 */ jal 0xf157e80 +/* f0e08b0: 0fc55fa0 */ jal textRender /* f0e08b4: afad0014 */ sw $t5,0x14($sp) /* f0e08b8: 00409025 */ move $s2,$v0 .PF0f0e08bc: @@ -5751,7 +5751,7 @@ glabel hudmsgsRender /* f0e08f0: 00004812 */ mflo $t1 /* f0e08f4: 01e9c021 */ addu $t8,$t7,$t1 /* f0e08f8: 44984000 */ mtc1 $t8,$f8 -/* f0e08fc: 0c0127b4 */ jal 0x49ed0 +/* f0e08fc: 0c0127b4 */ jal sqrtf /* f0e0900: 46804320 */ cvt.s.w $f12,$f8 /* f0e0904: 3c0142b8 */ lui $at,0x42b8 /* f0e0908: 44813000 */ mtc1 $at,$f6 @@ -5798,7 +5798,7 @@ glabel hudmsgsRender /* f0e09a0: 032f2021 */ addu $a0,$t9,$t7 /* f0e09a4: 01382821 */ addu $a1,$t1,$t8 /* f0e09a8: 44060000 */ mfc1 $a2,$f0 -/* f0e09ac: 0fc5524d */ jal 0xf154934 +/* f0e09ac: 0fc5524d */ jal func0f153c20 /* f0e09b0: 00000000 */ nop /* f0e09b4: c7a200a8 */ lwc1 $f2,0xa8($sp) /* f0e09b8: 3c014f80 */ lui $at,0x4f80 @@ -5842,13 +5842,13 @@ glabel hudmsgsRender /* f0e0a44: e7b40014 */ swc1 $f20,0x14($sp) /* f0e0a48: 02402025 */ move $a0,$s2 /* f0e0a4c: 2565fffd */ addiu $a1,$t3,-3 -/* f0e0a50: 0fc37776 */ jal 0xf0dddd8 +/* f0e0a50: 0fc37776 */ jal hudRenderMessageBox /* f0e0a54: 2586fffd */ addiu $a2,$t4,-3 -/* f0e0a58: 0c002e53 */ jal 0xb94c +/* f0e0a58: 0c002e53 */ jal viGetWidth /* f0e0a5c: 00409025 */ move $s2,$v0 /* f0e0a60: 00028c00 */ sll $s1,$v0,0x10 /* f0e0a64: 00114c03 */ sra $t1,$s1,0x10 -/* f0e0a68: 0c002e57 */ jal 0xb95c +/* f0e0a68: 0c002e57 */ jal viGetHeight /* f0e0a6c: 01208825 */ move $s1,$t1 /* f0e0a70: 8e180008 */ lw $t8,0x8($s0) /* f0e0a74: 02402025 */ move $a0,$s2 @@ -5862,7 +5862,7 @@ glabel hudmsgsRender /* f0e0a94: afb30018 */ sw $s3,0x18($sp) /* f0e0a98: 02e03025 */ move $a2,$s7 /* f0e0a9c: 26070020 */ addiu $a3,$s0,0x20 -/* f0e0aa0: 0fc55c50 */ jal 0xf157140 +/* f0e0aa0: 0fc55c50 */ jal textRenderProjected /* f0e0aa4: afa80014 */ sw $t0,0x14($sp) /* f0e0aa8: 1000001e */ b .PF0f0e0b24 /* f0e0aac: 00409025 */ move $s2,$v0 @@ -5872,13 +5872,13 @@ glabel hudmsgsRender /* f0e0ab8: afa00014 */ sw $zero,0x14($sp) /* f0e0abc: 01a66021 */ addu $t4,$t5,$a2 /* f0e0ac0: afac0010 */ sw $t4,0x10($sp) -/* f0e0ac4: 0fc551d2 */ jal 0xf154748 +/* f0e0ac4: 0fc551d2 */ jal func0f153a34 /* f0e0ac8: 01653821 */ addu $a3,$t3,$a1 -/* f0e0acc: 0c002e53 */ jal 0xb94c +/* f0e0acc: 0c002e53 */ jal viGetWidth /* f0e0ad0: 00409025 */ move $s2,$v0 /* f0e0ad4: 00028c00 */ sll $s1,$v0,0x10 /* f0e0ad8: 0011cc03 */ sra $t9,$s1,0x10 -/* f0e0adc: 0c002e57 */ jal 0xb95c +/* f0e0adc: 0c002e57 */ jal viGetHeight /* f0e0ae0: 03208825 */ move $s1,$t9 /* f0e0ae4: 8e0f0008 */ lw $t7,0x8($s0) /* f0e0ae8: 02402025 */ move $a0,$s2 @@ -5893,7 +5893,7 @@ glabel hudmsgsRender /* f0e0b0c: afb30018 */ sw $s3,0x18($sp) /* f0e0b10: 02e03025 */ move $a2,$s7 /* f0e0b14: 26070020 */ addiu $a3,$s0,0x20 -/* f0e0b18: 0fc55fa0 */ jal 0xf157e80 +/* f0e0b18: 0fc55fa0 */ jal textRender /* f0e0b1c: afa90014 */ sw $t1,0x14($sp) /* f0e0b20: 00409025 */ move $s2,$v0 .PF0f0e0b24: @@ -5903,7 +5903,7 @@ glabel hudmsgsRender /* f0e0b30: 00000000 */ nop /* f0e0b34: afa000e0 */ sw $zero,0xe0($sp) .PF0f0e0b38: -/* f0e0b38: 0fc552d8 */ jal 0xf154b60 +/* f0e0b38: 0fc552d8 */ jal func0f153e4c /* f0e0b3c: 00000000 */ nop .PF0f0e0b40: /* f0e0b40: 8e0801b4 */ lw $t0,0x1b4($s0) @@ -5912,12 +5912,12 @@ glabel hudmsgsRender /* f0e0b48: 15010039 */ bne $t0,$at,.PF0f0e0c30 /* f0e0b4c: 00000000 */ nop /* f0e0b50: afb2009c */ sw $s2,0x9c($sp) -/* f0e0b54: 0c002e91 */ jal 0xba44 +/* f0e0b54: 0c002e91 */ jal viGetViewLeft /* f0e0b58: 26520008 */ addiu $s2,$s2,0x8 /* f0e0b5c: 00028400 */ sll $s0,$v0,0x10 /* f0e0b60: 00105c03 */ sra $t3,$s0,0x10 /* f0e0b64: 01608025 */ move $s0,$t3 -/* f0e0b68: 0c002e95 */ jal 0xba54 +/* f0e0b68: 0c002e95 */ jal viGetViewTop /* f0e0b6c: 8fb3009c */ lw $s3,0x9c($sp) /* f0e0b70: 44829000 */ mtc1 $v0,$f18 /* f0e0b74: 44905000 */ mtc1 $s0,$f10 @@ -5936,17 +5936,17 @@ glabel hudmsgsRender /* f0e0ba8: 31e90fff */ andi $t1,$t7,0xfff /* f0e0bac: 0009c300 */ sll $t8,$t1,0xc /* f0e0bb0: 01984025 */ or $t0,$t4,$t8 -/* f0e0bb4: 0c002e73 */ jal 0xb9cc +/* f0e0bb4: 0c002e73 */ jal viGetViewWidth /* f0e0bb8: ae680000 */ sw $t0,0x0($s3) -/* f0e0bbc: 0c002e91 */ jal 0xba44 +/* f0e0bbc: 0c002e91 */ jal viGetViewLeft /* f0e0bc0: a7a20092 */ sh $v0,0x92($sp) /* f0e0bc4: 00028c00 */ sll $s1,$v0,0x10 /* f0e0bc8: 00115c03 */ sra $t3,$s1,0x10 -/* f0e0bcc: 0c002e95 */ jal 0xba54 +/* f0e0bcc: 0c002e95 */ jal viGetViewTop /* f0e0bd0: 01608825 */ move $s1,$t3 /* f0e0bd4: 00028400 */ sll $s0,$v0,0x10 /* f0e0bd8: 00105403 */ sra $t2,$s0,0x10 -/* f0e0bdc: 0c002e77 */ jal 0xb9dc +/* f0e0bdc: 0c002e77 */ jal viGetViewHeight /* f0e0be0: 01408025 */ move $s0,$t2 /* f0e0be4: 87a90092 */ lh $t1,0x92($sp) /* f0e0be8: 00506821 */ addu $t5,$v0,$s0 @@ -5987,7 +5987,7 @@ glabel hudmsgsRender /* f0e0c68: 11200028 */ beqz $t1,.PF0f0e0d0c /* f0e0c6c: 00000000 */ nop /* f0e0c70: 8d8ca798 */ lw $t4,-0x5868($t4) -/* f0e0c74: 0fc54d66 */ jal 0xf153598 +/* f0e0c74: 0fc54d66 */ jal optionsGetShowMissionTime /* f0e0c78: 8d840070 */ lw $a0,0x70($t4) /* f0e0c7c: 10400019 */ beqz $v0,.PF0f0e0ce4 /* f0e0c80: 3c188007 */ lui $t8,0x8007 @@ -6012,23 +6012,23 @@ glabel hudmsgsRender /* f0e0ccc: 00000000 */ nop /* f0e0cd0: 10410004 */ beq $v0,$at,.PF0f0e0ce4 /* f0e0cd4: 02402025 */ move $a0,$s2 -/* f0e0cd8: 0fc37521 */ jal 0xf0dd484 +/* f0e0cd8: 0fc37521 */ jal hudRenderMissionTimer /* f0e0cdc: 8fa500e0 */ lw $a1,0xe0($sp) /* f0e0ce0: 00409025 */ move $s2,$v0 .PF0f0e0ce4: -/* f0e0ce4: 0fc374d3 */ jal 0xf0dd34c +/* f0e0ce4: 0fc374d3 */ jal hudIsZoomRangeVisible /* f0e0ce8: 00000000 */ nop /* f0e0cec: 10400004 */ beqz $v0,.PF0f0e0d00 /* f0e0cf0: 02402025 */ move $a0,$s2 -/* f0e0cf4: 0fc3760f */ jal 0xf0dd83c +/* f0e0cf4: 0fc3760f */ jal hudRenderZoomRange /* f0e0cf8: 8fa500e0 */ lw $a1,0xe0($sp) /* f0e0cfc: 00409025 */ move $s2,$v0 .PF0f0e0d00: -/* f0e0d00: 0fc241f9 */ jal 0xf0907e4 +/* f0e0d00: 0fc241f9 */ jal func0f0908b8 /* f0e0d04: 02402025 */ move $a0,$s2 /* f0e0d08: 00409025 */ move $s2,$v0 .PF0f0e0d0c: -/* f0e0d0c: 0fc55125 */ jal 0xf154494 +/* f0e0d0c: 0fc55125 */ jal func0f153780 /* f0e0d10: 02402025 */ move $a0,$s2 /* f0e0d14: 8fbf007c */ lw $ra,0x7c($sp) /* f0e0d18: 240a0001 */ li $t2,0x1 diff --git a/src/game/lang.c b/src/game/lang.c index ef12a0e5f..dd8b62a62 100644 --- a/src/game/lang.c +++ b/src/game/lang.c @@ -406,9 +406,9 @@ GLOBAL_ASM( glabel langSetBankSimple /* f16f578: 27bdffe0 */ addiu $sp,$sp,-32 /* f16f57c: afbf0014 */ sw $ra,0x14($sp) -/* f16f580: 0fc5bd51 */ jal 0xf16f544 +/* f16f580: 0fc5bd51 */ jal langGetFileId /* f16f584: afa40020 */ sw $a0,0x20($sp) -/* f16f588: 0fc59ff5 */ jal 0xf167fd4 +/* f16f588: 0fc59ff5 */ jal fileGetInflatedLength /* f16f58c: 00402025 */ move $a0,$v0 /* f16f590: 3c038008 */ lui $v1,0x8008 /* f16f594: 8c634664 */ lw $v1,0x4664($v1) @@ -430,13 +430,13 @@ glabel langSetBankSimple .PF0f16f5d4: /* f16f5d4: 00084940 */ sll $t1,$t0,0x5 /* f16f5d8: afa90018 */ sw $t1,0x18($sp) -/* f16f5dc: 0fc5bd51 */ jal 0xf16f544 +/* f16f5dc: 0fc5bd51 */ jal langGetFileId /* f16f5e0: 8fa40020 */ lw $a0,0x20($sp) /* f16f5e4: 3c068008 */ lui $a2,0x8008 /* f16f5e8: 8cc64668 */ lw $a2,0x4668($a2) /* f16f5ec: 8fa70018 */ lw $a3,0x18($sp) /* f16f5f0: 00402025 */ move $a0,$v0 -/* f16f5f4: 0fc5a060 */ jal 0xf168180 +/* f16f5f4: 0fc5a060 */ jal func0f167200 /* f16f5f8: 24050022 */ li $a1,0x22 /* f16f5fc: 8faa0020 */ lw $t2,0x20($sp) /* f16f600: 3c0c8008 */ lui $t4,0x8008 @@ -446,7 +446,7 @@ glabel langSetBankSimple /* f16f610: 000a5880 */ sll $t3,$t2,0x2 /* f16f614: 002b0821 */ addu $at,$at,$t3 /* f16f618: ac22b040 */ sw $v0,-0x4fc0($at) -/* f16f61c: 0fc5df7c */ jal 0xf177df0 +/* f16f61c: 0fc5df7c */ jal align32 /* f16f620: 018d2021 */ addu $a0,$t4,$t5 /* f16f624: 3c018008 */ lui $at,0x8008 /* f16f628: 10000003 */ b .PF0f16f638 @@ -514,7 +514,7 @@ glabel func0f16f6ecpf /* f16f6f8: afb20020 */ sw $s2,0x20($sp) /* f16f6fc: afb1001c */ sw $s1,0x1c($sp) /* f16f700: afb00018 */ sw $s0,0x18($sp) -/* f16f704: 0fc5df7c */ jal 0xf177df0 +/* f16f704: 0fc5df7c */ jal align32 /* f16f708: 8c844664 */ lw $a0,0x4664($a0) /* f16f70c: 3c018008 */ lui $at,0x8008 /* f16f710: 3c11800b */ lui $s1,0x800b @@ -526,7 +526,7 @@ glabel func0f16f6ecpf /* f16f724: 8e2e0000 */ lw $t6,0x0($s1) /* f16f728: 51c00004 */ beqzl $t6,.PF0f16f73c /* f16f72c: 26100001 */ addiu $s0,$s0,0x1 -/* f16f730: 0fc5bd5e */ jal 0xf16f578 +/* f16f730: 0fc5bd5e */ jal langSetBankSimple /* f16f734: 02002025 */ move $a0,$s0 /* f16f738: 26100001 */ addiu $s0,$s0,0x1 .PF0f16f73c: @@ -569,7 +569,7 @@ glabel var7f1b9094pf .PF0f16f77c: /* f16f77c: 10400004 */ beqz $v0,.PF0f16f790 /* f16f780: 27a4001f */ addiu $a0,$sp,0x1f -/* f16f784: 0fc624bf */ jal 0xf1892fc +/* f16f784: 0fc624bf */ jal func0f1892fcpf /* f16f788: afa20018 */ sw $v0,0x18($sp) /* f16f78c: 8fa20018 */ lw $v0,0x18($sp) .PF0f16f790: @@ -605,12 +605,12 @@ glabel var7f1b9094pf /* f16f804: 3c018008 */ lui $at,0x8008 /* f16f808: ac2a4670 */ sw $t2,0x4670($at) .PF0f16f80c: -/* f16f80c: 0fc5bdbb */ jal 0xf16f6ec +/* f16f80c: 0fc5bdbb */ jal func0f16f6ecpf /* f16f810: afa20018 */ sw $v0,0x18($sp) /* f16f814: 8fa20018 */ lw $v0,0x18($sp) /* f16f818: 50400004 */ beqzl $v0,.PF0f16f82c /* f16f81c: 8fbf0014 */ lw $ra,0x14($sp) -/* f16f820: 0fc624e1 */ jal 0xf189384 +/* f16f820: 0fc624e1 */ jal func0f189384pf /* f16f824: 93a4001f */ lbu $a0,0x1f($sp) /* f16f828: 8fbf0014 */ lw $ra,0x14($sp) .PF0f16f82c: diff --git a/src/game/mplayer/mplayer.c b/src/game/mplayer/mplayer.c index 2210562b1..ce7472ace 100644 --- a/src/game/mplayer/mplayer.c +++ b/src/game/mplayer/mplayer.c @@ -537,10 +537,10 @@ glabel func0f1892fcpf /* f189324: 00008025 */ move $s0,$zero /* f189328: 24130008 */ li $s3,0x8 .PF0f18932c: -/* f18932c: 0fc5bdaa */ jal 0xf16f6a8 +/* f18932c: 0fc5bdaa */ jal langGet /* f189330: 26045608 */ addiu $a0,$s0,0x5608 /* f189334: 02202025 */ move $a0,$s1 -/* f189338: 0c004c01 */ jal 0x13004 +/* f189338: 0c004c01 */ jal strcmp /* f18933c: 00402825 */ move $a1,$v0 /* f189340: 54400007 */ bnezl $v0,.PF0f189360 /* f189344: 26100001 */ addiu $s0,$s0,0x1 @@ -587,10 +587,10 @@ glabel func0f189384pf /* f1893c8: 3c09800b */ lui $t1,0x800b /* f1893cc: 2529d150 */ addiu $t1,$t1,-11952 /* f1893d0: 00084080 */ sll $t0,$t0,0x2 -/* f1893d4: 0fc5bdaa */ jal 0xf16f6a8 +/* f1893d4: 0fc5bdaa */ jal langGet /* f1893d8: 01098821 */ addu $s1,$t0,$t1 /* f1893dc: 02202025 */ move $a0,$s1 -/* f1893e0: 0c004bb0 */ jal 0x12ec0 +/* f1893e0: 0c004bb0 */ jal strcpy /* f1893e4: 00402825 */ move $a1,$v0 .PF0f1893e8: /* f1893e8: 26100001 */ addiu $s0,$s0,0x1 @@ -5203,18 +5203,18 @@ glabel func0f18c4c0 /* f18d578: afb30024 */ sw $s3,0x24($sp) /* f18d57c: afb20020 */ sw $s2,0x20($sp) /* f18d580: afb1001c */ sw $s1,0x1c($sp) -/* f18d584: 0fc634d2 */ jal 0xf18d348 +/* f18d584: 0fc634d2 */ jal mpGetUsingMultipleTunes /* f18d588: afb00018 */ sw $s0,0x18($sp) /* f18d58c: 1040006f */ beqz $v0,.PF0f18d74c /* f18d590: 00000000 */ nop -/* f18d594: 0fc634a9 */ jal 0xf18d2a4 +/* f18d594: 0fc634a9 */ jal mpGetNumUnlockedTracks /* f18d598: 00000000 */ nop /* f18d59c: 0040a025 */ move $s4,$v0 /* f18d5a0: 0000a825 */ move $s5,$zero /* f18d5a4: 18400009 */ blez $v0,.PF0f18d5cc /* f18d5a8: 00008025 */ move $s0,$zero .PF0f18d5ac: -/* f18d5ac: 0fc634d5 */ jal 0xf18d354 +/* f18d5ac: 0fc634d5 */ jal mpIsMultiTrackSlotEnabled /* f18d5b0: 02002025 */ move $a0,$s0 /* f18d5b4: 10400002 */ beqz $v0,.PF0f18d5c0 /* f18d5b8: 26100001 */ addiu $s0,$s0,0x1 @@ -5228,7 +5228,7 @@ glabel func0f18c4c0 /* f18d5d0: 3c16800b */ lui $s6,0x800b /* f18d5d4: 26d6d1c0 */ addiu $s6,$s6,-11840 .PF0f18d5d8: -/* f18d5d8: 0c004ad4 */ jal 0x12b50 +/* f18d5d8: 0c004ad4 */ jal random /* f18d5dc: 00000000 */ nop /* f18d5e0: 0054001b */ divu $zero,$v0,$s4 /* f18d5e4: 00002010 */ mfhi $a0 @@ -5236,7 +5236,7 @@ glabel func0f18c4c0 /* f18d5ec: 00000000 */ nop /* f18d5f0: 0007000d */ break 0x7 .PF0f18d5f4: -/* f18d5f4: 0fc6348e */ jal 0xf18d238 +/* f18d5f4: 0fc6348e */ jal mpGetTrackNumAtSlotIndex /* f18d5f8: 00000000 */ nop /* f18d5fc: 8ece0004 */ lw $t6,0x4($s6) /* f18d600: 00409825 */ move $s3,$v0 @@ -5264,7 +5264,7 @@ glabel func0f18c4c0 /* f18d654: 26d6d1c0 */ addiu $s6,$s6,-11840 /* f18d658: 00008025 */ move $s0,$zero .PF0f18d65c: -/* f18d65c: 0c004ad4 */ jal 0x12b50 +/* f18d65c: 0c004ad4 */ jal random /* f18d660: 00008825 */ move $s1,$zero /* f18d664: 0055001b */ divu $zero,$v0,$s5 /* f18d668: 00009010 */ mfhi $s2 @@ -5276,7 +5276,7 @@ glabel func0f18c4c0 /* f18d67c: 5a80000d */ blezl $s4,.PF0f18d6b4 /* f18d680: 2401ffff */ li $at,-1 .PF0f18d684: -/* f18d684: 0fc634d5 */ jal 0xf18d354 +/* f18d684: 0fc634d5 */ jal mpIsMultiTrackSlotEnabled /* f18d688: 02002025 */ move $a0,$s0 /* f18d68c: 50400006 */ beqzl $v0,.PF0f18d6a8 /* f18d690: 26100001 */ addiu $s0,$s0,0x1 @@ -5305,7 +5305,7 @@ glabel func0f18c4c0 /* f18d6e0: 10000055 */ b .PF0f18d838 /* f18d6e4: 00031242 */ srl $v0,$v1,0x9 .PF0f18d6e8: -/* f18d6e8: 0fc6348e */ jal 0xf18d238 +/* f18d6e8: 0fc6348e */ jal mpGetTrackNumAtSlotIndex /* f18d6ec: 02602025 */ move $a0,$s3 /* f18d6f0: 2aa10002 */ slti $at,$s5,0x2 /* f18d6f4: 14200004 */ bnez $at,.PF0f18d708 @@ -5332,17 +5332,17 @@ glabel func0f18c4c0 /* f18d744: 1000003c */ b .PF0f18d838 /* f18d748: 00031242 */ srl $v0,$v1,0x9 .PF0f18d74c: -/* f18d74c: 0fc6354b */ jal 0xf18d52c +/* f18d74c: 0fc6354b */ jal mpGetCurrentTrackSlotNum /* f18d750: 00000000 */ nop /* f18d754: 04410024 */ bgez $v0,.PF0f18d7e8 /* f18d758: 00409825 */ move $s3,$v0 -/* f18d75c: 0fc634a9 */ jal 0xf18d2a4 +/* f18d75c: 0fc634a9 */ jal mpGetNumUnlockedTracks /* f18d760: 00000000 */ nop /* f18d764: 3c16800b */ lui $s6,0x800b /* f18d768: 00408025 */ move $s0,$v0 /* f18d76c: 26d6d1c0 */ addiu $s6,$s6,-11840 .PF0f18d770: -/* f18d770: 0c004ad4 */ jal 0x12b50 +/* f18d770: 0c004ad4 */ jal random /* f18d774: 00000000 */ nop /* f18d778: 0050001b */ divu $zero,$v0,$s0 /* f18d77c: 00002010 */ mfhi $a0 @@ -5350,7 +5350,7 @@ glabel func0f18c4c0 /* f18d784: 00000000 */ nop /* f18d788: 0007000d */ break 0x7 .PF0f18d78c: -/* f18d78c: 0fc6348e */ jal 0xf18d238 +/* f18d78c: 0fc6348e */ jal mpGetTrackNumAtSlotIndex /* f18d790: 00000000 */ nop /* f18d794: 8ece0004 */ lw $t6,0x4($s6) /* f18d798: 00409825 */ move $s3,$v0 @@ -5374,7 +5374,7 @@ glabel func0f18c4c0 /* f18d7e0: 10000015 */ b .PF0f18d838 /* f18d7e4: 00031242 */ srl $v0,$v1,0x9 .PF0f18d7e8: -/* f18d7e8: 0fc6348e */ jal 0xf18d238 +/* f18d7e8: 0fc6348e */ jal mpGetTrackNumAtSlotIndex /* f18d7ec: 02602025 */ move $a0,$s3 /* f18d7f0: 00024080 */ sll $t0,$v0,0x2 /* f18d7f4: 3c16800b */ lui $s6,0x800b @@ -7085,7 +7085,7 @@ glabel func0f18dcec /* f18edec: 2610d128 */ addiu $s0,$s0,-11992 /* f18edf0: 0080f025 */ move $s8,$a0 /* f18edf4: 96120016 */ lhu $s2,0x16($s0) -/* f18edf8: 0fc61922 */ jal 0xf186488 +/* f18edf8: 0fc61922 */ jal scenarioInit /* f18edfc: a20e0010 */ sb $t6,0x10($s0) /* f18ee00: 03c0c825 */ move $t9,$s8 /* f18ee04: 02004025 */ move $t0,$s0 @@ -7134,18 +7134,18 @@ glabel func0f18dcec /* f18eea4: 01d37023 */ subu $t6,$t6,$s3 /* f18eea8: 15a1000a */ bne $t5,$at,.PF0f18eed4 /* f18eeac: 02202025 */ move $a0,$s1 -/* f18eeb0: 0fc5bdaa */ jal 0xf16f6a8 +/* f18eeb0: 0fc5bdaa */ jal langGet /* f18eeb4: 240454f2 */ li $a0,0x54f2 /* f18eeb8: 26720001 */ addiu $s2,$s3,0x1 /* f18eebc: 02403025 */ move $a2,$s2 /* f18eec0: 02202025 */ move $a0,$s1 -/* f18eec4: 0c004d11 */ jal 0x13444 +/* f18eec4: 0c004d11 */ jal sprintf /* f18eec8: 00402825 */ move $a1,$v0 /* f18eecc: 10000006 */ b .PF0f18eee8 /* f18eed0: 928f0029 */ lbu $t7,0x29($s4) .PF0f18eed4: /* f18eed4: 03ce2821 */ addu $a1,$s8,$t6 -/* f18eed8: 0c004bb0 */ jal 0x12ec0 +/* f18eed8: 0c004bb0 */ jal strcpy /* f18eedc: 24a50130 */ addiu $a1,$a1,0x130 /* f18eee0: 26720001 */ addiu $s2,$s3,0x1 /* f18eee4: 928f0029 */ lbu $t7,0x29($s4) @@ -7163,7 +7163,7 @@ glabel func0f18dcec /* f18ef10: 26f70004 */ addiu $s7,$s7,0x4 /* f18ef14: 1420ffd2 */ bnez $at,.PF0f18ee60 /* f18ef18: a239ffc5 */ sb $t9,-0x3b($s1) -/* f18ef1c: 0fc67684 */ jal 0xf19da10 +/* f18ef1c: 0fc67684 */ jal mpIsFeatureUnlocked /* f18ef20: 24040016 */ li $a0,0x16 /* f18ef24: 1440000c */ bnez $v0,.PF0f18ef58 /* f18ef28: 3c04800b */ lui $a0,0x800b @@ -7181,9 +7181,9 @@ glabel func0f18dcec /* f18ef50: 5444fffb */ bnel $v0,$a0,.PF0f18ef40 /* f18ef54: 90480018 */ lbu $t0,0x18($v0) .PF0f18ef58: -/* f18ef58: 0fc62878 */ jal 0xf18a1e0 +/* f18ef58: 0fc62878 */ jal func0f18913c /* f18ef5c: 00000000 */ nop -/* f18ef60: 0fc674a4 */ jal 0xf19d290 +/* f18ef60: 0fc674a4 */ jal func0f19c190 /* f18ef64: 00000000 */ nop /* f18ef68: 8fbf003c */ lw $ra,0x3c($sp) /* f18ef6c: 8fb00018 */ lw $s0,0x18($sp) diff --git a/src/game/mplayer/scenarios.c b/src/game/mplayer/scenarios.c index 06890f32c..77699ef8d 100644 --- a/src/game/mplayer/scenarios.c +++ b/src/game/mplayer/scenarios.c @@ -834,13 +834,13 @@ glabel scenarioHtbCallback18 /* f1817dc: 27bdff60 */ addiu $sp,$sp,-160 /* f1817e0: afbf003c */ sw $ra,0x3c($sp) /* f1817e4: afb00038 */ sw $s0,0x38($sp) -/* f1817e8: 0fc44cc9 */ jal 0xf113324 +/* f1817e8: 0fc44cc9 */ jal invHasBriefcase /* f1817ec: 00808025 */ move $s0,$a0 /* f1817f0: 50400058 */ beqzl $v0,.PF0f181954 /* f1817f4: 8fbf003c */ lw $ra,0x3c($sp) -/* f1817f8: 0c002e91 */ jal 0xba44 +/* f1817f8: 0c002e91 */ jal viGetViewLeft /* f1817fc: 00000000 */ nop -/* f181800: 0c002e73 */ jal 0xb9cc +/* f181800: 0c002e73 */ jal viGetViewWidth /* f181804: a7a20042 */ sh $v0,0x42($sp) /* f181808: 87af0042 */ lh $t7,0x42($sp) /* f18180c: 04410003 */ bgez $v0,.PF0f18181c @@ -849,7 +849,7 @@ glabel scenarioHtbCallback18 /* f181818: 00017043 */ sra $t6,$at,0x1 .PF0f18181c: /* f18181c: 01cf2821 */ addu $a1,$t6,$t7 -/* f181820: 0c002e95 */ jal 0xba54 +/* f181820: 0c002e95 */ jal viGetViewTop /* f181824: afa50088 */ sw $a1,0x88($sp) /* f181828: 3c19800a */ lui $t9,0x800a /* f18182c: 8f39a798 */ lw $t9,-0x5868($t9) @@ -865,9 +865,9 @@ glabel scenarioHtbCallback18 /* f181854: 3c057f1c */ lui $a1,0x7f1c /* f181858: 24a59ae0 */ addiu $a1,$a1,-25888 /* f18185c: 27a40044 */ addiu $a0,$sp,0x44 -/* f181860: 0c004d11 */ jal 0x13444 +/* f181860: 0c004d11 */ jal sprintf /* f181864: 00003025 */ move $a2,$zero -/* f181868: 0fc550cf */ jal 0xf15433c +/* f181868: 0fc550cf */ jal func0f153628 /* f18186c: 02002025 */ move $a0,$s0 /* f181870: 3c0b8008 */ lui $t3,0x8008 /* f181874: 8d6b0064 */ lw $t3,0x64($t3) @@ -878,7 +878,7 @@ glabel scenarioHtbCallback18 /* f181888: 27a50090 */ addiu $a1,$sp,0x90 /* f18188c: 27a60044 */ addiu $a2,$sp,0x44 /* f181890: afa00014 */ sw $zero,0x14($sp) -/* f181894: 0fc5609a */ jal 0xf158268 +/* f181894: 0fc5609a */ jal textMeasure /* f181898: afab0010 */ sw $t3,0x10($sp) /* f18189c: 8fa70090 */ lw $a3,0x90($sp) /* f1818a0: 8fa50088 */ lw $a1,0x88($sp) @@ -896,11 +896,11 @@ glabel scenarioHtbCallback18 /* f1818cc: afa2008c */ sw $v0,0x8c($sp) /* f1818d0: afa70090 */ sw $a3,0x90($sp) /* f1818d4: afa50088 */ sw $a1,0x88($sp) -/* f1818d8: 0fc551a9 */ jal 0xf1546a4 +/* f1818d8: 0fc551a9 */ jal func0f153990 /* f1818dc: 02002025 */ move $a0,$s0 -/* f1818e0: 0c002e53 */ jal 0xb94c +/* f1818e0: 0c002e53 */ jal viGetWidth /* f1818e4: 00408025 */ move $s0,$v0 -/* f1818e8: 0c002e57 */ jal 0xb95c +/* f1818e8: 0c002e57 */ jal viGetHeight /* f1818ec: a7a20040 */ sh $v0,0x40($sp) /* f1818f0: 3c0d8008 */ lui $t5,0x8008 /* f1818f4: 3c0e8008 */ lui $t6,0x8008 @@ -921,9 +921,9 @@ glabel scenarioHtbCallback18 /* f181930: afa0002c */ sw $zero,0x2c($sp) /* f181934: afae0014 */ sw $t6,0x14($sp) /* f181938: afad0010 */ sw $t5,0x10($sp) -/* f18193c: 0fc55fa0 */ jal 0xf157e80 +/* f18193c: 0fc55fa0 */ jal textRender /* f181940: afb90020 */ sw $t9,0x20($sp) -/* f181944: 0fc55125 */ jal 0xf154494 +/* f181944: 0fc55125 */ jal func0f153780 /* f181948: 00402025 */ move $a0,$v0 /* f18194c: 00408025 */ move $s0,$v0 /* f181950: 8fbf003c */ lw $ra,0x3c($sp) @@ -2034,7 +2034,7 @@ glabel var7f1b8950 /* f182d90: 4500003b */ bc1f .PF0f182e80 /* f182d94: 00000000 */ nop /* f182d98: 8664000e */ lh $a0,0xe($s3) -/* f182d9c: 0fc00b0a */ jal 0xf002c28 +/* f182d9c: 0fc00b0a */ jal roomSetLighting /* f182da0: afa00010 */ sw $zero,0x10($sp) /* f182da4: 8679000c */ lh $t9,0xc($s3) /* f182da8: 00002025 */ move $a0,$zero @@ -2043,7 +2043,7 @@ glabel var7f1b8950 /* f182db4: a660000a */ sh $zero,0xa($s3) /* f182db8: 8670000a */ lh $s0,0xa($s3) .PF0f182dbc: -/* f182dbc: 0c004ad4 */ jal 0x12b50 +/* f182dbc: 0c004ad4 */ jal random /* f182dc0: 00000000 */ nop /* f182dc4: 8668000c */ lh $t0,0xc($s3) /* f182dc8: 0048001b */ divu $zero,$v0,$t0 @@ -2063,7 +2063,7 @@ glabel var7f1b8950 /* f182dfc: a660000a */ sh $zero,0xa($s3) .PF0f182e00: /* f182e00: 24050042 */ li $a1,0x42 -/* f182e04: 0fc45964 */ jal 0xf116590 +/* f182e04: 0fc45964 */ jal padUnpack /* f182e08: 27a600a8 */ addiu $a2,$sp,0xa8 /* f182e0c: 8fac00f0 */ lw $t4,0xf0($sp) /* f182e10: c7a800a8 */ lwc1 $f8,0xa8($sp) @@ -2080,14 +2080,14 @@ glabel var7f1b8950 /* f182e3c: a66c000e */ sh $t4,0xe($s3) /* f182e40: e6680024 */ swc1 $f8,0x24($s3) /* f182e44: e66a0028 */ swc1 $f10,0x28($s3) -/* f182e48: 0c00a71b */ jal 0x29c6c +/* f182e48: 0c00a71b */ jal func0002a36c /* f182e4c: e672002c */ swc1 $f18,0x2c($s3) /* f182e50: e6600028 */ swc1 $f0,0x28($s3) /* f182e54: 8664000e */ lh $a0,0xe($s3) /* f182e58: 24050005 */ li $a1,0x5 /* f182e5c: 00003025 */ move $a2,$zero /* f182e60: 00003825 */ move $a3,$zero -/* f182e64: 0fc00b0a */ jal 0xf002c28 +/* f182e64: 0fc00b0a */ jal roomSetLighting /* f182e68: afa00010 */ sw $zero,0x10($sp) /* f182e6c: 240effff */ li $t6,-1 /* f182e70: a66e0004 */ sh $t6,0x4($s3) @@ -2127,7 +2127,7 @@ glabel var7f1b8950 /* f182ee4: 8c640004 */ lw $a0,0x4($v1) /* f182ee8: afa70170 */ sw $a3,0x170($sp) /* f182eec: afa60174 */ sw $a2,0x174($sp) -/* f182ef0: 0fc0e706 */ jal 0xf039c18 +/* f182ef0: 0fc0e706 */ jal chrIsDead /* f182ef4: afa30074 */ sw $v1,0x74($sp) /* f182ef8: 8fa30074 */ lw $v1,0x74($sp) /* f182efc: 8fa60174 */ lw $a2,0x174($sp) @@ -2161,7 +2161,7 @@ glabel var7f1b8950 /* f182f58: 90a40125 */ lbu $a0,0x125($a1) /* f182f5c: afa70170 */ sw $a3,0x170($sp) /* f182f60: afa60174 */ sw $a2,0x174($sp) -/* f182f64: 0fc63e8e */ jal 0xf18fa38 +/* f182f64: 0fc63e8e */ jal radarGetTeamIndex /* f182f68: afa30050 */ sw $v1,0x50($sp) /* f182f6c: 00025080 */ sll $t2,$v0,0x2 /* f182f70: 022a2021 */ addu $a0,$s1,$t2 @@ -2282,11 +2282,11 @@ glabel var7f1b8950 /* f1830f4: 8c845750 */ lw $a0,0x5750($a0) /* f1830f8: 2407ffff */ li $a3,-1 /* f1830fc: 00008825 */ move $s1,$zero -/* f183100: 0c0041a0 */ jal 0x10680 +/* f183100: 0c0041a0 */ jal audioStart /* f183104: e7a40014 */ swc1 $f4,0x14($sp) /* f183108: a6700004 */ sh $s0,0x4($s3) /* f18310c: a6600006 */ sh $zero,0x6($s3) -/* f183110: 0fc5bdaa */ jal 0xf16f6a8 +/* f183110: 0fc5bdaa */ jal langGet /* f183114: 24045417 */ li $a0,0x5417 /* f183118: 00107080 */ sll $t6,$s0,0x2 /* f18311c: 01d07023 */ subu $t6,$t6,$s0 @@ -2295,7 +2295,7 @@ glabel var7f1b8950 /* f183128: 000e7080 */ sll $t6,$t6,0x2 /* f18312c: 01cf3021 */ addu $a2,$t6,$t7 /* f183130: 27a4011c */ addiu $a0,$sp,0x11c -/* f183134: 0c004d11 */ jal 0x13444 +/* f183134: 0c004d11 */ jal sprintf /* f183138: 00402825 */ move $a1,$v0 /* f18313c: 8e98006c */ lw $t8,0x6c($s4) /* f183140: 27b0011c */ addiu $s0,$sp,0x11c @@ -2331,28 +2331,28 @@ glabel var7f1b8950 /* f1831a8: 19800035 */ blez $t4,.PF0f183280 /* f1831ac: 00000000 */ nop .PF0f1831b0: -/* f1831b0: 0fc4a4ff */ jal 0xf1293fc +/* f1831b0: 0fc4a4ff */ jal setCurrentPlayerNum /* f1831b4: 02202025 */ move $a0,$s1 /* f1831b8: 8e8d0284 */ lw $t5,0x284($s4) /* f1831bc: 8dae00bc */ lw $t6,0xbc($t5) /* f1831c0: 8dc50004 */ lw $a1,0x4($t6) -/* f1831c4: 0fc63e8e */ jal 0xf18fa38 +/* f1831c4: 0fc63e8e */ jal radarGetTeamIndex /* f1831c8: 90a40125 */ lbu $a0,0x125($a1) /* f1831cc: 866f0004 */ lh $t7,0x4($s3) /* f1831d0: 02002025 */ move $a0,$s0 /* f1831d4: 24050009 */ li $a1,0x9 /* f1831d8: 144f0009 */ bne $v0,$t7,.PF0f183200 /* f1831dc: 00000000 */ nop -/* f1831e0: 0fc5bdaa */ jal 0xf16f6a8 +/* f1831e0: 0fc5bdaa */ jal langGet /* f1831e4: 24045416 */ li $a0,0x5416 /* f1831e8: 00402025 */ move $a0,$v0 /* f1831ec: 24050009 */ li $a1,0x9 -/* f1831f0: 0fc37976 */ jal 0xf0de5d8 +/* f1831f0: 0fc37976 */ jal func0f0ddfa4 /* f1831f4: 24060001 */ li $a2,0x1 /* f1831f8: 10000004 */ b .PF0f18320c /* f1831fc: 8e98006c */ lw $t8,0x6c($s4) .PF0f183200: -/* f183200: 0fc37976 */ jal 0xf0de5d8 +/* f183200: 0fc37976 */ jal func0f0ddfa4 /* f183204: 24060001 */ li $a2,0x1 /* f183208: 8e98006c */ lw $t8,0x6c($s4) .PF0f18320c: @@ -2390,7 +2390,7 @@ glabel var7f1b8950 /* f183278: 1420ffcd */ bnez $at,.PF0f1831b0 /* f18327c: 00000000 */ nop .PF0f183280: -/* f183280: 0fc4a4ff */ jal 0xf1293fc +/* f183280: 0fc4a4ff */ jal setCurrentPlayerNum /* f183284: 02402025 */ move $a0,$s2 /* f183288: 1000006d */ b .PF0f183440 /* f18328c: 86630004 */ lh $v1,0x4($s3) @@ -2425,7 +2425,7 @@ glabel var7f1b8950 /* f1832fc: 00003025 */ move $a2,$zero /* f183300: 2407ffff */ li $a3,-1 /* f183304: 00009025 */ move $s2,$zero -/* f183308: 0c0041a0 */ jal 0x10680 +/* f183308: 0c0041a0 */ jal audioStart /* f18330c: e7a60014 */ swc1 $f6,0x14($sp) /* f183310: 3c03800b */ lui $v1,0x800b /* f183314: 8c63cad0 */ lw $v1,-0x3530($v1) @@ -2438,7 +2438,7 @@ glabel var7f1b8950 .PF0f183330: /* f183330: 8e0d0000 */ lw $t5,0x0($s0) /* f183334: 91a40125 */ lbu $a0,0x125($t5) -/* f183338: 0fc63e8e */ jal 0xf18fa38 +/* f183338: 0fc63e8e */ jal radarGetTeamIndex /* f18333c: afa5004c */ sw $a1,0x4c($sp) /* f183340: 866e0004 */ lh $t6,0x4($s3) /* f183344: 8fa5004c */ lw $a1,0x4c($sp) @@ -2474,18 +2474,18 @@ glabel var7f1b8950 /* f1833b0: 8c4b02d4 */ lw $t3,0x2d4($v0) /* f1833b4: 1560000e */ bnez $t3,.PF0f1833f0 /* f1833b8: 00000000 */ nop -/* f1833bc: 0fc63e8e */ jal 0xf18fa38 +/* f1833bc: 0fc63e8e */ jal radarGetTeamIndex /* f1833c0: 90440125 */ lbu $a0,0x125($v0) /* f1833c4: 866c0004 */ lh $t4,0x4($s3) /* f1833c8: 144c0009 */ bne $v0,$t4,.PF0f1833f0 /* f1833cc: 00000000 */ nop -/* f1833d0: 0fc4a4ff */ jal 0xf1293fc +/* f1833d0: 0fc4a4ff */ jal setCurrentPlayerNum /* f1833d4: 02402025 */ move $a0,$s2 -/* f1833d8: 0fc5bdaa */ jal 0xf16f6a8 +/* f1833d8: 0fc5bdaa */ jal langGet /* f1833dc: 24045415 */ li $a0,0x5415 /* f1833e0: 00402025 */ move $a0,$v0 /* f1833e4: 24050009 */ li $a1,0x9 -/* f1833e8: 0fc37976 */ jal 0xf0de5d8 +/* f1833e8: 0fc37976 */ jal func0f0ddfa4 /* f1833ec: 24060001 */ li $a2,0x1 .PF0f1833f0: /* f1833f0: 3c0d800b */ lui $t5,0x800b @@ -2496,7 +2496,7 @@ glabel var7f1b8950 /* f183404: 5420ffea */ bnezl $at,.PF0f1833b0 /* f183408: 8e020000 */ lw $v0,0x0($s0) .PF0f18340c: -/* f18340c: 0fc4a4ff */ jal 0xf1293fc +/* f18340c: 0fc4a4ff */ jal setCurrentPlayerNum /* f183410: 02202025 */ move $a0,$s1 /* f183414: 240effff */ li $t6,-1 /* f183418: a66e0004 */ sh $t6,0x4($s3) @@ -3370,7 +3370,7 @@ glabel scenarioKohCallback18 /* f183690: 8dcf00bc */ lw $t7,0xbc($t6) /* f183694: 00808025 */ move $s0,$a0 /* f183698: 8de20004 */ lw $v0,0x4($t7) -/* f18369c: 0fc63e8e */ jal 0xf18fa38 +/* f18369c: 0fc63e8e */ jal radarGetTeamIndex /* f1836a0: 90440125 */ lbu $a0,0x125($v0) /* f1836a4: 3c03800b */ lui $v1,0x800b /* f1836a8: 2463c6b0 */ addiu $v1,$v1,-14672 @@ -3380,9 +3380,9 @@ glabel scenarioKohCallback18 /* f1836b8: 84790008 */ lh $t9,0x8($v1) /* f1836bc: 5720008f */ bnezl $t9,.PF0f1838fc /* f1836c0: 8fbf003c */ lw $ra,0x3c($sp) -/* f1836c4: 0c002e91 */ jal 0xba44 +/* f1836c4: 0c002e91 */ jal viGetViewLeft /* f1836c8: 00000000 */ nop -/* f1836cc: 0c002e73 */ jal 0xb9cc +/* f1836cc: 0c002e73 */ jal viGetViewWidth /* f1836d0: a7a2004e */ sh $v0,0x4e($sp) /* f1836d4: 87aa004e */ lh $t2,0x4e($sp) /* f1836d8: 04410003 */ bgez $v0,.PF0f1836e8 @@ -3391,7 +3391,7 @@ glabel scenarioKohCallback18 /* f1836e4: 00014843 */ sra $t1,$at,0x1 .PF0f1836e8: /* f1836e8: 012a2821 */ addu $a1,$t1,$t2 -/* f1836ec: 0c002e95 */ jal 0xba54 +/* f1836ec: 0c002e95 */ jal viGetViewTop /* f1836f0: afa50098 */ sw $a1,0x98($sp) /* f1836f4: 3c04800a */ lui $a0,0x800a /* f1836f8: 8c84a994 */ lw $a0,-0x566c($a0) @@ -3450,7 +3450,7 @@ glabel scenarioKohCallback18 /* f1837c0: 00000000 */ nop /* f1837c4: 0006000d */ break 0x6 .PF0f1837c8: -/* f1837c8: 0c004d11 */ jal 0x13444 +/* f1837c8: 0c004d11 */ jal sprintf /* f1837cc: 00000000 */ nop /* f1837d0: 1000000f */ b .PF0f183810 /* f1837d4: 00000000 */ nop @@ -3469,10 +3469,10 @@ glabel scenarioKohCallback18 /* f183800: 00000000 */ nop /* f183804: 0006000d */ break 0x6 .PF0f183808: -/* f183808: 0c004d11 */ jal 0x13444 +/* f183808: 0c004d11 */ jal sprintf /* f18380c: 00000000 */ nop .PF0f183810: -/* f183810: 0fc550cf */ jal 0xf15433c +/* f183810: 0fc550cf */ jal func0f153628 /* f183814: 02002025 */ move $a0,$s0 /* f183818: 3c098008 */ lui $t1,0x8008 /* f18381c: 8d290064 */ lw $t1,0x64($t1) @@ -3483,7 +3483,7 @@ glabel scenarioKohCallback18 /* f183830: 27a500a0 */ addiu $a1,$sp,0xa0 /* f183834: 27a60050 */ addiu $a2,$sp,0x50 /* f183838: afa00014 */ sw $zero,0x14($sp) -/* f18383c: 0fc5609a */ jal 0xf158268 +/* f18383c: 0fc5609a */ jal textMeasure /* f183840: afa90010 */ sw $t1,0x10($sp) /* f183844: 8fa700a0 */ lw $a3,0xa0($sp) /* f183848: 8fa50098 */ lw $a1,0x98($sp) @@ -3501,11 +3501,11 @@ glabel scenarioKohCallback18 /* f183874: afa2009c */ sw $v0,0x9c($sp) /* f183878: afa700a0 */ sw $a3,0xa0($sp) /* f18387c: afa50098 */ sw $a1,0x98($sp) -/* f183880: 0fc551a9 */ jal 0xf1546a4 +/* f183880: 0fc551a9 */ jal func0f153990 /* f183884: 02002025 */ move $a0,$s0 -/* f183888: 0c002e53 */ jal 0xb94c +/* f183888: 0c002e53 */ jal viGetWidth /* f18388c: 00408025 */ move $s0,$v0 -/* f183890: 0c002e57 */ jal 0xb95c +/* f183890: 0c002e57 */ jal viGetHeight /* f183894: a7a2004c */ sh $v0,0x4c($sp) /* f183898: 3c0b8008 */ lui $t3,0x8008 /* f18389c: 3c0c8008 */ lui $t4,0x8008 @@ -3526,9 +3526,9 @@ glabel scenarioKohCallback18 /* f1838d8: afa0002c */ sw $zero,0x2c($sp) /* f1838dc: afac0014 */ sw $t4,0x14($sp) /* f1838e0: afab0010 */ sw $t3,0x10($sp) -/* f1838e4: 0fc55fa0 */ jal 0xf157e80 +/* f1838e4: 0fc55fa0 */ jal textRender /* f1838e8: afaf0020 */ sw $t7,0x20($sp) -/* f1838ec: 0fc55125 */ jal 0xf154494 +/* f1838ec: 0fc55125 */ jal func0f153780 /* f1838f0: 00402025 */ move $a0,$v0 /* f1838f4: 00408025 */ move $s0,$v0 /* f1838f8: 8fbf003c */ lw $ra,0x3c($sp) @@ -8742,7 +8742,7 @@ glabel chrGiveBriefcase /* f1878e4: 2631a510 */ addiu $s1,$s1,-23280 /* f1878e8: 53200017 */ beqzl $t9,.PF0f187948 /* f1878ec: 8e39028c */ lw $t9,0x28c($s1) -/* f1878f0: 0fc63831 */ jal 0xf18e0c4 +/* f1878f0: 0fc63831 */ jal mpPlayerGetIndex /* f1878f4: 00000000 */ nop /* f1878f8: 00025080 */ sll $t2,$v0,0x2 /* f1878fc: 3c0b800b */ lui $t3,0x800b @@ -8751,14 +8751,14 @@ glabel chrGiveBriefcase /* f187908: 8fac0120 */ lw $t4,0x120($sp) /* f18790c: 8fa4012c */ lw $a0,0x12c($sp) /* f187910: afab0050 */ sw $t3,0x50($sp) -/* f187914: 0fc21f5f */ jal 0xf087d7c +/* f187914: 0fc21f5f */ jal propPlayPickupSound /* f187918: 9185005c */ lbu $a1,0x5c($t4) /* f18791c: 8fa40128 */ lw $a0,0x128($sp) /* f187920: 24050057 */ li $a1,0x57 /* f187924: 8c8302d4 */ lw $v1,0x2d4($a0) /* f187928: 906e009c */ lbu $t6,0x9c($v1) /* f18792c: 35d80080 */ ori $t8,$t6,0x80 -/* f187930: 0fc663e3 */ jal 0xf198f8c +/* f187930: 0fc663e3 */ jal aibotGiveSingleWeapon /* f187934: a078009c */ sb $t8,0x9c($v1) /* f187938: 3c11800a */ lui $s1,0x800a /* f18793c: 10000020 */ b .PF0f1879c0 @@ -8790,23 +8790,23 @@ glabel chrGiveBriefcase /* f18799c: 03197821 */ addu $t7,$t8,$t9 /* f1879a0: afaf0050 */ sw $t7,0x50($sp) .PF0f1879a4: -/* f1879a4: 0fc44a1a */ jal 0xf112868 +/* f1879a4: 0fc44a1a */ jal invGiveSingleWeapon /* f1879a8: 24040057 */ li $a0,0x57 /* f1879ac: 24040057 */ li $a0,0x57 -/* f1879b0: 0fc221bd */ jal 0xf0886f4 +/* f1879b0: 0fc221bd */ jal currentPlayerQueuePickupWeaponHudmsg /* f1879b4: 00002825 */ move $a1,$zero -/* f1879b8: 0fc21fa0 */ jal 0xf087e80 +/* f1879b8: 0fc21fa0 */ jal func0f087d10 /* f1879bc: 24040057 */ li $a0,0x57 .PF0f1879c0: -/* f1879c0: 0fc5bdaa */ jal 0xf16f6a8 +/* f1879c0: 0fc5bdaa */ jal langGet /* f1879c4: 24045401 */ li $a0,0x5401 /* f1879c8: 24040057 */ li $a0,0x57 -/* f1879cc: 0fc28941 */ jal 0xf0a2504 +/* f1879cc: 0fc28941 */ jal weaponGetShortName /* f1879d0: afa20048 */ sw $v0,0x48($sp) /* f1879d4: 8fa50048 */ lw $a1,0x48($sp) /* f1879d8: 27a400d4 */ addiu $a0,$sp,0xd4 /* f1879dc: 8fa60050 */ lw $a2,0x50($sp) -/* f1879e0: 0c004d11 */ jal 0x13444 +/* f1879e0: 0c004d11 */ jal sprintf /* f1879e4: 00403825 */ move $a3,$v0 /* f1879e8: 8e29006c */ lw $t1,0x6c($s1) /* f1879ec: 8e2a028c */ lw $t2,0x28c($s1) @@ -8852,11 +8852,11 @@ glabel chrGiveBriefcase /* f187a74: 1219000f */ beq $s0,$t9,.PF0f187ab4 /* f187a78: 00000000 */ nop .PF0f187a7c: -/* f187a7c: 0fc4a4ff */ jal 0xf1293fc +/* f187a7c: 0fc4a4ff */ jal setCurrentPlayerNum /* f187a80: 02002025 */ move $a0,$s0 /* f187a84: 27a400d4 */ addiu $a0,$sp,0xd4 /* f187a88: 24050009 */ li $a1,0x9 -/* f187a8c: 0fc37976 */ jal 0xf0de5d8 +/* f187a8c: 0fc37976 */ jal func0f0ddfa4 /* f187a90: 24060001 */ li $a2,0x1 /* f187a94: 3c09800a */ lui $t1,0x800a /* f187a98: 3c08800a */ lui $t0,0x800a @@ -8896,7 +8896,7 @@ glabel chrGiveBriefcase /* f187b08: 5420ffd6 */ bnezl $at,.PF0f187a64 /* f187b0c: 8fae0128 */ lw $t6,0x128($sp) .PF0f187b10: -/* f187b10: 0fc4a4ff */ jal 0xf1293fc +/* f187b10: 0fc4a4ff */ jal setCurrentPlayerNum /* f187b14: 8fa40118 */ lw $a0,0x118($sp) /* f187b18: 8fac0128 */ lw $t4,0x128($sp) /* f187b1c: 8fa30124 */ lw $v1,0x124($sp) @@ -8913,7 +8913,7 @@ glabel chrGiveBriefcase .PF0f187b48: /* f187b48: 00002825 */ move $a1,$zero /* f187b4c: 30cf0004 */ andi $t7,$a2,0x4 -/* f187b50: 0fc1abed */ jal 0xf06afb4 +/* f187b50: 0fc1abed */ jal func0f06ad2c /* f187b54: 01e03025 */ move $a2,$t7 /* f187b58: 100001af */ b .PF0f188218 /* f187b5c: 24020001 */ li $v0,0x1 @@ -8927,7 +8927,7 @@ glabel chrGiveBriefcase /* f187b78: 8d4302d4 */ lw $v1,0x2d4($t2) /* f187b7c: 5060000e */ beqzl $v1,.PF0f187bb8 /* f187b80: 8e2e028c */ lw $t6,0x28c($s1) -/* f187b84: 0fc63831 */ jal 0xf18e0c4 +/* f187b84: 0fc63831 */ jal mpPlayerGetIndex /* f187b88: 01402025 */ move $a0,$t2 /* f187b8c: 00025880 */ sll $t3,$v0,0x2 /* f187b90: 3c0c800b */ lui $t4,0x800b @@ -8981,7 +8981,7 @@ glabel chrGiveBriefcase .PF0f187c44: /* f187c44: 546000ad */ bnezl $v1,.PF0f187efc /* f187c48: 8fad0128 */ lw $t5,0x128($sp) -/* f187c4c: 0fc44cc9 */ jal 0xf113324 +/* f187c4c: 0fc44cc9 */ jal invHasBriefcase /* f187c50: 00000000 */ nop /* f187c54: 504000a9 */ beqzl $v0,.PF0f187efc /* f187c58: 8fad0128 */ lw $t5,0x128($sp) @@ -9008,7 +9008,7 @@ glabel chrGiveBriefcase .PF0f187ca4: /* f187ca4: 11a00009 */ beqz $t5,.PF0f187ccc /* f187ca8: 01802025 */ move $a0,$t4 -/* f187cac: 0fc66aa1 */ jal 0xf19aa84 +/* f187cac: 0fc66aa1 */ jal func0f199984 /* f187cb0: 24050057 */ li $a1,0x57 /* f187cb4: 8fae0128 */ lw $t6,0x128($sp) /* f187cb8: 8dc302d4 */ lw $v1,0x2d4($t6) @@ -9030,14 +9030,14 @@ glabel chrGiveBriefcase /* f187cf4: 240505b8 */ li $a1,0x5b8 /* f187cf8: 00003025 */ move $a2,$zero /* f187cfc: 2407ffff */ li $a3,-1 -/* f187d00: 0c0041a0 */ jal 0x10680 +/* f187d00: 0c0041a0 */ jal audioStart /* f187d04: e7a40014 */ swc1 $f4,0x14($sp) -/* f187d08: 0fc24454 */ jal 0xf091150 +/* f187d08: 0fc24454 */ jal func0f091250 /* f187d0c: 24040057 */ li $a0,0x57 -/* f187d10: 0fc44a61 */ jal 0xf112984 +/* f187d10: 0fc44a61 */ jal invRemoveItemByNum /* f187d14: 24040057 */ li $a0,0x57 .PF0f187d18: -/* f187d18: 0fc5bdaa */ jal 0xf16f6a8 +/* f187d18: 0fc5bdaa */ jal langGet /* f187d1c: 24045405 */ li $a0,0x5405 /* f187d20: 00106880 */ sll $t5,$s0,0x2 /* f187d24: 01b06823 */ subu $t5,$t5,$s0 @@ -9047,20 +9047,20 @@ glabel chrGiveBriefcase /* f187d34: 01ac3021 */ addu $a2,$t5,$t4 /* f187d38: afa6003c */ sw $a2,0x3c($sp) /* f187d3c: 27a400d4 */ addiu $a0,$sp,0xd4 -/* f187d40: 0c004d11 */ jal 0x13444 +/* f187d40: 0c004d11 */ jal sprintf /* f187d44: 00402825 */ move $a1,$v0 -/* f187d48: 0fc5bdaa */ jal 0xf16f6a8 +/* f187d48: 0fc5bdaa */ jal langGet /* f187d4c: 24045406 */ li $a0,0x5406 /* f187d50: 27a40094 */ addiu $a0,$sp,0x94 /* f187d54: 00402825 */ move $a1,$v0 -/* f187d58: 0c004d11 */ jal 0x13444 +/* f187d58: 0c004d11 */ jal sprintf /* f187d5c: 8fa60050 */ lw $a2,0x50($sp) -/* f187d60: 0fc5bdaa */ jal 0xf16f6a8 +/* f187d60: 0fc5bdaa */ jal langGet /* f187d64: 24045407 */ li $a0,0x5407 /* f187d68: 27a40054 */ addiu $a0,$sp,0x54 /* f187d6c: 00402825 */ move $a1,$v0 /* f187d70: 8fa60050 */ lw $a2,0x50($sp) -/* f187d74: 0c004d11 */ jal 0x13444 +/* f187d74: 0c004d11 */ jal sprintf /* f187d78: 8fa7003c */ lw $a3,0x3c($sp) /* f187d7c: 8e39006c */ lw $t9,0x6c($s1) /* f187d80: 8e2e028c */ lw $t6,0x28c($s1) @@ -9099,7 +9099,7 @@ glabel chrGiveBriefcase /* f187df0: 1980003f */ blez $t4,.PF0f187ef0 /* f187df4: 00000000 */ nop .PF0f187df8: -/* f187df8: 0fc4a4ff */ jal 0xf1293fc +/* f187df8: 0fc4a4ff */ jal setCurrentPlayerNum /* f187dfc: 02002025 */ move $a0,$s0 /* f187e00: 8fae0128 */ lw $t6,0x128($sp) /* f187e04: 00107880 */ sll $t7,$s0,0x2 @@ -9112,7 +9112,7 @@ glabel chrGiveBriefcase /* f187e20: 160a0006 */ bne $s0,$t2,.PF0f187e3c /* f187e24: 27a400d4 */ addiu $a0,$sp,0xd4 /* f187e28: 24050009 */ li $a1,0x9 -/* f187e2c: 0fc37976 */ jal 0xf0de5d8 +/* f187e2c: 0fc37976 */ jal func0f0ddfa4 /* f187e30: 24060001 */ li $a2,0x1 /* f187e34: 10000011 */ b .PF0f187e7c /* f187e38: 8e2c006c */ lw $t4,0x6c($s1) @@ -9126,12 +9126,12 @@ glabel chrGiveBriefcase /* f187e54: 170d0006 */ bne $t8,$t5,.PF0f187e70 /* f187e58: 00000000 */ nop /* f187e5c: 27a40094 */ addiu $a0,$sp,0x94 -/* f187e60: 0fc37976 */ jal 0xf0de5d8 +/* f187e60: 0fc37976 */ jal func0f0ddfa4 /* f187e64: 24050009 */ li $a1,0x9 /* f187e68: 10000004 */ b .PF0f187e7c /* f187e6c: 8e2c006c */ lw $t4,0x6c($s1) .PF0f187e70: -/* f187e70: 0fc37976 */ jal 0xf0de5d8 +/* f187e70: 0fc37976 */ jal func0f0ddfa4 /* f187e74: 24060001 */ li $a2,0x1 /* f187e78: 8e2c006c */ lw $t4,0x6c($s1) .PF0f187e7c: @@ -9169,7 +9169,7 @@ glabel chrGiveBriefcase /* f187ee8: 1420ffc3 */ bnez $at,.PF0f187df8 /* f187eec: 00000000 */ nop .PF0f187ef0: -/* f187ef0: 0fc4a4ff */ jal 0xf1293fc +/* f187ef0: 0fc4a4ff */ jal setCurrentPlayerNum /* f187ef4: 8fa40118 */ lw $a0,0x118($sp) /* f187ef8: 8fad0128 */ lw $t5,0x128($sp) .PF0f187efc: @@ -9191,7 +9191,7 @@ glabel chrGiveBriefcase .PF0f187f30: /* f187f30: 546000ac */ bnezl $v1,.PF0f1881e4 /* f187f34: 8fac0128 */ lw $t4,0x128($sp) -/* f187f38: 0fc44cc9 */ jal 0xf113324 +/* f187f38: 0fc44cc9 */ jal invHasBriefcase /* f187f3c: 00000000 */ nop /* f187f40: 144000a7 */ bnez $v0,.PF0f1881e0 /* f187f44: 8faf0128 */ lw $t7,0x128($sp) @@ -9204,7 +9204,7 @@ glabel chrGiveBriefcase /* f187f5c: a06d009c */ sb $t5,0x9c($v1) /* f187f60: 8fac0120 */ lw $t4,0x120($sp) /* f187f64: 8fa4012c */ lw $a0,0x12c($sp) -/* f187f68: 0fc21f5f */ jal 0xf087d7c +/* f187f68: 0fc21f5f */ jal propPlayPickupSound /* f187f6c: 9185005c */ lbu $a1,0x5c($t4) /* f187f70: 8faa0120 */ lw $t2,0x120($sp) .PF0f187f74: @@ -9215,7 +9215,7 @@ glabel chrGiveBriefcase /* f187f84: 24045402 */ li $a0,0x5402 /* f187f88: 000f5880 */ sll $t3,$t7,0x2 /* f187f8c: 002b0821 */ addu $at,$at,$t3 -/* f187f90: 0fc5bdaa */ jal 0xf16f6a8 +/* f187f90: 0fc5bdaa */ jal langGet /* f187f94: ac39c708 */ sw $t9,-0x38f8($at) /* f187f98: 8fb80120 */ lw $t8,0x120($sp) /* f187f9c: 3c10800b */ lui $s0,0x800b @@ -9227,15 +9227,15 @@ glabel chrGiveBriefcase /* f187fb4: 018d6023 */ subu $t4,$t4,$t5 /* f187fb8: 000c6080 */ sll $t4,$t4,0x2 /* f187fbc: 020c3821 */ addu $a3,$s0,$t4 -/* f187fc0: 0c004d11 */ jal 0x13444 +/* f187fc0: 0c004d11 */ jal sprintf /* f187fc4: 8fa60050 */ lw $a2,0x50($sp) -/* f187fc8: 0fc5bdaa */ jal 0xf16f6a8 +/* f187fc8: 0fc5bdaa */ jal langGet /* f187fcc: 24045403 */ li $a0,0x5403 /* f187fd0: 27a40094 */ addiu $a0,$sp,0x94 /* f187fd4: 00402825 */ move $a1,$v0 -/* f187fd8: 0c004d11 */ jal 0x13444 +/* f187fd8: 0c004d11 */ jal sprintf /* f187fdc: 8fa60050 */ lw $a2,0x50($sp) -/* f187fe0: 0fc5bdaa */ jal 0xf16f6a8 +/* f187fe0: 0fc5bdaa */ jal langGet /* f187fe4: 24045404 */ li $a0,0x5404 /* f187fe8: 8fae0120 */ lw $t6,0x120($sp) /* f187fec: 27a40054 */ addiu $a0,$sp,0x54 @@ -9244,7 +9244,7 @@ glabel chrGiveBriefcase /* f187ff8: 000a7880 */ sll $t7,$t2,0x2 /* f187ffc: 01ea7823 */ subu $t7,$t7,$t2 /* f188000: 000f7880 */ sll $t7,$t7,0x2 -/* f188004: 0c004d11 */ jal 0x13444 +/* f188004: 0c004d11 */ jal sprintf /* f188008: 020f3021 */ addu $a2,$s0,$t7 /* f18800c: 8e2b006c */ lw $t3,0x6c($s1) /* f188010: 8e39028c */ lw $t9,0x28c($s1) @@ -9282,7 +9282,7 @@ glabel chrGiveBriefcase /* f18807c: 19e0003f */ blez $t7,.PF0f18817c /* f188080: 00000000 */ nop .PF0f188084: -/* f188084: 0fc4a4ff */ jal 0xf1293fc +/* f188084: 0fc4a4ff */ jal setCurrentPlayerNum /* f188088: 02002025 */ move $a0,$s0 /* f18808c: 8fb90128 */ lw $t9,0x128($sp) /* f188090: 00107080 */ sll $t6,$s0,0x2 @@ -9295,7 +9295,7 @@ glabel chrGiveBriefcase /* f1880ac: 16180006 */ bne $s0,$t8,.PF0f1880c8 /* f1880b0: 27a40054 */ addiu $a0,$sp,0x54 /* f1880b4: 24050009 */ li $a1,0x9 -/* f1880b8: 0fc37976 */ jal 0xf0de5d8 +/* f1880b8: 0fc37976 */ jal func0f0ddfa4 /* f1880bc: 24060001 */ li $a2,0x1 /* f1880c0: 10000011 */ b .PF0f188108 /* f1880c4: 8e39006c */ lw $t9,0x6c($s1) @@ -9309,12 +9309,12 @@ glabel chrGiveBriefcase /* f1880e0: 158f0006 */ bne $t4,$t7,.PF0f1880fc /* f1880e4: 00000000 */ nop /* f1880e8: 27a40094 */ addiu $a0,$sp,0x94 -/* f1880ec: 0fc37976 */ jal 0xf0de5d8 +/* f1880ec: 0fc37976 */ jal func0f0ddfa4 /* f1880f0: 24050009 */ li $a1,0x9 /* f1880f4: 10000004 */ b .PF0f188108 /* f1880f8: 8e39006c */ lw $t9,0x6c($s1) .PF0f1880fc: -/* f1880fc: 0fc37976 */ jal 0xf0de5d8 +/* f1880fc: 0fc37976 */ jal func0f0ddfa4 /* f188100: 24060001 */ li $a2,0x1 /* f188104: 8e39006c */ lw $t9,0x6c($s1) .PF0f188108: @@ -9352,14 +9352,14 @@ glabel chrGiveBriefcase /* f188174: 1420ffc3 */ bnez $at,.PF0f188084 /* f188178: 00000000 */ nop .PF0f18817c: -/* f18817c: 0fc4a4ff */ jal 0xf1293fc +/* f18817c: 0fc4a4ff */ jal setCurrentPlayerNum /* f188180: 8fa40118 */ lw $a0,0x118($sp) /* f188184: 8faf0128 */ lw $t7,0x128($sp) /* f188188: 8df902d4 */ lw $t9,0x2d4($t7) /* f18818c: 01e02025 */ move $a0,$t7 /* f188190: 13200009 */ beqz $t9,.PF0f1881b8 /* f188194: 00000000 */ nop -/* f188198: 0fc663e3 */ jal 0xf198f8c +/* f188198: 0fc663e3 */ jal aibotGiveSingleWeapon /* f18819c: 24050057 */ li $a1,0x57 /* f1881a0: 8fab0124 */ lw $t3,0x124($sp) /* f1881a4: 00001025 */ move $v0,$zero @@ -9368,13 +9368,13 @@ glabel chrGiveBriefcase /* f1881b0: 10000019 */ b .PF0f188218 /* f1881b4: ad6d0040 */ sw $t5,0x40($t3) .PF0f1881b8: -/* f1881b8: 0fc44af4 */ jal 0xf112bd0 +/* f1881b8: 0fc44af4 */ jal invGiveWeaponsByProp /* f1881bc: 8fa4012c */ lw $a0,0x12c($sp) /* f1881c0: 8fa40124 */ lw $a0,0x124($sp) /* f1881c4: 00002825 */ move $a1,$zero /* f1881c8: 90860002 */ lbu $a2,0x2($a0) /* f1881cc: 30ca0004 */ andi $t2,$a2,0x4 -/* f1881d0: 0fc1abed */ jal 0xf06afb4 +/* f1881d0: 0fc1abed */ jal func0f06ad2c /* f1881d4: 01403025 */ move $a2,$t2 /* f1881d8: 1000000f */ b .PF0f188218 /* f1881dc: 24020001 */ li $v0,0x1 diff --git a/src/game/pak/pak.c b/src/game/pak/pak.c index 33eba32b6..7b4afa1c8 100644 --- a/src/game/pak/pak.c +++ b/src/game/pak/pak.c @@ -1651,12 +1651,12 @@ glabel func0f118674 /* f1186a0: afb0002c */ sw $s0,0x2c($sp) /* f1186a4: afa5007c */ sw $a1,0x7c($sp) /* f1186a8: afa60080 */ sw $a2,0x80($sp) -/* f1186ac: 0fc45c05 */ jal 0xf117014 +/* f1186ac: 0fc45c05 */ jal func0f117094 /* f1186b0: 01e02025 */ or $a0,$t7,$zero /* f1186b4: 00112600 */ sll $a0,$s1,0x18 /* f1186b8: 0004c603 */ sra $t8,$a0,0x18 /* f1186bc: 03002025 */ or $a0,$t8,$zero -/* f1186c0: 0fc45976 */ jal 0xf1165d8 +/* f1186c0: 0fc45976 */ jal func0f116658 /* f1186c4: 00402825 */ or $a1,$v0,$zero /* f1186c8: 00112600 */ sll $a0,$s1,0x18 /* f1186cc: 2419ffff */ addiu $t9,$zero,-1 @@ -1665,13 +1665,13 @@ glabel func0f118674 /* f1186d8: afb90058 */ sw $t9,0x58($sp) /* f1186dc: 00008025 */ or $s0,$zero,$zero /* f1186e0: afa00050 */ sw $zero,0x50($sp) -/* f1186e4: 0fc459d6 */ jal 0xf116758 +/* f1186e4: 0fc459d6 */ jal func0f1167d8 /* f1186e8: 01002025 */ or $a0,$t0,$zero /* f1186ec: 10400007 */ beqz $v0,.L0f11870c /* f1186f0: 00115080 */ sll $t2,$s1,0x2 /* f1186f4: 00112600 */ sll $a0,$s1,0x18 /* f1186f8: 00044e03 */ sra $t1,$a0,0x18 -/* f1186fc: 0fc459d6 */ jal 0xf116758 +/* f1186fc: 0fc459d6 */ jal func0f1167d8 /* f118700: 01202025 */ or $a0,$t1,$zero /* f118704: 10000097 */ beqz $zero,.L0f118964 /* f118708: 8fbf003c */ lw $ra,0x3c($sp) @@ -1694,7 +1694,7 @@ glabel func0f118674 /* f118744: 00046e03 */ sra $t5,$a0,0x18 /* f118748: 01a02025 */ or $a0,$t5,$zero /* f11874c: 02002825 */ or $a1,$s0,$zero -/* f118750: 0fc45d28 */ jal 0xf1174a0 +/* f118750: 0fc45d28 */ jal func0f117520 /* f118754: 27a60068 */ addiu $a2,$sp,0x68 /* f118758: 1440001a */ bnez $v0,.L0f1187c4 /* f11875c: 24010001 */ addiu $at,$zero,0x1 @@ -1733,7 +1733,7 @@ glabel func0f118674 /* f1187d0: 24020001 */ addiu $v0,$zero,0x1 .L0f1187d4: /* f1187d4: 00046603 */ sra $t4,$a0,0x18 -/* f1187d8: 0fc45954 */ jal 0xf116550 +/* f1187d8: 0fc45954 */ jal func0f1165d0 /* f1187dc: 01802025 */ or $a0,$t4,$zero /* f1187e0: 02028021 */ addu $s0,$s0,$v0 .L0f1187e4: @@ -1747,13 +1747,13 @@ glabel func0f118674 /* f1187fc: 12000047 */ beqz $s0,.L0f11891c /* f118800: 00112600 */ sll $a0,$s1,0x18 /* f118804: 00047603 */ sra $t6,$a0,0x18 -/* f118808: 0fc45ff0 */ jal 0xf117fc0 +/* f118808: 0fc45ff0 */ jal func0f117fc0 /* f11880c: 01c02025 */ or $a0,$t6,$zero /* f118810: 0202082b */ sltu $at,$s0,$v0 /* f118814: 10200041 */ beqz $at,.L0f11891c /* f118818: 00112600 */ sll $a0,$s1,0x18 /* f11881c: 0004c603 */ sra $t8,$a0,0x18 -/* f118820: 0fc45954 */ jal 0xf116550 +/* f118820: 0fc45954 */ jal func0f1165d0 /* f118824: 03002025 */ or $a0,$t8,$zero /* f118828: 244fffff */ addiu $t7,$v0,-1 /* f11882c: 01f0c824 */ and $t9,$t7,$s0 @@ -1778,7 +1778,7 @@ glabel func0f118674 /* f118870: afa00010 */ sw $zero,0x10($sp) /* f118874: afa00018 */ sw $zero,0x18($sp) /* f118878: afa0001c */ sw $zero,0x1c($sp) -/* f11887c: 0fc46e75 */ jal 0xf11b9d4 +/* f11887c: 0fc46e75 */ jal func0f11bc54 /* f118880: afaa0014 */ sw $t2,0x14($sp) /* f118884: 14400023 */ bnez $v0,.L0f118914 /* f118888: 8fac0050 */ lw $t4,0x50($sp) @@ -1789,12 +1789,12 @@ glabel func0f118674 .L0f11889c: /* f11889c: 00046e03 */ sra $t5,$a0,0x18 /* f1188a0: 01a02025 */ or $a0,$t5,$zero -/* f1188a4: 0fc45c05 */ jal 0xf117014 +/* f1188a4: 0fc45c05 */ jal func0f117094 /* f1188a8: 8fa5007c */ lw $a1,0x7c($sp) /* f1188ac: 00112600 */ sll $a0,$s1,0x18 /* f1188b0: 00047603 */ sra $t6,$a0,0x18 /* f1188b4: 01c02025 */ or $a0,$t6,$zero -/* f1188b8: 0fc45976 */ jal 0xf1165d8 +/* f1188b8: 0fc45976 */ jal func0f116658 /* f1188bc: 00402825 */ or $a1,$v0,$zero /* f1188c0: 8fb80058 */ lw $t8,0x58($sp) /* f1188c4: 00112600 */ sll $a0,$s1,0x18 @@ -1809,7 +1809,7 @@ glabel func0f118674 /* f1188e8: afa00010 */ sw $zero,0x10($sp) /* f1188ec: afa00014 */ sw $zero,0x14($sp) /* f1188f0: afa00018 */ sw $zero,0x18($sp) -/* f1188f4: 0fc46e75 */ jal 0xf11b9d4 +/* f1188f4: 0fc46e75 */ jal func0f11bc54 /* f1188f8: afa0001c */ sw $zero,0x1c($sp) /* f1188fc: 14400003 */ bnez $v0,.L0f11890c /* f118900: 00000000 */ sll $zero,$zero,0x0 @@ -2924,7 +2924,7 @@ glabel func0f1194e0 /* f11945c: afb3003c */ sw $s3,0x3c($sp) /* f119460: afb00030 */ sw $s0,0x30($sp) /* f119464: afa50084 */ sw $a1,0x84($sp) -/* f119468: 0fc45bfb */ jal 0xf116fec +/* f119468: 0fc45bfb */ jal func0f11706c /* f11946c: 01e02025 */ or $a0,$t7,$zero /* f119470: 8fb80084 */ lw $t8,0x84($sp) /* f119474: 00114880 */ sll $t1,$s1,0x2 @@ -2958,7 +2958,7 @@ glabel func0f1194e0 /* f1194dc: 00046603 */ sra $t4,$a0,0x18 /* f1194e0: 01802025 */ or $a0,$t4,$zero /* f1194e4: 02002825 */ or $a1,$s0,$zero -/* f1194e8: 0fc45d28 */ jal 0xf1174a0 +/* f1194e8: 0fc45d28 */ jal func0f117520 /* f1194ec: 02403025 */ or $a2,$s2,$zero /* f1194f0: 14400007 */ bnez $v0,.L0f119510 /* f1194f4: 8fad0078 */ lw $t5,0x78($sp) @@ -2976,7 +2976,7 @@ glabel func0f1194e0 /* f119520: 00112600 */ sll $a0,$s1,0x18 .L0f119524: /* f119524: 0004c603 */ sra $t8,$a0,0x18 -/* f119528: 0fc45954 */ jal 0xf116550 +/* f119528: 0fc45954 */ jal func0f1165d0 /* f11952c: 03002025 */ or $a0,$t8,$zero /* f119530: 02028021 */ addu $s0,$s0,$v0 /* f119534: 0216c823 */ subu $t9,$s0,$s6 @@ -2992,7 +2992,7 @@ glabel func0f1194e0 /* f119558: 5420ffe0 */ bnezl $at,.L0f1194dc /* f11955c: 00112600 */ sll $a0,$s1,0x18 .L0f119560: -/* f119560: 0fc45981 */ jal 0xf116604 +/* f119560: 0fc45981 */ jal func0f116684 /* f119564: 02162023 */ subu $a0,$s0,$s6 /* f119568: 00112600 */ sll $a0,$s1,0x18 /* f11956c: 00045603 */ sra $t2,$a0,0x18 @@ -3005,7 +3005,7 @@ glabel func0f1194e0 /* f119588: afa20010 */ sw $v0,0x10($sp) /* f11958c: afa00014 */ sw $zero,0x14($sp) /* f119590: afa00018 */ sw $zero,0x18($sp) -/* f119594: 0fc46e75 */ jal 0xf11b9d4 +/* f119594: 0fc46e75 */ jal func0f11bc54 /* f119598: afa0001c */ sw $zero,0x1c($sp) /* f11959c: 10400005 */ beqz $v0,.L0f1195b4 /* f1195a0: 8fad0084 */ lw $t5,0x84($sp) @@ -3067,7 +3067,7 @@ glabel func0f11970c /* f11a268: 00008825 */ move $s1,$zero /* f11a26c: aed90260 */ sw $t9,0x260($s6) /* f11a270: a2c002be */ sb $zero,0x2be($s6) -/* f11a274: 0fc45cae */ jal 0xf1172b8 +/* f11a274: 0fc45cae */ jal func0f1167d8 /* f11a278: 01202025 */ move $a0,$t1 /* f11a27c: 50400004 */ beqzl $v0,.PF0f11a290 /* f11a280: 8eca02a0 */ lw $t2,0x2a0($s6) @@ -3085,7 +3085,7 @@ glabel func0f11970c /* f11a2a8: 00045e03 */ sra $t3,$a0,0x18 /* f11a2ac: 01602025 */ move $a0,$t3 /* f11a2b0: 8fa503a4 */ lw $a1,0x3a4($sp) -/* f11a2b4: 0fc46000 */ jal 0xf118000 +/* f11a2b4: 0fc46000 */ jal func0f117520 /* f11a2b8: 02a03025 */ move $a2,$s5 /* f11a2bc: 14400071 */ bnez $v0,.PF0f11a484 /* f11a2c0: 24010001 */ li $at,0x1 @@ -3113,7 +3113,7 @@ glabel func0f11970c /* f11a318: afa00010 */ sw $zero,0x10($sp) /* f11a31c: afa00014 */ sw $zero,0x14($sp) /* f11a320: afa00018 */ sw $zero,0x18($sp) -/* f11a324: 0fc471d4 */ jal 0xf11c750 +/* f11a324: 0fc471d4 */ jal func0f11bc54 /* f11a328: afa0001c */ sw $zero,0x1c($sp) /* f11a32c: 50400082 */ beqzl $v0,.PF0f11a538 /* f11a330: 8fae07a4 */ lw $t6,0x7a4($sp) @@ -3148,7 +3148,7 @@ glabel func0f11970c /* f11a39c: 00046e03 */ sra $t5,$a0,0x18 /* f11a3a0: 01a02025 */ move $a0,$t5 /* f11a3a4: 27a503a4 */ addiu $a1,$sp,0x3a4 -/* f11a3a8: 0fc467f0 */ jal 0xf119fc0 +/* f11a3a8: 0fc467f0 */ jal func0f1194e0 /* f11a3ac: 02a03025 */ move $a2,$s5 /* f11a3b0: 1000001f */ b .PF0f11a430 /* f11a3b4: 2c570001 */ sltiu $s7,$v0,0x1 @@ -3163,14 +3163,14 @@ glabel func0f11970c /* f11a3d4: 03002025 */ move $a0,$t8 /* f11a3d8: afb90054 */ sw $t9,0x54($sp) /* f11a3dc: 00e02825 */ move $a1,$a3 -/* f11a3e0: 0fc467f0 */ jal 0xf119fc0 +/* f11a3e0: 0fc467f0 */ jal func0f1194e0 /* f11a3e4: afa7005c */ sw $a3,0x5c($sp) /* f11a3e8: 8fa7005c */ lw $a3,0x5c($sp) /* f11a3ec: 2c570001 */ sltiu $s7,$v0,0x1 /* f11a3f0: 02a02825 */ move $a1,$s5 /* f11a3f4: acf20000 */ sw $s2,0x0($a3) /* f11a3f8: 8fa40054 */ lw $a0,0x54($sp) -/* f11a3fc: 0c0127b8 */ jal 0x49ee0 +/* f11a3fc: 0c0127b8 */ jal memcpy /* f11a400: 24060010 */ li $a2,0x10 /* f11a404: 8fab03a4 */ lw $t3,0x3a4($sp) /* f11a408: 8fa6047c */ lw $a2,0x47c($sp) @@ -3195,7 +3195,7 @@ glabel func0f11970c /* f11a44c: 03298021 */ addu $s0,$t9,$t1 /* f11a450: 026f2021 */ addu $a0,$s3,$t7 /* f11a454: 02a02825 */ move $a1,$s5 -/* f11a458: 0c0127b8 */ jal 0x49ee0 +/* f11a458: 0c0127b8 */ jal memcpy /* f11a45c: 24060010 */ li $a2,0x10 /* f11a460: 8fae03a4 */ lw $t6,0x3a4($sp) /* f11a464: 8fa6047c */ lw $a2,0x47c($sp) @@ -3217,7 +3217,7 @@ glabel func0f11970c /* f11a49c: 00046e03 */ sra $t5,$a0,0x18 /* f11a4a0: 01a02025 */ move $a0,$t5 /* f11a4a4: 27a503a4 */ addiu $a1,$sp,0x3a4 -/* f11a4a8: 0fc467f0 */ jal 0xf119fc0 +/* f11a4a8: 0fc467f0 */ jal func0f1194e0 /* f11a4ac: 00003025 */ move $a2,$zero /* f11a4b0: 1000001a */ b .PF0f11a51c /* f11a4b4: 2c570001 */ sltiu $s7,$v0,0x1 @@ -3228,7 +3228,7 @@ glabel func0f11970c /* f11a4c4: 0004c603 */ sra $t8,$a0,0x18 /* f11a4c8: 03002025 */ move $a0,$t8 /* f11a4cc: 27a503a4 */ addiu $a1,$sp,0x3a4 -/* f11a4d0: 0fc467f0 */ jal 0xf119fc0 +/* f11a4d0: 0fc467f0 */ jal func0f1194e0 /* f11a4d4: 02a03025 */ move $a2,$s5 /* f11a4d8: 14400010 */ bnez $v0,.PF0f11a51c /* f11a4dc: 00000000 */ nop @@ -3272,7 +3272,7 @@ glabel func0f11970c /* f11a55c: 00045603 */ sra $t2,$a0,0x18 /* f11a560: 01402025 */ move $a0,$t2 /* f11a564: 8fa503a4 */ lw $a1,0x3a4($sp) -/* f11a568: 0fc46000 */ jal 0xf118000 +/* f11a568: 0fc46000 */ jal func0f117520 /* f11a56c: 02a03025 */ move $a2,$s5 /* f11a570: 14400017 */ bnez $v0,.PF0f11a5d0 /* f11a574: 8fa6047c */ lw $a2,0x47c($sp) @@ -3349,7 +3349,7 @@ glabel func0f11970c /* f11a668: 00047603 */ sra $t6,$a0,0x18 /* f11a66c: 01c02025 */ move $a0,$t6 /* f11a670: 8fa503a4 */ lw $a1,0x3a4($sp) -/* f11a674: 0fc46000 */ jal 0xf118000 +/* f11a674: 0fc46000 */ jal func0f117520 /* f11a678: 02a03025 */ move $a2,$s5 /* f11a67c: 14400025 */ bnez $v0,.PF0f11a714 /* f11a680: 8fa6047c */ lw $a2,0x47c($sp) @@ -3424,7 +3424,7 @@ glabel func0f11970c /* f11a774: 2c410010 */ sltiu $at,$v0,0x10 /* f11a778: 10200004 */ beqz $at,.PF0f11a78c /* f11a77c: aec20260 */ sw $v0,0x260($s6) -/* f11a780: 0fc45c5b */ jal 0xf11716c +/* f11a780: 0fc45c5b */ jal func0f11668c /* f11a784: 01e02025 */ move $a0,$t7 /* f11a788: aec20260 */ sw $v0,0x260($s6) .PF0f11a78c: @@ -3436,7 +3436,7 @@ glabel func0f11970c /* f11a79c: 00044e03 */ sra $t1,$a0,0x18 /* f11a7a0: 01202025 */ move $a0,$t1 /* f11a7a4: 8fa503a4 */ lw $a1,0x3a4($sp) -/* f11a7a8: 0fc46000 */ jal 0xf118000 +/* f11a7a8: 0fc46000 */ jal func0f117520 /* f11a7ac: 02a03025 */ move $a2,$s5 /* f11a7b0: 1440001c */ bnez $v0,.PF0f11a824 /* f11a7b4: 8fa6047c */ lw $a2,0x47c($sp) @@ -3453,7 +3453,7 @@ glabel func0f11970c /* f11a7e0: 00046e03 */ sra $t5,$a0,0x18 /* f11a7e4: 01a02025 */ move $a0,$t5 /* f11a7e8: 8fa503a4 */ lw $a1,0x3a4($sp) -/* f11a7ec: 0fc467d6 */ jal 0xf119f58 +/* f11a7ec: 0fc467d6 */ jal func0f119478 /* f11a7f0: 02a03025 */ move $a2,$s5 /* f11a7f4: 8fa6047c */ lw $a2,0x47c($sp) .PF0f11a7f8: @@ -3487,7 +3487,7 @@ glabel func0f11970c /* f11a854: 00046e03 */ sra $t5,$a0,0x18 /* f11a858: 55800007 */ bnezl $t4,.PF0f11a878 /* f11a85c: 00001025 */ move $v0,$zero -/* f11a860: 0fc45c5b */ jal 0xf11716c +/* f11a860: 0fc45c5b */ jal func0f11668c /* f11a864: 01a02025 */ move $a0,$t5 /* f11a868: aec20260 */ sw $v0,0x260($s6) /* f11a86c: 10000002 */ b .PF0f11a878 @@ -4012,7 +4012,7 @@ glabel func0f11970c /* f119664: 00008825 */ or $s1,$zero,$zero /* f119668: afd90260 */ sw $t9,0x260($s8) /* f11966c: a3c002be */ sb $zero,0x2be($s8) -/* f119670: 0fc459d6 */ jal 0xf116758 +/* f119670: 0fc459d6 */ jal func0f1167d8 /* f119674: 01002025 */ or $a0,$t0,$zero /* f119678: 50400004 */ beqzl $v0,.L0f11968c /* f11967c: 8fc902a0 */ lw $t1,0x2a0($s8) @@ -4030,7 +4030,7 @@ glabel func0f11970c /* f1196a4: 00045603 */ sra $t2,$a0,0x18 /* f1196a8: 01402025 */ or $a0,$t2,$zero /* f1196ac: 8fa5007c */ lw $a1,0x7c($sp) -/* f1196b0: 0fc45d28 */ jal 0xf1174a0 +/* f1196b0: 0fc45d28 */ jal func0f117520 /* f1196b4: 02e03025 */ or $a2,$s7,$zero /* f1196b8: 14400077 */ bnez $v0,.L0f119898 /* f1196bc: 24010001 */ addiu $at,$zero,0x1 @@ -4043,7 +4043,7 @@ glabel func0f11970c /* f1196d8: 304d0004 */ andi $t5,$v0,0x4 /* f1196dc: 01802025 */ or $a0,$t4,$zero /* f1196e0: 27a5007c */ addiu $a1,$sp,0x7c -/* f1196e4: 0fc46509 */ jal 0xf119424 +/* f1196e4: 0fc46509 */ jal func0f1194e0 /* f1196e8: 00003025 */ or $a2,$zero,$zero /* f1196ec: 10000090 */ beqz $zero,.L0f119930 /* f1196f0: 2c550001 */ sltiu $s5,$v0,0x1 @@ -4067,7 +4067,7 @@ glabel func0f11970c /* f119734: afa00010 */ sw $zero,0x10($sp) /* f119738: afa00014 */ sw $zero,0x14($sp) /* f11973c: afa00018 */ sw $zero,0x18($sp) -/* f119740: 0fc46e75 */ jal 0xf11b9d4 +/* f119740: 0fc46e75 */ jal func0f11bc54 /* f119744: afa0001c */ sw $zero,0x1c($sp) /* f119748: 50400080 */ beqzl $v0,.L0f11994c /* f11974c: 8fac047c */ lw $t4,0x47c($sp) @@ -4101,7 +4101,7 @@ glabel func0f11970c /* f1197b4: 00045603 */ sra $t2,$a0,0x18 /* f1197b8: 01402025 */ or $a0,$t2,$zero /* f1197bc: 27a5007c */ addiu $a1,$sp,0x7c -/* f1197c0: 0fc46509 */ jal 0xf119424 +/* f1197c0: 0fc46509 */ jal func0f1194e0 /* f1197c4: 02e03025 */ or $a2,$s7,$zero /* f1197c8: 1000001f */ beqz $zero,.L0f119848 /* f1197cc: 2c550001 */ sltiu $s5,$v0,0x1 @@ -4116,14 +4116,14 @@ glabel func0f11970c /* f1197ec: 01602025 */ or $a0,$t3,$zero /* f1197f0: afaf0060 */ sw $t7,0x60($sp) /* f1197f4: 00e02825 */ or $a1,$a3,$zero -/* f1197f8: 0fc46509 */ jal 0xf119424 +/* f1197f8: 0fc46509 */ jal func0f1194e0 /* f1197fc: afa70068 */ sw $a3,0x68($sp) /* f119800: 8fa70068 */ lw $a3,0x68($sp) /* f119804: 2c550001 */ sltiu $s5,$v0,0x1 /* f119808: 02e02825 */ or $a1,$s7,$zero /* f11980c: acf20000 */ sw $s2,0x0($a3) /* f119810: 8fa40060 */ lw $a0,0x60($sp) -/* f119814: 0c012978 */ jal 0x4a5e0 +/* f119814: 0c012978 */ jal memcpy /* f119818: 24060010 */ addiu $a2,$zero,0x10 /* f11981c: 8fb9007c */ lw $t9,0x7c($sp) /* f119820: 8fa60154 */ lw $a2,0x154($sp) @@ -4147,7 +4147,7 @@ glabel func0f11970c /* f119860: 016c8021 */ addu $s0,$t3,$t4 /* f119864: 026a2021 */ addu $a0,$s3,$t2 /* f119868: 02e02825 */ or $a1,$s7,$zero -/* f11986c: 0c012978 */ jal 0x4a5e0 +/* f11986c: 0c012978 */ jal memcpy /* f119870: 24060010 */ addiu $a2,$zero,0x10 /* f119874: 8faf007c */ lw $t7,0x7c($sp) /* f119878: 8fa60154 */ lw $a2,0x154($sp) @@ -4169,7 +4169,7 @@ glabel func0f11970c /* f1198b0: 00047603 */ sra $t6,$a0,0x18 /* f1198b4: 01c02025 */ or $a0,$t6,$zero /* f1198b8: 27a5007c */ addiu $a1,$sp,0x7c -/* f1198bc: 0fc46509 */ jal 0xf119424 +/* f1198bc: 0fc46509 */ jal func0f1194e0 /* f1198c0: 00003025 */ or $a2,$zero,$zero /* f1198c4: 1000001a */ beqz $zero,.L0f119930 /* f1198c8: 2c550001 */ sltiu $s5,$v0,0x1 @@ -4180,7 +4180,7 @@ glabel func0f11970c /* f1198d8: 00044603 */ sra $t0,$a0,0x18 /* f1198dc: 01002025 */ or $a0,$t0,$zero /* f1198e0: 27a5007c */ addiu $a1,$sp,0x7c -/* f1198e4: 0fc46509 */ jal 0xf119424 +/* f1198e4: 0fc46509 */ jal func0f1194e0 /* f1198e8: 02e03025 */ or $a2,$s7,$zero /* f1198ec: 14400010 */ bnez $v0,.L0f119930 /* f1198f0: 00000000 */ sll $zero,$zero,0x0 @@ -4224,7 +4224,7 @@ glabel func0f11970c /* f119970: 00046e03 */ sra $t5,$a0,0x18 /* f119974: 01a02025 */ or $a0,$t5,$zero /* f119978: 8fa5007c */ lw $a1,0x7c($sp) -/* f11997c: 0fc45d28 */ jal 0xf1174a0 +/* f11997c: 0fc45d28 */ jal func0f117520 /* f119980: 02e03025 */ or $a2,$s7,$zero /* f119984: 1440002d */ bnez $v0,.L0f119a3c /* f119988: 8fa60154 */ lw $a2,0x154($sp) @@ -4245,7 +4245,7 @@ glabel func0f11970c /* f1199c0: 00044603 */ sra $t0,$a0,0x18 /* f1199c4: 01002025 */ or $a0,$t0,$zero /* f1199c8: 27a5007c */ addiu $a1,$sp,0x7c -/* f1199cc: 0fc46509 */ jal 0xf119424 +/* f1199cc: 0fc46509 */ jal func0f1194e0 /* f1199d0: 02e03025 */ or $a2,$s7,$zero /* f1199d4: 10400006 */ beqz $v0,.L0f1199f0 /* f1199d8: 8fa40158 */ lw $a0,0x158($sp) @@ -4325,7 +4325,7 @@ glabel func0f11970c /* f119ad4: 00046603 */ sra $t4,$a0,0x18 /* f119ad8: 55600007 */ bnezl $t3,.L0f119af8 /* f119adc: 00001025 */ or $v0,$zero,$zero -/* f119ae0: 0fc45983 */ jal 0xf11660c +/* f119ae0: 0fc45983 */ jal func0f11668c /* f119ae4: 01802025 */ or $a0,$t4,$zero /* f119ae8: afc20260 */ sw $v0,0x260($s8) /* f119aec: 10000002 */ beqz $zero,.L0f119af8 @@ -5421,7 +5421,7 @@ glabel func0f11a8f4 /* f11a6dc: afa01058 */ sw $zero,0x1058($sp) /* f11a6e0: ae190000 */ sw $t9,0x0($s0) /* f11a6e4: a20a02b8 */ sb $t2,0x2b8($s0) -/* f11a6e8: 0fc468bd */ jal 0xf11a2f4 +/* f11a6e8: 0fc468bd */ jal func0f11a574 /* f11a6ec: 01602025 */ or $a0,$t3,$zero /* f11a6f0: 8e0c0010 */ lw $t4,0x10($s0) /* f11a6f4: 24010001 */ addiu $at,$zero,0x1 @@ -5430,7 +5430,7 @@ glabel func0f11a8f4 /* f11a700: 100000b9 */ beqz $zero,.L0f11a9e8_2 /* f11a704: 00001025 */ or $v0,$zero,$zero .L0f11a708_2: -/* f11a708: 0c00543a */ jal 0x150e8 +/* f11a708: 0c00543a */ jal func000150e8 /* f11a70c: 00000000 */ sll $zero,$zero,0x0 /* f11a710: 24010004 */ addiu $at,$zero,0x4 /* f11a714: 16210003 */ bne $s1,$at,.L0f11a724_2 @@ -5456,9 +5456,9 @@ glabel func0f11a8f4 /* f11a75c: afa20034 */ sw $v0,0x34($sp) /* f11a760: 24e75cf8 */ addiu $a3,$a3,%lo(g_PakNoteGameName) /* f11a764: 34c64445 */ ori $a2,$a2,_gamecode -/* f11a768: 0fc45f76 */ jal 0xf117dd8 +/* f11a768: 0fc45f76 */ jal func0f117e58 /* f11a76c: afaf0010 */ sw $t7,0x10($sp) -/* f11a770: 0c005451 */ jal 0x15144 +/* f11a770: 0c005451 */ jal func00015144 /* f11a774: afa2004c */ sw $v0,0x4c($sp) /* f11a778: 8fa4004c */ lw $a0,0x4c($sp) /* f11a77c: 00112e00 */ sll $a1,$s1,0x18 @@ -5466,7 +5466,7 @@ glabel func0f11a8f4 /* f11a784: 1080003e */ beqz $a0,.L0f11a880_2 /* f11a788: 03002825 */ or $a1,$t8,$zero /* f11a78c: 00003025 */ or $a2,$zero,$zero -/* f11a790: 0fc47047 */ jal 0xf11c11c +/* f11a790: 0fc47047 */ jal func0f11c39c /* f11a794: 24070d83 */ addiu $a3,$zero,0xd83 /* f11a798: 9619025a */ lhu $t9,0x25a($s0) /* f11a79c: 24090001 */ addiu $t1,$zero,0x1 @@ -5482,7 +5482,7 @@ glabel func0f11a8f4 /* f11a7c0: 000a58c0 */ sll $t3,$t2,0x3 /* f11a7c4: 016a5823 */ subu $t3,$t3,$t2 /* f11a7c8: 000b5a80 */ sll $t3,$t3,0xa -/* f11a7cc: 0c00543a */ jal 0x150e8 +/* f11a7cc: 0c00543a */ jal func000150e8 /* f11a7d0: afab0048 */ sw $t3,0x48($sp) /* f11a7d4: 24010004 */ addiu $at,$zero,0x4 /* f11a7d8: 16210003 */ bne $s1,$at,.L0f11a7e8_2 @@ -5509,9 +5509,9 @@ glabel func0f11a8f4 /* f11a824: 34c64445 */ ori $a2,$a2,_gamecode /* f11a828: afae0010 */ sw $t6,0x10($sp) /* f11a82c: afaf0014 */ sw $t7,0x14($sp) -/* f11a830: 0fc45f44 */ jal 0xf117d10 +/* f11a830: 0fc45f44 */ jal func0f117d90 /* f11a834: afb80018 */ sw $t8,0x18($sp) -/* f11a838: 0c005451 */ jal 0x15144 +/* f11a838: 0c005451 */ jal func00015144 /* f11a83c: afa2004c */ sw $v0,0x4c($sp) /* f11a840: 920802b8 */ lbu $t0,0x2b8($s0) /* f11a844: 00112e00 */ sll $a1,$s1,0x18 @@ -5521,7 +5521,7 @@ glabel func0f11a8f4 /* f11a854: a20902b8 */ sb $t1,0x2b8($s0) /* f11a858: 01402825 */ or $a1,$t2,$zero /* f11a85c: 24060001 */ addiu $a2,$zero,0x1 -/* f11a860: 0fc47047 */ jal 0xf11c11c +/* f11a860: 0fc47047 */ jal func0f11c39c /* f11a864: 24070d91 */ addiu $a3,$zero,0xd91 /* f11a868: 10400003 */ beqz $v0,.L0f11a878_2 /* f11a86c: 240b0001 */ addiu $t3,$zero,0x1 @@ -5533,11 +5533,11 @@ glabel func0f11a8f4 .L0f11a880_2: /* f11a880: 00112600 */ sll $a0,$s1,0x18 /* f11a884: 00046603 */ sra $t4,$a0,0x18 -/* f11a888: 0fc468bd */ jal 0xf11a2f4 +/* f11a888: 0fc468bd */ jal func0f11a574 /* f11a88c: 01802025 */ or $a0,$t4,$zero /* f11a890: 00112600 */ sll $a0,$s1,0x18 /* f11a894: 00046e03 */ sra $t5,$a0,0x18 -/* f11a898: 0fc46957 */ jal 0xf11a55c +/* f11a898: 0fc46957 */ jal func0f11a7dc /* f11a89c: 01a02025 */ or $a0,$t5,$zero /* f11a8a0: 920e02b8 */ lbu $t6,0x2b8($s0) /* f11a8a4: 2418000b */ addiu $t8,$zero,0xb @@ -5550,7 +5550,7 @@ glabel func0f11a8f4 /* f11a8c0: 00044603 */ sra $t0,$a0,0x18 /* f11a8c4: 5320000a */ beqzl $t9,.L0f11a8f0_2 /* f11a8c8: 8faa1058 */ lw $t2,0x1058($sp) -/* f11a8cc: 0fc46cb2 */ jal 0xf11b2c8 +/* f11a8cc: 0fc46cb2 */ jal pakForceScrub /* f11a8d0: 01002025 */ or $a0,$t0,$zero /* f11a8d4: 2401ffff */ addiu $at,$zero,-1 /* f11a8d8: 10410003 */ beq $v0,$at,.L0f11a8e8_2 @@ -5566,13 +5566,13 @@ glabel func0f11a8f4 /* f11a8f4: 00045e03 */ sra $t3,$a0,0x18 /* f11a8f8: 55400016 */ bnezl $t2,.L0f11a954_2 /* f11a8fc: 8fb91058 */ lw $t9,0x1058($sp) -/* f11a900: 0fc46579 */ jal 0xf1195e4 +/* f11a900: 0fc46579 */ jal func0f11970c /* f11a904: 01602025 */ or $a0,$t3,$zero /* f11a908: 2401ffff */ addiu $at,$zero,-1 /* f11a90c: 14410010 */ bne $v0,$at,.L0f11a950_2 /* f11a910: 00112600 */ sll $a0,$s1,0x18 /* f11a914: 00046603 */ sra $t4,$a0,0x18 -/* f11a918: 0fc46cb2 */ jal 0xf11b2c8 +/* f11a918: 0fc46cb2 */ jal pakForceScrub /* f11a91c: 01802025 */ or $a0,$t4,$zero /* f11a920: 2401ffff */ addiu $at,$zero,-1 /* f11a924: 10410003 */ beq $v0,$at,.L0f11a934_2 @@ -5595,7 +5595,7 @@ glabel func0f11a8f4 /* f11a958: 00044603 */ sra $t0,$a0,0x18 /* f11a95c: 5720001e */ bnezl $t9,.L0f11a9d8_2 /* f11a960: 240d0016 */ addiu $t5,$zero,0x16 -/* f11a964: 0fc4679a */ jal 0xf119e68 +/* f11a964: 0fc4679a */ jal func0f11a0e8 /* f11a968: 01002025 */ or $a0,$t0,$zero /* f11a96c: 2401ffff */ addiu $at,$zero,-1 /* f11a970: 10410018 */ beq $v0,$at,.L0f11a9d4_2 @@ -5604,12 +5604,12 @@ glabel func0f11a8f4 /* f11a97c: ae02025c */ sw $v0,0x25c($s0) /* f11a980: 01202025 */ or $a0,$t1,$zero /* f11a984: 24050004 */ addiu $a1,$zero,0x4 -/* f11a988: 0fc459cc */ jal 0xf116730 +/* f11a988: 0fc459cc */ jal func0f1167b0 /* f11a98c: 27a60054 */ addiu $a2,$sp,0x54 /* f11a990: 14400010 */ bnez $v0,.L0f11a9d4_2 /* f11a994: 00112600 */ sll $a0,$s1,0x18 /* f11a998: 00045603 */ sra $t2,$a0,0x18 -/* f11a99c: 0fc46703 */ jal 0xf119c0c +/* f11a99c: 0fc46703 */ jal func0f119e8c /* f11a9a0: 01402025 */ or $a0,$t2,$zero /* f11a9a4: 1040000b */ beqz $v0,.L0f11a9d4_2 /* f11a9a8: 24010004 */ addiu $at,$zero,0x4 @@ -5621,7 +5621,7 @@ glabel func0f11a8f4 .L0f11a9c0_2: /* f11a9c0: ae0c0010 */ sw $t4,0x10($s0) .L0f11a9c4_2: -/* f11a9c4: 0fc44344 */ jal 0xf110d10 +/* f11a9c4: 0fc44344 */ jal func0f110d90 /* f11a9c8: 02202025 */ or $a0,$s1,$zero /* f11a9cc: 10000006 */ beqz $zero,.L0f11a9e8_2 /* f11a9d0: 24020001 */ addiu $v0,$zero,0x1 @@ -5629,7 +5629,7 @@ glabel func0f11a8f4 /* f11a9d4: 240d0016 */ addiu $t5,$zero,0x16 .L0f11a9d8_2: /* f11a9d8: ae0d0010 */ sw $t5,0x10($s0) -/* f11a9dc: 0fc44344 */ jal 0xf110d10 +/* f11a9dc: 0fc44344 */ jal func0f110d90 /* f11a9e0: 02202025 */ or $a0,$s1,$zero /* f11a9e4: 00001025 */ or $v0,$zero,$zero .L0f11a9e8_2: @@ -9678,19 +9678,19 @@ glabel var7f1b4fd8 /* f11dd6c: 24050001 */ addiu $a1,$zero,0x1 /* f11dd70: 51400005 */ beqzl $t2,.L0f11dd88 /* f11dd74: 83a40023 */ lb $a0,0x23($sp) -/* f11dd78: 0fc3c320 */ jal 0xf0f0c80 +/* f11dd78: 0fc3c320 */ jal func0f0f0ca0 /* f11dd7c: afa3001c */ sw $v1,0x1c($sp) /* f11dd80: 8fa3001c */ lw $v1,0x1c($sp) /* f11dd84: 83a40023 */ lb $a0,0x23($sp) .L0f11dd88: /* f11dd88: 24050004 */ addiu $a1,$zero,0x4 -/* f11dd8c: 0fc3f475 */ jal 0xf0fd1d4 +/* f11dd8c: 0fc3f475 */ jal func0f0fd1f4 /* f11dd90: afa3001c */ sw $v1,0x1c($sp) /* f11dd94: 10400009 */ beqz $v0,.L0f11ddbc /* f11dd98: 8fa3001c */ lw $v1,0x1c($sp) /* f11dd9c: 83a40023 */ lb $a0,0x23($sp) /* f11dda0: 24050004 */ addiu $a1,$zero,0x4 -/* f11dda4: 0fc3f4c0 */ jal 0xf0fd300 +/* f11dda4: 0fc3f4c0 */ jal func0f0fd320 /* f11dda8: afa3001c */ sw $v1,0x1c($sp) /* f11ddac: 8fa3001c */ lw $v1,0x1c($sp) /* f11ddb0: 906b02b8 */ lbu $t3,0x2b8($v1) @@ -9716,10 +9716,10 @@ glabel var7f1b4fd8 /* f11ddfc: 13000004 */ beqz $t8,.L0f11de10 /* f11de00: ac600000 */ sw $zero,0x0($v1) /* f11de04: 2404ffff */ addiu $a0,$zero,-1 -/* f11de08: 0fc3c320 */ jal 0xf0f0c80 +/* f11de08: 0fc3c320 */ jal func0f0f0ca0 /* f11de0c: 24050001 */ addiu $a1,$zero,0x1 .L0f11de10: -/* f11de10: 0fc52b28 */ jal 0xf14aca0 +/* f11de10: 0fc52b28 */ jal func0f14aed0 /* f11de14: 83a40023 */ lb $a0,0x23($sp) /* f11de18: 100000d7 */ beqz $zero,.L0f11e178 /* f11de1c: 8fbf0014 */ lw $ra,0x14($sp) @@ -9727,12 +9727,12 @@ glabel var7f1b4fd8 /* f11de24: 2404ffff */ addiu $a0,$zero,-1 /* f11de28: 13200003 */ beqz $t9,.L0f11de38 /* f11de2c: 00000000 */ sll $zero,$zero,0x0 -/* f11de30: 0fc3c320 */ jal 0xf0f0c80 +/* f11de30: 0fc3c320 */ jal func0f0f0ca0 /* f11de34: 24050001 */ addiu $a1,$zero,0x1 .L0f11de38: -/* f11de38: 0fc46a7f */ jal 0xf11a9fc +/* f11de38: 0fc46a7f */ jal func0f11ac7c /* f11de3c: 83a40023 */ lb $a0,0x23($sp) -/* f11de40: 0fc52b28 */ jal 0xf14aca0 +/* f11de40: 0fc52b28 */ jal func0f14aed0 /* f11de44: 83a40023 */ lb $a0,0x23($sp) /* f11de48: 100000cb */ beqz $zero,.L0f11e178 /* f11de4c: 8fbf0014 */ lw $ra,0x14($sp) @@ -9775,18 +9775,18 @@ glabel var7f1b4fd8 /* f11ded8: 24050001 */ addiu $a1,$zero,0x1 /* f11dedc: 51c00005 */ beqzl $t6,.L0f11def4 /* f11dee0: 240f0005 */ addiu $t7,$zero,0x5 -/* f11dee4: 0fc3c320 */ jal 0xf0f0c80 +/* f11dee4: 0fc3c320 */ jal func0f0f0ca0 /* f11dee8: afa3001c */ sw $v1,0x1c($sp) /* f11deec: 8fa3001c */ lw $v1,0x1c($sp) /* f11def0: 240f0005 */ addiu $t7,$zero,0x5 .L0f11def4: /* f11def4: 1000009f */ beqz $zero,.L0f11e174 /* f11def8: ac6f0010 */ sw $t7,0x10($v1) -/* f11defc: 0c00543a */ jal 0x150e8 +/* f11defc: 0c00543a */ jal func000150e8 /* f11df00: 00000000 */ sll $zero,$zero,0x0 -/* f11df04: 0fc4699d */ jal 0xf11a674 +/* f11df04: 0fc4699d */ jal func0f11a8f4 /* f11df08: 83a40023 */ lb $a0,0x23($sp) -/* f11df0c: 0c005451 */ jal 0x15144 +/* f11df0c: 0c005451 */ jal func00015144 /* f11df10: 00000000 */ sll $zero,$zero,0x0 /* f11df14: 10000098 */ beqz $zero,.L0f11e178 /* f11df18: 8fbf0014 */ lw $ra,0x14($sp) @@ -9795,7 +9795,7 @@ glabel var7f1b4fd8 /* f11df24: 24050001 */ addiu $a1,$zero,0x1 /* f11df28: 53000005 */ beqzl $t8,.L0f11df40 /* f11df2c: 2409000b */ addiu $t1,$zero,0xb -/* f11df30: 0fc3c320 */ jal 0xf0f0c80 +/* f11df30: 0fc3c320 */ jal func0f0f0ca0 /* f11df34: afa3001c */ sw $v1,0x1c($sp) /* f11df38: 8fa3001c */ lw $v1,0x1c($sp) /* f11df3c: 2409000b */ addiu $t1,$zero,0xb @@ -9803,7 +9803,7 @@ glabel var7f1b4fd8 /* f11df40: 1000008c */ beqz $zero,.L0f11e174 /* f11df44: ac690010 */ sw $t1,0x10($v1) /* f11df48: 83a40023 */ lb $a0,0x23($sp) -/* f11df4c: 0fc52b1c */ jal 0xf14ac70 +/* f11df4c: 0fc52b1c */ jal func0f14aea0 /* f11df50: afa3001c */ sw $v1,0x1c($sp) /* f11df54: 10400087 */ beqz $v0,.L0f11e174 /* f11df58: 8fa3001c */ lw $v1,0x1c($sp) @@ -9830,7 +9830,7 @@ glabel var7f1b4fd8 /* f11dfac: 11c00005 */ beqz $t6,.L0f11dfc4 /* f11dfb0: 2404ffff */ addiu $a0,$zero,-1 /* f11dfb4: 24050001 */ addiu $a1,$zero,0x1 -/* f11dfb8: 0fc3c320 */ jal 0xf0f0c80 +/* f11dfb8: 0fc3c320 */ jal func0f0f0ca0 /* f11dfbc: afa3001c */ sw $v1,0x1c($sp) /* f11dfc0: 8fa3001c */ lw $v1,0x1c($sp) .L0f11dfc4: @@ -9843,13 +9843,13 @@ glabel var7f1b4fd8 /* f11dfdc: 13200065 */ beqz $t9,.L0f11e174 /* f11dfe0: 03002025 */ or $a0,$t8,$zero /* f11dfe4: 24050001 */ addiu $a1,$zero,0x1 -/* f11dfe8: 0fc3f475 */ jal 0xf0fd1d4 +/* f11dfe8: 0fc3f475 */ jal func0f0fd1f4 /* f11dfec: afa3001c */ sw $v1,0x1c($sp) /* f11dff0: 10400060 */ beqz $v0,.L0f11e174 /* f11dff4: 8fa3001c */ lw $v1,0x1c($sp) /* f11dff8: 83a40023 */ lb $a0,0x23($sp) /* f11dffc: 24050001 */ addiu $a1,$zero,0x1 -/* f11e000: 0fc3f4c0 */ jal 0xf0fd300 +/* f11e000: 0fc3f4c0 */ jal func0f0fd320 /* f11e004: afa3001c */ sw $v1,0x1c($sp) /* f11e008: 8fa3001c */ lw $v1,0x1c($sp) /* f11e00c: 24080014 */ addiu $t0,$zero,0x14 @@ -9857,13 +9857,13 @@ glabel var7f1b4fd8 /* f11e014: ac680010 */ sw $t0,0x10($v1) /* f11e018: 83a40023 */ lb $a0,0x23($sp) /* f11e01c: 24050003 */ addiu $a1,$zero,0x3 -/* f11e020: 0fc3f475 */ jal 0xf0fd1d4 +/* f11e020: 0fc3f475 */ jal func0f0fd1f4 /* f11e024: afa3001c */ sw $v1,0x1c($sp) /* f11e028: 10400052 */ beqz $v0,.L0f11e174 /* f11e02c: 8fa3001c */ lw $v1,0x1c($sp) /* f11e030: 83a40023 */ lb $a0,0x23($sp) /* f11e034: 24050003 */ addiu $a1,$zero,0x3 -/* f11e038: 0fc3f4c0 */ jal 0xf0fd300 +/* f11e038: 0fc3f4c0 */ jal func0f0fd320 /* f11e03c: afa3001c */ sw $v1,0x1c($sp) /* f11e040: 8fa3001c */ lw $v1,0x1c($sp) /* f11e044: 240b001b */ addiu $t3,$zero,0x1b @@ -9877,7 +9877,7 @@ glabel var7f1b4fd8 /* f11e064: 24050001 */ addiu $a1,$zero,0x1 /* f11e068: 51a00005 */ beqzl $t5,.L0f11e080 /* f11e06c: 83a90023 */ lb $t1,0x23($sp) -/* f11e070: 0fc3c320 */ jal 0xf0f0c80 +/* f11e070: 0fc3c320 */ jal func0f0f0ca0 /* f11e074: afa3001c */ sw $v1,0x1c($sp) /* f11e078: 8fa3001c */ lw $v1,0x1c($sp) /* f11e07c: 83a90023 */ lb $t1,0x23($sp) @@ -9890,13 +9890,13 @@ glabel var7f1b4fd8 /* f11e094: 13200037 */ beqz $t9,.L0f11e174 /* f11e098: 01202025 */ or $a0,$t1,$zero /* f11e09c: 24050002 */ addiu $a1,$zero,0x2 -/* f11e0a0: 0fc3f475 */ jal 0xf0fd1d4 +/* f11e0a0: 0fc3f475 */ jal func0f0fd1f4 /* f11e0a4: afa3001c */ sw $v1,0x1c($sp) /* f11e0a8: 10400032 */ beqz $v0,.L0f11e174 /* f11e0ac: 8fa3001c */ lw $v1,0x1c($sp) /* f11e0b0: 83a40023 */ lb $a0,0x23($sp) /* f11e0b4: 24050002 */ addiu $a1,$zero,0x2 -/* f11e0b8: 0fc3f4c0 */ jal 0xf0fd300 +/* f11e0b8: 0fc3f4c0 */ jal func0f0fd320 /* f11e0bc: afa3001c */ sw $v1,0x1c($sp) /* f11e0c0: 8fa3001c */ lw $v1,0x1c($sp) /* f11e0c4: 24180013 */ addiu $t8,$zero,0x13 @@ -9906,7 +9906,7 @@ glabel var7f1b4fd8 /* f11e0d4: 11000005 */ beqz $t0,.L0f11e0ec /* f11e0d8: 2404ffff */ addiu $a0,$zero,-1 /* f11e0dc: 24050001 */ addiu $a1,$zero,0x1 -/* f11e0e0: 0fc3c320 */ jal 0xf0f0c80 +/* f11e0e0: 0fc3c320 */ jal func0f0f0ca0 /* f11e0e4: afa3001c */ sw $v1,0x1c($sp) /* f11e0e8: 8fa3001c */ lw $v1,0x1c($sp) .L0f11e0ec: @@ -9919,13 +9919,13 @@ glabel var7f1b4fd8 /* f11e104: 11c0001b */ beqz $t6,.L0f11e174 /* f11e108: 01802025 */ or $a0,$t4,$zero /* f11e10c: 00002825 */ or $a1,$zero,$zero -/* f11e110: 0fc3f475 */ jal 0xf0fd1d4 +/* f11e110: 0fc3f475 */ jal func0f0fd1f4 /* f11e114: afa3001c */ sw $v1,0x1c($sp) /* f11e118: 10400016 */ beqz $v0,.L0f11e174 /* f11e11c: 8fa3001c */ lw $v1,0x1c($sp) /* f11e120: 83a40023 */ lb $a0,0x23($sp) /* f11e124: 00002825 */ or $a1,$zero,$zero -/* f11e128: 0fc3f4c0 */ jal 0xf0fd300 +/* f11e128: 0fc3f4c0 */ jal func0f0fd320 /* f11e12c: afa3001c */ sw $v1,0x1c($sp) /* f11e130: 8fa3001c */ lw $v1,0x1c($sp) /* f11e134: 240a0015 */ addiu $t2,$zero,0x15 @@ -9934,7 +9934,7 @@ glabel var7f1b4fd8 /* f11e140: 8cd90000 */ lw $t9,0x0($a2) /* f11e144: 1320000b */ beqz $t9,.L0f11e174 /* f11e148: 2404ffff */ addiu $a0,$zero,-1 -/* f11e14c: 0fc3c320 */ jal 0xf0f0c80 +/* f11e14c: 0fc3c320 */ jal func0f0f0ca0 /* f11e150: 24050001 */ addiu $a1,$zero,0x1 /* f11e154: 10000008 */ beqz $zero,.L0f11e178 /* f11e158: 8fbf0014 */ lw $ra,0x14($sp) @@ -9942,7 +9942,7 @@ glabel var7f1b4fd8 /* f11e160: 2404ffff */ addiu $a0,$zero,-1 /* f11e164: 51200004 */ beqzl $t1,.L0f11e178 /* f11e168: 8fbf0014 */ lw $ra,0x14($sp) -/* f11e16c: 0fc3c320 */ jal 0xf0f0c80 +/* f11e16c: 0fc3c320 */ jal func0f0f0ca0 /* f11e170: 24050001 */ addiu $a1,$zero,0x1 .L0f11e174: /* f11e174: 8fbf0014 */ lw $ra,0x14($sp) diff --git a/src/game/prop.c b/src/game/prop.c index f6acf55d2..e07b77d56 100644 --- a/src/game/prop.c +++ b/src/game/prop.c @@ -3133,7 +3133,7 @@ glabel var7f1ab190pf /* f063720: 920f003d */ lbu $t7,0x3d($s0) /* f063724: 8e020004 */ lw $v0,0x4($s0) /* f063728: 02002025 */ move $a0,$s0 -/* f06372c: 0fc5260c */ jal 0xf149830 +/* f06372c: 0fc5260c */ jal splatTick /* f063730: afa20048 */ sw $v0,0x48($sp) /* f063734: 8fa20048 */ lw $v0,0x48($sp) /* f063738: 10400008 */ beqz $v0,.PF0f06375c @@ -3141,12 +3141,12 @@ glabel var7f1ab190pf /* f063740: 8c4f02d4 */ lw $t7,0x2d4($v0) /* f063744: 11e00005 */ beqz $t7,.PF0f06375c /* f063748: 00000000 */ nop -/* f06374c: 0fc64a62 */ jal 0xf192988 +/* f06374c: 0fc64a62 */ jal aibotTick /* f063750: 02002025 */ move $a0,$s0 /* f063754: 10000004 */ b .PF0f063768 /* f063758: 00403025 */ move $a2,$v0 .PF0f06375c: -/* f06375c: 0fc08c75 */ jal 0xf0231d4 +/* f06375c: 0fc08c75 */ jal func0f023098 /* f063760: 02002025 */ move $a0,$s0 /* f063764: 00403025 */ move $a2,$v0 .PF0f063768: @@ -3177,7 +3177,7 @@ glabel var7f1ab190pf /* f0637c4: 54610006 */ bnel $v1,$at,.PF0f0637e0 /* f0637c8: 24010007 */ li $at,0x7 .PF0f0637cc: -/* f0637cc: 0fc1fa6a */ jal 0xf07e9a8 +/* f0637cc: 0fc1fa6a */ jal objTick /* f0637d0: 02002025 */ move $a0,$s0 /* f0637d4: 10000017 */ b .PF0f063834 /* f0637d8: 00403025 */ move $a2,$v0 @@ -3185,7 +3185,7 @@ glabel var7f1ab190pf .PF0f0637e0: /* f0637e0: 54610006 */ bnel $v1,$at,.PF0f0637fc /* f0637e4: 24010008 */ li $at,0x8 -/* f0637e8: 0fc4b436 */ jal 0xf12d0d8 +/* f0637e8: 0fc4b436 */ jal explosionUpdateZ /* f0637ec: 02002025 */ move $a0,$s0 /* f0637f0: 10000010 */ b .PF0f063834 /* f0637f4: 00403025 */ move $a2,$v0 @@ -3193,7 +3193,7 @@ glabel var7f1ab190pf .PF0f0637fc: /* f0637fc: 54610006 */ bnel $v1,$at,.PF0f063818 /* f063800: 24010006 */ li $at,0x6 -/* f063804: 0fc4bf31 */ jal 0xf12fcc4 +/* f063804: 0fc4bf31 */ jal smokeUpdateZ /* f063808: 02002025 */ move $a0,$s0 /* f06380c: 10000009 */ b .PF0f063834 /* f063810: 00403025 */ move $a2,$v0 @@ -3201,9 +3201,9 @@ glabel var7f1ab190pf .PF0f063818: /* f063818: 54610007 */ bnel $v1,$at,.PF0f063838 /* f06381c: 962e035e */ lhu $t6,0x35e($s1) -/* f063820: 0fc5260c */ jal 0xf149830 +/* f063820: 0fc5260c */ jal splatTick /* f063824: 02002025 */ move $a0,$s0 -/* f063828: 0fc30a3b */ jal 0xf0c28ec +/* f063828: 0fc30a3b */ jal func0f0c2364 /* f06382c: 02002025 */ move $a0,$s0 /* f063830: 00403025 */ move $a2,$v0 .PF0f063834: @@ -3303,7 +3303,7 @@ glabel var7f1ab190pf /* f06398c: 00000000 */ nop /* f063990: 8e020004 */ lw $v0,0x4($s0) /* f063994: 02002025 */ move $a0,$s0 -/* f063998: 0fc5260c */ jal 0xf149830 +/* f063998: 0fc5260c */ jal splatTick /* f06399c: afa20044 */ sw $v0,0x44($sp) /* f0639a0: 8fa20044 */ lw $v0,0x44($sp) /* f0639a4: 10400008 */ beqz $v0,.PF0f0639c8 @@ -3311,12 +3311,12 @@ glabel var7f1ab190pf /* f0639ac: 8c4f02d4 */ lw $t7,0x2d4($v0) /* f0639b0: 11e00005 */ beqz $t7,.PF0f0639c8 /* f0639b4: 00000000 */ nop -/* f0639b8: 0fc64a62 */ jal 0xf192988 +/* f0639b8: 0fc64a62 */ jal aibotTick /* f0639bc: 02002025 */ move $a0,$s0 /* f0639c0: 1000003c */ b .PF0f063ab4 /* f0639c4: 00403025 */ move $a2,$v0 .PF0f0639c8: -/* f0639c8: 0fc08c75 */ jal 0xf0231d4 +/* f0639c8: 0fc08c75 */ jal func0f023098 /* f0639cc: 02002025 */ move $a0,$s0 /* f0639d0: 10000038 */ b .PF0f063ab4 /* f0639d4: 00403025 */ move $a2,$v0 @@ -3335,7 +3335,7 @@ glabel var7f1ab190pf /* f063a00: 93189564 */ lbu $t8,-0x6a9c($t8) /* f063a04: 57000006 */ bnezl $t8,.PF0f063a20 /* f063a08: 860d0002 */ lh $t5,0x2($s0) -/* f063a0c: 0fc1fa6a */ jal 0xf07e9a8 +/* f063a0c: 0fc1fa6a */ jal objTick /* f063a10: 02002025 */ move $a0,$s0 /* f063a14: 10000027 */ b .PF0f063ab4 /* f063a18: 00403025 */ move $a2,$v0 @@ -3352,7 +3352,7 @@ glabel var7f1ab190pf /* f063a40: 01b9082a */ slt $at,$t5,$t9 /* f063a44: 5020001c */ beqzl $at,.PF0f063ab8 /* f063a48: 8faf0034 */ lw $t7,0x34($sp) -/* f063a4c: 0fc18c56 */ jal 0xf063158 +/* f063a4c: 0fc18c56 */ jal propPrependToList2 /* f063a50: 02002025 */ move $a0,$s0 /* f063a54: 10000017 */ b .PF0f063ab4 /* f063a58: 24060005 */ li $a2,0x5 @@ -3360,7 +3360,7 @@ glabel var7f1ab190pf .PF0f063a60: /* f063a60: 54610006 */ bnel $v1,$at,.PF0f063a7c /* f063a64: 24010008 */ li $at,0x8 -/* f063a68: 0fc4b436 */ jal 0xf12d0d8 +/* f063a68: 0fc4b436 */ jal explosionUpdateZ /* f063a6c: 02002025 */ move $a0,$s0 /* f063a70: 10000010 */ b .PF0f063ab4 /* f063a74: 00403025 */ move $a2,$v0 @@ -3368,7 +3368,7 @@ glabel var7f1ab190pf .PF0f063a7c: /* f063a7c: 54610006 */ bnel $v1,$at,.PF0f063a98 /* f063a80: 24010006 */ li $at,0x6 -/* f063a84: 0fc4bf31 */ jal 0xf12fcc4 +/* f063a84: 0fc4bf31 */ jal smokeUpdateZ /* f063a88: 02002025 */ move $a0,$s0 /* f063a8c: 10000009 */ b .PF0f063ab4 /* f063a90: 00403025 */ move $a2,$v0 @@ -3376,9 +3376,9 @@ glabel var7f1ab190pf .PF0f063a98: /* f063a98: 54610007 */ bnel $v1,$at,.PF0f063ab8 /* f063a9c: 8faf0034 */ lw $t7,0x34($sp) -/* f063aa0: 0fc5260c */ jal 0xf149830 +/* f063aa0: 0fc5260c */ jal splatTick /* f063aa4: 02002025 */ move $a0,$s0 -/* f063aa8: 0fc30a3b */ jal 0xf0c28ec +/* f063aa8: 0fc30a3b */ jal func0f0c2364 /* f063aac: 02002025 */ move $a0,$s0 /* f063ab0: 00403025 */ move $a2,$v0 .PF0f063ab4: @@ -3436,9 +3436,9 @@ glabel var7f1ab190pf /* f063b6c: 35ee0080 */ ori $t6,$t7,0x80 /* f063b70: a20e003f */ sb $t6,0x3f($s0) /* f063b74: afa20060 */ sw $v0,0x60($sp) -/* f063b78: 0fc18209 */ jal 0xf060824 +/* f063b78: 0fc18209 */ jal propRemoveFromCurrentList /* f063b7c: 02002025 */ move $a0,$s0 -/* f063b80: 0fc181e6 */ jal 0xf060798 +/* f063b80: 0fc181e6 */ jal propAppendToList1 /* f063b84: 02002025 */ move $a0,$s0 /* f063b88: 8fb8004c */ lw $t8,0x4c($sp) /* f063b8c: 8fa20060 */ lw $v0,0x60($sp) @@ -3448,7 +3448,7 @@ glabel var7f1ab190pf /* f063b9c: 10000004 */ b .PF0f063bb0 /* f063ba0: afa0004c */ sw $zero,0x4c($sp) .PF0f063ba4: -/* f063ba4: 0fc18b71 */ jal 0xf062dc4 +/* f063ba4: 0fc18b71 */ jal func0f062b64 /* f063ba8: afa20060 */ sw $v0,0x60($sp) /* f063bac: 8fa20060 */ lw $v0,0x60($sp) .PF0f063bb0: @@ -3770,14 +3770,14 @@ glabel var7f1ab190pf /* f06400c: 9638035c */ lhu $t8,0x35c($s1) /* f064010: 11a00007 */ beqz $t5,.PF0f064030 /* f064014: a5580378 */ sh $t8,0x378($t2) -/* f064018: 0fc2432d */ jal 0xf090cb4 +/* f064018: 0fc2432d */ jal alarmTick /* f06401c: 00000000 */ nop -/* f064020: 0fc24cfe */ jal 0xf0933f8 +/* f064020: 0fc24cfe */ jal func0f093508 /* f064024: 00000000 */ nop -/* f064028: 0fc198b9 */ jal 0xf0662e4 +/* f064028: 0fc198b9 */ jal func0f066054 /* f06402c: 00000000 */ nop .PF0f064030: -/* f064030: 0fc09214 */ jal 0xf024850 +/* f064030: 0fc09214 */ jal func0f02472c /* f064034: 00000000 */ nop /* f064038: 8fbf002c */ lw $ra,0x2c($sp) /* f06403c: 8fb00014 */ lw $s0,0x14($sp) diff --git a/src/game/propobj.c b/src/game/propobj.c index a1f6ee487..965098dfc 100644 --- a/src/game/propobj.c +++ b/src/game/propobj.c @@ -3180,7 +3180,7 @@ glabel func0f068c04 /* f068f58: afa70128 */ sw $a3,0x128($sp) /* f068f5c: 2405005e */ li $a1,0x5e /* f068f60: 27a600b0 */ addiu $a2,$sp,0xb0 -/* f068f64: 0fc45964 */ jal 0xf116590 +/* f068f64: 0fc45964 */ jal padUnpack /* f068f68: afa30104 */ sw $v1,0x104($sp) /* f068f6c: 8fab012c */ lw $t3,0x12c($sp) /* f068f70: 3c010400 */ lui $at,0x400 @@ -3190,10 +3190,10 @@ glabel func0f068c04 /* f068f80: 01816824 */ and $t5,$t4,$at /* f068f84: 51a0000f */ beqzl $t5,.PF0f068fc4 /* f068f88: 95cf0070 */ lhu $t7,0x70($t6) -/* f068f8c: 0fc002c9 */ jal 0xf000b24 +/* f068f8c: 0fc002c9 */ jal func0f000b24 /* f068f90: 8fa400f8 */ lw $a0,0xf8($sp) /* f068f94: 02629821 */ addu $s3,$s3,$v0 -/* f068f98: 0fc00315 */ jal 0xf000c54 +/* f068f98: 0fc00315 */ jal func0f000c54 /* f068f9c: 8fa400f8 */ lw $a0,0xf8($sp) /* f068fa0: 0282a021 */ addu $s4,$s4,$v0 /* f068fa4: 02741821 */ addu $v1,$s3,$s4 @@ -3278,10 +3278,10 @@ glabel func0f068c04 /* f0690d0: 45020011 */ bc1fl .PF0f069118 /* f0690d4: 8624002a */ lh $a0,0x2a($s1) .PF0f0690d8: -/* f0690d8: 0fc00315 */ jal 0xf000c54 +/* f0690d8: 0fc00315 */ jal func0f000c54 /* f0690dc: 00000000 */ nop /* f0690e0: 00408025 */ move $s0,$v0 -/* f0690e4: 0fc002c9 */ jal 0xf000b24 +/* f0690e4: 0fc002c9 */ jal func0f000b24 /* f0690e8: 86240028 */ lh $a0,0x28($s1) /* f0690ec: 00501821 */ addu $v1,$v0,$s0 /* f0690f0: 28610100 */ slti $at,$v1,0x100 @@ -3317,11 +3317,11 @@ glabel func0f068c04 /* f069154: 8fb00130 */ lw $s0,0x130($sp) /* f069158: 00002825 */ move $a1,$zero /* f06915c: 26100028 */ addiu $s0,$s0,0x28 -/* f069160: 0fc1a369 */ jal 0xf068da4 +/* f069160: 0fc1a369 */ jal func0f068b14 /* f069164: 02002025 */ move $a0,$s0 /* f069168: 00408825 */ move $s1,$v0 /* f06916c: 02002025 */ move $a0,$s0 -/* f069170: 0fc1a369 */ jal 0xf068da4 +/* f069170: 0fc1a369 */ jal func0f068b14 /* f069174: 24050001 */ li $a1,0x1 /* f069178: 10000017 */ b .PF0f0691d8 /* f06917c: 00401825 */ move $v1,$v0 @@ -15505,7 +15505,7 @@ glabel var7f1ab5c0pf /* f071768: 502002ef */ beqzl $at,.PF0f072328 /* f07176c: 8fbf004c */ lw $ra,0x4c($sp) /* f071770: 8c980014 */ lw $t8,0x14($a0) -/* f071774: 0fc1a361 */ jal 0xf068d84 +/* f071774: 0fc1a361 */ jal func0f068af4 /* f071778: afb801d4 */ sw $t8,0x1d4($sp) /* f07177c: 92190000 */ lbu $t9,0x0($s0) /* f071780: 3c0a8007 */ lui $t2,0x8007 @@ -15532,7 +15532,7 @@ glabel var7f1ab5c0pf /* f0717d4: 02002825 */ move $a1,$s0 /* f0717d8: afa801c0 */ sw $t0,0x1c0($sp) /* f0717dc: 24460008 */ addiu $a2,$v0,0x8 -/* f0717e0: 0fc1c59b */ jal 0xf07166c +/* f0717e0: 0fc1c59b */ jal func0f0713e4 /* f0717e4: 24470028 */ addiu $a3,$v0,0x28 /* f0717e8: 3c03800a */ lui $v1,0x800a /* f0717ec: 8c63a518 */ lw $v1,-0x5ae8($v1) @@ -15559,7 +15559,7 @@ glabel var7f1ab5c0pf /* f071838: 0561000c */ bgez $t3,.PF0f07186c /* f07183c: 27a50088 */ addiu $a1,$sp,0x88 /* f071840: 27a60084 */ addiu $a2,$sp,0x84 -/* f071844: 0fc21def */ jal 0xf0877bc +/* f071844: 0fc21def */ jal propObjGetBbox /* f071848: 27a70080 */ addiu $a3,$sp,0x80 /* f07184c: 3c017f1b */ lui $at,0x7f1b /* f071850: c422b570 */ lwc1 $f2,-0x4a90($at) @@ -15584,10 +15584,10 @@ glabel var7f1ab5c0pf /* f071898: 46005102 */ mul.s $f4,$f10,$f0 /* f07189c: e7a401cc */ swc1 $f4,0x1cc($sp) .PF0f0718a0: -/* f0718a0: 0c006858 */ jal 0x1a160 +/* f0718a0: 0c006858 */ jal cosf /* f0718a4: c60c0010 */ lwc1 $f12,0x10($s0) /* f0718a8: c60c0010 */ lwc1 $f12,0x10($s0) -/* f0718ac: 0c00685b */ jal 0x1a16c +/* f0718ac: 0c00685b */ jal sinf /* f0718b0: e7a000bc */ swc1 $f0,0xbc($sp) /* f0718b4: c7ac01d0 */ lwc1 $f12,0x1d0($sp) /* f0718b8: 8fa201d4 */ lw $v0,0x1d4($sp) @@ -15623,43 +15623,43 @@ glabel var7f1ab5c0pf /* f071930: 46062201 */ sub.s $f8,$f4,$f6 /* f071934: e7a80094 */ swc1 $f8,0x94($sp) /* f071938: c44a0010 */ lwc1 $f10,0x10($v0) -/* f07193c: 0fc1968d */ jal 0xf065a34 +/* f07193c: 0fc1968d */ jal roomsCopy /* f071940: e7aa0098 */ swc1 $f10,0x98($sp) /* f071944: 02202025 */ move $a0,$s1 /* f071948: 27a50090 */ addiu $a1,$sp,0x90 /* f07194c: 8fa6005c */ lw $a2,0x5c($sp) -/* f071950: 0fc2488f */ jal 0xf09223c +/* f071950: 0fc2488f */ jal func0f09233c /* f071954: 27a7009c */ addiu $a3,$sp,0x9c /* f071958: 8fa40064 */ lw $a0,0x64($sp) /* f07195c: 8fa50060 */ lw $a1,0x60($sp) /* f071960: 27a601b4 */ addiu $a2,$sp,0x1b4 -/* f071964: 0fc19841 */ jal 0xf066104 +/* f071964: 0fc19841 */ jal func0f065e74 /* f071968: 27a70198 */ addiu $a3,$sp,0x198 /* f07196c: 27a4009c */ addiu $a0,$sp,0x9c /* f071970: 27a50198 */ addiu $a1,$sp,0x198 -/* f071974: 0fc1969a */ jal 0xf065a68 +/* f071974: 0fc1969a */ jal roomsAppend /* f071978: 24060008 */ li $a2,0x8 /* f07197c: 27a401b4 */ addiu $a0,$sp,0x1b4 /* f071980: 3c0540a0 */ lui $a1,0x40a0 /* f071984: 27a60198 */ addiu $a2,$sp,0x198 /* f071988: 26270058 */ addiu $a3,$s1,0x58 -/* f07198c: 0c00a70c */ jal 0x29c30 +/* f07198c: 0c00a70c */ jal cdFindGroundYSimple /* f071990: afa00010 */ sw $zero,0x10($sp) /* f071994: 8fa40064 */ lw $a0,0x64($sp) /* f071998: 8fa50060 */ lw $a1,0x60($sp) /* f07199c: 27a601a8 */ addiu $a2,$sp,0x1a8 /* f0719a0: 27a70188 */ addiu $a3,$sp,0x188 -/* f0719a4: 0fc19841 */ jal 0xf066104 +/* f0719a4: 0fc19841 */ jal func0f065e74 /* f0719a8: e7a001c8 */ swc1 $f0,0x1c8($sp) /* f0719ac: 27a4009c */ addiu $a0,$sp,0x9c /* f0719b0: 27a50188 */ addiu $a1,$sp,0x188 -/* f0719b4: 0fc1969a */ jal 0xf065a68 +/* f0719b4: 0fc1969a */ jal roomsAppend /* f0719b8: 24060008 */ li $a2,0x8 /* f0719bc: 27a401a8 */ addiu $a0,$sp,0x1a8 /* f0719c0: 3c0540a0 */ lui $a1,0x40a0 /* f0719c4: 27a60188 */ addiu $a2,$sp,0x188 /* f0719c8: 00003825 */ move $a3,$zero -/* f0719cc: 0c00a70c */ jal 0x29c30 +/* f0719cc: 0c00a70c */ jal cdFindGroundYSimple /* f0719d0: afa00010 */ sw $zero,0x10($sp) /* f0719d4: 3c017f1b */ lui $at,0x7f1b /* f0719d8: c42cb578 */ lwc1 $f12,-0x4a88($at) @@ -15675,7 +15675,7 @@ glabel var7f1ab5c0pf /* f071a00: 45020011 */ bc1fl .PF0f071a48 /* f071a04: 4602603e */ c.le.s $f12,$f2 /* f071a08: 46101301 */ sub.s $f12,$f2,$f16 -/* f071a0c: 0fc2599c */ jal 0xf096670 +/* f071a0c: 0fc2599c */ jal atan2f /* f071a10: 46062381 */ sub.s $f14,$f4,$f6 /* f071a14: 3c017f1b */ lui $at,0x7f1b /* f071a18: c428b57c */ lwc1 $f8,-0x4a84($at) @@ -15697,7 +15697,7 @@ glabel var7f1ab5c0pf /* f071a50: 4600603e */ c.le.s $f12,$f0 /* f071a54: c6040034 */ lwc1 $f4,0x34($s0) /* f071a58: 46007387 */ neg.s $f14,$f14 -/* f071a5c: 0fc2599c */ jal 0xf096670 +/* f071a5c: 0fc2599c */ jal atan2f /* f071a60: 46041301 */ sub.s $f12,$f2,$f4 /* f071a64: 3c017f1b */ lui $at,0x7f1b /* f071a68: c426b584 */ lwc1 $f6,-0x4a7c($at) @@ -15719,7 +15719,7 @@ glabel var7f1ab5c0pf /* f071aa0: 44804000 */ mtc1 $zero,$f8 /* f071aa4: c60a0034 */ lwc1 $f10,0x34($s0) /* f071aa8: c7ae01cc */ lwc1 $f14,0x1cc($sp) -/* f071aac: 0fc2599c */ jal 0xf096670 +/* f071aac: 0fc2599c */ jal atan2f /* f071ab0: 46105301 */ sub.s $f12,$f10,$f16 /* f071ab4: 3c017f1b */ lui $at,0x7f1b /* f071ab8: c424b58c */ lwc1 $f4,-0x4a74($at) @@ -15793,7 +15793,7 @@ glabel var7f1ab5c0pf /* f071bb4: e7a00024 */ swc1 $f0,0x24($sp) /* f071bb8: e7a00030 */ swc1 $f0,0x30($sp) /* f071bbc: e7a00034 */ swc1 $f0,0x34($sp) -/* f071bc0: 0fc24e3a */ jal 0xf0938e8 +/* f071bc0: 0fc24e3a */ jal func0f0939f8 /* f071bc4: e7a00038 */ swc1 $f0,0x38($sp) .PF0f071bc8: /* f071bc8: 8fae00c0 */ lw $t6,0xc0($sp) @@ -15805,7 +15805,7 @@ glabel var7f1ab5c0pf /* f071bdc: e7a00010 */ swc1 $f0,0x10($sp) /* f071be0: c5c60010 */ lwc1 $f6,0x10($t6) /* f071be4: 44070000 */ mfc1 $a3,$f0 -/* f071be8: 0fc1b6e5 */ jal 0xf06db94 +/* f071be8: 0fc1b6e5 */ jal func0f06d90c /* f071bec: e7a60014 */ swc1 $f6,0x14($sp) /* f071bf0: 8fa200c0 */ lw $v0,0xc0($sp) /* f071bf4: c6000008 */ lwc1 $f0,0x8($s0) @@ -15820,7 +15820,7 @@ glabel var7f1ab5c0pf /* f071c18: 4502001a */ bc1fl .PF0f071c84 /* f071c1c: 4602003c */ c.lt.s $f0,$f2 /* f071c20: 44804000 */ mtc1 $zero,$f8 -/* f071c24: 0c004ad4 */ jal 0x12b50 +/* f071c24: 0c004ad4 */ jal random /* f071c28: e608000c */ swc1 $f8,0xc($s0) /* f071c2c: 8fa300c0 */ lw $v1,0xc0($sp) /* f071c30: 44824000 */ mtc1 $v0,$f8 @@ -15855,7 +15855,7 @@ glabel var7f1ab5c0pf /* f071c9c: 45020018 */ bc1fl .PF0f071d00 /* f071ca0: c440001c */ lwc1 $f0,0x1c($v0) /* f071ca4: 44802000 */ mtc1 $zero,$f4 -/* f071ca8: 0c004ad4 */ jal 0x12b50 +/* f071ca8: 0c004ad4 */ jal random /* f071cac: e604000c */ swc1 $f4,0xc($s0) /* f071cb0: 44824000 */ mtc1 $v0,$f8 /* f071cb4: 3c014f80 */ lui $at,0x4f80 @@ -15886,7 +15886,7 @@ glabel var7f1ab5c0pf /* f071d0c: c4480020 */ lwc1 $f8,0x20($v0) /* f071d10: 44070000 */ mfc1 $a3,$f0 /* f071d14: 2606001c */ addiu $a2,$s0,0x1c -/* f071d18: 0fc1b762 */ jal 0xf06dd88 +/* f071d18: 0fc1b762 */ jal func0f06db00 /* f071d1c: e7a80014 */ swc1 $f8,0x14($sp) /* f071d20: c60c0018 */ lwc1 $f12,0x18($s0) /* f071d24: c6060014 */ lwc1 $f6,0x14($s0) @@ -15916,7 +15916,7 @@ glabel var7f1ab5c0pf /* f071d84: 00000000 */ nop /* f071d88: 45000018 */ bc1f .PF0f071dec /* f071d8c: 00000000 */ nop -/* f071d90: 0c004ad4 */ jal 0x12b50 +/* f071d90: 0c004ad4 */ jal random /* f071d94: 00000000 */ nop /* f071d98: 8fa300c0 */ lw $v1,0xc0($sp) /* f071d9c: 3c017f1b */ lui $at,0x7f1b @@ -15941,7 +15941,7 @@ glabel var7f1ab5c0pf /* f071de4: 10000013 */ b .PF0f071e34 /* f071de8: e6040018 */ swc1 $f4,0x18($s0) .PF0f071dec: -/* f071dec: 0c004ad4 */ jal 0x12b50 +/* f071dec: 0c004ad4 */ jal random /* f071df0: 00000000 */ nop /* f071df4: 44825000 */ mtc1 $v0,$f10 /* f071df8: 3c014f80 */ lui $at,0x4f80 @@ -15970,7 +15970,7 @@ glabel var7f1ab5c0pf /* f071e48: e7a00010 */ swc1 $f0,0x10($sp) /* f071e4c: c4460030 */ lwc1 $f6,0x30($v0) /* f071e50: 44070000 */ mfc1 $a3,$f0 -/* f071e54: 0fc1b762 */ jal 0xf06dd88 +/* f071e54: 0fc1b762 */ jal func0f06db00 /* f071e58: e7a60014 */ swc1 $f6,0x14($sp) /* f071e5c: c60c0024 */ lwc1 $f12,0x24($s0) /* f071e60: c6080020 */ lwc1 $f8,0x20($s0) @@ -16000,7 +16000,7 @@ glabel var7f1ab5c0pf /* f071ec0: 00000000 */ nop /* f071ec4: 45000018 */ bc1f .PF0f071f28 /* f071ec8: 00000000 */ nop -/* f071ecc: 0c004ad4 */ jal 0x12b50 +/* f071ecc: 0c004ad4 */ jal random /* f071ed0: 00000000 */ nop /* f071ed4: 8fa900c0 */ lw $t1,0xc0($sp) /* f071ed8: 3c017f1b */ lui $at,0x7f1b @@ -16025,7 +16025,7 @@ glabel var7f1ab5c0pf /* f071f20: 10000013 */ b .PF0f071f70 /* f071f24: e60a0024 */ swc1 $f10,0x24($s0) .PF0f071f28: -/* f071f28: 0c004ad4 */ jal 0x12b50 +/* f071f28: 0c004ad4 */ jal random /* f071f2c: 00000000 */ nop /* f071f30: 44822000 */ mtc1 $v0,$f4 /* f071f34: 3c014f80 */ lui $at,0x4f80 @@ -16179,7 +16179,7 @@ glabel var7f1ab5c0pf /* f072148: 13000004 */ beqz $t8,.PF0f07215c /* f07214c: 02202025 */ move $a0,$s1 /* f072150: 24050001 */ li $a1,0x1 -/* f072154: 0fc1a7be */ jal 0xf069ef8 +/* f072154: 0fc1a7be */ jal func0f069c70 /* f072158: 24060001 */ li $a2,0x1 .PF0f07215c: /* f07215c: 3c0140a0 */ lui $at,0x40a0 @@ -16209,14 +16209,14 @@ glabel var7f1ab5c0pf /* f0721b4: 01415824 */ and $t3,$t2,$at /* f0721b8: ae2b0008 */ sw $t3,0x8($s1) .PF0f0721bc: -/* f0721bc: 0fc1c57a */ jal 0xf0715e8 +/* f0721bc: 0fc1c57a */ jal func0f071360 /* f0721c0: 02202025 */ move $a0,$s1 /* f0721c4: c6040030 */ lwc1 $f4,0x30($s0) /* f0721c8: 8fac01d4 */ lw $t4,0x1d4($sp) /* f0721cc: 27a50148 */ addiu $a1,$sp,0x148 /* f0721d0: 46040280 */ add.s $f10,$f0,$f4 /* f0721d4: e58a000c */ swc1 $f10,0xc($t4) -/* f0721d8: 0c005864 */ jal 0x16190 +/* f0721d8: 0c005864 */ jal func00016400 /* f0721dc: c60c0020 */ lwc1 $f12,0x20($s0) /* f0721e0: c608002c */ lwc1 $f8,0x2c($s0) /* f0721e4: c6060014 */ lwc1 $f6,0x14($s0) @@ -16241,21 +16241,21 @@ glabel var7f1ab5c0pf /* f07222c: c426b5c0 */ lwc1 $f6,-0x4a40($at) /* f072230: 46066300 */ add.s $f12,$f12,$f6 .PF0f072234: -/* f072234: 0c00581e */ jal 0x16078 +/* f072234: 0c00581e */ jal func000162e8 /* f072238: 27a50108 */ addiu $a1,$sp,0x108 /* f07223c: 27a40108 */ addiu $a0,$sp,0x108 -/* f072240: 0c00565c */ jal 0x15970 +/* f072240: 0c00565c */ jal func00015be0 /* f072244: 27a50148 */ addiu $a1,$sp,0x148 /* f072248: c60c0010 */ lwc1 $f12,0x10($s0) -/* f07224c: 0c005841 */ jal 0x16104 +/* f07224c: 0c005841 */ jal func00016374 /* f072250: 27a50108 */ addiu $a1,$sp,0x108 /* f072254: 27b00108 */ addiu $s0,$sp,0x108 /* f072258: 02002025 */ move $a0,$s0 -/* f07225c: 0c00565c */ jal 0x15970 +/* f07225c: 0c00565c */ jal func00015be0 /* f072260: 27a50148 */ addiu $a1,$sp,0x148 /* f072264: 8e2d0018 */ lw $t5,0x18($s1) /* f072268: 27a50148 */ addiu $a1,$sp,0x148 -/* f07226c: 0c005725 */ jal 0x15c94 +/* f07226c: 0c005725 */ jal func00015f04 /* f072270: c5ac0014 */ lwc1 $f12,0x14($t5) /* f072274: 922e0003 */ lbu $t6,0x3($s1) /* f072278: 24010033 */ li $at,0x33 @@ -16271,15 +16271,15 @@ glabel var7f1ab5c0pf /* f0722a0: 00000000 */ nop /* f0722a4: 4503000c */ bc1tl .PF0f0722d8 /* f0722a8: c7a4006c */ lwc1 $f4,0x6c($sp) -/* f0722ac: 0c00581e */ jal 0x16078 +/* f0722ac: 0c00581e */ jal func000162e8 /* f0722b0: 02002825 */ move $a1,$s0 /* f0722b4: 27b100c8 */ addiu $s1,$sp,0xc8 /* f0722b8: 02203025 */ move $a2,$s1 /* f0722bc: 27a40148 */ addiu $a0,$sp,0x148 -/* f0722c0: 0c00565d */ jal 0x15974 +/* f0722c0: 0c00565d */ jal func00015be4 /* f0722c4: 02002825 */ move $a1,$s0 /* f0722c8: 02202025 */ move $a0,$s1 -/* f0722cc: 0c0056aa */ jal 0x15aa8 +/* f0722cc: 0c0056aa */ jal func00015d18 /* f0722d0: 27a50148 */ addiu $a1,$sp,0x148 /* f0722d4: c7a4006c */ lwc1 $f4,0x6c($sp) .PF0f0722d8: @@ -16290,18 +16290,18 @@ glabel var7f1ab5c0pf /* f0722e8: 00000000 */ nop /* f0722ec: 4503000b */ bc1tl .PF0f07231c /* f0722f0: 27a40148 */ addiu $a0,$sp,0x148 -/* f0722f4: 0c005864 */ jal 0x16190 +/* f0722f4: 0c005864 */ jal func00016400 /* f0722f8: 46002306 */ mov.s $f12,$f4 /* f0722fc: 27a40148 */ addiu $a0,$sp,0x148 /* f072300: 02002825 */ move $a1,$s0 -/* f072304: 0c00565d */ jal 0x15974 +/* f072304: 0c00565d */ jal func00015be4 /* f072308: 02203025 */ move $a2,$s1 /* f07230c: 02202025 */ move $a0,$s1 -/* f072310: 0c0056aa */ jal 0x15aa8 +/* f072310: 0c0056aa */ jal func00015d18 /* f072314: 27a50148 */ addiu $a1,$sp,0x148 /* f072318: 27a40148 */ addiu $a0,$sp,0x148 .PF0f07231c: -/* f07231c: 0c0056cc */ jal 0x15b30 +/* f07231c: 0c0056cc */ jal func00015da0 /* f072320: 8fa5005c */ lw $a1,0x5c($sp) /* f072324: 8fbf004c */ lw $ra,0x4c($sp) .PF0f072328: @@ -18219,13 +18219,13 @@ glabel var7f1ab654pf /* f072e20: 460a2182 */ mul.s $f6,$f4,$f10 /* f072e24: afa30064 */ sw $v1,0x64($sp) /* f072e28: 4606a200 */ add.s $f8,$f20,$f6 -/* f072e2c: 0fc1c8d7 */ jal 0xf07235c +/* f072e2c: 0fc1c8d7 */ jal hoverpropGetTurnAngle /* f072e30: e7a8006c */ swc1 $f8,0x6c($sp) /* f072e34: e7a00080 */ swc1 $f0,0x80($sp) -/* f072e38: 0c00685b */ jal 0x1a16c +/* f072e38: 0c00685b */ jal sinf /* f072e3c: 46000306 */ mov.s $f12,$f0 /* f072e40: e7a0007c */ swc1 $f0,0x7c($sp) -/* f072e44: 0c006858 */ jal 0x1a160 +/* f072e44: 0c006858 */ jal cosf /* f072e48: c7ac0080 */ lwc1 $f12,0x80($sp) /* f072e4c: c7b0008c */ lwc1 $f16,0x8c($sp) /* f072e50: 3c05800a */ lui $a1,0x800a @@ -20544,7 +20544,7 @@ glabel var7f1ab6dcpf /* f073f34: 24010058 */ li $at,0x58 /* f073f38: 57010006 */ bnel $t8,$at,.PF0f073f54 /* f073f3c: 8e020000 */ lw $v0,0x0($s0) -/* f073f40: 0fc1cdbc */ jal 0xf0736f0 +/* f073f40: 0fc1cdbc */ jal func0f073478 /* f073f44: 00000000 */ nop /* f073f48: 10000c98 */ b .PF0f0771ac /* f073f4c: afa205d8 */ sw $v0,0x5d8($sp) @@ -20571,7 +20571,7 @@ glabel var7f1ab6dcpf /* f073f98: 31cf0080 */ andi $t7,$t6,0x80 /* f073f9c: 11e00005 */ beqz $t7,.PF0f073fb4 /* f073fa0: 27a605e8 */ addiu $a2,$sp,0x5e8 -/* f073fa4: 0fc1cf58 */ jal 0xf073d60 +/* f073fa4: 0fc1cf58 */ jal func0f073ae8 /* f073fa8: 27a705f4 */ addiu $a3,$sp,0x5f4 /* f073fac: 3c03800a */ lui $v1,0x800a /* f073fb0: 2463a510 */ addiu $v1,$v1,-23280 @@ -20595,11 +20595,11 @@ glabel var7f1ab6dcpf /* f073ff0: 30490800 */ andi $t1,$v0,0x800 /* f073ff4: 11200379 */ beqz $t1,.PF0f074ddc /* f073ff8: 304e0001 */ andi $t6,$v0,0x1 -/* f073ffc: 0c0056b9 */ jal 0x15ae4 +/* f073ffc: 0c0056b9 */ jal func00015d54 /* f074000: afa40074 */ sw $a0,0x74($sp) /* f074004: 26440008 */ addiu $a0,$s2,0x8 /* f074008: afa40070 */ sw $a0,0x70($sp) -/* f07400c: 0c0056d9 */ jal 0x15b64 +/* f07400c: 0c0056d9 */ jal func00015dd4 /* f074010: 27a50504 */ addiu $a1,$sp,0x504 /* f074014: 4480a000 */ mtc1 $zero,$f20 /* f074018: c60000dc */ lwc1 $f0,0xdc($s0) @@ -20724,7 +20724,7 @@ glabel var7f1ab6dcpf /* f0741cc: 46021282 */ mul.s $f10,$f2,$f2 /* f0741d0: 00000000 */ nop /* f0741d4: 460e7102 */ mul.s $f4,$f14,$f14 -/* f0741d8: 0c0127b4 */ jal 0x49ed0 +/* f0741d8: 0c0127b4 */ jal sqrtf /* f0741dc: 46045300 */ add.s $f12,$f10,$f4 /* f0741e0: 4600a03c */ c.lt.s $f20,$f0 /* f0741e4: 3c03800a */ lui $v1,0x800a @@ -20824,7 +20824,7 @@ glabel var7f1ab6dcpf .PF0f074334: /* f074334: 50800004 */ beqzl $a0,.PF0f074348 /* f074338: 86240006 */ lh $a0,0x6($s1) -/* f07433c: 0fc19102 */ jal 0xf064408 +/* f07433c: 0fc19102 */ jal propSetCollisionsEnabled /* f074340: 00002825 */ move $a1,$zero /* f074344: 86240006 */ lh $a0,0x6($s1) .PF0f074348: @@ -20842,7 +20842,7 @@ glabel var7f1ab6dcpf /* f074370: 8fb90088 */ lw $t9,0x88($sp) /* f074374: 1320003b */ beqz $t9,.PF0f074464 /* f074378: 24050002 */ li $a1,0x2 -/* f07437c: 0fc45964 */ jal 0xf116590 +/* f07437c: 0fc45964 */ jal padUnpack /* f074380: 27a60430 */ addiu $a2,$sp,0x430 /* f074384: 3c014348 */ lui $at,0x4348 /* f074388: 44811000 */ mtc1 $at,$f2 @@ -20880,7 +20880,7 @@ glabel var7f1ab6dcpf /* f074400: 46000282 */ mul.s $f10,$f0,$f0 /* f074404: 00000000 */ nop /* f074408: 46021102 */ mul.s $f4,$f2,$f2 -/* f07440c: 0c0127b4 */ jal 0x49ed0 +/* f07440c: 0c0127b4 */ jal sqrtf /* f074410: 46045300 */ add.s $f12,$f10,$f4 /* f074414: c7a60418 */ lwc1 $f6,0x418($sp) /* f074418: c7a8041c */ lwc1 $f8,0x41c($sp) @@ -20923,7 +20923,7 @@ glabel var7f1ab6dcpf /* f0744a4: acae0004 */ sw $t6,0x4($a1) /* f0744a8: 8d810008 */ lw $at,0x8($t4) /* f0744ac: aca10008 */ sw $at,0x8($a1) -/* f0744b0: 0fc1c8f2 */ jal 0xf0723c8 +/* f0744b0: 0fc1c8f2 */ jal func0f072144 /* f0744b4: e7a005a8 */ swc1 $f0,0x5a8($sp) /* f0744b8: 2401ffff */ li $at,-1 /* f0744bc: 1041000c */ beq $v0,$at,.PF0f0744f0 @@ -20937,7 +20937,7 @@ glabel var7f1ab6dcpf /* f0744dc: 02202025 */ move $a0,$s1 /* f0744e0: 46062282 */ mul.s $f10,$f4,$f6 /* f0744e4: 27a50404 */ addiu $a1,$sp,0x404 -/* f0744e8: 0fc1ca96 */ jal 0xf072a58 +/* f0744e8: 0fc1ca96 */ jal func0f0727d4 /* f0744ec: e60a00dc */ swc1 $f10,0xdc($s0) .PF0f0744f0: /* f0744f0: 3c01800a */ lui $at,0x800a @@ -20963,7 +20963,7 @@ glabel var7f1ab6dcpf /* f074540: 46000202 */ mul.s $f8,$f0,$f0 /* f074544: 460a3081 */ sub.s $f2,$f6,$f10 /* f074548: 46021102 */ mul.s $f4,$f2,$f2 -/* f07454c: 0c0127b4 */ jal 0x49ed0 +/* f07454c: 0c0127b4 */ jal sqrtf /* f074550: 46044300 */ add.s $f12,$f8,$f4 /* f074554: c7ac0418 */ lwc1 $f12,0x418($sp) /* f074558: c7a6041c */ lwc1 $f6,0x41c($sp) @@ -21005,13 +21005,13 @@ glabel var7f1ab6dcpf .PF0f0745e0: /* f0745e0: 02202025 */ move $a0,$s1 /* f0745e4: 27a5059c */ addiu $a1,$sp,0x59c -/* f0745e8: 0fc1c8f2 */ jal 0xf0723c8 +/* f0745e8: 0fc1c8f2 */ jal func0f072144 /* f0745ec: 24070001 */ li $a3,0x1 /* f0745f0: 144001ae */ bnez $v0,.PF0f074cac /* f0745f4: afa20600 */ sw $v0,0x600($sp) /* f0745f8: 4406a000 */ mfc1 $a2,$f20 /* f0745fc: 02202025 */ move $a0,$s1 -/* f074600: 0fc1ca96 */ jal 0xf072a58 +/* f074600: 0fc1ca96 */ jal func0f0727d4 /* f074604: 27a5059c */ addiu $a1,$sp,0x59c /* f074608: c604008c */ lwc1 $f4,0x8c($s0) /* f07460c: 27a403d0 */ addiu $a0,$sp,0x3d0 @@ -21021,7 +21021,7 @@ glabel var7f1ab6dcpf /* f07461c: 00000000 */ nop /* f074620: 450201a3 */ bc1fl .PF0f074cb0 /* f074624: 8fab0600 */ lw $t3,0x600($sp) -/* f074628: 0c009319 */ jal 0x24c64 +/* f074628: 0c009319 */ jal func00025364 /* f07462c: e7b0058c */ swc1 $f16,0x58c($sp) /* f074630: 1040000e */ beqz $v0,.PF0f07466c /* f074634: c7b0058c */ lwc1 $f16,0x58c($sp) @@ -21044,7 +21044,7 @@ glabel var7f1ab6dcpf /* f074674: 27a403d0 */ addiu $a0,$sp,0x3d0 /* f074678: 27a503c4 */ addiu $a1,$sp,0x3c4 /* f07467c: 240620a8 */ li $a2,0x20a8 -/* f074680: 0c0091d3 */ jal 0x2474c +/* f074680: 0c0091d3 */ jal func00024e4c /* f074684: e7b0058c */ swc1 $f16,0x58c($sp) /* f074688: c7aa03d0 */ lwc1 $f10,0x3d0($sp) /* f07468c: c7a803c4 */ lwc1 $f8,0x3c4($sp) @@ -21074,7 +21074,7 @@ glabel var7f1ab6dcpf /* f0746e8: 27a403d0 */ addiu $a0,$sp,0x3d0 /* f0746ec: 27a503c4 */ addiu $a1,$sp,0x3c4 /* f0746f0: 27a603b8 */ addiu $a2,$sp,0x3b8 -/* f0746f4: 0fc0b986 */ jal 0xf02e618 +/* f0746f4: 0fc0b986 */ jal func0f02e4f8 /* f0746f8: e7b0058c */ swc1 $f16,0x58c($sp) /* f0746fc: c6460008 */ lwc1 $f6,0x8($s2) /* f074700: c7aa05dc */ lwc1 $f10,0x5dc($sp) @@ -21127,7 +21127,7 @@ glabel var7f1ab6dcpf /* f0747b0: 27a503dc */ addiu $a1,$sp,0x3dc /* f0747b4: 240620ce */ li $a2,0x20ce /* f0747b8: e60600dc */ swc1 $f6,0xdc($s0) -/* f0747bc: 0c0091d3 */ jal 0x2474c +/* f0747bc: 0c0091d3 */ jal func00024e4c /* f0747c0: e7b0058c */ swc1 $f16,0x58c($sp) /* f0747c4: c7aa03e4 */ lwc1 $f10,0x3e4($sp) /* f0747c8: c7a803f0 */ lwc1 $f8,0x3f0($sp) @@ -21150,7 +21150,7 @@ glabel var7f1ab6dcpf /* f07480c: 45030006 */ bc1tl .PF0f074828 /* f074810: 44815000 */ mtc1 $at,$f10 .PF0f074814: -/* f074814: 0c0011d8 */ jal 0x4760 +/* f074814: 0c0011d8 */ jal guNormalize /* f074818: e7b0058c */ swc1 $f16,0x58c($sp) /* f07481c: 10000004 */ b .PF0f074830 /* f074820: c7b0058c */ lwc1 $f16,0x58c($sp) @@ -21199,7 +21199,7 @@ glabel var7f1ab6dcpf /* f0748c4: 46000202 */ mul.s $f8,$f0,$f0 /* f0748c8: 46045081 */ sub.s $f2,$f10,$f4 /* f0748cc: 46021182 */ mul.s $f6,$f2,$f2 -/* f0748d0: 0c0127b4 */ jal 0x49ed0 +/* f0748d0: 0c0127b4 */ jal sqrtf /* f0748d4: 46064300 */ add.s $f12,$f8,$f6 /* f0748d8: c7aa0418 */ lwc1 $f10,0x418($sp) /* f0748dc: c7a4041c */ lwc1 $f4,0x41c($sp) @@ -21242,13 +21242,13 @@ glabel var7f1ab6dcpf .PF0f074968: /* f074968: 02202025 */ move $a0,$s1 /* f07496c: 27a5059c */ addiu $a1,$sp,0x59c -/* f074970: 0fc1c8f2 */ jal 0xf0723c8 +/* f074970: 0fc1c8f2 */ jal func0f072144 /* f074974: 24070001 */ li $a3,0x1 /* f074978: 144000c2 */ bnez $v0,.PF0f074c84 /* f07497c: afa20600 */ sw $v0,0x600($sp) /* f074980: 4406a000 */ mfc1 $a2,$f20 /* f074984: 02202025 */ move $a0,$s1 -/* f074988: 0fc1ca96 */ jal 0xf072a58 +/* f074988: 0fc1ca96 */ jal func0f0727d4 /* f07498c: 27a5059c */ addiu $a1,$sp,0x59c /* f074990: c604008c */ lwc1 $f4,0x8c($s0) /* f074994: c6080004 */ lwc1 $f8,0x4($s0) @@ -21281,7 +21281,7 @@ glabel var7f1ab6dcpf /* f074a00: 46000182 */ mul.s $f6,$f0,$f0 /* f074a04: 46082081 */ sub.s $f2,$f4,$f8 /* f074a08: 46021282 */ mul.s $f10,$f2,$f2 -/* f074a0c: 0c0127b4 */ jal 0x49ed0 +/* f074a0c: 0c0127b4 */ jal sqrtf /* f074a10: 460a3300 */ add.s $f12,$f6,$f10 /* f074a14: c7a40418 */ lwc1 $f4,0x418($sp) /* f074a18: c7a8041c */ lwc1 $f8,0x41c($sp) @@ -21324,13 +21324,13 @@ glabel var7f1ab6dcpf .PF0f074aa4: /* f074aa4: 02202025 */ move $a0,$s1 /* f074aa8: 27a5059c */ addiu $a1,$sp,0x59c -/* f074aac: 0fc1c8f2 */ jal 0xf0723c8 +/* f074aac: 0fc1c8f2 */ jal func0f072144 /* f074ab0: 24070001 */ li $a3,0x1 /* f074ab4: 14400073 */ bnez $v0,.PF0f074c84 /* f074ab8: afa20600 */ sw $v0,0x600($sp) /* f074abc: 4406a000 */ mfc1 $a2,$f20 /* f074ac0: 02202025 */ move $a0,$s1 -/* f074ac4: 0fc1ca96 */ jal 0xf072a58 +/* f074ac4: 0fc1ca96 */ jal func0f0727d4 /* f074ac8: 27a5059c */ addiu $a1,$sp,0x59c /* f074acc: c7ae03e8 */ lwc1 $f14,0x3e8($sp) /* f074ad0: c7b203dc */ lwc1 $f18,0x3dc($sp) @@ -21352,7 +21352,7 @@ glabel var7f1ab6dcpf /* f074b0c: e7a203a0 */ swc1 $f2,0x3a0($sp) /* f074b10: 46000182 */ mul.s $f6,$f0,$f0 /* f074b14: e7a00398 */ swc1 $f0,0x398($sp) -/* f074b18: 0c0127b4 */ jal 0x49ed0 +/* f074b18: 0c0127b4 */ jal sqrtf /* f074b1c: 46064300 */ add.s $f12,$f8,$f6 /* f074b20: 3c013f80 */ lui $at,0x3f80 /* f074b24: 44815000 */ mtc1 $at,$f10 @@ -21395,7 +21395,7 @@ glabel var7f1ab6dcpf /* f074bb8: 46000102 */ mul.s $f4,$f0,$f0 /* f074bbc: 460a4081 */ sub.s $f2,$f8,$f10 /* f074bc0: 46021182 */ mul.s $f6,$f2,$f2 -/* f074bc4: 0c0127b4 */ jal 0x49ed0 +/* f074bc4: 0c0127b4 */ jal sqrtf /* f074bc8: 46062300 */ add.s $f12,$f4,$f6 /* f074bcc: c7a80418 */ lwc1 $f8,0x418($sp) /* f074bd0: c7aa041c */ lwc1 $f10,0x41c($sp) @@ -21438,13 +21438,13 @@ glabel var7f1ab6dcpf .PF0f074c5c: /* f074c5c: 02202025 */ move $a0,$s1 /* f074c60: 27a5059c */ addiu $a1,$sp,0x59c -/* f074c64: 0fc1c8f2 */ jal 0xf0723c8 +/* f074c64: 0fc1c8f2 */ jal func0f072144 /* f074c68: 24070001 */ li $a3,0x1 /* f074c6c: 14400005 */ bnez $v0,.PF0f074c84 /* f074c70: afa20600 */ sw $v0,0x600($sp) /* f074c74: 4406a000 */ mfc1 $a2,$f20 /* f074c78: 02202025 */ move $a0,$s1 -/* f074c7c: 0fc1ca96 */ jal 0xf072a58 +/* f074c7c: 0fc1ca96 */ jal func0f0727d4 /* f074c80: 27a5059c */ addiu $a1,$sp,0x59c .PF0f074c84: /* f074c84: 8faa0600 */ lw $t2,0x600($sp) @@ -21471,7 +21471,7 @@ glabel var7f1ab6dcpf .PF0f074ccc: /* f074ccc: 50800004 */ beqzl $a0,.PF0f074ce0 /* f074cd0: c6080004 */ lwc1 $f8,0x4($s0) -/* f074cd4: 0fc19102 */ jal 0xf064408 +/* f074cd4: 0fc19102 */ jal propSetCollisionsEnabled /* f074cd8: 24050001 */ li $a1,0x1 /* f074cdc: c6080004 */ lwc1 $f8,0x4($s0) .PF0f074ce0: @@ -21489,7 +21489,7 @@ glabel var7f1ab6dcpf /* f074d0c: 00000000 */ nop /* f074d10: 45020004 */ bc1fl .PF0f074d24 /* f074d14: 8fad0600 */ lw $t5,0x600($sp) -/* f074d18: 0fc1abb2 */ jal 0xf06aec8 +/* f074d18: 0fc1abb2 */ jal objEndFlight /* f074d1c: 02202025 */ move $a0,$s1 /* f074d20: 8fad0600 */ lw $t5,0x600($sp) .PF0f074d24: @@ -21499,7 +21499,7 @@ glabel var7f1ab6dcpf /* f074d30: 3c054000 */ lui $a1,0x4000 /* f074d34: 26460028 */ addiu $a2,$s2,0x28 /* f074d38: 26270058 */ addiu $a3,$s1,0x58 -/* f074d3c: 0c00a70c */ jal 0x29c30 +/* f074d3c: 0c00a70c */ jal cdFindGroundYSimple /* f074d40: afa00010 */ sw $zero,0x10($sp) /* f074d44: 3c017f1b */ lui $at,0x7f1b /* f074d48: c426b688 */ lwc1 $f6,-0x4978($at) @@ -21509,7 +21509,7 @@ glabel var7f1ab6dcpf /* f074d58: 00000000 */ nop /* f074d5c: 45020007 */ bc1fl .PF0f074d7c /* f074d60: 02202025 */ move $a0,$s1 -/* f074d64: 0fc1c57a */ jal 0xf0715e8 +/* f074d64: 0fc1c57a */ jal func0f071360 /* f074d68: e7a20584 */ swc1 $f2,0x584($sp) /* f074d6c: c7a20584 */ lwc1 $f2,0x584($sp) /* f074d70: 46020200 */ add.s $f8,$f0,$f2 @@ -21518,25 +21518,25 @@ glabel var7f1ab6dcpf /* f074d78: 02202025 */ move $a0,$s1 .PF0f074d7c: /* f074d7c: 00002825 */ move $a1,$zero -/* f074d80: 0fc1a7be */ jal 0xf069ef8 +/* f074d80: 0fc1a7be */ jal func0f069c70 /* f074d84: 24060001 */ li $a2,0x1 /* f074d88: 27b00484 */ addiu $s0,$sp,0x484 /* f074d8c: 02002825 */ move $a1,$s0 -/* f074d90: 0c0056b9 */ jal 0x15ae4 +/* f074d90: 0c0056b9 */ jal func00015d54 /* f074d94: 8fa40074 */ lw $a0,0x74($sp) /* f074d98: 8fa40070 */ lw $a0,0x70($sp) -/* f074d9c: 0c0056d9 */ jal 0x15b64 +/* f074d9c: 0c0056d9 */ jal func00015dd4 /* f074da0: 02002825 */ move $a1,$s0 /* f074da4: 27b104c4 */ addiu $s1,$sp,0x4c4 /* f074da8: 02202825 */ move $a1,$s1 -/* f074dac: 0c005c20 */ jal 0x17080 +/* f074dac: 0c005c20 */ jal func000172f0 /* f074db0: 27a40504 */ addiu $a0,$sp,0x504 /* f074db4: 02002025 */ move $a0,$s0 /* f074db8: 02202825 */ move $a1,$s1 -/* f074dbc: 0c0055e4 */ jal 0x15790 +/* f074dbc: 0c0055e4 */ jal func00015a00 /* f074dc0: 27a60544 */ addiu $a2,$sp,0x544 /* f074dc4: 02402025 */ move $a0,$s2 -/* f074dc8: 0fc1cd53 */ jal 0xf07354c +/* f074dc8: 0fc1cd53 */ jal func0f0732d4 /* f074dcc: 27a50544 */ addiu $a1,$sp,0x544 /* f074dd0: 240c0001 */ li $t4,0x1 /* f074dd4: 100008f5 */ b .PF0f0771ac @@ -21601,7 +21601,7 @@ glabel var7f1ab6dcpf /* f074eac: 27a50358 */ addiu $a1,$sp,0x358 /* f074eb0: 018e7821 */ addu $t7,$t4,$t6 /* f074eb4: ae0f00a0 */ sw $t7,0xa0($s0) -/* f074eb8: 0c00569a */ jal 0x15a68 +/* f074eb8: 0c00569a */ jal func00015cd8 /* f074ebc: afa40074 */ sw $a0,0x74($sp) /* f074ec0: 8e180000 */ lw $t8,0x0($s0) /* f074ec4: 3c017f1b */ lui $at,0x7f1b @@ -21739,10 +21739,10 @@ glabel var7f1ab6dcpf /* f0750c0: 460e7282 */ mul.s $f10,$f14,$f14 /* f0750c4: 460a2180 */ add.s $f6,$f4,$f10 /* f0750c8: 46000202 */ mul.s $f8,$f0,$f0 -/* f0750cc: 0c0127b4 */ jal 0x49ed0 +/* f0750cc: 0c0127b4 */ jal sqrtf /* f0750d0: 46064300 */ add.s $f12,$f8,$f6 /* f0750d4: 27a402a0 */ addiu $a0,$sp,0x2a0 -/* f0750d8: 0c0055d0 */ jal 0x15740 +/* f0750d8: 0c0055d0 */ jal func000159b0 /* f0750dc: e7a0029c */ swc1 $f0,0x29c($sp) /* f0750e0: c7ae029c */ lwc1 $f14,0x29c($sp) /* f0750e4: c624001c */ lwc1 $f4,0x1c($s1) @@ -21799,7 +21799,7 @@ glabel var7f1ab6dcpf /* f0751b0: c7260010 */ lwc1 $f6,0x10($t9) /* f0751b4: e7ae029c */ swc1 $f14,0x29c($sp) /* f0751b8: 46043281 */ sub.s $f10,$f6,$f4 -/* f0751bc: 0c0011d8 */ jal 0x4760 +/* f0751bc: 0c0011d8 */ jal guNormalize /* f0751c0: e7aa0298 */ swc1 $f10,0x298($sp) /* f0751c4: c6080004 */ lwc1 $f8,0x4($s0) /* f0751c8: 27a402ec */ addiu $a0,$sp,0x2ec @@ -21809,7 +21809,7 @@ glabel var7f1ab6dcpf /* f0751d8: 27a602f4 */ addiu $a2,$sp,0x2f4 /* f0751dc: e7a602f0 */ swc1 $f6,0x2f0($sp) /* f0751e0: c604000c */ lwc1 $f4,0xc($s0) -/* f0751e4: 0c0011d8 */ jal 0x4760 +/* f0751e4: 0c0011d8 */ jal guNormalize /* f0751e8: e7a402f4 */ swc1 $f4,0x2f4($sp) /* f0751ec: c7aa0298 */ lwc1 $f10,0x298($sp) /* f0751f0: c7a802f4 */ lwc1 $f8,0x2f4($sp) @@ -21822,7 +21822,7 @@ glabel var7f1ab6dcpf /* f07520c: 00000000 */ nop /* f075210: 46124102 */ mul.s $f4,$f8,$f18 /* f075214: 46045200 */ add.s $f8,$f10,$f4 -/* f075218: 0fc25a3c */ jal 0xf0968f0 +/* f075218: 0fc25a3c */ jal func0f0969d0 /* f07521c: 46083300 */ add.s $f12,$f6,$f8 /* f075220: 3c017f1b */ lui $at,0x7f1b /* f075224: c42ab6a0 */ lwc1 $f10,-0x4960($at) @@ -21840,17 +21840,17 @@ glabel var7f1ab6dcpf /* f075254: 4500009c */ bc1f .PF0f0754c8 .PF0f075258: /* f075258: 24a598a4 */ addiu $a1,$a1,-26460 -/* f07525c: 0c003624 */ jal 0xd890 +/* f07525c: 0c003624 */ jal func0000db30 /* f075260: e7ae029c */ swc1 $f14,0x29c($sp) /* f075264: 3c047f1b */ lui $a0,0x7f1b /* f075268: 3c058007 */ lui $a1,0x8007 /* f07526c: 24a598a8 */ addiu $a1,$a1,-26456 -/* f075270: 0c003624 */ jal 0xd890 +/* f075270: 0c003624 */ jal func0000db30 /* f075274: 2484b264 */ addiu $a0,$a0,-19868 /* f075278: 3c047f1b */ lui $a0,0x7f1b /* f07527c: 3c058007 */ lui $a1,0x8007 /* f075280: 24a598ac */ addiu $a1,$a1,-26452 -/* f075284: 0c003624 */ jal 0xd890 +/* f075284: 0c003624 */ jal func0000db30 /* f075288: 2484b268 */ addiu $a0,$a0,-19864 /* f07528c: 3c188007 */ lui $t8,0x8007 /* f075290: 8f1898a8 */ lw $t8,-0x6758($t8) @@ -21933,42 +21933,42 @@ glabel var7f1ab6dcpf /* f0753b8: 46040302 */ mul.s $f12,$f0,$f4 /* f0753bc: 460a4181 */ sub.s $f6,$f8,$f10 /* f0753c0: e7ac0078 */ swc1 $f12,0x78($sp) -/* f0753c4: 0c006858 */ jal 0x1a160 +/* f0753c4: 0c006858 */ jal cosf /* f0753c8: e7a60288 */ swc1 $f6,0x288($sp) /* f0753cc: e7a00260 */ swc1 $f0,0x260($sp) -/* f0753d0: 0c00685b */ jal 0x1a16c +/* f0753d0: 0c00685b */ jal sinf /* f0753d4: c7ac0078 */ lwc1 $f12,0x78($sp) /* f0753d8: c7a80280 */ lwc1 $f8,0x280($sp) /* f0753dc: c7ac0078 */ lwc1 $f12,0x78($sp) /* f0753e0: 46080282 */ mul.s $f10,$f0,$f8 -/* f0753e4: 0c00685b */ jal 0x1a16c +/* f0753e4: 0c00685b */ jal sinf /* f0753e8: e7aa0264 */ swc1 $f10,0x264($sp) /* f0753ec: c7a60284 */ lwc1 $f6,0x284($sp) /* f0753f0: c7ac0078 */ lwc1 $f12,0x78($sp) /* f0753f4: 46060102 */ mul.s $f4,$f0,$f6 -/* f0753f8: 0c00685b */ jal 0x1a16c +/* f0753f8: 0c00685b */ jal sinf /* f0753fc: e7a40268 */ swc1 $f4,0x268($sp) /* f075400: c7a80288 */ lwc1 $f8,0x288($sp) /* f075404: 27a40260 */ addiu $a0,$sp,0x260 /* f075408: 27a5020c */ addiu $a1,$sp,0x20c /* f07540c: 46080282 */ mul.s $f10,$f0,$f8 -/* f075410: 0fc25b7d */ jal 0xf096df4 +/* f075410: 0fc25b7d */ jal func0f096ed4 /* f075414: e7aa026c */ swc1 $f10,0x26c($sp) /* f075418: e6140018 */ swc1 $f20,0x18($s0) /* f07541c: e6140014 */ swc1 $f20,0x14($s0) /* f075420: e6140010 */ swc1 $f20,0x10($s0) /* f075424: 27a4020c */ addiu $a0,$sp,0x20c -/* f075428: 0c005628 */ jal 0x158a0 +/* f075428: 0c005628 */ jal func00015b10 /* f07542c: 26050004 */ addiu $a1,$s0,0x4 /* f075430: 27a402a0 */ addiu $a0,$sp,0x2a0 -/* f075434: 0fc25bd9 */ jal 0xf096f64 +/* f075434: 0fc25bd9 */ jal func0f097044 /* f075438: 27a50270 */ addiu $a1,$sp,0x270 /* f07543c: 27a40270 */ addiu $a0,$sp,0x270 /* f075440: 27a50260 */ addiu $a1,$sp,0x260 -/* f075444: 0fc25d96 */ jal 0xf097658 +/* f075444: 0fc25d96 */ jal func0f097738 /* f075448: 27a60250 */ addiu $a2,$sp,0x250 /* f07544c: 27a40250 */ addiu $a0,$sp,0x250 -/* f075450: 0fc25b7d */ jal 0xf096df4 +/* f075450: 0fc25b7d */ jal func0f096ed4 /* f075454: 27a5020c */ addiu $a1,$sp,0x20c /* f075458: c7ae029c */ lwc1 $f14,0x29c($sp) /* f07545c: c7a6020c */ lwc1 $f6,0x20c($sp) @@ -22077,16 +22077,16 @@ glabel var7f1ab6dcpf /* f0755e0: c608000c */ lwc1 $f8,0xc($s0) /* f0755e4: 46024182 */ mul.s $f6,$f8,$f2 /* f0755e8: 46065100 */ add.s $f4,$f10,$f6 -/* f0755ec: 0c0056b9 */ jal 0x15ae4 +/* f0755ec: 0c0056b9 */ jal func00015d54 /* f0755f0: e7a405e4 */ swc1 $f4,0x5e4($sp) /* f0755f4: 26050020 */ addiu $a1,$s0,0x20 /* f0755f8: 3c06800a */ lui $a2,0x800a /* f0755fc: 8cc6a544 */ lw $a2,-0x5abc($a2) /* f075600: afa50064 */ sw $a1,0x64($sp) -/* f075604: 0fc2596e */ jal 0xf0965b8 +/* f075604: 0fc2596e */ jal func0f096698 /* f075608: 27a4030c */ addiu $a0,$sp,0x30c /* f07560c: 27a4030c */ addiu $a0,$sp,0x30c -/* f075610: 0c0056cc */ jal 0x15b30 +/* f075610: 0c0056cc */ jal func00015da0 /* f075614: 8fa50074 */ lw $a1,0x74($sp) /* f075618: c6480008 */ lwc1 $f8,0x8($s2) /* f07561c: 26440028 */ addiu $a0,$s2,0x28 @@ -22096,12 +22096,12 @@ glabel var7f1ab6dcpf /* f07562c: e7aa05cc */ swc1 $f10,0x5cc($sp) /* f075630: c6460010 */ lwc1 $f6,0x10($s2) /* f075634: afa4006c */ sw $a0,0x6c($sp) -/* f075638: 0fc1968d */ jal 0xf065a34 +/* f075638: 0fc1968d */ jal roomsCopy /* f07563c: e7a605d0 */ swc1 $f6,0x5d0($sp) /* f075640: 8e040088 */ lw $a0,0x88($s0) /* f075644: 50800004 */ beqzl $a0,.PF0f075658 /* f075648: 8e0c0000 */ lw $t4,0x0($s0) -/* f07564c: 0fc19102 */ jal 0xf064408 +/* f07564c: 0fc19102 */ jal propSetCollisionsEnabled /* f075650: 00002825 */ move $a1,$zero /* f075654: 8e0c0000 */ lw $t4,0x0($s0) .PF0f075658: @@ -22110,7 +22110,7 @@ glabel var7f1ab6dcpf /* f075660: 02202025 */ move $a0,$s1 /* f075664: 27a505dc */ addiu $a1,$sp,0x5dc /* f075668: 27a605e8 */ addiu $a2,$sp,0x5e8 -/* f07566c: 0fc1b3e2 */ jal 0xf06cf88 +/* f07566c: 0fc1b3e2 */ jal func0f06cd00 /* f075670: 27a705f4 */ addiu $a3,$sp,0x5f4 /* f075674: 10000007 */ b .PF0f075694 /* f075678: afa20600 */ sw $v0,0x600($sp) @@ -22118,14 +22118,14 @@ glabel var7f1ab6dcpf /* f07567c: 02202025 */ move $a0,$s1 /* f075680: 27a505dc */ addiu $a1,$sp,0x5dc /* f075684: 27a605e8 */ addiu $a2,$sp,0x5e8 -/* f075688: 0fc1b581 */ jal 0xf06d604 +/* f075688: 0fc1b581 */ jal func0f06d37c /* f07568c: 27a705f4 */ addiu $a3,$sp,0x5f4 /* f075690: afa20600 */ sw $v0,0x600($sp) .PF0f075694: /* f075694: 8e040088 */ lw $a0,0x88($s0) /* f075698: 50800004 */ beqzl $a0,.PF0f0756ac /* f07569c: 240e0001 */ li $t6,0x1 -/* f0756a0: 0fc19102 */ jal 0xf064408 +/* f0756a0: 0fc19102 */ jal propSetCollisionsEnabled /* f0756a4: 24050001 */ li $a1,0x1 /* f0756a8: 240e0001 */ li $t6,0x1 .PF0f0756ac: @@ -22187,7 +22187,7 @@ glabel var7f1ab6dcpf /* f075778: 24010035 */ li $at,0x35 /* f07577c: 10e10006 */ beq $a3,$at,.PF0f075798 /* f075780: 2624005c */ addiu $a0,$s1,0x5c -/* f075784: 0fc2c8e8 */ jal 0xf0b23a0 +/* f075784: 0fc2c8e8 */ jal handHasFunctionFlags /* f075788: 24050100 */ li $a1,0x100 /* f07578c: 50400014 */ beqzl $v0,.PF0f0757e0 /* f075790: 8fb801f8 */ lw $t8,0x1f8($sp) @@ -22302,7 +22302,7 @@ glabel var7f1ab6dcpf /* f075910: 2406ffff */ li $a2,-1 /* f075914: afa301e4 */ sw $v1,0x1e4($sp) /* f075918: afa40070 */ sw $a0,0x70($sp) -/* f07591c: 0fc2a214 */ jal 0xf0a8850 +/* f07591c: 0fc2a214 */ jal func0f0a8404 /* f075920: afa801ec */ sw $t0,0x1ec($sp) /* f075924: 8fa401e4 */ lw $a0,0x1e4($sp) /* f075928: 8fa801ec */ lw $t0,0x1ec($sp) @@ -22316,10 +22316,10 @@ glabel var7f1ab6dcpf /* f075948: 8d6ba79c */ lw $t3,-0x5864($t3) /* f07594c: 9107005c */ lbu $a3,0x5c($t0) /* f075950: afa001f8 */ sw $zero,0x1f8($sp) -/* f075954: 0fc21530 */ jal 0xf0854c0 +/* f075954: 0fc21530 */ jal func0f085270 /* f075958: afab0010 */ sw $t3,0x10($sp) /* f07595c: 8fa401f4 */ lw $a0,0x1f4($sp) -/* f075960: 0fc1c248 */ jal 0xf070920 +/* f075960: 0fc1c248 */ jal func0f070698 /* f075964: 00002825 */ move $a1,$zero /* f075968: 240c0001 */ li $t4,0x1 /* f07596c: 1000000e */ b .PF0f0759a8 @@ -22332,7 +22332,7 @@ glabel var7f1ab6dcpf /* f075984: 54410009 */ bnel $v0,$at,.PF0f0759ac /* f075988: 8fae034c */ lw $t6,0x34c($sp) .PF0f07598c: -/* f07598c: 0fc0d042 */ jal 0xf034108 +/* f07598c: 0fc0d042 */ jal chrGetShield /* f075990: 8de40004 */ lw $a0,0x4($t7) /* f075994: 4600a03c */ c.lt.s $f20,$f0 /* f075998: 00000000 */ nop @@ -22384,10 +22384,10 @@ glabel var7f1ab6dcpf /* f075a40: 8c4e0088 */ lw $t6,0x88($v0) /* f075a44: afa70070 */ sw $a3,0x70($sp) /* f075a48: afa401dc */ sw $a0,0x1dc($sp) -/* f075a4c: 0fc0d042 */ jal 0xf034108 +/* f075a4c: 0fc0d042 */ jal chrGetShield /* f075a50: afae01d4 */ sw $t6,0x1d4($sp) /* f075a54: 8fa40070 */ lw $a0,0x70($sp) -/* f075a58: 0fc2c87a */ jal 0xf0b21e8 +/* f075a58: 0fc2c87a */ jal handGetDamage /* f075a5c: e7a001d8 */ swc1 $f0,0x1d8($sp) /* f075a60: 3c188007 */ lui $t8,0x8007 /* f075a64: 3c098007 */ lui $t1,0x8007 @@ -22413,7 +22413,7 @@ glabel var7f1ab6dcpf /* f075ab4: afad001c */ sw $t5,0x1c($sp) /* f075ab8: afa90018 */ sw $t1,0x18($sp) /* f075abc: afb80014 */ sw $t8,0x14($sp) -/* f075ac0: 0fc0d0d1 */ jal 0xf034344 +/* f075ac0: 0fc0d0d1 */ jal func0f0341dc /* f075ac4: afb90010 */ sw $t9,0x10($sp) /* f075ac8: c7a401d8 */ lwc1 $f4,0x1d8($sp) /* f075acc: 8faf01d4 */ lw $t7,0x1d4($sp) @@ -22436,7 +22436,7 @@ glabel var7f1ab6dcpf /* f075b0c: 8ca59610 */ lw $a1,-0x69f0($a1) /* f075b10: 8cc69614 */ lw $a2,-0x69ec($a2) /* f075b14: afb90010 */ sw $t9,0x10($sp) -/* f075b18: 0fc097f2 */ jal 0xf025fc8 +/* f075b18: 0fc097f2 */ jal chrEmitSparks /* f075b1c: afb80014 */ sw $t8,0x14($sp) /* f075b20: 3c098007 */ lui $t1,0x8007 /* f075b24: 8d299610 */ lw $t1,-0x69f0($t1) @@ -22456,19 +22456,19 @@ glabel var7f1ab6dcpf /* f075b5c: 104100f7 */ beq $v0,$at,.PF0f075f3c /* f075b60: 3c05800a */ lui $a1,0x800a /* f075b64: 8ca5d3d4 */ lw $a1,-0x2c2c($a1) -/* f075b68: 0c0068d7 */ jal 0x1a35c +/* f075b68: 0c0068d7 */ jal func0001a5cc /* f075b6c: 00003025 */ move $a2,$zero -/* f075b70: 0fc2d706 */ jal 0xf0b5c18 +/* f075b70: 0fc2d706 */ jal currentPlayerGetMatrix1740 /* f075b74: afa20184 */ sw $v0,0x184($sp) /* f075b78: 00402025 */ move $a0,$v0 /* f075b7c: 27a505e8 */ addiu $a1,$sp,0x5e8 -/* f075b80: 0c00563e */ jal 0x158f8 +/* f075b80: 0c00563e */ jal func00015b68 /* f075b84: 27a601c8 */ addiu $a2,$sp,0x1c8 /* f075b88: 8fa40184 */ lw $a0,0x184($sp) -/* f075b8c: 0c005bcb */ jal 0x16f2c +/* f075b8c: 0c005bcb */ jal func0001719c /* f075b90: 27a50188 */ addiu $a1,$sp,0x188 /* f075b94: 27a40188 */ addiu $a0,$sp,0x188 -/* f075b98: 0c00563d */ jal 0x158f4 +/* f075b98: 0c00563d */ jal func00015b64 /* f075b9c: 27a501c8 */ addiu $a1,$sp,0x1c8 /* f075ba0: 3c04800a */ lui $a0,0x800a /* f075ba4: 3c058007 */ lui $a1,0x8007 @@ -22476,7 +22476,7 @@ glabel var7f1ab6dcpf /* f075bac: 8cc6d3d4 */ lw $a2,-0x2c2c($a2) /* f075bb0: 8ca59614 */ lw $a1,-0x69ec($a1) /* f075bb4: 8c84d3d0 */ lw $a0,-0x2c30($a0) -/* f075bb8: 0fc0987a */ jal 0xf0261e8 +/* f075bb8: 0fc0987a */ jal func0f0260c4 /* f075bbc: 27a701c8 */ addiu $a3,$sp,0x1c8 /* f075bc0: 100000df */ b .PF0f075f40 /* f075bc4: 8faf034c */ lw $t7,0x34c($sp) @@ -22515,7 +22515,7 @@ glabel var7f1ab6dcpf /* f075c3c: afad0018 */ sw $t5,0x18($sp) /* f075c40: 8ce7d3d4 */ lw $a3,-0x2c2c($a3) /* f075c44: afa90014 */ sw $t1,0x14($sp) -/* f075c48: 0fc0a428 */ jal 0xf0290a0 +/* f075c48: 0fc0a428 */ jal func0f028f7c /* f075c4c: afb80010 */ sw $t8,0x10($sp) .PF0f075c50: /* f075c50: 8faa0180 */ lw $t2,0x180($sp) @@ -22530,7 +22530,7 @@ glabel var7f1ab6dcpf /* f075c74: 55e100b2 */ bnel $t7,$at,.PF0f075f40 /* f075c78: 8faf034c */ lw $t7,0x34c($sp) /* f075c7c: 4406a000 */ mfc1 $a2,$f20 -/* f075c80: 0fc6876a */ jal 0xf1a1da8 +/* f075c80: 0fc6876a */ jal frCalculateHit /* f075c84: 27a505e8 */ addiu $a1,$sp,0x5e8 /* f075c88: 100000ad */ b .PF0f075f40 /* f075c8c: 8faf034c */ lw $t7,0x34c($sp) @@ -22565,7 +22565,7 @@ glabel var7f1ab6dcpf /* f075cf4: 11600008 */ beqz $t3,.PF0f075d18 /* f075cf8: 8fa4017c */ lw $a0,0x17c($sp) /* f075cfc: afa00178 */ sw $zero,0x178($sp) -/* f075d00: 0fc63843 */ jal 0xf18e10c +/* f075d00: 0fc63843 */ jal mpGetChrFromPlayerIndex /* f075d04: afa70070 */ sw $a3,0x70($sp) /* f075d08: 8fa30178 */ lw $v1,0x178($sp) /* f075d0c: 10400002 */ beqz $v0,.PF0f075d18 @@ -22594,7 +22594,7 @@ glabel var7f1ab6dcpf /* f075d64: afae0024 */ sw $t6,0x24($sp) /* f075d68: afac0020 */ sw $t4,0x20($sp) /* f075d6c: afaa001c */ sw $t2,0x1c($sp) -/* f075d70: 0fc0d0d1 */ jal 0xf034344 +/* f075d70: 0fc0d0d1 */ jal func0f0341dc /* f075d74: afaf0014 */ sw $t7,0x14($sp) /* f075d78: 1000002f */ b .PF0f075e38 /* f075d7c: 02202025 */ move $a0,$s1 @@ -22637,7 +22637,7 @@ glabel var7f1ab6dcpf /* f075dfc: afac0018 */ sw $t4,0x18($sp) /* f075e00: 8ce7d3d4 */ lw $a3,-0x2c2c($a3) /* f075e04: afaa0014 */ sw $t2,0x14($sp) -/* f075e08: 0fc0a428 */ jal 0xf0290a0 +/* f075e08: 0fc0a428 */ jal func0f028f7c /* f075e0c: afaf0010 */ sw $t7,0x10($sp) /* f075e10: 3c0e8007 */ lui $t6,0x8007 /* f075e14: 8dce9610 */ lw $t6,-0x69f0($t6) @@ -22647,13 +22647,13 @@ glabel var7f1ab6dcpf /* f075e20: 8fb9017c */ lw $t9,0x17c($sp) /* f075e24: 3c0542c8 */ lui $a1,0x42c8 /* f075e28: 8fa60070 */ lw $a2,0x70($sp) -/* f075e2c: 0fc2153f */ jal 0xf0854fc +/* f075e2c: 0fc2153f */ jal func0f0852ac /* f075e30: afb90010 */ sw $t9,0x10($sp) .PF0f075e34: /* f075e34: 02202025 */ move $a0,$s1 .PF0f075e38: /* f075e38: 24050001 */ li $a1,0x1 -/* f075e3c: 0fc1a7be */ jal 0xf069ef8 +/* f075e3c: 0fc1a7be */ jal func0f069c70 /* f075e40: 24060001 */ li $a2,0x1 /* f075e44: 1000003d */ b .PF0f075f3c /* f075e48: a6200062 */ sh $zero,0x62($s1) @@ -22679,7 +22679,7 @@ glabel var7f1ab6dcpf /* f075e90: 8ce7d3d0 */ lw $a3,-0x2c30($a3) /* f075e94: 8ca5d3d4 */ lw $a1,-0x2c2c($a1) /* f075e98: afaf0014 */ sw $t7,0x14($sp) -/* f075e9c: 0fc0d07a */ jal 0xf0341e8 +/* f075e9c: 0fc0d07a */ jal func0f034080 /* f075ea0: afab0010 */ sw $t3,0x10($sp) /* f075ea4: 10000026 */ b .PF0f075f40 /* f075ea8: 8faf034c */ lw $t7,0x34c($sp) @@ -22722,7 +22722,7 @@ glabel var7f1ab6dcpf /* f075f28: afab0018 */ sw $t3,0x18($sp) /* f075f2c: 8ce7d3d4 */ lw $a3,-0x2c2c($a3) /* f075f30: afb80010 */ sw $t8,0x10($sp) -/* f075f34: 0fc0a428 */ jal 0xf0290a0 +/* f075f34: 0fc0a428 */ jal func0f028f7c /* f075f38: afad0014 */ sw $t5,0x14($sp) .PF0f075f3c: /* f075f3c: 8faf034c */ lw $t7,0x34c($sp) @@ -22735,7 +22735,7 @@ glabel var7f1ab6dcpf /* f075f54: afac034c */ sw $t4,0x34c($sp) /* f075f58: 02202025 */ move $a0,$s1 /* f075f5c: 24050001 */ li $a1,0x1 -/* f075f60: 0fc1a7be */ jal 0xf069ef8 +/* f075f60: 0fc1a7be */ jal func0f069c70 /* f075f64: 24060001 */ li $a2,0x1 /* f075f68: 922e0003 */ lbu $t6,0x3($s1) /* f075f6c: 24010008 */ li $at,0x8 @@ -22759,12 +22759,12 @@ glabel var7f1ab6dcpf /* f075fb0: 2627005c */ addiu $a3,$s1,0x5c /* f075fb4: 8f18a79c */ lw $t8,-0x5864($t8) /* f075fb8: afa70070 */ sw $a3,0x70($sp) -/* f075fbc: 0fc4a513 */ jal 0xf12944c +/* f075fbc: 0fc4a513 */ jal propGetPlayerNum /* f075fc0: afb80164 */ sw $t8,0x164($sp) -/* f075fc4: 0fc4a4ff */ jal 0xf1293fc +/* f075fc4: 0fc4a4ff */ jal setCurrentPlayerNum /* f075fc8: 00402025 */ move $a0,$v0 /* f075fcc: 8fa40070 */ lw $a0,0x70($sp) -/* f075fd0: 0fc2c238 */ jal 0xf0b08e0 +/* f075fd0: 0fc2c238 */ jal mpstatsIncrementPlayerShotCount /* f075fd4: 00002825 */ move $a1,$zero /* f075fd8: 3c058007 */ lui $a1,0x8007 /* f075fdc: 8ca59610 */ lw $a1,-0x69f0($a1) @@ -22776,12 +22776,12 @@ glabel var7f1ab6dcpf /* f075ff4: 5441000c */ bnel $v0,$at,.PF0f076028 /* f075ff8: 24010003 */ li $at,0x3 /* f075ffc: 8ca40004 */ lw $a0,0x4($a1) -/* f076000: 0fc21afe */ jal 0xf086bf8 +/* f076000: 0fc21afe */ jal objIsHealthy /* f076004: afa70070 */ sw $a3,0x70($sp) /* f076008: 1040004c */ beqz $v0,.PF0f07613c /* f07600c: 8fa70070 */ lw $a3,0x70($sp) /* f076010: 00e02025 */ move $a0,$a3 -/* f076014: 0fc2c238 */ jal 0xf0b08e0 +/* f076014: 0fc2c238 */ jal mpstatsIncrementPlayerShotCount /* f076018: 24050006 */ li $a1,0x6 /* f07601c: 10000047 */ b .PF0f07613c /* f076020: 00000000 */ nop @@ -22807,7 +22807,7 @@ glabel var7f1ab6dcpf /* f076064: 1441000e */ bne $v0,$at,.PF0f0760a0 /* f076068: 00000000 */ nop /* f07606c: afa6015c */ sw $a2,0x15c($sp) -/* f076070: 0fc4a513 */ jal 0xf12944c +/* f076070: 0fc4a513 */ jal propGetPlayerNum /* f076074: afa70070 */ sw $a3,0x70($sp) /* f076078: 00025880 */ sll $t3,$v0,0x2 /* f07607c: 3c0f800a */ lui $t7,0x800a @@ -22842,30 +22842,30 @@ glabel var7f1ab6dcpf /* f0760ec: 10000011 */ b .PF0f076134 /* f0760f0: 00e02025 */ move $a0,$a3 .PF0f0760f4: -/* f0760f4: 0fc2c238 */ jal 0xf0b08e0 +/* f0760f4: 0fc2c238 */ jal mpstatsIncrementPlayerShotCount /* f0760f8: 00e02025 */ move $a0,$a3 /* f0760fc: 1000000f */ b .PF0f07613c /* f076100: 00000000 */ nop .PF0f076104: -/* f076104: 0fc2c238 */ jal 0xf0b08e0 +/* f076104: 0fc2c238 */ jal mpstatsIncrementPlayerShotCount /* f076108: 24050004 */ li $a1,0x4 /* f07610c: 1000000b */ b .PF0f07613c /* f076110: 00000000 */ nop .PF0f076114: -/* f076114: 0fc2c238 */ jal 0xf0b08e0 +/* f076114: 0fc2c238 */ jal mpstatsIncrementPlayerShotCount /* f076118: 24050005 */ li $a1,0x5 /* f07611c: 10000007 */ b .PF0f07613c /* f076120: 00000000 */ nop .PF0f076124: -/* f076124: 0fc2c238 */ jal 0xf0b08e0 +/* f076124: 0fc2c238 */ jal mpstatsIncrementPlayerShotCount /* f076128: 24050002 */ li $a1,0x2 /* f07612c: 10000003 */ b .PF0f07613c /* f076130: 00000000 */ nop .PF0f076134: -/* f076134: 0fc2c238 */ jal 0xf0b08e0 +/* f076134: 0fc2c238 */ jal mpstatsIncrementPlayerShotCount /* f076138: 24050003 */ li $a1,0x3 .PF0f07613c: -/* f07613c: 0fc4a4ff */ jal 0xf1293fc +/* f07613c: 0fc4a4ff */ jal setCurrentPlayerNum /* f076140: 8fa40164 */ lw $a0,0x164($sp) .PF0f076144: /* f076144: 8fae01f4 */ lw $t6,0x1f4($sp) @@ -22893,7 +22893,7 @@ glabel var7f1ab6dcpf /* f076190: e7aa0154 */ swc1 $f10,0x154($sp) /* f076194: c606000c */ lwc1 $f6,0xc($s0) /* f076198: afa2014c */ sw $v0,0x14c($sp) -/* f07619c: 0c0011d8 */ jal 0x4760 +/* f07619c: 0c0011d8 */ jal guNormalize /* f0761a0: e7a60158 */ swc1 $f6,0x158($sp) /* f0761a4: 8fa2014c */ lw $v0,0x14c($sp) /* f0761a8: 50400005 */ beqzl $v0,.PF0f0761c0 @@ -22903,7 +22903,7 @@ glabel var7f1ab6dcpf /* f0761b8: afa90088 */ sw $t1,0x88($sp) /* f0761bc: afa00088 */ sw $zero,0x88($sp) .PF0f0761c0: -/* f0761c0: 0fc4fc06 */ jal 0xf13f018 +/* f0761c0: 0fc4fc06 */ jal chrIsUsingPaintball /* f0761c4: 8fa40088 */ lw $a0,0x88($sp) /* f0761c8: 1040000c */ beqz $v0,.PF0f0761fc /* f0761cc: 02402825 */ move $a1,$s2 @@ -22914,7 +22914,7 @@ glabel var7f1ab6dcpf /* f0761e0: afb80010 */ sw $t8,0x10($sp) /* f0761e4: 02402825 */ move $a1,$s2 /* f0761e8: 27a605e8 */ addiu $a2,$sp,0x5e8 -/* f0761ec: 0fc4c159 */ jal 0xf130564 +/* f0761ec: 0fc4c159 */ jal sparksCreate /* f0761f0: 27a70150 */ addiu $a3,$sp,0x150 /* f0761f4: 1000000a */ b .PF0f076220 /* f0761f8: 02402025 */ move $a0,$s2 @@ -22925,13 +22925,13 @@ glabel var7f1ab6dcpf /* f076208: afaf0014 */ sw $t7,0x14($sp) /* f07620c: afab0010 */ sw $t3,0x10($sp) /* f076210: 27a605e8 */ addiu $a2,$sp,0x5e8 -/* f076214: 0fc4c159 */ jal 0xf130564 +/* f076214: 0fc4c159 */ jal sparksCreate /* f076218: 27a70150 */ addiu $a3,$sp,0x150 /* f07621c: 02402025 */ move $a0,$s2 .PF0f076220: /* f076220: 27a505e8 */ addiu $a1,$sp,0x5e8 /* f076224: 27a605f4 */ addiu $a2,$sp,0x5f4 -/* f076228: 0fc1bcca */ jal 0xf06f328 +/* f076228: 0fc1bcca */ jal func0f06f0a0 /* f07622c: 8fa7060c */ lw $a3,0x60c($sp) .PF0f076230: /* f076230: 8faa034c */ lw $t2,0x34c($sp) @@ -22943,7 +22943,7 @@ glabel var7f1ab6dcpf /* f076244: 26440008 */ addiu $a0,$s2,0x8 /* f076248: 8fa5006c */ lw $a1,0x6c($sp) /* f07624c: 27a605dc */ addiu $a2,$sp,0x5dc -/* f076250: 0fc19841 */ jal 0xf066104 +/* f076250: 0fc19841 */ jal func0f065e74 /* f076254: 27a7013c */ addiu $a3,$sp,0x13c /* f076258: c7a405dc */ lwc1 $f4,0x5dc($sp) /* f07625c: 02402025 */ move $a0,$s2 @@ -22951,10 +22951,10 @@ glabel var7f1ab6dcpf /* f076264: c7a805e0 */ lwc1 $f8,0x5e0($sp) /* f076268: e648000c */ swc1 $f8,0xc($s2) /* f07626c: c7aa05e4 */ lwc1 $f10,0x5e4($sp) -/* f076270: 0fc197b5 */ jal 0xf065ed4 +/* f076270: 0fc197b5 */ jal func0f065c44 /* f076274: e64a0010 */ swc1 $f10,0x10($s2) /* f076278: 27a4013c */ addiu $a0,$sp,0x13c -/* f07627c: 0fc1968d */ jal 0xf065a34 +/* f07627c: 0fc1968d */ jal roomsCopy /* f076280: 8fa5006c */ lw $a1,0x6c($sp) /* f076284: 10000025 */ b .PF0f07631c /* f076288: 8fae034c */ lw $t6,0x34c($sp) @@ -22985,7 +22985,7 @@ glabel var7f1ab6dcpf /* f0762dc: e7aa05e0 */ swc1 $f10,0x5e0($sp) /* f0762e0: e7a605e4 */ swc1 $f6,0x5e4($sp) .PF0f0762e4: -/* f0762e4: 0fc19841 */ jal 0xf066104 +/* f0762e4: 0fc19841 */ jal func0f065e74 /* f0762e8: 8fa5006c */ lw $a1,0x6c($sp) /* f0762ec: c7a405dc */ lwc1 $f4,0x5dc($sp) /* f0762f0: 02402025 */ move $a0,$s2 @@ -22993,19 +22993,19 @@ glabel var7f1ab6dcpf /* f0762f8: c7a805e0 */ lwc1 $f8,0x5e0($sp) /* f0762fc: e648000c */ swc1 $f8,0xc($s2) /* f076300: c7aa05e4 */ lwc1 $f10,0x5e4($sp) -/* f076304: 0fc197b5 */ jal 0xf065ed4 +/* f076304: 0fc197b5 */ jal func0f065c44 /* f076308: e64a0010 */ swc1 $f10,0x10($s2) /* f07630c: 27a4012c */ addiu $a0,$sp,0x12c -/* f076310: 0fc1968d */ jal 0xf065a34 +/* f076310: 0fc1968d */ jal roomsCopy /* f076314: 8fa5006c */ lw $a1,0x6c($sp) /* f076318: 8fae034c */ lw $t6,0x34c($sp) .PF0f07631c: /* f07631c: 55c003a4 */ bnezl $t6,.PF0f0771b0 /* f076320: 8fbf005c */ lw $ra,0x5c($sp) -/* f076324: 0fc1a361 */ jal 0xf068d84 +/* f076324: 0fc1a361 */ jal func0f068af4 /* f076328: 02202025 */ move $a0,$s1 /* f07632c: 00402025 */ move $a0,$v0 -/* f076330: 0fc19afb */ jal 0xf066bec +/* f076330: 0fc19afb */ jal func0f06695c /* f076334: 8fa50074 */ lw $a1,0x74($sp) /* f076338: e7a0037c */ swc1 $f0,0x37c($sp) /* f07633c: c6460008 */ lwc1 $f6,0x8($s2) @@ -23023,7 +23023,7 @@ glabel var7f1ab6dcpf /* f07636c: afa70074 */ sw $a3,0x74($sp) /* f076370: afa90014 */ sw $t1,0x14($sp) /* f076374: afb90010 */ sw $t9,0x10($sp) -/* f076378: 0c00a7b9 */ jal 0x29ee4 +/* f076378: 0c00a7b9 */ jal func0002a5e4 /* f07637c: e7aa05b4 */ swc1 $f10,0x5b4($sp) /* f076380: 00021c00 */ sll $v1,$v0,0x10 /* f076384: 1840002e */ blez $v0,.PF0f076440 @@ -23041,7 +23041,7 @@ glabel var7f1ab6dcpf /* f0763b4: 45020023 */ bc1fl .PF0f076444 /* f0763b8: 26440008 */ addiu $a0,$s2,0x8 /* f0763bc: afad0010 */ sw $t5,0x10($sp) -/* f0763c0: 0c00b526 */ jal 0x2d498 +/* f0763c0: 0c00b526 */ jal func0002db98 /* f0763c4: a7b8038e */ sh $t8,0x38e($sp) /* f0763c8: 1440001d */ bnez $v0,.PF0f076440 /* f0763cc: 87a3038e */ lh $v1,0x38e($sp) @@ -23056,7 +23056,7 @@ glabel var7f1ab6dcpf /* f0763f0: a7a3038e */ sh $v1,0x38e($sp) /* f0763f4: e7a605f4 */ swc1 $f6,0x5f4($sp) /* f0763f8: e7a405f8 */ swc1 $f4,0x5f8($sp) -/* f0763fc: 0c0011d8 */ jal 0x4760 +/* f0763fc: 0c0011d8 */ jal guNormalize /* f076400: e7a805fc */ swc1 $f8,0x5fc($sp) /* f076404: c64a0008 */ lwc1 $f10,0x8($s2) /* f076408: c7a60390 */ lwc1 $f6,0x390($sp) @@ -23082,7 +23082,7 @@ glabel var7f1ab6dcpf /* f076450: 8fa5006c */ lw $a1,0x6c($sp) /* f076454: 27a60390 */ addiu $a2,$sp,0x390 /* f076458: 8fa70074 */ lw $a3,0x74($sp) -/* f07645c: 0c00a799 */ jal 0x29e64 +/* f07645c: 0c00a799 */ jal func0002a564 /* f076460: afa00014 */ sw $zero,0x14($sp) /* f076464: 00021c00 */ sll $v1,$v0,0x10 /* f076468: 00034c03 */ sra $t1,$v1,0x10 @@ -23098,7 +23098,7 @@ glabel var7f1ab6dcpf /* f076490: ae0b0000 */ sw $t3,0x0($s0) /* f076494: a7a9038e */ sh $t1,0x38e($sp) /* f076498: 27a405c8 */ addiu $a0,$sp,0x5c8 -/* f07649c: 0c00a740 */ jal 0x29d00 +/* f07649c: 0c00a740 */ jal func0002a400 /* f0764a0: 27a505b8 */ addiu $a1,$sp,0x5b8 /* f0764a4: 18400004 */ blez $v0,.PF0f0764b8 /* f0764a8: 87a3038e */ lh $v1,0x38e($sp) @@ -23116,16 +23116,16 @@ glabel var7f1ab6dcpf /* f0764d4: 02402025 */ move $a0,$s2 /* f0764d8: e64a000c */ swc1 $f10,0xc($s2) /* f0764dc: c7a605d0 */ lwc1 $f6,0x5d0($sp) -/* f0764e0: 0fc197b5 */ jal 0xf065ed4 +/* f0764e0: 0fc197b5 */ jal func0f065c44 /* f0764e4: e6460010 */ swc1 $f6,0x10($s2) /* f0764e8: 27a405b8 */ addiu $a0,$sp,0x5b8 -/* f0764ec: 0fc1968d */ jal 0xf065a34 +/* f0764ec: 0fc1968d */ jal roomsCopy /* f0764f0: 8fa5006c */ lw $a1,0x6c($sp) /* f0764f4: 8fa40070 */ lw $a0,0x70($sp) /* f0764f8: 8fa5006c */ lw $a1,0x6c($sp) /* f0764fc: 27a60390 */ addiu $a2,$sp,0x390 /* f076500: 8fa70074 */ lw $a3,0x74($sp) -/* f076504: 0c00a750 */ jal 0x29d40 +/* f076504: 0c00a750 */ jal func0002a440 /* f076508: afa00010 */ sw $zero,0x10($sp) /* f07650c: 00021c00 */ sll $v1,$v0,0x10 /* f076510: 0003cc03 */ sra $t9,$v1,0x10 @@ -23226,7 +23226,7 @@ glabel var7f1ab6dcpf /* f076668: 02402025 */ move $a0,$s2 /* f07666c: 57010004 */ bnel $t8,$at,.PF0f076680 /* f076670: 8fad0350 */ lw $t5,0x350($sp) -/* f076674: 0fc4bc95 */ jal 0xf12f254 +/* f076674: 0fc4bc95 */ jal smokeCreateAtProp /* f076678: 24050013 */ li $a1,0x13 /* f07667c: 8fad0350 */ lw $t5,0x350($sp) .PF0f076680: @@ -23239,7 +23239,7 @@ glabel var7f1ab6dcpf /* f076698: 8fab0354 */ lw $t3,0x354($sp) /* f07669c: 51600007 */ beqzl $t3,.PF0f0766bc /* f0766a0: 8e0f0000 */ lw $t7,0x0($s0) -/* f0766a4: 0fc1aa2a */ jal 0xf06a8a8 +/* f0766a4: 0fc1aa2a */ jal func0f06a620 /* f0766a8: 02202025 */ move $a0,$s1 /* f0766ac: c646000c */ lwc1 $f6,0xc($s2) /* f0766b0: 46003200 */ add.s $f8,$f6,$f0 @@ -23259,7 +23259,7 @@ glabel var7f1ab6dcpf /* f0766e4: 50200004 */ beqzl $at,.PF0f0766f8 /* f0766e8: 8e190090 */ lw $t9,0x90($s0) .PF0f0766ec: -/* f0766ec: 0fc258a0 */ jal 0xf096280 +/* f0766ec: 0fc258a0 */ jal func0f096360 /* f0766f0: 8fa40064 */ lw $a0,0x64($sp) /* f0766f4: 8e190090 */ lw $t9,0x90($s0) .PF0f0766f8: @@ -23288,7 +23288,7 @@ glabel var7f1ab6dcpf /* f07674c: c604008c */ lwc1 $f4,0x8c($s0) /* f076750: 11c00029 */ beqz $t6,.PF0f0767f8 /* f076754: 02202025 */ move $a0,$s1 -/* f076758: 0fc1b798 */ jal 0xf06de60 +/* f076758: 0fc1b798 */ jal func0f06dbd8 /* f07675c: 27a50358 */ addiu $a1,$sp,0x358 /* f076760: 10000026 */ b .PF0f0767fc /* f076764: 922b0003 */ lbu $t3,0x3($s1) @@ -23322,14 +23322,14 @@ glabel var7f1ab6dcpf .PF0f0767d0: /* f0767d0: 13000009 */ beqz $t8,.PF0f0767f8 /* f0767d4: 02202025 */ move $a0,$s1 -/* f0767d8: 0fc1b798 */ jal 0xf06de60 +/* f0767d8: 0fc1b798 */ jal func0f06dbd8 /* f0767dc: 27a50358 */ addiu $a1,$sp,0x358 /* f0767e0: 10000006 */ b .PF0f0767fc /* f0767e4: 922b0003 */ lbu $t3,0x3($s1) .PF0f0767e8: /* f0767e8: 11a00003 */ beqz $t5,.PF0f0767f8 /* f0767ec: 02202025 */ move $a0,$s1 -/* f0767f0: 0fc1b798 */ jal 0xf06de60 +/* f0767f0: 0fc1b798 */ jal func0f06dbd8 /* f0767f4: 27a50358 */ addiu $a1,$sp,0x358 .PF0f0767f8: /* f0767f8: 922b0003 */ lbu $t3,0x3($s1) @@ -23345,7 +23345,7 @@ glabel var7f1ab6dcpf /* f07681c: 24010001 */ li $at,0x1 /* f076820: 55e10006 */ bnel $t7,$at,.PF0f07683c /* f076824: 24010053 */ li $at,0x53 -/* f076828: 0fc1bac1 */ jal 0xf06eb04 +/* f076828: 0fc1bac1 */ jal func0f06e87c /* f07682c: 02202025 */ move $a0,$s1 /* f076830: 100000b0 */ b .PF0f076af4 /* f076834: 8fac0600 */ lw $t4,0x600($sp) @@ -23398,7 +23398,7 @@ glabel var7f1ab6dcpf /* f0768e0: 27a60110 */ addiu $a2,$sp,0x110 /* f0768e4: e7a4010c */ swc1 $f4,0x10c($sp) /* f0768e8: c608000c */ lwc1 $f8,0xc($s0) -/* f0768ec: 0c0011d8 */ jal 0x4760 +/* f0768ec: 0c0011d8 */ jal guNormalize /* f0768f0: e7a80110 */ swc1 $f8,0x110($sp) /* f0768f4: 3c0141a0 */ lui $at,0x41a0 /* f0768f8: 44810000 */ mtc1 $at,$f0 @@ -23419,7 +23419,7 @@ glabel var7f1ab6dcpf /* f076934: e7a8010c */ swc1 $f8,0x10c($sp) /* f076938: c64a0010 */ lwc1 $f10,0x10($s2) /* f07693c: 46045201 */ sub.s $f8,$f10,$f4 -/* f076940: 0fc4bcd8 */ jal 0xf12f360 +/* f076940: 0fc4bcd8 */ jal smokeCreateSimple /* f076944: e7a80110 */ swc1 $f8,0x110($sp) /* f076948: 1000006a */ b .PF0f076af4 /* f07694c: 8fac0600 */ lw $t4,0x600($sp) @@ -23433,7 +23433,7 @@ glabel var7f1ab6dcpf /* f076968: a6200062 */ sh $zero,0x62($s1) .PF0f07696c: /* f07696c: 8fa5006c */ lw $a1,0x6c($sp) -/* f076970: 0fc4bcd8 */ jal 0xf12f360 +/* f076970: 0fc4bcd8 */ jal smokeCreateSimple /* f076974: 2406000b */ li $a2,0xb /* f076978: 1000005e */ b .PF0f076af4 /* f07697c: 8fac0600 */ lw $t4,0x600($sp) @@ -23533,7 +23533,7 @@ glabel var7f1ab6dcpf /* f076adc: 10470004 */ beq $v0,$a3,.PF0f076af0 /* f076ae0: 26440008 */ addiu $a0,$s2,0x8 /* f076ae4: 8fa5006c */ lw $a1,0x6c($sp) -/* f076ae8: 0fc4bcd8 */ jal 0xf12f360 +/* f076ae8: 0fc4bcd8 */ jal smokeCreateSimple /* f076aec: 24060009 */ li $a2,0x9 .PF0f076af0: /* f076af0: 8fac0600 */ lw $t4,0x600($sp) @@ -23571,7 +23571,7 @@ glabel var7f1ab6dcpf /* f076b68: e7a00024 */ swc1 $f0,0x24($sp) /* f076b6c: e7a00030 */ swc1 $f0,0x30($sp) /* f076b70: e7a00034 */ swc1 $f0,0x34($sp) -/* f076b74: 0fc24e3a */ jal 0xf0938e8 +/* f076b74: 0fc24e3a */ jal func0f0939f8 /* f076b78: e7a00038 */ swc1 $f0,0x38($sp) /* f076b7c: 3c03800a */ lui $v1,0x800a /* f076b80: 10000052 */ b .PF0f076ccc @@ -23589,7 +23589,7 @@ glabel var7f1ab6dcpf /* f076bac: 8dec0004 */ lw $t4,0x4($t7) /* f076bb0: 27ab0100 */ addiu $t3,$sp,0x100 /* f076bb4: ad610000 */ sw $at,0x0($t3) -/* f076bb8: 0c004ad4 */ jal 0x12b50 +/* f076bb8: 0c004ad4 */ jal random /* f076bbc: ad6c0004 */ sw $t4,0x4($t3) /* f076bc0: 304e0003 */ andi $t6,$v0,0x3 /* f076bc4: 000ec840 */ sll $t9,$t6,0x1 @@ -23612,7 +23612,7 @@ glabel var7f1ab6dcpf /* f076c08: e7a00024 */ swc1 $f0,0x24($sp) /* f076c0c: e7a00030 */ swc1 $f0,0x30($sp) /* f076c10: e7a00034 */ swc1 $f0,0x34($sp) -/* f076c14: 0fc24e3a */ jal 0xf0938e8 +/* f076c14: 0fc24e3a */ jal func0f0939f8 /* f076c18: e7a00038 */ swc1 $f0,0x38($sp) /* f076c1c: 3c01bf80 */ lui $at,0xbf80 /* f076c20: 44810000 */ mtc1 $at,$f0 @@ -23632,7 +23632,7 @@ glabel var7f1ab6dcpf /* f076c58: e7a00024 */ swc1 $f0,0x24($sp) /* f076c5c: e7a00030 */ swc1 $f0,0x30($sp) /* f076c60: e7a00034 */ swc1 $f0,0x34($sp) -/* f076c64: 0fc24e3a */ jal 0xf0938e8 +/* f076c64: 0fc24e3a */ jal func0f0939f8 /* f076c68: e7a00038 */ swc1 $f0,0x38($sp) /* f076c6c: 3c03800a */ lui $v1,0x800a /* f076c70: 10000016 */ b .PF0f076ccc @@ -23655,7 +23655,7 @@ glabel var7f1ab6dcpf /* f076cb0: e7a00024 */ swc1 $f0,0x24($sp) /* f076cb4: e7a00030 */ swc1 $f0,0x30($sp) /* f076cb8: e7a00034 */ swc1 $f0,0x34($sp) -/* f076cbc: 0fc24e3a */ jal 0xf0938e8 +/* f076cbc: 0fc24e3a */ jal func0f0939f8 /* f076cc0: e7a00038 */ swc1 $f0,0x38($sp) /* f076cc4: 3c03800a */ lui $v1,0x800a /* f076cc8: 8c63a51c */ lw $v1,-0x5ae4($v1) @@ -23665,7 +23665,7 @@ glabel var7f1ab6dcpf /* f076cd0: 02202025 */ move $a0,$s1 .PF0f076cd4: /* f076cd4: 24050001 */ li $a1,0x1 -/* f076cd8: 0fc1a7be */ jal 0xf069ef8 +/* f076cd8: 0fc1a7be */ jal func0f069c70 /* f076cdc: 24060001 */ li $a2,0x1 /* f076ce0: 10000133 */ b .PF0f0771b0 /* f076ce4: 8fbf005c */ lw $ra,0x5c($sp) @@ -23704,22 +23704,22 @@ glabel var7f1ab6dcpf /* f076d60: c6000060 */ lwc1 $f0,0x60($s0) /* f076d64: 44060000 */ mfc1 $a2,$f0 .PF0f076d68: -/* f076d68: 0fc25c76 */ jal 0xf0971d8 +/* f076d68: 0fc25c76 */ jal func0f0972b8 /* f076d6c: 27a700ec */ addiu $a3,$sp,0xec /* f076d70: 27a400ec */ addiu $a0,$sp,0xec -/* f076d74: 0fc25b7d */ jal 0xf096df4 +/* f076d74: 0fc25b7d */ jal func0f096ed4 /* f076d78: 27a500ac */ addiu $a1,$sp,0xac /* f076d7c: c60c00b8 */ lwc1 $f12,0xb8($s0) -/* f076d80: 0c0056ed */ jal 0x15bb4 +/* f076d80: 0c0056ed */ jal func00015e24 /* f076d84: 27a500ac */ addiu $a1,$sp,0xac /* f076d88: c60c00bc */ lwc1 $f12,0xbc($s0) -/* f076d8c: 0c005704 */ jal 0x15c10 +/* f076d8c: 0c005704 */ jal func00015e80 /* f076d90: 27a500ac */ addiu $a1,$sp,0xac /* f076d94: c60c00c0 */ lwc1 $f12,0xc0($s0) -/* f076d98: 0c00571b */ jal 0x15c6c +/* f076d98: 0c00571b */ jal func00015edc /* f076d9c: 27a500ac */ addiu $a1,$sp,0xac /* f076da0: 27a400ac */ addiu $a0,$sp,0xac -/* f076da4: 0c0056cc */ jal 0x15b30 +/* f076da4: 0c0056cc */ jal func00015da0 /* f076da8: 2625001c */ addiu $a1,$s1,0x1c /* f076dac: 3c013f80 */ lui $at,0x3f80 /* f076db0: 44816000 */ mtc1 $at,$f12 @@ -23745,10 +23745,10 @@ glabel var7f1ab6dcpf /* f076dfc: 8faf00fc */ lw $t7,0xfc($sp) /* f076e00: afa90074 */ sw $t1,0x74($sp) .PF0f076e04: -/* f076e04: 0fc1a361 */ jal 0xf068d84 +/* f076e04: 0fc1a361 */ jal func0f068af4 /* f076e08: afa000fc */ sw $zero,0xfc($sp) /* f076e0c: 00402025 */ move $a0,$v0 -/* f076e10: 0fc19afb */ jal 0xf066bec +/* f076e10: 0fc19afb */ jal func0f06695c /* f076e14: 8fa50074 */ lw $a1,0x74($sp) /* f076e18: 3c03800a */ lui $v1,0x800a /* f076e1c: 8c63a548 */ lw $v1,-0x5ab8($v1) @@ -23788,7 +23788,7 @@ glabel var7f1ab6dcpf /* f076ea0: 46021282 */ mul.s $f10,$f2,$f2 /* f076ea4: 00000000 */ nop /* f076ea8: 460e7102 */ mul.s $f4,$f14,$f14 -/* f076eac: 0c0127b4 */ jal 0x49ed0 +/* f076eac: 0c0127b4 */ jal sqrtf /* f076eb0: 46045300 */ add.s $f12,$f10,$f4 /* f076eb4: 4600a03c */ c.lt.s $f20,$f0 /* f076eb8: 3c017f1b */ lui $at,0x7f1b @@ -23854,12 +23854,12 @@ glabel var7f1ab6dcpf /* f076f8c: e7a605cc */ swc1 $f6,0x5cc($sp) /* f076f90: c64a0010 */ lwc1 $f10,0x10($s2) /* f076f94: afa4006c */ sw $a0,0x6c($sp) -/* f076f98: 0fc1968d */ jal 0xf065a34 +/* f076f98: 0fc1968d */ jal roomsCopy /* f076f9c: e7aa05d0 */ swc1 $f10,0x5d0($sp) /* f076fa0: 02202025 */ move $a0,$s1 /* f076fa4: 27a505dc */ addiu $a1,$sp,0x5dc /* f076fa8: 27a605e8 */ addiu $a2,$sp,0x5e8 -/* f076fac: 0fc1b581 */ jal 0xf06d604 +/* f076fac: 0fc1b581 */ jal func0f06d37c /* f076fb0: 27a705f4 */ addiu $a3,$sp,0x5f4 /* f076fb4: 24180001 */ li $t8,0x1 /* f076fb8: afb805d8 */ sw $t8,0x5d8($sp) @@ -23877,7 +23877,7 @@ glabel var7f1ab6dcpf /* f076fe8: c6440010 */ lwc1 $f4,0x10($s2) /* f076fec: afa70074 */ sw $a3,0x74($sp) /* f076ff0: afad0010 */ sw $t5,0x10($sp) -/* f076ff4: 0c00a774 */ jal 0x29dd0 +/* f076ff4: 0c00a774 */ jal func0002a4d0 /* f076ff8: e7a405b4 */ swc1 $f4,0x5b4($sp) /* f076ffc: 00021c00 */ sll $v1,$v0,0x10 /* f077000: 1840000b */ blez $v0,.PF0f077030 @@ -23888,7 +23888,7 @@ glabel var7f1ab6dcpf /* f077014: 27a505b8 */ addiu $a1,$sp,0x5b8 /* f077018: 27a605ac */ addiu $a2,$sp,0x5ac /* f07701c: 24070021 */ li $a3,0x21 -/* f077020: 0c00b526 */ jal 0x2d498 +/* f077020: 0c00b526 */ jal func0002db98 /* f077024: a7aa00a2 */ sh $t2,0xa2($sp) /* f077028: 1040000b */ beqz $v0,.PF0f077058 /* f07702c: 87a300a2 */ lh $v1,0xa2($sp) @@ -23898,7 +23898,7 @@ glabel var7f1ab6dcpf /* f077038: 26440008 */ addiu $a0,$s2,0x8 /* f07703c: 8fa5006c */ lw $a1,0x6c($sp) /* f077040: 27a600a4 */ addiu $a2,$sp,0xa4 -/* f077044: 0c00a750 */ jal 0x29d40 +/* f077044: 0c00a750 */ jal func0002a440 /* f077048: 8fa70074 */ lw $a3,0x74($sp) /* f07704c: 00021c00 */ sll $v1,$v0,0x10 /* f077050: 00036403 */ sra $t4,$v1,0x10 @@ -23911,17 +23911,17 @@ glabel var7f1ab6dcpf /* f077068: 264e0008 */ addiu $t6,$s2,0x8 /* f07706c: 02402025 */ move $a0,$s2 /* f077070: e6460010 */ swc1 $f6,0x10($s2) -/* f077074: 0fc197b5 */ jal 0xf065ed4 +/* f077074: 0fc197b5 */ jal func0f065c44 /* f077078: afae0070 */ sw $t6,0x70($sp) /* f07707c: 27a405b8 */ addiu $a0,$sp,0x5b8 -/* f077080: 0fc1968d */ jal 0xf065a34 +/* f077080: 0fc1968d */ jal roomsCopy /* f077084: 8fa5006c */ lw $a1,0x6c($sp) /* f077088: 27b90096 */ addiu $t9,$sp,0x96 /* f07708c: afb90010 */ sw $t9,0x10($sp) /* f077090: 8fa40070 */ lw $a0,0x70($sp) /* f077094: 8fa5006c */ lw $a1,0x6c($sp) /* f077098: 27a600a4 */ addiu $a2,$sp,0xa4 -/* f07709c: 0c00a750 */ jal 0x29d40 +/* f07709c: 0c00a750 */ jal func0002a440 /* f0770a0: 8fa70074 */ lw $a3,0x74($sp) /* f0770a4: 00021c00 */ sll $v1,$v0,0x10 /* f0770a8: 00034c03 */ sra $t1,$v1,0x10 @@ -23931,7 +23931,7 @@ glabel var7f1ab6dcpf .PF0f0770b8: /* f0770b8: 18600010 */ blez $v1,.PF0f0770fc /* f0770bc: c7aa05cc */ lwc1 $f10,0x5cc($sp) -/* f0770c0: 0fc1aa2a */ jal 0xf06a8a8 +/* f0770c0: 0fc1aa2a */ jal func0f06a620 /* f0770c4: 02202025 */ move $a0,$s1 /* f0770c8: c7aa00a4 */ lwc1 $f10,0xa4($sp) /* f0770cc: c7a40098 */ lwc1 $f4,0x98($sp) @@ -23977,14 +23977,14 @@ glabel var7f1ab6dcpf .PF0f077164: /* f077164: 51e0000b */ beqzl $t7,.PF0f077194 /* f077168: 8fae05d8 */ lw $t6,0x5d8($sp) -/* f07716c: 0fc1abb2 */ jal 0xf06aec8 +/* f07716c: 0fc1abb2 */ jal objEndFlight /* f077170: 02202025 */ move $a0,$s1 /* f077174: 922c0003 */ lbu $t4,0x3($s1) /* f077178: 24010008 */ li $at,0x8 /* f07717c: 26450028 */ addiu $a1,$s2,0x28 /* f077180: 55810004 */ bnel $t4,$at,.PF0f077194 /* f077184: 8fae05d8 */ lw $t6,0x5d8($sp) -/* f077188: 0fc257be */ jal 0xf095ef8 +/* f077188: 0fc257be */ jal objectiveCheckMultiroomEntered /* f07718c: 9224005c */ lbu $a0,0x5c($s1) /* f077190: 8fae05d8 */ lw $t6,0x5d8($sp) .PF0f077194: @@ -23992,7 +23992,7 @@ glabel var7f1ab6dcpf /* f077198: 24050001 */ li $a1,0x1 /* f07719c: 51c00004 */ beqzl $t6,.PF0f0771b0 /* f0771a0: 8fbf005c */ lw $ra,0x5c($sp) -/* f0771a4: 0fc1a7be */ jal 0xf069ef8 +/* f0771a4: 0fc1a7be */ jal func0f069c70 /* f0771a8: 24060001 */ li $a2,0x1 .PF0f0771ac: /* f0771ac: 8fbf005c */ lw $ra,0x5c($sp) @@ -27605,14 +27605,14 @@ glabel var7f1aa43c .PF0f0772a8: /* f0772a8: 14600005 */ bnez $v1,.PF0f0772c0 /* f0772ac: 00000000 */ nop -/* f0772b0: 0fc238ed */ jal 0xf08e3b4 +/* f0772b0: 0fc238ed */ jal doorsRequestMode /* f0772b4: 24050002 */ li $a1,0x2 /* f0772b8: 1000002d */ b .PF0f077370 /* f0772bc: 822b0084 */ lb $t3,0x84($s1) .PF0f0772c0: /* f0772c0: 5040002b */ beqzl $v0,.PF0f077370 /* f0772c4: 822b0084 */ lb $t3,0x84($s1) -/* f0772c8: 0fc22fdb */ jal 0xf08bf6c +/* f0772c8: 0fc22fdb */ jal func0f08c040 /* f0772cc: 02202025 */ move $a0,$s1 /* f0772d0: 8e3000bc */ lw $s0,0xbc($s1) /* f0772d4: 52000010 */ beqzl $s0,.PF0f077318 @@ -27622,7 +27622,7 @@ glabel var7f1aa43c /* f0772e4: 5700000c */ bnezl $t8,.PF0f077318 /* f0772e8: 2c590001 */ sltiu $t9,$v0,0x1 .PF0f0772ec: -/* f0772ec: 0fc22fdb */ jal 0xf08bf6c +/* f0772ec: 0fc22fdb */ jal func0f08c040 /* f0772f0: 02002025 */ move $a0,$s0 /* f0772f4: 8e1000bc */ lw $s0,0xbc($s0) /* f0772f8: 2c430001 */ sltiu $v1,$v0,0x1 @@ -27656,7 +27656,7 @@ glabel var7f1aa43c /* f07735c: 822b0084 */ lb $t3,0x84($s1) .PF0f077360: /* f077360: 02202025 */ move $a0,$s1 -/* f077364: 0fc238ed */ jal 0xf08e3b4 +/* f077364: 0fc238ed */ jal doorsRequestMode /* f077368: 24050002 */ li $a1,0x2 .PF0f07736c: /* f07736c: 822b0084 */ lb $t3,0x84($s1) @@ -27693,22 +27693,22 @@ glabel var7f1aa43c .PF0f0773d8: /* f0773d8: 50600004 */ beqzl $v1,.PF0f0773ec /* f0773dc: 962c0072 */ lhu $t4,0x72($s1) -/* f0773e0: 0fc238b4 */ jal 0xf08e2d0 +/* f0773e0: 0fc238b4 */ jal doorSetMode /* f0773e4: 24050001 */ li $a1,0x1 /* f0773e8: 962c0072 */ lhu $t4,0x72($s1) .PF0f0773ec: /* f0773ec: 24010008 */ li $at,0x8 /* f0773f0: 1581000b */ bne $t4,$at,.PF0f077420 /* f0773f4: 00000000 */ nop -/* f0773f8: 0fc23913 */ jal 0xf08e44c +/* f0773f8: 0fc23913 */ jal doorIsClosed /* f0773fc: 02202025 */ move $a0,$s1 /* f077400: 10400007 */ beqz $v0,.PF0f077420 /* f077404: 00000000 */ nop -/* f077408: 0fc19a0f */ jal 0xf06683c +/* f077408: 0fc19a0f */ jal doorIsPadlockFree /* f07740c: 02202025 */ move $a0,$s1 /* f077410: 10400003 */ beqz $v0,.PF0f077420 /* f077414: 8fa40060 */ lw $a0,0x60($sp) -/* f077418: 0fc23f85 */ jal 0xf08fe14 +/* f077418: 0fc23f85 */ jal doorsActivate /* f07741c: 00002825 */ move $a1,$zero .PF0f077420: /* f077420: 3c0e800a */ lui $t6,0x800a @@ -27722,7 +27722,7 @@ glabel var7f1aa43c /* f077440: 55e00004 */ bnezl $t7,.PF0f077454 /* f077444: 8fb90058 */ lw $t9,0x58($sp) .PF0f077448: -/* f077448: 0fc23c12 */ jal 0xf08f048 +/* f077448: 0fc23c12 */ jal doorDoCalc /* f07744c: 02202025 */ move $a0,$s1 /* f077450: 8fb90058 */ lw $t9,0x58($sp) .PF0f077454: @@ -27764,7 +27764,7 @@ glabel var7f1aa43c /* f0774e0: e7a00024 */ swc1 $f0,0x24($sp) /* f0774e4: e7a00030 */ swc1 $f0,0x30($sp) /* f0774e8: e7a00034 */ swc1 $f0,0x34($sp) -/* f0774ec: 0fc24e3a */ jal 0xf0938e8 +/* f0774ec: 0fc24e3a */ jal func0f0939f8 /* f0774f0: e7a00038 */ swc1 $f0,0x38($sp) /* f0774f4: 10000019 */ b .PF0f07755c /* f0774f8: 8fbf004c */ lw $ra,0x4c($sp) @@ -27790,7 +27790,7 @@ glabel var7f1aa43c /* f077544: e7a00024 */ swc1 $f0,0x24($sp) /* f077548: e7a00030 */ swc1 $f0,0x30($sp) /* f07754c: e7a00034 */ swc1 $f0,0x34($sp) -/* f077550: 0fc24e3a */ jal 0xf0938e8 +/* f077550: 0fc24e3a */ jal func0f0939f8 /* f077554: e7a00038 */ swc1 $f0,0x38($sp) .PF0f077558: /* f077558: 8fbf004c */ lw $ra,0x4c($sp) @@ -53830,7 +53830,7 @@ glabel var7f1abe2cpf /* f087908: a7a80098 */ sh $t0,0x98($sp) /* f08790c: afa600b0 */ sw $a2,0xb0($sp) /* f087910: 8fa500bc */ lw $a1,0xbc($sp) -/* f087914: 0fc21e22 */ jal 0xf087888 +/* f087914: 0fc21e22 */ jal func0f087888pf /* f087918: 8fa400ac */ lw $a0,0xac($sp) /* f08791c: 8fa600b0 */ lw $a2,0xb0($sp) /* f087920: 97a80098 */ lhu $t0,0x98($sp) @@ -54001,27 +54001,27 @@ glabel var7f1abe2cpf /* f087b60: 00000000 */ nop /* f087b64: 01002025 */ move $a0,$t0 /* f087b68: afa60020 */ sw $a2,0x20($sp) -/* f087b6c: 0fc5bdaa */ jal 0xf16f6a8 +/* f087b6c: 0fc5bdaa */ jal langGet /* f087b70: afa90094 */ sw $t1,0x94($sp) /* f087b74: 8fa40020 */ lw $a0,0x20($sp) -/* f087b78: 0fc5bdaa */ jal 0xf16f6a8 +/* f087b78: 0fc5bdaa */ jal langGet /* f087b7c: afa20024 */ sw $v0,0x24($sp) /* f087b80: 3c057f1b */ lui $a1,0x7f1b /* f087b84: 24a5b2f8 */ addiu $a1,$a1,-19720 /* f087b88: 27a4002c */ addiu $a0,$sp,0x2c /* f087b8c: 8fa60024 */ lw $a2,0x24($sp) -/* f087b90: 0c004d11 */ jal 0x13444 +/* f087b90: 0c004d11 */ jal sprintf /* f087b94: 00403825 */ move $a3,$v0 /* f087b98: 8fa90094 */ lw $t1,0x94($sp) /* f087b9c: 1000000a */ b .PF0f087bc8 /* f087ba0: 8faa00b4 */ lw $t2,0xb4($sp) .PF0f087ba4: -/* f087ba4: 0fc5bdaa */ jal 0xf16f6a8 +/* f087ba4: 0fc5bdaa */ jal langGet /* f087ba8: afa90094 */ sw $t1,0x94($sp) /* f087bac: 3c057f1b */ lui $a1,0x7f1b /* f087bb0: 24a5b300 */ addiu $a1,$a1,-19712 /* f087bb4: 27a4002c */ addiu $a0,$sp,0x2c -/* f087bb8: 0c004d11 */ jal 0x13444 +/* f087bb8: 0c004d11 */ jal sprintf /* f087bbc: 00403025 */ move $a2,$v0 /* f087bc0: 8fa90094 */ lw $t1,0x94($sp) /* f087bc4: 8faa00b4 */ lw $t2,0xb4($sp) @@ -54047,30 +54047,30 @@ glabel var7f1abe2cpf /* f087c04: 8fb900b8 */ lw $t9,0xb8($sp) /* f087c08: 1320000b */ beqz $t9,.PF0f087c38 /* f087c0c: 00000000 */ nop -/* f087c10: 0fc5bdaa */ jal 0xf16f6a8 +/* f087c10: 0fc5bdaa */ jal langGet /* f087c14: 24045208 */ li $a0,0x5208 /* f087c18: 3c057f1b */ lui $a1,0x7f1b /* f087c1c: 24a5b304 */ addiu $a1,$a1,-19708 /* f087c20: 8fa400a8 */ lw $a0,0xa8($sp) /* f087c24: 00403025 */ move $a2,$v0 -/* f087c28: 0c004d11 */ jal 0x13444 +/* f087c28: 0c004d11 */ jal sprintf /* f087c2c: 27a7002c */ addiu $a3,$sp,0x2c /* f087c30: 1000000f */ b .PF0f087c70 /* f087c34: 8fbf0014 */ lw $ra,0x14($sp) .PF0f087c38: /* f087c38: 15400009 */ bnez $t2,.PF0f087c60 /* f087c3c: 8fa400a8 */ lw $a0,0xa8($sp) -/* f087c40: 0fc5bdaa */ jal 0xf16f6a8 +/* f087c40: 0fc5bdaa */ jal langGet /* f087c44: 25245200 */ addiu $a0,$t1,0x5200 /* f087c48: 8fa400a8 */ lw $a0,0xa8($sp) /* f087c4c: 00402825 */ move $a1,$v0 -/* f087c50: 0c004d11 */ jal 0x13444 +/* f087c50: 0c004d11 */ jal sprintf /* f087c54: 27a6002c */ addiu $a2,$sp,0x2c /* f087c58: 10000005 */ b .PF0f087c70 /* f087c5c: 8fbf0014 */ lw $ra,0x14($sp) .PF0f087c60: /* f087c60: 3c057f1b */ lui $a1,0x7f1b -/* f087c64: 0c004d11 */ jal 0x13444 +/* f087c64: 0c004d11 */ jal sprintf /* f087c68: 24a5b30c */ addiu $a1,$a1,-19700 .PF0f087c6c: /* f087c6c: 8fbf0014 */ lw $ra,0x14($sp) @@ -54828,7 +54828,7 @@ glabel weaponGetPickupText /* f088608: 2c430001 */ sltiu $v1,$v0,0x1 /* f08860c: 54600010 */ bnezl $v1,.PF0f088650 /* f088610: 8fac002c */ lw $t4,0x2c($sp) -/* f088614: 0fc54ef9 */ jal 0xf153be4 +/* f088614: 0fc54ef9 */ jal optionsGetScreenSplit /* f088618: 00000000 */ nop /* f08861c: 24050001 */ li $a1,0x1 /* f088620: 00a22026 */ xor $a0,$a1,$v0 @@ -54849,7 +54849,7 @@ glabel weaponGetPickupText /* f088654: afa30020 */ sw $v1,0x20($sp) /* f088658: 55810017 */ bnel $t4,$at,.PF0f0886b8 /* f08865c: 8fa70020 */ lw $a3,0x20($sp) -/* f088660: 0fc59965 */ jal 0xf166594 +/* f088660: 0fc59965 */ jal stageGetIndex /* f088664: 8ce404b4 */ lw $a0,0x4b4($a3) /* f088668: 3c07800a */ lui $a3,0x800a /* f08866c: 24010013 */ li $at,0x13 @@ -54859,13 +54859,13 @@ glabel weaponGetPickupText /* f08867c: 1000000d */ b .PF0f0886b4 /* f088680: afad002c */ sw $t5,0x2c($sp) .PF0f088684: -/* f088684: 0fc59965 */ jal 0xf166594 +/* f088684: 0fc59965 */ jal stageGetIndex /* f088688: 8ce404b4 */ lw $a0,0x4b4($a3) /* f08868c: 3c07800a */ lui $a3,0x800a /* f088690: 24010023 */ li $at,0x23 /* f088694: 10410005 */ beq $v0,$at,.PF0f0886ac /* f088698: 24e7a510 */ addiu $a3,$a3,-23280 -/* f08869c: 0fc59965 */ jal 0xf166594 +/* f08869c: 0fc59965 */ jal stageGetIndex /* f0886a0: 8ce404b4 */ lw $a0,0x4b4($a3) /* f0886a4: 24010009 */ li $at,0x9 /* f0886a8: 14410002 */ bne $v0,$at,.PF0f0886b4 @@ -54884,7 +54884,7 @@ glabel weaponGetPickupText /* f0886d0: 8fa40028 */ lw $a0,0x28($sp) /* f0886d4: 8fa5002c */ lw $a1,0x2c($sp) /* f0886d8: 00003025 */ move $a2,$zero -/* f0886dc: 0fc21e32 */ jal 0xf0878c8 +/* f0886dc: 0fc21e32 */ jal func0f0878c8pf /* f0886e0: afb80010 */ sw $t8,0x10($sp) /* f0886e4: 8fbf001c */ lw $ra,0x1c($sp) /* f0886e8: 27bd0028 */ addiu $sp,$sp,0x28 @@ -65428,16 +65428,16 @@ glabel var7f1ab1a8 /* f0907fc: afa40060 */ sw $a0,0x60($sp) /* f090800: 3c018007 */ lui $at,0x8007 /* f090804: c42495ec */ lwc1 $f4,-0x6a14($at) -/* f090808: 0c002e91 */ jal 0xba44 +/* f090808: 0c002e91 */ jal viGetViewLeft /* f09080c: e7a4004c */ swc1 $f4,0x4c($sp) -/* f090810: 0c002e73 */ jal 0xb9cc +/* f090810: 0c002e73 */ jal viGetViewWidth /* f090814: a7a20036 */ sh $v0,0x36($sp) /* f090818: 87b80036 */ lh $t8,0x36($sp) /* f09081c: 00027843 */ sra $t7,$v0,0x1 /* f090820: 01f8c821 */ addu $t9,$t7,$t8 -/* f090824: 0c002e95 */ jal 0xba54 +/* f090824: 0c002e95 */ jal viGetViewTop /* f090828: afb90044 */ sw $t9,0x44($sp) -/* f09082c: 0c002e77 */ jal 0xb9dc +/* f09082c: 0c002e77 */ jal viGetViewHeight /* f090830: a7a20036 */ sh $v0,0x36($sp) /* f090834: 87a90036 */ lh $t1,0x36($sp) /* f090838: 3c06800a */ lui $a2,0x800a @@ -65483,7 +65483,7 @@ glabel var7f1ab1a8 /* f0908c4: 24010001 */ li $at,0x1 /* f0908c8: 1301000a */ beq $t8,$at,.PF0f0908f4 /* f0908cc: 00000000 */ nop -/* f0908d0: 0fc54ef9 */ jal 0xf153be4 +/* f0908d0: 0fc54ef9 */ jal optionsGetScreenSplit /* f0908d4: 00000000 */ nop /* f0908d8: 3c06800a */ lui $a2,0x800a /* f0908dc: 24010001 */ li $at,0x1 @@ -65512,7 +65512,7 @@ glabel var7f1ab1a8 /* f090928: 10000006 */ b .PF0f090944 /* f09092c: 24f00002 */ addiu $s0,$a3,0x2 .PF0f090930: -/* f090930: 0fc54e8c */ jal 0xf153a30 +/* f090930: 0fc54e8c */ jal optionsGetEffectiveScreenSize /* f090934: 00000000 */ nop /* f090938: 50400003 */ beqzl $v0,.PF0f090948 /* f09093c: c7a0004c */ lwc1 $f0,0x4c($sp) @@ -65531,7 +65531,7 @@ glabel var7f1ab1a8 /* f090964: c428c38c */ lwc1 $f8,-0x3c74($at) /* f090968: e7a0004c */ swc1 $f0,0x4c($sp) /* f09096c: 46080302 */ mul.s $f12,$f0,$f8 -/* f090970: 0fc25dec */ jal 0xf0977b0 +/* f090970: 0fc25dec */ jal floorf /* f090974: 00000000 */ nop /* f090978: 4600028d */ trunc.w.s $f10,$f0 /* f09097c: 3c017f1b */ lui $at,0x7f1b @@ -65539,7 +65539,7 @@ glabel var7f1ab1a8 /* f090984: c7b0004c */ lwc1 $f16,0x4c($sp) /* f090988: 440b5000 */ mfc1 $t3,$f10 /* f09098c: 46128302 */ mul.s $f12,$f16,$f18 -/* f090990: 0fc25dec */ jal 0xf0977b0 +/* f090990: 0fc25dec */ jal floorf /* f090994: afab005c */ sw $t3,0x5c($sp) /* f090998: 4600010d */ trunc.w.s $f4,$f0 /* f09099c: 8fae005c */ lw $t6,0x5c($sp) @@ -65552,7 +65552,7 @@ glabel var7f1ab1a8 /* f0909b8: 000f7880 */ sll $t7,$t7,0x2 /* f0909bc: 01afc023 */ subu $t8,$t5,$t7 /* f0909c0: 46083302 */ mul.s $f12,$f6,$f8 -/* f0909c4: 0fc25dec */ jal 0xf0977b0 +/* f0909c4: 0fc25dec */ jal floorf /* f0909c8: afb80058 */ sw $t8,0x58($sp) /* f0909cc: 8faa005c */ lw $t2,0x5c($sp) /* f0909d0: 4600028d */ trunc.w.s $f10,$f0 @@ -65573,7 +65573,7 @@ glabel var7f1ab1a8 /* f090a0c: 012b6023 */ subu $t4,$t1,$t3 /* f090a10: 018d7823 */ subu $t7,$t4,$t5 /* f090a14: afaf0054 */ sw $t7,0x54($sp) -/* f090a18: 0fc550cf */ jal 0xf15433c +/* f090a18: 0fc550cf */ jal func0f153628 /* f090a1c: 8fa40060 */ lw $a0,0x60($sp) /* f090a20: 8fa5005c */ lw $a1,0x5c($sp) /* f090a24: 24010064 */ li $at,0x64 @@ -65591,7 +65591,7 @@ glabel var7f1ab1a8 /* f090a54: 00402025 */ move $a0,$v0 /* f090a58: 24070002 */ li $a3,0x2 /* f090a5c: afb00010 */ sw $s0,0x10($sp) -/* f090a60: 0fc2a85e */ jal 0xf0aa178 +/* f090a60: 0fc2a85e */ jal func0f0a9d2c /* f090a64: 24c6ffee */ addiu $a2,$a2,-18 /* f090a68: 8fa5005c */ lw $a1,0x5c($sp) /* f090a6c: 2401000a */ li $at,0xa @@ -65606,7 +65606,7 @@ glabel var7f1ab1a8 /* f090a90: 00402025 */ move $a0,$v0 /* f090a94: 24070002 */ li $a3,0x2 /* f090a98: afb00010 */ sw $s0,0x10($sp) -/* f090a9c: 0fc2a85e */ jal 0xf0aa178 +/* f090a9c: 0fc2a85e */ jal func0f0a9d2c /* f090aa0: 24c6fff2 */ addiu $a2,$a2,-14 /* f090aa4: 8fa60044 */ lw $a2,0x44($sp) /* f090aa8: 3c0f00ff */ lui $t7,0xff @@ -65619,7 +65619,7 @@ glabel var7f1ab1a8 /* f090ac4: 00402025 */ move $a0,$v0 /* f090ac8: 24070002 */ li $a3,0x2 /* f090acc: afb00010 */ sw $s0,0x10($sp) -/* f090ad0: 0fc2a7ed */ jal 0xf0a9fb4 +/* f090ad0: 0fc2a7ed */ jal func0f0a9b68 /* f090ad4: 24c6fff8 */ addiu $a2,$a2,-8 /* f090ad8: 8fa50058 */ lw $a1,0x58($sp) /* f090adc: 2401003c */ li $at,0x3c @@ -65637,7 +65637,7 @@ glabel var7f1ab1a8 /* f090b0c: 00402025 */ move $a0,$v0 /* f090b10: 24070002 */ li $a3,0x2 /* f090b14: afb00010 */ sw $s0,0x10($sp) -/* f090b18: 0fc2a85e */ jal 0xf0aa178 +/* f090b18: 0fc2a85e */ jal func0f0a9d2c /* f090b1c: 24c6fffe */ addiu $a2,$a2,-2 /* f090b20: 8fa50058 */ lw $a1,0x58($sp) /* f090b24: 2401000a */ li $at,0xa @@ -65652,7 +65652,7 @@ glabel var7f1ab1a8 /* f090b48: 00402025 */ move $a0,$v0 /* f090b4c: 24070002 */ li $a3,0x2 /* f090b50: afb00010 */ sw $s0,0x10($sp) -/* f090b54: 0fc2a85e */ jal 0xf0aa178 +/* f090b54: 0fc2a85e */ jal func0f0a9d2c /* f090b58: 24c60002 */ addiu $a2,$a2,0x2 /* f090b5c: 8fa60044 */ lw $a2,0x44($sp) /* f090b60: 3c0f00ff */ lui $t7,0xff @@ -65665,7 +65665,7 @@ glabel var7f1ab1a8 /* f090b7c: 00402025 */ move $a0,$v0 /* f090b80: 24070002 */ li $a3,0x2 /* f090b84: afb00010 */ sw $s0,0x10($sp) -/* f090b88: 0fc2a7ed */ jal 0xf0a9fb4 +/* f090b88: 0fc2a7ed */ jal func0f0a9b68 /* f090b8c: 24c60008 */ addiu $a2,$a2,0x8 /* f090b90: 8fa50054 */ lw $a1,0x54($sp) /* f090b94: 24010064 */ li $at,0x64 @@ -65683,7 +65683,7 @@ glabel var7f1ab1a8 /* f090bc4: 00402025 */ move $a0,$v0 /* f090bc8: 24070002 */ li $a3,0x2 /* f090bcc: afb00010 */ sw $s0,0x10($sp) -/* f090bd0: 0fc2a85e */ jal 0xf0aa178 +/* f090bd0: 0fc2a85e */ jal func0f0a9d2c /* f090bd4: 24c6000e */ addiu $a2,$a2,0xe /* f090bd8: 8fa50054 */ lw $a1,0x54($sp) /* f090bdc: 2401000a */ li $at,0xa @@ -65698,9 +65698,9 @@ glabel var7f1ab1a8 /* f090c00: 00402025 */ move $a0,$v0 /* f090c04: 24070002 */ li $a3,0x2 /* f090c08: afb00010 */ sw $s0,0x10($sp) -/* f090c0c: 0fc2a85e */ jal 0xf0aa178 +/* f090c0c: 0fc2a85e */ jal func0f0a9d2c /* f090c10: 24c60012 */ addiu $a2,$a2,0x12 -/* f090c14: 0fc55125 */ jal 0xf154494 +/* f090c14: 0fc55125 */ jal func0f153780 /* f090c18: 00402025 */ move $a0,$v0 /* f090c1c: afa20060 */ sw $v0,0x60($sp) .PF0f090c20: diff --git a/src/game/room.c b/src/game/room.c index 2da997b5b..5bb16d17b 100644 --- a/src/game/room.c +++ b/src/game/room.c @@ -5010,7 +5010,7 @@ glabel var7f1b75d0 /* f15b71c: afb1001c */ sw $s1,0x1c($sp) /* f15b720: afb00018 */ sw $s0,0x18($sp) /* f15b724: 39e4000f */ xori $a0,$t7,0xf -/* f15b728: 0c0048f2 */ jal 0x123c8 +/* f15b728: 0c0048f2 */ jal malloc /* f15b72c: 24050004 */ addiu $a1,$zero,0x4 /* f15b730: 8e6402bc */ lw $a0,0x2bc($s3) /* f15b734: 3c15800a */ lui $s5,%hi(g_Rooms) @@ -5020,7 +5020,7 @@ glabel var7f1b75d0 /* f15b744: 348e000f */ ori $t6,$a0,0xf /* f15b748: aea20000 */ sw $v0,0x0($s5) /* f15b74c: 39c4000f */ xori $a0,$t6,0xf -/* f15b750: 0c0048f2 */ jal 0x123c8 +/* f15b750: 0c0048f2 */ jal malloc /* f15b754: 24050004 */ addiu $a1,$zero,0x4 /* f15b758: 8e7102bc */ lw $s1,0x2bc($s3) /* f15b75c: 3c03800a */ lui $v1,%hi(var800a4ce8) @@ -5050,7 +5050,7 @@ glabel var7f1b75d0 /* f15b7b4: 2624000f */ addiu $a0,$s1,0xf /* f15b7b8: 3499000f */ ori $t9,$a0,0xf /* f15b7bc: 3b24000f */ xori $a0,$t9,0xf -/* f15b7c0: 0c0048f2 */ jal 0x123c8 +/* f15b7c0: 0c0048f2 */ jal malloc /* f15b7c4: 24050004 */ addiu $a1,$zero,0x4 /* f15b7c8: 8e7102bc */ lw $s1,0x2bc($s3) /* f15b7cc: 3c03800a */ lui $v1,%hi(g_MpRoomVisibility) @@ -5112,13 +5112,13 @@ glabel var7f1b75d0 /* f15b89c: 2610fcc0 */ addiu $s0,$s0,%lo(g_Stages) /* f15b8a0: 00007812 */ mflo $t7 /* f15b8a4: 020fc021 */ addu $t8,$s0,$t7 -/* f15b8a8: 0fc5718f */ jal 0xf15c63c +/* f15b8a8: 0fc5718f */ jal func0f15c880 /* f15b8ac: c70c0014 */ lwc1 $f12,0x14($t8) /* f15b8b0: 8e390000 */ lw $t9,0x0($s1) /* f15b8b4: 03320019 */ multu $t9,$s2 /* f15b8b8: 00007012 */ mflo $t6 /* f15b8bc: 020e7821 */ addu $t7,$s0,$t6 -/* f15b8c0: 0fc0a124 */ jal 0xf028490 +/* f15b8c0: 0fc0a124 */ jal func0f028490 /* f15b8c4: c5ec0014 */ lwc1 $f12,0x14($t7) /* f15b8c8: 3c188008 */ lui $t8,%hi(g_StageIndex) /* f15b8cc: 8f18fc00 */ lw $t8,%lo(g_StageIndex)($t8) @@ -5139,7 +5139,7 @@ glabel var7f1b75d0 /* f15b904: e4400068 */ swc1 $f0,0x68($v0) /* f15b908: 3c013f80 */ lui $at,0x3f80 /* f15b90c: 44816000 */ mtc1 $at,$f12 -/* f15b910: 0c0059d2 */ jal 0x16748 +/* f15b910: 0c0059d2 */ jal func00016748 /* f15b914: 00000000 */ nop /* f15b918: 3c0e800a */ lui $t6,%hi(var800a4920) /* f15b91c: 8dce4920 */ lw $t6,%lo(var800a4920)($t6) @@ -5165,7 +5165,7 @@ glabel var7f1b75d0 /* f15b964: 2442fc40 */ addiu $v0,$v0,%lo(g_NumPortalThings) /* f15b968: 348e000f */ ori $t6,$a0,0xf /* f15b96c: ac5e0000 */ sw $s8,0x0($v0) -/* f15b970: 0c0048f2 */ jal 0x123c8 +/* f15b970: 0c0048f2 */ jal malloc /* f15b974: 39c4000f */ xori $a0,$t6,0xf /* f15b978: 3c01800a */ lui $at,%hi(g_PortalThings) /* f15b97c: ac224cec */ sw $v0,%lo(g_PortalThings)($at) @@ -5213,7 +5213,7 @@ glabel var7f1b75d0 /* f15ba08: 2484000f */ addiu $a0,$a0,0xf /* f15ba0c: 348e000f */ ori $t6,$a0,0xf /* f15ba10: 39c4000f */ xori $a0,$t6,0xf -/* f15ba14: 0c0048f2 */ jal 0x123c8 +/* f15ba14: 0c0048f2 */ jal malloc /* f15ba18: 24050004 */ addiu $a1,$zero,0x4 /* f15ba1c: 3c05800a */ lui $a1,%hi(g_Vars) /* f15ba20: 24a59fc0 */ addiu $a1,$a1,%lo(g_Vars) @@ -5391,14 +5391,14 @@ glabel var7f1b75d0 .L0f15bc80: /* f15bc80: 2444000f */ addiu $a0,$v0,0xf /* f15bc84: 3498000f */ ori $t8,$a0,0xf -/* f15bc88: 0c0048f2 */ jal 0x123c8 +/* f15bc88: 0c0048f2 */ jal malloc /* f15bc8c: 3b04000f */ xori $a0,$t8,0xf /* f15bc90: 3c10800a */ lui $s0,%hi(var800a4cd0) /* f15bc94: 26104cd0 */ addiu $s0,$s0,%lo(var800a4cd0) /* f15bc98: 1bc00009 */ blez $s8,.L0f15bcc0 /* f15bc9c: ae020000 */ sw $v0,0x0($s0) .L0f15bca0: -/* f15bca0: 0fc56ca4 */ jal 0xf15b290 +/* f15bca0: 0fc56ca4 */ jal func0f15b4c0 /* f15bca4: 02802025 */ or $a0,$s4,$zero /* f15bca8: 8e0f0000 */ lw $t7,0x0($s0) /* f15bcac: 01f4c821 */ addu $t9,$t7,$s4 @@ -5413,7 +5413,7 @@ glabel var7f1b75d0 /* f15bccc: 2484000f */ addiu $a0,$a0,0xf /* f15bcd0: 3498000f */ ori $t8,$a0,0xf /* f15bcd4: 3b04000f */ xori $a0,$t8,0xf -/* f15bcd8: 0c0048f2 */ jal 0x123c8 +/* f15bcd8: 0c0048f2 */ jal malloc /* f15bcdc: 24050004 */ addiu $a1,$zero,0x4 /* f15bce0: 3c01800a */ lui $at,%hi(var800a4ccc) /* f15bce4: 1bc00095 */ blez $s8,.L0f15bf3c @@ -5498,7 +5498,7 @@ glabel var7f1b75d0 /* f15be0c: 46021282 */ mul.s $f10,$f2,$f2 /* f15be10: 460a3100 */ add.s $f4,$f6,$f10 /* f15be14: 460e7202 */ mul.s $f8,$f14,$f14 -/* f15be18: 0c012974 */ jal 0x4a5d0 +/* f15be18: 0c012974 */ jal sqrtf /* f15be1c: 46044300 */ add.s $f12,$f8,$f4 /* f15be20: c7b200f8 */ lwc1 $f18,0xf8($sp) /* f15be24: 46000087 */ neg.s $f2,$f0 @@ -5576,7 +5576,7 @@ glabel var7f1b75d0 /* f15bf34: e4460010 */ swc1 $f6,0x10($v0) /* f15bf38: 0000a025 */ or $s4,$zero,$zero .L0f15bf3c: -/* f15bf3c: 0fc2d96a */ jal 0xf0b65a8 +/* f15bf3c: 0fc2d96a */ jal func0f0b65a8 /* f15bf40: 03c02025 */ or $a0,$s8,$zero /* f15bf44: 3c1e800a */ lui $s8,%hi(g_BgPortalCommands) /* f15bf48: 27de4cd4 */ addiu $s8,$s8,%lo(g_BgPortalCommands) @@ -5598,7 +5598,7 @@ glabel var7f1b75d0 /* f15bf84: 8e0f0004 */ lw $t7,0x4($s0) /* f15bf88: 8e790000 */ lw $t9,0x0($s3) /* f15bf8c: 01f9c021 */ addu $t8,$t7,$t9 -/* f15bf90: 0fc5758b */ jal 0xf15d62c +/* f15bf90: 0fc5758b */ jal func0f15d870 /* f15bf94: 03142021 */ addu $a0,$t8,$s4 /* f15bf98: 8fce0000 */ lw $t6,0x0($s8) /* f15bf9c: 01d27821 */ addu $t7,$t6,$s2 @@ -5652,7 +5652,7 @@ glabel var7f1b75d0 /* f15c050: 5420ffe4 */ bnezl $at,.L0f15bfe4 /* f15c054: 8eae0000 */ lw $t6,0x0($s5) .L0f15c058: -/* f15c058: 0fc04fb8 */ jal 0xf013ee0 +/* f15c058: 0fc04fb8 */ jal func0f013ee0 /* f15c05c: 00000000 */ nop /* f15c060: 44808000 */ mtc1 $zero,$f16 /* f15c064: 8eaf0000 */ lw $t7,0x0($s5) @@ -5666,7 +5666,7 @@ glabel var7f1b75d0 /* f15c084: 8eaf0000 */ lw $t7,0x0($s5) /* f15c088: e5f00028 */ swc1 $f16,0x28($t7) /* f15c08c: 8eb90000 */ lw $t9,0x0($s5) -/* f15c090: 0fc4f071 */ jal 0xf13c1c4 +/* f15c090: 0fc4f071 */ jal func0f13c3f4 /* f15c094: e730002c */ swc1 $f16,0x2c($t9) /* f15c098: 03a08025 */ or $s0,$sp,$zero /* f15c09c: 261000b3 */ addiu $s0,$s0,0xb3 @@ -5676,7 +5676,7 @@ glabel var7f1b75d0 /* f15c0ac: 3b04000f */ xori $a0,$t8,0xf /* f15c0b0: 00808025 */ or $s0,$a0,$zero /* f15c0b4: 8e450000 */ lw $a1,0x0($s2) -/* f15c0b8: 0fc56be5 */ jal 0xf15af94 +/* f15c0b8: 0fc56be5 */ jal bgLoadFile /* f15c0bc: 24060040 */ addiu $a2,$zero,0x40 /* f15c0c0: 96020000 */ lhu $v0,0x0($s0) /* f15c0c4: 96110002 */ lhu $s1,0x2($s0) @@ -5685,7 +5685,7 @@ glabel var7f1b75d0 /* f15c0d0: 25e2ffff */ addiu $v0,$t7,-1 /* f15c0d4: 3459000f */ ori $t9,$v0,0xf /* f15c0d8: 03201025 */ or $v0,$t9,$zero -/* f15c0dc: 0c0048f2 */ jal 0x123c8 +/* f15c0dc: 0c0048f2 */ jal malloc /* f15c0e0: 24441001 */ addiu $a0,$v0,0x1001 /* f15c0e4: 8e450000 */ lw $a1,0x0($s2) /* f15c0e8: 2626ffff */ addiu $a2,$s1,-1 @@ -5694,11 +5694,11 @@ glabel var7f1b75d0 /* f15c0f4: afa2008c */ sw $v0,0x8c($sp) /* f15c0f8: 00808025 */ or $s0,$a0,$zero /* f15c0fc: 27060001 */ addiu $a2,$t8,0x1 -/* f15c100: 0fc56be5 */ jal 0xf15af94 +/* f15c100: 0fc56be5 */ jal bgLoadFile /* f15c104: 24a50004 */ addiu $a1,$a1,0x4 /* f15c108: 02002025 */ or $a0,$s0,$zero /* f15c10c: 8fa5008c */ lw $a1,0x8c($sp) -/* f15c110: 0fc575d9 */ jal 0xf15d764 +/* f15c110: 0fc575d9 */ jal bgInflate /* f15c114: 02203025 */ or $a2,$s1,$zero /* f15c118: 8e6302bc */ lw $v1,0x2bc($s3) /* f15c11c: 8fb0008c */ lw $s0,0x8c($sp) @@ -5812,7 +5812,7 @@ glabel var7f1b75d0 /* f15c2c8: 460e7102 */ mul.s $f4,$f14,$f14 /* f15c2cc: 46045200 */ add.s $f8,$f10,$f4 /* f15c2d0: 46000482 */ mul.s $f18,$f0,$f0 -/* f15c2d4: 0c012974 */ jal 0x4a5d0 +/* f15c2d4: 0c012974 */ jal sqrtf /* f15c2d8: 46089300 */ add.s $f12,$f18,$f8 /* f15c2dc: 3c013f00 */ lui $at,0x3f00 /* f15c2e0: 44818000 */ mtc1 $at,$f16 @@ -5888,7 +5888,7 @@ glabel var7f1b75d0 .L0f15c3e4: /* f15c3e4: 8fa4008c */ lw $a0,0x8c($sp) /* f15c3e8: 00002825 */ or $a1,$zero,$zero -/* f15c3ec: 0c00490c */ jal 0x12430 +/* f15c3ec: 0c00490c */ jal memReallocate /* f15c3f0: 24060004 */ addiu $a2,$zero,0x4 /* f15c3f4: 8fd102bc */ lw $s1,0x2bc($s8) /* f15c3f8: 24140001 */ addiu $s4,$zero,0x1 @@ -5896,7 +5896,7 @@ glabel var7f1b75d0 /* f15c400: 5420000a */ bnezl $at,.L0f15c42c /* f15c404: 2a210002 */ slti $at,$s1,0x2 .L0f15c408: -/* f15c408: 0fc004f2 */ jal 0xf0013c8 +/* f15c408: 0fc004f2 */ jal roomInitLights /* f15c40c: 02802025 */ or $a0,$s4,$zero /* f15c410: 8fd102bc */ lw $s1,0x2bc($s8) /* f15c414: 26940001 */ addiu $s4,$s4,0x1 @@ -5927,7 +5927,7 @@ glabel var7f1b75d0 /* f15c46c: 2484000f */ addiu $a0,$a0,0xf /* f15c470: 348f000f */ ori $t7,$a0,0xf /* f15c474: 39e4000f */ xori $a0,$t7,0xf -/* f15c478: 0c0048f2 */ jal 0x123c8 +/* f15c478: 0c0048f2 */ jal malloc /* f15c47c: 24050004 */ addiu $a1,$zero,0x4 /* f15c480: 3c03800a */ lui $v1,%hi(var800a41a0) /* f15c484: 246341a0 */ addiu $v1,$v1,%lo(var800a41a0) @@ -5961,7 +5961,7 @@ glabel var7f1b75d0 /* f15c4e8: 1300000a */ beqz $t8,.L0f15c514 /* f15c4ec: 00000000 */ nop .L0f15c4f0: -/* f15c4f0: 0fc5921d */ jal 0xf164874 +/* f15c4f0: 0fc5921d */ jal func0f164ab8 /* f15c4f4: 02802025 */ or $a0,$s4,$zero /* f15c4f8: 8eee0000 */ lw $t6,0x0($s7) /* f15c4fc: 26520008 */ addiu $s2,$s2,0x8 @@ -5979,7 +5979,7 @@ glabel var7f1b75d0 /* f15c528: 5420000a */ bnezl $at,.L0f15c554 /* f15c52c: 2a210002 */ slti $at,$s1,0x2 .L0f15c530: -/* f15c530: 0fc59288 */ jal 0xf164a20 +/* f15c530: 0fc59288 */ jal func0f164c64 /* f15c534: 02802025 */ or $a0,$s4,$zero /* f15c538: 8e1102bc */ lw $s1,0x2bc($s0) /* f15c53c: 26940001 */ addiu $s4,$s4,0x1 @@ -5992,7 +5992,7 @@ glabel var7f1b75d0 /* f15c554: 54200009 */ bnezl $at,.L0f15c57c /* f15c558: 8ef00000 */ lw $s0,0x0($s7) .L0f15c55c: -/* f15c55c: 0fc591a2 */ jal 0xf164688 +/* f15c55c: 0fc591a2 */ jal func0f1648cc /* f15c560: 02802025 */ or $a0,$s4,$zero /* f15c564: 8e1802bc */ lw $t8,0x2bc($s0) /* f15c568: 26940001 */ addiu $s4,$s4,0x1 @@ -6017,15 +6017,15 @@ glabel var7f1b75d0 /* f15c5ac: 55c0fff9 */ bnezl $t6,.L0f15c594 /* f15c5b0: 90590006 */ lbu $t9,0x6($v0) .L0f15c5b4: -/* f15c5b4: 0fc59729 */ jal 0xf165ca4 +/* f15c5b4: 0fc59729 */ jal func0f165ee4 /* f15c5b8: 8fa40148 */ lw $a0,0x148($sp) /* f15c5bc: 241900c8 */ addiu $t9,$zero,0xc8 /* f15c5c0: 3c018008 */ lui $at,%hi(var8007fc10) -/* f15c5c4: 0fc04d54 */ jal 0xf013550 +/* f15c5c4: 0fc04d54 */ jal func0f013550 /* f15c5c8: a439fc10 */ sh $t9,%lo(var8007fc10)($at) -/* f15c5cc: 0fc00aa6 */ jal 0xf002a98 +/* f15c5cc: 0fc00aa6 */ jal func0f002a98 /* f15c5d0: 00000000 */ nop -/* f15c5d4: 0fc00703 */ jal 0xf001c0c +/* f15c5d4: 0fc00703 */ jal func0f001c0c /* f15c5d8: 00000000 */ nop /* f15c5dc: 8fbf003c */ lw $ra,0x3c($sp) /* f15c5e0: 8fb00018 */ lw $s0,0x18($sp) diff --git a/src/game/sight.c b/src/game/sight.c index d67ff8f01..465d6b65f 100644 --- a/src/game/sight.c +++ b/src/game/sight.c @@ -1978,7 +1978,7 @@ glabel var7f1af0ccpf /* f0d8fdc: 02002025 */ move $a0,$s0 /* f0d8fe0: 440f3000 */ mfc1 $t7,$f6 /* f0d8fe4: afb900cc */ sw $t9,0xcc($sp) -/* f0d8fe8: 0fc5513c */ jal 0xf1544f0 +/* f0d8fe8: 0fc5513c */ jal gfxSetPrimColour /* f0d8fec: afaf00c8 */ sw $t7,0xc8($sp) /* f0d8ff0: 3c038008 */ lui $v1,0x8008 /* f0d8ff4: 8fab00d4 */ lw $t3,0xd4($sp) @@ -2044,10 +2044,10 @@ glabel var7f1af0ccpf /* f0d90e4: 31d803ff */ andi $t8,$t6,0x3ff /* f0d90e8: 0018cb80 */ sll $t9,$t8,0xe /* f0d90ec: 03297825 */ or $t7,$t9,$t1 -/* f0d90f0: 0fc55153 */ jal 0xf15454c +/* f0d90f0: 0fc55153 */ jal func0f153838 /* f0d90f4: ac4f0014 */ sw $t7,0x14($v0) /* f0d90f8: 00402025 */ move $a0,$v0 -/* f0d90fc: 0fc5513c */ jal 0xf1544f0 +/* f0d90fc: 0fc5513c */ jal gfxSetPrimColour /* f0d9100: 8fa500e4 */ lw $a1,0xe4($sp) /* f0d9104: 8fb800dc */ lw $t8,0xdc($sp) /* f0d9108: 8fb900c8 */ lw $t9,0xc8($sp) @@ -2298,7 +2298,7 @@ glabel var7f1af0ccpf /* f0d94dc: 332f03ff */ andi $t7,$t9,0x3ff /* f0d94e0: 000f7380 */ sll $t6,$t7,0xe /* f0d94e4: 01dfc025 */ or $t8,$t6,$ra -/* f0d94e8: 0fc55153 */ jal 0xf15454c +/* f0d94e8: 0fc55153 */ jal func0f153838 /* f0d94ec: ac580004 */ sw $t8,0x4($v0) /* f0d94f0: 8fbf004c */ lw $ra,0x4c($sp) /* f0d94f4: d7b40018 */ ldc1 $f20,0x18($sp) diff --git a/src/game/sparks/sparks.c b/src/game/sparks/sparks.c index c3cb24c1a..1bee26c40 100644 --- a/src/game/sparks/sparks.c +++ b/src/game/sparks/sparks.c @@ -129,7 +129,7 @@ glabel func0f12f6c0 /* f130254: e6000004 */ swc1 $f0,0x4($s0) /* f130258: e6000008 */ swc1 $f0,0x8($s0) /* f13025c: 00a08825 */ move $s1,$a1 -/* f130260: 0c004ad4 */ jal 0x12b50 +/* f130260: 0c004ad4 */ jal random /* f130264: e7a00020 */ swc1 $f0,0x20($sp) /* f130268: 96230000 */ lhu $v1,0x0($s1) /* f13026c: c7ae0020 */ lwc1 $f14,0x20($sp) @@ -144,7 +144,7 @@ glabel func0f12f6c0 /* f130290: 0007000d */ break 0x7 .PF0f130294: /* f130294: 468021a0 */ cvt.s.w $f6,$f4 -/* f130298: 0c004ad4 */ jal 0x12b50 +/* f130298: 0c004ad4 */ jal random /* f13029c: e606000c */ swc1 $f6,0xc($s0) /* f1302a0: 96230000 */ lhu $v1,0x0($s1) /* f1302a4: c7ae0020 */ lwc1 $f14,0x20($sp) @@ -159,7 +159,7 @@ glabel func0f12f6c0 /* f1302c8: 0007000d */ break 0x7 .PF0f1302cc: /* f1302cc: 468042a0 */ cvt.s.w $f10,$f8 -/* f1302d0: 0c004ad4 */ jal 0x12b50 +/* f1302d0: 0c004ad4 */ jal random /* f1302d4: e60a0010 */ swc1 $f10,0x10($s0) /* f1302d8: 96230000 */ lhu $v1,0x0($s1) /* f1302dc: c6100010 */ lwc1 $f16,0x10($s0) @@ -212,7 +212,7 @@ glabel func0f12f6c0 /* f130384: 46108482 */ mul.s $f18,$f16,$f16 /* f130388: 46125100 */ add.s $f4,$f10,$f18 /* f13038c: 46000182 */ mul.s $f6,$f0,$f0 -/* f130390: 0c0127b4 */ jal 0x49ed0 +/* f130390: 0c0127b4 */ jal sqrtf /* f130394: 46043300 */ add.s $f12,$f6,$f4 /* f130398: c7ae0020 */ lwc1 $f14,0x20($sp) /* f13039c: c608000c */ lwc1 $f8,0xc($s0) @@ -276,7 +276,7 @@ glabel func0f12f6c0 /* f13047c: 318d0001 */ andi $t5,$t4,0x1 /* f130480: 51a0000d */ beqzl $t5,.PF0f1304b8 /* f130484: 96380010 */ lhu $t8,0x10($s1) -/* f130488: 0c004ad4 */ jal 0x12b50 +/* f130488: 0c004ad4 */ jal random /* f13048c: 00000000 */ nop /* f130490: 962e0010 */ lhu $t6,0x10($s1) /* f130494: 004e001b */ divu $zero,$v0,$t6 diff --git a/src/game/title.c b/src/game/title.c index 8d6b88594..e4a079f35 100644 --- a/src/game/title.c +++ b/src/game/title.c @@ -603,10 +603,10 @@ glabel var7f1a83e4 /* f016780: 8d8c23fc */ lw $t4,0x23fc($t4) /* f016784: 51800196 */ beqzl $t4,.PF0f016de0 /* f016788: 8fbf005c */ lw $ra,0x5c($sp) -/* f01678c: 0fc06c2c */ jal 0xf01b0b0 +/* f01678c: 0fc06c2c */ jal func0f01afc0 /* f016790: 8fa40130 */ lw $a0,0x130($sp) /* f016794: afa20130 */ sw $v0,0x130($sp) -/* f016798: 0fc550cf */ jal 0xf15433c +/* f016798: 0fc550cf */ jal func0f153628 /* f01679c: 00402025 */ move $a0,$v0 /* f0167a0: 3c0d8006 */ lui $t5,0x8006 /* f0167a4: 3c118006 */ lui $s1,0x8006 @@ -679,9 +679,9 @@ glabel var7f1a83e4 /* f01689c: 24010003 */ li $at,0x3 /* f0168a0: 54610015 */ bnel $v1,$at,.PF0f0168f8 /* f0168a4: 24010004 */ li $at,0x4 -/* f0168a8: 0fc55125 */ jal 0xf154494 +/* f0168a8: 0fc55125 */ jal func0f153780 /* f0168ac: 8fa40130 */ lw $a0,0x130($sp) -/* f0168b0: 0c002e53 */ jal 0xb94c +/* f0168b0: 0c002e53 */ jal viGetWidth /* f0168b4: afa20130 */ sw $v0,0x130($sp) /* f0168b8: 86260002 */ lh $a2,0x2($s1) /* f0168bc: 3c0c7f7f */ lui $t4,0x7f7f @@ -691,10 +691,10 @@ glabel var7f1a83e4 /* f0168cc: afae0010 */ sw $t6,0x10($sp) /* f0168d0: afac0014 */ sw $t4,0x14($sp) /* f0168d4: 8fa40130 */ lw $a0,0x130($sp) -/* f0168d8: 0fc551d2 */ jal 0xf154748 +/* f0168d8: 0fc551d2 */ jal func0f153a34 /* f0168dc: 00403825 */ move $a3,$v0 /* f0168e0: afa20130 */ sw $v0,0x130($sp) -/* f0168e4: 0fc550cf */ jal 0xf15433c +/* f0168e4: 0fc550cf */ jal func0f153628 /* f0168e8: 00402025 */ move $a0,$v0 /* f0168ec: 10000133 */ b .PF0f016dbc /* f0168f0: afa20130 */ sw $v0,0x130($sp) @@ -702,7 +702,7 @@ glabel var7f1a83e4 .PF0f0168f8: /* f0168f8: 54610075 */ bnel $v1,$at,.PF0f016ad0 /* f0168fc: 24010007 */ li $at,0x7 -/* f016900: 0fc55125 */ jal 0xf154494 +/* f016900: 0fc55125 */ jal func0f153780 /* f016904: 8fa40130 */ lw $a0,0x130($sp) /* f016908: 244d0008 */ addiu $t5,$v0,0x8 /* f01690c: afad0130 */ sw $t5,0x130($sp) @@ -748,7 +748,7 @@ glabel var7f1a83e4 /* f0169ac: 27a40130 */ addiu $a0,$sp,0x130 /* f0169b0: 24060001 */ li $a2,0x1 /* f0169b4: 00003825 */ move $a3,$zero -/* f0169b8: 0fc2cfb8 */ jal 0xf0b3ee0 +/* f0169b8: 0fc2cfb8 */ jal func0f0b39c0 /* f0169bc: 24a50234 */ addiu $a1,$a1,0x234 /* f0169c0: 8fab0130 */ lw $t3,0x130($sp) /* f0169c4: 3c0eba00 */ lui $t6,0xba00 @@ -813,7 +813,7 @@ glabel var7f1a83e4 /* f016ab0: 3c0eb300 */ lui $t6,0xb300 /* f016ab4: af0e0000 */ sw $t6,0x0($t8) /* f016ab8: af0d0004 */ sw $t5,0x4($t8) -/* f016abc: 0fc550cf */ jal 0xf15433c +/* f016abc: 0fc550cf */ jal func0f153628 /* f016ac0: 8fa40130 */ lw $a0,0x130($sp) /* f016ac4: 100000bd */ b .PF0f016dbc /* f016ac8: afa20130 */ sw $v0,0x130($sp) @@ -821,7 +821,7 @@ glabel var7f1a83e4 .PF0f016ad0: /* f016ad0: 54610075 */ bnel $v1,$at,.PF0f016ca8 /* f016ad4: 86230000 */ lh $v1,0x0($s1) -/* f016ad8: 0fc55125 */ jal 0xf154494 +/* f016ad8: 0fc55125 */ jal func0f153780 /* f016adc: 8fa40130 */ lw $a0,0x130($sp) /* f016ae0: 24590008 */ addiu $t9,$v0,0x8 /* f016ae4: afb90130 */ sw $t9,0x130($sp) @@ -867,7 +867,7 @@ glabel var7f1a83e4 /* f016b84: 27a40130 */ addiu $a0,$sp,0x130 /* f016b88: 24060001 */ li $a2,0x1 /* f016b8c: 00003825 */ move $a3,$zero -/* f016b90: 0fc2cfb8 */ jal 0xf0b3ee0 +/* f016b90: 0fc2cfb8 */ jal func0f0b39c0 /* f016b94: 24a5024c */ addiu $a1,$a1,0x24c /* f016b98: 8fb80130 */ lw $t8,0x130($sp) /* f016b9c: 3c0eba00 */ lui $t6,0xba00 @@ -932,7 +932,7 @@ glabel var7f1a83e4 /* f016c88: 3c0eb300 */ lui $t6,0xb300 /* f016c8c: ad6e0000 */ sw $t6,0x0($t3) /* f016c90: ad790004 */ sw $t9,0x4($t3) -/* f016c94: 0fc550cf */ jal 0xf15433c +/* f016c94: 0fc550cf */ jal func0f153628 /* f016c98: 8fa40130 */ lw $a0,0x130($sp) /* f016c9c: 10000047 */ b .PF0f016dbc /* f016ca0: afa20130 */ sw $v0,0x130($sp) @@ -948,13 +948,13 @@ glabel var7f1a83e4 /* f016cc0: 862c0002 */ lh $t4,0x2($s1) /* f016cc4: 258dffff */ addiu $t5,$t4,-1 /* f016cc8: afad00dc */ sw $t5,0xdc($sp) -/* f016ccc: 0fc5bdaa */ jal 0xf16f6a8 +/* f016ccc: 0fc5bdaa */ jal langGet /* f016cd0: 9624000a */ lhu $a0,0xa($s1) -/* f016cd4: 0c002e53 */ jal 0xb94c +/* f016cd4: 0c002e53 */ jal viGetWidth /* f016cd8: 00409025 */ move $s2,$v0 /* f016cdc: 00028400 */ sll $s0,$v0,0x10 /* f016ce0: 0010c403 */ sra $t8,$s0,0x10 -/* f016ce4: 0c002e57 */ jal 0xb95c +/* f016ce4: 0c002e57 */ jal viGetHeight /* f016ce8: 03008025 */ move $s0,$t8 /* f016cec: 2401ff00 */ li $at,-256 /* f016cf0: 02a15824 */ and $t3,$s5,$at @@ -974,7 +974,7 @@ glabel var7f1a83e4 /* f016d28: afb0001c */ sw $s0,0x1c($sp) /* f016d2c: afa20020 */ sw $v0,0x20($sp) /* f016d30: afa00024 */ sw $zero,0x24($sp) -/* f016d34: 0fc55c50 */ jal 0xf157140 +/* f016d34: 0fc55c50 */ jal textRenderProjected /* f016d38: afa00028 */ sw $zero,0x28($sp) /* f016d3c: afa20130 */ sw $v0,0x130($sp) /* f016d40: 86230000 */ lh $v1,0x0($s1) @@ -987,13 +987,13 @@ glabel var7f1a83e4 .PF0f016d5c: /* f016d5c: 862d0002 */ lh $t5,0x2($s1) /* f016d60: afad00dc */ sw $t5,0xdc($sp) -/* f016d64: 0fc5bdaa */ jal 0xf16f6a8 +/* f016d64: 0fc5bdaa */ jal langGet /* f016d68: 9624000a */ lhu $a0,0xa($s1) -/* f016d6c: 0c002e53 */ jal 0xb94c +/* f016d6c: 0c002e53 */ jal viGetWidth /* f016d70: 00409025 */ move $s2,$v0 /* f016d74: 00028400 */ sll $s0,$v0,0x10 /* f016d78: 0010c403 */ sra $t8,$s0,0x10 -/* f016d7c: 0c002e57 */ jal 0xb95c +/* f016d7c: 0c002e57 */ jal viGetHeight /* f016d80: 03008025 */ move $s0,$t8 /* f016d84: 8fa40130 */ lw $a0,0x130($sp) /* f016d88: 27a500e0 */ addiu $a1,$sp,0xe0 @@ -1005,7 +1005,7 @@ glabel var7f1a83e4 /* f016da0: afb0001c */ sw $s0,0x1c($sp) /* f016da4: afa20020 */ sw $v0,0x20($sp) /* f016da8: afa00024 */ sw $zero,0x24($sp) -/* f016dac: 0fc55c50 */ jal 0xf157140 +/* f016dac: 0fc55c50 */ jal textRenderProjected /* f016db0: afa00028 */ sw $zero,0x28($sp) /* f016db4: afa20130 */ sw $v0,0x130($sp) /* f016db8: 8fb600e0 */ lw $s6,0xe0($sp) @@ -1015,7 +1015,7 @@ glabel var7f1a83e4 /* f016dc4: 022f082b */ sltu $at,$s1,$t7 /* f016dc8: 5420fe80 */ bnezl $at,.PF0f0167cc /* f016dcc: 86230008 */ lh $v1,0x8($s1) -/* f016dd0: 0fc55125 */ jal 0xf154494 +/* f016dd0: 0fc55125 */ jal func0f153780 /* f016dd4: 8fa40130 */ lw $a0,0x130($sp) /* f016dd8: afa20130 */ sw $v0,0x130($sp) /* f016ddc: 8fbf005c */ lw $ra,0x5c($sp) @@ -2664,7 +2664,7 @@ glabel var7f1a8468 /* f017e08: 44051000 */ mfc1 $a1,$f2 /* f017e0c: 44070000 */ mfc1 $a3,$f0 /* f017e10: e7a00010 */ swc1 $f0,0x10($sp) -/* f017e14: 0fc1b6e5 */ jal 0xf06db94 +/* f017e14: 0fc1b6e5 */ jal func0f06d90c /* f017e18: e7aa0014 */ swc1 $f10,0x14($sp) /* f017e1c: 3c028006 */ lui $v0,0x8006 /* f017e20: 3c0b8006 */ lui $t3,0x8006 @@ -2849,7 +2849,7 @@ glabel var7f1a8468 /* f0180b0: 44059000 */ mfc1 $a1,$f18 /* f0180b4: 44070000 */ mfc1 $a3,$f0 /* f0180b8: e7a00010 */ swc1 $f0,0x10($sp) -/* f0180bc: 0fc1b762 */ jal 0xf06dd88 +/* f0180bc: 0fc1b762 */ jal func0f06db00 /* f0180c0: e7a60014 */ swc1 $f6,0x14($sp) /* f0180c4: 3c017f1b */ lui $at,0x7f1b /* f0180c8: c42c9654 */ lwc1 $f12,-0x69ac($at) @@ -3114,9 +3114,9 @@ glabel var7f1a8468 .PF0f018490: /* f018490: 8fa40330 */ lw $a0,0x330($sp) .PF0f018494: -/* f018494: 0c002f12 */ jal 0xbc48 +/* f018494: 0c002f12 */ jal func0000bf04 /* f018498: 00002825 */ move $a1,$zero -/* f01849c: 0c002c02 */ jal 0xb008 +/* f01849c: 0c002c02 */ jal func0000b2c4 /* f0184a0: 00402025 */ move $a0,$v0 /* f0184a4: 3c188006 */ lui $t8,0x8006 /* f0184a8: 8f18249c */ lw $t8,0x249c($t8) @@ -3127,7 +3127,7 @@ glabel var7f1a8468 /* f0184bc: 10000272 */ b .PF0f018e88 /* f0184c0: 8fbf0034 */ lw $ra,0x34($sp) .PF0f0184c4: -/* f0184c4: 0fc5a24c */ jal 0xf168930 +/* f0184c4: 0fc5a24c */ jal gfxAllocate4Words /* f0184c8: afa30330 */ sw $v1,0x330($sp) /* f0184cc: 44809000 */ mtc1 $zero,$f18 /* f0184d0: 3c01457a */ lui $at,0x457a @@ -3145,7 +3145,7 @@ glabel var7f1a8468 /* f018500: e7b20020 */ swc1 $f18,0x20($sp) /* f018504: e7b20028 */ swc1 $f18,0x28($sp) /* f018508: e7a40010 */ swc1 $f4,0x10($sp) -/* f01850c: 0c0011b7 */ jal 0x46dc +/* f01850c: 0c0011b7 */ jal guLookAtReflect /* f018510: e7a80024 */ swc1 $f8,0x24($sp) /* f018514: 8fa30330 */ lw $v1,0x330($sp) /* f018518: 3c017f1b */ lui $at,0x7f1b @@ -3193,10 +3193,10 @@ glabel var7f1a8468 /* f0185c0: a0a20008 */ sb $v0,0x8($a1) /* f0185c4: e7ac00e4 */ swc1 $f12,0xe4($sp) /* f0185c8: e7b000e0 */ swc1 $f16,0xe0($sp) -/* f0185cc: 0c00685b */ jal 0x1a16c +/* f0185cc: 0c00685b */ jal sinf /* f0185d0: afa60330 */ sw $a2,0x330($sp) /* f0185d4: e7a00050 */ swc1 $f0,0x50($sp) -/* f0185d8: 0c006858 */ jal 0x1a160 +/* f0185d8: 0c006858 */ jal cosf /* f0185dc: c7ac00e0 */ lwc1 $f12,0xe0($sp) /* f0185e0: 3c0142fe */ lui $at,0x42fe /* f0185e4: 44813000 */ mtc1 $at,$f6 @@ -3208,7 +3208,7 @@ glabel var7f1a8468 /* f0185fc: 46080282 */ mul.s $f10,$f0,$f8 /* f018600: 4600518d */ trunc.w.s $f6,$f10 /* f018604: 440f3000 */ mfc1 $t7,$f6 -/* f018608: 0c00685b */ jal 0x1a16c +/* f018608: 0c00685b */ jal sinf /* f01860c: a02f2258 */ sb $t7,0x2258($at) /* f018610: 3c0142fe */ lui $at,0x42fe /* f018614: 44812000 */ mtc1 $at,$f4 @@ -3217,10 +3217,10 @@ glabel var7f1a8468 /* f018620: 46040202 */ mul.s $f8,$f0,$f4 /* f018624: 4600428d */ trunc.w.s $f10,$f8 /* f018628: 44185000 */ mfc1 $t8,$f10 -/* f01862c: 0c006858 */ jal 0x1a160 +/* f01862c: 0c006858 */ jal cosf /* f018630: a0382259 */ sb $t8,0x2259($at) /* f018634: e7a00050 */ swc1 $f0,0x50($sp) -/* f018638: 0c006858 */ jal 0x1a160 +/* f018638: 0c006858 */ jal cosf /* f01863c: c7ac00e0 */ lwc1 $f12,0xe0($sp) /* f018640: 3c0142fe */ lui $at,0x42fe /* f018644: 44813000 */ mtc1 $at,$f6 @@ -3244,7 +3244,7 @@ glabel var7f1a8468 /* f01868c: a02f225a */ sb $t7,0x225a($at) /* f018690: 3c013f80 */ lui $at,0x3f80 /* f018694: 44812000 */ mtc1 $at,$f4 -/* f018698: 0c005a1d */ jal 0x16874 +/* f018698: 0c005a1d */ jal func00016ae4 /* f01869c: e7a40020 */ swc1 $f4,0x20($sp) /* f0186a0: 3c0e8006 */ lui $t6,0x8006 /* f0186a4: 8dce2490 */ lw $t6,0x2490($t6) @@ -3261,22 +3261,22 @@ glabel var7f1a8468 /* f0186cc: afb9022c */ sw $t9,0x22c($sp) .PF0f0186d0: /* f0186d0: 3c018006 */ lui $at,0x8006 -/* f0186d4: 0c005841 */ jal 0x16104 +/* f0186d4: 0c005841 */ jal func00016374 /* f0186d8: c42c2478 */ lwc1 $f12,0x2478($at) /* f0186dc: 3c018006 */ lui $at,0x8006 /* f0186e0: c42c2480 */ lwc1 $f12,0x2480($at) -/* f0186e4: 0c00581e */ jal 0x16078 +/* f0186e4: 0c00581e */ jal func000162e8 /* f0186e8: 27a501a8 */ addiu $a1,$sp,0x1a8 /* f0186ec: 27a401a8 */ addiu $a0,$sp,0x1a8 -/* f0186f0: 0c0055e3 */ jal 0x1578c +/* f0186f0: 0c0055e3 */ jal func000159fc /* f0186f4: 27a501e8 */ addiu $a1,$sp,0x1e8 /* f0186f8: 27a402b0 */ addiu $a0,$sp,0x2b0 /* f0186fc: 27a501e8 */ addiu $a1,$sp,0x1e8 -/* f018700: 0c0055e4 */ jal 0x15790 +/* f018700: 0c0055e4 */ jal func00015a00 /* f018704: 27a60270 */ addiu $a2,$sp,0x270 /* f018708: 3c018006 */ lui $at,0x8006 /* f01870c: c42c2488 */ lwc1 $f12,0x2488($at) -/* f018710: 0c005725 */ jal 0x15c94 +/* f018710: 0c005725 */ jal func00015f04 /* f018714: 27a50270 */ addiu $a1,$sp,0x270 /* f018718: 3c01437f */ lui $at,0x437f /* f01871c: 44814000 */ mtc1 $at,$f8 @@ -3330,7 +3330,7 @@ glabel var7f1a8468 /* f0187d0: a0620000 */ sb $v0,0x0($v1) /* f0187d4: afa000dc */ sw $zero,0xdc($sp) /* f0187d8: afa000d8 */ sw $zero,0xd8($sp) -/* f0187dc: 0c0069ab */ jal 0x1a6ac +/* f0187dc: 0c0069ab */ jal modelGetPart /* f0187e0: 8f040008 */ lw $a0,0x8($t8) /* f0187e4: 10400027 */ beqz $v0,.PF0f018884 /* f0187e8: 00402825 */ move $a1,$v0 @@ -3342,10 +3342,10 @@ glabel var7f1a8468 /* f018800: 94ce0016 */ lhu $t6,0x16($a2) /* f018804: afa60164 */ sw $a2,0x164($sp) /* f018808: 25d80001 */ addiu $t8,$t6,0x1 -/* f01880c: 0c0069eb */ jal 0x1a7ac +/* f01880c: 0c0069eb */ jal modelGetNodeData /* f018810: afb800d8 */ sw $t8,0xd8($sp) /* f018814: afa20160 */ sw $v0,0x160($sp) -/* f018818: 0fc5a25d */ jal 0xf168974 +/* f018818: 0fc5a25d */ jal gfxAllocate /* f01881c: 24040028 */ li $a0,0x28 /* f018820: 8fb90160 */ lw $t9,0x160($sp) /* f018824: 8fa60164 */ lw $a2,0x164($sp) @@ -3375,7 +3375,7 @@ glabel var7f1a8468 .PF0f018884: /* f018884: 8faf022c */ lw $t7,0x22c($sp) /* f018888: 24050004 */ li $a1,0x4 -/* f01888c: 0c0069ab */ jal 0x1a6ac +/* f01888c: 0c0069ab */ jal modelGetPart /* f018890: 8de40008 */ lw $a0,0x8($t7) /* f018894: 10400037 */ beqz $v0,.PF0f018974 /* f018898: 00402825 */ move $a1,$v0 @@ -3391,10 +3391,10 @@ glabel var7f1a8468 /* f0188c0: afa60164 */ sw $a2,0x164($sp) /* f0188c4: 01d8c821 */ addu $t9,$t6,$t8 /* f0188c8: 272f0001 */ addiu $t7,$t9,0x1 -/* f0188cc: 0c0069eb */ jal 0x1a7ac +/* f0188cc: 0c0069eb */ jal modelGetNodeData /* f0188d0: afaf00d8 */ sw $t7,0xd8($sp) /* f0188d4: afa20160 */ sw $v0,0x160($sp) -/* f0188d8: 0fc5a25d */ jal 0xf168974 +/* f0188d8: 0fc5a25d */ jal gfxAllocate /* f0188dc: 24040028 */ li $a0,0x28 /* f0188e0: 8fae0160 */ lw $t6,0x160($sp) /* f0188e4: 8fa60164 */ lw $a2,0x164($sp) @@ -3437,7 +3437,7 @@ glabel var7f1a8468 .PF0f018974: /* f018974: 8fb9022c */ lw $t9,0x22c($sp) /* f018978: 24050006 */ li $a1,0x6 -/* f01897c: 0c0069ab */ jal 0x1a6ac +/* f01897c: 0c0069ab */ jal modelGetPart /* f018980: 8f240008 */ lw $a0,0x8($t9) /* f018984: 10400037 */ beqz $v0,.PF0f018a64 /* f018988: 00402825 */ move $a1,$v0 @@ -3453,10 +3453,10 @@ glabel var7f1a8468 /* f0189b0: afa60164 */ sw $a2,0x164($sp) /* f0189b4: 01eec021 */ addu $t8,$t7,$t6 /* f0189b8: 27190001 */ addiu $t9,$t8,0x1 -/* f0189bc: 0c0069eb */ jal 0x1a7ac +/* f0189bc: 0c0069eb */ jal modelGetNodeData /* f0189c0: afb900d8 */ sw $t9,0xd8($sp) /* f0189c4: afa20160 */ sw $v0,0x160($sp) -/* f0189c8: 0fc5a25d */ jal 0xf168974 +/* f0189c8: 0fc5a25d */ jal gfxAllocate /* f0189cc: 24040028 */ li $a0,0x28 /* f0189d0: 8faf0160 */ lw $t7,0x160($sp) /* f0189d4: 8fa60164 */ lw $a2,0x164($sp) @@ -3499,7 +3499,7 @@ glabel var7f1a8468 .PF0f018a64: /* f018a64: 8fb8022c */ lw $t8,0x22c($sp) /* f018a68: 24050008 */ li $a1,0x8 -/* f018a6c: 0c0069ab */ jal 0x1a6ac +/* f018a6c: 0c0069ab */ jal modelGetPart /* f018a70: 8f040008 */ lw $a0,0x8($t8) /* f018a74: 10400037 */ beqz $v0,.PF0f018b54 /* f018a78: 00402825 */ move $a1,$v0 @@ -3515,10 +3515,10 @@ glabel var7f1a8468 /* f018aa0: afa60164 */ sw $a2,0x164($sp) /* f018aa4: 032f7021 */ addu $t6,$t9,$t7 /* f018aa8: 25d80001 */ addiu $t8,$t6,0x1 -/* f018aac: 0c0069eb */ jal 0x1a7ac +/* f018aac: 0c0069eb */ jal modelGetNodeData /* f018ab0: afb800d8 */ sw $t8,0xd8($sp) /* f018ab4: afa20160 */ sw $v0,0x160($sp) -/* f018ab8: 0fc5a25d */ jal 0xf168974 +/* f018ab8: 0fc5a25d */ jal gfxAllocate /* f018abc: 24040028 */ li $a0,0x28 /* f018ac0: 8fb90160 */ lw $t9,0x160($sp) /* f018ac4: 8fa60164 */ lw $a2,0x164($sp) @@ -3559,10 +3559,10 @@ glabel var7f1a8468 /* f018b4c: ac4f0000 */ sw $t7,0x0($v0) /* f018b50: ac400004 */ sw $zero,0x4($v0) .PF0f018b54: -/* f018b54: 0fc5a239 */ jal 0xf1688e4 +/* f018b54: 0fc5a239 */ jal gfxAllocateVertices /* f018b58: 8fa400dc */ lw $a0,0xdc($sp) /* f018b5c: afa20044 */ sw $v0,0x44($sp) -/* f018b60: 0fc5a253 */ jal 0xf16894c +/* f018b60: 0fc5a253 */ jal gfxAllocateColours /* f018b64: 8fa400d8 */ lw $a0,0xd8($sp) /* f018b68: 3c013f80 */ lui $at,0x3f80 /* f018b6c: 44812000 */ mtc1 $at,$f4 @@ -3579,7 +3579,7 @@ glabel var7f1a8468 /* f018b98: 8fa5022c */ lw $a1,0x22c($sp) /* f018b9c: afa20020 */ sw $v0,0x20($sp) /* f018ba0: afb9001c */ sw $t9,0x1c($sp) -/* f018ba4: 0fc05cc9 */ jal 0xf017324 +/* f018ba4: 0fc05cc9 */ jal func0f017248 /* f018ba8: e7a40014 */ swc1 $f4,0x14($sp) /* f018bac: 3c0fbc00 */ lui $t7,0xbc00 /* f018bb0: 3c0e8000 */ lui $t6,0x8000 @@ -3610,21 +3610,21 @@ glabel var7f1a8468 /* f018c14: 8f2e0004 */ lw $t6,0x4($t9) /* f018c18: ac8e0004 */ sw $t6,0x4($a0) /* f018c1c: 8f210008 */ lw $at,0x8($t9) -/* f018c20: 0c00591b */ jal 0x1646c +/* f018c20: 0c00591b */ jal func000166dc /* f018c24: ac810008 */ sw $at,0x8($a0) /* f018c28: 3c013f80 */ lui $at,0x3f80 /* f018c2c: 44814000 */ mtc1 $at,$f8 /* f018c30: c7aa013c */ lwc1 $f10,0x13c($sp) /* f018c34: 27a501e8 */ addiu $a1,$sp,0x1e8 -/* f018c38: 0c005746 */ jal 0x15d18 +/* f018c38: 0c005746 */ jal func00015f88 /* f018c3c: 460a4300 */ add.s $f12,$f8,$f10 /* f018c40: 27a402b0 */ addiu $a0,$sp,0x2b0 /* f018c44: 27a501e8 */ addiu $a1,$sp,0x1e8 -/* f018c48: 0c0055e4 */ jal 0x15790 +/* f018c48: 0c0055e4 */ jal func00015a00 /* f018c4c: 27a60230 */ addiu $a2,$sp,0x230 /* f018c50: 3c017f1b */ lui $at,0x7f1b /* f018c54: c42c9678 */ lwc1 $f12,-0x6988($at) -/* f018c58: 0c005725 */ jal 0x15c94 +/* f018c58: 0c005725 */ jal func00015f04 /* f018c5c: 27a50230 */ addiu $a1,$sp,0x230 /* f018c60: 3c028006 */ lui $v0,0x8006 /* f018c64: 8c4224c8 */ lw $v0,0x24c8($v0) @@ -3662,7 +3662,7 @@ glabel var7f1a8468 /* f018ce0: e7a00014 */ swc1 $f0,0x14($sp) /* f018ce4: afa30018 */ sw $v1,0x18($sp) /* f018ce8: afae0020 */ sw $t6,0x20($sp) -/* f018cec: 0fc05cc9 */ jal 0xf017324 +/* f018cec: 0fc05cc9 */ jal func0f017248 /* f018cf0: afb9001c */ sw $t9,0x1c($sp) /* f018cf4: 10000062 */ b .PF0f018e80 /* f018cf8: afa20330 */ sw $v0,0x330($sp) @@ -3701,7 +3701,7 @@ glabel var7f1a8468 /* f018d74: afa30018 */ sw $v1,0x18($sp) /* f018d78: afae0020 */ sw $t6,0x20($sp) /* f018d7c: afb9001c */ sw $t9,0x1c($sp) -/* f018d80: 0fc05cc9 */ jal 0xf017324 +/* f018d80: 0fc05cc9 */ jal func0f017248 /* f018d84: e7a60014 */ swc1 $f6,0x14($sp) /* f018d88: 1000003d */ b .PF0f018e80 /* f018d8c: afa20330 */ sw $v0,0x330($sp) @@ -3739,7 +3739,7 @@ glabel var7f1a8468 /* f018e04: afa30018 */ sw $v1,0x18($sp) /* f018e08: afae0020 */ sw $t6,0x20($sp) /* f018e0c: afb9001c */ sw $t9,0x1c($sp) -/* f018e10: 0fc05cc9 */ jal 0xf017324 +/* f018e10: 0fc05cc9 */ jal func0f017248 /* f018e14: e7a80014 */ swc1 $f8,0x14($sp) /* f018e18: 10000019 */ b .PF0f018e80 /* f018e1c: afa20330 */ sw $v0,0x330($sp) @@ -3765,7 +3765,7 @@ glabel var7f1a8468 /* f018e68: afa30018 */ sw $v1,0x18($sp) /* f018e6c: afae0020 */ sw $t6,0x20($sp) /* f018e70: e7aa0014 */ swc1 $f10,0x14($sp) -/* f018e74: 0fc05cc9 */ jal 0xf017324 +/* f018e74: 0fc05cc9 */ jal func0f017248 /* f018e78: afb9001c */ sw $t9,0x1c($sp) /* f018e7c: afa20330 */ sw $v0,0x330($sp) .PF0f018e80: diff --git a/src/game/training/training.c b/src/game/training/training.c index 8d0877d46..99d5cb06e 100644 --- a/src/game/training/training.c +++ b/src/game/training/training.c @@ -1249,7 +1249,7 @@ glabel var7f1b941c /* f19f238: 24020001 */ li $v0,0x1 /* f19f23c: 91040001 */ lbu $a0,0x1($t0) /* f19f240: afa8004c */ sw $t0,0x4c($sp) -/* f19f244: 0fc67a36 */ jal 0xf19e8d8 +/* f19f244: 0fc67a36 */ jal frResolveFrPad /* f19f248: afa30058 */ sw $v1,0x58($sp) /* f19f24c: 8fa30058 */ lw $v1,0x58($sp) /* f19f250: 00403825 */ move $a3,$v0 @@ -1270,7 +1270,7 @@ glabel var7f1b941c /* f19f288: 24050002 */ li $a1,0x2 /* f19f28c: 27a60070 */ addiu $a2,$sp,0x70 /* f19f290: afa30058 */ sw $v1,0x58($sp) -/* f19f294: 0fc45964 */ jal 0xf116590 +/* f19f294: 0fc45964 */ jal padUnpack /* f19f298: afa8004c */ sw $t0,0x4c($sp) /* f19f29c: 8fb900d0 */ lw $t9,0xd0($sp) /* f19f2a0: 3c0140c0 */ lui $at,0x40c0 @@ -1324,7 +1324,7 @@ glabel var7f1b941c /* f19f35c: e7a00024 */ swc1 $f0,0x24($sp) /* f19f360: e7a00030 */ swc1 $f0,0x30($sp) /* f19f364: e7a00034 */ swc1 $f0,0x34($sp) -/* f19f368: 0fc24e3a */ jal 0xf0938e8 +/* f19f368: 0fc24e3a */ jal func0f0939f8 /* f19f36c: e7a00038 */ swc1 $f0,0x38($sp) /* f19f370: 8fa8004c */ lw $t0,0x4c($sp) /* f19f374: 8fa30058 */ lw $v1,0x58($sp) @@ -2610,15 +2610,15 @@ glabel var7f1b94e4 /* f1a0afc: 00184f00 */ sll $t1,$t8,0x1c /* f1a0b00: 0520000b */ bltz $t1,.PF0f1a0b30 /* f1a0b04: 00000000 */ nop -/* f1a0b08: 0fc678da */ jal 0xf19e368 +/* f1a0b08: 0fc678da */ jal frGetWeaponBySlot /* f1a0b0c: 96a40456 */ lhu $a0,0x456($s5) -/* f1a0b10: 0fc449df */ jal 0xf11277c +/* f1a0b10: 0fc449df */ jal invHasSingleWeaponIncAllGuns /* f1a0b14: 00402025 */ move $a0,$v0 /* f1a0b18: 10400005 */ beqz $v0,.PF0f1a0b30 /* f1a0b1c: 00000000 */ nop -/* f1a0b20: 0fc678da */ jal 0xf19e368 +/* f1a0b20: 0fc678da */ jal frGetWeaponBySlot /* f1a0b24: 96a40456 */ lhu $a0,0x456($s5) -/* f1a0b28: 0fc28728 */ jal 0xf0a1ca0 +/* f1a0b28: 0fc28728 */ jal currentPlayerEquipWeapon /* f1a0b2c: 00402025 */ move $a0,$v0 .PF0f1a0b30: /* f1a0b30: 3c15800b */ lui $s5,0x800b @@ -2662,7 +2662,7 @@ glabel var7f1b94e4 /* f1a0bbc: 02602825 */ move $a1,$s3 /* f1a0bc0: 50800004 */ beqzl $a0,.PF0f1a0bd4 /* f1a0bc4: 2610003c */ addiu $s0,$s0,0x3c -/* f1a0bc8: 0fc2496f */ jal 0xf0925bc +/* f1a0bc8: 0fc2496f */ jal func0f0926bc /* f1a0bcc: 3406ffff */ li $a2,0xffff /* f1a0bd0: 2610003c */ addiu $s0,$s0,0x3c .PF0f1a0bd4: @@ -2684,16 +2684,16 @@ glabel var7f1b94e4 /* f1a0c10: 10000372 */ b .PF0f1a19dc /* f1a0c14: 8fbf007c */ lw $ra,0x7c($sp) .PF0f1a0c18: -/* f1a0c18: 0fc6a1d4 */ jal 0xf1a8750 +/* f1a0c18: 0fc6a1d4 */ jal ciGetFrWeaponListMenuDialog /* f1a0c1c: 00000000 */ nop /* f1a0c20: 00402025 */ move $a0,$v0 -/* f1a0c24: 0fc3e349 */ jal 0xf0f8d24 +/* f1a0c24: 0fc3e349 */ jal func0f0f85e0 /* f1a0c28: 2405000d */ li $a1,0xd /* f1a0c2c: 1000036b */ b .PF0f1a19dc /* f1a0c30: 8fbf007c */ lw $ra,0x7c($sp) .PF0f1a0c34: /* f1a0c34: 248494b0 */ addiu $a0,$a0,-27472 -/* f1a0c38: 0fc3e349 */ jal 0xf0f8d24 +/* f1a0c38: 0fc3e349 */ jal func0f0f85e0 /* f1a0c3c: 2405000d */ li $a1,0xd /* f1a0c40: 10000366 */ b .PF0f1a19dc /* f1a0c44: 8fbf007c */ lw $ra,0x7c($sp) @@ -2710,11 +2710,11 @@ glabel var7f1b94e4 /* f1a0c6c: 240505db */ li $a1,0x5db /* f1a0c70: 00003025 */ move $a2,$zero /* f1a0c74: 2407ffff */ li $a3,-1 -/* f1a0c78: 0c0041a0 */ jal 0x10680 +/* f1a0c78: 0c0041a0 */ jal audioStart /* f1a0c7c: e7b80014 */ swc1 $f24,0x14($sp) /* f1a0c80: 3c048009 */ lui $a0,0x8009 /* f1a0c84: 248496e8 */ addiu $a0,$a0,-26904 -/* f1a0c88: 0fc3e349 */ jal 0xf0f8d24 +/* f1a0c88: 0fc3e349 */ jal func0f0f85e0 /* f1a0c8c: 2405000d */ li $a1,0xd /* f1a0c90: 10000352 */ b .PF0f1a19dc /* f1a0c94: 8fbf007c */ lw $ra,0x7c($sp) @@ -2731,16 +2731,16 @@ glabel var7f1b94e4 /* f1a0cbc: 240505dc */ li $a1,0x5dc /* f1a0cc0: 00003025 */ move $a2,$zero /* f1a0cc4: 2407ffff */ li $a3,-1 -/* f1a0cc8: 0c0041a0 */ jal 0x10680 +/* f1a0cc8: 0c0041a0 */ jal audioStart /* f1a0ccc: e7b80014 */ swc1 $f24,0x14($sp) /* f1a0cd0: 3c048009 */ lui $a0,0x8009 /* f1a0cd4: 248495cc */ addiu $a0,$a0,-27188 -/* f1a0cd8: 0fc3e349 */ jal 0xf0f8d24 +/* f1a0cd8: 0fc3e349 */ jal func0f0f85e0 /* f1a0cdc: 2405000d */ li $a1,0xd /* f1a0ce0: 3c04800a */ lui $a0,0x800a /* f1a0ce4: 24842860 */ addiu $a0,$a0,0x2860 /* f1a0ce8: 00002825 */ move $a1,$zero -/* f1a0cec: 0fc42793 */ jal 0xf109e4c +/* f1a0cec: 0fc42793 */ jal func0f1094e4 /* f1a0cf0: 00003025 */ move $a2,$zero /* f1a0cf4: 10000339 */ b .PF0f1a19dc /* f1a0cf8: 8fbf007c */ lw $ra,0x7c($sp) @@ -2774,7 +2774,7 @@ glabel var7f1b94e4 /* f1a0d60: 11400004 */ beqz $t2,.PF0f1a0d74 /* f1a0d64: 3406ffff */ li $a2,0xffff /* f1a0d68: a20b0041 */ sb $t3,0x41($s0) -/* f1a0d6c: 0fc2496f */ jal 0xf0925bc +/* f1a0d6c: 0fc2496f */ jal func0f0926bc /* f1a0d70: 8e040014 */ lw $a0,0x14($s0) .PF0f1a0d74: /* f1a0d74: 2610003c */ addiu $s0,$s0,0x3c @@ -2784,10 +2784,10 @@ glabel var7f1b94e4 /* f1a0d80: 3c02800a */ lui $v0,0x800a /* f1a0d84: 8c42a794 */ lw $v0,-0x586c($v0) /* f1a0d88: 24040001 */ li $a0,0x1 -/* f1a0d8c: 0fc67f7c */ jal 0xf19fdf0 +/* f1a0d8c: 0fc67f7c */ jal frEndSession /* f1a0d90: ac401c08 */ sw $zero,0x1c08($v0) /* f1a0d94: 00002025 */ move $a0,$zero -/* f1a0d98: 0fc12838 */ jal 0xf04a0e0 +/* f1a0d98: 0fc12838 */ jal chrUnsetStageFlag /* f1a0d9c: 24050001 */ li $a1,0x1 /* f1a0da0: 1000030e */ b .PF0f1a19dc /* f1a0da4: 8fbf007c */ lw $ra,0x7c($sp) @@ -2797,7 +2797,7 @@ glabel var7f1b94e4 /* f1a0db0: 8c4c00d8 */ lw $t4,0xd8($v0) /* f1a0db4: 51800004 */ beqzl $t4,.PF0f1a0dc8 /* f1a0db8: 8ecd0034 */ lw $t5,0x34($s6) -/* f1a0dbc: 0fc67f7c */ jal 0xf19fdf0 +/* f1a0dbc: 0fc67f7c */ jal frEndSession /* f1a0dc0: 00002025 */ move $a0,$zero /* f1a0dc4: 8ecd0034 */ lw $t5,0x34($s6) .PF0f1a0dc8: @@ -2822,7 +2822,7 @@ glabel var7f1b94e4 /* f1a0e0c: 11200004 */ beqz $t1,.PF0f1a0e20 /* f1a0e10: 3406ffff */ li $a2,0xffff /* f1a0e14: a20a0041 */ sb $t2,0x41($s0) -/* f1a0e18: 0fc2496f */ jal 0xf0925bc +/* f1a0e18: 0fc2496f */ jal func0f0926bc /* f1a0e1c: 8e040014 */ lw $a0,0x14($s0) .PF0f1a0e20: /* f1a0e20: 2610003c */ addiu $s0,$s0,0x3c @@ -2834,23 +2834,23 @@ glabel var7f1b94e4 .PF0f1a0e34: /* f1a0e34: 8ecc0284 */ lw $t4,0x284($s6) /* f1a0e38: 240b0001 */ li $t3,0x1 -/* f1a0e3c: 0fc67c16 */ jal 0xf19f058 +/* f1a0e3c: 0fc67c16 */ jal frExecuteHelpScript /* f1a0e40: ad8b1c08 */ sw $t3,0x1c08($t4) /* f1a0e44: 92ad045a */ lbu $t5,0x45a($s5) /* f1a0e48: 51a0004b */ beqzl $t5,.PF0f1a0f78 /* f1a0e4c: 8eab044c */ lw $t3,0x44c($s5) -/* f1a0e50: 0fc678da */ jal 0xf19e368 +/* f1a0e50: 0fc678da */ jal frGetWeaponBySlot /* f1a0e54: 96a40456 */ lhu $a0,0x456($s5) /* f1a0e58: 00409025 */ move $s2,$v0 /* f1a0e5c: 00402025 */ move $a0,$v0 -/* f1a0e60: 0fc2a798 */ jal 0xf0a9e60 +/* f1a0e60: 0fc2a798 */ jal weaponGetAmmoType /* f1a0e64: 00002825 */ move $a1,$zero /* f1a0e68: 00408825 */ move $s1,$v0 -/* f1a0e6c: 0fc2a750 */ jal 0xf0a9d40 +/* f1a0e6c: 0fc2a750 */ jal ammotypeGetMaxCapacity /* f1a0e70: 00402025 */ move $a0,$v0 /* f1a0e74: 00408025 */ move $s0,$v0 /* f1a0e78: 02402025 */ move $a0,$s2 -/* f1a0e7c: 0fc2c5ab */ jal 0xf0b16ac +/* f1a0e7c: 0fc2c5ab */ jal weaponGetAmmoByFunction /* f1a0e80: 00002825 */ move $a1,$zero /* f1a0e84: 10400003 */ beqz $v0,.PF0f1a0e94 /* f1a0e88: 00001825 */ move $v1,$zero @@ -2862,7 +2862,7 @@ glabel var7f1b94e4 /* f1a0e9c: 2401ffff */ li $at,-1 /* f1a0ea0: 18400011 */ blez $v0,.PF0f1a0ee8 /* f1a0ea4: 00000000 */ nop -/* f1a0ea8: 0fc2a6ef */ jal 0xf0a9bbc +/* f1a0ea8: 0fc2a6ef */ jal currentPlayerGetAmmoCountWithCheck /* f1a0eac: 02202025 */ move $a0,$s1 /* f1a0eb0: 92a3045a */ lbu $v1,0x45a($s5) /* f1a0eb4: 86ae0476 */ lh $t6,0x476($s5) @@ -2875,28 +2875,28 @@ glabel var7f1b94e4 /* f1a0ed0: 00000000 */ nop /* f1a0ed4: a6a00476 */ sh $zero,0x476($s5) .PF0f1a0ed8: -/* f1a0ed8: 0fc2a69d */ jal 0xf0a9a74 +/* f1a0ed8: 0fc2a69d */ jal currentPlayerSetAmmoQuantity /* f1a0edc: 02202025 */ move $a0,$s1 /* f1a0ee0: 10000006 */ b .PF0f1a0efc /* f1a0ee4: 24010012 */ li $at,0x12 .PF0f1a0ee8: /* f1a0ee8: 14410003 */ bne $v0,$at,.PF0f1a0ef8 /* f1a0eec: 02202025 */ move $a0,$s1 -/* f1a0ef0: 0fc2a69d */ jal 0xf0a9a74 +/* f1a0ef0: 0fc2a69d */ jal currentPlayerSetAmmoQuantity /* f1a0ef4: 02002825 */ move $a1,$s0 .PF0f1a0ef8: /* f1a0ef8: 24010012 */ li $at,0x12 .PF0f1a0efc: /* f1a0efc: 5641001d */ bnel $s2,$at,.PF0f1a0f74 /* f1a0f00: a2a0045a */ sb $zero,0x45a($s5) -/* f1a0f04: 0fc2a750 */ jal 0xf0a9d40 +/* f1a0f04: 0fc2a750 */ jal ammotypeGetMaxCapacity /* f1a0f08: 2404000b */ li $a0,0xb /* f1a0f0c: 86a30478 */ lh $v1,0x478($s5) /* f1a0f10: 00408025 */ move $s0,$v0 /* f1a0f14: 2401ffff */ li $at,-1 /* f1a0f18: 18600011 */ blez $v1,.PF0f1a0f60 /* f1a0f1c: 00000000 */ nop -/* f1a0f20: 0fc2a6ef */ jal 0xf0a9bbc +/* f1a0f20: 0fc2a6ef */ jal currentPlayerGetAmmoCountWithCheck /* f1a0f24: 2404000b */ li $a0,0xb /* f1a0f28: 92a3045a */ lbu $v1,0x45a($s5) /* f1a0f2c: 86b90478 */ lh $t9,0x478($s5) @@ -2909,14 +2909,14 @@ glabel var7f1b94e4 /* f1a0f48: 00000000 */ nop /* f1a0f4c: a6a00478 */ sh $zero,0x478($s5) .PF0f1a0f50: -/* f1a0f50: 0fc2a69d */ jal 0xf0a9a74 +/* f1a0f50: 0fc2a69d */ jal currentPlayerSetAmmoQuantity /* f1a0f54: 2404000b */ li $a0,0xb /* f1a0f58: 10000006 */ b .PF0f1a0f74 /* f1a0f5c: a2a0045a */ sb $zero,0x45a($s5) .PF0f1a0f60: /* f1a0f60: 14610003 */ bne $v1,$at,.PF0f1a0f70 /* f1a0f64: 2404000b */ li $a0,0xb -/* f1a0f68: 0fc2a69d */ jal 0xf0a9a74 +/* f1a0f68: 0fc2a69d */ jal currentPlayerSetAmmoQuantity /* f1a0f6c: 02002825 */ move $a1,$s0 .PF0f1a0f70: /* f1a0f70: a2a0045a */ sb $zero,0x45a($s5) @@ -2952,7 +2952,7 @@ glabel var7f1b94e4 /* f1a0fe0: 240505d4 */ li $a1,0x5d4 /* f1a0fe4: 00003025 */ move $a2,$zero /* f1a0fe8: 2407ffff */ li $a3,-1 -/* f1a0fec: 0c0041a0 */ jal 0x10680 +/* f1a0fec: 0c0041a0 */ jal audioStart /* f1a0ff0: e7b80014 */ swc1 $f24,0x14($sp) /* f1a0ff4: 8ea30464 */ lw $v1,0x464($s5) .PF0f1a0ff8: @@ -2964,7 +2964,7 @@ glabel var7f1b94e4 /* f1a1008: 2b01ff46 */ slti $at,$t8,-186 /* f1a100c: 54200273 */ bnezl $at,.PF0f1a19dc /* f1a1010: 8fbf007c */ lw $ra,0x7c($sp) -/* f1a1014: 0fc6790e */ jal 0xf19e438 +/* f1a1014: 0fc6790e */ jal frInitLighting /* f1a1018: 00000000 */ nop /* f1a101c: 1000026f */ b .PF0f1a19dc /* f1a1020: 8fbf007c */ lw $ra,0x7c($sp) @@ -2973,7 +2973,7 @@ glabel var7f1b94e4 /* f1a1028: 001952c0 */ sll $t2,$t9,0xb /* f1a102c: 05420004 */ bltzl $t2,.PF0f1a1040 /* f1a1030: 92ac0465 */ lbu $t4,0x465($s5) -/* f1a1034: 0fc6790e */ jal 0xf19e438 +/* f1a1034: 0fc6790e */ jal frInitLighting /* f1a1038: 00000000 */ nop /* f1a103c: 92ac0465 */ lbu $t4,0x465($s5) .PF0f1a1040: @@ -3000,7 +3000,7 @@ glabel var7f1b94e4 /* f1a1088: 052100d1 */ bgez $t1,.PF0f1a13d0 /* f1a108c: 00009025 */ move $s2,$zero /* f1a1090: a3a00123 */ sb $zero,0x123($sp) -/* f1a1094: 0fc678da */ jal 0xf19e368 +/* f1a1094: 0fc678da */ jal frGetWeaponBySlot /* f1a1098: 96a40456 */ lhu $a0,0x456($s5) /* f1a109c: 8e110014 */ lw $s1,0x14($s0) /* f1a10a0: 304300ff */ andi $v1,$v0,0xff @@ -3011,7 +3011,7 @@ glabel var7f1b94e4 /* f1a10b4: 14610003 */ bne $v1,$at,.PF0f1a10c4 .PF0f1a10b8: /* f1a10b8: 26240008 */ addiu $a0,$s1,0x8 -/* f1a10bc: 0fc22ac0 */ jal 0xf08ab00 +/* f1a10bc: 0fc22ac0 */ jal func0f08abd4 /* f1a10c0: 24050001 */ li $a1,0x1 .PF0f1a10c4: /* f1a10c4: 920a0043 */ lbu $t2,0x43($s0) @@ -3041,7 +3041,7 @@ glabel var7f1b94e4 /* f1a1124: afad002c */ sw $t5,0x2c($sp) /* f1a1128: e7b80030 */ swc1 $f24,0x30($sp) /* f1a112c: e7b80034 */ swc1 $f24,0x34($sp) -/* f1a1130: 0fc24e3a */ jal 0xf0938e8 +/* f1a1130: 0fc24e3a */ jal func0f0939f8 /* f1a1134: e7b80038 */ swc1 $f24,0x38($sp) /* f1a1138: c6000038 */ lwc1 $f0,0x38($s0) .PF0f1a113c: @@ -3093,7 +3093,7 @@ glabel var7f1b94e4 /* f1a11e0: 004b082a */ slt $at,$v0,$t3 /* f1a11e4: 50200007 */ beqzl $at,.PF0f1a1204 /* f1a11e8: 96ac045c */ lhu $t4,0x45c($s5) -/* f1a11ec: 0fc678da */ jal 0xf19e368 +/* f1a11ec: 0fc678da */ jal frGetWeaponBySlot /* f1a11f0: 96a40456 */ lhu $a0,0x456($s5) /* f1a11f4: 24010007 */ li $at,0x7 /* f1a11f8: 5441000e */ bnel $v0,$at,.PF0f1a1234 @@ -3127,7 +3127,7 @@ glabel var7f1b94e4 /* f1a125c: 1420005c */ bnez $at,.PF0f1a13d0 /* f1a1260: 00000000 */ nop .PF0f1a1264: -/* f1a1264: 0fc1a361 */ jal 0xf068d84 +/* f1a1264: 0fc1a361 */ jal func0f068af4 /* f1a1268: 00001025 */ move $v0,$zero /* f1a126c: 3c038009 */ lui $v1,0x8009 /* f1a1270: 90638d5c */ lbu $v1,-0x72a4($v1) @@ -3142,7 +3142,7 @@ glabel var7f1b94e4 /* f1a1294: a02d8d5c */ sb $t5,-0x72a4($at) /* f1a1298: 24050001 */ li $a1,0x1 /* f1a129c: 3406ffff */ li $a2,0xffff -/* f1a12a0: 0fc2496f */ jal 0xf0925bc +/* f1a12a0: 0fc2496f */ jal func0f0926bc /* f1a12a4: afa20118 */ sw $v0,0x118($sp) /* f1a12a8: 8fa80118 */ lw $t0,0x118($sp) .PF0f1a12ac: @@ -3161,7 +3161,7 @@ glabel var7f1b94e4 /* f1a12d8: c5060010 */ lwc1 $f6,0x10($t0) /* f1a12dc: afb10024 */ sw $s1,0x24($sp) /* f1a12e0: afae0020 */ sw $t6,0x20($sp) -/* f1a12e4: 0fc54534 */ jal 0xf1514d0 +/* f1a12e4: 0fc54534 */ jal shardsCreate /* f1a12e8: e7a6001c */ swc1 $f6,0x1c($sp) /* f1a12ec: 92af0455 */ lbu $t7,0x455($s5) /* f1a12f0: 24070005 */ li $a3,0x5 @@ -3175,7 +3175,7 @@ glabel var7f1b94e4 /* f1a1310: 240a0001 */ li $t2,0x1 /* f1a1314: afaa0010 */ sw $t2,0x10($sp) /* f1a1318: 24850008 */ addiu $a1,$a0,0x8 -/* f1a131c: 0fc4a8f4 */ jal 0xf12a3d0 +/* f1a131c: 0fc4a8f4 */ jal explosionCreateSimple /* f1a1320: 24860028 */ addiu $a2,$a0,0x28 /* f1a1324: 920b0010 */ lbu $t3,0x10($s0) .PF0f1a1328: @@ -3195,7 +3195,7 @@ glabel var7f1b94e4 /* f1a135c: c428ab2c */ lwc1 $f8,-0x54d4($at) /* f1a1360: e6360010 */ swc1 $f22,0x10($s1) /* f1a1364: 00003025 */ move $a2,$zero -/* f1a1368: 0fc1a7be */ jal 0xf069ef8 +/* f1a1368: 0fc1a7be */ jal func0f069c70 /* f1a136c: e628000c */ swc1 $f8,0xc($s1) /* f1a1370: 3c03800b */ lui $v1,0x800b /* f1a1374: 2463d2c0 */ addiu $v1,$v1,-11584 @@ -3242,7 +3242,7 @@ glabel var7f1b94e4 /* f1a1408: 0182082a */ slt $at,$t4,$v0 /* f1a140c: 14200005 */ bnez $at,.PF0f1a1424 /* f1a1410: 00000000 */ nop -/* f1a1414: 0fc680a8 */ jal 0xf1a02a0 +/* f1a1414: 0fc680a8 */ jal frSetCompleted /* f1a1418: 00000000 */ nop /* f1a141c: 1000016f */ b .PF0f1a19dc /* f1a1420: 8fbf007c */ lw $ra,0x7c($sp) @@ -3262,7 +3262,7 @@ glabel var7f1b94e4 /* f1a1450: 54200006 */ bnezl $at,.PF0f1a146c /* f1a1454: 92ae0454 */ lbu $t6,0x454($s5) .PF0f1a1458: -/* f1a1458: 0fc680a8 */ jal 0xf1a02a0 +/* f1a1458: 0fc680a8 */ jal frSetCompleted /* f1a145c: 00000000 */ nop /* f1a1460: 1000015e */ b .PF0f1a19dc /* f1a1464: 8fbf007c */ lw $ra,0x7c($sp) @@ -3272,16 +3272,16 @@ glabel var7f1b94e4 /* f1a146c: 004e082a */ slt $at,$v0,$t6 /* f1a1470: 14200005 */ bnez $at,.PF0f1a1488 /* f1a1474: 00000000 */ nop -/* f1a1478: 0fc6808e */ jal 0xf1a0238 +/* f1a1478: 0fc6808e */ jal frSetFailReason /* f1a147c: 24040003 */ li $a0,0x3 /* f1a1480: 10000156 */ b .PF0f1a19dc /* f1a1484: 8fbf007c */ lw $ra,0x7c($sp) .PF0f1a1488: -/* f1a1488: 0fc6818e */ jal 0xf1a0638 +/* f1a1488: 0fc6818e */ jal frIsAmmoWasted /* f1a148c: 00000000 */ nop /* f1a1490: 50400006 */ beqzl $v0,.PF0f1a14ac /* f1a1494: 92a20005 */ lbu $v0,0x5($s5) -/* f1a1498: 0fc6808e */ jal 0xf1a0238 +/* f1a1498: 0fc6808e */ jal frSetFailReason /* f1a149c: 24040001 */ li $a0,0x1 /* f1a14a0: 1000014e */ b .PF0f1a19dc /* f1a14a4: 8fbf007c */ lw $ra,0x7c($sp) @@ -3299,7 +3299,7 @@ glabel var7f1b94e4 /* f1a14d0: 01f8082a */ slt $at,$t7,$t8 /* f1a14d4: 14200005 */ bnez $at,.PF0f1a14ec /* f1a14d8: 00000000 */ nop -/* f1a14dc: 0fc6808e */ jal 0xf1a0238 +/* f1a14dc: 0fc6808e */ jal frSetFailReason /* f1a14e0: 24040002 */ li $a0,0x2 /* f1a14e4: 1000013d */ b .PF0f1a19dc /* f1a14e8: 8fbf007c */ lw $ra,0x7c($sp) @@ -3356,7 +3356,7 @@ glabel var7f1b94e4 /* f1a15a8: c7a40160 */ lwc1 $f4,0x160($sp) /* f1a15ac: 46042182 */ mul.s $f6,$f4,$f4 /* f1a15b0: 46104480 */ add.s $f18,$f8,$f16 -/* f1a15b4: 0c0127b4 */ jal 0x49ed0 +/* f1a15b4: 0c0127b4 */ jal sqrtf /* f1a15b8: 46123300 */ add.s $f12,$f6,$f18 /* f1a15bc: 46160032 */ c.eq.s $f0,$f22 /* f1a15c0: c7ae0110 */ lwc1 $f14,0x110($sp) @@ -3425,7 +3425,7 @@ glabel var7f1b94e4 /* f1a16b4: a04b0000 */ sb $t3,0x0($v0) .PF0f1a16b8: /* f1a16b8: 24050001 */ li $a1,0x1 -/* f1a16bc: 0fc2496f */ jal 0xf0925bc +/* f1a16bc: 0fc2496f */ jal func0f0926bc /* f1a16c0: 3406ffff */ li $a2,0xffff /* f1a16c4: 240cffff */ li $t4,-1 /* f1a16c8: 240d0400 */ li $t5,0x400 @@ -3444,7 +3444,7 @@ glabel var7f1b94e4 /* f1a16fc: afa00028 */ sw $zero,0x28($sp) /* f1a1700: e7b80030 */ swc1 $f24,0x30($sp) /* f1a1704: e7b80034 */ swc1 $f24,0x34($sp) -/* f1a1708: 0fc24e3a */ jal 0xf0938e8 +/* f1a1708: 0fc24e3a */ jal func0f0939f8 /* f1a170c: e7b80038 */ swc1 $f24,0x38($sp) .PF0f1a1710: /* f1a1710: c7a8014c */ lwc1 $f8,0x14c($sp) @@ -3456,7 +3456,7 @@ glabel var7f1b94e4 /* f1a1724: 00003025 */ move $a2,$zero /* f1a1728: e62a000c */ swc1 $f10,0xc($s1) /* f1a172c: c7a60154 */ lwc1 $f6,0x154($sp) -/* f1a1730: 0fc1a7be */ jal 0xf069ef8 +/* f1a1730: 0fc1a7be */ jal func0f069c70 /* f1a1734: e6260010 */ swc1 $f6,0x10($s1) /* f1a1738: 8e020010 */ lw $v0,0x10($s0) .PF0f1a173c: @@ -3588,17 +3588,17 @@ glabel var7f1b94e4 .PF0f1a1904: /* f1a1904: c426ab44 */ lwc1 $f6,-0x54bc($at) /* f1a1908: 02802825 */ move $a1,$s4 -/* f1a190c: 0c005841 */ jal 0x16104 +/* f1a190c: 0c005841 */ jal func00016374 /* f1a1910: 46060300 */ add.s $f12,$f0,$f6 /* f1a1914: 8e6c0018 */ lw $t4,0x18($s3) /* f1a1918: 02802825 */ move $a1,$s4 -/* f1a191c: 0c005725 */ jal 0x15c94 +/* f1a191c: 0c005725 */ jal func00015f04 /* f1a1920: c58c0014 */ lwc1 $f12,0x14($t4) /* f1a1924: 02802025 */ move $a0,$s4 -/* f1a1928: 0c0056cc */ jal 0x15b30 +/* f1a1928: 0c0056cc */ jal func00015da0 /* f1a192c: 02a02825 */ move $a1,$s5 /* f1a1930: 02a02025 */ move $a0,$s5 -/* f1a1934: 0c00569a */ jal 0x15a68 +/* f1a1934: 0c00569a */ jal func00015cd8 /* f1a1938: 2665001c */ addiu $a1,$s3,0x1c /* f1a193c: 8e020010 */ lw $v0,0x10($s0) .PF0f1a1940: @@ -3616,26 +3616,26 @@ glabel var7f1b94e4 /* f1a196c: 92090010 */ lbu $t1,0x10($s0) /* f1a1970: 02402025 */ move $a0,$s2 /* f1a1974: 312affef */ andi $t2,$t1,0xffef -/* f1a1978: 0fc67c66 */ jal 0xf19f198 +/* f1a1978: 0fc67c66 */ jal frExecuteTargetScript /* f1a197c: a20a0010 */ sb $t2,0x10($s0) /* f1a1980: 14400005 */ bnez $v0,.PF0f1a1998 /* f1a1984: 00000000 */ nop .PF0f1a1988: -/* f1a1988: 0fc67c66 */ jal 0xf19f198 +/* f1a1988: 0fc67c66 */ jal frExecuteTargetScript /* f1a198c: 02402025 */ move $a0,$s2 /* f1a1990: 1040fffd */ beqz $v0,.PF0f1a1988 /* f1a1994: 00000000 */ nop .PF0f1a1998: -/* f1a1998: 0fc67bfd */ jal 0xf19eff4 +/* f1a1998: 0fc67bfd */ jal frTargetIsAtScriptStart /* f1a199c: 02402025 */ move $a0,$s2 /* f1a19a0: 5040000a */ beqzl $v0,.PF0f1a19cc /* f1a19a4: 26520001 */ addiu $s2,$s2,0x1 -/* f1a19a8: 0fc67c66 */ jal 0xf19f198 +/* f1a19a8: 0fc67c66 */ jal frExecuteTargetScript /* f1a19ac: 02402025 */ move $a0,$s2 /* f1a19b0: 54400006 */ bnezl $v0,.PF0f1a19cc /* f1a19b4: 26520001 */ addiu $s2,$s2,0x1 .PF0f1a19b8: -/* f1a19b8: 0fc67c66 */ jal 0xf19f198 +/* f1a19b8: 0fc67c66 */ jal frExecuteTargetScript /* f1a19bc: 02402025 */ move $a0,$s2 /* f1a19c0: 1040fffd */ beqz $v0,.PF0f1a19b8 /* f1a19c4: 00000000 */ nop diff --git a/src/lib/audiomgr.c b/src/lib/audiomgr.c index f4b45f1ce..63bf78abd 100644 --- a/src/lib/audiomgr.c +++ b/src/lib/audiomgr.c @@ -417,7 +417,7 @@ glabel amgrCreate /* 899c: afb30028 */ sw $s3,0x28($sp) /* 89a0: afb20024 */ sw $s2,0x24($sp) /* 89a4: afb10020 */ sw $s1,0x20($sp) -/* 89a8: 0c01362c */ jal 0x4d8b0 +/* 89a8: 0c01362c */ jal osAiSetFrequency /* 89ac: 24045604 */ li $a0,0x5604 /* 89b0: 8fa505b8 */ lw $a1,0x5b8($sp) /* 89b4: 3c0e7001 */ lui $t6,0x7001 @@ -480,19 +480,19 @@ glabel amgrCreate /* 8a88: 258e0050 */ addiu $t6,$t4,0x50 /* 8a8c: ac2e1e34 */ sw $t6,0x1e34($at) /* 8a90: 3c018006 */ lui $at,0x8006 -/* 8a94: 0c00255c */ jal 0x9570 +/* 8a94: 0c00255c */ jal func00009660 /* 8a98: a020cc34 */ sb $zero,-0x33cc($at) /* 8a9c: 3c048009 */ lui $a0,0x8009 /* 8aa0: 3c058009 */ lui $a1,0x8009 /* 8aa4: 24a51db0 */ addiu $a1,$a1,0x1db0 /* 8aa8: 24841d98 */ addiu $a0,$a0,0x1d98 -/* 8aac: 0c011f10 */ jal 0x47c40 +/* 8aac: 0c011f10 */ jal osCreateMesgQueue /* 8ab0: 24060008 */ li $a2,0x8 /* 8ab4: 3c048009 */ lui $a0,0x8009 /* 8ab8: 3c058009 */ lui $a1,0x8009 /* 8abc: 24a51d78 */ addiu $a1,$a1,0x1d78 /* 8ac0: 24841d60 */ addiu $a0,$a0,0x1d60 -/* 8ac4: 0c011f10 */ jal 0x47c40 +/* 8ac4: 0c011f10 */ jal osCreateMesgQueue /* 8ac8: 24060008 */ li $a2,0x8 /* 8acc: 3c128009 */ lui $s2,0x8009 /* 8ad0: 26521e3c */ addiu $s2,$s2,0x1e3c @@ -511,7 +511,7 @@ glabel amgrCreate /* 8b00: 0018c8c0 */ sll $t9,$t8,0x3 /* 8b04: afb90010 */ sw $t9,0x10($sp) /* 8b08: 02203025 */ move $a2,$s1 -/* 8b0c: 0c00bd05 */ jal 0x2f414 +/* 8b0c: 0c00bd05 */ jal func0002fb14 /* 8b10: 24070001 */ li $a3,0x1 /* 8b14: 26100004 */ addiu $s0,$s0,0x4 /* 8b18: 0213082b */ sltu $at,$s0,$s3 @@ -527,7 +527,7 @@ glabel amgrCreate /* 8b3c: 00002025 */ move $a0,$zero /* 8b40: 00002825 */ move $a1,$zero /* 8b44: 02203025 */ move $a2,$s1 -/* 8b48: 0c00bd05 */ jal 0x2f414 +/* 8b48: 0c00bd05 */ jal func0002fb14 /* 8b4c: 24070001 */ li $a3,0x1 /* 8b50: ae020008 */ sw $v0,0x8($s0) /* 8b54: a4400004 */ sh $zero,0x4($v0) @@ -536,7 +536,7 @@ glabel amgrCreate /* 8b60: 00002025 */ move $a0,$zero /* 8b64: 00002825 */ move $a1,$zero /* 8b68: 02203025 */ move $a2,$s1 -/* 8b6c: 0c00bd05 */ jal 0x2f414 +/* 8b6c: 0c00bd05 */ jal func0002fb14 /* 8b70: 24070001 */ li $a3,0x1 /* 8b74: 8e0b0008 */ lw $t3,0x8($s0) /* 8b78: 26100004 */ addiu $s0,$s0,0x4 @@ -830,10 +830,10 @@ glabel amgrCreate .PF00008fac: /* 8fac: 3c048009 */ lui $a0,0x8009 /* 8fb0: 24841dd0 */ addiu $a0,$a0,0x1dd0 -/* 8fb4: 0c00bd28 */ jal 0x2f4a0 +/* 8fb4: 0c00bd28 */ jal func0002fba0 /* 8fb8: 02002825 */ move $a1,$s0 /* 8fbc: 00002025 */ move $a0,$zero -/* 8fc0: 0c00c13f */ jal 0x304fc +/* 8fc0: 0c00c13f */ jal func00030bfc /* 8fc4: 2405003c */ li $a1,0x3c /* 8fc8: 3c0b8009 */ lui $t3,0x8009 /* 8fcc: 8d6b1e40 */ lw $t3,0x1e40($t3) @@ -845,7 +845,7 @@ glabel amgrCreate /* 8fe4: 24841b30 */ addiu $a0,$a0,0x1b30 /* 8fe8: 24050004 */ li $a1,0x4 /* 8fec: 00003825 */ move $a3,$zero -/* 8ff0: 0c000fac */ jal 0x3eb0 +/* 8ff0: 0c000fac */ jal osCreateThread /* 8ff4: afab0010 */ sw $t3,0x10($sp) /* 8ff8: 8fbf002c */ lw $ra,0x2c($sp) /* 8ffc: 8fb0001c */ lw $s0,0x1c($sp) @@ -1363,7 +1363,7 @@ glabel amgrMain /* 90c8: 24c61d60 */ addiu $a2,$a2,0x1d60 /* 90cc: 24a51e20 */ addiu $a1,$a1,0x1e20 /* 90d0: 2484e120 */ addiu $a0,$a0,-7904 -/* 90d4: 0c00078c */ jal 0x1e30 +/* 90d4: 0c00078c */ jal osScAddClient /* 90d8: 24070001 */ li $a3,0x1 /* 90dc: 3c158009 */ lui $s5,0x8009 /* 90e0: 3c148009 */ lui $s4,0x8009 @@ -1380,7 +1380,7 @@ glabel amgrMain /* 9108: 3c048009 */ lui $a0,0x8009 /* 910c: 24841d60 */ addiu $a0,$a0,0x1d60 /* 9110: 02c02825 */ move $a1,$s6 -/* 9114: 0c011ffc */ jal 0x47ff0 +/* 9114: 0c011ffc */ jal osRecvMesg /* 9118: 24060001 */ li $a2,0x1 /* 911c: 8fae0064 */ lw $t6,0x64($sp) /* 9120: 85c40000 */ lh $a0,0x0($t6) @@ -1393,11 +1393,11 @@ glabel amgrMain /* 913c: 10000077 */ b .PF0000931c /* 9140: 00000000 */ nop .PF00009144: -/* 9144: 0c012288 */ jal 0x48a20 +/* 9144: 0c012288 */ jal osGetTime /* 9148: 00000000 */ nop /* 914c: ae820000 */ sw $v0,0x0($s4) /* 9150: ae830004 */ sw $v1,0x4($s4) -/* 9154: 0c002664 */ jal 0x9990 +/* 9154: 0c002664 */ jal func00009aa0 /* 9158: 3c040003 */ lui $a0,0x3 /* 915c: 3c0f8009 */ lui $t7,0x8009 /* 9160: 8def2d78 */ lw $t7,0x2d78($t7) @@ -1408,14 +1408,14 @@ glabel amgrMain /* 9174: 0018c880 */ sll $t9,$t8,0x2 /* 9178: 00992021 */ addu $a0,$a0,$t9 /* 917c: 8c841b20 */ lw $a0,0x1b20($a0) -/* 9180: 0c0024d8 */ jal 0x9360 +/* 9180: 0c0024d8 */ jal amgrHandleFrameMsg /* 9184: 8fa50060 */ lw $a1,0x60($sp) -/* 9188: 0c00263f */ jal 0x98fc +/* 9188: 0c00263f */ jal func00009a08 /* 918c: 00000000 */ nop /* 9190: 26520001 */ addiu $s2,$s2,0x1 -/* 9194: 0c002664 */ jal 0x9990 +/* 9194: 0c002664 */ jal func00009aa0 /* 9198: 3c040006 */ lui $a0,0x6 -/* 919c: 0c012288 */ jal 0x48a20 +/* 919c: 0c012288 */ jal osGetTime /* 91a0: 00000000 */ nop /* 91a4: 8e8a0000 */ lw $t2,0x0($s4) /* 91a8: 8e8b0004 */ lw $t3,0x4($s4) @@ -1441,7 +1441,7 @@ glabel amgrMain /* 91f8: 8e040000 */ lw $a0,0x0($s0) /* 91fc: 8e050004 */ lw $a1,0x4($s0) /* 9200: 24060000 */ li $a2,0x0 -/* 9204: 0c01369a */ jal 0x4da68 +/* 9204: 0c01369a */ jal __ull_div /* 9208: 240700f0 */ li $a3,0xf0 /* 920c: 3c018009 */ lui $at,0x8009 /* 9210: ac221ac8 */ sw $v0,0x1ac8($at) @@ -1504,12 +1504,12 @@ glabel amgrMain /* 92e4: 24841d98 */ addiu $a0,$a0,0x1d98 /* 92e8: 15c00003 */ bnez $t6,.PF000092f8 /* 92ec: 27a50060 */ addiu $a1,$sp,0x60 -/* 92f0: 0c011ffc */ jal 0x47ff0 +/* 92f0: 0c011ffc */ jal osRecvMesg /* 92f4: 24060001 */ li $a2,0x1 .PF000092f8: /* 92f8: 3c018006 */ lui $at,0x8006 /* 92fc: ac20d1b4 */ sw $zero,-0x2e4c($at) -/* 9300: 0c00254b */ jal 0x952c +/* 9300: 0c00254b */ jal amgrHandleDoneMsg /* 9304: 8fa40060 */ lw $a0,0x60($sp) /* 9308: 10000004 */ b .PF0000931c /* 930c: 00000000 */ nop @@ -1521,7 +1521,7 @@ glabel amgrMain /* 931c: 1260ff7a */ beqz $s3,.PF00009108 /* 9320: 00000000 */ nop /* 9324: 3c048009 */ lui $a0,0x8009 -/* 9328: 0c00bd43 */ jal 0x2f50c +/* 9328: 0c00bd43 */ jal alClose /* 932c: 24841dd0 */ addiu $a0,$a0,0x1dd0 /* 9330: 8fbf003c */ lw $ra,0x3c($sp) /* 9334: 8fb00018 */ lw $s0,0x18($sp) diff --git a/src/lib/entry.c b/src/lib/entry.c index 3de1672fe..9eaae51db 100644 --- a/src/lib/entry.c +++ b/src/lib/entry.c @@ -1043,7 +1043,7 @@ glabel boot00001180 /* 1434: afbc0070 */ sw $gp,0x70($sp) /* 1438: afbd0074 */ sw $sp,0x74($sp) /* 143c: afbe0078 */ sw $s8,0x78($sp) -/* 1440: 0c001da4 */ jal 0x7690 +/* 1440: 0c001da4 */ jal rzipInflate /* 1444: 00000000 */ nop /* 1448: 8fbf0000 */ lw $ra,0x0($sp) /* 144c: 8fa10004 */ lw $at,0x4($sp) diff --git a/src/lib/init.c b/src/lib/init.c index cb79f727b..76a3b7159 100644 --- a/src/lib/init.c +++ b/src/lib/init.c @@ -420,7 +420,7 @@ glabel init /* 17e0: 0c0005c3 */ jal 0x170c /* 17e4: 3c068030 */ lui $a2,0x8030 /* 17e8: 24040001 */ li $a0,0x1 -/* 17ec: 0c00059c */ jal 0x1670 +/* 17ec: 0c00059c */ jal segGetDataStart /* 17f0: 2405001f */ li $a1,0x1f /* 17f4: 3c048006 */ lui $a0,0x8006 /* 17f8: 3c038006 */ lui $v1,0x8006 @@ -439,11 +439,11 @@ glabel init /* 1828: 0c01253c */ jal 0x494f0 /* 182c: 00000000 */ nop /* 1830: 3c048000 */ lui $a0,0x8000 -/* 1834: 0c012548 */ jal 0x49520 +/* 1834: 0c012548 */ jal osEPiRawStartDma /* 1838: 24054000 */ li $a1,0x4000 /* 183c: 0c012568 */ jal 0x495a0 /* 1840: 00000000 */ nop -/* 1844: 0c01256c */ jal 0x495b0 +/* 1844: 0c01256c */ jal __osDisableInt /* 1848: 34440e80 */ ori $a0,$v0,0xe80 /* 184c: 3c03bc00 */ lui $v1,0xbc00 /* 1850: 34630c02 */ ori $v1,$v1,0xc02 diff --git a/src/lib/lib_09660.c b/src/lib/lib_09660.c index d2e906345..341a66e55 100644 --- a/src/lib/lib_09660.c +++ b/src/lib/lib_09660.c @@ -190,14 +190,14 @@ glabel func00009844 /* 97b0: 2453ffff */ addiu $s3,$v0,-1 .PF000097b4: /* 97b4: 02402025 */ move $a0,$s2 -/* 97b8: 0c00c41c */ jal 0x31070 +/* 97b8: 0c00c41c */ jal alLink /* 97bc: 02002825 */ move $a1,$s0 /* 97c0: 24180400 */ li $t8,0x400 /* 97c4: afb80010 */ sw $t8,0x10($sp) /* 97c8: 00002025 */ move $a0,$zero /* 97cc: 00002825 */ move $a1,$zero /* 97d0: 02803025 */ move $a2,$s4 -/* 97d4: 0c00bd05 */ jal 0x2f414 +/* 97d4: 0c00bd05 */ jal func0002fb14 /* 97d8: 24070001 */ li $a3,0x1 /* 97dc: 26310001 */ addiu $s1,$s1,0x1 /* 97e0: 26100014 */ addiu $s0,$s0,0x14 diff --git a/src/lib/lib_09a80.c b/src/lib/lib_09a80.c index 046f2eb3c..f33164e02 100644 --- a/src/lib/lib_09a80.c +++ b/src/lib/lib_09a80.c @@ -281,7 +281,7 @@ glabel func00009bf8 /* 9b38: 1445fff9 */ bne $v0,$a1,.PF00009b20 /* 9b3c: a444fff2 */ sh $a0,-0xe($v0) /* 9b40: 3c01800a */ lui $at,0x800a -/* 9b44: 0fc2f254 */ jal 0xf0bc950 +/* 9b44: 0fc2f254 */ jal viResetDefaultModeIf4Mb /* 9b48: a020a9f0 */ sb $zero,-0x5610($at) /* 9b4c: 8fbf0014 */ lw $ra,0x14($sp) /* 9b50: 27bd0018 */ addiu $sp,$sp,0x18 @@ -816,9 +816,9 @@ glabel func0000a044 .PF00009fb0: /* 9fb0: 3c013f80 */ lui $at,0x3f80 /* 9fb4: 44816000 */ mtc1 $at,$f12 -/* 9fb8: 0c0121fc */ jal 0x487f0 +/* 9fb8: 0c0121fc */ jal osViSetYScale /* 9fbc: 00000000 */ nop -/* 9fc0: 0c012178 */ jal 0x485e0 +/* 9fc0: 0c012178 */ jal osViBlack /* 9fc4: 24040001 */ li $a0,0x1 /* 9fc8: 3c098006 */ lui $t1,0x8006 /* 9fcc: 8d29d234 */ lw $t1,-0x2dcc($t1) @@ -1340,7 +1340,7 @@ glabel func0000a044 /* a728: 00007812 */ mflo $t7 /* a72c: 00ef7021 */ addu $t6,$a3,$t7 /* a730: ac2ed234 */ sw $t6,-0x2dcc($at) -/* a734: 0c0129ec */ jal 0x4a7b0 +/* a734: 0c0129ec */ jal bcopy /* a738: 8ca5d234 */ lw $a1,-0x2dcc($a1) /* a73c: 3c038009 */ lui $v1,0x8009 /* a740: 24632dc7 */ addiu $v1,$v1,0x2dc7 @@ -1358,7 +1358,7 @@ glabel func0000a044 /* a770: 53000005 */ beqzl $t8,.PF0000a788 /* a774: 8fbf0014 */ lw $ra,0x14($sp) /* a778: ac400000 */ sw $zero,0x0($v0) -/* a77c: 0c002779 */ jal 0x9de4 +/* a77c: 0c002779 */ jal func00009ec4 /* a780: 00002025 */ move $a0,$zero /* a784: 8fbf0014 */ lw $ra,0x14($sp) .PF0000a788: diff --git a/src/lib/lib_0e9d0.c b/src/lib/lib_0e9d0.c index 6aab225f6..d1ca03e6b 100644 --- a/src/lib/lib_0e9d0.c +++ b/src/lib/lib_0e9d0.c @@ -1736,7 +1736,7 @@ glabel func0000f804 /* f5d4: 3c057005 */ lui $a1,0x7005 /* f5d8: ac2f53f8 */ sw $t7,0x53f8($at) /* f5dc: 24a537f8 */ addiu $a1,$a1,0x37f8 -/* f5e0: 0c004b68 */ jal 0x12da0 +/* f5e0: 0c004b68 */ jal argFindByPrefix /* f5e4: 00402025 */ move $a0,$v0 /* f5e8: 10400002 */ beqz $v0,.PF0000f5f4 /* f5ec: 3c018006 */ lui $at,0x8006 @@ -1747,7 +1747,7 @@ glabel func0000f804 /* f5fc: 02002025 */ move $a0,$s0 /* f600: 570000c2 */ bnezl $t8,.PF0000f90c /* f604: 8fbf0024 */ lw $ra,0x24($sp) -/* f608: 0c004856 */ jal 0x12158 +/* f608: 0c004856 */ jal malloc /* f60c: 24050006 */ li $a1,0x6 /* f610: 00502021 */ addu $a0,$v0,$s0 /* f614: 0044082b */ sltu $at,$v0,$a0 @@ -1763,7 +1763,7 @@ glabel func0000f804 /* f634: 3c048009 */ lui $a0,0x8009 /* f638: 24845740 */ addiu $a0,$a0,0x5740 /* f63c: 00e02825 */ move $a1,$a3 -/* f640: 0c00bcfc */ jal 0x2f3f0 +/* f640: 0c00bcfc */ jal func0002faf0 /* f644: 02003025 */ move $a2,$s0 /* f648: 3c068009 */ lui $a2,0x8009 /* f64c: 24190020 */ li $t9,0x20 @@ -1771,16 +1771,16 @@ glabel func0000f804 /* f654: 24c65740 */ addiu $a2,$a2,0x5740 /* f658: 00002025 */ move $a0,$zero /* f65c: 00002825 */ move $a1,$zero -/* f660: 0c00bd05 */ jal 0x2f414 +/* f660: 0c00bd05 */ jal func0002fb14 /* f664: 24070001 */ li $a3,0x1 /* f668: 3c038006 */ lui $v1,0x8006 /* f66c: 2463da80 */ addiu $v1,$v1,-9600 /* f670: 3c057005 */ lui $a1,0x7005 /* f674: ac620000 */ sw $v0,0x0($v1) /* f678: 24a537c0 */ addiu $a1,$a1,0x37c0 -/* f67c: 0c004bb0 */ jal 0x12ec0 +/* f67c: 0c004bb0 */ jal strcpy /* f680: 00402025 */ move $a0,$v0 -/* f684: 0c003a23 */ jal 0xe88c +/* f684: 0c003a23 */ jal func0000eb2c /* f688: 00000000 */ nop /* f68c: 3c0900cf */ lui $t1,0xcf /* f690: 3c0a00cf */ lui $t2,0xcf @@ -1795,17 +1795,17 @@ glabel func0000f804 /* f6b4: afb00010 */ sw $s0,0x10($sp) /* f6b8: 00002025 */ move $a0,$zero /* f6bc: 00002825 */ move $a1,$zero -/* f6c0: 0c00bd05 */ jal 0x2f414 +/* f6c0: 0c00bd05 */ jal func0002fb14 /* f6c4: 24070001 */ li $a3,0x1 /* f6c8: 3c0500cf */ lui $a1,0xcf /* f6cc: 00408825 */ move $s1,$v0 /* f6d0: 24a5a4c0 */ addiu $a1,$a1,-23360 /* f6d4: 00402025 */ move $a0,$v0 -/* f6d8: 0c003454 */ jal 0xd150 +/* f6d8: 0c003454 */ jal dmaExec /* f6dc: 02003025 */ move $a2,$s0 /* f6e0: 3c0500cf */ lui $a1,0xcf /* f6e4: 24a54520 */ addiu $a1,$a1,0x4520 -/* f6e8: 0c00dc01 */ jal 0x37004 +/* f6e8: 0c00dc01 */ jal func00037704 /* f6ec: 02202025 */ move $a0,$s1 /* f6f0: 8e2b0004 */ lw $t3,0x4($s1) /* f6f4: 3c018009 */ lui $at,0x8009 @@ -1816,7 +1816,7 @@ glabel func0000f804 /* f708: 00002025 */ move $a0,$zero /* f70c: 00002825 */ move $a1,$zero /* f710: 24070001 */ li $a3,0x1 -/* f714: 0c00bd05 */ jal 0x2f414 +/* f714: 0c00bd05 */ jal func0002fb14 /* f718: ac2b5754 */ sw $t3,0x5754($at) /* f71c: 3c108009 */ lui $s0,0x8009 /* f720: 3c1100e7 */ lui $s1,0xe7 @@ -1825,7 +1825,7 @@ glabel func0000f804 /* f72c: ae020000 */ sw $v0,0x0($s0) /* f730: 02202825 */ move $a1,$s1 /* f734: 00402025 */ move $a0,$v0 -/* f738: 0c003454 */ jal 0xd150 +/* f738: 0c003454 */ jal dmaExec /* f73c: 24060010 */ li $a2,0x10 /* f740: 8e0d0000 */ lw $t5,0x0($s0) /* f744: 3c068009 */ lui $a2,0x8009 @@ -1837,7 +1837,7 @@ glabel func0000f804 /* f75c: 25c30004 */ addiu $v1,$t6,0x4 /* f760: afa30010 */ sw $v1,0x10($sp) /* f764: afa30050 */ sw $v1,0x50($sp) -/* f768: 0c00bd05 */ jal 0x2f414 +/* f768: 0c00bd05 */ jal func0002fb14 /* f76c: 24070001 */ li $a3,0x1 /* f770: 8fa30050 */ lw $v1,0x50($sp) /* f774: 2401fff0 */ li $at,-16 @@ -1846,7 +1846,7 @@ glabel func0000f804 /* f780: 00c17824 */ and $t7,$a2,$at /* f784: 01e03025 */ move $a2,$t7 /* f788: 00402025 */ move $a0,$v0 -/* f78c: 0c003454 */ jal 0xd150 +/* f78c: 0c003454 */ jal dmaExec /* f790: 02202825 */ move $a1,$s1 /* f794: 8e040000 */ lw $a0,0x0($s0) /* f798: 00001825 */ move $v1,$zero @@ -1908,44 +1908,44 @@ glabel func0000f804 /* f868: afab005c */ sw $t3,0x5c($sp) /* f86c: afac0060 */ sw $t4,0x60($sp) /* f870: 27a40064 */ addiu $a0,$sp,0x64 -/* f874: 0c002262 */ jal 0x8988 +/* f874: 0c002262 */ jal amgrCreate /* f878: 27a50058 */ addiu $a1,$sp,0x58 /* f87c: 3c0d8006 */ lui $t5,0x8006 /* f880: 8dadda70 */ lw $t5,-0x2590($t5) /* f884: 3c048009 */ lui $a0,0x8009 /* f888: 11a00009 */ beqz $t5,.PF0000f8b0 /* f88c: 00000000 */ nop -/* f890: 0c00dd00 */ jal 0x37400 +/* f890: 0c00dd00 */ jal func00037b00 /* f894: 24845740 */ addiu $a0,$a0,0x5740 /* f898: 24047fff */ li $a0,0x7fff -/* f89c: 0c00de02 */ jal 0x37808 +/* f89c: 0c00de02 */ jal func00037f08 /* f8a0: 24050001 */ li $a1,0x1 /* f8a4: 00002025 */ move $a0,$zero -/* f8a8: 0c00de17 */ jal 0x3785c +/* f8a8: 0c00de17 */ jal func00037f5c /* f8ac: 24050001 */ li $a1,0x1 .PF0000f8b0: /* f8b0: 3c108009 */ lui $s0,0x8009 /* f8b4: 26105428 */ addiu $s0,$s0,0x5428 .PF0000f8b8: -/* f8b8: 0c003cf7 */ jal 0xf3dc +/* f8b8: 0c003cf7 */ jal func0000f67c /* f8bc: 02002025 */ move $a0,$s0 /* f8c0: 3c0e8009 */ lui $t6,0x8009 /* f8c4: 25ce5740 */ addiu $t6,$t6,0x5740 /* f8c8: 26100108 */ addiu $s0,$s0,0x108 /* f8cc: 160efffa */ bne $s0,$t6,.PF0000f8b8 /* f8d0: 00000000 */ nop -/* f8d4: 0c00c43c */ jal 0x310f0 +/* f8d4: 0c00c43c */ jal func000317f0 /* f8d8: 27a4008c */ addiu $a0,$sp,0x8c /* f8dc: 3c047001 */ lui $a0,0x7001 -/* f8e0: 0c00cb1e */ jal 0x32c78 +/* f8e0: 0c00cb1e */ jal func00033378 /* f8e4: 2484f4cc */ addiu $a0,$a0,-2868 /* f8e8: 3c047001 */ lui $a0,0x7001 -/* f8ec: 0c00cbcd */ jal 0x32f34 +/* f8ec: 0c00cbcd */ jal func00033634 /* f8f0: 2484f518 */ addiu $a0,$a0,-2792 -/* f8f4: 0c002405 */ jal 0x9014 +/* f8f4: 0c002405 */ jal amgrStartThread /* f8f8: 00000000 */ nop /* f8fc: 3c048006 */ lui $a0,0x8006 -/* f900: 0c003c3b */ jal 0xf0ec +/* f900: 0c003c3b */ jal audioSetSoundMode /* f904: 8c84da6c */ lw $a0,-0x2594($a0) /* f908: 8fbf0024 */ lw $ra,0x24($sp) .PF0000f90c: diff --git a/src/lib/lib_2fc60.c b/src/lib/lib_2fc60.c index 09ad11c97..ddf8597c4 100644 --- a/src/lib/lib_2fc60.c +++ b/src/lib/lib_2fc60.c @@ -852,7 +852,7 @@ glabel var700546f4 /* 2fd78: 00000000 */ nop .PF0002fd7c: /* 2fd7c: 44cdf800 */ ctc1 $t5,$31 -/* 2fd80: 0c00bd58 */ jal 0x2f560 +/* 2fd80: 0c00bd58 */ jal func0002fc60 /* 2fd84: 00000000 */ nop /* 2fd88: e7a00018 */ swc1 $f0,0x18($sp) .PF0002fd8c: @@ -952,7 +952,7 @@ glabel var700546f4 /* 2fef0: c7300010 */ lwc1 $f16,0x10($t9) /* 2fef4: 4600818d */ trunc.w.s $f6,$f16 /* 2fef8: 44043000 */ mfc1 $a0,$f6 -/* 2fefc: 0c00e638 */ jal 0x398e0 +/* 2fefc: 0c00e638 */ jal func00039fe0 /* 2ff00: 00000000 */ nop /* 2ff04: 8fa90024 */ lw $t1,0x24($sp) /* 2ff08: 10000008 */ b .PF0002ff2c diff --git a/src/lib/lib_317f0.c b/src/lib/lib_317f0.c index 712bdec63..3bafd1a63 100644 --- a/src/lib/lib_317f0.c +++ b/src/lib/lib_317f0.c @@ -2762,7 +2762,7 @@ glabel audioStop /* 33b38: 31f80002 */ andi $t8,$t7,0x2 /* 33b3c: 13000005 */ beqz $t8,.L00033b54 /* 33b40: 00000000 */ nop -/* 33b44: 0c00ceee */ jal 0x33bb8 +/* 33b44: 0c00ceee */ jal func00033bc0 /* 33b48: 8fa40028 */ lw $a0,0x28($sp) /* 33b4c: 10000014 */ b .L00033ba0 /* 33b50: 00000000 */ nop @@ -2784,7 +2784,7 @@ glabel audioStop /* 33b8c: 27a50018 */ addiu $a1,$sp,0x18 /* 33b90: 00003025 */ or $a2,$zero,$zero /* 33b94: 00003825 */ or $a3,$zero,$zero -/* 33b98: 0c00f184 */ jal 0x3c610 +/* 33b98: 0c00f184 */ jal alEvtqPostEvent /* 33b9c: 24840014 */ addiu $a0,$a0,0x14 .L00033ba0: /* 33ba0: 10000001 */ b .L00033ba8 diff --git a/src/lib/lib_3d280.c b/src/lib/lib_3d280.c index f00d75bc9..cdfcd9248 100644 --- a/src/lib/lib_3d280.c +++ b/src/lib/lib_3d280.c @@ -117,11 +117,11 @@ glabel func0003d340 /* 3cce8: 018e7821 */ addu $t7,$t4,$t6 /* 3ccec: ad6f0008 */ sw $t7,0x8($t3) .PF0003ccf0: -/* 3ccf0: 0c00c429 */ jal 0x310a4 +/* 3ccf0: 0c00c429 */ jal alUnlink /* 3ccf4: 8fa40028 */ lw $a0,0x28($sp) /* 3ccf8: 8fa50040 */ lw $a1,0x40($sp) /* 3ccfc: 8fa40028 */ lw $a0,0x28($sp) -/* 3cd00: 0c00c41c */ jal 0x31070 +/* 3cd00: 0c00c41c */ jal alLink /* 3cd04: 24a50048 */ addiu $a1,$a1,0x48 .PF0003cd08: /* 3cd08: 8fb80024 */ lw $t8,0x24($sp) @@ -144,11 +144,11 @@ glabel func0003d340 /* 3cd48: 01cf5821 */ addu $t3,$t6,$t7 /* 3cd4c: af0b0024 */ sw $t3,0x24($t8) /* 3cd50: 8fa40044 */ lw $a0,0x44($sp) -/* 3cd54: 0c011210 */ jal 0x44840 +/* 3cd54: 0c011210 */ jal func00044f40 /* 3cd58: 00002825 */ move $a1,$zero /* 3cd5c: 8fa40044 */ lw $a0,0x44($sp) /* 3cd60: 00002825 */ move $a1,$zero -/* 3cd64: 0c00f17c */ jal 0x3c5f0 +/* 3cd64: 0c00f17c */ jal func0003ccf0 /* 3cd68: 8fa60048 */ lw $a2,0x48($sp) /* 3cd6c: 24190005 */ li $t9,0x5 /* 3cd70: a7b90030 */ sh $t9,0x30($sp) @@ -162,7 +162,7 @@ glabel func0003d340 /* 3cd90: 27a50030 */ addiu $a1,$sp,0x30 /* 3cd94: 8fa60048 */ lw $a2,0x48($sp) /* 3cd98: 00003825 */ move $a3,$zero -/* 3cd9c: 0c00efc4 */ jal 0x3bf10 +/* 3cd9c: 0c00efc4 */ jal alEvtqPostEvent /* 3cda0: 24840048 */ addiu $a0,$a0,0x48 /* 3cda4: 10000001 */ b .PF0003cdac /* 3cda8: 00000000 */ nop diff --git a/src/lib/main.c b/src/lib/main.c index dd3e1371d..12b8626d5 100644 --- a/src/lib/main.c +++ b/src/lib/main.c @@ -195,30 +195,30 @@ GLOBAL_ASM( glabel mainInit /* d260: 27bdeb20 */ addiu $sp,$sp,-5344 /* d264: afbf002c */ sw $ra,0x2c($sp) -/* d268: 0c002f3c */ jal 0xbcf0 +/* d268: 0c002f3c */ jal faultCreateThread /* d26c: afb00028 */ sw $s0,0x28($sp) -/* d270: 0c003378 */ jal 0xcde0 +/* d270: 0c003378 */ jal dmaInit /* d274: 00000000 */ nop -/* d278: 0c002258 */ jal 0x8960 +/* d278: 0c002258 */ jal amgrAllocateStack /* d27c: 00000000 */ nop -/* d280: 0c00557c */ jal 0x155f0 +/* d280: 0c00557c */ jal gvarsInit /* d284: 00000000 */ nop -/* d288: 0c0047dc */ jal 0x11f70 +/* d288: 0c0047dc */ jal func000121e0 /* d28c: 00000000 */ nop -/* d290: 0c0049e7 */ jal 0x1279c +/* d290: 0c0049e7 */ jal func00012a0c /* d294: 00000000 */ nop -/* d298: 0c004d3a */ jal 0x134e8 +/* d298: 0c004d3a */ jal func00013758 /* d29c: 00000000 */ nop -/* d2a0: 0c002668 */ jal 0x99a0 +/* d2a0: 0c002668 */ jal func00009ab0 /* d2a4: 00000000 */ nop -/* d2a8: 0c00bcc2 */ jal 0x2f308 +/* d2a8: 0c00bcc2 */ jal rmonIsDisabled /* d2ac: 00000000 */ nop /* d2b0: 3c018006 */ lui $at,0x8006 -/* d2b4: 0c004e87 */ jal 0x13a1c +/* d2b4: 0c004e87 */ jal contSystemInit /* d2b8: ac22d650 */ sw $v0,-0x29b0($at) /* d2bc: 27a41498 */ addiu $a0,$sp,0x1498 /* d2c0: 27a514d4 */ addiu $a1,$sp,0x14d4 -/* d2c4: 0c011f10 */ jal 0x47c40 +/* d2c4: 0c011f10 */ jal osCreateMesgQueue /* d2c8: 24060001 */ li $a2,0x1 /* d2cc: 00008025 */ move $s0,$zero /* d2d0: 3c070047 */ lui $a3,0x47 @@ -233,16 +233,16 @@ glabel mainInit /* d2f0: afae0010 */ sw $t6,0x10($sp) /* d2f4: 34e7868c */ ori $a3,$a3,0x868c /* d2f8: 27a414b0 */ addiu $a0,$sp,0x14b0 -/* d2fc: 0c012108 */ jal 0x48420 +/* d2fc: 0c012108 */ jal osSetTimer /* d300: 24060000 */ li $a2,0x0 /* d304: 27a41498 */ addiu $a0,$sp,0x1498 /* d308: 27a514d4 */ addiu $a1,$sp,0x14d4 -/* d30c: 0c011ffc */ jal 0x47ff0 +/* d30c: 0c011ffc */ jal osRecvMesg /* d310: 24060001 */ li $a2,0x1 /* d314: 24010001 */ li $at,0x1 /* d318: 56010006 */ bnel $s0,$at,.PF0000d334 /* d31c: 2a010002 */ slti $at,$s0,0x2 -/* d320: 0c004ee1 */ jal 0x13b84 +/* d320: 0c004ee1 */ jal func00013dfc /* d324: 00000000 */ nop /* d328: 10000007 */ b .PF0000d348 /* d32c: 26100001 */ addiu $s0,$s0,0x1 @@ -250,7 +250,7 @@ glabel mainInit .PF0000d334: /* d334: 54200004 */ bnezl $at,.PF0000d348 /* d338: 26100001 */ addiu $s0,$s0,0x1 -/* d33c: 0c00501e */ jal 0x14078 +/* d33c: 0c00501e */ jal contDebugJoy /* d340: 00000000 */ nop /* d344: 26100001 */ addiu $s0,$s0,0x1 .PF0000d348: @@ -259,7 +259,7 @@ glabel mainInit /* d350: 3c070047 */ lui $a3,0x47 /* d354: 3c057005 */ lui $a1,0x7005 /* d358: 24a53738 */ addiu $a1,$a1,0x3738 -/* d35c: 0c004b68 */ jal 0x12da0 +/* d35c: 0c004b68 */ jal argFindByPrefix /* d360: 24040001 */ li $a0,0x1 /* d364: 14400004 */ bnez $v0,.PF0000d378 /* d368: 00002025 */ move $a0,$zero @@ -267,19 +267,19 @@ glabel mainInit /* d370: 3c018006 */ lui $at,0x8006 /* d374: ac2bd650 */ sw $t3,-0x29b0($at) .PF0000d378: -/* d378: 0c00533a */ jal 0x14ce8 +/* d378: 0c00533a */ jal contGetButtons /* d37c: 24051000 */ li $a1,0x1000 /* d380: 1440000f */ bnez $v0,.PF0000d3c0 /* d384: 24040001 */ li $a0,0x1 -/* d388: 0c00533a */ jal 0x14ce8 +/* d388: 0c00533a */ jal contGetButtons /* d38c: 24051000 */ li $a1,0x1000 /* d390: 1440000b */ bnez $v0,.PF0000d3c0 /* d394: 24040002 */ li $a0,0x2 -/* d398: 0c00533a */ jal 0x14ce8 +/* d398: 0c00533a */ jal contGetButtons /* d39c: 24051000 */ li $a1,0x1000 /* d3a0: 14400007 */ bnez $v0,.PF0000d3c0 /* d3a4: 24040003 */ li $a0,0x3 -/* d3a8: 0c00533a */ jal 0x14ce8 +/* d3a8: 0c00533a */ jal contGetButtons /* d3ac: 24051000 */ li $a1,0x1000 /* d3b0: 14400003 */ bnez $v0,.PF0000d3c0 /* d3b4: 3c018006 */ lui $at,0x8006 @@ -309,7 +309,7 @@ glabel mainInit /* d40c: 8dd9001c */ lw $t9,0x1c($t6) /* d410: 8dc10018 */ lw $at,0x18($t6) /* d414: adb9001c */ sw $t9,0x1c($t5) -/* d418: 0c0005b0 */ jal 0x16c0 +/* d418: 0c0005b0 */ jal osGetMemSize /* d41c: ada10018 */ sw $at,0x18($t5) /* d420: 3c010040 */ lui $at,0x40 /* d424: 34210001 */ ori $at,$at,0x1 @@ -348,7 +348,7 @@ glabel mainInit /* d4a0: 256b68e0 */ addiu $t3,$t3,0x68e0 /* d4a4: 39c4003f */ xori $a0,$t6,0x3f /* d4a8: 00808025 */ move $s0,$a0 -/* d4ac: 0c003454 */ jal 0xd150 +/* d4ac: 0c003454 */ jal dmaExec /* d4b0: 01653023 */ subu $a2,$t3,$a1 /* d4b4: 1000000e */ b .PF0000d4f0 /* d4b8: 3c01ffff */ lui $at,0xffff @@ -363,7 +363,7 @@ glabel mainInit /* d4d8: 25ef6030 */ addiu $t7,$t7,0x6030 /* d4dc: 3b04003f */ xori $a0,$t8,0x3f /* d4e0: 00808025 */ move $s0,$a0 -/* d4e4: 0c003454 */ jal 0xd150 +/* d4e4: 0c003454 */ jal dmaExec /* d4e8: 01e53023 */ subu $a2,$t7,$a1 /* d4ec: 3c01ffff */ lui $at,0xffff .PF0000d4f0: @@ -371,7 +371,7 @@ glabel mainInit /* d4f4: 02012821 */ addu $a1,$s0,$at /* d4f8: afa50048 */ sw $a1,0x48($sp) /* d4fc: 02002025 */ move $a0,$s0 -/* d500: 0c001d0c */ jal 0x7430 +/* d500: 0c001d0c */ jal rzipInflate /* d504: 27a60058 */ addiu $a2,$sp,0x58 /* d508: 3c050004 */ lui $a1,0x4 /* d50c: 8faa0048 */ lw $t2,0x48($sp) @@ -415,9 +415,9 @@ glabel mainInit /* d594: 14c9fff3 */ bne $a2,$t1,.PF0000d564 /* d598: 24e70240 */ addiu $a3,$a3,0x240 .PF0000d59c: -/* d59c: 0c0029fd */ jal 0xa7f4 +/* d59c: 0c0029fd */ jal func0000aab0 /* d5a0: 24040002 */ li $a0,0x2 -/* d5a4: 0c002696 */ jal 0x9a58 +/* d5a4: 0c002696 */ jal func00009b50 /* d5a8: 02002025 */ move $a0,$s0 /* d5ac: 8faa0048 */ lw $t2,0x48($sp) /* d5b0: 3c018006 */ lui $at,0x8006 @@ -428,14 +428,14 @@ glabel mainInit /* d5c4: ac2eecf0 */ sw $t6,-0x1310($at) /* d5c8: 2484e080 */ addiu $a0,$a0,-8064 /* d5cc: 27a51478 */ addiu $a1,$sp,0x1478 -/* d5d0: 0c011ffc */ jal 0x47ff0 +/* d5d0: 0c011ffc */ jal osRecvMesg /* d5d4: 00003025 */ move $a2,$zero /* d5d8: 14400007 */ bnez $v0,.PF0000d5f8 .PF0000d5dc: /* d5dc: 3c048009 */ lui $a0,0x8009 /* d5e0: 2484e080 */ addiu $a0,$a0,-8064 /* d5e4: 27a51478 */ addiu $a1,$sp,0x1478 -/* d5e8: 0c011ffc */ jal 0x47ff0 +/* d5e8: 0c011ffc */ jal osRecvMesg /* d5ec: 00003025 */ move $a2,$zero /* d5f0: 1040fffa */ beqz $v0,.PF0000d5dc /* d5f4: 00000000 */ nop @@ -446,7 +446,7 @@ glabel mainInit /* d600: 2484e080 */ addiu $a0,$a0,-8064 /* d604: 27a51478 */ addiu $a1,$sp,0x1478 /* d608: 24060001 */ li $a2,0x1 -/* d60c: 0c011ffc */ jal 0x47ff0 +/* d60c: 0c011ffc */ jal osRecvMesg /* d610: afa31490 */ sw $v1,0x1490($sp) /* d614: 8fb91478 */ lw $t9,0x1478($sp) /* d618: 24010001 */ li $at,0x1 @@ -455,14 +455,14 @@ glabel mainInit /* d624: 27b01458 */ addiu $s0,$sp,0x1458 /* d628: 5561000d */ bnel $t3,$at,.PF0000d660 /* d62c: 28610006 */ slti $at,$v1,0x6 -/* d630: 0c0027d9 */ jal 0x9f64 +/* d630: 0c0027d9 */ jal func0000a044 /* d634: afa31490 */ sw $v1,0x1490($sp) /* d638: 3c048006 */ lui $a0,0x8006 /* d63c: 3c058006 */ lui $a1,0x8006 /* d640: 24a5d990 */ addiu $a1,$a1,-9840 /* d644: 2484d968 */ addiu $a0,$a0,-9880 /* d648: 00003025 */ move $a2,$zero -/* d64c: 0c00bc7d */ jal 0x2f1f4 +/* d64c: 0c00bc7d */ jal func0002f8f4 /* d650: 02003825 */ move $a3,$s0 /* d654: 8fa31490 */ lw $v1,0x1490($sp) /* d658: 24630001 */ addiu $v1,$v1,0x1 @@ -478,105 +478,105 @@ glabel mainInit /* d678: 1000ffff */ b .PF0000d678 /* d67c: 00000000 */ nop .PF0000d680: -/* d680: 0c001c04 */ jal 0x7010 +/* d680: 0c001c04 */ jal func000070d0 /* d684: 00000000 */ nop -/* d688: 0fc6a2ac */ jal 0xf1a8ab0 +/* d688: 0fc6a2ac */ jal func0f1a78b0 /* d68c: 00000000 */ nop -/* d690: 0fc59fbd */ jal 0xf167ef4 +/* d690: 0fc59fbd */ jal func0f166f74 /* d694: 00000000 */ nop -/* d698: 0fc5dbe0 */ jal 0xf176f80 +/* d698: 0fc5dbe0 */ jal stub0f175f50 /* d69c: 00000000 */ nop -/* d6a0: 0fc5dbf0 */ jal 0xf176fc0 +/* d6a0: 0fc5dbf0 */ jal func0f175f90 /* d6a4: 00000000 */ nop /* d6a8: 3c0c8006 */ lui $t4,0x8006 /* d6ac: 8d8cd650 */ lw $t4,-0x29b0($t4) /* d6b0: 11800003 */ beqz $t4,.PF0000d6c0 /* d6b4: 3c047005 */ lui $a0,0x7005 -/* d6b8: 0c004b23 */ jal 0x12c8c +/* d6b8: 0c004b23 */ jal argSetString /* d6bc: 24843740 */ addiu $a0,$a0,0x3740 .PF0000d6c0: /* d6c0: 3c04800b */ lui $a0,0x800b -/* d6c4: 0c012ab0 */ jal 0x4aac0 +/* d6c4: 0c012ab0 */ jal osVirtualToPhysical /* d6c8: 2484d760 */ addiu $a0,$a0,-10400 /* d6cc: 3c038009 */ lui $v1,0x8009 /* d6d0: 8c631050 */ lw $v1,0x1050($v1) /* d6d4: 3c018000 */ lui $at,0x8000 /* d6d8: 00412025 */ or $a0,$v0,$at -/* d6dc: 0c0047de */ jal 0x11f78 +/* d6dc: 0c0047de */ jal memInit /* d6e0: 00642823 */ subu $a1,$v1,$a0 -/* d6e4: 0c0048ae */ jal 0x122b8 +/* d6e4: 0c0048ae */ jal memResetPool /* d6e8: 24040008 */ li $a0,0x8 -/* d6ec: 0c0048ae */ jal 0x122b8 +/* d6ec: 0c0048ae */ jal memResetPool /* d6f0: 24040006 */ li $a0,0x6 -/* d6f4: 0c00330e */ jal 0xcc38 +/* d6f4: 0c00330e */ jal crashReset /* d6f8: 00000000 */ nop -/* d6fc: 0fc02c88 */ jal 0xf00b220 +/* d6fc: 0fc02c88 */ jal mpInitPresetFeatures /* d700: 00000000 */ nop -/* d704: 0fc5df83 */ jal 0xf177e0c +/* d704: 0fc5df83 */ jal func0f176ddc /* d708: 00000000 */ nop -/* d70c: 0c000d28 */ jal 0x34a0 +/* d70c: 0c000d28 */ jal func000034d0 /* d710: 00000000 */ nop -/* d714: 0fc02c68 */ jal 0xf00b1a0 +/* d714: 0fc02c68 */ jal loadTextureList /* d718: 00000000 */ nop -/* d71c: 0fc00000 */ jal 0xf000000 +/* d71c: 0fc00000 */ jal func0f000000 /* d720: 00000000 */ nop -/* d724: 0fc5a29e */ jal 0xf168a78 +/* d724: 0fc5a29e */ jal func0f167af8 /* d728: 00000000 */ nop -/* d72c: 0fc41f77 */ jal 0xf107ddc +/* d72c: 0fc41f77 */ jal cheatsDisableAll /* d730: 00000000 */ nop -/* d734: 0c0039c8 */ jal 0xe720 +/* d734: 0c0039c8 */ jal func0000e9c0 /* d738: 00000000 */ nop -/* d73c: 0fc54f94 */ jal 0xf153e50 +/* d73c: 0fc54f94 */ jal func0f1531a0 /* d740: 00000000 */ nop -/* d744: 0c004d48 */ jal 0x13520 +/* d744: 0c004d48 */ jal func00013790 /* d748: 00000000 */ nop -/* d74c: 0fc4a0f8 */ jal 0xf1283e0 +/* d74c: 0fc4a0f8 */ jal func0f127910 /* d750: 00000000 */ nop -/* d754: 0fc5b718 */ jal 0xf16dc60 +/* d754: 0fc5b718 */ jal frametimeInit /* d758: 00000000 */ nop -/* d75c: 0fc02c84 */ jal 0xf00b210 +/* d75c: 0fc02c84 */ jal stub0f00b200 /* d760: 00000000 */ nop -/* d764: 0c00265c */ jal 0x9970 +/* d764: 0c00265c */ jal func00009a80 /* d768: 00000000 */ nop -/* d76c: 0fc0021c */ jal 0xf000870 +/* d76c: 0fc0021c */ jal stub0f000870 /* d770: 00000000 */ nop -/* d774: 0fc00220 */ jal 0xf000880 +/* d774: 0fc00220 */ jal func0f000880 /* d778: 00000000 */ nop -/* d77c: 0fc00238 */ jal 0xf0008e0 +/* d77c: 0fc00238 */ jal stub0f0008e0 /* d780: 00000000 */ nop -/* d784: 0fc0023c */ jal 0xf0008f0 +/* d784: 0fc0023c */ jal stub0f0008f0 /* d788: 00000000 */ nop -/* d78c: 0fc00240 */ jal 0xf000900 +/* d78c: 0fc00240 */ jal stub0f000900 /* d790: 00000000 */ nop -/* d794: 0fc02c64 */ jal 0xf00b190 +/* d794: 0fc02c64 */ jal stub0f00b180 /* d798: 00000000 */ nop -/* d79c: 0fc00244 */ jal 0xf000910 +/* d79c: 0fc00244 */ jal stub0f000910 /* d7a0: 00000000 */ nop -/* d7a4: 0fc00210 */ jal 0xf000840 +/* d7a4: 0fc00210 */ jal stub0f000840 /* d7a8: 00000000 */ nop -/* d7ac: 0fc62468 */ jal 0xf1891a0 +/* d7ac: 0fc62468 */ jal mpSetDefaultSetup /* d7b0: 00000000 */ nop -/* d7b4: 0fc52bf6 */ jal 0xf14afd8 +/* d7b4: 0fc52bf6 */ jal func0f14a328 /* d7b8: 00000000 */ nop -/* d7bc: 0fc4652e */ jal 0xf1194b8 +/* d7bc: 0fc4652e */ jal func0f1189d8 /* d7c0: 00000000 */ nop -/* d7c4: 0fc52c1b */ jal 0xf14b06c +/* d7c4: 0fc52c1b */ jal func0f14a3bc /* d7c8: 00000000 */ nop -/* d7cc: 0c008b30 */ jal 0x22cc0 +/* d7cc: 0c008b30 */ jal func000233c0 /* d7d0: 00000000 */ nop -/* d7d4: 0fc00040 */ jal 0xf000100 +/* d7d4: 0fc00040 */ jal func0f000100 /* d7d8: 00000000 */ nop -/* d7dc: 0fc0004c */ jal 0xf000130 +/* d7dc: 0fc0004c */ jal func0f000130 /* d7e0: 00000000 */ nop -/* d7e4: 0fc00214 */ jal 0xf000850 +/* d7e4: 0fc00214 */ jal stub0f000850 /* d7e8: 00000000 */ nop -/* d7ec: 0fc00218 */ jal 0xf000860 +/* d7ec: 0fc00218 */ jal stub0f000860 /* d7f0: 00000000 */ nop -/* d7f4: 0fc00024 */ jal 0xf000090 +/* d7f4: 0fc00024 */ jal func0f000090 /* d7f8: 00000000 */ nop -/* d7fc: 0c0026c0 */ jal 0x9b00 +/* d7fc: 0c0026c0 */ jal func00009bf8 /* d800: 00000000 */ nop -/* d804: 0c002779 */ jal 0x9de4 +/* d804: 0c002779 */ jal func00009ec4 /* d808: 24040001 */ li $a0,0x1 /* d80c: 3c0f8006 */ lui $t7,0x8006 /* d810: 8defd674 */ lw $t7,-0x298c($t7) @@ -584,7 +584,7 @@ glabel mainInit /* d818: ac20d9b8 */ sw $zero,-0x2648($at) /* d81c: 51e00004 */ beqzl $t7,.PF0000d830 /* d820: 8fbf002c */ lw $ra,0x2c($sp) -/* d824: 0c011f84 */ jal 0x47e10 +/* d824: 0c011f84 */ jal osGetCount /* d828: 00000000 */ nop /* d82c: 8fbf002c */ lw $ra,0x2c($sp) .PF0000d830: diff --git a/src/lib/model.c b/src/lib/model.c index 616c40337..8e1b95b0a 100644 --- a/src/lib/model.c +++ b/src/lib/model.c @@ -773,7 +773,7 @@ glabel var70053f98pf /* 1ae84: 510000b1 */ beqzl $t0,.PF0001b14c /* 1ae88: 8fbf0014 */ lw $ra,0x14($sp) /* 1ae8c: afa40048 */ sw $a0,0x48($sp) -/* 1ae90: 0c0069eb */ jal 0x1a7ac +/* 1ae90: 0c0069eb */ jal modelGetNodeData /* 1ae94: afa80040 */ sw $t0,0x40($sp) /* 1ae98: 804e0000 */ lb $t6,0x0($v0) /* 1ae9c: 8fa80040 */ lw $t0,0x40($sp) @@ -805,7 +805,7 @@ glabel var70053f98pf /* 1af04: 46009103 */ div.s $f4,$f18,$f0 /* 1af08: afa80040 */ sw $t0,0x40($sp) /* 1af0c: afa20044 */ sw $v0,0x44($sp) -/* 1af10: 0fc25dec */ jal 0xf0977b0 +/* 1af10: 0fc25dec */ jal floorf /* 1af14: 46062300 */ add.s $f12,$f4,$f6 /* 1af18: 8fa80040 */ lw $t0,0x40($sp) /* 1af1c: 8fa30044 */ lw $v1,0x44($sp) @@ -830,13 +830,13 @@ glabel var70053f98pf /* 1af60: 44061000 */ mfc1 $a2,$f2 /* 1af64: afa30044 */ sw $v1,0x44($sp) /* 1af68: afa80040 */ sw $t0,0x40($sp) -/* 1af6c: 0c006b4a */ jal 0x1ad28 +/* 1af6c: 0c006b4a */ jal func0001af98 /* 1af70: e7a20024 */ swc1 $f2,0x24($sp) /* 1af74: c7a20024 */ lwc1 $f2,0x24($sp) /* 1af78: 8fa30044 */ lw $v1,0x44($sp) /* 1af7c: 44061000 */ mfc1 $a2,$f2 /* 1af80: c46c0030 */ lwc1 $f12,0x30($v1) -/* 1af84: 0c006b5e */ jal 0x1ad78 +/* 1af84: 0c006b5e */ jal func0001afe8 /* 1af88: c46e0020 */ lwc1 $f14,0x20($v1) /* 1af8c: 8fa30044 */ lw $v1,0x44($sp) /* 1af90: 8fa80040 */ lw $t0,0x40($sp) @@ -1182,7 +1182,7 @@ glabel func0001b400 /* 1b1bc: 00c02825 */ move $a1,$a2 /* 1b1c0: afa7026c */ sw $a3,0x26c($sp) /* 1b1c4: afa60270 */ sw $a2,0x270($sp) -/* 1b1c8: 0c0069eb */ jal 0x1a7ac +/* 1b1c8: 0c0069eb */ jal modelGetNodeData /* 1b1cc: afa80260 */ sw $t0,0x260($sp) /* 1b1d0: 8fa7026c */ lw $a3,0x26c($sp) /* 1b1d4: afa2025c */ sw $v0,0x25c($sp) @@ -1209,7 +1209,7 @@ glabel func0001b400 /* 1b228: 8cc50008 */ lw $a1,0x8($a2) /* 1b22c: 50a00006 */ beqzl $a1,.PF0001b248 /* 1b230: 8d8d0000 */ lw $t5,0x0($t4) -/* 1b234: 0c0068d7 */ jal 0x1a35c +/* 1b234: 0c0068d7 */ jal func0001a5cc /* 1b238: 00003025 */ move $a2,$zero /* 1b23c: 10000003 */ b .PF0001b24c /* 1b240: afa2024c */ sw $v0,0x24c($sp) @@ -1228,7 +1228,7 @@ glabel func0001b400 /* 1b26c: afaf0014 */ sw $t7,0x14($sp) /* 1b270: 8fa40240 */ lw $a0,0x240($sp) /* 1b274: 8fa6023c */ lw $a2,0x23c($sp) -/* 1b278: 0c008e54 */ jal 0x23950 +/* 1b278: 0c008e54 */ jal func00024050 /* 1b27c: afae0010 */ sw $t6,0x10($sp) /* 1b280: 3c09800a */ lui $t1,0x800a /* 1b284: 8d29a9dc */ lw $t1,-0x5624($t1) @@ -1245,7 +1245,7 @@ glabel func0001b400 /* 1b2b0: 3c017005 */ lui $at,0x7005 /* 1b2b4: c4323f98 */ lwc1 $f18,0x3f98($at) /* 1b2b8: 46005403 */ div.s $f16,$f10,$f0 -/* 1b2bc: 0fc25dec */ jal 0xf0977b0 +/* 1b2bc: 0fc25dec */ jal floorf /* 1b2c0: 46128300 */ add.s $f12,$f16,$f18 /* 1b2c4: c604001c */ lwc1 $f4,0x1c($s0) /* 1b2c8: 46040082 */ mul.s $f2,$f0,$f4 @@ -1270,13 +1270,13 @@ glabel func0001b400 /* 1b30c: afad001c */ sw $t5,0x1c($sp) /* 1b310: afac0018 */ sw $t4,0x18($sp) /* 1b314: afab0014 */ sw $t3,0x14($sp) -/* 1b318: 0c008e54 */ jal 0x23950 +/* 1b318: 0c008e54 */ jal func00024050 /* 1b31c: afaa0010 */ sw $t2,0x10($sp) /* 1b320: c7a20154 */ lwc1 $f2,0x154($sp) /* 1b324: 27a40230 */ addiu $a0,$sp,0x230 /* 1b328: 27a50148 */ addiu $a1,$sp,0x148 /* 1b32c: 44061000 */ mfc1 $a2,$f2 -/* 1b330: 0c006b83 */ jal 0x1ae0c +/* 1b330: 0c006b83 */ jal func0001b07c /* 1b334: 00000000 */ nop /* 1b338: 44804000 */ mtc1 $zero,$f8 .PF0001b33c: @@ -1296,7 +1296,7 @@ glabel func0001b400 /* 1b370: afb80018 */ sw $t8,0x18($sp) /* 1b374: afaf0014 */ sw $t7,0x14($sp) /* 1b378: 8fa40240 */ lw $a0,0x240($sp) -/* 1b37c: 0c008e54 */ jal 0x23950 +/* 1b37c: 0c008e54 */ jal func00024050 /* 1b380: afae0010 */ sw $t6,0x10($sp) /* 1b384: 44808000 */ mtc1 $zero,$f16 /* 1b388: c6120034 */ lwc1 $f18,0x34($s0) @@ -1314,11 +1314,11 @@ glabel func0001b400 /* 1b3b8: afac001c */ sw $t4,0x1c($sp) /* 1b3bc: afab0018 */ sw $t3,0x18($sp) /* 1b3c0: afaa0014 */ sw $t2,0x14($sp) -/* 1b3c4: 0c008e54 */ jal 0x23950 +/* 1b3c4: 0c008e54 */ jal func00024050 /* 1b3c8: afa90010 */ sw $t1,0x10($sp) /* 1b3cc: 27a40124 */ addiu $a0,$sp,0x124 /* 1b3d0: 27a500d0 */ addiu $a1,$sp,0xd0 -/* 1b3d4: 0c006b83 */ jal 0x1ae0c +/* 1b3d4: 0c006b83 */ jal func0001b07c /* 1b3d8: 8e060034 */ lw $a2,0x34($s0) /* 1b3dc: 860d0000 */ lh $t5,0x0($s0) .PF0001b3e0: @@ -1343,41 +1343,41 @@ glabel func0001b400 /* 1b428: 318d0002 */ andi $t5,$t4,0x2 /* 1b42c: 15a0000e */ bnez $t5,.PF0001b468 /* 1b430: 00000000 */ nop -/* 1b434: 0c005841 */ jal 0x16104 +/* 1b434: 0c005841 */ jal func00016374 /* 1b438: c5cc0014 */ lwc1 $f12,0x14($t6) /* 1b43c: 27a40124 */ addiu $a0,$sp,0x124 -/* 1b440: 0c005887 */ jal 0x1621c +/* 1b440: 0c005887 */ jal func0001648c /* 1b444: 27a50038 */ addiu $a1,$sp,0x38 /* 1b448: 27a40078 */ addiu $a0,$sp,0x78 -/* 1b44c: 0c00565c */ jal 0x15970 +/* 1b44c: 0c00565c */ jal func00015be0 /* 1b450: 27a50038 */ addiu $a1,$sp,0x38 /* 1b454: 27a40038 */ addiu $a0,$sp,0x38 -/* 1b458: 0fc25bd9 */ jal 0xf096f64 +/* 1b458: 0fc25bd9 */ jal func0f097044 /* 1b45c: 27a500ec */ addiu $a1,$sp,0xec /* 1b460: 10000004 */ b .PF0001b474 /* 1b464: 27a40230 */ addiu $a0,$sp,0x230 .PF0001b468: -/* 1b468: 0fc25af0 */ jal 0xf096bc0 +/* 1b468: 0fc25af0 */ jal func0f096ca0 /* 1b46c: 27a500ec */ addiu $a1,$sp,0xec /* 1b470: 27a40230 */ addiu $a0,$sp,0x230 .PF0001b474: -/* 1b474: 0fc25af0 */ jal 0xf096bc0 +/* 1b474: 0fc25af0 */ jal func0f096ca0 /* 1b478: 27a500fc */ addiu $a1,$sp,0xfc /* 1b47c: 27a400fc */ addiu $a0,$sp,0xfc -/* 1b480: 0fc25d78 */ jal 0xf0975e0 +/* 1b480: 0fc25d78 */ jal func0f0976c0 /* 1b484: 27a500ec */ addiu $a1,$sp,0xec /* 1b488: 27a400fc */ addiu $a0,$sp,0xfc /* 1b48c: 27a500ec */ addiu $a1,$sp,0xec /* 1b490: 8e060054 */ lw $a2,0x54($s0) -/* 1b494: 0fc25c76 */ jal 0xf0971d8 +/* 1b494: 0fc25c76 */ jal func0f0972b8 /* 1b498: 27a700dc */ addiu $a3,$sp,0xdc /* 1b49c: 27a400dc */ addiu $a0,$sp,0xdc -/* 1b4a0: 0fc25b7d */ jal 0xf096df4 +/* 1b4a0: 0fc25b7d */ jal func0f096ed4 /* 1b4a4: 27a501d8 */ addiu $a1,$sp,0x1d8 /* 1b4a8: 10000004 */ b .PF0001b4bc /* 1b4ac: 86180000 */ lh $t8,0x0($s0) .PF0001b4b0: -/* 1b4b0: 0c005887 */ jal 0x1621c +/* 1b4b0: 0c005887 */ jal func0001648c /* 1b4b4: 27a501d8 */ addiu $a1,$sp,0x1d8 /* 1b4b8: 86180000 */ lh $t8,0x0($s0) .PF0001b4bc: @@ -1393,7 +1393,7 @@ glabel func0001b400 /* 1b4e0: 314b0002 */ andi $t3,$t2,0x2 /* 1b4e4: 51600006 */ beqzl $t3,.PF0001b500 /* 1b4e8: c5800018 */ lwc1 $f0,0x18($t4) -/* 1b4ec: 0c00591b */ jal 0x1646c +/* 1b4ec: 0c00591b */ jal func000166dc /* 1b4f0: 27a50198 */ addiu $a1,$sp,0x198 /* 1b4f4: 10000011 */ b .PF0001b53c /* 1b4f8: 27b00158 */ addiu $s0,$sp,0x158 @@ -1406,19 +1406,19 @@ glabel func0001b400 /* 1b510: 45030006 */ bc1tl .PF0001b52c /* 1b514: 8fa40254 */ lw $a0,0x254($sp) /* 1b518: 44060000 */ mfc1 $a2,$f0 -/* 1b51c: 0c006b5e */ jal 0x1ad78 +/* 1b51c: 0c006b5e */ jal func0001afe8 /* 1b520: c58e001c */ lwc1 $f14,0x1c($t4) /* 1b524: e7a00250 */ swc1 $f0,0x250($sp) /* 1b528: 8fa40254 */ lw $a0,0x254($sp) .PF0001b52c: /* 1b52c: 8fa50250 */ lw $a1,0x250($sp) -/* 1b530: 0c0057f6 */ jal 0x15fd8 +/* 1b530: 0c0057f6 */ jal func00016248 /* 1b534: 27a60198 */ addiu $a2,$sp,0x198 /* 1b538: 27b00158 */ addiu $s0,$sp,0x158 .PF0001b53c: /* 1b53c: 02003025 */ move $a2,$s0 /* 1b540: 27a40198 */ addiu $a0,$sp,0x198 -/* 1b544: 0c00565d */ jal 0x15974 +/* 1b544: 0c00565d */ jal func00015be4 /* 1b548: 27a501d8 */ addiu $a1,$sp,0x1d8 /* 1b54c: 3c013f80 */ lui $at,0x3f80 /* 1b550: 44814000 */ mtc1 $at,$f8 @@ -1428,7 +1428,7 @@ glabel func0001b400 /* 1b560: 00000000 */ nop /* 1b564: 45030004 */ bc1tl .PF0001b578 /* 1b568: 8fa4024c */ lw $a0,0x24c($sp) -/* 1b56c: 0c005737 */ jal 0x15cdc +/* 1b56c: 0c005737 */ jal func00015f4c /* 1b570: 46003306 */ mov.s $f12,$f6 /* 1b574: 8fa4024c */ lw $a0,0x24c($sp) .PF0001b578: @@ -1436,12 +1436,12 @@ glabel func0001b400 /* 1b57c: 8fa50244 */ lw $a1,0x244($sp) /* 1b580: 10800005 */ beqz $a0,.PF0001b598 /* 1b584: 00000000 */ nop -/* 1b588: 0c00565d */ jal 0x15974 +/* 1b588: 0c00565d */ jal func00015be4 /* 1b58c: 02002825 */ move $a1,$s0 /* 1b590: 10000004 */ b .PF0001b5a4 /* 1b594: 8fbf002c */ lw $ra,0x2c($sp) .PF0001b598: -/* 1b598: 0c0056aa */ jal 0x15aa8 +/* 1b598: 0c0056aa */ jal func00015d18 /* 1b59c: 02002025 */ move $a0,$s0 /* 1b5a0: 8fbf002c */ lw $ra,0x2c($sp) .PF0001b5a4: @@ -2349,7 +2349,7 @@ glabel var70053fc0pf /* 1bdf8: afb80014 */ sw $t8,0x14($sp) /* 1bdfc: 8fa40154 */ lw $a0,0x154($sp) /* 1be00: 8fa60150 */ lw $a2,0x150($sp) -/* 1be04: 0c008e54 */ jal 0x23950 +/* 1be04: 0c008e54 */ jal func00024050 /* 1be08: afb90010 */ sw $t9,0x10($sp) /* 1be0c: 3c0a800a */ lui $t2,0x800a /* 1be10: 8d4aa9dc */ lw $t2,-0x5624($t2) @@ -2365,7 +2365,7 @@ glabel var70053fc0pf /* 1be38: 3c017005 */ lui $at,0x7005 /* 1be3c: c4283fcc */ lwc1 $f8,0x3fcc($at) /* 1be40: 46002183 */ div.s $f6,$f4,$f0 -/* 1be44: 0fc25dec */ jal 0xf0977b0 +/* 1be44: 0fc25dec */ jal floorf /* 1be48: 46083300 */ add.s $f12,$f6,$f8 /* 1be4c: c60a001c */ lwc1 $f10,0x1c($s0) /* 1be50: 44807000 */ mtc1 $zero,$f14 @@ -2390,13 +2390,13 @@ glabel var70053fc0pf /* 1be94: e7a200e0 */ swc1 $f2,0xe0($sp) /* 1be98: afad0018 */ sw $t5,0x18($sp) /* 1be9c: afac0014 */ sw $t4,0x14($sp) -/* 1bea0: 0c008e54 */ jal 0x23950 +/* 1bea0: 0c008e54 */ jal func00024050 /* 1bea4: afab0010 */ sw $t3,0x10($sp) /* 1bea8: c7a200e0 */ lwc1 $f2,0xe0($sp) /* 1beac: 27a40144 */ addiu $a0,$sp,0x144 /* 1beb0: 27a500d4 */ addiu $a1,$sp,0xd4 /* 1beb4: 44061000 */ mfc1 $a2,$f2 -/* 1beb8: 0c006b83 */ jal 0x1ae0c +/* 1beb8: 0c006b83 */ jal func0001b07c /* 1bebc: 00000000 */ nop /* 1bec0: 8faf003c */ lw $t7,0x3c($sp) /* 1bec4: c7a200e0 */ lwc1 $f2,0xe0($sp) @@ -2408,7 +2408,7 @@ glabel var70053fc0pf /* 1bedc: 44807000 */ mtc1 $zero,$f14 .PF0001bee0: /* 1bee0: 44061000 */ mfc1 $a2,$f2 -/* 1bee4: 0c006b4a */ jal 0x1ad28 +/* 1bee4: 0c006b4a */ jal func0001af98 /* 1bee8: 27a500c8 */ addiu $a1,$sp,0xc8 .PF0001beec: /* 1beec: 44807000 */ mtc1 $zero,$f14 @@ -2446,7 +2446,7 @@ glabel var70053fc0pf /* 1bf60: afaa001c */ sw $t2,0x1c($sp) /* 1bf64: afa90018 */ sw $t1,0x18($sp) /* 1bf68: afa80014 */ sw $t0,0x14($sp) -/* 1bf6c: 0c008e54 */ jal 0x23950 +/* 1bf6c: 0c008e54 */ jal func00024050 /* 1bf70: afb80010 */ sw $t8,0x10($sp) /* 1bf74: 44802000 */ mtc1 $zero,$f4 /* 1bf78: c6060034 */ lwc1 $f6,0x34($s0) @@ -2464,26 +2464,26 @@ glabel var70053fc0pf /* 1bfa8: afae001c */ sw $t6,0x1c($sp) /* 1bfac: afad0018 */ sw $t5,0x18($sp) /* 1bfb0: afac0014 */ sw $t4,0x14($sp) -/* 1bfb4: 0c008e54 */ jal 0x23950 +/* 1bfb4: 0c008e54 */ jal func00024050 /* 1bfb8: afab0010 */ sw $t3,0x10($sp) /* 1bfbc: 27a400b0 */ addiu $a0,$sp,0xb0 /* 1bfc0: 27a5005c */ addiu $a1,$sp,0x5c -/* 1bfc4: 0c006b83 */ jal 0x1ae0c +/* 1bfc4: 0c006b83 */ jal func0001b07c /* 1bfc8: 8e060034 */ lw $a2,0x34($s0) /* 1bfcc: 27a40144 */ addiu $a0,$sp,0x144 .PF0001bfd0: -/* 1bfd0: 0fc25af0 */ jal 0xf096bc0 +/* 1bfd0: 0fc25af0 */ jal func0f096ca0 /* 1bfd4: 27a50088 */ addiu $a1,$sp,0x88 /* 1bfd8: 27a400b0 */ addiu $a0,$sp,0xb0 -/* 1bfdc: 0fc25af0 */ jal 0xf096bc0 +/* 1bfdc: 0fc25af0 */ jal func0f096ca0 /* 1bfe0: 27a50078 */ addiu $a1,$sp,0x78 /* 1bfe4: 27a40088 */ addiu $a0,$sp,0x88 -/* 1bfe8: 0fc25d78 */ jal 0xf0975e0 +/* 1bfe8: 0fc25d78 */ jal func0f0976c0 /* 1bfec: 27a50078 */ addiu $a1,$sp,0x78 /* 1bff0: 27a70068 */ addiu $a3,$sp,0x68 /* 1bff4: 27a40088 */ addiu $a0,$sp,0x88 /* 1bff8: 27a50078 */ addiu $a1,$sp,0x78 -/* 1bffc: 0fc25c76 */ jal 0xf0971d8 +/* 1bffc: 0fc25c76 */ jal func0f0972b8 /* 1c000: 8e060054 */ lw $a2,0x54($s0) /* 1c004: 44804000 */ mtc1 $zero,$f8 /* 1c008: c7aa0138 */ lwc1 $f10,0x138($sp) @@ -2538,7 +2538,7 @@ glabel var70053fc0pf /* 1c0c8: 8fa40160 */ lw $a0,0x160($sp) .PF0001c0cc: /* 1c0cc: afb80010 */ sw $t8,0x10($sp) -/* 1c0d0: 0c006e6f */ jal 0x1b9bc +/* 1c0d0: 0c006e6f */ jal func0001bc14 /* 1c0d4: afa80014 */ sw $t0,0x14($sp) /* 1c0d8: 100000a2 */ b .PF0001c364 /* 1c0dc: 8fbf002c */ lw $ra,0x2c($sp) @@ -2556,20 +2556,20 @@ glabel var70053fc0pf /* 1c108: afad0014 */ sw $t5,0x14($sp) /* 1c10c: 8fa40160 */ lw $a0,0x160($sp) /* 1c110: 01202825 */ move $a1,$t1 -/* 1c114: 0c006e6f */ jal 0x1b9bc +/* 1c114: 0c006e6f */ jal func0001bc14 /* 1c118: afac0010 */ sw $t4,0x10($sp) /* 1c11c: 10000091 */ b .PF0001c364 /* 1c120: 8fbf002c */ lw $ra,0x2c($sp) .PF0001c124: /* 1c124: afae0010 */ sw $t6,0x10($sp) -/* 1c128: 0c006e6f */ jal 0x1b9bc +/* 1c128: 0c006e6f */ jal func0001bc14 /* 1c12c: afaf0014 */ sw $t7,0x14($sp) /* 1c130: 1000008c */ b .PF0001c364 /* 1c134: 8fbf002c */ lw $ra,0x2c($sp) .PF0001c138: /* 1c138: 13200019 */ beqz $t9,.PF0001c1a0 /* 1c13c: c7a60138 */ lwc1 $f6,0x138($sp) -/* 1c140: 0fc57602 */ jal 0xf15d808 +/* 1c140: 0fc57602 */ jal func0f15c888 /* 1c144: 00000000 */ nop /* 1c148: c7a60138 */ lwc1 $f6,0x138($sp) /* 1c14c: c7b0013c */ lwc1 $f16,0x13c($sp) @@ -2589,7 +2589,7 @@ glabel var70053fc0pf /* 1c184: 8fa50164 */ lw $a1,0x164($sp) /* 1c188: e7a80140 */ swc1 $f8,0x140($sp) /* 1c18c: 8fa60168 */ lw $a2,0x168($sp) -/* 1c190: 0c006d6d */ jal 0x1b5b4 +/* 1c190: 0c006d6d */ jal func0001b80c /* 1c194: 27a70144 */ addiu $a3,$sp,0x144 /* 1c198: 10000072 */ b .PF0001c364 /* 1c19c: 8fbf002c */ lw $ra,0x2c($sp) @@ -2644,7 +2644,7 @@ glabel var70053fc0pf /* 1c250: 8fa60168 */ lw $a2,0x168($sp) /* 1c254: afaf0010 */ sw $t7,0x10($sp) /* 1c258: afa00014 */ sw $zero,0x14($sp) -/* 1c25c: 0c006d6d */ jal 0x1b5b4 +/* 1c25c: 0c006d6d */ jal func0001b80c /* 1c260: afb90018 */ sw $t9,0x18($sp) /* 1c264: 1000003f */ b .PF0001c364 /* 1c268: 8fbf002c */ lw $ra,0x2c($sp) @@ -2665,7 +2665,7 @@ glabel var70053fc0pf /* 1c2a0: 03003025 */ move $a2,$t8 /* 1c2a4: 27a70144 */ addiu $a3,$sp,0x144 /* 1c2a8: afa00014 */ sw $zero,0x14($sp) -/* 1c2ac: 0c006d6d */ jal 0x1b5b4 +/* 1c2ac: 0c006d6d */ jal func0001b80c /* 1c2b0: afac0010 */ sw $t4,0x10($sp) /* 1c2b4: 1000002b */ b .PF0001c364 /* 1c2b8: 8fbf002c */ lw $ra,0x2c($sp) @@ -2674,7 +2674,7 @@ glabel var70053fc0pf /* 1c2c0: 27ae012c */ addiu $t6,$sp,0x12c /* 1c2c4: afae0018 */ sw $t6,0x18($sp) /* 1c2c8: afad0010 */ sw $t5,0x10($sp) -/* 1c2cc: 0c006d6d */ jal 0x1b5b4 +/* 1c2cc: 0c006d6d */ jal func0001b80c /* 1c2d0: afa00014 */ sw $zero,0x14($sp) /* 1c2d4: 10000023 */ b .PF0001c364 /* 1c2d8: 8fbf002c */ lw $ra,0x2c($sp) @@ -2685,7 +2685,7 @@ glabel var70053fc0pf /* 1c2e8: 8de50008 */ lw $a1,0x8($t7) /* 1c2ec: 50a00006 */ beqzl $a1,.PF0001c308 /* 1c2f0: 8f300000 */ lw $s0,0x0($t9) -/* 1c2f4: 0c0068d7 */ jal 0x1a35c +/* 1c2f4: 0c0068d7 */ jal func0001a5cc /* 1c2f8: 00003025 */ move $a2,$zero /* 1c2fc: 10000002 */ b .PF0001c308 /* 1c300: 00408025 */ move $s0,$v0 @@ -2694,7 +2694,7 @@ glabel var70053fc0pf /* 1c308: 1200000f */ beqz $s0,.PF0001c348 /* 1c30c: 8fa40158 */ lw $a0,0x158($sp) /* 1c310: 8fa40158 */ lw $a0,0x158($sp) -/* 1c314: 0c00591b */ jal 0x1646c +/* 1c314: 0c00591b */ jal func000166dc /* 1c318: 27a500e8 */ addiu $a1,$sp,0xe8 /* 1c31c: 8fa80158 */ lw $t0,0x158($sp) /* 1c320: 8faa0164 */ lw $t2,0x164($sp) @@ -2703,7 +2703,7 @@ glabel var70053fc0pf /* 1c32c: 8d49000c */ lw $t1,0xc($t2) /* 1c330: 27a500e8 */ addiu $a1,$sp,0xe8 /* 1c334: 00186180 */ sll $t4,$t8,0x6 -/* 1c338: 0c00565d */ jal 0x15974 +/* 1c338: 0c00565d */ jal func00015be4 /* 1c33c: 012c3021 */ addu $a2,$t1,$t4 /* 1c340: 10000008 */ b .PF0001c364 /* 1c344: 8fbf002c */ lw $ra,0x2c($sp) @@ -2712,7 +2712,7 @@ glabel var70053fc0pf /* 1c34c: 848f000e */ lh $t7,0xe($a0) /* 1c350: 8dae000c */ lw $t6,0xc($t5) /* 1c354: 000fc980 */ sll $t9,$t7,0x6 -/* 1c358: 0c00591b */ jal 0x1646c +/* 1c358: 0c00591b */ jal func000166dc /* 1c35c: 01d92821 */ addu $a1,$t6,$t9 /* 1c360: 8fbf002c */ lw $ra,0x2c($sp) .PF0001c364: @@ -3960,13 +3960,13 @@ glabel func0001ce64 /* 1cc54: 15400007 */ bnez $t2,.PF0001cc74 /* 1cc58: 00000000 */ nop /* 1cc5c: afa40018 */ sw $a0,0x18($sp) -/* 1cc60: 0c006104 */ jal 0x18410 +/* 1cc60: 0c006104 */ jal func00018680 /* 1cc64: afa5001c */ sw $a1,0x1c($sp) /* 1cc68: 8fa40018 */ lw $a0,0x18($sp) /* 1cc6c: 14400003 */ bnez $v0,.PF0001cc7c /* 1cc70: 8fa5001c */ lw $a1,0x1c($sp) .PF0001cc74: -/* 1cc74: 0c0072b6 */ jal 0x1cad8 +/* 1cc74: 0c0072b6 */ jal func0001cd18 /* 1cc78: 00000000 */ nop .PF0001cc7c: /* 1cc7c: 8fbf0014 */ lw $ra,0x14($sp) diff --git a/src/lib/reset.c b/src/lib/reset.c index 75588c021..b82b75c1f 100644 --- a/src/lib/reset.c +++ b/src/lib/reset.c @@ -32,17 +32,17 @@ glabel resetproc /* 2e00: afa0002c */ sw $zero,0x2c($sp) /* 2e04: 2484fff8 */ addiu $a0,$a0,-8 /* 2e08: 27a5002c */ addiu $a1,$sp,0x2c -/* 2e0c: 0c011ffc */ jal 0x47ff0 +/* 2e0c: 0c011ffc */ jal osRecvMesg /* 2e10: 24060001 */ li $a2,0x1 /* 2e14: 240e0001 */ li $t6,0x1 /* 2e18: 3c018006 */ lui $at,0x8006 -/* 2e1c: 0c002413 */ jal 0x904c +/* 2e1c: 0c002413 */ jal amgrStopThread /* 2e20: a02ecb80 */ sb $t6,-0x3480($at) /* 2e24: 3c048009 */ lui $a0,0x8009 -/* 2e28: 0c011f1c */ jal 0x47c70 +/* 2e28: 0c011f1c */ jal osStopThread /* 2e2c: 2484dc20 */ addiu $a0,$a0,-9184 /* 2e30: 00002025 */ move $a0,$zero -/* 2e34: 0c011f4c */ jal 0x47d30 +/* 2e34: 0c011f4c */ jal osSetThreadPri /* 2e38: 2405000b */ li $a1,0xb /* 2e3c: 3c028006 */ lui $v0,0x8006 /* 2e40: 2442f3c0 */ addiu $v0,$v0,-3136 @@ -50,15 +50,15 @@ glabel resetproc /* 2e48: 3c048006 */ lui $a0,0x8006 /* 2e4c: ac43052c */ sw $v1,0x52c($v0) /* 2e50: ac430540 */ sw $v1,0x540($v0) -/* 2e54: 0c012194 */ jal 0x48650 +/* 2e54: 0c012194 */ jal osViSetMode /* 2e58: 2484f8c0 */ addiu $a0,$a0,-1856 -/* 2e5c: 0c012178 */ jal 0x485e0 +/* 2e5c: 0c012178 */ jal osViBlack /* 2e60: 24040001 */ li $a0,0x1 -/* 2e64: 0c012288 */ jal 0x48a20 +/* 2e64: 0c012288 */ jal osGetTime /* 2e68: 00000000 */ nop /* 2e6c: 3c018009 */ lui $at,0x8009 /* 2e70: ac220340 */ sw $v0,0x340($at) -/* 2e74: 0c012288 */ jal 0x48a20 +/* 2e74: 0c012288 */ jal osGetTime /* 2e78: ac230344 */ sw $v1,0x344($at) /* 2e7c: 3c198009 */ lui $t9,0x8009 /* 2e80: 8f390344 */ lw $t9,0x344($t9) @@ -78,7 +78,7 @@ glabel resetproc /* 2eb8: 10200015 */ beqz $at,.PF00002f10 /* 2ebc: 00000000 */ nop .PF00002ec0: -/* 2ec0: 0c012288 */ jal 0x48a20 +/* 2ec0: 0c012288 */ jal osGetTime /* 2ec4: 00000000 */ nop /* 2ec8: 3c0b8009 */ lui $t3,0x8009 /* 2ecc: 8d6b0344 */ lw $t3,0x344($t3) @@ -99,7 +99,7 @@ glabel resetproc /* 2f08: 1420ffed */ bnez $at,.PF00002ec0 /* 2f0c: 00000000 */ nop .PF00002f10: -/* 2f10: 0c0053c9 */ jal 0x14f24 +/* 2f10: 0c0053c9 */ jal func0001519c /* 2f14: 00000000 */ nop .PF00002f18: /* 2f18: 1000ffff */ b .PF00002f18 diff --git a/src/lib/ultra/os/initialize2.c b/src/lib/ultra/os/initialize2.c index 498a8145a..2a9201735 100644 --- a/src/lib/ultra/os/initialize2.c +++ b/src/lib/ultra/os/initialize2.c @@ -30,25 +30,25 @@ glabel osInitialize2 /* 517cc: 3c018009 */ lui $at,0x8009 /* 517d0: afb00018 */ sw $s0,0x18($sp) /* 517d4: afa00030 */ sw $zero,0x30($sp) -/* 517d8: 0c012974 */ jal 0x4a5d0 +/* 517d8: 0c012974 */ jal __osGetSR /* 517dc: ac2e0fb0 */ sw $t6,0xfb0($at) /* 517e0: 00408025 */ move $s0,$v0 /* 517e4: 3c012000 */ lui $at,0x2000 -/* 517e8: 0c012970 */ jal 0x4a5c0 +/* 517e8: 0c012970 */ jal __osSetSR /* 517ec: 02012025 */ or $a0,$s0,$at /* 517f0: 3c040100 */ lui $a0,0x100 -/* 517f4: 0c011eb8 */ jal 0x47ae0 +/* 517f4: 0c011eb8 */ jal __osSetFpcCsr /* 517f8: 34840800 */ ori $a0,$a0,0x800 /* 517fc: 3c041fc0 */ lui $a0,0x1fc0 /* 51800: 348407fc */ ori $a0,$a0,0x7fc -/* 51804: 0c012978 */ jal 0x4a5e0 +/* 51804: 0c012978 */ jal __osSiRawReadIo /* 51808: 27a50034 */ addiu $a1,$sp,0x34 /* 5180c: 10400007 */ beqz $v0,.PF0005182c /* 51810: 00000000 */ nop .PF00051814: /* 51814: 3c041fc0 */ lui $a0,0x1fc0 /* 51818: 348407fc */ ori $a0,$a0,0x7fc -/* 5181c: 0c012978 */ jal 0x4a5e0 +/* 5181c: 0c012978 */ jal __osSiRawReadIo /* 51820: 27a50034 */ addiu $a1,$sp,0x34 /* 51824: 1440fffb */ bnez $v0,.PF00051814 /* 51828: 00000000 */ nop @@ -57,7 +57,7 @@ glabel osInitialize2 /* 51830: 3c041fc0 */ lui $a0,0x1fc0 /* 51834: 348407fc */ ori $a0,$a0,0x7fc /* 51838: 34af0008 */ ori $t7,$a1,0x8 -/* 5183c: 0c01298c */ jal 0x4a630 +/* 5183c: 0c01298c */ jal __osSiRawWriteIo /* 51840: 01e02825 */ move $a1,$t7 /* 51844: 10400009 */ beqz $v0,.PF0005186c /* 51848: 00000000 */ nop @@ -66,7 +66,7 @@ glabel osInitialize2 /* 51850: 3c041fc0 */ lui $a0,0x1fc0 /* 51854: 348407fc */ ori $a0,$a0,0x7fc /* 51858: 34b80008 */ ori $t8,$a1,0x8 -/* 5185c: 0c01298c */ jal 0x4a630 +/* 5185c: 0c01298c */ jal __osSiRawWriteIo /* 51860: 03002825 */ move $a1,$t8 /* 51864: 1440fff9 */ bnez $v0,.PF0005184c /* 51868: 00000000 */ nop @@ -119,30 +119,30 @@ glabel osInitialize2 /* 51920: 8dc10008 */ lw $at,0x8($t6) /* 51924: ade10008 */ sw $at,0x8($t7) /* 51928: 8dd8000c */ lw $t8,0xc($t6) -/* 5192c: 0c0129a0 */ jal 0x4a680 +/* 5192c: 0c0129a0 */ jal osWritebackDCache /* 51930: adf8000c */ sw $t8,0xc($t7) /* 51934: 3c048000 */ lui $a0,0x8000 -/* 51938: 0c011e94 */ jal 0x47a50 +/* 51938: 0c011e94 */ jal osInvalICache /* 5193c: 24050190 */ li $a1,0x190 -/* 51940: 0c01469a */ jal 0x51a68 +/* 51940: 0c01469a */ jal func00051a68pf /* 51944: 00000000 */ nop -/* 51948: 0c014820 */ jal 0x52080 +/* 51948: 0c014820 */ jal osUnmapTLBAll /* 5194c: 00000000 */ nop -/* 51950: 0c000bf0 */ jal 0x2fc0 +/* 51950: 0c000bf0 */ jal osMapTLBRdb /* 51954: 00000000 */ nop /* 51958: 3c048006 */ lui $a0,0x8006 /* 5195c: 3c058006 */ lui $a1,0x8006 /* 51960: 8ca5cc14 */ lw $a1,-0x33ec($a1) /* 51964: 8c84cc10 */ lw $a0,-0x33f0($a0) /* 51968: 24060000 */ li $a2,0x0 -/* 5196c: 0c0136da */ jal 0x4db68 +/* 5196c: 0c0136da */ jal __ll_mul /* 51970: 24070003 */ li $a3,0x3 /* 51974: afa20020 */ sw $v0,0x20($sp) /* 51978: afa30024 */ sw $v1,0x24($sp) /* 5197c: 8fa50024 */ lw $a1,0x24($sp) /* 51980: 8fa40020 */ lw $a0,0x20($sp) /* 51984: 24060000 */ li $a2,0x0 -/* 51988: 0c01369a */ jal 0x4da68 +/* 51988: 0c01369a */ jal __ull_div /* 5198c: 24070004 */ li $a3,0x4 /* 51990: 3c088000 */ lui $t0,0x8000 /* 51994: 8d08030c */ lw $t0,0x30c($t0) @@ -152,7 +152,7 @@ glabel osInitialize2 /* 519a4: ac23cc14 */ sw $v1,-0x33ec($at) /* 519a8: 3c048000 */ lui $a0,0x8000 /* 519ac: 2484031c */ addiu $a0,$a0,0x31c -/* 519b0: 0c0129c0 */ jal 0x4a700 +/* 519b0: 0c0129c0 */ jal bzero /* 519b4: 24050040 */ li $a1,0x40 .PF000519b8: /* 519b8: 3c198000 */ lui $t9,0x8000 @@ -181,7 +181,7 @@ glabel osInitialize2 /* 51a0c: 3c018006 */ lui $at,0x8006 /* 51a10: ac2d0fe8 */ sw $t5,0xfe8($at) .PF00051a14: -/* 51a14: 0c0129e8 */ jal 0x4a7a0 +/* 51a14: 0c0129e8 */ jal __osGetCause /* 51a18: 00000000 */ nop /* 51a1c: 304c1000 */ andi $t4,$v0,0x1000 /* 51a20: 11800003 */ beqz $t4,.PF00051a30