diff --git a/src/game/game_0b3350.c b/src/game/game_0b3350.c index 785a44bc5..888b2fd1e 100644 --- a/src/game/game_0b3350.c +++ b/src/game/game_0b3350.c @@ -2407,17 +2407,14 @@ u32 currentPlayerGetUnk1748(void) return g_Vars.currentplayer->unk1748; } -GLOBAL_ASM( -glabel func0f0b5758 -/* f0b5758: 3c02800a */ lui $v0,%hi(g_Vars+0x284) -/* f0b575c: 8c42a244 */ lw $v0,%lo(g_Vars+0x284)($v0) -/* f0b5760: 8c4e1744 */ lw $t6,0x1744($v0) -/* f0b5764: 8c4f174c */ lw $t7,0x174c($v0) -/* f0b5768: ac44174c */ sw $a0,0x174c($v0) -/* f0b576c: ac4e1764 */ sw $t6,0x1764($v0) -/* f0b5770: 03e00008 */ jr $ra -/* f0b5774: ac4f1768 */ sw $t7,0x1768($v0) -); +void currentPlayerSetUnk174c(u32 value) +{ + struct player *player = g_Vars.currentplayer; + + player->unk1764 = player->unk1744; + player->unk1768 = player->unk174c; + player->unk174c = value; +} GLOBAL_ASM( glabel func0f0b5778 diff --git a/src/game/game_0b63b0.c b/src/game/game_0b63b0.c index a72bcb914..f834f4868 100644 --- a/src/game/game_0b63b0.c +++ b/src/game/game_0b63b0.c @@ -10833,7 +10833,7 @@ glabel func0f0bfc7c /* f0bff88: 0fc2d406 */ jal currentPlayerSetUnk1740 /* f0bff8c: 8f040064 */ lw $a0,0x64($t8) /* f0bff90: 8e590284 */ lw $t9,0x284($s2) -/* f0bff94: 0fc2d5d6 */ jal func0f0b5758 +/* f0bff94: 0fc2d5d6 */ jal currentPlayerSetUnk174c /* f0bff98: 8f240068 */ lw $a0,0x68($t9) /* f0bff9c: 0fc2d5e6 */ jal func0f0b5798 /* f0bffa0: 8fa400cc */ lw $a0,0xcc($sp) diff --git a/src/include/game/game_0b3350.h b/src/include/game/game_0b3350.h index f37ea87b0..a72290d02 100644 --- a/src/include/game/game_0b3350.h +++ b/src/include/game/game_0b3350.h @@ -37,7 +37,7 @@ u32 func0f0b53a4(void); f32 *currentPlayerGetUnk1740(void); void currentPlayerSetUnk1754(u32 value); u32 currentPlayerGetUnk1754(void); -u32 func0f0b5758(void); +void currentPlayerSetUnk174c(u32 value); u32 func0f0b5778(void); u32 func0f0b5798(void); u32 func0f0b57a8(void);