diff options
Diffstat (limited to 'arm9/asm')
165 files changed, 1162 insertions, 1298 deletions
diff --git a/arm9/asm/save.s b/arm9/asm/save.s index 457e0f83..f4fe3815 100644 --- a/arm9/asm/save.s +++ b/arm9/asm/save.s @@ -68,7 +68,7 @@ FUN_0202254C: ; 0x0202254C push {r4, lr} ldr r1, _020225E0 ; =0x000204A8 mov r0, #0x1 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0x0 ldr r2, _020225E0 ; =0x000204A8 mov r0, #0x0 @@ -191,7 +191,7 @@ FUN_0202263C: ; 0x0202263C str r0, [sp, #0x0] mov r0, #0x3 lsl r1, r1, #0xc - bl FUN_020169D8 + bl AllocFromHeapAtEnd add r6, r0, #0x0 mov r0, #0x1 bl FUN_02016444 @@ -261,7 +261,7 @@ _020226B4: cmp r4, #0x40 blt _020226B4 add r0, r6, #0x0 - bl FUN_02016A18 + bl FreeToHeap ldr r0, [sp, #0x0] bl FUN_020227DC ldr r0, [sp, #0x0] @@ -846,12 +846,12 @@ FUN_02022AD8: ; 0x02022AD8 add r5, r0, #0x0 mov r0, #0x3 lsl r1, r1, #0x10 - bl FUN_020169D8 + bl AllocFromHeapAtEnd mov r1, #0x2 add r6, r0, #0x0 mov r0, #0x3 lsl r1, r1, #0x10 - bl FUN_020169D8 + bl AllocFromHeapAtEnd mov r2, #0x2 add r4, r0, #0x0 mov r0, #0x0 @@ -900,9 +900,9 @@ _02022B54: bl FUN_0202288C _02022B5E: add r0, r6, #0x0 - bl FUN_02016A18 + bl FreeToHeap add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap add r0, sp, #0x2c add r1, sp, #0x38 add r2, sp, #0x10 @@ -2076,7 +2076,7 @@ _02023430: str r0, [sp, #0x10] ldr r1, [sp, #0x10] add r0, r6, #0x0 - bl FUN_02016998 + bl AllocFromHeap add r6, r0, #0x0 ldr r0, [r4, #0x4] ldr r2, [sp, #0x10] @@ -2324,7 +2324,7 @@ _02023608: bne _02023652 ldr r0, _02023658 ; =UNK_021C59C8 ldr r0, [r0, #0x0] - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x1 bl FUN_02089D90 _02023652: @@ -2465,7 +2465,7 @@ FUN_02023740: ; 0x02023740 bl OS_ReleaseLockID ldr r0, _02023768 ; =UNK_021C59C8 ldr r0, [r0, #0x0] - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x1 add r1, r4, #0x0 bl FUN_0208A0B8 diff --git a/arm9/asm/scrcmd.s b/arm9/asm/scrcmd.s index 14919cfa..05fb23de 100644 --- a/arm9/asm/scrcmd.s +++ b/arm9/asm/scrcmd.s @@ -2945,7 +2945,7 @@ _0203B07A: mov r0, #0x4 add r1, r0, #0x0 add r1, #0xfc - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0x0 ldr r0, [sp, #0x4] bl FUN_02058B2C @@ -3081,7 +3081,7 @@ FUN_0203B174: ; 0x0203B174 mov r0, #0x4 mov r1, #0x10 add r7, r2, #0x0 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0x0 bne _0203B18E bl ErrorHandling @@ -3118,10 +3118,10 @@ FUN_0203B1A8: ; 0x0203B1A8 ldr r0, [r5, #0x8] cmp r0, #0x0 beq _0203B1D6 - bl FUN_02016A18 + bl FreeToHeap _0203B1D6: add r0, r5, #0x0 - bl FUN_02016A18 + bl FreeToHeap ldrb r0, [r4, #0x0] cmp r0, #0x0 bne _0203B1E8 @@ -4055,7 +4055,7 @@ _0203B994: strh r0, [r5, #0x0] _0203B9A6: ldr r0, [r4, #0x0] - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x0 str r0, [r4, #0x0] pop {r3-r5, pc} @@ -4172,7 +4172,7 @@ _0203BAA0: _0203BAA2: strh r0, [r5, #0x0] ldr r0, [r4, #0x0] - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x0 str r0, [r4, #0x0] pop {r4-r6, pc} @@ -4233,7 +4233,7 @@ _0203BB20: bl FUN_02037A78 strh r0, [r5, #0x0] ldr r0, [r4, #0x0] - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x0 str r0, [r4, #0x0] pop {r3-r5, pc} @@ -4310,7 +4310,7 @@ FUN_0203BB90: ; 0x0203BB90 pop {r3-r5, pc} _0203BBAE: ldr r0, [r4, #0x0] - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x0 str r0, [r4, #0x0] mov r0, #0x1 @@ -4345,7 +4345,7 @@ _0203BBDC: bl FUN_02028AD4 _0203BBF4: ldr r0, [r4, #0x0] - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x0 str r0, [r4, #0x0] mov r0, #0x1 @@ -4434,7 +4434,7 @@ FUN_0203BC6C: ; 0x0203BC6C _0203BC90: ldr r0, [sp, #0x0] mov r1, #0xc - bl FUN_02016998 + bl AllocFromHeap mov r1, #0x0 strb r1, [r0, #0x0] strb r1, [r0, #0x1] @@ -4491,7 +4491,7 @@ FUN_0203BCD8: ; 0x0203BCD8 ldr r1, [r1, #0x4] strh r1, [r0, #0x0] ldr r0, [r4, #0x0] - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x0 pop {r3-r5, pc} @@ -5026,7 +5026,7 @@ FUN_0203C12C: ; 0x0203C12C add r4, r0, #0x0 mov r0, #0xb lsl r1, r1, #0x6 - bl FUN_02016998 + bl AllocFromHeap str r0, [r4, #0x0] add r0, r5, #0x0 add r0, #0x80 @@ -5142,7 +5142,7 @@ FUN_0203C200: ; 0x0203C200 add r6, r0, #0x0 mov r0, #0xb mov r1, #0x8 - bl FUN_02016998 + bl AllocFromHeap mov r1, #0x0 mov r2, #0x8 str r0, [r6, #0x0] @@ -5180,7 +5180,7 @@ FUN_0203C278: ; 0x0203C278 add r4, r0, #0x0 mov r0, #0xb mov r1, #0xc - bl FUN_02016998 + bl AllocFromHeap add r1, r5, #0x0 add r1, #0x80 ldr r1, [r1, #0x0] @@ -5367,7 +5367,7 @@ FUN_0203C3E8: ; 0x0203C3E8 add r4, r0, #0x0 mov r0, #0xb mov r1, #0x8 - bl FUN_02016998 + bl AllocFromHeap str r0, [r4, #0x0] add r6, r0, #0x0 add r0, r5, #0x0 @@ -5408,7 +5408,7 @@ FUN_0203C430: ; 0x0203C430 lsr r1, r1, #0x10 bl FUN_0205F378 ldr r0, [r4, #0x0] - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x0 pop {r3-r5, pc} @@ -5479,7 +5479,7 @@ _0203C4DC: bl FUN_020378FC strh r0, [r5, #0x0] ldr r0, [r4, #0x0] - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x0 str r0, [r4, #0x0] pop {r3-r5, pc} @@ -6580,7 +6580,7 @@ FUN_0203CDD0: ; 0x0203CDD0 mov r2, #0x5 bl FUN_02047174 add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x0 str r0, [r6, #0x0] mov r0, #0x1 @@ -7475,7 +7475,7 @@ FUN_0203D4E8: ; 0x0203D4E8 mov r1, #0x13 bl FUN_02039438 ldr r0, [r0, #0x0] - bl FUN_02016A18 + bl FreeToHeap _0203D522: mov r0, #0x0 pop {r3-r5, pc} @@ -10491,7 +10491,7 @@ FUN_0203ED2C: ; 0x0203ED2C add r1, r4, #0x0 bl FUN_0202498C add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap add sp, #0x10 pop {r4-r6, pc} .balign 4 @@ -11678,7 +11678,7 @@ _0203F684: bl FUN_02028094 add r5, r0, #0x0 add r0, r7, #0x0 - bl FUN_02016A18 + bl FreeToHeap ldr r0, _0203F6E0 ; =0x0000FFFF cmp r5, r0 bne _0203F6D8 @@ -11777,7 +11777,7 @@ FUN_0203F760: ; 0x0203F760 bne _0203F798 mov r1, #0x0 strh r1, [r5, #0x0] - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x1 pop {r3-r5, pc} _0203F798: @@ -11787,7 +11787,7 @@ _0203F798: bl FUN_0202B21C strh r0, [r5, #0x0] add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x1 pop {r3-r5, pc} _0203F7AE: @@ -11795,7 +11795,7 @@ _0203F7AE: bne _0203F7BE mov r1, #0x0 strh r1, [r5, #0x0] - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x1 pop {r3-r5, pc} _0203F7BE: @@ -11888,7 +11888,7 @@ _0203F870: _0203F872: strh r0, [r5, #0x0] ldr r0, [r4, #0x0] - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x0 str r0, [r4, #0x0] pop {r4-r6, pc} diff --git a/arm9/asm/scrcmd_12.s b/arm9/asm/scrcmd_12.s index 1eea8f15..57aec5f4 100644 --- a/arm9/asm/scrcmd_12.s +++ b/arm9/asm/scrcmd_12.s @@ -669,7 +669,7 @@ _02043266: cmp r7, #0x0 beq _02043270 add r0, r7, #0x0 - bl FUN_02016A18 + bl FreeToHeap _02043270: add sp, #0x38 pop {r3-r7, pc} diff --git a/arm9/asm/scrcmd_13.s b/arm9/asm/scrcmd_13.s index 6bcbe812..276ad62e 100644 --- a/arm9/asm/scrcmd_13.s +++ b/arm9/asm/scrcmd_13.s @@ -73,7 +73,7 @@ _02043908: _0204390A: strh r0, [r4, #0x0] add r0, r5, #0x0 - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x0 pop {r4-r6, pc} .balign 4 @@ -140,7 +140,7 @@ _0204398C: cmp r5, #0x6 blt _0204395C add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap add r0, r7, #0x0 bl FUN_0202BEDC mov r0, #0x0 diff --git a/arm9/asm/scrcmd_18.s b/arm9/asm/scrcmd_18.s index 35d82a32..d8b2bdef 100644 --- a/arm9/asm/scrcmd_18.s +++ b/arm9/asm/scrcmd_18.s @@ -211,7 +211,7 @@ FUN_02044414: ; 0x02044414 add r1, r4, #0x0 bl FUN_0206B900 add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap _02044494: mov r0, #0x0 add sp, #0xc diff --git a/arm9/asm/scrcmd_24.s b/arm9/asm/scrcmd_24.s index 6893e15c..ed57d780 100644 --- a/arm9/asm/scrcmd_24.s +++ b/arm9/asm/scrcmd_24.s @@ -67,7 +67,7 @@ _02045DFC: strh r0, [r5, #0x0] _02045E0E: ldr r0, [r4, #0x0] - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x0 str r0, [r4, #0x0] pop {r3-r5, pc} @@ -109,7 +109,7 @@ FUN_02045E20: ; 0x02045E20 bl FUN_02088EF8 strh r0, [r4, #0x0] add r0, r5, #0x0 - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x0 pop {r4-r6, pc} .balign 4 @@ -157,7 +157,7 @@ FUN_02045E74: ; 0x02045E74 add r0, r5, #0x0 bl SetupNativeScript add r0, r6, #0x0 - bl FUN_02016A18 + bl FreeToHeap add sp, #0x8 pop {r3-r7, pc} .balign 4 @@ -226,7 +226,7 @@ FUN_02045F24: ; 0x02045F24 add r6, r0, #0x0 mov r0, #0x20 mov r1, #0x4 - bl FUN_02016998 + bl AllocFromHeap add r3, r0, #0x0 ldr r0, _02045F80 ; =0x0000FFFF strh r4, [r3, #0x0] diff --git a/arm9/asm/unk_020010A8.s b/arm9/asm/unk_020010A8.s index 00165116..74a4e970 100644 --- a/arm9/asm/unk_020010A8.s +++ b/arm9/asm/unk_020010A8.s @@ -14,7 +14,7 @@ FUN_020010A8: ; 0x020010A8 mov r1, #0x38 add r7, r2, #0x0 str r3, [sp, #0x0] - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0x0 add r3, r5, #0x0 add r2, r4, #0x0 diff --git a/arm9/asm/unk_02001B80.s b/arm9/asm/unk_02001B80.s index 10a31936..40e9a53d 100644 --- a/arm9/asm/unk_02001B80.s +++ b/arm9/asm/unk_02001B80.s @@ -32,7 +32,7 @@ FUN_02001B8C: ; 0x02001B8C mov r1, #0x20 add r7, r2, #0x0 str r0, [sp, #0x4] - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0x0 add r3, r5, #0x0 ldmia r3!, {r0-r1} diff --git a/arm9/asm/unk_02002C14.s b/arm9/asm/unk_02002C14.s index fc5c4538..41a63edc 100644 --- a/arm9/asm/unk_02002C14.s +++ b/arm9/asm/unk_02002C14.s @@ -226,7 +226,7 @@ _02002D48: add r0, r0, r5 add r0, #0x84 ldr r0, [r0, #0x0] - bl FUN_02016A18 + bl FreeToHeap ldr r0, _02002D8C ; =UNK_02106FC8 mov r1, #0x0 ldr r0, [r0, #0x0] diff --git a/arm9/asm/unk_02002F08.s b/arm9/asm/unk_02002F08.s index 471c4820..2eed07fc 100644 --- a/arm9/asm/unk_02002F08.s +++ b/arm9/asm/unk_02002F08.s @@ -123,7 +123,7 @@ FUN_02002FD0: ; 0x02002FD0 push {r4, lr} mov r1, #0x12 lsl r1, r1, #0x4 - bl FUN_02016998 + bl AllocFromHeap mov r2, #0x12 mov r1, #0x0 lsl r2, r2, #0x4 @@ -135,10 +135,10 @@ FUN_02002FD0: ; 0x02002FD0 thumb_func_start FUN_02002FEC FUN_02002FEC: ; 0x02002FEC - ldr r3, _02002FF0 ; =FUN_02016A18 + ldr r3, _02002FF0 ; =FreeToHeap bx r3 .balign 4 -_02002FF0: .word FUN_02016A18 +_02002FF0: .word FreeToHeap thumb_func_start FUN_02002FF4 FUN_02002FF4: ; 0x02002FF4 @@ -163,11 +163,11 @@ FUN_02003008: ; 0x02003008 str r3, [sp, #0x4] add r0, r3, #0x0 add r1, r4, #0x0 - bl FUN_02016998 + bl AllocFromHeap add r7, r0, #0x0 ldr r0, [sp, #0x4] add r1, r4, #0x0 - bl FUN_02016998 + bl AllocFromHeap add r3, r0, #0x0 add r0, r5, #0x0 add r1, r6, #0x0 @@ -185,10 +185,10 @@ FUN_02003038: ; 0x02003038 add r5, r1, #0x0 mul r5, r0 ldr r0, [r4, r5] - bl FUN_02016A18 + bl FreeToHeap add r0, r4, r5 ldr r0, [r0, #0x4] - bl FUN_02016A18 + bl FreeToHeap pop {r3-r5, pc} .balign 4 @@ -263,7 +263,7 @@ _020030C0: ldr r2, [sp, #0x18] bl FUN_02003054 add r0, r6, #0x0 - bl FUN_02016A18 + bl FreeToHeap add sp, #0x8 pop {r4-r6, pc} .balign 4 diff --git a/arm9/asm/unk_020030E8.s b/arm9/asm/unk_020030E8.s index a7b9cfc0..8e1d3360 100644 --- a/arm9/asm/unk_020030E8.s +++ b/arm9/asm/unk_020030E8.s @@ -92,7 +92,7 @@ _0200319A: ldr r1, [sp, #0x14] bl MIi_CpuCopy16 add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap pop {r3-r5, pc} .balign 4 @@ -1419,6 +1419,6 @@ _02003B64: add r0, r5, #0x0 bl FUN_02003054 add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap add sp, #0x8 pop {r3-r5, pc} diff --git a/arm9/asm/unk_020040F4.s b/arm9/asm/unk_020040F4.s index fdd87128..e2418c14 100644 --- a/arm9/asm/unk_020040F4.s +++ b/arm9/asm/unk_020040F4.s @@ -1398,7 +1398,7 @@ _02004B80: bne _02004BCE ldr r0, [sp, #0x48] add r1, r6, #0x0 - bl FUN_02016998 + bl AllocFromHeap str r0, [r4, #0x0] cmp r0, #0x0 bne _02004B9C @@ -1512,7 +1512,7 @@ _02004C60: mov r0, #0x0 strb r0, [r4, #0x0] ldr r0, [r6, #0x0] - bl FUN_02016A18 + bl FreeToHeap _02004C76: pop {r4-r6, pc} diff --git a/arm9/asm/unk_020051F4.s b/arm9/asm/unk_020051F4.s index 91832cb0..0e71ba6f 100644 --- a/arm9/asm/unk_020051F4.s +++ b/arm9/asm/unk_020051F4.s @@ -1069,7 +1069,7 @@ FUN_02005AE0: ; 0x02005AE0 bl FUN_02005BA0 add r0, r4, #0x0 mov r1, #0x8 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0x0 bne _02005B04 bl ErrorHandling @@ -1163,7 +1163,7 @@ FUN_02005BA0: ; 0x02005BA0 ldr r0, [r4, #0x0] bl FUN_0200CAB4 add r0, r5, #0x0 - bl FUN_02016A18 + bl FreeToHeap _02005BC2: mov r0, #0x0 str r0, [r4, #0x0] diff --git a/arm9/asm/unk_020061E8.s b/arm9/asm/unk_020061E8.s index 1af19f20..22f390c7 100644 --- a/arm9/asm/unk_020061E8.s +++ b/arm9/asm/unk_020061E8.s @@ -11,7 +11,7 @@ FUN_020061E8: ; 0x020061E8 cmp r5, #0x0 beq _0200620C add r0, r3, #0x0 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0x0 bne _02006202 mov r0, #0x0 @@ -38,7 +38,7 @@ FUN_0200621C: ; 0x0200621C bl FUN_0201B6C8 cmp r0, #0x0 beq _0200622C - bl FUN_02016A18 + bl FreeToHeap _0200622C: add r0, r4, #0x0 bl FUN_0200CAB4 diff --git a/arm9/asm/unk_02006234.s b/arm9/asm/unk_02006234.s deleted file mode 100644 index 4f60f4cb..00000000 --- a/arm9/asm/unk_02006234.s +++ /dev/null @@ -1,139 +0,0 @@ - .include "asm/macros.inc" - .include "global.inc" - .section .text - - thumb_func_start FUN_02006234 -FUN_02006234: ; 0x02006234 - push {r3-r5, lr} - add r5, r0, #0x0 - add r4, r1, #0x0 - add r0, r2, #0x0 - mov r1, #0x28 - bl FUN_02016998 - add r3, r0, #0x0 - add r2, r3, #0x0 - ldmia r5!, {r0-r1} - stmia r2!, {r0-r1} - ldmia r5!, {r0-r1} - stmia r2!, {r0-r1} - mov r0, #0x0 - str r0, [r3, #0x10] - str r0, [r3, #0x14] - str r4, [r3, #0x18] - str r0, [r3, #0x1c] - str r0, [r3, #0x20] - str r0, [r3, #0x24] - add r0, r3, #0x0 - pop {r3-r5, pc} - - thumb_func_start FUN_02006260 -FUN_02006260: ; 0x02006260 - ldr r3, _02006264 ; =FUN_02016A18 - bx r3 - .balign 4 -_02006264: .word FUN_02016A18 - - thumb_func_start FUN_02006268 -FUN_02006268: ; 0x02006268 - push {r4, lr} - add r4, r0, #0x0 - add r0, r2, #0x0 - bl FUN_02016998 - str r0, [r4, #0x1c] - pop {r4, pc} - .balign 4 - - thumb_func_start FUN_02006278 -FUN_02006278: ; 0x02006278 - ldr r0, [r0, #0x1c] - bx lr - - thumb_func_start FUN_0200627C -FUN_0200627C: ; 0x0200627C - push {r4, lr} - add r4, r0, #0x0 - ldr r0, [r4, #0x1c] - bl FUN_02016A18 - mov r0, #0x0 - str r0, [r4, #0x1c] - pop {r4, pc} - - thumb_func_start FUN_0200628C -FUN_0200628C: ; 0x0200628C - ldr r0, [r0, #0x18] - bx lr - - thumb_func_start FUN_02006290 -FUN_02006290: ; 0x02006290 - push {r4, lr} - add r4, r0, #0x0 - ldr r1, [r4, #0x10] - cmp r1, #0x3 - bhi _0200630E - add r1, r1, r1 - add r1, pc - ldrh r1, [r1, #0x6] - lsl r1, r1, #0x10 - asr r1, r1, #0x10 - add pc, r1 -_020062A6: ; jump table (using 16-bit offset) - .short _020062AE - _020062A6 - 2; case 0 - .short _020062C2 - _020062A6 - 2; case 1 - .short _020062DA - _020062A6 - 2; case 2 - .short _020062F0 - _020062A6 - 2; case 3 -_020062AE: - mov r1, #0x0 - ldr r0, [r4, #0xc] - mvn r1, r1 - cmp r0, r1 - beq _020062BE - mov r1, #0x2 - bl HandleLoadOverlay -_020062BE: - mov r0, #0x1 - str r0, [r4, #0x10] -_020062C2: - add r1, r4, #0x0 - ldr r2, [r4, #0x0] - add r0, r4, #0x0 - add r1, #0x14 - blx r2 - cmp r0, #0x1 - bne _0200630E - mov r0, #0x2 - str r0, [r4, #0x10] - mov r0, #0x0 - str r0, [r4, #0x14] - b _0200630E -_020062DA: - add r1, r4, #0x0 - ldr r2, [r4, #0x4] - add r1, #0x14 - blx r2 - cmp r0, #0x1 - bne _0200630E - mov r0, #0x3 - str r0, [r4, #0x10] - mov r0, #0x0 - str r0, [r4, #0x14] - b _0200630E -_020062F0: - add r1, r4, #0x0 - ldr r2, [r4, #0x8] - add r1, #0x14 - blx r2 - cmp r0, #0x1 - bne _0200630E - mov r1, #0x0 - ldr r0, [r4, #0xc] - mvn r1, r1 - cmp r0, r1 - beq _0200630A - bl UnloadOverlayByID -_0200630A: - mov r0, #0x1 - pop {r4, pc} -_0200630E: - mov r0, #0x0 - pop {r4, pc} - .balign 4 diff --git a/arm9/asm/unk_02006864.s b/arm9/asm/unk_02006864.s index c3e46e9a..8bd21720 100644 --- a/arm9/asm/unk_02006864.s +++ b/arm9/asm/unk_02006864.s @@ -57,7 +57,7 @@ _020068A8: bl FUN_02017E14 _020068BC: add r0, r7, #0x0 - bl FUN_02016A18 + bl FreeToHeap _020068C2: add r0, r4, #0x0 add sp, #0x8 @@ -111,7 +111,7 @@ _02006912: bl FUN_02017CE8 _02006926: add r0, r7, #0x0 - bl FUN_02016A18 + bl FreeToHeap _0200692C: add sp, #0x8 pop {r3-r7, pc} @@ -240,7 +240,7 @@ _02006A14: blx r3 _02006A24: ldr r0, [sp, #0x4] - bl FUN_02016A18 + bl FreeToHeap _02006A2A: add sp, #0xc pop {r4-r7, pc} @@ -284,7 +284,7 @@ _02006A60: blx r3 _02006A7A: add r0, r7, #0x0 - bl FUN_02016A18 + bl FreeToHeap _02006A80: add r0, r4, #0x0 add sp, #0x8 @@ -331,7 +331,7 @@ _02006ACE: bl FUN_020B1240 _02006ADA: add r0, r6, #0x0 - bl FUN_02016A18 + bl FreeToHeap _02006AE0: add sp, #0xc pop {r4-r7, pc} @@ -370,7 +370,7 @@ _02006B0E: ldr r4, [r0, #0x10] _02006B22: add r0, r6, #0x0 - bl FUN_02016A18 + bl FreeToHeap _02006B28: add r0, r4, #0x0 add sp, #0x8 @@ -433,7 +433,7 @@ _02006B88: blx r5 _02006B98: add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap _02006B9E: add sp, #0x8 pop {r4-r6, pc} @@ -457,7 +457,7 @@ FUN_02006BB0: ; 0x02006BB0 cmp r0, #0x0 bne _02006BD6 add r0, r5, #0x0 - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x0 pop {r3-r5, pc} _02006BD6: @@ -480,7 +480,7 @@ FUN_02006BDC: ; 0x02006BDC cmp r0, #0x0 bne _02006C02 add r0, r5, #0x0 - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x0 pop {r3-r5, pc} _02006C02: @@ -502,7 +502,7 @@ FUN_02006C08: ; 0x02006C08 cmp r0, #0x0 bne _02006C2C add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x0 pop {r3-r5, pc} _02006C2C: @@ -524,7 +524,7 @@ FUN_02006C30: ; 0x02006C30 cmp r0, #0x0 bne _02006C56 add r0, r5, #0x0 - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x0 pop {r3-r5, pc} _02006C56: @@ -547,7 +547,7 @@ FUN_02006C5C: ; 0x02006C5C cmp r0, #0x0 bne _02006C82 add r0, r5, #0x0 - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x0 pop {r3-r5, pc} _02006C82: @@ -580,17 +580,17 @@ FUN_02006C98: ; 0x02006C98 _02006CAC: ldr r1, [sp, #0x0] add r0, r7, #0x0 - bl LoadFromNARC_7 + bl GetNarcMemberSizeByIdPair add r1, r0, #0x0 add r0, r6, #0x0 - bl FUN_020169D8 + bl AllocFromHeapAtEnd add r4, r0, #0x0 b _02006CCE _02006CC0: - bl LoadFromNARC_7 + bl GetNarcMemberSizeByIdPair add r1, r0, #0x0 add r0, r6, #0x0 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0x0 _02006CCE: cmp r4, #0x0 @@ -598,7 +598,7 @@ _02006CCE: ldr r2, [sp, #0x0] add r0, r4, #0x0 add r1, r7, #0x0 - bl LoadFromNARC + bl ReadWholeNarcMemberByIdPair cmp r5, #0x0 beq _02006D12 ldr r0, [sp, #0x18] @@ -607,13 +607,13 @@ _02006CCE: ldr r1, [r4, #0x0] add r0, r6, #0x0 lsr r1, r1, #0x8 - bl FUN_02016998 + bl AllocFromHeap b _02006CFC _02006CF2: ldr r1, [r4, #0x0] add r0, r6, #0x0 lsr r1, r1, #0x8 - bl FUN_020169D8 + bl AllocFromHeapAtEnd _02006CFC: add r5, r0, #0x0 cmp r5, #0x0 @@ -622,7 +622,7 @@ _02006CFC: add r1, r5, #0x0 bl MI_UncompressLZ8 add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap _02006D10: add r4, r5, #0x0 _02006D12: @@ -639,7 +639,7 @@ FUN_02006D18: ; 0x02006D18 str r1, [sp, #0x4] add r6, r2, #0x0 add r7, r3, #0x0 - bl LoadFromNARC_7 + bl GetNarcMemberSizeByIdPair str r0, [r5, #0x0] cmp r6, #0x0 bne _02006D36 @@ -649,13 +649,13 @@ FUN_02006D18: ; 0x02006D18 _02006D36: ldr r1, [r5, #0x0] add r0, r7, #0x0 - bl FUN_020169D8 + bl AllocFromHeapAtEnd add r4, r0, #0x0 b _02006D4C _02006D42: ldr r1, [r5, #0x0] add r0, r7, #0x0 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0x0 _02006D4C: cmp r4, #0x0 @@ -663,7 +663,7 @@ _02006D4C: ldr r1, [sp, #0x0] ldr r2, [sp, #0x4] add r0, r4, #0x0 - bl LoadFromNARC + bl ReadWholeNarcMemberByIdPair cmp r6, #0x0 beq _02006D92 ldr r0, [r4, #0x0] @@ -674,12 +674,12 @@ _02006D4C: bne _02006D74 ldr r1, [r5, #0x0] add r0, r7, #0x0 - bl FUN_02016998 + bl AllocFromHeap b _02006D7C _02006D74: ldr r1, [r5, #0x0] add r0, r7, #0x0 - bl FUN_020169D8 + bl AllocFromHeapAtEnd _02006D7C: add r5, r0, #0x0 cmp r5, #0x0 @@ -688,7 +688,7 @@ _02006D7C: add r1, r5, #0x0 bl MI_UncompressLZ8 add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap _02006D90: add r4, r5, #0x0 _02006D92: diff --git a/arm9/asm/unk_02006D98.s b/arm9/asm/unk_02006D98.s index cad56bd1..8bcac588 100644 --- a/arm9/asm/unk_02006D98.s +++ b/arm9/asm/unk_02006D98.s @@ -85,7 +85,7 @@ FUN_02006D98: ; 0x02006D98 mov r1, #0xba lsl r1, r1, #0x2 add r5, r0, #0x0 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0x0 mov r0, #0xa6 lsl r0, r0, #0x2 @@ -108,13 +108,13 @@ FUN_02006D98: ; 0x02006D98 add r0, #0x10 str r2, [r4, r0] add r0, r5, #0x0 - bl FUN_02016998 + bl AllocFromHeap mov r1, #0xab lsl r1, r1, #0x2 str r0, [r4, r1] add r0, r5, #0x0 mov r1, #0xc0 - bl FUN_02016998 + bl AllocFromHeap mov r1, #0x2b lsl r1, r1, #0x4 str r0, [r4, r1] @@ -124,7 +124,7 @@ FUN_02006D98: ; 0x02006D98 bl MIi_CpuClearFast add r0, r5, #0x0 mov r1, #0xc0 - bl FUN_02016998 + bl AllocFromHeap mov r1, #0xad lsl r1, r1, #0x2 str r0, [r4, r1] @@ -152,7 +152,7 @@ _02006E12: ldr r2, [r4, r2] mov r0, #0x75 mov r1, #0xd3 - bl LoadFromNarc_2 + bl AllocAndReadWholeNarcMemberByIdPair add r1, sp, #0xc str r0, [sp, #0x4] bl FUN_020B0088 @@ -213,7 +213,7 @@ _02006E8E: cmp r0, #0x50 blt _02006E86 ldr r0, [sp, #0x4] - bl FUN_02016A18 + bl FreeToHeap ldr r0, _02006ED0 ; =0x000002E1 mov r1, #0x1 strb r1, [r4, r0] @@ -757,17 +757,17 @@ FUN_020072E8: ; 0x020072E8 mov r0, #0xab lsl r0, r0, #0x2 ldr r0, [r4, r0] - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x2b lsl r0, r0, #0x4 ldr r0, [r4, r0] - bl FUN_02016A18 + bl FreeToHeap mov r0, #0xad lsl r0, r0, #0x2 ldr r0, [r4, r0] - bl FUN_02016A18 + bl FreeToHeap add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} .balign 4 @@ -3034,7 +3034,7 @@ _020082CC: ldrh r0, [r0, #0x4] ldrh r1, [r1, #0x6] ldr r2, [r6, r2] - bl LoadFromNarc_2 + bl AllocAndReadWholeNarcMemberByIdPair add r1, sp, #0x58 str r0, [sp, #0x4c] bl FUN_020B0088 @@ -3541,7 +3541,7 @@ _020086A4: b _0200855C _020086BC: ldr r0, [sp, #0x4c] - bl FUN_02016A18 + bl FreeToHeap _020086C2: ldr r0, [sp, #0x44] mov r1, #0xa @@ -3597,7 +3597,7 @@ _02008706: ldrh r0, [r4, #0x4] ldrh r1, [r4, #0x8] ldr r2, [r5, r2] - bl LoadFromNarc_2 + bl AllocAndReadWholeNarcMemberByIdPair add r1, sp, #0x18 str r0, [sp, #0x10] bl FUN_020B0138 @@ -3631,7 +3631,7 @@ _0200874A: cmp r7, #0x10 blt _0200874A ldr r0, [sp, #0x10] - bl FUN_02016A18 + bl FreeToHeap add r0, r4, #0x0 add r0, #0x6c ldrh r0, [r0, #0x0] @@ -3643,7 +3643,7 @@ _0200874A: ldr r2, [r5, r2] mov r0, #0x75 mov r1, #0xd4 - bl LoadFromNarc_2 + bl AllocAndReadWholeNarcMemberByIdPair add r1, sp, #0x18 str r0, [sp, #0x4] bl FUN_020B0138 @@ -3684,7 +3684,7 @@ _0200879E: cmp r1, #0x10 blt _0200879E ldr r0, [sp, #0x4] - bl FUN_02016A18 + bl FreeToHeap _020087E0: ldr r0, [r4, #0x0] lsl r0, r0, #0x1f diff --git a/arm9/asm/unk_02008AA4.s b/arm9/asm/unk_02008AA4.s index aa6b1129..45b46079 100644 --- a/arm9/asm/unk_02008AA4.s +++ b/arm9/asm/unk_02008AA4.s @@ -190,12 +190,12 @@ _02008C0A: _02008C14: add r0, r7, #0x0 mov r1, #0x8 - bl FUN_02016998 + bl AllocFromHeap mov r1, #0x24 add r6, r0, #0x0 add r0, r7, #0x0 mul r1, r4 - bl FUN_02016998 + bl AllocFromHeap str r0, [r6, #0x0] mov r7, #0x0 str r4, [r6, #0x4] @@ -252,10 +252,10 @@ _02008C8A: ldr r0, [r4, #0x0] cmp r0, #0x0 beq _02008C94 - bl FUN_02016A18 + bl FreeToHeap _02008C94: add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} thumb_func_start FUN_02008C9C diff --git a/arm9/asm/unk_02008DEC.s b/arm9/asm/unk_02008DEC.s index 402bb494..50b83f92 100644 --- a/arm9/asm/unk_02008DEC.s +++ b/arm9/asm/unk_02008DEC.s @@ -11,7 +11,7 @@ FUN_02008DEC: ; 0x02008DEC str r2, [sp, #0x0] add r0, r2, #0x0 mov r1, #0x14 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0x0 ldr r1, [sp, #0x0] add r0, r5, #0x0 @@ -22,7 +22,7 @@ FUN_02008DEC: ; 0x02008DEC mul r7, r0 ldr r0, [sp, #0x0] add r1, r7, #0x0 - bl FUN_02016998 + bl AllocFromHeap mov r1, #0x0 add r2, r7, #0x0 str r0, [r4, #0x4] @@ -58,11 +58,11 @@ _02008E4A: mov r0, #0x0 str r0, [r4, #0x0] ldr r0, [r4, #0x4] - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x0 str r0, [r4, #0x4] add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} thumb_func_start FUN_02008E6C @@ -818,11 +818,11 @@ FUN_02009424: ; 0x02009424 add r5, r0, #0x0 add r0, r6, #0x0 mov r1, #0xc - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0x0 add r0, r6, #0x0 lsl r1, r5, #0x2 - bl FUN_02016998 + bl AllocFromHeap str r0, [r4, #0x0] str r5, [r4, #0x4] mov r0, #0x0 @@ -835,9 +835,9 @@ FUN_02009448: ; 0x02009448 push {r4, lr} add r4, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_02016A18 + bl FreeToHeap add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} .balign 4 @@ -1172,7 +1172,7 @@ _02009678: mov r1, #0x18 add r0, r6, #0x0 mul r1, r2 - bl FUN_02016998 + bl AllocFromHeap b _0200969C _0200969A: mov r0, #0x0 @@ -1197,7 +1197,7 @@ FUN_020096B4: ; 0x020096B4 ldr r0, [r4, #0x0] cmp r0, #0x0 beq _020096C2 - bl FUN_02016A18 + bl FreeToHeap _020096C2: mov r0, #0x0 str r0, [r4, #0x0] @@ -1453,7 +1453,7 @@ FUN_0200986C: ; 0x0200986C add r5, r1, #0x0 add r0, r2, #0x0 mov r1, #0x8 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0x0 add r0, r6, #0x0 add r1, r4, #0x0 @@ -1471,7 +1471,7 @@ FUN_0200988C: ; 0x0200988C add r0, r3, #0x0 mov r1, #0xc add r6, r2, #0x0 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0x0 add r0, r7, #0x0 add r1, r4, #0x0 @@ -1488,7 +1488,7 @@ FUN_020098B0: ; 0x020098B0 add r5, r0, #0x0 add r0, r1, #0x0 mov r1, #0x4 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0x0 add r0, r5, #0x0 add r1, r4, #0x0 @@ -1503,7 +1503,7 @@ FUN_020098CC: ; 0x020098CC add r5, r0, #0x0 add r0, r1, #0x0 mov r1, #0x4 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0x0 add r0, r5, #0x0 add r1, r4, #0x0 @@ -1518,7 +1518,7 @@ FUN_020098E8: ; 0x020098E8 add r5, r0, #0x0 add r0, r1, #0x0 mov r1, #0x4 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0x0 add r0, r5, #0x0 add r1, r4, #0x0 @@ -1533,7 +1533,7 @@ FUN_02009904: ; 0x02009904 add r5, r0, #0x0 add r0, r1, #0x0 mov r1, #0x4 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0x0 add r0, r5, #0x0 add r1, r4, #0x0 @@ -1549,7 +1549,7 @@ FUN_02009920: ; 0x02009920 ldr r0, [r4, #0x8] cmp r0, #0x0 beq _0200992E - bl FUN_02016A18 + bl FreeToHeap _0200992E: mov r0, #0x0 str r0, [r4, #0x8] @@ -1674,7 +1674,7 @@ FUN_02009A04: ; 0x02009A04 add r6, r3, #0x0 add r5, r2, #0x0 add r2, r6, #0x0 - bl FUN_02006704 + bl NARC_AllocAndReadWholeMember add r4, r0, #0x0 beq _02009A4A cmp r5, #0x0 @@ -1685,13 +1685,13 @@ FUN_02009A04: ; 0x02009A04 ldr r1, [r4, #0x0] add r0, r6, #0x0 lsr r1, r1, #0x8 - bl FUN_02016998 + bl AllocFromHeap b _02009A34 _02009A2A: ldr r1, [r4, #0x0] add r0, r6, #0x0 lsr r1, r1, #0x8 - bl FUN_020169D8 + bl AllocFromHeapAtEnd _02009A34: add r5, r0, #0x0 cmp r5, #0x0 @@ -1700,7 +1700,7 @@ _02009A34: add r1, r5, #0x0 bl MI_UncompressLZ8 add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap _02009A48: add r4, r5, #0x0 _02009A4A: diff --git a/arm9/asm/unk_02009EAC.s b/arm9/asm/unk_02009EAC.s index cb5adda6..a6a7e7d7 100644 --- a/arm9/asm/unk_02009EAC.s +++ b/arm9/asm/unk_02009EAC.s @@ -72,7 +72,7 @@ FUN_02009EF0: ; 0x02009EF0 _02009F08: ldr r0, [sp, #0x30] mov r1, #0x3c - bl FUN_02016998 + bl AllocFromHeap ldr r1, _02009F7C ; =UNK_021C4670 cmp r0, #0x0 str r0, [r1, #0x0] @@ -164,7 +164,7 @@ _02009FAE: bl FUN_0200A06C ldr r0, _02009FD4 ; =UNK_021C4670 ldr r0, [r0, #0x0] - bl FUN_02016A18 + bl FreeToHeap ldr r0, _02009FD4 ; =UNK_021C4670 mov r1, #0x0 str r1, [r0, #0x0] diff --git a/arm9/asm/unk_0200A384.s b/arm9/asm/unk_0200A384.s index 2bcb1c5b..482cdfd7 100644 --- a/arm9/asm/unk_0200A384.s +++ b/arm9/asm/unk_0200A384.s @@ -5,17 +5,17 @@ thumb_func_start FUN_0200A384 FUN_0200A384: ; 0x0200A384 - ldr r3, _0200A388 ; =LoadFromNarc_2 + ldr r3, _0200A388 ; =AllocAndReadWholeNarcMemberByIdPair bx r3 .balign 4 -_0200A388: .word LoadFromNarc_2 +_0200A388: .word AllocAndReadWholeNarcMemberByIdPair thumb_func_start FUN_0200A38C FUN_0200A38C: ; 0x0200A38C - ldr r3, _0200A390 ; =FUN_02016A18 + ldr r3, _0200A390 ; =FreeToHeap bx r3 .balign 4 -_0200A390: .word FUN_02016A18 +_0200A390: .word FreeToHeap thumb_func_start FUN_0200A394 FUN_0200A394: ; 0x0200A394 @@ -92,7 +92,7 @@ FUN_0200A418: ; 0x0200A418 add r5, r1, #0x0 add r1, r3, #0x0 add r4, r2, #0x0 - bl FUN_02006670 + bl NARC_ctor add r6, r0, #0x0 beq _0200A4AE add r1, sp, #0xc @@ -100,7 +100,7 @@ FUN_0200A418: ; 0x0200A418 add r1, r5, #0x0 mov r2, #0x0 mov r3, #0x4 - bl FUN_02006814 + bl NARC_ReadFromMember add r0, sp, #0x4 lsl r2, r4, #0x3 str r0, [sp, #0x0] @@ -108,7 +108,7 @@ FUN_0200A418: ; 0x0200A418 add r1, r5, #0x0 add r2, r2, #0x4 mov r3, #0x8 - bl FUN_02006814 + bl NARC_ReadFromMember add r0, sp, #0x4 ldrh r2, [r0, #0xa] ldr r0, _0200A4B4 ; =0x000002FD @@ -132,7 +132,7 @@ FUN_0200A418: ; 0x0200A418 ldr r2, [sp, #0x4] add r0, r6, #0x0 lsl r3, r3, #0x1 - bl FUN_02006814 + bl NARC_ReadFromMember ldr r2, _0200A4B8 ; =0x00091BD3 add r3, r4, #0x1 mul r2, r3 @@ -158,7 +158,7 @@ _0200A492: bne _0200A492 _0200A4A8: add r0, r6, #0x0 - bl FUN_020066F4 + bl NARC_dtor _0200A4AE: add sp, #0x10 pop {r4-r6, pc} @@ -215,7 +215,7 @@ FUN_0200A4D4: ; 0x0200A4D4 ldr r1, [sp, #0x4] mov r0, #0x0 str r6, [sp, #0xc] - bl FUN_020169D8 + bl AllocFromHeapAtEnd add r7, r0, #0x0 beq _0200A574 ldr r0, [sp, #0x8] @@ -251,7 +251,7 @@ _0200A556: add r2, r6, #0x0 bl FUN_02021E8C add r0, r7, #0x0 - bl FUN_02016A18 + bl FreeToHeap add sp, #0x10 pop {r3-r7, pc} _0200A56A: @@ -302,7 +302,7 @@ FUN_0200A584: ; 0x0200A584 ldr r0, [sp, #0x0] ldr r1, [sp, #0x4] str r6, [sp, #0xc] - bl FUN_020169D8 + bl AllocFromHeapAtEnd add r7, r0, #0x0 beq _0200A626 ldr r0, [sp, #0x8] @@ -343,7 +343,7 @@ _0200A606: bl FUN_02021E8C _0200A61A: add r0, r7, #0x0 - bl FUN_02016A18 + bl FreeToHeap add sp, #0x10 add r0, r4, #0x0 pop {r3-r7, pc} @@ -370,7 +370,7 @@ FUN_0200A648: ; 0x0200A648 add r5, r1, #0x0 add r1, r7, #0x0 add r4, r2, #0x0 - bl FUN_02006670 + bl NARC_ctor add r6, r0, #0x0 beq _0200A66E ldr r1, [sp, #0x18] @@ -380,7 +380,7 @@ FUN_0200A648: ; 0x0200A648 add r3, r7, #0x0 bl FUN_0200A670 add r0, r6, #0x0 - bl FUN_020066F4 + bl NARC_dtor _0200A66E: pop {r3-r7, pc} @@ -396,7 +396,7 @@ FUN_0200A670: ; 0x0200A670 mov r3, #0x4 add r7, r0, #0x0 str r1, [sp, #0x4] - bl FUN_02006814 + bl NARC_ReadFromMember add r0, sp, #0x8 ldrh r0, [r0, #0x8] cmp r5, r0 @@ -408,7 +408,7 @@ FUN_0200A670: ; 0x0200A670 add r0, r7, #0x0 add r2, r2, #0x4 mov r3, #0x8 - bl FUN_02006814 + bl NARC_ReadFromMember add r0, sp, #0x8 ldrh r2, [r0, #0xa] ldr r0, _0200A72C ; =0x000002FD @@ -428,7 +428,7 @@ FUN_0200A670: ; 0x0200A670 str r0, [sp, #0xc] add r0, r4, #0x0 add r1, r6, #0x0 - bl FUN_020169D8 + bl AllocFromHeapAtEnd add r4, r0, #0x0 beq _0200A728 str r4, [sp, #0x0] @@ -436,7 +436,7 @@ FUN_0200A670: ; 0x0200A670 ldr r2, [sp, #0x8] add r0, r7, #0x0 add r3, r6, #0x0 - bl FUN_02006814 + bl NARC_ReadFromMember ldr r2, _0200A730 ; =0x00091BD3 add r3, r5, #0x1 mul r2, r3 @@ -466,7 +466,7 @@ _0200A70A: add r1, r4, #0x0 bl FUN_02021E8C add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap add sp, #0x14 pop {r4-r7, pc} _0200A71E: @@ -488,7 +488,7 @@ FUN_0200A738: ; 0x0200A738 add r5, r1, #0x0 add r1, r6, #0x0 add r4, r2, #0x0 - bl FUN_02006670 + bl NARC_ctor add r7, r0, #0x0 beq _0200A75E add r1, r5, #0x0 @@ -497,7 +497,7 @@ FUN_0200A738: ; 0x0200A738 bl FUN_0200A76C add r4, r0, #0x0 add r0, r7, #0x0 - bl FUN_020066F4 + bl NARC_dtor b _0200A768 _0200A75E: mov r0, #0x4 @@ -520,7 +520,7 @@ FUN_0200A76C: ; 0x0200A76C mov r3, #0x4 add r7, r0, #0x0 str r1, [sp, #0x4] - bl FUN_02006814 + bl NARC_ReadFromMember add r0, sp, #0xc ldrh r0, [r0, #0x8] cmp r4, r0 @@ -532,7 +532,7 @@ FUN_0200A76C: ; 0x0200A76C add r0, r7, #0x0 add r2, r2, #0x4 mov r3, #0x8 - bl FUN_02006814 + bl NARC_ReadFromMember add r0, sp, #0xc ldrh r2, [r0, #0xa] ldr r0, _0200A83C ; =0x000002FD @@ -558,7 +558,7 @@ FUN_0200A76C: ; 0x0200A76C lsl r6, r0, #0x1 add r0, r5, #0x0 add r1, r6, #0x0 - bl FUN_020169D8 + bl AllocFromHeapAtEnd add r5, r0, #0x0 beq _0200A824 str r5, [sp, #0x0] @@ -566,7 +566,7 @@ FUN_0200A76C: ; 0x0200A76C ldr r2, [sp, #0xc] add r0, r7, #0x0 add r3, r6, #0x0 - bl FUN_02006814 + bl NARC_ReadFromMember ldr r2, _0200A840 ; =0x00091BD3 add r3, r4, #0x1 mul r2, r3 @@ -596,7 +596,7 @@ _0200A814: add r1, r5, #0x0 bl FUN_02021E8C add r0, r5, #0x0 - bl FUN_02016A18 + bl FreeToHeap _0200A824: ldr r0, [sp, #0x8] add sp, #0x18 @@ -629,7 +629,7 @@ FUN_0200A84C: ; 0x0200A84C add r1, r3, #0x0 add r0, sp, #0x4 mov r3, #0x0 - bl FUN_02006548 + bl ReadFromNarcMemberByIdPair add r0, sp, #0x4 ldrh r0, [r0, #0x0] add sp, #0x8 @@ -645,7 +645,7 @@ FUN_0200A86C: ; 0x0200A86C mov r1, #0xc add r7, r2, #0x0 str r3, [sp, #0x0] - bl FUN_020169D8 + bl AllocFromHeapAtEnd add r4, r0, #0x0 beq _0200A8B4 cmp r5, #0x0 @@ -658,13 +658,13 @@ FUN_0200A86C: ; 0x0200A86C cmp r0, #0x0 bne _0200A8AA add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x0 pop {r3-r7, pc} _0200A8A0: ldr r1, [sp, #0x0] add r0, r6, #0x0 - bl FUN_02006670 + bl NARC_ctor str r0, [r4, #0x8] _0200A8AA: strh r5, [r4, #0x0] @@ -693,10 +693,10 @@ _0200A8CA: b _0200A8D8 _0200A8D2: ldr r0, [r4, #0x8] - bl FUN_020066F4 + bl NARC_dtor _0200A8D8: add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap _0200A8DE: pop {r4, pc} diff --git a/arm9/asm/unk_0200AA80.s b/arm9/asm/unk_0200AA80.s index a3c00a1e..351b8eab 100644 --- a/arm9/asm/unk_0200AA80.s +++ b/arm9/asm/unk_0200AA80.s @@ -45,7 +45,7 @@ _0200AAA0: _0200AAAA: ldr r0, [sp, #0x4] mov r1, #0x10 - bl FUN_020169D8 + bl AllocFromHeapAtEnd add r4, r0, #0x0 beq _0200AB10 ldr r0, [sp, #0x4] @@ -59,7 +59,7 @@ _0200AAAA: beq _0200AB10 ldr r0, [sp, #0x4] lsl r1, r7, #0x3 - bl FUN_020169D8 + bl AllocFromHeapAtEnd str r0, [r4, #0x8] cmp r0, #0x0 beq _0200AB10 @@ -128,7 +128,7 @@ _0200AB36: blo _0200AB36 _0200AB4E: ldr r0, [r5, #0x8] - bl FUN_02016A18 + bl FreeToHeap _0200AB54: ldr r0, [r5, #0xc] cmp r0, #0x0 @@ -138,7 +138,7 @@ _0200AB5E: mov r0, #0x0 str r0, [r5, #0x0] add r0, r5, #0x0 - bl FUN_02016A18 + bl FreeToHeap pop {r4-r6, pc} .balign 4 @@ -1819,7 +1819,7 @@ FUN_0200B870: ; 0x0200B870 add r0, r4, #0x0 mov r1, #0x2c str r2, [sp, #0x4] - bl FUN_02016998 + bl AllocFromHeap str r0, [sp, #0x8] cmp r0, #0x0 beq _0200B98A @@ -1978,10 +1978,10 @@ FUN_0200B990: ; 0x0200B990 ldr r0, [r4, #0x0] cmp r0, #0x0 beq _0200B9A0 - bl FUN_02016A18 + bl FreeToHeap _0200B9A0: add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap _0200B9A6: pop {r4, pc} diff --git a/arm9/asm/unk_0200BB14.s b/arm9/asm/unk_0200BB14.s index faaf0729..04f67c6e 100644 --- a/arm9/asm/unk_0200BB14.s +++ b/arm9/asm/unk_0200BB14.s @@ -9,7 +9,7 @@ FUN_0200BB14: ; 0x0200BB14 mov r1, #0x4e lsl r1, r1, #0x2 add r4, r0, #0x0 - bl FUN_02016998 + bl AllocFromHeap cmp r0, #0x0 bne _0200BB28 mov r0, #0x0 @@ -31,7 +31,7 @@ FUN_0200BB34: ; 0x0200BB34 _0200BB3E: ldr r0, [r4, #0x0] mov r1, #0x58 - bl FUN_02016998 + bl AllocFromHeap cmp r0, #0x0 bne _0200BB4E mov r0, #0x0 @@ -214,7 +214,7 @@ _0200BC68: blt _0200BC68 _0200BC7C: ldr r0, [r5, #0x8] - bl FUN_02016A18 + bl FreeToHeap ldr r0, [r5, #0x24] bl FUN_02009C30 ldr r0, [r5, #0x28] @@ -256,13 +256,13 @@ _0200BCCC: thumb_func_start FUN_0200BCD0 FUN_0200BCD0: ; 0x0200BCD0 ldr r2, [r0, #0x4] - ldr r3, _0200BCDC ; =FUN_02016A18 + ldr r3, _0200BCDC ; =FreeToHeap sub r2, r2, #0x1 str r2, [r0, #0x4] add r0, r1, #0x0 bx r3 .balign 4 -_0200BCDC: .word FUN_02016A18 +_0200BCDC: .word FreeToHeap thumb_func_start FUN_0200BCE0 FUN_0200BCE0: ; 0x0200BCE0 @@ -293,7 +293,7 @@ _0200BD12: add r0, r4, #0x0 bl FUN_0200BCB0 add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} thumb_func_start FUN_0200BD20 @@ -328,7 +328,7 @@ _0200BD48: ldr r1, [sp, #0x14] ldr r0, [r5, #0x0] mul r1, r2 - bl FUN_02016998 + bl AllocFromHeap str r0, [r4, #0x8] ldr r0, [sp, #0x14] mov r7, #0x0 @@ -348,7 +348,7 @@ _0200BD68: str r0, [sp, #0x1c] bl FUN_02009668 ldr r0, [sp, #0x1c] - bl FUN_02016A18 + bl FreeToHeap ldr r0, [sp, #0x14] add r7, r7, #0x1 add r6, r6, #0x4 @@ -424,7 +424,7 @@ _0200BDF6: bl FUN_02008BE0 str r0, [r4, #0x4] add r0, r6, #0x0 - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x1 add sp, #0x24 pop {r4-r7, pc} @@ -849,7 +849,7 @@ FUN_0200C154: ; 0x0200C154 add r6, r1, #0x0 mov r1, #0x10 add r5, r2, #0x0 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0x0 bne _0200C170 add sp, #0x74 @@ -858,7 +858,7 @@ FUN_0200C154: ; 0x0200C154 _0200C170: ldr r0, [r7, #0x0] mov r1, #0x8 - bl FUN_02016998 + bl AllocFromHeap str r0, [r4, #0x8] cmp r0, #0x0 bne _0200C184 @@ -868,7 +868,7 @@ _0200C170: _0200C184: ldr r0, [r7, #0x0] mov r1, #0x24 - bl FUN_02016998 + bl AllocFromHeap ldr r1, [r4, #0x8] str r0, [r1, #0x0] ldr r0, [r4, #0x8] @@ -880,7 +880,7 @@ _0200C184: bne _0200C1AC cmp r0, #0x0 beq _0200C1A6 - bl FUN_02016A18 + bl FreeToHeap _0200C1A6: add sp, #0x74 mov r0, #0x0 @@ -1187,7 +1187,7 @@ _0200C3EE: ldr r0, [r4, #0x8] bl FUN_02008C80 add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} .balign 4 diff --git a/arm9/asm/unk_0200CABC.s b/arm9/asm/unk_0200CABC.s index 8e75a5c6..bfab698c 100644 --- a/arm9/asm/unk_0200CABC.s +++ b/arm9/asm/unk_0200CABC.s @@ -898,7 +898,7 @@ FUN_0200D18C: ; 0x0200D18C str r0, [sp, #0x28] add r0, r6, #0x0 lsl r1, r1, #0x6 - bl FUN_02016998 + bl AllocFromHeap add r5, r0, #0x0 ldr r0, [sp, #0x28] bl FUN_020187B0 @@ -982,9 +982,9 @@ _0200D1E0: ldr r0, [sp, #0x24] bl FUN_02002840 ldr r0, [sp, #0x2c] - bl FUN_02016A18 + bl FreeToHeap add r0, r5, #0x0 - bl FUN_02016A18 + bl FreeToHeap add sp, #0x40 pop {r3-r7, pc} .balign 4 @@ -1011,7 +1011,7 @@ FUN_0200D274: ; 0x0200D274 mov r1, #0x9 ldr r0, [sp, #0x2c] lsl r1, r1, #0x6 - bl FUN_02016998 + bl AllocFromHeap ldr r1, [sp, #0x10] mov r2, #0x9 ldr r1, [r1, #0x14] @@ -1051,9 +1051,9 @@ _0200D2D2: lsl r3, r3, #0x6 bl FUN_02017E14 ldr r0, [sp, #0xc] - bl FUN_02016A18 + bl FreeToHeap add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap add sp, #0x14 pop {r4-r7, pc} .balign 4 @@ -1081,7 +1081,7 @@ FUN_0200D300: ; 0x0200D300 mov r0, #0x24 mov r1, #0x1 add r2, r4, #0x0 - bl LoadFromNarc_2 + bl AllocAndReadWholeNarcMemberByIdPair add r1, sp, #0x18 str r0, [sp, #0x14] bl FUN_020B0138 @@ -1731,7 +1731,7 @@ FUN_0200D858: ; 0x0200D858 add r5, r0, #0x0 ldr r0, [sp, #0x28] ldr r1, _0200D970 ; =0x0000048C - bl FUN_02016998 + bl AllocFromHeap ldr r1, [sp, #0x24] add r4, r0, #0x0 ldr r0, _0200D974 ; =0x00000404 @@ -1743,7 +1743,7 @@ FUN_0200D858: ; 0x0200D858 bl memcpy ldr r0, [sp, #0x28] mov r1, #0x80 - bl FUN_02016998 + bl AllocFromHeap ldr r1, [sp, #0x24] mov r2, #0x20 add r1, #0xa @@ -1785,7 +1785,7 @@ _0200D8DA: cmp r5, #0x8 blo _0200D8DA add r0, r6, #0x0 - bl FUN_02016A18 + bl FreeToHeap ldr r0, [sp, #0x28] mov r1, #0x17 str r0, [sp, #0x0] @@ -1811,7 +1811,7 @@ _0200D8DA: ldr r0, [r0, #0x14] bl FUN_0200D148 add r0, r5, #0x0 - bl FUN_02016A18 + bl FreeToHeap ldr r0, [sp, #0x20] ldr r1, _0200D978 ; =0x00000484 str r0, [r4, #0x0] @@ -2150,7 +2150,7 @@ FUN_0200DBE8: ; 0x0200DBE8 push {r4, lr} add r4, r0, #0x0 add r0, r1, #0x0 - bl FUN_02016A18 + bl FreeToHeap add r0, r4, #0x0 bl FUN_0200CAB4 pop {r4, pc} @@ -2533,7 +2533,7 @@ FUN_0200DEF4: ; 0x0200DEF4 mov r1, #0x19 ldrh r0, [r5, r0] lsl r1, r1, #0x8 - bl FUN_02016998 + bl AllocFromHeap add r2, sp, #0x18 ldr r3, _0200DFCC ; =UNK_020ECE98 add r4, r0, #0x0 @@ -2586,7 +2586,7 @@ FUN_0200DEF4: ; 0x0200DEF4 lsl r2, r2, #0x8 bl GX_LoadOBJ add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap ldr r2, _0200DFC8 ; =0x00000162 ldrh r0, [r6, #0x0] ldrh r1, [r6, #0x4] @@ -2611,7 +2611,7 @@ FUN_0200DEF4: ; 0x0200DEF4 mov r2, #0x20 bl GX_LoadOBJPltt add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap add sp, #0x28 pop {r3-r7, pc} nop diff --git a/arm9/asm/unk_0200E1D0.s b/arm9/asm/unk_0200E1D0.s index 251fbbed..85f4bfc2 100644 --- a/arm9/asm/unk_0200E1D0.s +++ b/arm9/asm/unk_0200E1D0.s @@ -752,7 +752,7 @@ FUN_0200E6CC: ; 0x0200E6CC mov r1, #0x10 add r6, r2, #0x0 add r7, r3, #0x0 - bl FUN_020169D8 + bl AllocFromHeapAtEnd add r1, r0, #0x0 str r5, [r1, #0x0] str r4, [r1, #0x4] @@ -773,7 +773,7 @@ FUN_0200E6F8: ; 0x0200E6F8 add r4, r1, #0x0 add r0, r2, #0x0 mov r1, #0x8 - bl FUN_020169D8 + bl AllocFromHeapAtEnd add r1, r0, #0x0 mov r2, #0x1 str r5, [r1, #0x0] @@ -798,7 +798,7 @@ FUN_0200E71C: ; 0x0200E71C add r0, r5, #0x0 bl FUN_0200CAB4 add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap pop {r3-r5, pc} thumb_func_start FUN_0200E73C @@ -812,7 +812,7 @@ FUN_0200E73C: ; 0x0200E73C add r0, r5, #0x0 bl FUN_0200CAB4 add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap pop {r3-r5, pc} thumb_func_start FUN_0200E758 diff --git a/arm9/asm/unk_0200E850.s b/arm9/asm/unk_0200E850.s index 2625d2f0..15526585 100644 --- a/arm9/asm/unk_0200E850.s +++ b/arm9/asm/unk_0200E850.s @@ -1542,7 +1542,7 @@ FUN_0200F20C: ; 0x0200F20C ldr r0, [r5, #0x20] add r6, r1, #0x0 mov r1, #0x1c - bl FUN_02016998 + bl AllocFromHeap str r0, [r5, #0x14] mov r2, #0x1c mov r1, #0x0 @@ -1643,7 +1643,7 @@ _0200F2C4: str r0, [r5, #0xc] b _0200F2E8 _0200F2D4: - bl FUN_02016A18 + bl FreeToHeap add r0, r4, #0x0 str r0, [r5, #0x14] ldr r0, [r5, #0xc] @@ -2001,7 +2001,7 @@ FUN_0200F55C: ; 0x0200F55C _0200F572: ldr r1, _0200F5B8 ; =0x00000604 add r0, r3, #0x0 - bl FUN_02016998 + bl AllocFromHeap str r0, [r5, #0x0] mov r0, #0x1 str r0, [r5, #0x4] @@ -2014,7 +2014,7 @@ _0200F572: _0200F58C: ldr r1, _0200F5BC ; =0x00000C08 add r0, r3, #0x0 - bl FUN_02016998 + bl AllocFromHeap str r0, [r5, #0x0] mov r0, #0x2 str r0, [r5, #0x4] @@ -2049,7 +2049,7 @@ FUN_0200F5C8: ; 0x0200F5C8 push {r4, lr} add r4, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x0 str r0, [r4, #0x0] pop {r4, pc} @@ -3000,7 +3000,7 @@ FUN_0200FCC8: ; 0x0200FCC8 ldr r0, [r5, #0x20] add r6, r1, #0x0 mov r1, #0x4c - bl FUN_02016998 + bl AllocFromHeap str r0, [r5, #0x14] add r4, r0, #0x0 ldr r0, [r5, #0x10] @@ -3064,7 +3064,7 @@ _0200FD34: b _0200FD66 _0200FD50: add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap add r0, r6, #0x0 str r0, [r5, #0x14] ldr r0, [r5, #0xc] @@ -3088,7 +3088,7 @@ FUN_0200FD6C: ; 0x0200FD6C add r6, r1, #0x0 mov r1, #0x98 add r7, r2, #0x0 - bl FUN_02016998 + bl AllocFromHeap str r0, [r5, #0x14] add r4, r0, #0x0 ldr r0, [r5, #0x10] @@ -3156,7 +3156,7 @@ _0200FDDC: b _0200FE1A _0200FE04: add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap add r0, r6, #0x0 str r0, [r5, #0x14] ldr r0, [r5, #0xc] @@ -3307,7 +3307,7 @@ FUN_0200FF18: ; 0x0200FF18 ldr r0, [r5, #0x20] add r4, r1, #0x0 mov r1, #0x38 - bl FUN_02016998 + bl AllocFromHeap str r0, [r5, #0x14] ldr r0, [r5, #0x10] add r1, r4, #0x0 @@ -3359,7 +3359,7 @@ _0200FF84: add r0, r4, #0x0 bl FUN_0200F5C0 ldr r0, [r5, #0x14] - bl FUN_02016A18 + bl FreeToHeap add r0, r6, #0x0 str r0, [r5, #0x14] ldr r0, [r5, #0xc] @@ -3676,7 +3676,7 @@ FUN_020101EC: ; 0x020101EC ldr r0, [r5, #0x20] add r4, r1, #0x0 mov r1, #0x30 - bl FUN_02016998 + bl AllocFromHeap str r0, [r5, #0x14] ldr r0, [r5, #0x10] add r1, r4, #0x0 @@ -3728,7 +3728,7 @@ _02010258: add r0, r4, #0x0 bl FUN_0200F5C0 ldr r0, [r5, #0x14] - bl FUN_02016A18 + bl FreeToHeap add r0, r6, #0x0 str r0, [r5, #0x14] ldr r0, [r5, #0xc] @@ -3933,7 +3933,7 @@ FUN_020103F0: ; 0x020103F0 ldr r0, [r5, #0x20] add r4, r1, #0x0 mov r1, #0x34 - bl FUN_02016998 + bl AllocFromHeap str r0, [r5, #0x14] ldr r0, [r5, #0x10] add r1, r4, #0x0 @@ -3985,7 +3985,7 @@ _0201045C: add r0, r4, #0x0 bl FUN_0200F5C0 ldr r0, [r5, #0x14] - bl FUN_02016A18 + bl FreeToHeap add r0, r6, #0x0 str r0, [r5, #0x14] ldr r0, [r5, #0xc] @@ -4260,7 +4260,7 @@ FUN_02010688: ; 0x02010688 ldr r0, [r5, #0x20] add r4, r1, #0x0 mov r1, #0x30 - bl FUN_02016998 + bl AllocFromHeap str r0, [r5, #0x14] ldr r0, [r5, #0x10] add r1, r4, #0x0 @@ -4314,7 +4314,7 @@ _020106F4: add r0, r4, #0x0 bl FUN_0200F5C0 ldr r0, [r5, #0x14] - bl FUN_02016A18 + bl FreeToHeap add r0, r6, #0x0 str r0, [r5, #0x14] ldr r0, [r5, #0xc] @@ -4346,7 +4346,7 @@ FUN_02010720: ; 0x02010720 mul r1, r2 str r3, [sp, #0x1c] str r0, [sp, #0x44] - bl FUN_02016998 + bl AllocFromHeap str r0, [r7, #0xc] cmp r0, #0x0 bne _02010748 @@ -4507,7 +4507,7 @@ FUN_02010884: ; 0x02010884 push {r4, lr} add r4, r0, #0x0 ldr r0, [r4, #0xc] - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x0 str r0, [r4, #0xc] pop {r4, pc} @@ -4620,7 +4620,7 @@ FUN_02010948: ; 0x02010948 ldr r0, [r5, #0x20] add r4, r1, #0x0 mov r1, #0x38 - bl FUN_02016998 + bl AllocFromHeap str r0, [r5, #0x14] mov r1, #0x0 mov r2, #0x38 @@ -4677,7 +4677,7 @@ _020109BC: add r0, r4, #0x0 bl FUN_0200F5C0 ldr r0, [r5, #0x14] - bl FUN_02016A18 + bl FreeToHeap add r0, r6, #0x0 str r0, [r5, #0x14] ldr r0, [r5, #0xc] @@ -5033,7 +5033,7 @@ FUN_02010C7C: ; 0x02010C7C ldr r0, [r5, #0x20] add r4, r1, #0x0 mov r1, #0x38 - bl FUN_02016998 + bl AllocFromHeap str r0, [r5, #0x14] mov r1, #0x0 mov r2, #0x38 @@ -5090,7 +5090,7 @@ _02010CF0: add r0, r4, #0x0 bl FUN_0200F5C0 ldr r0, [r5, #0x14] - bl FUN_02016A18 + bl FreeToHeap add r0, r6, #0x0 str r0, [r5, #0x14] ldr r0, [r5, #0xc] @@ -5377,7 +5377,7 @@ FUN_02010F2C: ; 0x02010F2C mov r1, #0xcd ldr r0, [r5, #0x20] lsl r1, r1, #0x2 - bl FUN_02016998 + bl AllocFromHeap mov r2, #0xcd str r0, [r5, #0x14] mov r1, #0x0 @@ -5436,7 +5436,7 @@ _02010FAA: add r0, r4, #0x0 bl FUN_0201111C ldr r0, [r5, #0x14] - bl FUN_02016A18 + bl FreeToHeap add r0, r6, #0x0 str r0, [r5, #0x14] ldr r0, [r5, #0xc] @@ -5716,7 +5716,7 @@ FUN_020111AC: ; 0x020111AC mov r1, #0xe2 ldr r0, [r5, #0x20] lsl r1, r1, #0x2 - bl FUN_02016998 + bl AllocFromHeap mov r2, #0xe2 mov r1, #0x0 lsl r2, r2, #0x2 @@ -5797,7 +5797,7 @@ _02011242: str r0, [r5, #0xc] b _02011272 _02011258: - bl FUN_02016A18 + bl FreeToHeap add r0, r4, #0x0 str r0, [r5, #0x14] ldr r0, [r5, #0xc] diff --git a/arm9/asm/unk_02011744.s b/arm9/asm/unk_02011744.s index e0b5ddc3..4c1cb051 100644 --- a/arm9/asm/unk_02011744.s +++ b/arm9/asm/unk_02011744.s @@ -86,7 +86,7 @@ FUN_02011744: ; 0x02011744 str r0, [sp, #0x4] add r0, r7, #0x0 mov r1, #0x68 - bl FUN_02016998 + bl AllocFromHeap str r0, [sp, #0x8] cmp r0, #0x0 bne _0201175E @@ -119,7 +119,7 @@ _0201177E: mul r4, r1 add r0, r7, #0x0 add r1, r4, #0x0 - bl FUN_02016998 + bl AllocFromHeap ldr r1, [sp, #0x8] cmp r0, #0x0 str r0, [r1, #0x60] @@ -149,15 +149,15 @@ _020117C6: add r5, r6, #0x0 _020117CA: ldr r0, [r5, #0x0] - bl FUN_02016A18 + bl FreeToHeap add r4, r4, #0x1 add r5, r5, #0x4 cmp r4, #0xc blt _020117CA ldr r0, [r6, #0x60] - bl FUN_02016A18 + bl FreeToHeap add r0, r6, #0x0 - bl FUN_02016A18 + bl FreeToHeap pop {r4-r6, pc} .balign 4 @@ -193,12 +193,12 @@ _02011802: mov r1, #0x24 ldr r0, [r5, #0x2c] mul r1, r6 - bl FUN_020169D8 + bl AllocFromHeapAtEnd add r7, r0, #0x0 mov r1, #0xc ldr r0, [r5, #0x2c] mul r1, r6 - bl FUN_02016998 + bl AllocFromHeap str r0, [r4, #0x0] str r6, [r4, #0x4] ldr r0, [r5, #0x28] @@ -216,7 +216,7 @@ _02011802: add r3, r4, #0x0 bl FUN_02011EAC add r0, r7, #0x0 - bl FUN_02016A18 + bl FreeToHeap add r0, sp, #0x8 bl FUN_02011FDC add r0, r4, #0x0 @@ -239,7 +239,7 @@ _02011884: add r0, r4, #0x0 bl FUN_02011F00 ldr r0, [r4, #0x0] - bl FUN_02016A18 + bl FreeToHeap add r0, r4, #0x0 bl FUN_02011B90 pop {r4, pc} @@ -976,7 +976,7 @@ _02011DC6: lsl r4, r4, #0x5 ldr r0, [sp, #0x34] add r1, r4, #0x0 - bl FUN_020169D8 + bl AllocFromHeapAtEnd add r7, r0, #0x0 ldr r0, [r6, #0x4] ldr r1, [sp, #0x10] @@ -1027,7 +1027,7 @@ _02011E1A: ldr r0, [sp, #0x28] str r0, [r5, #0x20] add r0, r7, #0x0 - bl FUN_02016A18 + bl FreeToHeap ldr r0, [sp, #0x2c] add r0, r0, r4 add sp, #0x14 @@ -1227,7 +1227,7 @@ _02011F80: FUN_02011FAC: ; 0x02011FAC push {r4, lr} mov r1, #0x14 - bl FUN_020169D8 + bl AllocFromHeapAtEnd add r4, r0, #0x0 bne _02011FBC bl ErrorHandling @@ -1247,7 +1247,7 @@ FUN_02011FC8: ; 0x02011FC8 bl ErrorHandling _02011FD2: add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} .balign 4 @@ -1317,7 +1317,7 @@ _02012018: FUN_02012044: ; 0x02012044 push {r4-r6, lr} add r5, r3, #0x0 - bl LoadFromNarc_2 + bl AllocAndReadWholeNarcMemberByIdPair add r4, r0, #0x0 bne _02012054 bl ErrorHandling @@ -1335,7 +1335,7 @@ _02012066: bl ErrorHandling _0201206E: add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap pop {r4-r6, pc} .balign 4 @@ -1508,7 +1508,7 @@ FUN_0201219C: ; 0x0201219C add r0, r5, #0x0 lsl r1, r1, #0x5 str r3, [sp, #0x20] - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0x0 ldr r0, [sp, #0x38] ldr r3, [sp, #0x20] @@ -1543,7 +1543,7 @@ FUN_020121E8: ; 0x020121E8 str r3, [sp, #0x48] mov r3, #0x0 str r3, [sp, #0x2c] - bl LoadFromNarc_2 + bl AllocAndReadWholeNarcMemberByIdPair str r0, [sp, #0x20] cmp r0, #0x0 bne _02012204 @@ -1636,7 +1636,7 @@ _0201229C: blt _02012270 _020122AE: ldr r0, [sp, #0x20] - bl FUN_02016A18 + bl FreeToHeap add sp, #0x30 pop {r3-r7, pc} @@ -1653,7 +1653,7 @@ FUN_020122B8: ; 0x020122B8 add r0, r5, #0x0 lsl r1, r1, #0x5 str r3, [sp, #0x10] - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0x0 ldr r0, [sp, #0x28] ldr r3, [sp, #0x10] @@ -1808,7 +1808,7 @@ _020123D4: cmp r4, #0x6 blt _020123D4 ldr r0, [sp, #0x14] - bl FUN_02016A18 + bl FreeToHeap add sp, #0x7c pop {r4-r7, pc} nop @@ -1865,7 +1865,7 @@ FUN_0201244C: ; 0x0201244C add r5, r0, #0x0 add r0, r7, #0x0 lsl r1, r1, #0x6 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0x0 add r0, r5, #0x0 add r1, r6, #0x0 @@ -1883,12 +1883,12 @@ FUN_02012470: ; 0x02012470 add r6, r1, #0x0 add r0, r7, #0x0 mov r1, #0x20 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0x0 add r0, r5, #0x0 add r1, r6, #0x0 add r2, r7, #0x0 - bl LoadFromNarc_2 + bl AllocAndReadWholeNarcMemberByIdPair add r1, sp, #0x0 add r5, r0, #0x0 bl FUN_020B0138 @@ -1902,7 +1902,7 @@ _0201249C: mov r2, #0x20 bl MIi_CpuCopy16 add r0, r5, #0x0 - bl FUN_02016A18 + bl FreeToHeap add r0, r4, #0x0 pop {r3-r7, pc} .balign 4 @@ -1964,7 +1964,7 @@ _02012504: cmp r4, #0x6 blt _02012504 ldr r0, [sp, #0x24] - bl FUN_02016A18 + bl FreeToHeap add sp, #0x8c pop {r4-r7, pc} nop @@ -2396,7 +2396,7 @@ FUN_02012838: ; 0x02012838 add r1, r5, #0x1 add r0, r4, #0x0 lsl r1, r1, #0x3 - bl FUN_02016998 + bl AllocFromHeap cmp r0, #0x0 beq _0201286E mov r2, #0x0 @@ -2427,7 +2427,7 @@ FUN_02012870: ; 0x02012870 add r4, r0, #0x0 bl FUN_0201291C add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} thumb_func_start FUN_02012880 @@ -2552,7 +2552,7 @@ FUN_02012944: ; 0x02012944 add r5, r1, #0x0 mov r1, #0xc add r4, r2, #0x0 - bl FUN_02016998 + bl AllocFromHeap mov r1, #0x0 strb r1, [r0, #0x0] strb r1, [r0, #0x1] @@ -2580,7 +2580,7 @@ FUN_02012974: ; 0x02012974 bl ErrorHandling _0201297E: add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} .balign 4 @@ -2662,7 +2662,7 @@ FUN_02012A00: ; 0x02012A00 push {r3-r5, lr} ldr r1, _02012A2C ; =0x0000079C add r5, r0, #0x0 - bl FUN_02016998 + bl AllocFromHeap ldr r2, _02012A2C ; =0x0000079C mov r1, #0x0 add r4, r0, #0x0 @@ -2790,7 +2790,7 @@ FUN_02012B00: ; 0x02012B00 ldr r0, [r4, r0] bl FUN_02012974 add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} .balign 4 diff --git a/arm9/asm/unk_02012CC8.s b/arm9/asm/unk_02012CC8.s index e4b695b1..8cc86c3a 100644 --- a/arm9/asm/unk_02012CC8.s +++ b/arm9/asm/unk_02012CC8.s @@ -93,7 +93,7 @@ _02012CFA: _02012D04: ldr r0, [sp, #0x2c] mov r1, #0xdc - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0x0 bne _02012D14 bl ErrorHandling @@ -267,7 +267,7 @@ _02012E60: ldr r0, [r5, #0x4] cmp r0, #0x0 beq _02012E78 - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x0 str r0, [r5, #0x4] _02012E78: @@ -294,7 +294,7 @@ _02012E94: bl FUN_0201EB70 _02012E9E: add r0, r5, #0x0 - bl FUN_02016A18 + bl FreeToHeap pop {r3-r7, pc} nop _02012EA8: .word UNK_021C4858 @@ -736,10 +736,10 @@ _02013188: .word UNK_021C4850 thumb_func_start FUN_0201318C FUN_0201318C: ; 0x0201318C - ldr r3, _02013190 ; =LoadFromNarc_2 + ldr r3, _02013190 ; =AllocAndReadWholeNarcMemberByIdPair bx r3 .balign 4 -_02013190: .word LoadFromNarc_2 +_02013190: .word AllocAndReadWholeNarcMemberByIdPair thumb_func_start FUN_02013194 FUN_02013194: ; 0x02013194 @@ -1493,7 +1493,7 @@ FUN_02013690: ; 0x02013690 push {r3-r5, lr} mov r1, #0x8 add r5, r0, #0x0 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0x0 beq _020136B2 ldr r0, _020136B8 ; =0x0001020F @@ -1526,7 +1526,7 @@ _020136CA: bl FUN_02021A20 _020136D8: add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap _020136DE: pop {r4, pc} diff --git a/arm9/asm/unk_020139D8.s b/arm9/asm/unk_020139D8.s index 26303fbb..3fbf2466 100644 --- a/arm9/asm/unk_020139D8.s +++ b/arm9/asm/unk_020139D8.s @@ -103,7 +103,7 @@ FUN_020139D8: ; 0x020139D8 push {r3-r7, lr} mov r1, #0x30 add r6, r0, #0x0 - bl FUN_02016998 + bl AllocFromHeap ldr r4, _02013A0C ; =UNK_020ED5C0 str r0, [sp, #0x0] mov r7, #0x0 @@ -141,7 +141,7 @@ _02013A18: cmp r4, #0xb blt _02013A18 add r0, r6, #0x0 - bl FUN_02016A18 + bl FreeToHeap pop {r4-r6, pc} .balign 4 diff --git a/arm9/asm/unk_02013CD4.s b/arm9/asm/unk_02013CD4.s index e50217ba..7f278032 100644 --- a/arm9/asm/unk_02013CD4.s +++ b/arm9/asm/unk_02013CD4.s @@ -15,7 +15,7 @@ FUN_02013CD4: ; 0x02013CD4 add r5, r0, #0x0 ldr r0, [r5, #0xc] mov r1, #0x18 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0x0 bne _02013CE8 bl ErrorHandling @@ -65,13 +65,13 @@ _02013D36: bl ErrorHandling _02013D40: ldr r0, [r4, #0x0] - bl FUN_02016A18 + bl FreeToHeap ldr r0, [r4, #0x8] - bl FUN_02016A18 + bl FreeToHeap ldr r0, [r4, #0x10] - bl FUN_02016A18 + bl FreeToHeap add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} .balign 4 @@ -423,7 +423,7 @@ FUN_02013F68: ; 0x02013F68 add r6, r0, #0x0 add r0, r1, #0x0 lsl r1, r6, #0x6 - bl FUN_02016998 + bl AllocFromHeap add r7, r0, #0x0 bne _02013F7C bl ErrorHandling @@ -451,7 +451,7 @@ FUN_02013F98: ; 0x02013F98 add r0, r1, #0x0 mov r1, #0x28 mul r1, r6 - bl FUN_02016998 + bl AllocFromHeap add r7, r0, #0x0 bne _02013FAE bl ErrorHandling @@ -478,7 +478,7 @@ FUN_02013FC8: ; 0x02013FC8 add r0, r1, #0x0 mov r1, #0x18 mul r1, r6 - bl FUN_02016998 + bl AllocFromHeap add r7, r0, #0x0 bne _02013FDE bl ErrorHandling diff --git a/arm9/asm/unk_020144FC.s b/arm9/asm/unk_020144FC.s index 85770241..00a3066d 100644 --- a/arm9/asm/unk_020144FC.s +++ b/arm9/asm/unk_020144FC.s @@ -24,7 +24,7 @@ FUN_02014518: ; 0x02014518 push {r3-r7, lr} mov r1, #0x78 add r7, r0, #0x0 - bl FUN_02016998 + bl AllocFromHeap mov r1, #0x0 mov r2, #0x78 add r6, r0, #0x0 @@ -71,7 +71,7 @@ _0201456E: ldr r0, [r6, #0x0] bl FUN_0200A8B8 add r0, r6, #0x0 - bl FUN_02016A18 + bl FreeToHeap pop {r4-r6, pc} thumb_func_start FUN_02014588 diff --git a/arm9/asm/unk_02014590.s b/arm9/asm/unk_02014590.s index ac4ca5c8..ae4eadbd 100644 --- a/arm9/asm/unk_02014590.s +++ b/arm9/asm/unk_02014590.s @@ -8,7 +8,7 @@ FUN_02014590: ; 0x02014590 push {r3-r5, lr} add r5, r0, #0x0 mov r1, #0x9c - bl FUN_02016998 + bl AllocFromHeap add r1, r5, #0x0 add r4, r0, #0x0 bl FUN_020146F0 @@ -30,7 +30,7 @@ FUN_020145A8: ; 0x020145A8 bl FUN_020146C4 _020145BE: add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} .balign 4 @@ -567,7 +567,7 @@ FUN_02014970: ; 0x02014970 add r5, r6, #0x0 _020149B4: ldr r0, [r5, #0x8] - bl FUN_02016A18 + bl FreeToHeap add r4, r4, #0x1 add r5, r5, #0x4 cmp r4, #0x4 @@ -656,7 +656,7 @@ FUN_02014A3C: ; 0x02014A3C mov r1, #0x14 add r5, r2, #0x0 add r6, r3, #0x0 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0x0 add r2, r4, #0x0 mov r1, #0x14 @@ -696,7 +696,7 @@ FUN_02014A8C: ; 0x02014A8C mov r1, #0x14 add r5, r2, #0x0 add r6, r3, #0x0 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0x0 add r2, r4, #0x0 mov r1, #0x14 @@ -746,9 +746,9 @@ FUN_02014AD4: ; 0x02014AD4 add r0, r5, #0x0 bl FUN_0200CAB4 ldr r0, [r4, #0x8] - bl FUN_02016A18 + bl FreeToHeap add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap pop {r3-r5, pc} .balign 4 @@ -782,9 +782,9 @@ _02014B44: add r0, r5, #0x0 bl FUN_0200CAB4 ldr r0, [r4, #0x4] - bl FUN_02016A18 + bl FreeToHeap add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap pop {r3-r5, pc} thumb_func_start FUN_02014B58 diff --git a/arm9/asm/unk_02014BF4.s b/arm9/asm/unk_02014BF4.s index 8c766384..20e8fa45 100644 --- a/arm9/asm/unk_02014BF4.s +++ b/arm9/asm/unk_02014BF4.s @@ -80,7 +80,7 @@ FUN_02014BF4: ; 0x02014BF4 mov r1, #0xc add r5, r0, #0x0 add r6, r2, #0x0 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0x0 strb r6, [r4, #0x8] mov r0, #0x1d @@ -91,7 +91,7 @@ FUN_02014BF4: ; 0x02014BF4 add r0, r5, #0x0 add r1, r6, #0x0 str r5, [r4, #0x4] - bl FUN_02016998 + bl AllocFromHeap mov r1, #0x0 add r2, r6, #0x0 str r0, [r4, #0x0] @@ -104,9 +104,9 @@ FUN_02014C28: ; 0x02014C28 push {r4, lr} add r4, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_02016A18 + bl FreeToHeap add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} .balign 4 @@ -193,7 +193,7 @@ _02014CC2: add r1, r1, r4 ldr r1, [r1, #0x14] mov r0, #0x5e - bl FUN_02006528 + bl AllocAtEndAndReadWholeNarcMemberByIdPair ldr r1, [r5, #0x0] mov r2, #0x0 add r1, r1, r4 @@ -319,7 +319,7 @@ FUN_02014D9C: ; 0x02014D9C ldr r0, [r5, #0x0] add r0, r0, r4 ldr r0, [r0, #0x8] - bl FUN_02016A18 + bl FreeToHeap _02014DD6: pop {r3-r5, pc} @@ -350,7 +350,7 @@ _02014DF0: mov r0, #0x0 str r0, [r4, #0x4] ldr r0, [r4, #0x8] - bl FUN_02016A18 + bl FreeToHeap _02014E0E: pop {r3-r5, pc} diff --git a/arm9/asm/unk_02015EA0.s b/arm9/asm/unk_02015EA0.s index 77270feb..3a876cb5 100644 --- a/arm9/asm/unk_02015EA0.s +++ b/arm9/asm/unk_02015EA0.s @@ -411,7 +411,7 @@ FUN_020161A4: ; 0x020161A4 sub r5, r1, r0 add r0, r6, #0x0 add r1, r5, #0x0 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0x0 beq _020161E8 add r0, sp, #0x0 @@ -593,7 +593,7 @@ _02016306: ldr r0, [r5, #0x0] cmp r0, #0x0 beq _02016314 - bl FUN_02016A18 + bl FreeToHeap str r6, [r5, #0x0] str r6, [r5, #0x4] _02016314: @@ -649,7 +649,7 @@ _02016362: sub r6, r1, r0 add r0, r4, #0x0 add r1, r6, #0x0 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0x0 beq _0201639C add r0, sp, #0x20 @@ -659,7 +659,7 @@ _02016362: cmp r6, r0 beq _0201639C add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap mov r4, #0x0 _0201639C: add r0, sp, #0x20 diff --git a/arm9/asm/unk_020166C8.s b/arm9/asm/unk_020166C8.s index 8278f31e..87453775 100644 --- a/arm9/asm/unk_020166C8.s +++ b/arm9/asm/unk_020166C8.s @@ -397,8 +397,8 @@ FUN_02016988: ; 0x02016988 _02016996: pop {r3, pc} - thumb_func_start FUN_02016998 -FUN_02016998: ; 0x02016998 + thumb_func_start AllocFromHeap +AllocFromHeap: ; 0x02016998 push {r3-r5, lr} add r5, r0, #0x0 ldr r0, _020169D4 ; =UNK_021C4D28 @@ -433,8 +433,8 @@ _020169D0: .balign 4 _020169D4: .word UNK_021C4D28 - thumb_func_start FUN_020169D8 -FUN_020169D8: ; 0x020169D8 + thumb_func_start AllocFromHeapAtEnd +AllocFromHeapAtEnd: ; 0x020169D8 push {r3-r5, lr} ldr r2, _02016A14 ; =UNK_021C4D28 add r5, r0, #0x0 @@ -469,8 +469,8 @@ _02016A10: .balign 4 _02016A14: .word UNK_021C4D28 - thumb_func_start FUN_02016A18 -FUN_02016A18: ; 0x02016A18 + thumb_func_start FreeToHeap +FreeToHeap: ; 0x02016A18 push {r3-r7, lr} add r6, r0, #0x0 sub r0, r6, #0x4 diff --git a/arm9/asm/unk_02016B94.s b/arm9/asm/unk_02016B94.s index 4a3448e8..7950cfbe 100644 --- a/arm9/asm/unk_02016B94.s +++ b/arm9/asm/unk_02016B94.s @@ -51,7 +51,7 @@ FUN_02016B94: ; 0x02016B94 mov r1, #0x5a lsl r1, r1, #0x2 add r5, r0, #0x0 - bl FUN_02016998 + bl AllocFromHeap mov r2, #0x5a mov r1, #0x0 lsl r2, r2, #0x2 @@ -701,7 +701,7 @@ _0201705A: ldr r6, [sp, #0x0] ldr r0, [r0, #0x0] add r6, #0x8 - bl FUN_02016998 + bl AllocFromHeap str r0, [r6, r5] ldr r1, [r6, r5] ldr r2, [r4, #0x8] @@ -1828,7 +1828,7 @@ FUN_020178A0: ; 0x020178A0 ldr r0, [r4, r5] cmp r0, #0x0 beq _020178BA - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x0 str r0, [r4, r5] _020178BA: @@ -2443,7 +2443,7 @@ _02017D26: lsr r7, r0, #0x8 ldr r0, [r5, #0x0] add r1, r7, #0x0 - bl FUN_020169D8 + bl AllocFromHeapAtEnd add r5, r0, #0x0 ldr r2, [sp, #0x0] add r0, r6, #0x0 @@ -2456,7 +2456,7 @@ _02017D26: add r3, r7, #0x0 bl FUN_02017D68 add r0, r5, #0x0 - bl FUN_02016A18 + bl FreeToHeap add sp, #0x8 pop {r3-r7, pc} _02017D56: @@ -2597,7 +2597,7 @@ FUN_02017E40: ; 0x02017E40 ldr r0, [r0, #0x0] lsr r4, r1, #0x8 add r1, r4, #0x0 - bl FUN_020169D8 + bl AllocFromHeapAtEnd add r6, r0, #0x0 ldr r2, [sp, #0x0] add r0, r5, #0x0 @@ -2609,7 +2609,7 @@ FUN_02017E40: ; 0x02017E40 add r3, r4, #0x0 bl FUN_02017E84 add r0, r6, #0x0 - bl FUN_02016A18 + bl FreeToHeap pop {r3-r7, pc} _02017E78: ldr r2, [sp, #0x18] @@ -2704,7 +2704,7 @@ FUN_02017F18: ; 0x02017F18 add r0, r3, #0x0 add r7, r2, #0x0 str r3, [sp, #0x0] - bl FUN_020169D8 + bl AllocFromHeapAtEnd add r4, r0, #0x0 mov r1, #0x0 add r2, r5, #0x0 @@ -2734,7 +2734,7 @@ FUN_02017F48: ; 0x02017F48 add r5, r2, #0x0 mul r1, r3 str r1, [sp, #0x0] - bl FUN_020169D8 + bl AllocFromHeapAtEnd str r0, [sp, #0x4] ldrb r0, [r4, r6] cmp r0, #0x20 @@ -2770,7 +2770,7 @@ _02017F8C: lsr r0, r0, #0x18 bl FUN_02017E84 ldr r0, [sp, #0x4] - bl FUN_02016A18 + bl FreeToHeap add sp, #0x8 pop {r3-r7, pc} @@ -3971,7 +3971,7 @@ FUN_02018848: ; 0x02018848 add r0, r3, #0x0 lsl r1, r5, #0x1 add r7, r2, #0x0 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0x0 add r0, r6, #0x0 add r1, r5, #0x0 @@ -5027,7 +5027,7 @@ FUN_02018FF4: ; 0x02018FF4 push {r4-r6, lr} add r5, r1, #0x0 lsl r1, r5, #0x4 - bl FUN_02016998 + bl AllocFromHeap add r6, r0, #0x0 mov r4, #0x0 cmp r5, #0x0 @@ -5110,7 +5110,7 @@ FUN_02019064: ; 0x02019064 mul r3, r1 add r1, r2, #0x0 mul r1, r3 - bl FUN_02016998 + bl AllocFromHeap add r1, r0, #0x0 beq _020190E0 str r5, [r4, #0x0] @@ -5175,7 +5175,7 @@ FUN_020190EC: ; 0x020190EC str r0, [sp, #0x4] ldr r0, [r5, #0x0] ldr r1, [sp, #0x4] - bl FUN_02016998 + bl AllocFromHeap ldr r1, [sp, #0x24] add r7, r0, #0x0 lsl r2, r1, #0x4 @@ -5238,7 +5238,7 @@ FUN_02019178: ; 0x02019178 push {r4, lr} add r4, r0, #0x0 ldr r0, [r4, #0xc] - bl FUN_02016A18 + bl FreeToHeap mov r2, #0x0 str r2, [r4, #0x0] mov r0, #0xff @@ -5271,7 +5271,7 @@ _020191B0: ldr r0, [r0, #0xc] cmp r0, #0x0 beq _020191BE - bl FUN_02016A18 + bl FreeToHeap _020191BE: add r0, r4, #0x1 lsl r0, r0, #0x10 @@ -5280,7 +5280,7 @@ _020191BE: blt _020191B0 _020191C8: add r0, r5, #0x0 - bl FUN_02016A18 + bl FreeToHeap pop {r4-r6, pc} thumb_func_start FUN_020191D0 @@ -8412,7 +8412,7 @@ _0201A8A2: blt _0201A808 _0201A8B6: ldr r0, [sp, #0x1ec] - bl FUN_02016A18 + bl FreeToHeap thumb_func_start FUN_0201A8BC FUN_0201A8BC: ; 0x0201A8BC @@ -9455,7 +9455,7 @@ _0201AFE4: mov r1, #0x40 str r0, [sp, #0xc] ldr r0, [r7, #0x0] - bl FUN_020169D8 + bl AllocFromHeapAtEnd add r4, r0, #0x0 lsl r0, r6, #0x1 ldr r1, [sp, #0xc] @@ -9498,7 +9498,7 @@ _0201B042: add r0, r0, r1 ldrb r5, [r4, r0] add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap ldr r0, [sp, #0x30] ldrh r2, [r0, #0x0] mov r0, #0x1 @@ -9515,7 +9515,7 @@ _0201B096: ldr r0, [r7, #0x0] ldr r4, [r4, r5] mov r1, #0x40 - bl FUN_020169D8 + bl AllocFromHeapAtEnd lsl r6, r6, #0x1 ldrh r1, [r4, r6] add r5, r0, #0x0 @@ -9540,7 +9540,7 @@ _0201B096: add r0, r0, r1 ldrb r4, [r5, r0] add r0, r5, #0x0 - bl FUN_02016A18 + bl FreeToHeap b _0201B0F4 _0201B0E0: ldr r1, [r4, r5] @@ -9584,7 +9584,7 @@ FUN_0201B118: ; 0x0201B118 beq _0201B1A4 ldr r0, [r0, #0x0] mov r1, #0x40 - bl FUN_020169D8 + bl AllocFromHeapAtEnd add r4, r0, #0x0 ldr r0, [sp, #0x0] mov r1, #0x1 @@ -9647,7 +9647,7 @@ _0201B17E: bl memcpy _0201B19E: add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap _0201B1A4: pop {r3-r7, pc} .balign 4 diff --git a/arm9/asm/unk_0201BCBC.s b/arm9/asm/unk_0201BCBC.s index effce76e..10ab541b 100644 --- a/arm9/asm/unk_0201BCBC.s +++ b/arm9/asm/unk_0201BCBC.s @@ -86,7 +86,7 @@ _0201BD16: beq _0201BD32 bl FUN_0201C238 add r0, r5, #0x0 - bl FUN_02016A18 + bl FreeToHeap _0201BD32: ldr r0, [r6, r4] bl FUN_0200CAB4 @@ -297,7 +297,7 @@ FUN_0201BE98: ; 0x0201BE98 _0201BEAC: mov r0, #0x0 mov r1, #0x30 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0x0 mov r1, #0x1 add r0, #0x23 @@ -433,7 +433,7 @@ _0201BFBE: add r0, r4, #0x0 bl FUN_0201C238 add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x8 pop {r3-r7, pc} nop @@ -701,7 +701,7 @@ FUN_0201C1B0: ; 0x0201C1B0 mov r1, #0x6 mov r0, #0x0 lsl r1, r1, #0x8 - bl FUN_02016998 + bl AllocFromHeap mov r2, #0x0 add r5, r0, #0x0 str r2, [sp, #0x0] @@ -717,7 +717,7 @@ FUN_0201C1B0: ; 0x0201C1B0 lsl r2, r2, #0x8 bl MIi_CpuCopy32 add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap add r0, r5, #0x0 add sp, #0x8 pop {r3-r5, pc} @@ -769,7 +769,7 @@ FUN_0201C238: ; 0x0201C238 ldr r0, [r4, #0x2c] cmp r0, #0x0 beq _0201C24A - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x0 str r0, [r4, #0x2c] _0201C24A: diff --git a/arm9/asm/unk_0201C24C.s b/arm9/asm/unk_0201C24C.s index 9016fd72..36817113 100644 --- a/arm9/asm/unk_0201C24C.s +++ b/arm9/asm/unk_0201C24C.s @@ -22,7 +22,7 @@ FUN_0201C24C: ; 0x0201C24C _0201C25E: add r0, r4, #0x0 mov r1, #0xc - bl FUN_02016998 + bl AllocFromHeap ldr r1, _0201C298 ; =UNK_021C5934 cmp r0, #0x0 str r0, [r1, #0x0] @@ -31,7 +31,7 @@ _0201C25E: _0201C272: add r0, r4, #0x0 lsl r1, r5, #0x4 - bl FUN_02016998 + bl AllocFromHeap ldr r1, _0201C298 ; =UNK_021C5934 ldr r2, [r1, #0x0] str r0, [r2, #0x8] @@ -60,10 +60,10 @@ _0201C2AA: ldr r0, _0201C2C4 ; =UNK_021C5934 ldr r0, [r0, #0x0] ldr r0, [r0, #0x8] - bl FUN_02016A18 + bl FreeToHeap ldr r0, _0201C2C4 ; =UNK_021C5934 ldr r0, [r0, #0x0] - bl FUN_02016A18 + bl FreeToHeap ldr r0, _0201C2C4 ; =UNK_021C5934 mov r1, #0x0 str r1, [r0, #0x0] @@ -131,7 +131,7 @@ FUN_0201C328: ; 0x0201C328 add r0, r1, #0x0 mov r1, #0x30 mul r1, r4 - bl FUN_02016998 + bl AllocFromHeap ldr r2, _0201C344 ; =FUN_0201C358 add r1, r4, #0x0 add r5, r0, #0x0 @@ -150,10 +150,10 @@ _0201C34C: .word FUN_020B442C thumb_func_start FUN_0201C350 FUN_0201C350: ; 0x0201C350 - ldr r3, _0201C354 ; =FUN_02016A18 + ldr r3, _0201C354 ; =FreeToHeap bx r3 .balign 4 -_0201C354: .word FUN_02016A18 +_0201C354: .word FreeToHeap thumb_func_start FUN_0201C358 FUN_0201C358: ; 0x0201C358 diff --git a/arm9/asm/unk_0201C360.s b/arm9/asm/unk_0201C360.s index 690a7ddd..5f8ccb52 100644 --- a/arm9/asm/unk_0201C360.s +++ b/arm9/asm/unk_0201C360.s @@ -10,12 +10,12 @@ FUN_0201C360: ; 0x0201C360 add r5, r0, #0x0 add r0, r6, #0x0 mov r1, #0x8 - bl FUN_02016998 + bl AllocFromHeap mov r1, #0x14 add r4, r0, #0x0 add r0, r6, #0x0 mul r1, r5 - bl FUN_02016998 + bl AllocFromHeap str r0, [r4, #0x0] mov r6, #0x0 str r5, [r4, #0x4] @@ -41,9 +41,9 @@ FUN_0201C39C: ; 0x0201C39C add r4, r0, #0x0 bl FUN_0201C414 ldr r0, [r4, #0x0] - bl FUN_02016A18 + bl FreeToHeap add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} .balign 4 diff --git a/arm9/asm/unk_0201D040.s b/arm9/asm/unk_0201D040.s index edc44042..ba8c7b75 100644 --- a/arm9/asm/unk_0201D040.s +++ b/arm9/asm/unk_0201D040.s @@ -38,7 +38,7 @@ FUN_0201D060: ; 0x0201D060 bne _0201D11A ldr r0, [r5, #0xc] mov r1, #0x3c - bl FUN_02016998 + bl AllocFromHeap add r1, r0, #0x0 ldr r0, _0201D120 ; =UNK_021C5994 mov r2, #0x3c @@ -54,7 +54,7 @@ FUN_0201D060: ; 0x0201D060 ldr r2, [r1, #0x4] mov r1, #0x54 mul r1, r2 - bl FUN_02016998 + bl AllocFromHeap ldr r7, _0201D120 ; =UNK_021C5994 mov r6, #0x0 ldr r1, [r7, #0x0] @@ -138,10 +138,10 @@ FUN_0201D12C: ; 0x0201D12C ldr r0, _0201D164 ; =UNK_021C5994 ldr r0, [r0, #0x0] ldr r0, [r0, #0x0] - bl FUN_02016A18 + bl FreeToHeap ldr r0, _0201D164 ; =UNK_021C5994 ldr r0, [r0, #0x0] - bl FUN_02016A18 + bl FreeToHeap ldr r0, _0201D164 ; =UNK_021C5994 mov r1, #0x0 str r1, [r0, #0x0] @@ -1664,14 +1664,14 @@ FUN_0201DC58: ; 0x0201DC58 ldr r0, [r0, #0x34] cmp r0, #0x0 beq _0201DC76 - bl FUN_02016A18 + bl FreeToHeap _0201DC76: ldr r0, _0201DCBC ; =UNK_021C5994 ldr r0, [r0, #0x0] ldr r0, [r0, #0x38] cmp r0, #0x0 beq _0201DC84 - bl FUN_02016A18 + bl FreeToHeap _0201DC84: ldr r0, _0201DCBC ; =UNK_021C5994 ldr r0, [r0, #0x0] @@ -1680,7 +1680,7 @@ _0201DC84: beq _0201DC9C add r0, r6, #0x0 lsr r1, r5, #0x3 - bl FUN_02016998 + bl AllocFromHeap ldr r1, _0201DCBC ; =UNK_021C5994 ldr r1, [r1, #0x0] str r0, [r1, #0x34] @@ -1692,7 +1692,7 @@ _0201DC9C: beq _0201DCB4 add r0, r6, #0x0 lsr r1, r4, #0x3 - bl FUN_02016998 + bl AllocFromHeap ldr r1, _0201DCBC ; =UNK_021C5994 ldr r1, [r1, #0x0] str r0, [r1, #0x38] @@ -1714,12 +1714,12 @@ FUN_0201DCC0: ; 0x0201DCC0 bne _0201DCDA mov r1, #0x0 str r1, [r2, #0x24] - bl FUN_02016A18 + bl FreeToHeap pop {r3, pc} _0201DCDA: mov r1, #0x0 str r1, [r2, #0x28] - bl FUN_02016A18 + bl FreeToHeap _0201DCE2: pop {r3, pc} .balign 4 diff --git a/arm9/asm/unk_0201E00C.s b/arm9/asm/unk_0201E00C.s index 094f7d2d..744cbe95 100644 --- a/arm9/asm/unk_0201E00C.s +++ b/arm9/asm/unk_0201E00C.s @@ -20,7 +20,7 @@ FUN_0201E00C: ; 0x0201E00C bne _0201E060 add r0, r4, #0x0 mov r1, #0x28 - bl FUN_02016998 + bl AllocFromHeap add r1, r0, #0x0 ldr r0, _0201E064 ; =UNK_021C5998 mov r2, #0x28 @@ -33,7 +33,7 @@ FUN_0201E00C: ; 0x0201E00C mul r1, r6 str r6, [r0, #0x4] add r0, r4, #0x0 - bl FUN_02016998 + bl AllocFromHeap ldr r7, _0201E064 ; =UNK_021C5998 mov r4, #0x0 ldr r1, [r7, #0x0] @@ -89,10 +89,10 @@ FUN_0201E08C: ; 0x0201E08C ldr r0, _0201E0B4 ; =UNK_021C5998 ldr r0, [r0, #0x0] ldr r0, [r0, #0x0] - bl FUN_02016A18 + bl FreeToHeap ldr r0, _0201E0B4 ; =UNK_021C5998 ldr r0, [r0, #0x0] - bl FUN_02016A18 + bl FreeToHeap ldr r0, _0201E0B4 ; =UNK_021C5998 mov r1, #0x0 str r1, [r0, #0x0] diff --git a/arm9/asm/unk_0201E7D8.s b/arm9/asm/unk_0201E7D8.s index 717734d1..a70f909d 100644 --- a/arm9/asm/unk_0201E7D8.s +++ b/arm9/asm/unk_0201E7D8.s @@ -419,12 +419,12 @@ FUN_0201EABC: ; 0x0201EABC _0201EADA: ldr r0, [sp, #0x0] mov r1, #0x24 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0x0 mov r1, #0xc ldr r0, [sp, #0x0] mul r1, r5 - bl FUN_02016998 + bl AllocFromHeap mov r1, #0x0 str r0, [r4, #0x20] cmp r5, #0x0 @@ -485,9 +485,9 @@ FUN_0201EB48: ; 0x0201EB48 cmp r0, #0x0 beq _0201EB62 ldr r0, [r0, #0x20] - bl FUN_02016A18 + bl FreeToHeap ldr r0, [r4, #0x64] - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x0 str r0, [r4, #0x64] _0201EB62: @@ -495,18 +495,18 @@ _0201EB62: thumb_func_start FUN_0201EB64 FUN_0201EB64: ; 0x0201EB64 - ldr r3, _0201EB6C ; =FUN_02016998 + ldr r3, _0201EB6C ; =AllocFromHeap mov r1, #0x68 bx r3 nop -_0201EB6C: .word FUN_02016998 +_0201EB6C: .word AllocFromHeap thumb_func_start FUN_0201EB70 FUN_0201EB70: ; 0x0201EB70 - ldr r3, _0201EB74 ; =FUN_02016A18 + ldr r3, _0201EB74 ; =FreeToHeap bx r3 .balign 4 -_0201EB74: .word FUN_02016A18 +_0201EB74: .word FreeToHeap thumb_func_start FUN_0201EB78 FUN_0201EB78: ; 0x0201EB78 diff --git a/arm9/asm/unk_0201F06C.s b/arm9/asm/unk_0201F06C.s index c6f59e94..e48364ec 100644 --- a/arm9/asm/unk_0201F06C.s +++ b/arm9/asm/unk_0201F06C.s @@ -126,7 +126,7 @@ _0201F112: mov r1, #0xd4 add r0, r4, #0x0 mul r1, r6 - bl FUN_02016998 + bl AllocFromHeap ldr r7, _0201F13C ; =UNK_021C59A8 mov r4, #0x0 str r0, [r7, #0x0] @@ -168,7 +168,7 @@ _0201F14E: _0201F160: ldr r0, _0201F174 ; =UNK_021C59A8 ldr r0, [r0, #0x0] - bl FUN_02016A18 + bl FreeToHeap ldr r0, _0201F174 ; =UNK_021C59A8 mov r1, #0x0 str r1, [r0, #0x0] @@ -230,7 +230,7 @@ _0201F1C8: mov r1, #0xb8 ldr r0, [r5, #0x4] mul r1, r2 - bl FUN_02016998 + bl AllocFromHeap str r0, [r4, #0x4] ldr r0, [r5, #0x0] str r0, [r4, #0x8] @@ -248,7 +248,7 @@ _0201F1C8: ldr r1, [r5, #0x0] ldr r0, [r5, #0x4] lsl r1, r1, #0x2 - bl FUN_02016998 + bl AllocFromHeap add r1, r4, #0x0 add r1, #0xc4 str r0, [r1, #0x0] @@ -256,7 +256,7 @@ _0201F1C8: bl FUN_0201FABC ldr r0, [r5, #0x4] mov r1, #0x10 - bl FUN_02016998 + bl AllocFromHeap add r1, r4, #0x0 add r1, #0xcc str r0, [r1, #0x0] @@ -289,15 +289,15 @@ _0201F24A: beq _0201F27E bl FUN_0201F284 ldr r0, [r4, #0x4] - bl FUN_02016A18 + bl FreeToHeap add r0, r4, #0x0 add r0, #0xc4 ldr r0, [r0, #0x0] - bl FUN_02016A18 + bl FreeToHeap add r0, r4, #0x0 add r0, #0xcc ldr r0, [r0, #0x0] - bl FUN_02016A18 + bl FreeToHeap add r0, r4, #0x0 add r0, #0xd0 ldr r0, [r0, #0x0] @@ -1775,7 +1775,7 @@ _0201FCC4: mov r1, #0x49 ldr r0, [r5, #0x8] lsl r1, r1, #0x2 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0x0 bne _0201FCD6 bl ErrorHandling @@ -1787,7 +1787,7 @@ _0201FCD6: lsl r1, r2, #0x6 add r1, r2, r1 lsl r1, r1, #0x2 - bl FUN_02016998 + bl AllocFromHeap str r0, [r4, #0x0] cmp r0, #0x0 bne _0201FCF4 @@ -1798,7 +1798,7 @@ _0201FCF4: ldr r1, [r5, #0x0] ldr r0, [r5, #0x8] lsl r1, r1, #0x2 - bl FUN_02016998 + bl AllocFromHeap str r0, [r4, #0x8] cmp r0, #0x0 bne _0201FD0C @@ -1856,15 +1856,15 @@ _0201FD6C: mov r0, #0x46 lsl r0, r0, #0x2 ldr r0, [r4, r0] - bl FUN_02016A18 + bl FreeToHeap ldr r0, [r4, #0x8] - bl FUN_02016A18 + bl FreeToHeap ldr r0, [r4, #0x0] - bl FUN_02016A18 + bl FreeToHeap add r0, r4, #0x0 bl FUN_0201FE44 add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x1 pop {r4, pc} .balign 4 @@ -2211,12 +2211,12 @@ _0202000E: ldr r0, [r4, #0x70] cmp r0, #0x0 beq _02020026 - bl FUN_02016A18 + bl FreeToHeap _02020026: ldr r0, [r4, #0x74] cmp r0, #0x0 beq _02020030 - bl FUN_02016A18 + bl FreeToHeap _02020030: add r0, r5, #0x0 mov r1, #0x0 @@ -2792,7 +2792,7 @@ FUN_020203CC: ; 0x020203CC push {r4, lr} mov r1, #0x1 lsl r1, r1, #0xa - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0x0 mov r0, #0xb mov r2, #0x1 @@ -2810,7 +2810,7 @@ FUN_020203CC: ; 0x020203CC lsl r2, r2, #0xa bl GX_LoadOAM add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} thumb_func_start FUN_02020404 @@ -2818,7 +2818,7 @@ FUN_02020404: ; 0x02020404 push {r4, lr} mov r1, #0x1 lsl r1, r1, #0xa - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0x0 mov r0, #0xb mov r2, #0x1 @@ -2832,7 +2832,7 @@ FUN_02020404: ; 0x02020404 lsl r2, r2, #0xa bl GXS_LoadOAM add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} .balign 4 @@ -3040,12 +3040,12 @@ FUN_02020588: ; 0x02020588 mov r1, #0x28 add r0, r7, #0x0 mul r1, r6 - bl FUN_02016998 + bl AllocFromHeap mov r1, #0x54 str r0, [r4, #0x70] add r0, r7, #0x0 mul r1, r6 - bl FUN_02016998 + bl AllocFromHeap str r0, [r4, #0x74] ldr r0, [r4, #0x4] add r3, r6, #0x0 diff --git a/arm9/asm/unk_02020C44.s b/arm9/asm/unk_02020C44.s index ea2fb7bf..c1870c5a 100644 --- a/arm9/asm/unk_02020C44.s +++ b/arm9/asm/unk_02020C44.s @@ -15,14 +15,14 @@ FUN_02020C44: ; 0x02020C44 add r7, r0, #0x0 add r0, r4, #0x0 mov r1, #0xc - bl FUN_02016998 + bl AllocFromHeap add r6, r0, #0x0 bne _02020C5A bl ErrorHandling _02020C5A: add r0, r4, #0x0 lsl r1, r7, #0x3 - bl FUN_02016998 + bl AllocFromHeap str r0, [r6, #0x0] cmp r0, #0x0 bne _02020C6C @@ -58,9 +58,9 @@ _02020C9A: add r0, r4, #0x0 bl FUN_02020D9C ldr r0, [r4, #0x0] - bl FUN_02016A18 + bl FreeToHeap add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} .balign 4 @@ -176,7 +176,7 @@ _02020D7E: ldr r0, [r4, #0x4] cmp r0, #0x0 beq _02020D8C - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x0 str r0, [r4, #0x4] _02020D8C: @@ -279,7 +279,7 @@ _02020E2A: ldr r0, [r5, #0x4] cmp r0, #0x0 beq _02020E34 - bl FUN_02016A18 + bl FreeToHeap _02020E34: str r4, [r5, #0x4] pop {r3-r5, pc} @@ -347,7 +347,7 @@ FUN_02020E90: ; 0x02020E90 add r6, r0, #0x0 add r0, r4, #0x0 mov r1, #0x8 - bl FUN_02016998 + bl AllocFromHeap add r7, r0, #0x0 add r0, r6, #0x0 add r1, r4, #0x0 @@ -356,7 +356,7 @@ FUN_02020E90: ; 0x02020E90 str r0, [r7, #0x0] add r0, r4, #0x0 mul r1, r6 - bl FUN_02016998 + bl AllocFromHeap mov r4, #0x0 str r0, [r7, #0x4] cmp r6, #0x0 @@ -387,9 +387,9 @@ _02020EDE: ldr r0, [r4, #0x0] bl FUN_02020C90 ldr r0, [r4, #0x4] - bl FUN_02016A18 + bl FreeToHeap add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} thumb_func_start FUN_02020EF8 @@ -475,7 +475,7 @@ _02020F82: cmp r0, #0x0 bne _02020F98 ldr r0, [r4, #0x10] - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x0 strh r0, [r4, #0x16] _02020F98: @@ -710,7 +710,7 @@ _0202112E: ldr r3, [r4, #0xc] bl FUN_020212E4 ldr r0, [r4, #0x10] - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x0 str r0, [r4, #0x10] mov r0, #0x1 @@ -973,7 +973,7 @@ FUN_02021310: ; 0x02021310 add r5, r0, #0x0 add r0, r4, #0x0 add r1, r5, #0x0 - bl FUN_02016998 + bl AllocFromHeap add r1, r6, #0x0 add r2, r5, #0x0 add r4, r0, #0x0 diff --git a/arm9/asm/unk_02021590.s b/arm9/asm/unk_02021590.s index db0303a1..7299e97e 100644 --- a/arm9/asm/unk_02021590.s +++ b/arm9/asm/unk_02021590.s @@ -27,7 +27,7 @@ FUN_02021590: ; 0x02021590 mov r1, #0x78 add r7, r2, #0x0 str r3, [sp, #0x4] - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0x0 beq _020215C0 ldr r1, [sp, #0x20] @@ -54,7 +54,7 @@ FUN_020215C8: ; 0x020215C8 add r0, r4, #0x0 bl FUN_020216B8 add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} .balign 4 @@ -85,7 +85,7 @@ FUN_02021600: ; 0x02021600 ldr r1, [sp, #0x18] add r4, r2, #0x0 add r6, r3, #0x0 - bl FUN_02006670 + bl NARC_ctor str r0, [r5, #0x54] cmp r0, #0x0 beq _020216A6 @@ -95,7 +95,7 @@ FUN_02021600: ; 0x02021600 add r1, r4, #0x0 mov r2, #0x0 mov r3, #0x10 - bl FUN_02006814 + bl NARC_ReadFromMember str r6, [r5, #0x6c] cmp r6, #0x0 beq _02021638 @@ -112,7 +112,7 @@ _02021638: _02021642: ldr r0, [sp, #0x18] ldr r1, [r5, #0x64] - bl FUN_02016998 + bl AllocFromHeap str r0, [r5, #0x74] ldr r0, _020216B0 ; =FUN_02021924 add r1, r4, #0x0 @@ -122,7 +122,7 @@ _02021642: ldr r0, [r5, #0x54] ldr r2, [r5, #0x60] ldr r3, [r5, #0x64] - bl FUN_02006814 + bl NARC_ReadFromMember _02021660: add r0, r5, #0x0 add r0, #0x6a @@ -175,12 +175,12 @@ FUN_020216B8: ; 0x020216B8 ldr r0, [r4, #0x74] cmp r0, #0x0 beq _020216C6 - bl FUN_02016A18 + bl FreeToHeap _020216C6: ldr r0, [r4, #0x54] cmp r0, #0x0 beq _020216D0 - bl FUN_020066F4 + bl NARC_dtor _020216D0: pop {r4, pc} .balign 4 @@ -209,7 +209,7 @@ FUN_020216EC: ; 0x020216EC mul r4, r0 add r0, r1, #0x0 add r1, r4, #0x0 - bl FUN_02016998 + bl AllocFromHeap str r0, [r5, #0x10] ldr r0, _02021718 ; =FUN_02021774 add r3, r4, #0x0 @@ -219,7 +219,7 @@ FUN_020216EC: ; 0x020216EC ldr r0, [r5, #0x54] ldr r1, [r5, #0x58] ldr r2, [r5, #0x5c] - bl FUN_02006814 + bl NARC_ReadFromMember pop {r3-r5, pc} .balign 4 _02021718: .word FUN_02021774 @@ -249,7 +249,7 @@ FUN_0202173C: ; 0x0202173C push {r4, lr} add r4, r0, #0x0 ldr r0, [r4, #0x10] - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x0 str r0, [r4, #0x10] pop {r4, pc} @@ -381,7 +381,7 @@ FUN_0202181C: ; 0x0202181C ldr r0, [r4, #0x54] ldr r1, [r4, #0x58] add r3, r6, #0x0 - bl FUN_02006814 + bl NARC_ReadFromMember ldr r0, [r4, #0x8] cmp r0, #0x3 bhi _020218C0 diff --git a/arm9/asm/unk_02021934.s b/arm9/asm/unk_02021934.s index 7d333fd8..1171e40a 100644 --- a/arm9/asm/unk_02021934.s +++ b/arm9/asm/unk_02021934.s @@ -135,7 +135,7 @@ FUN_020219F4: ; 0x020219F4 add r0, r1, #0x0 lsl r1, r4, #0x1 add r1, #0xa - bl FUN_02016998 + bl AllocFromHeap cmp r0, #0x0 beq _02021A14 ldr r1, _02021A18 ; =0xB6F8D2EC @@ -167,7 +167,7 @@ _02021A36: ldr r0, _02021A48 ; =0xB6F8D2ED str r0, [r4, #0x4] add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} nop _02021A44: .word 0xB6F8D2EC diff --git a/arm9/asm/unk_02021FF8.s b/arm9/asm/unk_02021FF8.s index 1926cbb0..150d6003 100644 --- a/arm9/asm/unk_02021FF8.s +++ b/arm9/asm/unk_02021FF8.s @@ -105,7 +105,7 @@ FUN_020220C4: ; 0x020220C4 _020220D6: ldr r0, [sp, #0x18] mov r1, #0x14 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0x0 beq _0202211C str r5, [r4, #0x0] @@ -115,7 +115,7 @@ _020220D6: str r0, [r4, #0xc] ldr r0, [sp, #0x18] lsl r1, r7, #0x2 - bl FUN_02016998 + bl AllocFromHeap str r0, [r4, #0x10] cmp r0, #0x0 beq _02022114 @@ -134,7 +134,7 @@ _02022102: b _0202211C _02022114: add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap mov r4, #0x0 _0202211C: add r0, r4, #0x0 @@ -157,9 +157,9 @@ FUN_0202212C: ; 0x0202212C bl ErrorHandling _02022136: ldr r0, [r4, #0x10] - bl FUN_02016A18 + bl FreeToHeap add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} thumb_func_start FUN_02022144 diff --git a/arm9/asm/unk_02022318.s b/arm9/asm/unk_02022318.s index 74652de5..7f8590a6 100644 --- a/arm9/asm/unk_02022318.s +++ b/arm9/asm/unk_02022318.s @@ -12,7 +12,7 @@ FUN_02022318: ; 0x02022318 add r6, r0, #0x0 add r5, r2, #0x0 str r3, [sp, #0x4] - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0x0 str r6, [r4, #0x0] bl FUN_020BB7F4 @@ -27,7 +27,7 @@ FUN_02022318: ; 0x02022318 add r6, r0, #0x0 ldr r0, [r4, #0x0] add r1, r6, #0x0 - bl FUN_02016998 + bl AllocFromHeap str r0, [r4, #0x8] mov r0, #0x1 str r0, [sp, #0x0] @@ -52,7 +52,7 @@ _0202236E: add r5, r0, #0x0 ldr r0, [r4, #0x0] add r1, r5, #0x0 - bl FUN_02016998 + bl AllocFromHeap str r0, [r4, #0x4] ldr r0, [sp, #0x20] ldr r1, [r4, #0x4] @@ -87,11 +87,11 @@ FUN_020223BC: ; 0x020223BC push {r4, lr} add r4, r0, #0x0 ldr r0, [r4, #0x4] - bl FUN_02016A18 + bl FreeToHeap ldr r0, [r4, #0x8] - bl FUN_02016A18 + bl FreeToHeap add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} thumb_func_start FUN_020223D4 diff --git a/arm9/asm/unk_020238C4.s b/arm9/asm/unk_020238C4.s index dadfd602..c443494a 100644 --- a/arm9/asm/unk_020238C4.s +++ b/arm9/asm/unk_020238C4.s @@ -69,7 +69,7 @@ FUN_02023924: ; 0x02023924 FUN_02023928: ; 0x02023928 push {r4, lr} mov r1, #0x20 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0x0 bl FUN_02023948 add r0, r4, #0x0 diff --git a/arm9/asm/unk_02023C40.s b/arm9/asm/unk_02023C40.s index 5ad65841..9ab8cab3 100644 --- a/arm9/asm/unk_02023C40.s +++ b/arm9/asm/unk_02023C40.s @@ -218,7 +218,7 @@ FUN_02023D6C: ; 0x02023D6C push {r4, lr} mov r1, #0x4f lsl r1, r1, #0x2 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0x0 bl FUN_02024378 add r0, r4, #0x0 diff --git a/arm9/asm/unk_02024F30.s b/arm9/asm/unk_02024F30.s index c8e6d648..899404c6 100644 --- a/arm9/asm/unk_02024F30.s +++ b/arm9/asm/unk_02024F30.s @@ -9,7 +9,7 @@ FUN_02024F30: ; 0x02024F30 push {r4, lr} mov r1, #0x2 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0x0 bl FUN_02024F50 add r0, r4, #0x0 diff --git a/arm9/asm/unk_020250A4.s b/arm9/asm/unk_020250A4.s index dac42459..8a0f16b8 100644 --- a/arm9/asm/unk_020250A4.s +++ b/arm9/asm/unk_020250A4.s @@ -68,7 +68,7 @@ _02025112: cmp r4, r0 blt _020250DC ldr r0, [sp, #0x8] - bl FUN_02016A18 + bl FreeToHeap add sp, #0xc pop {r4-r7, pc} .balign 4 @@ -82,7 +82,7 @@ FUN_02025128: ; 0x02025128 str r0, [sp, #0x0] add r0, r7, #0x0 mov r1, #0xc0 - bl FUN_02016998 + bl AllocFromHeap str r0, [sp, #0x4] mov r6, #0x0 add r5, r0, #0x0 @@ -104,7 +104,7 @@ _02025142: bl FUN_02085290 strb r0, [r5, #0x2] add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap add r6, r6, #0x1 add r5, r5, #0x3 cmp r6, #0x40 diff --git a/arm9/asm/unk_020254B8.s b/arm9/asm/unk_020254B8.s index 67b4c5c9..65b3ddb1 100644 --- a/arm9/asm/unk_020254B8.s +++ b/arm9/asm/unk_020254B8.s @@ -82,7 +82,7 @@ FUN_02025520: ; 0x02025520 add r0, r3, #0x0 lsl r1, r1, #0x6 str r2, [sp, #0x8] - bl FUN_02016998 + bl AllocFromHeap str r0, [sp, #0x10] bl FUN_020254CC mov r0, #0x0 @@ -197,7 +197,7 @@ _020255F8: lsl r2, r2, #0x6 bl memcpy ldr r0, [sp, #0x10] - bl FUN_02016A18 + bl FreeToHeap add sp, #0x2c pop {r4-r7, pc} nop diff --git a/arm9/asm/unk_02025658.s b/arm9/asm/unk_02025658.s index 267b067c..8670750d 100644 --- a/arm9/asm/unk_02025658.s +++ b/arm9/asm/unk_02025658.s @@ -65,7 +65,7 @@ _020256B6: FUN_020256BC: ; 0x020256BC push {r4, lr} mov r1, #0x38 - bl FUN_020169D8 + bl AllocFromHeapAtEnd add r4, r0, #0x0 bl FUN_02025658 add r0, r4, #0x0 diff --git a/arm9/asm/unk_02025954.s b/arm9/asm/unk_02025954.s index 5dcaf3b3..d9db06df 100644 --- a/arm9/asm/unk_02025954.s +++ b/arm9/asm/unk_02025954.s @@ -44,7 +44,7 @@ FUN_02025960: ; 0x02025960 FUN_02025964: ; 0x02025964 push {r4, lr} mov r1, #0x3c - bl FUN_02016998 + bl AllocFromHeap mov r1, #0x0 mov r2, #0x3c add r4, r0, #0x0 diff --git a/arm9/asm/unk_02026CD0.s b/arm9/asm/unk_02026CD0.s index f1c29be8..b3d772a0 100644 --- a/arm9/asm/unk_02026CD0.s +++ b/arm9/asm/unk_02026CD0.s @@ -440,7 +440,7 @@ FUN_02026FE4: ; 0x02026FE4 FUN_02026FE8: ; 0x02026FE8 push {r4, lr} mov r1, #0x98 - bl FUN_02016998 + bl AllocFromHeap mov r1, #0x0 mov r2, #0x98 add r4, r0, #0x0 diff --git a/arm9/asm/unk_02027E30.s b/arm9/asm/unk_02027E30.s index 15104882..14110596 100644 --- a/arm9/asm/unk_02027E30.s +++ b/arm9/asm/unk_02027E30.s @@ -39,7 +39,7 @@ FUN_02027E44: ; 0x02027E44 FUN_02027E5C: ; 0x02027E5C push {r4, lr} mov r1, #0x8 - bl FUN_020169D8 + bl AllocFromHeapAtEnd add r4, r0, #0x0 bl FUN_02027E44 add r0, r4, #0x0 diff --git a/arm9/asm/unk_02028980.s b/arm9/asm/unk_02028980.s index b538a7c5..d57c7ccd 100644 --- a/arm9/asm/unk_02028980.s +++ b/arm9/asm/unk_02028980.s @@ -267,7 +267,7 @@ _02028B0E: bl FUN_02028C08 _02028B12: add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} .balign 4 @@ -939,7 +939,7 @@ FUN_02028FA4: ; 0x02028FA4 add r5, r0, #0x0 add r0, r1, #0x0 mov r1, #0x4 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0x0 add r0, sp, #0x0 bl FUN_020126B4 @@ -990,7 +990,7 @@ _02029010: .word 0xFFFFC7FF FUN_02029014: ; 0x02029014 push {r3, lr} mov r1, #0x8 - bl FUN_02016998 + bl AllocFromHeap mov r1, #0x0 strb r1, [r0, #0x0] strb r1, [r0, #0x1] @@ -1212,7 +1212,7 @@ FUN_0202916C: ; 0x0202916C FUN_02029178: ; 0x02029178 push {r3, lr} mov r1, #0x4 - bl FUN_02016998 + bl AllocFromHeap mov r1, #0x0 strb r1, [r0, #0x0] strb r1, [r0, #0x1] @@ -1365,7 +1365,7 @@ FUN_0202928C: ; 0x0202928C add r4, r1, #0x0 add r0, r2, #0x0 mov r1, #0x4 - bl FUN_02016998 + bl AllocFromHeap ldrh r2, [r0, #0x0] mov r1, #0x1 bic r2, r1 @@ -1388,7 +1388,7 @@ _020292B8: .word 0xFFFF0001 FUN_020292BC: ; 0x020292BC push {r4, lr} mov r1, #0x3a - bl FUN_02016998 + bl AllocFromHeap mov r1, #0x0 mov r2, #0x3a add r4, r0, #0x0 diff --git a/arm9/asm/unk_02029EC4.s b/arm9/asm/unk_02029EC4.s index 4e8fb451..78411f78 100644 --- a/arm9/asm/unk_02029EC4.s +++ b/arm9/asm/unk_02029EC4.s @@ -29,7 +29,7 @@ FUN_02029EE4: ; 0x02029EE4 push {r4, lr} mov r1, #0xfb lsl r1, r1, #0x2 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0x0 bl FUN_02029ECC add r0, r4, #0x0 diff --git a/arm9/asm/unk_0202A1E0.s b/arm9/asm/unk_0202A1E0.s index 177b9900..1b3ad961 100644 --- a/arm9/asm/unk_0202A1E0.s +++ b/arm9/asm/unk_0202A1E0.s @@ -988,7 +988,7 @@ FUN_0202A878: ; 0x0202A878 add r0, r1, #0x0 mov r1, #0xff lsl r1, r1, #0x2 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0x0 mov r0, #0x1d lsl r0, r0, #0x6 diff --git a/arm9/asm/unk_0202B870.s b/arm9/asm/unk_0202B870.s index bcdd8164..f37f255e 100644 --- a/arm9/asm/unk_0202B870.s +++ b/arm9/asm/unk_0202B870.s @@ -158,7 +158,7 @@ FUN_0202B93C: ; 0x0202B93C add r4, r0, #0x0 add r0, r5, #0x0 mov r1, #0x34 - bl FUN_020169D8 + bl AllocFromHeapAtEnd str r0, [sp, #0x4] add r5, r0, #0x0 ldr r0, _0202B9E8 ; =UNK_020EEAD0 @@ -248,7 +248,7 @@ FUN_0202B9EC: ; 0x0202B9EC add r6, r0, #0x0 add r0, r4, #0x0 lsl r1, r1, #0x2 - bl FUN_020169D8 + bl AllocFromHeapAtEnd mov r2, #0x4e mov r1, #0x0 lsl r2, r2, #0x2 @@ -286,7 +286,7 @@ _0202BA38: cmp r6, #0xd blt _0202BA38 ldr r0, [sp, #0x0] - bl FUN_02016A18 + bl FreeToHeap add r0, r7, #0x0 bl FUN_02021A20 ldr r0, [sp, #0x4] @@ -611,7 +611,7 @@ FUN_0202BC98: ; 0x0202BC98 mov r1, #0xe0 str r2, [sp, #0x10] add r4, r3, #0x0 - bl FUN_020169D8 + bl AllocFromHeapAtEnd add r6, r0, #0x0 mov r0, #0x0 str r0, [sp, #0x0] @@ -643,7 +643,7 @@ FUN_0202BC98: ; 0x0202BC98 bl FUN_0202BAD4 _0202BCEA: add r0, r6, #0x0 - bl FUN_02016A18 + bl FreeToHeap add sp, #0x14 pop {r4-r7, pc} @@ -722,7 +722,7 @@ FUN_0202BD6C: ; 0x0202BD6C str r0, [sp, #0x4] ldr r0, [sp, #0x0] mov r1, #0x4c - bl FUN_02016998 + bl AllocFromHeap mov r1, #0x0 mov r2, #0x4c add r7, r0, #0x0 @@ -766,7 +766,7 @@ _0202BDC4: blt _0202BDC4 _0202BDE2: ldr r0, [sp, #0x8] - bl FUN_02016A18 + bl FreeToHeap add r0, r7, #0x0 add sp, #0x10 pop {r3-r7, pc} @@ -780,7 +780,7 @@ FUN_0202BDF0: ; 0x0202BDF0 str r1, [sp, #0x0] add r0, r7, #0x0 mov r1, #0x4c - bl FUN_02016998 + bl AllocFromHeap mov r1, #0x0 mov r2, #0x4c add r4, r0, #0x0 @@ -855,5 +855,5 @@ _0202BE7E: mov r2, #0x4c bl MI_CpuFill8 add r0, r6, #0x0 - bl FUN_02016A18 + bl FreeToHeap pop {r4-r6, pc} diff --git a/arm9/asm/unk_0202D4C4.s b/arm9/asm/unk_0202D4C4.s index e3c47372..deb9a6ea 100644 --- a/arm9/asm/unk_0202D4C4.s +++ b/arm9/asm/unk_0202D4C4.s @@ -455,7 +455,7 @@ FUN_0202D7D8: ; 0x0202D7D8 lsl r7, r4, #0x4 mov r0, #0xf add r1, r7, #0x0 - bl FUN_02016998 + bl AllocFromHeap mov r1, #0x0 add r2, r7, #0x0 str r0, [r5, #0x18] @@ -485,11 +485,11 @@ FUN_0202D804: ; 0x0202D804 thumb_func_start FUN_0202D824 FUN_0202D824: ; 0x0202D824 - ldr r3, _0202D82C ; =FUN_02016A18 + ldr r3, _0202D82C ; =FreeToHeap ldr r0, [r0, #0x18] bx r3 nop -_0202D82C: .word FUN_02016A18 +_0202D82C: .word FreeToHeap thumb_func_start FUN_0202D830 FUN_0202D830: ; 0x0202D830 diff --git a/arm9/asm/unk_0202D8D0.s b/arm9/asm/unk_0202D8D0.s index 28287909..d457ca4a 100644 --- a/arm9/asm/unk_0202D8D0.s +++ b/arm9/asm/unk_0202D8D0.s @@ -48,7 +48,7 @@ FUN_0202D8D0: ; 0x0202D8D0 bne _0202D8EC mov r0, #0xf mov r1, #0x18 - bl FUN_02016998 + bl AllocFromHeap ldr r1, _0202D914 ; =UNK_021C59E0 str r0, [r1, #0x0] _0202D8EC: @@ -82,7 +82,7 @@ FUN_0202D918: ; 0x0202D918 ldr r0, [r0, #0x0] cmp r0, #0x0 beq _0202D92C - bl FUN_02016A18 + bl FreeToHeap ldr r0, _0202D930 ; =UNK_021C59E0 mov r1, #0x0 str r1, [r0, #0x0] diff --git a/arm9/asm/unk_0202DB14.s b/arm9/asm/unk_0202DB14.s index 1af52e10..d8604c93 100644 --- a/arm9/asm/unk_0202DB14.s +++ b/arm9/asm/unk_0202DB14.s @@ -24,7 +24,7 @@ FUN_0202DB14: ; 0x0202DB14 mov r1, #0xe9 mov r0, #0xf lsl r1, r1, #0x2 - bl FUN_02016998 + bl AllocFromHeap ldr r1, _0202DBA0 ; =UNK_021C59E4 mov r2, #0xe9 str r0, [r1, #0x0] @@ -104,7 +104,7 @@ _0202DBB8: ldr r0, [r0, #0x0] cmp r0, #0x0 beq _0202DBD2 - bl FUN_02016A18 + bl FreeToHeap _0202DBD2: ldr r0, _0202DBDC ; =UNK_021C59E4 mov r1, #0x0 diff --git a/arm9/asm/unk_0202E29C.s b/arm9/asm/unk_0202E29C.s index 9cd6946a..0b3f7256 100644 --- a/arm9/asm/unk_0202E29C.s +++ b/arm9/asm/unk_0202E29C.s @@ -26,7 +26,7 @@ FUN_0202E29C: ; 0x0202E29C mov r1, #0xdb mov r0, #0xf lsl r1, r1, #0x4 - bl FUN_02016998 + bl AllocFromHeap ldr r1, _0202E334 ; =UNK_021C59E8 mov r2, #0xdb str r0, [r1, #0x8] @@ -36,7 +36,7 @@ FUN_0202E29C: ; 0x0202E29C bl FUN_0202CEEC add r1, r0, #0x0 mov r0, #0xf - bl FUN_02016998 + bl AllocFromHeap ldr r1, _0202E334 ; =UNK_021C59E8 ldr r2, [r1, #0x8] ldr r1, _0202E338 ; =0x00000CA4 @@ -52,7 +52,7 @@ FUN_0202E29C: ; 0x0202E29C bl FUN_02023AC4 add r1, r0, #0x0 mov r0, #0xf - bl FUN_02016998 + bl AllocFromHeap ldr r1, _0202E334 ; =UNK_021C59E8 ldr r2, [r1, #0x8] ldr r1, _0202E33C ; =0x00000CBC @@ -706,15 +706,15 @@ FUN_0202E7D8: ; 0x0202E7D8 ldr r1, [r0, #0x8] ldr r0, _0202E808 ; =0x00000CBC ldr r0, [r1, r0] - bl FUN_02016A18 + bl FreeToHeap ldr r0, _0202E804 ; =UNK_021C59E8 ldr r1, [r0, #0x8] ldr r0, _0202E80C ; =0x00000CA4 ldr r0, [r1, r0] - bl FUN_02016A18 + bl FreeToHeap ldr r0, _0202E804 ; =UNK_021C59E8 ldr r0, [r0, #0x8] - bl FUN_02016A18 + bl FreeToHeap ldr r0, _0202E804 ; =UNK_021C59E8 mov r1, #0x0 str r1, [r0, #0x8] diff --git a/arm9/asm/unk_0202F150.s b/arm9/asm/unk_0202F150.s index 2f736a39..4d05c01e 100644 --- a/arm9/asm/unk_0202F150.s +++ b/arm9/asm/unk_0202F150.s @@ -42,7 +42,7 @@ _0202F178: bl FUN_02031480 ldr r1, _0202F2C0 ; =0x0000068C mov r0, #0xf - bl FUN_02016998 + bl AllocFromHeap ldr r1, _0202F2BC ; =UNK_021C59F4 ldr r2, _0202F2C0 ; =0x0000068C str r0, [r1, #0x4] @@ -67,7 +67,7 @@ _0202F178: mov r0, #0xf ldr r1, [r2, r1] lsl r1, r1, #0x1 - bl FUN_02016998 + bl AllocFromHeap ldr r2, _0202F2BC ; =UNK_021C59F4 ldr r1, _0202F2C8 ; =0x0000045C ldr r3, [r2, #0x4] @@ -76,7 +76,7 @@ _0202F178: ldr r1, _0202F2C4 ; =0x00000658 mov r0, #0xf ldr r1, [r2, r1] - bl FUN_02016998 + bl AllocFromHeap ldr r2, _0202F2BC ; =UNK_021C59F4 mov r1, #0x46 ldr r3, [r2, #0x4] @@ -87,7 +87,7 @@ _0202F178: mov r0, #0xf ldr r1, [r2, r1] mul r1, r5 - bl FUN_02016998 + bl AllocFromHeap ldr r2, _0202F2BC ; =UNK_021C59F4 ldr r1, _0202F2CC ; =0x00000458 ldr r3, [r2, #0x4] @@ -97,7 +97,7 @@ _0202F178: mov r0, #0xf ldr r1, [r2, r1] mul r1, r5 - bl FUN_02016998 + bl AllocFromHeap ldr r1, _0202F2BC ; =UNK_021C59F4 ldr r2, [r1, #0x4] ldr r1, _0202F2D0 ; =0x00000454 @@ -1161,23 +1161,23 @@ _0202FA82: ldr r1, [r1, #0x4] sub r0, #0xec ldr r0, [r1, r0] - bl FUN_02016A18 + bl FreeToHeap ldr r0, _0202FB00 ; =UNK_021C59F4 ldr r1, [r0, #0x4] mov r0, #0x46 lsl r0, r0, #0x4 ldr r0, [r1, r0] - bl FUN_02016A18 + bl FreeToHeap ldr r0, _0202FB00 ; =UNK_021C59F4 ldr r1, [r0, #0x4] ldr r0, _0202FB08 ; =0x00000458 ldr r0, [r1, r0] - bl FUN_02016A18 + bl FreeToHeap ldr r0, _0202FB00 ; =UNK_021C59F4 ldr r1, [r0, #0x4] ldr r0, _0202FB0C ; =0x00000454 ldr r0, [r1, r0] - bl FUN_02016A18 + bl FreeToHeap ldr r0, _0202FB00 ; =UNK_021C59F4 ldr r1, [r0, #0x4] ldr r0, _0202FB10 ; =0x0000056C @@ -1190,7 +1190,7 @@ _0202FA82: bl FUN_0202D824 ldr r0, _0202FB00 ; =UNK_021C59F4 ldr r0, [r0, #0x4] - bl FUN_02016A18 + bl FreeToHeap ldr r0, _0202FB00 ; =UNK_021C59F4 mov r1, #0x0 str r1, [r0, #0x4] diff --git a/arm9/asm/unk_02031480.s b/arm9/asm/unk_02031480.s index 99f644bf..58ff4996 100644 --- a/arm9/asm/unk_02031480.s +++ b/arm9/asm/unk_02031480.s @@ -17,7 +17,7 @@ FUN_02031480: ; 0x02031480 cmp r1, #0x0 bne _0203149C ldr r1, _020314CC ; =0x00000253 - bl FUN_02016998 + bl AllocFromHeap ldr r1, _020314C8 ; =UNK_021C59FC ldr r2, _020314CC ; =0x00000253 str r0, [r1, #0x0] @@ -56,7 +56,7 @@ FUN_020314D0: ; 0x020314D0 push {r3, lr} ldr r0, _020314E4 ; =UNK_021C59FC ldr r0, [r0, #0x0] - bl FUN_02016A18 + bl FreeToHeap ldr r0, _020314E4 ; =UNK_021C59FC mov r1, #0x0 str r1, [r0, #0x0] diff --git a/arm9/asm/unk_02031734.s b/arm9/asm/unk_02031734.s index 03f651ed..57f7aacc 100644 --- a/arm9/asm/unk_02031734.s +++ b/arm9/asm/unk_02031734.s @@ -52,7 +52,7 @@ FUN_02031734: ; 0x02031734 bl FUN_0202E49C mov r0, #0xf mov r1, #0x50 - bl FUN_02016998 + bl AllocFromHeap ldr r1, _020317BC ; =UNK_021C5A00 mov r2, #0x50 str r0, [r1, #0x0] @@ -119,7 +119,7 @@ FUN_020317C0: ; 0x020317C0 ldr r0, [r0, #0x0] cmp r0, #0x0 beq _020317DC - bl FUN_02016A18 + bl FreeToHeap _020317DC: ldr r0, _0203180C ; =UNK_021C5A00 ldr r0, [r0, #0x0] @@ -134,7 +134,7 @@ _020317EE: bl FUN_0202E4F0 ldr r0, _0203180C ; =UNK_021C5A00 ldr r0, [r0, #0x0] - bl FUN_02016A18 + bl FreeToHeap mov r0, #0xf bl FUN_020168D0 ldr r0, _0203180C ; =UNK_021C5A00 @@ -3585,7 +3585,7 @@ FUN_02033288: ; 0x02033288 bl FUN_02016828 mov r0, #0xf mov r1, #0x50 - bl FUN_02016998 + bl AllocFromHeap ldr r1, _020332D8 ; =UNK_021C5A00 mov r2, #0x50 str r0, [r1, #0x0] @@ -3625,7 +3625,7 @@ FUN_020332DC: ; 0x020332DC bl FUN_020334E8 ldr r0, _0203330C ; =UNK_021C5A00 ldr r0, [r0, #0x0] - bl FUN_02016A18 + bl FreeToHeap ldr r0, _0203330C ; =UNK_021C5A00 mov r1, #0x0 str r1, [r0, #0x0] @@ -3651,7 +3651,7 @@ FUN_02033310: ; 0x02033310 bl FUN_02016828 mov r0, #0xf mov r1, #0x50 - bl FUN_02016998 + bl AllocFromHeap ldr r1, _02033360 ; =UNK_021C5A00 mov r2, #0x50 str r0, [r1, #0x0] @@ -3691,7 +3691,7 @@ FUN_02033364: ; 0x02033364 bl FUN_020334E8 ldr r0, _02033394 ; =UNK_021C5A00 ldr r0, [r0, #0x0] - bl FUN_02016A18 + bl FreeToHeap ldr r0, _02033394 ; =UNK_021C5A00 mov r1, #0x0 str r1, [r0, #0x0] @@ -3828,7 +3828,7 @@ _02033482: bl FUN_02031734 mov r0, #0xf add r1, r4, #0x0 - bl FUN_02016998 + bl AllocFromHeap ldr r1, _020334D4 ; =UNK_021C5A00 ldr r2, [r1, #0x0] str r0, [r2, #0x0] diff --git a/arm9/asm/unk_020337E8.s b/arm9/asm/unk_020337E8.s index d535c8fc..99f778f2 100644 --- a/arm9/asm/unk_020337E8.s +++ b/arm9/asm/unk_020337E8.s @@ -8,7 +8,7 @@ FUN_020337E8: ; 0x020337E8 push {r3-r5, lr} mov r1, #0x72 lsl r1, r1, #0x4 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0x0 add r0, #0x1f mov r1, #0x1f @@ -16,7 +16,7 @@ FUN_020337E8: ; 0x020337E8 bl DWC_Init add r5, r0, #0x0 add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap add r0, r5, #0x0 pop {r3-r5, pc} .balign 4 diff --git a/arm9/asm/unk_02033B68.s b/arm9/asm/unk_02033B68.s index fb4ddef5..39125d06 100644 --- a/arm9/asm/unk_02033B68.s +++ b/arm9/asm/unk_02033B68.s @@ -75,7 +75,7 @@ FUN_02033B68: ; 0x02033B68 bl FUN_02033D9C add r0, r4, #0x0 mov r1, #0x20 - bl FUN_020169D8 + bl AllocFromHeapAtEnd add r4, r0, #0x0 ldr r0, _02033BC4 ; =FUN_02033BC8 add r1, r4, #0x0 @@ -276,7 +276,7 @@ FUN_02033CD4: ; 0x02033CD4 strh r1, [r0, #0x4] _02033CF6: add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} nop _02033D00: .word 0x40000200 @@ -320,7 +320,7 @@ FUN_02033D3C: ; 0x02033D3C add r0, r3, #0x0 lsl r1, r1, #0x2 add r4, r2, #0x0 - bl FUN_020169D8 + bl AllocFromHeapAtEnd str r0, [sp, #0x4] cmp r0, #0x0 beq _02033D92 @@ -350,7 +350,7 @@ _02033D80: bl GXS_LoadOBJPltt _02033D8C: ldr r0, [sp, #0x4] - bl FUN_02016A18 + bl FreeToHeap _02033D92: add sp, #0x8 pop {r3-r5, pc} @@ -366,7 +366,7 @@ FUN_02033D9C: ; 0x02033D9C add r5, r0, #0x0 add r0, r2, #0x0 lsl r1, r1, #0x2 - bl FUN_020169D8 + bl AllocFromHeapAtEnd str r0, [sp, #0x4] cmp r0, #0x0 beq _02033E58 @@ -456,7 +456,7 @@ _02033E46: bl GXS_LoadOBJ _02033E52: ldr r0, [sp, #0x4] - bl FUN_02016A18 + bl FreeToHeap _02033E58: add sp, #0x8 pop {r3-r5, pc} diff --git a/arm9/asm/unk_02033F50.s b/arm9/asm/unk_02033F50.s index acfefadb..7d92eb85 100644 --- a/arm9/asm/unk_02033F50.s +++ b/arm9/asm/unk_02033F50.s @@ -247,7 +247,7 @@ _02033FA4: add r0, r4, #0x0 bl FUN_0200AB18 add r0, r6, #0x0 - bl FUN_02016A18 + bl FreeToHeap add sp, #0x28 pop {r3-r7, pc} nop diff --git a/arm9/asm/unk_02034188.s b/arm9/asm/unk_02034188.s index fe4539b2..e0027d0b 100644 --- a/arm9/asm/unk_02034188.s +++ b/arm9/asm/unk_02034188.s @@ -220,7 +220,7 @@ _02034308: mov r1, #0x0 bl FUN_020178A0 ldr r0, [sp, #0x10] - bl FUN_02016A18 + bl FreeToHeap add sp, #0x24 pop {r4-r7, pc} nop diff --git a/arm9/asm/unk_020343A8.s b/arm9/asm/unk_020343A8.s index 11016257..fc2463b8 100644 --- a/arm9/asm/unk_020343A8.s +++ b/arm9/asm/unk_020343A8.s @@ -39,7 +39,7 @@ _020343D8: mov r0, #0x29 mov r1, r12 mov r2, #0xb - bl FUN_02006528 + bl AllocAtEndAndReadWholeNarcMemberByIdPair add r6, r0, #0x0 ldrb r0, [r6, #0x0] add r5, r6, #0x5 @@ -112,7 +112,7 @@ _0203446C: lsl r2, r2, #0x1 bl MI_CpuCopy8 add r0, r6, #0x0 - bl FUN_02016A18 + bl FreeToHeap add sp, #0xc pop {r4-r7, pc} .balign 4 @@ -125,7 +125,7 @@ FUN_02034494: ; 0x02034494 push {r3, lr} ldr r1, _020344A8 ; =0x000011AA mov r0, #0xb - bl FUN_02016998 + bl AllocFromHeap mov r1, #0x0 strb r1, [r0, #0x0] strb r1, [r0, #0x1] @@ -155,10 +155,10 @@ FUN_020344AC: ; 0x020344AC thumb_func_start FUN_020344D0 FUN_020344D0: ; 0x020344D0 - ldr r3, _020344D4 ; =FUN_02016A18 + ldr r3, _020344D4 ; =FreeToHeap bx r3 .balign 4 -_020344D4: .word FUN_02016A18 +_020344D4: .word FreeToHeap thumb_func_start FUN_020344D8 FUN_020344D8: ; 0x020344D8 @@ -292,12 +292,12 @@ FUN_020345A8: ; 0x020345A8 push {r3-r5, lr} ldr r1, _020345D8 ; =0x00000708 add r4, r0, #0x0 - bl FUN_02016998 + bl AllocFromHeap add r5, r0, #0x0 mov r0, #0x29 mov r1, #0x0 add r2, r4, #0x0 - bl FUN_02006528 + bl AllocAtEndAndReadWholeNarcMemberByIdPair add r4, r0, #0x0 ldrb r1, [r4, #0x4] add r0, r4, #0x5 @@ -306,7 +306,7 @@ FUN_020345A8: ; 0x020345A8 add r1, r5, #0x0 bl MI_CpuCopy8 add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap add r0, r5, #0x0 pop {r3-r5, pc} .balign 4 @@ -320,7 +320,7 @@ FUN_020345DC: ; 0x020345DC bl ErrorHandling _020345E6: add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} .balign 4 diff --git a/arm9/asm/unk_02034A28.s b/arm9/asm/unk_02034A28.s index fd8eb2fa..9185622e 100644 --- a/arm9/asm/unk_02034A28.s +++ b/arm9/asm/unk_02034A28.s @@ -15,7 +15,7 @@ FUN_02034A28: ; 0x02034A28 _02034A38: ldr r1, _02034A44 ; =0x00000AC8 add r0, r4, #0x0 - bl FUN_02016998 + bl AllocFromHeap str r0, [r5, #0x14] pop {r3-r5, pc} .balign 4 @@ -31,7 +31,7 @@ FUN_02034A48: ; 0x02034A48 bl ErrorHandling _02034A56: ldr r0, [r4, #0x14] - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} .balign 4 @@ -71,7 +71,7 @@ FUN_02034A98: ; 0x02034A98 add r4, r0, #0x0 mov r0, #0x20 add r1, r4, #0x0 - bl LoadFromNARC_7 + bl GetNarcMemberSizeByIdPair mov r1, #0x2 lsl r1, r1, #0xa cmp r0, r1 @@ -82,7 +82,7 @@ _02034AB8: add r0, r5, #0x0 mov r1, #0x20 add r2, r4, #0x0 - bl LoadFromNARC + bl ReadWholeNarcMemberByIdPair pop {r3-r5, pc} .balign 4 @@ -414,7 +414,7 @@ FUN_02034CB4: ; 0x02034CB4 add r2, r0, #0x0 add r0, r5, #0x0 mov r1, #0x25 - bl LoadFromNARC + bl ReadWholeNarcMemberByIdPair _02034CDE: pop {r3-r5, pc} @@ -443,7 +443,7 @@ FUN_02034CEC: ; 0x02034CEC bl MIi_CpuClearFast mov r0, #0xa add r1, r4, #0x0 - bl LoadFromNARC_7 + bl GetNarcMemberSizeByIdPair mov r1, #0x1 lsl r1, r1, #0x8 cmp r0, r1 @@ -455,7 +455,7 @@ _02034D1C: add r0, r5, r0 mov r1, #0xa add r2, r4, #0x0 - bl LoadFromNARC + bl ReadWholeNarcMemberByIdPair pop {r3-r5, pc} thumb_func_start FUN_02034D2C diff --git a/arm9/asm/unk_02035068.s b/arm9/asm/unk_02035068.s index 8acf81c6..5b78d799 100644 --- a/arm9/asm/unk_02035068.s +++ b/arm9/asm/unk_02035068.s @@ -294,7 +294,7 @@ FUN_02035254: ; 0x02035254 mov r1, #0x2 mov r0, #0xb lsl r1, r1, #0x8 - bl FUN_02016998 + bl AllocFromHeap mov r2, #0x0 strh r2, [r0, #0x2a] mov r1, #0x7e @@ -500,7 +500,7 @@ _020353D6: add r1, r5, #0x0 bl FUN_0203598C add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap ldr r0, [r5, #0x34] bl FUN_020587B0 mov r0, #0x1 @@ -529,10 +529,10 @@ _02035412: add r0, r6, #0x0 bl FUN_020463EC add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap b _02035484 _02035432: - bl FUN_02016A18 + bl FreeToHeap ldr r0, [r5, #0x34] bl FUN_020587B0 mov r0, #0x1 @@ -553,7 +553,7 @@ _02035440: mov r1, #0x3 bl FUN_0201AC68 add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap ldr r0, [r5, #0x34] bl FUN_020587B0 mov r0, #0x1 @@ -1655,7 +1655,7 @@ FUN_02035D34: ; 0x02035D34 add r6, r0, #0x0 mov r0, #0xb mov r1, #0x20 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0x0 ldr r0, [r5, #0xc] bl FUN_02024DA0 @@ -1788,7 +1788,7 @@ FUN_02035E50: ; 0x02035E50 add r4, r0, #0x0 mov r0, #0xb mov r1, #0x40 - bl FUN_02016998 + bl AllocFromHeap mov r1, #0x7e lsl r1, r1, #0x2 ldr r1, [r4, r1] @@ -1798,7 +1798,7 @@ FUN_02035E50: ; 0x02035E50 mov r0, #0x7e lsl r0, r0, #0x2 ldr r0, [r4, r0] - bl FUN_02016A18 + bl FreeToHeap add r0, r6, #0x0 add r0, #0x23 ldrb r0, [r0, #0x0] @@ -1840,7 +1840,7 @@ _02035E9C: ; jump table (using 16-bit offset) _02035ECC: mov r0, #0xb mov r1, #0x30 - bl FUN_02016998 + bl AllocFromHeap add r7, r0, #0x0 ldr r0, [r5, #0xc] bl FUN_0206BB1C @@ -1892,7 +1892,7 @@ _02035ECC: _02035F4A: mov r0, #0xb mov r1, #0x30 - bl FUN_02016998 + bl AllocFromHeap add r7, r0, #0x0 ldr r0, [r5, #0xc] bl FUN_0206BB1C @@ -1932,7 +1932,7 @@ _02035F4A: bl FUN_0203796C mov r0, #0xb mov r1, #0x4 - bl FUN_02016998 + bl AllocFromHeap ldrh r1, [r6, #0x24] strh r1, [r0, #0x0] mov r1, #0x0 @@ -1949,7 +1949,7 @@ _02035F4A: _02035FD0: mov r0, #0xb mov r1, #0x30 - bl FUN_02016998 + bl AllocFromHeap add r7, r0, #0x0 ldr r0, [r5, #0xc] bl FUN_0206BB1C @@ -1989,7 +1989,7 @@ _02035FD0: bl FUN_0203796C mov r0, #0xb mov r1, #0x4 - bl FUN_02016998 + bl AllocFromHeap mov r1, #0x0 strh r1, [r0, #0x0] ldr r1, [r6, #0x34] @@ -2074,7 +2074,7 @@ _020360AC: _020360EA: mov r0, #0xb mov r1, #0x4 - bl FUN_02016998 + bl AllocFromHeap add r1, r6, #0x0 add r1, #0x22 ldrb r1, [r1, #0x0] @@ -2113,7 +2113,7 @@ _020360EA: _02036144: mov r0, #0xb mov r1, #0xc - bl FUN_02016998 + bl AllocFromHeap ldrh r1, [r6, #0x24] strh r1, [r0, #0x2] mov r1, #0x3 @@ -2135,7 +2135,7 @@ _02036144: _02036170: mov r0, #0xb mov r1, #0xc - bl FUN_02016998 + bl AllocFromHeap add r7, r0, #0x0 ldr r0, [r5, #0x1c] ldr r0, [r0, #0x0] @@ -2250,7 +2250,7 @@ _02036254: strh r0, [r4, #0x2a] _0203625E: add r0, r6, #0x0 - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x0 add sp, #0xc pop {r4-r7, pc} @@ -2332,7 +2332,7 @@ FUN_020362E4: ; 0x020362E4 mov r0, #0x7e lsl r0, r0, #0x2 ldr r0, [r4, r0] - bl FUN_02016A18 + bl FreeToHeap ldr r0, [sp, #0x8] bl FUN_0206E384 cmp r0, #0x5 @@ -2388,7 +2388,7 @@ _0203637A: _0203638A: mov r0, #0xb mov r1, #0x40 - bl FUN_02016998 + bl AllocFromHeap mov r1, #0x0 mov r2, #0x40 add r5, r0, #0x0 @@ -2449,7 +2449,7 @@ _020363F6: mov r0, #0x7f lsl r0, r0, #0x2 ldr r0, [r4, r0] - bl FUN_02016A18 + bl FreeToHeap add r0, r5, #0x0 bl FUN_0206EA98 cmp r0, #0x1 @@ -2488,7 +2488,7 @@ _020363F6: _02036474: mov r0, #0xb mov r1, #0x40 - bl FUN_02016998 + bl AllocFromHeap mov r1, #0x0 mov r2, #0x40 add r5, r0, #0x0 @@ -2548,7 +2548,7 @@ _020364EE: strh r0, [r4, #0x2a] _020364F8: ldr r0, [sp, #0x8] - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x0 add sp, #0x18 pop {r3-r7, pc} @@ -2683,7 +2683,7 @@ FUN_020365F0: ; 0x020365F0 _02036618: mov r0, #0x20 mov r1, #0x8 - bl FUN_02016998 + bl AllocFromHeap mov r1, #0x7e lsl r1, r1, #0x2 str r0, [r4, r1] @@ -2732,7 +2732,7 @@ _02036676: _02036678: strh r0, [r4, #0x2a] add r0, r5, #0x0 - bl FUN_02016A18 + bl FreeToHeap pop {r4-r6, pc} .balign 4 @@ -2788,7 +2788,7 @@ FUN_020366D4: ; 0x020366D4 mov r0, #0x7e lsl r0, r0, #0x2 ldr r0, [r4, r0] - bl FUN_02016A18 + bl FreeToHeap add r0, r5, #0x0 bl FUN_0204649C mov r0, #0xc @@ -2943,7 +2943,7 @@ _02036834: bl FUN_02038D10 _0203683E: add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x0 pop {r4-r6, pc} .balign 4 @@ -2960,7 +2960,7 @@ FUN_0203684C: ; 0x0203684C add r4, r0, #0x0 mov r0, #0xb mov r1, #0x30 - bl FUN_02016998 + bl AllocFromHeap mov r1, #0x7e lsl r1, r1, #0x2 ldr r1, [r4, r1] @@ -2970,13 +2970,13 @@ FUN_0203684C: ; 0x0203684C mov r0, #0x7e lsl r0, r0, #0x2 ldr r0, [r4, r0] - bl FUN_02016A18 + bl FreeToHeap ldrb r0, [r7, #0x12] cmp r0, #0x2 bne _0203692E mov r0, #0xb mov r1, #0x40 - bl FUN_02016998 + bl AllocFromHeap mov r1, #0x7f lsl r1, r1, #0x2 ldr r1, [r4, r1] @@ -3044,7 +3044,7 @@ _020368EE: mov r0, #0x7f lsl r0, r0, #0x2 ldr r0, [r4, r0] - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x7e lsl r0, r0, #0x2 str r5, [r4, r0] @@ -3067,7 +3067,7 @@ _0203692E: bl FUN_02035D04 _0203694A: add r0, r7, #0x0 - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x0 pop {r3-r7, pc} .balign 4 @@ -3366,7 +3366,7 @@ FUN_02036BC4: ; 0x02036BC4 mov r0, #0xb mov r1, #0x4 add r6, r2, #0x0 - bl FUN_02016998 + bl AllocFromHeap strh r5, [r0, #0x0] strb r6, [r0, #0x2] strb r4, [r0, #0x3] @@ -3491,7 +3491,7 @@ _02036CD4: mov r0, #0x7f lsl r0, r0, #0x2 ldr r0, [r4, r0] - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x0 pop {r4-r6, pc} nop @@ -3509,7 +3509,7 @@ FUN_02036CEC: ; 0x02036CEC ldr r7, [r6, r0] mov r0, #0xb mov r1, #0x40 - bl FUN_02016998 + bl AllocFromHeap mov r1, #0x0 mov r2, #0x40 add r4, r0, #0x0 @@ -3730,7 +3730,7 @@ _02036EF2: add r4, r0, #0x0 mov r0, #0xb mov r1, #0x4 - bl FUN_02016998 + bl AllocFromHeap ldrb r1, [r5, #0x0] str r1, [r0, #0x0] mov r1, #0x7f @@ -3738,7 +3738,7 @@ _02036EF2: str r0, [r6, r1] sub r0, r1, #0x4 ldr r0, [r6, r0] - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x7e lsl r0, r0, #0x2 str r4, [r6, r0] @@ -3795,7 +3795,7 @@ FUN_02036F1C: ; 0x02036F1C mov r0, #0x7f lsl r0, r0, #0x2 ldr r0, [r4, r0] - bl FUN_02016A18 + bl FreeToHeap ldr r1, _02036FA0 ; =FUN_020362E4 add r0, r4, #0x0 bl FUN_02035D04 diff --git a/arm9/asm/unk_020372D4.s b/arm9/asm/unk_020372D4.s index 61ff665e..32c141c4 100644 --- a/arm9/asm/unk_020372D4.s +++ b/arm9/asm/unk_020372D4.s @@ -207,7 +207,7 @@ FUN_02037400: ; 0x02037400 bl MI_CpuFill8 mov r0, #0xb mov r1, #0x10 - bl FUN_02016998 + bl AllocFromHeap str r0, [r4, #0x0] mov r1, #0x0 str r1, [r0, #0x0] @@ -268,7 +268,7 @@ FUN_020374B0: ; 0x020374B0 add r0, r4, #0x0 add r0, #0x94 ldr r0, [r0, #0x0] - bl FUN_02016A18 + bl FreeToHeap add r0, r4, #0x0 add r0, #0x90 ldr r0, [r0, #0x0] @@ -278,7 +278,7 @@ FUN_020374B0: ; 0x020374B0 ldr r0, [r0, #0x0] bl FUN_0208A320 ldr r0, [r4, #0x0] - bl FUN_02016A18 + bl FreeToHeap add r0, r5, #0x0 bl FUN_0200627C mov r0, #0x5b diff --git a/arm9/asm/unk_020377F0.s b/arm9/asm/unk_020377F0.s index b89c9ea3..15e631e1 100644 --- a/arm9/asm/unk_020377F0.s +++ b/arm9/asm/unk_020377F0.s @@ -390,7 +390,7 @@ FUN_0203797C: ; 0x0203797C mov r1, #0x40 add r6, r2, #0x0 add r7, r3, #0x0 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0x0 mov r0, #0x0 add r1, r4, #0x0 @@ -602,13 +602,13 @@ _02037B1A: cmp r0, #0x0 bne _02037B3A ldr r0, [r4, #0x8] - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x0 str r0, [r5, #0x0] b _02037B3A _02037B30: add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x1 pop {r4-r6, pc} _02037B3A: @@ -626,7 +626,7 @@ FUN_02037B44: ; 0x02037B44 add r6, r0, #0x0 add r0, r5, #0x0 mov r1, #0xc - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0x0 add r0, r5, #0x0 add r1, r6, #0x0 @@ -720,7 +720,7 @@ FUN_02037C00: ; 0x02037C00 mov r0, #0xb mov r1, #0x30 add r6, r2, #0x0 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0x0 ldr r0, [r5, #0xc] bl FUN_0206BB1C @@ -773,7 +773,7 @@ FUN_02037C7C: ; 0x02037C7C add r0, r1, #0x0 mov r1, #0x30 add r6, r2, #0x0 - bl FUN_020169D8 + bl AllocFromHeapAtEnd mov r1, #0x0 mov r2, #0x30 add r4, r0, #0x0 @@ -822,7 +822,7 @@ FUN_02037CF0: ; 0x02037CF0 add r5, r1, #0x0 mov r1, #0x30 add r6, r2, #0x0 - bl FUN_02016998 + bl AllocFromHeap mov r1, #0x0 mov r2, #0x30 add r4, r0, #0x0 @@ -953,7 +953,7 @@ _02037E00: ldr r0, [r5, #0xc] bl FUN_020853A8 add r0, r5, #0x0 - bl FUN_02016A18 + bl FreeToHeap add sp, #0x4 mov r0, #0x1 pop {r3-r6, pc} @@ -974,7 +974,7 @@ FUN_02037E18: ; 0x02037E18 add r7, r0, #0x0 mov r0, #0x20 mov r1, #0x10 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0x0 ldr r0, [sp, #0x4] cmp r6, #0x0 @@ -1052,7 +1052,7 @@ FUN_02037EB8: ; 0x02037EB8 mov r1, #0x5 mov r0, #0xb lsl r1, r1, #0x6 - bl FUN_020169D8 + bl AllocFromHeapAtEnd add r4, r0, #0x0 add r0, r5, #0x0 add r1, r4, #0x0 @@ -1080,7 +1080,7 @@ FUN_02037EF8: ; 0x02037EF8 add r5, r0, #0x0 mov r0, #0xb mov r1, #0x2 - bl FUN_020169D8 + bl AllocFromHeapAtEnd add r4, r0, #0x0 add r0, r5, #0x0 bl FUN_020377AC @@ -1223,7 +1223,7 @@ FUN_0203800C: ; 0x0203800C mov r1, #0x20 add r7, r2, #0x0 add r6, r3, #0x0 - bl FUN_02016998 + bl AllocFromHeap mov r1, #0x0 mov r2, #0x20 add r4, r0, #0x0 @@ -1298,9 +1298,9 @@ _020380B4: ldr r0, [r5, #0x4] strh r1, [r0, #0x0] ldr r0, [r5, #0xc] - bl FUN_02016A18 + bl FreeToHeap add r0, r5, #0x0 - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x1 pop {r3-r5, pc} _020380C8: @@ -1317,7 +1317,7 @@ FUN_020380CC: ; 0x020380CC mov r1, #0x10 add r7, r2, #0x0 str r3, [sp, #0x4] - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0x0 add r2, r4, #0x0 mov r1, #0x10 @@ -1408,17 +1408,17 @@ FUN_02038144: ; 0x02038144 bl FUN_02023924 add r1, r0, #0x0 mov r0, #0x20 - bl FUN_02016998 + bl AllocFromHeap str r0, [r5, #0x38] bl FUN_020690C4 add r1, r0, #0x0 mov r0, #0x20 - bl FUN_02016998 + bl AllocFromHeap str r0, [r5, #0x3c] bl FUN_020690C4 add r1, r0, #0x0 mov r0, #0x20 - bl FUN_02016998 + bl AllocFromHeap str r0, [r5, #0x40] str r4, [r5, #0x0] mov r0, #0x0 @@ -1433,21 +1433,21 @@ FUN_020381CC: ; 0x020381CC ldr r0, [r4, #0x38] cmp r0, #0x0 beq _020381DE - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x0 str r0, [r4, #0x38] _020381DE: ldr r0, [r4, #0x3c] cmp r0, #0x0 beq _020381EC - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x0 str r0, [r4, #0x3c] _020381EC: ldr r0, [r4, #0x40] cmp r0, #0x0 beq _020381FA - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x0 str r0, [r4, #0x40] _020381FA: @@ -1517,7 +1517,7 @@ _0203826A: add r0, r4, #0x4 bl FUN_020381CC add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap add sp, #0x34 mov r0, #0x1 pop {r4-r7, pc} @@ -1687,7 +1687,7 @@ FUN_020383D8: ; 0x020383D8 add r4, r0, #0x0 mov r0, #0x20 mov r1, #0x68 - bl FUN_02016998 + bl AllocFromHeap add r2, r0, #0x0 mov r0, #0x0 str r0, [r2, #0x0] @@ -1704,7 +1704,7 @@ FUN_020383F8: ; 0x020383F8 add r5, r0, #0x0 mov r0, #0x20 mov r1, #0xc - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0x0 ldr r0, [r5, #0x7c] str r0, [r4, #0x0] @@ -1729,7 +1729,7 @@ FUN_0203842C: ; 0x0203842C add r5, r0, #0x0 mov r0, #0xb mov r1, #0x14 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0x0 ldr r0, [r5, #0xc] str r0, [r4, #0x0] @@ -1859,7 +1859,7 @@ _0203852E: ldr r0, [r4, #0x10] bl FUN_02021A20 add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x1 pop {r3-r7, pc} _02038544: @@ -1943,7 +1943,7 @@ FUN_020385CC: ; 0x020385CC add r7, r0, #0x0 mov r0, #0xb mov r1, #0x14 - bl FUN_020169D8 + bl AllocFromHeapAtEnd add r4, r0, #0x0 mov r0, #0x0 str r0, [r4, #0x0] @@ -2082,7 +2082,7 @@ FUN_020386E0: ; 0x020386E0 stmia r2!, {r0-r1} mov r0, #0xb mov r1, #0x44 - bl FUN_020169D8 + bl AllocFromHeapAtEnd add r4, r0, #0x0 ldr r0, [r5, #0xc] bl FUN_0202ABBC @@ -2158,7 +2158,7 @@ FUN_02038790: ; 0x02038790 stmia r2!, {r0-r1} mov r0, #0xb mov r1, #0x28 - bl FUN_020169D8 + bl AllocFromHeapAtEnd add r4, r0, #0x0 ldr r0, [r5, #0xc] bl FUN_0202A8D8 @@ -2226,7 +2226,7 @@ FUN_02038824: ; 0x02038824 add r4, r0, #0x0 cmp r1, #0x2 bne _02038842 - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x0 pop {r3-r5, pc} _02038842: @@ -2409,7 +2409,7 @@ _02038956: bl FUN_0205F6D8 _020389BA: add r0, r5, #0x0 - bl FUN_02016A18 + bl FreeToHeap add sp, #0xc mov r0, #0x1 pop {r4-r7, pc} @@ -2430,7 +2430,7 @@ FUN_020389CC: ; 0x020389CC str r0, [sp, #0x0] mov r0, #0x20 add r1, r0, #0x0 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0x0 str r4, [r4, #0xc] ldr r0, [r5, #0xc] @@ -2563,7 +2563,7 @@ FUN_02038AF4: ; 0x02038AF4 add r0, r1, #0x0 mov r1, #0x8 add r6, r2, #0x0 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0x0 str r6, [r4, #0x4] ldr r0, [r5, #0xc] diff --git a/arm9/asm/unk_02038C78.s b/arm9/asm/unk_02038C78.s index 74a9f45a..a756552a 100644 --- a/arm9/asm/unk_02038C78.s +++ b/arm9/asm/unk_02038C78.s @@ -1064,7 +1064,7 @@ _02038DD2: mov r0, #0x0 str r0, [r4, #0x0] add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap cmp r5, #0x0 beq _02038E14 ldr r0, [sp, #0x0] @@ -1086,7 +1086,7 @@ FUN_02038E20: ; 0x02038E20 push {r4, lr} mov r0, #0xb mov r1, #0xdc - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0x0 bne _02038E32 bl ErrorHandling @@ -1109,9 +1109,9 @@ FUN_02038E48: ; 0x02038E48 ldr r0, [r4, #0x78] bl FUN_0200A8B8 ldr r0, [r4, #0x7c] - bl FUN_02016A18 + bl FreeToHeap add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} thumb_func_start FUN_02038E60 @@ -1161,7 +1161,7 @@ FUN_02038EB0: ; 0x02038EB0 add r6, r1, #0x0 mov r0, #0xb mov r1, #0x84 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0x0 bne _02038EC6 bl ErrorHandling @@ -1635,7 +1635,7 @@ FUN_020392B4: ; 0x020392B4 add r4, r3, #0x0 mov r0, #0xa mov r2, #0xb - bl LoadFromNarc_2 + bl AllocAndReadWholeNarcMemberByIdPair str r0, [r5, #0x7c] mov r0, #0x1 mov r1, #0x1a @@ -1929,7 +1929,7 @@ FUN_0203949C: ; 0x0203949C add r1, r0, #0x0 mov r0, #0xa mov r2, #0xb - bl LoadFromNarc_2 + bl AllocAndReadWholeNarcMemberByIdPair pop {r3, pc} .balign 4 @@ -2313,7 +2313,7 @@ FUN_02039754: ; 0x02039754 mov r1, #0x6 add r0, r4, #0x0 mul r1, r2 - bl FUN_02016998 + bl AllocFromHeap str r0, [sp, #0x1c] cmp r5, #0x0 bne _02039786 diff --git a/arm9/asm/unk_02046030.s b/arm9/asm/unk_02046030.s index 00145c3e..be79d918 100644 --- a/arm9/asm/unk_02046030.s +++ b/arm9/asm/unk_02046030.s @@ -11,7 +11,7 @@ FUN_02046030: ; 0x02046030 add r4, r0, #0x0 mov r0, #0xb mov r1, #0xc - bl FUN_020169D8 + bl AllocFromHeapAtEnd add r2, r0, #0x0 mov r0, #0x0 strb r0, [r2, #0x0] @@ -217,7 +217,7 @@ _020461CE: b _020461F8 _020461E4: add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap add r0, r5, #0x0 mov r1, #0x0 bl FUN_0206367C diff --git a/arm9/asm/unk_0204639C.s b/arm9/asm/unk_0204639C.s index 64afeab7..07a73204 100644 --- a/arm9/asm/unk_0204639C.s +++ b/arm9/asm/unk_0204639C.s @@ -11,7 +11,7 @@ FUN_0204639C: ; 0x0204639C add r6, r1, #0x0 add r1, r0, #0x0 add r7, r2, #0x0 - bl FUN_020169D8 + bl AllocFromHeapAtEnd add r4, r0, #0x0 mov r0, #0x0 str r0, [r4, #0x0] @@ -23,7 +23,7 @@ FUN_0204639C: ; 0x0204639C mov r0, #0x20 mov r1, #0x4 str r5, [r4, #0x18] - bl FUN_020169D8 + bl AllocFromHeapAtEnd str r0, [r4, #0x1c] add r0, r4, #0x0 pop {r3-r7, pc} @@ -59,7 +59,7 @@ FUN_020463EC: ; 0x020463EC bne _02046400 beq _0204640A _02046400: - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x0 str r0, [r4, #0x10] str r0, [r4, #0x14] @@ -98,13 +98,13 @@ _02046436: ldr r0, [r0, #0x14] cmp r0, #0x0 beq _02046444 - bl FUN_02016A18 + bl FreeToHeap _02046444: ldr r0, [r5, #0x10] ldr r0, [r0, #0x1c] - bl FUN_02016A18 + bl FreeToHeap ldr r0, [r5, #0x10] - bl FUN_02016A18 + bl FreeToHeap str r4, [r5, #0x10] cmp r4, #0x0 bne _0204645C @@ -202,7 +202,7 @@ _020464E8: cmp r0, #0x0 bne _020464FC add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x1 pop {r3-r5, pc} _020464FC: @@ -217,7 +217,7 @@ FUN_02046500: ; 0x02046500 mov r0, #0x20 mov r1, #0xc add r4, r2, #0x0 - bl FUN_020169D8 + bl AllocFromHeapAtEnd add r2, r0, #0x0 mov r0, #0x0 str r0, [r2, #0x0] diff --git a/arm9/asm/unk_0204653C.s b/arm9/asm/unk_0204653C.s index d6859531..5a561e2e 100644 --- a/arm9/asm/unk_0204653C.s +++ b/arm9/asm/unk_0204653C.s @@ -59,7 +59,7 @@ FUN_02046594: ; 0x02046594 mov r1, #0x14 add r7, r2, #0x0 add r4, r3, #0x0 - bl FUN_020169D8 + bl AllocFromHeapAtEnd str r4, [r0, #0x0] cmp r4, #0x0 beq _020465B0 @@ -78,7 +78,7 @@ FUN_020465B8: ; 0x020465B8 ldr r0, [r4, #0x10] bl FUN_02047964 add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} .balign 4 @@ -563,7 +563,7 @@ FUN_0204697C: ; 0x0204697C mov r1, #0x14 add r7, r2, #0x0 add r4, r3, #0x0 - bl FUN_020169D8 + bl AllocFromHeapAtEnd str r4, [r0, #0xc] cmp r4, #0x0 beq _02046998 @@ -584,7 +584,7 @@ FUN_020469A4: ; 0x020469A4 ldr r0, [r4, #0x10] bl FUN_02047964 add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} .balign 4 diff --git a/arm9/asm/unk_020476CC.s b/arm9/asm/unk_020476CC.s index a898d827..ec3f24cf 100644 --- a/arm9/asm/unk_020476CC.s +++ b/arm9/asm/unk_020476CC.s @@ -18,7 +18,7 @@ FUN_020476CC: ; 0x020476CC mov r1, #0x67 lsl r1, r1, #0x2 add r5, r0, #0x0 - bl FUN_02016998 + bl AllocFromHeap mov r2, #0x67 mov r1, #0x0 lsl r2, r2, #0x2 @@ -283,7 +283,7 @@ FUN_02047814: ; 0x02047814 add r1, r6, #0x0 bl FUN_0206B900 add r0, r6, #0x0 - bl FUN_02016A18 + bl FreeToHeap ldr r0, [r5, #0xc] bl FUN_02022510 mov r1, #0x45 @@ -330,7 +330,7 @@ _0204796C: bl ErrorHandling _02047976: ldr r0, [r5, #0x4] - bl FUN_02016A18 + bl FreeToHeap add r4, r4, #0x1 add r5, r5, #0x4 cmp r4, #0x4 @@ -348,7 +348,7 @@ _02047996: add r0, r4, #0x0 add r0, #0xf8 ldr r0, [r0, #0x0] - bl FUN_02016A18 + bl FreeToHeap add r5, r5, #0x1 add r4, r4, #0x4 cmp r5, #0x4 @@ -366,7 +366,7 @@ _020479BA: mov r0, #0x46 lsl r0, r0, #0x2 ldr r0, [r4, r0] - bl FUN_02016A18 + bl FreeToHeap add r5, r5, #0x1 add r4, r4, #0x4 cmp r5, #0x4 @@ -374,21 +374,21 @@ _020479BA: mov r0, #0x42 lsl r0, r0, #0x2 ldr r0, [r7, r0] - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x11 lsl r0, r0, #0x4 ldr r0, [r7, r0] - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x13 lsl r0, r0, #0x4 ldr r0, [r7, r0] - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x4d lsl r0, r0, #0x2 ldr r0, [r7, r0] bl FUN_02061020 add r0, r7, #0x0 - bl FUN_02016A18 + bl FreeToHeap pop {r3-r7, pc} thumb_func_start FUN_020479FC @@ -697,7 +697,7 @@ _02047C82: blt _02047C40 _02047C98: add r0, r5, #0x0 - bl FUN_02016A18 + bl FreeToHeap mov r1, #0x42 lsl r1, r1, #0x2 ldr r0, [sp, #0x10] @@ -868,7 +868,7 @@ _02047DEE: blt _02047DEE _02047E0E: ldr r0, [sp, #0x8] - bl FUN_02016A18 + bl FreeToHeap _02047E14: ldr r0, [sp, #0xc] cmp r0, #0x0 diff --git a/arm9/asm/unk_02048120.s b/arm9/asm/unk_02048120.s index 061a427e..d7391e7d 100644 --- a/arm9/asm/unk_02048120.s +++ b/arm9/asm/unk_02048120.s @@ -64,7 +64,7 @@ FUN_02048164: ; 0x02048164 add r6, r1, #0x0 mov r0, #0xb mov r1, #0x24 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0x0 bne _0204817A bl ErrorHandling @@ -230,9 +230,9 @@ _020482B2: mov r1, #0x3 bl FUN_020178A0 ldr r0, [r4, #0x8] - bl FUN_02016A18 + bl FreeToHeap add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap add sp, #0xc mov r0, #0x1 pop {r3-r4, pc} diff --git a/arm9/asm/unk_020484A8.s b/arm9/asm/unk_020484A8.s index 453c8fdd..dd7ef2a4 100644 --- a/arm9/asm/unk_020484A8.s +++ b/arm9/asm/unk_020484A8.s @@ -53,7 +53,7 @@ _020484CC: add r1, r4, #0x0 bl FUN_02022540 add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap add sp, #0x14 pop {r3-r6, pc} .balign 4 @@ -238,7 +238,7 @@ _02048666: cmp r0, #0x0 bne _02048688 add r0, r5, #0x0 - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x4 bl FUN_020168D0 mov r0, #0x0 @@ -262,7 +262,7 @@ FUN_02048694: ; 0x02048694 add r4, r0, #0x0 mov r0, #0x20 mov r1, #0x3c - bl FUN_02016998 + bl AllocFromHeap add r5, r0, #0x0 ldr r0, [r4, #0xc] bl FUN_020462AC diff --git a/arm9/asm/unk_02048904.s b/arm9/asm/unk_02048904.s index 3b3789fc..a872c481 100644 --- a/arm9/asm/unk_02048904.s +++ b/arm9/asm/unk_02048904.s @@ -847,7 +847,7 @@ _02048FAE: b _02048FC4 _02048FBA: add r0, r6, #0x0 - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x1 pop {r3-r7, pc} _02048FC4: @@ -882,7 +882,7 @@ _02048FF8: _02049000: mov r0, #0xb mov r1, #0x18 - bl FUN_020169D8 + bl AllocFromHeapAtEnd add r2, r0, #0x0 mov r1, #0x0 ldr r0, _02049030 ; =0x000001D2 @@ -962,7 +962,7 @@ _02049090: str r0, [r4, #0x0] b _020490B6 _020490AE: - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x1 pop {r4-r6, pc} _020490B6: @@ -978,7 +978,7 @@ FUN_020490C0: ; 0x020490C0 add r4, r1, #0x0 mov r0, #0xb mov r1, #0x1c - bl FUN_020169D8 + bl AllocFromHeapAtEnd add r2, r0, #0x0 mov r0, #0x0 str r0, [r2, #0x0] @@ -1042,7 +1042,7 @@ _0204914C: add r0, r5, #0x0 bl FUN_02048AE4 add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x1 pop {r3-r5, pc} _0204915C: @@ -1058,7 +1058,7 @@ FUN_02049160: ; 0x02049160 add r7, r0, #0x0 mov r0, #0xb mov r1, #0x18 - bl FUN_020169D8 + bl AllocFromHeapAtEnd add r4, r0, #0x0 add r0, r7, #0x0 bl FUN_0203739C @@ -1155,7 +1155,7 @@ _02049216: str r0, [r4, #0x0] b _0204923C _02049234: - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x1 pop {r4-r6, pc} _0204923C: @@ -1171,7 +1171,7 @@ FUN_02049240: ; 0x02049240 mov r1, #0x18 add r4, r2, #0x0 add r6, r3, #0x0 - bl FUN_020169D8 + bl AllocFromHeapAtEnd add r2, r0, #0x0 mov r0, #0x0 str r0, [r2, #0x0] @@ -1203,7 +1203,7 @@ FUN_02049274: ; 0x02049274 mov r0, #0xb str r2, [sp, #0x4] str r3, [sp, #0x8] - bl FUN_020169D8 + bl AllocFromHeapAtEnd add r2, r0, #0x0 mov r0, #0x0 str r0, [r2, #0x0] @@ -1239,7 +1239,7 @@ FUN_020492BC: ; 0x020492BC mov r0, #0xb str r2, [sp, #0x4] str r3, [sp, #0x8] - bl FUN_020169D8 + bl AllocFromHeapAtEnd add r2, r0, #0x0 mov r0, #0x0 str r0, [r2, #0x0] @@ -1324,7 +1324,7 @@ _02049364: str r0, [r4, #0x0] b _02049390 _02049388: - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x1 pop {r3-r7, pc} _02049390: @@ -1473,7 +1473,7 @@ FUN_02049494: ; 0x02049494 mov r0, #0xb mov r1, #0x20 add r4, r2, #0x0 - bl FUN_020169D8 + bl AllocFromHeapAtEnd add r2, r0, #0x0 mov r0, #0x0 str r0, [r2, #0x0] @@ -1570,7 +1570,7 @@ _0204955A: str r0, [r4, #0x0] b _02049570 _02049568: - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x1 pop {r3-r7, pc} _02049570: @@ -1786,7 +1786,7 @@ _020496FE: str r0, [r4, #0x0] b _02049712 _0204970A: - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x1 pop {r3-r7, pc} _02049712: @@ -1803,7 +1803,7 @@ FUN_02049718: ; 0x02049718 mov r0, #0xb mov r1, #0x1c add r6, r2, #0x0 - bl FUN_020169D8 + bl AllocFromHeapAtEnd mov r1, #0x0 mov r2, #0x1c add r7, r0, #0x0 @@ -1844,7 +1844,7 @@ FUN_0204976C: ; 0x0204976C add r4, r0, #0x0 mov r0, #0xb mov r1, #0x40 - bl FUN_020169D8 + bl AllocFromHeapAtEnd add r5, r0, #0x0 mov r1, #0x0 str r1, [r5, #0x0] @@ -2137,7 +2137,7 @@ _020499D0: ldr r0, [r5, #0x34] bl FUN_020587B0 add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap add sp, #0x8 mov r0, #0x1 pop {r4-r6, pc} @@ -2231,7 +2231,7 @@ _02049A96: mov r0, #0x1 bl MOD18_02247970 add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap add sp, #0x8 mov r0, #0x1 pop {r4-r6, pc} @@ -2370,7 +2370,7 @@ _02049BBE: str r0, [r4, #0x0] b _02049BDC _02049BD2: - bl FUN_02016A18 + bl FreeToHeap add sp, #0x8 mov r0, #0x1 pop {r4-r6, pc} @@ -2480,7 +2480,7 @@ _02049C9C: add r0, r5, #0x0 bl FUN_02048AE4 add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x1 pop {r3-r5, pc} _02049CAC: @@ -2496,7 +2496,7 @@ FUN_02049CB0: ; 0x02049CB0 add r7, r0, #0x0 mov r0, #0xb mov r1, #0x18 - bl FUN_020169D8 + bl AllocFromHeapAtEnd add r4, r0, #0x0 add r0, r7, #0x0 bl FUN_0203739C @@ -2598,7 +2598,7 @@ _02049D80: b _02049D98 _02049D8E: add r0, r5, #0x0 - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x1 pop {r3-r7, pc} _02049D98: @@ -2615,7 +2615,7 @@ FUN_02049D9C: ; 0x02049D9C add r4, r0, #0x0 mov r0, #0xb mov r1, #0x1c - bl FUN_020169D8 + bl AllocFromHeapAtEnd add r6, r0, #0x0 mov r1, #0x0 mov r2, #0x1c @@ -2726,7 +2726,7 @@ _02049E88: b _02049E9E _02049E94: add r0, r5, #0x0 - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x1 pop {r3-r7, pc} _02049E9E: @@ -2746,7 +2746,7 @@ FUN_02049EA4: ; 0x02049EA4 add r7, r0, #0x0 mov r0, #0xb mov r1, #0x1c - bl FUN_020169D8 + bl AllocFromHeapAtEnd mov r1, #0x0 mov r2, #0x1c add r4, r0, #0x0 @@ -2838,7 +2838,7 @@ _02049F68: str r0, [r4, #0x0] b _02049F8E _02049F86: - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x1 pop {r4-r6, pc} _02049F8E: @@ -2866,7 +2866,7 @@ FUN_02049F98: ; 0x02049F98 str r0, [r4, #0x6c] mov r0, #0xb mov r1, #0x1c - bl FUN_020169D8 + bl AllocFromHeapAtEnd add r2, r0, #0x0 ldr r0, [sp, #0x30] str r5, [sp, #0x4] diff --git a/arm9/asm/unk_0204A01C.s b/arm9/asm/unk_0204A01C.s index c548c2a1..72deacec 100644 --- a/arm9/asm/unk_0204A01C.s +++ b/arm9/asm/unk_0204A01C.s @@ -81,7 +81,7 @@ FUN_0204A048: ; 0x0204A048 bl FUN_0202C144 _0204A0BC: add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap add r0, r5, #0x0 add sp, #0x20 pop {r3-r7, pc} @@ -119,7 +119,7 @@ FUN_0204A0C8: ; 0x0204A0C8 bl FUN_0206B900 add r5, r0, #0x0 add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap add r0, r5, #0x0 add sp, #0xc pop {r4-r7, pc} diff --git a/arm9/asm/unk_0204A368.s b/arm9/asm/unk_0204A368.s index 2a9c2b16..6a4e5e9b 100644 --- a/arm9/asm/unk_0204A368.s +++ b/arm9/asm/unk_0204A368.s @@ -13,7 +13,7 @@ FUN_0204A368: ; 0x0204A368 bne _0204A388 ldr r1, _0204A38C ; =0x000080E2 mov r0, #0xb - bl FUN_02016998 + bl AllocFromHeap str r0, [r5, #0x54] ldr r0, [r5, #0x28] ldr r1, [r5, #0x54] @@ -31,7 +31,7 @@ FUN_0204A390: ; 0x0204A390 ldr r0, [r4, #0x54] cmp r0, #0x0 beq _0204A3A2 - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x0 str r0, [r4, #0x54] _0204A3A2: @@ -98,7 +98,7 @@ _0204A402: _0204A410: mov r0, #0x43 mov r1, #0xb - bl FUN_02006670 + bl NARC_ctor add r7, r0, #0x0 ldr r0, [sp, #0xc] mov r6, #0x0 @@ -119,7 +119,7 @@ _0204A42E: mov r2, #0x10 add r0, r7, #0x0 lsl r3, r2, #0x7 - bl FUN_02006814 + bl NARC_ReadFromMember mov r0, #0x1 lsl r0, r0, #0xa add r5, r5, r0 @@ -130,7 +130,7 @@ _0204A42E: blt _0204A42E _0204A452: add r0, r7, #0x0 - bl FUN_020066F4 + bl NARC_dtor add sp, #0x3c pop {r4-r7, pc} diff --git a/arm9/asm/unk_0204AEA8.s b/arm9/asm/unk_0204AEA8.s index b674274a..018a64e2 100644 --- a/arm9/asm/unk_0204AEA8.s +++ b/arm9/asm/unk_0204AEA8.s @@ -37,7 +37,7 @@ _0204AEE6: ldr r1, [r4, #0x4] cmp r1, #0x1 bne _0204AEF4 - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x1 pop {r3-r5, pc} _0204AEF4: @@ -52,7 +52,7 @@ FUN_0204AEF8: ; 0x0204AEF8 mov r0, #0xb mov r1, #0x10 add r4, r2, #0x0 - bl FUN_020169D8 + bl AllocFromHeapAtEnd add r2, r0, #0x0 mov r0, #0x0 str r0, [r2, #0x0] diff --git a/arm9/asm/unk_0204B34C.s b/arm9/asm/unk_0204B34C.s index 021aad07..dd43d375 100644 --- a/arm9/asm/unk_0204B34C.s +++ b/arm9/asm/unk_0204B34C.s @@ -72,7 +72,7 @@ FUN_0204B388: ; 0x0204B388 add r5, r0, #0x0 add r0, r6, #0x0 mov r1, #0x64 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0x0 mov r1, #0x0 mov r2, #0x64 @@ -94,9 +94,9 @@ FUN_0204B3B8: ; 0x0204B3B8 add r4, r0, #0x0 bl FUN_0204B444 ldr r0, [r4, #0x4] - bl FUN_02016A18 + bl FreeToHeap add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} .balign 4 @@ -117,7 +117,7 @@ FUN_0204B3D0: ; 0x0204B3D0 add r2, r6, #0x0 bl FUN_020253E0 add r0, r5, #0x0 - bl FUN_02016A18 + bl FreeToHeap pop {r4-r6, pc} _0204B3FA: ldr r0, [r0, #0x18] @@ -140,7 +140,7 @@ FUN_0204B410: ; 0x0204B410 bl MOD05_021E4C54 add r1, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_02016998 + bl AllocFromHeap str r0, [r5, #0x60] ldr r2, [r5, #0x60] add r0, r4, #0x0 @@ -826,7 +826,7 @@ _0204B972: bl FUN_020553A0 bl FUN_02058908 add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x1 pop {r3-r5, pc} _0204B98E: @@ -843,7 +843,7 @@ FUN_0204B9A0: ; 0x0204B9A0 add r5, r0, #0x0 mov r0, #0x20 mov r1, #0x10 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0x0 mov r0, #0x0 str r0, [r4, #0x0] diff --git a/arm9/asm/unk_0204B9EC.s b/arm9/asm/unk_0204B9EC.s index dd899387..9c90b25f 100644 --- a/arm9/asm/unk_0204B9EC.s +++ b/arm9/asm/unk_0204B9EC.s @@ -166,7 +166,7 @@ _0204BB08: mov r1, #0x83 mov r2, #0x0 mul r3, r4 - bl FUN_02006548 + bl ReadFromNarcMemberByIdPair pop {r3-r5, pc} .balign 4 _0204BB1C: .word 0x000001ED @@ -232,7 +232,7 @@ _0204BB72: cmp r6, #0x6 blt _0204BB3C add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap add sp, #0x10 pop {r3-r7, pc} .balign 4 @@ -495,7 +495,7 @@ FUN_0204BD40: ; 0x0204BD40 mov r2, #0x1 bl FUN_020479FC add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap add r0, r7, #0x0 pop {r3-r7, pc} .balign 4 diff --git a/arm9/asm/unk_0204C1B4.s b/arm9/asm/unk_0204C1B4.s index ecfb8a01..73f9c7a5 100644 --- a/arm9/asm/unk_0204C1B4.s +++ b/arm9/asm/unk_0204C1B4.s @@ -29,7 +29,7 @@ FUN_0204C1B4: ; 0x0204C1B4 mov r1, #0x20 add r4, r2, #0x0 add r6, r3, #0x0 - bl FUN_02016998 + bl AllocFromHeap add r2, r0, #0x0 str r5, [r2, #0x4] str r4, [r2, #0x8] @@ -95,7 +95,7 @@ _0204C23C: ldr r0, [r0, #0x1c] bl MOD05_021F45E8 add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap add sp, #0xc mov r0, #0x1 pop {r4-r5, pc} @@ -114,7 +114,7 @@ FUN_0204C260: ; 0x0204C260 mov r1, #0x24 add r4, r2, #0x0 add r6, r3, #0x0 - bl FUN_020169D8 + bl AllocFromHeapAtEnd add r2, r0, #0x0 mov r0, #0x0 str r0, [r2, #0x0] @@ -145,7 +145,7 @@ FUN_0204C29C: ; 0x0204C29C mov r1, #0x24 str r2, [sp, #0x0] str r3, [sp, #0x4] - bl FUN_020169D8 + bl AllocFromHeapAtEnd add r6, r0, #0x0 mov r4, #0x0 str r4, [r6, #0x0] @@ -348,7 +348,7 @@ _0204C41E: str r0, [r4, #0x0] b _0204C458 _0204C450: - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x1 pop {r3-r7, pc} _0204C458: diff --git a/arm9/asm/unk_0204CB20.s b/arm9/asm/unk_0204CB20.s index 3554e6be..d738b304 100644 --- a/arm9/asm/unk_0204CB20.s +++ b/arm9/asm/unk_0204CB20.s @@ -71,7 +71,7 @@ _0204CB40: bl MOD18_02244D1C add r1, r0, #0x0 mov r0, #0xf - bl FUN_02016998 + bl AllocFromHeap ldr r1, _0204CC34 ; =UNK_021C5A68 ldr r2, [r1, #0x0] str r0, [r2, #0x4] @@ -281,7 +281,7 @@ _0204CCF0: ldr r0, [r1, r0] cmp r0, #0x0 beq _0204CD0E - bl FUN_02016A18 + bl FreeToHeap ldr r0, [r7, #0x0] mov r1, #0x0 add r2, r0, r5 @@ -326,11 +326,11 @@ _0204CD2C: ldr r0, _0204CD70 ; =UNK_021C5A68 ldr r0, [r0, #0x0] ldr r0, [r0, #0x4] - bl FUN_02016A18 + bl FreeToHeap _0204CD60: ldr r0, _0204CD70 ; =UNK_021C5A68 ldr r0, [r0, #0x0] - bl FUN_02016A18 + bl FreeToHeap ldr r0, _0204CD70 ; =UNK_021C5A68 mov r1, #0x0 str r1, [r0, #0x0] @@ -4559,7 +4559,7 @@ FUN_0204ED9C: ; 0x0204ED9C ldr r0, [r1, r0] cmp r0, #0x0 beq _0204EDE2 - bl FUN_02016A18 + bl FreeToHeap ldr r2, _0204EDE8 ; =UNK_021C5A68 lsl r1, r4, #0x2 ldr r3, [r2, #0x0] @@ -4616,7 +4616,7 @@ FUN_0204EDEC: ; 0x0204EDEC ldr r0, [r1, r0] cmp r0, #0x0 beq _0204EE2A - bl FUN_02016A18 + bl FreeToHeap _0204EE2A: mov r0, #0x9e lsl r0, r0, #0x2 @@ -5027,7 +5027,7 @@ FUN_0204F124: ; 0x0204F124 cmp r0, #0x0 bne _0204F14A add r0, r5, #0x0 - bl FUN_02016A18 + bl FreeToHeap add r0, r6, #0x0 bl FUN_0200CAB4 pop {r3-r7, pc} @@ -5048,7 +5048,7 @@ _0204F156: add r0, #0xea strb r1, [r0, #0x0] add r0, r5, #0x0 - bl FUN_02016A18 + bl FreeToHeap add r0, r6, #0x0 bl FUN_0200CAB4 _0204F172: @@ -5062,7 +5062,7 @@ FUN_0204F178: ; 0x0204F178 add r4, r0, #0x0 mov r0, #0xb mov r1, #0x8 - bl FUN_02016998 + bl AllocFromHeap add r1, r0, #0x0 mov r2, #0x0 str r2, [r1, #0x0] @@ -6067,7 +6067,7 @@ _0204F990: add r0, r5, #0x0 bl FUN_02021A20 add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap pop {r3-r5, pc} nop _0204F9B0: .word UNK_021C5A68 @@ -6186,7 +6186,7 @@ FUN_0204FA78: ; 0x0204FA78 ldr r0, [r1, r0] cmp r0, #0x0 beq _0204FA98 - bl FUN_02016A18 + bl FreeToHeap _0204FA98: mov r0, #0xf lsl r4, r5, #0x2 diff --git a/arm9/asm/unk_0204FBA8.s b/arm9/asm/unk_0204FBA8.s index 6a1223dd..c64ebb9f 100644 --- a/arm9/asm/unk_0204FBA8.s +++ b/arm9/asm/unk_0204FBA8.s @@ -64,7 +64,7 @@ FUN_0204FBB0: ; 0x0204FBB0 bl FUN_0208881C mov r0, #0xf mov r1, #0x48 - bl FUN_02016998 + bl AllocFromHeap ldr r1, _0204FC08 ; =UNK_021C5A6C mov r2, #0x48 str r0, [r1, #0x0] @@ -114,7 +114,7 @@ _0204FC26: ldr r0, [r0, r5] cmp r0, #0x0 beq _0204FC32 - bl FUN_02016A18 + bl FreeToHeap _0204FC32: add r4, r4, #0x1 add r5, r5, #0x4 @@ -125,11 +125,11 @@ _0204FC32: ldr r0, [r0, #0x44] cmp r0, #0x0 beq _0204FC48 - bl FUN_02016A18 + bl FreeToHeap _0204FC48: ldr r0, _0204FC58 ; =UNK_021C5A6C ldr r0, [r0, #0x0] - bl FUN_02016A18 + bl FreeToHeap ldr r0, _0204FC58 ; =UNK_021C5A6C mov r1, #0x0 str r1, [r0, #0x0] @@ -577,7 +577,7 @@ _0204FFCA: bne _0204FFDE ldr r1, _0205001C ; =0x0000066C add r0, r7, #0x0 - bl FUN_02016998 + bl AllocFromHeap ldr r1, [r6, #0x0] str r0, [r1, r5] _0204FFDE: @@ -1443,7 +1443,7 @@ FUN_020506C8: ; 0x020506C8 bl FUN_0204D320 add r1, r0, #0x0 mov r0, #0xf - bl FUN_02016998 + bl AllocFromHeap ldr r1, _02050720 ; =UNK_021C5A6C mov r2, #0x0 ldr r1, [r1, #0x0] @@ -1585,7 +1585,7 @@ FUN_020507F8: ; 0x020507F8 bl FUN_0204D320 add r1, r0, #0x0 mov r0, #0xf - bl FUN_02016998 + bl AllocFromHeap ldr r1, _0205084C ; =UNK_021C5A6C mov r2, #0x0 ldr r1, [r1, #0x0] @@ -1690,7 +1690,7 @@ _020508E6: ldr r0, [r0, r5] cmp r0, #0x0 beq _020508F8 - bl FUN_02016A18 + bl FreeToHeap ldr r1, [r6, #0x0] mov r0, #0x0 str r0, [r1, r5] @@ -1944,7 +1944,7 @@ _02050ADE: ldr r0, _02050B00 ; =UNK_021C5A6C ldr r0, [r0, #0x0] ldr r0, [r0, #0x44] - bl FUN_02016A18 + bl FreeToHeap ldr r0, _02050B00 ; =UNK_021C5A6C mov r1, #0x0 ldr r0, [r0, #0x0] diff --git a/arm9/asm/unk_02050E48.s b/arm9/asm/unk_02050E48.s index 80e6b7fb..00281e8b 100644 --- a/arm9/asm/unk_02050E48.s +++ b/arm9/asm/unk_02050E48.s @@ -24,7 +24,7 @@ FUN_02050E48: ; 0x02050E48 str r2, [sp, #0x0] str r3, [sp, #0x4] ldr r6, [r5, #0xc] - bl FUN_020169D8 + bl AllocFromHeapAtEnd mov r1, #0x0 mov r2, #0x30 add r4, r0, #0x0 @@ -79,7 +79,7 @@ FUN_02050ED4: ; 0x02050ED4 add r5, r0, #0x0 add r0, r1, #0x0 mov r1, #0x40 - bl FUN_02016998 + bl AllocFromHeap mov r1, #0x0 mov r2, #0x40 add r4, r0, #0x0 @@ -235,7 +235,7 @@ _02051006: add r0, #0x3c strb r1, [r0, #0x0] ldr r0, [r4, #0x4] - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x0 str r0, [r4, #0x4] mov r0, #0x1 @@ -258,7 +258,7 @@ _02051032: add r0, #0x3c strb r1, [r0, #0x0] ldr r0, [r4, #0x0] - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x0 str r0, [r4, #0x0] mov r0, #0x1 @@ -479,7 +479,7 @@ _020511E4: add r0, r4, #0x0 bl FUN_02051998 add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap add sp, #0x8 mov r0, #0x1 pop {r3-r5, pc} @@ -487,7 +487,7 @@ _020511F6: add r0, r4, #0x0 bl FUN_02051998 add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap bl FUN_0204F7FC add sp, #0x8 mov r0, #0x1 @@ -1295,7 +1295,7 @@ FUN_02051880: ; 0x02051880 _0205188E: mov r0, #0xb mov r1, #0x8c - bl FUN_020169D8 + bl AllocFromHeapAtEnd add r4, r0, #0x0 mov r1, #0x0 mov r2, #0x8c @@ -1370,11 +1370,11 @@ _02051938: add r6, r0, #0x0 mov r0, #0xb add r1, r6, #0x0 - bl FUN_020169D8 + bl AllocFromHeapAtEnd str r0, [r4, #0x4c] mov r0, #0xb add r1, r6, #0x0 - bl FUN_020169D8 + bl AllocFromHeapAtEnd str r0, [r4, #0x48] mov r0, #0xb bl FUN_0206B8AC @@ -1421,17 +1421,17 @@ FUN_02051998: ; 0x02051998 ldr r0, [r4, #0x50] cmp r0, #0x0 beq _020519A6 - bl FUN_02016A18 + bl FreeToHeap _020519A6: ldr r0, [r4, #0x4c] cmp r0, #0x0 beq _020519B0 - bl FUN_02016A18 + bl FreeToHeap _020519B0: ldr r0, [r4, #0x48] cmp r0, #0x0 beq _020519BA - bl FUN_02016A18 + bl FreeToHeap _020519BA: ldr r0, [r4, #0x2c] bl FUN_0200A8B8 @@ -2259,7 +2259,7 @@ _0205200C: _02052028: bl FUN_0204F7FC add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x1 pop {r4-r6, pc} _02052036: @@ -2299,7 +2299,7 @@ _02052066: bne _0205209C mov r0, #0xb mov r1, #0x2c - bl FUN_020169D8 + bl AllocFromHeapAtEnd add r2, r0, #0x0 str r4, [r2, #0x24] mov r0, #0x0 diff --git a/arm9/asm/unk_020520AC.s b/arm9/asm/unk_020520AC.s index 67c8fee6..1cd297c6 100644 --- a/arm9/asm/unk_020520AC.s +++ b/arm9/asm/unk_020520AC.s @@ -187,7 +187,7 @@ _0205211E: mov r1, #0x19 mov r0, #0x1f lsl r1, r1, #0x4 - bl FUN_02016998 + bl AllocFromHeap mov r2, #0x19 mov r1, #0x0 lsl r2, r2, #0x4 @@ -623,7 +623,7 @@ FUN_020524A0: ; 0x020524A0 ldr r0, [r4, #0xc] bl FUN_0200CAB4 add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x1f bl FUN_020168D0 _020524B8: @@ -1889,7 +1889,7 @@ _02052DBA: str r4, [sp, #0x4] bl FUN_0200ABB4 add r0, r6, #0x0 - bl FUN_02016A18 + bl FreeToHeap add r0, r7, #0x0 bl FUN_0200A8B8 _02052DE0: @@ -2003,15 +2003,15 @@ FUN_02052EAC: ; 0x02052EAC mov r0, #0x62 lsl r0, r0, #0x2 ldr r0, [r4, r0] - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x63 lsl r0, r0, #0x2 ldr r0, [r4, r0] - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x61 lsl r0, r0, #0x2 ldr r0, [r4, r0] - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} thumb_func_start FUN_02052ED0 diff --git a/arm9/asm/unk_02052EE8.s b/arm9/asm/unk_02052EE8.s index cb26e956..0ebe0995 100644 --- a/arm9/asm/unk_02052EE8.s +++ b/arm9/asm/unk_02052EE8.s @@ -17,7 +17,7 @@ FUN_02052EE8: ; 0x02052EE8 ldr r1, _02052F58 ; =0x000004E8 add r5, r0, #0x0 mov r0, #0x1f - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0x0 ldr r2, _02052F58 ; =0x000004E8 mov r0, #0x0 @@ -115,7 +115,7 @@ FUN_02052FA4: ; 0x02052FA4 mov r0, #0x59 bl FUN_020168D0 add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} .balign 4 _02052FC4: .word 0x000004DC @@ -913,7 +913,7 @@ FUN_020535E0: ; 0x020535E0 push {r4, lr} add r4, r0, #0x0 ldr r0, [r4, #0x0] - bl FUN_02016A18 + bl FreeToHeap ldr r0, [r4, #0x4] cmp r0, #0x0 beq _020535F4 @@ -946,7 +946,7 @@ FUN_02053618: ; 0x02053618 push {r4, lr} mov r1, #0x35 lsl r1, r1, #0x4 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0x0 bl FUN_020535BC add r0, r4, #0x0 @@ -958,5 +958,5 @@ FUN_0205362C: ; 0x0205362C add r4, r0, #0x0 bl FUN_02053600 add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} diff --git a/arm9/asm/unk_0205363C.s b/arm9/asm/unk_0205363C.s index 2b8e2a3a..5dc182e1 100644 --- a/arm9/asm/unk_0205363C.s +++ b/arm9/asm/unk_0205363C.s @@ -170,7 +170,7 @@ FUN_02053708: ; 0x02053708 add r4, r0, #0x0 add r0, r5, #0x0 lsl r1, r1, #0x6 - bl FUN_02016998 + bl AllocFromHeap add r5, r0, #0x0 ldr r0, [sp, #0x0] mov r2, #0x0 @@ -187,7 +187,7 @@ _02053734: cmp r2, r0 blt _02053734 add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap add r0, r5, #0x0 add sp, #0x4 pop {r3-r6, pc} diff --git a/arm9/asm/unk_02053750.s b/arm9/asm/unk_02053750.s index 0de67652..46b1ef06 100644 --- a/arm9/asm/unk_02053750.s +++ b/arm9/asm/unk_02053750.s @@ -989,7 +989,7 @@ _02053E24: bl FUN_02008BE0 str r0, [r5, #0x4] add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap add sp, #0x18 pop {r3-r7, pc} nop @@ -1008,7 +1008,7 @@ FUN_02053E8C: ; 0x02053E8C bl FUN_0200965C add r1, r0, #0x0 mov r0, #0x4 - bl FUN_020169D8 + bl AllocFromHeapAtEnd add r4, r0, #0x0 mov r0, #0x4 add r1, r6, #0x0 @@ -1018,7 +1018,7 @@ FUN_02053E8C: ; 0x02053E8C mov r2, #0x4 bl FUN_02009668 add r0, r6, #0x0 - bl FUN_02016A18 + bl FreeToHeap cmp r5, #0x0 beq _02053ED0 add r0, r4, #0x0 @@ -1039,7 +1039,7 @@ _02053ED2: add r0, r4, #0x0 bl FUN_020096B4 add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap add r0, r5, #0x0 pop {r3-r7, pc} .balign 4 @@ -1253,7 +1253,7 @@ FUN_02054088: ; 0x02054088 add r5, r1, #0x0 mov r0, #0x4 mov r1, #0x14 - bl FUN_02016998 + bl AllocFromHeap str r0, [r5, #0x0] mov r2, #0x14 mov r1, #0x0 @@ -1372,7 +1372,7 @@ FUN_02054168: ; 0x02054168 add r5, r1, #0x0 mov r0, #0x4 mov r1, #0x14 - bl FUN_02016998 + bl AllocFromHeap str r0, [r5, #0x0] mov r2, #0x14 mov r1, #0x0 @@ -1443,7 +1443,7 @@ FUN_020541E8: ; 0x020541E8 add r5, r1, #0x0 mov r0, #0x4 mov r1, #0x14 - bl FUN_02016998 + bl AllocFromHeap str r0, [r5, #0x0] mov r2, #0x14 mov r1, #0x0 @@ -1542,7 +1542,7 @@ FUN_020542A4: ; 0x020542A4 add r5, r1, #0x0 mov r0, #0x4 mov r1, #0x18 - bl FUN_02016998 + bl AllocFromHeap str r0, [r5, #0x0] mov r2, #0x18 mov r1, #0x0 @@ -1703,7 +1703,7 @@ FUN_020543D8: ; 0x020543D8 add r5, r1, #0x0 mov r0, #0x4 mov r1, #0x18 - bl FUN_02016998 + bl AllocFromHeap str r0, [r5, #0x0] mov r2, #0x18 mov r1, #0x0 @@ -1861,7 +1861,7 @@ FUN_02054508: ; 0x02054508 add r5, r1, #0x0 mov r0, #0x4 mov r1, #0x14 - bl FUN_02016998 + bl AllocFromHeap str r0, [r5, #0x0] mov r2, #0x14 mov r1, #0x0 diff --git a/arm9/asm/unk_02054C14.s b/arm9/asm/unk_02054C14.s index fdd8674f..5d88393f 100644 --- a/arm9/asm/unk_02054C14.s +++ b/arm9/asm/unk_02054C14.s @@ -456,7 +456,7 @@ _02054F28: add r1, sp, #0x0 bl FUN_02058BB4 add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap add sp, #0xc mov r0, #0x1 pop {r4-r5, pc} @@ -475,7 +475,7 @@ FUN_02054F50: ; 0x02054F50 str r0, [sp, #0x0] mov r0, #0xb mov r1, #0x14 - bl FUN_020169D8 + bl AllocFromHeapAtEnd mov r1, #0x0 mov r2, #0x14 add r4, r0, #0x0 @@ -561,7 +561,7 @@ FUN_02054FE4: ; 0x02054FE4 cmp r1, #0x0 bne _02055028 add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x1 pop {r4, pc} _02055028: @@ -578,7 +578,7 @@ FUN_0205502C: ; 0x0205502C str r0, [sp, #0x0] mov r0, #0xb mov r1, #0xc - bl FUN_020169D8 + bl AllocFromHeapAtEnd add r4, r0, #0x0 mov r1, #0x0 mov r2, #0xc diff --git a/arm9/asm/unk_02055068.s b/arm9/asm/unk_02055068.s index 93414ed4..7db8d152 100644 --- a/arm9/asm/unk_02055068.s +++ b/arm9/asm/unk_02055068.s @@ -116,10 +116,10 @@ _0205515C: thumb_func_start FUN_02055160 FUN_02055160: ; 0x02055160 - ldr r3, _02055164 ; =FUN_02016A18 + ldr r3, _02055164 ; =FreeToHeap bx r3 .balign 4 -_02055164: .word FUN_02016A18 +_02055164: .word FreeToHeap thumb_func_start FUN_02055168 FUN_02055168: ; 0x02055168 @@ -136,7 +136,7 @@ FUN_0205517C: ; 0x0205517C push {r4, lr} mov r0, #0xb mov r1, #0x3c - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0x0 bne _0205518E bl ErrorHandling diff --git a/arm9/asm/unk_02057380.s b/arm9/asm/unk_02057380.s index bd919430..1e79f8c0 100644 --- a/arm9/asm/unk_02057380.s +++ b/arm9/asm/unk_02057380.s @@ -107,7 +107,7 @@ FUN_02057444: ; 0x02057444 add r4, r0, #0x0 mov r0, #0xb lsl r1, r1, #0x2 - bl FUN_02016998 + bl AllocFromHeap add r5, r0, #0x0 bne _0205745A bl ErrorHandling @@ -123,7 +123,7 @@ _0205745A: mul r6, r0 mov r0, #0xb add r1, r6, #0x0 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0x0 bne _0205747E bl ErrorHandling @@ -967,7 +967,7 @@ _02057BC0: str r0, [sp, #0x4] ldr r1, [sp, #0x4] mov r0, #0xb - bl FUN_020169D8 + bl AllocFromHeapAtEnd add r6, r0, #0x0 bne _02057BD4 bl ErrorHandling @@ -978,7 +978,7 @@ _02057BD4: bl memcpy mov r0, #0xb mov r1, #0x14 - bl FUN_020169D8 + bl AllocFromHeapAtEnd add r4, r0, #0x0 bne _02057BEE bl ErrorHandling diff --git a/arm9/asm/unk_0205AD98.s b/arm9/asm/unk_0205AD98.s index b1d29854..bc0fa0dd 100644 --- a/arm9/asm/unk_0205AD98.s +++ b/arm9/asm/unk_0205AD98.s @@ -157,7 +157,7 @@ FUN_0205AEA4: ; 0x0205AEA4 add r6, r1, #0x0 mov r0, #0x4 mov r1, #0x14 - bl FUN_020169D8 + bl AllocFromHeapAtEnd add r4, r0, #0x0 bne _0205AEBA bl ErrorHandling diff --git a/arm9/asm/unk_0205C598.s b/arm9/asm/unk_0205C598.s index 5f1584b2..51030e32 100644 --- a/arm9/asm/unk_0205C598.s +++ b/arm9/asm/unk_0205C598.s @@ -675,7 +675,7 @@ FUN_0205CA80: ; 0x0205CA80 mov r1, #0x2c add r7, r2, #0x0 str r3, [sp, #0x0] - bl FUN_020169D8 + bl AllocFromHeapAtEnd add r4, r0, #0x0 bne _0205CA9A bl ErrorHandling diff --git a/arm9/asm/unk_0205CE48.s b/arm9/asm/unk_0205CE48.s index e6a4b0ac..91a7f21a 100644 --- a/arm9/asm/unk_0205CE48.s +++ b/arm9/asm/unk_0205CE48.s @@ -145,7 +145,7 @@ FUN_0205CF10: ; 0x0205CF10 mov r1, #0xc add r6, r2, #0x0 add r7, r3, #0x0 - bl FUN_02016998 + bl AllocFromHeap str r5, [r0, #0x0] strh r4, [r0, #0x4] strh r6, [r0, #0x6] @@ -263,7 +263,7 @@ _0205CFC6: b _0205D020 _0205D016: add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x1 pop {r3-r7, pc} _0205D020: @@ -282,7 +282,7 @@ FUN_0205D024: ; 0x0205D024 add r7, r0, #0x0 mov r0, #0xb mov r1, #0x40 - bl FUN_02016998 + bl AllocFromHeap mov r1, #0x0 mov r2, #0x40 add r4, r0, #0x0 @@ -765,7 +765,7 @@ FUN_0205D400: ; 0x0205D400 add r7, r0, #0x0 mov r0, #0xb mov r1, #0x40 - bl FUN_02016998 + bl AllocFromHeap mov r1, #0x0 mov r2, #0x40 add r4, r0, #0x0 @@ -989,7 +989,7 @@ FUN_0205D5C4: ; 0x0205D5C4 add r5, r0, #0x0 mov r0, #0xb mov r1, #0x4 - bl FUN_020169D8 + bl AllocFromHeapAtEnd add r4, r0, #0x0 mov r0, #0x0 str r0, [r4, #0x0] @@ -1013,7 +1013,7 @@ FUN_0205D604: ; 0x0205D604 add r4, r0, #0x0 mov r0, #0xb mov r1, #0x4 - bl FUN_020169D8 + bl AllocFromHeapAtEnd add r2, r0, #0x0 mov r0, #0x0 str r0, [r2, #0x0] @@ -1132,7 +1132,7 @@ FUN_0205D6BC: ; 0x0205D6BC str r0, [sp, #0x0] ldr r1, [sp, #0x0] mov r0, #0xb - bl FUN_020169D8 + bl AllocFromHeapAtEnd ldr r2, [sp, #0x0] mov r1, #0x0 add r7, r0, #0x0 @@ -1379,7 +1379,7 @@ FUN_0205D8B8: ; 0x0205D8B8 add r5, r0, #0x0 mov r0, #0xb mov r1, #0x18 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0x0 mov r0, #0x0 strh r0, [r4, #0x16] @@ -1475,7 +1475,7 @@ _0205D984: ldr r0, [r4, #0x10] bl FUN_02021A20 add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x1 pop {r3-r5, pc} _0205D9A0: @@ -1496,7 +1496,7 @@ FUN_0205D9A8: ; 0x0205D9A8 add r7, r0, #0x0 mov r0, #0xb mov r1, #0x40 - bl FUN_02016998 + bl AllocFromHeap mov r1, #0x0 mov r2, #0x40 add r4, r0, #0x0 @@ -1728,7 +1728,7 @@ _0205DB66: _0205DB9C: mov r0, #0xb mov r1, #0x2c - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0x0 mov r1, #0x0 mov r2, #0x2c @@ -1762,7 +1762,7 @@ _0205DBE0: cmp r5, #0x0 bne _0205DBEA add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap _0205DBEA: mov r0, #0x1 pop {r3-r7, pc} @@ -1776,7 +1776,7 @@ FUN_0205DBF0: ; 0x0205DBF0 add r6, r1, #0x0 mov r0, #0xb mov r1, #0x18 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0x0 mov r0, #0x0 strh r0, [r4, #0x16] @@ -1863,7 +1863,7 @@ _0205DC94: bl FUN_02087E14 b _0205DCB6 _0205DCB2: - bl FUN_02016A18 + bl FreeToHeap _0205DCB6: add r0, r5, #0x0 bl FUN_0204649C @@ -1891,7 +1891,7 @@ _0205DCE2: ldr r0, [r5, #0x34] bl FUN_020587B0 add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x1 pop {r3-r5, pc} _0205DCFA: diff --git a/arm9/asm/unk_0205DD18.s b/arm9/asm/unk_0205DD18.s index 8f679ad1..89ed6bcb 100644 --- a/arm9/asm/unk_0205DD18.s +++ b/arm9/asm/unk_0205DD18.s @@ -13,7 +13,7 @@ UNK_020F7374: ; 0x020F7374 FUN_0205DD18: ; 0x0205DD18 push {r4, lr} mov r1, #0xd4 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0x0 mov r0, #0x1 lsl r0, r0, #0x10 @@ -28,10 +28,10 @@ FUN_0205DD18: ; 0x0205DD18 thumb_func_start FUN_0205DD38 FUN_0205DD38: ; 0x0205DD38 - ldr r3, _0205DD3C ; =FUN_02016A18 + ldr r3, _0205DD3C ; =FreeToHeap bx r3 .balign 4 -_0205DD3C: .word FUN_02016A18 +_0205DD3C: .word FreeToHeap thumb_func_start FUN_0205DD40 FUN_0205DD40: ; 0x0205DD40 @@ -929,7 +929,7 @@ _0205E3CC: str r0, [r5, #0x0] b _0205E3FC _0205E3DE: - bl FUN_02016A18 + bl FreeToHeap ldr r0, [r4, #0x34] bl FUN_020587B0 mov r0, #0x1 diff --git a/arm9/asm/unk_0205EB38.s b/arm9/asm/unk_0205EB38.s index 70ff1ca4..6464bf32 100644 --- a/arm9/asm/unk_0205EB38.s +++ b/arm9/asm/unk_0205EB38.s @@ -36,7 +36,7 @@ FUN_0205EB38: ; 0x0205EB38 mov r1, #0x5b add r0, r4, #0x0 lsl r1, r1, #0x2 - bl FUN_02016998 + bl AllocFromHeap mov r2, #0x5b add r7, r0, #0x0 mov r1, #0x0 @@ -124,7 +124,7 @@ _0205EC02: add r0, r7, #0x0 bl MOD05_021D99F8 add r0, r7, #0x0 - bl FUN_02016A18 + bl FreeToHeap pop {r3-r7, pc} thumb_func_start FUN_0205EC18 diff --git a/arm9/asm/unk_0205F7A0.s b/arm9/asm/unk_0205F7A0.s index d54a1005..0634d08d 100644 --- a/arm9/asm/unk_0205F7A0.s +++ b/arm9/asm/unk_0205F7A0.s @@ -187,7 +187,7 @@ _0205F8F8: _0205F90A: mov r0, #0xb mov r1, #0x4 - bl FUN_020169D8 + bl AllocFromHeapAtEnd mov r1, #0x0 mov r2, #0x4 add r6, r0, #0x0 @@ -323,7 +323,7 @@ _0205FA16: add r0, sp, #0x28 bl FS_CloseFile add r0, r6, #0x0 - bl FUN_02016A18 + bl FreeToHeap add sp, #0x70 pop {r3-r7, pc} nop diff --git a/arm9/asm/unk_0205FA2C.s b/arm9/asm/unk_0205FA2C.s index 7f31bf0b..21beb029 100644 --- a/arm9/asm/unk_0205FA2C.s +++ b/arm9/asm/unk_0205FA2C.s @@ -19,7 +19,7 @@ FUN_0205FA2C: ; 0x0205FA2C add r7, r1, #0x0 add r0, r2, #0x0 mov r1, #0x40 - bl FUN_020169D8 + bl AllocFromHeapAtEnd ldr r6, [r7, #0xc] mov r1, #0x0 mov r2, #0x40 @@ -137,7 +137,7 @@ _0205FB0C: ldrb r0, [r0, #0x0] strb r0, [r5, #0xd] add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap ldr r0, [r5, #0x14] mov r1, #0x0 str r1, [r0, #0x0] @@ -153,7 +153,7 @@ FUN_0205FB34: ; 0x0205FB34 ldr r5, [r7, #0xc] add r0, r2, #0x0 mov r1, #0x30 - bl FUN_020169D8 + bl AllocFromHeapAtEnd mov r1, #0x0 mov r2, #0x30 add r4, r0, #0x0 @@ -219,7 +219,7 @@ _0205FBD2: ldr r0, [r0, #0x0] ldrb r1, [r0, #0x14] strb r1, [r4, #0xd] - bl FUN_02016A18 + bl FreeToHeap ldr r1, [r4, #0x14] mov r0, #0x0 str r0, [r1, #0x0] @@ -273,7 +273,7 @@ _0205FC38: str r0, [r4, #0x4] b _0205FC4A _0205FC42: - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x1 pop {r3-r5, pc} _0205FC4A: @@ -291,7 +291,7 @@ FUN_0205FC50: ; 0x0205FC50 str r0, [sp, #0x0] mov r0, #0xb mov r1, #0x18 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0x0 mov r1, #0x0 mov r2, #0x18 @@ -354,7 +354,7 @@ _0205FCD6: ldr r0, [r0, #0x20] str r0, [r4, #0x0] ldr r0, [r4, #0x8] - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x2 pop {r4, pc} .balign 4 @@ -393,7 +393,7 @@ _0205FD1E: ldr r1, [r4, #0x0] strh r1, [r0, #0x0] add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x1 pop {r3-r5, pc} _0205FD34: @@ -410,7 +410,7 @@ FUN_0205FD38: ; 0x0205FD38 str r0, [sp, #0x0] mov r0, #0xb mov r1, #0x18 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0x0 mov r1, #0x0 mov r2, #0x18 @@ -476,7 +476,7 @@ _0205FDC8: strh r0, [r4, #0x0] _0205FDD2: add r0, r5, #0x0 - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x1 pop {r3-r7, pc} @@ -489,7 +489,7 @@ FUN_0205FDDC: ; 0x0205FDDC add r7, r0, #0x0 mov r0, #0xb mov r1, #0x4 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0x0 mov r1, #0x0 mov r2, #0x4 diff --git a/arm9/asm/unk_0206015C.s b/arm9/asm/unk_0206015C.s index 80f03911..a12d86ab 100644 --- a/arm9/asm/unk_0206015C.s +++ b/arm9/asm/unk_0206015C.s @@ -11,7 +11,7 @@ FUN_0206015C: ; 0x0206015C add r5, r0, #0x0 mov r0, #0xb mov r1, #0x10 - bl FUN_020169D8 + bl AllocFromHeapAtEnd add r4, r0, #0x0 mov r0, #0xb bl MOD06_02244DB0 @@ -219,7 +219,7 @@ _02060312: ldr r0, [r4, #0x0] bl MOD06_02244DBC add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap add sp, #0x10 mov r0, #0x1 pop {r3-r7, pc} diff --git a/arm9/asm/unk_020603B0.s b/arm9/asm/unk_020603B0.s index 43182155..944911fc 100644 --- a/arm9/asm/unk_020603B0.s +++ b/arm9/asm/unk_020603B0.s @@ -264,7 +264,7 @@ _020604D0: mov r1, #0x5 bl FUN_0202AAFC ldr r0, [sp, #0x1c] - bl FUN_02016A18 + bl FreeToHeap ldr r0, [sp, #0x14] bl FUN_0202AA38 add r2, r0, #0x0 diff --git a/arm9/asm/unk_020606B0.s b/arm9/asm/unk_020606B0.s index 065ec292..6a271d62 100644 --- a/arm9/asm/unk_020606B0.s +++ b/arm9/asm/unk_020606B0.s @@ -108,11 +108,11 @@ _02060764: b _0206078A _02060772: ldr r0, [r4, #0x24] - bl FUN_02016A18 + bl FreeToHeap ldr r0, [r4, #0x28] - bl FUN_02016A18 + bl FreeToHeap add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap add sp, #0x8 mov r0, #0x1 pop {r4-r6, pc} @@ -130,7 +130,7 @@ FUN_02060790: ; 0x02060790 mov r1, #0x2c add r6, r2, #0x0 str r3, [sp, #0x0] - bl FUN_02016998 + bl AllocFromHeap mov r1, #0x0 mov r2, #0x2c add r4, r0, #0x0 diff --git a/arm9/asm/unk_020607D4.s b/arm9/asm/unk_020607D4.s index 30ee6c6f..45fc311a 100644 --- a/arm9/asm/unk_020607D4.s +++ b/arm9/asm/unk_020607D4.s @@ -19,7 +19,7 @@ FUN_020607D4: ; 0x020607D4 mov r1, #0x80 add r7, r2, #0x0 str r3, [sp, #0xc] - bl FUN_020169D8 + bl AllocFromHeapAtEnd add r4, r0, #0x0 strb r6, [r4, #0x1] strb r7, [r4, #0x4] @@ -151,7 +151,7 @@ _020608F0: _020608F8: bl ErrorHandling add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap add sp, #0x28 pop {r3-r7, pc} _02060906: @@ -177,7 +177,7 @@ FUN_02060924: ; 0x02060924 mov r0, #0xb mov r1, #0x8 add r6, r2, #0x0 - bl FUN_020169D8 + bl AllocFromHeapAtEnd add r2, r0, #0x0 str r6, [r2, #0x4] strb r4, [r2, #0x0] @@ -222,7 +222,7 @@ _0206097C: pop {r4-r6, pc} _0206098A: add r0, r6, #0x0 - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x1 pop {r4-r6, pc} _02060994: @@ -398,7 +398,7 @@ _02060AE2: strb r0, [r4, #0x0] b _02060B00 _02060AF6: - bl FUN_02016A18 + bl FreeToHeap add sp, #0xc mov r0, #0x1 pop {r3-r6, pc} diff --git a/arm9/asm/unk_02060CCC.s b/arm9/asm/unk_02060CCC.s index 9f15b6a6..a3cdf7b3 100644 --- a/arm9/asm/unk_02060CCC.s +++ b/arm9/asm/unk_02060CCC.s @@ -582,7 +582,7 @@ _02061000: FUN_02061008: ; 0x02061008 push {r4, lr} mov r1, #0x24 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0x0 mov r0, #0x0 add r1, r4, #0x0 @@ -593,10 +593,10 @@ FUN_02061008: ; 0x02061008 thumb_func_start FUN_02061020 FUN_02061020: ; 0x02061020 - ldr r3, _02061024 ; =FUN_02016A18 + ldr r3, _02061024 ; =FreeToHeap bx r3 .balign 4 -_02061024: .word FUN_02016A18 +_02061024: .word FreeToHeap thumb_func_start FUN_02061028 FUN_02061028: ; 0x02061028 @@ -3239,7 +3239,7 @@ FUN_02062474: ; 0x02062474 mov r1, #0x7e mov r2, #0x2 mov r3, #0x0 - bl FUN_02006548 + bl ReadFromNarcMemberByIdPair ldr r0, [sp, #0x8] lsl r0, r0, #0x10 lsr r4, r0, #0x10 @@ -3275,13 +3275,13 @@ _020624C6: mov r1, #0x7e add r3, r4, #0x4 str r2, [sp, #0x0] - bl FUN_02006548 + bl ReadFromNarcMemberByIdPair mov r2, #0x2 add r0, sp, #0x4 mov r1, #0x7e add r3, r4, #0x6 str r2, [sp, #0x0] - bl FUN_02006548 + bl ReadFromNarcMemberByIdPair add r2, sp, #0x4 ldrh r2, [r2, #0x2] add r0, r6, #0x0 diff --git a/arm9/asm/unk_020625EC.s b/arm9/asm/unk_020625EC.s index b35bcecd..a87efb7f 100644 --- a/arm9/asm/unk_020625EC.s +++ b/arm9/asm/unk_020625EC.s @@ -65,7 +65,7 @@ FUN_020625EC: ; 0x020625EC mov r1, #0x2d mov r0, #0x50 lsl r1, r1, #0x4 - bl FUN_02016998 + bl AllocFromHeap mov r2, #0x2d mov r1, #0x0 lsl r2, r2, #0x4 @@ -187,7 +187,7 @@ _020626EC: _020626FE: add r0, r4, #0x0 ldr r5, [r4, #0x0] - bl FUN_02016A18 + bl FreeToHeap mov r2, #0x2d add r0, r4, #0x0 mov r1, #0x0 @@ -647,7 +647,7 @@ FUN_02062A70: ; 0x02062A70 mov r1, #0x3c ldr r0, [r4, #0x0] mul r1, r2 - bl FUN_02016998 + bl AllocFromHeap mov r1, #0xb lsl r1, r1, #0x6 str r0, [r4, r1] @@ -909,7 +909,7 @@ _02062C72: mov r0, #0xb lsl r0, r0, #0x6 ldr r0, [r6, r0] - bl FUN_02016A18 + bl FreeToHeap pop {r3-r7, pc} .balign 4 @@ -2095,7 +2095,7 @@ _02063636: str r0, [r4, #0x0] b _02063646 _0206363E: - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x1 pop {r3-r5, pc} _02063646: @@ -2112,7 +2112,7 @@ FUN_02063650: ; 0x02063650 add r4, r0, #0x0 mov r0, #0xb mov r1, #0xc - bl FUN_02016998 + bl AllocFromHeap add r2, r0, #0x0 mov r0, #0x0 str r0, [r2, #0x0] diff --git a/arm9/asm/unk_02063888.s b/arm9/asm/unk_02063888.s index 6323a3a2..0e213436 100644 --- a/arm9/asm/unk_02063888.s +++ b/arm9/asm/unk_02063888.s @@ -10,7 +10,7 @@ FUN_02063888: ; 0x02063888 mov r1, #0x18 add r4, r2, #0x0 add r6, r3, #0x0 - bl FUN_020169D8 + bl AllocFromHeapAtEnd add r3, r0, #0x0 mov r2, #0x18 mov r1, #0x0 @@ -92,7 +92,7 @@ _02063920: sub r2, r2, #0x2 bl FUN_020492BC add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap _02063942: mov r0, #0x0 add sp, #0x1c diff --git a/arm9/asm/unk_02063948.s b/arm9/asm/unk_02063948.s index 0b3b0e77..fe93cc06 100644 --- a/arm9/asm/unk_02063948.s +++ b/arm9/asm/unk_02063948.s @@ -168,7 +168,7 @@ FUN_02063A5C: ; 0x02063A5C add r4, r1, #0x0 mov r0, #0x20 mov r1, #0x10 - bl FUN_02016998 + bl AllocFromHeap ldr r1, _02063A7C ; =0x19740205 str r1, [r0, #0x0] ldr r1, [r4, #0x8] @@ -192,7 +192,7 @@ FUN_02063A80: ; 0x02063A80 bl ErrorHandling _02063A90: add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} .balign 4 _02063A98: .word 0x19740205 @@ -357,7 +357,7 @@ FUN_02063BBC: ; 0x02063BBC add r4, r0, #0x0 mov r0, #0xb mov r1, #0x4 - bl FUN_02016998 + bl AllocFromHeap ldrh r1, [r5, #0x4] str r1, [r0, #0x0] mov r1, #0x7f @@ -365,7 +365,7 @@ FUN_02063BBC: ; 0x02063BBC str r0, [r4, r1] mov r0, #0xb sub r1, #0xbc - bl FUN_02016998 + bl AllocFromHeap mov r1, #0x7e lsl r1, r1, #0x2 str r0, [r4, r1] @@ -1102,7 +1102,7 @@ FUN_02064174: ; 0x02064174 bl MOD06_0224CB30 add r6, r0, #0x0 add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap ldr r1, _020641A8 ; =0x0224CB55 add r0, r5, #0x0 add r2, r6, #0x0 @@ -1206,7 +1206,7 @@ FUN_02064230: ; 0x02064230 mov r2, #0x1 bl FUN_02028AD4 add r0, r6, #0x0 - bl FUN_02016A18 + bl FreeToHeap ldr r1, _02064280 ; =0x0224CAAD add r0, r5, #0x0 add r2, r7, #0x0 diff --git a/arm9/asm/unk_0206439C.s b/arm9/asm/unk_0206439C.s index fb4ae44d..e9d72f9f 100644 --- a/arm9/asm/unk_0206439C.s +++ b/arm9/asm/unk_0206439C.s @@ -9,7 +9,7 @@ FUN_0206439C: ; 0x0206439C add r5, r1, #0x0 add r6, r2, #0x0 mov r1, #0x8 - bl FUN_020169D8 + bl AllocFromHeapAtEnd add r4, r0, #0x0 add r0, r6, #0x0 bl FUN_0206BB1C diff --git a/arm9/asm/unk_020643C0.s b/arm9/asm/unk_020643C0.s index b51d7c43..bc843c82 100644 --- a/arm9/asm/unk_020643C0.s +++ b/arm9/asm/unk_020643C0.s @@ -273,7 +273,7 @@ _020645D8: .word FUN_020646DC FUN_020645DC: ; 0x020645DC push {r4, lr} mov r1, #0x10 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0x0 bne _020645EC bl ErrorHandling @@ -306,7 +306,7 @@ FUN_0206460C: ; 0x0206460C add r5, r1, #0x0 mul r5, r2 add r1, r5, #0x0 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0x0 bne _02064622 bl ErrorHandling diff --git a/arm9/asm/unk_020647A4.s b/arm9/asm/unk_020647A4.s index 3d3e3279..1abe1353 100644 --- a/arm9/asm/unk_020647A4.s +++ b/arm9/asm/unk_020647A4.s @@ -365,7 +365,7 @@ FUN_020649D4: ; 0x020649D4 _020649FE: mov r0, #0xb mov r1, #0x10 - bl FUN_020169D8 + bl AllocFromHeapAtEnd add r2, r0, #0x0 mov r0, #0x0 str r0, [r2, #0x0] @@ -525,7 +525,7 @@ _02064B2E: str r0, [r4, #0x0] b _02064B5C _02064B52: - bl FUN_02016A18 + bl FreeToHeap add sp, #0x1c mov r0, #0x1 pop {r4-r5, pc} @@ -642,7 +642,7 @@ _02064C24: str r0, [r4, #0x0] b _02064C52 _02064C48: - bl FUN_02016A18 + bl FreeToHeap add sp, #0x1c mov r0, #0x1 pop {r4-r5, pc} diff --git a/arm9/asm/unk_02064E90.s b/arm9/asm/unk_02064E90.s index 8a6f1e4b..9fd903dd 100644 --- a/arm9/asm/unk_02064E90.s +++ b/arm9/asm/unk_02064E90.s @@ -198,7 +198,7 @@ _02065050: .word 0x00000668 FUN_02065054: ; 0x02065054 push {r4, lr} ldr r1, _0206506C ; =0x0000066C - bl FUN_02016998 + bl AllocFromHeap ldr r2, _0206506C ; =0x0000066C mov r1, #0x0 add r4, r0, #0x0 @@ -210,10 +210,10 @@ _0206506C: .word 0x0000066C thumb_func_start FUN_02065070 FUN_02065070: ; 0x02065070 - ldr r3, _02065074 ; =FUN_02016A18 + ldr r3, _02065074 ; =FreeToHeap bx r3 .balign 4 -_02065074: .word FUN_02016A18 +_02065074: .word FreeToHeap thumb_func_start FUN_02065078 FUN_02065078: ; 0x02065078 @@ -587,7 +587,7 @@ FUN_02065344: ; 0x02065344 add r5, r0, #0x0 mov r0, #0xb mov r1, #0x8 - bl FUN_020169D8 + bl AllocFromHeapAtEnd add r4, r0, #0x0 mov r0, #0x0 str r0, [r4, #0x0] @@ -656,7 +656,7 @@ _020653C8: ldr r0, [r4, #0x78] bl FUN_02052EAC add r0, r5, #0x0 - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x1 pop {r3-r5, pc} _020653E2: diff --git a/arm9/asm/unk_020653EC.s b/arm9/asm/unk_020653EC.s index 8094ffba..e454991f 100644 --- a/arm9/asm/unk_020653EC.s +++ b/arm9/asm/unk_020653EC.s @@ -47,7 +47,7 @@ FUN_020653EC: ; 0x020653EC mov r1, #0x6e mov r0, #0x2b lsl r1, r1, #0x2 - bl FUN_02016998 + bl AllocFromHeap mov r2, #0x6e mov r1, #0x0 lsl r2, r2, #0x2 @@ -109,7 +109,7 @@ FUN_02065474: ; 0x02065474 mov r1, #0x14 bl FUN_02066044 add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap ldr r0, [r4, #0x0] bl FUN_020168D0 pop {r4, pc} @@ -666,7 +666,7 @@ _020658E2: add r1, r0, #0x0 add r1, #0x22 ldrb r5, [r1, #0x0] - bl FUN_02016A18 + bl FreeToHeap cmp r5, #0x7 bne _02065912 ldr r1, [r4, #0xc] @@ -832,7 +832,7 @@ _02065A24: add r1, r0, #0x0 add r1, #0x23 ldrb r6, [r1, #0x0] - bl FUN_02016A18 + bl FreeToHeap cmp r6, #0x6 bne _02065A4E cmp r5, #0x7 @@ -877,7 +877,7 @@ _02065A86: mov r0, #0x6d lsl r0, r0, #0x2 ldr r0, [r4, r0] - bl FUN_02016A18 + bl FreeToHeap ldr r2, _02065AE8 ; =0x0000013B ldrb r1, [r4, #0x17] ldrb r2, [r4, r2] @@ -1707,7 +1707,7 @@ _02066134: add r0, r6, r0 strb r2, [r0, #0x1e] add r0, r7, #0x0 - bl FUN_02016A18 + bl FreeToHeap add sp, #0x14 pop {r4-r7, pc} @@ -2368,7 +2368,7 @@ FUN_02066664: ; 0x02066664 _02066676: ldr r0, [r5, #0x0] mov r1, #0x40 - bl FUN_02016998 + bl AllocFromHeap mov r1, #0x0 mov r2, #0x40 add r4, r0, #0x0 @@ -2567,7 +2567,7 @@ _02066802: mov r0, #0x0 pop {r3-r5, pc} _0206680C: - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x1 pop {r3-r5, pc} _02066814: @@ -2581,7 +2581,7 @@ FUN_02066818: ; 0x02066818 add r4, r0, #0x0 mov r0, #0xb mov r1, #0x8 - bl FUN_020169D8 + bl AllocFromHeapAtEnd add r2, r0, #0x0 mov r0, #0x0 str r0, [r2, #0x0] diff --git a/arm9/asm/unk_02066978.s b/arm9/asm/unk_02066978.s index 8cb9aeeb..cb93aaae 100644 --- a/arm9/asm/unk_02066978.s +++ b/arm9/asm/unk_02066978.s @@ -109,7 +109,7 @@ FUN_020669BC: ; 0x020669BC FUN_020669C0: ; 0x020669C0 push {r4, lr} mov r1, #0xec - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0x0 bl FUN_02066978 add r0, r4, #0x0 @@ -292,7 +292,7 @@ FUN_02066ACC: ; 0x02066ACC add r2, r4, #0x0 bl FUN_02067830 add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x0 str r0, [sp, #0x10] add r0, r5, #0x0 @@ -841,7 +841,7 @@ FUN_02066F04: ; 0x02066F04 add r7, r0, #0x0 mov r0, #0x0 mov r1, #0x2c - bl FUN_02016998 + bl AllocFromHeap add r6, r0, #0x0 ldr r1, [sp, #0x38] add r0, r7, #0x0 @@ -1017,7 +1017,7 @@ _0206701E: add r2, sp, #0x3c bl FUN_02067830 add r0, r6, #0x0 - bl FUN_02016A18 + bl FreeToHeap ldr r1, [sp, #0x54] cmp r1, #0x0 bne _0206717C @@ -3729,7 +3729,7 @@ FUN_0206851C: ; 0x0206851C add r5, r0, #0x0 add r0, r1, #0x0 mov r1, #0x2c - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0x0 add r0, r5, #0x0 add r1, r4, #0x0 @@ -3916,7 +3916,7 @@ FUN_02068640: ; 0x02068640 bl ErrorHandling _0206864A: add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} .balign 4 @@ -4069,7 +4069,7 @@ _0206877A: add r0, r4, #0x0 mov r1, #0x3 add r2, r5, #0x0 - bl LoadFromNARC + bl ReadWholeNarcMemberByIdPair pop {r3-r5, pc} .balign 4 @@ -4089,7 +4089,7 @@ _0206879E: mov r1, #0x65 mov r0, #0x0 lsl r1, r1, #0x2 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0x0 add r0, r6, #0x0 add r1, r4, #0x0 @@ -4097,7 +4097,7 @@ _0206879E: lsl r0, r5, #0x2 ldr r5, [r4, r0] add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap add r0, r5, #0x0 pop {r4-r6, pc} @@ -5230,7 +5230,7 @@ _02068FCA: add r0, sp, #0x0 add r1, r4, #0x0 add r2, r3, #0x0 - bl LoadFromNARC + bl ReadWholeNarcMemberByIdPair add r0, sp, #0x0 ldrb r0, [r0, #0x0] pop {r3-r5, pc} @@ -5277,7 +5277,7 @@ FUN_02069010: ; 0x02069010 mov r1, #0x72 mov r2, #0x0 mul r3, r5 - bl FUN_02006548 + bl ReadFromNarcMemberByIdPair add r0, sp, #0xc add r1, r4, #0x0 mov r2, #0x14 @@ -5301,7 +5301,7 @@ FUN_02069038: ; 0x02069038 mov r1, #0x72 mov r2, #0x0 mul r3, r6 - bl FUN_02006548 + bl ReadFromNarcMemberByIdPair cmp r5, #0x2 bne _0206906C add r1, sp, #0x4 @@ -5521,7 +5521,7 @@ _020691E4: _020691EA: mov r0, #0x0 mov r1, #0x2a - bl FUN_02016998 + bl AllocFromHeap str r0, [sp, #0x18] ldr r0, [sp, #0x2c] ldr r1, [sp, #0x18] @@ -5973,7 +5973,7 @@ _0206953E: blt _020694C4 _0206954A: ldr r0, [sp, #0x18] - bl FUN_02016A18 + bl FreeToHeap add r0, r6, #0x0 add sp, #0x44 pop {r4-r7, pc} @@ -6068,7 +6068,7 @@ FUN_020695F4: ; 0x020695F4 add r5, r0, #0x0 mov r0, #0x0 mov r1, #0x2c - bl FUN_02016998 + bl AllocFromHeap str r0, [sp, #0x0] add r0, r5, #0x0 bl FUN_02066A6C @@ -6127,7 +6127,7 @@ _02069672: bne _02069648 _0206967C: ldr r0, [sp, #0x0] - bl FUN_02016A18 + bl FreeToHeap ldr r1, [sp, #0x4] add r0, r5, #0x0 bl FUN_02066A94 @@ -6340,7 +6340,7 @@ FUN_02069818: ; 0x02069818 mov r1, #0x2c str r2, [sp, #0x0] str r0, [sp, #0x8] - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0x0 add r0, r7, #0x0 mov r1, #0x5 @@ -6371,7 +6371,7 @@ FUN_02069818: ; 0x02069818 cmp r2, r0 bne _0206987A add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap add sp, #0x10 mov r0, #0x0 pop {r3-r7, pc} @@ -6393,7 +6393,7 @@ _0206988A: cmp r2, r1 bne _020698A4 add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap add sp, #0x10 mov r0, #0x0 pop {r3-r7, pc} @@ -6420,7 +6420,7 @@ _020698AC: str r0, [sp, #0x8] _020698CC: add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap ldr r0, [sp, #0x8] add sp, #0x10 pop {r3-r7, pc} @@ -6662,7 +6662,7 @@ _02069A8E: add r2, r5, #0x0 bl FUN_02067830 add r0, r5, #0x0 - bl FUN_02016A18 + bl FreeToHeap add r0, r4, #0x0 mov r1, #0xa1 add r2, sp, #0x0 @@ -6734,7 +6734,7 @@ FUN_02069B40: ; 0x02069B40 mov r1, #0x6d mov r2, #0x0 lsl r3, r3, #0x1 - bl FUN_02006548 + bl ReadFromNarcMemberByIdPair add r0, sp, #0x4 ldrh r0, [r0, #0x0] add sp, #0x8 @@ -6756,7 +6756,7 @@ FUN_02069B60: ; 0x02069B60 add r0, sp, #0x4 mov r1, #0x91 lsl r3, r3, #0x1 - bl FUN_02006548 + bl ReadFromNarcMemberByIdPair _02069B7E: add r0, sp, #0x4 ldrh r0, [r0, #0x0] @@ -6848,7 +6848,7 @@ FUN_02069BFC: ; 0x02069BFC mov r0, #0x0 mov r1, #0x2c add r5, r2, #0x0 - bl FUN_02016998 + bl AllocFromHeap add r6, r0, #0x0 add r0, r4, #0x0 add r1, r7, #0x0 @@ -6874,7 +6874,7 @@ _02069C28: bne _02069C28 _02069C3A: add r0, r6, #0x0 - bl FUN_02016A18 + bl FreeToHeap add r0, r4, #0x0 pop {r3-r7, pc} .balign 4 @@ -7347,7 +7347,7 @@ FUN_02069F9C: ; 0x02069F9C add r2, r0, #0x0 add r0, r4, #0x0 mov r1, #0x21 - bl LoadFromNARC + bl ReadWholeNarcMemberByIdPair pop {r4, pc} thumb_func_start FUN_02069FB0 @@ -7816,19 +7816,19 @@ _0206A32E: mov r1, #0x64 bl FUN_0206A3A4 ldr r0, [sp, #0x4] - bl FUN_02016A18 + bl FreeToHeap add sp, #0x1c pop {r4-r7, pc} thumb_func_start FUN_0206A370 FUN_0206A370: ; 0x0206A370 - ldr r3, _0206A37C ; =LoadFromNARC + ldr r3, _0206A37C ; =ReadWholeNarcMemberByIdPair add r2, r0, #0x0 add r0, r1, #0x0 mov r1, #0x2 bx r3 nop -_0206A37C: .word LoadFromNARC +_0206A37C: .word ReadWholeNarcMemberByIdPair thumb_func_start FUN_0206A380 FUN_0206A380: ; 0x0206A380 @@ -7838,18 +7838,18 @@ FUN_0206A380: ; 0x0206A380 add r2, r0, #0x0 add r0, r4, #0x0 mov r1, #0x2 - bl LoadFromNARC + bl ReadWholeNarcMemberByIdPair pop {r4, pc} thumb_func_start FUN_0206A394 FUN_0206A394: ; 0x0206A394 - ldr r3, _0206A3A0 ; =LoadFromNARC + ldr r3, _0206A3A0 ; =ReadWholeNarcMemberByIdPair add r2, r0, #0x0 add r0, r1, #0x0 mov r1, #0x22 bx r3 nop -_0206A3A0: .word LoadFromNARC +_0206A3A0: .word ReadWholeNarcMemberByIdPair thumb_func_start FUN_0206A3A4 FUN_0206A3A4: ; 0x0206A3A4 diff --git a/arm9/asm/unk_0206AB04.s b/arm9/asm/unk_0206AB04.s index f377ea5f..c523eb3b 100644 --- a/arm9/asm/unk_0206AB04.s +++ b/arm9/asm/unk_0206AB04.s @@ -12,7 +12,7 @@ FUN_0206AB04: ; 0x0206AB04 str r1, [sp, #0x0] mov r1, #0x9 add r3, r2, #0x0 - bl FUN_02006548 + bl ReadFromNarcMemberByIdPair pop {r3, pc} thumb_func_start FUN_0206AB18 @@ -115,10 +115,10 @@ _0206ABB0: thumb_func_start FUN_0206ABB4 FUN_0206ABB4: ; 0x0206ABB4 - ldr r3, _0206ABC0 ; =LoadFromNARC + ldr r3, _0206ABC0 ; =ReadWholeNarcMemberByIdPair add r2, r0, #0x0 add r0, r1, #0x0 mov r1, #0x9 bx r3 nop -_0206ABC0: .word LoadFromNARC +_0206ABC0: .word ReadWholeNarcMemberByIdPair diff --git a/arm9/asm/unk_0206ABC4.s b/arm9/asm/unk_0206ABC4.s index 9354e489..483f68a7 100644 --- a/arm9/asm/unk_0206ABC4.s +++ b/arm9/asm/unk_0206ABC4.s @@ -170,7 +170,7 @@ FUN_0206ACD4: ; 0x0206ACD4 ldr r1, [sp, #0x4] mov r0, #0x3b add r4, r2, #0x0 - bl LoadFromNARC_7 + bl GetNarcMemberSizeByIdPair add r6, r0, #0x0 mov r0, #0x2 str r0, [sp, #0x0] @@ -178,10 +178,10 @@ FUN_0206ACD4: ; 0x0206ACD4 mov r1, #0x89 mov r2, #0x0 lsl r3, r5, #0x1 - bl FUN_02006548 + bl ReadFromNarcMemberByIdPair mov r0, #0x3b add r1, r4, #0x0 - bl FUN_02006670 + bl NARC_ctor add r4, sp, #0xc ldrh r2, [r4, #0x0] str r0, [sp, #0x8] @@ -194,7 +194,7 @@ _0206AD0E: ldr r0, [sp, #0x8] mov r1, #0x0 mov r3, #0x4 - bl FUN_02006814 + bl NARC_ReadFromMember ldrh r1, [r4, #0x2] cmp r1, r5 bne _0206AD30 @@ -215,7 +215,7 @@ _0206AD30: bne _0206AD0E _0206AD40: ldr r0, [sp, #0x8] - bl FUN_020066F4 + bl NARC_dtor ldr r0, [sp, #0x4] add sp, #0x14 pop {r4-r7, pc} @@ -230,7 +230,7 @@ FUN_0206AD4C: ; 0x0206AD4C mov r1, #0x0 str r2, [sp, #0x4] str r3, [sp, #0x8] - bl LoadFromNARC_7 + bl GetNarcMemberSizeByIdPair add r5, r0, #0x0 mov r0, #0x2 str r0, [sp, #0x0] @@ -238,10 +238,10 @@ FUN_0206AD4C: ; 0x0206AD4C mov r1, #0x89 mov r2, #0x0 lsl r3, r6, #0x1 - bl FUN_02006548 + bl ReadFromNarcMemberByIdPair ldr r1, [sp, #0x8] mov r0, #0x3b - bl FUN_02006670 + bl NARC_ctor add r4, sp, #0x10 ldrh r2, [r4, #0x0] str r0, [sp, #0xc] @@ -254,7 +254,7 @@ _0206AD84: ldr r0, [sp, #0xc] mov r1, #0x0 mov r3, #0x4 - bl FUN_02006814 + bl NARC_ReadFromMember ldrh r0, [r4, #0x2] cmp r0, r6 bne _0206ADB6 @@ -280,7 +280,7 @@ _0206ADB6: bne _0206AD84 _0206ADC2: ldr r0, [sp, #0xc] - bl FUN_020066F4 + bl NARC_dtor add r0, sp, #0x10 ldrh r0, [r0, #0x0] cmp r0, r5 @@ -295,23 +295,23 @@ _0206ADDC: .word 0x0000022E thumb_func_start FUN_0206ADE0 FUN_0206ADE0: ; 0x0206ADE0 - ldr r3, _0206ADEC ; =LoadFromNARC + ldr r3, _0206ADEC ; =ReadWholeNarcMemberByIdPair add r2, r0, #0x0 add r0, r1, #0x0 mov r1, #0x39 bx r3 nop -_0206ADEC: .word LoadFromNARC +_0206ADEC: .word ReadWholeNarcMemberByIdPair thumb_func_start FUN_0206ADF0 FUN_0206ADF0: ; 0x0206ADF0 - ldr r3, _0206ADFC ; =LoadFromNARC + ldr r3, _0206ADFC ; =ReadWholeNarcMemberByIdPair add r2, r0, #0x0 add r0, r1, #0x0 mov r1, #0x3a bx r3 nop -_0206ADFC: .word LoadFromNARC +_0206ADFC: .word ReadWholeNarcMemberByIdPair thumb_func_start FUN_0206AE00 FUN_0206AE00: ; 0x0206AE00 @@ -337,7 +337,7 @@ FUN_0206AE0C: ; 0x0206AE0C bl FUN_0206B8CC add r0, r5, #0x0 mov r1, #0x60 - bl FUN_02016998 + bl AllocFromHeap str r0, [sp, #0x4c] add r0, r5, #0x0 bl FUN_020669C0 @@ -740,9 +740,9 @@ _0206B120: blt _0206B0A2 _0206B156: ldr r0, [sp, #0x4c] - bl FUN_02016A18 + bl FreeToHeap ldr r0, [sp, #0x40] - bl FUN_02016A18 + bl FreeToHeap ldr r0, [sp, #0x44] bl seedr_LC add sp, #0x50 diff --git a/arm9/asm/unk_0206B8A4.s b/arm9/asm/unk_0206B8A4.s index fac07093..9ba283b4 100644 --- a/arm9/asm/unk_0206B8A4.s +++ b/arm9/asm/unk_0206B8A4.s @@ -15,7 +15,7 @@ FUN_0206B8AC: ; 0x0206B8AC push {r4, lr} mov r1, #0x59 lsl r1, r1, #0x4 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0x0 bl FUN_0206B8C0 add r0, r4, #0x0 @@ -267,7 +267,7 @@ _0206BA6E: _0206BA78: mov r0, #0x0 mov r1, #0xec - bl FUN_02016998 + bl AllocFromHeap mov r12, r0 add r1, r4, #0x0 mov r0, #0xec @@ -307,7 +307,7 @@ _0206BABA: ldr r0, [r4, #0x0] str r0, [r2, #0x0] mov r0, r12 - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x0 pop {r3-r7, pc} diff --git a/arm9/asm/unk_0206BF90.s b/arm9/asm/unk_0206BF90.s index 9c58c1b9..2522d3a7 100644 --- a/arm9/asm/unk_0206BF90.s +++ b/arm9/asm/unk_0206BF90.s @@ -23,11 +23,11 @@ FUN_0206BF90: ; 0x0206BF90 add r5, r0, #0x0 mov r0, #0x5 mov r1, #0x8 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0x0 mov r0, #0x5 mov r1, #0x8 - bl FUN_02016998 + bl AllocFromHeap add r6, r0, #0x0 ldr r0, _0206BFE4 ; =UNK_020F828C mov r1, #0xc @@ -223,7 +223,7 @@ FUN_0206C0C8: ; 0x0206C0C8 mov r1, #0x4 str r2, [sp, #0x8] add r7, r3, #0x0 - bl FUN_02016998 + bl AllocFromHeap add r6, r0, #0x0 ldr r0, [sp, #0x0] bl MOD11_022300D4 @@ -281,7 +281,7 @@ _0206C138: blt _0206C138 _0206C14A: add r0, r6, #0x0 - bl FUN_02016A18 + bl FreeToHeap add sp, #0xc pop {r4-r7, pc} @@ -644,7 +644,7 @@ _0206C3C4: _0206C3DE: add r0, r6, #0x0 add r1, r7, #0x0 - bl FUN_02016998 + bl AllocFromHeap str r0, [r5, #0x10] add r4, r4, #0x1 add r5, r5, #0x4 @@ -905,7 +905,7 @@ _0206C5A4: pop {r3-r7, pc} _0206C5CC: add r0, r5, #0x0 - bl FUN_02016A18 + bl FreeToHeap ldr r0, [sp, #0x0] bl FUN_0200CAB4 _0206C5D8: @@ -962,7 +962,7 @@ _0206C61E: pop {r3-r7, pc} _0206C63E: add r0, r5, #0x0 - bl FUN_02016A18 + bl FreeToHeap ldr r0, [sp, #0x0] bl FUN_0200CAB4 _0206C64A: diff --git a/arm9/asm/unk_0206C700.s b/arm9/asm/unk_0206C700.s index c781508b..2158d937 100644 --- a/arm9/asm/unk_0206C700.s +++ b/arm9/asm/unk_0206C700.s @@ -51,7 +51,7 @@ FUN_0206C700: ; 0x0206C700 mov r1, #0x80 add r7, r2, #0x0 str r3, [sp, #0x18] - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0x0 mov r0, #0x0 add r1, r4, #0x0 @@ -186,7 +186,7 @@ FUN_0206C700: ; 0x0206C700 str r0, [r4, #0x10] add r0, r5, #0x0 mov r1, #0x30 - bl FUN_02016998 + bl AllocFromHeap str r0, [r4, #0x3c] ldr r1, [r4, #0x3c] mov r0, #0x0 @@ -325,15 +325,15 @@ FUN_0206C92C: ; 0x0206C92C ldr r0, [r4, #0xc] bl FUN_0200AB18 ldr r0, [r4, #0x10] - bl FUN_02016A18 + bl FreeToHeap ldr r0, [r4, #0x3c] - bl FUN_02016A18 + bl FreeToHeap ldr r0, [r4, #0x58] bl FUN_020143D0 ldr r0, [r4, #0x0] - bl FUN_02016A18 + bl FreeToHeap add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x0 bl FUN_02002B60 pop {r4, pc} @@ -2176,7 +2176,7 @@ _0206D8EA: add r2, r6, #0x0 bl FUN_02067830 add r0, r6, #0x0 - bl FUN_02016A18 + bl FreeToHeap add r0, r5, #0x0 mov r1, #0xa1 add r2, sp, #0x0 @@ -2211,7 +2211,7 @@ _0206D8EA: ldr r0, [r4, #0x54] bl FUN_0204C104 add r0, r5, #0x0 - bl FUN_02016A18 + bl FreeToHeap ldr r0, [r4, #0x4c] ldr r3, [r4, #0x5c] mov r1, #0x4 @@ -2589,7 +2589,7 @@ FUN_0206DC80: ; 0x0206DC80 mov r2, #0x2 bl FUN_02068B68 add r0, r5, #0x0 - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x0 str r0, [sp, #0x0] str r0, [sp, #0x4] @@ -2670,7 +2670,7 @@ FUN_0206DD6C: ; 0x0206DD6C add r2, r5, #0x0 bl FUN_0200B7B8 add r0, r5, #0x0 - bl FUN_02016A18 + bl FreeToHeap ldr r0, [r4, #0x4] mov r1, #0xff bl FUN_02019620 diff --git a/arm9/asm/unk_0206DE24.s b/arm9/asm/unk_0206DE24.s index a63937e1..41eab63c 100644 --- a/arm9/asm/unk_0206DE24.s +++ b/arm9/asm/unk_0206DE24.s @@ -210,7 +210,7 @@ FUN_0206DFB4: ; 0x0206DFB4 mov r1, #0x12 lsl r1, r1, #0xa add r4, r0, #0x0 - bl FUN_02016998 + bl AllocFromHeap add r2, r0, #0x0 mov r0, #0x1 str r0, [sp, #0x0] @@ -266,7 +266,7 @@ FUN_0206E024: ; 0x0206E024 add r0, r5, #0x0 bl FUN_02012DE4 add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap pop {r3-r5, pc} thumb_func_start FUN_0206E03C @@ -310,7 +310,7 @@ FUN_0206E07C: ; 0x0206E07C add r5, r0, #0x0 ldr r0, [r5, #0x0] mov r1, #0x10 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0x0 bne _0206E090 bl ErrorHandling @@ -363,6 +363,6 @@ FUN_0206E0DC: ; 0x0206E0DC ldr r0, [r4, #0xc] bl FUN_0206E024 add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} .balign 4 diff --git a/arm9/asm/unk_0206E2F0.s b/arm9/asm/unk_0206E2F0.s index c819ccfa..fc0ebdad 100644 --- a/arm9/asm/unk_0206E2F0.s +++ b/arm9/asm/unk_0206E2F0.s @@ -7,7 +7,7 @@ FUN_0206E2F0: ; 0x0206E2F0 push {r4, lr} mov r1, #0x78 - bl FUN_02016998 + bl AllocFromHeap mov r1, #0x0 mov r2, #0x78 add r4, r0, #0x0 diff --git a/arm9/asm/unk_0206E5B4.s b/arm9/asm/unk_0206E5B4.s index 398c1029..51c6ace1 100644 --- a/arm9/asm/unk_0206E5B4.s +++ b/arm9/asm/unk_0206E5B4.s @@ -504,21 +504,21 @@ _0206E72C: lsl r3, r3, #0x3 ldrh r1, [r1, r3] mov r0, #0xf - bl LoadFromNarc_2 + bl AllocAndReadWholeNarcMemberByIdPair pop {r3, pc} _0206E73A: ldr r1, _0206E760 ; =UNK_020F85B6 lsl r3, r3, #0x3 ldrh r1, [r1, r3] mov r0, #0x10 - bl LoadFromNarc_2 + bl AllocAndReadWholeNarcMemberByIdPair pop {r3, pc} _0206E748: ldr r1, _0206E764 ; =UNK_020F85B8 lsl r3, r3, #0x3 ldrh r1, [r1, r3] mov r0, #0x10 - bl LoadFromNarc_2 + bl AllocAndReadWholeNarcMemberByIdPair pop {r3, pc} _0206E756: mov r0, #0x0 @@ -1159,7 +1159,7 @@ FUN_0206EB50: ; 0x0206EB50 mov r0, #0xf add r2, r4, #0x0 add r3, r1, #0x0 - bl FUN_02006564 + bl AllocAndReadFromNarcMemberByIdPair add sp, #0x4 pop {r3-r4, pc} .balign 4 diff --git a/arm9/asm/unk_0206EB80.s b/arm9/asm/unk_0206EB80.s index 67fab8c2..f65f8b86 100644 --- a/arm9/asm/unk_0206EB80.s +++ b/arm9/asm/unk_0206EB80.s @@ -14,7 +14,7 @@ _0206EB84: .word 0x00000774 FUN_0206EB88: ; 0x0206EB88 push {r4, lr} ldr r1, _0206EB9C ; =0x00000774 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0x0 bl FUN_0206EBA0 add r0, r4, #0x0 @@ -859,7 +859,7 @@ _0206F160: .word FUN_02022610 FUN_0206F164: ; 0x0206F164 push {r4, lr} mov r1, #0x24 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0x0 mov r0, #0x0 add r1, r4, #0x0 diff --git a/arm9/asm/unk_0206F1F0.s b/arm9/asm/unk_0206F1F0.s index e4b26738..3c1bc967 100644 --- a/arm9/asm/unk_0206F1F0.s +++ b/arm9/asm/unk_0206F1F0.s @@ -212,9 +212,9 @@ _0206F34A: b _0206F380 _0206F366: ldr r0, [r4, #0x0] - bl FUN_02016A18 + bl FreeToHeap add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap ldr r0, [r4, #0x4] add r0, r0, #0x1 str r0, [r4, #0x4] @@ -235,14 +235,14 @@ FUN_0206F38C: ; 0x0206F38C push {r4, lr} mov r0, #0xb mov r1, #0x10 - bl FUN_020169D8 + bl AllocFromHeapAtEnd mov r1, #0x0 mov r2, #0x10 add r4, r0, #0x0 bl MI_CpuFill8 mov r0, #0xb mov r1, #0xc - bl FUN_020169D8 + bl AllocFromHeapAtEnd mov r1, #0x0 mov r2, #0xc str r0, [r4, #0x0] diff --git a/arm9/asm/unk_0206F3FC.s b/arm9/asm/unk_0206F3FC.s index 0214512e..215119f6 100644 --- a/arm9/asm/unk_0206F3FC.s +++ b/arm9/asm/unk_0206F3FC.s @@ -1268,7 +1268,7 @@ FUN_0206FD24: ; 0x0206FD24 mov r0, #0x14 mov r1, #0x10 mov r2, #0xc - bl LoadFromNarc_2 + bl AllocAndReadWholeNarcMemberByIdPair add r1, sp, #0x10 add r4, r0, #0x0 bl FUN_020B0138 @@ -3665,7 +3665,7 @@ FUN_020710C4: ; 0x020710C4 bl FUN_0200D0E0 mov r0, #0xc mov r1, #0x8 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0x0 ldr r0, _02071174 ; =0x000005A4 ldr r0, [r5, r0] @@ -5370,7 +5370,7 @@ FUN_02071DF4: ; 0x02071DF4 beq _02071E30 _02071E1E: add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap add r0, r5, #0x0 mov r1, #0x0 bl FUN_0207703C @@ -5388,7 +5388,7 @@ _02071E30: cmp r0, #0x0 bne _02071E5A add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap add r0, r5, #0x0 mov r1, #0x1 bl FUN_0207703C @@ -5396,7 +5396,7 @@ _02071E30: pop {r3-r5, pc} _02071E5A: add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap ldr r0, _02071F1C ; =0x000005A4 ldr r2, _02071F20 ; =0x00000B25 ldr r1, [r5, r0] @@ -6198,7 +6198,7 @@ FUN_020724D4: ; 0x020724D4 mov r1, #0x16 add r2, r4, #0x0 add r7, r3, #0x0 - bl LoadFromNarc_2 + bl AllocAndReadWholeNarcMemberByIdPair add r1, sp, #0xc str r0, [sp, #0x8] bl FUN_020B0180 @@ -6238,7 +6238,7 @@ _020724FE: cmp r4, #0x6 blo _020724FE ldr r0, [sp, #0x8] - bl FUN_02016A18 + bl FreeToHeap add sp, #0x10 pop {r3-r7, pc} .balign 4 diff --git a/arm9/asm/unk_02073DA8.s b/arm9/asm/unk_02073DA8.s index 77df04fc..a3406825 100644 --- a/arm9/asm/unk_02073DA8.s +++ b/arm9/asm/unk_02073DA8.s @@ -1610,7 +1610,7 @@ FUN_02074AF4: ; 0x02074AF4 mov r1, #0x2c add r4, r5, r0 mov r0, #0xc - bl FUN_02016998 + bl AllocFromHeap add r7, r0, #0x0 mov r0, #0x3 lsl r0, r0, #0x8 diff --git a/arm9/asm/unk_0207550C.s b/arm9/asm/unk_0207550C.s index 8bc88090..cccec733 100644 --- a/arm9/asm/unk_0207550C.s +++ b/arm9/asm/unk_0207550C.s @@ -17,7 +17,7 @@ FUN_0207550C: ; 0x0207550C cmp r0, #0x1 beq _0207552C add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x1c pop {r3-r5, pc} _0207552C: @@ -58,7 +58,7 @@ _0207552C: beq _0207558A _02075580: add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x0 pop {r3-r5, pc} _0207558A: @@ -68,7 +68,7 @@ _0207558A: cmp r0, #0x0 beq _020755A0 add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x1 pop {r3-r5, pc} _020755A0: @@ -78,7 +78,7 @@ _020755A0: cmp r0, #0x0 beq _020755B6 add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x2 pop {r3-r5, pc} _020755B6: @@ -143,32 +143,32 @@ _0207562C: b _0207568E _02075632: add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x3 pop {r3-r5, pc} _0207563C: add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x4 pop {r3-r5, pc} _02075646: add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x5 pop {r3-r5, pc} _02075650: add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x6 pop {r3-r5, pc} _0207565A: add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x7 pop {r3-r5, pc} _02075664: add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x8 pop {r3-r5, pc} _0207566E: @@ -178,12 +178,12 @@ _0207566E: cmp r0, #0x0 beq _02075684 add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap mov r0, #0xb pop {r3-r5, pc} _02075684: add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x9 pop {r3-r5, pc} _0207568E: @@ -193,7 +193,7 @@ _0207568E: cmp r0, #0x0 beq _020756A4 add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap mov r0, #0xa pop {r3-r5, pc} _020756A4: @@ -203,7 +203,7 @@ _020756A4: cmp r0, #0x0 beq _020756BA add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap mov r0, #0xb pop {r3-r5, pc} _020756BA: @@ -213,13 +213,13 @@ _020756BA: cmp r0, #0x0 ble _020756D0 add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap mov r0, #0xc pop {r3-r5, pc} _020756D0: bge _020756DC add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x12 pop {r3-r5, pc} _020756DC: @@ -229,13 +229,13 @@ _020756DC: cmp r0, #0x0 ble _020756F2 add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap mov r0, #0xd pop {r3-r5, pc} _020756F2: bge _020756FE add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x13 pop {r3-r5, pc} _020756FE: @@ -245,13 +245,13 @@ _020756FE: cmp r0, #0x0 ble _02075714 add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap mov r0, #0xe pop {r3-r5, pc} _02075714: bge _02075720 add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x14 pop {r3-r5, pc} _02075720: @@ -261,13 +261,13 @@ _02075720: cmp r0, #0x0 ble _02075736 add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap mov r0, #0xf pop {r3-r5, pc} _02075736: bge _02075742 add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x15 pop {r3-r5, pc} _02075742: @@ -277,13 +277,13 @@ _02075742: cmp r0, #0x0 ble _02075758 add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x10 pop {r3-r5, pc} _02075758: bge _02075764 add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x16 pop {r3-r5, pc} _02075764: @@ -293,13 +293,13 @@ _02075764: cmp r0, #0x0 ble _0207577A add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x11 pop {r3-r5, pc} _0207577A: bge _02075786 add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x17 pop {r3-r5, pc} _02075786: @@ -309,7 +309,7 @@ _02075786: cmp r0, #0x0 beq _0207579C add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x18 pop {r3-r5, pc} _0207579C: @@ -319,7 +319,7 @@ _0207579C: cmp r0, #0x0 beq _020757B2 add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x19 pop {r3-r5, pc} _020757B2: @@ -329,7 +329,7 @@ _020757B2: cmp r0, #0x0 beq _020757C8 add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x1a pop {r3-r5, pc} _020757C8: @@ -345,12 +345,12 @@ _020757C8: beq _020757EA _020757E0: add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x1b pop {r3-r5, pc} _020757EA: add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x1c pop {r3-r5, pc} diff --git a/arm9/asm/unk_020772F0.s b/arm9/asm/unk_020772F0.s index a218ea81..a533f049 100644 --- a/arm9/asm/unk_020772F0.s +++ b/arm9/asm/unk_020772F0.s @@ -1082,7 +1082,7 @@ FUN_02077894: ; 0x02077894 mov r2, #0x5 bl FUN_02066ACC add r0, r6, #0x0 - bl FUN_02016A18 + bl FreeToHeap _020778DE: mov r1, #0x56 lsl r1, r1, #0x2 @@ -1271,7 +1271,7 @@ FUN_02077A84: ; 0x02077A84 str r0, [sp, #0x0] add r7, r2, #0x0 add r5, r3, #0x0 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0x0 str r6, [r4, #0x0] str r7, [r4, #0x4] @@ -1312,7 +1312,7 @@ _02077ADA: ldr r0, [r4, #0x18] bl FUN_02021A20 add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} thumb_func_start FUN_02077AE8 @@ -1661,7 +1661,7 @@ _02077D88: mov r1, #0x0 bl FUN_0200AC60 add r0, r5, #0x0 - bl FUN_02016A18 + bl FreeToHeap _02077DCE: ldr r0, [r7, #0x44] cmp r0, #0x0 @@ -1841,7 +1841,7 @@ _02077F1A: mov r1, #0x0 bl FUN_0200AC60 add r0, r6, #0x0 - bl FUN_02016A18 + bl FreeToHeap b _02077F7E _02077F50: mov r1, #0x56 diff --git a/arm9/asm/unk_020799E8.s b/arm9/asm/unk_020799E8.s index f08b3d63..61d5124f 100644 --- a/arm9/asm/unk_020799E8.s +++ b/arm9/asm/unk_020799E8.s @@ -244,15 +244,15 @@ FUN_02079B60: ; 0x02079B60 str r2, [sp, #0x4] ldr r5, [sp, #0x2c] ldr r4, [sp, #0x34] - bl LoadFromNARC_7 + bl GetNarcMemberSizeByIdPair add r1, r0, #0x0 add r0, r7, #0x0 - bl FUN_020169D8 + bl AllocFromHeapAtEnd add r7, r0, #0x0 ldr r0, [sp, #0x4] ldr r1, [sp, #0x28] add r2, r7, #0x0 - bl FUN_02006774 + bl NARC_ReadWholeMember ldr r0, [sp, #0x30] cmp r0, #0x0 beq _02079B9A @@ -340,7 +340,7 @@ _02079C24: bl FUN_02017FB4 _02079C36: add r0, r7, #0x0 - bl FUN_02016A18 + bl FreeToHeap add sp, #0x14 pop {r4-r7, pc} @@ -352,15 +352,15 @@ FUN_02079C40: ; 0x02079C40 add r0, r1, #0x0 add r1, r5, #0x0 add r7, r3, #0x0 - bl LoadFromNARC_7 + bl GetNarcMemberSizeByIdPair add r1, r0, #0x0 ldr r0, [sp, #0x18] - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0x0 add r0, r6, #0x0 add r1, r5, #0x0 add r2, r4, #0x0 - bl FUN_02006774 + bl NARC_ReadWholeMember add r0, r4, #0x0 add r1, r7, #0x0 bl FUN_020B0180 diff --git a/arm9/asm/unk_02079C70.s b/arm9/asm/unk_02079C70.s index 99cb0bc6..ad625101 100644 --- a/arm9/asm/unk_02079C70.s +++ b/arm9/asm/unk_02079C70.s @@ -1649,7 +1649,7 @@ _0207A980: cmp r0, #0x2 bne _0207A99E add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap _0207A99E: mov r1, #0x7 mov r0, #0x0 @@ -1831,7 +1831,7 @@ FUN_0207AAE0: ; 0x0207AAE0 add r2, r7, #0x0 bl FUN_0207AB0C add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap pop {r3-r7, pc} .balign 4 @@ -2747,7 +2747,7 @@ _0207B250: _0207B256: mov r0, #0x27 mov r2, #0x13 - bl LoadFromNarc_2 + bl AllocAndReadWholeNarcMemberByIdPair add r1, sp, #0xc add r4, r0, #0x0 bl FUN_020B0180 @@ -2765,7 +2765,7 @@ _0207B256: mov r1, #0x3 bl FUN_0201AC68 add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap ldr r0, _0207B2AC ; =0x0000068C ldrsb r0, [r5, r0] cmp r0, #0x0 diff --git a/arm9/asm/unk_0207D5BC.s b/arm9/asm/unk_0207D5BC.s index dbb70d53..839b275b 100644 --- a/arm9/asm/unk_0207D5BC.s +++ b/arm9/asm/unk_0207D5BC.s @@ -1548,7 +1548,7 @@ FUN_0207E190: ; 0x0207E190 add r2, r7, #0x0 bl FUN_0207E0C4 add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap b _0207E1F4 _0207E1E8: sub r0, #0x8 diff --git a/arm9/asm/unk_0207FD00.s b/arm9/asm/unk_0207FD00.s index c63ba131..839a9c0f 100644 --- a/arm9/asm/unk_0207FD00.s +++ b/arm9/asm/unk_0207FD00.s @@ -24,7 +24,7 @@ FUN_0207FD00: ; 0x0207FD00 add r6, r1, #0x0 add r0, r7, #0x0 mov r1, #0x3c - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0x0 mov r2, #0x65 str r7, [r4, #0x0] @@ -436,34 +436,34 @@ FUN_02080094: ; 0x02080094 ldr r0, [r4, #0x18] cmp r0, #0x0 beq _020800A2 - bl FUN_02016A18 + bl FreeToHeap _020800A2: ldr r0, [r4, #0x20] cmp r0, #0x0 beq _020800AC - bl FUN_02016A18 + bl FreeToHeap _020800AC: ldr r0, [r4, #0x28] cmp r0, #0x0 beq _020800B6 - bl FUN_02016A18 + bl FreeToHeap _020800B6: ldr r0, [r4, #0x30] cmp r0, #0x0 beq _020800C0 - bl FUN_02016A18 + bl FreeToHeap _020800C0: ldr r0, [r4, #0x38] cmp r0, #0x0 beq _020800CA - bl FUN_02016A18 + bl FreeToHeap _020800CA: ldr r0, [r4, #0x8] bl FUN_0200AB18 ldr r0, [r4, #0x4] bl FUN_0200A8B8 add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} .balign 4 diff --git a/arm9/asm/unk_02080C38.s b/arm9/asm/unk_02080C38.s index c4555bca..260609d5 100644 --- a/arm9/asm/unk_02080C38.s +++ b/arm9/asm/unk_02080C38.s @@ -47,7 +47,7 @@ FUN_02080C38: ; 0x02080C38 add r5, r0, #0x0 mov r0, #0xb mov r1, #0x8 - bl FUN_020169D8 + bl AllocFromHeapAtEnd mov r1, #0x0 mov r2, #0x8 add r4, r0, #0x0 @@ -249,7 +249,7 @@ _02080DE2: bl ErrorHandling _02080DE6: add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap add sp, #0x28 mov r0, #0x1 pop {r3-r7, pc} @@ -271,7 +271,7 @@ FUN_02080E0C: ; 0x02080E0C add r6, r1, #0x0 mov r0, #0xb mov r1, #0x8 - bl FUN_020169D8 + bl AllocFromHeapAtEnd mov r1, #0x0 mov r2, #0x8 add r4, r0, #0x0 @@ -500,7 +500,7 @@ _02080FCE: bl ErrorHandling _02080FD2: add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x1 pop {r3-r5, pc} _02080FDC: @@ -750,7 +750,7 @@ _020811A4: bl ErrorHandling _020811A8: add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap add sp, #0x10 mov r0, #0x1 pop {r3-r7, pc} @@ -772,7 +772,7 @@ FUN_020811D8: ; 0x020811D8 push {r4, lr} ldr r1, _02081204 ; =0x000019C4 mov r0, #0x14 - bl FUN_02016998 + bl AllocFromHeap ldr r2, _02081204 ; =0x000019C4 mov r1, #0x0 add r4, r0, #0x0 @@ -794,10 +794,10 @@ _02081208: .word 0x00000123 thumb_func_start FUN_0208120C FUN_0208120C: ; 0x0208120C - ldr r3, _02081210 ; =FUN_02016A18 + ldr r3, _02081210 ; =FreeToHeap bx r3 .balign 4 -_02081210: .word FUN_02016A18 +_02081210: .word FreeToHeap thumb_func_start FUN_02081214 FUN_02081214: ; 0x02081214 @@ -1162,14 +1162,14 @@ FUN_020814E8: ; 0x020814E8 mov r0, #0x56 lsl r0, r0, #0x2 ldr r0, [r7, r0] - bl FUN_02016A18 + bl FreeToHeap mov r6, #0x57 mov r4, #0x0 add r5, r7, #0x0 lsl r6, r6, #0x2 _020814FE: ldr r0, [r5, #0x0] - bl FUN_02016A18 + bl FreeToHeap add r0, r5, #0x0 add r0, #0xe8 ldr r0, [r0, #0x0] @@ -1177,9 +1177,9 @@ _020814FE: add r0, r5, #0x0 add r0, #0xf8 ldr r0, [r0, #0x0] - bl FUN_02016A18 + bl FreeToHeap ldr r0, [r5, r6] - bl FUN_02016A18 + bl FreeToHeap add r4, r4, #0x1 add r5, r5, #0x4 cmp r4, #0x4 @@ -1287,7 +1287,7 @@ FUN_020815D0: ; 0x020815D0 bl FUN_02027740 mov r0, #0x14 mov r1, #0x28 - bl FUN_02016998 + bl AllocFromHeap mov r1, #0x0 mov r2, #0x28 add r4, r0, #0x0 @@ -1354,7 +1354,7 @@ FUN_02081668: ; 0x02081668 add r4, r0, #0x0 ldr r0, _0208167C ; =0x000019B8 ldr r0, [r4, r0] - bl FUN_02016A18 + bl FreeToHeap ldr r0, _0208167C ; =0x000019B8 mov r1, #0x0 str r1, [r4, r0] @@ -3262,7 +3262,7 @@ FUN_02082444: ; 0x02082444 _02082456: mov r0, #0x4 mov r1, #0x10 - bl FUN_020169D8 + bl AllocFromHeapAtEnd mov r1, #0x0 mov r2, #0x10 add r4, r0, #0x0 @@ -3413,7 +3413,7 @@ FUN_0208251C: ; 0x0208251C _02082580: ldr r0, _02082598 ; =0x000019BC ldr r0, [r5, r0] - bl FUN_02016A18 + bl FreeToHeap ldr r0, _02082598 ; =0x000019BC mov r1, #0x0 str r1, [r5, r0] diff --git a/arm9/asm/unk_020828BC.s b/arm9/asm/unk_020828BC.s index 8db2792d..94266a9b 100644 --- a/arm9/asm/unk_020828BC.s +++ b/arm9/asm/unk_020828BC.s @@ -181,14 +181,14 @@ _0208292A: str r0, [sp, #0x14] mov r0, #0x5a mov r1, #0x0 - bl LoadFromNARC_7 + bl GetNarcMemberSizeByIdPair mov r1, #0x30 bl _u32_div_f str r0, [sp, #0x24] ldr r1, [sp, #0x24] add r0, r5, #0x0 add r1, r1, #0x1 - bl FUN_020169D8 + bl AllocFromHeapAtEnd add r5, r0, #0x0 ldr r0, [sp, #0x78] cmp r0, #0x1 @@ -495,9 +495,9 @@ _02082B6A: blt _02082B5A _02082B7E: add r0, r5, #0x0 - bl FUN_02016A18 + bl FreeToHeap ldr r0, [sp, #0x14] - bl FUN_02016A18 + bl FreeToHeap add sp, #0x58 pop {r3-r7, pc} .balign 4 @@ -708,7 +708,7 @@ _02082CD2: b _02082BE0 _02082D06: ldr r0, [sp, #0x14] - bl FUN_02016A18 + bl FreeToHeap add sp, #0x18 pop {r3-r7, pc} .balign 4 @@ -942,18 +942,18 @@ FUN_02082ED0: ; 0x02082ED0 str r0, [sp, #0x14] mov r0, #0x5a mov r1, #0x1 - bl LoadFromNARC_7 + bl GetNarcMemberSizeByIdPair lsr r0, r0, #0x3 str r0, [sp, #0x18] ldr r1, [sp, #0x18] ldr r0, [sp, #0x8] add r1, r1, #0x1 - bl FUN_020169D8 + bl AllocFromHeapAtEnd ldr r1, [sp, #0x18] add r6, r0, #0x0 ldr r0, [sp, #0x8] add r1, r1, #0x1 - bl FUN_020169D8 + bl AllocFromHeapAtEnd str r0, [sp, #0x10] ldr r0, [sp, #0x18] add r2, r5, #0x0 @@ -1208,11 +1208,11 @@ _02083058: str r0, [sp, #0x4] strh r1, [r0, #0x0] ldr r0, [sp, #0x10] - bl FUN_02016A18 + bl FreeToHeap add r0, r6, #0x0 - bl FUN_02016A18 + bl FreeToHeap ldr r0, [sp, #0x14] - bl FUN_02016A18 + bl FreeToHeap add sp, #0x24 pop {r4-r7, pc} .balign 4 diff --git a/arm9/asm/unk_020834D0.s b/arm9/asm/unk_020834D0.s index 63ed07ce..7f5a041a 100644 --- a/arm9/asm/unk_020834D0.s +++ b/arm9/asm/unk_020834D0.s @@ -308,7 +308,7 @@ FUN_020836BC: ; 0x020836BC add r4, r0, #0x0 mov r0, #0x14 add r1, r4, #0x1 - bl FUN_02016998 + bl AllocFromHeap add r5, r0, #0x0 add r0, r7, #0x0 add r1, r5, #0x0 @@ -327,7 +327,7 @@ _020836F0: mov r4, #0x0 _020836F2: add r0, r5, #0x0 - bl FUN_02016A18 + bl FreeToHeap add r0, r4, #0x0 pop {r3-r7, pc} @@ -435,7 +435,7 @@ FUN_020837B4: ; 0x020837B4 mov r0, #0x14 mov r1, #0x31 add r6, r2, #0x0 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0x0 add r0, r6, #0x0 add r1, r4, #0x0 @@ -456,7 +456,7 @@ _020837E6: mov r5, #0x0 _020837E8: add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap add r0, r5, #0x0 pop {r4-r6, pc} .balign 4 @@ -501,7 +501,7 @@ FUN_02083834: ; 0x02083834 mov r0, #0x14 mov r1, #0x19 add r5, r2, #0x0 - bl FUN_02016998 + bl AllocFromHeap add r6, r0, #0x0 mov r4, #0x0 mov r7, #0x8 @@ -531,7 +531,7 @@ _02083876: mov r4, #0x0 _02083878: add r0, r6, #0x0 - bl FUN_02016A18 + bl FreeToHeap add r0, r4, #0x0 pop {r3-r7, pc} nop @@ -570,7 +570,7 @@ FUN_020838B4: ; 0x020838B4 bl FUN_02021EF0 mov r0, #0x14 add r1, r0, #0x0 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0x0 add r0, sp, #0x0 add r1, r4, #0x4 @@ -594,7 +594,7 @@ _020838F6: mov r5, #0x0 _020838F8: add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap add r0, r5, #0x0 add sp, #0x10 pop {r3-r5, pc} @@ -630,7 +630,7 @@ FUN_02083930: ; 0x02083930 add r4, r0, #0x0 mov r0, #0x14 add r1, r4, #0x1 - bl FUN_02016998 + bl AllocFromHeap add r5, r0, #0x0 add r0, r7, #0x0 add r1, r5, #0x0 @@ -649,7 +649,7 @@ _02083964: mov r4, #0x0 _02083966: add r0, r5, #0x0 - bl FUN_02016A18 + bl FreeToHeap add r0, r4, #0x0 pop {r3-r7, pc} @@ -917,7 +917,7 @@ FUN_02083B48: ; 0x02083B48 mov r0, #0x14 mov r1, #0x7 add r6, r2, #0x0 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0x0 add r0, r6, #0x0 add r1, r4, #0x0 @@ -936,7 +936,7 @@ _02083B76: mov r5, #0x0 _02083B78: add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap add r0, r5, #0x0 pop {r4-r6, pc} .balign 4 diff --git a/arm9/asm/unk_020842DC.s b/arm9/asm/unk_020842DC.s index dfd14a6e..543d051a 100644 --- a/arm9/asm/unk_020842DC.s +++ b/arm9/asm/unk_020842DC.s @@ -20,7 +20,7 @@ FUN_020842DC: ; 0x020842DC cmp r0, #0x1 beq _02084308 add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap add sp, #0x18 mov r0, #0x0 pop {r3-r7, pc} @@ -39,7 +39,7 @@ _02084308: tst r0, r5 beq _02084332 add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap add sp, #0x18 mov r0, #0x1 pop {r3-r7, pc} @@ -53,7 +53,7 @@ _02084332: tst r0, r5 beq _02084350 add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap add sp, #0x18 mov r0, #0x1 pop {r3-r7, pc} @@ -67,7 +67,7 @@ _02084350: tst r0, r5 beq _0208436E add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap add sp, #0x18 mov r0, #0x1 pop {r3-r7, pc} @@ -81,7 +81,7 @@ _0208436E: tst r0, r5 beq _0208438C add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap add sp, #0x18 mov r0, #0x1 pop {r3-r7, pc} @@ -95,7 +95,7 @@ _0208438C: tst r0, r5 beq _020843AA add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap add sp, #0x18 mov r0, #0x1 pop {r3-r7, pc} @@ -124,7 +124,7 @@ _020843CE: cmp r5, #0x0 bne _02084414 add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap add sp, #0x18 mov r0, #0x1 pop {r3-r7, pc} @@ -143,7 +143,7 @@ _020843EA: cmp r5, r0 bhs _02084414 add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap add sp, #0x18 mov r0, #0x1 pop {r3-r7, pc} @@ -160,7 +160,7 @@ _02084414: cmp r0, #0x64 bhs _0208443A add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap add sp, #0x18 mov r0, #0x1 pop {r3-r7, pc} @@ -179,7 +179,7 @@ _0208443A: cmp r0, #0x0 beq _02084464 add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap add sp, #0x18 mov r0, #0x1 pop {r3-r7, pc} @@ -214,7 +214,7 @@ _0208447C: cmp r0, #0x5 blo _020844B2 add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap add sp, #0x18 mov r0, #0x1 pop {r3-r7, pc} @@ -230,7 +230,7 @@ _020844B2: cmp r0, #0x1 bne _020844D6 add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap add sp, #0x18 mov r0, #0x1 pop {r3-r7, pc} @@ -248,7 +248,7 @@ _020844E4: cmp r0, #0x1 bne _020844FC add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap add sp, #0x18 mov r0, #0x1 pop {r3-r7, pc} @@ -320,7 +320,7 @@ _02084502: cmp r1, r0 bge _020845C6 add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap add sp, #0x18 mov r0, #0x1 pop {r3-r7, pc} @@ -329,7 +329,7 @@ _0208459C: cmp r5, #0x0 ble _020845AE add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap add sp, #0x18 mov r0, #0x1 pop {r3-r7, pc} @@ -340,7 +340,7 @@ _020845AE: cmp r0, #0x1 bne _020845C6 add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap add sp, #0x18 mov r0, #0x1 pop {r3-r7, pc} @@ -370,7 +370,7 @@ _020845C6: cmp r1, r0 bge _02084632 add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap add sp, #0x18 mov r0, #0x1 pop {r3-r7, pc} @@ -380,7 +380,7 @@ _02084606: cmp r0, #0x0 ble _0208461A add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap add sp, #0x18 mov r0, #0x1 pop {r3-r7, pc} @@ -391,7 +391,7 @@ _0208461A: cmp r0, #0x1 bne _02084632 add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap add sp, #0x18 mov r0, #0x1 pop {r3-r7, pc} @@ -422,7 +422,7 @@ _02084632: cmp r1, r0 bge _020846A0 add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap add sp, #0x18 mov r0, #0x1 pop {r3-r7, pc} @@ -432,7 +432,7 @@ _02084674: cmp r0, #0x0 ble _02084688 add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap add sp, #0x18 mov r0, #0x1 pop {r3-r7, pc} @@ -443,7 +443,7 @@ _02084688: cmp r0, #0x1 bne _020846A0 add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap add sp, #0x18 mov r0, #0x1 pop {r3-r7, pc} @@ -474,7 +474,7 @@ _020846A0: cmp r1, r0 bge _0208470E add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap add sp, #0x18 mov r0, #0x1 pop {r3-r7, pc} @@ -484,7 +484,7 @@ _020846E2: cmp r0, #0x0 ble _020846F6 add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap add sp, #0x18 mov r0, #0x1 pop {r3-r7, pc} @@ -495,7 +495,7 @@ _020846F6: cmp r0, #0x1 bne _0208470E add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap add sp, #0x18 mov r0, #0x1 pop {r3-r7, pc} @@ -526,7 +526,7 @@ _0208470E: cmp r1, r0 bge _0208477C add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap add sp, #0x18 mov r0, #0x1 pop {r3-r7, pc} @@ -536,7 +536,7 @@ _02084750: cmp r0, #0x0 ble _02084764 add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap add sp, #0x18 mov r0, #0x1 pop {r3-r7, pc} @@ -547,7 +547,7 @@ _02084764: cmp r0, #0x1 bne _0208477C add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap add sp, #0x18 mov r0, #0x1 pop {r3-r7, pc} @@ -577,7 +577,7 @@ _0208477C: cmp r1, r0 bge _020847E6 add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap add sp, #0x18 mov r0, #0x1 pop {r3-r7, pc} @@ -586,7 +586,7 @@ _020847BC: cmp r7, #0x0 ble _020847CE add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap add sp, #0x18 mov r0, #0x1 pop {r3-r7, pc} @@ -597,13 +597,13 @@ _020847CE: cmp r0, #0x1 bne _020847E6 add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap add sp, #0x18 mov r0, #0x1 pop {r3-r7, pc} _020847E6: add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x0 add sp, #0x18 pop {r3-r7, pc} @@ -642,7 +642,7 @@ FUN_02084810: ; 0x02084810 cmp r0, #0x1 beq _02084840 add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap add sp, #0x70 mov r0, #0x0 pop {r3-r7, pc} @@ -1225,7 +1225,7 @@ _02084D00: cmp r7, #0x1 bne _02084D14 add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap add sp, #0x70 mov r0, #0x0 pop {r3-r7, pc} @@ -1253,7 +1253,7 @@ _02084D14: add r0, r5, #0x0 bl FUN_0208508C add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap add sp, #0x70 add r0, r6, #0x0 pop {r3-r7, pc} @@ -1277,7 +1277,7 @@ _02084D54: add r0, r5, #0x0 bl FUN_0208508C add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap add sp, #0x70 add r0, r6, #0x0 pop {r3-r7, pc} @@ -1302,13 +1302,13 @@ _02084D8A: add r0, r5, #0x0 bl FUN_0208508C add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap add sp, #0x70 add r0, r6, #0x0 pop {r3-r7, pc} _02084DC2: add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap add r0, r6, #0x0 add sp, #0x70 pop {r3-r7, pc} diff --git a/arm9/asm/unk_020851B8.s b/arm9/asm/unk_020851B8.s index 9bb0660b..a6ed91ad 100644 --- a/arm9/asm/unk_020851B8.s +++ b/arm9/asm/unk_020851B8.s @@ -7,7 +7,7 @@ FUN_020851B8: ; 0x020851B8 push {r3, lr} mov r1, #0xc - bl FUN_02016998 + bl AllocFromHeap mov r1, #0x0 strb r1, [r0, #0x0] strb r1, [r0, #0x1] diff --git a/arm9/asm/unk_02085258.s b/arm9/asm/unk_02085258.s index 288e7016..5af55be3 100644 --- a/arm9/asm/unk_02085258.s +++ b/arm9/asm/unk_02085258.s @@ -5,37 +5,37 @@ thumb_func_start FUN_02085258 FUN_02085258: ; 0x02085258 - ldr r3, _02085260 ; =FUN_02006670 + ldr r3, _02085260 ; =NARC_ctor add r1, r0, #0x0 mov r0, #0x44 bx r3 .balign 4 -_02085260: .word FUN_02006670 +_02085260: .word NARC_ctor thumb_func_start FUN_02085264 FUN_02085264: ; 0x02085264 - ldr r3, _02085268 ; =FUN_02006704 + ldr r3, _02085268 ; =NARC_AllocAndReadWholeMember bx r3 .balign 4 -_02085268: .word FUN_02006704 +_02085268: .word NARC_AllocAndReadWholeMember thumb_func_start FUN_0208526C FUN_0208526C: ; 0x0208526C - ldr r3, _02085270 ; =FUN_020066F4 + ldr r3, _02085270 ; =NARC_dtor bx r3 .balign 4 -_02085270: .word FUN_020066F4 +_02085270: .word NARC_dtor thumb_func_start FUN_02085274 FUN_02085274: ; 0x02085274 add r3, r0, #0x0 add r2, r1, #0x0 add r1, r3, #0x0 - ldr r3, _02085280 ; =LoadFromNarc_2 + ldr r3, _02085280 ; =AllocAndReadWholeNarcMemberByIdPair mov r0, #0x44 bx r3 .balign 4 -_02085280: .word LoadFromNarc_2 +_02085280: .word AllocAndReadWholeNarcMemberByIdPair thumb_func_start FUN_02085284 FUN_02085284: ; 0x02085284 diff --git a/arm9/asm/unk_02085338.s b/arm9/asm/unk_02085338.s index d9ebab0d..303ad31a 100644 --- a/arm9/asm/unk_02085338.s +++ b/arm9/asm/unk_02085338.s @@ -11,7 +11,7 @@ FUN_02085338: ; 0x02085338 add r0, r3, #0x0 mov r1, #0x24 add r6, r2, #0x0 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0x0 strb r5, [r4, #0x0] strb r7, [r4, #0x1] @@ -59,10 +59,10 @@ _020853A4: .word 0x0000FFFF thumb_func_start FUN_020853A8 FUN_020853A8: ; 0x020853A8 - ldr r3, _020853AC ; =FUN_02016A18 + ldr r3, _020853AC ; =FreeToHeap bx r3 .balign 4 -_020853AC: .word FUN_02016A18 +_020853AC: .word FreeToHeap thumb_func_start FUN_020853B0 FUN_020853B0: ; 0x020853B0 diff --git a/arm9/asm/unk_020854E0.s b/arm9/asm/unk_020854E0.s index c9ca67e5..f23b2327 100644 --- a/arm9/asm/unk_020854E0.s +++ b/arm9/asm/unk_020854E0.s @@ -29,7 +29,7 @@ FUN_020854E0: ; 0x020854E0 str r0, [sp, #0x4] ldr r0, [sp, #0x20] mov r1, #0x1c - bl FUN_020169D8 + bl AllocFromHeapAtEnd mov r1, #0x0 mov r2, #0x1c add r4, r0, #0x0 @@ -67,7 +67,7 @@ FUN_02085538: ; 0x02085538 mov r1, #0x1c add r6, r2, #0x0 str r3, [sp, #0x0] - bl FUN_020169D8 + bl AllocFromHeapAtEnd mov r1, #0x0 mov r2, #0x1c add r4, r0, #0x0 @@ -97,7 +97,7 @@ FUN_02085578: ; 0x02085578 add r6, r1, #0x0 add r0, r7, #0x0 mov r1, #0x1c - bl FUN_020169D8 + bl AllocFromHeapAtEnd mov r1, #0x0 mov r2, #0x1c add r4, r0, #0x0 @@ -124,7 +124,7 @@ FUN_020855B0: ; 0x020855B0 add r6, r1, #0x0 add r0, r7, #0x0 mov r1, #0x1c - bl FUN_020169D8 + bl AllocFromHeapAtEnd mov r1, #0x0 mov r2, #0x1c add r4, r0, #0x0 @@ -191,10 +191,10 @@ FUN_0208562C: ; 0x0208562C ldr r0, [r4, #0x14] cmp r0, #0x0 beq _0208563A - bl FUN_02016A18 + bl FreeToHeap _0208563A: add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} .balign 4 @@ -235,7 +235,7 @@ FUN_02085644: ; 0x02085644 add r2, sp, #0x0 bl FUN_02067830 add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap add r0, r6, #0x0 _0208569E: pop {r3-r7, pc} @@ -272,7 +272,7 @@ _020856BC: add r2, r5, #0x0 bl FUN_02025878 add r0, r6, #0x0 - bl FUN_02016A18 + bl FreeToHeap add r0, r5, #0x0 pop {r3-r7, pc} .balign 4 @@ -284,7 +284,7 @@ FUN_020856F0: ; 0x020856F0 add r4, r0, #0x0 add r0, r5, #0x0 mov r1, #0x34 - bl FUN_02016998 + bl AllocFromHeap mov r1, #0x0 mov r2, #0x34 add r6, r0, #0x0 @@ -358,7 +358,7 @@ FUN_0208578C: ; 0x0208578C bl FUN_02021A20 _0208579A: add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} .balign 4 diff --git a/arm9/asm/unk_020859C0.s b/arm9/asm/unk_020859C0.s index 65801fba..68edc27c 100644 --- a/arm9/asm/unk_020859C0.s +++ b/arm9/asm/unk_020859C0.s @@ -414,7 +414,7 @@ FUN_02085C08: ; 0x02085C08 add r0, r4, #0x0 add r0, #0xe4 ldr r0, [r0, #0x0] - bl FUN_02016A18 + bl FreeToHeap add r0, r4, #0x0 add r0, #0xe8 ldr r0, [r0, #0x0] @@ -448,7 +448,7 @@ FUN_02085C08: ; 0x02085C08 bl FUN_02085D8C ldr r0, _02085D64 ; =0x00000428 ldr r0, [r4, r0] - bl FUN_02016A18 + bl FreeToHeap add r0, r4, #0x0 bl MOD62_0222DAEC mov r0, #0x73 @@ -714,11 +714,11 @@ _02085F14: b _02085F38 _02085F20: ldr r0, [r6, #0xc] - bl FUN_02016A18 + bl FreeToHeap ldr r0, [r6, #0x8] - bl FUN_02016A18 + bl FreeToHeap add r0, r6, #0x0 - bl FUN_02016A18 + bl FreeToHeap add sp, #0xc mov r0, #0x1 pop {r4-r7, pc} @@ -737,7 +737,7 @@ FUN_02085F48: ; 0x02085F48 add r5, r1, #0x0 mov r0, #0xb mov r1, #0x18 - bl FUN_020169D8 + bl AllocFromHeapAtEnd add r4, r0, #0x0 add r2, r4, #0x0 mov r1, #0x18 @@ -750,7 +750,7 @@ _02085F5E: mov r0, #0xb mov r1, #0x30 str r5, [r4, #0x10] - bl FUN_02016998 + bl AllocFromHeap mov r1, #0x0 mov r2, #0x30 str r0, [r4, #0x8] @@ -763,7 +763,7 @@ _02085F5E: mov r1, #0x40 str r5, [r0, #0x28] mov r0, #0xb - bl FUN_02016998 + bl AllocFromHeap mov r1, #0x0 mov r2, #0x40 str r0, [r4, #0xc] diff --git a/arm9/asm/unk_02086084.s b/arm9/asm/unk_02086084.s index 5a4e2057..2afe74b0 100644 --- a/arm9/asm/unk_02086084.s +++ b/arm9/asm/unk_02086084.s @@ -208,7 +208,7 @@ FUN_020861DC: ; 0x020861DC mov r1, #0x4 bl FUN_020178A0 ldr r0, [r4, #0x4] - bl FUN_02016A18 + bl FreeToHeap bl FUN_0201C29C ldr r0, [r4, #0x3c] bl FUN_020072E8 @@ -375,7 +375,7 @@ _020863B6: str r0, [r4, #0x0] b _020863CE _020863C4: - bl FUN_02016A18 + bl FreeToHeap add sp, #0xc mov r0, #0x1 pop {r4-r7, pc} @@ -394,7 +394,7 @@ FUN_020863DC: ; 0x020863DC add r4, r1, #0x0 mov r0, #0xb mov r1, #0x1c - bl FUN_020169D8 + bl AllocFromHeapAtEnd add r2, r0, #0x0 add r3, r2, #0x0 mov r1, #0x1c diff --git a/arm9/asm/unk_02086414.s b/arm9/asm/unk_02086414.s index 7fdb0e98..1c060f0a 100644 --- a/arm9/asm/unk_02086414.s +++ b/arm9/asm/unk_02086414.s @@ -879,7 +879,7 @@ FUN_02086A80: ; 0x02086A80 mov r1, #0x12 lsl r1, r1, #0xa add r4, r0, #0x0 - bl FUN_02016998 + bl AllocFromHeap add r2, r0, #0x0 mov r0, #0x1 str r0, [sp, #0x0] @@ -935,7 +935,7 @@ FUN_02086AF0: ; 0x02086AF0 add r0, r5, #0x0 bl FUN_02012DE4 add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap pop {r3-r5, pc} thumb_func_start FUN_02086B08 @@ -975,7 +975,7 @@ FUN_02086B40: ; 0x02086B40 add r5, r0, #0x0 ldr r0, [r5, #0x0] mov r1, #0x10 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0x0 bne _02086B54 bl ErrorHandling @@ -1023,10 +1023,10 @@ _02086B9C: thumb_func_start FUN_02086BA0 FUN_02086BA0: ; 0x02086BA0 - ldr r3, _02086BA4 ; =FUN_02016A18 + ldr r3, _02086BA4 ; =FreeToHeap bx r3 .balign 4 -_02086BA4: .word FUN_02016A18 +_02086BA4: .word FreeToHeap thumb_func_start FUN_02086BA8 FUN_02086BA8: ; 0x02086BA8 diff --git a/arm9/asm/unk_02087A6C.s b/arm9/asm/unk_02087A6C.s index dbd8843c..c91f5a47 100644 --- a/arm9/asm/unk_02087A6C.s +++ b/arm9/asm/unk_02087A6C.s @@ -13,7 +13,7 @@ UNK_020FD144: ; 0x020FD144 FUN_02087A6C: ; 0x02087A6C push {r3, lr} mov r1, #0x18 - bl FUN_02016998 + bl AllocFromHeap add r3, r0, #0x0 mov r2, #0x18 mov r1, #0x0 @@ -32,7 +32,7 @@ FUN_02087A84: ; 0x02087A84 bl ErrorHandling _02087A8E: add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} .balign 4 @@ -107,17 +107,17 @@ _02087B1A: bl ErrorHandling _02087B24: ldr r0, [r4, #0x0] - bl FUN_02016A18 + bl FreeToHeap ldr r0, [r4, #0x4] - bl FUN_02016A18 + bl FreeToHeap ldr r0, [r4, #0x8] - bl FUN_02016A18 + bl FreeToHeap ldr r0, [r4, #0xc] - bl FUN_02016A18 + bl FreeToHeap ldr r0, [r4, #0x10] - bl FUN_02016A18 + bl FreeToHeap ldr r0, [r4, #0x14] - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x0 str r0, [r4, #0x0] str r0, [r4, #0x4] diff --git a/arm9/asm/unk_02087D00.s b/arm9/asm/unk_02087D00.s index afcb1e36..1f2ef5e9 100644 --- a/arm9/asm/unk_02087D00.s +++ b/arm9/asm/unk_02087D00.s @@ -50,7 +50,7 @@ FUN_02087D00: ; 0x02087D00 str r0, [sp, #0x0] add r0, r5, #0x0 lsl r1, r1, #0x2 - bl FUN_02016998 + bl AllocFromHeap mov r2, #0xcf mov r1, #0x0 lsl r2, r2, #0x2 @@ -159,7 +159,7 @@ _02087DEE: ldr r0, [sp, #0x4] bl FUN_0200AB18 add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap ldr r0, [sp, #0x0] strb r0, [r7, #0x0] mov r0, #0x5 @@ -171,10 +171,10 @@ _02087DEE: thumb_func_start FUN_02087E14 FUN_02087E14: ; 0x02087E14 - ldr r3, _02087E18 ; =FUN_02016A18 + ldr r3, _02087E18 ; =FreeToHeap bx r3 .balign 4 -_02087E18: .word FUN_02016A18 +_02087E18: .word FreeToHeap thumb_func_start FUN_02087E1C FUN_02087E1C: ; 0x02087E1C @@ -376,7 +376,7 @@ _02087F86: strb r0, [r1, #0x2] ldr r0, [r5, #0x0] mov r1, #0x40 - bl FUN_02016998 + bl AllocFromHeap mov r1, #0x0 mov r2, #0x40 add r4, r0, #0x0 @@ -426,7 +426,7 @@ _02087FE6: ldrb r6, [r0, #0x0] strb r6, [r5, #0x8] ldr r0, [r5, #0x10] - bl FUN_02016A18 + bl FreeToHeap cmp r6, #0x7 bne _02087FFE mov r0, #0x0 @@ -434,7 +434,7 @@ _02087FE6: _02087FFE: ldr r0, [r5, #0x0] mov r1, #0x30 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0x0 ldr r0, [r5, #0xc] ldr r0, [r0, #0x10] @@ -490,7 +490,7 @@ _0208806E: ldrb r0, [r0, #0x14] strb r0, [r5, #0x8] ldr r0, [r5, #0x10] - bl FUN_02016A18 + bl FreeToHeap cmp r4, #0x1 bne _02088084 mov r0, #0x0 @@ -517,7 +517,7 @@ FUN_020880A0: ; 0x020880A0 add r5, r0, #0x0 ldr r0, [r5, #0x0] mov r1, #0xc - bl FUN_02016998 + bl AllocFromHeap mov r1, #0x0 mov r2, #0xc add r4, r0, #0x0 @@ -574,9 +574,9 @@ FUN_0208810C: ; 0x0208810C _0208811E: ldr r4, [r4, #0x10] ldr r0, [r4, #0x4] - bl FUN_02016A18 + bl FreeToHeap add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x6 pop {r4, pc} @@ -586,7 +586,7 @@ FUN_02088130: ; 0x02088130 add r5, r0, #0x0 ldr r0, [r5, #0x0] mov r1, #0x30 - bl FUN_02016998 + bl AllocFromHeap ldr r2, [r5, #0xc] add r4, r0, #0x0 ldrb r1, [r2, #0x1] @@ -650,9 +650,9 @@ FUN_020881AC: ; 0x020881AC _020881BE: ldr r0, [r4, #0x10] ldr r0, [r0, #0x24] - bl FUN_02016A18 + bl FreeToHeap ldr r0, [r4, #0x10] - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x0 pop {r4, pc} diff --git a/arm9/asm/unk_02088320.s b/arm9/asm/unk_02088320.s index 3e6ede1e..92381e59 100644 --- a/arm9/asm/unk_02088320.s +++ b/arm9/asm/unk_02088320.s @@ -18,7 +18,7 @@ FUN_02088320: ; 0x02088320 add r6, r0, #0x0 add r7, r2, #0x0 str r3, [sp, #0x0] - bl FUN_02016998 + bl AllocFromHeap mov r2, #0x59 mov r1, #0x0 lsl r2, r2, #0x2 @@ -54,7 +54,7 @@ FUN_02088360: ; 0x02088360 lsl r2, r2, #0x2 bl MI_CpuFill8 add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} thumb_func_start FUN_0208837C @@ -138,7 +138,7 @@ _02088402: ldr r0, [sp, #0x0] mov r1, #0x4 ldr r0, [r0, #0x0] - bl FUN_02016998 + bl AllocFromHeap mov r2, #0x16 ldr r1, [sp, #0x0] lsl r2, r2, #0x4 @@ -160,7 +160,7 @@ FUN_0208843C: ; 0x0208843C mov r0, #0x16 lsl r0, r0, #0x4 ldr r0, [r5, r0] - bl FUN_02016A18 + bl FreeToHeap ldr r0, [r5, #0x10] bl FUN_0201FD58 mov r0, #0x15 @@ -216,7 +216,7 @@ FUN_02088490: ; 0x02088490 _020884B4: ldr r0, [r5, #0x0] mov r1, #0x8 - bl FUN_02016998 + bl AllocFromHeap str r0, [sp, #0x38] mov r1, #0x0 mov r2, #0x8 @@ -259,15 +259,15 @@ _020884D8: bl FUN_02009DE0 ldr r0, [r5, #0x0] mov r1, #0x10 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0x0 ldr r0, [r5, #0x0] mov r1, #0x8 - bl FUN_02016998 + bl AllocFromHeap str r0, [r4, #0x8] ldr r0, [r5, #0x0] mov r1, #0x24 - bl FUN_02016998 + bl AllocFromHeap ldr r1, [r4, #0x8] mov r3, #0xe str r0, [r1, #0x0] @@ -464,7 +464,7 @@ FUN_02088694: ; 0x02088694 add r1, r2, r1 strb r0, [r1, #0x1] add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap pop {r3-r5, pc} .balign 4 diff --git a/arm9/asm/unk_0208890C.s b/arm9/asm/unk_0208890C.s index 701c0230..4d274b76 100644 --- a/arm9/asm/unk_0208890C.s +++ b/arm9/asm/unk_0208890C.s @@ -17,7 +17,7 @@ FUN_0208890C: ; 0x0208890C add r0, r2, #0x0 mov r1, #0x20 add r7, r3, #0x0 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0x0 mov r1, #0x0 mov r2, #0x20 diff --git a/arm9/asm/unk_0208898C.s b/arm9/asm/unk_0208898C.s index 66959471..e2243e5e 100644 --- a/arm9/asm/unk_0208898C.s +++ b/arm9/asm/unk_0208898C.s @@ -137,7 +137,7 @@ FUN_02088A78: ; 0x02088A78 bl FUN_0200628C ldr r0, [r4, #0xc] ldr r6, [r4, #0x0] - bl FUN_02016A18 + bl FreeToHeap add r0, r4, #0x0 mov r1, #0x0 mov r2, #0x24 diff --git a/arm9/asm/unk_02088AAC.s b/arm9/asm/unk_02088AAC.s index d4f8492a..fd0718de 100644 --- a/arm9/asm/unk_02088AAC.s +++ b/arm9/asm/unk_02088AAC.s @@ -185,14 +185,14 @@ _02088BBA: add r0, r5, #0x0 bl memcpy ldr r0, [r4, #0x18] - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x0 str r0, [r4, #0x18] add r0, r5, #0x0 bl FUN_0206E37C str r0, [r4, #0x8] add r0, r5, #0x0 - bl FUN_02016A18 + bl FreeToHeap add r0, r5, #0x0 bl FUN_0206E384 cmp r0, #0x5 @@ -337,7 +337,7 @@ _02088CF2: mov r1, #0x4 bl FUN_0206F190 ldr r0, [r4, #0x18] - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x0 str r0, [r4, #0x18] add sp, #0x4 diff --git a/arm9/asm/unk_02088DD8.s b/arm9/asm/unk_02088DD8.s index 3c31d4f2..19d246ac 100644 --- a/arm9/asm/unk_02088DD8.s +++ b/arm9/asm/unk_02088DD8.s @@ -7,7 +7,7 @@ FUN_02088DD8: ; 0x02088DD8 push {r3, lr} mov r1, #0x18 - bl FUN_02016998 + bl AllocFromHeap add r3, r0, #0x0 mov r2, #0x18 mov r1, #0x0 @@ -20,10 +20,10 @@ _02088DE6: thumb_func_start FUN_02088DF0 FUN_02088DF0: ; 0x02088DF0 - ldr r3, _02088DF4 ; =FUN_02016A18 + ldr r3, _02088DF4 ; =FreeToHeap bx r3 .balign 4 -_02088DF4: .word FUN_02016A18 +_02088DF4: .word FreeToHeap thumb_func_start FUN_02088DF8 FUN_02088DF8: ; 0x02088DF8 @@ -69,11 +69,11 @@ _02088E34: blo _02088E34 ldr r0, [sp, #0x0] mov r1, #0x2c - bl FUN_02016998 + bl AllocFromHeap add r7, r0, #0x0 ldr r0, [sp, #0x0] mov r1, #0x2c - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0x0 ldr r0, [sp, #0xc] ldr r1, [sp, #0x8] @@ -150,7 +150,7 @@ _02088EDA: blo _02088E70 _02088EE8: add r0, r7, #0x0 - bl FUN_02016A18 + bl FreeToHeap add r0, r4, #0x0 add sp, #0x18 pop {r3-r7, pc} diff --git a/arm9/asm/unk_02088F0C.s b/arm9/asm/unk_02088F0C.s index 4c6a6986..490492fa 100644 --- a/arm9/asm/unk_02088F0C.s +++ b/arm9/asm/unk_02088F0C.s @@ -548,7 +548,7 @@ FUN_02088F0C: ; 0x02088F0C add r5, r1, #0x0 ldr r1, _02088F44 ; =0x0000195C add r6, r0, #0x0 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0x0 add r0, r6, #0x0 str r5, [r4, #0x0] @@ -581,7 +581,7 @@ FUN_02088F4C: ; 0x02088F4C ldr r0, [r4, #0x4] bl FUN_02013A10 add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap _02088F5E: pop {r4, pc} diff --git a/arm9/asm/unk_02089498.s b/arm9/asm/unk_02089498.s index 7bb64bd4..1b3721af 100644 --- a/arm9/asm/unk_02089498.s +++ b/arm9/asm/unk_02089498.s @@ -329,7 +329,7 @@ FUN_020896E0: ; 0x020896E0 mov r1, #0x0 bl FUN_020178A0 ldr r0, [r4, #0x14] - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} thumb_func_start FUN_02089734 diff --git a/arm9/asm/unk_02089960.s b/arm9/asm/unk_02089960.s index ba8fd1b6..94f81187 100644 --- a/arm9/asm/unk_02089960.s +++ b/arm9/asm/unk_02089960.s @@ -22,8 +22,11 @@ UNK_020FF390: ; 0x020FF390 UNK_020FF3AC: ; 0x020FF3AC .byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x61, 0x99, 0x08, 0x02, 0x9D, 0x99, 0x08, 0x02 - .byte 0x41, 0x9A, 0x08, 0x02, 0xFF, 0xFF, 0xFF, 0xFF + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + + .global UNK_020FF3D4 +UNK_020FF3D4: ; 0x020FF3D4 + .word FUN_02089960, FUN_0208999C, FUN_02089A40, 0xFFFFFFFF .text @@ -265,7 +268,7 @@ FUN_02089B2C: ; 0x02089B2C mov r1, #0x0 bl FUN_020178A0 ldr r0, [r4, #0x18] - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} thumb_func_start FUN_02089B80 diff --git a/arm9/asm/unk_0208A258.s b/arm9/asm/unk_0208A258.s index 1e9f7c68..2e476eaf 100644 --- a/arm9/asm/unk_0208A258.s +++ b/arm9/asm/unk_0208A258.s @@ -52,7 +52,7 @@ _0208A2A6: lsl r1, r1, #0x6 strb r0, [r4, r1] ldr r0, [r4, #0x4] - bl FUN_02016A18 + bl FreeToHeap add r0, r5, #0x0 bl FUN_0204649C mov r0, #0x11 diff --git a/arm9/asm/unk_0208A300.s b/arm9/asm/unk_0208A300.s index 18e8029c..fe273a33 100644 --- a/arm9/asm/unk_0208A300.s +++ b/arm9/asm/unk_0208A300.s @@ -7,7 +7,7 @@ FUN_0208A300: ; 0x0208A300 push {r3, lr} mov r1, #0x8 - bl FUN_02016998 + bl AllocFromHeap mov r1, #0x0 strb r1, [r0, #0x0] strb r1, [r0, #0x1] @@ -23,10 +23,10 @@ FUN_0208A300: ; 0x0208A300 thumb_func_start FUN_0208A320 FUN_0208A320: ; 0x0208A320 - ldr r3, _0208A324 ; =FUN_02016A18 + ldr r3, _0208A324 ; =FreeToHeap bx r3 .balign 4 -_0208A324: .word FUN_02016A18 +_0208A324: .word FreeToHeap thumb_func_start FUN_0208A328 FUN_0208A328: ; 0x0208A328 diff --git a/arm9/asm/unk_0208A338.s b/arm9/asm/unk_0208A338.s index 85fa2871..34ce5c45 100644 --- a/arm9/asm/unk_0208A338.s +++ b/arm9/asm/unk_0208A338.s @@ -13,7 +13,7 @@ FUN_0208A338: ; 0x0208A338 add r5, r0, #0x0 mov r0, #0x20 mov r1, #0x6c - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0x0 mov r0, #0x19 str r5, [r4, #0x0] @@ -85,7 +85,7 @@ FUN_0208A3C8: ; 0x0208A3C8 add r0, r4, #0x0 bl FUN_0208A400 add r0, r4, #0x0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} .balign 4 diff --git a/arm9/asm/unk_0208A998.s b/arm9/asm/unk_0208A998.s index 1b0d0b52..ba1509f7 100644 --- a/arm9/asm/unk_0208A998.s +++ b/arm9/asm/unk_0208A998.s @@ -266,7 +266,7 @@ _0208AB9C: ldr r0, [sp, #0xc] bl FUN_0200A8B8 ldr r0, [sp, #0x10] - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x0 bl OS_ResetSystem _0208ABC4: |