diff --git a/src/game/chr/chr.c b/src/game/chr/chr.c index 3ff08261e..d0ae24678 100644 --- a/src/game/chr/chr.c +++ b/src/game/chr/chr.c @@ -18056,23 +18056,23 @@ glabel func0f02d4fc /* f02d854: 152a0025 */ bne $t1,$t2,.L0f02d8ec /* f02d858: 24040020 */ addiu $a0,$zero,0x20 /* f02d85c: 24050004 */ addiu $a1,$zero,0x4 -/* f02d860: 0c0048f2 */ jal func000123c8 +/* f02d860: 0c0048f2 */ jal malloc /* f02d864: afa6005c */ sw $a2,0x5c($sp) /* f02d868: 8fa6005c */ lw $a2,0x5c($sp) /* f02d86c: 24040020 */ addiu $a0,$zero,0x20 /* f02d870: 24050004 */ addiu $a1,$zero,0x4 -/* f02d874: 0c0048f2 */ jal func000123c8 +/* f02d874: 0c0048f2 */ jal malloc /* f02d878: acc20348 */ sw $v0,0x348($a2) /* f02d87c: 8fa6005c */ lw $a2,0x5c($sp) /* f02d880: 24040030 */ addiu $a0,$zero,0x30 /* f02d884: 24050004 */ addiu $a1,$zero,0x4 -/* f02d888: 0c0048f2 */ jal func000123c8 +/* f02d888: 0c0048f2 */ jal malloc /* f02d88c: acc2034c */ sw $v0,0x34c($a2) /* f02d890: 8fa6005c */ lw $a2,0x5c($sp) /* f02d894: 24040030 */ addiu $a0,$zero,0x30 /* f02d898: 24050004 */ addiu $a1,$zero,0x4 /* f02d89c: 8ccb0348 */ lw $t3,0x348($a2) -/* f02d8a0: 0c0048f2 */ jal func000123c8 +/* f02d8a0: 0c0048f2 */ jal malloc /* f02d8a4: ad620004 */ sw $v0,0x4($t3) /* f02d8a8: 8fa6005c */ lw $a2,0x5c($sp) /* f02d8ac: 240cffff */ addiu $t4,$zero,-1 diff --git a/src/game/game_000000.c b/src/game/game_000000.c index ddd620a7f..86382a24b 100644 --- a/src/game/game_000000.c +++ b/src/game/game_000000.c @@ -14,12 +14,12 @@ glabel func0f000000 /* f00000c: afbf0014 */ sw $ra,0x14($sp) /* f000010: 11c00019 */ beqz $t6,.L0f000078 /* f000014: 24042e80 */ addiu $a0,$zero,0x2e80 -/* f000018: 0c0048f2 */ jal func000123c8 +/* f000018: 0c0048f2 */ jal malloc /* f00001c: 24050006 */ addiu $a1,$zero,0x6 /* f000020: 3c01800b */ lui $at,0x800b /* f000024: ac22abb4 */ sw $v0,-0x544c($at) /* f000028: 24040100 */ addiu $a0,$zero,0x100 -/* f00002c: 0c0048f2 */ jal func000123c8 +/* f00002c: 0c0048f2 */ jal malloc /* f000030: 24050006 */ addiu $a1,$zero,0x6 /* f000034: 3c04800b */ lui $a0,%hi(var800aabb8) /* f000038: 2484abb8 */ addiu $a0,$a0,%lo(var800aabb8) diff --git a/src/game/game_000920.c b/src/game/game_000920.c index dc9c53b3f..7bd9d8f18 100644 --- a/src/game/game_000920.c +++ b/src/game/game_000920.c @@ -1552,7 +1552,7 @@ glabel func0f001c0c /* f001d48: afa70048 */ sw $a3,0x48($sp) /* f001d4c: 00f2a821 */ addu $s5,$a3,$s2 /* f001d50: 8fa40068 */ lw $a0,0x68($sp) -/* f001d54: 0c0048f2 */ jal func000123c8 +/* f001d54: 0c0048f2 */ jal malloc /* f001d58: 24050004 */ addiu $a1,$zero,0x4 /* f001d5c: 8e0f0000 */ lw $t7,0x0($s0) /* f001d60: 3c148006 */ lui $s4,%hi(var80061420) @@ -1637,7 +1637,7 @@ glabel func0f001c0c /* f001e78: 0fc5db69 */ jal func0f176da4 /* f001e7c: 03c02025 */ or $a0,$s8,$zero /* f001e80: 00402025 */ or $a0,$v0,$zero -/* f001e84: 0c0048f2 */ jal func000123c8 +/* f001e84: 0c0048f2 */ jal malloc /* f001e88: 24050004 */ addiu $a1,$zero,0x4 /* f001e8c: 03c02025 */ or $a0,$s8,$zero /* f001e90: 0040b825 */ or $s7,$v0,$zero @@ -1725,7 +1725,7 @@ glabel func0f001c0c /* f001fc0: 0fc5db69 */ jal func0f176da4 /* f001fc4: 03c02025 */ or $a0,$s8,$zero /* f001fc8: 00402025 */ or $a0,$v0,$zero -/* f001fcc: 0c0048f2 */ jal func000123c8 +/* f001fcc: 0c0048f2 */ jal malloc /* f001fd0: 24050004 */ addiu $a1,$zero,0x4 /* f001fd4: 0040b825 */ or $s7,$v0,$zero /* f001fd8: 0fc5db69 */ jal func0f176da4 @@ -4926,7 +4926,7 @@ glabel func0f004c6c /* f004d34: 0fc5db69 */ jal func0f176da4 /* f004d38: 00402025 */ or $a0,$v0,$zero /* f004d3c: 00402025 */ or $a0,$v0,$zero -/* f004d40: 0c0048f2 */ jal func000123c8 +/* f004d40: 0c0048f2 */ jal malloc /* f004d44: 24050004 */ addiu $a1,$zero,0x4 /* f004d48: 8ea50000 */ lw $a1,0x0($s5) /* f004d4c: 8fa30038 */ lw $v1,0x38($sp) diff --git a/src/game/game_00b190.c b/src/game/game_00b190.c index a5ad84dae..0e75efa53 100644 --- a/src/game/game_00b190.c +++ b/src/game/game_00b190.c @@ -20,7 +20,7 @@ glabel func0f00b190 /* f00b1b4: 00c12024 */ and $a0,$a2,$at /* f00b1b8: 00803025 */ or $a2,$a0,$zero /* f00b1bc: afa40018 */ sw $a0,0x18($sp) -/* f00b1c0: 0c0048f2 */ jal func000123c8 +/* f00b1c0: 0c0048f2 */ jal malloc /* f00b1c4: 24050006 */ addiu $a1,$zero,0x6 /* f00b1c8: 3c03800b */ lui $v1,%hi(var800aabc0) /* f00b1cc: 2463abc0 */ addiu $v1,$v1,%lo(var800aabc0) diff --git a/src/game/game_00b200.c b/src/game/game_00b200.c index 9e8df8fe4..1d76d1ffd 100644 --- a/src/game/game_00b200.c +++ b/src/game/game_00b200.c @@ -172,17 +172,17 @@ glabel func0f00b420 /* f00b428: 3c018006 */ lui $at,0x8006 /* f00b42c: ac202410 */ sw $zero,0x2410($at) /* f00b430: 24040080 */ addiu $a0,$zero,0x80 -/* f00b434: 0c0048f2 */ jal func000123c8 +/* f00b434: 0c0048f2 */ jal malloc /* f00b438: 24050004 */ addiu $a1,$zero,0x4 /* f00b43c: 3c01800a */ lui $at,0x800a /* f00b440: ac22cc80 */ sw $v0,-0x3380($at) /* f00b444: 24040080 */ addiu $a0,$zero,0x80 -/* f00b448: 0c0048f2 */ jal func000123c8 +/* f00b448: 0c0048f2 */ jal malloc /* f00b44c: 24050004 */ addiu $a1,$zero,0x4 /* f00b450: 3c01800a */ lui $at,0x800a /* f00b454: ac22cc84 */ sw $v0,-0x337c($at) /* f00b458: 24040080 */ addiu $a0,$zero,0x80 -/* f00b45c: 0c0048f2 */ jal func000123c8 +/* f00b45c: 0c0048f2 */ jal malloc /* f00b460: 24050004 */ addiu $a1,$zero,0x4 /* f00b464: 8fbf0014 */ lw $ra,0x14($sp) /* f00b468: 3c01800a */ lui $at,0x800a @@ -223,7 +223,7 @@ glabel func0f00b480 .L0f00b4e4: /* f00b4e4: 3c040004 */ lui $a0,0x4 /* f00b4e8: 34847800 */ ori $a0,$a0,0x7800 -/* f00b4ec: 0c0048f2 */ jal func000123c8 +/* f00b4ec: 0c0048f2 */ jal malloc /* f00b4f0: 24050004 */ addiu $a1,$zero,0x4 /* f00b4f4: 3c01800a */ lui $at,0x800a /* f00b4f8: 0fc02d08 */ jal func0f00b420 @@ -262,7 +262,7 @@ glabel func0f00b510 /* f00b56c: afb00014 */ sw $s0,0x14($sp) /* f00b570: ac20298c */ sw $zero,0x298c($at) /* f00b574: 24040730 */ addiu $a0,$zero,0x730 -/* f00b578: 0c0048f2 */ jal func000123c8 +/* f00b578: 0c0048f2 */ jal malloc /* f00b57c: 24050004 */ addiu $a1,$zero,0x4 /* f00b580: 3c048006 */ lui $a0,%hi(var80062a8c) /* f00b584: 24842a8c */ addiu $a0,$a0,%lo(var80062a8c) @@ -284,7 +284,7 @@ glabel func0f00b510 /* f00b5c0: 3c01800a */ lui $at,0x800a /* f00b5c4: ac20cd18 */ sw $zero,-0x32e8($at) /* f00b5c8: 24041470 */ addiu $a0,$zero,0x1470 -/* f00b5cc: 0c0048f2 */ jal func000123c8 +/* f00b5cc: 0c0048f2 */ jal malloc /* f00b5d0: 24050004 */ addiu $a1,$zero,0x4 /* f00b5d4: 3c018006 */ lui $at,0x8006 /* f00b5d8: 3c10800a */ lui $s0,%hi(var8009ccc0) @@ -294,7 +294,7 @@ glabel func0f00b510 /* f00b5e8: 2610ccc0 */ addiu $s0,$s0,%lo(var8009ccc0) .L0f00b5ec: /* f00b5ec: 24040240 */ addiu $a0,$zero,0x240 -/* f00b5f0: 0c0048f2 */ jal func000123c8 +/* f00b5f0: 0c0048f2 */ jal malloc /* f00b5f4: 24050004 */ addiu $a1,$zero,0x4 /* f00b5f8: 2459003f */ addiu $t9,$v0,0x3f /* f00b5fc: 3728003f */ ori $t0,$t9,0x3f @@ -365,7 +365,7 @@ glabel func0f00b62c /* f00b6d8: 25e4000f */ addiu $a0,$t7,0xf /* f00b6dc: 3498000f */ ori $t8,$a0,0xf /* f00b6e0: ad0e0000 */ sw $t6,0x0($t0) -/* f00b6e4: 0c0048f2 */ jal func000123c8 +/* f00b6e4: 0c0048f2 */ jal malloc /* f00b6e8: 3b04000f */ xori $a0,$t8,0xf /* f00b6ec: 3c088006 */ lui $t0,%hi(g_NumChrsA) /* f00b6f0: 2508298c */ addiu $t0,$t0,%lo(g_NumChrsA) @@ -402,7 +402,7 @@ glabel func0f00b62c /* f00b764: ac20cd10 */ sw $zero,-0x32f0($at) /* f00b768: 39e4000f */ xori $a0,$t7,0xf /* f00b76c: 24050004 */ addiu $a1,$zero,0x4 -/* f00b770: 0c0048f2 */ jal func000123c8 +/* f00b770: 0c0048f2 */ jal malloc /* f00b774: afa3001c */ sw $v1,0x1c($sp) /* f00b778: 3c088006 */ lui $t0,%hi(g_NumChrsA) /* f00b77c: 2508298c */ addiu $t0,$t0,%lo(g_NumChrsA) @@ -414,7 +414,7 @@ glabel func0f00b62c /* f00b794: 3489000f */ ori $t1,$a0,0xf /* f00b798: acc20000 */ sw $v0,0x0($a2) /* f00b79c: 3924000f */ xori $a0,$t1,0xf -/* f00b7a0: 0c0048f2 */ jal func000123c8 +/* f00b7a0: 0c0048f2 */ jal malloc /* f00b7a4: 24050004 */ addiu $a1,$zero,0x4 /* f00b7a8: 3c088006 */ lui $t0,%hi(g_NumChrsA) /* f00b7ac: 2508298c */ addiu $t0,$t0,%lo(g_NumChrsA) diff --git a/src/game/game_00b820.c b/src/game/game_00b820.c index 6bb5543fa..d3acec29d 100644 --- a/src/game/game_00b820.c +++ b/src/game/game_00b820.c @@ -347,7 +347,7 @@ glabel func0f00bbc8 /* f00bcc0: afa9039c */ sw $t1,0x39c($sp) /* f00bcc4: afa003a0 */ sw $zero,0x3a0($sp) /* f00bcc8: 39c4000f */ xori $a0,$t6,0xf -/* f00bccc: 0c0048f2 */ jal func000123c8 +/* f00bccc: 0c0048f2 */ jal malloc /* f00bcd0: 00003025 */ or $a2,$zero,$zero /* f00bcd4: 3c078006 */ lui $a3,%hi(g_NumChrsB) /* f00bcd8: 24e77e60 */ addiu $a3,$a3,%lo(g_NumChrsB) @@ -359,7 +359,7 @@ glabel func0f00bbc8 /* f00bcf0: 3498000f */ ori $t8,$a0,0xf /* f00bcf4: ad020000 */ sw $v0,0x0($t0) /* f00bcf8: 3b04000f */ xori $a0,$t8,0xf -/* f00bcfc: 0c0048f2 */ jal func000123c8 +/* f00bcfc: 0c0048f2 */ jal malloc /* f00bd00: 24050004 */ addiu $a1,$zero,0x4 /* f00bd04: 3c0a800a */ lui $t2,%hi(g_StageSetup) /* f00bd08: 254ad030 */ addiu $t2,$t2,%lo(g_StageSetup) @@ -585,12 +585,12 @@ glabel func0f00bbc8 /* f00c03c: a5cf0000 */ sh $t7,0x0($t6) .L0f00c040: /* f00c040: 24040210 */ addiu $a0,$zero,0x210 -/* f00c044: 0c0048f2 */ jal func000123c8 +/* f00c044: 0c0048f2 */ jal malloc /* f00c048: 24050004 */ addiu $a1,$zero,0x4 /* f00c04c: 3c018006 */ lui $at,0x8006 /* f00c050: ac227e64 */ sw $v0,0x7e64($at) /* f00c054: 24040220 */ addiu $a0,$zero,0x220 -/* f00c058: 0c0048f2 */ jal func000123c8 +/* f00c058: 0c0048f2 */ jal malloc /* f00c05c: 24050004 */ addiu $a1,$zero,0x4 /* f00c060: 3c018006 */ lui $at,0x8006 /* f00c064: ac227e68 */ sw $v0,0x7e68($at) diff --git a/src/game/game_00c240.c b/src/game/game_00c240.c index cd62442c0..8ce09fc27 100644 --- a/src/game/game_00c240.c +++ b/src/game/game_00c240.c @@ -21,11 +21,11 @@ glabel func0f00c240 /* f00c264: 000e70c0 */ sll $t6,$t6,0x3 /* f00c268: 25c4003f */ addiu $a0,$t6,0x3f /* f00c26c: 348f003f */ ori $t7,$a0,0x3f -/* f00c270: 0c0048f2 */ jal func000123c8 +/* f00c270: 0c0048f2 */ jal malloc /* f00c274: 39e4003f */ xori $a0,$t7,0x3f /* f00c278: ae020338 */ sw $v0,0x338($s0) /* f00c27c: 24040340 */ addiu $a0,$zero,0x340 -/* f00c280: 0c0048f2 */ jal func000123c8 +/* f00c280: 0c0048f2 */ jal malloc /* f00c284: 24050004 */ addiu $a1,$zero,0x4 /* f00c288: 3c013f80 */ lui $at,0x3f80 /* f00c28c: 44812000 */ mtc1 $at,$f4 @@ -111,13 +111,13 @@ glabel func0f00c390 /* f00c3a8: 25c4000f */ addiu $a0,$t6,0xf /* f00c3ac: 348f000f */ ori $t7,$a0,0xf /* f00c3b0: 39e4000f */ xori $a0,$t7,0xf -/* f00c3b4: 0c0048f2 */ jal func000123c8 +/* f00c3b4: 0c0048f2 */ jal malloc /* f00c3b8: 24050004 */ addiu $a1,$zero,0x4 /* f00c3bc: 3c08800a */ lui $t0,%hi(var8009cda0) /* f00c3c0: 2508cda0 */ addiu $t0,$t0,%lo(var8009cda0) /* f00c3c4: ad020000 */ sw $v0,0x0($t0) /* f00c3c8: 24041000 */ addiu $a0,$zero,0x1000 -/* f00c3cc: 0c0048f2 */ jal func000123c8 +/* f00c3cc: 0c0048f2 */ jal malloc /* f00c3d0: 24050004 */ addiu $a1,$zero,0x4 /* f00c3d4: 3c07800a */ lui $a3,%hi(g_Vars) /* f00c3d8: 24e79fc0 */ addiu $a3,$a3,%lo(g_Vars) diff --git a/src/game/game_00c490.c b/src/game/game_00c490.c index 8a7d3c95d..2706c0531 100644 --- a/src/game/game_00c490.c +++ b/src/game/game_00c490.c @@ -341,7 +341,7 @@ glabel func0f00c490 /* f00c678: 2484000f */ addiu $a0,$a0,0xf /* f00c67c: 3498000f */ ori $t8,$a0,0xf /* f00c680: 3b04000f */ xori $a0,$t8,0xf -/* f00c684: 0c0048f2 */ jal func000123c8 +/* f00c684: 0c0048f2 */ jal malloc /* f00c688: 24050004 */ addiu $a1,$zero,0x4 /* f00c68c: 3c06800a */ lui $a2,%hi(var8009ce40) /* f00c690: 24c6ce40 */ addiu $a2,$a2,%lo(var8009ce40) @@ -394,7 +394,7 @@ glabel func0f00c490 /* f00c73c: 3499000f */ ori $t9,$a0,0xf /* f00c740: 3b24000f */ xori $a0,$t9,0xf /* f00c744: 24050004 */ addiu $a1,$zero,0x4 -/* f00c748: 0c0048f2 */ jal func000123c8 +/* f00c748: 0c0048f2 */ jal malloc /* f00c74c: afa3001c */ sw $v1,0x1c($sp) /* f00c750: 3c07800a */ lui $a3,%hi(var8009ce44) /* f00c754: 24e7ce44 */ addiu $a3,$a3,%lo(var8009ce44) @@ -443,7 +443,7 @@ glabel func0f00c490 /* f00c7f0: 348d000f */ ori $t5,$a0,0xf /* f00c7f4: 39a4000f */ xori $a0,$t5,0xf /* f00c7f8: 24050004 */ addiu $a1,$zero,0x4 -/* f00c7fc: 0c0048f2 */ jal func000123c8 +/* f00c7fc: 0c0048f2 */ jal malloc /* f00c800: afa3001c */ sw $v1,0x1c($sp) /* f00c804: 3c08800a */ lui $t0,%hi(var8009ce48) /* f00c808: 2508ce48 */ addiu $t0,$t0,%lo(var8009ce48) @@ -488,7 +488,7 @@ glabel func0f00c490 /* f00c898: 348e000f */ ori $t6,$a0,0xf /* f00c89c: 39c4000f */ xori $a0,$t6,0xf /* f00c8a0: 24050004 */ addiu $a1,$zero,0x4 -/* f00c8a4: 0c0048f2 */ jal func000123c8 +/* f00c8a4: 0c0048f2 */ jal malloc /* f00c8a8: afa3001c */ sw $v1,0x1c($sp) /* f00c8ac: 3c09800a */ lui $t1,%hi(var8009ce4c) /* f00c8b0: 2529ce4c */ addiu $t1,$t1,%lo(var8009ce4c) @@ -531,7 +531,7 @@ glabel func0f00c490 /* f00c938: 348f000f */ ori $t7,$a0,0xf /* f00c93c: 39e4000f */ xori $a0,$t7,0xf /* f00c940: 24050004 */ addiu $a1,$zero,0x4 -/* f00c944: 0c0048f2 */ jal func000123c8 +/* f00c944: 0c0048f2 */ jal malloc /* f00c948: afa3001c */ sw $v1,0x1c($sp) /* f00c94c: 3c0a800a */ lui $t2,%hi(var8009ce50) /* f00c950: 254ace50 */ addiu $t2,$t2,%lo(var8009ce50) @@ -571,7 +571,7 @@ glabel func0f00c490 /* f00c9cc: 3498000f */ ori $t8,$a0,0xf /* f00c9d0: 3b04000f */ xori $a0,$t8,0xf /* f00c9d4: 24050004 */ addiu $a1,$zero,0x4 -/* f00c9d8: 0c0048f2 */ jal func000123c8 +/* f00c9d8: 0c0048f2 */ jal malloc /* f00c9dc: afa3001c */ sw $v1,0x1c($sp) /* f00c9e0: 3c0b800a */ lui $t3,%hi(var8009ce54) /* f00c9e4: 256bce54 */ addiu $t3,$t3,%lo(var8009ce54) @@ -681,7 +681,7 @@ glabel func0f00c490 /* f00cb64: 0019c880 */ sll $t9,$t9,0x2 /* f00cb68: 2724000f */ addiu $a0,$t9,0xf /* f00cb6c: 348d000f */ ori $t5,$a0,0xf -/* f00cb70: 0c0048f2 */ jal func000123c8 +/* f00cb70: 0c0048f2 */ jal malloc /* f00cb74: 39a4000f */ xori $a0,$t5,0xf /* f00cb78: 3c078007 */ lui $a3,%hi(var80069970) /* f00cb7c: 24e79970 */ addiu $a3,$a3,%lo(var80069970) @@ -697,7 +697,7 @@ glabel func0f00c490 /* f00cba4: 3498000f */ ori $t8,$a0,0xf /* f00cba8: acc20000 */ sw $v0,0x0($a2) /* f00cbac: 3b04000f */ xori $a0,$t8,0xf -/* f00cbb0: 0c0048f2 */ jal func000123c8 +/* f00cbb0: 0c0048f2 */ jal malloc /* f00cbb4: 24050004 */ addiu $a1,$zero,0x4 /* f00cbb8: 3c078007 */ lui $a3,%hi(var80069970) /* f00cbbc: 3c018007 */ lui $at,0x8007 @@ -1924,7 +1924,7 @@ glabel func0f00dc00 /* f00dcbc: 460c4282 */ mul.s $f10,$f8,$f12 /* f00dcc0: 46025403 */ div.s $f16,$f10,$f2 /* f00dcc4: e6040064 */ swc1 $f4,0x64($s0) -/* f00dcc8: 0c0048f2 */ jal func000123c8 +/* f00dcc8: 0c0048f2 */ jal malloc /* f00dccc: e6100068 */ swc1 $f16,0x68($s0) /* f00dcd0: 2403ffff */ addiu $v1,$zero,-1 /* f00dcd4: ae02009c */ sw $v0,0x9c($s0) @@ -4330,11 +4330,11 @@ glabel func0f00f174 /* f00ffb8: a64d0090 */ sh $t5,0x90($s2) /* f00ffbc: 24040020 */ addiu $a0,$zero,0x20 /* f00ffc0: 24050004 */ addiu $a1,$zero,0x4 -/* f00ffc4: 0c0048f2 */ jal func000123c8 +/* f00ffc4: 0c0048f2 */ jal malloc /* f00ffc8: e64800b8 */ swc1 $f8,0xb8($s2) /* f00ffcc: ae4200e0 */ sw $v0,0xe0($s2) /* f00ffd0: 24040030 */ addiu $a0,$zero,0x30 -/* f00ffd4: 0c0048f2 */ jal func000123c8 +/* f00ffd4: 0c0048f2 */ jal malloc /* f00ffd8: 24050004 */ addiu $a1,$zero,0x4 /* f00ffdc: 8e4c00e0 */ lw $t4,0xe0($s2) /* f00ffe0: 2403ffff */ addiu $v1,$zero,-1 @@ -4960,7 +4960,7 @@ glabel func0f0108d0 /* f010904: 2484000f */ addiu $a0,$a0,0xf /* f010908: 348f000f */ ori $t7,$a0,0xf /* f01090c: 39e4000f */ xori $a0,$t7,0xf -/* f010910: 0c0048f2 */ jal func000123c8 +/* f010910: 0c0048f2 */ jal malloc /* f010914: 24050004 */ addiu $a1,$zero,0x4 /* f010918: 3c088009 */ lui $t0,%hi(g_Is4Mb) /* f01091c: 25080af0 */ addiu $t0,$t0,%lo(g_Is4Mb) diff --git a/src/game/game_0109d0.c b/src/game/game_0109d0.c index b325c81b1..65e3ed3fb 100644 --- a/src/game/game_0109d0.c +++ b/src/game/game_0109d0.c @@ -244,7 +244,7 @@ glabel func0f010bb0 /* f010ca4: 3926000f */ xori $a2,$t1,0xf .L0f010ca8: /* f010ca8: 00c02025 */ or $a0,$a2,$zero -/* f010cac: 0c0048f2 */ jal func000123c8 +/* f010cac: 0c0048f2 */ jal malloc /* f010cb0: 24050004 */ addiu $a1,$zero,0x4 /* f010cb4: 8e0b0284 */ lw $t3,0x284($s0) /* f010cb8: 2405ffff */ addiu $a1,$zero,-1 diff --git a/src/game/game_011110.c b/src/game/game_011110.c index 589e397c5..26f351915 100644 --- a/src/game/game_011110.c +++ b/src/game/game_011110.c @@ -2,6 +2,7 @@ #include "constants.h" #include "gvars/gvars.h" #include "math.h" +#include "setup/inventory.h" #include "setup/setup_000000.h" #include "setup/setup_0160b0.h" #include "setup/setup_020df0.h" @@ -19,6 +20,7 @@ #include "game/game_157db0.h" #include "game/game_176d70.h" #include "game/game_187770.h" +#include "library/library_121e0.h" #include "library/library_16110.h" #include "library/library_233c0.h" @@ -154,7 +156,7 @@ glabel func0f011130 /* f011288: ace00008 */ sw $zero,0x8($a3) /* f01128c: 3b24000f */ xori $a0,$t9,0xf /* f011290: afa8001c */ sw $t0,0x1c($sp) -/* f011294: 0c0048f2 */ jal func000123c8 +/* f011294: 0c0048f2 */ jal malloc /* f011298: 24050004 */ addiu $a1,$zero,0x4 /* f01129c: 3c0a8009 */ lui $t2,%hi(g_Is4Mb) /* f0112a0: 254a0af0 */ addiu $t2,$t2,%lo(g_Is4Mb) @@ -455,7 +457,7 @@ glabel currentPlayerInitEyespy /* f01168c: 10400094 */ beqz $v0,.L0f0118e0 /* f011690: 24040080 */ addiu $a0,$zero,0x80 /* f011694: 24050004 */ addiu $a1,$zero,0x4 -/* f011698: 0c0048f2 */ jal func000123c8 +/* f011698: 0c0048f2 */ jal malloc /* f01169c: afa20084 */ sw $v0,0x84($sp) /* f0116a0: 8e190284 */ lw $t9,0x284($s0) /* f0116a4: 8fa60084 */ lw $a2,0x84($sp) @@ -613,6 +615,83 @@ glabel currentPlayerInitEyespy /* f0118f0: 00000000 */ sll $zero,$zero,0x0 ); +// Mismatch due to address of static data +//void currentPlayerInitEyespy(void) +//{ +// struct prop *prop; +// struct pad pad; +// struct chrdata *propchr; +// struct chrdata *playerchr; +// static u8 nextpad; +// +// if (g_Vars.currentplayer->eyespy == NULL) { +// /** +// * To create the eyespy's prop, a pad must be passed to func0f02dbac. +// * However the eyespy doesn't have a pad because it's held by the +// * player, so it needs to choose one from the stage. The method used +// * will increment the chosen pad number each time the stage is loaded +// * and wrap at 256. +// * +// * @bug: This method means if you play G5 Building enough times then +// * the camspy will start in a trigger point for the mid cutscene, +// * causing the mid cutscene to play instead of the intro. +// */ +// padUnpack(nextpad++, PADFIELD_ROOM | PADFIELD_POS, &pad); +// prop = func0f02dbac(&pad, pad.room); +// +// if (prop) { +// g_Vars.currentplayer->eyespy = malloc(sizeof(struct eyespy), 4); +// +// if (g_Vars.currentplayer->eyespy) { +// g_Vars.currentplayer->eyespy->prop = prop; +// g_Vars.currentplayer->eyespy->look.x = 0; +// g_Vars.currentplayer->eyespy->look.y = 0; +// g_Vars.currentplayer->eyespy->look.z = 1; +// g_Vars.currentplayer->eyespy->up.x = 0; +// g_Vars.currentplayer->eyespy->up.y = 1; +// g_Vars.currentplayer->eyespy->up.z = 0; +// g_Vars.currentplayer->eyespy->theta = 0; +// g_Vars.currentplayer->eyespy->costheta = 1; +// g_Vars.currentplayer->eyespy->sintheta = 0; +// g_Vars.currentplayer->eyespy->verta = 0; +// g_Vars.currentplayer->eyespy->cosverta = 1; +// g_Vars.currentplayer->eyespy->sinverta = 0; +// g_Vars.currentplayer->eyespy->init = true; +// g_Vars.currentplayer->eyespy->initialised = false; +// g_Vars.currentplayer->eyespy->active = false; +// g_Vars.currentplayer->eyespy->buttonheld = false; +// g_Vars.currentplayer->eyespy->camerabuttonheld = false; +// g_Vars.currentplayer->eyespy->bobdir = 1; +// g_Vars.currentplayer->eyespy->bobtimer = 0; +// g_Vars.currentplayer->eyespy->bobactive = true; +// g_Vars.currentplayer->eyespy->vel.x = 0; +// g_Vars.currentplayer->eyespy->vel.y = 0; +// g_Vars.currentplayer->eyespy->vel.z = 0; +// g_Vars.currentplayer->eyespy->speed = 0; +// g_Vars.currentplayer->eyespy->oldground = 0; +// g_Vars.currentplayer->eyespy->height = 0; +// g_Vars.currentplayer->eyespy->gravity = 0; +// g_Vars.currentplayer->eyespy->hit = false; +// g_Vars.currentplayer->eyespy->opendoor = false; +// g_Vars.currentplayer->eyespy->mode = EYESPYMODE_CAMSPY; +// propchr = prop->chr; +// playerchr = g_Vars.currentplayer->prop->chr; +// propchr->team = playerchr->team; +// +// if (stageGetIndex(g_Vars.stagenum) == STAGEINDEX_AIRBASE) { +// g_Vars.currentplayer->eyespy->mode = EYESPYMODE_DRUGSPY; +// g_Weapons[WEAPON_CAMSPY]->name = 0x4c3d; // "DrugSpy" +// g_Weapons[WEAPON_CAMSPY]->shortname = 0x4c3d; // "DrugSpy" +// } else if (stageGetIndex(g_Vars.stagenum) == STAGEINDEX_MBR || stageGetIndex(g_Vars.stagenum) == STAGEINDEX_CHICAGO) { +// g_Vars.currentplayer->eyespy->mode = EYESPYMODE_BOMBSPY; +// } else { +// g_Vars.currentplayer->eyespy->mode = EYESPYMODE_CAMSPY; +// } +// } +// } +// } +//} + GLOBAL_ASM( glabel currentPlayerInit /* f0118f4: 27bdff58 */ addiu $sp,$sp,-168 diff --git a/src/game/game_012450.c b/src/game/game_012450.c index 30b26276e..9361b5ccd 100644 --- a/src/game/game_012450.c +++ b/src/game/game_012450.c @@ -28,6 +28,6 @@ void currentPlayerInitGunsHeld(void) void func0f012530(s32 arg0) { g_Vars.currentplayer->equipmaxitems = arg0 + 30; - g_Vars.currentplayer->unk1868 = func000123c8((g_Vars.currentplayer->equipmaxitems * 20 + 15 | 0xf) ^ 0xf, 4); + g_Vars.currentplayer->unk1868 = malloc((g_Vars.currentplayer->equipmaxitems * 20 + 15 | 0xf) ^ 0xf, 4); func0f111600(); } diff --git a/src/game/game_0125a0.c b/src/game/game_0125a0.c index c6f647f9c..7a5ab9eb1 100644 --- a/src/game/game_0125a0.c +++ b/src/game/game_0125a0.c @@ -569,7 +569,7 @@ glabel func0f012d50 /* f012db4: 2484000f */ addiu $a0,$a0,0xf /* f012db8: 3498000f */ ori $t8,$a0,0xf /* f012dbc: 3b04000f */ xori $a0,$t8,0xf -/* f012dc0: 0c0048f2 */ jal func000123c8 +/* f012dc0: 0c0048f2 */ jal malloc /* f012dc4: afa20118 */ sw $v0,0x118($sp) /* f012dc8: 8fa80118 */ lw $t0,0x118($sp) /* f012dcc: 3c15800a */ lui $s5,%hi(g_Vars) @@ -772,7 +772,7 @@ glabel func0f013010 /* f013090: 2401fff0 */ addiu $at,$zero,-16 /* f013094: 0081c024 */ and $t8,$a0,$at /* f013098: 03002025 */ or $a0,$t8,$zero -/* f01309c: 0c0048f2 */ jal func000123c8 +/* f01309c: 0c0048f2 */ jal malloc /* f0130a0: 24050004 */ addiu $a1,$zero,0x4 /* f0130a4: 3c08800a */ lui $t0,%hi(var800a3434) /* f0130a8: 25083434 */ addiu $t0,$t0,%lo(var800a3434) @@ -855,7 +855,7 @@ glabel func0f013130 /* f0131b0: 000420c0 */ sll $a0,$a0,0x3 /* f0131b4: 00822023 */ subu $a0,$a0,$v0 /* f0131b8: 00042080 */ sll $a0,$a0,0x2 -/* f0131bc: 0c0048f2 */ jal func000123c8 +/* f0131bc: 0c0048f2 */ jal malloc /* f0131c0: 24050004 */ addiu $a1,$zero,0x4 /* f0131c4: 3c08800a */ lui $t0,%hi(var800a3444) /* f0131c8: 25083444 */ addiu $t0,$t0,%lo(var800a3444) diff --git a/src/game/game_013260.c b/src/game/game_013260.c index 787c62017..85af986d8 100644 --- a/src/game/game_013260.c +++ b/src/game/game_013260.c @@ -101,7 +101,7 @@ glabel func0f0132a0 /* f013354: 29410002 */ slti $at,$t2,0x2 /* f013358: 10200074 */ beqz $at,.L0f01352c /* f01335c: 24040100 */ addiu $a0,$zero,0x100 -/* f013360: 0c0048f2 */ jal func000123c8 +/* f013360: 0c0048f2 */ jal malloc /* f013364: 24050004 */ addiu $a1,$zero,0x4 /* f013368: 3c038008 */ lui $v1,%hi(var8007f0c0) /* f01336c: 2463f0c0 */ addiu $v1,$v1,%lo(var8007f0c0) diff --git a/src/game/game_013540.c b/src/game/game_013540.c index 923391414..796aea232 100644 --- a/src/game/game_013540.c +++ b/src/game/game_013540.c @@ -270,7 +270,7 @@ glabel func0f013550 /* f013890: 00671824 */ and $v1,$v1,$a3 /* f013894: 00432021 */ addu $a0,$v0,$v1 /* f013898: afa30018 */ sw $v1,0x18($sp) -/* f01389c: 0c0048f2 */ jal func000123c8 +/* f01389c: 0c0048f2 */ jal malloc /* f0138a0: 24050004 */ addiu $a1,$zero,0x4 /* f0138a4: 8fa30018 */ lw $v1,0x18($sp) /* f0138a8: 3c04800a */ lui $a0,%hi(var800a41b0) @@ -450,7 +450,7 @@ glabel func0f0139f0 /* f013b10: 2401fff0 */ addiu $at,$zero,-16 /* f013b14: 0081c824 */ and $t9,$a0,$at /* f013b18: 03202025 */ or $a0,$t9,$zero -/* f013b1c: 0c0048f2 */ jal func000123c8 +/* f013b1c: 0c0048f2 */ jal malloc /* f013b20: 24050004 */ addiu $a1,$zero,0x4 /* f013b24: 3c06800a */ lui $a2,%hi(var800a45c0) /* f013b28: 24c645c0 */ addiu $a2,$a2,%lo(var800a45c0) @@ -559,7 +559,7 @@ glabel func0f013ba0 .L0f013c78: /* f013c78: 1a200004 */ blez $s1,.L0f013c8c /* f013c7c: 00000000 */ sll $zero,$zero,0x0 -/* f013c80: 0c0048f2 */ jal func000123c8 +/* f013c80: 0c0048f2 */ jal malloc /* f013c84: 00112100 */ sll $a0,$s1,0x4 /* f013c88: ae420024 */ sw $v0,0x24($s2) .L0f013c8c: @@ -786,7 +786,7 @@ glabel func0f013ee0 /* f013f8c: 24050004 */ addiu $a1,$zero,0x4 /* f013f90: 2484000f */ addiu $a0,$a0,0xf /* f013f94: 348f000f */ ori $t7,$a0,0xf -/* f013f98: 0c0048f2 */ jal func000123c8 +/* f013f98: 0c0048f2 */ jal malloc /* f013f9c: 39e4000f */ xori $a0,$t7,0xf /* f013fa0: 3c0a8008 */ lui $t2,%hi(var80082050) /* f013fa4: 254a2050 */ addiu $t2,$t2,%lo(var80082050) @@ -798,7 +798,7 @@ glabel func0f013ee0 /* f013fbc: 348e000f */ ori $t6,$a0,0xf /* f013fc0: ada20000 */ sw $v0,0x0($t5) /* f013fc4: 39c4000f */ xori $a0,$t6,0xf -/* f013fc8: 0c0048f2 */ jal func000123c8 +/* f013fc8: 0c0048f2 */ jal malloc /* f013fcc: 24050004 */ addiu $a1,$zero,0x4 /* f013fd0: 3c0a8008 */ lui $t2,%hi(var80082050) /* f013fd4: 254a2050 */ addiu $t2,$t2,%lo(var80082050) @@ -810,7 +810,7 @@ glabel func0f013ee0 /* f013fec: afe20000 */ sw $v0,0x0($ra) /* f013ff0: 3499000f */ ori $t9,$a0,0xf /* f013ff4: 3b24000f */ xori $a0,$t9,0xf -/* f013ff8: 0c0048f2 */ jal func000123c8 +/* f013ff8: 0c0048f2 */ jal malloc /* f013ffc: 24050004 */ addiu $a1,$zero,0x4 /* f014000: 3c0a8008 */ lui $t2,%hi(var80082050) /* f014004: 254a2050 */ addiu $t2,$t2,%lo(var80082050) @@ -822,7 +822,7 @@ glabel func0f013ee0 /* f01401c: 3498000f */ ori $t8,$a0,0xf /* f014020: ad620000 */ sw $v0,0x0($t3) /* f014024: 3b04000f */ xori $a0,$t8,0xf -/* f014028: 0c0048f2 */ jal func000123c8 +/* f014028: 0c0048f2 */ jal malloc /* f01402c: 24050004 */ addiu $a1,$zero,0x4 /* f014030: 3c0a8008 */ lui $t2,%hi(var80082050) /* f014034: 254a2050 */ addiu $t2,$t2,%lo(var80082050) @@ -834,7 +834,7 @@ glabel func0f013ee0 /* f01404c: 348f000f */ ori $t7,$a0,0xf /* f014050: ad820000 */ sw $v0,0x0($t4) /* f014054: 39e4000f */ xori $a0,$t7,0xf -/* f014058: 0c0048f2 */ jal func000123c8 +/* f014058: 0c0048f2 */ jal malloc /* f01405c: 24050004 */ addiu $a1,$zero,0x4 /* f014060: 3c08800a */ lui $t0,%hi(g_Vars) /* f014064: 3c01800a */ lui $at,0x800a @@ -989,7 +989,7 @@ glabel func0f014250 /* f01426c: 00047040 */ sll $t6,$a0,0x1 /* f014270: 25c4000f */ addiu $a0,$t6,0xf /* f014274: 348f000f */ ori $t7,$a0,0xf -/* f014278: 0c0048f2 */ jal func000123c8 +/* f014278: 0c0048f2 */ jal malloc /* f01427c: 39e4000f */ xori $a0,$t7,0xf /* f014280: 3c05800a */ lui $a1,%hi(g_CoverNums) /* f014284: 24a52370 */ addiu $a1,$a1,%lo(g_CoverNums) @@ -1046,7 +1046,7 @@ glabel func0f0142e8 /* f014338: 2484000f */ addiu $a0,$a0,0xf /* f01433c: 348f000f */ ori $t7,$a0,0xf /* f014340: 39e4000f */ xori $a0,$t7,0xf -/* f014344: 0c0048f2 */ jal func000123c8 +/* f014344: 0c0048f2 */ jal malloc /* f014348: afa20900 */ sw $v0,0x900($sp) /* f01434c: 8fa40900 */ lw $a0,0x900($sp) /* f014350: 3c13800a */ lui $s3,%hi(g_CoverFlags) @@ -1056,7 +1056,7 @@ glabel func0f0142e8 /* f014360: 3488000f */ ori $t0,$a0,0xf /* f014364: ae620000 */ sw $v0,0x0($s3) /* f014368: 3904000f */ xori $a0,$t0,0xf -/* f01436c: 0c0048f2 */ jal func000123c8 +/* f01436c: 0c0048f2 */ jal malloc /* f014370: 24050004 */ addiu $a1,$zero,0x4 /* f014374: 8fa40900 */ lw $a0,0x900($sp) /* f014378: 3c15800a */ lui $s5,%hi(g_CoverRooms) @@ -1066,7 +1066,7 @@ glabel func0f0142e8 /* f014388: 348b000f */ ori $t3,$a0,0xf /* f01438c: aea20000 */ sw $v0,0x0($s5) /* f014390: 3964000f */ xori $a0,$t3,0xf -/* f014394: 0c0048f2 */ jal func000123c8 +/* f014394: 0c0048f2 */ jal malloc /* f014398: 24050004 */ addiu $a1,$zero,0x4 /* f01439c: 3c03800a */ lui $v1,%hi(var800a2368) /* f0143a0: 24632368 */ addiu $v1,$v1,%lo(var800a2368) @@ -1517,7 +1517,7 @@ glabel func0f014848 /* f0149e0: 00380821 */ addu $at,$at,$t8 /* f0149e4: ac30cc80 */ sw $s0,-0x3380($at) /* f0149e8: 24790001 */ addiu $t9,$v1,0x1 -/* f0149ec: 0c0048f2 */ jal func000123c8 +/* f0149ec: 0c0048f2 */ jal malloc /* f0149f0: a1190000 */ sb $t9,0x0($t0) /* f0149f4: 3c088008 */ lui $t0,%hi(var80087d10) /* f0149f8: 25087d10 */ addiu $t0,$t0,%lo(var80087d10) @@ -1578,7 +1578,7 @@ glabel func0f014848 /* f014acc: ad0a0000 */ sw $t2,0x0($t0) /* f014ad0: afa60068 */ sw $a2,0x68($sp) /* f014ad4: 24040090 */ addiu $a0,$zero,0x90 -/* f014ad8: 0c0048f2 */ jal func000123c8 +/* f014ad8: 0c0048f2 */ jal malloc /* f014adc: 24050004 */ addiu $a1,$zero,0x4 /* f014ae0: 8fa60068 */ lw $a2,0x68($sp) /* f014ae4: 2407ffff */ addiu $a3,$zero,-1 @@ -1850,7 +1850,7 @@ glabel func0f014e90 /* f014ed4: a0460018 */ sb $a2,0x18($v0) /* f014ed8: 348e000f */ ori $t6,$a0,0xf /* f014edc: 39c4000f */ xori $a0,$t6,0xf -/* f014ee0: 0c0048f2 */ jal func000123c8 +/* f014ee0: 0c0048f2 */ jal malloc /* f014ee4: afa70018 */ sw $a3,0x18($sp) /* f014ee8: 8fa40018 */ lw $a0,0x18($sp) /* f014eec: 8c9802d4 */ lw $t8,0x2d4($a0) diff --git a/src/game/game_066310.c b/src/game/game_066310.c index f087f64c8..0f304fd0b 100644 --- a/src/game/game_066310.c +++ b/src/game/game_066310.c @@ -6002,7 +6002,7 @@ glabel func0f06a1ec /* f06a2e4: 3488000f */ ori $t0,$a0,0xf /* f06a2e8: 1b200006 */ blez $t9,.L0f06a304 /* f06a2ec: 3904000f */ xori $a0,$t0,0xf -/* f06a2f0: 0c0048f2 */ jal func000123c8 +/* f06a2f0: 0c0048f2 */ jal malloc /* f06a2f4: afa60028 */ sw $a2,0x28($sp) /* f06a2f8: 8fa60028 */ lw $a2,0x28($sp) /* f06a2fc: 10000002 */ beqz $zero,.L0f06a308 @@ -45462,7 +45462,7 @@ glabel func0f08d540 /* f08d6ac: 0019c880 */ sll $t9,$t9,0x2 /* f08d6b0: 2724000f */ addiu $a0,$t9,0xf /* f08d6b4: 3488000f */ ori $t0,$a0,0xf -/* f08d6b8: 0c0048f2 */ jal func000123c8 +/* f08d6b8: 0c0048f2 */ jal malloc /* f08d6bc: 3904000f */ xori $a0,$t0,0xf /* f08d6c0: 8fa60094 */ lw $a2,0x94($sp) /* f08d6c4: 10000006 */ beqz $zero,.L0f08d6e0 @@ -54164,7 +54164,7 @@ glabel func0f0953cc /* f095420: 39e4000f */ xori $a0,$t7,0xf /* f095424: 00003025 */ or $a2,$zero,$zero /* f095428: 24050004 */ addiu $a1,$zero,0x4 -/* f09542c: 0c0048f2 */ jal func000123c8 +/* f09542c: 0c0048f2 */ jal malloc /* f095430: afa00034 */ sw $zero,0x34($sp) /* f095434: 3c07800a */ lui $a3,%hi(g_NumTags) /* f095438: 24e7d0c4 */ addiu $a3,$a3,%lo(g_NumTags) diff --git a/src/game/game_0b28d0.c b/src/game/game_0b28d0.c index b4cf5d071..60d5c112c 100644 --- a/src/game/game_0b28d0.c +++ b/src/game/game_0b28d0.c @@ -507,7 +507,7 @@ glabel func0f0b2b64 /* f0b2c80: 8fac003c */ lw $t4,0x3c($sp) /* f0b2c84: 15800004 */ bnez $t4,.L0f0b2c98 /* f0b2c88: 00000000 */ sll $zero,$zero,0x0 -/* f0b2c8c: 0c0048f2 */ jal func000123c8 +/* f0b2c8c: 0c0048f2 */ jal malloc /* f0b2c90: 24040030 */ addiu $a0,$zero,0x30 /* f0b2c94: afa2003c */ sw $v0,0x3c($sp) .L0f0b2c98: @@ -526,7 +526,7 @@ glabel func0f0b2b64 /* f0b2cc8: 00047880 */ sll $t7,$a0,0x2 /* f0b2ccc: 25e4000f */ addiu $a0,$t7,0xf /* f0b2cd0: 3498000f */ ori $t8,$a0,0xf -/* f0b2cd4: 0c0048f2 */ jal func000123c8 +/* f0b2cd4: 0c0048f2 */ jal malloc /* f0b2cd8: 3b04000f */ xori $a0,$t8,0xf /* f0b2cdc: 100000ce */ beqz $zero,.L0f0b3018 /* f0b2ce0: afa20038 */ sw $v0,0x38($sp) @@ -690,7 +690,7 @@ glabel func0f0b2b64 /* f0b2f0c: 57200017 */ bnezl $t9,.L0f0b2f6c /* f0b2f10: 24c60001 */ addiu $a2,$a2,0x1 /* f0b2f14: 24040400 */ addiu $a0,$zero,0x400 -/* f0b2f18: 0c0048f2 */ jal func000123c8 +/* f0b2f18: 0c0048f2 */ jal malloc /* f0b2f1c: afa70018 */ sw $a3,0x18($sp) /* f0b2f20: 3c04800a */ lui $a0,%hi(var8009dd10) /* f0b2f24: 2484dd10 */ addiu $a0,$a0,%lo(var8009dd10) @@ -760,7 +760,7 @@ glabel func0f0b2b64 /* f0b3000: 0004c880 */ sll $t9,$a0,0x2 /* f0b3004: 2724000f */ addiu $a0,$t9,0xf /* f0b3008: 348b000f */ ori $t3,$a0,0xf -/* f0b300c: 0c0048f2 */ jal func000123c8 +/* f0b300c: 0c0048f2 */ jal malloc /* f0b3010: 3964000f */ xori $a0,$t3,0xf /* f0b3014: afa20038 */ sw $v0,0x38($sp) .L0f0b3018: @@ -4683,7 +4683,7 @@ glabel func0f0b65a8 /* f0b65c0: 2484000f */ addiu $a0,$a0,0xf /* f0b65c4: 348e000f */ ori $t6,$a0,0xf /* f0b65c8: 39c4000f */ xori $a0,$t6,0xf -/* f0b65cc: 0c0048f2 */ jal func000123c8 +/* f0b65cc: 0c0048f2 */ jal malloc /* f0b65d0: 24050004 */ addiu $a1,$zero,0x4 /* f0b65d4: 3c01800a */ lui $at,0x800a /* f0b65d8: 10000003 */ beqz $zero,.L0f0b65e8 @@ -4816,7 +4816,7 @@ glabel func0f0b6764 /* f0b6788: f7b60018 */ sdc1 $f22,0x18($sp) /* f0b678c: f7b40010 */ sdc1 $f20,0x10($sp) /* f0b6790: 39e4000f */ xori $a0,$t7,0xf -/* f0b6794: 0c0048f2 */ jal func000123c8 +/* f0b6794: 0c0048f2 */ jal malloc /* f0b6798: 24050004 */ addiu $a1,$zero,0x4 /* f0b679c: 3c0b800a */ lui $t3,%hi(g_Vars) /* f0b67a0: 256b9fc0 */ addiu $t3,$t3,%lo(g_Vars) diff --git a/src/game/game_0dcdb0.c b/src/game/game_0dcdb0.c index 534284e11..1249b93f4 100644 --- a/src/game/game_0dcdb0.c +++ b/src/game/game_0dcdb0.c @@ -5443,7 +5443,7 @@ glabel func0f0ddda0 /* f0dddf0: 0019c880 */ sll $t9,$t9,0x2 /* f0dddf4: 2724003f */ addiu $a0,$t9,0x3f /* f0dddf8: 3488003f */ ori $t0,$a0,0x3f -/* f0dddfc: 0c0048f2 */ jal func000123c8 +/* f0dddfc: 0c0048f2 */ jal malloc /* f0dde00: 3904003f */ xori $a0,$t0,0x3f /* f0dde04: 3c068007 */ lui $a2,%hi(var80070fe8) /* f0dde08: 24c60fe8 */ addiu $a2,$a2,%lo(var80070fe8) diff --git a/src/game/game_0f09f0.c b/src/game/game_0f09f0.c index d3ab0beeb..aa79dd27a 100644 --- a/src/game/game_0f09f0.c +++ b/src/game/game_0f09f0.c @@ -9625,7 +9625,7 @@ glabel func0f0f8bb4 /* f0f8bc8: ac850008 */ sw $a1,0x8($a0) /* f0f8bcc: 8fa4001c */ lw $a0,0x1c($sp) /* f0f8bd0: 24050004 */ addiu $a1,$zero,0x4 -/* f0f8bd4: 0c0048f2 */ jal func000123c8 +/* f0f8bd4: 0c0048f2 */ jal malloc /* f0f8bd8: afa70018 */ sw $a3,0x18($sp) /* f0f8bdc: 8fa70018 */ lw $a3,0x18($sp) /* f0f8be0: 10000002 */ beqz $zero,.L0f0f8bec @@ -9693,7 +9693,7 @@ glabel func0f0f8c98 /* f0f8cc0: 24010001 */ addiu $at,$zero,0x1 /* f0f8cc4: 11c10005 */ beq $t6,$at,.L0f0f8cdc /* f0f8cc8: 24044b00 */ addiu $a0,$zero,0x4b00 -/* f0f8ccc: 0c0048f2 */ jal func000123c8 +/* f0f8ccc: 0c0048f2 */ jal malloc /* f0f8cd0: 24050004 */ addiu $a1,$zero,0x4 /* f0f8cd4: 3c01800a */ lui $at,0x800a /* f0f8cd8: ac22dfbc */ sw $v0,-0x2044($at) diff --git a/src/game/game_1165d0.c b/src/game/game_1165d0.c index 58dd3867b..919a504c0 100644 --- a/src/game/game_1165d0.c +++ b/src/game/game_1165d0.c @@ -4940,7 +4940,7 @@ glabel func0f11a32c /* f11a3a8: 0fc5db70 */ jal func0f176dc0 /* f11a3ac: afa30018 */ sw $v1,0x18($sp) /* f11a3b0: 00402025 */ or $a0,$v0,$zero -/* f11a3b4: 0c0048f2 */ jal func000123c8 +/* f11a3b4: 0c0048f2 */ jal malloc /* f11a3b8: 24050006 */ addiu $a1,$zero,0x6 /* f11a3bc: 8fa30018 */ lw $v1,0x18($sp) /* f11a3c0: 24040708 */ addiu $a0,$zero,0x708 diff --git a/src/game/game_11ecf0.c b/src/game/game_11ecf0.c index 19bb8d985..51c2c1919 100644 --- a/src/game/game_11ecf0.c +++ b/src/game/game_11ecf0.c @@ -9756,7 +9756,7 @@ glabel func0f127ae4 /* f127b1c: 15ebfff8 */ bne $t7,$t3,.L0f127b00 /* f127b20: adc1fffc */ sw $at,-0x4($t6) /* f127b24: 24041c70 */ addiu $a0,$zero,0x1c70 -/* f127b28: 0c0048f2 */ jal func000123c8 +/* f127b28: 0c0048f2 */ jal malloc /* f127b2c: 24050004 */ addiu $a1,$zero,0x4 /* f127b30: 8fac07c8 */ lw $t4,0x7c8($sp) /* f127b34: 3c09800a */ lui $t1,%hi(g_Vars) diff --git a/src/game/game_129900.c b/src/game/game_129900.c index 1fa8740fd..480e89209 100644 --- a/src/game/game_129900.c +++ b/src/game/game_129900.c @@ -9311,7 +9311,7 @@ glabel func0f131334 /* f131360: f7b60020 */ sdc1 $f22,0x20($sp) /* f131364: f7b40018 */ sdc1 $f20,0x18($sp) /* f131368: 24043f00 */ addiu $a0,$zero,0x3f00 -/* f13136c: 0c0048f2 */ jal func000123c8 +/* f13136c: 0c0048f2 */ jal malloc /* f131370: 24050004 */ addiu $a1,$zero,0x4 /* f131374: 3c01c448 */ lui $at,0xc448 /* f131378: 4481b000 */ mtc1 $at,$f22 @@ -14762,7 +14762,7 @@ glabel func0f1360e8 /* f136280: 030a2021 */ addu $a0,$t8,$t2 /* f136284: 24840043 */ addiu $a0,$a0,0x43 /* f136288: 348b003f */ ori $t3,$a0,0x3f -/* f13628c: 0c0048f2 */ jal func000123c8 +/* f13628c: 0c0048f2 */ jal malloc /* f136290: 3964003f */ xori $a0,$t3,0x3f /* f136294: 24060006 */ addiu $a2,$zero,0x6 /* f136298: 1040016d */ beqz $v0,.L0f136850 @@ -20429,7 +20429,7 @@ glabel func0f13b4c4 /* f13b4e0: afb00030 */ sw $s0,0x30($sp) /* f13b4e4: ac20f130 */ sw $zero,-0xed0($at) /* f13b4e8: 24044240 */ addiu $a0,$zero,0x4240 -/* f13b4ec: 0c0048f2 */ jal func000123c8 +/* f13b4ec: 0c0048f2 */ jal malloc /* f13b4f0: 24050004 */ addiu $a1,$zero,0x4 /* f13b4f4: 3c10800a */ lui $s0,%hi(var800a4170) /* f13b4f8: 26104170 */ addiu $s0,$s0,%lo(var800a4170) @@ -21523,7 +21523,7 @@ glabel func0f13c3f4 /* f13c460: 3498003f */ ori $t8,$a0,0x3f /* f13c464: 3b04003f */ xori $a0,$t8,0x3f /* f13c468: afa4001c */ sw $a0,0x1c($sp) -/* f13c46c: 0c0048f2 */ jal func000123c8 +/* f13c46c: 0c0048f2 */ jal malloc /* f13c470: 24050004 */ addiu $a1,$zero,0x4 /* f13c474: 3c04800a */ lui $a0,0x800a /* f13c478: 8c844180 */ lw $a0,0x4180($a0) @@ -21535,7 +21535,7 @@ glabel func0f13c3f4 /* f13c490: 2504003f */ addiu $a0,$t0,0x3f /* f13c494: 3489003f */ ori $t1,$a0,0x3f /* f13c498: 3924003f */ xori $a0,$t1,0x3f -/* f13c49c: 0c0048f2 */ jal func000123c8 +/* f13c49c: 0c0048f2 */ jal malloc /* f13c4a0: 24050004 */ addiu $a1,$zero,0x4 /* f13c4a4: 3c04800a */ lui $a0,0x800a /* f13c4a8: 8c844188 */ lw $a0,0x4188($a0) @@ -21547,7 +21547,7 @@ glabel func0f13c3f4 /* f13c4c0: 2564003f */ addiu $a0,$t3,0x3f /* f13c4c4: 348c003f */ ori $t4,$a0,0x3f /* f13c4c8: 3984003f */ xori $a0,$t4,0x3f -/* f13c4cc: 0c0048f2 */ jal func000123c8 +/* f13c4cc: 0c0048f2 */ jal malloc /* f13c4d0: 24050004 */ addiu $a1,$zero,0x4 /* f13c4d4: 8fbf0014 */ lw $ra,0x14($sp) /* f13c4d8: 3c01800a */ lui $at,0x800a @@ -36951,12 +36951,12 @@ glabel func0f14a328 /* f14a358: 24040490 */ addiu $a0,$zero,0x490 /* f14a35c: 00408825 */ or $s1,$v0,$zero /* f14a360: 02002025 */ or $a0,$s0,$zero -/* f14a364: 0c0048f2 */ jal func000123c8 +/* f14a364: 0c0048f2 */ jal malloc /* f14a368: 24050006 */ addiu $a1,$zero,0x6 /* f14a36c: 3c018008 */ lui $at,0x8008 /* f14a370: ac22f8dc */ sw $v0,-0x724($at) /* f14a374: 02202025 */ or $a0,$s1,$zero -/* f14a378: 0c0048f2 */ jal func000123c8 +/* f14a378: 0c0048f2 */ jal malloc /* f14a37c: 24050006 */ addiu $a1,$zero,0x6 /* f14a380: 3c01800a */ lui $at,0x800a /* f14a384: 0fc52890 */ jal func0f14a240 @@ -37812,7 +37812,7 @@ glabel func0f14aed0 /* f14af58: 0fc5db69 */ jal func0f176da4 /* f14af5c: 00942021 */ addu $a0,$a0,$s4 /* f14af60: 02022021 */ addu $a0,$s0,$v0 -/* f14af64: 0c0048f2 */ jal func000123c8 +/* f14af64: 0c0048f2 */ jal malloc /* f14af68: 24050004 */ addiu $a1,$zero,0x4 /* f14af6c: 8eaf0000 */ lw $t7,0x0($s5) /* f14af70: 2451018c */ addiu $s1,$v0,0x18c diff --git a/src/game/game_152fa0.c b/src/game/game_152fa0.c index ba892a1a1..ed698999e 100644 --- a/src/game/game_152fa0.c +++ b/src/game/game_152fa0.c @@ -227,7 +227,7 @@ glabel func0f153204 /* f153218: afa60038 */ sw $a2,0x38($sp) /* f15321c: afa7003c */ sw $a3,0x3c($sp) /* f153220: afa40018 */ sw $a0,0x18($sp) -/* f153224: 0c0048f2 */ jal func000123c8 +/* f153224: 0c0048f2 */ jal malloc /* f153228: 24050004 */ addiu $a1,$zero,0x4 /* f15322c: 244802a4 */ addiu $t0,$v0,0x2a4 /* f153230: afa8001c */ sw $t0,0x1c($sp) diff --git a/src/game/game_157db0.c b/src/game/game_157db0.c index 0b87fe028..d93bc4e51 100644 --- a/src/game/game_157db0.c +++ b/src/game/game_157db0.c @@ -4026,7 +4026,7 @@ glabel func0f15b534 /* f15b608: 3498000f */ ori $t8,$a0,0xf /* f15b60c: ac4d0000 */ sw $t5,0x0($v0) /* f15b610: 3b04000f */ xori $a0,$t8,0xf -/* f15b614: 0c0048f2 */ jal func000123c8 +/* f15b614: 0c0048f2 */ jal malloc /* f15b618: afa70058 */ sw $a3,0x58($sp) /* f15b61c: 8fa70058 */ lw $a3,0x58($sp) /* f15b620: 00515021 */ addu $t2,$v0,$s1 @@ -4073,7 +4073,7 @@ glabel func0f15b534 /* f15b6c4: 3629000f */ ori $t1,$s1,0xf /* f15b6c8: 25310001 */ addiu $s1,$t1,0x1 /* f15b6cc: 02212021 */ addu $a0,$s1,$at -/* f15b6d0: 0c0048f2 */ jal func000123c8 +/* f15b6d0: 0c0048f2 */ jal malloc /* f15b6d4: afb90050 */ sw $t9,0x50($sp) /* f15b6d8: 8fa60050 */ lw $a2,0x50($sp) /* f15b6dc: 8fa50028 */ lw $a1,0x28($sp) @@ -4253,7 +4253,7 @@ glabel func0f15b908 /* f15b958: afb1001c */ sw $s1,0x1c($sp) /* f15b95c: afb00018 */ sw $s0,0x18($sp) /* f15b960: 39e4000f */ xori $a0,$t7,0xf -/* f15b964: 0c0048f2 */ jal func000123c8 +/* f15b964: 0c0048f2 */ jal malloc /* f15b968: 24050004 */ addiu $a1,$zero,0x4 /* f15b96c: 8e6402bc */ lw $a0,0x2bc($s3) /* f15b970: 3c15800a */ lui $s5,%hi(g_RoomPtrs) @@ -4263,7 +4263,7 @@ glabel func0f15b908 /* f15b980: 348e000f */ ori $t6,$a0,0xf /* f15b984: aea20000 */ sw $v0,0x0($s5) /* f15b988: 39c4000f */ xori $a0,$t6,0xf -/* f15b98c: 0c0048f2 */ jal func000123c8 +/* f15b98c: 0c0048f2 */ jal malloc /* f15b990: 24050004 */ addiu $a1,$zero,0x4 /* f15b994: 8e7102bc */ lw $s1,0x2bc($s3) /* f15b998: 3c03800a */ lui $v1,%hi(var800a4ce8) @@ -4293,7 +4293,7 @@ glabel func0f15b908 /* f15b9f0: 2624000f */ addiu $a0,$s1,0xf /* f15b9f4: 3499000f */ ori $t9,$a0,0xf /* f15b9f8: 3b24000f */ xori $a0,$t9,0xf -/* f15b9fc: 0c0048f2 */ jal func000123c8 +/* f15b9fc: 0c0048f2 */ jal malloc /* f15ba00: 24050004 */ addiu $a1,$zero,0x4 /* f15ba04: 8e7102bc */ lw $s1,0x2bc($s3) /* f15ba08: 3c03800a */ lui $v1,%hi(var800a492c) @@ -4408,7 +4408,7 @@ glabel func0f15b908 /* f15bba0: 2442fc40 */ addiu $v0,$v0,%lo(var8007fc40) /* f15bba4: 348e000f */ ori $t6,$a0,0xf /* f15bba8: ac5e0000 */ sw $s8,0x0($v0) -/* f15bbac: 0c0048f2 */ jal func000123c8 +/* f15bbac: 0c0048f2 */ jal malloc /* f15bbb0: 39c4000f */ xori $a0,$t6,0xf /* f15bbb4: 3c01800a */ lui $at,0x800a /* f15bbb8: ac224cec */ sw $v0,0x4cec($at) @@ -4456,7 +4456,7 @@ glabel func0f15b908 /* f15bc44: 2484000f */ addiu $a0,$a0,0xf /* f15bc48: 348e000f */ ori $t6,$a0,0xf /* f15bc4c: 39c4000f */ xori $a0,$t6,0xf -/* f15bc50: 0c0048f2 */ jal func000123c8 +/* f15bc50: 0c0048f2 */ jal malloc /* f15bc54: 24050004 */ addiu $a1,$zero,0x4 /* f15bc58: 3c05800a */ lui $a1,%hi(g_Vars) /* f15bc5c: 24a59fc0 */ addiu $a1,$a1,%lo(g_Vars) @@ -4634,7 +4634,7 @@ glabel func0f15b908 .L0f15bebc: /* f15bebc: 2444000f */ addiu $a0,$v0,0xf /* f15bec0: 3498000f */ ori $t8,$a0,0xf -/* f15bec4: 0c0048f2 */ jal func000123c8 +/* f15bec4: 0c0048f2 */ jal malloc /* f15bec8: 3b04000f */ xori $a0,$t8,0xf /* f15becc: 3c10800a */ lui $s0,%hi(var800a4cd0) /* f15bed0: 26104cd0 */ addiu $s0,$s0,%lo(var800a4cd0) @@ -4656,7 +4656,7 @@ glabel func0f15b908 /* f15bf08: 2484000f */ addiu $a0,$a0,0xf /* f15bf0c: 3498000f */ ori $t8,$a0,0xf /* f15bf10: 3b04000f */ xori $a0,$t8,0xf -/* f15bf14: 0c0048f2 */ jal func000123c8 +/* f15bf14: 0c0048f2 */ jal malloc /* f15bf18: 24050004 */ addiu $a1,$zero,0x4 /* f15bf1c: 3c01800a */ lui $at,0x800a /* f15bf20: 1bc00095 */ blez $s8,.L0f15c178 @@ -4929,7 +4929,7 @@ glabel func0f15b908 /* f15c310: 3459000f */ ori $t9,$v0,0xf /* f15c314: 27220001 */ addiu $v0,$t9,0x1 /* f15c318: 00412021 */ addu $a0,$v0,$at -/* f15c31c: 0c0048f2 */ jal func000123c8 +/* f15c31c: 0c0048f2 */ jal malloc /* f15c320: 24050004 */ addiu $a1,$zero,0x4 /* f15c324: 8e450000 */ lw $a1,0x0($s2) /* f15c328: 34018000 */ dli $at,0x8000 @@ -5172,7 +5172,7 @@ glabel func0f15b908 /* f15c6b0: 2484000f */ addiu $a0,$a0,0xf /* f15c6b4: 348f000f */ ori $t7,$a0,0xf /* f15c6b8: 39e4000f */ xori $a0,$t7,0xf -/* f15c6bc: 0c0048f2 */ jal func000123c8 +/* f15c6bc: 0c0048f2 */ jal malloc /* f15c6c0: 24050004 */ addiu $a1,$zero,0x4 /* f15c6c4: 3c03800a */ lui $v1,%hi(var800a41a0) /* f15c6c8: 246341a0 */ addiu $v1,$v1,%lo(var800a41a0) diff --git a/src/game/game_1668e0.c b/src/game/game_1668e0.c index baf93727e..109413b08 100644 --- a/src/game/game_1668e0.c +++ b/src/game/game_1668e0.c @@ -822,7 +822,7 @@ glabel func0f1670fc .L0f167174: /* f167174: 8e040000 */ lw $a0,0x0($s0) .L0f167178: -/* f167178: 0c0048f2 */ jal func000123c8 +/* f167178: 0c0048f2 */ jal malloc /* f16717c: 24050004 */ addiu $a1,$zero,0x4 /* f167180: afa20024 */ sw $v0,0x24($sp) /* f167184: 8e050000 */ lw $a1,0x0($s0) @@ -1200,7 +1200,7 @@ glabel func0f167350 /* f16765c: 8c843fdc */ lw $a0,0x3fdc($a0) /* f167660: 24050004 */ addiu $a1,$zero,0x4 /* f167664: 0004c840 */ sll $t9,$a0,0x1 -/* f167668: 0c0048f2 */ jal func000123c8 +/* f167668: 0c0048f2 */ jal malloc /* f16766c: 03202025 */ or $a0,$t9,$zero /* f167670: 3c0a800a */ lui $t2,%hi(g_Vars) /* f167674: 254a9fc0 */ addiu $t2,$t2,%lo(g_Vars) @@ -1321,7 +1321,7 @@ glabel func0f167350 /* f1677f0: 8c843fec */ lw $a0,0x3fec($a0) /* f1677f4: 24050004 */ addiu $a1,$zero,0x4 /* f1677f8: 00047840 */ sll $t7,$a0,0x1 -/* f1677fc: 0c0048f2 */ jal func000123c8 +/* f1677fc: 0c0048f2 */ jal malloc /* f167800: 01e02025 */ or $a0,$t7,$zero /* f167804: 3c0a800a */ lui $t2,%hi(g_Vars) /* f167808: 254a9fc0 */ addiu $t2,$t2,%lo(g_Vars) diff --git a/src/game/game_16e810.c b/src/game/game_16e810.c index 9fd26954b..251a5ec7b 100644 --- a/src/game/game_16e810.c +++ b/src/game/game_16e810.c @@ -5738,7 +5738,7 @@ glabel func0f1735c0 /* f1735e0: afb20020 */ sw $s2,0x20($sp) /* f1735e4: afb00018 */ sw $s0,0x18($sp) /* f1735e8: 02202025 */ or $a0,$s1,$zero -/* f1735ec: 0c0048f2 */ jal func000123c8 +/* f1735ec: 0c0048f2 */ jal malloc /* f1735f0: 24050004 */ addiu $a1,$zero,0x4 /* f1735f4: 3c03800b */ lui $v1,%hi(var800ab554) /* f1735f8: 2463b554 */ addiu $v1,$v1,%lo(var800ab554) @@ -5870,7 +5870,7 @@ glabel func0f1735c0 /* f1737f0: 00045080 */ sll $t2,$a0,0x2 /* f1737f4: 2544000f */ addiu $a0,$t2,0xf /* f1737f8: 348b000f */ ori $t3,$a0,0xf -/* f1737fc: 0c0048f2 */ jal func000123c8 +/* f1737fc: 0c0048f2 */ jal malloc /* f173800: 3964000f */ xori $a0,$t3,0xf /* f173804: 8e0d0000 */ lw $t5,0x0($s0) /* f173808: 3c03800b */ lui $v1,%hi(var800ab55c) diff --git a/src/game/game_176080.c b/src/game/game_176080.c index c0a72d38a..0ffcf59cc 100644 --- a/src/game/game_176080.c +++ b/src/game/game_176080.c @@ -153,7 +153,7 @@ glabel func0f1760c4 /* f176254: 03280019 */ multu $t9,$t0 /* f176258: 00002012 */ mflo $a0 /* f17625c: 00044840 */ sll $t1,$a0,0x1 -/* f176260: 0c0048f2 */ jal func000123c8 +/* f176260: 0c0048f2 */ jal malloc /* f176264: 25240040 */ addiu $a0,$t1,0x40 /* f176268: 3c038008 */ lui $v1,%hi(var800844f0) /* f17626c: 244b003f */ addiu $t3,$v0,0x3f diff --git a/src/game/game_176d70.c b/src/game/game_176d70.c index 96c5dca56..a03ae954f 100644 --- a/src/game/game_176d70.c +++ b/src/game/game_176d70.c @@ -522,7 +522,7 @@ glabel func0f176ddc /* f176ddc: 27bdffd8 */ addiu $sp,$sp,-40 /* f176de0: afbf0014 */ sw $ra,0x14($sp) /* f176de4: 24042710 */ addiu $a0,$zero,0x2710 -/* f176de8: 0c0048f2 */ jal func000123c8 +/* f176de8: 0c0048f2 */ jal malloc /* f176dec: 24050008 */ addiu $a1,$zero,0x8 /* f176df0: 3c01800b */ lui $at,0x800b /* f176df4: ac22c0d0 */ sw $v0,-0x3f30($at) @@ -530,7 +530,7 @@ glabel func0f176ddc /* f176dfc: 24043900 */ addiu $a0,$zero,0x3900 /* f176e00: afa20018 */ sw $v0,0x18($sp) /* f176e04: 00402025 */ or $a0,$v0,$zero -/* f176e08: 0c0048f2 */ jal func000123c8 +/* f176e08: 0c0048f2 */ jal malloc /* f176e0c: 24050008 */ addiu $a1,$zero,0x8 /* f176e10: 3c05800b */ lui $a1,%hi(var800ac0e8) /* f176e14: 24a5c0e8 */ addiu $a1,$a1,%lo(var800ac0e8) @@ -15554,7 +15554,7 @@ glabel func0f186508 /* f18655c: 24040060 */ addiu $a0,$zero,0x60 /* f186560: 24050004 */ addiu $a1,$zero,0x4 /* f186564: adc10000 */ sw $at,0x0($t6) -/* f186568: 0c0048f2 */ jal func000123c8 +/* f186568: 0c0048f2 */ jal malloc /* f18656c: adc80004 */ sw $t0,0x4($t6) /* f186570: 27a9001c */ addiu $t1,$sp,0x1c /* f186574: afa20018 */ sw $v0,0x18($sp) diff --git a/src/game/game_19c990.c b/src/game/game_19c990.c index 0506805cd..3d7f8203f 100644 --- a/src/game/game_19c990.c +++ b/src/game/game_19c990.c @@ -1253,7 +1253,7 @@ glabel func0f19d560 /* f19d56c: afbf0014 */ sw $ra,0x14($sp) /* f19d570: 348e000f */ ori $t6,$a0,0xf /* f19d574: 39c4000f */ xori $a0,$t6,0xf -/* f19d578: 0c0048f2 */ jal func000123c8 +/* f19d578: 0c0048f2 */ jal malloc /* f19d57c: 24050004 */ addiu $a1,$zero,0x4 /* f19d580: 3c038009 */ lui $v1,%hi(var80088810) /* f19d584: 24638810 */ addiu $v1,$v1,%lo(var80088810) @@ -2602,7 +2602,7 @@ glabel func0f19e7a8 /* f19e84c: 24050004 */ addiu $a1,$zero,0x4 /* f19e850: afa60028 */ sw $a2,0x28($sp) /* f19e854: afa70020 */ sw $a3,0x20($sp) -/* f19e858: 0c0048f2 */ jal func000123c8 +/* f19e858: 0c0048f2 */ jal malloc /* f19e85c: afa9002c */ sw $t1,0x2c($sp) /* f19e860: 3c048009 */ lui $a0,%hi(var80088800) /* f19e864: 24848800 */ addiu $a0,$a0,%lo(var80088800) diff --git a/src/include/constants.h b/src/include/constants.h index 96d35cf6d..1c7738207 100644 --- a/src/include/constants.h +++ b/src/include/constants.h @@ -437,6 +437,10 @@ #define ENTITYTYPE_DIRECTION 0x0010 #define ENTITYTYPE_TARGETCHR 0x0200 +#define EYESPYMODE_CAMSPY 0 +#define EYESPYMODE_DRUGSPY 1 +#define EYESPYMODE_BOMBSPY 2 + #define GAILIST_IDLE 0x0000 #define GAILIST_UNALERTED_0001 0x0001 #define GAILIST_UNALERTED_0002 0x0002 diff --git a/src/include/game/chr/chr.h b/src/include/game/chr/chr.h index 0f5d4130a..7a7e35b0c 100644 --- a/src/include/game/chr/chr.h +++ b/src/include/game/chr/chr.h @@ -121,7 +121,7 @@ u32 func0f02d36c(void); u32 func0f02d3f8(void); u32 func0f02d414(void); u32 func0f02d4fc(void); -u32 func0f02dbac(void); +struct prop *func0f02dbac(struct pad *pad, s16 room); u32 func0f02ddbc(void); u32 func0f02dff0(void); u32 func0f02e064(struct chrdata *chr); diff --git a/src/include/game/game_011110.h b/src/include/game/game_011110.h index f0417407e..fca8629e9 100644 --- a/src/include/game/game_011110.h +++ b/src/include/game/game_011110.h @@ -7,7 +7,7 @@ void func0f011110(void); void func0f011124(s32 value); u32 func0f011130(void); void func0f011560(s32 weapon); -u32 currentPlayerInitEyespy(void); +void currentPlayerInitEyespy(void); void currentPlayerInit(void); #endif diff --git a/src/include/library/library_121e0.h b/src/include/library/library_121e0.h index a8898735b..f705d859f 100644 --- a/src/include/library/library_121e0.h +++ b/src/include/library/library_121e0.h @@ -8,7 +8,7 @@ u32 func000121e8(void); u32 func000122e0(void); u32 func00012324(void); u32 func00012354(void); -s32 func000123c8(s32 arg0, s32 arg1, s32 arg2); +void *malloc(s32 arg0, s32 arg1); u32 func00012430(void); u32 func000124d4(void); void func00012528(s32 arg0); diff --git a/src/include/setup/setup_000000.h b/src/include/setup/setup_000000.h index aa68a4bbc..95cd2605e 100644 --- a/src/include/setup/setup_000000.h +++ b/src/include/setup/setup_000000.h @@ -203,6 +203,7 @@ extern u32 var80061a80; extern u32 var80061af4; extern u32 var80061b68; extern u32 var80061bf0; +extern u8 g_EyespyNextSpawnPad; extern struct coord var800623a4; extern u32 var800623b0; extern u32 var80062400; diff --git a/src/include/types.h b/src/include/types.h index f4c1766ff..43564b657 100644 --- a/src/include/types.h +++ b/src/include/types.h @@ -924,12 +924,12 @@ struct eyespy { /*0x00*/ struct prop *prop; /*0x04*/ struct coord look; /*0x10*/ struct coord up; - /*0x1c*/ s32 theta; - /*0x20*/ s32 costheta; - /*0x24*/ s32 sintheta; - /*0x28*/ s32 verta; - /*0x2c*/ s32 cosverta; - /*0x30*/ s32 sinverta; + /*0x1c*/ f32 theta; + /*0x20*/ f32 costheta; + /*0x24*/ f32 sintheta; + /*0x28*/ f32 verta; + /*0x2c*/ f32 cosverta; + /*0x30*/ f32 sinverta; /*0x34*/ u8 init; /*0x35*/ u8 initialised; /*0x36*/ u8 startuptimer60; @@ -941,10 +941,10 @@ struct eyespy { /*0x3d*/ u8 bobactive; /*0x40*/ struct coord vel; /*0x4c*/ struct coord unk4c; - /*0x58*/ s32 speed; - /*0x5c*/ s32 oldground; - /*0x60*/ s32 height; - /*0x64*/ s32 gravity; + /*0x58*/ f32 speed; + /*0x5c*/ f32 oldground; + /*0x60*/ f32 height; + /*0x64*/ f32 gravity; /*0x68*/ u8 camerashuttertime; /*0x69*/ u8 hit; /*0x6a*/ u8 opendoor; diff --git a/src/library/library_09660.c b/src/library/library_09660.c index 0f866c08f..a6145d7f0 100644 --- a/src/library/library_09660.c +++ b/src/library/library_09660.c @@ -606,7 +606,7 @@ glabel func00009c3c .L00009e08: /* 9e08: 24840040 */ addiu $a0,$a0,0x40 /* 9e0c: 24050004 */ addiu $a1,$zero,0x4 -/* 9e10: 0c0048f2 */ jal func000123c8 +/* 9e10: 0c0048f2 */ jal malloc /* 9e14: afa60018 */ sw $a2,0x18($sp) /* 9e18: 8fa60018 */ lw $a2,0x18($sp) /* 9e1c: 3c04800a */ lui $a0,%hi(var8009cac0) diff --git a/src/library/library_0d520.c b/src/library/library_0d520.c index 9ab512476..df0c57832 100644 --- a/src/library/library_0d520.c +++ b/src/library/library_0d520.c @@ -873,7 +873,7 @@ glabel func0000db3c .L0000df40: /* df40: 3c048006 */ lui $a0,0x8006 /* df44: 8c84d9b8 */ lw $a0,-0x2648($a0) -/* df48: 0c0048f2 */ jal func000123c8 +/* df48: 0c0048f2 */ jal malloc /* df4c: 24050004 */ addiu $a1,$zero,0x4 /* df50: 3c058006 */ lui $a1,0x8006 /* df54: 8ca5d9b8 */ lw $a1,-0x2648($a1) diff --git a/src/library/library_0e9d0.c b/src/library/library_0e9d0.c index bbcde44a8..b91c34b51 100644 --- a/src/library/library_0e9d0.c +++ b/src/library/library_0e9d0.c @@ -1108,7 +1108,7 @@ glabel func0000f804 /* f89c: 02002025 */ or $a0,$s0,$zero /* f8a0: 570000bb */ bnezl $t8,.L0000fb90 /* f8a4: 8fbf0024 */ lw $ra,0x24($sp) -/* f8a8: 0c0048f2 */ jal func000123c8 +/* f8a8: 0c0048f2 */ jal malloc /* f8ac: 24050006 */ addiu $a1,$zero,0x6 /* f8b0: 00502021 */ addu $a0,$v0,$s0 /* f8b4: 0044082b */ sltu $at,$v0,$a0 diff --git a/src/library/library_121e0.c b/src/library/library_121e0.c index a8225a259..c4bce67a3 100644 --- a/src/library/library_121e0.c +++ b/src/library/library_121e0.c @@ -153,7 +153,7 @@ glabel func00012354 ); GLOBAL_ASM( -glabel func000123c8 +glabel malloc /* 123c8: 27bdffe8 */ addiu $sp,$sp,-24 /* 123cc: afa40018 */ sw $a0,0x18($sp) /* 123d0: afbf0014 */ sw $ra,0x14($sp) diff --git a/src/library/library_233c0.c b/src/library/library_233c0.c index 06da4589c..3881e4ebe 100644 --- a/src/library/library_233c0.c +++ b/src/library/library_233c0.c @@ -37,7 +37,7 @@ glabel func000233c0 /* 233e4: afbf001c */ sw $ra,0x1c($sp) /* 233e8: 3b04003f */ xori $a0,$t8,0x3f /* 233ec: 00808025 */ or $s0,$a0,$zero -/* 233f0: 0c0048f2 */ jal func000123c8 +/* 233f0: 0c0048f2 */ jal malloc /* 233f4: 24050006 */ addiu $a1,$zero,0x6 /* 233f8: 3c05007d */ lui $a1,0x7d /* 233fc: 24a5d1a0 */ addiu $a1,$a1,-11872 @@ -108,7 +108,7 @@ glabel func000233c0 /* 234f0: ae0a0000 */ sw $t2,0x0($s0) /* 234f4: acee0000 */ sw $t6,0x0($a3) /* 234f8: 39e4003f */ xori $a0,$t7,0x3f -/* 234fc: 0c0048f2 */ jal func000123c8 +/* 234fc: 0c0048f2 */ jal malloc /* 23500: 24050006 */ addiu $a1,$zero,0x6 /* 23504: 3c098006 */ lui $t1,%hi(var8005f008) /* 23508: 3c018006 */ lui $at,0x8006 @@ -119,7 +119,7 @@ glabel func000233c0 /* 2351c: 0004c840 */ sll $t9,$a0,0x1 /* 23520: 2724003f */ addiu $a0,$t9,0x3f /* 23524: 348a003f */ ori $t2,$a0,0x3f -/* 23528: 0c0048f2 */ jal func000123c8 +/* 23528: 0c0048f2 */ jal malloc /* 2352c: 3944003f */ xori $a0,$t2,0x3f /* 23530: 3c078006 */ lui $a3,%hi(var8005f018) /* 23534: 3c018006 */ lui $at,0x8006 @@ -130,27 +130,27 @@ glabel func000233c0 /* 23548: 00046140 */ sll $t4,$a0,0x5 /* 2354c: 2584003f */ addiu $a0,$t4,0x3f /* 23550: 348d003f */ ori $t5,$a0,0x3f -/* 23554: 0c0048f2 */ jal func000123c8 +/* 23554: 0c0048f2 */ jal malloc /* 23558: 39a4003f */ xori $a0,$t5,0x3f /* 2355c: 3c01800a */ lui $at,0x800a /* 23560: ac22a870 */ sw $v0,-0x5790($at) /* 23564: 24040080 */ addiu $a0,$zero,0x80 -/* 23568: 0c0048f2 */ jal func000123c8 +/* 23568: 0c0048f2 */ jal malloc /* 2356c: 24050006 */ addiu $a1,$zero,0x6 /* 23570: 3c01800a */ lui $at,0x800a /* 23574: ac22a874 */ sw $v0,-0x578c($at) /* 23578: 24040040 */ addiu $a0,$zero,0x40 -/* 2357c: 0c0048f2 */ jal func000123c8 +/* 2357c: 0c0048f2 */ jal malloc /* 23580: 24050006 */ addiu $a1,$zero,0x6 /* 23584: 3c01800a */ lui $at,0x800a /* 23588: ac22a878 */ sw $v0,-0x5788($at) /* 2358c: 24040040 */ addiu $a0,$zero,0x40 -/* 23590: 0c0048f2 */ jal func000123c8 +/* 23590: 0c0048f2 */ jal malloc /* 23594: 24050006 */ addiu $a1,$zero,0x6 /* 23598: 3c01800a */ lui $at,0x800a /* 2359c: ac22a87c */ sw $v0,-0x5784($at) /* 235a0: 24040040 */ addiu $a0,$zero,0x40 -/* 235a4: 0c0048f2 */ jal func000123c8 +/* 235a4: 0c0048f2 */ jal malloc /* 235a8: 24050006 */ addiu $a1,$zero,0x6 /* 235ac: 3c01800a */ lui $at,0x800a /* 235b0: ac22a880 */ sw $v0,-0x5780($at) @@ -161,22 +161,22 @@ glabel func000233c0 /* 235c4: 000f78c0 */ sll $t7,$t7,0x3 /* 235c8: 25e4003f */ addiu $a0,$t7,0x3f /* 235cc: 3498003f */ ori $t8,$a0,0x3f -/* 235d0: 0c0048f2 */ jal func000123c8 +/* 235d0: 0c0048f2 */ jal malloc /* 235d4: 3b04003f */ xori $a0,$t8,0x3f /* 235d8: 3c01800a */ lui $at,0x800a /* 235dc: ac22a884 */ sw $v0,-0x577c($at) /* 235e0: 240400c0 */ addiu $a0,$zero,0xc0 -/* 235e4: 0c0048f2 */ jal func000123c8 +/* 235e4: 0c0048f2 */ jal malloc /* 235e8: 24050006 */ addiu $a1,$zero,0x6 /* 235ec: 3c01800a */ lui $at,0x800a /* 235f0: ac22a888 */ sw $v0,-0x5778($at) /* 235f4: 24040080 */ addiu $a0,$zero,0x80 -/* 235f8: 0c0048f2 */ jal func000123c8 +/* 235f8: 0c0048f2 */ jal malloc /* 235fc: 24050006 */ addiu $a1,$zero,0x6 /* 23600: 3c01800a */ lui $at,0x800a /* 23604: ac22a88c */ sw $v0,-0x5774($at) /* 23608: 240400c0 */ addiu $a0,$zero,0xc0 -/* 2360c: 0c0048f2 */ jal func000123c8 +/* 2360c: 0c0048f2 */ jal malloc /* 23610: 24050006 */ addiu $a1,$zero,0x6 /* 23614: 3c01800a */ lui $at,0x800a /* 23618: 0c008d90 */ jal func00023640 diff --git a/src/library/library_2f490.c b/src/library/library_2f490.c index 0690fdb8d..915894d3b 100644 --- a/src/library/library_2f490.c +++ b/src/library/library_2f490.c @@ -296,7 +296,7 @@ glabel func0002f8a0 /* 2f8bc: 34048000 */ dli $a0,0x8000 .L0002f8c0: /* 2f8c0: 24050006 */ addiu $a1,$zero,0x6 -/* 2f8c4: 0c0048f2 */ jal func000123c8 +/* 2f8c4: 0c0048f2 */ jal malloc /* 2f8c8: afa4001c */ sw $a0,0x1c($sp) /* 2f8cc: 8fa4001c */ lw $a0,0x1c($sp) /* 2f8d0: 8fbf0014 */ lw $ra,0x14($sp) diff --git a/src/setup/setup_000000.c b/src/setup/setup_000000.c index 8fd941bdc..66bf97654 100644 --- a/src/setup/setup_000000.c +++ b/src/setup/setup_000000.c @@ -7919,7 +7919,7 @@ u32 var80062390 = 0x00000000; u32 var80062394 = 0x00000000; u32 var80062398 = 0x00000000; u32 var8006239c = 0x00000000; -u32 var800623a0 = 0x00000000; +u8 g_EyespyNextSpawnPad = 0; struct coord var800623a4 = {0, 0, 0}; u32 var800623b0 = 0x00000000; u32 var800623b4 = 0x00000001;