summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--arm9/asm/unk_02006864.s10
-rw-r--r--arm9/asm/unk_02006D98.s8
-rw-r--r--arm9/asm/unk_02008DEC.s2
-rw-r--r--arm9/asm/unk_0200A384.s40
-rw-r--r--arm9/asm/unk_0200CABC.s2
-rw-r--r--arm9/asm/unk_02011744.s6
-rw-r--r--arm9/asm/unk_02012CC8.s4
-rw-r--r--arm9/asm/unk_02014BF4.s2
-rw-r--r--arm9/asm/unk_02021590.s12
-rw-r--r--arm9/asm/unk_020343A8.s4
-rw-r--r--arm9/asm/unk_02034A28.s10
-rw-r--r--arm9/asm/unk_02038C78.s4
-rw-r--r--arm9/asm/unk_0204A368.s6
-rw-r--r--arm9/asm/unk_0204B9EC.s2
-rw-r--r--arm9/asm/unk_02060CCC.s6
-rw-r--r--arm9/asm/unk_02066978.s24
-rw-r--r--arm9/asm/unk_0206AB04.s6
-rw-r--r--arm9/asm/unk_0206ABC4.s28
-rw-r--r--arm9/asm/unk_0206E5B4.s8
-rw-r--r--arm9/asm/unk_0206F3FC.s4
-rw-r--r--arm9/asm/unk_020799E8.s8
-rw-r--r--arm9/asm/unk_02079C70.s2
-rw-r--r--arm9/asm/unk_020828BC.s4
-rw-r--r--arm9/asm/unk_02085258.s16
-rw-r--r--arm9/global.inc30
-rw-r--r--arm9/modules/05/asm/module_05.s170
-rw-r--r--arm9/modules/06/asm/module_06.s52
-rw-r--r--arm9/modules/07/asm/module_07.s2
-rw-r--r--arm9/modules/08/asm/module_08.s18
-rw-r--r--arm9/modules/09/asm/module_09.s8
-rw-r--r--arm9/modules/11/asm/module_11.s26
-rw-r--r--arm9/modules/14/asm/module_14.s10
-rw-r--r--arm9/modules/16/asm/module_16.s6
-rw-r--r--arm9/modules/20/asm/module_20.s6
-rw-r--r--arm9/modules/27/asm/module_27.s6
-rw-r--r--arm9/modules/28/asm/module_28.s6
-rw-r--r--arm9/modules/57/asm/module_57.s6
-rw-r--r--arm9/modules/60/asm/module_60.s16
-rw-r--r--arm9/modules/61/asm/module_61.s20
-rw-r--r--arm9/modules/63/asm/module_63.s24
-rw-r--r--arm9/modules/65/asm/module_65.s8
-rw-r--r--arm9/modules/66/asm/module_66.s4
-rw-r--r--arm9/modules/74/asm/module_74.s4
-rw-r--r--arm9/modules/75/asm/module_75.s8
-rw-r--r--arm9/modules/77/asm/module_77.s10
-rw-r--r--arm9/modules/78/asm/module_78.s8
-rw-r--r--arm9/modules/80/asm/module_80.s6
-rw-r--r--arm9/modules/81/asm/module_81.s2
-rw-r--r--arm9/modules/83/asm/module_83.s8
-rw-r--r--arm9/modules/85/asm/module_85.s10
-rw-r--r--arm9/src/filesystem.c46
-rw-r--r--include/filesystem.h34
52 files changed, 386 insertions, 386 deletions
diff --git a/arm9/asm/unk_02006864.s b/arm9/asm/unk_02006864.s
index c3e46e9a..c3b18c3a 100644
--- a/arm9/asm/unk_02006864.s
+++ b/arm9/asm/unk_02006864.s
@@ -580,14 +580,14 @@ FUN_02006C98: ; 0x02006C98
_02006CAC:
ldr r1, [sp, #0x0]
add r0, r7, #0x0
- bl LoadFromNARC_7
+ bl GetNarcMemberSizeByIdPair
add r1, r0, #0x0
add r0, r6, #0x0
bl FUN_020169D8
add r4, r0, #0x0
b _02006CCE
_02006CC0:
- bl LoadFromNARC_7
+ bl GetNarcMemberSizeByIdPair
add r1, r0, #0x0
add r0, r6, #0x0
bl FUN_02016998
@@ -598,7 +598,7 @@ _02006CCE:
ldr r2, [sp, #0x0]
add r0, r4, #0x0
add r1, r7, #0x0
- bl LoadFromNARC
+ bl ReadWholeNarcMemberByIdPair
cmp r5, #0x0
beq _02006D12
ldr r0, [sp, #0x18]
@@ -639,7 +639,7 @@ FUN_02006D18: ; 0x02006D18
str r1, [sp, #0x4]
add r6, r2, #0x0
add r7, r3, #0x0
- bl LoadFromNARC_7
+ bl GetNarcMemberSizeByIdPair
str r0, [r5, #0x0]
cmp r6, #0x0
bne _02006D36
@@ -663,7 +663,7 @@ _02006D4C:
ldr r1, [sp, #0x0]
ldr r2, [sp, #0x4]
add r0, r4, #0x0
- bl LoadFromNARC
+ bl ReadWholeNarcMemberByIdPair
cmp r6, #0x0
beq _02006D92
ldr r0, [r4, #0x0]
diff --git a/arm9/asm/unk_02006D98.s b/arm9/asm/unk_02006D98.s
index cad56bd1..d856f51c 100644
--- a/arm9/asm/unk_02006D98.s
+++ b/arm9/asm/unk_02006D98.s
@@ -152,7 +152,7 @@ _02006E12:
ldr r2, [r4, r2]
mov r0, #0x75
mov r1, #0xd3
- bl LoadFromNarc_2
+ bl AllocAndReadWholeNarcMemberByIdPair
add r1, sp, #0xc
str r0, [sp, #0x4]
bl FUN_020B0088
@@ -3034,7 +3034,7 @@ _020082CC:
ldrh r0, [r0, #0x4]
ldrh r1, [r1, #0x6]
ldr r2, [r6, r2]
- bl LoadFromNarc_2
+ bl AllocAndReadWholeNarcMemberByIdPair
add r1, sp, #0x58
str r0, [sp, #0x4c]
bl FUN_020B0088
@@ -3597,7 +3597,7 @@ _02008706:
ldrh r0, [r4, #0x4]
ldrh r1, [r4, #0x8]
ldr r2, [r5, r2]
- bl LoadFromNarc_2
+ bl AllocAndReadWholeNarcMemberByIdPair
add r1, sp, #0x18
str r0, [sp, #0x10]
bl FUN_020B0138
@@ -3643,7 +3643,7 @@ _0200874A:
ldr r2, [r5, r2]
mov r0, #0x75
mov r1, #0xd4
- bl LoadFromNarc_2
+ bl AllocAndReadWholeNarcMemberByIdPair
add r1, sp, #0x18
str r0, [sp, #0x4]
bl FUN_020B0138
diff --git a/arm9/asm/unk_02008DEC.s b/arm9/asm/unk_02008DEC.s
index 402bb494..97f755ea 100644
--- a/arm9/asm/unk_02008DEC.s
+++ b/arm9/asm/unk_02008DEC.s
@@ -1674,7 +1674,7 @@ FUN_02009A04: ; 0x02009A04
add r6, r3, #0x0
add r5, r2, #0x0
add r2, r6, #0x0
- bl FUN_02006704
+ bl NARC_AllocAndReadWholeMember
add r4, r0, #0x0
beq _02009A4A
cmp r5, #0x0
diff --git a/arm9/asm/unk_0200A384.s b/arm9/asm/unk_0200A384.s
index 2bcb1c5b..1df2a2f2 100644
--- a/arm9/asm/unk_0200A384.s
+++ b/arm9/asm/unk_0200A384.s
@@ -5,10 +5,10 @@
thumb_func_start FUN_0200A384
FUN_0200A384: ; 0x0200A384
- ldr r3, _0200A388 ; =LoadFromNarc_2
+ ldr r3, _0200A388 ; =AllocAndReadWholeNarcMemberByIdPair
bx r3
.balign 4
-_0200A388: .word LoadFromNarc_2
+_0200A388: .word AllocAndReadWholeNarcMemberByIdPair
thumb_func_start FUN_0200A38C
FUN_0200A38C: ; 0x0200A38C
@@ -92,7 +92,7 @@ FUN_0200A418: ; 0x0200A418
add r5, r1, #0x0
add r1, r3, #0x0
add r4, r2, #0x0
- bl FUN_02006670
+ bl NARC_ctor
add r6, r0, #0x0
beq _0200A4AE
add r1, sp, #0xc
@@ -100,7 +100,7 @@ FUN_0200A418: ; 0x0200A418
add r1, r5, #0x0
mov r2, #0x0
mov r3, #0x4
- bl FUN_02006814
+ bl NARC_ReadFromMember
add r0, sp, #0x4
lsl r2, r4, #0x3
str r0, [sp, #0x0]
@@ -108,7 +108,7 @@ FUN_0200A418: ; 0x0200A418
add r1, r5, #0x0
add r2, r2, #0x4
mov r3, #0x8
- bl FUN_02006814
+ bl NARC_ReadFromMember
add r0, sp, #0x4
ldrh r2, [r0, #0xa]
ldr r0, _0200A4B4 ; =0x000002FD
@@ -132,7 +132,7 @@ FUN_0200A418: ; 0x0200A418
ldr r2, [sp, #0x4]
add r0, r6, #0x0
lsl r3, r3, #0x1
- bl FUN_02006814
+ bl NARC_ReadFromMember
ldr r2, _0200A4B8 ; =0x00091BD3
add r3, r4, #0x1
mul r2, r3
@@ -158,7 +158,7 @@ _0200A492:
bne _0200A492
_0200A4A8:
add r0, r6, #0x0
- bl FUN_020066F4
+ bl NARC_dtor
_0200A4AE:
add sp, #0x10
pop {r4-r6, pc}
@@ -370,7 +370,7 @@ FUN_0200A648: ; 0x0200A648
add r5, r1, #0x0
add r1, r7, #0x0
add r4, r2, #0x0
- bl FUN_02006670
+ bl NARC_ctor
add r6, r0, #0x0
beq _0200A66E
ldr r1, [sp, #0x18]
@@ -380,7 +380,7 @@ FUN_0200A648: ; 0x0200A648
add r3, r7, #0x0
bl FUN_0200A670
add r0, r6, #0x0
- bl FUN_020066F4
+ bl NARC_dtor
_0200A66E:
pop {r3-r7, pc}
@@ -396,7 +396,7 @@ FUN_0200A670: ; 0x0200A670
mov r3, #0x4
add r7, r0, #0x0
str r1, [sp, #0x4]
- bl FUN_02006814
+ bl NARC_ReadFromMember
add r0, sp, #0x8
ldrh r0, [r0, #0x8]
cmp r5, r0
@@ -408,7 +408,7 @@ FUN_0200A670: ; 0x0200A670
add r0, r7, #0x0
add r2, r2, #0x4
mov r3, #0x8
- bl FUN_02006814
+ bl NARC_ReadFromMember
add r0, sp, #0x8
ldrh r2, [r0, #0xa]
ldr r0, _0200A72C ; =0x000002FD
@@ -436,7 +436,7 @@ FUN_0200A670: ; 0x0200A670
ldr r2, [sp, #0x8]
add r0, r7, #0x0
add r3, r6, #0x0
- bl FUN_02006814
+ bl NARC_ReadFromMember
ldr r2, _0200A730 ; =0x00091BD3
add r3, r5, #0x1
mul r2, r3
@@ -488,7 +488,7 @@ FUN_0200A738: ; 0x0200A738
add r5, r1, #0x0
add r1, r6, #0x0
add r4, r2, #0x0
- bl FUN_02006670
+ bl NARC_ctor
add r7, r0, #0x0
beq _0200A75E
add r1, r5, #0x0
@@ -497,7 +497,7 @@ FUN_0200A738: ; 0x0200A738
bl FUN_0200A76C
add r4, r0, #0x0
add r0, r7, #0x0
- bl FUN_020066F4
+ bl NARC_dtor
b _0200A768
_0200A75E:
mov r0, #0x4
@@ -520,7 +520,7 @@ FUN_0200A76C: ; 0x0200A76C
mov r3, #0x4
add r7, r0, #0x0
str r1, [sp, #0x4]
- bl FUN_02006814
+ bl NARC_ReadFromMember
add r0, sp, #0xc
ldrh r0, [r0, #0x8]
cmp r4, r0
@@ -532,7 +532,7 @@ FUN_0200A76C: ; 0x0200A76C
add r0, r7, #0x0
add r2, r2, #0x4
mov r3, #0x8
- bl FUN_02006814
+ bl NARC_ReadFromMember
add r0, sp, #0xc
ldrh r2, [r0, #0xa]
ldr r0, _0200A83C ; =0x000002FD
@@ -566,7 +566,7 @@ FUN_0200A76C: ; 0x0200A76C
ldr r2, [sp, #0xc]
add r0, r7, #0x0
add r3, r6, #0x0
- bl FUN_02006814
+ bl NARC_ReadFromMember
ldr r2, _0200A840 ; =0x00091BD3
add r3, r4, #0x1
mul r2, r3
@@ -629,7 +629,7 @@ FUN_0200A84C: ; 0x0200A84C
add r1, r3, #0x0
add r0, sp, #0x4
mov r3, #0x0
- bl FUN_02006548
+ bl ReadFromNarcMemberByIdPair
add r0, sp, #0x4
ldrh r0, [r0, #0x0]
add sp, #0x8
@@ -664,7 +664,7 @@ FUN_0200A86C: ; 0x0200A86C
_0200A8A0:
ldr r1, [sp, #0x0]
add r0, r6, #0x0
- bl FUN_02006670
+ bl NARC_ctor
str r0, [r4, #0x8]
_0200A8AA:
strh r5, [r4, #0x0]
@@ -693,7 +693,7 @@ _0200A8CA:
b _0200A8D8
_0200A8D2:
ldr r0, [r4, #0x8]
- bl FUN_020066F4
+ bl NARC_dtor
_0200A8D8:
add r0, r4, #0x0
bl FUN_02016A18
diff --git a/arm9/asm/unk_0200CABC.s b/arm9/asm/unk_0200CABC.s
index 8e75a5c6..b35094db 100644
--- a/arm9/asm/unk_0200CABC.s
+++ b/arm9/asm/unk_0200CABC.s
@@ -1081,7 +1081,7 @@ FUN_0200D300: ; 0x0200D300
mov r0, #0x24
mov r1, #0x1
add r2, r4, #0x0
- bl LoadFromNarc_2
+ bl AllocAndReadWholeNarcMemberByIdPair
add r1, sp, #0x18
str r0, [sp, #0x14]
bl FUN_020B0138
diff --git a/arm9/asm/unk_02011744.s b/arm9/asm/unk_02011744.s
index e0b5ddc3..cccdc769 100644
--- a/arm9/asm/unk_02011744.s
+++ b/arm9/asm/unk_02011744.s
@@ -1317,7 +1317,7 @@ _02012018:
FUN_02012044: ; 0x02012044
push {r4-r6, lr}
add r5, r3, #0x0
- bl LoadFromNarc_2
+ bl AllocAndReadWholeNarcMemberByIdPair
add r4, r0, #0x0
bne _02012054
bl ErrorHandling
@@ -1543,7 +1543,7 @@ FUN_020121E8: ; 0x020121E8
str r3, [sp, #0x48]
mov r3, #0x0
str r3, [sp, #0x2c]
- bl LoadFromNarc_2
+ bl AllocAndReadWholeNarcMemberByIdPair
str r0, [sp, #0x20]
cmp r0, #0x0
bne _02012204
@@ -1888,7 +1888,7 @@ FUN_02012470: ; 0x02012470
add r0, r5, #0x0
add r1, r6, #0x0
add r2, r7, #0x0
- bl LoadFromNarc_2
+ bl AllocAndReadWholeNarcMemberByIdPair
add r1, sp, #0x0
add r5, r0, #0x0
bl FUN_020B0138
diff --git a/arm9/asm/unk_02012CC8.s b/arm9/asm/unk_02012CC8.s
index e4b695b1..2bb4e106 100644
--- a/arm9/asm/unk_02012CC8.s
+++ b/arm9/asm/unk_02012CC8.s
@@ -736,10 +736,10 @@ _02013188: .word UNK_021C4850
thumb_func_start FUN_0201318C
FUN_0201318C: ; 0x0201318C
- ldr r3, _02013190 ; =LoadFromNarc_2
+ ldr r3, _02013190 ; =AllocAndReadWholeNarcMemberByIdPair
bx r3
.balign 4
-_02013190: .word LoadFromNarc_2
+_02013190: .word AllocAndReadWholeNarcMemberByIdPair
thumb_func_start FUN_02013194
FUN_02013194: ; 0x02013194
diff --git a/arm9/asm/unk_02014BF4.s b/arm9/asm/unk_02014BF4.s
index 8c766384..b65898da 100644
--- a/arm9/asm/unk_02014BF4.s
+++ b/arm9/asm/unk_02014BF4.s
@@ -193,7 +193,7 @@ _02014CC2:
add r1, r1, r4
ldr r1, [r1, #0x14]
mov r0, #0x5e
- bl FUN_02006528
+ bl AllocAtEndAndReadWholeNarcMemberByIdPair
ldr r1, [r5, #0x0]
mov r2, #0x0
add r1, r1, r4
diff --git a/arm9/asm/unk_02021590.s b/arm9/asm/unk_02021590.s
index db0303a1..683e5ca4 100644
--- a/arm9/asm/unk_02021590.s
+++ b/arm9/asm/unk_02021590.s
@@ -85,7 +85,7 @@ FUN_02021600: ; 0x02021600
ldr r1, [sp, #0x18]
add r4, r2, #0x0
add r6, r3, #0x0
- bl FUN_02006670
+ bl NARC_ctor
str r0, [r5, #0x54]
cmp r0, #0x0
beq _020216A6
@@ -95,7 +95,7 @@ FUN_02021600: ; 0x02021600
add r1, r4, #0x0
mov r2, #0x0
mov r3, #0x10
- bl FUN_02006814
+ bl NARC_ReadFromMember
str r6, [r5, #0x6c]
cmp r6, #0x0
beq _02021638
@@ -122,7 +122,7 @@ _02021642:
ldr r0, [r5, #0x54]
ldr r2, [r5, #0x60]
ldr r3, [r5, #0x64]
- bl FUN_02006814
+ bl NARC_ReadFromMember
_02021660:
add r0, r5, #0x0
add r0, #0x6a
@@ -180,7 +180,7 @@ _020216C6:
ldr r0, [r4, #0x54]
cmp r0, #0x0
beq _020216D0
- bl FUN_020066F4
+ bl NARC_dtor
_020216D0:
pop {r4, pc}
.balign 4
@@ -219,7 +219,7 @@ FUN_020216EC: ; 0x020216EC
ldr r0, [r5, #0x54]
ldr r1, [r5, #0x58]
ldr r2, [r5, #0x5c]
- bl FUN_02006814
+ bl NARC_ReadFromMember
pop {r3-r5, pc}
.balign 4
_02021718: .word FUN_02021774
@@ -381,7 +381,7 @@ FUN_0202181C: ; 0x0202181C
ldr r0, [r4, #0x54]
ldr r1, [r4, #0x58]
add r3, r6, #0x0
- bl FUN_02006814
+ bl NARC_ReadFromMember
ldr r0, [r4, #0x8]
cmp r0, #0x3
bhi _020218C0
diff --git a/arm9/asm/unk_020343A8.s b/arm9/asm/unk_020343A8.s
index 11016257..b1ee54ec 100644
--- a/arm9/asm/unk_020343A8.s
+++ b/arm9/asm/unk_020343A8.s
@@ -39,7 +39,7 @@ _020343D8:
mov r0, #0x29
mov r1, r12
mov r2, #0xb
- bl FUN_02006528
+ bl AllocAtEndAndReadWholeNarcMemberByIdPair
add r6, r0, #0x0
ldrb r0, [r6, #0x0]
add r5, r6, #0x5
@@ -297,7 +297,7 @@ FUN_020345A8: ; 0x020345A8
mov r0, #0x29
mov r1, #0x0
add r2, r4, #0x0
- bl FUN_02006528
+ bl AllocAtEndAndReadWholeNarcMemberByIdPair
add r4, r0, #0x0
ldrb r1, [r4, #0x4]
add r0, r4, #0x5
diff --git a/arm9/asm/unk_02034A28.s b/arm9/asm/unk_02034A28.s
index fd8eb2fa..5dbc8f68 100644
--- a/arm9/asm/unk_02034A28.s
+++ b/arm9/asm/unk_02034A28.s
@@ -71,7 +71,7 @@ FUN_02034A98: ; 0x02034A98
add r4, r0, #0x0
mov r0, #0x20
add r1, r4, #0x0
- bl LoadFromNARC_7
+ bl GetNarcMemberSizeByIdPair
mov r1, #0x2
lsl r1, r1, #0xa
cmp r0, r1
@@ -82,7 +82,7 @@ _02034AB8:
add r0, r5, #0x0
mov r1, #0x20
add r2, r4, #0x0
- bl LoadFromNARC
+ bl ReadWholeNarcMemberByIdPair
pop {r3-r5, pc}
.balign 4
@@ -414,7 +414,7 @@ FUN_02034CB4: ; 0x02034CB4
add r2, r0, #0x0
add r0, r5, #0x0
mov r1, #0x25
- bl LoadFromNARC
+ bl ReadWholeNarcMemberByIdPair
_02034CDE:
pop {r3-r5, pc}
@@ -443,7 +443,7 @@ FUN_02034CEC: ; 0x02034CEC
bl MIi_CpuClearFast
mov r0, #0xa
add r1, r4, #0x0
- bl LoadFromNARC_7
+ bl GetNarcMemberSizeByIdPair
mov r1, #0x1
lsl r1, r1, #0x8
cmp r0, r1
@@ -455,7 +455,7 @@ _02034D1C:
add r0, r5, r0
mov r1, #0xa
add r2, r4, #0x0
- bl LoadFromNARC
+ bl ReadWholeNarcMemberByIdPair
pop {r3-r5, pc}
thumb_func_start FUN_02034D2C
diff --git a/arm9/asm/unk_02038C78.s b/arm9/asm/unk_02038C78.s
index 74a9f45a..0b3072f1 100644
--- a/arm9/asm/unk_02038C78.s
+++ b/arm9/asm/unk_02038C78.s
@@ -1635,7 +1635,7 @@ FUN_020392B4: ; 0x020392B4
add r4, r3, #0x0
mov r0, #0xa
mov r2, #0xb
- bl LoadFromNarc_2
+ bl AllocAndReadWholeNarcMemberByIdPair
str r0, [r5, #0x7c]
mov r0, #0x1
mov r1, #0x1a
@@ -1929,7 +1929,7 @@ FUN_0203949C: ; 0x0203949C
add r1, r0, #0x0
mov r0, #0xa
mov r2, #0xb
- bl LoadFromNarc_2
+ bl AllocAndReadWholeNarcMemberByIdPair
pop {r3, pc}
.balign 4
diff --git a/arm9/asm/unk_0204A368.s b/arm9/asm/unk_0204A368.s
index 2a9c2b16..714edb36 100644
--- a/arm9/asm/unk_0204A368.s
+++ b/arm9/asm/unk_0204A368.s
@@ -98,7 +98,7 @@ _0204A402:
_0204A410:
mov r0, #0x43
mov r1, #0xb
- bl FUN_02006670
+ bl NARC_ctor
add r7, r0, #0x0
ldr r0, [sp, #0xc]
mov r6, #0x0
@@ -119,7 +119,7 @@ _0204A42E:
mov r2, #0x10
add r0, r7, #0x0
lsl r3, r2, #0x7
- bl FUN_02006814
+ bl NARC_ReadFromMember
mov r0, #0x1
lsl r0, r0, #0xa
add r5, r5, r0
@@ -130,7 +130,7 @@ _0204A42E:
blt _0204A42E
_0204A452:
add r0, r7, #0x0
- bl FUN_020066F4
+ bl NARC_dtor
add sp, #0x3c
pop {r4-r7, pc}
diff --git a/arm9/asm/unk_0204B9EC.s b/arm9/asm/unk_0204B9EC.s
index dd899387..13436a9c 100644
--- a/arm9/asm/unk_0204B9EC.s
+++ b/arm9/asm/unk_0204B9EC.s
@@ -166,7 +166,7 @@ _0204BB08:
mov r1, #0x83
mov r2, #0x0
mul r3, r4
- bl FUN_02006548
+ bl ReadFromNarcMemberByIdPair
pop {r3-r5, pc}
.balign 4
_0204BB1C: .word 0x000001ED
diff --git a/arm9/asm/unk_02060CCC.s b/arm9/asm/unk_02060CCC.s
index 9f15b6a6..37ee6334 100644
--- a/arm9/asm/unk_02060CCC.s
+++ b/arm9/asm/unk_02060CCC.s
@@ -3239,7 +3239,7 @@ FUN_02062474: ; 0x02062474
mov r1, #0x7e
mov r2, #0x2
mov r3, #0x0
- bl FUN_02006548
+ bl ReadFromNarcMemberByIdPair
ldr r0, [sp, #0x8]
lsl r0, r0, #0x10
lsr r4, r0, #0x10
@@ -3275,13 +3275,13 @@ _020624C6:
mov r1, #0x7e
add r3, r4, #0x4
str r2, [sp, #0x0]
- bl FUN_02006548
+ bl ReadFromNarcMemberByIdPair
mov r2, #0x2
add r0, sp, #0x4
mov r1, #0x7e
add r3, r4, #0x6
str r2, [sp, #0x0]
- bl FUN_02006548
+ bl ReadFromNarcMemberByIdPair
add r2, sp, #0x4
ldrh r2, [r2, #0x2]
add r0, r6, #0x0
diff --git a/arm9/asm/unk_02066978.s b/arm9/asm/unk_02066978.s
index 8cb9aeeb..cf3e442a 100644
--- a/arm9/asm/unk_02066978.s
+++ b/arm9/asm/unk_02066978.s
@@ -4069,7 +4069,7 @@ _0206877A:
add r0, r4, #0x0
mov r1, #0x3
add r2, r5, #0x0
- bl LoadFromNARC
+ bl ReadWholeNarcMemberByIdPair
pop {r3-r5, pc}
.balign 4
@@ -5230,7 +5230,7 @@ _02068FCA:
add r0, sp, #0x0
add r1, r4, #0x0
add r2, r3, #0x0
- bl LoadFromNARC
+ bl ReadWholeNarcMemberByIdPair
add r0, sp, #0x0
ldrb r0, [r0, #0x0]
pop {r3-r5, pc}
@@ -5277,7 +5277,7 @@ FUN_02069010: ; 0x02069010
mov r1, #0x72
mov r2, #0x0
mul r3, r5
- bl FUN_02006548
+ bl ReadFromNarcMemberByIdPair
add r0, sp, #0xc
add r1, r4, #0x0
mov r2, #0x14
@@ -5301,7 +5301,7 @@ FUN_02069038: ; 0x02069038
mov r1, #0x72
mov r2, #0x0
mul r3, r6
- bl FUN_02006548
+ bl ReadFromNarcMemberByIdPair
cmp r5, #0x2
bne _0206906C
add r1, sp, #0x4
@@ -6734,7 +6734,7 @@ FUN_02069B40: ; 0x02069B40
mov r1, #0x6d
mov r2, #0x0
lsl r3, r3, #0x1
- bl FUN_02006548
+ bl ReadFromNarcMemberByIdPair
add r0, sp, #0x4
ldrh r0, [r0, #0x0]
add sp, #0x8
@@ -6756,7 +6756,7 @@ FUN_02069B60: ; 0x02069B60
add r0, sp, #0x4
mov r1, #0x91
lsl r3, r3, #0x1
- bl FUN_02006548
+ bl ReadFromNarcMemberByIdPair
_02069B7E:
add r0, sp, #0x4
ldrh r0, [r0, #0x0]
@@ -7347,7 +7347,7 @@ FUN_02069F9C: ; 0x02069F9C
add r2, r0, #0x0
add r0, r4, #0x0
mov r1, #0x21
- bl LoadFromNARC
+ bl ReadWholeNarcMemberByIdPair
pop {r4, pc}
thumb_func_start FUN_02069FB0
@@ -7822,13 +7822,13 @@ _0206A32E:
thumb_func_start FUN_0206A370
FUN_0206A370: ; 0x0206A370
- ldr r3, _0206A37C ; =LoadFromNARC
+ ldr r3, _0206A37C ; =ReadWholeNarcMemberByIdPair
add r2, r0, #0x0
add r0, r1, #0x0
mov r1, #0x2
bx r3
nop
-_0206A37C: .word LoadFromNARC
+_0206A37C: .word ReadWholeNarcMemberByIdPair
thumb_func_start FUN_0206A380
FUN_0206A380: ; 0x0206A380
@@ -7838,18 +7838,18 @@ FUN_0206A380: ; 0x0206A380
add r2, r0, #0x0
add r0, r4, #0x0
mov r1, #0x2
- bl LoadFromNARC
+ bl ReadWholeNarcMemberByIdPair
pop {r4, pc}
thumb_func_start FUN_0206A394
FUN_0206A394: ; 0x0206A394
- ldr r3, _0206A3A0 ; =LoadFromNARC
+ ldr r3, _0206A3A0 ; =ReadWholeNarcMemberByIdPair
add r2, r0, #0x0
add r0, r1, #0x0
mov r1, #0x22
bx r3
nop
-_0206A3A0: .word LoadFromNARC
+_0206A3A0: .word ReadWholeNarcMemberByIdPair
thumb_func_start FUN_0206A3A4
FUN_0206A3A4: ; 0x0206A3A4
diff --git a/arm9/asm/unk_0206AB04.s b/arm9/asm/unk_0206AB04.s
index f377ea5f..c523eb3b 100644
--- a/arm9/asm/unk_0206AB04.s
+++ b/arm9/asm/unk_0206AB04.s
@@ -12,7 +12,7 @@ FUN_0206AB04: ; 0x0206AB04
str r1, [sp, #0x0]
mov r1, #0x9
add r3, r2, #0x0
- bl FUN_02006548
+ bl ReadFromNarcMemberByIdPair
pop {r3, pc}
thumb_func_start FUN_0206AB18
@@ -115,10 +115,10 @@ _0206ABB0:
thumb_func_start FUN_0206ABB4
FUN_0206ABB4: ; 0x0206ABB4
- ldr r3, _0206ABC0 ; =LoadFromNARC
+ ldr r3, _0206ABC0 ; =ReadWholeNarcMemberByIdPair
add r2, r0, #0x0
add r0, r1, #0x0
mov r1, #0x9
bx r3
nop
-_0206ABC0: .word LoadFromNARC
+_0206ABC0: .word ReadWholeNarcMemberByIdPair
diff --git a/arm9/asm/unk_0206ABC4.s b/arm9/asm/unk_0206ABC4.s
index 9354e489..8144ba8a 100644
--- a/arm9/asm/unk_0206ABC4.s
+++ b/arm9/asm/unk_0206ABC4.s
@@ -170,7 +170,7 @@ FUN_0206ACD4: ; 0x0206ACD4
ldr r1, [sp, #0x4]
mov r0, #0x3b
add r4, r2, #0x0
- bl LoadFromNARC_7
+ bl GetNarcMemberSizeByIdPair
add r6, r0, #0x0
mov r0, #0x2
str r0, [sp, #0x0]
@@ -178,10 +178,10 @@ FUN_0206ACD4: ; 0x0206ACD4
mov r1, #0x89
mov r2, #0x0
lsl r3, r5, #0x1
- bl FUN_02006548
+ bl ReadFromNarcMemberByIdPair
mov r0, #0x3b
add r1, r4, #0x0
- bl FUN_02006670
+ bl NARC_ctor
add r4, sp, #0xc
ldrh r2, [r4, #0x0]
str r0, [sp, #0x8]
@@ -194,7 +194,7 @@ _0206AD0E:
ldr r0, [sp, #0x8]
mov r1, #0x0
mov r3, #0x4
- bl FUN_02006814
+ bl NARC_ReadFromMember
ldrh r1, [r4, #0x2]
cmp r1, r5
bne _0206AD30
@@ -215,7 +215,7 @@ _0206AD30:
bne _0206AD0E
_0206AD40:
ldr r0, [sp, #0x8]
- bl FUN_020066F4
+ bl NARC_dtor
ldr r0, [sp, #0x4]
add sp, #0x14
pop {r4-r7, pc}
@@ -230,7 +230,7 @@ FUN_0206AD4C: ; 0x0206AD4C
mov r1, #0x0
str r2, [sp, #0x4]
str r3, [sp, #0x8]
- bl LoadFromNARC_7
+ bl GetNarcMemberSizeByIdPair
add r5, r0, #0x0
mov r0, #0x2
str r0, [sp, #0x0]
@@ -238,10 +238,10 @@ FUN_0206AD4C: ; 0x0206AD4C
mov r1, #0x89
mov r2, #0x0
lsl r3, r6, #0x1
- bl FUN_02006548
+ bl ReadFromNarcMemberByIdPair
ldr r1, [sp, #0x8]
mov r0, #0x3b
- bl FUN_02006670
+ bl NARC_ctor
add r4, sp, #0x10
ldrh r2, [r4, #0x0]
str r0, [sp, #0xc]
@@ -254,7 +254,7 @@ _0206AD84:
ldr r0, [sp, #0xc]
mov r1, #0x0
mov r3, #0x4
- bl FUN_02006814
+ bl NARC_ReadFromMember
ldrh r0, [r4, #0x2]
cmp r0, r6
bne _0206ADB6
@@ -280,7 +280,7 @@ _0206ADB6:
bne _0206AD84
_0206ADC2:
ldr r0, [sp, #0xc]
- bl FUN_020066F4
+ bl NARC_dtor
add r0, sp, #0x10
ldrh r0, [r0, #0x0]
cmp r0, r5
@@ -295,23 +295,23 @@ _0206ADDC: .word 0x0000022E
thumb_func_start FUN_0206ADE0
FUN_0206ADE0: ; 0x0206ADE0
- ldr r3, _0206ADEC ; =LoadFromNARC
+ ldr r3, _0206ADEC ; =ReadWholeNarcMemberByIdPair
add r2, r0, #0x0
add r0, r1, #0x0
mov r1, #0x39
bx r3
nop
-_0206ADEC: .word LoadFromNARC
+_0206ADEC: .word ReadWholeNarcMemberByIdPair
thumb_func_start FUN_0206ADF0
FUN_0206ADF0: ; 0x0206ADF0
- ldr r3, _0206ADFC ; =LoadFromNARC
+ ldr r3, _0206ADFC ; =ReadWholeNarcMemberByIdPair
add r2, r0, #0x0
add r0, r1, #0x0
mov r1, #0x3a
bx r3
nop
-_0206ADFC: .word LoadFromNARC
+_0206ADFC: .word ReadWholeNarcMemberByIdPair
thumb_func_start FUN_0206AE00
FUN_0206AE00: ; 0x0206AE00
diff --git a/arm9/asm/unk_0206E5B4.s b/arm9/asm/unk_0206E5B4.s
index 398c1029..51c6ace1 100644
--- a/arm9/asm/unk_0206E5B4.s
+++ b/arm9/asm/unk_0206E5B4.s
@@ -504,21 +504,21 @@ _0206E72C:
lsl r3, r3, #0x3
ldrh r1, [r1, r3]
mov r0, #0xf
- bl LoadFromNarc_2
+ bl AllocAndReadWholeNarcMemberByIdPair
pop {r3, pc}
_0206E73A:
ldr r1, _0206E760 ; =UNK_020F85B6
lsl r3, r3, #0x3
ldrh r1, [r1, r3]
mov r0, #0x10
- bl LoadFromNarc_2
+ bl AllocAndReadWholeNarcMemberByIdPair
pop {r3, pc}
_0206E748:
ldr r1, _0206E764 ; =UNK_020F85B8
lsl r3, r3, #0x3
ldrh r1, [r1, r3]
mov r0, #0x10
- bl LoadFromNarc_2
+ bl AllocAndReadWholeNarcMemberByIdPair
pop {r3, pc}
_0206E756:
mov r0, #0x0
@@ -1159,7 +1159,7 @@ FUN_0206EB50: ; 0x0206EB50
mov r0, #0xf
add r2, r4, #0x0
add r3, r1, #0x0
- bl FUN_02006564
+ bl AllocAndReadFromNarcMemberByIdPair
add sp, #0x4
pop {r3-r4, pc}
.balign 4
diff --git a/arm9/asm/unk_0206F3FC.s b/arm9/asm/unk_0206F3FC.s
index 0214512e..df570956 100644
--- a/arm9/asm/unk_0206F3FC.s
+++ b/arm9/asm/unk_0206F3FC.s
@@ -1268,7 +1268,7 @@ FUN_0206FD24: ; 0x0206FD24
mov r0, #0x14
mov r1, #0x10
mov r2, #0xc
- bl LoadFromNarc_2
+ bl AllocAndReadWholeNarcMemberByIdPair
add r1, sp, #0x10
add r4, r0, #0x0
bl FUN_020B0138
@@ -6198,7 +6198,7 @@ FUN_020724D4: ; 0x020724D4
mov r1, #0x16
add r2, r4, #0x0
add r7, r3, #0x0
- bl LoadFromNarc_2
+ bl AllocAndReadWholeNarcMemberByIdPair
add r1, sp, #0xc
str r0, [sp, #0x8]
bl FUN_020B0180
diff --git a/arm9/asm/unk_020799E8.s b/arm9/asm/unk_020799E8.s
index f08b3d63..c4839555 100644
--- a/arm9/asm/unk_020799E8.s
+++ b/arm9/asm/unk_020799E8.s
@@ -244,7 +244,7 @@ FUN_02079B60: ; 0x02079B60
str r2, [sp, #0x4]
ldr r5, [sp, #0x2c]
ldr r4, [sp, #0x34]
- bl LoadFromNARC_7
+ bl GetNarcMemberSizeByIdPair
add r1, r0, #0x0
add r0, r7, #0x0
bl FUN_020169D8
@@ -252,7 +252,7 @@ FUN_02079B60: ; 0x02079B60
ldr r0, [sp, #0x4]
ldr r1, [sp, #0x28]
add r2, r7, #0x0
- bl FUN_02006774
+ bl NARC_ReadWholeMember
ldr r0, [sp, #0x30]
cmp r0, #0x0
beq _02079B9A
@@ -352,7 +352,7 @@ FUN_02079C40: ; 0x02079C40
add r0, r1, #0x0
add r1, r5, #0x0
add r7, r3, #0x0
- bl LoadFromNARC_7
+ bl GetNarcMemberSizeByIdPair
add r1, r0, #0x0
ldr r0, [sp, #0x18]
bl FUN_02016998
@@ -360,7 +360,7 @@ FUN_02079C40: ; 0x02079C40
add r0, r6, #0x0
add r1, r5, #0x0
add r2, r4, #0x0
- bl FUN_02006774
+ bl NARC_ReadWholeMember
add r0, r4, #0x0
add r1, r7, #0x0
bl FUN_020B0180
diff --git a/arm9/asm/unk_02079C70.s b/arm9/asm/unk_02079C70.s
index 99cb0bc6..ba551579 100644
--- a/arm9/asm/unk_02079C70.s
+++ b/arm9/asm/unk_02079C70.s
@@ -2747,7 +2747,7 @@ _0207B250:
_0207B256:
mov r0, #0x27
mov r2, #0x13
- bl LoadFromNarc_2
+ bl AllocAndReadWholeNarcMemberByIdPair
add r1, sp, #0xc
add r4, r0, #0x0
bl FUN_020B0180
diff --git a/arm9/asm/unk_020828BC.s b/arm9/asm/unk_020828BC.s
index 8db2792d..5dc01065 100644
--- a/arm9/asm/unk_020828BC.s
+++ b/arm9/asm/unk_020828BC.s
@@ -181,7 +181,7 @@ _0208292A:
str r0, [sp, #0x14]
mov r0, #0x5a
mov r1, #0x0
- bl LoadFromNARC_7
+ bl GetNarcMemberSizeByIdPair
mov r1, #0x30
bl _u32_div_f
str r0, [sp, #0x24]
@@ -942,7 +942,7 @@ FUN_02082ED0: ; 0x02082ED0
str r0, [sp, #0x14]
mov r0, #0x5a
mov r1, #0x1
- bl LoadFromNARC_7
+ bl GetNarcMemberSizeByIdPair
lsr r0, r0, #0x3
str r0, [sp, #0x18]
ldr r1, [sp, #0x18]
diff --git a/arm9/asm/unk_02085258.s b/arm9/asm/unk_02085258.s
index 288e7016..5af55be3 100644
--- a/arm9/asm/unk_02085258.s
+++ b/arm9/asm/unk_02085258.s
@@ -5,37 +5,37 @@
thumb_func_start FUN_02085258
FUN_02085258: ; 0x02085258
- ldr r3, _02085260 ; =FUN_02006670
+ ldr r3, _02085260 ; =NARC_ctor
add r1, r0, #0x0
mov r0, #0x44
bx r3
.balign 4
-_02085260: .word FUN_02006670
+_02085260: .word NARC_ctor
thumb_func_start FUN_02085264
FUN_02085264: ; 0x02085264
- ldr r3, _02085268 ; =FUN_02006704
+ ldr r3, _02085268 ; =NARC_AllocAndReadWholeMember
bx r3
.balign 4
-_02085268: .word FUN_02006704
+_02085268: .word NARC_AllocAndReadWholeMember
thumb_func_start FUN_0208526C
FUN_0208526C: ; 0x0208526C
- ldr r3, _02085270 ; =FUN_020066F4
+ ldr r3, _02085270 ; =NARC_dtor
bx r3
.balign 4
-_02085270: .word FUN_020066F4
+_02085270: .word NARC_dtor
thumb_func_start FUN_02085274
FUN_02085274: ; 0x02085274
add r3, r0, #0x0
add r2, r1, #0x0
add r1, r3, #0x0
- ldr r3, _02085280 ; =LoadFromNarc_2
+ ldr r3, _02085280 ; =AllocAndReadWholeNarcMemberByIdPair
mov r0, #0x44
bx r3
.balign 4
-_02085280: .word LoadFromNarc_2
+_02085280: .word AllocAndReadWholeNarcMemberByIdPair
thumb_func_start FUN_02085284
FUN_02085284: ; 0x02085284
diff --git a/arm9/global.inc b/arm9/global.inc
index 67ee8f6b..e37b0456 100644
--- a/arm9/global.inc
+++ b/arm9/global.inc
@@ -381,18 +381,18 @@
.extern FUN_0200627C
.extern FUN_0200628C
.extern FUN_02006290
-.extern FUN_02006528
-.extern FUN_02006548
-.extern FUN_02006564
-.extern FUN_02006584
-.extern FUN_02006670
-.extern FUN_020066F4
-.extern FUN_02006704
-.extern FUN_02006774
-.extern FUN_020067D0
-.extern FUN_02006814
-.extern FUN_02006864
-.extern FUN_02006874
+.extern AllocAtEndAndReadWholeNarcMemberByIdPair
+.extern ReadFromNarcMemberByIdPair
+.extern AllocAndReadFromNarcMemberByIdPair
+.extern AllocAtEndAndReadFromNarcMemberByIdPair
+.extern NARC_ctor
+.extern NARC_dtor
+.extern NARC_AllocAndReadWholeMember
+.extern NARC_ReadWholeMember
+.extern NARC_GetMemberSize
+.extern NARC_ReadFromMember
+.extern NARC_ReadFile
+.extern NARC_GetFileCount
.extern FUN_0200687C
.extern FUN_020068C8
.extern FUN_02006930
@@ -5957,9 +5957,9 @@
.extern InitScriptContext
.extern InitSystemForTheGame
.extern InitializeMainRNG
-.extern LoadFromNARC
-.extern LoadFromNARC_7
-.extern LoadFromNarc_2
+.extern ReadWholeNarcMemberByIdPair
+.extern GetNarcMemberSizeByIdPair
+.extern AllocAndReadWholeNarcMemberByIdPair
.extern LoadOverlay_MODULE_05
.extern LoadPlayerDataAddress
.extern MATH_CalcCRC16
diff --git a/arm9/modules/05/asm/module_05.s b/arm9/modules/05/asm/module_05.s
index 47d20311..ff3f2ecc 100644
--- a/arm9/modules/05/asm/module_05.s
+++ b/arm9/modules/05/asm/module_05.s
@@ -1162,7 +1162,7 @@ MOD05_021D7EE8: ; 0x021D7EE8
mov r0, #0x60
add r1, r6, #0
add r2, r5, #0
- bl FUN_02006528
+ bl AllocAtEndAndReadWholeNarcMemberByIdPair
ldr r1, _021D7F38 ; =0x0000FFFF
mov r2, #0
add r3, r4, #0
@@ -4675,7 +4675,7 @@ _021D9ABE:
add r0, r6, #0
add r1, r4, #0
mov r2, #4
- bl FUN_02006704
+ bl NARC_AllocAndReadWholeMember
add r4, r0, #0
bne _021D9AD0
bl ErrorHandling
@@ -4802,13 +4802,13 @@ _021D9B98:
bl FUN_02016B20
mov r0, #0x6e
mov r1, #4
- bl FUN_02006670
+ bl NARC_ctor
mov r1, #0x2b
lsl r1, r1, #4
str r0, [r7, r1]
mov r0, #0x6f
mov r1, #4
- bl FUN_02006670
+ bl NARC_ctor
mov r1, #0xad
lsl r1, r1, #2
str r0, [r7, r1]
@@ -4877,7 +4877,7 @@ MOD05_021D9C14: ; 0x021D9C14
add r1, r6, #0
add r2, sp, #0x10
add r5, r3, #0
- bl FUN_02006774
+ bl NARC_ReadWholeMember
cmp r4, #4
blt _021D9C38
bl ErrorHandling
@@ -4987,7 +4987,7 @@ MOD05_021D9CEC: ; 0x021D9CEC
ldr r0, [r6, r0]
add r1, r4, #0
add r2, sp, #0x20
- bl FUN_02006774
+ bl NARC_ReadWholeMember
add r0, sp, #0x20
ldrb r0, [r0]
cmp r0, #0
@@ -5113,7 +5113,7 @@ _021D9DEC:
ldr r0, [r6, r0]
add r1, r5, #0
add r2, sp, #4
- bl FUN_02006774
+ bl NARC_ReadWholeMember
cmp r4, #4
blt _021D9E02
bl ErrorHandling
@@ -5211,7 +5211,7 @@ _021D9EA4:
ldr r0, [r4, r0]
add r1, r5, #0
add r2, sp, #0x10
- bl FUN_02006774
+ bl NARC_ReadWholeMember
add r0, sp, #0x10
ldrb r0, [r0, #1]
bl MOD05_021D9BF0
@@ -5367,7 +5367,7 @@ MOD05_021D9FB4: ; 0x021D9FB4
ldr r0, [r4, r0]
add r2, sp, #0
add r5, r3, #0
- bl FUN_02006774
+ bl NARC_ReadWholeMember
cmp r5, #4
blt _021D9FD4
bl ErrorHandling
@@ -5416,11 +5416,11 @@ MOD05_021DA018: ; 0x021DA018
mov r0, #0x2b
lsl r0, r0, #4
ldr r0, [r4, r0]
- bl FUN_020066F4
+ bl NARC_dtor
mov r0, #0xad
lsl r0, r0, #2
ldr r0, [r4, r0]
- bl FUN_020066F4
+ bl NARC_dtor
add r0, r4, #0
bl FUN_02016A18
_021DA038:
@@ -5478,7 +5478,7 @@ MOD05_021DA080: ; 0x021DA080
ldr r0, [r5, r0]
add r1, r3, #0
add r2, sp, #0
- bl FUN_02006774
+ bl NARC_ReadWholeMember
cmp r4, #4
blt _021DA0A0
bl ErrorHandling
@@ -5724,11 +5724,11 @@ _021DA21A:
MOD05_021DA220: ; 0x021DA220
mov r1, #0xad
lsl r1, r1, #2
- ldr r3, _021DA22C ; =FUN_02006874
+ ldr r3, _021DA22C ; =NARC_GetFileCount
ldr r0, [r0, r1]
bx r3
nop
-_021DA22C: .word FUN_02006874
+_021DA22C: .word NARC_GetFileCount
thumb_func_start MOD05_021DA230
MOD05_021DA230: ; 0x021DA230
@@ -5738,7 +5738,7 @@ MOD05_021DA230: ; 0x021DA230
lsl r2, r2, #2
ldr r0, [r0, r2]
add r2, sp, #0
- bl FUN_02006774
+ bl NARC_ReadWholeMember
add r0, sp, #0
ldrb r0, [r0]
cmp r0, #0
@@ -10422,7 +10422,7 @@ MOD05_021DC554: ; 0x021DC554
ldr r0, _021DC590 ; =0x021F689C
str r0, [r4, #4]
mov r0, #0x41
- bl FUN_02006670
+ bl NARC_ctor
mov r1, #0x42
lsl r1, r1, #2
str r0, [r4, r1]
@@ -10476,7 +10476,7 @@ _021DC5A2:
ldr r1, [r4]
lsl r0, r0, #2
ldr r0, [r1, r0]
- bl FUN_020066F4
+ bl NARC_dtor
ldr r1, [r4]
mov r0, #4
bl FUN_02016A8C
@@ -11681,7 +11681,7 @@ MOD05_021DCECC: ; 0x021DCECC
mul r2, r1
ldr r1, [r3, r2]
mov r2, #4
- bl FUN_02006704
+ bl NARC_AllocAndReadWholeMember
add r1, sp, #0x14
str r0, [sp]
bl FUN_020B0138
@@ -11718,7 +11718,7 @@ MOD05_021DCF14: ; 0x021DCF14
ldr r0, [r4, r0]
ldr r1, [r1, #4]
mov r2, #4
- bl FUN_02006704
+ bl NARC_AllocAndReadWholeMember
add r1, sp, #0x14
str r0, [sp, #8]
bl FUN_020B0088
@@ -11764,7 +11764,7 @@ MOD05_021DCF68: ; 0x021DCF68
ldr r0, [r4, r0]
ldr r1, [r1, #8]
mov r2, #4
- bl FUN_02006704
+ bl NARC_AllocAndReadWholeMember
str r0, [sp, #0x14]
cmp r0, #0
bne _021DCFA0
@@ -27816,33 +27816,33 @@ MOD05_021E4C34: ; 0x021E4C34
bl MOD05_021E4C30
add r1, r0, #0
mov r0, #0x6b
- bl FUN_02006670
+ bl NARC_ctor
str r0, [r4, #0x20]
pop {r4, pc}
thumb_func_start MOD05_021E4C48
MOD05_021E4C48: ; 0x021E4C48
- ldr r3, _021E4C50 ; =FUN_020066F4
+ ldr r3, _021E4C50 ; =NARC_dtor
ldr r0, [r0, #0x20]
bx r3
nop
-_021E4C50: .word FUN_020066F4
+_021E4C50: .word NARC_dtor
thumb_func_start MOD05_021E4C54
MOD05_021E4C54: ; 0x021E4C54
- ldr r3, _021E4C5C ; =FUN_020067D0
+ ldr r3, _021E4C5C ; =NARC_GetMemberSize
ldr r0, [r0, #0x20]
bx r3
nop
-_021E4C5C: .word FUN_020067D0
+_021E4C5C: .word NARC_GetMemberSize
thumb_func_start MOD05_021E4C60
MOD05_021E4C60: ; 0x021E4C60
- ldr r3, _021E4C68 ; =FUN_02006774
+ ldr r3, _021E4C68 ; =NARC_ReadWholeMember
ldr r0, [r0, #0x20]
bx r3
nop
-_021E4C68: .word FUN_02006774
+_021E4C68: .word NARC_ReadWholeMember
thumb_func_start MOD05_021E4C6C
MOD05_021E4C6C: ; 0x021E4C6C
@@ -34174,7 +34174,7 @@ MOD05_021E7CD8: ; 0x021E7CD8
ldr r2, [sp, #4]
add r0, r6, #0
add r1, r4, #0
- bl FUN_02006864
+ bl NARC_ReadFile
add r0, r4, #0
mov r1, #0x30
bl _u32_div_f
@@ -46621,7 +46621,7 @@ MOD05_021EE0C0: ; 0x021EE0C0
mov r2, #0
mov r3, #0x10
str r4, [sp]
- bl FUN_02006814
+ bl NARC_ReadFromMember
b _021EE0FC
_021EE0E6:
bl ErrorHandling
@@ -46631,7 +46631,7 @@ _021EE0E6:
add r1, r7, #0
mov r2, #4
mov r3, #0
- bl FUN_02006584
+ bl AllocAtEndAndReadFromNarcMemberByIdPair
add r4, r0, #0
_021EE0FC:
ldr r0, [r4]
@@ -46678,7 +46678,7 @@ MOD05_021EE114: ; 0x021EE114
ldr r0, [r0]
ldr r1, [sp, #0x10]
ldr r2, [r4, r7]
- bl FUN_02006864
+ bl NARC_ReadFile
add r0, r5, #0
add r0, #0xf0
ldr r0, [r0]
@@ -46784,7 +46784,7 @@ MOD05_021EE1E4: ; 0x021EE1E4
ldr r0, [r0]
lsl r1, r1, #0xa
add r2, sp, #0x20
- bl FUN_02006864
+ bl NARC_ReadFile
add r0, r5, #0
add r0, #0xf0
ldr r0, [r0]
@@ -46870,7 +46870,7 @@ MOD05_021EE2A4: ; 0x021EE2A4
ldr r0, [r0]
ldr r1, [sp, #0xc]
ldr r2, [r4, r5]
- bl FUN_02006864
+ bl NARC_ReadFile
add r0, r7, #0
add r0, #0xf0
ldr r0, [r0]
@@ -46984,7 +46984,7 @@ MOD05_021EE38C: ; 0x021EE38C
ldr r0, [r0]
lsl r1, r1, #0xa
add r2, sp, #0x1c
- bl FUN_02006864
+ bl NARC_ReadFile
add r0, r5, #0
add r0, #0xf0
ldr r0, [r0]
@@ -49155,7 +49155,7 @@ _021EF3AE:
str r1, [r0]
mov r0, #0x43
mov r1, #4
- bl FUN_02006670
+ bl NARC_ctor
add r1, r4, #0
add r1, #0xf8
str r0, [r1]
@@ -49366,7 +49366,7 @@ MOD05_021EF5A8: ; 0x021EF5A8
add r4, r0, #0
add r0, #0xf8
ldr r0, [r0]
- bl FUN_020066F4
+ bl NARC_dtor
ldr r0, [r4]
bl MOD05_021F3C30
add r0, r4, #0
@@ -49890,7 +49890,7 @@ _021EF948:
ldr r2, [r4, #0x24]
add r1, r5, #0
add r2, r3, r2
- bl FUN_02006864
+ bl NARC_ReadFile
ldr r0, [r4, #0x24]
add r0, r0, r5
str r0, [r4, #0x24]
@@ -49914,7 +49914,7 @@ _021EF978:
ldr r3, [r3]
add r1, r5, #0
add r2, r3, r2
- bl FUN_02006864
+ bl NARC_ReadFile
cmp r6, #0
beq _021EF990
mov r0, #2
@@ -50018,7 +50018,7 @@ MOD05_021EFA40: ; 0x021EFA40
add r4, r3, #0
add r5, r2, #0
ldr r2, [r4]
- bl FUN_02006864
+ bl NARC_ReadFile
ldr r0, [sp, #0x10]
cmp r0, #0
beq _021EFA6A
@@ -54450,7 +54450,7 @@ MOD05_021F1D68: ; 0x021F1D68
add r4, r0, #0
mov r0, #0x51
mov r1, #4
- bl FUN_02006670
+ bl NARC_ctor
add r1, r0, #0
add r0, r4, #0
bl FUN_020583F0
@@ -54461,7 +54461,7 @@ MOD05_021F1D68: ; 0x021F1D68
MOD05_021F1D80: ; 0x021F1D80
push {r3, lr}
bl FUN_020583F4
- bl FUN_020066F4
+ bl NARC_dtor
pop {r3, pc}
thumb_func_start MOD05_021F1D8C
@@ -54557,7 +54557,7 @@ MOD05_021F1E2C: ; 0x021F1E2C
bl FUN_020583F4
add r1, r4, #0
add r6, r0, #0
- bl FUN_020067D0
+ bl NARC_GetMemberSize
add r1, r0, #0
cmp r5, #1
bne _021F1E4C
@@ -54572,7 +54572,7 @@ _021F1E52:
add r0, r6, #0
add r1, r4, #0
add r2, r5, #0
- bl FUN_02006774
+ bl NARC_ReadWholeMember
add r0, r5, #0
pop {r4, r5, r6, pc}
.balign 4, 0
@@ -59038,68 +59038,68 @@ MOD05_021F3FE0: ; 0x021F3FE0
add r0, r5, #0
mov r1, #8
add r2, sp, #0
- bl FUN_02006864
+ bl NARC_ReadFile
add r0, r5, #0
mov r1, #2
add r2, sp, #0
- bl FUN_02006864
+ bl NARC_ReadFile
add r0, r5, #0
mov r1, #2
add r2, r4, #0
- bl FUN_02006864
+ bl NARC_ReadFile
add r0, r5, #0
mov r1, #2
add r2, sp, #0
- bl FUN_02006864
+ bl NARC_ReadFile
add r0, r5, #0
mov r1, #2
add r2, r4, #4
- bl FUN_02006864
+ bl NARC_ReadFile
add r0, r5, #0
mov r1, #2
add r2, sp, #0
- bl FUN_02006864
+ bl NARC_ReadFile
add r2, r4, #0
add r0, r5, #0
mov r1, #2
add r2, #8
- bl FUN_02006864
+ bl NARC_ReadFile
add r0, r5, #0
mov r1, #2
add r2, sp, #0
- bl FUN_02006864
+ bl NARC_ReadFile
add r0, r5, #0
mov r1, #2
add r2, sp, #0
- bl FUN_02006864
+ bl NARC_ReadFile
add r2, r4, #0
add r0, r5, #0
mov r1, #2
add r2, #0xc
- bl FUN_02006864
+ bl NARC_ReadFile
add r0, r5, #0
mov r1, #2
add r2, sp, #0
- bl FUN_02006864
+ bl NARC_ReadFile
add r2, r4, #0
add r0, r5, #0
mov r1, #2
add r2, #0x18
- bl FUN_02006864
+ bl NARC_ReadFile
add r0, r5, #0
mov r1, #2
add r2, sp, #0
- bl FUN_02006864
+ bl NARC_ReadFile
add r2, r4, #0
add r0, r5, #0
mov r1, #4
add r2, #0x14
- bl FUN_02006864
+ bl NARC_ReadFile
add r4, #0x10
add r0, r5, #0
mov r1, #4
add r2, r4, #0
- bl FUN_02006864
+ bl NARC_ReadFile
add sp, #8
pop {r3, r4, r5, pc}
@@ -59235,13 +59235,13 @@ _021F4180:
thumb_func_start MOD05_021F4184
MOD05_021F4184: ; 0x021F4184
- ldr r3, _021F4190 ; =FUN_02006864
+ ldr r3, _021F4190 ; =NARC_ReadFile
add r2, r1, #0
mov r1, #0x1c
ldr r2, [r2]
bx r3
nop
-_021F4190: .word FUN_02006864
+_021F4190: .word NARC_ReadFile
thumb_func_start MOD05_021F4194
MOD05_021F4194: ; 0x021F4194
@@ -59250,10 +59250,10 @@ MOD05_021F4194: ; 0x021F4194
mov r1, #0xc
mul r1, r2
ldr r2, [r3, #0x10]
- ldr r3, _021F41A4 ; =FUN_02006864
+ ldr r3, _021F41A4 ; =NARC_ReadFile
bx r3
nop
-_021F41A4: .word FUN_02006864
+_021F41A4: .word NARC_ReadFile
thumb_func_start MOD05_021F41A8
MOD05_021F41A8: ; 0x021F41A8
@@ -59262,10 +59262,10 @@ MOD05_021F41A8: ; 0x021F41A8
mov r1, #0xc
mul r1, r2
ldr r2, [r3, #0x14]
- ldr r3, _021F41B8 ; =FUN_02006864
+ ldr r3, _021F41B8 ; =NARC_ReadFile
bx r3
nop
-_021F41B8: .word FUN_02006864
+_021F41B8: .word NARC_ReadFile
thumb_func_start MOD05_021F41BC
MOD05_021F41BC: ; 0x021F41BC
@@ -59274,41 +59274,41 @@ MOD05_021F41BC: ; 0x021F41BC
mov r1, #0xc
mul r1, r2
ldr r2, [r3, #4]
- ldr r3, _021F41CC ; =FUN_02006864
+ ldr r3, _021F41CC ; =NARC_ReadFile
bx r3
nop
-_021F41CC: .word FUN_02006864
+_021F41CC: .word NARC_ReadFile
thumb_func_start MOD05_021F41D0
MOD05_021F41D0: ; 0x021F41D0
add r3, r1, #0
ldr r1, [r2, #0xc]
ldr r2, [r3, #8]
- ldr r3, _021F41DC ; =FUN_02006864
+ ldr r3, _021F41DC ; =NARC_ReadFile
lsl r1, r1, #2
bx r3
.balign 4, 0
-_021F41DC: .word FUN_02006864
+_021F41DC: .word NARC_ReadFile
thumb_func_start MOD05_021F41E0
MOD05_021F41E0: ; 0x021F41E0
add r3, r1, #0
ldr r1, [r2, #0x14]
ldr r2, [r3, #0xc]
- ldr r3, _021F41EC ; =FUN_02006864
+ ldr r3, _021F41EC ; =NARC_ReadFile
bx r3
nop
-_021F41EC: .word FUN_02006864
+_021F41EC: .word NARC_ReadFile
thumb_func_start MOD05_021F41F0
MOD05_021F41F0: ; 0x021F41F0
add r3, r1, #0
ldr r1, [r2, #0x10]
ldr r2, [r3, #0x18]
- ldr r3, _021F41FC ; =FUN_02006864
+ ldr r3, _021F41FC ; =NARC_ReadFile
bx r3
nop
-_021F41FC: .word FUN_02006864
+_021F41FC: .word NARC_ReadFile
thumb_func_start MOD05_021F4200
MOD05_021F4200: ; 0x021F4200
@@ -60381,13 +60381,13 @@ MOD05_021F49AC: ; 0x021F49AC
sub r0, #8
ldr r2, [r7]
add r0, r5, r0
- bl LoadFromNARC
+ bl ReadWholeNarcMemberByIdPair
mov r1, #0x8b
lsl r1, r1, #4
ldrh r1, [r5, r1]
mov r0, #0x2b
mov r2, #4
- bl LoadFromNarc_2
+ bl AllocAndReadWholeNarcMemberByIdPair
ldr r1, _021F4BA0 ; =0x000008BC
str r0, [r5, r1]
ldr r0, [r5, r1]
@@ -60405,14 +60405,14 @@ _021F49E4:
ldrh r1, [r5, r1]
mov r0, #0x2c
mov r2, #4
- bl LoadFromNarc_2
+ bl AllocAndReadWholeNarcMemberByIdPair
ldr r1, _021F4BAC ; =0x0000089C
mov r2, #4
str r0, [r5, r1]
add r1, #0x14
ldrh r1, [r5, r1]
mov r0, #0x47
- bl LoadFromNarc_2
+ bl AllocAndReadWholeNarcMemberByIdPair
mov r1, #0x8a
lsl r1, r1, #4
str r0, [r5, r1]
@@ -60477,7 +60477,7 @@ _021F4A78:
str r1, [r5, r0]
mov r0, #0x28
mov r1, #4
- bl FUN_02006670
+ bl NARC_ctor
str r0, [sp, #0xc]
ldr r0, [r7, #4]
bl MOD05_021DA220
@@ -60505,7 +60505,7 @@ _021F4ABE:
ldr r0, [sp, #0xc]
add r1, r6, #0
mov r2, #4
- bl FUN_02006704
+ bl NARC_AllocAndReadWholeMember
str r0, [r4, #4]
ldr r0, [sp, #4]
cmp r6, r0
@@ -60547,7 +60547,7 @@ _021F4B10:
ldr r0, [sp, #0xc]
mov r1, #0
mov r2, #4
- bl FUN_02006704
+ bl NARC_AllocAndReadWholeMember
str r0, [r5, #4]
bl FUN_020BC0FC
add r4, r0, #0
@@ -60565,7 +60565,7 @@ _021F4B36:
bl ErrorHandling
_021F4B46:
ldr r0, [sp, #0xc]
- bl FUN_020066F4
+ bl NARC_dtor
ldr r2, _021F4BB8 ; =0x04000060
ldr r0, _021F4BBC ; =0xFFFFCFFF
ldrh r1, [r2]
@@ -61471,7 +61471,7 @@ _021F51E6:
ldr r1, _021F5218 ; =0x021FC644
ldr r1, [r1, r2]
mov r2, #4
- bl FUN_02006528
+ bl AllocAtEndAndReadWholeNarcMemberByIdPair
ldrb r1, [r4, #4]
lsl r1, r1, #2
ldr r4, [r0, r1]
@@ -62652,7 +62652,7 @@ MOD05_021F5AB8: ; 0x021F5AB8
add r7, r3, #0
add r0, r5, #0
add r1, r4, #0
- bl FUN_020067D0
+ bl NARC_GetMemberSize
add r1, r0, #0
add r0, r6, #0
add r2, r7, #0
@@ -62661,7 +62661,7 @@ MOD05_021F5AB8: ; 0x021F5AB8
add r0, r5, #0
add r1, r4, #0
add r2, r6, #0
- bl FUN_02006774
+ bl NARC_ReadWholeMember
add r0, r6, #0
pop {r3, r4, r5, r6, r7, pc}
@@ -62674,7 +62674,7 @@ MOD05_021F5AE4: ; 0x021F5AE4
add r6, r1, #0
add r0, r4, #0
add r1, r7, #0
- bl FUN_020067D0
+ bl NARC_GetMemberSize
add r2, r0, #0
ldr r3, [sp, #0x18]
add r0, r5, #0
@@ -62684,7 +62684,7 @@ MOD05_021F5AE4: ; 0x021F5AE4
add r0, r4, #0
add r1, r7, #0
add r2, r5, #0
- bl FUN_02006774
+ bl NARC_ReadWholeMember
add r0, r5, #0
pop {r3, r4, r5, r6, r7, pc}
.balign 4, 0
diff --git a/arm9/modules/06/asm/module_06.s b/arm9/modules/06/asm/module_06.s
index c208ee4a..58862ec1 100644
--- a/arm9/modules/06/asm/module_06.s
+++ b/arm9/modules/06/asm/module_06.s
@@ -4723,7 +4723,7 @@ MOD06_0223B9A8: ; 0x0223B9A8
mov r0, #0x6a
mov r1, #8
mov r2, #4
- bl FUN_02006528
+ bl AllocAtEndAndReadWholeNarcMemberByIdPair
add r1, sp, #0
ldrh r2, [r1, #2]
ldr r1, _0223BA00 ; =0x0000FFFF
@@ -23104,20 +23104,20 @@ MOD06_02244CE8: ; 0x02244CE8
add r3, r0, #0
add r2, r1, #0
add r1, r3, #0
- ldr r3, _02244CF4 ; =LoadFromNarc_2
+ ldr r3, _02244CF4 ; =AllocAndReadWholeNarcMemberByIdPair
mov r0, #0x86
bx r3
.align 2, 0
-_02244CF4: .word LoadFromNarc_2
+_02244CF4: .word AllocAndReadWholeNarcMemberByIdPair
thumb_func_start MOD06_02244CF8
MOD06_02244CF8: ; 0x02244CF8
- ldr r3, _02244D00 ; =LoadFromNARC
+ ldr r3, _02244D00 ; =ReadWholeNarcMemberByIdPair
add r2, r1, #0
mov r1, #0x87
bx r3
.align 2, 0
-_02244D00: .word LoadFromNARC
+_02244D00: .word ReadWholeNarcMemberByIdPair
thumb_func_start MOD06_02244D04
MOD06_02244D04: ; 0x02244D04
@@ -23285,7 +23285,7 @@ _02244E10:
str r0, [r7, #0x38]
mov r0, #0x61
mov r1, #4
- bl FUN_02006670
+ bl NARC_ctor
ldr r4, _02244EF4 ; =0x022512E0
str r0, [sp, #0x10]
mov r6, #0
@@ -23361,7 +23361,7 @@ _02244E48:
ldr r3, [r7, #0x24]
bl MOD06_02244F84
ldr r0, [sp, #0x10]
- bl FUN_020066F4
+ bl NARC_dtor
add r0, r7, #0
bl MOD06_02244FFC
add sp, #0x14
@@ -23640,7 +23640,7 @@ MOD06_02245114: ; 0x02245114
str r0, [r5, #0x2c]
mov r0, #0x6a
mov r2, #4
- bl FUN_02006528
+ bl AllocAtEndAndReadWholeNarcMemberByIdPair
add r7, r0, #0
mov r4, #0
_02245132:
@@ -24327,7 +24327,7 @@ _02245670:
_02245672:
mov r0, #0x6a
mov r2, #4
- bl FUN_02006528
+ bl AllocAtEndAndReadWholeNarcMemberByIdPair
lsl r1, r7, #2
add r1, r7, r1
add r3, r5, #0
@@ -26394,12 +26394,12 @@ MOD06_02246600: ; 0x02246600
thumb_func_start MOD06_02246604
MOD06_02246604: ; 0x02246604
- ldr r3, _0224660C ; =FUN_02006670
+ ldr r3, _0224660C ; =NARC_ctor
mov r0, #0x61
mov r1, #4
bx r3
.align 2, 0
-_0224660C: .word FUN_02006670
+_0224660C: .word NARC_ctor
thumb_func_start MOD06_02246610
MOD06_02246610: ; 0x02246610
@@ -27697,7 +27697,7 @@ MOD06_02246F0C: ; 0x02246F0C
add r1, r4, #0
bl MOD06_02247018
add r0, r4, #0
- bl FUN_020066F4
+ bl NARC_dtor
mov r0, #4
mov r1, #0x20
bl FUN_020643C0
@@ -27751,12 +27751,12 @@ _02247008: .word 0x04000008
thumb_func_start MOD06_0224700C
MOD06_0224700C: ; 0x0224700C
- ldr r3, _02247014 ; =FUN_02006670
+ ldr r3, _02247014 ; =NARC_ctor
mov r0, #0x61
mov r1, #4
bx r3
.align 2, 0
-_02247014: .word FUN_02006670
+_02247014: .word NARC_ctor
thumb_func_start MOD06_02247018
MOD06_02247018: ; 0x02247018
@@ -28412,7 +28412,7 @@ _02247530:
bl ErrorHandling
_02247538:
add r0, r6, #0
- bl FUN_020066F4
+ bl NARC_dtor
add sp, #0xc
pop {r3, r4, r5, r6, pc}
.align 2, 0
@@ -28422,7 +28422,7 @@ MOD06_02247544: ; 0x02247544
push {r3, r4, r5, lr}
add r5, r2, #0
mov r2, #4
- bl FUN_02006704
+ bl NARC_AllocAndReadWholeMember
add r1, r5, #0
add r4, r0, #0
bl FUN_020B0138
@@ -28445,7 +28445,7 @@ MOD06_0224756C: ; 0x0224756C
add r1, r2, #0
add r4, r3, #0
mov r2, #4
- bl FUN_02006704
+ bl NARC_AllocAndReadWholeMember
add r1, r4, #0
add r6, r0, #0
bl FUN_020B0088
@@ -28483,7 +28483,7 @@ MOD06_022475A4: ; 0x022475A4
add r0, r6, #0
add r1, r7, #0
mov r2, #4
- bl FUN_02006704
+ bl NARC_AllocAndReadWholeMember
add r1, r4, #0
add r6, r0, #0
bl FUN_020B0180
@@ -30532,7 +30532,7 @@ _02248522:
bl MOD06_02245D10
_02248582:
add r0, r4, #0
- bl FUN_020066F4
+ bl NARC_dtor
ldr r0, [r5]
add r0, r0, #1
str r0, [r5]
@@ -31522,7 +31522,7 @@ MOD06_02248D00: ; 0x02248D00
mov r1, #0x7e
mov r2, #0
mul r3, r4
- bl FUN_02006548
+ bl ReadFromNarcMemberByIdPair
add r0, sp, #4
ldrb r4, [r0, r5]
cmp r4, #0
@@ -31548,7 +31548,7 @@ MOD06_02248D60: ; 0x02248D60
mov r1, #0x7e
add r3, r4, r3
str r2, [sp]
- bl FUN_02006548
+ bl ReadFromNarcMemberByIdPair
add r0, sp, #4
ldrb r0, [r0]
cmp r0, #5
@@ -31574,7 +31574,7 @@ MOD06_02248D8C: ; 0x02248D8C
mov r1, #0x7e
mov r2, #1
add r3, r3, #1
- bl FUN_02006548
+ bl ReadFromNarcMemberByIdPair
add sp, #4
pop {r3, r4, pc}
@@ -39622,7 +39622,7 @@ MOD06_0224CBB0: ; 0x0224CBB0
mov r0, #0x6a
mov r1, #8
mov r2, #4
- bl FUN_02006528
+ bl AllocAtEndAndReadWholeNarcMemberByIdPair
add r4, r0, #0
add r1, sp, #4
ldr r0, [sp]
@@ -39692,7 +39692,7 @@ _0224CC40:
mov r0, #0x6a
mov r1, #8
mov r2, #4
- bl FUN_02006528
+ bl AllocAtEndAndReadWholeNarcMemberByIdPair
add r1, sp, #0
ldrh r1, [r1, #2]
lsl r1, r1, #2
@@ -39753,7 +39753,7 @@ _0224CC80:
mov r0, #0x6a
mov r1, #1
mov r2, #4
- bl FUN_02006528
+ bl AllocAtEndAndReadWholeNarcMemberByIdPair
str r0, [sp, #0xc]
mov r4, #0
ldr r0, [r0]
@@ -39877,7 +39877,7 @@ MOD06_0224CDA0: ; 0x0224CDA0
mov r0, #0x6a
mov r1, #0
mov r2, #4
- bl FUN_02006528
+ bl AllocAtEndAndReadWholeNarcMemberByIdPair
ldr r1, [r0]
str r1, [r4]
bl FUN_02016A18
diff --git a/arm9/modules/07/asm/module_07.s b/arm9/modules/07/asm/module_07.s
index 9ec5f07f..b2f1aff0 100644
--- a/arm9/modules/07/asm/module_07.s
+++ b/arm9/modules/07/asm/module_07.s
@@ -3316,7 +3316,7 @@ MOD07_02213924: ; 0x02213924
mov r0, #0x14
ldr r2, [r2, #0x24]
mov r1, #0x10
- bl LoadFromNarc_2
+ bl AllocAndReadWholeNarcMemberByIdPair
add r1, sp, #0x10
add r4, r0, #0
bl FUN_020B0138
diff --git a/arm9/modules/08/asm/module_08.s b/arm9/modules/08/asm/module_08.s
index 9bc92d95..51a20b39 100644
--- a/arm9/modules/08/asm/module_08.s
+++ b/arm9/modules/08/asm/module_08.s
@@ -600,7 +600,7 @@ _022122A6:
str r0, [r4, #4]
ldr r1, [sp]
ldr r2, [r4]
- bl LoadFromNarc_2
+ bl AllocAndReadWholeNarcMemberByIdPair
str r0, [r4, #0x14]
cmp r0, #0
bne _022122C6
@@ -8148,10 +8148,10 @@ MOD08_02215ACC: ; 0x02215ACC
thumb_func_start MOD08_02215AF8
MOD08_02215AF8: ; 0x02215AF8
- ldr r3, _02215AFC ; =FUN_02006704
+ ldr r3, _02215AFC ; =NARC_AllocAndReadWholeMember
bx r3
.align 2, 0
-_02215AFC: .word FUN_02006704
+_02215AFC: .word NARC_AllocAndReadWholeMember
thumb_func_start MOD08_02215B00
MOD08_02215B00: ; 0x02215B00
@@ -45110,7 +45110,7 @@ _022282D4: ; jump table
_022282DC:
ldr r1, [r4]
mov r0, #0x63
- bl FUN_02006670
+ bl NARC_ctor
add r1, r4, #0
add r1, #0x8c
str r0, [r1]
@@ -45387,7 +45387,7 @@ _02228504:
add r4, #0x8c
str r1, [r0]
ldr r0, [r4]
- bl FUN_020066F4
+ bl NARC_dtor
ldr r0, [sp]
bl FUN_0200CAB4
_02228520:
@@ -49547,7 +49547,7 @@ _0222A31C:
mov r1, #0x8a
mov r2, #0
add r3, r6, #0
- bl FUN_02006548
+ bl ReadFromNarcMemberByIdPair
mov r0, #1
str r0, [sp]
add r0, sp, #0x24
@@ -49555,14 +49555,14 @@ _0222A31C:
mov r1, #0x90
mov r2, #0
add r3, r6, #0
- bl FUN_02006548
+ bl ReadFromNarcMemberByIdPair
mov r0, #1
str r0, [sp]
add r0, sp, #0x24
mov r1, #0x8e
mov r2, #0
add r3, r6, #0
- bl FUN_02006548
+ bl ReadFromNarcMemberByIdPair
ldr r0, [r5]
add r2, sp, #0x24
lsl r0, r0, #2
@@ -49793,7 +49793,7 @@ _0222A5AA:
str r1, [r0, #8]
add r0, sp, #0
mov r1, #0x79
- bl LoadFromNARC
+ bl ReadWholeNarcMemberByIdPair
add r0, sp, #0
ldrb r1, [r0]
ldr r0, [r5]
diff --git a/arm9/modules/09/asm/module_09.s b/arm9/modules/09/asm/module_09.s
index f2efcdad..edb7a39e 100644
--- a/arm9/modules/09/asm/module_09.s
+++ b/arm9/modules/09/asm/module_09.s
@@ -2182,7 +2182,7 @@ MOD09_02212F8C: ; 0x02212F8C
mov r0, #0x48
ldr r2, [r2, #0xc]
mov r1, #0x14
- bl LoadFromNarc_2
+ bl AllocAndReadWholeNarcMemberByIdPair
add r1, sp, #0x10
add r4, r0, #0
bl FUN_020B0180
@@ -2196,7 +2196,7 @@ MOD09_02212F8C: ; 0x02212F8C
mov r0, #0x48
ldr r2, [r2, #0xc]
mov r1, #0x15
- bl LoadFromNarc_2
+ bl AllocAndReadWholeNarcMemberByIdPair
add r1, sp, #0x10
add r4, r0, #0
bl FUN_020B0180
@@ -3406,7 +3406,7 @@ _02213976:
ldr r1, [r6]
ldr r2, [r2, #0xc]
mov r0, #0x48
- bl LoadFromNarc_2
+ bl AllocAndReadWholeNarcMemberByIdPair
add r1, sp, #0xc
add r7, r0, #0
bl FUN_020B0180
@@ -14007,7 +14007,7 @@ MOD09_022191C0: ; 0x022191C0
mov r0, #0x4d
ldr r2, [r2, #0xc]
mov r1, #1
- bl LoadFromNarc_2
+ bl AllocAndReadWholeNarcMemberByIdPair
add r1, sp, #0x10
add r4, r0, #0
bl FUN_020B0180
diff --git a/arm9/modules/11/asm/module_11.s b/arm9/modules/11/asm/module_11.s
index 820d6e96..0b1c042f 100644
--- a/arm9/modules/11/asm/module_11.s
+++ b/arm9/modules/11/asm/module_11.s
@@ -44074,7 +44074,7 @@ MOD11_022431DC: ; 0x022431DC
add r5, r0, #0
add r0, r4, #0
add r1, r6, #0
- bl LoadFromNARC_7
+ bl GetNarcMemberSizeByIdPair
mov r1, #0x19
lsl r1, r1, #6
cmp r0, r1
@@ -44096,7 +44096,7 @@ _022431F8:
add r0, r5, r0
add r1, r4, #0
add r2, r6, #0
- bl LoadFromNARC
+ bl ReadWholeNarcMemberByIdPair
pop {r4, r5, r6, pc}
thumb_func_start MOD11_0224321C
@@ -44107,7 +44107,7 @@ MOD11_0224321C: ; 0x0224321C
add r5, r0, #0
add r0, r4, #0
add r1, r6, #0
- bl LoadFromNARC_7
+ bl GetNarcMemberSizeByIdPair
mov r1, #0x19
lsl r1, r1, #6
cmp r0, r1
@@ -44173,7 +44173,7 @@ _02243246:
lsl r0, r0, #8
add r0, r5, r0
add r1, r4, #0
- bl LoadFromNARC
+ bl ReadWholeNarcMemberByIdPair
pop {r4, r5, r6, pc}
thumb_func_start MOD11_022432B4
@@ -65823,7 +65823,7 @@ _0224D5FE:
add r0, #2
mov r1, #0x8a
mov r2, #0
- bl FUN_02006548
+ bl ReadFromNarcMemberByIdPair
mov r0, #1
str r0, [sp]
add r0, sp, #0x30
@@ -65831,14 +65831,14 @@ _0224D5FE:
add r0, #1
mov r1, #0x90
mov r2, #0
- bl FUN_02006548
+ bl ReadFromNarcMemberByIdPair
mov r0, #1
str r0, [sp]
ldrh r3, [r5, #2]
add r0, sp, #0x30
mov r1, #0x8e
mov r2, #0
- bl FUN_02006548
+ bl ReadFromNarcMemberByIdPair
add r0, sp, #0x30
ldrh r1, [r5, #2]
add r0, #3
@@ -66007,7 +66007,7 @@ _0224D774:
add r0, #0x90
mov r1, #0x8a
mov r2, #0
- bl FUN_02006548
+ bl ReadFromNarcMemberByIdPair
mov r0, #1
str r0, [sp]
add r0, r4, #0
@@ -66015,7 +66015,7 @@ _0224D774:
add r0, #0x91
mov r1, #0x90
mov r2, #0
- bl FUN_02006548
+ bl ReadFromNarcMemberByIdPair
mov r0, #1
str r0, [sp]
add r0, r4, #0
@@ -66023,7 +66023,7 @@ _0224D774:
add r0, #0x93
mov r1, #0x8e
mov r2, #0
- bl FUN_02006548
+ bl ReadFromNarcMemberByIdPair
add r0, r6, #0
bl MOD11_02253A78
str r7, [r4]
@@ -66171,7 +66171,7 @@ _0224D8C4:
add r0, #0x90
mov r1, #0x8a
mov r2, #0
- bl FUN_02006548
+ bl ReadFromNarcMemberByIdPair
mov r0, #1
str r0, [sp]
add r0, r5, #0
@@ -66179,7 +66179,7 @@ _0224D8C4:
add r0, #0x91
mov r1, #0x90
mov r2, #0
- bl FUN_02006548
+ bl ReadFromNarcMemberByIdPair
mov r0, #1
str r0, [sp]
add r0, r5, #0
@@ -66187,7 +66187,7 @@ _0224D8C4:
add r0, #0x93
mov r1, #0x8e
mov r2, #0
- bl FUN_02006548
+ bl ReadFromNarcMemberByIdPair
add r0, r6, #0
bl MOD11_02253A78
str r7, [r5]
diff --git a/arm9/modules/14/asm/module_14.s b/arm9/modules/14/asm/module_14.s
index 2a461b45..3c5d5ffa 100644
--- a/arm9/modules/14/asm/module_14.s
+++ b/arm9/modules/14/asm/module_14.s
@@ -18727,7 +18727,7 @@ _021E0818:
str r0, [r5, #0x18]
mov r0, #0x13
mov r1, #0xa
- bl FUN_02006670
+ bl NARC_ctor
str r0, [r5, #0x48]
ldr r0, [r5, #8]
cmp r0, #0
@@ -18788,7 +18788,7 @@ _021E08D8:
ldr r0, [r4, #0x48]
cmp r0, #0
beq _021E08E2
- bl FUN_020066F4
+ bl NARC_dtor
_021E08E2:
pop {r4, pc}
@@ -18922,7 +18922,7 @@ MOD14_021E0940: ; 0x021E0940
ldr r1, [r4, #0x28]
mov r2, #0
lsl r3, r3, #6
- bl FUN_02006814
+ bl NARC_ReadFromMember
add r0, r5, #0
add r0, #0x4c
add r1, sp, #0x1c
@@ -19146,7 +19146,7 @@ MOD14_021E0BAC: ; 0x021E0BAC
ldr r0, [r0, #0x48]
add r1, r2, #0
mov r2, #0
- bl FUN_02006814
+ bl NARC_ReadFromMember
pop {r3, pc}
thumb_func_start MOD14_021E0BBC
@@ -19169,7 +19169,7 @@ MOD14_021E0BBC: ; 0x021E0BBC
ldr r1, [r4, #0x28]
mov r2, #0
lsl r3, r3, #6
- bl FUN_02006814
+ bl NARC_ReadFromMember
add r5, #0x4c
add r0, r5, #0
add r1, sp, #4
diff --git a/arm9/modules/16/asm/module_16.s b/arm9/modules/16/asm/module_16.s
index 839501c6..4f66f1cd 100644
--- a/arm9/modules/16/asm/module_16.s
+++ b/arm9/modules/16/asm/module_16.s
@@ -2148,7 +2148,7 @@ MOD16_021D8534: ; 0x021D8534
add r5, r0, #0
mov r0, #0x45
add r4, r1, #0
- bl FUN_02006670
+ bl NARC_ctor
mov r1, #0x9f
lsl r1, r1, #2
str r0, [r5, r1]
@@ -2296,7 +2296,7 @@ MOD16_021D8628: ; 0x021D8628
mov r0, #0x9f
lsl r0, r0, #2
ldr r0, [r4, r0]
- bl FUN_020066F4
+ bl NARC_dtor
mov r2, #0xa
add r0, r4, #0
mov r1, #0
@@ -3146,7 +3146,7 @@ MOD16_021D8C78: ; 0x021D8C78
add r6, r3, #0
ldr r0, [r0, r2]
add r2, r6, #0
- bl FUN_02006704
+ bl NARC_AllocAndReadWholeMember
add r4, r0, #0
beq _021D8CB0
cmp r5, #0
diff --git a/arm9/modules/20/asm/module_20.s b/arm9/modules/20/asm/module_20.s
index 292f499f..d8c1e99e 100644
--- a/arm9/modules/20/asm/module_20.s
+++ b/arm9/modules/20/asm/module_20.s
@@ -3034,7 +3034,7 @@ MOD20_02253A04: ; 0x02253A04
beq _02253A98
mov r0, #0x13
mov r1, #8
- bl FUN_02006670
+ bl NARC_ctor
str r0, [sp, #0x1c]
cmp r0, #0
beq _02253A92
@@ -3059,7 +3059,7 @@ _02253A4E:
ldr r1, [r6]
ldr r3, [sp, #0x14]
mov r2, #0
- bl FUN_02006814
+ bl NARC_ReadFromMember
add r0, r7, #0
add r1, sp, #0x20
bl FUN_020B0088
@@ -3083,7 +3083,7 @@ _02253A4E:
blo _02253A4E
_02253A8C:
ldr r0, [sp, #0x1c]
- bl FUN_020066F4
+ bl NARC_dtor
_02253A92:
add r0, r7, #0
bl FUN_02016A18
diff --git a/arm9/modules/27/asm/module_27.s b/arm9/modules/27/asm/module_27.s
index 7ee2d7fc..0d5124db 100644
--- a/arm9/modules/27/asm/module_27.s
+++ b/arm9/modules/27/asm/module_27.s
@@ -983,7 +983,7 @@ MOD27_02254FAC: ; 0x02254FAC
str r1, [sp, #8]
mov r0, #0x13
mov r1, #8
- bl FUN_02006670
+ bl NARC_ctor
str r0, [sp, #0x14]
cmp r0, #0
beq _022550C0
@@ -1024,7 +1024,7 @@ _02254FFC:
ldr r1, [r4, #4]
mov r2, #0
lsl r3, r3, #6
- bl FUN_02006814
+ bl NARC_ReadFromMember
ldr r0, [sp, #0x18]
add r1, sp, #0x20
bl FUN_020B0088
@@ -1107,7 +1107,7 @@ _02255098:
blt _02254FFC
_022550BA:
ldr r0, [sp, #0x14]
- bl FUN_020066F4
+ bl NARC_dtor
_022550C0:
add sp, #0x34
pop {r4, r5, r6, r7, pc}
diff --git a/arm9/modules/28/asm/module_28.s b/arm9/modules/28/asm/module_28.s
index 3f9efbbe..40971e04 100644
--- a/arm9/modules/28/asm/module_28.s
+++ b/arm9/modules/28/asm/module_28.s
@@ -638,7 +638,7 @@ MOD28_02254CB4: ; 0x02254CB4
bl FUN_02006A34
mov r0, #0x13
mov r1, #8
- bl FUN_02006670
+ bl NARC_ctor
str r0, [sp, #0x1c]
cmp r0, #0
bne _02254CE8
@@ -679,7 +679,7 @@ _02254D24:
ldr r0, [sp, #0x1c]
ldr r1, [r4, #4]
mov r2, #8
- bl FUN_02006704
+ bl NARC_AllocAndReadWholeMember
add r1, sp, #0x2c
str r0, [sp, #0x20]
bl FUN_020B0088
@@ -807,7 +807,7 @@ _02254DE0:
b _02254D24
_02254E40:
ldr r0, [sp, #0x1c]
- bl FUN_020066F4
+ bl NARC_dtor
_02254E46:
add sp, #0x40
pop {r3, r4, r5, r6, r7, pc}
diff --git a/arm9/modules/57/asm/module_57.s b/arm9/modules/57/asm/module_57.s
index a25b99a6..a7e7e2ee 100644
--- a/arm9/modules/57/asm/module_57.s
+++ b/arm9/modules/57/asm/module_57.s
@@ -3685,7 +3685,7 @@ _021D91BC:
stmia r2!, {r0, r1}
mov r0, #0x33
mov r1, #0x19
- bl FUN_02006670
+ bl NARC_ctor
str r0, [sp, #0x14]
mov r0, #0x1e
lsl r0, r0, #4
@@ -3699,7 +3699,7 @@ _021D9290:
ldr r1, [r1, r6]
mov r2, #0x19
add r5, r7, r6
- bl FUN_02006704
+ bl NARC_AllocAndReadWholeMember
mov r1, #7
lsl r1, r1, #6
str r0, [r5, r1]
@@ -3727,7 +3727,7 @@ _021D92CE:
cmp r4, #8
blo _021D9290
ldr r0, [sp, #0x14]
- bl FUN_020066F4
+ bl NARC_dtor
mov r0, #0x10
mov r1, #1
bl FUN_0201E6E4
diff --git a/arm9/modules/60/asm/module_60.s b/arm9/modules/60/asm/module_60.s
index ffbc157e..570890e1 100644
--- a/arm9/modules/60/asm/module_60.s
+++ b/arm9/modules/60/asm/module_60.s
@@ -673,11 +673,11 @@ MOD60_021D7A40: ; 0x021D7A40
add r5, r0, #0
ldr r1, [r5]
mov r0, #0x49
- bl FUN_02006670
+ bl NARC_ctor
add r4, r0, #0
mov r0, #0x49
mov r1, #1
- bl LoadFromNARC_7
+ bl GetNarcMemberSizeByIdPair
add r1, r0, #0
ldr r0, [r5]
bl FUN_020169D8
@@ -685,7 +685,7 @@ MOD60_021D7A40: ; 0x021D7A40
add r0, r4, #0
mov r1, #1
add r2, r6, #0
- bl FUN_02006774
+ bl NARC_ReadWholeMember
add r0, r6, #0
add r1, sp, #0x20
bl FUN_020B0088
@@ -708,7 +708,7 @@ MOD60_021D7A40: ; 0x021D7A40
bl FUN_02016A18
mov r0, #0x49
mov r1, #0
- bl LoadFromNARC_7
+ bl GetNarcMemberSizeByIdPair
add r1, r0, #0
ldr r0, [r5]
bl FUN_020169D8
@@ -716,7 +716,7 @@ MOD60_021D7A40: ; 0x021D7A40
add r0, r4, #0
mov r1, #0
add r2, r6, #0
- bl FUN_02006774
+ bl NARC_ReadWholeMember
add r0, r6, #0
add r1, sp, #0x1c
bl FUN_020B0138
@@ -736,7 +736,7 @@ MOD60_021D7A40: ; 0x021D7A40
bl FUN_02016A18
mov r0, #0x49
mov r1, #2
- bl LoadFromNARC_7
+ bl GetNarcMemberSizeByIdPair
add r1, r0, #0
ldr r0, [r5]
bl FUN_02016998
@@ -744,13 +744,13 @@ MOD60_021D7A40: ; 0x021D7A40
ldr r2, [r5, #0x24]
add r0, r4, #0
mov r1, #2
- bl FUN_02006774
+ bl NARC_ReadWholeMember
add r1, r5, #0
ldr r0, [r5, #0x24]
add r1, #0x28
bl FUN_020B0180
add r0, r4, #0
- bl FUN_020066F4
+ bl NARC_dtor
mov r3, #0
str r3, [sp]
mov r0, #0x20
diff --git a/arm9/modules/61/asm/module_61.s b/arm9/modules/61/asm/module_61.s
index beb43d8a..e75bcde2 100644
--- a/arm9/modules/61/asm/module_61.s
+++ b/arm9/modules/61/asm/module_61.s
@@ -1053,7 +1053,7 @@ MOD61_021D7CE8: ; 0x021D7CE8
add r0, #0x18
str r0, [sp, #0x20]
mov r0, #0x4f
- bl FUN_02006670
+ bl NARC_ctor
mov r1, #0
str r1, [sp]
add r6, r0, #0
@@ -1076,7 +1076,7 @@ MOD61_021D7CE8: ; 0x021D7CE8
bl FUN_0200CD68
mov r0, #0x4f
add r1, r4, #0
- bl LoadFromNARC_7
+ bl GetNarcMemberSizeByIdPair
add r1, r0, #0
ldr r0, [r5]
bl FUN_020169D8
@@ -1084,7 +1084,7 @@ MOD61_021D7CE8: ; 0x021D7CE8
add r0, r6, #0
add r1, r4, #0
add r2, r7, #0
- bl FUN_02006774
+ bl NARC_ReadWholeMember
add r0, r7, #0
add r1, sp, #0x28
bl FUN_020B0088
@@ -1108,7 +1108,7 @@ MOD61_021D7CE8: ; 0x021D7CE8
bl FUN_02016A18
ldr r1, [sp, #0x1c]
mov r0, #0x4f
- bl LoadFromNARC_7
+ bl GetNarcMemberSizeByIdPair
add r1, r0, #0
ldr r0, [r5]
bl FUN_020169D8
@@ -1116,7 +1116,7 @@ MOD61_021D7CE8: ; 0x021D7CE8
ldr r1, [sp, #0x1c]
add r0, r6, #0
add r2, r4, #0
- bl FUN_02006774
+ bl NARC_ReadWholeMember
add r0, r4, #0
add r1, sp, #0x24
bl FUN_020B0138
@@ -1241,7 +1241,7 @@ _021D7E00:
bl FUN_02016A18
ldr r1, [sp, #0x20]
mov r0, #0x4f
- bl LoadFromNARC_7
+ bl GetNarcMemberSizeByIdPair
add r1, r0, #0
ldr r0, [r5]
bl FUN_02016998
@@ -1249,14 +1249,14 @@ _021D7E00:
ldr r1, [sp, #0x20]
ldr r2, [r5, #0x34]
add r0, r6, #0
- bl FUN_02006774
+ bl NARC_ReadWholeMember
add r1, r5, #0
ldr r0, [r5, #0x34]
add r1, #0x3c
bl FUN_020B0180
mov r0, #0x4f
mov r1, #0x24
- bl LoadFromNARC_7
+ bl GetNarcMemberSizeByIdPair
add r1, r0, #0
ldr r0, [r5]
bl FUN_02016998
@@ -1264,13 +1264,13 @@ _021D7E00:
ldr r2, [r5, #0x38]
add r0, r6, #0
mov r1, #0x24
- bl FUN_02006774
+ bl NARC_ReadWholeMember
add r1, r5, #0
ldr r0, [r5, #0x38]
add r1, #0x40
bl FUN_020B0180
add r0, r6, #0
- bl FUN_020066F4
+ bl NARC_dtor
mov r3, #0
str r3, [sp]
mov r0, #0x20
diff --git a/arm9/modules/63/asm/module_63.s b/arm9/modules/63/asm/module_63.s
index 80721fb6..9606c9e5 100644
--- a/arm9/modules/63/asm/module_63.s
+++ b/arm9/modules/63/asm/module_63.s
@@ -504,12 +504,12 @@ MOD63_021D78BC: ; 0x021D78BC
mov r0, #0x30
add r1, r6, #0
add r2, r4, #0
- bl LoadFromNarc_2
+ bl AllocAndReadWholeNarcMemberByIdPair
str r0, [r5, #0x5c]
mov r0, #0x30
add r1, r7, #0
add r2, r4, #0
- bl LoadFromNarc_2
+ bl AllocAndReadWholeNarcMemberByIdPair
add r1, r5, #0
add r2, r5, #0
str r0, [r5, #0x60]
@@ -4217,7 +4217,7 @@ MOD63_021D96A0: ; 0x021D96A0
stmia r2!, {r0, r1}
mov r0, #0x80
mov r1, #0x4c
- bl FUN_02006670
+ bl NARC_ctor
str r0, [sp, #0x10]
add r0, r5, #0
str r0, [sp, #0x14]
@@ -4231,7 +4231,7 @@ _021D96C6:
ldr r1, [r1, r7]
mov r2, #0x4c
add r6, r5, r7
- bl FUN_02006704
+ bl NARC_AllocAndReadWholeMember
str r0, [r6, #0x1c]
cmp r0, #0
beq _021D96F4
@@ -4253,7 +4253,7 @@ _021D96F8:
cmp r4, #4
blo _021D96C6
ldr r0, [sp, #0x10]
- bl FUN_020066F4
+ bl NARC_dtor
mov r0, #0
str r0, [sp]
str r0, [sp, #4]
@@ -4380,7 +4380,7 @@ MOD63_021D9810: ; 0x021D9810
mov r0, #0x80
mov r1, #0x46
mov r2, #0x4c
- bl LoadFromNarc_2
+ bl AllocAndReadWholeNarcMemberByIdPair
str r0, [r5, #0x3c]
bl FUN_020BC0FC
str r0, [r5, #0x40]
@@ -4403,7 +4403,7 @@ _021D9840:
bl FUN_02016B44
mov r0, #0x80
mov r1, #0x4c
- bl FUN_02006670
+ bl NARC_ctor
str r0, [sp, #0xc]
add r0, r5, #0
str r0, [sp, #0x10]
@@ -4419,7 +4419,7 @@ _021D9862:
mul r6, r0
ldr r0, [sp, #0xc]
mov r2, #0x4c
- bl FUN_02006704
+ bl NARC_AllocAndReadWholeMember
add r1, r5, r6
add r1, #0x9c
str r0, [r1]
@@ -4484,7 +4484,7 @@ _021D98BC:
cmp r7, #6
blo _021D9862
ldr r0, [sp, #0xc]
- bl FUN_020066F4
+ bl NARC_dtor
mov r0, #0x4c
bl FUN_0201EB64
add r3, sp, #0x20
@@ -5498,11 +5498,11 @@ MOD63_021DA158: ; 0x021DA158
add r4, r0, #0
mov r0, #0x80
mov r1, #0x4c
- bl FUN_02006670
+ bl NARC_ctor
mov r1, #0x35
mov r2, #0x4c
add r5, r0, #0
- bl FUN_02006704
+ bl NARC_AllocAndReadWholeMember
str r0, [r4, #0x10]
cmp r0, #0
beq _021DA18E
@@ -5519,7 +5519,7 @@ _021DA18E:
bl ErrorHandling
_021DA192:
add r0, r5, #0
- bl FUN_020066F4
+ bl NARC_dtor
mov r1, #0
str r1, [sp]
ldr r0, [r4, #0x14]
diff --git a/arm9/modules/65/asm/module_65.s b/arm9/modules/65/asm/module_65.s
index f00d4102..34ca2a59 100644
--- a/arm9/modules/65/asm/module_65.s
+++ b/arm9/modules/65/asm/module_65.s
@@ -831,7 +831,7 @@ MOD65_021D7B24: ; 0x021D7B24
add r5, r0, #0
ldr r1, [r5]
mov r0, #0x53
- bl FUN_02006670
+ bl NARC_ctor
add r4, r0, #0
mov r0, #2
str r0, [sp]
@@ -916,7 +916,7 @@ MOD65_021D7B24: ; 0x021D7B24
mov r3, #0x53
bl FUN_02079B60
add r0, r4, #0
- bl FUN_020066F4
+ bl NARC_dtor
ldr r0, [r5, #0x24]
mov r1, #3
bl FUN_0201AC68
@@ -3161,7 +3161,7 @@ MOD65_021D8D90: ; 0x021D8D90
add r5, r0, #0
ldr r1, [r5]
mov r0, #0x57
- bl FUN_02006670
+ bl NARC_ctor
add r4, r0, #0
mov r0, #2
str r0, [sp]
@@ -3245,7 +3245,7 @@ MOD65_021D8D90: ; 0x021D8D90
mov r3, #0x57
bl FUN_02079B60
add r0, r4, #0
- bl FUN_020066F4
+ bl NARC_dtor
ldr r0, [r5, #0x68]
mov r1, #2
bl FUN_0201AC68
diff --git a/arm9/modules/66/asm/module_66.s b/arm9/modules/66/asm/module_66.s
index db284cc3..9199796b 100644
--- a/arm9/modules/66/asm/module_66.s
+++ b/arm9/modules/66/asm/module_66.s
@@ -483,7 +483,7 @@ MOD66_021D78B4: ; 0x021D78B4
add r5, r0, #0
ldr r1, [r5, #4]
mov r0, #0x11
- bl FUN_02006670
+ bl NARC_ctor
add r4, r0, #0
mov r0, #0x13
str r0, [sp]
@@ -639,7 +639,7 @@ MOD66_021D78B4: ; 0x021D78B4
add r1, #0xb4
str r0, [r1]
add r0, r4, #0
- bl FUN_020066F4
+ bl NARC_dtor
mov r1, #0x1e
ldr r2, [r5, #4]
mov r0, #0
diff --git a/arm9/modules/74/asm/module_74.s b/arm9/modules/74/asm/module_74.s
index 5ac99cc2..283ad8a8 100644
--- a/arm9/modules/74/asm/module_74.s
+++ b/arm9/modules/74/asm/module_74.s
@@ -687,7 +687,7 @@ MOD74_021D79F8: ; 0x021D79F8
add r5, r0, #0
ldr r1, [r5]
mov r0, #0x7b
- bl FUN_02006670
+ bl NARC_ctor
add r4, r0, #0
mov r0, #5
str r0, [sp]
@@ -744,7 +744,7 @@ _021D7A5A:
mov r3, #0x7b
bl FUN_02079B60
add r0, r4, #0
- bl FUN_020066F4
+ bl NARC_dtor
ldr r0, [r5, #0x10]
mov r1, #1
bl FUN_0201AC68
diff --git a/arm9/modules/75/asm/module_75.s b/arm9/modules/75/asm/module_75.s
index 00cfbad8..422ae56a 100644
--- a/arm9/modules/75/asm/module_75.s
+++ b/arm9/modules/75/asm/module_75.s
@@ -453,7 +453,7 @@ MOD75_021E6F00: ; 0x021E6F00
bl FUN_0200AB18
add r4, #0xd4
ldr r0, [r4]
- bl FUN_020066F4
+ bl NARC_dtor
add r0, r5, #0
bl FUN_0200627C
mov r0, #0
@@ -771,7 +771,7 @@ MOD75_021E7214: ; 0x021E7214
add r4, r0, #0
mov r0, #0xd
mov r1, #6
- bl FUN_02006670
+ bl NARC_ctor
add r1, r4, #0
add r1, #0xd4
str r0, [r1]
@@ -7831,7 +7831,7 @@ MOD75_021EA950: ; 0x021EA950
add r5, r1, #0
mov r1, #0x11
mov r2, #6
- bl FUN_02006704
+ bl NARC_AllocAndReadWholeMember
add r1, r5, #0
add r4, r0, #0
bl FUN_020B0030
@@ -8584,7 +8584,7 @@ MOD75_021EAF54: ; 0x021EAF54
add r5, r1, #0
mov r1, #0x26
mov r2, #6
- bl FUN_02006704
+ bl NARC_AllocAndReadWholeMember
add r1, r5, #0
add r4, r0, #0
bl FUN_020B0030
diff --git a/arm9/modules/77/asm/module_77.s b/arm9/modules/77/asm/module_77.s
index 1e602cbc..1115ff22 100644
--- a/arm9/modules/77/asm/module_77.s
+++ b/arm9/modules/77/asm/module_77.s
@@ -2314,7 +2314,7 @@ MOD77_021D8814: ; 0x021D8814
ldr r2, [r4]
mov r0, #0x81
mov r1, #0
- bl LoadFromNarc_2
+ bl AllocAndReadWholeNarcMemberByIdPair
ldr r2, _021D88B4 ; =0x0000C0CC
str r0, [r4, r2]
add r0, r2, #0
@@ -2327,7 +2327,7 @@ MOD77_021D8814: ; 0x021D8814
ldr r2, [r4]
mov r0, #0x81
mov r1, #1
- bl LoadFromNarc_2
+ bl AllocAndReadWholeNarcMemberByIdPair
ldr r2, _021D88B8 ; =0x0000C294
str r0, [r4, r2]
add r0, r2, #0
@@ -2341,7 +2341,7 @@ MOD77_021D8814: ; 0x021D8814
ldr r2, [r4]
mov r0, #0x81
mov r1, #2
- bl LoadFromNarc_2
+ bl AllocAndReadWholeNarcMemberByIdPair
ldr r2, _021D88BC ; =0x0000C298
str r0, [r4, r2]
add r0, r2, #0
@@ -2355,7 +2355,7 @@ MOD77_021D8814: ; 0x021D8814
ldr r2, [r4]
mov r0, #0x81
mov r1, #3
- bl LoadFromNarc_2
+ bl AllocAndReadWholeNarcMemberByIdPair
ldr r2, _021D88C0 ; =0x0000C28C
str r0, [r4, r2]
add r1, r2, #0
@@ -2368,7 +2368,7 @@ MOD77_021D8814: ; 0x021D8814
ldr r2, [r4]
mov r0, #0x81
mov r1, #4
- bl LoadFromNarc_2
+ bl AllocAndReadWholeNarcMemberByIdPair
ldr r2, _021D88C8 ; =0x0000C290
str r0, [r4, r2]
add r1, r2, #0
diff --git a/arm9/modules/78/asm/module_78.s b/arm9/modules/78/asm/module_78.s
index dbda846c..28fd9482 100644
--- a/arm9/modules/78/asm/module_78.s
+++ b/arm9/modules/78/asm/module_78.s
@@ -332,7 +332,7 @@ MOD78_021D778C: ; 0x021D778C
add r5, r0, #0
mov r0, #0x78
mov r1, #0x48
- bl FUN_02006670
+ bl NARC_ctor
str r0, [sp]
add r0, r5, #0
add r0, #0x70
@@ -349,7 +349,7 @@ MOD78_021D778C: ; 0x021D778C
ldr r1, _021D7878 ; =0x021D7900
mov r2, #0x48
ldrh r1, [r1, r3]
- bl FUN_02006704
+ bl NARC_AllocAndReadWholeMember
add r1, r5, #0
add r2, r5, #0
str r0, [r5, #0x5c]
@@ -399,7 +399,7 @@ _021D780E:
ldrh r1, [r1, #2]
ldr r0, [sp]
mov r2, #0x48
- bl FUN_02006704
+ bl NARC_AllocAndReadWholeMember
str r0, [r4, #0x60]
mov r1, #0
bl FUN_020BC4C8
@@ -428,7 +428,7 @@ _021D780E:
cmp r6, #4
blo _021D780E
ldr r0, [sp]
- bl FUN_020066F4
+ bl NARC_dtor
add sp, #0xc
pop {r4, r5, r6, r7, pc}
.align 2, 0
diff --git a/arm9/modules/80/asm/module_80.s b/arm9/modules/80/asm/module_80.s
index 12992a4e..39c54939 100644
--- a/arm9/modules/80/asm/module_80.s
+++ b/arm9/modules/80/asm/module_80.s
@@ -10713,7 +10713,7 @@ MOD80_02232BAC: ; 0x02232BAC
push {r3, r4, r5, lr}
add r5, r2, #0
add r2, r3, #0
- bl FUN_02006704
+ bl NARC_AllocAndReadWholeMember
add r4, r0, #0
beq _02232BCE
add r1, r5, #0
@@ -10953,7 +10953,7 @@ MOD80_02232D7C: ; 0x02232D7C
str r0, [r5, r1]
mov r0, #0x13
mov r1, #0x3e
- bl FUN_02006670
+ bl NARC_ctor
str r0, [sp, #0x1c]
ldr r0, [sp, #0x10]
cmp r0, #0
@@ -11142,7 +11142,7 @@ _02232F14:
bl FUN_0200A8E0
_02232F22:
ldr r0, [sp, #0x1c]
- bl FUN_020066F4
+ bl NARC_dtor
ldr r0, _02232F9C ; =0x00000EC8
mov r1, #0
add r0, r5, r0
diff --git a/arm9/modules/81/asm/module_81.s b/arm9/modules/81/asm/module_81.s
index b52f32e8..2182f0cd 100644
--- a/arm9/modules/81/asm/module_81.s
+++ b/arm9/modules/81/asm/module_81.s
@@ -1661,7 +1661,7 @@ MOD81_02238A84: ; 0x02238A84
str r0, [r4, r6]
ldr r1, [sp, #4]
add r0, r7, #0
- bl LoadFromNARC_7
+ bl GetNarcMemberSizeByIdPair
add r1, r0, #0
ldr r0, [r4, r6]
bl DC_FlushRange
diff --git a/arm9/modules/83/asm/module_83.s b/arm9/modules/83/asm/module_83.s
index 669b1fa3..5569fd70 100644
--- a/arm9/modules/83/asm/module_83.s
+++ b/arm9/modules/83/asm/module_83.s
@@ -15963,7 +15963,7 @@ MOD83_022352FC: ; 0x022352FC
beq _02235330
add r1, r5, #0
add r2, r6, #0
- bl LoadFromNARC
+ bl ReadWholeNarcMemberByIdPair
add r0, r4, #0
add r1, r7, #0
bl FUN_020B0030
@@ -15986,7 +15986,7 @@ MOD83_02235334: ; 0x02235334
add r4, r2, #0
add r0, r3, #0
add r1, r6, #0
- bl FUN_02006774
+ bl NARC_ReadWholeMember
add r0, r4, #0
add r1, r5, #0
bl FUN_020B0030
@@ -16217,7 +16217,7 @@ MOD83_022354F0: ; 0x022354F0
add r5, r0, #0
mov r0, #0x13
mov r1, #0x4e
- bl FUN_02006670
+ bl NARC_ctor
mov r1, #1
str r0, [sp, #0xc]
mov r0, #0x4e
@@ -16345,7 +16345,7 @@ _02235602:
ldr r0, [sp, #0x10]
bl FUN_02016A18
ldr r0, [sp, #0xc]
- bl FUN_020066F4
+ bl NARC_dtor
ldr r1, _02235640 ; =MOD83_022354AC
ldr r0, _02235644 ; =0x00012604
str r1, [r5, r0]
diff --git a/arm9/modules/85/asm/module_85.s b/arm9/modules/85/asm/module_85.s
index 3b342aa7..06e7f034 100644
--- a/arm9/modules/85/asm/module_85.s
+++ b/arm9/modules/85/asm/module_85.s
@@ -1494,7 +1494,7 @@ MOD85_021D811C: ; 0x021D811C
add r4, r0, #0
mov r0, #0x85
mov r1, #0x4f
- bl FUN_02006670
+ bl NARC_ctor
ldr r1, _021D8130 ; =0x00000438
str r0, [r4, r1]
pop {r4, pc}
@@ -1505,12 +1505,12 @@ _021D8130: .word 0x00000438
thumb_func_start MOD85_021D8134
MOD85_021D8134: ; 0x021D8134
ldr r1, _021D813C ; =0x00000438
- ldr r3, _021D8140 ; =FUN_020066F4
+ ldr r3, _021D8140 ; =NARC_dtor
ldr r0, [r0, r1]
bx r3
.align 2, 0
_021D813C: .word 0x00000438
-_021D8140: .word FUN_020066F4
+_021D8140: .word NARC_dtor
thumb_func_end MOD85_021D8134
thumb_func_start MOD85_021D8144
@@ -1521,7 +1521,7 @@ MOD85_021D8144: ; 0x021D8144
add r6, r1, #0
ldr r0, [r4, r0]
add r5, r2, #0
- bl FUN_020067D0
+ bl NARC_GetMemberSize
add r1, r0, #0
cmp r5, #1
bne _021D8162
@@ -1541,7 +1541,7 @@ _021D8172:
add r1, r6, #0
ldr r0, [r4, r0]
add r2, r5, #0
- bl FUN_02006774
+ bl NARC_ReadWholeMember
add r0, r5, #0
pop {r4, r5, r6, pc}
nop
diff --git a/arm9/src/filesystem.c b/arm9/src/filesystem.c
index 3faada5c..5f6dc8ef 100644
--- a/arm9/src/filesystem.c
+++ b/arm9/src/filesystem.c
@@ -152,7 +152,7 @@ static char * sNarcFileList[] = {
"poketool/shinzukan.narc",
};
-THUMB_FUNC void ReadNARCFile(void * dest, const char * path, s32 file_idx, u32 offset, u32 size)
+THUMB_FUNC void ReadFromNarcMemberByPathAndId(void * dest, const char * path, s32 file_idx, u32 offset, u32 size)
{
FSFile file;
register u32 chunk_starts[3];
@@ -192,7 +192,7 @@ THUMB_FUNC void ReadNARCFile(void * dest, const char * path, s32 file_idx, u32 o
FS_CloseFile(&file);
}
-THUMB_FUNC void * LoadFileIntoMemory(const char * path, s32 file_idx, u32 heap_id, u32 offset, u32 size, BOOL r4)
+THUMB_FUNC void * AllocAndReadFromNarcMemberByPathAndId(const char * path, s32 file_idx, u32 heap_id, u32 offset, u32 size, BOOL r4)
{
FSFile file;
register u32 chunk_starts[3];
@@ -243,37 +243,37 @@ THUMB_FUNC void * LoadFileIntoMemory(const char * path, s32 file_idx, u32 heap_i
return dest;
}
-THUMB_FUNC void LoadFromNARC(void * dest, NarcId narc_id, s32 file_id)
+THUMB_FUNC void ReadWholeNarcMemberByIdPair(void * dest, NarcId narc_id, s32 file_id)
{
- ReadNARCFile(dest, sNarcFileList[narc_id], file_id, 0, 0);
+ ReadFromNarcMemberByPathAndId(dest, sNarcFileList[narc_id], file_id, 0, 0);
}
-THUMB_FUNC void * LoadFromNarc_2(NarcId narc_id, s32 file_id, u32 heap_id)
+THUMB_FUNC void * AllocAndReadWholeNarcMemberByIdPair(NarcId narc_id, s32 file_id, u32 heap_id)
{
- return LoadFileIntoMemory(sNarcFileList[narc_id], file_id, heap_id, 0, 0, FALSE);
+ return AllocAndReadFromNarcMemberByPathAndId(sNarcFileList[narc_id], file_id, heap_id, 0, 0, FALSE);
}
-THUMB_FUNC void * FUN_02006528(NarcId narc_id, s32 file_id, u32 heap_id)
+THUMB_FUNC void * AllocAtEndAndReadWholeNarcMemberByIdPair(NarcId narc_id, s32 file_id, u32 heap_id)
{
- return LoadFileIntoMemory(sNarcFileList[narc_id], file_id, heap_id, 0, 0, TRUE);
+ return AllocAndReadFromNarcMemberByPathAndId(sNarcFileList[narc_id], file_id, heap_id, 0, 0, TRUE);
}
-THUMB_FUNC void FUN_02006548(void * dest, NarcId narc_id, s32 file_id, u32 offset, u32 size)
+THUMB_FUNC void ReadFromNarcMemberByIdPair(void * dest, NarcId narc_id, s32 file_id, u32 offset, u32 size)
{
- ReadNARCFile(dest, sNarcFileList[narc_id], file_id, offset, size);
+ ReadFromNarcMemberByPathAndId(dest, sNarcFileList[narc_id], file_id, offset, size);
}
-THUMB_FUNC void * FUN_02006564(NarcId narc_id, s32 file_id, u32 heap_id, u32 offset, u32 size)
+THUMB_FUNC void * AllocAndReadFromNarcMemberByIdPair(NarcId narc_id, s32 file_id, u32 heap_id, u32 offset, u32 size)
{
- return LoadFileIntoMemory(sNarcFileList[narc_id], file_id, heap_id, offset, size, FALSE);
+ return AllocAndReadFromNarcMemberByPathAndId(sNarcFileList[narc_id], file_id, heap_id, offset, size, FALSE);
}
-THUMB_FUNC void * FUN_02006584(NarcId narc_id, s32 file_id, u32 heap_id, u32 offset, u32 size)
+THUMB_FUNC void * AllocAtEndAndReadFromNarcMemberByIdPair(NarcId narc_id, s32 file_id, u32 heap_id, u32 offset, u32 size)
{
- return LoadFileIntoMemory(sNarcFileList[narc_id], file_id, heap_id, offset, size, TRUE);
+ return AllocAndReadFromNarcMemberByPathAndId(sNarcFileList[narc_id], file_id, heap_id, offset, size, TRUE);
}
-THUMB_FUNC u32 LoadFromNARC_7(NarcId narc_id, s32 file_idx)
+THUMB_FUNC u32 GetNarcMemberSizeByIdPair(NarcId narc_id, s32 file_idx)
{
FSFile file;
register u32 chunk_starts[3];
@@ -310,7 +310,7 @@ THUMB_FUNC u32 LoadFromNARC_7(NarcId narc_id, s32 file_idx)
return chunk_size;
}
-THUMB_FUNC NARC * FUN_02006670(NarcId narc_id, u32 heap_id)
+THUMB_FUNC NARC * NARC_ctor(NarcId narc_id, u32 heap_id)
{
NARC * narc = (NARC *)FUN_02016998(heap_id, sizeof(NARC));
u32 btnf_start;
@@ -333,13 +333,13 @@ THUMB_FUNC NARC * FUN_02006670(NarcId narc_id, u32 heap_id)
return narc;
}
-THUMB_FUNC void FUN_020066F4(NARC * narc)
+THUMB_FUNC void NARC_dtor(NARC * narc)
{
FS_CloseFile(&narc->file);
FUN_02016A18(narc); // free to heap
}
-THUMB_FUNC void * FUN_02006704(NARC * narc, u32 file_id, u32 heap_id)
+THUMB_FUNC void * NARC_AllocAndReadWholeMember(NARC * narc, u32 file_id, u32 heap_id)
{
u32 file_start;
u32 file_end;
@@ -358,7 +358,7 @@ THUMB_FUNC void * FUN_02006704(NARC * narc, u32 file_id, u32 heap_id)
return dest;
}
-THUMB_FUNC void FUN_02006774(NARC * narc, u32 file_id, void * dest)
+THUMB_FUNC void NARC_ReadWholeMember(NARC * narc, u32 file_id, void * dest)
{
u32 file_start;
u32 file_end;
@@ -371,7 +371,7 @@ THUMB_FUNC void FUN_02006774(NARC * narc, u32 file_id, void * dest)
FS_ReadFile(&narc->file, dest, file_end - file_start);
}
-THUMB_FUNC u32 FUN_020067D0(NARC * narc, u32 file_id)
+THUMB_FUNC u32 NARC_GetMemberSize(NARC * narc, u32 file_id)
{
u32 file_start;
u32 file_end;
@@ -383,7 +383,7 @@ THUMB_FUNC u32 FUN_020067D0(NARC * narc, u32 file_id)
return file_end - file_start;
}
-THUMB_FUNC void FUN_02006814(NARC * narc, u32 file_id, u32 pos, u32 size, void * dest)
+THUMB_FUNC void NARC_ReadFromMember(NARC * narc, u32 file_id, u32 pos, u32 size, void * dest)
{
u32 file_start;
if (narc->num_files <= file_id)
@@ -394,12 +394,12 @@ THUMB_FUNC void FUN_02006814(NARC * narc, u32 file_id, u32 pos, u32 size, void *
FS_ReadFile(&narc->file, dest, size);
}
-THUMB_FUNC void FUN_02006864(NARC * narc, u32 size, void * dest)
+THUMB_FUNC void NARC_ReadFile(NARC * narc, u32 size, void * dest)
{
FS_ReadFile(&narc->file, dest, size);
}
-THUMB_FUNC u16 FUN_02006874(NARC * narc)
+THUMB_FUNC u16 NARC_GetFileCount(NARC * narc)
{
return narc->num_files;
}
diff --git a/include/filesystem.h b/include/filesystem.h
index 1c106943..64335228 100644
--- a/include/filesystem.h
+++ b/include/filesystem.h
@@ -159,22 +159,22 @@ typedef enum NarcId
NARC_POKETOOL_SHINZUKAN,
} NarcId;
-void ReadNARCFile(void * dest, const char * path, s32 file_idx, u32 offset, u32 size);
-void * LoadFileIntoMemory(const char * path, s32 file_idx, u32 heap_id, u32 offset, u32 size, BOOL r4);
-void LoadFromNARC(void * dest, NarcId narc_id, s32 file_id);
-void * LoadFromNarc_2(NarcId narc_id, s32 file_id, u32 heap_id);
-void * FUN_02006528(NarcId narc_id, s32 file_id, u32 heap_id);
-void FUN_02006548(void * dest, NarcId narc_id, s32 file_id, u32 offset, u32 size);
-void * FUN_02006564(NarcId narc_id, s32 file_id, u32 heap_id, u32 offset, u32 size);
-void * FUN_02006584(NarcId narc_id, s32 file_id, u32 heap_id, u32 offset, u32 size);
-u32 LoadFromNARC_7(NarcId narc_id, s32 file_idx);
-NARC * FUN_02006670(NarcId narc_id, u32 heap_id);
-void FUN_020066F4(NARC * narc);
-void * FUN_02006704(NARC * narc, u32 file_id, u32 heap_id);
-void FUN_02006774(NARC * narc, u32 file_id, void * dest);
-u32 FUN_020067D0(NARC * narc, u32 file_id);
-void FUN_02006814(NARC * narc, u32 file_id, u32 pos, u32 size, void * dest);
-void FUN_02006864(NARC * narc, u32 size, void * dest);
-u16 FUN_02006874(NARC * narc);
+void ReadFromNarcMemberByPathAndId(void * dest, const char * path, s32 file_idx, u32 offset, u32 size);
+void * AllocAndReadFromNarcMemberByPathAndId(const char * path, s32 file_idx, u32 heap_id, u32 offset, u32 size, BOOL r4);
+void ReadWholeNarcMemberByIdPair(void * dest, NarcId narc_id, s32 file_id);
+void * AllocAndReadWholeNarcMemberByIdPair(NarcId narc_id, s32 file_id, u32 heap_id);
+void * AllocAtEndAndReadWholeNarcMemberByIdPair(NarcId narc_id, s32 file_id, u32 heap_id);
+void ReadFromNarcMemberByIdPair(void * dest, NarcId narc_id, s32 file_id, u32 offset, u32 size);
+void * AllocAndReadFromNarcMemberByIdPair(NarcId narc_id, s32 file_id, u32 heap_id, u32 offset, u32 size);
+void * AllocAtEndAndReadFromNarcMemberByIdPair(NarcId narc_id, s32 file_id, u32 heap_id, u32 offset, u32 size);
+u32 GetNarcMemberSizeByIdPair(NarcId narc_id, s32 file_idx);
+NARC * NARC_ctor(NarcId narc_id, u32 heap_id);
+void NARC_dtor(NARC * narc);
+void * NARC_AllocAndReadWholeMember(NARC * narc, u32 file_id, u32 heap_id);
+void NARC_ReadWholeMember(NARC * narc, u32 file_id, void * dest);
+u32 NARC_GetMemberSize(NARC * narc, u32 file_id);
+void NARC_ReadFromMember(NARC * narc, u32 file_id, u32 pos, u32 size, void * dest);
+void NARC_ReadFile(NARC * narc, u32 size, void * dest);
+u16 NARC_GetFileCount(NARC * narc);
#endif //POKEDIAMOND_FILESYSTEM_H
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-26 08:54:37 +0000