diff --git a/src/game/bondmove.c b/src/game/bondmove.c index 494b27877..32c9dd8a6 100644 --- a/src/game/bondmove.c +++ b/src/game/bondmove.c @@ -3090,7 +3090,7 @@ glabel var7f1ad8e4 /* f0cab10: 8e4d0284 */ lw $t5,0x284($s2) .L0f0cab14: /* f0cab14: e5a216f8 */ swc1 $f2,0x16f8($t5) -/* f0cab18: 0fc2d5be */ jal func0f0b56f8 +/* f0cab18: 0fc2d5be */ jal currentPlayerGetUnk1740 /* f0cab1c: e7a200ac */ swc1 $f2,0xac($sp) /* f0cab20: 8e4e0284 */ lw $t6,0x284($s2) /* f0cab24: 27b000a0 */ addiu $s0,$sp,0xa0 diff --git a/src/game/chr/chraction.c b/src/game/chr/chraction.c index e6b45b2ea..ed796938c 100644 --- a/src/game/chr/chraction.c +++ b/src/game/chr/chraction.c @@ -19170,7 +19170,7 @@ glabel var7f1a90b8 /* f03ffe4: 02602825 */ or $a1,$s3,$zero /* f03ffe8: 0c0056c5 */ jal func00015b14 /* f03ffec: 27a60118 */ addiu $a2,$sp,0x118 -/* f03fff0: 0fc2d5be */ jal func0f0b56f8 +/* f03fff0: 0fc2d5be */ jal currentPlayerGetUnk1740 /* f03fff4: 00000000 */ sll $zero,$zero,0x0 /* f03fff8: 00514826 */ xor $t1,$v0,$s1 /* f03fffc: 0009482b */ sltu $t1,$zero,$t1 @@ -29196,7 +29196,7 @@ glabel var7f1a93e0 /* f04a08c: 8fa40050 */ lw $a0,0x50($sp) /* f04a090: 0c006b43 */ jal func0001ad0c /* f04a094: 27a5002c */ addiu $a1,$sp,0x2c -/* f04a098: 0fc2d5be */ jal func0f0b56f8 +/* f04a098: 0fc2d5be */ jal currentPlayerGetUnk1740 /* f04a09c: 00000000 */ sll $zero,$zero,0x0 /* f04a0a0: 00402025 */ or $a0,$v0,$zero /* f04a0a4: 0c0056d9 */ jal func00015b64 diff --git a/src/game/game_006bd0.c b/src/game/game_006bd0.c index 8656e960e..a3f7a6444 100644 --- a/src/game/game_006bd0.c +++ b/src/game/game_006bd0.c @@ -650,7 +650,7 @@ glabel func0f006c80 /* f007440: 8fa40154 */ lw $a0,0x154($sp) /* f007444: 0c0059b7 */ jal func000166dc /* f007448: 02002825 */ or $a1,$s0,$zero -/* f00744c: 0fc2d5be */ jal func0f0b56f8 +/* f00744c: 0fc2d5be */ jal currentPlayerGetUnk1740 /* f007450: 00000000 */ sll $zero,$zero,0x0 /* f007454: 00402025 */ or $a0,$v0,$zero /* f007458: 0c0056f8 */ jal func00015be0 @@ -3081,7 +3081,7 @@ glabel func0f009818 /* f009924: 27a50088 */ addiu $a1,$sp,0x88 /* f009928: 0c005680 */ jal func00015a00 /* f00992c: 27a600c8 */ addiu $a2,$sp,0xc8 -/* f009930: 0fc2d5be */ jal func0f0b56f8 +/* f009930: 0fc2d5be */ jal currentPlayerGetUnk1740 /* f009934: 00000000 */ sll $zero,$zero,0x0 /* f009938: 00402025 */ or $a0,$v0,$zero /* f00993c: 0c0056f8 */ jal func00015be0 diff --git a/src/game/game_01e250.c b/src/game/game_01e250.c index 5db863255..1e9b9e0f3 100644 --- a/src/game/game_01e250.c +++ b/src/game/game_01e250.c @@ -3556,7 +3556,7 @@ glabel var7f1a879c /* f021700: c7a4013c */ lwc1 $f4,0x13c($sp) /* f021704: e4440034 */ swc1 $f4,0x34($v0) /* f021708: c7a60140 */ lwc1 $f6,0x140($sp) -/* f02170c: 0fc2d5be */ jal func0f0b56f8 +/* f02170c: 0fc2d5be */ jal currentPlayerGetUnk1740 /* f021710: e4460038 */ swc1 $f6,0x38($v0) /* f021714: 00402025 */ or $a0,$v0,$zero /* f021718: 0c0056f8 */ jal func00015be0 @@ -4158,7 +4158,7 @@ glabel var7f1a879c /* f021f78: c7a60074 */ lwc1 $f6,0x74($sp) /* f021f7c: e5a60034 */ swc1 $f6,0x34($t5) /* f021f80: c7aa0078 */ lwc1 $f10,0x78($sp) -/* f021f84: 0fc2d5be */ jal func0f0b56f8 +/* f021f84: 0fc2d5be */ jal currentPlayerGetUnk1740 /* f021f88: e5aa0038 */ swc1 $f10,0x38($t5) /* f021f8c: 00402025 */ or $a0,$v0,$zero /* f021f90: 0c0056f8 */ jal func00015be0 @@ -6288,7 +6288,7 @@ glabel var7f1a87d8 /* f023e20: 46080482 */ mul.s $f18,$f0,$f8 /* f023e24: 0c0059b7 */ jal func000166dc /* f023e28: e7b20198 */ swc1 $f18,0x198($sp) -/* f023e2c: 0fc2d5be */ jal func0f0b56f8 +/* f023e2c: 0fc2d5be */ jal currentPlayerGetUnk1740 /* f023e30: 00000000 */ sll $zero,$zero,0x0 /* f023e34: 00402025 */ or $a0,$v0,$zero /* f023e38: 0c00567f */ jal func000159fc @@ -6358,7 +6358,7 @@ glabel var7f1a87d8 /* f023f2c: 460a0102 */ mul.s $f4,$f0,$f10 /* f023f30: 0c0059b7 */ jal func000166dc /* f023f34: e7a40184 */ swc1 $f4,0x184($sp) -/* f023f38: 0fc2d5be */ jal func0f0b56f8 +/* f023f38: 0fc2d5be */ jal currentPlayerGetUnk1740 /* f023f3c: 00000000 */ sll $zero,$zero,0x0 /* f023f40: 00402025 */ or $a0,$v0,$zero /* f023f44: 0c00567f */ jal func000159fc @@ -6367,12 +6367,12 @@ glabel var7f1a87d8 /* f023f50: 10000008 */ beqz $zero,.L0f023f74 /* f023f54: afaa0210 */ sw $t2,0x210($sp) .L0f023f58: -/* f023f58: 0fc2d5be */ jal func0f0b56f8 +/* f023f58: 0fc2d5be */ jal currentPlayerGetUnk1740 /* f023f5c: 00000000 */ sll $zero,$zero,0x0 /* f023f60: 10000004 */ beqz $zero,.L0f023f74 /* f023f64: afa20210 */ sw $v0,0x210($sp) .L0f023f68: -/* f023f68: 0fc2d5be */ jal func0f0b56f8 +/* f023f68: 0fc2d5be */ jal currentPlayerGetUnk1740 /* f023f6c: 00000000 */ sll $zero,$zero,0x0 /* f023f70: afa20210 */ sw $v0,0x210($sp) .L0f023f74: @@ -7332,7 +7332,7 @@ glabel var7f1a87f8 /* f024cdc: c6280024 */ lwc1 $f8,0x24($s1) /* f024ce0: e7a80090 */ swc1 $f8,0x90($sp) .L0f024ce4: -/* f024ce4: 0fc2d5be */ jal func0f0b56f8 +/* f024ce4: 0fc2d5be */ jal currentPlayerGetUnk1740 /* f024ce8: 00000000 */ sll $zero,$zero,0x0 /* f024cec: 263500ec */ addiu $s5,$s1,0xec /* f024cf0: 02a03025 */ or $a2,$s5,$zero @@ -10707,7 +10707,7 @@ glabel func0f027994 .L0f027cb0: /* f027cb0: 5b000035 */ blezl $t8,.L0f027d88 /* f027cb4: 8fb900b8 */ lw $t9,0xb8($sp) -/* f027cb8: 0fc2d5be */ jal func0f0b56f8 +/* f027cb8: 0fc2d5be */ jal currentPlayerGetUnk1740 /* f027cbc: 00000000 */ sll $zero,$zero,0x0 /* f027cc0: c7a400dc */ lwc1 $f4,0xdc($sp) /* f027cc4: c4460008 */ lwc1 $f6,0x8($v0) diff --git a/src/game/game_0601b0.c b/src/game/game_0601b0.c index ec0429fcc..8a240b7d2 100644 --- a/src/game/game_0601b0.c +++ b/src/game/game_0601b0.c @@ -1295,7 +1295,7 @@ glabel var7f1a9eb8 /* f061338: 24010016 */ addiu $at,$zero,0x16 /* f06133c: 1161000f */ beq $t3,$at,.L0f06137c /* f061340: 00000000 */ sll $zero,$zero,0x0 -/* f061344: 0fc2d5be */ jal func0f0b56f8 +/* f061344: 0fc2d5be */ jal currentPlayerGetUnk1740 /* f061348: 00000000 */ sll $zero,$zero,0x0 /* f06134c: 00402025 */ or $a0,$v0,$zero /* f061350: 27a50694 */ addiu $a1,$sp,0x694 diff --git a/src/game/game_097ba0.c b/src/game/game_097ba0.c index 0ee7aac62..8f83350ee 100644 --- a/src/game/game_097ba0.c +++ b/src/game/game_097ba0.c @@ -10737,7 +10737,7 @@ glabel var7f1ac764 /* f0a05f8: c44606bc */ lwc1 $f6,0x6bc($v0) /* f0a05fc: e7a60098 */ swc1 $f6,0x98($sp) /* f0a0600: c44806c0 */ lwc1 $f8,0x6c0($v0) -/* f0a0604: 0fc2d5be */ jal func0f0b56f8 +/* f0a0604: 0fc2d5be */ jal currentPlayerGetUnk1740 /* f0a0608: e7a8009c */ swc1 $f8,0x9c($sp) /* f0a060c: 00402025 */ or $a0,$v0,$zero /* f0a0610: 0c0056d9 */ jal func00015b64 @@ -14489,7 +14489,7 @@ glabel func0f0a37b4 /* f0a3894: e7a40050 */ swc1 $f4,0x50($sp) /* f0a3898: e7a6003c */ swc1 $f6,0x3c($sp) /* f0a389c: e7a80040 */ swc1 $f8,0x40($sp) -/* f0a38a0: 0fc2d5be */ jal func0f0b56f8 +/* f0a38a0: 0fc2d5be */ jal currentPlayerGetUnk1740 /* f0a38a4: e7aa0044 */ swc1 $f10,0x44($sp) /* f0a38a8: 00402025 */ or $a0,$v0,$zero /* f0a38ac: 27a5003c */ addiu $a1,$sp,0x3c diff --git a/src/game/game_0abe70.c b/src/game/game_0abe70.c index d87bd0cb0..2a09c246b 100644 --- a/src/game/game_0abe70.c +++ b/src/game/game_0abe70.c @@ -253,7 +253,7 @@ glabel func0f0ac138 /* f0ac140: 27bdff88 */ addiu $sp,$sp,-120 /* f0ac144: afbf0014 */ sw $ra,0x14($sp) /* f0ac148: afa40078 */ sw $a0,0x78($sp) -/* f0ac14c: 0fc2d5be */ jal func0f0b56f8 +/* f0ac14c: 0fc2d5be */ jal currentPlayerGetUnk1740 /* f0ac150: afae0074 */ sw $t6,0x74($sp) /* f0ac154: 8fa40078 */ lw $a0,0x78($sp) /* f0ac158: 8faf0074 */ lw $t7,0x74($sp) @@ -499,7 +499,7 @@ glabel func0f0ac4b8 /* f0ac4dc: 24040002 */ addiu $a0,$zero,0x2 /* f0ac4e0: 0fc59e73 */ jal func0f1679cc /* f0ac4e4: 26101bb0 */ addiu $s0,$s0,7088 -/* f0ac4e8: 0fc2d5be */ jal func0f0b56f8 +/* f0ac4e8: 0fc2d5be */ jal currentPlayerGetUnk1740 /* f0ac4ec: afa200c4 */ sw $v0,0xc4($sp) /* f0ac4f0: 3c0c8007 */ lui $t4,%hi(var80070500) /* f0ac4f4: afa20080 */ sw $v0,0x80($sp) @@ -558,7 +558,7 @@ glabel func0f0ac4b8 /* f0ac5c4: e7a800e4 */ swc1 $f8,0xe4($sp) /* f0ac5c8: 46023283 */ div.s $f10,$f6,$f2 /* f0ac5cc: e7a400e8 */ swc1 $f4,0xe8($sp) -/* f0ac5d0: 0fc2d5be */ jal func0f0b56f8 +/* f0ac5d0: 0fc2d5be */ jal currentPlayerGetUnk1740 /* f0ac5d4: e7aa00ec */ swc1 $f10,0xec($sp) /* f0ac5d8: 00402025 */ or $a0,$v0,$zero /* f0ac5dc: 8fa500fc */ lw $a1,0xfc($sp) @@ -610,7 +610,7 @@ glabel func0f0ac4b8 /* f0ac680: 1000013e */ beqz $zero,.L0f0acb7c /* f0ac684: 8fa200f0 */ lw $v0,0xf0($sp) .L0f0ac688: -/* f0ac688: 0fc2d5be */ jal func0f0b56f8 +/* f0ac688: 0fc2d5be */ jal currentPlayerGetUnk1740 /* f0ac68c: 00000000 */ sll $zero,$zero,0x0 /* f0ac690: 00402025 */ or $a0,$v0,$zero /* f0ac694: 8fa50108 */ lw $a1,0x108($sp) @@ -1069,7 +1069,7 @@ glabel var7f1accf4 /* f0acc54: 01cf6821 */ addu $t5,$t6,$t7 /* f0acc58: afad00ec */ sw $t5,0xec($sp) /* f0acc5c: e7a20124 */ swc1 $f2,0x124($sp) -/* f0acc60: 0fc2d5be */ jal func0f0b56f8 +/* f0acc60: 0fc2d5be */ jal currentPlayerGetUnk1740 /* f0acc64: e7aa00f0 */ swc1 $f10,0xf0($sp) /* f0acc68: afa200e4 */ sw $v0,0xe4($sp) /* f0acc6c: 82230001 */ lb $v1,0x1($s1) @@ -3192,7 +3192,7 @@ glabel var7f1acd6c /* f0aeacc: 26440004 */ addiu $a0,$s2,0x4 /* f0aead0: 0c005775 */ jal func00015dd4 /* f0aead4: 02002825 */ or $a1,$s0,$zero -/* f0aead8: 0fc2d5be */ jal func0f0b56f8 +/* f0aead8: 0fc2d5be */ jal currentPlayerGetUnk1740 /* f0aeadc: 00000000 */ sll $zero,$zero,0x0 /* f0aeae0: 00402025 */ or $a0,$v0,$zero /* f0aeae4: 02002825 */ or $a1,$s0,$zero @@ -3814,7 +3814,7 @@ glabel var7f1acd8c /* f0af32c: af090004 */ sw $t1,0x4($t8) /* f0af330: 0c00566c */ jal func000159b0 /* f0af334: af080000 */ sw $t0,0x0($t8) -/* f0af338: 0fc2d5be */ jal func0f0b56f8 +/* f0af338: 0fc2d5be */ jal currentPlayerGetUnk1740 /* f0af33c: 00000000 */ sll $zero,$zero,0x0 /* f0af340: 00402025 */ or $a0,$v0,$zero /* f0af344: 0c0056f8 */ jal func00015be0 @@ -3834,7 +3834,7 @@ glabel var7f1acd8c /* f0af37c: e7a00154 */ swc1 $f0,0x154($sp) /* f0af380: 0c00566c */ jal func000159b0 /* f0af384: e7a0015c */ swc1 $f0,0x15c($sp) -/* f0af388: 0fc2d5be */ jal func0f0b56f8 +/* f0af388: 0fc2d5be */ jal currentPlayerGetUnk1740 /* f0af38c: 00000000 */ sll $zero,$zero,0x0 /* f0af390: 00402025 */ or $a0,$v0,$zero /* f0af394: 0c0056f8 */ jal func00015be0 @@ -4408,7 +4408,7 @@ glabel var7f1acd90 /* f0afc18: 24a50024 */ addiu $a1,$a1,0x0024 /* f0afc1c: 0c00566c */ jal func000159b0 /* f0afc20: 27a4014c */ addiu $a0,$sp,0x14c -/* f0afc24: 0fc2d5be */ jal func0f0b56f8 +/* f0afc24: 0fc2d5be */ jal currentPlayerGetUnk1740 /* f0afc28: 00000000 */ sll $zero,$zero,0x0 /* f0afc2c: 00402025 */ or $a0,$v0,$zero /* f0afc30: 0c0056f8 */ jal func00015be0 @@ -4427,7 +4427,7 @@ glabel var7f1acd90 /* f0afc64: e7b4013c */ swc1 $f20,0x13c($sp) /* f0afc68: 0c00566c */ jal func000159b0 /* f0afc6c: e7b40144 */ swc1 $f20,0x144($sp) -/* f0afc70: 0fc2d5be */ jal func0f0b56f8 +/* f0afc70: 0fc2d5be */ jal currentPlayerGetUnk1740 /* f0afc74: 00000000 */ sll $zero,$zero,0x0 /* f0afc78: 00402025 */ or $a0,$v0,$zero /* f0afc7c: 0c0056f8 */ jal func00015be0 diff --git a/src/game/game_0b3350.c b/src/game/game_0b3350.c index 05d7d0d82..e7cab749d 100644 --- a/src/game/game_0b3350.c +++ b/src/game/game_0b3350.c @@ -1880,7 +1880,7 @@ u32 currentPlayerGetUnk1758(void) return g_Vars.currentplayer->unk1758; } -void currentPlayerSetUnk1740(u32 value) +void currentPlayerSetUnk1740(f32 *value) { struct player *player = g_Vars.currentplayer; @@ -2377,13 +2377,10 @@ glabel func0f0b53a4 /* f0b56f4: 27bd0050 */ addiu $sp,$sp,0x50 ); -GLOBAL_ASM( -glabel func0f0b56f8 -/* f0b56f8: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) -/* f0b56fc: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) -/* f0b5700: 03e00008 */ jr $ra -/* f0b5704: 8dc21740 */ lw $v0,0x1740($t6) -); +f32 *currentPlayerGetUnk1740(void) +{ + return g_Vars.currentplayer->unk1740; +} GLOBAL_ASM( glabel func0f0b5708 diff --git a/src/game/game_0b63b0.c b/src/game/game_0b63b0.c index bc53b1423..120886b21 100644 --- a/src/game/game_0b63b0.c +++ b/src/game/game_0b63b0.c @@ -10626,7 +10626,7 @@ void currentPlayerSetGlobalDrawCameraOffset(void) g_Vars.currentplayer->globaldrawcameraoffset.y = g_Vars.currentplayer->globaldrawworldoffset.y; g_Vars.currentplayer->globaldrawcameraoffset.z = g_Vars.currentplayer->globaldrawworldoffset.z; - func00015b10(func0f0b56f8(), &g_Vars.currentplayer->globaldrawcameraoffset); + func00015b10(currentPlayerGetUnk1740(), &g_Vars.currentplayer->globaldrawcameraoffset); } GLOBAL_ASM( diff --git a/src/game/game_0f09f0.c b/src/game/game_0f09f0.c index 98011e18c..fae39efc0 100644 --- a/src/game/game_0f09f0.c +++ b/src/game/game_0f09f0.c @@ -14900,7 +14900,7 @@ glabel func0f0fd494 /* f0fd4a8: afbf001c */ sw $ra,0x1c($sp) /* f0fd4ac: afa40038 */ sw $a0,0x38($sp) /* f0fd4b0: 35f80010 */ ori $t8,$t7,0x10 -/* f0fd4b4: 0fc2d5be */ jal func0f0b56f8 +/* f0fd4b4: 0fc2d5be */ jal currentPlayerGetUnk1740 /* f0fd4b8: a21805d5 */ sb $t8,0x5d5($s0) /* f0fd4bc: 00402025 */ or $a0,$v0,$zero /* f0fd4c0: 8fa50038 */ lw $a1,0x38($sp) diff --git a/src/game/game_11f000.c b/src/game/game_11f000.c index eb33d2017..41a6e0e9a 100644 --- a/src/game/game_11f000.c +++ b/src/game/game_11f000.c @@ -2157,7 +2157,7 @@ glabel var7f1b50c8 /* f120df4: 8fae0068 */ lw $t6,0x68($sp) /* f120df8: 0fc2d5c6 */ jal func0f0b5718 /* f120dfc: 00000000 */ sll $zero,$zero,0x0 -/* f120e00: 0fc2d5be */ jal func0f0b56f8 +/* f120e00: 0fc2d5be */ jal currentPlayerGetUnk1740 /* f120e04: 00408025 */ or $s0,$v0,$zero /* f120e08: 02002025 */ or $a0,$s0,$zero /* f120e0c: 00402825 */ or $a1,$v0,$zero @@ -3599,7 +3599,7 @@ glabel var7f1b50c8 /* f122438: af0b0004 */ sw $t3,0x4($t8) /* f12243c: 0fc2d5c6 */ jal func0f0b5718 /* f122440: af190000 */ sw $t9,0x0($t8) -/* f122444: 0fc2d5be */ jal func0f0b56f8 +/* f122444: 0fc2d5be */ jal currentPlayerGetUnk1740 /* f122448: 00408025 */ or $s0,$v0,$zero /* f12244c: 02002025 */ or $a0,$s0,$zero /* f122450: 00402825 */ or $a1,$v0,$zero @@ -7284,7 +7284,7 @@ glabel var7f1b5108 /* f125aa8: f7b60040 */ sdc1 $f22,0x40($sp) /* f125aac: f7b40038 */ sdc1 $f20,0x38($sp) /* f125ab0: afa40170 */ sw $a0,0x170($sp) -/* f125ab4: 0fc2d5be */ jal func0f0b56f8 +/* f125ab4: 0fc2d5be */ jal currentPlayerGetUnk1740 /* f125ab8: afa50174 */ sw $a1,0x174($sp) /* f125abc: 0fc2d5c6 */ jal func0f0b5718 /* f125ac0: afa2016c */ sw $v0,0x16c($sp) @@ -8466,7 +8466,7 @@ glabel func0f126c3c /* f126c54: afa40070 */ sw $a0,0x70($sp) /* f126c58: e7ac0064 */ swc1 $f12,0x64($sp) /* f126c5c: e7ae0068 */ swc1 $f14,0x68($sp) -/* f126c60: 0fc2d5be */ jal func0f0b56f8 +/* f126c60: 0fc2d5be */ jal currentPlayerGetUnk1740 /* f126c64: e7a4006c */ swc1 $f4,0x6c($sp) /* f126c68: 00402025 */ or $a0,$v0,$zero /* f126c6c: 0c0056d9 */ jal func00015b64 diff --git a/src/game/game_129900.c b/src/game/game_129900.c index a29b911d0..7a8728e72 100644 --- a/src/game/game_129900.c +++ b/src/game/game_129900.c @@ -3076,7 +3076,7 @@ GLOBAL_ASM( glabel func0f12c5a8 /* f12c5a8: 27bdffe8 */ addiu $sp,$sp,-24 /* f12c5ac: afbf0014 */ sw $ra,0x14($sp) -/* f12c5b0: 0fc2d5be */ jal func0f0b56f8 +/* f12c5b0: 0fc2d5be */ jal currentPlayerGetUnk1740 /* f12c5b4: afa40018 */ sw $a0,0x18($sp) /* f12c5b8: 8fa40018 */ lw $a0,0x18($sp) /* f12c5bc: c4440008 */ lwc1 $f4,0x8($v0) diff --git a/src/game/game_12d3f0.c b/src/game/game_12d3f0.c index f522c16d5..66d36f778 100644 --- a/src/game/game_12d3f0.c +++ b/src/game/game_12d3f0.c @@ -2090,7 +2090,7 @@ GLOBAL_ASM( glabel func0f12f184 /* f12f184: 27bdffe8 */ addiu $sp,$sp,-24 /* f12f188: afbf0014 */ sw $ra,0x14($sp) -/* f12f18c: 0fc2d5be */ jal func0f0b56f8 +/* f12f18c: 0fc2d5be */ jal currentPlayerGetUnk1740 /* f12f190: afa40018 */ sw $a0,0x18($sp) /* f12f194: 8fa40018 */ lw $a0,0x18($sp) /* f12f198: c4440008 */ lwc1 $f4,0x8($v0) diff --git a/src/game/game_12f6c0.c b/src/game/game_12f6c0.c index a9c11c86d..8a12830c8 100644 --- a/src/game/game_12f6c0.c +++ b/src/game/game_12f6c0.c @@ -1394,7 +1394,7 @@ glabel func0f130044 /* f130a48: 02a02025 */ or $a0,$s5,$zero /* f130a4c: 0c005775 */ jal func00015dd4 /* f130a50: 27a500d4 */ addiu $a1,$sp,0xd4 -/* f130a54: 0fc2d5be */ jal func0f0b56f8 +/* f130a54: 0fc2d5be */ jal currentPlayerGetUnk1740 /* f130a58: 00000000 */ sll $zero,$zero,0x0 /* f130a5c: 00402025 */ or $a0,$v0,$zero /* f130a60: 0c0056f8 */ jal func00015be0 diff --git a/src/game/game_131060.c b/src/game/game_131060.c index 6fee9ba02..1069fcdc4 100644 --- a/src/game/game_131060.c +++ b/src/game/game_131060.c @@ -2380,7 +2380,7 @@ glabel var7f1b5780 /* f133070: afa00194 */ sw $zero,0x194($sp) /* f133074: 0c00566c */ jal func000159b0 /* f133078: 02002025 */ or $a0,$s0,$zero -/* f13307c: 0fc2d5be */ jal func0f0b56f8 +/* f13307c: 0fc2d5be */ jal currentPlayerGetUnk1740 /* f133080: 00000000 */ sll $zero,$zero,0x0 /* f133084: 00402025 */ or $a0,$v0,$zero /* f133088: 0c0056f8 */ jal func00015be0 @@ -4024,7 +4024,7 @@ glabel var7f1b5790 /* f134878: afa00198 */ sw $zero,0x198($sp) /* f13487c: 0c00566c */ jal func000159b0 /* f134880: 02002025 */ or $a0,$s0,$zero -/* f134884: 0fc2d5be */ jal func0f0b56f8 +/* f134884: 0fc2d5be */ jal currentPlayerGetUnk1740 /* f134888: 00000000 */ sll $zero,$zero,0x0 /* f13488c: 00402025 */ or $a0,$v0,$zero /* f134890: 0c0056f8 */ jal func00015be0 diff --git a/src/game/game_135c70.c b/src/game/game_135c70.c index bd1313a02..35f772c69 100644 --- a/src/game/game_135c70.c +++ b/src/game/game_135c70.c @@ -1173,7 +1173,7 @@ glabel var7f1b57bc /* f136c90: 02202025 */ or $a0,$s1,$zero /* f136c94: 0c00566c */ jal func000159b0 /* f136c98: e7a00154 */ swc1 $f0,0x154($sp) -/* f136c9c: 0fc2d5be */ jal func0f0b56f8 +/* f136c9c: 0fc2d5be */ jal currentPlayerGetUnk1740 /* f136ca0: 00000000 */ sll $zero,$zero,0x0 /* f136ca4: 00402025 */ or $a0,$v0,$zero /* f136ca8: 0c0056f8 */ jal func00015be0 diff --git a/src/game/game_13c510.c b/src/game/game_13c510.c index d9f446105..8d98fb5c7 100644 --- a/src/game/game_13c510.c +++ b/src/game/game_13c510.c @@ -1574,7 +1574,7 @@ glabel func0f13d568 /* f13dae4: 460a3481 */ sub.s $f18,$f6,$f10 /* f13dae8: 14a8ffe4 */ bne $a1,$t0,.L0f13da7c /* f13daec: e4b2fffc */ swc1 $f18,-0x4($a1) -/* f13daf0: 0fc2d5be */ jal func0f0b56f8 +/* f13daf0: 0fc2d5be */ jal currentPlayerGetUnk1740 /* f13daf4: 00000000 */ sll $zero,$zero,0x0 /* f13daf8: 00402025 */ or $a0,$v0,$zero /* f13dafc: 0c0056c4 */ jal func00015b10 diff --git a/src/game/game_157db0.c b/src/game/game_157db0.c index c386a0fe6..96839d0a7 100644 --- a/src/game/game_157db0.c +++ b/src/game/game_157db0.c @@ -5898,7 +5898,7 @@ glabel func0f15d08c /* f15d090: afbf001c */ sw $ra,0x1c($sp) /* f15d094: afb00018 */ sw $s0,0x18($sp) /* f15d098: 00a08025 */ or $s0,$a1,$zero -/* f15d09c: 0fc2d5be */ jal func0f0b56f8 +/* f15d09c: 0fc2d5be */ jal currentPlayerGetUnk1740 /* f15d0a0: afa40020 */ sw $a0,0x20($sp) /* f15d0a4: 8fa60020 */ lw $a2,0x20($sp) /* f15d0a8: 00402025 */ or $a0,$v0,$zero diff --git a/src/game/game_165670.c b/src/game/game_165670.c index 598c93e0e..55184e9b3 100644 --- a/src/game/game_165670.c +++ b/src/game/game_165670.c @@ -1228,7 +1228,7 @@ glabel func0f1666f8 /* f166738: 24020001 */ addiu $v0,$zero,0x1 /* f16673c: afa3001c */ sw $v1,0x1c($sp) .L0f166740: -/* f166740: 0fc2d5be */ jal func0f0b56f8 +/* f166740: 0fc2d5be */ jal currentPlayerGetUnk1740 /* f166744: afa40030 */ sw $a0,0x30($sp) /* f166748: 8fa3001c */ lw $v1,0x1c($sp) /* f16674c: 8fa40030 */ lw $a0,0x30($sp) diff --git a/src/game/propobj.c b/src/game/propobj.c index 8b70e5a34..66a12112c 100644 --- a/src/game/propobj.c +++ b/src/game/propobj.c @@ -7674,7 +7674,7 @@ glabel func0f06c8ac /* f06c9a8: c6880004 */ lwc1 $f8,0x4($s4) /* f06c9ac: e7a8008c */ swc1 $f8,0x8c($sp) /* f06c9b0: c68a0008 */ lwc1 $f10,0x8($s4) -/* f06c9b4: 0fc2d5be */ jal func0f0b56f8 +/* f06c9b4: 0fc2d5be */ jal currentPlayerGetUnk1740 /* f06c9b8: e7aa0090 */ swc1 $f10,0x90($sp) /* f06c9bc: 00402025 */ or $a0,$v0,$zero /* f06c9c0: 0c0056d9 */ jal func00015b64 @@ -7684,7 +7684,7 @@ glabel func0f06c8ac /* f06c9d0: c7b000a0 */ lwc1 $f16,0xa0($sp) /* f06c9d4: e7a6007c */ swc1 $f6,0x7c($sp) /* f06c9d8: e7b20080 */ swc1 $f18,0x80($sp) -/* f06c9dc: 0fc2d5be */ jal func0f0b56f8 +/* f06c9dc: 0fc2d5be */ jal currentPlayerGetUnk1740 /* f06c9e0: e7b00084 */ swc1 $f16,0x84($sp) /* f06c9e4: 00402025 */ or $a0,$v0,$zero /* f06c9e8: 0c0056c4 */ jal func00015b10 @@ -17773,7 +17773,7 @@ glabel var7f1aa438 /* f0758e0: 8ca5ce74 */ lw $a1,%lo(var8009ce74)($a1) /* f0758e4: 0c006973 */ jal func0001a5cc /* f0758e8: 00003025 */ or $a2,$zero,$zero -/* f0758ec: 0fc2d5be */ jal func0f0b56f8 +/* f0758ec: 0fc2d5be */ jal currentPlayerGetUnk1740 /* f0758f0: afa20184 */ sw $v0,0x184($sp) /* f0758f4: 00402025 */ or $a0,$v0,$zero /* f0758f8: 27a505e8 */ addiu $a1,$sp,0x5e8 @@ -19713,7 +19713,7 @@ glabel var7f1aa44c /* f077484: 8ed5000c */ lw $s5,0xc($s6) /* f077488: 0fc23109 */ jal func0f08c424 /* f07748c: 02a02825 */ or $a1,$s5,$zero -/* f077490: 0fc2d5be */ jal func0f0b56f8 +/* f077490: 0fc2d5be */ jal currentPlayerGetUnk1740 /* f077494: 00000000 */ sll $zero,$zero,0x0 /* f077498: 00402025 */ or $a0,$v0,$zero /* f07749c: 0c0056f8 */ jal func00015be0 @@ -21249,7 +21249,7 @@ glabel var7f1aa4ac /* f0789fc: 27a40064 */ addiu $a0,$sp,0x64 /* f078a00: 0c005775 */ jal func00015dd4 /* f078a04: 8fa50018 */ lw $a1,0x18($sp) -/* f078a08: 0fc2d5be */ jal func0f0b56f8 +/* f078a08: 0fc2d5be */ jal currentPlayerGetUnk1740 /* f078a0c: 00000000 */ sll $zero,$zero,0x0 /* f078a10: 00402025 */ or $a0,$v0,$zero /* f078a14: 0c0056f8 */ jal func00015be0 @@ -22720,7 +22720,7 @@ glabel var7f1aa588 /* f079d5c: 8df80018 */ lw $t8,0x18($t7) /* f079d60: 0c0057c1 */ jal func00015f04 /* f079d64: c70c0014 */ lwc1 $f12,0x14($t8) -/* f079d68: 0fc2d5be */ jal func0f0b56f8 +/* f079d68: 0fc2d5be */ jal currentPlayerGetUnk1740 /* f079d6c: 00000000 */ sll $zero,$zero,0x0 /* f079d70: 00402025 */ or $a0,$v0,$zero /* f079d74: 0c0056f8 */ jal func00015be0 @@ -27688,7 +27688,7 @@ glabel func0f07e2cc /* f07e314: 27a500ac */ addiu $a1,$sp,0xac /* f07e318: 0c005775 */ jal func00015dd4 /* f07e31c: 24e40008 */ addiu $a0,$a3,0x8 -/* f07e320: 0fc2d5be */ jal func0f0b56f8 +/* f07e320: 0fc2d5be */ jal currentPlayerGetUnk1740 /* f07e324: 00000000 */ sll $zero,$zero,0x0 /* f07e328: 8e0f0018 */ lw $t7,0x18($s0) /* f07e32c: 00402025 */ or $a0,$v0,$zero @@ -28289,7 +28289,7 @@ glabel var7f1aa6ec /* f07eb74: 00046980 */ sll $t5,$a0,0x6 /* f07eb78: 0fc59e7d */ jal func0f1679f4 /* f07eb7c: 01a02025 */ or $a0,$t5,$zero -/* f07eb80: 0fc2d5be */ jal func0f0b56f8 +/* f07eb80: 0fc2d5be */ jal currentPlayerGetUnk1740 /* f07eb84: afa201ec */ sw $v0,0x1ec($sp) /* f07eb88: afa201dc */ sw $v0,0x1dc($sp) /* f07eb8c: 27a401dc */ addiu $a0,$sp,0x1dc @@ -28509,7 +28509,7 @@ glabel var7f1aa6ec /* f07eeb4: afa40038 */ sw $a0,0x38($sp) /* f07eeb8: 0c005775 */ jal func00015dd4 /* f07eebc: 27a500f8 */ addiu $a1,$sp,0xf8 -/* f07eec0: 0fc2d5be */ jal func0f0b56f8 +/* f07eec0: 0fc2d5be */ jal currentPlayerGetUnk1740 /* f07eec4: 00000000 */ sll $zero,$zero,0x0 /* f07eec8: 00402025 */ or $a0,$v0,$zero /* f07eecc: 27a500f8 */ addiu $a1,$sp,0xf8 @@ -30972,7 +30972,7 @@ glabel func0f080f8c /* f081004: 8fa50110 */ lw $a1,0x110($sp) /* f081008: 0c005892 */ jal func00016248 /* f08100c: 27a600c0 */ addiu $a2,$sp,0xc0 -/* f081010: 0fc2d5be */ jal func0f0b56f8 +/* f081010: 0fc2d5be */ jal currentPlayerGetUnk1740 /* f081014: 00000000 */ sll $zero,$zero,0x0 /* f081018: 00402025 */ or $a0,$v0,$zero /* f08101c: 27a500c0 */ addiu $a1,$sp,0xc0 @@ -46785,7 +46785,7 @@ glabel func0f08e794 /* f08e7b8: 8c84a244 */ lw $a0,%lo(g_Vars+0x284)($a0) /* f08e7bc: afa20030 */ sw $v0,0x30($sp) /* f08e7c0: 24841bb0 */ addiu $a0,$a0,7088 -/* f08e7c4: 0fc2d5be */ jal func0f0b56f8 +/* f08e7c4: 0fc2d5be */ jal currentPlayerGetUnk1740 /* f08e7c8: afa4001c */ sw $a0,0x1c($sp) /* f08e7cc: 8fa4001c */ lw $a0,0x1c($sp) /* f08e7d0: 8fa50038 */ lw $a1,0x38($sp) diff --git a/src/include/game/game_0b3350.h b/src/include/game/game_0b3350.h index b64f727de..078dcd50f 100644 --- a/src/include/game/game_0b3350.h +++ b/src/include/game/game_0b3350.h @@ -31,10 +31,10 @@ void currentPlayerSetUnk1750(u32 value); u32 currentPlayerGetUnk1750(void); void currentPlayerSetUnk1758(u32 value); u32 currentPlayerGetUnk1758(void); -void currentPlayerSetUnk1740(u32 value); +void currentPlayerSetUnk1740(f32 *value); u32 func0f0b5050(void); u32 func0f0b53a4(void); -f32 *func0f0b56f8(void); +f32 *currentPlayerGetUnk1740(void); u32 func0f0b5708(void); u32 func0f0b5718(void); u32 func0f0b5758(void); diff --git a/src/include/types.h b/src/include/types.h index daa96f927..6a24e20a6 100644 --- a/src/include/types.h +++ b/src/include/types.h @@ -2568,7 +2568,7 @@ struct player { /*0x1734*/ f32 c_recipscaley; /*0x1738*/ u32 unk1738; /*0x173c*/ u32 unk173c; - /*0x1740*/ u32 unk1740; + /*0x1740*/ f32 *unk1740; /*0x1744*/ u32 unk1744; /*0x1748*/ u32 unk1748; /*0x174c*/ u32 unk174c; @@ -2576,7 +2576,7 @@ struct player { /*0x1754*/ u32 unk1754; /*0x1758*/ u32 unk1758; /*0x175c*/ u32 unk175c; - /*0x1760*/ u32 unk1760; + /*0x1760*/ f32 *unk1760; /*0x1764*/ u32 unk1764; /*0x1768*/ u32 unk1768; /*0x176c*/ f32 c_scalelod60; diff --git a/src/lib/lib_09660.c b/src/lib/lib_09660.c index f870ccbfa..d3c1c9610 100644 --- a/src/lib/lib_09660.c +++ b/src/lib/lib_09660.c @@ -1605,7 +1605,7 @@ glabel func0000ab78 /* abb8: e7a60014 */ swc1 $f6,0x14($sp) /* abbc: 0c001210 */ jal func00004840 /* abc0: e7a80018 */ swc1 $f8,0x18($sp) -/* abc4: 0fc2d5be */ jal func0f0b56f8 +/* abc4: 0fc2d5be */ jal currentPlayerGetUnk1740 /* abc8: 00000000 */ sll $zero,$zero,0x0 /* abcc: 00402025 */ or $a0,$v0,$zero /* abd0: 0c005746 */ jal func00015d18