From de6f8fc978e5297d3f425d2d6c8517e9bb8e75ff Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 22 May 2021 10:37:04 -0400 Subject: Merge conflicting prototypes --- arm9/asm/unk_02006864.s | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arm9/asm') diff --git a/arm9/asm/unk_02006864.s b/arm9/asm/unk_02006864.s index 5528150d..5bd62750 100644 --- a/arm9/asm/unk_02006864.s +++ b/arm9/asm/unk_02006864.s @@ -567,7 +567,7 @@ FUN_02006C88: ; 0x02006C88 thumb_func_start UncompressFromNarc UncompressFromNarc: ; 0x02006C98 - ; BOOL UncompressFromNarc(NarcId narcId, s32 memberNo, BOOL a2, u32 heap_id, BOOL a4) + ; void * UncompressFromNarc(NarcId narcId, s32 memberNo, BOOL isCompressed, u32 heap_id, BOOL allocAtEnd) push {r3-r7, lr} add r5, r2, #0x0 add r7, r0, #0x0 -- cgit v1.2.3