summaryrefslogtreecommitdiff
path: root/arm9/modules
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2020-08-10 10:11:48 -0400
committerPikalaxALT <pikalaxalt@gmail.com>2020-08-10 10:11:48 -0400
commitf17073efa07f1ee054dd6ab1fdd2c5ce35dbf27a (patch)
tree1faccb9341907667d84fa2cda0ad226b68ad3f40 /arm9/modules
parentc259e6ed18294c001033fed62d924d379276021a (diff)
Name some symbols in scrcmd space
Diffstat (limited to 'arm9/modules')
-rw-r--r--arm9/modules/05/asm/mod05_021E1AD8.s14
-rw-r--r--arm9/modules/05/asm/module_05.s6
-rw-r--r--arm9/modules/06/asm/module_06.s68
-rw-r--r--arm9/modules/07/asm/module_07.s8
-rw-r--r--arm9/modules/09/asm/module_09.s88
-rw-r--r--arm9/modules/11/asm/module_11_thumb2.s24
-rw-r--r--arm9/modules/12/asm/module_12.s10
-rw-r--r--arm9/modules/14/asm/module_14.s2
-rw-r--r--arm9/modules/15/asm/module_15.s2
-rw-r--r--arm9/modules/17/asm/module_17.s10
-rw-r--r--arm9/modules/18/asm/module_18.s32
-rw-r--r--arm9/modules/53/asm/module_53.s2
-rw-r--r--arm9/modules/54/asm/module_54.s2
-rw-r--r--arm9/modules/55/asm/module_55.s24
-rw-r--r--arm9/modules/56/asm/module_56.s16
-rw-r--r--arm9/modules/57/asm/module_57.s12
-rw-r--r--arm9/modules/58/asm/module_58.s2
-rw-r--r--arm9/modules/59/asm/module_59.s2
-rw-r--r--arm9/modules/65/asm/module_65.s10
-rw-r--r--arm9/modules/67/asm/module_67.s72
-rw-r--r--arm9/modules/68/asm/module_68.s4
-rw-r--r--arm9/modules/69/asm/module_69.s8
-rw-r--r--arm9/modules/70/asm/module_70.s4
-rw-r--r--arm9/modules/73/asm/module_73.s12
-rw-r--r--arm9/modules/74/asm/module_74.s12
-rw-r--r--arm9/modules/75/asm/module_75.s46
-rw-r--r--arm9/modules/76/asm/module_76.s4
-rw-r--r--arm9/modules/77/asm/module_77.s2
-rw-r--r--arm9/modules/80/asm/module_80.s10
-rw-r--r--arm9/modules/81/asm/module_81.s8
-rw-r--r--arm9/modules/82/asm/module_82.s4
-rw-r--r--arm9/modules/86/asm/module_86.s2
32 files changed, 261 insertions, 261 deletions
diff --git a/arm9/modules/05/asm/mod05_021E1AD8.s b/arm9/modules/05/asm/mod05_021E1AD8.s
index 8dba7426..75dbdcd9 100644
--- a/arm9/modules/05/asm/mod05_021E1AD8.s
+++ b/arm9/modules/05/asm/mod05_021E1AD8.s
@@ -340,7 +340,7 @@ MOD05_021E1D38: ; 0x021E1D38
ldr r0, [r0]
ldr r1, [r1, #0x1c]
add r2, r4, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
add r0, r5, #0
add r0, #0x9b
ldrb r2, [r0]
@@ -782,7 +782,7 @@ MOD05_021E2094: ; 0x021E2094
ldr r0, [r0]
ldr r1, [r1, #0x1c]
add r2, r6, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
add r0, r5, #0
add r0, #0x9b
ldrb r1, [r0]
@@ -1201,7 +1201,7 @@ MOD05_021E23D0: ; 0x021E23D0
ldr r0, [r0]
add r1, r6, #0
add r2, r4, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
mov r3, #0
str r3, [sp]
str r7, [sp, #4]
@@ -1373,7 +1373,7 @@ MOD05_021E2540: ; 0x021E2540
ldr r0, [r0]
add r1, r6, #0
add r2, r4, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
str r7, [sp]
mov r0, #0xff
str r0, [sp, #4]
@@ -1840,7 +1840,7 @@ MOD05_021E28A0: ; 0x021E28A0
ldr r2, [sp, #0x10]
add r0, r6, #0
add r1, r4, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
mov r0, #0
add r1, r4, #0
add r2, r0, #0
@@ -1968,7 +1968,7 @@ MOD05_021E29C8: ; 0x021E29C8
ldr r2, [sp, #0x10]
add r0, r5, #0
add r1, r4, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
mov r0, #0
add r1, r4, #0
add r2, r0, #0
@@ -2088,7 +2088,7 @@ MOD05_021E2AD4: ; 0x021E2AD4
ldr r2, [sp, #0x10]
add r0, r5, #0
add r1, r4, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
mov r0, #0
add r1, r4, #0
add r2, r0, #0
diff --git a/arm9/modules/05/asm/module_05.s b/arm9/modules/05/asm/module_05.s
index 6e557880..c3d8b34d 100644
--- a/arm9/modules/05/asm/module_05.s
+++ b/arm9/modules/05/asm/module_05.s
@@ -311,7 +311,7 @@ MOD05_021E2DD4: ; 0x021E2DD4
ldr r0, [r4, #8]
ldr r1, [r4]
ldr r2, [r4, #4]
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
pop {r4, pc}
.balign 4, 0
@@ -27473,7 +27473,7 @@ _021F0204:
ldr r0, [r4, #0x38]
ldr r1, [r4, #0xc]
ldr r2, [r4, #8]
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
ldr r0, [r4, #0x30]
add r1, r4, #0
ldr r0, [r0, #8]
@@ -40043,7 +40043,7 @@ MOD05_021F6140: ; 0x021F6140
ldr r0, [r5, #0x34]
ldr r1, [r5, #0x2c]
ldr r2, [r5, #0x30]
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
ldr r0, [r4, #0xc]
bl LoadPlayerDataAddress
add r2, r0, #0
diff --git a/arm9/modules/06/asm/module_06.s b/arm9/modules/06/asm/module_06.s
index 485937c9..349d6008 100644
--- a/arm9/modules/06/asm/module_06.s
+++ b/arm9/modules/06/asm/module_06.s
@@ -9418,7 +9418,7 @@ MOD06_0223DE34: ; 0x0223DE34
ldr r0, [r0]
add r1, r4, #0
add r2, r6, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
mov r0, #0
add r1, r4, #0
add r2, r0, #0
@@ -9522,7 +9522,7 @@ _0223DF30:
ldr r0, [r0]
add r1, r4, #0
add r2, r7, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
mov r0, #0
add r1, r4, #0
add r2, r0, #0
@@ -9679,7 +9679,7 @@ _0223E034:
ldr r0, [r0]
ldr r1, [r5, r1]
add r2, r4, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
add r0, r4, #0
bl String_dtor
mov r2, #0x23
@@ -9734,7 +9734,7 @@ _0223E124:
ldr r0, [r0]
ldr r1, [r5, r1]
add r2, r4, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
add r0, r4, #0
bl String_dtor
mov r2, #0x23
@@ -9864,7 +9864,7 @@ _0223E214:
ldr r0, [r0]
add r1, r6, #0
add r2, r7, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
mov r1, #0
str r1, [sp]
mov r0, #0xff
@@ -10072,7 +10072,7 @@ _0223E418:
ldr r0, [r0]
ldr r1, [r4, r1]
add r2, r5, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
add r0, r5, #0
bl String_dtor
mov r2, #0x23
@@ -10137,7 +10137,7 @@ _0223E450:
ldr r0, [r0]
ldr r1, [r4, r1]
add r2, r5, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
add r0, r5, #0
bl String_dtor
mov r2, #0x23
@@ -10204,7 +10204,7 @@ _0223E50A:
ldr r0, [r0]
add r1, r4, #0
add r2, r6, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
mov r0, #8
str r0, [sp]
mov r0, #0xff
@@ -10244,7 +10244,7 @@ _0223E50A:
ldr r0, [r0]
add r1, r4, #0
add r2, r7, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
mov r0, #0
add r1, r4, #0
add r2, r0, #0
@@ -10423,7 +10423,7 @@ _0223E704:
ldr r0, [r0]
ldr r1, [r5, r1]
add r2, r4, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
add r0, r4, #0
bl String_dtor
add r0, r5, #0
@@ -10638,7 +10638,7 @@ _0223E88A:
ldr r0, [r0]
ldr r1, [r5, r1]
add r2, r4, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
add r0, r4, #0
bl String_dtor
add r0, r5, #0
@@ -10880,7 +10880,7 @@ _0223EA74:
ldr r0, [r0]
ldr r1, [r5, r1]
add r2, r4, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
add r0, r4, #0
bl String_dtor
mov r2, #0x23
@@ -10941,7 +10941,7 @@ MOD06_0223EB2C: ; 0x0223EB2C
ldr r0, [r0]
ldr r1, [r4, r1]
add r2, r6, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
add r0, r6, #0
bl String_dtor
add r1, r4, #0
@@ -11223,7 +11223,7 @@ _0223ED66:
ldr r0, [r0]
ldr r1, [r5, r1]
add r2, r4, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
add r0, r4, #0
bl String_dtor
mov r2, #0x23
@@ -11272,7 +11272,7 @@ _0223EDE6:
ldr r0, [r2, #0x58]
ldr r1, [r2, #0x14]
ldr r2, [r2, #0x10]
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
b _0223EE16
_0223EE08:
ldr r0, _0223EE70 ; =0x02252420
@@ -11718,7 +11718,7 @@ _0223F11A:
ldr r2, [r0]
ldr r0, [r2, #0x50]
ldmia r2!, {r1, r2}
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
ldr r0, _0223F26C ; =0x02252420
mov r1, #0
ldr r2, [r0]
@@ -11758,7 +11758,7 @@ _0223F11A:
ldr r0, [r2, #0x50]
ldr r1, [r2, #8]
ldr r2, [r2, #0xc]
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
ldr r0, _0223F26C ; =0x02252420
mov r1, #0
ldr r2, [r0]
@@ -11794,7 +11794,7 @@ _0223F21C:
ldr r2, [r0]
ldr r0, [r2, #0x50]
ldmia r2!, {r1, r2}
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
ldr r0, _0223F26C ; =0x02252420
mov r1, #0
ldr r2, [r0]
@@ -11947,7 +11947,7 @@ MOD06_0223F344: ; 0x0223F344
ldr r0, [r2, #0x54]
ldr r1, [r2, #0x1c]
ldr r2, [r2, #0x18]
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
ldr r0, _0223F3B4 ; =0x02252420
mov r3, #2
ldr r2, [r0]
@@ -12001,7 +12001,7 @@ _0223F3E0:
ldr r2, [r4]
ldr r0, [r2, #0x50]
ldmia r2!, {r1, r2}
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
ldr r1, [r4]
mov r2, #0
ldr r0, [r1, #0x64]
@@ -12480,7 +12480,7 @@ _0223F7E0:
ldr r2, [r0]
ldr r0, [r2, #0x50]
ldmia r2!, {r1, r2}
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
ldr r0, _0223F898 ; =0x02252420
lsl r4, r4, #4
ldr r2, [r0]
@@ -12518,7 +12518,7 @@ _0223F7E0:
ldr r0, [r2, #0x50]
ldr r1, [r2, #8]
ldr r2, [r2, #0xc]
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
ldr r0, _0223F898 ; =0x02252420
mov r1, #0
ldr r2, [r0]
@@ -12739,7 +12739,7 @@ _0223FA02:
ldr r0, [r2, #0x54]
ldr r1, [r2, #0x18]
ldr r2, [r2, #0x1c]
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
ldr r0, _0223FA5C ; =0x02252420
mov r3, #2
ldr r2, [r0]
@@ -14500,7 +14500,7 @@ _022408A6:
ldr r0, [r5, #0x64]
ldr r1, [r5, #0x18]
ldr r2, [r5, #0x14]
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
ldr r0, [r5, #0x10]
ldr r0, [r0, #0xc]
bl LoadPlayerDataAddress
@@ -14621,7 +14621,7 @@ _02240998:
ldr r0, [r5, #0x64]
ldr r1, [r5, #0x20]
ldr r2, [r5, #0x1c]
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
ldr r0, [r5, #8]
ldr r1, [r5, #0x20]
add r2, r4, #0
@@ -15006,7 +15006,7 @@ MOD06_02240C58: ; 0x02240C58
ldr r1, [sp, #0x28]
ldr r2, [sp, #0x2c]
add r0, r5, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
mov r1, #0
str r1, [sp]
mov r0, #0xff
@@ -15223,7 +15223,7 @@ _02240E8C:
ldr r1, [sp, #0x28]
ldr r2, [sp, #0x2c]
add r0, r5, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
mov r0, #0
ldr r1, [sp, #0x28]
add r2, r0, #0
@@ -19488,7 +19488,7 @@ MOD06_02243080: ; 0x02243080
ldr r0, [r5, #0x58]
add r1, r6, #0
add r2, r4, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
mov r3, #0
str r3, [sp]
add r5, #0x14
@@ -40909,7 +40909,7 @@ MOD06_0224D46C: ; 0x0224D46C
ldr r0, [r4, #0x14]
add r1, r6, #0
add r2, r5, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
add r0, r6, #0
mov r1, #0
mov r2, #1
@@ -41040,7 +41040,7 @@ _0224D60C:
ldr r0, [r4, #0x14]
ldr r2, [sp, #0x2c]
add r1, r6, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
mov r3, #4
ldrsh r3, [r5, r3]
add r0, r6, #0
@@ -41950,7 +41950,7 @@ MOD06_0224DD50: ; 0x0224DD50
ldr r1, [sp, #0xc]
ldr r2, [sp, #0x10]
add r0, r6, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
ldr r0, [sp, #8]
ldr r1, [sp, #0xc]
add r2, r7, #0
@@ -42010,7 +42010,7 @@ MOD06_0224DDD8: ; 0x0224DDD8
ldr r1, [sp, #0xc]
ldr r2, [sp, #0x10]
add r0, r6, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
ldr r0, [sp, #8]
ldr r1, [sp, #0xc]
add r2, r7, #0
@@ -42155,7 +42155,7 @@ _0224DF64:
ldr r0, [r5, #8]
ldr r1, [r5, #0xc]
ldr r2, [r6, #0x10]
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
mov r1, #0
str r4, [sp]
mov r0, #0xff
@@ -42266,7 +42266,7 @@ _0224E034:
ldr r0, [r5, r0]
ldr r1, [r5, r1]
ldr r2, [sp, #0x1c]
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
mov r0, #0x4a
lsl r0, r0, #2
ldr r0, [r5, r0]
diff --git a/arm9/modules/07/asm/module_07.s b/arm9/modules/07/asm/module_07.s
index 11506c14..2b139a82 100644
--- a/arm9/modules/07/asm/module_07.s
+++ b/arm9/modules/07/asm/module_07.s
@@ -4511,7 +4511,7 @@ _022142BE:
ldr r0, [sp, #0x14]
ldr r2, [sp, #0x20]
add r1, r6, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
ldr r0, [sp, #0x20]
bl String_dtor
mov r1, #0
@@ -4625,7 +4625,7 @@ MOD07_0221437C: ; 0x0221437C
ldr r0, [sp, #0x10]
ldr r1, [sp, #0x28]
add r2, r7, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
add r0, r7, #0
bl String_dtor
mov r1, #0
@@ -4682,7 +4682,7 @@ MOD07_022143FC: ; 0x022143FC
ldr r0, [sp, #0x18]
ldr r2, [sp, #0x20]
add r1, r4, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
ldr r0, [sp, #0x20]
bl String_dtor
mov r0, #0
@@ -4746,7 +4746,7 @@ MOD07_022143FC: ; 0x022143FC
ldr r0, [sp, #0x18]
add r1, r4, #0
add r2, r5, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
add r0, r5, #0
bl String_dtor
mov r1, #0
diff --git a/arm9/modules/09/asm/module_09.s b/arm9/modules/09/asm/module_09.s
index 882a9e27..115ee3cb 100644
--- a/arm9/modules/09/asm/module_09.s
+++ b/arm9/modules/09/asm/module_09.s
@@ -3480,7 +3480,7 @@ MOD09_022139D4: ; 0x022139D4
ldr r0, [r5, r1]
add r1, r1, #4
ldr r1, [r5, r1]
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
add r0, r4, #0
bl String_dtor
mov r0, #0
@@ -3506,7 +3506,7 @@ _02213A30:
ldr r0, [r5, r1]
add r1, r1, #4
ldr r1, [r5, r1]
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
add r0, r6, #0
bl String_dtor
mov r0, #0
@@ -3541,7 +3541,7 @@ _02213A82:
ldr r0, [r5, r1]
add r1, r1, #4
ldr r1, [r5, r1]
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
add r0, r6, #0
bl String_dtor
mov r0, #0
@@ -3590,7 +3590,7 @@ _02213AD4:
ldr r0, [r5, r1]
add r1, r1, #4
ldr r1, [r5, r1]
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
add r0, r6, #0
bl String_dtor
mov r0, #0
@@ -3622,7 +3622,7 @@ _02213B24:
ldr r0, [r5, r1]
add r1, r1, #4
ldr r1, [r5, r1]
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
add r0, r7, #0
bl String_dtor
mov r0, #0
@@ -4093,7 +4093,7 @@ MOD09_02213E84: ; 0x02213E84
ldr r1, [sp, #0x1c]
ldr r0, [r6, r0]
ldr r2, [sp, #0x18]
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
ldr r0, [sp, #0x10]
add r3, sp, #0x38
cmp r0, #0
@@ -4486,7 +4486,7 @@ MOD09_022141D8: ; 0x022141D8
ldr r2, [sp, #0x10]
ldr r0, [r5, r0]
add r1, r6, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
mov r1, #0
str r1, [sp]
mov r0, #0xff
@@ -4556,7 +4556,7 @@ _02214284:
ldr r2, [sp, #0x10]
ldr r0, [r4, r0]
add r1, r6, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
ldr r0, [sp, #0x10]
bl String_dtor
_022142BA:
@@ -4617,7 +4617,7 @@ MOD09_022142FC: ; 0x022142FC
ldr r2, [sp, #0x18]
ldr r0, [r5, r0]
add r1, r7, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
add r0, sp, #0x20
ldrh r0, [r0, #0x10]
cmp r0, #2
@@ -4854,7 +4854,7 @@ MOD09_022144C0: ; 0x022144C0
ldr r1, [sp, #0x1c]
ldr r0, [r5, r0]
ldr r2, [sp, #0x18]
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
mov r1, #0
add r0, r6, #0
add r0, #0xb
@@ -4938,7 +4938,7 @@ _022145F4:
ldr r1, [sp, #0x10]
ldr r0, [r5, r0]
ldr r2, [sp, #0x14]
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
ldr r0, _02214684 ; =0x00002070
add r6, #0xc
ldr r0, [r5, r0]
@@ -5058,7 +5058,7 @@ MOD09_02214694: ; 0x02214694
ldr r2, [sp, #0x10]
ldr r0, [r5, r0]
add r1, r6, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
mov r0, #0
add r1, r6, #0
add r2, r0, #0
@@ -5167,7 +5167,7 @@ MOD09_02214790: ; 0x02214790
ldr r2, [sp, #0x10]
ldr r0, [r5, r0]
add r1, r6, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
mov r0, #0
add r1, r6, #0
add r2, r0, #0
@@ -5277,7 +5277,7 @@ MOD09_0221488C: ; 0x0221488C
ldr r2, [sp, #0x10]
ldr r0, [r5, r0]
add r1, r6, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
mov r0, #0
add r1, r6, #0
add r2, r0, #0
@@ -5389,7 +5389,7 @@ MOD09_0221498C: ; 0x0221498C
ldr r2, [sp, #0x10]
ldr r0, [r4, r0]
add r1, r6, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
mov r0, #0
add r1, r6, #0
add r2, r0, #0
@@ -5501,7 +5501,7 @@ MOD09_02214A8C: ; 0x02214A8C
ldr r2, [sp, #0x10]
ldr r0, [r4, r0]
add r1, r6, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
mov r0, #0
add r1, r6, #0
add r2, r0, #0
@@ -5648,7 +5648,7 @@ MOD09_02214B8C: ; 0x02214B8C
ldr r1, [sp, #0x1c]
ldr r0, [r5, r0]
ldr r2, [sp, #0x18]
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
mov r0, #0
ldr r1, [sp, #0x1c]
add r2, r0, #0
@@ -5694,7 +5694,7 @@ MOD09_02214B8C: ; 0x02214B8C
ldr r1, [sp, #0x24]
ldr r0, [r5, r0]
ldr r2, [sp, #0x20]
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
mov r1, #0
ldr r3, [sp, #0x14]
str r1, [sp]
@@ -5885,7 +5885,7 @@ _02214E42:
ldr r2, [sp, #0x14]
ldr r0, [r5, r0]
add r1, r7, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
mov r0, #0
add r1, r7, #0
add r2, r0, #0
@@ -6021,7 +6021,7 @@ _02214F72:
ldr r2, [sp, #0x14]
ldr r0, [r5, r0]
add r1, r7, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
mov r0, #0
add r1, r7, #0
add r2, r0, #0
@@ -6316,7 +6316,7 @@ MOD09_022151A8: ; 0x022151A8
ldr r1, [sp, #0x24]
ldr r0, [r5, r0]
ldr r2, [sp, #0x20]
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
mov r0, #0
ldr r1, [sp, #0x24]
add r2, r0, #0
@@ -6360,7 +6360,7 @@ MOD09_022151A8: ; 0x022151A8
ldr r1, [sp, #0x2c]
ldr r0, [r5, r0]
ldr r2, [sp, #0x28]
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
mov r1, #0
ldr r3, [sp, #0x1c]
str r1, [sp]
@@ -6565,7 +6565,7 @@ MOD09_022153B0: ; 0x022153B0
ldr r2, [sp, #0x20]
ldr r0, [r5, r0]
add r1, r7, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
mov r0, #0x18
str r0, [sp]
mov r0, #0xff
@@ -6601,7 +6601,7 @@ MOD09_022153B0: ; 0x022153B0
ldr r2, [sp, #0x24]
ldr r0, [r5, r0]
add r1, r7, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
mov r0, #0
add r1, r7, #0
add r2, r0, #0
@@ -6693,7 +6693,7 @@ MOD09_022154FC: ; 0x022154FC
ldr r1, [sp, #0x14]
ldr r0, [r5, r0]
add r2, r7, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
mov r0, #0
ldr r1, [sp, #0x14]
add r2, r0, #0
@@ -6977,7 +6977,7 @@ MOD09_02215784: ; 0x02215784
ldr r1, [sp, #0x10]
ldr r0, [r4, r0]
add r2, r6, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
add r0, r6, #0
bl String_dtor
ldr r0, [sp, #0x14]
@@ -8439,7 +8439,7 @@ _02216444:
ldr r0, [r5, r1]
add r1, r1, #4
ldr r1, [r5, r1]
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
add r0, r4, #0
bl String_dtor
b _022166BE
@@ -8480,7 +8480,7 @@ _0221648E:
ldr r0, [r5, r1]
add r1, r1, #4
ldr r1, [r5, r1]
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
add r0, r4, #0
bl String_dtor
b _022166BE
@@ -8523,7 +8523,7 @@ _02216512:
ldr r0, [r5, r1]
add r1, r1, #4
ldr r1, [r5, r1]
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
add r0, r4, #0
bl String_dtor
b _022166BE
@@ -8546,7 +8546,7 @@ _0221654A:
ldr r0, [r5, r1]
add r1, r1, #4
ldr r1, [r5, r1]
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
add r0, r4, #0
bl String_dtor
b _022166BE
@@ -8569,7 +8569,7 @@ _02216580:
ldr r0, [r5, r1]
add r1, r1, #4
ldr r1, [r5, r1]
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
add r0, r4, #0
bl String_dtor
b _022166BE
@@ -8592,7 +8592,7 @@ _022165B6:
ldr r0, [r5, r1]
add r1, r1, #4
ldr r1, [r5, r1]
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
add r0, r4, #0
bl String_dtor
b _022166BE
@@ -8615,7 +8615,7 @@ _022165EC:
ldr r0, [r5, r1]
add r1, r1, #4
ldr r1, [r5, r1]
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
add r0, r4, #0
bl String_dtor
b _022166BE
@@ -8638,7 +8638,7 @@ _02216622:
ldr r0, [r5, r1]
add r1, r1, #4
ldr r1, [r5, r1]
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
add r0, r4, #0
bl String_dtor
b _022166BE
@@ -8661,7 +8661,7 @@ _02216658:
ldr r0, [r5, r1]
add r1, r1, #4
ldr r1, [r5, r1]
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
add r0, r4, #0
bl String_dtor
b _022166BE
@@ -8682,7 +8682,7 @@ _0221668E:
ldr r0, [r5, r1]
add r1, r1, #4
ldr r1, [r5, r1]
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
add r0, r4, #0
bl String_dtor
_022166BE:
@@ -8729,7 +8729,7 @@ MOD09_022166D0: ; 0x022166D0
ldr r0, [r5, r1]
add r1, r1, #4
ldr r1, [r5, r1]
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
add r0, r4, #0
bl String_dtor
pop {r4, r5, r6, pc}
@@ -13359,7 +13359,7 @@ _02218C68:
ldr r0, [r5, #0x14]
ldr r1, [r5, #0x18]
add r2, r4, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
add r0, r4, #0
bl String_dtor
add r0, r5, #0
@@ -13420,7 +13420,7 @@ _02218D22:
ldr r0, [r5, #0x14]
ldr r1, [r5, #0x18]
add r2, r6, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
add r0, r6, #0
bl String_dtor
add r0, r7, #0
@@ -14619,7 +14619,7 @@ MOD09_02219694: ; 0x02219694
ldr r0, [r5, #0x14]
ldr r1, [r5, #0x18]
ldr r2, [sp, #0x14]
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
ldr r0, [sp, #0x30]
ldr r1, [r5, #0x18]
mov r2, #0
@@ -14699,7 +14699,7 @@ MOD09_02219738: ; 0x02219738
ldr r0, [r5, #0x14]
ldr r1, [r5, #0x18]
ldr r2, [sp, #0x14]
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
ldr r0, [sp, #0x34]
mov r3, #0
str r0, [sp]
@@ -14882,7 +14882,7 @@ MOD09_02219884: ; 0x02219884
ldr r0, [r5, #0x14]
ldr r1, [r5, #0x18]
ldr r2, [sp, #0x14]
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
mov r0, #4
str r0, [sp]
mov r0, #0xff
@@ -14920,7 +14920,7 @@ MOD09_02219884: ; 0x02219884
ldr r0, [r5, #0x14]
ldr r1, [r5, #0x18]
add r2, r7, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
mov r0, #0
ldr r1, [r5, #0x18]
add r2, r0, #0
@@ -15086,7 +15086,7 @@ MOD09_02219A8C: ; 0x02219A8C
ldr r0, [r5, #0x14]
ldr r1, [r5, #0x18]
add r2, r7, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
add r0, r4, #0
mov r1, #0
bl FUN_02019620
diff --git a/arm9/modules/11/asm/module_11_thumb2.s b/arm9/modules/11/asm/module_11_thumb2.s
index 5640bb75..b22fc761 100644
--- a/arm9/modules/11/asm/module_11_thumb2.s
+++ b/arm9/modules/11/asm/module_11_thumb2.s
@@ -6224,7 +6224,7 @@ MOD11_022321EC: ; 0x022321EC
ldr r0, [r5, #0x14]
ldr r1, [r5, #0x18]
add r2, r4, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
add r0, r4, #0
bl String_dtor
pop {r3, r4, r5, pc}
@@ -28095,7 +28095,7 @@ _0223CF5C:
ldr r0, [sp, #0x24]
ldr r1, [sp, #0x20]
add r2, r6, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
add r0, r6, #0
bl String_dtor
add r0, sp, #0x68
@@ -82473,7 +82473,7 @@ MOD11_022574F0: ; 0x022574F0
ldr r1, [sp, #0x18]
ldr r2, [sp, #0x1c]
add r0, r4, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
mov r0, #0
str r0, [sp]
mov r0, #0xf
@@ -83172,7 +83172,7 @@ _02257B1E:
ldr r2, [sp, #0x18]
add r0, r7, #0
add r1, r6, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
mov r0, #0
str r0, [sp]
mov r0, #0xf
@@ -86994,11 +86994,11 @@ MOD11_022599CC: ; 0x022599CC
ldr r2, [sp, #0x1c]
add r0, r4, #0
add r1, r6, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
ldr r2, [sp, #0x20]
add r0, r4, #0
add r1, r7, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
ldr r0, _02259AA0 ; =0x00010203
ldr r1, _02259AA4 ; =0x000004CC
str r0, [sp]
@@ -87090,11 +87090,11 @@ MOD11_02259AB0: ; 0x02259AB0
ldr r2, [sp, #0x1c]
add r0, r4, #0
add r1, r6, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
ldr r2, [sp, #0x20]
add r0, r4, #0
add r1, r7, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
ldr r0, _02259B84 ; =0x00010203
ldr r1, _02259B88 ; =0x000004CC
str r0, [sp]
@@ -87187,11 +87187,11 @@ MOD11_02259B94: ; 0x02259B94
ldr r2, [sp, #0x1c]
add r0, r4, #0
add r1, r6, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
ldr r2, [sp, #0x20]
add r0, r4, #0
add r1, r7, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
ldr r0, _02259C64 ; =0x00010203
ldr r1, _02259C68 ; =0x000004CC
str r0, [sp]
@@ -87348,7 +87348,7 @@ _02259D2A:
ldr r0, [sp, #0x1c]
ldr r1, [sp, #0x28]
ldr r2, [sp, #0x24]
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
mov r0, #1
tst r0, r4
beq _02259D5A
@@ -88794,7 +88794,7 @@ _0225A876:
ldr r0, [sp, #0x24]
ldr r1, [sp, #0x30]
ldr r2, [sp, #0x2c]
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
ldrh r0, [r5, #8]
ldrh r1, [r5, #0x10]
bl MOD11_0225B3D4
diff --git a/arm9/modules/12/asm/module_12.s b/arm9/modules/12/asm/module_12.s
index c8a949ca..122cd442 100644
--- a/arm9/modules/12/asm/module_12.s
+++ b/arm9/modules/12/asm/module_12.s
@@ -15271,7 +15271,7 @@ _02234F42:
ldr r0, [r5, #0x54]
ldr r1, [r5, #0x58]
add r2, r6, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
add r0, r5, #0
add r0, #0x34
mov r1, #0xff
@@ -25514,7 +25514,7 @@ _02239AF4:
ldr r0, [r5, #0x48]
ldr r1, [r5, #0x4c]
add r2, r6, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
add r0, r5, #0
add r0, #0x34
mov r1, #0xff
@@ -34763,7 +34763,7 @@ _0223E210:
ldr r0, [r0]
ldr r1, [r1]
add r2, r6, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
add r0, r5, #0
add r0, #0x78
mov r1, #0xff
@@ -35100,7 +35100,7 @@ _0223E49A:
ldr r0, [r0]
ldr r1, [r1]
add r2, r6, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
add r0, r5, #0
add r0, #0x88
mov r1, #0xff
@@ -43550,7 +43550,7 @@ _02242618:
ldr r0, [r0]
ldr r1, [r1]
add r2, r6, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
add r0, r5, #0
add r0, #0x34
mov r1, #0xff
diff --git a/arm9/modules/14/asm/module_14.s b/arm9/modules/14/asm/module_14.s
index 911f12fe..c8d6e847 100644
--- a/arm9/modules/14/asm/module_14.s
+++ b/arm9/modules/14/asm/module_14.s
@@ -20836,7 +20836,7 @@ MOD14_021E189C: ; 0x021E189C
ldr r0, [r5, #0x2c]
ldr r1, [r5, #0x34]
ldr r2, [r5, #0x30]
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
mov r3, #0
str r3, [sp]
mov r0, #0xff
diff --git a/arm9/modules/15/asm/module_15.s b/arm9/modules/15/asm/module_15.s
index 5a05b6f7..ea50637f 100644
--- a/arm9/modules/15/asm/module_15.s
+++ b/arm9/modules/15/asm/module_15.s
@@ -5232,7 +5232,7 @@ _021D9CDC:
ldr r2, [r4, #0x4c]
add r0, r5, #0
add r1, r6, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
mov r3, #0
str r3, [sp]
mov r0, #0xff
diff --git a/arm9/modules/17/asm/module_17.s b/arm9/modules/17/asm/module_17.s
index 624ed28f..239aa59b 100644
--- a/arm9/modules/17/asm/module_17.s
+++ b/arm9/modules/17/asm/module_17.s
@@ -4772,7 +4772,7 @@ MOD17_021D99E0: ; 0x021D99E0
add r1, r4, #0
ldr r0, [r5, r0]
add r2, r6, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
mov r3, #0
str r3, [sp]
ldr r0, _021D9A64 ; =0x0001020F
@@ -4839,7 +4839,7 @@ _021D9A7E:
ldr r0, [r5, r0]
ldr r1, [r5, r1]
add r2, r4, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
ldr r0, _021D9B10 ; =0x000006C4
ldr r1, [r5, r0]
ldrb r1, [r1, #0x16]
@@ -14415,7 +14415,7 @@ _021DDFF8:
add r0, r6, #0
add r1, r4, #0
add r2, r7, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
mov r0, #0
add r1, r4, #0
add r2, r0, #0
@@ -14531,7 +14531,7 @@ _021DE1A0:
add r0, r7, #0
add r1, r4, #0
add r2, r6, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
add r0, r6, #0
bl String_dtor
mov r0, #0
@@ -14563,7 +14563,7 @@ _021DE1A0:
add r0, r7, #0
add r1, r4, #0
add r2, r6, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
add r0, r6, #0
bl String_dtor
mov r0, #0
diff --git a/arm9/modules/18/asm/module_18.s b/arm9/modules/18/asm/module_18.s
index fd50f831..6013cb5d 100644
--- a/arm9/modules/18/asm/module_18.s
+++ b/arm9/modules/18/asm/module_18.s
@@ -7729,7 +7729,7 @@ _0223D212:
ldr r1, [sp]
add r0, r5, #0
add r2, r6, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
ldr r1, _0223D290 ; =0x02251384
mov r0, #0
ldr r1, [r1]
@@ -8341,7 +8341,7 @@ MOD18_0223D6D8: ; 0x0223D6D8
ldr r1, [sp, #4]
add r0, r4, #0
add r2, r7, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
add r0, r7, #0
bl String_dtor
add r0, r4, #0
@@ -8384,7 +8384,7 @@ MOD18_0223D744: ; 0x0223D744
ldr r1, [sp, #4]
add r0, r4, #0
add r2, r6, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
add r0, r6, #0
bl String_dtor
add r0, r4, #0
@@ -10160,7 +10160,7 @@ MOD18_0223E4D4: ; 0x0223E4D4
add r1, r1, r4
add r1, #0xdc
ldr r1, [r1]
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
add r0, r7, #0
bl String_dtor
add r0, r6, #0
@@ -34255,7 +34255,7 @@ _0224A002:
ldr r0, [r5, #0x70]
ldr r1, [r5, #0x68]
ldr r2, [r5, #0x6c]
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
ldr r0, [r5, #0x40]
ldr r1, [r5, #0x68]
add r2, r4, #0
@@ -38687,7 +38687,7 @@ _0224C434:
ldr r0, [r4, #0x70]
ldr r1, [r4, #0x6c]
ldr r2, [r4, #0x68]
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
mov r0, #0x11
str r0, [sp]
mov r1, #0
@@ -38994,7 +38994,7 @@ _0224C6C4:
ldr r0, [r4, #0x70]
ldr r1, [r4, #0x6c]
ldr r2, [r4, #0x68]
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
mov r0, #0x11
str r0, [sp]
mov r1, #0
@@ -40604,7 +40604,7 @@ MOD18_0224D364: ; 0x0224D364
ldr r0, [sp, #0x1c]
ldr r1, [sp, #0x18]
add r2, r4, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
mov r0, #1
str r0, [sp]
mov r0, #0xff
@@ -40626,7 +40626,7 @@ MOD18_0224D364: ; 0x0224D364
ldr r0, [sp, #0x1c]
ldr r1, [sp, #0x18]
add r2, r4, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
mov r0, #1
str r0, [sp]
mov r0, #0xff
@@ -40698,7 +40698,7 @@ _0224D500:
ldr r0, [sp, #0x1c]
ldr r1, [sp, #0x18]
add r2, r4, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
str r5, [sp]
mov r0, #0xff
str r0, [sp, #4]
@@ -41095,7 +41095,7 @@ MOD18_0224D814: ; 0x0224D814
add r0, r7, #0
add r1, r6, #0
add r2, r4, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
mov r0, #1
str r0, [sp]
mov r0, #0xff
@@ -41137,7 +41137,7 @@ MOD18_0224D814: ; 0x0224D814
add r0, r7, #0
add r1, r6, #0
add r2, r4, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
mov r0, #0x12
str r0, [sp]
mov r0, #0xff
@@ -41183,7 +41183,7 @@ _0224D8FA:
add r0, r7, #0
add r1, r6, #0
add r2, r4, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
add r0, r5, #0
str r0, [sp, #0x1c]
add r0, #0x45
@@ -41216,7 +41216,7 @@ _0224D8FA:
add r0, r7, #0
add r1, r6, #0
add r2, r4, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
ldr r0, [sp, #0x1c]
mov r1, #0
str r0, [sp]
@@ -41543,7 +41543,7 @@ MOD18_0224DBE4: ; 0x0224DBE4
beq _0224DC04
ldr r0, [r4, #0x28]
ldr r1, [r4, #4]
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
ldr r1, [r4, #0x40]
mov r0, #2
ldr r2, [r4, #4]
@@ -42851,7 +42851,7 @@ _0224E454:
ldr r2, [sp, #0x2c]
add r0, r6, #0
add r1, r4, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
mov r0, #0x10
str r0, [sp]
mov r0, #0xff
diff --git a/arm9/modules/53/asm/module_53.s b/arm9/modules/53/asm/module_53.s
index ed7427c8..06a668bc 100644
--- a/arm9/modules/53/asm/module_53.s
+++ b/arm9/modules/53/asm/module_53.s
@@ -3626,7 +3626,7 @@ MOD53_021D91C8: ; 0x021D91C8
ldr r0, [r5, #0xc]
ldr r1, [r5, #0x2c]
add r2, r6, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
add r0, r6, #0
bl String_dtor
mov r0, #0xb6
diff --git a/arm9/modules/54/asm/module_54.s b/arm9/modules/54/asm/module_54.s
index 963dafe4..628c0cdf 100644
--- a/arm9/modules/54/asm/module_54.s
+++ b/arm9/modules/54/asm/module_54.s
@@ -3006,7 +3006,7 @@ MOD54_021D8C90: ; 0x021D8C90
ldr r0, [r5, #0x24]
ldr r1, [r5, #0x44]
add r2, r4, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
add r0, r4, #0
bl String_dtor
mov r0, #0xba
diff --git a/arm9/modules/55/asm/module_55.s b/arm9/modules/55/asm/module_55.s
index 45cf9f2e..7c114b63 100644
--- a/arm9/modules/55/asm/module_55.s
+++ b/arm9/modules/55/asm/module_55.s
@@ -1327,7 +1327,7 @@ _021D7F86:
ldr r0, [r5, #0xc]
ldr r1, [r1]
ldr r2, [r2]
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
b _021D8002
_021D7FF4:
add r2, r7, #0
@@ -3625,7 +3625,7 @@ _021D91D6:
ldr r0, [r5, #0xc]
ldr r1, [r1]
ldr r2, [r2]
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
mov r0, #4
str r0, [sp]
mov r0, #0xff
@@ -3776,7 +3776,7 @@ _021D9338:
ldr r0, [r5, #0xc]
ldr r1, [r1]
ldr r2, [r2]
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
mov r0, #0xe2
lsl r0, r0, #2
add r0, r5, r0
@@ -4191,7 +4191,7 @@ _021D969A:
ldr r0, [r4, #0xc]
ldr r1, [r1]
ldr r2, [r2]
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
mov r0, #4
str r0, [sp]
mov r0, #0xff
@@ -4261,7 +4261,7 @@ _021D974E:
ldr r0, [r4, #0xc]
ldr r1, [r1]
ldr r2, [r2]
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
ldr r0, _021D9A54 ; =0x000F0E00
add r1, r4, #0
str r0, [sp]
@@ -4433,7 +4433,7 @@ _021D987C:
ldr r0, [r4, #0xc]
ldr r1, [r1]
ldr r2, [r2]
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
add r1, r4, #0
add r1, #0xc4
mov r0, #0
@@ -4504,7 +4504,7 @@ _021D987C:
ldr r0, [r4, #0xc]
ldr r1, [r1]
ldr r2, [r2]
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
add r1, r4, #0
add r1, #0xc0
mov r0, #0
@@ -4553,7 +4553,7 @@ _021D987C:
ldr r0, [r4, #0xc]
ldr r1, [r1]
ldr r2, [r2]
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
add r1, r4, #0
add r1, #0xc0
mov r0, #0
@@ -4643,7 +4643,7 @@ _021D9AE8:
ldr r0, [r4, #0xc]
ldr r1, [r1]
ldr r2, [r2]
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
add r1, r4, #0
add r1, #0xc0
mov r0, #0
@@ -4747,7 +4747,7 @@ _021D9AE8:
ldr r0, [r4, #0xc]
ldr r1, [r1]
ldr r2, [r2]
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
add r1, r4, #0
add r1, #0xc0
mov r0, #0
@@ -5392,7 +5392,7 @@ _021DA0D0:
ldr r0, [r5, #0xc]
ldr r1, [r1]
ldr r2, [r2]
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
mov r0, #0xce
lsl r0, r0, #2
add r0, r5, r0
@@ -5473,7 +5473,7 @@ _021DA17C:
ldr r0, [r5, #0xc]
ldr r1, [r1]
ldr r2, [r2]
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
mov r0, #0xce
lsl r0, r0, #2
add r0, r5, r0
diff --git a/arm9/modules/56/asm/module_56.s b/arm9/modules/56/asm/module_56.s
index 8b6b5517..8fb23c76 100644
--- a/arm9/modules/56/asm/module_56.s
+++ b/arm9/modules/56/asm/module_56.s
@@ -7051,7 +7051,7 @@ _02215532:
sub r2, #8
ldr r0, [r0]
ldr r2, [r5, r2]
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
mov r3, #0
str r3, [sp]
mov r2, #0xff
@@ -7130,7 +7130,7 @@ _02215532:
sub r2, #8
ldr r0, [r0]
ldr r2, [r5, r2]
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
mov r1, #0x16
lsl r1, r1, #4
mov r0, #0
@@ -7206,7 +7206,7 @@ _02215532:
sub r2, #8
ldr r0, [r0]
ldr r2, [r5, r2]
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
mov r0, #0x30
str r0, [sp]
mov r2, #0xff
@@ -7252,7 +7252,7 @@ _02215532:
sub r2, #8
ldr r0, [r0]
ldr r2, [r5, r2]
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
mov r1, #0x16
lsl r1, r1, #4
mov r0, #0
@@ -7343,7 +7343,7 @@ _02215822:
sub r2, #8
ldr r0, [r0]
ldr r2, [r5, r2]
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
mov r1, #0x16
lsl r1, r1, #4
mov r0, #0
@@ -7445,7 +7445,7 @@ _02215822:
sub r2, #8
ldr r0, [r0]
ldr r2, [r5, r2]
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
mov r1, #0x16
lsl r1, r1, #4
mov r0, #0
@@ -8267,7 +8267,7 @@ _02215F82:
sub r2, r2, #4
ldr r0, [r0]
ldr r2, [r5, r2]
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
mov r0, #0xcf
lsl r0, r0, #2
add r0, r5, r0
@@ -8383,7 +8383,7 @@ _02216048:
sub r2, r2, #4
ldr r0, [r0]
ldr r2, [r5, r2]
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
mov r0, #0xdb
lsl r0, r0, #2
add r0, r5, r0
diff --git a/arm9/modules/57/asm/module_57.s b/arm9/modules/57/asm/module_57.s
index b876924b..a2811684 100644
--- a/arm9/modules/57/asm/module_57.s
+++ b/arm9/modules/57/asm/module_57.s
@@ -2843,7 +2843,7 @@ _021D8AE0:
ldr r2, [sp, #0x10]
add r0, r4, #0
add r1, r5, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
mov r0, #0
add r1, r5, #0
add r2, r0, #0
@@ -2945,7 +2945,7 @@ _021D8C32:
ldr r2, [sp, #0x10]
add r0, r4, #0
add r1, r5, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
mov r0, #0
add r1, r5, #0
add r2, r0, #0
@@ -2994,7 +2994,7 @@ _021D8C32:
ldr r2, [sp, #0x10]
add r0, r4, #0
add r1, r5, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
mov r0, #0
add r1, r5, #0
add r2, r0, #0
@@ -3173,7 +3173,7 @@ _021D8D72:
ldr r2, [sp, #0x14]
add r0, r4, #0
add r1, r5, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
b _021D8E74
_021D8E3C:
ldr r2, [sp, #0x14]
@@ -3224,7 +3224,7 @@ _021D8E74:
ldr r2, [sp, #0x14]
add r0, r4, #0
add r1, r5, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
mov r0, #0
add r1, r5, #0
add r2, r0, #0
@@ -3501,7 +3501,7 @@ _021D906E:
ldr r2, [sp, #0x14]
add r0, r6, #0
add r1, r4, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
mov r0, #0
add r1, r4, #0
add r2, r0, #0
diff --git a/arm9/modules/58/asm/module_58.s b/arm9/modules/58/asm/module_58.s
index 5d8425be..30fd8539 100644
--- a/arm9/modules/58/asm/module_58.s
+++ b/arm9/modules/58/asm/module_58.s
@@ -2210,7 +2210,7 @@ MOD58_021DAB94: ; 0x021DAB94
ldr r0, [r5, #0x10]
ldr r1, [r5, #0x34]
add r2, r4, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
add r0, r4, #0
bl String_dtor
mov r0, #0xb5
diff --git a/arm9/modules/59/asm/module_59.s b/arm9/modules/59/asm/module_59.s
index 1493661d..17491c02 100644
--- a/arm9/modules/59/asm/module_59.s
+++ b/arm9/modules/59/asm/module_59.s
@@ -995,7 +995,7 @@ _021D7C5E:
ldr r0, [r5, #0x64]
ldr r1, [r5, #0x5c]
add r2, r6, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
add r0, r6, #0
bl String_dtor
ldr r0, [r5, #8]
diff --git a/arm9/modules/65/asm/module_65.s b/arm9/modules/65/asm/module_65.s
index f6048964..87f493d0 100644
--- a/arm9/modules/65/asm/module_65.s
+++ b/arm9/modules/65/asm/module_65.s
@@ -1579,7 +1579,7 @@ _021D80EE:
ldr r0, [r5, #0x30]
ldr r1, [r5, #0x34]
ldr r2, [r5, #0x3c]
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
add r0, r5, #0
add r0, #0xcc
ldrb r2, [r6, #5]
@@ -2183,7 +2183,7 @@ _021D85D4:
ldr r0, [r4, #0x30]
ldr r1, [r4, #0x34]
ldr r2, [r4, #0x40]
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
mov r1, #0
str r1, [sp]
ldr r0, _021D8630 ; =0x00010200
@@ -2358,7 +2358,7 @@ MOD65_021D8718: ; 0x021D8718
ldr r0, [r4, #0x30]
ldr r1, [r4, #0x34]
ldr r2, [r4, #0x44]
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
add r0, r4, #0
ldr r1, [r4, #0x34]
add r4, #0x7c
@@ -2395,7 +2395,7 @@ MOD65_021D8764: ; 0x021D8764
ldr r0, [r4, #0x30]
ldr r1, [r4, #0x34]
ldr r2, [r4, #0x48]
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
add r0, r4, #0
ldr r1, [r4, #0x34]
add r4, #0x7c
@@ -3861,7 +3861,7 @@ MOD65_021D92C4: ; 0x021D92C4
lsl r2, r2, #2
add r2, r4, r2
ldr r2, [r2, #0x24]
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
mov r3, #0
str r3, [sp]
ldr r0, [r4, #0x10]
diff --git a/arm9/modules/67/asm/module_67.s b/arm9/modules/67/asm/module_67.s
index 82805b95..a70bda2f 100644
--- a/arm9/modules/67/asm/module_67.s
+++ b/arm9/modules/67/asm/module_67.s
@@ -1202,7 +1202,7 @@ _021D7E32:
ldr r0, [r5, #0x54]
ldr r1, [r5, #0x58]
add r2, r4, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
add r0, r4, #0
bl String_dtor
mov r1, #0
@@ -1256,7 +1256,7 @@ _021D7E32:
ldr r0, [r5, #0x54]
ldr r1, [r5, #0x58]
add r2, r4, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
mov r1, #0
str r1, [sp]
mov r0, #0xff
@@ -1715,7 +1715,7 @@ _021D822A:
ldr r0, [r4, #0x54]
ldr r1, [r4, #0x58]
add r2, r6, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
ldr r0, [r4, #0x58]
bl StringGetLength
add r5, r5, r0
@@ -1782,7 +1782,7 @@ _021D82F2:
ldr r0, [r4, #0x54]
ldr r1, [r4, #0x58]
add r2, r5, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
mov r0, #0x60
str r0, [sp]
mov r0, #0xff
@@ -2261,7 +2261,7 @@ MOD67_021D8688: ; 0x021D8688
ldr r0, [r5, #0x54]
ldr r1, [r5, #0x58]
add r2, r7, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
lsl r0, r6, #4
add r0, #0x10
str r0, [sp]
@@ -2306,7 +2306,7 @@ MOD67_021D86DC: ; 0x021D86DC
ldr r0, [r5, #0x54]
ldr r1, [r5, #0x58]
add r2, r7, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
lsl r0, r6, #4
add r0, #0x10
str r0, [sp]
@@ -2347,7 +2347,7 @@ MOD67_021D873C: ; 0x021D873C
ldr r0, [r5, #0x54]
ldr r1, [r5, #0x58]
add r2, r7, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
lsl r0, r6, #4
add r0, #0x10
str r0, [sp]
@@ -2388,7 +2388,7 @@ MOD67_021D8790: ; 0x021D8790
ldr r0, [r5, #0x54]
ldr r1, [r5, #0x58]
add r2, r7, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
lsl r0, r6, #4
add r0, #0x10
str r0, [sp]
@@ -2431,7 +2431,7 @@ MOD67_021D87E4: ; 0x021D87E4
ldr r0, [r5, #0x54]
ldr r1, [r5, #0x58]
add r2, r7, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
lsl r0, r6, #4
add r0, #0x10
str r0, [sp]
@@ -2486,7 +2486,7 @@ _021D886E:
ldr r0, [r5, #0x54]
ldr r1, [r5, #0x58]
add r2, r7, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
lsl r0, r6, #4
add r0, #0x10
str r0, [sp]
@@ -2536,7 +2536,7 @@ _021D88D2:
ldr r0, [r5, #0x54]
ldr r1, [r5, #0x58]
add r2, r6, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
lsl r0, r4, #4
add r0, #0x10
str r0, [sp]
@@ -2639,7 +2639,7 @@ MOD67_021D898C: ; 0x021D898C
ldr r0, [r5, #0x54]
ldr r1, [r5, #0x58]
add r2, r7, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
lsl r0, r6, #4
add r0, #0x10
str r0, [sp]
@@ -2682,7 +2682,7 @@ MOD67_021D89E0: ; 0x021D89E0
ldr r0, [r5, #0x54]
ldr r1, [r5, #0x58]
add r2, r7, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
lsl r0, r6, #4
add r0, #0x10
str r0, [sp]
@@ -2725,7 +2725,7 @@ MOD67_021D8A3C: ; 0x021D8A3C
ldr r0, [r5, #0x54]
ldr r1, [r5, #0x58]
add r2, r7, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
lsl r0, r6, #4
add r0, #0x10
str r0, [sp]
@@ -2768,7 +2768,7 @@ MOD67_021D8A98: ; 0x021D8A98
ldr r0, [r5, #0x54]
ldr r1, [r5, #0x58]
add r2, r7, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
lsl r0, r6, #4
add r0, #0x10
str r0, [sp]
@@ -2811,7 +2811,7 @@ MOD67_021D8AF4: ; 0x021D8AF4
ldr r0, [r5, #0x54]
ldr r1, [r5, #0x58]
add r2, r7, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
lsl r0, r6, #4
add r0, #0x10
str r0, [sp]
@@ -2854,7 +2854,7 @@ MOD67_021D8B50: ; 0x021D8B50
ldr r0, [r5, #0x54]
ldr r1, [r5, #0x58]
add r2, r7, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
lsl r0, r6, #4
add r0, #0x10
str r0, [sp]
@@ -2897,7 +2897,7 @@ MOD67_021D8BAC: ; 0x021D8BAC
ldr r0, [r5, #0x54]
ldr r1, [r5, #0x58]
add r2, r7, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
lsl r0, r6, #4
add r0, #0x10
str r0, [sp]
@@ -2940,7 +2940,7 @@ MOD67_021D8C08: ; 0x021D8C08
ldr r0, [r5, #0x54]
ldr r1, [r5, #0x58]
add r2, r7, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
lsl r0, r6, #4
add r0, #0x10
str r0, [sp]
@@ -2983,7 +2983,7 @@ MOD67_021D8C64: ; 0x021D8C64
ldr r0, [r5, #0x54]
ldr r1, [r5, #0x58]
add r2, r7, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
lsl r0, r6, #4
add r0, #0x10
str r0, [sp]
@@ -3026,7 +3026,7 @@ MOD67_021D8CC0: ; 0x021D8CC0
ldr r0, [r5, #0x54]
ldr r1, [r5, #0x58]
add r2, r7, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
lsl r0, r6, #4
add r0, #0x10
str r0, [sp]
@@ -3069,7 +3069,7 @@ MOD67_021D8D1C: ; 0x021D8D1C
ldr r0, [r5, #0x54]
ldr r1, [r5, #0x58]
add r2, r7, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
lsl r0, r6, #4
add r0, #0x10
str r0, [sp]
@@ -3112,7 +3112,7 @@ MOD67_021D8D78: ; 0x021D8D78
ldr r0, [r5, #0x54]
ldr r1, [r5, #0x58]
add r2, r7, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
lsl r0, r6, #4
add r0, #0x10
str r0, [sp]
@@ -3384,7 +3384,7 @@ _021D8F9A:
ldr r0, [r5, #0x54]
ldr r1, [r5, #0x58]
add r2, r6, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
mov r0, #0x50
str r0, [sp]
mov r0, #0xff
@@ -3469,7 +3469,7 @@ _021D9046:
ldr r0, [r5, #0x54]
ldr r1, [r5, #0x58]
add r2, r6, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
mov r0, #0x50
str r0, [sp]
mov r0, #0xff
@@ -3565,7 +3565,7 @@ _021D9114:
ldr r0, [r5, #0x54]
ldr r1, [r5, #0x58]
add r2, r7, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
lsl r0, r6, #4
add r0, #0x70
str r0, [sp]
@@ -3632,7 +3632,7 @@ _021D9198:
ldr r0, [r5, #0x54]
ldr r1, [r5, #0x58]
add r2, r7, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
lsl r0, r6, #4
add r0, #0x70
str r0, [sp]
@@ -3707,7 +3707,7 @@ _021D921C:
ldr r0, [r5, #0x54]
ldr r1, [r5, #0x58]
add r2, r7, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
lsl r0, r6, #4
add r0, #0x70
str r0, [sp]
@@ -3774,7 +3774,7 @@ _021D92B4:
ldr r0, [r5, #0x54]
ldr r1, [r5, #0x58]
add r2, r7, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
lsl r0, r6, #4
add r0, #0x70
str r0, [sp]
@@ -3849,7 +3849,7 @@ _021D9338:
ldr r0, [r5, #0x54]
ldr r1, [r5, #0x58]
add r2, r7, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
lsl r0, r6, #4
add r0, #0x70
str r0, [sp]
@@ -3893,7 +3893,7 @@ MOD67_021D9390: ; 0x021D9390
ldr r0, [r5, #0x54]
ldr r1, [r5, #0x58]
add r2, r7, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
lsl r0, r6, #4
add r0, #0x70
str r0, [sp]
@@ -3945,7 +3945,7 @@ MOD67_021D93EC: ; 0x021D93EC
ldr r0, [r5, #0x54]
ldr r1, [r5, #0x58]
add r2, r7, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
lsl r0, r6, #4
add r0, #0x70
str r0, [sp]
@@ -4021,7 +4021,7 @@ MOD67_021D9494: ; 0x021D9494
ldr r0, [r5, #0x54]
ldr r1, [r5, #0x58]
add r2, r7, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
lsl r0, r6, #4
add r0, #0x70
str r0, [sp]
@@ -4119,7 +4119,7 @@ _021D956C:
ldr r0, [r5, #0x54]
ldr r1, [r5, #0x58]
add r2, r7, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
lsl r0, r6, #4
add r0, #0x70
str r0, [sp]
@@ -4196,7 +4196,7 @@ MOD67_021D95EC: ; 0x021D95EC
ldr r0, [r5, #0x54]
ldr r1, [r5, #0x58]
add r2, r7, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
lsl r0, r6, #4
add r0, #0x70
str r0, [sp]
@@ -4279,7 +4279,7 @@ MOD67_021D9688: ; 0x021D9688
ldr r0, [r5, #0x54]
ldr r1, [r5, #0x58]
add r2, r7, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
lsl r0, r6, #4
add r0, #0x70
str r0, [sp]
diff --git a/arm9/modules/68/asm/module_68.s b/arm9/modules/68/asm/module_68.s
index c7cef5c8..953d3b63 100644
--- a/arm9/modules/68/asm/module_68.s
+++ b/arm9/modules/68/asm/module_68.s
@@ -699,7 +699,7 @@ MOD68_021D7A18: ; 0x021D7A18
ldr r0, [r0]
add r1, r6, #0
add r2, r7, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
mov r1, #0
str r1, [sp]
mov r0, #0xff
@@ -963,7 +963,7 @@ MOD68_021D7C28: ; 0x021D7C28
ldr r0, [r5]
ldr r2, [sp, #0x10]
add r1, r4, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
mov r1, #0
str r1, [sp]
mov r0, #0xff
diff --git a/arm9/modules/69/asm/module_69.s b/arm9/modules/69/asm/module_69.s
index 6bde4c55..482c0e19 100644
--- a/arm9/modules/69/asm/module_69.s
+++ b/arm9/modules/69/asm/module_69.s
@@ -2398,7 +2398,7 @@ _0222E95E:
ldr r0, [r4, #0x14]
ldr r1, [r4, #0x1c]
ldr r2, [r4, #0x18]
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
add sp, #8
pop {r4, pc}
@@ -2431,7 +2431,7 @@ _0222E996:
ldr r0, [r5, #0x14]
ldr r1, [r5, #0x1c]
ldr r2, [r5, #0x18]
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
pop {r3, r4, r5, pc}
thumb_func_start MOD69_0222E9AC
@@ -2511,7 +2511,7 @@ _0222EA2E:
ldr r0, [r4, #0x14]
ldr r1, [r4, #0x1c]
ldr r2, [r4, #0x18]
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
add r0, r4, #0
mov r1, #0x78
bl MOD69_0222E89C
@@ -2719,7 +2719,7 @@ MOD69_0222EB4C: ; 0x0222EB4C
add r2, #8
ldr r1, [r4, r1]
ldr r2, [r4, r2]
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
ldr r1, _0222EC54 ; =0x00001B54
mov r0, #0
ldr r1, [r4, r1]
diff --git a/arm9/modules/70/asm/module_70.s b/arm9/modules/70/asm/module_70.s
index 59c97d17..e2e99a1f 100644
--- a/arm9/modules/70/asm/module_70.s
+++ b/arm9/modules/70/asm/module_70.s
@@ -1099,7 +1099,7 @@ MOD70_021D7CE8: ; 0x021D7CE8
add r2, r2, #4
ldr r1, [r5, r1]
ldr r2, [r5, r2]
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
add r0, r6, #0
mov r1, #0xf
bl FUN_02019620
@@ -1256,7 +1256,7 @@ _021D7E68:
add r2, r2, #4
ldr r1, [r5, r1]
ldr r2, [r5, r2]
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
mov r1, #0
str r1, [sp]
mov r2, #0xff
diff --git a/arm9/modules/73/asm/module_73.s b/arm9/modules/73/asm/module_73.s
index 6a1954b8..b9d19767 100644
--- a/arm9/modules/73/asm/module_73.s
+++ b/arm9/modules/73/asm/module_73.s
@@ -4909,7 +4909,7 @@ _021D9B02:
ldr r0, [r2, #4]
ldr r1, [r2, #8]
ldr r2, [r2, #0x14]
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
ldr r1, [r5, #0x18]
lsl r0, r6, #3
ldr r1, [r1, #8]
@@ -6272,7 +6272,7 @@ MOD73_021DA550: ; 0x021DA550
ldr r0, [r2, #4]
ldr r1, [r2, #8]
ldr r2, [r2, #0x50]
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
mov r0, #0x18
str r0, [sp]
mov r1, #0
@@ -6322,7 +6322,7 @@ _021DA61A:
ldr r0, [r3, #4]
ldr r1, [r3, #8]
ldr r2, [r2, #0x4c]
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
mov r0, #0x30
str r0, [sp]
mov r1, #0
@@ -6372,7 +6372,7 @@ _021DA682:
ldr r0, [r3, #4]
ldr r1, [r3, #8]
ldr r2, [r2, #0x4c]
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
mov r0, #0x44
str r0, [sp]
mov r1, #0
@@ -6428,7 +6428,7 @@ MOD73_021DA6BC: ; 0x021DA6BC
ldr r0, [r2, #4]
ldr r1, [r2, #8]
ldr r2, [r2, #0x68]
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
mov r0, #0x18
str r0, [sp]
mov r1, #0
@@ -6528,7 +6528,7 @@ _021DA79E:
ldr r0, [r2, #4]
ldr r1, [r2, #8]
ldr r2, [r2, #0x18]
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
ldr r0, [r4, #0x1c]
ldr r5, [r0, #8]
b _021DA7EC
diff --git a/arm9/modules/74/asm/module_74.s b/arm9/modules/74/asm/module_74.s
index 1e7b6d56..76811a01 100644
--- a/arm9/modules/74/asm/module_74.s
+++ b/arm9/modules/74/asm/module_74.s
@@ -996,7 +996,7 @@ MOD74_021D7C10: ; 0x021D7C10
ldr r0, [r5, #0x2c]
ldr r1, [r5, #0x30]
ldr r2, [r5, #0x5c]
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
mov r0, #0
ldr r1, [r5, #0x30]
add r2, r0, #0
@@ -1041,7 +1041,7 @@ MOD74_021D7C10: ; 0x021D7C10
ldr r0, [r5, #0x2c]
ldr r1, [r5, #0x30]
ldr r2, [r5, #0x5c]
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
mov r0, #0
ldr r1, [r5, #0x30]
add r2, r0, #0
@@ -1207,7 +1207,7 @@ _021D7E04:
ldr r0, [r4, #0x2c]
ldr r1, [r4, #0x30]
ldr r2, [r4, #0x60]
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
mov r0, #0
ldr r1, [r4, #0x30]
add r2, r0, #0
@@ -1465,7 +1465,7 @@ MOD74_021D8008: ; 0x021D8008
ldr r0, [r4, #0x2c]
ldr r1, [r4, #0x30]
ldr r2, [r4, #0x38]
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
mov r0, #0
ldr r1, [r4, #0x30]
add r2, r0, #0
@@ -1566,7 +1566,7 @@ _021D8108:
ldr r0, [r4, #0x2c]
ldr r1, [r4, #0x30]
ldr r2, [r4, #0x44]
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
mov r0, #4
str r0, [sp]
mov r1, #0
@@ -1591,7 +1591,7 @@ _021D813C:
ldr r0, [r4, #0x2c]
ldr r1, [r4, #0x30]
ldr r2, [r4, #0x40]
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
mov r0, #4
str r0, [sp]
mov r1, #0
diff --git a/arm9/modules/75/asm/module_75.s b/arm9/modules/75/asm/module_75.s
index e61c2137..1cadb67b 100644
--- a/arm9/modules/75/asm/module_75.s
+++ b/arm9/modules/75/asm/module_75.s
@@ -4734,7 +4734,7 @@ _021E908E:
ldr r0, [r4, r0]
ldr r1, [r4, r1]
add r2, r5, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
add r0, r5, #0
bl String_dtor
add r0, r4, #0
@@ -4928,7 +4928,7 @@ _021E923E:
ldr r0, [r4, r0]
ldr r1, [r4, r1]
add r2, r5, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
add r0, r5, #0
bl String_dtor
mov r0, #1
@@ -5467,7 +5467,7 @@ _021E967A:
ldr r0, [r5, r0]
ldr r1, [r5, r1]
add r2, r4, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
add r0, r4, #0
bl String_dtor
add r0, r5, #0
@@ -5741,7 +5741,7 @@ _021E9872:
ldr r0, [r5, r0]
ldr r1, [r5, r1]
add r2, r4, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
add r0, r4, #0
bl String_dtor
add r0, r5, #0
@@ -5922,7 +5922,7 @@ _021E9A38:
ldr r0, [r5, r0]
ldr r1, [r5, r1]
add r2, r4, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
add r0, r4, #0
bl String_dtor
add r0, r5, #0
@@ -5984,7 +5984,7 @@ _021E9A6E:
ldr r0, [r5, r0]
ldr r1, [r5, r1]
add r2, r4, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
add r0, r4, #0
bl String_dtor
add r0, r5, #0
@@ -6008,7 +6008,7 @@ _021E9AF4:
ldr r0, [r5, r0]
ldr r1, [r5, r1]
add r2, r4, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
add r0, r4, #0
bl String_dtor
add r0, r5, #0
@@ -6128,7 +6128,7 @@ _021E9BAC:
ldr r0, [r4, r0]
ldr r1, [r4, r1]
add r2, r5, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
add r0, r5, #0
bl String_dtor
add r0, r4, #0
@@ -6223,7 +6223,7 @@ _021E9C80:
ldr r0, [r4, r0]
ldr r1, [r4, r1]
add r2, r5, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
add r0, r5, #0
bl String_dtor
add r0, r4, #0
@@ -6399,7 +6399,7 @@ _021E9E2A:
ldr r0, [r5, r0]
ldr r1, [r5, r1]
add r2, r4, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
add r0, r4, #0
bl String_dtor
add r0, r5, #0
@@ -8218,7 +8218,7 @@ MOD75_021EAB44: ; 0x021EAB44
ldr r0, [r5, r0]
ldr r1, [r5, r1]
add r2, r6, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
add r0, r6, #0
bl String_dtor
mov r0, #0x10
@@ -8273,7 +8273,7 @@ _021EACC6:
ldr r0, [r5, r0]
ldr r1, [r5, r1]
add r2, r6, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
add r0, r6, #0
bl String_dtor
mov r0, #0x10
@@ -8327,7 +8327,7 @@ _021EAD3C:
ldr r0, [r5, r0]
ldr r1, [r5, r1]
add r2, r6, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
add r0, r6, #0
bl String_dtor
mov r0, #0x20
@@ -8454,7 +8454,7 @@ _021EAE2E:
ldr r0, [r5, r0]
ldr r2, [r5, r2]
add r1, r7, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
mov r0, #0
add r1, r7, #0
add r2, r0, #0
@@ -9033,7 +9033,7 @@ _021EB298:
ldr r0, [r5, r0]
ldr r2, [sp, #0x18]
add r1, r7, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
mov r3, #0
str r3, [sp]
mov r0, #0xff
@@ -9166,7 +9166,7 @@ MOD75_021EB3D8: ; 0x021EB3D8
ldr r0, [r5, r0]
add r1, r4, #0
add r2, r6, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
mov r1, #0
str r1, [sp]
mov r0, #0xff
@@ -9246,7 +9246,7 @@ MOD75_021EB454: ; 0x021EB454
ldr r0, [r5, r0]
add r1, r4, #0
add r2, r6, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
mov r3, #0
str r3, [sp]
mov r0, #0xff
@@ -9306,7 +9306,7 @@ MOD75_021EB504: ; 0x021EB504
ldr r0, [r5, r0]
ldr r1, [r5, r1]
add r2, r6, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
mov r0, #8
str r0, [sp]
mov r0, #0xff
@@ -9420,7 +9420,7 @@ _021EB616:
ldr r0, [r5, r0]
ldr r1, [r5, r1]
add r2, r4, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
add r0, r4, #0
bl String_dtor
add r0, r5, #0
@@ -9568,7 +9568,7 @@ _021EB722:
ldr r0, [r5, r0]
ldr r1, [r5, r1]
add r2, r6, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
mov r0, #8
str r0, [sp]
mov r0, #0xff
@@ -9610,7 +9610,7 @@ _021EB722:
ldr r0, [r5, r0]
ldr r1, [r5, r1]
add r2, r6, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
mov r1, #0xfe
lsl r1, r1, #2
mov r0, #0
@@ -9715,7 +9715,7 @@ _021EB866:
ldr r0, [r5, r0]
ldr r1, [r5, r1]
add r2, r6, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
mov r1, #0xfe
lsl r1, r1, #2
mov r0, #0
@@ -9807,7 +9807,7 @@ MOD75_021EB8E8: ; 0x021EB8E8
ldr r0, [r5, r0]
ldr r1, [r5, r1]
add r2, r6, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
add r0, r6, #0
bl String_dtor
mov r1, #0xfe
diff --git a/arm9/modules/76/asm/module_76.s b/arm9/modules/76/asm/module_76.s
index ed94aa20..da9aff3b 100644
--- a/arm9/modules/76/asm/module_76.s
+++ b/arm9/modules/76/asm/module_76.s
@@ -1098,7 +1098,7 @@ MOD76_021D7D60: ; 0x021D7D60
ldr r0, [r0]
ldr r1, [r5, r1]
add r2, r4, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
add r0, r4, #0
bl String_dtor
add sp, #8
@@ -2000,7 +2000,7 @@ _021D84D8:
ldr r0, [r0]
ldr r1, [r4, r1]
add r2, r5, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
add r0, r5, #0
bl String_dtor
pop {r3, r4, r5, pc}
diff --git a/arm9/modules/77/asm/module_77.s b/arm9/modules/77/asm/module_77.s
index 8fe53b7d..4c119b1d 100644
--- a/arm9/modules/77/asm/module_77.s
+++ b/arm9/modules/77/asm/module_77.s
@@ -2008,7 +2008,7 @@ MOD77_021D8510: ; 0x021D8510
add r1, r4, #0
ldr r0, [r5, r0]
add r2, r6, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
mov r1, #0
ldr r0, _021D85CC ; =0x0000C044
str r1, [sp]
diff --git a/arm9/modules/80/asm/module_80.s b/arm9/modules/80/asm/module_80.s
index 1c8a9d21..63810310 100644
--- a/arm9/modules/80/asm/module_80.s
+++ b/arm9/modules/80/asm/module_80.s
@@ -4801,7 +4801,7 @@ MOD80_0222FB3C: ; 0x0222FB3C
add r1, #0x1c
ldr r1, [r5, r1]
add r2, r6, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
ldr r0, _0222FBB8 ; =0x00000E98
mov r1, #0xf
add r0, r5, r0
@@ -10667,7 +10667,7 @@ MOD80_02232B34: ; 0x02232B34
add r1, #0x1c
ldr r1, [r5, r1]
add r2, r7, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
ldr r0, [sp, #0x24]
cmp r0, #0
bne _02232B60
@@ -11653,7 +11653,7 @@ MOD80_022332EC: ; 0x022332EC
add r1, #0x1c
ldr r1, [r5, r1]
add r2, r6, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
ldr r0, _02233350 ; =0x00000E98
mov r1, #0xf
add r0, r5, r0
@@ -19045,7 +19045,7 @@ MOD80_02236C70: ; 0x02236C70
add r1, #0x1c
ldr r1, [r5, r1]
add r2, r6, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
add r0, r6, #0
bl String_dtor
ldr r0, _02236CD8 ; =0x00000E98
@@ -19202,7 +19202,7 @@ MOD80_02236D8C: ; 0x02236D8C
add r1, #0x4c
ldr r1, [r5, r1]
add r2, r4, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
ldr r0, _02236DFC ; =0x00000EC8
mov r1, #0xf
add r0, r5, r0
diff --git a/arm9/modules/81/asm/module_81.s b/arm9/modules/81/asm/module_81.s
index c5c4a97f..8ebe39e5 100644
--- a/arm9/modules/81/asm/module_81.s
+++ b/arm9/modules/81/asm/module_81.s
@@ -2467,7 +2467,7 @@ _022390F4:
ldr r1, [r4, #0x58]
ldr r2, [r4, #0x54]
add r0, r7, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
mov r3, #0
str r3, [sp]
mov r0, #0xff
@@ -2509,7 +2509,7 @@ _02239138:
ldr r1, [r4, #0x58]
ldr r2, [r4, #0x54]
add r0, r7, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
ldr r0, [r4]
bl MOD81_02238818
mov r1, #0x4c
@@ -9591,7 +9591,7 @@ _0223C982:
ldr r1, [r4, #0x5c]
ldr r2, [r4, #0x58]
add r0, r7, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
mov r3, #0
str r3, [sp]
mov r0, #0xff
@@ -9636,7 +9636,7 @@ _0223C9D0:
ldr r1, [r4, #0x5c]
ldr r2, [r4, #0x58]
add r0, r7, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
add r0, r4, #0
add r0, #0x48
mov r1, #0xf
diff --git a/arm9/modules/82/asm/module_82.s b/arm9/modules/82/asm/module_82.s
index 36d3f681..1427108d 100644
--- a/arm9/modules/82/asm/module_82.s
+++ b/arm9/modules/82/asm/module_82.s
@@ -4032,7 +4032,7 @@ MOD82_0222F4D8: ; 0x0222F4D8
ldr r0, [r5, r1]
add r1, #0x10
ldr r1, [r5, r1]
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
mov r0, #0x36
lsl r0, r0, #6
add r0, r5, r0
@@ -4370,7 +4370,7 @@ MOD82_0222F740: ; 0x0222F740
ldr r0, [r5, r1]
add r1, #0x20
ldr r1, [r5, r1]
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
mov r0, #0x37
lsl r0, r0, #6
add r0, r5, r0
diff --git a/arm9/modules/86/asm/module_86.s b/arm9/modules/86/asm/module_86.s
index 166d85a6..12ddd3a3 100644
--- a/arm9/modules/86/asm/module_86.s
+++ b/arm9/modules/86/asm/module_86.s
@@ -816,7 +816,7 @@ MOD86_021D7B80: ; 0x021D7B80
ldr r0, [r5, #0x38]
add r1, r4, #0
add r2, r6, #0
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
mov r0, #0x20
str r0, [sp]
mov r1, #0