diff --git a/src/game/pak/pak.c b/src/game/pak/pak.c index 009171dd7..6f61828e0 100644 --- a/src/game/pak/pak.c +++ b/src/game/pak/pak.c @@ -662,32 +662,11 @@ void func0f117150(s8 device, u8 *ptr) } } -GLOBAL_ASM( -glabel func0f1171b4 -/* f1171b4: 00047600 */ sll $t6,$a0,0x18 -/* f1171b8: 000e7e03 */ sra $t7,$t6,0x18 -/* f1171bc: 000fc080 */ sll $t8,$t7,0x2 -/* f1171c0: 030fc023 */ subu $t8,$t8,$t7 -/* f1171c4: 0018c080 */ sll $t8,$t8,0x2 -/* f1171c8: 030fc023 */ subu $t8,$t8,$t7 -/* f1171cc: 0018c080 */ sll $t8,$t8,0x2 -/* f1171d0: 030fc021 */ addu $t8,$t8,$t7 -/* f1171d4: 0018c080 */ sll $t8,$t8,0x2 -/* f1171d8: 030fc023 */ subu $t8,$t8,$t7 -/* f1171dc: 3c19800a */ lui $t9,%hi(var800a2380) -/* f1171e0: 27392380 */ addiu $t9,$t9,%lo(var800a2380) -/* f1171e4: 0018c080 */ sll $t8,$t8,0x2 -/* f1171e8: 03191021 */ addu $v0,$t8,$t9 -/* f1171ec: 904b02b8 */ lbu $t3,0x2b8($v0) -/* f1171f0: 00064880 */ sll $t1,$a2,0x2 -/* f1171f4: 312a0004 */ andi $t2,$t1,0x4 -/* f1171f8: 316cfffb */ andi $t4,$t3,0xfffb -/* f1171fc: 014c6825 */ or $t5,$t2,$t4 -/* f117200: afa40000 */ sw $a0,0x0($sp) -/* f117204: ac45000c */ sw $a1,0xc($v0) -/* f117208: 03e00008 */ jr $ra -/* f11720c: a04d02b8 */ sb $t5,0x2b8($v0) -); +void func0f1171b4(s8 device, s32 arg1, s32 arg2) +{ + var800a2380[device].unk00c = arg1; + var800a2380[device].unk2b8_06 = arg2; +} GLOBAL_ASM( glabel func0f117210 diff --git a/src/include/game/pak/pak.h b/src/include/game/pak/pak.h index f6d6934d5..354b3098a 100644 --- a/src/include/game/pak/pak.h +++ b/src/include/game/pak/pak.h @@ -33,7 +33,7 @@ s32 func0f11702c(s8 device); s32 func0f11706c(s8 arg0); s32 func0f117094(s8 arg0, u32 arg1); void func0f117150(s8 device, u8 *ptr); -u32 func0f1171b4(void); +void func0f1171b4(s8 device, s32 arg1, s32 arg2); u32 func0f117210(void); u32 func0f117430(void); u32 func0f117520(s8 arg0, u32 arg1, u32 *arg2); diff --git a/src/include/types.h b/src/include/types.h index 58cf2d2c0..b935b3b9f 100644 --- a/src/include/types.h +++ b/src/include/types.h @@ -5141,7 +5141,9 @@ struct var800a2380 { /*0x2ac*/ u32 unk2ac; /*0x2b0*/ u32 unk2b0; /*0x2b4*/ f32 unk2b4; - /*0x2b8*/ u16 unk2b8; + /*0x2b8*/ u8 unk2b8_01 : 5; + /*0x2b8*/ u8 unk2b8_06 : 1; + /*0x2b9*/ u8 unk2b9; /*0x2ba*/ u8 unk2ba; /*0x2bb*/ u8 unk2bb; /*0x2bc*/ u32 unk2bc;