7 files changed, 13 insertions, 13 deletions
diff --git a/arm9/modules/05/asm/mod05_021D74E0.s b/arm9/modules/05/asm/mod05_021D74E0.s
index 730bfc00..4ca1ac2e 100644
--- a/arm9/modules/05/asm/mod05_021D74E0.s
+++ b/arm9/modules/05/asm/mod05_021D74E0.s
@@ -69,7 +69,7 @@ _021D7564:
 	mov r0, #3
 	ldr r2, [r2, #4]
 	mov r1, #4
-	bl FUN_0201681C
+	bl CreateHeap
 	ldr r0, [r4, #4]
 	cmp r0, #0
 	beq _021D757A
@@ -361,7 +361,7 @@ _021D7806:
 	mov r0, #0
 	str r0, [r4, #4]
 	mov r0, #4
-	bl FUN_020168D0
+	bl DestroyHeap
 	ldr r0, [r4, #0x70]
 	ldr r0, [r0]
 	lsl r0, r0, #8
diff --git a/arm9/modules/05/asm/mod05_021D9320.s b/arm9/modules/05/asm/mod05_021D9320.s
index ec304548..419b92fd 100644
--- a/arm9/modules/05/asm/mod05_021D9320.s
+++ b/arm9/modules/05/asm/mod05_021D9320.s
@@ -53,7 +53,7 @@ _021D9374:
 	str r0, [sp, #0x20]
 	ldr r1, [r6]
 	add r0, r4, #0
-	bl FUN_020161A4
+	bl AllocAndReadFile
 	ldr r1, [sp, #0x20]
 	str r0, [sp, #0x24]
 	add r2, r4, #0
@@ -161,7 +161,7 @@ _021D944A:
 	ldr r1, [sp, #0x10]
 	add r0, r4, #0
 	ldr r1, [r1, #0x18]
-	bl FUN_020161A4
+	bl AllocAndReadFile
 	mov r3, #0x4e
 	lsl r3, r3, #2
 	ldr r1, [r5, r3]
diff --git a/arm9/modules/05/asm/mod05_021D9A48.s b/arm9/modules/05/asm/mod05_021D9A48.s
index ee169f98..4cd22924 100644
--- a/arm9/modules/05/asm/mod05_021D9A48.s
+++ b/arm9/modules/05/asm/mod05_021D9A48.s
@@ -199,7 +199,7 @@ _021D9B98:
 	mov r1, #4
 	add r0, r7, #0
 	add r2, r1, #0
-	bl FUN_02016B20
+	bl GF_ExpHeap_FndInitAllocator
 	mov r0, #0x6e
 	mov r1, #4
 	bl NARC_ctor
diff --git a/arm9/modules/05/asm/mod05_021DB44C.s b/arm9/modules/05/asm/mod05_021DB44C.s
index eaee32f8..bba92897 100644
--- a/arm9/modules/05/asm/mod05_021DB44C.s
+++ b/arm9/modules/05/asm/mod05_021DB44C.s
@@ -255,7 +255,7 @@ MOD05_021DB61C: ; 0x021DB61C
 	str r1, [sp]
 	mov r0, #4
 	add r1, r2, #0
-	bl FUN_020161A4
+	bl AllocAndReadFile
 	mov r1, #0
 	str r0, [sp, #0x14]
 	str r1, [sp, #8]
diff --git a/arm9/modules/05/asm/mod05_021DBEF4.s b/arm9/modules/05/asm/mod05_021DBEF4.s
index f65de9d8..ae93e2a3 100644
--- a/arm9/modules/05/asm/mod05_021DBEF4.s
+++ b/arm9/modules/05/asm/mod05_021DBEF4.s
@@ -120,7 +120,7 @@ _021DBFA8:
 	add r7, #0x10
 	mov r0, #4
 	add r1, sp, #0xc
-	bl FUN_020161A4
+	bl AllocAndReadFile
 	str r0, [r7, r5]
 	add r0, r6, #0
 	str r0, [sp, #8]
@@ -128,7 +128,7 @@ _021DBFA8:
 	str r0, [sp, #8]
 	ldr r0, [r7, r5]
 	mov r1, #4
-	bl FUN_02016324
+	bl OpenFileCached
 	ldr r1, [sp, #8]
 	str r0, [r1, r5]
 	add r0, r1, #0
diff --git a/arm9/modules/05/asm/mod05_021E4AE4.s b/arm9/modules/05/asm/mod05_021E4AE4.s
index 98146a9c..09f66fe5 100644
--- a/arm9/modules/05/asm/mod05_021E4AE4.s
+++ b/arm9/modules/05/asm/mod05_021E4AE4.s
@@ -1093,7 +1093,7 @@ MOD05_021E5294: ; 0x021E5294
 	add r1, r0, #0
 	add r0, r4, #0
 	mov r2, #0x20
-	bl FUN_02016B20
+	bl GF_ExpHeap_FndInitAllocator
 	pop {r4, pc}
 
 	.section .rodata
diff --git a/arm9/modules/05/asm/module_05.s b/arm9/modules/05/asm/module_05.s
index 006e8bb1..a67d2d02 100644
--- a/arm9/modules/05/asm/module_05.s
+++ b/arm9/modules/05/asm/module_05.s
@@ -13882,7 +13882,7 @@ MOD05_021EF4F8: ; 0x021EF4F8
 MOD05_021EF514: ; 0x021EF514
 	push {r3, r4, r5, r6, r7, lr}
 	add r5, r0, #0
-	bl FUN_020162FC
+	bl ClearFileCache
 	bl NNS_GfdResetLnkTexVramState
 	bl NNS_GfdResetLnkPlttVramState
 	mov r4, #0
@@ -24929,7 +24929,7 @@ MOD05_021F4968: ; 0x021F4968
 	sub r1, r1, r0
 	bx r3
 	nop
-_021F4974: .word FUN_02016B44
+_021F4974: .word ReallocFromHeap
 
 	thumb_func_start MOD05_021F4978
 MOD05_021F4978: ; 0x021F4978
@@ -27084,7 +27084,7 @@ MOD05_021F5990: ; 0x021F5990
 	str r0, [sp]
 	add r7, r1, #0
 	str r3, [sp, #4]
-	bl FUN_0201681C
+	bl CreateHeap
 	cmp r0, #1
 	beq _021F59B2
 	bl GF_AssertFail
@@ -27142,7 +27142,7 @@ _021F5A0E:
 	add r0, r6, #0
 	bl FreeToHeap
 	add r0, r4, #0
-	bl FUN_020168D0
+	bl DestroyHeap
 	pop {r4, r5, r6, pc}
 	.balign 4, 0