3 files changed, 8 insertions, 8 deletions
diff --git a/arm9/modules/05/asm/mod05_021DC0B8.s b/arm9/modules/05/asm/mod05_021DC0B8.s
index 8d4f91fa..7b1e767f 100644
--- a/arm9/modules/05/asm/mod05_021DC0B8.s
+++ b/arm9/modules/05/asm/mod05_021DC0B8.s
@@ -520,7 +520,7 @@ MOD05_021DC480: ; 0x021DC480
 	add r1, r5, #0
 	mov r2, #0
 	mov r3, #4
-	bl UncompressFromNarc
+	bl GfGfxLoader_LoadFromNarc
 	add r5, r0, #0
 	add r1, r4, #0
 	mov r2, #4
diff --git a/arm9/modules/05/asm/mod05_021E3444.s b/arm9/modules/05/asm/mod05_021E3444.s
index 73ee60ca..42f9037e 100644
--- a/arm9/modules/05/asm/mod05_021E3444.s
+++ b/arm9/modules/05/asm/mod05_021E3444.s
@@ -1170,7 +1170,7 @@ MOD05_021E3D20: ; 0x021E3D20
 	str r0, [sp, #4]
 	mov r0, #0x70
 	add r2, r3, #0
-	bl FUN_02006930
+	bl GfGfxLoader_GXLoadPal
 	mov r0, #0
 	str r0, [sp]
 	str r0, [sp, #4]
@@ -1181,7 +1181,7 @@ MOD05_021E3D20: ; 0x021E3D20
 	add r1, r6, #0
 	add r2, r4, #0
 	mov r3, #3
-	bl FUN_0200687C
+	bl GfGfxLoader_LoadCharData
 	mov r0, #0
 	str r0, [sp]
 	str r0, [sp, #4]
@@ -1192,7 +1192,7 @@ MOD05_021E3D20: ; 0x021E3D20
 	add r1, r5, #0
 	add r2, r4, #0
 	mov r3, #3
-	bl FUN_020068C8
+	bl GfGfxLoader_LoadScrnData
 	add sp, #0x10
 	pop {r4, r5, r6, pc}
 
@@ -1464,7 +1464,7 @@ MOD05_021E3F68: ; 0x021E3F68
 	ldrh r1, [r1, #8]
 	add r2, sp, #4
 	add r3, r4, #0
-	bl FUN_02006C08
+	bl GfGfxLoader_GetPlttData
 	add r4, r0, #0
 	add r0, sp, #0x20
 	ldrh r0, [r0, #0x10]
@@ -1549,7 +1549,7 @@ MOD05_021E4014: ; 0x021E4014
 	ldrh r1, [r1, #0xa]
 	mov r2, #0
 	add r3, sp, #0xc
-	bl FUN_02006BB0
+	bl GfGfxLoader_GetCharData
 	str r0, [sp, #4]
 	ldr r0, [sp, #0xc]
 	ldr r0, [r0, #0x14]
diff --git a/arm9/modules/05/asm/module_05.s b/arm9/modules/05/asm/module_05.s
index 4662c7cc..006e8bb1 100644
--- a/arm9/modules/05/asm/module_05.s
+++ b/arm9/modules/05/asm/module_05.s
@@ -26118,7 +26118,7 @@ MOD05_021F5268: ; 0x021F5268
 	add r1, r2, #0
 	str r5, [sp]
 	add r2, r5, #0
-	bl UncompressFromNarc
+	bl GfGfxLoader_LoadFromNarc
 	str r0, [r4]
 	bl NNS_G3dGetMdlSet
 	str r0, [r4, #4]
@@ -26211,7 +26211,7 @@ MOD05_021F531C: ; 0x021F531C
 	ldr r3, [sp, #0x18]
 	add r2, r6, #0
 	str r6, [sp]
-	bl UncompressFromNarc
+	bl GfGfxLoader_LoadFromNarc
 	add r2, r0, #0
 	ldr r3, [sp, #0x1c]
 	add r0, r5, #0