From a20fd5b08b44383c9e6a1109dffde3dd047c1eb2 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Mon, 16 Mar 2020 20:48:35 +1000 Subject: [PATCH] Decompile currentPlayerGetUnk174c --- src/game/chr/chraction.c | 4 ++-- src/game/game_01e250.c | 16 +++++++------- src/game/game_0601b0.c | 10 ++++----- src/game/game_097ba0.c | 22 +++++++++---------- src/game/game_0abe70.c | 6 ++--- src/game/game_0b3350.c | 11 +++++----- src/game/game_0b63b0.c | 8 +++---- src/game/game_11f000.c | 2 +- src/game/game_129900.c | 2 +- src/game/game_12d3f0.c | 2 +- src/game/game_157db0.c | 2 +- src/game/propobj.c | 40 +++++++++++++++++----------------- src/include/game/game_0b3350.h | 2 +- 13 files changed, 64 insertions(+), 63 deletions(-) diff --git a/src/game/chr/chraction.c b/src/game/chr/chraction.c index ed796938c..d78e71fab 100644 --- a/src/game/chr/chraction.c +++ b/src/game/chr/chraction.c @@ -19067,7 +19067,7 @@ glabel func0f03fde4 /* f03fe7c: c4660004 */ lwc1 $f6,0x4($v1) /* f03fe80: e6060004 */ swc1 $f6,0x4($s0) /* f03fe84: c4680008 */ lwc1 $f8,0x8($v1) -/* f03fe88: 0fc2d5de */ jal func0f0b5778 +/* f03fe88: 0fc2d5de */ jal currentPlayerGetUnk174c /* f03fe8c: e6080008 */ swc1 $f8,0x8($s0) /* f03fe90: 00402025 */ or $a0,$v0,$zero /* f03fe94: 8fa500ac */ lw $a1,0xac($sp) @@ -19091,7 +19091,7 @@ glabel func0f03fde4 /* f03fed8: 00e02025 */ or $a0,$a3,$zero /* f03fedc: 0c006973 */ jal func0001a5cc /* f03fee0: 00003025 */ or $a2,$zero,$zero -/* f03fee4: 0fc2d5de */ jal func0f0b5778 +/* f03fee4: 0fc2d5de */ jal currentPlayerGetUnk174c /* f03fee8: afa20064 */ sw $v0,0x64($sp) /* f03feec: 00402025 */ or $a0,$v0,$zero /* f03fef0: 8fa50064 */ lw $a1,0x64($sp) diff --git a/src/game/game_01e250.c b/src/game/game_01e250.c index 1e9b9e0f3..c70fb19d0 100644 --- a/src/game/game_01e250.c +++ b/src/game/game_01e250.c @@ -3470,7 +3470,7 @@ glabel var7f1a879c /* f0215c0: c4ce0318 */ lwc1 $f14,0x318($a2) /* f0215c4: e7a800b4 */ swc1 $f8,0xb4($sp) .L0f0215c8: -/* f0215c8: 0fc2d5de */ jal func0f0b5778 +/* f0215c8: 0fc2d5de */ jal currentPlayerGetUnk174c /* f0215cc: e7ae00b0 */ swc1 $f14,0xb0($sp) /* f0215d0: 00402025 */ or $a0,$v0,$zero /* f0215d4: 0c0056f8 */ jal func00015be0 @@ -4057,7 +4057,7 @@ glabel var7f1a879c /* f021e04: 46126300 */ add.s $f12,$f12,$f18 /* f021e08: e7ac00a0 */ swc1 $f12,0xa0($sp) .L0f021e0c: -/* f021e0c: 0fc2d5de */ jal func0f0b5778 +/* f021e0c: 0fc2d5de */ jal currentPlayerGetUnk174c /* f021e10: e7ae00a4 */ swc1 $f14,0xa4($sp) /* f021e14: 00402025 */ or $a0,$v0,$zero /* f021e18: 0c0056f8 */ jal func00015be0 @@ -7116,7 +7116,7 @@ glabel func0f024738 /* f024a04: c60600a4 */ lwc1 $f6,0xa4($s0) /* f024a08: 46044400 */ add.s $f16,$f8,$f4 /* f024a0c: 46103280 */ add.s $f10,$f6,$f16 -/* f024a10: 0fc2d5de */ jal func0f0b5778 +/* f024a10: 0fc2d5de */ jal currentPlayerGetUnk174c /* f024a14: e60a012c */ swc1 $f10,0x12c($s0) /* f024a18: 02402025 */ or $a0,$s2,$zero /* f024a1c: 00402825 */ or $a1,$v0,$zero @@ -10621,7 +10621,7 @@ glabel func0f027994 /* f027b64: 27a600dc */ addiu $a2,$sp,0xdc /* f027b68: 0c0056da */ jal func00015b68 /* f027b6c: 03082021 */ addu $a0,$t8,$t0 -/* f027b70: 0fc2d5de */ jal func0f0b5778 +/* f027b70: 0fc2d5de */ jal currentPlayerGetUnk174c /* f027b74: 00000000 */ sll $zero,$zero,0x0 /* f027b78: 00402025 */ or $a0,$v0,$zero /* f027b7c: 0c0056d9 */ jal func00015b64 @@ -10633,7 +10633,7 @@ glabel func0f027994 /* f027b94: 27a600d0 */ addiu $a2,$sp,0xd0 /* f027b98: 0c0056c5 */ jal func00015b14 /* f027b9c: 012b2021 */ addu $a0,$t1,$t3 -/* f027ba0: 0fc2d5de */ jal func0f0b5778 +/* f027ba0: 0fc2d5de */ jal currentPlayerGetUnk174c /* f027ba4: 00000000 */ sll $zero,$zero,0x0 /* f027ba8: 00402025 */ or $a0,$v0,$zero /* f027bac: 0c0056c4 */ jal func00015b10 @@ -10676,13 +10676,13 @@ glabel func0f027994 /* f027c38: 00a03025 */ or $a2,$a1,$zero /* f027c3c: 50400010 */ beqzl $v0,.L0f027c80 /* f027c40: afa000c0 */ sw $zero,0xc0($sp) -/* f027c44: 0fc2d5de */ jal func0f0b5778 +/* f027c44: 0fc2d5de */ jal currentPlayerGetUnk174c /* f027c48: 00000000 */ sll $zero,$zero,0x0 /* f027c4c: 00402025 */ or $a0,$v0,$zero /* f027c50: 27a50088 */ addiu $a1,$sp,0x88 /* f027c54: 0c0056da */ jal func00015b68 /* f027c58: 27a600dc */ addiu $a2,$sp,0xdc -/* f027c5c: 0fc2d5de */ jal func0f0b5778 +/* f027c5c: 0fc2d5de */ jal currentPlayerGetUnk174c /* f027c60: 00000000 */ sll $zero,$zero,0x0 /* f027c64: 00402025 */ or $a0,$v0,$zero /* f027c68: 27a50094 */ addiu $a1,$sp,0x94 @@ -10861,7 +10861,7 @@ glabel func0f027e1c /* f027ee4: c4480008 */ lwc1 $f8,0x8($v0) /* f027ee8: afa300f0 */ sw $v1,0xf0($sp) /* f027eec: 460a4481 */ sub.s $f18,$f8,$f10 -/* f027ef0: 0fc2d5de */ jal func0f0b5778 +/* f027ef0: 0fc2d5de */ jal currentPlayerGetUnk174c /* f027ef4: e7b200a0 */ swc1 $f18,0xa0($sp) /* f027ef8: 00402025 */ or $a0,$v0,$zero /* f027efc: 27a50098 */ addiu $a1,$sp,0x98 diff --git a/src/game/game_0601b0.c b/src/game/game_0601b0.c index 8a240b7d2..2e8965723 100644 --- a/src/game/game_0601b0.c +++ b/src/game/game_0601b0.c @@ -2063,13 +2063,13 @@ glabel var7f1a9ebc /* f061de0: 46044181 */ sub.s $f6,$f8,$f4 /* f061de4: e7a6005c */ swc1 $f6,0x5c($sp) .L0f061de8: -/* f061de8: 0fc2d5de */ jal func0f0b5778 +/* f061de8: 0fc2d5de */ jal currentPlayerGetUnk174c /* f061dec: 00000000 */ sll $zero,$zero,0x0 /* f061df0: 00402025 */ or $a0,$v0,$zero /* f061df4: 27a50058 */ addiu $a1,$sp,0x58 /* f061df8: 0c0056da */ jal func00015b68 /* f061dfc: 27a60040 */ addiu $a2,$sp,0x40 -/* f061e00: 0fc2d5de */ jal func0f0b5778 +/* f061e00: 0fc2d5de */ jal currentPlayerGetUnk174c /* f061e04: 00000000 */ sll $zero,$zero,0x0 /* f061e08: 00402025 */ or $a0,$v0,$zero /* f061e0c: 27a50064 */ addiu $a1,$sp,0x64 @@ -2150,13 +2150,13 @@ glabel var7f1a9ec0 /* f061f00: 8fae0074 */ lw $t6,0x74($sp) /* f061f04: 59c00025 */ blezl $t6,.L0f061f9c /* f061f08: 8fbf002c */ lw $ra,0x2c($sp) -/* f061f0c: 0fc2d5de */ jal func0f0b5778 +/* f061f0c: 0fc2d5de */ jal currentPlayerGetUnk174c /* f061f10: 00000000 */ sll $zero,$zero,0x0 /* f061f14: 00402025 */ or $a0,$v0,$zero /* f061f18: 27a50038 */ addiu $a1,$sp,0x38 /* f061f1c: 0c0056da */ jal func00015b68 /* f061f20: 27a60050 */ addiu $a2,$sp,0x50 -/* f061f24: 0fc2d5de */ jal func0f0b5778 +/* f061f24: 0fc2d5de */ jal currentPlayerGetUnk174c /* f061f28: 00000000 */ sll $zero,$zero,0x0 /* f061f2c: 00402025 */ or $a0,$v0,$zero /* f061f30: 27a50044 */ addiu $a1,$sp,0x44 @@ -2628,7 +2628,7 @@ glabel var7f1a9ec4 /* f0625d4: 8fa60138 */ lw $a2,0x138($sp) /* f0625d8: 0fc2832c */ jal func0f0a0cb0 /* f0625dc: 24070001 */ addiu $a3,$zero,0x1 -/* f0625e0: 0fc2d5de */ jal func0f0b5778 +/* f0625e0: 0fc2d5de */ jal currentPlayerGetUnk174c /* f0625e4: 00000000 */ sll $zero,$zero,0x0 /* f0625e8: 00402025 */ or $a0,$v0,$zero /* f0625ec: 0c0056c4 */ jal func00015b10 diff --git a/src/game/game_097ba0.c b/src/game/game_097ba0.c index 8f83350ee..9d96c1961 100644 --- a/src/game/game_097ba0.c +++ b/src/game/game_097ba0.c @@ -9405,7 +9405,7 @@ glabel var7f1ac72c /* f09f2f0: 8fa60240 */ lw $a2,0x240($sp) /* f09f2f4: 0fc2832c */ jal func0f0a0cb0 /* f09f2f8: 24070001 */ addiu $a3,$zero,0x1 -/* f09f2fc: 0fc2d5de */ jal func0f0b5778 +/* f09f2fc: 0fc2d5de */ jal currentPlayerGetUnk174c /* f09f300: 00000000 */ sll $zero,$zero,0x0 /* f09f304: 00402025 */ or $a0,$v0,$zero /* f09f308: 0c0056c4 */ jal func00015b10 @@ -9985,7 +9985,7 @@ glabel var7f1ac740 /* f09fb2c: 02003025 */ or $a2,$s0,$zero /* f09fb30: 0fc2832c */ jal func0f0a0cb0 /* f09fb34: 24070001 */ addiu $a3,$zero,0x1 -/* f09fb38: 0fc2d5de */ jal func0f0b5778 +/* f09fb38: 0fc2d5de */ jal currentPlayerGetUnk174c /* f09fb3c: 00000000 */ sll $zero,$zero,0x0 /* f09fb40: 00402025 */ or $a0,$v0,$zero /* f09fb44: 0c0056c4 */ jal func00015b10 @@ -14452,7 +14452,7 @@ glabel func0f0a37b4 /* f0a3804: c4660034 */ lwc1 $f6,0x34($v1) /* f0a3808: e7a60068 */ swc1 $f6,0x68($sp) /* f0a380c: c4680038 */ lwc1 $f8,0x38($v1) -/* f0a3810: 0fc2d5de */ jal func0f0b5778 +/* f0a3810: 0fc2d5de */ jal currentPlayerGetUnk174c /* f0a3814: e7a8006c */ swc1 $f8,0x6c($sp) /* f0a3818: 00402025 */ or $a0,$v0,$zero /* f0a381c: 0c0056d9 */ jal func00015b64 @@ -14495,7 +14495,7 @@ glabel func0f0a37b4 /* f0a38ac: 27a5003c */ addiu $a1,$sp,0x3c /* f0a38b0: 0c0056da */ jal func00015b68 /* f0a38b4: 27a60054 */ addiu $a2,$sp,0x54 -/* f0a38b8: 0fc2d5de */ jal func0f0b5778 +/* f0a38b8: 0fc2d5de */ jal currentPlayerGetUnk174c /* f0a38bc: 00000000 */ sll $zero,$zero,0x0 /* f0a38c0: 00402025 */ or $a0,$v0,$zero /* f0a38c4: 27a50048 */ addiu $a1,$sp,0x48 @@ -14513,7 +14513,7 @@ glabel func0f0a37b4 /* f0a38f4: 46004282 */ mul.s $f10,$f8,$f0 /* f0a38f8: e7b20088 */ swc1 $f18,0x88($sp) /* f0a38fc: e7a6008c */ swc1 $f6,0x8c($sp) -/* f0a3900: 0fc2d5de */ jal func0f0b5778 +/* f0a3900: 0fc2d5de */ jal currentPlayerGetUnk174c /* f0a3904: e7aa0090 */ swc1 $f10,0x90($sp) /* f0a3908: 00402025 */ or $a0,$v0,$zero /* f0a390c: 0c0056c4 */ jal func00015b10 @@ -14582,7 +14582,7 @@ glabel func0f0a37b4 /* f0a39fc: e7b0008c */ swc1 $f16,0x8c($sp) /* f0a3a00: e7a40090 */ swc1 $f4,0x90($sp) .L0f0a3a04: -/* f0a3a04: 0fc2d5de */ jal func0f0b5778 +/* f0a3a04: 0fc2d5de */ jal currentPlayerGetUnk174c /* f0a3a08: 00000000 */ sll $zero,$zero,0x0 /* f0a3a0c: 00402025 */ or $a0,$v0,$zero /* f0a3a10: 0c0056d9 */ jal func00015b64 @@ -15393,7 +15393,7 @@ glabel var7f1ac8c8 /* f0a44f4: 4600a306 */ mov.s $f12,$f20 /* f0a44f8: 0c0057c1 */ jal func00015f04 /* f0a44fc: 02002825 */ or $a1,$s0,$zero -/* f0a4500: 0fc2d5de */ jal func0f0b5778 +/* f0a4500: 0fc2d5de */ jal currentPlayerGetUnk174c /* f0a4504: 00000000 */ sll $zero,$zero,0x0 /* f0a4508: 00402025 */ or $a0,$v0,$zero /* f0a450c: 0c00567f */ jal func000159fc @@ -16566,7 +16566,7 @@ glabel var7f1ac9e0 /* f0a53cc: c42cc938 */ lwc1 $f12,%lo(var7f1ac938)($at) /* f0a53d0: 0c0057c1 */ jal func00015f04 /* f0a53d4: 27a50024 */ addiu $a1,$sp,0x24 -/* f0a53d8: 0fc2d5de */ jal func0f0b5778 +/* f0a53d8: 0fc2d5de */ jal currentPlayerGetUnk174c /* f0a53dc: 00000000 */ sll $zero,$zero,0x0 /* f0a53e0: 00402025 */ or $a0,$v0,$zero /* f0a53e4: 0c00567f */ jal func000159fc @@ -17444,7 +17444,7 @@ glabel var7f1aca70 /* f0a5fa4: afa40040 */ sw $a0,0x40($sp) /* f0a5fa8: 0c005746 */ jal func00015d18 /* f0a5fac: 26050334 */ addiu $a1,$s0,0x334 -/* f0a5fb0: 0fc2d5de */ jal func0f0b5778 +/* f0a5fb0: 0fc2d5de */ jal currentPlayerGetUnk174c /* f0a5fb4: 00000000 */ sll $zero,$zero,0x0 /* f0a5fb8: 00402025 */ or $a0,$v0,$zero /* f0a5fbc: 8fa50048 */ lw $a1,0x48($sp) @@ -17842,7 +17842,7 @@ glabel var7f1aca70 /* f0a6558: c4860038 */ lwc1 $f6,0x38($a0) /* f0a655c: 0c005746 */ jal func00015d18 /* f0a6560: e606037c */ swc1 $f6,0x37c($s0) -/* f0a6564: 0fc2d5de */ jal func0f0b5778 +/* f0a6564: 0fc2d5de */ jal currentPlayerGetUnk174c /* f0a6568: 00000000 */ sll $zero,$zero,0x0 /* f0a656c: 00402025 */ or $a0,$v0,$zero /* f0a6570: 0c0056d9 */ jal func00015b64 @@ -17914,7 +17914,7 @@ glabel var7f1aca70 /* f0a6670: c4840038 */ lwc1 $f4,0x38($a0) /* f0a6674: 0c005746 */ jal func00015d18 /* f0a6678: e604037c */ swc1 $f4,0x37c($s0) -/* f0a667c: 0fc2d5de */ jal func0f0b5778 +/* f0a667c: 0fc2d5de */ jal currentPlayerGetUnk174c /* f0a6680: 00000000 */ sll $zero,$zero,0x0 /* f0a6684: 00402025 */ or $a0,$v0,$zero /* f0a6688: 0c0056d9 */ jal func00015b64 diff --git a/src/game/game_0abe70.c b/src/game/game_0abe70.c index 2a09c246b..4e8bd51fb 100644 --- a/src/game/game_0abe70.c +++ b/src/game/game_0abe70.c @@ -1540,7 +1540,7 @@ glabel var7f1accf4 /* f0ad348: e7ae00d0 */ swc1 $f14,0xd0($sp) /* f0ad34c: e7aa00d4 */ swc1 $f10,0xd4($sp) .L0f0ad350: -/* f0ad350: 0fc2d5de */ jal func0f0b5778 +/* f0ad350: 0fc2d5de */ jal currentPlayerGetUnk174c /* f0ad354: 00000000 */ sll $zero,$zero,0x0 /* f0ad358: 00402025 */ or $a0,$v0,$zero /* f0ad35c: 0c0056d9 */ jal func00015b64 @@ -3822,7 +3822,7 @@ glabel var7f1acd8c /* f0af34c: 27b10124 */ addiu $s1,$sp,0x124 /* f0af350: 0c00566c */ jal func000159b0 /* f0af354: 02202025 */ or $a0,$s1,$zero -/* f0af358: 0fc2d5de */ jal func0f0b5778 +/* f0af358: 0fc2d5de */ jal currentPlayerGetUnk174c /* f0af35c: 00000000 */ sll $zero,$zero,0x0 /* f0af360: 00402025 */ or $a0,$v0,$zero /* f0af364: 0c0056f8 */ jal func00015be0 @@ -4415,7 +4415,7 @@ glabel var7f1acd90 /* f0afc34: 27a5014c */ addiu $a1,$sp,0x14c /* f0afc38: 0c00566c */ jal func000159b0 /* f0afc3c: 27a4010c */ addiu $a0,$sp,0x10c -/* f0afc40: 0fc2d5de */ jal func0f0b5778 +/* f0afc40: 0fc2d5de */ jal currentPlayerGetUnk174c /* f0afc44: 00000000 */ sll $zero,$zero,0x0 /* f0afc48: 00402025 */ or $a0,$v0,$zero /* f0afc4c: 0c0056f8 */ jal func00015be0 diff --git a/src/game/game_0b3350.c b/src/game/game_0b3350.c index 888b2fd1e..165779091 100644 --- a/src/game/game_0b3350.c +++ b/src/game/game_0b3350.c @@ -2416,12 +2416,13 @@ void currentPlayerSetUnk174c(u32 value) player->unk174c = value; } +u32 currentPlayerGetUnk174c(void) +{ + return g_Vars.currentplayer->unk174c; +} + GLOBAL_ASM( -glabel func0f0b5778 -/* f0b5778: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) -/* f0b577c: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) -/* f0b5780: 03e00008 */ jr $ra -/* f0b5784: 8dc2174c */ lw $v0,0x174c($t6) +glabel func0f0b5788 /* f0b5788: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) /* f0b578c: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) /* f0b5790: 03e00008 */ jr $ra diff --git a/src/game/game_0b63b0.c b/src/game/game_0b63b0.c index f834f4868..c4fcd6913 100644 --- a/src/game/game_0b63b0.c +++ b/src/game/game_0b63b0.c @@ -2230,13 +2230,13 @@ glabel var7f1ad574 /* f0b8174: 02602825 */ or $a1,$s3,$zero /* f0b8178: 0fc28302 */ jal func0f0a0c08 /* f0b817c: 02202025 */ or $a0,$s1,$zero -/* f0b8180: 0fc2d5de */ jal func0f0b5778 +/* f0b8180: 0fc2d5de */ jal currentPlayerGetUnk174c /* f0b8184: 00000000 */ sll $zero,$zero,0x0 /* f0b8188: 00402025 */ or $a0,$v0,$zero /* f0b818c: 02602825 */ or $a1,$s3,$zero /* f0b8190: 0c0056c5 */ jal func00015b14 /* f0b8194: 27a60090 */ addiu $a2,$sp,0x90 -/* f0b8198: 0fc2d5de */ jal func0f0b5778 +/* f0b8198: 0fc2d5de */ jal currentPlayerGetUnk174c /* f0b819c: 00000000 */ sll $zero,$zero,0x0 /* f0b81a0: 00402025 */ or $a0,$v0,$zero /* f0b81a4: 02202825 */ or $a1,$s1,$zero @@ -13299,7 +13299,7 @@ glabel var7f1ad710 /* f0c2488: 8c45000c */ lw $a1,0xc($v0) /* f0c248c: 8c45000c */ lw $a1,0xc($v0) .L0f0c2490: -/* f0c2490: 0fc2d5de */ jal func0f0b5778 +/* f0c2490: 0fc2d5de */ jal currentPlayerGetUnk174c /* f0c2494: afa500e8 */ sw $a1,0xe8($sp) /* f0c2498: 8fa500e8 */ lw $a1,0xe8($sp) /* f0c249c: 00402025 */ or $a0,$v0,$zero @@ -14378,7 +14378,7 @@ glabel func0f0c3320 /* f0c3358: 00808025 */ or $s0,$a0,$zero /* f0c335c: 27b20040 */ addiu $s2,$sp,0x40 .L0f0c3360: -/* f0c3360: 0fc2d5de */ jal func0f0b5778 +/* f0c3360: 0fc2d5de */ jal currentPlayerGetUnk174c /* f0c3364: 00000000 */ sll $zero,$zero,0x0 /* f0c3368: 00402025 */ or $a0,$v0,$zero /* f0c336c: 02002825 */ or $a1,$s0,$zero diff --git a/src/game/game_11f000.c b/src/game/game_11f000.c index 52dfc0b6f..791e04af8 100644 --- a/src/game/game_11f000.c +++ b/src/game/game_11f000.c @@ -27,7 +27,7 @@ glabel func0f11f000 /* f11f004: afbf0014 */ sw $ra,0x14($sp) /* f11f008: e7ac0028 */ swc1 $f12,0x28($sp) /* f11f00c: e7ae002c */ swc1 $f14,0x2c($sp) -/* f11f010: 0fc2d5de */ jal func0f0b5778 +/* f11f010: 0fc2d5de */ jal currentPlayerGetUnk174c /* f11f014: afa60030 */ sw $a2,0x30($sp) /* f11f018: 0fc2d5fe */ jal func0f0b57f8 /* f11f01c: afa20024 */ sw $v0,0x24($sp) diff --git a/src/game/game_129900.c b/src/game/game_129900.c index 7a8728e72..82848dbed 100644 --- a/src/game/game_129900.c +++ b/src/game/game_129900.c @@ -3640,7 +3640,7 @@ glabel var7f1b55c4 /* f12cd8c: afa700dc */ sw $a3,0xdc($sp) /* f12cd90: 0fc59e59 */ jal func0f167964 /* f12cd94: 24040004 */ addiu $a0,$zero,0x4 -/* f12cd98: 0fc2d5de */ jal func0f0b5778 +/* f12cd98: 0fc2d5de */ jal currentPlayerGetUnk174c /* f12cd9c: 00408025 */ or $s0,$v0,$zero /* f12cda0: 8faa00d0 */ lw $t2,0xd0($sp) /* f12cda4: 00405825 */ or $t3,$v0,$zero diff --git a/src/game/game_12d3f0.c b/src/game/game_12d3f0.c index 66d36f778..6ee7bee4a 100644 --- a/src/game/game_12d3f0.c +++ b/src/game/game_12d3f0.c @@ -49,7 +49,7 @@ glabel func0f12d3f0 /* f12d418: 24040001 */ addiu $a0,$zero,0x1 /* f12d41c: 0fc59e73 */ jal func0f1679cc /* f12d420: afa200b4 */ sw $v0,0xb4($sp) -/* f12d424: 0fc2d5de */ jal func0f0b5778 +/* f12d424: 0fc2d5de */ jal currentPlayerGetUnk174c /* f12d428: 00408025 */ or $s0,$v0,$zero /* f12d42c: 8fae00b8 */ lw $t6,0xb8($sp) /* f12d430: 8fa700bc */ lw $a3,0xbc($sp) diff --git a/src/game/game_157db0.c b/src/game/game_157db0.c index 96839d0a7..b287e61bb 100644 --- a/src/game/game_157db0.c +++ b/src/game/game_157db0.c @@ -12691,7 +12691,7 @@ glabel func0f162d9c /* f162ea4: e7a00094 */ swc1 $f0,0x94($sp) /* f162ea8: e7a00098 */ swc1 $f0,0x98($sp) /* f162eac: c6d2002c */ lwc1 $f18,0x2c($s6) -/* f162eb0: 0fc2d5de */ jal func0f0b5778 +/* f162eb0: 0fc2d5de */ jal currentPlayerGetUnk174c /* f162eb4: e7b2009c */ swc1 $f18,0x9c($sp) /* f162eb8: 00402025 */ or $a0,$v0,$zero /* f162ebc: 0c0056d9 */ jal func00015b64 diff --git a/src/game/propobj.c b/src/game/propobj.c index 66a12112c..6f7f72244 100644 --- a/src/game/propobj.c +++ b/src/game/propobj.c @@ -6419,13 +6419,13 @@ glabel func0f06b610 /* f06b818: 0c0056c5 */ jal func00015b14 /* f06b81c: 01d82021 */ addu $a0,$t6,$t8 /* f06b820: c7a00108 */ lwc1 $f0,0x108($sp) -/* f06b824: 0fc2d5de */ jal func0f0b5778 +/* f06b824: 0fc2d5de */ jal currentPlayerGetUnk174c /* f06b828: e6e00000 */ swc1 $f0,0x0($s7) /* f06b82c: 00402025 */ or $a0,$v0,$zero /* f06b830: 27a500fc */ addiu $a1,$sp,0xfc /* f06b834: 0c0056da */ jal func00015b68 /* f06b838: 8fa6014c */ lw $a2,0x14c($sp) -/* f06b83c: 0fc2d5de */ jal func0f0b5778 +/* f06b83c: 0fc2d5de */ jal currentPlayerGetUnk174c /* f06b840: 00000000 */ sll $zero,$zero,0x0 /* f06b844: 00402025 */ or $a0,$v0,$zero /* f06b848: 27a500f0 */ addiu $a1,$sp,0xf0 @@ -6649,7 +6649,7 @@ glabel func0f06b610 /* f06bb78: 0c0056c5 */ jal func00015b14 /* f06bb7c: 03292021 */ addu $a0,$t9,$t1 /* f06bb80: c7b20118 */ lwc1 $f18,0x118($sp) -/* f06bb84: 0fc2d5de */ jal func0f0b5778 +/* f06bb84: 0fc2d5de */ jal currentPlayerGetUnk174c /* f06bb88: e6f20000 */ swc1 $f18,0x0($s7) /* f06bb8c: 00402025 */ or $a0,$v0,$zero /* f06bb90: 27a500fc */ addiu $a1,$sp,0xfc @@ -6678,7 +6678,7 @@ glabel func0f06b610 /* f06bbec: e7aa00f4 */ swc1 $f10,0xf4($sp) /* f06bbf0: e7a800f8 */ swc1 $f8,0xf8($sp) .L0f06bbf4: -/* f06bbf4: 0fc2d5de */ jal func0f0b5778 +/* f06bbf4: 0fc2d5de */ jal currentPlayerGetUnk174c /* f06bbf8: 00000000 */ sll $zero,$zero,0x0 /* f06bbfc: 8fb00150 */ lw $s0,0x150($sp) /* f06bc00: 00402025 */ or $a0,$v0,$zero @@ -7354,13 +7354,13 @@ glabel func0f06c28c /* f06c508: 0c0056c5 */ jal func00015b14 /* f06c50c: 01af2021 */ addu $a0,$t5,$t7 /* f06c510: c7a800ec */ lwc1 $f8,0xec($sp) -/* f06c514: 0fc2d5de */ jal func0f0b5778 +/* f06c514: 0fc2d5de */ jal currentPlayerGetUnk174c /* f06c518: e7c80000 */ swc1 $f8,0x0($s8) /* f06c51c: 00402025 */ or $a0,$v0,$zero /* f06c520: 02a02825 */ or $a1,$s5,$zero /* f06c524: 0c0056da */ jal func00015b68 /* f06c528: 8fa6010c */ lw $a2,0x10c($sp) -/* f06c52c: 0fc2d5de */ jal func0f0b5778 +/* f06c52c: 0fc2d5de */ jal currentPlayerGetUnk174c /* f06c530: 00000000 */ sll $zero,$zero,0x0 /* f06c534: 00402025 */ or $a0,$v0,$zero /* f06c538: 02c02825 */ or $a1,$s6,$zero @@ -7469,13 +7469,13 @@ glabel func0f06c28c /* f06c6b4: 00000000 */ sll $zero,$zero,0x0 /* f06c6b8: 45000034 */ bc1f .L0f06c78c /* f06c6bc: 00000000 */ sll $zero,$zero,0x0 -/* f06c6c0: 0fc2d5de */ jal func0f0b5778 +/* f06c6c0: 0fc2d5de */ jal currentPlayerGetUnk174c /* f06c6c4: e7c40000 */ swc1 $f4,0x0($s8) /* f06c6c8: 00402025 */ or $a0,$v0,$zero /* f06c6cc: 02e02825 */ or $a1,$s7,$zero /* f06c6d0: 0c0056da */ jal func00015b68 /* f06c6d4: 8fa6010c */ lw $a2,0x10c($sp) -/* f06c6d8: 0fc2d5de */ jal func0f0b5778 +/* f06c6d8: 0fc2d5de */ jal currentPlayerGetUnk174c /* f06c6dc: 00000000 */ sll $zero,$zero,0x0 /* f06c6e0: 8fb10110 */ lw $s1,0x110($sp) /* f06c6e4: 00402025 */ or $a0,$v0,$zero @@ -10421,7 +10421,7 @@ glabel func0f06ef44 /* f06f03c: 27a40034 */ addiu $a0,$sp,0x34 /* f06f040: 0c0056f9 */ jal func00015be4 /* f06f044: 27a50074 */ addiu $a1,$sp,0x74 -/* f06f048: 0fc2d5de */ jal func0f0b5778 +/* f06f048: 0fc2d5de */ jal currentPlayerGetUnk174c /* f06f04c: 00000000 */ sll $zero,$zero,0x0 /* f06f050: 00402025 */ or $a0,$v0,$zero /* f06f054: 8fa50024 */ lw $a1,0x24($sp) @@ -10661,7 +10661,7 @@ glabel func0f06f314 /* f06f398: c4460034 */ lwc1 $f6,0x34($v0) /* f06f39c: e7a60080 */ swc1 $f6,0x80($sp) /* f06f3a0: c4480038 */ lwc1 $f8,0x38($v0) -/* f06f3a4: 0fc2d5de */ jal func0f0b5778 +/* f06f3a4: 0fc2d5de */ jal currentPlayerGetUnk174c /* f06f3a8: e7a80084 */ swc1 $f8,0x84($sp) /* f06f3ac: 27b0007c */ addiu $s0,$sp,0x7c /* f06f3b0: 02002825 */ or $a1,$s0,$zero @@ -23007,7 +23007,7 @@ glabel var7f1aa5a8 /* f07a14c: e7b0016c */ swc1 $f16,0x16c($sp) /* f07a150: e7b20170 */ swc1 $f18,0x170($sp) .L0f07a154: -/* f07a154: 0fc2d5de */ jal func0f0b5778 +/* f07a154: 0fc2d5de */ jal currentPlayerGetUnk174c /* f07a158: afa50108 */ sw $a1,0x108($sp) /* f07a15c: 8fa50108 */ lw $a1,0x108($sp) /* f07a160: 00402025 */ or $a0,$v0,$zero @@ -28298,7 +28298,7 @@ glabel var7f1aa6ec /* f07eb98: 8fac023c */ lw $t4,0x23c($sp) /* f07eb9c: 5180017b */ beqzl $t4,.L0f07f18c /* f07eba0: 8fad023c */ lw $t5,0x23c($sp) -/* f07eba4: 0fc2d5de */ jal func0f0b5778 +/* f07eba4: 0fc2d5de */ jal currentPlayerGetUnk174c /* f07eba8: 00000000 */ sll $zero,$zero,0x0 /* f07ebac: 8fb80254 */ lw $t8,0x254($sp) /* f07ebb0: 00402025 */ or $a0,$v0,$zero @@ -28579,7 +28579,7 @@ glabel var7f1aa6ec /* f07efc4: 0fc2ccce */ jal func0f0b3338 /* f07efc8: 8da40020 */ lw $a0,0x20($t5) /* f07efcc: 8fac0254 */ lw $t4,0x254($sp) -/* f07efd0: 0fc2d5de */ jal func0f0b5778 +/* f07efd0: 0fc2d5de */ jal currentPlayerGetUnk174c /* f07efd4: ad800020 */ sw $zero,0x20($t4) /* f07efd8: 8fae0254 */ lw $t6,0x254($sp) /* f07efdc: 00402025 */ or $a0,$v0,$zero @@ -32746,7 +32746,7 @@ glabel var7f1aa85c /* f0828ec: c4500004 */ lwc1 $f16,0x4($v0) /* f0828f0: e7b00050 */ swc1 $f16,0x50($sp) /* f0828f4: c44a0008 */ lwc1 $f10,0x8($v0) -/* f0828f8: 0fc2d5de */ jal func0f0b5778 +/* f0828f8: 0fc2d5de */ jal currentPlayerGetUnk174c /* f0828fc: e7aa0054 */ swc1 $f10,0x54($sp) /* f082900: 00402025 */ or $a0,$v0,$zero /* f082904: 0c0056c4 */ jal func00015b10 @@ -34180,7 +34180,7 @@ glabel var7f1aa978 /* f083b94: 00000000 */ sll $zero,$zero,0x0 /* f083b98: 0c006983 */ jal func0001a60c /* f083b9c: 8fa40130 */ lw $a0,0x130($sp) -/* f083ba0: 0fc2d5de */ jal func0f0b5778 +/* f083ba0: 0fc2d5de */ jal currentPlayerGetUnk174c /* f083ba4: afa20048 */ sw $v0,0x48($sp) /* f083ba8: 00402025 */ or $a0,$v0,$zero /* f083bac: 8fa50048 */ lw $a1,0x48($sp) @@ -35663,7 +35663,7 @@ glabel func0f084f64 /* f084fb0: 00402825 */ or $a1,$v0,$zero /* f084fb4: 0c006973 */ jal func0001a5cc /* f084fb8: 00003025 */ or $a2,$zero,$zero -/* f084fbc: 0fc2d5de */ jal func0f0b5778 +/* f084fbc: 0fc2d5de */ jal currentPlayerGetUnk174c /* f084fc0: afa2007c */ sw $v0,0x7c($sp) /* f084fc4: 00402025 */ or $a0,$v0,$zero /* f084fc8: 8fa5007c */ lw $a1,0x7c($sp) @@ -36611,7 +36611,7 @@ glabel func0f0859a0 /* f085cf0: 00000000 */ sll $zero,$zero,0x0 /* f085cf4: 00008025 */ or $s0,$zero,$zero .L0f085cf8: -/* f085cf8: 0fc2d5de */ jal func0f0b5778 +/* f085cf8: 0fc2d5de */ jal currentPlayerGetUnk174c /* f085cfc: 00000000 */ sll $zero,$zero,0x0 /* f085d00: 27b2007c */ addiu $s2,$sp,0x7c /* f085d04: 02403025 */ or $a2,$s2,$zero @@ -36626,7 +36626,7 @@ glabel func0f0859a0 /* f085d28: 27a500f4 */ addiu $a1,$sp,0xf4 /* f085d2c: 0c0056c5 */ jal func00015b14 /* f085d30: 01b82021 */ addu $a0,$t5,$t8 -/* f085d34: 0fc2d5de */ jal func0f0b5778 +/* f085d34: 0fc2d5de */ jal currentPlayerGetUnk174c /* f085d38: 00000000 */ sll $zero,$zero,0x0 /* f085d3c: 00402025 */ or $a0,$v0,$zero /* f085d40: 0c0056c4 */ jal func00015b10 @@ -36796,7 +36796,7 @@ glabel func0f085eac /* f085f84: c48a0000 */ lwc1 $f10,0x0($a0) /* f085f88: c4480008 */ lwc1 $f8,0x8($v0) /* f085f8c: 460a4481 */ sub.s $f18,$f8,$f10 -/* f085f90: 0fc2d5de */ jal func0f0b5778 +/* f085f90: 0fc2d5de */ jal currentPlayerGetUnk174c /* f085f94: e7b20118 */ swc1 $f18,0x118($sp) /* f085f98: 00402025 */ or $a0,$v0,$zero /* f085f9c: 0c0056d9 */ jal func00015b64 @@ -37377,7 +37377,7 @@ glabel func0f085eac /* f0867dc: c4440030 */ lwc1 $f4,0x30($v0) /* f0867e0: afb80048 */ sw $t8,0x48($sp) /* f0867e4: 46002402 */ mul.s $f16,$f4,$f0 -/* f0867e8: 0fc2d5de */ jal func0f0b5778 +/* f0867e8: 0fc2d5de */ jal currentPlayerGetUnk174c /* f0867ec: e7b000b8 */ swc1 $f16,0xb8($sp) /* f0867f0: 8fb9011c */ lw $t9,0x11c($sp) /* f0867f4: 8fac0124 */ lw $t4,0x124($sp) diff --git a/src/include/game/game_0b3350.h b/src/include/game/game_0b3350.h index a72290d02..36c791032 100644 --- a/src/include/game/game_0b3350.h +++ b/src/include/game/game_0b3350.h @@ -38,7 +38,7 @@ f32 *currentPlayerGetUnk1740(void); void currentPlayerSetUnk1754(u32 value); u32 currentPlayerGetUnk1754(void); void currentPlayerSetUnk174c(u32 value); -u32 func0f0b5778(void); +u32 currentPlayerGetUnk174c(void); u32 func0f0b5798(void); u32 func0f0b57a8(void); u32 func0f0b57b8(void);