Merge branch 'master' into make_naix

17 files changed, 73 insertions, 771 deletions

diff --git a/arm9/asm/unk_02002C14.s b/arm9/asm/unk_02002C14.s
index 3f62a449..119c68ff 100644
--- a/arm9/asm/unk_02002C14.s
+++ b/arm9/asm/unk_02002C14.s
@@ -411,7 +411,7 @@ FUN_02002ED0: ; 0x02002ED0
 	mov r0, #0xe
 	mov r1, #0x6
 	add r2, r4, #0x0
-	bl FUN_02006930
+	bl GfGfxLoader_GXLoadPal
 	add sp, #0x8
 	pop {r4, pc}
 
@@ -427,6 +427,6 @@ FUN_02002EEC: ; 0x02002EEC
 	mov r0, #0xe
 	mov r1, #0x7
 	add r2, r4, #0x0
-	bl FUN_02006930
+	bl GfGfxLoader_GXLoadPal
 	add sp, #0x8
 	pop {r4, pc}
diff --git a/arm9/asm/unk_02002F08.s b/arm9/asm/unk_02002F08.s
index c37869ed..fb6f96ff 100644
--- a/arm9/asm/unk_02002F08.s
+++ b/arm9/asm/unk_02002F08.s
@@ -226,7 +226,7 @@ FUN_02003084: ; 0x02003084
 	add r1, r2, #0x0
 	add r2, sp, #0x4
 	ldr r4, [sp, #0x1c]
-	bl FUN_02006C08
+	bl GfGfxLoader_GetPlttData
 	add r6, r0, #0x0
 	bne _0200309E
 	bl GF_AssertFail
diff --git a/arm9/asm/unk_020030E8.s b/arm9/asm/unk_020030E8.s
index 30d0ea43..f9b9de1f 100644
--- a/arm9/asm/unk_020030E8.s
+++ b/arm9/asm/unk_020030E8.s
@@ -72,7 +72,7 @@ FUN_0200317C: ; 0x0200317C
 	add r5, r3, #0x0
 	add r2, sp, #0x0
 	add r3, r4, #0x0
-	bl FUN_02006C08
+	bl GfGfxLoader_GetPlttData
 	add r4, r0, #0x0
 	bne _02003192
 	bl GF_AssertFail
@@ -1387,7 +1387,7 @@ FUN_02003B40: ; 0x02003B40
 	add r0, r1, #0x0
 	add r1, r2, #0x0
 	add r2, sp, #0x4
-	bl FUN_02006C08
+	bl GfGfxLoader_GetPlttData
 	add r4, r0, #0x0
 	bne _02003B58
 	bl GF_AssertFail
diff --git a/arm9/asm/unk_02006864.s b/arm9/asm/unk_02006864.s
deleted file mode 100644
index 75adbe92..00000000
--- a/arm9/asm/unk_02006864.s
+++ /dev/null
@@ -1,698 +0,0 @@
-    .include "asm/macros.inc"
-    .include "global.inc"
-
-	.section .rodata
-
-	.global UNK_020ECB98
-UNK_020ECB98: ; 0x020ECB98
-	.word NNS_G2dLoadImage1DMapping
-	.word NNS_G2dLoadImage2DMapping
-
-	.global UNK_020ECBA0
-UNK_020ECBA0: ; 0x020ECBA0
-	.word GX_LoadOBJ, GXS_LoadOBJ
-
-	.global UNK_020ECBA8
-UNK_020ECBA8: ; 0x020ECBA8
-	.word NNS_G2dLoadImage1DMapping, NNS_G2dLoadImage2DMapping
-
-	.global UNK_020ECBB0
-UNK_020ECBB0: ; 0x020ECBB0
-	.word GX_LoadBGPltt, GX_LoadOBJPltt, GX_LoadBGExtPltt, GX_LoadOBJExtPltt
-	.word GXS_LoadBGPltt, GXS_LoadOBJPltt, GXS_LoadBGExtPltt, GXS_LoadOBJExtPltt
-
-	.text
-
-	thumb_func_start FUN_0200687C
-FUN_0200687C: ; 0x0200687C
-	push {r3-r7, lr}
-	sub sp, #0x8
-	add r6, r2, #0x0
-	mov r2, #0x0
-	add r5, r3, #0x0
-	str r2, [sp, #0x0]
-	ldr r2, [sp, #0x28]
-	ldr r3, [sp, #0x2c]
-	ldr r4, [sp, #0x24]
-	bl UncompressFromNarc
-	add r7, r0, #0x0
-	beq _020068C2
-	add r1, sp, #0x4
-	bl NNS_G2dGetUnpackedBGCharacterData
-	cmp r0, #0x0
-	beq _020068BC
-	cmp r4, #0x0
-	bne _020068A8
-	ldr r0, [sp, #0x4]
-	ldr r4, [r0, #0x10]
-_020068A8:
-	ldr r0, [sp, #0x20]
-	lsl r1, r5, #0x18
-	str r0, [sp, #0x0]
-	ldr r2, [sp, #0x4]
-	add r0, r6, #0x0
-	ldr r2, [r2, #0x14]
-	lsr r1, r1, #0x18
-	add r3, r4, #0x0
-	bl FUN_02017E14
-_020068BC:
-	add r0, r7, #0x0
-	bl FreeToHeap
-_020068C2:
-	add r0, r4, #0x0
-	add sp, #0x8
-	pop {r3-r7, pc}
-
-	thumb_func_start FUN_020068C8
-FUN_020068C8: ; 0x020068C8
-	push {r3-r7, lr}
-	sub sp, #0x8
-	add r6, r2, #0x0
-	mov r2, #0x1
-	add r5, r3, #0x0
-	str r2, [sp, #0x0]
-	ldr r2, [sp, #0x28]
-	ldr r3, [sp, #0x2c]
-	ldr r4, [sp, #0x24]
-	bl UncompressFromNarc
-	add r7, r0, #0x0
-	beq _0200692C
-	add r1, sp, #0x4
-	bl NNS_G2dGetUnpackedScreenData
-	cmp r0, #0x0
-	beq _02006926
-	cmp r4, #0x0
-	bne _020068F4
-	ldr r0, [sp, #0x4]
-	ldr r4, [r0, #0x8]
-_020068F4:
-	lsl r1, r5, #0x18
-	add r0, r6, #0x0
-	lsr r1, r1, #0x18
-	bl FUN_0201886C
-	cmp r0, #0x0
-	beq _02006912
-	ldr r2, [sp, #0x4]
-	lsl r1, r5, #0x18
-	add r0, r6, #0x0
-	lsr r1, r1, #0x18
-	add r2, #0xc
-	add r3, r4, #0x0
-	bl FUN_02017DFC
-_02006912:
-	ldr r0, [sp, #0x20]
-	lsl r1, r5, #0x18
-	str r0, [sp, #0x0]
-	ldr r2, [sp, #0x4]
-	add r0, r6, #0x0
-	lsr r1, r1, #0x18
-	add r2, #0xc
-	add r3, r4, #0x0
-	bl FUN_02017CE8
-_02006926:
-	add r0, r7, #0x0
-	bl FreeToHeap
-_0200692C:
-	add sp, #0x8
-	pop {r3-r7, pc}
-
-	thumb_func_start FUN_02006930
-FUN_02006930: ; 0x02006930
-	push {lr}
-	sub sp, #0xc
-	str r3, [sp, #0x0]
-	ldr r3, [sp, #0x10]
-	str r3, [sp, #0x4]
-	ldr r3, [sp, #0x14]
-	str r3, [sp, #0x8]
-	mov r3, #0x0
-	bl FUN_02006948
-	add sp, #0xc
-	pop {pc}
-
-	thumb_func_start FUN_02006948
-FUN_02006948: ; 0x02006948
-	push {r4-r7, lr}
-	sub sp, #0xc
-	add r4, r2, #0x0
-	add r7, r3, #0x0
-	mov r2, #0x1
-	str r2, [sp, #0x0]
-	ldr r3, [sp, #0x28]
-	mov r2, #0x0
-	ldr r6, [sp, #0x20]
-	ldr r5, [sp, #0x24]
-	bl UncompressFromNarc
-	str r0, [sp, #0x4]
-	cmp r0, #0x0
-	beq _02006A2A
-	add r1, sp, #0x8
-	bl NNS_G2dGetUnpackedPaletteData
-	cmp r0, #0x0
-	beq _02006A24
-	ldr r0, [sp, #0x8]
-	ldr r1, [r0, #0xc]
-	add r1, r1, r7
-	str r1, [r0, #0xc]
-	cmp r5, #0x0
-	bne _02006982
-	ldr r0, [sp, #0x8]
-	ldr r0, [r0, #0x8]
-	sub r5, r0, r7
-_02006982:
-	ldr r0, [sp, #0x8]
-	add r1, r5, #0x0
-	ldr r0, [r0, #0xc]
-	bl DC_FlushRange
-	cmp r4, #0x7
-	bhi _02006A14
-	add r0, r4, r4
-	add r0, pc
-	ldrh r0, [r0, #0x6]
-	lsl r0, r0, #0x10
-	asr r0, r0, #0x10
-	add pc, r0
-_0200699C: ; jump table (using 16-bit offset)
-	.short _02006A14 - _0200699C - 2; case 0
-	.short _02006A14 - _0200699C - 2; case 1
-	.short _020069AC - _0200699C - 2; case 2
-	.short _020069E0 - _0200699C - 2; case 3
-	.short _02006A14 - _0200699C - 2; case 4
-	.short _02006A14 - _0200699C - 2; case 5
-	.short _020069C6 - _0200699C - 2; case 6
-	.short _020069FA - _0200699C - 2; case 7
-_020069AC:
-	bl GX_BeginLoadBGExtPltt
-	ldr r0, [sp, #0x8]
-	ldr r3, _02006A30 ; =UNK_020ECBB0
-	lsl r4, r4, #0x2
-	ldr r0, [r0, #0xc]
-	ldr r3, [r3, r4]
-	add r1, r6, #0x0
-	add r2, r5, #0x0
-	blx r3
-	bl GX_EndLoadBGExtPltt
-	b _02006A24
-_020069C6:
-	bl GXS_BeginLoadBGExtPltt
-	ldr r0, [sp, #0x8]
-	ldr r3, _02006A30 ; =UNK_020ECBB0
-	lsl r4, r4, #0x2
-	ldr r0, [r0, #0xc]
-	ldr r3, [r3, r4]
-	add r1, r6, #0x0
-	add r2, r5, #0x0
-	blx r3
-	bl GXS_EndLoadBGExtPltt
-	b _02006A24
-_020069E0:
-	bl GX_BeginLoadOBJExtPltt
-	ldr r0, [sp, #0x8]
-	ldr r3, _02006A30 ; =UNK_020ECBB0
-	lsl r4, r4, #0x2
-	ldr r0, [r0, #0xc]
-	ldr r3, [r3, r4]
-	add r1, r6, #0x0
-	add r2, r5, #0x0
-	blx r3
-	bl GX_EndLoadOBJExtPltt
-	b _02006A24
-_020069FA:
-	bl GXS_BeginLoadOBJExtPltt
-	ldr r0, [sp, #0x8]
-	ldr r3, _02006A30 ; =UNK_020ECBB0
-	lsl r4, r4, #0x2
-	ldr r0, [r0, #0xc]
-	ldr r3, [r3, r4]
-	add r1, r6, #0x0
-	add r2, r5, #0x0
-	blx r3
-	bl GXS_EndLoadOBJExtPltt
-	b _02006A24
-_02006A14:
-	ldr r0, [sp, #0x8]
-	ldr r3, _02006A30 ; =UNK_020ECBB0
-	lsl r4, r4, #0x2
-	ldr r0, [r0, #0xc]
-	ldr r3, [r3, r4]
-	add r1, r6, #0x0
-	add r2, r5, #0x0
-	blx r3
-_02006A24:
-	ldr r0, [sp, #0x4]
-	bl FreeToHeap
-_02006A2A:
-	add sp, #0xc
-	pop {r4-r7, pc}
-	nop
-_02006A30: .word UNK_020ECBB0
-
-	thumb_func_start FUN_02006A34
-FUN_02006A34: ; 0x02006A34
-	push {r3-r7, lr}
-	sub sp, #0x8
-	add r5, r2, #0x0
-	mov r2, #0x1
-	add r6, r3, #0x0
-	str r2, [sp, #0x0]
-	ldr r2, [sp, #0x24]
-	ldr r3, [sp, #0x28]
-	ldr r4, [sp, #0x20]
-	bl UncompressFromNarc
-	add r7, r0, #0x0
-	beq _02006A80
-	add r1, sp, #0x4
-	bl NNS_G2dGetUnpackedCharacterData
-	cmp r0, #0x0
-	beq _02006A7A
-	cmp r4, #0x0
-	bne _02006A60
-	ldr r0, [sp, #0x4]
-	ldr r4, [r0, #0x10]
-_02006A60:
-	ldr r0, [sp, #0x4]
-	add r1, r4, #0x0
-	ldr r0, [r0, #0x14]
-	bl DC_FlushRange
-	ldr r0, [sp, #0x4]
-	ldr r3, _02006A88 ; =UNK_020ECBA0
-	lsl r5, r5, #0x2
-	ldr r0, [r0, #0x14]
-	ldr r3, [r3, r5]
-	add r1, r6, #0x0
-	add r2, r4, #0x0
-	blx r3
-_02006A7A:
-	add r0, r7, #0x0
-	bl FreeToHeap
-_02006A80:
-	add r0, r4, #0x0
-	add sp, #0x8
-	pop {r3-r7, pc}
-	nop
-_02006A88: .word UNK_020ECBA0
-
-	thumb_func_start FUN_02006A8C
-FUN_02006A8C: ; 0x02006A8C
-	push {r4-r7, lr}
-	sub sp, #0xc
-	add r5, r2, #0x0
-	add r4, r3, #0x0
-	mov r2, #0x1
-	str r2, [sp, #0x0]
-	ldr r3, [sp, #0x20]
-	mov r2, #0x0
-	bl UncompressFromNarc
-	add r6, r0, #0x0
-	beq _02006AE0
-	add r1, sp, #0x4
-	bl NNS_G2dGetUnpackedPaletteCompressInfo
-	add r7, r0, #0x0
-	add r0, r6, #0x0
-	add r1, sp, #0x8
-	bl NNS_G2dGetUnpackedPaletteData
-	cmp r0, #0x0
-	beq _02006ADA
-	cmp r7, #0x0
-	beq _02006ACE
-	ldr r0, [sp, #0x24]
-	add r2, r4, #0x0
-	str r0, [sp, #0x0]
-	ldr r0, [sp, #0x8]
-	ldr r1, [sp, #0x4]
-	add r3, r5, #0x0
-	bl NNS_G2dLoadPaletteEx
-	b _02006ADA
-_02006ACE:
-	ldr r0, [sp, #0x8]
-	ldr r3, [sp, #0x24]
-	add r1, r4, #0x0
-	add r2, r5, #0x0
-	bl NNS_G2dLoadPalette
-_02006ADA:
-	add r0, r6, #0x0
-	bl FreeToHeap
-_02006AE0:
-	add sp, #0xc
-	pop {r4-r7, pc}
-
-	thumb_func_start FUN_02006AE4
-FUN_02006AE4: ; 0x02006AE4
-	push {r4-r6, lr}
-	sub sp, #0x8
-	add r5, r3, #0x0
-	mov r3, #0x1
-	str r3, [sp, #0x0]
-	ldr r3, [sp, #0x24]
-	bl UncompressFromNarc
-	add r6, r0, #0x0
-	ldr r4, _02006B30 ; =0x00000000
-	beq _02006B28
-	add r1, sp, #0x4
-	bl NNS_G2dGetUnpackedCharacterData
-	cmp r0, #0x0
-	beq _02006B22
-	ldr r1, [sp, #0x18]
-	cmp r1, #0x0
-	beq _02006B0E
-	ldr r0, [sp, #0x4]
-	str r1, [r0, #0x10]
-_02006B0E:
-	ldr r4, _02006B34 ; =UNK_020ECBA8
-	lsl r5, r5, #0x2
-	ldr r0, [sp, #0x4]
-	ldr r1, [sp, #0x20]
-	ldr r2, [sp, #0x1c]
-	ldr r3, [sp, #0x28]
-	ldr r4, [r4, r5]
-	blx r4
-	ldr r0, [sp, #0x4]
-	ldr r4, [r0, #0x10]
-_02006B22:
-	add r0, r6, #0x0
-	bl FreeToHeap
-_02006B28:
-	add r0, r4, #0x0
-	add sp, #0x8
-	pop {r4-r6, pc}
-	nop
-_02006B30: .word 0x00000000
-_02006B34: .word UNK_020ECBA8
-
-	thumb_func_start FUN_02006B38
-FUN_02006B38: ; 0x02006B38
-	push {r4-r6, lr}
-	sub sp, #0x8
-	add r5, r3, #0x0
-	mov r3, #0x1
-	str r3, [sp, #0x0]
-	ldr r3, [sp, #0x24]
-	bl UncompressFromNarc
-	add r4, r0, #0x0
-	beq _02006B9E
-	add r1, sp, #0x4
-	bl NNS_G2dGetUnpackedCharacterData
-	cmp r0, #0x0
-	beq _02006B98
-	ldr r1, [sp, #0x18]
-	cmp r1, #0x0
-	beq _02006B60
-	ldr r0, [sp, #0x4]
-	str r1, [r0, #0x10]
-_02006B60:
-	ldr r0, [sp, #0x1c]
-	cmp r0, #0x1
-	beq _02006B6C
-	cmp r0, #0x2
-	beq _02006B7C
-	b _02006B88
-_02006B6C:
-	mov r0, #0x1
-	lsl r0, r0, #0x1a
-	ldr r1, [r0, #0x0]
-	ldr r0, _02006BA4 ; =0x00300010
-	and r1, r0
-	ldr r0, [sp, #0x4]
-	str r1, [r0, #0x8]
-	b _02006B88
-_02006B7C:
-	ldr r0, _02006BA8 ; =0x04001000
-	ldr r1, [r0, #0x0]
-	ldr r0, _02006BA4 ; =0x00300010
-	and r1, r0
-	ldr r0, [sp, #0x4]
-	str r1, [r0, #0x8]
-_02006B88:
-	lsl r6, r5, #0x2
-	ldr r5, _02006BAC ; =UNK_020ECB98
-	ldr r0, [sp, #0x4]
-	ldr r1, [sp, #0x20]
-	ldr r2, [sp, #0x1c]
-	ldr r3, [sp, #0x28]
-	ldr r5, [r5, r6]
-	blx r5
-_02006B98:
-	add r0, r4, #0x0
-	bl FreeToHeap
-_02006B9E:
-	add sp, #0x8
-	pop {r4-r6, pc}
-	nop
-_02006BA4: .word 0x00300010
-_02006BA8: .word 0x04001000
-_02006BAC: .word UNK_020ECB98
-
-	thumb_func_start FUN_02006BB0
-FUN_02006BB0: ; 0x02006BB0
-	push {r3-r5, lr}
-	add r4, r3, #0x0
-	mov r3, #0x0
-	str r3, [sp, #0x0]
-	ldr r3, [sp, #0x10]
-	bl UncompressFromNarc
-	add r5, r0, #0x0
-	beq _02006BD6
-	add r1, r4, #0x0
-	bl NNS_G2dGetUnpackedBGCharacterData
-	cmp r0, #0x0
-	bne _02006BD6
-	add r0, r5, #0x0
-	bl FreeToHeap
-	mov r0, #0x0
-	pop {r3-r5, pc}
-_02006BD6:
-	add r0, r5, #0x0
-	pop {r3-r5, pc}
-	.balign 4
-
-	thumb_func_start FUN_02006BDC
-FUN_02006BDC: ; 0x02006BDC
-	push {r3-r5, lr}
-	add r4, r3, #0x0
-	mov r3, #0x0
-	str r3, [sp, #0x0]
-	ldr r3, [sp, #0x10]
-	bl UncompressFromNarc
-	add r5, r0, #0x0
-	beq _02006C02
-	add r1, r4, #0x0
-	bl NNS_G2dGetUnpackedScreenData
-	cmp r0, #0x0
-	bne _02006C02
-	add r0, r5, #0x0
-	bl FreeToHeap
-	mov r0, #0x0
-	pop {r3-r5, pc}
-_02006C02:
-	add r0, r5, #0x0
-	pop {r3-r5, pc}
-	.balign 4
-
-	thumb_func_start FUN_02006C08
-FUN_02006C08: ; 0x02006C08
-	push {r3-r5, lr}
-	add r5, r2, #0x0
-	mov r2, #0x0
-	str r2, [sp, #0x0]
-	bl UncompressFromNarc
-	add r4, r0, #0x0
-	beq _02006C2C
-	add r1, r5, #0x0
-	bl NNS_G2dGetUnpackedPaletteData
-	cmp r0, #0x0
-	bne _02006C2C
-	add r0, r4, #0x0
-	bl FreeToHeap
-	mov r0, #0x0
-	pop {r3-r5, pc}
-_02006C2C:
-	add r0, r4, #0x0
-	pop {r3-r5, pc}
-
-	thumb_func_start FUN_02006C30
-FUN_02006C30: ; 0x02006C30
-	push {r3-r5, lr}
-	add r4, r3, #0x0
-	mov r3, #0x0
-	str r3, [sp, #0x0]
-	ldr r3, [sp, #0x10]
-	bl UncompressFromNarc
-	add r5, r0, #0x0
-	beq _02006C56
-	add r1, r4, #0x0
-	bl NNS_G2dGetUnpackedCellBank
-	cmp r0, #0x0
-	bne _02006C56
-	add r0, r5, #0x0
-	bl FreeToHeap
-	mov r0, #0x0
-	pop {r3-r5, pc}
-_02006C56:
-	add r0, r5, #0x0
-	pop {r3-r5, pc}
-	.balign 4
-
-	thumb_func_start FUN_02006C5C
-FUN_02006C5C: ; 0x02006C5C
-	push {r3-r5, lr}
-	add r4, r3, #0x0
-	mov r3, #0x0
-	str r3, [sp, #0x0]
-	ldr r3, [sp, #0x10]
-	bl UncompressFromNarc
-	add r5, r0, #0x0
-	beq _02006C82
-	add r1, r4, #0x0
-	bl NNS_G2dGetUnpackedAnimBank
-	cmp r0, #0x0
-	bne _02006C82
-	add r0, r5, #0x0
-	bl FreeToHeap
-	mov r0, #0x0
-	pop {r3-r5, pc}
-_02006C82:
-	add r0, r5, #0x0
-	pop {r3-r5, pc}
-	.balign 4
-
-	thumb_func_start FUN_02006C88
-FUN_02006C88: ; 0x02006C88
-	push {r3, lr}
-	add r3, r2, #0x0
-	mov r2, #0x0
-	str r2, [sp, #0x0]
-	mov r2, #0x1
-	bl UncompressFromNarc
-	pop {r3, pc}
-
-	thumb_func_start UncompressFromNarc
-UncompressFromNarc: ; 0x02006C98
-	; void * UncompressFromNarc(NarcId narcId, s32 memberNo, BOOL isCompressed, u32 heap_id, BOOL allocAtEnd)
-	push {r3-r7, lr}
-	add r5, r2, #0x0
-	add r7, r0, #0x0
-	add r6, r3, #0x0
-	str r1, [sp, #0x0]
-	cmp r5, #0x0
-	bne _02006CAC
-	ldr r2, [sp, #0x18]
-	cmp r2, #0x1
-	bne _02006CC0
-_02006CAC:
-	ldr r1, [sp, #0x0]
-	add r0, r7, #0x0
-	bl GetNarcMemberSizeByIdPair
-	add r1, r0, #0x0
-	add r0, r6, #0x0
-	bl AllocFromHeapAtEnd
-	add r4, r0, #0x0
-	b _02006CCE
-_02006CC0:
-	bl GetNarcMemberSizeByIdPair
-	add r1, r0, #0x0
-	add r0, r6, #0x0
-	bl AllocFromHeap
-	add r4, r0, #0x0
-_02006CCE:
-	cmp r4, #0x0
-	beq _02006D12
-	ldr r2, [sp, #0x0]
-	add r0, r4, #0x0
-	add r1, r7, #0x0
-	bl ReadWholeNarcMemberByIdPair
-	cmp r5, #0x0
-	beq _02006D12
-	ldr r0, [sp, #0x18]
-	cmp r0, #0x0
-	bne _02006CF2
-	ldr r1, [r4, #0x0]
-	add r0, r6, #0x0
-	lsr r1, r1, #0x8
-	bl AllocFromHeap
-	b _02006CFC
-_02006CF2:
-	ldr r1, [r4, #0x0]
-	add r0, r6, #0x0
-	lsr r1, r1, #0x8
-	bl AllocFromHeapAtEnd
-_02006CFC:
-	add r5, r0, #0x0
-	cmp r5, #0x0
-	beq _02006D10
-	add r0, r4, #0x0
-	add r1, r5, #0x0
-	bl MI_UncompressLZ8
-	add r0, r4, #0x0
-	bl FreeToHeap
-_02006D10:
-	add r4, r5, #0x0
-_02006D12:
-	add r0, r4, #0x0
-	pop {r3-r7, pc}
-	.balign 4
-
-	thumb_func_start FUN_02006D18
-FUN_02006D18: ; 0x02006D18
-	push {r3-r7, lr}
-	sub sp, #0x8
-	ldr r5, [sp, #0x24]
-	str r0, [sp, #0x0]
-	str r1, [sp, #0x4]
-	add r6, r2, #0x0
-	add r7, r3, #0x0
-	bl GetNarcMemberSizeByIdPair
-	str r0, [r5, #0x0]
-	cmp r6, #0x0
-	bne _02006D36
-	ldr r0, [sp, #0x20]
-	cmp r0, #0x1
-	bne _02006D42
-_02006D36:
-	ldr r1, [r5, #0x0]
-	add r0, r7, #0x0
-	bl AllocFromHeapAtEnd
-	add r4, r0, #0x0
-	b _02006D4C
-_02006D42:
-	ldr r1, [r5, #0x0]
-	add r0, r7, #0x0
-	bl AllocFromHeap
-	add r4, r0, #0x0
-_02006D4C:
-	cmp r4, #0x0
-	beq _02006D92
-	ldr r1, [sp, #0x0]
-	ldr r2, [sp, #0x4]
-	add r0, r4, #0x0
-	bl ReadWholeNarcMemberByIdPair
-	cmp r6, #0x0
-	beq _02006D92
-	ldr r0, [r4, #0x0]
-	lsr r0, r0, #0x8
-	str r0, [r5, #0x0]
-	ldr r0, [sp, #0x20]
-	cmp r0, #0x0
-	bne _02006D74
-	ldr r1, [r5, #0x0]
-	add r0, r7, #0x0
-	bl AllocFromHeap
-	b _02006D7C
-_02006D74:
-	ldr r1, [r5, #0x0]
-	add r0, r7, #0x0
-	bl AllocFromHeapAtEnd
-_02006D7C:
-	add r5, r0, #0x0
-	cmp r5, #0x0
-	beq _02006D90
-	add r0, r4, #0x0
-	add r1, r5, #0x0
-	bl MI_UncompressLZ8
-	add r0, r4, #0x0
-	bl FreeToHeap
-_02006D90:
-	add r4, r5, #0x0
-_02006D92:
-	add r0, r4, #0x0
-	add sp, #0x8
-	pop {r3-r7, pc}
diff --git a/arm9/asm/unk_02008DEC.s b/arm9/asm/unk_02008DEC.s
index 92341f16..31aabcc3 100644
--- a/arm9/asm/unk_02008DEC.s
+++ b/arm9/asm/unk_02008DEC.s
@@ -1604,7 +1604,7 @@ FUN_02009978: ; 0x02009978
 	add r1, r3, #0x0
 	ldr r2, [sp, #0x10]
 	ldr r3, [sp, #0x24]
-	bl UncompressFromNarc
+	bl GfGfxLoader_LoadFromNarc
 	add r1, r0, #0x0
 	ldr r0, [r5, #0x0]
 	ldr r2, [sp, #0x14]
diff --git a/arm9/asm/unk_0200CABC.s b/arm9/asm/unk_0200CABC.s
index bf4889d8..9e8b3189 100644
--- a/arm9/asm/unk_0200CABC.s
+++ b/arm9/asm/unk_0200CABC.s
@@ -42,7 +42,7 @@ FUN_0200CABC: ; 0x0200CABC
 	mov r0, #0x26
 	add r2, r5, #0x0
 	add r3, r4, #0x0
-	bl FUN_0200687C
+	bl GfGfxLoader_LoadCharData
 	add sp, #0x10
 	pop {r3-r5, pc}
 _0200CAE2:
@@ -55,7 +55,7 @@ _0200CAE2:
 	mov r0, #0x26
 	add r2, r5, #0x0
 	add r3, r4, #0x0
-	bl FUN_0200687C
+	bl GfGfxLoader_LoadCharData
 	add sp, #0x10
 	pop {r3-r5, pc}
 
@@ -89,7 +89,7 @@ _0200CB18:
 	str r0, [sp, #0xc]
 	mov r0, #0x26
 	add r3, r5, #0x0
-	bl FUN_0200687C
+	bl GfGfxLoader_LoadCharData
 	add r0, sp, #0x10
 	ldrb r0, [r0, #0x10]
 	cmp r0, #0x2
@@ -108,7 +108,7 @@ _0200CB3C:
 	str r0, [sp, #0x4]
 	mov r0, #0x26
 	lsl r3, r4, #0x5
-	bl FUN_02006930
+	bl GfGfxLoader_GXLoadPal
 	add sp, #0x10
 	pop {r4-r6, pc}
 _0200CB56:
@@ -119,7 +119,7 @@ _0200CB56:
 	str r0, [sp, #0x4]
 	mov r0, #0x26
 	lsl r3, r4, #0x5
-	bl FUN_02006930
+	bl GfGfxLoader_GXLoadPal
 	add sp, #0x10
 	pop {r4-r6, pc}
 
@@ -394,7 +394,7 @@ FUN_0200CD68: ; 0x0200CD68
 	str r0, [sp, #0xc]
 	mov r0, #0x26
 	add r3, r5, #0x0
-	bl FUN_0200687C
+	bl GfGfxLoader_LoadCharData
 	cmp r5, #0x4
 	bhs _0200CDB8
 	add r0, r7, #0x0
@@ -407,7 +407,7 @@ FUN_0200CD68: ; 0x0200CD68
 	str r0, [sp, #0x4]
 	mov r0, #0x26
 	lsl r3, r4, #0x5
-	bl FUN_02006930
+	bl GfGfxLoader_GXLoadPal
 	add sp, #0x14
 	pop {r4-r7, pc}
 _0200CDB8:
@@ -421,7 +421,7 @@ _0200CDB8:
 	str r0, [sp, #0x4]
 	mov r0, #0x26
 	lsl r3, r4, #0x5
-	bl FUN_02006930
+	bl GfGfxLoader_GXLoadPal
 	add sp, #0x14
 	pop {r4-r7, pc}
 	.balign 4
@@ -908,7 +908,7 @@ FUN_0200D18C: ; 0x0200D18C
 	mov r1, #0x16
 	mov r2, #0x0
 	add r3, sp, #0x3c
-	bl FUN_02006BB0
+	bl GfGfxLoader_GetCharData
 	str r0, [sp, #0x2c]
 	ldr r0, [sp, #0x3c]
 	mov r7, #0x0
@@ -1006,7 +1006,7 @@ FUN_0200D274: ; 0x0200D274
 	str r0, [sp, #0x0]
 	mov r0, #0x26
 	add r3, sp, #0x10
-	bl FUN_02006BB0
+	bl GfGfxLoader_GetCharData
 	str r0, [sp, #0xc]
 	mov r1, #0x9
 	ldr r0, [sp, #0x2c]
@@ -1077,7 +1077,7 @@ FUN_0200D300: ; 0x0200D300
 	mov r0, #0x24
 	add r3, r6, #0x0
 	str r4, [sp, #0xc]
-	bl FUN_0200687C
+	bl GfGfxLoader_LoadCharData
 	mov r0, #0x24 ; NARC_GRAPHIC_FIELD_BOARD
 	mov r1, #0x1
 	add r2, r4, #0x0
@@ -1144,7 +1144,7 @@ _0200D390:
 	str r0, [sp, #0xc]
 	mov r0, #0x24
 	add r3, r4, #0x0
-	bl FUN_0200687C
+	bl GfGfxLoader_LoadCharData
 	add sp, #0x10
 	pop {r3-r5, pc}
 
@@ -1792,7 +1792,7 @@ _0200D8DA:
 	mov r0, #0x26
 	mov r2, #0x0
 	add r3, sp, #0x30
-	bl FUN_02006BB0
+	bl GfGfxLoader_GetCharData
 	mov r2, #0x80
 	add r5, r0, #0x0
 	str r2, [sp, #0x0]
diff --git a/arm9/asm/unk_02011744.s b/arm9/asm/unk_02011744.s
index 8ee30228..bc9652c8 100644
--- a/arm9/asm/unk_02011744.s
+++ b/arm9/asm/unk_02011744.s
@@ -46,7 +46,7 @@ _02011766:
 	mov r2, #0x0
 	add r3, r4, #0x0
 	str r7, [sp, #0x0]
-	bl FUN_02006C30
+	bl GfGfxLoader_GetCellBank
 	str r0, [r5, #0x0]
 	cmp r0, #0x0
 	bne _0201177E
diff --git a/arm9/asm/unk_02014590.s b/arm9/asm/unk_02014590.s
index aa2f249b..189206a3 100644
--- a/arm9/asm/unk_02014590.s
+++ b/arm9/asm/unk_02014590.s
@@ -471,7 +471,7 @@ _020148EA:
 	ldr r0, [r5, #0x8]
 	ldr r1, [r7, #0xc]
 	add r3, r6, #0x0
-	bl FUN_02006BDC
+	bl GfGfxLoader_GetScrnData
 	str r0, [r4, #0x8]
 	ldr r0, [r4, #0x18]
 	ldr r1, [r5, #0x1c]
@@ -672,7 +672,7 @@ _02014A58:
 	add r0, r7, #0x0
 	mov r2, #0x1
 	add r3, r4, #0x4
-	bl FUN_02006BB0
+	bl GfGfxLoader_GetCharData
 	str r0, [r4, #0x8]
 	str r5, [r4, #0x0]
 	ldr r0, [sp, #0x20]
@@ -710,7 +710,7 @@ _02014AA6:
 	ldr r3, [sp, #0x1c]
 	add r0, r7, #0x0
 	add r2, r4, #0x0
-	bl FUN_02006C08
+	bl GfGfxLoader_GetPlttData
 	str r0, [r4, #0x4]
 	str r5, [r4, #0x8]
 	ldr r0, [sp, #0x18]
diff --git a/arm9/asm/unk_02048120.s b/arm9/asm/unk_02048120.s
index 96cfbab6..780c4833 100644
--- a/arm9/asm/unk_02048120.s
+++ b/arm9/asm/unk_02048120.s
@@ -49,7 +49,7 @@ FUN_02048120: ; 0x02048120
 	mov r1, #0x6
 	mov r2, #0x0
 	lsl r3, r3, #0x4
-	bl FUN_02006930
+	bl GfGfxLoader_GXLoadPal
 	add sp, #0x8
 	pop {r4, pc}
 	.balign 4
diff --git a/arm9/asm/unk_0205363C.s b/arm9/asm/unk_0205363C.s
index 2e5f334e..aa73064c 100644
--- a/arm9/asm/unk_0205363C.s
+++ b/arm9/asm/unk_0205363C.s
@@ -165,7 +165,7 @@ FUN_02053708: ; 0x02053708
 	mov r1, #0x7
 	add r2, sp, #0x0
 	add r3, r5, #0x0
-	bl FUN_02006C08
+	bl GfGfxLoader_GetPlttData
 	mov r1, #0x9
 	add r4, r0, #0x0
 	add r0, r5, #0x0
diff --git a/arm9/asm/unk_0206C700.s b/arm9/asm/unk_0206C700.s
index 3a2bfac6..4ba1b745 100644
--- a/arm9/asm/unk_0206C700.s
+++ b/arm9/asm/unk_0206C700.s
@@ -2365,7 +2365,7 @@ _0206DA26:
 	str r0, [sp, #0xc]
 	mov r0, #0x76
 	mov r3, #0x3
-	bl FUN_0200687C
+	bl GfGfxLoader_LoadCharData
 	mov r0, #0x0
 	str r0, [sp, #0x0]
 	str r0, [sp, #0x4]
@@ -2376,7 +2376,7 @@ _0206DA26:
 	str r0, [sp, #0xc]
 	mov r0, #0x76
 	mov r3, #0x3
-	bl FUN_020068C8
+	bl GfGfxLoader_LoadScrnData
 	mov r1, #0x0
 	str r1, [sp, #0x0]
 	mov r0, #0x40
@@ -2441,7 +2441,7 @@ _0206DA26:
 	mov r0, #0xc
 	add r2, r4, #0x0
 	mov r3, #0x4
-	bl FUN_0200687C
+	bl GfGfxLoader_LoadCharData
 	mov r0, #0x0
 	str r0, [sp, #0x0]
 	str r0, [sp, #0x4]
@@ -2453,7 +2453,7 @@ _0206DA26:
 	mov r0, #0xc
 	add r2, r4, #0x0
 	mov r3, #0x4
-	bl FUN_020068C8
+	bl GfGfxLoader_LoadScrnData
 	mov r0, #0x1
 	str r0, [sp, #0x0]
 	mov r0, #0x20
diff --git a/arm9/asm/unk_0206F3FC.s b/arm9/asm/unk_0206F3FC.s
index a50d92bf..17adb2d2 100644
--- a/arm9/asm/unk_0206F3FC.s
+++ b/arm9/asm/unk_0206F3FC.s
@@ -1256,7 +1256,7 @@ FUN_0206FD24: ; 0x0206FD24
 	mov r0, #0x14
 	mov r1, #0xf
 	mov r3, #0x3
-	bl FUN_0200687C
+	bl GfGfxLoader_LoadCharData
 	mov r0, #0x0
 	str r0, [sp, #0x0]
 	str r0, [sp, #0x4]
@@ -1267,7 +1267,7 @@ FUN_0206FD24: ; 0x0206FD24
 	mov r0, #0x14
 	mov r1, #0x11
 	mov r3, #0x3
-	bl FUN_020068C8
+	bl GfGfxLoader_LoadScrnData
 	mov r0, #0x14 ; NARC_GRAPHIC_PLIST_GRA
 	mov r1, #0x10
 	mov r2, #0xc
@@ -1331,7 +1331,7 @@ FUN_0206FD24: ; 0x0206FD24
 	mov r0, #0x14
 	mov r1, #0x3
 	mov r3, #0x4
-	bl FUN_0200687C
+	bl GfGfxLoader_LoadCharData
 	mov r3, #0x20
 	mov r1, #0x4
 	str r3, [sp, #0x0]
@@ -1339,7 +1339,7 @@ FUN_0206FD24: ; 0x0206FD24
 	str r0, [sp, #0x4]
 	mov r0, #0x14
 	add r2, r1, #0x0
-	bl FUN_02006930
+	bl GfGfxLoader_GXLoadPal
 	mov r0, #0x0
 	str r0, [sp, #0x0]
 	str r0, [sp, #0x4]
@@ -1349,7 +1349,7 @@ FUN_0206FD24: ; 0x0206FD24
 	ldr r2, [r5, #0x0]
 	mov r0, #0x14
 	mov r3, #0x5
-	bl FUN_0200687C
+	bl GfGfxLoader_LoadCharData
 	mov r0, #0x0
 	str r0, [sp, #0x0]
 	str r0, [sp, #0x4]
@@ -1360,7 +1360,7 @@ FUN_0206FD24: ; 0x0206FD24
 	mov r0, #0x14
 	mov r1, #0xe
 	mov r3, #0x5
-	bl FUN_020068C8
+	bl GfGfxLoader_LoadScrnData
 	mov r0, #0x20
 	str r0, [sp, #0x0]
 	mov r0, #0xc
@@ -1369,7 +1369,7 @@ FUN_0206FD24: ; 0x0206FD24
 	mov r1, #0xd
 	mov r2, #0x4
 	mov r3, #0x0
-	bl FUN_02006930
+	bl GfGfxLoader_GXLoadPal
 	mov r2, #0x99
 	lsl r2, r2, #0x2
 	mov r3, #0xf9
diff --git a/arm9/asm/unk_020772F0.s b/arm9/asm/unk_020772F0.s
index 34c0bc89..87e9cab0 100644
--- a/arm9/asm/unk_020772F0.s
+++ b/arm9/asm/unk_020772F0.s
@@ -2269,7 +2269,7 @@ FUN_02077FE8: ; 0x02077FE8
 	mov r0, #0x1f
 	add r2, r1, #0x0
 	add r3, r1, #0x0
-	bl FUN_02006930
+	bl GfGfxLoader_GXLoadPal
 	mov r0, #0x20
 	str r0, [sp, #0x0]
 	mov r0, #0x12
@@ -2278,7 +2278,7 @@ FUN_02077FE8: ; 0x02077FE8
 	add r1, r0, #0x0
 	mov r2, #0x4
 	mov r3, #0x0
-	bl FUN_02006930
+	bl GfGfxLoader_GXLoadPal
 	mov r0, #0x4
 	mov r1, #0x0
 	bl FUN_02017FE4
@@ -2295,7 +2295,7 @@ FUN_02077FE8: ; 0x02077FE8
 	mov r0, #0x1f
 	add r2, r4, #0x0
 	add r3, r1, #0x0
-	bl FUN_0200687C
+	bl GfGfxLoader_LoadCharData
 	mov r0, #0x0
 	str r0, [sp, #0x0]
 	mov r0, #0x6
@@ -2309,7 +2309,7 @@ FUN_02077FE8: ; 0x02077FE8
 	mov r1, #0x4
 	add r2, r4, #0x0
 	mov r3, #0x2
-	bl FUN_020068C8
+	bl GfGfxLoader_LoadScrnData
 	mov r0, #0x0
 	str r0, [sp, #0x0]
 	mov r0, #0x2
@@ -2322,7 +2322,7 @@ FUN_02077FE8: ; 0x02077FE8
 	mov r0, #0x1f
 	mov r1, #0x2
 	add r2, r4, #0x0
-	bl FUN_0200687C
+	bl GfGfxLoader_LoadCharData
 	mov r0, #0x0
 	str r0, [sp, #0x0]
 	mov r0, #0xe
@@ -2335,7 +2335,7 @@ FUN_02077FE8: ; 0x02077FE8
 	mov r0, #0x1f
 	mov r1, #0x6
 	add r2, r4, #0x0
-	bl FUN_020068C8
+	bl GfGfxLoader_LoadScrnData
 	mov r3, #0x0
 	mov r0, #0xe
 	str r3, [sp, #0x0]
@@ -2348,7 +2348,7 @@ FUN_02077FE8: ; 0x02077FE8
 	mov r0, #0x1f
 	mov r1, #0x7
 	add r2, r4, #0x0
-	bl FUN_020068C8
+	bl GfGfxLoader_LoadScrnData
 	mov r1, #0x6
 	mov r0, #0x0
 	lsl r1, r1, #0x6
@@ -2382,7 +2382,7 @@ FUN_02077FE8: ; 0x02077FE8
 	mov r1, #0x10
 	mov r2, #0x1
 	add r3, r5, r3
-	bl FUN_02006BB0
+	bl GfGfxLoader_GetCharData
 	ldr r1, _0207810C ; =0x000004AC
 	str r0, [r5, r1]
 	add sp, #0x10
@@ -2533,7 +2533,7 @@ _0207818C:
 	mov r0, #0x13
 	mov r2, #0x0
 	add r3, r5, r3
-	bl FUN_02006BB0
+	bl GfGfxLoader_GetCharData
 	ldr r1, _02078320 ; =0x000004B4
 	str r0, [r5, r1]
 	add r0, r1, #0x4
@@ -2547,7 +2547,7 @@ _0207818C:
 	lsl r2, r0, #0x6
 	add r2, r5, r2
 	mov r3, #0x12
-	bl FUN_02006C08
+	bl GfGfxLoader_GetPlttData
 	ldr r1, _02078324 ; =0x000004BC
 	str r0, [r5, r1]
 	add r0, r1, #0x4
@@ -3131,7 +3131,7 @@ _020786F0:
 	mov r0, #0x1f
 	add r1, r7, #0x6
 	add r3, r6, #0x0
-	bl FUN_020068C8
+	bl GfGfxLoader_LoadScrnData
 	add r0, r4, #0x0
 	add r1, r6, #0x0
 	bl FUN_02078BA8
@@ -3435,7 +3435,7 @@ FUN_0207890C: ; 0x0207890C
 	ldr r2, [r5, r2]
 	mov r0, #0x1f
 	mov r1, #0x9
-	bl FUN_020068C8
+	bl GfGfxLoader_LoadScrnData
 	mov r0, #0x46
 	mov r1, #0x4
 	lsl r0, r0, #0x4
diff --git a/arm9/asm/unk_02079C70.s b/arm9/asm/unk_02079C70.s
index 625807ae..3134a96c 100644
--- a/arm9/asm/unk_02079C70.s
+++ b/arm9/asm/unk_02079C70.s
@@ -551,7 +551,7 @@ FUN_0207A0CC: ; 0x0207A0CC
 	ldr r2, [r4, #0x0]
 	mov r0, #0x27
 	mov r3, #0x3
-	bl FUN_0200687C
+	bl GfGfxLoader_LoadCharData
 	mov r0, #0x0
 	str r0, [sp, #0x0]
 	str r0, [sp, #0x4]
@@ -562,7 +562,7 @@ FUN_0207A0CC: ; 0x0207A0CC
 	ldr r2, [r4, #0x0]
 	mov r0, #0x27
 	add r3, r1, #0x0
-	bl FUN_020068C8
+	bl GfGfxLoader_LoadScrnData
 	mov r2, #0x0
 	str r2, [sp, #0x0]
 	mov r0, #0x13
@@ -570,7 +570,7 @@ FUN_0207A0CC: ; 0x0207A0CC
 	mov r0, #0x27
 	mov r1, #0x1
 	add r3, r2, #0x0
-	bl FUN_02006930
+	bl GfGfxLoader_GXLoadPal
 	mov r0, #0x0
 	str r0, [sp, #0x0]
 	str r0, [sp, #0x4]
@@ -581,7 +581,7 @@ FUN_0207A0CC: ; 0x0207A0CC
 	mov r0, #0x27
 	mov r1, #0xb
 	mov r3, #0x2
-	bl FUN_020068C8
+	bl GfGfxLoader_LoadScrnData
 	mov r0, #0x0
 	str r0, [sp, #0x0]
 	str r0, [sp, #0x4]
@@ -592,7 +592,7 @@ FUN_0207A0CC: ; 0x0207A0CC
 	mov r0, #0x27
 	mov r1, #0x2
 	mov r3, #0x4
-	bl FUN_0200687C
+	bl GfGfxLoader_LoadCharData
 	mov r0, #0x0
 	str r0, [sp, #0x0]
 	str r0, [sp, #0x4]
@@ -603,7 +603,7 @@ FUN_0207A0CC: ; 0x0207A0CC
 	mov r0, #0x27
 	mov r1, #0x10
 	mov r3, #0x5
-	bl FUN_0200687C
+	bl GfGfxLoader_LoadCharData
 	mov r0, #0x0
 	str r0, [sp, #0x0]
 	str r0, [sp, #0x4]
@@ -614,7 +614,7 @@ FUN_0207A0CC: ; 0x0207A0CC
 	mov r0, #0x27
 	mov r1, #0xf
 	mov r3, #0x5
-	bl FUN_020068C8
+	bl GfGfxLoader_LoadScrnData
 	mov r3, #0x0
 	str r3, [sp, #0x0]
 	mov r0, #0x13
@@ -622,7 +622,7 @@ FUN_0207A0CC: ; 0x0207A0CC
 	mov r0, #0x27
 	mov r1, #0xe
 	mov r2, #0x4
-	bl FUN_02006930
+	bl GfGfxLoader_GXLoadPal
 	add sp, #0x10
 	pop {r4, pc}
 
diff --git a/arm9/asm/unk_020828BC.s b/arm9/asm/unk_020828BC.s
index 58dba10d..a64d7ab7 100644
--- a/arm9/asm/unk_020828BC.s
+++ b/arm9/asm/unk_020828BC.s
@@ -177,7 +177,7 @@ _0208292A:
 	mov r0, #0x5a
 	add r2, r1, #0x0
 	add r3, r5, #0x0
-	bl UncompressFromNarc
+	bl GfGfxLoader_LoadFromNarc
 	str r0, [sp, #0x14]
 	mov r0, #0x5a
 	mov r1, #0x0
@@ -513,7 +513,7 @@ FUN_02082B90: ; 0x02082B90
 	mov r0, #0x5a
 	mov r1, #0x2
 	mov r2, #0x0
-	bl UncompressFromNarc
+	bl GfGfxLoader_LoadFromNarc
 	str r0, [sp, #0x14]
 	ldr r1, _02082D10 ; =0x00000121
 	ldr r0, [sp, #0x8]
@@ -938,7 +938,7 @@ FUN_02082ED0: ; 0x02082ED0
 	add r2, r5, #0x0
 	add r4, r5, #0x0
 	str r1, [sp, #0x0]
-	bl UncompressFromNarc
+	bl GfGfxLoader_LoadFromNarc
 	str r0, [sp, #0x14]
 	mov r0, #0x5a
 	mov r1, #0x1
diff --git a/arm9/asm/unk_02086414.s b/arm9/asm/unk_02086414.s
index e5739d5b..54ce0190 100644
--- a/arm9/asm/unk_02086414.s
+++ b/arm9/asm/unk_02086414.s
@@ -772,7 +772,7 @@ FUN_0208699C: ; 0x0208699C
 	mov r0, #0x76
 	add r2, r5, #0x0
 	mov r3, #0x3
-	bl FUN_0200687C
+	bl GfGfxLoader_LoadCharData
 	mov r0, #0x0
 	str r0, [sp, #0x0]
 	str r0, [sp, #0x4]
@@ -783,7 +783,7 @@ FUN_0208699C: ; 0x0208699C
 	mov r0, #0x76
 	add r2, r5, #0x0
 	mov r3, #0x3
-	bl FUN_020068C8
+	bl GfGfxLoader_LoadScrnData
 	mov r1, #0x0
 	str r1, [sp, #0x0]
 	mov r0, #0x40
@@ -815,7 +815,7 @@ FUN_020869F0: ; 0x020869F0
 	mov r1, #0xa
 	add r2, r5, #0x0
 	mov r3, #0x4
-	bl FUN_0200687C
+	bl GfGfxLoader_LoadCharData
 	mov r0, #0x0
 	str r0, [sp, #0x0]
 	str r0, [sp, #0x4]
@@ -827,7 +827,7 @@ FUN_020869F0: ; 0x020869F0
 	mov r1, #0xb
 	add r2, r5, #0x0
 	mov r3, #0x4
-	bl FUN_020068C8
+	bl GfGfxLoader_LoadScrnData
 	mov r0, #0x1
 	str r0, [sp, #0x0]
 	mov r0, #0x20
diff --git a/arm9/asm/unk_02087A6C.s b/arm9/asm/unk_02087A6C.s
index c508e978..1ab7b908 100644
--- a/arm9/asm/unk_02087A6C.s
+++ b/arm9/asm/unk_02087A6C.s
@@ -249,7 +249,7 @@ FUN_02087C18: ; 0x02087C18
 	mov r0, #0x4b
 	add r2, r1, #0x0
 	str r1, [sp, #0x0]
-	bl UncompressFromNarc
+	bl GfGfxLoader_LoadFromNarc
 	pop {r3, pc}
 	.balign 4
 
@@ -261,7 +261,7 @@ FUN_02087C2C: ; 0x02087C2C
 	mov r0, #0x4b
 	mov r1, #0x1
 	str r2, [sp, #0x0]
-	bl UncompressFromNarc
+	bl GfGfxLoader_LoadFromNarc
 	pop {r3, pc}
 	.balign 4
 
@@ -277,14 +277,14 @@ FUN_02087C40: ; 0x02087C40
 	mov r0, #0x4b
 	mov r1, #0x9
 	add r3, r6, #0x0
-	bl UncompressFromNarc
+	bl GfGfxLoader_LoadFromNarc
 	str r0, [r5, #0x0]
 	mov r2, #0x0
 	mov r0, #0x4b
 	mov r1, #0xa
 	add r3, r6, #0x0
 	str r2, [sp, #0x0]
-	bl UncompressFromNarc
+	bl GfGfxLoader_LoadFromNarc
 	str r0, [r4, #0x0]
 	add sp, #0x4
 	pop {r3-r6, pc}
@@ -302,14 +302,14 @@ FUN_02087C70: ; 0x02087C70
 	mov r0, #0x4b
 	mov r1, #0x7
 	add r3, r6, #0x0
-	bl UncompressFromNarc
+	bl GfGfxLoader_LoadFromNarc
 	str r0, [r5, #0x0]
 	mov r2, #0x0
 	mov r0, #0x4b
 	mov r1, #0x8
 	add r3, r6, #0x0
 	str r2, [sp, #0x0]
-	bl UncompressFromNarc
+	bl GfGfxLoader_LoadFromNarc
 	str r0, [r4, #0x0]
 	add sp, #0x4
 	pop {r3-r6, pc}
@@ -327,14 +327,14 @@ FUN_02087CA0: ; 0x02087CA0
 	mov r0, #0x4b
 	mov r1, #0x5
 	add r3, r6, #0x0
-	bl UncompressFromNarc
+	bl GfGfxLoader_LoadFromNarc
 	str r0, [r5, #0x0]
 	mov r2, #0x0
 	mov r0, #0x4b
 	mov r1, #0x6
 	add r3, r6, #0x0
 	str r2, [sp, #0x0]
-	bl UncompressFromNarc
+	bl GfGfxLoader_LoadFromNarc
 	str r0, [r4, #0x0]
 	add sp, #0x4
 	pop {r3-r6, pc}
@@ -352,14 +352,14 @@ FUN_02087CD0: ; 0x02087CD0
 	mov r0, #0x4b
 	mov r1, #0x3
 	add r3, r6, #0x0
-	bl UncompressFromNarc
+	bl GfGfxLoader_LoadFromNarc
 	str r0, [r5, #0x0]
 	mov r2, #0x0
 	mov r0, #0x4b
 	mov r1, #0x4
 	add r3, r6, #0x0
 	str r2, [sp, #0x0]
-	bl UncompressFromNarc
+	bl GfGfxLoader_LoadFromNarc
 	str r0, [r4, #0x0]
 	add sp, #0x4
 	pop {r3-r6, pc}