diff --git a/src/game/pak/pak.c b/src/game/pak/pak.c index 1a48fe6ef..d13fc87c2 100644 --- a/src/game/pak/pak.c +++ b/src/game/pak/pak.c @@ -393,25 +393,10 @@ void func0f116c2c(s8 index) contSetPfsTemporarilyPlugged(index); } -GLOBAL_ASM( -glabel func0f116c54 -/* f116c54: 00047600 */ sll $t6,$a0,0x18 -/* f116c58: 000e7e03 */ sra $t7,$t6,0x18 -/* f116c5c: 000fc080 */ sll $t8,$t7,0x2 -/* f116c60: 030fc023 */ subu $t8,$t8,$t7 -/* f116c64: 0018c080 */ sll $t8,$t8,0x2 -/* f116c68: 030fc023 */ subu $t8,$t8,$t7 -/* f116c6c: 0018c080 */ sll $t8,$t8,0x2 -/* f116c70: 030fc021 */ addu $t8,$t8,$t7 -/* f116c74: 0018c080 */ sll $t8,$t8,0x2 -/* f116c78: 030fc023 */ subu $t8,$t8,$t7 -/* f116c7c: 0018c080 */ sll $t8,$t8,0x2 -/* f116c80: 3c02800a */ lui $v0,%hi(var800a2380+0x262) -/* f116c84: 00581021 */ addu $v0,$v0,$t8 -/* f116c88: afa40000 */ sw $a0,0x0($sp) -/* f116c8c: 03e00008 */ jr $ra -/* f116c90: 944225e2 */ lhu $v0,%lo(var800a2380+0x262)($v0) -); +u16 func0f116c54(s8 device) +{ + return var800a2380[device].unk262; +} GLOBAL_ASM( glabel func0f116c94 diff --git a/src/include/game/pak/pak.h b/src/include/game/pak/pak.h index 0b235ba9d..25152692d 100644 --- a/src/include/game/pak/pak.h +++ b/src/include/game/pak/pak.h @@ -23,7 +23,7 @@ void func0f1169c8(s8 device, s32 arg1); bool func0f116aec(s8 device); bool func0f116b5c(s8 device); void func0f116bdc(s8 device, u8 *arg1, u8 *arg2); -u32 func0f116c54(void); +u16 func0f116c54(s8 device); u32 func0f116c94(void); void func0f116db0(s8 arg0, s32 arg1); s32 func0f116df0(s8 device, struct pakdata **arg1); diff --git a/src/include/types.h b/src/include/types.h index 91d475da6..136f27bac 100644 --- a/src/include/types.h +++ b/src/include/types.h @@ -5255,7 +5255,8 @@ struct var800a2380 { /*0x254*/ u32 unk254; /*0x258*/ u32 unk258; /*0x25c*/ u32 unk25c; - /*0x260*/ u32 unk260; + /*0x260*/ u16 unk260; + /*0x262*/ u16 unk262; /*0x264*/ u32 unk264; /*0x268*/ u32 unk268; /*0x26c*/ u32 unk26c;