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

String_Delete -> String_Free

Browse Source
This commit is contained in:
Eduardo Quezada 2025-12-29 22:57:07 -03:00
parent 5325256624
commit be1e5e569e
112 changed files with 889 additions and 889 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arm9/asm/scrcmd_12.s
View File

@ -640,7 +640,7 @@ _020431D4:
bl SetMonData
add r0, r5, #0x0
add r4, r7, #0x0
bl String_Delete
bl String_Free
_0204322C:
ldr r1, [sp, #0x8]
mov r0, #0x2
@ -894,7 +894,7 @@ sub_020433DC: ; 0x020433DC
mov r3, #0x0
bl BufferString
add r0, r4, #0x0
bl String_Delete
bl String_Free
add sp, #0x8
pop {r3-r7, pc}

2
arm9/asm/scrcmd_9.s
View File

@ -538,7 +538,7 @@ sub_0204224C: ; 0x0204224C
add r2, r4, #0x0
bl BufferString
add r0, r4, #0x0
bl String_Delete
bl String_Free
add sp, #0xc
pop {r4-r7, pc}
.balign 4

2
arm9/asm/unk_02012CC8.s
View File

@ -1523,7 +1523,7 @@ _020136CA:
ldr r0, [r4, #0x4]
cmp r0, #0x0
beq _020136D8
bl String_Delete
bl String_Free
_020136D8:
add r0, r4, #0x0
bl Heap_Free

2
arm9/asm/unk_020144FC.s
View File

@ -64,7 +64,7 @@ sub_02014564: ; 0x02014564
add r5, #0x70
_0201456E:
ldr r0, [r5, #0x4]
bl String_Delete
bl String_Free
sub r5, r5, #0x4
sub r4, r4, #0x1
bpl _0201456E

4
arm9/asm/unk_0202B870.s
View File

@ -288,7 +288,7 @@ _0202BA38:
ldr r0, [sp, #0x0]
bl Heap_Free
add r0, r7, #0x0
bl String_Delete
bl String_Free
ldr r0, [sp, #0x4]
add sp, #0xc
pop {r4-r7, pc}
@ -844,7 +844,7 @@ _0202BE74:
ldr r0, [r5, #0xc]
cmp r0, #0x0
beq _0202BE7E
bl String_Delete
bl String_Free
_0202BE7E:
add r4, r4, #0x1
add r5, #0xc

4
arm9/asm/unk_02033874.s
View File

@ -285,7 +285,7 @@ _02033AA6:
add r1, r5, #0x0
bl sub_020283C0
ldr r0, [sp, #0xc]
bl String_Delete
bl String_Free
add r0, r6, #0x0
bl PlayerProfile_GetTrainerGender
add r3, r0, #0x0
@ -339,7 +339,7 @@ _02033B22:
add r1, r5, #0x0
bl sub_02028404
ldr r0, [sp, #0x10]
bl String_Delete
bl String_Free
add r0, r6, #0x0
bl PlayerProfile_GetAvatar
add r3, r0, #0x0

10
arm9/asm/unk_02035068.s
View File

@ -686,9 +686,9 @@ _02035526:
add r1, r7, #0x0
bl ListMenuItems_AddItem
ldr r0, [sp, #0x20]
bl String_Delete
bl String_Free
add r0, r7, #0x0
bl String_Delete
bl String_Free
add r0, r6, #0x0
bl MessageFormat_Delete
b _020355A2
@ -994,7 +994,7 @@ _020357D6:
str r1, [sp, #0x8]
bl AddTextPrinterParameterized
add r0, r7, #0x0
bl String_Delete
bl String_Free
mov r0, #0xb
bl MessageFormat_New
add r7, r0, #0x0
@ -1049,9 +1049,9 @@ _0203584C:
str r1, [sp, #0x8]
bl AddTextPrinterParameterized
ldr r0, [sp, #0x18]
bl String_Delete
bl String_Free
ldr r0, [sp, #0x14]
bl String_Delete
bl String_Free
add r0, r7, #0x0
bl MessageFormat_Delete
ldr r0, [sp, #0x1c]

2
arm9/asm/unk_020377F0.s
View File

@ -1889,7 +1889,7 @@ _0203852E:
ldr r0, [r4, #0xc]
bl sub_02077AC4
ldr r0, [r4, #0x10]
bl String_Delete
bl String_Free
add r0, r4, #0x0
bl Heap_Free
mov r0, #0x1

4
arm9/asm/unk_02038C78.s
View File

@ -1058,9 +1058,9 @@ _02038DD2:
ldr r0, [r4, #0x40]
bl MessageFormat_Delete
ldr r0, [r4, #0x44]
bl String_Delete
bl String_Free
ldr r0, [r4, #0x48]
bl String_Delete
bl String_Free
mov r0, #0x0
str r0, [r4, #0x0]
add r0, r4, #0x0

2
arm9/asm/unk_020476CC.s
View File

@ -218,7 +218,7 @@ sub_02047814: ; 0x02047814
ldr r0, [r0, #0x0]
bl CopyPlayerName
add r0, r7, #0x0
bl String_Delete
bl String_Free
ldr r0, [sp, #0x18]
bl DestroyMsgData
ldr r0, [sp, #0x10]

4
arm9/asm/unk_020484A8.s
View File

@ -442,7 +442,7 @@ sub_02048848: ; 0x02048848
push {r4, lr}
add r4, r0, #0x0
ldr r0, [r4, #0x2c]
bl String_Delete
bl String_Free
ldr r0, [r4, #0x30]
bl sub_0200DBFC
add r4, #0x1c
@ -510,7 +510,7 @@ sub_020488D4: ; 0x020488D4
ldr r0, [r4, #0x2c]
cmp r0, #0x0
beq _020488E4
bl String_Delete
bl String_Free
_020488E4:
add r0, r4, #0x0
add r0, #0x1c

2
arm9/asm/unk_02048904.s
View File

@ -2026,7 +2026,7 @@ _020498DC:
cmp r0, #0x1
bne _0204992C
ldr r0, [r4, #0x34]
bl String_Delete
bl String_Free
mov r0, #0x0
str r0, [sp, #0x0]
mov r3, #0xb

4
arm9/asm/unk_0204CB20.s
View File

@ -6065,7 +6065,7 @@ _0204F990:
add r1, r4, #0x0
bl sub_020311D0
add r0, r5, #0x0
bl String_Delete
bl String_Free
add r0, r4, #0x0
bl Heap_Free
pop {r3-r5, pc}
@ -6141,7 +6141,7 @@ _0204FA26:
mov r2, #0x1
bl sub_02030BC4
ldr r0, [sp, #0x0]
bl String_Delete
bl String_Free
ldr r0, _0204FA54 ; =UNK_021C5A68
mov r2, #0x1
ldr r1, [r0, #0x0]

8
arm9/asm/unk_02050E48.s
View File

@ -1438,9 +1438,9 @@ _020519BA:
ldr r0, [r4, #0x28]
bl MessageFormat_Delete
ldr r0, [r4, #0xc]
bl String_Delete
bl String_Free
ldr r0, [r4, #0x10]
bl String_Delete
bl String_Free
ldr r0, [r4, #0x78]
bl DestroyListMenuCursorObj
add r0, r4, #0x0
@ -2196,9 +2196,9 @@ _02051F7C:
ldr r0, [r4, #0x18]
bl MessageFormat_Delete
ldr r0, [r4, #0x0]
bl String_Delete
bl String_Free
ldr r0, [r4, #0x4]
bl String_Delete
bl String_Free
add r0, r4, #0x0
add r0, #0x8
mov r1, #0x0

4
arm9/asm/unk_02052EE8.s
View File

@ -917,12 +917,12 @@ sub_020535E0: ; 0x020535E0
ldr r0, [r4, #0x4]
cmp r0, #0x0
beq _020535F4
bl String_Delete
bl String_Free
_020535F4:
ldr r0, [r4, #0x8]
cmp r0, #0x0
beq _020535FE
bl String_Delete
bl String_Free
_020535FE:
pop {r4, pc}

2
arm9/asm/unk_0205CE48.s
View File

@ -1473,7 +1473,7 @@ _0205D984:
add r0, r4, #0x0
bl RemoveWindow
ldr r0, [r4, #0x10]
bl String_Delete
bl String_Free
add r0, r4, #0x0
bl Heap_Free
mov r0, #0x1

10
arm9/asm/unk_02060CCC.s
View File

@ -278,7 +278,7 @@ sub_02060D90: ; 0x02060D90
add r2, r4, #0x0
bl BufferString
add r0, r4, #0x0
bl String_Delete
bl String_Free
add sp, #0xc
pop {r4-r7, pc}
.balign 4
@ -329,7 +329,7 @@ sub_02060E04: ; 0x02060E04
mov r2, #0xb
bl CopyStringToU16Array
add r0, r4, #0x0
bl String_Delete
bl String_Free
pop {r4-r6, pc}
.balign 4
@ -438,7 +438,7 @@ sub_02060ECC: ; 0x02060ECC
mov r2, #0xb
bl CopyStringToU16Array
add r0, r4, #0x0
bl String_Delete
bl String_Free
_02060F0C:
pop {r3-r7, pc}
.balign 4
@ -1546,7 +1546,7 @@ sub_02061750: ; 0x02061750
mov r3, #0x0
bl BufferString
add r0, r4, #0x0
bl String_Delete
bl String_Free
mov r0, #0x5
add sp, #0x8
pop {r4-r6, pc}
@ -3390,7 +3390,7 @@ _0206257A:
add r3, r6, #0x0
bl BufferString
add r0, r4, #0x0
bl String_Delete
bl String_Free
add r0, r5, #0x0
bl sub_0202769C
add r2, r0, #0x0

18
arm9/asm/unk_020625EC.s
View File

@ -1011,7 +1011,7 @@ _02062D40:
add r0, r5, #0x0
add r0, #0x94
ldr r0, [r0, #0x0]
bl String_Delete
bl String_Free
add r4, r4, #0x1
add r5, r5, #0x4
cmp r4, #0x3
@ -1020,7 +1020,7 @@ _02062D40:
add r4, r6, #0x0
_02062D56:
ldr r0, [r4, #0x48]
bl String_Delete
bl String_Free
add r5, r5, #0x1
add r4, r4, #0x4
cmp r5, #0x7
@ -1032,9 +1032,9 @@ _02062D56:
add r4, r6, #0x0
_02062D6E:
ldr r0, [r4, #0x64]
bl String_Delete
bl String_Free
ldr r0, [r4, #0x7c]
bl String_Delete
bl String_Free
ldrb r0, [r6, #0x18]
add r5, r5, #0x1
add r4, r4, #0x4
@ -1042,15 +1042,15 @@ _02062D6E:
blt _02062D6E
_02062D84:
ldr r0, [r6, #0x44]
bl String_Delete
bl String_Free
ldr r0, [r6, #0x40]
bl String_Delete
bl String_Free
ldr r0, [r6, #0x3c]
bl String_Delete
bl String_Free
ldr r0, [r6, #0x38]
bl String_Delete
bl String_Free
ldr r0, [r6, #0x34]
bl String_Delete
bl String_Free
ldr r0, [r6, #0x30]
bl MessageFormat_Delete
ldr r0, [r6, #0x2c]

10
arm9/asm/unk_020653EC.s
View File

@ -1586,7 +1586,7 @@ _02066050:
ldr r0, [r0, #0x8]
cmp r0, #0x0
beq _02066060
bl String_Delete
bl String_Free
_02066060:
add r0, r4, #0x1
lsl r0, r0, #0x18
@ -1912,7 +1912,7 @@ sub_020662E4: ; 0x020662E4
lsl r7, r7, #0x4
_020662F0:
ldr r0, [r5, r7]
bl String_Delete
bl String_Free
add r4, r4, #0x1
add r5, r5, #0x4
cmp r4, #0x6
@ -1920,15 +1920,15 @@ _020662F0:
mov r0, #0x47
lsl r0, r0, #0x2
ldr r0, [r6, r0]
bl String_Delete
bl String_Free
mov r0, #0x46
lsl r0, r0, #0x2
ldr r0, [r6, r0]
bl String_Delete
bl String_Free
mov r0, #0x45
lsl r0, r0, #0x2
ldr r0, [r6, r0]
bl String_Delete
bl String_Free
mov r0, #0x11
lsl r0, r0, #0x4
ldr r0, [r6, r0]

12
arm9/asm/unk_0206F3FC.s
View File

@ -982,23 +982,23 @@ sub_0206FAA4: ; 0x0206FAA4
lsl r7, r7, #0x8
_0206FAD8:
ldr r0, [r5, r7]
bl String_Delete
bl String_Free
add r4, r4, #0x1
add r5, #0x2c
cmp r4, #0x6
blo _0206FAD8
ldr r0, _0206FB40 ; =0x000006A4
ldr r0, [r6, r0]
bl String_Delete
bl String_Free
ldr r0, _0206FB44 ; =0x000006A8
ldr r0, [r6, r0]
bl String_Delete
bl String_Free
ldr r7, _0206FB48 ; =0x000006AC
mov r5, #0x0
add r4, r6, #0x0
_0206FAFC:
ldr r0, [r4, r7]
bl String_Delete
bl String_Free
add r5, r5, #0x1
add r4, r4, #0x4
cmp r5, #0x13
@ -4409,7 +4409,7 @@ _02071630:
add r2, r5, #0x0
bl StringExpandPlaceholders
add r0, r5, #0x0
bl String_Delete
bl String_Free
mov r1, #0x0
add r0, r4, #0x0
mvn r1, r1
@ -5070,7 +5070,7 @@ _02071B34:
add r2, r5, #0x0
bl StringExpandPlaceholders
add r0, r5, #0x0
bl String_Delete
bl String_Free
mov r1, #0x0
add r0, r4, #0x0
mvn r1, r1

20
arm9/asm/unk_02072548.s
View File

@ -418,7 +418,7 @@ sub_020727FC: ; 0x020727FC
add r2, r6, #0x0
bl StringExpandPlaceholders
add r0, r6, #0x0
bl String_Delete
bl String_Free
pop {r3-r7, pc}
nop
_02072840: .word 0x0000069C
@ -605,7 +605,7 @@ _0207297E:
add r2, r4, #0x0
bl StringExpandPlaceholders
add r0, r4, #0x0
bl String_Delete
bl String_Free
pop {r4-r6, pc}
nop
_020729C4: .word 0x000005A4
@ -669,7 +669,7 @@ sub_02072A00: ; 0x02072A00
add r2, r6, #0x0
bl StringExpandPlaceholders
add r0, r6, #0x0
bl String_Delete
bl String_Free
pop {r3-r7, pc}
nop
_02072A4C: .word 0x0000069C
@ -1795,7 +1795,7 @@ _02073332:
str r1, [sp, #0xc]
bl AddTextPrinterParameterized2
ldr r0, [sp, #0x10]
bl String_Delete
bl String_Free
add r0, r4, r6
bl ScheduleWindowCopyToVram
add sp, #0x14
@ -1858,7 +1858,7 @@ _020733B4:
str r1, [sp, #0xc]
bl AddTextPrinterParameterized2
ldr r0, [sp, #0x10]
bl String_Delete
bl String_Free
add r0, r4, r7
bl ScheduleWindowCopyToVram
add sp, #0x14
@ -1906,7 +1906,7 @@ _02073416:
str r1, [sp, #0xc]
bl AddTextPrinterParameterized2
add r0, r5, #0x0
bl String_Delete
bl String_Free
add r0, r4, r6
bl ScheduleWindowCopyToVram
add sp, #0x10
@ -1964,7 +1964,7 @@ _02073490:
str r1, [sp, #0xc]
bl AddTextPrinterParameterized2
add r0, r5, #0x0
bl String_Delete
bl String_Free
add r0, r4, r7
bl ScheduleWindowCopyToVram
add sp, #0x10
@ -2071,7 +2071,7 @@ _0207356C:
add r3, r1, #0x0
bl AddTextPrinterParameterized
ldr r0, [sp, #0x18]
bl String_Delete
bl String_Free
ldr r0, _02073630 ; =0x0000069C
mov r1, #0xbf
ldr r0, [r5, r0]
@ -2099,7 +2099,7 @@ _0207356C:
ldr r2, [sp, #0x1c]
bl StringExpandPlaceholders
ldr r0, [sp, #0x1c]
bl String_Delete
bl String_Free
ldr r1, _02073638 ; =0x000006A4
mov r0, #0x0
ldr r1, [r5, r1]
@ -2216,7 +2216,7 @@ _0207366E:
cmp r0, #0x6
blo _0207366E
ldr r0, [sp, #0xc]
bl String_Delete
bl String_Free
mov r0, #0x95
lsl r0, r0, #0x2
add r0, r5, r0

86
arm9/asm/unk_0207550C.s
View File

@ -428,7 +428,7 @@ _0207586C:
add r2, r5, #0x0
bl StringExpandPlaceholders
add r0, r5, #0x0
bl String_Delete
bl String_Free
pop {r4-r6, pc}
_02075890:
ldr r0, _02075B94 ; =0x0000069C
@ -444,7 +444,7 @@ _02075890:
add r2, r5, #0x0
bl StringExpandPlaceholders
add r0, r5, #0x0
bl String_Delete
bl String_Free
pop {r4-r6, pc}
_020758B4:
ldr r0, _02075B94 ; =0x0000069C
@ -460,7 +460,7 @@ _020758B4:
add r2, r5, #0x0
bl StringExpandPlaceholders
add r0, r5, #0x0
bl String_Delete
bl String_Free
pop {r4-r6, pc}
_020758D8:
ldr r0, _02075B94 ; =0x0000069C
@ -476,7 +476,7 @@ _020758D8:
add r2, r5, #0x0
bl StringExpandPlaceholders
add r0, r5, #0x0
bl String_Delete
bl String_Free
pop {r4-r6, pc}
_020758FC:
ldr r0, _02075B94 ; =0x0000069C
@ -492,7 +492,7 @@ _020758FC:
add r2, r5, #0x0
bl StringExpandPlaceholders
add r0, r5, #0x0
bl String_Delete
bl String_Free
pop {r4-r6, pc}
_02075920:
ldr r0, _02075B94 ; =0x0000069C
@ -508,7 +508,7 @@ _02075920:
add r2, r5, #0x0
bl StringExpandPlaceholders
add r0, r5, #0x0
bl String_Delete
bl String_Free
pop {r4-r6, pc}
_02075944:
ldr r0, _02075B94 ; =0x0000069C
@ -524,7 +524,7 @@ _02075944:
add r2, r5, #0x0
bl StringExpandPlaceholders
add r0, r5, #0x0
bl String_Delete
bl String_Free
pop {r4-r6, pc}
_02075968:
ldr r0, _02075B94 ; =0x0000069C
@ -540,7 +540,7 @@ _02075968:
add r2, r5, #0x0
bl StringExpandPlaceholders
add r0, r5, #0x0
bl String_Delete
bl String_Free
pop {r4-r6, pc}
_0207598C:
ldr r0, _02075B94 ; =0x0000069C
@ -562,7 +562,7 @@ _0207598C:
add r2, r5, #0x0
bl StringExpandPlaceholders
add r0, r5, #0x0
bl String_Delete
bl String_Free
pop {r4-r6, pc}
_020759BE:
ldr r0, _02075B94 ; =0x0000069C
@ -584,7 +584,7 @@ _020759BE:
add r2, r5, #0x0
bl StringExpandPlaceholders
add r0, r5, #0x0
bl String_Delete
bl String_Free
pop {r4-r6, pc}
_020759F0:
ldr r0, _02075B94 ; =0x0000069C
@ -606,7 +606,7 @@ _020759F0:
add r2, r5, #0x0
bl StringExpandPlaceholders
add r0, r5, #0x0
bl String_Delete
bl String_Free
pop {r4-r6, pc}
_02075A22:
ldr r0, _02075B94 ; =0x0000069C
@ -628,7 +628,7 @@ _02075A22:
add r2, r5, #0x0
bl StringExpandPlaceholders
add r0, r5, #0x0
bl String_Delete
bl String_Free
pop {r4-r6, pc}
_02075A54:
ldr r0, _02075B94 ; =0x0000069C
@ -650,7 +650,7 @@ _02075A54:
add r2, r5, #0x0
bl StringExpandPlaceholders
add r0, r5, #0x0
bl String_Delete
bl String_Free
pop {r4-r6, pc}
_02075A86:
ldr r0, _02075B94 ; =0x0000069C
@ -672,7 +672,7 @@ _02075A86:
add r2, r5, #0x0
bl StringExpandPlaceholders
add r0, r5, #0x0
bl String_Delete
bl String_Free
pop {r4-r6, pc}
_02075AB8:
ldr r0, _02075B94 ; =0x0000069C
@ -695,7 +695,7 @@ _02075AB8:
add r2, r5, #0x0
bl StringExpandPlaceholders
add r0, r5, #0x0
bl String_Delete
bl String_Free
pop {r4-r6, pc}
_02075AEC:
ldr r0, _02075B94 ; =0x0000069C
@ -718,7 +718,7 @@ _02075AEC:
add r2, r5, #0x0
bl StringExpandPlaceholders
add r0, r5, #0x0
bl String_Delete
bl String_Free
pop {r4-r6, pc}
_02075B20:
ldr r0, _02075B94 ; =0x0000069C
@ -741,7 +741,7 @@ _02075B20:
add r2, r5, #0x0
bl StringExpandPlaceholders
add r0, r5, #0x0
bl String_Delete
bl String_Free
pop {r4-r6, pc}
_02075B54:
ldr r0, _02075B94 ; =0x0000069C
@ -764,7 +764,7 @@ _02075B54:
add r2, r5, #0x0
bl StringExpandPlaceholders
add r0, r5, #0x0
bl String_Delete
bl String_Free
pop {r4-r6, pc}
_02075B88:
ldr r0, _02075B94 ; =0x0000069C
@ -793,7 +793,7 @@ _02075B98:
add r2, r5, #0x0
bl StringExpandPlaceholders
add r0, r5, #0x0
bl String_Delete
bl String_Free
pop {r4-r6, pc}
_02075BCA:
ldr r0, _02075C50 ; =0x0000069C
@ -816,7 +816,7 @@ _02075BCA:
add r2, r5, #0x0
bl StringExpandPlaceholders
add r0, r5, #0x0
bl String_Delete
bl String_Free
pop {r4-r6, pc}
_02075BFE:
ldr r0, _02075C50 ; =0x0000069C
@ -838,7 +838,7 @@ _02075BFE:
add r2, r6, #0x0
bl StringExpandPlaceholders
add r0, r6, #0x0
bl String_Delete
bl String_Free
pop {r4-r6, pc}
_02075C30:
ldr r2, _02075C50 ; =0x0000069C
@ -1313,7 +1313,7 @@ _02075FDA:
add r2, r7, #0x0
bl StringExpandPlaceholders
add r0, r7, #0x0
bl String_Delete
bl String_Free
ldr r0, [sp, #0x8]
bl sub_0207C2D4
add r4, r0, #0x0
@ -1596,7 +1596,7 @@ _02076212:
add r2, r6, #0x0
bl StringExpandPlaceholders
add r0, r6, #0x0
bl String_Delete
bl String_Free
ldr r7, _020763E0 ; =0x00000B25
ldr r3, _020763F4 ; =0x0000070E
ldrb r5, [r4, r7]
@ -1903,7 +1903,7 @@ sub_0207640C: ; 0x0207640C
add r2, r7, #0x0
bl StringExpandPlaceholders
add r0, r7, #0x0
bl String_Delete
bl String_Free
add r0, r4, #0x0
bl sub_0207C2D4
add r4, r0, #0x0
@ -2111,7 +2111,7 @@ _020766BA:
add r2, r5, #0x0
bl StringExpandPlaceholders
add r0, r5, #0x0
bl String_Delete
bl String_Free
mov r1, #0x0
add r0, r4, #0x0
mvn r1, r1
@ -2158,7 +2158,7 @@ _02076724:
add r2, r5, #0x0
bl StringExpandPlaceholders
add r0, r5, #0x0
bl String_Delete
bl String_Free
mov r1, #0x0
add r0, r4, #0x0
mvn r1, r1
@ -2225,7 +2225,7 @@ _020767A4:
add r2, r5, #0x0
bl StringExpandPlaceholders
add r0, r5, #0x0
bl String_Delete
bl String_Free
mov r1, #0x0
add r0, r4, #0x0
mvn r1, r1
@ -2355,7 +2355,7 @@ _020768E6:
add r2, r5, #0x0
bl StringExpandPlaceholders
add r0, r5, #0x0
bl String_Delete
bl String_Free
mov r1, #0x0
add r0, r4, #0x0
mvn r1, r1
@ -2392,7 +2392,7 @@ sub_02076950: ; 0x02076950
add r2, r4, #0x0
bl StringExpandPlaceholders
add r0, r4, #0x0
bl String_Delete
bl String_Free
mov r1, #0x0
add r0, r5, #0x0
mvn r1, r1
@ -2430,7 +2430,7 @@ sub_020769A4: ; 0x020769A4
add r2, r4, #0x0
bl StringExpandPlaceholders
add r0, r4, #0x0
bl String_Delete
bl String_Free
mov r1, #0x0
add r0, r5, #0x0
mvn r1, r1
@ -2470,7 +2470,7 @@ sub_020769FC: ; 0x020769FC
add r2, r4, #0x0
bl StringExpandPlaceholders
add r0, r4, #0x0
bl String_Delete
bl String_Free
mov r1, #0x0
add r0, r5, #0x0
mvn r1, r1
@ -2505,7 +2505,7 @@ sub_02076A48: ; 0x02076A48
add r2, r4, #0x0
bl StringExpandPlaceholders
add r0, r4, #0x0
bl String_Delete
bl String_Free
mov r1, #0x0
add r0, r5, #0x0
mvn r1, r1
@ -2652,7 +2652,7 @@ _02076B68:
add r2, r5, #0x0
bl StringExpandPlaceholders
add r0, r5, #0x0
bl String_Delete
bl String_Free
mov r1, #0x0
add r0, r4, #0x0
mvn r1, r1
@ -2681,7 +2681,7 @@ _02076BB2:
add r2, r5, #0x0
bl StringExpandPlaceholders
add r0, r5, #0x0
bl String_Delete
bl String_Free
mov r1, #0x0
add r0, r4, #0x0
mvn r1, r1
@ -2710,7 +2710,7 @@ _02076BF2:
add r2, r5, #0x0
bl StringExpandPlaceholders
add r0, r5, #0x0
bl String_Delete
bl String_Free
mov r1, #0x0
add r0, r4, #0x0
mvn r1, r1
@ -2740,7 +2740,7 @@ _02076C34:
add r2, r5, #0x0
bl StringExpandPlaceholders
add r0, r5, #0x0
bl String_Delete
bl String_Free
mov r1, #0x0
add r0, r4, #0x0
mvn r1, r1
@ -2823,7 +2823,7 @@ _02076CDC:
add r2, r5, #0x0
bl StringExpandPlaceholders
add r0, r5, #0x0
bl String_Delete
bl String_Free
mov r1, #0x0
add r0, r4, #0x0
mvn r1, r1
@ -2883,7 +2883,7 @@ sub_02076D3C: ; 0x02076D3C
add r2, r4, #0x0
bl StringExpandPlaceholders
add r0, r4, #0x0
bl String_Delete
bl String_Free
mov r1, #0x0
add r0, r5, #0x0
mvn r1, r1
@ -2926,7 +2926,7 @@ sub_02076DD4: ; 0x02076DD4
add r2, r4, #0x0
bl StringExpandPlaceholders
add r0, r4, #0x0
bl String_Delete
bl String_Free
mov r1, #0x0
add r0, r5, #0x0
mvn r1, r1
@ -2964,7 +2964,7 @@ sub_02076E28: ; 0x02076E28
add r2, r4, #0x0
bl StringExpandPlaceholders
add r0, r4, #0x0
bl String_Delete
bl String_Free
mov r1, #0x0
add r0, r5, #0x0
mvn r1, r1
@ -3004,7 +3004,7 @@ sub_02076E80: ; 0x02076E80
add r2, r4, #0x0
bl StringExpandPlaceholders
add r0, r4, #0x0
bl String_Delete
bl String_Free
mov r1, #0x0
add r0, r5, #0x0
mvn r1, r1
@ -3042,7 +3042,7 @@ sub_02076ED4: ; 0x02076ED4
add r2, r4, #0x0
bl StringExpandPlaceholders
add r0, r4, #0x0
bl String_Delete
bl String_Free
mov r1, #0x0
add r0, r5, #0x0
mvn r1, r1
@ -3165,7 +3165,7 @@ sub_02076FB0: ; 0x02076FB0
add r2, r7, #0x0
bl StringExpandPlaceholders
add r0, r7, #0x0
bl String_Delete
bl String_Free
cmp r4, #0x0
ldr r1, _02077038 ; =0x000006F8
bne _0207701C

20
arm9/asm/unk_020772F0.s
View File

@ -1323,7 +1323,7 @@ _0207781A:
add r1, r6, #0x0
bl StringCopy
add r0, r6, #0x0
bl String_Delete
bl String_Free
ldr r0, [r4, #0x18]
add r4, #0x1c
add r1, r4, #0x0
@ -1347,7 +1347,7 @@ _02077836:
add r1, r5, #0x0
bl StringCopy
add r0, r5, #0x0
bl String_Delete
bl String_Free
ldr r0, [r4, #0x18]
add r4, #0x1c
add r1, r4, #0x0
@ -1462,7 +1462,7 @@ _02077932:
mov r0, #0x61
lsl r0, r0, #0x2
ldr r0, [r4, r0]
bl String_Delete
bl String_Free
mov r7, #0xe7
mov r6, #0x0
add r5, r4, #0x0
@ -1551,16 +1551,16 @@ _020779C2:
ldr r0, [r4, r0]
cmp r0, #0x0
beq _02077A0C
bl String_Delete
bl String_Free
_02077A0C:
mov r0, #0x5e
lsl r0, r0, #0x2
ldr r0, [r4, r0]
bl String_Delete
bl String_Free
mov r0, #0x5f
lsl r0, r0, #0x2
ldr r0, [r4, r0]
bl String_Delete
bl String_Free
mov r0, #0x5d
lsl r0, r0, #0x2
ldr r0, [r4, r0]
@ -1646,7 +1646,7 @@ _02077AD2:
bl GF_AssertFail
_02077ADA:
ldr r0, [r4, #0x18]
bl String_Delete
bl String_Free
add r0, r4, #0x0
bl Heap_Free
pop {r4, pc}
@ -2216,7 +2216,7 @@ _02077F7E:
mov r0, #0x1
str r0, [r5, #0x14]
add r0, r7, #0x0
bl String_Delete
bl String_Free
_02077FA0:
add sp, #0x14
pop {r4-r7, pc}
@ -4173,7 +4173,7 @@ _02078F58:
bne _02078EB4
_02078F62:
ldr r0, [sp, #0x28]
bl String_Delete
bl String_Free
add sp, #0x3c
pop {r4-r7, pc}
.balign 4
@ -4291,7 +4291,7 @@ _02079012:
cmp r5, #0x3
blo _02079012
add r0, r4, #0x0
bl String_Delete
bl String_Free
add sp, #0x38
pop {r3-r7, pc}
nop

10
arm9/asm/unk_02079C70.s
View File

@ -749,22 +749,22 @@ sub_0207A264: ; 0x0207A264
mov r0, #0x25
lsl r0, r0, #0x4
ldr r0, [r4, r0]
bl String_Delete
bl String_Free
mov r0, #0x95
lsl r0, r0, #0x2
ldr r0, [r4, r0]
bl String_Delete
bl String_Free
mov r0, #0x96
lsl r0, r0, #0x2
ldr r0, [r4, r0]
bl String_Delete
bl String_Free
mov r0, #0x1a
lsl r0, r0, #0x6
ldr r0, [r4, r0]
bl String_Delete
bl String_Free
ldr r0, _0207A2D4 ; =0x00000684
ldr r0, [r4, r0]
bl String_Delete
bl String_Free
pop {r4, pc}
.balign 4
_0207A2C4: .word 0x00000688

14
arm9/asm/unk_0207D5BC.s
View File

@ -412,7 +412,7 @@ sub_0207D800: ; 0x0207D800
ldr r1, [r5, r1]
bl StringExpandPlaceholders
add r0, r4, #0x0
bl String_Delete
bl String_Free
mov r1, #0x0
mov r2, #0x1a
str r1, [sp, #0x0]
@ -465,7 +465,7 @@ sub_0207D8A0: ; 0x0207D8A0
ldr r1, [r5, r1]
bl StringExpandPlaceholders
add r0, r4, #0x0
bl String_Delete
bl String_Free
b _0207D8F2
_0207D8E4:
ldr r2, _0207D920 ; =0x00000674
@ -674,7 +674,7 @@ sub_0207DA48: ; 0x0207DA48
ldr r1, [r5, r1]
bl StringExpandPlaceholders
add r0, r4, #0x0
bl String_Delete
bl String_Free
add sp, #0x8
pop {r3-r7, pc}
.balign 4
@ -1769,7 +1769,7 @@ sub_0207E200: ; 0x0207E200
ldr r1, [r4, r1]
bl StringExpandPlaceholders
add r0, r5, #0x0
bl String_Delete
bl String_Free
mov r1, #0x91
lsl r1, r1, #0x2
ldr r1, [r4, r1]
@ -2301,7 +2301,7 @@ sub_0207E840: ; 0x0207E840
ldr r1, [r5, r1]
bl StringExpandPlaceholders
add r0, r4, #0x0
bl String_Delete
bl String_Free
mov r1, #0x1a
lsl r1, r1, #0x6
mov r0, #0x0
@ -2359,7 +2359,7 @@ sub_0207E840: ; 0x0207E840
add r0, #0x10
bl AddTextPrinterParameterized2
add r0, r6, #0x0
bl String_Delete
bl String_Free
ldr r0, _0207E994 ; =0x00000674
mov r1, #0xb8
ldr r0, [r5, r0]
@ -2388,7 +2388,7 @@ sub_0207E840: ; 0x0207E840
ldr r1, [r5, r1]
bl StringExpandPlaceholders
add r0, r6, #0x0
bl String_Delete
bl String_Free
mov r1, #0x1a
lsl r1, r1, #0x6
mov r0, #0x0

8
arm9/asm/unk_0207FD00.s
View File

@ -608,7 +608,7 @@ sub_02080108: ; 0x02080108
add r2, r4, #0x0
bl StringExpandPlaceholders
add r0, r4, #0x0
bl String_Delete
bl String_Free
add sp, #0x8
pop {r4-r6, pc}
@ -766,7 +766,7 @@ _0208036E:
add r2, r5, #0x0
bl StringExpandPlaceholders
add r0, r5, #0x0
bl String_Delete
bl String_Free
add sp, #0x8
pop {r4-r6, pc}
.balign 4
@ -883,7 +883,7 @@ _02080478:
add r2, r4, #0x0
bl StringExpandPlaceholders
add r0, r4, #0x0
bl String_Delete
bl String_Free
add sp, #0x8
pop {r3-r7, pc}
@ -1733,7 +1733,7 @@ sub_02080AE4: ; 0x02080AE4
add r2, r4, #0x0
bl SetBoxMonData
add r0, r4, #0x0
bl String_Delete
bl String_Free
add sp, #0x8
pop {r4-r6, pc}

4
arm9/asm/unk_02080C38.s
View File

@ -137,7 +137,7 @@ _02080CB4:
bl sub_02081214
str r0, [r4, #0x0]
add r0, r5, #0x0
bl String_Delete
bl String_Free
ldr r0, [r4, #0x0]
bl sub_02081DC4
ldr r0, [r4, #0x4]
@ -1173,7 +1173,7 @@ _020814FE:
add r0, r5, #0x0
add r0, #0xe8
ldr r0, [r0, #0x0]
bl String_Delete
bl String_Free
add r0, r5, #0x0
add r0, #0xf8
ldr r0, [r0, #0x0]

4
arm9/asm/unk_020828BC.s
View File

@ -816,9 +816,9 @@ _02082D9A:
mov r1, #0x90
bl SetMonData
add r0, r5, #0x0
bl String_Delete
bl String_Free
ldr r0, [sp, #0x14]
bl String_Delete
bl String_Free
add r0, r4, #0x0
bl DestroyMsgData
add r2, sp, #0x1c

2
arm9/asm/unk_020854E0.s
View File

@ -355,7 +355,7 @@ sub_0208578C: ; 0x0208578C
ldr r0, [r4, #0x10]
cmp r0, #0x0
beq _0208579A
bl String_Delete
bl String_Free
_0208579A:
add r0, r4, #0x0
bl Heap_Free

6
arm9/asm/unk_02086414.s
View File

@ -607,9 +607,9 @@ sub_020867EC: ; 0x020867EC
add r0, r7, #0x0
bl DestroyMsgData
add r0, r4, #0x0
bl String_Delete
bl String_Free
ldr r0, [sp, #0x14]
bl String_Delete
bl String_Free
add r0, r5, #0x0
bl MessageFormat_Delete
add r0, r6, #0x0
@ -677,7 +677,7 @@ _020868DE:
add r2, r4, #0x0
bl ListMenuItems_AddItem
add r0, r6, #0x0
bl String_Delete
bl String_Free
add r4, r4, #0x1
cmp r4, #0x2
blt _020868DE

4
arm9/asm/unk_02089498.s
View File

@ -568,7 +568,7 @@ _020898B8:
cmp r4, #0x0
bne _02089918
ldr r0, [r5, #0x10]
bl String_Delete
bl String_Free
ldr r0, [r5, #0x8]
add r0, r0, #0x1
str r0, [r5, #0x8]
@ -585,7 +585,7 @@ _02089920:
cmp r0, #0x0
bne _02089950
ldr r0, [r5, #0x10]
bl String_Delete
bl String_Free
ldr r0, [r5, #0x8]
add r0, r0, #0x1
str r0, [r5, #0x8]

4
arm9/asm/unk_02089960.s
View File

@ -495,7 +495,7 @@ _02089CE8:
cmp r4, #0x0
bne _02089D48
ldr r0, [r5, #0x14]
bl String_Delete
bl String_Free
ldr r0, [r5, #0xc]
add r0, r0, #0x1
str r0, [r5, #0xc]
@ -512,7 +512,7 @@ _02089D50:
cmp r0, #0x0
bne _02089D80
ldr r0, [r5, #0x14]
bl String_Delete
bl String_Free
ldr r0, [r5, #0xc]
add r0, r0, #0x1
str r0, [r5, #0xc]

4
arm9/asm/unk_0208A338.s
View File

@ -75,9 +75,9 @@ sub_0208A3C8: ; 0x0208A3C8
ldr r0, [r4, #0x14]
bl DestroyListMenuCursorObj
ldr r0, [r4, #0x4]
bl String_Delete
bl String_Free
ldr r0, [r4, #0x8]
bl String_Delete
bl String_Free
ldr r0, [r4, #0xc]
bl MessageFormat_Delete
ldr r0, [r4, #0x10]

2
arm9/global.inc
View File

@ -1389,7 +1389,7 @@
.extern GetStringWidthMultiline
.extern StringGetWidth_SingleLine_HandleClearToControlCode
.extern String_New
.extern String_Delete
.extern String_Free
.extern String_SetEmpty
.extern StringCopy
.extern StringDup

32
arm9/overlays/05/asm/ov05_021E1AD8.s
View File

@ -352,7 +352,7 @@ ov05_021E1D38: ; 0x021E1D38
add r0, #0xb4
str r1, [r0]
add r0, r4, #0
bl String_Delete
bl String_Free
add r0, r5, #0
add r0, #0x9b
ldrb r0, [r0]
@ -550,7 +550,7 @@ ov05_021E1ECC: ; 0x021E1ECC
add r5, r6, #0
_021E1EFC:
ldr r0, [r5, #0x1c]
bl String_Delete
bl String_Free
add r4, r4, #1
add r5, r5, #4
cmp r4, #0x1c
@ -795,7 +795,7 @@ ov05_021E2094: ; 0x021E2094
lsl r1, r1, #2
str r0, [r2, r1]
add r0, r6, #0
bl String_Delete
bl String_Free
cmp r4, #0xfa
bne _021E2104
add r0, r5, #0
@ -1147,7 +1147,7 @@ ov05_021E2368: ; 0x021E2368
add r5, r6, #0
_021E2398:
ldr r0, [r5, #0x1c]
bl String_Delete
bl String_Free
add r4, r4, #1
add r5, r5, #4
cmp r4, #0x1c
@ -1211,9 +1211,9 @@ ov05_021E23D0: ; 0x021E23D0
add r2, r6, #0
bl AddTextPrinterParameterized
add r0, r4, #0
bl String_Delete
bl String_Free
add r0, r6, #0
bl String_Delete
bl String_Free
add sp, #0x10
pop {r3, r4, r5, r6, r7, pc}
@ -1385,9 +1385,9 @@ ov05_021E2540: ; 0x021E2540
add r2, r6, #0
bl AddTextPrinterParameterized
add r0, r4, #0
bl String_Delete
bl String_Free
add r0, r6, #0
bl String_Delete
bl String_Free
add sp, #0x14
pop {r4, r5, r6, r7, pc}
.balign 4, 0
@ -1416,7 +1416,7 @@ ov05_021E25A4: ; 0x021E25A4
add r5, r6, #0
_021E25D0:
ldr r0, [r5, #0x1c]
bl String_Delete
bl String_Free
add r4, r4, #1
add r5, r5, #4
cmp r4, #0x1c
@ -1773,7 +1773,7 @@ ov05_021E27E8: ; 0x021E27E8
add r0, r7, #0
bl DestroyMsgData
add r0, r6, #0
bl String_Delete
bl String_Free
add r0, r5, #0
add r1, r4, #0
bl ov05_021E28A0
@ -1857,9 +1857,9 @@ ov05_021E28A0: ; 0x021E28A0
str r1, [sp, #8]
bl AddTextPrinterParameterized
ldr r0, [sp, #0x10]
bl String_Delete
bl String_Free
add r0, r4, #0
bl String_Delete
bl String_Free
add r0, r6, #0
bl MessageFormat_Delete
ldr r0, [sp, #0xc]
@ -1984,9 +1984,9 @@ ov05_021E29C8: ; 0x021E29C8
str r1, [sp, #8]
bl AddTextPrinterParameterized
ldr r0, [sp, #0x10]
bl String_Delete
bl String_Free
add r0, r4, #0
bl String_Delete
bl String_Free
add r0, r5, #0
bl MessageFormat_Delete
add r0, r7, #0
@ -2104,9 +2104,9 @@ ov05_021E2AD4: ; 0x021E2AD4
str r1, [sp, #8]
bl AddTextPrinterParameterized
ldr r0, [sp, #0x10]
bl String_Delete
bl String_Free
add r0, r4, #0
bl String_Delete
bl String_Free
add r0, r5, #0
bl MessageFormat_Delete
add r0, r7, #0

2
arm9/overlays/05/asm/ov05_021E2B80.s
View File

@ -346,7 +346,7 @@ ov05_ExpandEasyChatMessage: ; 0x021E2DF0
add r1, r4, #0
bl StringCopy
add r0, r4, #0
bl String_Delete
bl String_Free
add sp, #8
pop {r3, r4, r5, r6, r7, pc}
.balign 4, 0

2
arm9/overlays/05/asm/ov05_021E2E88.s
View File

@ -500,7 +500,7 @@ ov05_021E3248: ; 0x021E3248
add r0, #0x20
bl RemoveWindow
ldr r0, [r4, #0x40]
bl String_Delete
bl String_Free
ldr r0, [r4, #0x38]
bl Heap_Free
add r0, r4, #0

6
arm9/overlays/05/asm/ov05_021E8310.s
View File

@ -163,7 +163,7 @@ ov05_021E8410: ; 0x021E8410
add r3, r1, #0
bl AddTextPrinterParameterized
add r0, r6, #0
bl String_Delete
bl String_Free
mov r0, #1
str r0, [sp, #0x10]
ldr r0, _021E84EC ; =ov05_021F78D4
@ -194,7 +194,7 @@ _021E846E:
add r3, r1, #0
bl AddTextPrinterParameterized
add r0, r6, #0
bl String_Delete
bl String_Free
sub r2, r7, #4
ldr r0, [r5, #0x14]
ldr r1, [r5, #0x18]
@ -221,7 +221,7 @@ _021E846E:
add r2, r6, #0
bl AddTextPrinterParameterized
add r0, r6, #0
bl String_Delete
bl String_Free
_021E84D6:
ldr r0, [sp, #0xc]
add r7, r7, #4

8
arm9/overlays/05/asm/ov05_021EC458.s
View File

@ -1435,7 +1435,7 @@ _021ECF7E:
add r2, r6, #0
bl SetMonData
add r0, r6, #0
bl String_Delete
bl String_Free
ldr r0, [sp, #0x40]
cmp r0, #4
bne _021ECFEE
@ -1462,7 +1462,7 @@ _021ECF7E:
add r2, sp, #0x18
bl SetMonData
add r0, r6, #0
bl String_Delete
bl String_Free
_021ECFEE:
mov r0, #0
str r0, [sp]
@ -1560,7 +1560,7 @@ _021ED05E:
add r2, r4, #0
bl SetMonData
add r0, r4, #0
bl String_Delete
bl String_Free
add sp, #0x18
pop {r3, r4, r5, r6, r7, pc}
.balign 4, 0
@ -2598,7 +2598,7 @@ _021ED7CE:
add r1, r4, #0
bl CopyPokemonToPokemon
ldr r0, [sp, #0x10]
bl String_Delete
bl String_Free
add r0, r6, #0
bl Heap_Free
add sp, #0x3c

4
arm9/overlays/05/asm/ov05_021EFBF8.s
View File

@ -835,9 +835,9 @@ ov05_021F0290: ; 0x021F0290
ldr r0, [r4, #0x38]
bl MessageFormat_Delete
ldr r0, [r4, #0xc]
bl String_Delete
bl String_Free
ldr r0, [r4, #8]
bl String_Delete
bl String_Free
add r0, r4, #0
add r0, #0x10
bl WindowIsInUse

4
arm9/overlays/05/asm/ov05_021F5C44.s
View File

@ -655,9 +655,9 @@ ov05_021F60FC: ; 0x021F60FC
ldr r0, [r4, #0x34]
bl MessageFormat_Delete
ldr r0, [r4, #0x2c]
bl String_Delete
bl String_Free
ldr r0, [r4, #0x30]
bl String_Delete
bl String_Free
ldr r0, [r4, #0x48]
bl DestroyMsgData
pop {r4, pc}

128
arm9/overlays/06/asm/overlay_06.s
View File

@ -8661,7 +8661,7 @@ _0223D804:
mov r0, #0x23
lsl r0, r0, #4
ldr r0, [r4, r0]
bl String_Delete
bl String_Free
ldr r0, _0223D910 ; =0x00000241
ldrb r0, [r4, r0]
cmp r0, #0
@ -9174,7 +9174,7 @@ _0223DC52:
add r1, r7, #0
bl ListMenuItems_AddItem
add r0, r7, #0
bl String_Delete
bl String_Free
mov r0, #0x8b
lsl r0, r0, #2
ldrb r0, [r5, r0]
@ -9310,7 +9310,7 @@ _0223DD86:
str r1, [sp, #0xc]
bl AddTextPrinterParameterized2
add r0, r6, #0
bl String_Delete
bl String_Free
lsl r1, r5, #0x10
add r0, r4, #0
lsr r1, r1, #0x10
@ -9438,9 +9438,9 @@ ov06_0223DE34: ; 0x0223DE34
str r1, [sp, #0xc]
bl AddTextPrinterParameterized2
add r0, r6, #0
bl String_Delete
bl String_Free
add r0, r4, #0
bl String_Delete
bl String_Free
_0223DEC6:
add sp, #0x14
pop {r4, r5, r6, r7, pc}
@ -9480,7 +9480,7 @@ ov06_0223DED0: ; 0x0223DED0
str r1, [sp, #8]
bl AddTextPrinterParameterized
add r0, r4, #0
bl String_Delete
bl String_Free
b _0223DF30
_0223DF1C:
mov r0, #0x50
@ -9541,9 +9541,9 @@ _0223DF30:
str r1, [sp, #8]
bl AddTextPrinterParameterized
add r0, r7, #0
bl String_Delete
bl String_Free
add r0, r4, #0
bl String_Delete
bl String_Free
add r5, #0x28
add r0, r5, #0
bl ScheduleWindowCopyToVram
@ -9681,7 +9681,7 @@ _0223E034:
add r2, r4, #0
bl StringExpandPlaceholders
add r0, r4, #0
bl String_Delete
bl String_Free
mov r2, #0x23
lsl r2, r2, #4
ldr r1, [r5, r2]
@ -9736,7 +9736,7 @@ _0223E124:
add r2, r4, #0
bl StringExpandPlaceholders
add r0, r4, #0
bl String_Delete
bl String_Free
mov r2, #0x23
lsl r2, r2, #4
ldr r1, [r5, r2]
@ -9876,9 +9876,9 @@ _0223E214:
str r1, [sp, #8]
bl AddTextPrinterParameterized
add r0, r7, #0
bl String_Delete
bl String_Free
add r0, r6, #0
bl String_Delete
bl String_Free
add r5, #0x48
add r0, r5, #0
bl ScheduleWindowCopyToVram
@ -10074,7 +10074,7 @@ _0223E418:
add r2, r5, #0
bl StringExpandPlaceholders
add r0, r5, #0
bl String_Delete
bl String_Free
mov r2, #0x23
lsl r2, r2, #4
ldr r1, [r4, r2]
@ -10139,7 +10139,7 @@ _0223E450:
add r2, r5, #0
bl StringExpandPlaceholders
add r0, r5, #0
bl String_Delete
bl String_Free
mov r2, #0x23
lsl r2, r2, #4
ldr r1, [r4, r2]
@ -10217,7 +10217,7 @@ _0223E50A:
str r1, [sp, #8]
bl AddTextPrinterParameterized
add r0, r6, #0
bl String_Delete
bl String_Free
add r0, r5, #0
add r0, #0x88
ldr r0, [r0]
@ -10263,9 +10263,9 @@ _0223E50A:
str r1, [sp, #8]
bl AddTextPrinterParameterized
add r0, r7, #0
bl String_Delete
bl String_Free
add r0, r4, #0
bl String_Delete
bl String_Free
add r5, #0x38
add r0, r5, #0
bl ScheduleWindowCopyToVram
@ -10425,7 +10425,7 @@ _0223E704:
add r2, r4, #0
bl StringExpandPlaceholders
add r0, r4, #0
bl String_Delete
bl String_Free
add r0, r5, #0
add r0, #0x58
mov r1, #0xf
@ -10640,7 +10640,7 @@ _0223E88A:
add r2, r4, #0
bl StringExpandPlaceholders
add r0, r4, #0
bl String_Delete
bl String_Free
add r0, r5, #0
add r0, #0x58
mov r1, #0xf
@ -10882,7 +10882,7 @@ _0223EA74:
add r2, r4, #0
bl StringExpandPlaceholders
add r0, r4, #0
bl String_Delete
bl String_Free
mov r2, #0x23
lsl r2, r2, #4
ldr r1, [r5, r2]
@ -10943,7 +10943,7 @@ ov06_0223EB2C: ; 0x0223EB2C
add r2, r6, #0
bl StringExpandPlaceholders
add r0, r6, #0
bl String_Delete
bl String_Free
add r1, r4, #0
ldr r0, [r5, #8]
add r1, #0x18
@ -11225,7 +11225,7 @@ _0223ED66:
add r2, r4, #0
bl StringExpandPlaceholders
add r0, r4, #0
bl String_Delete
bl String_Free
mov r2, #0x23
lsl r2, r2, #4
ldr r1, [r5, r2]
@ -11518,7 +11518,7 @@ ov06_0223EFFC: ; 0x0223EFFC
_0223F004:
ldr r0, [r6]
ldr r0, [r0, r5]
bl String_Delete
bl String_Free
add r4, r4, #1
add r5, r5, #4
cmp r4, #8
@ -15256,9 +15256,9 @@ _02240E8C:
b _02240D34
_02240EE0:
ldr r0, [sp, #0x2c]
bl String_Delete
bl String_Free
ldr r0, [sp, #0x28]
bl String_Delete
bl String_Free
ldr r0, [sp, #0x30]
bl DestroyMsgData
ldr r0, [sp, #0x24]
@ -15555,13 +15555,13 @@ _0224113A:
ldr r0, [r4, #0x68]
bl DestroyMsgData
ldr r0, [r4, #0x14]
bl String_Delete
bl String_Free
ldr r0, [r4, #0x18]
bl String_Delete
bl String_Free
ldr r0, [r4, #0x1c]
bl String_Delete
bl String_Free
ldr r0, [r4, #0x20]
bl String_Delete
bl String_Free
ldr r0, [r4, #0x6c]
bl sub_0206BB74
add r0, r4, #0
@ -19449,7 +19449,7 @@ ov06_02243024: ; 0x02243024
add r5, r6, #0
_02243060:
ldr r0, [r5, #0x24]
bl String_Delete
bl String_Free
add r4, r4, #1
add r5, r5, #4
cmp r4, #0xc
@ -19499,9 +19499,9 @@ ov06_02243080: ; 0x02243080
str r3, [sp, #8]
bl AddTextPrinterParameterized
add r0, r4, #0
bl String_Delete
bl String_Free
add r0, r6, #0
bl String_Delete
bl String_Free
add sp, #0x10
pop {r3, r4, r5, r6, r7, pc}
@ -21848,9 +21848,9 @@ _0224429E:
ldr r0, [sp, #0x10]
bl DestroyMsgData
ldr r0, [sp, #0x1c]
bl String_Delete
bl String_Free
add r0, r6, #0
bl String_Delete
bl String_Free
ldr r0, [sp, #0x14]
add sp, #0x20
pop {r3, r4, r5, r6, r7, pc}
@ -22119,7 +22119,7 @@ _022443D4:
add r2, r7, #0
bl SetMonData
add r0, r7, #0
bl String_Delete
bl String_Free
add r0, r4, #0
bl DestroyMsgData
b _02244508
@ -22565,7 +22565,7 @@ ov06_02244820: ; 0x02244820
mov r2, #8
bl CopyStringToU16Array
add r0, r4, #0
bl String_Delete
bl String_Free
add r0, r7, #0
bl DestroyMsgData
add r0, r6, #0
@ -31011,7 +31011,7 @@ _0224886C:
mov r2, #0x80
bl CopyStringToU16Array
add r0, r5, #0
bl String_Delete
bl String_Free
ldr r0, [r4, #8]
add r1, sp, #4
bl CopyPlayerName
@ -31182,7 +31182,7 @@ CreateInGameTradeMon: ; 0x022489D4
add r2, r7, #0
bl SetMonData
add r0, r7, #0
bl String_Delete
bl String_Free
mov r1, #1
add r0, sp, #0x10
strb r1, [r0]
@ -31258,7 +31258,7 @@ CreateInGameTradeMon: ; 0x022489D4
add r2, r6, #0
bl SetMonData
add r0, r6, #0
bl String_Delete
bl String_Free
add r2, r4, #0
add r0, r5, #0
mov r1, #0x9c
@ -40926,7 +40926,7 @@ ov06_0224D46C: ; 0x0224D46C
str r1, [sp, #8]
bl AddTextPrinterParameterized
add r0, r5, #0
bl String_Delete
bl String_Free
ldr r0, [r4, #0x10]
mov r1, #1
bl NewString_ReadMsgData
@ -40946,7 +40946,7 @@ ov06_0224D46C: ; 0x0224D46C
str r1, [sp, #8]
bl AddTextPrinterParameterized
add r0, r5, #0
bl String_Delete
bl String_Free
mov r0, #0
ldr r5, _0224D698 ; =0x02251FAC
str r0, [sp, #0x24]
@ -40973,7 +40973,7 @@ _0224D576:
add r0, r4, #0
bl AddTextPrinterParameterized
add r0, r7, #0
bl String_Delete
bl String_Free
ldr r0, [sp, #0x24]
add r5, #8
add r0, r0, #1
@ -41006,7 +41006,7 @@ _0224D5BE:
add r0, r4, #0
bl AddTextPrinterParameterized
add r0, r7, #0
bl String_Delete
bl String_Free
ldr r0, [sp, #0x14]
add r5, #8
add r0, r0, #1
@ -41061,7 +41061,7 @@ _0224D60C:
add r0, r4, #0
bl AddTextPrinterParameterized
ldr r0, [sp, #0x2c]
bl String_Delete
bl String_Free
add r7, r7, #1
add r5, #8
cmp r7, #4
@ -41075,7 +41075,7 @@ _0224D60C:
cmp r0, #5
blt _0224D608
add r0, r6, #0
bl String_Delete
bl String_Free
add r0, r4, #0
bl CopyWindowToVram
add r0, r4, #0
@ -41256,7 +41256,7 @@ _0224D7D0:
add r1, r5, #0
bl ov06_0224DCD8
add r0, r5, #0
bl String_Delete
bl String_Free
mov r0, #0xb
str r0, [r4]
mov r0, #1
@ -41282,7 +41282,7 @@ _0224D80E:
add r1, r5, #0
bl ov06_0224DCD8
add r0, r5, #0
bl String_Delete
bl String_Free
mov r0, #0xb
str r0, [r4]
mov r0, #0xc
@ -41352,7 +41352,7 @@ _0224D8A6:
add r1, r5, #0
bl ov06_0224DCD8
add r0, r5, #0
bl String_Delete
bl String_Free
mov r0, #0xa
str r0, [r4]
mov r0, #4
@ -41425,7 +41425,7 @@ _0224D94C:
add r1, r5, #0
bl ov06_0224DCD8
add r0, r5, #0
bl String_Delete
bl String_Free
mov r0, #0xb
str r0, [r4]
mov r0, #0xc
@ -41472,7 +41472,7 @@ _0224D992:
add r1, r5, #0
bl ov06_0224DCD8
add r0, r5, #0
bl String_Delete
bl String_Free
mov r0, #0xb
str r0, [r4]
mov r0, #3
@ -41504,7 +41504,7 @@ _0224D9EA:
add r1, r5, #0
bl ov06_0224DCD8
add r0, r5, #0
bl String_Delete
bl String_Free
mov r0, #0xb9
lsl r0, r0, #2
add r0, r4, r0
@ -41528,7 +41528,7 @@ _0224DA32:
add r1, r5, #0
bl ov06_0224DCD8
add r0, r5, #0
bl String_Delete
bl String_Free
mov r0, #0xb9
lsl r0, r0, #2
add r0, r4, r0
@ -41605,7 +41605,7 @@ _0224DAD2:
add r1, r5, #0
bl ov06_0224DCD8
add r0, r5, #0
bl String_Delete
bl String_Free
mov r0, #0xb
str r0, [r4]
mov r0, #9
@ -41625,7 +41625,7 @@ _0224DAFE:
add r1, r5, #0
bl ov06_0224DCD8
add r0, r5, #0
bl String_Delete
bl String_Free
mov r0, #0xb
str r0, [r4]
mov r0, #0xc
@ -41896,7 +41896,7 @@ ov06_0224DD28: ; 0x0224DD28
ldr r0, [r4, #0x10]
cmp r0, #0
beq _0224DD48
bl String_Delete
bl String_Free
mov r0, #0
str r0, [r4, #0x10]
_0224DD48:
@ -41959,9 +41959,9 @@ ov06_0224DD50: ; 0x0224DD50
add r0, r6, #0
bl MessageFormat_Delete
ldr r0, [sp, #0xc]
bl String_Delete
bl String_Free
ldr r0, [sp, #0x10]
bl String_Delete
bl String_Free
add sp, #0x14
pop {r4, r5, r6, r7, pc}
.align 2, 0
@ -42019,9 +42019,9 @@ ov06_0224DDD8: ; 0x0224DDD8
add r0, r6, #0
bl MessageFormat_Delete
ldr r0, [sp, #0xc]
bl String_Delete
bl String_Free
ldr r0, [sp, #0x10]
bl String_Delete
bl String_Free
add sp, #0x14
pop {r4, r5, r6, r7, pc}
.align 2, 0
@ -42096,13 +42096,13 @@ ov06_0224DED8: ; 0x0224DED8
add r5, r6, #0
_0224DEE6:
ldr r0, [r5, #0x10]
bl String_Delete
bl String_Free
add r4, r4, #1
add r5, r5, #4
cmp r4, #3
blt _0224DEE6
ldr r0, [r6, #0xc]
bl String_Delete
bl String_Free
ldr r0, [r6, #8]
bl MessageFormat_Delete
ldr r0, [r6, #4]
@ -42313,9 +42313,9 @@ _0224E084:
mov r0, #0x4a
lsl r0, r0, #2
ldr r0, [r5, r0]
bl String_Delete
bl String_Free
ldr r0, [sp, #0x1c]
bl String_Delete
bl String_Free
ldr r3, [sp, #0x14]
ldr r0, [r5, #4]
ldr r1, _0224E168 ; =ov06_022523A0
@ -42435,7 +42435,7 @@ _0224E1AC:
add r0, r4, #0
add r0, #0xc4
ldr r0, [r0]
bl String_Delete
bl String_Free
ldr r0, [r6, r7]
add r5, r5, #1
add r4, r4, #4

10
arm9/overlays/07/asm/overlay_07.s
View File

@ -4513,7 +4513,7 @@ _022142BE:
add r1, r6, #0
bl StringExpandPlaceholders
ldr r0, [sp, #0x20]
bl String_Delete
bl String_Free
mov r1, #0
str r1, [sp]
mov r0, #0xff
@ -4627,7 +4627,7 @@ ov07_0221437C: ; 0x0221437C
add r2, r7, #0
bl StringExpandPlaceholders
add r0, r7, #0
bl String_Delete
bl String_Free
mov r1, #0
str r1, [sp]
mov r0, #0xff
@ -4684,7 +4684,7 @@ ov07_022143FC: ; 0x022143FC
add r1, r4, #0
bl StringExpandPlaceholders
ldr r0, [sp, #0x20]
bl String_Delete
bl String_Free
mov r0, #0
add r1, r4, #0
add r2, r0, #0
@ -4748,7 +4748,7 @@ ov07_022143FC: ; 0x022143FC
add r2, r5, #0
bl StringExpandPlaceholders
add r0, r5, #0
bl String_Delete
bl String_Free
mov r1, #0
ldr r3, [sp, #0x24]
str r1, [sp]
@ -5004,7 +5004,7 @@ _022146F6:
cmp r4, #6
blo _022146DC
add r0, r7, #0
bl String_Delete
bl String_Free
ldr r0, [sp, #0x10]
bl DestroyMsgData
ldr r0, [sp, #0xc]

202
arm9/overlays/09/asm/overlay_09.s
View File

@ -2405,7 +2405,7 @@ ov09_02213190: ; 0x02213190
bl MessageFormat_Delete
ldr r0, _022131C4 ; =0x00001FB0
ldr r0, [r4, r0]
bl String_Delete
bl String_Free
pop {r4, pc}
nop
_022131B8: .word 0x00001FA8
@ -3482,7 +3482,7 @@ ov09_022139D4: ; 0x022139D4
ldr r1, [r5, r1]
bl StringExpandPlaceholders
add r0, r4, #0
bl String_Delete
bl String_Free
mov r0, #0
pop {r3, r4, r5, r6, r7, pc}
_02213A30:
@ -3508,7 +3508,7 @@ _02213A30:
ldr r1, [r5, r1]
bl StringExpandPlaceholders
add r0, r6, #0
bl String_Delete
bl String_Free
mov r0, #0
pop {r3, r4, r5, r6, r7, pc}
_02213A6C:
@ -3543,7 +3543,7 @@ _02213A82:
ldr r1, [r5, r1]
bl StringExpandPlaceholders
add r0, r6, #0
bl String_Delete
bl String_Free
mov r0, #0
pop {r3, r4, r5, r6, r7, pc}
_02213AB8:
@ -3592,7 +3592,7 @@ _02213AD4:
ldr r1, [r5, r1]
bl StringExpandPlaceholders
add r0, r6, #0
bl String_Delete
bl String_Free
mov r0, #0
pop {r3, r4, r5, r6, r7, pc}
_02213B24:
@ -3624,7 +3624,7 @@ _02213B24:
ldr r1, [r5, r1]
bl StringExpandPlaceholders
add r0, r7, #0
bl String_Delete
bl String_Free
mov r0, #0
pop {r3, r4, r5, r6, r7, pc}
_02213B6C:
@ -4128,9 +4128,9 @@ _02213F06:
bl AddTextPrinterParameterized2
_02213F22:
ldr r0, [sp, #0x18]
bl String_Delete
bl String_Free
ldr r0, [sp, #0x1c]
bl String_Delete
bl String_Free
ldr r0, [sp, #0x20]
ldrb r0, [r0, #0x16]
lsl r0, r0, #0x18
@ -4185,7 +4185,7 @@ _02213F8A:
bl AddTextPrinterParameterized2
_02213F9E:
add r0, r6, #0
bl String_Delete
bl String_Free
b _02214008
_02213FA6:
cmp r0, #1
@ -4232,7 +4232,7 @@ _02213FEE:
bl AddTextPrinterParameterized2
_02214002:
add r0, r6, #0
bl String_Delete
bl String_Free
_02214008:
add r0, r5, r4
bl ScheduleWindowCopyToVram
@ -4502,9 +4502,9 @@ ov09_022141D8: ; 0x022141D8
add r3, r1, #0
bl AddTextPrinterParameterized2
ldr r0, [sp, #0x10]
bl String_Delete
bl String_Free
add r0, r6, #0
bl String_Delete
bl String_Free
ldr r0, _0221425C ; =0x00002070
ldr r0, [r5, r0]
add r0, r0, r4
@ -4558,7 +4558,7 @@ _02214284:
add r1, r6, #0
bl StringExpandPlaceholders
ldr r0, [sp, #0x10]
bl String_Delete
bl String_Free
_022142BA:
mov r1, #0
str r1, [sp]
@ -4575,7 +4575,7 @@ _022142BA:
add r3, r1, #0
bl AddTextPrinterParameterized2
add r0, r6, #0
bl String_Delete
bl String_Free
ldr r0, _022142F8 ; =0x00002070
ldr r0, [r4, r0]
add r0, r0, r5
@ -4651,9 +4651,9 @@ _02214362:
add r0, r4, r6
bl AddTextPrinterParameterized2
ldr r0, [sp, #0x18]
bl String_Delete
bl String_Free
add r0, r7, #0
bl String_Delete
bl String_Free
add r0, r4, r6
bl ScheduleWindowCopyToVram
add sp, #0x1c
@ -4691,7 +4691,7 @@ ov09_022143A0: ; 0x022143A0
add r2, r7, #0
bl AddTextPrinterParameterized2
add r0, r7, #0
bl String_Delete
bl String_Free
ldr r0, _022143F4 ; =0x00002070
ldr r0, [r4, r0]
add r0, r0, r5
@ -4737,7 +4737,7 @@ ov09_022143F8: ; 0x022143F8
str r3, [sp, #0xc]
bl AddTextPrinterParameterized2
add r0, r5, #0
bl String_Delete
bl String_Free
ldr r0, _02214450 ; =0x00002050
add r0, r4, r0
bl ScheduleWindowCopyToVram
@ -4784,7 +4784,7 @@ ov09_0221445C: ; 0x0221445C
lsr r3, r3, #1
bl AddTextPrinterParameterized2
add r0, r7, #0
bl String_Delete
bl String_Free
add r0, r5, r4
bl ScheduleWindowCopyToVram
add sp, #0x10
@ -4828,7 +4828,7 @@ ov09_022144C0: ; 0x022144C0
add r2, r7, #0
bl AddTextPrinterParameterized2
add r0, r7, #0
bl String_Delete
bl String_Free
ldr r0, _02214688 ; =0x00001FA8
mov r1, #0x18
ldr r0, [r5, r0]
@ -4872,9 +4872,9 @@ ov09_022144C0: ; 0x022144C0
add r0, r0, r7
bl AddTextPrinterParameterized2
ldr r0, [sp, #0x18]
bl String_Delete
bl String_Free
ldr r0, [sp, #0x1c]
bl String_Delete
bl String_Free
ldr r0, _02214688 ; =0x00001FA8
mov r1, #0x19
ldr r0, [r5, r0]
@ -4895,7 +4895,7 @@ ov09_022144C0: ; 0x022144C0
ldr r2, [sp, #0x20]
bl AddTextPrinterParameterized2
ldr r0, [sp, #0x20]
bl String_Delete
bl String_Free
ldr r0, _02214688 ; =0x00001FA8
mov r1, #0x1a
ldr r0, [r5, r0]
@ -4967,9 +4967,9 @@ _022145F4:
add r0, r0, r4
bl AddTextPrinterParameterized2
ldr r0, [sp, #0x14]
bl String_Delete
bl String_Free
ldr r0, [sp, #0x10]
bl String_Delete
bl String_Free
ldr r0, _02214684 ; =0x00002070
ldr r1, [r5, r0]
mov r0, #0x13
@ -5031,7 +5031,7 @@ ov09_02214694: ; 0x02214694
add r0, #0xe0
bl AddTextPrinterParameterized2
add r0, r6, #0
bl String_Delete
bl String_Free
ldr r0, _02214784 ; =0x00001FA8
mov r1, #0x21
ldr r0, [r5, r0]
@ -5088,9 +5088,9 @@ ov09_02214694: ; 0x02214694
add r0, r0, r4
bl AddTextPrinterParameterized2
ldr r0, [sp, #0x10]
bl String_Delete
bl String_Free
add r0, r6, #0
bl String_Delete
bl String_Free
ldr r0, _02214780 ; =0x00002070
ldr r0, [r5, r0]
add r0, #0xe0
@ -5140,7 +5140,7 @@ ov09_02214790: ; 0x02214790
add r0, #0xf0
bl AddTextPrinterParameterized2
add r0, r6, #0
bl String_Delete
bl String_Free
ldr r0, _02214880 ; =0x00001FA8
mov r1, #0x23
ldr r0, [r5, r0]
@ -5197,9 +5197,9 @@ ov09_02214790: ; 0x02214790
add r0, r0, r4
bl AddTextPrinterParameterized2
ldr r0, [sp, #0x10]
bl String_Delete
bl String_Free
add r0, r6, #0
bl String_Delete
bl String_Free
ldr r0, _0221487C ; =0x00002070
ldr r0, [r5, r0]
add r0, #0xf0
@ -5250,7 +5250,7 @@ ov09_0221488C: ; 0x0221488C
add r2, r6, #0
bl AddTextPrinterParameterized2
add r0, r6, #0
bl String_Delete
bl String_Free
ldr r0, _02214980 ; =0x00001FA8
mov r1, #0x29
ldr r0, [r5, r0]
@ -5307,9 +5307,9 @@ ov09_0221488C: ; 0x0221488C
add r0, r0, r4
bl AddTextPrinterParameterized2
ldr r0, [sp, #0x10]
bl String_Delete
bl String_Free
add r0, r6, #0
bl String_Delete
bl String_Free
ldr r0, _0221497C ; =0x00002070
ldr r1, [r5, r0]
mov r0, #1
@ -5362,7 +5362,7 @@ ov09_0221498C: ; 0x0221498C
add r2, r6, #0
bl AddTextPrinterParameterized2
add r0, r6, #0
bl String_Delete
bl String_Free
ldr r0, _02214A80 ; =0x00001FA8
mov r1, #0x25
ldr r0, [r4, r0]
@ -5419,9 +5419,9 @@ ov09_0221498C: ; 0x0221498C
add r0, r0, r5
bl AddTextPrinterParameterized2
ldr r0, [sp, #0x10]
bl String_Delete
bl String_Free
add r0, r6, #0
bl String_Delete
bl String_Free
ldr r0, _02214A7C ; =0x00002070
ldr r1, [r4, r0]
mov r0, #0x11
@ -5474,7 +5474,7 @@ ov09_02214A8C: ; 0x02214A8C
add r2, r6, #0
bl AddTextPrinterParameterized2
add r0, r6, #0
bl String_Delete
bl String_Free
ldr r0, _02214B80 ; =0x00001FA8
mov r1, #0x27
ldr r0, [r4, r0]
@ -5531,9 +5531,9 @@ ov09_02214A8C: ; 0x02214A8C
add r0, r0, r5
bl AddTextPrinterParameterized2
ldr r0, [sp, #0x10]
bl String_Delete
bl String_Free
add r0, r6, #0
bl String_Delete
bl String_Free
ldr r0, _02214B7C ; =0x00002070
ldr r1, [r4, r0]
mov r0, #0x12
@ -5588,7 +5588,7 @@ ov09_02214B8C: ; 0x02214B8C
add r0, #0xd0
bl AddTextPrinterParameterized2
add r0, r6, #0
bl String_Delete
bl String_Free
ldr r0, _02214D18 ; =0x00001FA8
mov r1, #0x1f
ldr r0, [r5, r0]
@ -5624,7 +5624,7 @@ ov09_02214B8C: ; 0x02214B8C
add r0, r0, r4
bl AddTextPrinterParameterized2
ldr r0, [sp, #0x10]
bl String_Delete
bl String_Free
ldr r0, _02214D18 ; =0x00001FA8
mov r1, #0x1d
ldr r0, [r5, r0]
@ -5668,9 +5668,9 @@ ov09_02214B8C: ; 0x02214B8C
add r0, r0, r4
bl AddTextPrinterParameterized2
ldr r0, [sp, #0x18]
bl String_Delete
bl String_Free
ldr r0, [sp, #0x1c]
bl String_Delete
bl String_Free
ldr r0, _02214D18 ; =0x00001FA8
mov r1, #0x1e
ldr r0, [r5, r0]
@ -5710,9 +5710,9 @@ ov09_02214B8C: ; 0x02214B8C
add r0, r0, r4
bl AddTextPrinterParameterized2
ldr r0, [sp, #0x20]
bl String_Delete
bl String_Free
ldr r0, [sp, #0x24]
bl String_Delete
bl String_Free
ldr r0, _02214D14 ; =0x00002070
ldr r0, [r5, r0]
add r0, #0xd0
@ -5771,7 +5771,7 @@ ov09_02214D24: ; 0x02214D24
add r0, r0, r4
bl AddTextPrinterParameterized2
add r0, r6, #0
bl String_Delete
bl String_Free
add r0, r7, #0
bl DestroyMsgData
ldr r0, _02214D9C ; =0x00002070
@ -5810,7 +5810,7 @@ ov09_02214DA0: ; 0x02214DA0
str r1, [sp, #0xc]
bl AddTextPrinterParameterized2
add r0, r6, #0
bl String_Delete
bl String_Free
add r0, r5, r4
bl ScheduleWindowCopyToVram
add sp, #0x10
@ -5859,7 +5859,7 @@ ov09_02214DE8: ; 0x02214DE8
str r1, [sp, #0xc]
bl AddTextPrinterParameterized2
add r0, r7, #0
bl String_Delete
bl String_Free
b _02214EB8
_02214E42:
sub r2, #0xc8
@ -5909,9 +5909,9 @@ _02214E42:
str r1, [sp, #0xc]
bl AddTextPrinterParameterized2
ldr r0, [sp, #0x14]
bl String_Delete
bl String_Free
add r0, r7, #0
bl String_Delete
bl String_Free
_02214EB8:
add r0, r4, r6
bl ScheduleWindowCopyToVram
@ -5946,7 +5946,7 @@ ov09_02214ED0: ; 0x02214ED0
str r1, [sp, #0xc]
bl AddTextPrinterParameterized2
add r0, r6, #0
bl String_Delete
bl String_Free
add r0, r5, r4
bl ScheduleWindowCopyToVram
add sp, #0x10
@ -5995,7 +5995,7 @@ ov09_02214F18: ; 0x02214F18
str r1, [sp, #0xc]
bl AddTextPrinterParameterized2
add r0, r7, #0
bl String_Delete
bl String_Free
b _02214FE8
_02214F72:
sub r2, #0xc8
@ -6045,9 +6045,9 @@ _02214F72:
str r1, [sp, #0xc]
bl AddTextPrinterParameterized2
ldr r0, [sp, #0x14]
bl String_Delete
bl String_Free
add r0, r7, #0
bl String_Delete
bl String_Free
_02214FE8:
add r0, r4, r6
bl ScheduleWindowCopyToVram
@ -6089,7 +6089,7 @@ ov09_02215000: ; 0x02215000
str r1, [sp, #0xc]
bl AddTextPrinterParameterized2
add r0, r6, #0
bl String_Delete
bl String_Free
add r0, r7, #0
bl DestroyMsgData
add r0, r5, r4
@ -6136,7 +6136,7 @@ ov09_02215060: ; 0x02215060
str r1, [sp, #0xc]
bl AddTextPrinterParameterized2
add r0, r6, #0
bl String_Delete
bl String_Free
ldr r0, [sp, #0x10]
bl DestroyMsgData
add r0, r5, r4
@ -6184,7 +6184,7 @@ ov09_022150C8: ; 0x022150C8
str r1, [sp, #0xc]
bl AddTextPrinterParameterized2
add r0, r7, #0
bl String_Delete
bl String_Free
add r0, r5, r4
bl ScheduleWindowCopyToVram
add sp, #0x10
@ -6245,7 +6245,7 @@ _0221516C:
str r1, [sp, #0xc]
bl AddTextPrinterParameterized2
add r0, r6, #0
bl String_Delete
bl String_Free
add r0, r5, r4
bl ScheduleWindowCopyToVram
add sp, #0x10
@ -6292,7 +6292,7 @@ ov09_022151A8: ; 0x022151A8
str r1, [sp, #0xc]
bl AddTextPrinterParameterized2
ldr r0, [sp, #0x18]
bl String_Delete
bl String_Free
ldr r0, _022152D4 ; =0x00001FA8
mov r1, #0x2c
ldr r0, [r5, r0]
@ -6334,9 +6334,9 @@ ov09_022151A8: ; 0x022151A8
str r1, [sp, #0xc]
bl AddTextPrinterParameterized2
ldr r0, [sp, #0x20]
bl String_Delete
bl String_Free
ldr r0, [sp, #0x24]
bl String_Delete
bl String_Free
ldr r0, _022152D4 ; =0x00001FA8
mov r1, #0x2d
ldr r0, [r5, r0]
@ -6374,9 +6374,9 @@ ov09_022151A8: ; 0x022151A8
str r1, [sp, #0xc]
bl AddTextPrinterParameterized2
ldr r0, [sp, #0x28]
bl String_Delete
bl String_Free
ldr r0, [sp, #0x2c]
bl String_Delete
bl String_Free
add r0, r4, r6
bl ScheduleWindowCopyToVram
add sp, #0x30
@ -6432,7 +6432,7 @@ _02215306:
lsr r3, r3, #1
bl AddTextPrinterParameterized2
add r0, r6, #0
bl String_Delete
bl String_Free
add r0, r5, r4
bl ScheduleWindowCopyToVram
add sp, #0x10
@ -6479,7 +6479,7 @@ _02215368:
str r1, [sp, #0xc]
bl AddTextPrinterParameterized2
add r0, r4, #0
bl String_Delete
bl String_Free
add r0, r5, #0
bl ScheduleWindowCopyToVram
add sp, #0x10
@ -6521,7 +6521,7 @@ ov09_022153B0: ; 0x022153B0
str r1, [sp, #0xc]
bl AddTextPrinterParameterized2
ldr r0, [sp, #0x14]
bl String_Delete
bl String_Free
ldr r0, _022154F0 ; =0x00001FA8
mov r1, #0x2e
ldr r0, [r5, r0]
@ -6545,7 +6545,7 @@ ov09_022153B0: ; 0x022153B0
str r1, [sp, #0xc]
bl AddTextPrinterParameterized2
ldr r0, [sp, #0x18]
bl String_Delete
bl String_Free
ldr r0, _022154F0 ; =0x00001FA8
mov r1, #0x2d
ldr r0, [r5, r0]
@ -6581,7 +6581,7 @@ ov09_022153B0: ; 0x022153B0
str r3, [sp, #0x1c]
bl AddTextPrinterParameterized2
ldr r0, [sp, #0x20]
bl String_Delete
bl String_Free
ldr r0, _022154F0 ; =0x00001FA8
mov r1, #0x2c
ldr r0, [r5, r0]
@ -6621,9 +6621,9 @@ ov09_022153B0: ; 0x022153B0
str r1, [sp, #0xc]
bl AddTextPrinterParameterized2
ldr r0, [sp, #0x24]
bl String_Delete
bl String_Free
add r0, r7, #0
bl String_Delete
bl String_Free
add r0, r4, r6
bl ScheduleWindowCopyToVram
add sp, #0x28
@ -6659,7 +6659,7 @@ ov09_022154FC: ; 0x022154FC
bl sub_02002E14
add r7, r0, #0
ldr r0, [sp, #0x18]
bl String_Delete
bl String_Free
add r7, #0x28
mov r0, #0x50
sub r0, r0, r7
@ -6713,9 +6713,9 @@ ov09_022154FC: ; 0x022154FC
str r1, [sp, #0xc]
bl AddTextPrinterParameterized2
add r0, r7, #0
bl String_Delete
bl String_Free
ldr r0, [sp, #0x14]
bl String_Delete
bl String_Free
add r0, r4, r6
bl ScheduleWindowCopyToVram
add sp, #0x1c
@ -6979,7 +6979,7 @@ ov09_02215784: ; 0x02215784
add r2, r6, #0
bl StringExpandPlaceholders
add r0, r6, #0
bl String_Delete
bl String_Free
ldr r0, [sp, #0x14]
mov r5, #0
ldrb r0, [r0, #0x16]
@ -7053,7 +7053,7 @@ _02215840:
add r3, r7, #0
bl AddTextPrinterParameterized2
ldr r0, [sp, #0x10]
bl String_Delete
bl String_Free
cmp r5, #0
beq _022158C6
ldr r0, [sp, #0x14]
@ -7091,7 +7091,7 @@ _022158A4:
bl AddTextPrinterParameterized2
_022158C0:
add r0, r5, #0
bl String_Delete
bl String_Free
_022158C6:
ldr r0, [sp, #0x18]
bl ScheduleWindowCopyToVram
@ -8180,7 +8180,7 @@ ov09_022161B0: ; 0x022161B0
add r0, #0x40
bl AddTextPrinterParameterized2
add r0, r4, #0
bl String_Delete
bl String_Free
ldr r0, _02216304 ; =0x00002070
ldr r0, [r5, r0]
add r0, #0x40
@ -8441,7 +8441,7 @@ _02216444:
ldr r1, [r5, r1]
bl StringExpandPlaceholders
add r0, r4, #0
bl String_Delete
bl String_Free
b _022166BE
_0221648E:
ldr r0, [sp, #8]
@ -8482,7 +8482,7 @@ _0221648E:
ldr r1, [r5, r1]
bl StringExpandPlaceholders
add r0, r4, #0
bl String_Delete
bl String_Free
b _022166BE
_022164EA:
add r0, r6, #0
@ -8525,7 +8525,7 @@ _02216512:
ldr r1, [r5, r1]
bl StringExpandPlaceholders
add r0, r4, #0
bl String_Delete
bl String_Free
b _022166BE
_0221654A:
cmp r4, #2
@ -8548,7 +8548,7 @@ _0221654A:
ldr r1, [r5, r1]
bl StringExpandPlaceholders
add r0, r4, #0
bl String_Delete
bl String_Free
b _022166BE
_02216580:
cmp r4, #4
@ -8571,7 +8571,7 @@ _02216580:
ldr r1, [r5, r1]
bl StringExpandPlaceholders
add r0, r4, #0
bl String_Delete
bl String_Free
b _022166BE
_022165B6:
cmp r4, #8
@ -8594,7 +8594,7 @@ _022165B6:
ldr r1, [r5, r1]
bl StringExpandPlaceholders
add r0, r4, #0
bl String_Delete
bl String_Free
b _022166BE
_022165EC:
cmp r4, #0x10
@ -8617,7 +8617,7 @@ _022165EC:
ldr r1, [r5, r1]
bl StringExpandPlaceholders
add r0, r4, #0
bl String_Delete
bl String_Free
b _022166BE
_02216622:
cmp r4, #0x20
@ -8640,7 +8640,7 @@ _02216622:
ldr r1, [r5, r1]
bl StringExpandPlaceholders
add r0, r4, #0
bl String_Delete
bl String_Free
b _022166BE
_02216658:
cmp r4, #0x40
@ -8663,7 +8663,7 @@ _02216658:
ldr r1, [r5, r1]
bl StringExpandPlaceholders
add r0, r4, #0
bl String_Delete
bl String_Free
b _022166BE
_0221668E:
ldr r0, [r5, r0]
@ -8684,7 +8684,7 @@ _0221668E:
ldr r1, [r5, r1]
bl StringExpandPlaceholders
add r0, r4, #0
bl String_Delete
bl String_Free
_022166BE:
add r0, r6, #0
bl Heap_Free
@ -8731,7 +8731,7 @@ ov09_022166D0: ; 0x022166D0
ldr r1, [r5, r1]
bl StringExpandPlaceholders
add r0, r4, #0
bl String_Delete
bl String_Free
pop {r4, r5, r6, pc}
.align 2, 0
_02216728: .word 0x00001FA8
@ -13361,7 +13361,7 @@ _02218C68:
add r2, r4, #0
bl StringExpandPlaceholders
add r0, r4, #0
bl String_Delete
bl String_Free
add r0, r5, #0
bl ov09_02219BE0
ldr r0, _02218E40 ; =0x0000114B
@ -13422,7 +13422,7 @@ _02218D22:
add r2, r6, #0
bl StringExpandPlaceholders
add r0, r6, #0
bl String_Delete
bl String_Free
add r0, r7, #0
bl DestroyMsgData
add r0, r5, #0
@ -14121,7 +14121,7 @@ ov09_022192E4: ; 0x022192E4
ldr r0, [r4, #0x14]
bl MessageFormat_Delete
ldr r0, [r4, #0x18]
bl String_Delete
bl String_Free
pop {r4, pc}
.align 2, 0
@ -14467,7 +14467,7 @@ ov09_02219560: ; 0x02219560
add r0, r5, r4
bl AddTextPrinterParameterized2
ldr r0, [sp, #0x10]
bl String_Delete
bl String_Free
add r0, r5, r4
bl ScheduleWindowCopyToVram
add sp, #0x14
@ -14567,7 +14567,7 @@ _022195C4:
add r2, r4, #0
bl AddTextPrinterParameterized2
add r0, r4, #0
bl String_Delete
bl String_Free
ldr r0, [r5, #0x2c]
add r0, #0x40
bl ScheduleWindowCopyToVram
@ -14643,7 +14643,7 @@ ov09_02219694: ; 0x02219694
add r0, r4, r6
bl AddTextPrinterParameterized2
ldr r0, [sp, #0x14]
bl String_Delete
bl String_Free
_02219726:
add r0, r4, r6
bl ScheduleWindowCopyToVram
@ -14713,7 +14713,7 @@ ov09_02219738: ; 0x02219738
add r0, r4, r7
bl AddTextPrinterParameterized2
ldr r0, [sp, #0x14]
bl String_Delete
bl String_Free
_022197BA:
add r0, r4, r7
bl ScheduleWindowCopyToVram
@ -14860,7 +14860,7 @@ ov09_02219884: ; 0x02219884
str r1, [sp, #0xc]
bl AddTextPrinterParameterized2
ldr r0, [sp, #0x10]
bl String_Delete
bl String_Free
ldr r0, [r5, #0x10]
mov r1, #0x1d
bl NewString_ReadMsgData
@ -14898,7 +14898,7 @@ ov09_02219884: ; 0x02219884
add r3, r6, r7
bl AddTextPrinterParameterized2
ldr r0, [sp, #0x14]
bl String_Delete
bl String_Free
ldr r0, [r5, #0x10]
mov r1, #0x1e
bl NewString_ReadMsgData
@ -14941,7 +14941,7 @@ ov09_02219884: ; 0x02219884
sub r3, r6, r3
bl AddTextPrinterParameterized2
add r0, r7, #0
bl String_Delete
bl String_Free
mov r0, #0x19
lsl r0, r0, #4
add r0, r4, r0
@ -15102,7 +15102,7 @@ ov09_02219A8C: ; 0x02219A8C
add r0, r4, #0
bl AddTextPrinterParameterized2
add r0, r7, #0
bl String_Delete
bl String_Free
add r0, r4, #0
bl ScheduleWindowCopyToVram
add sp, #0x10
@ -15149,7 +15149,7 @@ ov09_02219AFC: ; 0x02219AFC
str r1, [sp, #0xc]
bl AddTextPrinterParameterized2
add r0, r7, #0
bl String_Delete
bl String_Free
add r0, r4, #0
bl ScheduleWindowCopyToVram
add sp, #0x10

2
arm9/overlays/11/asm/ov11_0222D5C0_3.s
View File

@ -217,7 +217,7 @@ _0222F30E:
add r2, r6, #0
bl AddTextPrinterParameterized
add r0, r6, #0
bl String_Delete
bl String_Free
add r0, r4, #0
bl DestroyMsgData
ldr r0, _0222F4D8 ; =ov11_0222F0D4

6
arm9/overlays/11/asm/ov11_0222FF68.s
View File

@ -3293,7 +3293,7 @@ _022316CC:
bl AddTextPrinterParameterized
add r5, r0, #0
add r0, r4, #0
bl String_Delete
bl String_Free
b _02231778
_022316F6:
cmp r7, #0x64
@ -3331,7 +3331,7 @@ _02231708:
bl AddTextPrinterParameterized
add r5, r0, #0
add r0, r4, #0
bl String_Delete
bl String_Free
add r0, r7, #0
bl DestroyMsgData
b _02231778
@ -4652,7 +4652,7 @@ ov11_022321EC: ; 0x022321EC
add r2, r4, #0
bl StringExpandPlaceholders
add r0, r4, #0
bl String_Delete
bl String_Free
pop {r3, r4, r5, pc}
thumb_func_start ov11_0223220C

2
arm9/overlays/11/asm/ov11_02232264.s
View File

@ -21825,7 +21825,7 @@ _0223CF5C:
add r2, r6, #0
bl StringExpandPlaceholders
add r0, r6, #0
bl String_Delete
bl String_Free
add r0, sp, #0x68
bl InitWindow
mov r0, #0

10
arm9/overlays/11/asm/ov11_02256C08.s
View File

@ -1306,9 +1306,9 @@ ov11_022574F0: ; 0x022574F0
add r0, sp, #0x24
bl RemoveWindow
ldr r0, [sp, #0x18]
bl String_Delete
bl String_Free
ldr r0, [sp, #0x1c]
bl String_Delete
bl String_Free
add sp, #0x34
pop {r4, r5, r6, r7, pc}
.align 2, 0
@ -1852,7 +1852,7 @@ _02257A26:
add r0, sp, #0x18
bl RemoveWindow
add r0, r7, #0
bl String_Delete
bl String_Free
add sp, #0x28
pop {r3, r4, r5, r6, r7, pc}
nop
@ -1977,9 +1977,9 @@ _02257B1E:
add r0, sp, #0x24
bl RemoveWindow
add r0, r6, #0
bl String_Delete
bl String_Free
ldr r0, [sp, #0x18]
bl String_Delete
bl String_Free
add sp, #0x34
pop {r4, r5, r6, r7, pc}
.align 2, 0

56
arm9/overlays/11/asm/ov11_02258428.s
View File

@ -1933,13 +1933,13 @@ _0225934A:
add r2, r4, #0
bl ov11_0225A458
ldr r0, [sp, #0x24]
bl String_Delete
bl String_Free
ldr r0, [sp, #0x20]
bl String_Delete
bl String_Free
ldr r0, [sp, #0x1c]
bl String_Delete
bl String_Free
add r0, r4, #0
bl String_Delete
bl String_Free
ldr r0, [r5]
bl ov11_0222FF74
mov r1, #0x22
@ -2347,7 +2347,7 @@ _02259748:
add r2, r4, #0
bl ov11_0225A458
add r0, r4, #0
bl String_Delete
bl String_Free
mov r4, #0
mov r7, #3
b _022597B0
@ -2520,9 +2520,9 @@ ov11_02259898: ; 0x02259898
add r2, r6, #0
bl ov11_0225A458
add r0, r4, #0
bl String_Delete
bl String_Free
add r0, r6, #0
bl String_Delete
bl String_Free
add sp, #0x1c
pop {r3, r4, r5, r6, pc}
.align 2, 0
@ -2587,9 +2587,9 @@ ov11_02259930: ; 0x02259930
add r2, r6, #0
bl ov11_0225A458
add r0, r4, #0
bl String_Delete
bl String_Free
add r0, r6, #0
bl String_Delete
bl String_Free
add sp, #0x1c
pop {r3, r4, r5, r6, pc}
nop
@ -2679,13 +2679,13 @@ ov11_022599CC: ; 0x022599CC
add r2, r7, #0
bl ov11_0225A458
ldr r0, [sp, #0x1c]
bl String_Delete
bl String_Free
ldr r0, [sp, #0x20]
bl String_Delete
bl String_Free
add r0, r6, #0
bl String_Delete
bl String_Free
add r0, r7, #0
bl String_Delete
bl String_Free
add sp, #0x24
pop {r4, r5, r6, r7, pc}
nop
@ -2775,13 +2775,13 @@ ov11_02259AB0: ; 0x02259AB0
add r2, r7, #0
bl ov11_0225A458
ldr r0, [sp, #0x1c]
bl String_Delete
bl String_Free
ldr r0, [sp, #0x20]
bl String_Delete
bl String_Free
add r0, r6, #0
bl String_Delete
bl String_Free
add r0, r7, #0
bl String_Delete
bl String_Free
add sp, #0x24
pop {r4, r5, r6, r7, pc}
nop
@ -2872,13 +2872,13 @@ ov11_02259B94: ; 0x02259B94
add r2, r7, #0
bl ov11_0225A458
ldr r0, [sp, #0x1c]
bl String_Delete
bl String_Free
ldr r0, [sp, #0x20]
bl String_Delete
bl String_Free
add r0, r6, #0
bl String_Delete
bl String_Free
add r0, r7, #0
bl String_Delete
bl String_Free
add sp, #0x24
pop {r4, r5, r6, r7, pc}
.align 2, 0
@ -3024,7 +3024,7 @@ _02259D5C:
add r0, r5, #0
bl ov11_0225A458
ldr r0, [sp, #0x24]
bl String_Delete
bl String_Free
cmp r4, #1
beq _02259DA2
cmp r4, #3
@ -3074,7 +3074,7 @@ _02259DEC:
b _02259CE0
_02259DF2:
ldr r0, [sp, #0x28]
bl String_Delete
bl String_Free
ldr r0, [sp, #0x2c]
ldr r1, _02259E54 ; =0x000003A2
bl NewString_ReadMsgData
@ -3100,7 +3100,7 @@ _02259DF2:
add r1, r5, r1
bl ov11_0225A458
add r0, r4, #0
bl String_Delete
bl String_Free
add sp, #0x44
pop {r4, r5, r6, r7, pc}
nop
@ -4386,7 +4386,7 @@ _0225A826:
mov r2, #2
bl ov11_0225A968
ldr r0, [sp, #0x48]
bl String_Delete
bl String_Free
_0225A846:
add r0, r6, #0
add r0, #0x84
@ -4506,11 +4506,11 @@ _0225A906:
b _0225A7CE
_0225A930:
ldr r0, [sp, #0x28]
bl String_Delete
bl String_Free
ldr r0, [sp, #0x2c]
bl String_Delete
bl String_Free
ldr r0, [sp, #0x30]
bl String_Delete
bl String_Free
mov r0, #0xc
_0225A944:
ldr r1, [sp, #8]

54
arm9/overlays/12/asm/overlay_12.s
View File

@ -496,7 +496,7 @@ ov12_0222D9B0: ; 0x0222D9B0
ldr r0, [r4, #0x5c]
bl sub_02002FEC
ldr r0, [r4, #0x58]
bl String_Delete
bl String_Free
ldr r0, [r4, #0x54]
bl MessageFormat_Delete
ldr r0, [r4, #0x44]
@ -3669,7 +3669,7 @@ _0222F3AE:
ldr r0, [r4, #0x48]
bl MessageFormat_Delete
ldr r0, [r4, #0x4c]
bl String_Delete
bl String_Free
ldr r0, [r4, #0x44]
bl DestroyMsgData
ldr r0, [r4, #0x30]
@ -5507,7 +5507,7 @@ _02230296:
add r0, r4, #0
add r0, #0xa0
ldr r0, [r0]
bl String_Delete
bl String_Free
add r0, r4, #0
add r0, #0x9c
ldr r0, [r0]
@ -8891,9 +8891,9 @@ ov12_02231D5C: ; 0x02231D5C
str r3, [sp, #0x18]
bl ov12_022322C0
add r0, r4, #0
bl String_Delete
bl String_Free
add r0, r6, #0
bl String_Delete
bl String_Free
ldr r2, [r5, #4]
mov r0, #1
str r0, [sp]
@ -9315,7 +9315,7 @@ _0223210E:
mov r3, #2
bl ov12_022322C0
add r0, r6, #0
bl String_Delete
bl String_Free
ldr r2, [r5, #4]
ldr r0, [r2, #0x18]
ldr r1, [r2, #0x1c]
@ -10791,7 +10791,7 @@ _02232C62:
mov r2, #2
bl ov12_02232D7C
ldr r0, [sp, #0x24]
bl String_Delete
bl String_Free
mov r0, #0x4b
lsl r0, r0, #2
ldrb r0, [r4, r0]
@ -10823,9 +10823,9 @@ _02232C62:
mov r2, #0
bl ov12_02232D7C
ldr r0, [sp, #0x28]
bl String_Delete
bl String_Free
add r0, r4, #0
bl String_Delete
bl String_Free
ldr r0, [sp, #0x1c]
add r7, r7, #2
add r0, #0x14
@ -10861,7 +10861,7 @@ _02232CF8:
add r3, r6, #0
bl ov12_02232D7C
ldr r0, [sp, #0x2c]
bl String_Delete
bl String_Free
add r7, r7, #1
add r4, #8
add r6, #0x14
@ -15300,7 +15300,7 @@ _02234F96:
mov r1, #1
bl Bg_GetXpos
add r0, r6, #0
bl String_Delete
bl String_Free
add sp, #0x10
pop {r3, r4, r5, r6, r7, pc}
.align 2, 0
@ -15462,7 +15462,7 @@ _0223506A:
mov r0, #0x15
bl ov12_02231380
ldr r0, [sp, #0x30]
bl String_Delete
bl String_Free
add sp, #0x34
pop {r4, r5, r6, r7, pc}
nop
@ -25531,7 +25531,7 @@ _02239AF4:
add r5, #0xd0
strb r0, [r5]
add r0, r6, #0
bl String_Delete
bl String_Free
add sp, #0x10
pop {r3, r4, r5, r6, r7, pc}
nop
@ -29485,9 +29485,9 @@ ov12_0223B940: ; 0x0223B940
add r2, r7, #0
bl ov12_0223BCD8
add r0, r6, #0
bl String_Delete
bl String_Free
add r0, r7, #0
bl String_Delete
bl String_Free
add r0, r4, #0
bl DestroyMsgData
add sp, #0x18
@ -29619,13 +29619,13 @@ _0223BA3E:
str r1, [sp, #0x18]
bl ov12_0223BCD8
add r0, r4, #0
bl String_Delete
bl String_Free
add r0, r6, #0
bl String_Delete
bl String_Free
add r0, r7, #0
bl String_Delete
bl String_Free
add r0, r5, #0
bl String_Delete
bl String_Free
add sp, #0x1c
pop {r4, r5, r6, r7, pc}
.align 2, 0
@ -31382,11 +31382,11 @@ _0223C778:
cmp r0, #3
blt _0223C778
ldr r0, [sp, #0x38]
bl String_Delete
bl String_Free
ldr r0, [sp, #0x34]
bl String_Delete
bl String_Free
ldr r0, [sp, #0x30]
bl String_Delete
bl String_Free
add sp, #0x40
pop {r3, r4, r5, r6, r7, pc}
.align 2, 0
@ -34782,7 +34782,7 @@ _0223E210:
ldr r1, _0223E270 ; =0x00000AB8
strb r0, [r5, r1]
add r0, r6, #0
bl String_Delete
bl String_Free
add sp, #0x10
pop {r3, r4, r5, r6, r7, pc}
nop
@ -35117,7 +35117,7 @@ _0223E49A:
mov r1, #1
bl AddTextPrinterParameterized
add r0, r6, #0
bl String_Delete
bl String_Free
ldr r0, _0223E51C ; =0x00001BF1
mov r1, #1
strb r1, [r5, r0]
@ -41542,7 +41542,7 @@ _022415D4:
add r0, r4, #0
add r0, #0xcc
ldr r0, [r0]
bl String_Delete
bl String_Free
add r0, r4, #0
add r0, #0xc8
ldr r0, [r0]
@ -43570,7 +43570,7 @@ _02242618:
lsl r1, r1, #2
strb r0, [r5, r1]
add r0, r6, #0
bl String_Delete
bl String_Free
add sp, #0x10
pop {r3, r4, r5, r6, r7, pc}
.align 2, 0
@ -43937,7 +43937,7 @@ _022428E6:
cmp r5, #4
blt _022428E6
add r0, r7, #0
bl String_Delete
bl String_Free
mov r2, #1
lsl r2, r2, #0x1a
ldr r1, [r2]

32
arm9/overlays/14/asm/overlay_14.s
View File

@ -7829,11 +7829,11 @@ ov14_021DB49C: ; 0x021DB49C
thumb_func_start ov14_021DB4BC
ov14_021DB4BC: ; 0x021DB4BC
ldr r3, _021DB4C4 ; =String_Delete
ldr r3, _021DB4C4 ; =String_Free
ldr r0, [r0, #4]
bx r3
nop
_021DB4C4: .word String_Delete
_021DB4C4: .word String_Free
thumb_func_start ov14_021DB4C8
ov14_021DB4C8: ; 0x021DB4C8
@ -7866,15 +7866,15 @@ ov14_021DB500: ; 0x021DB500
push {r4, lr}
add r4, r0, #0
ldr r0, [r4, #0x14]
bl String_Delete
bl String_Free
ldr r0, [r4, #0x18]
bl String_Delete
bl String_Free
ldr r0, [r4, #0x1c]
bl String_Delete
bl String_Free
ldr r0, [r4, #0x20]
bl String_Delete
bl String_Free
ldr r0, [r4, #0x24]
bl String_Delete
bl String_Free
pop {r4, pc}
thumb_func_start ov14_021DB524
@ -7912,9 +7912,9 @@ ov14_021DB558: ; 0x021DB558
mov r4, #0
_021DB55E:
ldr r0, [r5, #0x30]
bl String_Delete
bl String_Free
ldr r0, [r5, #0x34]
bl String_Delete
bl String_Free
add r4, r4, #1
add r5, #0x30
cmp r4, #2
@ -19526,12 +19526,12 @@ _021E0E86:
ldr r0, [r5, #0x44]
cmp r0, #0
beq _021E0E90
bl String_Delete
bl String_Free
_021E0E90:
ldr r0, [r5, #0x48]
cmp r0, #0
beq _021E0E9A
bl String_Delete
bl String_Free
_021E0E9A:
ldr r0, [r5, #0x24]
cmp r0, #0
@ -20729,12 +20729,12 @@ _021E17F6:
ldr r0, [r5, #0x30]
cmp r0, #0
beq _021E1800
bl String_Delete
bl String_Free
_021E1800:
ldr r0, [r5, #0x34]
cmp r0, #0
beq _021E180A
bl String_Delete
bl String_Free
_021E180A:
ldr r0, [r5, #0x18]
bl Heap_Free
@ -21693,7 +21693,7 @@ _021E1F62:
ldr r0, [r5, r0]
cmp r0, #0
beq _021E1F6E
bl String_Delete
bl String_Free
_021E1F6E:
ldr r0, [r5, #0x10]
cmp r0, #0
@ -24553,7 +24553,7 @@ _021E3518:
ldr r0, [r0]
cmp r0, #0
beq _021E3526
bl String_Delete
bl String_Free
_021E3526:
mov r4, #0
add r5, r6, #0
@ -28252,7 +28252,7 @@ ov14_021E50EC: ; 0x021E50EC
add r0, r4, #0
bl ov14_021E5474
ldr r0, [r4, #0x74]
bl String_Delete
bl String_Free
add r0, r4, #0
bl Heap_Free
_021E5124:

28
arm9/overlays/15/asm/overlay_15.s
View File

@ -4384,7 +4384,7 @@ _021D966A:
ldr r0, [r4, #0x4c]
cmp r0, #0
beq _021D9674
bl String_Delete
bl String_Free
_021D9674:
add r0, r4, #0
add r0, #0xc
@ -4933,7 +4933,7 @@ _021D9ADE:
str r0, [sp, #0x10]
bl ov15_021D9B30
ldr r0, [sp, #0x1c]
bl String_Delete
bl String_Free
ldr r0, [sp, #0x18]
add sp, #0x28
pop {r3, r4, r5, r6, r7, pc}
@ -4967,11 +4967,11 @@ _021D9B2C: .word 0x0000FFFE
thumb_func_start ov15_021D9B30
ov15_021D9B30: ; 0x021D9B30
ldr r3, _021D9B38 ; =String_Delete
ldr r3, _021D9B38 ; =String_Free
ldr r0, [r0]
bx r3
nop
_021D9B38: .word String_Delete
_021D9B38: .word String_Free
thumb_func_start ov15_021D9B3C
ov15_021D9B3C: ; 0x021D9B3C
@ -5246,7 +5246,7 @@ _021D9CDC:
str r3, [sp, #0xc]
bl AddTextPrinterParameterized2
add r0, r6, #0
bl String_Delete
bl String_Free
add r0, r5, #0
bl MessageFormat_Delete
b _021D9DB0
@ -5678,7 +5678,7 @@ ov15_021DA044: ; 0x021DA044
add r0, sp, #0x10
bl CopyWindowPixelsToVram_TextMode
add r0, r4, #0
bl String_Delete
bl String_Free
add r0, sp, #0x10
bl RemoveWindow
add sp, #0x20
@ -6046,7 +6046,7 @@ _021DA31A:
add r0, sp, #0x28
bl CopyWindowPixelsToVram_TextMode
add r0, r5, #0
bl String_Delete
bl String_Free
add r0, sp, #0x28
bl RemoveWindow
add r4, r4, #1
@ -6147,7 +6147,7 @@ _021DA452:
add r0, sp, #0x20
bl PutWindowTilemap
add r0, r4, #0
bl String_Delete
bl String_Free
add r0, sp, #0x20
bl RemoveWindow
ldr r0, [sp, #0x14]
@ -6241,7 +6241,7 @@ _021DA4C2:
cmp r7, #2
blo _021DA4B6
ldr r0, [sp, #0x1c]
bl String_Delete
bl String_Free
ldr r0, [sp, #0x20]
bl DestroyMsgData
add r0, r5, #0
@ -6730,7 +6730,7 @@ _021DA8C6:
ldr r0, [r4, #0x3c]
cmp r0, #0
beq _021DA8D0
bl String_Delete
bl String_Free
_021DA8D0:
add r0, r4, #0
add r0, #0x20
@ -7737,13 +7737,13 @@ ov15_021DAFF8: ; 0x021DAFF8
bl Heap_Free
_021DB0D4:
add r0, r6, #0
bl String_Delete
bl String_Free
add r0, r4, #0
bl String_Delete
bl String_Free
ldr r0, [sp, #4]
bl String_Delete
bl String_Free
add r0, r7, #0
bl String_Delete
bl String_Free
mov r0, #2
bl sub_02002CF8
add sp, #0x20

50
arm9/overlays/16/asm/overlay_16.s
View File

@ -1198,7 +1198,7 @@ ov16_021D7D9C: ; 0x021D7D9C
mov r3, #0x31
bl AddTextPrinterParameterized2
add r0, r4, #0
bl String_Delete
bl String_Free
add r0, r6, #0
bl ov16_021DBBAC
add sp, #0x14
@ -4694,7 +4694,7 @@ ov16_021D98B0: ; 0x021D98B0
add r4, r0, #0
ldr r0, _021D98D4 ; =0x00001754
ldr r0, [r4, r0]
bl String_Delete
bl String_Free
ldr r0, _021D98D8 ; =0x00001748
ldr r0, [r4, r0]
bl sub_02087B0C
@ -8498,7 +8498,7 @@ _021DB3E4:
bl sub_02002E14
add r6, r0, #0
add r0, r4, #0
bl String_Delete
bl String_Free
add r0, r5, #0
bl DestroyMsgData
add r0, r6, #0
@ -9663,10 +9663,10 @@ _021DBBA8:
thumb_func_start ov16_021DBBAC
ov16_021DBBAC: ; 0x021DBBAC
ldr r3, _021DBBB0 ; =String_Delete
ldr r3, _021DBBB0 ; =String_Free
bx r3
.align 2, 0
_021DBBB0: .word String_Delete
_021DBBB0: .word String_Free
thumb_func_end ov16_021DBBAC
thumb_func_start ov16_021DBBB4
@ -11602,7 +11602,7 @@ ov16_021DC958: ; 0x021DC958
str r1, [sp, #0xc]
bl AddTextPrinterParameterized2
add r0, r4, #0
bl String_Delete
bl String_Free
add r0, r6, #0
bl DestroyMsgData
ldr r0, [r5]
@ -11664,7 +11664,7 @@ ov16_021DCA2C: ; 0x021DCA2C
str r1, [sp, #0xc]
bl AddTextPrinterParameterized2
add r0, r4, #0
bl String_Delete
bl String_Free
add r0, r6, #0
bl DestroyMsgData
ldr r0, [r5]
@ -12886,7 +12886,7 @@ _021DD420:
add r0, r5, #0
bl ov16_021DB3BC
add r0, r7, #0
bl String_Delete
bl String_Free
ldr r0, [sp, #0x14]
bl DestroyMsgData
add sp, #0x40
@ -17114,7 +17114,7 @@ _021DF394:
str r1, [sp, #0xc]
bl AddTextPrinterParameterized2
add r0, r6, #0
bl String_Delete
bl String_Free
add sp, #0x10
pop {r3, r4, r5, r6, r7, pc}
.align 2, 0
@ -17166,7 +17166,7 @@ ov16_021DF3E4: ; 0x021DF3E4
str r1, [sp, #0xc]
bl AddTextPrinterParameterized2
add r0, r6, #0
bl String_Delete
bl String_Free
add sp, #0x10
pop {r4, r5, r6, pc}
.align 2, 0
@ -17411,7 +17411,7 @@ ov16_021DF5D0: ; 0x021DF5D0
str r1, [sp, #0xc]
bl AddTextPrinterParameterized2
add r0, r5, #0
bl String_Delete
bl String_Free
add sp, #0x10
pop {r4, r5, r6, pc}
nop
@ -17505,7 +17505,7 @@ _021DF698:
str r1, [sp, #0xc]
bl AddTextPrinterParameterized2
add r0, r4, #0
bl String_Delete
bl String_Free
add sp, #0x10
pop {r3, r4, r5, r6, r7, pc}
nop
@ -17632,7 +17632,7 @@ _021DF774:
str r1, [sp, #0xc]
bl AddTextPrinterParameterized2
add r0, r4, #0
bl String_Delete
bl String_Free
add sp, #0x14
pop {r4, r5, r6, r7, pc}
.align 2, 0
@ -17900,7 +17900,7 @@ ov16_021DF970: ; 0x021DF970
str r1, [sp, #0xc]
bl AddTextPrinterParameterized2
add r0, r4, #0
bl String_Delete
bl String_Free
mov r0, #1
mov r1, #0
bl SetBgPriority
@ -29813,7 +29813,7 @@ ov16_021E5064: ; 0x021E5064
str r1, [sp, #0xc]
bl AddTextPrinterParameterized2
add r0, r7, #0
bl String_Delete
bl String_Free
ldr r0, [sp, #0x18]
bl DestroyMsgData
ldr r2, [sp, #0x10]
@ -29870,7 +29870,7 @@ ov16_021E5104: ; 0x021E5104
str r1, [sp, #0xc]
bl AddTextPrinterParameterized2
add r0, r4, #0
bl String_Delete
bl String_Free
add r0, r6, #0
bl DestroyMsgData
add sp, #0x14
@ -29909,7 +29909,7 @@ ov16_021E5158: ; 0x021E5158
str r1, [sp, #0xc]
bl AddTextPrinterParameterized2
add r0, r4, #0
bl String_Delete
bl String_Free
add r0, r6, #0
bl DestroyMsgData
add sp, #0x14
@ -34501,7 +34501,7 @@ _021E731E:
sub r3, r3, r6
bl AddTextPrinterParameterized2
ldr r0, [sp, #0x18]
bl String_Delete
bl String_Free
ldr r0, [sp, #0x14]
bl DestroyMsgData
ldr r0, [r4, #0x1c]
@ -45875,7 +45875,7 @@ ov16_021EC7E8: ; 0x021EC7E8
mov r3, #0x98
bl AddTextPrinterParameterized2
add r0, r4, #0
bl String_Delete
bl String_Free
add r0, r6, #0
bl DestroyMsgData
add sp, #0x10
@ -45943,7 +45943,7 @@ ov16_021EC898: ; 0x021EC898
add r0, r0, #4
bl AddTextPrinterParameterized2
ldr r0, [sp, #0x18]
bl String_Delete
bl String_Free
ldr r0, [sp, #0x10]
bl DestroyMsgData
ldr r2, _021EC9AC ; =0x00000266
@ -45999,7 +45999,7 @@ _021EC970:
add r0, r0, #4
bl AddTextPrinterParameterized2
add r0, r4, #0
bl String_Delete
bl String_Free
add r0, r7, #0
bl DestroyMsgData
add sp, #0x1c
@ -48855,7 +48855,7 @@ ov16_021EDEC8: ; 0x021EDEC8
mov r3, #0x98
bl AddTextPrinterParameterized2
add r0, r4, #0
bl String_Delete
bl String_Free
add r0, r6, #0
bl DestroyMsgData
add sp, #0x10
@ -48922,7 +48922,7 @@ ov16_021EDF78: ; 0x021EDF78
add r0, r0, #4
bl AddTextPrinterParameterized2
ldr r0, [sp, #0x18]
bl String_Delete
bl String_Free
ldr r0, [sp, #0x10]
bl DestroyMsgData
ldr r2, _021EE08C ; =0x00000266
@ -48978,7 +48978,7 @@ _021EE04E:
add r0, r0, #4
bl AddTextPrinterParameterized2
add r0, r4, #0
bl String_Delete
bl String_Free
add r0, r7, #0
bl DestroyMsgData
add sp, #0x1c
@ -52443,7 +52443,7 @@ ov16_021EFA6C: ; 0x021EFA6C
str r1, [sp, #0xc]
bl AddTextPrinterParameterized2
add r0, r5, #0
bl String_Delete
bl String_Free
add r0, r4, #0
bl DestroyMsgData
add sp, #0x10

32
arm9/overlays/17/asm/overlay_17.s
View File

@ -4260,7 +4260,7 @@ ov17_021D95AC: ; 0x021D95AC
add r1, r5, #0
bl sub_020274F0
add r0, r5, #0
bl String_Delete
bl String_Free
_021D95EC:
ldr r0, [sp]
mov r5, #0
@ -4347,7 +4347,7 @@ ov17_021D964C: ; 0x021D964C
add r1, r5, #0
bl sub_02027A58
add r0, r5, #0
bl String_Delete
bl String_Free
_021D969A:
ldr r1, [sp]
add r0, r6, #0
@ -4729,7 +4729,7 @@ ov17_021D9918: ; 0x021D9918
add r2, r4, #0
bl AddTextPrinterParameterized2
add r0, r4, #0
bl String_Delete
bl String_Free
add r0, r6, #0
bl DestroyMsgData
ldr r0, _021D99D4 ; =0x000006A8
@ -4785,9 +4785,9 @@ ov17_021D99E0: ; 0x021D99E0
add r2, r4, #0
bl AddTextPrinterParameterized2
add r0, r4, #0
bl String_Delete
bl String_Free
add r0, r6, #0
bl String_Delete
bl String_Free
add r0, r7, #0
bl DestroyMsgData
ldr r0, _021D9A58 ; =0x000006A8
@ -4866,7 +4866,7 @@ _021D9AD0:
bl AddTextPrinterParameterized2
add r6, r0, #0
add r0, r4, #0
bl String_Delete
bl String_Free
add r0, r7, #0
bl DestroyMsgData
ldr r0, _021D9B08 ; =0x000006A8
@ -4889,7 +4889,7 @@ ov17_021D9B18: ; 0x021D9B18
mov r0, #0x6d
lsl r0, r0, #4
ldr r0, [r4, r0]
bl String_Delete
bl String_Free
mov r0, #0x6d
mov r1, #0
lsl r0, r0, #4
@ -11292,7 +11292,7 @@ _021DC898:
str r3, [sp, #0xc]
bl AddTextPrinterParameterized2
add r0, r7, #0
bl String_Delete
bl String_Free
add r0, r6, #0
bl DestroyMsgData
add r0, r4, #0
@ -11681,7 +11681,7 @@ ov17_021DCBC0: ; 0x021DCBC0
mov r0, #0x51
lsl r0, r0, #2
ldr r0, [r4, r0]
bl String_Delete
bl String_Free
mov r0, #0x51
mov r1, #0
lsl r0, r0, #2
@ -11957,7 +11957,7 @@ _021DCD98:
bl AddTextPrinterParameterized2
add r6, r0, #0
add r0, r4, #0
bl String_Delete
bl String_Free
add r0, r5, #0
bl DestroyMsgData
add r0, r6, #0
@ -14397,7 +14397,7 @@ _021DDFF8:
sub r3, r3, r4
bl AddTextPrinterParameterized2
add r0, r7, #0
bl String_Delete
bl String_Free
ldr r0, [r5]
bl sub_0202769C
add r2, r0, #0
@ -14439,9 +14439,9 @@ _021DDFF8:
sub r3, r3, r5
bl AddTextPrinterParameterized2
add r0, r4, #0
bl String_Delete
bl String_Free
add r0, r7, #0
bl String_Delete
bl String_Free
ldr r0, [sp, #0x10]
bl DestroyMsgData
add r0, r6, #0
@ -14533,7 +14533,7 @@ _021DE1A0:
add r2, r6, #0
bl StringExpandPlaceholders
add r0, r6, #0
bl String_Delete
bl String_Free
mov r0, #0
add r1, r4, #0
add r2, r0, #0
@ -14565,7 +14565,7 @@ _021DE1A0:
add r2, r6, #0
bl StringExpandPlaceholders
add r0, r6, #0
bl String_Delete
bl String_Free
mov r0, #0
add r1, r4, #0
add r2, r0, #0
@ -14589,7 +14589,7 @@ _021DE1A0:
sub r3, r3, r5
bl AddTextPrinterParameterized2
add r0, r4, #0
bl String_Delete
bl String_Free
ldr r0, [sp, #0x10]
bl DestroyMsgData
add r0, r7, #0

56
arm9/overlays/18/asm/overlay_18.s
View File

@ -7747,7 +7747,7 @@ _0223D276:
cmp r6, #0
beq _0223D280
add r0, r6, #0
bl String_Delete
bl String_Free
_0223D280:
cmp r5, #0
beq _0223D28A
@ -8150,7 +8150,7 @@ _0223D5AC:
ldr r0, [r0]
cmp r0, #0
beq _0223D5BC
bl String_Delete
bl String_Free
_0223D5BC:
add r4, r4, #1
add r5, r5, #4
@ -8343,7 +8343,7 @@ ov18_0223D6D8: ; 0x0223D6D8
add r2, r7, #0
bl StringExpandPlaceholders
add r0, r7, #0
bl String_Delete
bl String_Free
add r0, r4, #0
bl MessageFormat_Delete
add sp, #8
@ -8386,7 +8386,7 @@ ov18_0223D744: ; 0x0223D744
add r2, r6, #0
bl StringExpandPlaceholders
add r0, r6, #0
bl String_Delete
bl String_Free
add r0, r4, #0
bl MessageFormat_Delete
add sp, #8
@ -8501,7 +8501,7 @@ _0223D84E:
add r0, r0, r4
add r0, #0xdc
ldr r0, [r0]
bl String_Delete
bl String_Free
ldr r0, _0223D8A0 ; =0x02251388
mov r1, #0
ldr r0, [r0]
@ -10162,7 +10162,7 @@ ov18_0223E4D4: ; 0x0223E4D4
ldr r1, [r1]
bl StringExpandPlaceholders
add r0, r7, #0
bl String_Delete
bl String_Free
add r0, r6, #0
bl MessageFormat_Delete
_0223E54E:
@ -23457,7 +23457,7 @@ ov18_02244B7C: ; 0x02244B7C
add r4, r5, #0
_02244B84:
ldr r0, [r4]
bl String_Delete
bl String_Free
add r6, r6, #1
add r4, r4, #4
cmp r6, #0x20
@ -23465,13 +23465,13 @@ _02244B84:
add r0, r5, #0
add r0, #0x80
ldr r0, [r0]
bl String_Delete
bl String_Free
mov r4, #0
_02244B9E:
add r0, r5, #0
add r0, #0x84
ldr r0, [r0]
bl String_Delete
bl String_Free
add r4, r4, #1
add r5, r5, #4
cmp r4, #2
@ -32987,7 +32987,7 @@ _022495BA:
add r1, r7, #0
bl ListMenuItems_AddItem
add r0, r7, #0
bl String_Delete
bl String_Free
b _022495EE
_022495E2:
ldr r0, [r5, #0x40]
@ -35279,9 +35279,9 @@ ov18_0224A8AC: ; 0x0224A8AC
bl sub_020021EC
_0224A8C0:
ldr r0, [r5, #0x68]
bl String_Delete
bl String_Free
ldr r0, [r5, #0x6c]
bl String_Delete
bl String_Free
ldr r0, [r5, #0x70]
bl MessageFormat_Delete
bl ov18_0223D648
@ -35937,12 +35937,12 @@ _0224AE34:
ldr r0, [r5, #0x68]
cmp r0, #0
beq _0224AE3E
bl String_Delete
bl String_Free
_0224AE3E:
ldr r0, [r5, #0x6c]
cmp r0, #0
beq _0224AE48
bl String_Delete
bl String_Free
_0224AE48:
ldr r0, [r5, #0x70]
cmp r0, #0
@ -37366,9 +37366,9 @@ ov18_0224B980: ; 0x0224B980
add r4, r1, #0
add r5, r0, #0
ldr r0, [r4, #0x68]
bl String_Delete
bl String_Free
ldr r0, [r4, #0x6c]
bl String_Delete
bl String_Free
ldr r0, [r4, #0x70]
bl MessageFormat_Delete
mov r0, #0x7f
@ -39370,9 +39370,9 @@ ov18_0224CA34: ; 0x0224CA34
push {r4, lr}
add r4, r0, #0
ldr r0, [r4, #0x68]
bl String_Delete
bl String_Free
ldr r0, [r4, #0x6c]
bl String_Delete
bl String_Free
ldr r0, [r4, #0x70]
bl MessageFormat_Delete
add r0, r4, #0
@ -40717,9 +40717,9 @@ _0224D500:
cmp r0, #7
blt _0224D500
add r0, r4, #0
bl String_Delete
bl String_Free
ldr r0, [sp, #0x18]
bl String_Delete
bl String_Free
ldr r0, [sp, #0x1c]
bl MessageFormat_Delete
add sp, #0x20
@ -41273,9 +41273,9 @@ _0224D9DE:
cmp r0, #5
blt _0224D8FA
add r0, r4, #0
bl String_Delete
bl String_Free
add r0, r6, #0
bl String_Delete
bl String_Free
add r0, r7, #0
bl MessageFormat_Delete
add sp, #0x28
@ -41456,9 +41456,9 @@ ov18_0224DB5C: ; 0x0224DB5C
push {r4, lr}
add r4, r0, #0
ldr r0, [r4]
bl String_Delete
bl String_Free
ldr r0, [r4, #4]
bl String_Delete
bl String_Free
ldr r0, [r4, #0x28]
bl MessageFormat_Delete
ldr r0, [r4, #0x24]
@ -42362,7 +42362,7 @@ ov18_0224E0CC: ; 0x0224E0CC
str r1, [sp, #8]
bl AddTextPrinterParameterized
add r0, r4, #0
bl String_Delete
bl String_Free
mov r6, #0
add r4, sp, #0x14
_0224E186:
@ -42867,11 +42867,11 @@ _0224E454:
add r0, r6, #0
bl MessageFormat_Delete
ldr r0, [sp, #0x28]
bl String_Delete
bl String_Free
ldr r0, [sp, #0x2c]
bl String_Delete
bl String_Free
add r0, r4, #0
bl String_Delete
bl String_Free
ldr r0, [sp, #0x24]
bl DestroyMsgData
ldr r0, [sp, #0x20]

2
arm9/overlays/38/asm/overlay_38.s
View File

@ -659,7 +659,7 @@ ov38_02254D04: ; 0x02254D04
beq _02254D32
add r0, #0xbc
ldr r0, [r0]
bl String_Delete
bl String_Free
add r0, r4, #0
add r0, #0xb4
ldr r0, [r0]

2
arm9/overlays/43/asm/overlay_43.s
View File

@ -673,7 +673,7 @@ ov43_02254CD0: ; 0x02254CD0
add r0, sp, #0x14
bl RemoveWindow
add r0, r6, #0
bl String_Delete
bl String_Free
_02254D44:
add sp, #0x24
pop {r3, r4, r5, r6, pc}

2
arm9/overlays/47/asm/overlay_47.s
View File

@ -725,7 +725,7 @@ ov47_02254D6C: ; 0x02254D6C
add r4, r0, #0
beq _02254D8A
ldr r0, [r4, #0x5c]
bl String_Delete
bl String_Free
ldr r0, [r4, #0x58]
bl DestroyMsgData
add r0, r4, #0

2
arm9/overlays/49/asm/overlay_49.s
View File

@ -452,7 +452,7 @@ ov49_02254AD4: ; 0x02254AD4
add r0, sp, #0x1c
bl CopyWindowPixelsToVram_TextMode
add r0, r4, #0
bl String_Delete
bl String_Free
_02254B94:
add r0, sp, #0x1c
bl RemoveWindow

6
arm9/overlays/51/asm/overlay_51.s
View File

@ -1581,7 +1581,7 @@ _0225548C:
add r3, r1, #0
bl BufferString
add r0, r4, #0
bl String_Delete
bl String_Free
_022554CA:
ldr r1, [sp, #8]
add r0, r7, #0
@ -1629,7 +1629,7 @@ _0225550A:
ldr r0, [r0, #4]
cmp r0, #0
beq _0225551E
bl String_Delete
bl String_Free
_0225551E:
ldr r1, [r5]
mov r0, #0x1c
@ -1638,7 +1638,7 @@ _0225551E:
ldr r0, [r0, #8]
cmp r0, #0
beq _02255530
bl String_Delete
bl String_Free
_02255530:
ldr r0, [sp, #8]
bl PlayerProfile_GetNamePtr

8
arm9/overlays/53/asm/overlay_53.s
View File

@ -712,15 +712,15 @@ ov53_021D7AE8: ; 0x021D7AE8
add r5, r6, #0
_021D7B00:
ldr r0, [r5, #0x14]
bl String_Delete
bl String_Free
add r4, r4, #1
add r5, r5, #4
cmp r4, #5
blt _021D7B00
ldr r0, [r6, #0x2c]
bl String_Delete
bl String_Free
ldr r0, [r6, #0x28]
bl String_Delete
bl String_Free
pop {r4, r5, r6, pc}
.align 2, 0
_021D7B1C: .word 0x000043C8
@ -3628,7 +3628,7 @@ ov53_021D91C8: ; 0x021D91C8
add r2, r6, #0
bl StringExpandPlaceholders
add r0, r6, #0
bl String_Delete
bl String_Free
mov r0, #0xb6
lsl r0, r0, #2
add r0, r5, r0

10
arm9/overlays/54/asm/overlay_54.s
View File

@ -643,15 +643,15 @@ ov54_021D7A34: ; 0x021D7A34
add r5, r6, #0
_021D7A50:
ldr r0, [r5, #0x2c]
bl String_Delete
bl String_Free
add r4, r4, #1
add r5, r5, #4
cmp r4, #5
blt _021D7A50
ldr r0, [r6, #0x48]
bl String_Delete
bl String_Free
ldr r0, [r6, #0x44]
bl String_Delete
bl String_Free
pop {r4, r5, r6, pc}
thumb_func_end ov54_021D7A34
@ -2879,7 +2879,7 @@ _021D8BAC:
bl AddTextPrinterParameterized2
_021D8BDE:
ldr r0, [sp, #0x18]
bl String_Delete
bl String_Free
_021D8BE4:
ldr r0, [sp, #0x20]
add r7, #8
@ -3008,7 +3008,7 @@ ov54_021D8C90: ; 0x021D8C90
add r2, r4, #0
bl StringExpandPlaceholders
add r0, r4, #0
bl String_Delete
bl String_Free
mov r0, #0xba
lsl r0, r0, #2
add r0, r5, r0

14
arm9/overlays/55/asm/overlay_55.s
View File

@ -647,7 +647,7 @@ ov55_021D7A38: ; 0x021D7A38
add r5, r6, #0
_021D7A4C:
ldr r0, [r5, #0x38]
bl String_Delete
bl String_Free
add r4, r4, #1
add r5, r5, #4
cmp r4, #0x20
@ -655,22 +655,22 @@ _021D7A4C:
add r0, r6, #0
add r0, #0xb8
ldr r0, [r0]
bl String_Delete
bl String_Free
add r0, r6, #0
add r0, #0xbc
ldr r0, [r0]
bl String_Delete
bl String_Free
add r0, r6, #0
add r0, #0xc0
ldr r0, [r0]
bl String_Delete
bl String_Free
mov r5, #0
add r4, r6, #0
_021D7A7C:
add r0, r4, #0
add r0, #0xc4
ldr r0, [r0]
bl String_Delete
bl String_Free
add r5, r5, #1
add r4, r4, #4
cmp r5, #4
@ -678,10 +678,10 @@ _021D7A7C:
add r0, r6, #0
add r0, #0xd4
ldr r0, [r0]
bl String_Delete
bl String_Free
add r6, #0xd8
ldr r0, [r6]
bl String_Delete
bl String_Free
pop {r4, r5, r6, pc}
.align 2, 0
thumb_func_end ov55_021D7A38

16
arm9/overlays/56/asm/overlay_56.s
View File

@ -858,7 +858,7 @@ _022124EC:
add r0, r5, #0
add r0, #0xd4
ldr r0, [r0]
bl String_Delete
bl String_Free
add r4, r4, #1
add r5, r5, #4
cmp r4, #0x20
@ -866,22 +866,22 @@ _022124EC:
mov r0, #0x16
lsl r0, r0, #4
ldr r0, [r7, r0]
bl String_Delete
bl String_Free
mov r0, #0x57
lsl r0, r0, #2
ldr r0, [r7, r0]
bl String_Delete
bl String_Free
mov r0, #0x5d
lsl r0, r0, #2
ldr r0, [r7, r0]
bl String_Delete
bl String_Free
mov r6, #0x59
mov r5, #0
add r4, r7, #0
lsl r6, r6, #2
_02212524:
ldr r0, [r4, r6]
bl String_Delete
bl String_Free
add r5, r5, #1
add r4, r4, #4
cmp r5, #4
@ -889,7 +889,7 @@ _02212524:
mov r0, #0x56
lsl r0, r0, #2
ldr r0, [r7, r0]
bl String_Delete
bl String_Free
pop {r3, r4, r5, r6, r7, pc}
.align 2, 0
thumb_func_end ov56_022124E4
@ -2778,7 +2778,7 @@ ov56_0221341C: ; 0x0221341C
cmp r0, #0
bne _0221344C
add r0, r6, #0
bl String_Delete
bl String_Free
add sp, #0x10
pop {r4, r5, r6, pc}
_0221344C:
@ -2801,7 +2801,7 @@ _0221344C:
str r1, [sp, #0xc]
bl AddTextPrinterParameterized2
add r0, r6, #0
bl String_Delete
bl String_Free
ldr r0, [r4, #4]
ldrb r0, [r0, #0x1b]
cmp r0, #0x10

16
arm9/overlays/57/asm/overlay_57.s
View File

@ -612,10 +612,10 @@ ov57_021D79F4: ; 0x021D79F4
add r4, r0, #0
ldr r0, _021D7A0C ; =0x00003308
ldr r0, [r4, r0]
bl String_Delete
bl String_Free
ldr r0, _021D7A10 ; =0x0000330C
ldr r0, [r4, r0]
bl String_Delete
bl String_Free
pop {r4, pc}
nop
_021D7A0C: .word 0x00003308
@ -3012,11 +3012,11 @@ _021D8C32:
str r1, [sp, #0xc]
bl AddTextPrinterParameterized2
ldr r0, [sp, #0x10]
bl String_Delete
bl String_Free
add r0, r4, #0
bl MessageFormat_Delete
add r0, r5, #0
bl String_Delete
bl String_Free
ldr r0, [sp, #0x14]
bl DestroyMsgData
add sp, #0x18
@ -3329,11 +3329,11 @@ _021D8E74:
add r3, r2, #0
bl ov57_021D8FD8
ldr r0, [sp, #0x14]
bl String_Delete
bl String_Free
add r0, r4, #0
bl MessageFormat_Delete
add r0, r5, #0
bl String_Delete
bl String_Free
add r0, r7, #0
bl DestroyMsgData
add sp, #0x18
@ -3521,9 +3521,9 @@ _021D906E:
ldr r0, [sp, #0x10]
bl DestroyMsgData
add r0, r4, #0
bl String_Delete
bl String_Free
ldr r0, [sp, #0x14]
bl String_Delete
bl String_Free
add r0, r6, #0
bl MessageFormat_Delete
add sp, #0x18

10
arm9/overlays/58/asm/overlay_58.s
View File

@ -523,17 +523,17 @@ ov58_021D9EA0: ; 0x021D9EA0
add r5, r6, #0
_021D9EB0:
ldr r0, [r5, #0x18]
bl String_Delete
bl String_Free
add r4, r4, #1
add r5, r5, #4
cmp r4, #5
blt _021D9EB0
ldr r0, [r6, #0x34]
bl String_Delete
bl String_Free
ldr r0, [r6, #0x30]
bl String_Delete
bl String_Free
ldr r0, [r6, #0x2c]
bl String_Delete
bl String_Free
pop {r4, r5, r6, pc}
nop
_021D9ED4: .word 0x00005C9C
@ -2212,7 +2212,7 @@ ov58_021DAB94: ; 0x021DAB94
add r2, r4, #0
bl StringExpandPlaceholders
add r0, r4, #0
bl String_Delete
bl String_Free
mov r0, #0xb5
lsl r0, r0, #2
add r0, r5, r0

8
arm9/overlays/59/src/ov59_Intro.c
View File

@ -715,7 +715,7 @@ BOOL ov59_DisplayMessage(ov59_IntroOverlayData *data, u32 msgNo, BOOL autoAdvanc
BufferString(data->messageFormat, 0, data->playerStruct->name, data->selectedGender, 1, 2);
BufferString(data->messageFormat, 1, data->rivalStruct->name, 0, 1, 2);
StringExpandPlaceholders(data->messageFormat, data->string, string);
String_Delete(string);
String_Free(string);
u32 delay = Options_GetTextFrameDelay(data->options);
data->minTextSpacing = AddTextPrinterParameterized(&data->window, 1, data->string, 0, 0, delay, NULL);
@ -725,7 +725,7 @@ BOOL ov59_DisplayMessage(ov59_IntroOverlayData *data, u32 msgNo, BOOL autoAdvanc
if (sub_0201BD70((u8)data->minTextSpacing)) {
break;
}
String_Delete(data->string);
String_Free(data->string);
data->displayMessageCounter = 2;
break;
case 2:
@ -834,7 +834,7 @@ BOOL ov59_DisplayControlAdventureMessage(ov59_IntroOverlayData *data, u32 msgNo,
FillWindowPixelRect(&data->window, 0, 0, 0, 192, 192);
AddTextPrinterParameterized2(&data->window, 0, data->string, 0, 0, TEXT_SPEED_INSTANT, MAKE_TEXT_COLOR(15, 2, 0), NULL);
}
String_Delete(data->string);
String_Free(data->string);
data->displayControlMessageCounter = 1;
break;
case 1:
@ -2450,7 +2450,7 @@ BOOL ov59_MasterController(ov59_IntroOverlayData *data) {
}
struct String *name = NewString_ReadMsgData(data->msgData, msgNo);
StringCopy(data->rivalStruct->name, name);
String_Delete(name);
String_Free(name);
data->controllerCounter = 91;
break;
}

2
arm9/overlays/59/src/ov59_TV.c
View File

@ -331,7 +331,7 @@ BOOL ov59_021D9C74(ov59_TVOverlayData *data, u32 msgNo, u32 param2, u32 param3)
width = (256 - width) / 2;
AddTextPrinterParameterized2(&data->window, 0, string, width, param3, TEXT_SPEED_INSTANT, MAKE_TEXT_COLOR(15, 2, 0), NULL);
String_Delete(string);
String_Free(string);
CopyWindowToVram(&data->window);
ToggleBgLayer(GF_BG_LYR_MAIN_2, GX_PLANE_TOGGLE_ON);
data->unk24 = 240;

4
arm9/overlays/60/asm/overlay_60.s
View File

@ -525,7 +525,7 @@ _021D7906:
add r5, r6, #0
_021D7914:
ldr r0, [r5, #0x60]
bl String_Delete
bl String_Free
add r0, r6, #0
add r0, #0x5c
ldrh r0, [r0]
@ -1085,7 +1085,7 @@ _021D7DB6:
add r0, r6, #0
bl CopyWindowToVram
add r0, r5, #0
bl String_Delete
bl String_Free
add sp, #0x10
pop {r3, r4, r5, r6, r7, pc}
nop

8
arm9/overlays/61/asm/overlay_61.s
View File

@ -326,7 +326,7 @@ _021D7702:
str r3, [sp, #0xc]
bl AddTextPrinterParameterized2
add r0, r4, #0
bl String_Delete
bl String_Free
b _021D777C
_021D774E:
ldr r0, _021D778C ; =gSystem
@ -455,7 +455,7 @@ _021D77F2:
bl AddTextPrinterParameterized2
strb r0, [r5, #0xf]
add r0, r4, #0
bl String_Delete
bl String_Free
mov r1, #0
ldr r0, _021D78CC ; =0x00007FFF
str r1, [sp]
@ -1559,7 +1559,7 @@ _021D8122:
mov r3, #0
bl AddTextPrinterParameterized2
ldr r0, [sp, #0x10]
bl String_Delete
bl String_Free
add r0, r6, #0
bl CopyWindowToVram
_021D8164:
@ -1627,7 +1627,7 @@ _021D8196:
cmp r6, #2
blt _021D8196
add r0, r5, #0
bl String_Delete
bl String_Free
add sp, #0x1c
pop {r4, r5, r6, r7, pc}
_021D81F8:

12
arm9/overlays/62/asm/overlay_62.s
View File

@ -1234,7 +1234,7 @@ ov62_0222DE00: ; 0x0222DE00
ldr r1, [sp, #0x70]
bl sub_02011AC0
ldr r0, [sp, #0x18]
bl String_Delete
bl String_Free
ldr r0, [sp, #0x14]
bl DestroyMsgData
add r0, sp, #0x1c
@ -1992,7 +1992,7 @@ _0222E49A:
add r1, r4, #0
bl ListMenuItems_AddItem
add r0, r4, #0
bl String_Delete
bl String_Free
add r6, r6, #1
add r5, r5, #4
cmp r6, r7
@ -3280,7 +3280,7 @@ _0222EE96:
add r0, r4, #0
bl CopyWindowToVram
add r0, r5, #0
bl String_Delete
bl String_Free
add r0, r6, #0
bl DestroyMsgData
add sp, #0xc
@ -3591,7 +3591,7 @@ _0222F0FE:
add r0, r5, #0
bl CopyWindowToVram
add r0, r4, #0
bl String_Delete
bl String_Free
_0222F152:
add r6, r6, #1
add r5, #0x10
@ -3657,7 +3657,7 @@ _0222F194:
add r0, r5, r4
bl CopyWindowToVram
ldr r0, [sp, #0x10]
bl String_Delete
bl String_Free
add sp, #0x14
pop {r4, r5, r6, r7, pc}
.align 2, 0
@ -3722,7 +3722,7 @@ _0222F226:
add r0, r4, #0
bl CopyWindowToVram
add r0, r5, #0
bl String_Delete
bl String_Free
add r0, r6, #0
bl DestroyMsgData
add sp, #0xc

2
arm9/overlays/63/asm/ov63_021D74E0.s
View File

@ -2092,7 +2092,7 @@ _021D844C:
str r1, [sp, #0x14]
bl AddTextPrinterParameterized3
add r0, r4, #0
bl String_Delete
bl String_Free
add r0, r7, #0
bl DestroyMsgData
mov r1, #0x15

6
arm9/overlays/64/asm/overlay_64.s
View File

@ -2338,7 +2338,7 @@ _021D86F8:
add r3, r1, #0
bl DrawFrameAndWindow2
add r0, r6, #0
bl String_Delete
bl String_Free
add r0, r4, #0
bl DestroyMsgData
add r0, r7, #0
@ -2408,7 +2408,7 @@ ov64_021D87B8: ; 0x021D87B8
add r4, r0, #0
add r0, #0xac
ldr r0, [r0]
bl String_Delete
bl String_Free
mov r0, #0
add r4, #0xac
str r0, [r4]
@ -3524,7 +3524,7 @@ _021D8FEC:
str r1, [sp, #0xc]
bl AddTextPrinterParameterized2
add r0, r6, #0
bl String_Delete
bl String_Free
add r0, r4, #0
bl DestroyMsgData
add sp, #0x10

26
arm9/overlays/65/asm/overlay_65.s
View File

@ -1117,30 +1117,30 @@ ov65_021D7D74: ; 0x021D7D74
add r5, r6, #0
_021D7D7C:
ldr r0, [r5, #0x50]
bl String_Delete
bl String_Free
cmp r4, #5
bge _021D7D94
ldr r0, [r5, #0x68]
bl String_Delete
bl String_Free
add r4, r4, #1
add r5, r5, #4
cmp r4, #6
blt _021D7D7C
_021D7D94:
ldr r0, [r6, #0x4c]
bl String_Delete
bl String_Free
ldr r0, [r6, #0x48]
bl String_Delete
bl String_Free
ldr r0, [r6, #0x44]
bl String_Delete
bl String_Free
ldr r0, [r6, #0x40]
bl String_Delete
bl String_Free
ldr r0, [r6, #0x3c]
bl String_Delete
bl String_Free
ldr r0, [r6, #0x38]
bl String_Delete
bl String_Free
ldr r0, [r6, #0x34]
bl String_Delete
bl String_Free
ldr r0, [r6, #0x30]
bl MessageFormat_Delete
ldr r0, [r6, #0x28]
@ -3346,13 +3346,13 @@ ov65_021D8F08: ; 0x021D8F08
add r5, r6, #0
_021D8F10:
ldr r0, [r5, #0x24]
bl String_Delete
bl String_Free
add r4, r4, #1
add r5, r5, #4
cmp r4, #3
blt _021D8F10
ldr r0, [r6, #0x20]
bl String_Delete
bl String_Free
ldr r0, [r6, #0x1c]
bl MessageFormat_Delete
ldr r0, [r6, #0x18]
@ -3416,11 +3416,11 @@ ov65_021D8F34: ; 0x021D8F34
thumb_func_start ov65_021D8FA4
ov65_021D8FA4: ; 0x021D8FA4
ldr r3, _021D8FAC ; =String_Delete
ldr r3, _021D8FAC ; =String_Free
ldr r0, [r0, #0x3c]
bx r3
nop
_021D8FAC: .word String_Delete
_021D8FAC: .word String_Free
thumb_func_end ov65_021D8FA4
thumb_func_start ov65_021D8FB0

10
arm9/overlays/66/asm/overlay_66.s
View File

@ -349,7 +349,7 @@ _021D7782:
add r0, r5, #0
add r0, #0x88
ldr r0, [r0]
bl String_Delete
bl String_Free
add r0, r5, #0
add r0, #0x84
ldr r0, [r0]
@ -1781,7 +1781,7 @@ _021D8278:
str r1, [sp, #0xc]
bl AddTextPrinterParameterized2
add r0, r5, #0
bl String_Delete
bl String_Free
_021D82AA:
add r0, r4, #0
bl CopyWindowToVram
@ -1845,7 +1845,7 @@ _021D8300:
add r0, r6, #0
bl AddTextPrinterParameterized2
add r0, r7, #0
bl String_Delete
bl String_Free
_021D832C:
ldrh r1, [r4, #0xa]
ldr r0, _021D8378 ; =0x0000FFFF
@ -1879,7 +1879,7 @@ _021D8348:
add r0, r6, #0
bl AddTextPrinterParameterized2
add r0, r5, #0
bl String_Delete
bl String_Free
_021D8372:
add sp, #0x10
pop {r3, r4, r5, r6, r7, pc}
@ -2119,7 +2119,7 @@ ov66_021D84C8: ; 0x021D84C8
add r0, r5, #0
bl CopyWindowToVram
add r0, r6, #0
bl String_Delete
bl String_Free
add sp, #0x1c
pop {r3, r4, r5, r6, pc}
nop

122
arm9/overlays/67/asm/overlay_67.s
View File

@ -461,7 +461,7 @@ ov67_021D78AC: ; 0x021D78AC
ldr r0, [r4, #0x54]
bl MessageFormat_Delete
ldr r0, [r4, #0x58]
bl String_Delete
bl String_Free
pop {r4, pc}
thumb_func_end ov67_021D78AC
@ -1204,7 +1204,7 @@ _021D7E32:
add r2, r4, #0
bl StringExpandPlaceholders
add r0, r4, #0
bl String_Delete
bl String_Free
mov r1, #0
str r1, [sp]
mov r0, #0xff
@ -1241,7 +1241,7 @@ _021D7E32:
str r1, [sp, #0xc]
bl AddTextPrinterParameterized2
add r0, r6, #0
bl String_Delete
bl String_Free
ldr r0, [r5, #0x50]
mov r1, #0
bl NewString_ReadMsgData
@ -1269,7 +1269,7 @@ _021D7E32:
ldr r2, [r5, #0x58]
bl AddTextPrinterParameterized2
add r0, r4, #0
bl String_Delete
bl String_Free
mov r0, #1
add sp, #0x18
pop {r3, r4, r5, r6, r7, pc}
@ -1695,7 +1695,7 @@ _021D822A:
bl StringGetLength
add r5, r0, #0
add r0, r6, #0
bl String_Delete
bl String_Free
add r0, sp, #0x10
ldrh r0, [r0]
mov r1, #1
@ -1720,7 +1720,7 @@ _021D822A:
bl StringGetLength
add r5, r5, r0
add r0, r6, #0
bl String_Delete
bl String_Free
b _021D82BA
_021D828A:
add r2, sp, #0x10
@ -1735,7 +1735,7 @@ _021D828A:
bl StringGetLength
add r5, r5, r0
add r0, r6, #0
bl String_Delete
bl String_Free
add r2, sp, #0x10
ldrh r2, [r2]
ldr r0, [r4, #0x54]
@ -1796,7 +1796,7 @@ _021D82F2:
add r3, r1, #0
bl AddTextPrinterParameterized2
add r0, r5, #0
bl String_Delete
bl String_Free
_021D832E:
add sp, #0x14
pop {r4, r5, r6, r7, pc}
@ -2018,7 +2018,7 @@ ov67_021D84A8: ; 0x021D84A8
str r1, [sp, #0xc]
bl AddTextPrinterParameterized2
add r0, r4, #0
bl String_Delete
bl String_Free
add sp, #0x10
pop {r4, r5, r6, pc}
.align 2, 0
@ -2049,7 +2049,7 @@ ov67_021D84E4: ; 0x021D84E4
str r1, [sp, #0xc]
bl AddTextPrinterParameterized2
add r0, r4, #0
bl String_Delete
bl String_Free
add sp, #0x10
pop {r4, r5, r6, pc}
.align 2, 0
@ -2080,7 +2080,7 @@ ov67_021D8520: ; 0x021D8520
str r1, [sp, #0xc]
bl AddTextPrinterParameterized2
add r0, r4, #0
bl String_Delete
bl String_Free
add sp, #0x10
pop {r4, r5, r6, pc}
.align 2, 0
@ -2111,7 +2111,7 @@ ov67_021D855C: ; 0x021D855C
str r1, [sp, #0xc]
bl AddTextPrinterParameterized2
add r0, r4, #0
bl String_Delete
bl String_Free
add sp, #0x10
pop {r4, r5, r6, pc}
.align 2, 0
@ -2142,7 +2142,7 @@ ov67_021D8598: ; 0x021D8598
str r1, [sp, #0xc]
bl AddTextPrinterParameterized2
add r0, r4, #0
bl String_Delete
bl String_Free
add sp, #0x10
pop {r4, r5, r6, pc}
.align 2, 0
@ -2173,7 +2173,7 @@ ov67_021D85D4: ; 0x021D85D4
str r1, [sp, #0xc]
bl AddTextPrinterParameterized2
add r0, r4, #0
bl String_Delete
bl String_Free
add sp, #0x10
pop {r4, r5, r6, pc}
.align 2, 0
@ -2204,7 +2204,7 @@ ov67_021D8610: ; 0x021D8610
str r1, [sp, #0xc]
bl AddTextPrinterParameterized2
add r0, r4, #0
bl String_Delete
bl String_Free
add sp, #0x10
pop {r4, r5, r6, pc}
.align 2, 0
@ -2235,7 +2235,7 @@ ov67_021D864C: ; 0x021D864C
str r1, [sp, #0xc]
bl AddTextPrinterParameterized2
add r0, r4, #0
bl String_Delete
bl String_Free
add sp, #0x10
pop {r4, r5, r6, pc}
.align 2, 0
@ -2276,7 +2276,7 @@ ov67_021D8688: ; 0x021D8688
add r3, r1, #0
bl AddTextPrinterParameterized2
add r0, r7, #0
bl String_Delete
bl String_Free
add sp, #0x14
pop {r4, r5, r6, r7, pc}
.align 2, 0
@ -2321,7 +2321,7 @@ ov67_021D86DC: ; 0x021D86DC
add r3, r1, #0
bl AddTextPrinterParameterized2
add r0, r7, #0
bl String_Delete
bl String_Free
add sp, #0x14
pop {r4, r5, r6, r7, pc}
nop
@ -2362,7 +2362,7 @@ ov67_021D873C: ; 0x021D873C
add r3, r1, #0
bl AddTextPrinterParameterized2
add r0, r7, #0
bl String_Delete
bl String_Free
add sp, #0x14
pop {r4, r5, r6, r7, pc}
.align 2, 0
@ -2403,7 +2403,7 @@ ov67_021D8790: ; 0x021D8790
add r3, r1, #0
bl AddTextPrinterParameterized2
add r0, r7, #0
bl String_Delete
bl String_Free
add sp, #0x14
pop {r4, r5, r6, r7, pc}
.align 2, 0
@ -2446,7 +2446,7 @@ ov67_021D87E4: ; 0x021D87E4
add r3, r1, #0
bl AddTextPrinterParameterized2
add r0, r7, #0
bl String_Delete
bl String_Free
add sp, #0x14
pop {r4, r5, r6, r7, pc}
nop
@ -2501,7 +2501,7 @@ _021D886E:
add r3, r1, #0
bl AddTextPrinterParameterized2
add r0, r7, #0
bl String_Delete
bl String_Free
add sp, #0x14
pop {r4, r5, r6, r7, pc}
.align 2, 0
@ -2551,7 +2551,7 @@ _021D88D2:
add r3, r1, #0
bl AddTextPrinterParameterized2
add r0, r6, #0
bl String_Delete
bl String_Free
add sp, #0x14
pop {r4, r5, r6, r7, pc}
nop
@ -2582,7 +2582,7 @@ ov67_021D8914: ; 0x021D8914
str r1, [sp, #0xc]
bl AddTextPrinterParameterized2
add r0, r4, #0
bl String_Delete
bl String_Free
add sp, #0x10
pop {r4, r5, r6, pc}
.align 2, 0
@ -2613,7 +2613,7 @@ ov67_021D8950: ; 0x021D8950
str r1, [sp, #0xc]
bl AddTextPrinterParameterized2
add r0, r4, #0
bl String_Delete
bl String_Free
add sp, #0x10
pop {r4, r5, r6, pc}
.align 2, 0
@ -2654,7 +2654,7 @@ ov67_021D898C: ; 0x021D898C
add r3, r1, #0
bl AddTextPrinterParameterized2
add r0, r7, #0
bl String_Delete
bl String_Free
add sp, #0x14
pop {r4, r5, r6, r7, pc}
.align 2, 0
@ -2697,7 +2697,7 @@ ov67_021D89E0: ; 0x021D89E0
add r3, r1, #0
bl AddTextPrinterParameterized2
add r0, r7, #0
bl String_Delete
bl String_Free
add sp, #0x14
pop {r4, r5, r6, r7, pc}
nop
@ -2740,7 +2740,7 @@ ov67_021D8A3C: ; 0x021D8A3C
add r3, r1, #0
bl AddTextPrinterParameterized2
add r0, r7, #0
bl String_Delete
bl String_Free
add sp, #0x14
pop {r4, r5, r6, r7, pc}
nop
@ -2783,7 +2783,7 @@ ov67_021D8A98: ; 0x021D8A98
add r3, r1, #0
bl AddTextPrinterParameterized2
add r0, r7, #0
bl String_Delete
bl String_Free
add sp, #0x14
pop {r4, r5, r6, r7, pc}
nop
@ -2826,7 +2826,7 @@ ov67_021D8AF4: ; 0x021D8AF4
add r3, r1, #0
bl AddTextPrinterParameterized2
add r0, r7, #0
bl String_Delete
bl String_Free
add sp, #0x14
pop {r4, r5, r6, r7, pc}
nop
@ -2869,7 +2869,7 @@ ov67_021D8B50: ; 0x021D8B50
add r3, r1, #0
bl AddTextPrinterParameterized2
add r0, r7, #0
bl String_Delete
bl String_Free
add sp, #0x14
pop {r4, r5, r6, r7, pc}
nop
@ -2912,7 +2912,7 @@ ov67_021D8BAC: ; 0x021D8BAC
add r3, r1, #0
bl AddTextPrinterParameterized2
add r0, r7, #0
bl String_Delete
bl String_Free
add sp, #0x14
pop {r4, r5, r6, r7, pc}
nop
@ -2955,7 +2955,7 @@ ov67_021D8C08: ; 0x021D8C08
add r3, r1, #0
bl AddTextPrinterParameterized2
add r0, r7, #0
bl String_Delete
bl String_Free
add sp, #0x14
pop {r4, r5, r6, r7, pc}
nop
@ -2998,7 +2998,7 @@ ov67_021D8C64: ; 0x021D8C64
add r3, r1, #0
bl AddTextPrinterParameterized2
add r0, r7, #0
bl String_Delete
bl String_Free
add sp, #0x14
pop {r4, r5, r6, r7, pc}
nop
@ -3041,7 +3041,7 @@ ov67_021D8CC0: ; 0x021D8CC0
add r3, r1, #0
bl AddTextPrinterParameterized2
add r0, r7, #0
bl String_Delete
bl String_Free
add sp, #0x14
pop {r4, r5, r6, r7, pc}
nop
@ -3084,7 +3084,7 @@ ov67_021D8D1C: ; 0x021D8D1C
add r3, r1, #0
bl AddTextPrinterParameterized2
add r0, r7, #0
bl String_Delete
bl String_Free
add sp, #0x14
pop {r4, r5, r6, r7, pc}
nop
@ -3127,7 +3127,7 @@ ov67_021D8D78: ; 0x021D8D78
add r3, r1, #0
bl AddTextPrinterParameterized2
add r0, r7, #0
bl String_Delete
bl String_Free
add sp, #0x14
pop {r4, r5, r6, r7, pc}
nop
@ -3158,7 +3158,7 @@ ov67_021D8DD4: ; 0x021D8DD4
str r1, [sp, #0xc]
bl AddTextPrinterParameterized2
add r0, r4, #0
bl String_Delete
bl String_Free
add sp, #0x10
pop {r4, r5, r6, pc}
.align 2, 0
@ -3189,7 +3189,7 @@ ov67_021D8E10: ; 0x021D8E10
str r1, [sp, #0xc]
bl AddTextPrinterParameterized2
add r0, r4, #0
bl String_Delete
bl String_Free
add sp, #0x10
pop {r4, r5, r6, pc}
.align 2, 0
@ -3220,7 +3220,7 @@ ov67_021D8E4C: ; 0x021D8E4C
str r1, [sp, #0xc]
bl AddTextPrinterParameterized2
add r0, r4, #0
bl String_Delete
bl String_Free
add sp, #0x10
pop {r4, r5, r6, pc}
.align 2, 0
@ -3251,7 +3251,7 @@ ov67_021D8E88: ; 0x021D8E88
str r1, [sp, #0xc]
bl AddTextPrinterParameterized2
add r0, r4, #0
bl String_Delete
bl String_Free
add sp, #0x10
pop {r4, r5, r6, pc}
.align 2, 0
@ -3282,7 +3282,7 @@ ov67_021D8EC4: ; 0x021D8EC4
str r1, [sp, #0xc]
bl AddTextPrinterParameterized2
add r0, r4, #0
bl String_Delete
bl String_Free
add sp, #0x10
pop {r4, r5, r6, pc}
.align 2, 0
@ -3398,7 +3398,7 @@ _021D8F9A:
add r3, r1, #0
bl AddTextPrinterParameterized2
add r0, r6, #0
bl String_Delete
bl String_Free
add sp, #0x10
pop {r3, r4, r5, r6, r7, pc}
nop
@ -3483,7 +3483,7 @@ _021D9046:
add r3, r1, #0
bl AddTextPrinterParameterized2
add r0, r6, #0
bl String_Delete
bl String_Free
add sp, #0x10
pop {r3, r4, r5, r6, r7, pc}
nop
@ -3514,7 +3514,7 @@ ov67_021D9098: ; 0x021D9098
add r3, r7, #0
bl BufferString
add r0, r4, #0
bl String_Delete
bl String_Free
add sp, #0xc
pop {r4, r5, r6, r7, pc}
.align 2, 0
@ -3580,7 +3580,7 @@ _021D9114:
add r3, r1, #0
bl AddTextPrinterParameterized2
add r0, r7, #0
bl String_Delete
bl String_Free
add sp, #0x14
pop {r4, r5, r6, r7, pc}
.align 2, 0
@ -3647,7 +3647,7 @@ _021D9198:
add r3, r1, #0
bl AddTextPrinterParameterized2
add r0, r7, #0
bl String_Delete
bl String_Free
add sp, #0x14
pop {r4, r5, r6, r7, pc}
.align 2, 0
@ -3722,7 +3722,7 @@ _021D921C:
add r3, r1, #0
bl AddTextPrinterParameterized2
add r0, r7, #0
bl String_Delete
bl String_Free
add sp, #0x14
pop {r4, r5, r6, r7, pc}
nop
@ -3789,7 +3789,7 @@ _021D92B4:
add r3, r1, #0
bl AddTextPrinterParameterized2
add r0, r7, #0
bl String_Delete
bl String_Free
add sp, #0x14
pop {r4, r5, r6, r7, pc}
.align 2, 0
@ -3864,7 +3864,7 @@ _021D9338:
add r3, r1, #0
bl AddTextPrinterParameterized2
add r0, r7, #0
bl String_Delete
bl String_Free
add sp, #0x14
pop {r4, r5, r6, r7, pc}
nop
@ -3908,7 +3908,7 @@ ov67_021D9390: ; 0x021D9390
add r3, r1, #0
bl AddTextPrinterParameterized2
add r0, r7, #0
bl String_Delete
bl String_Free
add sp, #0x14
pop {r4, r5, r6, r7, pc}
nop
@ -3960,7 +3960,7 @@ ov67_021D93EC: ; 0x021D93EC
add r3, r1, #0
bl AddTextPrinterParameterized2
add r0, r7, #0
bl String_Delete
bl String_Free
add sp, #0x14
pop {r4, r5, r6, r7, pc}
.align 2, 0
@ -3991,7 +3991,7 @@ ov67_021D9458: ; 0x021D9458
str r1, [sp, #0xc]
bl AddTextPrinterParameterized2
add r0, r4, #0
bl String_Delete
bl String_Free
add sp, #0x10
pop {r4, r5, r6, pc}
.align 2, 0
@ -4036,7 +4036,7 @@ ov67_021D9494: ; 0x021D9494
add r3, r1, #0
bl AddTextPrinterParameterized2
add r0, r7, #0
bl String_Delete
bl String_Free
add sp, #0x14
pop {r4, r5, r6, r7, pc}
.align 2, 0
@ -4067,7 +4067,7 @@ ov67_021D94F0: ; 0x021D94F0
str r1, [sp, #0xc]
bl AddTextPrinterParameterized2
add r0, r4, #0
bl String_Delete
bl String_Free
add sp, #0x10
pop {r4, r5, r6, pc}
.align 2, 0
@ -4134,7 +4134,7 @@ _021D956C:
add r3, r1, #0
bl AddTextPrinterParameterized2
add r0, r7, #0
bl String_Delete
bl String_Free
add sp, #0x14
pop {r4, r5, r6, r7, pc}
.align 2, 0
@ -4165,7 +4165,7 @@ ov67_021D95B0: ; 0x021D95B0
str r1, [sp, #0xc]
bl AddTextPrinterParameterized2
add r0, r4, #0
bl String_Delete
bl String_Free
add sp, #0x10
pop {r4, r5, r6, pc}
.align 2, 0
@ -4211,7 +4211,7 @@ ov67_021D95EC: ; 0x021D95EC
add r3, r1, #0
bl AddTextPrinterParameterized2
add r0, r7, #0
bl String_Delete
bl String_Free
add sp, #0x14
pop {r4, r5, r6, r7, pc}
nop
@ -4242,7 +4242,7 @@ ov67_021D964C: ; 0x021D964C
str r1, [sp, #0xc]
bl AddTextPrinterParameterized2
add r0, r4, #0
bl String_Delete
bl String_Free
add sp, #0x10
pop {r4, r5, r6, pc}
.align 2, 0
@ -4294,7 +4294,7 @@ ov67_021D9688: ; 0x021D9688
add r3, r1, #0
bl AddTextPrinterParameterized2
add r0, r7, #0
bl String_Delete
bl String_Free
add sp, #0x14
pop {r4, r5, r6, r7, pc}
.align 2, 0
@ -4325,7 +4325,7 @@ ov67_021D96F4: ; 0x021D96F4
str r1, [sp, #0xc]
bl AddTextPrinterParameterized2
add r0, r4, #0
bl String_Delete
bl String_Free
add sp, #0x10
pop {r4, r5, r6, pc}
.align 2, 0

20
arm9/overlays/68/asm/overlay_68.s
View File

@ -542,7 +542,7 @@ ov68_021D7904: ; 0x021D7904
str r1, [sp, #0xc]
bl AddTextPrinterParameterized2
ldr r0, [sp, #0x10]
bl String_Delete
bl String_Free
add r0, r5, r4
bl ScheduleWindowCopyToVram
add sp, #0x14
@ -712,9 +712,9 @@ ov68_021D7A18: ; 0x021D7A18
str r1, [sp, #0xc]
bl AddTextPrinterParameterized2
add r0, r7, #0
bl String_Delete
bl String_Free
add r0, r6, #0
bl String_Delete
bl String_Free
mov r0, #0x7e
lsl r0, r0, #2
ldr r0, [r5, r0]
@ -734,7 +734,7 @@ ov68_021D7A18: ; 0x021D7A18
str r1, [sp, #0xc]
bl AddTextPrinterParameterized2
add r0, r5, #0
bl String_Delete
bl String_Free
add r0, r4, #0
bl ScheduleWindowCopyToVram
add sp, #0x10
@ -772,7 +772,7 @@ ov68_021D7AE4: ; 0x021D7AE4
str r1, [sp, #0xc]
bl AddTextPrinterParameterized2
add r0, r4, #0
bl String_Delete
bl String_Free
add r0, r5, #0
bl ScheduleWindowCopyToVram
add sp, #0x10
@ -808,7 +808,7 @@ ov68_021D7B34: ; 0x021D7B34
str r1, [sp, #0xc]
bl AddTextPrinterParameterized2
add r0, r4, #0
bl String_Delete
bl String_Free
add r0, r5, #0
bl ScheduleWindowCopyToVram
add sp, #0x10
@ -853,7 +853,7 @@ _021D7BA4:
str r1, [sp, #0xc]
bl AddTextPrinterParameterized2
add r0, r4, #0
bl String_Delete
bl String_Free
add r0, r5, #0
bl ScheduleWindowCopyToVram
add sp, #0x10
@ -889,7 +889,7 @@ ov68_021D7BDC: ; 0x021D7BDC
str r1, [sp, #0xc]
bl AddTextPrinterParameterized2
add r0, r4, #0
bl String_Delete
bl String_Free
add r0, r5, #0
bl ScheduleWindowCopyToVram
add sp, #0x10
@ -976,9 +976,9 @@ ov68_021D7C28: ; 0x021D7C28
str r1, [sp, #0xc]
bl AddTextPrinterParameterized2
ldr r0, [sp, #0x10]
bl String_Delete
bl String_Free
add r0, r4, #0
bl String_Delete
bl String_Free
add r0, r6, #0
bl ScheduleWindowCopyToVram
add sp, #0x14

4
arm9/overlays/69/asm/overlay_69.s
View File

@ -203,10 +203,10 @@ _0222D762:
bl MessageFormat_Delete
ldr r0, _0222D7E8 ; =0x00001B54
ldr r0, [r4, r0]
bl String_Delete
bl String_Free
ldr r0, _0222D7EC ; =0x00001B58
ldr r0, [r4, r0]
bl String_Delete
bl String_Free
ldr r0, _0222D7F0 ; =0x00001B5C
ldr r0, [r4, r0]
bl DestroyMsgData

8
arm9/overlays/70/asm/overlay_70.s
View File

@ -339,9 +339,9 @@ ov70_021D7760: ; 0x021D7760
mov r4, #0
_021D7766:
ldr r0, [r5, #0x20]
bl String_Delete
bl String_Free
ldr r0, [r5, #0x24]
bl String_Delete
bl String_Free
add r4, r4, #1
add r5, #0x1c
cmp r4, #6
@ -501,11 +501,11 @@ ov70_021D78A0: ; 0x021D78A0
mov r0, #0x65
lsl r0, r0, #2
ldr r0, [r4, r0]
bl String_Delete
bl String_Free
mov r0, #0x19
lsl r0, r0, #4
ldr r0, [r4, r0]
bl String_Delete
bl String_Free
mov r0, #0x63
lsl r0, r0, #2
ldr r0, [r4, r0]

22
arm9/overlays/71/asm/overlay_71.s
View File

@ -247,11 +247,11 @@ ov71_0222D780: ; 0x0222D780
mov r3, #0
bl ov71_02230EFC
add r0, r7, #0
bl String_Delete
bl String_Free
add r0, r6, #0
bl String_Delete
bl String_Free
add r0, r4, #0
bl String_Delete
bl String_Free
add sp, #8
pop {r3, r4, r5, r6, r7, pc}
nop
@ -697,7 +697,7 @@ _0222DBB0:
mov r3, #0
bl ov71_02230EFC
add r0, r6, #0
bl String_Delete
bl String_Free
ldr r0, [sp, #0x10]
add r5, #0x10
add r4, r4, #1
@ -1733,7 +1733,7 @@ ov71_0222E438: ; 0x0222E438
mov r0, #0x19
lsl r0, r0, #4
ldr r0, [r4, r0]
bl String_Delete
bl String_Free
ldr r0, _0222E4D4 ; =0x0000221C
ldr r0, [r4, r0]
bl Heap_Free
@ -1770,7 +1770,7 @@ ov71_0222E438: ; 0x0222E438
mov r0, #0x63
lsl r0, r0, #2
ldr r0, [r4, r0]
bl String_Delete
bl String_Free
add r0, r5, #0
bl OverlayManager_FreeData
mov r0, #0
@ -2711,7 +2711,7 @@ ov71_0222EC5C: ; 0x0222EC5C
mov r3, #0
bl ov71_02230EFC
add r0, r4, #0
bl String_Delete
bl String_Free
add sp, #0xc
pop {r4, r5, r6, r7, pc}
thumb_func_end ov71_0222EC5C
@ -2951,7 +2951,7 @@ _0222EE14:
str r3, [sp, #4]
bl ov71_02230EFC
add r0, r7, #0
bl String_Delete
bl String_Free
b _0222EEA6
_0222EE9A:
add r0, r5, #0
@ -3002,7 +3002,7 @@ _0222EEA6:
str r3, [sp, #4]
bl ov71_02230EFC
add r0, r5, #0
bl String_Delete
bl String_Free
add sp, #0x38
pop {r3, r4, r5, r6, r7, pc}
.align 2, 0
@ -4452,7 +4452,7 @@ _0222FA8A:
sub r3, #0xd
bl ListMenuItems_AppendFromMsgData
add r0, r6, #0
bl String_Delete
bl String_Free
ldr r2, _0222FAD0 ; =0x0000367C
mov r3, #0x5d
lsl r3, r3, #2
@ -7008,7 +7008,7 @@ _02230F76:
bl AddTextPrinterParameterized2
add r4, r0, #0
add r0, r6, #0
bl String_Delete
bl String_Free
add r0, r4, #0
add sp, #0x10
pop {r4, r5, r6, pc}

28
arm9/overlays/73/asm/overlay_73.s
View File

@ -2958,44 +2958,44 @@ ov73_021D8D18: ; 0x021D8D18
add r6, r0, #0
ldr r0, _021D8DBC ; =0x000015A8
ldr r0, [r6, r0]
bl String_Delete
bl String_Free
ldr r0, _021D8DC0 ; =0x000015A4
ldr r0, [r6, r0]
bl String_Delete
bl String_Free
ldr r0, _021D8DC4 ; =0x00001594
ldr r0, [r6, r0]
bl String_Delete
bl String_Free
ldr r0, _021D8DC8 ; =0x00001590
ldr r0, [r6, r0]
bl String_Delete
bl String_Free
ldr r0, _021D8DCC ; =0x0000158C
ldr r0, [r6, r0]
bl String_Delete
bl String_Free
ldr r0, _021D8DD0 ; =0x00001588
ldr r0, [r6, r0]
bl String_Delete
bl String_Free
ldr r0, _021D8DD4 ; =0x00001584
ldr r0, [r6, r0]
bl String_Delete
bl String_Free
mov r0, #0x56
lsl r0, r0, #6
ldr r0, [r6, r0]
bl String_Delete
bl String_Free
ldr r0, _021D8DD8 ; =0x00001598
ldr r0, [r6, r0]
bl String_Delete
bl String_Free
ldr r0, _021D8DDC ; =0x0000159C
ldr r0, [r6, r0]
bl String_Delete
bl String_Free
ldr r0, _021D8DE0 ; =0x000015A0
ldr r0, [r6, r0]
bl String_Delete
bl String_Free
ldr r7, _021D8DE4 ; =0x000015AC
mov r4, #0
add r5, r6, #0
_021D8D7C:
ldr r0, [r5, r7]
bl String_Delete
bl String_Free
add r4, r4, #1
add r5, r5, #4
cmp r4, #5
@ -3006,14 +3006,14 @@ _021D8D7C:
lsl r7, r7, #6
_021D8D92:
ldr r0, [r4, r7]
bl String_Delete
bl String_Free
add r5, r5, #1
add r4, r4, #4
cmp r5, #0xa
blt _021D8D92
ldr r0, _021D8DE8 ; =0x0000157C
ldr r0, [r6, r0]
bl String_Delete
bl String_Free
ldr r0, _021D8DEC ; =0x00001578
ldr r0, [r6, r0]
bl MessageFormat_Delete

24
arm9/overlays/74/asm/overlay_74.s
View File

@ -909,32 +909,32 @@ ov74_021D7BB4: ; 0x021D7BB4
push {r4, r5, r6, lr}
add r6, r0, #0
ldr r0, [r6, #0x68]
bl String_Delete
bl String_Free
ldr r0, [r6, #0x64]
bl String_Delete
bl String_Free
ldr r0, [r6, #0x48]
bl String_Delete
bl String_Free
ldr r0, [r6, #0x44]
bl String_Delete
bl String_Free
ldr r0, [r6, #0x40]
bl String_Delete
bl String_Free
ldr r0, [r6, #0x34]
bl String_Delete
bl String_Free
ldr r0, [r6, #0x3c]
bl String_Delete
bl String_Free
ldr r0, [r6, #0x38]
bl String_Delete
bl String_Free
mov r4, #0
add r5, r6, #0
_021D7BEC:
ldr r0, [r5, #0x4c]
bl String_Delete
bl String_Free
add r4, r4, #1
add r5, r5, #4
cmp r4, #6
blt _021D7BEC
ldr r0, [r6, #0x30]
bl String_Delete
bl String_Free
ldr r0, [r6, #0x2c]
bl MessageFormat_Delete
ldr r0, [r6, #0x28]
@ -1324,7 +1324,7 @@ _021D7F2E:
add r0, r5, #0
add r0, #0xbc
ldr r0, [r0]
bl String_Delete
bl String_Free
add r4, r4, #1
add r5, #0x10
cmp r4, #0x1e
@ -1651,7 +1651,7 @@ ov74_021D818C: ; 0x021D818C
str r1, [sp, #0xc]
bl AddTextPrinterParameterized2
add r0, r5, #0
bl String_Delete
bl String_Free
add sp, #0x10
pop {r3, r4, r5, pc}
nop

82
arm9/overlays/75/asm/overlay_75.s
View File

@ -430,7 +430,7 @@ ov75_021E6F00: ; 0x021E6F00
mov r0, #0xfe
lsl r0, r0, #2
ldr r0, [r4, r0]
bl String_Delete
bl String_Free
mov r0, #0x12
lsl r0, r0, #4
ldr r0, [r4, r0]
@ -1450,7 +1450,7 @@ ov75_021E773C: ; 0x021E773C
lsl r6, r6, #2
_021E7746:
ldr r0, [r5, r6]
bl String_Delete
bl String_Free
add r4, r4, #1
add r5, r5, #4
cmp r4, #0xa5
@ -4736,7 +4736,7 @@ _021E908E:
add r2, r5, #0
bl StringExpandPlaceholders
add r0, r5, #0
bl String_Delete
bl String_Free
add r0, r4, #0
bl ov75_021EB660
ldr r1, _021E91AC ; =0x00000426
@ -4930,7 +4930,7 @@ _021E923E:
add r2, r5, #0
bl StringExpandPlaceholders
add r0, r5, #0
bl String_Delete
bl String_Free
mov r0, #1
pop {r3, r4, r5, pc}
nop
@ -5469,7 +5469,7 @@ _021E967A:
add r2, r4, #0
bl StringExpandPlaceholders
add r0, r4, #0
bl String_Delete
bl String_Free
add r0, r5, #0
add r0, #0x64
mov r1, #0xf
@ -5743,7 +5743,7 @@ _021E9872:
add r2, r4, #0
bl StringExpandPlaceholders
add r0, r4, #0
bl String_Delete
bl String_Free
add r0, r5, #0
bl ov75_021EB660
ldr r1, _021E992C ; =0x00000426
@ -5924,7 +5924,7 @@ _021E9A38:
add r2, r4, #0
bl StringExpandPlaceholders
add r0, r4, #0
bl String_Delete
bl String_Free
add r0, r5, #0
bl ov75_021EB660
ldr r1, _021E9B44 ; =0x00000426
@ -5986,7 +5986,7 @@ _021E9A6E:
add r2, r4, #0
bl StringExpandPlaceholders
add r0, r4, #0
bl String_Delete
bl String_Free
add r0, r5, #0
bl ov75_021EB660
ldr r1, _021E9B44 ; =0x00000426
@ -6010,7 +6010,7 @@ _021E9AF4:
add r2, r4, #0
bl StringExpandPlaceholders
add r0, r4, #0
bl String_Delete
bl String_Free
add r0, r5, #0
bl ov75_021EB660
ldr r1, _021E9B44 ; =0x00000426
@ -6130,7 +6130,7 @@ _021E9BAC:
add r2, r5, #0
bl StringExpandPlaceholders
add r0, r5, #0
bl String_Delete
bl String_Free
add r0, r4, #0
bl ov75_021EB660
ldr r1, _021E9D58 ; =0x00000426
@ -6225,7 +6225,7 @@ _021E9C80:
add r2, r5, #0
bl StringExpandPlaceholders
add r0, r5, #0
bl String_Delete
bl String_Free
add r0, r4, #0
bl ov75_021EB660
ldr r1, _021E9D58 ; =0x00000426
@ -6401,7 +6401,7 @@ _021E9E2A:
add r2, r4, #0
bl StringExpandPlaceholders
add r0, r4, #0
bl String_Delete
bl String_Free
add r0, r5, #0
add r0, #0x64
mov r1, #0xf
@ -7656,7 +7656,7 @@ _021EA800:
lsl r0, r4, #2
add r0, r5, r0
ldr r0, [r0, r6]
bl String_Delete
bl String_Free
add r0, r4, #1
lsl r0, r0, #0x10
lsr r4, r0, #0x10
@ -8075,7 +8075,7 @@ _021EAB18:
str r1, [sp, #0xc]
bl AddTextPrinterParameterized2
add r0, r4, #0
bl String_Delete
bl String_Free
add sp, #0x10
pop {r4, r5, r6, pc}
.align 2, 0
@ -8111,7 +8111,7 @@ ov75_021EAB44: ; 0x021EAB44
str r1, [sp, #0xc]
bl AddTextPrinterParameterized2
add r0, r6, #0
bl String_Delete
bl String_Free
mov r0, #0x45
lsl r0, r0, #2
ldr r0, [r5, r0]
@ -8131,7 +8131,7 @@ ov75_021EAB44: ; 0x021EAB44
str r1, [sp, #0xc]
bl AddTextPrinterParameterized2
add r0, r6, #0
bl String_Delete
bl String_Free
mov r0, #0x45
lsl r0, r0, #2
ldr r0, [r5, r0]
@ -8150,7 +8150,7 @@ ov75_021EAB44: ; 0x021EAB44
str r1, [sp, #0xc]
bl AddTextPrinterParameterized2
add r0, r6, #0
bl String_Delete
bl String_Free
mov r0, #0x45
lsl r0, r0, #2
ldr r0, [r5, r0]
@ -8170,7 +8170,7 @@ ov75_021EAB44: ; 0x021EAB44
str r1, [sp, #0xc]
bl AddTextPrinterParameterized2
add r0, r6, #0
bl String_Delete
bl String_Free
mov r0, #0x45
lsl r0, r0, #2
ldr r0, [r5, r0]
@ -8190,7 +8190,7 @@ ov75_021EAB44: ; 0x021EAB44
str r1, [sp, #0xc]
bl AddTextPrinterParameterized2
add r0, r6, #0
bl String_Delete
bl String_Free
ldr r0, [sp, #0x10]
mov r1, #0
bl WazaGetMaxPp
@ -8220,7 +8220,7 @@ ov75_021EAB44: ; 0x021EAB44
add r2, r6, #0
bl StringExpandPlaceholders
add r0, r6, #0
bl String_Delete
bl String_Free
mov r0, #0x10
str r0, [sp]
mov r0, #0xff
@ -8275,7 +8275,7 @@ _021EACC6:
add r2, r6, #0
bl StringExpandPlaceholders
add r0, r6, #0
bl String_Delete
bl String_Free
mov r0, #0x10
str r0, [sp]
mov r0, #0xff
@ -8329,7 +8329,7 @@ _021EAD3C:
add r2, r6, #0
bl StringExpandPlaceholders
add r0, r6, #0
bl String_Delete
bl String_Free
mov r0, #0x20
str r0, [sp]
mov r0, #0xff
@ -8381,11 +8381,11 @@ ov75_021EADC0: ; 0x021EADC0
mov r0, #0xff
lsl r0, r0, #2
ldr r0, [r4, r0]
bl String_Delete
bl String_Free
mov r0, #1
lsl r0, r0, #0xa
ldr r0, [r4, r0]
bl String_Delete
bl String_Free
pop {r4, pc}
.align 2, 0
thumb_func_end ov75_021EADC0
@ -8472,7 +8472,7 @@ _021EAE2E:
str r1, [sp, #0xc]
bl AddTextPrinterParameterized2
add r0, r7, #0
bl String_Delete
bl String_Free
add sp, #0x14
pop {r4, r5, r6, r7, pc}
.align 2, 0
@ -8659,7 +8659,7 @@ ov75_021EAFB0: ; 0x021EAFB0
str r1, [sp, #0xc]
bl AddTextPrinterParameterized2
add r0, r6, #0
bl String_Delete
bl String_Free
add sp, #0x10
pop {r4, r5, r6, pc}
nop
@ -8804,7 +8804,7 @@ _021EB11A:
lsl r0, r4, #2
add r0, r5, r0
ldr r0, [r0, r6]
bl String_Delete
bl String_Free
add r0, r4, #1
lsl r0, r0, #0x10
lsr r4, r0, #0x10
@ -9044,9 +9044,9 @@ _021EB298:
str r3, [sp, #8]
bl AddTextPrinterParameterized
add r0, r7, #0
bl String_Delete
bl String_Free
ldr r0, [sp, #0x18]
bl String_Delete
bl String_Free
add r0, r4, r6
bl ScheduleWindowCopyToVram
_021EB31E:
@ -9183,9 +9183,9 @@ ov75_021EB3D8: ; 0x021EB3D8
add r0, r5, #0
bl ScheduleWindowCopyToVram
add r0, r4, #0
bl String_Delete
bl String_Free
add r0, r6, #0
bl String_Delete
bl String_Free
add sp, #0x10
pop {r4, r5, r6, pc}
.align 2, 0
@ -9261,9 +9261,9 @@ ov75_021EB454: ; 0x021EB454
add r0, r5, #0
bl ScheduleWindowCopyToVram
add r0, r4, #0
bl String_Delete
bl String_Free
add r0, r6, #0
bl String_Delete
bl String_Free
add sp, #0xc
pop {r3, r4, r5, r6, pc}
nop
@ -9322,7 +9322,7 @@ ov75_021EB504: ; 0x021EB504
add r0, r4, #0
bl ScheduleWindowCopyToVram
add r0, r6, #0
bl String_Delete
bl String_Free
add sp, #0xc
pop {r3, r4, r5, r6, pc}
nop
@ -9422,7 +9422,7 @@ _021EB616:
add r2, r4, #0
bl StringExpandPlaceholders
add r0, r4, #0
bl String_Delete
bl String_Free
add r0, r5, #0
bl ov75_021EB660
ldr r1, _021EB65C ; =0x00000426
@ -9582,7 +9582,7 @@ _021EB722:
add r3, r1, #0
bl AddTextPrinterParameterized
add r0, r6, #0
bl String_Delete
bl String_Free
mov r0, #0x45
lsl r0, r0, #2
ldr r0, [r5, r0]
@ -9634,7 +9634,7 @@ _021EB722:
add r0, r4, #0
bl ScheduleWindowCopyToVram
add r0, r6, #0
bl String_Delete
bl String_Free
add sp, #0xc
pop {r3, r4, r5, r6, pc}
.align 2, 0
@ -9676,7 +9676,7 @@ ov75_021EB808: ; 0x021EB808
str r1, [sp, #8]
bl AddTextPrinterParameterized
add r0, r6, #0
bl String_Delete
bl String_Free
b _021EB866
_021EB854:
mov r0, #0x50
@ -9739,7 +9739,7 @@ _021EB866:
add r0, r4, #0
bl ScheduleWindowCopyToVram
add r0, r6, #0
bl String_Delete
bl String_Free
add sp, #0xc
pop {r3, r4, r5, r6, pc}
nop
@ -9777,7 +9777,7 @@ ov75_021EB8E8: ; 0x021EB8E8
str r1, [sp, #8]
bl AddTextPrinterParameterized
add r0, r6, #0
bl String_Delete
bl String_Free
mov r0, #0x45
lsl r0, r0, #2
ldr r0, [r5, r0]
@ -9809,7 +9809,7 @@ ov75_021EB8E8: ; 0x021EB8E8
add r2, r6, #0
bl StringExpandPlaceholders
add r0, r6, #0
bl String_Delete
bl String_Free
mov r1, #0xfe
lsl r1, r1, #2
mov r0, #0

6
arm9/overlays/76/asm/overlay_76.s
View File

@ -549,7 +549,7 @@ ov76_021D7938: ; 0x021D7938
mov r0, #1
lsl r0, r0, #8
ldr r0, [r4, r0]
bl String_Delete
bl String_Free
pop {r4, pc}
.align 2, 0
thumb_func_end ov76_021D7938
@ -1100,7 +1100,7 @@ ov76_021D7D60: ; 0x021D7D60
add r2, r4, #0
bl StringExpandPlaceholders
add r0, r4, #0
bl String_Delete
bl String_Free
add sp, #8
pop {r3, r4, r5, r6, r7, pc}
.align 2, 0
@ -2002,7 +2002,7 @@ _021D84D8:
add r2, r5, #0
bl StringExpandPlaceholders
add r0, r5, #0
bl String_Delete
bl String_Free
pop {r3, r4, r5, pc}
.align 2, 0
_021D8510: .word ov76_021D8F6C

18
arm9/overlays/77/asm/overlay_77.s
View File

@ -1588,7 +1588,7 @@ ov77_021D7FAC: ; 0x021D7FAC
add r2, r4, #0
bl AddTextPrinterParameterized
add r0, r4, #0
bl String_Delete
bl String_Free
mov r0, #2
bl sub_02002CF8
add sp, #0x18
@ -1712,7 +1712,7 @@ _021D830A:
bne _021D8340
ldr r0, _021D834C ; =0x0000C06C
ldr r0, [r5, r0]
bl String_Delete
bl String_Free
ldr r0, _021D8348 ; =0x0000C064
mov r1, #2
str r1, [r5, r0]
@ -2019,9 +2019,9 @@ ov77_021D8510: ; 0x021D8510
str r1, [sp, #8]
bl AddTextPrinterParameterized
add r0, r6, #0
bl String_Delete
bl String_Free
add r0, r4, #0
bl String_Delete
bl String_Free
ldr r0, _021D85CC ; =0x0000C044
add r0, r5, r0
bl CopyWindowToVram
@ -2105,9 +2105,9 @@ _021D865C:
str r1, [sp, #8]
bl AddTextPrinterParameterized
add r0, r6, #0
bl String_Delete
bl String_Free
add r0, r7, #0
bl String_Delete
bl String_Free
ldr r0, _021D8690 ; =0x0000C044
add r0, r5, r0
bl CopyWindowToVram
@ -2175,7 +2175,7 @@ ov77_021D86B4: ; 0x021D86B4
str r3, [sp, #8]
bl AddTextPrinterParameterized
add r0, r4, #0
bl String_Delete
bl String_Free
add sp, #0x20
pop {r3, r4, r5, r6, r7, pc}
_021D870E:
@ -2280,9 +2280,9 @@ _021D87C8:
mov r3, #0
bl AddTextPrinterParameterized
add r0, r6, #0
bl String_Delete
bl String_Free
add r0, r7, #0
bl String_Delete
bl String_Free
mov r1, #1
_021D87EC:
ldr r0, [sp, #0x1c]

102
arm9/overlays/80/asm/overlay_80.s
View File

@ -3108,11 +3108,11 @@ ov80_0222EE08: ; 0x0222EE08
add r4, r0, #0
ldr r0, _0222EE20 ; =0x00000B4C
ldr r0, [r4, r0]
bl String_Delete
bl String_Free
mov r0, #0xb5
lsl r0, r0, #4
ldr r0, [r4, r0]
bl String_Delete
bl String_Free
pop {r4, pc}
.align 2, 0
_0222EE20: .word 0x00000B4C
@ -3771,7 +3771,7 @@ ov80_0222F300: ; 0x0222F300
str r3, [sp, #8]
bl AddTextPrinterParameterized
add r0, r6, #0
bl String_Delete
bl String_Free
add sp, #0xc
pop {r3, r4, r5, r6, pc}
thumb_func_end ov80_0222F300
@ -4391,18 +4391,18 @@ ov80_0222F830: ; 0x0222F830
add r5, r7, #0
_0222F83A:
ldr r0, [r5, r6]
bl String_Delete
bl String_Free
add r4, r4, #1
add r5, r5, #4
cmp r4, #0xa
blt _0222F83A
ldr r0, _0222F860 ; =0x00000B4C
ldr r0, [r7, r0]
bl String_Delete
bl String_Free
mov r0, #0xb5
lsl r0, r0, #4
ldr r0, [r7, r0]
bl String_Delete
bl String_Free
pop {r3, r4, r5, r6, r7, pc}
.align 2, 0
_0222F85C: .word 0x00000B54
@ -4826,7 +4826,7 @@ ov80_0222FB3C: ; 0x0222FB3C
lsl r1, r1, #6
str r0, [r5, r1]
add r0, r6, #0
bl String_Delete
bl String_Free
add sp, #0xc
pop {r3, r4, r5, r6, pc}
.align 2, 0
@ -4977,17 +4977,17 @@ _0222FCA2:
add r3, r2, #0
bl ov80_02236D50
ldr r0, [sp, #0x20]
bl String_Delete
bl String_Free
ldr r0, [sp, #0x18]
bl String_Delete
bl String_Free
ldr r0, [sp, #0x24]
bl String_Delete
bl String_Free
ldr r0, [sp, #0x28]
bl String_Delete
bl String_Free
ldr r0, [sp, #0x1c]
bl String_Delete
bl String_Free
ldr r0, [sp, #0x2c]
bl String_Delete
bl String_Free
add sp, #0x34
pop {r4, r5, r6, r7, pc}
.align 2, 0
@ -5032,9 +5032,9 @@ ov80_0222FD28: ; 0x0222FD28
add r3, r2, #0
bl ov80_02236D50
add r0, r6, #0
bl String_Delete
bl String_Free
add r0, r4, #0
bl String_Delete
bl String_Free
add sp, #8
pop {r3, r4, r5, r6, r7, pc}
.align 2, 0
@ -5682,13 +5682,13 @@ ov80_022302C4: ; 0x022302C4
add r4, r0, #0
ldr r0, _022302E4 ; =0x00000B54
ldr r0, [r4, r0]
bl String_Delete
bl String_Free
ldr r0, _022302E8 ; =0x00000B58
ldr r0, [r4, r0]
bl String_Delete
bl String_Free
ldr r0, _022302EC ; =0x00000B4C
ldr r0, [r4, r0]
bl String_Delete
bl String_Free
pop {r4, pc}
nop
_022302E4: .word 0x00000B54
@ -6043,9 +6043,9 @@ ov80_02230550: ; 0x02230550
mov r3, #2
bl ov80_02236D50
add r0, r4, #0
bl String_Delete
bl String_Free
add r0, r6, #0
bl String_Delete
bl String_Free
add sp, #8
pop {r4, r5, r6, pc}
nop
@ -6740,11 +6740,11 @@ ov80_02230B2C: ; 0x02230B2C
bl Heap_Free
ldr r0, _02230B68 ; =0x00000B4C
ldr r0, [r4, r0]
bl String_Delete
bl String_Free
mov r0, #0xb5
lsl r0, r0, #4
ldr r0, [r4, r0]
bl String_Delete
bl String_Free
pop {r4, pc}
nop
_02230B68: .word 0x00000B4C
@ -8424,7 +8424,7 @@ ov80_022318D4: ; 0x022318D4
add r3, r2, #0
bl ov80_02236D50
add r0, r6, #0
bl String_Delete
bl String_Free
add r0, r4, #0
mov r1, #0x3d
bl NewString_ReadMsgData
@ -8439,7 +8439,7 @@ ov80_022318D4: ; 0x022318D4
add r3, r2, #0
bl ov80_02236D50
add r0, r6, #0
bl String_Delete
bl String_Free
add r0, r4, #0
mov r1, #0x3f
bl NewString_ReadMsgData
@ -8454,7 +8454,7 @@ ov80_022318D4: ; 0x022318D4
add r3, r2, #0
bl ov80_02236D50
add r0, r6, #0
bl String_Delete
bl String_Free
add r0, r4, #0
mov r1, #0x41
bl NewString_ReadMsgData
@ -8477,7 +8477,7 @@ ov80_022318D4: ; 0x022318D4
add r1, r6, #0
bl ov80_02236D50
add r0, r6, #0
bl String_Delete
bl String_Free
add r0, r4, #0
mov r1, #0x42
bl NewString_ReadMsgData
@ -8500,7 +8500,7 @@ ov80_022318D4: ; 0x022318D4
add r1, r4, #0
bl ov80_02236D50
add r0, r4, #0
bl String_Delete
bl String_Free
add sp, #8
pop {r4, r5, r6, pc}
nop
@ -9362,17 +9362,17 @@ ov80_022320E8: ; 0x022320E8
bl Heap_Free
ldr r0, _0223211C ; =0x00000B44
ldr r0, [r4, r0]
bl String_Delete
bl String_Free
ldr r0, _02232120 ; =0x00000B4C
ldr r0, [r4, r0]
bl String_Delete
bl String_Free
ldr r0, _02232124 ; =0x00000B48
ldr r0, [r4, r0]
bl String_Delete
bl String_Free
mov r0, #0xb5
lsl r0, r0, #4
ldr r0, [r4, r0]
bl String_Delete
bl String_Free
pop {r4, pc}
.align 2, 0
_02232118: .word 0x00001004
@ -10698,7 +10698,7 @@ _02232B62:
lsl r1, r1, #6
str r0, [r5, r1]
add r0, r7, #0
bl String_Delete
bl String_Free
add sp, #0xc
pop {r4, r5, r6, r7, pc}
.align 2, 0
@ -11678,7 +11678,7 @@ ov80_022332EC: ; 0x022332EC
lsl r1, r1, #6
str r0, [r5, r1]
add r0, r6, #0
bl String_Delete
bl String_Free
add sp, #0xc
pop {r3, r4, r5, r6, pc}
.align 2, 0
@ -12087,11 +12087,11 @@ ov80_02233684: ; 0x02233684
bl Heap_Free
ldr r0, _022336C0 ; =0x00000B4C
ldr r0, [r4, r0]
bl String_Delete
bl String_Free
mov r0, #0xb5
lsl r0, r0, #4
ldr r0, [r4, r0]
bl String_Delete
bl String_Free
pop {r4, pc}
nop
_022336C0: .word 0x00000B4C
@ -13082,7 +13082,7 @@ ov80_02233EA4: ; 0x02233EA4
mov r2, #0
bl ov80_02236D50
add r0, r4, #0
bl String_Delete
bl String_Free
_02233ED2:
add sp, #8
pop {r4, r5, r6, pc}
@ -13154,7 +13154,7 @@ _02233F34:
bl ov80_02236D50
_02233F4E:
add r0, r4, #0
bl String_Delete
bl String_Free
_02233F54:
add sp, #8
pop {r4, r5, r6, pc}
@ -13187,7 +13187,7 @@ ov80_02233F5C: ; 0x02233F5C
add r1, r4, #0
bl ov80_02236D50
add r0, r4, #0
bl String_Delete
bl String_Free
_02233F92:
add sp, #8
pop {r4, r5, r6, pc}
@ -13275,7 +13275,7 @@ _02234022:
mov r3, #2
bl ov80_02233F9C
ldr r0, [sp, #0x14]
bl String_Delete
bl String_Free
add sp, #0x18
pop {r3, r4, r5, r6, r7, pc}
nop
@ -13347,7 +13347,7 @@ _022340B6:
mov r3, #2
bl ov80_02233F9C
ldr r0, [sp, #0x14]
bl String_Delete
bl String_Free
add sp, #0x18
pop {r3, r4, r5, r6, r7, pc}
nop
@ -13473,13 +13473,13 @@ _022341CA:
strb r6, [r7, #2]
strb r0, [r7, #3]
ldr r0, [sp, #0x1c]
bl String_Delete
bl String_Free
ldr r0, [sp, #0x14]
bl String_Delete
bl String_Free
ldr r0, [sp, #0x18]
bl String_Delete
bl String_Free
ldr r0, [sp, #0x20]
bl String_Delete
bl String_Free
add sp, #0x24
pop {r4, r5, r6, r7, pc}
.align 2, 0
@ -14484,12 +14484,12 @@ _022349B8: .word 0x00000B4C
thumb_func_start ov80_022349BC
ov80_022349BC: ; 0x022349BC
ldr r1, _022349C4 ; =0x00000B4C
ldr r3, _022349C8 ; =String_Delete
ldr r3, _022349C8 ; =String_Free
ldr r0, [r0, r1]
bx r3
.align 2, 0
_022349C4: .word 0x00000B4C
_022349C8: .word String_Delete
_022349C8: .word String_Free
thumb_func_end ov80_022349BC
thumb_func_start ov80_022349CC
@ -18245,13 +18245,13 @@ ov80_0223669C: ; 0x0223669C
mov r0, #0xb5
lsl r0, r0, #4
ldr r0, [r4, r0]
bl String_Delete
bl String_Free
ldr r0, _022366BC ; =0x00000B7C
ldr r0, [r4, r0]
bl String_Delete
bl String_Free
ldr r0, _022366C0 ; =0x00000B4C
ldr r0, [r4, r0]
bl String_Delete
bl String_Free
pop {r4, pc}
.align 2, 0
_022366BC: .word 0x00000B7C
@ -19047,7 +19047,7 @@ ov80_02236C70: ; 0x02236C70
add r2, r6, #0
bl StringExpandPlaceholders
add r0, r6, #0
bl String_Delete
bl String_Free
ldr r0, _02236CD8 ; =0x00000E98
mov r1, #0xf
add r0, r5, r0
@ -19227,7 +19227,7 @@ ov80_02236D8C: ; 0x02236D8C
lsl r1, r1, #6
str r0, [r5, r1]
add r0, r4, #0
bl String_Delete
bl String_Free
add sp, #0xc
pop {r3, r4, r5, r6, pc}
.align 2, 0

10
arm9/overlays/81/asm/overlay_81.s
View File

@ -228,7 +228,7 @@ ov81_02238004: ; 0x02238004
ldr r0, [r4, #0x10]
bl DestroyMsgData
ldr r0, [r4, #0x14]
bl String_Delete
bl String_Free
ldr r0, [r4, #8]
bl Heap_Free
ldr r0, [r4, #0x18]
@ -2052,9 +2052,9 @@ ov81_02238D64: ; 0x02238D64
add r0, r4, #0
bl ov81_02239498
ldr r0, [r4, #0x54]
bl String_Delete
bl String_Free
ldr r0, [r4, #0x58]
bl String_Delete
bl String_Free
ldr r0, [r4, #0x5c]
bl ov81_0223890C
ldr r0, [r4, #0x40]
@ -9109,9 +9109,9 @@ ov81_0223C580: ; 0x0223C580
ldr r0, [r4, #0x6c]
bl ov81_0223CDE0
ldr r0, [r4, #0x58]
bl String_Delete
bl String_Free
ldr r0, [r4, #0x5c]
bl String_Delete
bl String_Free
ldr r0, [r4, #0x60]
cmp r0, #0
beq _0223C5AC

14
arm9/overlays/82/asm/overlay_82.s
View File

@ -1923,20 +1923,20 @@ ov82_0222E504: ; 0x0222E504
add r4, r0, #0
ldr r0, _0222E534 ; =0x00000B98
ldr r0, [r4, r0]
bl String_Delete
bl String_Free
ldr r0, _0222E538 ; =0x00000B8C
ldr r0, [r4, r0]
bl String_Delete
bl String_Free
ldr r0, _0222E53C ; =0x00000B94
ldr r0, [r4, r0]
bl String_Delete
bl String_Free
mov r0, #0xb9
lsl r0, r0, #4
ldr r0, [r4, r0]
bl String_Delete
bl String_Free
ldr r0, _0222E540 ; =0x00000B88
ldr r0, [r4, r0]
bl String_Delete
bl String_Free
pop {r4, pc}
.align 2, 0
_0222E534: .word 0x00000B98
@ -4059,7 +4059,7 @@ ov82_0222F4D8: ; 0x0222F4D8
ldr r1, _0222F544 ; =0x00000B9C
str r0, [r5, r1]
add r0, r6, #0
bl String_Delete
bl String_Free
add sp, #0xc
pop {r3, r4, r5, r6, pc}
nop
@ -4397,7 +4397,7 @@ ov82_0222F740: ; 0x0222F740
ldr r1, _0222F7BC ; =0x00000B9C
str r0, [r5, r1]
add r0, r4, #0
bl String_Delete
bl String_Free
add sp, #0xc
pop {r3, r4, r5, r6, pc}
.align 2, 0

48
arm9/overlays/83/asm/overlay_83.s
View File

@ -923,7 +923,7 @@ ov83_0222DCA0: ; 0x0222DCA0
str r1, [sp, #0xc]
bl AddTextPrinterParameterized2
add r0, r5, #0
bl String_Delete
bl String_Free
add sp, #0x10
pop {r3, r4, r5, r6, r7, pc}
thumb_func_end ov83_0222DCA0
@ -1030,7 +1030,7 @@ _0222DD88:
mov r3, #0x20
bl AddTextPrinterParameterized2
add r0, r7, #0
bl String_Delete
bl String_Free
_0222DDB8:
add r6, r6, #1
add r4, r4, #4
@ -3364,7 +3364,7 @@ ov83_0222F074: ; 0x0222F074
mov r2, #0x24
bl CopyStringToU16Array
add r0, r7, #0
bl String_Delete
bl String_Free
mov r0, #0xc
bl ov83_02238EF4
add r7, r0, #0
@ -3421,7 +3421,7 @@ ov83_0222F074: ; 0x0222F074
mov r2, #0xfa
bl CopyStringToU16Array
add r0, r7, #0
bl String_Delete
bl String_Free
mov r0, #0xd2
lsl r0, r0, #2
mov r1, #0
@ -6020,7 +6020,7 @@ _02230554:
cmp r0, #0
bne _0223057A
add r0, r6, #0
bl String_Delete
bl String_Free
_0223057A:
add r0, r5, #0
mov r1, #0
@ -6077,7 +6077,7 @@ ov83_022305A4: ; 0x022305A4
mov r3, #3
bl DrawFrameAndWindow1
add r0, r4, #0
bl String_Delete
bl String_Free
add sp, #0x10
pop {r4, r5, r6, pc}
.align 2, 0
@ -6454,7 +6454,7 @@ _022308F8:
cmp r0, #0
bne _02230918
ldr r0, [r4, #0x14]
bl String_Delete
bl String_Free
mov r0, #0
str r0, [r4, #0x14]
str r0, [r4, #0x68]
@ -8259,7 +8259,7 @@ ov83_022317A8: ; 0x022317A8
add r0, r5, #0
bl CopyWindowToVram
add r0, r7, #0
bl String_Delete
bl String_Free
add r0, r4, #0
bl DestroyMsgData
add r0, r6, #0
@ -8570,7 +8570,7 @@ ov83_02231A4C: ; 0x02231A4C
str r3, [sp, #0xc]
bl AddTextPrinterParameterized2
add r0, r6, #0
bl String_Delete
bl String_Free
mov r0, #1
add sp, #0x10
pop {r3, r4, r5, r6, r7, pc}
@ -8632,7 +8632,7 @@ _02231ADE:
str r3, [sp, #0xc]
bl AddTextPrinterParameterized2
add r0, r4, #0
bl String_Delete
bl String_Free
mov r0, #1
add sp, #0x10
pop {r4, r5, r6, pc}
@ -8726,7 +8726,7 @@ ov83_02231B84: ; 0x02231B84
str r3, [sp, #0xc]
bl AddTextPrinterParameterized2
add r0, r6, #0
bl String_Delete
bl String_Free
mov r0, #0
add sp, #0x10
pop {r3, r4, r5, r6, r7, pc}
@ -8771,7 +8771,7 @@ ov83_02231BD8: ; 0x02231BD8
str r3, [sp, #0xc]
bl AddTextPrinterParameterized2
add r0, r4, #0
bl String_Delete
bl String_Free
add sp, #0x10
mov r0, #0
pop {r4, r5, r6, pc}
@ -9159,7 +9159,7 @@ _02231EBE:
add r0, r6, #0
bl AddTextPrinterParameterized2
ldr r0, [sp, #0x30]
bl String_Delete
bl String_Free
_02231F20:
add r0, r6, #0
bl CopyWindowToVram
@ -9296,7 +9296,7 @@ _02231FFE:
add r0, r6, #0
bl AddTextPrinterParameterized2
ldr r0, [sp, #0x14]
bl String_Delete
bl String_Free
ldr r0, _02232090 ; =0x000029A4
ldr r0, [r5, r0]
bl DestroyMsgData
@ -11143,7 +11143,7 @@ _02232F30:
bl AddTextPrinterParameterized2
_02232F4A:
ldr r0, [sp, #0x20]
bl String_Delete
bl String_Free
add r0, r7, #0
bl PlayerProfile_GetTrainerID
add r2, r0, #0
@ -11176,7 +11176,7 @@ _02232F4A:
mov r3, #0x50
bl AddTextPrinterParameterized2
add r0, r7, #0
bl String_Delete
bl String_Free
add r5, #0x18
_02232F9E:
ldr r0, [sp, #0x18]
@ -11262,7 +11262,7 @@ ov83_02232FE4: ; 0x02232FE4
add r0, r4, #0
bl CopyWindowToVram
add r0, r6, #0
bl String_Delete
bl String_Free
ldr r0, _02233078 ; =0x000029A4
ldr r0, [r5, r0]
bl DestroyMsgData
@ -15555,7 +15555,7 @@ _02234FB2:
bl AddTextPrinterParameterized2
str r0, [r5, #0x48]
ldr r0, [sp, #0x18]
bl String_Delete
bl String_Free
ldr r0, [r5, #0x40]
cmp r0, #0
bne _02234FF8
@ -15596,7 +15596,7 @@ _02235004:
bl AddTextPrinterParameterized2
str r0, [r5, #0x48]
add r0, r7, #0
bl String_Delete
bl String_Free
mov r0, #0
str r0, [r5, #0x38]
_0223504C:
@ -17285,7 +17285,7 @@ _02235CCA:
add r0, r7, #0
bl DestroyMsgData
add r0, r6, #0
bl String_Delete
bl String_Free
add r0, r4, #0
mov r1, #0xc
mov r2, #0
@ -17317,7 +17317,7 @@ _02235CCA:
str r6, [sp, #0x68]
bl ov83_02234F2C
add r0, r6, #0
bl String_Delete
bl String_Free
_02235DAC:
add r0, r4, #0
bl ov83_02237EDC
@ -17344,7 +17344,7 @@ _02235DAC:
str r4, [sp, #0x68]
bl ov83_02234F2C
add r0, r4, #0
bl String_Delete
bl String_Free
ldr r0, [sp, #4]
lsl r0, r0, #0x10
lsr r0, r0, #0x10
@ -18192,7 +18192,7 @@ ov83_02236484: ; 0x02236484
add r1, r5, r1
bl ov83_02234F2C
add r0, r6, #0
bl String_Delete
bl String_Free
add r0, r4, #0
bl MessageFormat_Delete
add r0, r5, #0
@ -23160,7 +23160,7 @@ _022389D0:
str r0, [r5, #0xc]
_02238A12:
add r0, r4, #0
bl String_Delete
bl String_Free
ldr r0, [r5, #0x14]
cmp r0, #0
bne _02238A24

2
arm9/overlays/84/asm/overlay_84_thumb2.s
View File

@ -624,7 +624,7 @@ ov84_021D85B8: ; 0x021D85B8
bl SysTask_Destroy
_021D85C6:
ldr r0, [r4, #0x30]
bl String_Delete
bl String_Free
ldr r0, [r4, #0x24]
bl RemoveWindow
ldr r0, [r4, #0x28]

2
arm9/overlays/85/asm/overlay_85.s
View File

@ -824,7 +824,7 @@ ov85_021D7BB8: ; 0x021D7BB8
ldr r0, [r4, #4]
bl MessageFormat_Delete
ldr r0, [r4, #0x18]
bl String_Delete
bl String_Free
pop {r4, r5, r6, pc}
nop
_021D7BE8: .word 0x00000408

4
arm9/overlays/86/asm/overlay_86.s
View File

@ -842,7 +842,7 @@ ov86_021D7B80: ; 0x021D7B80
str r1, [sp, #0xc]
bl AddTextPrinterParameterized2
add r0, r6, #0
bl String_Delete
bl String_Free
ldr r0, [r5, #4]
cmp r0, #0
bne _021D7C00
@ -905,7 +905,7 @@ _021D7C02:
str r1, [sp, #0xc]
bl AddTextPrinterParameterized2
add r0, r4, #0
bl String_Delete
bl String_Free
add sp, #0x10
pop {r4, r5, r6, pc}
nop

4
arm9/src/bag_view.c
View File

@ -144,7 +144,7 @@ BOOL TryFormatRegisteredKeyItemUseMessage(SaveData *saveData, String *dest, u32
}
StringExpandPlaceholders(messageFormat, dest, string);
String_Delete(string);
String_Free(string);
MessageFormat_Delete(messageFormat);
DestroyMsgData(msgData);
return TRUE;
@ -174,7 +174,7 @@ void GetItemUseErrorMessage(PlayerProfile *playerProfile, String *dest, u16 item
String *src = NewString_ReadMsgData(msgData, narc_0199_00036);
BufferPlayersName(messageFormat, 0, playerProfile);
StringExpandPlaceholders(messageFormat, dest, src);
String_Delete(src);
String_Free(src);
MessageFormat_Delete(messageFormat);
DestroyMsgData(msgData);
break;

4
arm9/src/blackout.c
View File

@ -178,8 +178,8 @@ static void Blackout_PrintMessage(BlackoutScreenEnvironment *environment, s32 ms
AddTextPrinterParameterized2(&environment->window, 0, finStr, x, y, TEXT_SPEED_NOTRANSFER, MAKE_TEXT_COLOR(15, 2, 0), NULL);
String_Delete(tmpStr);
String_Delete(finStr);
String_Free(tmpStr);
String_Free(finStr);
}
enum {

2
arm9/src/communication_error.c
View File

@ -144,7 +144,7 @@ void ShowCommunicationError(enum HeapID heapID, u32 error, u32 errorCode) {
ReadMsgDataIntoString(errorMessageData, msgNo, tmpStr);
StringExpandPlaceholders(messageFormat, errorMessageStr, tmpStr);
AddTextPrinterParameterized(&window, 0, errorMessageStr, 0, 0, 0, NULL);
String_Delete(errorMessageStr);
String_Free(errorMessageStr);
// BUG: tmp_str is never destroyed.
GfGfx_BothDispOn();

2
arm9/src/error_message_reset.c
View File

@ -142,7 +142,7 @@ void PrintErrorMessageAndReset() {
AddTextPrinterParameterized(&buf, 0, str, 0, 0, 0, NULL);
String_Delete(str);
String_Free(str);
GfGfx_BothDispOn();
SetMasterBrightnessNeutral(PM_LCD_TOP);
SetMasterBrightnessNeutral(PM_LCD_BOTTOM);

2
arm9/src/hall_of_fame.c
View File

@ -62,7 +62,7 @@ void Save_HOF_RecordParty(struct HallOfFame *hof, struct Party *party, RTCDate *
}
hof->num_total++;
if (str != NULL) {
String_Delete(str);
String_Free(str);
}
}
}

2
arm9/src/list_menu_items.c
View File

@ -74,7 +74,7 @@ void ListMenuItems_DestroyMenuStrings(struct ListMenuItem *items) {
if (items[i].text == NULL) {
break;
}
String_Delete(items[i].text);
String_Free(items[i].text);
items[i].text = NULL;
}
}

2
arm9/src/mail_message.c
View File

@ -128,7 +128,7 @@ u32 MailMsg_NumFields(u16 bank, u16 num) {
cstr++;
}
}
String_Delete(str);
String_Free(str);
return count;
}

6
arm9/src/message_format.c
View File

@ -82,12 +82,12 @@ void MessageFormat_Delete(MessageFormat *messageFormat) {
if (messageFormat->fields[i].msg == NULL) {
break;
}
String_Delete(messageFormat->fields[i].msg);
String_Free(messageFormat->fields[i].msg);
}
Heap_Free(messageFormat->fields);
}
if (messageFormat->buffer != NULL) {
String_Delete(messageFormat->buffer);
String_Free(messageFormat->buffer);
}
messageFormat->count = 0;
Heap_Free(messageFormat);
@ -583,7 +583,7 @@ void BufferGroupName(MessageFormat *messageFormat, struct SaveData *save, u32 r5
struct String *r4 = String_New(64, HEAP_ID_4);
CopyU16ArrayToString(r4, sub_020287A8(r6, r5, sp28));
BufferString(messageFormat, idx, r4, sp10, 1, r7);
String_Delete(r4);
String_Free(r4);
}
void BufferMonthNameAbbr(MessageFormat *messageFormat, u32 idx, u32 month) {

Some files were not shown because too many files have changed in this diff Show More