summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsceptillion <33798691+sceptillion@users.noreply.github.com>2017-12-11 11:32:19 -0800
committersceptillion <33798691+sceptillion@users.noreply.github.com>2017-12-11 11:33:35 -0800
commit9b5c263a938ddc43bb7910170dc5a5925ffc48b0 (patch)
tree6bc8f0b98a9d4b64f60ee9f706ea86e7b6392604
parent87ef770ca23875a9b4777bff7b07c2093a1df1b2 (diff)
label functions
-rw-r--r--asm/code.s8
-rw-r--r--asm/code_8006218.s94
-rw-r--r--asm/code_800B540.s330
-rw-r--r--src/main.c4
4 files changed, 218 insertions, 218 deletions
diff --git a/asm/code.s b/asm/code.s
index 80b1fa4..1882229 100644
--- a/asm/code.s
+++ b/asm/code.s
@@ -362,7 +362,7 @@ _0800055A:
_08000580:
ldr r0, _0800059C
ldr r0, [r0]
- bl sub_800AA14
+ bl CloseFile
cmp r5, 0x3
beq _080005CA
cmp r5, 0x3
@@ -466,14 +466,14 @@ sub_8000634:
ldr r0, [r5]
ldr r5, _08000714
adds r1, r5, 0
- bl sub_800A9EC
+ bl OpenFileAndGetFileDataPtr
ldr r1, _08000718
str r0, [r1]
mov r1, sp
adds r0, r1, r4
ldr r0, [r0]
adds r1, r5, 0
- bl sub_800A9EC
+ bl OpenFileAndGetFileDataPtr
mov r8, r0
adds r0, r7, 0
movs r1, 0
@@ -528,7 +528,7 @@ _080006B8:
ldr r2, _08000724
bl CpuCopy
mov r0, r8
- bl sub_800AA14
+ bl CloseFile
adds r0, r7, 0
bl MemoryFree
add sp, 0x18
diff --git a/asm/code_8006218.s b/asm/code_8006218.s
index 3983a60..4ebdc6f 100644
--- a/asm/code_8006218.s
+++ b/asm/code_8006218.s
@@ -18,12 +18,12 @@ sub_8006218:
ldr r0, _080062F8
ldr r5, _080062FC
adds r1, r5, 0
- bl sub_800A9EC
+ bl OpenFileAndGetFileDataPtr
ldr r4, _08006300
str r0, [r4]
ldr r0, _08006304
adds r1, r5, 0
- bl sub_800A9EC
+ bl OpenFileAndGetFileDataPtr
str r0, [r4, 0x4]
ldr r2, _08006308
ldr r1, [r4]
@@ -7346,7 +7346,7 @@ _08009714:
bls _08009714
ldr r4, _0800979C
adds r1, r4, 0
- bl sub_800A9EC
+ bl OpenFileAndGetFileDataPtr
adds r6, r0, 0
ldr r1, [r6, 0x4]
ldm r1!, {r5}
@@ -7354,10 +7354,10 @@ _08009714:
lsls r2, r5, 5
bl CpuCopy
adds r0, r6, 0
- bl sub_800AA14
+ bl CloseFile
ldr r0, _080097A4
adds r1, r4, 0
- bl sub_800A9EC
+ bl OpenFileAndGetFileDataPtr
adds r6, r0, 0
ldr r1, [r6, 0x4]
ldm r1!, {r5}
@@ -7365,11 +7365,11 @@ _08009714:
lsls r2, r5, 5
bl CpuCopy
adds r0, r6, 0
- bl sub_800AA14
+ bl CloseFile
bl sub_80097B0
ldr r0, _080097AC
adds r1, r4, 0
- bl sub_800A9EC
+ bl OpenFileAndGetFileDataPtr
adds r6, r0, 0
ldr r4, [r6, 0x4]
movs r5, 0
@@ -7384,7 +7384,7 @@ _08009766:
cmp r5, 0xF
ble _08009766
adds r0, r6, 0
- bl sub_800AA14
+ bl CloseFile
bl TransferBGPaletteBuffer
pop {r4-r6}
pop {r0}
@@ -7406,7 +7406,7 @@ sub_80097B0:
push {r4-r6,lr}
ldr r0, _080097F8
ldr r1, _080097FC
- bl sub_800A9EC
+ bl OpenFileAndGetFileDataPtr
adds r6, r0, 0
ldr r4, _08009800
ldr r1, [r6, 0x4]
@@ -7432,7 +7432,7 @@ _080097DA:
cmp r4, 0xF
ble _080097DA
adds r0, r6, 0
- bl sub_800AA14
+ bl CloseFile
pop {r4-r6}
pop {r0}
bx r0
@@ -9821,8 +9821,8 @@ _0800A8BC: .4byte 0x0000012b
_0800A8C0: .4byte gUnknown_80B96E4
thumb_func_end sub_800A894
- thumb_func_start sub_800A8C4
-sub_800A8C4:
+ thumb_func_start InitFileSystem
+InitFileSystem:
push {r4,lr}
ldr r3, _0800A8EC
ldr r4, _0800A8F0
@@ -9847,7 +9847,7 @@ _0800A8D0:
_0800A8EC: .4byte gUnknown_203B094
_0800A8F0: .4byte gUnknown_202D2A4
_0800A8F4: .4byte gUnknown_202D2A8
- thumb_func_end sub_800A8C4
+ thumb_func_end InitFileSystem
thumb_func_start sub_800A8F8
sub_800A8F8:
@@ -9860,8 +9860,8 @@ sub_800A8F8:
_0800A904: .4byte gUnknown_202D2A4
thumb_func_end sub_800A8F8
- thumb_func_start sub_800A908
-sub_800A908:
+ thumb_func_start OpenFile
+OpenFile:
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -9966,55 +9966,55 @@ _0800A9B8:
.align 2, 0
_0800A9C4: .4byte gUnknown_203B094
_0800A9C8: .4byte gUnknown_202D2A8
- thumb_func_end sub_800A908
+ thumb_func_end OpenFile
- thumb_func_start sub_800A9CC
-sub_800A9CC:
+ thumb_func_start GetFileDataPtrFromFileEntry
+GetFileDataPtrFromFileEntry:
ldr r1, [r0]
ldr r1, [r1, 0x4]
str r1, [r0, 0x4]
adds r0, r1, 0
bx lr
- thumb_func_end sub_800A9CC
+ thumb_func_end GetFileDataPtrFromFileEntry
- thumb_func_start sub_800A9D8
-sub_800A9D8:
+ thumb_func_start GetFileDataPtr
+GetFileDataPtr:
push {r4,lr}
adds r4, r0, 0
- bl sub_800A9CC
+ bl GetFileDataPtrFromFileEntry
adds r0, r4, 0
- bl sub_800AA48
+ bl GetSiroPtr
pop {r4}
pop {r1}
bx r1
- thumb_func_end sub_800A9D8
+ thumb_func_end GetFileDataPtr
- thumb_func_start sub_800A9EC
-sub_800A9EC:
+ thumb_func_start OpenFileAndGetFileDataPtr
+OpenFileAndGetFileDataPtr:
push {r4,lr}
- bl sub_800A908
+ bl OpenFile
adds r4, r0, 0
cmp r4, 0
beq _0800A9FE
movs r1, 0
- bl sub_800A9D8
+ bl GetFileDataPtr
_0800A9FE:
adds r0, r4, 0
pop {r4}
pop {r1}
bx r1
- thumb_func_end sub_800A9EC
+ thumb_func_end OpenFileAndGetFileDataPtr
- thumb_func_start sub_800AA08
-sub_800AA08:
+ thumb_func_start Call_OpenFileAndGetFileDataPtr
+Call_OpenFileAndGetFileDataPtr:
push {lr}
- bl sub_800A9EC
+ bl OpenFileAndGetFileDataPtr
pop {r1}
bx r1
- thumb_func_end sub_800AA08
+ thumb_func_end Call_OpenFileAndGetFileDataPtr
- thumb_func_start sub_800AA14
-sub_800AA14:
+ thumb_func_start CloseFile
+CloseFile:
push {r4,r5,lr}
adds r4, r0, 0
movs r1, 0
@@ -10042,10 +10042,10 @@ _0800AA42:
pop {r4,r5}
pop {r0}
bx r0
- thumb_func_end sub_800AA14
+ thumb_func_end CloseFile
- thumb_func_start sub_800AA48
-sub_800AA48:
+ thumb_func_start GetSiroPtr
+GetSiroPtr:
push {r4,r5,lr}
adds r5, r0, 0
ldr r4, [r5, 0x4]
@@ -10063,7 +10063,7 @@ _0800AA60: .4byte 0x30524953
_0800AA64: .4byte 0x4f524953
_0800AA68:
adds r0, r4, 0
- bl nullsub_15
+ bl NDS_DecompressRLE
_0800AA6E:
ldr r0, [r4, 0x4]
str r0, [r5, 0x4]
@@ -10071,10 +10071,10 @@ _0800AA72:
pop {r4,r5}
pop {r1}
bx r1
- thumb_func_end sub_800AA48
+ thumb_func_end GetSiroPtr
- thumb_func_start sub_800AA78
-sub_800AA78:
+ thumb_func_start UnusedGetSir0Ptr
+UnusedGetSir0Ptr:
push {r4,lr}
adds r4, r0, 0
ldr r1, [r4]
@@ -10082,7 +10082,7 @@ sub_800AA78:
cmp r1, r0
bne _0800AA94
adds r0, r4, 0
- bl nullsub_15
+ bl NDS_DecompressRLE
ldr r0, [r4, 0x4]
b _0800AA96
.align 2, 0
@@ -10093,12 +10093,12 @@ _0800AA96:
pop {r4}
pop {r1}
bx r1
- thumb_func_end sub_800AA78
+ thumb_func_end UnusedGetSir0Ptr
- thumb_func_start nullsub_15
-nullsub_15:
+ thumb_func_start NDS_DecompressRLE
+NDS_DecompressRLE:
bx lr
- thumb_func_end nullsub_15
+ thumb_func_end NDS_DecompressRLE
thumb_func_start nullsub_16
nullsub_16:
diff --git a/asm/code_800B540.s b/asm/code_800B540.s
index 33642ba..a84ae2a 100644
--- a/asm/code_800B540.s
+++ b/asm/code_800B540.s
@@ -5074,7 +5074,7 @@ _0800DAF0:
bne _0800DB6C
ldr r0, _0800DB44
ldr r1, _0800DB48
- bl sub_800AA08
+ bl Call_OpenFileAndGetFileDataPtr
adds r4, r0, 0
cmp r4, 0
beq _0800DB6C
@@ -5084,7 +5084,7 @@ _0800DAF0:
movs r3, 0
bl sub_8005610
adds r0, r4, 0
- bl sub_800AA14
+ bl CloseFile
b _0800DB6C
.align 2, 0
_0800DB38: .4byte gUnknown_203B0CC
@@ -5095,7 +5095,7 @@ _0800DB48: .4byte gUnknown_9740000
_0800DB4C:
ldr r0, _0800DB74
ldr r1, _0800DB78
- bl sub_800AA08
+ bl Call_OpenFileAndGetFileDataPtr
adds r4, r0, 0
cmp r4, 0
beq _0800DB6C
@@ -5105,7 +5105,7 @@ _0800DB4C:
movs r3, 0
bl sub_8005610
adds r0, r4, 0
- bl sub_800AA14
+ bl CloseFile
_0800DB6C:
pop {r4-r6}
pop {r0}
@@ -8237,7 +8237,7 @@ _0800F1E4:
_0800F1EC:
ldr r1, _0800F200
mov r0, sp
- bl sub_800AA08
+ bl Call_OpenFileAndGetFileDataPtr
add sp, 0x8
pop {r1}
bx r1
@@ -8249,7 +8249,7 @@ _0800F200: .4byte gUnknown_9740000
thumb_func_start sub_800F204
sub_800F204:
push {lr}
- bl sub_800AA14
+ bl CloseFile
pop {r0}
bx r0
thumb_func_end sub_800F204
@@ -10776,11 +10776,11 @@ sub_801059C:
ldr r0, [r6]
ldr r5, _080106E8
adds r1, r5, 0
- bl sub_800A9EC
+ bl OpenFileAndGetFileDataPtr
str r0, [sp, 0xC]
ldr r0, [r6, 0x4]
adds r1, r5, 0
- bl sub_800A9EC
+ bl OpenFileAndGetFileDataPtr
str r0, [sp, 0x10]
ldr r1, _080106EC
movs r0, 0x8
@@ -10790,7 +10790,7 @@ sub_801059C:
ldr r1, _080106F0
mov r8, r1
mov r0, sp
- bl sub_800A9EC
+ bl OpenFileAndGetFileDataPtr
ldr r4, _080106F4
ldr r1, [r4]
ldr r2, _080106F8
@@ -10798,7 +10798,7 @@ sub_801059C:
str r0, [r1]
ldr r0, _080106FC
adds r1, r5, 0
- bl sub_800A9EC
+ bl OpenFileAndGetFileDataPtr
ldr r1, [r4]
ldr r3, _08010700
mov r9, r3
@@ -10806,7 +10806,7 @@ sub_801059C:
str r0, [r1]
ldr r0, [r6, 0x8]
adds r1, r5, 0
- bl sub_800A9EC
+ bl OpenFileAndGetFileDataPtr
ldr r1, [r4]
ldr r2, _08010704
mov r10, r2
@@ -10814,14 +10814,14 @@ sub_801059C:
str r0, [r1]
ldr r0, _08010708
mov r1, r8
- bl sub_800A9EC
+ bl OpenFileAndGetFileDataPtr
ldr r1, [r4]
ldr r3, _0801070C
adds r1, r3
str r0, [r1]
ldr r0, [r6, 0xC]
adds r1, r5, 0
- bl sub_800A9EC
+ bl OpenFileAndGetFileDataPtr
ldr r1, [r4]
movs r2, 0x88
lsls r2, 5
@@ -10897,9 +10897,9 @@ _080106A2:
cmp r3, r9
ble _080106A2
ldr r0, [sp, 0xC]
- bl sub_800AA14
+ bl CloseFile
ldr r0, [sp, 0x10]
- bl sub_800AA14
+ bl CloseFile
movs r0, 0
movs r1, 0x1
movs r2, 0x1
@@ -10945,28 +10945,28 @@ sub_801073C:
ldr r1, _08010788
adds r0, r1
ldr r0, [r0]
- bl sub_800AA14
+ bl CloseFile
ldr r0, [r4]
ldr r1, _0801078C
adds r0, r1
ldr r0, [r0]
- bl sub_800AA14
+ bl CloseFile
ldr r0, [r4]
ldr r1, _08010790
adds r0, r1
ldr r0, [r0]
- bl sub_800AA14
+ bl CloseFile
ldr r0, [r4]
movs r1, 0x88
lsls r1, 5
adds r0, r1
ldr r0, [r0]
- bl sub_800AA14
+ bl CloseFile
ldr r0, [r4]
ldr r1, _08010794
adds r0, r1
ldr r0, [r0]
- bl sub_800AA14
+ bl CloseFile
pop {r4}
pop {r0}
bx r0
@@ -11751,11 +11751,11 @@ sub_8010DA4:
ldr r0, [r6]
ldr r5, _08010EC0
adds r1, r5, 0
- bl sub_800A9EC
+ bl OpenFileAndGetFileDataPtr
mov r10, r0
ldr r0, [r6, 0x4]
adds r1, r5, 0
- bl sub_800A9EC
+ bl OpenFileAndGetFileDataPtr
adds r7, r0, 0
ldr r1, _08010EC4
mov r0, r9
@@ -11767,28 +11767,28 @@ sub_8010DA4:
mov r8, r0
mov r0, sp
mov r1, r8
- bl sub_800A9EC
+ bl OpenFileAndGetFileDataPtr
ldr r4, _08010ECC
ldr r1, [r4]
str r0, [r1, 0xC]
ldr r0, _08010ED0
adds r1, r5, 0
- bl sub_800A9EC
+ bl OpenFileAndGetFileDataPtr
ldr r1, [r4]
str r0, [r1, 0x8]
ldr r0, [r6, 0x8]
adds r1, r5, 0
- bl sub_800A9EC
+ bl OpenFileAndGetFileDataPtr
ldr r1, [r4]
str r0, [r1, 0x10]
ldr r0, _08010ED4
mov r1, r8
- bl sub_800A9EC
+ bl OpenFileAndGetFileDataPtr
ldr r1, [r4]
str r0, [r1, 0x4]
ldr r0, [r6, 0xC]
adds r1, r5, 0
- bl sub_800A9EC
+ bl OpenFileAndGetFileDataPtr
ldr r1, [r4]
str r0, [r1]
mov r1, r9
@@ -11847,9 +11847,9 @@ _08010E84:
cmp r1, 0
bge _08010E84
mov r0, r10
- bl sub_800AA14
+ bl CloseFile
adds r0, r7, 0
- bl sub_800AA14
+ bl CloseFile
movs r0, 0
movs r1, 0x1
movs r2, 0x1
@@ -11884,19 +11884,19 @@ sub_8010EF0:
ldr r4, _08010F24
ldr r0, [r4]
ldr r0, [r0, 0x10]
- bl sub_800AA14
+ bl CloseFile
ldr r0, [r4]
ldr r0, [r0, 0x8]
- bl sub_800AA14
+ bl CloseFile
ldr r0, [r4]
ldr r0, [r0, 0xC]
- bl sub_800AA14
+ bl CloseFile
ldr r0, [r4]
ldr r0, [r0]
- bl sub_800AA14
+ bl CloseFile
ldr r0, [r4]
ldr r0, [r0, 0x4]
- bl sub_800AA14
+ bl CloseFile
pop {r4}
pop {r0}
bx r0
@@ -15089,7 +15089,7 @@ sub_8012750:
ldr r0, [r0, 0xC]
cmp r0, 0
beq _08012764
- bl sub_800AA14
+ bl CloseFile
_08012764:
ldr r0, [r4]
bl MemoryFree
@@ -23019,7 +23019,7 @@ sub_801641C:
beq _08016438
adds r0, 0x94
ldr r0, [r0]
- bl sub_800AA14
+ bl CloseFile
ldr r0, [r4]
bl MemoryFree
movs r0, 0
@@ -24279,7 +24279,7 @@ sub_8016E40:
beq _08016E5C
adds r0, 0xD8
ldr r0, [r0]
- bl sub_800AA14
+ bl CloseFile
ldr r0, [r4]
bl MemoryFree
movs r0, 0
@@ -28099,7 +28099,7 @@ sub_8018CF0:
beq _08018D0C
adds r0, 0xD4
ldr r0, [r0]
- bl sub_800AA14
+ bl CloseFile
ldr r0, [r4]
bl MemoryFree
movs r0, 0
@@ -37715,7 +37715,7 @@ sub_801D970:
mov r10, r2
ldr r0, _0801D9DC
ldr r1, _0801D9E0
- bl sub_800A9EC
+ bl OpenFileAndGetFileDataPtr
adds r7, r0, 0
ldr r0, [r7, 0x4]
ldr r6, [r0]
@@ -37745,7 +37745,7 @@ _0801D994:
movs r3, 0x10
bl sub_8007E20
adds r0, r7, 0
- bl sub_800AA14
+ bl CloseFile
add sp, 0xC
pop {r3-r5}
mov r8, r3
@@ -39737,7 +39737,7 @@ sub_801E93C:
lsls r1, 1
adds r0, r1
ldr r0, [r0]
- bl sub_800AA14
+ bl CloseFile
ldr r0, [r4]
bl MemoryFree
movs r0, 0
@@ -42290,7 +42290,7 @@ sub_801FD7C:
lsls r1, 1
adds r0, r1
ldr r0, [r0]
- bl sub_800AA14
+ bl CloseFile
ldr r0, [r4]
bl MemoryFree
movs r0, 0
@@ -46244,7 +46244,7 @@ sub_8021D1C:
beq _08021D38
adds r0, 0xBC
ldr r0, [r0]
- bl sub_800AA14
+ bl CloseFile
ldr r0, [r4]
bl MemoryFree
movs r0, 0
@@ -51669,7 +51669,7 @@ sub_80247C0:
lsls r1, 1
adds r0, r1
ldr r0, [r0]
- bl sub_800AA14
+ bl CloseFile
ldr r0, [r4]
bl MemoryFree
movs r0, 0
@@ -58995,7 +58995,7 @@ sub_80282FC:
lsls r1, 3
adds r0, r1
ldr r0, [r0]
- bl sub_800AA14
+ bl CloseFile
ldr r0, [r4]
bl MemoryFree
movs r0, 0
@@ -62390,7 +62390,7 @@ sub_8029E60:
lsls r1, 3
adds r0, r1
ldr r0, [r0]
- bl sub_800AA14
+ bl CloseFile
ldr r0, [r4]
bl MemoryFree
movs r0, 0
@@ -65041,7 +65041,7 @@ sub_802B3B8:
cmp r0, 0
beq _0802B3D2
ldr r0, [r0, 0x4]
- bl sub_800AA14
+ bl CloseFile
ldr r0, [r4]
bl MemoryFree
movs r0, 0
@@ -70198,7 +70198,7 @@ sub_802DC00:
ldr r0, [r0, 0x38]
cmp r0, 0
beq _0802DC14
- bl sub_800AA14
+ bl CloseFile
_0802DC14:
ldr r0, [r4]
bl MemoryFree
@@ -73080,7 +73080,7 @@ sub_802F2C0:
ldr r0, [r0, 0x14]
cmp r0, 0
beq _0802F2D4
- bl sub_800AA14
+ bl CloseFile
_0802F2D4:
ldr r0, [r4]
bl MemoryFree
@@ -74589,7 +74589,7 @@ sub_802FEE0:
cmp r0, 0
beq _0802FEFA
ldr r0, [r0, 0x58]
- bl sub_800AA14
+ bl CloseFile
ldr r0, [r4]
bl MemoryFree
movs r0, 0
@@ -76898,7 +76898,7 @@ sub_80310B4:
lsls r1, 1
adds r0, r1
ldr r0, [r0]
- bl sub_800AA14
+ bl CloseFile
ldr r0, [r4]
bl MemoryFree
movs r0, 0
@@ -77524,7 +77524,7 @@ sub_80315C0:
ldr r0, [r0, 0x8]
cmp r0, 0
beq _080315D4
- bl sub_800AA14
+ bl CloseFile
_080315D4:
ldr r0, [r4]
bl MemoryFree
@@ -93520,7 +93520,7 @@ sub_80397B4:
sub sp, 0xC
ldr r0, _08039834
ldr r1, _08039838
- bl sub_800A9EC
+ bl OpenFileAndGetFileDataPtr
adds r6, r0, 0
movs r4, 0
_080397C8:
@@ -93569,7 +93569,7 @@ _0803981C:
cmp r4, 0xB
ble _080397E6
adds r0, r6, 0
- bl sub_800AA14
+ bl CloseFile
add sp, 0xC
pop {r3}
mov r8, r3
@@ -100336,7 +100336,7 @@ _0803CCC8:
movs r2, 0xE
bl sub_800836C
adds r0, r5, 0
- bl sub_800AA14
+ bl CloseFile
movs r0, 0x1
bl sub_80073E0
add sp, 0x60
@@ -100732,7 +100732,7 @@ _0803CFF0:
movs r2, 0xE
bl sub_800836C
adds r0, r5, 0
- bl sub_800AA14
+ bl CloseFile
movs r0, 0x1
bl sub_80073E0
ldr r0, _0803D02C
@@ -101409,7 +101409,7 @@ _0803D500:
str r0, [r2]
ldr r0, _0803D660
ldr r1, _0803D664
- bl sub_800A9EC
+ bl OpenFileAndGetFileDataPtr
mov r9, r0
ldr r3, [r0, 0x4]
ldr r2, [r6]
@@ -101639,7 +101639,7 @@ _0803D6C0:
cmp r5, 0x3
ble _0803D60C
mov r0, r9
- bl sub_800AA14
+ bl CloseFile
_0803D6E0:
add sp, 0x1FC
pop {r3-r5}
@@ -102145,12 +102145,12 @@ sub_803DA7C:
ldr r0, _0803DB84
ldr r4, _0803DB88
adds r1, r4, 0
- bl sub_800A9EC
+ bl OpenFileAndGetFileDataPtr
ldr r5, _0803DB8C
str r0, [r5]
ldr r0, _0803DB90
adds r1, r4, 0
- bl sub_800A9EC
+ bl OpenFileAndGetFileDataPtr
ldr r1, _0803DB94
str r0, [r1]
ldr r1, _0803DB98
@@ -102300,7 +102300,7 @@ _0803DBCA:
_0803DBEA:
ldr r0, _0803DC10
ldr r0, [r0]
- bl sub_800AA14
+ bl CloseFile
movs r0, 0x2
bl sub_803E46C
add sp, 0x68
@@ -102783,7 +102783,7 @@ sub_803DF60:
push {r4-r7,lr}
ldr r0, _0803DFF8
ldr r1, _0803DFFC
- bl sub_800A9EC
+ bl OpenFileAndGetFileDataPtr
adds r7, r0, 0
ldr r0, [r7, 0x4]
ldr r5, [r0]
@@ -102803,10 +102803,10 @@ _0803DF78:
bne _0803DF78
_0803DF8C:
adds r0, r7, 0
- bl sub_800AA14
+ bl CloseFile
ldr r0, _0803E004
ldr r1, _0803DFFC
- bl sub_800A9EC
+ bl OpenFileAndGetFileDataPtr
adds r7, r0, 0
ldr r5, [r7, 0x4]
ldm r5!, {r4}
@@ -102825,26 +102825,26 @@ _0803DFA6:
bne _0803DFA6
_0803DFBA:
adds r0, r7, 0
- bl sub_800AA14
+ bl CloseFile
ldr r0, _0803E00C
ldr r4, _0803DFFC
adds r1, r4, 0
- bl sub_800A9EC
+ bl OpenFileAndGetFileDataPtr
ldr r1, _0803E010
str r0, [r1]
ldr r0, _0803E014
adds r1, r4, 0
- bl sub_800A9EC
+ bl OpenFileAndGetFileDataPtr
ldr r1, _0803E018
str r0, [r1]
ldr r0, _0803E01C
adds r1, r4, 0
- bl sub_800A9EC
+ bl OpenFileAndGetFileDataPtr
ldr r1, _0803E020
str r0, [r1]
ldr r0, _0803E024
adds r1, r4, 0
- bl sub_800A9EC
+ bl OpenFileAndGetFileDataPtr
ldr r1, _0803E028
str r0, [r1]
pop {r4-r7}
@@ -102880,7 +102880,7 @@ sub_803E02C:
stm r1!, {r2,r3}
ldr r1, _0803E11C
mov r0, sp
- bl sub_800A9EC
+ bl OpenFileAndGetFileDataPtr
adds r7, r0, 0
ldr r0, [r7, 0x4]
ldr r5, [r0]
@@ -102905,7 +102905,7 @@ _0803E06C:
movs r2, 0x80
bl CpuCopy
adds r0, r7, 0
- bl sub_800AA14
+ bl CloseFile
movs r6, 0x80
lsls r6, 2
movs r4, 0
@@ -103113,16 +103113,16 @@ sub_803E214:
push {lr}
ldr r0, _0803E23C
ldr r0, [r0]
- bl sub_800AA14
+ bl CloseFile
ldr r0, _0803E240
ldr r0, [r0]
- bl sub_800AA14
+ bl CloseFile
ldr r0, _0803E244
ldr r0, [r0]
- bl sub_800AA14
+ bl CloseFile
ldr r0, _0803E248
ldr r0, [r0]
- bl sub_800AA14
+ bl CloseFile
pop {r0}
bx r0
.align 2, 0
@@ -107041,7 +107041,7 @@ sub_8040130:
push {lr}
ldr r0, _08040144
ldr r1, _08040148
- bl sub_800A9EC
+ bl OpenFileAndGetFileDataPtr
ldr r1, _0804014C
str r0, [r1]
pop {r0}
@@ -107153,7 +107153,7 @@ sub_8040218:
ldr r0, [r0]
cmp r0, 0
beq _08040226
- bl sub_800AA14
+ bl CloseFile
_08040226:
bl sub_8040124
pop {r0}
@@ -114494,7 +114494,7 @@ _08043926:
bl sub_8049820
ldr r0, _08043994
ldr r0, [r0]
- bl sub_800AA14
+ bl CloseFile
bl sub_800F740
ldr r0, _08043998
mov r3, r10
@@ -126257,14 +126257,14 @@ sub_804966C:
ldr r7, _08049744
mov r0, sp
adds r1, r7, 0
- bl sub_800A9EC
+ bl OpenFileAndGetFileDataPtr
adds r4, r0, 0
ldr r0, _08049748
movs r1, 0
adds r2, r4, 0
bl sub_800AE28
adds r0, r4, 0
- bl sub_800AA14
+ bl CloseFile
ldr r1, _0804974C
ldr r0, [r6]
adds r0, r5
@@ -126274,7 +126274,7 @@ sub_804966C:
bl sprintf
mov r0, sp
adds r1, r7, 0
- bl sub_800A9EC
+ bl OpenFileAndGetFileDataPtr
ldr r1, _08049750
str r0, [r1]
ldr r1, _08049754
@@ -126288,7 +126288,7 @@ sub_804966C:
bl sprintf
mov r0, sp
adds r1, r7, 0
- bl sub_800A9EC
+ bl OpenFileAndGetFileDataPtr
adds r4, r0, 0
ldr r0, [r6]
ldr r1, _08049758
@@ -126297,7 +126297,7 @@ sub_804966C:
adds r2, r4, 0
bl sub_800AAA8
adds r0, r4, 0
- bl sub_800AA14
+ bl CloseFile
ldr r0, [r6]
adds r2, r0, r5
movs r3, 0
@@ -126311,7 +126311,7 @@ sub_804966C:
bl sprintf
mov r0, sp
adds r1, r7, 0
- bl sub_800A9EC
+ bl OpenFileAndGetFileDataPtr
adds r4, r0, 0
ldr r0, [r6]
ldr r1, _08049764
@@ -126321,7 +126321,7 @@ sub_804966C:
adds r2, r4, 0
bl sub_800AAA8
adds r0, r4, 0
- bl sub_800AA14
+ bl CloseFile
b _08049794
.align 2, 0
_08049734: .4byte gUnknown_80F6A04
@@ -126345,7 +126345,7 @@ _08049768:
bl sprintf
mov r0, sp
adds r1, r7, 0
- bl sub_800A9EC
+ bl OpenFileAndGetFileDataPtr
adds r4, r0, 0
ldr r0, [r6]
ldr r1, _080497EC
@@ -126355,7 +126355,7 @@ _08049768:
adds r2, r4, 0
bl sub_800AAA8
adds r0, r4, 0
- bl sub_800AA14
+ bl CloseFile
_08049794:
ldr r1, _080497F0
ldr r5, _080497F4
@@ -126368,7 +126368,7 @@ _08049794:
bl sprintf
ldr r1, _080497FC
mov r0, sp
- bl sub_800A9EC
+ bl OpenFileAndGetFileDataPtr
adds r1, r0, 0
ldr r0, _08049800
str r1, [r0]
@@ -126424,10 +126424,10 @@ sub_8049820:
push {lr}
ldr r0, _08049838
ldr r0, [r0]
- bl sub_800AA14
+ bl CloseFile
ldr r0, _0804983C
ldr r0, [r0]
- bl sub_800AA14
+ bl CloseFile
pop {r0}
bx r0
.align 2, 0
@@ -129581,7 +129581,7 @@ sub_804AFAC:
mov r8, r1
ldr r0, _0804B0F0
ldr r1, _0804B0F4
- bl sub_800A9EC
+ bl OpenFileAndGetFileDataPtr
ldr r2, [r4]
ldr r3, _0804B0F8
adds r1, r2, r3
@@ -130195,7 +130195,7 @@ _0804B504:
ldr r1, _0804B530
adds r0, r1
ldr r0, [r0]
- bl sub_800AA14
+ bl CloseFile
add sp, 0x44
pop {r3-r5}
mov r8, r3
@@ -145378,7 +145378,7 @@ _08052888:
ldr r0, [sp, 0x14]
cmp r0, 0
beq _080528B2
- bl sub_800AA14
+ bl CloseFile
_080528B2:
cmp r6, 0
beq _080528E4
@@ -145699,7 +145699,7 @@ _08052B3C:
cmp r1, 0
beq _08052B5C
ldr r0, [r1]
- bl sub_800AA14
+ bl CloseFile
_08052B5C:
ldrh r0, [r6]
cmp r0, 0x1
@@ -145812,7 +145812,7 @@ _08052C2A:
ldr r0, [sp]
cmp r0, 0
beq _08052C48
- bl sub_800AA14
+ bl CloseFile
_08052C48:
bl sub_8040238
movs r0, 0
@@ -145917,7 +145917,7 @@ _08052D02:
ldr r0, [sp, 0x14]
cmp r0, 0
beq _08052D20
- bl sub_800AA14
+ bl CloseFile
_08052D20:
bl sub_8040238
movs r0, 0
@@ -188659,7 +188659,7 @@ sub_8068614:
push {lr}
ldr r0, _0806862C
ldr r1, _08068630
- bl sub_800A9EC
+ bl OpenFileAndGetFileDataPtr
ldr r1, _08068634
ldr r1, [r1]
ldr r2, _08068638
@@ -188682,7 +188682,7 @@ sub_806863C:
ldr r1, _08068654
adds r0, r1
ldr r0, [r0]
- bl sub_800AA14
+ bl CloseFile
pop {r0}
bx r0
.align 2, 0
@@ -188915,7 +188915,7 @@ sub_80687EC:
bl sprintf
ldr r1, _08068834
mov r0, sp
- bl sub_800A9EC
+ bl OpenFileAndGetFileDataPtr
ldr r1, [r5]
ldr r2, _0806882C
adds r1, r2
@@ -189026,7 +189026,7 @@ _080688D2:
ldr r0, [r0]
cmp r0, 0
beq _080688F2
- bl sub_800AA14
+ bl CloseFile
ldr r0, [r6]
ldr r1, _08068904
adds r0, r1
@@ -192556,7 +192556,7 @@ _0806A404:
_0806A41C:
ldr r1, _0806A454
mov r0, sp
- bl sub_800A9EC
+ bl OpenFileAndGetFileDataPtr
adds r4, r0, 0
adds r0, r5, 0
movs r1, 0xA
@@ -192571,7 +192571,7 @@ _0806A41C:
adds r0, r7, 0
bl strcpy
adds r0, r4, 0
- bl sub_800AA14
+ bl CloseFile
add sp, 0xC
pop {r4-r7}
pop {r0}
@@ -261103,7 +261103,7 @@ LoadMonsterParameters:
str r0, [r1]
ldr r0, _0808CDEC
ldr r1, _0808CDF0
- bl sub_800A9EC
+ bl OpenFileAndGetFileDataPtr
ldr r1, _0808CDF4
str r0, [r1]
ldr r1, _0808CDF8
@@ -263388,7 +263388,7 @@ sub_808DD90:
bl sprintf
ldr r1, _0808DDC4
mov r0, sp
- bl sub_800A908
+ bl OpenFile
b _0808DDCA
.align 2, 0
_0808DDBC: .4byte gUnknown_202F3E0
@@ -263422,7 +263422,7 @@ sub_808DDD0:
bl sprintf
ldr r1, _0808DE04
mov r0, sp
- bl sub_800A9EC
+ bl OpenFileAndGetFileDataPtr
b _0808DE0A
.align 2, 0
_0808DDFC: .4byte gUnknown_202F3E0
@@ -263730,14 +263730,14 @@ sub_808E010:
bl sprintf
ldr r1, _0808E074
mov r0, sp
- bl sub_800A9EC
+ bl OpenFileAndGetFileDataPtr
adds r4, r0, 0
ldr r0, _0808E078
movs r1, 0
adds r2, r4, 0
bl sub_800AAA8
adds r0, r4, 0
- bl sub_800AA14
+ bl CloseFile
_0808E04A:
subs r5, 0x1
cmp r5, 0
@@ -264438,7 +264438,7 @@ sub_808E53C:
str r1, [sp]
ldr r0, _0808E628
ldr r1, _0808E62C
- bl sub_800A9EC
+ bl OpenFileAndGetFileDataPtr
adds r7, r0, 0
ldr r4, [r7, 0x4]
movs r6, 0x7
@@ -264458,7 +264458,7 @@ _0808E564:
cmp r6, 0
bne _0808E564
adds r0, r7, 0
- bl sub_800AA14
+ bl CloseFile
movs r6, 0
movs r0, 0x3
mov r12, r0
@@ -269215,7 +269215,7 @@ sub_8090998:
str r0, [r1]
ldr r0, _080909C0
ldr r1, _080909C4
- bl sub_800A9EC
+ bl OpenFileAndGetFileDataPtr
ldr r1, _080909C8
str r0, [r1]
ldr r1, _080909CC
@@ -273590,7 +273590,7 @@ sub_8092848:
push {lr}
ldr r0, _08092868
ldr r1, _0809286C
- bl sub_800A9EC
+ bl OpenFileAndGetFileDataPtr
ldr r1, _08092870
str r0, [r1]
ldr r1, _08092874
@@ -288545,7 +288545,7 @@ sub_809965C:
bl sub_8099690
ldr r0, _08099688
ldr r1, _0809968C
- bl sub_800A9EC
+ bl OpenFileAndGetFileDataPtr
adds r4, r0, 0
movs r0, 0xF8
lsls r0, 1
@@ -288553,7 +288553,7 @@ sub_809965C:
movs r2, 0x10
bl sub_800388C
adds r0, r4, 0
- bl sub_800AA14
+ bl CloseFile
pop {r4}
pop {r0}
bx r0
@@ -288568,7 +288568,7 @@ sub_8099690:
adds r4, r0, 0
ldr r0, _080996BC
ldr r1, _080996C0
- bl sub_800A9EC
+ bl OpenFileAndGetFileDataPtr
adds r6, r0, 0
cmp r4, 0x1
beq _080996CC
@@ -288613,7 +288613,7 @@ _080996E4:
cmp r4, 0xF
ble _080996E4
adds r0, r6, 0
- bl sub_800AA14
+ bl CloseFile
pop {r4-r6}
pop {r0}
bx r0
@@ -290954,7 +290954,7 @@ sub_809A83C:
ldr r0, [r6, 0x20]
cmp r0, 0
beq _0809A89A
- bl sub_800AA14
+ bl CloseFile
str r7, [r6, 0x20]
_0809A89A:
pop {r4-r7}
@@ -290998,7 +290998,7 @@ sub_809A8B8:
ldr r0, [r7, 0x20]
cmp r0, 0
beq _0809A8F6
- bl sub_800AA14
+ bl CloseFile
ldr r2, [sp, 0x4]
str r2, [r7, 0x20]
_0809A8F6:
@@ -291441,7 +291441,7 @@ sub_809AC7C:
ldr r0, [r4, 0x20]
cmp r0, 0
beq _0809ACA8
- bl sub_800AA14
+ bl CloseFile
movs r0, 0
str r0, [r4, 0x20]
_0809ACA8:
@@ -291518,7 +291518,7 @@ _0809AD1C:
strb r5, [r4, 0x6]
str r0, [r4, 0x10]
movs r1, 0
- bl sub_800A9D8
+ bl GetFileDataPtr
movs r1, 0
ldrsh r0, [r4, r1]
cmp r0, 0x4D
@@ -307375,7 +307375,7 @@ _080A2DE0:
ldr r0, [r4]
cmp r0, 0
beq _080A2DEE
- bl sub_800AA14
+ bl CloseFile
movs r0, 0
str r0, [r4]
_080A2DEE:
@@ -307388,7 +307388,7 @@ _080A2DEE:
ldr r0, [r4]
cmp r0, 0
beq _080A2E08
- bl sub_800AA14
+ bl CloseFile
movs r0, 0
str r0, [r4]
_080A2E08:
@@ -307398,7 +307398,7 @@ _080A2E08:
ldr r0, [r4]
cmp r0, 0
beq _080A2E1C
- bl sub_800AA14
+ bl CloseFile
movs r0, 0
str r0, [r4]
_080A2E1C:
@@ -307408,7 +307408,7 @@ _080A2E1C:
ldr r0, [r4]
cmp r0, 0
beq _080A2E30
- bl sub_800AA14
+ bl CloseFile
movs r0, 0
str r0, [r4]
_080A2E30:
@@ -307417,7 +307417,7 @@ _080A2E30:
ldr r0, [r4]
cmp r0, 0
beq _080A2E42
- bl sub_800AA14
+ bl CloseFile
movs r0, 0
str r0, [r4]
_080A2E42:
@@ -307427,7 +307427,7 @@ _080A2E42:
ldr r0, [r4]
cmp r0, 0
beq _080A2E56
- bl sub_800AA14
+ bl CloseFile
movs r0, 0
str r0, [r4]
_080A2E56:
@@ -307642,7 +307642,7 @@ _080A2FDE:
ldr r0, [r0]
ldr r4, _080A328C
adds r1, r4, 0
- bl sub_800A9EC
+ bl OpenFileAndGetFileDataPtr
movs r6, 0x86
lsls r6, 3
add r6, r9
@@ -307650,14 +307650,14 @@ _080A2FDE:
ldr r1, [sp, 0xC]
ldr r0, [r1, 0x4]
adds r1, r4, 0
- bl sub_800A9EC
+ bl OpenFileAndGetFileDataPtr
ldr r5, _080A3290
add r5, r9
str r0, [r5]
ldr r2, [sp, 0xC]
ldr r0, [r2, 0x8]
adds r1, r4, 0
- bl sub_800A9EC
+ bl OpenFileAndGetFileDataPtr
movs r1, 0x87
lsls r1, 3
add r1, r9
@@ -308051,7 +308051,7 @@ _080A3338:
beq _080A3394
ldr r1, _080A3390
str r3, [sp, 0x24]
- bl sub_800A9EC
+ bl OpenFileAndGetFileDataPtr
str r0, [r4, 0x8]
movs r1, 0x1
strb r1, [r4]
@@ -308121,7 +308121,7 @@ _080A33C0:
cmp r0, 0
beq _080A3408
ldr r1, _080A3438
- bl sub_800A9EC
+ bl OpenFileAndGetFileDataPtr
adds r3, r0, 0
ldr r0, [r3, 0x4]
adds r1, r0, 0x4
@@ -308148,7 +308148,7 @@ _080A33F4:
bne _080A33F4
_080A3402:
adds r0, r3, 0
- bl sub_800AA14
+ bl CloseFile
_080A3408:
adds r7, r4, 0
cmp r7, 0x3
@@ -308220,7 +308220,7 @@ _080A346C:
ldr r0, [r4]
ldr r5, _080A3784
adds r1, r5, 0
- bl sub_800A9EC
+ bl OpenFileAndGetFileDataPtr
movs r1, 0x86
lsls r1, 3
add r1, r9
@@ -308228,13 +308228,13 @@ _080A346C:
str r0, [r1]
ldr r0, [r4, 0x4]
adds r1, r5, 0
- bl sub_800A9EC
+ bl OpenFileAndGetFileDataPtr
ldr r6, _080A3788
add r6, r9
str r0, [r6]
ldr r0, [r4, 0x8]
adds r1, r5, 0
- bl sub_800A9EC
+ bl OpenFileAndGetFileDataPtr
movs r1, 0x87
lsls r1, 3
add r1, r9
@@ -308363,10 +308363,10 @@ _080A34FE:
bl sub_80ADD9C
ldr r0, [r5]
movs r1, 0
- bl sub_800A9D8
+ bl GetFileDataPtr
ldr r0, [r6]
movs r1, 0
- bl sub_800A9D8
+ bl GetFileDataPtr
movs r2, 0xA8
lsls r2, 3
add r2, r9
@@ -314479,7 +314479,7 @@ sub_80A62F0:
str r0, [r4]
ldr r0, _080A637C
ldr r1, _080A6380
- bl sub_800A9EC
+ bl OpenFileAndGetFileDataPtr
ldr r1, _080A6384
str r0, [r1]
movs r0, 0x1
@@ -314645,7 +314645,7 @@ sub_80A6460:
push {r4-r7,lr}
ldr r0, _080A649C
ldr r1, _080A64A0
- bl sub_800A9EC
+ bl OpenFileAndGetFileDataPtr
adds r7, r0, 0
movs r5, 0x80
lsls r5, 1
@@ -314665,7 +314665,7 @@ _080A6474:
cmp r6, 0
bge _080A6474
adds r0, r7, 0
- bl sub_800AA14
+ bl CloseFile
pop {r4-r7}
pop {r0}
bx r0
@@ -314716,7 +314716,7 @@ _080A64C0:
beq _080A6514
ldr r0, _080A650C
ldr r1, _080A6510
- bl sub_800A9EC
+ bl OpenFileAndGetFileDataPtr
adds r6, r0, 0
movs r0, 0xFF
ands r0, r5
@@ -314736,7 +314736,7 @@ _080A6514:
adds r0, r1
ldr r0, [r0]
ldr r1, _080A6588
- bl sub_800A9EC
+ bl OpenFileAndGetFileDataPtr
adds r6, r0, 0
ldr r2, [r6, 0x4]
_080A652A:
@@ -314768,7 +314768,7 @@ _080A654C:
cmp r6, 0
beq _080A6568
adds r0, r6, 0
- bl sub_800AA14
+ bl CloseFile
_080A6568:
movs r0, 0x1
add r8, r0
@@ -314804,7 +314804,7 @@ sub_80A658C:
bl nullsub_14
ldr r0, _080A65D0
ldr r0, [r0]
- bl sub_800AA14
+ bl CloseFile
ldr r4, _080A65D4
ldr r0, [r4]
bl MemoryFree
@@ -315256,7 +315256,7 @@ _080A68CE:
ldr r0, [r4, 0x54]
cmp r0, 0
beq _080A68DC
- bl sub_800AA14
+ bl CloseFile
movs r0, 0
str r0, [r4, 0x54]
_080A68DC:
@@ -315662,7 +315662,7 @@ _080A6BA8:
beq _080A6BE8
ldr r0, _080A6BE0
ldr r1, _080A6BE4
- bl sub_800A9EC
+ bl OpenFileAndGetFileDataPtr
mov r9, r0
ldr r7, [r0, 0x4]
movs r0, 0xFF
@@ -315681,7 +315681,7 @@ _080A6BE8:
adds r0, r1
ldr r0, [r0]
ldr r1, _080A6C64
- bl sub_800A9EC
+ bl OpenFileAndGetFileDataPtr
mov r9, r0
ldr r7, [r0, 0x4]
_080A6BFE:
@@ -315730,7 +315730,7 @@ _080A6C42:
mov r0, r9
cmp r0, 0
beq _080A6C78
- bl sub_800AA14
+ bl CloseFile
b _080A6C78
.align 2, 0
_080A6C60: .4byte gUnknown_81178F4
@@ -316802,10 +316802,10 @@ sub_80A7428:
bl sprintf
ldr r1, _080A7484
mov r0, sp
- bl sub_800A908
+ bl OpenFile
adds r5, r0, 0
movs r1, 0
- bl sub_800A9D8
+ bl GetFileDataPtr
adds r0, r4, 0
bl sub_808DACC
lsls r0, 24
@@ -317030,10 +317030,10 @@ sub_80A75CC:
cmp r0, 0
beq _080A7628
ldr r1, _080A7624
- bl sub_800A908
+ bl OpenFile
adds r5, r0, 0
movs r1, 0
- bl sub_800A9D8
+ bl GetFileDataPtr
ldr r0, [r5, 0x4]
str r0, [sp, 0x4]
b _080A762A
@@ -317126,10 +317126,10 @@ sub_80A7688:
cmp r0, 0
beq _080A76E4
ldr r1, _080A76E0
- bl sub_800A908
+ bl OpenFile
adds r5, r0, 0
movs r1, 0
- bl sub_800A9D8
+ bl GetFileDataPtr
ldr r0, [r5, 0x4]
str r0, [sp, 0x4]
b _080A76E6
@@ -330744,7 +330744,7 @@ sub_80ADD9C:
ldr r0, _080ADEB4
ldr r7, _080ADEB8
adds r1, r7, 0
- bl sub_800A9EC
+ bl OpenFileAndGetFileDataPtr
adds r6, r0, 0
add r4, sp, 0x1C
adds r0, r4, 0
@@ -330785,7 +330785,7 @@ _080ADDFA:
ldrb r0, [r0, 0x2]
mov r8, r0
adds r0, r6, 0
- bl sub_800AA14
+ bl CloseFile
ldr r1, _080ADEBC
ldr r0, _080ADEC0
add r0, r8
@@ -330795,21 +330795,21 @@ _080ADDFA:
bl sprintf
add r0, sp, 0x10
adds r1, r7, 0
- bl sub_800A9EC
+ bl OpenFileAndGetFileDataPtr
adds r4, r0, 0
ldr r0, [sp, 0x28]
movs r1, 0
adds r2, r4, 0
bl sub_800AE28
adds r0, r4, 0
- bl sub_800AA14
+ bl CloseFile
ldr r1, _080ADEC4
add r0, sp, 0x10
mov r2, r8
bl sprintf
add r0, sp, 0x10
adds r1, r7, 0
- bl sub_800A908
+ bl OpenFile
ldr r1, [sp, 0x20]
str r0, [r1]
ldr r1, _080ADEC8
@@ -330818,14 +330818,14 @@ _080ADDFA:
bl sprintf
add r0, sp, 0x10
adds r1, r7, 0
- bl sub_800A9EC
+ bl OpenFileAndGetFileDataPtr
adds r4, r0, 0
ldr r1, _080ADECC
ldr r0, [sp, 0x2C]
adds r2, r4, 0
bl sub_800AAA8
adds r0, r4, 0
- bl sub_800AA14
+ bl CloseFile
mov r2, r8
cmp r2, 0x3F
bgt _080ADED4
@@ -330835,7 +330835,7 @@ _080ADDFA:
bl sprintf
add r0, sp, 0x10
adds r1, r7, 0
- bl sub_800A9EC
+ bl OpenFileAndGetFileDataPtr
adds r4, r0, 0
mov r0, r10
movs r1, 0x93
@@ -330843,7 +330843,7 @@ _080ADDFA:
adds r2, r4, 0
bl sub_800AAA8
adds r0, r4, 0
- bl sub_800AA14
+ bl CloseFile
b _080ADEFC
.align 2, 0
_080ADEB4: .4byte gUnknown_8118890
@@ -330862,7 +330862,7 @@ _080ADED4:
bl sprintf
add r0, sp, 0x10
adds r1, r7, 0
- bl sub_800A9EC
+ bl OpenFileAndGetFileDataPtr
adds r4, r0, 0
movs r1, 0x90
lsls r1, 2
@@ -330870,7 +330870,7 @@ _080ADED4:
adds r2, r4, 0
bl sub_800AAA8
adds r0, r4, 0
- bl sub_800AA14
+ bl CloseFile
_080ADEFC:
movs r5, 0
ldr r3, [sp, 0x60]
@@ -330924,7 +330924,7 @@ _080ADF52:
bl sprintf
ldr r1, _080ADF88
add r0, sp, 0x10
- bl sub_800A908
+ bl OpenFile
ldr r1, [sp, 0x24]
str r0, [r1]
mov r0, r10
diff --git a/src/main.c b/src/main.c
index a74a9b6..59922dd 100644
--- a/src/main.c
+++ b/src/main.c
@@ -33,7 +33,7 @@ extern void nullsub_6(void);
extern void sub_80047E8(void);
extern void InitBGPaletteBuffer(void);
extern void sub_80057E8(void);
-extern void sub_800A8C4(void);
+extern void InitFileSystem(void);
extern void sub_8006218(void);
extern void sub_80098A0(void);
extern void sub_80096E0(void);
@@ -97,7 +97,7 @@ void AgbMain(void)
sub_80047E8();
InitBGPaletteBuffer();
sub_80057E8();
- sub_800A8C4();
+ InitFileSystem();
sub_8006218();
sub_80098A0();
sub_80096E0();