From 833b47e6ca9ded07b104305921d8ea5d36212fd1 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Mon, 16 Mar 2020 20:22:21 +1000 Subject: [PATCH] Decompile currentPlayerSetUnk1758 --- 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 be6ae3f5f..ce662f873 100644 --- a/src/game/game_0b3350.c +++ b/src/game/game_0b3350.c @@ -1870,13 +1870,10 @@ u32 currentPlayerGetUnk1750(void) return g_Vars.currentplayer->unk1750; } -GLOBAL_ASM( -glabel func0f0b4ff8 -/* f0b4ff8: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) -/* f0b4ffc: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) -/* f0b5000: 03e00008 */ jr $ra -/* f0b5004: adc41758 */ sw $a0,0x1758($t6) -); +void currentPlayerSetUnk1758(u32 value) +{ + g_Vars.currentplayer->unk1758 = value; +} GLOBAL_ASM( glabel func0f0b5008 diff --git a/src/game/game_0b63b0.c b/src/game/game_0b63b0.c index e42b177a6..d1e4b9494 100644 --- a/src/game/game_0b63b0.c +++ b/src/game/game_0b63b0.c @@ -10810,7 +10810,7 @@ glabel func0f0bfc7c /* f0bff2c: 02002025 */ or $a0,$s0,$zero /* f0bff30: 0c0128d8 */ jal func0004a360 /* f0bff34: 02202825 */ or $a1,$s1,$zero -/* f0bff38: 0fc2d3fe */ jal func0f0b4ff8 +/* f0bff38: 0fc2d3fe */ jal currentPlayerSetUnk1758 /* f0bff3c: 02202025 */ or $a0,$s1,$zero /* f0bff40: c7ac0070 */ lwc1 $f12,0x70($sp) /* f0bff44: 0c0057c1 */ jal func00015f04 diff --git a/src/include/game/game_0b3350.h b/src/include/game/game_0b3350.h index 2ee482a3f..16e4f9003 100644 --- a/src/include/game/game_0b3350.h +++ b/src/include/game/game_0b3350.h @@ -29,7 +29,7 @@ void currentPlayerSetUnk006c(u32 value); u32 currentPlayerGetUnk006c(void); void currentPlayerSetUnk1750(u32 value); u32 currentPlayerGetUnk1750(void); -u32 func0f0b4ff8(void); +void currentPlayerSetUnk1758(u32 value); u32 func0f0b5008(void); u32 func0f0b5018(void); u32 func0f0b5050(void);