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/script_pokemon_util.s (renamed from arm9/asm/unk_0204A01C.s)0
-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_0207FC5C.s180
-rw-r--r--arm9/asm/unk_02080C38.s2
-rw-r--r--arm9/asm/unk_020828BC.s6
-rw-r--r--arm9/asm/unk_02087A6C.s20
9 files changed, 33 insertions, 213 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_0204A01C.s b/arm9/asm/script_pokemon_util.s
index 49ac1fa6..49ac1fa6 100644
--- a/arm9/asm/unk_0204A01C.s
+++ b/arm9/asm/script_pokemon_util.s
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_0207FC5C.s b/arm9/asm/unk_0207FC5C.s
deleted file mode 100644
index b06b72e9..00000000
--- a/arm9/asm/unk_0207FC5C.s
+++ /dev/null
@@ -1,180 +0,0 @@
- .include "asm/macros.inc"
- .include "global.inc"
-
- .section .rodata
-
- .global UNK_020FB788
-UNK_020FB788: ; 0x020FB788
- .byte 0x62, 0x00, 0x00, 0x00
-
- .global UNK_020FB78C
-UNK_020FB78C: ; 0x020FB78C
- .byte 0x48, 0x00
-
- .global UNK_020FB78E
-UNK_020FB78E: ; 0x020FB78E
- .byte 0x00, 0x00
-
- .global UNK_020FB790
-UNK_020FB790: ; 0x020FB790
- .byte 0x00, 0x00
-
- .global UNK_020FB792
-UNK_020FB792: ; 0x020FB792
- .byte 0x50, 0x00, 0x4E, 0x00, 0x00, 0x00, 0x49, 0x00, 0x00, 0x00, 0x01, 0x00, 0x51, 0x00, 0x4F, 0x00
- .byte 0x00, 0x00, 0x4A, 0x00, 0x00, 0x00, 0x02, 0x00, 0x52, 0x00, 0x50, 0x00, 0x00, 0x00, 0x4B, 0x00
- .byte 0x00, 0x00, 0x03, 0x00, 0x53, 0x00, 0x51, 0x00, 0x00, 0x00, 0x4C, 0x00, 0x00, 0x00, 0x04, 0x00
- .byte 0x54, 0x00, 0x52, 0x00, 0x00, 0x00, 0x49, 0x00, 0x01, 0x00, 0x05, 0x00, 0x55, 0x00, 0x53, 0x00
- .byte 0x00, 0x00, 0x4A, 0x00, 0x01, 0x00, 0x06, 0x00, 0x56, 0x00, 0x54, 0x00, 0x00, 0x00, 0x4B, 0x00
- .byte 0x01, 0x00, 0x07, 0x00, 0x57, 0x00, 0x55, 0x00, 0x00, 0x00, 0x4C, 0x00, 0x01, 0x00, 0x08, 0x00
- .byte 0x58, 0x00, 0x56, 0x00, 0x00, 0x00, 0x49, 0x00, 0x02, 0x00, 0x09, 0x00, 0x59, 0x00, 0x57, 0x00
- .byte 0x00, 0x00, 0x4A, 0x00, 0x02, 0x00, 0x0A, 0x00, 0x5A, 0x00, 0x58, 0x00, 0x00, 0x00, 0x4B, 0x00
- .byte 0x02, 0x00, 0x0B, 0x00, 0x5B, 0x00, 0x59, 0x00, 0x00, 0x00, 0x4C, 0x00, 0x02, 0x00, 0x0C, 0x00
- .byte 0x5C, 0x00, 0x5A, 0x00, 0x00, 0x00, 0x49, 0x00, 0x03, 0x00, 0x0D, 0x00, 0x5D, 0x00, 0x5B, 0x00
- .byte 0x00, 0x00, 0x4A, 0x00, 0x03, 0x00, 0x0E, 0x00, 0x5E, 0x00, 0x5C, 0x00, 0x00, 0x00, 0x4B, 0x00
- .byte 0x03, 0x00, 0x0F, 0x00, 0x5F, 0x00, 0x5D, 0x00, 0x00, 0x00, 0x4C, 0x00, 0x03, 0x00, 0x10, 0x00
- .byte 0x60, 0x00, 0x5E, 0x00, 0x00, 0x00, 0x49, 0x00, 0x04, 0x00, 0x11, 0x00, 0x61, 0x00, 0x5F, 0x00
- .byte 0x00, 0x00, 0x4A, 0x00, 0x04, 0x00, 0x12, 0x00, 0x62, 0x00, 0x60, 0x00, 0x00, 0x00, 0x4B, 0x00
- .byte 0x04, 0x00, 0x13, 0x00, 0x63, 0x00, 0x61, 0x00, 0x00, 0x00, 0x4C, 0x00, 0x04, 0x00, 0x14, 0x00
- .byte 0x64, 0x00, 0x63, 0x00, 0x00, 0x00, 0x4E, 0x00, 0x00, 0x00, 0x15, 0x00, 0x65, 0x00, 0x64, 0x00
- .byte 0x00, 0x00, 0x4D, 0x00, 0x00, 0x00, 0x16, 0x00, 0x66, 0x00, 0x65, 0x00, 0x00, 0x00, 0x4F, 0x00
- .byte 0x01, 0x00, 0x17, 0x00, 0x67, 0x00, 0x66, 0x00, 0x00, 0x00, 0x50, 0x00, 0x02, 0x00, 0x18, 0x00
- .byte 0x68, 0x00, 0x67, 0x00, 0x00, 0x00, 0x51, 0x00, 0x01, 0x00, 0x19, 0x00, 0x00, 0x80, 0x68, 0x00
- .byte 0x00, 0x00, 0x51, 0x00, 0x03, 0x00, 0x1A, 0x00, 0x01, 0x80, 0x69, 0x00, 0x00, 0x00, 0x51, 0x00
- .byte 0x04, 0x00, 0x1B, 0x00, 0x02, 0x80, 0x6A, 0x00, 0x00, 0x00, 0x52, 0x00, 0x03, 0x00, 0x1C, 0x00
- .byte 0xB2, 0x00, 0x6B, 0x00, 0x00, 0x00, 0x52, 0x00, 0x04, 0x00, 0x1D, 0x00, 0xBE, 0x00, 0x6C, 0x00
- .byte 0x00, 0x00, 0x53, 0x00, 0x00, 0x00, 0x1E, 0x00, 0xBF, 0x00, 0x6D, 0x00, 0x00, 0x00, 0x53, 0x00
- .byte 0x01, 0x00, 0x1F, 0x00, 0xB2, 0x00, 0x19, 0x00, 0x00, 0x00, 0x58, 0x00, 0x00, 0x00, 0x20, 0x00
- .byte 0x69, 0x00, 0x7A, 0x00, 0x00, 0x00, 0x59, 0x00, 0x00, 0x00, 0x21, 0x00, 0x6A, 0x00, 0x7B, 0x00
- .byte 0x00, 0x00, 0x5A, 0x00, 0x00, 0x00, 0x22, 0x00, 0x6B, 0x00, 0x7C, 0x00, 0x00, 0x00, 0x5B, 0x00
- .byte 0x00, 0x00, 0x23, 0x00, 0x6C, 0x00, 0x7D, 0x00, 0x00, 0x00, 0x5C, 0x00, 0x00, 0x00, 0x24, 0x00
- .byte 0x6D, 0x00, 0x7E, 0x00, 0x00, 0x00, 0x59, 0x00, 0x01, 0x00, 0x25, 0x00, 0x6E, 0x00, 0x7F, 0x00
- .byte 0x00, 0x00, 0x5A, 0x00, 0x01, 0x00, 0x26, 0x00, 0x6F, 0x00, 0x80, 0x00, 0x00, 0x00, 0x5B, 0x00
- .byte 0x01, 0x00, 0x27, 0x00, 0x70, 0x00, 0x81, 0x00, 0x00, 0x00, 0x5C, 0x00, 0x01, 0x00, 0x28, 0x00
- .byte 0x71, 0x00, 0x82, 0x00, 0x00, 0x00, 0x59, 0x00, 0x02, 0x00, 0x29, 0x00, 0x72, 0x00, 0x83, 0x00
- .byte 0x00, 0x00, 0x5A, 0x00, 0x02, 0x00, 0x2A, 0x00, 0x73, 0x00, 0x84, 0x00, 0x00, 0x00, 0x5B, 0x00
- .byte 0x02, 0x00, 0x2B, 0x00, 0x74, 0x00, 0x85, 0x00, 0x00, 0x00, 0x5C, 0x00, 0x02, 0x00, 0x2C, 0x00
- .byte 0x75, 0x00, 0x86, 0x00, 0x00, 0x00, 0x59, 0x00, 0x03, 0x00, 0x2D, 0x00, 0x76, 0x00, 0x87, 0x00
- .byte 0x00, 0x00, 0x5A, 0x00, 0x03, 0x00, 0x2E, 0x00, 0x77, 0x00, 0x88, 0x00, 0x00, 0x00, 0x5B, 0x00
- .byte 0x03, 0x00, 0x2F, 0x00, 0x78, 0x00, 0x89, 0x00, 0x00, 0x00, 0x5C, 0x00, 0x03, 0x00, 0x30, 0x00
- .byte 0x79, 0x00, 0x8A, 0x00, 0x00, 0x00, 0x59, 0x00, 0x04, 0x00, 0x31, 0x00, 0x7A, 0x00, 0x8B, 0x00
- .byte 0x00, 0x00, 0x5A, 0x00, 0x04, 0x00, 0x32, 0x00, 0x7B, 0x00, 0x8C, 0x00, 0x00, 0x00, 0x5B, 0x00
- .byte 0x04, 0x00, 0x33, 0x00, 0x7C, 0x00, 0x8D, 0x00, 0x00, 0x00, 0x5C, 0x00, 0x04, 0x00, 0x34, 0x00
- .byte 0x7D, 0x00, 0x1A, 0x00, 0x00, 0x00, 0x5D, 0x00, 0x00, 0x00, 0x35, 0x00, 0x7E, 0x00, 0x1B, 0x00
- .byte 0x00, 0x00, 0x5E, 0x00, 0x00, 0x00, 0x36, 0x00, 0x7F, 0x00, 0x1C, 0x00, 0x00, 0x00, 0x5F, 0x00
- .byte 0x00, 0x00, 0x37, 0x00, 0x80, 0x00, 0x1D, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x38, 0x00
- .byte 0x81, 0x00, 0x1E, 0x00, 0x00, 0x00, 0x61, 0x00, 0x00, 0x00, 0x39, 0x00, 0x82, 0x00, 0x1F, 0x00
- .byte 0x00, 0x00, 0x62, 0x00, 0x00, 0x00, 0x3A, 0x00, 0x83, 0x00, 0x20, 0x00, 0x00, 0x00, 0x63, 0x00
- .byte 0x02, 0x00, 0x3B, 0x00, 0x84, 0x00, 0x21, 0x00, 0x00, 0x00, 0x64, 0x00, 0x00, 0x00, 0x3C, 0x00
- .byte 0x85, 0x00, 0x22, 0x00, 0x00, 0x00, 0x65, 0x00, 0x01, 0x00, 0x3D, 0x00, 0x86, 0x00, 0x23, 0x00
- .byte 0x00, 0x00, 0x66, 0x00, 0x02, 0x00, 0x3E, 0x00, 0x87, 0x00, 0x24, 0x00, 0x00, 0x00, 0x67, 0x00
- .byte 0x03, 0x00, 0x3F, 0x00, 0x88, 0x00, 0x25, 0x00, 0x00, 0x00, 0x68, 0x00, 0x00, 0x00, 0x40, 0x00
- .byte 0x89, 0x00, 0x26, 0x00, 0x00, 0x00, 0x69, 0x00, 0x02, 0x00, 0x41, 0x00, 0x8A, 0x00, 0x27, 0x00
- .byte 0x00, 0x00, 0x6A, 0x00, 0x01, 0x00, 0x42, 0x00, 0x8B, 0x00, 0x28, 0x00, 0x00, 0x00, 0x6B, 0x00
- .byte 0x03, 0x00, 0x43, 0x00, 0x8C, 0x00, 0x29, 0x00, 0x00, 0x00, 0x6C, 0x00, 0x00, 0x00, 0x44, 0x00
- .byte 0x8D, 0x00, 0x2A, 0x00, 0x00, 0x00, 0x6D, 0x00, 0x00, 0x00, 0x45, 0x00, 0x8E, 0x00, 0x2B, 0x00
- .byte 0x00, 0x00, 0x6E, 0x00, 0x01, 0x00, 0x46, 0x00, 0x8F, 0x00, 0x2C, 0x00, 0x00, 0x00, 0x6F, 0x00
- .byte 0x03, 0x00, 0x47, 0x00, 0x90, 0x00, 0x2D, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x00, 0x48, 0x00
- .byte 0x91, 0x00, 0x2E, 0x00, 0x00, 0x00, 0x71, 0x00, 0x00, 0x00, 0x49, 0x00, 0x07, 0x80, 0x2F, 0x00
- .byte 0x00, 0x00, 0x72, 0x00, 0x03, 0x00, 0x4A, 0x00, 0x08, 0x80, 0x30, 0x00, 0x00, 0x00, 0x73, 0x00
- .byte 0x01, 0x00, 0x4B, 0x00, 0x09, 0x80, 0x31, 0x00, 0x00, 0x00, 0x74, 0x00, 0x01, 0x00, 0x4C, 0x00
- .byte 0x0A, 0x80, 0x32, 0x00, 0x00, 0x00, 0x75, 0x00, 0x00, 0x00, 0x4D, 0x00, 0x0B, 0x80, 0x33, 0x00
- .byte 0x00, 0x00, 0x76, 0x00, 0x01, 0x00, 0x4E, 0x00, 0x0C, 0x80, 0x34, 0x00, 0x00, 0x00, 0x77, 0x00
- .byte 0x00, 0x00, 0x4F, 0x00, 0x0D, 0x80
-
- .text
-
- thumb_func_start FUN_0207FC5C
-FUN_0207FC5C: ; 0x0207FC5C
- cmp r1, #0x4
- bhi _0207FCA8
- add r1, r1, r1
- add r1, pc
- ldrh r1, [r1, #0x6]
- lsl r1, r1, #0x10
- asr r1, r1, #0x10
- add pc, r1
-_0207FC6C: ; jump table (using 16-bit offset)
- .short _0207FC76 - _0207FC6C - 2; case 0
- .short _0207FC80 - _0207FC6C - 2; case 1
- .short _0207FC8A - _0207FC6C - 2; case 2
- .short _0207FC94 - _0207FC6C - 2; case 3
- .short _0207FC9E - _0207FC6C - 2; case 4
-_0207FC76:
- mov r1, #0xc
- mul r1, r0
- ldr r0, _0207FCAC ; =UNK_020FB788
- ldr r0, [r0, r1]
- bx lr
-_0207FC80:
- mov r1, #0xc
- mul r1, r0
- ldr r0, _0207FCB0 ; =UNK_020FB78C
- ldrh r0, [r0, r1]
- bx lr
-_0207FC8A:
- mov r1, #0xc
- mul r1, r0
- ldr r0, _0207FCB4 ; =UNK_020FB78E
- ldrh r0, [r0, r1]
- bx lr
-_0207FC94:
- mov r1, #0xc
- mul r1, r0
- ldr r0, _0207FCB8 ; =UNK_020FB790
- ldrh r0, [r0, r1]
- bx lr
-_0207FC9E:
- mov r1, #0xc
- mul r1, r0
- ldr r0, _0207FCBC ; =UNK_020FB792
- ldrh r0, [r0, r1]
- bx lr
-_0207FCA8:
- mov r0, #0x0
- bx lr
- .balign 4
-_0207FCAC: .word UNK_020FB788
-_0207FCB0: .word UNK_020FB78C
-_0207FCB4: .word UNK_020FB78E
-_0207FCB8: .word UNK_020FB790
-_0207FCBC: .word UNK_020FB792
-
- thumb_func_start FUN_0207FCC0
-FUN_0207FCC0: ; 0x0207FCC0
- mov r2, #0xc
- mul r2, r1
- ldr r1, _0207FCDC ; =UNK_020FB792
- ldrh r2, [r1, r2]
- mov r1, #0x2
- lsl r1, r1, #0xe
- tst r1, r2
- beq _0207FCD8
- lsl r1, r2, #0x18
- lsr r1, r1, #0x18
- ldrb r2, [r0, r1]
- add r2, #0x92
-_0207FCD8:
- add r0, r2, #0x0
- bx lr
- .balign 4
-_0207FCDC: .word UNK_020FB792
-
- thumb_func_start FUN_0207FCE0
-FUN_0207FCE0: ; 0x0207FCE0
- mov r1, #0xc
- mul r1, r0
- ldr r0, _0207FCFC ; =UNK_020FB792
- ldrh r1, [r0, r1]
- mov r0, #0x2
- lsl r0, r0, #0xe
- tst r0, r1
- beq _0207FCF6
- lsl r0, r1, #0x18
- lsr r0, r0, #0x18
- bx lr
-_0207FCF6:
- mov r0, #0xff
- bx lr
- nop
-_0207FCFC: .word UNK_020FB792
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-06-05 10:59:05 +0000