From 6743c035b9cfb125944012b4d395862bb1545cb5 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Mon, 16 Mar 2020 20:17:55 +1000 Subject: [PATCH] Decompile currentPlayerSetUnk006c --- src/game/game_0b3350.c | 11 ++++------- src/game/game_0b63b0.c | 2 +- src/include/game/game_0b3350.h | 2 +- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/game/game_0b3350.c b/src/game/game_0b3350.c index 5777eb4ab..caa715834 100644 --- a/src/game/game_0b3350.c +++ b/src/game/game_0b3350.c @@ -1850,13 +1850,10 @@ u32 currentPlayerGetUnk173c(void) return g_Vars.currentplayer->unk173c; } -GLOBAL_ASM( -glabel func0f0b4fb8 -/* f0b4fb8: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) -/* f0b4fbc: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) -/* f0b4fc0: 03e00008 */ jr $ra -/* f0b4fc4: adc4006c */ sw $a0,0x6c($t6) -); +void currentPlayerSetUnk006c(u32 value) +{ + g_Vars.currentplayer->unk006c = value; +} GLOBAL_ASM( glabel func0f0b4fc8 diff --git a/src/game/game_0b63b0.c b/src/game/game_0b63b0.c index 511a01294..9ab191414 100644 --- a/src/game/game_0b63b0.c +++ b/src/game/game_0b63b0.c @@ -10805,7 +10805,7 @@ glabel func0f0bfc7c /* f0bff18: 24a50001 */ addiu $a1,$a1,0x1 /* f0bff1c: 14a8ffed */ bne $a1,$t0,.L0f0bfed4 /* f0bff20: 24c60010 */ addiu $a2,$a2,0x10 -/* f0bff24: 0fc2d3ee */ jal func0f0b4fb8 +/* f0bff24: 0fc2d3ee */ jal currentPlayerSetUnk006c /* f0bff28: 02002025 */ or $a0,$s0,$zero /* f0bff2c: 02002025 */ or $a0,$s0,$zero /* f0bff30: 0c0128d8 */ jal func0004a360 diff --git a/src/include/game/game_0b3350.h b/src/include/game/game_0b3350.h index 20265d47e..d4cc21bea 100644 --- a/src/include/game/game_0b3350.h +++ b/src/include/game/game_0b3350.h @@ -25,7 +25,7 @@ u32 func0f0b4eb8(void); void currentPlayerSetUnk1738(u32 value); void currentPlayerSetUnk173c(u32 value); u32 currentPlayerGetUnk173c(void); -u32 func0f0b4fb8(void); +void currentPlayerSetUnk006c(u32 value); u32 func0f0b4fc8(void); u32 func0f0b4fd8(void); u32 func0f0b4fe8(void);