diff --git a/src/game/game_0b3350.c b/src/game/game_0b3350.c index 75ee270ca..be6ae3f5f 100644 --- a/src/game/game_0b3350.c +++ b/src/game/game_0b3350.c @@ -1865,13 +1865,10 @@ void currentPlayerSetUnk1750(u32 value) g_Vars.currentplayer->unk1750 = value; } -GLOBAL_ASM( -glabel func0f0b4fe8 -/* f0b4fe8: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) -/* f0b4fec: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) -/* f0b4ff0: 03e00008 */ jr $ra -/* f0b4ff4: 8dc21750 */ lw $v0,0x1750($t6) -); +u32 currentPlayerGetUnk1750(void) +{ + return g_Vars.currentplayer->unk1750; +} GLOBAL_ASM( glabel func0f0b4ff8 diff --git a/src/game/game_0b63b0.c b/src/game/game_0b63b0.c index 9ab191414..e42b177a6 100644 --- a/src/game/game_0b63b0.c +++ b/src/game/game_0b63b0.c @@ -6523,7 +6523,7 @@ glabel func0f0bbf78 /* f0bc0b8: 37390040 */ ori $t9,$t9,0x40 /* f0bc0bc: afa20040 */ sw $v0,0x40($sp) /* f0bc0c0: ac590000 */ sw $t9,0x0($v0) -/* f0bc0c4: 0fc2d3fa */ jal func0f0b4fe8 +/* f0bc0c4: 0fc2d3fa */ jal currentPlayerGetUnk1750 /* f0bc0c8: 24500008 */ addiu $s0,$v0,0x8 /* f0bc0cc: 0c012d20 */ jal osVirtualToPhysical /* f0bc0d0: 00402025 */ or $a0,$v0,$zero diff --git a/src/game/game_0d4690.c b/src/game/game_0d4690.c index 6fe53dfc7..dd764644f 100644 --- a/src/game/game_0d4690.c +++ b/src/game/game_0d4690.c @@ -280,7 +280,7 @@ glabel func0f0d49c8 /* f0d4a04: ac6f0004 */ sw $t7,0x4($v1) /* f0d4a08: ac980000 */ sw $t8,0x0($a0) /* f0d4a0c: afa40020 */ sw $a0,0x20($sp) -/* f0d4a10: 0fc2d3fa */ jal func0f0b4fe8 +/* f0d4a10: 0fc2d3fa */ jal currentPlayerGetUnk1750 /* f0d4a14: 26100008 */ addiu $s0,$s0,0x8 /* f0d4a18: 0c012d20 */ jal osVirtualToPhysical /* f0d4a1c: 00402025 */ or $a0,$v0,$zero diff --git a/src/game/game_0f09f0.c b/src/game/game_0f09f0.c index bcedfae25..98011e18c 100644 --- a/src/game/game_0f09f0.c +++ b/src/game/game_0f09f0.c @@ -4831,7 +4831,7 @@ glabel var7f1b2948 /* f0f4768: 35ef0040 */ ori $t7,$t7,0x40 /* f0f476c: afac0440 */ sw $t4,0x440($sp) /* f0f4770: ac4f0000 */ sw $t7,0x0($v0) -/* f0f4774: 0fc2d3fa */ jal func0f0b4fe8 +/* f0f4774: 0fc2d3fa */ jal currentPlayerGetUnk1750 /* f0f4778: 00408825 */ or $s1,$v0,$zero /* f0f477c: 0c012d20 */ jal osVirtualToPhysical /* f0f4780: 00402025 */ or $a0,$v0,$zero @@ -13568,7 +13568,7 @@ glabel var7f1b2afc /* f0fc1a4: 356b0040 */ ori $t3,$t3,0x40 /* f0fc1a8: 02a08025 */ or $s0,$s5,$zero /* f0fc1ac: ae0b0000 */ sw $t3,0x0($s0) -/* f0fc1b0: 0fc2d3fa */ jal func0f0b4fe8 +/* f0fc1b0: 0fc2d3fa */ jal currentPlayerGetUnk1750 /* f0fc1b4: 26b50008 */ addiu $s5,$s5,0x8 /* f0fc1b8: 0c012d20 */ jal osVirtualToPhysical /* f0fc1bc: 00402025 */ or $a0,$v0,$zero diff --git a/src/game/game_129900.c b/src/game/game_129900.c index 3943d78b0..8bd47670d 100644 --- a/src/game/game_129900.c +++ b/src/game/game_129900.c @@ -3564,7 +3564,7 @@ glabel func0f12c654 /* f12ccb8: 35ef0040 */ ori $t7,$t7,0x40 /* f12ccbc: 02a09025 */ or $s2,$s5,$zero /* f12ccc0: ae4f0000 */ sw $t7,0x0($s2) -/* f12ccc4: 0fc2d3fa */ jal func0f0b4fe8 +/* f12ccc4: 0fc2d3fa */ jal currentPlayerGetUnk1750 /* f12ccc8: 26b50008 */ addiu $s5,$s5,0x8 /* f12cccc: 0c012d20 */ jal osVirtualToPhysical /* f12ccd0: 00402025 */ or $a0,$v0,$zero diff --git a/src/game/game_12d3f0.c b/src/game/game_12d3f0.c index b6abc022e..9a7f640a7 100644 --- a/src/game/game_12d3f0.c +++ b/src/game/game_12d3f0.c @@ -2379,7 +2379,7 @@ glabel func0f12f230 /* f12f5b8: 37390040 */ ori $t9,$t9,0x40 /* f12f5bc: 02208025 */ or $s0,$s1,$zero /* f12f5c0: ae190000 */ sw $t9,0x0($s0) -/* f12f5c4: 0fc2d3fa */ jal func0f0b4fe8 +/* f12f5c4: 0fc2d3fa */ jal currentPlayerGetUnk1750 /* f12f5c8: 26310008 */ addiu $s1,$s1,0x8 /* f12f5cc: 0c012d20 */ jal osVirtualToPhysical /* f12f5d0: 00402025 */ or $a0,$v0,$zero diff --git a/src/game/game_150820.c b/src/game/game_150820.c index 77d342a71..93c6c513e 100644 --- a/src/game/game_150820.c +++ b/src/game/game_150820.c @@ -1522,7 +1522,7 @@ glabel func0f151780 /* f151e50: 35080040 */ ori $t0,$t0,0x40 /* f151e54: 02608025 */ or $s0,$s3,$zero /* f151e58: ae080000 */ sw $t0,0x0($s0) -/* f151e5c: 0fc2d3fa */ jal func0f0b4fe8 +/* f151e5c: 0fc2d3fa */ jal currentPlayerGetUnk1750 /* f151e60: 26730008 */ addiu $s3,$s3,0x8 /* f151e64: 3c090102 */ lui $t1,0x102 /* f151e68: ae020004 */ sw $v0,0x4($s0) @@ -2069,7 +2069,7 @@ glabel func0f151ed0 /* f152660: 35ce0040 */ ori $t6,$t6,0x40 /* f152664: 260d0008 */ addiu $t5,$s0,0x8 /* f152668: afad0140 */ sw $t5,0x140($sp) -/* f15266c: 0fc2d3fa */ jal func0f0b4fe8 +/* f15266c: 0fc2d3fa */ jal currentPlayerGetUnk1750 /* f152670: ae0e0000 */ sw $t6,0x0($s0) /* f152674: ae020004 */ sw $v0,0x4($s0) /* f152678: 8fb10140 */ lw $s1,0x140($sp) diff --git a/src/game/game_157db0.c b/src/game/game_157db0.c index 01c7516a9..775d13735 100644 --- a/src/game/game_157db0.c +++ b/src/game/game_157db0.c @@ -2859,7 +2859,7 @@ glabel func0f15a2c4 /* f15a614: 244d0008 */ addiu $t5,$v0,0x8 /* f15a618: afad0238 */ sw $t5,0x238($sp) /* f15a61c: ac540000 */ sw $s4,0x0($v0) -/* f15a620: 0fc2d3fa */ jal func0f0b4fe8 +/* f15a620: 0fc2d3fa */ jal currentPlayerGetUnk1750 /* f15a624: 00408825 */ or $s1,$v0,$zero /* f15a628: 0c012d20 */ jal osVirtualToPhysical /* f15a62c: 00402025 */ or $a0,$v0,$zero @@ -3319,7 +3319,7 @@ glabel func0f15a6f4 /* f15ac80: 0018c080 */ sll $t8,$t8,0x2 /* f15ac84: 030b8021 */ addu $s0,$t8,$t3 /* f15ac88: afa20084 */ sw $v0,0x84($sp) -/* f15ac8c: 0fc2d3fa */ jal func0f0b4fe8 +/* f15ac8c: 0fc2d3fa */ jal currentPlayerGetUnk1750 /* f15ac90: 26310008 */ addiu $s1,$s1,0x8 /* f15ac94: 0c012d20 */ jal osVirtualToPhysical /* f15ac98: 00402025 */ or $a0,$v0,$zero @@ -3406,7 +3406,7 @@ glabel func0f15a6f4 /* f15adcc: 02201025 */ or $v0,$s1,$zero /* f15add0: ac4c0000 */ sw $t4,0x0($v0) /* f15add4: afa2007c */ sw $v0,0x7c($sp) -/* f15add8: 0fc2d3fa */ jal func0f0b4fe8 +/* f15add8: 0fc2d3fa */ jal currentPlayerGetUnk1750 /* f15addc: 26310008 */ addiu $s1,$s1,0x8 /* f15ade0: 0c012d20 */ jal osVirtualToPhysical /* f15ade4: 00402025 */ or $a0,$v0,$zero @@ -3558,7 +3558,7 @@ glabel func0f15a6f4 /* f15b00c: 02201025 */ or $v0,$s1,$zero /* f15b010: ac4b0000 */ sw $t3,0x0($v0) /* f15b014: afa20070 */ sw $v0,0x70($sp) -/* f15b018: 0fc2d3fa */ jal func0f0b4fe8 +/* f15b018: 0fc2d3fa */ jal currentPlayerGetUnk1750 /* f15b01c: 26310008 */ addiu $s1,$s1,0x8 /* f15b020: 0c012d20 */ jal osVirtualToPhysical /* f15b024: 00402025 */ or $a0,$v0,$zero diff --git a/src/game/propobj.c b/src/game/propobj.c index 9cfda2f25..bff487e4d 100644 --- a/src/game/propobj.c +++ b/src/game/propobj.c @@ -30858,7 +30858,7 @@ glabel func0f0809c4 /* f080e68: 02201825 */ or $v1,$s1,$zero /* f080e6c: ac6e0000 */ sw $t6,0x0($v1) /* f080e70: afa3003c */ sw $v1,0x3c($sp) -/* f080e74: 0fc2d3fa */ jal func0f0b4fe8 +/* f080e74: 0fc2d3fa */ jal currentPlayerGetUnk1750 /* f080e78: 26310008 */ addiu $s1,$s1,0x8 /* f080e7c: 8fa3003c */ lw $v1,0x3c($sp) /* f080e80: ac620004 */ sw $v0,0x4($v1) diff --git a/src/include/game/game_0b3350.h b/src/include/game/game_0b3350.h index 796ca4e6c..2ee482a3f 100644 --- a/src/include/game/game_0b3350.h +++ b/src/include/game/game_0b3350.h @@ -28,7 +28,7 @@ u32 currentPlayerGetUnk173c(void); void currentPlayerSetUnk006c(u32 value); u32 currentPlayerGetUnk006c(void); void currentPlayerSetUnk1750(u32 value); -u32 func0f0b4fe8(void); +u32 currentPlayerGetUnk1750(void); u32 func0f0b4ff8(void); u32 func0f0b5008(void); u32 func0f0b5018(void);