summaryrefslogtreecommitdiff
path: root/arm9/asm
diff options
context:
space:
mode:
Diffstat (limited to 'arm9/asm')
-rw-r--r--arm9/asm/scrcmd_4.s2
-rw-r--r--arm9/asm/unk_02006864.s30
-rw-r--r--arm9/asm/unk_02008DEC.s2
-rw-r--r--arm9/asm/unk_0200AA80.s4
-rw-r--r--arm9/asm/unk_02080C38.s2
-rw-r--r--arm9/asm/unk_020828BC.s6
-rw-r--r--arm9/asm/unk_02087A6C.s20
7 files changed, 33 insertions, 33 deletions
diff --git a/arm9/asm/scrcmd_4.s b/arm9/asm/scrcmd_4.s
index d7e850ab..55341882 100644
--- a/arm9/asm/scrcmd_4.s
+++ b/arm9/asm/scrcmd_4.s
@@ -984,7 +984,7 @@ FUN_02040EB4: ; 0x02040EB4
lsr r2, r0, #0x10
ldr r0, [r6, #0x0]
add r1, r4, #0x0
- bl FUN_0200AD94
+ bl GetRibbonNameOrDesc
mov r0, #0x0
pop {r4-r6, pc}
.balign 4
diff --git a/arm9/asm/unk_02006864.s b/arm9/asm/unk_02006864.s
index 8bd21720..cffea043 100644
--- a/arm9/asm/unk_02006864.s
+++ b/arm9/asm/unk_02006864.s
@@ -34,7 +34,7 @@ FUN_0200687C: ; 0x0200687C
ldr r2, [sp, #0x28]
ldr r3, [sp, #0x2c]
ldr r4, [sp, #0x24]
- bl FUN_02006C98
+ bl UncompressFromNarc
add r7, r0, #0x0
beq _020068C2
add r1, sp, #0x4
@@ -74,7 +74,7 @@ FUN_020068C8: ; 0x020068C8
ldr r2, [sp, #0x28]
ldr r3, [sp, #0x2c]
ldr r4, [sp, #0x24]
- bl FUN_02006C98
+ bl UncompressFromNarc
add r7, r0, #0x0
beq _0200692C
add r1, sp, #0x4
@@ -142,7 +142,7 @@ FUN_02006948: ; 0x02006948
mov r2, #0x0
ldr r6, [sp, #0x20]
ldr r5, [sp, #0x24]
- bl FUN_02006C98
+ bl UncompressFromNarc
str r0, [sp, #0x4]
cmp r0, #0x0
beq _02006A2A
@@ -258,7 +258,7 @@ FUN_02006A34: ; 0x02006A34
ldr r2, [sp, #0x24]
ldr r3, [sp, #0x28]
ldr r4, [sp, #0x20]
- bl FUN_02006C98
+ bl UncompressFromNarc
add r7, r0, #0x0
beq _02006A80
add r1, sp, #0x4
@@ -302,7 +302,7 @@ FUN_02006A8C: ; 0x02006A8C
str r2, [sp, #0x0]
ldr r3, [sp, #0x20]
mov r2, #0x0
- bl FUN_02006C98
+ bl UncompressFromNarc
add r6, r0, #0x0
beq _02006AE0
add r1, sp, #0x4
@@ -344,7 +344,7 @@ FUN_02006AE4: ; 0x02006AE4
mov r3, #0x1
str r3, [sp, #0x0]
ldr r3, [sp, #0x24]
- bl FUN_02006C98
+ bl UncompressFromNarc
add r6, r0, #0x0
ldr r4, _02006B30 ; =0x00000000
beq _02006B28
@@ -387,7 +387,7 @@ FUN_02006B38: ; 0x02006B38
mov r3, #0x1
str r3, [sp, #0x0]
ldr r3, [sp, #0x24]
- bl FUN_02006C98
+ bl UncompressFromNarc
add r4, r0, #0x0
beq _02006B9E
add r1, sp, #0x4
@@ -449,7 +449,7 @@ FUN_02006BB0: ; 0x02006BB0
mov r3, #0x0
str r3, [sp, #0x0]
ldr r3, [sp, #0x10]
- bl FUN_02006C98
+ bl UncompressFromNarc
add r5, r0, #0x0
beq _02006BD6
add r1, r4, #0x0
@@ -472,7 +472,7 @@ FUN_02006BDC: ; 0x02006BDC
mov r3, #0x0
str r3, [sp, #0x0]
ldr r3, [sp, #0x10]
- bl FUN_02006C98
+ bl UncompressFromNarc
add r5, r0, #0x0
beq _02006C02
add r1, r4, #0x0
@@ -494,7 +494,7 @@ FUN_02006C08: ; 0x02006C08
add r5, r2, #0x0
mov r2, #0x0
str r2, [sp, #0x0]
- bl FUN_02006C98
+ bl UncompressFromNarc
add r4, r0, #0x0
beq _02006C2C
add r1, r5, #0x0
@@ -516,7 +516,7 @@ FUN_02006C30: ; 0x02006C30
mov r3, #0x0
str r3, [sp, #0x0]
ldr r3, [sp, #0x10]
- bl FUN_02006C98
+ bl UncompressFromNarc
add r5, r0, #0x0
beq _02006C56
add r1, r4, #0x0
@@ -539,7 +539,7 @@ FUN_02006C5C: ; 0x02006C5C
mov r3, #0x0
str r3, [sp, #0x0]
ldr r3, [sp, #0x10]
- bl FUN_02006C98
+ bl UncompressFromNarc
add r5, r0, #0x0
beq _02006C82
add r1, r4, #0x0
@@ -562,11 +562,11 @@ FUN_02006C88: ; 0x02006C88
mov r2, #0x0
str r2, [sp, #0x0]
mov r2, #0x1
- bl FUN_02006C98
+ bl UncompressFromNarc
pop {r3, pc}
- thumb_func_start FUN_02006C98
-FUN_02006C98: ; 0x02006C98
+ thumb_func_start UncompressFromNarc
+UncompressFromNarc: ; 0x02006C98
push {r3-r7, lr}
add r5, r2, #0x0
add r7, r0, #0x0
diff --git a/arm9/asm/unk_02008DEC.s b/arm9/asm/unk_02008DEC.s
index 50b83f92..1b0161ae 100644
--- a/arm9/asm/unk_02008DEC.s
+++ b/arm9/asm/unk_02008DEC.s
@@ -1604,7 +1604,7 @@ FUN_02009978: ; 0x02009978
add r1, r3, #0x0
ldr r2, [sp, #0x10]
ldr r3, [sp, #0x24]
- bl FUN_02006C98
+ bl UncompressFromNarc
add r1, r0, #0x0
ldr r0, [r5, #0x0]
ldr r2, [sp, #0x14]
diff --git a/arm9/asm/unk_0200AA80.s b/arm9/asm/unk_0200AA80.s
index c5065adc..ace139f6 100644
--- a/arm9/asm/unk_0200AA80.s
+++ b/arm9/asm/unk_0200AA80.s
@@ -427,8 +427,8 @@ _0200AD90:
pop {r3-r7, pc}
.balign 4
- thumb_func_start FUN_0200AD94
-FUN_0200AD94: ; 0x0200AD94
+ thumb_func_start GetRibbonNameOrDesc
+GetRibbonNameOrDesc: ; 0x0200AD94
push {r3-r7, lr}
add r5, r0, #0x0
add r6, r2, #0x0
diff --git a/arm9/asm/unk_02080C38.s b/arm9/asm/unk_02080C38.s
index 55901920..8eb1213d 100644
--- a/arm9/asm/unk_02080C38.s
+++ b/arm9/asm/unk_02080C38.s
@@ -3041,7 +3041,7 @@ _020822D6:
add r2, r0, #0x0
add r0, r4, #0x0
add r1, r5, #0x0
- bl FUN_0200AD94
+ bl GetRibbonNameOrDesc
pop {r3-r5, pc}
.balign 4
_020822EC: .word 0x0000011F
diff --git a/arm9/asm/unk_020828BC.s b/arm9/asm/unk_020828BC.s
index 3c10063d..f63a493e 100644
--- a/arm9/asm/unk_020828BC.s
+++ b/arm9/asm/unk_020828BC.s
@@ -177,7 +177,7 @@ _0208292A:
mov r0, #0x5a
add r2, r1, #0x0
add r3, r5, #0x0
- bl FUN_02006C98
+ bl UncompressFromNarc
str r0, [sp, #0x14]
mov r0, #0x5a
mov r1, #0x0
@@ -513,7 +513,7 @@ FUN_02082B90: ; 0x02082B90
mov r0, #0x5a
mov r1, #0x2
mov r2, #0x0
- bl FUN_02006C98
+ bl UncompressFromNarc
str r0, [sp, #0x14]
ldr r1, _02082D10 ; =0x00000121
ldr r0, [sp, #0x8]
@@ -938,7 +938,7 @@ FUN_02082ED0: ; 0x02082ED0
add r2, r5, #0x0
add r4, r5, #0x0
str r1, [sp, #0x0]
- bl FUN_02006C98
+ bl UncompressFromNarc
str r0, [sp, #0x14]
mov r0, #0x5a
mov r1, #0x1
diff --git a/arm9/asm/unk_02087A6C.s b/arm9/asm/unk_02087A6C.s
index c91f5a47..d51eab43 100644
--- a/arm9/asm/unk_02087A6C.s
+++ b/arm9/asm/unk_02087A6C.s
@@ -249,7 +249,7 @@ FUN_02087C18: ; 0x02087C18
mov r0, #0x4b
add r2, r1, #0x0
str r1, [sp, #0x0]
- bl FUN_02006C98
+ bl UncompressFromNarc
pop {r3, pc}
.balign 4
@@ -261,7 +261,7 @@ FUN_02087C2C: ; 0x02087C2C
mov r0, #0x4b
mov r1, #0x1
str r2, [sp, #0x0]
- bl FUN_02006C98
+ bl UncompressFromNarc
pop {r3, pc}
.balign 4
@@ -277,14 +277,14 @@ FUN_02087C40: ; 0x02087C40
mov r0, #0x4b
mov r1, #0x9
add r3, r6, #0x0
- bl FUN_02006C98
+ bl UncompressFromNarc
str r0, [r5, #0x0]
mov r2, #0x0
mov r0, #0x4b
mov r1, #0xa
add r3, r6, #0x0
str r2, [sp, #0x0]
- bl FUN_02006C98
+ bl UncompressFromNarc
str r0, [r4, #0x0]
add sp, #0x4
pop {r3-r6, pc}
@@ -302,14 +302,14 @@ FUN_02087C70: ; 0x02087C70
mov r0, #0x4b
mov r1, #0x7
add r3, r6, #0x0
- bl FUN_02006C98
+ bl UncompressFromNarc
str r0, [r5, #0x0]
mov r2, #0x0
mov r0, #0x4b
mov r1, #0x8
add r3, r6, #0x0
str r2, [sp, #0x0]
- bl FUN_02006C98
+ bl UncompressFromNarc
str r0, [r4, #0x0]
add sp, #0x4
pop {r3-r6, pc}
@@ -327,14 +327,14 @@ FUN_02087CA0: ; 0x02087CA0
mov r0, #0x4b
mov r1, #0x5
add r3, r6, #0x0
- bl FUN_02006C98
+ bl UncompressFromNarc
str r0, [r5, #0x0]
mov r2, #0x0
mov r0, #0x4b
mov r1, #0x6
add r3, r6, #0x0
str r2, [sp, #0x0]
- bl FUN_02006C98
+ bl UncompressFromNarc
str r0, [r4, #0x0]
add sp, #0x4
pop {r3-r6, pc}
@@ -352,14 +352,14 @@ FUN_02087CD0: ; 0x02087CD0
mov r0, #0x4b
mov r1, #0x3
add r3, r6, #0x0
- bl FUN_02006C98
+ bl UncompressFromNarc
str r0, [r5, #0x0]
mov r2, #0x0
mov r0, #0x4b
mov r1, #0x4
add r3, r6, #0x0
str r2, [sp, #0x0]
- bl FUN_02006C98
+ bl UncompressFromNarc
str r0, [r4, #0x0]
add sp, #0x4
pop {r3-r6, pc}
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-08 04:18:14 +0000