Finish FS_command_default.c

11 files changed, 404 insertions, 634 deletions

diff --git a/arm9/arm9.lcf b/arm9/arm9.lcf
index 3b7215de..2cc19d81 100644
--- a/arm9/arm9.lcf
+++ b/arm9/arm9.lcf
@@ -112,6 +112,7 @@ MEMORY {
 SECTIONS {
 #include "undefined_syms.txt"
 	.arm9 : {
+		ALIGNALL(4); . = ALIGN(32);
 		SDK_STATIC_START = .;
 		SDK_STATIC_TEXT_START = .;
 		secure.o (.text)
@@ -203,7 +204,6 @@ SECTIONS {
 		PXI_init.o (.text)
 		PXI_fifo.o (.text)
 		FS_command.o (.text)
-		FS_command_default.asm.o (.text)
 		FS_command_default.o (.text)
 		FS_archive.o (.text)
 		FS_file.o (.text)
@@ -223,15 +223,17 @@ SECTIONS {
 		libc.o (.text)
 		/* MWCC library */
 		libmwcc.o (.text)
-		SDK_STATIC_TEXT_END = .;
 
-		/* Static data */
-		SDK_STATIC_DATA_START = .;
-		rom2.o (.data)
-		string_util.o (.data)
-		rom2_2.o (.data)
+		/* Text data */
+		rom2.o (.rodata)
+		string_util.o (.rodata)
+		rom2_2.o (.rodata)
 		FS_command_default.o (.rodata)
+		/* . = ALIGN(32); */
+		SDK_STATIC_TEXT_END = .; /* somewhere around here */
+		SDK_STATIC_DATA_START = .;
 		rom2_3.o (.data)
+		FS_command_default.o (.data)
 		FS_rom.o (.data)
 		rom2_4.o (.data)
 		SDK_STATIC_DATA_END = .;
diff --git a/arm9/asm/FS_command_default.asm.s b/arm9/asm/FS_command_default.asm.s
deleted file mode 100644
index 550c82ea..00000000
--- a/arm9/asm/FS_command_default.asm.s
+++ /dev/null
@@ -1,618 +0,0 @@
-	.include "asm/macros.inc"
-	.include "global.inc"
-	.section .text
-	.extern FSi_StrNICmp
-	.extern FSi_ReadTable
-	.extern FSi_SeekDirDirect
-
-	arm_func_start FSi_CloseFileCommand
-FSi_CloseFileCommand: ; 0x020D0114
-	mov r0, #0x0
-	bx lr
-
-	arm_func_start FSi_OpenFileDirectCommand
-FSi_OpenFileDirectCommand: ; 0x020D011C
-	ldr r1, [r0, #0x30]
-	str r1, [r0, #0x24]
-	ldr r1, [r0, #0x30]
-	str r1, [r0, #0x2c]
-	ldr r1, [r0, #0x34]
-	str r1, [r0, #0x28]
-	ldr r1, [r0, #0x38]
-	str r1, [r0, #0x20]
-	mov r0, #0x0
-	bx lr
-
-	arm_func_start FSi_OpenFileFastCommand
-FSi_OpenFileFastCommand: ; 0x020D0144
-	stmdb sp!, {r4-r5,lr}
-	sub sp, sp, #0x14
-	mov r5, r0
-	ldr r1, [r5, #0x8]
-	ldr r4, [r5, #0x34]
-	ldr r0, [r1, #0x30]
-	mov r2, r4, lsl #0x3
-	cmp r2, r0
-	addcs sp, sp, #0x14
-	movcs r0, #0x1
-	ldmcsia sp!, {r4-r5,lr}
-	bxcs lr
-	str r1, [sp, #0x8]
-	ldr r1, [r1, #0x2c]
-	add r0, sp, #0x8
-	add r3, r1, r2
-	add r1, sp, #0x0
-	mov r2, #0x8
-	str r3, [sp, #0xc]
-	bl FSi_ReadTable
-	cmp r0, #0
-	addne sp, sp, #0x14
-	ldmneia sp!, {r4-r5,lr}
-	bxne lr
-	ldr r1, [sp]
-	mov r0, r5
-	str r1, [r5, #0x30]
-	ldr r2, [sp, #0x4]
-	mov r1, #7
-	str r2, [r5, #0x34]
-	str r4, [r5, #0x38]
-	bl FSi_TranslateCommand
-	add sp, sp, #0x14
-	ldmia sp!, {r4-r5,lr}
-	bx lr
-
-	arm_func_start FSi_GetPathCommand
-FSi_GetPathCommand: ; 0x020D01D0
-	stmdb sp!, {r4-r11,lr}
-	sub sp, sp, #0xe4
-	mov r4, r0
-	ldr r1, [r4, #0x8]
-	add r0, sp, #0x98
-	add r11, r4, #0x30
-	str r1, [sp, #0x0]
-	bl FS_InitFile
-	ldr r0, [r4, #0x8]
-	str r0, [sp, #0xa0]
-	ldr r0, [r4, #0xc]
-	ands r0, r0, #0x20
-	movne r0, #0x1
-	moveq r0, #0x0
-	cmp r0, #0x0
-	ldrneh r5, [r4, #0x24]
-	movne r4, #0x10000
-	bne _020D02BC
-	ldrh r0, [r11, #0x8]
-	ldr r4, [r4, #0x20]
-	cmp r0, #0x0
-	ldrneh r5, [r11, #0xa]
-	bne _020D02BC
-	mov r10, #0x0
-	mov r9, r10
-	mov r5, #0x10000
-	add r8, sp, #0x98
-	mov r6, #0x3
-	mov r7, #0x1
-_020D0244:
-	mov r0, r8
-	mov r1, r10
-	bl FSi_SeekDirDirect
-	add r2, sp, #0x4
-	cmp r10, #0x0
-	mov r0, r8
-	mov r1, r6
-	ldreq r9, [sp, #0xc4]
-	str r2, [sp, #0xc8]
-	str r7, [sp, #0xcc]
-	bl FSi_TranslateCommand
-_020D0270:
-	cmp r0, #0x0
-	bne _020D02A8
-_020D0278:
-	ldr r0, [sp, #0x10]
-	cmp r0, #0x0
-	bne _020D0294
-	ldr r0, [sp, #0x8]
-	cmp r0, r4
-	ldreqh r5, [sp, #0xbc]
-	beq _020D02A8
-_020D0294:
-	mov r0, r8
-	mov r1, r6
-	bl FSi_TranslateCommand
-	cmp r0, #0x0
-	beq _020D0278
-_020D02A8:
-	cmp r5, #0x10000
-	bne _020D02BC
-	add sl, sl, #0x1
-	cmp sl, r9
-	bcc _020D0244
-_020D02BC:
-	cmp r5, #0x10000
-	moveq r0, #0x0
-	streqh r0, [r11, #0x8]
-	addeq sp, sp, #0xe4
-	moveq r0, #0x1
-	ldmeqia sp!, {r4-r11,lr}
-	bxeq lr
-	ldrh r0, [r11, #0x8]
-	cmp r0, #0x0
-	bne _020D03B8
-	ldr r0, [sp, #0x0]
-	mov r1, #0x0
-	ldr r0, [r0, #0x0]
-	cmp r0, #0xff
-	addls r9, r1, #0x1
-	bls _020D0308
-	cmp r0, #0xff00
-	addls r9, r1, #0x2
-	addhi r9, r1, #0x3
-_020D0308:
-	cmp r4, #0x10000
-	ldrne r0, [sp, #0x14]
-	add r9, r9, #0x2
-	addne r9, r9, r0
-	mov r10, r5
-	cmp r5, #0x0
-	beq _020D03AC
-	add r0, sp, #0x98
-	mov r1, r5
-	bl FSi_SeekDirDirect
-	add r8, sp, #0x98
-	mov r6, #0x3
-	mov r7, #0x1
-_020D033C:
-	ldr r1, [sp, #0xc4]
-	mov r0, r8
-	bl FSi_SeekDirDirect
-	add r2, sp, #0x4
-	mov r0, r8
-	mov r1, r6
-	str r2, [sp, #0xc8]
-	str r7, [sp, #0xcc]
-	bl FSi_TranslateCommand
-_020D0360:
-	cmp r0, #0x0
-	bne _020D03A0
-_020D0368:
-	ldr r0, [sp, #0x10]
-	cmp r0, #0x0
-	beq _020D038C
-	ldrh r0, [sp, #0x8]
-	cmp r0, sl
-	ldreq r0, [sp, #0x14]
-	addeq r0, r0, #0x1
-	addeq r9, r9, r0
-	beq _020D03A0
-_020D038C:
-	mov r0, r8
-	mov r1, r6
-	bl FSi_TranslateCommand
-	cmp r0, #0x0
-	beq _020D0368
-_020D03A0:
-	ldrh sl, [sp, #0xbc]
-	cmp sl, #0x0
-	bne _020D033C
-_020D03AC:
-	add r0, r9, #0x1
-	strh r0, [r11, #0x8]
-	strh r5, [r11, #0xa]
-_020D03B8:
-	ldr r7, [r11, #0x0]
-	cmp r7, #0x0
-	addeq sp, sp, #0xe4
-	moveq r0, #0x0
-	ldmeqia sp!, {r4-r11,lr}
-	bxeq lr
-	ldrh r6, [r11, #0x8]
-	ldr r0, [r11, #0x4]
-	cmp r0, r6
-	addcc sp, sp, #0xe4
-	movcc r0, #0x1
-	ldmccia sp!, {r4-r11,lr}
-	bxcc lr
-	ldr r0, [sp, #0x0]
-	mov r9, #0x0
-	ldr r0, [r0, #0x0]
-	cmp r0, #0xff
-	movls r8, #0x1
-	bls _020D0410
-	cmp r0, #0xff00
-	movls r8, #0x2
-	movhi r8, #0x3
-_020D0410:
-	ldr r0, [sp, #0x0]
-	mov r1, r7
-	mov r2, r8
-	bl MI_CpuCopy8
-	add r1, r9, r8
-	ldr r0, _020D058C ; =0x0210682C
-	add r1, r7, r1
-	mov r2, #0x2
-	bl MI_CpuCopy8
-	add r0, sp, #0x98
-	mov r1, r5
-	bl FSi_SeekDirDirect
-	cmp r4, #0x10000
-	beq _020D04C4
-	add r3, sp, #0x4
-	mov r2, #0x0
-	add r0, sp, #0x98
-	mov r1, #0x3
-	str r3, [sp, #0xc8]
-	str r2, [sp, #0xcc]
-	bl FSi_TranslateCommand
-_020D0464:
-	cmp r0, #0x0
-	bne _020D04A0
-	add r9, sp, #0x98
-	mov r8, #0x3
-_020D0474:
-	ldr r0, [sp, #0x10]
-	cmp r0, #0x0
-	bne _020D048C
-	ldr r0, [sp, #0x8]
-	cmp r0, r4
-	beq _020D04A0
-_020D048C:
-	mov r0, r9
-	mov r1, r8
-	bl FSi_TranslateCommand
-	cmp r0, #0x0
-	beq _020D0474
-_020D04A0:
-	ldr r0, [sp, #0x14]
-	add r1, r7, r6
-	add r4, r0, #0x1
-	add r0, sp, #0x18
-	mov r2, r4
-	sub r1, r1, r4
-	bl MI_CpuCopy8
-	sub r6, r6, r4
-	b _020D04D4
-_020D04C4:
-	add r0, r7, r6
-	mov r1, #0x0
-	strb r1, [r0, #-0x1]
-	sub r6, r6, #0x1
-_020D04D4:
-	cmp r5, #0x0
-	beq _020D057C
-	add r10, sp, #0x98
-	add r11, sp, #0x4
-	mov r4, #0x3
-	mov r9, #0x0
-	mov r8, #0x2f
-_020D04F0:
-	ldr r1, [sp, #0xc4]
-	mov r0, r10
-	bl FSi_SeekDirDirect
-	add r2, r7, r6
-	mov r0, r10
-	mov r1, r4
-	str r11, [sp, #0xc8]
-	str r9, [sp, #0xcc]
-	strb r8, [r2, #-0x1]
-	sub r6, r6, #0x1
-	bl FSi_TranslateCommand
-_020D051C:
-	cmp r0, #0x0
-	bne _020D0570
-_020D0524:
-	ldr r0, [sp, #0x10]
-	cmp r0, #0x0
-	beq _020D055C
-	ldrh r0, [sp, #0x8]
-	cmp r0, r5
-	bne _020D055C
-	ldr r5, [sp, #0x14]
-	add r1, r7, r6
-	add r0, sp, #0x18
-	mov r2, r5
-	sub r1, r1, r5
-	bl MI_CpuCopy8
-	sub r6, r6, r5
-	b _020D0570
-_020D055C:
-	mov r0, sl
-	mov r1, r4
-	bl FSi_TranslateCommand
-	cmp r0, #0x0
-	beq _020D0524
-_020D0570:
-	ldrh r5, [sp, #0xbc]
-	cmp r5, #0x0
-	bne _020D04F0
-_020D057C:
-	mov r0, #0x0
-	add sp, sp, #0xe4
-	ldmia sp!, {r4-r11,lr}
-	bx lr
-	.balign 4
-_020D058C: .word 0x0210682C
-
-	arm_func_start FSi_FindPathCommand
-FSi_FindPathCommand: ; 0x020D0590
-	stmdb sp!, {r4-r11,lr}
-	sub sp, sp, #0x9c
-	mov r10, r0
-	ldr r2, [r10, #0x40]
-	ldr r9, [r10, #0x3c]
-	mov r1, #0x2
-	str r2, [sp, #0x0]
-	bl FSi_TranslateCommand
-	ldrb r1, [r9, #0x0]
-	cmp r1, #0x0
-	beq _020D0780
-	mov r0, #0x2
-	add r11, sp, #0x1c
-	mov r4, #0x3
-	mov r5, #0x1
-	mov r6, #0x0
-	str r0, [sp, #0x4]
-_020D05D4:
-	mov r7, r6
-	b _020D05E0
-_020D05DC:
-	add r7, r7, #0x1
-_020D05E0:
-	ldrb r8, [r9, r7]
-	mov r0, r6
-	cmp r8, #0x0
-	beq _020D0600
-	cmp r8, #0x2f
-	beq _020D0600
-	cmp r8, #0x5c
-	movne r0, r5
-_020D0600:
-	cmp r0, #0x0
-	bne _020D05DC
-	cmp r8, #0x0
-	bne _020D061C
-	ldr r0, [sp, #0x0]
-	cmp r0, #0x0
-	beq _020D0620
-_020D061C:
-	mov r8, r5
-_020D0620:
-	cmp r7, #0x0
-	addeq sp, sp, #0x9c
-	moveq r0, #0x1
-	ldmeqia sp!, {r4-r11,lr}
-	bxeq lr
-	cmp r1, #0x2e
-	bne _020D068C
-	cmp r7, #0x1
-	addeq r9, r9, #0x1
-	beq _020D0764
-	ldrb r0, [r9, #0x1]
-	cmp r7, #0x2
-	moveq r1, r5
-	movne r1, r6
-	cmp r0, #0x2e
-	moveq r0, r5
-	movne r0, r6
-	ands r0, r1, r0
-	beq _020D068C
-	ldrh r0, [r10, #0x24]
-	cmp r0, #0x0
-	beq _020D0684
-	ldr r1, [r10, #0x2c]
-	mov r0, r10
-	bl FSi_SeekDirDirect
-_020D0684:
-	add r9, r9, #0x2
-	b _020D0764
-_020D068C:
-	cmp r7, #0x7f
-	addgt sp, sp, #0x9c
-	movgt r0, #0x1
-	ldmgtia sp!, {r4-r11,lr}
-	bxgt lr
-	add r0, sp, #0x8
-	str r0, [r10, #0x30]
-	str r6, [r10, #0x34]
-_020D06AC:
-	mov r0, r10
-	mov r1, r4
-	bl FSi_TranslateCommand
-_020D06B8:
-	cmp r0, #0x0
-	addne sp, sp, #0x9c
-	movne r0, #0x1
-	ldmneia sp!, {r4-r11,lr}
-	bxne lr
-	ldr r0, [sp, #0x14]
-	cmp r8, r0
-	bne _020D06AC
-	ldr r0, [sp, #0x18]
-	cmp r7, r0
-	bne _020D06AC
-	mov r0, r9
-	mov r1, fp
-	mov r2, r7
-	bl FSi_StrNICmp
-	cmp r0, #0x0
-	bne _020D06AC
-	cmp r8, #0x0
-	beq _020D0728
-	add r0, sp, #0x8
-	add r3, sl, #0x30
-	ldmia r0, {r0, r1, r2}
-	stmia r3, {r0, r1, r2}
-	ldr r1, [sp, #0x4]
-	mov r0, sl
-	add r9, r9, r7
-	bl FSi_TranslateCommand
-	b _020D0764
-_020D0728:
-	ldr r0, [sp]
-	cmp r0, #0x0
-	addne sp, sp, #0x9c
-	movne r0, #0x1
-	ldmneia sp!, {r4-r11,lr}
-	bxne lr
-	ldr r3, [sl, #0x44]
-	ldr r2, [sp, #0x8]
-	ldr r1, [sp, #0xC]
-	add sp, sp, #0x9c
-	str r2, [r3]
-	str r1, [r3, #0x4]
-	mov r0, #0x0
-	ldmia sp!, {r4-r11,lr}
-	bx lr
-_020D0764:
-	ldrb r0, [r9, #0x0]
-	cmp r0, #0x0
-	movne r0, r5
-	moveq r0, r6
-	ldrb r1, [r9, r0]!
-	cmp r1, #0x0
-	bne _020D05D4
-_020D0780:
-	ldr r0, [sp, #0x0]
-	cmp r0, #0x0
-	moveq r0, #0x1
-	addne r0, r10, #0x20
-	ldrne r3, [r10, #0x44]
-	ldmneia r0, {r0-r2}
-	stmneia r3, {r0-r2}
-	movne r0, #0x0
-	add sp, sp, #0x9c
-	ldmia sp!, {r4-r11,lr}
-	bx lr
-
-	arm_func_start FSi_ReadDirCommand
-FSi_ReadDirCommand: ; 0x020D07AC
-	stmdb sp!, {r4-r5,lr}
-	sub sp, sp, #0xc
-	mov r5, r0
-	ldr r4, [r5, #0x30]
-	ldr r1, [r5, #0x8]
-	add r0, sp, #0x4
-	str r1, [sp, #0x4]
-	ldr r3, [r5, #0x28]
-	add r1, sp, #0x0
-	mov r2, #0x1
-	str r3, [sp, #0x8]
-	bl FSi_ReadTable
-_020D07DC:
-	cmp r0, #0x0
-	addne sp, sp, #0xC
-	ldmneia sp!, {r4-r5,lr}
-	bxne lr
-	ldrb r1, [sp]
-	and r2, r1, #0x7F
-	mov r1, r1, asr #0x7
-	str r2, [r4, #0x10]
-	and r1, r1, #0x1
-	str r1, [r4, #0xC]
-	ldr r2, [r4, #0x10]
-	cmp r2, #0x0
-	addeq sp, sp, #0xC
-	moveq r0, #0x1
-	ldmeqia sp!, {r4-r5,lr}
-	bxeq lr
-	ldr r1, [r5, #0x34]
-	cmp r1, #0x0
-	bne _020D0858
-	add r0, sp, #0x4
-	add r1, r4, #0x14
-	bl FSi_ReadTable
-	cmp r0, #0x0
-	addne sp, sp, #0xC
-	ldmneia sp!, {r4-r5,lr}
-	bxne lr
-	ldr r1, [r4, #0x10]
-	mov r2, #0x0
-	add r1, r4, r1
-	strb r2, [r1, #0x14]
-	b _020D0864
-_020D0858:
-	ldr r1, [sp, #0x8]
-	add r1, r1, r2
-	str r1, [sp, #0x8]
-_020D0864:
-	ldr r1, [r4, #0xC]
-	cmp r1, #0x0
-	beq _020D08B8
-	add r0, sp, #0x4
-	add r1, sp, #0x2
-	mov r2, #0x2
-	bl FSi_ReadTable
-	cmp r0, #0x0
-	addne sp, sp, #0xC
-	ldmneia sp!, {r4-r5,lr}
-	bxne lr
-	ldr r2, [r5, #0x8]
-	ldr r1, _020D08E8
-	str r2, [r4]
-	ldrh r3, [sp, #0x2]
-	mov r2, #0x0
-	and r1, r3, r1
-	strh r1, [r4, #0x4]
-	strh r2, [r4, #0x6]
-	str r2, [r4, #0x8]
-	b _020D08D4
-_020D08B8:
-	ldr r1, [r5, #0x8]
-	str r1, [r4]
-	ldrh r1, [r5, #0x26]
-	str r1, [r4, #0x4]
-	ldrh r1, [r5, #0x26]
-	add r1, r1, #0x1
-	strh r1, [r5, #0x26]
-_020D08D4:
-	ldr r1, [sp, #0x8]
-	str r1, [r5, #0x28]
-	add sp, sp, #0xC
-	ldmia sp!, {r4-r5,lr}
-	bx lr
-_020D08E8: .word 0x00000FFF
-
-	arm_func_start FSi_SeekDirCommand
-FSi_SeekDirCommand: ; 0x020D08EC
-	stmdb sp!, {r4-r6,lr}
-	sub sp, sp, #0x10
-	mov r6, r0
-	ldr r5, [r6, #0x8]
-	add r4, r6, #0x30
-	str r5, [sp, #0x8]
-	ldrh r1, [r4, #0x4]
-	ldr r2, [r5, #0x34]
-	add r0, sp, #0x8
-	add r3, r2, r1, lsl #0x3
-	add r1, sp, #0x0
-	mov r2, #0x8
-	str r3, [sp, #0xc]
-	bl FSi_ReadTable
-	movs r3, r0
-	bne _020D0978
-	add r12, r6, #0x20
-	ldmia r4, {r0-r2}
-	stmia r12, {r0-r2}
-	ldrh r0, [r4, #0x6]
-	cmp r0, #0x0
-	bne _020D0968
-	ldr r0, [r4, #0x8]
-	cmp r0, #0x0
-	bne _020D0968
-	ldrh r0, [sp, #0x4]
-	strh r0, [r6, #0x26]
-	ldr r1, [r5, #0x34]
-	ldr r0, [sp, #0x0]
-	add r0, r1, r0
-	str r0, [r6, #0x28]
-_020D0968:
-	ldrh r1, [sp, #0x6]
-	ldr r0, _020D0988 ; =0x00000FFF
-	and r0, r1, r0
-	str r0, [r6, #0x2c]
-_020D0978:
-	mov r0, r3
-	add sp, sp, #0x10
-	ldmia sp!, {r4-r6,lr}
-	bx lr
-	.balign 4
-_020D0988: .word 0x00000FFF
diff --git a/arm9/data/rom2.s b/arm9/data/rom2.s
index 0f18b45a..9650cc4c 100644
--- a/arm9/data/rom2.s
+++ b/arm9/data/rom2.s
@@ -2,6 +2,6 @@
 		.include "asm/macros.inc"
 		.include "global.inc"
 
-	.data
+	.section .rodata
 
 .incbin "baserom.nds", 0xF0710, 0x3F8 ; this does not seem to be code
diff --git a/arm9/data/rom2_2.s b/arm9/data/rom2_2.s
index 35f573bf..48e1bab8 100644
--- a/arm9/data/rom2_2.s
+++ b/arm9/data/rom2_2.s
@@ -3,7 +3,7 @@
 
 /* rom2.s TODO: Disassemble */
 
-.section .data
+.section .rodata
 
 .incbin "baserom.nds", 0xF0B50, 0x6A0C
 
diff --git a/arm9/data/rom2_3.s b/arm9/data/rom2_3.s
index 5d640cba..8b047886 100644
--- a/arm9/data/rom2_3.s
+++ b/arm9/data/rom2_3.s
@@ -6,4 +6,4 @@
 	.section .data
 
 	/* 0x02103FA4 */
-	.incbin "baserom.nds", 0x107FA4, 0x288C
\ No newline at end of file
+	.incbin "baserom.nds", 0x107FA4, 0x2888
\ No newline at end of file
diff --git a/arm9/lib/include/FS_archive.h b/arm9/lib/include/FS_archive.h
index 3bbbbff7..d30081d7 100644
--- a/arm9/lib/include/FS_archive.h
+++ b/arm9/lib/include/FS_archive.h
@@ -105,6 +105,19 @@ typedef struct
 }
 FSFileLink;
 
+typedef struct
+{
+    u32 start;
+    u16 index;
+    u16 parent;
+} FSArchiveFNT;
+
+typedef struct
+{
+    u32 top;
+    u32 bottom;
+} FSArchiveFAT;
+
 typedef struct FSArchive
 {
     union
diff --git a/arm9/lib/include/FS_file.h b/arm9/lib/include/FS_file.h
index fdf6c4e2..55825c61 100644
--- a/arm9/lib/include/FS_file.h
+++ b/arm9/lib/include/FS_file.h
@@ -13,6 +13,8 @@
 #define	FS_FILE_STATUS_IS_DIR		0x00000020
 #define FS_FILE_STATUS_OPERATING    0x00000040
 
+#define FS_FILE_NAME_MAX 127
+
 typedef enum FSSeekFileMode
 {
     FS_SEEK_SET = 0,
@@ -210,4 +212,9 @@ static inline BOOL FS_IsSucceeded(volatile const FSFile * p_file)
     return (p_file->error == FS_RESULT_SUCCESS) ? TRUE : FALSE;
 }
 
+static inline BOOL FS_IsDir(volatile const FSFile * p_file)
+{
+    return (p_file->stat & FS_FILE_STATUS_IS_DIR) ? TRUE : FALSE;
+}
+
 #endif //NITRO_FS_FILE_H_
diff --git a/arm9/lib/include/FSi_util.h b/arm9/lib/include/FSi_util.h
index 1f6faf6f..6e96681e 100644
--- a/arm9/lib/include/FSi_util.h
+++ b/arm9/lib/include/FSi_util.h
@@ -5,6 +5,8 @@
 
 #define ALIGN_BYTE(n, a) (((u32)(n) + ALIGN_MASK(a)) & ~ALIGN_MASK(a))
 
+#define BIT_MASK(a) ((u32)((1 << (a)) - 1))
+
 static inline BOOL FSi_IsSlash(u32 c)
 {
     return (c == '/') || (c == '\\');
diff --git a/arm9/lib/include/MI_byteAccess.h b/arm9/lib/include/MI_byteAccess.h
index 10dae4c9..cad4d518 100644
--- a/arm9/lib/include/MI_byteAccess.h
+++ b/arm9/lib/include/MI_byteAccess.h
@@ -6,4 +6,9 @@ static inline u8 MI_ReadByte(const void *address)
     return *(u8 *)address;
 }
 
+static inline void MI_WriteByte(void *address, u8 value)
+{
+    *(u8 *)address = value;
+}
+
 #endif //NITRO_MI_BYTEACCESS_H_
diff --git a/arm9/lib/src/FS_command_default.c b/arm9/lib/src/FS_command_default.c
index bd04f740..85287fa9 100644
--- a/arm9/lib/src/FS_command_default.c
+++ b/arm9/lib/src/FS_command_default.c
@@ -3,6 +3,8 @@
 #include "FS_command.h"
 #include "FS_archive.h"
 #include "MI_byteAccess.h"
+#include "MI_memory.h"
+#include "FSi_util.h"
 
 typedef struct
 {
@@ -106,3 +108,361 @@ FSResult FSi_WriteFileCommand(FSFile * p_file)
     p_file->prop.file.pos += len;
     return (*p_arc->write_func)(p_arc, src, pos, len);
 }
+
+FSResult FSi_SeekDirCommand(FSFile * p_dir)
+{
+    FSResult ret;
+    FSArchive *const p_arc = p_dir->arc;
+    const FSDirPos *const arg = &p_dir->arg.seekdir.pos;
+
+    FSArchiveFNT fnt_entry;
+    FSiSyncReadParam param;
+    param.arc = p_arc;
+    param.pos = p_arc->fnt + arg->own_id * sizeof(fnt_entry);
+    ret = FSi_ReadTable(&param, &fnt_entry, sizeof(fnt_entry));
+    if (ret == FS_RESULT_SUCCESS)
+    {
+        p_dir->prop.dir.pos = *arg;
+        if ((arg->index == 0) && (arg->pos == 0))
+        {
+            p_dir->prop.dir.pos.index = fnt_entry.index;
+            p_dir->prop.dir.pos.pos = p_arc->fnt + fnt_entry.start;
+        }
+        p_dir->prop.dir.parent = (u32) (fnt_entry.parent & BIT_MASK(12));
+    }
+    return ret;
+}
+
+FSResult FSi_ReadDirCommand(FSFile *p_dir)
+{
+    FSDirEntry *p_entry = p_dir->arg.readdir.p_entry;
+    FSResult ret;
+
+    FSiSyncReadParam param;
+    param.arc = p_dir->arc;
+    param.pos = p_dir->prop.dir.pos.pos;
+
+    {
+        u8 len;
+        ret = FSi_ReadTable(&param, &len, sizeof(len));
+        if (ret != FS_RESULT_SUCCESS)
+            return ret;
+        p_entry->name_len = (u32)(len & BIT_MASK(7));
+        p_entry->is_directory = (u32)((len >> 7) & 1);
+    }
+    if (p_entry->name_len == 0)
+        return FS_RESULT_FAILURE;
+
+    if (!p_dir->arg.readdir.skip_string)
+    {
+        ret = FSi_ReadTable(&param, p_entry->name, p_entry->name_len);
+        if (ret != FS_RESULT_SUCCESS)
+            return ret;
+        MI_WriteByte((u8 *)p_entry->name + p_entry->name_len, (u8)'\0');
+    }
+    else
+    {
+        param.pos += p_entry->name_len;
+    }
+
+    if (p_entry->is_directory)
+    {
+        u16 id;
+        ret = FSi_ReadTable(&param, &id, sizeof(id));
+        if (ret != FS_RESULT_SUCCESS)
+            return ret;
+        p_entry->dir_id.arc = p_dir->arc;
+        p_entry->dir_id.own_id = (u16)(id & BIT_MASK(12));
+        p_entry->dir_id.index = 0;
+        p_entry->dir_id.pos = 0;
+    }
+    else
+    {
+        p_entry->file_id.arc = p_dir->arc;
+        p_entry->file_id.file_id = p_dir->prop.dir.pos.index;
+        ++p_dir->prop.dir.pos.index;
+    }
+    p_dir->prop.dir.pos.pos = param.pos;
+
+    return ret;
+}
+
+FSResult FSi_FindPathCommand(FSFile *p_dir)
+{
+    const char *path = p_dir->arg.findpath.path;
+    const BOOL is_dir = p_dir->arg.findpath.find_directory;
+    p_dir->arg.seekdir.pos = p_dir->arg.findpath.pos;
+    (void)FSi_TranslateCommand(p_dir, FS_COMMAND_SEEKDIR);
+    for (; MI_ReadByte(path); path += (MI_ReadByte(path) ? 1 : 0))
+    {
+        u32 is_directory;
+        int name_len = 0;
+        while ((is_directory = MI_ReadByte(path + name_len)),
+            (is_directory && !FSi_IsSlash(is_directory)))
+            ++name_len;
+        if (is_directory || is_dir)
+            is_directory = 1;
+        if (name_len == 0)
+        {
+            return FS_RESULT_FAILURE;
+        }
+        else if (MI_ReadByte(path) == '.')
+        {
+            if (name_len == 1)
+            {
+                path += 1;
+                continue;
+            }
+            else if ((name_len == 2) & (MI_ReadByte(path + 1) == '.'))
+            {
+                if (p_dir->prop.dir.pos.own_id != 0)
+                    FSi_SeekDirDirect(p_dir, p_dir->prop.dir.parent);
+                path += 2;
+                continue;
+            }
+        }
+        if (name_len > FS_FILE_NAME_MAX)
+        {
+            return FS_RESULT_FAILURE;
+        }
+        else
+        {
+            FSDirEntry etr;
+            p_dir->arg.readdir.p_entry = &etr;
+            p_dir->arg.readdir.skip_string = FALSE;
+            for (;;)
+            {
+                if (FSi_TranslateCommand(p_dir, FS_COMMAND_READDIR) != FS_RESULT_SUCCESS)
+                    return FS_RESULT_FAILURE;
+                if ((is_directory != etr.is_directory) ||
+                    (name_len != etr.name_len) || FSi_StrNICmp(path, etr.name, (u32)name_len))
+                    continue;
+                if (is_directory)
+                {
+                    path += name_len;
+                    p_dir->arg.seekdir.pos = etr.dir_id;
+                    (void)FSi_TranslateCommand(p_dir, FS_COMMAND_SEEKDIR);
+                    break;
+                }
+                else if (is_dir)
+                {
+                    return FS_RESULT_FAILURE;
+                }
+                else
+                {
+                    *p_dir->arg.findpath.result.file = etr.file_id;
+                    return FS_RESULT_SUCCESS;
+                }
+            }
+        }
+    }
+    if (!is_dir)
+        return FS_RESULT_FAILURE;
+    *p_dir->arg.findpath.result.dir = p_dir->prop.dir.pos;
+    return FS_RESULT_SUCCESS;
+}
+
+FSResult FSi_GetPathCommand(FSFile *p_file)
+{
+    FSArchive *const p_arc = p_file->arc;
+
+    FSGetPathInfo *p_info = &p_file->arg.getpath;
+
+    FSDirEntry entry;
+    FSFile tmp;
+    u32 dir_id;
+    u32 file_id;
+    u32 id;
+    u32 len;
+
+    enum
+    { INVALID_ID = 0x10000 };
+
+    FS_InitFile(&tmp);
+    tmp.arc = p_file->arc;
+
+    if (FS_IsDir(p_file))
+    {
+        dir_id = p_file->prop.dir.pos.own_id;
+        file_id = INVALID_ID;
+    }
+    else
+    {
+        file_id = p_file->prop.file.own_id;
+        if (p_info->total_len != 0)
+        {
+            dir_id = p_info->dir_id;
+        }
+        else
+        {
+            u32 pos = 0;
+            u32 num_dir = 0;
+            dir_id = INVALID_ID;
+            do
+            {
+                FSi_SeekDirDirect(&tmp, pos);
+                if (!pos)
+                    num_dir = tmp.prop.dir.parent;
+                tmp.arg.readdir.p_entry = &entry;
+                tmp.arg.readdir.skip_string = TRUE;
+                while (FSi_TranslateCommand(&tmp, FS_COMMAND_READDIR) == FS_RESULT_SUCCESS)
+                {
+                    if (!entry.is_directory && (entry.file_id.file_id == file_id))
+                    {
+                        dir_id = tmp.prop.dir.pos.own_id;
+                        break;
+                    }
+                }
+            }
+            while ((dir_id == INVALID_ID) && (++pos < num_dir));
+        }
+    }
+    if (dir_id == INVALID_ID)
+    {
+        p_info->total_len = 0;
+        return FS_RESULT_FAILURE;
+    }
+    if (p_info->total_len == 0)
+    {
+        len = 0;
+        if (p_arc->name.pack <= 0x000000FF)
+            len += 1;
+        else if (p_arc->name.pack <= 0x0000FF00)
+            len += 2;
+        else
+            len += 3;
+        len += 1 + 1;
+        if (file_id != INVALID_ID)
+            len += entry.name_len;
+        id = dir_id;
+        if (id != 0)
+        {
+            FSi_SeekDirDirect(&tmp, id);
+            do
+            {
+                FSi_SeekDirDirect(&tmp, tmp.prop.dir.parent);
+                tmp.arg.readdir.p_entry = &entry;
+                tmp.arg.readdir.skip_string = TRUE;
+                while (FSi_TranslateCommand(&tmp, FS_COMMAND_READDIR) == FS_RESULT_SUCCESS)
+                {
+                    if (entry.is_directory && (entry.dir_id.own_id == id))
+                    {
+                        len += entry.name_len + 1;
+                        break;
+                    }
+                }
+                id = tmp.prop.dir.pos.own_id;
+            }
+            while (id != 0);
+        }
+        p_info->total_len = (u16)(len + 1);
+        p_info->dir_id = (u16)dir_id;
+    }
+    if (!p_info->buf)
+        return FS_RESULT_SUCCESS;
+    if (p_info->buf_len < p_info->total_len)
+        return FS_RESULT_FAILURE;
+    else
+    {
+        u8 *dst = p_info->buf;
+        u32 total = p_info->total_len;
+        u32 pos = 0;
+        if (p_arc->name.pack <= 0x000000FF)
+            len = 1;
+        else if (p_arc->name.pack <= 0x0000FF00)
+            len = 2;
+        else
+            len = 3;
+        MI_CpuCopy8(p_arc->name.ptr, dst + pos, len);
+        pos += len;
+        MI_CpuCopy8(":/", dst + pos, 2);
+        pos += 2;
+        id = dir_id;
+        FSi_SeekDirDirect(&tmp, id);
+        if (file_id != INVALID_ID)
+        {
+            tmp.arg.readdir.p_entry = &entry;
+            tmp.arg.readdir.skip_string = FALSE;
+            while (FSi_TranslateCommand(&tmp, FS_COMMAND_READDIR) == FS_RESULT_SUCCESS)
+            {
+                if (!entry.is_directory && (entry.file_id.file_id == file_id))
+                    break;
+            }
+            len = entry.name_len + 1;
+            MI_CpuCopy8(entry.name, dst + total - len, len);
+            total -= len;
+        }
+        else
+        {
+            MI_WriteByte(dst + total - 1, '\0');
+            total -= 1;
+        }
+        if (id != 0)
+        {
+            do
+            {
+                FSi_SeekDirDirect(&tmp, tmp.prop.dir.parent);
+                tmp.arg.readdir.p_entry = &entry;
+                tmp.arg.readdir.skip_string = FALSE;
+                MI_WriteByte(dst + total - 1, '/');
+                total -= 1;
+                while (FSi_TranslateCommand(&tmp, FS_COMMAND_READDIR) == FS_RESULT_SUCCESS)
+                {
+                    if (entry.is_directory && (entry.dir_id.own_id == id))
+                    {
+                        len = entry.name_len;
+                        MI_CpuCopy8(entry.name, dst + total - len, len);
+                        total -= len;
+                        break;
+                    }
+                }
+                id = tmp.prop.dir.pos.own_id;
+            }
+            while (id != 0);
+        }
+    }
+
+    return FS_RESULT_SUCCESS;
+}
+
+FSResult FSi_OpenFileFastCommand(FSFile * p_file)
+{
+    FSArchive *const p_arc = p_file->arc;
+    const FSFileID *p_id = &p_file->arg.openfilefast.id;
+    const u32 index = p_id->file_id;
+    FSResult ret;
+
+    {
+        u32 pos = (u32)(index * sizeof(FSArchiveFAT));
+        if (pos >= p_arc->fat_size)
+            return FS_RESULT_FAILURE;
+        else
+        {
+            FSArchiveFAT fat;
+            FSiSyncReadParam param;
+            param.arc = p_arc;
+            param.pos = p_arc->fat + pos;
+            ret = FSi_ReadTable(&param, &fat, sizeof(fat));
+            if (ret != FS_RESULT_SUCCESS)
+                return ret;
+            p_file->arg.openfiledirect.top = fat.top;
+            p_file->arg.openfiledirect.bottom = fat.bottom;
+            p_file->arg.openfiledirect.index = index;
+            return FSi_TranslateCommand(p_file, FS_COMMAND_OPENFILEDIRECT);
+        }
+    }
+}
+
+FSResult FSi_OpenFileDirectCommand(FSFile * p_file)
+{
+    p_file->prop.file.top = p_file->arg.openfiledirect.top;
+    p_file->prop.file.pos = p_file->arg.openfiledirect.top;
+    p_file->prop.file.bottom = p_file->arg.openfiledirect.bottom;
+    p_file->prop.file.own_id = p_file->arg.openfiledirect.index;
+    return FS_RESULT_SUCCESS;
+}
+
+FSResult FSi_CloseFileCommand(FSFile * p_file)
+{
+    return FS_RESULT_SUCCESS;
+}
diff --git a/arm9/src/string_util.c b/arm9/src/string_util.c
index 6c949e88..e6ea85de 100644
--- a/arm9/src/string_util.c
+++ b/arm9/src/string_util.c
@@ -1,6 +1,9 @@
 #include "global.h"

 

-u16 gDigitTable[] = {

+#define EOS 0xFFFF

+#define NON_DIGIT 0xE2

+

+const u16 gDigitTable[] = {

     0xA2,

     0xA3,

     0xA4,

@@ -19,7 +22,7 @@ u16 gDigitTable[] = {
     0xB1

 };

 

-s32 gPowersOfTen[] = {

+const s32 gPowersOfTen[] = {

              1,

             10,

            100,

@@ -32,8 +35,6 @@ s32 gPowersOfTen[] = {
     1000000000,

 };

 

-static const u16 EOS = 0xFFFF;

-

 THUMB_FUNC void StringCopy(u16 *dest, const u16 *src)

 {

     u16 c = *src;

@@ -129,8 +130,6 @@ enum PrintingMode {
     PAD_ZEROES

 };

 

-const u16 NON_DIGIT = 0xE2;

-

 THUMB_FUNC u16 *ConvertUIntToDecimalString(u16 *dest, u32 value, enum PrintingMode mode, u32 n)

 {

     for (u32 x = gPowersOfTen[n - 1]; x != 0; x = x / 10) {