From 9f3c697d9dee85da8c9bf4f708a340d5023194ec Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Wed, 6 May 2020 18:14:26 -0400
Subject: FS_overlay.c

---
 arm9/asm/FS_overlay.s            | 546 ---------------------------------------
 arm9/asm/libdgt.s                |   4 +-
 arm9/global.inc                  |   2 +-
 arm9/lib/include/CARD_rom.h      |   9 +
 arm9/lib/include/DGT_common.h    |   6 +
 arm9/lib/include/DGT_dgt.h       |   6 +
 arm9/lib/include/FS_file.h       |  13 +
 arm9/lib/include/FS_mw_dtor.h    |  16 ++
 arm9/lib/include/FS_overlay.h    |  15 ++
 arm9/lib/include/FS_rom.h        |   7 +
 arm9/lib/include/MI_memory.h     |  10 +
 arm9/lib/include/MI_uncompress.h |   6 +
 arm9/lib/include/OS_cache.h      |   9 +
 arm9/lib/include/OS_system.h     |   5 +
 arm9/lib/src/FS_overlay.c        | 297 +++++++++++++++++++++
 arm9/undefined_syms.txt          |   9 +
 16 files changed, 411 insertions(+), 549 deletions(-)
 delete mode 100644 arm9/asm/FS_overlay.s
 create mode 100644 arm9/lib/include/DGT_common.h
 create mode 100644 arm9/lib/include/DGT_dgt.h
 create mode 100644 arm9/lib/include/FS_mw_dtor.h
 create mode 100644 arm9/lib/include/MI_memory.h
 create mode 100644 arm9/lib/include/MI_uncompress.h
 create mode 100644 arm9/lib/include/OS_cache.h
 create mode 100644 arm9/lib/src/FS_overlay.c

