summaryrefslogtreecommitdiff
path: root/arm9/modules/18/asm/module_18.s
diff options
context:
space:
mode:
Diffstat (limited to 'arm9/modules/18/asm/module_18.s')
-rw-r--r--arm9/modules/18/asm/module_18.s228
1 files changed, 114 insertions, 114 deletions
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