Implement config.mk and config.h

248 files changed, 3223 insertions, 3204 deletions

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

 .extern FUN_02016828

 .extern FUN_020168D0

-.extern FUN_02016998

-.extern FUN_020169D8

-.extern FUN_02016A18

+.extern AllocFromHeap

+.extern AllocFromHeapAtEnd

+.extern FreeToHeap

 .extern FUN_02016A8C

 .extern FUN_02016AF8

 .extern FUN_02016B20

@@ -5793,6 +5793,8 @@
 .extern FX_ModS32

 .extern FX_Modf

 .extern FX_Sqrt

+.extern gGameLanguage

+.extern gGameVersion

 .extern G2S_GetBG0CharPtr

 .extern G2S_GetBG0ScrPtr

 .extern G2S_GetBG1CharPtr

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
 
diff --git a/arm9/src/filesystem.c b/arm9/src/filesystem.c
index 5f6dc8ef..de0f6457 100644
--- a/arm9/src/filesystem.c
+++ b/arm9/src/filesystem.c
@@ -232,10 +232,10 @@ THUMB_FUNC void * AllocAndReadFromNarcMemberByPathAndId(const char * path, s32 f
     switch (r4)
     {
     case 0:
-        dest = FUN_02016998(heap_id, chunk_size);
+        dest = AllocFromHeap(heap_id, chunk_size);
         break;
     default:
-        dest = FUN_020169D8(heap_id, chunk_size);
+        dest = AllocFromHeapAtEnd(heap_id, chunk_size);
         break;
     }
     FS_ReadFile(&file, dest, chunk_size);
@@ -312,7 +312,7 @@ THUMB_FUNC u32 GetNarcMemberSizeByIdPair(NarcId narc_id, s32 file_idx)
 
 THUMB_FUNC NARC * NARC_ctor(NarcId narc_id, u32 heap_id)
 {
-    NARC * narc = (NARC *)FUN_02016998(heap_id, sizeof(NARC));
+    NARC * narc = (NARC *)AllocFromHeap(heap_id, sizeof(NARC));
     u32 btnf_start;
     u32 chunk_size;
     if (narc != NULL)
@@ -336,7 +336,7 @@ THUMB_FUNC NARC * NARC_ctor(NarcId narc_id, u32 heap_id)
 THUMB_FUNC void NARC_dtor(NARC * narc)
 {
     FS_CloseFile(&narc->file);
-    FUN_02016A18(narc); // free to heap
+    FreeToHeap(narc); // free to heap
 }
 
 THUMB_FUNC void * NARC_AllocAndReadWholeMember(NARC * narc, u32 file_id, u32 heap_id)
@@ -350,7 +350,7 @@ THUMB_FUNC void * NARC_AllocAndReadWholeMember(NARC * narc, u32 file_id, u32 hea
     FS_ReadFile(&narc->file, &file_start, 4);
     FS_ReadFile(&narc->file, &file_end, 4);
     FS_SeekFile(&narc->file, narc->gmif_start + 8 + file_start, FS_SEEK_SET);
-    dest = FUN_02016998(heap_id, file_end - file_start);
+    dest = AllocFromHeap(heap_id, file_end - file_start);
     if (dest != NULL)
     {
         FS_ReadFile(&narc->file, dest, file_end - file_start);
diff --git a/arm9/src/main.c b/arm9/src/main.c
index ae3961cd..e7898c32 100644
--- a/arm9/src/main.c
+++ b/arm9/src/main.c
@@ -54,8 +54,8 @@ extern struct Unk21DBE18 MOD52_UNK_021D76C8;
 
 extern u8 SDK_STATIC_BSS_START[];
 
-const enum GameVersion gGameVersion = VERSION_DIAMOND;
-const enum GameLanguage gGameLanguage = LANGUAGE_ENGLISH;
+const enum GameVersion gGameVersion = GAME_VERSION;
+const enum GameLanguage gGameLanguage = GAME_LANGUAGE;
 
 THUMB_FUNC void NitroMain(void)
 {
diff --git a/include/config.h b/include/config.h
new file mode 100644
index 00000000..959e3d18
--- /dev/null
+++ b/include/config.h
@@ -0,0 +1,14 @@
+#ifndef POKEDIAMOND_CONFIG_H
+#define POKEDIAMOND_CONFIG_H
+
+// #define NDEBUG
+
+#ifdef DIAMOND
+#define GAME_VERSION VERSION_DIAMOND
+#else
+#define GAME_VERSION VERSION_PEARL
+#endif
+
+#define GAME_LANGUAGE LANGUAGE_ENGLISH
+
+#endif //POKEDIAMOND_CONFIG_H
diff --git a/include/global.h b/include/global.h
index 8d5a3e78..2f31fa3d 100644
--- a/include/global.h
+++ b/include/global.h
@@ -1,6 +1,7 @@
 #ifndef GUARD_GLOBAL_H
 #define GUARD_GLOBAL_H
 
+#include "config.h"
 #include "function_target.h"
 #include "nitro.h"
 
@@ -11,11 +12,17 @@ enum GameVersion {
     VERSION_FIRE_RED   =  4,
     VERSION_LEAF_GREEN =  5,
     VERSION_DIAMOND    = 10,
+    VERSION_PEARL      = 11,
 };
 
 enum GameLanguage {
     LANGUAGE_JAPANESE   = 1,
     LANGUAGE_ENGLISH    = 2,
+    LANGUAGE_FRENCH = 3,
+    LANGUAGE_ITALIAN = 4,
+    LANGUAGE_GERMAN = 5,
+    LANGUAGE_SPANISH = 7,
+    LANGUAGE_KOREAN = 8
 };
 
 extern void ErrorHandling(void);
diff --git a/include/heap.h b/include/heap.h
index 36b79122..49c54d22 100644
--- a/include/heap.h
+++ b/include/heap.h
@@ -1,8 +1,8 @@
 #ifndef POKEDIAMOND_HEAP_H
 #define POKEDIAMOND_HEAP_H
 
-void * FUN_02016998(u32 heap_id, u32 size);
-void * FUN_020169D8(u32 heap_id, u32 size);
-void FUN_02016A18(void * ptr);
+void * AllocFromHeap(u32 heap_id, u32 size);
+void * AllocFromHeapAtEnd(u32 heap_id, u32 size);
+void FreeToHeap(void * ptr);
 
 #endif //POKEDIAMOND_HEAP_H
diff --git a/include/pokemon.h b/include/pokemon.h
index 8886c47c..494f29d8 100644
--- a/include/pokemon.h
+++ b/include/pokemon.h
@@ -24,15 +24,7 @@ typedef enum {
     GIFT_EEVEE = 12
 } EncounterType;
 
-typedef enum {
-    JAPANESE = 1,
-    ENGLISH = 2,
-    FRENCH = 3,
-    ITALIAN = 4,
-    GERMAN = 5,
-    SPANISH = 7,
-    KOREAN = 8
-} OriginLanguage;
+typedef enum GameLanguage OriginLanguage;
 
 typedef enum {
     ARCEUS_NORMAL = 0,