diff options
Diffstat (limited to 'arm9/modules')
77 files changed, 2127 insertions, 2127 deletions
diff --git a/arm9/modules/04/asm/thumb_04.s b/arm9/modules/04/asm/thumb_04.s index 8537da40..48315516 100644 --- a/arm9/modules/04/asm/thumb_04.s +++ b/arm9/modules/04/asm/thumb_04.s @@ -16,7 +16,7 @@ MOD04_021D74E0: ; 0x021D74E0 _021D74F2: ldr r1, _021D7648 ; =0x00001FAC add r0, r4, #0 - bl FUN_02016998 + bl AllocFromHeap ldr r2, _021D7644 ; =UNK04_0220FBC0 mov r1, #0x1f str r0, [r2, #4] @@ -48,7 +48,7 @@ _021D74F2: str r4, [r0, r1] ldr r1, _021D764C ; =0x0002B020 add r0, r4, #0 - bl FUN_02016998 + bl AllocFromHeap ldr r2, _021D7644 ; =UNK04_0220FBC0 ldr r1, _021D7650 ; =0x00001F04 ldr r3, [r2] @@ -2821,7 +2821,7 @@ MOD04_021D8A7C: ; 0x021D8A7C cmp r1, #0 bne _021D8ACA ldr r1, _021D8BD0 ; =0x000035DC - bl FUN_02016998 + bl AllocFromHeap ldr r2, _021D8BCC ; =UNK04_0220FBC8 mov r1, #0x35 str r0, [r2] diff --git a/arm9/modules/05/asm/module_05.s b/arm9/modules/05/asm/module_05.s index ff3f2ecc..201a9066 100644 --- a/arm9/modules/05/asm/module_05.s +++ b/arm9/modules/05/asm/module_05.s @@ -77,7 +77,7 @@ _021D7564: _021D757A: mov r0, #4 mov r1, #0x28 - bl FUN_02016998 + bl AllocFromHeap mov r1, #0 mov r2, #0x28 str r0, [r4, #4] @@ -355,9 +355,9 @@ _021D7806: add r1, r0, #0 bl FUN_02015F10 ldr r0, [r4, #8] - bl FUN_02016A18 + bl FreeToHeap ldr r0, [r4, #4] - bl FUN_02016A18 + bl FreeToHeap mov r0, #0 str r0, [r4, #4] mov r0, #4 @@ -1157,7 +1157,7 @@ MOD05_021D7EE8: ; 0x021D7EE8 add r6, r1, #0 add r5, r0, #0 mov r1, #0x64 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 mov r0, #0x60 add r1, r6, #0 @@ -1189,7 +1189,7 @@ _021D7F18: blt _021D7F18 _021D7F2C: strh r3, [r4] - bl FUN_02016A18 + bl FreeToHeap add r0, r4, #0 pop {r4, r5, r6, pc} nop @@ -1207,10 +1207,10 @@ MOD05_021D7F40: ; 0x021D7F40 thumb_func_start MOD05_021D7F44 MOD05_021D7F44: ; 0x021D7F44 - ldr r3, _021D7F48 ; =FUN_02016A18 + ldr r3, _021D7F48 ; =FreeToHeap bx r3 .balign 4, 0 -_021D7F48: .word FUN_02016A18 +_021D7F48: .word FreeToHeap thumb_func_start MOD05_021D7F4C MOD05_021D7F4C: ; 0x021D7F4C @@ -1220,7 +1220,7 @@ MOD05_021D7F4C: ; 0x021D7F4C add r0, r5, #0 mov r1, #0x14 add r6, r2, #0 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 str r7, [r4] str r5, [r4, #4] @@ -1230,7 +1230,7 @@ MOD05_021D7F4C: ; 0x021D7F4C str r6, [r4, #8] add r0, r5, #0 add r1, r7, #0 - bl FUN_02016998 + bl AllocFromHeap str r0, [r4, #0xc] ldr r1, [r4, #0xc] mov r0, #0 @@ -1240,7 +1240,7 @@ MOD05_021D7F4C: ; 0x021D7F4C bl FUN_0201B578 add r1, r0, #0 add r0, r5, #0 - bl FUN_02016998 + bl AllocFromHeap str r0, [r4, #0x10] ldr r1, [r4, #0x10] add r0, r6, #0 @@ -1269,11 +1269,11 @@ _021D7FAA: blt _021D7FAA _021D7FBC: ldr r0, [r5, #0xc] - bl FUN_02016A18 + bl FreeToHeap ldr r0, [r5, #0x10] - bl FUN_02016A18 + bl FreeToHeap add r0, r5, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, r5, r6, pc} thumb_func_start MOD05_021D7FD0 @@ -1367,7 +1367,7 @@ _021D806C: cmp r1, #0 beq _021D807A ldr r0, [r5, #4] - bl FUN_02016998 + bl AllocFromHeap str r0, [r4, #0x10] _021D807A: ldr r3, [r6, #8] @@ -1414,7 +1414,7 @@ _021D80BE: cmp r0, #0 beq _021D80CC ldr r0, [r4, #0x10] - bl FUN_02016A18 + bl FreeToHeap _021D80CC: ldr r0, [r4, #4] bl FUN_0200CAB4 @@ -3726,7 +3726,7 @@ _021D9348: add r0, r4, #0 add r1, r2, #0 mul r1, r3 - bl FUN_02016998 + bl AllocFromHeap add r7, r0, #0 mov r0, #0 str r0, [sp, #0x1c] @@ -3749,7 +3749,7 @@ _021D9374: add r2, r4, #0 bl FUN_02009668 ldr r0, [sp, #0x24] - bl FUN_02016A18 + bl FreeToHeap ldr r0, [sp, #0x1c] add r6, r6, #4 add r0, r0, #1 @@ -3839,7 +3839,7 @@ _021D9432: blo _021D9432 _021D944A: add r0, r7, #0 - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x52 lsl r0, r0, #2 ldr r0, [r5, r0] @@ -3879,7 +3879,7 @@ _021D944A: lsl r1, r1, #2 str r0, [r5, r1] add r0, r6, #0 - bl FUN_02016A18 + bl FreeToHeap add sp, #0x2c pop {r4, r5, r6, r7, pc} nop @@ -4345,17 +4345,17 @@ MOD05_021D9820: ; 0x021D9820 add r4, r1, #0 ldrh r0, [r5, r0] mov r1, #0x10 - bl FUN_02016998 + bl AllocFromHeap add r6, r0, #0 ldr r0, _021D99F4 ; =0x00000162 mov r1, #8 ldrh r0, [r5, r0] - bl FUN_02016998 + bl AllocFromHeap str r0, [r6, #8] ldr r0, _021D99F4 ; =0x00000162 mov r1, #0x24 ldrh r0, [r5, r0] - bl FUN_02016998 + bl AllocFromHeap ldr r1, [r6, #8] add r2, r4, #0 str r0, [r1] @@ -4757,7 +4757,7 @@ MOD05_021D9B54: ; 0x021D9B54 mov r1, #0xae mov r0, #4 lsl r1, r1, #2 - bl FUN_02016998 + bl AllocFromHeap add r7, r0, #0 mov r1, #0 add r2, r7, #0 @@ -5312,7 +5312,7 @@ _021D9F54: bl thunk_FUN_020ae84c str r7, [r5, #0x10] ldr r0, [r5, #0x24] - bl FUN_02016A18 + bl FreeToHeap _021D9F6E: mov r0, #0 str r0, [r5, #0x14] @@ -5347,7 +5347,7 @@ _021D9F90: mov r0, #0 str r0, [r5] ldr r0, [r5, #0x14] - bl FUN_02016A18 + bl FreeToHeap _021D9FAC: mov r0, #0 str r0, [r5, #4] @@ -5422,7 +5422,7 @@ MOD05_021DA018: ; 0x021DA018 ldr r0, [r4, r0] bl NARC_dtor add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap _021DA038: pop {r4, pc} .balign 4, 0 @@ -6028,7 +6028,7 @@ MOD05_021DA430: ; 0x021DA430 mov r1, #0xe mov r0, #4 lsl r1, r1, #6 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 mov r2, #0xe mov r0, #0 @@ -6046,7 +6046,7 @@ MOD05_021DA450: ; 0x021DA450 ldr r0, [r4] cmp r0, #0 beq _021DA462 - bl FUN_02016A18 + bl FreeToHeap mov r0, #0 str r0, [r4] _021DA462: @@ -6236,17 +6236,17 @@ MOD05_021DA5B8: ; 0x021DA5B8 push {r3, lr} mov r0, #4 mov r1, #0x28 - bl FUN_020169D8 + bl AllocFromHeapAtEnd mov r1, #0 str r1, [r0] pop {r3, pc} thumb_func_start MOD05_021DA5C8 MOD05_021DA5C8: ; 0x021DA5C8 - ldr r3, _021DA5CC ; =FUN_02016A18 + ldr r3, _021DA5CC ; =FreeToHeap bx r3 .balign 4, 0 -_021DA5CC: .word FUN_02016A18 +_021DA5CC: .word FreeToHeap thumb_func_start MOD05_021DA5D0 MOD05_021DA5D0: ; 0x021DA5D0 @@ -7308,7 +7308,7 @@ MOD05_021DAE14: ; 0x021DAE14 cmp r0, #0 beq _021DAE3C add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap mov r0, #1 pop {r3, r4, r5, pc} _021DAE3C: @@ -7478,7 +7478,7 @@ MOD05_021DAF78: ; 0x021DAF78 add r4, r1, #0 mov r0, #4 mov r1, #1 - bl FUN_020169D8 + bl AllocFromHeapAtEnd add r2, r0, #0 strb r4, [r2] ldr r0, [r5, #0x10] @@ -7566,7 +7566,7 @@ MOD05_021DB030: ; 0x021DB030 push {r3, lr} mov r0, #4 mov r1, #0x10 - bl FUN_020169D8 + bl AllocFromHeapAtEnd mov r1, #0 str r1, [r0] pop {r3, pc} @@ -7673,7 +7673,7 @@ _021DB106: cmp r1, r0 bne _021DB126 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap add sp, #0xc mov r0, #1 pop {r3, r4, r5, r6, pc} @@ -7740,7 +7740,7 @@ _021DB1A0: cmp r0, #0 beq _021DB1B4 add r0, r5, #0 - bl FUN_02016A18 + bl FreeToHeap add sp, #0xc mov r0, #1 pop {r4, r5, pc} @@ -7804,7 +7804,7 @@ _021DB222: cmp r0, #0 beq _021DB236 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap add sp, #0x10 mov r0, #1 pop {r4, r5, r6, pc} @@ -7955,7 +7955,7 @@ _021DB348: cmp r1, r0 bne _021DB368 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap add sp, #0x18 mov r0, #1 pop {r3, r4, r5, r6, r7, pc} @@ -8062,7 +8062,7 @@ _021DB432: cmp r0, #0 beq _021DB446 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap add sp, #0x10 mov r0, #1 pop {r3, r4, r5, r6, r7, pc} @@ -8082,7 +8082,7 @@ MOD05_021DB44C: ; 0x021DB44C _021DB45A: mov r0, #4 mov r1, #0x14 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 ldr r0, _021DB4AC ; =0x021F65FC lsl r1, r6, #2 @@ -8394,7 +8394,7 @@ _021DB6A4: mul r4, r1 mov r0, #4 add r1, r4, #0 - bl FUN_02016998 + bl AllocFromHeap ldr r1, [sp] add r2, r4, #0 str r0, [r1] @@ -8682,7 +8682,7 @@ MOD05_021DB900: ; 0x021DB900 push {r4, lr} mov r0, #4 mov r1, #8 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 bne _021DB912 bl ErrorHandling @@ -8728,7 +8728,7 @@ _021DB958: lsl r4, r0, #2 mov r0, #4 add r1, r6, #0 - bl FUN_02016998 + bl AllocFromHeap str r0, [r5] cmp r0, #0 bne _021DB974 @@ -8736,7 +8736,7 @@ _021DB958: _021DB974: mov r0, #4 add r1, r4, #0 - bl FUN_02016998 + bl AllocFromHeap str r0, [r5, #4] cmp r0, #0 bne _021DB986 @@ -8772,11 +8772,11 @@ MOD05_021DB9BC: ; 0x021DB9BC push {r4, lr} add r4, r0, #0 ldr r0, [r4, #4] - bl FUN_02016A18 + bl FreeToHeap ldr r0, [r4] - bl FUN_02016A18 + bl FreeToHeap add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} thumb_func_start MOD05_021DB9D4 @@ -8815,7 +8815,7 @@ MOD05_021DBA00: ; 0x021DBA00 push {r4, lr} mov r0, #4 mov r1, #0x38 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 mov r0, #0 add r1, r4, #0 @@ -8935,7 +8935,7 @@ MOD05_021DBABC: ; 0x021DBABC push {r4, lr} mov r0, #4 mov r1, #0x48 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 mov r0, #0 add r1, r4, #0 @@ -9545,7 +9545,7 @@ MOD05_021DBEF4: ; 0x021DBEF4 mov r1, #0x42 mov r0, #4 lsl r1, r1, #2 - bl FUN_02016998 + bl AllocFromHeap cmp r0, #0 beq _021DBF1E mov r2, #0 @@ -9754,7 +9754,7 @@ MOD05_021DC06C: ; 0x021DC06C ldr r0, [r6, r4] cmp r0, #0 beq _021DC08A - bl FUN_02016A18 + bl FreeToHeap mov r0, #0 str r0, [r6, r4] _021DC08A: @@ -9786,7 +9786,7 @@ MOD05_021DC0AC: ; 0x021DC0AC push {r3, lr} cmp r0, #0 beq _021DC0B6 - bl FUN_02016A18 + bl FreeToHeap _021DC0B6: pop {r3, pc} @@ -9796,7 +9796,7 @@ MOD05_021DC0B8: ; 0x021DC0B8 add r5, r0, #0 mov r0, #4 mov r1, #0x18 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 add r2, r4, #0 mov r1, #0x18 @@ -9843,7 +9843,7 @@ _021DC112: sub r1, r1, #1 bne _021DC112 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} .balign 4, 0 @@ -10245,7 +10245,7 @@ _021DC3F6: add r1, r0, #0 mov r0, #4 lsl r1, r1, #2 - bl FUN_02016998 + bl AllocFromHeap str r0, [r6, #0x10] mov r1, #0 mov r2, #0x39 @@ -10313,7 +10313,7 @@ MOD05_021DC480: ; 0x021DC480 mov r2, #4 bl FUN_02009668 add r0, r5, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r3, r4, r5, pc} thumb_func_start MOD05_021DC4AC @@ -10334,7 +10334,7 @@ _021DC4B4: cmp r4, #4 blt _021DC4B4 ldr r0, [r6, #0x10] - bl FUN_02016A18 + bl FreeToHeap mov r0, #0 str r0, [r6, #0x10] add r0, r6, #0 @@ -10408,7 +10408,7 @@ MOD05_021DC554: ; 0x021DC554 add r5, r0, #0 mov r0, #4 lsl r1, r1, #2 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 mov r0, #0x41 lsl r0, r0, #2 @@ -10882,7 +10882,7 @@ _021DC8DC: cmp r0, #0 bne _021DC8F4 ldr r0, [r4, #0xc] - bl FUN_02016A18 + bl FreeToHeap mov r0, #0 str r0, [r4, #0xc] pop {r3, r4, r5, pc} @@ -11017,7 +11017,7 @@ _021DC998: cmp r1, #0 ble _021DC9FE mov r0, #4 - bl FUN_02016998 + bl AllocFromHeap ldr r2, [r4, #0xc] ldr r1, _021DCA3C ; =0x00000F58 str r0, [r2, r1] @@ -11434,7 +11434,7 @@ MOD05_021DCD04: ; 0x021DCD04 _021DCD14: ldr r1, _021DCD60 ; =0x00000F68 mov r0, #4 - bl FUN_02016998 + bl AllocFromHeap str r0, [r4, #0xc] cmp r0, #0 bne _021DCD26 @@ -11489,7 +11489,7 @@ MOD05_021DCD68: ; 0x021DCD68 _021DCD80: mov r0, #4 mov r1, #0x64 - bl FUN_02016998 + bl AllocFromHeap str r0, [r4, #0x10] cmp r0, #0 bne _021DCD92 @@ -11692,7 +11692,7 @@ MOD05_021DCECC: ; 0x021DCECC mov r3, #0xc0 bl FUN_02017FB4 ldr r0, [sp] - bl FUN_02016A18 + bl FreeToHeap mov r0, #0 str r0, [sp] _021DCF0E: @@ -11734,7 +11734,7 @@ MOD05_021DCF14: ; 0x021DCF14 mov r1, #2 bl FUN_02017E14 ldr r0, [sp, #8] - bl FUN_02016A18 + bl FreeToHeap mov r0, #0 str r0, [sp, #8] _021DCF62: @@ -11814,7 +11814,7 @@ _021DCFA0: ldr r0, [r0, #8] bl FUN_02017CD0 ldr r0, [sp, #0x14] - bl FUN_02016A18 + bl FreeToHeap mov r0, #0 str r0, [sp, #0x14] _021DD00A: @@ -20436,7 +20436,7 @@ MOD05_021E1374: ; 0x021E1374 add r7, r0, #0 mov r0, #4 lsl r1, r1, #2 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 bne _021E1396 bl ErrorHandling @@ -20619,7 +20619,7 @@ _021E14FA: bl MOD05_021E1514 b _021E150C _021E1502: - bl FUN_02016A18 + bl FreeToHeap add sp, #8 mov r0, #1 pop {r3, r4, r5, pc} @@ -20912,7 +20912,7 @@ MOD05_021E1724: ; 0x021E1724 add r6, r1, #0 mov r0, #4 mov r1, #0xc - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 bne _021E173C bl ErrorHandling @@ -21566,7 +21566,7 @@ MOD05_021E1BF8: ; 0x021E1BF8 lsl r1, r1, #2 str r2, [sp, #0x18] add r5, r3, #0 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 bne _021E1C18 add sp, #0x1c @@ -21973,7 +21973,7 @@ _021E1F22: ldr r0, [r6, #4] bl FUN_0200CAB4 add r0, r6, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, r5, r6, pc} .balign 4, 0 _021E1F30: .word 0x000005DC @@ -22570,7 +22570,7 @@ _021E23BE: ldr r0, [r6, #4] bl FUN_0200CAB4 add r0, r6, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, r5, r6, pc} .balign 4, 0 _021E23CC: .word 0x000005DC @@ -22839,7 +22839,7 @@ _021E25F6: ldr r0, [r6, #4] bl FUN_0200CAB4 add r0, r6, #0 - bl FUN_02016A18 + bl FreeToHeap _021E2602: pop {r4, r5, r6, pc} .balign 4, 0 @@ -23985,7 +23985,7 @@ MOD05_021E2EE4: ; 0x021E2EE4 add r2, r7, #0 bl MOD05_021E2E88 ldr r0, [sp, #4] - bl FUN_02016A18 + bl FreeToHeap add sp, #8 pop {r3, r4, r5, r6, r7, pc} nop @@ -24374,7 +24374,7 @@ MOD05_021E320C: ; 0x021E320C add r5, r0, #0 mov r0, #4 mov r1, #0x44 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 mov r0, #0x16 mov r1, #4 @@ -24408,9 +24408,9 @@ MOD05_021E3248: ; 0x021E3248 ldr r0, [r4, #0x40] bl FUN_02021A20 ldr r0, [r4, #0x38] - bl FUN_02016A18 + bl FreeToHeap add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} .balign 4, 0 @@ -24615,7 +24615,7 @@ _021E33FE: cmp r0, #0 beq _021E3414 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap add sp, #4 mov r0, #1 pop {r3, r4, r5, r6, pc} @@ -24633,7 +24633,7 @@ MOD05_021E3424: ; 0x021E3424 add r4, r0, #0 mov r0, #0xb mov r1, #4 - bl FUN_020169D8 + bl AllocFromHeapAtEnd add r2, r0, #0 mov r0, #0 str r0, [r2] @@ -24679,7 +24679,7 @@ MOD05_021E3474: ; 0x021E3474 mov r1, #0x4c str r2, [sp] add r5, r3, #0 - bl FUN_02016998 + bl AllocFromHeap mov r1, #0 mov r2, #0x4c add r4, r0, #0 @@ -24821,7 +24821,7 @@ _021E3580: _021E3590: bl FUN_0200CAB4 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap add sp, #4 pop {r3, r4, pc} _021E359E: @@ -25079,7 +25079,7 @@ MOD05_021E3768: ; 0x021E3768 push {r4, lr} mov r0, #4 mov r1, #0x30 - bl FUN_02016998 + bl AllocFromHeap mov r1, #0 mov r2, #0x30 add r4, r0, #0 @@ -25119,7 +25119,7 @@ _021E37B2: and r0, r1 str r0, [r2] add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} nop _021E37C8: .word 0xFFFF1FFF @@ -25415,7 +25415,7 @@ MOD05_021E39FC: ; 0x021E39FC push {r4, r5, r6, lr} mov r0, #4 mov r1, #0x48 - bl FUN_02016998 + bl AllocFromHeap mov r1, #0 mov r2, #0x48 add r4, r0, #0 @@ -25463,7 +25463,7 @@ _021E3A56: and r0, r1 str r0, [r2] add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} nop _021E3A6C: .word 0xFFFF1FFF @@ -26098,7 +26098,7 @@ MOD05_021E3F68: ; 0x021E3F68 bl FUN_020690AC add r0, r4, #0 mov r1, #0x20 - bl FUN_02016998 + bl AllocFromHeap add r1, sp, #4 add r5, r0, #0 ldrh r0, [r1, #4] @@ -26121,9 +26121,9 @@ MOD05_021E3F68: ; 0x021E3F68 mov r2, #0x20 bl MOD05_021E40F0 add r0, r5, #0 - bl FUN_02016A18 + bl FreeToHeap add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap add sp, #0x18 pop {r3, r4, r5, r6, r7, pc} @@ -26214,9 +26214,9 @@ MOD05_021E4014: ; 0x021E4014 add r1, r4, #0 bl MOD05_021E4118 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap ldr r0, [sp, #4] - bl FUN_02016A18 + bl FreeToHeap add sp, #0x20 pop {r3, r4, r5, r6, r7, pc} .balign 4, 0 @@ -26232,7 +26232,7 @@ MOD05_021E4080: ; 0x021E4080 lsl r1, r1, #0xa str r2, [sp, #4] add r5, r3, #0 - bl FUN_02016998 + bl AllocFromHeap mov ip, r0 lsl r0, r5, #2 mov r7, #0 @@ -26323,7 +26323,7 @@ MOD05_021E4118: ; 0x021E4118 MOD05_021E4140: ; 0x021E4140 push {r4, lr} mov r1, #0x30 - bl FUN_02016998 + bl AllocFromHeap mov r1, #0 mov r2, #0x30 add r4, r0, #0 @@ -26334,10 +26334,10 @@ MOD05_021E4140: ; 0x021E4140 thumb_func_start MOD05_021E4158 MOD05_021E4158: ; 0x021E4158 - ldr r3, _021E415C ; =FUN_02016A18 + ldr r3, _021E415C ; =FreeToHeap bx r3 .balign 4, 0 -_021E415C: .word FUN_02016A18 +_021E415C: .word FreeToHeap thumb_func_start MOD05_021E4160 MOD05_021E4160: ; 0x021E4160 @@ -26441,7 +26441,7 @@ _021E41CE: MOD05_021E4220: ; 0x021E4220 push {r4, lr} mov r1, #0x30 - bl FUN_02016998 + bl AllocFromHeap mov r1, #0 mov r2, #0x30 add r4, r0, #0 @@ -26452,10 +26452,10 @@ MOD05_021E4220: ; 0x021E4220 thumb_func_start MOD05_021E4238 MOD05_021E4238: ; 0x021E4238 - ldr r3, _021E423C ; =FUN_02016A18 + ldr r3, _021E423C ; =FreeToHeap bx r3 .balign 4, 0 -_021E423C: .word FUN_02016A18 +_021E423C: .word FreeToHeap thumb_func_start MOD05_021E4240 MOD05_021E4240: ; 0x021E4240 @@ -26641,7 +26641,7 @@ MOD05_021E4394: ; 0x021E4394 add r6, r0, #0 mov r0, #4 mov r1, #0xcc - bl FUN_02016998 + bl AllocFromHeap mov r1, #0 mov r2, #0xcc add r7, r0, #0 @@ -26674,7 +26674,7 @@ _021E43CC: cmp r4, #0x30 blt _021E43CC add r0, r6, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, r5, r6, pc} .balign 4, 0 @@ -26846,7 +26846,7 @@ _021E4518: .word 0x021F745C MOD05_021E451C: ; 0x021E451C push {r3, lr} mov r1, #0x1c - bl FUN_02016998 + bl AllocFromHeap add r3, r0, #0 mov r2, #0x1c mov r1, #0 @@ -26859,10 +26859,10 @@ _021E452A: thumb_func_start MOD05_021E4534 MOD05_021E4534: ; 0x021E4534 - ldr r3, _021E4538 ; =FUN_02016A18 + ldr r3, _021E4538 ; =FreeToHeap bx r3 .balign 4, 0 -_021E4538: .word FUN_02016A18 +_021E4538: .word FreeToHeap thumb_func_start MOD05_021E453C MOD05_021E453C: ; 0x021E453C @@ -27038,7 +27038,7 @@ MOD05_021E4688: ; 0x021E4688 push {r3, r4, r5, r6, r7, lr} mov r1, #0x24 add r6, r0, #0 - bl FUN_02016998 + bl AllocFromHeap mov r1, #0 mov r2, #0x24 add r7, r0, #0 @@ -27070,7 +27070,7 @@ _021E46BC: cmp r4, #8 blt _021E46BC add r0, r6, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, r5, r6, pc} .balign 4, 0 @@ -27172,7 +27172,7 @@ MOD05_021E4788: ; 0x021E4788 push {r4, lr} mov r0, #4 mov r1, #0xe8 - bl FUN_02016998 + bl AllocFromHeap mov r1, #0 mov r2, #0xe8 add r4, r0, #0 @@ -27192,7 +27192,7 @@ MOD05_021E47A0: ; 0x021E47A0 bl MOD05_021E4918 _021E47B2: add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} .balign 4, 0 @@ -27772,10 +27772,10 @@ MOD05_021E4BE8: ; 0x021E4BE8 thumb_func_start MOD05_021E4C00 MOD05_021E4C00: ; 0x021E4C00 - ldr r3, _021E4C04 ; =FUN_02016A18 + ldr r3, _021E4C04 ; =FreeToHeap bx r3 .balign 4, 0 -_021E4C04: .word FUN_02016A18 +_021E4C04: .word FreeToHeap thumb_func_start MOD05_021E4C08 MOD05_021E4C08: ; 0x021E4C08 @@ -32684,7 +32684,7 @@ _021E7198: str r0, [sp] mov r0, #4 mov r1, #0x10 - bl FUN_020169D8 + bl AllocFromHeapAtEnd add r4, r0, #0 mov r0, #0 str r0, [r4] @@ -32728,7 +32728,7 @@ MOD05_021E71E8: ; 0x021E71E8 add r0, r4, #0 bl MOD05_021E6014 add r0, r6, #0 - bl FUN_02016A18 + bl FreeToHeap add r0, r5, #0 bl FUN_0200CAB4 _021E7216: @@ -32824,7 +32824,7 @@ MOD05_021E72B8: ; 0x021E72B8 add r5, r0, #0 mov r0, #4 add r1, r5, #0 - bl FUN_020169D8 + bl AllocFromHeapAtEnd add r4, r0, #0 bne _021E72CC bl ErrorHandling @@ -33101,7 +33101,7 @@ MOD05_021E74D4: ; 0x021E74D4 add r5, r0, #0 mov r0, #4 add r1, r5, #0 - bl FUN_020169D8 + bl AllocFromHeapAtEnd add r4, r0, #0 bne _021E74E8 bl ErrorHandling @@ -33250,7 +33250,7 @@ _021E75EA: mov r1, #1 str r1, [r0] add r0, r5, #0 - bl FUN_02016A18 + bl FreeToHeap add r0, r7, #0 bl FUN_0200CAB4 _021E7606: @@ -33389,7 +33389,7 @@ _021E771C: mov r1, #1 str r1, [r0] add r0, r5, #0 - bl FUN_02016A18 + bl FreeToHeap add r0, r6, #0 bl FUN_0200CAB4 _021E7740: @@ -33408,7 +33408,7 @@ MOD05_021E7750: ; 0x021E7750 mov r0, #4 mov r1, #0x14 add r7, r2, #0 - bl FUN_020169D8 + bl AllocFromHeapAtEnd add r4, r0, #0 mov r1, #0 mov r2, #0x14 @@ -34040,7 +34040,7 @@ MOD05_021E7C00: ; 0x021E7C00 push {r4, lr} mov r1, #0x46 lsl r1, r1, #6 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 bl MOD05_021E7C1C add r0, r4, #0 @@ -34048,10 +34048,10 @@ MOD05_021E7C00: ; 0x021E7C00 thumb_func_start MOD05_021E7C14 MOD05_021E7C14: ; 0x021E7C14 - ldr r3, _021E7C18 ; =FUN_02016A18 + ldr r3, _021E7C18 ; =FreeToHeap bx r3 .balign 4, 0 -_021E7C18: .word FUN_02016A18 +_021E7C18: .word FreeToHeap thumb_func_start MOD05_021E7C1C MOD05_021E7C1C: ; 0x021E7C1C @@ -34169,7 +34169,7 @@ MOD05_021E7CD8: ; 0x021E7CD8 cmp r4, #0 beq _021E7D0E mov r0, #4 - bl FUN_020169D8 + bl AllocFromHeapAtEnd str r0, [sp, #4] ldr r2, [sp, #4] add r0, r6, #0 @@ -34279,7 +34279,7 @@ _021E7DBE: ldr r0, [sp, #4] cmp r0, #0 beq _021E7DD2 - bl FUN_02016A18 + bl FreeToHeap _021E7DD2: add sp, #0x14 pop {r4, r5, r6, r7, pc} @@ -34725,7 +34725,7 @@ _021E80F4: .word 0x021F789C MOD05_021E80F8: ; 0x021E80F8 push {r3, lr} mov r1, #0x14 - bl FUN_02016998 + bl AllocFromHeap add r3, r0, #0 mov r2, #0x14 mov r1, #0 @@ -34747,7 +34747,7 @@ MOD05_021E8110: ; 0x021E8110 bl FUN_02019178 _021E8120: add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} thumb_func_start MOD05_021E8128 @@ -35262,7 +35262,7 @@ MOD05_021E84F4: ; 0x021E84F4 add r4, r0, #0 ldr r0, [r4, #4] mov r1, #0x10 - bl FUN_02016998 + bl AllocFromHeap str r0, [r4, #0x10] mov r3, #1 str r3, [sp] @@ -35320,7 +35320,7 @@ MOD05_021E856C: ; 0x021E856C ldr r0, [r4, #0x10] bl FUN_02019178 ldr r0, [r4, #0x10] - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} .balign 4, 0 @@ -35332,7 +35332,7 @@ MOD05_021E8588: ; 0x021E8588 add r0, r5, #0 mov r1, #0x34 add r7, r2, #0 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 str r6, [r4] str r5, [r4, #4] @@ -35376,7 +35376,7 @@ MOD05_021E85E4: ; 0x021E85E4 ldr r0, [r4, #0x14] bl FUN_0200AB18 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} thumb_func_start MOD05_021E85FC @@ -35708,7 +35708,7 @@ MOD05_021E8860: ; 0x021E8860 bl GX_ResetBankForBG mov r0, #4 add r1, r0, #0 - bl FUN_02016998 + bl AllocFromHeap add r7, r0, #0 mov r0, #0 add r1, r7, #0 @@ -35782,7 +35782,7 @@ _021E8906: ; jump table _021E8912: mov r0, #4 mov r1, #0x20 - bl FUN_02016998 + bl AllocFromHeap str r0, [r4, #0xc] mov r1, #0 mov r2, #0x20 @@ -35964,7 +35964,7 @@ _021E8A86: ; jump table _021E8A92: mov r0, #4 mov r1, #0x20 - bl FUN_02016998 + bl AllocFromHeap str r0, [r4, #0xc] mov r1, #0 mov r2, #0x20 @@ -36148,7 +36148,7 @@ _021E8C0A: ; jump table _021E8C18: mov r0, #4 mov r1, #0x10 - bl FUN_02016998 + bl AllocFromHeap str r0, [r4, #0xc] mov r2, #0x10 mov r1, #0 @@ -36304,7 +36304,7 @@ _021E8D3E: ; jump table _021E8D4C: mov r0, #4 mov r1, #0x10 - bl FUN_02016998 + bl AllocFromHeap str r0, [r4, #0xc] mov r2, #0x10 mov r1, #0 @@ -36571,7 +36571,7 @@ _021E8F3C: ; jump table _021E8F48: mov r0, #4 mov r1, #0x1c - bl FUN_02016998 + bl AllocFromHeap str r0, [r4, #0xc] mov r2, #0x1c mov r1, #0 @@ -36706,7 +36706,7 @@ _021E904C: ; jump table _021E9058: mov r0, #4 mov r1, #0x1c - bl FUN_02016998 + bl AllocFromHeap str r0, [r4, #0xc] mov r2, #0x1c mov r1, #0 @@ -36846,7 +36846,7 @@ _021E916E: mov r1, #0x1e mov r0, #4 lsl r1, r1, #4 - bl FUN_02016998 + bl AllocFromHeap mov r2, #0x1e str r0, [r7, #0xc] mov r1, #0 @@ -37252,7 +37252,7 @@ _021E94D4: mov r1, #0x71 mov r0, #4 lsl r1, r1, #2 - bl FUN_02016998 + bl AllocFromHeap mov r2, #0x71 str r0, [r6, #0xc] mov r1, #0 @@ -37612,7 +37612,7 @@ _021E97D6: mov r1, #0x7a mov r0, #4 lsl r1, r1, #2 - bl FUN_02016998 + bl AllocFromHeap mov r2, #0x7a str r0, [r7, #0xc] mov r1, #0 @@ -38069,7 +38069,7 @@ _021E9B98: mov r1, #9 mov r0, #4 lsl r1, r1, #6 - bl FUN_02016998 + bl AllocFromHeap ldr r1, [sp, #0x1c] mov r2, #9 str r0, [r1, #0xc] @@ -38728,7 +38728,7 @@ _021EA110: mov r1, #0x1f mov r0, #4 lsl r1, r1, #4 - bl FUN_02016998 + bl AllocFromHeap mov r2, #0x1f str r0, [r5, #0xc] mov r1, #0 @@ -39058,7 +39058,7 @@ _021EA3D8: mov r1, #0x8a mov r0, #4 lsl r1, r1, #2 - bl FUN_02016998 + bl AllocFromHeap ldr r1, [sp, #0x18] mov r2, #0x8a str r0, [r1, #0xc] @@ -39645,7 +39645,7 @@ _021EA8B2: mov r1, #0x69 mov r0, #4 lsl r1, r1, #2 - bl FUN_02016998 + bl AllocFromHeap mov r2, #0x69 str r0, [r4, #0xc] mov r1, #0 @@ -39931,7 +39931,7 @@ _021EAB14: mov r1, #0x1b mov r0, #4 lsl r1, r1, #4 - bl FUN_02016998 + bl AllocFromHeap mov r2, #0x1b str r0, [r6, #0xc] mov r1, #0 @@ -40238,7 +40238,7 @@ _021EAD8E: mov r1, #0x3d mov r0, #4 lsl r1, r1, #4 - bl FUN_02016998 + bl AllocFromHeap ldr r1, [sp, #0x14] mov r2, #0x3d str r0, [r1, #0xc] @@ -40727,7 +40727,7 @@ _021EB18E: mov r1, #0x6f mov r0, #4 lsl r1, r1, #2 - bl FUN_02016998 + bl AllocFromHeap mov r2, #0x6f str r0, [r5, #0xc] mov r1, #0 @@ -41072,7 +41072,7 @@ _021EB466: ; jump table _021EB476: mov r0, #4 mov r1, #0x10 - bl FUN_02016998 + bl AllocFromHeap str r0, [r4, #0xc] mov r2, #0x10 mov r1, #0 @@ -41254,7 +41254,7 @@ _021EB5D0: ; jump table _021EB5E4: mov r0, #4 mov r1, #0x38 - bl FUN_02016998 + bl AllocFromHeap mov r1, #0 mov r2, #0x38 str r0, [r4, #0xc] @@ -41473,7 +41473,7 @@ _021EB7A2: mov r1, #0x1f ldr r0, [sp, #0x14] lsl r1, r1, #4 - bl FUN_02016998 + bl AllocFromHeap mov r2, #0x1f str r0, [r5, #0xc] mov r1, #0 @@ -42156,7 +42156,7 @@ _021EBD20: mov r1, #0x9b ldr r0, [sp, #0x10] lsl r1, r1, #2 - bl FUN_02016998 + bl AllocFromHeap mov r2, #0x9b str r0, [r5, #0xc] mov r1, #0 @@ -43353,7 +43353,7 @@ _021EC6FA: mov r1, #0 bl FUN_02023CA0 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap add r0, r7, #0 add sp, #0xc pop {r4, r5, r6, r7, pc} @@ -43406,7 +43406,7 @@ MOD05_021EC744: ; 0x021EC744 bl FUN_020687C8 add r4, r0, #0 add r0, r7, #0 - bl FUN_02016A18 + bl FreeToHeap add r0, r4, #0 pop {r3, r4, r5, r6, r7, pc} @@ -43925,7 +43925,7 @@ MOD05_021ECB6C: ; 0x021ECB6C mov r0, #4 mov r1, #0xb4 str r2, [sp, #4] - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 mov r0, #0 add r1, r4, #0 @@ -44166,7 +44166,7 @@ _021ECD4A: blo _021ECCFE _021ECD54: add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap add sp, #0x28 pop {r3, r4, r5, r6, r7, pc} nop @@ -44671,7 +44671,7 @@ _021ED168: add r0, r5, #0 bl MOD05_021ECD64 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap add sp, #0x14 pop {r4, r5, r6, r7, pc} @@ -45625,7 +45625,7 @@ _021ED7CE: ldr r0, [sp, #0x10] bl FUN_02021A20 add r0, r6, #0 - bl FUN_02016A18 + bl FreeToHeap add sp, #0x3c pop {r4, r5, r6, r7, pc} nop @@ -46490,7 +46490,7 @@ MOD05_021EDFBC: ; 0x021EDFBC _021EDFC4: ldr r1, _021EE03C ; =0x0000086C mov r0, #4 - bl FUN_02016998 + bl AllocFromHeap lsl r4, r6, #2 add r1, r5, r4 add r1, #0x90 @@ -46559,7 +46559,7 @@ MOD05_021EE050: ; 0x021EE050 _021EE058: ldr r1, _021EE0B0 ; =0x0000086C mov r0, #4 - bl FUN_02016998 + bl AllocFromHeap lsl r4, r6, #2 add r1, r5, r4 add r1, #0x90 @@ -46614,7 +46614,7 @@ MOD05_021EE0C0: ; 0x021EE0C0 beq _021EE0E6 mov r0, #4 mov r1, #0x10 - bl FUN_020169D8 + bl AllocFromHeapAtEnd add r4, r0, #0 add r0, r6, #0 add r1, r7, #0 @@ -46643,7 +46643,7 @@ _021EE0FC: ldr r0, [r4, #0xc] str r0, [r5, #8] add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r3, r4, r5, r6, r7, pc} thumb_func_start MOD05_021EE114 @@ -49082,7 +49082,7 @@ MOD05_021EF368: ; 0x021EF368 lsl r1, r1, #2 str r2, [sp, #4] add r6, r3, #0 - bl FUN_02016998 + bl AllocFromHeap mov r2, #0x41 mov r1, #0 lsl r2, r2, #2 @@ -49335,7 +49335,7 @@ _021EF542: add r0, r5, r4 add r0, #0x90 ldr r0, [r0] - bl FUN_02016A18 + bl FreeToHeap add r0, r5, r4 add r0, #0x90 str r7, [r0] @@ -49370,7 +49370,7 @@ MOD05_021EF5A8: ; 0x021EF5A8 ldr r0, [r4] bl MOD05_021F3C30 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} .balign 4, 0 @@ -49971,7 +49971,7 @@ _021EF9EC: mov r1, #0 str r1, [r0] add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap add r0, r5, #0 bl FUN_0200CAB4 _021EF9FE: @@ -49989,7 +49989,7 @@ MOD05_021EFA08: ; 0x021EFA08 mov r1, #0x28 add r6, r2, #0 add r7, r3, #0 - bl FUN_020169D8 + bl AllocFromHeapAtEnd add r1, r0, #0 str r5, [r1] str r4, [r1, #4] @@ -50761,7 +50761,7 @@ _021F000E: add r2, r6, #0 bl FUN_0200ABC0 add r0, r6, #0 - bl FUN_02016A18 + bl FreeToHeap add r0, r5, #0 mov r1, #0x24 bl MOD05_021F01EC @@ -50963,7 +50963,7 @@ _021F01D4: add r0, r4, #0 bl MOD05_021F0290 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap bl FUN_02037778 mov r0, #1 pop {r3, r4, r5, pc} @@ -51077,7 +51077,7 @@ MOD05_021F02C4: ; 0x021F02C4 ldr r5, [r6, #0x10] mov r0, #0xb mov r1, #0x94 - bl FUN_020169D8 + bl AllocFromHeapAtEnd add r4, r0, #0 bl MOD05_021F0254 str r6, [r4, #0x30] @@ -51259,7 +51259,7 @@ MOD05_021F043C: ; 0x021F043C add r5, r0, #0 mov r0, #4 mov r1, #0x60 - bl FUN_02016998 + bl AllocFromHeap add r1, r5, #0 add r4, r0, #0 bl MOD05_021F0454 @@ -51350,7 +51350,7 @@ MOD05_021F04F8: ; 0x021F04F8 bl ErrorHandling _021F0508: ldr r0, [r4] - bl FUN_02016A18 + bl FreeToHeap mov r0, #0 str r0, [r4] _021F0512: @@ -54562,11 +54562,11 @@ MOD05_021F1E2C: ; 0x021F1E2C cmp r5, #1 bne _021F1E4C mov r0, #4 - bl FUN_02016998 + bl AllocFromHeap b _021F1E52 _021F1E4C: mov r0, #4 - bl FUN_020169D8 + bl AllocFromHeapAtEnd _021F1E52: add r5, r0, #0 add r0, r6, #0 @@ -54972,7 +54972,7 @@ MOD05_021F2160: ; 0x021F2160 add r7, r0, #0 mov r0, #4 mul r1, r6 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 add r0, r7, #0 add r0, #0xe4 @@ -54983,7 +54983,7 @@ MOD05_021F2160: ; 0x021F2160 _021F2180: mov r0, #4 lsl r1, r6, #3 - bl FUN_02016998 + bl AllocFromHeap add r5, r0, #0 add r7, #0xf4 str r5, [r7] @@ -57504,7 +57504,7 @@ MOD05_021F33B4: ; 0x021F33B4 ldr r1, [sp, #8] mov r0, #4 str r2, [sp] - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 bne _021F33E2 bl ErrorHandling @@ -57577,7 +57577,7 @@ MOD05_021F3458: ; 0x021F3458 ldr r0, [r4, #0x24] bl FUN_0200CAB4 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap mov r0, #1 mov r1, #0 lsl r0, r0, #8 @@ -57635,7 +57635,7 @@ MOD05_021F34DC: ; 0x021F34DC str r0, [sp, #0x10] mov r0, #4 mov r1, #0x58 - bl FUN_020169D8 + bl AllocFromHeapAtEnd mov r1, #0 mov r2, #0x58 add r5, r0, #0 @@ -57871,13 +57871,13 @@ _021F370A: ldr r0, [r5, #0x24] bl FUN_0201F744 ldr r0, [r5, #8] - bl FUN_02016A18 + bl FreeToHeap ldr r0, [r5, #0xc] - bl FUN_02016A18 + bl FreeToHeap ldr r0, [r5, #0x10] - bl FUN_02016A18 + bl FreeToHeap add r0, r5, #0 - bl FUN_02016A18 + bl FreeToHeap add r0, r6, #0 bl FUN_0200CAB4 pop {r4, r5, r6, pc} @@ -57904,13 +57904,13 @@ _021F3758: ldr r0, [r5, #0x24] bl FUN_0201F744 ldr r0, [r5, #8] - bl FUN_02016A18 + bl FreeToHeap ldr r0, [r5, #0xc] - bl FUN_02016A18 + bl FreeToHeap ldr r0, [r5, #0x10] - bl FUN_02016A18 + bl FreeToHeap add r0, r5, #0 - bl FUN_02016A18 + bl FreeToHeap add r0, r6, #0 bl FUN_0200CAB4 _021F377C: @@ -57945,7 +57945,7 @@ MOD05_021F379C: ; 0x021F379C MOD05_021F37AC: ; 0x021F37AC push {r4, lr} mov r1, #0x10 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 bne _021F37BC bl ErrorHandling @@ -58014,7 +58014,7 @@ MOD05_021F3810: ; 0x021F3810 mul r5, r0 ldr r0, [r4] add r1, r5, #0 - bl FUN_02016998 + bl AllocFromHeap str r0, [r4, #0xc] cmp r0, #0 bne _021F382E @@ -58032,7 +58032,7 @@ MOD05_021F383C: ; 0x021F383C push {r4, lr} add r4, r0, #0 ldr r0, [r4, #0x5c] - bl FUN_02016A18 + bl FreeToHeap add r0, r4, #0 mov r1, #0 mov r2, #0x60 @@ -58467,7 +58467,7 @@ MOD05_021F3BC0: ; 0x021F3BC0 add r7, r0, #0 mov r0, #4 mov r1, #0x20 - bl FUN_02016998 + bl AllocFromHeap add r5, r0, #0 mov r4, #0 _021F3BD0: @@ -58491,7 +58491,7 @@ _021F3BEC: mov r1, #9 mov r0, #4 lsl r1, r1, #0xc - bl FUN_02016998 + bl AllocFromHeap str r0, [r6, #0x10] cmp r0, #0 bne _021F3C04 @@ -58534,7 +58534,7 @@ _021F3C38: ldr r0, [r5, #0x10] cmp r0, #0 beq _021F3C4C - bl FUN_02016A18 + bl FreeToHeap mov r0, #0 str r0, [r5, #0x10] _021F3C4C: @@ -58544,7 +58544,7 @@ _021F3C4C: cmp r4, #4 blo _021F3C38 add r0, r6, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r3, r4, r5, r6, r7, pc} .balign 4, 0 @@ -59431,7 +59431,7 @@ _021F42EA: mov r1, #0 str r1, [r0] add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap add r0, r5, #0 bl FUN_0200CAB4 pop {r3, r4, r5, pc} @@ -59462,7 +59462,7 @@ MOD05_021F4328: ; 0x021F4328 push {r3, lr} mov r0, #4 mov r1, #0x20 - bl FUN_02016998 + bl AllocFromHeap mov r1, #0 str r1, [r0, #0x10] str r1, [r0, #0x14] @@ -59481,7 +59481,7 @@ MOD05_021F4344: ; 0x021F4344 mov r0, #4 mov r1, #0x1c add r4, r2, #0 - bl FUN_020169D8 + bl AllocFromHeapAtEnd add r6, r0, #0 add r0, r5, #0 add r1, r6, #0 @@ -59518,7 +59518,7 @@ MOD05_021F4344: ; 0x021F4344 add r2, r6, #0 bl MOD05_021F41F0 add r0, r6, #0 - bl FUN_02016A18 + bl FreeToHeap mov r0, #1 str r0, [r4, #0x1c] pop {r4, r5, r6} @@ -59532,7 +59532,7 @@ MOD05_021F43C0: ; 0x021F43C0 push {r3, lr} cmp r0, #0 beq _021F43CA - bl FUN_02016A18 + bl FreeToHeap _021F43CA: pop {r3, pc} @@ -59561,7 +59561,7 @@ MOD05_021F43E4: ; 0x021F43E4 mov r1, #0xb4 add r6, r2, #0 add r7, r3, #0 - bl FUN_020169D8 + bl AllocFromHeapAtEnd add r1, r0, #0 add r2, r1, #0 mov r0, #0 @@ -59659,12 +59659,12 @@ MOD05_021F4498: ; 0x021F4498 add r5, r0, #0 add r0, r6, #0 mov r1, #8 - bl FUN_02016998 + bl AllocFromHeap mov r1, #0x18 add r4, r0, #0 add r0, r6, #0 mul r1, r5 - bl FUN_02016998 + bl AllocFromHeap str r0, [r4, #4] mov r6, #0 str r5, [r4] @@ -59721,9 +59721,9 @@ MOD05_021F450C: ; 0x021F450C push {r4, lr} add r4, r0, #0 ldr r0, [r4, #4] - bl FUN_02016A18 + bl FreeToHeap add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} .balign 4, 0 @@ -59816,7 +59816,7 @@ _021F45A6: MOD05_021F45B4: ; 0x021F45B4 push {r4, lr} mov r1, #0x1c - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 bl MOD05_021F4650 add r0, r4, #0 @@ -59836,7 +59836,7 @@ _021F45D8: add r0, r4, #0 bl MOD05_021F4650 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap _021F45E4: pop {r4, pc} .balign 4, 0 @@ -59988,7 +59988,7 @@ MOD05_021F46C8: ; 0x021F46C8 mov r1, #0xca lsl r1, r1, #2 add r6, r0, #0 - bl FUN_02016998 + bl AllocFromHeap mov r2, #0xca mov r1, #0 lsl r2, r2, #2 @@ -60025,7 +60025,7 @@ _021F4712: ldr r0, [r4, r0] bl FUN_02012974 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} thumb_func_start MOD05_021F4724 @@ -60351,11 +60351,11 @@ MOD05_021F4978: ; 0x021F4978 add r5, r0, #0 mov r0, #4 lsl r1, r1, #6 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 mov r0, #4 mov r1, #0x10 - bl FUN_020169D8 + bl AllocFromHeapAtEnd ldr r1, _021F49A8 ; =0x000008B8 mov r2, #0 str r0, [r4, r1] @@ -60596,7 +60596,7 @@ _021F4B70: bl MOD05_021DB918 ldr r0, _021F4B9C ; =0x000008B8 ldr r0, [r5, r0] - bl FUN_02016A18 + bl FreeToHeap ldr r0, _021F4B9C ; =0x000008B8 mov r1, #0 str r1, [r5, r0] @@ -60661,7 +60661,7 @@ _021F4C10: ldr r0, [r0, #4] cmp r0, #0 beq _021F4C1E - bl FUN_02016A18 + bl FreeToHeap _021F4C1E: add r6, r6, #1 add r4, r4, #4 @@ -60670,11 +60670,11 @@ _021F4C1E: ldr r1, [r5] ldr r0, _021F4C6C ; =0x000008BC ldr r0, [r1, r0] - bl FUN_02016A18 + bl FreeToHeap ldr r1, [r5] ldr r0, _021F4C70 ; =0x0000089C ldr r0, [r1, r0] - bl FUN_02016A18 + bl FreeToHeap ldr r1, [r5] ldr r0, _021F4C70 ; =0x0000089C mov r2, #0 @@ -60682,14 +60682,14 @@ _021F4C1E: ldr r1, [r5] add r0, r0, #4 ldr r0, [r1, r0] - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x8a ldr r1, [r5] mov r2, #0 lsl r0, r0, #4 str r2, [r1, r0] ldr r0, [r5] - bl FUN_02016A18 + bl FreeToHeap mov r0, #0 str r0, [r5] pop {r3, r4, r5, r6, r7, pc} @@ -60793,7 +60793,7 @@ MOD05_021F4CF8: ; 0x021F4CF8 push {r4, lr} mov r0, #4 mov r1, #0xfc - bl FUN_02016998 + bl AllocFromHeap mov r4, #0 add r2, r4, #0 _021F4D06: @@ -60814,7 +60814,7 @@ MOD05_021F4D1C: ; 0x021F4D1C push {r4, lr} add r4, r0, #0 ldr r0, [r4] - bl FUN_02016A18 + bl FreeToHeap mov r0, #0 str r0, [r4] pop {r4, pc} @@ -61475,7 +61475,7 @@ _021F51E6: ldrb r1, [r4, #4] lsl r1, r1, #2 ldr r4, [r0, r1] - bl FUN_02016A18 + bl FreeToHeap add r0, r4, #0 pop {r3, r4, r5, pc} .balign 4, 0 @@ -61596,7 +61596,7 @@ _021F52F8: ldr r0, [r4] cmp r0, #0 beq _021F5302 - bl FUN_02016A18 + bl FreeToHeap _021F5302: mov r1, #0x10 mov r0, #0 @@ -61658,7 +61658,7 @@ MOD05_021F5358: ; 0x021F5358 cmp r0, #0 bne _021F5376 ldr r0, [r4] - bl FUN_02016A18 + bl FreeToHeap _021F5376: mov r1, #0x14 mov r0, #0 @@ -62044,7 +62044,7 @@ MOD05_021F5608: ; 0x021F5608 bl FUN_02017FB4 mov r0, #4 mov r1, #0x20 - bl FUN_02016998 + bl AllocFromHeap mov r1, #0x11 mov r2, #0x20 add r4, r0, #0 @@ -62057,7 +62057,7 @@ MOD05_021F5608: ; 0x021F5608 mov r3, #0x20 bl FUN_02017E14 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap ldr r2, _021F565C ; =0x00006001 add r0, r5, #0 mov r1, #2 @@ -62272,7 +62272,7 @@ MOD05_021F57D0: ; 0x021F57D0 str r0, [r4] _021F57E2: add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} .balign 4, 0 @@ -62504,7 +62504,7 @@ _021F59B2: sub r5, r6, r5 add r0, r7, #0 add r1, r5, #0 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 bne _021F59C4 bl ErrorHandling @@ -62552,7 +62552,7 @@ _021F5A06: _021F5A0E: ldr r4, [r6, #4] add r0, r6, #0 - bl FUN_02016A18 + bl FreeToHeap add r0, r4, #0 bl FUN_020168D0 pop {r4, r5, r6, pc} @@ -62695,10 +62695,10 @@ MOD05_021F5B14: ; 0x021F5B14 cmp r2, #0 ldr r0, [r0, #4] bne _021F5B22 - bl FUN_02016998 + bl AllocFromHeap b _021F5B26 _021F5B22: - bl FUN_020169D8 + bl AllocFromHeapAtEnd _021F5B26: add r4, r0, #0 cmp r4, #0 @@ -62710,10 +62710,10 @@ _021F5B30: thumb_func_start MOD05_021F5B34 MOD05_021F5B34: ; 0x021F5B34 - ldr r3, _021F5B38 ; =FUN_02016A18 + ldr r3, _021F5B38 ; =FreeToHeap bx r3 .balign 4, 0 -_021F5B38: .word FUN_02016A18 +_021F5B38: .word FreeToHeap thumb_func_start MOD05_021F5B3C MOD05_021F5B3C: ; 0x021F5B3C @@ -62875,7 +62875,7 @@ MOD05_021F5C44: ; 0x021F5C44 add r0, r1, #0 mov r1, #0x18 add r5, r2, #0 - bl FUN_020169D8 + bl AllocFromHeapAtEnd add r4, r0, #0 add r2, r4, #0 mov r1, #0x18 @@ -62960,7 +62960,7 @@ _021F5CBA: add r1, r6, #0 bl FUN_02046A20 add r0, r5, #0 - bl FUN_02016A18 + bl FreeToHeap mov r0, #0 pop {r3, r4, r5, r6, r7, pc} _021F5D10: @@ -62971,7 +62971,7 @@ _021F5D18: ldr r0, [r4, #0x34] bl FUN_020587B0 add r0, r5, #0 - bl FUN_02016A18 + bl FreeToHeap mov r0, #1 pop {r3, r4, r5, r6, r7, pc} _021F5D28: @@ -63018,7 +63018,7 @@ MOD05_021F5D68: ; 0x021F5D68 push {r4, lr} add r4, r0, #0 bl FUN_0201B6C8 - bl FUN_02016A18 + bl FreeToHeap add r0, r4, #0 bl FUN_0200CAB4 pop {r4, pc} @@ -63446,7 +63446,7 @@ MOD05_021F6074: ; 0x021F6074 add r5, r0, #0 mov r0, #4 add r1, r5, #0 - bl FUN_020169D8 + bl AllocFromHeapAtEnd add r4, r0, #0 bne _021F6088 bl ErrorHandling @@ -63650,7 +63650,7 @@ MOD05_021F61F4: ; 0x021F61F4 add r5, r0, #0 add r0, r6, #0 mov r1, #0x34 - bl FUN_020169D8 + bl AllocFromHeapAtEnd add r4, r0, #0 mov r1, #0 mov r2, #0x34 @@ -63686,7 +63686,7 @@ MOD05_021F6240: ; 0x021F6240 push {r4, lr} add r4, r0, #0 bl FUN_0201B6C8 - bl FUN_02016A18 + bl FreeToHeap add r0, r4, #0 bl FUN_0200CAB4 pop {r4, pc} @@ -63881,7 +63881,7 @@ _021F638E: ; jump table _021F639A: mov r0, #0xb mov r1, #8 - bl FUN_020169D8 + bl AllocFromHeapAtEnd str r0, [r6, #4] ldr r0, [r4] add r0, r0, #1 @@ -63892,7 +63892,7 @@ _021F63AC: add r6, r0, #0 mov r0, #0xb add r1, r6, #0 - bl FUN_020169D8 + bl AllocFromHeapAtEnd str r0, [r5, #4] mov r1, #0 add r2, r6, #0 @@ -63937,9 +63937,9 @@ _021F6402: b _021F6424 _021F6414: add r0, r5, #0 - bl FUN_02016A18 + bl FreeToHeap add r0, r6, #0 - bl FUN_02016A18 + bl FreeToHeap mov r0, #1 pop {r3, r4, r5, r6, r7, pc} _021F6424: diff --git a/arm9/modules/06/asm/module_06.s b/arm9/modules/06/asm/module_06.s index 58862ec1..9540ce0b 100644 --- a/arm9/modules/06/asm/module_06.s +++ b/arm9/modules/06/asm/module_06.s @@ -352,7 +352,7 @@ _02239930: ldr r0, [r4] bl MOD06_0223A44C add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap mov r0, #1 pop {r4, pc} _02239940: @@ -368,7 +368,7 @@ MOD06_02239944: ; 0x02239944 add r4, r0, #0 mov r0, #4 mov r1, #0x10 - bl FUN_02016998 + bl AllocFromHeap add r5, r0, #0 add r2, r5, #0 mov r1, #0x10 @@ -528,7 +528,7 @@ _02239A94: ldr r0, [r4] bl MOD06_0223A44C add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap mov r0, #1 pop {r4, pc} _02239AA4: @@ -546,7 +546,7 @@ MOD06_02239AAC: ; 0x02239AAC add r4, r0, #0 mov r0, #4 mov r1, #0x10 - bl FUN_02016998 + bl AllocFromHeap add r5, r0, #0 add r2, r5, #0 mov r1, #0x10 @@ -1809,7 +1809,7 @@ MOD06_0223A428: ; 0x0223A428 push {r3, r4, r5, lr} mov r1, #0x4c add r5, r0, #0 - bl FUN_02016998 + bl AllocFromHeap mov r1, #0 mov r2, #0x4c add r4, r0, #0 @@ -1829,7 +1829,7 @@ MOD06_0223A44C: ; 0x0223A44C ldr r0, [r4] bl FUN_0201EB70 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} .align 2, 0 @@ -2097,7 +2097,7 @@ MOD06_0223A640: ; 0x0223A640 MOD06_0223A644: ; 0x0223A644 push {r4, lr} mov r1, #0x24 - bl FUN_02016998 + bl AllocFromHeap mov r1, #0 mov r2, #0x24 add r4, r0, #0 @@ -2120,7 +2120,7 @@ MOD06_0223A660: ; 0x0223A660 str r0, [r4, #0x20] _0223A672: add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} .align 2, 0 @@ -2248,7 +2248,7 @@ MOD06_0223A75C: ; 0x0223A75C add r5, r0, #0 mov r0, #4 lsl r1, r1, #6 - bl FUN_02016998 + bl AllocFromHeap mov r2, #5 mov r1, #0 lsl r2, r2, #6 @@ -2279,7 +2279,7 @@ MOD06_0223A790: ; 0x0223A790 bl ErrorHandling _0223A7A2: add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} .align 2, 0 @@ -2926,7 +2926,7 @@ MOD06_0223AC78: ; 0x0223AC78 mov r1, #5 lsl r1, r1, #6 add r5, r0, #0 - bl FUN_02016998 + bl AllocFromHeap mov r2, #5 add r4, r0, #0 mov r1, #0 @@ -2964,7 +2964,7 @@ MOD06_0223ACC0: ; 0x0223ACC0 add r0, #0x34 bl MOD06_0223AFD0 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} thumb_func_start MOD06_0223ACD8 @@ -3609,7 +3609,7 @@ MOD06_0223B19C: ; 0x0223B19C mov r1, #0x1e lsl r1, r1, #4 add r4, r0, #0 - bl FUN_02016998 + bl AllocFromHeap mov r2, #0x1e add r6, r0, #0 mov r1, #0 @@ -3655,7 +3655,7 @@ _0223B1EE: add r0, r6, #0 bl MOD06_0223A3A4 add r0, r6, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, r5, r6, pc} .align 2, 0 @@ -3989,7 +3989,7 @@ MOD06_0223B458: ; 0x0223B458 add r4, r1, #0 mov r1, #0xd4 add r7, r0, #0 - bl FUN_02016998 + bl AllocFromHeap add r6, r0, #0 mov r1, #0 mov r2, #0xd4 @@ -4071,7 +4071,7 @@ _0223B4FC: cmp r4, #3 blt _0223B4FC add r0, r7, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r3, r4, r5, r6, r7, pc} thumb_func_start MOD06_0223B514 @@ -4355,7 +4355,7 @@ MOD06_0223B71C: ; 0x0223B71C push {r4, lr} add r4, r1, #0 mov r1, #0x18 - bl FUN_02016998 + bl AllocFromHeap add r3, r0, #0 mov r2, #0x18 mov r1, #0 @@ -4371,10 +4371,10 @@ _0223B72C: thumb_func_start MOD06_0223B73C MOD06_0223B73C: ; 0x0223B73C - ldr r3, _0223B740 ; =FUN_02016A18 + ldr r3, _0223B740 ; =FreeToHeap bx r3 .align 2, 0 -_0223B740: .word FUN_02016A18 +_0223B740: .word FreeToHeap thumb_func_start MOD06_0223B744 MOD06_0223B744: ; 0x0223B744 @@ -4510,7 +4510,7 @@ MOD06_0223B828: ; 0x0223B828 add r4, r1, #0 mov r1, #0xec add r7, r0, #0 - bl FUN_02016998 + bl AllocFromHeap add r6, r0, #0 mov r1, #0 mov r2, #0xec @@ -4596,7 +4596,7 @@ _0223B8D4: cmp r4, #4 blt _0223B8D4 add r0, r7, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r3, r4, r5, r6, r7, pc} thumb_func_start MOD06_0223B8EC @@ -4742,7 +4742,7 @@ _0223B9E8: ldr r1, [r0, r1] str r1, [r7] _0223B9F8: - bl FUN_02016A18 + bl FreeToHeap _0223B9FC: pop {r3, r4, r5, r6, r7, pc} nop @@ -6669,7 +6669,7 @@ _0223C92E: bl ErrorHandling _0223C95A: ldr r0, [sp, #0x1c] - bl FUN_02016A18 + bl FreeToHeap add sp, #0x28 pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -6763,7 +6763,7 @@ _0223C9E4: bl ErrorHandling _0223CA1E: add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap add sp, #0x14 pop {r4, r5, r6, r7, pc} _0223CA28: @@ -6790,7 +6790,7 @@ _0223CA28: bl ErrorHandling _0223CA5C: add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap add sp, #0x14 pop {r4, r5, r6, r7, pc} nop @@ -7643,7 +7643,7 @@ MOD06_0223D044: ; 0x0223D044 bl ErrorHandling _0223D0D8: add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap add sp, #0x18 pop {r3, r4, r5, r6, r7} pop {r3} @@ -7998,7 +7998,7 @@ _0223D374: ldrb r1, [r5, r1] mov r0, #0xb lsl r1, r1, #1 - bl FUN_02016998 + bl AllocFromHeap mov r1, #0x8a lsl r1, r1, #2 str r0, [r5, r1] @@ -8032,7 +8032,7 @@ MOD06_0223D3B4: ; 0x0223D3B4 mov r1, #0x93 mov r0, #0xb lsl r1, r1, #2 - bl FUN_02016998 + bl AllocFromHeap mov r2, #0x93 mov r1, #0 lsl r2, r2, #2 @@ -8685,9 +8685,9 @@ _0223D8F4: mov r0, #0x8a lsl r0, r0, #2 ldr r0, [r4, r0] - bl FUN_02016A18 + bl FreeToHeap add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap mov r0, #1 pop {r3, r4, r5, pc} _0223D908: @@ -11351,7 +11351,7 @@ MOD06_0223EF18: ; 0x0223EF18 _0223EF28: mov r0, #4 mov r1, #0x9c - bl FUN_02016998 + bl AllocFromHeap ldr r1, _0223EFF4 ; =0x02252420 mov r2, #0x9c str r0, [r1] @@ -11461,7 +11461,7 @@ _0223F004: ldr r0, _0223F08C ; =0x02252420 ldr r0, [r0] ldr r0, [r0, #0x7c] - bl FUN_02016A18 + bl FreeToHeap ldr r0, _0223F08C ; =0x02252420 ldr r0, [r0] ldr r0, [r0, #0x50] @@ -11509,7 +11509,7 @@ _0223F060: _0223F07A: ldr r0, _0223F08C ; =0x02252420 ldr r0, [r0] - bl FUN_02016A18 + bl FreeToHeap ldr r0, _0223F08C ; =0x02252420 mov r1, #0 str r1, [r0] @@ -15500,7 +15500,7 @@ _0224113A: ldr r0, [r4, #0x6c] bl FUN_0206BB74 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap mov r0, #1 pop {r4, pc} _0224117A: @@ -15518,7 +15518,7 @@ MOD06_02241188: ; 0x02241188 add r5, r0, #0 mov r0, #0xb mov r1, #0x84 - bl FUN_020169D8 + bl AllocFromHeapAtEnd mov r1, #0 mov r2, #0x84 add r4, r0, #0 @@ -15641,7 +15641,7 @@ MOD06_02241230: ; 0x02241230 add r5, r0, #0 mov r0, #0xb mov r1, #4 - bl FUN_020169D8 + bl AllocFromHeapAtEnd add r2, r0, #0 mov r0, #0 str r0, [r2] @@ -15826,7 +15826,7 @@ _022413F8: str r0, [r5] b _0224141E _02241414: - bl FUN_02016A18 + bl FreeToHeap add sp, #0x10 mov r0, #1 pop {r3, r4, r5, r6, r7, pc} @@ -15917,7 +15917,7 @@ _022414C6: cmp r1, r0 bne _022414DA add r0, r5, #0 - bl FUN_02016A18 + bl FreeToHeap add sp, #0x28 mov r0, #1 pop {r3, r4, r5, r6, r7, pc} @@ -15998,7 +15998,7 @@ _02241558: str r0, [r5] b _02241580 _02241576: - bl FUN_02016A18 + bl FreeToHeap add sp, #0x28 mov r0, #1 pop {r3, r4, r5, r6, r7, pc} @@ -16107,7 +16107,7 @@ _0224163E: str r0, [r5] b _02241666 _0224165C: - bl FUN_02016A18 + bl FreeToHeap add sp, #0x10 mov r0, #1 pop {r3, r4, r5, r6, r7, pc} @@ -16429,7 +16429,7 @@ MOD06_02241914: ; 0x02241914 add r5, r0, #0 mov r0, #0xb mov r1, #4 - bl FUN_020169D8 + bl AllocFromHeapAtEnd add r6, r0, #0 mov r0, #0 str r0, [r6] @@ -16551,7 +16551,7 @@ _02241A02: str r0, [r4] b _02241A32 _02241A28: - bl FUN_02016A18 + bl FreeToHeap add sp, #0xc mov r0, #1 pop {r3, r4, r5, r6, pc} @@ -16647,7 +16647,7 @@ _02241ACE: str r0, [r4] b _02241AFC _02241AF2: - bl FUN_02016A18 + bl FreeToHeap add sp, #0xc mov r0, #1 pop {r3, r4, r5, r6, pc} @@ -16762,7 +16762,7 @@ MOD06_02241BB0: ; 0x02241BB0 str r0, [sp, #4] mov r0, #0xb mov r1, #4 - bl FUN_020169D8 + bl AllocFromHeapAtEnd mov r1, #0 str r1, [r0] str r0, [sp] @@ -17199,7 +17199,7 @@ _02241F48: str r0, [r4] b _02241F68 _02241F5E: - bl FUN_02016A18 + bl FreeToHeap add sp, #0xc mov r0, #1 pop {r4, r5, r6, r7, pc} @@ -17359,7 +17359,7 @@ _02242092: b _022420BC _022420B0: add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap add sp, #0x1c mov r0, #1 pop {r4, r5, r6, r7, pc} @@ -17522,7 +17522,7 @@ _022421E4: b _02242214 _02242208: add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap add sp, #0x1c mov r0, #1 pop {r4, r5, r6, r7, pc} @@ -17546,7 +17546,7 @@ MOD06_02242224: ; 0x02242224 str r0, [sp, #0x10] mov r0, #4 mov r1, #0xf4 - bl FUN_02016998 + bl AllocFromHeap ldr r1, [r6, #4] add r2, sp, #0x50 str r0, [r1, #0x24] @@ -17800,7 +17800,7 @@ MOD06_02242444: ; 0x02242444 add r4, r0, #0 ldr r0, [r4, #4] ldr r0, [r0, #0x24] - bl FUN_02016A18 + bl FreeToHeap ldr r0, [r4, #4] mov r1, #0 str r1, [r0, #0x24] @@ -17931,7 +17931,7 @@ MOD06_0224252C: ; 0x0224252C add r6, r0, #0 mov r0, #0xb mov r1, #4 - bl FUN_020169D8 + bl AllocFromHeapAtEnd mov r1, #0 str r1, [r0] strb r4, [r5, #0x1c] @@ -18002,7 +18002,7 @@ MOD06_022425C8: ; 0x022425C8 str r0, [sp, #0x10] mov r0, #4 mov r1, #0x58 - bl FUN_02016998 + bl AllocFromHeap ldr r1, [sp, #8] ldr r5, _0224268C ; =0x0224F8B8 ldr r1, [r1, #4] @@ -18098,7 +18098,7 @@ MOD06_02242698: ; 0x02242698 add r4, r0, #0 ldr r0, [r4, #4] ldr r0, [r0, #0x24] - bl FUN_02016A18 + bl FreeToHeap ldr r0, [r4, #4] mov r1, #0 str r1, [r0, #0x24] @@ -18303,7 +18303,7 @@ _02242808: b _0224283A _0224282E: add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap add sp, #0xc mov r0, #1 pop {r4, r5, r6, r7, pc} @@ -18414,7 +18414,7 @@ MOD06_022428D8: ; 0x022428D8 str r0, [sp, #0xc] mov r0, #4 mov r1, #0x1c - bl FUN_02016998 + bl AllocFromHeap ldr r1, [r5, #4] str r0, [r1, #0x24] ldr r0, [r5, #4] @@ -18514,7 +18514,7 @@ MOD06_022429B0: ; 0x022429B0 add r4, r0, #0 ldr r0, [r4, #4] ldr r0, [r0, #0x24] - bl FUN_02016A18 + bl FreeToHeap ldr r0, [r4, #4] mov r1, #0 str r1, [r0, #0x24] @@ -18596,7 +18596,7 @@ MOD06_02242A38: ; 0x02242A38 mov r1, #4 ldr r4, [r0, #0x24] mov r0, #0xb - bl FUN_020169D8 + bl AllocFromHeapAtEnd mov r1, #0 str r1, [r0] strh r5, [r4, #0x14] @@ -18791,7 +18791,7 @@ _02242BB8: str r1, [r0] b _02242BD6 _02242BCC: - bl FUN_02016A18 + bl FreeToHeap add sp, #0x10 mov r0, #1 pop {r3, r4, r5, r6, r7, pc} @@ -18817,7 +18817,7 @@ MOD06_02242BE0: ; 0x02242BE0 mov r1, #0x11 mov r0, #4 lsl r1, r1, #4 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 bne _02242C0E bl ErrorHandling @@ -19201,7 +19201,7 @@ _02242EFA: _02242F00: bl MOD06_02243024 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap mov r0, #1 pop {r4, pc} _02242F0E: @@ -19999,7 +19999,7 @@ MOD06_022434D0: ; 0x022434D0 bl FUN_02016828 ldr r1, _02243684 ; =0x000008CC mov r0, #0x3b - bl FUN_02016998 + bl AllocFromHeap ldr r2, _02243684 ; =0x000008CC mov r1, #0 add r4, r0, #0 @@ -20208,7 +20208,7 @@ _022436A6: mov r1, #0 bl MI_CpuFill8 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap add r0, r5, #0 bl FUN_020168D0 _022436BE: @@ -20254,7 +20254,7 @@ MOD06_022436E8: ; 0x022436E8 bne _02243716 _02243706: ldr r0, [sp, #4] - bl FUN_02016A18 + bl FreeToHeap ldr r1, [sp] mov r0, #0 str r0, [r1] @@ -20303,7 +20303,7 @@ _02243726: _0224376A: ldr r0, [sp] ldr r0, [r0] - bl FUN_02016A18 + bl FreeToHeap ldr r0, [sp] mov r1, #0 str r1, [r0] @@ -21658,7 +21658,7 @@ MOD06_02244190: ; 0x02244190 add r4, r1, #0 mov r1, #0xa8 str r2, [sp] - bl FUN_020169D8 + bl AllocFromHeapAtEnd mov r1, #0 mov r2, #0xa8 str r0, [sp, #4] @@ -21690,7 +21690,7 @@ _022441B8: mov r2, #0xa8 bl MI_CpuFill8 ldr r0, [sp, #4] - bl FUN_02016A18 + bl FreeToHeap add sp, #8 pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -22184,7 +22184,7 @@ _022445E8: blt _022445A6 _022445FA: add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap add r0, r7, #0 bl FUN_020480E4 ldr r0, [r5, #4] @@ -22760,7 +22760,7 @@ MOD06_02244A34: ; 0x02244A34 bl MOD06_02244AEC add r4, r0, #0 add r0, r7, #0 - bl FUN_02016A18 + bl FreeToHeap add r0, r4, #0 add sp, #0x18 pop {r3, r4, r5, r6, r7, pc} @@ -22815,7 +22815,7 @@ _02244AB0: cmp r7, #2 blt _02244AB0 ldr r0, [sp, #0x1c] - bl FUN_02016A18 + bl FreeToHeap add sp, #0x24 pop {r4, r5, r6, r7, pc} .align 2, 0 @@ -23200,26 +23200,26 @@ _02244D8A: blt _02244D8A _02244DA4: add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap add sp, #8 pop {r3, r4, r5, r6, r7, pc} .align 2, 0 thumb_func_start MOD06_02244DB0 MOD06_02244DB0: ; 0x02244DB0 - ldr r3, _02244DB8 ; =FUN_020169D8 + ldr r3, _02244DB8 ; =AllocFromHeapAtEnd mov r1, #0x17 lsl r1, r1, #4 bx r3 .align 2, 0 -_02244DB8: .word FUN_020169D8 +_02244DB8: .word AllocFromHeapAtEnd thumb_func_start MOD06_02244DBC MOD06_02244DBC: ; 0x02244DBC - ldr r3, _02244DC0 ; =FUN_02016A18 + ldr r3, _02244DC0 ; =FreeToHeap bx r3 .align 2, 0 -_02244DC0: .word FUN_02016A18 +_02244DC0: .word FreeToHeap thumb_func_start MOD06_02244DC4 MOD06_02244DC4: ; 0x02244DC4 @@ -23423,9 +23423,9 @@ _02244F3E: ldr r0, [r5, #0x38] bl FUN_0201FD58 ldr r0, [r5, #0x20] - bl FUN_02016A18 + bl FreeToHeap ldr r0, [r5, #0x24] - bl FUN_02016A18 + bl FreeToHeap pop {r3, r4, r5, pc} thumb_func_start MOD06_02244F64 @@ -23633,7 +23633,7 @@ MOD06_02245114: ; 0x02245114 push {r3, r4, r5, r6, r7, lr} str r1, [sp] mov r1, #0x34 - bl FUN_020169D8 + bl AllocFromHeapAtEnd add r5, r0, #0 ldr r0, [sp] mov r1, #0xb @@ -23680,7 +23680,7 @@ _02245148: ldr r0, [r0] str r0, [r5, #0x30] add r0, r7, #0 - bl FUN_02016A18 + bl FreeToHeap add r0, r5, #0 pop {r3, r4, r5, r6, r7, pc} nop @@ -23688,10 +23688,10 @@ _0224518C: .word 0x0000071D thumb_func_start MOD06_02245190 MOD06_02245190: ; 0x02245190 - ldr r3, _02245194 ; =FUN_02016A18 + ldr r3, _02245194 ; =FreeToHeap bx r3 .align 2, 0 -_02245194: .word FUN_02016A18 +_02245194: .word FreeToHeap thumb_func_start MOD06_02245198 MOD06_02245198: ; 0x02245198 @@ -23813,7 +23813,7 @@ MOD06_0224525C: ; 0x0224525C add r4, r0, #0 mov r0, #4 mov r1, #0x14 - bl FUN_020169D8 + bl AllocFromHeapAtEnd add r5, r0, #0 add r2, r5, #0 mov r1, #0x14 @@ -24060,7 +24060,7 @@ _0224544C: strb r0, [r4, #5] b _02245468 _0224545E: - bl FUN_02016A18 + bl FreeToHeap add sp, #0x24 mov r0, #1 pop {r4, r5, r6, r7, pc} @@ -24345,7 +24345,7 @@ _02245672: ldr r2, [r0, r2] ldr r1, [sp, #0x18] str r2, [r1] - bl FUN_02016A18 + bl FreeToHeap pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -25001,19 +25001,19 @@ _02245B34: mov r0, #0x51 lsl r0, r0, #2 ldr r0, [r5, r0] - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x52 lsl r0, r0, #2 ldr r0, [r5, r0] - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x53 lsl r0, r0, #2 ldr r0, [r5, r0] - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x15 lsl r0, r0, #4 ldr r0, [r5, r0] - bl FUN_02016A18 + bl FreeToHeap ldr r0, [r5, #8] bl FUN_0201FDB4 ldr r0, [r5, #8] @@ -26502,7 +26502,7 @@ MOD06_022466C0: ; 0x022466C0 add r5, r0, #0 mov r0, #4 lsl r1, r1, #2 - bl FUN_020169D8 + bl AllocFromHeapAtEnd mov r2, #0x87 mov r1, #0 lsl r2, r2, #2 @@ -26514,10 +26514,10 @@ MOD06_022466C0: ; 0x022466C0 thumb_func_start MOD06_022466E0 MOD06_022466E0: ; 0x022466E0 - ldr r3, _022466E4 ; =FUN_02016A18 + ldr r3, _022466E4 ; =FreeToHeap bx r3 .align 2, 0 -_022466E4: .word FUN_02016A18 +_022466E4: .word FreeToHeap thumb_func_start MOD06_022466E8 MOD06_022466E8: ; 0x022466E8 @@ -27555,7 +27555,7 @@ _02246E60: ldr r0, [r6, r0] cmp r0, #0 beq _02246E7E - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x83 mov r1, #0 lsl r0, r0, #2 @@ -27566,7 +27566,7 @@ _02246E7E: ldr r0, [r6, r0] cmp r0, #0 beq _02246E94 - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x21 mov r1, #0 lsl r0, r0, #4 @@ -28433,7 +28433,7 @@ MOD06_02247544: ; 0x02247544 lsl r3, r0, #7 bl FUN_02017FB4 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r3, r4, r5, pc} thumb_func_start MOD06_0224756C @@ -28458,7 +28458,7 @@ MOD06_0224756C: ; 0x0224756C mov r1, #3 bl FUN_02017E14 add r0, r6, #0 - bl FUN_02016A18 + bl FreeToHeap add sp, #4 pop {r3, r4, r5, r6, pc} .align 2, 0 @@ -28508,7 +28508,7 @@ MOD06_022475A4: ; 0x022475A4 mov r1, #3 bl FUN_02017CD0 add r0, r6, #0 - bl FUN_02016A18 + bl FreeToHeap add sp, #0xc pop {r4, r5, r6, r7, pc} @@ -28737,7 +28737,7 @@ MOD06_0224778C: ; 0x0224778C mov r0, #4 lsl r1, r1, #6 add r7, r2, #0 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 bne _022477A8 bl ErrorHandling @@ -30346,7 +30346,7 @@ MOD06_022483EC: ; 0x022483EC push {r4, lr} add r4, r0, #0 bl FUN_0201B6C8 - bl FUN_02016A18 + bl FreeToHeap add r0, r4, #0 bl FUN_0200CAB4 pop {r4, pc} @@ -30629,7 +30629,7 @@ MOD06_02248630: ; 0x02248630 MOD06_02248634: ; 0x02248634 push {r3, r4, r5, lr} add r5, r1, #0 - bl FUN_020169D8 + bl AllocFromHeapAtEnd add r4, r0, #0 bne _02248644 bl ErrorHandling @@ -30912,7 +30912,7 @@ MOD06_0224884C: ; 0x0224884C _0224885C: add r0, r5, #0 mov r1, #0x14 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 add r2, r4, #0 mov r1, #0x14 @@ -30963,13 +30963,13 @@ MOD06_022488CC: ; 0x022488CC push {r4, lr} add r4, r0, #0 ldr r0, [r4] - bl FUN_02016A18 + bl FreeToHeap ldr r0, [r4, #4] - bl FUN_02016A18 + bl FreeToHeap ldr r0, [r4, #8] - bl FUN_02016A18 + bl FreeToHeap add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} .align 2, 0 @@ -31313,7 +31313,7 @@ MOD06_02248B70: ; 0x02248B70 add r5, r1, #0 mov r0, #4 mov r1, #0x18 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 bl MOD06_02248B0C add r0, r5, #0 @@ -31349,7 +31349,7 @@ MOD06_02248BC0: ; 0x02248BC0 add r5, r0, #0 mov r0, #4 mov r1, #0x18 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 bl MOD06_02248B0C add r0, r5, #0 @@ -31385,7 +31385,7 @@ MOD06_02248C18: ; 0x02248C18 add r6, r0, #0 mov r0, #4 mov r1, #0x18 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 bl MOD06_02248B0C add r0, r6, #0 @@ -31450,10 +31450,10 @@ _02248CA4: thumb_func_start MOD06_02248CB8 MOD06_02248CB8: ; 0x02248CB8 - ldr r3, _02248CBC ; =FUN_02016A18 + ldr r3, _02248CBC ; =FreeToHeap bx r3 .align 2, 0 -_02248CBC: .word FUN_02016A18 +_02248CBC: .word FreeToHeap thumb_func_start MOD06_02248CC0 MOD06_02248CC0: ; 0x02248CC0 @@ -38470,7 +38470,7 @@ MOD06_0224C27C: ; 0x0224C27C beq _0224C2E8 mov r0, #4 mov r1, #0x18 - bl FUN_020169D8 + bl AllocFromHeapAtEnd add r4, r0, #0 strb r6, [r4, #0xc] mov r0, #0 @@ -38758,7 +38758,7 @@ _0224C4EE: strb r0, [r4, #0xf] b _0224C500 _0224C4F6: - bl FUN_02016A18 + bl FreeToHeap add sp, #0x38 mov r0, #1 pop {r3, r4, r5, r6, r7, pc} @@ -38788,7 +38788,7 @@ MOD06_0224C520: ; 0x0224C520 beq _0224C552 mov r0, #4 add r1, r0, #0 - bl FUN_020169D8 + bl AllocFromHeapAtEnd add r2, r0, #0 strb r6, [r2] strb r4, [r2, #1] @@ -38924,7 +38924,7 @@ _0224C648: strb r0, [r4, #2] b _0224C664 _0224C65A: - bl FUN_02016A18 + bl FreeToHeap add sp, #0x1c mov r0, #1 pop {r4, r5, r6, r7, pc} @@ -39047,7 +39047,7 @@ _0224C732: cmp r4, #2 bne _0224C74E add r0, r5, #0 - bl FUN_02016A18 + bl FreeToHeap _0224C74E: cmp r4, #1 beq _0224C732 @@ -39274,7 +39274,7 @@ _0224C8FC: add r1, r4, #0 bl MOD06_0224C92C add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap mov r0, #1 pop {r3, r4, r5, r6, r7, pc} _0224C920: @@ -39499,7 +39499,7 @@ _0224CABE: cmp r4, #2 bne _0224CADA add r0, r5, #0 - bl FUN_02016A18 + bl FreeToHeap _0224CADA: cmp r4, #1 beq _0224CABE @@ -39588,7 +39588,7 @@ _0224CB66: cmp r4, #2 bne _0224CB82 add r0, r5, #0 - bl FUN_02016A18 + bl FreeToHeap _0224CB82: cmp r4, #1 beq _0224CB66 @@ -39601,7 +39601,7 @@ _0224CB8C: .word 0x02251E28 MOD06_0224CB90: ; 0x0224CB90 push {r3, r4, r5, lr} add r5, r1, #0 - bl FUN_020169D8 + bl AllocFromHeapAtEnd add r4, r0, #0 bne _0224CBA0 bl ErrorHandling @@ -39668,7 +39668,7 @@ _0224CC02: add r1, r5, #0 bl FUN_0202ABA0 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap add sp, #8 pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -39697,7 +39697,7 @@ _0224CC40: ldrh r1, [r1, #2] lsl r1, r1, #2 ldr r4, [r0, r1] - bl FUN_02016A18 + bl FreeToHeap add r0, r4, #0 add sp, #4 pop {r3, r4, pc} @@ -39856,7 +39856,7 @@ _0224CD7E: blo _0224CD70 _0224CD88: ldr r0, [sp, #0xc] - bl FUN_02016A18 + bl FreeToHeap ldr r0, [sp, #4] add sp, #0x4c pop {r4, r5, r6, r7, pc} @@ -39880,7 +39880,7 @@ MOD06_0224CDA0: ; 0x0224CDA0 bl AllocAtEndAndReadWholeNarcMemberByIdPair ldr r1, [r0] str r1, [r4] - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} thumb_func_start MOD06_0224CDB8 @@ -40711,7 +40711,7 @@ MOD06_0224D3E8: ; 0x0224D3E8 add r5, r0, #0 mov r0, #0xb mov r1, #8 - bl FUN_020169D8 + bl AllocFromHeapAtEnd mov r1, #0 mov r2, #8 add r4, r0, #0 @@ -40762,7 +40762,7 @@ _0224D442: str r0, [r4, #4] b _0224D462 _0224D45A: - bl FUN_02016A18 + bl FreeToHeap mov r0, #1 pop {r3, r4, r5, pc} _0224D462: @@ -40783,7 +40783,7 @@ MOD06_0224D46C: ; 0x0224D46C str r0, [sp, #0x1c] mov r0, #0xb mov r1, #0x18 - bl FUN_02016998 + bl AllocFromHeap mov r1, #0 mov r2, #0x18 add r4, r0, #0 @@ -41035,7 +41035,7 @@ MOD06_0224D6A4: ; 0x0224D6A4 ldr r0, [r4, #0x14] bl FUN_0200AB18 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} .align 2, 0 @@ -41082,7 +41082,7 @@ MOD06_0224D70C: ; 0x0224D70C lsl r1, r1, #2 add r5, r0, #0 add r7, r2, #0 - bl FUN_02016998 + bl AllocFromHeap mov r2, #0xc1 add r4, r0, #0 mov r1, #0 @@ -41134,7 +41134,7 @@ MOD06_0224D76C: ; 0x0224D76C lsl r2, r2, #2 bl memset add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} .align 2, 0 @@ -42869,7 +42869,7 @@ MOD06_0224E554: ; 0x0224E554 beq _0224E5C0 mov r0, #4 mov r1, #0x18 - bl FUN_020169D8 + bl AllocFromHeapAtEnd add r4, r0, #0 strb r6, [r4, #0xc] mov r0, #0 @@ -43098,7 +43098,7 @@ _0224E73A: strb r0, [r4, #0xf] b _0224E74C _0224E742: - bl FUN_02016A18 + bl FreeToHeap add sp, #0x30 mov r0, #1 pop {r4, r5, r6, pc} @@ -44313,7 +44313,7 @@ _0224F038: lsl r6, r6, #4 _0224F054: ldr r0, [r5, r6] - bl FUN_02016A18 + bl FreeToHeap add r4, r4, #1 add r5, r5, #4 cmp r4, #4 @@ -44423,7 +44423,7 @@ _0224F102: mov r1, #1 strh r1, [r0] add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap add r0, r5, #0 bl FUN_0200CAB4 _0224F120: @@ -44440,7 +44440,7 @@ MOD06_0224F12C: ; 0x0224F12C add r0, r3, #0 mov r1, #0x10 add r4, r2, #0 - bl FUN_02016998 + bl AllocFromHeap add r6, r0, #0 add r2, r6, #0 mov r1, #0x10 diff --git a/arm9/modules/07/asm/module_07.s b/arm9/modules/07/asm/module_07.s index b2f1aff0..8cccb236 100644 --- a/arm9/modules/07/asm/module_07.s +++ b/arm9/modules/07/asm/module_07.s @@ -1992,7 +1992,7 @@ MOD07_02212E64: ; 0x02212E64 mov r1, #1 bl FUN_020178A0 ldr r0, [r4, #0xc] - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} thumb_func_start MOD07_02212E90 @@ -3023,7 +3023,7 @@ MOD07_022136B4: ; 0x022136B4 mov r1, #0x12 ldr r0, [r0, #0x24] lsl r1, r1, #0xa - bl FUN_02016998 + bl AllocFromHeap mov r2, #0xb6 lsl r2, r2, #4 str r0, [r4, r2] @@ -3142,7 +3142,7 @@ MOD07_022137DC: ; 0x022137DC mov r0, #0xb6 lsl r0, r0, #4 ldr r0, [r4, r0] - bl FUN_02016A18 + bl FreeToHeap ldr r0, _0221380C ; =0x00000B58 ldr r0, [r4, r0] bl FUN_020223BC @@ -3280,7 +3280,7 @@ MOD07_022138F8: ; 0x022138F8 mov r1, #1 bl FUN_020178A0 ldr r0, [r4, #0xc] - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} thumb_func_start MOD07_02213924 @@ -3336,7 +3336,7 @@ MOD07_02213924: ; 0x02213924 mov r2, #0x60 bl memcpy add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap ldr r0, [r5] mov r2, #0xa9 lsl r2, r2, #2 @@ -5053,7 +5053,7 @@ MOD07_02214720: ; 0x02214720 str r0, [sp, #0x10] ldr r0, [r4, #0x24] mov r1, #0x10 - bl FUN_02016998 + bl AllocFromHeap add r5, r0, #0 add r0, r7, #0 bl FUN_020313CC @@ -5070,7 +5070,7 @@ MOD07_02214720: ; 0x02214720 bl FUN_020294B4 add r6, r0, #0 add r0, r5, #0 - bl FUN_02016A18 + bl FreeToHeap b _0221493A _0221479C: bl FUN_02033534 @@ -5105,7 +5105,7 @@ _022147BC: str r0, [sp, #0x14] ldr r0, [r4, #0x24] mov r1, #0x10 - bl FUN_02016998 + bl AllocFromHeap add r5, r0, #0 add r0, r7, #0 bl FUN_020313CC @@ -5122,7 +5122,7 @@ _022147BC: bl FUN_0202930C add r6, r0, #0 add r0, r5, #0 - bl FUN_02016A18 + bl FreeToHeap b _0221493A _02214808: mov r0, #1 @@ -5138,7 +5138,7 @@ _02214808: str r0, [sp, #0x18] ldr r0, [r4, #0x24] mov r1, #0x10 - bl FUN_02016998 + bl AllocFromHeap add r5, r0, #0 add r0, r7, #0 bl FUN_020313CC @@ -5155,7 +5155,7 @@ _02214808: bl FUN_0202934C add r6, r0, #0 add r0, r5, #0 - bl FUN_02016A18 + bl FreeToHeap b _0221493A _02214854: mov r0, #1 @@ -5171,7 +5171,7 @@ _02214854: str r0, [sp, #0x1c] ldr r0, [r4, #0x24] mov r1, #0x10 - bl FUN_02016998 + bl AllocFromHeap add r5, r0, #0 add r0, r7, #0 bl FUN_020313CC @@ -5188,16 +5188,16 @@ _02214854: bl FUN_020293EC add r6, r0, #0 add r0, r5, #0 - bl FUN_02016A18 + bl FreeToHeap b _0221493A _022148A0: ldr r0, [r4, #0x24] mov r1, #0x10 - bl FUN_02016998 + bl AllocFromHeap add r5, r0, #0 ldr r0, [r4, #0x24] mov r1, #0x10 - bl FUN_02016998 + bl AllocFromHeap add r7, r0, #0 bl MOD07_02212BD4 cmp r0, #1 @@ -5250,9 +5250,9 @@ _02214914: bl FUN_0202938C add r6, r0, #0 add r0, r5, #0 - bl FUN_02016A18 + bl FreeToHeap add r0, r7, #0 - bl FUN_02016A18 + bl FreeToHeap b _0221493A _02214936: add sp, #0x20 diff --git a/arm9/modules/08/asm/module_08.s b/arm9/modules/08/asm/module_08.s index 51a20b39..9a66c27d 100644 --- a/arm9/modules/08/asm/module_08.s +++ b/arm9/modules/08/asm/module_08.s @@ -157,7 +157,7 @@ MOD08_02211F5C: ; 0x02211F5C mov r1, #0x69
lsl r1, r1, #2
add r5, r0, #0
- bl FUN_02016998
+ bl AllocFromHeap
add r4, r0, #0
bne _02211F78
cmp r4, #0
@@ -177,7 +177,7 @@ _02211F78: str r0, [r4, #8]
ldr r0, [r4]
lsl r1, r1, #2
- bl FUN_02016998
+ bl AllocFromHeap
add r1, r4, #0
add r1, #0xc0
str r0, [r1]
@@ -276,9 +276,9 @@ _02212034: add r0, r4, #0
add r0, #0xc0
ldr r0, [r0]
- bl FUN_02016A18
+ bl FreeToHeap
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
mov r0, #1
pop {r4, pc}
@@ -742,7 +742,7 @@ _022123BE: mov r0, #0
pop {r3, pc}
_022123C2:
- bl FUN_02016A18
+ bl FreeToHeap
mov r0, #1
pop {r3, pc}
.align 2, 0
@@ -982,7 +982,7 @@ MOD08_0221252C: ; 0x0221252C add r5, r0, #0
ldr r0, [r5]
mov r1, #0x3c
- bl FUN_02016998
+ bl AllocFromHeap
add r4, r0, #0
bne _02212544
bl ErrorHandling
@@ -1040,7 +1040,7 @@ MOD08_02212574: ; 0x02212574 strh r1, [r0]
_022125A2:
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
add r0, r5, #0
bl FUN_0200CAB4
_022125AE:
@@ -3078,7 +3078,7 @@ MOD08_02213454: ; 0x02213454 mov r0, #0x5e
lsl r0, r0, #2
ldr r0, [r4, r0]
- bl FUN_02016A18
+ bl FreeToHeap
mov r0, #0x5e
mov r1, #0
lsl r0, r0, #2
@@ -3095,7 +3095,7 @@ _02213480: ldr r0, [r0, #0xc]
bl FUN_0200CAB4
ldr r0, [r4, r5]
- bl FUN_02016A18
+ bl FreeToHeap
mov r0, #0
str r0, [r4, r5]
_0221349E:
@@ -3203,7 +3203,7 @@ _02213500: bne _022135AC
ldr r0, [r5]
mov r1, #0x10
- bl FUN_02016998
+ bl AllocFromHeap
mov r1, #0x5e
lsl r1, r1, #2
str r0, [r5, r1]
@@ -3681,7 +3681,7 @@ _0221393A: add r6, r4, r0
ldr r0, [r4]
mov r1, #0x10
- bl FUN_02016998
+ bl AllocFromHeap
str r0, [r6, r5]
ldr r0, [r6, r5]
ldr r1, [sp, #0x1c]
@@ -4268,7 +4268,7 @@ MOD08_02213DA8: ; 0x02213DA8 add r5, r0, #0
ldr r0, [r5]
mov r1, #0x4c
- bl FUN_02016998
+ bl AllocFromHeap
add r4, r0, #0
bne _02213DC0
bl ErrorHandling
@@ -5182,7 +5182,7 @@ MOD08_022144C0: ; 0x022144C0 cmp r0, #1
bne _022144DA
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
add r0, r5, #0
bl FUN_0200CAB4
pop {r3, r4, r5, pc}
@@ -5262,7 +5262,7 @@ MOD08_0221454C: ; 0x0221454C ldr r0, [r5, #0x48]
mov r1, #0x20
ldr r0, [r0]
- bl FUN_02016998
+ bl AllocFromHeap
add r4, r0, #0
ldr r0, [r5, #0x48]
mov r2, #6
@@ -5348,11 +5348,11 @@ MOD08_022145F8: ; 0x022145F8 str r0, [sp]
ldr r0, [r4]
mov r1, #0x20
- bl FUN_02016998
+ bl AllocFromHeap
add r6, r0, #0
ldr r0, [r4]
mov r1, #0xc4
- bl FUN_02016998
+ bl AllocFromHeap
str r0, [r6, #0x1c]
mov r0, #6
lsl r0, r0, #6
@@ -5470,9 +5470,9 @@ MOD08_022146E4: ; 0x022146E4 ldr r0, [r4]
bl MOD08_02218870
ldr r0, [r5, #0x1c]
- bl FUN_02016A18
+ bl FreeToHeap
add r0, r5, #0
- bl FUN_02016A18
+ bl FreeToHeap
add r0, r6, #0
bl FUN_0200CAB4
add sp, #8
@@ -5727,7 +5727,7 @@ MOD08_022148E0: ; 0x022148E0 lsl r0, r0, #2
strb r2, [r1, r0]
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
add r0, r5, #0
bl FUN_0200CAB4
_0221490A:
@@ -7628,7 +7628,7 @@ MOD08_022156C0: ; 0x022156C0 stmia r2!, {r0, r1}
add r0, r5, #0
mov r1, #0x58
- bl FUN_02016998
+ bl AllocFromHeap
add r4, r0, #0
str r5, [r4]
str r6, [r4, #4]
@@ -7925,7 +7925,7 @@ _0221593C: cmp r6, #4
blt _02215920
add r0, r5, #0
- bl FUN_02016A18
+ bl FreeToHeap
pop {r4, r5, r6, pc}
thumb_func_start MOD08_0221594C
@@ -7955,7 +7955,7 @@ _02215976: cmp r4, #4
blt _02215956
add r0, r6, #0
- bl FUN_02016A18
+ bl FreeToHeap
pop {r3, r4, r5, r6, r7, pc}
.align 2, 0
@@ -7979,7 +7979,7 @@ MOD08_0221599C: ; 0x0221599C mov r1, #0x12
lsl r1, r1, #0xa
add r4, r0, #0
- bl FUN_02016998
+ bl AllocFromHeap
add r2, r0, #0
mov r0, #1
str r0, [sp]
@@ -8013,7 +8013,7 @@ MOD08_022159E4: ; 0x022159E4 mov r1, #0x42
lsl r1, r1, #8
add r4, r0, #0
- bl FUN_02016998
+ bl AllocFromHeap
add r2, r0, #0
mov r0, #1
str r0, [sp]
@@ -8049,7 +8049,7 @@ MOD08_02215A2C: ; 0x02215A2C add r0, r5, #0
bl FUN_02012DE4
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
pop {r3, r4, r5, pc}
thumb_func_start MOD08_02215A44
@@ -11152,7 +11152,7 @@ MOD08_022171CC: ; 0x022171CC add r5, r0, #0
bl MOD08_02212014
mov r1, #0x38
- bl FUN_02016998
+ bl AllocFromHeap
add r4, r0, #0
str r5, [r4]
add r0, r5, #0
@@ -11222,7 +11222,7 @@ _0221726C: add r1, r4, #0
bl MOD08_022164C8
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
pop {r4, r5, r6, pc}
thumb_func_start MOD08_0221727C
@@ -14192,7 +14192,7 @@ MOD08_022187F4: ; 0x022187F4 add r5, r0, #0
ldr r1, _02218864 ; =0x00000624
add r0, r7, #0
- bl FUN_02016998
+ bl AllocFromHeap
ldr r2, _02218864 ; =0x00000624
mov r1, #0
add r4, r0, #0
@@ -14255,7 +14255,7 @@ _0221887A: bl FUN_02012974
_0221888A:
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
pop {r4, pc}
.align 2, 0
@@ -14312,7 +14312,7 @@ MOD08_022188DC: ; 0x022188DC mov r1, #0x20
str r2, [sp, #0x18]
add r5, r3, #0
- bl FUN_02016998
+ bl AllocFromHeap
add r4, r0, #0
bne _022188F8
bl ErrorHandling
@@ -14369,7 +14369,7 @@ _02218956: bl FUN_02012B00
_02218966:
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
pop {r4, pc}
.align 2, 0
@@ -14622,7 +14622,7 @@ _02218B12: ldr r0, [r4, #4]
bl FUN_0200CAB4
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
pop {r4, pc}
thumb_func_start MOD08_02218B20
@@ -14633,7 +14633,7 @@ MOD08_02218B20: ; 0x02218B20 mov r1, #0x1c
add r6, r2, #0
add r7, r3, #0
- bl FUN_02016998
+ bl AllocFromHeap
add r4, r0, #0
bne _02218B38
bl ErrorHandling
@@ -14832,7 +14832,7 @@ _02218C8C: add r1, r2, #0
bl MOD08_02212438
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
pop {r4, pc}
thumb_func_start MOD08_02218C9C
@@ -14841,7 +14841,7 @@ MOD08_02218C9C: ; 0x02218C9C add r4, r0, #0
mov r0, #5
mov r1, #8
- bl FUN_02016998
+ bl AllocFromHeap
add r2, r0, #0
mov r0, #0
strb r0, [r2]
@@ -14875,7 +14875,7 @@ _02218CDC: add r1, r2, #0
bl MOD08_02212448
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
pop {r4, pc}
thumb_func_start MOD08_02218CEC
@@ -14884,7 +14884,7 @@ MOD08_02218CEC: ; 0x02218CEC add r4, r0, #0
mov r0, #5
mov r1, #8
- bl FUN_02016998
+ bl AllocFromHeap
add r2, r0, #0
mov r0, #0
strb r0, [r2]
@@ -14915,7 +14915,7 @@ _02218D24: _02218D2A:
bl FUN_0200CAB4
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
pop {r4, pc}
.align 2, 0
@@ -14925,7 +14925,7 @@ MOD08_02218D38: ; 0x02218D38 add r4, r0, #0
mov r0, #5
mov r1, #8
- bl FUN_02016998
+ bl AllocFromHeap
add r1, r0, #0
mov r0, #0
strb r0, [r1]
@@ -14983,7 +14983,7 @@ _02218DB4: ldr r4, [r5, #4]
bl FUN_0200C3DC
add r0, r5, #0
- bl FUN_02016A18
+ bl FreeToHeap
add r0, r4, #0
add r1, r6, #0
bl MOD08_02212438
@@ -15000,7 +15000,7 @@ MOD08_02218DCC: ; 0x02218DCC lsl r1, r1, #2
add r7, r2, #0
add r5, r3, #0
- bl FUN_02016998
+ bl AllocFromHeap
add r4, r0, #0
bne _02218DEA
bl ErrorHandling
@@ -15191,7 +15191,7 @@ _02218F4E: add r1, r2, #0
bl MOD08_02212438
add r0, r5, #0
- bl FUN_02016A18
+ bl FreeToHeap
_02218F5C:
pop {r3, r4, r5, r6, r7, pc}
.align 2, 0
@@ -15382,7 +15382,7 @@ _022190B2: add r1, r5, #0
bl MOD08_02212438
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
pop {r3, r4, r5, pc}
_022190CA:
mov r1, #0x10
@@ -15783,7 +15783,7 @@ _022193DA: add r1, r5, #0
bl MOD08_02212438
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
pop {r3, r4, r5, pc}
_022193F2:
mov r1, #0x10
@@ -16119,7 +16119,7 @@ _02219688: add r1, r5, #0
bl MOD08_02212438
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
pop {r3, r4, r5, pc}
.align 2, 0
@@ -16129,7 +16129,7 @@ MOD08_022196B8: ; 0x022196B8 add r5, r0, #0
bl MOD08_02212014
mov r1, #0x2c
- bl FUN_02016998
+ bl AllocFromHeap
add r4, r0, #0
mov r0, #0
strb r0, [r4]
@@ -16257,7 +16257,7 @@ MOD08_02219794: ; 0x02219794 add r1, r5, #0
bl MOD08_02212438
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
_022197E0:
pop {r3, r4, r5, pc}
.align 2, 0
@@ -16268,7 +16268,7 @@ MOD08_022197E4: ; 0x022197E4 add r5, r0, #0
bl MOD08_02212014
mov r1, #0x30
- bl FUN_02016998
+ bl AllocFromHeap
add r4, r0, #0
add r0, r5, #0
mov r1, #0
@@ -16545,7 +16545,7 @@ _02219A0C: add r1, r5, #0
bl MOD08_02212438
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
pop {r3, r4, r5, pc}
_02219A22:
ldr r0, [r4, #8]
@@ -16623,7 +16623,7 @@ MOD08_02219AB8: ; 0x02219AB8 cmp r0, #0
bne _02219AD6
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
ldr r0, [r4]
add r1, r5, #0
bl MOD08_02212438
@@ -16795,7 +16795,7 @@ _02219C14: pop {r3, r4, r5, pc}
_02219C1A:
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
ldr r0, [r4]
add r1, r5, #0
bl MOD08_02212438
@@ -17009,7 +17009,7 @@ _02219DA8: cmp r0, #0
bne _02219DB6
add r0, r6, #0
- bl FUN_02016A18
+ bl FreeToHeap
pop {r3, r4, r5, r6, r7, pc}
_02219DB6:
add r0, r4, #0
@@ -17211,7 +17211,7 @@ _02219F48: b _02219F60
_02219F4E:
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
ldr r0, [r4]
add r1, r5, #0
bl MOD08_02212438
@@ -17514,7 +17514,7 @@ _0221A1C8: ldr r0, [r4, #0xc]
bl MOD08_02218E34
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
ldr r0, [r4]
add r1, r5, #0
bl MOD08_02212438
@@ -17718,7 +17718,7 @@ _0221A346: cmp r0, #0
bne _0221A356
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
add sp, #0x54
pop {r4, r5, r6, r7, pc}
_0221A356:
@@ -17795,7 +17795,7 @@ MOD08_0221A3EC: ; 0x0221A3EC cmp r0, #0
beq _0221A40E
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
ldr r0, [r4]
add r1, r5, #0
bl MOD08_02212438
@@ -17945,7 +17945,7 @@ MOD08_0221A518: ; 0x0221A518 mov r2, #0
bl FUN_02007558
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
ldr r0, [r4, #0x3c]
add r1, r5, #0
bl MOD08_02212438
@@ -18071,7 +18071,7 @@ _0221A632: add r1, r2, #0
bl MOD08_02212438
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
add sp, #8
pop {r4, pc}
@@ -18157,7 +18157,7 @@ _0221A6EA: cmp r6, #0xff
bne _0221A6F6
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
pop {r4, r5, r6, pc}
_0221A6F6:
add r1, r4, #0
@@ -18264,7 +18264,7 @@ _0221A7BC: add r1, r2, #0
bl MOD08_02212438
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
add sp, #8
pop {r4, pc}
.align 2, 0
@@ -18358,7 +18358,7 @@ _0221A886: cmp r6, #0xff
bne _0221A892
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
pop {r3, r4, r5, r6, r7, pc}
_0221A892:
add r0, r5, #0
@@ -18586,7 +18586,7 @@ _0221AA6A: add r1, r2, #0
bl MOD08_02212438
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
_0221AA78:
add sp, #4
pop {r3, r4, r5, r6, pc}
@@ -18598,7 +18598,7 @@ MOD08_0221AA7C: ; 0x0221AA7C add r5, r0, #0
bl MOD08_02212014
mov r1, #0x5c
- bl FUN_02016998
+ bl AllocFromHeap
add r4, r0, #0
mov r0, #0
strb r0, [r4, #8]
@@ -18854,7 +18854,7 @@ _0221ACA8: add r1, r2, #0
bl MOD08_02212438
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
_0221ACB6:
add sp, #0xc
pop {r3, r4, pc}
@@ -18867,7 +18867,7 @@ MOD08_0221ACBC: ; 0x0221ACBC add r5, r0, #0
bl MOD08_02212014
mov r1, #0x68
- bl FUN_02016998
+ bl AllocFromHeap
add r4, r0, #0
mov r0, #0
strb r0, [r4, #8]
@@ -18990,7 +18990,7 @@ MOD08_0221ADC0: ; 0x0221ADC0 add r1, r5, #0
bl MOD08_02212438
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
pop {r3, r4, r5, pc}
nop
_0221ADEC: .word 0xFFFF1FFF
@@ -19132,7 +19132,7 @@ _0221AF0A: add r1, r2, #0
bl MOD08_02212438
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
add sp, #8
pop {r4, pc}
@@ -19231,7 +19231,7 @@ _0221AFE0: cmp r6, #0xff
bne _0221AFEC
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
pop {r3, r4, r5, r6, r7, pc}
_0221AFEC:
add r0, r5, #0
@@ -19241,7 +19241,7 @@ _0221AFEC: cmp r0, #0
bne _0221B002
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
pop {r3, r4, r5, r6, r7, pc}
_0221B002:
add r1, r4, #0
@@ -19322,7 +19322,7 @@ MOD08_0221B068: ; 0x0221B068 add r1, r5, #0
bl MOD08_02212438
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
_0221B0AC:
pop {r3, r4, r5, pc}
.align 2, 0
@@ -19415,7 +19415,7 @@ _0221B160: add r1, r2, #0
bl MOD08_02212438
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
pop {r4, pc}
thumb_func_start MOD08_0221B170
@@ -19774,7 +19774,7 @@ MOD08_0221B434: ; 0x0221B434 add r1, r5, #0
bl MOD08_02212438
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
_0221B458:
pop {r3, r4, r5, pc}
.align 2, 0
@@ -19937,7 +19937,7 @@ _0221B59C: add r1, r5, #0
bl MOD08_02212438
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
_0221B5B0:
pop {r3, r4, r5, pc}
.align 2, 0
@@ -20209,7 +20209,7 @@ _0221B7B4: add r1, r5, #0
bl MOD08_02212438
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
_0221B7E6:
pop {r3, r4, r5, pc}
@@ -20277,7 +20277,7 @@ _0221B83E: add r1, r5, #0
bl MOD08_02212438
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
_0221B870:
pop {r3, r4, r5, pc}
.align 2, 0
@@ -20338,7 +20338,7 @@ _0221B8C8: add r1, r5, #0
bl MOD08_02212438
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
_0221B8E6:
pop {r3, r4, r5, pc}
@@ -20562,7 +20562,7 @@ _0221BAAC: add r1, r2, #0
bl MOD08_02212438
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
_0221BABA:
add sp, #4
pop {r3, r4, pc}
@@ -20641,7 +20641,7 @@ _0221BB50: add r1, r2, #0
bl MOD08_02212438
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
pop {r4, pc}
_0221BB60:
mov r1, #0x20
@@ -21507,7 +21507,7 @@ MOD08_0221C24C: ; 0x0221C24C add r1, r6, #0
bl MOD08_02212438
add r0, r5, #0
- bl FUN_02016A18
+ bl FreeToHeap
pop {r4, r5, r6, pc}
_0221C282:
add r0, r5, #0
@@ -21717,7 +21717,7 @@ MOD08_0221C428: ; 0x0221C428 add r1, r5, #0
bl MOD08_02212438
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
pop {r3, r4, r5, pc}
_0221C44E:
bl FUN_0200C5A8
@@ -21888,7 +21888,7 @@ _0221C59E: add r1, r4, #0
bl MOD08_02212438
add r0, r5, #0
- bl FUN_02016A18
+ bl FreeToHeap
pop {r4, r5, r6, pc}
_0221C5B4:
ldr r0, [r5, #0x1c]
@@ -21978,7 +21978,7 @@ MOD08_0221C660: ; 0x0221C660 add r1, r5, #0
bl MOD08_02212438
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
pop {r3, r4, r5, pc}
_0221C686:
bl FUN_0200C5A8
@@ -22184,7 +22184,7 @@ _0221C816: add r1, r5, #0
bl MOD08_02212438
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
add sp, #0x10
pop {r3, r4, r5, pc}
_0221C82E:
@@ -22591,7 +22591,7 @@ _0221CB0E: add r1, r5, #0
bl MOD08_02212438
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
pop {r3, r4, r5, pc}
_0221CB66:
ldr r0, [r4, #0x1c]
@@ -22676,7 +22676,7 @@ _0221CC18: mov r1, #0
bl FUN_0200C644
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
pop {r3, r4, r5, r6, r7, pc}
_0221CC28:
add r0, r5, #0
@@ -22879,7 +22879,7 @@ MOD08_0221CD94: ; 0x0221CD94 add r1, r2, #0
bl MOD08_02212438
add r0, r6, #0
- bl FUN_02016A18
+ bl FreeToHeap
pop {r4, r5, r6, pc}
_0221CDB0:
sub r0, r0, #1
@@ -23014,7 +23014,7 @@ _0221CEB2: add r1, r4, #0
bl MOD08_02212438
add r0, r5, #0
- bl FUN_02016A18
+ bl FreeToHeap
_0221CEC0:
add sp, #0x14
pop {r3, r4, r5, r6, pc}
@@ -23264,7 +23264,7 @@ _0221D09E: ldr r1, [sp, #0xc]
bl MOD08_02212438
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
add sp, #0x1c
pop {r4, r5, r6, r7, pc}
_0221D0B0:
@@ -23306,7 +23306,7 @@ MOD08_0221D0EC: ; 0x0221D0EC add r7, r3, #0
bl MOD08_02212014
mov r1, #0x44
- bl FUN_02016998
+ bl AllocFromHeap
add r4, r0, #0
bne _0221D10A
bl ErrorHandling
@@ -23672,7 +23672,7 @@ _0221D404: add r1, r2, #0
bl MOD08_02212438
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
_0221D412:
add sp, #4
pop {r3, r4, r5, r6, pc}
@@ -23685,7 +23685,7 @@ MOD08_0221D418: ; 0x0221D418 add r5, r0, #0
bl MOD08_02212014
mov r1, #0x5c
- bl FUN_02016998
+ bl AllocFromHeap
add r4, r0, #0
mov r0, #0
strb r0, [r4, #8]
@@ -24001,7 +24001,7 @@ _0221D6CC: add r1, r2, #0
bl MOD08_02212438
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
add sp, #0xc
pop {r3, r4, pc}
.align 2, 0
@@ -24013,7 +24013,7 @@ MOD08_0221D6E0: ; 0x0221D6E0 add r5, r0, #0
bl MOD08_02212014
mov r1, #0x58
- bl FUN_02016998
+ bl AllocFromHeap
add r4, r0, #0
mov r0, #0
strb r0, [r4]
@@ -24267,7 +24267,7 @@ _0221D8E2: add r1, r2, #0
bl MOD08_02212438
add r0, r5, #0
- bl FUN_02016A18
+ bl FreeToHeap
add sp, #0x18
pop {r3, r4, r5, r6, r7, pc}
_0221D8F4:
@@ -24288,7 +24288,7 @@ MOD08_0221D910: ; 0x0221D910 str r0, [sp, #0x18]
bl MOD08_02212014
mov r1, #0xb8
- bl FUN_02016998
+ bl AllocFromHeap
add r4, r0, #0
mov r0, #0
strb r0, [r4, #1]
@@ -24642,7 +24642,7 @@ _0221DC44: add r1, r2, #0
bl MOD08_02212438
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
pop {r3, r4, r5, pc}
.align 2, 0
_0221DC54: .word 0x0222C531
@@ -24764,7 +24764,7 @@ _0221DD42: add r1, r2, #0
bl MOD08_02212438
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
add sp, #0xc
pop {r4, r5, pc}
.align 2, 0
@@ -25014,7 +25014,7 @@ _0221DF24: add r1, r5, #0
bl MOD08_02212438
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
add sp, #0xc
pop {r4, r5, pc}
.align 2, 0
@@ -25181,7 +25181,7 @@ _0221E0B6: add r1, r2, #0
bl MOD08_02212438
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
_0221E0C4:
add sp, #0xc
pop {r3, r4, pc}
@@ -25341,7 +25341,7 @@ _0221E1F8: add r1, r2, #0
bl MOD08_02212438
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
add sp, #0xc
pop {r3, r4, r5, r6, pc}
nop
@@ -25471,7 +25471,7 @@ _0221E308: add r1, r2, #0
bl MOD08_02212438
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
pop {r4, pc}
_0221E324:
ldr r0, [r4, #0xc]
@@ -25842,7 +25842,7 @@ _0221E61A: add r1, r5, #0
bl MOD08_02212438
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
add sp, #0x2c
pop {r4, r5, r6, r7, pc}
_0221E636:
@@ -26118,7 +26118,7 @@ _0221E866: add r1, r2, #0
bl MOD08_02212438
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
_0221E874:
add sp, #0xc
pop {r4, r5, r6, r7, pc}
@@ -26225,7 +26225,7 @@ _0221E946: add r1, r2, #0
bl MOD08_02212438
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
pop {r4, pc}
.align 2, 0
@@ -26428,7 +26428,7 @@ _0221EAE6: add r1, r5, #0
bl MOD08_02212438
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
pop {r3, r4, r5, pc}
.align 2, 0
_0221EB00: .word 0x0222C5B0
@@ -26489,7 +26489,7 @@ _0221EB6A: add r1, r2, #0
bl MOD08_02212438
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
_0221EB78:
add sp, #8
pop {r4, pc}
@@ -26635,7 +26635,7 @@ _0221ECA0: add r1, r2, #0
bl MOD08_02212438
add r0, r5, #0
- bl FUN_02016A18
+ bl FreeToHeap
pop {r3, r4, r5, r6, r7, pc}
thumb_func_start MOD08_0221ECB0
@@ -26817,7 +26817,7 @@ _0221EE00: add r1, r2, #0
bl MOD08_02212438
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
add sp, #4
pop {r3, r4, pc}
.align 2, 0
@@ -27925,7 +27925,7 @@ _0221F738: ldr r1, [sp, #0x10]
bl MOD08_02212438
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
add sp, #0x3c
pop {r4, r5, r6, r7, pc}
_0221F74A:
@@ -28277,7 +28277,7 @@ _0221FA08: add r1, r7, #0
bl MOD08_02212438
add r0, r5, #0
- bl FUN_02016A18
+ bl FreeToHeap
pop {r3, r4, r5, r6, r7, pc}
_0221FA18:
ldrb r0, [r5, #5]
@@ -28312,7 +28312,7 @@ MOD08_0221FA44: ; 0x0221FA44 str r3, [sp]
bl MOD08_02212014
mov r1, #0x44
- bl FUN_02016998
+ bl AllocFromHeap
add r4, r0, #0
bne _0221FA62
bl ErrorHandling
@@ -28720,7 +28720,7 @@ _0221FD8A: add r1, r7, #0
bl MOD08_02212438
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
add sp, #0xc
pop {r4, r5, r6, r7, pc}
_0221FD9C:
@@ -28766,7 +28766,7 @@ MOD08_0221FDE4: ; 0x0221FDE4 add r7, r3, #0
bl MOD08_02212014
mov r1, #0x84
- bl FUN_02016998
+ bl AllocFromHeap
add r4, r0, #0
bne _0221FE02
bl ErrorHandling
@@ -29212,7 +29212,7 @@ _02220164: add r1, r2, #0
bl MOD08_02212438
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
pop {r4, r5, r6, pc}
_02220174:
ldr r0, [r4, #0x10]
@@ -29231,7 +29231,7 @@ MOD08_02220180: ; 0x02220180 add r7, r3, #0
bl MOD08_02212014
ldr r1, _022202E8 ; =0x00000564
- bl FUN_02016998
+ bl AllocFromHeap
add r4, r0, #0
bne _0222019E
bl ErrorHandling
@@ -29516,7 +29516,7 @@ _022203EA: add r1, r5, #0
bl MOD08_02212438
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
add sp, #0x14
pop {r3, r4, r5, r6, pc}
_02220410:
@@ -29681,7 +29681,7 @@ _0222054E: ldr r0, [r0, #4]
bl MOD08_02212438
ldr r0, [sp, #4]
- bl FUN_02016A18
+ bl FreeToHeap
add sp, #8
pop {r3, r4, r5, r6, r7, pc}
_02220570:
@@ -30061,7 +30061,7 @@ _0222086A: ldr r1, [sp, #0x1c]
bl MOD08_02212438
add r0, r5, #0
- bl FUN_02016A18
+ bl FreeToHeap
add sp, #0x24
pop {r4, r5, r6, r7, pc}
_0222088A:
@@ -30808,7 +30808,7 @@ _02220EE6: ldr r0, [r0, #4]
bl MOD08_02212438
ldr r0, [sp, #4]
- bl FUN_02016A18
+ bl FreeToHeap
add sp, #8
pop {r3, r4, r5, r6, r7, pc}
_02220F08:
@@ -31160,7 +31160,7 @@ _022211D6: add r1, r4, #0
bl MOD08_02212438
add r0, r5, #0
- bl FUN_02016A18
+ bl FreeToHeap
add sp, #0x1c
pop {r4, r5, pc}
_022211FE:
@@ -31554,7 +31554,7 @@ _02221560: add r1, r5, #0
bl MOD08_02212438
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
add sp, #0x58
pop {r3, r4, r5, pc}
@@ -31926,7 +31926,7 @@ _0222181E: mov r1, #0x17
bl FUN_02007558
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
add sp, #4
pop {r3, r4, r5, r6, pc}
.align 2, 0
@@ -32108,7 +32108,7 @@ _022219B8: add r1, r5, #0
bl MOD08_02212438
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
_022219EE:
add sp, #0xc
pop {r4, r5, pc}
@@ -32121,7 +32121,7 @@ MOD08_022219F4: ; 0x022219F4 add r5, r0, #0
bl MOD08_02212014
mov r1, #0xf0
- bl FUN_02016998
+ bl AllocFromHeap
add r4, r0, #0
str r5, [r4]
add r0, r5, #0
@@ -32408,7 +32408,7 @@ _02221C32: add r1, r5, #0
bl MOD08_02212438
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
_02221C62:
add sp, #8
pop {r3, r4, r5, pc}
@@ -32421,7 +32421,7 @@ MOD08_02221C68: ; 0x02221C68 add r5, r0, #0
bl MOD08_02212014
mov r1, #0xf0
- bl FUN_02016998
+ bl AllocFromHeap
add r4, r0, #0
str r5, [r4]
mov r0, #0
@@ -32942,7 +32942,7 @@ _0222207C: add r1, r7, #0
bl MOD08_02212438
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
pop {r3, r4, r5, r6, r7, pc}
_022220A0:
ldr r0, [r4, #8]
@@ -32964,7 +32964,7 @@ MOD08_022220B4: ; 0x022220B4 bl MOD08_02212014
mov r1, #1
lsl r1, r1, #8
- bl FUN_02016998
+ bl AllocFromHeap
add r4, r0, #0
str r5, [r4]
str r6, [r4, #4]
@@ -33245,7 +33245,7 @@ _0222232A: add r1, r2, #0
bl MOD08_02212438
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
add sp, #0xc
pop {r4, r5, pc}
_0222233C:
@@ -33262,7 +33262,7 @@ MOD08_02222348: ; 0x02222348 add r5, r0, #0
bl MOD08_02212014
mov r1, #0x68
- bl FUN_02016998
+ bl AllocFromHeap
add r4, r0, #0
str r5, [r4]
add r0, r5, #0
@@ -33614,7 +33614,7 @@ _022225CE: add r1, r6, #0
bl MOD08_02212438
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
_02222650:
add sp, #8
pop {r4, r5, r6, pc}
@@ -33626,7 +33626,7 @@ MOD08_02222654: ; 0x02222654 add r5, r0, #0
bl MOD08_02212014
mov r1, #0x68
- bl FUN_02016998
+ bl AllocFromHeap
mov r1, #0
mov r2, #0x68
add r4, r0, #0
@@ -33866,7 +33866,7 @@ _02222862: add r1, r2, #0
bl MOD08_02212438
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
add sp, #8
pop {r3, r4, r5, pc}
_02222874:
@@ -34027,7 +34027,7 @@ _022229B4: add r1, r2, #0
bl MOD08_02212438
add r0, r5, #0
- bl FUN_02016A18
+ bl FreeToHeap
_022229C2:
add sp, #0xc
pop {r4, r5, pc}
@@ -34039,7 +34039,7 @@ MOD08_022229C8: ; 0x022229C8 add r5, r0, #0
bl MOD08_02212014
mov r1, #0x50
- bl FUN_02016998
+ bl AllocFromHeap
add r4, r0, #0
mov r1, #0
mov r2, #0x50
@@ -34115,7 +34115,7 @@ MOD08_02222A78: ; 0x02222A78 add r5, r0, #0
bl MOD08_02212014
mov r1, #0x40
- bl FUN_02016998
+ bl AllocFromHeap
add r4, r0, #0
mov r1, #0
mov r2, #0x40
@@ -34378,7 +34378,7 @@ _02222C3E: add r1, r6, #0
bl MOD08_02212438
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
_02222CC4:
pop {r4, r5, r6, pc}
.align 2, 0
@@ -34650,7 +34650,7 @@ _02222F06: add r1, r5, #0
bl MOD08_02212438
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
add sp, #0xc
pop {r4, r5, pc}
_02222F1E:
@@ -35039,7 +35039,7 @@ _02223226: add r1, r7, #0
bl MOD08_02212438
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
pop {r3, r4, r5, r6, r7, pc}
_02223244:
ldr r0, [r4, #8]
@@ -35354,7 +35354,7 @@ _022234BA: add r1, r5, #0
bl MOD08_02212438
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
add sp, #0x10
pop {r3, r4, r5, pc}
_022234D2:
@@ -35550,7 +35550,7 @@ _02223664: add r1, r2, #0
bl MOD08_02212438
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
add sp, #8
pop {r4, pc}
_02223676:
@@ -35805,7 +35805,7 @@ _0222386E: add r1, r5, #0
bl MOD08_02212438
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
pop {r3, r4, r5, pc}
_02223884:
ldr r0, [r4, #8]
@@ -36171,7 +36171,7 @@ _02223B64: add r1, r5, #0
bl MOD08_02212438
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
add sp, #8
pop {r3, r4, r5, pc}
_02223B7C:
@@ -36525,7 +36525,7 @@ _02223E30: add r1, r5, #0
bl MOD08_02212438
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
add sp, #0xc
pop {r4, r5, r6, r7, pc}
_02223E48:
@@ -36829,7 +36829,7 @@ _022240A8: add r1, r2, #0
bl MOD08_02212438
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
_022240B6:
pop {r4, pc}
@@ -37041,7 +37041,7 @@ _02224250: add r1, r2, #0
bl MOD08_02212438
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
_0222425E:
pop {r4, pc}
@@ -37448,7 +37448,7 @@ _02224590: add r1, r5, #0
bl MOD08_02212438
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
add sp, #8
pop {r3, r4, r5, pc}
_022245A8:
@@ -37604,7 +37604,7 @@ _022246C8: add r1, r2, #0
bl MOD08_02212438
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
pop {r4, pc}
thumb_func_start MOD08_022246D8
@@ -37858,7 +37858,7 @@ _022248D4: add r1, r2, #0
bl MOD08_02212438
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
_022248E2:
add sp, #8
pop {r4, pc}
@@ -38267,7 +38267,7 @@ _02224BF6: add r1, r7, #0
bl MOD08_02212438
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
pop {r3, r4, r5, r6, r7, pc}
_02224C14:
ldr r0, [r4, #8]
@@ -38602,7 +38602,7 @@ _02224EC2: add r1, r5, #0
bl MOD08_02212438
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
add sp, #8
pop {r3, r4, r5, pc}
_02224EDA:
@@ -39195,7 +39195,7 @@ _0222539C: add r1, r2, #0
bl MOD08_02212438
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
_022253AA:
ldr r0, [r4, #4]
bl FUN_0200BC1C
@@ -39525,7 +39525,7 @@ _0222566A: cmp r6, #3
blt _0222566A
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
ldr r0, [r4]
add r1, r7, #0
bl MOD08_02212438
@@ -39873,7 +39873,7 @@ _02225946: cmp r6, #6
blt _02225946
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
ldr r0, [r4]
add r1, r7, #0
bl MOD08_02212438
@@ -40192,7 +40192,7 @@ _02225BD8: cmp r4, #0xf
blt _02225BD8
add r0, r6, #0
- bl FUN_02016A18
+ bl FreeToHeap
ldr r0, [r6]
add r1, r7, #0
bl MOD08_02212438
@@ -40560,7 +40560,7 @@ _02225E68: lsr r1, r1, #0x18
bl FUN_02018744
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
ldr r0, [r4]
add r1, r6, #0
bl MOD08_02212438
@@ -40827,7 +40827,7 @@ _0222610E: pop {r4, r5, pc}
_02226126:
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
ldr r0, [r4]
add r1, r5, #0
bl MOD08_02212438
@@ -40938,7 +40938,7 @@ _022261F8: add r1, r5, #0
bl MOD08_02212438
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
add sp, #8
pop {r3, r4, r5, pc}
_02226210:
@@ -41194,7 +41194,7 @@ _022263E6: add r2, #0xf3
bl FUN_02007558
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
ldr r0, [r4]
add r1, r5, #0
bl MOD08_02212438
@@ -41270,7 +41270,7 @@ MOD08_022264A4: ; 0x022264A4 ldr r0, [r4, #0x2c]
bl FUN_0200C3DC
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
ldr r0, [r4]
add r1, r5, #0
bl MOD08_02212438
@@ -41525,7 +41525,7 @@ _022266BA: mov r1, #1
bl FUN_02007558
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
ldr r0, [r4]
add r1, r5, #0
bl MOD08_02212438
@@ -41708,7 +41708,7 @@ _02226836: mov r1, #1
bl FUN_02007558
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
ldr r0, [r4]
add r1, r5, #0
bl MOD08_02212438
@@ -41944,7 +41944,7 @@ _02226A2A: add r1, r7, #0
bl MOD08_02212438
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
pop {r3, r4, r5, r6, r7, pc}
_02226A48:
ldr r0, [r4, #0xc]
@@ -42162,7 +42162,7 @@ _02226C00: add r1, r5, #0
bl MOD08_02212438
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
add sp, #8
pop {r3, r4, r5, pc}
_02226C18:
@@ -42390,7 +42390,7 @@ _02226DC0: ldr r0, [r0]
bl MOD08_02212438
ldr r0, [sp]
- bl FUN_02016A18
+ bl FreeToHeap
pop {r3, r4, r5, r6, r7, pc}
_02226DE0:
ldr r0, [sp]
@@ -42607,7 +42607,7 @@ _02226F82: cmp r6, #6
blt _02226F82
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
ldr r0, [r4]
add r1, r7, #0
bl MOD08_02212438
@@ -44760,7 +44760,7 @@ _02228072: add r0, r4, #0
bl MOD08_02212014
add r1, r5, #0
- bl FUN_02016998
+ bl AllocFromHeap
add r4, r0, #0
bne _02228086
bl ErrorHandling
@@ -44780,7 +44780,7 @@ MOD08_02228094: ; 0x02228094 bl ErrorHandling
_0222809E:
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
pop {r4, pc}
.align 2, 0
@@ -44986,7 +44986,7 @@ MOD08_022281F4: ; 0x022281F4 push {r4, lr}
mov r1, #0xb8
add r4, r0, #0
- bl FUN_02016998
+ bl AllocFromHeap
cmp r0, #0
bne _0222820A
bl ErrorHandling
@@ -45529,10 +45529,10 @@ _02228616: thumb_func_start MOD08_02228618
MOD08_02228618: ; 0x02228618
- ldr r3, _0222861C ; =FUN_02016A18
+ ldr r3, _0222861C ; =FreeToHeap
bx r3
.align 2, 0
-_0222861C: .word FUN_02016A18
+_0222861C: .word FreeToHeap
thumb_func_start MOD08_02228620
MOD08_02228620: ; 0x02228620
@@ -45556,7 +45556,7 @@ MOD08_02228620: ; 0x02228620 add r0, r5, #0
bl FUN_0200CAB4
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
pop {r3, r4, r5, pc}
_02228654:
sub r0, r0, #1
@@ -45609,7 +45609,7 @@ _0222869A: _022286AC:
ldr r0, [r6]
mov r1, #0x1c
- bl FUN_02016998
+ bl AllocFromHeap
add r4, r0, #0
bne _022286BC
bl ErrorHandling
@@ -45853,7 +45853,7 @@ MOD08_02228880: ; 0x02228880 add r5, r0, #0
ldr r0, [r5, #8]
mov r1, #0x24
- bl FUN_02016998
+ bl AllocFromHeap
add r4, r0, #0
bne _02228894
bl ErrorHandling
@@ -45972,10 +45972,10 @@ _0222896C: thumb_func_start MOD08_02228970
MOD08_02228970: ; 0x02228970
- ldr r3, _02228974 ; =FUN_02016A18
+ ldr r3, _02228974 ; =FreeToHeap
bx r3
.align 2, 0
-_02228974: .word FUN_02016A18
+_02228974: .word FreeToHeap
thumb_func_start MOD08_02228978
MOD08_02228978: ; 0x02228978
@@ -48086,7 +48086,7 @@ MOD08_02229918: ; 0x02229918 add r5, r0, #0
ldr r0, [r5, #4]
mov r1, #0xe0
- bl FUN_02016998
+ bl AllocFromHeap
mov r1, #0
mov r2, #0xe0
add r4, r0, #0
@@ -48247,7 +48247,7 @@ _02229A36: ldr r0, [r0]
bl FUN_0200CAB4
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
pop {r4, pc}
.align 2, 0
@@ -49115,7 +49115,7 @@ MOD08_0222A0D4: ; 0x0222A0D4 add r5, r1, #0
mov r1, #0x48
add r6, r0, #0
- bl FUN_02016998
+ bl AllocFromHeap
add r4, r0, #0
bne _0222A0EC
bl ErrorHandling
@@ -49187,14 +49187,14 @@ _0222A154: ldr r0, [r5, #8]
cmp r0, #0
beq _0222A15E
- bl FUN_02016A18
+ bl FreeToHeap
_0222A15E:
add r4, r4, #1
add r5, r5, #4
cmp r4, #0x10
blt _0222A154
add r0, r6, #0
- bl FUN_02016A18
+ bl FreeToHeap
pop {r4, r5, r6, pc}
.align 2, 0
@@ -49231,7 +49231,7 @@ MOD08_0222A1A0: ; 0x0222A1A0 add r6, r1, #0
mov r1, #0x24
add r5, r0, #0
- bl FUN_02016998
+ bl AllocFromHeap
add r4, r0, #0
bne _0222A1B8
bl ErrorHandling
diff --git a/arm9/modules/09/asm/module_09.s b/arm9/modules/09/asm/module_09.s index edb7a39e..7c980707 100644 --- a/arm9/modules/09/asm/module_09.s +++ b/arm9/modules/09/asm/module_09.s @@ -2191,7 +2191,7 @@ MOD09_02212F8C: ; 0x02212F8C add r1, #0xc
bl MOD09_0221790C
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
ldr r2, [r5]
mov r0, #0x48
ldr r2, [r2, #0xc]
@@ -2205,7 +2205,7 @@ MOD09_02212F8C: ; 0x02212F8C add r1, #0xc
bl MOD09_02217C38
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
mov r0, #1
str r0, [sp]
lsl r0, r0, #9
@@ -2305,7 +2305,7 @@ MOD09_02212F8C: ; 0x02212F8C ldr r0, [r5]
mov r1, #0x20
ldr r0, [r0, #0xc]
- bl FUN_02016998
+ bl AllocFromHeap
mov r1, #0x1a
lsl r1, r1, #4
add r1, r6, r1
@@ -2345,7 +2345,7 @@ MOD09_02212F8C: ; 0x02212F8C mov r2, #1
bl FUN_02003054
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
add sp, #0x14
pop {r3, r4, r5, r6, pc}
nop
@@ -3434,7 +3434,7 @@ _02213976: lsr r1, r1, #0x18
bl FUN_0201AC68
add r0, r7, #0
- bl FUN_02016A18
+ bl FreeToHeap
add r4, r4, #1
add r6, r6, #4
cmp r4, #2
@@ -8687,7 +8687,7 @@ _0221668E: bl FUN_02021A20
_022166BE:
add r0, r6, #0
- bl FUN_02016A18
+ bl FreeToHeap
add sp, #0x10
pop {r3, r4, r5, r6, r7, pc}
.align 2, 0
@@ -11729,7 +11729,7 @@ MOD09_02217F88: ; 0x02217F88 mul r1, r7
ldr r0, [r0, #0xc]
lsl r1, r1, #1
- bl FUN_02016998
+ bl AllocFromHeap
str r0, [sp, #0x18]
ldr r0, [sp, #0x14]
ldr r1, [sp, #0x18]
@@ -11757,7 +11757,7 @@ MOD09_02217F88: ; 0x02217F88 mov r1, #6
bl FUN_0201AC68
ldr r0, [sp, #0x18]
- bl FUN_02016A18
+ bl FreeToHeap
add sp, #0x1c
pop {r4, r5, r6, r7, pc}
nop
@@ -14016,7 +14016,7 @@ MOD09_022191C0: ; 0x022191C0 add r1, #0xc
bl MOD09_0221A2F4
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
mov r0, #1
str r0, [sp]
mov r0, #6
@@ -16829,7 +16829,7 @@ MOD09_0221A884: ; 0x0221A884 mul r1, r7
ldr r0, [r0, #0xc]
lsl r1, r1, #1
- bl FUN_02016998
+ bl AllocFromHeap
str r0, [sp, #0x18]
ldr r0, [sp, #0x14]
ldr r1, [sp, #0x18]
@@ -16853,7 +16853,7 @@ MOD09_0221A884: ; 0x0221A884 mov r1, #6
bl FUN_0201AC68
ldr r0, [sp, #0x18]
- bl FUN_02016A18
+ bl FreeToHeap
add sp, #0x1c
pop {r4, r5, r6, r7, pc}
nop
@@ -17262,7 +17262,7 @@ _0221AC00: .word 0x0000114D MOD09_0221AC04: ; 0x0221AC04
push {r3, lr}
mov r1, #0x10
- bl FUN_02016998
+ bl AllocFromHeap
add r3, r0, #0
mov r2, #0x10
mov r1, #0
@@ -17275,10 +17275,10 @@ _0221AC12: thumb_func_start MOD09_0221AC1C
MOD09_0221AC1C: ; 0x0221AC1C
- ldr r3, _0221AC20 ; =FUN_02016A18
+ ldr r3, _0221AC20 ; =FreeToHeap
bx r3
.align 2, 0
-_0221AC20: .word FUN_02016A18
+_0221AC20: .word FreeToHeap
thumb_func_start MOD09_0221AC24
MOD09_0221AC24: ; 0x0221AC24
diff --git a/arm9/modules/11/asm/module_11.s b/arm9/modules/11/asm/module_11.s index 0b1c042f..46ec5b7a 100644 --- a/arm9/modules/11/asm/module_11.s +++ b/arm9/modules/11/asm/module_11.s @@ -756,7 +756,7 @@ _0222DC42: mov r1, #0x32
mov r0, #5
lsl r1, r1, #6
- bl FUN_02016998
+ bl AllocFromHeap
str r0, [r5, r7]
add r6, r6, #1
add r5, #0x10
@@ -1155,14 +1155,14 @@ _0222DFEC: ldr r1, [r6, #4]
bl FUN_0206BAD0
ldr r0, [r5, #0x68]
- bl FUN_02016A18
+ bl FreeToHeap
add r1, r6, #0
add r1, #0xf8
ldr r0, [r5, #0x48]
ldr r1, [r1]
bl FUN_0202393C
ldr r0, [r5, #0x48]
- bl FUN_02016A18
+ bl FreeToHeap
ldr r0, [sp]
add r6, r6, #4
add r0, r0, #1
@@ -1180,14 +1180,14 @@ _0222DFEC: ldr r1, [r7, r1]
bl FUN_0206EBB4
ldr r0, [r4, #0x58]
- bl FUN_02016A18
+ bl FreeToHeap
mov r1, #0x11
lsl r1, r1, #4
ldr r0, [r4, #0x60]
ldr r1, [r7, r1]
bl FUN_02023D80
ldr r0, [r4, #0x60]
- bl FUN_02016A18
+ bl FreeToHeap
mov r0, #0x45
ldr r1, [r4, #0x64]
lsl r0, r0, #2
@@ -1281,13 +1281,13 @@ _0222DFEC: add r7, #0x8c
_0222E10A:
ldr r0, [r5, r7]
- bl FUN_02016A18
+ bl FreeToHeap
add r6, r6, #1
add r5, #0x10
cmp r6, #4
blt _0222E10A
ldr r0, [r4, #0x18]
- bl FUN_02016A18
+ bl FreeToHeap
ldr r0, [r4, #0x28]
mov r1, #0
bl FUN_02003038
@@ -1357,15 +1357,15 @@ _0222E1AC: mov r1, #3
bl FUN_020191A4
ldr r0, [r4, #4]
- bl FUN_02016A18
+ bl FreeToHeap
mov r0, #0x87
lsl r0, r0, #2
ldr r0, [r4, r0]
- bl FUN_02016A18
+ bl FreeToHeap
mov r0, #0x22
lsl r0, r0, #4
ldr r0, [r4, r0]
- bl FUN_02016A18
+ bl FreeToHeap
mov r0, #0x6a
lsl r0, r0, #2
ldr r0, [r4, r0]
@@ -1395,7 +1395,7 @@ _0222E220: ldr r0, [r4, r0]
bl FUN_0201C350
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
ldr r0, _0222E25C ; =SDK_OVERLAY_MODULE_08_ID
bl UnloadOverlayByID
bl FUN_02033590
@@ -4117,7 +4117,7 @@ _0222F898: add r5, r4, #0
_0222F8B0:
ldr r0, [r5, #0x10]
- bl FUN_02016A18
+ bl FreeToHeap
add r6, r6, #1
add r5, r5, #4
cmp r6, #4
@@ -4207,9 +4207,9 @@ MOD11_0222F93C: ; 0x0222F93C mov r1, #1
bl FUN_020178A0
ldr r0, [r4, #4]
- bl FUN_02016A18
+ bl FreeToHeap
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
pop {r4, pc}
thumb_func_start MOD11_0222F988
@@ -4256,7 +4256,7 @@ _0222F9CA: _0222F9DE:
mov r0, #5
mov r1, #0x2c
- bl FUN_02016998
+ bl AllocFromHeap
mov r1, #7
lsl r1, r1, #6
str r0, [r4, r1]
@@ -4387,7 +4387,7 @@ _0222FADA: ldr r0, [r0, #0x14]
cmp r0, #0
beq _0222FAE8
- bl FUN_02016A18
+ bl FreeToHeap
_0222FAE8:
add r4, r4, #1
add r5, r5, #4
@@ -4396,7 +4396,7 @@ _0222FAE8: mov r0, #7
lsl r0, r0, #6
ldr r0, [r6, r0]
- bl FUN_02016A18
+ bl FreeToHeap
mov r0, #1
pop {r3, r4, r5, r6, r7, pc}
_0222FAFE:
@@ -4428,7 +4428,7 @@ _0222FB2A: _0222FB2E:
mov r0, #5
mov r1, #0x2c
- bl FUN_02016998
+ bl AllocFromHeap
mov r1, #7
lsl r1, r1, #6
str r0, [r4, r1]
@@ -4573,7 +4573,7 @@ _0222FC56: ldr r0, [r0, #0x14]
cmp r0, #0
beq _0222FC64
- bl FUN_02016A18
+ bl FreeToHeap
_0222FC64:
add r4, r4, #1
add r5, r5, #4
@@ -4582,7 +4582,7 @@ _0222FC64: mov r0, #7
lsl r0, r0, #6
ldr r0, [r6, r0]
- bl FUN_02016A18
+ bl FreeToHeap
mov r0, #1
pop {r3, r4, r5, r6, r7, pc}
_0222FC7A:
@@ -4617,7 +4617,7 @@ _0222FCA8: bl HandleLoadOverlay
mov r0, #5
mov r1, #0x2c
- bl FUN_02016998
+ bl AllocFromHeap
add r6, r0, #0
mov r0, #0x66
lsl r0, r0, #2
@@ -4838,14 +4838,14 @@ _0222FE72: ldr r0, [r5, #0x14]
cmp r0, #0
beq _0222FE7C
- bl FUN_02016A18
+ bl FreeToHeap
_0222FE7C:
add r4, r4, #1
add r5, r5, #4
cmp r4, #4
blt _0222FE72
add r0, r6, #0
- bl FUN_02016A18
+ bl FreeToHeap
mov r0, #1
pop {r4, r5, r6, pc}
_0222FE8E:
@@ -7227,13 +7227,13 @@ MOD11_02230FCC: ; 0x02230FCC add r4, r0, #0
mov r0, #5
lsl r1, r1, #0x10
- bl FUN_02016998
+ bl AllocFromHeap
mov r1, #0x87
lsl r1, r1, #2
str r0, [r4, r1]
mov r0, #5
sub r1, #0x1c
- bl FUN_02016998
+ bl AllocFromHeap
mov r1, #0x22
lsl r1, r1, #4
str r0, [r4, r1]
@@ -12734,7 +12734,7 @@ MOD11_02233A78: ; 0x02233A78 bl MOD11_0223A424
mov r0, #5
mov r1, #0x58
- bl FUN_02016998
+ bl AllocFromHeap
mov r1, #0x5e
lsl r1, r1, #2
str r0, [r4, r1]
@@ -13128,7 +13128,7 @@ MOD11_02233D7C: ; 0x02233D7C add r6, r0, #0
mov r0, #5
mov r1, #0x58
- bl FUN_02016998
+ bl AllocFromHeap
mov r1, #0x5e
lsl r1, r1, #2
str r0, [r4, r1]
@@ -15122,7 +15122,7 @@ MOD11_02234CFC: ; 0x02234CFC str r2, [sp]
mov r0, #5
mov r1, #0x60
- bl FUN_02016998
+ bl AllocFromHeap
add r4, r0, #0
ldr r0, [sp]
add r6, r7, #0
@@ -15236,7 +15236,7 @@ _02234DCC: mul r5, r1
_02234DDE:
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
add r0, r5, #0
add sp, #0x3c
pop {r4, r5, r6, r7, pc}
@@ -27066,7 +27066,7 @@ _0223AB22: str r0, [sp, #0x30]
mov r0, #5
mov r1, #0x18
- bl FUN_02016998
+ bl AllocFromHeap
mov r1, #0x5f
ldr r2, [r4, #4]
lsl r1, r1, #2
@@ -27474,7 +27474,7 @@ _0223AEAC: ldr r1, [r4, #4]
lsl r0, r0, #2
ldr r0, [r1, r0]
- bl FUN_02016A18
+ bl FreeToHeap
mov r0, #0xf
add sp, #0xd4
str r0, [r4, #0x28]
@@ -27957,7 +27957,7 @@ _0223B298: lsl r0, r0, #2
str r2, [r1, r0]
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
ldr r0, [sp, #0x14]
bl FUN_0200CAB4
_0223B2AE:
@@ -29386,7 +29386,7 @@ _0223BEBE: lsl r0, r0, #2
str r2, [r1, r0]
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
ldr r0, [sp, #0x10]
bl FUN_0200CAB4
add sp, #0x158
@@ -29467,7 +29467,7 @@ _0223BF5E: lsl r0, r0, #2
str r2, [r1, r0]
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
ldr r0, [sp, #0x10]
bl FUN_0200CAB4
add sp, #0x158
@@ -29498,7 +29498,7 @@ _0223BFB2: lsl r0, r0, #2
str r2, [r1, r0]
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
ldr r0, [sp, #0x10]
bl FUN_0200CAB4
_0223BFD0:
@@ -31748,7 +31748,7 @@ MOD11_0223D1DC: ; 0x0223D1DC ldr r1, _0223D22C ; =0x0000314C
add r5, r0, #0
mov r0, #5
- bl FUN_02016998
+ bl AllocFromHeap
add r4, r0, #0
ldr r2, _0223D22C ; =0x0000314C
mov r0, #0
@@ -31827,9 +31827,9 @@ MOD11_0223D284: ; 0x0223D284 add r4, r0, #0
ldr r0, _0223D298 ; =0x00002120
ldr r0, [r4, r0]
- bl FUN_02016A18
+ bl FreeToHeap
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
pop {r4, pc}
.align 2, 0
_0223D298: .word 0x00002120
@@ -64289,7 +64289,7 @@ MOD11_0224CA64: ; 0x0224CA64 mov r1, #0x69
mov r0, #5
lsl r1, r1, #2
- bl FUN_02016998
+ bl AllocFromHeap
add r4, r0, #0
mov r2, #0x69
mov r0, #0
@@ -64414,7 +64414,7 @@ _0224CB64: add r0, r4, #0
bl MOD11_0225468C
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
pop {r4, pc}
.align 2, 0
@@ -65709,7 +65709,7 @@ MOD11_0224D550: ; 0x0224D550 add r4, r0, #0
mov r0, #5
mov r1, #0x18
- bl FUN_02016998
+ bl AllocFromHeap
add r1, r0, #0
str r4, [r1]
mov r2, #0
@@ -65734,7 +65734,7 @@ MOD11_0224D574: ; 0x0224D574 bl MOD11_0222FF74
mov r0, #5
mov r1, #0x2c
- bl FUN_02016998
+ bl AllocFromHeap
add r4, r0, #0
mov r2, #0
ldr r0, _0224D720 ; =0x00000195
@@ -65942,7 +65942,7 @@ MOD11_0224D738: ; 0x0224D738 bl MOD11_0222FF74
mov r0, #5
mov r1, #0x9c
- bl FUN_02016998
+ bl AllocFromHeap
add r4, r0, #0
ldr r0, _0224D874 ; =0x00000195
ldrb r1, [r6, r0]
@@ -66100,7 +66100,7 @@ MOD11_0224D87C: ; 0x0224D87C bl MOD11_0222FF74
mov r0, #5
mov r1, #0x9c
- bl FUN_02016998
+ bl AllocFromHeap
add r5, r0, #0
add r1, r5, #0
mov r0, #0
@@ -66311,7 +66311,7 @@ MOD11_0224DA2C: ; 0x0224DA2C mov r0, #5
mov r1, #0x74
str r2, [sp]
- bl FUN_02016998
+ bl AllocFromHeap
add r2, r0, #0
str r5, [r2]
str r4, [r2, #4]
@@ -66405,7 +66405,7 @@ MOD11_0224DAE8: ; 0x0224DAE8 mov r0, #5
mov r1, #0x10
add r6, r2, #0
- bl FUN_02016998
+ bl AllocFromHeap
add r4, r0, #0
str r7, [r4]
ldr r0, [r5, #0x20]
@@ -66456,7 +66456,7 @@ MOD11_0224DB4C: ; 0x0224DB4C str r0, [sp, #0x2c]
mov r0, #5
mov r1, #0x24
- bl FUN_02016998
+ bl AllocFromHeap
add r4, r0, #0
mov r2, #0
ldr r0, _0224DCCC ; =0x00000195
@@ -66646,7 +66646,7 @@ MOD11_0224DCE4: ; 0x0224DCE4 mov r0, #5
mov r1, #0x1c
add r6, r2, #0
- bl FUN_02016998
+ bl AllocFromHeap
add r4, r0, #0
mov r0, #0
strb r0, [r4, #0xa]
@@ -66693,7 +66693,7 @@ MOD11_0224DD44: ; 0x0224DD44 add r4, r1, #0
mov r0, #5
mov r1, #0x10
- bl FUN_02016998
+ bl AllocFromHeap
add r1, r0, #0
mov r0, #0
strb r0, [r1, #0xa]
@@ -66734,7 +66734,7 @@ MOD11_0224DD8C: ; 0x0224DD8C str r0, [sp, #0x14]
mov r0, #5
mov r1, #0x10
- bl FUN_02016998
+ bl AllocFromHeap
add r4, r0, #0
mov r0, #0
ldr r1, _0224DE38 ; =0x00000195
@@ -66952,7 +66952,7 @@ MOD11_0224DF60: ; 0x0224DF60 mov r0, #5
mov r1, #0x3c
add r5, r2, #0
- bl FUN_02016998
+ bl AllocFromHeap
add r4, r0, #0
mov r0, #0
add r1, r4, #0
@@ -67064,7 +67064,7 @@ MOD11_0224E034: ; 0x0224E034 mov r0, #5
mov r1, #0x24
add r7, r2, #0
- bl FUN_02016998
+ bl AllocFromHeap
add r3, r0, #0
mov r1, #0x65
mov r4, #0
@@ -67123,7 +67123,7 @@ MOD11_0224E0A4: ; 0x0224E0A4 mov r0, #5
mov r1, #0x34
add r5, r2, #0
- bl FUN_02016998
+ bl AllocFromHeap
add r6, r0, #0
mov r0, #0
strb r0, [r6, #0xf]
@@ -67193,15 +67193,15 @@ MOD11_0224E130: ; 0x0224E130 mov r0, #5
mov r1, #0x34
str r2, [sp, #4]
- bl FUN_02016998
+ bl AllocFromHeap
add r4, r0, #0
mov r0, #5
mov r1, #0x34
- bl FUN_02016998
+ bl AllocFromHeap
str r0, [r4, #8]
mov r0, #5
mov r1, #0x38
- bl FUN_02016998
+ bl AllocFromHeap
ldr r1, [r4, #8]
str r0, [r1, #4]
mov r0, #5
@@ -67278,7 +67278,7 @@ MOD11_0224E1DC: ; 0x0224E1DC mov r0, #5
mov r1, #0x34
add r7, r2, #0
- bl FUN_02016998
+ bl AllocFromHeap
add r2, r0, #0
mov r3, #0
strb r3, [r2, #0xa]
@@ -67335,7 +67335,7 @@ MOD11_0224E248: ; 0x0224E248 mov r0, #5
mov r1, #0x1c
add r4, r2, #0
- bl FUN_02016998
+ bl AllocFromHeap
add r1, r0, #0
mov r2, #0
strb r2, [r1, #0xe]
@@ -67373,7 +67373,7 @@ MOD11_0224E28C: ; 0x0224E28C str r0, [sp]
mov r0, #5
mov r1, #8
- bl FUN_02016998
+ bl AllocFromHeap
add r4, r0, #0
str r6, [r4]
ldrb r0, [r5]
@@ -67421,7 +67421,7 @@ MOD11_0224E2F4: ; 0x0224E2F4 str r0, [sp]
mov r0, #5
mov r1, #8
- bl FUN_02016998
+ bl AllocFromHeap
add r4, r0, #0
add r0, r6, #0
str r5, [r4]
@@ -67456,7 +67456,7 @@ MOD11_0224E344: ; 0x0224E344 mov r0, #5
mov r1, #0x70
add r5, r2, #0
- bl FUN_02016998
+ bl AllocFromHeap
add r4, r0, #0
mov r1, #0
add r0, #0x6a
@@ -67535,7 +67535,7 @@ MOD11_0224E3E0: ; 0x0224E3E0 add r4, r1, #0
mov r0, #5
mov r1, #0xc
- bl FUN_02016998
+ bl AllocFromHeap
add r1, r0, #0
mov r2, #0
strb r2, [r1, #9]
@@ -67689,7 +67689,7 @@ MOD11_0224E510: ; 0x0224E510 mov r0, #5
mov r1, #0x74
str r2, [sp]
- bl FUN_02016998
+ bl AllocFromHeap
add r1, r0, #0
ldr r0, _0224E5F0 ; =0x00000195
ldrb r2, [r4, r0]
@@ -67831,7 +67831,7 @@ MOD11_0224E628: ; 0x0224E628 add r4, r1, #0
mov r0, #5
mov r1, #8
- bl FUN_02016998
+ bl AllocFromHeap
add r1, r0, #0
mov r2, #0
strb r2, [r1, #6]
@@ -67859,7 +67859,7 @@ MOD11_0224E65C: ; 0x0224E65C mov r0, #5
mov r1, #0x68
str r2, [sp]
- bl FUN_02016998
+ bl AllocFromHeap
add r1, r0, #0
str r5, [r1]
ldr r0, [sp]
@@ -67975,7 +67975,7 @@ MOD11_0224E734: ; 0x0224E734 str r0, [sp, #4]
mov r0, #5
mov r1, #8
- bl FUN_02016998
+ bl AllocFromHeap
add r4, r0, #0
str r6, [r4]
ldrb r0, [r7]
@@ -68018,7 +68018,7 @@ MOD11_0224E790: ; 0x0224E790 str r0, [sp]
mov r0, #5
mov r1, #8
- bl FUN_02016998
+ bl AllocFromHeap
add r4, r0, #0
str r5, [r4]
ldrb r0, [r7]
@@ -68058,7 +68058,7 @@ MOD11_0224E7E8: ; 0x0224E7E8 str r0, [sp]
mov r0, #5
mov r1, #8
- bl FUN_02016998
+ bl AllocFromHeap
add r4, r0, #0
str r5, [r4]
ldrb r0, [r7]
@@ -68097,7 +68097,7 @@ MOD11_0224E840: ; 0x0224E840 add r7, r0, #0
mov r0, #5
mov r1, #8
- bl FUN_02016998
+ bl AllocFromHeap
add r4, r0, #0
str r5, [r4]
mov r0, #0x22
@@ -68137,7 +68137,7 @@ MOD11_0224E894: ; 0x0224E894 str r0, [sp]
mov r0, #5
mov r1, #8
- bl FUN_02016998
+ bl AllocFromHeap
add r4, r0, #0
str r5, [r4]
ldrb r0, [r7]
@@ -68170,7 +68170,7 @@ MOD11_0224E8EC: ; 0x0224E8EC add r4, r1, #0
mov r0, #5
mov r1, #0xc
- bl FUN_02016998
+ bl AllocFromHeap
add r1, r0, #0
add r0, r4, #0
str r5, [r1]
@@ -68205,7 +68205,7 @@ MOD11_0224E924: ; 0x0224E924 str r0, [sp]
mov r0, #5
mov r1, #0xc
- bl FUN_02016998
+ bl AllocFromHeap
add r7, r0, #0
str r6, [r7]
ldrb r0, [r4]
@@ -68360,7 +68360,7 @@ MOD11_0224EA74: ; 0x0224EA74 mov r0, #5
mov r1, #0x10
add r4, r2, #0
- bl FUN_02016998
+ bl AllocFromHeap
add r1, r0, #0
mov r2, #0
strb r2, [r1, #0xa]
@@ -68389,7 +68389,7 @@ MOD11_0224EAAC: ; 0x0224EAAC mov r0, #5
mov r1, #0x10
add r4, r2, #0
- bl FUN_02016998
+ bl AllocFromHeap
add r1, r0, #0
mov r2, #0
strb r2, [r1, #0xa]
@@ -68421,7 +68421,7 @@ MOD11_0224EAEC: ; 0x0224EAEC mov r0, #5
mov r1, #0x10
add r4, r2, #0
- bl FUN_02016998
+ bl AllocFromHeap
add r1, r0, #0
mov r0, #0
strb r0, [r1, #7]
@@ -68459,7 +68459,7 @@ MOD11_0224EB34: ; 0x0224EB34 mov r0, #5
mov r1, #0x10
add r6, r2, #0
- bl FUN_02016998
+ bl AllocFromHeap
add r1, r0, #0
mov r2, #0
strb r2, [r1, #7]
@@ -68488,7 +68488,7 @@ MOD11_0224EB6C: ; 0x0224EB6C mov r0, #5
mov r1, #0x10
add r4, r2, #0
- bl FUN_02016998
+ bl AllocFromHeap
add r1, r0, #0
mov r0, #0
strb r0, [r1, #7]
@@ -68527,7 +68527,7 @@ MOD11_0224EBB8: ; 0x0224EBB8 mov r0, #5
mov r1, #0x10
add r6, r2, #0
- bl FUN_02016998
+ bl AllocFromHeap
add r1, r0, #0
mov r2, #0
strb r2, [r1, #7]
@@ -68623,7 +68623,7 @@ MOD11_0224EC80: ; 0x0224EC80 add r4, r1, #0
mov r0, #5
mov r1, #0x10
- bl FUN_02016998
+ bl AllocFromHeap
add r1, r0, #0
mov r2, #0
strb r2, [r1, #0xe]
@@ -68652,7 +68652,7 @@ MOD11_0224ECB8: ; 0x0224ECB8 add r4, r1, #0
mov r0, #5
mov r1, #0x10
- bl FUN_02016998
+ bl AllocFromHeap
add r1, r0, #0
mov r2, #0
strb r2, [r1, #0xe]
@@ -68687,7 +68687,7 @@ MOD11_0224ECF0: ; 0x0224ECF0 add r7, r0, #0
mov r0, #5
mov r1, #8
- bl FUN_02016998
+ bl AllocFromHeap
add r4, r0, #0
str r5, [r4]
mov r0, #0x3b
@@ -68726,7 +68726,7 @@ MOD11_0224ED44: ; 0x0224ED44 add r7, r0, #0
mov r0, #5
mov r1, #8
- bl FUN_02016998
+ bl AllocFromHeap
add r4, r0, #0
str r5, [r4]
mov r0, #0x3c
@@ -68765,7 +68765,7 @@ MOD11_0224ED98: ; 0x0224ED98 add r7, r0, #0
mov r0, #5
mov r1, #8
- bl FUN_02016998
+ bl AllocFromHeap
add r4, r0, #0
str r5, [r4]
mov r0, #0x3d
@@ -69395,7 +69395,7 @@ _0224F2C2: ldr r0, [r4]
bl MOD11_022567B8
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
add r0, r6, #0
bl FUN_0200CAB4
_0224F2D8:
@@ -69986,7 +69986,7 @@ _0224F7A2: ldr r0, [r4]
bl MOD11_022567B8
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
add r0, r5, #0
bl FUN_0200CAB4
_0224F7C0:
@@ -70682,7 +70682,7 @@ _0224FD68: ldr r0, [r4]
bl MOD11_022567B8
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
add r0, r6, #0
bl FUN_0200CAB4
_0224FD86:
@@ -70975,7 +70975,7 @@ _0224FFC0: ldr r0, [r4]
bl MOD11_022567B8
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
add r0, r6, #0
bl FUN_0200CAB4
_0224FFDE:
@@ -71035,7 +71035,7 @@ _02250048: ldr r0, [r4]
bl MOD11_022567B8
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
add r0, r5, #0
bl FUN_0200CAB4
_0225005E:
@@ -71359,7 +71359,7 @@ _022502CA: ldr r0, [r4]
bl MOD11_022567B8
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
add r0, r6, #0
bl FUN_0200CAB4
add sp, #4
@@ -72038,7 +72038,7 @@ _02250874: ldr r0, [r4]
bl MOD11_022567B8
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
add r0, r5, #0
bl FUN_0200CAB4
_0225088A:
@@ -72112,7 +72112,7 @@ _02250906: ldr r0, [r4]
bl MOD11_022567B8
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
add r0, r5, #0
bl FUN_0200CAB4
_0225092A:
@@ -72177,7 +72177,7 @@ _0225099A: ldr r0, [r4]
bl MOD11_022567B8
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
add r0, r5, #0
bl FUN_0200CAB4
_022509B0:
@@ -72860,7 +72860,7 @@ _02250F14: ldr r0, [r4]
bl MOD11_022567B8
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
ldr r0, [sp]
bl FUN_0200CAB4
_02250F3E:
@@ -72885,7 +72885,7 @@ MOD11_02250F44: ; 0x02250F44 ldr r0, [r4]
bl MOD11_022567B8
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
add r0, r5, #0
bl FUN_0200CAB4
pop {r3, r4, r5, pc}
@@ -72900,7 +72900,7 @@ MOD11_02250F74: ; 0x02250F74 ldr r0, [r4]
bl MOD11_022567B8
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
add r0, r5, #0
bl FUN_0200CAB4
pop {r3, r4, r5, pc}
@@ -72953,7 +72953,7 @@ _02250FF2: ldr r0, [r4]
bl MOD11_022567B8
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
add r0, r6, #0
bl FUN_0200CAB4
pop {r4, r5, r6, pc}
@@ -72975,7 +72975,7 @@ MOD11_02251014: ; 0x02251014 ldr r0, [r4]
bl MOD11_022567B8
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
add r0, r5, #0
bl FUN_0200CAB4
pop {r3, r4, r5, pc}
@@ -73157,7 +73157,7 @@ _0225118E: ldr r0, [r4]
bl MOD11_022567B8
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
add r0, r6, #0
bl FUN_0200CAB4
_022511B6:
@@ -73256,7 +73256,7 @@ _0225126C: ldr r0, [r6]
bl MOD11_022567B8
add r0, r6, #0
- bl FUN_02016A18
+ bl FreeToHeap
ldr r0, [sp, #8]
bl FUN_0200CAB4
_0225128C:
@@ -73275,7 +73275,7 @@ MOD11_02251294: ; 0x02251294 ldr r0, [r4]
bl MOD11_022567B8
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
add r0, r5, #0
bl FUN_0200CAB4
pop {r3, r4, r5, pc}
@@ -73450,7 +73450,7 @@ _022513F8: ldr r0, [r4]
bl MOD11_022567B8
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
ldr r0, [sp]
bl FUN_0200CAB4
_02251418:
@@ -73485,7 +73485,7 @@ _02251442: ldr r0, [r5]
bl MOD11_022567B8
add r0, r5, #0
- bl FUN_02016A18
+ bl FreeToHeap
add r0, r6, #0
bl FUN_0200CAB4
pop {r4, r5, r6, pc}
@@ -73500,7 +73500,7 @@ MOD11_02251464: ; 0x02251464 ldr r0, [r4]
bl MOD11_022567B8
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
add r0, r5, #0
bl FUN_0200CAB4
pop {r3, r4, r5, pc}
@@ -73605,7 +73605,7 @@ _02251540: bl MOD11_0222D7F8
mov r0, #5
mov r1, #0x34
- bl FUN_02016998
+ bl AllocFromHeap
str r0, [r4, #4]
ldr r1, [r4]
str r1, [r0]
@@ -74230,16 +74230,16 @@ _02251A08: ldr r0, [r4, #8]
ldr r0, [r0, #4]
ldr r0, [r0]
- bl FUN_02016A18
+ bl FreeToHeap
ldr r0, [r4, #8]
ldr r0, [r0, #4]
- bl FUN_02016A18
+ bl FreeToHeap
ldr r0, [r4, #8]
- bl FUN_02016A18
+ bl FreeToHeap
ldr r0, [r4, #4]
- bl FUN_02016A18
+ bl FreeToHeap
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
add r0, r7, #0
bl FUN_0200CAB4
add sp, #0x1fc
@@ -74978,14 +74978,14 @@ MOD11_02252018: ; 0x02252018 ldr r0, [r4, #8]
ldr r0, [r0, #4]
ldr r0, [r0]
- bl FUN_02016A18
+ bl FreeToHeap
ldr r0, [r4, #8]
ldr r0, [r0, #4]
- bl FUN_02016A18
+ bl FreeToHeap
ldr r0, [r4, #8]
- bl FUN_02016A18
+ bl FreeToHeap
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
add r0, r5, #0
bl FUN_0200CAB4
add sp, #4
@@ -75004,14 +75004,14 @@ MOD11_02252070: ; 0x02252070 ldr r0, [r4, #8]
ldr r0, [r0, #4]
ldr r0, [r0]
- bl FUN_02016A18
+ bl FreeToHeap
ldr r0, [r4, #8]
ldr r0, [r0, #4]
- bl FUN_02016A18
+ bl FreeToHeap
ldr r0, [r4, #8]
- bl FUN_02016A18
+ bl FreeToHeap
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
add r0, r5, #0
bl FUN_0200CAB4
pop {r3, r4, r5, pc}
@@ -75096,7 +75096,7 @@ _02252146: bl MOD11_0222D7F8
mov r0, #5
mov r1, #0x38
- bl FUN_02016998
+ bl AllocFromHeap
str r0, [r4, #4]
mov r0, #5
bl FUN_0206B8AC
@@ -75147,7 +75147,7 @@ _022521AE: cmp r5, #6
blt _022521AE
add r0, r6, #0
- bl FUN_02016A18
+ bl FreeToHeap
ldr r0, [r4]
ldr r1, [sp, #0x18]
mov r7, #0
@@ -75460,11 +75460,11 @@ _02252444: bl MOD11_022567B8
ldr r0, [r4, #4]
ldr r0, [r0]
- bl FUN_02016A18
+ bl FreeToHeap
ldr r0, [r4, #4]
- bl FUN_02016A18
+ bl FreeToHeap
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
add r0, r6, #0
bl FUN_0200CAB4
_02252468:
@@ -75552,7 +75552,7 @@ _022524FE: ldr r0, [r5]
bl MOD11_022567B8
add r0, r5, #0
- bl FUN_02016A18
+ bl FreeToHeap
ldr r0, [sp]
bl FUN_0200CAB4
add sp, #0xc
@@ -75569,7 +75569,7 @@ MOD11_02252524: ; 0x02252524 ldr r0, [r4]
bl MOD11_022567B8
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
add r0, r5, #0
bl FUN_0200CAB4
pop {r3, r4, r5, pc}
@@ -75792,7 +75792,7 @@ _022526E0: ldr r0, [r4]
bl MOD11_022567B8
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
add r0, r7, #0
bl FUN_0200CAB4
_0225270A:
@@ -75811,7 +75811,7 @@ MOD11_02252714: ; 0x02252714 ldr r0, [r4]
bl MOD11_022567B8
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
add r0, r5, #0
bl FUN_0200CAB4
pop {r3, r4, r5, pc}
@@ -75827,7 +75827,7 @@ MOD11_02252734: ; 0x02252734 ldr r0, [r4]
bl MOD11_022567B8
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
add r0, r5, #0
bl FUN_0200CAB4
pop {r3, r4, r5, pc}
@@ -76106,7 +76106,7 @@ _02252974: ldr r0, [r4]
bl MOD11_022567B8
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
add r0, r5, #0
bl FUN_0200CAB4
add sp, #0x1fc
@@ -76173,7 +76173,7 @@ _022529FA: mov r2, #0x17
bl MOD11_022567B8
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
add r0, r5, #0
bl FUN_0200CAB4
pop {r3, r4, r5, pc}
@@ -76631,7 +76631,7 @@ _02252D8C: ldr r0, [r4]
bl MOD11_022567B8
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
add r0, r6, #0
bl FUN_0200CAB4
_02252DAA:
@@ -76704,7 +76704,7 @@ _02252E30: ldr r0, [r5]
bl MOD11_022567B8
add r0, r5, #0
- bl FUN_02016A18
+ bl FreeToHeap
add r0, r6, #0
bl FUN_0200CAB4
_02252E46:
@@ -76887,7 +76887,7 @@ _02252F98: ldr r0, [r4]
bl MOD11_022567B8
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
add r0, r6, #0
bl FUN_0200CAB4
_02252FB6:
@@ -76925,7 +76925,7 @@ _02252FE4: ldr r0, [r4]
bl MOD11_022567B8
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
add r0, r5, #0
bl FUN_0200CAB4
_02253000:
@@ -76958,7 +76958,7 @@ _0225302A: ldr r0, [r4]
bl MOD11_022567B8
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
add r0, r5, #0
bl FUN_0200CAB4
_0225304A:
@@ -77001,7 +77001,7 @@ _02253074: ldr r0, [r4]
bl MOD11_022567B8
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
add r0, r5, #0
bl FUN_0200CAB4
_0225309E:
@@ -77270,7 +77270,7 @@ _022532C8: mov r1, #0
bl FUN_020143A8
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
ldr r0, [sp, #0xc]
bl FUN_0200CAB4
add sp, #0x18
@@ -77439,7 +77439,7 @@ _02253440: bl MOD11_0222D7F8
mov r0, #5
mov r1, #0x38
- bl FUN_02016998
+ bl AllocFromHeap
str r0, [r4, #4]
ldrb r1, [r4, #9]
ldr r0, [r4]
@@ -77531,9 +77531,9 @@ _02253508: ldr r0, [r4]
bl MOD11_022567B8
ldr r0, [r4, #4]
- bl FUN_02016A18
+ bl FreeToHeap
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
add r0, r5, #0
bl FUN_0200CAB4
_02253524:
@@ -77595,7 +77595,7 @@ _02253582: ldr r0, [r5]
bl MOD11_022567B8
add r0, r5, #0
- bl FUN_02016A18
+ bl FreeToHeap
add r0, r4, #0
bl FUN_0200CAB4
_02253598:
@@ -77689,7 +77689,7 @@ _02253636: ldr r0, [r5]
bl MOD11_022567B8
add r0, r5, #0
- bl FUN_02016A18
+ bl FreeToHeap
add r0, r6, #0
bl FUN_0200CAB4
_0225364C:
@@ -77757,7 +77757,7 @@ _022536BA: ldr r0, [r5]
bl MOD11_022567B8
add r0, r5, #0
- bl FUN_02016A18
+ bl FreeToHeap
add r0, r7, #0
bl FUN_0200CAB4
_022536D0:
@@ -77796,7 +77796,7 @@ _02253706: ldr r0, [r4]
bl MOD11_022567B8
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
add r0, r5, #0
bl FUN_0200CAB4
pop {r3, r4, r5, pc}
@@ -77841,7 +77841,7 @@ _0225374E: ldr r0, [r4]
bl MOD11_022567B8
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
add r0, r5, #0
bl FUN_0200CAB4
pop {r3, r4, r5, pc}
@@ -86000,7 +86000,7 @@ _02257670: add r4, r0, #0
mov r0, #5
mov r1, #0x80
- bl FUN_02016998
+ bl AllocFromHeap
add r7, r0, #0
ldr r0, [sp]
ldr r0, [r0, #4]
@@ -86097,7 +86097,7 @@ _022576DA: ldrh r2, [r3, r2]
bl MIi_CpuCopy16
add r0, r7, #0
- bl FUN_02016A18
+ bl FreeToHeap
add sp, #8
pop {r3, r4, r5, r6, r7, pc}
.align 2, 0
@@ -86113,11 +86113,11 @@ MOD11_0225775C: ; 0x0225775C str r0, [sp, #4]
mov r0, #5
mov r1, #0x60
- bl FUN_02016998
+ bl AllocFromHeap
add r4, r0, #0
mov r0, #5
mov r1, #0xc0
- bl FUN_02016998
+ bl AllocFromHeap
add r7, r0, #0
add r0, r4, #0
mov r1, #0xff
@@ -86228,9 +86228,9 @@ _022577F2: ldrh r2, [r3, r2]
bl MIi_CpuCopy16
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
add r0, r7, #0
- bl FUN_02016A18
+ bl FreeToHeap
add sp, #0xc
pop {r4, r5, r6, r7, pc}
nop
@@ -86246,7 +86246,7 @@ MOD11_0225787C: ; 0x0225787C add r6, r1, #0
mov r0, #5
mov r1, #0x60
- bl FUN_02016998
+ bl AllocFromHeap
mov r1, #0xff
mov r2, #0x60
add r4, r0, #0
@@ -86292,7 +86292,7 @@ MOD11_0225787C: ; 0x0225787C add r0, r4, r0
bl MIi_CpuCopy16
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
pop {r3, r4, r5, r6, r7, pc}
nop
_022578F8: .word 0x0225EA58
@@ -86306,7 +86306,7 @@ MOD11_02257908: ; 0x02257908 add r5, r0, #0
mov r0, #5
mov r1, #0x60
- bl FUN_02016998
+ bl AllocFromHeap
mov r1, #0xff
mov r2, #0x60
add r4, r0, #0
@@ -86337,7 +86337,7 @@ MOD11_02257908: ; 0x02257908 ldrh r2, [r3, r2]
bl MIi_CpuCopy16
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
pop {r3, r4, r5, pc}
.align 2, 0
_02257960: .word 0x0225E9F8
@@ -87277,7 +87277,7 @@ MOD11_0225805C: ; 0x0225805C strb r0, [r6]
mov r0, #5
mov r1, #0xc
- bl FUN_02016998
+ bl AllocFromHeap
mov r1, #0
mov r2, #0xc
add r4, r0, #0
@@ -87400,7 +87400,7 @@ _0225814A: mov r1, #1
strb r1, [r0]
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
add r0, r7, #0
bl FUN_0200CAB4
add sp, #8
@@ -87758,7 +87758,7 @@ MOD11_02258428: ; 0x02258428 mov r1, #7
mov r0, #5
lsl r1, r1, #8
- bl FUN_02016998
+ bl AllocFromHeap
mov r2, #7
mov r1, #0
lsl r2, r2, #8
@@ -87871,7 +87871,7 @@ MOD11_022584D4: ; 0x022584D4 _02258512:
mov r0, #5
add r1, r7, #0
- bl FUN_02016998
+ bl AllocFromHeap
lsl r1, r4, #2
add r1, r6, r1
str r0, [r1, #0x3c]
@@ -87893,7 +87893,7 @@ _02258512: add r0, #0xc
bl MIi_CpuCopy32
add r0, r5, #0
- bl FUN_02016A18
+ bl FreeToHeap
add r4, r4, #1
_0225854E:
cmp r4, #7
@@ -87901,7 +87901,7 @@ _0225854E: mov r1, #2
mov r0, #5
lsl r1, r1, #8
- bl FUN_02016998
+ bl AllocFromHeap
str r0, [r6, #0x58]
mov r0, #1
str r0, [sp]
@@ -87954,7 +87954,7 @@ _022585BC: bl FUN_020799E8
add r1, r0, #0
mov r0, #5
- bl FUN_02016998
+ bl AllocFromHeap
lsl r1, r5, #2
add r1, r4, r1
add r1, #0x80
@@ -87972,11 +87972,11 @@ _022585DE: blt _022585AE
mov r0, #5
mov r1, #0x20
- bl FUN_02016998
+ bl AllocFromHeap
str r0, [r6, #0x5c]
mov r0, #5
mov r1, #0x20
- bl FUN_02016998
+ bl AllocFromHeap
str r0, [r6, #0x60]
ldr r1, [r6, #0x5c]
ldr r0, [r6, #0x58]
@@ -87994,7 +87994,7 @@ _022585DE: mov r2, #0x20
bl MIi_CpuCopy16
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
bl FUN_02002BE4
bl FUN_02002C04
ldr r0, _02258650 ; =MOD11_0225B824
@@ -88033,23 +88033,23 @@ MOD11_02258658: ; 0x02258658 add r5, r6, #0
_02258680:
ldr r0, [r5, #0x3c]
- bl FUN_02016A18
+ bl FreeToHeap
add r4, r4, #1
add r5, r5, #4
cmp r4, #7
blt _02258680
ldr r0, [r6, #0x58]
- bl FUN_02016A18
+ bl FreeToHeap
add r0, r6, #0
bl MOD11_0225A6B0
ldr r0, [r6, #0x5c]
- bl FUN_02016A18
+ bl FreeToHeap
ldr r0, [r6, #0x60]
- bl FUN_02016A18
+ bl FreeToHeap
ldr r0, [r6, #0x64]
bl FUN_0200CAB4
add r0, r6, #0
- bl FUN_02016A18
+ bl FreeToHeap
pop {r4, r5, r6, pc}
.align 2, 0
_022586B4: .word 0x000004C8
@@ -89441,7 +89441,7 @@ MOD11_0225916C: ; 0x0225916C str r0, [r1]
mov r0, #5
mov r1, #0x14
- bl FUN_02016998
+ bl AllocFromHeap
add r4, r0, #0
mov r1, #0
mov r2, #0x14
@@ -91973,7 +91973,7 @@ _0225A6E4: ldr r0, [sp, #4]
add r0, #0x80
ldr r0, [r0]
- bl FUN_02016A18
+ bl FreeToHeap
add r0, r4, #0
add r0, #0x9c
ldr r0, [r0]
@@ -92111,7 +92111,7 @@ _0225A7CE: ldr r2, [sp, #0xc]
bl MIi_CpuCopy32
ldr r0, [sp, #0x44]
- bl FUN_02016A18
+ bl FreeToHeap
_0225A814:
ldr r0, [r6, #0x34]
cmp r0, #0
@@ -93783,7 +93783,7 @@ _0225B4D6: ldr r0, [r0]
bl MOD11_022312AC
add r0, r5, #0
- bl FUN_02016A18
+ bl FreeToHeap
add r0, r6, #0
bl FUN_0200CAB4
_0225B526:
@@ -96547,7 +96547,7 @@ MOD11_0225C9D4: ; 0x0225C9D4 push {r4, lr}
mov r0, #5
lsl r1, r0, #6
- bl FUN_02016998
+ bl AllocFromHeap
mov r2, #5
mov r1, #0
lsl r2, r2, #6
@@ -96567,7 +96567,7 @@ MOD11_0225C9F0: ; 0x0225C9F0 bl ErrorHandling
_0225C9FE:
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
pop {r4, pc}
.align 2, 0
@@ -97996,7 +97996,7 @@ _0225D496: ldr r0, [sp, #0x60]
str r0, [sp, #0x30]
mov r0, ip
- bl FUN_02016998
+ bl AllocFromHeap
mov r1, #0
mov r2, #0x18
str r0, [sp]
@@ -98044,7 +98044,7 @@ _0225D510: ldr r0, [r6, #0x14]
bl FUN_0200CAB4
add r0, r6, #0
- bl FUN_02016A18
+ bl FreeToHeap
pop {r4, r5, r6, pc}
thumb_func_start MOD11_0225D52C
@@ -98347,7 +98347,7 @@ _0225D74C: ldr r0, [sp, #0x60]
str r0, [sp, #0x30]
add r0, r2, #0
- bl FUN_02016998
+ bl AllocFromHeap
mov r1, #0
mov r2, #0x20
add r4, r0, #0
@@ -98384,7 +98384,7 @@ MOD11_0225D7B8: ; 0x0225D7B8 ldr r0, [r4, #4]
bl FUN_0200CAB4
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
pop {r4, pc}
thumb_func_start MOD11_0225D7D0
diff --git a/arm9/modules/12/asm/module_12.s b/arm9/modules/12/asm/module_12.s index 5d3d5f87..09561820 100644 --- a/arm9/modules/12/asm/module_12.s +++ b/arm9/modules/12/asm/module_12.s @@ -508,7 +508,7 @@ MOD12_0222D9B0: ; 0x0222D9B0 ldr r0, [r4, #0x50] bl FUN_0200A8B8 ldr r0, [r4, #0x30] - bl FUN_02016A18 + bl FreeToHeap ldr r0, [r4, #4] bl FUN_0200CAB4 ldr r0, [r4, #8] @@ -1167,11 +1167,11 @@ MOD12_0222DFC4: ; 0x0222DFC4 bl FUN_020030E8 mov r0, #0x15 mov r1, #0x20 - bl FUN_02016998 + bl AllocFromHeap add r7, r0, #0 mov r0, #0x15 mov r1, #0x20 - bl FUN_02016998 + bl AllocFromHeap str r0, [sp, #0x10] ldr r0, [r5, #0x5c] mov r1, #0 @@ -1229,9 +1229,9 @@ MOD12_0222DFC4: ; 0x0222DFC4 mov r2, #0x20 bl MIi_CpuCopy16 add r0, r7, #0 - bl FUN_02016A18 + bl FreeToHeap ldr r0, [sp, #0x10] - bl FUN_02016A18 + bl FreeToHeap add sp, #0x18 pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -3673,7 +3673,7 @@ _0222F3AE: ldr r0, [r4, #0x44] bl FUN_0200A8B8 ldr r0, [r4, #0x30] - bl FUN_02016A18 + bl FreeToHeap ldr r0, [r4, #4] bl FUN_0200CAB4 ldr r0, [r4, #8] @@ -5085,7 +5085,7 @@ MOD12_0222FE4C: ; 0x0222FE4C mov r1, #2 mov r0, #0x17 lsl r1, r1, #8 - bl FUN_02016998 + bl AllocFromHeap ldr r1, _022300F0 ; =0x0000110C str r0, [r5, r1] add r0, r5, #0 @@ -5479,7 +5479,7 @@ _02230296: bl FUN_02002CF8 ldr r0, _022303B4 ; =0x0000110C ldr r0, [r4, r0] - bl FUN_02016A18 + bl FreeToHeap add r0, r4, #0 add r0, #0xa4 ldr r0, [r0] @@ -5517,7 +5517,7 @@ _02230296: ldr r0, [r0] bl FUN_0200A8B8 ldr r0, [r4, #0x74] - bl FUN_02016A18 + bl FreeToHeap ldr r0, [r4, #4] bl FUN_0200CAB4 ldr r0, [r4, #0x10] @@ -6297,7 +6297,7 @@ _022309E8: mov r1, #0x12 mov r0, #0x17 lsl r1, r1, #0xa - bl FUN_02016998 + bl AllocFromHeap add r2, r0, #0 mov r0, #1 str r0, [sp] @@ -6341,7 +6341,7 @@ MOD12_02230A40: ; 0x02230A40 ldr r0, [r4, #0xc] bl FUN_02012DE4 add r0, r5, #0 - bl FUN_02016A18 + bl FreeToHeap mov r0, #0 str r0, [r4, #0xc] pop {r3, r4, r5, pc} @@ -7730,7 +7730,7 @@ _022314E0: cmp r6, #4 blt _022314E0 add r0, r7, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r3, r4, r5, r6, r7, pc} nop _02231504: .word 0x00000122 @@ -8214,7 +8214,7 @@ MOD12_022318A4: ; 0x022318A4 mov r1, #0x14 add r6, r2, #0 add r7, r3, #0 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 mov r1, #0 mov r2, #0x14 @@ -8246,7 +8246,7 @@ _022318EA: ldr r0, [r4] bl FUN_0200CAB4 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} thumb_func_start MOD12_022318F8 @@ -8325,7 +8325,7 @@ MOD12_0223197C: ; 0x0223197C mov r1, #0x32 mov r0, #0x15 lsl r1, r1, #4 - bl FUN_02016998 + bl AllocFromHeap mov r2, #0x32 mov r1, #0 lsl r2, r2, #4 @@ -8428,7 +8428,7 @@ MOD12_02231A24: ; 0x02231A24 _02231A4C: mov r0, #0x15 add r1, r7, #0 - bl FUN_02016998 + bl AllocFromHeap lsl r1, r5, #2 add r1, r4, r1 str r0, [r1, #0x20] @@ -8450,7 +8450,7 @@ _02231A4C: add r0, #0xc bl MIi_CpuCopy32 add r0, r6, #0 - bl FUN_02016A18 + bl FreeToHeap add r5, r5, #1 _02231A88: cmp r5, #5 @@ -8464,7 +8464,7 @@ _02231A88: _02231A98: mov r0, #0x15 add r1, r7, #0 - bl FUN_02016998 + bl AllocFromHeap lsl r1, r5, #2 add r1, r4, r1 str r0, [r1, #0x34] @@ -8522,7 +8522,7 @@ MOD12_02231AE8: ; 0x02231AE8 add r5, r6, #0 _02231B16: ldr r0, [r5, #0x20] - bl FUN_02016A18 + bl FreeToHeap add r4, r4, #1 add r5, r5, #4 cmp r4, #5 @@ -8531,7 +8531,7 @@ _02231B16: add r4, r6, #0 _02231B28: ldr r0, [r4, #0x34] - bl FUN_02016A18 + bl FreeToHeap add r5, r5, #1 add r4, r4, #4 cmp r5, #2 @@ -8539,7 +8539,7 @@ _02231B28: add r0, r6, #0 bl MOD12_02232B7C add r0, r6, #0 - bl FUN_02016A18 + bl FreeToHeap add sp, #4 pop {r3, r4, r5, r6, pc} nop @@ -11742,7 +11742,7 @@ MOD12_0223336C: ; 0x0223336C mov r0, #0xb6 lsl r0, r0, #2 ldr r0, [r4, r0] - bl FUN_02016A18 + bl FreeToHeap mov r0, #0xb6 mov r1, #0 lsl r0, r0, #2 @@ -12055,7 +12055,7 @@ MOD12_022335E4: ; 0x022335E4 add r6, r1, #0 mov r0, #0x15 mov r1, #0xc - bl FUN_02016998 + bl AllocFromHeap mov r1, #0 mov r2, #0xc add r4, r0, #0 @@ -12086,7 +12086,7 @@ _0223362A: ldr r0, [r4, #4] bl FUN_0200CAB4 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} thumb_func_start MOD12_02233638 @@ -12261,7 +12261,7 @@ _0223377C: mov r1, #0x32 mov r0, #0x15 lsl r1, r1, #6 - bl FUN_02016998 + bl AllocFromHeap str r0, [r7, #0x58] ldr r0, [sp, #0x18] ldr r2, [sp, #0x14] @@ -12327,7 +12327,7 @@ _0223380C: mov r1, #0x32 mov r0, #0x15 lsl r1, r1, #6 - bl FUN_02016998 + bl AllocFromHeap ldr r1, [sp, #0x14] mov r2, #0x32 add r1, #0x98 @@ -12364,7 +12364,7 @@ _02233854: ldr r0, [r4, #8] bl FUN_02007534 ldr r0, [r5, #0x58] - bl FUN_02016A18 + bl FreeToHeap str r7, [r5, #0x58] add r6, r6, #1 add r4, r4, #4 @@ -12374,7 +12374,7 @@ _02233854: ldr r0, [sp] add r0, #0x98 ldr r0, [r0] - bl FUN_02016A18 + bl FreeToHeap ldr r0, [sp] mov r1, #0 add r0, #0x98 @@ -12911,7 +12911,7 @@ MOD12_02233C94: ; 0x02233C94 mov r1, #0x28 add r6, r2, #0 add r7, r3, #0 - bl FUN_02016998 + bl AllocFromHeap mov r1, #0 mov r2, #0x28 add r4, r0, #0 @@ -13094,7 +13094,7 @@ _02233E0A: mov r1, #1 strb r1, [r0] add r0, r2, #0 - bl FUN_02016A18 + bl FreeToHeap add r0, r4, #0 bl FUN_0200CAB4 pop {r4, pc} @@ -13202,7 +13202,7 @@ _02233ED8: mov r1, #1 strb r1, [r0] add r0, r2, #0 - bl FUN_02016A18 + bl FreeToHeap add r0, r4, #0 bl FUN_0200CAB4 pop {r4, pc} @@ -13553,7 +13553,7 @@ MOD12_0223419C: ; 0x0223419C add r5, r0, #0 mov r0, #0x15 mov r1, #0x10 - bl FUN_02016998 + bl AllocFromHeap mov r1, #0 mov r2, #0x10 add r4, r0, #0 @@ -13660,7 +13660,7 @@ _0223428A: mov r1, #0 bl FUN_0200C840 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap add r0, r5, #0 bl FUN_0200CAB4 _0223429E: @@ -14072,7 +14072,7 @@ _022345AC: lsl r0, r0, #4 bl FUN_020054C8 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap add r0, r5, #0 bl FUN_0200CAB4 pop {r3, r4, r5, pc} @@ -14195,7 +14195,7 @@ _02234672: bl FUN_0200C644 mov r0, #0x15 mov r1, #0x34 - bl FUN_02016998 + bl AllocFromHeap mov r1, #0 mov r2, #0x34 add r4, r0, #0 @@ -14399,7 +14399,7 @@ MOD12_0223483C: ; 0x0223483C strb r0, [r7] mov r0, #0x15 mov r1, #0x10 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 mov r1, #0 mov r2, #0x10 @@ -14586,7 +14586,7 @@ _022349B8: mov r1, #1 strb r1, [r0] add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap add r0, r5, #0 bl FUN_0200CAB4 _022349CE: @@ -15757,7 +15757,7 @@ MOD12_022352F4: ; 0x022352F4 mov r1, #0x14 add r7, r2, #0 str r3, [sp] - bl FUN_02016998 + bl AllocFromHeap mov r1, #0 mov r2, #0x14 add r4, r0, #0 @@ -15930,7 +15930,7 @@ _02235452: mov r1, #1 strb r1, [r0] add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap add r0, r5, #0 bl FUN_0200CAB4 _02235464: @@ -16066,7 +16066,7 @@ _02235550: _02235576: mov r0, #0x15 mov r1, #0x28 - bl FUN_02016998 + bl AllocFromHeap mov r1, #0 mov r2, #0x28 add r4, r0, #0 @@ -16328,7 +16328,7 @@ _02235778: sub r0, r0, #1 strb r0, [r1] add r0, r5, #0 - bl FUN_02016A18 + bl FreeToHeap add r0, r4, #0 bl FUN_0200CAB4 add sp, #0x10 @@ -16345,7 +16345,7 @@ MOD12_022357B0: ; 0x022357B0 add r6, r1, #0 mov r0, #0x15 mov r1, #0xc - bl FUN_02016998 + bl AllocFromHeap mov r1, #0 mov r2, #0xc add r4, r0, #0 @@ -16370,7 +16370,7 @@ MOD12_022357E4: ; 0x022357E4 ldr r0, [r4, #4] bl FUN_0200CAB4 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} .align 2, 0 @@ -16427,7 +16427,7 @@ _02235846: beq _02235890 mov r0, #0x15 mov r1, #0x28 - bl FUN_02016998 + bl AllocFromHeap mov r1, #0 mov r2, #0x28 add r4, r0, #0 @@ -16695,7 +16695,7 @@ _02235A5E: sub r0, r0, #1 strb r0, [r1] add r0, r5, #0 - bl FUN_02016A18 + bl FreeToHeap add r0, r4, #0 bl FUN_0200CAB4 _02235A80: @@ -17253,7 +17253,7 @@ MOD12_02235E3C: ; 0x02235E3C mov r0, #0x15 mov r1, #0x10 add r5, r2, #0 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 mov r1, #0 mov r2, #0x10 @@ -17337,7 +17337,7 @@ _02235EDA: add r3, r2, #0 bl MOD12_02240FB0 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap add r0, r5, #0 bl FUN_0200CAB4 _02235EF8: @@ -17366,7 +17366,7 @@ MOD12_02235F14: ; 0x02235F14 mov r1, #0x1c add r5, r2, #0 add r6, r3, #0 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 mov r1, #0 mov r2, #0x1c @@ -17503,7 +17503,7 @@ _0223601A: add r3, r2, #0 bl MOD12_02240FB0 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap add r0, r5, #0 bl FUN_0200CAB4 _02236038: @@ -17534,7 +17534,7 @@ MOD12_02236058: ; 0x02236058 mov r1, #0x1c add r5, r2, #0 add r7, r3, #0 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 mov r1, #0 mov r2, #0x1c @@ -17731,7 +17731,7 @@ _022361DA: add r3, r2, #0 bl MOD12_02240FB0 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap add r0, r6, #0 bl FUN_0200CAB4 _022361FE: @@ -17764,7 +17764,7 @@ MOD12_02236228: ; 0x02236228 mov r1, #0x1c add r5, r2, #0 add r7, r3, #0 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 mov r1, #0 mov r2, #0x1c @@ -17906,7 +17906,7 @@ _02236342: add r3, r2, #0 bl MOD12_02240FB0 add r0, r5, #0 - bl FUN_02016A18 + bl FreeToHeap add r0, r7, #0 bl FUN_0200CAB4 pop {r3, r4, r5, r6, r7, pc} @@ -17937,7 +17937,7 @@ MOD12_02236388: ; 0x02236388 mov r1, #0x1c add r6, r2, #0 add r5, r3, #0 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 mov r1, #0 mov r2, #0x1c @@ -18135,7 +18135,7 @@ _02236502: add r3, r2, #0 bl MOD12_02240FB0 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap add r0, r5, #0 bl FUN_0200CAB4 _02236520: @@ -18167,7 +18167,7 @@ MOD12_02236540: ; 0x02236540 lsl r1, r1, #2 add r6, r2, #0 add r5, r3, #0 - bl FUN_02016998 + bl AllocFromHeap mov r2, #0x49 add r4, r0, #0 mov r1, #0 @@ -18833,7 +18833,7 @@ _02236A70: add r3, r2, #0 bl MOD12_02240FB0 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap add r0, r6, #0 bl FUN_0200CAB4 _02236A8E: @@ -18865,7 +18865,7 @@ MOD12_02236AB8: ; 0x02236AB8 mov r0, #0x15 mov r1, #0x14 add r5, r2, #0 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 mov r1, #0 mov r2, #0x14 @@ -19134,7 +19134,7 @@ _02236CB4: add r3, r1, #0 bl MOD12_02231B4C add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap add r0, r5, #0 bl FUN_0200CAB4 _02236CE4: @@ -19208,7 +19208,7 @@ MOD12_02236D50: ; 0x02236D50 add r1, #0xff add r6, r2, #0 add r5, r3, #0 - bl FUN_02016998 + bl AllocFromHeap mov r2, #0x45 add r4, r0, #0 mov r1, #0 @@ -19339,7 +19339,7 @@ _02236E48: add r3, r2, #0 bl MOD12_02240FB0 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap add r0, r5, #0 bl FUN_0200CAB4 _02236E66: @@ -19368,7 +19368,7 @@ MOD12_02236E80: ; 0x02236E80 add r1, #0xff add r6, r2, #0 add r5, r3, #0 - bl FUN_02016998 + bl AllocFromHeap mov r2, #0x45 add r4, r0, #0 mov r1, #0 @@ -19690,7 +19690,7 @@ _022370D4: add r3, r2, #0 bl MOD12_02240FB0 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap ldr r0, [sp, #4] bl FUN_0200CAB4 _022370F2: @@ -19724,7 +19724,7 @@ MOD12_0223711C: ; 0x0223711C add r1, #0xff add r6, r2, #0 add r5, r3, #0 - bl FUN_02016998 + bl AllocFromHeap mov r2, #0x45 add r4, r0, #0 mov r1, #0 @@ -19886,7 +19886,7 @@ _0223724C: add r3, r2, #0 bl MOD12_02240FB0 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap add r0, r5, #0 bl FUN_0200CAB4 _0223726A: @@ -19915,7 +19915,7 @@ MOD12_02237284: ; 0x02237284 add r1, #0xff add r6, r2, #0 add r5, r3, #0 - bl FUN_02016998 + bl AllocFromHeap mov r2, #0x45 add r4, r0, #0 mov r1, #0 @@ -20412,7 +20412,7 @@ _02237624: add r3, r2, #0 bl MOD12_02240FB0 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap add r0, r6, #0 bl FUN_0200CAB4 _02237648: @@ -20446,7 +20446,7 @@ MOD12_02237670: ; 0x02237670 add r1, #0xff add r6, r2, #0 add r5, r3, #0 - bl FUN_02016998 + bl AllocFromHeap mov r2, #0x45 add r4, r0, #0 mov r1, #0 @@ -20609,7 +20609,7 @@ _022377A0: add r3, r2, #0 bl MOD12_02240FB0 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap add r0, r5, #0 bl FUN_0200CAB4 _022377BE: @@ -20638,7 +20638,7 @@ MOD12_022377D8: ; 0x022377D8 add r1, #0xf7 add r5, r2, #0 add r6, r3, #0 - bl FUN_02016998 + bl AllocFromHeap mov r2, #0x43 add r4, r0, #0 mov r1, #0 @@ -20992,7 +20992,7 @@ _02237A6A: add r3, r2, #0 bl MOD12_02240FB0 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap ldr r0, [sp, #4] bl FUN_0200CAB4 _02237A88: @@ -21029,7 +21029,7 @@ MOD12_02237ABC: ; 0x02237ABC add r1, #0xff add r6, r2, #0 add r5, r3, #0 - bl FUN_02016998 + bl AllocFromHeap mov r2, #0x45 add r4, r0, #0 mov r1, #0 @@ -21262,7 +21262,7 @@ _02237C6E: add r3, r2, #0 bl MOD12_02240FB0 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap add r0, r5, #0 bl FUN_0200CAB4 _02237C8C: @@ -21292,7 +21292,7 @@ MOD12_02237CA8: ; 0x02237CA8 add r1, #0xff add r5, r2, #0 add r6, r3, #0 - bl FUN_02016998 + bl AllocFromHeap mov r2, #0x45 add r4, r0, #0 mov r1, #0 @@ -21393,7 +21393,7 @@ _02237D70: add r3, r2, #0 bl MOD12_02240FB0 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap add r0, r5, #0 bl FUN_0200CAB4 _02237D8E: @@ -21421,7 +21421,7 @@ MOD12_02237DA8: ; 0x02237DA8 mov r0, #0x15 mov r1, #0x28 add r5, r2, #0 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 mov r1, #0 mov r2, #0x28 @@ -21569,7 +21569,7 @@ _02237EC2: add r3, r2, #0 bl MOD12_02240FB0 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap add r0, r5, #0 bl FUN_0200CAB4 _02237EE4: @@ -21646,7 +21646,7 @@ MOD12_02237F5C: ; 0x02237F5C mov r1, #0x20 add r6, r2, #0 add r5, r3, #0 - bl FUN_02016998 + bl AllocFromHeap mov r1, #0 mov r2, #0x20 add r4, r0, #0 @@ -21762,7 +21762,7 @@ _02238040: add r3, r2, #0 bl MOD12_02240FB0 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap add r0, r5, #0 bl FUN_0200CAB4 _02238058: @@ -23912,7 +23912,7 @@ MOD12_0223900C: ; 0x0223900C str r1, [sp, #4] mov r0, #0x15 mov r1, #0x32 - bl FUN_02016998 + bl AllocFromHeap add r7, r0, #0 ldr r1, [r6] ldr r0, _02239060 ; =0x00000127 @@ -23943,7 +23943,7 @@ _02239032: blt _02239032 _02239056: add r0, r7, #0 - bl FUN_02016A18 + bl FreeToHeap add sp, #8 pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -25172,7 +25172,7 @@ _02239858: add r6, #0x48 lsl r7, r4, #4 ldr r0, [r6, r7] - bl FUN_02016A18 + bl FreeToHeap lsl r0, r4, #2 mov r1, #0 add r0, r5, r0 @@ -25258,7 +25258,7 @@ MOD12_022398F8: ; 0x022398F8 mov r0, #0x16 mov r1, #0x18 add r7, r2, #0 - bl FUN_02016998 + bl AllocFromHeap mov r1, #0 mov r2, #0x18 add r4, r0, #0 @@ -25373,7 +25373,7 @@ _022399EE: sub r0, r0, #1 strb r0, [r1] add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap add r0, r5, #0 bl FUN_0200CAB4 _02239A08: @@ -25680,7 +25680,7 @@ MOD12_02239C30: ; 0x02239C30 mov r1, #0x1c add r5, r2, #0 add r7, r3, #0 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 mov r1, #0 mov r2, #0x1c @@ -25957,7 +25957,7 @@ _02239E6E: add r3, r2, #0 bl MOD12_02240FB0 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap add r0, r5, #0 bl FUN_0200CAB4 _02239E86: @@ -25989,7 +25989,7 @@ MOD12_02239EAC: ; 0x02239EAC mov r1, #0x1c add r5, r2, #0 str r3, [sp] - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 mov r1, #0 mov r2, #0x1c @@ -26098,7 +26098,7 @@ _02239F8E: add r3, r2, #0 bl MOD12_02240FB0 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap add r0, r5, #0 bl FUN_0200CAB4 pop {r3, r4, r5, pc} @@ -26124,7 +26124,7 @@ MOD12_02239FBC: ; 0x02239FBC mov r1, #0x1c add r5, r2, #0 str r3, [sp] - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 mov r1, #0 mov r2, #0x1c @@ -26162,7 +26162,7 @@ MOD12_0223A00C: ; 0x0223A00C mov r1, #0x1c add r5, r2, #0 str r3, [sp] - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 mov r1, #0 mov r2, #0x1c @@ -26200,7 +26200,7 @@ MOD12_0223A05C: ; 0x0223A05C mov r1, #0x1c add r5, r2, #0 add r6, r3, #0 - bl FUN_02016998 + bl AllocFromHeap mov r1, #0 mov r2, #0x1c add r4, r0, #0 @@ -26455,7 +26455,7 @@ _0223A248: add r3, r2, #0 bl MOD12_02240FB0 add r0, r5, #0 - bl FUN_02016A18 + bl FreeToHeap add r0, r4, #0 bl FUN_0200CAB4 _0223A260: @@ -26485,7 +26485,7 @@ MOD12_0223A27C: ; 0x0223A27C mov r1, #0x1c add r5, r2, #0 str r3, [sp] - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 mov r1, #0 mov r2, #0x1c @@ -26601,7 +26601,7 @@ _0223A348: add r3, r2, #0 bl MOD12_02240FB0 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap add r0, r5, #0 bl FUN_0200CAB4 pop {r3, r4, r5, pc} @@ -26628,7 +26628,7 @@ MOD12_0223A39C: ; 0x0223A39C mov r0, #0x16 mov r1, #0x18 add r5, r2, #0 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 mov r1, #0 mov r2, #0x18 @@ -26828,7 +26828,7 @@ _0223A516: add r3, r2, #0 bl MOD12_02240FB0 ldr r0, [sp] - bl FUN_02016A18 + bl FreeToHeap add r0, r4, #0 bl FUN_0200CAB4 _0223A530: @@ -26858,7 +26858,7 @@ MOD12_0223A550: ; 0x0223A550 mov r0, #0x16 mov r1, #0x18 add r5, r2, #0 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 mov r1, #0 mov r2, #0x18 @@ -27078,7 +27078,7 @@ _0223A6F2: add r3, r2, #0 bl MOD12_02240FB0 ldr r0, [sp] - bl FUN_02016A18 + bl FreeToHeap add r0, r4, #0 bl FUN_0200CAB4 _0223A70C: @@ -27109,7 +27109,7 @@ MOD12_0223A72C: ; 0x0223A72C mov r1, #0x1c add r5, r2, #0 str r3, [sp] - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 mov r1, #0 mov r2, #0x1c @@ -27207,7 +27207,7 @@ _0223A7F8: add r3, r2, #0 bl MOD12_02240FB0 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap add r0, r5, #0 bl FUN_0200CAB4 pop {r3, r4, r5, pc} @@ -27234,7 +27234,7 @@ MOD12_0223A828: ; 0x0223A828 mov r1, #0x1c add r5, r2, #0 str r3, [sp] - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 mov r1, #0 mov r2, #0x1c @@ -27337,7 +27337,7 @@ _0223A8F8: add r3, r2, #0 bl MOD12_02240FB0 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap add r0, r5, #0 bl FUN_0200CAB4 pop {r3, r4, r5, pc} @@ -27363,7 +27363,7 @@ MOD12_0223A92C: ; 0x0223A92C mov r1, #0x58 add r5, r2, #0 add r7, r3, #0 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 mov r1, #0 mov r2, #0x58 @@ -27530,7 +27530,7 @@ _0223AA8A: add r3, r2, #0 bl MOD12_02240FB0 add r0, r5, #0 - bl FUN_02016A18 + bl FreeToHeap add r0, r4, #0 bl FUN_0200CAB4 _0223AAA2: @@ -28027,7 +28027,7 @@ MOD12_0223AE58: ; 0x0223AE58 mov r1, #0x1c add r6, r2, #0 add r5, r3, #0 - bl FUN_02016998 + bl AllocFromHeap mov r1, #0 mov r2, #0x1c add r4, r0, #0 @@ -28152,7 +28152,7 @@ _0223AF58: add r3, r2, #0 bl MOD12_02240FB0 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap add r0, r5, #0 bl FUN_0200CAB4 _0223AF70: @@ -28180,7 +28180,7 @@ MOD12_0223AF88: ; 0x0223AF88 mov r1, #0x18 add r5, r2, #0 add r6, r3, #0 - bl FUN_02016998 + bl AllocFromHeap mov r1, #0 mov r2, #0x18 add r4, r0, #0 @@ -28322,7 +28322,7 @@ _0223B0A8: add r3, r2, #0 bl MOD12_02240FB0 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap add r0, r5, #0 bl FUN_0200CAB4 _0223B0C0: @@ -28355,7 +28355,7 @@ MOD12_0223B0EC: ; 0x0223B0EC mov r0, #0x16 mov r1, #0x1c add r5, r2, #0 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 mov r1, #0 mov r2, #0x1c @@ -28656,7 +28656,7 @@ _0223B316: add r3, r2, #0 bl MOD12_02240FB0 ldr r0, [sp] - bl FUN_02016A18 + bl FreeToHeap add r0, r4, #0 bl FUN_0200CAB4 _0223B340: @@ -28694,7 +28694,7 @@ MOD12_0223B37C: ; 0x0223B37C mov r1, #0x14 add r5, r2, #0 str r3, [sp] - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 mov r1, #0 mov r2, #0x14 @@ -28737,7 +28737,7 @@ MOD12_0223B3C8: ; 0x0223B3C8 add r3, r2, #0 bl MOD12_02240FB0 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap add r0, r5, #0 bl FUN_0200CAB4 _0223B3F0: @@ -28750,7 +28750,7 @@ MOD12_0223B3F8: ; 0x0223B3F8 push {r4, lr} mov r0, #0x17 mov r1, #0xf4 - bl FUN_02016998 + bl AllocFromHeap mov r1, #0 mov r2, #0xf4 add r4, r0, #0 @@ -28858,7 +28858,7 @@ MOD12_0223B4C0: ; 0x0223B4C0 ldr r0, [r4, #0x18] bl FUN_020117BC add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} .align 2, 0 @@ -28882,63 +28882,63 @@ MOD12_0223B4F8: ; 0x0223B4F8 add r4, r0, #0 mov r0, #0x17 lsl r1, r1, #0xc - bl FUN_02016998 + bl AllocFromHeap add r1, r4, #0 add r1, #0xd0 str r0, [r1] mov r1, #6 mov r0, #0x17 lsl r1, r1, #0xc - bl FUN_02016998 + bl AllocFromHeap add r1, r4, #0 add r1, #0xd4 str r0, [r1] mov r1, #0x1b mov r0, #0x17 lsl r1, r1, #8 - bl FUN_02016998 + bl AllocFromHeap add r1, r4, #0 add r1, #0xd8 str r0, [r1] mov r1, #2 mov r0, #0x17 lsl r1, r1, #0xa - bl FUN_02016998 + bl AllocFromHeap add r1, r4, #0 add r1, #0xdc str r0, [r1] mov r1, #2 mov r0, #0x17 lsl r1, r1, #0xa - bl FUN_02016998 + bl AllocFromHeap add r1, r4, #0 add r1, #0xe0 str r0, [r1] mov r1, #2 mov r0, #0x17 lsl r1, r1, #0xa - bl FUN_02016998 + bl AllocFromHeap add r1, r4, #0 add r1, #0xe4 str r0, [r1] mov r1, #2 mov r0, #0x17 lsl r1, r1, #0xa - bl FUN_02016998 + bl AllocFromHeap add r1, r4, #0 add r1, #0xe8 str r0, [r1] mov r1, #2 mov r0, #0x17 lsl r1, r1, #8 - bl FUN_02016998 + bl AllocFromHeap add r1, r4, #0 add r1, #0xec str r0, [r1] mov r1, #2 mov r0, #0x17 lsl r1, r1, #8 - bl FUN_02016998 + bl AllocFromHeap add r1, r4, #0 add r1, #0xf0 str r0, [r1] @@ -28959,7 +28959,7 @@ MOD12_0223B4F8: ; 0x0223B4F8 lsl r2, r2, #0xc bl MIi_CpuCopy32 add r0, r5, #0 - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x17 str r0, [sp] mov r0, #0x2d @@ -28977,7 +28977,7 @@ MOD12_0223B4F8: ; 0x0223B4F8 lsl r2, r2, #0xc bl MIi_CpuCopy32 add r0, r5, #0 - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x17 str r0, [sp] mov r0, #0x2d @@ -28995,7 +28995,7 @@ MOD12_0223B4F8: ; 0x0223B4F8 lsl r2, r2, #8 bl MIi_CpuCopy32 add r0, r5, #0 - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x17 str r0, [sp] mov r0, #0x2d @@ -29013,7 +29013,7 @@ MOD12_0223B4F8: ; 0x0223B4F8 lsl r2, r2, #0xa bl MIi_CpuCopy32 add r0, r5, #0 - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x17 str r0, [sp] mov r0, #0x2d @@ -29031,7 +29031,7 @@ MOD12_0223B4F8: ; 0x0223B4F8 lsl r2, r2, #0xa bl MIi_CpuCopy32 add r0, r5, #0 - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x17 str r0, [sp] mov r0, #0x2d @@ -29049,7 +29049,7 @@ MOD12_0223B4F8: ; 0x0223B4F8 lsl r2, r2, #0xa bl MIi_CpuCopy32 add r0, r5, #0 - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x17 str r0, [sp] mov r0, #0x2d @@ -29067,7 +29067,7 @@ MOD12_0223B4F8: ; 0x0223B4F8 lsl r2, r2, #0xa bl MIi_CpuCopy32 add r0, r5, #0 - bl FUN_02016A18 + bl FreeToHeap mov r0, #0 str r0, [sp] add r0, r4, #0 @@ -29122,7 +29122,7 @@ _0223B718: add r0, r4, #0 add r0, #0xd0 ldr r0, [r0] - bl FUN_02016A18 + bl FreeToHeap add r6, r6, #1 add r4, r4, #4 cmp r6, #3 @@ -29133,7 +29133,7 @@ _0223B72E: add r0, r4, #0 add r0, #0xdc ldr r0, [r0] - bl FUN_02016A18 + bl FreeToHeap add r6, r6, #1 add r4, r4, #4 cmp r6, #4 @@ -29143,7 +29143,7 @@ _0223B742: add r0, r5, #0 add r0, #0xec ldr r0, [r0] - bl FUN_02016A18 + bl FreeToHeap add r4, r4, #1 add r5, r5, #4 cmp r4, #2 @@ -29727,7 +29727,7 @@ MOD12_0223BBC0: ; 0x0223BBC0 mov r0, #0x17 mov r1, #0x20 add r5, r3, #0 - bl FUN_02016998 + bl AllocFromHeap mov r1, #0 mov r2, #0x20 add r4, r0, #0 @@ -29797,10 +29797,10 @@ MOD12_0223BC44: ; 0x0223BC44 ldr r0, [r4, #8] cmp r0, #0 beq _0223BC58 - bl FUN_02016A18 + bl FreeToHeap _0223BC58: add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap mov r0, #1 pop {r4, pc} _0223BC62: @@ -34895,7 +34895,7 @@ MOD12_0223E32C: ; 0x0223E32C _0223E33E: mov r0, #0x17 mov r1, #0x10 - bl FUN_02016998 + bl AllocFromHeap mov r1, #0 mov r2, #0x10 add r4, r0, #0 @@ -34942,7 +34942,7 @@ MOD12_0223E38C: ; 0x0223E38C mov r0, #0x21 lsl r0, r0, #4 ldr r0, [r4, r0] - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x21 mov r1, #0 lsl r0, r0, #4 @@ -35199,7 +35199,7 @@ MOD12_0223E598: ; 0x0223E598 strb r0, [r7] mov r0, #0x17 mov r1, #0x2c - bl FUN_02016998 + bl AllocFromHeap mov r1, #0 mov r2, #0x2c add r4, r0, #0 @@ -35316,7 +35316,7 @@ _0223E686: add r2, r1, #0 bl MOD12_0223CD38 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap add r0, r5, #0 bl FUN_0200CAB4 pop {r3, r4, r5, pc} @@ -35392,7 +35392,7 @@ _0223E720: mov r1, #1 strb r1, [r0] add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap add r0, r5, #0 bl FUN_0200CAB4 pop {r3, r4, r5, pc} @@ -36246,7 +36246,7 @@ MOD12_0223EDAC: ; 0x0223EDAC add r6, r2, #0 str r3, [sp, #4] ldr r5, [sp, #0x28] - bl FUN_02016998 + bl AllocFromHeap mov r1, #0 mov r2, #0x14 add r4, r0, #0 @@ -36324,7 +36324,7 @@ _0223EE30: strb r0, [r1] _0223EE5E: add r0, r5, #0 - bl FUN_02016A18 + bl FreeToHeap add r0, r6, #0 bl FUN_0200CAB4 _0223EE6A: @@ -36424,7 +36424,7 @@ MOD12_0223EEFC: ; 0x0223EEFC mov r0, #0x17 mov r1, #0x18 add r5, r2, #0 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 mov r1, #0 mov r2, #0x18 @@ -36624,7 +36624,7 @@ _0223F076: add r3, r2, #0 bl MOD12_02240FB0 ldr r0, [sp] - bl FUN_02016A18 + bl FreeToHeap add r0, r4, #0 bl FUN_0200CAB4 _0223F090: @@ -36654,7 +36654,7 @@ MOD12_0223F0B0: ; 0x0223F0B0 mov r0, #0x17 mov r1, #0x18 add r5, r2, #0 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 mov r1, #0 mov r2, #0x18 @@ -36881,7 +36881,7 @@ _0223F266: add r3, r2, #0 bl MOD12_02240FB0 ldr r0, [sp] - bl FUN_02016A18 + bl FreeToHeap add r0, r4, #0 bl FUN_0200CAB4 _0223F280: @@ -36911,7 +36911,7 @@ MOD12_0223F2A0: ; 0x0223F2A0 mov r0, #0x17 mov r1, #0x14 add r5, r2, #0 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 mov r1, #0 mov r2, #0x14 @@ -37027,7 +37027,7 @@ _0223F388: add r3, r2, #0 bl MOD12_02240FB0 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap add r0, r5, #0 bl FUN_0200CAB4 _0223F3A0: @@ -37103,7 +37103,7 @@ MOD12_0223F414: ; 0x0223F414 lsl r1, r1, #2 add r5, r2, #0 str r3, [sp, #4] - bl FUN_02016998 + bl AllocFromHeap mov r2, #0x57 add r4, r0, #0 mov r1, #0 @@ -37238,7 +37238,7 @@ MOD12_0223F524: ; 0x0223F524 add r6, r1, #0 mov r0, #0x17 mov r1, #0x14 - bl FUN_02016998 + bl AllocFromHeap mov r1, #0 mov r2, #0x14 add r4, r0, #0 @@ -37263,7 +37263,7 @@ MOD12_0223F558: ; 0x0223F558 ldr r0, [r4] bl FUN_0200CAB4 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} .align 2, 0 @@ -37888,7 +37888,7 @@ _0223FA4C: cmp r6, #4 blt _0223FA4C add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap ldr r0, [sp, #0x18] bl FUN_0200CAB4 _0223FA66: @@ -38397,7 +38397,7 @@ MOD12_0223FDE8: ; 0x0223FDE8 add r1, #0xed add r5, r2, #0 add r6, r3, #0 - bl FUN_02016998 + bl AllocFromHeap mov r2, #0x41 mov r1, #0 lsl r2, r2, #2 @@ -38672,7 +38672,7 @@ _02240002: add r3, r2, #0 bl MOD12_02240FB0 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap add r0, r5, #0 bl FUN_0200CAB4 _0224001A: @@ -38974,7 +38974,7 @@ MOD12_02240288: ; 0x02240288 mov r1, #0x50 add r5, r2, #0 add r6, r3, #0 - bl FUN_02016998 + bl AllocFromHeap mov r1, #0 mov r2, #0x50 add r4, r0, #0 @@ -39056,7 +39056,7 @@ _02240330: add r3, r2, #0 bl MOD12_02240FB0 add r0, r5, #0 - bl FUN_02016A18 + bl FreeToHeap add r0, r4, #0 bl FUN_0200CAB4 pop {r3, r4, r5, pc} @@ -39084,7 +39084,7 @@ MOD12_02240364: ; 0x02240364 mov r1, #0x50 add r5, r2, #0 add r6, r3, #0 - bl FUN_02016998 + bl AllocFromHeap mov r1, #0 mov r2, #0x50 add r4, r0, #0 @@ -39214,7 +39214,7 @@ _0224044E: add r3, r2, #0 bl MOD12_02240FB0 add r0, r5, #0 - bl FUN_02016A18 + bl FreeToHeap add r0, r4, #0 bl FUN_0200CAB4 _02240484: @@ -39243,7 +39243,7 @@ MOD12_022404A0: ; 0x022404A0 mov r1, #0x20 add r6, r2, #0 add r5, r3, #0 - bl FUN_02016998 + bl AllocFromHeap mov r1, #0 mov r2, #0x20 add r4, r0, #0 @@ -39371,7 +39371,7 @@ _022405A4: add r3, r2, #0 bl MOD12_02240FB0 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap add r0, r5, #0 bl FUN_0200CAB4 _022405BC: @@ -39472,7 +39472,7 @@ MOD12_02240658: ; 0x02240658 mov r1, #0x54 add r5, r2, #0 add r6, r3, #0 - bl FUN_02016998 + bl AllocFromHeap mov r1, #0 mov r2, #0x54 add r4, r0, #0 @@ -39597,7 +39597,7 @@ _0224074E: add r3, r2, #0 bl MOD12_02240FB0 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap add r0, r5, #0 bl FUN_0200CAB4 _02240766: @@ -41552,7 +41552,7 @@ _022415D4: ldr r0, [r0] bl FUN_0200A8B8 ldr r0, [r4, #0x30] - bl FUN_02016A18 + bl FreeToHeap ldr r0, [r4, #4] bl FUN_0200CAB4 ldr r0, [r4, #8] @@ -43328,7 +43328,7 @@ _0224247A: mov r1, #0x32 mov r0, #0x18 lsl r1, r1, #6 - bl FUN_02016998 + bl AllocFromHeap lsl r2, r6, #4 add r1, r5, r2 add r1, #0xd8 @@ -43382,7 +43382,7 @@ _022424DE: add r0, r4, #0 add r0, #0xc8 ldr r0, [r0] - bl FUN_02016A18 + bl FreeToHeap add r0, r4, #0 add r0, #0xc8 add r6, r6, #1 @@ -44342,7 +44342,7 @@ MOD12_02242CB0: ; 0x02242CB0 add r5, r0, #0 mov r0, #0x18 mov r1, #8 - bl FUN_02016998 + bl AllocFromHeap mov r1, #0 mov r2, #8 add r6, r0, #0 @@ -44383,7 +44383,7 @@ MOD12_02242CF8: ; 0x02242CF8 cmp r2, #1 bne _02242D14 add r0, r1, #0 - bl FUN_02016A18 + bl FreeToHeap add r0, r4, #0 bl FUN_0200CAB4 pop {r4, pc} @@ -44414,7 +44414,7 @@ MOD12_02242D3C: ; 0x02242D3C add r5, r0, #0 mov r0, #0x18 mov r1, #0x20 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 mov r1, #0 mov r2, #0x20 @@ -44524,7 +44524,7 @@ _02242E2C: ldr r0, [r4, #4] bl FUN_0200C3DC add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap add r0, r5, #0 bl FUN_0200CAB4 pop {r3, r4, r5, pc} @@ -45047,7 +45047,7 @@ MOD12_0224324C: ; 0x0224324C strb r0, [r7] mov r0, #0x18 mov r1, #0x14 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 mov r1, #0 mov r2, #0x14 @@ -45150,7 +45150,7 @@ _02243322: mov r2, #1 strb r2, [r0] add r0, r1, #0 - bl FUN_02016A18 + bl FreeToHeap add r0, r4, #0 bl FUN_0200CAB4 pop {r3, r4, r5, pc} @@ -45224,7 +45224,7 @@ _022433B2: mov r2, #1 strb r2, [r0] add r0, r1, #0 - bl FUN_02016A18 + bl FreeToHeap add r0, r4, #0 bl FUN_0200CAB4 pop {r3, r4, r5, pc} @@ -45243,7 +45243,7 @@ MOD12_022433CC: ; 0x022433CC mov r1, #0x14 add r7, r2, #0 str r3, [sp] - bl FUN_02016998 + bl AllocFromHeap mov r1, #0 mov r2, #0x14 add r4, r0, #0 @@ -45333,7 +45333,7 @@ _0224348E: mov r1, #1 strb r1, [r0] add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap add r0, r5, #0 bl FUN_0200CAB4 pop {r3, r4, r5, pc} @@ -45389,7 +45389,7 @@ _022434F0: mov r1, #1 strb r1, [r0] add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap add r0, r5, #0 bl FUN_0200CAB4 pop {r3, r4, r5, pc} @@ -46222,7 +46222,7 @@ MOD12_02243B1C: ; 0x02243B1C add r7, r1, #0 add r1, r0, #0 add r5, r2, #0 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 mov r1, #0 mov r2, #0x18 @@ -46422,7 +46422,7 @@ _02243C96: add r3, r2, #0 bl MOD12_02240FB0 ldr r0, [sp] - bl FUN_02016A18 + bl FreeToHeap add r0, r4, #0 bl FUN_0200CAB4 _02243CB0: @@ -46452,7 +46452,7 @@ MOD12_02243CD0: ; 0x02243CD0 add r7, r1, #0 add r1, r0, #0 add r5, r2, #0 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 mov r1, #0 mov r2, #0x18 @@ -46672,7 +46672,7 @@ _02243E72: add r3, r2, #0 bl MOD12_02240FB0 ldr r0, [sp] - bl FUN_02016A18 + bl FreeToHeap add r0, r4, #0 bl FUN_0200CAB4 _02243E8C: @@ -46729,7 +46729,7 @@ MOD12_02243ED8: ; 0x02243ED8 mov r1, #0x20 add r6, r2, #0 add r5, r3, #0 - bl FUN_02016998 + bl AllocFromHeap mov r1, #0 mov r2, #0x20 add r4, r0, #0 @@ -46858,7 +46858,7 @@ _02243FDE: add r3, r2, #0 bl MOD12_02240FB0 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap add r0, r5, #0 bl FUN_0200CAB4 _02243FF6: @@ -46895,7 +46895,7 @@ _0224401C: bne _0224401C mov r0, #0x18 mov r1, #0x14 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 mov r1, #0 mov r2, #0x14 @@ -47078,7 +47078,7 @@ _0224419A: add r3, r2, #0 bl MOD12_02240FB0 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap add r0, r5, #0 bl FUN_0200CAB4 _022441B2: @@ -47111,7 +47111,7 @@ MOD12_022441DC: ; 0x022441DC add r1, r0, #0 add r6, r2, #0 add r5, r3, #0 - bl FUN_02016998 + bl AllocFromHeap mov r1, #0 mov r2, #0x18 add r4, r0, #0 @@ -47216,7 +47216,7 @@ _022442A6: add r3, r2, #0 bl MOD12_02240FB0 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap add r0, r5, #0 bl FUN_0200CAB4 _022442BE: @@ -47243,7 +47243,7 @@ MOD12_022442D4: ; 0x022442D4 add r1, r0, #0 add r5, r2, #0 str r3, [sp] - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 mov r1, #0 mov r2, #0x18 @@ -47401,7 +47401,7 @@ _02244414: add r3, r2, #0 bl MOD12_02240FB0 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap add r0, r5, #0 bl FUN_0200CAB4 _0224442C: @@ -47432,7 +47432,7 @@ MOD12_0224444C: ; 0x0224444C mov r1, #0x24 add r6, r2, #0 add r7, r3, #0 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 mov r1, #0 mov r2, #0x24 @@ -47651,7 +47651,7 @@ _022445E8: add r3, r2, #0 bl MOD12_02240FB0 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap add r0, r5, #0 bl FUN_0200CAB4 _02244600: @@ -47681,7 +47681,7 @@ MOD12_02244624: ; 0x02244624 mov r0, #0x18 mov r1, #0x14 add r5, r2, #0 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 mov r1, #0 mov r2, #0x14 @@ -47774,7 +47774,7 @@ _022446E8: add r3, r2, #0 bl MOD12_02240FB0 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap add r0, r5, #0 bl FUN_0200CAB4 _02244700: @@ -47926,7 +47926,7 @@ _022447FA: ldr r0, [sp, #0x60] str r0, [sp, #0x30] mov r0, ip - bl FUN_02016998 + bl AllocFromHeap mov r1, #0 mov r2, #0x18 str r0, [sp] @@ -47974,7 +47974,7 @@ _02244874: ldr r0, [r6, #0x14] bl FUN_0200CAB4 add r0, r6, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, r5, r6, pc} thumb_func_start MOD12_02244890 diff --git a/arm9/modules/13/asm/module_13_init.s b/arm9/modules/13/asm/module_13_init.s index 03402138..8adffb85 100644 --- a/arm9/modules/13/asm/module_13_init.s +++ b/arm9/modules/13/asm/module_13_init.s @@ -15,13 +15,13 @@ MOD13_02211E60: ; 0x02211E60 add r5, r0, #0 add r0, r4, #0 lsl r1, r1, #0x12 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 mov r1, #1 mov r2, #0 bl MOD13_02223494 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap add r0, r5, #0 bl OS_RestoreInterrupts ldr r1, _02211EA0 ; =0x04000208 diff --git a/arm9/modules/14/asm/module_14.s b/arm9/modules/14/asm/module_14.s index 3c5d5ffa..22ebe973 100644 --- a/arm9/modules/14/asm/module_14.s +++ b/arm9/modules/14/asm/module_14.s @@ -5859,7 +5859,7 @@ _021DA498: mov r0, #0x85 lsl r0, r0, #2 ldr r0, [r4, r0] - bl FUN_02016A18 + bl FreeToHeap ldr r0, _021DA5DC ; =SDK_OVERLAY_MODULE_75_ID bl UnloadOverlayByID ldr r0, _021DA5E4 ; =0x021E6A00 @@ -7579,7 +7579,7 @@ MOD14_021DB220: ; 0x021DB220 bl FUN_020669BC add r1, r0, #0 mov r0, #9 - bl FUN_02016998 + bl AllocFromHeap mov r1, #0x1a lsl r1, r1, #4 str r0, [r5, r1] @@ -7697,7 +7697,7 @@ MOD14_021DB398: ; 0x021DB398 ldr r0, [r4, r0] cmp r0, #0 beq _021DB3BE - bl FUN_02016A18 + bl FreeToHeap _021DB3BE: mov r0, #0x67 lsl r0, r0, #2 @@ -7736,7 +7736,7 @@ _021DB3BE: add r0, #0xa4 bl MOD14_021DB558 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} .align 2, 0 @@ -7795,7 +7795,7 @@ MOD14_021DB470: ; 0x021DB470 mov r1, #0x1e mov r0, #9 mul r1, r2 - bl FUN_02016998 + bl AllocFromHeap str r0, [r4] mov r0, #0 strb r0, [r4, #8] @@ -7805,11 +7805,11 @@ MOD14_021DB470: ; 0x021DB470 thumb_func_start MOD14_021DB490 MOD14_021DB490: ; 0x021DB490 - ldr r3, _021DB498 ; =FUN_02016A18 + ldr r3, _021DB498 ; =FreeToHeap ldr r0, [r0] bx r3 nop -_021DB498: .word FUN_02016A18 +_021DB498: .word FreeToHeap thumb_func_start MOD14_021DB49C MOD14_021DB49C: ; 0x021DB49C @@ -10473,7 +10473,7 @@ MOD14_021DC76C: ; 0x021DC76C ldr r1, _021DC9C8 ; =0x0000B3B4 mov r0, #0xa add r6, r2, #0 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 beq _021DC79A mov r0, #0x16 @@ -10854,9 +10854,9 @@ MOD14_021DCA38: ; 0x021DCA38 mov r0, #0x57 lsl r0, r0, #2 ldr r0, [r4, r0] - bl FUN_02016A18 + bl FreeToHeap add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap bl FUN_02009FA0 pop {r4, pc} .align 2, 0 @@ -10890,7 +10890,7 @@ _021DCB3A: ldr r1, [sp] mov r0, #0xa add r1, #0x14 - bl FUN_02016998 + bl AllocFromHeap add r1, r0, #0 beq _021DCB78 str r6, [r1] @@ -10982,7 +10982,7 @@ MOD14_021DCBD8: ; 0x021DCBD8 add r0, r4, r0 str r1, [r0, #8] add r0, r5, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r3, r4, r5, pc} thumb_func_start MOD14_021DCBFC @@ -13443,7 +13443,7 @@ MOD14_021DDEF4: ; 0x021DDEF4 ldr r5, _021DDF2C ; =0x021E6A10 _021DDF06: ldr r0, [r5, #8] - bl FUN_02016A18 + bl FreeToHeap ldr r1, [r5] cmp r1, #0 beq _021DDF16 @@ -13785,7 +13785,7 @@ _021DE17E: lsl r1, r1, #4 bl DC_FlushRange ldr r0, [sp, #4] - bl FUN_02016A18 + bl FreeToHeap _021DE1C0: add sp, #0xc pop {r4, r5, r6, r7, pc} @@ -13853,7 +13853,7 @@ MOD14_021DE1D0: ; 0x021DE1D0 sub r3, r3, r5 bl FUN_0201BDE0 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap _021DE250: ldr r3, [sp, #0x14] ldr r0, _021DE270 ; =0x00005984 @@ -13865,7 +13865,7 @@ _021DE250: bl FUN_02017E14 _021DE262: ldr r0, [sp, #0x10] - bl FUN_02016A18 + bl FreeToHeap _021DE268: add sp, #0x18 pop {r3, r4, r5, r6, r7, pc} @@ -13911,7 +13911,7 @@ MOD14_021DE278: ; 0x021DE278 bl MOD14_021DECD4 _021DE2C2: ldr r0, [sp, #4] - bl FUN_02016A18 + bl FreeToHeap mov r0, #0 str r0, [sp] ldr r0, _021DE2E4 ; =0x00005984 @@ -14481,7 +14481,7 @@ MOD14_021DE730: ; 0x021DE730 mov r1, #0x10 add r7, r2, #0 str r3, [sp] - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 beq _021DE782 str r5, [r4] @@ -14511,7 +14511,7 @@ _021DE764: pop {r3, r4, r5, r6, r7, pc} _021DE77C: add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap _021DE782: pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -16076,14 +16076,14 @@ MOD14_021DF3A8: ; 0x021DF3A8 ldr r0, [r4, #0x14] cmp r0, #0 beq _021DF3BA - bl FUN_02016A18 + bl FreeToHeap mov r0, #0 str r0, [r4, #0x14] _021DF3BA: ldr r0, [r4, #0x18] cmp r0, #0 beq _021DF3C8 - bl FUN_02016A18 + bl FreeToHeap mov r0, #0 str r0, [r4, #0x18] _021DF3C8: @@ -16954,7 +16954,7 @@ MOD14_021DFA7C: ; 0x021DFA7C mov r1, #0x2c add r7, r2, #0 str r3, [sp] - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 beq _021DFAFC add r0, r6, #0 @@ -17005,7 +17005,7 @@ MOD14_021DFA7C: ; 0x021DFA7C pop {r3, r4, r5, r6, r7, pc} _021DFAF6: add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap _021DFAFC: add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} @@ -18688,7 +18688,7 @@ _021E0806: bl FUN_020B1240 _021E0812: ldr r0, [sp, #0xc] - bl FUN_02016A18 + bl FreeToHeap _021E0818: mov r0, #0xa add r3, r5, #0 @@ -18760,28 +18760,28 @@ MOD14_021E089C: ; 0x021E089C ldr r0, [r4, #8] cmp r0, #0 beq _021E08AE - bl FUN_02016A18 + bl FreeToHeap mov r0, #0 str r0, [r4, #8] _021E08AE: ldr r0, [r4] cmp r0, #0 beq _021E08BC - bl FUN_02016A18 + bl FreeToHeap mov r0, #0 str r0, [r4] _021E08BC: ldr r0, [r4, #0x14] cmp r0, #0 beq _021E08CA - bl FUN_02016A18 + bl FreeToHeap mov r0, #0 str r0, [r4, #0x14] _021E08CA: ldr r0, [r4, #0x18] cmp r0, #0 beq _021E08D8 - bl FUN_02016A18 + bl FreeToHeap mov r0, #0 str r0, [r4, #0x18] _021E08D8: @@ -19362,14 +19362,14 @@ MOD14_021E0D3C: ; 0x021E0D3C ldr r0, [r4, #8] cmp r0, #0 beq _021E0D4E - bl FUN_02016A18 + bl FreeToHeap mov r0, #0 str r0, [r4, #8] _021E0D4E: ldr r0, [r4, #0xc] cmp r0, #0 beq _021E0D5C - bl FUN_02016A18 + bl FreeToHeap mov r0, #0 str r0, [r4, #0xc] _021E0D5C: @@ -19509,7 +19509,7 @@ _021E0E58: cmp r6, #4 blt _021E0E58 ldr r0, [r5, #4] - bl FUN_02016A18 + bl FreeToHeap mov r0, #0 str r0, [r5, #4] _021E0E72: @@ -19543,7 +19543,7 @@ _021E0EA8: ldr r0, [r5, #0x28] cmp r0, #0 beq _021E0EB2 - bl FUN_02016A18 + bl FreeToHeap _021E0EB2: ldr r0, [r5, #0x30] cmp r0, #0 @@ -19553,7 +19553,7 @@ _021E0EBC: ldr r0, [r5, #0x34] cmp r0, #0 beq _021E0EC6 - bl FUN_02016A18 + bl FreeToHeap _021E0EC6: mov r6, #0 add r4, r5, #0 @@ -19807,7 +19807,7 @@ MOD14_021E10B0: ; 0x021E10B0 bne _021E10EE mov r0, #0xa mov r1, #0xc - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 beq _021E10EA ldr r0, [r5, #0x10] @@ -19843,7 +19843,7 @@ MOD14_021E10F4: ; 0x021E10F4 cmp r0, #0 beq _021E1110 bl FUN_0201B6C8 - bl FUN_02016A18 + bl FreeToHeap ldr r0, [r4, #0x4c] bl FUN_0200CAB4 mov r0, #0 @@ -20719,7 +20719,7 @@ _021E17D2: ldr r0, [r5, #0x24] cmp r0, #0 beq _021E17EC - bl FUN_02016A18 + bl FreeToHeap _021E17EC: ldr r0, [r5, #0x14] cmp r0, #0 @@ -20737,7 +20737,7 @@ _021E1800: bl FUN_02021A20 _021E180A: ldr r0, [r5, #0x18] - bl FUN_02016A18 + bl FreeToHeap mov r0, #0 str r0, [r5, #0x18] _021E1814: @@ -21457,7 +21457,7 @@ MOD14_021E1D38: ; 0x021E1D38 mov r2, #0x40 bl MIi_CpuCopy16 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x12 mov r1, #0x14 add r2, sp, #0x14 @@ -21472,7 +21472,7 @@ MOD14_021E1D38: ; 0x021E1D38 mov r2, #0x20 bl MIi_CpuCopy16 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap add r0, r5, #0 mov r1, #0x2a mov r4, #1 @@ -21667,22 +21667,22 @@ _021E1F30: ldr r0, [r5, #0x14] cmp r0, #0 beq _021E1F3A - bl FUN_02016A18 + bl FreeToHeap _021E1F3A: ldr r0, [r5, #0x1c] cmp r0, #0 beq _021E1F44 - bl FUN_02016A18 + bl FreeToHeap _021E1F44: ldr r0, [r5, #0x2c] cmp r0, #0 beq _021E1F4E - bl FUN_02016A18 + bl FreeToHeap _021E1F4E: ldr r0, [r5, #0x34] cmp r0, #0 beq _021E1F58 - bl FUN_02016A18 + bl FreeToHeap _021E1F58: ldr r0, [r5, #0x44] cmp r0, #0 @@ -21709,7 +21709,7 @@ _021E1F78: cmp r6, #3 blt _021E1F78 ldr r0, [r5, #0x10] - bl FUN_02016A18 + bl FreeToHeap _021E1F8E: pop {r4, r5, r6, pc} .align 2, 0 @@ -22358,7 +22358,7 @@ MOD14_021E247C: ; 0x021E247C add r6, r1, #0 mov r0, #0xa mov r1, #0xc - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 beq _021E24B6 ldr r0, _021E24B8 ; =0x021E6624 @@ -22378,7 +22378,7 @@ MOD14_021E247C: ; 0x021E247C cmp r0, #0 bne _021E24B6 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap _021E24B6: pop {r4, r5, r6, pc} .align 2, 0 @@ -22393,7 +22393,7 @@ MOD14_021E24BC: ; 0x021E24BC add r0, #0xdc str r2, [r0] add r0, r1, #0 - bl FUN_02016A18 + bl FreeToHeap add r0, r4, #0 bl FUN_0200CAB4 pop {r4, pc} @@ -22672,7 +22672,7 @@ MOD14_021E26E4: ; 0x021E26E4 add r5, r0, #0 mov r0, #0xa mov r1, #0x18 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 beq _021E2798 ldr r0, [r5, #0xc] @@ -22840,7 +22840,7 @@ MOD14_021E283C: ; 0x021E283C add r5, r0, #0 mov r0, #0xa mov r1, #0x18 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 beq _021E287C mov r1, #0 @@ -23046,7 +23046,7 @@ MOD14_021E2940: ; 0x021E2940 bl FUN_02020248 _021E29F0: add r0, r6, #0 - bl FUN_02016A18 + bl FreeToHeap _021E29F6: add sp, #0x54 pop {r3, r4, r5, r6, pc} @@ -23132,7 +23132,7 @@ _021E2A74: mov r1, #9 mov r0, #0xa lsl r1, r1, #6 - bl FUN_02016998 + bl AllocFromHeap str r0, [r5, #0x1c] mov r0, #0xa add r3, r5, #0 @@ -23166,12 +23166,12 @@ MOD14_021E2AC8: ; 0x021E2AC8 ldr r0, [r4, #0x14] cmp r0, #0 beq _021E2AD6 - bl FUN_02016A18 + bl FreeToHeap _021E2AD6: ldr r0, [r4, #0x1c] cmp r0, #0 beq _021E2AE0 - bl FUN_02016A18 + bl FreeToHeap _021E2AE0: add r0, r4, #0 bl MOD14_021E3390 @@ -24391,7 +24391,7 @@ MOD14_021E33C8: ; 0x021E33C8 _021E33E4: mov r0, #0xa mov r1, #0xf4 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 beq _021E3460 ldr r0, [sp] @@ -24515,28 +24515,28 @@ MOD14_021E34C0: ; 0x021E34C0 ldr r0, [r0] cmp r0, #0 beq _021E34DA - bl FUN_02016A18 + bl FreeToHeap _021E34DA: add r0, r6, #0 add r0, #0xa0 ldr r0, [r0] cmp r0, #0 beq _021E34E8 - bl FUN_02016A18 + bl FreeToHeap _021E34E8: add r0, r6, #0 add r0, #0xa8 ldr r0, [r0] cmp r0, #0 beq _021E34F6 - bl FUN_02016A18 + bl FreeToHeap _021E34F6: add r0, r6, #0 add r0, #0xb0 ldr r0, [r0] cmp r0, #0 beq _021E3504 - bl FUN_02016A18 + bl FreeToHeap _021E3504: ldr r0, [r6, #0x2c] cmp r0, #0 @@ -24580,7 +24580,7 @@ _021E354A: cmp r5, #0xa blt _021E3540 add r0, r6, #0 - bl FUN_02016A18 + bl FreeToHeap _021E3558: pop {r4, r5, r6, pc} .align 2, 0 @@ -24955,7 +24955,7 @@ _021E3838: b _021E3852 _021E384A: add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r3, r4, r5, r6, r7, pc} _021E3852: str r6, [r5, #0x10] @@ -26233,7 +26233,7 @@ MOD14_021E41C0: ; 0x021E41C0 add r4, r0, #0 mov r0, #0xa lsl r1, r1, #4 - bl FUN_02016998 + bl AllocFromHeap add r5, r0, #0 beq _021E4208 mov r1, #0x73 @@ -26261,7 +26261,7 @@ _021E41EA: cmp r0, #0 bne _021E4208 add r0, r5, #0 - bl FUN_02016A18 + bl FreeToHeap _021E4208: pop {r3, r4, r5, pc} nop @@ -26529,7 +26529,7 @@ MOD14_021E43E8: ; 0x021E43E8 add r4, r0, #0 mov r0, #0xa lsl r1, r1, #4 - bl FUN_02016998 + bl AllocFromHeap add r5, r0, #0 beq _021E4436 add r0, r4, #0 @@ -26560,7 +26560,7 @@ _021E4418: cmp r0, #0 bne _021E4436 add r0, r5, #0 - bl FUN_02016A18 + bl FreeToHeap _021E4436: pop {r3, r4, r5, pc} .align 2, 0 @@ -26660,7 +26660,7 @@ MOD14_021E44E0: ; 0x021E44E0 add r4, r0, #0 mov r0, #0xa lsl r1, r1, #4 - bl FUN_02016998 + bl AllocFromHeap add r5, r0, #0 beq _021E4528 mov r1, #0x73 @@ -26688,7 +26688,7 @@ _021E450A: cmp r0, #0 bne _021E4528 add r0, r5, #0 - bl FUN_02016A18 + bl FreeToHeap _021E4528: pop {r3, r4, r5, pc} nop @@ -26939,7 +26939,7 @@ MOD14_021E46E4: ; 0x021E46E4 add r4, r0, #0 mov r0, #0xa lsl r1, r1, #4 - bl FUN_02016998 + bl AllocFromHeap add r5, r0, #0 beq _021E472C mov r1, #0x73 @@ -26967,7 +26967,7 @@ _021E470E: cmp r0, #0 bne _021E472C add r0, r5, #0 - bl FUN_02016A18 + bl FreeToHeap _021E472C: pop {r3, r4, r5, pc} nop @@ -27108,7 +27108,7 @@ MOD14_021E4828: ; 0x021E4828 mov r1, #0x3c add r6, r2, #0 str r3, [sp] - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 beq _021E487C str r5, [r4, #4] @@ -27150,7 +27150,7 @@ MOD14_021E4880: ; 0x021E4880 add r4, r0, #0 bl MOD14_021E495C add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} thumb_func_start MOD14_021E4890 @@ -27230,7 +27230,7 @@ _021E48EA: cmp r7, #3 blt _021E48EA ldr r0, [sp, #8] - bl FUN_02016A18 + bl FreeToHeap add sp, #0x58 pop {r3, r4, r5, r6, r7, pc} _021E4940: @@ -27673,7 +27673,7 @@ MOD14_021E4C98: ; 0x021E4C98 mov r1, #0x34 add r6, r2, #0 str r3, [sp] - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 beq _021E4D1A lsl r0, r7, #2 @@ -27725,7 +27725,7 @@ MOD14_021E4C98: ; 0x021E4C98 pop {r3, r4, r5, r6, r7, pc} _021E4D14: add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap _021E4D1A: pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -28171,7 +28171,7 @@ _021E5064: mov r1, #0xe1 mov r0, #0xa lsl r1, r1, #2 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 beq _021E50E6 str r6, [r4, #4] @@ -28240,11 +28240,11 @@ MOD14_021E50EC: ; 0x021E50EC mov r0, #0x37 lsl r0, r0, #4 ldr r0, [r4, r0] - bl FUN_02016A18 + bl FreeToHeap mov r0, #0xdd lsl r0, r0, #2 ldr r0, [r4, r0] - bl FUN_02016A18 + bl FreeToHeap ldr r0, [r4, #0x70] bl FUN_0200A8B8 add r0, r4, #0 @@ -28254,7 +28254,7 @@ MOD14_021E50EC: ; 0x021E50EC ldr r0, [r4, #0x74] bl FUN_02021A20 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap _021E5124: pop {r4, pc} .align 2, 0 @@ -29666,10 +29666,10 @@ _021E5C30: bl FUN_0201FFC8 ldr r0, [sp] ldr r0, [r0, #0x5c] - bl FUN_02016A18 + bl FreeToHeap ldr r0, [sp] ldr r0, [r0, #0x64] - bl FUN_02016A18 + bl FreeToHeap add sp, #8 pop {r3, r4, r5, r6, r7, pc} diff --git a/arm9/modules/15/asm/module_15.s b/arm9/modules/15/asm/module_15.s index 1db3e4ac..800f1e57 100644 --- a/arm9/modules/15/asm/module_15.s +++ b/arm9/modules/15/asm/module_15.s @@ -2583,7 +2583,7 @@ MOD15_021D87F8: ; 0x021D87F8 add r5, r0, #0
mov r0, #0x23
lsl r1, r1, #2
- bl FUN_02016998
+ bl AllocFromHeap
add r4, r0, #0
beq _021D8878
mov r0, #0
@@ -2668,9 +2668,9 @@ _021D88A4: ldr r0, [r6, #0x24]
bl FUN_0201FD58
ldr r0, [r6, #0x20]
- bl FUN_02016A18
+ bl FreeToHeap
add r0, r6, #0
- bl FUN_02016A18
+ bl FreeToHeap
_021D88CE:
pop {r4, r5, r6, pc}
@@ -2712,7 +2712,7 @@ MOD15_021D8900: ; 0x021D8900 bhs _021D894E
mov r0, #0x23
mov r1, #0x18
- bl FUN_02016998
+ bl AllocFromHeap
add r1, r0, #0
beq _021D8952
mov r4, #0
@@ -2809,7 +2809,7 @@ MOD15_021D8998: ; 0x021D8998 add r0, r1, r0
str r2, [r0, #8]
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
pop {r4, pc}
.align 2, 0
@@ -3061,14 +3061,14 @@ _021D8BD8: ldr r0, [r5, r0]
cmp r0, #0
beq _021D8BE6
- bl FUN_02016A18
+ bl FreeToHeap
_021D8BE6:
mov r0, #0x76
lsl r0, r0, #2
ldr r0, [r5, r0]
cmp r0, #0
beq _021D8BF4
- bl FUN_02016A18
+ bl FreeToHeap
_021D8BF4:
add r4, r4, #1
add r5, r5, #4
@@ -4325,7 +4325,7 @@ MOD15_021D95E8: ; 0x021D95E8 mov r0, #0x23
lsl r1, r1, #4
add r7, r2, #0
- bl FUN_02016998
+ bl AllocFromHeap
add r4, r0, #0
str r5, [r4]
str r6, [r4, #4]
@@ -4396,7 +4396,7 @@ _021D9674: add r0, #0x2c
bl FUN_02019178
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
pop {r4, pc}
thumb_func_start MOD15_021D9694
@@ -4585,7 +4585,7 @@ MOD15_021D97E4: ; 0x021D97E4 lsl r1, r1, #6
bl DC_FlushRange
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
add sp, #0xc
pop {r4, r5, pc}
@@ -5564,7 +5564,7 @@ MOD15_021D9FA0: ; 0x021D9FA0 mov r0, #0x23
mov r1, #0x10
add r6, r2, #0
- bl FUN_02016998
+ bl AllocFromHeap
str r5, [r0]
str r4, [r0, #4]
str r6, [r0, #8]
@@ -5582,7 +5582,7 @@ MOD15_021D9FBC: ; 0x021D9FBC bl FUN_0201FFC8
_021D9FCA:
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
pop {r4, pc}
.align 2, 0
@@ -5816,7 +5816,7 @@ MOD15_021DA18C: ; 0x021DA18C mov r0, #0x23
mov r1, #0x60
add r7, r2, #0
- bl FUN_02016998
+ bl AllocFromHeap
add r4, r0, #0
str r5, [r4]
str r6, [r4, #4]
@@ -5841,7 +5841,7 @@ MOD15_021DA1B8: ; 0x021DA1B8 bl FUN_0201FFC8
_021DA1C6:
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
pop {r4, pc}
.align 2, 0
@@ -6657,7 +6657,7 @@ MOD15_021DA828: ; 0x021DA828 mov r0, #0x23
mov r1, #0x94
add r7, r2, #0
- bl FUN_02016998
+ bl AllocFromHeap
add r4, r0, #0
str r5, [r4]
str r6, [r4, #4]
@@ -6739,7 +6739,7 @@ _021DA8D0: add r0, #0x10
bl FUN_02019178
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
pop {r4, pc}
thumb_func_start MOD15_021DA8E8
@@ -7451,7 +7451,7 @@ MOD15_021DAE68: ; 0x021DAE68 mov r0, #0x23
lsl r1, r1, #8
add r7, r2, #0
- bl FUN_02016998
+ bl AllocFromHeap
add r4, r0, #0
str r5, [r4]
str r6, [r4, #4]
@@ -7478,7 +7478,7 @@ MOD15_021DAEA4: ; 0x021DAEA4 add r4, r0, #0
bl MOD15_021DB200
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
pop {r4, pc}
thumb_func_start MOD15_021DAEB4
@@ -7625,7 +7625,7 @@ _021DAFB8: mov r1, #0x9a
bl DC_FlushRange
add r0, r7, #0
- bl FUN_02016A18
+ bl FreeToHeap
_021DAFE6:
add r6, r6, #1
add r4, r4, #2
@@ -7734,7 +7734,7 @@ MOD15_021DAFF8: ; 0x021DAFF8 mov r1, #4
bl FUN_02017E14
ldr r0, [sp, #8]
- bl FUN_02016A18
+ bl FreeToHeap
_021DB0D4:
add r0, r6, #0
bl FUN_02021A20
@@ -7925,9 +7925,9 @@ MOD15_021DB258: ; 0x021DB258 push {r4, lr}
add r4, r0, #0
ldr r0, [r4]
- bl FUN_02016A18
+ bl FreeToHeap
ldr r0, [r4, #8]
- bl FUN_02016A18
+ bl FreeToHeap
pop {r4, pc}
.align 2, 0
@@ -7988,7 +7988,7 @@ MOD15_021DB2D0: ; 0x021DB2D0 add r5, r0, #0
mov r0, #0x23
mov r1, #0x18
- bl FUN_02016998
+ bl AllocFromHeap
add r4, r0, #0
beq _021DB32C
ldr r0, [r5, #4]
@@ -8239,7 +8239,7 @@ _021DB4CC: mov r2, #0
str r2, [r1, r0]
add r0, r4, #0
- bl FUN_02016A18
+ bl FreeToHeap
add r0, r5, #0
bl FUN_0200CAB4
_021DB4E0:
diff --git a/arm9/modules/16/asm/module_16.s b/arm9/modules/16/asm/module_16.s index 4f66f1cd..4cefdab3 100644 --- a/arm9/modules/16/asm/module_16.s +++ b/arm9/modules/16/asm/module_16.s @@ -242,7 +242,7 @@ MOD16_021D76AC: ; 0x021D76AC add r5, r1, #0 ldr r1, _021D77D0 ; =0x00001D10 add r7, r0, #0 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 bne _021D76C2 bl ErrorHandling @@ -1824,7 +1824,7 @@ MOD16_021D8298: ; 0x021D8298 _021D82B0: ldr r0, _021D83D8 ; =0x00001A0C ldr r0, [r6, r0] - bl FUN_02016A18 + bl FreeToHeap ldr r0, _021D83DC ; =0x00001A10 ldr r0, [r6, r0] cmp r0, #0 @@ -1833,7 +1833,7 @@ _021D82B0: _021D82C4: ldr r0, _021D83DC ; =0x00001A10 ldr r0, [r6, r0] - bl FUN_02016A18 + bl FreeToHeap ldr r0, _021D83E0 ; =0x00001A14 ldr r0, [r6, r0] cmp r0, #0 @@ -1842,7 +1842,7 @@ _021D82C4: _021D82D8: ldr r0, _021D83E0 ; =0x00001A14 ldr r0, [r6, r0] - bl FUN_02016A18 + bl FreeToHeap ldr r0, _021D83E4 ; =0x00001A18 ldr r0, [r6, r0] cmp r0, #0 @@ -1851,7 +1851,7 @@ _021D82D8: _021D82EC: ldr r0, _021D83E4 ; =0x00001A18 ldr r0, [r6, r0] - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x1d lsl r0, r0, #8 ldr r0, [r6, r0] @@ -1862,7 +1862,7 @@ _021D8302: mov r0, #0x1d lsl r0, r0, #8 ldr r0, [r6, r0] - bl FUN_02016A18 + bl FreeToHeap ldr r0, _021D83E8 ; =0x00001D04 ldr r0, [r6, r0] cmp r0, #0 @@ -1871,7 +1871,7 @@ _021D8302: _021D8318: ldr r0, _021D83E8 ; =0x00001D04 ldr r0, [r6, r0] - bl FUN_02016A18 + bl FreeToHeap ldr r0, _021D83EC ; =0x00001D08 ldr r0, [r6, r0] cmp r0, #0 @@ -1880,7 +1880,7 @@ _021D8318: _021D832C: ldr r0, _021D83EC ; =0x00001D08 ldr r0, [r6, r0] - bl FUN_02016A18 + bl FreeToHeap ldr r0, _021D83F0 ; =0x00001D0C ldr r0, [r6, r0] cmp r0, #0 @@ -1889,7 +1889,7 @@ _021D832C: _021D8340: ldr r0, _021D83F0 ; =0x00001D0C ldr r0, [r6, r0] - bl FUN_02016A18 + bl FreeToHeap ldr r0, _021D83F4 ; =0x00001A30 ldr r4, _021D83F8 ; =0x021FF440 mov r7, #0 @@ -1954,7 +1954,7 @@ _021D83BA: add r0, r6, r0 bl MOD16_021D8628 add r0, r6, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r3, r4, r5, r6, r7, pc} nop _021D83D4: .word 0x00001A1C @@ -2264,7 +2264,7 @@ MOD16_021D8628: ; 0x021D8628 ldr r0, [r4] bl MOD16_021D8F2C ldr r0, [r4] - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x4f lsl r0, r0, #2 ldr r0, [r4, r0] @@ -3154,14 +3154,14 @@ MOD16_021D8C78: ; 0x021D8C78 ldr r1, [r4] add r0, r6, #0 lsr r1, r1, #8 - bl FUN_02016998 + bl AllocFromHeap add r5, r0, #0 beq _021D8CAE add r0, r4, #0 add r1, r5, #0 bl MI_UncompressLZ8 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap _021D8CAE: add r4, r5, #0 _021D8CB0: @@ -3201,7 +3201,7 @@ _021D8CDC: bl FUN_02017E14 _021D8CF0: add r0, r7, #0 - bl FUN_02016A18 + bl FreeToHeap _021D8CF6: add r0, r4, #0 add sp, #8 @@ -3242,7 +3242,7 @@ _021D8D22: blx r3 _021D8D3C: add r0, r7, #0 - bl FUN_02016A18 + bl FreeToHeap _021D8D42: pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -3262,7 +3262,7 @@ MOD16_021D8D48: ; 0x021D8D48 cmp r0, #0 bne _021D8D6A add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap mov r0, #0 pop {r3, r4, r5, pc} _021D8D6A: @@ -3284,7 +3284,7 @@ MOD16_021D8D70: ; 0x021D8D70 cmp r0, #0 bne _021D8D92 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap mov r0, #0 pop {r3, r4, r5, pc} _021D8D92: @@ -3306,7 +3306,7 @@ MOD16_021D8D98: ; 0x021D8D98 cmp r0, #0 bne _021D8DBA add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap mov r0, #0 pop {r3, r4, r5, pc} _021D8DBA: @@ -5009,7 +5009,7 @@ MOD16_021D9A90: ; 0x021D9A90 add r0, r7, #0 str r2, [sp, #0x10] str r3, [sp, #0x14] - bl FUN_020169D8 + bl AllocFromHeapAtEnd add r6, r0, #0 bne _021D9AAE bl ErrorHandling @@ -5022,7 +5022,7 @@ _021D9AAE: str r0, [sp, #0x24] ldr r1, _021D9CA8 ; =0x000003DA add r0, r7, #0 - bl FUN_020169D8 + bl AllocFromHeapAtEnd add r4, r0, #0 bne _021D9ACC bl ErrorHandling @@ -5241,11 +5241,11 @@ _021D9C82: add r2, r5, r2 bl MOD16_021DA5C4 add r0, r6, #0 - bl FUN_02016A18 + bl FreeToHeap add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap ldr r0, [sp, #0x18] - bl FUN_02016A18 + bl FreeToHeap add r0, r7, #0 add sp, #0x28 pop {r3, r4, r5, r6, r7, pc} @@ -6112,7 +6112,7 @@ _021DA226: ldr r3, [sp, #0x18] bl MOD16_021DA004 add r0, r6, #0 - bl FUN_02016A18 + bl FreeToHeap add sp, #0x1c pop {r4, r5, r6, r7, pc} _021DA24E: @@ -6231,7 +6231,7 @@ _021DA30A: add r1, r6, #0 bl MOD16_021DA004 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap add sp, #0x18 pop {r3, r4, r5, r6, r7, pc} _021DA332: @@ -6406,7 +6406,7 @@ _021DA45E: add r1, r6, #0 bl MOD16_021DA004 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap add sp, #0x18 pop {r3, r4, r5, r6, r7, pc} _021DA486: @@ -6560,7 +6560,7 @@ _021DA588: add r1, r6, #0 bl MOD16_021DA004 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap add sp, #0x18 pop {r3, r4, r5, r6, r7, pc} _021DA5B0: @@ -6615,7 +6615,7 @@ MOD16_021DA5FC: ; 0x021DA5FC push {r3, r4, r5, lr} mov r1, #0x48 add r5, r0, #0 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 bne _021DA60E bl ErrorHandling @@ -6967,7 +6967,7 @@ _021DA84C: MOD16_021DA858: ; 0x021DA858 push {r4, lr} mov r1, #0xc - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 bne _021DA868 bl ErrorHandling @@ -7560,7 +7560,7 @@ MOD16_021DAC7C: ; 0x021DAC7C bl ErrorHandling _021DAC8A: ldr r0, [r4, #0x10] - bl FUN_02016A18 + bl FreeToHeap mov r0, #0 str r0, [r4, #0x10] pop {r4, pc} @@ -7576,7 +7576,7 @@ MOD16_021DAC98: ; 0x021DAC98 str r1, [r6, #4] mov r1, #0x30 add r5, r2, #0 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 bne _021DACB2 bl ErrorHandling @@ -7635,7 +7635,7 @@ MOD16_021DAD20: ; 0x021DAD20 str r1, [r5, #4] mov r1, #0x14 add r6, r2, #0 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 bne _021DAD3A bl ErrorHandling @@ -7678,7 +7678,7 @@ MOD16_021DAD78: ; 0x021DAD78 str r1, [r6, #4] mov r1, #0x30 add r5, r2, #0 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 bne _021DAD92 bl ErrorHandling @@ -7742,7 +7742,7 @@ MOD16_021DAE0C: ; 0x021DAE0C str r1, [r6, #4] mov r1, #0x30 add r5, r2, #0 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 bne _021DAE26 bl ErrorHandling @@ -7802,7 +7802,7 @@ MOD16_021DAE94: ; 0x021DAE94 str r0, [r5, #4] add r0, r2, #0 mov r1, #0xc - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 bne _021DAEB0 bl ErrorHandling @@ -7832,7 +7832,7 @@ MOD16_021DAED4: ; 0x021DAED4 str r1, [r5, #4] mov r1, #0x18 add r6, r2, #0 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 bne _021DAEEE bl ErrorHandling @@ -7880,7 +7880,7 @@ MOD16_021DAF38: ; 0x021DAF38 str r1, [r5, #4] mov r1, #0x18 add r6, r2, #0 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 bne _021DAF52 bl ErrorHandling @@ -7928,7 +7928,7 @@ MOD16_021DAF9C: ; 0x021DAF9C str r1, [r5, #4] mov r1, #0x18 add r6, r2, #0 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 bne _021DAFB6 bl ErrorHandling @@ -7976,7 +7976,7 @@ MOD16_021DB000: ; 0x021DB000 str r1, [r5, #4] mov r1, #0xc add r6, r2, #0 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 bne _021DB01A bl ErrorHandling @@ -8019,7 +8019,7 @@ MOD16_021DB058: ; 0x021DB058 str r1, [r5, #4] mov r1, #0xc add r6, r2, #0 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 bne _021DB072 bl ErrorHandling @@ -8062,7 +8062,7 @@ MOD16_021DB0B0: ; 0x021DB0B0 str r1, [r5, #4] mov r1, #0x18 add r6, r2, #0 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 bne _021DB0CA bl ErrorHandling @@ -8110,7 +8110,7 @@ MOD16_021DB114: ; 0x021DB114 str r1, [r5, #4] mov r1, #0xc add r6, r2, #0 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 bne _021DB12E bl ErrorHandling @@ -8153,7 +8153,7 @@ MOD16_021DB16C: ; 0x021DB16C str r1, [r5, #4] mov r1, #0x18 add r6, r2, #0 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 bne _021DB186 bl ErrorHandling @@ -8201,7 +8201,7 @@ MOD16_021DB1D0: ; 0x021DB1D0 str r1, [r5, #4] mov r1, #0xc add r6, r2, #0 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 bne _021DB1EA bl ErrorHandling @@ -8241,7 +8241,7 @@ MOD16_021DB228: ; 0x021DB228 add r5, r0, #0 ldr r0, [r5, #0xc] mov r1, #0x18 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 bne _021DB23C bl ErrorHandling @@ -8261,7 +8261,7 @@ _021DB242: ldr r1, [r5, #8] ldr r0, [r5, #0xc] lsl r1, r1, #4 - bl FUN_02016998 + bl AllocFromHeap str r0, [r4, #0xc] cmp r0, #0 bne _021DB268 @@ -8294,7 +8294,7 @@ _021DB292: add r0, r4, #0 bl MOD16_021DB358 ldr r0, [r4, #0xc] - bl FUN_02016A18 + bl FreeToHeap ldr r0, [r4] bl FUN_020117BC add r2, r4, #0 @@ -8306,7 +8306,7 @@ _021DB2AA: sub r1, r1, #1 bne _021DB2AA add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} .align 2, 0 thumb_func_end MOD16_021DB288 @@ -8576,7 +8576,7 @@ _021DB48C: MOD16_021DB490: ; 0x021DB490 push {r3, lr} mov r1, #0x14 - bl FUN_02016998 + bl AllocFromHeap add r3, r0, #0 mov r2, #0x14 mov r1, #0 @@ -8590,10 +8590,10 @@ _021DB49E: thumb_func_start MOD16_021DB4A8 MOD16_021DB4A8: ; 0x021DB4A8 - ldr r3, _021DB4AC ; =FUN_02016A18 + ldr r3, _021DB4AC ; =FreeToHeap bx r3 .align 2, 0 -_021DB4AC: .word FUN_02016A18 +_021DB4AC: .word FreeToHeap thumb_func_end MOD16_021DB4A8 thumb_func_start MOD16_021DB4B0 @@ -9968,7 +9968,7 @@ _021DBDCA: bl ErrorHandling _021DBDD4: ldr r0, [r4] - bl FUN_02016A18 + bl FreeToHeap mov r0, #0 str r0, [r4] str r0, [r4, #4] @@ -10419,7 +10419,7 @@ MOD16_021DC10C: ; 0x021DC10C push {r3, r4, r5, lr} add r5, r1, #0 mov r1, #0x38 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 bne _021DC11E bl ErrorHandling @@ -10452,7 +10452,7 @@ MOD16_021DC148: ; 0x021DC148 bl ErrorHandling _021DC152: add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} .align 2, 0 thumb_func_end MOD16_021DC148 @@ -10462,7 +10462,7 @@ MOD16_021DC15C: ; 0x021DC15C push {r3, r4, r5, lr} add r5, r1, #0 mov r1, #4 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 bne _021DC16E bl ErrorHandling @@ -10487,7 +10487,7 @@ MOD16_021DC184: ; 0x021DC184 bl ErrorHandling _021DC18E: add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} .align 2, 0 thumb_func_end MOD16_021DC184 @@ -10502,7 +10502,7 @@ MOD16_021DC198: ; 0x021DC198 mov r1, #0x14 add r0, r5, #0 mul r1, r2 - bl FUN_02016998 + bl AllocFromHeap add r6, r0, #0 add r0, r5, #0 add r1, r6, #0 @@ -10559,7 +10559,7 @@ _021DC202: add r0, #0x50 bl MOD16_021DAC7C add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} thumb_func_end MOD16_021DC1F8 @@ -10576,7 +10576,7 @@ MOD16_021DC234: ; 0x021DC234 ldr r0, [r5, #4] add r4, r1, #0 mov r1, #0x24 - bl FUN_02016998 + bl AllocFromHeap str r0, [r5, #8] cmp r0, #0 bne _021DC24C @@ -10642,7 +10642,7 @@ MOD16_021DC2B0: ; 0x021DC2B0 push {r4, lr} add r4, r0, #0 ldr r0, [r4, #8] - bl FUN_02016A18 + bl FreeToHeap mov r0, #0 str r0, [r4, #8] mov r0, #1 @@ -10675,7 +10675,7 @@ _021DC2E8: mov r1, #0x52 ldr r0, [r4, #4] lsl r1, r1, #2 - bl FUN_02016998 + bl AllocFromHeap add r7, r0, #0 bne _021DC2FA bl ErrorHandling @@ -10904,7 +10904,7 @@ _021DC4AC: add r0, r6, #0 bl MOD16_021DC754 add r0, r6, #0 - bl FUN_02016A18 + bl FreeToHeap ldr r0, [r4] add r0, r0, #1 str r0, [r4] @@ -11306,7 +11306,7 @@ MOD16_021DC770: ; 0x021DC770 str r0, [sp, #8] bl GX_LoadBGPltt ldr r0, [sp, #0xc] - bl FUN_02016A18 + bl FreeToHeap add r0, r7, #0 add r1, r6, #0 bl MOD16_021DC860 @@ -11411,7 +11411,7 @@ MOD16_021DC860: ; 0x021DC860 ldr r0, [r5] bl FUN_02018148 add r0, r6, #0 - bl FUN_02016A18 + bl FreeToHeap str r4, [sp] add r0, r5, #0 mov r1, #0x27 @@ -11436,7 +11436,7 @@ MOD16_021DC860: ; 0x021DC860 ldr r0, [r5] bl FUN_02018148 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap ldr r0, [r5] mov r1, #3 bl FUN_0201AC68 @@ -11488,7 +11488,7 @@ MOD16_021DC93C: ; 0x021DC93C add r4, r0, #0 add r0, #0xd8 ldr r0, [r0] - bl FUN_02016A18 + bl FreeToHeap add r0, r4, #0 mov r1, #0 add r0, #0xd8 @@ -13996,7 +13996,7 @@ MOD16_021DDCA4: ; 0x021DDCA4 add r6, r1, #0 mov r1, #0x28 add r5, r0, #0 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 bne _021DDCB8 bl ErrorHandling @@ -14032,7 +14032,7 @@ MOD16_021DDCEC: ; 0x021DDCEC push {r3, r4, r5, lr} add r5, r1, #0 mov r1, #4 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 bne _021DDCFE bl ErrorHandling @@ -14060,7 +14060,7 @@ MOD16_021DDD14: ; 0x021DDD14 mul r7, r1 add r0, r5, #0 add r1, r7, #0 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 bne _021DDD34 bl ErrorHandling @@ -14087,7 +14087,7 @@ MOD16_021DDD50: ; 0x021DDD50 bl ErrorHandling _021DDD5A: add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} .align 2, 0 thumb_func_end MOD16_021DDD50 @@ -14100,7 +14100,7 @@ MOD16_021DDD64: ; 0x021DDD64 bl ErrorHandling _021DDD6E: add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} .align 2, 0 thumb_func_end MOD16_021DDD64 @@ -14115,7 +14115,7 @@ _021DDD82: add r0, r4, #0 bl MOD16_021DAC7C add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} thumb_func_end MOD16_021DDD78 @@ -14132,7 +14132,7 @@ MOD16_021DDD94: ; 0x021DDD94 ldr r0, [r5, #4] add r4, r1, #0 mov r1, #0x24 - bl FUN_02016998 + bl AllocFromHeap str r0, [r5, #8] cmp r0, #0 bne _021DDDAC @@ -14213,7 +14213,7 @@ MOD16_021DDE28: ; 0x021DDE28 ldr r0, [r4, #8] bl MOD16_021DE0EC ldr r0, [r4, #8] - bl FUN_02016A18 + bl FreeToHeap mov r0, #1 pop {r4, pc} thumb_func_end MOD16_021DDE28 @@ -14242,7 +14242,7 @@ _021DDE56: ; jump table _021DDE60: ldr r0, [r4, #4] mov r1, #0x3c - bl FUN_02016998 + bl AllocFromHeap str r0, [r4, #8] cmp r0, #0 bne _021DDE72 @@ -14418,7 +14418,7 @@ _021DDFB2: str r0, [r4] b _021DDFD8 _021DDFC2: - bl FUN_02016A18 + bl FreeToHeap mov r0, #0 str r0, [r4, #8] ldr r0, [r4] @@ -14445,7 +14445,7 @@ MOD16_021DDFE0: ; 0x021DDFE0 add r4, r1, #0 add r0, r6, #0 mov r1, #0x1c - bl FUN_02016998 + bl AllocFromHeap str r0, [r5, #8] mov r0, #0x60 str r0, [sp] @@ -14507,7 +14507,7 @@ MOD16_021DDFE0: ; 0x021DDFE0 bl MOD16_021D7C98 add r0, r6, #0 mov r1, #8 - bl FUN_02016998 + bl AllocFromHeap add r3, r0, #0 str r5, [r3] str r4, [r3, #4] @@ -14573,9 +14573,9 @@ MOD16_021DE0EC: ; 0x021DE0EC ldr r0, [r4] bl FUN_0202212C ldr r0, [r4, #4] - bl FUN_02016A18 + bl FreeToHeap ldr r0, [r4, #8] - bl FUN_02016A18 + bl FreeToHeap mov r0, #0 str r0, [r4, #8] pop {r4, pc} @@ -14836,7 +14836,7 @@ _021DE2AC: add r0, r6, #0 bl FUN_02018148 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap add r0, r6, #0 mov r1, #6 bl FUN_0201AC68 @@ -15420,7 +15420,7 @@ MOD16_021DE788: ; 0x021DE788 add r0, r4, #0 bl FUN_02018148 add r0, r5, #0 - bl FUN_02016A18 + bl FreeToHeap add r0, r4, #0 mov r1, #7 bl FUN_0201AC68 @@ -16113,7 +16113,7 @@ MOD16_021DEC64: ; 0x021DEC64 push {r3, r4, r5, lr} add r5, r1, #0 mov r1, #0x38 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 bne _021DEC76 bl ErrorHandling @@ -16142,7 +16142,7 @@ MOD16_021DECA0: ; 0x021DECA0 push {r3, r4, r5, lr} add r5, r1, #0 mov r1, #4 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 bne _021DECB2 bl ErrorHandling @@ -16170,7 +16170,7 @@ MOD16_021DECC8: ; 0x021DECC8 mul r7, r1 add r0, r5, #0 add r1, r7, #0 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 bne _021DECE8 bl ErrorHandling @@ -16197,7 +16197,7 @@ MOD16_021DED04: ; 0x021DED04 bl ErrorHandling _021DED0E: add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} .align 2, 0 thumb_func_end MOD16_021DED04 @@ -16210,7 +16210,7 @@ MOD16_021DED18: ; 0x021DED18 bl ErrorHandling _021DED22: add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} .align 2, 0 thumb_func_end MOD16_021DED18 @@ -16225,7 +16225,7 @@ _021DED36: add r0, r4, #0 bl MOD16_021DAC7C add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} thumb_func_end MOD16_021DED2C @@ -16242,7 +16242,7 @@ MOD16_021DED48: ; 0x021DED48 ldr r0, [r5, #4] add r4, r1, #0 mov r1, #4 - bl FUN_02016998 + bl AllocFromHeap add r6, r0, #0 bne _021DED5E bl ErrorHandling @@ -16429,7 +16429,7 @@ MOD16_021DEEA4: ; 0x021DEEA4 push {r4, lr} add r4, r0, #0 ldr r0, [r4, #8] - bl FUN_02016A18 + bl FreeToHeap mov r0, #0 str r0, [r4, #8] mov r0, #1 @@ -16461,7 +16461,7 @@ _021DEED4: ; jump table _021DEEDC: ldr r0, [r4, #4] mov r1, #0x64 - bl FUN_02016998 + bl AllocFromHeap str r0, [r4, #8] mov r1, #0 mov r2, #0x64 @@ -16598,7 +16598,7 @@ _021DEFCE: str r0, [r4] b _021DEFF2 _021DEFDC: - bl FUN_02016A18 + bl FreeToHeap mov r0, #0 str r0, [r4, #8] ldr r0, [r4] @@ -16792,7 +16792,7 @@ MOD16_021DF168: ; 0x021DF168 push {r4, lr} add r4, r0, #0 ldr r0, [r4, #0x5c] - bl FUN_02016A18 + bl FreeToHeap mov r0, #0 str r0, [r4, #0x5c] str r0, [r4, #0x60] @@ -17286,7 +17286,7 @@ MOD16_021DF514: ; 0x021DF514 ldr r0, [r0] bl FUN_02018148 ldr r0, [sp, #0x10] - bl FUN_02016A18 + bl FreeToHeap cmp r7, #3 bhi _021DF584 add r0, r7, r7 @@ -17343,7 +17343,7 @@ _021DF584: ldr r0, [r0] bl FUN_02018148 add r0, r6, #0 - bl FUN_02016A18 + bl FreeToHeap ldr r0, [r4] mov r1, #3 ldr r0, [r0] @@ -18000,7 +18000,7 @@ MOD16_021DFAA0: ; 0x021DFAA0 push {r3, r4, r5, lr} add r5, r1, #0 mov r1, #0x10 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 bne _021DFAB2 bl ErrorHandling @@ -18036,7 +18036,7 @@ MOD16_021DFAE8: ; 0x021DFAE8 push {r3, r4, r5, lr} add r5, r1, #0 mov r1, #0xc - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 bne _021DFAFA bl ErrorHandling @@ -18075,7 +18075,7 @@ MOD16_021DFB24: ; 0x021DFB24 bl ErrorHandling _021DFB2E: add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} .align 2, 0 thumb_func_end MOD16_021DFB24 @@ -18088,7 +18088,7 @@ MOD16_021DFB38: ; 0x021DFB38 bl ErrorHandling _021DFB42: add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} .align 2, 0 thumb_func_end MOD16_021DFB38 @@ -18112,7 +18112,7 @@ MOD16_021DFB54: ; 0x021DFB54 ldr r0, [r5, #4] add r6, r1, #0 mov r1, #0x9c - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 bne _021DFB6A bl ErrorHandling @@ -18322,7 +18322,7 @@ MOD16_021DFCEC: ; 0x021DFCEC add r0, r5, #0 bl MOD16_021E18D0 add r0, r5, #0 - bl FUN_02016A18 + bl FreeToHeap mov r0, #0 str r0, [r4, #8] mov r0, #1 @@ -18355,7 +18355,7 @@ _021DFD32: mov r1, #0x4e ldr r0, [r4, #4] lsl r1, r1, #2 - bl FUN_02016998 + bl AllocFromHeap mov r2, #0x4e str r0, [r4, #8] mov r1, #0 @@ -18632,7 +18632,7 @@ _021DFF4E: b _021DFF6E _021DFF56: add r0, r5, #0 - bl FUN_02016A18 + bl FreeToHeap mov r0, #0 str r0, [r4, #8] ldr r0, [r4] @@ -18743,7 +18743,7 @@ MOD16_021DFFE0: ; 0x021DFFE0 ldr r0, [r0] bl FUN_02018148 add r0, r5, #0 - bl FUN_02016A18 + bl FreeToHeap ldr r0, [r4] mov r1, #6 ldr r0, [r0] @@ -18923,7 +18923,7 @@ MOD16_021E0158: ; 0x021E0158 add r4, r1, #0 add r0, r6, #0 mov r1, #0x18 - bl FUN_02016998 + bl AllocFromHeap str r0, [r5, #4] mov r0, #1 lsl r0, r0, #8 @@ -19071,7 +19071,7 @@ MOD16_021E026C: ; 0x021E026C ldr r0, [r4] bl FUN_0202212C ldr r0, [r4, #4] - bl FUN_02016A18 + bl FreeToHeap mov r0, #0 str r0, [r4, #4] pop {r4, pc} @@ -19110,7 +19110,7 @@ MOD16_021E02AC: ; 0x021E02AC ldr r0, [r4, #8] bl FUN_0202212C ldr r0, [r4, #0xc] - bl FUN_02016A18 + bl FreeToHeap mov r0, #0 str r0, [r4, #0xc] pop {r4, pc} @@ -19139,7 +19139,7 @@ MOD16_021E02D4: ; 0x021E02D4 add r0, r2, #0 mov r1, #0x18 str r2, [sp, #0xc] - bl FUN_02016998 + bl AllocFromHeap ldr r1, [sp, #4] str r0, [r1, #0xc] mov r0, #0 @@ -19307,7 +19307,7 @@ MOD16_021E0400: ; 0x021E0400 add r0, r2, #0 mov r1, #0x28 str r2, [sp, #0xc] - bl FUN_02016998 + bl AllocFromHeap ldr r1, [sp, #4] str r0, [r1, #0xc] mov r0, #0 @@ -19500,7 +19500,7 @@ MOD16_021E0558: ; 0x021E0558 add r0, r2, #0 mov r1, #0x2c str r2, [sp, #0xc] - bl FUN_02016998 + bl AllocFromHeap ldr r1, [sp, #4] str r0, [r1, #0xc] mov r0, #0 @@ -19730,7 +19730,7 @@ MOD16_021E06F8: ; 0x021E06F8 add r0, r2, #0 mov r1, #0x28 str r2, [sp, #0xc] - bl FUN_02016998 + bl AllocFromHeap ldr r1, [sp, #4] str r0, [r1, #0xc] mov r0, #0 @@ -19962,7 +19962,7 @@ MOD16_021E08A0: ; 0x021E08A0 add r0, r2, #0 mov r1, #0x3c str r2, [sp, #0xc] - bl FUN_02016998 + bl AllocFromHeap ldr r1, [sp, #4] str r0, [r1, #0xc] mov r0, #0 @@ -20409,7 +20409,7 @@ MOD16_021E0BB8: ; 0x021E0BB8 add r0, r1, #0 mov r1, #0x7e lsl r1, r1, #2 - bl FUN_02016998 + bl AllocFromHeap ldr r1, [sp, #0x10] str r0, [r1, #0x1c] mov r0, #0 @@ -20673,7 +20673,7 @@ MOD16_021E0D90: ; 0x021E0D90 add r0, r1, #0 mov r1, #0x7e lsl r1, r1, #2 - bl FUN_02016998 + bl AllocFromHeap ldr r1, [sp, #0x10] str r0, [r1, #0x1c] mov r0, #0 @@ -21003,7 +21003,7 @@ MOD16_021E0FDC: ; 0x021E0FDC add r0, r1, #0 mov r1, #0x7e lsl r1, r1, #2 - bl FUN_02016998 + bl AllocFromHeap ldr r1, [sp, #0x10] str r0, [r1, #0x1c] mov r0, #0 @@ -21377,7 +21377,7 @@ MOD16_021E127C: ; 0x021E127C add r0, r1, #0 mov r1, #0x7e lsl r1, r1, #2 - bl FUN_02016998 + bl AllocFromHeap ldr r1, [sp, #0x10] str r0, [r1, #0x1c] mov r0, #0 @@ -21765,7 +21765,7 @@ MOD16_021E1534: ; 0x021E1534 add r0, r1, #0 mov r1, #0x2a lsl r1, r1, #4 - bl FUN_02016998 + bl AllocFromHeap ldr r1, [sp, #0x10] str r0, [r1, #0x1c] mov r0, #0 @@ -22271,7 +22271,7 @@ MOD16_021E18D0: ; 0x021E18D0 push {r4, lr} add r4, r0, #0 ldr r0, [r4, #0x1c] - bl FUN_02016A18 + bl FreeToHeap ldr r0, [r4, #0x18] bl MOD16_021DB4A8 mov r0, #0 @@ -25382,7 +25382,7 @@ MOD16_021E2F64: ; 0x021E2F64 push {r3, r4, r5, lr} add r5, r1, #0 mov r1, #0xc - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 bne _021E2F76 bl ErrorHandling @@ -25417,7 +25417,7 @@ MOD16_021E2FA8: ; 0x021E2FA8 push {r3, r4, r5, lr} add r5, r1, #0 mov r1, #0x14 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 bne _021E2FBA bl ErrorHandling @@ -25445,7 +25445,7 @@ MOD16_021E2FD4: ; 0x021E2FD4 bl ErrorHandling _021E2FDE: add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} .align 2, 0 thumb_func_end MOD16_021E2FD4 @@ -25458,7 +25458,7 @@ MOD16_021E2FE8: ; 0x021E2FE8 bl ErrorHandling _021E2FF2: add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} .align 2, 0 thumb_func_end MOD16_021E2FE8 @@ -25476,7 +25476,7 @@ MOD16_021E3000: ; 0x021E3000 ldr r0, [r6, #4] add r5, r1, #0 mov r1, #0x34 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 bne _021E3016 bl ErrorHandling @@ -25572,17 +25572,17 @@ MOD16_021E30B0: ; 0x021E30B0 ldr r0, [r5, #4] cmp r0, #0 beq _021E30C0 - bl FUN_02016A18 + bl FreeToHeap _021E30C0: ldr r0, [r5, #8] cmp r0, #0 beq _021E30CA - bl FUN_02016A18 + bl FreeToHeap _021E30CA: add r0, r5, #0 bl MOD16_021E4070 add r0, r5, #0 - bl FUN_02016A18 + bl FreeToHeap mov r0, #0 str r0, [r4, #8] mov r0, #1 @@ -25617,7 +25617,7 @@ _021E3102: ; jump table _021E310A: ldr r0, [r4, #4] ldr r1, _021E31D4 ; =0x00000844 - bl FUN_02016998 + bl AllocFromHeap ldr r2, _021E31D4 ; =0x00000844 str r0, [r4, #8] mov r1, #0 @@ -25822,12 +25822,12 @@ _021E329E: bl FUN_0201E6E4 ldr r0, _021E32D0 ; =0x00000804 ldr r0, [r5, r0] - bl FUN_02016A18 + bl FreeToHeap ldr r0, _021E32D4 ; =0x00000808 ldr r0, [r5, r0] - bl FUN_02016A18 + bl FreeToHeap ldr r0, [r4, #8] - bl FUN_02016A18 + bl FreeToHeap mov r0, #0 str r0, [r4, #8] ldr r0, [r4] @@ -25940,7 +25940,7 @@ MOD16_021E3348: ; 0x021E3348 ldr r0, [r0] bl FUN_02018148 add r0, r7, #0 - bl FUN_02016A18 + bl FreeToHeap ldr r1, [r6] ldr r0, _021E34C0 ; =0x00001764 ldr r0, [r1, r0] @@ -25971,7 +25971,7 @@ MOD16_021E3348: ; 0x021E3348 ldr r0, [r0] bl FUN_02018148 add r0, r7, #0 - bl FUN_02016A18 + bl FreeToHeap _021E33E6: ldr r1, [r6] ldr r0, _021E34C4 ; =0x0000176C @@ -26003,7 +26003,7 @@ _021E33E6: ldr r0, [r0] bl FUN_02018148 add r0, r7, #0 - bl FUN_02016A18 + bl FreeToHeap _021E342A: ldr r1, [r6] ldr r0, _021E34C8 ; =0x00001760 @@ -26035,7 +26035,7 @@ _021E342A: ldr r0, [r0] bl FUN_02018148 add r0, r7, #0 - bl FUN_02016A18 + bl FreeToHeap _021E346E: ldr r1, [r6] ldr r0, _021E34CC ; =0x00001768 @@ -26067,7 +26067,7 @@ _021E346E: ldr r0, [r0] bl FUN_02018148 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap _021E34B2: ldr r0, [r5] mov r1, #3 @@ -26972,7 +26972,7 @@ MOD16_021E3BC8: ; 0x021E3BC8 bl FUN_02018744 ldr r0, _021E3C10 ; =0x000007F4 ldr r0, [r5, r0] - bl FUN_02016A18 + bl FreeToHeap ldr r1, _021E3C10 ; =0x000007F4 mov r2, #0 str r2, [r5, r1] @@ -26980,7 +26980,7 @@ MOD16_021E3BC8: ; 0x021E3BC8 add r1, #8 str r2, [r5, r0] ldr r0, [r5, r1] - bl FUN_02016A18 + bl FreeToHeap ldr r0, _021E3C14 ; =0x000007FC mov r1, #0 str r1, [r5, r0] @@ -27026,7 +27026,7 @@ MOD16_021E3C18: ; 0x021E3C18 add r7, r1, r0 ldr r0, [sp, #0x2c] add r1, r7, #0 - bl FUN_020169D8 + bl AllocFromHeapAtEnd add r5, r0, #0 mov r1, #0 cmp r7, #0 @@ -27066,7 +27066,7 @@ _021E3C7E: lsl r1, r1, #6 str r0, [r6, r1] add r0, r5, #0 - bl FUN_02016A18 + bl FreeToHeap add r0, r6, #0 mov r1, #0x1e add r0, #0xec @@ -27142,7 +27142,7 @@ _021E3CEC: add r7, r1, r0 ldr r0, [sp, #0x2c] add r1, r7, #0 - bl FUN_020169D8 + bl AllocFromHeapAtEnd add r5, r0, #0 mov r1, #0 cmp r7, #0 @@ -27194,7 +27194,7 @@ _021E3D68: add r6, #0xc4 str r0, [r6] add r0, r5, #0 - bl FUN_02016A18 + bl FreeToHeap add sp, #0x3c pop {r4, r5, r6, r7, pc} .align 2, 0 @@ -27276,7 +27276,7 @@ _021E3E30: cmp r4, #0 beq _021E3E3C add r1, r4, #0 - bl FUN_02016998 + bl AllocFromHeap b _021E3E3E _021E3E3C: mov r0, #0 @@ -27871,7 +27871,7 @@ MOD16_021E42AC: ; 0x021E42AC push {r3, r4, r5, lr} add r5, r1, #0 mov r1, #8 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 bne _021E42BE bl ErrorHandling @@ -27902,7 +27902,7 @@ MOD16_021E42E8: ; 0x021E42E8 push {r3, r4, r5, lr} add r5, r1, #0 mov r1, #4 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 bne _021E42FA bl ErrorHandling @@ -27933,7 +27933,7 @@ MOD16_021E4314: ; 0x021E4314 bl ErrorHandling _021E431E: add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} .align 2, 0 thumb_func_end MOD16_021E4314 @@ -27946,7 +27946,7 @@ MOD16_021E4328: ; 0x021E4328 bl ErrorHandling _021E4332: add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} .align 2, 0 thumb_func_end MOD16_021E4328 @@ -27970,7 +27970,7 @@ MOD16_021E4344: ; 0x021E4344 ldr r0, [r5, #4] add r6, r1, #0 mov r1, #0x28 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 bne _021E435A bl ErrorHandling @@ -28027,7 +28027,7 @@ MOD16_021E43AC: ; 0x021E43AC add r0, r4, #0 bl MOD16_021E4968 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap mov r0, #1 pop {r4, pc} thumb_func_end MOD16_021E43AC @@ -28058,7 +28058,7 @@ _021E43E0: ; jump table _021E43E8: ldr r0, [r4, #4] mov r1, #0x2c - bl FUN_02016998 + bl AllocFromHeap str r0, [r4, #8] mov r1, #0 mov r2, #0x2c @@ -28211,9 +28211,9 @@ _021E450A: b _021E4534 _021E451C: ldr r0, [r5, #0x14] - bl FUN_02016A18 + bl FreeToHeap ldr r0, [r4, #8] - bl FUN_02016A18 + bl FreeToHeap ldr r0, [r4] add r0, r0, #1 str r0, [r4] @@ -28410,7 +28410,7 @@ MOD16_021E4634: ; 0x021E4634 ldr r0, [r0] bl FUN_02018148 add r0, r5, #0 - bl FUN_02016A18 + bl FreeToHeap ldr r0, [r4] mov r1, #6 ldr r0, [r0] @@ -28592,7 +28592,7 @@ MOD16_021E47E4: ; 0x021E47E4 add r4, r1, #0 add r0, r6, #0 mov r1, #4 - bl FUN_02016998 + bl AllocFromHeap str r0, [r5, #0x14] mov r1, #0xfe strb r1, [r0] @@ -28798,7 +28798,7 @@ MOD16_021E4968: ; 0x021E4968 ldr r0, [r4, #0x10] bl FUN_0202212C ldr r0, [r4, #0x14] - bl FUN_02016A18 + bl FreeToHeap mov r0, #0 str r0, [r4, #0x14] pop {r4, pc} @@ -28874,7 +28874,7 @@ _021E49F8: ldr r0, [r5, #0x14] cmp r0, #0 beq _021E4A04 - bl FUN_02016A18 + bl FreeToHeap _021E4A04: ldr r1, [r5, #0x18] add r2, r5, #0 @@ -28902,7 +28902,7 @@ _021E4A2E: ldr r0, [r5, #0x14] cmp r0, #0 beq _021E4A38 - bl FUN_02016A18 + bl FreeToHeap _021E4A38: ldr r1, [r5, #0x1c] add r2, r5, #0 @@ -29134,7 +29134,7 @@ MOD16_021E4BCC: ; 0x021E4BCC push {r3, r4, r5, lr} add r5, r1, #0 mov r1, #0x20 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 bne _021E4BDE bl ErrorHandling @@ -29163,7 +29163,7 @@ MOD16_021E4C08: ; 0x021E4C08 push {r3, r4, r5, lr} add r5, r1, #0 mov r1, #4 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 bne _021E4C1A bl ErrorHandling @@ -29188,7 +29188,7 @@ MOD16_021E4C30: ; 0x021E4C30 bl ErrorHandling _021E4C3A: add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} .align 2, 0 thumb_func_end MOD16_021E4C30 @@ -29201,7 +29201,7 @@ MOD16_021E4C44: ; 0x021E4C44 bl ErrorHandling _021E4C4E: add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} .align 2, 0 thumb_func_end MOD16_021E4C44 @@ -29309,7 +29309,7 @@ _021E4CF8: ; jump table _021E4D00: ldr r0, [r4, #4] mov r1, #0x74 - bl FUN_02016998 + bl AllocFromHeap str r0, [r4, #8] mov r1, #0 mov r2, #0x74 @@ -29502,7 +29502,7 @@ _021E4E58: str r0, [r4] b _021E4E76 _021E4E66: - bl FUN_02016A18 + bl FreeToHeap ldr r0, [r4] add r0, r0, #1 str r0, [r4] @@ -29631,7 +29631,7 @@ MOD16_021E4F1C: ; 0x021E4F1C ldr r0, [r0] bl FUN_02018148 add r0, r6, #0 - bl FUN_02016A18 + bl FreeToHeap str r4, [sp] ldr r0, [r5] mov r1, #0x33 @@ -29656,7 +29656,7 @@ MOD16_021E4F1C: ; 0x021E4F1C ldr r0, [r0] bl FUN_02018148 add r0, r6, #0 - bl FUN_02016A18 + bl FreeToHeap str r4, [sp] ldr r0, [r5] mov r1, #0x34 @@ -29682,7 +29682,7 @@ MOD16_021E4F1C: ; 0x021E4F1C ldr r0, [r0] bl FUN_02018148 add r0, r6, #0 - bl FUN_02016A18 + bl FreeToHeap str r4, [sp] ldr r0, [r5] mov r1, #0x36 @@ -29708,7 +29708,7 @@ MOD16_021E4F1C: ; 0x021E4F1C ldr r0, [r0] bl FUN_02018148 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap ldr r0, [r5] mov r1, #3 ldr r0, [r0] @@ -31344,7 +31344,7 @@ MOD16_021E5C88: ; 0x021E5C88 push {r3, r4, r5, lr} add r5, r1, #0 mov r1, #0x18 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 bne _021E5C9A bl ErrorHandling @@ -31377,7 +31377,7 @@ MOD16_021E5CC8: ; 0x021E5CC8 push {r3, r4, r5, lr} add r5, r1, #0 mov r1, #0xc - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 bne _021E5CDA bl ErrorHandling @@ -31410,7 +31410,7 @@ MOD16_021E5D00: ; 0x021E5D00 bl ErrorHandling _021E5D0A: add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} .align 2, 0 thumb_func_end MOD16_021E5D00 @@ -31423,7 +31423,7 @@ MOD16_021E5D14: ; 0x021E5D14 bl ErrorHandling _021E5D1E: add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} .align 2, 0 thumb_func_end MOD16_021E5D14 @@ -31516,7 +31516,7 @@ _021E5D9C: ; jump table _021E5DA4: ldr r0, [r4, #4] mov r1, #0xd0 - bl FUN_02016998 + bl AllocFromHeap str r0, [r4, #8] mov r1, #0 mov r2, #0xd0 @@ -31714,7 +31714,7 @@ _021E5F1C: str r0, [r4] b _021E5F3A _021E5F2A: - bl FUN_02016A18 + bl FreeToHeap ldr r0, [r4] add r0, r0, #1 str r0, [r4] @@ -31819,7 +31819,7 @@ MOD16_021E5FA4: ; 0x021E5FA4 ldr r0, [r0] bl FUN_02018148 add r0, r5, #0 - bl FUN_02016A18 + bl FreeToHeap ldr r0, [r4] mov r1, #3 ldr r0, [r0] @@ -33910,7 +33910,7 @@ MOD16_021E6F18: ; 0x021E6F18 push {r3, r4, r5, lr} add r5, r1, #0 mov r1, #0x20 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 bne _021E6F2A bl ErrorHandling @@ -33939,7 +33939,7 @@ MOD16_021E6F54: ; 0x021E6F54 push {r3, r4, r5, lr} add r5, r1, #0 mov r1, #4 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 bne _021E6F66 bl ErrorHandling @@ -33964,7 +33964,7 @@ MOD16_021E6F7C: ; 0x021E6F7C bl ErrorHandling _021E6F86: add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} .align 2, 0 thumb_func_end MOD16_021E6F7C @@ -33977,7 +33977,7 @@ MOD16_021E6F90: ; 0x021E6F90 bl ErrorHandling _021E6F9A: add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} .align 2, 0 thumb_func_end MOD16_021E6F90 @@ -34037,7 +34037,7 @@ _021E6FDC: ; jump table _021E6FE4: ldr r0, [r4, #4] mov r1, #0x58 - bl FUN_02016998 + bl AllocFromHeap str r0, [r4, #8] mov r1, #0 mov r2, #0x58 @@ -34230,7 +34230,7 @@ _021E713C: str r0, [r4] b _021E715A _021E714A: - bl FUN_02016A18 + bl FreeToHeap ldr r0, [r4] add r0, r0, #1 str r0, [r4] @@ -34339,7 +34339,7 @@ MOD16_021E71D0: ; 0x021E71D0 ldr r0, [r0] bl FUN_02018148 add r0, r6, #0 - bl FUN_02016A18 + bl FreeToHeap str r4, [sp] ldr r0, [r5] mov r1, #0x33 @@ -34364,7 +34364,7 @@ MOD16_021E71D0: ; 0x021E71D0 ldr r0, [r0] bl FUN_02018148 add r0, r6, #0 - bl FUN_02016A18 + bl FreeToHeap str r4, [sp] ldr r0, [r5] mov r1, #0x37 @@ -34390,7 +34390,7 @@ MOD16_021E71D0: ; 0x021E71D0 ldr r0, [r0] bl FUN_02018148 add r0, r6, #0 - bl FUN_02016A18 + bl FreeToHeap str r4, [sp] ldr r0, [r5] mov r1, #0x38 @@ -34416,7 +34416,7 @@ MOD16_021E71D0: ; 0x021E71D0 ldr r0, [r0] bl FUN_02018148 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap ldr r0, [r5] mov r1, #3 ldr r0, [r0] @@ -35582,7 +35582,7 @@ MOD16_021E7BB0: ; 0x021E7BB0 push {r3, r4, r5, lr} add r5, r1, #0 mov r1, #0x18 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 bne _021E7BC2 bl ErrorHandling @@ -35628,7 +35628,7 @@ MOD16_021E7C10: ; 0x021E7C10 push {r3, r4, r5, lr} add r5, r1, #0 mov r1, #4 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 bne _021E7C22 bl ErrorHandling @@ -35656,7 +35656,7 @@ MOD16_021E7C38: ; 0x021E7C38 mul r7, r1 add r0, r5, #0 add r1, r7, #0 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 bne _021E7C58 bl ErrorHandling @@ -35695,7 +35695,7 @@ MOD16_021E7C90: ; 0x021E7C90 bl ErrorHandling _021E7C9A: add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} .align 2, 0 thumb_func_end MOD16_021E7C90 @@ -35708,7 +35708,7 @@ MOD16_021E7CA4: ; 0x021E7CA4 bl ErrorHandling _021E7CAE: add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} .align 2, 0 thumb_func_end MOD16_021E7CA4 @@ -35729,7 +35729,7 @@ _021E7CC2: add r0, #0x28 bl MOD16_021DAC7C add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} thumb_func_end MOD16_021E7CB8 @@ -35746,7 +35746,7 @@ MOD16_021E7CE4: ; 0x021E7CE4 ldr r0, [r5, #4] add r6, r1, #0 mov r1, #0x3c - bl FUN_02016998 + bl AllocFromHeap mov r1, #0 mov r2, #0x3c add r4, r0, #0 @@ -35816,7 +35816,7 @@ MOD16_021E7D68: ; 0x021E7D68 add r0, r4, #0 bl MOD16_021E8088 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap mov r0, #1 pop {r4, pc} thumb_func_end MOD16_021E7D68 @@ -35846,7 +35846,7 @@ _021E7D9A: ; jump table _021E7DA2: ldr r0, [r4, #4] mov r1, #0xc4 - bl FUN_02016998 + bl AllocFromHeap str r0, [r4, #8] mov r1, #0 mov r2, #0xc4 @@ -36057,7 +36057,7 @@ _021E7F2A: b _021E7F4E _021E7F3C: add r0, r6, #0 - bl FUN_02016A18 + bl FreeToHeap ldr r0, [r4] add r0, r0, #1 str r0, [r4] @@ -36080,7 +36080,7 @@ MOD16_021E7F54: ; 0x021E7F54 add r4, r1, #0 add r0, r6, #0 mov r1, #0x20 - bl FUN_02016998 + bl AllocFromHeap str r0, [r5, #4] mov r0, #0xd0 str r0, [sp] @@ -36240,7 +36240,7 @@ MOD16_021E8088: ; 0x021E8088 ldr r0, [r4] bl FUN_0202212C ldr r0, [r4, #4] - bl FUN_02016A18 + bl FreeToHeap mov r0, #0 str r0, [r4, #4] pop {r4, pc} @@ -36508,7 +36508,7 @@ _021E829E: ldr r0, [r0] cmp r0, #0 beq _021E82AC - bl FUN_02016A18 + bl FreeToHeap _021E82AC: add r4, r4, #1 add r5, r5, #4 @@ -36559,7 +36559,7 @@ MOD16_021E82B8: ; 0x021E82B8 ldr r0, [r0] bl FUN_02018148 add r0, r6, #0 - bl FUN_02016A18 + bl FreeToHeap str r4, [sp] ldr r0, [r5] mov r1, #0x3c @@ -36585,7 +36585,7 @@ MOD16_021E82B8: ; 0x021E82B8 ldr r0, [r0] bl FUN_02018148 add r0, r6, #0 - bl FUN_02016A18 + bl FreeToHeap str r4, [sp] ldr r0, [r5] mov r1, #0x3f @@ -36611,7 +36611,7 @@ MOD16_021E82B8: ; 0x021E82B8 ldr r0, [r0] bl FUN_02018148 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap ldr r0, [r5] mov r1, #6 ldr r0, [r0] @@ -37329,7 +37329,7 @@ _021E8926: ldr r0, [r6] cmp r0, #0 beq _021E8934 - bl FUN_02016A18 + bl FreeToHeap _021E8934: ldr r0, [sp, #4] ldr r3, [sp, #0x34] @@ -37783,7 +37783,7 @@ MOD16_021E8C70: ; 0x021E8C70 push {r3, r4, r5, lr} add r5, r1, #0 mov r1, #0x34 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 bne _021E8C82 bl ErrorHandling @@ -37842,7 +37842,7 @@ MOD16_021E8CF4: ; 0x021E8CF4 push {r3, r4, r5, lr} add r5, r1, #0 mov r1, #4 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 bne _021E8D06 bl ErrorHandling @@ -37870,7 +37870,7 @@ MOD16_021E8D1C: ; 0x021E8D1C mul r7, r1 add r0, r5, #0 add r1, r7, #0 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 bne _021E8D3C bl ErrorHandling @@ -37940,7 +37940,7 @@ MOD16_021E8DBC: ; 0x021E8DBC bl ErrorHandling _021E8DC6: add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} .align 2, 0 thumb_func_end MOD16_021E8DBC @@ -37953,7 +37953,7 @@ MOD16_021E8DD0: ; 0x021E8DD0 bl ErrorHandling _021E8DDA: add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} .align 2, 0 thumb_func_end MOD16_021E8DD0 @@ -37989,7 +37989,7 @@ _021E8DEE: add r0, #0x8c bl MOD16_021DAC7C add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} thumb_func_end MOD16_021E8DE4 @@ -38070,7 +38070,7 @@ _021E8E96: ; jump table _021E8E9E: ldr r0, [r4, #4] mov r1, #0x28 - bl FUN_02016998 + bl AllocFromHeap str r0, [r4, #8] mov r1, #0 mov r2, #0x28 @@ -38244,7 +38244,7 @@ _021E8FE4: b _021E900C _021E8FF0: add r0, r1, #0 - bl FUN_02016A18 + bl FreeToHeap mov r0, #0 str r0, [r4, #8] ldr r0, [r4] @@ -38710,7 +38710,7 @@ _021E932E: ldr r0, [r0] bl FUN_02018148 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap ldr r0, [r5] mov r1, #2 ldr r0, [r0] @@ -39027,7 +39027,7 @@ MOD16_021E95D0: ; 0x021E95D0 push {r3, r4, r5, lr} add r5, r1, #0 mov r1, #0x34 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 bne _021E95E2 bl ErrorHandling @@ -39056,7 +39056,7 @@ MOD16_021E960C: ; 0x021E960C push {r3, r4, r5, lr} add r5, r1, #0 mov r1, #4 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 bne _021E961E bl ErrorHandling @@ -39087,7 +39087,7 @@ MOD16_021E9638: ; 0x021E9638 bl ErrorHandling _021E9642: add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} .align 2, 0 thumb_func_end MOD16_021E9638 @@ -39100,7 +39100,7 @@ MOD16_021E964C: ; 0x021E964C bl ErrorHandling _021E9656: add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} .align 2, 0 thumb_func_end MOD16_021E964C @@ -39124,7 +39124,7 @@ MOD16_021E9668: ; 0x021E9668 ldr r0, [r5, #4] add r4, r1, #0 mov r1, #0x1c - bl FUN_02016998 + bl AllocFromHeap add r6, r0, #0 add r2, r6, #0 mov r1, #0x1c @@ -39230,7 +39230,7 @@ MOD16_021E972C: ; 0x021E972C add r0, r5, #0 bl MOD16_021EA074 ldr r0, [r4, #8] - bl FUN_02016A18 + bl FreeToHeap mov r0, #0 str r0, [r4, #8] mov r0, #1 @@ -39263,7 +39263,7 @@ _021E976A: ; jump table _021E9774: ldr r0, [r4, #4] mov r1, #0x28 - bl FUN_02016998 + bl AllocFromHeap str r0, [r4, #8] mov r1, #0 mov r2, #0x28 @@ -39400,7 +39400,7 @@ _021E9860: str r0, [r4] b _021E9890 _021E987C: - bl FUN_02016A18 + bl FreeToHeap mov r0, #0 str r0, [r4, #8] ldr r0, [r4] @@ -39424,7 +39424,7 @@ MOD16_021E9894: ; 0x021E9894 add r4, r1, #0 add r0, r6, #0 mov r1, #0x18 - bl FUN_02016998 + bl AllocFromHeap str r0, [r5, #4] mov r0, #0x30 str r0, [sp] @@ -39585,7 +39585,7 @@ MOD16_021E99C0: ; 0x021E99C0 ldr r0, [r4] bl FUN_0202212C ldr r0, [r4, #4] - bl FUN_02016A18 + bl FreeToHeap mov r0, #0 str r0, [r4, #4] pop {r4, pc} @@ -39850,7 +39850,7 @@ _021E9B9E: ldr r0, [r0] bl FUN_02018148 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap ldr r0, [r5] mov r1, #5 ldr r0, [r0] @@ -40210,7 +40210,7 @@ MOD16_021E9E6C: ; 0x021E9E6C add r4, r1, #0 add r0, r6, #0 mov r1, #0xa8 - bl FUN_02016998 + bl AllocFromHeap str r0, [r5, #0x18] mov r0, #0x10 str r0, [sp] @@ -40460,7 +40460,7 @@ MOD16_021EA074: ; 0x021EA074 push {r4, lr} add r4, r0, #0 ldr r0, [r4, #0x18] - bl FUN_02016A18 + bl FreeToHeap ldr r0, [r4, #0x14] bl MOD16_021DB4A8 mov r0, #0 @@ -40754,7 +40754,7 @@ MOD16_021EA274: ; 0x021EA274 push {r3, r4, r5, lr} add r5, r1, #0 mov r1, #0x10 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 bne _021EA286 bl ErrorHandling @@ -40790,7 +40790,7 @@ MOD16_021EA2BC: ; 0x021EA2BC push {r3, r4, r5, lr} add r5, r1, #0 mov r1, #0x14 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 bne _021EA2CE bl ErrorHandling @@ -40818,7 +40818,7 @@ MOD16_021EA2E8: ; 0x021EA2E8 bl ErrorHandling _021EA2F2: add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} .align 2, 0 thumb_func_end MOD16_021EA2E8 @@ -40831,7 +40831,7 @@ MOD16_021EA2FC: ; 0x021EA2FC bl ErrorHandling _021EA306: add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} .align 2, 0 thumb_func_end MOD16_021EA2FC @@ -40852,7 +40852,7 @@ MOD16_021EA314: ; 0x021EA314 add r7, r0, #0 ldr r0, [r5, #4] mov r1, #0x18 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 bne _021EA332 bl ErrorHandling @@ -40909,7 +40909,7 @@ MOD16_021EA388: ; 0x021EA388 push {r4, lr} add r4, r0, #0 ldr r0, [r4, #8] - bl FUN_02016A18 + bl FreeToHeap mov r0, #0 str r0, [r4, #8] mov r0, #1 @@ -40943,7 +40943,7 @@ _021EA3C2: mov r1, #0x33 ldr r0, [r4, #4] lsl r1, r1, #4 - bl FUN_02016998 + bl AllocFromHeap mov r2, #0x33 str r0, [r4, #8] mov r1, #0 @@ -41107,7 +41107,7 @@ _021EA4F6: str r0, [r4] b _021EA518 _021EA504: - bl FUN_02016A18 + bl FreeToHeap mov r0, #0 str r0, [r4, #8] ldr r0, [r4] @@ -41542,7 +41542,7 @@ MOD16_021EA7F0: ; 0x021EA7F0 ldr r0, [r0] bl FUN_02018148 add r0, r5, #0 - bl FUN_02016A18 + bl FreeToHeap ldr r0, [r4] mov r1, #3 ldr r0, [r0] @@ -42459,7 +42459,7 @@ MOD16_021EAF18: ; 0x021EAF18 push {r3, r4, r5, lr} add r5, r1, #0 mov r1, #0x10 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 bne _021EAF2A bl ErrorHandling @@ -42492,7 +42492,7 @@ MOD16_021EAF58: ; 0x021EAF58 push {r3, r4, r5, lr} add r5, r1, #0 mov r1, #4 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 bne _021EAF6A bl ErrorHandling @@ -42523,7 +42523,7 @@ MOD16_021EAF84: ; 0x021EAF84 bl ErrorHandling _021EAF8E: add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} .align 2, 0 thumb_func_end MOD16_021EAF84 @@ -42536,7 +42536,7 @@ MOD16_021EAF98: ; 0x021EAF98 bl ErrorHandling _021EAFA2: add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} .align 2, 0 thumb_func_end MOD16_021EAF98 @@ -42563,7 +42563,7 @@ MOD16_021EAFB4: ; 0x021EAFB4 add r7, r0, #0 ldr r0, [r5, #4] mov r1, #0x70 - bl FUN_02016998 + bl AllocFromHeap mov r1, #0 mov r2, #0x70 add r4, r0, #0 @@ -42655,7 +42655,7 @@ MOD16_021EB078: ; 0x021EB078 add r0, r4, #0 bl MOD16_021EB3F4 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap mov r0, #1 pop {r4, pc} thumb_func_end MOD16_021EB078 @@ -42684,7 +42684,7 @@ _021EB0A8: ; jump table _021EB0B0: ldr r0, [r4, #4] mov r1, #0x74 - bl FUN_02016998 + bl AllocFromHeap str r0, [r4, #8] mov r1, #0 mov r2, #0x74 @@ -42834,7 +42834,7 @@ _021EB1D0: b _021EB1F4 _021EB1E2: add r0, r5, #0 - bl FUN_02016A18 + bl FreeToHeap ldr r0, [r4] add r0, r0, #1 str r0, [r4] @@ -43004,11 +43004,11 @@ MOD16_021EB31C: ; 0x021EB31C add r6, r1, #0 add r0, r4, #0 mov r1, #0xc - bl FUN_02016998 + bl AllocFromHeap str r0, [r5, #4] add r0, r4, #0 mov r1, #8 - bl FUN_02016998 + bl AllocFromHeap str r0, [r5, #0x10] mov r0, #0x6a str r0, [sp] @@ -43110,11 +43110,11 @@ MOD16_021EB3F4: ; 0x021EB3F4 ldr r0, [r4, #0x14] bl FUN_0202212C ldr r0, [r4, #4] - bl FUN_02016A18 + bl FreeToHeap mov r0, #0 str r0, [r4, #4] ldr r0, [r4, #0x10] - bl FUN_02016A18 + bl FreeToHeap mov r0, #0 str r0, [r4, #0x10] pop {r4, pc} @@ -43576,7 +43576,7 @@ MOD16_021EB724: ; 0x021EB724 ldr r0, [r0] bl FUN_02018148 add r0, r6, #0 - bl FUN_02016A18 + bl FreeToHeap ldr r0, [r5] mov r1, #6 ldr r0, [r0] @@ -43616,7 +43616,7 @@ MOD16_021EB724: ; 0x021EB724 ldr r0, [r0] bl FUN_02018148 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap ldr r0, [r5] mov r1, #7 ldr r0, [r0] @@ -44756,7 +44756,7 @@ MOD16_021EC080: ; 0x021EC080 push {r4, lr} add r4, r0, #0 ldr r0, [r4, #0x68] - bl FUN_02016A18 + bl FreeToHeap mov r0, #0 str r0, [r4, #0x68] str r0, [r4, #0x6c] @@ -45040,7 +45040,7 @@ MOD16_021EC274: ; 0x021EC274 push {r3, r4, r5, lr} add r5, r1, #0 mov r1, #0xc - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 bne _021EC286 bl ErrorHandling @@ -45078,7 +45078,7 @@ MOD16_021EC2C0: ; 0x021EC2C0 push {r3, r4, r5, lr} add r5, r1, #0 mov r1, #4 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 bne _021EC2D2 bl ErrorHandling @@ -45109,7 +45109,7 @@ MOD16_021EC2EC: ; 0x021EC2EC bl ErrorHandling _021EC2F6: add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} .align 2, 0 thumb_func_end MOD16_021EC2EC @@ -45122,7 +45122,7 @@ MOD16_021EC300: ; 0x021EC300 bl ErrorHandling _021EC30A: add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} .align 2, 0 thumb_func_end MOD16_021EC300 @@ -45145,7 +45145,7 @@ MOD16_021EC31C: ; 0x021EC31C add r5, r0, #0 ldr r0, [r5, #4] mov r1, #4 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 bne _021EC330 bl ErrorHandling @@ -45178,7 +45178,7 @@ MOD16_021EC350: ; 0x021EC350 push {r4, lr} add r4, r0, #0 ldr r0, [r4, #8] - bl FUN_02016A18 + bl FreeToHeap mov r0, #0 str r0, [r4, #8] mov r0, #1 @@ -45211,7 +45211,7 @@ _021EC382: ; jump table _021EC38A: ldr r0, [r4, #4] mov r1, #0x14 - bl FUN_02016998 + bl AllocFromHeap str r0, [r4, #8] mov r2, #0x14 mov r1, #0 @@ -45312,7 +45312,7 @@ _021EC434: str r0, [r4] b _021EC456 _021EC442: - bl FUN_02016A18 + bl FreeToHeap mov r0, #0 str r0, [r4, #8] ldr r0, [r4] @@ -45544,7 +45544,7 @@ MOD16_021EC5A8: ; 0x021EC5A8 ldr r0, [r0] bl FUN_02018148 add r0, r5, #0 - bl FUN_02016A18 + bl FreeToHeap ldr r0, [r4] mov r1, #3 ldr r0, [r0] @@ -46204,7 +46204,7 @@ MOD16_021ECB54: ; 0x021ECB54 push {r3, r4, r5, lr} add r5, r1, #0 mov r1, #0x10 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 bne _021ECB66 bl ErrorHandling @@ -46239,7 +46239,7 @@ MOD16_021ECB98: ; 0x021ECB98 push {r3, r4, r5, lr} add r5, r1, #0 mov r1, #4 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 bne _021ECBAA bl ErrorHandling @@ -46267,7 +46267,7 @@ MOD16_021ECBC0: ; 0x021ECBC0 mul r7, r1 add r0, r5, #0 add r1, r7, #0 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 bne _021ECBE0 bl ErrorHandling @@ -46299,7 +46299,7 @@ MOD16_021ECC08: ; 0x021ECC08 bl ErrorHandling _021ECC12: add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} .align 2, 0 thumb_func_end MOD16_021ECC08 @@ -46312,7 +46312,7 @@ MOD16_021ECC1C: ; 0x021ECC1C bl ErrorHandling _021ECC26: add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} .align 2, 0 thumb_func_end MOD16_021ECC1C @@ -46330,7 +46330,7 @@ _021ECC3A: add r0, #0x14 bl MOD16_021DAC7C add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} thumb_func_end MOD16_021ECC30 @@ -46347,7 +46347,7 @@ MOD16_021ECC54: ; 0x021ECC54 ldr r0, [r5, #4] add r4, r1, #0 mov r1, #0x18 - bl FUN_02016998 + bl AllocFromHeap add r6, r0, #0 add r2, r6, #0 mov r1, #0x18 @@ -46432,7 +46432,7 @@ MOD16_021ECCF4: ; 0x021ECCF4 add r0, r4, #0 bl MOD16_021ECFD4 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap mov r0, #1 pop {r4, pc} thumb_func_end MOD16_021ECCF4 @@ -46461,7 +46461,7 @@ _021ECD24: ; jump table _021ECD2C: ldr r0, [r4, #4] mov r1, #0x40 - bl FUN_02016998 + bl AllocFromHeap str r0, [r4, #8] mov r1, #0 mov r2, #0x40 @@ -46595,7 +46595,7 @@ _021ECE1E: b _021ECE42 _021ECE30: add r0, r6, #0 - bl FUN_02016A18 + bl FreeToHeap ldr r0, [r4] add r0, r0, #1 str r0, [r4] @@ -46754,7 +46754,7 @@ MOD16_021ECF40: ; 0x021ECF40 add r4, r1, #0 add r0, r6, #0 mov r1, #8 - bl FUN_02016998 + bl AllocFromHeap str r0, [r5, #4] mov r0, #0x80 str r0, [sp] @@ -46837,7 +46837,7 @@ MOD16_021ECFD4: ; 0x021ECFD4 ldr r0, [r4] bl FUN_0202212C ldr r0, [r4, #4] - bl FUN_02016A18 + bl FreeToHeap mov r0, #0 str r0, [r4, #4] pop {r4, pc} @@ -46952,7 +46952,7 @@ _021ED0BA: ldr r0, [r5, #0x38] cmp r0, #0 beq _021ED0C4 - bl FUN_02016A18 + bl FreeToHeap _021ED0C4: add r4, r4, #1 add r5, r5, #4 @@ -47003,7 +47003,7 @@ MOD16_021ED0D0: ; 0x021ED0D0 ldr r0, [r0] bl FUN_02018148 add r0, r5, #0 - bl FUN_02016A18 + bl FreeToHeap ldr r0, [r4] mov r1, #6 ldr r0, [r0] @@ -47387,7 +47387,7 @@ _021ED422: ldr r0, [r6] cmp r0, #0 beq _021ED430 - bl FUN_02016A18 + bl FreeToHeap _021ED430: ldr r0, [sp, #4] ldr r3, [sp, #0x34] @@ -47619,7 +47619,7 @@ MOD16_021ED5C8: ; 0x021ED5C8 push {r3, r4, r5, lr} add r5, r1, #0 mov r1, #8 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 bne _021ED5DA bl ErrorHandling @@ -47651,7 +47651,7 @@ MOD16_021ED604: ; 0x021ED604 add r6, r1, #0 mov r1, #0x20 add r5, r0, #0 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 bne _021ED618 bl ErrorHandling @@ -47685,7 +47685,7 @@ MOD16_021ED648: ; 0x021ED648 bl ErrorHandling _021ED652: add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} .align 2, 0 thumb_func_end MOD16_021ED648 @@ -47702,7 +47702,7 @@ _021ED666: add r0, r4, #0 bl MOD16_021EE14C add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} .align 2, 0 thumb_func_end MOD16_021ED65C @@ -47720,7 +47720,7 @@ MOD16_021ED680: ; 0x021ED680 ldr r0, [r6, #4] add r5, r1, #0 mov r1, #8 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 bne _021ED696 bl ErrorHandling @@ -47789,7 +47789,7 @@ MOD16_021ED6FC: ; 0x021ED6FC push {r4, lr} add r4, r0, #0 ldr r0, [r4, #8] - bl FUN_02016A18 + bl FreeToHeap mov r0, #0 str r0, [r4, #8] mov r0, #1 @@ -47823,7 +47823,7 @@ _021ED730: ; jump table _021ED738: ldr r0, [r4, #4] mov r1, #0xc4 - bl FUN_02016998 + bl AllocFromHeap str r0, [r4, #8] mov r1, #0 mov r2, #0xc4 @@ -48046,7 +48046,7 @@ _021ED8CA: bl FUN_0200CAB4 _021ED8DA: ldr r0, [r4, #8] - bl FUN_02016A18 + bl FreeToHeap mov r0, #0 str r0, [r4, #8] ldr r0, [r4] @@ -48301,7 +48301,7 @@ MOD16_021EDA7C: ; 0x021EDA7C ldr r0, [r0] bl FUN_02018148 add r0, r5, #0 - bl FUN_02016A18 + bl FreeToHeap ldr r0, [r4] mov r1, #3 ldr r0, [r0] @@ -48382,7 +48382,7 @@ MOD16_021EDAE4: ; 0x021EDAE4 _021EDB82: add r0, r4, #0 mov r1, #0x60 - bl FUN_02016998 + bl AllocFromHeap add r1, r5, #0 add r1, #0xbc str r0, [r1] @@ -48447,7 +48447,7 @@ _021EDB82: bl FUN_02009D68 add r0, r4, #0 mov r1, #0xa0 - bl FUN_02016998 + bl AllocFromHeap add r1, r5, #0 add r1, #0xc0 str r0, [r1] @@ -48542,10 +48542,10 @@ MOD16_021EDC70: ; 0x021EDC70 add r0, r5, #0 add r0, #0xbc ldr r0, [r0] - bl FUN_02016A18 + bl FreeToHeap add r5, #0xc0 ldr r0, [r5] - bl FUN_02016A18 + bl FreeToHeap pop {r3, r4, r5, pc} .align 2, 0 thumb_func_end MOD16_021EDC70 @@ -49026,9 +49026,9 @@ MOD16_021EE0F0: ; 0x021EE0F0 ldr r0, [r4, #8] bl FUN_02013E44 ldr r0, [r4, #0x10] - bl FUN_02016A18 + bl FreeToHeap ldr r0, [r4, #0x14] - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} .align 2, 0 thumb_func_end MOD16_021EE0F0 @@ -49814,7 +49814,7 @@ MOD16_021EE6CC: ; 0x021EE6CC push {r3, r4, r5, lr} add r5, r1, #0 mov r1, #0x10 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 bne _021EE6DE bl ErrorHandling @@ -49850,7 +49850,7 @@ MOD16_021EE714: ; 0x021EE714 push {r3, r4, r5, lr} add r5, r1, #0 mov r1, #4 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 bne _021EE726 bl ErrorHandling @@ -49881,7 +49881,7 @@ MOD16_021EE740: ; 0x021EE740 bl ErrorHandling _021EE74A: add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} .align 2, 0 thumb_func_end MOD16_021EE740 @@ -49894,7 +49894,7 @@ MOD16_021EE754: ; 0x021EE754 bl ErrorHandling _021EE75E: add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} .align 2, 0 thumb_func_end MOD16_021EE754 @@ -49918,7 +49918,7 @@ MOD16_021EE770: ; 0x021EE770 ldr r0, [r5, #4] add r6, r1, #0 mov r1, #0x18 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 add r2, r4, #0 mov r1, #0x18 @@ -50001,7 +50001,7 @@ MOD16_021EE810: ; 0x021EE810 add r0, r4, #0 bl MOD16_021EEAA0 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap mov r0, #1 pop {r4, pc} thumb_func_end MOD16_021EE810 @@ -50030,7 +50030,7 @@ _021EE840: ; jump table _021EE848: ldr r0, [r4, #4] mov r1, #0x30 - bl FUN_02016998 + bl AllocFromHeap str r0, [r4, #8] mov r1, #0 mov r2, #0x30 @@ -50164,7 +50164,7 @@ _021EE93A: b _021EE95E _021EE94C: add r0, r6, #0 - bl FUN_02016A18 + bl FreeToHeap ldr r0, [r4] add r0, r0, #1 str r0, [r4] @@ -50305,7 +50305,7 @@ MOD16_021EEA3C: ; 0x021EEA3C add r4, r1, #0 add r0, r6, #0 mov r1, #4 - bl FUN_02016998 + bl AllocFromHeap str r0, [r5, #4] mov r0, #0xf8 str r0, [sp] @@ -50361,7 +50361,7 @@ MOD16_021EEAA0: ; 0x021EEAA0 ldr r0, [r4] bl FUN_0202212C ldr r0, [r4, #4] - bl FUN_02016A18 + bl FreeToHeap mov r0, #0 str r0, [r4, #4] pop {r4, pc} @@ -50444,7 +50444,7 @@ MOD16_021EEB10: ; 0x021EEB10 ldr r0, [r5, #0x2c] cmp r0, #0 beq _021EEB4A - bl FUN_02016A18 + bl FreeToHeap _021EEB4A: add sp, #8 pop {r3, r4, r5, pc} @@ -50492,7 +50492,7 @@ MOD16_021EEB50: ; 0x021EEB50 ldr r0, [r0] bl FUN_02018148 add r0, r5, #0 - bl FUN_02016A18 + bl FreeToHeap ldr r0, [r4] mov r1, #6 ldr r0, [r0] @@ -50815,7 +50815,7 @@ _021EEE1E: ldr r0, [r6] cmp r0, #0 beq _021EEE2C - bl FUN_02016A18 + bl FreeToHeap _021EEE2C: ldr r0, [sp, #4] ldr r3, [sp, #0x34] @@ -50955,7 +50955,7 @@ MOD16_021EEF0C: ; 0x021EEF0C mov r1, #0x7a ldr r0, [r5, #0xc] lsl r1, r1, #2 - bl FUN_02016998 + bl AllocFromHeap mov r2, #0x7a add r4, r0, #0 mov r1, #0 @@ -51000,7 +51000,7 @@ MOD16_021EEF68: ; 0x021EEF68 ldr r0, [r4, r0] bl FUN_0200CAB4 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} .align 2, 0 thumb_func_end MOD16_021EEF68 @@ -52074,7 +52074,7 @@ MOD16_021EF790: ; 0x021EF790 add r0, r5, #0 bl FUN_02018148 add r0, r6, #0 - bl FUN_02016A18 + bl FreeToHeap str r4, [sp] mov r0, #0x45 mov r1, #0x33 @@ -52098,7 +52098,7 @@ MOD16_021EF790: ; 0x021EF790 add r0, r5, #0 bl FUN_02018148 add r0, r6, #0 - bl FUN_02016A18 + bl FreeToHeap str r4, [sp] mov r0, #0x45 mov r1, #0x34 @@ -52123,7 +52123,7 @@ MOD16_021EF790: ; 0x021EF790 add r0, r5, #0 bl FUN_02018148 add r0, r6, #0 - bl FUN_02016A18 + bl FreeToHeap str r4, [sp] mov r0, #0x45 mov r1, #0x36 @@ -52148,7 +52148,7 @@ MOD16_021EF790: ; 0x021EF790 add r0, r5, #0 bl FUN_02018148 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap add r0, r5, #0 mov r1, #3 bl FUN_0201AC68 @@ -52196,7 +52196,7 @@ MOD16_021EF8A8: ; 0x021EF8A8 add r0, r4, #0 bl FUN_02018148 add r0, r5, #0 - bl FUN_02016A18 + bl FreeToHeap add r0, r4, #0 mov r1, #2 bl FUN_0201AC68 @@ -52569,7 +52569,7 @@ MOD16_021EFBA4: ; 0x021EFBA4 mov r4, #0 _021EFBAA: ldr r0, [r5] - bl FUN_02016A18 + bl FreeToHeap add r4, r4, #1 cmp r4, #2 blt _021EFBAA diff --git a/arm9/modules/17/asm/module_17.s b/arm9/modules/17/asm/module_17.s index 2703b8a1..633c2690 100644 --- a/arm9/modules/17/asm/module_17.s +++ b/arm9/modules/17/asm/module_17.s @@ -10,12 +10,12 @@ MOD17_021D74E0: ; 0x021D74E0 add r5, r0, #0 add r0, r7, #0 mov r1, #8 - bl FUN_02016998 + bl AllocFromHeap lsl r6, r5, #3 add r4, r0, #0 add r0, r7, #0 add r1, r6, #0 - bl FUN_02016998 + bl AllocFromHeap mov r1, #0 add r2, r6, #0 str r0, [r4] @@ -31,9 +31,9 @@ MOD17_021D750C: ; 0x021D750C push {r4, lr} add r4, r0, #0 ldr r0, [r4] - bl FUN_02016A18 + bl FreeToHeap add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} .align 2, 0 thumb_func_end MOD17_021D750C @@ -484,7 +484,7 @@ MOD17_021D7828: ; 0x021D7828 add r0, r4, #0 bl MOD17_021D8058 ldr r0, [r4, #0x38] - bl FUN_02016A18 + bl FreeToHeap add r0, r4, #0 bl MOD17_021D834C add r0, r4, #0 @@ -492,11 +492,11 @@ MOD17_021D7828: ; 0x021D7828 add r0, r4, #0 bl MOD17_021D80B4 ldr r0, [r4, #4] - bl FUN_02016A18 + bl FreeToHeap mov r0, #0 str r0, [r4, #4] ldr r0, [r4, #0x10] - bl FUN_02016A18 + bl FreeToHeap mov r0, #0 str r0, [r4, #0x10] pop {r4, pc} @@ -1003,11 +1003,11 @@ MOD17_021D7BE4: ; 0x021D7BE4 add r0, r4, #0 bl MOD17_021D834C ldr r0, [r4, #4] - bl FUN_02016A18 + bl FreeToHeap mov r0, #0 str r0, [r4, #4] ldr r0, [r4, #0x10] - bl FUN_02016A18 + bl FreeToHeap mov r0, #0 str r0, [r4, #0x10] pop {r4, pc} @@ -1125,7 +1125,7 @@ MOD17_021D7CD8: ; 0x021D7CD8 add r4, r0, #0 bl MOD17_021D8058 ldr r0, [r4, #0x38] - bl FUN_02016A18 + bl FreeToHeap add r0, r4, #0 bl MOD17_021D816C pop {r4, pc} @@ -1297,7 +1297,7 @@ MOD17_021D7E1C: ; 0x021D7E1C mov r1, #0x76 ldr r0, [r4, #0xc] lsl r1, r1, #2 - bl FUN_02016998 + bl AllocFromHeap str r0, [r5, #4] mov r0, #0x76 str r0, [r5, #8] @@ -1305,7 +1305,7 @@ MOD17_021D7E1C: ; 0x021D7E1C str r0, [r5, #0xc] ldr r0, [r4, #0xc] mov r1, #0x4c - bl FUN_02016998 + bl AllocFromHeap str r0, [r5, #0x10] mov r0, #0x13 str r0, [r5, #0x14] @@ -1611,7 +1611,7 @@ MOD17_021D8088: ; 0x021D8088 str r0, [r4, #0x2c] mov r0, #0xe lsl r1, r1, #2 - bl FUN_02016998 + bl AllocFromHeap mov r2, #0x77 mov r1, #0 lsl r2, r2, #2 @@ -1628,7 +1628,7 @@ MOD17_021D80B4: ; 0x021D80B4 push {r4, lr} add r4, r0, #0 ldr r0, [r4, #0x30] - bl FUN_02016A18 + bl FreeToHeap ldr r0, [r4, #0x2c] bl FUN_02020C90 mov r0, #0 @@ -1899,7 +1899,7 @@ MOD17_021D82D4: ; 0x021D82D4 push {r4, lr} add r4, r0, #0 ldr r0, [r4, #0x28] - bl FUN_02016A18 + bl FreeToHeap mov r0, #0 str r0, [r4, #0x28] pop {r4, pc} @@ -1974,7 +1974,7 @@ MOD17_021D8358: ; 0x021D8358 ldr r1, [sp] add r0, r7, #0 add r6, r2, #0 - bl FUN_02016998 + bl AllocFromHeap ldr r2, [sp] mov r1, #0 str r0, [r5] @@ -1989,7 +1989,7 @@ MOD17_021D8358: ; 0x021D8358 mul r4, r0 add r0, r7, #0 add r1, r4, #0 - bl FUN_02016998 + bl AllocFromHeap mov r1, #0 add r2, r4, #0 str r0, [r5, #8] @@ -2022,11 +2022,11 @@ _021D83BE: str r0, [r4, #0x14] _021D83CC: ldr r0, [r4] - bl FUN_02016A18 + bl FreeToHeap mov r0, #0 str r0, [r4] ldr r0, [r4, #8] - bl FUN_02016A18 + bl FreeToHeap mov r0, #0 str r0, [r4, #8] pop {r4, pc} @@ -4324,7 +4324,7 @@ MOD17_021D964C: ; 0x021D964C mov r1, #0xac str r2, [sp, #4] add r4, r3, #0 - bl FUN_02016998 + bl AllocFromHeap add r6, r0, #0 bl MOD17_021D9CD4 ldr r1, [sp] @@ -4394,7 +4394,7 @@ _021D96DE: add r0, r7, #0 bl FUN_02027710 add r0, r6, #0 - bl FUN_02016A18 + bl FreeToHeap add sp, #8 pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -7258,7 +7258,7 @@ MOD17_021DAB48: ; 0x021DAB48 add r5, r0, #0 mov r0, #0xe lsl r1, r4, #4 - bl FUN_02016998 + bl AllocFromHeap str r0, [r5] str r4, [r5, #4] mov r6, #0 @@ -7294,7 +7294,7 @@ MOD17_021DAB8C: ; 0x021DAB8C push {r4, lr} add r4, r0, #0 ldr r0, [r4] - bl FUN_02016A18 + bl FreeToHeap mov r0, #0 str r0, [r4] strb r0, [r4] @@ -7495,7 +7495,7 @@ MOD17_021DACA4: ; 0x021DACA4 mov r0, #0xd mul r1, r2 str r2, [r4, #0x2c] - bl FUN_02016998 + bl AllocFromHeap str r0, [r4, #0x28] cmp r0, #0 bne _021DAD04 @@ -7683,7 +7683,7 @@ _021DAE40: mov r1, #0 str r1, [r0, #0x3c] ldr r0, [r4, #0x28] - bl FUN_02016A18 + bl FreeToHeap add r0, r5, #0 bl FUN_0200621C add sp, #4 @@ -7983,7 +7983,7 @@ MOD17_021DB038: ; 0x021DB038 bl MOD17_021DAF48 mov r0, #0xd mov r1, #0x34 - bl FUN_02016998 + bl AllocFromHeap str r0, [r5] mov r1, #0 mov r2, #0x34 @@ -8017,7 +8017,7 @@ MOD17_021DB08C: ; 0x021DB08C push {r4, lr} add r4, r0, #0 ldr r0, [r4] - bl FUN_02016A18 + bl FreeToHeap add r0, r4, #0 bl MOD17_021DAF48 pop {r4, pc} @@ -8928,7 +8928,7 @@ MOD17_021DB700: ; 0x021DB700 strb r0, [r5, #8] add r0, r6, #0 strb r7, [r5, #9] - bl FUN_02016A18 + bl FreeToHeap str r4, [r5, #0xc] add sp, #0x1c pop {r4, r5, r6, r7, pc} @@ -9273,7 +9273,7 @@ MOD17_021DB9F4: ; 0x021DB9F4 add r5, r0, #0 add r0, r2, #0 add r1, r4, #0 - bl FUN_02016998 + bl AllocFromHeap str r0, [r5] cmp r0, #0 bne _021DBA0E @@ -9292,7 +9292,7 @@ MOD17_021DBA1C: ; 0x021DBA1C push {r4, lr} add r4, r0, #0 ldr r0, [r4] - bl FUN_02016A18 + bl FreeToHeap mov r0, #0 str r0, [r4] str r0, [r4, #4] @@ -9832,7 +9832,7 @@ _021DBDAA: ldr r3, [r3, #0x14] bl MOD17_021DC004 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap _021DBDE4: add sp, #0x18 pop {r3, r4, r5, pc} @@ -9869,7 +9869,7 @@ MOD17_021DBDE8: ; 0x021DBDE8 ldr r3, [r3, #0x14] bl MOD17_021DC004 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap mov r1, #0x18 mov r0, #0 _021DBE2E: @@ -10045,7 +10045,7 @@ _021DBF2A: ldr r1, [r5, #0x1c] bl MOD17_021DC004 ldr r0, [sp, #0x20] - bl FUN_02016A18 + bl FreeToHeap cmp r4, #0 beq _021DBF86 str r7, [r4] @@ -10190,7 +10190,7 @@ MOD17_021DC084: ; 0x021DC084 mov r1, #0x14 add r5, r2, #0 add r6, r3, #0 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 add r2, r4, #0 mov r1, #0x14 @@ -10231,7 +10231,7 @@ MOD17_021DC0D4: ; 0x021DC0D4 mov r1, #0x14 add r5, r2, #0 add r6, r3, #0 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 add r2, r4, #0 mov r1, #0x14 @@ -10282,9 +10282,9 @@ MOD17_021DC11C: ; 0x021DC11C add r0, r5, #0 bl FUN_0200CAB4 ldr r0, [r4, #8] - bl FUN_02016A18 + bl FreeToHeap add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r3, r4, r5, pc} .align 2, 0 thumb_func_end MOD17_021DC11C @@ -10319,9 +10319,9 @@ _021DC18C: add r0, r5, #0 bl FUN_0200CAB4 ldr r0, [r4, #4] - bl FUN_02016A18 + bl FreeToHeap add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r3, r4, r5, pc} thumb_func_end MOD17_021DC158 @@ -12981,9 +12981,9 @@ _021DD552: mov r0, #0x8a lsl r0, r0, #2 ldr r0, [r4, r0] - bl FUN_02016A18 + bl FreeToHeap add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} .align 2, 0 thumb_func_end MOD17_021DD540 @@ -13197,7 +13197,7 @@ MOD17_021DD6DC: ; 0x021DD6DC mov r1, #0x97 ldr r0, [r5, #0x68] lsl r1, r1, #2 - bl FUN_02016998 + bl AllocFromHeap mov r2, #0x97 mov r1, #0 lsl r2, r2, #2 @@ -13267,7 +13267,7 @@ MOD17_021DD778: ; 0x021DD778 mov r1, #0x97 ldr r0, [r5, #0x68] lsl r1, r1, #2 - bl FUN_02016998 + bl AllocFromHeap mov r2, #0x97 mov r1, #0 lsl r2, r2, #2 @@ -14085,7 +14085,7 @@ _021DDD96: ldr r0, [r5, #0x4c] bl FUN_020186B4 add r0, r6, #0 - bl FUN_02016A18 + bl FreeToHeap ldr r0, [r5, #0x4c] mov r1, #1 bl FUN_0201AC68 @@ -14513,7 +14513,7 @@ MOD17_021DE0F4: ; 0x021DE0F4 mov r1, #4 bl FUN_0200ACF8 add r0, r6, #0 - bl FUN_02016A18 + bl FreeToHeap ldr r2, _021DE24C ; =0x00000151 mov r0, #0 mov r1, #0x1a diff --git a/arm9/modules/18/asm/module_18.s b/arm9/modules/18/asm/module_18.s index acbd812b..879113e6 100644 --- a/arm9/modules/18/asm/module_18.s +++ b/arm9/modules/18/asm/module_18.s @@ -261,7 +261,7 @@ _02239892: _02239896: ldr r0, _022398A8 ; =0x02251380 ldr r0, [r0] - bl FUN_02016A18 + bl FreeToHeap ldr r0, _022398A8 ; =0x02251380 mov r1, #0 str r1, [r0] @@ -1958,7 +1958,7 @@ _0223A5EC: ldr r0, [r5, #0x18] cmp r0, #0 beq _0223A5F8 - bl FUN_02016A18 + bl FreeToHeap str r6, [r5, #0x18] _0223A5F8: add r4, r4, #1 @@ -1978,7 +1978,7 @@ _0223A5F8: ldr r0, _0223A648 ; =0x02251380 ldr r0, [r0] ldr r0, [r0, #4] - bl FUN_02016A18 + bl FreeToHeap ldr r0, _0223A648 ; =0x02251380 mov r1, #0 ldr r0, [r0] @@ -2526,7 +2526,7 @@ _0223AA5C: lsl r0, r0, #6 str r2, [r1, r0] add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap add r0, r6, #0 bl FUN_0200CAB4 mov r0, #1 @@ -2703,7 +2703,7 @@ MOD18_0223AC24: ; 0x0223AC24 bl FUN_02028AD4 mov r0, #0xb mov r1, #0x54 - bl FUN_020169D8 + bl AllocFromHeapAtEnd add r4, r0, #0 mov r1, #0 mov r2, #0x54 @@ -6324,7 +6324,7 @@ _0223C7F6: mov r1, #0x5e mov r0, #0xb lsl r1, r1, #4 - bl FUN_020169D8 + bl AllocFromHeapAtEnd mov r2, #0x5e mov r1, #0 lsl r2, r2, #4 @@ -6370,7 +6370,7 @@ MOD18_0223C848: ; 0x0223C848 ldr r1, [r0] ldr r0, _0223C880 ; =0x00000884 ldr r0, [r1, r0] - bl FUN_02016A18 + bl FreeToHeap ldr r1, _0223C878 ; =0x02251380 ldr r0, _0223C87C ; =0x00000878 ldr r2, [r1] @@ -6966,7 +6966,7 @@ MOD18_0223CCA8: ; 0x0223CCA8 ldr r0, [r0] cmp r0, #0 beq _0223CCBC - bl FUN_02016A18 + bl FreeToHeap ldr r0, _0223CCC0 ; =0x02251384 mov r1, #0 str r1, [r0] @@ -7827,7 +7827,7 @@ _0223D31E: _0223D330: mov r0, #0xb mov r1, #4 - bl FUN_020169D8 + bl AllocFromHeapAtEnd mov r1, #0 mov r2, #4 add r4, r0, #0 @@ -7868,7 +7868,7 @@ MOD18_0223D370: ; 0x0223D370 ldr r1, [r0] ldr r0, _0223D3A8 ; =0x000004C4 ldr r0, [r1, r0] - bl FUN_02016A18 + bl FreeToHeap ldr r1, _0223D3A4 ; =0x02251384 mov r0, #0x13 ldr r2, [r1] @@ -8183,7 +8183,7 @@ _0223D5BC: add r1, #0x8c str r2, [r1] ldr r0, [r0] - bl FUN_02016A18 + bl FreeToHeap ldr r0, _0223D634 ; =0x02251388 mov r1, #0 str r1, [r0] @@ -9510,44 +9510,44 @@ MOD18_0223E060: ; 0x0223E060 mov r1, #0x15 mov r0, #0xf lsl r1, r1, #4 - bl FUN_02016998 + bl AllocFromHeap add r1, r5, #0 bl MOD18_0223D414 bl FUN_0204D320 add r1, r0, #0 mov r0, #0xf - bl FUN_02016998 + bl AllocFromHeap add r1, r5, #0 mov r2, #1 bl FUN_0204CB20 bl MOD18_0223ECE4 add r1, r0, #0 mov r0, #0xf - bl FUN_02016998 + bl AllocFromHeap add r1, r5, #0 bl MOD18_0223E958 bl MOD18_02245350 add r1, r0, #0 mov r0, #0xf - bl FUN_02016998 + bl AllocFromHeap add r1, r5, #0 bl MOD18_02244ED0 bl MOD18_0223CC78 add r1, r0, #0 mov r0, #0xf - bl FUN_02016998 + bl AllocFromHeap add r1, r5, #0 bl MOD18_0223CB94 bl MOD18_02239848 add r1, r0, #0 mov r0, #0xf - bl FUN_02016998 + bl AllocFromHeap add r1, r5, #0 bl MOD18_02239744 bl MOD18_0224D360 add r1, r0, #0 mov r0, #0xf - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 add r0, r5, #0 bl FUN_020377AC @@ -10805,7 +10805,7 @@ _0223EA12: ldr r0, [r1, r0] cmp r0, #0 beq _0223EA30 - bl FUN_02016A18 + bl FreeToHeap ldr r0, _0223EA3C ; =0x022513A0 mov r2, #0 ldr r1, [r0, #4] @@ -10909,11 +10909,11 @@ _0223EAE2: ldr r0, [r1, r0] cmp r0, #0 beq _0223EAF4 - bl FUN_02016A18 + bl FreeToHeap _0223EAF4: ldr r0, _0223EB04 ; =0x022513A0 ldr r0, [r0, #4] - bl FUN_02016A18 + bl FreeToHeap ldr r0, _0223EB04 ; =0x022513A0 mov r1, #0 str r1, [r0, #4] @@ -13997,7 +13997,7 @@ _022401D2: add r2, r1, #0 bl FUN_0200A274 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap add r0, r5, #0 bl FUN_0200CAB4 ldr r2, _02240204 ; =0x022513A0 @@ -14029,7 +14029,7 @@ MOD18_02240210: ; 0x02240210 mov r1, #0x1c add r7, r2, #0 str r3, [sp] - bl FUN_020169D8 + bl AllocFromHeapAtEnd mov r1, #0 mov r2, #0x1c add r4, r0, #0 @@ -14109,7 +14109,7 @@ MOD18_022402A0: ; 0x022402A0 add r2, r1, #0 bl FUN_0200A274 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap ldr r0, _022402EC ; =0x022513A0 ldr r1, [r0, #4] mov r0, #0xa3 @@ -14185,7 +14185,7 @@ MOD18_02240334: ; 0x02240334 mov r0, #4 mov r1, #0x20 add r7, r2, #0 - bl FUN_020169D8 + bl AllocFromHeapAtEnd mov r1, #0 mov r2, #0x20 add r4, r0, #0 @@ -14387,7 +14387,7 @@ _022404A4: ldr r0, [r1, r0] bl FUN_0200CAB4 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap ldr r1, _022404EC ; =0x022513A0 mov r0, #0xa3 ldr r2, [r1, #4] @@ -15300,7 +15300,7 @@ MOD18_02240BB8: ; 0x02240BB8 bne _02240C08 mov r0, #4 sub r1, #0xb4 - bl FUN_020169D8 + bl AllocFromHeapAtEnd mov r2, #0x79 mov r1, #0 lsl r2, r2, #2 @@ -15359,7 +15359,7 @@ MOD18_02240C14: ; 0x02240C14 mov r0, #0xa6 lsl r0, r0, #2 ldr r0, [r1, r0] - bl FUN_02016A18 + bl FreeToHeap ldr r1, _02240C6C ; =0x022513A0 mov r0, #0xa5 ldr r2, [r1, #4] @@ -15595,7 +15595,7 @@ MOD18_02240DC8: ; 0x02240DC8 mov r0, #0xa7 lsl r0, r0, #2 ldr r0, [r1, r0] - bl FUN_02016A18 + bl FreeToHeap ldr r1, _02240E24 ; =0x022513A0 mov r0, #0xa3 ldr r2, [r1, #4] @@ -15684,7 +15684,7 @@ _02240EA4: bl GXx_SetMasterBrightness_ bl FUN_020307D0 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap add r0, r5, #0 bl FUN_0200CAB4 ldr r1, _02240EE4 ; =0x022513A0 @@ -15709,7 +15709,7 @@ MOD18_02240EE8: ; 0x02240EE8 add r5, r0, #0 mov r0, #4 mov r1, #0x14 - bl FUN_020169D8 + bl AllocFromHeapAtEnd mov r1, #0 mov r2, #0x14 add r4, r0, #0 @@ -15765,7 +15765,7 @@ MOD18_02240F34: ; 0x02240F34 ldr r0, [r1, r0] bl FUN_0200CAB4 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap ldr r1, _02240F80 ; =0x022513A0 mov r0, #0xa3 ldr r2, [r1, #4] @@ -15829,7 +15829,7 @@ _02240FB4: ldr r0, [r1, r0] bl FUN_0200CAB4 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap ldr r1, _02241000 ; =0x022513A0 mov r0, #0xa3 ldr r2, [r1, #4] @@ -16068,7 +16068,7 @@ _022411B0: ldr r0, [r0, #0x38] bl FUN_02055540 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap add r0, r5, #0 bl FUN_0200CAB4 ldr r1, _02241278 ; =0x022513A0 @@ -16171,7 +16171,7 @@ MOD18_02241288: ; 0x02241288 mov r0, #4 mov r1, #0x24 add r7, r2, #0 - bl FUN_02016998 + bl AllocFromHeap mov r1, #0 mov r2, #0x24 add r4, r0, #0 @@ -16750,7 +16750,7 @@ _022416D6: mov r0, #0xa7 lsl r0, r0, #2 ldr r0, [r1, r0] - bl FUN_02016A18 + bl FreeToHeap ldr r1, _02241730 ; =0x022513A0 mov r0, #0xa3 ldr r2, [r1, #4] @@ -16777,7 +16777,7 @@ MOD18_02241738: ; 0x02241738 mov r0, #4 lsl r1, r1, #4 add r7, r2, #0 - bl FUN_02016998 + bl AllocFromHeap mov r2, #0x12 mov r1, #0 lsl r2, r2, #4 @@ -18097,7 +18097,7 @@ MOD18_02242180: ; 0x02242180 mov r0, #4 lsl r1, r1, #2 add r6, r2, #0 - bl FUN_020169D8 + bl AllocFromHeapAtEnd mov r2, #0x59 mov r1, #0 lsl r2, r2, #2 @@ -18686,7 +18686,7 @@ _02242604: mov r0, #0xa7 lsl r0, r0, #2 ldr r0, [r1, r0] - bl FUN_02016A18 + bl FreeToHeap ldr r1, _02242658 ; =0x022513A0 mov r0, #0xa3 ldr r2, [r1, #4] @@ -20132,7 +20132,7 @@ MOD18_022431A4: ; 0x022431A4 mov r0, #4 lsl r1, r1, #4 add r6, r2, #0 - bl FUN_020169D8 + bl AllocFromHeapAtEnd mov r2, #0x13 mov r1, #0 lsl r2, r2, #4 @@ -20245,7 +20245,7 @@ _02243268: ldr r0, [r1, r0] bl FUN_0200CAB4 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap ldr r1, _022432AC ; =0x022513A0 mov r0, #0xa3 ldr r2, [r1, #4] @@ -20886,7 +20886,7 @@ MOD18_02243794: ; 0x02243794 mov r0, #4 mov r1, #0x30 add r6, r2, #0 - bl FUN_020169D8 + bl AllocFromHeapAtEnd add r4, r0, #0 mov r1, #0 mov r2, #0x30 @@ -20992,7 +20992,7 @@ _02243840: ldr r0, [r1, r0] bl FUN_0200CAB4 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap ldr r1, _0224388C ; =0x022513A0 mov r0, #0xa3 ldr r2, [r1, #4] @@ -21160,7 +21160,7 @@ MOD18_022439A8: ; 0x022439A8 mov r0, #4 mov r1, #0x14 add r6, r2, #0 - bl FUN_020169D8 + bl AllocFromHeapAtEnd add r4, r0, #0 mov r1, #0 mov r2, #0x14 @@ -21256,7 +21256,7 @@ _02243A44: ldr r0, [r1, r0] bl FUN_0200CAB4 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap ldr r1, _02243A88 ; =0x022513A0 mov r0, #0xa3 ldr r2, [r1, #4] @@ -21695,7 +21695,7 @@ _02243DCA: ldr r0, [sp] bl FUN_0200CAB4 add r0, r7, #0 - bl FUN_02016A18 + bl FreeToHeap ldr r0, _02243E10 ; =0x022513A0 mov r2, #0 ldr r1, [r0, #4] @@ -21728,7 +21728,7 @@ MOD18_02243E18: ; 0x02243E18 bne _02243E82 mov r0, #4 mov r1, #0x34 - bl FUN_020169D8 + bl AllocFromHeapAtEnd mov r1, #0 mov r2, #0x34 add r4, r0, #0 @@ -21782,7 +21782,7 @@ MOD18_02243E8C: ; 0x02243E8C bne _02243EA6 bl FUN_0200CAB4 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, r5, r6, pc} _02243EA6: ldr r5, [r4, #8] @@ -21808,7 +21808,7 @@ _02243EBE: add r0, r6, #0 bl FUN_0200CAB4 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap add r0, r5, #0 bl FUN_0204E254 pop {r4, r5, r6, pc} @@ -21903,7 +21903,7 @@ MOD18_02243F5C: ; 0x02243F5C bne _02243FA4 mov r0, #4 mov r1, #0x10 - bl FUN_020169D8 + bl AllocFromHeapAtEnd mov r1, #0 mov r2, #0x10 add r4, r0, #0 @@ -21976,7 +21976,7 @@ _02243FFA: bl FUN_0200CAB4 ldr r0, [r4, #4] ldr r0, [r0, r5] - bl FUN_02016A18 + bl FreeToHeap ldr r0, [r4, #4] add r0, r0, r5 str r7, [r0, #0x20] @@ -22002,7 +22002,7 @@ MOD18_02244028: ; 0x02244028 add r0, r3, #0 mov r1, #0x24 str r3, [sp, #8] - bl FUN_02016998 + bl AllocFromHeap str r0, [sp, #0xc] mov r1, #0 mov r2, #0x24 @@ -22291,7 +22291,7 @@ _0224425E: blt _0224425E _02244268: ldr r0, [r5, #8] - bl FUN_02016A18 + bl FreeToHeap ldr r0, [sp] ldr r1, [sp] str r0, [r5, #8] @@ -22388,10 +22388,10 @@ MOD18_02244318: ; 0x02244318 ldr r0, [r4, #0x10] bl FUN_020136C0 ldr r0, [r4, #8] - bl FUN_02016A18 + bl FreeToHeap _02244334: add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} thumb_func_end MOD18_02244318 @@ -24417,7 +24417,7 @@ _02245288: ldr r0, [r0] cmp r0, #0 beq _02245298 - bl FUN_02016A18 + bl FreeToHeap _02245298: ldr r0, _022452A0 ; =0x022513EC mov r1, #0 @@ -25117,7 +25117,7 @@ _022457E6: add r0, r5, #0 bl FUN_0200CAB4 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap bl MOD18_0223E6A0 pop {r3, r4, r5, pc} thumb_func_end MOD18_022457D4 @@ -25147,7 +25147,7 @@ _0224580A: add r0, r5, #0 bl FUN_0200CAB4 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap bl MOD18_0223E6A0 bl MOD18_022479A0 pop {r3, r4, r5, pc} @@ -25373,7 +25373,7 @@ MOD18_022459E8: ; 0x022459E8 bl MOD18_02247984 mov r0, #4 mov r1, #0x30 - bl FUN_020169D8 + bl AllocFromHeapAtEnd mov r1, #0 mov r2, #0x30 add r4, r0, #0 @@ -25425,7 +25425,7 @@ MOD18_02245A50: ; 0x02245A50 bne _02245AA2 mov r0, #0xb mov r1, #0x30 - bl FUN_020169D8 + bl AllocFromHeapAtEnd mov r1, #0 mov r2, #0x30 add r4, r0, #0 @@ -25892,7 +25892,7 @@ MOD18_02245E1C: ; 0x02245E1C mov r1, #0x30 add r7, r2, #0 str r3, [sp] - bl FUN_020169D8 + bl AllocFromHeapAtEnd mov r1, #0 mov r2, #0x30 add r4, r0, #0 @@ -27099,7 +27099,7 @@ _022467A6: _022467AA: bl FUN_0204F7FC add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap bl FUN_0202EDD8 cmp r0, #0 beq _022467CE @@ -27419,7 +27419,7 @@ _02246A60: ldr r0, [sp, #4] bl FUN_0200CAB4 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap bl MOD18_0223E6A0 add sp, #0x14 pop {r4, r5, r6, r7, pc} @@ -27446,7 +27446,7 @@ _02246A80: ldr r0, [sp, #4] bl FUN_0200CAB4 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap bl MOD18_0223E6A0 bl MOD18_022479A0 _02246ACA: @@ -27634,7 +27634,7 @@ _02246C28: add r0, r5, #0 bl FUN_0200CAB4 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap bl MOD18_0223E6A0 bl FUN_0204F7FC bl MOD18_022479A0 @@ -27648,7 +27648,7 @@ MOD18_02246C44: ; 0x02246C44 bl MOD18_02247984 mov r0, #4 mov r1, #0x14 - bl FUN_020169D8 + bl AllocFromHeapAtEnd mov r1, #0 mov r2, #0x14 add r4, r0, #0 @@ -28523,7 +28523,7 @@ MOD18_02247324: ; 0x02247324 push {r4, lr} add r4, r0, #0 add r0, r1, #0 - bl FUN_02016A18 + bl FreeToHeap add r0, r4, #0 bl FUN_0200CAB4 pop {r4, pc} @@ -28619,7 +28619,7 @@ _022473DA: pop {r4, r5, pc} _022473F6: add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap add r0, r5, #0 bl FUN_0200CAB4 bl MOD18_0223E6A0 @@ -28654,7 +28654,7 @@ MOD18_02247428: ; 0x02247428 bne _02247464 mov r0, #0xb mov r1, #8 - bl FUN_02016998 + bl AllocFromHeap mov r1, #0 mov r2, #4 add r4, r0, #0 @@ -29463,7 +29463,7 @@ MOD18_02247A34: ; 0x02247A34 mov r0, #0x21 mov r1, #0x3c add r7, r2, #0 - bl FUN_02016998 + bl AllocFromHeap mov r1, #0 mov r2, #0x3c add r4, r0, #0 @@ -29623,7 +29623,7 @@ _02247B88: blx r1 _02247B9A: add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap bl FUN_0204F7FC add r0, r5, #0 bl FUN_0200CAB4 @@ -31093,7 +31093,7 @@ _02248760: add r1, r4, #0 bl MOD18_02248784 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap bl FUN_0204F7FC add r0, r5, #0 bl FUN_0200CAB4 @@ -31911,7 +31911,7 @@ MOD18_02248DF8: ; 0x02248DF8 _02248E0C: mov r0, #0x21 mov r1, #0x38 - bl FUN_02016998 + bl AllocFromHeap mov r1, #0 mov r2, #0x38 add r4, r0, #0 @@ -32590,7 +32590,7 @@ MOD18_022492F8: ; 0x022492F8 add r4, r0, #0 mov r0, #0xf mov r1, #8 - bl FUN_02016998 + bl AllocFromHeap ldr r1, _02249324 ; =0x022513F8 mov r2, #8 str r0, [r1] @@ -32612,12 +32612,12 @@ _02249324: .word 0x022513F8 thumb_func_start MOD18_02249328 MOD18_02249328: ; 0x02249328 ldr r0, _02249330 ; =0x022513F8 - ldr r3, _02249334 ; =FUN_02016A18 + ldr r3, _02249334 ; =FreeToHeap ldr r0, [r0] bx r3 .align 2, 0 _02249330: .word 0x022513F8 -_02249334: .word FUN_02016A18 +_02249334: .word FreeToHeap thumb_func_end MOD18_02249328 thumb_func_start MOD18_02249338 @@ -32857,7 +32857,7 @@ MOD18_022494C8: ; 0x022494C8 mov r1, #0x25 mov r0, #4 lsl r1, r1, #4 - bl FUN_02016998 + bl AllocFromHeap mov r2, #0x25 mov r1, #0 lsl r2, r2, #4 @@ -35146,7 +35146,7 @@ MOD18_0224A7C8: ; 0x0224A7C8 add r5, r0, #0 mov r0, #4 lsl r1, r1, #4 - bl FUN_02016998 + bl AllocFromHeap mov r2, #0x25 mov r1, #0 lsl r2, r2, #4 @@ -35288,7 +35288,7 @@ _0224A8F0: bl FUN_0205EBEC _0224A8FE: add r0, r5, #0 - bl FUN_02016A18 + bl FreeToHeap cmp r4, #0 bne _0224A90C bl FUN_0204F7FC @@ -35939,7 +35939,7 @@ _0224AE52: bl FUN_0200CAB4 _0224AE5C: add r0, r5, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r3, r4, r5, pc} .align 2, 0 _0224AE64: .word 0x022513F8 @@ -36048,7 +36048,7 @@ MOD18_0224AF28: ; 0x0224AF28 add r5, r0, #0 mov r0, #4 lsl r1, r1, #4 - bl FUN_02016998 + bl AllocFromHeap mov r2, #0x25 mov r1, #0 lsl r2, r2, #4 @@ -37331,7 +37331,7 @@ _0224B946: add r0, r4, #0 bl MOD18_0224BD54 add r0, r5, #0 - bl FUN_02016A18 + bl FreeToHeap add sp, #0xc mov r0, #1 pop {r3, r4, r5, r6, pc} @@ -37377,7 +37377,7 @@ _0224B9B4: add r0, r5, #0 bl FUN_0200CAB4 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r3, r4, r5, pc} thumb_func_end MOD18_0224B980 @@ -37680,7 +37680,7 @@ _0224BC5C: bne _0224BC86 mov r0, #0xb mov r1, #0xc - bl FUN_020169D8 + bl AllocFromHeapAtEnd mov r1, #0 mov r2, #0xc add r5, r0, #0 @@ -37796,7 +37796,7 @@ MOD18_0224BD54: ; 0x0224BD54 mov r1, #0x25 mov r0, #4 lsl r1, r1, #4 - bl FUN_02016998 + bl AllocFromHeap mov r2, #0x25 add r4, r0, #0 mov r1, #0 @@ -37912,7 +37912,7 @@ _0224BE5E: pop {r3, r4, r5, pc} _0224BE68: add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap bl MOD18_0223E6A0 add r0, r5, #0 bl FUN_0200CAB4 @@ -37935,7 +37935,7 @@ MOD18_0224BE84: ; 0x0224BE84 bl FUN_020021EC _0224BE96: add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap add r0, r5, #0 bl FUN_0200CAB4 pop {r3, r4, r5, pc} @@ -37949,7 +37949,7 @@ MOD18_0224BEA4: ; 0x0224BEA4 add r6, r0, #0 mov r0, #4 lsl r1, r1, #4 - bl FUN_02016998 + bl AllocFromHeap mov r1, #0 mov r2, #0x14 add r4, r0, #0 @@ -39360,7 +39360,7 @@ MOD18_0224CA34: ; 0x0224CA34 ldr r0, [r4, #0x70] bl FUN_0200AB18 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} .align 2, 0 thumb_func_end MOD18_0224CA34 @@ -40330,7 +40330,7 @@ MOD18_0224D1F8: ; 0x0224D1F8 mov r1, #0x25 mov r0, #4 lsl r1, r1, #4 - bl FUN_02016998 + bl AllocFromHeap mov r2, #0x25 mov r1, #0 lsl r2, r2, #4 @@ -40441,10 +40441,10 @@ MOD18_0224D324: ; 0x0224D324 ldr r0, _0224D340 ; =0x022513FC ldr r0, [r0] ldr r0, [r0, #0x10] - bl FUN_02016A18 + bl FreeToHeap ldr r0, _0224D340 ; =0x022513FC ldr r0, [r0] - bl FUN_02016A18 + bl FreeToHeap ldr r0, _0224D340 ; =0x022513FC mov r1, #0 str r1, [r0] @@ -40734,7 +40734,7 @@ MOD18_0224D56C: ; 0x0224D56C blx r1 _0224D596: add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap add r0, r5, #0 bl FUN_0200CAB4 ldr r0, _0224D5B0 ; =0x022513FC @@ -40773,7 +40773,7 @@ MOD18_0224D5CC: ; 0x0224D5CC mov r1, #0x2c add r5, r2, #0 add r6, r3, #0 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 mov r1, #0 mov r2, #0x2c @@ -40869,7 +40869,7 @@ MOD18_0224D698: ; 0x0224D698 add r6, r0, #0 mov r0, #4 add r1, r4, #1 - bl FUN_02016998 + bl AllocFromHeap mov r1, #0 add r2, r4, #1 add r5, r0, #0 @@ -40896,7 +40896,7 @@ _0224D6CE: add r2, r4, #1 bl FUN_02030ADC add r0, r5, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r3, r4, r5, r6, r7, pc} nop _0224D6FC: .word 0x022513FC @@ -41031,7 +41031,7 @@ _0224D7BC: blx r4 add r4, r0, #0 add r0, r6, #0 - bl FUN_02016A18 + bl FreeToHeap bl MOD18_0223D658 add r1, r4, #0 bl MOD18_0224DEC8 @@ -41213,7 +41213,7 @@ _0224D8FA: mov r3, #0x66 bl FUN_0201BD84 ldr r0, [sp, #0x24] - bl FUN_02016A18 + bl FreeToHeap b _0224D9DE _0224D994: ldr r0, [sp, #0x10] @@ -41276,7 +41276,7 @@ MOD18_0224DA00: ; 0x0224DA00 mov r1, #0x2c add r6, r2, #0 add r4, r3, #0 - bl FUN_02016998 + bl AllocFromHeap mov r1, #0 mov r2, #0x2c add r5, r0, #0 @@ -41362,7 +41362,7 @@ MOD18_0224DAA8: ; 0x0224DAA8 blx r1 _0224DACE: add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} .align 2, 0 thumb_func_end MOD18_0224DAA8 @@ -41386,7 +41386,7 @@ MOD18_0224DAE0: ; 0x0224DAE0 add r7, r2, #0 str r3, [sp, #4] ldr r6, [sp, #0x20] - bl FUN_02016998 + bl AllocFromHeap mov r1, #0 mov r2, #0x44 add r4, r0, #0 @@ -41448,7 +41448,7 @@ MOD18_0224DB5C: ; 0x0224DB5C ldr r0, [r4, #0x24] bl FUN_0200A8B8 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} thumb_func_end MOD18_0224DB5C @@ -42156,12 +42156,12 @@ _0224E018: .word 0x0225074A thumb_func_start MOD18_0224E01C MOD18_0224E01C: ; 0x0224E01C - ldr r3, _0224E024 ; =FUN_02016998 + ldr r3, _0224E024 ; =AllocFromHeap mov r0, #4 mov r1, #0x44 bx r3 .align 2, 0 -_0224E024: .word FUN_02016998 +_0224E024: .word AllocFromHeap thumb_func_end MOD18_0224E01C thumb_func_start MOD18_0224E028 @@ -42194,10 +42194,10 @@ _0224E058: .word 0x000003D9 thumb_func_start MOD18_0224E05C MOD18_0224E05C: ; 0x0224E05C - ldr r3, _0224E060 ; =FUN_02016A18 + ldr r3, _0224E060 ; =FreeToHeap bx r3 .align 2, 0 -_0224E060: .word FUN_02016A18 +_0224E060: .word FreeToHeap thumb_func_end MOD18_0224E05C thumb_func_start MOD18_0224E064 @@ -42508,12 +42508,12 @@ _0224E2CC: thumb_func_start MOD18_0224E2D8 MOD18_0224E2D8: ; 0x0224E2D8 - ldr r3, _0224E2E0 ; =FUN_02016998 + ldr r3, _0224E2E0 ; =AllocFromHeap mov r0, #4 mov r1, #0x4c bx r3 .align 2, 0 -_0224E2E0: .word FUN_02016998 +_0224E2E0: .word AllocFromHeap thumb_func_end MOD18_0224E2D8 thumb_func_start MOD18_0224E2E4 @@ -42555,10 +42555,10 @@ MOD18_0224E314: ; 0x0224E314 thumb_func_start MOD18_0224E320 MOD18_0224E320: ; 0x0224E320 - ldr r3, _0224E324 ; =FUN_02016A18 + ldr r3, _0224E324 ; =FreeToHeap bx r3 .align 2, 0 -_0224E324: .word FUN_02016A18 +_0224E324: .word FreeToHeap thumb_func_end MOD18_0224E320 thumb_func_start MOD18_0224E328 @@ -43305,7 +43305,7 @@ _0224E91A: ldr r0, [r4, r0] bl MOD05_021D80A4 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap mov r0, #1 pop {r4, r5, r6, pc} _0224E93C: @@ -43456,7 +43456,7 @@ MOD18_0224EA74: ; 0x0224EA74 add r5, r0, #0 ldr r1, _0224EAC0 ; =0x00000528 mov r0, #0xb - bl FUN_020169D8 + bl AllocFromHeapAtEnd ldr r2, _0224EAC0 ; =0x00000528 add r4, r0, #0 mov r1, #0 @@ -45659,11 +45659,11 @@ _0224FBC4: .word 0x02251350 thumb_func_start MOD18_0224FBC8 MOD18_0224FBC8: ; 0x0224FBC8 - ldr r3, _0224FBD0 ; =FUN_02016A18 + ldr r3, _0224FBD0 ; =FreeToHeap ldr r0, [r0, #0x54] bx r3 nop -_0224FBD0: .word FUN_02016A18 +_0224FBD0: .word FreeToHeap thumb_func_end MOD18_0224FBC8 thumb_func_start MOD18_0224FBD4 diff --git a/arm9/modules/20/asm/module_20.s b/arm9/modules/20/asm/module_20.s index d8c1e99e..61c73b55 100644 --- a/arm9/modules/20/asm/module_20.s +++ b/arm9/modules/20/asm/module_20.s @@ -28,7 +28,7 @@ MOD20_02252448: ; 0x02252448 bl FUN_0201681C mov r0, #7 mov r1, #0x60 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 beq _022524B2 str r4, [r5] @@ -234,7 +234,7 @@ _022525C6: add r0, r4, #0 bl MOD20_0225257C add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap add r0, r5, #0 bl FUN_0200CAB4 mov r0, #7 @@ -1215,7 +1215,7 @@ MOD20_02252C5C: ; 0x02252C5C lsl r1, r1, #2 add r7, r2, #0 str r3, [sp] - bl FUN_02016998 + bl AllocFromHeap str r0, [r5] add r4, r0, #0 beq _02252D0A @@ -1236,7 +1236,7 @@ MOD20_02252C5C: ; 0x02252C5C cmp r0, #0 bne _02252CA6 ldr r0, [r5] - bl FUN_02016A18 + bl FreeToHeap mov r0, #0 str r0, [r5] pop {r3, r4, r5, r6, r7, pc} @@ -1347,7 +1347,7 @@ MOD20_02252D44: ; 0x02252D44 add r1, #0x78 bl DC_FlushRange add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap _02252D7A: pop {r3, r4, r5, pc} thumb_func_end MOD20_02252D44 @@ -1449,7 +1449,7 @@ _02252E36: ldr r0, [r4, r0] cmp r0, #0 beq _02252E44 - bl FUN_02016A18 + bl FreeToHeap _02252E44: mov r0, #0x56 lsl r0, r0, #2 @@ -1459,7 +1459,7 @@ _02252E44: bl FUN_0200CAB4 _02252E52: add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap _02252E58: pop {r4, pc} .align 2, 0 @@ -2736,7 +2736,7 @@ _022537FA: ldr r0, [sp, #0x28] ldr r1, [r1, r6] add r1, #0x18 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 beq _02253870 ldr r0, [sp, #8] @@ -2777,7 +2777,7 @@ _0225382E: pop {r4, r5, r6, r7, pc} _02253866: add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap add sp, #0xc pop {r4, r5, r6, r7, pc} _02253870: @@ -2805,7 +2805,7 @@ MOD20_02253888: ; 0x02253888 ldr r0, [r4, #0x14] bl FUN_0200CAB4 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} thumb_func_end MOD20_02253888 @@ -2886,7 +2886,7 @@ MOD20_022538F4: ; 0x022538F4 add r6, r1, #0 mov r0, #8 mov r1, #0x20 - bl FUN_02016998 + bl AllocFromHeap add r7, r0, #0 beq _02253960 bl MOD20_02252DEC @@ -2933,7 +2933,7 @@ _02253948: blo _02253910 _0225395A: add r0, r7, #0 - bl FUN_02016A18 + bl FreeToHeap _02253960: pop {r3, r4, r5, r6, r7, pc} nop @@ -2948,12 +2948,12 @@ MOD20_0225396C: ; 0x0225396C add r7, r1, #0 mov r0, #8 mov r1, #0x20 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 beq _022539C2 mov r0, #8 mov r1, #0x20 - bl FUN_02016998 + bl AllocFromHeap add r5, r0, #0 add r0, r4, #0 bl MOD20_02252DEC @@ -2977,10 +2977,10 @@ _02253998: mov r2, #0x20 bl GXS_LoadOBJPltt add r0, r5, #0 - bl FUN_02016A18 + bl FreeToHeap _022539BC: add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap _022539C2: pop {r3, r4, r5, r6, r7, pc} thumb_func_end MOD20_0225396C @@ -3011,7 +3011,7 @@ MOD20_022539C4: ; 0x022539C4 mov r2, #0x80 bl GXS_LoadOBJPltt add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap _02253A02: pop {r3, r4, r5, pc} thumb_func_end MOD20_022539C4 @@ -3029,7 +3029,7 @@ MOD20_02253A04: ; 0x02253A04 ldr r1, [sp, #0xc] mov r0, #8 ldrh r1, [r2, r1] - bl FUN_02016998 + bl AllocFromHeap add r7, r0, #0 beq _02253A98 mov r0, #0x13 @@ -3086,7 +3086,7 @@ _02253A8C: bl NARC_dtor _02253A92: add r0, r7, #0 - bl FUN_02016A18 + bl FreeToHeap _02253A98: add sp, #0x24 pop {r4, r5, r6, r7, pc} @@ -3229,7 +3229,7 @@ MOD20_02253BA4: ; 0x02253BA4 add r0, r5, #0 mov r1, #0x1c mov r6, #0 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 beq _02253C0E add r0, r6, #0 @@ -3244,7 +3244,7 @@ MOD20_02253BA4: ; 0x02253BA4 ldrh r1, [r4, #0x10] add r0, r5, #0 lsl r1, r1, #3 - bl FUN_02016998 + bl AllocFromHeap str r0, [r4, #0x14] cmp r0, #0 beq _02253C0E @@ -3252,14 +3252,14 @@ MOD20_02253BA4: ; 0x02253BA4 mov r1, #0x90 add r0, r5, #0 mul r1, r2 - bl FUN_02016998 + bl AllocFromHeap str r0, [r4, #0xc] cmp r0, #0 beq _02253C0E ldrh r1, [r4, #0x10] add r0, r5, #0 lsl r1, r1, #2 - bl FUN_02016998 + bl AllocFromHeap str r0, [r4, #4] cmp r0, #0 beq _02253C0E @@ -3313,20 +3313,20 @@ MOD20_02253C4C: ; 0x02253C4C ldr r0, [r4, #0x14] cmp r0, #0 beq _02253C5C - bl FUN_02016A18 + bl FreeToHeap _02253C5C: ldr r0, [r4, #0xc] cmp r0, #0 beq _02253C66 - bl FUN_02016A18 + bl FreeToHeap _02253C66: ldr r0, [r4, #4] cmp r0, #0 beq _02253C70 - bl FUN_02016A18 + bl FreeToHeap _02253C70: add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap _02253C76: pop {r4, pc} thumb_func_end MOD20_02253C4C @@ -4039,7 +4039,7 @@ MOD20_02254130: ; 0x02254130 _02254144: add r0, r5, #0 mov r1, #0x18 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 beq _02254192 ldr r0, [sp] @@ -4052,7 +4052,7 @@ _02254144: str r0, [r4, #0x10] add r0, r5, #0 mul r1, r7 - bl FUN_02016998 + bl AllocFromHeap str r0, [r4, #0x14] cmp r0, #0 beq _02254188 diff --git a/arm9/modules/21/asm/module_21.s b/arm9/modules/21/asm/module_21.s index 68f89a45..d3c385c0 100644 --- a/arm9/modules/21/asm/module_21.s +++ b/arm9/modules/21/asm/module_21.s @@ -24,7 +24,7 @@ MOD21_02254854: ; 0x02254854 mov r1, #0x2c add r7, r2, #0 str r3, [sp] - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 beq _02254892 ldr r3, [sp] @@ -44,7 +44,7 @@ MOD21_02254854: ; 0x02254854 pop {r3, r4, r5, r6, r7, pc} _0225488C: add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap _02254892: mov r0, #0 pop {r3, r4, r5, r6, r7, pc} @@ -124,7 +124,7 @@ MOD21_02254918: ; 0x02254918 ldr r0, [r4, #0x10] bl MOD20_02254198 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} thumb_func_end MOD21_02254918 @@ -322,7 +322,7 @@ MOD21_02254A6C: ; 0x02254A6C add r5, r0, #0 mov r0, #8 lsl r1, r1, #8 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 beq _02254ACC add r0, #8 @@ -341,7 +341,7 @@ MOD21_02254A6C: ; 0x02254A6C add r6, r0, #0 bne _02254AB2 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap add sp, #8 mov r0, #0 pop {r4, r5, r6, pc} @@ -352,7 +352,7 @@ _02254AB2: add r1, #0x30 bl MOD21_02254AD4 add r0, r6, #0 - bl FUN_02016A18 + bl FreeToHeap add sp, #8 str r4, [r5] mov r0, #1 @@ -396,7 +396,7 @@ MOD21_02254B04: ; 0x02254B04 push {r3, lr} cmp r0, #0 beq _02254B0E - bl FUN_02016A18 + bl FreeToHeap _02254B0E: pop {r3, pc} thumb_func_end MOD21_02254B04 diff --git a/arm9/modules/22/asm/module_22.s b/arm9/modules/22/asm/module_22.s index 0aba3a4c..8d928551 100644 --- a/arm9/modules/22/asm/module_22.s +++ b/arm9/modules/22/asm/module_22.s @@ -24,7 +24,7 @@ MOD22_02254854: ; 0x02254854 mov r1, #0x68 add r7, r2, #0 str r3, [sp] - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 beq _02254892 ldr r2, [sp] @@ -44,7 +44,7 @@ MOD22_02254854: ; 0x02254854 pop {r3, r4, r5, r6, r7, pc} _0225488C: add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap _02254892: mov r0, #0 pop {r3, r4, r5, r6, r7, pc} @@ -163,7 +163,7 @@ MOD22_0225492C: ; 0x0225492C ldr r0, [r4, #0x60] bl MOD22_02254F10 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} .align 2, 0 thumb_func_end MOD22_0225492C @@ -880,7 +880,7 @@ MOD22_02254E8C: ; 0x02254E8C add r6, r1, #0 mov r0, #8 mov r1, #0x88 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 beq _02254F08 str r6, [r4] @@ -946,10 +946,10 @@ MOD22_02254F10: ; 0x02254F10 ldr r0, [r4, #4] cmp r0, #0 beq _02254F20 - bl FUN_02016A18 + bl FreeToHeap _02254F20: add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap _02254F26: pop {r4, pc} thumb_func_end MOD22_02254F10 diff --git a/arm9/modules/23/asm/module_23.s b/arm9/modules/23/asm/module_23.s index c079cc35..0fceaaad 100644 --- a/arm9/modules/23/asm/module_23.s +++ b/arm9/modules/23/asm/module_23.s @@ -24,7 +24,7 @@ MOD23_02254854: ; 0x02254854 mov r1, #0x28 add r7, r2, #0 str r3, [sp] - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 beq _02254888 ldr r1, [sp] @@ -178,7 +178,7 @@ _02254964: add r0, r4, #0 bl MOD23_02254918 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap add r0, r5, #0 bl FUN_0200CAB4 ldr r0, [r4, #0x10] @@ -1073,7 +1073,7 @@ MOD23_02254FFC: ; 0x02254FFC ldr r1, _02255028 ; =0x0000048C mov r0, #8 add r7, r2, #0 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 beq _02255022 str r6, [r4] @@ -1096,7 +1096,7 @@ MOD23_0225502C: ; 0x0225502C push {r3, lr} cmp r0, #0 beq _02255036 - bl FUN_02016A18 + bl FreeToHeap _02255036: pop {r3, pc} thumb_func_end MOD23_0225502C @@ -1730,7 +1730,7 @@ MOD23_0225551C: ; 0x0225551C add r4, r1, #0 mov r0, #8 mov r1, #0xc - bl FUN_02016998 + bl AllocFromHeap str r0, [r5] cmp r0, #0 beq _0225553C @@ -1746,10 +1746,10 @@ _0225553C: thumb_func_start MOD23_02255540 MOD23_02255540: ; 0x02255540 - ldr r3, _02255544 ; =FUN_02016A18 + ldr r3, _02255544 ; =FreeToHeap bx r3 .align 2, 0 -_02255544: .word FUN_02016A18 +_02255544: .word FreeToHeap thumb_func_end MOD23_02255540 thumb_func_start MOD23_02255548 diff --git a/arm9/modules/24/asm/module_24.s b/arm9/modules/24/asm/module_24.s index 2b129ec7..504f59b5 100644 --- a/arm9/modules/24/asm/module_24.s +++ b/arm9/modules/24/asm/module_24.s @@ -25,7 +25,7 @@ MOD24_02254854: ; 0x02254854 lsl r1, r1, #8 add r7, r2, #0 str r3, [sp] - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 beq _02254894 ldr r3, [sp] @@ -45,7 +45,7 @@ MOD24_02254854: ; 0x02254854 pop {r3, r4, r5, r6, r7, pc} _0225488E: add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap _02254894: mov r0, #0 pop {r3, r4, r5, r6, r7, pc} @@ -108,7 +108,7 @@ MOD24_022548F4: ; 0x022548F4 ldr r0, [r4, r0] bl MOD24_02254D48 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} .align 2, 0 _02254910: .word 0x000016FC @@ -629,7 +629,7 @@ MOD24_02254CA0: ; 0x02254CA0 add r6, r1, #0 mov r0, #8 mov r1, #0x74 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 beq _02254CFA mov r0, #7 @@ -729,10 +729,10 @@ _02254D5C: ldr r0, [r4, #0x70] bl FUN_02019178 ldr r0, [r4, #0x70] - bl FUN_02016A18 + bl FreeToHeap _02254D7E: add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap _02254D84: pop {r4, pc} nop diff --git a/arm9/modules/25/asm/module_25.s b/arm9/modules/25/asm/module_25.s index ac9c9dbf..b83d964c 100644 --- a/arm9/modules/25/asm/module_25.s +++ b/arm9/modules/25/asm/module_25.s @@ -24,7 +24,7 @@ MOD25_02254854: ; 0x02254854 mov r1, #0x2c add r7, r2, #0 str r3, [sp] - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 beq _02254892 ldr r3, [sp] @@ -44,7 +44,7 @@ MOD25_02254854: ; 0x02254854 pop {r3, r4, r5, r6, r7, pc} _0225488C: add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap _02254892: mov r0, #0 pop {r3, r4, r5, r6, r7, pc} @@ -124,7 +124,7 @@ MOD25_02254918: ; 0x02254918 ldr r0, [r4, #0x10] bl MOD20_02254198 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} thumb_func_end MOD25_02254918 @@ -320,7 +320,7 @@ MOD25_02254A6C: ; 0x02254A6C add r6, r1, #0 mov r0, #8 mov r1, #0x54 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 beq _02254ABA add r0, #8 @@ -336,7 +336,7 @@ MOD25_02254A6C: ; 0x02254A6C cmp r0, #0 bne _02254AA8 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap mov r0, #0 pop {r4, r5, r6, pc} _02254AA8: @@ -367,7 +367,7 @@ MOD25_02254AC4: ; 0x02254AC4 bl FUN_0200CAB4 _02254AD8: add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap _02254ADE: pop {r4, pc} thumb_func_end MOD25_02254AC4 diff --git a/arm9/modules/26/asm/module_26.s b/arm9/modules/26/asm/module_26.s index a31b3554..05d00696 100644 --- a/arm9/modules/26/asm/module_26.s +++ b/arm9/modules/26/asm/module_26.s @@ -25,7 +25,7 @@ MOD26_02254854: ; 0x02254854 lsl r1, r1, #2 add r7, r2, #0 str r3, [sp] - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 beq _0225489C ldr r3, [sp] @@ -48,7 +48,7 @@ MOD26_02254854: ; 0x02254854 pop {r3, r4, r5, r6, r7, pc} _02254896: add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap _0225489C: mov r0, #0 pop {r3, r4, r5, r6, r7, pc} @@ -267,7 +267,7 @@ MOD26_02254A04: ; 0x02254A04 ldr r0, [r4, r0] bl MOD26_02254C04 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} thumb_func_end MOD26_02254A04 @@ -512,7 +512,7 @@ MOD26_02254BD4: ; 0x02254BD4 add r6, r1, #0 mov r0, #8 mov r1, #0x30 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 beq _02254C00 add r0, #8 @@ -536,7 +536,7 @@ MOD26_02254C04: ; 0x02254C04 push {r3, lr} cmp r0, #0 beq _02254C0E - bl FUN_02016A18 + bl FreeToHeap _02254C0E: pop {r3, pc} thumb_func_end MOD26_02254C04 @@ -643,7 +643,7 @@ MOD26_02254CC4: ; 0x02254CC4 str r0, [sp, #4] mov r0, #8 lsl r1, r0, #6 - bl FUN_02016998 + bl AllocFromHeap str r0, [sp, #0x1c] cmp r0, #0 beq _02254D68 @@ -716,7 +716,7 @@ _02254CEC: lsl r3, r3, #8 bl FUN_02017E14 ldr r0, [sp, #0x1c] - bl FUN_02016A18 + bl FreeToHeap _02254D68: add sp, #0x20 pop {r3, r4, r5, r6, r7, pc} diff --git a/arm9/modules/27/asm/module_27.s b/arm9/modules/27/asm/module_27.s index 0d5124db..0a04d74a 100644 --- a/arm9/modules/27/asm/module_27.s +++ b/arm9/modules/27/asm/module_27.s @@ -24,7 +24,7 @@ MOD27_02254854: ; 0x02254854 mov r1, #0x7c add r7, r2, #0 str r3, [sp] - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 beq _02254892 ldr r3, [sp] @@ -44,7 +44,7 @@ MOD27_02254854: ; 0x02254854 pop {r3, r4, r5, r6, r7, pc} _0225488C: add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap _02254892: mov r0, #0 pop {r3, r4, r5, r6, r7, pc} @@ -96,7 +96,7 @@ MOD27_022548E4: ; 0x022548E4 ldr r0, [r4, #0x74] bl MOD27_02254B88 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} .align 2, 0 thumb_func_end MOD27_022548E4 @@ -375,7 +375,7 @@ MOD27_02254AF0: ; 0x02254AF0 str r0, [sp, #4] mov r0, #8 lsl r1, r1, #2 - bl FUN_02016998 + bl AllocFromHeap str r0, [sp, #8] cmp r0, #0 beq _02254B82 @@ -461,7 +461,7 @@ MOD27_02254B88: ; 0x02254B88 bl FUN_0200CAB4 _02254BB0: add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap _02254BB6: pop {r4, pc} thumb_func_end MOD27_02254B88 diff --git a/arm9/modules/28/asm/module_28.s b/arm9/modules/28/asm/module_28.s index 40971e04..8a9f5379 100644 --- a/arm9/modules/28/asm/module_28.s +++ b/arm9/modules/28/asm/module_28.s @@ -24,7 +24,7 @@ MOD28_02254854: ; 0x02254854 mov r1, #0x64 add r7, r2, #0 str r3, [sp] - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 beq _02254892 ldr r3, [sp] @@ -44,7 +44,7 @@ MOD28_02254854: ; 0x02254854 pop {r3, r4, r5, r6, r7, pc} _0225488C: add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap _02254892: mov r0, #0 pop {r3, r4, r5, r6, r7, pc} @@ -202,7 +202,7 @@ MOD28_022549AC: ; 0x022549AC ldr r0, [r4, #0x5c] bl MOD28_02254B70 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} .align 2, 0 thumb_func_end MOD28_022549AC @@ -397,7 +397,7 @@ MOD28_02254AF4: ; 0x02254AF4 add r5, r0, #0 mov r0, #8 lsl r1, r1, #2 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 beq _02254B6A add r0, #8 @@ -492,7 +492,7 @@ _02254B9A: bl FUN_0200CAB4 _02254BC0: add r0, r5, #0 - bl FUN_02016A18 + bl FreeToHeap _02254BC6: pop {r3, r4, r5, r6, r7, pc} thumb_func_end MOD28_02254B70 @@ -695,7 +695,7 @@ _02254D24: lsl r2, r2, #0xa bl GXS_LoadOBJ ldr r0, [sp, #0x20] - bl FUN_02016A18 + bl FreeToHeap ldrh r0, [r6] mov r1, #1 ldr r2, [sp, #0x24] diff --git a/arm9/modules/29/asm/module_29.s b/arm9/modules/29/asm/module_29.s index 77e8d7e5..1d279ddc 100644 --- a/arm9/modules/29/asm/module_29.s +++ b/arm9/modules/29/asm/module_29.s @@ -24,7 +24,7 @@ MOD29_02254854: ; 0x02254854 mov r1, #0x54 add r7, r2, #0 str r3, [sp] - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 beq _02254892 ldr r3, [sp] @@ -44,7 +44,7 @@ MOD29_02254854: ; 0x02254854 pop {r3, r4, r5, r6, r7, pc} _0225488C: add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap _02254892: mov r0, #0 pop {r3, r4, r5, r6, r7, pc} @@ -83,12 +83,12 @@ MOD29_022548C4: ; 0x022548C4 ldr r0, [r4, #0x50] cmp r0, #0 beq _022548D2 - bl FUN_02016A18 + bl FreeToHeap _022548D2: ldr r0, [r4, #0x48] bl MOD29_02254C84 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} thumb_func_end MOD29_022548C4 @@ -433,7 +433,7 @@ _02254B58: bne _02254AE0 _02254B60: ldr r0, [sp, #4] - bl FUN_02016A18 + bl FreeToHeap _02254B66: add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} @@ -497,7 +497,7 @@ MOD29_02254BC0: ; 0x02254BC0 add r6, r1, #0 mov r0, #8 mov r1, #0x90 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 beq _02254C04 add r0, #8 @@ -616,7 +616,7 @@ _02254CAE: add r0, #0x58 bl MOD20_02254014 add r0, r6, #0 - bl FUN_02016A18 + bl FreeToHeap _02254CBC: pop {r4, r5, r6, pc} .align 2, 0 diff --git a/arm9/modules/30/asm/module_30.s b/arm9/modules/30/asm/module_30.s index e0e1737f..a6c7ee0d 100644 --- a/arm9/modules/30/asm/module_30.s +++ b/arm9/modules/30/asm/module_30.s @@ -24,7 +24,7 @@ MOD30_02254854: ; 0x02254854 mov r1, #0x20 add r7, r2, #0 str r3, [sp] - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 beq _02254892 ldr r3, [sp] @@ -44,7 +44,7 @@ MOD30_02254854: ; 0x02254854 pop {r3, r4, r5, r6, r7, pc} _0225488C: add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap _02254892: mov r0, #0 pop {r3, r4, r5, r6, r7, pc} @@ -128,7 +128,7 @@ MOD30_0225490C: ; 0x0225490C ldr r0, [r4, #0x10] bl MOD30_02254ACC add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} thumb_func_end MOD30_0225490C @@ -338,7 +338,7 @@ MOD30_02254A90: ; 0x02254A90 add r5, r1, #0 mov r0, #8 mov r1, #0x60 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 beq _02254AC6 add r0, #8 @@ -368,7 +368,7 @@ MOD30_02254ACC: ; 0x02254ACC beq _02254ADC bl MOD30_02254B94 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap _02254ADC: pop {r4, pc} .align 2, 0 diff --git a/arm9/modules/31/asm/module_31.s b/arm9/modules/31/asm/module_31.s index f461d1c1..e4d8a7d8 100644 --- a/arm9/modules/31/asm/module_31.s +++ b/arm9/modules/31/asm/module_31.s @@ -24,7 +24,7 @@ MOD31_02254854: ; 0x02254854 mov r1, #0x20 add r7, r2, #0 str r3, [sp] - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 beq _02254892 ldr r3, [sp] @@ -44,7 +44,7 @@ MOD31_02254854: ; 0x02254854 pop {r3, r4, r5, r6, r7, pc} _0225488C: add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap _02254892: mov r0, #0 pop {r3, r4, r5, r6, r7, pc} @@ -115,7 +115,7 @@ MOD31_02254900: ; 0x02254900 ldr r0, [r4, #0xc] bl MOD31_02254AC0 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} thumb_func_end MOD31_02254900 @@ -328,7 +328,7 @@ MOD31_02254A84: ; 0x02254A84 add r5, r1, #0 mov r0, #8 mov r1, #0x64 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 beq _02254ABA add r0, #8 @@ -358,7 +358,7 @@ MOD31_02254AC0: ; 0x02254AC0 beq _02254AD0 bl MOD31_02254B88 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap _02254AD0: pop {r4, pc} .align 2, 0 diff --git a/arm9/modules/32/asm/module_32.s b/arm9/modules/32/asm/module_32.s index 6c0cd924..fa319f00 100644 --- a/arm9/modules/32/asm/module_32.s +++ b/arm9/modules/32/asm/module_32.s @@ -24,7 +24,7 @@ MOD32_02254854: ; 0x02254854 mov r1, #0x1c add r7, r2, #0 str r3, [sp] - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 beq _02254892 ldr r3, [sp] @@ -44,7 +44,7 @@ MOD32_02254854: ; 0x02254854 pop {r3, r4, r5, r6, r7, pc} _0225488C: add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap _02254892: mov r0, #0 pop {r3, r4, r5, r6, r7, pc} @@ -114,7 +114,7 @@ MOD32_02254900: ; 0x02254900 ldr r0, [r4, #8] bl MOD32_02254A90 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} thumb_func_end MOD32_02254900 @@ -314,7 +314,7 @@ MOD32_02254A54: ; 0x02254A54 add r5, r1, #0 mov r0, #8 mov r1, #0x3c - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 beq _02254A8A add r0, #8 @@ -342,7 +342,7 @@ MOD32_02254A90: ; 0x02254A90 push {r3, lr} cmp r0, #0 beq _02254A9A - bl FUN_02016A18 + bl FreeToHeap _02254A9A: pop {r3, pc} thumb_func_end MOD32_02254A90 diff --git a/arm9/modules/33/asm/module_33.s b/arm9/modules/33/asm/module_33.s index 1bfc56fe..c878125b 100644 --- a/arm9/modules/33/asm/module_33.s +++ b/arm9/modules/33/asm/module_33.s @@ -24,7 +24,7 @@ MOD33_02254854: ; 0x02254854 mov r1, #0x10 add r7, r2, #0 str r3, [sp] - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 beq _02254892 ldr r3, [sp] @@ -44,7 +44,7 @@ MOD33_02254854: ; 0x02254854 pop {r3, r4, r5, r6, r7, pc} _0225488C: add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap _02254892: mov r0, #0 pop {r3, r4, r5, r6, r7, pc} @@ -81,7 +81,7 @@ MOD33_022548C0: ; 0x022548C0 ldr r0, [r4, #8] bl MOD33_022549DC add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} .align 2, 0 thumb_func_end MOD33_022548C0 @@ -224,7 +224,7 @@ MOD33_022549AC: ; 0x022549AC add r6, r1, #0 mov r0, #8 mov r1, #0x30 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 beq _022549D8 add r0, #8 @@ -248,7 +248,7 @@ MOD33_022549DC: ; 0x022549DC push {r3, lr} cmp r0, #0 beq _022549E6 - bl FUN_02016A18 + bl FreeToHeap _022549E6: pop {r3, pc} thumb_func_end MOD33_022549DC diff --git a/arm9/modules/34/asm/module_34.s b/arm9/modules/34/asm/module_34.s index dc31c030..e08716c1 100644 --- a/arm9/modules/34/asm/module_34.s +++ b/arm9/modules/34/asm/module_34.s @@ -24,7 +24,7 @@ MOD34_02254854: ; 0x02254854 mov r1, #0x38 add r7, r2, #0 str r3, [sp] - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 beq _02254892 ldr r3, [sp] @@ -44,7 +44,7 @@ MOD34_02254854: ; 0x02254854 pop {r3, r4, r5, r6, r7, pc} _0225488C: add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap _02254892: mov r0, #0 pop {r3, r4, r5, r6, r7, pc} @@ -105,7 +105,7 @@ _022548F6: ldr r0, [r4, #0x24] bl MOD34_02254A8C add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} thumb_func_end MOD34_022548E8 @@ -313,7 +313,7 @@ MOD34_02254A5C: ; 0x02254A5C add r6, r1, #0 mov r0, #8 mov r1, #0x20 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 beq _02254A88 add r0, #8 @@ -337,7 +337,7 @@ MOD34_02254A8C: ; 0x02254A8C push {r3, lr} cmp r0, #0 beq _02254A96 - bl FUN_02016A18 + bl FreeToHeap _02254A96: pop {r3, pc} thumb_func_end MOD34_02254A8C diff --git a/arm9/modules/35/asm/module_35.s b/arm9/modules/35/asm/module_35.s index 7036c07d..135c8922 100644 --- a/arm9/modules/35/asm/module_35.s +++ b/arm9/modules/35/asm/module_35.s @@ -24,7 +24,7 @@ MOD35_02254854: ; 0x02254854 mov r1, #0x34 add r7, r2, #0 str r3, [sp] - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 beq _02254892 ldr r3, [sp] @@ -44,7 +44,7 @@ MOD35_02254854: ; 0x02254854 pop {r3, r4, r5, r6, r7, pc} _0225488C: add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap _02254892: mov r0, #0 pop {r3, r4, r5, r6, r7, pc} @@ -92,7 +92,7 @@ MOD35_022548DC: ; 0x022548DC ldr r0, [r4, #0x28] bl MOD35_02254B38 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} .align 2, 0 thumb_func_end MOD35_022548DC @@ -374,7 +374,7 @@ MOD35_02254ADC: ; 0x02254ADC add r5, r1, #0 mov r0, #8 mov r1, #0x90 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 beq _02254B2E add r0, #8 @@ -422,7 +422,7 @@ MOD35_02254B38: ; 0x02254B38 ldr r0, [r0] bl FUN_0200CAB4 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap _02254B52: pop {r4, pc} thumb_func_end MOD35_02254B38 diff --git a/arm9/modules/36/asm/module_36.s b/arm9/modules/36/asm/module_36.s index ef3e3e9e..93e6816a 100644 --- a/arm9/modules/36/asm/module_36.s +++ b/arm9/modules/36/asm/module_36.s @@ -24,7 +24,7 @@ MOD36_02254854: ; 0x02254854 mov r0, #8 add r7, r2, #0 str r3, [sp] - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 beq _02254892 ldr r3, [sp] @@ -44,7 +44,7 @@ MOD36_02254854: ; 0x02254854 pop {r3, r4, r5, r6, r7, pc} _0225488C: add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap _02254892: mov r0, #0 pop {r3, r4, r5, r6, r7, pc} @@ -120,7 +120,7 @@ MOD36_02254914: ; 0x02254914 ldr r0, [r4, r0] bl MOD36_02254E78 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} .align 2, 0 _02254930: .word 0x00005B84 @@ -825,7 +825,7 @@ MOD36_02254E30: ; 0x02254E30 add r5, r1, #0 mov r0, #8 mov r1, #0x70 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 beq _02254E74 add r0, #8 @@ -861,7 +861,7 @@ MOD36_02254E78: ; 0x02254E78 beq _02254E88 bl MOD36_02254EE4 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap _02254E88: pop {r4, pc} .align 2, 0 diff --git a/arm9/modules/37/asm/module_37.s b/arm9/modules/37/asm/module_37.s index e4fc7ad1..7433805c 100644 --- a/arm9/modules/37/asm/module_37.s +++ b/arm9/modules/37/asm/module_37.s @@ -24,7 +24,7 @@ MOD37_02254854: ; 0x02254854 mov r1, #0x14 add r7, r2, #0 str r3, [sp] - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 beq _02254892 ldr r3, [sp] @@ -44,7 +44,7 @@ MOD37_02254854: ; 0x02254854 pop {r3, r4, r5, r6, r7, pc} _0225488C: add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap _02254892: mov r0, #0 pop {r3, r4, r5, r6, r7, pc} @@ -102,7 +102,7 @@ MOD37_022548E0: ; 0x022548E0 ldr r0, [r4, #0xc] bl MOD37_02254B0C add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} .align 2, 0 thumb_func_end MOD37_022548E0 @@ -310,7 +310,7 @@ MOD37_02254A54: ; 0x02254A54 add r6, r1, #0 mov r0, #8 mov r1, #0x48 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 beq _02254A94 add r0, #8 @@ -403,7 +403,7 @@ MOD37_02254B0C: ; 0x02254B0C beq _02254B1C bl MOD37_02254AF4 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap _02254B1C: pop {r4, pc} .align 2, 0 diff --git a/arm9/modules/38/asm/module_38.s b/arm9/modules/38/asm/module_38.s index 029d89d2..1620e737 100644 --- a/arm9/modules/38/asm/module_38.s +++ b/arm9/modules/38/asm/module_38.s @@ -24,7 +24,7 @@ MOD38_02254854: ; 0x02254854 mov r1, #0x24 add r7, r2, #0 str r3, [sp] - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 beq _02254892 ldr r3, [sp] @@ -44,7 +44,7 @@ MOD38_02254854: ; 0x02254854 pop {r3, r4, r5, r6, r7, pc} _0225488C: add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap _02254892: mov r0, #0 pop {r3, r4, r5, r6, r7, pc} @@ -139,7 +139,7 @@ MOD38_02254928: ; 0x02254928 ldr r0, [r4, #0x14] bl MOD38_02254D04 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} thumb_func_end MOD38_02254928 @@ -512,7 +512,7 @@ MOD38_02254BC4: ; 0x02254BC4 add r6, r1, #0 mov r0, #8 mov r1, #0xc0 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 beq _02254C2A add r0, #8 @@ -683,7 +683,7 @@ MOD38_02254D04: ; 0x02254D04 add r0, r4, #0 bl MOD38_02254CC4 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap _02254D32: pop {r4, pc} thumb_func_end MOD38_02254D04 diff --git a/arm9/modules/39/asm/module_39.s b/arm9/modules/39/asm/module_39.s index 10288362..29b974a0 100644 --- a/arm9/modules/39/asm/module_39.s +++ b/arm9/modules/39/asm/module_39.s @@ -24,7 +24,7 @@ MOD39_02254854: ; 0x02254854 mov r1, #0x68 add r7, r2, #0 str r3, [sp] - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 beq _02254892 ldr r3, [sp] @@ -44,7 +44,7 @@ MOD39_02254854: ; 0x02254854 pop {r3, r4, r5, r6, r7, pc} _0225488C: add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap _02254892: mov r0, #0 pop {r3, r4, r5, r6, r7, pc} @@ -166,7 +166,7 @@ MOD39_02254974: ; 0x02254974 ldr r0, [r4, #0x38] bl MOD39_02254C58 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} thumb_func_end MOD39_02254974 @@ -546,7 +546,7 @@ MOD39_02254C1C: ; 0x02254C1C add r5, r1, #0 mov r0, #8 mov r1, #0x88 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 beq _02254C52 add r0, #8 @@ -576,7 +576,7 @@ MOD39_02254C58: ; 0x02254C58 beq _02254C68 bl MOD39_02254D78 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap _02254C68: pop {r4, pc} .align 2, 0 diff --git a/arm9/modules/40/asm/module_40.s b/arm9/modules/40/asm/module_40.s index 4d0e1d8f..304931b8 100644 --- a/arm9/modules/40/asm/module_40.s +++ b/arm9/modules/40/asm/module_40.s @@ -24,7 +24,7 @@ MOD40_02254854: ; 0x02254854 mov r1, #0x34 add r7, r2, #0 str r3, [sp] - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 beq _02254892 ldr r3, [sp] @@ -44,7 +44,7 @@ MOD40_02254854: ; 0x02254854 pop {r3, r4, r5, r6, r7, pc} _0225488C: add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap _02254892: mov r0, #0 pop {r3, r4, r5, r6, r7, pc} @@ -167,7 +167,7 @@ MOD40_02254978: ; 0x02254978 ldr r0, [r4, #8] bl MOD40_02254DA8 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} thumb_func_end MOD40_02254978 @@ -721,7 +721,7 @@ MOD40_02254D6C: ; 0x02254D6C add r5, r1, #0 mov r0, #8 mov r1, #0x9c - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 beq _02254DA2 add r0, #8 @@ -751,7 +751,7 @@ MOD40_02254DA8: ; 0x02254DA8 beq _02254DB8 bl MOD40_02254EE4 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap _02254DB8: pop {r4, pc} .align 2, 0 diff --git a/arm9/modules/41/asm/module_41.s b/arm9/modules/41/asm/module_41.s index b29e2780..8ea279f7 100644 --- a/arm9/modules/41/asm/module_41.s +++ b/arm9/modules/41/asm/module_41.s @@ -24,7 +24,7 @@ MOD41_02254854: ; 0x02254854 mov r1, #0x90 add r7, r2, #0 str r3, [sp] - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 beq _02254892 ldr r3, [sp] @@ -44,7 +44,7 @@ MOD41_02254854: ; 0x02254854 pop {r3, r4, r5, r6, r7, pc} _0225488C: add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap _02254892: mov r0, #0 pop {r3, r4, r5, r6, r7, pc} @@ -284,7 +284,7 @@ MOD41_02254A38: ; 0x02254A38 ldr r0, [r4, #8] bl MOD41_0225528C add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} thumb_func_end MOD41_02254A38 @@ -1342,7 +1342,7 @@ MOD41_0225524C: ; 0x0225524C add r5, r1, #0 mov r0, #8 mov r1, #0xac - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 beq _02255288 add r0, #8 @@ -1374,7 +1374,7 @@ MOD41_0225528C: ; 0x0225528C beq _0225529C bl MOD41_02255374 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap _0225529C: pop {r4, pc} .align 2, 0 diff --git a/arm9/modules/42/asm/module_42.s b/arm9/modules/42/asm/module_42.s index da2f2470..89617940 100644 --- a/arm9/modules/42/asm/module_42.s +++ b/arm9/modules/42/asm/module_42.s @@ -24,7 +24,7 @@ MOD42_02254854: ; 0x02254854 mov r1, #0x78 add r7, r2, #0 str r3, [sp] - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 beq _02254892 ldr r3, [sp] @@ -44,7 +44,7 @@ MOD42_02254854: ; 0x02254854 pop {r3, r4, r5, r6, r7, pc} _0225488C: add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap _02254892: mov r0, #0 pop {r3, r4, r5, r6, r7, pc} @@ -225,7 +225,7 @@ _022549D4: ldr r0, [r6, #0x58] bl MOD42_02254CF0 add r0, r6, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, r5, r6, pc} .align 2, 0 thumb_func_end MOD42_022549CC @@ -621,7 +621,7 @@ MOD42_02254CB4: ; 0x02254CB4 add r5, r1, #0 mov r0, #8 mov r1, #0x74 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 beq _02254CEA add r0, #8 @@ -651,7 +651,7 @@ MOD42_02254CF0: ; 0x02254CF0 beq _02254D00 bl MOD42_02254E7C add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap _02254D00: pop {r4, pc} .align 2, 0 diff --git a/arm9/modules/43/asm/module_43.s b/arm9/modules/43/asm/module_43.s index 9057d4d8..b8533f00 100644 --- a/arm9/modules/43/asm/module_43.s +++ b/arm9/modules/43/asm/module_43.s @@ -24,7 +24,7 @@ MOD43_02254854: ; 0x02254854 mov r1, #0xb0 add r7, r2, #0 str r3, [sp] - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 beq _02254892 ldr r3, [sp] @@ -44,7 +44,7 @@ MOD43_02254854: ; 0x02254854 pop {r3, r4, r5, r6, r7, pc} _0225488C: add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap _02254892: mov r0, #0 pop {r3, r4, r5, r6, r7, pc} @@ -130,7 +130,7 @@ MOD43_02254928: ; 0x02254928 ldr r0, [r0] bl MOD43_02254BCC add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} thumb_func_end MOD43_02254928 @@ -473,7 +473,7 @@ MOD43_02254B8C: ; 0x02254B8C add r6, r0, #0 mov r0, #8 lsl r1, r1, #4 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 beq _02254BC6 add r0, #8 @@ -503,7 +503,7 @@ MOD43_02254BCC: ; 0x02254BCC push {r3, lr} cmp r0, #0 beq _02254BD6 - bl FUN_02016A18 + bl FreeToHeap _02254BD6: pop {r3, pc} thumb_func_end MOD43_02254BCC diff --git a/arm9/modules/44/asm/module_44.s b/arm9/modules/44/asm/module_44.s index 9503c3c1..346f755c 100644 --- a/arm9/modules/44/asm/module_44.s +++ b/arm9/modules/44/asm/module_44.s @@ -24,7 +24,7 @@ MOD44_02254854: ; 0x02254854 mov r1, #0x14 add r7, r2, #0 str r3, [sp] - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 beq _02254892 ldr r3, [sp] @@ -44,7 +44,7 @@ MOD44_02254854: ; 0x02254854 pop {r3, r4, r5, r6, r7, pc} _0225488C: add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap _02254892: mov r0, #0 pop {r3, r4, r5, r6, r7, pc} @@ -91,7 +91,7 @@ MOD44_022548D8: ; 0x022548D8 ldr r0, [r4, #8] bl MOD44_02254B00 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} .align 2, 0 thumb_func_end MOD44_022548D8 @@ -309,7 +309,7 @@ MOD44_02254A54: ; 0x02254A54 add r5, r1, #0 mov r0, #8 mov r1, #0x3c - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 beq _02254A8A add r0, #8 @@ -398,7 +398,7 @@ MOD44_02254B00: ; 0x02254B00 beq _02254B10 bl MOD44_02254AE4 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap _02254B10: pop {r4, pc} .align 2, 0 diff --git a/arm9/modules/45/asm/module_45.s b/arm9/modules/45/asm/module_45.s index 48c0d8ef..b64df933 100644 --- a/arm9/modules/45/asm/module_45.s +++ b/arm9/modules/45/asm/module_45.s @@ -24,7 +24,7 @@ MOD45_02254854: ; 0x02254854 mov r1, #0xb0 add r7, r2, #0 str r3, [sp] - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 beq _02254892 ldr r3, [sp] @@ -44,7 +44,7 @@ MOD45_02254854: ; 0x02254854 pop {r3, r4, r5, r6, r7, pc} _0225488C: add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap _02254892: mov r0, #0 pop {r3, r4, r5, r6, r7, pc} @@ -212,7 +212,7 @@ MOD45_022549C0: ; 0x022549C0 ldr r0, [r0] bl MOD45_02254BCC add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} .align 2, 0 thumb_func_end MOD45_022549C0 @@ -467,7 +467,7 @@ MOD45_02254B90: ; 0x02254B90 add r5, r1, #0 mov r0, #8 mov r1, #0x3c - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 beq _02254BC6 add r0, #8 @@ -497,7 +497,7 @@ MOD45_02254BCC: ; 0x02254BCC beq _02254BDC bl MOD45_02254C64 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap _02254BDC: pop {r4, pc} .align 2, 0 diff --git a/arm9/modules/46/asm/module_46.s b/arm9/modules/46/asm/module_46.s index 0a5bd641..72013e2e 100644 --- a/arm9/modules/46/asm/module_46.s +++ b/arm9/modules/46/asm/module_46.s @@ -24,7 +24,7 @@ MOD46_02254854: ; 0x02254854 mov r1, #0x10 add r7, r2, #0 str r3, [sp] - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 beq _02254892 ldr r3, [sp] @@ -44,7 +44,7 @@ MOD46_02254854: ; 0x02254854 pop {r3, r4, r5, r6, r7, pc} _0225488C: add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap _02254892: mov r0, #0 pop {r3, r4, r5, r6, r7, pc} @@ -81,7 +81,7 @@ MOD46_022548C0: ; 0x022548C0 ldr r0, [r4, #8] bl MOD46_022549DC add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} .align 2, 0 thumb_func_end MOD46_022548C0 @@ -224,7 +224,7 @@ MOD46_022549AC: ; 0x022549AC add r6, r1, #0 mov r0, #8 mov r1, #0x30 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 beq _022549D8 add r0, #8 @@ -248,7 +248,7 @@ MOD46_022549DC: ; 0x022549DC push {r3, lr} cmp r0, #0 beq _022549E6 - bl FUN_02016A18 + bl FreeToHeap _022549E6: pop {r3, pc} thumb_func_end MOD46_022549DC diff --git a/arm9/modules/47/asm/module_47.s b/arm9/modules/47/asm/module_47.s index 11520ab5..f92acbb8 100644 --- a/arm9/modules/47/asm/module_47.s +++ b/arm9/modules/47/asm/module_47.s @@ -24,7 +24,7 @@ MOD47_02254854: ; 0x02254854 mov r1, #0x24 add r7, r2, #0 str r3, [sp] - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 beq _02254892 ldr r3, [sp] @@ -44,7 +44,7 @@ MOD47_02254854: ; 0x02254854 pop {r3, r4, r5, r6, r7, pc} _0225488C: add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap _02254892: mov r0, #0 pop {r3, r4, r5, r6, r7, pc} @@ -87,7 +87,7 @@ MOD47_022548CC: ; 0x022548CC ldr r0, [r4, #0x14] bl MOD47_02254D6C add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} .align 2, 0 thumb_func_end MOD47_022548CC @@ -697,7 +697,7 @@ MOD47_02254D14: ; 0x02254D14 add r5, r1, #0 mov r0, #8 mov r1, #0x60 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 beq _02254D62 add r0, #8 @@ -743,7 +743,7 @@ MOD47_02254D6C: ; 0x02254D6C add r0, r4, #0 bl MOD47_02254DFC add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap _02254D8A: pop {r4, pc} thumb_func_end MOD47_02254D6C diff --git a/arm9/modules/48/asm/module_48.s b/arm9/modules/48/asm/module_48.s index bc0ac51c..5a117b74 100644 --- a/arm9/modules/48/asm/module_48.s +++ b/arm9/modules/48/asm/module_48.s @@ -24,7 +24,7 @@ MOD48_02254854: ; 0x02254854 mov r1, #0x40 add r7, r2, #0 str r3, [sp] - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 beq _02254892 ldr r3, [sp] @@ -44,7 +44,7 @@ MOD48_02254854: ; 0x02254854 pop {r3, r4, r5, r6, r7, pc} _0225488C: add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap _02254892: mov r0, #0 pop {r3, r4, r5, r6, r7, pc} @@ -138,7 +138,7 @@ MOD48_02254938: ; 0x02254938 ldr r0, [r4, #0x2c] bl MOD48_02254AD4 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} thumb_func_end MOD48_02254938 @@ -343,7 +343,7 @@ MOD48_02254AA0: ; 0x02254AA0 add r6, r1, #0 mov r0, #8 mov r1, #0xb0 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 beq _02254ACE add r0, #8 @@ -368,7 +368,7 @@ MOD48_02254AD4: ; 0x02254AD4 push {r3, lr} cmp r0, #0 beq _02254ADE - bl FUN_02016A18 + bl FreeToHeap _02254ADE: pop {r3, pc} thumb_func_end MOD48_02254AD4 diff --git a/arm9/modules/49/asm/module_49.s b/arm9/modules/49/asm/module_49.s index d034630a..f61d8633 100644 --- a/arm9/modules/49/asm/module_49.s +++ b/arm9/modules/49/asm/module_49.s @@ -24,7 +24,7 @@ MOD49_02254854: ; 0x02254854 mov r1, #0x7c add r7, r2, #0 str r3, [sp] - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 beq _02254892 ldr r3, [sp] @@ -44,7 +44,7 @@ MOD49_02254854: ; 0x02254854 pop {r3, r4, r5, r6, r7, pc} _0225488C: add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap _02254892: mov r0, #0 pop {r3, r4, r5, r6, r7, pc} @@ -128,7 +128,7 @@ MOD49_02254920: ; 0x02254920 ldr r0, [r4, #0x68] bl MOD49_02254A78 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} thumb_func_end MOD49_02254920 @@ -301,7 +301,7 @@ MOD49_02254A44: ; 0x02254A44 add r6, r1, #0 mov r0, #8 mov r1, #0x98 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 beq _02254A72 add r0, #8 @@ -326,7 +326,7 @@ MOD49_02254A78: ; 0x02254A78 push {r3, lr} cmp r0, #0 beq _02254A82 - bl FUN_02016A18 + bl FreeToHeap _02254A82: pop {r3, pc} thumb_func_end MOD49_02254A78 diff --git a/arm9/modules/50/asm/module_50.s b/arm9/modules/50/asm/module_50.s index dd8fdef3..3310d44c 100644 --- a/arm9/modules/50/asm/module_50.s +++ b/arm9/modules/50/asm/module_50.s @@ -24,7 +24,7 @@ MOD50_02254854: ; 0x02254854 mov r1, #0x10 str r2, [sp] add r5, r3, #0 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 beq _02254894 ldr r2, [sp] @@ -45,7 +45,7 @@ MOD50_02254854: ; 0x02254854 pop {r3, r4, r5, r6, r7, pc} _0225488E: add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap _02254894: mov r0, #0 pop {r3, r4, r5, r6, r7, pc} @@ -82,7 +82,7 @@ MOD50_022548C0: ; 0x022548C0 ldr r0, [r4, #8] bl MOD50_022549E0 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} .align 2, 0 thumb_func_end MOD50_022548C0 @@ -225,7 +225,7 @@ MOD50_022549AC: ; 0x022549AC add r6, r1, #0 mov r0, #8 mov r1, #0x30 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 beq _022549DA add r0, #8 @@ -254,10 +254,10 @@ MOD50_022549E0: ; 0x022549E0 ldr r0, [r4, #4] cmp r0, #0 beq _022549F0 - bl FUN_02016A18 + bl FreeToHeap _022549F0: add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap _022549F6: pop {r4, pc} thumb_func_end MOD50_022549E0 diff --git a/arm9/modules/51/asm/module_51.s b/arm9/modules/51/asm/module_51.s index 53b01aee..c07a0192 100644 --- a/arm9/modules/51/asm/module_51.s +++ b/arm9/modules/51/asm/module_51.s @@ -355,7 +355,7 @@ _02254AEC: ldr r0, [sp] bl MOD51_02254B30 ldr r0, [r6, #0x20] - bl FUN_02016A18 + bl FreeToHeap mov r0, #0xa2 lsl r0, r0, #2 ldr r0, [r6, r0] @@ -1884,7 +1884,7 @@ _022556E6: bl MOD51_02255640 _0225570E: ldr r0, [sp, #4] - bl FUN_02016A18 + bl FreeToHeap _02255714: add sp, #8 pop {r3, r4, r5, r6, r7, pc} diff --git a/arm9/modules/53/asm/module_53.s b/arm9/modules/53/asm/module_53.s index 5e63549a..77275774 100644 --- a/arm9/modules/53/asm/module_53.s +++ b/arm9/modules/53/asm/module_53.s @@ -410,7 +410,7 @@ _021D786E: add r0, r6, #0 bl MOD53_021D7AE8 ldr r0, [r6, #8] - bl FUN_02016A18 + bl FreeToHeap add r0, r5, #0 bl FUN_0200627C mov r0, #0 @@ -675,7 +675,7 @@ _021D7A0E: mov r1, #0xf mov r0, #0x27 lsl r1, r1, #0xa - bl FUN_02016998 + bl AllocFromHeap ldr r1, _021D7AE0 ; =0x000043C8 str r0, [r7, r1] mov r0, #0x27 @@ -704,7 +704,7 @@ MOD53_021D7AE8: ; 0x021D7AE8 add r6, r0, #0 ldr r0, _021D7B1C ; =0x000043C8 ldr r0, [r6, r0] - bl FUN_02016A18 + bl FreeToHeap ldr r0, _021D7B20 ; =0x000093F0 ldr r0, [r6, r0] bl FUN_020145A8 @@ -749,7 +749,7 @@ MOD53_021D7B24: ; 0x021D7B24 mov r1, #0 bl FUN_020178A0 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} .align 2, 0 thumb_func_end MOD53_021D7B24 diff --git a/arm9/modules/54/asm/module_54.s b/arm9/modules/54/asm/module_54.s index 529bf315..9de1ac02 100644 --- a/arm9/modules/54/asm/module_54.s +++ b/arm9/modules/54/asm/module_54.s @@ -634,11 +634,11 @@ MOD54_021D7A34: ; 0x021D7A34 add r6, r0, #0 bl MOD54_021D8F0C ldr r0, [r6, #0x18] - bl FUN_02016A18 + bl FreeToHeap mov r0, #0xea lsl r0, r0, #2 ldr r0, [r6, r0] - bl FUN_02016A18 + bl FreeToHeap mov r4, #0 add r5, r6, #0 _021D7A50: @@ -674,7 +674,7 @@ MOD54_021D7A6C: ; 0x021D7A6C mov r1, #0 bl FUN_020178A0 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} .align 2, 0 thumb_func_end MOD54_021D7A6C @@ -3320,19 +3320,19 @@ MOD54_021D8F0C: ; 0x021D8F0C mov r0, #0xcd lsl r0, r0, #2 ldr r0, [r4, r0] - bl FUN_02016A18 + bl FreeToHeap mov r0, #0xce lsl r0, r0, #2 ldr r0, [r4, r0] - bl FUN_02016A18 + bl FreeToHeap mov r0, #0xc9 lsl r0, r0, #2 ldr r0, [r4, r0] - bl FUN_02016A18 + bl FreeToHeap mov r0, #0xca lsl r0, r0, #2 ldr r0, [r4, r0] - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} .align 2, 0 thumb_func_end MOD54_021D8F0C @@ -3777,7 +3777,7 @@ MOD54_021D9238: ; 0x021D9238 add r5, r0, #0 add r0, r1, #0 add r1, r4, #0 - bl FUN_020169D8 + bl AllocFromHeapAtEnd add r7, r0, #0 add r0, r5, #0 bl FUN_02022504 @@ -3807,7 +3807,7 @@ MOD54_021D9274: ; 0x021D9274 add r5, r0, #0 add r0, r1, #0 add r1, r4, #0 - bl FUN_020169D8 + bl AllocFromHeapAtEnd add r7, r0, #0 add r0, r5, #0 bl FUN_02022504 @@ -3835,7 +3835,7 @@ MOD54_021D92AC: ; 0x021D92AC add r5, r0, #0 add r0, r1, #0 add r1, r4, #0 - bl FUN_020169D8 + bl AllocFromHeapAtEnd add r7, r0, #0 add r0, r5, #0 bl FUN_02022504 @@ -4069,7 +4069,7 @@ MOD54_021D943C: ; 0x021D943C add r6, r0, #0 add r0, r4, #0 add r1, r5, #0 - bl FUN_020169D8 + bl AllocFromHeapAtEnd add r4, r0, #0 add r0, r6, #0 bl MOD54_021D9098 @@ -4111,7 +4111,7 @@ MOD54_021D9488: ; 0x021D9488 add r6, r0, #0 add r0, r4, #0 add r1, r5, #0 - bl FUN_020169D8 + bl AllocFromHeapAtEnd add r4, r0, #0 add r0, r6, #0 mov r1, #0 @@ -4217,7 +4217,7 @@ MOD54_021D9544: ; 0x021D9544 add r6, r0, #0 add r0, r1, #0 add r1, r5, #0 - bl FUN_020169D8 + bl AllocFromHeapAtEnd add r4, r0, #0 mov r1, #0 add r2, r5, #0 @@ -4267,7 +4267,7 @@ _021D959C: add r2, r4, #0 bl MIi_CpuCopyFast add r0, r7, #0 - bl FUN_02016A18 + bl FreeToHeap ldr r0, [sp, #4] sub r6, r6, r4 add r0, r0, r4 diff --git a/arm9/modules/55/asm/module_55.s b/arm9/modules/55/asm/module_55.s index 3215db95..70381d8a 100644 --- a/arm9/modules/55/asm/module_55.s +++ b/arm9/modules/55/asm/module_55.s @@ -317,7 +317,7 @@ _021D7754: mov r0, #0xeb lsl r0, r0, #2 ldr r0, [r6, r0] - bl FUN_02016A18 + bl FreeToHeap pop {r3, r4, r5, r6, r7, pc} thumb_func_end MOD55_021D7720 @@ -708,7 +708,7 @@ MOD55_021D7AA4: ; 0x021D7AA4 mov r1, #0 bl FUN_020178A0 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} .align 2, 0 thumb_func_end MOD55_021D7AA4 @@ -1995,7 +1995,7 @@ MOD55_021D84C8: ; 0x021D84C8 mov r1, #0x19 bl MOD55_021DA0A4 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x3b mov r1, #0xd lsl r0, r0, #4 @@ -3335,7 +3335,7 @@ _021D8F1A: mov r1, #0xc bl MOD55_021DA0A4 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap ldr r0, _021D8FE0 ; =0x00000418 mov r1, #0 strh r1, [r5, r0] @@ -3535,7 +3535,7 @@ MOD55_021D90D8: ; 0x021D90D8 lsl r0, r0, #2 strb r1, [r5, r0] add r0, r6, #0 - bl FUN_02016A18 + bl FreeToHeap _021D9170: mov r0, #0x3b mov r1, #3 @@ -4419,7 +4419,7 @@ _021D987C: add r2, r5, #0 bl FUN_0200ABC0 add r0, r5, #0 - bl FUN_02016A18 + bl FreeToHeap add r2, r4, #0 add r2, #0xb8 ldr r0, [r4, #0x10] @@ -4777,7 +4777,7 @@ _021D9C18: add r0, r4, r0 bl FUN_02019220 ldr r0, [sp, #0x20] - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x3b mov r1, #0x15 lsl r0, r0, #4 @@ -5226,7 +5226,7 @@ MOD55_021D9F8C: ; 0x021D9F8C mov r1, #0x1c bl MOD55_021DA0A4 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x3b mov r1, #0x1c lsl r0, r0, #4 diff --git a/arm9/modules/56/asm/module_56.s b/arm9/modules/56/asm/module_56.s index 08de4669..095e72dc 100644 --- a/arm9/modules/56/asm/module_56.s +++ b/arm9/modules/56/asm/module_56.s @@ -916,7 +916,7 @@ MOD56_02212540: ; 0x02212540 mov r1, #0 bl FUN_020178A0 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} .align 2, 0 thumb_func_end MOD56_02212540 @@ -7113,7 +7113,7 @@ _02215532: add r2, r6, #0 bl FUN_0200ABC0 add r0, r6, #0 - bl FUN_02016A18 + bl FreeToHeap add r0, r5, #0 mov r2, #0x56 add r0, #0xcc @@ -8445,7 +8445,7 @@ MOD56_022160E4: ; 0x022160E4 add r2, r4, #0 bl FUN_0200ABC0 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap _0221611C: pop {r4, r5, r6, pc} .align 2, 0 diff --git a/arm9/modules/57/asm/module_57.s b/arm9/modules/57/asm/module_57.s index a7e7e2ee..a84a5097 100644 --- a/arm9/modules/57/asm/module_57.s +++ b/arm9/modules/57/asm/module_57.s @@ -546,10 +546,10 @@ MOD57_021D7944: ; 0x021D7944 bl MOD57_021D94BC ldr r0, _021D79A4 ; =0x000030B8 ldr r0, [r4, r0] - bl FUN_02016A18 + bl FreeToHeap ldr r0, _021D79A8 ; =0x000032F8 ldr r0, [r4, r0] - bl FUN_02016A18 + bl FreeToHeap add r0, r4, #4 bl MOD57_021D89D4 ldr r0, [r4] @@ -736,7 +736,7 @@ _021D7AC4: mov r2, #0x20 bl GXS_LoadBGPltt add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r3, r4, r5, pc} thumb_func_end MOD57_021D7A34 @@ -788,7 +788,7 @@ _021D7B30: mov r2, #0x20 bl GXS_LoadBGPltt add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap add sp, #4 pop {r3, r4, pc} thumb_func_end MOD57_021D7AF4 @@ -815,7 +815,7 @@ MOD57_021D7B5C: ; 0x021D7B5C mov r2, #0x20 bl GXS_LoadBGPltt add r0, r6, #0 - bl FUN_02016A18 + bl FreeToHeap add sp, #4 pop {r3, r4, r5, r6, pc} .align 2, 0 @@ -966,7 +966,7 @@ MOD57_021D7CA4: ; 0x021D7CA4 lsl r2, r2, #8 bl GXS_LoadBGPltt add r0, r5, #0 - bl FUN_02016A18 + bl FreeToHeap add r0, r4, #0 add r0, #0xb4 ldr r1, [r0] @@ -993,7 +993,7 @@ MOD57_021D7CA4: ; 0x021D7CA4 lsl r2, r2, #8 bl GX_LoadBGPltt add r0, r5, #0 - bl FUN_02016A18 + bl FreeToHeap add r0, r4, #0 add r0, #0xb4 ldr r0, [r0] @@ -1228,7 +1228,7 @@ MOD57_021D7EDC: ; 0x021D7EDC mov r1, #3 bl FUN_020178A0 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} thumb_func_end MOD57_021D7EDC @@ -3715,7 +3715,7 @@ _021D9290: mov r0, #0x1e lsl r0, r0, #4 ldr r0, [r5, r0] - bl FUN_02016A18 + bl FreeToHeap bl ErrorHandling b _021D92CE _021D92CA: @@ -3967,7 +3967,7 @@ _021D94C6: lsl r0, r4, #2 add r0, r5, r0 ldr r0, [r0, r6] - bl FUN_02016A18 + bl FreeToHeap add r0, r4, #1 lsl r0, r0, #0x18 lsr r4, r0, #0x18 diff --git a/arm9/modules/58/asm/module_58.s b/arm9/modules/58/asm/module_58.s index f41e981d..1b86ce96 100644 --- a/arm9/modules/58/asm/module_58.s +++ b/arm9/modules/58/asm/module_58.s @@ -561,7 +561,7 @@ MOD58_021D9ED8: ; 0x021D9ED8 mov r1, #0 bl FUN_020178A0 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} .align 2, 0 thumb_func_end MOD58_021D9ED8 diff --git a/arm9/modules/59/asm/module_59.s b/arm9/modules/59/asm/module_59.s index ec8b9a53..18eeffea 100644 --- a/arm9/modules/59/asm/module_59.s +++ b/arm9/modules/59/asm/module_59.s @@ -588,7 +588,7 @@ MOD59_021D796C: ; 0x021D796C mov r1, #7 bl FUN_020178A0 ldr r0, [r4, #0x18] - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} thumb_func_end MOD59_021D796C @@ -1096,7 +1096,7 @@ _021D7DA8: mov r6, #3 b _021D7DC4 _021D7DB0: - ldr r0, _021D7EAC ; =0x020ECAC0 + ldr r0, _021D7EAC ; =gGameVersion ldr r2, _021D7EB0 ; =0x021D9DA0 ldrb r0, [r0] cmp r0, #0xa @@ -1214,7 +1214,7 @@ _021D7E9C: .word 0x021D9DA8 _021D7EA0: .word 0x021D9E0C _021D7EA4: .word 0x021D9DB0 _021D7EA8: .word 0x021D9E58 -_021D7EAC: .word 0x020ECAC0 +_021D7EAC: .word gGameVersion _021D7EB0: .word 0x021D9DA0 _021D7EB4: .word 0x021D9F40 _021D7EB8: .word 0x021D9F68 @@ -1447,7 +1447,7 @@ MOD59_021D8058: ; 0x021D8058 mov r0, #0x7d mov r3, #7 bl FUN_0200687C - ldr r0, _021D80F8 ; =0x020ECAC0 + ldr r0, _021D80F8 ; =gGameVersion ldrb r0, [r0] cmp r0, #0xa bne _021D80A6 @@ -1490,7 +1490,7 @@ _021D80AA: add sp, #0x10 pop {r3, r4, r5, pc} nop -_021D80F8: .word 0x020ECAC0 +_021D80F8: .word gGameVersion thumb_func_end MOD59_021D8058 thumb_func_start MOD59_021D80FC @@ -1722,7 +1722,7 @@ MOD59_021D82A0: ; 0x021D82A0 bl FUN_02068C00 ldr r0, [r5] mov r1, #0xc8 - bl FUN_02016998 + bl AllocFromHeap add r7, r0, #0 ldr r2, _021D83F0 ; =0x021D9FE8 mov r1, #0 @@ -1848,11 +1848,11 @@ _021D82C8: lsl r3, r0, #6 bl FUN_02017FB4 add r0, r6, #0 - bl FUN_02016A18 + bl FreeToHeap add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap add r0, r7, #0 - bl FUN_02016A18 + bl FreeToHeap add sp, #0x20 pop {r3, r4, r5, r6, r7, pc} .align 2, 0 @@ -4140,7 +4140,7 @@ _021D9636: str r0, [r4, #0xc] b _021D985C _021D963C: - ldr r1, _021D977C ; =0x020ECAC0 + ldr r1, _021D977C ; =gGameVersion ldrb r1, [r1] cmp r1, #0xa bne _021D964C @@ -4295,7 +4295,7 @@ _021D9764: b _021D985C nop _021D9778: .word 0x020FA5FC -_021D977C: .word 0x020ECAC0 +_021D977C: .word gGameVersion _021D9780: .word 0x021D9F40 _021D9784: .word 0x021D9F68 _021D9788: @@ -4861,7 +4861,7 @@ MOD59_021D9BD0: ; 0x021D9BD0 mov r1, #2 bl FUN_020178A0 ldr r0, [r4, #4] - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} nop _021D9C44: .word 0x04000050 diff --git a/arm9/modules/60/asm/module_60.s b/arm9/modules/60/asm/module_60.s index 570890e1..9c4971db 100644 --- a/arm9/modules/60/asm/module_60.s +++ b/arm9/modules/60/asm/module_60.s @@ -662,7 +662,7 @@ MOD60_021D7A14: ; 0x021D7A14 mov r1, #0 bl FUN_020178A0 ldr r0, [r4, #0x14] - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} thumb_func_end MOD60_021D7A14 @@ -680,7 +680,7 @@ MOD60_021D7A40: ; 0x021D7A40 bl GetNarcMemberSizeByIdPair add r1, r0, #0 ldr r0, [r5] - bl FUN_020169D8 + bl AllocFromHeapAtEnd add r6, r0, #0 add r0, r4, #0 mov r1, #1 @@ -705,13 +705,13 @@ MOD60_021D7A40: ; 0x021D7A40 mov r1, #4 bl FUN_02017E14 add r0, r6, #0 - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x49 mov r1, #0 bl GetNarcMemberSizeByIdPair add r1, r0, #0 ldr r0, [r5] - bl FUN_020169D8 + bl AllocFromHeapAtEnd add r6, r0, #0 add r0, r4, #0 mov r1, #0 @@ -733,13 +733,13 @@ MOD60_021D7A40: ; 0x021D7A40 mov r3, #0 bl FUN_02017FB4 add r0, r6, #0 - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x49 mov r1, #2 bl GetNarcMemberSizeByIdPair add r1, r0, #0 ldr r0, [r5] - bl FUN_02016998 + bl AllocFromHeap str r0, [r5, #0x24] ldr r2, [r5, #0x24] add r0, r4, #0 @@ -817,11 +817,11 @@ MOD60_021D7A40: ; 0x021D7A40 thumb_func_start MOD60_021D7B98 MOD60_021D7B98: ; 0x021D7B98 - ldr r3, _021D7BA0 ; =FUN_02016A18 + ldr r3, _021D7BA0 ; =FreeToHeap ldr r0, [r0, #0x24] bx r3 nop -_021D7BA0: .word FUN_02016A18 +_021D7BA0: .word FreeToHeap thumb_func_end MOD60_021D7B98 thumb_func_start MOD60_021D7BA4 @@ -1019,7 +1019,7 @@ MOD60_021D7D18: ; 0x021D7D18 bl FUN_0201BDE0 add r0, r5, #0 bl FUN_02021A4C - ldr r1, _021D7DF0 ; =0x020ECAC0 + ldr r1, _021D7DF0 ; =gGameVersion ldr r0, [r6, #0x20] ldrb r1, [r1] add r2, r5, #0 @@ -1090,7 +1090,7 @@ _021D7DB6: pop {r3, r4, r5, r6, r7, pc} nop _021D7DEC: .word 0x00010200 -_021D7DF0: .word 0x020ECAC0 +_021D7DF0: .word gGameVersion _021D7DF4: .word 0x0001020F thumb_func_end MOD60_021D7D18 diff --git a/arm9/modules/61/asm/module_61.s b/arm9/modules/61/asm/module_61.s index e75bcde2..3b1791b2 100644 --- a/arm9/modules/61/asm/module_61.s +++ b/arm9/modules/61/asm/module_61.s @@ -1034,7 +1034,7 @@ MOD61_021D7CB4: ; 0x021D7CB4 mov r1, #0 bl FUN_020178A0 ldr r0, [r4, #0x18] - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} thumb_func_end MOD61_021D7CB4 @@ -1079,7 +1079,7 @@ MOD61_021D7CE8: ; 0x021D7CE8 bl GetNarcMemberSizeByIdPair add r1, r0, #0 ldr r0, [r5] - bl FUN_020169D8 + bl AllocFromHeapAtEnd add r7, r0, #0 add r0, r6, #0 add r1, r4, #0 @@ -1105,13 +1105,13 @@ MOD61_021D7CE8: ; 0x021D7CE8 mov r1, #4 bl FUN_02017E14 add r0, r7, #0 - bl FUN_02016A18 + bl FreeToHeap ldr r1, [sp, #0x1c] mov r0, #0x4f bl GetNarcMemberSizeByIdPair add r1, r0, #0 ldr r0, [r5] - bl FUN_020169D8 + bl AllocFromHeapAtEnd add r4, r0, #0 ldr r1, [sp, #0x1c] add r0, r6, #0 @@ -1238,13 +1238,13 @@ _021D7E00: ldr r0, [r5, #0x30] bl FUN_0200372C add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap ldr r1, [sp, #0x20] mov r0, #0x4f bl GetNarcMemberSizeByIdPair add r1, r0, #0 ldr r0, [r5] - bl FUN_02016998 + bl AllocFromHeap str r0, [r5, #0x34] ldr r1, [sp, #0x20] ldr r2, [r5, #0x34] @@ -1259,7 +1259,7 @@ _021D7E00: bl GetNarcMemberSizeByIdPair add r1, r0, #0 ldr r0, [r5] - bl FUN_02016998 + bl AllocFromHeap str r0, [r5, #0x38] ldr r2, [r5, #0x38] add r0, r6, #0 @@ -1360,9 +1360,9 @@ MOD61_021D7FB4: ; 0x021D7FB4 sub sp, #4 add r4, r0, #0 ldr r0, [r4, #0x38] - bl FUN_02016A18 + bl FreeToHeap ldr r0, [r4, #0x34] - bl FUN_02016A18 + bl FreeToHeap ldr r0, [r4, #0x30] mov r1, #2 bl FUN_02003038 diff --git a/arm9/modules/62/asm/module_62.s b/arm9/modules/62/asm/module_62.s index d98871b2..44336f0b 100644 --- a/arm9/modules/62/asm/module_62.s +++ b/arm9/modules/62/asm/module_62.s @@ -1580,7 +1580,7 @@ _0222E160: mov r1, #0 str r1, [r0] add r0, r7, #0 - bl FUN_02016A18 + bl FreeToHeap ldr r0, [sp] bl FUN_0200CAB4 _0222E17C: @@ -1598,7 +1598,7 @@ MOD62_0222E180: ; 0x0222E180 mov r0, #0x35 lsl r1, r1, #4 str r2, [sp, #0x10] - bl FUN_02016998 + bl AllocFromHeap str r0, [sp, #0x1c] ldr r0, [sp, #8] mov r1, #0x59 @@ -5238,7 +5238,7 @@ _0222FDFC: add r0, r5, #0 bl FUN_0200CAB4 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r3, r4, r5, pc} _0222FE1C: add r0, r0, #1 @@ -5254,7 +5254,7 @@ MOD62_0222FE24: ; 0x0222FE24 add r5, r1, #0 mov r0, #0x35 mov r1, #0xc - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 mov r0, #1 str r0, [r4] diff --git a/arm9/modules/63/asm/module_63.s b/arm9/modules/63/asm/module_63.s index 9606c9e5..861f4283 100644 --- a/arm9/modules/63/asm/module_63.s +++ b/arm9/modules/63/asm/module_63.s @@ -581,9 +581,9 @@ MOD63_021D7970: ; 0x021D7970 add r0, #0x68 bl thunk_FUN_020ae84c ldr r0, [r4, #0x60] - bl FUN_02016A18 + bl FreeToHeap ldr r0, [r4, #0x5c] - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} .align 2, 0 thumb_func_end MOD63_021D7970 @@ -882,7 +882,7 @@ MOD63_021D7B9C: ; 0x021D7B9C mov r1, #7 bl FUN_020178A0 ldr r0, [r4, #4] - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} thumb_func_end MOD63_021D7B9C @@ -898,7 +898,7 @@ MOD63_021D7C18: ; 0x021D7C18 add r1, r4, #0 add r2, r5, #0 bl MOD63_021D83A8 - ldr r0, _021D7D5C ; =0x020ECAC0 + ldr r0, _021D7D5C ; =gGameVersion ldrb r0, [r0] cmp r0, #0xa bne _021D7C46 @@ -1038,7 +1038,7 @@ _021D7C52: add sp, #8 pop {r4, r5, r6, pc} nop -_021D7D5C: .word 0x020ECAC0 +_021D7D5C: .word gGameVersion _021D7D60: .word 0x04000060 _021D7D64: .word 0xFFFFCFFF _021D7D68: .word 0x00007FFF @@ -1911,7 +1911,7 @@ MOD63_021D83A8: ; 0x021D83A8 mov r3, #3 str r4, [sp, #0xc] bl FUN_020068C8 - ldr r0, _021D85C8 ; =0x020ECAC0 + ldr r0, _021D85C8 ; =gGameVersion ldrb r7, [r0] cmp r7, #0xa bne _021D841A @@ -2113,7 +2113,7 @@ _021D844C: add sp, #0x20 pop {r3, r4, r5, r6, r7, pc} nop -_021D85C8: .word 0x020ECAC0 +_021D85C8: .word gGameVersion _021D85CC: .word 0x00000227 _021D85D0: .word 0x021DB9A0 _021D85D4: .word 0x00010100 @@ -2129,7 +2129,7 @@ MOD63_021D85D8: ; 0x021D85D8 add r5, r1, #0 cmp r0, #0 bne _021D863A - ldr r0, _021D8640 ; =0x020ECAC0 + ldr r0, _021D8640 ; =gGameVersion ldrb r0, [r0] cmp r0, #0xa bne _021D85F8 @@ -2173,7 +2173,7 @@ _021D863A: add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} nop -_021D8640: .word 0x020ECAC0 +_021D8640: .word gGameVersion thumb_func_end MOD63_021D85D8 thumb_func_start MOD63_021D8644 @@ -2271,7 +2271,7 @@ MOD63_021D86E0: ; 0x021D86E0 push {r3, r4, r5, lr} sub sp, #0x18 add r4, r0, #0 - ldr r0, _021D8858 ; =0x020ECAC0 + ldr r0, _021D8858 ; =gGameVersion ldrb r0, [r0] cmp r0, #0xa bne _021D8788 @@ -2457,7 +2457,7 @@ _021D8828: add sp, #0x18 pop {r3, r4, r5, pc} .align 2, 0 -_021D8858: .word 0x020ECAC0 +_021D8858: .word gGameVersion _021D885C: .word 0xFFFFE000 _021D8860: .word 0xFFFDA000 _021D8864: .word 0xFFFFF6E3 @@ -3687,7 +3687,7 @@ MOD63_021D9234: ; 0x021D9234 mov r1, #5 bl FUN_020178A0 ldr r0, [r4, #0xc] - bl FUN_02016A18 + bl FreeToHeap mov r0, #0 strb r0, [r4, #0x1a] _021D9286: @@ -3988,14 +3988,14 @@ MOD63_021D9498: ; 0x021D9498 add r6, r0, #0 mov r0, #0x4c add r1, r4, #0 - bl FUN_02016998 + bl AllocFromHeap str r0, [r5, #0x44] mov r0, #0x10 bl MOD63_021DAF20 str r0, [r5, #0x48] mov r0, #0x4c add r1, r6, #0 - bl FUN_02016998 + bl AllocFromHeap str r0, [r5, #0x4c] ldr r0, [r5, #0x44] mov r1, #0 @@ -4112,14 +4112,14 @@ _021D95D0: add r0, r5, r0 add r0, #0xd0 ldr r0, [r0] - bl FUN_02016A18 + bl FreeToHeap add r0, r4, #1 lsl r0, r0, #0x18 lsr r4, r0, #0x18 cmp r4, #6 blo _021D95D0 ldr r0, [r5, #0x70] - bl FUN_02016A18 + bl FreeToHeap add r0, r5, #0 mov r1, #0 add r0, #0x38 @@ -4137,7 +4137,7 @@ _021D9608: lsl r0, r4, #2 add r0, r5, r0 ldr r0, [r0, #0x50] - bl FUN_02016A18 + bl FreeToHeap add r0, r4, #1 lsl r0, r0, #0x18 lsr r4, r0, #0x18 @@ -4163,7 +4163,7 @@ _021D963C: ldr r0, [r5, #0x44] cmp r0, #0 beq _021D964A - bl FUN_02016A18 + bl FreeToHeap mov r0, #0 str r0, [r5, #0x44] _021D964A: @@ -4172,7 +4172,7 @@ _021D964A: beq _021D965E bl MOD63_021DB580 ldr r0, [r5, #0x4c] - bl FUN_02016A18 + bl FreeToHeap mov r0, #0 str r0, [r5, #0x4c] _021D965E: @@ -4189,7 +4189,7 @@ _021D965E: mov r1, #4 bl FUN_020178A0 ldr r0, [r5, #0xc] - bl FUN_02016A18 + bl FreeToHeap ldr r0, [r5, #0x10] bl FUN_020223BC mov r0, #0 @@ -4241,7 +4241,7 @@ _021D96C6: cmp r0, #0 bne _021D96F8 ldr r0, [r6, #0x2c] - bl FUN_02016A18 + bl FreeToHeap bl ErrorHandling b _021D96F8 _021D96F4: @@ -5512,7 +5512,7 @@ MOD63_021DA158: ; 0x021DA158 cmp r0, #0 bne _021DA192 ldr r0, [r4, #0x14] - bl FUN_02016A18 + bl FreeToHeap bl ErrorHandling b _021DA192 _021DA18E: @@ -5841,7 +5841,7 @@ MOD63_021DA418: ; 0x021DA418 mov r1, #5 bl FUN_020178A0 ldr r0, [r4, #0xc] - bl FUN_02016A18 + bl FreeToHeap ldr r0, _021DA470 ; =0x0000028E mov r1, #0 strb r1, [r4, r0] @@ -5852,7 +5852,7 @@ _021DA458: beq _021DA46E add r0, #0xd ldr r0, [r4, r0] - bl FUN_02016A18 + bl FreeToHeap ldr r0, _021DA474 ; =0x0000028F mov r1, #0 strb r1, [r4, r0] @@ -7196,7 +7196,7 @@ MOD63_021DAEF8: ; 0x021DAEF8 mov r1, #0x7d mov r0, #0x4c lsl r1, r1, #2 - bl FUN_02016998 + bl AllocFromHeap mov r2, #0x7d add r4, r0, #0 mov r1, #0 @@ -7216,14 +7216,14 @@ MOD63_021DAF20: ; 0x021DAF20 add r5, r0, #0 mov r0, #0x4c mov r1, #8 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 mov r0, #0xc add r6, r5, #0 mul r6, r0 mov r0, #0x4c add r1, r6, #0 - bl FUN_02016998 + bl AllocFromHeap mov r1, #0 add r2, r6, #0 str r0, [r4, #4] @@ -7257,9 +7257,9 @@ _021DAF68: blt _021DAF5A _021DAF72: ldr r0, [r5, #4] - bl FUN_02016A18 + bl FreeToHeap add r0, r5, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, r5, r6, pc} thumb_func_end MOD63_021DAF4C @@ -7321,7 +7321,7 @@ _021DAFDA: cmp r4, #0xa blo _021DAFCA add r0, r5, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r3, r4, r5, r6, r7, pc} thumb_func_end MOD63_021DAF9C @@ -7997,7 +7997,7 @@ _021DB4BA: mov r1, #0x12 mov r0, #0x4c lsl r1, r1, #0xa - bl FUN_02016998 + bl AllocFromHeap str r0, [r5, #0x14] mov r0, #1 str r0, [sp] @@ -8043,7 +8043,7 @@ MOD63_021DB580: ; 0x021DB580 ldr r0, [r4, #0x18] bl FUN_02012DE4 ldr r0, [r4, #0x14] - bl FUN_02016A18 + bl FreeToHeap ldr r0, [r4] bl FUN_020072E8 pop {r4, pc} diff --git a/arm9/modules/64/asm/module_64.s b/arm9/modules/64/asm/module_64.s index b9de9e0d..4dcf153c 100644 --- a/arm9/modules/64/asm/module_64.s +++ b/arm9/modules/64/asm/module_64.s @@ -293,7 +293,7 @@ _021D7726: bl MOD64_021D7A38 add r4, #0x94 ldr r0, [r4] - bl FUN_02016A18 + bl FreeToHeap bl MOD64_021D7828 bl FUN_0201C29C add r0, r5, #0 @@ -727,7 +727,7 @@ MOD64_021D7AEC: ; 0x021D7AEC bl FUN_02019178 add r4, #0x98 ldr r0, [r4] - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} .align 2, 0 thumb_func_end MOD64_021D7AEC @@ -1121,7 +1121,7 @@ MOD64_021D7E04: ; 0x021D7E04 add r4, r1, #0 cmp r0, #0 beq _021D7E14 - bl FUN_02016A18 + bl FreeToHeap _021D7E14: ldr r0, [r5, #0x64] cmp r0, #0 @@ -1130,7 +1130,7 @@ _021D7E14: add r0, r4, #0 bl thunk_FUN_020ae84c ldr r0, [r5, #0x64] - bl FUN_02016A18 + bl FreeToHeap _021D7E28: add r0, r5, #0 mov r1, #0 @@ -2991,9 +2991,9 @@ MOD64_021D8C0C: ; 0x021D8C0C ldr r0, [r4, #4] bl FUN_02013E44 ldr r0, [r4, #0xc] - bl FUN_02016A18 + bl FreeToHeap ldr r0, [r4, #0x10] - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} thumb_func_end MOD64_021D8C0C @@ -3480,7 +3480,7 @@ _021D8FB2: add r0, r5, #0 add r0, #0x9c ldr r0, [r0] - bl FUN_02016A18 + bl FreeToHeap add r4, r4, #1 add r5, r5, #4 cmp r4, #3 diff --git a/arm9/modules/65/asm/module_65.s b/arm9/modules/65/asm/module_65.s index 34ca2a59..437fc4a6 100644 --- a/arm9/modules/65/asm/module_65.s +++ b/arm9/modules/65/asm/module_65.s @@ -819,7 +819,7 @@ _021D7B0A: cmp r4, #6 blt _021D7B0A ldr r0, [r5, #0x24] - bl FUN_02016A18 + bl FreeToHeap pop {r3, r4, r5, pc} .align 2, 0 thumb_func_end MOD65_021D7B04 @@ -3149,7 +3149,7 @@ _021D8D6E: mov r1, #4 bl FUN_020178A0 ldr r0, [r5, #0x68] - bl FUN_02016A18 + bl FreeToHeap pop {r3, r4, r5, pc} .align 2, 0 thumb_func_end MOD65_021D8D68 diff --git a/arm9/modules/66/asm/module_66.s b/arm9/modules/66/asm/module_66.s index 9199796b..8e3d0e84 100644 --- a/arm9/modules/66/asm/module_66.s +++ b/arm9/modules/66/asm/module_66.s @@ -341,7 +341,7 @@ _021D7782: cmp r4, #8 blt _021D7782 ldr r0, [r5, #0x28] - bl FUN_02016A18 + bl FreeToHeap ldr r0, [r5, #0x40] bl MOD66_021D9544 ldr r0, [r5, #0x30] @@ -661,34 +661,34 @@ MOD66_021D7A34: ; 0x021D7A34 add r4, r0, #0 add r0, #0xb4 ldr r0, [r0] - bl FUN_02016A18 + bl FreeToHeap add r0, r4, #0 add r0, #0xb0 ldr r0, [r0] - bl FUN_02016A18 + bl FreeToHeap add r0, r4, #0 add r0, #0xac ldr r0, [r0] - bl FUN_02016A18 + bl FreeToHeap add r0, r4, #0 add r0, #0xa8 ldr r0, [r0] - bl FUN_02016A18 + bl FreeToHeap add r0, r4, #0 add r0, #0xa4 ldr r0, [r0] - bl FUN_02016A18 + bl FreeToHeap add r0, r4, #0 add r0, #0xa0 ldr r0, [r0] - bl FUN_02016A18 + bl FreeToHeap add r0, r4, #0 add r0, #0x9c ldr r0, [r0] - bl FUN_02016A18 + bl FreeToHeap add r4, #0x98 ldr r0, [r4] - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} .align 2, 0 thumb_func_end MOD66_021D7A34 @@ -866,7 +866,7 @@ MOD66_021D7BB4: ; 0x021D7BB4 mov r1, #0x11 ldr r0, [r4, #4] lsl r1, r1, #4 - bl FUN_02016998 + bl AllocFromHeap mov r2, #0x11 mov r1, #0 lsl r2, r2, #4 @@ -896,7 +896,7 @@ _021D7BEA: add r0, r5, #0 bl MOD66_021D8670 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap mov r0, #1 pop {r3, r4, r5, pc} thumb_func_end MOD66_021D7BD4 @@ -3754,7 +3754,7 @@ MOD66_021D9228: ; 0x021D9228 mov r1, #0xc str r2, [sp, #8] add r4, r3, #0 - bl FUN_02016998 + bl AllocFromHeap add r7, r0, #0 mov r0, #0 strb r0, [r7] @@ -3774,7 +3774,7 @@ MOD66_021D9228: ; 0x021D9228 mov r1, #0x1c add r0, r5, #0 mul r1, r2 - bl FUN_02016998 + bl AllocFromHeap str r0, [r7, #8] ldrh r3, [r7] mov r2, #0x1c @@ -3912,9 +3912,9 @@ _021D935E: blt _021D935E _021D9380: ldr r0, [r5, #8] - bl FUN_02016A18 + bl FreeToHeap add r0, r5, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r3, r4, r5, r6, r7, pc} .align 2, 0 thumb_func_end MOD66_021D9350 @@ -4109,7 +4109,7 @@ _021D94C8: _021D94DA: add r0, r4, #0 mov r1, #8 - bl FUN_02016998 + bl AllocFromHeap add r6, r0, #0 mov r0, #0 strb r0, [r6] @@ -4124,7 +4124,7 @@ _021D94DA: mov r1, #0x18 add r0, r4, #0 mul r1, r2 - bl FUN_02016998 + bl AllocFromHeap str r0, [r6, #4] ldr r3, [sp] mov r2, #0x18 @@ -4164,9 +4164,9 @@ MOD66_021D9544: ; 0x021D9544 push {r4, lr} add r4, r0, #0 ldr r0, [r4, #4] - bl FUN_02016A18 + bl FreeToHeap add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} .align 2, 0 thumb_func_end MOD66_021D9544 diff --git a/arm9/modules/67/asm/module_67.s b/arm9/modules/67/asm/module_67.s index 11ce834a..02c76f3d 100644 --- a/arm9/modules/67/asm/module_67.s +++ b/arm9/modules/67/asm/module_67.s @@ -3315,7 +3315,7 @@ MOD67_021D8F00: ; 0x021D8F00 ldr r1, [sp, #0xc] bl FUN_0200AC60 add r0, r6, #0 - bl FUN_02016A18 + bl FreeToHeap add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} thumb_func_end MOD67_021D8F00 diff --git a/arm9/modules/68/asm/module_68.s b/arm9/modules/68/asm/module_68.s index 687d6add..a342b2d1 100644 --- a/arm9/modules/68/asm/module_68.s +++ b/arm9/modules/68/asm/module_68.s @@ -166,7 +166,7 @@ MOD68_021D762C: ; 0x021D762C mov r0, #0x7f lsl r0, r0, #2 ldr r0, [r4, r0] - bl FUN_02016A18 + bl FreeToHeap add r0, r5, #0 bl FUN_0200627C mov r0, #0 @@ -372,7 +372,7 @@ MOD68_021D77A4: ; 0x021D77A4 bl FUN_02006930 mov r0, #0x24 mov r1, #0x80 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 ldr r0, _021D7854 ; =0x00003001 mov r2, #0 @@ -395,7 +395,7 @@ _021D7812: mov r3, #2 bl FUN_02018148 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap ldr r0, [r5] mov r1, #1 bl FUN_02017CD0 @@ -1375,7 +1375,7 @@ MOD68_021D7F98: ; 0x021D7F98 mov r0, #0x7f lsl r0, r0, #2 ldr r0, [r4, r0] - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x7e lsl r0, r0, #2 ldr r0, [r4, r0] diff --git a/arm9/modules/69/asm/module_69.s b/arm9/modules/69/asm/module_69.s index 0236e100..5ab71cc1 100644 --- a/arm9/modules/69/asm/module_69.s +++ b/arm9/modules/69/asm/module_69.s @@ -911,7 +911,7 @@ MOD69_0222DD18: ; 0x0222DD18 mov r1, #3 bl FUN_020178A0 ldr r0, [r4, #0x10] - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} .align 2, 0 _0222DD50: .word 0xFFFF1FFF @@ -1412,9 +1412,9 @@ _0222E10E: mov r1, #0 bl FUN_020200A0 ldr r0, [sp, #0x24] - bl FUN_02016A18 + bl FreeToHeap ldr r0, [sp, #0x28] - bl FUN_02016A18 + bl FreeToHeap add sp, #0xd4 pop {r4, r5, r6, r7, pc} nop @@ -1444,11 +1444,11 @@ _0222E1C2: mov r0, #0x17 lsl r0, r0, #4 ldr r0, [r6, r0] - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x5b lsl r0, r0, #2 ldr r0, [r6, r0] - bl FUN_02016A18 + bl FreeToHeap ldr r0, [r6, #0x24] bl FUN_0201FD58 bl FUN_02009FA0 @@ -1463,7 +1463,7 @@ MOD69_0222E1E4: ; 0x0222E1E4 mov r2, #0 str r2, [r0] ldr r0, [r1] - bl FUN_02016A18 + bl FreeToHeap add r0, r4, #0 bl FUN_0200CAB4 pop {r4, pc} @@ -1495,7 +1495,7 @@ MOD69_0222E218: ; 0x0222E218 mov r0, #0x3f mov r1, #0x2c str r2, [sp] - bl FUN_02016998 + bl AllocFromHeap mov r1, #0x6d lsl r1, r1, #6 add r4, r6, r1 @@ -1582,7 +1582,7 @@ MOD69_0222E2D8: ; 0x0222E2D8 add r7, r1, #0 mov r0, #0x3f mov r1, #0x2c - bl FUN_02016998 + bl AllocFromHeap mov r1, #0x6d lsl r1, r1, #6 add r5, r0, #0 @@ -1895,7 +1895,7 @@ MOD69_0222E53C: ; 0x0222E53C mov r0, #0x3f mov r1, #0x1c add r6, r2, #0 - bl FUN_02016998 + bl AllocFromHeap mov r1, #0x6d lsl r1, r1, #6 add r5, r0, #0 @@ -1933,7 +1933,7 @@ MOD69_0222E590: ; 0x0222E590 mov r0, #0x3f mov r1, #0x28 add r6, r2, #0 - bl FUN_02016998 + bl AllocFromHeap mov r1, #0x6d lsl r1, r1, #6 add r5, r0, #0 @@ -1976,7 +1976,7 @@ MOD69_0222E5F0: ; 0x0222E5F0 add r6, r1, #0 mov r0, #0x3f mov r1, #0x28 - bl FUN_02016998 + bl AllocFromHeap mov r1, #0x6d lsl r1, r1, #6 add r5, r0, #0 @@ -2015,7 +2015,7 @@ MOD69_0222E644: ; 0x0222E644 add r6, r1, #0 mov r0, #0x3f mov r1, #0x38 - bl FUN_02016998 + bl AllocFromHeap mov r1, #0x6d lsl r1, r1, #6 add r5, r0, #0 @@ -2059,7 +2059,7 @@ MOD69_0222E6A0: ; 0x0222E6A0 add r6, r1, #0 mov r0, #0x3f mov r1, #0x38 - bl FUN_02016998 + bl AllocFromHeap mov r1, #0x6d lsl r1, r1, #6 add r5, r0, #0 @@ -2106,7 +2106,7 @@ MOD69_0222E6FC: ; 0x0222E6FC mov r1, #0x74 str r2, [sp] str r3, [sp, #4] - bl FUN_02016998 + bl AllocFromHeap mov r1, #0x6d lsl r1, r1, #6 add r7, r5, r1 @@ -2234,7 +2234,7 @@ MOD69_0222E804: ; 0x0222E804 mov r0, #0x3f mov r1, #0x38 str r2, [sp] - bl FUN_02016998 + bl AllocFromHeap mov r1, #0x6d lsl r1, r1, #6 add r6, r5, r1 @@ -2541,7 +2541,7 @@ MOD69_0222EA84: ; 0x0222EA84 add r7, r1, #0 mov r0, #0x3f mov r1, #0x30 - bl FUN_02016998 + bl AllocFromHeap mov r1, #0x6d lsl r1, r1, #6 add r4, r0, #0 @@ -2761,7 +2761,7 @@ MOD69_0222EC60: ; 0x0222EC60 add r6, r1, #0 mov r0, #0x3f mov r1, #0xdc - bl FUN_02016998 + bl AllocFromHeap mov r1, #0x6d lsl r1, r1, #6 add r1, r5, r1 @@ -2943,7 +2943,7 @@ MOD69_0222EDCC: ; 0x0222EDCC ldr r1, _0222EE10 ; =0x00000844 add r5, r0, #0 mov r0, #0x3f - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 beq _0222EE0C ldr r0, _0222EE14 ; =0x0222F940 @@ -3090,7 +3090,7 @@ MOD69_0222EF00: ; 0x0222EF00 mov r0, #0x3f add r7, r2, #0 add r4, r3, #0 - bl FUN_02016998 + bl AllocFromHeap add r1, r0, #0 beq _0222EF74 ldr r0, _0222EF7C ; =0x00000818 @@ -3384,7 +3384,7 @@ _0222F170: ldr r0, _0222F198 ; =0x00000818 ldr r0, [r5, r0] bl FUN_0201B6C8 - bl FUN_02016A18 + bl FreeToHeap ldr r0, [r6, r7] add r4, r4, #1 add r5, r5, #4 @@ -3392,7 +3392,7 @@ _0222F170: blt _0222F170 _0222F186: add r0, r6, #0 - bl FUN_02016A18 + bl FreeToHeap _0222F18C: pop {r3, r4, r5, r6, r7, pc} nop @@ -3420,7 +3420,7 @@ MOD69_0222F1B0: ; 0x0222F1B0 sub sp, #0x2c ldr r1, _0222F344 ; =0x00008D64 mov r0, #0x3f - bl FUN_02016998 + bl AllocFromHeap str r0, [sp, #0x28] bl rand_LC str r0, [sp, #0x20] @@ -3624,7 +3624,7 @@ MOD69_0222F360: ; 0x0222F360 add r4, r0, #0 beq _0222F374 bl FUN_0201B6C8 - bl FUN_02016A18 + bl FreeToHeap add r0, r4, #0 bl FUN_0200CAB4 _0222F374: diff --git a/arm9/modules/70/asm/module_70.s b/arm9/modules/70/asm/module_70.s index 83b234e7..ac2b8a5d 100644 --- a/arm9/modules/70/asm/module_70.s +++ b/arm9/modules/70/asm/module_70.s @@ -399,7 +399,7 @@ MOD70_021D77CC: ; 0x021D77CC add r5, r0, #0 ldr r1, _021D7894 ; =0x00000E1C mov r0, #0x3d - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 beq _021D788C str r5, [r4] @@ -497,7 +497,7 @@ MOD70_021D78A0: ; 0x021D78A0 mov r0, #0x66 lsl r0, r0, #2 ldr r0, [r4, r0] - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x65 lsl r0, r0, #2 ldr r0, [r4, r0] @@ -526,9 +526,9 @@ MOD70_021D78A0: ; 0x021D78A0 bl FUN_0201FD58 bl FUN_02009FA0 ldr r0, [r4, #0x10] - bl FUN_02016A18 + bl FreeToHeap add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap _021D790A: pop {r4, pc} thumb_func_end MOD70_021D78A0 @@ -1408,11 +1408,11 @@ _021D7FDA: mov r0, #0x5e lsl r0, r0, #2 ldr r0, [r7, r0] - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x5f lsl r0, r0, #2 ldr r0, [r7, r0] - bl FUN_02016A18 + bl FreeToHeap pop {r3, r4, r5, r6, r7, pc} thumb_func_end MOD70_021D7FC4 @@ -1505,9 +1505,9 @@ _021D8050: cmp r0, #6 blt _021D8050 ldr r0, [sp, #8] - bl FUN_02016A18 + bl FreeToHeap ldr r0, [sp, #0xc] - bl FUN_02016A18 + bl FreeToHeap add sp, #0x94 pop {r4, r5, r6, r7, pc} nop diff --git a/arm9/modules/71/asm/module_71.s b/arm9/modules/71/asm/module_71.s index 174c8037..8a04256d 100644 --- a/arm9/modules/71/asm/module_71.s +++ b/arm9/modules/71/asm/module_71.s @@ -1684,7 +1684,7 @@ _0222E3EA: mov r0, #0x79 lsl r0, r0, #4 ldr r0, [r5, r0] - bl FUN_02016A18 + bl FreeToHeap ldr r0, [r6, r7] add r5, r5, #4 add r4, r4, #1 @@ -1703,7 +1703,7 @@ _0222E402: _0222E414: ldr r0, _0222E434 ; =0x000007A8 ldr r0, [r4, r0] - bl FUN_02016A18 + bl FreeToHeap ldr r0, [r6, r7] add r4, r4, #4 add r5, r5, #1 @@ -1736,7 +1736,7 @@ MOD71_0222E438: ; 0x0222E438 bl FUN_02021A20 ldr r0, _0222E4D4 ; =0x0000221C ldr r0, [r4, r0] - bl FUN_02016A18 + bl FreeToHeap add r0, r4, #0 bl MOD71_0222E378 ldr r0, _0222E4D8 ; =0x00000438 @@ -2146,7 +2146,7 @@ MOD71_0222E76C: ; 0x0222E76C bl FUN_0206B8A4 add r1, r0, #0 mov r0, #0x1a - bl FUN_02016998 + bl AllocFromHeap ldr r1, _0222E844 ; =0x0000221C str r0, [r5, r1] ldr r0, [r5, r1] @@ -2249,7 +2249,7 @@ _0222E8B2: bl FUN_02017DFC _0222E8D0: add r0, r6, #0 - bl FUN_02016A18 + bl FreeToHeap _0222E8D6: add sp, #8 pop {r4, r5, r6, pc} @@ -4363,7 +4363,7 @@ _0222F9A0: add r2, r6, #0 bl FUN_0200ABC0 add r0, r6, #0 - bl FUN_02016A18 + bl FreeToHeap add r0, r5, #0 mov r1, #0x24 bl MOD71_0222F84C @@ -6404,9 +6404,9 @@ _02230A98: mov r1, #0x13 bl FUN_0202A0E8 add r0, r7, #0 - bl FUN_02016A18 + bl FreeToHeap add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap add sp, #0x14 pop {r4, r5, r6, r7, pc} .align 2, 0 diff --git a/arm9/modules/73/asm/module_73.s b/arm9/modules/73/asm/module_73.s index 8fe29b6b..46c50951 100644 --- a/arm9/modules/73/asm/module_73.s +++ b/arm9/modules/73/asm/module_73.s @@ -872,7 +872,7 @@ _021D7BC6: bl ErrorHandling _021D7C0C: add r0, r6, #0 - bl FUN_02016A18 + bl FreeToHeap _021D7C12: ldr r0, [r5] add r0, r0, #1 @@ -2023,7 +2023,7 @@ MOD73_021D856C: ; 0x021D856C _021D857C: ldr r0, _021D858C ; =0x0000152C ldr r0, [r4, r0] - bl FUN_02016A18 + bl FreeToHeap ldr r0, _021D858C ; =0x0000152C mov r1, #0 str r1, [r4, r0] @@ -2522,7 +2522,7 @@ MOD73_021D8980: ; 0x021D8980 mov r1, #1 bl FUN_020178A0 ldr r0, [r4] - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} thumb_func_end MOD73_021D8980 @@ -3425,7 +3425,7 @@ MOD73_021D9094: ; 0x021D9094 mov r1, #8 str r2, [sp] add r5, r3, #0 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 mov r0, #0 str r5, [r4] @@ -3481,7 +3481,7 @@ MOD73_021D90F4: ; 0x021D90F4 bl MOD73_021D91BC _021D9104: add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} thumb_func_end MOD73_021D90F4 @@ -3508,7 +3508,7 @@ MOD73_021D9120: ; 0x021D9120 add r0, r3, #0 lsl r1, r1, #4 add r7, r2, #0 - bl FUN_02016998 + bl AllocFromHeap mov r2, #0x1b mov r1, #0 lsl r2, r2, #4 @@ -3591,7 +3591,7 @@ MOD73_021D91BC: ; 0x021D91BC ldr r0, [r4, r0] bl FUN_0200CAB4 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} .align 2, 0 thumb_func_end MOD73_021D91BC @@ -3690,7 +3690,7 @@ MOD73_021D9258: ; 0x021D9258 bl FUN_02013D98 add r5, r0, #0 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap add r0, r5, #0 add sp, #0x10 pop {r3, r4, r5, pc} @@ -3716,7 +3716,7 @@ MOD73_021D9288: ; 0x021D9288 bl FUN_02013E14 add r5, r0, #0 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap add r0, r5, #0 add sp, #0x10 pop {r3, r4, r5, pc} @@ -5118,9 +5118,9 @@ MOD73_021D9D48: ; 0x021D9D48 push {r4, lr} add r4, r0, #0 ldr r0, [r4, #0x20] - bl FUN_02016A18 + bl FreeToHeap ldr r0, [r4, #0x28] - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} .align 2, 0 thumb_func_end MOD73_021D9D48 @@ -6047,7 +6047,7 @@ MOD73_021DA374: ; 0x021DA374 ldr r0, [r4, #4] bl FUN_020186B4 add r0, r5, #0 - bl FUN_02016A18 + bl FreeToHeap ldr r0, [r4, #4] mov r1, #1 bl FUN_0201AC68 @@ -9210,7 +9210,7 @@ _021DBAA4: add r0, r1, r0 str r0, [sp, #0x20] add r0, r7, #0 - bl FUN_02016A18 + bl FreeToHeap ldr r0, [sp, #0x28] add r0, r0, #1 str r0, [sp, #0x28] diff --git a/arm9/modules/74/asm/module_74.s b/arm9/modules/74/asm/module_74.s index 283ad8a8..785f1686 100644 --- a/arm9/modules/74/asm/module_74.s +++ b/arm9/modules/74/asm/module_74.s @@ -675,7 +675,7 @@ _021D79D8: blt _021D79D8 _021D79EE: ldr r0, [r6, #0x10] - bl FUN_02016A18 + bl FreeToHeap pop {r4, r5, r6, pc} .align 2, 0 thumb_func_end MOD74_021D79C8 @@ -1309,7 +1309,7 @@ _021D7F0C: cmp r0, #0x1e blt _021D7EB8 ldr r0, [sp] - bl FUN_02016A18 + bl FreeToHeap add sp, #8 pop {r3, r4, r5, r6, r7, pc} .align 2, 0 diff --git a/arm9/modules/75/asm/module_75.s b/arm9/modules/75/asm/module_75.s index 422ae56a..c6baf422 100644 --- a/arm9/modules/75/asm/module_75.s +++ b/arm9/modules/75/asm/module_75.s @@ -4248,7 +4248,7 @@ _021E8CCC: lsr r2, r2, #0x18 bl MOD75_021EB130 add r0, r7, #0 - bl FUN_02016A18 + bl FreeToHeap add sp, #0xc pop {r4, r5, r6, r7, pc} .align 2, 0 diff --git a/arm9/modules/77/asm/module_77.s b/arm9/modules/77/asm/module_77.s index 1115ff22..5becbc25 100644 --- a/arm9/modules/77/asm/module_77.s +++ b/arm9/modules/77/asm/module_77.s @@ -824,7 +824,7 @@ MOD77_021D7BAC: ; 0x021D7BAC bl FUN_0201B398 ldr r0, _021D7C1C ; =0x0000C010 ldr r0, [r4, r0] - bl FUN_02016A18 + bl FreeToHeap mov r0, #0 add r1, r0, #0 bl FUN_02015F10 @@ -937,7 +937,7 @@ _021D7CC2: blt _021D7C9A _021D7CCA: ldr r0, [sp, #0x18] - bl FUN_02016A18 + bl FreeToHeap mov r7, #1 bl FUN_02088D1C str r0, [sp, #0x10] @@ -995,7 +995,7 @@ _021D7D10: blt _021D7D10 _021D7D44: ldr r0, [sp, #0x14] - bl FUN_02016A18 + bl FreeToHeap ldr r0, [sp, #0x10] add r7, r7, #1 cmp r7, r0 @@ -2395,19 +2395,19 @@ MOD77_021D88D0: ; 0x021D88D0 add r4, r0, #0 ldr r0, _021D8900 ; =0x0000C290 ldr r0, [r4, r0] - bl FUN_02016A18 + bl FreeToHeap ldr r0, _021D8904 ; =0x0000C28C ldr r0, [r4, r0] - bl FUN_02016A18 + bl FreeToHeap ldr r0, _021D8908 ; =0x0000C298 ldr r0, [r4, r0] - bl FUN_02016A18 + bl FreeToHeap ldr r0, _021D890C ; =0x0000C294 ldr r0, [r4, r0] - bl FUN_02016A18 + bl FreeToHeap ldr r0, _021D8910 ; =0x0000C0CC ldr r0, [r4, r0] - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} nop _021D8900: .word 0x0000C290 diff --git a/arm9/modules/78/asm/module_78.s b/arm9/modules/78/asm/module_78.s index 28fd9482..9ef97624 100644 --- a/arm9/modules/78/asm/module_78.s +++ b/arm9/modules/78/asm/module_78.s @@ -245,14 +245,14 @@ _021D76C8: add r0, r7, #0 bl thunk_FUN_020ae84c ldr r0, [r5, #0x60] - bl FUN_02016A18 + bl FreeToHeap add r0, r4, #1 lsl r0, r0, #0x18 lsr r4, r0, #0x18 cmp r4, #4 blo _021D76C8 ldr r0, [r6, #0x5c] - bl FUN_02016A18 + bl FreeToHeap ldr r0, [r6] bl FUN_0201EB70 ldr r0, [sp] diff --git a/arm9/modules/80/asm/module_80.s b/arm9/modules/80/asm/module_80.s index 39c54939..c8b610a8 100644 --- a/arm9/modules/80/asm/module_80.s +++ b/arm9/modules/80/asm/module_80.s @@ -1465,7 +1465,7 @@ _0222DFE4: bl FUN_0200433C ldr r1, _0222E130 ; =0x00020020 mov r0, #0x3e - bl FUN_02016998 + bl AllocFromHeap str r0, [r4, #0x48] add r0, #0x1f mov r1, #0x1f @@ -1654,7 +1654,7 @@ MOD80_0222E25C: ; 0x0222E25C bl FUN_02006278 add r4, r0, #0 ldr r0, [r4, #0x48] - bl FUN_02016A18 + bl FreeToHeap bl FUN_020888CC bl FUN_02088868 add r0, r4, #0 @@ -1680,9 +1680,9 @@ MOD80_0222E25C: ; 0x0222E25C bl MOD80_0222E398 bl FUN_0202E4F0 ldr r0, [r4, #4] - bl FUN_02016A18 + bl FreeToHeap ldr r0, [r4] - bl FUN_02016A18 + bl FreeToHeap add r0, r5, #0 bl FUN_0200627C mov r0, #0 @@ -2056,7 +2056,7 @@ _0222E570: mov r2, #0x60 bl GX_LoadOBJPltt ldr r0, [sp, #0x14] - bl FUN_02016A18 + bl FreeToHeap add sp, #0x1c pop {r4, r5, r6, r7, pc} .align 2, 0 @@ -5049,7 +5049,7 @@ MOD80_0222FD88: ; 0x0222FD88 add r5, r0, #0 mov r0, #0x3e lsl r1, r1, #6 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 add r0, sp, #0x20 add r1, r5, #0 @@ -5102,7 +5102,7 @@ MOD80_0222FD88: ; 0x0222FD88 lsl r3, r3, #4 bl FUN_02006930 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap add sp, #0x30 pop {r4, r5, r6, pc} .align 2, 0 @@ -6687,7 +6687,7 @@ MOD80_02230AC0: ; 0x02230AC0 str r0, [r4, r1] mov r0, #0x3e mov r1, #0x30 - bl FUN_02016998 + bl AllocFromHeap mov r1, #0xfe lsl r1, r1, #4 str r0, [r4, r1] @@ -6728,16 +6728,16 @@ MOD80_02230B2C: ; 0x02230B2C lsl r0, r0, #4 ldr r0, [r4, r0] ldr r0, [r0, #0x14] - bl FUN_02016A18 + bl FreeToHeap mov r0, #0xfe lsl r0, r0, #4 ldr r0, [r4, r0] ldr r0, [r0, #0x18] - bl FUN_02016A18 + bl FreeToHeap mov r0, #0xfe lsl r0, r0, #4 ldr r0, [r4, r0] - bl FUN_02016A18 + bl FreeToHeap ldr r0, _02230B68 ; =0x00000B4C ldr r0, [r4, r0] bl FUN_02021A20 @@ -9341,7 +9341,7 @@ _022320A4: _022320C4: mov r0, #0x3e mov r1, #0x78 - bl FUN_02016998 + bl AllocFromHeap ldr r1, _022320E4 ; =0x00001004 str r0, [r4, r1] pop {r4, pc} @@ -9359,7 +9359,7 @@ MOD80_022320E8: ; 0x022320E8 add r4, r0, #0 ldr r0, _02232118 ; =0x00001004 ldr r0, [r4, r0] - bl FUN_02016A18 + bl FreeToHeap ldr r0, _0223211C ; =0x00000B44 ldr r0, [r4, r0] bl FUN_02021A20 @@ -10721,7 +10721,7 @@ MOD80_02232BAC: ; 0x02232BAC cmp r0, #0 bne _02232BCE add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap mov r0, #0 pop {r3, r4, r5, pc} _02232BCE: @@ -10768,7 +10768,7 @@ MOD80_02232BD4: ; 0x02232BD4 add r0, r0, #3 str r0, [r4, #4] ldr r0, [sp, #4] - bl FUN_02016A18 + bl FreeToHeap add sp, #0xc pop {r4, r5, r6, r7, pc} thumb_func_end MOD80_02232BD4 @@ -10817,7 +10817,7 @@ _02232C6E: ldr r1, _02232C84 ; =0x00001010 ldr r0, [sp] ldr r0, [r0, r1] - bl FUN_02016A18 + bl FreeToHeap pop {r3, r4, r5, r6, r7, pc} nop _02232C84: .word 0x00001010 @@ -10947,7 +10947,7 @@ MOD80_02232D7C: ; 0x02232D7C ldr r1, _02232F7C ; =0x00003D68 str r0, [sp, #0x20] mov r0, #3 - bl FUN_020169D8 + bl AllocFromHeapAtEnd ldr r1, _02232F80 ; =0x00001010 str r0, [sp, #0x18] str r0, [r5, r1] @@ -12034,7 +12034,7 @@ MOD80_02233618: ; 0x02233618 str r0, [r4, r1] mov r0, #0x3e mov r1, #0x30 - bl FUN_02016998 + bl AllocFromHeap mov r1, #0xfe lsl r1, r1, #4 str r0, [r4, r1] @@ -12075,16 +12075,16 @@ MOD80_02233684: ; 0x02233684 lsl r0, r0, #4 ldr r0, [r4, r0] ldr r0, [r0, #0x14] - bl FUN_02016A18 + bl FreeToHeap mov r0, #0xfe lsl r0, r0, #4 ldr r0, [r4, r0] ldr r0, [r0, #0x18] - bl FUN_02016A18 + bl FreeToHeap mov r0, #0xfe lsl r0, r0, #4 ldr r0, [r4, r0] - bl FUN_02016A18 + bl FreeToHeap ldr r0, _022336C0 ; =0x00000B4C ldr r0, [r4, r0] bl FUN_02021A20 @@ -13516,7 +13516,7 @@ MOD80_02234228: ; 0x02234228 ldr r1, _02234280 ; =0x000001EE add r5, r0, #0 mov r0, #0x3e - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 ldr r2, _02234280 ; =0x000001EE mov r0, #0 @@ -13550,7 +13550,7 @@ _0223426C: blo _02234264 _02234274: add r0, r7, #0 - bl FUN_02016A18 + bl FreeToHeap add r0, r4, #0 add sp, #0xc pop {r4, r5, r6, r7, pc} @@ -15274,7 +15274,7 @@ _02234F38: ldr r0, [r0] bl FUN_0202ABE4 add r0, r5, #0 - bl FUN_02016A18 + bl FreeToHeap b _02235006 _02234F9C: add r0, r4, #0 @@ -15312,7 +15312,7 @@ _02234FA4: ldr r0, [r0] bl FUN_0202ABE4 add r0, r5, #0 - bl FUN_02016A18 + bl FreeToHeap b _02235006 _02234FF4: str r0, [r4, #0x3c] @@ -16094,7 +16094,7 @@ MOD80_02235534: ; 0x02235534 ldr r0, [r0, #0xc] bl FUN_0206B2FC add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap b _022355DC _02235590: add r1, r5, #0 @@ -17071,11 +17071,11 @@ MOD80_02235D10: ; 0x02235D10 beq _02235D2E add r0, #0xc ldr r0, [r4, r0] - bl FUN_02016A18 + bl FreeToHeap mov r0, #0xff lsl r0, r0, #4 ldr r0, [r4, r0] - bl FUN_02016A18 + bl FreeToHeap _02235D2E: pop {r4, pc} .align 2, 0 @@ -17582,7 +17582,7 @@ _02236126: mov r6, #4 _02236132: ldr r0, [sp, #0x20] - bl FUN_02016A18 + bl FreeToHeap b _0223617E _0223613A: add r0, r4, #0 @@ -17630,11 +17630,11 @@ MOD80_02236188: ; 0x02236188 mov r0, #1 lsl r0, r0, #0xc ldr r0, [r4, r0] - bl FUN_02016A18 + bl FreeToHeap add r0, r4, #0 add r0, #0xc8 ldr r0, [r0] - bl FUN_02016A18 + bl FreeToHeap add r0, r4, #0 bl MOD80_0222E7B0 mov r0, #1 diff --git a/arm9/modules/81/asm/module_81.s b/arm9/modules/81/asm/module_81.s index 2182f0cd..2398e91b 100644 --- a/arm9/modules/81/asm/module_81.s +++ b/arm9/modules/81/asm/module_81.s @@ -230,7 +230,7 @@ MOD81_02238004: ; 0x02238004 ldr r0, [r4, #0x14] bl FUN_02021A20 ldr r0, [r4, #8] - bl FUN_02016A18 + bl FreeToHeap ldr r0, [r4, #0x18] bl FUN_0201FD58 bl FUN_02009FA0 @@ -349,7 +349,7 @@ MOD81_02238118: ; 0x02238118 add r6, r1, #0 add r1, r0, #0 add r1, #0xc7 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 ldr r0, _022381DC ; =0x00000000 str r0, [r5] @@ -366,7 +366,7 @@ MOD81_02238118: ; 0x02238118 mov r2, #0x60 bl MIi_CpuClear16 add r0, r7, #0 - bl FUN_02016A18 + bl FreeToHeap _02238152: add r1, r4, #0 mov r0, #0 @@ -492,7 +492,7 @@ _02238224: ldr r0, [r0] bl FUN_0200CAB4 add r0, r6, #0 - bl FUN_02016A18 + bl FreeToHeap _02238246: pop {r4, r5, r6, pc} thumb_func_end MOD81_02238200 @@ -593,7 +593,7 @@ _02238308: mov r1, #0 str r1, [r0] add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap add r0, r5, #0 bl FUN_0200CAB4 _02238328: @@ -642,7 +642,7 @@ MOD81_02238358: ; 0x02238358 bne _02238404 mov r0, #0x39 mov r1, #0x18 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 beq _02238404 add r0, r5, #0 @@ -715,7 +715,7 @@ _0223838C: pop {r3, r4, r5, pc} _022383FE: add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap _02238404: pop {r3, r4, r5, pc} nop @@ -733,7 +733,7 @@ MOD81_0223840C: ; 0x0223840C cmp r0, #0 beq _0223843A bl FUN_0201B6C8 - bl FUN_02016A18 + bl FreeToHeap ldr r0, [r6, r4] bl FUN_0200CAB4 mov r0, #0 @@ -816,7 +816,7 @@ MOD81_022384AC: ; 0x022384AC add r7, r2, #0 str r3, [sp, #4] ldr r5, [sp, #0x28] - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 ldr r0, _0223850C ; =0x00000001 str r0, [r5] @@ -848,7 +848,7 @@ _022384E0: mov r0, #1 str r0, [r5] add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap _02238504: add r0, r4, #0 add sp, #8 @@ -981,7 +981,7 @@ _022385E8: _022385EC: mov r0, #0x39 add r1, r6, #0 - bl FUN_020169D8 + bl AllocFromHeapAtEnd add r7, r0, #0 beq _02238690 ldr r3, _022386B8 ; =0x0223CF74 @@ -1053,7 +1053,7 @@ _02238648: add r0, r4, #0 bl FUN_02066A94 add r0, r7, #0 - bl FUN_02016A18 + bl FreeToHeap _02238690: ldr r0, [sp, #0x14] cmp r0, #4 @@ -1148,7 +1148,7 @@ _022386DE: lsr r3, r3, #0x18 bl FUN_020186B4 add r0, r7, #0 - bl FUN_02016A18 + bl FreeToHeap _02238746: add sp, #0x20 pop {r3, r4, r5, r6, r7, pc} @@ -1192,14 +1192,14 @@ MOD81_02238784: ; 0x02238784 ldr r0, [r4] cmp r0, #0 beq _02238796 - bl FUN_02016A18 + bl FreeToHeap mov r0, #0 str r0, [r4] _02238796: ldr r0, [r4, #4] cmp r0, #0 beq _022387A4 - bl FUN_02016A18 + bl FreeToHeap mov r0, #0 str r0, [r4, #4] _022387A4: @@ -1363,7 +1363,7 @@ MOD81_02238864: ; 0x02238864 ldr r5, _02238894 ; =0x0223D3C4 _02238876: ldr r0, [r5] - bl FUN_02016A18 + bl FreeToHeap ldr r0, [r6] add r4, r4, #1 add r5, r5, #4 @@ -1412,7 +1412,7 @@ MOD81_022388C0: ; 0x022388C0 mov r1, #0x20 add r5, r2, #0 str r3, [sp] - bl FUN_02016998 + bl AllocFromHeap add r6, r0, #0 beq _02238906 ldr r3, [sp] @@ -1422,7 +1422,7 @@ MOD81_022388C0: ; 0x022388C0 mov r1, #0x8c mov r0, #0x3a mul r1, r7 - bl FUN_02016998 + bl AllocFromHeap str r0, [r6, #0x18] mov r4, #0 str r7, [r6, #0x1c] @@ -1463,11 +1463,11 @@ _0223891A: blo _0223891A _0223892C: ldr r0, [r5, #0x18] - bl FUN_02016A18 + bl FreeToHeap add r0, r5, #0 bl MOD81_02238D0C add r0, r5, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, r5, r6, pc} thumb_func_end MOD81_0223890C @@ -1631,7 +1631,7 @@ MOD81_02238A6C: ; 0x02238A6C ldr r0, [r4] cmp r0, #0 beq _02238A80 - bl FUN_02016A18 + bl FreeToHeap mov r0, #0 str r0, [r4] str r0, [r4, #0x64] @@ -2009,7 +2009,7 @@ MOD81_02238D18: ; 0x02238D18 add r5, r0, #0 mov r0, #0x3a mov r1, #0x6c - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 beq _02238D60 str r5, [r4] @@ -2077,7 +2077,7 @@ _02238DB6: ldr r0, [r4, #0xc] bl FUN_020072E8 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap _02238DC2: pop {r4, pc} thumb_func_end MOD81_02238D64 @@ -2924,7 +2924,7 @@ MOD81_022394BC: ; 0x022394BC mov r1, #0x14 str r2, [sp] add r7, r3, #0 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 beq _02239502 str r5, [r4] @@ -3023,7 +3023,7 @@ MOD81_02239578: ; 0x02239578 add r5, r0, #0 mov r0, #0x3a mov r1, #0x30 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 beq _022395B8 str r5, [r4] @@ -3089,7 +3089,7 @@ MOD81_022395E8: ; 0x022395E8 cmp r0, #0 beq _02239604 bl FUN_0201B6C8 - bl FUN_02016A18 + bl FreeToHeap ldr r0, [r4, #0x68] bl FUN_0200CAB4 mov r0, #0 @@ -3222,7 +3222,7 @@ MOD81_022396E8: ; 0x022396E8 add r5, r0, #0 mov r0, #0x3a lsl r1, r1, #2 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 beq _0223974A str r5, [r4] @@ -3302,7 +3302,7 @@ _02239790: ldr r0, [r0] bl seedr_MT add r0, r5, #0 - bl FUN_02016A18 + bl FreeToHeap _022397A0: add r0, r4, #0 bl OS_RestoreInterrupts @@ -3832,7 +3832,7 @@ MOD81_022399FC: ; 0x022399FC bl FUN_020068C8 mov r0, #0x3a mov r1, #0x60 - bl FUN_02016998 + bl AllocFromHeap add r5, r0, #0 beq _02239C02 mov r0, #0 @@ -3857,7 +3857,7 @@ MOD81_022399FC: ; 0x022399FC bl GX_EndLoadBGExtPltt bl GXS_EndLoadBGExtPltt add r0, r5, #0 - bl FUN_02016A18 + bl FreeToHeap _02239C02: add r0, r4, #0 add r0, #0xc0 @@ -4345,7 +4345,7 @@ _02239FD0: cmp r0, #0 bne _0223A014 ldr r0, [sp] - bl FUN_02016A18 + bl FreeToHeap _0223A014: pop {r3, r4, r5, r6, r7, pc} nop @@ -4482,7 +4482,7 @@ MOD81_0223A104: ; 0x0223A104 add r6, r0, #0 mov r0, #0x3a lsl r1, r1, #4 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 beq _0223A170 str r6, [r4] @@ -4524,7 +4524,7 @@ MOD81_0223A104: ; 0x0223A104 cmp r0, #0 bne _0223A170 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap _0223A170: pop {r4, r5, r6, pc} nop @@ -4615,7 +4615,7 @@ MOD81_0223A1FC: ; 0x0223A1FC ldr r0, [r4, r0] bl MOD81_0223A0EC add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap add r0, r5, #0 bl FUN_0200CAB4 _0223A226: @@ -4631,7 +4631,7 @@ MOD81_0223A228: ; 0x0223A228 mov r1, #0x14 add r7, r2, #0 add r6, r3, #0 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 beq _0223A268 lsl r0, r5, #0xc @@ -4682,7 +4682,7 @@ _0223A292: asr r1, r1, #0xc bl MOD81_02238B5C add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap add r0, r5, #0 bl FUN_0200CAB4 pop {r3, r4, r5, pc} @@ -5469,7 +5469,7 @@ MOD81_0223A898: ; 0x0223A898 add r5, r0, #0 mov r0, #0x3a mov r1, #0xa4 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 beq _0223A8C2 str r5, [r4] @@ -5507,7 +5507,7 @@ MOD81_0223A8C8: ; 0x0223A8C8 add r0, #0x34 bl MOD81_0223AD88 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap _0223A8F6: pop {r4, pc} thumb_func_end MOD81_0223A8C8 @@ -6522,7 +6522,7 @@ MOD81_0223B0E8: ; 0x0223B0E8 add r5, r0, #0 mov r0, #0x3a mov r1, #0x24 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 beq _0223B106 str r5, [r4] @@ -6544,7 +6544,7 @@ MOD81_0223B10C: ; 0x0223B10C beq _0223B11C bl MOD81_0223B478 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap _0223B11C: pop {r4, pc} .align 2, 0 @@ -7012,7 +7012,7 @@ MOD81_0223B4E8: ; 0x0223B4E8 add r5, r0, #0 mov r0, #0x3a mov r1, #0xb0 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 beq _0223B51C str r5, [r4] @@ -7055,7 +7055,7 @@ MOD81_0223B524: ; 0x0223B524 add r0, #0x34 bl MOD81_0223B9A8 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap _0223B552: pop {r4, pc} thumb_func_end MOD81_0223B524 @@ -8049,7 +8049,7 @@ MOD81_0223BD18: ; 0x0223BD18 add r5, r0, #0 mov r0, #0x3a mov r1, #0x3c - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 beq _0223BD46 str r5, [r4] @@ -8096,7 +8096,7 @@ _0223BD70: bl MOD81_0223C514 _0223BD7A: add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap _0223BD80: pop {r4, pc} .align 2, 0 @@ -8548,7 +8548,7 @@ MOD81_0223BF74: ; 0x0223BF74 bl FUN_020068C8 mov r0, #0x3a mov r1, #0x60 - bl FUN_02016998 + bl AllocFromHeap add r5, r0, #0 beq _0223C14A mov r0, #0 @@ -8573,7 +8573,7 @@ MOD81_0223BF74: ; 0x0223BF74 bl GX_EndLoadBGExtPltt bl GXS_EndLoadBGExtPltt add r0, r5, #0 - bl FUN_02016A18 + bl FreeToHeap _0223C14A: ldr r0, [r4, #0xc] ldr r3, _0223C1A4 ; =0xFFFFFE80 @@ -8775,7 +8775,7 @@ MOD81_0223C300: ; 0x0223C300 add r5, r1, #0 mov r0, #0x3a mov r1, #0x24 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 beq _0223C340 str r6, [r4] @@ -8798,7 +8798,7 @@ MOD81_0223C300: ; 0x0223C300 cmp r0, #0 bne _0223C340 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap _0223C340: pop {r4, r5, r6, pc} nop @@ -8878,7 +8878,7 @@ MOD81_0223C3CC: ; 0x0223C3CC add r5, r1, #0 mov r0, #0x3a mov r1, #0x1c - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 beq _0223C418 str r5, [r4] @@ -8906,7 +8906,7 @@ MOD81_0223C3CC: ; 0x0223C3CC cmp r0, #0 bne _0223C418 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap _0223C418: pop {r4, r5, r6, pc} nop @@ -8956,7 +8956,7 @@ MOD81_0223C460: ; 0x0223C460 ldr r1, [r0] mov r2, #0 str r2, [r1] - bl FUN_02016A18 + bl FreeToHeap add r0, r4, #0 bl FUN_0200CAB4 _0223C47A: @@ -8974,7 +8974,7 @@ MOD81_0223C47C: ; 0x0223C47C str r2, [sp, #4] add r7, r3, #0 ldr r5, [sp, #0x20] - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 beq _0223C4D4 str r5, [r4] @@ -9001,7 +9001,7 @@ MOD81_0223C47C: ; 0x0223C47C cmp r0, #0 bne _0223C4D8 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap add sp, #8 pop {r3, r4, r5, r6, r7, pc} _0223C4D4: @@ -9051,7 +9051,7 @@ MOD81_0223C514: ; 0x0223C514 ldr r1, [r0] mov r2, #0 str r2, [r1] - bl FUN_02016A18 + bl FreeToHeap add r0, r4, #0 bl FUN_0200CAB4 _0223C52E: @@ -9064,7 +9064,7 @@ MOD81_0223C530: ; 0x0223C530 add r5, r0, #0 mov r0, #0x3a mov r1, #0x70 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 beq _0223C57A str r5, [r4] @@ -9131,7 +9131,7 @@ _0223C5C6: ldr r0, [r4, #0x10] bl FUN_020072E8 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap _0223C5D2: pop {r4, pc} thumb_func_end MOD81_0223C580 @@ -9976,7 +9976,7 @@ MOD81_0223CCA8: ; 0x0223CCA8 mov r1, #0x14 str r2, [sp] add r7, r3, #0 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 beq _0223CCEE str r5, [r4] @@ -10076,7 +10076,7 @@ MOD81_0223CD64: ; 0x0223CD64 add r6, r1, #0 mov r0, #0x3a mov r1, #0x44 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 beq _0223CDD2 mov r1, #0 @@ -10117,7 +10117,7 @@ MOD81_0223CD64: ; 0x0223CD64 cmp r0, #0 bne _0223CDD6 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, r5, r6, pc} _0223CDD2: mov r0, #0 @@ -10138,7 +10138,7 @@ MOD81_0223CDE0: ; 0x0223CDE0 ldr r1, [r0] mov r2, #0 str r2, [r1] - bl FUN_02016A18 + bl FreeToHeap add r0, r4, #0 bl FUN_0200CAB4 _0223CDFA: diff --git a/arm9/modules/82/asm/module_82.s b/arm9/modules/82/asm/module_82.s index d96f335e..794685b9 100644 --- a/arm9/modules/82/asm/module_82.s +++ b/arm9/modules/82/asm/module_82.s @@ -707,7 +707,7 @@ _0222DA48: bl FUN_0200433C ldr r1, _0222DB78 ; =0x00020020 mov r0, #0x44 - bl FUN_02016998 + bl AllocFromHeap str r0, [r4, #0x24] add r0, #0x1f mov r1, #0x1f @@ -858,7 +858,7 @@ MOD82_0222DC50: ; 0x0222DC50 bl FUN_02006278 add r4, r0, #0 ldr r0, [r4, #0x24] - bl FUN_02016A18 + bl FreeToHeap bl FUN_020888CC bl FUN_02088868 add r0, r4, #0 @@ -880,7 +880,7 @@ MOD82_0222DC50: ; 0x0222DC50 bl MOD82_0222DD20 bl FUN_0202E4F0 ldr r0, [r4, #4] - bl FUN_02016A18 + bl FreeToHeap add r0, r5, #0 bl FUN_0200627C mov r0, #0 diff --git a/arm9/modules/83/asm/module_83.s b/arm9/modules/83/asm/module_83.s index 5569fd70..411e6c20 100644 --- a/arm9/modules/83/asm/module_83.s +++ b/arm9/modules/83/asm/module_83.s @@ -1851,7 +1851,7 @@ _0222E3FE: mov r1, #2 bl FUN_020178A0 ldr r0, [r7] - bl FUN_02016A18 + bl FreeToHeap mov r0, #0 add r1, r0, #0 bl FUN_02015F10 @@ -3028,7 +3028,7 @@ _0222EDD0: mov r1, #5 bl FUN_020178A0 ldr r0, [r4, #4] - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} thumb_func_end MOD83_0222ED88 @@ -4166,7 +4166,7 @@ MOD83_0222F74C: ; 0x0222F74C mov r1, #0xf5 mov r0, #0xf lsl r1, r1, #2 - bl FUN_02016998 + bl AllocFromHeap ldr r1, _0222F79C ; =0x0223B884 mov r2, #0xf5 str r0, [r1] @@ -4666,7 +4666,7 @@ _0222FAB6: mov r1, #5 bl FUN_020178A0 ldr r0, [r7] - bl FUN_02016A18 + bl FreeToHeap pop {r3, r4, r5, r6, r7, pc} thumb_func_end MOD83_0222FA4C @@ -6539,7 +6539,7 @@ MOD83_02230954: ; 0x02230954 ldr r0, _02230A04 ; =0x000015D4 mov r1, #2 str r1, [r4, r0] - ldr r0, _02230A08 ; =0x020ECAC0 + ldr r0, _02230A08 ; =gGameVersion ldrb r0, [r0] bl FUN_02016438 mov r0, #1 @@ -6567,7 +6567,7 @@ _022309D0: _022309FC: .word 0x00002998 _02230A00: .word 0x00000496 _02230A04: .word 0x000015D4 -_02230A08: .word 0x020ECAC0 +_02230A08: .word gGameVersion _02230A0C: .word 0x000005C8 thumb_func_end MOD83_02230954 @@ -7827,7 +7827,7 @@ MOD83_02231494: ; 0x02231494 bl FUN_0202E4F0 ldr r0, _022314B0 ; =0x0223B888 ldr r0, [r0, #8] - bl FUN_02016A18 + bl FreeToHeap bl FUN_02033ED0 ldr r0, _022314B0 ; =0x0223B888 mov r1, #0 @@ -7918,7 +7918,7 @@ _0223153C: bl MOD83_02239D98 add r1, r0, #0 mov r0, #0x56 - bl FUN_02016998 + bl AllocFromHeap add r2, r0, #0 ldr r0, _022315C0 ; =0x0223B888 ldr r1, _022315C4 ; =MOD83_02231440 @@ -9394,7 +9394,7 @@ MOD83_022320D8: ; 0x022320D8 add r3, r6, #0 bl FUN_02017DFC add r0, r7, #0 - bl FUN_02016A18 + bl FreeToHeap add sp, #8 pop {r3, r4, r5, r6, r7, pc} nop @@ -9695,7 +9695,7 @@ _02232312: ldr r0, [r4, r0] bl FUN_02020248 ldr r0, [sp, #0x14] - bl FUN_02016A18 + bl FreeToHeap _0223237C: ldr r0, [sp, #8] add r6, r6, #1 @@ -11360,7 +11360,7 @@ _02233104: bl FUN_020178A0 ldr r0, _0223315C ; =0x0000299C ldr r0, [r7, r0] - bl FUN_02016A18 + bl FreeToHeap ldr r0, _02233160 ; =SDK_OVERLAY_MODULE_83_ID ldr r1, _02233164 ; =0x0223A434 bl FUN_02000E7C @@ -11389,7 +11389,7 @@ MOD83_02233168: ; 0x02233168 bl MOD83_022331E0 ldr r1, _022331B4 ; =0x00003CF4 add r0, r5, #0 - bl FUN_020169D8 + bl AllocFromHeapAtEnd ldr r2, _022331B4 ; =0x00003CF4 mov r1, #0 add r4, r0, #0 @@ -11411,7 +11411,7 @@ MOD83_02233168: ; 0x02233168 mov r1, #1 bl MOD83_02231DF0 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r3, r4, r5, r6, r7, pc} nop _022331B4: .word 0x00003CF4 @@ -15958,7 +15958,7 @@ MOD83_022352FC: ; 0x022352FC add r0, r3, #0 lsl r1, r1, #0xc add r7, r2, #0 - bl FUN_020169D8 + bl AllocFromHeapAtEnd add r4, r0, #0 beq _02235330 add r1, r5, #0 @@ -15970,7 +15970,7 @@ MOD83_022352FC: ; 0x022352FC cmp r0, #0 bne _02235330 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap mov r0, #0 pop {r3, r4, r5, r6, r7, pc} _02235330: @@ -16105,7 +16105,7 @@ MOD83_022353C0: ; 0x022353C0 add r1, #8 bl FUN_02020248 add r0, r6, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r3, r4, r5, r6, r7, pc} thumb_func_end MOD83_022353C0 @@ -16222,7 +16222,7 @@ MOD83_022354F0: ; 0x022354F0 str r0, [sp, #0xc] mov r0, #0x4e lsl r1, r1, #0xc - bl FUN_020169D8 + bl AllocFromHeapAtEnd mov r6, #0 str r0, [sp, #0x10] add r7, r6, #0 @@ -16343,7 +16343,7 @@ _02235602: cmp r6, #0x1e blt _02235512 ldr r0, [sp, #0x10] - bl FUN_02016A18 + bl FreeToHeap ldr r0, [sp, #0xc] bl NARC_dtor ldr r1, _02235640 ; =MOD83_022354AC @@ -19267,7 +19267,7 @@ MOD83_02236DD0: ; 0x02236DD0 add r4, r0, #0 bl FUN_02006278 ldr r0, [r0, #0x20] - bl FUN_02016A18 + bl FreeToHeap ldr r0, _02236DFC ; =SDK_OVERLAY_MODULE_63_ID ldr r1, _02236E00 ; =0x021DBAB8 bl FUN_02000E7C @@ -22602,12 +22602,12 @@ _02238604: .word 0x0223BC2C MOD83_02238608: ; 0x02238608 add r1, r0, #0 ldr r0, _02238614 ; =0x0223BC2C - ldr r3, _02238618 ; =FUN_02016998 + ldr r3, _02238618 ; =AllocFromHeap ldr r0, [r0] bx r3 nop _02238614: .word 0x0223BC2C -_02238618: .word FUN_02016998 +_02238618: .word AllocFromHeap thumb_func_end MOD83_02238608 thumb_func_start MOD83_0223861C @@ -22656,7 +22656,7 @@ _02238652: mov r0, #0 bl CTRDG_Enable ldr r0, _022386C0 ; =MOD83_02238608 - ldr r1, _022386C4 ; =FUN_02016A18 + ldr r1, _022386C4 ; =FreeToHeap bl SetCustomAllocatorAndDestructor ldr r1, _022386B8 ; =0x000004A8 ldr r3, _022386C8 ; =0x0223A6B4 @@ -22688,7 +22688,7 @@ _022386B4: .word 0x0223B69C _022386B8: .word 0x000004A8 _022386BC: .word 0x08020000 _022386C0: .word MOD83_02238608 -_022386C4: .word FUN_02016A18 +_022386C4: .word FreeToHeap _022386C8: .word 0x0223A6B4 thumb_func_end MOD83_0223861C @@ -24219,7 +24219,7 @@ MOD83_022391EC: ; 0x022391EC lsl r3, r3, #8 bl FUN_02017DFC ldr r0, [sp, #0x10] - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x20 str r0, [sp] mov r0, #0x18 @@ -24309,7 +24309,7 @@ MOD83_022392EC: ; 0x022392EC add r0, r2, #0 lsl r1, r1, #8 str r2, [sp] - bl FUN_02016998 + bl AllocFromHeap ldr r1, _0223936C ; =0x0000A001 add r4, r0, #0 bl MATHi_CRC16InitTableRev @@ -24319,7 +24319,7 @@ MOD83_022392EC: ; 0x022392EC bl MATH_CalcCRC16 add r6, r0, #0 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap add r0, sp, #4 bl OS_GetMacAddress add r0, sp, #4 @@ -24341,7 +24341,7 @@ _0223932E: mov r1, #0x41 ldr r0, [sp] lsl r1, r1, #2 - bl FUN_02016998 + bl AllocFromHeap add r1, sp, #4 mov r2, #8 add r4, r0, #0 @@ -24354,7 +24354,7 @@ _0223932E: add r3, r7, #0 bl FUN_020952AC add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap add sp, #0xc pop {r4, r5, r6, r7, pc} .align 2, 0 @@ -24372,7 +24372,7 @@ MOD83_02239374: ; 0x02239374 add r0, r2, #0 lsl r1, r1, #8 str r2, [sp] - bl FUN_02016998 + bl AllocFromHeap ldr r1, _0223940C ; =0x0000A001 add r4, r0, #0 bl MATHi_CRC16InitTableRev @@ -24382,7 +24382,7 @@ MOD83_02239374: ; 0x02239374 bl MATH_CalcCRC16 add r6, r0, #0 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap mov r0, #0 bl FUN_0202EF18 ldrb r2, [r0, #4] @@ -24416,7 +24416,7 @@ _022393CE: mov r1, #0x41 ldr r0, [sp] lsl r1, r1, #2 - bl FUN_02016998 + bl AllocFromHeap add r1, sp, #4 mov r2, #8 add r4, r0, #0 @@ -24429,7 +24429,7 @@ _022393CE: add r3, r7, #0 bl FUN_020952AC add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap add sp, #0xc pop {r4, r5, r6, r7, pc} .align 2, 0 @@ -25738,7 +25738,7 @@ MOD83_02239DC0: ; 0x02239DC0 bic r1, r0 add r1, #0x20 mov r0, #0x56 - bl FUN_02016998 + bl AllocFromHeap add r2, r0, #0 add r2, #0x20 mov r1, #0x1f @@ -25756,7 +25756,7 @@ MOD83_02239DE0: ; 0x02239DE0 beq _02239DEE sub r0, r1, #4 ldr r0, [r0] - bl FUN_02016A18 + bl FreeToHeap _02239DEE: pop {r3, pc} thumb_func_end MOD83_02239DE0 diff --git a/arm9/modules/84/asm/module_84.s b/arm9/modules/84/asm/module_84.s index a0ac6143..75dc0d1e 100644 --- a/arm9/modules/84/asm/module_84.s +++ b/arm9/modules/84/asm/module_84.s @@ -697,7 +697,7 @@ MOD84_021D7A84: ; 0x021D7A84 mov r1, #5 bl FUN_020178A0 ldr r0, [r4, #4] - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} thumb_func_end MOD84_021D7A84 @@ -983,12 +983,12 @@ MOD84_021D7CD4: ; 0x021D7CD4 add r0, #0x6c bl thunk_FUN_020ae84c ldr r0, [r4, #4] - bl FUN_02016A18 + bl FreeToHeap _021D7CF0: ldr r0, [r4] cmp r0, #0 beq _021D7CFA - bl FUN_02016A18 + bl FreeToHeap _021D7CFA: pop {r4, pc} thumb_func_end MOD84_021D7CD4 @@ -1118,7 +1118,7 @@ MOD84_021D7DF4: ; 0x021D7DF4 add r4, #0x38 cmp r0, #0 beq _021D7E08 - bl FUN_02016A18 + bl FreeToHeap _021D7E08: ldr r1, _021D7ED4 ; =0x021DA648 lsl r3, r5, #1 @@ -1381,7 +1381,7 @@ MOD84_021D801C: ; 0x021D801C mov r1, #0x30 str r2, [sp] add r6, r3, #0 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 beq _021D8090 ldr r0, [sp] @@ -1489,10 +1489,10 @@ _021D81CE: thumb_func_start MOD84_021D81D4 MOD84_021D81D4: ; 0x021D81D4 - ldr r3, _021D81D8 ; =FUN_02016A18 + ldr r3, _021D81D8 ; =FreeToHeap bx r3 .align 2, 0 -_021D81D8: .word FUN_02016A18 +_021D81D8: .word FreeToHeap thumb_func_end MOD84_021D81D4 thumb_func_start MOD84_021D81DC @@ -1503,7 +1503,7 @@ MOD84_021D81DC: ; 0x021D81DC mov r0, #0x4b mov r1, #0x10 add r7, r2, #0 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 beq _021D8218 mov r0, #0x4b @@ -1537,15 +1537,15 @@ MOD84_021D821C: ; 0x021D821C ldr r0, [r4] cmp r0, #0 beq _021D822C - bl FUN_02016A18 + bl FreeToHeap _021D822C: ldr r0, [r4, #4] cmp r0, #0 beq _021D8236 - bl FUN_02016A18 + bl FreeToHeap _021D8236: add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap _021D823C: pop {r4, pc} .align 2, 0 @@ -1942,7 +1942,7 @@ MOD84_021D84F8: ; 0x021D84F8 mov r1, #0x38 add r5, r2, #0 add r7, r3, #0 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 beq _021D85AC ldr r0, [sp, #0x14] @@ -2038,11 +2038,11 @@ _021D85C6: ldr r0, [r4, #0x28] bl FUN_02019178 ldr r0, [r4, #0x24] - bl FUN_02016A18 + bl FreeToHeap ldr r0, [r4, #0x28] - bl FUN_02016A18 + bl FreeToHeap add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} thumb_func_end MOD84_021D85B8 @@ -2381,7 +2381,7 @@ MOD84_021D8874: ; 0x021D8874 add r6, r1, #0 mov r0, #0x4b mov r1, #0x1c - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 beq _021D88A0 str r5, [r4] @@ -2427,7 +2427,7 @@ MOD84_021D88C8: ; 0x021D88C8 add r4, r0, #0 bl MOD84_021D8A74 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap mov r0, #1 pop {r4, pc} .align 2, 0 @@ -2661,7 +2661,7 @@ MOD84_021D8A8C: ; 0x021D8A8C add r4, r1, #0 mov r0, #0x4b mov r1, #0x10 - bl FUN_02016998 + bl AllocFromHeap cmp r0, #0 beq _021D8AA8 str r5, [r0] @@ -2694,7 +2694,7 @@ MOD84_021D8AC0: ; 0x021D8AC0 add r4, r0, #0 bl MOD84_021D8C3C add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap mov r0, #1 pop {r4, pc} .align 2, 0 @@ -2910,7 +2910,7 @@ MOD84_021D8C54: ; 0x021D8C54 add r5, r0, #0 mov r0, #0x4b lsl r1, r1, #8 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 beq _021D8CC6 str r5, [r4] @@ -2990,7 +2990,7 @@ MOD84_021D8CEC: ; 0x021D8CEC add r0, r4, #0 bl MOD84_021D9044 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap mov r0, #1 pop {r4, pc} .align 2, 0 @@ -3342,7 +3342,7 @@ _021D8FA6: cmp r6, #6 blt _021D8FA6 ldr r0, [sp, #0x18] - bl FUN_02016A18 + bl FreeToHeap _021D8FC8: ldr r0, [sp, #0x14] ldr r0, [r0] @@ -3431,7 +3431,7 @@ _021D906A: cmp r0, #0 beq _021D9082 bl FUN_0201B6C8 - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x15 lsl r0, r0, #4 ldr r0, [r5, r0] @@ -3477,7 +3477,7 @@ MOD84_021D90C4: ; 0x021D90C4 add r6, r1, #0 mov r0, #0x4b mov r1, #0x38 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 bne _021D90DA b _021D91F6 @@ -3820,7 +3820,7 @@ MOD84_021D9394: ; 0x021D9394 add r4, r1, #0 mov r0, #0x4b mov r1, #0x10 - bl FUN_02016998 + bl AllocFromHeap cmp r0, #0 beq _021D93B0 str r5, [r0] @@ -3853,7 +3853,7 @@ MOD84_021D93C8: ; 0x021D93C8 add r4, r0, #0 bl MOD84_021D9544 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap mov r0, #1 pop {r4, pc} .align 2, 0 @@ -4068,7 +4068,7 @@ MOD84_021D955C: ; 0x021D955C add r6, r1, #0 mov r0, #0x4b mov r1, #0x6c - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 beq _021D958E str r5, [r4] @@ -4118,7 +4118,7 @@ MOD84_021D95B8: ; 0x021D95B8 add r4, r0, #0 bl MOD84_021D9A04 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap mov r0, #1 pop {r4, pc} .align 2, 0 @@ -4693,7 +4693,7 @@ MOD84_021D9A54: ; 0x021D9A54 add r4, r1, #0 mov r0, #0x4b mov r1, #0x10 - bl FUN_02016998 + bl AllocFromHeap cmp r0, #0 beq _021D9A70 str r5, [r0] @@ -4726,7 +4726,7 @@ MOD84_021D9A88: ; 0x021D9A88 add r4, r0, #0 bl MOD84_021D9C04 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap mov r0, #1 pop {r4, pc} .align 2, 0 @@ -4941,7 +4941,7 @@ MOD84_021D9C1C: ; 0x021D9C1C add r6, r1, #0 mov r0, #0x4b mov r1, #0xf4 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 beq _021D9C7C str r5, [r4] @@ -5018,10 +5018,10 @@ MOD84_021D9CA4: ; 0x021D9CA4 ldr r0, [r5, #0x58] cmp r0, #0 beq _021D9CC4 - bl FUN_02016A18 + bl FreeToHeap _021D9CC4: add r0, r5, #0 - bl FUN_02016A18 + bl FreeToHeap add r0, r4, #0 bl OS_RestoreInterrupts mov r0, #1 @@ -6131,7 +6131,7 @@ MOD84_021DA58C: ; 0x021DA58C mov r1, #0x1c add r7, r2, #0 str r3, [sp] - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 beq _021DA5CE mov r0, #0 @@ -6151,7 +6151,7 @@ MOD84_021DA58C: ; 0x021DA58C add r5, r0, #0 bne _021DA5CA add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap _021DA5CA: add r0, r5, #0 pop {r3, r4, r5, r6, r7, pc} @@ -6168,7 +6168,7 @@ MOD84_021DA5D8: ; 0x021DA5D8 add r4, r0, #0 beq _021DA5EC bl FUN_0201B6C8 - bl FUN_02016A18 + bl FreeToHeap add r0, r4, #0 bl FUN_0200CAB4 _021DA5EC: diff --git a/arm9/modules/85/asm/module_85.s b/arm9/modules/85/asm/module_85.s index 06e7f034..c5eddf82 100644 --- a/arm9/modules/85/asm/module_85.s +++ b/arm9/modules/85/asm/module_85.s @@ -252,10 +252,10 @@ _021D76F0: .word 0x000004C4 thumb_func_start MOD85_021D76F4 MOD85_021D76F4: ; 0x021D76F4 - ldr r3, _021D76F8 ; =FUN_02016A18 + ldr r3, _021D76F8 ; =FreeToHeap bx r3 .align 2, 0 -_021D76F8: .word FUN_02016A18 +_021D76F8: .word FreeToHeap thumb_func_end MOD85_021D76F4 thumb_func_start MOD85_021D76FC @@ -513,7 +513,7 @@ MOD85_021D7904: ; 0x021D7904 mov r1, #7 bl FUN_020178A0 add r0, r4, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} .align 2, 0 thumb_func_end MOD85_021D7904 @@ -580,7 +580,7 @@ MOD85_021D797C: ; 0x021D797C mov r3, #0 bl FUN_02017FB4 add r0, r5, #0 - bl FUN_02016A18 + bl FreeToHeap mov r1, #0 add r0, r4, #0 add r2, r1, #0 @@ -600,7 +600,7 @@ MOD85_021D797C: ; 0x021D797C mov r1, #1 bl FUN_02017E14 add r0, r5, #0 - bl FUN_02016A18 + bl FreeToHeap add r0, r4, #0 mov r1, #1 mov r2, #0 @@ -625,7 +625,7 @@ MOD85_021D797C: ; 0x021D797C ldr r0, [r4, r0] bl FUN_02017CD0 add r0, r5, #0 - bl FUN_02016A18 + bl FreeToHeap add r0, r4, #0 mov r1, #8 mov r2, #0 @@ -645,7 +645,7 @@ MOD85_021D797C: ; 0x021D797C mov r1, #2 bl FUN_02017E14 add r0, r5, #0 - bl FUN_02016A18 + bl FreeToHeap add r0, r4, #0 mov r1, #9 mov r2, #0 @@ -670,7 +670,7 @@ MOD85_021D797C: ; 0x021D797C ldr r0, [r4, r0] bl FUN_02017CD0 add r0, r5, #0 - bl FUN_02016A18 + bl FreeToHeap add r0, r4, #0 mov r1, #3 mov r2, #0 @@ -688,7 +688,7 @@ MOD85_021D797C: ; 0x021D797C mov r3, #0 bl FUN_02017FB4 add r0, r5, #0 - bl FUN_02016A18 + bl FreeToHeap add r0, r4, #0 mov r1, #2 mov r2, #0 @@ -708,7 +708,7 @@ MOD85_021D797C: ; 0x021D797C mov r1, #7 bl FUN_02017E14 add r0, r5, #0 - bl FUN_02016A18 + bl FreeToHeap add r0, r4, #0 mov r1, #4 mov r2, #0 @@ -733,7 +733,7 @@ MOD85_021D797C: ; 0x021D797C ldr r0, [r4, r0] bl FUN_02017CD0 add r0, r5, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r3, r4, r5, pc} .align 2, 0 _021D7B1C: .word 0x00000448 @@ -1474,7 +1474,7 @@ MOD85_021D80F8: ; 0x021D80F8 add r5, r0, #0 mov r0, #0x4f add r1, r5, #0 - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 bne _021D810C bl ErrorHandling @@ -1526,11 +1526,11 @@ MOD85_021D8144: ; 0x021D8144 cmp r5, #1 bne _021D8162 mov r0, #0x4f - bl FUN_02016998 + bl AllocFromHeap b _021D8168 _021D8162: mov r0, #0x4f - bl FUN_020169D8 + bl AllocFromHeapAtEnd _021D8168: add r5, r0, #0 cmp r5, #0 @@ -8620,7 +8620,7 @@ MOD85_021DB494: ; 0x021DB494 add r2, r4, r2 bl MOD85_021DB604 add r0, r6, #0 - bl FUN_02016A18 + bl FreeToHeap add r0, r5, #0 mov r1, #5 mov r2, #0 @@ -8634,7 +8634,7 @@ MOD85_021DB494: ; 0x021DB494 add r2, #0x24 bl MOD85_021DB604 add r0, r6, #0 - bl FUN_02016A18 + bl FreeToHeap add r0, r5, #0 mov r1, #6 mov r2, #0 @@ -8648,7 +8648,7 @@ MOD85_021DB494: ; 0x021DB494 add r2, #0x44 bl MOD85_021DB604 add r0, r6, #0 - bl FUN_02016A18 + bl FreeToHeap add r0, r5, #0 mov r1, #7 mov r2, #0 @@ -8662,7 +8662,7 @@ MOD85_021DB494: ; 0x021DB494 add r2, #0x64 bl MOD85_021DB604 add r0, r6, #0 - bl FUN_02016A18 + bl FreeToHeap add r0, r5, #0 mov r1, #0x4a mov r2, #0 @@ -8677,7 +8677,7 @@ MOD85_021DB494: ; 0x021DB494 add r2, r4, r2 bl MOD85_021DB604 add r0, r6, #0 - bl FUN_02016A18 + bl FreeToHeap add r0, r5, #0 mov r1, #0x4b mov r2, #0 @@ -8698,7 +8698,7 @@ MOD85_021DB494: ; 0x021DB494 add r2, r4, r2 bl MOD85_021DB604 add r0, r6, #0 - bl FUN_02016A18 + bl FreeToHeap add r0, r5, #0 mov r1, #0x4c mov r2, #0 @@ -8719,7 +8719,7 @@ MOD85_021DB494: ; 0x021DB494 add r2, r4, r2 bl MOD85_021DB604 add r0, r5, #0 - bl FUN_02016A18 + bl FreeToHeap add sp, #4 pop {r3, r4, r5, r6, pc} thumb_func_end MOD85_021DB494 @@ -9462,7 +9462,7 @@ MOD85_021DBB0C: ; 0x021DBB0C add r4, r0, #0 mov r0, #0x4f mov r1, #0x10 - bl FUN_020169D8 + bl AllocFromHeapAtEnd add r1, r0, #0 mov r0, #0 str r0, [r1] @@ -9482,7 +9482,7 @@ MOD85_021DBB30: ; 0x021DBB30 add r4, r0, #0 mov r0, #0x4f mov r1, #0x10 - bl FUN_020169D8 + bl AllocFromHeapAtEnd add r1, r0, #0 mov r0, #0 str r0, [r1] @@ -9503,7 +9503,7 @@ MOD85_021DBB54: ; 0x021DBB54 add r4, r1, #0 mov r0, #0x4f mov r1, #0x10 - bl FUN_020169D8 + bl AllocFromHeapAtEnd add r1, r0, #0 mov r0, #0 str r0, [r1] @@ -9567,7 +9567,7 @@ _021DBBB8: bne _021DBBE6 _021DBBDA: add r0, r5, #0 - bl FUN_02016A18 + bl FreeToHeap add r0, r7, #0 bl FUN_0200CAB4 _021DBBE6: @@ -9618,7 +9618,7 @@ _021DBC18: bne _021DBC46 _021DBC3A: add r0, r5, #0 - bl FUN_02016A18 + bl FreeToHeap add r0, r7, #0 bl FUN_0200CAB4 _021DBC46: @@ -9641,7 +9641,7 @@ MOD85_021DBC48: ; 0x021DBC48 cmp r3, #0x3f bne _021DBC70 add r0, r5, #0 - bl FUN_02016A18 + bl FreeToHeap add r0, r7, #0 bl FUN_0200CAB4 pop {r3, r4, r5, r6, r7, pc} @@ -9714,7 +9714,7 @@ _021DBCD8: cmp r4, #0 bne _021DBCFE add r0, r5, #0 - bl FUN_02016A18 + bl FreeToHeap add r0, r7, #0 bl FUN_0200CAB4 _021DBCFE: @@ -15185,7 +15185,7 @@ MOD85_021DE5A4: ; 0x021DE5A4 add r7, r3, #0 ldr r5, [sp, #0x20] ldr r6, [sp, #0x24] - bl FUN_02016998 + bl AllocFromHeap add r4, r0, #0 bne _021DE5C8 bl ErrorHandling @@ -15250,26 +15250,26 @@ _021DE5C8: str r0, [r4, r1] ldr r0, [sp] lsl r1, r7, #3 - bl FUN_02016998 + bl AllocFromHeap mov r1, #0x53 lsl r1, r1, #2 str r0, [r4, r1] ldr r0, [sp] lsl r1, r5, #3 - bl FUN_02016998 + bl AllocFromHeap mov r1, #0x15 lsl r1, r1, #4 str r0, [r4, r1] ldr r0, [sp] lsl r1, r6, #3 - bl FUN_02016998 + bl AllocFromHeap mov r1, #0x55 lsl r1, r1, #2 str r0, [r4, r1] ldr r1, [sp, #0x28] ldr r0, [sp] lsl r1, r1, #3 - bl FUN_02016998 + bl AllocFromHeap mov r1, #0x56 lsl r1, r1, #2 str r0, [r4, r1] @@ -15468,19 +15468,19 @@ _021DE7BC: mov r0, #0x53 lsl r0, r0, #2 ldr r0, [r5, r0] - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x15 lsl r0, r0, #4 ldr r0, [r5, r0] - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x55 lsl r0, r0, #2 ldr r0, [r5, r0] - bl FUN_02016A18 + bl FreeToHeap mov r0, #0x56 lsl r0, r0, #2 ldr r0, [r5, r0] - bl FUN_02016A18 + bl FreeToHeap bl FUN_0201C29C mov r0, #0x4e lsl r0, r0, #2 @@ -15491,7 +15491,7 @@ _021DE7BC: ldr r0, [r5, #0xc] bl FUN_0201FD58 add r0, r5, #0 - bl FUN_02016A18 + bl FreeToHeap pop {r3, r4, r5, r6, r7, pc} .align 2, 0 thumb_func_end MOD85_021DE710 diff --git a/arm9/modules/86/asm/module_86.s b/arm9/modules/86/asm/module_86.s index 9c974657..920d9ed9 100644 --- a/arm9/modules/86/asm/module_86.s +++ b/arm9/modules/86/asm/module_86.s @@ -457,7 +457,7 @@ MOD86_021D7858: ; 0x021D7858 mov r1, #7 bl FUN_020178A0 ldr r0, [r4, #0x10] - bl FUN_02016A18 + bl FreeToHeap pop {r4, pc} thumb_func_end MOD86_021D7858 |