diff --git a/arm9/asm/FS_overlay.s b/arm9/asm/FS_overlay.s
deleted file mode 100644
index 78635558..00000000
--- a/arm9/asm/FS_overlay.s
+++ /dev/null
@@ -1,546 +0,0 @@
-	.include "asm/macros.inc"
-	.include "global.inc"
-	.section .text
-
-	arm_func_start FS_UnloadOverlay
-FS_UnloadOverlay: ; 0x020D2040
-	stmdb sp!, {lr}
-	sub sp, sp, #0x2c
-	mov r3, r0
-	mov r2, r1
-	add r0, sp, #0x0
-	mov r1, r3
-	bl FS_LoadOverlayInfo
-_020D205C:
-	cmp r0, #0x0
-	beq _020D2074
-	add r0, sp, #0x0
-	bl FS_UnloadOverlayImage
-	cmp r0, #0x0
-	bne _020D2084
-_020D2074:
-	add sp, sp, #0x2c
-	mov r0, #0x0
-	ldmfd sp!, {lr}
-	bx lr
-_020D2084:
-	mov r0, #0x1
-	add sp, sp, #0x2c
-	ldmfd sp!, {lr}
-	bx lr
-
-	arm_func_start FS_LoadOverlay
-FS_LoadOverlay: ; 0x020D2094
-	stmdb sp!, {lr}
-	sub sp, sp, #0x2c
-	mov r3, r0
-	mov r2, r1
-	add r0, sp, #0x0
-	mov r1, r3
-	bl FS_LoadOverlayInfo
-_020D20B0:
-	cmp r0, #0x0
-	beq _020D20C8
-	add r0, sp, #0x0
-	bl FS_LoadOverlayImage
-	cmp r0, #0x0
-	bne _020D20D8
-_020D20C8:
-	add sp, sp, #0x2c
-	mov r0, #0x0
-	ldmfd sp!, {lr}
-	bx lr
-_020D20D8:
-	add r0, sp, #0x0
-	bl FS_StartOverlay
-	mov r0, #0x1
-	add sp, sp, #0x2c
-	ldmfd sp!, {lr}
-	bx lr
-
-	arm_func_start FS_UnloadOverlayImage
-FS_UnloadOverlayImage: ; 0x020D20F0
-	stmdb sp!, {lr}
-	sub sp, sp, #0x4
-	bl FS_EndOverlay
-	mov r0, #0x1
-	add sp, sp, #0x4
-	ldmia sp!, {lr}
-	bx lr
-
-	arm_func_start FS_EndOverlay
-FS_EndOverlay: ; 0x020D210C
-	stmdb sp!, {r4-r11,lr}
-	sub sp, sp, #0x4
-	ldr r8, _020D220C ; =0x021D74C8
-	mov r11, r0
-	mov r9, #0x0
-_020D2120:
-	ldr r1, [r11, #0x8]
-	ldr r0, [r11, #0xc]
-	ldr r5, [r11, #0x4]
-	add r0, r1, r0
-	mov r7, r9
-	mov r6, r9
-	add r4, r5, r0
-	bl OS_DisableInterrupts
-	ldr lr, [r8, #0x0]
-	mov r10, r9
-	mov r12, lr
-	cmp lr, #0x0
-	beq _020D21C4
-_020D2154:
-	ldr r2, [r12, #0x8]
-	ldr r3, [r12, #0x0]
-	cmp r2, #0x0
-	ldr r1, [r12, #0x4]
-	bne _020D2178
-	cmp r1, r5
-	blo _020D2178
-	cmp r1, r4
-	blo _020D2188
-_020D2178:
-	cmp r2, r5
-	blo _020D21B4
-	cmp r2, r4
-	bhs _020D21B4
-_020D2188:
-	cmp r6, #0x0
-	strne r12, [r6, #0x0]
-	moveq r7, r12
-	cmp lr, r12
-	streq r3, [r8, #0x0]
-	moveq lr, r3
-	str r9, [r12, #0x0]
-	cmp r10, #0x0
-	mov r6, r12
-	strne r3, [r10, #0x0]
-	b _020D21B8
-_020D21B4:
-	mov r10, r12
-_020D21B8:
-	mov r12, r3
-	cmp r3, #0x0
-	bne _020D2154
-_020D21C4:
-	bl OS_RestoreInterrupts
-_020D21C8:
-	cmp r7, #0x0
-	addeq sp, sp, #0x4
-	ldmeqia sp!, {r4-r11, lr}
-	bxeq lr
-_020D21D8:
-	ldr r1, [r7, #0x4]
-	ldr r4, [r7]
-	cmp r1, #0x0
-	beq _020D21F0
-	ldr r0, [r7, #0x8]
-	blx r1
-_020D21F0:
-	mov r7, r4
-	cmp r4, #0x0
-	bne _020D21D8
-	b _020D2120
-	add sp, sp, #0x4
-	ldmia sp!, {r4-r11, lr}
-	bx lr
-_020D220C: .word 0x021D74C8
-
-	arm_func_start FS_StartOverlay
-FS_StartOverlay: ; 0x020D2210
-	stmdb sp!, {r4-r6,lr}
-	mov r5, r0
-	bl FSi_GetOverlayBinarySize
-	ldr r1, _020D2300 ; =0x027FFC40
-	mov r4, r0
-	ldrh r0, [r1, #0x0]
-	cmp r0, #0x2
-	bne _020D22A4
-	ldrb r1, [r5, #0x1f]
-	mov r0, #0x0
-	ands r1, r1, #0x2
-	beq _020D2280
-	ldr r1, _020D2304 ; =0x02106F84
-	ldr r3, _020D2308 ; =0x02106F84
-	ldr r2, _020D230C ; =0x66666667
-	sub r12, r1, r3
-	smull r1, lr, r2, r12
-	mov lr, lr, asr #0x3
-	mov r1, r12, lsr #0x1f
-	ldr r2, [r5, #0x0]
-	add lr, r1, lr
-	cmp r2, lr
-	bhs _020D2280
-	mov r0, #0x14
-	mla r0, r2, r0, r3
-	ldr r1, [r5, #0x4]
-	mov r2, r4
-	bl FSi_CompareDigest
-_020D2280:
-	cmp r0, #0x0
-	bne _020D22A4
-	ldr r0, [r5, #0x4]
-	mov r2, r4
-	mov r1, #0x0
-	bl MI_CpuFill8
-	bl OS_Terminate
-	ldmia sp!, {r4-r6,lr}
-	bx lr
-_020D22A4:
-	ldrb r0, [r5, #0x1f]
-	ands r0, r0, #0x1
-	beq _020D22BC
-	ldr r0, [r5, #0x4]
-	add r0, r0, r4
-	bl MIi_UncompressBackward
-_020D22BC:
-	ldr r0, [r5, #0x4]
-	ldr r1, [r5, #0x8]
-	bl DC_FlushRange
-	ldr r6, [r5, #0x10]
-	ldr r4, [r5, #0x14]
-	cmp r6, r4
-	ldmcsia sp!, {r4-r6,lr}
-	bxcs lr
-_020D22DC:
-	ldr r0, [r6, #0x0]
-	cmp r0, #0x0
-	beq _020D22EC
-	blx r0
-_020D22EC:
-	add r6, r6, #0x4
-	cmp r6, r4
-	blo _020D22DC
-	ldmia sp!, {r4-r6,lr}
-	bx lr
-	.balign 4
-_020D2300: .word 0x027FFC40
-_020D2304: .word 0x02106F84
-_020D2308: .word 0x02106F84
-_020D230C: .word 0x66666667
-
-	arm_func_start FSi_CompareDigest
-FSi_CompareDigest:
-	stmdb sp!, {r4-r6,lr}
-	sub sp, sp, #0x58
-	mov r4, r0
-	mov r6, r1
-	mov r5, r2
-	add r0, sp, #0x4
-	mov r1, #0x0
-	mov r2, #0x14
-	bl MI_CpuFill8
-	ldr r0, _020D23AC ; =0x02106834
-	ldr r1, _020D23B0 ; =0x02106838
-	ldr r0, [r0, #0x0]
-	ldr r2, [r1, #0x0]
-	add r1, sp, #0x18
-	bl MI_CpuCopy8
-	ldr r3, _020D23B0 ; =0x02106838
-	mov r1, r6
-	ldr r12, [r3, #0x0]
-	mov r2, r5
-	add r0, sp, #0x4
-	add r3, sp, #0x18
-	str r12, [sp, #0x0]
-	bl MATH_CalcHMACSHA1
-	add r2, sp, #0x4
-	mov r3, #0x0
-_020D2374:
-	ldr r1, [r2, #0x0]
-	ldr r0, [r4, r3]
-	cmp r1, r0
-	bne _020D2394
-	add r3, r3, #0x4
-	cmp r3, #0x14
-	add r2, r2, #0x4
-	blo _020D2374
-_020D2394:
-	cmp r3, #0x14
-	moveq r0, #0x1
-	movne r0, #0x0
-	add sp, sp, #0x58
-	ldmia sp!, {r4-r6,lr}
-	bx lr
-	.balign 4
-_020D23AC: .word 0x02106834
-_020D23B0: .word 0x02106838
-
-	arm_func_start FS_LoadOverlayImage
-FS_LoadOverlayImage: ; 0x020D23B4
-	stmdb sp!, {r4-r5,lr}
-	sub sp, sp, #0x54
-	mov r5, r0
-	add r0, sp, #0x8
-	bl FS_InitFile
-_020D23C8:
-	add r0, sp, #0x0
-	mov r1, r5
-	bl FS_GetOverlayFileID
-	add r1, sp, #0x0
-	add r0, sp, #0x8
-	ldmia r1, {r1, r2}
-	bl FS_OpenFileFast
-	cmp r0, #0x0
-	addeq sp, sp, #0x54
-	moveq r0, #0x0
-	ldmeqia sp!, {r4-r5, lr}
-	bxeq lr
-	mov r0, r5
-	bl FSi_GetOverlayBinarySize
-	mov r4, r0
-	mov r0, r5
-	bl FS_ClearOverlayImage
-	ldr r1, [r5, #0x4]
-	add r0, sp, #0x8
-	mov r2, r4
-	bl FS_ReadFile
-	cmp r4, r0
-	beq _020D243C
-	add r0, sp, #0x8
-	bl FS_CloseFile
-	add sp, sp, #0x54
-	mov r0, #0x0
-	ldmia sp!, {r4-r5, lr}
-	bx lr
-_020D243C:
-	add r0, sp, #0x8
-	bl FS_CloseFile
-	mov r0, #0x1
-	add sp, sp, #0x54
-	ldmia sp!, {r4-r5, lr}
-	bx lr
-
-	arm_func_start FS_LoadOverlayImageAsync
-FS_LoadOverlayImageAsync: ; 0x020D2454
-	stmdb sp!, {r4-r6,lr}
-	sub sp, sp, #0x8
-	mov r5, r1
-	mov r6, r0
-	mov r0, r5
-	bl FS_InitFile
-_020D246C:
-	add r0, sp, #0x0
-	mov r1, r6
-	bl FS_GetOverlayFileID
-	add r1, sp, #0x0
-	mov r0, r5
-	ldmia r1, {r1, r2}
-	bl FS_OpenFileFast
-	cmp r0, #0x0
-	addeq sp, sp, #0x8
-	moveq r0, #0x0
-	ldmeqia sp!, {r4-r6, lr}
-	bxeq lr
-	mov r0, r6
-	bl FSi_GetOverlayBinarySize
-	mov r4, r0
-	mov r0, r6
-	bl FS_ClearOverlayImage
-	ldr r1, [r6, #0x4]
-	mov r0, r5
-	mov r2, r4
-	bl FS_ReadFileAsync
-	cmp r4, r0
-	addeq sp, sp, #0x8
-	moveq r0, #0x1
-	ldmeqia sp!, {r4-r6, lr}
-	bxeq lr
-	mov r0, r5
-	bl FS_CloseFile
-	mov r0, #0x0
-	add sp, sp, #0x8
-	ldmia sp!, {r4-r6, lr}
-	bx lr
-
-	arm_func_start FS_LoadOverlayInfo
-FS_LoadOverlayInfo:
-	stmdb sp!, {r4-r5,lr}
-	sub sp, sp, #0x64
-	movs r4, r1
-	mov r5, r0
-	ldreq r0, _020D25EC ; =0x021D5404
-	ldrne r0, _020D25F0 ; =0x021D540C
-	ldr r3, [r0, #0x0]
-	cmp r3, #0x0
-	beq _020D25A8
-	ldr r0, [r0, #0x4]
-	mov r2, r2, lsl #0x5
-	cmp r2, r0
-	addcs sp, sp, #0x64
-	movcs r0, #0x0
-	ldmcsia sp!, {r4-r5,lr}
-	bxcs lr
-	add r0, r3, r2
-	mov r1, r5
-	mov r2, #0x20
-	bl MI_CpuCopy8
-	add r0, sp, #0x18
-	str r4, [r5, #0x20]
-	bl FS_InitFile
-	add r0, sp, #0x10
-	mov r1, r5
-	bl FS_GetOverlayFileID
-	add r1, sp, #0x10
-	add r0, sp, #0x18
-	ldmia r1, {r1-r2}
-	bl FS_OpenFileFast
-_020D2564:
-	cmp r0, #0x0
-	addeq sp, sp, #0x64
-	moveq r0, #0x0
-	ldmeqia sp!, {r4-r5,lr}
-	bxeq lr
-	ldr r1, [sp, #0x3c]
-	add r0, sp, #0x18
-	str r1, [r5, #0x24]
-	ldr r2, [sp, #0x40]
-	ldr r1, [sp, #0x3c]
-	sub r1, r2, r1
-	str r1, [r5, #0x28]
-	bl FS_CloseFile
-	add sp, sp, #0x64
-	mov r0, #0x1
-	ldmia sp!, {r4-r5,lr}
-	bx lr
-_020D25A8:
-	ldr r1, _020D25F4 ; =0x027FFE50
-	ldr ip, _020D25F8 ; =0x027FFE58
-	ldr r0, [r1, #0x0]
-	ldr r3, _020D25FC ; =0x021D5414
-	str r0, [sp, #0x0]
-	ldr r1, [r1, #0x4]
-	mov r0, r5
-	str r1, [sp, #0x4]
-	ldr r5, [r12, #0x0]
-	mov r1, r4
-	str r5, [sp, #0x8]
-	ldr r4, [r12, #0x4]
-	str r4, [sp, #0xc]
-	bl FSi_LoadOverlayInfoCore
-	add sp, sp, #0x64
-	ldmia sp!, {r4-r5,lr}
-	bx lr
-	.balign 4
-_020D25EC: .word 0x021D5404
-_020D25F0: .word 0x021D540C
-_020D25F4: .word 0x027FFE50
-_020D25F8: .word 0x027FFE58
-_020D25FC: .word 0x021D5414
-
-	arm_func_start FSi_LoadOverlayInfoCore
-FSi_LoadOverlayInfoCore: ; 0x020D2600
-	stmdb sp!, {r4-r9,lr}
-	sub sp, sp, #0x54
-	movs r9, r1
-	ldreq r5, [sp, #0x74]
-	ldreq r6, [sp, #0x70]
-	ldrne r5, [sp, #0x7c]
-	ldrne r6, [sp, #0x78]
-	mov r7, r2, lsl #0x5
-	cmp r7, r5
-	mov r4, r0
-	mov r8, r3
-	addcs sp, sp, #0x54
-	movcs r0, #0x0
-	ldmcsia sp!, {r4-r9,lr}
-	bxcs lr
-	add r0, sp, #0xc
-	bl FS_InitFile
-	mvn r12, #0x0
-	add r0, sp, #0xc
-	mov r1, r8
-	add r2, r6, r7
-	add r3, r6, r5
-	str r12, [sp, #0x0]
-	bl FS_OpenFileDirect
-_020D2660:
-	cmp r0, #0
-	addeq sp, sp, #0x54
-	moveq r0, #0
-	ldmeqia sp!, {r4-r9, lr}
-	bxeq lr
-	add r0, sp, #12
-	mov r1, r4
-	mov r2, #32
-	bl FS_ReadFile
-	cmp r0, #32
-	beq _020D26A4
-	add r0, sp, #12
-	bl FS_CloseFile
-	add sp, sp, #0x54
-	mov r0, #0x0
-	ldmia sp!, {r4-r9, lr}
-	bx lr
-_020D26A4:
-	add r0, sp, #0xC
-	bl FS_CloseFile
-	add r0, sp, #0x4
-	mov r1, r4
-	str r9, [r4, #0x20]
-	bl FS_GetOverlayFileID
-	add r1, sp, #0x4
-	add r0, sp, #0xC
-	ldmia r1, {r1, r2}
-	bl FS_OpenFileFast
-	cmp r0, #0x0
-	addeq sp, sp, #0x54
-	moveq r0, #0x0
-	ldmeqia sp!, {r4-r9, lr}
-	bxeq lr
-	ldr r1, [sp, #0x30]
-	add r0, sp, #0xC
-	str r1, [r4, #0x24]
-	ldr r2, [sp, #0x34]
-	ldr r1, [sp, #0x30]
-	sub r1, r2, r1
-	str r1, [r4, #0x28]
-	bl FS_CloseFile
-	mov r0, #0x1
-	add sp, sp, #0x54
-	ldmia sp!, {r4-r9, lr}
-	bx lr
-
-	arm_func_start FS_GetOverlayFileID
-FS_GetOverlayFileID: ; 0x020D2710
-	sub sp, sp, #0x8
-	ldr r2, _020D2734 ; =0x021D5414
-	str r2, [sp, #0x0]
-	ldr r1, [r1, #0x18]
-	str r1, [sp, #0x4]
-	str r2, [r0, #0x0]
-	str r1, [r0, #0x4]
-	add sp, sp, #0x8
-	bx lr
-	.balign 4
-_020D2734: .word 0x021D5414
-
-	arm_func_start FS_ClearOverlayImage
-FS_ClearOverlayImage: ; 0x020D2738
-	stmdb sp!, {r4-r6,lr}
-	ldr r5, [r0, #0x8]
-	ldr r1, [r0, #0xc]
-	ldr r6, [r0, #0x4]
-	add r4, r5, r1
-	mov r0, r6
-	mov r1, r4
-	bl IC_InvalidateRange
-	mov r0, r6
-	mov r1, r4
-	bl DC_InvalidateRange
-	add r0, r6, r5
-	sub r2, r4, r5
-	mov r1, #0x0
-	bl MI_CpuFill8
-	ldmia sp!, {r4-r6,lr}
-	bx lr
-
-	arm_func_start FSi_GetOverlayBinarySize
-FSi_GetOverlayBinarySize: ; 0x020D277C
-	ldrb r1, [r0, #0x1f]
-	ands r1, r1, #0x1
-	ldrne r0, [r0, #0x1c]
-	movne r0, r0, lsl #0x8
-	movne r0, r0, lsr #0x8
-	ldreq r0, [r0, #0x8]
-	bx lr
diff --git a/arm9/asm/libdgt.s b/arm9/asm/libdgt.s
index d5ef358d..02a3293f 100644
--- a/arm9/asm/libdgt.s
+++ b/arm9/asm/libdgt.s
@@ -403,8 +403,8 @@ _020D2D6C: .word 0xEFCDAB89
 _020D2D70: .word 0x98BADCFE
 _020D2D74: .word 0x10325476
 
-	arm_func_start MATH_CalcHMACSHA1
-MATH_CalcHMACSHA1: ; 0x020D2D78
+	arm_func_start DGT_Hash2CalcHmac
+DGT_Hash2CalcHmac: ; 0x020D2D78
 	stmdb sp!, {r4-r8,lr}
 	sub sp, sp, #0xa0
 	ldr lr, _020D2E00 ; =0x02106A04
diff --git a/arm9/global.inc b/arm9/global.inc
index b74fe006..e00d3eb1 100644
--- a/arm9/global.inc
+++ b/arm9/global.inc
@@ -3315,7 +3315,7 @@
 .extern MATH_CalcCRC16CCITT
 .extern MATH_CalcCRC32
 .extern MATH_CalcCRC8
-.extern MATH_CalcHMACSHA1
+.extern DGT_Hash2CalcHmac
 .extern MATH_CalcMD5
 .extern MATH_CalcSHA1
 .extern MATH_CountPopulation
diff --git a/arm9/lib/include/CARD_rom.h b/arm9/lib/include/CARD_rom.h
index 327bc995..c43a2f06 100644
--- a/arm9/lib/include/CARD_rom.h
+++ b/arm9/lib/include/CARD_rom.h
@@ -1,6 +1,8 @@
 #ifndef NITRO_CARD_ROM_H_
 #define NITRO_CARD_ROM_H_
 
+#include "MI_exMemory.h"
+
 typedef struct
 {
     u32 offset;
@@ -8,4 +10,11 @@ typedef struct
 }
 CARDRomRegion;
 
+static inline const CARDRomRegion * CARD_GetRomRegionOVT(MIProcessor target)
+{
+    return (target == MI_PROCESSOR_ARM9)
+    ? (const CARDRomRegion *)((const u8 *)HW_ROM_HEADER_BUF + 0x50)
+    : (const CARDRomRegion *)((const u8 *)HW_ROM_HEADER_BUF + 0x58);
+}
+
 #endif //NITRO_CARD_ROM_H_
diff --git a/arm9/lib/include/DGT_common.h b/arm9/lib/include/DGT_common.h
new file mode 100644
index 00000000..c74ae7cd
--- /dev/null
+++ b/arm9/lib/include/DGT_common.h
@@ -0,0 +1,6 @@
+#ifndef NITRO_DGT_COMMON_H_
+#define NITRO_DGT_COMMON_H_
+
+#define DGT_HASH2_DIGEST_SIZE (160/8)
+
+#endif //NITRO_DGT_COMMON_H_
diff --git a/arm9/lib/include/DGT_dgt.h b/arm9/lib/include/DGT_dgt.h
new file mode 100644
index 00000000..1c48531c
--- /dev/null
+++ b/arm9/lib/include/DGT_dgt.h
@@ -0,0 +1,6 @@
+#ifndef NITRO_DGT_DGT_H_
+#define NITRO_DGT_DGT_H_
+
+void DGT_Hash2CalcHmac(void* digest, void* bin_ptr, int bin_len, void* key_ptr, int keylen);
+
+#endif //NITRO_DGT_DGT_H_
diff --git a/arm9/lib/include/FS_file.h b/arm9/lib/include/FS_file.h
index 4871b660..89f69d86 100644
--- a/arm9/lib/include/FS_file.h
+++ b/arm9/lib/include/FS_file.h
@@ -175,5 +175,18 @@ FSFile;
 u32 FS_SetDefaultDMA(u32 dma_no); // returns the previous selection
 void FS_InitFile(FSFile * p_file);
 BOOL FS_WaitAsync(FSFile * p_file);
+BOOL FS_OpenFileDirect(FSFile * p_file, FSArchive * p_arc, u32 image_top, u32 image_bottom, u32 file_index);
+int FS_ReadFile(FSFile * p_file, void * dst, s32 len);
+int FS_ReadFileAsync(FSFile * p_file, void * dst, s32 len);
+BOOL FS_OpenFileFast(FSFile * p_file, FSFileID file_id);
+
+static inline u32 const FS_GetFileImageTop(volatile const FSFile * p_file) {
+    return p_file->prop.file.top;
+}
+
+static inline u32 const FS_GetLength(volatile const FSFile * p_file)
+{
+    return p_file->prop.file.bottom - p_file->prop.file.top;
+}
 
 #endif //NITRO_FS_FILE_H_
diff --git a/arm9/lib/include/FS_mw_dtor.h b/arm9/lib/include/FS_mw_dtor.h
new file mode 100644
index 00000000..a746ed19
--- /dev/null
+++ b/arm9/lib/include/FS_mw_dtor.h
@@ -0,0 +1,16 @@
+#ifndef NITRO_FS_MW_DTOR_H_
+#define NITRO_FS_MW_DTOR_H_
+
+typedef void (*MWI_DESTRUCTOR_FUNC) (void *);
+
+typedef struct MWiDestructorChain
+{
+    struct MWiDestructorChain *next;
+    MWI_DESTRUCTOR_FUNC dtor;
+    void *obj;
+}
+MWiDestructorChain;
+
+extern MWiDestructorChain *__global_destructor_chain;
+
+#endif //NITRO_FS_MW_DTOR_H_
diff --git a/arm9/lib/include/FS_overlay.h b/arm9/lib/include/FS_overlay.h
index c2634509..1ef6469c 100644
--- a/arm9/lib/include/FS_overlay.h
+++ b/arm9/lib/include/FS_overlay.h
@@ -30,6 +30,21 @@ typedef struct FSOverlayInfo
     CARDRomRegion file_pos;
 } FSOverlayInfo;
 
+static inline u8 *const FS_GetOverlayAddress(FSOverlayInfo * p_ovi)
+{
+    return p_ovi->header.ram_address;
+}
+
+static inline u32 const FS_GetOverlayImageSize(FSOverlayInfo * p_ovi)
+{
+    return p_ovi->header.ram_size;
+}
+
+static inline u32 const FS_GetOverlayTotalSize(FSOverlayInfo * p_ovi)
+{
+    return p_ovi->header.ram_size + p_ovi->header.bss_size;
+}
+
 BOOL    FS_LoadOverlayInfo(FSOverlayInfo *p_ovi, MIProcessor target, FSOverlayID id);
 BOOL    FS_LoadOverlay(MIProcessor target, FSOverlayID id);
 BOOL    FS_UnloadOverlay(MIProcessor target, FSOverlayID id);
diff --git a/arm9/lib/include/FS_rom.h b/arm9/lib/include/FS_rom.h
index fc62b579..0bba46bf 100644
--- a/arm9/lib/include/FS_rom.h
+++ b/arm9/lib/include/FS_rom.h
@@ -1,6 +1,13 @@
 #ifndef NITRO_FS_ROM_H_
 #define NITRO_FS_ROM_H_
 
+#include "FS_archive.h"
+#include "CARD_rom.h"
+
+extern FSArchive fsi_arc_rom;
+extern CARDRomRegion fsi_ovt7;
+extern CARDRomRegion fsi_ovt9;
+
 void FSi_InitRom(u32 default_dma_no);
 
 #endif //NITRO_FS_ROM_H_
diff --git a/arm9/lib/include/MI_memory.h b/arm9/lib/include/MI_memory.h
new file mode 100644
index 00000000..d9935a5f
--- /dev/null
+++ b/arm9/lib/include/MI_memory.h
@@ -0,0 +1,10 @@
+#ifndef NITRO_MI_MEMORY_H_
+#define NITRO_MI_MEMORY_H_
+
+void MI_CpuFill8(void *dest, u8 data, u32 size);
+void MI_CpuCopy8(void const *src, void *dest, u32 size);
+static inline void MI_CpuClear8(void *dest, u32 size) {
+    MI_CpuFill8(dest, 0, size);
+}
+
+#endif //NITRO_MI_MEMORY_H_
diff --git a/arm9/lib/include/MI_uncompress.h b/arm9/lib/include/MI_uncompress.h
new file mode 100644
index 00000000..55f28e27
--- /dev/null
+++ b/arm9/lib/include/MI_uncompress.h
@@ -0,0 +1,6 @@
+#ifndef NITRO_MI_UNCOMPRESS_H_
+#define NITRO_MI_UNCOMPRESS_H_
+
+void MIi_UncompressBackward(void * bottom);
+
+#endif //NITRO_MI_UNCOMPRESS_H_
diff --git a/arm9/lib/include/OS_cache.h b/arm9/lib/include/OS_cache.h
new file mode 100644
index 00000000..bee42d45
--- /dev/null
+++ b/arm9/lib/include/OS_cache.h
@@ -0,0 +1,9 @@
+#ifndef NITRO_OS_CACHE_H_
+#define NITRO_OS_CACHE_H_
+
+void IC_InvalidateRange(void *startAddr, u32 nBytes);
+void IC_FlushRange(void *startAddr, u32 nBytes);
+void DC_InvalidateRange(void *startAddr, u32 nBytes);
+void DC_FlushRange(void *startAddr, u32 nBytes);
+
+#endif //NITRO_OS_CACHE_H_
diff --git a/arm9/lib/include/OS_system.h b/arm9/lib/include/OS_system.h
index 65c58f57..1b263b19 100644
--- a/arm9/lib/include/OS_system.h
+++ b/arm9/lib/include/OS_system.h
@@ -36,5 +36,10 @@ OSIntrMode OS_GetCpsrIrq();
 OSProcMode OS_GetProcMode();
 void OS_SpinWait();
 void OS_WaitVBlankIntr();
+void OS_Terminate(void);
+static inline void OS_TPanic(const char * message)
+{
+    OS_Terminate();
+}
 
 #endif //POKEDIAMOND_OS_SYSTEM_H
diff --git a/arm9/lib/src/FS_overlay.c b/arm9/lib/src/FS_overlay.c
new file mode 100644
index 00000000..d8d53570
--- /dev/null
+++ b/arm9/lib/src/FS_overlay.c
@@ -0,0 +1,297 @@
+#include "nitro.h"
+#include "DGT_common.h"
+#include "DGT_dgt.h"
+#include "OS_cache.h"
+#include "OS_system.h"
+#include "MI_memory.h"
+#include "MI_uncompress.h"
+#include "FS_rom.h"
+#include "FS_overlay.h"
+#include "FS_mw_dtor.h"
+#include "MB_mb.h"
+
+#define FS_OVERLAY_FLAG_COMP    0x0001
+#define FS_OVERLAY_FLAG_AUTH    0x0002
+#define FS_OVERLAY_DIGEST_SIZE  DGT_HASH2_DIGEST_SIZE
+
+u32 FSi_GetOverlayBinarySize(FSOverlayInfo * p_ovi)
+{
+    u32 size = (p_ovi->header.flag & FS_OVERLAY_FLAG_COMP)
+        ? p_ovi->header.compressed
+        : p_ovi->header.ram_size;
+    return size;
+}
+
+void FS_ClearOverlayImage(FSOverlayInfo * p_ovi)
+{
+    u8 * const im_start = FS_GetOverlayAddress(p_ovi);
+    u32 const ram_size = FS_GetOverlayImageSize(p_ovi);
+    u32 const total_size = FS_GetOverlayTotalSize(p_ovi);
+
+    IC_InvalidateRange(im_start, total_size);
+    DC_InvalidateRange(im_start, total_size);
+    MI_CpuFill8(im_start + ram_size, 0, total_size - ram_size);
+}
+
+FSFileID FS_GetOverlayFileID(FSOverlayInfo * p_ovi)
+{
+    FSFileID ret;
+    ret.arc = &fsi_arc_rom;
+    ret.file_id = p_ovi->header.file_id;
+    return ret;
+}
+
+BOOL FSi_LoadOverlayInfoCore(FSOverlayInfo * p_ovi, MIProcessor target, FSOverlayID id, FSArchive * arc, u32 offset_arm9, u32 len_arm9, u32 offset_arm7, u32 len_arm7)
+{
+    CARDRomRegion pr[1];
+    u32 pos;
+    if (target == MI_PROCESSOR_ARM9)
+    {
+        pr->offset = offset_arm9;
+        pr->length = len_arm9;
+    }
+    else
+    {
+        pr->offset = offset_arm7;
+        pr->length = len_arm7;
+    }
+    pos = (u32) id * sizeof(FSOverlayInfoHeader);
+    if (pos >= pr->length)
+        return FALSE;
+
+    FSFile file[1];
+    FS_InitFile(file);
+    // BOOL FS_OpenFileDirect(FSFile * p_file, FSArchive * p_arc, u32 image_top, u32 image_bottom, u32 file_index)
+    if (!FS_OpenFileDirect(file, arc, pr->offset + pos, pr->offset + pr->length, (u32)~0))
+        return FALSE;
+    if (FS_ReadFile(file, p_ovi, sizeof(FSOverlayInfoHeader)) != sizeof(FSOverlayInfoHeader))
+    {
+        FS_CloseFile(file);
+        return FALSE;
+    }
+    FS_CloseFile(file);
+    p_ovi->target = target;
+    if (!FS_OpenFileFast(file, FS_GetOverlayFileID(p_ovi)))
+        return FALSE;
+    p_ovi->file_pos.offset = FS_GetFileImageTop(file);
+    p_ovi->file_pos.length = FS_GetLength(file);
+    FS_CloseFile(file);
+    return TRUE;
+}
+
+BOOL FS_LoadOverlayInfo(FSOverlayInfo * p_ovi, MIProcessor target, FSOverlayID id)
+{
+    CARDRomRegion * const pr = (target == MI_PROCESSOR_ARM9) ? &fsi_ovt9 : &fsi_ovt7;
+    if (pr->offset)
+    {
+        FSFile file[1];
+        const u32 pos = id * sizeof(FSOverlayInfoHeader);
+        if (pos >= pr->length)
+            return FALSE;
+        MI_CpuCopy8((const void *)(pr->offset + pos), p_ovi, sizeof(FSOverlayInfoHeader));
+        p_ovi->target = target;
+        FS_InitFile(file);
+        if (!FS_OpenFileFast(file, FS_GetOverlayFileID(p_ovi)))
+            return FALSE;
+        p_ovi->file_pos.offset = FS_GetFileImageTop(file);
+        p_ovi->file_pos.length = FS_GetLength(file);
+        FS_CloseFile(file);
+        return TRUE;
+    }
+    else
+    {
+        const CARDRomRegion * const p_ovt9 = CARD_GetRomRegionOVT(MI_PROCESSOR_ARM9);
+        const CARDRomRegion * const p_ovt7 = CARD_GetRomRegionOVT(MI_PROCESSOR_ARM7);
+        return FSi_LoadOverlayInfoCore(p_ovi, target, id, &fsi_arc_rom, p_ovt9->offset, p_ovt9->length, p_ovt7->offset, p_ovt7->length);
+    }
+}
+
+BOOL FS_LoadOverlayImageAsync(FSOverlayInfo * p_ovi, FSFile * p_file)
+{
+    FS_InitFile(p_file);
+    if (!FS_OpenFileFast(p_file, FS_GetOverlayFileID(p_ovi)))
+        return FALSE;
+    else
+    {
+        s32 size = FSi_GetOverlayBinarySize(p_ovi);
+        FS_ClearOverlayImage(p_ovi);
+        if (FS_ReadFileAsync(p_file, FS_GetOverlayAddress(p_ovi), size) != size)
+        {
+            FS_CloseFile(p_file);
+            return FALSE;
+        }
+        return TRUE;
+    }
+}
+
+BOOL FS_LoadOverlayImage(FSOverlayInfo * p_ovi)
+{
+    FSFile file[1];
+    FS_InitFile(file);
+    if (!FS_OpenFileFast(file, FS_GetOverlayFileID(p_ovi)))
+        return FALSE;
+    else
+    {
+        s32 size = FSi_GetOverlayBinarySize(p_ovi);
+        FS_ClearOverlayImage(p_ovi);
+        if (FS_ReadFile(file, FS_GetOverlayAddress(p_ovi), size) != size)
+        {
+            FS_CloseFile(file);
+            return FALSE;
+        }
+        FS_CloseFile(file);
+        return TRUE;
+    }
+}
+
+const void *fsi_digest_key_ptr;
+u32 fsi_digest_key_len;
+
+BOOL FSi_CompareDigest(const u8 *spec_digest, void *src, int len)
+{
+    int i;
+    u8 digest[FS_OVERLAY_DIGEST_SIZE];
+    u8 digest_key[64];
+
+    MI_CpuClear8(digest, sizeof(digest));
+    MI_CpuCopy8(fsi_digest_key_ptr, digest_key, fsi_digest_key_len);
+    DGT_Hash2CalcHmac(digest, src, len, digest_key, fsi_digest_key_len);
+    for (i = 0; i < sizeof(digest); i += sizeof(u32))
+    {
+        if (*(const u32 *)(digest + i) != *(const u32 *)(spec_digest + i))
+            break;
+    }
+    return i == sizeof(digest);
+}
+
+extern u8 SDK_OVERLAY_DIGEST[];
+extern u8 SDK_OVERLAY_DIGEST_END[];
+
+void FS_StartOverlay(FSOverlayInfo * p_ovi)
+{
+    u32 rare_size = FSi_GetOverlayBinarySize(p_ovi);
+    if (MB_IsMultiBootChild())
+    {
+        BOOL ret = FALSE;
+
+        if (p_ovi->header.flag & FS_OVERLAY_FLAG_AUTH)
+        {
+            const u32 odt_max = (u32)((SDK_OVERLAY_DIGEST_END - SDK_OVERLAY_DIGEST) / FS_OVERLAY_DIGEST_SIZE);
+            if (p_ovi->header.id < odt_max)
+            {
+                const u8 * spec_digest = SDK_OVERLAY_DIGEST + FS_OVERLAY_DIGEST_SIZE * p_ovi->header.id;
+                ret = FSi_CompareDigest(spec_digest, p_ovi->header.ram_address, (int)rare_size);
+            }
+        }
+        if (!ret)
+        {
+            MI_CpuClear8(p_ovi->header.ram_address, rare_size);
+            OS_TPanic("FS_StartOverlay() failed! (invalid overlay-segment data)");
+            return;
+        }
+    }
+    if (p_ovi->header.flag & FS_OVERLAY_FLAG_COMP)
+    {
+        MIi_UncompressBackward(p_ovi->header.ram_address + rare_size);
+    }
+    DC_FlushRange(p_ovi->header.ram_address, p_ovi->header.ram_size);
+
+    {
+        FSOverlayInitFunc *p = p_ovi->header.sinit_init;
+        FSOverlayInitFunc *q = p_ovi->header.sinit_init_end;
+        for (; p < q; ++p)
+        {
+            if (*p)
+                (**p)();
+        }
+    }
+}
+
+void FS_EndOverlay(FSOverlayInfo *p_ovi)
+{
+    for (;;)
+    {
+        MWiDestructorChain *head = NULL, *tail = NULL;
+        const u32 region_top = (u32)FS_GetOverlayAddress(p_ovi);
+        const u32 region_bottom = region_top + FS_GetOverlayTotalSize(p_ovi);
+
+        {
+            OSIntrMode bak_psr = OS_DisableInterrupts();
+            MWiDestructorChain *prev = NULL;
+            MWiDestructorChain *base = __global_destructor_chain;
+            MWiDestructorChain *p = base;
+            while (p)
+            {
+                MWiDestructorChain *next = p->next;
+                const u32 dtor = (u32)p->dtor;
+                const u32 obj = (u32)p->obj;
+                if (((obj == 0) && (dtor >= region_top) && (dtor < region_bottom)) ||
+                    ((obj >= region_top) && (obj < region_bottom)))
+                {
+                    /* If appropriate, extract*/
+                    if (!tail)
+                    {
+                        head = p;
+                    }
+                    else
+                    {
+                        tail->next = p;
+                    }
+                    if (base == p)
+                    {
+                        base = __global_destructor_chain = next;
+                    }
+                    tail = p, p->next = NULL;
+                    if (prev)
+                    {
+                        prev->next = next;
+                    }
+                }
+                else
+                {
+                    prev = p;
+                }
+                p = next;
+            }
+            OS_RestoreInterrupts(bak_psr);
+        }
+
+        if (!head)
+        {
+            break;
+        }
+        do
+        {
+            MWiDestructorChain *next = head->next;
+            if (head->dtor)
+            {
+                (*head->dtor) (head->obj);
+            }
+            head = next;
+        }
+        while (head);
+    }
+}
+
+BOOL FS_UnloadOverlayImage(FSOverlayInfo * p_ovi)
+{
+    FS_EndOverlay(p_ovi);
+    return TRUE;
+}
+
+BOOL FS_LoadOverlay(MIProcessor target, FSOverlayID id)
+{
+    FSOverlayInfo ovi;
+    if (!FS_LoadOverlayInfo(&ovi, target, id) || !FS_LoadOverlayImage(&ovi))
+        return FALSE;
+    FS_StartOverlay(&ovi);
+    return TRUE;
+}
+
+BOOL FS_UnloadOverlay(MIProcessor target, FSOverlayID id)
+{
+    FSOverlayInfo ovi;
+    if (!FS_LoadOverlayInfo(&ovi, target, id) || !FS_UnloadOverlayImage(&ovi))
+        return FALSE;
+    return TRUE;
+}
diff --git a/arm9/undefined_syms.txt b/arm9/undefined_syms.txt
index 0b159a51..48598491 100644
--- a/arm9/undefined_syms.txt
+++ b/arm9/undefined_syms.txt
@@ -14,6 +14,11 @@ Unk_02106840 = 0x02106840;
 Unk_02106900 = 0x02106900;
 Unk_02106A00 = 0x02106A00;
 Unk_02106A04 = 0x02106A04;
+// FS
+fsi_digest_key_ptr = 0x02106834;
+fsi_digest_key_len = 0x02106838;
+SDK_OVERLAY_DIGEST = 0x02106F84;
+SDK_OVERLAY_DIGEST_END = 0x02106F84;
 
 // .bss
 OSi_ConsoleTypeCache = 0x02106828;
@@ -27,6 +32,10 @@ OSi_IrqCallbackInfo = 0x021D341C;
 isInitialized = 0x021D347C;
 current_dir_pos = 0x021D53EC;
 is_init = 0x021D53F8;
+fsi_ovt9 = 0x021D5404;
+fsi_ovt7 = 0x021D540C;
+fsi_arc_rom = 0x021D5414;
+__global_destructor_chain = 0x021D74C8;
 OSi_StackForDestructor = 0x021D3480;
 OSi_RescheduleCount = 0x021D3484;
 OSi_ThreadIdCount = 0x021D3488;
-- 
cgit v1.2.3


From d4575098dbd671e2b6fd27ad65b984502c90465b Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Thu, 7 May 2020 08:52:32 -0400
Subject: FS_archive.c WIP

---
 arm9/arm9.lcf                 |   1 +
 arm9/asm/FS_archive.asm.s     | 624 +++++++++++++++++++++++++++++
 arm9/asm/FS_archive.s         | 897 ------------------------------------------
 arm9/asm/FS_rom.s             |   1 -
 arm9/lib/include/FS_archive.h |  56 +++
 arm9/lib/include/FS_command.h |   9 +
 arm9/lib/include/FS_file.h    |  20 +
 arm9/lib/include/OS_thread.h  |   1 +
 arm9/lib/src/FS_archive.c     | 147 +++++++
 arm9/lib/src/FS_file.c        |  10 -
 10 files changed, 858 insertions(+), 908 deletions(-)
 create mode 100644 arm9/asm/FS_archive.asm.s
 delete mode 100644 arm9/asm/FS_archive.s
 create mode 100644 arm9/lib/include/FS_command.h
 create mode 100644 arm9/lib/src/FS_archive.c

diff --git a/arm9/arm9.lcf b/arm9/arm9.lcf
index 7a4a43fb..b98c9b69 100644
--- a/arm9/arm9.lcf
+++ b/arm9/arm9.lcf
@@ -192,6 +192,7 @@ SECTIONS {
 		PXI_fifo.o (.text)
 		FS_command.o (.text)
 		FS_command_default.o (.text)
+		FS_archive.asm.o (.text)
 		FS_archive.o (.text)
 		FS_file.o (.text)
 		FS_rom.o (.text)
diff --git a/arm9/asm/FS_archive.asm.s b/arm9/asm/FS_archive.asm.s
new file mode 100644
index 00000000..fd205e5a
--- /dev/null
+++ b/arm9/asm/FS_archive.asm.s
@@ -0,0 +1,624 @@
+	.include "asm/macros.inc"
+	.include "global.inc"
+	.section .text
+
+	.extern FSi_GetPackedName
+	.extern FSi_ReadMemCallback
+	.extern FSi_WriteMemCallback
+	.extern FSi_ReadMemoryCore
+	.extern FSi_NextCommand
+	.extern FSi_ExecuteAsyncCommand
+	.extern FSi_ExecuteSyncCommand
+
+	arm_func_start FS_NotifyArchiveAsyncEnd
+FS_NotifyArchiveAsyncEnd: ; 0x020D0B40
+	stmdb sp!, {r4-r6,lr}
+	mov r4, r0
+	ldr r0, [r4, #0x1c]
+	mov r6, r1
+	ands r0, r0, #0x100
+	beq _020D0B8C
+	ldr r2, [r4, #0x1c]
+	ldr r0, [r4, #0x24]
+	bic r2, r2, #0x100
+	str r2, [r4, #0x1c]
+	bl FSi_ReleaseCommand
+	mov r0, r4
+	bl FSi_NextCommand
+_020D0B74:
+	cmp r0, #0x0
+	ldmeqia sp!, {r4-r6,lr}
+	bxeq lr
+	bl FSi_ExecuteAsyncCommand
+	ldmia sp!, {r4-r6,lr}
+	bx lr
+_020D0B8C:
+	ldr r5, [r4, #0x24]
+	bl OS_DisableInterrupts
+	str r6, [r5, #0x14]
+	ldr r1, [r4, #0x1c]
+	mov r5, r0
+	bic r1, r1, #0x200
+	add r0, r4, #0xc
+	str r1, [r4, #0x1c]
+	bl OS_WakeupThread
+	mov r0, r5
+	bl OS_RestoreInterrupts
+	ldmia sp!, {r4-r6,lr}
+	bx lr
+
+	arm_func_start FS_SetArchiveProc
+FS_SetArchiveProc: ; 0x020D0BC0
+	cmp r2, #0x0
+	moveq r1, #0x0
+	beq _020D0BD4
+	cmp r1, #0x0
+	moveq r2, #0x0
+_020D0BD4:
+	str r1, [r0, #0x54]
+	str r2, [r0, #0x58]
+	bx lr
+
+	arm_func_start FS_ResumeArchive
+FS_ResumeArchive:
+	stmdb sp!, {r4-r7,lr}
+	sub sp, sp, #0x4
+	mov r4, r0
+	mov r6, #0x0
+	bl OS_DisableInterrupts
+	ldr r1, [r4, #0x1c]
+	mov r5, r0
+	ands r0, r1, #0x8
+	movne r0, #0x1
+	moveq r0, r6
+	cmp r0, #0x0
+	moveq r7, #0x1
+	movne r7, #0x0
+	cmp r7, #0x0
+	bne _020D0C34
+	ldr r1, [r4, #0x1c]
+	mov r0, r4
+	bic r1, r1, #0x8
+	str r1, [r4, #0x1c]
+	bl FSi_NextCommand
+	mov r6, r0
+_020D0C34:
+	mov r0, r5
+	bl OS_RestoreInterrupts
+_020D0C3C:
+	cmp r6, #0x0
+	beq _020D0C4C
+	mov r0, r6
+	bl FSi_ExecuteAsyncCommand
+_020D0C4C:
+	mov r0, r7
+	add sp, sp, #0x4
+	ldmia sp!, {r4-r7, lr}
+	bx lr
+
+	arm_func_start FS_SuspendArchive
+FS_SuspendArchive: ; 0x020D0C5C
+	stmdb sp!, {r4-r7,lr}
+	sub sp, sp, #0x4
+	mov r6, r0
+	bl OS_DisableInterrupts
+	ldr r1, [r6, #0x1c]
+	mov r4, r0
+	ands r0, r1, #0x8
+	movne r0, #0x1
+	moveq r0, #0x0
+	cmp r0, #0x0
+	moveq r5, #0x1
+	movne r5, #0x0
+	cmp r5, #0x0
+	beq _020D0CD4
+	ldr r0, [r6, #0x1c]
+	ands r0, r0, #0x10
+	beq _020D0CC8
+	ldr r0, [r6, #0x1c]
+	orr r0, r0, #0x40
+	str r0, [r6, #0x1c]
+	add r7, r6, #0x14
+_020D0CB0:
+	mov r0, r7
+	bl OS_SleepThread
+	ldr r0, [r6, #0x1c]
+	ands r0, r0, #0x40
+	bne _020D0CB0
+	b _020D0CD4
+_020D0CC8:
+	ldr r0, [r6, #0x1c]
+	orr r0, r0, #0x8
+	str r0, [r6, #0x1c]
+_020D0CD4:
+	mov r0, r4
+	bl OS_RestoreInterrupts
+	mov r0, r5
+	add sp, sp, #0x4
+	ldmia sp!, {r4-r7,lr}
+	bx lr
+
+	arm_func_start FS_UnloadArchiveTables
+FS_UnloadArchiveTables: ; 0x020D0CEC
+	stmdb sp!, {r4-r5,lr}
+	sub sp, sp, #0x4
+	mov r5, r0
+	ldr r0, [r5, #0x1c]
+	mov r4, #0x0
+	ands r0, r0, #0x2
+	movne r0, #0x1
+	moveq r0, r4
+	cmp r0, #0x0
+	beq _020D0D74
+	mov r0, r5
+	bl FS_SuspendArchive
+	ldr r1, [r5, #0x1c]
+	ands r1, r1, #0x4
+	movne r1, #0x1
+	moveq r1, #0x0
+	cmp r1, #0x0
+	beq _020D0D64
+	ldr r2, [r5, #0x1c]
+	mov r1, #0x0
+	bic r2, r2, #0x4
+	str r2, [r5, #0x1c]
+	ldr r4, [r5, #0x44]
+	str r1, [r5, #0x44]
+	ldr r1, [r5, #0x3c]
+	str r1, [r5, #0x2c]
+	ldr r1, [r5, #0x40]
+	str r1, [r5, #0x34]
+	ldr r1, [r5, #0x48]
+	str r1, [r5, #0x50]
+_020D0D64:
+	cmp r0, #0x0
+	beq _020D0D74
+	mov r0, r5
+	bl FS_ResumeArchive
+_020D0D74:
+	mov r0, r4
+	add sp, sp, #0x4
+	ldmia sp!, {r4-r5,lr}
+	bx lr
+
+	arm_func_start FUN_020D0D84
+FUN_020D0D84: ; 0x020D0D84
+	stmdb sp!, {r4-r7,lr}
+	sub sp, sp, #0x4c
+	mov r7, r0
+	ldr r3, [r7, #0x30]
+	ldr r0, [r7, #0x38]
+	mov r6, r1
+	add r0, r3, r0
+	add r0, r0, #0x20
+	add r0, r0, #0x1f
+	bic r5, r0, #0x1f
+	cmp r5, r2
+	bhi _020D0E9C
+	add r1, r6, #0x1f
+	add r0, sp, #0x4
+	bic r4, r1, #0x1f
+	bl FS_InitFile
+	ldr r2, [r7, #0x2c]
+	mvn r0, #0x0
+	str r0, [sp, #0x0]
+	ldr r3, [r7, #0x30]
+	add r0, sp, #0x4
+	mov r1, r7
+	add r3, r2, r3
+	bl FS_OpenFileDirect
+_020D0DE4:
+	cmp r0, #0x0
+	beq _020D0E1C
+	ldr r2, [r7, #0x30]
+	add r0, sp, #0x4
+	mov r1, r4
+	bl FS_ReadFile
+	cmp r0, #0x0
+	bge _020D0E14
+	ldr r2, [r7, #0x30]
+	mov r0, r4
+	mov r1, #0x0
+	bl MI_CpuFill8
+_020D0E14:
+	add r0, sp, #0x4
+	bl FS_CloseFile
+_020D0E1C:
+	str r4, [r7, #0x2C]
+	ldr ip, [r7, #0x30]
+	ldr r2, [r7, #0x34]
+	mvn r0, #0x0
+	str r0, [sp]
+	ldr r3, [r7, #0x38]
+	add r0, sp, #0x4
+	mov r1, r7
+	add r3, r2, r3
+	add r4, r4, ip
+	bl FS_OpenFileDirect
+	cmp r0, #0x0
+	beq _020D0E80
+	ldr r2, [r7, #0x38]
+	add r0, sp, #0x4
+	mov r1, r4
+	bl FS_ReadFile
+	cmp r0, #0x0
+	bge _020D0E78
+	ldr r2, [r7, #0x38]
+	mov r0, r4
+	mov r1, #0x0
+	bl MI_CpuFill8
+_020D0E78:
+	add r0, sp, #0x4
+	bl FS_CloseFile
+_020D0E80:
+	str r4, [r7, #0x34]
+	ldr r0, _020D0EAC
+	str r6, [r7, #0x44]
+	str r0, [r7, #0x50]
+	ldr r0, [r7, #0x1C]
+	orr r0, r0, #0x4
+	str r0, [r7, #0x1C]
+_020D0E9C:
+	mov r0, r5
+	add sp, sp, #0x4C
+	ldmia sp!, {r4-r7,lr}
+	bx lr
+_020D0EAC:
+	.word FSi_ReadMemoryCore
+
+	arm_func_start FUN_020D0EB0
+FUN_020D0EB0: ; 0x020D0EB0
+	stmdb sp!, {r4-r8,lr}
+	mov r5, r0
+	bl OS_DisableInterrupts
+	ldr r1, [r5, #0x1c]
+	mov r4, r0
+	ands r0, r1, #0x2
+	movne r0, #0x1
+	moveq r0, #0x0
+	cmp r0, #0x0
+	beq _020D0F64
+	mov r0, r5
+	ldr r1, [r5, #0x1c]
+	bl FS_SuspendArchive
+	ldr r1, [r5, #0x1c]
+	mov r7, r0
+	orr r0, r1, #0x80
+	str r0, [r5, #0x1c]
+	ldr r0, [r5, #0x24]
+	cmp r0, #0x0
+	beq _020D0F1C
+	mov r6, #0x3
+_020D0F04:
+	ldr r8, [r0, #0x4]
+	mov r1, r6
+	bl FSi_ReleaseCommand
+	mov r0, r8
+	cmp r8, #0x0
+	bne _020D0F04
+_020D0F1C:
+	mov r0, #0x0
+	str r0, [r5, #0x24]
+	cmp r7, #0x0
+	beq _020D0F34
+	mov r0, r5
+	bl FS_ResumeArchive
+_020D0F34:
+	mov r0, #0x0
+	str r0, [r5, #0x28]
+	str r0, [r5, #0x2c]
+	str r0, [r5, #0x30]
+	str r0, [r5, #0x34]
+	str r0, [r5, #0x38]
+	str r0, [r5, #0x40]
+	ldr r0, [r5, #0x40]
+	str r0, [r5, #0x3c]
+	ldr r0, [r5, #0x1c]
+	bic r0, r0, #0xa2
+	str r0, [r5, #0x1c]
+_020D0F64:
+	mov r0, r4
+	bl OS_RestoreInterrupts
+	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
diff --git a/arm9/asm/FS_archive.s b/arm9/asm/FS_archive.s
deleted file mode 100644
index 51a3e121..00000000
--- a/arm9/asm/FS_archive.s
+++ /dev/null
@@ -1,897 +0,0 @@
-	.include "asm/macros.inc"
-	.include "global.inc"
-	.section .text
-
-	arm_func_start FS_NotifyArchiveAsyncEnd
-FS_NotifyArchiveAsyncEnd: ; 0x020D0B40
-	stmdb sp!, {r4-r6,lr}
-	mov r4, r0
-	ldr r0, [r4, #0x1c]
-	mov r6, r1
-	ands r0, r0, #0x100
-	beq _020D0B8C
-	ldr r2, [r4, #0x1c]
-	ldr r0, [r4, #0x24]
-	bic r2, r2, #0x100
-	str r2, [r4, #0x1c]
-	bl FSi_ReleaseCommand
-	mov r0, r4
-	bl FSi_NextCommand
-_020D0B74:
-	cmp r0, #0x0
-	ldmeqia sp!, {r4-r6,lr}
-	bxeq lr
-	bl FSi_ExecuteAsyncCommand
-	ldmia sp!, {r4-r6,lr}
-	bx lr
-_020D0B8C:
-	ldr r5, [r4, #0x24]
-	bl OS_DisableInterrupts
-	str r6, [r5, #0x14]
-	ldr r1, [r4, #0x1c]
-	mov r5, r0
-	bic r1, r1, #0x200
-	add r0, r4, #0xc
-	str r1, [r4, #0x1c]
-	bl OS_WakeupThread
-	mov r0, r5
-	bl OS_RestoreInterrupts
-	ldmia sp!, {r4-r6,lr}
-	bx lr
-
-	arm_func_start FS_SetArchiveProc
-FS_SetArchiveProc: ; 0x020D0BC0
-	cmp r2, #0x0
-	moveq r1, #0x0
-	beq _020D0BD4
-	cmp r1, #0x0
-	moveq r2, #0x0
-_020D0BD4:
-	str r1, [r0, #0x54]
-	str r2, [r0, #0x58]
-	bx lr
-
-	arm_func_start FS_ResumeArchive
-FS_ResumeArchive:
-	stmdb sp!, {r4-r7,lr}
-	sub sp, sp, #0x4
-	mov r4, r0
-	mov r6, #0x0
-	bl OS_DisableInterrupts
-	ldr r1, [r4, #0x1c]
-	mov r5, r0
-	ands r0, r1, #0x8
-	movne r0, #0x1
-	moveq r0, r6
-	cmp r0, #0x0
-	moveq r7, #0x1
-	movne r7, #0x0
-	cmp r7, #0x0
-	bne _020D0C34
-	ldr r1, [r4, #0x1c]
-	mov r0, r4
-	bic r1, r1, #0x8
-	str r1, [r4, #0x1c]
-	bl FSi_NextCommand
-	mov r6, r0
-_020D0C34:
-	mov r0, r5
-	bl OS_RestoreInterrupts
-_020D0C3C:
-	cmp r6, #0x0
-	beq _020D0C4C
-	mov r0, r6
-	bl FSi_ExecuteAsyncCommand
-_020D0C4C:
-	mov r0, r7
-	add sp, sp, #0x4
-	ldmia sp!, {r4-r7, lr}
-	bx lr
-
-	arm_func_start FS_SuspendArchive
-FS_SuspendArchive: ; 0x020D0C5C
-	stmdb sp!, {r4-r7,lr}
-	sub sp, sp, #0x4
-	mov r6, r0
-	bl OS_DisableInterrupts
-	ldr r1, [r6, #0x1c]
-	mov r4, r0
-	ands r0, r1, #0x8
-	movne r0, #0x1
-	moveq r0, #0x0
-	cmp r0, #0x0
-	moveq r5, #0x1
-	movne r5, #0x0
-	cmp r5, #0x0
-	beq _020D0CD4
-	ldr r0, [r6, #0x1c]
-	ands r0, r0, #0x10
-	beq _020D0CC8
-	ldr r0, [r6, #0x1c]
-	orr r0, r0, #0x40
-	str r0, [r6, #0x1c]
-	add r7, r6, #0x14
-_020D0CB0:
-	mov r0, r7
-	bl OS_SleepThread
-	ldr r0, [r6, #0x1c]
-	ands r0, r0, #0x40
-	bne _020D0CB0
-	b _020D0CD4
-_020D0CC8:
-	ldr r0, [r6, #0x1c]
-	orr r0, r0, #0x8
-	str r0, [r6, #0x1c]
-_020D0CD4:
-	mov r0, r4
-	bl OS_RestoreInterrupts
-	mov r0, r5
-	add sp, sp, #0x4
-	ldmia sp!, {r4-r7,lr}
-	bx lr
-
-	arm_func_start FS_UnloadArchiveTables
-FS_UnloadArchiveTables: ; 0x020D0CEC
-	stmdb sp!, {r4-r5,lr}
-	sub sp, sp, #0x4
-	mov r5, r0
-	ldr r0, [r5, #0x1c]
-	mov r4, #0x0
-	ands r0, r0, #0x2
-	movne r0, #0x1
-	moveq r0, r4
-	cmp r0, #0x0
-	beq _020D0D74
-	mov r0, r5
-	bl FS_SuspendArchive
-	ldr r1, [r5, #0x1c]
-	ands r1, r1, #0x4
-	movne r1, #0x1
-	moveq r1, #0x0
-	cmp r1, #0x0
-	beq _020D0D64
-	ldr r2, [r5, #0x1c]
-	mov r1, #0x0
-	bic r2, r2, #0x4
-	str r2, [r5, #0x1c]
-	ldr r4, [r5, #0x44]
-	str r1, [r5, #0x44]
-	ldr r1, [r5, #0x3c]
-	str r1, [r5, #0x2c]
-	ldr r1, [r5, #0x40]
-	str r1, [r5, #0x34]
-	ldr r1, [r5, #0x48]
-	str r1, [r5, #0x50]
-_020D0D64:
-	cmp r0, #0x0
-	beq _020D0D74
-	mov r0, r5
-	bl FS_ResumeArchive
-_020D0D74:
-	mov r0, r4
-	add sp, sp, #0x4
-	ldmia sp!, {r4-r5,lr}
-	bx lr
-
-	arm_func_start FUN_020D0D84
-FUN_020D0D84: ; 0x020D0D84
-	stmdb sp!, {r4-r7,lr}
-	sub sp, sp, #0x4c
-	mov r7, r0
-	ldr r3, [r7, #0x30]
-	ldr r0, [r7, #0x38]
-	mov r6, r1
-	add r0, r3, r0
-	add r0, r0, #0x20
-	add r0, r0, #0x1f
-	bic r5, r0, #0x1f
-	cmp r5, r2
-	bhi _020D0E9C
-	add r1, r6, #0x1f
-	add r0, sp, #0x4
-	bic r4, r1, #0x1f
-	bl FS_InitFile
-	ldr r2, [r7, #0x2c]
-	mvn r0, #0x0
-	str r0, [sp, #0x0]
-	ldr r3, [r7, #0x30]
-	add r0, sp, #0x4
-	mov r1, r7
-	add r3, r2, r3
-	bl FS_OpenFileDirect
-_020D0DE4:
-	cmp r0, #0x0
-	beq _020D0E1C
-	ldr r2, [r7, #0x30]
-	add r0, sp, #0x4
-	mov r1, r4
-	bl FS_ReadFile
-	cmp r0, #0x0
-	bge _020D0E14
-	ldr r2, [r7, #0x30]
-	mov r0, r4
-	mov r1, #0x0
-	bl MI_CpuFill8
-_020D0E14:
-	add r0, sp, #0x4
-	bl FS_CloseFile
-_020D0E1C:
-	str r4, [r7, #0x2C]
-	ldr ip, [r7, #0x30]
-	ldr r2, [r7, #0x34]
-	mvn r0, #0x0
-	str r0, [sp]
-	ldr r3, [r7, #0x38]
-	add r0, sp, #0x4
-	mov r1, r7
-	add r3, r2, r3
-	add r4, r4, ip
-	bl FS_OpenFileDirect
-	cmp r0, #0x0
-	beq _020D0E80
-	ldr r2, [r7, #0x38]
-	add r0, sp, #0x4
-	mov r1, r4
-	bl FS_ReadFile
-	cmp r0, #0x0
-	bge _020D0E78
-	ldr r2, [r7, #0x38]
-	mov r0, r4
-	mov r1, #0x0
-	bl MI_CpuFill8
-_020D0E78:
-	add r0, sp, #0x4
-	bl FS_CloseFile
-_020D0E80:
-	str r4, [r7, #0x34]
-	ldr r0, _020D0EAC
-	str r6, [r7, #0x44]
-	str r0, [r7, #0x50]
-	ldr r0, [r7, #0x1C]
-	orr r0, r0, #0x4
-	str r0, [r7, #0x1C]
-_020D0E9C:
-	mov r0, r5
-	add sp, sp, #0x4C
-	ldmia sp!, {r4-r7,lr}
-	bx lr
-_020D0EAC:
-	.word FSi_ReadMemoryCore
-
-	arm_func_start FUN_020D0EB0
-FUN_020D0EB0: ; 0x020D0EB0
-	stmdb sp!, {r4-r8,lr}
-	mov r5, r0
-	bl OS_DisableInterrupts
-	ldr r1, [r5, #0x1c]
-	mov r4, r0
-	ands r0, r1, #0x2
-	movne r0, #0x1
-	moveq r0, #0x0
-	cmp r0, #0x0
-	beq _020D0F64
-	mov r0, r5
-	ldr r1, [r5, #0x1c]
-	bl FS_SuspendArchive
-	ldr r1, [r5, #0x1c]
-	mov r7, r0
-	orr r0, r1, #0x80
-	str r0, [r5, #0x1c]
-	ldr r0, [r5, #0x24]
-	cmp r0, #0x0
-	beq _020D0F1C
-	mov r6, #0x3
-_020D0F04:
-	ldr r8, [r0, #0x4]
-	mov r1, r6
-	bl FSi_ReleaseCommand
-	mov r0, r8
-	cmp r8, #0x0
-	bne _020D0F04
-_020D0F1C:
-	mov r0, #0x0
-	str r0, [r5, #0x24]
-	cmp r7, #0x0
-	beq _020D0F34
-	mov r0, r5
-	bl FS_ResumeArchive
-_020D0F34:
-	mov r0, #0x0
-	str r0, [r5, #0x28]
-	str r0, [r5, #0x2c]
-	str r0, [r5, #0x30]
-	str r0, [r5, #0x34]
-	str r0, [r5, #0x38]
-	str r0, [r5, #0x40]
-	ldr r0, [r5, #0x40]
-	str r0, [r5, #0x3c]
-	ldr r0, [r5, #0x1c]
-	bic r0, r0, #0xa2
-	str r0, [r5, #0x1c]
-_020D0F64:
-	mov r0, r4
-	bl OS_RestoreInterrupts
-	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
-
-	arm_func_start FSi_ExecuteSyncCommand
-FSi_ExecuteSyncCommand: ; 0x020D138C
-	stmdb sp!, {r4,lr}
-	mov r4, r0
-	ldr r1, [r4, #0x10]
-	bl FSi_TranslateCommand
-	mov r1, r0
-	mov r0, r4
-	bl FSi_ReleaseCommand
-	ldr r0, [r4, #0x8]
-	bl FSi_NextCommand
-_020D13B0:
-	cmp r0, #0x0
-	beq _020D13BC
-	bl FSi_ExecuteAsyncCommand
-_020D13BC:
-	ldr r0, [r4, #0x14]
-	cmp r0, #0x0
-	moveq r0, #0x1
-	movne r0, #0x0
-	ldmia sp!, {r4,lr}
-	bx lr
-
-	arm_func_start FSi_ExecuteAsyncCommand
-FSi_ExecuteAsyncCommand: ; 0x020D13D4
-	stmdb sp!, {r4-r8,lr}
-	movs r6, r0
-	ldr r5, [r6, #0x8]
-	ldmeqia sp!, {r4-r8,lr}
-	bxeq lr
-	mov r7, #0x0
-	mov r8, #0x1
-_020D13F0:
-	bl OS_DisableInterrupts
-	ldr r1, [r6, #0xc]
-	mov r4, r0
-	orr r0, r1, #0x40
-	str r0, [r6, #0xc]
-	ldr r0, [r6, #0xc]
-	ands r0, r0, #0x4
-	movne r0, r8
-	moveq r0, r7
-	cmp r0, #0x0
-	beq _020D1434
-	add r0, r6, #0x18
-	bl OS_WakeupThread
-	mov r0, r4
-	bl OS_RestoreInterrupts
-	ldmia sp!, {r4-r8,lr}
-	bx lr
-_020D1434:
-	ldr r1, [r6, #0xc]
-	mov r0, r4
-	orr r1, r1, #0x8
-	str r1, [r6, #0xc]
-	bl OS_RestoreInterrupts
-	ldr r1, [r6, #0x10]
-	mov r0, r6
-	bl FSi_TranslateCommand
-	cmp r0, #0x6
-	ldmeqia sp!, {r4-r8,lr}
-	bxeq lr
-	mov r0, r5
-	bl FSi_NextCommand
-	movs r6, r0
-	bne _020D13F0
-	ldmia sp!, {r4-r8,lr}
-	bx lr
-
-	arm_func_start FSi_NextCommand
-FSi_NextCommand:
-	stmdb sp!, {r4-r9,lr}
-	sub sp, sp, #0x4c
-	mov r6, r0
-	bl OS_DisableInterrupts
-	ldr r1, [r6, #0x1c]
-	mov r5, r0
-	ands r0, r1, #0x20
-	beq _020D1500
-	ldr r0, [r6, #0x1c]
-	bic r0, r0, #0x20
-	str r0, [r6, #0x1c]
-	ldr r0, [r6, #0x24]
-	cmp r0, #0x0
-	beq _020D1500
-	mov r8, #0x0
-	mov r9, #0x1
-	mov r7, #0x3
-_020D14BC:
-	ldr r1, [r0, #0xc]
-	ldr r4, [r0, #0x4]
-	ands r1, r1, #0x2
-	movne r1, r9
-	moveq r1, r8
-	cmp r1, #0x0
-	beq _020D14F4
-	ldr r1, [r6, #0x24]
-	cmp r1, r0
-	mov r1, r7
-	streq r4, [r6, #0x24]
-	bl FSi_ReleaseCommand
-_020D14EC:
-	cmp r4, #0x0
-	ldreq r4, [r6, #0x24]
-_020D14F4:
-	mov r0, r4
-	cmp r4, #0x0
-	bne _020D14BC
-_020D1500:
-	ldr r0, [r6, #0x1c]
-	ands r0, r0, #0x40
-	bne _020D15EC
-	ldr r0, [r6, #0x1c]
-	ands r0, r0, #0x8
-	movne r0, #0x1
-	moveq r0, #0x0
-	cmp r0, #0x0
-	bne _020D15EC
-	ldr r4, [r6, #0x24]
-	cmp r4, #0x0
-	beq _020D15EC
-	ldr r0, [r6, #0x1c]
-	ands r0, r0, #0x10
-	movne r0, #0x1
-	moveq r0, #0x0
-	cmp r0, #0x0
-	moveq r7, #0x1
-	movne r7, #0x0
-	cmp r7, #0x0
-	ldrne r0, [r6, #0x1c]
-	orrne r0, r0, #0x10
-	strne r0, [r6, #0x1c]
-	mov r0, r5
-	bl OS_RestoreInterrupts
-_020D1564:
-	cmp r7, #0x0
-	beq _020D1588
-	ldr r0, [r6, #0x58]
-	ands r0, r0, #0x200
-	beq _020D1588
-	ldr r2, [r6, #0x54]
-	mov r0, r4
-	mov r1, #0x9
-	blx r2
-_020D1588:
-	bl OS_DisableInterrupts
-	ldr r1, [r4, #0xC]
-	mov r5, r0
-	orr r0, r1, #0x40
-	str r0, [r4, #0xC]
-	ldr r0, [r4, #0xC]
-	ands r0, r0, #0x4
-	movne r0, #0x1
-	moveq r0, #0x0
-	cmp r0, #0x0
-	beq _020D15D4
-	add r0, r4, #0x18
-	bl OS_WakeupThread
-	mov r0, r5
-	bl OS_RestoreInterrupts
-	add sp, sp, #0x4c
-	mov r0, #0x0
-	ldmia sp!, {r4-r9, lr}
-	bx lr
-_020D15D4:
-	mov r0, r5
-	bl OS_RestoreInterrupts
-	add sp, sp, #0x4c
-	mov r0, r4
-	ldmia sp!, {r4-r9, lr}
-	bx lr
-_020D15EC:
-	ldr r0, [r6, #0x1c]
-	ands r0, r0, #0x10
-	beq _020D162C
-	ldr r0, [r6, #0x1c]
-	bic r0, r0, #0x10
-	str r0, [r6, #0x1c]
-	ldr r0, [r6, #0x58]
-	ands r0, r0, #0x400
-	beq _020D162C
-	add r0, sp, #0x0
-	bl FS_InitFile
-	str r6, [sp, #0x8]
-	ldr r2, [r6, #0x54]
-	add r0, sp, #0x0
-	mov r1, #0xa
-	blx r2
-_020D162C:
-	ldr r0, [r6, #0x1c]
-	ands r0, r0, #0x40
-	beq _020D1658
-	ldr r1, [r6, #0x1c]
-	add r0, r6, #0x14
-	bic r1, r1, #0x40
-	str r1, [r6, #0x1c]
-	ldr r1, [r6, #0x1c]
-	orr r1, r1, #0x8
-	str r1, [r6, #0x1c]
-	bl OS_WakeupThread
-_020D1658:
-	mov r0, r5
-	bl OS_RestoreInterrupts
-_020D1660:
-	mov r0, #0x0
-	add sp, sp, #0x4c
-	ldmia sp!, {r4-r9, lr}
-	bx lr
-
-	arm_func_start FSi_ReadMemoryCore
-FSi_ReadMemoryCore: ; 0x020D1670
-	stmdb sp!, {lr}
-	sub sp, sp, #0x4
-	mov r0, r2
-	mov r2, r3
-	bl MI_CpuCopy8
-_020D1684:
-	mov r0, #0x0
-	add sp, sp, #0x4
-	ldmfd sp!, {lr}
-	bx lr
-
-	arm_func_start FSi_WriteMemCallback
-FSi_WriteMemCallback: ; 0x020D1694
-	stmdb sp!, {lr}
-	sub sp, sp, #0x4
-	ldr r12, [r0, #0x28]
-	mov r0, r1
-	add r1, r12, r2
-	mov r2, r3
-	bl MI_CpuCopy8
-_020D16B0:
-	mov r0, #0x0
-	add sp, sp, #0x4
-	ldmfd sp!, {lr}
-	bx lr
-
-	arm_func_start FSi_ReadMemCallback
-FSi_ReadMemCallback: ; 0x020D16C0
-	stmdb sp!, {lr}
-	sub sp, sp, #0x4
-	ldr r0, [r0, #0x28]
-	add r0, r0, r2
-	mov r2, r3
-	bl MI_CpuCopy8
-_020D16D8:
-	mov r0, #0x0
-	add sp, sp, #0x4
-	ldmfd sp!, {lr}
-	bx lr
-
-	arm_func_start FSi_GetPackedName
-FSi_GetPackedName: ; 0x020D16E8
-	stmdb sp!, {lr}
-	sub sp, sp, #0x4
-	cmp r1, #0x3
-	mov lr, #0x0
-	bgt _020D173C
-	mov r12, lr
-	cmp r1, #0x0
-	ble _020D173C
-	mov r3, lr
-_020D170C:
-	ldrb r2, [r0, r12]
-	cmp r2, #0x0
-	beq _020D173C
-	sub r2, r2, #0x41
-	cmp r2, #0x19
-	addls r2, r2, #0x61
-	addhi r2, r2, #0x41
-	add r12, r12, #0x1
-	orr lr, lr, r2, lsl r3
-	cmp r12, r1
-	add r3, r3, #0x8
-	blt _020D170C
-_020D173C:
-	mov r0, lr
-	add sp, sp, #0x4
-	ldmia sp!, {lr}
-	bx lr
diff --git a/arm9/asm/FS_rom.s b/arm9/asm/FS_rom.s
index 61a7c521..dc7baf6c 100644
--- a/arm9/asm/FS_rom.s
+++ b/arm9/asm/FS_rom.s
@@ -236,7 +236,6 @@ FSi_OnRomReadDone: ; 0x020D2018
 	stmdb sp!, {r4,lr}
 	mov r4, r0
 	bl CARD_IsPulledOut
-_020D2024:
 	cmp r0, #0x0
 	movne r1, #0x5
 	moveq r1, #0x0
diff --git a/arm9/lib/include/FS_archive.h b/arm9/lib/include/FS_archive.h
index 66840b32..b39e7738 100644
--- a/arm9/lib/include/FS_archive.h
+++ b/arm9/lib/include/FS_archive.h
@@ -47,6 +47,37 @@ typedef enum {
     FS_COMMAND_INVALID
 } FSCommandType;
 
+/* Asynchronous commands*/
+#define	FS_ARCHIVE_PROC_READFILE		(1 << FS_COMMAND_READFILE)
+#define	FS_ARCHIVE_PROC_WRITEFILE		(1 << FS_COMMAND_WRITEFILE)
+/* All asynchronous commands*/
+#define	FS_ARCHIVE_PROC_ASYNC	\
+	(FS_ARCHIVE_PROC_READFILE | FS_ARCHIVE_PROC_WRITEFILE)
+
+/* Synchronous commands*/
+#define	FS_ARCHIVE_PROC_SEEKDIR			(1 << FS_COMMAND_SEEKDIR)
+#define	FS_ARCHIVE_PROC_READDIR			(1 << FS_COMMAND_READDIR)
+#define	FS_ARCHIVE_PROC_FINDPATH		(1 << FS_COMMAND_FINDPATH)
+#define	FS_ARCHIVE_PROC_GETPATH			(1 << FS_COMMAND_GETPATH)
+#define	FS_ARCHIVE_PROC_OPENFILEFAST	(1 << FS_COMMAND_OPENFILEFAST)
+#define	FS_ARCHIVE_PROC_OPENFILEDIRECT	(1 << FS_COMMAND_OPENFILEDIRECT)
+#define	FS_ARCHIVE_PROC_CLOSEFILE		(1 << FS_COMMAND_CLOSEFILE)
+/* All synchronous commands*/
+#define	FS_ARCHIVE_PROC_SYNC	\
+	(FS_ARCHIVE_PROC_SEEKDIR | FS_ARCHIVE_PROC_READDIR |	\
+	 FS_ARCHIVE_PROC_FINDPATH | FS_ARCHIVE_PROC_GETPATH |	\
+	FS_ARCHIVE_PROC_OPENFILEFAST | FS_ARCHIVE_PROC_OPENFILEDIRECT | FS_ARCHIVE_PROC_CLOSEFILE)
+
+/* Messages when status changes*/
+#define	FS_ARCHIVE_PROC_ACTIVATE		(1 << FS_COMMAND_ACTIVATE)
+#define	FS_ARCHIVE_PROC_IDLE			(1 << FS_COMMAND_IDLE)
+#define	FS_ARCHIVE_PROC_SUSPENDING		(1 << FS_COMMAND_SUSPEND)
+#define	FS_ARCHIVE_PROC_RESUME			(1 << FS_COMMAND_RESUME)
+/* All messages when status changes*/
+#define	FS_ARCHIVE_PROC_STATUS	\
+	(FS_ARCHIVE_PROC_ACTIVATE | FS_ARCHIVE_PROC_IDLE |	\
+	 FS_ARCHIVE_PROC_SUSPENDING | FS_ARCHIVE_PROC_RESUME)
+
 typedef enum {
     FS_RESULT_SUCCESS = 0,
     FS_RESULT_FAILURE,
@@ -107,6 +138,31 @@ static inline BOOL FS_IsArchiveLoaded(volatile const FSArchive * p_arc)
     return (p_arc->flag & FS_ARCHIVE_FLAG_LOADED) ? TRUE : FALSE;
 }
 
+static inline u32 FS_GetArchiveOffset(const FSArchive * p_arc, u32 pos)
+{
+    return p_arc->base + pos;
+}
+
+static inline BOOL FSi_IsArchiveCanceling(volatile const FSArchive * p_arc)
+{
+    return (p_arc->flag & FS_ARCHIVE_FLAG_CANCELING) != 0;
+}
+
+static inline BOOL FS_IsArchiveSuspended(volatile const FSArchive * p_arc)
+{
+    return (p_arc->flag & FS_ARCHIVE_FLAG_SUSPEND) ? TRUE : FALSE;
+}
+
+static inline BOOL FSi_IsArchiveSuspending(volatile const FSArchive * p_arc)
+{
+    return (p_arc->flag & FS_ARCHIVE_FLAG_SUSPENDING) != 0;
+}
+
+static inline BOOL FSi_IsArchiveRunning(volatile const FSArchive * p_arc)
+{
+    return (p_arc->flag & FS_ARCHIVE_FLAG_RUNNING) != 0;
+}
+
 BOOL FSi_SendCommand(struct FSFile * file, FSCommandType command);
 BOOL FSi_ExecuteSyncCommand(struct FSFile * file);
 
diff --git a/arm9/lib/include/FS_command.h b/arm9/lib/include/FS_command.h
new file mode 100644
index 00000000..db878f3f
--- /dev/null
+++ b/arm9/lib/include/FS_command.h
@@ -0,0 +1,9 @@
+#ifndef NITRO_FS_COMMAND_H_
+#define NITRO_FS_COMMAND_H_
+
+#include "FS_file.h"
+
+void FSi_ReleaseCommand(FSFile * file, FSResult signal);
+FSResult FSi_TranslateCommand(FSFile * file, FSCommandType command);
+
+#endif //NITRO_FS_COMMAND_H_
diff --git a/arm9/lib/include/FS_file.h b/arm9/lib/include/FS_file.h
index 89f69d86..92e2149e 100644
--- a/arm9/lib/include/FS_file.h
+++ b/arm9/lib/include/FS_file.h
@@ -189,4 +189,24 @@ static inline u32 const FS_GetLength(volatile const FSFile * p_file)
     return p_file->prop.file.bottom - p_file->prop.file.top;
 }
 
+static inline BOOL FS_IsCanceling(volatile const FSFile * p_file)
+{
+    return (p_file->stat & FS_FILE_STATUS_CANCEL) ? TRUE : FALSE;
+}
+
+static inline BOOL FS_IsFileSyncMode(volatile const FSFile * p_file)
+{
+    return (p_file->stat & FS_FILE_STATUS_SYNC) ? TRUE : FALSE;
+}
+
+static inline BOOL FS_IsBusy(volatile const FSFile * p_file)
+{
+    return p_file->stat & FS_FILE_STATUS_BUSY ? TRUE : FALSE;
+}
+
+static inline BOOL FS_IsSucceeded(volatile const FSFile * p_file)
+{
+    return (p_file->error == FS_RESULT_SUCCESS) ? TRUE : FALSE;
+}
+
 #endif //NITRO_FS_FILE_H_
diff --git a/arm9/lib/include/OS_thread.h b/arm9/lib/include/OS_thread.h
index 8820a7a0..c5602559 100644
--- a/arm9/lib/include/OS_thread.h
+++ b/arm9/lib/include/OS_thread.h
@@ -29,6 +29,7 @@ struct _OSThread
 };
 
 void OS_SleepThread(OSThreadQueue * queue);
+void OS_WakeupThread(OSThreadQueue * queue);
 static inline void OS_InitThreadQueue(OSThreadQueue * queue)
 {
     queue->head = queue->tail = NULL;
diff --git a/arm9/lib/src/FS_archive.c b/arm9/lib/src/FS_archive.c
new file mode 100644
index 00000000..39daa324
--- /dev/null
+++ b/arm9/lib/src/FS_archive.c
@@ -0,0 +1,147 @@
+#include "FS_archive.h"
+#include "FS_file.h"
+#include "FS_command.h"
+#include "MI_memory.h"
+#include "MI_byteAccess.h"
+
+FSArchive * arc_list = NULL;
+FSDirPos current_dir_pos;
+
+u32 FSi_GetPackedName(const char * name, int name_len)
+{
+    u32 ret = 0;
+    if (name_len <= FS_ARCHIVE_NAME_LEN_MAX)
+    {
+        int i = 0;
+        for (; i < name_len; i++)
+        {
+            u32 c = MI_ReadByte(name + i);
+            if (!c)
+                break;
+            c = (u32)(c - 'A');
+            if (c <= (u32)('Z' - 'A'))
+                c = (u32)(c + 'a');
+            else
+                c = (u32)(c + 'A');
+            ret |= (u32)(c << (i * 8));
+        }
+    }
+    return ret;
+}
+
+FSResult FSi_ReadMemCallback(FSArchive * p_arc, u8 * dest, u32 offset, u32 size)
+{
+    MI_CpuCopy8((const void *)FS_GetArchiveOffset(p_arc, offset), dest, size);
+    return FS_RESULT_SUCCESS;
+}
+
+FSResult FSi_WriteMemCallback(FSArchive * p_arc, const u8 * src, u32 offset, u32 size)
+{
+    MI_CpuCopy8(src, (void *)FS_GetArchiveOffset(p_arc, offset), size);
+    return FS_RESULT_SUCCESS;
+}
+
+FSResult FSi_ReadMemoryCore(FSArchive * p_arc, u8 * dest, u32 offset, u32 size)
+{
+    MI_CpuCopy8((const void *)offset, dest, size);
+    return FS_RESULT_SUCCESS;
+}
+
+FSFile * FSi_NextCommand(FSArchive * p_arc)
+{
+    OSIntrMode bak_psr = OS_DisableInterrupts();
+    if (FSi_IsArchiveCanceling(p_arc))
+    {
+        FSFile *p, *q;
+        p_arc->flag &= ~FS_ARCHIVE_FLAG_CANCELING;
+        for (p = p_arc->list.next; p; p = q)
+        {
+            q = p->link.next;
+            if (FS_IsCanceling(p))
+            {
+                if (p_arc->list.next == p)
+                    p_arc->list.next = q;
+                FSi_ReleaseCommand(p, FS_RESULT_CANCELED);
+                if (!q)
+                    q = p_arc->list.next;
+            }
+        }
+    }
+    if (!FSi_IsArchiveSuspending(p_arc) && !FS_IsArchiveSuspended(p_arc))
+    {
+        FSFile * p_file = p_arc->list.next;
+        if (p_file != NULL)
+        {
+            const BOOL is_start = !FSi_IsArchiveRunning(p_arc);
+            if (is_start)
+                p_arc->flag |= FS_ARCHIVE_FLAG_RUNNING;
+            OS_RestoreInterrupts(bak_psr);
+            if (is_start)
+            {
+                if ((p_arc->proc_flag & FS_ARCHIVE_PROC_ACTIVATE) != 0)
+                    (*p_arc->proc) (p_file, FS_COMMAND_ACTIVATE);
+            }
+            bak_psr = OS_DisableInterrupts();
+            p_file->stat |= FS_FILE_STATUS_OPERATING;
+            if (FS_IsFileSyncMode(p_file))
+            {
+                OS_WakeupThread(p_file->queue);
+                OS_RestoreInterrupts(bak_psr);
+                return NULL;
+            }
+            OS_RestoreInterrupts(bak_psr);
+            return p_file;
+        }
+    }
+    if (FSi_IsArchiveRunning(p_arc))
+    {
+        p_arc->flag &= ~FS_ARCHIVE_FLAG_RUNNING;
+        if (p_arc->proc_flag & FS_ARCHIVE_PROC_IDLE)
+        {
+            FSFile tmp;
+            FS_InitFile(&tmp);
+            tmp.arc = p_arc;
+            (*p_arc->proc)(&tmp, FS_COMMAND_IDLE);
+        }
+    }
+    if (FSi_IsArchiveSuspending(p_arc))
+    {
+        p_arc->flag &= ~FS_ARCHIVE_FLAG_SUSPENDING;
+        p_arc->flag |= FS_ARCHIVE_FLAG_SUSPEND;
+        OS_WakeupThread(&p_arc->stat_q);
+    }
+    OS_RestoreInterrupts(bak_psr);
+    return NULL;
+}
+
+void FSi_ExecuteAsyncCommand(FSFile * p_file)
+{
+    FSArchive *const p_arc = p_file->arc;
+    while (p_file)
+    {
+        OSIntrMode bak_psr = OS_DisableInterrupts();
+        p_file->stat |= FS_FILE_STATUS_OPERATING;
+        if (FS_IsFileSyncMode(p_file))
+        {
+            OS_WakeupThread(p_file->queue);
+            OS_RestoreInterrupts(bak_psr);
+            break;
+        }
+        p_file->stat |= FS_FILE_STATUS_ASYNC;
+        OS_RestoreInterrupts(bak_psr);
+        if (FSi_TranslateCommand(p_file, p_file->command) == FS_RESULT_PROC_ASYNC)
+            break;
+        p_file = FSi_NextCommand(p_arc);
+    }
+}
+
+BOOL FSi_ExecuteSyncCommand(FSFile * p_file)
+{
+    FSFile * p_target;
+    FSResult ret = FSi_TranslateCommand(p_file, p_file->command);
+    FSi_ReleaseCommand(p_file, ret);
+    p_target = FSi_NextCommand(p_file->arc);
+    if (p_target)
+        FSi_ExecuteAsyncCommand(p_target);
+    return FS_IsSucceeded(p_file);
+}
diff --git a/arm9/lib/src/FS_file.c b/arm9/lib/src/FS_file.c
index 8ca89af8..479a5085 100644
--- a/arm9/lib/src/FS_file.c
+++ b/arm9/lib/src/FS_file.c
@@ -11,16 +11,6 @@ static inline BOOL FSi_IsSlash(u32 c)
     return (c == '/') || (c == '\\');
 }
 
-static inline BOOL FS_IsBusy(volatile const FSFile * p_file)
-{
-    return p_file->stat & FS_FILE_STATUS_BUSY ? TRUE : FALSE;
-}
-
-static inline BOOL FS_IsSucceeded(volatile const FSFile * p_file)
-{
-    return p_file->error == FS_RESULT_SUCCESS ? TRUE : FALSE;
-}
-
 void FS_Init(u32 default_dma_no)
 {
     if (!is_init)
-- 
cgit v1.2.3