1 files changed, 6 insertions, 300 deletions
diff --git a/arm9/asm/FS_archive.asm.s b/arm9/asm/FS_archive.asm.s
index fd205e5a..ac647d7e 100644
--- a/arm9/asm/FS_archive.asm.s
+++ b/arm9/asm/FS_archive.asm.s
@@ -9,6 +9,12 @@
 	.extern FSi_NextCommand
 	.extern FSi_ExecuteAsyncCommand
 	.extern FSi_ExecuteSyncCommand
+	.extern FSi_SendCommand
+	.extern FS_InitArchive
+	.extern FS_FindArchive
+	.extern FS_RegisterArchiveName
+	.extern FS_ReleaseArchiveName
+	.extern FS_LoadArchive
 
 	arm_func_start FS_NotifyArchiveAsyncEnd
 FS_NotifyArchiveAsyncEnd: ; 0x020D0B40
@@ -322,303 +328,3 @@ _020D0F64:
 	mov r0, #0x1
 	ldmia sp!, {r4-r8,lr}
 	bx lr
-
-	arm_func_start FS_LoadArchive
-FS_LoadArchive: ; 0x020D0F78
-	str r1, [r0, #0x28]
-	str r3, [r0, #0x30]
-	str r2, [r0, #0x3c]
-	ldr r1, [r0, #0x3c]
-	ldr r2, [sp, #0x4]
-	str r1, [r0, #0x2c]
-	str r2, [r0, #0x38]
-	ldr r1, [sp, #0x0]
-	ldr r2, [sp, #0x8]
-	str r1, [r0, #0x40]
-	ldr r1, [r0, #0x40]
-	cmp r2, #0x0
-	str r1, [r0, #0x34]
-	ldreq r2, _020D0FE8 ; =FSi_ReadMemCallback
-	ldr r1, [sp, #0xc]
-	str r2, [r0, #0x48]
-	cmp r1, #0x0
-	ldreq r1, _020D0FEC ; =FSi_WriteMemCallback
-	str r1, [r0, #0x4c]
-	ldr r2, [r0, #0x48]
-	mov r1, #0x0
-	str r2, [r0, #0x50]
-	str r1, [r0, #0x44]
-	ldr r1, [r0, #0x1c]
-	orr r1, r1, #0x2
-	str r1, [r0, #0x1c]
-	mov r0, #0x1
-	bx lr
-	.balign 4
-_020D0FE8: .word FSi_ReadMemCallback
-_020D0FEC: .word FSi_WriteMemCallback
-
-	arm_func_start FUN_020D0FF0
-FUN_020D0FF0: ; 0x020D0FF0
-	stmdb sp!, {r4,lr}
-	mov r4, r0
-	ldr r0, [r4, #0x0]
-	cmp r0, #0x0
-	ldmeqia sp!, {r4,lr}
-	bxeq lr
-	bl OS_DisableInterrupts
-	ldr r2, [r4, #0x4]
-	mov r3, #0x0
-	cmp r2, #0x0
-	ldrne r1, [r4, #0x8]
-	strne r1, [r2, #0x8]
-	ldr r2, [r4, #0x8]
-	cmp r2, #0x0
-	ldrne r1, [r4, #0x4]
-	strne r1, [r2, #0x4]
-	str r3, [r4, #0x0]
-	str r3, [r4, #0x8]
-	ldr r1, [r4, #0x8]
-	ldr r2, _020D1080 ; =0x021D53EC
-	str r1, [r4, #0x4]
-	ldr r1, [r4, #0x1c]
-	bic r1, r1, #0x1
-	str r1, [r4, #0x1c]
-	ldr r1, [r2, #0x0]
-	cmp r1, r4
-	bne _020D1074
-	ldr r1, _020D1084 ; =0x021D53E8
-	str r3, [r2, #0x8]
-	ldr r1, [r1, #0x0]
-	strh r3, [r2, #0x6]
-	str r1, [r2, #0x0]
-	strh r3, [r2, #0x4]
-_020D1074:
-	bl OS_RestoreInterrupts
-	ldmia sp!, {r4,lr}
-	bx lr
-	.balign 4
-_020D1080: .word 0x021D53EC
-_020D1084: .word 0x021D53E8
-
-	arm_func_start FS_RegisterArchiveName
-FS_RegisterArchiveName: ; 0x020D1088
-	stmdb sp!, {r4-r8,lr}
-	mov r6, r1
-	mov r5, r2
-	mov r7, r0
-	mov r8, #0x0
-	bl OS_DisableInterrupts
-	mov r4, r0
-	mov r0, r6
-	mov r1, r5
-	bl FS_FindArchive
-_020D10B0:
-	cmp r0, #0x0
-	bne _020D112C
-	ldr r1, _020D1140
-	ldr r2, [r1]
-	cmp r2, #0x0
-	bne _020D10E8
-	ldr r0, _020D1144
-	mov r2, r8
-	str r7, [r1]
-	str r7, [r0]
-	str r2, [r0, #0x8]
-	strh r2, [r0, #0x6]
-	strh r2, [r0, #0x4]
-	b _020D110C
-_020D10E8:
-	ldr r0, [r2, #0x4]
-	cmp r0, #0x0
-	beq _020D1104
-_020D10F4:
-	mov r2, r0
-	ldr r0, [r0, #0x4]
-	cmp r0, #0x0
-	bne _020D10F4
-_020D1104:
-	str r7, [r2, #0x4]
-	str r2, [r7, #0x8]
-_020D110C:
-	mov r0, r6
-	mov r1, r5
-	bl FSi_GetPackedName
-	str r0, [r7]
-	ldr r0, [r7, #0x1C]
-	mov r8, #0x1
-	orr r0, r0, #0x1
-	str r0, [r7, #0x1C]
-_020D112C:
-	mov r0, r4
-	bl OS_RestoreInterrupts
-	mov r0, r8
-	ldmia sp!, {r4-r8,lr}
-	bx lr
-_020D1140: .word 0x021D53E8
-_020D1144: .word 0x021D53EC
-
-	arm_func_start FS_FindArchive
-FS_FindArchive:
-	stmdb sp!, {r4-r5,lr}
-	sub sp, sp, #0x4
-	bl FSi_GetPackedName
-	mov r5, r0
-	bl OS_DisableInterrupts
-	ldr r1, _020D1194 ; =0x021D53E8
-	ldr r4, [r1, #0x0]
-	b _020D116C
-_020D1168:
-	ldr r4, [r4, #0x4]
-_020D116C:
-	cmp r4, #0x0
-	beq _020D1180
-	ldr r1, [r4, #0x0]
-	cmp r1, r5
-	bne _020D1168
-_020D1180:
-	bl OS_RestoreInterrupts
-	mov r0, r4
-	add sp, sp, #0x4
-	ldmia sp!, {r4-r5,lr}
-	bx lr
-	.balign 4
-_020D1194: .word 0x021D53E8
-
-	arm_func_start FS_InitArchive
-FS_InitArchive: ; 0x020D1198
-	stmdb sp!, {r4,lr}
-	mov r1, #0x0
-	mov r2, #0x5c
-	mov r4, r0
-	bl MI_CpuFill8
-	mov r1, #0x0
-	str r1, [r4, #0x10]
-	ldr r0, [r4, #0x10]
-	str r0, [r4, #0xc]
-	str r1, [r4, #0x18]
-	ldr r0, [r4, #0x18]
-	str r0, [r4, #0x14]
-	ldmia sp!, {r4,lr}
-	bx lr
-
-	arm_func_start FSi_SendCommand
-FSi_SendCommand:
-	stmdb sp!, {r4-r7,lr}
-	sub sp, sp, #0x4
-	mov r7, r0
-	ldr r6, [r7, #0x8]
-	mov r2, #0x1
-	str r1, [r7, #0x10]
-	mov r0, #0x2
-	str r0, [r7, #0x14]
-	ldr r0, [r7, #0xc]
-	mov r5, r2, lsl r1
-	orr r0, r0, #0x1
-	str r0, [r7, #0xc]
-	bl OS_DisableInterrupts
-	ldr r1, [r6, #0x1c]
-	mov r4, r0
-	ands r0, r1, #0x80
-	beq _020D1238
-	mov r0, r7
-	mov r1, #0x3
-	bl FSi_ReleaseCommand
-	mov r0, r4
-	bl OS_RestoreInterrupts
-	add sp, sp, #0x4
-	mov r0, #0x0
-	ldmia sp!, {r4-r7,lr}
-	bx lr
-_020D1238:
-	ands r0, r5, #0x1fc
-	ldrne r0, [r7, #0xc]
-	add r2, r6, #0x20
-	orrne r0, r0, #0x4
-	strne r0, [r7, #0xc]
-	ldr r1, [r7, #0x0]
-	ldr r0, [r7, #0x4]
-	cmp r1, #0x0
-	strne r0, [r1, #0x4]
-	cmp r0, #0x0
-	strne r1, [r0, #0x0]
-	ldr r0, [r2, #0x4]
-	cmp r0, #0x0
-	beq _020D1280
-_020D1270:
-	mov r2, r0
-	ldr r0, [r0, #0x4]
-	cmp r0, #0x0
-	bne _020D1270
-_020D1280:
-	str r7, [r2, #0x4]
-	str r2, [r7, #0x0]
-	mov r1, #0x0
-	str r1, [r7, #0x4]
-	ldr r0, [r6, #0x1c]
-	ands r0, r0, #0x8
-	movne r1, #0x1
-	cmp r1, #0x0
-	bne _020D132C
-	ldr r0, [r6, #0x1c]
-	ands r0, r0, #0x10
-	bne _020D132C
-	ldr r1, [r6, #0x1c]
-	mov r0, r4
-	orr r1, r1, #0x10
-	str r1, [r6, #0x1c]
-	bl OS_RestoreInterrupts
-	ldr r0, [r6, #0x58]
-	ands r0, r0, #0x200
-	beq _020D12E0
-	ldr r2, [r6, #0x54]
-	mov r0, r7
-	mov r1, #0x9
-	blx r2
-_020D12E0:
-	bl OS_DisableInterrupts
-	ldr r1, [r7, #0xc]
-	orr r1, r1, #0x40
-	str r1, [r7, #0xc]
-	ldr r1, [r7, #0xc]
-	ands r1, r1, #0x4
-	movne r1, #0x1
-	moveq r1, #0x0
-	cmp r1, #0x0
-	bne _020D1324
-	bl OS_RestoreInterrupts
-	mov r0, r7
-	bl FSi_ExecuteAsyncCommand
-	add sp, sp, #0x4
-	mov r0, #0x1
-	ldmia sp!, {r4-r7,lr}
-	bx lr
-_020D1324:
-	bl OS_RestoreInterrupts
-	b _020D1378
-_020D132C:
-	ldr r0, [r7, #0xc]
-	ands r0, r0, #0x4
-	movne r0, #0x1
-	moveq r0, #0x0
-	cmp r0, #0x0
-	bne _020D135C
-	mov r0, r4
-	bl OS_RestoreInterrupts
-	add sp, sp, #0x4
-	mov r0, #0x1
-	ldmia sp!, {r4-r7,lr}
-	bx lr
-_020D135C:
-	add r0, r7, #0x18
-	bl OS_SleepThread
-	ldr r0, [r7, #0xc]
-	ands r0, r0, #0x40
-	beq _020D135C
-	mov r0, r4
-	bl OS_RestoreInterrupts
-_020D1378:
-	mov r0, r7
-	bl FSi_ExecuteSyncCommand
-	add sp, sp, #0x4
-	ldmia sp!, {r4-r7,lr}
-	bx lr