diff --git a/arm9/arm9.lsf b/arm9/arm9.lsf index 671c928fc..eacb91fe0 100644 --- a/arm9/arm9.lsf +++ b/arm9/arm9.lsf @@ -79,7 +79,7 @@ Static arm9 Object unk_02020C44.o Object unk_0202134C.o Object unk_02021590.o - Object unk_02021934.o + Object string_gf.o Object unk_02021FF8.o Object unk_02022244.o Object unk_02022294.o diff --git a/arm9/asm/scrcmd_12.s b/arm9/asm/scrcmd_12.s index 28cc62793..cc8c396bd 100644 --- a/arm9/asm/scrcmd_12.s +++ b/arm9/asm/scrcmd_12.s @@ -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} diff --git a/arm9/asm/scrcmd_9.s b/arm9/asm/scrcmd_9.s index 3370b8dac..b7a1cab3e 100644 --- a/arm9/asm/scrcmd_9.s +++ b/arm9/asm/scrcmd_9.s @@ -527,7 +527,7 @@ sub_0204224C: ; 0x0204224C bl String_New add r1, r7, #0x0 add r4, r0, #0x0 - bl CopyU16ArrayToString + bl String_CopyFromChars ldr r0, [sp, #0x24] ldr r3, [sp, #0x8] str r0, [sp, #0x0] @@ -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 diff --git a/arm9/asm/unk_02012CC8.s b/arm9/asm/unk_02012CC8.s index 912624afb..f822504b3 100644 --- a/arm9/asm/unk_02012CC8.s +++ b/arm9/asm/unk_02012CC8.s @@ -1503,7 +1503,7 @@ ListMenuCursorNew: ; 0x02013690 bl String_New ldr r1, _020136BC ; =UNK_020ED548 str r0, [r4, #0x4] - bl CopyU16ArrayToString + bl String_CopyFromChars _020136B2: add r0, r4, #0x0 pop {r3-r5, pc} @@ -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 diff --git a/arm9/asm/unk_020144FC.s b/arm9/asm/unk_020144FC.s index 4c5f04339..9fea660b4 100644 --- a/arm9/asm/unk_020144FC.s +++ b/arm9/asm/unk_020144FC.s @@ -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 diff --git a/arm9/asm/unk_02023AC4.s b/arm9/asm/unk_02023AC4.s index b734337e6..0fe9ce515 100644 --- a/arm9/asm/unk_02023AC4.s +++ b/arm9/asm/unk_02023AC4.s @@ -47,14 +47,14 @@ _02023AE0: .word memset thumb_func_start sub_02023AE4 sub_02023AE4: ; 0x02023AE4 - ldr r3, _02023AF0 ; =CopyU16ArrayToStringN + ldr r3, _02023AF0 ; =String_CopyNumChars add r2, r0, #0x0 add r0, r1, #0x0 add r1, r2, #0x0 mov r2, #0xc bx r3 .balign 4 -_02023AF0: .word CopyU16ArrayToStringN +_02023AF0: .word String_CopyNumChars thumb_func_start sub_02023AF4 sub_02023AF4: ; 0x02023AF4 @@ -64,7 +64,7 @@ sub_02023AF4: ; 0x02023AF4 bl String_New add r1, r5, #0x0 add r4, r0, #0x0 - bl CopyU16ArrayToString + bl String_CopyFromChars add r0, r4, #0x0 pop {r3-r5, pc} .balign 4 diff --git a/arm9/asm/unk_02026CD0.s b/arm9/asm/unk_02026CD0.s index 9f61c1223..6757c78d6 100644 --- a/arm9/asm/unk_02026CD0.s +++ b/arm9/asm/unk_02026CD0.s @@ -112,7 +112,7 @@ sub_02026D98: ; 0x02026D98 add r4, r2, #0x0 add r1, #0x20 mov r2, #0x8 - bl CopyStringToU16Array + bl String_CopyToChars add r5, #0x34 strb r4, [r5, #0x0] pop {r3-r5, pc} @@ -2242,13 +2242,13 @@ sub_02027C84: ; 0x02027C84 thumb_func_start sub_02027C88 sub_02027C88: ; 0x02027C88 add r2, r0, #0x0 - ldr r3, _02027C94 ; =CopyU16ArrayToString + ldr r3, _02027C94 ; =String_CopyFromChars add r2, #0x20 add r0, r1, #0x0 add r1, r2, #0x0 bx r3 .balign 4 -_02027C94: .word CopyU16ArrayToString +_02027C94: .word String_CopyFromChars thumb_func_start sub_02027C98 sub_02027C98: ; 0x02027C98 diff --git a/arm9/asm/unk_020281E0.s b/arm9/asm/unk_020281E0.s index 0f6cfd00a..9278bc090 100644 --- a/arm9/asm/unk_020281E0.s +++ b/arm9/asm/unk_020281E0.s @@ -291,7 +291,7 @@ _020283D0: add r1, r2, r1 add r0, r6, #0x0 mov r2, #0x10 - bl CopyStringToU16Array + bl String_CopyToChars pop {r4-r6, pc} .balign 4 @@ -330,7 +330,7 @@ _02028414: add r1, r2, r1 add r0, r6, #0x0 mov r2, #0x10 - bl CopyStringToU16Array + bl String_CopyToChars pop {r4-r6, pc} .balign 4 diff --git a/arm9/asm/unk_0202B870.s b/arm9/asm/unk_0202B870.s index 026465055..25ca0f2ed 100644 --- a/arm9/asm/unk_0202B870.s +++ b/arm9/asm/unk_0202B870.s @@ -277,7 +277,7 @@ _0202BA38: add r0, r7, #0x0 add r1, #0x8 mov r2, #0x8 - bl CopyStringToU16Array + bl String_CopyToChars ldr r0, [r5, #0x0] add r6, r6, #0x1 str r0, [r4, #0x4] @@ -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} @@ -822,7 +822,7 @@ _0202BE14: add r1, r5, #0x0 ldr r0, [r0, #0xc] add r1, #0x8 - bl CopyU16ArrayToString + bl String_CopyFromChars ldr r0, [r4, #0x0] add r0, r0, #0x1 str r0, [r4, #0x0] @@ -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 diff --git a/arm9/asm/unk_02033874.s b/arm9/asm/unk_02033874.s index 25a3b113a..d36caac8f 100644 --- a/arm9/asm/unk_02033874.s +++ b/arm9/asm/unk_02033874.s @@ -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 @@ -333,13 +333,13 @@ _02033B22: bl sub_0202DFFC add r1, r0, #0x0 ldr r0, [sp, #0x10] - bl CopyU16ArrayToString + bl String_CopyFromChars ldr r2, [sp, #0x10] add r0, r4, #0x0 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 diff --git a/arm9/asm/unk_02035068.s b/arm9/asm/unk_02035068.s index 49f6d6815..1129a550e 100644 --- a/arm9/asm/unk_02035068.s +++ b/arm9/asm/unk_02035068.s @@ -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] diff --git a/arm9/asm/unk_020377F0.s b/arm9/asm/unk_020377F0.s index a99a97dd3..ba8de74db 100644 --- a/arm9/asm/unk_020377F0.s +++ b/arm9/asm/unk_020377F0.s @@ -1860,7 +1860,7 @@ _020384F2: cmp r0, #0x5 bne _02038514 ldr r0, [r1, #0x18] - bl String_c_str + bl String_GetChars add r7, r0, #0x0 ldr r0, [r6, #0xc] bl sub_0202881C @@ -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 @@ -2022,12 +2022,12 @@ _02038620: beq _0203866E ldr r0, [r4, #0x10] add r1, r5, #0x0 - bl CopyU16ArrayToString + bl String_CopyFromChars b _0203866E _02038656: ldr r0, [r4, #0x10] add r1, r5, #0x0 - bl CopyU16ArrayToString + bl String_CopyFromChars b _0203866E _02038660: cmp r5, #0x0 @@ -2035,7 +2035,7 @@ _02038660: ldr r0, [r4, #0xc] add r1, r5, #0x0 ldr r0, [r0, #0x18] - bl CopyU16ArrayToString + bl String_CopyFromChars _0203866E: ldr r0, [sp, #0x4] ldr r1, _0203867C ; =sub_0203847C diff --git a/arm9/asm/unk_02038C78.s b/arm9/asm/unk_02038C78.s index 0b37d47af..812bf2c00 100644 --- a/arm9/asm/unk_02038C78.s +++ b/arm9/asm/unk_02038C78.s @@ -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 diff --git a/arm9/asm/unk_020476CC.s b/arm9/asm/unk_020476CC.s index 6b987c385..3e7650e22 100644 --- a/arm9/asm/unk_020476CC.s +++ b/arm9/asm/unk_020476CC.s @@ -211,14 +211,14 @@ sub_02047814: ; 0x02047814 add r2, r7, #0x0 bl ReadMsgDataIntoString add r0, r7, #0x0 - bl String_c_str + bl String_GetChars add r1, r0, #0x0 add r0, r4, #0x0 add r0, #0xf8 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] diff --git a/arm9/asm/unk_020484A8.s b/arm9/asm/unk_020484A8.s index f86c9198c..4ec581bed 100644 --- a/arm9/asm/unk_020484A8.s +++ b/arm9/asm/unk_020484A8.s @@ -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 diff --git a/arm9/asm/unk_02048904.s b/arm9/asm/unk_02048904.s index e8eecf404..ea451cd2c 100644 --- a/arm9/asm/unk_02048904.s +++ b/arm9/asm/unk_02048904.s @@ -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 diff --git a/arm9/asm/unk_0204CB20.s b/arm9/asm/unk_0204CB20.s index 6984e16cc..7c602077c 100644 --- a/arm9/asm/unk_0204CB20.s +++ b/arm9/asm/unk_0204CB20.s @@ -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} @@ -6102,7 +6102,7 @@ sub_0204F9BC: ; 0x0204F9BC mov r1, #0xf bl PlayerProfile_GetPlayerName_NewString str r0, [sp, #0x0] - bl StringGetLength + bl String_GetLength cmp r0, #0x0 beq _0204F9FE ldr r0, _0204FA54 ; =UNK_021C5A68 @@ -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] diff --git a/arm9/asm/unk_02050E48.s b/arm9/asm/unk_02050E48.s index bb6eb5c49..6547233f8 100644 --- a/arm9/asm/unk_02050E48.s +++ b/arm9/asm/unk_02050E48.s @@ -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 diff --git a/arm9/asm/unk_02052EE8.s b/arm9/asm/unk_02052EE8.s index 664defd4b..65bfe55bd 100644 --- a/arm9/asm/unk_02052EE8.s +++ b/arm9/asm/unk_02052EE8.s @@ -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} diff --git a/arm9/asm/unk_0205CE48.s b/arm9/asm/unk_0205CE48.s index 12882c7de..5dd140f8a 100644 --- a/arm9/asm/unk_0205CE48.s +++ b/arm9/asm/unk_0205CE48.s @@ -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 diff --git a/arm9/asm/unk_02060CCC.s b/arm9/asm/unk_02060CCC.s index 26aaea4aa..cb070ba83 100644 --- a/arm9/asm/unk_02060CCC.s +++ b/arm9/asm/unk_02060CCC.s @@ -267,7 +267,7 @@ sub_02060D90: ; 0x02060D90 bl String_New add r1, r7, #0x0 add r4, r0, #0x0 - bl CopyU16ArrayToString + bl String_CopyFromChars ldr r0, [sp, #0x24] ldr r3, [sp, #0x8] str r0, [sp, #0x0] @@ -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 @@ -327,9 +327,9 @@ sub_02060E04: ; 0x02060E04 add r0, r4, #0x0 add r1, r5, #0x0 mov r2, #0xb - bl CopyStringToU16Array + bl String_CopyToChars add r0, r4, #0x0 - bl String_Delete + bl String_Free pop {r4-r6, pc} .balign 4 @@ -436,9 +436,9 @@ sub_02060ECC: ; 0x02060ECC add r0, r4, #0x0 add r1, r7, #0x0 mov r2, #0xb - bl CopyStringToU16Array + bl String_CopyToChars 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 diff --git a/arm9/asm/unk_020625EC.s b/arm9/asm/unk_020625EC.s index ae383239a..db667d23f 100644 --- a/arm9/asm/unk_020625EC.s +++ b/arm9/asm/unk_020625EC.s @@ -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] diff --git a/arm9/asm/unk_020653EC.s b/arm9/asm/unk_020653EC.s index 7b072b447..796ac17cc 100644 --- a/arm9/asm/unk_020653EC.s +++ b/arm9/asm/unk_020653EC.s @@ -1538,7 +1538,7 @@ sub_02065FF8: ; 0x02065FF8 ldr r0, [r0, #0x8] cmp r0, #0x0 beq _0206600E - bl String_SetEmpty + bl String_Clear _0206600E: pop {r3, pc} @@ -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 @@ -1671,7 +1671,7 @@ _020660AE: bl Mail_GetAuthorNamePtr add r1, r0, #0x0 ldr r0, [r5, #0x8] - bl CopyU16ArrayToString + bl String_CopyFromChars ldrb r0, [r6, #0x19] strb r0, [r5, #0x2] ldrb r1, [r5, #0x0] @@ -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] @@ -2076,7 +2076,7 @@ _02066426: mov r0, #0x45 lsl r0, r0, #0x2 ldr r0, [r5, r0] - bl String_SetEmpty + bl String_Clear mov r0, #0x1 str r0, [sp, #0x0] mov r0, #0x2 diff --git a/arm9/asm/unk_0206F3FC.s b/arm9/asm/unk_0206F3FC.s index e8e821e02..a37ac0a81 100644 --- a/arm9/asm/unk_0206F3FC.s +++ b/arm9/asm/unk_0206F3FC.s @@ -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 diff --git a/arm9/asm/unk_02072548.s b/arm9/asm/unk_02072548.s index adec1227a..ebaae43f1 100644 --- a/arm9/asm/unk_02072548.s +++ b/arm9/asm/unk_02072548.s @@ -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 diff --git a/arm9/asm/unk_0207550C.s b/arm9/asm/unk_0207550C.s index fb2ee1a5e..82264e543 100644 --- a/arm9/asm/unk_0207550C.s +++ b/arm9/asm/unk_0207550C.s @@ -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 diff --git a/arm9/asm/unk_020772F0.s b/arm9/asm/unk_020772F0.s index 08e7fce76..8e72b0f55 100644 --- a/arm9/asm/unk_020772F0.s +++ b/arm9/asm/unk_020772F0.s @@ -1321,14 +1321,14 @@ _020777FE: _0207781A: ldr r0, [r4, #0x18] add r1, r6, #0x0 - bl StringCopy + bl String_Copy add r0, r6, #0x0 - bl String_Delete + bl String_Free ldr r0, [r4, #0x18] add r4, #0x1c add r1, r4, #0x0 mov r2, #0xa - bl CopyStringToU16Array + bl String_CopyToChars pop {r4-r6, pc} _02077836: cmp r0, #0x3 @@ -1345,14 +1345,14 @@ _02077836: add r5, r0, #0x0 ldr r0, [r4, #0x18] add r1, r5, #0x0 - bl StringCopy + bl String_Copy add r0, r5, #0x0 - bl String_Delete + bl String_Free ldr r0, [r4, #0x18] add r4, #0x1c add r1, r4, #0x0 mov r2, #0xa - bl CopyStringToU16Array + bl String_CopyToChars pop {r4-r6, pc} _02077864: mov r0, #0x1 @@ -1457,12 +1457,12 @@ _0207790E: add r1, r4, #0x0 ldr r0, [r5, #0x18] add r1, #0xd8 - bl CopyU16ArrayToString + bl String_CopyFromChars _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} @@ -1967,7 +1967,7 @@ sub_02077CD4: ; 0x02077CD4 beq _02077D88 add r1, r4, r1 mov r2, #0x20 - bl CopyStringToU16Array + bl String_CopyToChars _02077D88: add r1, r4, #0x0 mov r0, #0x1 @@ -2191,7 +2191,7 @@ _02077F50: add r1, r5, #0x0 add r0, r7, #0x0 add r1, #0xd8 - bl CopyU16ArrayToString + bl String_CopyFromChars mov r1, #0x0 str r1, [sp, #0x0] mov r0, #0x5a @@ -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} @@ -4139,7 +4139,7 @@ _02078F0A: add r5, r0, #0x0 ldr r0, [sp, #0x28] add r1, sp, #0x38 - bl CopyU16ArrayToString + bl String_CopyFromChars ldr r0, [sp, #0x20] sub r3, r6, r5 str r0, [sp, #0x0] @@ -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 @@ -4269,7 +4269,7 @@ _02079012: bl FillWindowPixelBuffer add r0, r4, #0x0 add r1, sp, #0xc - bl CopyU16ArrayToString + bl String_CopyFromChars ldr r3, _0207906C ; =0x000D0E0F add r0, r6, r7 add r1, r4, #0x0 @@ -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 diff --git a/arm9/asm/unk_02079C70.s b/arm9/asm/unk_02079C70.s index ba24bf622..5c2457770 100644 --- a/arm9/asm/unk_02079C70.s +++ b/arm9/asm/unk_02079C70.s @@ -716,7 +716,7 @@ sub_0207A1A0: ; 0x0207A1A0 cmp r1, #0x0 beq _0207A24C ldr r0, [r4, r2] - bl CopyU16ArrayToString + bl String_CopyFromChars _0207A24C: pop {r4, pc} nop @@ -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 diff --git a/arm9/asm/unk_0207D5BC.s b/arm9/asm/unk_0207D5BC.s index 39f2d3d35..f39f52fb0 100644 --- a/arm9/asm/unk_0207D5BC.s +++ b/arm9/asm/unk_0207D5BC.s @@ -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 diff --git a/arm9/asm/unk_0207FD00.s b/arm9/asm/unk_0207FD00.s index 658396948..5ca91d641 100644 --- a/arm9/asm/unk_0207FD00.s +++ b/arm9/asm/unk_0207FD00.s @@ -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} diff --git a/arm9/asm/unk_02080C38.s b/arm9/asm/unk_02080C38.s index 4423ec8fb..41f163c94 100644 --- a/arm9/asm/unk_02080C38.s +++ b/arm9/asm/unk_02080C38.s @@ -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] @@ -941,7 +941,7 @@ _02081304: add r0, #0xe8 ldr r0, [r0, #0x0] ldr r1, [r6, #0xc] - bl StringCopy + bl String_Copy ldr r0, [r6, #0x10] bl PlayerProfile_GetTrainerGender mov r1, #0x42 @@ -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] @@ -1787,7 +1787,7 @@ _020819A2: add r0, r6, #0x0 add r0, #0xe8 ldr r0, [r0, #0x0] - bl String_SetEmpty + bl String_Clear add r1, r6, #0x0 add r1, #0xe8 ldr r1, [r1, #0x0] diff --git a/arm9/asm/unk_020828BC.s b/arm9/asm/unk_020828BC.s index 83a5acb8c..a04e070a4 100644 --- a/arm9/asm/unk_020828BC.s +++ b/arm9/asm/unk_020828BC.s @@ -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 diff --git a/arm9/asm/unk_020834D0.s b/arm9/asm/unk_020834D0.s index db1e9b019..d9501f4e0 100644 --- a/arm9/asm/unk_020834D0.s +++ b/arm9/asm/unk_020834D0.s @@ -547,10 +547,10 @@ sub_02083888: ; 0x02083888 add r4, #0xe8 lsl r7, r0, #0x2 ldr r0, [r4, r7] - bl String_SetEmpty + bl String_Clear ldr r0, [r4, r7] add r1, r5, #0x4 - bl CopyU16ArrayToString + bl String_CopyFromChars ldr r0, _020838B0 ; =0x00000584 ldrb r1, [r6, r0] add r1, r1, #0x1 @@ -567,7 +567,7 @@ sub_020838B4: ; 0x020838B4 add r0, r2, #0x0 add r1, sp, #0x0 mov r2, #0x8 - bl CopyStringToU16Array + bl String_CopyToChars mov r0, #0x14 add r1, r0, #0x0 bl Heap_Alloc diff --git a/arm9/asm/unk_020854E0.s b/arm9/asm/unk_020854E0.s index 84d294524..23f87d42b 100644 --- a/arm9/asm/unk_020854E0.s +++ b/arm9/asm/unk_020854E0.s @@ -302,7 +302,7 @@ sub_020856F0: ; 0x020856F0 bl Mail_GetAuthorNamePtr add r1, r0, #0x0 ldr r0, [r6, #0x10] - bl CopyU16ArrayToString + bl String_CopyFromChars add r0, r4, #0x0 bl Mail_GetType strb r0, [r6, #0xf] @@ -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 diff --git a/arm9/asm/unk_02086414.s b/arm9/asm/unk_02086414.s index 87d3ab3fb..65cc7ad41 100644 --- a/arm9/asm/unk_02086414.s +++ b/arm9/asm/unk_02086414.s @@ -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 diff --git a/arm9/asm/unk_02089498.s b/arm9/asm/unk_02089498.s index 3eedf37c9..cc56b31f4 100644 --- a/arm9/asm/unk_02089498.s +++ b/arm9/asm/unk_02089498.s @@ -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] diff --git a/arm9/asm/unk_02089960.s b/arm9/asm/unk_02089960.s index 81c6241f8..12a2191ac 100644 --- a/arm9/asm/unk_02089960.s +++ b/arm9/asm/unk_02089960.s @@ -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] diff --git a/arm9/asm/unk_0208A338.s b/arm9/asm/unk_0208A338.s index d96270017..36077eda6 100644 --- a/arm9/asm/unk_0208A338.s +++ b/arm9/asm/unk_0208A338.s @@ -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] diff --git a/arm9/global.inc b/arm9/global.inc index 99b3685f9..7c2a5e394 100644 --- a/arm9/global.inc +++ b/arm9/global.inc @@ -1389,24 +1389,24 @@ .extern GetStringWidthMultiline .extern StringGetWidth_SingleLine_HandleClearToControlCode .extern String_New -.extern String_Delete -.extern String_SetEmpty -.extern StringCopy -.extern StringDup -.extern String16_FormatInteger -.extern String_atoi +.extern String_Free +.extern String_Clear +.extern String_Copy +.extern String_Clone +.extern String_FormatInt +.extern String_AtoI .extern String_Compare -.extern StringGetLength -.extern StringCountLines -.extern StringGetLineN -.extern CopyU16ArrayToString -.extern CopyU16ArrayToStringN -.extern CopyStringToU16Array -.extern String_c_str -.extern StringCat -.extern StrAddChar -.extern StrUpperFirstChar -.extern StringCat_HandleTrainerName +.extern String_GetLength +.extern String_CountLines +.extern String_CopyLine +.extern String_CopyFromChars +.extern String_CopyNumChars +.extern String_CopyToChars +.extern String_GetChars +.extern String_Concat +.extern String_AppendChar +.extern String_UpperFirstChar +.extern String_ConcatTrainerName .extern sub_020220C4 .extern sub_0202212C .extern sub_02022144 diff --git a/arm9/overlays/05/asm/ov05_021E1AD8.s b/arm9/overlays/05/asm/ov05_021E1AD8.s index 0f69d864a..d74600c10 100644 --- a/arm9/overlays/05/asm/ov05_021E1AD8.s +++ b/arm9/overlays/05/asm/ov05_021E1AD8.s @@ -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 diff --git a/arm9/overlays/05/asm/ov05_021E2B80.s b/arm9/overlays/05/asm/ov05_021E2B80.s index a22ad365f..71a08dbdc 100644 --- a/arm9/overlays/05/asm/ov05_021E2B80.s +++ b/arm9/overlays/05/asm/ov05_021E2B80.s @@ -344,9 +344,9 @@ ov05_ExpandEasyChatMessage: ; 0x021E2DF0 add r4, r0, #0 ldr r0, [r5] add r1, r4, #0 - bl StringCopy + bl String_Copy add r0, r4, #0 - bl String_Delete + bl String_Free add sp, #8 pop {r3, r4, r5, r6, r7, pc} .balign 4, 0 diff --git a/arm9/overlays/05/asm/ov05_021E2E88.s b/arm9/overlays/05/asm/ov05_021E2E88.s index c618416d1..5afd962e9 100644 --- a/arm9/overlays/05/asm/ov05_021E2E88.s +++ b/arm9/overlays/05/asm/ov05_021E2E88.s @@ -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 diff --git a/arm9/overlays/05/asm/ov05_021E8310.s b/arm9/overlays/05/asm/ov05_021E8310.s index 24e47d837..e2fbfcfbc 100644 --- a/arm9/overlays/05/asm/ov05_021E8310.s +++ b/arm9/overlays/05/asm/ov05_021E8310.s @@ -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 diff --git a/arm9/overlays/05/asm/ov05_021EC458.s b/arm9/overlays/05/asm/ov05_021EC458.s index e084c0523..17b51553e 100644 --- a/arm9/overlays/05/asm/ov05_021EC458.s +++ b/arm9/overlays/05/asm/ov05_021EC458.s @@ -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 diff --git a/arm9/overlays/05/asm/ov05_021EFBF8.s b/arm9/overlays/05/asm/ov05_021EFBF8.s index 0581b0948..0a8fb2aae 100644 --- a/arm9/overlays/05/asm/ov05_021EFBF8.s +++ b/arm9/overlays/05/asm/ov05_021EFBF8.s @@ -426,7 +426,7 @@ _021EFF2E: bl sub_020283A4 add r1, r0, #0 ldr r0, [r5, #8] - bl CopyU16ArrayToString + bl String_CopyFromChars ldr r0, [r5] ldr r1, [r5, #8] add r2, r4, #0 @@ -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 diff --git a/arm9/overlays/05/asm/ov05_021F5C44.s b/arm9/overlays/05/asm/ov05_021F5C44.s index 28846904c..da33f0b37 100644 --- a/arm9/overlays/05/asm/ov05_021F5C44.s +++ b/arm9/overlays/05/asm/ov05_021F5C44.s @@ -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} diff --git a/arm9/overlays/06/asm/overlay_06.s b/arm9/overlays/06/asm/overlay_06.s index 45d198824..031c13c7b 100644 --- a/arm9/overlays/06/asm/overlay_06.s +++ b/arm9/overlays/06/asm/overlay_06.s @@ -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 @@ -22563,9 +22563,9 @@ ov06_02244820: ; 0x02244820 add r4, r0, #0 add r1, r5, #0 mov r2, #8 - bl CopyStringToU16Array + bl String_CopyToChars add r0, r4, #0 - bl String_Delete + bl String_Free add r0, r7, #0 bl DestroyMsgData add r0, r6, #0 @@ -31009,9 +31009,9 @@ _0224886C: add r5, r0, #0 add r1, sp, #4 mov r2, #0x80 - bl CopyStringToU16Array + bl String_CopyToChars 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 @@ -41862,7 +41862,7 @@ _0224DCEC: bl FillWindowPixelBuffer add r0, r4, #0 add r1, r6, #0 - bl StringDup + bl String_Clone str r0, [r5, #0x10] mov r3, #0 str r3, [sp] @@ -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] @@ -42272,7 +42272,7 @@ _0224E034: lsl r0, r0, #2 ldr r0, [r5, r0] ldr r1, [sp, #0x14] - bl StringDup + bl String_Clone add r1, r6, #0 add r1, #0xc4 str r0, [r1] @@ -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 diff --git a/arm9/overlays/07/asm/overlay_07.s b/arm9/overlays/07/asm/overlay_07.s index 78d801654..75be438c6 100644 --- a/arm9/overlays/07/asm/overlay_07.s +++ b/arm9/overlays/07/asm/overlay_07.s @@ -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] @@ -5062,7 +5062,7 @@ ov07_02214720: ; 0x02214720 ldr r0, [r0, #0x14] add r1, r5, #0 mov r2, #8 - bl CopyStringToU16Array + bl String_CopyToChars ldr r1, [sp, #0x10] ldr r3, [r4, #0x24] add r0, r5, #0 @@ -5114,7 +5114,7 @@ _022147BC: ldr r0, [r0, #0x14] add r1, r5, #0 mov r2, #8 - bl CopyStringToU16Array + bl String_CopyToChars ldr r1, [sp, #0x14] ldr r3, [r4, #0x24] add r0, r5, #0 @@ -5147,7 +5147,7 @@ _02214808: ldr r0, [r0, #0x14] add r1, r5, #0 mov r2, #8 - bl CopyStringToU16Array + bl String_CopyToChars ldr r1, [sp, #0x18] ldr r3, [r4, #0x24] add r0, r5, #0 @@ -5180,7 +5180,7 @@ _02214854: ldr r0, [r0, #0x14] add r1, r5, #0 mov r2, #8 - bl CopyStringToU16Array + bl String_CopyToChars ldr r1, [sp, #0x1c] ldr r3, [r4, #0x24] add r0, r5, #0 @@ -5215,11 +5215,11 @@ _022148A0: ldr r0, [r4, #0x18] add r1, r5, #0 mov r2, #8 - bl CopyStringToU16Array + bl String_CopyToChars ldr r0, [r4, #0x20] add r1, r7, #0 mov r2, #8 - bl CopyStringToU16Array + bl String_CopyToChars b _02214914 _022148EA: add r0, #0x29 @@ -5234,11 +5234,11 @@ _022148EA: ldr r0, [r4, #0x14] add r1, r5, #0 mov r2, #8 - bl CopyStringToU16Array + bl String_CopyToChars ldr r0, [r4, #0x1c] add r1, r7, #0 mov r2, #8 - bl CopyStringToU16Array + bl String_CopyToChars _02214914: str r6, [sp] ldr r0, [r4, #0x24] diff --git a/arm9/overlays/09/asm/overlay_09.s b/arm9/overlays/09/asm/overlay_09.s index 416ff2bdb..f3d3de022 100644 --- a/arm9/overlays/09/asm/overlay_09.s +++ b/arm9/overlays/09/asm/overlay_09.s @@ -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 diff --git a/arm9/overlays/11/asm/ov11_0222D5C0_3.s b/arm9/overlays/11/asm/ov11_0222D5C0_3.s index 5deaf0260..605a7caa3 100644 --- a/arm9/overlays/11/asm/ov11_0222D5C0_3.s +++ b/arm9/overlays/11/asm/ov11_0222D5C0_3.s @@ -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 diff --git a/arm9/overlays/11/asm/ov11_0222FF68.s b/arm9/overlays/11/asm/ov11_0222FF68.s index f5fd4b130..46c272825 100644 --- a/arm9/overlays/11/asm/ov11_0222FF68.s +++ b/arm9/overlays/11/asm/ov11_0222FF68.s @@ -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 diff --git a/arm9/overlays/11/asm/ov11_02232264.s b/arm9/overlays/11/asm/ov11_02232264.s index 1236ec086..37b1c4820 100644 --- a/arm9/overlays/11/asm/ov11_02232264.s +++ b/arm9/overlays/11/asm/ov11_02232264.s @@ -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 diff --git a/arm9/overlays/11/asm/ov11_02242B78.s b/arm9/overlays/11/asm/ov11_02242B78.s index 98028b957..3fd30de1f 100644 --- a/arm9/overlays/11/asm/ov11_02242B78.s +++ b/arm9/overlays/11/asm/ov11_02242B78.s @@ -1300,7 +1300,7 @@ _022435DC: add r4, #0x36 add r0, r3, #0 add r1, r4, #0 - bl CopyU16ArrayToString + bl String_CopyFromChars b _02243798 _022435E8: ldr r0, [r4, #0x4c] diff --git a/arm9/overlays/11/asm/ov11_02256C08.s b/arm9/overlays/11/asm/ov11_02256C08.s index 6435c3cef..7059f6688 100644 --- a/arm9/overlays/11/asm/ov11_02256C08.s +++ b/arm9/overlays/11/asm/ov11_02256C08.s @@ -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 diff --git a/arm9/overlays/11/asm/ov11_02258428.s b/arm9/overlays/11/asm/ov11_02258428.s index 5430fb72b..181104ad7 100644 --- a/arm9/overlays/11/asm/ov11_02258428.s +++ b/arm9/overlays/11/asm/ov11_02258428.s @@ -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] diff --git a/arm9/overlays/12/asm/overlay_12.s b/arm9/overlays/12/asm/overlay_12.s index aeabc7bf7..f20927f65 100644 --- a/arm9/overlays/12/asm/overlay_12.s +++ b/arm9/overlays/12/asm/overlay_12.s @@ -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] diff --git a/arm9/overlays/14/asm/overlay_14.s b/arm9/overlays/14/asm/overlay_14.s index 9c14c9786..971e41352 100644 --- a/arm9/overlays/14/asm/overlay_14.s +++ b/arm9/overlays/14/asm/overlay_14.s @@ -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 @@ -9282,9 +9282,9 @@ _021DBF6C: _021DBF8C: ldr r0, [r4, #0x18] ldr r1, [r4, #0x14] - bl StringCopy + bl String_Copy ldr r0, [r4, #0x14] - bl String_SetEmpty + bl String_Clear _021DBF9A: ldrh r1, [r4, #6] cmp r1, #0 @@ -9354,15 +9354,15 @@ ov14_021DBFF4: ; 0x021DBFF4 ldr r0, [r4, #0x28] beq _021DC02E ldr r1, [r6, #0x18] - bl StringCopy + bl String_Copy b _021DC034 _021DC02E: ldr r1, [r6, #0x14] - bl StringCopy + bl String_Copy _021DC034: ldr r0, [r4, #0x2c] ldr r1, [r6, #0x20] - bl StringCopy + bl String_Copy mov r1, #0x1a lsl r1, r1, #4 ldr r0, [sp] @@ -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: @@ -29199,7 +29199,7 @@ _021E5872: ldr r0, [r5, #0x74] mov r2, #3 mov r3, #0 - bl String16_FormatInteger + bl String_FormatInt mov r0, #0 ldr r1, [r5, #0x74] add r2, r0, #0 diff --git a/arm9/overlays/15/asm/overlay_15.s b/arm9/overlays/15/asm/overlay_15.s index a488a05d7..b6ee4a59a 100644 --- a/arm9/overlays/15/asm/overlay_15.s +++ b/arm9/overlays/15/asm/overlay_15.s @@ -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} @@ -4949,7 +4949,7 @@ ov15_021D9B04: ; 0x021D9B04 mov r1, #0x23 bl ov15_021D8720 str r0, [r4] - bl String_c_str + bl String_GetChars str r0, [r4, #4] ldrh r1, [r0] ldr r0, _021D9B2C ; =0x0000FFFE @@ -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 @@ -5041,7 +5041,7 @@ _021D9B9C: ldr r0, [sp] mov r1, ip add r2, r2, #1 - bl CopyU16ArrayToStringN + bl String_CopyNumChars mov r0, #0 pop {r3, r4, r5, r6, r7, pc} _021D9BB6: @@ -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 @@ -8617,7 +8617,7 @@ _021DB782: add r1, r2, r1 add r0, r5, #0 mov r2, #2 - bl CopyU16ArrayToStringN + bl String_CopyNumChars pop {r3, r4, r5, pc} .align 2, 0 _021DB794: .word ov15_021DBA4C diff --git a/arm9/overlays/16/asm/overlay_16.s b/arm9/overlays/16/asm/overlay_16.s index da145213a..e5529ac5f 100644 --- a/arm9/overlays/16/asm/overlay_16.s +++ b/arm9/overlays/16/asm/overlay_16.s @@ -1167,7 +1167,7 @@ ov16_021D7D9C: ; 0x021D7D9C mov r2, #3 mov r3, #2 add r4, r0, #0 - bl String16_FormatInteger + bl String_FormatInt ldr r2, [sp, #0x10] add r0, r7, #0 mov r1, #2 @@ -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 @@ -11571,7 +11571,7 @@ ov16_021DC958: ; 0x021DC958 add r1, r7, #0 mov r2, #3 mov r3, #2 - bl String16_FormatInteger + bl String_FormatInt mov r0, #0xaa str r0, [sp] mov r1, #0 @@ -11589,7 +11589,7 @@ ov16_021DC958: ; 0x021DC958 add r0, r4, #0 mov r2, #3 mov r3, #2 - bl String16_FormatInteger + bl String_FormatInt mov r0, #0xaa str r0, [sp] mov r1, #0 @@ -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] @@ -11651,7 +11651,7 @@ ov16_021DCA2C: ; 0x021DCA2C add r1, r7, #0 mov r2, #3 mov r3, #2 - bl String16_FormatInteger + bl String_FormatInt mov r0, #0xaa str r0, [sp] mov r1, #0 @@ -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] @@ -12840,7 +12840,7 @@ ov16_021DD370: ; 0x021DD370 add r0, r7, #0 mov r2, #3 mov r3, #2 - bl String16_FormatInteger + bl String_FormatInt mov r1, #0 str r1, [sp] mov r0, #0xff @@ -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 diff --git a/arm9/overlays/17/asm/overlay_17.s b/arm9/overlays/17/asm/overlay_17.s index 21f908a89..f0ea0bbdb 100644 --- a/arm9/overlays/17/asm/overlay_17.s +++ b/arm9/overlays/17/asm/overlay_17.s @@ -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 diff --git a/arm9/overlays/18/asm/overlay_18.s b/arm9/overlays/18/asm/overlay_18.s index a436de29f..65bb215b7 100644 --- a/arm9/overlays/18/asm/overlay_18.s +++ b/arm9/overlays/18/asm/overlay_18.s @@ -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 @@ -8495,13 +8495,13 @@ _0223D84E: cmp r1, #0 beq _0223D886 add r0, r6, #0 - bl StringCopy + bl String_Copy ldr r0, _0223D8A0 ; =0x02251388 ldr r0, [r0] 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 @@ -23489,7 +23489,7 @@ ov18_02244BB4: ; 0x02244BB4 add r1, r5, #0 add r1, #0x94 mov r2, #0x50 - bl CopyStringToU16Array + bl String_CopyToChars add r0, r5, #0 add r0, #0x94 ldrh r2, [r0] @@ -23528,7 +23528,7 @@ _02244C02: add r5, #0x84 ldr r0, [r5] ldr r1, [sp] - bl StringCopy + bl String_Copy mov r0, #1 pop {r3, r4, r5, r6, r7, pc} _02244C14: @@ -23542,7 +23542,7 @@ _02244C14: add r1, r5, #0 ldr r0, [r0] add r1, #0x94 - bl CopyU16ArrayToString + bl String_CopyFromChars add r0, r5, #0 add r0, #0x88 add r1, r6, #1 @@ -23550,7 +23550,7 @@ _02244C14: add r5, #0x94 lsl r1, r1, #1 add r1, r5, r1 - bl CopyU16ArrayToString + bl String_CopyFromChars mov r0, #2 pop {r3, r4, r5, r6, r7, pc} nop @@ -23604,7 +23604,7 @@ _02244C8A: add r1, #0x84 ldr r0, [r5, r0] ldr r1, [r1] - bl StringCopy + bl String_Copy ldr r0, [r7] add r0, r0, #1 str r0, [r7] @@ -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] diff --git a/arm9/overlays/38/asm/overlay_38.s b/arm9/overlays/38/asm/overlay_38.s index c2e7dd145..066c9dbe6 100644 --- a/arm9/overlays/38/asm/overlay_38.s +++ b/arm9/overlays/38/asm/overlay_38.s @@ -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] diff --git a/arm9/overlays/43/asm/overlay_43.s b/arm9/overlays/43/asm/overlay_43.s index 9415d9d5f..10311c33c 100644 --- a/arm9/overlays/43/asm/overlay_43.s +++ b/arm9/overlays/43/asm/overlay_43.s @@ -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} diff --git a/arm9/overlays/47/asm/overlay_47.s b/arm9/overlays/47/asm/overlay_47.s index 581e739fe..e45771590 100644 --- a/arm9/overlays/47/asm/overlay_47.s +++ b/arm9/overlays/47/asm/overlay_47.s @@ -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 @@ -1441,7 +1441,7 @@ _0225532C: ldr r0, [r5, #0x5c] ldr r1, [r7] add r3, r2, #0 - bl String16_FormatInteger + bl String_FormatInt str r4, [sp] mov r0, #0xff str r0, [sp, #4] diff --git a/arm9/overlays/49/asm/overlay_49.s b/arm9/overlays/49/asm/overlay_49.s index 0528adb16..80c6c0ddd 100644 --- a/arm9/overlays/49/asm/overlay_49.s +++ b/arm9/overlays/49/asm/overlay_49.s @@ -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 diff --git a/arm9/overlays/51/asm/overlay_51.s b/arm9/overlays/51/asm/overlay_51.s index b15dbb477..58ec546d7 100644 --- a/arm9/overlays/51/asm/overlay_51.s +++ b/arm9/overlays/51/asm/overlay_51.s @@ -1569,7 +1569,7 @@ _0225548C: bl sub_020254F0 add r1, r0, #0 add r0, r4, #0 - bl CopyU16ArrayToString + bl String_CopyFromChars add r0, r6, #0 add r1, r5, #0 bl sub_020254F8 @@ -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 @@ -1647,7 +1647,7 @@ _02255530: mov r0, #0x1c mul r0, r2 ldr r0, [r4, r0] - bl CopyU16ArrayToString + bl String_CopyFromChars ldr r0, [r5] mov r1, #0x1c add r2, r0, #0 diff --git a/arm9/overlays/53/asm/overlay_53.s b/arm9/overlays/53/asm/overlay_53.s index a5ba1bbef..77d670ac4 100644 --- a/arm9/overlays/53/asm/overlay_53.s +++ b/arm9/overlays/53/asm/overlay_53.s @@ -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 diff --git a/arm9/overlays/54/asm/overlay_54.s b/arm9/overlays/54/asm/overlay_54.s index 39a95ef62..a2e9dfa24 100644 --- a/arm9/overlays/54/asm/overlay_54.s +++ b/arm9/overlays/54/asm/overlay_54.s @@ -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 diff --git a/arm9/overlays/55/asm/overlay_55.s b/arm9/overlays/55/asm/overlay_55.s index fcac991b8..09eb33235 100644 --- a/arm9/overlays/55/asm/overlay_55.s +++ b/arm9/overlays/55/asm/overlay_55.s @@ -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 @@ -1818,7 +1818,7 @@ ov55_021D8370: ; 0x021D8370 add r0, #0xd4 ldr r0, [r0] ldr r1, [r1, #0x18] - bl StringCopy + bl String_Copy mov r1, #0xa b _021D83F0 _021D83A8: @@ -1914,7 +1914,7 @@ ov55_021D8440: ; 0x021D8440 add r0, #0xd8 ldr r0, [r0] ldr r1, [r1, #0x18] - bl StringCopy + bl String_Copy ldr r0, [r5] bl sub_02077AC4 mov r0, #0 @@ -1967,7 +1967,7 @@ ov55_021D84C8: ; 0x021D84C8 add r0, #0xd8 ldr r0, [r0] add r1, sp, #4 - bl String_atoi + bl String_AtoI str r0, [sp] ldr r0, [sp, #4] add r7, r1, #0 @@ -1979,7 +1979,7 @@ ov55_021D84C8: ; 0x021D84C8 add r0, r5, #0 add r0, #0xd4 ldr r0, [r0] - bl String_c_str + bl String_GetChars add r1, r0, #0 add r0, r4, #0 bl CopyPlayerName @@ -2081,7 +2081,7 @@ _021D85B2: add r0, #0xd8 ldr r0, [r0] add r1, sp, #8 - bl String_atoi + bl String_AtoI add r7, r0, #0 ldr r0, [sp, #4] add r6, r1, #0 @@ -2678,7 +2678,7 @@ ov55_021D8A28: ; 0x021D8A28 add r4, r6, #0 _021D8A46: ldr r0, [r5, #0x38] - bl String_SetEmpty + bl String_Clear add r0, r7, #0 add r1, r4, #0 bl sub_0202842C @@ -2689,7 +2689,7 @@ _021D8A46: bl sub_020283A4 add r1, r0, #0 ldr r0, [r5, #0x38] - bl CopyU16ArrayToString + bl String_CopyFromChars ldr r0, [sp] add r1, r4, #1 add r0, r0, r6 @@ -5090,11 +5090,11 @@ ov55_021D9E40: ; 0x021D9E40 bne _021D9EB8 ldr r0, [r0, #0x18] add r1, r5, #0 - bl CopyU16ArrayToString + bl String_CopyFromChars b _021D9EBE _021D9EB8: ldr r0, [r0, #0x18] - bl String_SetEmpty + bl String_Clear _021D9EBE: add r0, r6, #0 add sp, #4 @@ -5127,7 +5127,7 @@ ov55_021D9EC8: ; 0x021D9EC8 add r0, #0xd4 ldr r0, [r0] ldr r1, [r1, #0x18] - bl StringCopy + bl String_Copy ldr r0, [r5, #8] bl sub_020286EC mov r1, #0xf2 diff --git a/arm9/overlays/56/asm/overlay_56.s b/arm9/overlays/56/asm/overlay_56.s index 6c7c72adb..37985c8bb 100644 --- a/arm9/overlays/56/asm/overlay_56.s +++ b/arm9/overlays/56/asm/overlay_56.s @@ -795,7 +795,7 @@ _02212456: add r0, r5, #0 add r0, #0xd4 ldr r0, [r0] - bl CopyU16ArrayToString + bl String_CopyFromChars add r4, r4, #1 add r5, r5, #4 cmp r4, #0x20 @@ -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 @@ -2872,7 +2872,7 @@ _022134F2: mov r0, #0x56 lsl r0, r0, #2 ldr r0, [r4, r0] - bl CopyU16ArrayToString + bl String_CopyFromChars b _022135DC _0221350C: add r0, r4, #0 diff --git a/arm9/overlays/57/asm/overlay_57.s b/arm9/overlays/57/asm/overlay_57.s index 763a72646..63b47e8d7 100644 --- a/arm9/overlays/57/asm/overlay_57.s +++ b/arm9/overlays/57/asm/overlay_57.s @@ -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 @@ -2819,7 +2819,7 @@ _021D8AE0: add r1, r6, #0 add r0, r5, #0 add r1, #8 - bl CopyU16ArrayToString + bl String_CopyFromChars add r0, r7, #0 mov r2, #0 add r0, #0x10 @@ -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 @@ -3380,7 +3380,7 @@ ov57_021D8FD8: ; 0x021D8FD8 ldr r0, [sp, #0x28] ldr r1, [sp, #0x2c] ldr r3, [sp, #0x34] - bl String16_FormatInteger + bl String_FormatInt mov r0, #0 ldr r1, [sp, #0x28] add r2, r0, #0 @@ -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 diff --git a/arm9/overlays/58/asm/overlay_58.s b/arm9/overlays/58/asm/overlay_58.s index cd708f461..2023f5230 100644 --- a/arm9/overlays/58/asm/overlay_58.s +++ b/arm9/overlays/58/asm/overlay_58.s @@ -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 diff --git a/arm9/overlays/59/src/ov59_Intro.c b/arm9/overlays/59/src/ov59_Intro.c index 30b4922f9..5af1effd6 100644 --- a/arm9/overlays/59/src/ov59_Intro.c +++ b/arm9/overlays/59/src/ov59_Intro.c @@ -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: @@ -2349,7 +2349,7 @@ BOOL ov59_MasterController(ov59_IntroOverlayData *data) { case -2: case 2: - String_SetEmpty(data->playerStruct->name); + String_Clear(data->playerStruct->name); data->nextControllerCounter = 63; data->controllerCounter = 81; break; @@ -2449,8 +2449,8 @@ BOOL ov59_MasterController(ov59_IntroOverlayData *data) { msgNo = nameList[index].msgNo; } struct String *name = NewString_ReadMsgData(data->msgData, msgNo); - StringCopy(data->rivalStruct->name, name); - String_Delete(name); + String_Copy(data->rivalStruct->name, name); + String_Free(name); data->controllerCounter = 91; break; } @@ -2504,7 +2504,7 @@ BOOL ov59_MasterController(ov59_IntroOverlayData *data) { case -2: case 2: - String_SetEmpty(data->rivalStruct->name); + String_Clear(data->rivalStruct->name); data->controllerCounter = 88; break; } diff --git a/arm9/overlays/59/src/ov59_TV.c b/arm9/overlays/59/src/ov59_TV.c index 740c48d56..cfc277741 100644 --- a/arm9/overlays/59/src/ov59_TV.c +++ b/arm9/overlays/59/src/ov59_TV.c @@ -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; diff --git a/arm9/overlays/60/asm/overlay_60.s b/arm9/overlays/60/asm/overlay_60.s index efa7b344d..872664335 100644 --- a/arm9/overlays/60/asm/overlay_60.s +++ b/arm9/overlays/60/asm/overlay_60.s @@ -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] @@ -1018,7 +1018,7 @@ ov60_021D7D18: ; 0x021D7D18 str r1, [sp, #0xc] bl AddTextPrinterParameterized2 add r0, r5, #0 - bl String_SetEmpty + bl String_Clear ldr r1, _021D7DF0 ; =gGameVersion ldr r0, [r6, #0x20] ldrb r1, [r1] @@ -1042,7 +1042,7 @@ ov60_021D7D18: ; 0x021D7D18 add r7, #0x3c _021D7D7E: add r0, r5, #0 - bl String_SetEmpty + bl String_Clear ldr r0, [r6, #0x20] add r1, r4, #3 add r2, r5, #0 @@ -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 diff --git a/arm9/overlays/61/asm/overlay_61.s b/arm9/overlays/61/asm/overlay_61.s index 4cfffc7a6..ffb514a0e 100644 --- a/arm9/overlays/61/asm/overlay_61.s +++ b/arm9/overlays/61/asm/overlay_61.s @@ -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: @@ -1588,7 +1588,7 @@ _021D8164: str r0, [sp, #0x18] _021D8196: add r0, r5, #0 - bl String_SetEmpty + bl String_Clear ldr r0, [r4, #0x20] add r1, r6, #0 add r2, r5, #0 @@ -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: diff --git a/arm9/overlays/62/asm/overlay_62.s b/arm9/overlays/62/asm/overlay_62.s index 1e243f0b9..526d6f35f 100644 --- a/arm9/overlays/62/asm/overlay_62.s +++ b/arm9/overlays/62/asm/overlay_62.s @@ -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 @@ -3574,7 +3574,7 @@ _0222F0FE: add r0, r4, #0 mov r2, #3 mov r3, #1 - bl String16_FormatInteger + bl String_FormatInt mov r0, #0 str r0, [sp] mov r0, #0xff @@ -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 @@ -3642,7 +3642,7 @@ _0222F194: ldr r0, [sp, #0x10] mov r2, #3 str r3, [sp] - bl String16_FormatInteger + bl String_FormatInt mov r1, #0 str r1, [sp] mov r0, #0xff @@ -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 diff --git a/arm9/overlays/63/asm/ov63_021D74E0.s b/arm9/overlays/63/asm/ov63_021D74E0.s index a795d6657..cc3cef84b 100644 --- a/arm9/overlays/63/asm/ov63_021D74E0.s +++ b/arm9/overlays/63/asm/ov63_021D74E0.s @@ -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 diff --git a/arm9/overlays/64/asm/overlay_64.s b/arm9/overlays/64/asm/overlay_64.s index 4047bfb7d..c4673693c 100644 --- a/arm9/overlays/64/asm/overlay_64.s +++ b/arm9/overlays/64/asm/overlay_64.s @@ -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 diff --git a/arm9/overlays/65/asm/overlay_65.s b/arm9/overlays/65/asm/overlay_65.s index 31d873812..20e2b79a6 100644 --- a/arm9/overlays/65/asm/overlay_65.s +++ b/arm9/overlays/65/asm/overlay_65.s @@ -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] @@ -2165,7 +2165,7 @@ _021D85B4: add r1, r1, r5 bl ov65_021D847C ldr r0, [r4, #0x34] - bl String_SetEmpty + bl String_Clear ldr r0, [r4, #0x20] add r0, r0, r5 ldrb r2, [r0, #0x1f] @@ -2339,7 +2339,7 @@ ov65_021D8718: ; 0x021D8718 sub sp, #8 add r4, r0, #0 ldr r0, [r4, #0x34] - bl String_SetEmpty + bl String_Clear ldrb r1, [r4, #0x1a] ldr r2, [r4, #0x20] ldr r0, [r4, #0x28] @@ -2376,7 +2376,7 @@ ov65_021D8764: ; 0x021D8764 sub sp, #8 add r4, r0, #0 ldr r0, [r4, #0x34] - bl String_SetEmpty + bl String_Clear ldrb r1, [r4, #0x1a] ldr r2, [r4, #0x20] ldr r0, [r4, #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 @@ -3844,7 +3844,7 @@ ov65_021D92C4: ; 0x021D92C4 mov r1, #0xff bl FillWindowPixelBuffer ldr r0, [r4, #0x20] - bl String_SetEmpty + bl String_Clear mov r0, #1 str r0, [sp] mov r3, #2 diff --git a/arm9/overlays/66/asm/overlay_66.s b/arm9/overlays/66/asm/overlay_66.s index cf15d10bc..17a3e98e2 100644 --- a/arm9/overlays/66/asm/overlay_66.s +++ b/arm9/overlays/66/asm/overlay_66.s @@ -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] @@ -1299,7 +1299,7 @@ _021D7EF8: add r0, r6, #0 add r0, #0x88 ldr r0, [r0] - bl String_SetEmpty + bl String_Clear ldr r2, [r4, #0x18] ldr r3, [r4, #0x1c] add r0, r6, #0 @@ -1717,7 +1717,7 @@ ov66_021D820C: ; 0x021D820C ldr r6, [r5, #0x34] add r7, r2, #0 str r3, [sp, #0x10] - bl String_SetEmpty + bl String_Clear add r0, r4, #0 mov r1, #0 bl FillWindowPixelBuffer @@ -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 diff --git a/arm9/overlays/67/asm/overlay_67.s b/arm9/overlays/67/asm/overlay_67.s index bb8e10139..5132abc75 100644 --- a/arm9/overlays/67/asm/overlay_67.s +++ b/arm9/overlays/67/asm/overlay_67.s @@ -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} @@ -1692,10 +1692,10 @@ _021D822A: mov r3, #0x2a bl ReadMsgData_NewNarc_NewString add r6, r0, #0 - bl StringGetLength + bl String_GetLength add r5, r0, #0 add r0, r6, #0 - bl String_Delete + bl String_Free add r0, sp, #0x10 ldrh r0, [r0] mov r1, #1 @@ -1717,10 +1717,10 @@ _021D822A: add r2, r6, #0 bl StringExpandPlaceholders ldr r0, [r4, #0x58] - bl StringGetLength + bl String_GetLength add r5, r5, r0 add r0, r6, #0 - bl String_Delete + bl String_Free b _021D82BA _021D828A: add r2, sp, #0x10 @@ -1732,10 +1732,10 @@ _021D828A: mov r3, #0x2a bl ReadMsgData_NewNarc_NewString add r6, r0, #0 - bl StringGetLength + bl String_GetLength 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 @@ -3503,7 +3503,7 @@ ov67_021D9098: ; 0x021D9098 bl String_New add r1, r6, #0 add r4, r0, #0 - bl CopyU16ArrayToString + bl String_CopyFromChars mov r0, #1 str r0, [sp] mov r0, #2 @@ -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 diff --git a/arm9/overlays/68/asm/overlay_68.s b/arm9/overlays/68/asm/overlay_68.s index b54d003ed..0fef920b1 100644 --- a/arm9/overlays/68/asm/overlay_68.s +++ b/arm9/overlays/68/asm/overlay_68.s @@ -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 diff --git a/arm9/overlays/69/asm/overlay_69.s b/arm9/overlays/69/asm/overlay_69.s index e5d7041a6..3df652eda 100644 --- a/arm9/overlays/69/asm/overlay_69.s +++ b/arm9/overlays/69/asm/overlay_69.s @@ -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 @@ -2307,7 +2307,7 @@ ov69_0222E89C: ; 0x0222E89C add r5, r0, #0 ldr r0, [r5, #0x1c] add r4, r1, #0 - bl StringCountLines + bl String_CountLines mov r6, #0 str r0, [sp, #0x10] cmp r0, #0 @@ -2316,7 +2316,7 @@ _0222E8B2: ldr r0, [r5, #0x18] ldr r1, [r5, #0x1c] add r2, r6, #0 - bl StringGetLineN + bl String_CopyLine mov r0, #0 ldr r1, [r5, #0x18] add r2, r0, #0 diff --git a/arm9/overlays/70/asm/overlay_70.s b/arm9/overlays/70/asm/overlay_70.s index c1dfd9a6f..8ddf7baad 100644 --- a/arm9/overlays/70/asm/overlay_70.s +++ b/arm9/overlays/70/asm/overlay_70.s @@ -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] @@ -1219,7 +1219,7 @@ _021D7E5E: mov r0, #0x19 lsl r0, r0, #4 ldr r0, [r5, r0] - bl String_SetEmpty + bl String_Clear _021D7E68: mov r1, #0 str r1, [sp] diff --git a/arm9/overlays/71/asm/overlay_71.s b/arm9/overlays/71/asm/overlay_71.s index 18776fa8b..012dd450a 100644 --- a/arm9/overlays/71/asm/overlay_71.s +++ b/arm9/overlays/71/asm/overlay_71.s @@ -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 @@ -2940,7 +2940,7 @@ _0222EE14: add r0, r7, #0 mov r2, #3 mov r3, #0 - bl String16_FormatInteger + bl String_FormatInt mov r0, #0x1e str r0, [sp] ldr r0, [sp, #0x30] @@ -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 @@ -4433,7 +4433,7 @@ _0222FA60: bl sub_020283A4 add r1, r0, #0 add r0, r6, #0 - bl CopyU16ArrayToString + bl String_CopyFromChars ldr r0, _0222FAD0 ; =0x0000367C add r1, r6, #0 ldr r0, [r5, r0] @@ -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} diff --git a/arm9/overlays/73/asm/overlay_73.s b/arm9/overlays/73/asm/overlay_73.s index 17162b17b..7375ace1d 100644 --- a/arm9/overlays/73/asm/overlay_73.s +++ b/arm9/overlays/73/asm/overlay_73.s @@ -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 diff --git a/arm9/overlays/74/asm/overlay_74.s b/arm9/overlays/74/asm/overlay_74.s index bcb56c97e..784dcd057 100644 --- a/arm9/overlays/74/asm/overlay_74.s +++ b/arm9/overlays/74/asm/overlay_74.s @@ -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] @@ -1294,11 +1294,11 @@ _021D7EB8: lsl r1, r1, #2 add r1, r7, r1 ldr r1, [r1, #0x64] - bl StringCopy + bl String_Copy b _021D7F0C _021D7F06: add r1, r6, #0 - bl CopyU16ArrayToString + bl String_CopyFromChars _021D7F0C: ldr r0, [sp, #4] add r4, #0x10 @@ -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 @@ -1443,7 +1443,7 @@ ov74_021D8008: ; 0x021D8008 add r1, sp, #0x10 bl sub_0202A864 ldr r0, [r4, #0x30] - bl String_SetEmpty + bl String_Clear mov r1, #0 str r1, [sp] mov r0, #1 @@ -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 diff --git a/arm9/overlays/75/asm/overlay_75.s b/arm9/overlays/75/asm/overlay_75.s index 83a8ca4fa..88747b96b 100644 --- a/arm9/overlays/75/asm/overlay_75.s +++ b/arm9/overlays/75/asm/overlay_75.s @@ -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 diff --git a/arm9/overlays/76/asm/overlay_76.s b/arm9/overlays/76/asm/overlay_76.s index 53f349fdf..84c6fafaf 100644 --- a/arm9/overlays/76/asm/overlay_76.s +++ b/arm9/overlays/76/asm/overlay_76.s @@ -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 diff --git a/arm9/overlays/77/asm/overlay_77.s b/arm9/overlays/77/asm/overlay_77.s index 7af93b80e..35f2a8313 100644 --- a/arm9/overlays/77/asm/overlay_77.s +++ b/arm9/overlays/77/asm/overlay_77.s @@ -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] diff --git a/arm9/overlays/80/asm/overlay_80.s b/arm9/overlays/80/asm/overlay_80.s index 2ad497f4d..9db10870f 100644 --- a/arm9/overlays/80/asm/overlay_80.s +++ b/arm9/overlays/80/asm/overlay_80.s @@ -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 @@ -5013,7 +5013,7 @@ ov80_0222FD28: ; 0x0222FD28 add r6, r0, #0 add r0, r4, #0 add r1, r7, #0 - bl CopyU16ArrayToString + bl String_CopyFromChars mov r2, #0 ldr r0, _0222FD84 ; =0x000F0200 str r2, [sp] @@ -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 diff --git a/arm9/overlays/81/asm/overlay_81.s b/arm9/overlays/81/asm/overlay_81.s index 457be48e3..618c3b2e7 100644 --- a/arm9/overlays/81/asm/overlay_81.s +++ b/arm9/overlays/81/asm/overlay_81.s @@ -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 diff --git a/arm9/overlays/82/asm/overlay_82.s b/arm9/overlays/82/asm/overlay_82.s index 30772bbea..6f895e786 100644 --- a/arm9/overlays/82/asm/overlay_82.s +++ b/arm9/overlays/82/asm/overlay_82.s @@ -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 @@ -4265,7 +4265,7 @@ ov82_0222F694: ; 0x0222F694 add r1, r6, #0 add r2, r7, #0 mov r3, #2 - bl String16_FormatInteger + bl String_FormatInt mov r3, #1 ldr r0, _0222F6CC ; =0x00010200 str r3, [sp] @@ -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 diff --git a/arm9/overlays/83/asm/overlay_83.s b/arm9/overlays/83/asm/overlay_83.s index 6442c8fb3..60aec1b36 100644 --- a/arm9/overlays/83/asm/overlay_83.s +++ b/arm9/overlays/83/asm/overlay_83.s @@ -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 @@ -3362,9 +3362,9 @@ ov83_0222F074: ; 0x0222F074 add r7, r0, #0 add r1, r4, r1 mov r2, #0x24 - bl CopyStringToU16Array + bl String_CopyToChars add r0, r7, #0 - bl String_Delete + bl String_Free mov r0, #0xc bl ov83_02238EF4 add r7, r0, #0 @@ -3419,9 +3419,9 @@ ov83_0222F074: ; 0x0222F074 lsl r1, r1, #2 add r1, r4, r1 mov r2, #0xfa - bl CopyStringToU16Array + bl String_CopyToChars 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 @@ -6053,7 +6053,7 @@ ov83_022305A4: ; 0x022305A4 add r1, r6, #0 mov r2, #0x24 add r4, r0, #0 - bl CopyU16ArrayToStringN + bl String_CopyNumChars mov r0, #0 mov r1, #6 bl GetFontAttribute @@ -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 @@ -8558,7 +8558,7 @@ ov83_02231A4C: ; 0x02231A4C lsl r1, r1, #2 add r1, r2, r1 mov r2, #0x24 - bl CopyU16ArrayToStringN + bl String_CopyNumChars mov r3, #0 str r3, [sp] mov r0, #0xff @@ -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} @@ -8714,7 +8714,7 @@ ov83_02231B84: ; 0x02231B84 lsl r1, r1, #2 add r1, r2, r1 mov r2, #0xfa - bl CopyU16ArrayToStringN + bl String_CopyNumChars mov r3, #0 str r3, [sp] mov r0, #0xff @@ -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 @@ -15577,7 +15577,7 @@ _02235004: ldr r1, [r5, #0x38] add r7, r0, #0 mov r2, #0x40 - bl CopyU16ArrayToStringN + bl String_CopyNumChars add r0, r5, #0 add r1, r7, #0 add r2, r4, #0 @@ -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 @@ -17330,7 +17330,7 @@ _02235DAC: mov r2, #3 add r4, r0, #0 str r3, [sp] - bl String16_FormatInteger + bl String_FormatInt mov r0, #0 mvn r0, r0 str r0, [sp, #0x60] @@ -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 @@ -18165,7 +18165,7 @@ ov83_02236484: ; 0x02236484 bl String_New add r1, sp, #8 add r6, r0, #0 - bl CopyU16ArrayToString + bl String_CopyFromChars mov r1, #1 str r1, [sp] mov r0, #2 @@ -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 diff --git a/arm9/overlays/84/asm/overlay_84_thumb2.s b/arm9/overlays/84/asm/overlay_84_thumb2.s index cc0577edc..045f23531 100644 --- a/arm9/overlays/84/asm/overlay_84_thumb2.s +++ b/arm9/overlays/84/asm/overlay_84_thumb2.s @@ -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] diff --git a/arm9/overlays/85/asm/overlay_85.s b/arm9/overlays/85/asm/overlay_85.s index 02d23056f..507ff954e 100644 --- a/arm9/overlays/85/asm/overlay_85.s +++ b/arm9/overlays/85/asm/overlay_85.s @@ -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 diff --git a/arm9/overlays/86/asm/overlay_86.s b/arm9/overlays/86/asm/overlay_86.s index f63e3f84e..2bd643bc3 100644 --- a/arm9/overlays/86/asm/overlay_86.s +++ b/arm9/overlays/86/asm/overlay_86.s @@ -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 diff --git a/arm9/src/bag_view.c b/arm9/src/bag_view.c index 7194c1399..9be8a3d69 100644 --- a/arm9/src/bag_view.c +++ b/arm9/src/bag_view.c @@ -126,17 +126,17 @@ BOOL TryFormatRegisteredKeyItemUseMessage(SaveData *saveData, String *dest, u32 string = NewString_ReadMsgData(msgData, narc_0007_00099); // A Key Item in the Bag can be assigned to this button for instant use. } else if (itemId == ITEM_POINT_CARD) { string = NewString_ReadMsgData(msgData, narc_0007_00097); // Saved Battle Points: {STRVAR_1 53, 0}BP - BufferIntegerAsString(messageFormat, 0, GetNumBattlePoints(saveData), 4, PRINTING_MODE_LEFT_ALIGN, TRUE); + BufferIntegerAsString(messageFormat, 0, GetNumBattlePoints(saveData), 4, PADDING_MODE_NONE, TRUE); } else if (itemId == ITEM_SEAL_CASE) { string = NewString_ReadMsgData(msgData, narc_0007_00092); // Seals: {STRVAR_1 53, 0} - BufferIntegerAsString(messageFormat, 0, GetSealCount(saveData), 4, PRINTING_MODE_LEFT_ALIGN, TRUE); + BufferIntegerAsString(messageFormat, 0, GetSealCount(saveData), 4, PADDING_MODE_NONE, TRUE); } else if (itemId == ITEM_FASHION_CASE) { string = NewString_ReadMsgData(msgData, narc_0007_00093); // Accessories: {STRVAR_1 52, 0} Backdrops: {STRVAR_1 51, 1} - BufferIntegerAsString(messageFormat, 0, GetNumFashionAccessories(saveData), 3, PRINTING_MODE_LEFT_ALIGN, TRUE); - BufferIntegerAsString(messageFormat, 1, GetNumFashionBackgrounds(saveData), 2, PRINTING_MODE_LEFT_ALIGN, TRUE); + BufferIntegerAsString(messageFormat, 0, GetNumFashionAccessories(saveData), 3, PADDING_MODE_NONE, TRUE); + BufferIntegerAsString(messageFormat, 1, GetNumFashionBackgrounds(saveData), 2, PADDING_MODE_NONE, TRUE); } else if (itemId == ITEM_COIN_CASE) { string = NewString_ReadMsgData(msgData, narc_0007_00057); // Your Coins: {STRVAR_1 54, 0} - BufferIntegerAsString(messageFormat, 0, GetCoinCount(saveData), 5, PRINTING_MODE_LEFT_ALIGN, TRUE); + BufferIntegerAsString(messageFormat, 0, GetCoinCount(saveData), 5, PADDING_MODE_NONE, TRUE); } else { MessageFormat_Delete(messageFormat); DestroyMsgData(msgData); @@ -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; diff --git a/arm9/src/blackout.c b/arm9/src/blackout.c index b9eead3e3..6eabef230 100644 --- a/arm9/src/blackout.c +++ b/arm9/src/blackout.c @@ -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 { diff --git a/arm9/src/communication_error.c b/arm9/src/communication_error.c index b42daa61c..08c82aacf 100644 --- a/arm9/src/communication_error.c +++ b/arm9/src/communication_error.c @@ -140,11 +140,11 @@ void ShowCommunicationError(enum HeapID heapID, u32 error, u32 errorCode) { FillWindowPixelRect(&window, 0xF, 0, 0, 208, 144); DrawFrameAndWindow1(&window, FALSE, 0x01F7, 2); - BufferIntegerAsString(messageFormat, 0, errorCode, 5, PRINTING_MODE_LEADING_ZEROS, TRUE); + BufferIntegerAsString(messageFormat, 0, errorCode, 5, PADDING_MODE_ZEROES, TRUE); 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(); diff --git a/arm9/src/easy_chat.c b/arm9/src/easy_chat.c index 0e1f3518a..7d37c3844 100644 --- a/arm9/src/easy_chat.c +++ b/arm9/src/easy_chat.c @@ -116,7 +116,7 @@ void GetECWordIntoStringByIndex(u32 ecWord, String *dest) { category = sNarcMsgBanks[category]; ReadMsgData_NewNarc_ExistingString(NARC_MSGDATA_MSG, category, msgNo, HEAP_ID_DEFAULT, dest); } else { - String_SetEmpty(dest); + String_Clear(dest); } } diff --git a/arm9/src/error_message_reset.c b/arm9/src/error_message_reset.c index 75c70d323..e6acf9daa 100644 --- a/arm9/src/error_message_reset.c +++ b/arm9/src/error_message_reset.c @@ -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); diff --git a/arm9/src/font.c b/arm9/src/font.c index 399c77c4b..072b2d324 100644 --- a/arm9/src/font.c +++ b/arm9/src/font.c @@ -6,8 +6,8 @@ #include "gf_gfx_loader.h" #include "render_text.h" -#include "string16.h" #include "string_control_code.h" +#include "string_gf.h" #include "text.h" #include "unk_02021590.h" @@ -110,7 +110,7 @@ u32 sub_02002DE0(u32 param0, u16 *str, u32 param2) { u32 sub_02002E14(u32 param0, struct String *str, u32 param2) { GF_ASSERT(UNK_02106FC8->unk94[param0] != NULL); - return GetStringWidth(UNK_02106FC8->unk94[param0], String_c_str(str), param2); + return GetStringWidth(UNK_02106FC8->unk94[param0], String_GetChars(str), param2); } s32 GetFontAttribute(u8 fontId, s32 attr) { @@ -156,7 +156,7 @@ void LoadFontPal1(enum GFPalLoadLocation location, enum GFPalSlotOffset palSlotO u32 FontID_String_GetWidthMultiline(u32 param0, struct String *str, u32 param2) { GF_ASSERT(UNK_02106FC8->unk94[param0] != NULL); - return GetStringWidthMultiline(UNK_02106FC8->unk94[param0], String_c_str(str), param2); + return GetStringWidthMultiline(UNK_02106FC8->unk94[param0], String_GetChars(str), param2); } u32 sub_02002F40(u32 param0, struct String *str, u32 param2, u32 param3) { @@ -189,12 +189,12 @@ u32 sub_02002F58(const u16 *str) { } u32 sub_02002F90(struct String *str) { - return sub_02002F58(String_c_str(str)); + return sub_02002F58(String_GetChars(str)); } s32 sub_02002F9C(u32 param0, struct String *str) { GF_ASSERT(UNK_02106FC8->unk94[param0] != NULL); return StringGetWidth_SingleLine_HandleClearToControlCode( - UNK_02106FC8->unk94[param0], String_c_str(str)); + UNK_02106FC8->unk94[param0], String_GetChars(str)); } diff --git a/arm9/src/hall_of_fame.c b/arm9/src/hall_of_fame.c index 4785cb2e5..b93733e34 100644 --- a/arm9/src/hall_of_fame.c +++ b/arm9/src/hall_of_fame.c @@ -8,7 +8,7 @@ #include "party.h" #include "pokemon.h" #include "save.h" -#include "string16.h" +#include "string_gf.h" u32 Save_HOF_sizeof(void) { return sizeof(struct HallOfFame); @@ -42,9 +42,9 @@ void Save_HOF_RecordParty(struct HallOfFame *hof, struct Party *party, RTCDate * hof_party->party[j].moves[3] = (u16)GetMonData(mon, MON_DATA_MOVE4, NULL); if (str != NULL) { GetMonData(mon, MON_DATA_NICKNAME_STRING, str); - CopyStringToU16Array(str, hof_party->party[j].nickname, POKEMON_NAME_LENGTH + 1); + String_CopyToChars(str, hof_party->party[j].nickname, POKEMON_NAME_LENGTH + 1); GetMonData(mon, MON_DATA_OT_NAME_STRING, str); - CopyStringToU16Array(str, hof_party->party[j].otname, PLAYER_NAME_LENGTH + 1); + String_CopyToChars(str, hof_party->party[j].otname, PLAYER_NAME_LENGTH + 1); } else { hof_party->party[j].nickname[0] = EOS; hof_party->party[j].otname[0] = EOS; @@ -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); } } } @@ -116,8 +116,8 @@ void Save_HOF_GetMonStatsByIndexPair(struct HallOfFame *hof, int a1, int a2, str dest->personality = mon->personality; dest->otid = mon->otid; dest->form = mon->form; - CopyU16ArrayToString(dest->nickname, mon->nickname); - CopyU16ArrayToString(dest->otname, mon->otname); + String_CopyFromChars(dest->nickname, mon->nickname); + String_CopyFromChars(dest->otname, mon->otname); for (int i = 0; i < 4; i++) { dest->moves[i] = mon->moves[i]; } diff --git a/arm9/src/list_menu_items.c b/arm9/src/list_menu_items.c index a470e1314..d12b9ed54 100644 --- a/arm9/src/list_menu_items.c +++ b/arm9/src/list_menu_items.c @@ -39,7 +39,7 @@ void ListMenuItems_AddItem(struct ListMenuItem *items, struct String *str, s32 v enum HeapID heapID; struct ListMenuItem *newItem = ListMenuItems_SeekEnd(items, &heapID); if (newItem != NULL) { - newItem->text = StringDup(str, heapID); + newItem->text = String_Clone(str, heapID); newItem->value = value; } } @@ -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; } } diff --git a/arm9/src/mail_message.c b/arm9/src/mail_message.c index ff077136a..64cdefe4e 100644 --- a/arm9/src/mail_message.c +++ b/arm9/src/mail_message.c @@ -116,7 +116,7 @@ u32 MailMsg_NumFields(u16 bank, u16 num) { GF_ASSERT(bank < NELEMS(sMessageBanks)); GF_ASSERT(num < MailMsg_NumMsgsInBank(bank)); str = ReadMsgData_NewNarc_NewString(NARC_MSGDATA_MSG, sMessageBanks[bank], num, HEAP_ID_DEFAULT); - cstr = String_c_str(str); + cstr = String_GetChars(str); count = 0; while (*cstr != EOS) { if (*cstr == EXT_CTRL_CODE_BEGIN) { @@ -128,7 +128,7 @@ u32 MailMsg_NumFields(u16 bank, u16 num) { cstr++; } } - String_Delete(str); + String_Free(str); return count; } diff --git a/arm9/src/message_format.c b/arm9/src/message_format.c index 739984641..5f8a8042b 100644 --- a/arm9/src/message_format.c +++ b/arm9/src/message_format.c @@ -16,8 +16,8 @@ #include "player_data.h" #include "pokemon.h" #include "pokemon_storage_system.h" -#include "string16.h" #include "string_control_code.h" +#include "string_gf.h" #include "text.h" #include "trainer_data.h" #include "unk_02015CC0.h" @@ -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); @@ -103,7 +103,7 @@ void SetStringAsPlaceholder(MessageFormat *messageFormat, u32 idx, struct String if (attrs != NULL) { messageFormat->fields[idx].attrs = *attrs; } - StringCopy(messageFormat->fields[idx].msg, str); + String_Copy(messageFormat->fields[idx].msg, str); } } @@ -114,13 +114,13 @@ void BufferString(MessageFormat *messageFormat, u32 idx, struct String *str, u32 void BufferPlayersName(MessageFormat *messageFormat, u32 idx, PlayerProfile *profile) { u16 *name = PlayerProfile_GetNamePtr(profile); - CopyU16ArrayToString(messageFormat->buffer, name); + String_CopyFromChars(messageFormat->buffer, name); SetStringAsPlaceholder(messageFormat, idx, messageFormat->buffer, NULL); } void BufferRivalsName(MessageFormat *messageFormat, u32 idx, struct SaveData *save) { u16 *name = GetRivalNamePtr(sub_02024EC0(save)); - CopyU16ArrayToString(messageFormat->buffer, name); + String_CopyFromChars(messageFormat->buffer, name); SetStringAsPlaceholder(messageFormat, idx, messageFormat->buffer, NULL); } @@ -164,8 +164,8 @@ void BufferBoxMonOTName(MessageFormat *messageFormat, u32 idx, struct BoxPokemon SetStringAsPlaceholder(messageFormat, idx, messageFormat->buffer, NULL); } -void BufferIntegerAsString(MessageFormat *messageFormat, u32 idx, s32 num, u32 ndigits, enum PrintingMode printingMode, BOOL whichCharset) { - String16_FormatInteger(messageFormat->buffer, num, ndigits, printingMode, whichCharset); +void BufferIntegerAsString(MessageFormat *messageFormat, u32 idx, s32 num, u32 ndigits, enum PaddingMode paddingMode, BOOL whichCharset) { + String_FormatInt(messageFormat->buffer, num, ndigits, paddingMode, (enum CharsetMode)whichCharset); SetStringAsPlaceholder(messageFormat, idx, messageFormat->buffer, NULL); } @@ -330,7 +330,7 @@ void BufferTrainerName(MessageFormat *messageFormat, u32 idx, u32 msgno) { } void BufferTrainerNameFromDataStruct(MessageFormat *messageFormat, u32 idx, Trainer *trdata) { - CopyU16ArrayToString(messageFormat->buffer, trdata->name); + String_CopyFromChars(messageFormat->buffer, trdata->name); SetStringAsPlaceholder(messageFormat, idx, messageFormat->buffer, NULL); } @@ -443,7 +443,7 @@ void BufferGenderSymbol(MessageFormat *messageFormat, u32 idx, u32 gender) { ReadMsgDataIntoString(msgData, narc_0199_00069, messageFormat->buffer); // ♀ break; default: - String_SetEmpty(messageFormat->buffer); + String_Clear(messageFormat->buffer); break; } SetStringAsPlaceholder(messageFormat, idx, messageFormat->buffer, NULL); @@ -581,9 +581,9 @@ void BufferGroupName(MessageFormat *messageFormat, struct SaveData *save, u32 r5 u8 sp10 = sub_020287F8(r6, r5); u8 r7 = sub_02028804(r6, r5); struct String *r4 = String_New(64, HEAP_ID_4); - CopyU16ArrayToString(r4, sub_020287A8(r6, r5, sp28)); + String_CopyFromChars(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) { @@ -599,35 +599,35 @@ void BufferMonthNameAbbr(MessageFormat *messageFormat, u32 idx, u32 month) { } void MessageFormat_UpperFirstChar(MessageFormat *messageFormat, u32 idx) { - StrUpperFirstChar(messageFormat->fields[idx].msg); + String_UpperFirstChar(messageFormat->fields[idx].msg); } void StringExpandPlaceholders(MessageFormat *messageFormat, struct String *dest, struct String *src) { - const u16 *cstr = String_c_str(src); - String_SetEmpty(dest); + const u16 *cstr = String_GetChars(src); + String_Clear(dest); while (*cstr != EOS) { if (*cstr == EXT_CTRL_CODE_BEGIN) { if (MsgArray_ControlCodeIsStrVar(cstr)) { u32 idx = MsgArray_ControlCodeGetField(cstr, 0); GF_ASSERT(idx < messageFormat->count); - StringCat_HandleTrainerName(dest, messageFormat->fields[idx].msg); + String_ConcatTrainerName(dest, messageFormat->fields[idx].msg); cstr = MsgArray_SkipControlCode(cstr); } else { const u16 *before = cstr; cstr = MsgArray_SkipControlCode(cstr); while (before < cstr) { - StrAddChar(dest, *before++); + String_AppendChar(dest, *before++); } } } else { - StrAddChar(dest, *cstr++); + String_AppendChar(dest, *cstr++); } } } void MessageFormat_ResetBuffers(MessageFormat *messageFormat) { for (int i = 0; i < messageFormat->count; i++) { - String_SetEmpty(messageFormat->fields[i].msg); + String_Clear(messageFormat->fields[i].msg); } } @@ -686,7 +686,7 @@ void sub_0200B9A8(struct UnkStruct_0200B870 *a0, int a1, struct Window *a2, int BlitBitmapRectToWindow(a2, a0->unk_4->pRawData + UNK_020ECE6C[a1][0], 0, 0, UNK_020ECE6C[a1][1], 8, (u16)a3, (u16)a4, UNK_020ECE6C[a1][1], 8); } -void sub_0200B9EC(struct UnkStruct_0200B870 *string, u32 value, u32 n, enum PrintingMode mode, struct Window *window, int x, int y) { +void sub_0200B9EC(struct UnkStruct_0200B870 *string, u32 value, u32 n, enum PaddingMode mode, struct Window *window, int x, int y) { ConvertUIntToDecimalString(string->data, value, mode, n); for (int i = 0; string->data[i] != EOS; i++) { if (string->data[i] >= CHAR_JP_0 && string->data[i] <= CHAR_JP_9) { diff --git a/arm9/src/msgdata.c b/arm9/src/msgdata.c index 60f846853..d42c47ed6 100644 --- a/arm9/src/msgdata.c +++ b/arm9/src/msgdata.c @@ -7,7 +7,7 @@ #include "MI_memory.h" #include "filesystem.h" #include "heap.h" -#include "string16.h" +#include "string_gf.h" static void *LoadSingleElementFromNarc(NarcId narc_id, s32 file_id, enum HeapID heapID); static void FreeMsgDataRawData(void *data); @@ -88,12 +88,12 @@ static void ReadMsgData_ExistingTable_ExistingString(struct MsgDataTable *table, if (buf != NULL) { MI_CpuCopy16((char *)table + alloc.offset, buf, 2 * alloc.length); Decrypt2(buf, alloc.length, num); - CopyU16ArrayToStringN(dest, buf, alloc.length); + String_CopyNumChars(dest, buf, alloc.length); Heap_Free(buf); } } else { GF_ASSERT(FALSE); - String_SetEmpty(dest); + String_Clear(dest); } } @@ -110,7 +110,7 @@ static struct String *ReadMsgData_ExistingTable_NewString(struct MsgDataTable *t Decrypt2(buf, alloc.length, num); dest = String_New(alloc.length, heapID); if (dest != NULL) { - CopyU16ArrayToStringN(dest, buf, alloc.length); + String_CopyNumChars(dest, buf, alloc.length); } Heap_Free(buf); return dest; @@ -146,13 +146,13 @@ static void ReadMsgData_ExistingNarc_ExistingString(NARC *narc, u32 group, u32 n if (buf != NULL) { NARC_ReadFromMember(narc, group, alloc.offset, size, buf); Decrypt2(buf, alloc.length, num); - CopyU16ArrayToStringN(dest, buf, alloc.length); + String_CopyNumChars(dest, buf, alloc.length); Heap_Free(buf); return; } } else { GF_ASSERT(FALSE); - String_SetEmpty(dest); + String_Clear(dest); } } @@ -186,7 +186,7 @@ static struct String *ReadMsgData_ExistingNarc_NewString(NARC *narc, u32 group, if (buf != NULL) { NARC_ReadFromMember(narc, group, alloc.offset, size, buf); Decrypt2(buf, alloc.length, num); - CopyU16ArrayToStringN(dest, buf, alloc.length); + String_CopyNumChars(dest, buf, alloc.length); Heap_Free(buf); } } @@ -299,10 +299,10 @@ struct String *ReadMsgData_ExpandPlaceholders(MessageFormat *messageFormat, stru r5 = NewString_ReadMsgData(msgData, msgno); if (r5 != NULL) { StringExpandPlaceholders(messageFormat, r4, r5); - ret = StringDup(r4, heapID); - String_Delete(r5); + ret = String_Clone(r4, heapID); + String_Free(r5); } - String_Delete(r4); + String_Free(r4); } return ret; } diff --git a/arm9/src/player_data.c b/arm9/src/player_data.c index 493e751bb..a603fb249 100644 --- a/arm9/src/player_data.c +++ b/arm9/src/player_data.c @@ -7,7 +7,7 @@ #include "heap.h" #include "options.h" #include "save.h" -#include "string16.h" +#include "string_gf.h" void PlayerProfile_Init(PlayerProfile *data); @@ -64,7 +64,7 @@ void CopyPlayerName(u16 *dest, PlayerProfile *data) { } void PlayerName_StringToFlat(PlayerProfile *data, struct String *str) { - CopyStringToU16Array(str, data->playerName, PLAYER_NAME_LENGTH + 1); + String_CopyToChars(str, data->playerName, PLAYER_NAME_LENGTH + 1); } u16 *PlayerProfile_GetNamePtr(PlayerProfile *data) { @@ -72,7 +72,7 @@ u16 *PlayerProfile_GetNamePtr(PlayerProfile *data) { } void PlayerName_FlatToString(PlayerProfile *data, struct String *str) { - CopyU16ArrayToString(str, data->playerName); + String_CopyFromChars(str, data->playerName); } struct String *PlayerProfile_GetPlayerName_NewString(PlayerProfile *data, enum HeapID heapID) { diff --git a/arm9/src/pokemon.c b/arm9/src/pokemon.c index 887e30dbe..578db7561 100644 --- a/arm9/src/pokemon.c +++ b/arm9/src/pokemon.c @@ -818,10 +818,10 @@ u32 GetBoxMonDataInternal(struct BoxPokemon *boxmon, int attr, void *dest) { case MON_DATA_NICKNAME_STRING: if (boxmon->checksum_fail) { struct String *buffer = GetSpeciesName(SPECIES_MANAPHY_EGG, HEAP_ID_DEFAULT); - StringCopy(dest, buffer); - String_Delete(buffer); + String_Copy(dest, buffer); + String_Free(buffer); } else { - CopyU16ArrayToString(dest, blockC->nickname); + String_CopyFromChars(dest, blockC->nickname); } break; case MON_DATA_UNUSED_120: @@ -865,7 +865,7 @@ u32 GetBoxMonDataInternal(struct BoxPokemon *boxmon, int attr, void *dest) { dest16[ret] = EOS; } break; case MON_DATA_OT_NAME_STRING: - CopyU16ArrayToString(dest, blockD->otTrainerName); + String_CopyFromChars(dest, blockD->otTrainerName); break; case MON_DATA_EGG_YEAR: ret = blockD->dateEggReceived[0]; @@ -1259,11 +1259,11 @@ void SetBoxMonDataInternal(struct BoxPokemon *boxmon, int attr, void *value) { break; case MON_DATA_NICKNAME_STRING_AND_FLAG: GetSpeciesNameIntoArray(blockA->species, HEAP_ID_DEFAULT, namebuf2); - CopyStringToU16Array(value, namebuf3, POKEMON_NAME_LENGTH + 1); + String_CopyToChars(value, namebuf3, POKEMON_NAME_LENGTH + 1); blockB->isNicknamed = StringNotEqual(namebuf2, namebuf3); // fallthrough case MON_DATA_NICKNAME_STRING: - CopyStringToU16Array(value, blockC->nickname, POKEMON_NAME_LENGTH + 1); + String_CopyToChars(value, blockC->nickname, POKEMON_NAME_LENGTH + 1); break; case MON_DATA_UNUSED_120: blockC->Unused = VALUE(u8); @@ -1307,7 +1307,7 @@ void SetBoxMonDataInternal(struct BoxPokemon *boxmon, int attr, void *value) { } break; case MON_DATA_OT_NAME_STRING: - CopyStringToU16Array(value, blockD->otTrainerName, PLAYER_NAME_LENGTH + 1); + String_CopyToChars(value, blockD->otTrainerName, PLAYER_NAME_LENGTH + 1); break; case MON_DATA_EGG_YEAR: blockD->dateEggReceived[0] = VALUE(u8); @@ -1361,8 +1361,8 @@ void SetBoxMonDataInternal(struct BoxPokemon *boxmon, int attr, void *value) { break; case MON_DATA_SPECIES_NAME: speciesName = GetSpeciesName(blockA->species, HEAP_ID_DEFAULT); - CopyStringToU16Array(speciesName, blockC->nickname, POKEMON_NAME_LENGTH + 1); - String_Delete(speciesName); + String_CopyToChars(speciesName, blockC->nickname, POKEMON_NAME_LENGTH + 1); + String_Free(speciesName); break; } #undef VALUE @@ -3470,8 +3470,8 @@ BOOL sub_0206A9AC(struct BoxPokemon *boxmon, PlayerProfile *sb2, enum HeapID hea if (myId == otId && myGender == otGender && String_Compare(r7, r6) == 0) { ret = TRUE; } - String_Delete(r6); - String_Delete(r7); + String_Free(r6); + String_Free(r7); return ret; } diff --git a/arm9/src/pokemon_storage_system.c b/arm9/src/pokemon_storage_system.c index 019748027..edc890ced 100644 --- a/arm9/src/pokemon_storage_system.c +++ b/arm9/src/pokemon_storage_system.c @@ -7,7 +7,7 @@ #include "msgdata.h" #include "pokemon.h" #include "save.h" -#include "string16.h" +#include "string_gf.h" void PCStorage_Init(struct PCStorage *pc) { PCStorage_InitializeBoxes(pc); @@ -193,7 +193,7 @@ void PCStorage_GetBoxName(struct PCStorage *pc, int boxno, struct String *ret) { boxno = (int)pc->curBox; } if (boxno < NUM_BOXES) { - CopyU16ArrayToString(ret, pc->names[boxno]); + String_CopyFromChars(ret, pc->names[boxno]); return; } GF_ASSERT(0); @@ -204,7 +204,7 @@ void PCStorage_SetBoxName(struct PCStorage *pc, int boxno, struct String *src) { boxno = (int)pc->curBox; } if (boxno < NUM_BOXES) { - CopyStringToU16Array(src, pc->names[boxno], BOX_NAME_LENGTH); + String_CopyToChars(src, pc->names[boxno], BOX_NAME_LENGTH); Save_SetDirtyBit(); } } diff --git a/arm9/src/save_data_read_error.c b/arm9/src/save_data_read_error.c index 25c3b23b9..8fb88a79c 100644 --- a/arm9/src/save_data_read_error.c +++ b/arm9/src/save_data_read_error.c @@ -112,7 +112,7 @@ void ShowSaveDataReadError(enum HeapID heapID) { ReadMsgDataIntoString(msg_data, narc_0005_00000, str); // The data could not be read. Please turn off the power... AddTextPrinterParameterized(&window, 0, str, 0, 0, 0, NULL); - String_Delete(str); + String_Free(str); GfGfx_BothDispOn(); SetMasterBrightnessNeutral(PM_LCD_TOP); @@ -173,7 +173,7 @@ void ShowGBACartRemovedError(enum HeapID heapID) { ReadMsgDataIntoString(msg_data, narc_0005_00001, str); // Error reading data. The GBA Game Pak was removed... AddTextPrinterParameterized(&window, 0, str, 0, 0, 0, NULL); - String_Delete(str); + String_Free(str); GfGfx_BothDispOn(); SetMasterBrightnessNeutral(PM_LCD_TOP); diff --git a/arm9/src/save_data_write_error.c b/arm9/src/save_data_write_error.c index bf76ecd88..2a5e4fea5 100644 --- a/arm9/src/save_data_write_error.c +++ b/arm9/src/save_data_write_error.c @@ -120,7 +120,7 @@ void ShowSaveDataWriteError(enum HeapID heapID, u32 err_no) { ReadMsgDataIntoString(msg_data, msg_no, str); AddTextPrinterParameterized(&window, 0, str, 0, 0, 0, NULL); - String_Delete(str); + String_Free(str); GfGfx_BothDispOn(); SetMasterBrightnessNeutral(PM_LCD_TOP); diff --git a/arm9/src/scrcmd.c b/arm9/src/scrcmd.c index 5f660c3fd..dfb7180b7 100644 --- a/arm9/src/scrcmd.c +++ b/arm9/src/scrcmd.c @@ -4671,8 +4671,8 @@ BOOL ScrCmd_CompareMysteryGiftEasyChatInput(ScriptContext *ctx) { // 02AA String *userInput = ReadMsgData_ExpandPlaceholders(messageFormat, msgData, narc_0327_00001, HEAP_ID_32); String *targetString = NewString_ReadMsgData(msgData, narc_0327_00000); *var = String_Compare(userInput, targetString) == FALSE; - String_Delete(userInput); - String_Delete(targetString); + String_Free(userInput); + String_Free(targetString); DestroyMsgData(msgData); MessageFormat_Delete(messageFormat); return FALSE; diff --git a/arm9/src/scrcmd_3.c b/arm9/src/scrcmd_3.c index 8f2f7aaba..3eb4be7eb 100644 --- a/arm9/src/scrcmd_3.c +++ b/arm9/src/scrcmd_3.c @@ -110,7 +110,7 @@ BOOL ScrCmd_Unk00FA(ScriptContext *ctx) { *miscDataPtr = sub_02081214(&unk); - String_Delete(str); + String_Free(str); return FALSE; } @@ -167,7 +167,7 @@ BOOL ScrCmd_Unk00FF(ScriptContext *ctx) { u16 num = ScriptGetVar(ctx); u16 idx = ScriptGetVar(ctx); - BufferIntegerAsString(*msgFormat, idx, num, 1, PRINTING_MODE_LEFT_ALIGN, TRUE); + BufferIntegerAsString(*msgFormat, idx, num, 1, PADDING_MODE_NONE, TRUE); return FALSE; } diff --git a/arm9/src/scrcmd_names.c b/arm9/src/scrcmd_names.c index e36139162..b8dbe87cd 100644 --- a/arm9/src/scrcmd_names.c +++ b/arm9/src/scrcmd_names.c @@ -131,7 +131,7 @@ BOOL ScrCmd_Unk00D5(ScriptContext *ctx) // 00D5 - todo: BufferNumber? TextNumber u16 unk = ScriptGetVar(ctx); u32 digits = sub_02054C14(unk); - BufferIntegerAsString(*messageFormat, idx, unk, digits, PRINTING_MODE_RIGHT_ALIGN, TRUE); + BufferIntegerAsString(*messageFormat, idx, unk, digits, PADDING_MODE_SPACES, TRUE); return FALSE; } @@ -141,13 +141,13 @@ BOOL ScrCmd_Unk0280(ScriptContext *ctx) // 0280 - todo: BufferNumberSpecial? nee MessageFormat **messageFormat = FieldSysGetAttrAddr(ctx->fieldSystem, SCRIPTENV_MESSAGE_FORMAT); u8 idx = ScriptReadByte(ctx); u16 unk = ScriptGetVar(ctx); - enum PrintingMode printingMode = (enum PrintingMode)ScriptReadByte(ctx); + enum PaddingMode paddingMode = (enum PaddingMode)ScriptReadByte(ctx); u8 digits = ScriptReadByte(ctx); - if (printingMode == PRINTING_MODE_LEFT_ALIGN) { + if (paddingMode == PADDING_MODE_NONE) { digits = (u8)sub_02054C14(unk); } - BufferIntegerAsString(*messageFormat, idx, unk, digits, printingMode, TRUE); + BufferIntegerAsString(*messageFormat, idx, unk, digits, paddingMode, TRUE); return FALSE; } @@ -230,7 +230,7 @@ BOOL ScrCmd_Unk00DA(ScriptContext *ctx) // 00DA - todo: BufferPokemonSpeciesName String *str = sub_02040AE4(msg_no, HEAP_ID_4); BufferString(*messageFormat, idx, str, unk1, unk2, 2); - String_Delete(str); + String_Free(str); return FALSE; } @@ -253,7 +253,7 @@ BOOL ScrCmd_GetPlayerStarterName(ScriptContext *ctx) // 00DB - todo: BufferPlaye String *str = sub_02040AE4(msg_no, HEAP_ID_4); BufferString(*messageFormat, idx, str, 0, 1, 2); - String_Delete(str); + String_Free(str); return FALSE; } @@ -267,7 +267,7 @@ BOOL ScrCmd_GetRivalStarterName(ScriptContext *ctx) // 00DC - todo: BufferRivalS String *str = sub_02040AE4(msg_no, HEAP_ID_4); BufferString(*messageFormat, idx, str, 0, 1, 2); - String_Delete(str); + String_Free(str); return FALSE; } @@ -281,7 +281,7 @@ BOOL ScrCmd_GetCounterpartStarterName(ScriptContext *ctx) // 00DD - todo: Buffer String *str = sub_02040AE4(msg_no, HEAP_ID_4); BufferString(*messageFormat, idx, str, 0, 1, 2); - String_Delete(str); + String_Free(str); return FALSE; } @@ -328,7 +328,7 @@ BOOL ScrCmd_GetMapName(ScriptContext *ctx) // 00E2 - todo: BufferMapName? sub_02064E60(map_no, HEAP_ID_4, str); BufferString(*messageFormat, idx, str, 0, 1, 2); - String_Delete(str); + String_Free(str); return FALSE; } @@ -342,7 +342,7 @@ BOOL ScrCmd_GetBerryName(ScriptContext *ctx) // 017B - todo: BufferBerryName? String *nut_name = GetNutName((u16)(berry - FIRST_BERRY_IDX), HEAP_ID_32); BufferString(*messageFormat, idx, nut_name, 0, unk < 2, 2); - String_Delete(nut_name); + String_Free(nut_name); return FALSE; } @@ -377,9 +377,9 @@ BOOL ScrCmd_GetWhiteRockInscription(ScriptContext *ctx) // 0272 - todo: BufferWh UnkStruct_02024E64 *unk = sub_02024EB4(ctx->fieldSystem->saveData); u16 *unk_buffer = sub_02024F0C(unk); - CopyU16ArrayToString(str, unk_buffer); + String_CopyFromChars(str, unk_buffer); BufferString(*messageFormat, idx, str, 0, 0, gGameLanguage); - String_Delete(str); + String_Free(str); return FALSE; } diff --git a/arm9/src/scrcmd_union.c b/arm9/src/scrcmd_union.c index cd89933c6..1345e1e22 100644 --- a/arm9/src/scrcmd_union.c +++ b/arm9/src/scrcmd_union.c @@ -75,7 +75,7 @@ BOOL ScrCmd_UnionGroup(struct ScriptContext *ctx) // 021D sub_02028810(unk_sav_ptr, 0, 2); sub_02028788(unk_sav_ptr, 0, MTRandom()); - String_Delete(player_name); + String_Free(player_name); sub_02028700(unk_sav_ptr, 0, 1); sub_020612EC(ctx->fieldSystem); diff --git a/arm9/src/string_gf.c b/arm9/src/string_gf.c new file mode 100644 index 000000000..ab67c78ce --- /dev/null +++ b/arm9/src/string_gf.c @@ -0,0 +1,336 @@ +#include "string_gf.h" + +#include "global.h" + +#include "heap.h" +#include "string_util.h" + +#define STRING_HEADER_SIZE (10) +#define STRING_MAGIC_NUMBER (0xB6F8D2EC) +#define STRING_INVAL (STRING_MAGIC_NUMBER + 1) + +static inline void String_Assert(const String *string) { + GF_ASSERT(string != NULL); + GF_ASSERT(string->integrity == STRING_MAGIC_NUMBER); +} + +String *String_New(u32 maxSize, enum HeapID heapID) { + String *string = Heap_Alloc(heapID, STRING_HEADER_SIZE + (maxSize * sizeof(charcode_t))); + if (string != NULL) { + string->integrity = STRING_MAGIC_NUMBER; + string->maxSize = maxSize; + string->size = 0; + string->data[0] = EOS; + } + return string; +} + +void String_Free(String *string) { + String_Assert(string); + string->integrity = STRING_INVAL; + Heap_Free(string); +} + +void String_Clear(String *string) { + String_Assert(string); + string->size = 0; + string->data[0] = EOS; +} + +void String_Copy(String *dest, String *src) { + String_Assert(dest); + String_Assert(src); + if (dest->maxSize > src->size) { + memcpy(dest->data, src->data, (src->size + 1) * sizeof(charcode_t)); + dest->size = src->size; + return; + } + GF_ASSERT(FALSE); +} + +String *String_Clone(String *src, enum HeapID heapID) { + String_Assert(src); + String *ret = String_New(src->size + 1, heapID); + if (ret != NULL) { + String_Copy(ret, src); + } + return ret; +} + +void String_FormatInt(String *dest, int num, u32 maxDigits, enum PaddingMode paddingMode, enum CharsetMode charsetMode) { + static const u32 sPowersOfTen[] = { + 1, + 10, + 100, + 1000, + 10000, + 100000, + 1000000, + 10000000, + 100000000, + 1000000000, + }; + + static const charcode_t sDigits_JP[] = { + CHAR_JP_0, + CHAR_JP_1, + CHAR_JP_2, + CHAR_JP_3, + CHAR_JP_4, + CHAR_JP_5, + CHAR_JP_6, + CHAR_JP_7, + CHAR_JP_8, + CHAR_JP_9, + }; + + static const charcode_t sDigits_EN[] = { + CHAR_0, + CHAR_1, + CHAR_2, + CHAR_3, + CHAR_4, + CHAR_5, + CHAR_6, + CHAR_7, + CHAR_8, + CHAR_9, + }; + + String_Assert(dest); + + BOOL isNegative = (num < 0); + + if (dest->maxSize > maxDigits + isNegative) { + const charcode_t *digitSet = (charsetMode == CHARSET_MODE_JP) ? sDigits_JP : sDigits_EN; + + String_Clear(dest); + + if (isNegative) { + num *= -1; + dest->data[dest->size++] = (charsetMode == CHARSET_MODE_JP) ? 0x00F1 : 0x01BE; + } + + u32 dividend = sPowersOfTen[maxDigits - 1]; + while (dividend != 0) { + u16 digit = num / dividend; + num -= dividend * digit; + + if (paddingMode == PADDING_MODE_ZEROES) { + dest->data[dest->size++] = (digit < 10) ? digitSet[digit] : 0x00E2; + // If we hit a non-zero digit, flip the padding mode off + } else if (digit != 0 || dividend == 1) { + paddingMode = PADDING_MODE_ZEROES; + dest->data[dest->size++] = (digit < 10) ? digitSet[digit] : 0x00E2; + } else if (paddingMode == PADDING_MODE_SPACES) { + dest->data[dest->size++] = (charsetMode == CHARSET_MODE_JP) ? 0x0001 : 0x01E2; + } + dividend /= 10; + } + dest->data[dest->size] = EOS; + return; + } + GF_ASSERT(FALSE); +} + +s64 String_AtoI(String *string, BOOL *success) { + s64 ret = 0ll; + s64 pow = 1ll; + if (string->size > 18) { + return 0; + } + + for (int i = (string->size - 1); i >= 0; i--) { + s64 digit = string->data[i] - 0x00A2; + if (digit >= 10ull) { + digit = string->data[i] - 0x0121; + if (digit >= 10ull) { + *success = FALSE; + return ret; + } + } + digit *= pow; + ret += digit; + pow *= 10; + } + *success = TRUE; + return ret; +} + +BOOL String_Compare(String *str1, String *str2) { + String_Assert(str1); + String_Assert(str2); + + for (int i = 0; str1->data[i] == str2->data[i]; i++) { + if (str1->data[i] == EOS) { + return FALSE; + } + } + return TRUE; +} + +u16 String_GetLength(String *string) { + String_Assert(string); + return string->size; +} + +int String_CountLines(const String *string) { + String_Assert(string); + + int i, count; + for (i = 0, count = 1; i < string->size; i++) { + if (string->data[i] == CHAR_LF) { + count++; + } + } + return count; +} + +void String_CopyLine(String *dest, const String *src, u32 lineNum) { + String_Assert(src); + String_Assert(dest); + + int i = 0; + if (lineNum != 0) { + for (i = 0; i < src->size; i++) { + if (src->data[i] == CHAR_LF && --lineNum == 0) { + i++; + break; + } + } + } + String_Clear(dest); + for (; i < src->size; i++) { + if (src->data[i] == CHAR_LF) { + break; + } + String_AppendChar(dest, src->data[i]); + } +} + +void String_CopyFromChars(String *dest, const charcode_t *src) { + String_Assert(dest); + + for (dest->size = 0; *src != EOS;) { + if (dest->size >= dest->maxSize - 1) { + GF_ASSERT(FALSE); + break; + } + dest->data[dest->size++] = *src++; + } + dest->data[dest->size] = EOS; +} + +void String_CopyNumChars(String *dest, const charcode_t *src, u32 num) { + String_Assert(dest); + + if (num <= dest->maxSize) { + memcpy(dest->data, src, num * sizeof(charcode_t)); + + int i; + for (i = 0; i < num; i++) { + if (dest->data[i] == EOS) { + break; + } + } + dest->size = i; + if (i == num) { + dest->data[num - 1] = EOS; + } + return; + } + GF_ASSERT(FALSE); +} + +void String_CopyToChars(String *src, charcode_t *dest, u32 destSize) { + String_Assert(src); + + if (src->size + 1 <= destSize) { + memcpy(dest, src->data, (src->size + 1) * sizeof(charcode_t)); + return; + } + GF_ASSERT(FALSE); +} + +charcode_t *String_GetChars(String *string) { + String_Assert(string); + + return string->data; +} + +void String_Concat(String *dest, String *src) { + String_Assert(dest); + String_Assert(src); + + if (dest->size + src->size + 1 <= dest->maxSize) { + memcpy(dest->data + dest->size, src->data, (src->size + 1) * sizeof(charcode_t)); + dest->size += src->size; + return; + } + GF_ASSERT(FALSE); +} + +void String_AppendChar(String *string, charcode_t c) { + String_Assert(string); + + if (string->size + 1 < string->maxSize) { + string->data[string->size++] = c; + string->data[string->size] = EOS; + return; + } + GF_ASSERT(FALSE); +} + +void String_UpperFirstChar(String *string) { + String_Assert(string); + + if (string->size != 0) { + // a z + if (string->data[0] >= 0x0145 && string->data[0] <= 0x015E) { + // (a - A) + string->data[0] -= 26; + } + } +} + +BOOL String_IsTrainerName(String *string) { + return string->size > 0 && string->data[0] == 0xF100; +} + +void String_ConcatTrainerName(String *dest, String *src) { + // Trainer names are expressed using a format with a designating leader + // code followed by compression algorithm that trims individual characters + // from 16 bits to 10 bits. + // + // TODO: This process could do with some more documentation, i.e. why this + // is done. + if (String_IsTrainerName(src)) { + charcode_t *dstChar = &dest->data[dest->size]; + charcode_t *srcChar = &src->data[1]; + s32 shift = 0; + u32 charsAdded = 0; + charcode_t curChar = 0; + + while (TRUE) { + curChar = (*srcChar >> shift) & 0x1FF; + shift += 9; + if (shift >= 15) { + srcChar++; + shift -= 15; + if (shift != 0) { + curChar |= (*srcChar << (9 - shift)) & 0x1FF; + } + } + + if (curChar == 0x1FF) { + break; + } + *dstChar++ = curChar; + charsAdded++; + } + *dstChar = EOS; + dest->size += charsAdded; + } else { + String_Concat(dest, src); + } +} diff --git a/arm9/src/string_util.c b/arm9/src/string_util.c index 71a1cfd80..2550b0bd6 100644 --- a/arm9/src/string_util.c +++ b/arm9/src/string_util.c @@ -112,18 +112,18 @@ u16 *StringFillEOS(u16 *dest, u32 num) { return StringFill(dest, EOS, num); } -u16 *ConvertUIntToDecimalString(u16 *dest, u32 value, enum PrintingMode mode, u32 n) { +u16 *ConvertUIntToDecimalString(u16 *dest, u32 value, enum PaddingMode mode, u32 n) { for (u32 x = (u32)gPowersOfTen[n - 1]; x != 0; x = x / 10) { u16 res = (u16)(value / x); value = value - x * res; - if (mode == PRINTING_MODE_LEADING_ZEROS) { + if (mode == PADDING_MODE_ZEROES) { *dest = res >= 10 ? (u16)CHAR_JP_QUESTION_MARK : gDigitTable[res]; dest++; } else if (res != 0 || x == 1) { - mode = PRINTING_MODE_LEADING_ZEROS; + mode = PADDING_MODE_ZEROES; *dest = res >= 10 ? (u16)CHAR_JP_QUESTION_MARK : gDigitTable[res]; dest++; - } else if (mode == PRINTING_MODE_RIGHT_ALIGN) { + } else if (mode == PADDING_MODE_SPACES) { *dest = 1; dest++; } diff --git a/arm9/src/text.c b/arm9/src/text.c index 167ae4480..f36e6a31c 100644 --- a/arm9/src/text.c +++ b/arm9/src/text.c @@ -10,7 +10,7 @@ #include "gf_gfx_loader.h" #include "heap.h" #include "message_format.h" -#include "string16.h" +#include "string_gf.h" #include "unk_0200CA44.h" const struct FontInfo *gFonts = NULL; @@ -168,7 +168,7 @@ u16 AddTextPrinter(struct TextPrinterTemplate *printerTemplate, u32 speed, u8 (* } printer->printerTemplate = *printerTemplate; - printer->printerTemplate.currentChar.raw = String_c_str(printer->printerTemplate.currentChar.wrapped); + printer->printerTemplate.currentChar.raw = String_GetChars(printer->printerTemplate.currentChar.wrapped); printer->callback = callback; UNK_021C570C = 0; sub_0201C1A8(printer); diff --git a/arm9/src/trainer_data.c b/arm9/src/trainer_data.c index f8e1c0253..3f51948f4 100644 --- a/arm9/src/trainer_data.c +++ b/arm9/src/trainer_data.c @@ -32,8 +32,8 @@ void EnemyTrainerSet_Init(BattleSetup *setup, struct SaveData *save, enum HeapID CopyU16StringArray(setup->trainers[i].name, rivalName); } else { str = NewString_ReadMsgData(msgData, setup->trainerId[i]); - CopyStringToU16Array(str, setup->trainers[i].name, PLAYER_NAME_LENGTH + 1); - String_Delete(str); + String_CopyToChars(str, setup->trainers[i].name, PLAYER_NAME_LENGTH + 1); + String_Free(str); } CreateNPCTrainerParty(setup, i, heapID); } @@ -129,7 +129,7 @@ void GetTrainerMessageByIdPair(u32 trainer_idx, u32 msg_id, struct String *str, } NARC_Delete(trTblNarc); if (rdbuf[0] == trTblSize) { - String_SetEmpty(str); + String_Clear(str); } } diff --git a/arm9/src/unk_0200BA78.c b/arm9/src/unk_0200BA78.c index 59422f217..ef0030f09 100644 --- a/arm9/src/unk_0200BA78.c +++ b/arm9/src/unk_0200BA78.c @@ -8,7 +8,7 @@ void sub_0200BA78(struct UnkStruct_0200B870 *param0, int param1, u32 value, u32 n, - enum PrintingMode mode, + enum PaddingMode mode, struct Window *window, int x, int y) { @@ -17,7 +17,7 @@ void sub_0200BA78(struct UnkStruct_0200B870 *param0, } void sub_0200BAAC( - struct UnkStruct_0200B870 *param0, u32 value, u32 n, enum PrintingMode mode, void *dest) { + struct UnkStruct_0200B870 *param0, u32 value, u32 n, enum PaddingMode mode, void *dest) { u8 st0 = (u8)((param0->unk_28 << 4) | param0->unk_28); ConvertUIntToDecimalString(param0->data, value, mode, n); diff --git a/arm9/src/unk_02021934.c b/arm9/src/unk_02021934.c deleted file mode 100644 index fa420346e..000000000 --- a/arm9/src/unk_02021934.c +++ /dev/null @@ -1,306 +0,0 @@ -#include "global.h" - -#include "heap.h" -#include "string16.h" -#include "string_util.h" - -#define ASSERT_STR16(_str) ({ GF_ASSERT(_str != NULL); GF_ASSERT(_str->magic == STR16_MAGIC); }) - -struct String *String_New(u32 length, enum HeapID heapID) { - struct String *ret = Heap_Alloc(heapID, length * 2 + 10); - if (ret != NULL) { - ret->magic = STR16_MAGIC; - ret->maxsize = (u16)length; - ret->size = 0; - ret->data[0] = EOS; - } - return ret; -} - -void String_Delete(struct String *str) { - ASSERT_STR16(str); - str->magic = STR16_MAGIC | 1; - Heap_Free(str); -} - -void String_SetEmpty(struct String *str) { - ASSERT_STR16(str); - str->size = 0; - str->data[0] = EOS; -} - -void StringCopy(struct String *dest, struct String *src) { - ASSERT_STR16(dest); - ASSERT_STR16(src); - if (dest->maxsize > src->size) { - memcpy(dest->data, src->data, (u32)((src->size + 1) * 2)); - dest->size = src->size; - return; - } - GF_ASSERT(0); -} - -struct String *StringDup(struct String *src, enum HeapID heapID) { - ASSERT_STR16(src); - struct String *dest = String_New((u32)(src->size + 1), heapID); - if (dest != NULL) { - StringCopy(dest, src); - } - return dest; -} - -void String16_FormatInteger(struct String *str, int num, u32 ndigits, enum PrintingMode printingMode, BOOL whichCharset) { - static const u16 sCharset_EN[10] = { - 0x121, 0x122, 0x123, 0x124, 0x125, 0x126, 0x127, 0x128, 0x129, 0x12A - }; - - static const u16 sCharset_JP[10] = { - 0xA2, 0xA3, 0xA4, 0xA5, 0xA6, 0xA7, 0xA8, 0xA9, 0xAA, 0xAB - }; - - static const u32 sPowersOfTen[10] = { - 1, - 10, - 100, - 1000, - 10000, - 100000, - 1000000, - 10000000, - 100000000, - 1000000000 - }; - - ASSERT_STR16(str); - - const u16 *charbase; - BOOL isNegative = (num < 0); - - if (str->maxsize > ndigits + isNegative) { - charbase = (whichCharset == 0) ? sCharset_JP : sCharset_EN; - String_SetEmpty(str); - if (isNegative) { - num *= -1; - u16 hyphen = (u16)((whichCharset == 0) ? 0x00F1 : 0x01BE); - str->data[str->size++] = hyphen; - } - u32 dividend = sPowersOfTen[ndigits - 1]; - while (dividend != 0) { - u16 digit = (u16)(num / dividend); - num -= dividend * digit; - if (printingMode == PRINTING_MODE_LEADING_ZEROS) { - u16 value = (u16)((digit < 10) ? charbase[digit] : 0x00E2); - str->data[str->size++] = value; - } else if (digit != 0 || dividend == 1) { - printingMode = PRINTING_MODE_LEADING_ZEROS; - u16 value = (u16)((digit < 10) ? charbase[digit] : 0x00E2); - str->data[str->size++] = value; - } else if (printingMode == PRINTING_MODE_RIGHT_ALIGN) { - u16 value = (u16)((whichCharset == 0) ? 0x0001 : 0x01E2); - str->data[str->size++] = value; - } - dividend /= 10; - } - str->data[str->size] = EOS; - return; - } - GF_ASSERT(FALSE); -} - -s64 String_atoi(struct String *str, BOOL *flag) { - s64 ret = 0; - s64 pow10 = 1; - if (str->size > 18) { - return 0; - } - int ndigits = str->size - 1; - while (ndigits >= 0) { - // ０ - s64 digit = str->data[ndigits] - 0x00A2; - if (digit >= 10ull) { - // 0 - digit = str->data[ndigits] - 0x0121; - if (digit >= 10ull) { - *flag = FALSE; - return ret; - } - } - digit *= pow10; - ret += digit; - pow10 *= 10; - ndigits--; - } - *flag = TRUE; - return ret; -} - -BOOL String_Compare(struct String *str1, struct String *str2) { - ASSERT_STR16(str1); - ASSERT_STR16(str2); - - for (int i = 0; str1->data[i] == str2->data[i]; i++) { - if (str1->data[i] == EOS) { - return FALSE; - } - } - return TRUE; -} - -u16 StringGetLength(struct String *str) { - ASSERT_STR16(str); - return str->size; -} - -int StringCountLines(volatile struct String *str) { - ASSERT_STR16(str); - - int i, nline; - for (i = 0, nline = 1; i < str->size; i++) { - if (str->data[i] == CHAR_LF) { - nline++; - } - } - return nline; -} - -void StringGetLineN(struct String *dest, volatile struct String *src, u32 n) { - ASSERT_STR16(src); - ASSERT_STR16(dest); - - int i = 0; - if (n != 0) { - for (i = 0; i < src->size; i++) { - if (src->data[i] == CHAR_LF && --n == 0) { - i++; - break; - } - } - } - String_SetEmpty(dest); - for (; i < src->size; i++) { - u16 c = src->data[i]; - if (c == CHAR_LF) { - break; - } - StrAddChar(dest, c); - } -} - -void CopyU16ArrayToString(struct String *str, u16 *buf) { - ASSERT_STR16(str); - - for (str->size = 0; *buf != EOS;) { - if (str->size >= str->maxsize - 1) { - GF_ASSERT(0); - break; - } - str->data[str->size++] = *buf++; - } - str->data[str->size] = EOS; -} - -void CopyU16ArrayToStringN(struct String *str, u16 *buf, u32 length) { - ASSERT_STR16(str); - - if (length <= str->maxsize) { - memcpy(str->data, buf, length * 2); - int i; - for (i = 0; i < length; i++) { - if (str->data[i] == EOS) { - break; - } - } - str->size = (u16)i; - if (i == length) { - str->data[length - 1] = EOS; - } - return; - } - GF_ASSERT(0); -} - -void CopyStringToU16Array(struct String *str, u16 *buf, u32 length) { - ASSERT_STR16(str); - - if (str->size + 1 <= length) { - memcpy(buf, str->data, (u32)((str->size + 1) * 2)); - return; - } - GF_ASSERT(0); -} - -u16 *String_c_str(struct String *str) { - ASSERT_STR16(str); - - return str->data; -} - -void StringCat(struct String *dest, struct String *src) { - ASSERT_STR16(dest); - ASSERT_STR16(src); - - if (dest->size + src->size + 1 <= dest->maxsize) { - memcpy(dest->data + dest->size, src->data, (u32)(2 * (src->size + 1))); - dest->size += src->size; - return; - } - GF_ASSERT(0); -} - -void StrAddChar(struct String *str, u16 val) { - ASSERT_STR16(str); - - if (str->size + 1 < str->maxsize) { - str->data[str->size++] = val; - str->data[str->size] = EOS; - return; - } - GF_ASSERT(0); -} - -void StrUpperFirstChar(struct String *str) { - ASSERT_STR16(str); - - if (str->size != 0) { - // a z - if (str->data[0] >= 0x0145 && str->data[0] <= 0x015E) { - // (a - A) - str->data[0] -= 26; - } - } -} - -BOOL String_IsTrainerName(struct String *string) { - return string->size != 0 && string->data[0] == 0xF100; -} - -void StringCat_HandleTrainerName(struct String *dest, struct String *src) { - if (String_IsTrainerName(src)) { - u16 *dest_p = &dest->data[dest->size]; - u16 *src_p = &src->data[1]; - s32 bit = 0; - u32 outsize = 0; - u16 cur_char = 0; - - while (1) { - cur_char = (u16)((*src_p >> bit) & 0x1FF); - bit += 9; - if (bit >= 15) { - src_p++; - bit -= 15; - if (bit != 0) { - cur_char |= (*src_p << (9 - bit)) & 0x1FF; - } - } - if (cur_char == 0x1FF) { - break; - } - *dest_p++ = cur_char; - outsize++; - } - *dest_p = EOS; - dest->size += outsize; - } else { - StringCat(dest, src); - } -} diff --git a/arm9/src/unk_02021FF8.c b/arm9/src/unk_02021FF8.c index 8f79f0ba4..7e7637acd 100644 --- a/arm9/src/unk_02021FF8.c +++ b/arm9/src/unk_02021FF8.c @@ -3,7 +3,7 @@ #include "global.h" #include "heap.h" -#include "string16.h" +#include "string_gf.h" struct UnkStruct_020220C4 *sub_020220C4(u8 *a0, u32 a1, void (*a2)(s32, s32, u32), u32 a3, enum HeapID heapID) { struct UnkStruct_020220C4 *ret; diff --git a/arm9/src/unk_02024E64.c b/arm9/src/unk_02024E64.c index 2f91ba534..8575b3652 100644 --- a/arm9/src/unk_02024E64.c +++ b/arm9/src/unk_02024E64.c @@ -42,7 +42,7 @@ u16 *GetRivalNamePtr(struct UnkStruct_02024E64 *unk) { } void RivalsNameToU16Array(struct UnkStruct_02024E64 *unk, struct String *str) { - CopyStringToU16Array(str, unk->rival_name_buf, sizeof(unk->rival_name_buf) / sizeof(u16)); + String_CopyToChars(str, unk->rival_name_buf, sizeof(unk->rival_name_buf) / sizeof(u16)); } u16 *sub_02024F0C(struct UnkStruct_02024E64 *unk) { @@ -50,5 +50,5 @@ u16 *sub_02024F0C(struct UnkStruct_02024E64 *unk) { } void sub_02024F18(struct UnkStruct_02024E64 *unk, struct String *str) { - CopyStringToU16Array(str, unk->unk734, sizeof(unk->unk734) / sizeof(u16)); + String_CopyToChars(str, unk->unk734, sizeof(unk->unk734) / sizeof(u16)); } diff --git a/arm9/src/unk_020286F8.c b/arm9/src/unk_020286F8.c index dd08cc95c..4b330f0ab 100644 --- a/arm9/src/unk_020286F8.c +++ b/arm9/src/unk_020286F8.c @@ -5,7 +5,7 @@ #include "MI_memory.h" #include "math_util.h" #include "save.h" -#include "string16.h" +#include "string_gf.h" #include "string_util.h" struct UnkSaveStruct_020286F8 *UNK_021C59D0; @@ -59,9 +59,9 @@ u16 *sub_020287A8(struct UnkSaveStruct_020286F8 *ptr, u32 i, u32 j) { void sub_020287C0(struct UnkSaveStruct_020286F8 *ptr, u32 i, u32 j, struct String *k) { if (j == 0) { - CopyStringToU16Array(k, ptr[i].unk_0, 8); + String_CopyToChars(k, ptr[i].unk_0, 8); } else { - CopyStringToU16Array(k, ptr[i].unk_10, 8); + String_CopyToChars(k, ptr[i].unk_10, 8); } } diff --git a/arm9/src/wfc_user_info_warning.c b/arm9/src/wfc_user_info_warning.c index c242a7b3c..386627c14 100644 --- a/arm9/src/wfc_user_info_warning.c +++ b/arm9/src/wfc_user_info_warning.c @@ -17,7 +17,7 @@ #include "main.h" #include "msgdata.h" #include "render_window.h" -#include "string16.h" +#include "string_gf.h" #include "text.h" extern void SetMasterBrightnessNeutral(BOOL set_brightness_on_bottom_screen); @@ -117,7 +117,7 @@ void ShowWFCUserInfoWarning(enum HeapID heapID, u32 a1) { ReadMsgDataIntoString(warning_messages_data, narc_0613_00015, warning_message); // Your Nintendo Wi-Fi Connection User Information may have been erased... AddTextPrinterParameterized(&window, 0, warning_message, 0, 0, 0, 0); - String_Delete(warning_message); + String_Free(warning_message); GfGfx_BothDispOn(); SetMasterBrightnessNeutral(PM_LCD_TOP); diff --git a/include/itemtool.h b/include/itemtool.h index 8c20c5311..5f7c98073 100644 --- a/include/itemtool.h +++ b/include/itemtool.h @@ -6,7 +6,7 @@ #include "constants/items.h" #include "filesystem.h" -#include "string16.h" +#include "string_gf.h" #define ITEMDATA_DATA 0 #define ITEMDATA_NCGR 1 diff --git a/include/list_menu_items.h b/include/list_menu_items.h index 9b9189f8b..8e57de4fd 100644 --- a/include/list_menu_items.h +++ b/include/list_menu_items.h @@ -2,7 +2,7 @@ #define POKEDIAMOND_LIST_MENU_ITEMS_H #include "msgdata.h" -#include "string16.h" +#include "string_gf.h" struct ListMenuItem { struct String *text; diff --git a/include/message_format.h b/include/message_format.h index 8d6b46cbf..cab1fca3f 100644 --- a/include/message_format.h +++ b/include/message_format.h @@ -43,7 +43,7 @@ void BufferBoxMonSpeciesNameWithArticle(MessageFormat *messageFormat, u32 idx, s void BufferSpeciesNameWithArticle(MessageFormat *messageFormat, u32 idx, u32 species); void BufferBoxMonNickname(MessageFormat *messageFormat, u32 idx, struct BoxPokemon *mon); void BufferBoxMonOTName(MessageFormat *messageFormat, u32 idx, struct BoxPokemon *mon); -void BufferIntegerAsString(MessageFormat *messageFormat, u32 idx, s32 num, u32 ndigits, enum PrintingMode printingMode, BOOL whichCharset); +void BufferIntegerAsString(MessageFormat *messageFormat, u32 idx, s32 num, u32 ndigits, enum PaddingMode paddingMode, BOOL whichCharset); void BufferMoveName(MessageFormat *messageFormat, u32 idx, u32 move); void BufferRibbonNameOrDesc(MessageFormat *messageFormat, u32 idx, u32 ribbon); void BufferAbilityName(MessageFormat *messageFormat, u32 idx, u32 ability); @@ -96,6 +96,6 @@ void MessageFormat_ResetBuffers(MessageFormat *messageFormat); struct UnkStruct_0200B870 *MessagePrinter_New(u32 color1, u32 color2, u32 color3, enum HeapID heapID); void MessagePrinter_Delete(struct UnkStruct_0200B870 *a0); void sub_0200B9A8(struct UnkStruct_0200B870 *a0, int a1, struct Window *a2, int a3, int a4); -void sub_0200B9EC(struct UnkStruct_0200B870 *string, u32 value, u32 n, enum PrintingMode mode, struct Window *window, int x, int y); +void sub_0200B9EC(struct UnkStruct_0200B870 *string, u32 value, u32 n, enum PaddingMode mode, struct Window *window, int x, int y); #endif // POKEDIAMOND_MESSAGE_FORMAT_H diff --git a/include/msgdata.h b/include/msgdata.h index 3f95bd6e8..a0d3fb1bd 100644 --- a/include/msgdata.h +++ b/include/msgdata.h @@ -3,7 +3,7 @@ #include "filesystem.h" #include "message_format.h" -#include "string16.h" +#include "string_gf.h" typedef enum MsgDataLoadType { MSGDATA_LOAD_DIRECT, diff --git a/include/player_data.h b/include/player_data.h index c4e3a1e86..b3e82e025 100644 --- a/include/player_data.h +++ b/include/player_data.h @@ -3,7 +3,7 @@ #include "igt.h" #include "options.h" -#include "string16.h" +#include "string_gf.h" struct SaveData; diff --git a/include/pokemon.h b/include/pokemon.h index 6fa3d484b..9e52971ab 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -11,7 +11,7 @@ #include "mail.h" #include "player_data.h" #include "sound_chatot.h" -#include "string16.h" +#include "string_gf.h" #define LEVEL_UP_LEARNSET_END 0xFFFF #define LEVEL_UP_LEARNSET_MAX 22 diff --git a/include/proto.h b/include/proto.h index b5c11c4fb..e3a562c8c 100644 --- a/include/proto.h +++ b/include/proto.h @@ -5,7 +5,7 @@ #include "player_data.h" // for struct definitions #include "pokemon.h" // for struct definitions -#include "string16.h" // for struct definitions +#include "string_gf.h" // for struct definitions int TrainerClass_GetGenderOrTrainerCount(int x); int sub_02014C3C(u8); diff --git a/include/string16.h b/include/string16.h deleted file mode 100644 index 8380407a5..000000000 --- a/include/string16.h +++ /dev/null @@ -1,38 +0,0 @@ -#ifndef POKEDIAMOND_STRING16_H -#define POKEDIAMOND_STRING16_H - -#include "string_util.h" -#include "unk_02021590.h" - -typedef struct String { - u16 maxsize; - u16 size; - u32 magic; - u16 data[1]; - u8 padding[2]; -} String; - -#define STR16_MAGIC 0xB6F8D2EC - -struct String *String_New(u32 count, enum HeapID heapID); -BOOL String_Compare(struct String *, struct String *); -void CopyU16ArrayToStringN(struct String *, u16 *, u32); // copy -void String_SetEmpty(struct String *); // set empty -struct String *StringDup(struct String *, enum HeapID heapID); -void String_Delete(struct String *str); -void StringCopy(struct String *dest, struct String *src); -void String16_FormatInteger(struct String *str, int num, u32 ndigits, enum PrintingMode printingMode, BOOL whichCharset); -s64 String_atoi(struct String *str, BOOL *flag); -u16 StringGetLength(struct String *str); -int StringCountLines(volatile struct String *str); -void StringGetLineN(struct String *dest, volatile struct String *src, u32 n); -void CopyU16ArrayToString(struct String *str, u16 *buf); -void CopyStringToU16Array(struct String *str, u16 *buf, u32 length); -u16 *String_c_str(struct String *str); -void StrAddChar(struct String *str, u16 val); -void StringCat(struct String *dest, struct String *src); -void StrUpperFirstChar(struct String *str); -BOOL String_IsTrainerName(struct String *string); -void StringCat_HandleTrainerName(struct String *dest, struct String *src); - -#endif // POKEDIAMOND_STRING16_H diff --git a/include/string_control_code.h b/include/string_control_code.h index 06fe5851c..a181f7ad2 100644 --- a/include/string_control_code.h +++ b/include/string_control_code.h @@ -3,6 +3,8 @@ #include "nitro/types.h" +typedef u16 charcode_t; + const u16 *MsgArray_SkipControlCode(const u16 *arr); u32 MsgArray_GetControlCode(const u16 *arr); BOOL MsgArray_ControlCodeIsStrVar(const u16 *arr); diff --git a/include/string_gf.h b/include/string_gf.h new file mode 100644 index 000000000..b8038cc02 --- /dev/null +++ b/include/string_gf.h @@ -0,0 +1,235 @@ +#ifndef POKEDIAMOND_STRING_GF_H +#define POKEDIAMOND_STRING_GF_H + +#include "string_control_code.h" +#include "string_util.h" +#include "unk_02021590.h" + +/** + * Managed string buffer. + */ +typedef struct String { + /// Maximum allocated size of the buffer. + u16 maxSize; + /// Size of the buffer, at present; the length of the underlying string. + u16 size; + /// Integrity value specified at allocation time. + u32 integrity; + /// The underlying character buffer. + /// + /// UB: This is meant to be a flexible array, but is purposely defined + /// incorrectly in order to match the original byte-code. The correct + /// definition method would be as `data[]`. + charcode_t data[1]; +} String; + +/** + * Control codes for which charset to use when formatting a string. + */ +enum CharsetMode { + /// Use the Japanese character set (i.e., full-width characters). + CHARSET_MODE_JP, + /// Use the English character set (i.e., half-width characters). + CHARSET_MODE_EN, +}; + +/** + * @brief Init routine. Allocates memory for a new String, initializes it + * with an integrity-check value, and exposes its address. + * + * @param maxSize The maximum size of the new String to allocate from the heap. + * @param heapID ID of the heap to own the new String. + * @return Address to the new String. + */ +String *String_New(u32 maxSize, enum HeapID heapID); + +/** + * @brief Free routine. Destroys an existing String and returns its memory + * to the owning heap. + * + * @param string Address to the String to be freed. + */ +void String_Free(String *string); + +/** + * @brief Clears out a string of any existing character data. The first value + * in the underlying data buffer is set to `CHAR_EOS`, and `string->size` is + * set to 0. + * + * @param string Address to the String to be cleared. + */ +void String_Clear(String *string); + +/** + * @brief Copies the contents of the data buffer in `src` to the data buffer + * in `dest`. Fails if the contents of `src` will not fit into `dest`'s + * allocated memory. + * + * @param dest Destination buffer. `dest->size` and `dest->data` will be modified. + * @param src Source buffer. `src->size` and `src->data` will be accessed. + */ +void String_Copy(String *dest, String *src); + +/** + * @brief Clones the contents of a given String into a new String and returns + * the address of the newly-created struct. + * + * This is effectively a nice wrapper around the following code: + * + * ```c + * String *dest = String_New(src->size + 1, heapID); + * String_Copy(dest, src); + * ``` + * + * @param src Source buffer to clone. + * @param heapID ID of the heap which will own the new String. + * @return Address to the cloned String. + */ +String *String_Clone(String *src, enum HeapID heapID); + +/** + * @brief Format a number into a destination buffer. + * + * The destination buffer must already be initialized. + * + * @param[out] dest Destination buffer. + * @param num Number to be formatted. + * @param maxDigits Maximum number of digits to format, right-justified. + * @param paddingMode Padding mode to use when formatting the number. + * @param charsetMode Charset mode to use when formatting the number. + */ +void String_FormatInt(String *dest, int num, u32 maxDigits, enum PaddingMode paddingMode, enum CharsetMode charsetMode); + +/** + * @brief Parses a numeric string into a number. + * + * @param string Numeric string. + * @param[out] success Flag denoting if the result string was fully processed. + * @return Parsed result. + */ +s64 String_AtoI(String *string, BOOL *success); + +/** + * @brief Compares two strings. Similar to the `strcmp` standard, but without returning -1. Essentially a BOOL. + * + * @param str1 First string. + * @param str2 Second string. + * @return FALSE if the strings match, TRUE if they do not. + */ +BOOL String_Compare(String *str1, String *str2); + +/** + * @brief Accessor for the length of a string. + * + * @param string + * @return `string->size` + */ +u16 String_GetLength(String *string); + +/** + * @brief Counts the number of lines in a string. + * + * @param string + * @return The number of lines in `string`. + */ +int String_CountLines(const String *string); + +/** + * @brief Copies a particular line number from `src` into `dest`. + * + * Lines are zero-indexed, e.g. `lineNum == 0` will copy the first line, + * `lineNum == 1` will copy the second line, etc. + * + * @param[out] dest Destination buffer. + * @param src Source buffer. + * @param lineNum Number of the line to copy, zero-indexed. + */ +void String_CopyLine(String *dest, const String *src, u32 lineNum); + +/** + * @brief Copies data from a raw character buffer into a managed String. + * + * @param[out] dest Destination buffer. + * @param src Raw character source buffer. + */ +void String_CopyFromChars(String *dest, const charcode_t *src); + +/** + * @brief Copies a specific number of values from a raw character buffer into + * a managed String. + * + * @param[out] dest Destination buffer. + * @param src Raw character source buffer. + * @param num Number of values to copy. + */ +void String_CopyNumChars(String *dest, const charcode_t *src, u32 num); + +/** + * @brief Dumps the contents of a String into a raw character buffer. + * + * Fails if `src->size + 1 > destSize`. + * + * @param src Source buffer. + * @param[out] dest Destination buffer. + * @param destSize Size of `dest`. + */ +void String_CopyToChars(String *src, charcode_t *dest, u32 destSize); + +/** + * @brief Accessor for the underlying data buffer of a managed string. + * + * @param string + * @return Underlying data buffer for `string`. + */ +charcode_t *String_GetChars(String *string); + +/** + * @brief Concatenates `src` onto the end of `dest`, if allocation permits. + * + * Fails if `dest->maxSize < dest->size + src->size + 1`. + * + * @param[out] dest Destination buffer. + * @param src Source buffer. + */ +void String_Concat(String *dest, String *src); + +/** + * @brief Appends a single character onto `string`, if allocation permits. + * + * Fails if `string->maxSize >= string->size + 1`. + * + * @param[out] string Destination buffer. + * @param c Character to append. + */ +void String_AppendChar(String *string, charcode_t c); + +/** + * @brief Checks if a given string is a trainer name. + * + * Trainer names are identified using a specific leader character which denotes + * different handling methods for their concatenation. + * + * @param string + * @return TRUE if `string` is a trainer name, FALSE otherwise. + */ +BOOL String_IsTrainerName(String *string); + +/** + * @brief Concatenates `src` onto the end of `dest`, accounting for trainer + * name compression. + * + * If `src` is not a trainer name, then this falls back to `String_Concat`. + * + * @param[out] dest Destination buffer. + * @param src Source buffer. + */ +void String_ConcatTrainerName(String *dest, String *src); + +/** + * @brief Converts the first character to uppercase. + * + * @param string + */ +void String_UpperFirstChar(String *string); + +#endif // POKEDIAMOND_STRING_GF_H diff --git a/include/string_util.h b/include/string_util.h index e35433cc3..7e41d496a 100644 --- a/include/string_util.h +++ b/include/string_util.h @@ -7,10 +7,10 @@ #include "global.h" -enum PrintingMode { - PRINTING_MODE_LEFT_ALIGN, - PRINTING_MODE_RIGHT_ALIGN, - PRINTING_MODE_LEADING_ZEROS +enum PaddingMode { + PADDING_MODE_NONE, + PADDING_MODE_SPACES, + PADDING_MODE_ZEROES }; void CopyU16StringArray(u16 *dest, const u16 *src); @@ -20,6 +20,6 @@ BOOL StringNotEqual(const u16 *s1, const u16 *s2); BOOL StringNotEqualN(const u16 *s1, const u16 *s2, u32 num); u16 *StringFill(u16 *dest, u16 value, u32 num); u16 *StringFillEOS(u16 *dest, u32 num); -u16 *ConvertUIntToDecimalString(u16 *dest, u32 value, enum PrintingMode mode, u32 n); +u16 *ConvertUIntToDecimalString(u16 *dest, u32 value, enum PaddingMode mode, u32 n); #endif // POKEDIAMOND_STRING_UTIL_H diff --git a/include/text_02054590.h b/include/text_02054590.h index 3e2d4d4cd..275cb150c 100644 --- a/include/text_02054590.h +++ b/include/text_02054590.h @@ -5,7 +5,7 @@ #include "bg_window.h" #include "options.h" -#include "string16.h" +#include "string_gf.h" void sub_02054590(enum GFPalLoadLocation location, u32 param1); void sub_020545B8(struct BgConfig *param0, struct Window *param1, u32 param2); diff --git a/include/trainer_data.h b/include/trainer_data.h index 185ef8568..6c06e719f 100644 --- a/include/trainer_data.h +++ b/include/trainer_data.h @@ -7,7 +7,7 @@ #include "heap.h" #include "save.h" -#include "string16.h" +#include "string_gf.h" struct TrainerMonSpecies { u16 difficulty; diff --git a/include/unk_0200BA78.h b/include/unk_0200BA78.h index ac4953088..c8cfa8de1 100644 --- a/include/unk_0200BA78.h +++ b/include/unk_0200BA78.h @@ -9,12 +9,12 @@ void sub_0200BA78(struct UnkStruct_0200B870 *param0, int param1, u32 value, u32 n, - enum PrintingMode mode, + enum PaddingMode mode, struct Window *window, int x, int y); void sub_0200BAAC( - struct UnkStruct_0200B870 *param0, u32 value, u32 n, enum PrintingMode mode, void *dest); + struct UnkStruct_0200B870 *param0, u32 value, u32 n, enum PaddingMode mode, void *dest); #endif // POKEDIAMOND_UNK_0200BA78_H diff --git a/include/unk_02024E64.h b/include/unk_02024E64.h index be1c53b20..624dd81ad 100644 --- a/include/unk_02024E64.h +++ b/include/unk_02024E64.h @@ -5,7 +5,7 @@ #include "MI_memory.h" #include "save.h" -#include "string16.h" +#include "string_gf.h" typedef struct UnkStruct_02024E64 { u8 unk0[0xE][0x80]; diff --git a/include/unk_020286F8.h b/include/unk_020286F8.h index 2f732bd59..f52151ff4 100644 --- a/include/unk_020286F8.h +++ b/include/unk_020286F8.h @@ -4,7 +4,7 @@ #include "nitro/types.h" #include "save.h" -#include "string16.h" +#include "string_gf.h" struct UnkSaveStruct_020286F8 { u16 unk_0[8]; diff --git a/include/unk_02064E4C.h b/include/unk_02064E4C.h index 7ab720845..379ecc843 100644 --- a/include/unk_02064E4C.h +++ b/include/unk_02064E4C.h @@ -2,7 +2,7 @@ #define POKEDIAMOND_UNK_02064E4C_H #include "msgdata.h" -#include "string16.h" +#include "string_gf.h" void sub_02064E4C(struct MsgData *msgData, u16 map_sec, struct String *dest); void sub_02064E60(u32 map_no, enum HeapID heapID, struct String *dest);