diff --git a/src/game/game_097ba0.c b/src/game/game_097ba0.c index 4eaf4bd34..3eea36b10 100644 --- a/src/game/game_097ba0.c +++ b/src/game/game_097ba0.c @@ -20651,21 +20651,12 @@ glabel var7f1acb14 /* f0a8c4c: 00000000 */ sll $zero,$zero,0x0 ); -GLOBAL_ASM( -glabel func0f0a8c50 -/* f0a8c50: 3c02800a */ lui $v0,%hi(g_Vars+0x284) -/* f0a8c54: 8c42a244 */ lw $v0,%lo(g_Vars+0x284)($v0) -/* f0a8c58: 8c4e0d0c */ lw $t6,0xd0c($v0) -/* f0a8c5c: 000ec6c0 */ sll $t8,$t6,0x1b -/* f0a8c60: 07000004 */ bltz $t8,.L0f0a8c74 -/* f0a8c64: 00000000 */ sll $zero,$zero,0x0 -/* f0a8c68: 90591583 */ lbu $t9,0x1583($v0) -/* f0a8c6c: 3328ffdf */ andi $t0,$t9,0xffdf -/* f0a8c70: a0481583 */ sb $t0,0x1583($v0) -.L0f0a8c74: -/* f0a8c74: 03e00008 */ jr $ra -/* f0a8c78: 00000000 */ sll $zero,$zero,0x0 -); +void func0f0a8c50(void) +{ + if (g_Vars.currentplayer->unk0d0f_03 == 0) { + g_Vars.currentplayer->unk1583_02 = 0; + } +} GLOBAL_ASM( glabel func0f0a8c7c diff --git a/src/include/game/game_097ba0.h b/src/include/game/game_097ba0.h index e6bf7512d..431bcbade 100644 --- a/src/include/game/game_097ba0.h +++ b/src/include/game/game_097ba0.h @@ -141,7 +141,7 @@ u32 func0f0a8404(void); u32 func0f0a84c8(void); u32 func0f0a8910(void); u32 func0f0a895c(void); -u32 func0f0a8c50(void); +void func0f0a8c50(void); u32 func0f0a8c7c(void); u32 func0f0a8d34(void); void func0f0a92ac(u32 arg0); diff --git a/src/include/types.h b/src/include/types.h index 0dd15218e..539be80c2 100644 --- a/src/include/types.h +++ b/src/include/types.h @@ -1914,7 +1914,12 @@ struct player { /*0x0cf0*/ struct coord unk0cf0; /*0x0cfc*/ struct coord unk0cfc; /*0x0d08*/ u32 unk0d08; - /*0x0d0c*/ u32 unk0d0c; + /*0x0d0c*/ u8 unk0d0c; + /*0x0d0e*/ u8 unk0d0d; + /*0x0d0d*/ u8 unk0d0e; + /*0x0d0f*/ u8 unk0d0f_00 : 3; + /*0x0d0f*/ u8 unk0d0f_03 : 1; + /*0x0d0f*/ u8 unk0d0f_04 : 4; /*0x0d10*/ u32 unk0d10; /*0x0d14*/ u32 unk0d14; /*0x0d18*/ u32 unk0d18; @@ -2450,7 +2455,13 @@ struct player { /*0x1580*/ s8 unk1580; /*0x1581*/ u8 unk1581; /*0x1582*/ u8 unk1582; - /*0x1583*/ u8 unk1583_00 : 7; + /*0x1583*/ u8 unk1583_00 : 1; + /*0x1583*/ u8 unk1583_01 : 1; + /*0x1583*/ u8 unk1583_02 : 1; + /*0x1583*/ u8 unk1583_03 : 1; + /*0x1583*/ u8 unk1583_04 : 1; + /*0x1583*/ u8 unk1583_05 : 1; + /*0x1583*/ u8 unk1583_06 : 1; /*0x1583*/ u8 unk1583_07 : 1; /*0x1584*/ u32 unk1584; /*0x1588*/ u32 unk1588;