diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2021-05-22 10:37:04 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2021-05-22 10:37:04 -0400 |
| commit | de6f8fc978e5297d3f425d2d6c8517e9bb8e75ff (patch) | |
| tree | 9a4e1be7cbadd711196e5efa1fafb9bfd2bba843 /arm9/asm | |
| parent | 616cd9b1c1cf789ae990d4236085d1a6748d3850 (diff) | |
Merge conflicting prototypes
Diffstat (limited to 'arm9/asm')
| -rw-r--r-- | arm9/asm/unk_02006864.s | 2 |
1 files changed, 1 insertions, 1 deletions
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 |