diff options
Diffstat (limited to 'arm9/asm')
-rw-r--r-- | arm9/asm/scrcmd.s | 4 | ||||
-rw-r--r-- | arm9/asm/unk_0200AA80.s | 4 | ||||
-rw-r--r-- | arm9/asm/unk_02033F50.s | 2 | ||||
-rw-r--r-- | arm9/asm/unk_02035068.s | 4 | ||||
-rw-r--r-- | arm9/asm/unk_02048120.s | 2 | ||||
-rw-r--r-- | arm9/asm/unk_02050E48.s | 8 | ||||
-rw-r--r-- | arm9/asm/unk_020625EC.s | 4 | ||||
-rw-r--r-- | arm9/asm/unk_020653EC.s | 2 | ||||
-rw-r--r-- | arm9/asm/unk_0206C700.s | 2 | ||||
-rw-r--r-- | arm9/asm/unk_0206E2F0.s | 4 | ||||
-rw-r--r-- | arm9/asm/unk_0206F3FC.s | 14 | ||||
-rw-r--r-- | arm9/asm/unk_02072548.s | 10 | ||||
-rw-r--r-- | arm9/asm/unk_02073DA8.s | 4 | ||||
-rw-r--r-- | arm9/asm/unk_0207550C.s | 86 | ||||
-rw-r--r-- | arm9/asm/unk_02079C70.s | 6 | ||||
-rw-r--r-- | arm9/asm/unk_0207D5BC.s | 12 | ||||
-rw-r--r-- | arm9/asm/unk_0207FD00.s | 6 | ||||
-rw-r--r-- | arm9/asm/unk_02086414.s | 2 | ||||
-rw-r--r-- | arm9/asm/unk_0208A338.s | 2 |
19 files changed, 89 insertions, 89 deletions
diff --git a/arm9/asm/scrcmd.s b/arm9/asm/scrcmd.s index 68c87867..9ced92c0 100644 --- a/arm9/asm/scrcmd.s +++ b/arm9/asm/scrcmd.s @@ -1883,7 +1883,7 @@ _0203A7E0: ldr r0, [r0, #0x0] ldr r1, [r7, #0x0] ldr r2, [r2, #0x0] - bl StringExpandPlaceholders + bl FUN_0200B7B8 ldr r0, [r4, #0x60] bl MOD05_021E8140 mov r3, #0x0 @@ -2011,7 +2011,7 @@ FUN_0203A8B8: ; 0x0203A8B8 ldr r1, [r7, #0x0] ldr r0, [r0, #0x0] ldr r2, [r6, #0x0] - bl StringExpandPlaceholders + bl FUN_0200B7B8 ldr r0, [r4, #0x60] bl MOD05_021E8140 add r4, r0, #0x0 diff --git a/arm9/asm/unk_0200AA80.s b/arm9/asm/unk_0200AA80.s index 165a789e..02fa918d 100644 --- a/arm9/asm/unk_0200AA80.s +++ b/arm9/asm/unk_0200AA80.s @@ -1719,8 +1719,8 @@ FUN_0200B7A8: ; 0x0200B7A8 .balign 4 _0200B7B4: .word FUN_02021FF8 - thumb_func_start StringExpandPlaceholders -StringExpandPlaceholders: ; 0x0200B7B8 + thumb_func_start FUN_0200B7B8 +FUN_0200B7B8: ; 0x0200B7B8 push {r3-r7, lr} add r7, r0, #0x0 add r6, r1, #0x0 diff --git a/arm9/asm/unk_02033F50.s b/arm9/asm/unk_02033F50.s index ff184e1c..ddbaf49b 100644 --- a/arm9/asm/unk_02033F50.s +++ b/arm9/asm/unk_02033F50.s @@ -220,7 +220,7 @@ _02033FA4: ldr r2, [sp, #0x14] add r0, r4, #0x0 add r1, r7, #0x0 - bl StringExpandPlaceholders + bl FUN_0200B7B8 mov r1, #0x0 str r1, [sp, #0x0] str r1, [sp, #0x4] diff --git a/arm9/asm/unk_02035068.s b/arm9/asm/unk_02035068.s index 5a905b2d..20fae5b3 100644 --- a/arm9/asm/unk_02035068.s +++ b/arm9/asm/unk_02035068.s @@ -677,7 +677,7 @@ _02035526: ldr r2, [sp, #0x20] add r0, r6, #0x0 add r1, r7, #0x0 - bl StringExpandPlaceholders + bl FUN_0200B7B8 add r2, r4, r5 add r2, #0x30 ldrb r2, [r2, #0x0] @@ -1035,7 +1035,7 @@ _0203584C: ldr r1, [sp, #0x18] ldr r2, [sp, #0x14] add r0, r7, #0x0 - bl StringExpandPlaceholders + bl FUN_0200B7B8 mov r0, #0x10 str r0, [sp, #0x0] mov r0, #0xff diff --git a/arm9/asm/unk_02048120.s b/arm9/asm/unk_02048120.s index cf52f344..0d4da9a6 100644 --- a/arm9/asm/unk_02048120.s +++ b/arm9/asm/unk_02048120.s @@ -271,7 +271,7 @@ FUN_020482F4: ; 0x020482F4 ldr r0, [r5, #0x20] add r1, r4, #0x0 add r2, r6, #0x0 - bl StringExpandPlaceholders + bl FUN_0200B7B8 mov r0, #0x0 add r1, r4, #0x0 add r2, r0, #0x0 diff --git a/arm9/asm/unk_02050E48.s b/arm9/asm/unk_02050E48.s index c4024a82..8ad56d6f 100644 --- a/arm9/asm/unk_02050E48.s +++ b/arm9/asm/unk_02050E48.s @@ -791,7 +791,7 @@ _0205142C: ldr r0, [r4, #0x28] ldr r1, [r4, #0x10] ldr r2, [r4, #0xc] - bl StringExpandPlaceholders + bl FUN_0200B7B8 ldr r1, [r4, #0x10] add r0, r4, #0x0 bl FUN_020517C0 @@ -970,7 +970,7 @@ _020515BA: ldr r0, [r4, #0x28] ldr r1, [r4, #0x10] ldr r2, [r4, #0xc] - bl StringExpandPlaceholders + bl FUN_0200B7B8 ldr r1, [r4, #0x10] add r0, r4, #0x0 bl FUN_020517C0 @@ -1025,7 +1025,7 @@ _02051642: ldr r0, [r4, #0x28] ldr r1, [r4, #0x10] ldr r2, [r4, #0xc] - bl StringExpandPlaceholders + bl FUN_0200B7B8 ldr r1, [r4, #0x10] add r0, r4, #0x0 bl FUN_020517C0 @@ -2154,7 +2154,7 @@ _02051EF2: ldr r0, [r4, #0x18] ldr r1, [r4, #0x4] ldr r2, [r4, #0x0] - bl StringExpandPlaceholders + bl FUN_0200B7B8 add r1, r4, #0x0 ldr r0, [r5, #0x8] add r1, #0x8 diff --git a/arm9/asm/unk_020625EC.s b/arm9/asm/unk_020625EC.s index 2450a9ad..a72ed912 100644 --- a/arm9/asm/unk_020625EC.s +++ b/arm9/asm/unk_020625EC.s @@ -1734,7 +1734,7 @@ _02063318: ldr r0, [r4, #0x30] ldr r1, [r4, #0x34] ldr r2, [r4, #0x44] - bl StringExpandPlaceholders + bl FUN_0200B7B8 ldr r0, [sp, #0x30] mov r1, #0x0 str r0, [sp, #0x0] @@ -1764,7 +1764,7 @@ _02063318: lsl r2, r2, #0x2 add r2, r4, r2 ldr r2, [r2, #0xc] - bl StringExpandPlaceholders + bl FUN_0200B7B8 mov r0, #0x0 ldr r1, [r4, #0x34] add r2, r0, #0x0 diff --git a/arm9/asm/unk_020653EC.s b/arm9/asm/unk_020653EC.s index f463a96a..e50c86ca 100644 --- a/arm9/asm/unk_020653EC.s +++ b/arm9/asm/unk_020653EC.s @@ -2101,7 +2101,7 @@ _02066426: add r2, #0x10 ldr r1, [r5, r1] ldr r2, [r3, r2] - bl StringExpandPlaceholders + bl FUN_0200B7B8 mov r0, #0x45 lsl r0, r0, #0x2 ldr r2, [r5, r0] diff --git a/arm9/asm/unk_0206C700.s b/arm9/asm/unk_0206C700.s index 30db1fe3..081d478b 100644 --- a/arm9/asm/unk_0206C700.s +++ b/arm9/asm/unk_0206C700.s @@ -2668,7 +2668,7 @@ FUN_0206DD6C: ; 0x0206DD6C ldr r0, [r4, #0xc] ldr r1, [r4, #0x10] add r2, r5, #0x0 - bl StringExpandPlaceholders + bl FUN_0200B7B8 add r0, r5, #0x0 bl FreeToHeap ldr r0, [r4, #0x4] diff --git a/arm9/asm/unk_0206E2F0.s b/arm9/asm/unk_0206E2F0.s index 6d87f0fa..d46ad82e 100644 --- a/arm9/asm/unk_0206E2F0.s +++ b/arm9/asm/unk_0206E2F0.s @@ -295,7 +295,7 @@ _0206E4FA: ldr r1, [sp, #0x8] add r0, r4, #0x0 add r2, r5, #0x0 - bl StringExpandPlaceholders + bl FUN_0200B7B8 add r0, r5, #0x0 bl String_dtor add r0, r4, #0x0 @@ -364,7 +364,7 @@ _0206E56A: add r0, r4, #0x0 add r1, r5, #0x0 add r2, r6, #0x0 - bl StringExpandPlaceholders + bl FUN_0200B7B8 add r0, r6, #0x0 bl String_dtor add r0, r4, #0x0 diff --git a/arm9/asm/unk_0206F3FC.s b/arm9/asm/unk_0206F3FC.s index 23b8fdb0..7cfac832 100644 --- a/arm9/asm/unk_0206F3FC.s +++ b/arm9/asm/unk_0206F3FC.s @@ -4404,7 +4404,7 @@ _02071630: add r1, r1, #0x4 ldr r1, [r4, r1] add r2, r5, #0x0 - bl StringExpandPlaceholders + bl FUN_0200B7B8 add r0, r5, #0x0 bl String_dtor mov r1, #0x0 @@ -5065,7 +5065,7 @@ _02071B34: add r1, r1, #0x4 ldr r1, [r4, r1] add r2, r5, #0x0 - bl StringExpandPlaceholders + bl FUN_0200B7B8 add r0, r5, #0x0 bl String_dtor mov r1, #0x0 @@ -5586,7 +5586,7 @@ _02071FA0: add r2, #0x8 ldr r1, [r5, r1] ldr r2, [r5, r2] - bl StringExpandPlaceholders + bl FUN_0200B7B8 mov r4, #0xb b _02072054 _02071FF2: @@ -5623,7 +5623,7 @@ _02071FF2: add r2, #0x8 ldr r1, [r5, r1] ldr r2, [r5, r2] - bl StringExpandPlaceholders + bl FUN_0200B7B8 mov r4, #0x9 b _02072054 _02072044: @@ -5893,7 +5893,7 @@ _02072246: add r2, #0x8 ldr r1, [r5, r1] ldr r2, [r5, r2] - bl StringExpandPlaceholders + bl FUN_0200B7B8 _02072282: mov r0, #0x89 lsl r0, r0, #0x2 @@ -6014,7 +6014,7 @@ FUN_0207230C: ; 0x0207230C add r2, #0x8 ldr r1, [r5, r1] ldr r2, [r5, r2] - bl StringExpandPlaceholders + bl FUN_0200B7B8 b _020723D6 _02072388: ldr r0, _02072410 ; =0x000005A4 @@ -6050,7 +6050,7 @@ _02072388: add r2, #0x8 ldr r1, [r5, r1] ldr r2, [r5, r2] - bl StringExpandPlaceholders + bl FUN_0200B7B8 _020723D6: mov r0, #0x89 lsl r0, r0, #0x2 diff --git a/arm9/asm/unk_02072548.s b/arm9/asm/unk_02072548.s index 2592e6ed..8acfa300 100644 --- a/arm9/asm/unk_02072548.s +++ b/arm9/asm/unk_02072548.s @@ -416,7 +416,7 @@ FUN_020727FC: ; 0x020727FC add r1, #0xc ldr r1, [r2, r1] add r2, r6, #0x0 - bl StringExpandPlaceholders + bl FUN_0200B7B8 add r0, r6, #0x0 bl String_dtor pop {r3-r7, pc} @@ -603,7 +603,7 @@ _0207297E: add r1, r1, #0x4 ldr r1, [r5, r1] add r2, r4, #0x0 - bl StringExpandPlaceholders + bl FUN_0200B7B8 add r0, r4, #0x0 bl String_dtor pop {r4-r6, pc} @@ -667,7 +667,7 @@ FUN_02072A00: ; 0x02072A00 add r2, #0x60 ldr r1, [r1, r2] add r2, r6, #0x0 - bl StringExpandPlaceholders + bl FUN_0200B7B8 add r0, r6, #0x0 bl String_dtor pop {r3-r7, pc} @@ -2097,7 +2097,7 @@ _0207356C: ldr r0, [r5, r0] ldr r1, [r5, r1] ldr r2, [sp, #0x1c] - bl StringExpandPlaceholders + bl FUN_0200B7B8 ldr r0, [sp, #0x1c] bl String_dtor ldr r1, _02073638 ; =0x000006A4 @@ -2187,7 +2187,7 @@ _0207366E: ldr r0, [r5, r0] ldr r1, [r5, r1] ldr r2, [sp, #0xc] - bl StringExpandPlaceholders + bl FUN_0200B7B8 ldr r1, _020736F0 ; =0x000006A4 mov r0, #0x0 ldr r1, [r5, r1] diff --git a/arm9/asm/unk_02073DA8.s b/arm9/asm/unk_02073DA8.s index e30d5da6..69c2ba13 100644 --- a/arm9/asm/unk_02073DA8.s +++ b/arm9/asm/unk_02073DA8.s @@ -222,7 +222,7 @@ FUN_02073EEC: ; 0x02073EEC add r2, #0x8 ldr r1, [r5, r1] ldr r2, [r5, r2] - bl StringExpandPlaceholders + bl FUN_0200B7B8 b _02074018 _02073F66: ldr r0, [r5, r0] @@ -280,7 +280,7 @@ _02073F66: add r2, #0x8 ldr r1, [r5, r1] ldr r2, [r5, r2] - bl StringExpandPlaceholders + bl FUN_0200B7B8 ldr r1, _0207404C ; =0x00000B25 mov r2, #0x2c ldrb r3, [r5, r1] diff --git a/arm9/asm/unk_0207550C.s b/arm9/asm/unk_0207550C.s index 1dd536b9..03f5f2ea 100644 --- a/arm9/asm/unk_0207550C.s +++ b/arm9/asm/unk_0207550C.s @@ -426,7 +426,7 @@ _0207586C: add r1, r1, #0x4 ldr r1, [r4, r1] add r2, r5, #0x0 - bl StringExpandPlaceholders + bl FUN_0200B7B8 add r0, r5, #0x0 bl String_dtor pop {r4-r6, pc} @@ -442,7 +442,7 @@ _02075890: add r1, r1, #0x4 ldr r1, [r4, r1] add r2, r5, #0x0 - bl StringExpandPlaceholders + bl FUN_0200B7B8 add r0, r5, #0x0 bl String_dtor pop {r4-r6, pc} @@ -458,7 +458,7 @@ _020758B4: add r1, r1, #0x4 ldr r1, [r4, r1] add r2, r5, #0x0 - bl StringExpandPlaceholders + bl FUN_0200B7B8 add r0, r5, #0x0 bl String_dtor pop {r4-r6, pc} @@ -474,7 +474,7 @@ _020758D8: add r1, r1, #0x4 ldr r1, [r4, r1] add r2, r5, #0x0 - bl StringExpandPlaceholders + bl FUN_0200B7B8 add r0, r5, #0x0 bl String_dtor pop {r4-r6, pc} @@ -490,7 +490,7 @@ _020758FC: add r1, r1, #0x4 ldr r1, [r4, r1] add r2, r5, #0x0 - bl StringExpandPlaceholders + bl FUN_0200B7B8 add r0, r5, #0x0 bl String_dtor pop {r4-r6, pc} @@ -506,7 +506,7 @@ _02075920: add r1, r1, #0x4 ldr r1, [r4, r1] add r2, r5, #0x0 - bl StringExpandPlaceholders + bl FUN_0200B7B8 add r0, r5, #0x0 bl String_dtor pop {r4-r6, pc} @@ -522,7 +522,7 @@ _02075944: add r1, r1, #0x4 ldr r1, [r4, r1] add r2, r5, #0x0 - bl StringExpandPlaceholders + bl FUN_0200B7B8 add r0, r5, #0x0 bl String_dtor pop {r4-r6, pc} @@ -538,7 +538,7 @@ _02075968: add r1, r1, #0x4 ldr r1, [r4, r1] add r2, r5, #0x0 - bl StringExpandPlaceholders + bl FUN_0200B7B8 add r0, r5, #0x0 bl String_dtor pop {r4-r6, pc} @@ -560,7 +560,7 @@ _0207598C: add r1, r1, #0x4 ldr r1, [r4, r1] add r2, r5, #0x0 - bl StringExpandPlaceholders + bl FUN_0200B7B8 add r0, r5, #0x0 bl String_dtor pop {r4-r6, pc} @@ -582,7 +582,7 @@ _020759BE: add r1, r1, #0x4 ldr r1, [r4, r1] add r2, r5, #0x0 - bl StringExpandPlaceholders + bl FUN_0200B7B8 add r0, r5, #0x0 bl String_dtor pop {r4-r6, pc} @@ -604,7 +604,7 @@ _020759F0: add r1, r1, #0x4 ldr r1, [r4, r1] add r2, r5, #0x0 - bl StringExpandPlaceholders + bl FUN_0200B7B8 add r0, r5, #0x0 bl String_dtor pop {r4-r6, pc} @@ -626,7 +626,7 @@ _02075A22: add r1, r1, #0x4 ldr r1, [r4, r1] add r2, r5, #0x0 - bl StringExpandPlaceholders + bl FUN_0200B7B8 add r0, r5, #0x0 bl String_dtor pop {r4-r6, pc} @@ -648,7 +648,7 @@ _02075A54: add r1, r1, #0x4 ldr r1, [r4, r1] add r2, r5, #0x0 - bl StringExpandPlaceholders + bl FUN_0200B7B8 add r0, r5, #0x0 bl String_dtor pop {r4-r6, pc} @@ -670,7 +670,7 @@ _02075A86: add r1, r1, #0x4 ldr r1, [r4, r1] add r2, r5, #0x0 - bl StringExpandPlaceholders + bl FUN_0200B7B8 add r0, r5, #0x0 bl String_dtor pop {r4-r6, pc} @@ -693,7 +693,7 @@ _02075AB8: add r1, r1, #0x4 ldr r1, [r4, r1] add r2, r5, #0x0 - bl StringExpandPlaceholders + bl FUN_0200B7B8 add r0, r5, #0x0 bl String_dtor pop {r4-r6, pc} @@ -716,7 +716,7 @@ _02075AEC: add r1, r1, #0x4 ldr r1, [r4, r1] add r2, r5, #0x0 - bl StringExpandPlaceholders + bl FUN_0200B7B8 add r0, r5, #0x0 bl String_dtor pop {r4-r6, pc} @@ -739,7 +739,7 @@ _02075B20: add r1, r1, #0x4 ldr r1, [r4, r1] add r2, r5, #0x0 - bl StringExpandPlaceholders + bl FUN_0200B7B8 add r0, r5, #0x0 bl String_dtor pop {r4-r6, pc} @@ -762,7 +762,7 @@ _02075B54: add r1, r1, #0x4 ldr r1, [r4, r1] add r2, r5, #0x0 - bl StringExpandPlaceholders + bl FUN_0200B7B8 add r0, r5, #0x0 bl String_dtor pop {r4-r6, pc} @@ -791,7 +791,7 @@ _02075B98: add r1, r1, #0x4 ldr r1, [r4, r1] add r2, r5, #0x0 - bl StringExpandPlaceholders + bl FUN_0200B7B8 add r0, r5, #0x0 bl String_dtor pop {r4-r6, pc} @@ -814,7 +814,7 @@ _02075BCA: add r1, r1, #0x4 ldr r1, [r4, r1] add r2, r5, #0x0 - bl StringExpandPlaceholders + bl FUN_0200B7B8 add r0, r5, #0x0 bl String_dtor pop {r4-r6, pc} @@ -836,7 +836,7 @@ _02075BFE: add r1, r1, #0x4 ldr r1, [r4, r1] add r2, r6, #0x0 - bl StringExpandPlaceholders + bl FUN_0200B7B8 add r0, r6, #0x0 bl String_dtor pop {r4-r6, pc} @@ -1311,7 +1311,7 @@ _02075FDA: add r1, r1, #0x4 ldr r1, [r5, r1] add r2, r7, #0x0 - bl StringExpandPlaceholders + bl FUN_0200B7B8 add r0, r7, #0x0 bl String_dtor ldr r0, [sp, #0x8] @@ -1594,7 +1594,7 @@ _02076212: add r1, r1, #0x4 ldr r1, [r4, r1] add r2, r6, #0x0 - bl StringExpandPlaceholders + bl FUN_0200B7B8 add r0, r6, #0x0 bl String_dtor ldr r7, _020763E0 ; =0x00000B25 @@ -1901,7 +1901,7 @@ FUN_0207640C: ; 0x0207640C add r1, r1, #0x4 ldr r1, [r5, r1] add r2, r7, #0x0 - bl StringExpandPlaceholders + bl FUN_0200B7B8 add r0, r7, #0x0 bl String_dtor add r0, r4, #0x0 @@ -2109,7 +2109,7 @@ _020766BA: add r1, r1, #0x4 ldr r1, [r4, r1] add r2, r5, #0x0 - bl StringExpandPlaceholders + bl FUN_0200B7B8 add r0, r5, #0x0 bl String_dtor mov r1, #0x0 @@ -2156,7 +2156,7 @@ _02076724: add r1, r1, #0x4 ldr r1, [r4, r1] add r2, r5, #0x0 - bl StringExpandPlaceholders + bl FUN_0200B7B8 add r0, r5, #0x0 bl String_dtor mov r1, #0x0 @@ -2223,7 +2223,7 @@ _020767A4: add r1, r1, #0x4 ldr r1, [r4, r1] add r2, r5, #0x0 - bl StringExpandPlaceholders + bl FUN_0200B7B8 add r0, r5, #0x0 bl String_dtor mov r1, #0x0 @@ -2353,7 +2353,7 @@ _020768E6: add r1, r1, #0x4 ldr r1, [r4, r1] add r2, r5, #0x0 - bl StringExpandPlaceholders + bl FUN_0200B7B8 add r0, r5, #0x0 bl String_dtor mov r1, #0x0 @@ -2390,7 +2390,7 @@ FUN_02076950: ; 0x02076950 add r1, r1, #0x4 ldr r1, [r5, r1] add r2, r4, #0x0 - bl StringExpandPlaceholders + bl FUN_0200B7B8 add r0, r4, #0x0 bl String_dtor mov r1, #0x0 @@ -2428,7 +2428,7 @@ FUN_020769A4: ; 0x020769A4 add r1, r1, #0x4 ldr r1, [r5, r1] add r2, r4, #0x0 - bl StringExpandPlaceholders + bl FUN_0200B7B8 add r0, r4, #0x0 bl String_dtor mov r1, #0x0 @@ -2468,7 +2468,7 @@ FUN_020769FC: ; 0x020769FC add r1, r1, #0x4 ldr r1, [r5, r1] add r2, r4, #0x0 - bl StringExpandPlaceholders + bl FUN_0200B7B8 add r0, r4, #0x0 bl String_dtor mov r1, #0x0 @@ -2503,7 +2503,7 @@ FUN_02076A48: ; 0x02076A48 add r1, r1, #0x4 ldr r1, [r5, r1] add r2, r4, #0x0 - bl StringExpandPlaceholders + bl FUN_0200B7B8 add r0, r4, #0x0 bl String_dtor mov r1, #0x0 @@ -2650,7 +2650,7 @@ _02076B68: add r1, r1, #0x4 ldr r1, [r4, r1] add r2, r5, #0x0 - bl StringExpandPlaceholders + bl FUN_0200B7B8 add r0, r5, #0x0 bl String_dtor mov r1, #0x0 @@ -2679,7 +2679,7 @@ _02076BB2: add r1, r1, #0x4 ldr r1, [r4, r1] add r2, r5, #0x0 - bl StringExpandPlaceholders + bl FUN_0200B7B8 add r0, r5, #0x0 bl String_dtor mov r1, #0x0 @@ -2708,7 +2708,7 @@ _02076BF2: add r1, r1, #0x4 ldr r1, [r4, r1] add r2, r5, #0x0 - bl StringExpandPlaceholders + bl FUN_0200B7B8 add r0, r5, #0x0 bl String_dtor mov r1, #0x0 @@ -2738,7 +2738,7 @@ _02076C34: add r1, r1, #0x4 ldr r1, [r4, r1] add r2, r5, #0x0 - bl StringExpandPlaceholders + bl FUN_0200B7B8 add r0, r5, #0x0 bl String_dtor mov r1, #0x0 @@ -2821,7 +2821,7 @@ _02076CDC: add r1, r1, #0x4 ldr r1, [r4, r1] add r2, r5, #0x0 - bl StringExpandPlaceholders + bl FUN_0200B7B8 add r0, r5, #0x0 bl String_dtor mov r1, #0x0 @@ -2881,7 +2881,7 @@ FUN_02076D3C: ; 0x02076D3C add r1, r1, #0x4 ldr r1, [r5, r1] add r2, r4, #0x0 - bl StringExpandPlaceholders + bl FUN_0200B7B8 add r0, r4, #0x0 bl String_dtor mov r1, #0x0 @@ -2924,7 +2924,7 @@ FUN_02076DD4: ; 0x02076DD4 add r1, r1, #0x4 ldr r1, [r5, r1] add r2, r4, #0x0 - bl StringExpandPlaceholders + bl FUN_0200B7B8 add r0, r4, #0x0 bl String_dtor mov r1, #0x0 @@ -2962,7 +2962,7 @@ FUN_02076E28: ; 0x02076E28 add r1, r1, #0x4 ldr r1, [r5, r1] add r2, r4, #0x0 - bl StringExpandPlaceholders + bl FUN_0200B7B8 add r0, r4, #0x0 bl String_dtor mov r1, #0x0 @@ -3002,7 +3002,7 @@ FUN_02076E80: ; 0x02076E80 add r1, r1, #0x4 ldr r1, [r5, r1] add r2, r4, #0x0 - bl StringExpandPlaceholders + bl FUN_0200B7B8 add r0, r4, #0x0 bl String_dtor mov r1, #0x0 @@ -3040,7 +3040,7 @@ FUN_02076ED4: ; 0x02076ED4 add r1, r1, #0x4 ldr r1, [r5, r1] add r2, r4, #0x0 - bl StringExpandPlaceholders + bl FUN_0200B7B8 add r0, r4, #0x0 bl String_dtor mov r1, #0x0 @@ -3163,7 +3163,7 @@ FUN_02076FB0: ; 0x02076FB0 add r1, #0x8 ldr r1, [r5, r1] add r2, r7, #0x0 - bl StringExpandPlaceholders + bl FUN_0200B7B8 add r0, r7, #0x0 bl String_dtor cmp r4, #0x0 diff --git a/arm9/asm/unk_02079C70.s b/arm9/asm/unk_02079C70.s index 644dbb64..24ce0c2e 100644 --- a/arm9/asm/unk_02079C70.s +++ b/arm9/asm/unk_02079C70.s @@ -1871,7 +1871,7 @@ FUN_0207AB0C: ; 0x0207AB0C add r2, r2, #0x4 ldr r1, [r7, r1] ldr r2, [r7, r2] - bl StringExpandPlaceholders + bl FUN_0200B7B8 ldr r2, _0207AEAC ; =0x00000674 mov r1, #0x0 ldr r0, [r7, r2] @@ -1890,7 +1890,7 @@ FUN_0207AB0C: ; 0x0207AB0C add r2, r2, #0x4 ldr r1, [r7, r1] ldr r2, [r7, r2] - bl StringExpandPlaceholders + bl FUN_0200B7B8 ldr r2, _0207AEAC ; =0x00000674 mov r1, #0xe ldr r0, [r7, r2] @@ -1909,7 +1909,7 @@ FUN_0207AB0C: ; 0x0207AB0C add r2, r2, #0x4 ldr r1, [r7, r1] ldr r2, [r7, r2] - bl StringExpandPlaceholders + bl FUN_0200B7B8 add r0, r6, #0x0 mov r1, #0x6 mov r2, #0x0 diff --git a/arm9/asm/unk_0207D5BC.s b/arm9/asm/unk_0207D5BC.s index ecdfaaa3..d0a7ab43 100644 --- a/arm9/asm/unk_0207D5BC.s +++ b/arm9/asm/unk_0207D5BC.s @@ -410,7 +410,7 @@ FUN_0207D800: ; 0x0207D800 ldr r0, [r5, r1] add r1, r1, #0x4 ldr r1, [r5, r1] - bl StringExpandPlaceholders + bl FUN_0200B7B8 add r0, r4, #0x0 bl String_dtor mov r1, #0x0 @@ -463,7 +463,7 @@ FUN_0207D8A0: ; 0x0207D8A0 ldr r0, [r5, r1] add r1, r1, #0x4 ldr r1, [r5, r1] - bl StringExpandPlaceholders + bl FUN_0200B7B8 add r0, r4, #0x0 bl String_dtor b _0207D8F2 @@ -672,7 +672,7 @@ FUN_0207DA48: ; 0x0207DA48 ldr r0, [r5, r1] add r1, r1, #0x4 ldr r1, [r5, r1] - bl StringExpandPlaceholders + bl FUN_0200B7B8 add r0, r4, #0x0 bl String_dtor add sp, #0x8 @@ -1767,7 +1767,7 @@ FUN_0207E200: ; 0x0207E200 ldr r0, [r4, r1] add r1, r1, #0x4 ldr r1, [r4, r1] - bl StringExpandPlaceholders + bl FUN_0200B7B8 add r0, r5, #0x0 bl String_dtor mov r1, #0x91 @@ -2299,7 +2299,7 @@ FUN_0207E840: ; 0x0207E840 ldr r0, [r5, r1] add r1, r1, #0x4 ldr r1, [r5, r1] - bl StringExpandPlaceholders + bl FUN_0200B7B8 add r0, r4, #0x0 bl String_dtor mov r1, #0x1a @@ -2386,7 +2386,7 @@ FUN_0207E840: ; 0x0207E840 ldr r0, [r5, r1] add r1, r1, #0x4 ldr r1, [r5, r1] - bl StringExpandPlaceholders + bl FUN_0200B7B8 add r0, r6, #0x0 bl String_dtor mov r1, #0x1a diff --git a/arm9/asm/unk_0207FD00.s b/arm9/asm/unk_0207FD00.s index 9e7642aa..7269a626 100644 --- a/arm9/asm/unk_0207FD00.s +++ b/arm9/asm/unk_0207FD00.s @@ -606,7 +606,7 @@ FUN_02080108: ; 0x02080108 ldr r0, [r5, #0x8] ldr r1, [r5, #0x20] add r2, r4, #0x0 - bl StringExpandPlaceholders + bl FUN_0200B7B8 add r0, r4, #0x0 bl String_dtor add sp, #0x8 @@ -764,7 +764,7 @@ _0208036E: ldr r0, [r4, #0x8] ldr r1, [r4, #0x20] add r2, r5, #0x0 - bl StringExpandPlaceholders + bl FUN_0200B7B8 add r0, r5, #0x0 bl String_dtor add sp, #0x8 @@ -881,7 +881,7 @@ _02080478: ldr r0, [r5, #0x8] ldr r1, [r5, #0x20] add r2, r4, #0x0 - bl StringExpandPlaceholders + bl FUN_0200B7B8 add r0, r4, #0x0 bl String_dtor add sp, #0x8 diff --git a/arm9/asm/unk_02086414.s b/arm9/asm/unk_02086414.s index d479cde5..532dfc12 100644 --- a/arm9/asm/unk_02086414.s +++ b/arm9/asm/unk_02086414.s @@ -594,7 +594,7 @@ FUN_020867EC: ; 0x020867EC ldr r2, [sp, #0x14] add r0, r5, #0x0 add r1, r4, #0x0 - bl StringExpandPlaceholders + bl FUN_0200B7B8 mov r3, #0x0 str r3, [sp, #0x0] str r6, [sp, #0x4] diff --git a/arm9/asm/unk_0208A338.s b/arm9/asm/unk_0208A338.s index 3c3bfb6c..509ffd50 100644 --- a/arm9/asm/unk_0208A338.s +++ b/arm9/asm/unk_0208A338.s @@ -448,7 +448,7 @@ FUN_0208A6D4: ; 0x0208A6D4 ldr r0, [r5, #0xc] ldr r1, [r5, #0x8] ldr r2, [r5, #0x4] - bl StringExpandPlaceholders + bl FUN_0200B7B8 b _0208A6FA _0208A6F4: ldr r2, [r5, #0x8] |