Leahnaya/pokediamond
1
0
Fork 0
mirror of https://github.com/pret/pokediamond.git synced 2026-08-09 04:06:10 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

This function was misnamed

Browse Source
This commit is contained in:
PikalaxALT 2020-08-04 11:22:23 -04:00
parent 5a110f52d2
commit 1d5e9d12ea
54 changed files with 353 additions and 353 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arm9/asm/scrcmd.s
View File

@ -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

4
arm9/asm/unk_0200AA80.s
View File

@ -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

2
arm9/asm/unk_02033F50.s
View File

@ -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]

4
arm9/asm/unk_02035068.s
View File

@ -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

2
arm9/asm/unk_02048120.s
View File

@ -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

8
arm9/asm/unk_02050E48.s
View File

@ -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

4
arm9/asm/unk_020625EC.s
View File

@ -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

2
arm9/asm/unk_020653EC.s
View File

@ -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]

2
arm9/asm/unk_0206C700.s
View File

@ -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]

4
arm9/asm/unk_0206E2F0.s
View File

@ -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

14
arm9/asm/unk_0206F3FC.s
View File

@ -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

10
arm9/asm/unk_02072548.s
View File

@ -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]

4
arm9/asm/unk_02073DA8.s
View File

@ -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]

86
arm9/asm/unk_0207550C.s
View File

@ -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

6
arm9/asm/unk_02079C70.s
View File

@ -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

12
arm9/asm/unk_0207D5BC.s
View File

@ -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

6
arm9/asm/unk_0207FD00.s
View File

@ -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

2
arm9/asm/unk_02086414.s
View File

@ -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]

2
arm9/asm/unk_0208A338.s
View File

@ -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]

2
arm9/global.inc
View File

@ -598,7 +598,7 @@
.extern FUN_0200B708
.extern FUN_0200B764
.extern FUN_0200B7A8
.extern StringExpandPlaceholders
.extern FUN_0200B7B8
.extern FUN_0200B84C
.extern FUN_0200B870
.extern FUN_0200B990

14
arm9/modules/05/asm/mod05_021E1AD8.s
View File

