diff --git a/src/game/pak/pak.c b/src/game/pak/pak.c index c5e34e3f4..ec5beb985 100644 --- a/src/game/pak/pak.c +++ b/src/game/pak/pak.c @@ -260,19 +260,10 @@ u32 func0f1167d8(s8 arg0) return func0f119298(arg0); } -GLOBAL_ASM( -glabel func0f116800 -/* f116800: 27bdffe8 */ addiu $sp,$sp,-24 -/* f116804: afbf0014 */ sw $ra,0x14($sp) -/* f116808: afa40018 */ sw $a0,0x18($sp) -/* f11680c: 00047600 */ sll $t6,$a0,0x18 -/* f116810: 0fc462f2 */ jal func0f118bc8 -/* f116814: 000e2603 */ sra $a0,$t6,0x18 -/* f116818: 8fbf0014 */ lw $ra,0x14($sp) -/* f11681c: 27bd0018 */ addiu $sp,$sp,0x18 -/* f116820: 03e00008 */ jr $ra -/* f116824: 00000000 */ sll $zero,$zero,0x0 -); +s32 func0f116800(s8 arg0, s32 arg1, void *arg2, s32 arg3) +{ + return func0f118bc8(arg0, arg1, arg2, arg3); +} s32 func0f116828(s8 arg0, s32 arg1, s32 arg2, void *arg3, s32 *arg4, s32 arg5) { diff --git a/src/include/game/pak/pak.h b/src/include/game/pak/pak.h index 89cb98ff2..6b2952838 100644 --- a/src/include/game/pak/pak.h +++ b/src/include/game/pak/pak.h @@ -60,7 +60,7 @@ u32 func0f1185e0(void); u32 func0f118674(s8 arg0, u32 arg1, u32 arg2); void func0f1189d8(void); void func0f118ae4(u8 *arg0, u8 *arg1, u16 *arg2); -u32 func0f118bc8(void); +s32 func0f118bc8(s8 arg0, s32 arg1, void *arg2, s32 arg3); u32 func0f118d18(void); u32 func0f1190bc(void); u32 func0f119298(s8 index);