diff --git a/src/game/game_0b3350.c b/src/game/game_0b3350.c index caa715834..e208e5c0f 100644 --- a/src/game/game_0b3350.c +++ b/src/game/game_0b3350.c @@ -1855,13 +1855,10 @@ void currentPlayerSetUnk006c(u32 value) g_Vars.currentplayer->unk006c = value; } -GLOBAL_ASM( -glabel func0f0b4fc8 -/* f0b4fc8: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) -/* f0b4fcc: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) -/* f0b4fd0: 03e00008 */ jr $ra -/* f0b4fd4: 8dc2006c */ lw $v0,0x6c($t6) -); +u32 currentPlayerGetUnk006c(void) +{ + return g_Vars.currentplayer->unk006c; +} GLOBAL_ASM( glabel func0f0b4fd8 diff --git a/src/game/game_13c510.c b/src/game/game_13c510.c index 160b96637..d9f446105 100644 --- a/src/game/game_13c510.c +++ b/src/game/game_13c510.c @@ -306,7 +306,7 @@ glabel func0f13c780 /* f13c870: 46000306 */ mov.s $f12,$f0 /* f13c874: 0c0057e2 */ jal func00015f88 /* f13c878: 02002825 */ or $a1,$s0,$zero -/* f13c87c: 0fc2d3f2 */ jal func0f0b4fc8 +/* f13c87c: 0fc2d3f2 */ jal currentPlayerGetUnk006c /* f13c880: 00000000 */ sll $zero,$zero,0x0 /* f13c884: 00402025 */ or $a0,$v0,$zero /* f13c888: 02002825 */ or $a1,$s0,$zero diff --git a/src/include/game/game_0b3350.h b/src/include/game/game_0b3350.h index d4cc21bea..70f0b38ea 100644 --- a/src/include/game/game_0b3350.h +++ b/src/include/game/game_0b3350.h @@ -26,7 +26,7 @@ void currentPlayerSetUnk1738(u32 value); void currentPlayerSetUnk173c(u32 value); u32 currentPlayerGetUnk173c(void); void currentPlayerSetUnk006c(u32 value); -u32 func0f0b4fc8(void); +u32 currentPlayerGetUnk006c(void); u32 func0f0b4fd8(void); u32 func0f0b4fe8(void); u32 func0f0b4ff8(void);