summaryrefslogtreecommitdiff
path: root/arm9/asm
diff options
context:
space:
mode:
Diffstat (limited to 'arm9/asm')
-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
24 files changed, 109 insertions, 109 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