From 14dac5f6dc6ea45b0d2200b5fa53033aae7e71e2 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Fri, 13 Nov 2020 17:35:51 +1000 Subject: [PATCH] Decompile func0f1167b0 --- src/game/pak/pak.c | 17 ++++------------- src/include/game/pak/pak.h | 4 ++-- 2 files changed, 6 insertions(+), 15 deletions(-) diff --git a/src/game/pak/pak.c b/src/game/pak/pak.c index ec5beb985..8c4d23cff 100644 --- a/src/game/pak/pak.c +++ b/src/game/pak/pak.c @@ -241,19 +241,10 @@ glabel var7f1b4dac /* f1167ac: 00000000 */ sll $zero,$zero,0x0 ); -GLOBAL_ASM( -glabel func0f1167b0 -/* f1167b0: 27bdffe8 */ addiu $sp,$sp,-24 -/* f1167b4: afbf0014 */ sw $ra,0x14($sp) -/* f1167b8: afa40018 */ sw $a0,0x18($sp) -/* f1167bc: 00047600 */ sll $t6,$a0,0x18 -/* f1167c0: 0fc46346 */ jal func0f118d18 -/* f1167c4: 000e2603 */ sra $a0,$t6,0x18 -/* f1167c8: 8fbf0014 */ lw $ra,0x14($sp) -/* f1167cc: 27bd0018 */ addiu $sp,$sp,0x18 -/* f1167d0: 03e00008 */ jr $ra -/* f1167d4: 00000000 */ sll $zero,$zero,0x0 -); +s32 func0f1167b0(s8 device, u32 arg1, u32 *buffer1024) +{ + return func0f118d18(device, arg1, buffer1024); +} u32 func0f1167d8(s8 arg0) { diff --git a/src/include/game/pak/pak.h b/src/include/game/pak/pak.h index 6b2952838..0e9782c0c 100644 --- a/src/include/game/pak/pak.h +++ b/src/include/game/pak/pak.h @@ -9,7 +9,7 @@ u32 func0f116658(s8 arg0, u32 arg1); u32 func0f116684(u32 arg0); u32 func0f11668c(void); bool pakIsConnected(s32 paknum); -s32 func0f1167b0(s32 device, u32 arg1, u32 *buffer1024); +s32 func0f1167b0(s8 device, u32 arg1, u32 *buffer1024); u32 func0f1167d8(s8 arg0); s32 func0f116800(s8 arg0, s32 arg1, void *arg2, s32 arg3); s32 func0f116828(s8 arg0, s32 arg1, s32 arg2, void *arg3, s32 *arg4, s32 arg5); @@ -61,7 +61,7 @@ u32 func0f118674(s8 arg0, u32 arg1, u32 arg2); void func0f1189d8(void); void func0f118ae4(u8 *arg0, u8 *arg1, u16 *arg2); s32 func0f118bc8(s8 arg0, s32 arg1, void *arg2, s32 arg3); -u32 func0f118d18(void); +s32 func0f118d18(s8 device, u32 arg1, u32 *buffer1024); u32 func0f1190bc(void); u32 func0f119298(s8 index); void func0f119340(u32 arg0);