@ -340,7 +340,7 @@ MOD05_021E1D38: ; 0x021E1D38
ldr r0, [r0]
ldr r1, [r1, #0x1c]
add r2, r4, #0
bl StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
mov r0, #0
add r1, r4, #0
add r2, r0, #0

6
arm9/modules/05/asm/module_05.s
View File

@ -311,7 +311,7 @@ MOD05_021E2DD4: ; 0x021E2DD4
ldr r0, [r4, #8]
ldr r1, [r4]
ldr r2, [r4, #4]
bl StringExpandPlaceholders
bl FUN_0200B7B8
pop {r4, pc}
.balign 4, 0
@ -27473,7 +27473,7 @@ _021F0204:
ldr r0, [r4, #0x38]
ldr r1, [r4, #0xc]
ldr r2, [r4, #8]
bl StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
ldr r0, [r4, #0xc]
bl LoadPlayerDataAddress
add r2, r0, #0

68
arm9/modules/06/asm/module_06.s
View File

@ -9418,7 +9418,7 @@ MOD06_0223DE34: ; 0x0223DE34
ldr r0, [r0]
add r1, r4, #0
add r2, r6, #0
bl StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
b _0223EE16
_0223EE08:
ldr r0, _0223EE70 ; =0x02252420
@ -11718,7 +11718,7 @@ _0223F11A:
ldr r2, [r0]
ldr r0, [r2, #0x50]
ldmia r2!, {r1, r2}
bl StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
mov r0, #0x4a
lsl r0, r0, #2
ldr r0, [r5, r0]

8
arm9/modules/07/asm/module_07.s
View File

@ -4511,7 +4511,7 @@ _022142BE:
ldr r0, [sp, #0x14]
ldr r2, [sp, #0x20]
add r1, r6, #0
bl StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
add r0, r5, #0
bl String_dtor
mov r1, #0

88
arm9/modules/09/asm/module_09.s
View File

@ -3480,7 +3480,7 @@ MOD09_022139D4: ; 0x022139D4
ldr r0, [r5, r1]
add r1, r1, #4
ldr r1, [r5, r1]
bl StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
add r0, r4, #0
mov r1, #0
bl FUN_02019620

24
arm9/modules/11/asm/module_11_thumb2.s
View File

@ -6224,7 +6224,7 @@ MOD11_022321EC: ; 0x022321EC
ldr r0, [r5, #0x14]
ldr r1, [r5, #0x18]
add r2, r4, #0
bl StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
ldr r2, [sp, #0x20]
add r0, r4, #0
add r1, r7, #0
bl StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
ldr r2, [sp, #0x20]
add r0, r4, #0
add r1, r7, #0
bl StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
ldr r2, [sp, #0x20]
add r0, r4, #0
add r1, r7, #0
bl StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
ldrh r0, [r5, #8]
ldrh r1, [r5, #0x10]
bl MOD11_0225B3D4

10
arm9/modules/12/asm/module_12.s
View File

@ -15271,7 +15271,7 @@ _02234F42:
ldr r0, [r5, #0x54]
ldr r1, [r5, #0x58]
add r2, r6, #0
bl StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
add r0, r5, #0
add r0, #0x34
mov r1, #0xff

2
arm9/modules/14/asm/module_14.s
View File

@ -20836,7 +20836,7 @@ MOD14_021E189C: ; 0x021E189C
ldr r0, [r5, #0x2c]
ldr r1, [r5, #0x34]
ldr r2, [r5, #0x30]
bl StringExpandPlaceholders
bl FUN_0200B7B8
mov r3, #0
str r3, [sp]
mov r0, #0xff

2
arm9/modules/15/asm/module_15.s
View File

@ -5232,7 +5232,7 @@ _021D9CDC:
ldr r2, [r4, #0x4c]
add r0, r5, #0
add r1, r6, #0
bl StringExpandPlaceholders
bl FUN_0200B7B8
mov r3, #0
str r3, [sp]
mov r0, #0xff

10
arm9/modules/17/asm/module_17.s
View File

@ -4772,7 +4772,7 @@ MOD17_021D99E0: ; 0x021D99E0
add r1, r4, #0
ldr r0, [r5, r0]
add r2, r6, #0
bl StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
add r0, r6, #0
bl String_dtor
mov r0, #0

32
arm9/modules/18/asm/module_18.s
View File

@ -7729,7 +7729,7 @@ _0223D212:
ldr r1, [sp]
add r0, r5, #0
add r2, r6, #0
bl StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
mov r0, #0x10
str r0, [sp]
mov r0, #0xff

2
arm9/modules/53/asm/module_53.s
View File

@ -3626,7 +3626,7 @@ MOD53_021D91C8: ; 0x021D91C8
ldr r0, [r5, #0xc]
ldr r1, [r5, #0x2c]
add r2, r6, #0
bl StringExpandPlaceholders
bl FUN_0200B7B8
add r0, r6, #0
bl String_dtor
mov r0, #0xb6

2
arm9/modules/54/asm/module_54.s
View File

@ -3006,7 +3006,7 @@ MOD54_021D8C90: ; 0x021D8C90
ldr r0, [r5, #0x24]
ldr r1, [r5, #0x44]
add r2, r4, #0
bl StringExpandPlaceholders
bl FUN_0200B7B8
add r0, r4, #0
bl String_dtor
mov r0, #0xba

24
arm9/modules/55/asm/module_55.s
View File

@ -1327,7 +1327,7 @@ _021D7F86:
ldr r0, [r5, #0xc]
ldr r1, [r1]
ldr r2, [r2]
bl StringExpandPlaceholders
bl FUN_0200B7B8
b _021D8002
_021D7FF4:
add r2, r7, #0
@ -3625,7 +3625,7 @@ _021D91D6:
ldr r0, [r5, #0xc]
ldr r1, [r1]
ldr r2, [r2]
bl StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
mov r0, #0xce
lsl r0, r0, #2
add r0, r5, r0

16
arm9/modules/56/asm/module_56.s
View File

@ -7051,7 +7051,7 @@ _02215532:
sub r2, #8
ldr r0, [r0]
ldr r2, [r5, r2]
bl StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
mov r0, #0xdb
lsl r0, r0, #2
add r0, r5, r0

12
arm9/modules/57/asm/module_57.s
View File

@ -2843,7 +2843,7 @@ _021D8AE0:
ldr r2, [sp, #0x10]
add r0, r4, #0
add r1, r5, #0
bl StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
mov r0, #0
add r1, r4, #0
add r2, r0, #0

2
arm9/modules/58/asm/module_58.s
View File

@ -2210,7 +2210,7 @@ MOD58_021DAB94: ; 0x021DAB94
ldr r0, [r5, #0x10]
ldr r1, [r5, #0x34]
add r2, r4, #0
bl StringExpandPlaceholders
bl FUN_0200B7B8
add r0, r4, #0
bl String_dtor
mov r0, #0xb5

2
arm9/modules/59/asm/module_59.s
View File

@ -995,7 +995,7 @@ _021D7C5E:
ldr r0, [r5, #0x64]
ldr r1, [r5, #0x5c]
add r2, r6, #0
bl StringExpandPlaceholders
bl FUN_0200B7B8
add r0, r6, #0
bl String_dtor
ldr r0, [r5, #8]

10
arm9/modules/65/asm/module_65.s
View File

@ -1579,7 +1579,7 @@ _021D80EE:
ldr r0, [r5, #0x30]
ldr r1, [r5, #0x34]
ldr r2, [r5, #0x3c]
bl StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
mov r3, #0
str r3, [sp]
ldr r0, [r4, #0x10]

72
arm9/modules/67/asm/module_67.s
View File

@ -1202,7 +1202,7 @@ _021D7E32:
ldr r0, [r5, #0x54]
ldr r1, [r5, #0x58]
add r2, r4, #0
bl StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
ldr r0, [r4, #0x58]
bl FUN_02021D3C
add r5, r5, r0
@ -1782,7 +1782,7 @@ _021D82F2:
ldr r0, [r4, #0x54]
ldr r1, [r4, #0x58]
add r2, r5, #0
bl StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
lsl r0, r6, #4
add r0, #0x70
str r0, [sp]

4
arm9/modules/68/asm/module_68.s
View File

@ -699,7 +699,7 @@ MOD68_021D7A18: ; 0x021D7A18
ldr r0, [r0]
add r1, r6, #0
add r2, r7, #0
bl StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
mov r1, #0
str r1, [sp]
mov r0, #0xff

8
arm9/modules/69/asm/module_69.s
View File

@ -2398,7 +2398,7 @@ _0222E95E:
ldr r0, [r4, #0x14]
ldr r1, [r4, #0x1c]
ldr r2, [r4, #0x18]
bl StringExpandPlaceholders
bl FUN_0200B7B8
add sp, #8
pop {r4, pc}
@ -2431,7 +2431,7 @@ _0222E996:
ldr r0, [r5, #0x14]
ldr r1, [r5, #0x1c]
ldr r2, [r5, #0x18]
bl StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
ldr r1, _0222EC54 ; =0x00001B54
mov r0, #0
ldr r1, [r4, r1]

4
arm9/modules/70/asm/module_70.s
View File

@ -1099,7 +1099,7 @@ MOD70_021D7CE8: ; 0x021D7CE8
add r2, r2, #4
ldr r1, [r5, r1]
ldr r2, [r5, r2]
bl StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
mov r1, #0
str r1, [sp]
mov r2, #0xff

12
arm9/modules/73/asm/module_73.s
View File

@ -4909,7 +4909,7 @@ _021D9B02:
ldr r0, [r2, #4]
ldr r1, [r2, #8]
ldr r2, [r2, #0x14]
bl StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
ldr r0, [r4, #0x1c]
ldr r5, [r0, #8]
b _021DA7EC

12
arm9/modules/74/asm/module_74.s
View File

@ -996,7 +996,7 @@ MOD74_021D7C10: ; 0x021D7C10
ldr r0, [r5, #0x2c]
ldr r1, [r5, #0x30]
ldr r2, [r5, #0x5c]
bl StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
mov r0, #4
str r0, [sp]
mov r1, #0

46
arm9/modules/75/asm/module_75.s
View File

@ -4734,7 +4734,7 @@ _021E908E:
ldr r0, [r4, r0]
ldr r1, [r4, r1]
add r2, r5, #0
bl StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
add r0, r6, #0
bl String_dtor
mov r1, #0xfe

4
arm9/modules/76/asm/module_76.s
View File

@ -1098,7 +1098,7 @@ MOD76_021D7D60: ; 0x021D7D60
ldr r0, [r0]
ldr r1, [r5, r1]
add r2, r4, #0
bl StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
add r0, r5, #0
bl String_dtor
pop {r3, r4, r5, pc}

2
arm9/modules/77/asm/module_77.s
View File

@ -2008,7 +2008,7 @@ MOD77_021D8510: ; 0x021D8510
add r1, r4, #0
ldr r0, [r5, r0]
add r2, r6, #0
bl StringExpandPlaceholders
bl FUN_0200B7B8
mov r1, #0
ldr r0, _021D85CC ; =0x0000C044
str r1, [sp]

10
arm9/modules/80/asm/module_80.s
View File

@ -4801,7 +4801,7 @@ MOD80_0222FB3C: ; 0x0222FB3C
add r1, #0x1c
ldr r1, [r5, r1]
add r2, r6, #0
bl StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
ldr r0, _02236DFC ; =0x00000EC8
mov r1, #0xf
add r0, r5, r0

8
arm9/modules/81/asm/module_81.s
View File

@ -2467,7 +2467,7 @@ _022390F4:
ldr r1, [r4, #0x58]
ldr r2, [r4, #0x54]
add r0, r7, #0
bl StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
add r0, r4, #0
add r0, #0x48
mov r1, #0xf

4
arm9/modules/82/asm/module_82.s
View File

@ -4032,7 +4032,7 @@ MOD82_0222F4D8: ; 0x0222F4D8
ldr r0, [r5, r1]
add r1, #0x10
ldr r1, [r5, r1]
bl StringExpandPlaceholders
bl FUN_0200B7B8
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 StringExpandPlaceholders
bl FUN_0200B7B8
mov r0, #0x37
lsl r0, r0, #6
add r0, r5, r0

2
arm9/modules/86/asm/module_86.s
View File

@ -816,7 +816,7 @@ MOD86_021D7B80: ; 0x021D7B80
ldr r0, [r5, #0x38]
add r1, r4, #0
add r2, r6, #0
bl StringExpandPlaceholders
bl FUN_0200B7B8
mov r0, #0x20
str r0, [sp]
mov r1, #0

2
arm9/src/msgdata.c
View File

@ -360,7 +360,7 @@ struct String * ReadMsgData_ExpandPlaceholders(u32 * a0, struct MsgData * msgDat
r5 = NewString_ReadMsgData(msgData, msgno);
if (r5 != NULL)
{
StringExpandPlaceholders(a0, r4, r5);
FUN_0200B7B8(a0, r4, r5);
ret = StringDup(r4, a3);
String_dtor(r5);
}

2
include/proto.h
View File

@ -20,6 +20,6 @@ void FUN_02005E90(int, int, int, int);
void FUN_020056AC(int, int, int, int, int);
void FUN_020808AC(struct BoxPokemon *, int, int, int, int);
void * FUN_02022610(void *, int);
void StringExpandPlaceholders(u32 *, struct String *, struct String *);
void FUN_0200B7B8(u32 *, struct String *, struct String *);
#endif //POKEDIAMOND_PROTO_H