Through FUN_02006AE4

1 files changed, 3 insertions, 282 deletions

diff --git a/arm9/asm/unk_02006864.s b/arm9/asm/unk_02006864.s
index d716ff8b..0a8b7bf3 100644
--- a/arm9/asm/unk_02006864.s
+++ b/arm9/asm/unk_02006864.s
@@ -1,291 +1,12 @@
     .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
+    .extern UNK_020ECB98
+    .extern UNK_020ECBA0
+    .extern UNK_020ECBA8
 
 	.text
 
-	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}