From e294a633ecf0eb56f9150ab0ec11d30462c2fa92 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Tue, 3 Mar 2020 17:18:22 +1000 Subject: [PATCH] Replace remaining jals to hardcoded addresses --- src/game/bondbike.c | 2 +- src/game/chr/chraction.c | 6 ++-- src/game/game_005fd0.c | 2 +- src/game/game_016100.c | 4 +-- src/game/game_01e250.c | 22 ++++++------ src/game/game_0601b0.c | 10 +++--- src/game/game_066310.c | 70 ++++++++++++++++++------------------- src/game/game_097ba0.c | 12 +++---- src/game/game_0abe70.c | 4 +-- src/game/game_0b63b0.c | 6 ++-- src/game/game_0c79f0.c | 2 +- src/game/game_0f09f0.c | 12 +++---- src/game/game_11f000.c | 8 ++--- src/game/game_13c510.c | 2 +- src/game/game_148b80.c | 4 +-- src/include/lib/lib_159b0.h | 2 ++ src/lib/lib_09660.c | 2 +- src/lib/lib_159b0.c | 2 ++ 18 files changed, 88 insertions(+), 84 deletions(-) diff --git a/src/game/bondbike.c b/src/game/bondbike.c index 8955f7ee5..dceaf1d9c 100644 --- a/src/game/bondbike.c +++ b/src/game/bondbike.c @@ -2236,7 +2236,7 @@ glabel func0f0d3d50 /* f0d40d4: 8e050284 */ lw $a1,0x284($s0) /* f0d40d8: 27a401a8 */ addiu $a0,$sp,0x1a8 /* f0d40dc: 27a601e8 */ addiu $a2,$sp,0x1e8 -/* f0d40e0: 0c0056da */ jal 0x15b68 +/* f0d40e0: 0c0056da */ jal func00015b68 /* f0d40e4: 24a51a70 */ addiu $a1,$a1,0x1a70 /* f0d40e8: 0fc34d07 */ jal func0f0d341c /* f0d40ec: 27a401e8 */ addiu $a0,$sp,0x1e8 diff --git a/src/game/chr/chraction.c b/src/game/chr/chraction.c index ffa9de7ef..4efef09b0 100644 --- a/src/game/chr/chraction.c +++ b/src/game/chr/chraction.c @@ -19037,11 +19037,11 @@ glabel var7f1a90b8 /* f03ffcc: 00408825 */ or $s1,$v0,$zero /* f03ffd0: 00402025 */ or $a0,$v0,$zero /* f03ffd4: 02402825 */ or $a1,$s2,$zero -/* f03ffd8: 0c0056da */ jal 0x15b68 +/* f03ffd8: 0c0056da */ jal func00015b68 /* f03ffdc: 27a60124 */ addiu $a2,$sp,0x124 /* f03ffe0: 02202025 */ or $a0,$s1,$zero /* f03ffe4: 02602825 */ or $a1,$s3,$zero -/* f03ffe8: 0c0056c5 */ jal 0x15b14 +/* f03ffe8: 0c0056c5 */ jal func00015b14 /* f03ffec: 27a60118 */ addiu $a2,$sp,0x118 /* f03fff0: 0fc2d5be */ jal func0f0b56f8 /* f03fff4: 00000000 */ sll $zero,$zero,0x0 @@ -22312,7 +22312,7 @@ glabel var7f1a91dc /* f042cd4: c7ac00fc */ lwc1 $f12,0xfc($sp) /* f042cd8: 27a400a4 */ addiu $a0,$sp,0xa4 /* f042cdc: 02002825 */ or $a1,$s0,$zero -/* f042ce0: 0c0056c5 */ jal 0x15b14 +/* f042ce0: 0c0056c5 */ jal func00015b14 /* f042ce4: 27a600e4 */ addiu $a2,$sp,0xe4 /* f042ce8: 8e4c0020 */ lw $t4,0x20($s2) /* f042cec: c7aa00e4 */ lwc1 $f10,0xe4($sp) diff --git a/src/game/game_005fd0.c b/src/game/game_005fd0.c index e7ee25c8b..d523758f6 100644 --- a/src/game/game_005fd0.c +++ b/src/game/game_005fd0.c @@ -3989,7 +3989,7 @@ glabel func0f009818 /* f00991c: 460a4303 */ div.s $f12,$f8,$f10 /* f009920: 27a40048 */ addiu $a0,$sp,0x48 /* f009924: 27a50088 */ addiu $a1,$sp,0x88 -/* f009928: 0c005680 */ jal 0x15a00 +/* f009928: 0c005680 */ jal func00015a00 /* f00992c: 27a600c8 */ addiu $a2,$sp,0xc8 /* f009930: 0fc2d5be */ jal func0f0b56f8 /* f009934: 00000000 */ sll $zero,$zero,0x0 diff --git a/src/game/game_016100.c b/src/game/game_016100.c index 0b8562e5e..298831034 100644 --- a/src/game/game_016100.c +++ b/src/game/game_016100.c @@ -2583,7 +2583,7 @@ glabel func0f017ac0 /* f018610: 27a501e8 */ addiu $a1,$sp,0x1e8 /* f018614: 27a402b0 */ addiu $a0,$sp,0x2b0 /* f018618: 27a501e8 */ addiu $a1,$sp,0x1e8 -/* f01861c: 0c005680 */ jal 0x15a00 +/* f01861c: 0c005680 */ jal func00015a00 /* f018620: 27a60270 */ addiu $a2,$sp,0x270 /* f018624: 3c018006 */ lui $at,0x8006 /* f018628: c42c27b8 */ lwc1 $f12,0x27b8($at) @@ -2931,7 +2931,7 @@ glabel func0f017ac0 /* f018b58: 46083300 */ add.s $f12,$f6,$f8 /* f018b5c: 27a402b0 */ addiu $a0,$sp,0x2b0 /* f018b60: 27a501e8 */ addiu $a1,$sp,0x1e8 -/* f018b64: 0c005680 */ jal 0x15a00 +/* f018b64: 0c005680 */ jal func00015a00 /* f018b68: 27a60230 */ addiu $a2,$sp,0x230 /* f018b6c: 3c017f1b */ lui $at,%hi(var7f1a8468) /* f018b70: c42c8468 */ lwc1 $f12,%lo(var7f1a8468)($at) diff --git a/src/game/game_01e250.c b/src/game/game_01e250.c index 1b087ec41..980a99713 100644 --- a/src/game/game_01e250.c +++ b/src/game/game_01e250.c @@ -7327,21 +7327,21 @@ glabel func0f024738 /* f024cfc: 2625002c */ addiu $a1,$s1,0x2c /* f024d00: 02a02025 */ or $a0,$s5,$zero /* f024d04: 27a500a0 */ addiu $a1,$sp,0xa0 -/* f024d08: 0c0056da */ jal 0x15b68 +/* f024d08: 0c0056da */ jal func00015b68 /* f024d0c: 02603025 */ or $a2,$s3,$zero /* f024d10: 02602025 */ or $a0,$s3,$zero /* f024d14: 0fc2d37b */ jal func0f0b4dec /* f024d18: 26250134 */ addiu $a1,$s1,0x134 /* f024d1c: 02a02025 */ or $a0,$s5,$zero /* f024d20: 27a50094 */ addiu $a1,$sp,0x94 -/* f024d24: 0c0056da */ jal 0x15b68 +/* f024d24: 0c0056da */ jal func00015b68 /* f024d28: 02603025 */ or $a2,$s3,$zero /* f024d2c: 02602025 */ or $a0,$s3,$zero /* f024d30: 0fc2d37b */ jal func0f0b4dec /* f024d34: 2625013c */ addiu $a1,$s1,0x13c /* f024d38: 02a02025 */ or $a0,$s5,$zero /* f024d3c: 27a50088 */ addiu $a1,$sp,0x88 -/* f024d40: 0c0056da */ jal 0x15b68 +/* f024d40: 0c0056da */ jal func00015b68 /* f024d44: 02603025 */ or $a2,$s3,$zero /* f024d48: 02602025 */ or $a0,$s3,$zero /* f024d4c: 0fc2d37b */ jal func0f0b4dec @@ -7436,7 +7436,7 @@ glabel func0f024738 .L0f024eac: /* f024eac: 03c02025 */ or $a0,$s8,$zero /* f024eb0: 02c02825 */ or $a1,$s6,$zero -/* f024eb4: 0c0056da */ jal 0x15b68 +/* f024eb4: 0c0056da */ jal func00015b68 /* f024eb8: 02603025 */ or $a2,$s3,$zero /* f024ebc: 02602025 */ or $a0,$s3,$zero /* f024ec0: 0fc2d37b */ jal func0f0b4dec @@ -7473,7 +7473,7 @@ glabel func0f024738 /* f024f30: 16800030 */ bnez $s4,.L0f024ff4 /* f024f34: 02e02025 */ or $a0,$s7,$zero /* f024f38: 02c02825 */ or $a1,$s6,$zero -/* f024f3c: 0c0056da */ jal 0x15b68 +/* f024f3c: 0c0056da */ jal func00015b68 /* f024f40: 02603025 */ or $a2,$s3,$zero /* f024f44: c7a60070 */ lwc1 $f6,0x70($sp) /* f024f48: c62a0014 */ lwc1 $f10,0x14($s1) @@ -10588,7 +10588,7 @@ glabel func0f027994 /* f027b5c: 27a50088 */ addiu $a1,$sp,0x88 /* f027b60: 00194180 */ sll $t0,$t9,0x6 /* f027b64: 27a600dc */ addiu $a2,$sp,0xdc -/* f027b68: 0c0056da */ jal 0x15b68 +/* f027b68: 0c0056da */ jal func00015b68 /* f027b6c: 03082021 */ addu $a0,$t8,$t0 /* f027b70: 0fc2d5de */ jal func0f0b5778 /* f027b74: 00000000 */ sll $zero,$zero,0x0 @@ -10600,7 +10600,7 @@ glabel func0f027994 /* f027b8c: 27a50094 */ addiu $a1,$sp,0x94 /* f027b90: 000a5980 */ sll $t3,$t2,0x6 /* f027b94: 27a600d0 */ addiu $a2,$sp,0xd0 -/* f027b98: 0c0056c5 */ jal 0x15b14 +/* f027b98: 0c0056c5 */ jal func00015b14 /* f027b9c: 012b2021 */ addu $a0,$t1,$t3 /* f027ba0: 0fc2d5de */ jal func0f0b5778 /* f027ba4: 00000000 */ sll $zero,$zero,0x0 @@ -10649,13 +10649,13 @@ glabel func0f027994 /* f027c48: 00000000 */ sll $zero,$zero,0x0 /* f027c4c: 00402025 */ or $a0,$v0,$zero /* f027c50: 27a50088 */ addiu $a1,$sp,0x88 -/* f027c54: 0c0056da */ jal 0x15b68 +/* f027c54: 0c0056da */ jal func00015b68 /* f027c58: 27a600dc */ addiu $a2,$sp,0xdc /* f027c5c: 0fc2d5de */ jal func0f0b5778 /* f027c60: 00000000 */ sll $zero,$zero,0x0 /* f027c64: 00402025 */ or $a0,$v0,$zero /* f027c68: 27a50094 */ addiu $a1,$sp,0x94 -/* f027c6c: 0c0056c5 */ jal 0x15b14 +/* f027c6c: 0c0056c5 */ jal func00015b14 /* f027c70: 27a600d0 */ addiu $a2,$sp,0xd0 /* f027c74: 10000002 */ beqz $zero,.L0f027c80 /* f027c78: 00000000 */ sll $zero,$zero,0x0 @@ -10834,7 +10834,7 @@ glabel func0f027e1c /* f027ef4: e7b200a0 */ swc1 $f18,0xa0($sp) /* f027ef8: 00402025 */ or $a0,$v0,$zero /* f027efc: 27a50098 */ addiu $a1,$sp,0x98 -/* f027f00: 0c0056da */ jal 0x15b68 +/* f027f00: 0c0056da */ jal func00015b68 /* f027f04: 27a600a4 */ addiu $a2,$sp,0xa4 /* f027f08: 0fc2a519 */ jal func0f0a9464 /* f027f0c: 27a400a4 */ addiu $a0,$sp,0xa4 @@ -11146,7 +11146,7 @@ glabel func0f027e1c /* f02838c: 27a500b0 */ addiu $a1,$sp,0xb0 /* f028390: 27a400b0 */ addiu $a0,$sp,0xb0 /* f028394: 27a50098 */ addiu $a1,$sp,0x98 -/* f028398: 0c0056da */ jal 0x15b68 +/* f028398: 0c0056da */ jal func00015b68 /* f02839c: 27a6005c */ addiu $a2,$sp,0x5c /* f0283a0: 8fb800f0 */ lw $t8,0xf0($sp) /* f0283a4: 8fa30068 */ lw $v1,0x68($sp) diff --git a/src/game/game_0601b0.c b/src/game/game_0601b0.c index 9567f9b08..b74b2970b 100644 --- a/src/game/game_0601b0.c +++ b/src/game/game_0601b0.c @@ -1378,7 +1378,7 @@ glabel func0f060db8 /* f061348: 00000000 */ sll $zero,$zero,0x0 /* f06134c: 00402025 */ or $a0,$v0,$zero /* f061350: 27a50694 */ addiu $a1,$sp,0x694 -/* f061354: 0c0056da */ jal 0x15b68 +/* f061354: 0c0056da */ jal func00015b68 /* f061358: 27a60658 */ addiu $a2,$sp,0x658 /* f06135c: c7a00660 */ lwc1 $f0,0x660($sp) /* f061360: c7a40230 */ lwc1 $f4,0x230($sp) @@ -2142,13 +2142,13 @@ glabel func0f061d54 /* f061dec: 00000000 */ sll $zero,$zero,0x0 /* f061df0: 00402025 */ or $a0,$v0,$zero /* f061df4: 27a50058 */ addiu $a1,$sp,0x58 -/* f061df8: 0c0056da */ jal 0x15b68 +/* f061df8: 0c0056da */ jal func00015b68 /* f061dfc: 27a60040 */ addiu $a2,$sp,0x40 /* f061e00: 0fc2d5de */ jal func0f0b5778 /* f061e04: 00000000 */ sll $zero,$zero,0x0 /* f061e08: 00402025 */ or $a0,$v0,$zero /* f061e0c: 27a50064 */ addiu $a1,$sp,0x64 -/* f061e10: 0c0056c5 */ jal 0x15b14 +/* f061e10: 0c0056c5 */ jal func00015b14 /* f061e14: 27a6004c */ addiu $a2,$sp,0x4c /* f061e18: 3c02800a */ lui $v0,%hi(g_Vars) /* f061e1c: 24429fc0 */ addiu $v0,$v0,%lo(g_Vars) @@ -2225,13 +2225,13 @@ glabel func0f061ed4 /* f061f10: 00000000 */ sll $zero,$zero,0x0 /* f061f14: 00402025 */ or $a0,$v0,$zero /* f061f18: 27a50038 */ addiu $a1,$sp,0x38 -/* f061f1c: 0c0056da */ jal 0x15b68 +/* f061f1c: 0c0056da */ jal func00015b68 /* f061f20: 27a60050 */ addiu $a2,$sp,0x50 /* f061f24: 0fc2d5de */ jal func0f0b5778 /* f061f28: 00000000 */ sll $zero,$zero,0x0 /* f061f2c: 00402025 */ or $a0,$v0,$zero /* f061f30: 27a50044 */ addiu $a1,$sp,0x44 -/* f061f34: 0c0056c5 */ jal 0x15b14 +/* f061f34: 0c0056c5 */ jal func00015b14 /* f061f38: 27a6005c */ addiu $a2,$sp,0x5c /* f061f3c: 3c017f1b */ lui $at,%hi(var7f1a9ec0) /* f061f40: c4249ec0 */ lwc1 $f4,%lo(var7f1a9ec0)($at) diff --git a/src/game/game_066310.c b/src/game/game_066310.c index f5480092e..eed43196a 100644 --- a/src/game/game_066310.c +++ b/src/game/game_066310.c @@ -2551,11 +2551,11 @@ glabel func0f0675c8 /* f067628: e7a80054 */ swc1 $f8,0x54($sp) /* f06762c: 27a40058 */ addiu $a0,$sp,0x58 /* f067630: 27a5004c */ addiu $a1,$sp,0x4c -/* f067634: 0c0056c5 */ jal 0x15b14 +/* f067634: 0c0056c5 */ jal func00015b14 /* f067638: 27a60040 */ addiu $a2,$sp,0x40 /* f06763c: 27a40058 */ addiu $a0,$sp,0x58 /* f067640: 27a50034 */ addiu $a1,$sp,0x34 -/* f067644: 0c0056c5 */ jal 0x15b14 +/* f067644: 0c0056c5 */ jal func00015b14 /* f067648: 27a60028 */ addiu $a2,$sp,0x28 /* f06764c: 44800000 */ mtc1 $zero,$f0 /* f067650: c7a20028 */ lwc1 $f2,0x28($sp) @@ -7300,7 +7300,7 @@ glabel func0f06b610 /* f06b790: 000c6980 */ sll $t5,$t4,0x6 /* f06b794: 02c02825 */ or $a1,$s6,$zero /* f06b798: 27a600fc */ addiu $a2,$sp,0xfc -/* f06b79c: 0c0056da */ jal 0x15b68 +/* f06b79c: 0c0056da */ jal func00015b68 /* f06b7a0: 016d2021 */ addu $a0,$t3,$t5 /* f06b7a4: c7a400fc */ lwc1 $f4,0xfc($sp) /* f06b7a8: c6680000 */ lwc1 $f8,0x0($s3) @@ -7331,20 +7331,20 @@ glabel func0f06b610 /* f06b80c: 8e8e000c */ lw $t6,0xc($s4) /* f06b810: e7a00108 */ swc1 $f0,0x108($sp) /* f06b814: 241e0001 */ addiu $s8,$zero,0x1 -/* f06b818: 0c0056c5 */ jal 0x15b14 +/* f06b818: 0c0056c5 */ jal func00015b14 /* f06b81c: 01d82021 */ addu $a0,$t6,$t8 /* f06b820: c7a00108 */ lwc1 $f0,0x108($sp) /* f06b824: 0fc2d5de */ jal func0f0b5778 /* f06b828: e6e00000 */ swc1 $f0,0x0($s7) /* f06b82c: 00402025 */ or $a0,$v0,$zero /* f06b830: 27a500fc */ addiu $a1,$sp,0xfc -/* f06b834: 0c0056da */ jal 0x15b68 +/* f06b834: 0c0056da */ jal func00015b68 /* f06b838: 8fa6014c */ lw $a2,0x14c($sp) /* f06b83c: 0fc2d5de */ jal func0f0b5778 /* f06b840: 00000000 */ sll $zero,$zero,0x0 /* f06b844: 00402025 */ or $a0,$v0,$zero /* f06b848: 27a500f0 */ addiu $a1,$sp,0xf0 -/* f06b84c: 0c0056c5 */ jal 0x15b14 +/* f06b84c: 0c0056c5 */ jal func00015b14 /* f06b850: 02003025 */ or $a2,$s0,$zero /* f06b854: c6040000 */ lwc1 $f4,0x0($s0) /* f06b858: 02002025 */ or $a0,$s0,$zero @@ -7528,7 +7528,7 @@ glabel func0f06b610 /* f06bae8: 000ec180 */ sll $t8,$t6,0x6 /* f06baec: 02c02825 */ or $a1,$s6,$zero /* f06baf0: 27a600fc */ addiu $a2,$sp,0xfc -/* f06baf4: 0c0056da */ jal 0x15b68 +/* f06baf4: 0c0056da */ jal func00015b68 /* f06baf8: 01f82021 */ addu $a0,$t7,$t8 /* f06bafc: c7b200fc */ lwc1 $f18,0xfc($sp) /* f06bb00: c66a0000 */ lwc1 $f10,0x0($s3) @@ -7561,14 +7561,14 @@ glabel func0f06b610 /* f06bb6c: 00000000 */ sll $zero,$zero,0x0 /* f06bb70: 8e99000c */ lw $t9,0xc($s4) /* f06bb74: 27a600f0 */ addiu $a2,$sp,0xf0 -/* f06bb78: 0c0056c5 */ jal 0x15b14 +/* f06bb78: 0c0056c5 */ jal func00015b14 /* f06bb7c: 03292021 */ addu $a0,$t9,$t1 /* f06bb80: c7b20118 */ lwc1 $f18,0x118($sp) /* f06bb84: 0fc2d5de */ jal func0f0b5778 /* f06bb88: e6f20000 */ swc1 $f18,0x0($s7) /* f06bb8c: 00402025 */ or $a0,$v0,$zero /* f06bb90: 27a500fc */ addiu $a1,$sp,0xfc -/* f06bb94: 0c0056da */ jal 0x15b68 +/* f06bb94: 0c0056da */ jal func00015b68 /* f06bb98: 8fa6014c */ lw $a2,0x14c($sp) /* f06bb9c: c7a800f0 */ lwc1 $f8,0xf0($sp) /* f06bba0: c6460000 */ lwc1 $f6,0x0($s2) @@ -7598,7 +7598,7 @@ glabel func0f06b610 /* f06bbfc: 8fb00150 */ lw $s0,0x150($sp) /* f06bc00: 00402025 */ or $a0,$v0,$zero /* f06bc04: 27a500f0 */ addiu $a1,$sp,0xf0 -/* f06bc08: 0c0056c5 */ jal 0x15b14 +/* f06bc08: 0c0056c5 */ jal func00015b14 /* f06bc0c: 02003025 */ or $a2,$s0,$zero /* f06bc10: c6120000 */ lwc1 $f18,0x0($s0) /* f06bc14: 02002025 */ or $a0,$s0,$zero @@ -8186,7 +8186,7 @@ glabel func0f06c28c /* f06c47c: 000b6180 */ sll $t4,$t3,0x6 /* f06c480: 02e02825 */ or $a1,$s7,$zero /* f06c484: 02a03025 */ or $a2,$s5,$zero -/* f06c488: 0c0056da */ jal 0x15b68 +/* f06c488: 0c0056da */ jal func00015b68 /* f06c48c: 014c2021 */ addu $a0,$t2,$t4 /* f06c490: c7a800b8 */ lwc1 $f8,0xb8($sp) /* f06c494: c6660000 */ lwc1 $f6,0x0($s3) @@ -8218,20 +8218,20 @@ glabel func0f06c28c /* f06c4fc: 02402025 */ or $a0,$s2,$zero /* f06c500: 8e4d000c */ lw $t5,0xc($s2) /* f06c504: afb800c8 */ sw $t8,0xc8($sp) -/* f06c508: 0c0056c5 */ jal 0x15b14 +/* f06c508: 0c0056c5 */ jal func00015b14 /* f06c50c: 01af2021 */ addu $a0,$t5,$t7 /* f06c510: c7a800ec */ lwc1 $f8,0xec($sp) /* f06c514: 0fc2d5de */ jal func0f0b5778 /* f06c518: e7c80000 */ swc1 $f8,0x0($s8) /* f06c51c: 00402025 */ or $a0,$v0,$zero /* f06c520: 02a02825 */ or $a1,$s5,$zero -/* f06c524: 0c0056da */ jal 0x15b68 +/* f06c524: 0c0056da */ jal func00015b68 /* f06c528: 8fa6010c */ lw $a2,0x10c($sp) /* f06c52c: 0fc2d5de */ jal func0f0b5778 /* f06c530: 00000000 */ sll $zero,$zero,0x0 /* f06c534: 00402025 */ or $a0,$v0,$zero /* f06c538: 02c02825 */ or $a1,$s6,$zero -/* f06c53c: 0c0056c5 */ jal 0x15b14 +/* f06c53c: 0c0056c5 */ jal func00015b14 /* f06c540: 02203025 */ or $a2,$s1,$zero /* f06c544: c62a0000 */ lwc1 $f10,0x0($s1) /* f06c548: 02202025 */ or $a0,$s1,$zero @@ -8340,14 +8340,14 @@ glabel func0f06c28c /* f06c6c4: e7c40000 */ swc1 $f4,0x0($s8) /* f06c6c8: 00402025 */ or $a0,$v0,$zero /* f06c6cc: 02e02825 */ or $a1,$s7,$zero -/* f06c6d0: 0c0056da */ jal 0x15b68 +/* f06c6d0: 0c0056da */ jal func00015b68 /* f06c6d4: 8fa6010c */ lw $a2,0x10c($sp) /* f06c6d8: 0fc2d5de */ jal func0f0b5778 /* f06c6dc: 00000000 */ sll $zero,$zero,0x0 /* f06c6e0: 8fb10110 */ lw $s1,0x110($sp) /* f06c6e4: 00402025 */ or $a0,$v0,$zero /* f06c6e8: 27a50088 */ addiu $a1,$sp,0x88 -/* f06c6ec: 0c0056c5 */ jal 0x15b14 +/* f06c6ec: 0c0056c5 */ jal func00015b14 /* f06c6f0: 02203025 */ or $a2,$s1,$zero /* f06c6f4: c62a0000 */ lwc1 $f10,0x0($s1) /* f06c6f8: 02202025 */ or $a0,$s1,$zero @@ -9858,7 +9858,7 @@ glabel func0f06dbd8 /* f06dc94: 27a500c8 */ addiu $a1,$sp,0xc8 /* f06dc98: 27a400c8 */ addiu $a0,$sp,0xc8 /* f06dc9c: 27a50148 */ addiu $a1,$sp,0x148 -/* f06dca0: 0c005680 */ jal 0x15a00 +/* f06dca0: 0c005680 */ jal func00015a00 /* f06dca4: 27a60088 */ addiu $a2,$sp,0x88 /* f06dca8: c7a20088 */ lwc1 $f2,0x88($sp) /* f06dcac: c7ae008c */ lwc1 $f14,0x8c($sp) @@ -10886,7 +10886,7 @@ glabel func0f06e9cc /* f06eb28: 46044301 */ sub.s $f12,$f8,$f4 /* f06eb2c: 27a40070 */ addiu $a0,$sp,0x70 /* f06eb30: 27a50030 */ addiu $a1,$sp,0x30 -/* f06eb34: 0c005680 */ jal 0x15a00 +/* f06eb34: 0c005680 */ jal func00015a00 /* f06eb38: 8fa6012c */ lw $a2,0x12c($sp) /* f06eb3c: 8fbf0014 */ lw $ra,0x14($sp) /* f06eb40: 27bd0128 */ addiu $sp,$sp,0x128 @@ -11130,7 +11130,7 @@ glabel func0f06ed64 /* f06eeb4: 27a50050 */ addiu $a1,$sp,0x50 /* f06eeb8: 27a40090 */ addiu $a0,$sp,0x90 /* f06eebc: 27a50050 */ addiu $a1,$sp,0x50 -/* f06eec0: 0c005680 */ jal 0x15a00 +/* f06eec0: 0c005680 */ jal func00015a00 /* f06eec4: 27a600d0 */ addiu $a2,$sp,0xd0 /* f06eec8: 8faa0110 */ lw $t2,0x110($sp) /* f06eecc: 27a500d0 */ addiu $a1,$sp,0xd0 @@ -12533,7 +12533,7 @@ glabel func0f06f54c /* f070280: e7a00074 */ swc1 $f0,0x74($sp) /* f070284: 27a400f8 */ addiu $a0,$sp,0xf8 /* f070288: 27a500b8 */ addiu $a1,$sp,0xb8 -/* f07028c: 0c005680 */ jal 0x15a00 +/* f07028c: 0c005680 */ jal func00015a00 /* f070290: 27a60078 */ addiu $a2,$sp,0x78 /* f070294: 27a400f8 */ addiu $a0,$sp,0xf8 /* f070298: 0c0056c4 */ jal func00015b10 @@ -12584,7 +12584,7 @@ glabel func0f06f54c /* f070348: 27a500f8 */ addiu $a1,$sp,0xf8 /* f07034c: 27a400f8 */ addiu $a0,$sp,0xf8 /* f070350: 27a500b8 */ addiu $a1,$sp,0xb8 -/* f070354: 0c005680 */ jal 0x15a00 +/* f070354: 0c005680 */ jal func00015a00 /* f070358: 27a60078 */ addiu $a2,$sp,0x78 /* f07035c: 27a40078 */ addiu $a0,$sp,0x78 /* f070360: 0c005768 */ jal func00015da0 @@ -16031,7 +16031,7 @@ glabel func0f073478 /* f073674: 27b00098 */ addiu $s0,$sp,0x98 /* f073678: 02003025 */ or $a2,$s0,$zero /* f07367c: 27a400d8 */ addiu $a0,$sp,0xd8 -/* f073680: 0c005680 */ jal 0x15a00 +/* f073680: 0c005680 */ jal func00015a00 /* f073684: 02202825 */ or $a1,$s1,$zero /* f073688: 8fae0188 */ lw $t6,0x188($sp) /* f07368c: 02002825 */ or $a1,$s0,$zero @@ -17453,7 +17453,7 @@ glabel func0f073c6c /* f074b2c: 27a40504 */ addiu $a0,$sp,0x504 /* f074b30: 02002025 */ or $a0,$s0,$zero /* f074b34: 02202825 */ or $a1,$s1,$zero -/* f074b38: 0c005680 */ jal 0x15a00 +/* f074b38: 0c005680 */ jal func00015a00 /* f074b3c: 27a60544 */ addiu $a2,$sp,0x544 /* f074b40: 02402025 */ or $a0,$s2,$zero /* f074b44: 0fc1ccb5 */ jal func0f0732d4 @@ -18382,7 +18382,7 @@ glabel func0f073c6c /* f0758f0: afa20184 */ sw $v0,0x184($sp) /* f0758f4: 00402025 */ or $a0,$v0,$zero /* f0758f8: 27a505e8 */ addiu $a1,$sp,0x5e8 -/* f0758fc: 0c0056da */ jal 0x15b68 +/* f0758fc: 0c0056da */ jal func00015b68 /* f075900: 27a601c8 */ addiu $a2,$sp,0x1c8 /* f075904: 8fa40184 */ lw $a0,0x184($sp) /* f075908: 0c005c67 */ jal func0001719c @@ -21771,7 +21771,7 @@ glabel func0f078930 /* f0789c0: 27a40024 */ addiu $a0,$sp,0x24 /* f0789c4: 24c60040 */ addiu $a2,$a2,0x40 /* f0789c8: afa60018 */ sw $a2,0x18($sp) -/* f0789cc: 0c005680 */ jal 0x15a00 +/* f0789cc: 0c005680 */ jal func00015a00 /* f0789d0: 24650060 */ addiu $a1,$v1,0x60 /* f0789d4: 8fa70070 */ lw $a3,0x70($sp) /* f0789d8: 8fa40084 */ lw $a0,0x84($sp) @@ -25381,7 +25381,7 @@ glabel func0f07ba38 /* f07bed4: c54c0014 */ lwc1 $f12,0x14($t2) /* f07bed8: 27a4007c */ addiu $a0,$sp,0x7c /* f07bedc: 27a5003c */ addiu $a1,$sp,0x3c -/* f07bee0: 0c005680 */ jal 0x15a00 +/* f07bee0: 0c005680 */ jal func00015a00 /* f07bee4: 27a600bc */ addiu $a2,$sp,0xbc /* f07bee8: 27a400bc */ addiu $a0,$sp,0xbc /* f07beec: 0c005768 */ jal func00015da0 @@ -27470,7 +27470,7 @@ glabel func0f07d1e4 /* f07dd04: c5ac0014 */ lwc1 $f12,0x14($t5) /* f07dd08: 27a400ac */ addiu $a0,$sp,0xac /* f07dd0c: 27a5006c */ addiu $a1,$sp,0x6c -/* f07dd10: 0c005680 */ jal 0x15a00 +/* f07dd10: 0c005680 */ jal func00015a00 /* f07dd14: 27a600ec */ addiu $a2,$sp,0xec /* f07dd18: 27a400ec */ addiu $a0,$sp,0xec /* f07dd1c: 0c005768 */ jal func00015da0 @@ -28732,7 +28732,7 @@ glabel func0f07e758 /* f07eec4: 00000000 */ sll $zero,$zero,0x0 /* f07eec8: 00402025 */ or $a0,$v0,$zero /* f07eecc: 27a500f8 */ addiu $a1,$sp,0xf8 -/* f07eed0: 0c005680 */ jal 0x15a00 +/* f07eed0: 0c005680 */ jal func00015a00 /* f07eed4: 27a60098 */ addiu $a2,$sp,0x98 /* f07eed8: 8fac0254 */ lw $t4,0x254($sp) /* f07eedc: 240d0001 */ addiu $t5,$zero,0x1 @@ -31035,7 +31035,7 @@ glabel func0f080f8c /* f081014: 00000000 */ sll $zero,$zero,0x0 /* f081018: 00402025 */ or $a0,$v0,$zero /* f08101c: 27a500c0 */ addiu $a1,$sp,0xc0 -/* f081020: 0c005680 */ jal 0x15a00 +/* f081020: 0c005680 */ jal func00015a00 /* f081024: 27a60080 */ addiu $a2,$sp,0x80 /* f081028: 27a40080 */ addiu $a0,$sp,0x80 /* f08102c: 0c005815 */ jal func00016054 @@ -36376,7 +36376,7 @@ glabel func0f0859a0 /* f085c58: 02e02825 */ or $a1,$s7,$zero /* f085c5c: 000c6980 */ sll $t5,$t4,0x6 /* f085c60: 02203025 */ or $a2,$s1,$zero -/* f085c64: 0c0056da */ jal 0x15b68 +/* f085c64: 0c0056da */ jal func00015b68 /* f085c68: 016d2021 */ addu $a0,$t3,$t5 /* f085c6c: c7a400e0 */ lwc1 $f4,0xe0($sp) /* f085c70: 8fae0124 */ lw $t6,0x124($sp) @@ -36421,7 +36421,7 @@ glabel func0f0859a0 /* f085d00: 27b2007c */ addiu $s2,$sp,0x7c /* f085d04: 02403025 */ or $a2,$s2,$zero /* f085d08: 00402025 */ or $a0,$v0,$zero -/* f085d0c: 0c0056da */ jal 0x15b68 +/* f085d0c: 0c0056da */ jal func00015b68 /* f085d10: 02202825 */ or $a1,$s1,$zero /* f085d14: 8faf00e4 */ lw $t7,0xe4($sp) /* f085d18: 8ead000c */ lw $t5,0xc($s5) @@ -36429,7 +36429,7 @@ glabel func0f0859a0 /* f085d20: 000fc180 */ sll $t8,$t7,0x6 /* f085d24: 02203025 */ or $a2,$s1,$zero /* f085d28: 27a500f4 */ addiu $a1,$sp,0xf4 -/* f085d2c: 0c0056c5 */ jal 0x15b14 +/* f085d2c: 0c0056c5 */ jal func00015b14 /* f085d30: 01b82021 */ addu $a0,$t5,$t8 /* f085d34: 0fc2d5de */ jal func0f0b5778 /* f085d38: 00000000 */ sll $zero,$zero,0x0 @@ -36670,7 +36670,7 @@ glabel func0f085eac /* f086080: 27a50110 */ addiu $a1,$sp,0x110 /* f086084: 8f24000c */ lw $a0,0xc($t9) /* f086088: 27a600ec */ addiu $a2,$sp,0xec -/* f08608c: 0c0056da */ jal 0x15b68 +/* f08608c: 0c0056da */ jal func00015b68 /* f086090: afa700e4 */ sw $a3,0xe4($sp) /* f086094: c7a000f4 */ lwc1 $f0,0xf4($sp) /* f086098: 8fa700e4 */ lw $a3,0xe4($sp) @@ -37192,11 +37192,11 @@ glabel func0f085eac /* f086804: 27a60058 */ addiu $a2,$sp,0x58 /* f086808: 8d6d000c */ lw $t5,0xc($t3) /* f08680c: 000e7980 */ sll $t7,$t6,0x6 -/* f086810: 0c005680 */ jal 0x15a00 +/* f086810: 0c005680 */ jal func00015a00 /* f086814: 01af2821 */ addu $a1,$t5,$t7 /* f086818: 27a40058 */ addiu $a0,$sp,0x58 /* f08681c: 8fa50048 */ lw $a1,0x48($sp) -/* f086820: 0c0056da */ jal 0x15b68 +/* f086820: 0c0056da */ jal func00015b68 /* f086824: 27a600a4 */ addiu $a2,$sp,0xa4 /* f086828: 8fb80120 */ lw $t8,0x120($sp) /* f08682c: 24190001 */ addiu $t9,$zero,0x1 diff --git a/src/game/game_097ba0.c b/src/game/game_097ba0.c index 590212055..1276a5dd8 100644 --- a/src/game/game_097ba0.c +++ b/src/game/game_097ba0.c @@ -10751,7 +10751,7 @@ glabel func0f0a0fac /* f0a1210: e7a60018 */ swc1 $f6,0x18($sp) /* f0a1214: 27a40054 */ addiu $a0,$sp,0x54 /* f0a1218: 27a50048 */ addiu $a1,$sp,0x48 -/* f0a121c: 0c0056c5 */ jal 0x15b14 +/* f0a121c: 0c0056c5 */ jal func00015b14 /* f0a1220: 8fa600a8 */ lw $a2,0xa8($sp) /* f0a1224: 8fbf002c */ lw $ra,0x2c($sp) /* f0a1228: 27bd00a8 */ addiu $sp,$sp,0xa8 @@ -12296,7 +12296,7 @@ glabel func0f0a24f0 /* f0a2710: 27a50078 */ addiu $a1,$sp,0x78 /* f0a2714: 02002025 */ or $a0,$s0,$zero /* f0a2718: 27a50078 */ addiu $a1,$sp,0x78 -/* f0a271c: 0c005680 */ jal 0x15a00 +/* f0a271c: 0c005680 */ jal func00015a00 /* f0a2720: 27a60038 */ addiu $a2,$sp,0x38 /* f0a2724: 27a40038 */ addiu $a0,$sp,0x38 /* f0a2728: 0c005746 */ jal func00015d18 @@ -12331,7 +12331,7 @@ glabel func0f0a24f0 /* f0a2794: 27a50078 */ addiu $a1,$sp,0x78 /* f0a2798: 02002025 */ or $a0,$s0,$zero /* f0a279c: 27a50078 */ addiu $a1,$sp,0x78 -/* f0a27a0: 0c005680 */ jal 0x15a00 +/* f0a27a0: 0c005680 */ jal func00015a00 /* f0a27a4: 27a60038 */ addiu $a2,$sp,0x38 /* f0a27a8: 27a40038 */ addiu $a0,$sp,0x38 /* f0a27ac: 0c005746 */ jal func00015d18 @@ -13532,13 +13532,13 @@ glabel func0f0a37b4 /* f0a38a4: e7aa0044 */ swc1 $f10,0x44($sp) /* f0a38a8: 00402025 */ or $a0,$v0,$zero /* f0a38ac: 27a5003c */ addiu $a1,$sp,0x3c -/* f0a38b0: 0c0056da */ jal 0x15b68 +/* f0a38b0: 0c0056da */ jal func00015b68 /* f0a38b4: 27a60054 */ addiu $a2,$sp,0x54 /* f0a38b8: 0fc2d5de */ jal func0f0b5778 /* f0a38bc: 00000000 */ sll $zero,$zero,0x0 /* f0a38c0: 00402025 */ or $a0,$v0,$zero /* f0a38c4: 27a50048 */ addiu $a1,$sp,0x48 -/* f0a38c8: 0c0056c5 */ jal 0x15b14 +/* f0a38c8: 0c0056c5 */ jal func00015b14 /* f0a38cc: 27a60030 */ addiu $a2,$sp,0x30 /* f0a38d0: 3c0143fa */ lui $at,0x43fa /* f0a38d4: 44810000 */ mtc1 $at,$f0 @@ -16196,7 +16196,7 @@ glabel func0f0a5550 /* f0a5f58: e6100238 */ swc1 $f16,0x238($s0) /* f0a5f5c: 27a40124 */ addiu $a0,$sp,0x124 /* f0a5f60: 27a50164 */ addiu $a1,$sp,0x164 -/* f0a5f64: 0c005680 */ jal 0x15a00 +/* f0a5f64: 0c005680 */ jal func00015a00 /* f0a5f68: 27a60284 */ addiu $a2,$sp,0x284 /* f0a5f6c: 27a40284 */ addiu $a0,$sp,0x284 /* f0a5f70: 0c00567f */ jal func000159fc diff --git a/src/game/game_0abe70.c b/src/game/game_0abe70.c index e9683219a..ca3bae133 100644 --- a/src/game/game_0abe70.c +++ b/src/game/game_0abe70.c @@ -646,7 +646,7 @@ glabel func0f0ac4b8 /* f0ac5d4: e7aa00ec */ swc1 $f10,0xec($sp) /* f0ac5d8: 00402025 */ or $a0,$v0,$zero /* f0ac5dc: 8fa500fc */ lw $a1,0xfc($sp) -/* f0ac5e0: 0c0056da */ jal 0x15b68 +/* f0ac5e0: 0c0056da */ jal func00015b68 /* f0ac5e4: 27a6005c */ addiu $a2,$sp,0x5c /* f0ac5e8: c7ae00f8 */ lwc1 $f14,0xf8($sp) /* f0ac5ec: c7a8005c */ lwc1 $f8,0x5c($sp) @@ -698,7 +698,7 @@ glabel func0f0ac4b8 /* f0ac68c: 00000000 */ sll $zero,$zero,0x0 /* f0ac690: 00402025 */ or $a0,$v0,$zero /* f0ac694: 8fa50108 */ lw $a1,0x108($sp) -/* f0ac698: 0c0056da */ jal 0x15b68 +/* f0ac698: 0c0056da */ jal func00015b68 /* f0ac69c: 27a6005c */ addiu $a2,$sp,0x5c /* f0ac6a0: c7b000f8 */ lwc1 $f16,0xf8($sp) /* f0ac6a4: c7a6005c */ lwc1 $f6,0x5c($sp) diff --git a/src/game/game_0b63b0.c b/src/game/game_0b63b0.c index 796867239..f409660da 100644 --- a/src/game/game_0b63b0.c +++ b/src/game/game_0b63b0.c @@ -2160,13 +2160,13 @@ glabel func0f0b802c /* f0b8184: 00000000 */ sll $zero,$zero,0x0 /* f0b8188: 00402025 */ or $a0,$v0,$zero /* f0b818c: 02602825 */ or $a1,$s3,$zero -/* f0b8190: 0c0056c5 */ jal 0x15b14 +/* f0b8190: 0c0056c5 */ jal func00015b14 /* f0b8194: 27a60090 */ addiu $a2,$sp,0x90 /* f0b8198: 0fc2d5de */ jal func0f0b5778 /* f0b819c: 00000000 */ sll $zero,$zero,0x0 /* f0b81a0: 00402025 */ or $a0,$v0,$zero /* f0b81a4: 02202825 */ or $a1,$s1,$zero -/* f0b81a8: 0c0056da */ jal 0x15b68 +/* f0b81a8: 0c0056da */ jal func00015b68 /* f0b81ac: 27a60078 */ addiu $a2,$sp,0x78 /* f0b81b0: 0fc4a24b */ jal setCurrentPlayerNum /* f0b81b4: 02002025 */ or $a0,$s0,$zero @@ -10546,7 +10546,7 @@ glabel func0f0bfc7c /* f0bfea0: 00408025 */ or $s0,$v0,$zero /* f0bfea4: 00402025 */ or $a0,$v0,$zero /* f0bfea8: 27a5008c */ addiu $a1,$sp,0x8c -/* f0bfeac: 0c005680 */ jal 0x15a00 +/* f0bfeac: 0c005680 */ jal func00015a00 /* f0bfeb0: 02003025 */ or $a2,$s0,$zero /* f0bfeb4: 3c01c6fa */ lui $at,0xc6fa /* f0bfeb8: 44816000 */ mtc1 $at,$f12 diff --git a/src/game/game_0c79f0.c b/src/game/game_0c79f0.c index 39fd209c1..dc566d5b2 100644 --- a/src/game/game_0c79f0.c +++ b/src/game/game_0c79f0.c @@ -3097,7 +3097,7 @@ glabel var7f1ad8e4 /* f0cab28: 02003025 */ or $a2,$s0,$zero /* f0cab2c: 8dc5025c */ lw $a1,0x25c($t6) /* f0cab30: 00402025 */ or $a0,$v0,$zero -/* f0cab34: 0c0056da */ jal 0x15b68 +/* f0cab34: 0c0056da */ jal func00015b68 /* f0cab38: 24a50008 */ addiu $a1,$a1,0x8 /* f0cab3c: c7a200ac */ lwc1 $f2,0xac($sp) /* f0cab40: 8e4f0284 */ lw $t7,0x284($s2) diff --git a/src/game/game_0f09f0.c b/src/game/game_0f09f0.c index 9cdb9e672..c286b9cf3 100644 --- a/src/game/game_0f09f0.c +++ b/src/game/game_0f09f0.c @@ -4819,7 +4819,7 @@ glabel func0f0f38b0 .L0f0f46cc: /* f0f46cc: 02203025 */ or $a2,$s1,$zero /* f0f46d0: 27a40310 */ addiu $a0,$sp,0x310 -/* f0f46d4: 0c005680 */ jal 0x15a00 +/* f0f46d4: 0c005680 */ jal func00015a00 /* f0f46d8: 27a50350 */ addiu $a1,$sp,0x350 /* f0f46dc: 8fae0448 */ lw $t6,0x448($sp) /* f0f46e0: 24010003 */ addiu $at,$zero,0x3 @@ -4829,12 +4829,12 @@ glabel func0f0f38b0 /* f0f46f0: 27a401c4 */ addiu $a0,$sp,0x1c4 /* f0f46f4: 27a401c4 */ addiu $a0,$sp,0x1c4 /* f0f46f8: 02202825 */ or $a1,$s1,$zero -/* f0f46fc: 0c005680 */ jal 0x15a00 +/* f0f46fc: 0c005680 */ jal func00015a00 /* f0f4700: 27a60184 */ addiu $a2,$sp,0x184 /* f0f4704: 26060014 */ addiu $a2,$s0,0x14 /* f0f4708: afa60040 */ sw $a2,0x40($sp) /* f0f470c: 27a40184 */ addiu $a0,$sp,0x184 -/* f0f4710: 0c005680 */ jal 0x15a00 +/* f0f4710: 0c005680 */ jal func00015a00 /* f0f4714: 27a50204 */ addiu $a1,$sp,0x204 /* f0f4718: 10000006 */ beqz $zero,.L0f0f4734 /* f0f471c: 00000000 */ sll $zero,$zero,0x0 @@ -4842,7 +4842,7 @@ glabel func0f0f38b0 .L0f0f4724: /* f0f4724: afa60040 */ sw $a2,0x40($sp) /* f0f4728: 02202025 */ or $a0,$s1,$zero -/* f0f472c: 0c005680 */ jal 0x15a00 +/* f0f472c: 0c005680 */ jal func00015a00 /* f0f4730: 27a50204 */ addiu $a1,$sp,0x204 .L0f0f4734: /* f0f4734: 0fc388d2 */ jal func0f0e2348 @@ -5169,7 +5169,7 @@ glabel func0f0f38b0 /* f0f4be8: 032b3821 */ addu $a3,$t9,$t3 /* f0f4bec: 00e02025 */ or $a0,$a3,$zero /* f0f4bf0: afa70040 */ sw $a3,0x40($sp) -/* f0f4bf4: 0c005680 */ jal 0x15a00 +/* f0f4bf4: 0c005680 */ jal func00015a00 /* f0f4bf8: 27a600e0 */ addiu $a2,$sp,0xe0 /* f0f4bfc: 8fa50040 */ lw $a1,0x40($sp) /* f0f4c00: 0c005746 */ jal func00015d18 @@ -14726,7 +14726,7 @@ glabel func0f0fd494 /* f0fd4b8: a21805d5 */ sb $t8,0x5d5($s0) /* f0fd4bc: 00402025 */ or $a0,$v0,$zero /* f0fd4c0: 8fa50038 */ lw $a1,0x38($sp) -/* f0fd4c4: 0c0056da */ jal 0x15b68 +/* f0fd4c4: 0c0056da */ jal func00015b68 /* f0fd4c8: 27a60024 */ addiu $a2,$sp,0x24 /* f0fd4cc: 27a40024 */ addiu $a0,$sp,0x24 /* f0fd4d0: 0fc2d341 */ jal func0f0b4d04 diff --git a/src/game/game_11f000.c b/src/game/game_11f000.c index 6d33ce0b1..e7421ab6a 100644 --- a/src/game/game_11f000.c +++ b/src/game/game_11f000.c @@ -2033,7 +2033,7 @@ glabel func0f11f984 /* f120e04: 00408025 */ or $s0,$v0,$zero /* f120e08: 02002025 */ or $a0,$s0,$zero /* f120e0c: 00402825 */ or $a1,$v0,$zero -/* f120e10: 0c005680 */ jal 0x15a00 +/* f120e10: 0c005680 */ jal func00015a00 /* f120e14: 27a603cc */ addiu $a2,$sp,0x3cc /* f120e18: 3c013f80 */ lui $at,0x3f80 /* f120e1c: 44813000 */ mtc1 $at,$f6 @@ -2048,7 +2048,7 @@ glabel func0f11f984 /* f120e40: 3c05800a */ lui $a1,%hi(var800a33a8) /* f120e44: 24a533a8 */ addiu $a1,$a1,%lo(var800a33a8) /* f120e48: 27a403cc */ addiu $a0,$sp,0x3cc -/* f120e4c: 0c005680 */ jal 0x15a00 +/* f120e4c: 0c005680 */ jal func00015a00 /* f120e50: 27a6038c */ addiu $a2,$sp,0x38c /* f120e54: 1a20004e */ blez $s1,.L0f120f90 /* f120e58: afa00270 */ sw $zero,0x270($sp) @@ -3475,7 +3475,7 @@ glabel func0f11f984 /* f122448: 00408025 */ or $s0,$v0,$zero /* f12244c: 02002025 */ or $a0,$s0,$zero /* f122450: 00402825 */ or $a1,$v0,$zero -/* f122454: 0c005680 */ jal 0x15a00 +/* f122454: 0c005680 */ jal func00015a00 /* f122458: 27a601ec */ addiu $a2,$sp,0x1ec /* f12245c: c7a60064 */ lwc1 $f6,0x64($sp) /* f122460: 3c04800a */ lui $a0,%hi(var800a33a8) @@ -3488,7 +3488,7 @@ glabel func0f11f984 /* f12247c: 3c05800a */ lui $a1,%hi(var800a33a8) /* f122480: 24a533a8 */ addiu $a1,$a1,%lo(var800a33a8) /* f122484: 27a401ec */ addiu $a0,$sp,0x1ec -/* f122488: 0c005680 */ jal 0x15a00 +/* f122488: 0c005680 */ jal func00015a00 /* f12248c: 27a601ac */ addiu $a2,$sp,0x1ac /* f122490: 1a200036 */ blez $s1,.L0f12256c /* f122494: afa00090 */ sw $zero,0x90($sp) diff --git a/src/game/game_13c510.c b/src/game/game_13c510.c index 75aa1085d..9ed02149c 100644 --- a/src/game/game_13c510.c +++ b/src/game/game_13c510.c @@ -277,7 +277,7 @@ glabel func0f13c780 /* f13c880: 00000000 */ sll $zero,$zero,0x0 /* f13c884: 00402025 */ or $a0,$v0,$zero /* f13c888: 02002825 */ or $a1,$s0,$zero -/* f13c88c: 0c005680 */ jal 0x15a00 +/* f13c88c: 0c005680 */ jal func00015a00 /* f13c890: 27a600f8 */ addiu $a2,$sp,0xf8 /* f13c894: 0c002f22 */ jal func0000bc88 /* f13c898: 00000000 */ sll $zero,$zero,0x0 diff --git a/src/game/game_148b80.c b/src/game/game_148b80.c index ebb09da4d..1434f06b6 100644 --- a/src/game/game_148b80.c +++ b/src/game/game_148b80.c @@ -447,11 +447,11 @@ glabel func0f148f18 /* f14915c: 02602825 */ or $a1,$s3,$zero /* f149160: 02602025 */ or $a0,$s3,$zero /* f149164: 27a500fc */ addiu $a1,$sp,0xfc -/* f149168: 0c0056c5 */ jal 0x15b14 +/* f149168: 0c0056c5 */ jal func00015b14 /* f14916c: 02a03025 */ or $a2,$s5,$zero /* f149170: 02602025 */ or $a0,$s3,$zero /* f149174: 27a500f0 */ addiu $a1,$sp,0xf0 -/* f149178: 0c0056c5 */ jal 0x15b14 +/* f149178: 0c0056c5 */ jal func00015b14 /* f14917c: 02c03025 */ or $a2,$s6,$zero /* f149180: 3c077f1b */ lui $a3,%hi(var7f1b5fd0) /* f149184: 24e75fd0 */ addiu $a3,$a3,%lo(var7f1b5fd0) diff --git a/src/include/lib/lib_159b0.h b/src/include/lib/lib_159b0.h index e848aaab4..fbe852784 100644 --- a/src/include/lib/lib_159b0.h +++ b/src/include/lib/lib_159b0.h @@ -5,7 +5,9 @@ void func000159b0(u32 *obj48_20); u32 func000159fc(void); +u32 func00015a00(void); void func00015b10(f32 *matrix, struct coord *coord); +void func00015b14(f32 *matrix, struct coord *coord, s32 arg2); u32 func00015b64(void); void func00015b68(f32 *matrix, f32 *arg1, f32 *arg2); u32 func00015be0(void); diff --git a/src/lib/lib_09660.c b/src/lib/lib_09660.c index d5afa3545..1112aff06 100644 --- a/src/lib/lib_09660.c +++ b/src/lib/lib_09660.c @@ -1608,7 +1608,7 @@ glabel func0000ab78 /* abe4: 27a600d0 */ addiu $a2,$sp,0xd0 /* abe8: e7a000c0 */ swc1 $f0,0xc0($sp) /* abec: e7a000c4 */ swc1 $f0,0xc4($sp) -/* abf0: 0c005680 */ jal 0x15a00 +/* abf0: 0c005680 */ jal func00015a00 /* abf4: e7a000c8 */ swc1 $f0,0xc8($sp) /* abf8: 0fc59e66 */ jal func0f167998 /* abfc: 00000000 */ sll $zero,$zero,0x0 diff --git a/src/lib/lib_159b0.c b/src/lib/lib_159b0.c index 5b3d36452..a23a05c6d 100644 --- a/src/lib/lib_159b0.c +++ b/src/lib/lib_159b0.c @@ -37,6 +37,7 @@ glabel func000159b0 GLOBAL_ASM( glabel func000159fc /* 159fc: 00a03020 */ add $a2,$a1,$zero +glabel func00015a00 /* 15a00: 4409a000 */ mfc1 $t1,$f20 /* 15a04: 440aa800 */ mfc1 $t2,$f21 /* 15a08: 440bb000 */ mfc1 $t3,$f22 @@ -111,6 +112,7 @@ glabel func000159fc GLOBAL_ASM( glabel func00015b10 /* 15b10: 00a03020 */ add $a2,$a1,$zero +glabel func00015b14 /* 15b14: c4a00000 */ lwc1 $f0,0x0($a1) /* 15b18: c4a10004 */ lwc1 $f1,0x4($a1) /* 15b1c: c4a20008 */ lwc1 $f2,0x8($a1)