diff --git a/src/game/game_097ba0.c b/src/game/game_097ba0.c index a2c394adc..8b7b4e92d 100644 --- a/src/game/game_097ba0.c +++ b/src/game/game_097ba0.c @@ -8099,24 +8099,19 @@ void func0f09df50(void) g_Vars.currentplayer->unk15ea = 11; } -GLOBAL_ASM( -glabel func0f09df64 -/* f09df64: 3c02800a */ lui $v0,%hi(g_Vars+0x284) -/* f09df68: 8c42a244 */ lw $v0,%lo(g_Vars+0x284)($v0) -/* f09df6c: 240fffff */ addiu $t7,$zero,-1 -/* f09df70: 904e15ea */ lbu $t6,0x15ea($v0) -/* f09df74: 55c00007 */ bnezl $t6,.L0f09df94 -/* f09df78: ac441584 */ sw $a0,0x1584($v0) -/* f09df7c: a04015b0 */ sb $zero,0x15b0($v0) -/* f09df80: a04015b1 */ sb $zero,0x15b1($v0) -/* f09df84: ac441584 */ sw $a0,0x1584($v0) -/* f09df88: 03e00008 */ jr $ra -/* f09df8c: a04f15eb */ sb $t7,0x15eb($v0) -/* f09df90: ac441584 */ sw $a0,0x1584($v0) -.L0f09df94: -/* f09df94: 03e00008 */ jr $ra -/* f09df98: 00000000 */ nop -); +void func0f09df64(s32 arg0) +{ + struct player *player = g_Vars.currentplayer; + + if (player->unk15ea == 0) { + player->unk15b0 = 0; + player->unk15b1 = 0; + player->unk1584 = arg0; + player->unk15eb = -1; + } else { + player->unk1584 = arg0; + } +} GLOBAL_ASM( glabel func0f09df9c diff --git a/src/include/game/game_097ba0.h b/src/include/game/game_097ba0.h index 52e6300bd..6c1c11f28 100644 --- a/src/include/game/game_097ba0.h +++ b/src/include/game/game_097ba0.h @@ -60,7 +60,7 @@ u32 func0f09ddcc(void); u32 func0f09ddec(void); u32 func0f09ddfc(void); void func0f09df50(void); -u32 func0f09df64(void); +void func0f09df64(s32 arg0); u32 func0f09df9c(void); u32 func0f09e004(void); u32 func0f09e144(void); diff --git a/src/include/types.h b/src/include/types.h index 893772177..fbc941454 100644 --- a/src/include/types.h +++ b/src/include/types.h @@ -2340,7 +2340,8 @@ struct player { /*0x15a4*/ u32 unk15a4; /*0x15a8*/ u32 unk15a8; /*0x15ac*/ u32 unk15ac; - /*0x15b0*/ u32 unk15b0; + /*0x15b0*/ u8 unk15b0; + /*0x15b1*/ u8 unk15b1; /*0x15b4*/ u32 unk15b4; /*0x15b8*/ u32 unk15b8; /*0x15bc*/ u32 unk15bc; @@ -2357,6 +2358,7 @@ struct player { /*0x15e6*/ u16 unk15e6; /*0x15e8*/ u16 unk15e8; /*0x15ea*/ u8 unk15ea; + /*0x15eb*/ s8 unk15eb; /*0x15ec*/ u32 unk15ec; /*0x15f0*/ u32 unk15f0; /*0x15f4*/ u32 unk15f4;