diff options
| -rw-r--r-- | asm/filesystem.s | 24 | ||||
| -rw-r--r-- | asm/unk_02006864.s | 104 | ||||
| -rw-r--r-- | global.inc | 6 |
3 files changed, 67 insertions, 67 deletions
diff --git a/asm/filesystem.s b/asm/filesystem.s index b50f31c6..75af021d 100644 --- a/asm/filesystem.s +++ b/asm/filesystem.s @@ -104,8 +104,8 @@ _020063E0: add sp, #0x60
pop {r3-r7, pc}
- thumb_func_start FUN_020063F4
-FUN_020063F4: ; 0x020063F4
+ thumb_func_start LoadFileIntoMemory
+LoadFileIntoMemory: ; 0x020063F4
push {r3-r7, lr}
sub sp, #0x60
add r5, r1, #0x0
@@ -219,8 +219,8 @@ _020064D8: add sp, #0x60
pop {r3-r7, pc}
- thumb_func_start FUN_020064F0
-FUN_020064F0: ; 0x020064F0
+ thumb_func_start LoadFromNARC
+LoadFromNARC: ; 0x020064F0
push {r3-r4, lr}
sub sp, #0x4
mov r3, #0x0
@@ -234,8 +234,8 @@ FUN_020064F0: ; 0x020064F0 nop
_02006508: .word 0x021058A0
- thumb_func_start FUN_0200650C
-FUN_0200650C: ; 0x0200650C
+ thumb_func_start LoadFromNarc_2
+LoadFromNarc_2: ; 0x0200650C
push {r4, lr}
sub sp, #0x8
mov r3, #0x0
@@ -244,7 +244,7 @@ FUN_0200650C: ; 0x0200650C ldr r0, _02006524 ; =0x021058A0
str r3, [sp, #0x4]
ldr r0, [r0, r4]
- bl FUN_020063F4
+ bl LoadFileIntoMemory
add sp, #0x8
pop {r4, pc}
.balign 4
@@ -261,7 +261,7 @@ FUN_02006528: ; 0x02006528 lsl r4, r0, #0x2
ldr r0, _02006544 ; =0x021058A0
ldr r0, [r0, r4]
- bl FUN_020063F4
+ bl LoadFileIntoMemory
add sp, #0x8
pop {r4, pc}
nop
@@ -293,7 +293,7 @@ FUN_02006564: ; 0x02006564 lsl r4, r0, #0x2
ldr r0, _02006580 ; =0x021058A0
ldr r0, [r0, r4]
- bl FUN_020063F4
+ bl LoadFileIntoMemory
add sp, #0x8
pop {r4, pc}
nop
@@ -310,14 +310,14 @@ FUN_02006584: ; 0x02006584 lsl r4, r0, #0x2
ldr r0, _020065A0 ; =0x021058A0
ldr r0, [r0, r4]
- bl FUN_020063F4
+ bl LoadFileIntoMemory
add sp, #0x8
pop {r4, pc}
nop
_020065A0: .word 0x021058A0
- thumb_func_start FUN_020065A4
-FUN_020065A4: ; 0x020065A4
+ thumb_func_start LoadFromNARC_7
+LoadFromNARC_7: ; 0x020065A4
push {r3-r7, lr}
sub sp, #0x58
add r5, r1, #0x0
diff --git a/asm/unk_02006864.s b/asm/unk_02006864.s index deba334f..bb43f51a 100644 --- a/asm/unk_02006864.s +++ b/asm/unk_02006864.s @@ -577,14 +577,14 @@ FUN_02006C98: ; 0x02006C98 _02006CAC:
ldr r1, [sp, #0x0]
add r0, r7, #0x0
- bl FUN_020065A4
+ bl LoadFromNARC_7
add r1, r0, #0x0
add r0, r6, #0x0
bl FUN_020169D8
add r4, r0, #0x0
b _02006CCE
_02006CC0:
- bl FUN_020065A4
+ bl LoadFromNARC_7
add r1, r0, #0x0
add r0, r6, #0x0
bl FUN_02016998
@@ -595,7 +595,7 @@ _02006CCE: ldr r2, [sp, #0x0]
add r0, r4, #0x0
add r1, r7, #0x0
- bl FUN_020064F0
+ bl LoadFromNARC
cmp r5, #0x0
beq _02006D12
ldr r0, [sp, #0x18]
@@ -636,7 +636,7 @@ FUN_02006D18: ; 0x02006D18 str r1, [sp, #0x4]
add r6, r2, #0x0
add r7, r3, #0x0
- bl FUN_020065A4
+ bl LoadFromNARC_7
str r0, [r5, #0x0]
cmp r6, #0x0
bne _02006D36
@@ -660,7 +660,7 @@ _02006D4C: ldr r1, [sp, #0x0]
ldr r2, [sp, #0x4]
add r0, r4, #0x0
- bl FUN_020064F0
+ bl LoadFromNARC
cmp r6, #0x0
beq _02006D92
ldr r0, [r4, #0x0]
@@ -767,7 +767,7 @@ _02006E12: ldr r2, [r4, r2]
mov r0, #0x75
mov r1, #0xd3
- bl FUN_0200650C
+ bl LoadFromNarc_2
add r1, sp, #0xc
str r0, [sp, #0x4]
blx FUN_020B0088
@@ -3649,7 +3649,7 @@ _020082CC: ldrh r0, [r0, #0x4]
ldrh r1, [r1, #0x6]
ldr r2, [r6, r2]
- bl FUN_0200650C
+ bl LoadFromNarc_2
add r1, sp, #0x58
str r0, [sp, #0x4c]
blx FUN_020B0088
@@ -4212,7 +4212,7 @@ _02008706: ldrh r0, [r4, #0x4]
ldrh r1, [r4, #0x8]
ldr r2, [r5, r2]
- bl FUN_0200650C
+ bl LoadFromNarc_2
add r1, sp, #0x18
str r0, [sp, #0x10]
blx FUN_020B0138
@@ -4258,7 +4258,7 @@ _0200874A: ldr r2, [r5, r2]
mov r0, #0x75
mov r1, #0xd4
- bl FUN_0200650C
+ bl LoadFromNarc_2
add r1, sp, #0x18
str r0, [sp, #0x4]
blx FUN_020B0138
@@ -8028,10 +8028,10 @@ _0200A380: .word 0x021C4674 thumb_func_start FUN_0200A384
FUN_0200A384: ; 0x0200A384
- ldr r3, _0200A388 ; =FUN_0200650C
+ ldr r3, _0200A388 ; =LoadFromNarc_2
bx r3
.balign 4
-_0200A388: .word FUN_0200650C
+_0200A388: .word LoadFromNarc_2
thumb_func_start FUN_0200A38C
FUN_0200A38C: ; 0x0200A38C
@@ -14356,7 +14356,7 @@ FUN_0200D300: ; 0x0200D300 mov r0, #0x24
mov r1, #0x1
add r2, r4, #0x0
- bl FUN_0200650C
+ bl LoadFromNarc_2
add r1, sp, #0x18
str r0, [sp, #0x14]
blx FUN_020B0138
@@ -24442,7 +24442,7 @@ _02012018: FUN_02012044: ; 0x02012044
push {r4-r6, lr}
add r5, r3, #0x0
- bl FUN_0200650C
+ bl LoadFromNarc_2
add r4, r0, #0x0
bne _02012054
bl ErrorHandling
@@ -24668,7 +24668,7 @@ FUN_020121E8: ; 0x020121E8 str r3, [sp, #0x48]
mov r3, #0x0
str r3, [sp, #0x2c]
- bl FUN_0200650C
+ bl LoadFromNarc_2
str r0, [sp, #0x20]
cmp r0, #0x0
bne _02012204
@@ -25013,7 +25013,7 @@ FUN_02012470: ; 0x02012470 add r0, r5, #0x0
add r1, r6, #0x0
add r2, r7, #0x0
- bl FUN_0200650C
+ bl LoadFromNarc_2
add r1, sp, #0x0
add r5, r0, #0x0
blx FUN_020B0138
@@ -26822,10 +26822,10 @@ _02013188: .word 0x021C4850 thumb_func_start FUN_0201318C
FUN_0201318C: ; 0x0201318C
- ldr r3, _02013190 ; =FUN_0200650C
+ ldr r3, _02013190 ; =LoadFromNarc_2
bx r3
.balign 4
-_02013190: .word FUN_0200650C
+_02013190: .word LoadFromNarc_2
thumb_func_start FUN_02013194
FUN_02013194: ; 0x02013194
@@ -101149,7 +101149,7 @@ FUN_02034A98: ; 0x02034A98 add r4, r0, #0x0
mov r0, #0x20
add r1, r4, #0x0
- bl FUN_020065A4
+ bl LoadFromNARC_7
mov r1, #0x2
lsl r1, r1, #0xa
cmp r0, r1
@@ -101160,7 +101160,7 @@ _02034AB8: add r0, r5, #0x0
mov r1, #0x20
add r2, r4, #0x0
- bl FUN_020064F0
+ bl LoadFromNARC
pop {r3-r5, pc}
.balign 4
@@ -101492,7 +101492,7 @@ FUN_02034CB4: ; 0x02034CB4 add r2, r0, #0x0
add r0, r5, #0x0
mov r1, #0x25
- bl FUN_020064F0
+ bl LoadFromNARC
_02034CDE:
pop {r3-r5, pc}
@@ -101521,7 +101521,7 @@ FUN_02034CEC: ; 0x02034CEC blx MIi_CpuClearFast
mov r0, #0xa
add r1, r4, #0x0
- bl FUN_020065A4
+ bl LoadFromNARC_7
mov r1, #0x1
lsl r1, r1, #0x8
cmp r0, r1
@@ -101533,7 +101533,7 @@ _02034D1C: add r0, r5, r0
mov r1, #0xa
add r2, r4, #0x0
- bl FUN_020064F0
+ bl LoadFromNARC
pop {r3-r5, pc}
thumb_func_start FUN_02034D2C
@@ -110304,7 +110304,7 @@ FUN_020392B4: ; 0x020392B4 add r4, r3, #0x0
mov r0, #0xa
mov r2, #0xb
- bl FUN_0200650C
+ bl LoadFromNarc_2
str r0, [r5, #0x7c]
mov r0, #0x1
mov r1, #0x1a
@@ -110598,7 +110598,7 @@ FUN_0203949C: ; 0x0203949C add r1, r0, #0x0
mov r0, #0xa
mov r2, #0xb
- bl FUN_0200650C
+ bl LoadFromNarc_2
pop {r3, pc}
.balign 4
@@ -208399,7 +208399,7 @@ _0206877A: add r0, r4, #0x0
mov r1, #0x3
add r2, r5, #0x0
- bl FUN_020064F0
+ bl LoadFromNARC
pop {r3-r5, pc}
.balign 4
@@ -209560,7 +209560,7 @@ _02068FCA: add r0, sp, #0x0
add r1, r4, #0x0
add r2, r3, #0x0
- bl FUN_020064F0
+ bl LoadFromNARC
add r0, sp, #0x0
ldrb r0, [r0, #0x0]
pop {r3-r5, pc}
@@ -211677,7 +211677,7 @@ FUN_02069F9C: ; 0x02069F9C add r2, r0, #0x0
add r0, r4, #0x0
mov r1, #0x21
- bl FUN_020064F0
+ bl LoadFromNARC
pop {r4, pc}
thumb_func_start FUN_02069FB0
@@ -212152,13 +212152,13 @@ _0206A32E: thumb_func_start FUN_0206A370
FUN_0206A370: ; 0x0206A370
- ldr r3, _0206A37C ; =FUN_020064F0
+ ldr r3, _0206A37C ; =LoadFromNARC
add r2, r0, #0x0
add r0, r1, #0x0
mov r1, #0x2
bx r3
nop
-_0206A37C: .word FUN_020064F0
+_0206A37C: .word LoadFromNARC
thumb_func_start FUN_0206A380
FUN_0206A380: ; 0x0206A380
@@ -212168,18 +212168,18 @@ FUN_0206A380: ; 0x0206A380 add r2, r0, #0x0
add r0, r4, #0x0
mov r1, #0x2
- bl FUN_020064F0
+ bl LoadFromNARC
pop {r4, pc}
thumb_func_start FUN_0206A394
FUN_0206A394: ; 0x0206A394
- ldr r3, _0206A3A0 ; =FUN_020064F0
+ ldr r3, _0206A3A0 ; =LoadFromNARC
add r2, r0, #0x0
add r0, r1, #0x0
mov r1, #0x22
bx r3
nop
-_0206A3A0: .word FUN_020064F0
+_0206A3A0: .word LoadFromNARC
thumb_func_start FUN_0206A3A4
FUN_0206A3A4: ; 0x0206A3A4
@@ -213435,13 +213435,13 @@ _0206ABB0: thumb_func_start FUN_0206ABB4
FUN_0206ABB4: ; 0x0206ABB4
- ldr r3, _0206ABC0 ; =FUN_020064F0
+ ldr r3, _0206ABC0 ; =LoadFromNARC
add r2, r0, #0x0
add r0, r1, #0x0
mov r1, #0x9
bx r3
nop
-_0206ABC0: .word FUN_020064F0
+_0206ABC0: .word LoadFromNARC
thumb_func_start FUN_0206ABC4
FUN_0206ABC4: ; 0x0206ABC4
@@ -213598,7 +213598,7 @@ FUN_0206ACD4: ; 0x0206ACD4 ldr r1, [sp, #0x4]
mov r0, #0x3b
add r4, r2, #0x0
- bl FUN_020065A4
+ bl LoadFromNARC_7
add r6, r0, #0x0
mov r0, #0x2
str r0, [sp, #0x0]
@@ -213658,7 +213658,7 @@ FUN_0206AD4C: ; 0x0206AD4C mov r1, #0x0
str r2, [sp, #0x4]
str r3, [sp, #0x8]
- bl FUN_020065A4
+ bl LoadFromNARC_7
add r5, r0, #0x0
mov r0, #0x2
str r0, [sp, #0x0]
@@ -213723,23 +213723,23 @@ _0206ADDC: .word 0x0000022E thumb_func_start FUN_0206ADE0
FUN_0206ADE0: ; 0x0206ADE0
- ldr r3, _0206ADEC ; =FUN_020064F0
+ ldr r3, _0206ADEC ; =LoadFromNARC
add r2, r0, #0x0
add r0, r1, #0x0
mov r1, #0x39
bx r3
nop
-_0206ADEC: .word FUN_020064F0
+_0206ADEC: .word LoadFromNARC
thumb_func_start FUN_0206ADF0
FUN_0206ADF0: ; 0x0206ADF0
- ldr r3, _0206ADFC ; =FUN_020064F0
+ ldr r3, _0206ADFC ; =LoadFromNARC
add r2, r0, #0x0
add r0, r1, #0x0
mov r1, #0x3a
bx r3
nop
-_0206ADFC: .word FUN_020064F0
+_0206ADFC: .word LoadFromNARC
thumb_func_start FUN_0206AE00
FUN_0206AE00: ; 0x0206AE00
@@ -221187,21 +221187,21 @@ _0206E72C: lsl r3, r3, #0x3
ldrh r1, [r1, r3]
mov r0, #0xf
- bl FUN_0200650C
+ bl LoadFromNarc_2
pop {r3, pc}
_0206E73A:
ldr r1, _0206E760 ; =0x020F85B6
lsl r3, r3, #0x3
ldrh r1, [r1, r3]
mov r0, #0x10
- bl FUN_0200650C
+ bl LoadFromNarc_2
pop {r3, pc}
_0206E748:
ldr r1, _0206E764 ; =0x020F85B8
lsl r3, r3, #0x3
ldrh r1, [r1, r3]
mov r0, #0x10
- bl FUN_0200650C
+ bl LoadFromNarc_2
pop {r3, pc}
_0206E756:
mov r0, #0x0
@@ -224244,7 +224244,7 @@ FUN_0206FD24: ; 0x0206FD24 mov r0, #0x14
mov r1, #0x10
mov r2, #0xc
- bl FUN_0200650C
+ bl LoadFromNarc_2
add r1, sp, #0x10
add r4, r0, #0x0
blx FUN_020B0138
@@ -229174,7 +229174,7 @@ FUN_020724D4: ; 0x020724D4 mov r1, #0x16
add r2, r4, #0x0
add r7, r3, #0x0
- bl FUN_0200650C
+ bl LoadFromNarc_2
add r1, sp, #0xc
str r0, [sp, #0x8]
blx FUN_020B0180
@@ -243632,7 +243632,7 @@ FUN_02079B60: ; 0x02079B60 str r2, [sp, #0x4]
ldr r5, [sp, #0x2c]
ldr r4, [sp, #0x34]
- bl FUN_020065A4
+ bl LoadFromNARC_7
add r1, r0, #0x0
add r0, r7, #0x0
bl FUN_020169D8
@@ -243740,7 +243740,7 @@ FUN_02079C40: ; 0x02079C40 add r0, r1, #0x0
add r1, r5, #0x0
add r7, r3, #0x0
- bl FUN_020065A4
+ bl LoadFromNARC_7
add r1, r0, #0x0
ldr r0, [sp, #0x18]
bl FUN_02016998
@@ -246456,7 +246456,7 @@ _0207B250: _0207B256:
mov r0, #0x27
mov r2, #0x13
- bl FUN_0200650C
+ bl LoadFromNarc_2
add r1, sp, #0xc
add r4, r0, #0x0
blx FUN_020B0180
@@ -261276,7 +261276,7 @@ _0208292A: str r0, [sp, #0x14]
mov r0, #0x5a
mov r1, #0x0
- bl FUN_020065A4
+ bl LoadFromNARC_7
mov r1, #0x30
blx _u32_div_f
str r0, [sp, #0x24]
@@ -262037,7 +262037,7 @@ FUN_02082ED0: ; 0x02082ED0 str r0, [sp, #0x14]
mov r0, #0x5a
mov r1, #0x1
- bl FUN_020065A4
+ bl LoadFromNARC_7
lsr r0, r0, #0x3
str r0, [sp, #0x18]
ldr r1, [sp, #0x18]
@@ -266800,11 +266800,11 @@ FUN_02085274: ; 0x02085274 add r3, r0, #0x0
add r2, r1, #0x0
add r1, r3, #0x0
- ldr r3, _02085280 ; =FUN_0200650C
+ ldr r3, _02085280 ; =LoadFromNarc_2
mov r0, #0x44
bx r3
.balign 4
-_02085280: .word FUN_0200650C
+_02085280: .word LoadFromNarc_2
thumb_func_start FUN_02085284
FUN_02085284: ; 0x02085284
@@ -1101,12 +1101,12 @@ .extern FUN_02006278
.extern FUN_0200627C
.extern FUN_0200628C
-.extern FUN_020064F0
-.extern FUN_0200650C
+.extern LoadFromNARC
+.extern LoadFromNarc_2
.extern FUN_02006528
.extern FUN_02006548
.extern FUN_02006564
-.extern FUN_020065A4
+.extern LoadFromNARC_7
.extern FUN_02006670
.extern FUN_020066F4
.extern FUN_02006704
|