diff --git a/src/game/game_097ba0.c b/src/game/game_097ba0.c index fbe985acc..b7d6bbef3 100644 --- a/src/game/game_097ba0.c +++ b/src/game/game_097ba0.c @@ -1421,25 +1421,17 @@ glabel func0f098bfc /* f098c08: 01c01025 */ or $v0,$t6,$zero ); -GLOBAL_ASM( -glabel func0f098c0c -/* f098c0c: 908f0690 */ lbu $t7,0x690($a0) -/* f098c10: 908b06d6 */ lbu $t3,0x6d6($a0) -/* f098c14: 240effff */ addiu $t6,$zero,-1 -/* f098c18: 31f9ff7f */ andi $t9,$t7,0xff7f -/* f098c1c: 332900df */ andi $t1,$t9,0xdf -/* f098c20: a0990690 */ sb $t9,0x690($a0) -/* f098c24: a0890690 */ sb $t1,0x690($a0) -/* f098c28: 312a00bf */ andi $t2,$t1,0xbf -/* f098c2c: 316cfffe */ andi $t4,$t3,0xfffe -/* f098c30: ac8e0680 */ sw $t6,0x680($a0) -/* f098c34: ac80068c */ sw $zero,0x68c($a0) -/* f098c38: ac8006b0 */ sw $zero,0x6b0($a0) -/* f098c3c: a0800691 */ sb $zero,0x691($a0) -/* f098c40: a08a0690 */ sb $t2,0x690($a0) -/* f098c44: 03e00008 */ jr $ra -/* f098c48: a08c06d6 */ sb $t4,0x6d6($a0) -); +void func0f098c0c(struct hand *hand) +{ + hand->unk0cb8 = -1; + hand->unk0cc4 = 0; + hand->unk0cc8_01 = false; + hand->unk0cc8_03 = false; + hand->unk0ce8 = NULL; + hand->unk0cc9 = 0; + hand->unk0cc8_02 = false; + hand->unk0d0e_07 = false; +} void handGetWeaponInfo(struct handweaponinfo *info, s32 handnum) { diff --git a/src/include/game/game_097ba0.h b/src/include/game/game_097ba0.h index 249512b84..85bfcf359 100644 --- a/src/include/game/game_097ba0.h +++ b/src/include/game/game_097ba0.h @@ -17,7 +17,7 @@ bool func0f098884(struct remoteminething *arg0, struct shorthand *hand); void func0f0988e0(struct remoteminething *arg0, bool arg1, struct hand *hand); u32 func0f098a44(void); u32 func0f098bfc(void); -u32 func0f098c0c(void); +void func0f098c0c(struct hand *hand); void handGetWeaponInfo(struct handweaponinfo *info, s32 handnum); s32 func0f098ca0(s32 arg0, struct handweaponinfo *info, struct hand *hand); u32 func0f098df8(void); diff --git a/src/include/types.h b/src/include/types.h index 12b0fa0b6..92a3e2e61 100644 --- a/src/include/types.h +++ b/src/include/types.h @@ -2024,7 +2024,7 @@ struct hand { /*0x0cac*/ u32 unk0cac; /*0x0cb0*/ u32 unk0cb0; /*0x0cb4*/ u32 unk0cb4; - /*0x0cb8*/ u32 unk0cb8; + /*0x0cb8*/ s32 unk0cb8; /*0x0cbc*/ u32 unk0cbc; /*0x0cc0*/ u32 unk0cc0; /*0x0cc4*/ u32 unk0cc4;