summaryrefslogtreecommitdiff
path: root/arm9/modules
diff options
context:
space:
mode:
Diffstat (limited to 'arm9/modules')
-rw-r--r--arm9/modules/05/asm/module_05.s2
-rw-r--r--arm9/modules/06/asm/module_06.s4
-rw-r--r--arm9/modules/07/asm/module_07.s16
-rw-r--r--arm9/modules/11/asm/module_11_thumb2.s2
-rw-r--r--arm9/modules/15/asm/module_15.s4
-rw-r--r--arm9/modules/18/asm/module_18.s6
-rw-r--r--arm9/modules/51/asm/module_51.s4
-rw-r--r--arm9/modules/55/asm/module_55.s8
-rw-r--r--arm9/modules/56/asm/module_56.s4
-rw-r--r--arm9/modules/57/asm/module_57.s2
-rw-r--r--arm9/modules/67/asm/module_67.s8
-rw-r--r--arm9/modules/69/asm/module_69.s6
-rw-r--r--arm9/modules/71/asm/module_71.s2
-rw-r--r--arm9/modules/74/asm/module_74.s2
-rw-r--r--arm9/modules/80/asm/module_80.s2
-rw-r--r--arm9/modules/83/asm/module_83.s14
16 files changed, 43 insertions, 43 deletions
diff --git a/arm9/modules/05/asm/module_05.s b/arm9/modules/05/asm/module_05.s
index f1fdbbd0..f525e8c6 100644
--- a/arm9/modules/05/asm/module_05.s
+++ b/arm9/modules/05/asm/module_05.s
@@ -27128,7 +27128,7 @@ _021EFF2E:
bl FUN_020283A4
add r1, r0, #0
ldr r0, [r5, #8]
- bl FUN_02021E28
+ bl CopyU16ArrayToString
ldr r0, [r5]
ldr r1, [r5, #8]
add r2, r4, #0
diff --git a/arm9/modules/06/asm/module_06.s b/arm9/modules/06/asm/module_06.s
index 950b8916..f74e8b93 100644
--- a/arm9/modules/06/asm/module_06.s
+++ b/arm9/modules/06/asm/module_06.s
@@ -22563,7 +22563,7 @@ MOD06_02244820: ; 0x02244820
add r4, r0, #0
add r1, r5, #0
mov r2, #8
- bl FUN_02021EF0
+ bl CopyStringToU16Array
add r0, r4, #0
bl String_dtor
add r0, r7, #0
@@ -31009,7 +31009,7 @@ _0224886C:
add r5, r0, #0
add r1, sp, #4
mov r2, #0x80
- bl FUN_02021EF0
+ bl CopyStringToU16Array
add r0, r5, #0
bl String_dtor
ldr r0, [r4, #8]
diff --git a/arm9/modules/07/asm/module_07.s b/arm9/modules/07/asm/module_07.s
index 5eca8548..fd5e5c2a 100644
--- a/arm9/modules/07/asm/module_07.s
+++ b/arm9/modules/07/asm/module_07.s
@@ -5062,7 +5062,7 @@ MOD07_02214720: ; 0x02214720
ldr r0, [r0, #0x14]
add r1, r5, #0
mov r2, #8
- bl FUN_02021EF0
+ bl CopyStringToU16Array
ldr r1, [sp, #0x10]
ldr r3, [r4, #0x24]
add r0, r5, #0
@@ -5114,7 +5114,7 @@ _022147BC:
ldr r0, [r0, #0x14]
add r1, r5, #0
mov r2, #8
- bl FUN_02021EF0
+ bl CopyStringToU16Array
ldr r1, [sp, #0x14]
ldr r3, [r4, #0x24]
add r0, r5, #0
@@ -5147,7 +5147,7 @@ _02214808:
ldr r0, [r0, #0x14]
add r1, r5, #0
mov r2, #8
- bl FUN_02021EF0
+ bl CopyStringToU16Array
ldr r1, [sp, #0x18]
ldr r3, [r4, #0x24]
add r0, r5, #0
@@ -5180,7 +5180,7 @@ _02214854:
ldr r0, [r0, #0x14]
add r1, r5, #0
mov r2, #8
- bl FUN_02021EF0
+ bl CopyStringToU16Array
ldr r1, [sp, #0x1c]
ldr r3, [r4, #0x24]
add r0, r5, #0
@@ -5215,11 +5215,11 @@ _022148A0:
ldr r0, [r4, #0x18]
add r1, r5, #0
mov r2, #8
- bl FUN_02021EF0
+ bl CopyStringToU16Array
ldr r0, [r4, #0x20]
add r1, r7, #0
mov r2, #8
- bl FUN_02021EF0
+ bl CopyStringToU16Array
b _02214914
_022148EA:
add r0, #0x29
@@ -5234,11 +5234,11 @@ _022148EA:
ldr r0, [r4, #0x14]
add r1, r5, #0
mov r2, #8
- bl FUN_02021EF0
+ bl CopyStringToU16Array
ldr r0, [r4, #0x1c]
add r1, r7, #0
mov r2, #8
- bl FUN_02021EF0
+ bl CopyStringToU16Array
_02214914:
str r6, [sp]
ldr r0, [r4, #0x24]
diff --git a/arm9/modules/11/asm/module_11_thumb2.s b/arm9/modules/11/asm/module_11_thumb2.s
index 9901427c..f080d018 100644
--- a/arm9/modules/11/asm/module_11_thumb2.s
+++ b/arm9/modules/11/asm/module_11_thumb2.s
@@ -41251,7 +41251,7 @@ _022435DC:
add r4, #0x36
add r0, r3, #0
add r1, r4, #0
- bl FUN_02021E28
+ bl CopyU16ArrayToString
b _02243798
_022435E8:
ldr r0, [r4, #0x4c]
diff --git a/arm9/modules/15/asm/module_15.s b/arm9/modules/15/asm/module_15.s
index 5639bd70..07d6e961 100644
--- a/arm9/modules/15/asm/module_15.s
+++ b/arm9/modules/15/asm/module_15.s
@@ -5041,7 +5041,7 @@ _021D9B9C:
ldr r0, [sp]
mov r1, ip
add r2, r2, #1
- bl FUN_02021E8C
+ bl CopyU16ArrayToStringN
mov r0, #0
pop {r3, r4, r5, r6, r7, pc}
_021D9BB6:
@@ -8617,7 +8617,7 @@ _021DB782:
add r1, r2, r1
add r0, r5, #0
mov r2, #2
- bl FUN_02021E8C
+ bl CopyU16ArrayToStringN
pop {r3, r4, r5, pc}
.align 2, 0
_021DB794: .word MOD15_021DBA4C
diff --git a/arm9/modules/18/asm/module_18.s b/arm9/modules/18/asm/module_18.s
index 673ceb02..a604a281 100644
--- a/arm9/modules/18/asm/module_18.s
+++ b/arm9/modules/18/asm/module_18.s
@@ -23489,7 +23489,7 @@ MOD18_02244BB4: ; 0x02244BB4
add r1, r5, #0
add r1, #0x94
mov r2, #0x50
- bl FUN_02021EF0
+ bl CopyStringToU16Array
add r0, r5, #0
add r0, #0x94
ldrh r2, [r0]
@@ -23542,7 +23542,7 @@ _02244C14:
add r1, r5, #0
ldr r0, [r0]
add r1, #0x94
- bl FUN_02021E28
+ bl CopyU16ArrayToString
add r0, r5, #0
add r0, #0x88
add r1, r6, #1
@@ -23550,7 +23550,7 @@ _02244C14:
add r5, #0x94
lsl r1, r1, #1
add r1, r5, r1
- bl FUN_02021E28
+ bl CopyU16ArrayToString
mov r0, #2
pop {r3, r4, r5, r6, r7, pc}
nop
diff --git a/arm9/modules/51/asm/module_51.s b/arm9/modules/51/asm/module_51.s
index e41127d5..5e3f79d8 100644
--- a/arm9/modules/51/asm/module_51.s
+++ b/arm9/modules/51/asm/module_51.s
@@ -1569,7 +1569,7 @@ _0225548C:
bl FUN_020254F0
add r1, r0, #0
add r0, r4, #0
- bl FUN_02021E28
+ bl CopyU16ArrayToString
add r0, r6, #0
add r1, r5, #0
bl FUN_020254F8
@@ -1647,7 +1647,7 @@ _02255530:
mov r0, #0x1c
mul r0, r2
ldr r0, [r4, r0]
- bl FUN_02021E28
+ bl CopyU16ArrayToString
ldr r0, [r5]
mov r1, #0x1c
add r2, r0, #0
diff --git a/arm9/modules/55/asm/module_55.s b/arm9/modules/55/asm/module_55.s
index c33392ec..a59e1058 100644
--- a/arm9/modules/55/asm/module_55.s
+++ b/arm9/modules/55/asm/module_55.s
@@ -1967,7 +1967,7 @@ MOD55_021D84C8: ; 0x021D84C8
add r0, #0xd8
ldr r0, [r0]
add r1, sp, #4
- bl FUN_02021C38
+ bl String_atoi
str r0, [sp]
ldr r0, [sp, #4]
add r7, r1, #0
@@ -2081,7 +2081,7 @@ _021D85B2:
add r0, #0xd8
ldr r0, [r0]
add r1, sp, #8
- bl FUN_02021C38
+ bl String_atoi
add r7, r0, #0
ldr r0, [sp, #4]
add r6, r1, #0
@@ -2689,7 +2689,7 @@ _021D8A46:
bl FUN_020283A4
add r1, r0, #0
ldr r0, [r5, #0x38]
- bl FUN_02021E28
+ bl CopyU16ArrayToString
ldr r0, [sp]
add r1, r4, #1
add r0, r0, r6
@@ -5090,7 +5090,7 @@ MOD55_021D9E40: ; 0x021D9E40
bne _021D9EB8
ldr r0, [r0, #0x18]
add r1, r5, #0
- bl FUN_02021E28
+ bl CopyU16ArrayToString
b _021D9EBE
_021D9EB8:
ldr r0, [r0, #0x18]
diff --git a/arm9/modules/56/asm/module_56.s b/arm9/modules/56/asm/module_56.s
index bcdd979e..9144e290 100644
--- a/arm9/modules/56/asm/module_56.s
+++ b/arm9/modules/56/asm/module_56.s
@@ -795,7 +795,7 @@ _02212456:
add r0, r5, #0
add r0, #0xd4
ldr r0, [r0]
- bl FUN_02021E28
+ bl CopyU16ArrayToString
add r4, r4, #1
add r5, r5, #4
cmp r4, #0x20
@@ -2872,7 +2872,7 @@ _022134F2:
mov r0, #0x56
lsl r0, r0, #2
ldr r0, [r4, r0]
- bl FUN_02021E28
+ bl CopyU16ArrayToString
b _022135DC
_0221350C:
add r0, r4, #0
diff --git a/arm9/modules/57/asm/module_57.s b/arm9/modules/57/asm/module_57.s
index d9ccb89e..22452327 100644
--- a/arm9/modules/57/asm/module_57.s
+++ b/arm9/modules/57/asm/module_57.s
@@ -2819,7 +2819,7 @@ _021D8AE0:
add r1, r6, #0
add r0, r5, #0
add r1, #8
- bl FUN_02021E28
+ bl CopyU16ArrayToString
add r0, r7, #0
mov r2, #0
add r0, #0x10
diff --git a/arm9/modules/67/asm/module_67.s b/arm9/modules/67/asm/module_67.s
index 081effc0..3c03a849 100644
--- a/arm9/modules/67/asm/module_67.s
+++ b/arm9/modules/67/asm/module_67.s
@@ -1692,7 +1692,7 @@ _021D822A:
mov r3, #0x2a
bl ReadMsgData_NewNarc_NewString
add r6, r0, #0
- bl FUN_02021D3C
+ bl StringGetLength
add r5, r0, #0
add r0, r6, #0
bl String_dtor
@@ -1717,7 +1717,7 @@ _021D822A:
add r2, r6, #0
bl FUN_0200B7B8
ldr r0, [r4, #0x58]
- bl FUN_02021D3C
+ bl StringGetLength
add r5, r5, r0
add r0, r6, #0
bl String_dtor
@@ -1732,7 +1732,7 @@ _021D828A:
mov r3, #0x2a
bl ReadMsgData_NewNarc_NewString
add r6, r0, #0
- bl FUN_02021D3C
+ bl StringGetLength
add r5, r5, r0
add r0, r6, #0
bl String_dtor
@@ -3503,7 +3503,7 @@ MOD67_021D9098: ; 0x021D9098
bl String_ctor
add r1, r6, #0
add r4, r0, #0
- bl FUN_02021E28
+ bl CopyU16ArrayToString
mov r0, #1
str r0, [sp]
mov r0, #2
diff --git a/arm9/modules/69/asm/module_69.s b/arm9/modules/69/asm/module_69.s
index a6cd9d90..c21637a9 100644
--- a/arm9/modules/69/asm/module_69.s
+++ b/arm9/modules/69/asm/module_69.s
@@ -2307,7 +2307,7 @@ MOD69_0222E89C: ; 0x0222E89C
add r5, r0, #0
ldr r0, [r5, #0x1c]
add r4, r1, #0
- bl FUN_02021D5C
+ bl StringCountLines
mov r6, #0
str r0, [sp, #0x10]
cmp r0, #0
@@ -2316,7 +2316,7 @@ _0222E8B2:
ldr r0, [r5, #0x18]
ldr r1, [r5, #0x1c]
add r2, r6, #0
- bl FUN_02021D9C
+ bl StringGetLineN
mov r0, #0
ldr r1, [r5, #0x18]
add r2, r0, #0
@@ -4094,7 +4094,7 @@ _0222F726:
ldr r0, [r5, r1]
add r1, r1, #4
ldr r1, [r5, r1]
- bl FUN_02021CE0
+ bl StringCompare
cmp r0, #0
beq _0222F750
mov r5, #2
diff --git a/arm9/modules/71/asm/module_71.s b/arm9/modules/71/asm/module_71.s
index 111546a5..b60cc139 100644
--- a/arm9/modules/71/asm/module_71.s
+++ b/arm9/modules/71/asm/module_71.s
@@ -4433,7 +4433,7 @@ _0222FA60:
bl FUN_020283A4
add r1, r0, #0
add r0, r6, #0
- bl FUN_02021E28
+ bl CopyU16ArrayToString
ldr r0, _0222FAD0 ; =0x0000367C
add r1, r6, #0
ldr r0, [r5, r0]
diff --git a/arm9/modules/74/asm/module_74.s b/arm9/modules/74/asm/module_74.s
index 5487f6ef..743c4a76 100644
--- a/arm9/modules/74/asm/module_74.s
+++ b/arm9/modules/74/asm/module_74.s
@@ -1298,7 +1298,7 @@ _021D7EB8:
b _021D7F0C
_021D7F06:
add r1, r6, #0
- bl FUN_02021E28
+ bl CopyU16ArrayToString
_021D7F0C:
ldr r0, [sp, #4]
add r4, #0x10
diff --git a/arm9/modules/80/asm/module_80.s b/arm9/modules/80/asm/module_80.s
index f346f404..83c24108 100644
--- a/arm9/modules/80/asm/module_80.s
+++ b/arm9/modules/80/asm/module_80.s
@@ -5013,7 +5013,7 @@ MOD80_0222FD28: ; 0x0222FD28
add r6, r0, #0
add r0, r4, #0
add r1, r7, #0
- bl FUN_02021E28
+ bl CopyU16ArrayToString
mov r2, #0
ldr r0, _0222FD84 ; =0x000F0200
str r2, [sp]
diff --git a/arm9/modules/83/asm/module_83.s b/arm9/modules/83/asm/module_83.s
index 1824f32f..bece508d 100644
--- a/arm9/modules/83/asm/module_83.s
+++ b/arm9/modules/83/asm/module_83.s
@@ -3361,7 +3361,7 @@ MOD83_0222F074: ; 0x0222F074
add r7, r0, #0
add r1, r4, r1
mov r2, #0x24
- bl FUN_02021EF0
+ bl CopyStringToU16Array
add r0, r7, #0
bl String_dtor
mov r0, #0xc
@@ -3418,7 +3418,7 @@ MOD83_0222F074: ; 0x0222F074
lsl r1, r1, #2
add r1, r4, r1
mov r2, #0xfa
- bl FUN_02021EF0
+ bl CopyStringToU16Array
add r0, r7, #0
bl String_dtor
mov r0, #0xd2
@@ -6052,7 +6052,7 @@ MOD83_022305A4: ; 0x022305A4
add r1, r6, #0
mov r2, #0x24
add r4, r0, #0
- bl FUN_02021E8C
+ bl CopyU16ArrayToStringN
mov r0, #0
mov r1, #6
bl FUN_02002E4C
@@ -8557,7 +8557,7 @@ MOD83_02231A4C: ; 0x02231A4C
lsl r1, r1, #2
add r1, r2, r1
mov r2, #0x24
- bl FUN_02021E8C
+ bl CopyU16ArrayToStringN
mov r3, #0
str r3, [sp]
mov r0, #0xff
@@ -8713,7 +8713,7 @@ MOD83_02231B84: ; 0x02231B84
lsl r1, r1, #2
add r1, r2, r1
mov r2, #0xfa
- bl FUN_02021E8C
+ bl CopyU16ArrayToStringN
mov r3, #0
str r3, [sp]
mov r0, #0xff
@@ -15576,7 +15576,7 @@ _02235004:
ldr r1, [r5, #0x38]
add r7, r0, #0
mov r2, #0x40
- bl FUN_02021E8C
+ bl CopyU16ArrayToStringN
add r0, r5, #0
add r1, r7, #0
add r2, r4, #0
@@ -18164,7 +18164,7 @@ MOD83_02236484: ; 0x02236484
bl String_ctor
add r1, sp, #8
add r6, r0, #0
- bl FUN_02021E28
+ bl CopyU16ArrayToString
mov r1, #1
str r1, [sp]
mov r0, #2
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-03 18:47:37 +0000