summaryrefslogtreecommitdiff
path: root/arm9/asm
diff options
context:
space:
mode:
Diffstat (limited to 'arm9/asm')
-rw-r--r--arm9/asm/scrcmd.s51
-rw-r--r--arm9/asm/scrcmd_12.s22
-rw-r--r--arm9/asm/unk_0200AA80.s4
-rw-r--r--arm9/asm/unk_02033F50.s2
-rw-r--r--arm9/asm/unk_02035068.s4
-rw-r--r--arm9/asm/unk_02038C78.s22
-rw-r--r--arm9/asm/unk_02048120.s2
-rw-r--r--arm9/asm/unk_02050E48.s8
-rw-r--r--arm9/asm/unk_020625EC.s4
-rw-r--r--arm9/asm/unk_020653EC.s2
-rw-r--r--arm9/asm/unk_0206C700.s2
-rw-r--r--arm9/asm/unk_0206E2F0.s4
-rw-r--r--arm9/asm/unk_0206F3FC.s14
-rw-r--r--arm9/asm/unk_02072548.s10
-rw-r--r--arm9/asm/unk_02073DA8.s4
-rw-r--r--arm9/asm/unk_0207550C.s86
-rw-r--r--arm9/asm/unk_02079C70.s6
-rw-r--r--arm9/asm/unk_0207D5BC.s12
-rw-r--r--arm9/asm/unk_0207FD00.s6
-rw-r--r--arm9/asm/unk_02086414.s2
-rw-r--r--arm9/asm/unk_0208A338.s2
21 files changed, 135 insertions, 134 deletions
diff --git a/arm9/asm/scrcmd.s b/arm9/asm/scrcmd.s
index e979c01d..54004fe3 100644
--- a/arm9/asm/scrcmd.s
+++ b/arm9/asm/scrcmd.s
@@ -2,7 +2,7 @@
.include "global.inc"
.extern UNK_020F34E0
- .extern UNK_020F34E8
+ .extern sScriptConditionTable
.extern UNK_020F34FC
.extern UNK_020F3538
.extern gMain
@@ -16,26 +16,26 @@ UNK_021C5A0C: ; 0x021C5A0C
.text
- thumb_func_start FUN_020399A0
-FUN_020399A0: ; 0x020399A0
+ thumb_func_start ScrCmd_nop
+ScrCmd_nop: ; 0x020399A0
mov r0, #0x0
bx lr
- thumb_func_start FUN_020399A4
-FUN_020399A4: ; 0x020399A4
+ thumb_func_start ScrCmd_nop2
+ScrCmd_nop2: ; 0x020399A4
mov r0, #0x0
bx lr
- thumb_func_start FUN_020399A8
-FUN_020399A8: ; 0x020399A8
+ thumb_func_start ScrCmd_end
+ScrCmd_end: ; 0x020399A8
push {r3, lr}
bl StopScript
mov r0, #0x0
pop {r3, pc}
.balign 4
- thumb_func_start FUN_020399B4
-FUN_020399B4: ; 0x020399B4
+ thumb_func_start ScrCmd_delay
+ScrCmd_delay: ; 0x020399B4
push {r3-r7, lr}
add r5, r0, #0x0
add r1, r5, #0x0
@@ -480,8 +480,9 @@ FUN_02039CE4: ; 0x02039CE4
add r0, r1, #0x0
pop {r3, pc}
- thumb_func_start FUN_02039CF8
-FUN_02039CF8: ; 0x02039CF8
+ thumb_func_start ScrCmd_goto
+ScrCmd_goto: ; 0x02039CF8
+ ; relative jump
push {r4, lr}
add r4, r0, #0x0
bl ScriptReadWord
@@ -573,8 +574,8 @@ _02039DA8:
mov r0, #0x0
pop {r4-r6, pc}
- thumb_func_start FUN_02039DAC
-FUN_02039DAC: ; 0x02039DAC
+ thumb_func_start ScrCmd_call
+ScrCmd_call: ; 0x02039DAC
push {r4, lr}
add r4, r0, #0x0
bl ScriptReadWord
@@ -586,16 +587,16 @@ FUN_02039DAC: ; 0x02039DAC
mov r0, #0x0
pop {r4, pc}
- thumb_func_start FUN_02039DC4
-FUN_02039DC4: ; 0x02039DC4
+ thumb_func_start ScrCmd_return
+ScrCmd_return: ; 0x02039DC4
push {r3, lr}
bl ScriptReturn
mov r0, #0x0
pop {r3, pc}
.balign 4
- thumb_func_start FUN_02039DD0
-FUN_02039DD0: ; 0x02039DD0
+ thumb_func_start ScrCmd_gotoif
+ScrCmd_gotoif: ; 0x02039DD0
push {r3-r5, lr}
add r5, r0, #0x0
ldr r2, [r5, #0x8]
@@ -606,7 +607,7 @@ FUN_02039DD0: ; 0x02039DD0
add r1, r0, #0x0
lsl r0, r4, #0x1
add r3, r4, r0
- ldr r0, _02039E00 ; =UNK_020F34E8
+ ldr r0, _02039E00 ; =sScriptConditionTable
ldrb r2, [r5, #0x2]
add r0, r0, r3
ldrb r0, [r2, r0]
@@ -620,10 +621,10 @@ _02039DFC:
mov r0, #0x0
pop {r3-r5, pc}
.balign 4
-_02039E00: .word UNK_020F34E8
+_02039E00: .word sScriptConditionTable
- thumb_func_start FUN_02039E04
-FUN_02039E04: ; 0x02039E04
+ thumb_func_start ScrCmd_callif
+ScrCmd_callif: ; 0x02039E04
push {r3-r5, lr}
add r5, r0, #0x0
ldr r2, [r5, #0x8]
@@ -634,7 +635,7 @@ FUN_02039E04: ; 0x02039E04
add r1, r0, #0x0
lsl r0, r4, #0x1
add r3, r4, r0
- ldr r0, _02039E34 ; =UNK_020F34E8
+ ldr r0, _02039E34 ; =sScriptConditionTable
ldrb r2, [r5, #0x2]
add r0, r0, r3
ldrb r0, [r2, r0]
@@ -648,7 +649,7 @@ _02039E30:
mov r0, #0x0
pop {r3-r5, pc}
.balign 4
-_02039E34: .word UNK_020F34E8
+_02039E34: .word sScriptConditionTable
thumb_func_start FUN_02039E38
FUN_02039E38: ; 0x02039E38
@@ -1883,7 +1884,7 @@ _0203A7E0:
ldr r0, [r0, #0x0]
ldr r1, [r7, #0x0]
ldr r2, [r2, #0x0]
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
ldr r0, [r4, #0x60]
bl MOD05_021E8140
mov r3, #0x0
@@ -2011,7 +2012,7 @@ FUN_0203A8B8: ; 0x0203A8B8
ldr r1, [r7, #0x0]
ldr r0, [r0, #0x0]
ldr r2, [r6, #0x0]
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
ldr r0, [r4, #0x60]
bl MOD05_021E8140
add r4, r0, #0x0
diff --git a/arm9/asm/scrcmd_12.s b/arm9/asm/scrcmd_12.s
index 95f2fa63..8c9b6a15 100644
--- a/arm9/asm/scrcmd_12.s
+++ b/arm9/asm/scrcmd_12.s
@@ -5,17 +5,17 @@
.global UNK_020F43E4
UNK_020F43E4: ; 0x020F43E4
- .byte 0x11, 0x2F, 0x04, 0x02, 0x6D, 0x2F, 0x04, 0x02, 0x75, 0x32, 0x04, 0x02, 0xB5, 0x32, 0x04, 0x02
- .byte 0x11, 0x2F, 0x04, 0x02, 0xC1, 0x32, 0x04, 0x02, 0xC9, 0x32, 0x04, 0x02, 0xB5, 0x32, 0x04, 0x02
- .byte 0x09, 0x33, 0x04, 0x02, 0x31, 0x33, 0x04, 0x02, 0x59, 0x33, 0x04, 0x02, 0x95, 0x33, 0x04, 0x02
- .byte 0xC5, 0x33, 0x04, 0x02, 0xC9, 0x33, 0x04, 0x02, 0xDD, 0x33, 0x04, 0x02, 0x31, 0x34, 0x04, 0x02
- .byte 0x3D, 0x34, 0x04, 0x02, 0x55, 0x34, 0x04, 0x02, 0x6D, 0x34, 0x04, 0x02, 0xA5, 0x34, 0x04, 0x02
- .byte 0xB1, 0x34, 0x04, 0x02, 0xE9, 0x34, 0x04, 0x02, 0x39, 0x35, 0x04, 0x02, 0x95, 0x35, 0x04, 0x02
- .byte 0x11, 0x2F, 0x04, 0x02, 0x29, 0x2F, 0x04, 0x02, 0x49, 0x2F, 0x04, 0x02, 0xB5, 0x32, 0x04, 0x02
- .byte 0xA1, 0x35, 0x04, 0x02, 0xC5, 0x35, 0x04, 0x02, 0xF9, 0x35, 0x04, 0x02, 0x35, 0x36, 0x04, 0x02
- .byte 0x61, 0x36, 0x04, 0x02, 0x85, 0x36, 0x04, 0x02, 0xB9, 0x36, 0x04, 0x02, 0xF1, 0x36, 0x04, 0x02
- .byte 0x1D, 0x37, 0x04, 0x02, 0x41, 0x37, 0x04, 0x02, 0x75, 0x37, 0x04, 0x02, 0xB1, 0x37, 0x04, 0x02
- .byte 0xDD, 0x37, 0x04, 0x02, 0xF9, 0x37, 0x04, 0x02, 0x19, 0x38, 0x04, 0x02, 0x51, 0x38, 0x04, 0x02
+ .word FUN_02042F10, FUN_02042F6C, FUN_02043274, FUN_020432B4
+ .word FUN_02042F10, FUN_020432C0, FUN_020432C8, FUN_020432B4
+ .word FUN_02043308, FUN_02043330, FUN_02043358, FUN_02043394
+ .word FUN_020433C4, FUN_020433C8, FUN_020433DC, FUN_02043430
+ .word FUN_0204343C, FUN_02043454, FUN_0204346C, FUN_020434A4
+ .word FUN_020434B0, FUN_020434E8, FUN_02043538, FUN_02043594
+ .word FUN_02042F10, FUN_02042F28, FUN_02042F48, FUN_020432B4
+ .word FUN_020435A0, FUN_020435C4, FUN_020435F8, FUN_02043634
+ .word FUN_02043660, FUN_02043684, FUN_020436B8, FUN_020436F0
+ .word FUN_0204371C, FUN_02043740, FUN_02043774, FUN_020437B0
+ .word FUN_020437DC, FUN_020437F8, FUN_02043818, FUN_02043850
.text
diff --git a/arm9/asm/unk_0200AA80.s b/arm9/asm/unk_0200AA80.s
index a054a19f..011a54cf 100644
--- a/arm9/asm/unk_0200AA80.s
+++ b/arm9/asm/unk_0200AA80.s
@@ -1719,8 +1719,8 @@ FUN_0200B7A8: ; 0x0200B7A8
.balign 4
_0200B7B4: .word StrUpperFirstChar
- thumb_func_start FUN_0200B7B8
-FUN_0200B7B8: ; 0x0200B7B8
+ thumb_func_start StringExpandPlaceholders
+StringExpandPlaceholders: ; 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 acf3edeb..d514a9d6 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 FUN_0200B7B8
+ bl StringExpandPlaceholders
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 09b94b57..5a8b5870 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 FUN_0200B7B8
+ bl StringExpandPlaceholders
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 FUN_0200B7B8
+ bl StringExpandPlaceholders
mov r0, #0x10
str r0, [sp, #0x0]
mov r0, #0xff
diff --git a/arm9/asm/unk_02038C78.s b/arm9/asm/unk_02038C78.s
index 3445febe..51e97ffe 100644
--- a/arm9/asm/unk_02038C78.s
+++ b/arm9/asm/unk_02038C78.s
@@ -129,8 +129,8 @@ UNK_020F34DC: ; 0x020F34DC
UNK_020F34E0: ; 0x020F34E0
.byte 0x03, 0x19, 0x0D, 0x06, 0x04, 0x0D, 0x15, 0x03
- .global UNK_020F34E8
-UNK_020F34E8: ; 0x020F34E8
+ .global sScriptConditionTable
+sScriptConditionTable: ; 0x020F34E8
.byte 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01
.byte 0x00, 0x01, 0x00, 0x00
@@ -149,10 +149,10 @@ UNK_020F3538: ; 0x020F3538
.global gScriptCmdTable
gScriptCmdTable: ; 0x020F355C
- .word FUN_020399A0
- .word FUN_020399A4
- .word FUN_020399A8
- .word FUN_020399B4
+ .word ScrCmd_nop
+ .word ScrCmd_nop2
+ .word ScrCmd_end
+ .word ScrCmd_delay
.word FUN_02039A28
.word FUN_02039A40
.word FUN_02039A5C
@@ -171,14 +171,14 @@ gScriptCmdTable: ; 0x020F355C
.word FUN_02039C40
.word FUN_02039C78
.word FUN_02039CE4
- .word FUN_02039CF8
+ .word ScrCmd_goto
.word FUN_02039D10
.word FUN_02039D48
.word FUN_02039D78
- .word FUN_02039DAC
- .word FUN_02039DC4
- .word FUN_02039DD0
- .word FUN_02039E04
+ .word ScrCmd_call
+ .word ScrCmd_return
+ .word ScrCmd_gotoif
+ .word ScrCmd_callif
.word FUN_02039E38
.word FUN_02039E50
.word FUN_02039E68
diff --git a/arm9/asm/unk_02048120.s b/arm9/asm/unk_02048120.s
index 79bb65c1..93dbbb9a 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 FUN_0200B7B8
+ bl StringExpandPlaceholders
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 6971b088..34d0ee1c 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 FUN_0200B7B8
+ bl StringExpandPlaceholders
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 FUN_0200B7B8
+ bl StringExpandPlaceholders
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 FUN_0200B7B8
+ bl StringExpandPlaceholders
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 FUN_0200B7B8
+ bl StringExpandPlaceholders
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 618ef08b..d17df287 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 FUN_0200B7B8
+ bl StringExpandPlaceholders
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 FUN_0200B7B8
+ bl StringExpandPlaceholders
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 7dab8c17..3f2c8545 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 FUN_0200B7B8
+ bl StringExpandPlaceholders
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 52e88375..b27d0c31 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 FUN_0200B7B8
+ bl StringExpandPlaceholders
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 d46ad82e..6d87f0fa 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 FUN_0200B7B8
+ bl StringExpandPlaceholders
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 FUN_0200B7B8
+ bl StringExpandPlaceholders
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 d5e109fb..4dc1be07 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 FUN_0200B7B8
+ bl StringExpandPlaceholders
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 FUN_0200B7B8
+ bl StringExpandPlaceholders
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 FUN_0200B7B8
+ bl StringExpandPlaceholders
mov r4, #0xb
b _02072054
_02071FF2:
@@ -5623,7 +5623,7 @@ _02071FF2:
add r2, #0x8
ldr r1, [r5, r1]
ldr r2, [r5, r2]
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
mov r4, #0x9
b _02072054
_02072044:
@@ -5893,7 +5893,7 @@ _02072246:
add r2, #0x8
ldr r1, [r5, r1]
ldr r2, [r5, r2]
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
_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 FUN_0200B7B8
+ bl StringExpandPlaceholders
b _020723D6
_02072388:
ldr r0, _02072410 ; =0x000005A4
@@ -6050,7 +6050,7 @@ _02072388:
add r2, #0x8
ldr r1, [r5, r1]
ldr r2, [r5, r2]
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
_020723D6:
mov r0, #0x89
lsl r0, r0, #0x2
diff --git a/arm9/asm/unk_02072548.s b/arm9/asm/unk_02072548.s
index e4f28bfe..16c4a95b 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 FUN_0200B7B8
+ bl StringExpandPlaceholders
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 FUN_0200B7B8
+ bl StringExpandPlaceholders
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 FUN_0200B7B8
+ bl StringExpandPlaceholders
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 FUN_0200B7B8
+ bl StringExpandPlaceholders
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 FUN_0200B7B8
+ bl StringExpandPlaceholders
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 98d5417f..4dc42878 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 FUN_0200B7B8
+ bl StringExpandPlaceholders
b _02074018
_02073F66:
ldr r0, [r5, r0]
@@ -280,7 +280,7 @@ _02073F66:
add r2, #0x8
ldr r1, [r5, r1]
ldr r2, [r5, r2]
- bl FUN_0200B7B8
+ bl StringExpandPlaceholders
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 a17d5fd5..d2c20b95 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 FUN_0200B7B8
+ bl StringExpandPlaceholders
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 FUN_0200B7B8
+ bl StringExpandPlaceholders
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 FUN_0200B7B8
+ bl StringExpandPlaceholders
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 FUN_0200B7B8
+ bl StringExpandPlaceholders
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 FUN_0200B7B8
+ bl StringExpandPlaceholders
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 FUN_0200B7B8
+ bl StringExpandPlaceholders
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 FUN_0200B7B8
+ bl StringExpandPlaceholders
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 FUN_0200B7B8
+ bl StringExpandPlaceholders
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 FUN_0200B7B8
+ bl StringExpandPlaceholders
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 FUN_0200B7B8
+ bl StringExpandPlaceholders
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 FUN_0200B7B8
+ bl StringExpandPlaceholders
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 FUN_0200B7B8
+ bl StringExpandPlaceholders
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 FUN_0200B7B8
+ bl StringExpandPlaceholders
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 FUN_0200B7B8
+ bl StringExpandPlaceholders
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 FUN_0200B7B8
+ bl StringExpandPlaceholders
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 FUN_0200B7B8
+ bl StringExpandPlaceholders
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 FUN_0200B7B8
+ bl StringExpandPlaceholders
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 FUN_0200B7B8
+ bl StringExpandPlaceholders
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 FUN_0200B7B8
+ bl StringExpandPlaceholders
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 FUN_0200B7B8
+ bl StringExpandPlaceholders
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 FUN_0200B7B8
+ bl StringExpandPlaceholders
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 FUN_0200B7B8
+ bl StringExpandPlaceholders
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 FUN_0200B7B8
+ bl StringExpandPlaceholders
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 FUN_0200B7B8
+ bl StringExpandPlaceholders
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 FUN_0200B7B8
+ bl StringExpandPlaceholders
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 FUN_0200B7B8
+ bl StringExpandPlaceholders
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 FUN_0200B7B8
+ bl StringExpandPlaceholders
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 FUN_0200B7B8
+ bl StringExpandPlaceholders
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 FUN_0200B7B8
+ bl StringExpandPlaceholders
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 FUN_0200B7B8
+ bl StringExpandPlaceholders
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 FUN_0200B7B8
+ bl StringExpandPlaceholders
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 FUN_0200B7B8
+ bl StringExpandPlaceholders
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 FUN_0200B7B8
+ bl StringExpandPlaceholders
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 FUN_0200B7B8
+ bl StringExpandPlaceholders
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 FUN_0200B7B8
+ bl StringExpandPlaceholders
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 FUN_0200B7B8
+ bl StringExpandPlaceholders
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 FUN_0200B7B8
+ bl StringExpandPlaceholders
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 FUN_0200B7B8
+ bl StringExpandPlaceholders
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 FUN_0200B7B8
+ bl StringExpandPlaceholders
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 FUN_0200B7B8
+ bl StringExpandPlaceholders
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 FUN_0200B7B8
+ bl StringExpandPlaceholders
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 FUN_0200B7B8
+ bl StringExpandPlaceholders
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 FUN_0200B7B8
+ bl StringExpandPlaceholders
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 32848371..403f1cc1 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 FUN_0200B7B8
+ bl StringExpandPlaceholders
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 FUN_0200B7B8
+ bl StringExpandPlaceholders
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 FUN_0200B7B8
+ bl StringExpandPlaceholders
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 28f9597d..3163b4c6 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 FUN_0200B7B8
+ bl StringExpandPlaceholders
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 FUN_0200B7B8
+ bl StringExpandPlaceholders
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 FUN_0200B7B8
+ bl StringExpandPlaceholders
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 FUN_0200B7B8
+ bl StringExpandPlaceholders
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 FUN_0200B7B8
+ bl StringExpandPlaceholders
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 FUN_0200B7B8
+ bl StringExpandPlaceholders
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 7269a626..9e7642aa 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 FUN_0200B7B8
+ bl StringExpandPlaceholders
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 FUN_0200B7B8
+ bl StringExpandPlaceholders
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 FUN_0200B7B8
+ bl StringExpandPlaceholders
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 7c862646..598bb827 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 FUN_0200B7B8
+ bl StringExpandPlaceholders
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 7425416f..81b8d40e 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 FUN_0200B7B8
+ bl StringExpandPlaceholders
b _0208A6FA
_0208A6F4:
ldr r2, [r5, #0x8]
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-09 05:32:31 +0000