diff --git a/asm/frontier_system.s b/asm/frontier_system.s index 2aec84ed59..a8b75fa1f0 100644 --- a/asm/frontier_system.s +++ b/asm/frontier_system.s @@ -126,9 +126,9 @@ _0222A930: ldr r0, [r4, #0x44] bl MessageFormat_Delete ldr r0, [r4, #0x48] - bl String_Delete + bl String_Free ldr r0, [r4, #0x4c] - bl String_Delete + bl String_Free ldr r0, [r4, #0x40] bl Heap_Free ldr r0, [r4, #0x3c] diff --git a/asm/include/overlay_01_021EDAFC.inc b/asm/include/overlay_01_021EDAFC.inc index 05bbb6c87e..fcd374d7e5 100644 --- a/asm/include/overlay_01_021EDAFC.inc +++ b/asm/include/overlay_01_021EDAFC.inc @@ -40,7 +40,7 @@ .public AddTextPrinterParameterized .public GF_AssertFail .public String_New -.public String_Delete +.public String_Free .public Save_PlayerData_GetProfile .public Save_PlayerData_GetCoinsAddr .public PlayerProfile_GetMoney diff --git a/asm/include/overlay_01_021F3F50.inc b/asm/include/overlay_01_021F3F50.inc index 44da8f6493..c0cc188c48 100644 --- a/asm/include/overlay_01_021F3F50.inc +++ b/asm/include/overlay_01_021F3F50.inc @@ -26,7 +26,7 @@ .public AddTextPrinterParameterized .public AddTextPrinterParameterizedWithColor .public GF_AssertFail -.public String_Delete +.public String_Free .public SaveGameNormal .public Save_PlayerData_GetProfile .public Save_PlayerData_GetIGTAddr diff --git a/asm/include/overlay_01_021F6CFC.inc b/asm/include/overlay_01_021F6CFC.inc index 89eff6bffe..f44d5f67c2 100644 --- a/asm/include/overlay_01_021F6CFC.inc +++ b/asm/include/overlay_01_021F6CFC.inc @@ -15,7 +15,7 @@ .public RemoveWindow .public TextPrinterCheckActive .public String_New -.public String_Delete +.public String_Free .public Save_PlayerData_GetOptionsAddr .public PlayerProfile_New .public Save_Profile_PlayerName_Set diff --git a/asm/include/overlay_01_021FC66C.inc b/asm/include/overlay_01_021FC66C.inc index a6b3cd1f61..eb8834e229 100644 --- a/asm/include/overlay_01_021FC66C.inc +++ b/asm/include/overlay_01_021FC66C.inc @@ -17,7 +17,7 @@ .public LCRandom .public GF_AssertFail .public String_New -.public String_Delete +.public String_Free .public Save_PlayerData_GetOptionsAddr .public Save_GameStats_Get .public GameStats_Inc diff --git a/asm/include/overlay_02.inc b/asm/include/overlay_02.inc index cfb00b2a09..8d6db60e3a 100644 --- a/asm/include/overlay_02.inc +++ b/asm/include/overlay_02.inc @@ -148,7 +148,7 @@ .public Sprite_SetDrawPriority .public GF_AssertFail .public String_New -.public String_Delete +.public String_Free .public Save_SysInfo_RTC_Get .public Save_PlayerData_GetProfile .public Save_PlayerData_GetOptionsAddr diff --git a/asm/include/overlay_03.inc b/asm/include/overlay_03.inc index 42d46687a0..a0b5b4bc27 100644 --- a/asm/include/overlay_03.inc +++ b/asm/include/overlay_03.inc @@ -92,8 +92,8 @@ .public System_GetTouchNew .public GF_AssertFail .public String_New -.public String_Delete -.public String16_FormatInteger +.public String_Free +.public String_FormatInt .public Save_PlayerData_GetProfile .public Save_PlayerData_GetOptionsAddr .public Save_PlayerData_GetIGTAddr diff --git a/asm/include/overlay_05.inc b/asm/include/overlay_05.inc index 9ea038e757..7ba82b7811 100644 --- a/asm/include/overlay_05.inc +++ b/asm/include/overlay_05.inc @@ -124,7 +124,7 @@ .public Sprite_UpdateAnim .public GF_AssertFail .public String_New -.public String_Delete +.public String_Free .public Thunk_G3X_Reset .public GF_3DVramMan_Create .public GF_3DVramMan_Delete diff --git a/asm/include/overlay_08.inc b/asm/include/overlay_08.inc index afacc30df5..2fe63ce7f5 100644 --- a/asm/include/overlay_08.inc +++ b/asm/include/overlay_08.inc @@ -101,7 +101,7 @@ .public TouchscreenHitbox_FindRectAtTouchNew .public System_GetTouchNew .public String_New -.public String_Delete +.public String_Free .public GetMonData .public GetMonExpBySpeciesAndLevel .public GetMonGender diff --git a/asm/include/overlay_102.inc b/asm/include/overlay_102.inc index 0172b8970d..ab0ed821e2 100644 --- a/asm/include/overlay_102.inc +++ b/asm/include/overlay_102.inc @@ -136,11 +136,11 @@ .public TouchscreenHitbox_PointIsIn .public GF_AssertFail .public String_New -.public String_Delete +.public String_Free .public String_CountLines -.public String_GetLineN -.public CopyU16ArrayToStringN -.public String_cstr +.public String_CopyLine +.public String_CopyNumChars +.public String_GetChars .public TouchHitboxController_Create .public TouchHitboxController_Destroy .public TouchHitboxController_IsTriggered diff --git a/asm/include/overlay_103.inc b/asm/include/overlay_103.inc index 7677052c7b..c1963c98d8 100644 --- a/asm/include/overlay_103.inc +++ b/asm/include/overlay_103.inc @@ -127,8 +127,8 @@ .public TouchscreenHitbox_FindRectAtTouchNew .public System_GetTouchNew .public String_New -.public String_Delete -.public CopyU16ArrayToString +.public String_Free +.public String_CopyFromChars .public Save_PlayerData_GetOptionsAddr .public Options_GetTextFrameDelay .public Options_GetFrame diff --git a/asm/include/overlay_108.inc b/asm/include/overlay_108.inc index 81f1ebe021..fdb9d2f801 100644 --- a/asm/include/overlay_108.inc +++ b/asm/include/overlay_108.inc @@ -176,7 +176,7 @@ .public System_GetTouchNew .public GF_AssertFail .public String_New -.public String_Delete +.public String_Free .public Thunk_G3X_Reset .public GF_3DVramMan_InitLinkedListTexVramManager .public GF_3DVramMan_InitLinkedListPlttVramManager diff --git a/asm/include/overlay_109.inc b/asm/include/overlay_109.inc index 43a8a58e51..98cc7e0030 100644 --- a/asm/include/overlay_109.inc +++ b/asm/include/overlay_109.inc @@ -107,8 +107,8 @@ .public Sprite_IsAnimated .public TouchscreenHitbox_FindRectAtTouchNew .public String_New -.public String_Delete -.public CopyU16ArrayToString +.public String_Free +.public String_CopyFromChars .public Save_PlayerData_GetProfile .public Save_PlayerData_GetOptionsAddr .public Options_GetTextFrameDelay diff --git a/asm/include/overlay_111.inc b/asm/include/overlay_111.inc index 280cf01eb9..5a053a293e 100644 --- a/asm/include/overlay_111.inc +++ b/asm/include/overlay_111.inc @@ -98,7 +98,7 @@ .public Sprite_GetVramType .public System_GetTouchNew .public GF_AssertFail -.public String_Delete +.public String_Free .public Options_GetTextFrameDelay .public Options_GetFrame .public GetMonData diff --git a/asm/include/overlay_112.inc b/asm/include/overlay_112.inc index 111b6e6fc9..6e68bc24bf 100644 --- a/asm/include/overlay_112.inc +++ b/asm/include/overlay_112.inc @@ -192,14 +192,14 @@ .public TouchscreenHitbox_TouchNewIsIn .public GF_AssertFail .public String_New -.public String_Delete +.public String_Free .public String_Copy .public String_GetLength -.public CopyU16ArrayToString -.public CopyU16ArrayToStringN -.public CopyStringToU16Array -.public String_Cat -.public String_AddChar +.public String_CopyFromChars +.public String_CopyNumChars +.public String_CopyToChars +.public String_Concat +.public String_AppendChar .public SaveArray_PCStorage_Get .public SaveGameNormal .public Save_ClearStatusFlags diff --git a/asm/include/overlay_113.inc b/asm/include/overlay_113.inc index 464e618c0a..d348f08799 100644 --- a/asm/include/overlay_113.inc +++ b/asm/include/overlay_113.inc @@ -97,7 +97,7 @@ .public Sprite_IsAnimated .public TouchscreenHitbox_FindHitboxAtTouchNew .public String_New -.public String_Delete +.public String_Free .public Save_PlayerData_GetProfile .public Save_PlayerData_GetOptionsAddr .public PlayerProfile_GetPlayerName_NewString diff --git a/asm/include/overlay_115.inc b/asm/include/overlay_115.inc index b42ec75187..45dc0a7822 100644 --- a/asm/include/overlay_115.inc +++ b/asm/include/overlay_115.inc @@ -37,7 +37,7 @@ .public Sprite_SetPriority .public Sprite_GetPaletteProxy .public String_New -.public String_Delete +.public String_Free .public Thunk_G3X_Reset .public RequestSwap3DBuffers .public Save_PlayerData_GetProfile diff --git a/asm/include/overlay_117.inc b/asm/include/overlay_117.inc index c96cff083a..9514b61080 100644 --- a/asm/include/overlay_117.inc +++ b/asm/include/overlay_117.inc @@ -40,7 +40,7 @@ .public Sprite_SetPriority .public Sprite_SetOamMode .public String_New -.public String_Delete +.public String_Free .public G2x_SetBlendAlpha_ .public memset .public _s32_div_f diff --git a/asm/include/overlay_12_022378C0.inc b/asm/include/overlay_12_022378C0.inc index 16fbc57a2b..b17f7e6d1a 100644 --- a/asm/include/overlay_12_022378C0.inc +++ b/asm/include/overlay_12_022378C0.inc @@ -110,7 +110,7 @@ .public GfGfx_BothDispOn .public GF_AssertFail .public String_New -.public String_Delete +.public String_Free .public RequestSwap3DBuffers .public GetMainBgPlttAddr .public sub_02026E8C diff --git a/asm/include/overlay_12_battle_command.inc b/asm/include/overlay_12_battle_command.inc index d6b5005a1a..f2c25df115 100644 --- a/asm/include/overlay_12_battle_command.inc +++ b/asm/include/overlay_12_battle_command.inc @@ -66,7 +66,7 @@ .public Sprite_SetPalOffsetRespectVramOffset .public System_GetTouchNew .public GF_AssertFail -.public String_Delete +.public String_Free .public CalcMonStats .public GetMonData .public SetMonData diff --git a/asm/include/overlay_14.inc b/asm/include/overlay_14.inc index 3d0f934a45..d577fbb868 100644 --- a/asm/include/overlay_14.inc +++ b/asm/include/overlay_14.inc @@ -201,7 +201,7 @@ .public System_GetTouchHeldCoords .public System_GetTouchNewCoords .public String_New -.public String_Delete +.public String_Free .public SaveArray_PCStorage_Get .public Save_PlayerData_GetProfile .public Save_PlayerData_GetOptionsAddr diff --git a/asm/include/overlay_15.inc b/asm/include/overlay_15.inc index 21e051cd6b..a555d22673 100644 --- a/asm/include/overlay_15.inc +++ b/asm/include/overlay_15.inc @@ -141,8 +141,8 @@ .public System_GetTouchHeld .public GF_AssertFail .public String_New -.public String_Delete -.public String16_FormatInteger +.public String_Free +.public String_FormatInt .public Thunk_G3X_Reset .public RequestSwap3DBuffers .public Save_PlayerData_GetProfile diff --git a/asm/include/overlay_18.inc b/asm/include/overlay_18.inc index d25fe3a5aa..268710a232 100644 --- a/asm/include/overlay_18.inc +++ b/asm/include/overlay_18.inc @@ -219,7 +219,7 @@ .public System_GetTouchNewCoords .public GF_AssertFail .public String_New -.public String_Delete +.public String_Free .public PlayerProfile_GetPlayerName_NewString .public PlayerProfile_GetTrainerGender .public Pokedex_CheckMonCaughtFlag diff --git a/asm/include/overlay_27.inc b/asm/include/overlay_27.inc index b1ed0da65b..b72d28fce8 100644 --- a/asm/include/overlay_27.inc +++ b/asm/include/overlay_27.inc @@ -85,7 +85,7 @@ .public TouchscreenHitbox_FindRectAtTouchNew .public System_GetTouchNew .public GF_AssertFail -.public String_Delete +.public String_Free .public Save_PlayerData_GetProfile .public PlayerProfile_GetTrainerGender .public sub_0203769C diff --git a/asm/include/overlay_28.inc b/asm/include/overlay_28.inc index 314353f721..edd6923e12 100644 --- a/asm/include/overlay_28.inc +++ b/asm/include/overlay_28.inc @@ -65,7 +65,7 @@ .public TouchscreenHitbox_TouchNewIsIn .public System_GetTouchNew .public System_GetTouchHeldCoords -.public String_Delete +.public String_Free .public FieldSystem_GetFacingObject .public sub_0203DF8C .public FieldSystem_IsPlayerMovementAllowed diff --git a/asm/include/overlay_29.inc b/asm/include/overlay_29.inc index 2e632c6b6e..21808c2532 100644 --- a/asm/include/overlay_29.inc +++ b/asm/include/overlay_29.inc @@ -58,7 +58,7 @@ .public Sprite_SetAnimCtrlSeq .public Sprite_UpdateAnim .public TouchscreenHitbox_FindRectAtTouchNew -.public String_Delete +.public String_Free .public GXS_SetGraphicsMode .public GX_SetBankForSubBG .public GX_SetBankForSubOBJ diff --git a/asm/include/overlay_31.inc b/asm/include/overlay_31.inc index 6b54301381..094f3e16cf 100644 --- a/asm/include/overlay_31.inc +++ b/asm/include/overlay_31.inc @@ -59,7 +59,7 @@ .public TouchscreenHitbox_FindRectAtTouchNew .public GF_AssertFail .public String_New -.public String_Delete +.public String_Free .public Save_PlayerData_GetProfile .public Save_PlayerData_GetOptionsAddr .public PlayerProfile_GetMoney diff --git a/asm/include/overlay_32.inc b/asm/include/overlay_32.inc index 28821c46b4..18d001e681 100644 --- a/asm/include/overlay_32.inc +++ b/asm/include/overlay_32.inc @@ -64,7 +64,7 @@ .public Sprite_UpdateAnim .public TouchscreenHitbox_FindRectAtTouchNew .public String_New -.public String_Delete +.public String_Free .public PlayerProfile_New .public Save_Profile_PlayerName_Set .public sub_0202C254 diff --git a/asm/include/overlay_33.inc b/asm/include/overlay_33.inc index 82040dbbca..e381bdcb2b 100644 --- a/asm/include/overlay_33.inc +++ b/asm/include/overlay_33.inc @@ -34,7 +34,7 @@ .public AddTextPrinterParameterizedWithColor .public TouchscreenHitbox_FindRectAtTouchHeld .public TouchscreenHitbox_FindRectAtTouchNew -.public String_Delete +.public String_Free .public GXS_SetGraphicsMode .public GX_SetBankForSubBG .public GX_SetBankForSubOBJ diff --git a/asm/include/overlay_34.inc b/asm/include/overlay_34.inc index a27cef58b6..f593ea7877 100644 --- a/asm/include/overlay_34.inc +++ b/asm/include/overlay_34.inc @@ -63,8 +63,8 @@ .public System_GetTouchHeldCoords .public GF_AssertFail .public String_New -.public String_Delete -.public CopyU16ArrayToString +.public String_Free +.public String_CopyFromChars .public Save_PlayerData_GetProfile .public PlayerProfile_GetNamePtr .public PlayerProfile_GetTrainerID diff --git a/asm/include/overlay_37.inc b/asm/include/overlay_37.inc index 10860feb74..f6e55acca6 100644 --- a/asm/include/overlay_37.inc +++ b/asm/include/overlay_37.inc @@ -101,7 +101,7 @@ .public TouchscreenHitbox_FindRectAtTouchNew .public GF_AssertFail .public String_New -.public String_Delete +.public String_Free .public PlayerName_FlatToString .public Options_GetFrame .public sub_02033250 diff --git a/asm/include/overlay_39_thumb.inc b/asm/include/overlay_39_thumb.inc index 03c806d289..fe52f4dab2 100644 --- a/asm/include/overlay_39_thumb.inc +++ b/asm/include/overlay_39_thumb.inc @@ -80,8 +80,8 @@ .public System_GetTouchNew .public GF_AssertFail .public String_New -.public String_Delete -.public CopyStringToU16Array +.public String_Free +.public String_CopyToChars .public SaveArray_CalcCRC16 .public Save_SysInfo_Get .public Save_SysInfo_GetDwcProfileId diff --git a/asm/include/overlay_40.inc b/asm/include/overlay_40.inc index 249abdf7fa..5de9607980 100644 --- a/asm/include/overlay_40.inc +++ b/asm/include/overlay_40.inc @@ -164,15 +164,15 @@ .public System_GetTouchNewCoords .public GF_AssertFail .public String_New -.public String_Delete -.public String_SetEmpty -.public String16_FormatInteger -.public String16_FormatUnsignedLongLong +.public String_Free +.public String_Clear +.public String_FormatInt +.public String_FormatU64 .public String_CountLines -.public String_GetLineN -.public CopyU16ArrayToString -.public CopyStringToU16Array -.public String_Cat +.public String_CopyLine +.public String_CopyFromChars +.public String_CopyToChars +.public String_Concat .public TouchHitboxController_Create .public TouchHitboxController_Destroy .public TouchHitboxController_IsTriggered diff --git a/asm/include/overlay_41.inc b/asm/include/overlay_41.inc index 9ac1fa16d6..eaa34cef2d 100644 --- a/asm/include/overlay_41.inc +++ b/asm/include/overlay_41.inc @@ -182,7 +182,7 @@ .public GF2dGfxRawResMan_DoesNotHaveObjWithId .public GF2dGfxRawResMan_AllocObj .public String_New -.public String_Delete +.public String_Free .public TouchHitboxController_Create .public TouchHitboxController_Destroy .public TouchHitboxController_IsTriggered diff --git a/asm/include/overlay_43.inc b/asm/include/overlay_43.inc index d15b56ed70..44ca4e64a0 100644 --- a/asm/include/overlay_43.inc +++ b/asm/include/overlay_43.inc @@ -146,12 +146,12 @@ .public GF_AssertFail .public GF_SetG2dRendererSurface .public String_New -.public String_Delete -.public String_SetEmpty +.public String_Free +.public String_Clear .public String_Copy -.public String_atoi -.public CopyU16ArrayToString -.public String_cstr +.public String_AtoI +.public String_CopyFromChars +.public String_GetChars .public Save_PlayerData_GetProfile .public Save_PlayerData_GetOptionsAddr .public PlayerProfile_New diff --git a/asm/include/overlay_44.inc b/asm/include/overlay_44.inc index fb60dcc9b6..986d898922 100644 --- a/asm/include/overlay_44.inc +++ b/asm/include/overlay_44.inc @@ -182,8 +182,8 @@ .public System_GetTouchNew .public GF_AssertFail .public String_New -.public String_Delete -.public CopyU16ArrayToString +.public String_Free +.public String_CopyFromChars .public TouchHitboxController_Create .public TouchHitboxController_Destroy .public TouchHitboxController_IsTriggered diff --git a/asm/include/overlay_45_thumb.inc b/asm/include/overlay_45_thumb.inc index 6030e86579..46c516957f 100644 --- a/asm/include/overlay_45_thumb.inc +++ b/asm/include/overlay_45_thumb.inc @@ -92,8 +92,8 @@ .public GF3dGfxRawResObj_GetTex4x4Key .public GF3dGfxRawResObj_GetPlttKey .public String_New -.public String_Delete -.public CopyStringToU16Array +.public String_Free +.public String_CopyToChars .public sub_02026E18 .public SaveArray_CalcCRC16 .public Save_SysInfo_RTC_Get diff --git a/asm/include/overlay_46.inc b/asm/include/overlay_46.inc index 1f57ac74c1..30ec658239 100644 --- a/asm/include/overlay_46.inc +++ b/asm/include/overlay_46.inc @@ -66,7 +66,7 @@ .public System_GetTouchNew .public GF_AssertFail .public String_New -.public String_Delete +.public String_Free .public Save_PlayerData_GetOptionsAddr .public Options_GetTextFrameDelay .public Options_GetFrame diff --git a/asm/include/overlay_47.inc b/asm/include/overlay_47.inc index 7b6ac07342..9a3ec8a188 100644 --- a/asm/include/overlay_47.inc +++ b/asm/include/overlay_47.inc @@ -99,9 +99,9 @@ .public Sprite_SetAnimActiveFlag .public GF_AssertFail .public String_New -.public String_Delete +.public String_Free .public String_Copy -.public CopyU16ArrayToString +.public String_CopyFromChars .public Save_PlayerData_GetOptionsAddr .public PlayerProfile_New .public Options_GetTextFrameDelay diff --git a/asm/include/overlay_48.inc b/asm/include/overlay_48.inc index 7b12579e63..f43ced3fb5 100644 --- a/asm/include/overlay_48.inc +++ b/asm/include/overlay_48.inc @@ -127,7 +127,7 @@ .public Sprite_SetAnimSpeed .public GF_AssertFail .public String_New -.public String_Delete +.public String_Free .public Thunk_G3X_Reset .public RequestSwap3DBuffers .public GF_3DVramMan_Create diff --git a/asm/include/overlay_49.inc b/asm/include/overlay_49.inc index f3ce78d1da..2835c3ae62 100644 --- a/asm/include/overlay_49.inc +++ b/asm/include/overlay_49.inc @@ -189,7 +189,7 @@ .public GF_AssertFail .public G3dResFileHeader_GetSizeWithoutTex .public String_New -.public String_Delete +.public String_Free .public String_Copy .public String_GetLength .public TouchHitboxController_Create diff --git a/asm/include/overlay_56.inc b/asm/include/overlay_56.inc index 0b8d12b90c..b3d223c559 100644 --- a/asm/include/overlay_56.inc +++ b/asm/include/overlay_56.inc @@ -98,8 +98,8 @@ .public System_GetTouchHeld .public System_GetTouchNew .public String_New -.public String_Delete -.public String_SetEmpty +.public String_Free +.public String_Clear .public Options_GetTextFrameDelay .public Options_GetFrame .public sub_0203A964 diff --git a/asm/include/overlay_57.inc b/asm/include/overlay_57.inc index 2c5ad3b02e..5804cbaf13 100644 --- a/asm/include/overlay_57.inc +++ b/asm/include/overlay_57.inc @@ -165,8 +165,8 @@ .public System_GetTouchHeldCoords .public GF_AssertFail .public String_New -.public String_Delete -.public String16_FormatInteger +.public String_Free +.public String_FormatInt .public TouchHitboxController_Create .public TouchHitboxController_Destroy .public TouchHitboxController_IsTriggered diff --git a/asm/include/overlay_59.inc b/asm/include/overlay_59.inc index 5f1f3114c4..0155074b46 100644 --- a/asm/include/overlay_59.inc +++ b/asm/include/overlay_59.inc @@ -155,7 +155,7 @@ .public TouchscreenHitbox_PointIsIn .public GF_AssertFail .public String_New -.public String_Delete +.public String_Free .public Thunk_G3X_Reset .public GF_3DVramMan_Create .public GF_3DVramMan_Delete diff --git a/asm/include/overlay_64.inc b/asm/include/overlay_64.inc index 188e683750..2368447fcd 100644 --- a/asm/include/overlay_64.inc +++ b/asm/include/overlay_64.inc @@ -93,7 +93,7 @@ .public Sprite_GetPaletteProxy .public TouchscreenHitbox_FindRectAtTouchNew .public String_New -.public String_Delete +.public String_Free .public Save_HOF_GetNumRecords .public Save_HOF_TranslateRecordIdx .public Save_HOF_RecordCountMons diff --git a/asm/include/overlay_65.inc b/asm/include/overlay_65.inc index 11bf752168..54c5bf6452 100644 --- a/asm/include/overlay_65.inc +++ b/asm/include/overlay_65.inc @@ -139,9 +139,9 @@ .public TouchscreenHitbox_FindRectAtTouchNew .public GF_AssertFail .public String_New -.public String_Delete -.public String16_FormatInteger -.public CopyU16ArrayToString +.public String_Free +.public String_FormatInt +.public String_CopyFromChars .public PlayerProfile_New .public PlayerProfile_Copy .public Save_Profile_PlayerName_Set diff --git a/asm/include/overlay_67.inc b/asm/include/overlay_67.inc index ef9261b671..258e3323f4 100644 --- a/asm/include/overlay_67.inc +++ b/asm/include/overlay_67.inc @@ -87,9 +87,9 @@ .public TouchscreenHitbox_TouchNewIsIn .public System_GetTouchNew .public String_New -.public String_Delete +.public String_Free .public String_Copy -.public CopyU16ArrayToString +.public String_CopyFromChars .public Save_PlayerData_GetOptionsAddr .public sub_0202D488 .public sub_0202D5DC diff --git a/asm/include/overlay_68.inc b/asm/include/overlay_68.inc index ada3f2117d..f11701e4cf 100644 --- a/asm/include/overlay_68.inc +++ b/asm/include/overlay_68.inc @@ -127,7 +127,7 @@ .public Camera_Init_FromPosDistanceAndAngle .public System_GetTouchNew .public String_New -.public String_Delete +.public String_Free .public Thunk_G3X_Reset .public Options_GetTextFrameDelay .public Options_GetFrame diff --git a/asm/include/overlay_69.inc b/asm/include/overlay_69.inc index 37b637c24b..d0a9a4a988 100644 --- a/asm/include/overlay_69.inc +++ b/asm/include/overlay_69.inc @@ -85,7 +85,7 @@ .public Camera_GetDistance .public System_GetTouchNew .public String_New -.public String_Delete +.public String_Free .public Thunk_G3X_Reset .public RequestSwap3DBuffers .public Save_PlayerData_GetOptionsAddr diff --git a/asm/include/overlay_70.inc b/asm/include/overlay_70.inc index 28c6fa0ebd..cb937a378c 100644 --- a/asm/include/overlay_70.inc +++ b/asm/include/overlay_70.inc @@ -169,8 +169,8 @@ .public TouchscreenHitbox_FindRectAtTouchNew .public GF_AssertFail .public String_New -.public String_Delete -.public CopyU16ArrayToString +.public String_Free +.public String_CopyFromChars .public SetAllPCBoxesModified .public Save_PrepareForAsyncWrite .public Save_WriteFileAsync diff --git a/asm/include/overlay_71.inc b/asm/include/overlay_71.inc index 5c0ae05836..dda0f07914 100644 --- a/asm/include/overlay_71.inc +++ b/asm/include/overlay_71.inc @@ -126,7 +126,7 @@ .public Sprite_IsAnimated .public GF_AssertFail .public String_New -.public String_Delete +.public String_Free .public RequestSwap3DBuffers .public GF_3DVramMan_InitFrameTexVramManager .public GF_3DVramMan_InitFramePlttVramManager diff --git a/asm/include/overlay_72.inc b/asm/include/overlay_72.inc index faf72b6028..cb53d99881 100644 --- a/asm/include/overlay_72.inc +++ b/asm/include/overlay_72.inc @@ -111,7 +111,7 @@ .public TouchscreenHitbox_FindRectAtTouchNew .public GF_AssertFail .public String_New -.public String_Delete +.public String_Free .public Save_PrepareForAsyncWrite .public Save_WriteFileAsync .public Save_SysInfo_GetDwcProfileId diff --git a/asm/include/overlay_73.inc b/asm/include/overlay_73.inc index 0f2153c446..3b598f42ee 100644 --- a/asm/include/overlay_73.inc +++ b/asm/include/overlay_73.inc @@ -125,8 +125,8 @@ .public System_GetTouchHeld .public GF_AssertFail .public String_New -.public String_Delete -.public String16_FormatInteger +.public String_Free +.public String_FormatInt .public sub_020270C4 .public Save_PrepareForAsyncWrite .public Save_WriteFileAsync diff --git a/asm/include/overlay_74_thumb.inc b/asm/include/overlay_74_thumb.inc index 0b7391d236..cf40b0e89f 100644 --- a/asm/include/overlay_74_thumb.inc +++ b/asm/include/overlay_74_thumb.inc @@ -177,12 +177,12 @@ .public System_GetTouchNew .public GF_AssertFail .public String_New -.public String_Delete -.public String_SetEmpty -.public String16_FormatInteger -.public CopyU16ArrayToString -.public CopyU16ArrayToStringN -.public CopyStringToU16Array +.public String_Free +.public String_Clear +.public String_FormatInt +.public String_CopyFromChars +.public String_CopyNumChars +.public String_CopyToChars .public sub_02027098 .public Save_MysteryGift_Get .public Save_MigratedPokemon_Get diff --git a/asm/include/overlay_75.inc b/asm/include/overlay_75.inc index 4c153c1ede..c832538501 100644 --- a/asm/include/overlay_75.inc +++ b/asm/include/overlay_75.inc @@ -101,14 +101,14 @@ .public GfGfx_SwapDisplay .public GF_AssertFail .public String_New -.public String_Delete +.public String_Free .public String_Copy -.public String_atoi +.public String_AtoI .public String_Compare .public String_GetLength .public String_CountLines -.public String_GetLineN -.public CopyStringToU16Array +.public String_CopyLine +.public String_CopyToChars .public SaveGameNormal .public Save_ClearStatusFlags .public Save_SysInfo_Get diff --git a/asm/include/overlay_80_02229EE0.inc b/asm/include/overlay_80_02229EE0.inc index 5ecef92a50..6aa3422b09 100644 --- a/asm/include/overlay_80_02229EE0.inc +++ b/asm/include/overlay_80_02229EE0.inc @@ -17,8 +17,8 @@ .public Sprite_SetAnimationFrame .public Sprite_GetAnimationFrame .public GF_AssertFail -.public String_Delete -.public CopyStringToU16Array +.public String_Free +.public String_CopyToChars .public Save_PlayerData_GetProfile .public PlayerProfile_GetTrainerGender .public PlayerProfile_GetVersion diff --git a/asm/include/overlay_80_0222A84C.inc b/asm/include/overlay_80_0222A84C.inc index 3b86a6f635..0a41d9ea84 100644 --- a/asm/include/overlay_80_0222A84C.inc +++ b/asm/include/overlay_80_0222A84C.inc @@ -9,7 +9,7 @@ .public Heap_Free .public GF_AssertFail .public String_New -.public String_Delete +.public String_Free .public sub_0209680C .public MI_CpuFill8 .public FrontierSystem_Create diff --git a/asm/include/overlay_80_0222BDF4.inc b/asm/include/overlay_80_0222BDF4.inc index 1e801871d4..507000a1c0 100644 --- a/asm/include/overlay_80_0222BDF4.inc +++ b/asm/include/overlay_80_0222BDF4.inc @@ -107,7 +107,7 @@ .public System_GetTouchNew .public GF_AssertFail .public String_New -.public String_Delete +.public String_Free .public String_Copy .public sub_020270C4 .public SaveGameNormal diff --git a/asm/include/overlay_80_022324C4.inc b/asm/include/overlay_80_022324C4.inc index 07364a9d7b..b5355d5e93 100644 --- a/asm/include/overlay_80_022324C4.inc +++ b/asm/include/overlay_80_022324C4.inc @@ -18,7 +18,7 @@ .public AddTextPrinterParameterized .public GF_AssertFail .public String_New -.public String_Delete +.public String_Free .public Save_PlayerData_GetProfile .public Save_GameStats_Get .public GameStats_Add diff --git a/asm/include/overlay_80_0223A00C.inc b/asm/include/overlay_80_0223A00C.inc index dfe048859a..d6c0720bce 100644 --- a/asm/include/overlay_80_0223A00C.inc +++ b/asm/include/overlay_80_0223A00C.inc @@ -60,7 +60,7 @@ .public Sprite_SetAffineOverwriteMode .public Sprite_SetAnimCtrlSeq .public GF_AssertFail -.public String_Delete +.public String_Free .public FX_Div .public FX_ModS32 .public MIi_CpuCopy16 diff --git a/asm/include/overlay_81.inc b/asm/include/overlay_81.inc index 575d83f8d2..89e33a586a 100644 --- a/asm/include/overlay_81.inc +++ b/asm/include/overlay_81.inc @@ -156,9 +156,9 @@ .public Sprite_SetOamMode .public GF_AssertFail .public String_New -.public String_Delete -.public String_SetEmpty -.public CopyU16ArrayToString +.public String_Free +.public String_Clear +.public String_CopyFromChars .public Thunk_G3X_Reset .public GF_3DVramMan_Create .public GF_3DVramMan_Delete diff --git a/asm/include/overlay_82.inc b/asm/include/overlay_82.inc index dfecc62e37..0d5c3a88db 100644 --- a/asm/include/overlay_82.inc +++ b/asm/include/overlay_82.inc @@ -119,9 +119,9 @@ .public Sprite_SetPalOffsetRespectVramOffset .public GF_AssertFail .public String_New -.public String_Delete -.public String_SetEmpty -.public CopyU16ArrayToString +.public String_Free +.public String_Clear +.public String_CopyFromChars .public Save_PlayerData_GetProfile .public Save_PlayerData_GetOptionsAddr .public Options_GetTextFrameDelay diff --git a/asm/include/overlay_83.inc b/asm/include/overlay_83.inc index 81d69e7a10..37f988d3f7 100644 --- a/asm/include/overlay_83.inc +++ b/asm/include/overlay_83.inc @@ -161,8 +161,8 @@ .public System_GetTouchNew .public GF_AssertFail .public String_New -.public String_Delete -.public CopyU16ArrayToString +.public String_Free +.public String_CopyFromChars .public Save_PlayerData_GetProfile .public Save_PlayerData_GetOptionsAddr .public PlayerProfile_GetNamePtr diff --git a/asm/include/overlay_85.inc b/asm/include/overlay_85.inc index 2f821cef37..4f3b9e2008 100644 --- a/asm/include/overlay_85.inc +++ b/asm/include/overlay_85.inc @@ -164,7 +164,7 @@ .public System_GetTouchNew .public GF_AssertFail .public String_New -.public String_Delete +.public String_Free .public Thunk_G3X_Reset .public RequestSwap3DBuffers .public GF_3DVramMan_InitFrameTexVramManager diff --git a/asm/include/overlay_86.inc b/asm/include/overlay_86.inc index a50b788781..f5e493d0bf 100644 --- a/asm/include/overlay_86.inc +++ b/asm/include/overlay_86.inc @@ -98,7 +98,7 @@ .public TouchscreenHitbox_FindRectAtTouchNew .public TouchscreenHitbox_TouchNewIsIn .public String_New -.public String_Delete +.public String_Free .public Save_PlayerData_GetOptionsAddr .public Options_GetFrame .public sub_0202D5DC diff --git a/asm/include/overlay_87.inc b/asm/include/overlay_87.inc index c33ef963af..8634278a4f 100644 --- a/asm/include/overlay_87.inc +++ b/asm/include/overlay_87.inc @@ -134,7 +134,7 @@ .public System_GetTouchHeldCoords .public GF_AssertFail .public String_New -.public String_Delete +.public String_Free .public Save_PlayerData_GetOptionsAddr .public Options_GetFrame .public NNS_G2dInitOamManagerModule diff --git a/asm/include/overlay_88.inc b/asm/include/overlay_88.inc index c3b86250d4..e7a6ee6f1a 100644 --- a/asm/include/overlay_88.inc +++ b/asm/include/overlay_88.inc @@ -73,11 +73,11 @@ .public SpriteList_RenderAndAnimateSprites .public GF_AssertFail .public String_New -.public String_Delete +.public String_Free .public String_Copy .public String_GetLength .public String_CountLines -.public String_GetLineN +.public String_CopyLine .public sub_0203A880 .public NNS_G2dInitOamManagerModule .public GX_LoadBGPltt diff --git a/asm/include/overlay_89.inc b/asm/include/overlay_89.inc index e3c689b930..7ab153c0a8 100644 --- a/asm/include/overlay_89.inc +++ b/asm/include/overlay_89.inc @@ -172,7 +172,7 @@ .public TouchscreenHitbox_FindRectAtTouchNew .public GF_AssertFail .public String_New -.public String_Delete +.public String_Free .public Thunk_G3X_Reset .public RequestSwap3DBuffers .public GF_3DVramMan_Create diff --git a/asm/include/overlay_90.inc b/asm/include/overlay_90.inc index b6bb9850c6..24b888c5da 100644 --- a/asm/include/overlay_90.inc +++ b/asm/include/overlay_90.inc @@ -132,7 +132,7 @@ .public Sprite_IsAnimated .public GF_AssertFail .public String_New -.public String_Delete +.public String_Free .public Save_PlayerData_GetProfile .public Save_PlayerData_GetOptionsAddr .public Options_GetFrame diff --git a/asm/include/overlay_91.inc b/asm/include/overlay_91.inc index 0f94bae071..be455af590 100644 --- a/asm/include/overlay_91.inc +++ b/asm/include/overlay_91.inc @@ -154,8 +154,8 @@ .public Sprite_GetDrawPriority .public GF_AssertFail .public String_New -.public String_Delete -.public String16_FormatInteger +.public String_Free +.public String_FormatInt .public Thunk_G3X_Reset .public RequestSwap3DBuffers .public GF_3DVramMan_Create diff --git a/asm/include/overlay_92.inc b/asm/include/overlay_92.inc index 4dfe3de931..254f1c07c7 100644 --- a/asm/include/overlay_92.inc +++ b/asm/include/overlay_92.inc @@ -138,7 +138,7 @@ .public System_GetTouchHeldCoords .public TouchscreenHitbox_FindHitboxAtPoint .public GF_AssertFail -.public String_Delete +.public String_Free .public Thunk_G3X_Reset .public RequestSwap3DBuffers .public GF_3DVramMan_Create diff --git a/asm/include/overlay_93_thumb_1.inc b/asm/include/overlay_93_thumb_1.inc index f280501535..9384ab4694 100644 --- a/asm/include/overlay_93_thumb_1.inc +++ b/asm/include/overlay_93_thumb_1.inc @@ -139,7 +139,7 @@ .public Camera_ApplyPerspectiveType .public GF_AssertFail .public String_New -.public String_Delete +.public String_Free .public Thunk_G3X_Reset .public RequestSwap3DBuffers .public GF_3DVramMan_Create diff --git a/asm/include/overlay_93_thumb_2.inc b/asm/include/overlay_93_thumb_2.inc index 45b99936b0..c42a159f53 100644 --- a/asm/include/overlay_93_thumb_2.inc +++ b/asm/include/overlay_93_thumb_2.inc @@ -57,7 +57,7 @@ .public sub_02021AC8 .public sub_02021B5C .public GF_AssertFail -.public String_Delete +.public String_Free .public sub_0203410C .public sub_020342C0 .public sub_02037030 diff --git a/asm/include/overlay_95.inc b/asm/include/overlay_95.inc index b4a0536f6b..786825b51e 100644 --- a/asm/include/overlay_95.inc +++ b/asm/include/overlay_95.inc @@ -140,7 +140,7 @@ .public TouchscreenHitbox_FindRectAtTouchNew .public GF_AssertFail .public String_New -.public String_Delete +.public String_Free .public Thunk_G3X_Reset .public RequestSwap3DBuffers .public GF_3DVramMan_Create diff --git a/asm/include/overlay_96.inc b/asm/include/overlay_96.inc index 23567b5cb0..fd2850bc40 100644 --- a/asm/include/overlay_96.inc +++ b/asm/include/overlay_96.inc @@ -277,10 +277,10 @@ .public System_GetTouchNewCoords .public GF_AssertFail .public String_New -.public String_Delete +.public String_Free .public String_Copy -.public CopyU16ArrayToString -.public String_cstr +.public String_CopyFromChars +.public String_GetChars .public Thunk_G3X_Reset .public RequestSwap3DBuffers .public Save_PlayerData_GetProfile diff --git a/asm/include/overlay_97.inc b/asm/include/overlay_97.inc index 8b640134ab..326e83c501 100644 --- a/asm/include/overlay_97.inc +++ b/asm/include/overlay_97.inc @@ -72,8 +72,8 @@ .public Sprite_SetPriority .public GF_AssertFail .public String_New -.public String_Delete -.public CopyU16ArrayToString +.public String_Free +.public String_CopyFromChars .public SaveArray_PCStorage_Get .public Save_Pokeathlon_Get .public sub_020319A8 diff --git a/asm/include/overlay_98.inc b/asm/include/overlay_98.inc index ee8ea195f6..9708856b7c 100644 --- a/asm/include/overlay_98.inc +++ b/asm/include/overlay_98.inc @@ -68,7 +68,7 @@ .public TouchscreenHitbox_TouchNewIsIn .public GF_AssertFail .public String_New -.public String_Delete +.public String_Free .public GetMonSpriteCharAndPlttNarcIdsEx .public GetMonIconNaixEx .public GetMonIconPaletteEx diff --git a/asm/include/overlay_99.inc b/asm/include/overlay_99.inc index d4b5f25f99..be313813cd 100644 --- a/asm/include/overlay_99.inc +++ b/asm/include/overlay_99.inc @@ -71,8 +71,8 @@ .public TouchscreenHitbox_FindHitboxAtTouchNew .public GF_AssertFail .public String_New -.public String_Delete -.public CopyU16ArrayToString +.public String_Free +.public String_CopyFromChars .public PlayerProfile_GetTrainerGender .public Pokedex_GetSeenSpindaPersonality .public Pokedex_SpeciesGetLastSeenGender diff --git a/asm/include/overlay_trainer_card_main.inc b/asm/include/overlay_trainer_card_main.inc index b01a60f1b5..66b859c159 100644 --- a/asm/include/overlay_trainer_card_main.inc +++ b/asm/include/overlay_trainer_card_main.inc @@ -120,9 +120,9 @@ .public System_GetTouchNew .public GF_AssertFail .public String_New -.public String_Delete -.public String16_FormatInteger -.public CopyU16ArrayToString +.public String_Free +.public String_FormatInt +.public String_CopyFromChars .public Save_PlayerData_GetOptionsAddr .public Options_GetTextFrameDelay .public Options_GetFrame diff --git a/asm/include/overlay_trainer_card_signature.inc b/asm/include/overlay_trainer_card_signature.inc index 62bd9a6c40..330ba6b9fc 100644 --- a/asm/include/overlay_trainer_card_signature.inc +++ b/asm/include/overlay_trainer_card_signature.inc @@ -102,7 +102,7 @@ .public TouchscreenHitbox_FindRectAtTouchNew .public GF_AssertFail .public String_New -.public String_Delete +.public String_Free .public Save_PlayerData_GetOptionsAddr .public Options_GetTextFrameDelay .public Options_GetFrame diff --git a/asm/include/unk_02014DA0.inc b/asm/include/unk_02014DA0.inc index 797ad7abfa..398fc2c913 100644 --- a/asm/include/unk_02014DA0.inc +++ b/asm/include/unk_02014DA0.inc @@ -59,8 +59,8 @@ .public Camera_ApplyPerspectiveType .public GF_AssertFail .public String_New -.public String_Delete -.public CopyU16ArrayToString +.public String_Free +.public String_CopyFromChars .public SPL_DeleteAll .public SPL_Delete .public SPL_CreateWithInitialize diff --git a/asm/include/unk_0202B614.inc b/asm/include/unk_0202B614.inc index 4c41978820..10dc806e81 100644 --- a/asm/include/unk_0202B614.inc +++ b/asm/include/unk_0202B614.inc @@ -7,8 +7,8 @@ .public sub_02015FF8 .public Heap_Alloc .public GF_AssertFail -.public CopyU16ArrayToString -.public CopyStringToU16Array +.public String_CopyFromChars +.public String_CopyToChars .public SaveArray_Get .public Save_FashionData_Init .public Save_FashionData_sizeof diff --git a/asm/include/unk_0202C034.inc b/asm/include/unk_0202C034.inc index 1df5cacb5c..8ef449a8e1 100644 --- a/asm/include/unk_0202C034.inc +++ b/asm/include/unk_0202C034.inc @@ -2,7 +2,7 @@ #pragma once .public GF_RTC_CopyDate .public GF_AssertFail -.public CopyStringToU16Array +.public String_CopyToChars .public SaveArray_Get .public sub_0202C034 .public sub_0202C03C diff --git a/asm/include/unk_0202C730.inc b/asm/include/unk_0202C730.inc index 608a7dbd9f..dfb947d40d 100644 --- a/asm/include/unk_0202C730.inc +++ b/asm/include/unk_0202C730.inc @@ -2,7 +2,7 @@ #pragma once .public StringNotEqualN .public PRandom -.public CopyStringToU16Array +.public String_CopyToChars .public SaveArray_Get .public Save_FriendGroup_sizeof .public sub_0202C738 diff --git a/asm/include/unk_02030A98.inc b/asm/include/unk_02030A98.inc index 05a4de7b4b..41c138ffb8 100644 --- a/asm/include/unk_02030A98.inc +++ b/asm/include/unk_02030A98.inc @@ -8,7 +8,7 @@ .public Heap_Free .public GF_AssertFail .public String_New -.public CopyU16ArrayToStringN +.public String_CopyNumChars .public sub_02027144 .public sub_02027158 .public SaveArray_Get diff --git a/asm/include/unk_02031B0C.inc b/asm/include/unk_02031B0C.inc index 677d57ba1c..b5bb48d0e7 100644 --- a/asm/include/unk_02031B0C.inc +++ b/asm/include/unk_02031B0C.inc @@ -10,7 +10,7 @@ .public Heap_AllocAtEnd .public GF_AssertFail .public String_New -.public CopyU16ArrayToString +.public String_CopyFromChars .public SaveArray_Get .public PlayerProfile_GetNamePtr .public PlayerProfile_GetTrainerID diff --git a/asm/include/unk_02037C94.inc b/asm/include/unk_02037C94.inc index b72de65967..e5024ca428 100644 --- a/asm/include/unk_02037C94.inc +++ b/asm/include/unk_02037C94.inc @@ -10,8 +10,8 @@ .public Heap_Free .public GF_AssertFail .public String_New -.public String_Delete -.public CopyU16ArrayToString +.public String_Free +.public String_CopyFromChars .public Save_PrepareForAsyncWrite .public Save_WriteFileAsync .public Save_Cancel diff --git a/asm/include/unk_02058AEC.inc b/asm/include/unk_02058AEC.inc index 018f56cb1a..3755faeede 100644 --- a/asm/include/unk_02058AEC.inc +++ b/asm/include/unk_02058AEC.inc @@ -36,7 +36,7 @@ .public AddTextPrinterParameterized .public GF_AssertFail .public String_New -.public String_Delete +.public String_Free .public Save_PlayerData_GetProfile .public Save_PlayerData_GetOptionsAddr .public LinkBattleRuleset_GetRuleValue diff --git a/asm/include/unk_0205AC88.inc b/asm/include/unk_0205AC88.inc index dba8c00b57..ad90162740 100644 --- a/asm/include/unk_0205AC88.inc +++ b/asm/include/unk_0205AC88.inc @@ -10,7 +10,7 @@ .public Heap_Free .public GF_AssertFail .public String_New -.public String_Delete +.public String_Free .public SaveArray_Get .public PlayerProfile_GetTrainerID .public PlayerProfile_GetAvatar diff --git a/asm/include/unk_020755E8.inc b/asm/include/unk_020755E8.inc index caa5d0dcb3..416e016ffa 100644 --- a/asm/include/unk_020755E8.inc +++ b/asm/include/unk_020755E8.inc @@ -120,7 +120,7 @@ .public TouchscreenHitbox_FindRectAtTouchNew .public GF_AssertFail .public String_New -.public String_Delete +.public String_Free .public RequestSwap3DBuffers .public GetMainBgPlttAddr .public sub_02026E8C diff --git a/asm/include/unk_020850F4.inc b/asm/include/unk_020850F4.inc index 5518c3cb76..ebf3c88828 100644 --- a/asm/include/unk_020850F4.inc +++ b/asm/include/unk_020850F4.inc @@ -38,7 +38,7 @@ .public GfGfx_SwapDisplay .public GF_AssertFail .public String_New -.public String_Delete +.public String_Free .public TouchHitboxController_Destroy .public sub_0203A880 .public sub_0203A914 diff --git a/asm/include/unk_02085604.inc b/asm/include/unk_02085604.inc index 1f273cbd90..456dba5e89 100644 --- a/asm/include/unk_02085604.inc +++ b/asm/include/unk_02085604.inc @@ -12,9 +12,9 @@ .public Heap_Free .public System_GetTouchHeld .public String_New -.public String_Delete -.public String16_FormatInteger -.public String_Cat +.public String_Free +.public String_FormatInt +.public String_Concat .public TouchHitboxController_Create .public TouchHitboxController_IsTriggered .public sub_0203A4AC diff --git a/asm/include/unk_020863F4.inc b/asm/include/unk_020863F4.inc index 7c2d5e26c7..b35fe58533 100644 --- a/asm/include/unk_020863F4.inc +++ b/asm/include/unk_020863F4.inc @@ -53,7 +53,7 @@ .public sub_02021AC8 .public sub_02021B5C .public GF_AssertFail -.public String_Delete +.public String_Free .public Options_GetFrame .public sub_020863F4 .public sub_02086490 diff --git a/asm/include/unk_02088288.inc b/asm/include/unk_02088288.inc index 72e54c3cda..b436c86499 100644 --- a/asm/include/unk_02088288.inc +++ b/asm/include/unk_02088288.inc @@ -86,8 +86,8 @@ .public TouchscreenHitbox_FindRectAtTouchNew .public TouchscreenHitbox_TouchNewIsIn .public String_New -.public String_Delete -.public CopyU16ArrayToString +.public String_Free +.public String_CopyFromChars .public PlayerProfile_GetNamePtr .public PlayerProfile_GetTrainerID .public PlayerProfile_GetTrainerGender diff --git a/asm/include/unk_0208C3E4.inc b/asm/include/unk_0208C3E4.inc index 08b4a766a6..4563174191 100644 --- a/asm/include/unk_0208C3E4.inc +++ b/asm/include/unk_0208C3E4.inc @@ -26,7 +26,7 @@ .public GetWindowWidth .public ScheduleBgTilemapBufferTransfer .public AddTextPrinterParameterizedWithColor -.public String_Delete +.public String_Free .public String_Compare .public AllocMonZeroed .public CopyBoxPokemonToPokemon diff --git a/asm/include/unk_020932E0.inc b/asm/include/unk_020932E0.inc index c603bab181..db3fc51444 100644 --- a/asm/include/unk_020932E0.inc +++ b/asm/include/unk_020932E0.inc @@ -77,7 +77,7 @@ .public System_GetTouchHeldCoords .public GF_AssertFail .public String_New -.public String_Delete +.public String_Free .public GetMonData .public GetMonIconNaixEx .public GetMonIconPaletteEx diff --git a/asm/overlay_01_021EDAFC.s b/asm/overlay_01_021EDAFC.s index 83d396488d..5784891c8a 100644 --- a/asm/overlay_01_021EDAFC.s +++ b/asm/overlay_01_021EDAFC.s @@ -373,7 +373,7 @@ ov01_021EDD68: ; 0x021EDD68 add r0, #0xbc str r1, [r0] add r0, r4, #0 - bl String_Delete + bl String_Free add r0, r5, #0 add r0, #0x9b ldrb r0, [r0] @@ -561,7 +561,7 @@ ov01_021EDF00: ; 0x021EDF00 add r5, r6, #0 _021EDF08: ldr r0, [r5, #0x1c] - bl String_Delete + bl String_Free add r4, r4, #1 add r5, r5, #4 cmp r4, #0x1c @@ -1026,7 +1026,7 @@ MoveTutorMenu_SetListItem_Internal: ; 0x021EE244 lsl r1, r1, #2 str r0, [r2, r1] add r0, r6, #0 - bl String_Delete + bl String_Free cmp r4, #0xfa bne _021EE2B4 add r0, r5, #0 @@ -1426,7 +1426,7 @@ ov01_021EE568: ; 0x021EE568 add r5, r6, #0 _021EE598: ldr r0, [r5, #0x1c] - bl String_Delete + bl String_Free add r4, r4, #1 add r5, r5, #4 cmp r4, #0x1c @@ -1491,9 +1491,9 @@ ov01_021EE5D0: ; 0x021EE5D0 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} thumb_func_end ov01_021EE5D0 @@ -1678,9 +1678,9 @@ ov01_021EE754: ; 0x021EE754 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 @@ -1710,7 +1710,7 @@ ov01_021EE7B8: ; 0x021EE7B8 add r5, r6, #0 _021EE7E4: ldr r0, [r5, #0x1c] - bl String_Delete + bl String_Free add r4, r4, #1 add r5, r5, #4 cmp r4, #0x1c @@ -2154,7 +2154,7 @@ FieldSystem_ShowMoneyBox: ; 0x021EEA90 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 MoneyBoxSys_Update @@ -2240,9 +2240,9 @@ MoneyBoxSys_Update: ; 0x021EEB4C 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] @@ -2405,9 +2405,9 @@ _021EED04: str r1, [sp, #8] bl AddTextPrinterParameterized add r0, r4, #0 - bl String_Delete + bl String_Free add r0, r6, #0 - bl String_Delete + bl String_Free ldr r0, [sp, #0x10] bl MessageFormat_Delete add r0, r7, #0 @@ -2479,7 +2479,7 @@ ov01_021EED60: ; 0x021EED60 str r1, [sp, #8] bl AddTextPrinterParameterized add r0, r6, #0 - bl String_Delete + bl String_Free ldr r1, _021EEE2C ; =0x0000014B add r0, r7, #0 bl NewString_ReadMsgData @@ -2495,7 +2495,7 @@ ov01_021EED60: ; 0x021EED60 str r1, [sp, #8] bl AddTextPrinterParameterized add r0, r6, #0 - bl String_Delete + bl String_Free add r0, r7, #0 bl DestroyMsgData add r0, r5, #0 @@ -2627,9 +2627,9 @@ ov01_021EEE44: ; 0x021EEE44 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] @@ -2731,9 +2731,9 @@ ov01_021EEF9C: ; 0x021EEF9C mov r1, #1 bl AddTextPrinterParameterized add r0, r7, #0 - bl String_Delete + bl String_Free ldr r0, [sp, #0xc] - bl String_Delete + bl String_Free _021EF006: add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} diff --git a/asm/overlay_01_021F3F50.s b/asm/overlay_01_021F3F50.s index 34af9e6db4..0541ced560 100644 --- a/asm/overlay_01_021F3F50.s +++ b/asm/overlay_01_021F3F50.s @@ -172,7 +172,7 @@ ov01_021F4048: ; 0x021F4048 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, _021F4124 ; =ov01_02206AF4 @@ -203,7 +203,7 @@ _021F40A6: 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] @@ -230,7 +230,7 @@ _021F40A6: add r2, r6, #0 bl AddTextPrinterParameterized add r0, r6, #0 - bl String_Delete + bl String_Free _021F410E: ldr r0, [sp, #0xc] add r7, r7, #4 @@ -465,7 +465,7 @@ _021F429C: ldr r0, [r5, #0x10] bl AddTextPrinterParameterizedWithColor add r0, r6, #0 - bl String_Delete + bl String_Free _021F42E2: add r7, r7, #1 add r4, #0x10 diff --git a/asm/overlay_01_021F6CFC.s b/asm/overlay_01_021F6CFC.s index 83fbbdeac1..509c87cbc7 100644 --- a/asm/overlay_01_021F6CFC.s +++ b/asm/overlay_01_021F6CFC.s @@ -736,9 +736,9 @@ ov01_021F7268: ; 0x021F7268 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/asm/overlay_01_021FC66C.s b/asm/overlay_01_021FC66C.s index ac267a40b9..f2260fd8dc 100644 --- a/asm/overlay_01_021FC66C.s +++ b/asm/overlay_01_021FC66C.s @@ -715,9 +715,9 @@ ov01_021FCB4C: ; 0x021FCB4C 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/asm/overlay_02_02245B80.s b/asm/overlay_02_02245B80.s index 67a4e30b74..d5fa1ab120 100644 --- a/asm/overlay_02_02245B80.s +++ b/asm/overlay_02_02245B80.s @@ -1760,7 +1760,7 @@ ov02_0224686C: ; 0x0224686C add r0, r5, #0 bl ScheduleWindowCopyToVram add r0, r7, #0 - bl String_Delete + bl String_Free add r0, r4, #0 bl DestroyMsgData add sp, #0x10 @@ -21139,7 +21139,7 @@ _0224FA50: add r0, r4, #0 bl RemoveWindow ldr r0, [r4, #0x10] - bl String_Delete + bl String_Free add r0, r5, #0 add r0, #0xd2 ldrb r1, [r0] @@ -21173,7 +21173,7 @@ _0224FABA: add r0, r4, #0 bl RemoveWindow ldr r0, [r4, #0x10] - bl String_Delete + bl String_Free add r0, r5, #0 add r0, #0xd2 ldrb r1, [r0] @@ -21430,7 +21430,7 @@ FollowMon_ExpandInteractionMessage: ; 0x0224FC8C add r2, r6, #0 bl StringExpandPlaceholders add r0, r6, #0 - bl String_Delete + bl String_Free add r0, r4, #0 bl MessageFormat_Delete add r0, r5, #0 @@ -21514,7 +21514,7 @@ _0224FD72: add r2, r5, #0 bl StringExpandPlaceholders add r0, r5, #0 - bl String_Delete + bl String_Free add r0, r4, #0 bl MessageFormat_Delete add r0, r7, #0 @@ -22172,7 +22172,7 @@ _02250272: lsl r0, r0, #4 ldr r0, [r4, r0] ldr r0, [r0, #0x10] - bl String_Delete + bl String_Free add r0, r4, #0 add r0, #0xd2 ldrb r1, [r0] @@ -22210,7 +22210,7 @@ _022502C4: lsl r0, r0, #4 ldr r0, [r4, r0] ldr r0, [r0, #0x10] - bl String_Delete + bl String_Free add r0, r4, #0 add r0, #0xd2 ldrb r1, [r0] @@ -22396,7 +22396,7 @@ _02250418: lsl r0, r0, #4 ldr r0, [r4, r0] ldr r0, [r0, #0x10] - bl String_Delete + bl String_Free add r0, r4, #0 add r0, #0xd2 ldrb r1, [r0] diff --git a/asm/overlay_03.s b/asm/overlay_03.s index 350c2740b9..94dd722163 100644 --- a/asm/overlay_03.s +++ b/asm/overlay_03.s @@ -283,7 +283,7 @@ ov03_02254054: ; 0x02254054 _0225405C: ldr r0, [r6] ldr r0, [r0, r5] - bl String_Delete + bl String_Free add r4, r4, #1 add r5, r5, #4 cmp r4, #8 @@ -4642,9 +4642,9 @@ _02256348: b _022561C8 _0225639C: 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] @@ -4944,13 +4944,13 @@ _022565F6: 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 PokedexData_UnloadAndDelete add r0, r4, #0 @@ -5059,7 +5059,7 @@ ov03_022566D0: ; 0x022566D0 add r3, r1, #0 bl BufferString add r0, r4, #0 - bl String_Delete + bl String_Free add sp, #8 pop {r3, r4, r5, r6, r7, pc} .balign 4, 0 @@ -5422,9 +5422,9 @@ _02256994: b _022567F0 _022569EC: ldr r0, [sp, #0x2c] - bl String_Delete + bl String_Free add r0, r7, #0 - bl String_Delete + bl String_Free add r0, r6, #0 bl MessageFormat_Delete ldr r0, [sp, #0x30] @@ -6325,7 +6325,7 @@ ov03_0225709C: ; 0x0225709C mov r0, #0x9d lsl r0, r0, #2 ldr r0, [r4, r0] - bl String_Delete + bl String_Free mov r0, #0x9a lsl r0, r0, #2 ldr r0, [r4, r0] @@ -6823,7 +6823,7 @@ _022574AA: str r1, [sp, #0xc] bl AddTextPrinterParameterizedWithColor add r0, r6, #0 - bl String_Delete + bl String_Free add r0, r4, #0 add r1, r5, #0 bl ov03_022585A4 @@ -10136,13 +10136,13 @@ ov03_02258E88: ; 0x02258E88 push {r4, lr} add r4, r0, #0 ldr r0, [r4, #0x3c] - bl String_Delete + bl String_Free ldr r0, [r4, #0x38] - bl String_Delete + bl String_Free ldr r0, [r4, #0x34] - bl String_Delete + bl String_Free ldr r0, [r4, #0x30] - bl String_Delete + bl String_Free ldr r0, [r4, #0x2c] bl MessageFormat_Delete ldr r0, [r4, #0x28] @@ -10344,7 +10344,7 @@ _02259028: ldr r0, [r5, #0x34] add r1, r7, #0 mov r2, #7 - bl String16_FormatInteger + bl String_FormatInt _02259036: mov r0, #0 ldr r1, [r5, #0x34] diff --git a/asm/overlay_05.s b/asm/overlay_05.s index 23a1f58175..93985f3f6d 100644 --- a/asm/overlay_05.s +++ b/asm/overlay_05.s @@ -2754,7 +2754,7 @@ ov05_0221D020: ; 0x0221D020 ldr r0, [r4, r0] cmp r0, #0 beq _0221D030 - bl String_Delete + bl String_Free _0221D030: mov r0, #0xbb lsl r0, r0, #4 @@ -5538,7 +5538,7 @@ _0221E656: 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 @@ -5932,7 +5932,7 @@ _0221E9A0: cmp r4, #6 blo _0221E986 add r0, r7, #0 - bl String_Delete + bl String_Free ldr r0, [sp, #0x10] bl DestroyMsgData ldr r0, [sp, #0xc] diff --git a/asm/overlay_08.s b/asm/overlay_08.s index 3fc1647d4b..d53716eac0 100644 --- a/asm/overlay_08.s +++ b/asm/overlay_08.s @@ -2440,7 +2440,7 @@ ov08_0221D14C: ; 0x0221D14C bl MessageFormat_Delete ldr r0, _0221D180 ; =0x00001FB0 ldr r0, [r4, r0] - bl String_Delete + bl String_Free pop {r4, pc} nop _0221D174: .word 0x00001FA8 @@ -3474,7 +3474,7 @@ ov08_0221D91C: ; 0x0221D91C 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} _0221D978: @@ -3500,7 +3500,7 @@ _0221D978: 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} _0221D9B4: @@ -3535,7 +3535,7 @@ _0221D9CA: 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} _0221DA00: @@ -3584,7 +3584,7 @@ _0221DA1C: 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} _0221DA6C: @@ -3616,7 +3616,7 @@ _0221DA6C: 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} _0221DAB4: @@ -4134,9 +4134,9 @@ _0221DE4E: bl AddTextPrinterParameterizedWithColor _0221DE6A: 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 @@ -4191,7 +4191,7 @@ _0221DED2: bl AddTextPrinterParameterizedWithColor _0221DEE6: add r0, r6, #0 - bl String_Delete + bl String_Free b _0221DF50 _0221DEEE: cmp r0, #1 @@ -4238,7 +4238,7 @@ _0221DF36: bl AddTextPrinterParameterizedWithColor _0221DF4A: add r0, r6, #0 - bl String_Delete + bl String_Free _0221DF50: add r0, r5, r4 bl ScheduleWindowCopyToVram @@ -4512,9 +4512,9 @@ ov08_0221E120: ; 0x0221E120 add r3, r1, #0 bl AddTextPrinterParameterizedWithColor ldr r0, [sp, #0x10] - bl String_Delete + bl String_Free add r0, r6, #0 - bl String_Delete + bl String_Free ldr r0, _0221E1A4 ; =0x00002070 ldr r0, [r5, r0] add r0, r0, r4 @@ -4569,7 +4569,7 @@ _0221E1CC: add r1, r6, #0 bl StringExpandPlaceholders ldr r0, [sp, #0x10] - bl String_Delete + bl String_Free _0221E202: mov r1, #0 str r1, [sp] @@ -4586,7 +4586,7 @@ _0221E202: add r3, r1, #0 bl AddTextPrinterParameterizedWithColor add r0, r6, #0 - bl String_Delete + bl String_Free ldr r0, _0221E240 ; =0x00002070 ldr r0, [r4, r0] add r0, r0, r5 @@ -4663,9 +4663,9 @@ _0221E2AA: add r0, r4, r6 bl AddTextPrinterParameterizedWithColor 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 @@ -4704,7 +4704,7 @@ ov08_0221E2E8: ; 0x0221E2E8 add r2, r7, #0 bl AddTextPrinterParameterizedWithColor add r0, r7, #0 - bl String_Delete + bl String_Free ldr r0, _0221E33C ; =0x00002070 ldr r0, [r4, r0] add r0, r0, r5 @@ -4751,7 +4751,7 @@ ov08_0221E340: ; 0x0221E340 str r3, [sp, #0xc] bl AddTextPrinterParameterizedWithColor add r0, r5, #0 - bl String_Delete + bl String_Free ldr r0, _0221E398 ; =0x00002050 add r0, r4, r0 bl ScheduleWindowCopyToVram @@ -4799,7 +4799,7 @@ ov08_0221E3A4: ; 0x0221E3A4 lsr r3, r3, #1 bl AddTextPrinterParameterizedWithColor add r0, r7, #0 - bl String_Delete + bl String_Free add r0, r5, r4 bl ScheduleWindowCopyToVram add sp, #0x10 @@ -4844,7 +4844,7 @@ ov08_0221E408: ; 0x0221E408 add r2, r7, #0 bl AddTextPrinterParameterizedWithColor add r0, r7, #0 - bl String_Delete + bl String_Free ldr r0, _0221E5D0 ; =0x00001FA8 mov r1, #0x18 ldr r0, [r5, r0] @@ -4888,9 +4888,9 @@ ov08_0221E408: ; 0x0221E408 add r0, r0, r7 bl AddTextPrinterParameterizedWithColor ldr r0, [sp, #0x18] - bl String_Delete + bl String_Free ldr r0, [sp, #0x1c] - bl String_Delete + bl String_Free ldr r0, _0221E5D0 ; =0x00001FA8 mov r1, #0x19 ldr r0, [r5, r0] @@ -4911,7 +4911,7 @@ ov08_0221E408: ; 0x0221E408 ldr r2, [sp, #0x20] bl AddTextPrinterParameterizedWithColor ldr r0, [sp, #0x20] - bl String_Delete + bl String_Free ldr r0, _0221E5D0 ; =0x00001FA8 mov r1, #0x1a ldr r0, [r5, r0] @@ -4983,9 +4983,9 @@ _0221E53C: add r0, r0, r4 bl AddTextPrinterParameterizedWithColor ldr r0, [sp, #0x14] - bl String_Delete + bl String_Free ldr r0, [sp, #0x10] - bl String_Delete + bl String_Free ldr r0, _0221E5CC ; =0x00002070 ldr r1, [r5, r0] mov r0, #0x13 @@ -5048,7 +5048,7 @@ ov08_0221E5DC: ; 0x0221E5DC add r0, #0xe0 bl AddTextPrinterParameterizedWithColor add r0, r6, #0 - bl String_Delete + bl String_Free ldr r0, _0221E6CC ; =0x00001FA8 mov r1, #0x21 ldr r0, [r5, r0] @@ -5105,9 +5105,9 @@ ov08_0221E5DC: ; 0x0221E5DC add r0, r0, r4 bl AddTextPrinterParameterizedWithColor ldr r0, [sp, #0x10] - bl String_Delete + bl String_Free add r0, r6, #0 - bl String_Delete + bl String_Free ldr r0, _0221E6C8 ; =0x00002070 ldr r0, [r5, r0] add r0, #0xe0 @@ -5158,7 +5158,7 @@ ov08_0221E6D8: ; 0x0221E6D8 add r0, #0xf0 bl AddTextPrinterParameterizedWithColor add r0, r6, #0 - bl String_Delete + bl String_Free ldr r0, _0221E7C8 ; =0x00001FA8 mov r1, #0x23 ldr r0, [r5, r0] @@ -5215,9 +5215,9 @@ ov08_0221E6D8: ; 0x0221E6D8 add r0, r0, r4 bl AddTextPrinterParameterizedWithColor ldr r0, [sp, #0x10] - bl String_Delete + bl String_Free add r0, r6, #0 - bl String_Delete + bl String_Free ldr r0, _0221E7C4 ; =0x00002070 ldr r0, [r5, r0] add r0, #0xf0 @@ -5269,7 +5269,7 @@ ov08_0221E7D4: ; 0x0221E7D4 add r2, r6, #0 bl AddTextPrinterParameterizedWithColor add r0, r6, #0 - bl String_Delete + bl String_Free ldr r0, _0221E8C8 ; =0x00001FA8 mov r1, #0x29 ldr r0, [r5, r0] @@ -5326,9 +5326,9 @@ ov08_0221E7D4: ; 0x0221E7D4 add r0, r0, r4 bl AddTextPrinterParameterizedWithColor ldr r0, [sp, #0x10] - bl String_Delete + bl String_Free add r0, r6, #0 - bl String_Delete + bl String_Free ldr r0, _0221E8C4 ; =0x00002070 ldr r1, [r5, r0] mov r0, #1 @@ -5382,7 +5382,7 @@ ov08_0221E8D4: ; 0x0221E8D4 add r2, r6, #0 bl AddTextPrinterParameterizedWithColor add r0, r6, #0 - bl String_Delete + bl String_Free ldr r0, _0221E9C8 ; =0x00001FA8 mov r1, #0x25 ldr r0, [r4, r0] @@ -5439,9 +5439,9 @@ ov08_0221E8D4: ; 0x0221E8D4 add r0, r0, r5 bl AddTextPrinterParameterizedWithColor ldr r0, [sp, #0x10] - bl String_Delete + bl String_Free add r0, r6, #0 - bl String_Delete + bl String_Free ldr r0, _0221E9C4 ; =0x00002070 ldr r1, [r4, r0] mov r0, #0x11 @@ -5495,7 +5495,7 @@ ov08_0221E9D4: ; 0x0221E9D4 add r2, r6, #0 bl AddTextPrinterParameterizedWithColor add r0, r6, #0 - bl String_Delete + bl String_Free ldr r0, _0221EAC8 ; =0x00001FA8 mov r1, #0x27 ldr r0, [r4, r0] @@ -5552,9 +5552,9 @@ ov08_0221E9D4: ; 0x0221E9D4 add r0, r0, r5 bl AddTextPrinterParameterizedWithColor ldr r0, [sp, #0x10] - bl String_Delete + bl String_Free add r0, r6, #0 - bl String_Delete + bl String_Free ldr r0, _0221EAC4 ; =0x00002070 ldr r1, [r4, r0] mov r0, #0x12 @@ -5610,7 +5610,7 @@ ov08_0221EAD4: ; 0x0221EAD4 add r0, #0xd0 bl AddTextPrinterParameterizedWithColor add r0, r6, #0 - bl String_Delete + bl String_Free ldr r0, _0221EC60 ; =0x00001FA8 mov r1, #0x1f ldr r0, [r5, r0] @@ -5646,7 +5646,7 @@ ov08_0221EAD4: ; 0x0221EAD4 add r0, r0, r4 bl AddTextPrinterParameterizedWithColor ldr r0, [sp, #0x10] - bl String_Delete + bl String_Free ldr r0, _0221EC60 ; =0x00001FA8 mov r1, #0x1d ldr r0, [r5, r0] @@ -5690,9 +5690,9 @@ ov08_0221EAD4: ; 0x0221EAD4 add r0, r0, r4 bl AddTextPrinterParameterizedWithColor ldr r0, [sp, #0x18] - bl String_Delete + bl String_Free ldr r0, [sp, #0x1c] - bl String_Delete + bl String_Free ldr r0, _0221EC60 ; =0x00001FA8 mov r1, #0x1e ldr r0, [r5, r0] @@ -5732,9 +5732,9 @@ ov08_0221EAD4: ; 0x0221EAD4 add r0, r0, r4 bl AddTextPrinterParameterizedWithColor ldr r0, [sp, #0x20] - bl String_Delete + bl String_Free ldr r0, [sp, #0x24] - bl String_Delete + bl String_Free ldr r0, _0221EC5C ; =0x00002070 ldr r0, [r5, r0] add r0, #0xd0 @@ -5794,7 +5794,7 @@ ov08_0221EC6C: ; 0x0221EC6C add r0, r0, r4 bl AddTextPrinterParameterizedWithColor add r0, r6, #0 - bl String_Delete + bl String_Free add r0, r7, #0 bl DestroyMsgData ldr r0, _0221ECE4 ; =0x00002070 @@ -5834,7 +5834,7 @@ ov08_0221ECE8: ; 0x0221ECE8 str r1, [sp, #0xc] bl AddTextPrinterParameterizedWithColor add r0, r6, #0 - bl String_Delete + bl String_Free add r0, r5, r4 bl ScheduleWindowCopyToVram add sp, #0x10 @@ -5884,7 +5884,7 @@ ov08_0221ED30: ; 0x0221ED30 str r1, [sp, #0xc] bl AddTextPrinterParameterizedWithColor add r0, r7, #0 - bl String_Delete + bl String_Free b _0221EE00 _0221ED8A: sub r2, #0xc8 @@ -5934,9 +5934,9 @@ _0221ED8A: str r1, [sp, #0xc] bl AddTextPrinterParameterizedWithColor ldr r0, [sp, #0x14] - bl String_Delete + bl String_Free add r0, r7, #0 - bl String_Delete + bl String_Free _0221EE00: add r0, r4, r6 bl ScheduleWindowCopyToVram @@ -5972,7 +5972,7 @@ ov08_0221EE18: ; 0x0221EE18 str r1, [sp, #0xc] bl AddTextPrinterParameterizedWithColor add r0, r6, #0 - bl String_Delete + bl String_Free add r0, r5, r4 bl ScheduleWindowCopyToVram add sp, #0x10 @@ -6022,7 +6022,7 @@ ov08_0221EE60: ; 0x0221EE60 str r1, [sp, #0xc] bl AddTextPrinterParameterizedWithColor add r0, r7, #0 - bl String_Delete + bl String_Free b _0221EF30 _0221EEBA: sub r2, #0xc8 @@ -6072,9 +6072,9 @@ _0221EEBA: str r1, [sp, #0xc] bl AddTextPrinterParameterizedWithColor ldr r0, [sp, #0x14] - bl String_Delete + bl String_Free add r0, r7, #0 - bl String_Delete + bl String_Free _0221EF30: add r0, r4, r6 bl ScheduleWindowCopyToVram @@ -6117,7 +6117,7 @@ ov08_0221EF48: ; 0x0221EF48 str r1, [sp, #0xc] bl AddTextPrinterParameterizedWithColor add r0, r6, #0 - bl String_Delete + bl String_Free add r0, r7, #0 bl DestroyMsgData add r0, r5, r4 @@ -6167,7 +6167,7 @@ ov08_0221EFA8: ; 0x0221EFA8 str r1, [sp, #0xc] bl AddTextPrinterParameterizedWithColor add r0, r7, #0 - bl String_Delete + bl String_Free add r0, r5, r4 bl ScheduleWindowCopyToVram add sp, #0x10 @@ -6224,7 +6224,7 @@ _0221F04C: str r1, [sp, #0xc] bl AddTextPrinterParameterizedWithColor add r0, r6, #0 - bl String_Delete + bl String_Free add r0, r5, r4 bl ScheduleWindowCopyToVram add sp, #0x10 @@ -6272,7 +6272,7 @@ ov08_0221F07C: ; 0x0221F07C str r1, [sp, #0xc] bl AddTextPrinterParameterizedWithColor ldr r0, [sp, #0x18] - bl String_Delete + bl String_Free ldr r0, _0221F1A8 ; =0x00001FA8 mov r1, #0x2c ldr r0, [r5, r0] @@ -6314,9 +6314,9 @@ ov08_0221F07C: ; 0x0221F07C str r1, [sp, #0xc] bl AddTextPrinterParameterizedWithColor ldr r0, [sp, #0x20] - bl String_Delete + bl String_Free ldr r0, [sp, #0x24] - bl String_Delete + bl String_Free ldr r0, _0221F1A8 ; =0x00001FA8 mov r1, #0x2d ldr r0, [r5, r0] @@ -6354,9 +6354,9 @@ ov08_0221F07C: ; 0x0221F07C str r1, [sp, #0xc] bl AddTextPrinterParameterizedWithColor 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 @@ -6413,7 +6413,7 @@ _0221F1DA: lsr r3, r3, #1 bl AddTextPrinterParameterizedWithColor add r0, r6, #0 - bl String_Delete + bl String_Free add r0, r5, r4 bl ScheduleWindowCopyToVram add sp, #0x10 @@ -6461,7 +6461,7 @@ _0221F23C: str r1, [sp, #0xc] bl AddTextPrinterParameterizedWithColor add r0, r4, #0 - bl String_Delete + bl String_Free add r0, r5, #0 bl ScheduleWindowCopyToVram add sp, #0x10 @@ -6504,7 +6504,7 @@ ov08_0221F284: ; 0x0221F284 str r1, [sp, #0xc] bl AddTextPrinterParameterizedWithColor ldr r0, [sp, #0x14] - bl String_Delete + bl String_Free ldr r0, _0221F3C4 ; =0x00001FA8 mov r1, #0x2e ldr r0, [r5, r0] @@ -6528,7 +6528,7 @@ ov08_0221F284: ; 0x0221F284 str r1, [sp, #0xc] bl AddTextPrinterParameterizedWithColor ldr r0, [sp, #0x18] - bl String_Delete + bl String_Free ldr r0, _0221F3C4 ; =0x00001FA8 mov r1, #0x2d ldr r0, [r5, r0] @@ -6564,7 +6564,7 @@ ov08_0221F284: ; 0x0221F284 str r3, [sp, #0x1c] bl AddTextPrinterParameterizedWithColor ldr r0, [sp, #0x20] - bl String_Delete + bl String_Free ldr r0, _0221F3C4 ; =0x00001FA8 mov r1, #0x2c ldr r0, [r5, r0] @@ -6604,9 +6604,9 @@ ov08_0221F284: ; 0x0221F284 str r1, [sp, #0xc] bl AddTextPrinterParameterizedWithColor 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 @@ -6643,7 +6643,7 @@ ov08_0221F3D0: ; 0x0221F3D0 bl FontID_String_GetWidth add r7, r0, #0 ldr r0, [sp, #0x18] - bl String_Delete + bl String_Free add r7, #0x28 mov r0, #0x50 sub r0, r0, r7 @@ -6697,9 +6697,9 @@ ov08_0221F3D0: ; 0x0221F3D0 str r1, [sp, #0xc] bl AddTextPrinterParameterizedWithColor 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 @@ -6968,7 +6968,7 @@ ov08_0221F658: ; 0x0221F658 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] @@ -7042,7 +7042,7 @@ _0221F714: add r3, r7, #0 bl AddTextPrinterParameterizedWithColor ldr r0, [sp, #0x10] - bl String_Delete + bl String_Free cmp r5, #0 beq _0221F79A ldr r0, [sp, #0x14] @@ -7080,7 +7080,7 @@ _0221F778: bl AddTextPrinterParameterizedWithColor _0221F794: add r0, r5, #0 - bl String_Delete + bl String_Free _0221F79A: ldr r0, [sp, #0x18] bl ScheduleWindowCopyToVram @@ -8172,7 +8172,7 @@ ov08_02220084: ; 0x02220084 add r0, #0x40 bl AddTextPrinterParameterizedWithColor add r0, r4, #0 - bl String_Delete + bl String_Free ldr r0, _022201B0 ; =0x00002070 ldr r0, [r5, r0] add r0, #0x40 @@ -8424,7 +8424,7 @@ _022202F0: ldr r1, [r5, r1] bl StringExpandPlaceholders add r0, r4, #0 - bl String_Delete + bl String_Free b _0222056A _0222033A: ldr r0, [sp, #8] @@ -8465,7 +8465,7 @@ _0222033A: ldr r1, [r5, r1] bl StringExpandPlaceholders add r0, r4, #0 - bl String_Delete + bl String_Free b _0222056A _02220396: add r0, r6, #0 @@ -8508,7 +8508,7 @@ _022203BE: ldr r1, [r5, r1] bl StringExpandPlaceholders add r0, r4, #0 - bl String_Delete + bl String_Free b _0222056A _022203F6: cmp r4, #2 @@ -8531,7 +8531,7 @@ _022203F6: ldr r1, [r5, r1] bl StringExpandPlaceholders add r0, r4, #0 - bl String_Delete + bl String_Free b _0222056A _0222042C: cmp r4, #4 @@ -8554,7 +8554,7 @@ _0222042C: ldr r1, [r5, r1] bl StringExpandPlaceholders add r0, r4, #0 - bl String_Delete + bl String_Free b _0222056A _02220462: cmp r4, #8 @@ -8577,7 +8577,7 @@ _02220462: ldr r1, [r5, r1] bl StringExpandPlaceholders add r0, r4, #0 - bl String_Delete + bl String_Free b _0222056A _02220498: cmp r4, #0x10 @@ -8600,7 +8600,7 @@ _02220498: ldr r1, [r5, r1] bl StringExpandPlaceholders add r0, r4, #0 - bl String_Delete + bl String_Free b _0222056A _022204CE: cmp r4, #0x20 @@ -8623,7 +8623,7 @@ _022204CE: ldr r1, [r5, r1] bl StringExpandPlaceholders add r0, r4, #0 - bl String_Delete + bl String_Free b _0222056A _02220504: cmp r4, #0x40 @@ -8646,7 +8646,7 @@ _02220504: ldr r1, [r5, r1] bl StringExpandPlaceholders add r0, r4, #0 - bl String_Delete + bl String_Free b _0222056A _0222053A: ldr r0, [r5, r0] @@ -8667,7 +8667,7 @@ _0222053A: ldr r1, [r5, r1] bl StringExpandPlaceholders add r0, r4, #0 - bl String_Delete + bl String_Free _0222056A: add r0, r6, #0 bl Heap_Free @@ -8715,7 +8715,7 @@ ov08_0222057C: ; 0x0222057C ldr r1, [r5, r1] bl StringExpandPlaceholders add r0, r4, #0 - bl String_Delete + bl String_Free pop {r4, r5, r6, pc} .balign 4, 0 _022205D4: .word 0x00001FA8 @@ -13472,7 +13472,7 @@ _02222B9C: add r2, r4, #0 bl StringExpandPlaceholders add r0, r4, #0 - bl String_Delete + bl String_Free add r0, r5, #0 bl ov08_02223B20 ldr r0, _02222D74 ; =0x0000114B @@ -13533,7 +13533,7 @@ _02222C56: 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 @@ -14253,7 +14253,7 @@ ov08_02223228: ; 0x02223228 ldr r0, [r4, #0x14] bl MessageFormat_Delete ldr r0, [r4, #0x18] - bl String_Delete + bl String_Free pop {r4, pc} .balign 4, 0 thumb_func_end ov08_02223228 @@ -14611,7 +14611,7 @@ ov08_022234A4: ; 0x022234A4 add r0, r5, r4 bl AddTextPrinterParameterizedWithColor ldr r0, [sp, #0x10] - bl String_Delete + bl String_Free add r0, r5, r4 bl ScheduleWindowCopyToVram add sp, #0x14 @@ -14711,7 +14711,7 @@ _02223508: add r2, r4, #0 bl AddTextPrinterParameterizedWithColor add r0, r4, #0 - bl String_Delete + bl String_Free ldr r0, [r5, #0x2c] add r0, #0x40 bl ScheduleWindowCopyToVram @@ -14788,7 +14788,7 @@ ov08_022235D4: ; 0x022235D4 add r0, r4, r6 bl AddTextPrinterParameterizedWithColor ldr r0, [sp, #0x14] - bl String_Delete + bl String_Free _02223666: add r0, r4, r6 bl ScheduleWindowCopyToVram @@ -14859,7 +14859,7 @@ ov08_02223678: ; 0x02223678 add r0, r4, r7 bl AddTextPrinterParameterizedWithColor ldr r0, [sp, #0x14] - bl String_Delete + bl String_Free _022236FA: add r0, r4, r7 bl ScheduleWindowCopyToVram @@ -15009,7 +15009,7 @@ ov08_022237C4: ; 0x022237C4 str r1, [sp, #0xc] bl AddTextPrinterParameterizedWithColor ldr r0, [sp, #0x10] - bl String_Delete + bl String_Free ldr r0, [r5, #0x10] mov r1, #0x1d bl NewString_ReadMsgData @@ -15047,7 +15047,7 @@ ov08_022237C4: ; 0x022237C4 add r3, r6, r7 bl AddTextPrinterParameterizedWithColor ldr r0, [sp, #0x14] - bl String_Delete + bl String_Free ldr r0, [r5, #0x10] mov r1, #0x1e bl NewString_ReadMsgData @@ -15090,7 +15090,7 @@ ov08_022237C4: ; 0x022237C4 sub r3, r6, r3 bl AddTextPrinterParameterizedWithColor add r0, r7, #0 - bl String_Delete + bl String_Free mov r0, #0x19 lsl r0, r0, #4 add r0, r4, r0 @@ -15254,7 +15254,7 @@ ov08_022239CC: ; 0x022239CC add r0, r4, #0 bl AddTextPrinterParameterizedWithColor add r0, r7, #0 - bl String_Delete + bl String_Free add r0, r4, #0 bl ScheduleWindowCopyToVram add sp, #0x10 @@ -15302,7 +15302,7 @@ ov08_02223A3C: ; 0x02223A3C str r1, [sp, #0xc] bl AddTextPrinterParameterizedWithColor add r0, r7, #0 - bl String_Delete + bl String_Free add r0, r4, #0 bl ScheduleWindowCopyToVram add sp, #0x10 diff --git a/asm/overlay_102.s b/asm/overlay_102.s index e4ca2cf30e..9e2f50aa2f 100644 --- a/asm/overlay_102.s +++ b/asm/overlay_102.s @@ -3800,7 +3800,7 @@ _021E92CA: ldr r1, [sp, #0x24] add r0, r4, #0 add r2, r6, #0 - bl String_GetLineN + bl String_CopyLine mov r0, #4 add r1, r4, #0 mov r2, #0 @@ -3867,9 +3867,9 @@ _021E9308: cmp r0, #2 blt _021E927E add r0, r4, #0 - bl String_Delete + bl String_Free ldr r0, [sp, #0x24] - bl String_Delete + bl String_Free ldr r0, [sp, #0x20] bl DestroyMsgData add sp, #0x60 @@ -5978,7 +5978,7 @@ _021EA3D6: ldr r0, [r4, #0x7c] cmp r0, #0 beq _021EA3E0 - bl String_Delete + bl String_Free _021EA3E0: add r0, r4, #0 add r0, #0xc @@ -6989,7 +6989,7 @@ _021EABFC: str r0, [sp, #0x10] bl ov102_021EAC70 ldr r0, [sp, #0x20] - bl String_Delete + bl String_Free ldr r0, [sp, #0x1c] add sp, #0x28 pop {r3, r4, r5, r6, r7, pc} @@ -7027,7 +7027,7 @@ ov102_021EAC44: ; 0x021EAC44 mov r1, #0x23 bl ov102_021E8FA8 str r0, [r4] - bl String_cstr + bl String_GetChars str r0, [r4, #4] ldrh r1, [r0] ldr r0, _021EAC6C ; =0x0000FFFE @@ -7046,11 +7046,11 @@ _021EAC6C: .word 0x0000FFFE thumb_func_start ov102_021EAC70 ov102_021EAC70: ; 0x021EAC70 - ldr r3, _021EAC78 ; =String_Delete + ldr r3, _021EAC78 ; =String_Free ldr r0, [r0] bx r3 nop -_021EAC78: .word String_Delete +_021EAC78: .word String_Free thumb_func_end ov102_021EAC70 thumb_func_start ov102_021EAC7C @@ -7121,7 +7121,7 @@ _021EACDC: 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} _021EACF6: @@ -7369,7 +7369,7 @@ _021EAE68: add r2, r6, #0 bl AddTextPrinterParameterizedWithColor add r0, r6, #0 - bl String_Delete + bl String_Free add r0, r5, #0 bl MessageFormat_Delete b _021EAF34 @@ -7896,7 +7896,7 @@ _021EB2BA: add r0, r4, #0 bl RemoveWindow ldr r0, [r5, #0x18] - bl String_Delete + bl String_Free add r6, r6, #1 add r4, #0x10 add r5, r5, #4 @@ -8617,7 +8617,7 @@ _021EB7EC: 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 @@ -8718,7 +8718,7 @@ _021EB91E: 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] @@ -9242,7 +9242,7 @@ _021EBCDE: ldr r0, [r4, #0x3c] cmp r0, #0 beq _021EBCE8 - bl String_Delete + bl String_Free _021EBCE8: add r0, r4, #0 add r0, #0x20 @@ -10311,7 +10311,7 @@ _021EC4B6: add r1, r2, r1 add r0, r5, #0 mov r2, #2 - bl CopyU16ArrayToStringN + bl String_CopyNumChars pop {r3, r4, r5, pc} .balign 4, 0 _021EC4C8: .word ov102_021EC820 diff --git a/asm/overlay_103.s b/asm/overlay_103.s index 9149842e71..022ac631e6 100644 --- a/asm/overlay_103.s +++ b/asm/overlay_103.s @@ -631,7 +631,7 @@ ov103_021ECE54: ; 0x021ECE54 mov r0, #0x23 lsl r0, r0, #4 ldr r0, [r4, r0] - bl String_Delete + bl String_Free mov r0, #0x8b lsl r0, r0, #2 ldr r0, [r4, r0] @@ -3539,7 +3539,7 @@ ov103_021EE430: ; 0x021EE430 add r1, r6, #0 bl ov103_021EE3E4 add r0, r6, #0 - bl String_Delete + bl String_Free add sp, #0xc pop {r3, r4, r5, r6, pc} thumb_func_end ov103_021EE430 @@ -3566,7 +3566,7 @@ ov103_021EE468: ; 0x021EE468 ldr r2, [r5, #0xc] lsl r0, r0, #4 ldr r0, [r2, r0] - bl CopyU16ArrayToString + bl String_CopyFromChars mov r4, #0 str r4, [sp, #0x1c] _021EE49A: @@ -3844,7 +3844,7 @@ ov103_021EE644: ; 0x021EE644 add r2, r6, #0 bl StringExpandPlaceholders add r0, r6, #0 - bl String_Delete + bl String_Free mov r1, #0x23 ldr r2, [r5, #0xc] lsl r1, r1, #4 @@ -3898,7 +3898,7 @@ ov103_021EE644: ; 0x021EE644 add r2, r6, #0 bl StringExpandPlaceholders add r0, r6, #0 - bl String_Delete + bl String_Free mov r1, #0x6e ldr r2, [r5, #0xc] mov r3, #0 @@ -3944,7 +3944,7 @@ ov103_021EE784: ; 0x021EE784 bl Mail_GetAuthorNamePtr add r1, r0, #0 add r0, r4, #0 - bl CopyU16ArrayToString + bl String_CopyFromChars add r0, r5, #0 bl Mail_GetAuthorGender add r3, r0, #0 @@ -3960,7 +3960,7 @@ ov103_021EE784: ; 0x021EE784 add r2, r4, #0 bl BufferString add r0, r4, #0 - bl String_Delete + bl String_Free add sp, #8 pop {r4, r5, r6, pc} .balign 4, 0 @@ -4024,7 +4024,7 @@ ov103_021EE824: ; 0x021EE824 add r2, r4, #0 bl StringExpandPlaceholders add r0, r4, #0 - bl String_Delete + bl String_Free add r0, r5, #0 bl ov103_021EE7DC pop {r3, r4, r5, pc} @@ -4191,7 +4191,7 @@ _021EE93A: ldr r2, [r5, #0xc] lsl r0, r0, #4 ldr r0, [r2, r0] - bl CopyU16ArrayToString + bl String_CopyFromChars mov r1, #0x86 ldr r4, [r5, #0xc] mov r3, #1 @@ -4254,7 +4254,7 @@ ov103_021EE9C8: ; 0x021EE9C8 add r3, r2, #0 bl ov103_021EE3E4 add r0, r6, #0 - bl String_Delete + bl String_Free _021EEA1C: add sp, #0xc pop {r3, r4, r5, r6, pc} diff --git a/asm/overlay_108.s b/asm/overlay_108.s index fe61667bd0..d274a451b8 100644 --- a/asm/overlay_108.s +++ b/asm/overlay_108.s @@ -2914,7 +2914,7 @@ ov108_021E7014: ; 0x021E7014 lsl r7, r7, #2 _021E7020: ldr r0, [r5, r7] - bl String_Delete + bl String_Free add r4, r4, #1 add r5, r5, #4 cmp r4, #4 @@ -2925,7 +2925,7 @@ _021E7020: lsl r7, r7, #4 _021E7036: ldr r0, [r4, r7] - bl String_Delete + bl String_Free add r5, r5, #1 add r4, r4, #4 cmp r5, #5 @@ -2933,15 +2933,15 @@ _021E7036: mov r0, #0xce lsl r0, r0, #2 ldr r0, [r6, r0] - bl String_Delete + bl String_Free mov r0, #0xcd lsl r0, r0, #2 ldr r0, [r6, r0] - bl String_Delete + bl String_Free mov r0, #0xc3 lsl r0, r0, #2 ldr r0, [r6, r0] - bl String_Delete + bl String_Free mov r0, #0xc2 lsl r0, r0, #2 ldr r0, [r6, r0] diff --git a/asm/overlay_108_021E8850.s b/asm/overlay_108_021E8850.s index e98713a256..4d8076497f 100644 --- a/asm/overlay_108_021E8850.s +++ b/asm/overlay_108_021E8850.s @@ -2577,7 +2577,7 @@ ov108_021E9CD0: ; 0x021E9CD0 lsl r7, r7, #2 _021E9CDC: ldr r0, [r5, r7] - bl String_Delete + bl String_Free add r4, r4, #1 add r5, r5, #4 cmp r4, #4 @@ -2585,19 +2585,19 @@ _021E9CDC: mov r0, #0x33 lsl r0, r0, #4 ldr r0, [r6, r0] - bl String_Delete + bl String_Free mov r0, #0xcb lsl r0, r0, #2 ldr r0, [r6, r0] - bl String_Delete + bl String_Free mov r0, #0xc6 lsl r0, r0, #2 ldr r0, [r6, r0] - bl String_Delete + bl String_Free mov r0, #0xc5 lsl r0, r0, #2 ldr r0, [r6, r0] - bl String_Delete + bl String_Free mov r0, #0x31 lsl r0, r0, #4 ldr r0, [r6, r0] diff --git a/asm/overlay_109.s b/asm/overlay_109.s index 1a613d415e..708addfe08 100644 --- a/asm/overlay_109.s +++ b/asm/overlay_109.s @@ -2635,7 +2635,7 @@ ov109_021E6D2C: ; 0x021E6D2C add r5, r6, #0 _021E6D42: ldr r0, [r5, #0x48] - bl String_Delete + bl String_Free add r4, r4, #1 add r5, r5, #4 cmp r4, #2 @@ -2644,15 +2644,15 @@ _021E6D42: add r4, r6, #0 _021E6D54: ldr r0, [r4, #0x34] - bl String_Delete + bl String_Free add r5, r5, #1 add r4, r4, #4 cmp r5, #5 blt _021E6D54 ldr r0, [r6, #0x30] - bl String_Delete + bl String_Free ldr r0, [r6, #0x2c] - bl String_Delete + bl String_Free ldr r0, [r6, #0x28] bl MessageFormat_Delete ldr r0, [r6, #0x24] @@ -3340,7 +3340,7 @@ _021E728A: add r1, r4, #0 ldr r0, [r5, #0x2c] add r1, #0x18 - bl CopyU16ArrayToString + bl String_CopyFromChars mov r0, #0 mov r1, #2 str r0, [sp] diff --git a/asm/overlay_111.s b/asm/overlay_111.s index 4b02a84bcd..39e728b8e6 100644 --- a/asm/overlay_111.s +++ b/asm/overlay_111.s @@ -1993,7 +1993,7 @@ ov111_021E685C: ; 0x021E685C ldr r0, [r4, #0x10] cmp r0, #0 beq _021E687A - bl String_Delete + bl String_Free _021E687A: ldr r0, [r4, #4] bl MessagePrinter_Delete @@ -2021,7 +2021,7 @@ ov111_021E6888: ; 0x021E6888 and r0, r1 str r0, [r4, #0x30] ldr r0, [r4, #0x10] - bl String_Delete + bl String_Free mov r0, #0 str r0, [r4, #0x10] sub r0, r0, #1 @@ -2386,7 +2386,7 @@ ov111_021E6B30: ; 0x021E6B30 add r0, r5, #0 bl AddTextPrinterParameterizedWithColor add r0, r4, #0 - bl String_Delete + bl String_Free add sp, #0x10 pop {r4, r5, r6, pc} thumb_func_end ov111_021E6B30 diff --git a/asm/overlay_112.s b/asm/overlay_112.s index 4b4ec249a1..73ab14df1f 100644 --- a/asm/overlay_112.s +++ b/asm/overlay_112.s @@ -4553,7 +4553,7 @@ ov112_021E7C6C: ; 0x021E7C6C add r4, r0, #0 ldr r0, _021E7C94 ; =0x0001E454 ldr r0, [r4, r0] - bl String_Delete + bl String_Free ldr r0, _021E7C98 ; =0x0001E450 ldr r0, [r4, r0] bl DestroyMsgData @@ -4628,7 +4628,7 @@ ov112_021E7CC8: ; 0x021E7CC8 add r1, #0x3c add r0, r4, #0 add r1, r5, r1 - bl CopyStringToU16Array + bl String_CopyToChars ldr r0, _021E7D6C ; =0x00001028 mov r1, #1 str r1, [r5, r0] @@ -4657,7 +4657,7 @@ ov112_021E7CC8: ; 0x021E7CC8 add r0, r5, r0 bl ov112_021E5D68 add r0, r4, #0 - bl String_Delete + bl String_Free pop {r3, r4, r5, pc} nop _021E7D60: .word 0x00001024 @@ -6355,9 +6355,9 @@ _021E8D24: add r4, r0, #0 add r1, #0x28 mov r2, #0x15 - bl CopyStringToU16Array + bl String_CopyToChars add r0, r4, #0 - bl String_Delete + bl String_Free add r0, sp, #0x3c str r0, [sp] add r0, r7, #0 @@ -6709,7 +6709,7 @@ ov112_021E90FC: ; 0x021E90FC mov r0, #5 bl FontID_Release add r0, r4, #0 - bl String_Delete + bl String_Free add sp, #0x10 pop {r3, r4, r5, pc} nop @@ -6759,7 +6759,7 @@ _021E9170: mov r3, #2 bl AddTextPrinterParameterizedWithColor add r0, r6, #0 - bl String_Delete + bl String_Free add r7, r7, #1 add r4, r4, #6 add r5, #0x10 @@ -6796,7 +6796,7 @@ _021E91B4: mov r3, #2 bl AddTextPrinterParameterizedWithColor add r0, r4, #0 - bl String_Delete + bl String_Free add r5, r5, #1 cmp r5, #3 blt _021E91B4 @@ -6823,7 +6823,7 @@ _021E91B4: mov r3, #2 bl AddTextPrinterParameterizedWithColor add r0, r4, #0 - bl String_Delete + bl String_Free mov r0, #0xc mov r1, #0x9a bl String_New @@ -6850,7 +6850,7 @@ _021E91B4: str r0, [sp, #0x10] bl AddTextPrinterParameterizedWithColor add r0, r4, #0 - bl String_Delete + bl String_Free mov r0, #5 bl FontID_Release ldr r0, [sp, #0x20] @@ -7497,9 +7497,9 @@ ov112_021E96D0: ; 0x021E96D0 ldr r0, _021E974C ; =0x0001F2E2 strh r1, [r5, r0] add r0, r7, #0 - bl String_Delete + bl String_Free add r0, r6, #0 - bl String_Delete + bl String_Free pop {r3, r4, r5, r6, r7, pc} .balign 4, 0 _021E9740: .word 0x0001E44C @@ -8376,70 +8376,70 @@ ov112_021E9E30: ; 0x021E9E30 add r4, r0, #0 ldr r0, _021E9EE8 ; =0x0001E458 ldr r0, [r4, r0] - bl String_Delete + bl String_Free ldr r0, _021E9EEC ; =0x0001E45C ldr r0, [r4, r0] - bl String_Delete + bl String_Free ldr r0, _021E9EF0 ; =0x0001E460 ldr r0, [r4, r0] - bl String_Delete + bl String_Free ldr r0, _021E9EF4 ; =0x0001E464 ldr r0, [r4, r0] - bl String_Delete + bl String_Free ldr r0, _021E9EF8 ; =0x0001E468 ldr r0, [r4, r0] - bl String_Delete + bl String_Free ldr r0, _021E9EFC ; =0x0001E46C ldr r0, [r4, r0] - bl String_Delete + bl String_Free ldr r0, _021E9F00 ; =0x0001E470 ldr r0, [r4, r0] - bl String_Delete + bl String_Free ldr r0, _021E9F04 ; =0x0001E474 ldr r0, [r4, r0] - bl String_Delete + bl String_Free ldr r0, _021E9F08 ; =0x0001E494 ldr r0, [r4, r0] - bl String_Delete + bl String_Free ldr r0, _021E9F0C ; =0x0001E49C ldr r0, [r4, r0] - bl String_Delete + bl String_Free ldr r0, _021E9F10 ; =0x0001E498 ldr r0, [r4, r0] - bl String_Delete + bl String_Free ldr r0, _021E9F14 ; =0x0001E4A0 ldr r0, [r4, r0] - bl String_Delete + bl String_Free ldr r0, _021E9F18 ; =0x0001E4A4 ldr r0, [r4, r0] - bl String_Delete + bl String_Free ldr r0, _021E9F1C ; =0x0001E4A8 ldr r0, [r4, r0] - bl String_Delete + bl String_Free ldr r0, _021E9F20 ; =0x0001E4AC ldr r0, [r4, r0] - bl String_Delete + bl String_Free ldr r0, _021E9F24 ; =0x0001E4B0 ldr r0, [r4, r0] - bl String_Delete + bl String_Free ldr r0, _021E9F28 ; =0x0001E4B4 ldr r0, [r4, r0] - bl String_Delete + bl String_Free ldr r0, _021E9F2C ; =0x0001E4BC ldr r0, [r4, r0] - bl String_Delete + bl String_Free ldr r0, _021E9F30 ; =0x0001E50C ldr r0, [r4, r0] - bl String_Delete + bl String_Free ldr r0, _021E9F34 ; =0x0001E510 ldr r0, [r4, r0] - bl String_Delete + bl String_Free ldr r0, _021E9F38 ; =0x0001E514 ldr r0, [r4, r0] - bl String_Delete + bl String_Free ldr r0, _021E9F3C ; =0x0001E518 ldr r0, [r4, r0] - bl String_Delete + bl String_Free pop {r4, pc} nop _021E9EE8: .word 0x0001E458 @@ -8506,7 +8506,7 @@ ov112_021E9F5C: ; 0x021E9F5C mov r3, #0 bl ov112_021E9FA4 add r0, r6, #0 - bl String_Delete + bl String_Free pop {r3, r4, r5, r6, r7, pc} nop _021E9F98: .word 0x0001E44C @@ -8624,7 +8624,7 @@ ov112_021EA044: ; 0x021EA044 mov r3, #0 bl ov112_021EA010 add r0, r6, #0 - bl String_Delete + bl String_Free pop {r3, r4, r5, r6, r7, pc} nop _021EA080: .word 0x0001E44C @@ -8674,7 +8674,7 @@ ov112_021EA08C: ; 0x021EA08C bl AddTextPrinterParameterized add r4, r0, #0 add r0, r7, #0 - bl String_Delete + bl String_Free add r0, r4, #0 add sp, #0xc pop {r4, r5, r6, r7, pc} @@ -8725,7 +8725,7 @@ ov112_021EA10C: ; 0x021EA10C mov r1, #1 bl AddTextPrinterParameterized add r0, r7, #0 - bl String_Delete + bl String_Free add sp, #0xc pop {r4, r5, r6, r7, pc} nop @@ -10506,7 +10506,7 @@ _021EAFA2: str r7, [sp] bl ov112_021E9FA4 add r0, r6, #0 - bl String_Delete + bl String_Free add r4, r4, #1 cmp r4, #4 blt _021EAFA2 @@ -13703,7 +13703,7 @@ _021EC802: str r7, [sp] bl ov112_021E9FA4 add r0, r6, #0 - bl String_Delete + bl String_Free add r4, r4, #1 cmp r4, #5 blt _021EC7DA @@ -13745,7 +13745,7 @@ _021EC802: mov r3, #0 bl ov112_021E9FA4 add r0, r4, #0 - bl String_Delete + bl String_Free ldr r2, _021EC890 ; =0x0001EC54 add r0, r5, #0 ldr r1, [r5, r2] @@ -13788,7 +13788,7 @@ _021EC8B8: add r3, r1, #0 bl ov112_021EA010 add r0, r5, #0 - bl String_Delete + bl String_Free ldr r0, _021EC94C ; =0x0001EBB8 mov r1, #0 add r0, r4, r0 @@ -13814,7 +13814,7 @@ _021EC8EE: add r3, r1, #0 bl ov112_021EA010 add r0, r5, #0 - bl String_Delete + bl String_Free add r0, r4, #0 bl ov112_021ECA88 add r1, r0, #0 @@ -13831,7 +13831,7 @@ _021EC8EE: mov r3, #0 bl ov112_021EA010 add r0, r5, #0 - bl String_Delete + bl String_Free pop {r3, r4, r5, pc} .balign 4, 0 _021EC944: .word 0x0001E44C @@ -16579,7 +16579,7 @@ ov112_021EDF4C: ; 0x021EDF4C add r0, r4, #0 add r1, r5, r1 mov r2, #0xc - bl CopyU16ArrayToStringN + bl String_CopyNumChars mov r1, #1 str r1, [sp] ldr r3, _021EDFDC ; =0x00009D51 @@ -16606,7 +16606,7 @@ _021EDFC2: str r0, [r5, r1] bl ov112_021E7464 add r0, r4, #0 - bl String_Delete + bl String_Free mov r0, #0x26 add sp, #0x10 pop {r3, r4, r5, pc} @@ -17934,7 +17934,7 @@ ov112_021EE9A4: ; 0x021EE9A4 add r2, r6, #0 bl SetMonData add r0, r6, #0 - bl String_Delete + bl String_Free add sp, #8 pop {r3, r4, r5, r6, r7, pc} thumb_func_end ov112_021EE9A4 @@ -18178,7 +18178,7 @@ _021EEBA4: beq _021EECAC add r2, #0x1e add r1, r5, r2 - bl CopyU16ArrayToString + bl String_CopyFromChars add r0, r4, #0 bl ZeroMonData add r0, r4, #0 @@ -18269,10 +18269,10 @@ _021EEBA4: str r0, [r5, r1] _021EECAC: ldr r0, [sp, #4] - bl String_Delete + bl String_Free _021EECB2: ldr r0, [sp, #0xc] - bl String_Delete + bl String_Free add r0, r4, #0 bl Heap_Free add sp, #0x28 @@ -19853,7 +19853,7 @@ ov112_021EF8D4: ; 0x021EF8D4 mov r2, #0xb add r1, r5, r1 add r4, r0, #0 - bl CopyU16ArrayToStringN + bl String_CopyNumChars mov r1, #1 ldr r0, _021EF94C ; =0x00001090 str r1, [sp] @@ -19868,7 +19868,7 @@ ov112_021EF8D4: ; 0x021EF8D4 lsr r3, r3, #0x1e bl BufferString add r0, r4, #0 - bl String_Delete + bl String_Free add r0, r5, #0 mov r1, #0 mov r2, #0x2c @@ -20575,7 +20575,7 @@ _021EFE6E: blt _021EFE6E _021EFE96: add r0, r6, #0 - bl String_Delete + bl String_Free mov r0, #6 str r0, [sp] mov r1, #1 @@ -21419,7 +21419,7 @@ ov112_021F051C: ; 0x021F051C ldr r0, [r7, #0x6c] bl MessageFormat_Delete ldr r0, [r7, #0x70] - bl String_Delete + bl String_Free add r0, r7, #0 add r0, #8 bl RemoveWindow @@ -21625,7 +21625,7 @@ ov112_021F06CC: ; 0x021F06CC add r1, #0xa str r0, [sp, #0x10] ldr r0, [r5, #0x70] - bl CopyU16ArrayToString + bl String_CopyFromChars add r0, r5, #0 add r0, #0x38 mov r1, #0 @@ -21658,7 +21658,7 @@ ov112_021F06CC: ; 0x021F06CC add r2, r6, #0 bl BufferString add r0, r6, #0 - bl String_Delete + bl String_Free ldr r0, [r5, #0x6c] ldr r1, [r5, #0x68] ldr r3, [r5] @@ -21685,7 +21685,7 @@ ov112_021F06CC: ; 0x021F06CC add r0, #8 bl CopyWindowToVram add r0, r6, #0 - bl String_Delete + bl String_Free mov r0, #1 str r0, [sp] str r0, [sp, #4] @@ -21729,7 +21729,7 @@ ov112_021F06CC: ; 0x021F06CC add r0, #0x18 bl CopyWindowToVram add r0, r6, #0 - bl String_Delete + bl String_Free ldrb r0, [r4, #8] cmp r0, #0 bne _021F0820 @@ -21757,7 +21757,7 @@ ov112_021F06CC: ; 0x021F06CC add r0, #0x48 bl CopyWindowToVram add r0, r4, #0 - bl String_Delete + bl String_Free b _021F0876 _021F0820: cmp r0, #1 @@ -21787,7 +21787,7 @@ _021F0820: add r0, #0x48 bl CopyWindowToVram add r0, r4, #0 - bl String_Delete + bl String_Free b _021F0876 _021F0864: add r0, r5, #0 @@ -21822,7 +21822,7 @@ _021F0876: add r0, #0x28 bl CopyWindowToVram add r0, r4, #0 - bl String_Delete + bl String_Free ldr r0, [r5, #0x6c] ldr r2, [sp, #0x10] mov r1, #0 @@ -21853,7 +21853,7 @@ _021F0876: add r0, r5, #0 bl CopyWindowToVram add r0, r4, #0 - bl String_Delete + bl String_Free add sp, #0x14 pop {r4, r5, r6, r7, pc} .balign 4, 0 @@ -23262,7 +23262,7 @@ _021F1370: add r0, r4, r6 bl AddTextPrinterParameterizedWithColor add r0, r5, #0 - bl String_Delete + bl String_Free add r0, r4, r6 bl CopyWindowToVram add sp, #0x14 @@ -23323,10 +23323,10 @@ ov112_021F13CC: ; 0x021F13CC mov r1, #0xe add r0, r4, #0 lsl r1, r1, #0xc - bl String_AddChar + bl String_AppendChar add r0, r4, #0 add r1, r7, #0 - bl String_Cat + bl String_Concat mov r3, #0 str r3, [sp] mov r0, #0xff @@ -23339,9 +23339,9 @@ ov112_021F13CC: ; 0x021F13CC str r3, [sp, #0xc] bl AddTextPrinterParameterizedWithColor add r0, r7, #0 - bl String_Delete + bl String_Free add r0, r4, #0 - bl String_Delete + bl String_Free b _021F1472 _021F145A: mov r3, #0 @@ -23357,7 +23357,7 @@ _021F145A: bl AddTextPrinterParameterizedWithColor _021F1472: add r0, r6, #0 - bl String_Delete + bl String_Free ldr r0, [sp, #0x10] bl CopyWindowToVram add sp, #0x14 @@ -23406,12 +23406,12 @@ _021F14C6: beq _021F14D6 ldr r1, _021F1500 ; =ov112_021FF2EC add r0, r7, #0 - bl CopyU16ArrayToString + bl String_CopyFromChars b _021F14DE _021F14D6: add r0, r7, #0 add r1, r6, #0 - bl CopyU16ArrayToString + bl String_CopyFromChars _021F14DE: mov r0, #1 str r0, [sp] @@ -23422,7 +23422,7 @@ _021F14DE: add r2, r7, #0 bl BufferString add r0, r7, #0 - bl String_Delete + bl String_Free add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} nop @@ -23451,14 +23451,14 @@ _021F1514: add r0, r6, #0 add r1, sp, #0 mov r2, #0x13 - bl CopyStringToU16Array + bl String_CopyToChars add r0, r5, #0 add r1, sp, #0 mov r2, #4 add r3, r4, #0 bl ov112_021F1488 add r0, r6, #0 - bl String_Delete + bl String_Free add sp, #0x28 pop {r4, r5, r6, pc} .balign 4, 0 @@ -23481,14 +23481,14 @@ ov112_021F1548: ; 0x021F1548 add r0, r4, #0 add r1, sp, #0 add r2, r7, #0 - bl CopyStringToU16Array + bl String_CopyToChars add r0, r5, #0 add r1, sp, #0 add r2, r6, #0 add r3, r7, #0 bl ov112_021F1488 add r0, r4, #0 - bl String_Delete + bl String_Free add sp, #0x18 pop {r3, r4, r5, r6, r7, pc} thumb_func_end ov112_021F1548 @@ -23735,7 +23735,7 @@ _021F1664: bl FontID_String_GetCenterAlignmentX add r6, r0, #0 add r0, r4, #0 - bl String_Delete + bl String_Free lsl r3, r6, #0x18 add r0, r5, #0 mov r1, #1 diff --git a/asm/overlay_113.s b/asm/overlay_113.s index a82330a6c9..9cc9428b34 100644 --- a/asm/overlay_113.s +++ b/asm/overlay_113.s @@ -1784,15 +1784,15 @@ ov113_021E66E4: ; 0x021E66E4 push {r4, lr} add r4, r0, #0 ldr r0, [r4, #0x5c] - bl String_Delete + bl String_Free ldr r0, [r4, #0x58] - bl String_Delete + bl String_Free ldr r0, [r4, #0x54] - bl String_Delete + bl String_Free ldr r0, [r4, #0x50] - bl String_Delete + bl String_Free ldr r0, [r4, #0x4c] - bl String_Delete + bl String_Free ldr r0, [r4, #0x48] bl MessageFormat_Delete ldr r0, [r4, #0x44] diff --git a/asm/overlay_115.s b/asm/overlay_115.s index 9fb4bfe312..7c568e7058 100644 --- a/asm/overlay_115.s +++ b/asm/overlay_115.s @@ -207,7 +207,7 @@ ov115_0225F158: ; 0x0225F158 add r0, r4, #0 bl MessageFormat_Delete add r0, r5, #0 - bl String_Delete + bl String_Free add r0, r7, #0 pop {r3, r4, r5, r6, r7, pc} thumb_func_end ov115_0225F158 @@ -251,7 +251,7 @@ ov115_0225F1BC: ; 0x0225F1BC add r0, r4, #0 bl MessageFormat_Delete add r0, r5, #0 - bl String_Delete + bl String_Free add r0, r7, #0 pop {r3, r4, r5, r6, r7, pc} thumb_func_end ov115_0225F1BC @@ -363,7 +363,7 @@ _0225F2DE: str r1, [sp, #0xc] bl AddTextPrinterParameterizedWithColor ldr r0, [sp, #0x14] - bl String_Delete + bl String_Free add r0, r4, #0 add r0, #0x44 mov r1, #8 @@ -1661,7 +1661,7 @@ _0225FC0E: str r1, [sp, #0xc] bl AddTextPrinterParameterizedWithColor add r0, r5, #0 - bl String_Delete + bl String_Free mov r0, #3 str r0, [r6, #4] ldr r0, [r6] diff --git a/asm/overlay_117.s b/asm/overlay_117.s index 95448af4d5..178f5acd94 100644 --- a/asm/overlay_117.s +++ b/asm/overlay_117.s @@ -574,7 +574,7 @@ ov117_0225F470: ; 0x0225F470 add r0, r4, #0 bl MessageFormat_Delete add r0, r5, #0 - bl String_Delete + bl String_Free add r0, r7, #0 pop {r3, r4, r5, r6, r7, pc} thumb_func_end ov117_0225F470 @@ -816,7 +816,7 @@ _0225F560: str r1, [sp, #0xc] bl AddTextPrinterParameterizedWithColor add r0, r6, #0 - bl String_Delete + bl String_Free mov r0, #0 str r0, [sp] mov r0, #2 diff --git a/asm/overlay_12_022378C0.s b/asm/overlay_12_022378C0.s index d1e6b2cc9c..a165d65058 100644 --- a/asm/overlay_12_022378C0.s +++ b/asm/overlay_12_022378C0.s @@ -3650,7 +3650,7 @@ _02239A46: add r2, r6, #0 bl AddTextPrinterParameterized add r0, r6, #0 - bl String_Delete + bl String_Free add r0, r4, #0 bl DestroyMsgData ldr r0, _02239C1C ; =ov12_022397E4 diff --git a/asm/overlay_12_battle_command.s b/asm/overlay_12_battle_command.s index 2cc16d46ef..b413a2826f 100644 --- a/asm/overlay_12_battle_command.s +++ b/asm/overlay_12_battle_command.s @@ -3986,7 +3986,7 @@ _022483C6: 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/asm/overlay_14.s b/asm/overlay_14.s index 5ba26cf0c8..5af717723b 100644 --- a/asm/overlay_14.s +++ b/asm/overlay_14.s @@ -594,7 +594,7 @@ ov14_021E5DB8: ; 0x021E5DB8 add r4, r0, #0 ldr r0, [r4, #0x34] ldr r0, [r0, #0x28] - bl String_Delete + bl String_Free ldr r0, [r4, #0x34] ldr r0, [r0, #0x24] bl MessageFormat_Delete @@ -31129,7 +31129,7 @@ ov14_021F4F84: ; 0x021F4F84 add r1, r6, #0 bl ov14_021F4F24 add r0, r6, #0 - bl String_Delete + bl String_Free add sp, #0xc pop {r3, r4, r5, r6, pc} thumb_func_end ov14_021F4F84 @@ -31163,7 +31163,7 @@ ov14_021F4FBC: ; 0x021F4FBC ldr r3, [sp, #0x24] bl ov14_021F4F24 add r0, r6, #0 - bl String_Delete + bl String_Free add sp, #0xc pop {r3, r4, r5, r6, pc} thumb_func_end ov14_021F4FBC @@ -32120,7 +32120,7 @@ ov14_021F5718: ; 0x021F5718 sub r3, #8 bl ov14_021F4F24 add r0, r7, #0 - bl String_Delete + bl String_Free add r0, r4, #0 bl CopyWindowPixelsToVram_TextMode add r0, r4, #0 @@ -32170,7 +32170,7 @@ ov14_021F57B8: ; 0x021F57B8 mov r2, #0x30 bl ov14_021F4F24 add r0, r5, #0 - bl String_Delete + bl String_Free ldr r0, [r4, #0x34] add r1, sp, #0xc mov r2, #0 @@ -32233,7 +32233,7 @@ ov14_021F57B8: ; 0x021F57B8 mov r2, #0x14 bl ov14_021F4F24 add r0, r5, #0 - bl String_Delete + bl String_Free ldr r0, [r4, #0x34] add r1, sp, #0xc mov r2, #1 @@ -32304,7 +32304,7 @@ _021F5918: mov r2, #0x30 bl ov14_021F4F24 add r0, r4, #0 - bl String_Delete + bl String_Free ldr r0, [r5, #0x34] add r1, sp, #0xc mov r2, #0 @@ -32621,7 +32621,7 @@ _021F5B8E: add r3, r7, #0 bl ov14_021F4F24 add r0, r6, #0 - bl String_Delete + bl String_Free add r0, r5, r4 bl CopyWindowPixelsToVram_TextMode add sp, #0x70 @@ -32702,7 +32702,7 @@ _021F5C5A: bl ov14_021F4F24 _021F5C6E: add r0, r7, #0 - bl String_Delete + bl String_Free add r0, r5, r4 bl CopyWindowPixelsToVram_TextMode add sp, #0x14 @@ -32958,7 +32958,7 @@ _021F5E4A: add r3, r7, #0 bl ov14_021F4F24 add r0, r6, #0 - bl String_Delete + bl String_Free add r0, r5, r4 bl CopyWindowPixelsToVram_TextMode add sp, #0x3c @@ -33969,7 +33969,7 @@ _021F65D8: asr r2, r2, #1 bl ov14_021F4F24 add r0, r5, #0 - bl String_Delete + bl String_Free mov r0, #0x2e lsl r0, r0, #4 add r0, r4, r0 @@ -34510,7 +34510,7 @@ _021F6996: ldr r1, [r1, #0x28] bl StringExpandPlaceholders add r0, r4, #0 - bl String_Delete + bl String_Free ldr r0, [r5, #0x34] lsl r4, r6, #4 add r0, #0x30 diff --git a/asm/overlay_15.s b/asm/overlay_15.s index 1d84f1ddc4..6c95a45d9b 100644 --- a/asm/overlay_15.s +++ b/asm/overlay_15.s @@ -600,7 +600,7 @@ Bag_Exit: ; 0x021F982C bl ov15_021FA028 ldr r0, _021F98F0 ; =0x000005E4 ldr r0, [r4, r0] - bl String_Delete + bl String_Free mov r0, #0xbf lsl r0, r0, #2 ldr r0, [r4, r0] @@ -1585,7 +1585,7 @@ ov15_021FA028: ; 0x021FA028 lsl r6, r6, #4 _021FA032: ldr r0, [r5, r6] - bl String_Delete + bl String_Free add r4, r4, #1 add r5, r5, #4 cmp r4, #0xa5 @@ -4778,7 +4778,7 @@ _021FB8CA: add r2, r5, #0 bl StringExpandPlaceholders add r0, r5, #0 - bl String_Delete + bl String_Free add r0, r4, #0 mov r1, #0 bl ov15_021FEF48 @@ -4965,7 +4965,7 @@ _021FBA7A: add r2, r5, #0 bl StringExpandPlaceholders add r0, r5, #0 - bl String_Delete + bl String_Free mov r0, #1 pop {r3, r4, r5, pc} .balign 4, 0 @@ -5743,7 +5743,7 @@ _021FC082: add r2, r4, #0 bl StringExpandPlaceholders add r0, r4, #0 - bl String_Delete + bl String_Free add r0, r5, #0 add r0, #0x34 mov r1, #0xf @@ -5945,7 +5945,7 @@ ov15_021FC224: ; 0x021FC224 add r2, r4, #0 bl StringExpandPlaceholders add r0, r4, #0 - bl String_Delete + bl String_Free add r0, r5, #0 mov r1, #0 bl ov15_021FEF48 @@ -6530,7 +6530,7 @@ _021FC72C: add r2, r4, #0 bl StringExpandPlaceholders add r0, r4, #0 - bl String_Delete + bl String_Free add r0, r5, #0 mov r1, #0 bl ov15_021FEF48 @@ -7175,7 +7175,7 @@ _021FCC32: add r2, r5, #0 bl StringExpandPlaceholders add r0, r5, #0 - bl String_Delete + bl String_Free add r0, r4, #0 mov r1, #0 bl ov15_021FEF48 @@ -7239,7 +7239,7 @@ _021FCC7C: add r2, r5, #0 bl StringExpandPlaceholders add r0, r5, #0 - bl String_Delete + bl String_Free add r0, r4, #0 mov r1, #1 bl ov15_021FEF48 @@ -7284,7 +7284,7 @@ _021FCD0C: add r2, r5, #0 bl StringExpandPlaceholders add r0, r5, #0 - bl String_Delete + bl String_Free add r0, r4, #0 mov r1, #1 bl ov15_021FEF48 @@ -7628,7 +7628,7 @@ ov15_021FCFC8: ; 0x021FCFC8 add r2, r4, #0 bl StringExpandPlaceholders add r0, r4, #0 - bl String_Delete + bl String_Free add r0, r5, #0 mov r1, #1 bl ov15_021FEF48 @@ -7805,7 +7805,7 @@ _021FD172: add r2, r5, #0 bl StringExpandPlaceholders add r0, r5, #0 - bl String_Delete + bl String_Free add r0, r4, #0 mov r1, #0 bl ov15_021FEF48 @@ -10214,7 +10214,7 @@ _021FE50C: 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 @@ -10347,7 +10347,7 @@ _021FE5F4: str r1, [sp, #0xc] bl AddTextPrinterParameterizedWithColor add r0, r4, #0 - bl String_Delete + bl String_Free add sp, #0x10 pop {r4, r5, r6, pc} nop @@ -10383,7 +10383,7 @@ ov15_021FE620: ; 0x021FE620 str r1, [sp, #0xc] bl AddTextPrinterParameterizedWithColor add r0, r6, #0 - bl String_Delete + bl String_Free mov r0, #0x2f lsl r0, r0, #4 ldr r0, [r5, r0] @@ -10403,7 +10403,7 @@ ov15_021FE620: ; 0x021FE620 str r1, [sp, #0xc] bl AddTextPrinterParameterizedWithColor add r0, r6, #0 - bl String_Delete + bl String_Free mov r0, #0x2f lsl r0, r0, #4 ldr r0, [r5, r0] @@ -10422,7 +10422,7 @@ ov15_021FE620: ; 0x021FE620 str r1, [sp, #0xc] bl AddTextPrinterParameterizedWithColor add r0, r6, #0 - bl String_Delete + bl String_Free mov r0, #0x2f lsl r0, r0, #4 ldr r0, [r5, r0] @@ -10441,7 +10441,7 @@ ov15_021FE620: ; 0x021FE620 str r1, [sp, #0xc] bl AddTextPrinterParameterizedWithColor add r0, r6, #0 - bl String_Delete + bl String_Free mov r0, #0x2f lsl r0, r0, #4 ldr r0, [r5, r0] @@ -10461,7 +10461,7 @@ ov15_021FE620: ; 0x021FE620 str r1, [sp, #0xc] bl AddTextPrinterParameterizedWithColor add r0, r6, #0 - bl String_Delete + bl String_Free ldr r0, [sp, #0x10] mov r1, #0 bl GetMoveMaxPP @@ -10490,7 +10490,7 @@ ov15_021FE620: ; 0x021FE620 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 @@ -10543,7 +10543,7 @@ _021FE79C: add r2, r6, #0 bl StringExpandPlaceholders add r0, r6, #0 - bl String_Delete + bl String_Free mov r1, #0 str r1, [sp] mov r0, #0xff @@ -10594,7 +10594,7 @@ _021FE80C: 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 @@ -10656,10 +10656,10 @@ ov15_021FE8A4: ; 0x021FE8A4 add r4, r0, #0 ldr r0, _021FE8BC ; =0x000005E8 ldr r0, [r4, r0] - bl String_Delete + bl String_Free ldr r0, _021FE8C0 ; =0x000005EC ldr r0, [r4, r0] - bl String_Delete + bl String_Free pop {r4, pc} nop _021FE8BC: .word 0x000005E8 @@ -10698,7 +10698,7 @@ ov15_021FE8C4: ; 0x021FE8C4 add r2, r0, #0 bl FontID_String_GetWidth add r0, r4, #0 - bl String_Delete + bl String_Free add sp, #8 pop {r4, r5, r6, pc} .balign 4, 0 @@ -11006,7 +11006,7 @@ _021FEB6E: 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 @@ -11133,9 +11133,9 @@ _021FEC3E: str r3, [sp, #8] bl AddTextPrinterParameterized add r0, r6, #0 - bl String_Delete + bl String_Free add r0, r7, #0 - bl String_Delete + bl String_Free add r5, #0x24 add r0, r5, #0 bl ScheduleWindowCopyToVram @@ -11204,7 +11204,7 @@ ov15_021FECD8: ; 0x021FECD8 str r1, [sp, #0xc] bl AddTextPrinterParameterizedWithColor add r0, r4, #0 - bl String_Delete + bl String_Free add r0, r5, #0 bl ScheduleWindowCopyToVram add sp, #0x10 @@ -11301,9 +11301,9 @@ ov15_021FED60: ; 0x021FED60 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} .balign 4, 0 @@ -11358,7 +11358,7 @@ _021FEE2C: ldr r1, [sp, #0x18] mov r2, #1 mov r3, #0 - bl String16_FormatInteger + bl String_FormatInt ldr r0, [sp, #0x18] add r1, r0, #0 mul r1, r4 @@ -11397,7 +11397,7 @@ _021FEE2C: blo _021FEE2C _021FEE96: ldr r0, [sp, #0x14] - bl String_Delete + bl String_Free add sp, #0x20 pop {r3, r4, r5, r6, r7, pc} .balign 4, 0 @@ -11470,7 +11470,7 @@ _021FEEFE: add r2, r4, #0 bl StringExpandPlaceholders add r0, r4, #0 - bl String_Delete + bl String_Free add r0, r5, #0 mov r1, #0 bl ov15_021FEF48 @@ -11691,7 +11691,7 @@ ov15_021FF068: ; 0x021FF068 add r0, r5, r6 bl ScheduleWindowCopyToVram add r0, r4, #0 - bl String_Delete + bl String_Free add sp, #0x10 pop {r4, r5, r6, pc} nop @@ -11736,7 +11736,7 @@ ov15_021FF0FC: ; 0x021FF0FC str r1, [sp, #0xc] bl AddTextPrinterParameterizedWithColor add r0, r7, #0 - bl String_Delete + bl String_Free b _021FF160 _021FF14E: mov r0, #0x48 @@ -11796,9 +11796,9 @@ _021FF160: add r0, r5, r6 bl ScheduleWindowCopyToVram ldr r0, [sp, #0x10] - bl String_Delete + bl String_Free add r0, r4, #0 - bl String_Delete + bl String_Free add sp, #0x14 pop {r4, r5, r6, r7, pc} .balign 4, 0 @@ -11836,7 +11836,7 @@ ov15_021FF1E0: ; 0x021FF1E0 str r1, [sp, #8] bl AddTextPrinterParameterized add r0, r6, #0 - bl String_Delete + bl String_Free mov r0, #0x2f lsl r0, r0, #4 ldr r0, [r5, r0] @@ -11861,7 +11861,7 @@ ov15_021FF1E0: ; 0x021FF1E0 add r2, r6, #0 bl StringExpandPlaceholders add r0, r6, #0 - bl String_Delete + bl String_Free ldr r1, _021FF298 ; =0x000005E4 mov r0, #0 ldr r1, [r5, r1] @@ -11946,7 +11946,7 @@ _021FF308: add r0, r5, #0 bl ScheduleWindowCopyToVram add r0, r4, #0 - bl String_Delete + bl String_Free add sp, #0x10 pop {r4, r5, r6, pc} nop @@ -12419,7 +12419,7 @@ ov15_021FF66C: ; 0x021FF66C str r1, [sp, #0xc] bl AddTextPrinterParameterizedWithColor add r0, r4, #0 - bl String_Delete + bl String_Free add sp, #0x10 pop {r4, r5, r6, pc} .balign 4, 0 @@ -12494,7 +12494,7 @@ _021FF6E0: add r0, r4, #0 bl ScheduleWindowCopyToVram add r0, r5, #0 - bl String_Delete + bl String_Free add sp, #0x10 pop {r4, r5, r6, pc} .balign 4, 0 diff --git a/asm/overlay_18.s b/asm/overlay_18.s index 20488426f7..99c54cad14 100644 --- a/asm/overlay_18.s +++ b/asm/overlay_18.s @@ -1186,7 +1186,7 @@ ov18_021E6280: ; 0x021E6280 add r4, r0, #0 ldr r0, _021E62A0 ; =0x00000664 ldr r0, [r4, r0] - bl String_Delete + bl String_Free mov r0, #0x66 lsl r0, r0, #4 ldr r0, [r4, r0] @@ -17167,7 +17167,7 @@ ov18_021EE3AC: ; 0x021EE3AC ldr r1, [r5, r1] bl ov18_021F95FC add r0, r6, #0 - bl String_Delete + bl String_Free add sp, #0xc pop {r3, r4, r5, r6, pc} .balign 4, 0 @@ -17500,7 +17500,7 @@ _021EE682: bl ov18_021F95FC _021EE696: add r0, r7, #0 - bl String_Delete + bl String_Free add r0, r4, r6 bl ScheduleWindowCopyToVram add sp, #0xc @@ -17687,7 +17687,7 @@ ov18_021EE7DC: ; 0x021EE7DC str r2, [sp, #8] bl ov18_021F95FC add r0, r6, #0 - bl String_Delete + bl String_Free add r0, r4, r5 bl ScheduleWindowCopyToVram add sp, #0xc @@ -17750,7 +17750,7 @@ _021EE874: mov r3, #0 bl ov18_021F95FC add r0, r6, #0 - bl String_Delete + bl String_Free add r0, r4, r5 bl ScheduleWindowCopyToVram add sp, #0x10 @@ -17898,7 +17898,7 @@ ov18_021EE984: ; 0x021EE984 str r3, [sp, #8] bl ov18_021F95FC add r0, r6, #0 - bl String_Delete + bl String_Free add r0, r5, r4 bl ScheduleWindowCopyToVram _021EE9EC: @@ -18015,7 +18015,7 @@ _021EEAB4: add r1, r5, #0 bl ov18_021F95FC add r0, r5, #0 - bl String_Delete + bl String_Free ldr r0, [sp, #0xc] bl DestroyMsgData add sp, #0x10 @@ -18101,7 +18101,7 @@ _021EEB64: add r1, r5, #0 bl ov18_021F95FC add r0, r5, #0 - bl String_Delete + bl String_Free ldr r0, [sp, #0xc] bl DestroyMsgData add sp, #0x10 @@ -18274,7 +18274,7 @@ ov18_021EECB0: ; 0x021EECB0 str r2, [sp, #8] bl ov18_021F95FC add r0, r6, #0 - bl String_Delete + bl String_Free add r0, r5, r4 bl ScheduleWindowCopyToVram add sp, #0xc @@ -18327,7 +18327,7 @@ _021EED3C: mov r2, #0x7c bl ov18_021F95FC add r0, r5, #0 - bl String_Delete + bl String_Free add r0, r6, r4 bl ScheduleWindowCopyToVram add sp, #0x10 @@ -20893,7 +20893,7 @@ ov18_021F021C: ; 0x021F021C mov r2, #0x24 bl ov18_021F95FC add r0, r4, #0 - bl String_Delete + bl String_Free mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -21404,7 +21404,7 @@ _021F0624: mov r2, #0x20 bl ov18_021F95FC add r0, r6, #0 - bl String_Delete + bl String_Free ldr r0, [r5] mov r1, #0x25 ldr r0, [r0, #4] @@ -21422,7 +21422,7 @@ _021F0624: mov r2, #0x20 bl ov18_021F95FC add r0, r6, #0 - bl String_Delete + bl String_Free mov r0, #0x20 str r0, [sp] mov r0, #0 @@ -22004,7 +22004,7 @@ _021F0B38: add r2, r5, #0 bl BufferString add r0, r5, #0 - bl String_Delete + bl String_Free mov r0, #0x9f add sp, #8 pop {r3, r4, r5, pc} @@ -22186,7 +22186,7 @@ _021F0CB2: add r2, r4, #0 bl BufferString add r0, r4, #0 - bl String_Delete + bl String_Free mov r0, #0x48 str r0, [sp] mov r0, #0 @@ -22349,7 +22349,7 @@ ov18_021F0DD0: ; 0x021F0DD0 add r2, r4, #0 bl BufferString add r0, r4, #0 - bl String_Delete + bl String_Free mov r0, #0x48 str r0, [sp] mov r0, #0 @@ -38463,7 +38463,7 @@ _021F8CDA: str r3, [sp, #8] bl ov18_021F95FC add r0, r7, #0 - bl String_Delete + bl String_Free mov r0, #0x91 lsl r0, r0, #2 ldr r0, [r5, r0] @@ -38483,7 +38483,7 @@ _021F8CDA: str r2, [sp, #8] bl ov18_021F95FC add r0, r7, #0 - bl String_Delete + bl String_Free mov r0, #0x91 lsl r0, r0, #2 ldr r0, [r5, r0] @@ -38508,7 +38508,7 @@ _021F8CDA: mov r3, #0 bl ov18_021F95FC add r0, r7, #0 - bl String_Delete + bl String_Free mov r0, #0x91 lsl r0, r0, #2 ldr r0, [r5, r0] @@ -38539,7 +38539,7 @@ _021F8CDA: str r3, [sp, #8] bl ov18_021F95FC add r0, r7, #0 - bl String_Delete + bl String_Free mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -38617,7 +38617,7 @@ _021F8CDA: add r0, r4, #0 bl DestroyMsgData ldr r0, [sp, #0x10] - bl String_Delete + bl String_Free mov r4, #0 add r5, #0x24 _021F8EF2: @@ -39594,7 +39594,7 @@ ov18_021F9648: ; 0x021F9648 add r0, r5, #0 bl ov18_021F95FC add r0, r4, #0 - bl String_Delete + bl String_Free add sp, #0xc pop {r3, r4, r5, r6, pc} thumb_func_end ov18_021F9648 diff --git a/asm/overlay_27.s b/asm/overlay_27.s index b3721e10c5..47110f6702 100644 --- a/asm/overlay_27.s +++ b/asm/overlay_27.s @@ -3550,17 +3550,17 @@ ov27_0225BC34: ; 0x0225BC34 add r5, r0, #0 ldr r0, _0225BC78 ; =0x000004C8 ldr r0, [r5, r0] - bl String_Delete + bl String_Free ldr r0, _0225BC7C ; =0x000004C4 ldr r0, [r5, r0] - bl String_Delete + bl String_Free mov r7, #0x4b mov r6, #0 add r4, r5, #0 lsl r7, r7, #4 _0225BC50: ldr r0, [r4, r7] - bl String_Delete + bl String_Free add r6, r6, #1 add r4, r4, #4 cmp r6, #5 @@ -3571,7 +3571,7 @@ _0225BC62: ldr r0, [r5, r6] cmp r0, #0 beq _0225BC6C - bl String_Delete + bl String_Free _0225BC6C: add r4, r4, #1 add r5, #8 @@ -3853,7 +3853,7 @@ _0225BE3A: mov r2, #1 bl ov27_0225BB38 add r0, r4, #0 - bl String_Delete + bl String_Free ldr r0, [r5, #8] mov r1, #5 bl Sprite_TryChangeAnimSeq @@ -3974,7 +3974,7 @@ _0225BF48: str r1, [sp, #0xc] bl AddTextPrinterParameterizedWithColor add r0, r4, #0 - bl String_Delete + bl String_Free add r0, sp, #0x14 bl CopyWindowToVram add r0, sp, #0x14 @@ -5209,7 +5209,7 @@ ov27_0225C8D0: ; 0x0225C8D0 add r0, r5, #0 bl ScheduleWindowCopyToVram add r0, r4, #0 - bl String_Delete + bl String_Free add sp, #0x10 pop {r3, r4, r5, pc} .balign 4, 0 diff --git a/asm/overlay_28.s b/asm/overlay_28.s index 64ea74cc02..5845dbdbc5 100644 --- a/asm/overlay_28.s +++ b/asm/overlay_28.s @@ -333,7 +333,7 @@ ov28_0225D7C4: ; 0x0225D7C4 lsl r6, r6, #4 _0225D7CE: ldr r0, [r5, r6] - bl String_Delete + bl String_Free add r4, r4, #1 add r5, r5, #4 cmp r4, #5 diff --git a/asm/overlay_29.s b/asm/overlay_29.s index 2c40460853..8315358334 100644 --- a/asm/overlay_29.s +++ b/asm/overlay_29.s @@ -316,7 +316,7 @@ _0225D73A: add r0, r5, r4 bl AddTextPrinterParameterizedWithColor add r0, r7, #0 - bl String_Delete + bl String_Free add r0, r5, r4 bl CopyWindowPixelsToVram_TextMode add r0, r5, r4 diff --git a/asm/overlay_31.s b/asm/overlay_31.s index 4c303b35dc..b01dc4c6a0 100644 --- a/asm/overlay_31.s +++ b/asm/overlay_31.s @@ -146,7 +146,7 @@ ov31_0225D654: ; 0x0225D654 mov r0, #0x62 lsl r0, r0, #2 ldr r0, [r4, r0] - bl String_Delete + bl String_Free mov r0, #0x57 lsl r0, r0, #2 ldr r0, [r4, r0] @@ -223,7 +223,7 @@ _0225D6F8: add r0, r5, #0 bl ScheduleWindowCopyToVram add r0, r4, #0 - bl String_Delete + bl String_Free add sp, #0x10 pop {r4, r5, r6, pc} nop @@ -1035,7 +1035,7 @@ _0225DD60: add r3, r4, #0 bl ov31_0225DE00 ldr r0, [sp, #0x10] - bl String_Delete + bl String_Free ldr r0, [r5, #0x14] ldr r1, [sp, #0xc] add r2, r7, #0 @@ -1148,7 +1148,7 @@ _0225DE3A: str r1, [sp, #0xc] bl AddTextPrinterParameterizedWithColor add r0, r4, #0 - bl String_Delete + bl String_Free add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} nop @@ -1198,7 +1198,7 @@ _0225DEBC: str r1, [sp, #0xc] bl AddTextPrinterParameterizedWithColor add r0, r4, #0 - bl String_Delete + bl String_Free mov r0, #0x10 mov r1, #0xb bl String_New @@ -1270,9 +1270,9 @@ _0225DF2A: str r1, [sp, #0xc] bl AddTextPrinterParameterizedWithColor add r0, r7, #0 - bl String_Delete + bl String_Free add r0, r4, #0 - bl String_Delete + bl String_Free add r5, #0x74 add r0, r5, #0 bl ScheduleWindowCopyToVram @@ -1360,9 +1360,9 @@ _0225DFEC: str r1, [sp, #0xc] bl AddTextPrinterParameterizedWithColor add r0, r7, #0 - bl String_Delete + bl String_Free add r0, r6, #0 - bl String_Delete + bl String_Free add r4, #0x54 add r0, r4, #0 bl ScheduleWindowCopyToVram @@ -1554,7 +1554,7 @@ ov31_0225E184: ; 0x0225E184 add r3, r6, #0 bl ov31_0225DE00 add r0, r7, #0 - bl String_Delete + bl String_Free mov r2, #0x9a ldr r0, [r5, #0x14] lsl r2, r2, #2 @@ -1617,7 +1617,7 @@ ov31_0225E20C: ; 0x0225E20C str r1, [sp, #0xc] bl AddTextPrinterParameterizedWithColor add r0, r4, #0 - bl String_Delete + bl String_Free mov r0, #5 mov r1, #0xb bl String_New @@ -1669,9 +1669,9 @@ ov31_0225E20C: ; 0x0225E20C str r1, [sp, #0xc] bl AddTextPrinterParameterizedWithColor add r0, r4, #0 - bl String_Delete + bl String_Free add r0, r7, #0 - bl String_Delete + bl String_Free mov r0, #0x49 lsl r0, r0, #2 add r0, r5, r0 @@ -1780,13 +1780,13 @@ ov31_0225E2D4: ; 0x0225E2D4 str r1, [sp, #0xc] bl AddTextPrinterParameterizedWithColor add r0, r6, #0 - bl String_Delete + bl String_Free add r0, r7, #0 - bl String_Delete + bl String_Free ldr r0, [sp, #0x10] - bl String_Delete + bl String_Free ldr r0, [sp, #0x14] - bl String_Delete + bl String_Free add r0, r5, #0 add r0, #0xf4 bl ScheduleWindowCopyToVram @@ -1850,9 +1850,9 @@ ov31_0225E2D4: ; 0x0225E2D4 str r1, [sp, #0xc] bl AddTextPrinterParameterizedWithColor add r0, r6, #0 - bl String_Delete + bl String_Free add r0, r7, #0 - bl String_Delete + bl String_Free mov r0, #0x4d lsl r0, r0, #2 add r0, r5, r0 @@ -1891,7 +1891,7 @@ ov31_0225E474: ; 0x0225E474 add r0, r5, r0 bl ScheduleWindowCopyToVram add r0, r4, #0 - bl String_Delete + bl String_Free add sp, #0x10 pop {r3, r4, r5, pc} nop @@ -2022,7 +2022,7 @@ ov31_0225E54C: ; 0x0225E54C add r2, r4, #0 bl StringExpandPlaceholders add r0, r4, #0 - bl String_Delete + bl String_Free mov r0, #0x59 lsl r0, r0, #2 ldr r0, [r5, r0] @@ -2144,7 +2144,7 @@ _0225E684: add r2, r5, #0 bl StringExpandPlaceholders add r0, r5, #0 - bl String_Delete + bl String_Free mov r0, #0x59 lsl r0, r0, #2 ldr r0, [r4, r0] @@ -2439,7 +2439,7 @@ _0225E8DA: add r2, r5, #0 bl StringExpandPlaceholders add r0, r5, #0 - bl String_Delete + bl String_Free add r0, r4, #0 add r0, #0x44 mov r1, #0xf @@ -2607,7 +2607,7 @@ ov31_0225EA08: ; 0x0225EA08 add r2, r4, #0 bl StringExpandPlaceholders add r0, r4, #0 - bl String_Delete + bl String_Free add r0, r5, #0 add r0, #0x44 mov r1, #0xf @@ -2675,7 +2675,7 @@ ov31_0225EA9C: ; 0x0225EA9C add r2, r4, #0 bl StringExpandPlaceholders add r0, r4, #0 - bl String_Delete + bl String_Free add r0, r5, #0 add r0, #0x44 mov r1, #0xf @@ -2743,7 +2743,7 @@ ov31_0225EB30: ; 0x0225EB30 add r2, r4, #0 bl StringExpandPlaceholders add r0, r4, #0 - bl String_Delete + bl String_Free add r0, r5, #0 add r0, #0x44 mov r1, #0xf @@ -2811,7 +2811,7 @@ ov31_0225EBC4: ; 0x0225EBC4 add r2, r4, #0 bl StringExpandPlaceholders add r0, r4, #0 - bl String_Delete + bl String_Free add r0, r5, #0 add r0, #0x44 mov r1, #0xf diff --git a/asm/overlay_32.s b/asm/overlay_32.s index 6fa2a2bdc9..cba2743895 100644 --- a/asm/overlay_32.s +++ b/asm/overlay_32.s @@ -361,7 +361,7 @@ _0225D796: mov r1, #4 bl AddTextPrinterParameterizedWithColor add r0, r6, #0 - bl String_Delete + bl String_Free add r0, r5, #0 add r0, #0x24 bl CopyWindowPixelsToVram_TextMode @@ -437,7 +437,7 @@ ov32_0225D84C: ; 0x0225D84C str r1, [sp, #0xc] bl AddTextPrinterParameterizedWithColor add r0, r6, #0 - bl String_Delete + bl String_Free mov r0, #4 mov r1, #8 bl String_New @@ -476,7 +476,7 @@ ov32_0225D84C: ; 0x0225D84C str r1, [sp, #0xc] bl AddTextPrinterParameterizedWithColor ldr r0, [sp, #0x10] - bl String_Delete + bl String_Free mov r0, #0x51 lsl r0, r0, #2 ldr r0, [r5, r0] @@ -519,9 +519,9 @@ ov32_0225D84C: ; 0x0225D84C str r1, [sp, #0xc] bl AddTextPrinterParameterizedWithColor add r0, r7, #0 - bl String_Delete + bl String_Free add r0, r6, #0 - bl String_Delete + bl String_Free add r0, r5, #0 add r0, #0x34 bl CopyWindowPixelsToVram_TextMode @@ -635,9 +635,9 @@ _0225D9D4: ldr r0, [sp, #0x1c] bl Heap_Free ldr r0, [sp, #0x14] - bl String_Delete + bl String_Free ldr r0, [sp, #0x18] - bl String_Delete + bl String_Free ldr r1, _0225DA7C ; =0x000002AB mov r0, #1 ldrb r2, [r7, r1] diff --git a/asm/overlay_33.s b/asm/overlay_33.s index e0e90de7ff..e5bcbe7cbd 100644 --- a/asm/overlay_33.s +++ b/asm/overlay_33.s @@ -564,7 +564,7 @@ _0225D912: add r0, r4, r6 bl ScheduleWindowCopyToVram ldr r0, [sp, #0x20] - bl String_Delete + bl String_Free add r0, r5, #1 lsl r0, r0, #0x10 lsr r5, r0, #0x10 diff --git a/asm/overlay_34.s b/asm/overlay_34.s index 6f1c99489e..4d07f5bece 100644 --- a/asm/overlay_34.s +++ b/asm/overlay_34.s @@ -26,7 +26,7 @@ ov34_0225D520: ; 0x0225D520 str r1, [sp, #0xc] bl AddTextPrinterParameterizedWithColor add r0, r4, #0 - bl String_Delete + bl String_Free add sp, #0x10 pop {r3, r4, r5, pc} .balign 4, 0 @@ -1752,7 +1752,7 @@ _0225E2F4: bl PalPad_GetNthEntry add r1, r0, #0 add r0, r4, #0 - bl CopyU16ArrayToString + bl String_CopyFromChars add r0, r6, #0 add r1, r5, #0 bl PalPadEntry_GetFromUnk68Array @@ -1764,7 +1764,7 @@ _0225E2F4: add r3, r1, #0 bl BufferString add r0, r4, #0 - bl String_Delete + bl String_Free _0225E332: ldr r1, [sp, #8] add r0, r7, #0 @@ -1812,7 +1812,7 @@ _0225E372: ldr r0, [r0, #4] cmp r0, #0 beq _0225E386 - bl String_Delete + bl String_Free _0225E386: ldr r1, [r5] mov r0, #0x1c @@ -1821,7 +1821,7 @@ _0225E386: ldr r0, [r0, #8] cmp r0, #0 beq _0225E398 - bl String_Delete + bl String_Free _0225E398: ldr r0, [sp, #8] bl PlayerProfile_GetNamePtr @@ -1830,7 +1830,7 @@ _0225E398: 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/asm/overlay_37.s b/asm/overlay_37.s index 1fe8c38769..fb9a99ea34 100644 --- a/asm/overlay_37.s +++ b/asm/overlay_37.s @@ -724,15 +724,15 @@ ov37_021E5F20: ; 0x021E5F20 add r5, r6, #0 _021E5F38: ldr r0, [r5, #0x14] - bl String_Delete + bl String_Free add r4, r4, #1 add r5, r5, #4 cmp r4, #5 blt _021E5F38 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} .balign 4, 0 _021E5F54: .word 0x000043C8 @@ -3662,7 +3662,7 @@ ov37_021E762C: ; 0x021E762C 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/asm/overlay_39_thumb.s b/asm/overlay_39_thumb.s index b603bfe116..b12e087c5c 100644 --- a/asm/overlay_39_thumb.s +++ b/asm/overlay_39_thumb.s @@ -55,9 +55,9 @@ ov39_02227088: ; 0x02227088 add r0, r4, #0 add r1, r7, #0 mov r2, #0x14 - bl CopyStringToU16Array + bl String_CopyToChars add r0, r4, #0 - bl String_Delete + bl String_Free mov r4, #0 str r7, [sp, #0xc] str r7, [sp, #8] @@ -346,7 +346,7 @@ ov39_022272EC: ; 0x022272EC str r1, [r4, r0] add r0, #0x38 ldr r0, [r4, r0] - bl String_Delete + bl String_Free mov r0, #0xfe lsl r0, r0, #2 ldr r0, [r4, r0] @@ -1790,7 +1790,7 @@ _02227D6E: add r2, r5, #0 bl StringExpandPlaceholders add r0, r5, #0 - bl String_Delete + bl String_Free mov r1, #0xff lsl r1, r1, #2 ldr r1, [r4, r1] @@ -2639,11 +2639,11 @@ _02228394: ldr r0, [r4, #0x20] bl MessageFormat_Delete ldr r0, [r4, #0x38] - bl String_Delete + bl String_Free ldr r0, [r4, #0x3c] - bl String_Delete + bl String_Free ldr r0, [r4, #0x34] - bl String_Delete + bl String_Free add r0, r4, #0 bl ov39_02228948 ldr r0, [r4, #4] @@ -3420,7 +3420,7 @@ ov39_022289D0: ; 0x022289D0 mov r0, #0xff str r0, [r5, #0x40] add r0, r4, #0 - bl String_Delete + bl String_Free add sp, #0xc pop {r3, r4, r5, r6, pc} .balign 4, 0 @@ -3562,7 +3562,7 @@ ov39_02228B04: ; 0x02228B04 add r2, r6, #0 bl StringExpandPlaceholders add r0, r6, #0 - bl String_Delete + bl String_Free add r0, r5, #0 add r0, #0x44 mov r1, #0xf diff --git a/asm/overlay_40.s b/asm/overlay_40.s index f0ec57db50..b44dd2538d 100644 --- a/asm/overlay_40.s +++ b/asm/overlay_40.s @@ -3647,9 +3647,9 @@ _0222D410: add r2, r7, #0 bl StringExpandPlaceholders add r0, r7, #0 - bl String_Delete + bl String_Free ldr r0, [sp, #0x14] - bl String_Delete + bl String_Free add r0, r6, #0 bl MessageFormat_Delete b _0222D504 @@ -3704,9 +3704,9 @@ _0222D494: add r2, r7, #0 bl StringExpandPlaceholders add r0, r7, #0 - bl String_Delete + bl String_Free ldr r0, [sp, #0x18] - bl String_Delete + bl String_Free add r0, r6, #0 bl MessageFormat_Delete b _0222D504 @@ -3744,7 +3744,7 @@ _0222D504: mov r3, #0x6d bl TextOBJ_CopyFromBGWindow add r0, r5, #0 - bl String_Delete + bl String_Free add r0, sp, #0x1c bl RemoveWindow add sp, #0x2c @@ -3921,7 +3921,7 @@ ov40_0222D66C: ; 0x0222D66C mov r3, #0x6d bl TextOBJ_CopyFromBGWindow add r0, r6, #0 - bl String_Delete + bl String_Free add r0, sp, #0x10 bl RemoveWindow add sp, #0x20 @@ -4890,7 +4890,7 @@ ov40_0222DD9C: ; 0x0222DD9C add r0, r5, r4 bl ScheduleWindowCopyToVram add r0, r6, #0 - bl String_Delete + bl String_Free bl OS_WaitVBlankIntr mov r0, #4 mov r1, #1 @@ -5030,7 +5030,7 @@ ov40_0222DED0: ; 0x0222DED0 add r0, r5, r4 bl ScheduleWindowCopyToVram add r0, r6, #0 - bl String_Delete + bl String_Free _0222DF54: add sp, #0x14 pop {r3, r4, r5, r6, pc} @@ -5069,7 +5069,7 @@ ov40_0222DF60: ; 0x0222DF60 add r0, r5, r6 bl ScheduleWindowCopyToVram add r0, r4, #0 - bl String_Delete + bl String_Free _0222DFA4: add sp, #0x10 pop {r4, r5, r6, pc} @@ -5179,7 +5179,7 @@ ov40_0222DFE8: ; 0x0222DFE8 add r0, r5, r4 bl ScheduleWindowCopyToVram add r0, r6, #0 - bl String_Delete + bl String_Free _0222E08A: add sp, #0x14 pop {r3, r4, r5, r6, pc} @@ -5290,7 +5290,7 @@ _0222E0D6: add r0, r0, r2 str r0, [sp, #0x24] add r0, r6, #0 - bl String_Delete + bl String_Free ldr r0, [sp, #0x1c] add r4, #0x10 add r0, r0, #4 @@ -5357,11 +5357,11 @@ _0222E0D6: add r0, r5, #0 bl ScheduleWindowCopyToVram ldr r0, [sp, #0x2c] - bl String_Delete + bl String_Free ldr r0, [sp, #0x30] - bl String_Delete + bl String_Free add r0, r6, #0 - bl String_Delete + bl String_Free add r0, r4, #0 bl MessageFormat_ResetBuffers ldr r0, [sp, #0x20] @@ -5412,11 +5412,11 @@ _0222E0D6: add r0, r5, #0 bl ScheduleWindowCopyToVram ldr r0, [sp, #0x38] - bl String_Delete + bl String_Free ldr r0, [sp, #0x3c] - bl String_Delete + bl String_Free add r0, r6, #0 - bl String_Delete + bl String_Free add r0, r4, #0 bl MessageFormat_ResetBuffers ldr r5, [sp, #0x14] @@ -5445,7 +5445,7 @@ _0222E0D6: add r0, r5, #0 bl ScheduleWindowCopyToVram add r0, r6, #0 - bl String_Delete + bl String_Free ldr r0, [sp, #0x20] bl sub_02031620 add r6, r0, #0 @@ -5477,7 +5477,7 @@ _0222E0D6: add r0, r5, #0 bl ScheduleWindowCopyToVram add r0, r6, #0 - bl String_Delete + bl String_Free b _0222E3F6 _0222E33C: mov r0, #0xff @@ -5510,9 +5510,9 @@ _0222E33C: add r0, r5, #0 bl ScheduleWindowCopyToVram ldr r0, [sp, #0x44] - bl String_Delete + bl String_Free ldr r0, [sp, #0x48] - bl String_Delete + bl String_Free ldr r0, [sp, #0x40] cmp r0, #0 beq _0222E3F6 @@ -5553,9 +5553,9 @@ _0222E33C: ldr r0, [sp, #0x18] bl ScheduleWindowCopyToVram add r0, r5, #0 - bl String_Delete + bl String_Free ldr r0, [sp, #0x4c] - bl String_Delete + bl String_Free _0222E3F6: add r0, r4, #0 bl MessageFormat_ResetBuffers @@ -5591,7 +5591,7 @@ _0222E434: add r0, r5, #0 bl ScheduleWindowCopyToVram add r0, r6, #0 - bl String_Delete + bl String_Free ldr r0, [sp, #0x14] add r1, sp, #0x50 add r0, #0x7c @@ -5623,7 +5623,7 @@ _0222E46A: ldr r0, [sp, #0x14] bl ScheduleWindowCopyToVram add r0, r5, #0 - bl String_Delete + bl String_Free add r0, r4, #0 bl MessageFormat_Delete add sp, #0xd8 @@ -6123,7 +6123,7 @@ _0222E85C: bl StringExpandPlaceholders _0222E884: add r0, r4, #0 - bl String_Delete + bl String_Free add r0, r7, #0 bl MessageFormat_Delete _0222E890: @@ -6142,7 +6142,7 @@ _0222E890: add r0, r5, #0 bl ScheduleWindowCopyToVram ldr r0, [sp, #0x14] - bl String_Delete + bl String_Free add sp, #0x18 pop {r3, r4, r5, r6, r7, pc} nop @@ -6247,7 +6247,7 @@ _0222E95C: add r3, r1, #0 bl AddTextPrinterParameterizedWithColor ldr r0, [sp, #0x1c] - bl String_Delete + bl String_Free ldr r0, [r4] ldr r0, [r0, r6] cmp r0, #0x10 @@ -6386,7 +6386,7 @@ _0222EA72: add r3, r1, #0 bl AddTextPrinterParameterizedWithColor ldr r0, [sp, #0x24] - bl String_Delete + bl String_Free ldr r0, [r4, #0x10] add r6, r6, #1 add r7, #0x10 @@ -6424,12 +6424,12 @@ _0222EAC0: add r1, r1, #1 mov r2, #2 mov r3, #1 - bl String16_FormatInteger + bl String_FormatInt ldr r2, [sp, #0x1c] ldr r1, _0222EB98 ; =0x00002608 add r0, r7, #0 ldr r1, [r2, r1] - bl CopyU16ArrayToString + bl String_CopyFromChars ldr r0, [sp, #0x14] add r1, r7, #0 bl ov40_02230DCC @@ -6477,11 +6477,11 @@ _0222EAC0: mov r3, #0x16 bl AddTextPrinterParameterizedWithColor add r0, r7, #0 - bl String_Delete + bl String_Free ldr r0, [sp, #0x2c] - bl String_Delete + bl String_Free ldr r0, [sp, #0x28] - bl String_Delete + bl String_Free ldr r0, [sp, #0x1c] ldr r1, [r4, #0x10] add r0, r0, #4 @@ -6752,7 +6752,7 @@ _0222ED6E: bl GetSpeciesNameIntoArray ldr r0, [sp, #0x44] add r1, sp, #0x64 - bl CopyU16ArrayToString + bl String_CopyFromChars mov r0, #1 str r0, [sp] mov r0, #2 @@ -6781,7 +6781,7 @@ _0222EDA8: ldr r0, [sp, #0x34] ldr r1, [sp, #0x24] ldr r2, [sp, #0x28] - bl String16_FormatUnsignedLongLong + bl String_FormatU64 mov r0, #1 str r0, [sp] ldr r1, [sp, #0x20] @@ -6790,7 +6790,7 @@ _0222EDA8: mov r2, #2 add r1, r1, #1 mov r3, #1 - bl String16_FormatInteger + bl String_FormatInt mov r0, #1 str r0, [sp] mov r0, #2 @@ -6861,15 +6861,15 @@ _0222EDA8: bl AddTextPrinterParameterizedWithColor _0222EE7A: ldr r0, [sp, #0x4c] - bl String_Delete + bl String_Free ldr r0, [sp, #0x48] - bl String_Delete + bl String_Free ldr r0, [sp, #0x44] - bl String_Delete + bl String_Free add r0, r7, #0 - bl String_Delete + bl String_Free ldr r0, [sp, #0x34] - bl String_Delete + bl String_Free add r0, r5, #0 bl MessageFormat_ResetBuffers ldr r0, [sp, #0x20] @@ -7344,7 +7344,7 @@ _0222F21E: bl GetSpeciesNameIntoArray ldr r0, [sp, #0x4c] add r1, sp, #0x6c - bl CopyU16ArrayToString + bl String_CopyFromChars mov r0, #1 str r0, [sp] mov r0, #2 @@ -7373,7 +7373,7 @@ _0222F258: ldr r0, [sp, #0x48] ldr r1, [sp, #0x24] ldr r2, [sp, #0x28] - bl String16_FormatUnsignedLongLong + bl String_FormatU64 mov r0, #1 str r0, [sp] ldr r1, [sp, #0x20] @@ -7382,7 +7382,7 @@ _0222F258: mov r2, #2 add r1, r1, #1 mov r3, #1 - bl String16_FormatInteger + bl String_FormatInt mov r0, #1 str r0, [sp] mov r0, #2 @@ -7456,15 +7456,15 @@ _0222F32A: add r0, r0, #1 str r0, [sp, #0x44] ldr r0, [sp, #0x54] - bl String_Delete + bl String_Free ldr r0, [sp, #0x50] - bl String_Delete + bl String_Free ldr r0, [sp, #0x4c] - bl String_Delete + bl String_Free add r0, r7, #0 - bl String_Delete + bl String_Free ldr r0, [sp, #0x48] - bl String_Delete + bl String_Free add r0, r5, #0 bl MessageFormat_ResetBuffers ldr r0, [sp, #0x20] @@ -7604,7 +7604,7 @@ _0222F42C: ldr r0, [sp, #0x18] bl AddTextPrinterParameterizedWithColor add r0, r7, #0 - bl String_Delete + bl String_Free ldr r0, [sp, #0x10] add r6, r6, #1 add r1, r0, #1 @@ -7713,12 +7713,12 @@ _0222F500: add r1, r1, #1 mov r2, #2 mov r3, #1 - bl String16_FormatInteger + bl String_FormatInt ldr r2, [sp, #0x18] ldr r1, _0222F5E4 ; =0x00002608 add r0, r5, #0 ldr r1, [r2, r1] - bl CopyU16ArrayToString + bl String_CopyFromChars ldr r0, [sp, #0x14] add r1, r5, #0 bl ov40_02230DCC @@ -7766,11 +7766,11 @@ _0222F500: mov r3, #0x16 bl AddTextPrinterParameterizedWithColor add r0, r5, #0 - bl String_Delete + bl String_Free add r0, r7, #0 - bl String_Delete + bl String_Free ldr r0, [sp, #0x24] - bl String_Delete + bl String_Free ldr r0, [sp, #0x18] add r4, #0x18 add r0, r0, #4 @@ -9194,7 +9194,7 @@ _0222FFAE: add r0, r0, r2 str r0, [sp, #0x3c] add r0, r6, #0 - bl String_Delete + bl String_Free ldr r0, [sp, #0x20] add r4, #8 add r0, r0, #4 @@ -9261,11 +9261,11 @@ _02230062: add r0, r5, #0 bl ScheduleWindowCopyToVram ldr r0, [sp, #0x44] - bl String_Delete + bl String_Free ldr r0, [sp, #0x48] - bl String_Delete + bl String_Free add r0, r6, #0 - bl String_Delete + bl String_Free add r0, r4, #0 bl MessageFormat_ResetBuffers ldr r0, [sp, #0x14] @@ -9297,7 +9297,7 @@ _02230062: add r0, r5, #0 bl ScheduleWindowCopyToVram add r0, r6, #0 - bl String_Delete + bl String_Free add r0, r4, #0 bl MessageFormat_ResetBuffers ldr r0, [sp, #0x14] @@ -9328,7 +9328,7 @@ _02230062: ldr r1, [sp, #0x4c] mov r2, #4 mov r3, #0 - bl String16_FormatInteger + bl String_FormatInt mov r0, #1 str r0, [sp] mov r0, #2 @@ -9362,11 +9362,11 @@ _02230062: add r0, r5, #0 bl ScheduleWindowCopyToVram ldr r0, [sp, #0x50] - bl String_Delete + bl String_Free ldr r0, [sp, #0x54] - bl String_Delete + bl String_Free add r0, r6, #0 - bl String_Delete + bl String_Free add r0, r4, #0 bl MessageFormat_ResetBuffers b _02230206 @@ -9465,21 +9465,21 @@ _022302BA: ldr r1, [sp, #0x2c] mov r2, #5 mov r3, #2 - bl String16_FormatInteger + bl String_FormatInt mov r0, #1 str r0, [sp] ldr r0, [sp, #0x34] ldr r1, [sp, #0x28] mov r2, #5 mov r3, #2 - bl String16_FormatInteger + bl String_FormatInt mov r0, #1 str r0, [sp] mov r2, #2 ldr r0, [sp, #0x30] ldr r1, [sp, #0x24] add r3, r2, #0 - bl String16_FormatInteger + bl String_FormatInt mov r0, #1 str r0, [sp] mov r1, #2 @@ -9529,15 +9529,15 @@ _022302BA: ldr r0, [sp, #0x14] bl ScheduleWindowCopyToVram 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 r0, r6, #0 - bl String_Delete + bl String_Free add r0, r5, #0 - bl String_Delete + bl String_Free add r0, r4, #0 bl MessageFormat_ResetBuffers add r0, r4, #0 @@ -11015,7 +11015,7 @@ ov40_02230DCC: ; 0x02230DCC bl ov40_02230E08 _02230DFE: add r0, r6, #0 - bl String_Delete + bl String_Free pop {r4, r5, r6, pc} .balign 4, 0 thumb_func_end ov40_02230DCC @@ -11025,7 +11025,7 @@ ov40_02230E08: ; 0x02230E08 push {r3, r4, r5, lr} add r5, r1, #0 add r4, r0, #0 - bl String_SetEmpty + bl String_Clear mov r0, #1 mov r1, #0x1b mov r2, #0xd @@ -11086,7 +11086,7 @@ ov40_02230E34: ; 0x02230E34 str r1, [sp, #0xc] bl AddTextPrinterParameterizedWithColor add r0, r6, #0 - bl String_Delete + bl String_Free add r0, r5, r4 bl ScheduleWindowCopyToVram mov r0, #4 @@ -14161,7 +14161,7 @@ ov40_022326DC: ; 0x022326DC str r1, [sp, #0xc] bl AddTextPrinterParameterizedWithColor add r0, r7, #0 - bl String_Delete + bl String_Free add r0, r4, r6 bl ScheduleWindowCopyToVram add r6, #0x10 @@ -14203,7 +14203,7 @@ ov40_022326DC: ; 0x022326DC str r1, [sp, #0xc] bl AddTextPrinterParameterizedWithColor add r0, r5, #0 - bl String_Delete + bl String_Free add r0, r4, r6 bl ScheduleWindowCopyToVram add sp, #0x14 @@ -15251,7 +15251,7 @@ ov40_02232FEC: ; 0x02232FEC str r1, [sp, #0xc] bl AddTextPrinterParameterizedWithColor add r0, r5, #0 - bl String_Delete + bl String_Free add r0, r4, r6 bl ScheduleWindowCopyToVram add sp, #0x10 @@ -20052,7 +20052,7 @@ ov40_02235868: ; 0x02235868 str r1, [sp, #0xc] bl AddTextPrinterParameterizedWithColor add r0, r5, #0 - bl String_Delete + bl String_Free add r0, r4, #0 bl ScheduleWindowCopyToVram add sp, #0x10 @@ -20470,7 +20470,7 @@ _02235C18: add r0, r4, #0 add r1, r7, #0 add r2, r5, #0 - bl String_GetLineN + bl String_CopyLine mov r0, #0 add r1, r4, #0 add r2, r0, #0 @@ -20498,11 +20498,11 @@ _02235C54: ldr r0, [sp, #0x20] bl ScheduleWindowCopyToVram add r0, r4, #0 - bl String_Delete + bl String_Free ldr r0, [sp, #0x1c] - bl String_Delete + bl String_Free add r0, r7, #0 - bl String_Delete + bl String_Free ldr r0, [sp, #0x18] bl MessageFormat_Delete _02235C72: @@ -20606,7 +20606,7 @@ _02235D48: add r0, r4, #0 add r1, r7, #0 add r2, r5, #0 - bl String_GetLineN + bl String_CopyLine mov r0, #0 add r1, r4, #0 add r2, r0, #0 @@ -20634,11 +20634,11 @@ _02235D84: ldr r0, [sp, #0x20] bl ScheduleWindowCopyToVram add r0, r4, #0 - bl String_Delete + bl String_Free ldr r0, [sp, #0x1c] - bl String_Delete + bl String_Free add r0, r7, #0 - bl String_Delete + bl String_Free ldr r0, [sp, #0x18] bl MessageFormat_Delete _02235DA2: @@ -21069,7 +21069,7 @@ _022360DA: add r0, r4, #0 bl ScheduleWindowCopyToVram ldr r0, [sp, #0x2c] - bl String_Delete + bl String_Free ldr r0, [sp, #0x1c] add r7, r7, #1 add r1, r0, #0 @@ -22936,7 +22936,7 @@ _02236F50: add r0, r4, #0 bl ScheduleWindowCopyToVram ldr r0, [sp, #0x18] - bl String_Delete + bl String_Free ldrb r1, [r5, #2] ldrb r0, [r5, #3] add r7, r7, #1 @@ -23028,7 +23028,7 @@ ov40_02237030: ; 0x02237030 add r0, r5, r6 bl ScheduleWindowCopyToVram add r0, r4, #0 - bl String_Delete + bl String_Free add sp, #0x10 pop {r4, r5, r6, pc} nop @@ -23069,7 +23069,7 @@ ov40_0223707C: ; 0x0223707C mov r1, #0xe3 lsl r1, r1, #2 ldr r1, [r2, r1] - bl CopyU16ArrayToString + bl String_CopyFromChars add r0, r5, #0 add r1, r6, #0 bl ov40_02230DCC @@ -23109,11 +23109,11 @@ ov40_0223707C: ; 0x0223707C add r0, r4, r0 bl ScheduleWindowCopyToVram ldr r0, [sp, #0x10] - 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 ldr r0, [sp, #0x14] bl MessageFormat_Delete add sp, #0x18 @@ -23137,7 +23137,7 @@ ov40_02237144: ; 0x02237144 bl String_New add r1, r5, #4 add r4, r0, #0 - bl CopyU16ArrayToString + bl String_CopyFromChars add r0, r5, r6 mov r1, #0 bl FillWindowPixelBuffer @@ -23159,7 +23159,7 @@ ov40_02237144: ; 0x02237144 add r0, r5, r6 bl ScheduleWindowCopyToVram add r0, r4, #0 - bl String_Delete + bl String_Free add sp, #0x10 pop {r4, r5, r6, pc} .balign 4, 0 @@ -23256,7 +23256,7 @@ _02237238: bl GetSpeciesNameIntoArray add r0, r5, #0 add r1, sp, #0x10 - bl CopyU16ArrayToString + bl String_CopyFromChars add r0, r4, r7 add r1, r5, #0 bl ov40_022306C0 @@ -23275,7 +23275,7 @@ _02237238: add r0, r4, r7 bl ScheduleWindowCopyToVram add r0, r5, #0 - bl String_Delete + bl String_Free add sp, #0x1fc add sp, #0x14 pop {r3, r4, r5, r6, r7, pc} @@ -24371,7 +24371,7 @@ _02237AE6: mul r0, r1 add r7, r7, r0 ldr r0, [sp, #0x1c] - bl String_Delete + bl String_Free ldr r0, [sp, #0x18] add r4, #0x10 add r0, r0, #1 @@ -24421,7 +24421,7 @@ ov40_02237B7C: ; 0x02237B7C str r1, [sp, #0xc] bl AddTextPrinterParameterizedWithColor add r0, r5, #0 - bl String_Delete + bl String_Free add r0, r4, r6 bl ScheduleWindowCopyToVram add sp, #0x10 @@ -24483,7 +24483,7 @@ ov40_02237BD4: ; 0x02237BD4 add r0, r4, r6 bl ScheduleWindowCopyToVram add r0, r5, #0 - bl String_Delete + bl String_Free add sp, #0x14 pop {r3, r4, r5, r6, pc} .balign 4, 0 @@ -24607,7 +24607,7 @@ _02237D16: add r2, r6, #0 bl AddTextPrinterParameterizedWithColor add r0, r6, #0 - bl String_Delete + bl String_Free _02237D3C: add r0, r4, #0 bl ScheduleWindowCopyToVram @@ -25250,7 +25250,7 @@ _022382AA: lsl r1, r1, #2 ldr r0, [r4, r0] ldr r1, [r5, r1] - bl CopyU16ArrayToString + bl String_CopyFromChars ldr r1, _022382FC ; =0x00002E10 ldr r0, [sp] ldr r1, [r4, r1] @@ -25266,7 +25266,7 @@ _022382AA: ldr r1, [r5, r1] ldr r0, [r4, r0] add r1, #0x80 - bl CopyU16ArrayToString + bl String_CopyFromChars mov r0, #0xe2 lsl r0, r0, #2 ldr r0, [r7, r0] @@ -25301,7 +25301,7 @@ _0223831C: ldr r0, [r5, r0] cmp r0, #0 beq _0223832C - bl String_Delete + bl String_Free ldr r0, _02238350 ; =0x00002E0C str r7, [r5, r0] _0223832C: @@ -25309,7 +25309,7 @@ _0223832C: ldr r0, [r5, r0] cmp r0, #0 beq _0223833E - bl String_Delete + bl String_Free ldr r0, _02238354 ; =0x00002E10 mov r1, #0 str r1, [r5, r0] @@ -27290,7 +27290,7 @@ _02239358: add r0, r4, #0 bl ScheduleWindowCopyToVram add r0, r7, #0 - bl String_Delete + bl String_Free ldr r0, [sp, #0x18] add r4, #0x10 add r0, r0, #1 @@ -27432,7 +27432,7 @@ _022394B4: add r0, r4, #0 bl ScheduleWindowCopyToVram ldr r0, [sp, #0x20] - bl String_Delete + bl String_Free ldr r0, [sp, #0x18] add r4, #0x10 add r0, r0, #1 @@ -27561,7 +27561,7 @@ _022395CE: add r0, #0x24 bl ScheduleWindowCopyToVram add r0, r7, #0 - bl String_Delete + bl String_Free add r0, r4, #0 add r0, #0x34 mov r1, #0 @@ -27595,7 +27595,7 @@ _0223961A: add r0, #0x34 bl ScheduleWindowCopyToVram add r0, r7, #0 - bl String_Delete + bl String_Free ldr r0, _022397B0 ; =0x0000088C mov r1, #0x6d ldr r0, [r5, r0] @@ -27689,7 +27689,7 @@ _022396F8: bl GetSpeciesNameIntoArray ldr r0, [sp, #0x1c] add r1, sp, #0x2c - bl CopyU16ArrayToString + bl String_CopyFromChars b _02239726 _0223971C: ldr r0, [r5, #0x48] @@ -27736,13 +27736,13 @@ _0223973A: add r0, r4, #0 bl ScheduleWindowCopyToVram add r0, r7, #0 - bl String_Delete + bl String_Free 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 add r0, r6, #0 bl MessageFormat_ResetBuffers add r0, r6, #0 @@ -28816,7 +28816,7 @@ _0223A096: ldr r0, [r4, r0] cmp r0, #0 beq _0223A0B8 - bl String_Delete + bl String_Free _0223A0B8: ldr r0, _0223A14C ; =0x0000049C add r1, r5, #0 @@ -29054,7 +29054,7 @@ _0223A29A: ldr r0, [r4, r0] cmp r0, #0 beq _0223A2BE - bl String_Delete + bl String_Free _0223A2BE: ldr r0, _0223A31C ; =0x0000049C add r1, r5, #0 @@ -29391,9 +29391,9 @@ ov40_0223A510: ; 0x0223A510 add r2, r4, #0 bl StringExpandPlaceholders ldr r0, [sp, #0x18] - bl String_Delete + bl String_Free add r0, r4, #0 - bl String_Delete + bl String_Free add r0, r7, #0 bl MessageFormat_Delete b _0223A602 @@ -29438,9 +29438,9 @@ _0223A58A: add r2, r4, #0 bl StringExpandPlaceholders ldr r0, [sp, #0x1c] - bl String_Delete + bl String_Free add r0, r4, #0 - bl String_Delete + bl String_Free add r0, r7, #0 bl MessageFormat_Delete b _0223A602 @@ -29469,7 +29469,7 @@ _0223A602: add r0, r5, r0 bl ScheduleWindowCopyToVram add r0, r6, #0 - bl String_Delete + bl String_Free add sp, #0x20 pop {r3, r4, r5, r6, r7, pc} .balign 4, 0 @@ -31014,9 +31014,9 @@ _0223B2BC: add r1, r4, #0 bl StringExpandPlaceholders ldr r0, [sp, #0x14] - bl String_Delete + bl String_Free add r0, r6, #0 - bl String_Delete + bl String_Free add r0, r7, #0 bl MessageFormat_Delete _0223B31A: @@ -31049,7 +31049,7 @@ _0223B31A: mov r3, #0x6d bl TextOBJ_CopyFromBGWindow add r0, r4, #0 - bl String_Delete + bl String_Free add r0, sp, #0x18 bl RemoveWindow add sp, #0x28 @@ -31967,7 +31967,7 @@ ov40_0223BA70: ; 0x0223BA70 add r0, r6, #0 bl ScheduleWindowCopyToVram add r0, r7, #0 - bl String_Delete + bl String_Free add r6, r4, #0 add r6, #0x94 add r0, r6, #0 @@ -32013,7 +32013,7 @@ ov40_0223BA70: ; 0x0223BA70 add r0, r6, #0 bl ScheduleWindowCopyToVram add r0, r5, #0 - bl String_Delete + bl String_Free ldr r0, _0223BB70 ; =0x0000202C mov r1, #1 str r1, [r4, r0] @@ -33460,9 +33460,9 @@ ov40_0223C710: ; 0x0223C710 add r2, r4, #0 bl StringExpandPlaceholders ldr r0, [sp, #0x18] - bl String_Delete + bl String_Free add r0, r4, #0 - bl String_Delete + bl String_Free add r0, r7, #0 bl MessageFormat_Delete b _0223C7CE @@ -33492,7 +33492,7 @@ _0223C7CE: add r0, r5, r0 bl ScheduleWindowCopyToVram add r0, r6, #0 - bl String_Delete + bl String_Free add sp, #0x1c pop {r4, r5, r6, r7, pc} .balign 4, 0 @@ -34084,7 +34084,7 @@ ov40_0223CCBC: ; 0x0223CCBC str r1, [sp, #0xc] bl AddTextPrinterParameterizedWithColor add r0, r5, #0 - bl String_Delete + bl String_Free add r0, r4, #0 bl ScheduleWindowCopyToVram add sp, #0x10 @@ -34176,7 +34176,7 @@ ov40_0223CD58: ; 0x0223CD58 str r1, [sp, #0xc] bl AddTextPrinterParameterizedWithColor add r0, r7, #0 - bl String_Delete + bl String_Free add r0, r6, #0 bl ScheduleWindowCopyToVram add r4, #0xa4 @@ -34218,7 +34218,7 @@ ov40_0223CD58: ; 0x0223CD58 str r1, [sp, #0xc] bl AddTextPrinterParameterizedWithColor add r0, r5, #0 - bl String_Delete + bl String_Free add r0, r4, #0 bl ScheduleWindowCopyToVram add sp, #0x14 @@ -36155,7 +36155,7 @@ _0223DC94: add r0, r4, #0 bl ScheduleWindowCopyToVram add r0, r6, #0 - bl String_Delete + bl String_Free ldr r0, [sp, #0x18] ldr r1, [sp, #0x20] add r0, r0, #4 @@ -36232,7 +36232,7 @@ _0223DD38: add r0, r6, r7 bl ScheduleWindowCopyToVram add r0, r4, #0 - bl String_Delete + bl String_Free add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} .balign 4, 0 @@ -36273,7 +36273,7 @@ _0223DD94: bl GetSpeciesNameIntoArray add r0, r5, #0 add r1, sp, #0x10 - bl CopyU16ArrayToString + bl String_CopyFromChars _0223DDB0: mov r1, #0 str r1, [sp] @@ -36289,7 +36289,7 @@ _0223DDB0: add r0, r4, r7 bl ScheduleWindowCopyToVram add r0, r5, #0 - bl String_Delete + bl String_Free add sp, #0x1fc add sp, #0x14 pop {r3, r4, r5, r6, r7, pc} @@ -36366,7 +36366,7 @@ _0223DE50: bl StringExpandPlaceholders _0223DE78: add r0, r5, #0 - bl String_Delete + bl String_Free add r0, r6, #0 bl MessageFormat_Delete _0223DE84: @@ -36386,7 +36386,7 @@ _0223DE84: add r0, r7, r0 bl ScheduleWindowCopyToVram ldr r0, [sp, #0x14] - bl String_Delete + bl String_Free add sp, #0x18 pop {r3, r4, r5, r6, r7, pc} .balign 4, 0 @@ -36431,7 +36431,7 @@ _0223DED2: add r0, r5, r6 bl ScheduleWindowCopyToVram add r0, r4, #0 - bl String_Delete + bl String_Free add sp, #0x10 pop {r4, r5, r6, pc} nop @@ -36549,7 +36549,7 @@ _0223DFC6: add r0, r5, #0 bl ScheduleWindowCopyToVram add r0, r4, #0 - bl String_Delete + bl String_Free add r6, r6, #1 add r5, #0x10 add r7, r7, #4 @@ -36682,7 +36682,7 @@ ov40_0223E0A4: ; 0x0223E0A4 add r0, r4, r6 bl ScheduleWindowCopyToVram add r0, r7, #0 - bl String_Delete + bl String_Free add r6, #0xc0 add r0, r4, r6 bl InitWindow @@ -36727,7 +36727,7 @@ ov40_0223E0A4: ; 0x0223E0A4 add r0, r4, r6 bl ScheduleWindowCopyToVram add r0, r5, #0 - bl String_Delete + bl String_Free ldr r0, _0223E18C ; =0x00000798 mov r1, #1 str r1, [r4, r0] @@ -37519,7 +37519,7 @@ _0223E810: add r0, r4, #0 bl ScheduleWindowCopyToVram ldr r0, [sp, #0x2c] - bl String_Delete + bl String_Free ldr r0, [sp, #0x1c] add r7, r7, #1 add r1, r0, #0 @@ -42062,9 +42062,9 @@ _02240D70: add r1, r4, #0 bl StringExpandPlaceholders ldr r0, [sp, #0x14] - bl String_Delete + bl String_Free add r0, r6, #0 - bl String_Delete + bl String_Free add r0, r7, #0 bl MessageFormat_Delete _02240DCE: @@ -42097,7 +42097,7 @@ _02240DCE: mov r3, #0x6d bl TextOBJ_CopyFromBGWindow add r0, r4, #0 - bl String_Delete + bl String_Free add r0, sp, #0x18 bl RemoveWindow add sp, #0x28 @@ -42178,9 +42178,9 @@ ov40_02240E28: ; 0x02240E28 add r2, r4, #0 bl StringExpandPlaceholders ldr r0, [sp, #0x18] - bl String_Delete + bl String_Free add r0, r4, #0 - bl String_Delete + bl String_Free add r0, r7, #0 bl MessageFormat_Delete b _02240EE4 @@ -42210,7 +42210,7 @@ _02240EE4: add r0, r5, r0 bl ScheduleWindowCopyToVram add r0, r6, #0 - bl String_Delete + bl String_Free add sp, #0x1c pop {r4, r5, r6, r7, pc} nop @@ -42264,9 +42264,9 @@ ov40_02240F24: ; 0x02240F24 add r2, r4, #0 bl StringExpandPlaceholders ldr r0, [sp, #0x18] - bl String_Delete + bl String_Free add r0, r4, #0 - bl String_Delete + bl String_Free add r0, r7, #0 bl MessageFormat_Delete b _02241014 @@ -42311,9 +42311,9 @@ _02240F9C: add r2, r4, #0 bl StringExpandPlaceholders ldr r0, [sp, #0x1c] - bl String_Delete + bl String_Free add r0, r4, #0 - bl String_Delete + bl String_Free add r0, r7, #0 bl MessageFormat_Delete b _02241014 @@ -42342,7 +42342,7 @@ _02241014: add r0, r5, r0 bl ScheduleWindowCopyToVram add r0, r6, #0 - bl String_Delete + bl String_Free add sp, #0x20 pop {r3, r4, r5, r6, r7, pc} nop @@ -43577,7 +43577,7 @@ ov40_02241A54: ; 0x02241A54 str r1, [sp, #0xc] bl AddTextPrinterParameterizedWithColor add r0, r5, #0 - bl String_Delete + bl String_Free add r0, r4, r6 bl ScheduleWindowCopyToVram add sp, #0x10 @@ -43672,7 +43672,7 @@ ov40_02241AFC: ; 0x02241AFC str r1, [sp, #0xc] bl AddTextPrinterParameterizedWithColor add r0, r7, #0 - bl String_Delete + bl String_Free add r0, r4, r6 bl ScheduleWindowCopyToVram add r6, #0x10 @@ -43714,7 +43714,7 @@ ov40_02241AFC: ; 0x02241AFC str r1, [sp, #0xc] bl AddTextPrinterParameterizedWithColor add r0, r5, #0 - bl String_Delete + bl String_Free add r0, r4, r6 bl ScheduleWindowCopyToVram add sp, #0x14 @@ -46030,7 +46030,7 @@ ov40_02242E4C: ; 0x02242E4C ldr r0, [sp, #0x18] mov r2, #5 mov r3, #2 - bl String16_FormatInteger + bl String_FormatInt ldr r0, [sp, #0x24] ldr r2, _02242F9C ; =0x000186A0 add r1, r4, #0 @@ -46042,7 +46042,7 @@ ov40_02242E4C: ; 0x02242E4C ldr r0, [sp, #0x1c] mov r2, #5 mov r3, #2 - bl String16_FormatInteger + bl String_FormatInt ldr r0, [sp, #0x24] ldr r2, _02242F9C ; =0x000186A0 add r1, r4, #0 @@ -46054,7 +46054,7 @@ ov40_02242E4C: ; 0x02242E4C mov r2, #2 ldr r0, [sp, #0x20] add r3, r2, #0 - bl String16_FormatInteger + bl String_FormatInt mov r0, #1 str r0, [sp] mov r1, #2 @@ -46104,15 +46104,15 @@ ov40_02242E4C: ; 0x02242E4C add r0, r5, r0 bl ScheduleWindowCopyToVram ldr r0, [sp, #0x18] - bl String_Delete + bl String_Free ldr r0, [sp, #0x1c] - bl String_Delete + bl String_Free ldr r0, [sp, #0x20] - bl String_Delete + bl String_Free ldr r0, [sp, #0x28] - bl String_Delete + bl String_Free ldr r0, [sp, #0x2c] - bl String_Delete + bl String_Free add r0, r6, #0 bl MessageFormat_ResetBuffers add r0, r6, #0 @@ -46180,7 +46180,7 @@ _02243006: bl GF_AssertFail _0224300E: ldr r0, [r4, #0x18] - bl String_Delete + bl String_Free add r0, r4, #0 bl Heap_Free pop {r4, pc} @@ -46951,12 +46951,12 @@ _022435C2: ldr r0, [sp, #4] ldr r1, [sp, #8] add r3, r2, #0 - bl String16_FormatInteger + bl String_FormatInt mov r0, #0xb lsl r0, r0, #6 ldr r0, [r7, r0] ldr r1, [sp, #4] - bl String_Cat + bl String_Concat mov r0, #0x81 lsl r0, r0, #2 ldr r0, [r7, r0] @@ -46966,7 +46966,7 @@ _022435C2: blt _02243590 _022435FC: ldr r0, [sp, #4] - bl String_Delete + bl String_Free add r0, r7, #0 mov r1, #3 bl ov40_0224320C @@ -48722,9 +48722,9 @@ ov40_022442F0: ; 0x022442F0 add r2, r7, #0 bl StringExpandPlaceholders ldr r0, [sp, #0x14] - bl String_Delete + bl String_Free add r0, r7, #0 - bl String_Delete + bl String_Free add r0, r6, #0 bl MessageFormat_Delete b _02244372 @@ -48753,7 +48753,7 @@ _02244372: add r0, r5, r0 bl ScheduleWindowCopyToVram add r0, r4, #0 - bl String_Delete + bl String_Free add sp, #0x18 pop {r3, r4, r5, r6, r7, pc} .balign 4, 0 @@ -48810,7 +48810,7 @@ ov40_022443B4: ; 0x022443B4 str r1, [sp, #0xc] bl AddTextPrinterParameterizedWithColor add r0, r7, #0 - bl String_Delete + bl String_Free add r0, r6, #0 bl ScheduleWindowCopyToVram add r4, #0x20 @@ -48852,7 +48852,7 @@ ov40_022443B4: ; 0x022443B4 str r1, [sp, #0xc] bl AddTextPrinterParameterizedWithColor add r0, r5, #0 - bl String_Delete + bl String_Free add r0, r4, #0 bl ScheduleWindowCopyToVram add sp, #0x14 @@ -49461,14 +49461,14 @@ _02244982: ldr r0, [sp, #0x1c] ldr r1, [sp, #0x10] mov r2, #8 - bl CopyStringToU16Array + bl String_CopyToChars b _022449CC _0224499E: add r0, r4, #0 - bl String_SetEmpty + bl String_Clear ldr r1, [sp, #0xc] add r0, r4, #0 - bl CopyU16ArrayToString + bl String_CopyFromChars ldr r2, [sp, #0x1c] mov r0, #0 add r1, r4, #0 @@ -49481,7 +49481,7 @@ _0224499E: ldr r0, [sp, #0x1c] ldr r1, [sp, #0x10] mov r2, #8 - bl CopyStringToU16Array + bl String_CopyToChars _022449CC: ldr r0, [sp, #0x14] ldr r1, [sp, #0x28] @@ -49531,10 +49531,10 @@ _02244A02: add r2, r5, #0 bl GetMonData add r0, r4, #0 - bl String_SetEmpty + bl String_Clear add r0, r4, #0 add r1, r5, #0 - bl CopyU16ArrayToString + bl String_CopyFromChars ldr r2, [sp, #0x1c] mov r0, #0 add r1, r4, #0 @@ -49562,9 +49562,9 @@ _02244A5C: blt _022449F2 _02244A6E: add r0, r4, #0 - bl String_Delete + bl String_Free ldr r0, [sp, #0x1c] - bl String_Delete + bl String_Free add r0, r5, #0 bl Heap_Free add sp, #0x2c @@ -49576,7 +49576,7 @@ ov40_02244A84: ; 0x02244A84 push {r3, r4, r5, lr} add r5, r1, #0 add r4, r0, #0 - bl String_SetEmpty + bl String_Clear mov r0, #1 mov r1, #0x1b mov r2, #0xd diff --git a/asm/overlay_41.s b/asm/overlay_41.s index 3baa9eb5da..6074bfbbf5 100644 --- a/asm/overlay_41.s +++ b/asm/overlay_41.s @@ -3592,7 +3592,7 @@ ov41_022479A8: ; 0x022479A8 add r1, r5, #0 bl sub_0202BDC8 add r0, r5, #0 - bl String_Delete + bl String_Free _022479E8: ldr r0, [sp] mov r5, #0 @@ -3907,7 +3907,7 @@ ov41_02247BB8: ; 0x02247BB8 add r2, r4, #0 bl AddTextPrinterParameterizedWithColor add r0, r4, #0 - bl String_Delete + bl String_Free add r0, r6, #0 bl DestroyMsgData ldr r0, _02247C74 ; =0x000006BC @@ -3962,9 +3962,9 @@ ov41_02247C7C: ; 0x02247C7C add r2, r4, #0 bl AddTextPrinterParameterizedWithColor 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, _02247CF4 ; =0x000006BC @@ -10186,7 +10186,7 @@ _0224A940: mov r1, #2 bl AddTextPrinterParameterizedWithColor add r0, r5, #0 - bl String_Delete + bl String_Free add r0, r7, #0 bl DestroyMsgData add r0, r4, #0 @@ -10579,7 +10579,7 @@ ov41_0224AC80: ; 0x0224AC80 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 @@ -10830,7 +10830,7 @@ _0224AE3C: bl AddTextPrinterParameterizedWithColor add r6, r0, #0 add r0, r4, #0 - bl String_Delete + bl String_Free add r0, r5, #0 bl DestroyMsgData add r0, r6, #0 @@ -12978,7 +12978,7 @@ _0224BE9C: sub r3, r3, r4 bl AddTextPrinterParameterizedWithColor add r0, r7, #0 - bl String_Delete + bl String_Free ldr r0, [r5] bl sub_0202BE98 add r2, r0, #0 @@ -13020,9 +13020,9 @@ _0224BE9C: sub r3, r3, r5 bl AddTextPrinterParameterizedWithColor 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 diff --git a/asm/overlay_43.s b/asm/overlay_43.s index ef7c41cd25..9e0d677039 100644 --- a/asm/overlay_43.s +++ b/asm/overlay_43.s @@ -512,9 +512,9 @@ ov43_0222A2F0: ; 0x0222A2F0 ldr r1, [r5] bl MenuInputStateMgr_SetState ldr r0, [r5, #0x58] - bl String_Delete + bl String_Free ldr r0, [r5, #0x5c] - bl String_Delete + bl String_Free pop {r3, r4, r5, pc} thumb_func_end ov43_0222A2F0 @@ -585,7 +585,7 @@ _0222A378: bne _0222A404 add r0, r6, #0 add r1, sp, #0x1c - bl String_atoi + bl String_AtoI add r7, r0, #0 ldr r0, [sp, #0x1c] add r6, r1, #0 @@ -1317,15 +1317,15 @@ ov43_0222A960: ; 0x0222A960 ldr r0, [r4, #0x5c] bl TouchscreenListMenuSpawner_Destroy ldr r0, [r4, #0x7c] - bl String_Delete + bl String_Free add r0, r4, #0 add r0, #0x80 ldr r0, [r0] - bl String_Delete + bl String_Free ldr r0, [r4, #0x74] - bl String_Delete + bl String_Free ldr r0, [r4, #0x78] - bl String_Delete + bl String_Free add r4, #0x64 add r0, r4, #0 bl RemoveWindow @@ -2122,7 +2122,7 @@ _0222AF88: bl PlayerProfile_New str r0, [sp, #0xc] ldr r0, [r4, #0x58] - bl String_cstr + bl String_GetChars add r1, r0, #0 ldr r0, [sp, #0xc] bl Save_Profile_PlayerName_Set @@ -2134,7 +2134,7 @@ _0222AF88: bl Heap_Free ldr r0, [r4, #0x5c] add r1, sp, #0x10 - bl String_atoi + bl String_AtoI add r3, r0, #0 ldr r0, [sp, #0x10] add r2, r1, #0 @@ -2370,9 +2370,9 @@ _0222B160: cmp r7, #4 blt _0222B160 add r0, r4, #0 - bl String_Delete + bl String_Free ldr r0, [sp, #0x1c] - bl String_Delete + bl String_Free ldr r0, [sp, #0x18] ldr r3, [sp, #0x14] str r0, [sp] @@ -2395,7 +2395,7 @@ ov43_0222B1D8: ; 0x0222B1D8 push {r4, lr} add r4, r0, #0 ldr r0, [r4, #0x3c] - bl String_Delete + bl String_Free add r0, r4, #0 add r0, #8 bl RemoveWindow @@ -2818,7 +2818,7 @@ ov43_0222B4BC: ; 0x0222B4BC add r0, r5, #0 bl ScheduleWindowCopyToVram add r0, r6, #0 - bl String_Delete + bl String_Free add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} .balign 4, 0 @@ -3427,7 +3427,7 @@ _0222B95A: str r3, [sp, #0xc] bl AddTextPrinterParameterizedWithColor add r0, r4, #0 - bl String_Delete + bl String_Free mov r0, #0 str r0, [sp, #0x20] ldr r0, _0222BAAC ; =ov43_0222EEE0 @@ -3538,7 +3538,7 @@ ov43_0222BAB8: ; 0x0222BAB8 add r0, r5, #0 add r0, #0xd8 ldr r0, [r0] - bl String_Delete + bl String_Free mov r6, #0 add r4, r5, #0 _0222BADC: @@ -4953,7 +4953,7 @@ ov43_0222C550: ; 0x0222C550 add r0, r5, #0 bl ScheduleWindowCopyToVram add r0, r6, #0 - bl String_Delete + bl String_Free add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} .balign 4, 0 @@ -5636,7 +5636,7 @@ _0222CAD0: bl sub_0202C254 add r1, r0, #0 add r0, r6, #0 - bl CopyU16ArrayToString + bl String_CopyFromChars add r3, r4, #0 mov r0, #0xa mul r3, r0 @@ -5662,7 +5662,7 @@ _0222CAD0: lsl r3, r3, #3 bl AddTextPrinterParameterizedWithColor add r0, r6, #0 - bl String_Delete + bl String_Free add sp, #0x28 pop {r3, r4, r5, r6, r7, pc} nop @@ -5968,10 +5968,10 @@ ov43_0222CD44: ; 0x0222CD44 ldr r0, [r4, #0x18] bne _0222CD80 ldr r1, [r5, #0x60] - bl CopyU16ArrayToString + bl String_CopyFromChars b _0222CD84 _0222CD80: - bl String_SetEmpty + bl String_Clear _0222CD84: mov r0, #0 str r0, [r5, #0x64] @@ -6264,9 +6264,9 @@ _0222CFB4: str r3, [sp, #0xc] bl AddTextPrinterParameterizedWithColor add r0, r6, #0 - bl String_Delete + bl String_Free ldr r0, [sp, #0x20] - bl String_Delete + bl String_Free str r7, [sp] add r3, r5, #0 ldr r0, [r4, #0x58] @@ -9047,9 +9047,9 @@ _0222E462: mov r1, #3 bl ov43_0222DEF8 add r0, r7, #0 - bl String_Delete + bl String_Free add r0, r6, #0 - bl String_Delete + bl String_Free add sp, #0x28 pop {r3, r4, r5, r6, r7, pc} .balign 4, 0 @@ -9266,9 +9266,9 @@ _0222E63A: mov r1, #4 bl ov43_0222DEF8 add r0, r7, #0 - bl String_Delete + bl String_Free add r0, r6, #0 - bl String_Delete + bl String_Free add sp, #0x28 pop {r3, r4, r5, r6, r7, pc} .balign 4, 0 @@ -9333,7 +9333,7 @@ ov43_0222E78C: ; 0x0222E78C add r3, r1, #0 bl AddTextPrinterParameterizedWithColor ldr r0, [sp, #0x2c] - bl String_Delete + bl String_Free mov r2, #0xb ldrsb r2, [r5, r2] ldr r0, [sp, #0x28] @@ -9439,9 +9439,9 @@ _0222E828: mov r1, #5 bl ov43_0222DEF8 add r0, r7, #0 - bl String_Delete + bl String_Free add r0, r6, #0 - bl String_Delete + bl String_Free add sp, #0x30 pop {r3, r4, r5, r6, r7, pc} nop @@ -9587,9 +9587,9 @@ _0222E966: mov r1, #6 bl ov43_0222DEF8 add r0, r7, #0 - bl String_Delete + bl String_Free add r0, r6, #0 - bl String_Delete + bl String_Free add sp, #0x28 pop {r3, r4, r5, r6, r7, pc} .balign 4, 0 @@ -9772,9 +9772,9 @@ ov43_0222EA40: ; 0x0222EA40 mov r1, #1 bl ov43_0222DEF8 add r0, r6, #0 - bl String_Delete + bl String_Free add r0, r7, #0 - bl String_Delete + bl String_Free add sp, #0x28 pop {r3, r4, r5, r6, r7, pc} .balign 4, 0 diff --git a/asm/overlay_44.s b/asm/overlay_44.s index 9bb6600510..2969c5af53 100644 --- a/asm/overlay_44.s +++ b/asm/overlay_44.s @@ -2066,19 +2066,19 @@ ov44_0222AE44: ; 0x0222AE44 mov r0, #0x5e lsl r0, r0, #2 ldr r0, [r4, r0] - bl String_Delete + bl String_Free mov r0, #0x5d lsl r0, r0, #2 ldr r0, [r4, r0] - bl String_Delete + bl String_Free mov r0, #0x5f lsl r0, r0, #2 ldr r0, [r4, r0] - bl String_Delete + bl String_Free mov r0, #0x17 lsl r0, r0, #4 ldr r0, [r4, r0] - bl String_Delete + bl String_Free pop {r4, pc} .balign 4, 0 thumb_func_end ov44_0222AE44 @@ -4401,7 +4401,7 @@ ov44_0222C120: ; 0x0222C120 cmp r0, #0 bne _0222C152 add r0, r4, #0 - bl String_Delete + bl String_Free add sp, #0x14 pop {r3, r4, r5, r6, pc} _0222C152: @@ -4435,7 +4435,7 @@ _0222C170: str r1, [sp, #0xc] bl AddTextPrinterParameterizedWithColor add r0, r4, #0 - bl String_Delete + bl String_Free ldr r1, [r5, #4] add r0, r5, #0 bl ov44_02229F00 @@ -4484,7 +4484,7 @@ _0222C1EA: mov r0, #0x17 lsl r0, r0, #4 ldr r0, [r5, r0] - bl CopyU16ArrayToString + bl String_CopyFromChars b _0222C214 _0222C204: mov r2, #0x5a @@ -13768,7 +13768,7 @@ ov44_02230C68: ; 0x02230C68 str r1, [sp, #0xc] bl AddTextPrinterParameterizedWithColor add r0, r6, #0 - bl String_Delete + bl String_Free mov r1, #0x5e lsl r1, r1, #2 ldr r1, [r5, r1] @@ -14889,7 +14889,7 @@ _0223153E: mov r1, #2 bl AddTextPrinterParameterizedWithColor add r0, r4, #0 - bl String_Delete + bl String_Free ldr r1, [sp, #0x2c] add r0, sp, #0x68 bl sub_02013910 @@ -19188,9 +19188,9 @@ ov44_02233678: ; 0x02233678 push {r4, lr} add r4, r0, #0 ldr r0, [r4, #0x10] - bl String_Delete + bl String_Free ldr r0, [r4, #0xc] - bl String_Delete + bl String_Free ldr r0, [r4, #8] bl DestroyMsgData ldr r0, [r4, #4] @@ -19475,7 +19475,7 @@ _02233890: add r0, r5, r0 bl ScheduleWindowCopyToVram add r0, r7, #0 - bl String_Delete + bl String_Free ldr r0, [r4, #8] bl Save_PlayerData_GetOptionsAddr bl Options_GetFrame @@ -19631,9 +19631,9 @@ ov44_0223398C: ; 0x0223398C add r0, r5, r0 bl ScheduleWindowCopyToVram add r0, r6, #0 - bl String_Delete + bl String_Free add r0, r7, #0 - bl String_Delete + bl String_Free add sp, #0x18 pop {r3, r4, r5, r6, r7, pc} .balign 4, 0 @@ -19868,9 +19868,9 @@ _02233BAA: mov r1, #2 bl ScheduleBgTilemapBufferTransfer ldr r0, [sp, #0x28] - bl String_Delete + bl String_Free ldr r0, [sp, #0x24] - bl String_Delete + bl String_Free add sp, #0x2c pop {r4, r5, r6, r7, pc} .balign 4, 0 diff --git a/asm/overlay_45_thumb.s b/asm/overlay_45_thumb.s index 92fd2c57ce..82c477472f 100644 --- a/asm/overlay_45_thumb.s +++ b/asm/overlay_45_thumb.s @@ -1364,9 +1364,9 @@ ov45_0222A844: ; 0x0222A844 mov r6, #1 _0222A892: ldr r0, [sp] - bl String_Delete + bl String_Free ldr r0, [sp, #4] - bl String_Delete + bl String_Free b _0222A8A2 _0222A8A0: mov r6, #1 @@ -1386,7 +1386,7 @@ _0222A8A2: add r1, r7, #0 bl PlayerName_StringToFlat add r0, r7, #0 - bl String_Delete + bl String_Free add r0, r6, #0 bl DestroyMsgData _0222A8D0: @@ -3709,13 +3709,13 @@ ov45_0222B8A0: ; 0x0222B8A0 add r4, r0, #0 add r1, #0x28 mov r2, #8 - bl CopyStringToU16Array + bl String_CopyToChars add r0, r4, #0 add r1, r5, #0 mov r2, #8 - bl CopyStringToU16Array + bl String_CopyToChars add r0, r4, #0 - bl String_Delete + bl String_Free mov r0, #0 mvn r0, r0 str r0, [r5, #0x20] @@ -9313,7 +9313,7 @@ _0222DFD8: add r5, r6, #0 _0222DFDC: ldr r0, [r5, #0x10] - bl String_Delete + bl String_Free add r4, r4, #1 add r5, r5, #4 cmp r4, #4 @@ -9565,7 +9565,7 @@ ov45_0222E14C: ; 0x0222E14C add r2, r4, #0 bl StringExpandPlaceholders add r0, r4, #0 - bl String_Delete + bl String_Free mov r0, #1 add sp, #8 pop {r3, r4, r5, r6, r7, pc} @@ -9610,7 +9610,7 @@ ov45_0222E1A0: ; 0x0222E1A0 add r2, r4, #0 bl StringExpandPlaceholders add r0, r4, #0 - bl String_Delete + bl String_Free mov r0, #1 add sp, #8 pop {r3, r4, r5, r6, r7, pc} @@ -9762,7 +9762,7 @@ _0222E320: add r2, r5, #0 bl StringExpandPlaceholders add r0, r5, #0 - bl String_Delete + bl String_Free mov r0, #1 add sp, #8 pop {r3, r4, r5, r6, r7, pc} @@ -9808,7 +9808,7 @@ ov45_0222E33C: ; 0x0222E33C add r2, r5, #0 bl StringExpandPlaceholders add r0, r5, #0 - bl String_Delete + bl String_Free mov r0, #1 add sp, #8 pop {r4, r5, r6, pc} @@ -9870,7 +9870,7 @@ _0222E3EC: add r2, r4, #0 bl StringExpandPlaceholders add r0, r4, #0 - bl String_Delete + bl String_Free mov r0, #1 add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} @@ -9934,7 +9934,7 @@ _0222E468: add r2, r5, #0 bl StringExpandPlaceholders add r0, r5, #0 - bl String_Delete + bl String_Free mov r0, #1 pop {r3, r4, r5, pc} thumb_func_end ov45_0222E414 @@ -10028,7 +10028,7 @@ _0222E51C: add r2, r4, #0 bl StringExpandPlaceholders add r0, r4, #0 - bl String_Delete + bl String_Free mov r0, #1 add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} diff --git a/asm/overlay_46.s b/asm/overlay_46.s index da569e0cbb..f21c182a92 100644 --- a/asm/overlay_46.s +++ b/asm/overlay_46.s @@ -1571,9 +1571,9 @@ _022594BC: add r0, #8 bl RemoveWindow ldr r0, [r4, #0x1c] - bl String_Delete + bl String_Free ldr r0, [r4, #0x18] - bl String_Delete + bl String_Free ldr r0, [r4, #4] bl DestroyMsgData ldr r0, [r4] diff --git a/asm/overlay_47.s b/asm/overlay_47.s index 9028bcaded..4105010af3 100644 --- a/asm/overlay_47.s +++ b/asm/overlay_47.s @@ -602,9 +602,9 @@ _02258CC8: ldr r0, [r6, #0x24] bl MessageFormat_Delete ldr r0, [r6, #0x28] - bl String_Delete + bl String_Free ldr r0, [r6, #0x2c] - bl String_Delete + bl String_Free pop {r4, r5, r6, pc} .balign 4, 0 thumb_func_end ov47_02258CC0 @@ -1338,7 +1338,7 @@ _02259296: add r0, r5, #0 bl ov47_022593A0 ldr r0, [r5, #0x18] - bl String_Delete + bl String_Free add r0, r5, #0 add r0, #8 bl RemoveWindow @@ -2676,7 +2676,7 @@ _02259CC4: _02259CF6: ldr r0, [r5, #0x10] add r1, r4, #0 - bl CopyU16ArrayToString + bl String_CopyFromChars mov r4, #0 add r7, r6, #1 _02259D02: @@ -2688,7 +2688,7 @@ _02259D02: _02259D10: ldr r0, [r5, #0x14] add r1, r6, #0 - bl CopyU16ArrayToString + bl String_CopyFromChars add r4, r4, #1 add r5, r5, #4 cmp r4, #3 @@ -2703,11 +2703,11 @@ ov47_02259D24: ; 0x02259D24 push {r3, r4, r5, lr} add r5, r0, #0 ldr r0, [r5, #0x10] - bl String_Delete + bl String_Free mov r4, #0 _02259D30: ldr r0, [r5, #0x14] - bl String_Delete + bl String_Free add r4, r4, #1 add r5, r5, #4 cmp r4, #3 diff --git a/asm/overlay_48.s b/asm/overlay_48.s index 4b5abebef7..167c59af4b 100644 --- a/asm/overlay_48.s +++ b/asm/overlay_48.s @@ -3048,7 +3048,7 @@ ov48_02259F14: ; 0x02259F14 bl RemoveTextPrinter _02259F30: ldr r0, [r4, #0xc] - bl String_Delete + bl String_Free ldr r0, [r4, #0x20] bl YesNoPrompt_Destroy add r4, #0x10 @@ -5437,9 +5437,9 @@ ov48_0225B0A4: ; 0x0225B0A4 ldr r0, [r4, #4] bl MessageFormat_Delete ldr r0, [r4, #8] - bl String_Delete + bl String_Free ldr r0, [r4, #0xc] - bl String_Delete + bl String_Free pop {r4, pc} .balign 4, 0 thumb_func_end ov48_0225B0A4 diff --git a/asm/overlay_49.s b/asm/overlay_49.s index bc4ca652eb..90bfd0bceb 100644 --- a/asm/overlay_49.s +++ b/asm/overlay_49.s @@ -4823,7 +4823,7 @@ _0225AB30: add r0, r4, #0 bl ov49_0225AC38 ldr r0, [r4, #0x18] - bl String_Delete + bl String_Free add r0, r4, #0 bl RemoveWindow pop {r4, pc} @@ -5951,9 +5951,9 @@ _0225B36A: cmp r4, #4 blt _0225B36A ldr r0, [r6, #0x14] - bl String_Delete + bl String_Free ldr r0, [r6, #0x18] - bl String_Delete + bl String_Free pop {r4, r5, r6, pc} .balign 4, 0 thumb_func_end ov49_0225B35C diff --git a/asm/overlay_56.s b/asm/overlay_56.s index 5922ff2664..8a910a976c 100644 --- a/asm/overlay_56.s +++ b/asm/overlay_56.s @@ -556,7 +556,7 @@ _021E5FF2: str r3, [sp, #0xc] bl AddTextPrinterParameterizedWithColor add r0, r4, #0 - bl String_Delete + bl String_Free b _021E6088 _021E603E: ldr r1, _021E6098 ; =gSystem @@ -751,7 +751,7 @@ _021E6162: bl AddTextPrinterParameterizedWithColor strb r0, [r5, #0xf] add r0, r4, #0 - bl String_Delete + bl String_Free add r0, r5, #0 bl ov56_021E5D08 ldrb r0, [r5, #0x16] @@ -1863,7 +1863,7 @@ _021E6AB2: mov r3, #0 bl AddTextPrinterParameterizedWithColor ldr r0, [sp, #0x10] - bl String_Delete + bl String_Free add r0, r6, #0 bl CopyWindowToVram _021E6AF4: @@ -1892,7 +1892,7 @@ _021E6AF4: str r0, [sp, #0x18] _021E6B26: add r0, r5, #0 - bl String_SetEmpty + bl String_Clear ldr r0, [r4, #0x20] add r1, r6, #0 add r2, r5, #0 @@ -1931,7 +1931,7 @@ _021E6B26: cmp r6, #2 blt _021E6B26 add r0, r5, #0 - bl String_Delete + bl String_Free add sp, #0x1c pop {r4, r5, r6, r7, pc} _021E6B88: diff --git a/asm/overlay_57.s b/asm/overlay_57.s index 9e80bb6233..4d0c3649e9 100644 --- a/asm/overlay_57.s +++ b/asm/overlay_57.s @@ -1791,7 +1791,7 @@ ov57_0223866C: ; 0x0223866C lsr r3, r3, #1 bl AddTextPrinterParameterizedWithColor add r0, r4, #0 - bl String_Delete + bl String_Free add r0, r6, #0 bl DestroyMsgData mov r0, #0x43 @@ -2041,7 +2041,7 @@ ov57_022387E0: ; 0x022387E0 ldr r1, [sp, #0x70] bl sub_020138E0 ldr r0, [sp, #0x18] - bl String_Delete + bl String_Free ldr r0, [sp, #0x14] bl DestroyMsgData add r0, sp, #0x1c @@ -2587,7 +2587,7 @@ _02238CCE: add r1, r4, #0 bl ListMenuItems_AddItem add r0, r4, #0 - bl String_Delete + bl String_Free ldr r0, [sp, #0x14] add r6, r6, #1 add r5, r5, #4 @@ -3953,7 +3953,7 @@ _02239766: add r0, r4, #0 bl ScheduleWindowCopyToVram add r0, r5, #0 - bl String_Delete + bl String_Free add r0, r6, #0 bl DestroyMsgData add sp, #0xc @@ -4290,7 +4290,7 @@ _02239A22: 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 @@ -4307,7 +4307,7 @@ _02239A22: add r0, r5, #0 bl ScheduleWindowCopyToVram add r0, r4, #0 - bl String_Delete + bl String_Free _02239A76: add r6, r6, #1 add r5, #0x10 @@ -4358,7 +4358,7 @@ _02239AB8: 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 @@ -4373,7 +4373,7 @@ _02239AB8: add r0, r5, r4 bl ScheduleWindowCopyToVram ldr r0, [sp, #0x10] - bl String_Delete + bl String_Free add sp, #0x14 pop {r4, r5, r6, r7, pc} .balign 4, 0 @@ -4438,7 +4438,7 @@ _02239B4A: add r0, r4, #0 bl ScheduleWindowCopyToVram add r0, r5, #0 - bl String_Delete + bl String_Free add r0, r6, #0 bl DestroyMsgData add sp, #0xc diff --git a/asm/overlay_59.s b/asm/overlay_59.s index 76e47b914f..27226c9dab 100644 --- a/asm/overlay_59.s +++ b/asm/overlay_59.s @@ -3364,7 +3364,7 @@ _02239794: add r0, r5, #0 add r0, #0xd0 ldr r0, [r0] - bl String_Delete + bl String_Free add r4, r4, #1 add r5, r5, #4 cmp r4, #7 @@ -3373,19 +3373,19 @@ _02239794: add r4, r6, #0 _022397AA: ldr r0, [r4, #0x78] - bl String_Delete + bl String_Free add r5, r5, #1 add r4, r4, #4 cmp r5, #0x16 blt _022397AA ldr r0, [r6, #0x74] - bl String_Delete + bl String_Free ldr r0, [r6, #0x6c] - bl String_Delete + bl String_Free ldr r0, [r6, #0x68] - bl String_Delete + bl String_Free ldr r0, [r6, #0x64] - bl String_Delete + bl String_Free ldr r0, [r6, #0x60] bl MessageFormat_Delete ldr r0, [r6, #0x5c] @@ -7490,15 +7490,15 @@ ov59_0223B6FC: ; 0x0223B6FC push {r4, lr} add r4, r0, #0 ldr r0, [r4, #0x74] - bl String_Delete + bl String_Free ldr r0, [r4, #0x70] - bl String_Delete + bl String_Free ldr r0, [r4, #0x6c] - bl String_Delete + bl String_Free ldr r0, [r4, #0x68] - bl String_Delete + bl String_Free ldr r0, [r4, #0x64] - bl String_Delete + bl String_Free ldr r0, [r4, #0x60] bl MessageFormat_Delete ldr r0, [r4, #0x5c] @@ -7964,11 +7964,11 @@ ov59_0223BA64: ; 0x0223BA64 thumb_func_start ov59_0223BADC ov59_0223BADC: ; 0x0223BADC - ldr r3, _0223BAE4 ; =String_Delete + ldr r3, _0223BAE4 ; =String_Free ldr r0, [r0, #0xc] bx r3 nop -_0223BAE4: .word String_Delete +_0223BAE4: .word String_Free thumb_func_end ov59_0223BADC thumb_func_start ov59_0223BAE8 diff --git a/asm/overlay_64.s b/asm/overlay_64.s index 50ba1c4722..8808189d55 100644 --- a/asm/overlay_64.s +++ b/asm/overlay_64.s @@ -970,19 +970,19 @@ ov64_021E6118: ; 0x021E6118 mov r0, #0x6a lsl r0, r0, #2 ldr r0, [r4, r0] - bl String_Delete + bl String_Free mov r0, #0x69 lsl r0, r0, #2 ldr r0, [r4, r0] - bl String_Delete + bl String_Free mov r0, #0x4b lsl r0, r0, #2 ldr r0, [r4, r0] - bl String_Delete + bl String_Free mov r0, #0x4a lsl r0, r0, #2 ldr r0, [r4, r0] - bl String_Delete + bl String_Free mov r0, #0x49 lsl r0, r0, #2 ldr r0, [r4, r0] diff --git a/asm/overlay_65.s b/asm/overlay_65.s index 93aebda283..f34b762046 100644 --- a/asm/overlay_65.s +++ b/asm/overlay_65.s @@ -251,11 +251,11 @@ ov65_0221BFEC: ; 0x0221BFEC mov r3, #0 bl ov65_0221FB4C 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 @@ -708,7 +708,7 @@ _0221C430: mov r3, #0 bl ov65_0221FB4C add r0, r6, #0 - bl String_Delete + bl String_Free ldr r0, [sp, #0x10] add r5, #0x10 add r4, r4, #1 @@ -1826,7 +1826,7 @@ WirelessTradeSelectMon_Exit: ; 0x0221CD74 mov r0, #0x67 lsl r0, r0, #2 ldr r0, [r4, r0] - bl String_Delete + bl String_Free ldr r0, _0221CE14 ; =0x00002228 ldr r0, [r4, r0] bl Heap_Free @@ -1863,7 +1863,7 @@ WirelessTradeSelectMon_Exit: ; 0x0221CD74 mov r0, #0x66 lsl r0, r0, #2 ldr r0, [r4, r0] - bl String_Delete + bl String_Free add r0, r5, #0 bl OverlayManager_FreeData mov r0, #0 @@ -2852,7 +2852,7 @@ ov65_0221D5FC: ; 0x0221D5FC mov r3, #0 bl ov65_0221FB4C add r0, r4, #0 - bl String_Delete + bl String_Free add sp, #0xc pop {r4, r5, r6, r7, pc} thumb_func_end ov65_0221D5FC @@ -3079,7 +3079,7 @@ _0221D7B0: add r0, r6, #0 mov r2, #3 mov r3, #0 - bl String16_FormatInteger + bl String_FormatInt mov r0, #0x1e str r0, [sp] ldr r0, [sp, #0x2c] @@ -3090,7 +3090,7 @@ _0221D7B0: str r3, [sp, #4] bl ov65_0221FB4C add r0, r6, #0 - bl String_Delete + bl String_Free b _0221D842 _0221D836: add r0, r5, #0 @@ -3141,7 +3141,7 @@ _0221D842: str r3, [sp, #4] bl ov65_0221FB4C add r0, r5, #0 - bl String_Delete + bl String_Free add sp, #0x38 pop {r3, r4, r5, r6, r7, pc} .balign 4, 0 @@ -4758,7 +4758,7 @@ _0221E580: bl sub_0202C254 add r1, r0, #0 add r0, r6, #0 - bl CopyU16ArrayToString + bl String_CopyFromChars ldr r0, _0221E5F0 ; =0x00003688 add r1, r6, #0 ldr r0, [r5, r0] @@ -4777,7 +4777,7 @@ _0221E5AA: sub r3, #0xd bl ListMenuItems_AppendFromMsgData add r0, r6, #0 - bl String_Delete + bl String_Free ldr r2, _0221E5F0 ; =0x00003688 mov r3, #6 lsl r3, r3, #6 @@ -7496,7 +7496,7 @@ _0221FBC6: add r0, r5, #0 bl ScheduleWindowCopyToVram 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/asm/overlay_67.s b/asm/overlay_67.s index 6f9487f50c..9bdd22c7c2 100644 --- a/asm/overlay_67.s +++ b/asm/overlay_67.s @@ -989,11 +989,11 @@ ov67_021E60F4: ; 0x021E60F4 push {r4, lr} add r4, r0, #0 ldr r0, [r4, #0x68] - bl String_Delete + bl String_Free ldr r0, [r4, #0x64] - bl String_Delete + bl String_Free ldr r0, [r4, #0x30] - bl String_Delete + bl String_Free ldr r0, [r4, #0x2c] bl MessageFormat_Delete ldr r0, [r4, #0x28] @@ -1067,7 +1067,7 @@ ov67_021E6164: ; 0x021E6164 add r2, r7, #0 bl ov67_021E6118 add r0, r6, #0 - bl String_Delete + bl String_Free add sp, #0xc pop {r4, r5, r6, r7, pc} .balign 4, 0 @@ -1103,7 +1103,7 @@ ov67_021E61A0: ; 0x021E61A0 add r2, r6, #0 bl ov67_021E6118 add r0, r7, #0 - bl String_Delete + bl String_Free add sp, #0xc pop {r4, r5, r6, r7, pc} .balign 4, 0 @@ -1403,7 +1403,7 @@ _021E6406: b _021E645A _021E6454: add r1, r6, #0 - bl CopyU16ArrayToString + bl String_CopyFromChars _021E645A: ldr r0, [sp] add r4, #0x10 @@ -1428,7 +1428,7 @@ ov67_021E6474: ; 0x021E6474 lsl r6, r6, #2 _021E647E: ldr r0, [r5, r6] - bl String_Delete + bl String_Free add r4, r4, #1 add r5, #0x10 cmp r4, #0x1e @@ -1857,7 +1857,7 @@ _021E67A6: str r2, [sp, #8] bl ov67_021E6118 add r0, r5, #0 - bl String_Delete + bl String_Free _021E67E8: mov r5, #0 _021E67EA: diff --git a/asm/overlay_68.s b/asm/overlay_68.s index a0e6c58850..e248b86fc2 100644 --- a/asm/overlay_68.s +++ b/asm/overlay_68.s @@ -748,15 +748,15 @@ ov68_021E5F18: ; 0x021E5F18 mov r0, #1 lsl r0, r0, #8 ldr r0, [r4, r0] - bl String_Delete + bl String_Free mov r0, #0x41 lsl r0, r0, #2 ldr r0, [r4, r0] - bl String_Delete + bl String_Free mov r0, #0x42 lsl r0, r0, #2 ldr r0, [r4, r0] - bl String_Delete + bl String_Free pop {r4, pc} .balign 4, 0 thumb_func_end ov68_021E5F18 @@ -1262,7 +1262,7 @@ ov68_021E62D4: ; 0x021E62D4 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} .balign 4, 0 @@ -1641,7 +1641,7 @@ _021E65AE: ldr r0, [sp, #0x1c] bl DestroyMsgData ldr r0, [sp, #0x20] - bl String_Delete + bl String_Free add sp, #0x28 pop {r3, r4, r5, r6, r7, pc} .balign 4, 0 @@ -2311,7 +2311,7 @@ _021E6BB0: add r2, r5, #0 bl StringExpandPlaceholders add r0, r5, #0 - bl String_Delete + bl String_Free pop {r3, r4, r5, pc} .balign 4, 0 _021E6BE8: .word ov68_021E7DA4 diff --git a/asm/overlay_69.s b/asm/overlay_69.s index d6e8aa7474..f333feb3e0 100644 --- a/asm/overlay_69.s +++ b/asm/overlay_69.s @@ -1740,7 +1740,7 @@ ov69_021E64CC: ; 0x021E64CC str r3, [sp, #8] bl AddTextPrinterParameterized add r0, r5, #0 - bl String_Delete + bl String_Free mov r0, #4 bl FontID_Release add sp, #0x18 @@ -1871,7 +1871,7 @@ _021E6886: bne _021E68BC ldr r0, _021E68C8 ; =0x0000C07C ldr r0, [r5, r0] - bl String_Delete + bl String_Free ldr r0, _021E68C4 ; =0x0000C074 mov r1, #2 str r1, [r5, r0] @@ -2178,9 +2178,9 @@ ov69_021E6A8C: ; 0x021E6A8C 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, _021E6B48 ; =0x0000C054 add r0, r5, r0 bl CopyWindowToVram @@ -2264,9 +2264,9 @@ _021E6BD8: 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, _021E6C0C ; =0x0000C054 add r0, r5, r0 bl CopyWindowToVram @@ -2494,7 +2494,7 @@ ov69_021E6D5C: ; 0x021E6D5C str r3, [sp, #8] bl AddTextPrinterParameterized add r0, r4, #0 - bl String_Delete + bl String_Free add sp, #0x10 pop {r4, r5, r6, pc} _021E6DB6: @@ -2561,9 +2561,9 @@ _021E6E2A: 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 ldr r0, [sp, #0xc] mov r1, #0x30 add r2, r0, #0 diff --git a/asm/overlay_70.s b/asm/overlay_70.s index 4d27650141..c4cb8fb038 100644 --- a/asm/overlay_70.s +++ b/asm/overlay_70.s @@ -3766,11 +3766,11 @@ ov70_0223963C: ; 0x0223963C add r4, r0, #0 ldr r0, _02239654 ; =0x00000BBC ldr r0, [r4, r0] - bl String_Delete + bl String_Free mov r0, #0x2f lsl r0, r0, #6 ldr r0, [r4, r0] - bl String_Delete + bl String_Free pop {r4, pc} .balign 4, 0 _02239654: .word 0x00000BBC @@ -4544,7 +4544,7 @@ ov70_02239C34: ; 0x02239C34 str r3, [sp, #0xc] bl AddTextPrinterParameterizedWithColor add r0, r4, #0 - bl String_Delete + bl String_Free add sp, #0x10 pop {r4, r5, r6, pc} nop @@ -5258,18 +5258,18 @@ ov70_0223A224: ; 0x0223A224 add r5, r7, #0 _0223A22E: ldr r0, [r5, r6] - bl String_Delete + bl String_Free add r4, r4, #1 add r5, r5, #4 cmp r4, #0xa blt _0223A22E ldr r0, _0223A254 ; =0x00000BBC ldr r0, [r7, r0] - bl String_Delete + bl String_Free mov r0, #0x2f lsl r0, r0, #6 ldr r0, [r7, r0] - bl String_Delete + bl String_Free pop {r3, r4, r5, r6, r7, pc} .balign 4, 0 _0223A250: .word 0x00000BC4 @@ -5659,7 +5659,7 @@ ov70_0223A4F4: ; 0x0223A4F4 lsl r1, r1, #4 str r0, [r5, r1] add r0, r6, #0 - bl String_Delete + bl String_Free add sp, #0xc pop {r3, r4, r5, r6, pc} nop @@ -5835,21 +5835,21 @@ _0223A66E: add r3, r2, #0 bl ov70_02245084 ldr r0, [sp, #0x24] - bl String_Delete + bl String_Free ldr r0, [sp, #0x18] - bl String_Delete + bl String_Free 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 String_Delete + bl String_Free ldr r0, [sp, #0x1c] - bl String_Delete + bl String_Free ldr r0, [sp, #0x34] - bl String_Delete + bl String_Free ldr r0, [sp, #0x20] - bl String_Delete + bl String_Free add sp, #0x3c pop {r4, r5, r6, r7, pc} nop @@ -5881,7 +5881,7 @@ ov70_0223A72C: ; 0x0223A72C str r0, [sp, #0x10] ldr r1, [sp, #8] add r0, r4, #0 - bl CopyU16ArrayToString + bl String_CopyFromChars add r0, r7, #0 mov r1, #0xb4 bl NewString_ReadMsgData @@ -5925,13 +5925,13 @@ ov70_0223A72C: ; 0x0223A72C add r3, r2, #0 bl ov70_02245084 ldr r0, [sp, #0x10] - bl String_Delete + bl String_Free add r0, r4, #0 - bl String_Delete + bl String_Free add r0, r7, #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} nop @@ -6818,13 +6818,13 @@ ov70_0223AF30: ; 0x0223AF30 add r4, r0, #0 ldr r0, _0223AF50 ; =0x00000BC4 ldr r0, [r4, r0] - bl String_Delete + bl String_Free ldr r0, _0223AF54 ; =0x00000BC8 ldr r0, [r4, r0] - bl String_Delete + bl String_Free ldr r0, _0223AF58 ; =0x00000BBC ldr r0, [r4, r0] - bl String_Delete + bl String_Free pop {r4, pc} nop _0223AF50: .word 0x00000BC4 @@ -7401,7 +7401,7 @@ ov70_0223B3BC: ; 0x0223B3BC add r3, r2, #0 bl ov70_02245084 add r0, r4, #0 - bl String_Delete + bl String_Free add sp, #8 pop {r3, r4, r5, pc} nop @@ -7426,7 +7426,7 @@ ov70_0223B3EC: ; 0x0223B3EC add r3, r2, #0 bl ov70_022450B8 add r0, r4, #0 - bl String_Delete + bl String_Free add sp, #8 pop {r3, r4, r5, pc} .balign 4, 0 @@ -8468,11 +8468,11 @@ ov70_0223BCD0: ; 0x0223BCD0 bl Heap_Free ldr r0, _0223BD00 ; =0x00000BBC ldr r0, [r4, r0] - bl String_Delete + bl String_Free mov r0, #0x2f lsl r0, r0, #6 ldr r0, [r4, r0] - bl String_Delete + bl String_Free pop {r4, pc} nop _0223BCFC: .word 0x000011C4 @@ -10296,7 +10296,7 @@ ov70_0223CB1C: ; 0x0223CB1C add r3, r2, #0 bl ov70_02245084 add r0, r6, #0 - bl String_Delete + bl String_Free add r0, r4, #0 mov r1, #0x3f bl NewString_ReadMsgData @@ -10311,7 +10311,7 @@ ov70_0223CB1C: ; 0x0223CB1C add r3, r2, #0 bl ov70_02245084 add r0, r6, #0 - bl String_Delete + bl String_Free add r0, r4, #0 mov r1, #0x41 bl NewString_ReadMsgData @@ -10326,7 +10326,7 @@ ov70_0223CB1C: ; 0x0223CB1C add r3, r2, #0 bl ov70_02245084 add r0, r6, #0 - bl String_Delete + bl String_Free add r0, r4, #0 mov r1, #0xab bl NewString_ReadMsgData @@ -10340,7 +10340,7 @@ ov70_0223CB1C: ; 0x0223CB1C add r3, r2, #0 bl ov70_02245084 add r0, r6, #0 - bl String_Delete + bl String_Free add r0, r4, #0 mov r1, #0x43 bl NewString_ReadMsgData @@ -10355,7 +10355,7 @@ ov70_0223CB1C: ; 0x0223CB1C add r3, r2, #0 bl ov70_022450B8 add r0, r6, #0 - bl String_Delete + bl String_Free add r0, r4, #0 mov r1, #0xee bl NewString_ReadMsgData @@ -10370,7 +10370,7 @@ ov70_0223CB1C: ; 0x0223CB1C add r3, r2, #0 bl ov70_022450B8 add r0, r4, #0 - bl String_Delete + bl String_Free add sp, #8 pop {r3, r4, r5, r6, r7, pc} nop @@ -10418,7 +10418,7 @@ _0223CC1C: str r4, [sp, #4] bl ov70_022450B8 add r0, r5, #0 - bl String_Delete + bl String_Free add sp, #0xc pop {r4, r5, r6, r7, pc} nop @@ -11342,13 +11342,13 @@ ov70_0223D414: ; 0x0223D414 bl Heap_Free ldr r0, _0223D440 ; =0x00000BB4 ldr r0, [r4, r0] - bl String_Delete + bl String_Free ldr r0, _0223D444 ; =0x00000BBC ldr r0, [r4, r0] - bl String_Delete + bl String_Free ldr r0, _0223D448 ; =0x00000BB8 ldr r0, [r4, r0] - bl String_Delete + bl String_Free pop {r4, pc} nop _0223D43C: .word 0x000011F4 @@ -12893,7 +12893,7 @@ _0223E04A: lsl r1, r1, #4 str r0, [r5, r1] add r0, r7, #0 - bl String_Delete + bl String_Free add sp, #0xc pop {r4, r5, r6, r7, pc} .balign 4, 0 @@ -14013,7 +14013,7 @@ ov70_0223E8E8: ; 0x0223E8E8 lsl r1, r1, #4 str r0, [r5, r1] add r0, r6, #0 - bl String_Delete + bl String_Free add sp, #0xc pop {r3, r4, r5, r6, pc} .balign 4, 0 @@ -14495,7 +14495,7 @@ ov70_0223ED24: ; 0x0223ED24 bl Heap_Free ldr r0, _0223ED54 ; =0x00000BBC ldr r0, [r4, r0] - bl String_Delete + bl String_Free pop {r4, pc} nop _0223ED50: .word 0x000011C4 @@ -15129,7 +15129,7 @@ ov70_0223F1D8: ; 0x0223F1D8 mov r2, #0 bl ov70_02245084 add r0, r4, #0 - bl String_Delete + bl String_Free _0223F206: add sp, #8 pop {r4, r5, r6, pc} @@ -15160,7 +15160,7 @@ ov70_0223F20C: ; 0x0223F20C str r1, [sp, #0xc] bl AddTextPrinterParameterizedWithColor add r0, r4, #0 - bl String_Delete + bl String_Free _0223F240: add sp, #0x10 pop {r4, r5, r6, pc} @@ -15187,7 +15187,7 @@ ov70_0223F244: ; 0x0223F244 mov r2, #0 bl ov70_02245084 add r0, r5, #0 - bl String_Delete + bl String_Free add sp, #8 pop {r3, r4, r5, pc} _0223F276: @@ -15205,7 +15205,7 @@ _0223F276: mov r2, #0 bl ov70_02245084 add r0, r5, #0 - bl String_Delete + bl String_Free add sp, #8 pop {r3, r4, r5, pc} .balign 4, 0 @@ -15276,7 +15276,7 @@ _0223F2FC: bl ov70_02245084 _0223F316: add r0, r4, #0 - bl String_Delete + bl String_Free _0223F31C: add sp, #8 pop {r4, r5, r6, pc} @@ -15316,7 +15316,7 @@ _0223F334: str r1, [sp, #0xc] bl AddTextPrinterParameterizedWithColor add r0, r4, #0 - bl String_Delete + bl String_Free _0223F368: add sp, #0x10 pop {r4, r5, r6, pc} @@ -15373,7 +15373,7 @@ _0223F3A8: add r1, r4, #0 bl ov70_02245084 add r0, r4, #0 - bl String_Delete + bl String_Free _0223F3CC: add sp, #8 pop {r4, r5, r6, pc} @@ -15448,7 +15448,7 @@ _0223F446: mov r3, #2 bl ov70_0223F370 ldr r0, [sp, #0x14] - bl String_Delete + bl String_Free add sp, #0x18 pop {r3, r4, r5, r6, r7, pc} .balign 4, 0 @@ -15521,7 +15521,7 @@ _0223F4DE: str r3, [sp, #8] bl ov70_0223F370 ldr r0, [sp, #0x14] - bl String_Delete + bl String_Free add sp, #0x18 pop {r3, r4, r5, r6, r7, pc} nop @@ -15648,13 +15648,13 @@ _0223F5F6: 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} .balign 4, 0 @@ -16468,12 +16468,12 @@ _0223FC54: .word 0x00000BBC thumb_func_start ov70_0223FC58 ov70_0223FC58: ; 0x0223FC58 ldr r1, _0223FC60 ; =0x00000BBC - ldr r3, _0223FC64 ; =String_Delete + ldr r3, _0223FC64 ; =String_Free ldr r0, [r0, r1] bx r3 .balign 4, 0 _0223FC60: .word 0x00000BBC -_0223FC64: .word String_Delete +_0223FC64: .word String_Free thumb_func_end ov70_0223FC58 thumb_func_start ov70_0223FC68 @@ -22893,7 +22893,7 @@ _02242DE0: mov r3, #2 bl ov70_02242FC4 add r0, r7, #0 - bl String_Delete + bl String_Free add r4, r4, #1 add r6, #0x10 cmp r4, #9 @@ -22920,7 +22920,7 @@ _02242DE0: mov r3, #2 bl ov70_02242FC4 add r0, r4, #0 - bl String_Delete + bl String_Free _02242E34: ldr r2, [sp, #8] mov r1, #0 @@ -22973,7 +22973,7 @@ _02242E80: mov r3, #2 bl ov70_02242FC4 add r0, r7, #0 - bl String_Delete + bl String_Free add r6, r6, #1 add r4, #0x10 cmp r6, #3 @@ -23393,7 +23393,7 @@ _022431CA: mov r3, #2 bl ov70_02242FC4 add r0, r7, #0 - bl String_Delete + bl String_Free add r4, r4, #1 add r6, #0x10 cmp r4, #9 @@ -25028,7 +25028,7 @@ ov70_02243E8C: ; 0x02243E8C add r2, r4, #0 bl ov70_02242FC4 add r0, r4, #0 - bl String_Delete + bl String_Free add sp, #4 pop {r3, r4, r5, r6, pc} thumb_func_end ov70_02243E8C @@ -25061,7 +25061,7 @@ ov70_02243EB8: ; 0x02243EB8 add r2, r5, #0 bl sub_02019A60 add r0, r4, #0 - bl String_Delete + bl String_Free add sp, #0x10 pop {r4, r5, r6, pc} .balign 4, 0 @@ -26012,13 +26012,13 @@ ov70_022446A8: ; 0x022446A8 mov r0, #0x2f lsl r0, r0, #6 ldr r0, [r4, r0] - bl String_Delete + bl String_Free ldr r0, _022446C8 ; =0x00000BEC ldr r0, [r4, r0] - bl String_Delete + bl String_Free ldr r0, _022446CC ; =0x00000BBC ldr r0, [r4, r0] - bl String_Delete + bl String_Free pop {r4, pc} .balign 4, 0 _022446C8: .word 0x00000BEC @@ -27220,7 +27220,7 @@ ov70_02244FA4: ; 0x02244FA4 ldr r1, [r5, r1] bl StringExpandPlaceholders add r0, r6, #0 - bl String_Delete + bl String_Free ldr r0, _02245010 ; =0x00000F18 mov r1, #0xf add r0, r5, r0 @@ -27393,7 +27393,7 @@ ov70_022450EC: ; 0x022450EC add r3, r2, #0 bl ov70_02245084 add r0, r4, #0 - bl String_Delete + bl String_Free add sp, #8 pop {r3, r4, r5, pc} .balign 4, 0 @@ -27455,7 +27455,7 @@ ov70_0224512C: ; 0x0224512C lsl r1, r1, #4 str r0, [r5, r1] add r0, r4, #0 - bl String_Delete + bl String_Free add sp, #0xc pop {r3, r4, r5, r6, pc} .balign 4, 0 diff --git a/asm/overlay_71.s b/asm/overlay_71.s index 4d49c38665..0c23af4e5a 100644 --- a/asm/overlay_71.s +++ b/asm/overlay_71.s @@ -253,7 +253,7 @@ TradeSequence_Exit: ; 0x02246B58 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] @@ -2139,9 +2139,9 @@ ov71_02247924: ; 0x02247924 add r0, r4, #0 bl ov71_0224809C 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 ov71_02247498 ldr r0, [r4, #0x54] @@ -9231,9 +9231,9 @@ ov71_0224B198: ; 0x0224B198 ldr r0, [r0] bl ov71_0224BA48 ldr r0, [r4, #0x6c] - bl String_Delete + bl String_Free ldr r0, [r4, #0x70] - bl String_Delete + bl String_Free ldr r0, [r4, #0x74] cmp r0, #0 beq _0224B1C8 diff --git a/asm/overlay_72.s b/asm/overlay_72.s index 633753f4f4..fd6d618292 100644 --- a/asm/overlay_72.s +++ b/asm/overlay_72.s @@ -2931,20 +2931,20 @@ ov72_02239098: ; 0x02239098 mov r0, #0xbf lsl r0, r0, #4 ldr r0, [r4, r0] - bl String_Delete + bl String_Free ldr r0, _022390CC ; =0x00000BE4 ldr r0, [r4, r0] - bl String_Delete + bl String_Free ldr r0, _022390D0 ; =0x00000BEC ldr r0, [r4, r0] - bl String_Delete + bl String_Free ldr r0, _022390D4 ; =0x00000BE8 ldr r0, [r4, r0] - bl String_Delete + bl String_Free mov r0, #0xbe lsl r0, r0, #4 ldr r0, [r4, r0] - bl String_Delete + bl String_Free pop {r4, pc} nop _022390CC: .word 0x00000BE4 @@ -5340,7 +5340,7 @@ ov72_0223A280: ; 0x0223A280 ldr r1, _0223A2E4 ; =0x00000BF4 str r0, [r5, r1] add r0, r6, #0 - bl String_Delete + bl String_Free add sp, #0xc pop {r3, r4, r5, r6, pc} .balign 4, 0 @@ -5607,7 +5607,7 @@ ov72_0223A460: ; 0x0223A460 ldr r1, _0223A4D8 ; =0x00000BF4 str r0, [r5, r1] add r0, r4, #0 - bl String_Delete + bl String_Free add sp, #0xc pop {r3, r4, r5, r6, pc} nop @@ -6740,7 +6740,7 @@ ov72_0223AD20: ; 0x0223AD20 add r0, r5, #0 bl CopyWindowToVram add r0, r4, #0 - bl String_Delete + bl String_Free add sp, #0x10 pop {r3, r4, r5, pc} nop @@ -7412,9 +7412,9 @@ ov72_0223B1C8: ; 0x0223B1C8 add r0, r5, #0 bl CopyWindowToVram 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 DestroyMsgData add sp, #0x14 diff --git a/asm/overlay_73.s b/asm/overlay_73.s index 2eee888e73..6926abda4d 100644 --- a/asm/overlay_73.s +++ b/asm/overlay_73.s @@ -695,15 +695,15 @@ ov73_021E5ED4: ; 0x021E5ED4 add r5, r6, #0 _021E5EF0: ldr r0, [r5, #0x2c] - bl String_Delete + bl String_Free add r4, r4, #1 add r5, r5, #4 cmp r4, #5 blt _021E5EF0 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 ov73_021E5ED4 @@ -3153,7 +3153,7 @@ ov73_021E7230: ; 0x021E7230 asr r3, r6, #1 bl AddTextPrinterParameterizedWithColor add r0, r5, #0 - bl String_Delete + bl String_Free _021E7286: mov r1, #0 ldr r0, _021E72F0 ; =0x00004A38 @@ -3189,7 +3189,7 @@ _021E7286: asr r3, r6, #1 bl AddTextPrinterParameterizedWithColor add r0, r5, #0 - bl String_Delete + bl String_Free ldr r0, [r4] mov r1, #1 bl ScheduleBgTilemapBufferTransfer @@ -3373,7 +3373,7 @@ _021E7410: bl AddTextPrinterParameterizedWithColor _021E7442: ldr r0, [sp, #0x18] - bl String_Delete + bl String_Free _021E7448: ldr r0, [sp, #0x20] add r7, #8 @@ -3563,7 +3563,7 @@ ov73_021E756C: ; 0x021E756C add r2, r4, #0 bl StringExpandPlaceholders add r0, r4, #0 - bl String_Delete + bl String_Free mov r0, #0xaa lsl r0, r0, #2 add r0, r5, r0 @@ -6400,20 +6400,20 @@ ov73_021E8BBC: ; 0x021E8BBC mov r0, #0xbf lsl r0, r0, #4 ldr r0, [r4, r0] - bl String_Delete + bl String_Free ldr r0, _021E8BF0 ; =0x00000BE4 ldr r0, [r4, r0] - bl String_Delete + bl String_Free ldr r0, _021E8BF4 ; =0x00000BEC ldr r0, [r4, r0] - bl String_Delete + bl String_Free ldr r0, _021E8BF8 ; =0x00000BE8 ldr r0, [r4, r0] - bl String_Delete + bl String_Free mov r0, #0xbe lsl r0, r0, #4 ldr r0, [r4, r0] - bl String_Delete + bl String_Free pop {r4, pc} nop _021E8BF0: .word 0x00000BE4 @@ -8987,7 +8987,7 @@ ov73_021E9F34: ; 0x021E9F34 ldr r1, _021E9F98 ; =0x00000BF4 str r0, [r5, r1] add r0, r6, #0 - bl String_Delete + bl String_Free add sp, #0xc pop {r3, r4, r5, r6, pc} .balign 4, 0 @@ -9193,7 +9193,7 @@ ov73_021EA0F0: ; 0x021EA0F0 add r1, r6, #0 add r2, r7, #0 mov r3, #2 - bl String16_FormatInteger + bl String_FormatInt mov r3, #1 ldr r0, _021EA128 ; =0x00010200 str r3, [sp] @@ -9324,7 +9324,7 @@ ov73_021EA19C: ; 0x021EA19C ldr r1, _021EA214 ; =0x00000BF4 str r0, [r5, r1] add r0, r4, #0 - bl String_Delete + bl String_Free add sp, #0xc pop {r3, r4, r5, r6, pc} nop diff --git a/asm/overlay_74_thumb.s b/asm/overlay_74_thumb.s index d176fcfe42..f8922eac8e 100644 --- a/asm/overlay_74_thumb.s +++ b/asm/overlay_74_thumb.s @@ -1001,9 +1001,9 @@ ov74_0222947C: ; 0x0222947C 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, #8 bl ov74_02235A68 add r7, r0, #0 @@ -1069,9 +1069,9 @@ ov74_0222947C: ; 0x0222947C add r7, r0, #0 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 @@ -3801,7 +3801,7 @@ _0222AA60: cmp r0, #0 bne _0222AA86 add r0, r6, #0 - bl String_Delete + bl String_Free _0222AA86: add r0, r5, #0 mov r1, #0 @@ -3833,7 +3833,7 @@ ov74_0222AAAC: ; 0x0222AAAC add r1, r6, #0 mov r2, #0x24 add r4, r0, #0 - bl CopyU16ArrayToStringN + bl String_CopyNumChars mov r0, #0 mov r1, #6 bl GetFontAttribute @@ -3857,7 +3857,7 @@ ov74_0222AAAC: ; 0x0222AAAC mov r3, #3 bl DrawFrameAndWindow1 add r0, r4, #0 - bl String_Delete + bl String_Free add sp, #0x10 pop {r4, r5, r6, pc} .balign 4, 0 @@ -4245,7 +4245,7 @@ _0222AE16: cmp r0, #0 bne _0222AE36 ldr r0, [r4, #0x14] - bl String_Delete + bl String_Free mov r0, #0 str r0, [r4, #0x14] str r0, [r4, #0x68] @@ -8661,7 +8661,7 @@ ov74_0222D1D4: ; 0x0222D1D4 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 @@ -8970,7 +8970,7 @@ ov74_0222D494: ; 0x0222D494 add r1, r2, r1 mov r2, #0x24 add r6, r0, #0 - bl CopyU16ArrayToStringN + bl String_CopyNumChars mov r3, #0 str r3, [sp] mov r0, #0xff @@ -8982,7 +8982,7 @@ ov74_0222D494: ; 0x0222D494 str r3, [sp, #0xc] bl AddTextPrinterParameterizedWithColor add r0, r6, #0 - bl String_Delete + bl String_Free mov r0, #1 add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} @@ -9043,7 +9043,7 @@ _0222D522: str r3, [sp, #0xc] bl AddTextPrinterParameterizedWithColor add r0, r4, #0 - bl String_Delete + bl String_Free mov r0, #1 add sp, #0x10 pop {r4, r5, r6, pc} @@ -9125,7 +9125,7 @@ ov74_0222D5C4: ; 0x0222D5C4 add r1, r2, r1 mov r2, #0xfa add r6, r0, #0 - bl CopyU16ArrayToStringN + bl String_CopyNumChars mov r3, #0 str r3, [sp] mov r0, #0xff @@ -9137,7 +9137,7 @@ ov74_0222D5C4: ; 0x0222D5C4 str r3, [sp, #0xc] bl AddTextPrinterParameterizedWithColor add r0, r6, #0 - bl String_Delete + bl String_Free mov r0, #0 add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} @@ -9182,7 +9182,7 @@ ov74_0222D614: ; 0x0222D614 str r3, [sp, #0xc] bl AddTextPrinterParameterizedWithColor add r0, r4, #0 - bl String_Delete + bl String_Free add sp, #0x10 mov r0, #0 pop {r4, r5, r6, pc} @@ -9584,7 +9584,7 @@ _0222D956: add r0, r6, #0 bl AddTextPrinterParameterizedWithColor add r0, r7, #0 - bl String_Delete + bl String_Free _0222D976: add r0, r6, #0 bl CopyWindowToVram @@ -9725,7 +9725,7 @@ _0222DA58: add r0, r6, #0 bl AddTextPrinterParameterizedWithColor ldr r0, [sp, #0x14] - bl String_Delete + bl String_Free ldr r0, _0222DAE8 ; =0x00002A04 ldr r0, [r5, r0] bl DestroyMsgData @@ -11608,7 +11608,7 @@ _0222E9D6: bl AddTextPrinterParameterizedWithColor _0222E9F0: ldr r0, [sp, #0x20] - bl String_Delete + bl String_Free add r0, r7, #0 bl PlayerProfile_GetTrainerID add r2, r0, #0 @@ -11641,7 +11641,7 @@ _0222E9F0: mov r3, #0x50 bl AddTextPrinterParameterizedWithColor add r0, r7, #0 - bl String_Delete + bl String_Free add r5, #0x18 _0222EA44: ldr r0, [sp, #0x18] @@ -11730,7 +11730,7 @@ ov74_0222EA88: ; 0x0222EA88 add r0, r4, #0 bl CopyWindowToVram add r0, r6, #0 - bl String_Delete + bl String_Free ldr r0, _0222EB20 ; =0x00002A04 ldr r0, [r5, r0] bl DestroyMsgData @@ -12123,7 +12123,7 @@ ov74_0222EE0C: ; 0x0222EE0C 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 @@ -12135,7 +12135,7 @@ ov74_0222EE0C: ; 0x0222EE0C str r3, [sp, #0xc] bl AddTextPrinterParameterizedWithColor add r0, r6, #0 - bl String_Delete + bl String_Free mov r0, #1 add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} @@ -12181,7 +12181,7 @@ _0222EE76: str r3, [sp, #0xc] bl AddTextPrinterParameterizedWithColor add r0, r4, #0 - bl String_Delete + bl String_Free mov r0, #1 add sp, #0x10 pop {r4, r5, r6, pc} @@ -12258,7 +12258,7 @@ ov74_0222EF18: ; 0x0222EF18 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 @@ -12270,7 +12270,7 @@ ov74_0222EF18: ; 0x0222EF18 str r3, [sp, #0xc] bl AddTextPrinterParameterizedWithColor add r0, r6, #0 - bl String_Delete + bl String_Free mov r0, #0 add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} @@ -12527,7 +12527,7 @@ _0222F0F4: add r0, r6, #0 bl AddTextPrinterParameterizedWithColor ldr r0, [sp, #0x30] - bl String_Delete + bl String_Free _0222F158: add r0, r6, #0 bl CopyWindowToVram @@ -12665,7 +12665,7 @@ _0222F234: add r0, r6, #0 bl AddTextPrinterParameterizedWithColor ldr r0, [sp, #0x14] - bl String_Delete + bl String_Free ldr r0, _0222F2C4 ; =0x00002A04 ldr r0, [r5, r0] bl DestroyMsgData @@ -18009,7 +18009,7 @@ _02231A7E: _02231AA6: ldr r0, _02231BB4 ; =0x00012608 ldr r0, [r6, r0] - bl String_SetEmpty + bl String_Clear ldr r0, _02231BB4 ; =0x00012608 ldr r1, [r5, #0x34] ldr r0, [r6, r0] @@ -18023,7 +18023,7 @@ _02231AA6: ldr r2, [sp, #0x20] bl StringExpandPlaceholders ldr r0, [sp, #0x20] - bl String_Delete + bl String_Free ldr r1, [sp, #0x1c] add r0, r5, #0 add r2, r4, #0 @@ -18060,7 +18060,7 @@ _02231B0E: mov r2, #0x40 ldr r6, [r6, r0] add r0, r6, #0 - bl CopyU16ArrayToStringN + bl String_CopyNumChars add r0, r5, #0 add r1, r6, #0 add r2, r4, #0 @@ -19774,7 +19774,7 @@ _022327D6: 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 @@ -19806,7 +19806,7 @@ _022327D6: str r6, [sp, #0x68] bl ov74_02231A1C add r0, r6, #0 - bl String_Delete + bl String_Free _022328B8: add r0, r4, #0 bl ov74_02234A0C @@ -19819,7 +19819,7 @@ _022328B8: 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] @@ -19833,7 +19833,7 @@ _022328B8: str r4, [sp, #0x68] bl ov74_02231A1C add r0, r4, #0 - bl String_Delete + bl String_Free ldr r0, [sp, #4] mov r1, #0 lsl r0, r0, #0x10 @@ -20661,7 +20661,7 @@ ov74_02232F9C: ; 0x02232F9C 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 @@ -20688,7 +20688,7 @@ ov74_02232F9C: ; 0x02232F9C add r1, r5, r1 bl ov74_02231A1C add r0, r6, #0 - bl String_Delete + bl String_Free add r0, r4, #0 bl MessageFormat_Delete add r0, r5, #0 @@ -21767,10 +21767,10 @@ ov74_022338D4: ; 0x022338D4 add r4, r0, #0 ldr r0, _02233914 ; =0x00012608 ldr r0, [r4, r0] - bl String_Delete + bl String_Free ldr r0, _02233918 ; =0x0001260C ldr r0, [r4, r0] - bl String_Delete + bl String_Free ldr r0, [r4, #0x20] bl Heap_Free ldr r0, _0223391C ; =FS_OVERLAY_ID(intro_title) @@ -25662,7 +25662,7 @@ _02235500: str r0, [r5, #0xc] _02235542: add r0, r4, #0 - bl String_Delete + bl String_Free ldr r0, [r5, #0x14] cmp r0, #0 bne _02235554 diff --git a/asm/overlay_75.s b/asm/overlay_75.s index 1cc3e95245..275e1e586f 100644 --- a/asm/overlay_75.s +++ b/asm/overlay_75.s @@ -214,11 +214,11 @@ ov75_02246B00: ; 0x02246B00 mov r0, #0x45 lsl r0, r0, #2 ldr r0, [r4, r0] - bl String_Delete + bl String_Free mov r0, #0x11 lsl r0, r0, #4 ldr r0, [r4, r0] - bl String_Delete + bl String_Free add r0, r5, #0 bl OverlayManager_FreeData mov r0, #0x73 @@ -647,7 +647,7 @@ ov75_02246DFC: ; 0x02246DFC ldr r4, [r0] add r1, sp, #0 ldr r0, [r4, #0x1c] - bl String_atoi + bl String_AtoI ldr r2, _02246E38 ; =0x00002710 mov r3, #0 bl _ull_mod @@ -710,7 +710,7 @@ ov75_02246E78: ; 0x02246E78 ldr r4, [r0] add r1, sp, #0 ldr r0, [r4, #0x1c] - bl String_atoi + bl String_AtoI mov r1, #0x41 lsl r1, r1, #2 str r0, [r5, r1] @@ -1086,11 +1086,11 @@ _022471A4: ldr r0, [r4, #0x20] bl MessageFormat_Delete ldr r0, [r4, #0x3c] - bl String_Delete + bl String_Free ldr r0, [r4, #0x40] - bl String_Delete + bl String_Free ldr r0, [r4, #0x38] - bl String_Delete + bl String_Free add r0, r4, #0 bl ov75_02247838 ldr r0, [r4, #4] @@ -2418,7 +2418,7 @@ ov75_02247C70: ; 0x02247C70 add r3, #0xc bl AddTextPrinterParameterized add r0, r5, #0 - bl String_Delete + bl String_Free ldr r0, [r4, #0x34] mov r1, #0x2b bl NewString_ReadMsgData @@ -2437,7 +2437,7 @@ ov75_02247C70: ; 0x02247C70 add r3, #0xc bl AddTextPrinterParameterized add r0, r5, #0 - bl String_Delete + bl String_Free add r0, r4, #0 add r0, #0xb0 ldr r0, [r0] @@ -2893,7 +2893,7 @@ _0224806E: ldr r1, [sp, #0xc] add r0, r6, #0 add r2, r4, #0 - bl String_GetLineN + bl String_CopyLine str r5, [sp] mov r0, #0xff str r0, [sp, #4] @@ -2914,9 +2914,9 @@ _0224806E: blt _0224806E _0224809E: ldr r0, [sp, #0xc] - bl String_Delete + bl String_Free add r0, r6, #0 - bl String_Delete + bl String_Free add r7, #0xc4 add r0, r7, #0 bl CopyWindowToVram @@ -3015,7 +3015,7 @@ _02248168: ldr r1, [sp, #0x14] add r0, r7, #0 add r2, r6, #0 - bl String_GetLineN + bl String_CopyLine str r4, [sp] mov r0, #0xff str r0, [sp, #4] @@ -3031,9 +3031,9 @@ _02248168: cmp r6, #6 blt _02248168 ldr r0, [sp, #0x14] - bl String_Delete + bl String_Free add r0, r7, #0 - bl String_Delete + bl String_Free add r0, r5, #0 add r0, #0xc4 mov r1, #1 @@ -5572,7 +5572,7 @@ ov75_022494CC: ; 0x022494CC add r2, r6, #0 bl StringExpandPlaceholders add r0, r6, #0 - bl String_Delete + bl String_Free add r0, r5, #0 add r0, #0x48 mov r1, #0xf @@ -5866,7 +5866,7 @@ ov75_022496B8: ; 0x022496B8 mov r0, #0xff str r0, [r5, #0x44] add r0, r4, #0 - bl String_Delete + bl String_Free add sp, #0xc pop {r3, r4, r5, r6, pc} .balign 4, 0 @@ -5959,7 +5959,7 @@ _02249794: ldr r0, [sp] ldr r1, [sp, #4] mov r2, #0x64 - bl CopyStringToU16Array + bl String_CopyToChars ldr r7, [sp, #4] mov r6, #0 _022497BE: @@ -6040,7 +6040,7 @@ ov75_02249838: ; 0x02249838 add r0, r6, #0 add r1, r4, #0 mov r2, #0x64 - bl CopyStringToU16Array + bl String_CopyToChars ldrh r1, [r4] ldr r0, _0224987C ; =0x0000FFFF cmp r1, r0 diff --git a/asm/overlay_80_02229EE0.s b/asm/overlay_80_02229EE0.s index 006994a6c1..1290cc2198 100644 --- a/asm/overlay_80_02229EE0.s +++ b/asm/overlay_80_02229EE0.s @@ -66,9 +66,9 @@ ov80_02229F04: ; 0x02229F04 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 @@ -496,7 +496,7 @@ _0222A1BC: add r2, r7, #0 bl SetMonData add r0, r7, #0 - bl String_Delete + bl String_Free add r0, r4, #0 bl DestroyMsgData b _0222A2F0 @@ -594,7 +594,7 @@ ov80_0222A334: ; 0x0222A334 add r2, sp, #8 bl SetMonData add r0, r6, #0 - bl String_Delete + bl String_Free add r0, r5, #0 bl DestroyMsgData add sp, #0xc diff --git a/asm/overlay_80_0222BDF4.s b/asm/overlay_80_0222BDF4.s index 096ce4039e..500a15e59c 100644 --- a/asm/overlay_80_0222BDF4.s +++ b/asm/overlay_80_0222BDF4.s @@ -2567,7 +2567,7 @@ FrtCmd_126: ; 0x0222D084 add r2, r7, #0 bl BufferString add r0, r7, #0 - bl String_Delete + bl String_Free mov r0, #0 add sp, #0xc pop {r4, r5, r6, r7, pc} @@ -5119,7 +5119,7 @@ ov80_0222E400: ; 0x0222E400 add r1, r4, #0 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 @@ -5463,7 +5463,7 @@ ov80_0222E690: ; 0x0222E690 add r1, #0xb4 str r0, [r1] add r0, r4, #0 - bl String_Delete + bl String_Free add r0, r5, #0 add r0, #0x9b ldrb r0, [r0] @@ -5715,7 +5715,7 @@ ov80_0222E88C: ; 0x0222E88C add r5, r6, #0 _0222E8BE: ldr r0, [r5, #0x1c] - bl String_Delete + bl String_Free add r4, r4, #1 add r5, r5, #4 cmp r4, #0x1c @@ -5982,7 +5982,7 @@ ov80_0222EA74: ; 0x0222EA74 lsl r1, r1, #2 str r0, [r2, r1] add r0, r6, #0 - bl String_Delete + bl String_Free cmp r4, #0xfa bne _0222EAE6 add r0, r5, #0 @@ -6386,7 +6386,7 @@ _0222EDB0: add r5, r6, #0 _0222EDD6: ldr r0, [r5, #0x1c] - bl String_Delete + bl String_Free add r4, r4, #1 add r5, r5, #4 cmp r4, #0x1c @@ -6455,9 +6455,9 @@ ov80_0222EE14: ; 0x0222EE14 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} thumb_func_end ov80_0222EE14 diff --git a/asm/overlay_80_022324C4.s b/asm/overlay_80_022324C4.s index 1d072eb5a0..8b0bd532af 100644 --- a/asm/overlay_80_022324C4.s +++ b/asm/overlay_80_022324C4.s @@ -2123,9 +2123,9 @@ ov80_02233594: ; 0x02233594 str r1, [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 r0, r7, #0 bl DestroyMsgData ldr r0, [sp, #0xc] diff --git a/asm/overlay_80_0223A00C.s b/asm/overlay_80_0223A00C.s index ec02faa835..2926c6b886 100644 --- a/asm/overlay_80_0223A00C.s +++ b/asm/overlay_80_0223A00C.s @@ -291,7 +291,7 @@ _0223A1BA: mov r1, #0 bl TextOBJ_SetSpritesDrawFlag ldr r0, [sp, #0x24] - bl String_Delete + bl String_Free ldr r0, [sp, #0x20] bl DestroyMsgData ldr r0, [r4, #0x24] diff --git a/asm/overlay_81.s b/asm/overlay_81.s index 8521a9bcb7..98d80317fb 100644 --- a/asm/overlay_81.s +++ b/asm/overlay_81.s @@ -5344,7 +5344,7 @@ ov81_022408C4: ; 0x022408C4 bl PlayerProfile_GetNamePtr add r1, r0, #0 add r0, r4, #0 - bl CopyU16ArrayToString + bl String_CopyFromChars add r0, r7, #0 bl PlayerProfile_GetTrainerGender cmp r0, #0 @@ -5368,7 +5368,7 @@ _0224090C: add r2, r4, #0 bl AddTextPrinterParameterizedWithColor add r0, r4, #0 - bl String_Delete + bl String_Free add r0, r5, #0 bl ScheduleWindowCopyToVram add sp, #0x14 @@ -5422,7 +5422,7 @@ _02240980: add r2, r4, #0 bl AddTextPrinterParameterizedWithColor add r0, r4, #0 - bl String_Delete + bl String_Free add r0, r5, #0 bl ScheduleWindowCopyToVram add sp, #0x14 @@ -5490,9 +5490,9 @@ ov81_022409B0: ; 0x022409B0 add r1, r6, #0 bl AddTextPrinterParameterizedWithColor ldr r0, [sp, #0x1c] - bl String_Delete + bl String_Free ldr r0, [sp, #0x18] - bl String_Delete + bl String_Free add r0, r7, #0 mov r1, #0xb0 mov r2, #0 @@ -5530,7 +5530,7 @@ ov81_022409B0: ; 0x022409B0 add r0, r4, #0 bl AddTextPrinterParameterizedWithColor add r0, r5, #0 - bl String_Delete + bl String_Free b _02240AC8 _02240A96: cmp r7, #1 @@ -5554,7 +5554,7 @@ _02240A96: add r2, r5, #0 bl AddTextPrinterParameterizedWithColor add r0, r5, #0 - bl String_Delete + bl String_Free _02240AC8: add r0, r4, #0 bl ScheduleWindowCopyToVram @@ -5639,7 +5639,7 @@ _02240B68: lsl r7, r7, #0xa _02240B6C: add r0, r4, #0 - bl String_SetEmpty + bl String_Clear add r0, sp, #0x4c ldrb r0, [r0] cmp r0, #2 @@ -5663,7 +5663,7 @@ _02240B6C: bl AddTextPrinterParameterizedWithColor _02240BA0: add r0, r4, #0 - bl String_Delete + bl String_Free add sp, #0x24 pop {r4, r5, r6, r7, pc} nop @@ -5768,14 +5768,14 @@ _02240C6C: ldr r0, [r5, #0x20] bl MessageFormat_Delete ldr r0, [r5, #0x24] - bl String_Delete + bl String_Free ldr r0, [r5, #0x28] - bl String_Delete + bl String_Free mov r6, #0 add r4, r5, #0 _02240C9A: ldr r0, [r4, #0x2c] - bl String_Delete + bl String_Free add r6, r6, #1 add r4, r4, #4 cmp r6, #4 @@ -10550,7 +10550,7 @@ ov81_022430B4: ; 0x022430B4 add r0, r5, #0 bl ov81_02243068 add r0, r4, #0 - bl String_Delete + bl String_Free add sp, #0xc pop {r3, r4, r5, r6, pc} thumb_func_end ov81_022430B4 diff --git a/asm/overlay_82.s b/asm/overlay_82.s index 5ace75d65d..5a10e35ce1 100644 --- a/asm/overlay_82.s +++ b/asm/overlay_82.s @@ -1468,9 +1468,9 @@ _0223E8E4: ldr r0, [r6, #0x24] bl MessageFormat_Delete ldr r0, [r6, #0x28] - bl String_Delete + bl String_Free ldr r0, [r6, #0x2c] - bl String_Delete + bl String_Free add r0, r6, #0 add r0, #0x98 ldr r0, [r0] @@ -1479,7 +1479,7 @@ _0223E8E4: add r5, r6, #0 _0223E94A: ldr r0, [r5, #0x30] - bl String_Delete + bl String_Free add r4, r4, #1 add r5, r5, #4 cmp r4, #2 @@ -2300,7 +2300,7 @@ ov82_0223EFCC: ; 0x0223EFCC bl String_New add r1, sp, #0x10 add r6, r0, #0 - bl CopyU16ArrayToString + bl String_CopyFromChars str r4, [sp] mov r4, #0 str r4, [sp, #4] @@ -2322,7 +2322,7 @@ ov82_0223EFCC: ; 0x0223EFCC add r3, r7, #0 bl AddTextPrinterParameterizedWithColor add r0, r6, #0 - bl String_Delete + bl String_Free add r0, r5, #0 bl CopyWindowToVram add sp, #0x28 @@ -2379,7 +2379,7 @@ _0223F090: cmp r0, #0xfe beq _0223F0D4 add r0, r5, #0 - bl String_SetEmpty + bl String_Clear lsl r0, r7, #0x18 lsr r0, r0, #0x18 bl ov80_02237920 @@ -2417,7 +2417,7 @@ _0223F0D4: cmp r0, #5 blt _0223F08C add r0, r5, #0 - bl String_Delete + bl String_Free ldr r0, [sp, #0x24] bl DestroyMsgData ldr r0, [sp, #0x10] @@ -2558,7 +2558,7 @@ ov82_0223F1AC: ; 0x0223F1AC add r3, r7, #0 bl AddTextPrinterParameterizedWithColor add r0, r6, #0 - bl String_Delete + bl String_Free ldr r0, [sp, #0x10] bl DestroyMsgData add r0, r5, #0 diff --git a/asm/overlay_83.s b/asm/overlay_83.s index 2d43f80228..bb9938c498 100644 --- a/asm/overlay_83.s +++ b/asm/overlay_83.s @@ -2311,9 +2311,9 @@ _0223F0F0: ldr r0, [r5, #0x24] bl MessageFormat_Delete ldr r0, [r5, #0x28] - bl String_Delete + bl String_Free ldr r0, [r5, #0x2c] - bl String_Delete + bl String_Free ldr r0, _0223F1C0 ; =0x00000504 ldr r0, [r5, r0] bl MessagePrinter_Delete @@ -2323,7 +2323,7 @@ _0223F0F0: add r4, r5, #0 _0223F164: ldr r0, [r4, #0x30] - bl String_Delete + bl String_Free add r6, r6, #1 add r4, r4, #4 cmp r6, #3 @@ -4756,7 +4756,7 @@ _0224058C: bl PlayerProfile_GetNamePtr add r1, r0, #0 add r0, r4, #0 - bl CopyU16ArrayToString + bl String_CopyFromChars add r0, r6, #0 bl PlayerProfile_GetTrainerGender cmp r0, #0 @@ -4778,7 +4778,7 @@ _022405C0: str r2, [sp, #8] bl ov83_02247998 add r0, r4, #0 - bl String_Delete + bl String_Free ldrb r0, [r5, #9] bl sub_0205C1F0 add r4, r0, #0 @@ -5595,7 +5595,7 @@ ov83_02240C8C: ; 0x02240C8C bl PlayerProfile_GetNamePtr add r1, r0, #0 add r0, r4, #0 - bl CopyU16ArrayToString + bl String_CopyFromChars add r0, r7, #0 bl PlayerProfile_GetTrainerGender cmp r0, #0 @@ -5621,7 +5621,7 @@ _02240CCA: add r0, r5, #0 bl ScheduleWindowCopyToVram add r0, r4, #0 - bl String_Delete + bl String_Free add sp, #0x14 pop {r4, r5, r6, r7, pc} .balign 4, 0 @@ -7820,7 +7820,7 @@ ov83_02241DD8: ; 0x02241DD8 add r0, r4, #0 bl ov83_02247998 add r0, r6, #0 - bl String_Delete + bl String_Free add sp, #0xc pop {r3, r4, r5, r6, pc} .balign 4, 0 @@ -8770,7 +8770,7 @@ _02242664: mov r3, #0 bl ov83_02247998 ldr r0, [sp, #0x28] - bl String_Delete + bl String_Free add r0, r4, r5 str r0, [sp, #0x18] mov r0, #0 @@ -8812,7 +8812,7 @@ _02242664: mov r3, #0 bl ov83_02247998 ldr r0, [sp, #0x2c] - bl String_Delete + bl String_Free mov r0, #0 str r0, [sp] ldr r3, [sp, #0x18] @@ -11780,10 +11780,10 @@ _02243EDC: bl MessageFormat_Delete ldr r0, [sp] ldr r0, [r0, #0x28] - bl String_Delete + bl String_Free ldr r0, [sp] ldr r0, [r0, #0x2c] - bl String_Delete + bl String_Free mov r1, #0xad ldr r0, [sp] lsl r1, r1, #2 @@ -11795,7 +11795,7 @@ _02243EDC: mov r5, #0 _02243F50: ldr r0, [r4, #0x30] - bl String_Delete + bl String_Free add r5, r5, #1 add r4, r4, #4 cmp r5, #3 @@ -13224,7 +13224,7 @@ ov83_02244AD8: ; 0x02244AD8 bl PlayerProfile_GetNamePtr add r1, r0, #0 add r0, r4, #0 - bl CopyU16ArrayToString + bl String_CopyFromChars add r0, r6, #0 bl PlayerProfile_GetTrainerGender cmp r0, #0 @@ -13248,7 +13248,7 @@ _02244B18: add r2, r4, #0 bl AddTextPrinterParameterizedWithColor add r0, r4, #0 - bl String_Delete + bl String_Free add sp, #0x14 pop {r4, r5, r6, r7, pc} .balign 4, 0 @@ -15568,7 +15568,7 @@ ov83_02245D08: ; 0x02245D08 add r0, r4, #0 bl ov83_02247998 add r0, r6, #0 - bl String_Delete + bl String_Free add sp, #0xc pop {r3, r4, r5, r6, pc} .balign 4, 0 @@ -16646,7 +16646,7 @@ _0224665A: add r3, r4, #0 bl ov83_02247998 add r0, r7, #0 - bl String_Delete + bl String_Free ldr r0, [r5, #0x20] mov r1, #0x49 bl NewString_ReadMsgData @@ -16672,7 +16672,7 @@ _0224665A: add r3, r4, #0 bl ov83_02247998 add r0, r7, #0 - bl String_Delete + bl String_Free add r6, #0x78 str r4, [sp] mov r0, #0 @@ -16771,7 +16771,7 @@ _02246784: mov r2, #0x78 bl ov83_02247998 add r0, r7, #0 - bl String_Delete + bl String_Free add r0, r5, r4 str r0, [sp, #0x18] mov r0, #0 @@ -16812,7 +16812,7 @@ _02246784: add r0, r5, r0 bl ov83_02247998 add r0, r7, #0 - bl String_Delete + bl String_Free mov r0, #0 str r0, [sp] ldr r3, [sp, #0x18] @@ -19130,7 +19130,7 @@ ov83_022479E4: ; 0x022479E4 add r0, r5, #0 bl ov83_02247998 add r0, r4, #0 - bl String_Delete + bl String_Free add sp, #0xc pop {r3, r4, r5, r6, pc} thumb_func_end ov83_022479E4 diff --git a/asm/overlay_85.s b/asm/overlay_85.s index 8f6b9a4969..3c7e0d9011 100644 --- a/asm/overlay_85.s +++ b/asm/overlay_85.s @@ -3166,13 +3166,13 @@ ov85_021E7148: ; 0x021E7148 ldr r0, [r4, #8] bl MessageFormat_Delete ldr r0, [r4, #0x6c] - bl String_Delete + bl String_Free mov r4, #0 _021E717A: add r0, r5, #0 add r0, #0x98 ldr r0, [r0] - bl String_Delete + bl String_Free add r4, r4, #1 add r5, r5, #4 cmp r4, #5 @@ -3257,7 +3257,7 @@ ov85_021E71EC: ; 0x021E71EC add r2, r6, #0 bl StringExpandPlaceholders add r0, r6, #0 - bl String_Delete + bl String_Free add r0, r5, #0 mov r1, #1 mov r2, #0xa @@ -3309,7 +3309,7 @@ ov85_021E7274: ; 0x021E7274 add r2, r6, #0 bl StringExpandPlaceholders add r0, r6, #0 - bl String_Delete + bl String_Free add r0, r5, #0 mov r1, #1 mov r2, #0xa @@ -7094,15 +7094,15 @@ ov85_021E8E00: ; 0x021E8E00 add r5, r6, #0 _021E8E1C: ldr r0, [r5, #0x3c] - bl String_Delete + bl String_Free add r4, r4, #1 add r5, r5, #4 cmp r4, #5 blt _021E8E1C ldr r0, [r6, #0x58] - bl String_Delete + bl String_Free ldr r0, [r6, #0x54] - bl String_Delete + bl String_Free pop {r4, r5, r6, pc} thumb_func_end ov85_021E8E00 @@ -9350,7 +9350,7 @@ _021E9F74: bl AddTextPrinterParameterizedWithColor _021E9FA6: ldr r0, [sp, #0x18] - bl String_Delete + bl String_Free _021E9FAC: ldr r0, [sp, #0x20] add r7, #8 @@ -9555,7 +9555,7 @@ ov85_021EA0EC: ; 0x021EA0EC add r2, r4, #0 bl StringExpandPlaceholders add r0, r4, #0 - bl String_Delete + bl String_Free mov r0, #0xbe lsl r0, r0, #2 add r0, r5, r0 diff --git a/asm/overlay_86.s b/asm/overlay_86.s index 7cc9a2510a..8b28f3927d 100644 --- a/asm/overlay_86.s +++ b/asm/overlay_86.s @@ -224,7 +224,7 @@ ov86_021E5AA4: ; 0x021E5AA4 mov r0, #0x86 lsl r0, r0, #2 ldr r0, [r4, r0] - bl String_Delete + bl String_Free mov r0, #0x8f lsl r0, r0, #2 add r0, r4, r0 @@ -925,7 +925,7 @@ ov86_021E6024: ; 0x021E6024 add r2, r7, #0 bl ov86_021E5FD8 add r0, r6, #0 - bl String_Delete + bl String_Free add sp, #0xc pop {r4, r5, r6, r7, pc} .balign 4, 0 @@ -968,7 +968,7 @@ ov86_021E6064: ; 0x021E6064 add r2, r7, #0 bl ov86_021E5FD8 add r0, r6, #0 - bl String_Delete + bl String_Free add sp, #0xc pop {r4, r5, r6, r7, pc} thumb_func_end ov86_021E6064 @@ -1687,7 +1687,7 @@ ov86_021E668C: ; 0x021E668C add r3, r1, #0 bl BufferString add r0, r5, #0 - bl String_Delete + bl String_Free add sp, #8 pop {r4, r5, r6, pc} thumb_func_end ov86_021E668C @@ -2599,7 +2599,7 @@ ov86_021E6E30: ; 0x021E6E30 add r0, r5, r0 bl ScheduleWindowCopyToVram add r0, r4, #0 - bl String_Delete + bl String_Free add sp, #0xc pop {r4, r5, pc} nop diff --git a/asm/overlay_87.s b/asm/overlay_87.s index a29e49d956..33935d7aa6 100644 --- a/asm/overlay_87.s +++ b/asm/overlay_87.s @@ -1923,9 +1923,9 @@ _021E6816: ldr r0, [r6, #0x3c] bl MessageFormat_Delete ldr r0, [r6, #0x40] - bl String_Delete + bl String_Free ldr r0, [r6, #0x44] - bl String_Delete + bl String_Free mov r0, #0x16 lsl r0, r0, #4 ldr r0, [r6, r0] diff --git a/asm/overlay_88.s b/asm/overlay_88.s index f369ab499a..f99ebe1e1c 100644 --- a/asm/overlay_88.s +++ b/asm/overlay_88.s @@ -1561,7 +1561,7 @@ ov88_022593D0: ; 0x022593D0 add r0, r5, #0 add r0, #0x90 ldr r0, [r0] - bl String_Delete + bl String_Free add r4, r5, #0 mov r6, #0 add r4, #0x60 @@ -1752,7 +1752,7 @@ ov88_0225954C: ; 0x0225954C push {r4, lr} add r4, r0, #0 ldr r0, [r4, #8] - bl String_Delete + bl String_Free add r4, #0xc add r0, r4, #0 bl RemoveWindow @@ -1990,7 +1990,7 @@ _02259720: ldr r1, [sp, #0x34] add r0, r4, #0 add r2, r7, #0 - bl String_GetLineN + bl String_CopyLine ldrb r0, [r5, #9] cmp r0, #0 beq _0225973A @@ -2042,7 +2042,7 @@ _02259766: blo _02259720 _0225978A: add r0, r4, #0 - bl String_Delete + bl String_Free ldr r0, [sp, #0x14] bl ScheduleWindowCopyToVram ldr r0, [sp, #0x28] @@ -2064,7 +2064,7 @@ _0225978A: cmp r0, #4 blt _022596BC ldr r0, [sp, #0x34] - bl String_Delete + bl String_Free ldr r0, [sp, #0x38] bl DestroyMsgData add sp, #0x40 diff --git a/asm/overlay_89.s b/asm/overlay_89.s index 7374f7ffab..a1a78efc08 100644 --- a/asm/overlay_89.s +++ b/asm/overlay_89.s @@ -814,7 +814,7 @@ ov89_02258F00: ; 0x02258F00 add r0, r4, #0 add r0, #0xc4 ldr r0, [r0] - bl String_Delete + bl String_Free mov r0, #2 bl FontID_Release ldr r0, [r4, #0x10] @@ -1677,7 +1677,7 @@ _0225963E: mov r1, #1 bl TextOBJ_SetSpritesDrawFlag add r0, r4, #0 - bl String_Delete + bl String_Free add sp, #0x4c pop {r4, r5, r6, r7, pc} nop @@ -8197,11 +8197,11 @@ _0225C7D8: add r0, r4, r5 bl CopyWindowToVram ldr r0, [sp, #0x1c] - bl String_Delete + bl String_Free ldr r0, [sp, #0x20] - bl String_Delete + bl String_Free add r0, r7, #0 - bl String_Delete + bl String_Free add r0, r6, #0 bl Heap_Free _0225C80A: diff --git a/asm/overlay_90.s b/asm/overlay_90.s index f5d32903d7..2431d1125e 100644 --- a/asm/overlay_90.s +++ b/asm/overlay_90.s @@ -1376,9 +1376,9 @@ ov90_022591D4: ; 0x022591D4 push {r4, lr} add r4, r0, #0 ldr r0, [r4, #0xc] - bl String_Delete + bl String_Free ldr r0, [r4, #8] - bl String_Delete + bl String_Free ldr r0, [r4, #4] bl MessageFormat_Delete ldr r0, [r4] @@ -1716,7 +1716,7 @@ _0225943E: add r1, r4, #0 bl ov90_022594FC ldr r0, [r5, #0x24] - bl String_Delete + bl String_Free add r0, r6, #0 bl RemoveWindow add r4, r4, #1 @@ -3661,7 +3661,7 @@ ov90_0225A340: ; 0x0225A340 add r4, r0, #0 bl RemoveWindow ldr r0, [r4, #0x14] - bl String_Delete + bl String_Free pop {r4, pc} thumb_func_end ov90_0225A340 diff --git a/asm/overlay_91.s b/asm/overlay_91.s index e92411cd32..4e0c7f8b95 100644 --- a/asm/overlay_91.s +++ b/asm/overlay_91.s @@ -2687,7 +2687,7 @@ _0225D908: str r1, [sp, #0xc] bl AddTextPrinterParameterizedWithColor add r0, r6, #0 - bl String_Delete + bl String_Free mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -2850,7 +2850,7 @@ _0225DAC6: blo _0225DA0E _0225DAD2: ldr r0, [sp, #0x24] - bl String_Delete + bl String_Free add r0, sp, #0x30 bl RemoveWindow ldr r0, [sp, #0x14] @@ -7282,9 +7282,9 @@ ov91_0225FD0C: ; 0x0225FD0C push {r4, lr} add r4, r0, #0 ldr r0, [r4, #0x10] - bl String_Delete + bl String_Free ldr r0, [r4, #0xc] - bl String_Delete + bl String_Free ldr r0, [r4, #8] bl DestroyMsgData ldr r0, [r4, #4] @@ -10766,7 +10766,7 @@ ov91_02261790: ; 0x02261790 ldr r0, [r5, #0x4c] bl sub_02013938 ldr r0, [r5, #0x5c] - bl String_Delete + bl String_Free ldr r0, [r5, #0x34] bl Sprite_Delete ldr r0, [r5] @@ -10809,7 +10809,7 @@ ov91_02261808: ; 0x02261808 mov r2, #2 ldr r0, [r5, #0x5c] add r3, r2, #0 - bl String16_FormatInteger + bl String_FormatInt mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -10899,7 +10899,7 @@ ov91_022618B0: ; 0x022618B0 mov r2, #2 ldr r0, [r5, #0x5c] add r3, r2, #0 - bl String16_FormatInteger + bl String_FormatInt mov r0, #0 str r0, [sp] str r0, [sp, #4] diff --git a/asm/overlay_92.s b/asm/overlay_92.s index 554cfa50cc..b69a37cd07 100644 --- a/asm/overlay_92.s +++ b/asm/overlay_92.s @@ -3351,7 +3351,7 @@ ov92_0225E070: ; 0x0225E070 str r1, [sp, #8] bl AddTextPrinterParameterized add r0, r4, #0 - bl String_Delete + bl String_Free add r0, r6, #0 bl DestroyMsgData ldr r0, _0225E0FC ; =0x00001FE0 @@ -3655,7 +3655,7 @@ _0225E312: bl AddTextPrinterParameterizedWithColorAndSpacing _0225E32E: add r0, r7, #0 - bl String_Delete + bl String_Free add r0, r4, #0 bl CopyWindowToVram ldr r0, [sp, #0x1c] diff --git a/asm/overlay_93_thumb_1.s b/asm/overlay_93_thumb_1.s index 338870b271..9f2041e33b 100644 --- a/asm/overlay_93_thumb_1.s +++ b/asm/overlay_93_thumb_1.s @@ -1039,7 +1039,7 @@ _0225CD72: add r0, r4, #0 add r0, #0x88 ldr r0, [r0] - bl String_Delete + bl String_Free add r0, r4, #0 add r0, #0x84 ldr r0, [r0] @@ -1780,7 +1780,7 @@ ov93_0225D468: ; 0x0225D468 str r1, [sp, #0xc] bl AddTextPrinterParameterizedWithColor add r0, r4, #0 - bl String_Delete + bl String_Free add r5, #0x70 add r0, r5, #0 bl ScheduleWindowCopyToVram @@ -2223,7 +2223,7 @@ ov93_0225D78C: ; 0x0225D78C add r3, r5, r3 bl ov93_02261EB8 add r0, r6, #0 - bl String_Delete + bl String_Free add r0, r5, #0 add r0, #0x80 ldr r0, [r0] @@ -2308,9 +2308,9 @@ _0225D840: cmp r0, #6 blt _0225D840 ldr r0, [sp, #0x30] - bl String_Delete + bl String_Free ldr r0, [sp, #0x38] - bl String_Delete + bl String_Free ldr r0, _0225D9D4 ; =0x000015A8 add r0, r5, r0 bl ov93_02261FC8 diff --git a/asm/overlay_93_thumb_2.s b/asm/overlay_93_thumb_2.s index ec376b07b9..ec85606a18 100644 --- a/asm/overlay_93_thumb_2.s +++ b/asm/overlay_93_thumb_2.s @@ -5056,7 +5056,7 @@ _0226227A: ldr r2, [r2] bl ov93_02261EB8 ldr r0, [sp, #0x34] - bl String_Delete + bl String_Free ldr r0, [sp, #0x30] sub r6, #0x14 sub r4, #0x28 diff --git a/asm/overlay_95.s b/asm/overlay_95.s index 7f30c3528b..6867c6e493 100644 --- a/asm/overlay_95.s +++ b/asm/overlay_95.s @@ -510,9 +510,9 @@ ov95_021E5CAC: ; 0x021E5CAC add r0, r7, #0 bl DestroyMsgData add r0, r4, #0 - bl String_Delete + bl String_Free ldr r0, [sp, #0x14] - bl String_Delete + bl String_Free add r0, r5, #0 bl MessageFormat_Delete add r0, r6, #0 @@ -3297,7 +3297,7 @@ ov95_021E7328: ; 0x021E7328 add r0, r7, #0 bl DestroyMsgData add r0, r5, #0 - bl String_Delete + bl String_Free add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} nop diff --git a/asm/overlay_96.s b/asm/overlay_96.s index 0c78e7e1ff..6eb1ce72c1 100644 --- a/asm/overlay_96.s +++ b/asm/overlay_96.s @@ -5553,12 +5553,12 @@ _021E8504: bl ov96_021E5F34 add r6, r0, #0 add r0, r4, #0 - bl String_cstr + bl String_GetChars add r1, r0, #0 add r0, r6, #0 bl Save_Profile_PlayerName_Set add r0, r4, #0 - bl String_Delete + bl String_Free mov r0, #0 add r6, r5, #0 str r0, [sp, #0x18] @@ -5620,13 +5620,13 @@ _021E8578: ldrh r0, [r4] bl GetSpeciesName str r0, [sp, #0x20] - bl String_cstr + bl String_GetChars add r1, r0, #0 add r0, r6, #0 mov r2, #0xb bl CopyU16StringArrayN ldr r0, [sp, #0x20] - bl String_Delete + bl String_Free ldr r0, [sp, #0x18] add r4, r4, #2 add r0, r0, #1 @@ -7484,9 +7484,9 @@ ov96_021E9320: ; 0x021E9320 add r5, r6, #0 _021E9328: ldr r0, [r5, #0x34] - bl String_Delete + bl String_Free ldr r0, [r5, #0x38] - bl String_Delete + bl String_Free add r4, r4, #1 add r5, #0x18 cmp r4, #0xc @@ -7953,7 +7953,7 @@ ov96_021E95F8: ; 0x021E95F8 add r1, r5, #0 bl String_Copy add r0, r5, #0 - bl String_Delete + bl String_Free add r0, r7, #0 bl DestroyMsgData add sp, #0xc @@ -8016,7 +8016,7 @@ ov96_021E966C: ; 0x021E966C add r1, r6, #0 bl String_Copy add r0, r6, #0 - bl String_Delete + bl String_Free add r0, r7, #0 bl DestroyMsgData add sp, #0xc @@ -16161,7 +16161,7 @@ ov96_021ED524: ; 0x021ED524 add r1, r6, r1 add r1, #0x12 add r7, r0, #0 - bl CopyU16ArrayToString + bl String_CopyFromChars ldr r0, [r4, #0xc] bl ov96_021EE97C mov r1, #1 @@ -16173,7 +16173,7 @@ ov96_021ED524: ; 0x021ED524 mov r3, #2 bl BufferString add r0, r7, #0 - bl String_Delete + bl String_Free add sp, #0xc pop {r4, r5, r6, r7, pc} thumb_func_end ov96_021ED524 @@ -18543,7 +18543,7 @@ ov96_021EE6A0: ; 0x021EE6A0 add r3, r4, #0 bl ov96_021EE700 add r0, r7, #0 - bl String_Delete + bl String_Free add r0, r6, #0 bl DestroyMsgData pop {r3, r4, r5, r6, r7, pc} @@ -18689,7 +18689,7 @@ ov96_021EE808: ; 0x021EE808 ldr r0, [r4, #0x10] cmp r0, #0 beq _021EE828 - bl String_Delete + bl String_Free _021EE828: add r0, r4, #0 bl Heap_Free @@ -18717,7 +18717,7 @@ ov96_021EE830: ; 0x021EE830 orr r0, r1 str r0, [r4, #0x34] ldr r0, [r4, #0x10] - bl String_Delete + bl String_Free mov r0, #0 str r0, [r4, #0x10] sub r0, r0, #1 @@ -27590,7 +27590,7 @@ ov96_021F2EFC: ; 0x021F2EFC str r3, [sp, #0xc] bl AddTextPrinterParameterizedWithColor add r0, r7, #0 - bl String_Delete + bl String_Free add r0, r6, #0 bl MessageFormat_Delete add r0, r4, #0 @@ -30138,7 +30138,7 @@ _021F425A: str r1, [sp, #0xc] bl AddTextPrinterParameterizedWithColor add r0, r4, #0 - bl String_Delete + bl String_Free mov r0, #0x13 lsl r0, r0, #4 ldr r0, [r5, r0] @@ -30183,7 +30183,7 @@ _021F42D2: add r3, r1, #0 bl AddTextPrinterParameterizedWithColor add r0, r7, #0 - bl String_Delete + bl String_Free lsl r0, r6, #2 add r1, r5, r0 mov r0, #0x13 @@ -30558,7 +30558,7 @@ ov96_021F459C: ; 0x021F459C str r1, [sp, #0xc] bl AddTextPrinterParameterizedWithColor add r0, r5, #0 - bl String_Delete + bl String_Free add sp, #0x10 pop {r3, r4, r5, pc} .balign 4, 0 @@ -35771,7 +35771,7 @@ _021F6F8E: str r1, [sp, #0xc] bl AddTextPrinterParameterizedWithColor add r0, r4, #0 - bl String_Delete + bl String_Free add r0, r7, #4 mov r4, #1 mov r5, #0 @@ -35802,7 +35802,7 @@ _021F6FE4: add r3, r1, #0 bl AddTextPrinterParameterizedWithColor add r0, r6, #0 - bl String_Delete + bl String_Free add r0, r4, #1 lsl r0, r0, #0x18 lsr r4, r0, #0x18 @@ -35919,7 +35919,7 @@ ov96_021F70AC: ; 0x021F70AC str r3, [sp, #0xc] bl AddTextPrinterParameterizedWithColor add r0, r7, #0 - bl String_Delete + bl String_Free add r0, r6, #0 bl MessageFormat_Delete add r0, r4, #0 @@ -36986,7 +36986,7 @@ ov96_021F78C4: ; 0x021F78C4 str r1, [sp, #0xc] bl AddTextPrinterParameterizedWithColor add r0, r5, #0 - bl String_Delete + bl String_Free add r0, r6, #0 bl MessageFormat_Delete add r0, r7, #0 @@ -39373,7 +39373,7 @@ ov96_021F8BC0: ; 0x021F8BC0 str r4, [sp, #0xc] bl ov96_021F8DF4 add r0, r6, #0 - bl String_Delete + bl String_Free add sp, #0x10 pop {r4, r5, r6, pc} .balign 4, 0 @@ -39981,7 +39981,7 @@ _021F908C: mov r3, #2 bl ov96_021F9134 add r0, r4, #0 - bl String_Delete + bl String_Free ldr r0, [r7, #0x34] mov r1, #1 bl TextOBJ_SetSpritesDrawFlag @@ -44877,7 +44877,7 @@ ov96_021FB808: ; 0x021FB808 str r3, [sp, #0xc] bl AddTextPrinterParameterizedWithColor add r0, r6, #0 - bl String_Delete + bl String_Free add r0, r4, #0 bl MessageFormat_Delete add r0, r7, #0 @@ -53635,7 +53635,7 @@ _021FFDB0: str r3, [sp, #0xc] bl AddTextPrinterParameterizedWithColor add r0, r7, #0 - bl String_Delete + bl String_Free add r0, r4, #0 bl MessageFormat_Delete add r0, r6, #0 @@ -53853,7 +53853,7 @@ _021FFFAA: add r1, r4, #0 ldr r0, [r5, r0] add r1, #0x12 - bl CopyU16ArrayToString + bl String_CopyFromChars add r6, r6, #1 add r4, #0x28 add r5, r5, #4 @@ -53915,7 +53915,7 @@ _0220000E: lsl r6, r6, #4 _02200030: ldr r0, [r4, r6] - bl String_Delete + bl String_Free add r5, r5, #1 add r4, r4, #4 cmp r5, #3 @@ -55403,7 +55403,7 @@ ov96_02200BD8: ; 0x02200BD8 str r1, [sp, #0xc] bl AddTextPrinterParameterizedWithColor add r0, r5, #0 - bl String_Delete + bl String_Free add r4, #0xc add r0, r4, #0 bl CopyWindowToVram @@ -55438,7 +55438,7 @@ ov96_02200C40: ; 0x02200C40 str r1, [sp, #0xc] bl AddTextPrinterParameterizedWithColor add r0, r4, #0 - bl String_Delete + bl String_Free add r5, #0x1c add r0, r5, #0 bl CopyWindowToVram @@ -60251,7 +60251,7 @@ ov96_0220337C: ; 0x0220337C str r3, [sp, #0xc] bl AddTextPrinterParameterizedWithColor add r0, r7, #0 - bl String_Delete + bl String_Free add r0, r6, #0 bl MessageFormat_Delete add r0, r4, #0 @@ -60866,7 +60866,7 @@ _02203846: add r3, r1, #0 bl AddTextPrinterParameterizedWithColor add r0, r6, #0 - bl String_Delete + bl String_Free add r0, r5, #0 bl CopyWindowToVram add r7, r7, #1 @@ -61859,7 +61859,7 @@ ov96_02203FFC: ; 0x02203FFC str r1, [sp, #0xc] bl AddTextPrinterParameterizedWithColor add r0, r4, #0 - bl String_Delete + bl String_Free add r5, #0xc add r0, r5, #0 bl CopyWindowToVram @@ -68747,7 +68747,7 @@ ov96_02207774: ; 0x02207774 str r3, [sp, #0xc] bl AddTextPrinterParameterizedWithColor add r0, r7, #0 - bl String_Delete + bl String_Free add r0, r6, #0 bl MessageFormat_Delete add r0, r4, #0 @@ -69495,7 +69495,7 @@ _02207D3A: add r1, r4, #0 ldr r0, [r5, r0] add r1, #0x12 - bl CopyU16ArrayToString + bl String_CopyFromChars add r6, r6, #1 add r4, #0x28 add r5, r5, #4 @@ -69548,7 +69548,7 @@ _02207D8A: lsl r6, r6, #2 _02207DAC: ldr r0, [r4, r6] - bl String_Delete + bl String_Free add r5, r5, #1 add r4, r4, #4 cmp r5, #3 @@ -70960,7 +70960,7 @@ ov96_022088AC: ; 0x022088AC str r1, [sp, #0xc] bl AddTextPrinterParameterizedWithColor add r0, r5, #0 - bl String_Delete + bl String_Free add r4, #0xc add r0, r4, #0 bl CopyWindowToVram @@ -73465,7 +73465,7 @@ ov96_02209CA8: ; 0x02209CA8 add r5, r6, #0 _02209CB0: ldr r0, [r5, #0x18] - bl String_Delete + bl String_Free add r4, r4, #1 add r5, r5, #4 cmp r4, #3 @@ -73662,7 +73662,7 @@ _02209E4A: add r1, r5, #0 add r1, #0x12 str r0, [r4, #0x18] - bl CopyU16ArrayToString + bl String_CopyFromChars add r7, r7, #1 add r4, r4, #4 add r5, #0x28 @@ -73803,7 +73803,7 @@ ov96_02209F40: ; 0x02209F40 str r1, [sp, #0xc] bl AddTextPrinterParameterizedWithColor add r0, r4, #0 - bl String_Delete + bl String_Free add r0, r5, #0 bl CopyWindowToVram add sp, #0x10 @@ -74657,7 +74657,7 @@ ov96_0220A5DC: ; 0x0220A5DC str r3, [sp, #0xc] bl AddTextPrinterParameterizedWithColor add r0, r5, #0 - bl String_Delete + bl String_Free mov r0, #0x8e lsl r0, r0, #2 add r0, r4, r0 @@ -83456,7 +83456,7 @@ ov96_0220E9A0: ; 0x0220E9A0 str r3, [sp, #0xc] bl AddTextPrinterParameterizedWithColor add r0, r5, #0 - bl String_Delete + bl String_Free add r4, #0x24 add r0, r4, #0 bl CopyWindowToVram @@ -87205,7 +87205,7 @@ _022106E4: add r0, r6, r7 bl CopyWindowToVram ldr r0, [sp, #0x20] - bl String_Delete + bl String_Free lsl r0, r4, #0x10 lsr r0, r0, #0x10 str r0, [sp] @@ -93215,7 +93215,7 @@ ov96_022136A4: ; 0x022136A4 str r3, [sp, #0xc] bl AddTextPrinterParameterizedWithColor add r0, r7, #0 - bl String_Delete + bl String_Free add r0, r6, #0 bl MessageFormat_Delete add r0, r4, #0 @@ -94612,7 +94612,7 @@ _02214140: ldr r1, _022141AC ; =0x000007C4 str r0, [r2, r1] add r0, r6, #0 - bl String_Delete + bl String_Free add r0, r4, #1 lsl r0, r0, #0x18 lsr r4, r0, #0x18 @@ -94640,21 +94640,21 @@ ov96_022141B0: ; 0x022141B0 add r5, r0, #0 ldr r0, _022141EC ; =0x000007B8 ldr r0, [r5, r0] - bl String_Delete + bl String_Free ldr r0, _022141F0 ; =0x000007BC ldr r0, [r5, r0] - bl String_Delete + bl String_Free mov r0, #0x1f lsl r0, r0, #6 ldr r0, [r5, r0] - bl String_Delete + bl String_Free ldr r6, _022141F4 ; =0x000007C4 mov r4, #0 _022141D6: 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, #0x18 lsr r4, r0, #0x18 @@ -95516,7 +95516,7 @@ ov96_022147FC: ; 0x022147FC str r1, [sp, #0xc] bl AddTextPrinterParameterizedWithColor add r0, r4, #0 - bl String_Delete + bl String_Free add r5, #0x14 add r0, r5, #0 bl CopyWindowToVram @@ -95553,7 +95553,7 @@ ov96_02214854: ; 0x02214854 str r1, [sp, #0xc] bl AddTextPrinterParameterizedWithColor add r0, r4, #0 - bl String_Delete + bl String_Free add r5, #0x24 add r0, r5, #0 bl CopyWindowToVram @@ -105414,7 +105414,7 @@ ov96_022193F8: ; 0x022193F8 str r3, [sp, #0xc] bl AddTextPrinterParameterizedWithColor add r0, r5, #0 - bl String_Delete + bl String_Free add r4, #0x20 add r0, r4, #0 bl CopyWindowToVram @@ -105594,7 +105594,7 @@ _02219590: add r1, r6, #0 ldr r0, [r0] add r1, #0x12 - bl CopyU16ArrayToString + bl String_CopyFromChars add r7, r7, #1 add r5, r5, #4 add r6, #0x28 @@ -105640,7 +105640,7 @@ _022195FC: add r0, r5, #0 add r0, #0xb0 ldr r0, [r0] - bl String_Delete + bl String_Free add r4, r4, #1 add r5, r5, #4 cmp r4, #3 @@ -106371,7 +106371,7 @@ ov96_02219B30: ; 0x02219B30 lsl r3, r3, #4 bl ov96_02219BDC add r0, r4, #0 - bl String_Delete + bl String_Free add r0, r5, #0 add r0, #0x30 bl CopyWindowToVram @@ -106446,7 +106446,7 @@ ov96_02219BDC: ; 0x02219BDC add r0, r5, #0 bl AddTextPrinterParameterizedWithColor add r0, r4, #0 - bl String_Delete + bl String_Free add r0, r5, #0 bl CopyWindowToVram add sp, #0x10 diff --git a/asm/overlay_97.s b/asm/overlay_97.s index c8f3404c77..721f6c2571 100644 --- a/asm/overlay_97.s +++ b/asm/overlay_97.s @@ -1310,7 +1310,7 @@ ov97_0221F020: ; 0x0221F020 ldr r0, [r7, #0x70] bl MessageFormat_Delete ldr r0, [r7, #0x74] - bl String_Delete + bl String_Free add r0, r7, #0 add r0, #8 bl RemoveWindow @@ -1631,7 +1631,7 @@ ov97_0221F294: ; 0x0221F294 add r0, #8 bl CopyWindowToVram add r0, r5, #0 - bl String_Delete + bl String_Free add r0, r4, #0 add r0, #0x18 mov r1, #0 @@ -1658,7 +1658,7 @@ ov97_0221F294: ; 0x0221F294 str r1, [sp, #0xc] bl AddTextPrinterParameterizedWithColor add r0, r5, #0 - bl String_Delete + bl String_Free _0221F32A: add r0, r4, #0 add r0, #0x18 @@ -1684,7 +1684,7 @@ _0221F32A: str r1, [sp, #0xc] bl AddTextPrinterParameterizedWithColor add r0, r5, #0 - bl String_Delete + bl String_Free ldr r0, [r4, #0x6c] mov r1, #4 bl NewString_ReadMsgData @@ -1703,7 +1703,7 @@ _0221F32A: str r1, [sp, #0xc] bl AddTextPrinterParameterizedWithColor add r0, r5, #0 - bl String_Delete + bl String_Free ldr r0, [r4, #0x6c] mov r1, #6 bl NewString_ReadMsgData @@ -1722,7 +1722,7 @@ _0221F32A: str r1, [sp, #0xc] bl AddTextPrinterParameterizedWithColor add r0, r5, #0 - bl String_Delete + bl String_Free ldr r0, [r4, #0x6c] mov r1, #5 bl NewString_ReadMsgData @@ -1741,7 +1741,7 @@ _0221F32A: str r1, [sp, #0xc] bl AddTextPrinterParameterizedWithColor add r0, r5, #0 - bl String_Delete + bl String_Free ldr r0, [r4, #0x6c] mov r1, #7 bl NewString_ReadMsgData @@ -1760,7 +1760,7 @@ _0221F32A: str r1, [sp, #0xc] bl AddTextPrinterParameterizedWithColor add r0, r5, #0 - bl String_Delete + bl String_Free add r4, #0x48 add r0, r4, #0 bl CopyWindowToVram @@ -1778,7 +1778,7 @@ ov97_0221F428: ; 0x0221F428 ldr r0, [r5, #0x74] add r4, r1, #0 add r1, #0xa - bl CopyU16ArrayToString + bl String_CopyFromChars add r0, r5, #0 add r0, #0x28 mov r1, #0 @@ -1825,7 +1825,7 @@ ov97_0221F428: ; 0x0221F428 add r0, #0x38 bl CopyWindowToVram add r0, r6, #0 - bl String_Delete + bl String_Free b _0221F4FE _0221F4A8: cmp r0, #1 @@ -1855,7 +1855,7 @@ _0221F4A8: add r0, #0x38 bl CopyWindowToVram add r0, r6, #0 - bl String_Delete + bl String_Free b _0221F4FE _0221F4EC: add r0, r5, #0 @@ -1879,7 +1879,7 @@ _0221F4FE: add r2, r4, #0 bl BufferString add r0, r4, #0 - bl String_Delete + bl String_Free ldr r0, [r5, #0x70] ldr r1, [r5, #0x6c] ldr r3, [r5] @@ -1906,7 +1906,7 @@ _0221F4FE: add r0, r5, #0 bl CopyWindowToVram add r0, r4, #0 - bl String_Delete + bl String_Free add sp, #0x10 pop {r4, r5, r6, pc} .balign 4, 0 diff --git a/asm/overlay_98.s b/asm/overlay_98.s index 0645c09192..f5b7ec80b7 100644 --- a/asm/overlay_98.s +++ b/asm/overlay_98.s @@ -758,7 +758,7 @@ ov98_0221EB84: ; 0x0221EB84 add r7, r1, #0 bl FontID_Release ldr r0, [r5, #0x14] - bl String_Delete + bl String_Free ldr r0, [r5, #0x10] bl MessageFormat_Delete ldr r0, [r5, #0xc] @@ -916,7 +916,7 @@ _0221EC8A: add r0, r0, r6 bl ScheduleWindowCopyToVram add r0, r7, #0 - bl String_Delete + bl String_Free add sp, #0x14 pop {r4, r5, r6, r7, pc} .balign 4, 0 @@ -966,7 +966,7 @@ ov98_0221ECD0: ; 0x0221ECD0 add r0, r0, r4 bl ScheduleWindowCopyToVram add r0, r6, #0 - bl String_Delete + bl String_Free add sp, #0x10 pop {r4, r5, r6, pc} nop @@ -1019,7 +1019,7 @@ ov98_0221ED48: ; 0x0221ED48 add r0, r0, r5 bl ScheduleWindowCopyToVram add r0, r7, #0 - bl String_Delete + bl String_Free add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} .balign 4, 0 @@ -1084,7 +1084,7 @@ ov98_0221EDC4: ; 0x0221EDC4 add r0, r0, r4 bl ScheduleWindowCopyToVram add r0, r6, #0 - bl String_Delete + bl String_Free add sp, #0x10 pop {r4, r5, r6, pc} nop diff --git a/asm/overlay_99.s b/asm/overlay_99.s index 97c6f494d4..acec817080 100644 --- a/asm/overlay_99.s +++ b/asm/overlay_99.s @@ -7560,7 +7560,7 @@ ov99_021E9418: ; 0x021E9418 mov r0, #0x6f lsl r0, r0, #2 ldr r0, [r4, r0] - bl String_Delete + bl String_Free add r0, r4, #0 bl Heap_Free pop {r4, pc} @@ -7725,7 +7725,7 @@ _021E9528: add r2, #0x30 mul r1, r6 add r1, r2, r1 - bl CopyU16ArrayToString + bl String_CopyFromChars mov r0, #0x6f lsl r0, r0, #2 ldr r0, [r5, r0] diff --git a/asm/overlay_trainer_card_main.s b/asm/overlay_trainer_card_main.s index bd52ccf73b..27091dc339 100644 --- a/asm/overlay_trainer_card_main.s +++ b/asm/overlay_trainer_card_main.s @@ -640,38 +640,38 @@ ov51_021E6038: ; 0x021E6038 add r5, r6, #0 _021E6042: ldr r0, [r5, r7] - bl String_Delete + bl String_Free add r4, r4, #1 add r5, r5, #4 cmp r4, #0xe blt _021E6042 ldr r0, _021E60AC ; =0x000033E8 ldr r0, [r6, r0] - bl String_Delete + bl String_Free ldr r0, _021E60B0 ; =0x000033E4 ldr r0, [r6, r0] - bl String_Delete + bl String_Free ldr r0, _021E60B4 ; =0x000033E0 ldr r0, [r6, r0] - bl String_Delete + bl String_Free ldr r0, _021E60B8 ; =0x000033DC ldr r0, [r6, r0] - bl String_Delete + bl String_Free ldr r0, _021E60BC ; =0x000033D8 ldr r0, [r6, r0] - bl String_Delete + bl String_Free ldr r0, _021E60C0 ; =0x000033CC ldr r0, [r6, r0] - bl String_Delete + bl String_Free ldr r0, _021E60C4 ; =0x000033D4 ldr r0, [r6, r0] - bl String_Delete + bl String_Free ldr r0, _021E60C8 ; =0x000033D0 ldr r0, [r6, r0] - bl String_Delete + bl String_Free ldr r0, _021E60CC ; =0x000033C8 ldr r0, [r6, r0] - bl String_Delete + bl String_Free ldr r0, _021E60D0 ; =0x000033C4 ldr r0, [r6, r0] bl DestroyMsgData @@ -2552,7 +2552,7 @@ _021E6F68: add r1, r5, #0 ldr r0, [r7, r0] add r1, #8 - bl CopyU16ArrayToString + bl String_CopyFromChars ldr r0, _021E71C8 ; =0x000033D0 mov r2, #0 ldr r0, [r7, r0] @@ -2774,7 +2774,7 @@ _021E710A: str r1, [sp, #0xc] bl AddTextPrinterParameterizedWithColor ldr r0, [sp, #0x1c] - bl String_Delete + bl String_Free add r0, r4, #0 bl MessageFormat_Delete add sp, #0x28 @@ -3129,7 +3129,7 @@ _021E7324: str r1, [sp, #0xc] bl AddTextPrinterParameterizedWithColor add r0, r7, #0 - bl String_Delete + bl String_Free add r0, r6, #0 bl MessageFormat_Delete add sp, #0x20 @@ -3177,7 +3177,7 @@ ov51_021E74F4: ; 0x021E74F4 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 @@ -3320,9 +3320,9 @@ _021E758E: 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/asm/overlay_trainer_card_signature.s b/asm/overlay_trainer_card_signature.s index ba34123fea..9d52595d5f 100644 --- a/asm/overlay_trainer_card_signature.s +++ b/asm/overlay_trainer_card_signature.s @@ -540,17 +540,17 @@ ov52_021E8568: ; 0x021E8568 add r5, r6, #0 _021E8578: ldr r0, [r5, #0x18] - bl String_Delete + bl String_Free add r4, r4, #1 add r5, r5, #4 cmp r4, #5 blt _021E8578 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 _021E859C: .word 0x00005C9C @@ -2241,7 +2241,7 @@ ov52_021E927C: ; 0x021E927C 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/asm/unk_02014DA0.s b/asm/unk_02014DA0.s index a3763aa546..b776965704 100644 --- a/asm/unk_02014DA0.s +++ b/asm/unk_02014DA0.s @@ -1571,7 +1571,7 @@ ListMenuCursorNew: ; 0x02015788 bl String_New ldr r1, _020157B4 ; =_020F60DC str r0, [r4, #4] - bl CopyU16ArrayToString + bl String_CopyFromChars _020157AA: add r0, r4, #0 pop {r3, r4, r5, pc} @@ -1592,7 +1592,7 @@ _020157C2: ldr r0, [r4, #4] cmp r0, #0 beq _020157D0 - bl String_Delete + bl String_Free _020157D0: add r0, r4, #0 bl Heap_Free diff --git a/asm/unk_0202B614.s b/asm/unk_0202B614.s index b1a1ed986a..cd5415b60b 100644 --- a/asm/unk_0202B614.s +++ b/asm/unk_0202B614.s @@ -152,7 +152,7 @@ sub_0202B718: ; 0x0202B718 add r4, r2, #0 add r1, #0x20 mov r2, #8 - bl CopyStringToU16Array + bl String_CopyToChars add r5, #0x34 strb r4, [r5] pop {r3, r4, r5, pc} @@ -1265,13 +1265,13 @@ _0202BEC8: .word 0x00002345 thumb_func_start sub_0202BECC sub_0202BECC: ; 0x0202BECC add r2, r0, #0 - ldr r3, _0202BED8 ; =CopyU16ArrayToString + ldr r3, _0202BED8 ; =String_CopyFromChars add r2, #0x20 add r0, r1, #0 add r1, r2, #0 bx r3 .balign 4, 0 -_0202BED8: .word CopyU16ArrayToString +_0202BED8: .word String_CopyFromChars thumb_func_end sub_0202BECC thumb_func_start sub_0202BEDC diff --git a/asm/unk_0202C034.s b/asm/unk_0202C034.s index 344566c865..2bf45907c6 100644 --- a/asm/unk_0202C034.s +++ b/asm/unk_0202C034.s @@ -350,7 +350,7 @@ _0202C280: add r1, r2, r1 add r0, r6, #0 mov r2, #0x10 - bl CopyStringToU16Array + bl String_CopyToChars pop {r4, r5, r6, pc} .balign 4, 0 thumb_func_end sub_0202C270 @@ -391,7 +391,7 @@ _0202C2C4: add r1, r2, r1 add r0, r6, #0 mov r2, #0x10 - bl CopyStringToU16Array + bl String_CopyToChars pop {r4, r5, r6, pc} .balign 4, 0 thumb_func_end sub_0202C2B4 diff --git a/asm/unk_0202C730.s b/asm/unk_0202C730.s index 4386585724..e2a7ad191e 100644 --- a/asm/unk_0202C730.s +++ b/asm/unk_0202C730.s @@ -154,7 +154,7 @@ sub_0202C7F8: ; 0x0202C7F8 add r1, r4, r2 add r0, r3, #0 mov r2, #8 - bl CopyStringToU16Array + bl String_CopyToChars pop {r4, pc} _0202C810: mov r2, #0x2c @@ -163,7 +163,7 @@ _0202C810: add r0, r3, #0 add r1, #0x10 mov r2, #8 - bl CopyStringToU16Array + bl String_CopyToChars pop {r4, pc} .balign 4, 0 thumb_func_end sub_0202C7F8 diff --git a/asm/unk_02030A98.s b/asm/unk_02030A98.s index 26910c4d08..450757c064 100644 --- a/asm/unk_02030A98.s +++ b/asm/unk_02030A98.s @@ -1700,7 +1700,7 @@ sub_020315B8: ; 0x020315B8 add r1, r5, #0 mov r2, #0xf add r4, r0, #0 - bl CopyU16ArrayToStringN + bl String_CopyNumChars add r0, r4, #0 pop {r3, r4, r5, pc} thumb_func_end sub_020315B8 @@ -1873,7 +1873,7 @@ _020316CE: add r1, r5, #0 mov r2, #0x28 add r4, r0, #0 - bl CopyU16ArrayToStringN + bl String_CopyNumChars add r0, r4, #0 add sp, #8 pop {r4, r5, r6, pc} diff --git a/asm/unk_02031B0C.s b/asm/unk_02031B0C.s index 21876aacfa..136c628f2d 100644 --- a/asm/unk_02031B0C.s +++ b/asm/unk_02031B0C.s @@ -1197,7 +1197,7 @@ _020322E2: add r4, #0x28 add r0, r6, #0 add r1, r4, r5 - bl CopyU16ArrayToString + bl String_CopyFromChars _02032304: add r0, r6, #0 pop {r3, r4, r5, r6, r7, pc} diff --git a/asm/unk_02037C94.s b/asm/unk_02037C94.s index 6985fec32e..d0db7e189f 100644 --- a/asm/unk_02037C94.s +++ b/asm/unk_02037C94.s @@ -5133,7 +5133,7 @@ _0203A2B6: add r1, r5, #0 bl sub_0202C270 ldr r0, [sp, #0xc] - bl String_Delete + bl String_Free add r0, r6, #0 bl PlayerProfile_GetTrainerGender add r3, r0, #0 @@ -5182,13 +5182,13 @@ _0203A334: bl sub_02034884 add r1, r0, #0 ldr r0, [sp, #0x10] - bl CopyU16ArrayToString + bl String_CopyFromChars ldr r2, [sp, #0x10] add r0, r4, #0 add r1, r5, #0 bl sub_0202C2B4 ldr r0, [sp, #0x10] - bl String_Delete + bl String_Free add r0, r6, #0 bl PlayerProfile_GetAvatar add r3, r0, #0 diff --git a/asm/unk_02058AEC.s b/asm/unk_02058AEC.s index 5fd8e59c1e..34646bd812 100644 --- a/asm/unk_02058AEC.s +++ b/asm/unk_02058AEC.s @@ -1462,9 +1462,9 @@ _02059672: 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, #0 @@ -2273,9 +2273,9 @@ _02059C6C: ldr r0, [r4, #0x18] bl MessageFormat_Delete ldr r0, [r4] - bl String_Delete + bl String_Free ldr r0, [r4, #4] - bl String_Delete + bl String_Free add r0, r4, #0 add r0, #8 mov r1, #0 diff --git a/asm/unk_0205AC88.s b/asm/unk_0205AC88.s index 481ae2abf9..6b2f8e5f39 100644 --- a/asm/unk_0205AC88.s +++ b/asm/unk_0205AC88.s @@ -935,12 +935,12 @@ sub_0205B380: ; 0x0205B380 ldr r0, [r4, #4] cmp r0, #0 beq _0205B394 - bl String_Delete + bl String_Free _0205B394: ldr r0, [r4, #8] cmp r0, #0 beq _0205B39E - bl String_Delete + bl String_Free _0205B39E: pop {r4, pc} thumb_func_end sub_0205B380 diff --git a/asm/unk_020755E8.s b/asm/unk_020755E8.s index 7ee2b1e914..2cd5bb84c8 100644 --- a/asm/unk_020755E8.s +++ b/asm/unk_020755E8.s @@ -351,7 +351,7 @@ sub_02075804: ; 0x02075804 add r0, r5, #0 bl CopyWindowToVram add r0, r4, #0 - bl String_Delete + bl String_Free add sp, #0x10 pop {r3, r4, r5, pc} .balign 4, 0 diff --git a/asm/unk_020850F4.s b/asm/unk_020850F4.s index 0c51826682..ce9f773290 100644 --- a/asm/unk_020850F4.s +++ b/asm/unk_020850F4.s @@ -404,7 +404,7 @@ _02085446: bl GF_AssertFail _0208544E: ldr r0, [r4, #0x1c] - bl String_Delete + bl String_Free add r0, r4, #0 bl Heap_Free pop {r4, pc} diff --git a/asm/unk_02085604.s b/asm/unk_02085604.s index ef18cdecbb..26a678b306 100644 --- a/asm/unk_02085604.s +++ b/asm/unk_02085604.s @@ -1311,12 +1311,12 @@ _02085FC0: add r0, r7, #0 sub r1, r1, #1 add r3, r2, #0 - bl String16_FormatInteger + bl String_FormatInt mov r0, #0xf5 lsl r0, r0, #2 ldr r0, [r6, r0] add r1, r7, #0 - bl String_Cat + bl String_Concat mov r0, #0x2d lsl r0, r0, #4 ldr r0, [r6, r0] @@ -1326,7 +1326,7 @@ _02085FC0: blt _02085FA8 _02085FEC: add r0, r7, #0 - bl String_Delete + bl String_Free add r0, r6, #0 mov r1, #3 bl sub_02085808 diff --git a/asm/unk_020863F4.s b/asm/unk_020863F4.s index 5eabfa4042..c7eb75be5d 100644 --- a/asm/unk_020863F4.s +++ b/asm/unk_020863F4.s @@ -1772,7 +1772,7 @@ sub_02087090: ; 0x02087090 ldr r1, [sp, #0x70] bl sub_020138E0 ldr r0, [sp, #0x18] - bl String_Delete + bl String_Free ldr r0, [sp, #0x14] bl DestroyMsgData add r0, sp, #0x1c @@ -1867,7 +1867,7 @@ sub_02087230: ; 0x02087230 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/asm/unk_02088288.s b/asm/unk_02088288.s index e2ec58ef9f..aab4a45c05 100644 --- a/asm/unk_02088288.s +++ b/asm/unk_02088288.s @@ -792,7 +792,7 @@ sub_02088894: ; 0x02088894 cmp r1, #0 beq _0208893C ldr r0, [r4, r2] - bl CopyU16ArrayToString + bl String_CopyFromChars _0208893C: pop {r4, pc} nop @@ -828,22 +828,22 @@ sub_0208895C: ; 0x0208895C mov r0, #0x23 lsl r0, r0, #4 ldr r0, [r4, r0] - bl String_Delete + bl String_Free mov r0, #0x8d lsl r0, r0, #2 ldr r0, [r4, r0] - bl String_Delete + bl String_Free mov r0, #0x8e lsl r0, r0, #2 ldr r0, [r4, r0] - bl String_Delete + bl String_Free ldr r0, _020889CC ; =0x000007AC ldr r0, [r4, r0] - bl String_Delete + bl String_Free mov r0, #0x7b lsl r0, r0, #4 ldr r0, [r4, r0] - bl String_Delete + bl String_Free pop {r4, pc} .balign 4, 0 _020889BC: .word 0x000007B4 diff --git a/asm/unk_0208C3E4.s b/asm/unk_0208C3E4.s index 3a12978caf..0d8a6fce53 100644 --- a/asm/unk_0208C3E4.s +++ b/asm/unk_0208C3E4.s @@ -359,7 +359,7 @@ sub_0208C614: ; 0x0208C614 ldr r1, [r5, r1] bl StringExpandPlaceholders add r0, r4, #0 - bl String_Delete + bl String_Free mov r1, #0 str r1, [sp] mov r0, #0xff @@ -413,7 +413,7 @@ sub_0208C6B4: ; 0x0208C6B4 ldr r1, [r5, r1] bl StringExpandPlaceholders add r0, r4, #0 - bl String_Delete + bl String_Free b _0208C70A _0208C6FA: mov r2, #0x7a @@ -644,7 +644,7 @@ sub_0208C87C: ; 0x0208C87C ldr r1, [r5, r1] bl StringExpandPlaceholders add r0, r4, #0 - bl String_Delete + bl String_Free add sp, #8 pop {r3, r4, r5, r6, r7, pc} nop @@ -1671,7 +1671,7 @@ _0208D110: add r0, #0x70 bl ScheduleWindowCopyToVram add r0, r4, #0 - bl String_Delete + bl String_Free _0208D170: add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} @@ -1920,7 +1920,7 @@ sub_0208D178: ; 0x0208D178 ldr r1, [r4, r1] bl StringExpandPlaceholders add r0, r5, #0 - bl String_Delete + bl String_Free mov r1, #0x89 lsl r1, r1, #2 ldr r1, [r4, r1] diff --git a/asm/unk_020932E0.s b/asm/unk_020932E0.s index 2faf6d7ea7..2899803dd3 100644 --- a/asm/unk_020932E0.s +++ b/asm/unk_020932E0.s @@ -3252,7 +3252,7 @@ _02094CC8: add r0, r5, r0 bl CopyWindowToVram add r0, r4, #0 - bl String_Delete + bl String_Free add sp, #0x10 pop {r4, r5, r6, pc} nop @@ -3309,7 +3309,7 @@ _02094D78: add r0, r5, r0 bl CopyWindowToVram add r0, r4, #0 - bl String_Delete + bl String_Free add r0, r6, #0 bl DestroyMsgData add sp, #0x10 @@ -3684,7 +3684,7 @@ sub_0209501C: ; 0x0209501C str r3, [sp, #0xc] bl AddTextPrinterParameterizedWithColor add r0, r5, #0 - bl String_Delete + bl String_Free add r0, r7, #0 bl DestroyMsgData ldr r0, _020950B4 ; =0x00004660 diff --git a/include/easy_chat.h b/include/easy_chat.h index 5d899fef80..2067277db0 100644 --- a/include/easy_chat.h +++ b/include/easy_chat.h @@ -4,7 +4,7 @@ #include "constants/easy_chat.h" #include "msgdata.h" -#include "pm_string.h" +#include "string_gf.h" typedef u16 ecword_t; diff --git a/include/font_types_def.h b/include/font_types_def.h index 0c2dafc63f..5648879ad3 100644 --- a/include/font_types_def.h +++ b/include/font_types_def.h @@ -2,7 +2,7 @@ #define POKEHEARTGOLD_FONT_TYPES_DEF_H #include "bg_window.h" -#include "pm_string.h" +#include "string_gf.h" typedef u8 FontID; // TODO: This should be an enum and NOT typedef'd, and should be u32 struct FontData; diff --git a/include/friend_group.h b/include/friend_group.h index 23e769da1b..190f1b4acd 100644 --- a/include/friend_group.h +++ b/include/friend_group.h @@ -1,7 +1,7 @@ #ifndef POKEHEARTGOLD_FRIEND_GROUP_H #define POKEHEARTGOLD_FRIEND_GROUP_H -#include "pm_string.h" +#include "string_gf.h" #include "save.h" // Hey, you wanna join a GROUP? diff --git a/include/hall_of_fame.h b/include/hall_of_fame.h index 886c7d0ca8..01a593b27c 100644 --- a/include/hall_of_fame.h +++ b/include/hall_of_fame.h @@ -2,7 +2,7 @@ #define POKEHEARTGOLD_HALL_OF_FAME_H #include "party.h" -#include "pm_string.h" +#include "string_gf.h" #define NUM_HOF_RECORDS 30 diff --git a/include/item.h b/include/item.h index 44238ffd30..02aa3d4d88 100644 --- a/include/item.h +++ b/include/item.h @@ -2,7 +2,7 @@ #define POKEHEARTGOLD_ITEM_H #include "heap.h" -#include "pm_string.h" +#include "string_gf.h" /* * Item slot in memory/save file. diff --git a/include/list_menu_items.h b/include/list_menu_items.h index 5c02590baf..5114731eac 100644 --- a/include/list_menu_items.h +++ b/include/list_menu_items.h @@ -3,7 +3,7 @@ #include "heap.h" #include "msgdata.h" -#include "pm_string.h" +#include "string_gf.h" #define LIST_HEADER -3 #define LIST_CANCEL -2 diff --git a/include/mail.h b/include/mail.h index 6cbececf88..9f0cfb9b93 100644 --- a/include/mail.h +++ b/include/mail.h @@ -3,7 +3,7 @@ #include "heap.h" #include "mail_message.h" -#include "pm_string.h" +#include "string_gf.h" #include "pokemon_types_def.h" #include "save.h" diff --git a/include/mail_message.h b/include/mail_message.h index 3860fe9889..2abbc1d44f 100644 --- a/include/mail_message.h +++ b/include/mail_message.h @@ -1,7 +1,7 @@ #ifndef POKEHEARTGOLD_MAIL_MESSAGE_H #define POKEHEARTGOLD_MAIL_MESSAGE_H -#include "pm_string.h" +#include "string_gf.h" #include "pokemon_types_def.h" #define MAILMSG_BANK_0294_GMM 0 @@ -10,7 +10,7 @@ #define MAILMSG_BANK_0293_GMM 3 #define MAILMSG_BANK_0295_GMM 4 -#include "pm_string.h" +#include "string_gf.h" #ifndef PM_ASM diff --git a/include/message_format.h b/include/message_format.h index 671b97f3bf..0458a5baf5 100644 --- a/include/message_format.h +++ b/include/message_format.h @@ -2,7 +2,7 @@ #define GUARD_MESSAGE_FORMAT_H #include "player_data.h" -#include "pm_string.h" +#include "string_gf.h" #include "pokemon_storage_system.h" #include "pokemon_types_def.h" #include "save_misc_data.h" @@ -28,15 +28,15 @@ MessageFormat *MessageFormat_New(enum HeapID heapID); MessageFormat *MessageFormat_New_Custom(u32 nstr, u32 _strlen, enum HeapID heapID); void MessageFormat_Delete(MessageFormat *messageFormat); void StringExpandPlaceholders(MessageFormat *messageFormat, String *dest, String *src); -void BufferString(MessageFormat *messageFormat, u32 fieldno, const String *string, s32 a3, s32 a4, s32 a5); -void BufferIntegerAsString(MessageFormat *messageFormat, u32 idx, s32 num, u32 numDigits, PrintingMode strconvmode, BOOL whichCharset); +void BufferString(MessageFormat *messageFormat, u32 fieldno, String *string, s32 a3, s32 a4, s32 a5); +void BufferIntegerAsString(MessageFormat *messageFormat, u32 idx, s32 num, u32 numDigits, enum PaddingMode paddingMode, BOOL whichCharset); void BufferPlayersName(MessageFormat *messageFormat, u32 idx, PlayerProfile *playerProfile); void BufferECWord(MessageFormat *messageFormat, u32 idx, u16 wordno); void BufferSpeciesName(MessageFormat *messageFormat, u32 idx, u16 species); void BufferSpeciesNameWithArticle(MessageFormat *messageFormat, u32 idx, u32 species); void BufferTrainerClassName(MessageFormat *messageFormat, u32 fieldno, u32 trainerClassId); void MessageFormat_InitFields(MessageFormatFields *fields); -void SetStringAsPlaceholder(MessageFormat *messageFormat, u32 fieldno, const String *string, const MessageFormatAttrs *attrs); +void SetStringAsPlaceholder(MessageFormat *messageFormat, u32 fieldno, String *string, const MessageFormatAttrs *attrs); void BufferRivalsName(MessageFormat *messageFormat, u32 fieldno, SaveData *saveData); void BufferFriendsName(MessageFormat *messageFormat, u32 fieldno, SaveData *saveData); void BufferBoxMonSpeciesName(MessageFormat *messageFormat, u32 fieldno, BoxPokemon *boxmon); diff --git a/include/message_printer.h b/include/message_printer.h index f1c181da93..1c02ee5297 100644 --- a/include/message_printer.h +++ b/include/message_printer.h @@ -16,6 +16,6 @@ typedef struct MessagePrinter { MessagePrinter *MessagePrinter_New(u32 foreground, u32 shadow, u32 background, enum HeapID heapID); void MessagePrinter_Delete(MessagePrinter *messagePrinter); void sub_0200CDAC(MessagePrinter *messagePrinter, u8 glyphId, Window *window, u32 x, u32 y); -void PrintUIntOnWindow(MessagePrinter *messagePrinter, u32 num, u32 ndigits, PrintingMode mode, Window *window, u32 x, u32 y); +void PrintUIntOnWindow(MessagePrinter *messagePrinter, u32 num, u32 ndigits, enum PaddingMode mode, Window *window, u32 x, u32 y); #endif // POKEHEARTGOLD_MESSAGE_PRINTER_H diff --git a/include/msgdata.h b/include/msgdata.h index b8157371fd..18d64f89d4 100644 --- a/include/msgdata.h +++ b/include/msgdata.h @@ -3,7 +3,7 @@ #include "filesystem.h" #include "message_format.h" -#include "pm_string.h" +#include "string_gf.h" typedef enum MsgDataLoadType { MSGDATA_LOAD_DIRECT, diff --git a/include/naming_screen.h b/include/naming_screen.h index 3fedee2706..578390217c 100644 --- a/include/naming_screen.h +++ b/include/naming_screen.h @@ -4,7 +4,7 @@ #include "launch_application.h" #include "options.h" #include "overlay_manager.h" -#include "pm_string.h" +#include "string_gf.h" extern const OverlayManagerTemplate gOverlayTemplate_NamingScreen; diff --git a/include/overlay_55.h b/include/overlay_55.h index c8e4437b1c..8db81eebc3 100644 --- a/include/overlay_55.h +++ b/include/overlay_55.h @@ -5,7 +5,7 @@ #include "mail_misc.h" #include "options.h" #include "overlay_manager.h" -#include "pm_string.h" +#include "string_gf.h" typedef struct UnkStruct_ov55_021E5B08 { u16 unk0; diff --git a/include/player_data.h b/include/player_data.h index 4ba0c40ed7..06c35a8f41 100644 --- a/include/player_data.h +++ b/include/player_data.h @@ -4,7 +4,7 @@ #include "coins.h" #include "igt.h" #include "options.h" -#include "pm_string.h" +#include "string_gf.h" #include "save.h" #define MAX_MONEY 999999 diff --git a/include/pm_string.h b/include/pm_string.h deleted file mode 100644 index dd1dd68c7e..0000000000 --- a/include/pm_string.h +++ /dev/null @@ -1,42 +0,0 @@ -#ifndef POKEHEARTGOLD_STRING_H -#define POKEHEARTGOLD_STRING_H - -#include "constants/charcode.h" - -#include "heap.h" -#include "string_util.h" - -typedef struct String { - u16 maxsize; - u16 size; - u32 magic; - u16 data[0]; -} String; - -String *String_New(u32 maxsize, enum HeapID heapID); -void String_Delete(String *string); -void CopyStringToU16Array(const String *string, u16 *dest, u32 n); -void CopyU16ArrayToString(String *string, const u16 *src); -void CopyU16ArrayToStringN(String *string, const u16 *src, u32 n); -int String_Compare(String *a, String *b); -void String_Copy(String *dest, const String *src); -void String_SetEmpty(String *str); -String *String_Dup(const String *src, enum HeapID heapID); -void String_AddChar(String *str, u16 _char); -void CopyU16ArrayToString(String *dest, const u16 *src); -void CopyU16ArrayToStringN(String *dest, const u16 *src, u32 n); -u16 *String_cstr(String *string); -void String16_FormatInteger(String *str, int num, u32 ndigits, PrintingMode strConvMode, BOOL whichCharset); -void String_UpperCharN(String *str, int n); -void String_Cat_HandleTrainerName(String *dest, String *src); -void String16_FormatUnsignedLongLong(String *str, u64 num, u32 ndigits, PrintingMode strConvMode, BOOL whichCharset); -s64 String_atoi(String *str, BOOL *flag); -u16 String_GetLength(String *str); -int String_CountLines(volatile String *str); -void String_GetLineN(String *dest, volatile String *src, u32 n); -void String_RadioAddStatic(String *string, u8 level); -u16 *String_cstr(String *str); -void String_Cat(String *dest, String *src); -BOOL String_IsTrainerName(String *string); - -#endif // POKEHEARTGOLD_STRING_H diff --git a/include/pokemon.h b/include/pokemon.h index d2fa521eb3..d5d263c236 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -11,7 +11,7 @@ #include "filesystem.h" #include "player_data.h" -#include "pm_string.h" +#include "string_gf.h" #include "sound_chatot.h" #define LEVEL_UP_LEARNSET_END 0xFFFF diff --git a/include/pokemon_storage_system.h b/include/pokemon_storage_system.h index 698093e93a..cf5ae23e27 100644 --- a/include/pokemon_storage_system.h +++ b/include/pokemon_storage_system.h @@ -4,7 +4,7 @@ #include "constants/box_wallpaper.h" #include "constants/pokemon.h" -#include "pm_string.h" +#include "string_gf.h" #include "pokemon_types_def.h" typedef struct PokemonStorageSystem PCStorage; @@ -44,7 +44,7 @@ void PCStorage_SetActiveBox(PCStorage *storage, u32 boxno); u8 PCStorage_GetBoxWallpaper(PCStorage *storage, u32 boxno); BOOL PCStorage_IsValidWallpaperId(u8 wallpaperno); void PCStorage_SetBoxWallpaper(PCStorage *storage, u32 boxno, u8 wallpaperno); -void PCStorage_SetBoxName(PCStorage *storage, u32 boxno, const String *src); +void PCStorage_SetBoxName(PCStorage *storage, u32 boxno, String *src); int PCStorage_CountMonsAndEggsInBox(PCStorage *storage, u32 boxno); int PCStorage_CountMonsInBox(PCStorage *storage, u32 boxno); int PCStorage_CountMonsInAllBoxes(PCStorage *storage); diff --git a/include/save_link_ruleset.h b/include/save_link_ruleset.h index 8b3f645e79..4a86e97191 100644 --- a/include/save_link_ruleset.h +++ b/include/save_link_ruleset.h @@ -1,7 +1,7 @@ #ifndef POKEHEARTGOLD_SAVE_LINK_RULESET_H #define POKEHEARTGOLD_SAVE_LINK_RULESET_H -#include "pm_string.h" +#include "string_gf.h" #include "save.h" #define NUM_SAVE_LINK_BATTLE_RULESETS (1) diff --git a/include/save_misc_data.h b/include/save_misc_data.h index c1a6429373..78db04d6a6 100644 --- a/include/save_misc_data.h +++ b/include/save_misc_data.h @@ -4,7 +4,7 @@ #include "gf_rtc.h" #include "gymmick.h" #include "mail_message.h" -#include "pm_string.h" +#include "string_gf.h" #include "save.h" typedef struct APRICORN_TREE { @@ -71,7 +71,7 @@ BerryPot *Save_BerryPots_Get(SaveData *saveData); struct GF_RTC_DateTime *Save_BerryPotRTC_Get(SaveData *saveData); Gymmick *Save_GetGymmickPtr(SaveData *saveData); const u16 *Save_Misc_RivalName_Const_Get(const SAVE_MISC_DATA *saveMiscData); -void Save_Misc_RivalName_Set(SAVE_MISC_DATA *saveMiscData, const String *name); +void Save_Misc_RivalName_Set(SAVE_MISC_DATA *saveMiscData, String *name); void SaveMisc_SetExtraChunksExist(SAVE_MISC_DATA *saveMiscData); BOOL SaveMisc_CheckExtraChunksExist(SAVE_MISC_DATA *saveMiscData); void SaveMisc_SetFavoriteMon(SAVE_MISC_DATA *saveMiscData, int species, int form, int isEgg); diff --git a/include/save_rankings.h b/include/save_rankings.h index b80c0145ca..fc7b680cc1 100644 --- a/include/save_rankings.h +++ b/include/save_rankings.h @@ -1,7 +1,7 @@ #ifndef GUARD_POKEHEARTGOLD_UNK_0202E4B0_H #define GUARD_POKEHEARTGOLD_UNK_0202E4B0_H -#include "pm_string.h" +#include "string_gf.h" #include "save.h" #define RANKINGS_PER_STAT 6 diff --git a/include/string_control_code.h b/include/string_control_code.h index afd3fcc850..94db341dee 100644 --- a/include/string_control_code.h +++ b/include/string_control_code.h @@ -3,6 +3,8 @@ #include "global.h" +typedef u16 charcode_t; + const u16 *MsgArray_SkipControlCode(const u16 *arr); int 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 0000000000..1ef13a929f --- /dev/null +++ b/include/string_gf.h @@ -0,0 +1,255 @@ +#ifndef POKEHEARTGOLD_STRING_GF_H +#define POKEHEARTGOLD_STRING_GF_H + +#include "constants/charcode.h" +#include "constants/heap.h" + +#include "string_control_code.h" +#include "string_util.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. + charcode_t data[0]; +} 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 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_FormatU64(String *dest, u64 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 Modifies chars from `string` into different amounts of dots. + * + * @param[out] string. + * @param level Level of "static" to add. + */ +void String_AddRadioStatic(String *string, u8 level); + +/** + * @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 a particular character to uppercase. + * + * @param string + * @param index Index of the character to capitalize, zero-indexed. + */ +void String_UpperChar(String *string, int index); + +#endif // POKEHEARTGOLD_STRING_GF_H diff --git a/include/string_util.h b/include/string_util.h index 8ac352af6a..92c98d539a 100644 --- a/include/string_util.h +++ b/include/string_util.h @@ -3,17 +3,17 @@ #include "global.h" -typedef enum PrintingMode { - PRINTING_MODE_LEFT_ALIGN, - PRINTING_MODE_RIGHT_ALIGN, - PRINTING_MODE_LEADING_ZEROS, -} PrintingMode; +enum PaddingMode { + PADDING_MODE_NONE, + PADDING_MODE_SPACES, + PADDING_MODE_ZEROES, +}; u16 *CopyU16StringArray(u16 *dest, const u16 *src); BOOL StringNotEqual(const u16 *a, const u16 *b); u16 *StringFill(u16 *str, u16 val, u32 n); u16 *StringFillEOS(u16 *s, u32 n); -u16 *ConvertUIntToDecimalString(u16 *dest, u32 num, PrintingMode strconvmode, u32 ndigits); +u16 *ConvertUIntToDecimalString(u16 *dest, u32 num, enum PaddingMode paddingMode, u32 ndigits); u16 *CopyU16StringArrayN(u16 *dest, const u16 *src, u32 n); int StringLength(const u16 *str); BOOL StringNotEqualN(const u16 *a, const u16 *b, u32 n); diff --git a/include/text_0205B4EC.h b/include/text_0205B4EC.h index 9f541640a5..37c39ad681 100644 --- a/include/text_0205B4EC.h +++ b/include/text_0205B4EC.h @@ -3,7 +3,7 @@ #include "bg_window.h" #include "options.h" -#include "pm_string.h" +#include "string_gf.h" void sub_0205B514(BgConfig *bgConfig, Window *window, int a2); void sub_0205B564(Window *window, Options *options); diff --git a/include/trainer_data.h b/include/trainer_data.h index 31ad628938..7a223c42f5 100644 --- a/include/trainer_data.h +++ b/include/trainer_data.h @@ -9,7 +9,7 @@ #include "global.h" #include "mail_message.h" -#include "pm_string.h" +#include "string_gf.h" #include "pokemon_types_def.h" typedef enum TrainerAttr { diff --git a/include/unk_0200CE7C.h b/include/unk_0200CE7C.h index 4317d0794e..714aa19cae 100644 --- a/include/unk_0200CE7C.h +++ b/include/unk_0200CE7C.h @@ -13,7 +13,7 @@ typedef struct BattleNumberPrinter { int fillVal; } BattleNumberPrinter; -void sub_0200CE7C(MessagePrinter *msgPrinter, u8 glyphId, u32 num, u32 ndigits, PrintingMode mode, Window *window, u32 x, u32 y); -void sub_0200CEB0(BattleNumberPrinter *unk, u32 num, u32 ndigits, PrintingMode strConvMode, u16 *dest); +void sub_0200CE7C(MessagePrinter *msgPrinter, u8 glyphId, u32 num, u32 ndigits, enum PaddingMode mode, Window *window, u32 x, u32 y); +void sub_0200CEB0(BattleNumberPrinter *unk, u32 num, u32 ndigits, enum PaddingMode paddingMode, u16 *dest); #endif // GUARD_POKEHEARTGOLD_UNK_0200CE7C_H diff --git a/main.lsf b/main.lsf index 6e7e537b10..4cb93b1e32 100644 --- a/main.lsf +++ b/main.lsf @@ -91,7 +91,7 @@ Static main Object src/unk_02025534.o Object asm/unk_02025C44.o Object src/font_data.o - Object src/pm_string.o + Object src/string_gf.o Object src/touch_hitbox_controller.o Object asm/unk_02026DE0.o Object src/unk_02026E30.o diff --git a/src/alph_puzzle.c b/src/alph_puzzle.c index 4d9a00f5e3..dce81bfebb 100644 --- a/src/alph_puzzle.c +++ b/src/alph_puzzle.c @@ -1173,12 +1173,12 @@ static void AlphPuzzle_InitText(AlphPuzzleData *data) { } static void AlphPuzzle_DeleteText(AlphPuzzleData *data) { - String_Delete(data->confirmQuitText[0]); + String_Free(data->confirmQuitText[0]); for (int i = 0; i < 4; i++) { - String_Delete(data->hintText[i]); + String_Free(data->hintText[i]); } - String_Delete(data->quitText); - String_Delete(data->unk30); + String_Free(data->quitText); + String_Free(data->unk30); MessageFormat_Delete(data->messageFormat); DestroyMsgData(data->msgData); FontID_Release(4); diff --git a/src/application/check_savedata.c b/src/application/check_savedata.c index 0216b555c6..16367492ed 100644 --- a/src/application/check_savedata.c +++ b/src/application/check_savedata.c @@ -326,7 +326,7 @@ static BOOL CheckSavedataApp_PrintMessage(CheckSavedataApp_Data *data, u32 msgNu data->textPrinterId = AddTextPrinterParameterized(&data->window, 1, data->textString, 0, 0, textSpeed, NULL); if (textSpeed == TEXT_SPEED_INSTANT) { - String_Delete(data->textString); + String_Free(data->textString); // Skip waiting for the text printer to finish since the speed here was instant data->printState++; @@ -339,7 +339,7 @@ static BOOL CheckSavedataApp_PrintMessage(CheckSavedataApp_Data *data, u32 msgNu break; } - String_Delete(data->textString); + String_Free(data->textString); data->printState++; break; case PRINTSTATE_EXIT: diff --git a/src/application/delete_savedata.c b/src/application/delete_savedata.c index 494fe0d164..05d704538e 100644 --- a/src/application/delete_savedata.c +++ b/src/application/delete_savedata.c @@ -340,7 +340,7 @@ static BOOL DeleteSavedataApp_PrintMessage(DeleteSavedataApp_Data *data, u32 msg data->textPrinterId = AddTextPrinterParameterized(&data->window, 1, data->textString, 0, 0, textSpeed, NULL); if (textSpeed == TEXT_SPEED_INSTANT) { - String_Delete(data->textString); + String_Free(data->textString); // Skip waiting for the text printer to finish since the speed here was instant data->printState++; @@ -353,7 +353,7 @@ static BOOL DeleteSavedataApp_PrintMessage(DeleteSavedataApp_Data *data, u32 msg break; } - String_Delete(data->textString); + String_Free(data->textString); data->printState++; break; case PRINTSTATE_EXIT: diff --git a/src/application/main_menu/main_menu.c b/src/application/main_menu/main_menu.c index 6d5e7b0732..2846c806c6 100644 --- a/src/application/main_menu/main_menu.c +++ b/src/application/main_menu/main_menu.c @@ -673,7 +673,7 @@ static BOOL ov74_0222779C(MainMenuAppData *data) { String *string = NewString_ReadMsgData(msgData, unk2->msgId); u32 width = FontID_String_GetWidthMultiline(unk.fontId, string, 0); unk.textX = (unk2->width * 8 - width) / 2; - String_Delete(string); + String_Free(string); DestroyMsgData(msgData); unk.textY = 4; } @@ -892,25 +892,25 @@ static void PrintPlayerInfoField(Window *window, MsgData *msgData, MessageFormat int stringPixelWidth = FontID_String_GetWidth(0, string, GetFontAttribute(0, 2)); u32 x = GetWindowWidth(window) * 8 - (stringPixelWidth + 32); AddTextPrinterParameterizedWithColor(window, 0, string, x, y, TEXT_SPEED_NOTRANSFER, color, NULL); - String_Delete(string); + String_Free(string); } static void ov74_02227E64(MessageFormat *messageFormat, int number) { u32 digits; - PrintingMode printingMode; + enum PaddingMode paddingMode; if (number >= 100) { digits = 3; - printingMode = PRINTING_MODE_LEFT_ALIGN; + paddingMode = PADDING_MODE_NONE; } else if (number >= 10) { digits = 3; - printingMode = PRINTING_MODE_RIGHT_ALIGN; + paddingMode = PADDING_MODE_SPACES; } else { digits = 2; - printingMode = PRINTING_MODE_RIGHT_ALIGN; + paddingMode = PADDING_MODE_SPACES; } - BufferIntegerAsString(messageFormat, 0, number, digits, printingMode, 1); + BufferIntegerAsString(messageFormat, 0, number, digits, paddingMode, 1); } static BOOL MainMenu_PrintContinueButton(MainMenuAppData *data, u32 a1, UnkStruct_ov74_02235414 *a2, u32 a3) { @@ -937,17 +937,17 @@ static BOOL MainMenu_PrintContinueButton(MainMenuAppData *data, u32 a1, UnkStruc String *string = ReadMsgData_ExpandPlaceholders(messageFormat, msgData, sContinueButtonMsgs[i], HEAP_ID_MAIN_MENU); AddTextPrinterParameterizedWithColor(a2->window, 0, string, 32, i * 16, TEXT_SPEED_NOTRANSFER, textColor, NULL); - String_Delete(string); + String_Free(string); } BufferPlayersName(messageFormat, 0, data->profile); PrintPlayerInfoField(a2->window, msgData, messageFormat, textColor, msg_0442_00017, 16); ov74_02227E64(messageFormat, GetIGTHours(data->igt)); - BufferIntegerAsString(messageFormat, 1, GetIGTMinutes(data->igt), 2, PRINTING_MODE_LEADING_ZEROS, 1); + BufferIntegerAsString(messageFormat, 1, GetIGTMinutes(data->igt), 2, PADDING_MODE_ZEROES, 1); PrintPlayerInfoField(a2->window, msgData, messageFormat, textColor, msg_0442_00018, 32); - BufferIntegerAsString(messageFormat, 0, data->badges, 2, PRINTING_MODE_LEFT_ALIGN, 1); + BufferIntegerAsString(messageFormat, 0, data->badges, 2, PADDING_MODE_NONE, 1); PrintPlayerInfoField(a2->window, msgData, messageFormat, textColor, msg_0442_00020, 48); if (data->hasPokedex) { diff --git a/src/application/pokegear/map/overlay_101_021E7FF4.c b/src/application/pokegear/map/overlay_101_021E7FF4.c index b239b1ad0e..657c8f00c8 100644 --- a/src/application/pokegear/map/overlay_101_021E7FF4.c +++ b/src/application/pokegear/map/overlay_101_021E7FF4.c @@ -424,11 +424,11 @@ static void PokegearMap_InitMsg(PokegearMapAppData *mapApp) { } static void PokegearMap_DeleteMsg(PokegearMapAppData *mapApp) { - String_Delete(mapApp->formatFlavorTextString); - String_Delete(mapApp->mapNameString); - String_Delete(mapApp->regionNameStrings[1]); - String_Delete(mapApp->regionNameStrings[0]); - String_Delete(mapApp->flavorTextString); + String_Free(mapApp->formatFlavorTextString); + String_Free(mapApp->mapNameString); + String_Free(mapApp->regionNameStrings[1]); + String_Free(mapApp->regionNameStrings[0]); + String_Free(mapApp->flavorTextString); MessageFormat_Delete(mapApp->msgFormat); DestroyMsgData(mapApp->msgData); } diff --git a/src/application/pokegear/map/overlay_101_021E9270.c b/src/application/pokegear/map/overlay_101_021E9270.c index 9bd714e284..77554bee75 100644 --- a/src/application/pokegear/map/overlay_101_021E9270.c +++ b/src/application/pokegear/map/overlay_101_021E9270.c @@ -816,7 +816,7 @@ static void ov101_021EAA0C(PokegearMapAppData *mapApp, BOOL a1, BOOL isKanto) { locationSpec = selectedLoc->locationSpec; markersHeap = selectedLoc->markingsNode; - String_SetEmpty(mapApp->mapNameString); + String_Clear(mapApp->mapNameString); for (i = 0; i < 3; ++i) { FillWindowPixelBuffer(&mapApp->windows[i], 0); } @@ -854,7 +854,7 @@ static void ov101_021EAA0C(PokegearMapAppData *mapApp, BOOL a1, BOOL isKanto) { } CopyToBgTilemapRect(mapApp->pokegear->bgConfig, GF_BG_LYR_SUB_2, 23, 11, 8, 7, mapApp->unk_16C->rawData, tilemap16CsrcX, 0, mapApp->unk_16C->screenWidth / 8, mapApp->unk_16C->screenHeight / 8); CopyToBgTilemapRect(mapApp->pokegear->bgConfig, GF_BG_LYR_SUB_3, 24, 11, 7, 7, mapApp->unk_174->rawData, (tilemap174blockId % 4) * 7, (tilemap174blockId / 4) * 7, mapApp->unk_174->screenWidth / 8, mapApp->unk_174->screenHeight / 8); - String_SetEmpty(mapApp->flavorTextString); + String_Clear(mapApp->flavorTextString); ReadMsgDataIntoString(mapApp->msgData, locationSpec->flavorText, mapApp->flavorTextString); AddTextPrinterParameterizedWithColor(&mapApp->windows[2], 0, mapApp->flavorTextString, 0, 0, TEXT_SPEED_NOTRANSFER, MAKE_TEXT_COLOR(1, 2, 0), NULL); Sprite_SetDrawFlag(objects[PGMAP_SPRITE_GEAR_BATTLE].sprite, PokegearMap_MapHasPhoneRematchOrGift(mapApp, locationSpec->mapId)); @@ -922,7 +922,7 @@ void PokegearMap_PrintSelectedMapDetail(PokegearMapAppData *mapApp, BOOL forceUp markingsNode = selectedLoc->markingsNode; if (forceUpdateMapName) { - String_SetEmpty(mapApp->mapNameString); + String_Clear(mapApp->mapNameString); FillWindowPixelBuffer(&mapApp->windows[7], 0); PokegearMap_GetLandmarkNameFromMapID(locationSpec->mapId, mapApp->heapID, mapApp->mapNameString); AddTextPrinterParameterizedWithColor(&mapApp->windows[7], 0, mapApp->mapNameString, 0, 5, TEXT_SPEED_INSTANT, MAKE_TEXT_COLOR(1, 2, 0), NULL); diff --git a/src/application/pokegear/map/overlay_101_021EDCE0.c b/src/application/pokegear/map/overlay_101_021EDCE0.c index fad62b2750..c694f5e658 100644 --- a/src/application/pokegear/map/overlay_101_021EDCE0.c +++ b/src/application/pokegear/map/overlay_101_021EDCE0.c @@ -565,14 +565,14 @@ static void FlyMap_LoadStrings(PokegearMapAppData *mapApp) { } static void FlyMap_UnloadStrings(PokegearMapAppData *mapApp) { - String_Delete(mapApp->formatFlavorTextString); - String_Delete(mapApp->closeString); - String_Delete(mapApp->flyToLocationString); - String_Delete(mapApp->chooseDestinationString); - String_Delete(mapApp->mapNameString); - String_Delete(mapApp->regionNameStrings[1]); - String_Delete(mapApp->regionNameStrings[0]); - String_Delete(mapApp->flavorTextString); + String_Free(mapApp->formatFlavorTextString); + String_Free(mapApp->closeString); + String_Free(mapApp->flyToLocationString); + String_Free(mapApp->chooseDestinationString); + String_Free(mapApp->mapNameString); + String_Free(mapApp->regionNameStrings[1]); + String_Free(mapApp->regionNameStrings[0]); + String_Free(mapApp->flavorTextString); MessageFormat_Delete(mapApp->msgFormat); DestroyMsgData(mapApp->msgData); } diff --git a/src/application/pokegear/phone/overlay_101_021F017C.c b/src/application/pokegear/phone/overlay_101_021F017C.c index 320be2869e..ad80e197b3 100644 --- a/src/application/pokegear/phone/overlay_101_021F017C.c +++ b/src/application/pokegear/phone/overlay_101_021F017C.c @@ -425,10 +425,10 @@ void ov101_021F05EC(PokegearPhoneAppData *phoneApp) { void ov101_021F0658(PokegearPhoneAppData *phoneApp) { for (int i = 0; i < PHONE_TOOLTIP_MAX; ++i) { - String_Delete(phoneApp->tooltipStrings[i]); + String_Free(phoneApp->tooltipStrings[i]); } - String_Delete(phoneApp->msgReadBuf); - String_Delete(phoneApp->msgFormatBuf); + String_Free(phoneApp->msgReadBuf); + String_Free(phoneApp->msgFormatBuf); MessageFormat_Delete(phoneApp->msgFormat); DestroyMsgData(phoneApp->msgData); TextFlags_SetAlternateDownArrow(FALSE); diff --git a/src/application/pokegear/phone/overlay_101_021F1D74.c b/src/application/pokegear/phone/overlay_101_021F1D74.c index fdb60ae9d0..e0daff2d97 100644 --- a/src/application/pokegear/phone/overlay_101_021F1D74.c +++ b/src/application/pokegear/phone/overlay_101_021F1D74.c @@ -71,14 +71,14 @@ PokegearPhoneCallContext *PhoneCall_CreateContext(const PokegearPhoneCallContext void PhoneCall_DestroyContext(PokegearPhoneCallContext *ctx) { for (int i = 0; i < 3; ++i) { - String_Delete(ctx->noSignalMsgs[i]); - String_Delete(ctx->hangUpMsgs[i]); + String_Free(ctx->noSignalMsgs[i]); + String_Free(ctx->hangUpMsgs[i]); } - String_Delete(ctx->buf14String); - String_Delete(ctx->contactClassBuf); - String_Delete(ctx->contactNameBuf); - String_Delete(ctx->phoneCallMsgReadBuff); - String_Delete(ctx->msgExpansionBuff); + String_Free(ctx->buf14String); + String_Free(ctx->contactClassBuf); + String_Free(ctx->contactNameBuf); + String_Free(ctx->phoneCallMsgReadBuff); + String_Free(ctx->msgExpansionBuff); MessageFormat_Delete(ctx->msgFormat); DestroyMsgData(ctx->msgData_0640); DestroyMsgData(ctx->msgData_0271); @@ -103,7 +103,7 @@ String *PhoneContact_GetClass(PokegearPhoneCallContext *ctx, u8 callerID) { callerID = PHONE_CONTACT_MOTHER; } if (ctx->phoneEntries[callerID].trainerClass == TRAINERCLASS_PHONE_MOM) { - String_SetEmpty(ctx->contactClassBuf); + String_Clear(ctx->contactClassBuf); } else if (ctx->phoneEntries[callerID].trainerClass >= TRAINERCLASS_PHONE_POKEMON_PROFESSOR) { ReadMsgDataIntoString(ctx->msgData_0271, ctx->phoneEntries[callerID].trainerClass - TRAINERCLASS_PHONE_POKEMON_PROFESSOR + msg_0271_00038, ctx->contactClassBuf); } else { diff --git a/src/application/pokegear/phone/scripts/phone_scripts_bill.c b/src/application/pokegear/phone/scripts/phone_scripts_bill.c index 1563c418ee..55f7458890 100644 --- a/src/application/pokegear/phone/scripts/phone_scripts_bill.c +++ b/src/application/pokegear/phone/scripts/phone_scripts_bill.c @@ -42,7 +42,7 @@ BOOL GearPhoneCall_Bill(PokegearPhoneCallContext *ctx) { PCStorage_GetBoxName(pcStorage, PCStorage_GetActiveBox(pcStorage), ctx->msgExpansionBuff); BufferString(ctx->msgFormat, 10, ctx->msgExpansionBuff, 2, 1, 2); count = PCStorage_CountEmptySpotsInAllBoxes(pcStorage); - BufferIntegerAsString(ctx->msgFormat, 11, count, 3, PRINTING_MODE_LEFT_ALIGN, TRUE); + BufferIntegerAsString(ctx->msgFormat, 11, count, 3, PADDING_MODE_NONE, TRUE); if (count == 0) { PhoneCallMessagePrint_Ungendered(ctx, ctx->msgData_PhoneContact, msg_0665_00009); } else { diff --git a/src/application/pokegear/phone/scripts/phone_scripts_daycare_lady.c b/src/application/pokegear/phone/scripts/phone_scripts_daycare_lady.c index 77383265c2..6c73aa7b7a 100644 --- a/src/application/pokegear/phone/scripts/phone_scripts_daycare_lady.c +++ b/src/application/pokegear/phone/scripts/phone_scripts_daycare_lady.c @@ -74,7 +74,7 @@ BOOL GearPhoneCall_DayCareLady(PokegearPhoneCallContext *ctx) { } } BufferBoxMonNickname(ctx->msgFormat, 10, DaycareMon_GetBoxMon(Save_Daycare_GetMonX(state->miscPtr.daycare, monIdx))); - BufferIntegerAsString(ctx->msgFormat, 11, state->daycareMonsLevelGrowth[monIdx], 3, PRINTING_MODE_LEFT_ALIGN, TRUE); + BufferIntegerAsString(ctx->msgFormat, 11, state->daycareMonsLevelGrowth[monIdx], 3, PADDING_MODE_NONE, TRUE); PhoneCallMessagePrint_Ungendered(ctx, ctx->msgData_PhoneContact, msg_0660_00006); return FALSE; case 3: @@ -82,7 +82,7 @@ BOOL GearPhoneCall_DayCareLady(PokegearPhoneCallContext *ctx) { return FALSE; } BufferBoxMonNickname(ctx->msgFormat, 10, DaycareMon_GetBoxMon(Save_Daycare_GetMonX(state->miscPtr.daycare, 1))); - BufferIntegerAsString(ctx->msgFormat, 11, state->daycareMonsLevelGrowth[1], 3, PRINTING_MODE_LEFT_ALIGN, TRUE); + BufferIntegerAsString(ctx->msgFormat, 11, state->daycareMonsLevelGrowth[1], 3, PADDING_MODE_NONE, TRUE); PhoneCallMessagePrint_Ungendered(ctx, ctx->msgData_PhoneContact, msg_0660_00006); break; case 4: diff --git a/src/application/pokegear/phone/scripts/phone_scripts_kurt.c b/src/application/pokegear/phone/scripts/phone_scripts_kurt.c index 8f51181c10..55dbbe3958 100644 --- a/src/application/pokegear/phone/scripts/phone_scripts_kurt.c +++ b/src/application/pokegear/phone/scripts/phone_scripts_kurt.c @@ -42,7 +42,7 @@ BOOL GearPhoneCall_Kurt(PokegearPhoneCallContext *ctx) { msgId = msg_0643_00004; } else { BufferItemName(ctx->msgFormat, 10, ApricornBox_GetKurtBall(apricornBox)); - BufferIntegerAsString(ctx->msgFormat, 11, kurtQuantity, 2, PRINTING_MODE_LEFT_ALIGN, TRUE); + BufferIntegerAsString(ctx->msgFormat, 11, kurtQuantity, 2, PADDING_MODE_NONE, TRUE); msgId = msg_0643_00003; } PhoneCallMessagePrint_Ungendered(ctx, ctx->msgData_PhoneContact, msgId); diff --git a/src/application/pokegear/phone/scripts/phone_scripts_mother.c b/src/application/pokegear/phone/scripts/phone_scripts_mother.c index c9a1e6db0a..8921be649b 100644 --- a/src/application/pokegear/phone/scripts/phone_scripts_mother.c +++ b/src/application/pokegear/phone/scripts/phone_scripts_mother.c @@ -46,7 +46,7 @@ BOOL GearPhoneCall_Mother(PokegearPhoneCallContext *ctx) { case 0: PhoneCall_InitMsgDataAndBufferNames(ctx); state->momsSavingsBalance = PhoneCallPersistentState_MomSavings_BalanceAction(ctx->callPersistentState, MOMS_BALANCE_GET, 0); - BufferIntegerAsString(ctx->msgFormat, 10, state->momsSavingsBalance, 6, PRINTING_MODE_LEFT_ALIGN, TRUE); + BufferIntegerAsString(ctx->msgFormat, 10, state->momsSavingsBalance, 6, PADDING_MODE_NONE, TRUE); state->flag0 = Save_VarsFlags_MomsSavingsFlagCheck(ctx->saveVarsFlags); state->flag1 = PhoneCallPersistentState_MomGiftQueue_IsFull(ctx->callPersistentState); if (state->isScriptedCall == 2) { diff --git a/src/application/pokegear/phone/scripts/phone_scripts_prof_oak.c b/src/application/pokegear/phone/scripts/phone_scripts_prof_oak.c index d4d48e60b6..3749d153b2 100644 --- a/src/application/pokegear/phone/scripts/phone_scripts_prof_oak.c +++ b/src/application/pokegear/phone/scripts/phone_scripts_prof_oak.c @@ -104,8 +104,8 @@ BOOL GearPhoneCall_ProfOak(PokegearPhoneCallContext *ctx) { r7 = Pokedex_CountNationalDexSeen(state->miscPtr.pokedex); r6_2 = Pokedex_CountNationalDexOwned(state->miscPtr.pokedex); } - BufferIntegerAsString(ctx->msgFormat, 5, r7, 3, PRINTING_MODE_LEFT_ALIGN, TRUE); - BufferIntegerAsString(ctx->msgFormat, 6, r6_2, 3, PRINTING_MODE_LEFT_ALIGN, TRUE); + BufferIntegerAsString(ctx->msgFormat, 5, r7, 3, PADDING_MODE_NONE, TRUE); + BufferIntegerAsString(ctx->msgFormat, 6, r6_2, 3, PADDING_MODE_NONE, TRUE); PhoneCallMessagePrint_Ungendered(ctx, ctx->msgData_PhoneContact, msg_0666_00020); break; case 4: diff --git a/src/application/pokegear/radio/overlay_101_021F57B8.c b/src/application/pokegear/radio/overlay_101_021F57B8.c index f27c444d36..395824a040 100644 --- a/src/application/pokegear/radio/overlay_101_021F57B8.c +++ b/src/application/pokegear/radio/overlay_101_021F57B8.c @@ -80,11 +80,11 @@ RadioShow *RadioShow_Create(SaveData *saveData, u16 mapID, u16 mapHeader, BOOL i } void RadioShow_Delete(RadioShow *radioShow) { - String_Delete(radioShow->msgbufRaw); - String_Delete(radioShow->msgbufFormatted); - String_Delete(radioShow->showHost); - String_Delete(radioShow->showTitle); - String_Delete(radioShow->curLineStr); + String_Free(radioShow->msgbufRaw); + String_Free(radioShow->msgbufFormatted); + String_Free(radioShow->showHost); + String_Free(radioShow->showTitle); + String_Free(radioShow->curLineStr); MessageFormat_Delete(radioShow->msgFormat); DestroyMsgData(radioShow->msgData_269); MI_CpuClear8(radioShow, sizeof(RadioShow)); @@ -240,7 +240,7 @@ void RadioShow_PrintTitleAndHost(RadioShow *radioShow) { void PrintRadioLine(RadioShow *radioShow, String *msg, int y) { if (radioShow->statik == TRUE) { - String_RadioAddStatic(msg, 70); + String_AddRadioStatic(msg, 70); } AddTextPrinterParameterizedWithColor(radioShow->showScriptWindow, 0, msg, 0, y * 16, TEXT_SPEED_NOTRANSFER, radioShow->textColor, NULL); } @@ -249,7 +249,7 @@ BOOL RadioPrintAdvance(RadioShow *radioShow) { if (!radioShow->isSecondLine) { radioShow->isSecondLine = TRUE; } - String_GetLineN(radioShow->curLineStr, radioShow->msgbufFormatted, radioShow->curLineIdx++); + String_CopyLine(radioShow->curLineStr, radioShow->msgbufFormatted, radioShow->curLineIdx++); PrintRadioLine(radioShow, radioShow->curLineStr, 1); CopyWindowToVram(radioShow->showScriptWindow); return radioShow->curLineIdx >= radioShow->numLines; @@ -262,7 +262,7 @@ void RadioPrintInit(RadioShow *radioShow, int msgId, int textNoScroll) { radioShow->curLineIdx = 0; radioShow->numLines = String_CountLines(radioShow->msgbufFormatted); radioShow->printState = RADIO_PRINT_STATE_NULL; - String_GetLineN(radioShow->curLineStr, radioShow->msgbufFormatted, radioShow->curLineIdx++); + String_CopyLine(radioShow->curLineStr, radioShow->msgbufFormatted, radioShow->curLineIdx++); PrintRadioLine(radioShow, radioShow->curLineStr, radioShow->isSecondLine); CopyWindowToVram(radioShow->showScriptWindow); if (radioShow->curLineIdx >= radioShow->numLines) { diff --git a/src/application/pokegear/radio/shows/buenas_password.c b/src/application/pokegear/radio/shows/buenas_password.c index af842a5313..d3a0730ad9 100644 --- a/src/application/pokegear/radio/shows/buenas_password.c +++ b/src/application/pokegear/radio/shows/buenas_password.c @@ -93,7 +93,7 @@ void RadioShow_BuenasPassword_Init(RadioShow *radioShow) { setID = Save_VarsFlags_GetBuenasPasswordSet(Save_VarsFlags_Get(radioShow->saveData)) % 30; answer = NewString_ReadMsgData(bpMsgData, msg_0066_D23R0102_00040 + setID); BufferString(radioShow->msgFormat, 0, answer, 2, 1, 2); - String_Delete(answer); + String_Free(answer); DestroyMsgData(bpMsgData); } diff --git a/src/application/pokegear/radio/shows/commercials.c b/src/application/pokegear/radio/shows/commercials.c index 96f46d2e06..950e1ec6d8 100644 --- a/src/application/pokegear/radio/shows/commercials.c +++ b/src/application/pokegear/radio/shows/commercials.c @@ -128,7 +128,7 @@ void RadioShow_Commercials_Init(RadioShow *radioShow) { radioShow->showMsgData = NewMsgDataFromNarc(MSGDATA_LOAD_DIRECT, NARC_msgdata_msg, NARC_msg_msg_0412_bin, radioShow->heapID); ReadMsgDataIntoString(radioShow->showMsgData, msg_0412_00000, radioShow->showTitle); - String_SetEmpty(radioShow->showHost); + String_Clear(radioShow->showHost); MI_CpuClear8(data->commercialUnlockFlags, sizeof(data->commercialUnlockFlags)); MI_CpuClear8(data->unlockedCommercials, sizeof(data->unlockedCommercials)); diff --git a/src/application/pokegear/radio/shows/mahogany_signal.c b/src/application/pokegear/radio/shows/mahogany_signal.c index 9cf4e95bc8..032f7d191c 100644 --- a/src/application/pokegear/radio/shows/mahogany_signal.c +++ b/src/application/pokegear/radio/shows/mahogany_signal.c @@ -43,7 +43,7 @@ BOOL RadioShow_MahoganySignal_Print(RadioShow *radioShow) { void RadioShow_MahoganySignal_Init(RadioShow *radioShow) { radioShow->showMsgData = NewMsgDataFromNarc(MSGDATA_LOAD_DIRECT, NARC_msgdata_msg, NARC_msg_msg_0409_bin, radioShow->heapID); ReadMsgDataIntoString(radioShow->showMsgData, msg_0409_00000, radioShow->showTitle); - String_SetEmpty(radioShow->showHost); + String_Clear(radioShow->showHost); } void RadioShow_MahoganySignal_Unload(RadioShow *radioShow) { diff --git a/src/application/pokegear/radio/shows/poke_flute.c b/src/application/pokegear/radio/shows/poke_flute.c index 8e19968bc3..2df0eae523 100644 --- a/src/application/pokegear/radio/shows/poke_flute.c +++ b/src/application/pokegear/radio/shows/poke_flute.c @@ -41,7 +41,7 @@ BOOL RadioShow_PokeFlute_Print(RadioShow *radioShow) { void RadioShow_PokeFlute_Init(RadioShow *radioShow) { radioShow->showMsgData = NewMsgDataFromNarc(MSGDATA_LOAD_DIRECT, NARC_msgdata_msg, NARC_msg_msg_0417_bin, radioShow->heapID); ReadMsgDataIntoString(radioShow->showMsgData, msg_0417_00000, radioShow->showTitle); - String_SetEmpty(radioShow->showHost); + String_Clear(radioShow->showHost); } void RadioShow_PokeFlute_Unload(RadioShow *radioShow) { diff --git a/src/application/pokegear/radio/shows/unown.c b/src/application/pokegear/radio/shows/unown.c index 6453a68428..c37ea5f714 100644 --- a/src/application/pokegear/radio/shows/unown.c +++ b/src/application/pokegear/radio/shows/unown.c @@ -41,7 +41,7 @@ BOOL RadioShow_Unown_Print(RadioShow *radioShow) { void RadioShow_Unown_Init(RadioShow *radioShow) { radioShow->showMsgData = NewMsgDataFromNarc(MSGDATA_LOAD_DIRECT, NARC_msgdata_msg, NARC_msg_msg_0410_bin, radioShow->heapID); ReadMsgDataIntoString(radioShow->showMsgData, msg_0410_00000, radioShow->showTitle); - String_SetEmpty(radioShow->showHost); + String_Clear(radioShow->showHost); } void RadioShow_Unown_Unload(RadioShow *radioShow) { diff --git a/src/application/view_photo.c b/src/application/view_photo.c index 75e3073bb0..db3058f48d 100644 --- a/src/application/view_photo.c +++ b/src/application/view_photo.c @@ -358,10 +358,10 @@ static void ViewPhotoSysTask_InitMessages(ViewPhotoSysTaskData *viewPhoto) { static void ViewPhotoSysTask_ReleaseMessages(ViewPhotoSysTaskData *viewPhoto) { for (int i = 0; i < 2; ++i) { - String_Delete(viewPhoto->photoDescStringTemplates[i]); + String_Free(viewPhoto->photoDescStringTemplates[i]); } - String_Delete(viewPhoto->exitMsg); - String_Delete(viewPhoto->strBuf); + String_Free(viewPhoto->exitMsg); + String_Free(viewPhoto->strBuf); MessageFormat_Delete(viewPhoto->msgFormat); DestroyMsgData(viewPhoto->msgData); FontID_Release(4); @@ -423,14 +423,14 @@ static void formatPhotoFlavorText(Photo *photo, MessageFormat *msgFormat, String BufferPlayersName(msgFormat, 0, Save_PlayerData_GetProfile(saveData)); MapID_GetLandmarkName(photo->mapId, heapID, strBuf); BufferString(msgFormat, 1, strBuf, 2, 0, 2); - CopyU16ArrayToString(strBuf, photo->leadMonNick); + String_CopyFromChars(strBuf, photo->leadMonNick); BufferString(msgFormat, 2, strBuf, 2, 0, 2); u8 year = photo->date >> 24; - BufferIntegerAsString(msgFormat, 3, year + 2000, 4, PRINTING_MODE_LEADING_ZEROS, TRUE); + BufferIntegerAsString(msgFormat, 3, year + 2000, 4, PADDING_MODE_ZEROES, TRUE); u8 month = photo->date >> 16; - BufferIntegerAsString(msgFormat, 4, month, 2, PRINTING_MODE_LEADING_ZEROS, TRUE); + BufferIntegerAsString(msgFormat, 4, month, 2, PADDING_MODE_ZEROES, TRUE); u8 day = photo->date >> 8; - BufferIntegerAsString(msgFormat, 5, day, 2, PRINTING_MODE_LEADING_ZEROS, TRUE); + BufferIntegerAsString(msgFormat, 5, day, 2, PADDING_MODE_ZEROES, TRUE); } static void ViewPhotoSysTask_DrawLyr3Icon(ViewPhotoSysTaskData *viewPhoto) { diff --git a/src/application/view_rankings.c b/src/application/view_rankings.c index 2a7f8990bf..f9b04a809b 100644 --- a/src/application/view_rankings.c +++ b/src/application/view_rankings.c @@ -983,11 +983,11 @@ static void ViewRankings_CreateStrings(ViewRankingsAppData *appData) { static void ViewRankings_DeleteStrings(ViewRankingsAppData *appData) { for (int i = 0; i < VIEW_RANKINGS_MISC_STRING_MAX; ++i) { - String_Delete(appData->miscStrings[i]); + String_Free(appData->miscStrings[i]); } - String_Delete(appData->playerNameString); - String_Delete(appData->rankingString); - String_Delete(appData->formatedStrBuf); + String_Free(appData->playerNameString); + String_Free(appData->rankingString); + String_Free(appData->formatedStrBuf); MessageFormat_Delete(appData->msgFormat); DestroyMsgData(appData->msgData); } @@ -1017,7 +1017,7 @@ static void ViewRankings_PrintRecords(ViewRankingsAppData *appData) { if (cur < prev) { ++ranking; } - BufferIntegerAsString(appData->msgFormat, 0, ranking, 1, PRINTING_MODE_RIGHT_ALIGN, TRUE); + BufferIntegerAsString(appData->msgFormat, 0, ranking, 1, PADDING_MODE_SPACES, TRUE); StringExpandPlaceholders(appData->msgFormat, appData->formatedStrBuf, appData->rankingString); AddTextPrinterParameterizedWithColor(&appData->windows[VIEW_RANKINGS_APP_WINDOW_RANKING], 0, appData->formatedStrBuf, 0, 16 * y, TEXT_SPEED_NOTRANSFER, MAKE_TEXT_COLOR(1, 2, 0), NULL); @@ -1025,7 +1025,7 @@ static void ViewRankings_PrintRecords(ViewRankingsAppData *appData) { StringExpandPlaceholders(appData->msgFormat, appData->formatedStrBuf, appData->playerNameString); AddTextPrinterParameterizedWithColor(&appData->windows[VIEW_RANKINGS_APP_WINDOW_RECORDS], 0, appData->formatedStrBuf, 0, 16 * y, TEXT_SPEED_NOTRANSFER, MAKE_TEXT_COLOR(1, 2, 0), NULL); - BufferIntegerAsString(appData->msgFormat, 0, cur, pageParam->numDigits, PRINTING_MODE_RIGHT_ALIGN, TRUE); + BufferIntegerAsString(appData->msgFormat, 0, cur, pageParam->numDigits, PADDING_MODE_SPACES, TRUE); StringExpandPlaceholders(appData->msgFormat, appData->formatedStrBuf, appData->miscStrings[pageParam->msgId - msg_0421_00044]); AddTextPrinterParameterizedWithColor(&appData->windows[VIEW_RANKINGS_APP_WINDOW_RECORDS], 0, appData->formatedStrBuf, 160 - FontID_String_GetWidth(0, appData->formatedStrBuf, 0), 16 * y, TEXT_SPEED_NOTRANSFER, MAKE_TEXT_COLOR(1, 2, 0), NULL); @@ -1050,7 +1050,7 @@ static void ViewRankings_PrintDeleteRecordText(ViewRankingsAppData *appData) { FillWindowPixelBuffer(&appData->windows[VIEW_RANKINGS_APP_WINDOW_DELETE_RECORD], 0); String *string = NewString_ReadMsgData(appData->msgData, msg_0421_00040); AddTextPrinterParameterizedWithColor(&appData->windows[VIEW_RANKINGS_APP_WINDOW_DELETE_RECORD], 4, string, 0, 0, TEXT_SPEED_NOTRANSFER, MAKE_TEXT_COLOR(3, 1, 0), NULL); - String_Delete(string); + String_Free(string); CopyWindowToVram(&appData->windows[VIEW_RANKINGS_APP_WINDOW_DELETE_RECORD]); } @@ -1058,7 +1058,7 @@ static void ViewRankings_PrintReturnText(ViewRankingsAppData *appData) { FillWindowPixelBuffer(&appData->windows[VIEW_RANKINGS_APP_WINDOW_RETURN], 0); String *string = NewString_ReadMsgData(appData->msgData, msg_0421_00041); AddTextPrinterParameterizedWithColor(&appData->windows[VIEW_RANKINGS_APP_WINDOW_RETURN], 4, string, 0, 0, TEXT_SPEED_NOTRANSFER, MAKE_TEXT_COLOR(3, 1, 0), NULL); - String_Delete(string); + String_Free(string); CopyWindowToVram(&appData->windows[VIEW_RANKINGS_APP_WINDOW_RETURN]); } @@ -1074,7 +1074,7 @@ static void ViewRankings_PrintDeleteXsRecordAreYouSure(ViewRankingsAppData *appD BufferString(appData->msgFormat, 0, page->entries[entryIdx].pageEntry->playerName, 2, 1, 2); string = ReadMsgData_ExpandPlaceholders(appData->msgFormat, appData->msgData, msg_0421_00049, HEAP_ID_RANKINGS_APP); AddTextPrinterParameterizedWithColor(&appData->windows[VIEW_RANKINGS_APP_WINDOW_SELECT_RECORD_TO_DELETE], 0, string, 0, 0, TEXT_SPEED_NOTRANSFER, MAKE_TEXT_COLOR(1, 2, 0), NULL); - String_Delete(string); + String_Free(string); CopyWindowToVram(&appData->windows[VIEW_RANKINGS_APP_WINDOW_SELECT_RECORD_TO_DELETE]); } @@ -1085,7 +1085,7 @@ static void ViewRankings_PrintYourOwnRecordCantBeDeleted(ViewRankingsAppData *ap FillWindowPixelBuffer(&appData->windows[VIEW_RANKINGS_APP_WINDOW_SELECT_RECORD_TO_DELETE], 0xFF); string = NewString_ReadMsgData(appData->msgData, msg_0421_00052); AddTextPrinterParameterizedWithColor(&appData->windows[VIEW_RANKINGS_APP_WINDOW_SELECT_RECORD_TO_DELETE], 0, string, 0, 0, TEXT_SPEED_NOTRANSFER, MAKE_TEXT_COLOR(1, 2, 0), NULL); - String_Delete(string); + String_Free(string); CopyWindowToVram(&appData->windows[VIEW_RANKINGS_APP_WINDOW_SELECT_RECORD_TO_DELETE]); } @@ -1100,8 +1100,8 @@ static void ViewRankings_PrintRecordStatHeaderText(ViewRankingsAppData *appData) string2 = NewString_ReadMsgData(appData->msgData, msgNo + 1); AddTextPrinterParameterizedWithColor(&appData->windows[VIEW_RANKINGS_APP_WINDOW_HEADER], 0, string, 0, 0, TEXT_SPEED_NOTRANSFER, MAKE_TEXT_COLOR(1, 2, 0), NULL); AddTextPrinterParameterizedWithColor(&appData->windows[VIEW_RANKINGS_APP_WINDOW_HEADER], 0, string2, 0, 16, TEXT_SPEED_NOTRANSFER, MAKE_TEXT_COLOR(1, 2, 0), NULL); - String_Delete(string); - String_Delete(string2); + String_Free(string); + String_Free(string2); CopyWindowToVram(&appData->windows[VIEW_RANKINGS_APP_WINDOW_HEADER]); } @@ -1112,7 +1112,7 @@ static void ViewRankings_PrintSelectRecordToDeleteText(ViewRankingsAppData *appD FillWindowPixelBuffer(&appData->windows[VIEW_RANKINGS_APP_WINDOW_SELECT_RECORD_TO_DELETE], 0xFF); string = NewString_ReadMsgData(appData->msgData, msg_0421_00048); AddTextPrinterParameterizedWithColor(&appData->windows[VIEW_RANKINGS_APP_WINDOW_SELECT_RECORD_TO_DELETE], 0, string, 0, 0, TEXT_SPEED_NOTRANSFER, MAKE_TEXT_COLOR(1, 2, 0), NULL); - String_Delete(string); + String_Free(string); CopyWindowToVram(&appData->windows[VIEW_RANKINGS_APP_WINDOW_SELECT_RECORD_TO_DELETE]); } diff --git a/src/bag_view.c b/src/bag_view.c index 7231b4d643..03e42f28af 100644 --- a/src/bag_view.c +++ b/src/bag_view.c @@ -126,17 +126,17 @@ BOOL TryFormatRegisteredKeyItemUseMessage(SaveData *saveData, String *dest, u16 string = NewString_ReadMsgData(msgData, msg_0010_00102); // 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, msg_0010_00100); // Saved Battle Points: {STRVAR_1 53, 0, 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, msg_0010_00095); // Seals: {STRVAR_1 53, 0, 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, msg_0010_00096); // Accessories: {STRVAR_1 52, 0, 0} Backdrops: {STRVAR_1 51, 1, 0} - 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, msg_0010_00058); // Your Coins: {STRVAR_1 54, 0, 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, u16 } StringExpandPlaceholders(messageFormat, dest, string); - String_Delete(string); + String_Free(string); MessageFormat_Delete(messageFormat); DestroyMsgData(msgData); return TRUE; @@ -179,7 +179,7 @@ void GetItemUseErrorMessage(PlayerProfile *playerProfile, String *dest, u16 item String *src = NewString_ReadMsgData(msgData, msg_0040_00037); BufferPlayersName(messageFormat, 0, playerProfile); StringExpandPlaceholders(messageFormat, dest, src); - String_Delete(src); + String_Free(src); MessageFormat_Delete(messageFormat); DestroyMsgData(msgData); break; diff --git a/src/battle/battle_hp_bar.c b/src/battle/battle_hp_bar.c index 6614a925dd..5e7d63a512 100644 --- a/src/battle/battle_hp_bar.c +++ b/src/battle/battle_hp_bar.c @@ -1197,8 +1197,8 @@ static void ov12_0226516C(BattleHpBar *hpBar) { MI_CpuCopy16(pixelBuffer2 + ov12_0226D680[hpBar->type][1].size, (void *)((u32)vramAddr + ov12_0226D680[hpBar->type][3].offset + imgProxy->vramLocation.baseAddrOfVram[NNS_G2D_VRAM_TYPE_2DMAIN]), ov12_0226D680[hpBar->type][3].size); } RemoveWindow(&window); - String_Delete(string); - String_Delete(string2); + String_Free(string); + String_Free(string2); } static void ov12_022652D0(BattleHpBar *hpBar) { @@ -1227,7 +1227,7 @@ static void ov12_02265354(BattleHpBar *hpBar) { u8 *r4 = Heap_Alloc(HEAP_ID_BATTLE, 0x60); u8 *r7 = Heap_Alloc(HEAP_ID_BATTLE, 0xC0); MI_CpuFill8(r4, 0xFF, 0x60); - sub_0200CEB0(BattleSystem_GetLevelNumPrinter(hpBar->battleSystem), hpBar->level, 3, PRINTING_MODE_LEFT_ALIGN, (void *)r4); + sub_0200CEB0(BattleSystem_GetLevelNumPrinter(hpBar->battleSystem), hpBar->level, 3, PADDING_MODE_NONE, (void *)r4); NNSG2dImageProxy *imgProxy = Sprite_GetImageProxy(hpBar->boxObj->sprite); void *vramAddr = G2_GetOBJCharPtr(); MI_CpuCopy16((void *)((u32)vramAddr + ov12_0226D420[hpBar->type][0].offset + imgProxy->vramLocation.baseAddrOfVram[NNS_G2D_VRAM_TYPE_2DMAIN]), r7, ov12_0226D420[hpBar->type][0].size); @@ -1252,7 +1252,7 @@ static void ov12_02265354(BattleHpBar *hpBar) { static void ov12_02265474(BattleHpBar *hpBar, u32 num) { u8 *r4 = Heap_Alloc(HEAP_ID_BATTLE, 0x60); MI_CpuFill8(r4, 0xFF, 0x60); - sub_0200CEB0(BattleSystem_GetHpNumPrinter(hpBar->battleSystem), num, 3, PRINTING_MODE_RIGHT_ALIGN, (void *)r4); + sub_0200CEB0(BattleSystem_GetHpNumPrinter(hpBar->battleSystem), num, 3, PADDING_MODE_SPACES, (void *)r4); NNSG2dImageProxy *imgProxy = Sprite_GetImageProxy(hpBar->boxObj->sprite); void *vramAddr = G2_GetOBJCharPtr(); @@ -1264,7 +1264,7 @@ static void ov12_02265474(BattleHpBar *hpBar, u32 num) { static void ov12_02265500(BattleHpBar *hpBar) { u8 *r4 = Heap_Alloc(HEAP_ID_BATTLE, 0x60); MI_CpuFill8(r4, 0xFF, 0x60); - sub_0200CEB0(BattleSystem_GetHpNumPrinter(hpBar->battleSystem), hpBar->maxHp, 3, PRINTING_MODE_LEFT_ALIGN, (void *)r4); + sub_0200CEB0(BattleSystem_GetHpNumPrinter(hpBar->battleSystem), hpBar->maxHp, 3, PADDING_MODE_NONE, (void *)r4); NNSG2dImageProxy *imgProxy = Sprite_GetImageProxy(hpBar->boxObj->sprite); void *vramAddr = G2_GetOBJCharPtr(); @@ -1329,7 +1329,7 @@ static void BattleHpBar_PrintSafariOrParkBallsString(BattleHpBar *hpBar, u32 fla } RemoveWindow(&window); - String_Delete(string); + String_Free(string); } static void BattleHpBar_PrintNumRemainingSafariOrParkBalls(BattleHpBar *hpBar, u32 flag) { @@ -1352,7 +1352,7 @@ static void BattleHpBar_PrintNumRemainingSafariOrParkBalls(BattleHpBar *hpBar, u } else { string2 = NewString_ReadMsgData(msgData, msg_0197_01221); // Left: $1 } - BufferIntegerAsString(msgFormat, 0, hpBar->unk27, 2, PRINTING_MODE_RIGHT_ALIGN, TRUE); + BufferIntegerAsString(msgFormat, 0, hpBar->unk27, 2, PADDING_MODE_SPACES, TRUE); StringExpandPlaceholders(msgFormat, string, string2); AddTextWindowTopLeftCorner(bgConfig, &window, 13, 2, 0, 15); AddTextPrinterParameterizedWithColorAndSpacing(&window, 0, string, 0, 0, TEXT_SPEED_NOTRANSFER, MAKE_TEXT_COLOR(14, 2, 15), 0, 0, NULL); @@ -1374,8 +1374,8 @@ static void BattleHpBar_PrintNumRemainingSafariOrParkBalls(BattleHpBar *hpBar, u } RemoveWindow(&window); - String_Delete(string); - String_Delete(string2); + String_Free(string); + String_Free(string2); } static int ov12_022657E4(BattleHpBar *hpBar, BOOL isExp) { diff --git a/src/battle/battle_input.c b/src/battle/battle_input.c index 7f98aaa9b2..ab12c47b94 100644 --- a/src/battle/battle_input.c +++ b/src/battle/battle_input.c @@ -1877,10 +1877,10 @@ static void BattleInput_CreateMainMenuObjects(BattleInput *battleInput, int a1, BattleInput_CreateTextObject(battleInput, &battleInput->textObj[MENUTXT_POKEMON], strPokemon, 4, MAKE_TEXT_COLOR(7, 8, 9), 2, 20023, 216, 168, 1, NULL); BattleInput_CreateTextObject(battleInput, &battleInput->textObj[MENUTXT_RUN], strRun, 4, MAKE_TEXT_COLOR(10, 11, 12), 2, 20023, 128, 176, 1, NULL); - String_Delete(strFight); - String_Delete(strBag); - String_Delete(strPokemon); - String_Delete(strRun); + String_Free(strFight); + String_Free(strBag); + String_Free(strPokemon); + String_Free(strRun); if ((BattleSystem_GetBattleType(battleInput->battleSystem) & (BATTLE_TYPE_SAFARI | BATTLE_TYPE_PAL_PARK)) == 0) { Pokemon *pokemon = BattleSystem_GetPartyMon(battleInput->battleSystem, menu->battlerId, menu->selectedMon); @@ -1931,25 +1931,25 @@ static void BattleInput_CreateMainMenuObjects(BattleInput *battleInput, int a1, if (strMonGender != NULL) { BattleInput_CreateTextObject(battleInput, &battleInput->textObj[MENUTXT_BUG_GENDER], strMonGender, 0, genderColor, 3, 20023, 136, 0x10, 0, 0); - String_Delete(strMonGender); + String_Free(strMonGender); } int level = GetMonData(caughtMon, MON_DATA_LEVEL, NULL); - BufferIntegerAsString(format, 1, level, 3, PRINTING_MODE_LEFT_ALIGN, 1); + BufferIntegerAsString(format, 1, level, 3, PADDING_MODE_NONE, 1); String *strMonLevel = NewString_ReadMsgData(msgLoader, msg_0197_01274); StringExpandPlaceholders(format, strFormated, strMonLevel); BattleInput_CreateTextObject(battleInput, &battleInput->textObj[MENUTXT_BUG_LEVEL], strFormated, 0, 0x90800, 3, 20023, 144, 0x10, 0, 0); - String_Delete(strMonLevel); + String_Free(strMonLevel); BattleInput_SetBugContestPokemonIcon(battleInput, caughtMon); } } int ballsRemaining = BattleSystem_GetSafariBallCount(battleInput->battleSystem); - BufferIntegerAsString(format, 0, ballsRemaining, 2, PRINTING_MODE_LEFT_ALIGN, 1); + BufferIntegerAsString(format, 0, ballsRemaining, 2, PADDING_MODE_NONE, 1); String *strBallsRemaining = NewString_ReadMsgData(msgLoader, msg_0197_01271); StringExpandPlaceholders(format, strFormated, strBallsRemaining); BattleInput_CreateTextObject(battleInput, &battleInput->textObj[6], strFormated, 0, 0x90800, 3, 20023, 224, 0x10, 0, 0); - String_Delete(strBallsRemaining); + String_Free(strBallsRemaining); BattleInput_CreateBugContestGraphics(battleInput); - String_Delete(strFormated); + String_Free(strFormated); } } } @@ -2028,7 +2028,7 @@ static void BattleInput_CreateFightMenuObjects(BattleInput *battleInput, int par String *strCancel = NewString_ReadMsgData(msgLoader, msg_0197_00929); // CANCEL BattleInput_CreateTextObject(battleInput, &battleInput->textObj[MENUTXT_CANCEL], strCancel, 4, MAKE_TEXT_COLOR(10, 11, 12), 2, 20023, 128, 175, 1, NULL); - String_Delete(strCancel); + String_Free(strCancel); int moveType; @@ -2077,8 +2077,8 @@ static void BattleInput_CreateYesNoMenuObjects(BattleInput *battleInput, int par BattleInput_CreateTextObject(battleInput, &battleInput->textObj[MENUTXT_YES], strYes, 4, MAKE_TEXT_COLOR(1, 2, 3), 2, 20023, 128, 67, 1, NULL); BattleInput_CreateTextObject(battleInput, &battleInput->textObj[MENUTXT_NO], strNo, 4, MAKE_TEXT_COLOR(10, 11, 12), 2, 20023, 128, 139, 1, NULL); - String_Delete(strYes); - String_Delete(strNo); + String_Free(strYes); + String_Free(strNo); } static void BattleInput_CreateKeepForgetMenuObjects(BattleInput *battleInput, int param1, int param2) { @@ -2089,8 +2089,8 @@ static void BattleInput_CreateKeepForgetMenuObjects(BattleInput *battleInput, in BattleInput_CreateTextObject(battleInput, &battleInput->textObj[MENUTXT_FORGET_MOVE], strForget, 4, MAKE_TEXT_COLOR(1, 2, 3), 2, 20023, 128, 67, 1, NULL); BattleInput_CreateTextObject(battleInput, &battleInput->textObj[MENUTXT_KEEP_MOVE], strKeep, 4, MAKE_TEXT_COLOR(10, 11, 12), 2, 20023, 128, 139, 1, NULL); - String_Delete(strForget); - String_Delete(strKeep); + String_Free(strForget); + String_Free(strKeep); } static void BattleInput_CreateGiveUpOnMoveMenuObjects(BattleInput *battleInput, int param1, int param2) { @@ -2109,10 +2109,10 @@ static void BattleInput_CreateGiveUpOnMoveMenuObjects(BattleInput *battleInput, BattleInput_CreateTextObject(battleInput, &battleInput->textObj[MENUTXT_GIVEUP], strGiveUpFormated, 4, MAKE_TEXT_COLOR(1, 2, 3), 2, 20023, 128, 67, 1, NULL); BattleInput_CreateTextObject(battleInput, &battleInput->textObj[MENUTXT_DONT_GIVEUP], strDontGiveUpFormated, 4, MAKE_TEXT_COLOR(10, 11, 12), 2, 20023, 128, 139, 1, NULL); - String_Delete(strGiveUp); - String_Delete(strDontGiveUp); - String_Delete(strGiveUpFormated); - String_Delete(strDontGiveUpFormated); + String_Free(strGiveUp); + String_Free(strDontGiveUp); + String_Free(strGiveUpFormated); + String_Free(strDontGiveUpFormated); } static void BattleInput_CreateVSRecorderPlaybackMenuObjects(BattleInput *battleInput, int param1, int param2) { @@ -2138,7 +2138,7 @@ static void BattleInput_CreateVSRecorderPlaybackMenuObjects(BattleInput *battleI ScheduleBgTilemapBufferTransfer(bgConfig, 5); BattleInput_CreateTextObject(battleInput, &battleInput->textObj[0], strStop, 4, MAKE_TEXT_COLOR(1, 2, 3), 2, 20023, 128, 171, 1, NULL); - String_Delete(strStop); + String_Free(strStop); } static void BattleInput_CreateSwitchOrFleeMenuObjects(BattleInput *battleInput, int param1, int param2) { @@ -2157,10 +2157,10 @@ static void BattleInput_CreateSwitchOrFleeMenuObjects(BattleInput *battleInput, BattleInput_CreateTextObject(battleInput, &battleInput->textObj[MENUTXT_USE_NEXT_MON], strNextPokemonFormated, 4, MAKE_TEXT_COLOR(1, 2, 3), 2, 20023, 128, 67, 1, NULL); BattleInput_CreateTextObject(battleInput, &battleInput->textObj[MENUTXT_FLEE], strFleeFormated, 4, MAKE_TEXT_COLOR(10, 11, 12), 2, 20023, 128, 139, 1, NULL); - String_Delete(strNextPokemon); - String_Delete(strFlee); - String_Delete(strNextPokemonFormated); - String_Delete(strFleeFormated); + String_Free(strNextPokemon); + String_Free(strFlee); + String_Free(strNextPokemonFormated); + String_Free(strFleeFormated); } static void BattleInput_CreateSwitchOrKeepMenuObjects(BattleInput *battleInput, int param1, int param2) { @@ -2184,10 +2184,10 @@ static void BattleInput_CreateSwitchOrKeepMenuObjects(BattleInput *battleInput, BattleInput_CreateTextObject(battleInput, &battleInput->textObj[MENUTXT_SWITCH], strSwitchPokemonFormated, 4, MAKE_TEXT_COLOR(1, 2, 3), 2, 20023, 128, 67, 1, NULL); BattleInput_CreateTextObject(battleInput, &battleInput->textObj[MENUTXT_KEEP_BATTLING], strKeepBattlingFormated, 4, MAKE_TEXT_COLOR(10, 11, 12), 2, 20023, 128, 139, 1, NULL); - String_Delete(strSwitchPokemon); - String_Delete(strKeepBattling); - String_Delete(strSwitchPokemonFormated); - String_Delete(strKeepBattlingFormated); + String_Free(strSwitchPokemon); + String_Free(strKeepBattling); + String_Free(strSwitchPokemonFormated); + String_Free(strKeepBattlingFormated); } static void BattleInput_CreateTargetMenuObjects(BattleInput *battleInput, int param1, int param2) { @@ -2245,7 +2245,7 @@ static void BattleInput_CreateTargetMenuObjects(BattleInput *battleInput, int pa } BattleInput_CreateTextObject(battleInput, &battleInput->textObj[i], strPokemonName, 4, monNameColor, 6, 20023, sTargetPokemonMenuPositions[i][0], sTargetPokemonMenuPositions[i][1], 1, NULL); - String_Delete(strGenderMarker); + String_Free(strGenderMarker); switch (i) { case 1: @@ -2262,11 +2262,11 @@ static void BattleInput_CreateTargetMenuObjects(BattleInput *battleInput, int pa } } - String_Delete(strPokemonName); + String_Free(strPokemonName); String *strCancel = NewString_ReadMsgData(msgLoader, msg_0197_00930); // CANCEL BattleInput_CreateTextObject(battleInput, &battleInput->textObj[MENUTXT_TARGET_CANCEL], strCancel, 4, MAKE_TEXT_COLOR(10, 11, 12), 2, 20023, sTargetPokemonMenuPositions[MENUTXT_TARGET_CANCEL][0], sTargetPokemonMenuPositions[MENUTXT_TARGET_CANCEL][1], 1, NULL); - String_Delete(strCancel); + String_Free(strCancel); } static int BattleInput_TouchCallback_MainMenu(BattleInput *battleInput, int touchInput, int unused) { @@ -2874,12 +2874,12 @@ void BattleInput_LoadFightMenuText(BattleInput *battleInput, int battlerId, cons if ((moveDisplayObj->moveDisplay[i].window.pixelBuffer == NULL) || ((moveMemory->moveNo[i] != moveDisplayObj->move.moveNo[i]) && (moveMemory->moveNo[i] != 0))) { strMoveName = GetMoveName(moveMemory->moveNo[i], HEAP_ID_BATTLE); BattleInput_SetMoveDisplayObjectTextFont(battleInput, strMoveName, 4, &moveDisplayObj->moveDisplay[i], MAKE_TEXT_COLOR(7, 8, 9)); - String_Delete(strMoveName); + String_Free(strMoveName); } if ((moveDisplayObj->ppDisplay[i].window.pixelBuffer == NULL) || (moveDisplayObj->ppMaxDisplay[i].window.pixelBuffer == NULL) || (moveMemory->moveNo[i] != 0) || (moveMemory->moveNo[i] != moveDisplayObj->move.moveNo[i]) || (moveMemory->pp[i] != moveDisplayObj->move.pp[i]) || (moveMemory->ppMax[i] != moveDisplayObj->move.ppMax[i])) { - BufferIntegerAsString(messageFormat, 0, moveMemory->pp[i], 2, PRINTING_MODE_RIGHT_ALIGN, 0); - BufferIntegerAsString(messageFormat, 1, moveMemory->ppMax[i], 2, PRINTING_MODE_RIGHT_ALIGN, 0); + BufferIntegerAsString(messageFormat, 0, moveMemory->pp[i], 2, PADDING_MODE_SPACES, 0); + BufferIntegerAsString(messageFormat, 1, moveMemory->ppMax[i], 2, PADDING_MODE_SPACES, 0); StringExpandPlaceholders(messageFormat, strSlashFormatted, strSlash); ppColor = GetPPTextColor(moveMemory->pp[i], moveMemory->ppMax[i]); @@ -2894,9 +2894,9 @@ void BattleInput_LoadFightMenuText(BattleInput *battleInput, int battlerId, cons } } - String_Delete(strPP); - String_Delete(strSlash); - String_Delete(strSlashFormatted); + String_Free(strPP); + String_Free(strSlash); + String_Free(strSlashFormatted); moveDisplayObj->move = *moveMemory; } @@ -4500,7 +4500,7 @@ void BattleInput_PrintSystemMessage(BattleInput *battleInput, int index) { src = NewString_ReadMsgData(msgLoader, stopMsgId[index][i]); BattleInput_CreateTextObject(battleInput, &battleInput->textObj[1 + i], src, 0, MAKE_TEXT_COLOR(1, 2, 0), 4, 20023, 1 * 8 + 8, 6 * 8 + 16 + 16 * i, 0, NULL); - String_Delete(src); + String_Free(src); } } diff --git a/src/battle/battle_setup.c b/src/battle/battle_setup.c index d2e7a3be5f..7bc7054cd8 100644 --- a/src/battle/battle_setup.c +++ b/src/battle/battle_setup.c @@ -112,8 +112,8 @@ BattleSetup *BattleSetup_New_Tutorial(enum HeapID heapID, FieldSystem *fieldSyst { String *name = String_New(PLAYER_NAME_LENGTH + 1, heapID); ReadMsgDataIntoString(msgData, PlayerProfile_GetTrainerGender(profile) ^ 1, name); - Save_Profile_PlayerName_Set(setup->profile[BATTLER_PLAYER], String_cstr(name)); - String_Delete(name); + Save_Profile_PlayerName_Set(setup->profile[BATTLER_PLAYER], String_GetChars(name)); + String_Free(name); } DestroyMsgData(msgData); } diff --git a/src/battle/battle_system.c b/src/battle/battle_system.c index f2d8382adc..a8e3df1b35 100644 --- a/src/battle/battle_system.c +++ b/src/battle/battle_system.c @@ -1376,7 +1376,7 @@ u8 BattleSystem_PrintTrainerMessage(BattleSystem *battleSystem, int trainerId, i FillWindowPixelBuffer(window, 0xFF); String_Copy(battleSystem->msgBuffer, msg); index = AddTextPrinterParameterized(window, 1, battleSystem->msgBuffer, 0, 0, delay, ov12_0223CF14); - String_Delete(msg); + String_Free(msg); } else { MsgData *data; String *msg; @@ -1407,7 +1407,7 @@ u8 BattleSystem_PrintTrainerMessage(BattleSystem *battleSystem, int trainerId, i FillWindowPixelBuffer(window, 0xFF); String_Copy(battleSystem->msgBuffer, msg); index = AddTextPrinterParameterized(window, 1, battleSystem->msgBuffer, 0, 0, delay, ov12_0223CF14); - String_Delete(msg); + String_Free(msg); DestroyMsgData(data); } } else { @@ -1872,14 +1872,14 @@ static void BattleMessage_BufferItem(BattleSystem *battleSystem, int bufferIndex } static void BattleMessage_BufferNumber(BattleSystem *battleSystem, int bufferIndex, int param) { - BufferIntegerAsString(battleSystem->msgFormat, bufferIndex, param, 5, PRINTING_MODE_LEFT_ALIGN, TRUE); + BufferIntegerAsString(battleSystem->msgFormat, bufferIndex, param, 5, PADDING_MODE_NONE, TRUE); } static void BattleMessage_BufferNumbers(BattleSystem *battleSystem, int bufferIndex, int param, int numDigits) { if (numDigits) { - BufferIntegerAsString(battleSystem->msgFormat, bufferIndex, param, numDigits, PRINTING_MODE_RIGHT_ALIGN, TRUE); + BufferIntegerAsString(battleSystem->msgFormat, bufferIndex, param, numDigits, PADDING_MODE_SPACES, TRUE); } else { - BufferIntegerAsString(battleSystem->msgFormat, bufferIndex, param, 5, PRINTING_MODE_RIGHT_ALIGN, TRUE); + BufferIntegerAsString(battleSystem->msgFormat, bufferIndex, param, 5, PADDING_MODE_SPACES, TRUE); } } @@ -1929,7 +1929,7 @@ static void BattleMessage_BufferBoxName(BattleSystem *battleSystem, int bufferIn static void BattleMessage_ExpandPlaceholders(BattleSystem *battleSystem, MsgData *data, BattleMessage *msg) { String *str = NewString_ReadMsgData(data, msg->id); StringExpandPlaceholders(battleSystem->msgFormat, battleSystem->msgBuffer, str); - String_Delete(str); + String_Free(str); } static BOOL ov12_0223CF14(struct TextPrinterTemplate *template, u16 glyphId) { diff --git a/src/battle/overlay_12_0224E4FC.c b/src/battle/overlay_12_0224E4FC.c index 29bbd2ddca..bf4989a126 100644 --- a/src/battle/overlay_12_0224E4FC.c +++ b/src/battle/overlay_12_0224E4FC.c @@ -363,7 +363,7 @@ int GetBattlerVar(BattleContext *ctx, int battlerId, u32 id, void *data) { } } break; case BMON_DATA_NICKNAME_STRBUF: - CopyU16ArrayToString((String *)data, mon->nickname); + String_CopyFromChars((String *)data, mon->nickname); break; case BMON_DATA_HP: return mon->hp; diff --git a/src/battle_arcade_game_board.c b/src/battle_arcade_game_board.c index 27d0820e96..09af1d07e0 100644 --- a/src/battle_arcade_game_board.c +++ b/src/battle_arcade_game_board.c @@ -532,11 +532,11 @@ static void BattleArcadeGameBoard_Delete(GAME_BOARD_WORK *work) { DestroyMsgData(work->msgData); MessageFormat_Delete(work->msgFmt); - String_Delete(work->unk70); - String_Delete(work->unk74); + String_Free(work->unk70); + String_Free(work->unk74); for (i = 0; i < 2; i++) { - String_Delete(work->unk78[i]); + String_Free(work->unk78[i]); } ov84_0223F8E4(work->window); diff --git a/src/berry_pots_app.c b/src/berry_pots_app.c index fad870dbd9..d4fe2fa7c4 100644 --- a/src/berry_pots_app.c +++ b/src/berry_pots_app.c @@ -1141,10 +1141,10 @@ static void BerryPotsApp_SetupText(BerryPotsAppData *data) { static void BerryPotsApp_FreeText(BerryPotsAppData *data) { for (int i = 0; i < (int)NELEMS(data->statusStrings); i++) { - String_Delete(data->statusStrings[i]); + String_Free(data->statusStrings[i]); } - String_Delete(data->cancelString); - String_Delete(data->currentStatusString); + String_Free(data->cancelString); + String_Free(data->currentStatusString); MessageFormat_Delete(data->msgFmt); DestroyMsgData(data->msgData); diff --git a/src/berry_pots_app_tasks.c b/src/berry_pots_app_tasks.c index 22b06bdac0..bb9b7d8159 100644 --- a/src/berry_pots_app_tasks.c +++ b/src/berry_pots_app_tasks.c @@ -124,7 +124,7 @@ void ov17_022036FC(BerryPotsAppData *data, enum BerryPotsApp_022036FC_Action act break; case BERRY_POTS_APP_022036FC_ACTION_10: case BERRY_POTS_APP_022036FC_ACTION_14: - BufferIntegerAsString(data->msgFmt, 1, unk->quantityOrYieldMaybe, 2, PRINTING_MODE_LEFT_ALIGN, 0); + BufferIntegerAsString(data->msgFmt, 1, unk->quantityOrYieldMaybe, 2, PADDING_MODE_NONE, 0); // fallthrough case BERRY_POTS_APP_022036FC_ACTION_6: case BERRY_POTS_APP_022036FC_ACTION_7: @@ -135,7 +135,7 @@ void ov17_022036FC(BerryPotsAppData *data, enum BerryPotsApp_022036FC_Action act case BERRY_POTS_APP_022036FC_ACTION_16: { String *berryName = GetNutName(unk->berryId, data->heapID); BufferString(data->msgFmt, 0, berryName, 0, 0, 2); - String_Delete(berryName); + String_Free(berryName); break; } default: diff --git a/src/blackout.c b/src/blackout.c index febfbc7bd1..372325135e 100644 --- a/src/blackout.c +++ b/src/blackout.c @@ -172,8 +172,8 @@ static void Blackout_PrintMessage(BlackoutScreenEnvironment *environment, s32 ms AddTextPrinterParameterizedWithColor(&environment->window, 0, finStr, x, y, TEXT_SPEED_NOTRANSFER, MAKE_TEXT_COLOR(1, 2, 0), NULL); - String_Delete(tmpStr); - String_Delete(finStr); + String_Free(tmpStr); + String_Free(finStr); } enum { diff --git a/src/certificates_app.c b/src/certificates_app.c index bc098b080c..eaf078a53b 100644 --- a/src/certificates_app.c +++ b/src/certificates_app.c @@ -540,7 +540,7 @@ static void ov78_021E6068(CertificatesApp_Data *data) { StringExpandPlaceholders(data->msgFmt, string, tempString); AddTextPrinterParameterizedWithColor(&data->window1, 0, string, x1, y1, TEXT_SPEED_INSTANT, MAKE_TEXT_COLOR(1, 2, 0), NULL); AddTextPrinterParameterizedWithColor(&data->window2, 0, string, x1, y1, TEXT_SPEED_INSTANT, MAKE_TEXT_COLOR(1, 2, 0), NULL); - String_Delete(tempString); + String_Free(tempString); u32 msgNum; if (data->certificateId == CERTIFICATE_JOHTO_DEX) { @@ -560,7 +560,7 @@ static void ov78_021E6068(CertificatesApp_Data *data) { AddTextPrinterParameterizedWithColor(&data->window2, 0, string, 138, 144, TEXT_SPEED_INSTANT, MAKE_TEXT_COLOR(1, 2, 0), NULL); } - String_Delete(string); + String_Free(string); } static ManagedSprite *ov78_021E61C4(SpriteSystem *renderer, SpriteManager *gfxHandler, s16 x, s16 y, u8 animation, u8 spritePriority) { diff --git a/src/choose_starter_app.c b/src/choose_starter_app.c index eb2582ad5a..6893c92101 100644 --- a/src/choose_starter_app.c +++ b/src/choose_starter_app.c @@ -348,7 +348,7 @@ BOOL ChooseStarter_Main(OverlayManager *ovy, int *state) { if (TextPrinterCheckActive(work->subPrinterId)) { break; } - String_Delete(work->strbuf); + String_Free(work->strbuf); work->strbuf = NULL; *state = CHOOSE_STARTER_STATE_HANDLE_INPUT; break; @@ -371,7 +371,7 @@ BOOL ChooseStarter_Main(OverlayManager *ovy, int *state) { { String *baseTrans = NULL; printMsgOnWinEx(work->winTop, work->heapID, FALSE, NARC_msg_msg_0190_bin, msg_0190_00004 + work->curSelection, MAKE_TEXT_COLOR(1, 2, 15), 0, &baseTrans); - String_Delete(baseTrans); + String_Free(baseTrans); } PlayCry(sSpecies[work->curSelection], FALSE); printMsgOnBottom(work, msg_0190_00007); @@ -425,7 +425,7 @@ BOOL ChooseStarter_Main(OverlayManager *ovy, int *state) { { String *sp10 = NULL; printMsgOnWinEx(work->winTop, work->heapID, FALSE, NARC_msg_msg_0190_bin, msg_0190_00004 + work->curSelection, MAKE_TEXT_COLOR(1, 2, 15), 0, &sp10); - String_Delete(sp10); + String_Free(sp10); } PlayCry(sSpecies[work->curSelection], 0); if (work->state != SELECT_STATE_INSPECT) { @@ -1060,7 +1060,7 @@ static u8 printMsgOnWinEx(Window *window, enum HeapID heapID, BOOL makeFrame, s3 static void printMsgOnBottom(struct ChooseStarterAppWork *work, int msgId) { String *string = NULL; printMsgOnWinEx(work->winBottom, work->heapID, FALSE, NARC_msg_msg_0190_bin, msgId, MAKE_TEXT_COLOR(1, 2, 0), 0, &string); - String_Delete(string); + String_Free(string); } static void freeWindow(Window *window) { diff --git a/src/communication_error.c b/src/communication_error.c index dc13b7dc54..c8da8e156e 100644 --- a/src/communication_error.c +++ b/src/communication_error.c @@ -11,7 +11,7 @@ #include "gf_gfx_planes.h" #include "msgdata.h" #include "overlay_00_thumb.h" -#include "pm_string.h" +#include "string_gf.h" #include "render_window.h" #include "system.h" #include "text.h" @@ -172,11 +172,11 @@ void ShowCommunicationError(enum HeapID heapID, u32 error, u32 errorCode) { FillWindowPixelRect(&window, 0xF, 0, 0, 208, 144); DrawFrameAndWindow1(&window, FALSE, 0x1F7, 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/src/credits/credits.c b/src/credits/credits.c index 1b91108473..a96be0bf2d 100644 --- a/src/credits/credits.c +++ b/src/credits/credits.c @@ -279,7 +279,7 @@ BOOL Credits_Exit(OverlayManager *man, int *state) { PageWork *ptr = &work->pageWork; RemoveWindow(&ptr->window); DestroyMsgData(ptr->msgData); - String_Delete(ptr->string); + String_Free(ptr->string); FreeBG(work); for (u8 i = 0; i < 6; i++) { Heap_Free(work->unk468[i]); diff --git a/src/easy_chat.c b/src/easy_chat.c index 81851cfa9b..8cd66759cd 100644 --- a/src/easy_chat.c +++ b/src/easy_chat.c @@ -132,7 +132,7 @@ void GetECWordIntoStringByIndex(u16 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/src/error_message_reset.c b/src/error_message_reset.c index 6b368a79c4..423a685d63 100644 --- a/src/error_message_reset.c +++ b/src/error_message_reset.c @@ -15,7 +15,7 @@ #include "gf_gfx_planes.h" #include "main.h" #include "msgdata.h" -#include "pm_string.h" +#include "string_gf.h" #include "render_window.h" #include "system.h" #include "text.h" @@ -141,7 +141,7 @@ void PrintErrorMessageAndReset(void) { ReadMsgDataIntoString(error_msgdata, msg_0041_00003, error_str); AddTextPrinterParameterized(&window, 0, error_str, 0, 0, 0, NULL); - String_Delete(error_str); + String_Free(error_str); GfGfx_BothDispOn(); SetMasterBrightnessNeutral(PM_LCD_TOP); diff --git a/src/field/draw_map_name.c b/src/field/draw_map_name.c index 81065936bc..c992a35209 100644 --- a/src/field/draw_map_name.c +++ b/src/field/draw_map_name.c @@ -142,7 +142,7 @@ FieldDrawMapNameInfo *FieldDrawMapNameInfo_Create(BgConfig *bgConfig) { void FieldDrawMapNameInfo_Destroy(FieldDrawMapNameInfo *info) { DestroyMsgData(info->mapsecMsgData); RemoveWindow(&info->window); - String_Delete(info->mapNameString); + String_Free(info->mapNameString); Heap_Free(info); } diff --git a/src/field/scrcmd_message.c b/src/field/scrcmd_message.c index ea247a04b4..99c899f922 100644 --- a/src/field/scrcmd_message.c +++ b/src/field/scrcmd_message.c @@ -9,7 +9,7 @@ #include "message_format.h" #include "msgdata.h" #include "overlay_01.h" -#include "pm_string.h" +#include "string_gf.h" #include "scrcmd.h" #include "script.h" #include "text.h" @@ -297,7 +297,7 @@ static void ovFieldMain_GetFormattedECMessage(MessageBox *messageBox, u16 messag MailMsg_SetFieldI(&mailMessage, 1, word2); String *string = MailMsg_GetExpandedString(&mailMessage, HEAP_ID_FIELD3); String_Copy(messageBox->message, string); - String_Delete(string); + String_Free(string); } static void ov01_021EF758(MessageBox *messageBox, FontID fontId, u32 textFrameDelay, BOOL canABSpeedUp, u32 a4) { diff --git a/src/field/scrcmd_pokemon_misc.c b/src/field/scrcmd_pokemon_misc.c index 395eac8d4d..bed1dc2439 100644 --- a/src/field/scrcmd_pokemon_misc.c +++ b/src/field/scrcmd_pokemon_misc.c @@ -262,7 +262,7 @@ static void ov01_02200EC8(SCR_648_STRUCT *unkPtr, int strNo, u16 a2, u32 a3) { ReadMsgDataIntoString(unkPtr->msgdata, strNo, str); StringExpandPlaceholders(unkPtr->msgfmt, unkPtr->stringArr_1C[unkPtr->totalItems], str); unkPtr->items[unkPtr->totalItems].text = unkPtr->stringArr_1C[unkPtr->totalItems]; - String_Delete(str); + String_Free(str); if (a3 == 0xfa) { unkPtr->items[unkPtr->totalItems].value = -3; } else { @@ -353,7 +353,7 @@ static void ov01_0220116C(SCR_648_STRUCT *unkPtr) { RemoveWindow(&unkPtr->window_8); for (i = 0; i < 0x78; i++) { - String_Delete(unkPtr->stringArr_1C[i]); + String_Free(unkPtr->stringArr_1C[i]); } if (((u32)(unkPtr->unk_207 << 0x1e) >> 0x1f) == 1) { @@ -925,9 +925,9 @@ BOOL ScrCmd_741(ScriptContext *ctx) { *price = 5000; } - BufferIntegerAsString(*msgfmt, 2, *price, 4, PRINTING_MODE_LEFT_ALIGN, 1); - BufferIntegerAsString(*msgfmt, 3, unkVar, 3, PRINTING_MODE_LEFT_ALIGN, 1); // richness..? - BufferIntegerAsString(*msgfmt, 4, unkOut.unk2, 3, PRINTING_MODE_LEFT_ALIGN, 1); // smoothness..? + BufferIntegerAsString(*msgfmt, 2, *price, 4, PADDING_MODE_NONE, 1); + BufferIntegerAsString(*msgfmt, 3, unkVar, 3, PADDING_MODE_NONE, 1); // richness..? + BufferIntegerAsString(*msgfmt, 4, unkOut.unk2, 3, PADDING_MODE_NONE, 1); // smoothness..? *unkPtrC = unkOut.unk0; @@ -1538,7 +1538,7 @@ BOOL ScrCmd_BugContestGetTimeLeft(ScriptContext *ctx) { timeLeft = 20 - bugContest->elapsed_time; } - BufferIntegerAsString(*msgfmt, script_index, timeLeft, 2, PRINTING_MODE_LEFT_ALIGN, 1); + BufferIntegerAsString(*msgfmt, script_index, timeLeft, 2, PADDING_MODE_NONE, 1); return FALSE; } diff --git a/src/field_use_item.c b/src/field_use_item.c index 2a1d2bf45e..e27f3e597e 100644 --- a/src/field_use_item.c +++ b/src/field_use_item.c @@ -519,7 +519,7 @@ static BOOL Task_PrintRegisteredKeyItemUseMessage(TaskManager *taskManager) { case 2: MapObjectManager_UnpauseAllMovement(fieldSystem->mapObjectManager); RemoveWindow(&env->window); - String_Delete(env->strbuf); + String_Free(env->strbuf); Heap_Free(env); return TRUE; } diff --git a/src/fieldmap.c b/src/fieldmap.c index e76b9c5844..7b53ec1023 100644 --- a/src/fieldmap.c +++ b/src/fieldmap.c @@ -128,8 +128,8 @@ BOOL Task_RunScripts(TaskManager *taskman) { if (env->activeScriptContextCount == 0) { void (*callback)(FieldSystem *a0) = env->scrctx_end_cb; MessageFormat_Delete(env->msgfmt); - String_Delete(env->stringBuffer0); - String_Delete(env->stringBuffer1); + String_Free(env->stringBuffer0); + String_Free(env->stringBuffer1); env->check = 0; Heap_Free(env); if (callback != NULL) { diff --git a/src/font.c b/src/font.c index ad1fbb359f..9104c7b3aa 100644 --- a/src/font.c +++ b/src/font.c @@ -128,14 +128,14 @@ u32 FontID_FlatArray_GetWidthFirstLine(FontID fontId, const u16 *string, u32 let u32 FontID_String_GetWidth(u32 fontId, String *string, u32 letterSpacing) { GF_ASSERT(sFontWork->fontDataMan[fontId] != NULL); - return GetStringWidth(sFontWork->fontDataMan[fontId], String_cstr(string), letterSpacing); + return GetStringWidth(sFontWork->fontDataMan[fontId], String_GetChars(string), letterSpacing); } BOOL FontID_String_AllCharsValid(FontID fontId, String *str0, String *str1) { GF_ASSERT(sFontWork->fontDataMan[fontId] != NULL); - String_SetEmpty(str1); - String_Cat_HandleTrainerName(str1, str0); - return StringAllCharsValid(sFontWork->fontDataMan[fontId], String_cstr(str1)); + String_Clear(str1); + String_ConcatTrainerName(str1, str0); + return StringAllCharsValid(sFontWork->fontDataMan[fontId], String_GetChars(str1)); } u8 GetFontAttribute(FontID fontId, int attr) { @@ -181,7 +181,7 @@ void LoadFontPal1(enum GFPalLoadLocation location, enum GFPalSlotOffset palSlotO u32 FontID_String_GetWidthMultiline(u32 fontId, String *string, u32 letterSpacing) { GF_ASSERT(sFontWork->fontDataMan[fontId] != NULL); - return GetStringWidthMultiline(sFontWork->fontDataMan[fontId], String_cstr(string), letterSpacing); + return GetStringWidthMultiline(sFontWork->fontDataMan[fontId], String_GetChars(string), letterSpacing); } u32 FontID_String_GetCenterAlignmentX(FontID fontId, String *string, u32 letterSpacing, u32 windowWidth) { diff --git a/src/game_clear.c b/src/game_clear.c index e13533a4cf..ced32e22b6 100644 --- a/src/game_clear.c +++ b/src/game_clear.c @@ -328,7 +328,7 @@ static BOOL GameClearSave_IsPrintFinished(GameClearWork *env) { } static void sub_02052E70(GameClearWork *env) { - String_Delete(env->windowText); + String_Free(env->windowText); sub_0200F450(env->waitingIcon); sub_0205B5A8(&env->window); } @@ -351,7 +351,7 @@ static void GameClearSave_PrintSaveStatus(FieldSystem *fieldSystem, GameClearWor static void GameClearSave_Free(FieldSystem *fieldSystem, GameClearWork *env) { if (env->windowText != NULL) { - String_Delete(env->windowText); + String_Free(env->windowText); } if (WindowIsInUse(&env->window)) { RemoveWindow(&env->window); diff --git a/src/get_egg.c b/src/get_egg.c index 7e36998b01..f3170d63e7 100644 --- a/src/get_egg.c +++ b/src/get_egg.c @@ -228,7 +228,7 @@ static u8 DaycareMon_BufferLevelGrowthAndNick(DaycareMon *daycareMon, MessageFor boxMon = DaycareMon_GetBoxMon(daycareMon); levelGrowth = DaycareMon_CalcLevelGrowth(daycareMon); - BufferIntegerAsString(msgFmt, 1, levelGrowth, 3, PRINTING_MODE_LEFT_ALIGN, TRUE); + BufferIntegerAsString(msgFmt, 1, levelGrowth, 3, PADDING_MODE_NONE, TRUE); BufferBoxMonNickname(msgFmt, 0, boxMon); return levelGrowth; } @@ -241,7 +241,7 @@ static u16 DaycareMon_BufferNickAndRetrievalPrice(DaycareMon *daycareMon, Messag levelGrowth = DaycareMon_CalcLevelGrowth(daycareMon); BufferBoxMonNickname(msgFmt, 0, boxMon); price = (levelGrowth + 1) * 100; - BufferIntegerAsString(msgFmt, 1, price, 5, PRINTING_MODE_LEFT_ALIGN, TRUE); + BufferIntegerAsString(msgFmt, 1, price, 5, PADDING_MODE_NONE, TRUE); return price; } @@ -650,7 +650,7 @@ void SetEggStats(Pokemon *mon, int species, u8 metLocation, PlayerProfile *profi SetMonData(mon, MON_DATA_IS_EGG, &isEgg); name = GetSpeciesName(SPECIES_EGG, HEAP_ID_FIELD1); SetMonData(mon, MON_DATA_NICKNAME_STRING, name); - String_Delete(name); + String_Free(name); if (trainerMemoStrat == 4) { otId = PlayerProfile_GetTrainerID(profile); gender = PlayerProfile_GetTrainerGender(profile); @@ -658,7 +658,7 @@ void SetEggStats(Pokemon *mon, int species, u8 metLocation, PlayerProfile *profi SetMonData(mon, MON_DATA_OT_NAME_STRING, name); SetMonData(mon, MON_DATA_OT_ID, &otId); SetMonData(mon, MON_DATA_OT_GENDER, &gender); - String_Delete(name); + String_Free(name); } MonSetTrainerMemo(mon, profile, trainerMemoStrat, eggLocation, HEAP_ID_DEFAULT); } @@ -694,7 +694,7 @@ static void SetBreedEggStats(Pokemon *mon, u16 species, Daycare *dayCare, u32 ot SetMonData(mon, MON_DATA_FORM, &form); name = GetSpeciesName(SPECIES_EGG, HEAP_ID_FIELD1); SetMonData(mon, MON_DATA_NICKNAME_STRING, name); - String_Delete(name); + String_Free(name); } void GiveEggToPlayer(Daycare *dayCare, Party *party, PlayerProfile *profile) { @@ -943,7 +943,7 @@ void Save_Daycare_BufferMonStats(Daycare *dayCare, u32 nickname_idx, u32 level_i BufferBoxMonNickname(msgFmt, nickname_idx, boxMon); level = GetDaycareUpdatedLevel(boxMon, DaycareMon_GetSteps(daycareMon)); - BufferIntegerAsString(msgFmt, level_idx, level, 3, PRINTING_MODE_LEFT_ALIGN, TRUE); + BufferIntegerAsString(msgFmt, level_idx, level, 3, PADDING_MODE_NONE, TRUE); gender = GetBoxMonData(boxMon, MON_DATA_GENDER, NULL); if (gender != MON_GENDERLESS) { @@ -1091,7 +1091,7 @@ static void sub_0206D038(Pokemon *mon, enum HeapID heapID) { SetMonData(tmpMon, MON_DATA_MET_MONTH, &metMonth); SetMonData(tmpMon, MON_DATA_MET_DAY, &metDay); CopyPokemonToPokemon(tmpMon, mon); - String_Delete(string); + String_Free(string); Heap_Free(tmpMon); } diff --git a/src/hall_of_fame.c b/src/hall_of_fame.c index 63e6c009c4..b53f335775 100644 --- a/src/hall_of_fame.c +++ b/src/hall_of_fame.c @@ -51,9 +51,9 @@ void Save_HOF_RecordParty(HallOfFame *hof, Party *party, RTCDate *date) { team->party[j].moves[3] = GetMonData(mon, MON_DATA_MOVE4, NULL); if (string != NULL) { GetMonData(mon, MON_DATA_NICKNAME_STRING, string); - CopyStringToU16Array(string, team->party[j].nickname, POKEMON_NAME_LENGTH + 1); + String_CopyToChars(string, team->party[j].nickname, POKEMON_NAME_LENGTH + 1); GetMonData(mon, MON_DATA_OT_NAME_STRING, string); - CopyStringToU16Array(string, team->party[j].otname, PLAYER_NAME_LENGTH + 1); + String_CopyToChars(string, team->party[j].otname, PLAYER_NAME_LENGTH + 1); } else { team->party[j].nickname[0] = EOS; team->party[j].otname[0] = EOS; @@ -71,7 +71,7 @@ void Save_HOF_RecordParty(HallOfFame *hof, Party *party, RTCDate *date) { } hof->num_total++; if (string != NULL) { - String_Delete(string); + String_Free(string); } } } @@ -121,8 +121,8 @@ void Save_HOF_GetMonStatsByIndexPair(HallOfFame *hallOfFame, int teamNum, int mo 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 (i = 0; i < 4; i++) { dest->moves[i] = mon->moves[i]; } diff --git a/src/item.c b/src/item.c index ccedbef818..a7605637b4 100644 --- a/src/item.c +++ b/src/item.c @@ -15,7 +15,7 @@ #include "filesystem.h" #include "heap.h" #include "msgdata.h" -#include "pm_string.h" +#include "string_gf.h" static const u16 sPocketCounts[POCKETS_COUNT] = { [POCKET_ITEMS] = NUM_BAG_ITEMS, diff --git a/src/launch_application.c b/src/launch_application.c index a0bf1642c0..fd8b7a7621 100644 --- a/src/launch_application.c +++ b/src/launch_application.c @@ -1052,7 +1052,7 @@ static BOOL Task_NamingScreen(TaskManager *taskman) { data->args->noInput = 1; } } else if (args->kind == 5) { - u16 *var2 = String_cstr(args->nameInputString); + u16 *var2 = String_GetChars(args->nameInputString); SAV_FRIEND_GRP *friendGroup = Save_FriendGroup_Get(fieldSystem->saveData); if (sub_0202C88C(friendGroup, var2)) { data->args->noInput = 2; @@ -1066,7 +1066,7 @@ static BOOL Task_NamingScreen(TaskManager *taskman) { *retVar = data->args->noInput; } NamingScreen_DeleteArgs(data->args); - String_Delete(data->unk10); + String_Free(data->unk10); Heap_Free(data); return TRUE; } @@ -1127,15 +1127,15 @@ void CallTask_NamingScreen(TaskManager *taskman, NameScreenType type, int specie data->args->monGender = GetMonData(mon, MON_DATA_GENDER, NULL); data->args->monForm = GetMonData(mon, MON_DATA_FORM, NULL); if (defaultStr != NULL) { - CopyU16ArrayToString(data->unk10, defaultStr); + String_CopyFromChars(data->unk10, defaultStr); } break; case NAME_SCREEN_GROUP: - CopyU16ArrayToString(data->unk10, defaultStr); + String_CopyFromChars(data->unk10, defaultStr); break; default: if (defaultStr != NULL) { - CopyU16ArrayToString(data->args->nameInputString, defaultStr); + String_CopyFromChars(data->args->nameInputString, defaultStr); } break; } diff --git a/src/list_menu_items.c b/src/list_menu_items.c index 950e487026..0a2547e19d 100644 --- a/src/list_menu_items.c +++ b/src/list_menu_items.c @@ -39,7 +39,7 @@ void ListMenuItems_AddItem(LISTMENUITEM *items, String *string, int value) { items = ListMenuItems_SeekEnd(items, &heapID); if (items != NULL) { - items->text = String_Dup(string, heapID); + items->text = String_Clone(string, heapID); items->value = value; } } @@ -65,7 +65,7 @@ void ListMenuItems_DestroyMenuStrings(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/src/mail.c b/src/mail.c index 215e749a69..7b315979fa 100644 --- a/src/mail.c +++ b/src/mail.c @@ -154,7 +154,7 @@ Mail *CreateKenyaMail(Pokemon *mon, u8 mailType, u8 gender, String *name, u8 otI Mail *ret = Mail_New(HEAP_ID_3); Mail_Init(ret); ret->mail_type = mailType; - CopyStringToU16Array(name, ret->author_name, PLAYER_NAME_LENGTH + 1); + String_CopyToChars(name, ret->author_name, PLAYER_NAME_LENGTH + 1); ret->author_gender = gender; ret->author_otId = otId; diff --git a/src/mail_message.c b/src/mail_message.c index 04546ead53..3e85db658d 100644 --- a/src/mail_message.c +++ b/src/mail_message.c @@ -111,7 +111,7 @@ u32 MailMsg_NumFields(u16 msg_bank, u16 msg_no) { GF_ASSERT(msg_bank < NELEMS(sMessageBanks)); GF_ASSERT(msg_no < MailMsg_NumMsgsInBank(msg_bank)); msg = ReadMsgData_NewNarc_NewString(NARC_msgdata_msg, sMessageBanks[msg_bank], msg_no, HEAP_ID_DEFAULT); - msg_cstr = String_cstr(msg); + msg_cstr = String_GetChars(msg); ret = 0; while (*msg_cstr != EOS) { if (*msg_cstr == EXT_CTRL_CODE_BEGIN) { @@ -123,7 +123,7 @@ u32 MailMsg_NumFields(u16 msg_bank, u16 msg_no) { msg_cstr++; } } - String_Delete(msg); + String_Free(msg); return ret; } diff --git a/src/message_format.c b/src/message_format.c index 5de7385197..69c2235cab 100644 --- a/src/message_format.c +++ b/src/message_format.c @@ -67,12 +67,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); @@ -82,7 +82,7 @@ void MessageFormat_InitFields(MessageFormatFields *field) { #pragma unused(field) } -void SetStringAsPlaceholder(MessageFormat *msgFmt, u32 fieldno, const String *string, const MessageFormatAttrs *attrs) { +void SetStringAsPlaceholder(MessageFormat *msgFmt, u32 fieldno, String *string, const MessageFormatAttrs *attrs) { GF_ASSERT(fieldno < msgFmt->count); if (fieldno < msgFmt->count) { if (attrs != NULL) { @@ -92,18 +92,18 @@ void SetStringAsPlaceholder(MessageFormat *msgFmt, u32 fieldno, const String *st } } -void BufferString(MessageFormat *msgFmt, u32 fieldno, const String *string, s32 a3, s32 a4, s32 a5) { +void BufferString(MessageFormat *msgFmt, u32 fieldno, String *string, s32 a3, s32 a4, s32 a5) { #pragma unused(a3, a4, a5) SetStringAsPlaceholder(msgFmt, fieldno, string, NULL); } void BufferPlayersName(MessageFormat *msgFmt, u32 fieldno, PlayerProfile *playerProfile) { - CopyU16ArrayToString(msgFmt->buffer, PlayerProfile_GetNamePtr(playerProfile)); + String_CopyFromChars(msgFmt->buffer, PlayerProfile_GetNamePtr(playerProfile)); SetStringAsPlaceholder(msgFmt, fieldno, msgFmt->buffer, NULL); } void BufferRivalsName(MessageFormat *msgFmt, u32 fieldno, SaveData *saveData) { - CopyU16ArrayToString(msgFmt->buffer, Save_Misc_RivalName_Const_Get(Save_Misc_Const_Get(saveData))); + String_CopyFromChars(msgFmt->buffer, Save_Misc_RivalName_Const_Get(Save_Misc_Const_Get(saveData))); SetStringAsPlaceholder(msgFmt, fieldno, msgFmt->buffer, NULL); } @@ -151,8 +151,8 @@ void BufferBoxMonOTName(MessageFormat *msgFmt, u32 fieldno, BoxPokemon *boxMon) SetStringAsPlaceholder(msgFmt, fieldno, msgFmt->buffer, NULL); } -void BufferIntegerAsString(MessageFormat *msgFmt, u32 fieldno, s32 num, u32 numDigits, PrintingMode strconvmode, BOOL whichCharset) { - String16_FormatInteger(msgFmt->buffer, num, numDigits, strconvmode, whichCharset); +void BufferIntegerAsString(MessageFormat *msgFmt, u32 fieldno, s32 num, u32 numDigits, enum PaddingMode paddingMode, BOOL whichCharset) { + String_FormatInt(msgFmt->buffer, num, numDigits, paddingMode, (enum CharsetMode)whichCharset); SetStringAsPlaceholder(msgFmt, fieldno, msgFmt->buffer, NULL); } @@ -322,7 +322,7 @@ void BufferFrontierOpponentName(MessageFormat *msgFmt, u32 fieldno, u32 opponent } void BufferTrainerNameFromDataStruct(MessageFormat *msgFmt, u32 fieldno, Trainer *trainer) { - CopyU16ArrayToString(msgFmt->buffer, trainer->name); + String_CopyFromChars(msgFmt->buffer, trainer->name); SetStringAsPlaceholder(msgFmt, fieldno, msgFmt->buffer, NULL); } @@ -346,7 +346,7 @@ void BufferGenderSymbol(MessageFormat *msgFmt, u32 fieldno, u8 gender) { ReadMsgDataIntoString(msgData, msg_0040_00056, msgFmt->buffer); break; default: - String_SetEmpty(msgFmt->buffer); + String_Clear(msgFmt->buffer); break; } SetStringAsPlaceholder(msgFmt, fieldno, msgFmt->buffer, NULL); @@ -469,9 +469,9 @@ void BufferGroupName(MessageFormat *msgFmt, SaveData *saveData, s32 groupId, s32 u8 sp10 = sub_0202C830(friendGrp, groupId); u8 r7 = sub_0202C83C(friendGrp, groupId); String *dest = String_New(64, HEAP_ID_FIELD1); - CopyU16ArrayToString(dest, sub_0202C7E0(friendGrp, groupId, nameType)); + String_CopyFromChars(dest, sub_0202C7E0(friendGrp, groupId, nameType)); BufferString(msgFmt, fieldno, dest, sp10, 1, r7); - String_Delete(dest); + String_Free(dest); } void BufferWiFiPlazaActivityName(MessageFormat *msgFmt, u32 fieldno, u32 activityId) { @@ -636,7 +636,7 @@ void BufferMonthNameAbbr(MessageFormat *msgFmt, u32 fieldno, u32 month) { } void MessageFormat_UpperFirstChar(MessageFormat *msgFmt, u32 fieldno) { - String_UpperCharN(msgFmt->fields[fieldno].msg, 0); + String_UpperChar(msgFmt->fields[fieldno].msg, 0); } void BufferDeptStoreFloorNo(MessageFormat *msgFmt, u32 fieldno, u32 floor) { @@ -656,30 +656,30 @@ void BufferDeptStoreFloorNo(MessageFormat *msgFmt, u32 fieldno, u32 floor) { } void StringExpandPlaceholders(MessageFormat *msgFmt, String *dest, String *src) { - const u16 *cstr = String_cstr(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 < msgFmt->count); - String_Cat_HandleTrainerName(dest, msgFmt->fields[idx].msg); + String_ConcatTrainerName(dest, msgFmt->fields[idx].msg); cstr = MsgArray_SkipControlCode(cstr); } else { const u16 *before = cstr; cstr = MsgArray_SkipControlCode(cstr); while (before < cstr) { - String_AddChar(dest, *before++); + String_AppendChar(dest, *before++); } } } else { - String_AddChar(dest, *cstr++); + String_AppendChar(dest, *cstr++); } } } void MessageFormat_ResetBuffers(MessageFormat *msgFmt) { for (int i = 0; i < msgFmt->count; i++) { - String_SetEmpty(msgFmt->fields[i].msg); + String_Clear(msgFmt->fields[i].msg); } } diff --git a/src/message_printer.c b/src/message_printer.c index c6606f2b2a..f7642593b3 100644 --- a/src/message_printer.c +++ b/src/message_printer.c @@ -70,7 +70,7 @@ void sub_0200CDAC(MessagePrinter *messagePrinter, u8 glyphId, Window *window, u3 BlitBitmapRectToWindow(window, messagePrinter->ppCharData->pRawData + _020F5C24[glyphId][0], 0, 0, _020F5C24[glyphId][1], 8, x, y, _020F5C24[glyphId][1], 8); } -void PrintUIntOnWindow(MessagePrinter *messagePrinter, u32 num, u32 ndigits, PrintingMode mode, Window *window, u32 x, u32 y) { +void PrintUIntOnWindow(MessagePrinter *messagePrinter, u32 num, u32 ndigits, enum PaddingMode mode, Window *window, u32 x, u32 y) { ConvertUIntToDecimalString(messagePrinter->string, num, mode, ndigits); u32 i; for (i = 0; messagePrinter->string[i] != EOS; i++) { diff --git a/src/msgdata.c b/src/msgdata.c index 793ec21392..b64ddb21d1 100644 --- a/src/msgdata.c +++ b/src/msgdata.c @@ -78,12 +78,12 @@ static void ReadMsgData_ExistingTable_ExistingString(MAT *table, u32 num, String 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); } } @@ -100,7 +100,7 @@ static String *ReadMsgData_ExistingTable_NewString(MAT *table, u32 num, enum Hea 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; @@ -136,13 +136,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); } } @@ -176,7 +176,7 @@ static String *ReadMsgData_ExistingNarc_NewString(NARC *narc, u32 group, u32 num 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); } } @@ -289,10 +289,10 @@ String *ReadMsgData_ExpandPlaceholders(MessageFormat *messageFormat, MsgData *ms r5 = NewString_ReadMsgData(msgData, msgno); if (r5 != NULL) { StringExpandPlaceholders(messageFormat, r4, r5); - ret = String_Dup(r4, heapID); - String_Delete(r5); + ret = String_Clone(r4, heapID); + String_Free(r5); } - String_Delete(r4); + String_Free(r4); } return ret; } diff --git a/src/naming_screen.c b/src/naming_screen.c index 19586db135..ecd285faa5 100644 --- a/src/naming_screen.c +++ b/src/naming_screen.c @@ -664,13 +664,13 @@ static void NamingScreen_SetDefaultName(NamingScreenAppData *data, NamingScreenA } // UB: Nonbinary players will not initialize string. String_Copy(args->nameInputString, string); - String_Delete(string); - CopyStringToU16Array(args->nameInputString, args->nameInputFlat, 10); + String_Free(string); + String_CopyToChars(args->nameInputString, args->nameInputFlat, 10); } else if (data->type == NAME_SCREEN_RIVAL) { string = NewString_ReadMsgData(data->msgData_254, FIRST_DEFAULT_NAME_RIVAL); String_Copy(args->nameInputString, string); - String_Delete(string); - CopyStringToU16Array(args->nameInputString, args->nameInputFlat, 10); + String_Free(string); + String_CopyToChars(args->nameInputString, args->nameInputFlat, 10); } else { // Remaining cases have their own separate handlers. args->noInput = TRUE; @@ -709,9 +709,9 @@ BOOL NamingScreenApp_Exit(OverlayManager *ovyMan, int *pState) { } else { CopyU16StringArray(data->entryBufBak, data->entryBuf); CopyU16StringArray(args->nameInputFlat, data->entryBuf); - CopyU16ArrayToString(args->nameInputString, data->entryBuf); + String_CopyFromChars(args->nameInputString, data->entryBuf); } - String_Delete(data->unk_184); + String_Free(data->unk_184); for (int i = 0; i < 7; ++i) { DestroySysTaskAndEnvironment(data->tasks[i]); } @@ -737,10 +737,10 @@ BOOL NamingScreenApp_Exit(OverlayManager *ovyMan, int *pState) { GX_SetVisibleWnd(GX_WNDMASK_NONE); FontID_Release(2); if (data->battleMsgString != NULL) { - String_Delete(data->battleMsgString); + String_Free(data->battleMsgString); } - String_Delete(data->promptString); - String_Delete(data->unkJapaneseString); + String_Free(data->promptString); + String_Free(data->unkJapaneseString); DestroyMsgData(data->msgData_197); DestroyMsgData(data->msgData_254); DestroyMsgData(data->msgData_249); @@ -776,7 +776,7 @@ NamingScreenArgs *NamingScreen_CreateArgs(enum HeapID heapID, NameScreenType kin void NamingScreen_DeleteArgs(NamingScreenArgs *namingScreenArgs) { GF_ASSERT(namingScreenArgs->nameInputString != NULL); GF_ASSERT(namingScreenArgs != NULL); // UB: should check this first - String_Delete(namingScreenArgs->nameInputString); + String_Free(namingScreenArgs->nameInputString); Heap_Free(namingScreenArgs); } @@ -937,7 +937,7 @@ static void NamingScreen_InitKeyboardAndEntryCursors(NamingScreenAppData *data, BgSetPosTextAndCommit(data->bgConfig, data->activeKeyboardBgId ^ 1, BG_POS_OP_SET_Y, data->bgPosVecs[data->activeKeyboardBgId ^ 1].y); data->entryBufBak[0] = EOS; if (args->nameInputString != NULL) { - CopyStringToU16Array(args->nameInputString, data->entryBufBak, 32); + String_CopyToChars(args->nameInputString, data->entryBufBak, 32); } MI_CpuFill16(data->entryBuf, 1, sizeof(data->entryBuf)); if (data->type == NAME_SCREEN_POKEMON) { @@ -994,12 +994,12 @@ static void NamingScreen_PrepareBattleMessage(NamingScreenAppData *data, Overlay Heap_Free(mon); } else { data->entryBuf[data->textCursorPos] = EOS; - CopyU16ArrayToString(string, data->entryBuf); + String_CopyFromChars(string, data->entryBuf); BufferString(data->msgFormat, 0, string, 0, 0, 0); } data->battleMsgString = ReadMsgData_ExpandPlaceholders(data->msgFormat, data->msgData_197, args->battleMsgId, HEAP_ID_NAMING_SCREEN); data->printedFromBattleGMM = TRUE; - String_Delete(string); + String_Free(string); } } @@ -1530,13 +1530,13 @@ static void NamingScreen_BlitRawCharactersToWindow(Window *window, const u16 *ra pmCharBuf[0] = rawChars[i]; pmCharBuf[1] = EOS; width = FontID_FlatArray_GetWidth(0, pmCharBuf, 0); - CopyU16ArrayToString(string, pmCharBuf); + String_CopyFromChars(string, pmCharBuf); centerX = x + i * spacing + ((spacing - width) / 2); AddTextPrinterParameterizedWithColor(window, 0, string, centerX, y, textSpeed, color, NULL); } ++i; } - String_Delete(string); + String_Free(string); } static const u8 _02101D3C[] = { 0x60, 0x68, 0x50, 0x58 }; @@ -1568,13 +1568,13 @@ static void NamingScreen_PrintCharacterOnWindowAndOBJ(Window *windows, const u16 curCharBuf[1] = EOS; FillWindowPixelBuffer(&windows[i], 0); - CopyU16ArrayToString(string2, curCharBuf); + String_CopyFromChars(string2, curCharBuf); ptr = NamingScreen_PrintStringOnWindow_GetPixelBuffer(&windows[i], string2, 2, MAKE_TEXT_COLOR(13, 14, 15)); DC_FlushRange(ptr, 0x80); GXS_LoadOBJ(ptr, sSpriteGfxOffsets[i] * 32, 0x80); } - String_Delete(string2); + String_Free(string2); } static void NamingScreen_PrintLastCharacterOfEntryBuf(Window *window, u16 *entryBuf, u16 cursorPos, u16 *tmpBuf, void *charBuf, String *string) { diff --git a/src/npc_trade.c b/src/npc_trade.c index b68b784c60..e5c5c6fddf 100644 --- a/src/npc_trade.c +++ b/src/npc_trade.c @@ -38,8 +38,8 @@ NPCTradeAppData *NPCTradeApp_Init(enum HeapID heapID, NpcTradeNum tradeno) { { String *name; name = _GetNpcTradeName(heapID, NPC_TRADE_OT_NUM(tradeno)); - CopyStringToU16Array(name, strbuf, 128); - String_Delete(name); + String_CopyToChars(name, strbuf, 128); + String_Free(name); } Save_Profile_PlayerName_Set(ret->profile, strbuf); PlayerProfile_SetTrainerGender(ret->profile, ret->trade_dat->gender); @@ -74,7 +74,7 @@ void NPCTrade_MakeAndGiveLoanMon(FieldSystem *fieldSystem, NpcTradeNum tradeno, mailno = ItemToMailId(trade_dat->heldItem); mail = CreateKenyaMail(mon, mailno, trade_dat->gender, name, trade_dat->otId); SetMonData(kenya, MON_DATA_MAIL, mail); - String_Delete(name); + String_Free(name); Heap_Free(mail); } Heap_Free(trade_dat); @@ -94,7 +94,7 @@ Mail *NPCTrade_MakeKenyaMail(void) { name = _GetNpcTradeName(HEAP_ID_FIELD2, NPC_TRADE_OT_NUM(NPC_TRADE_KENYA_SPEAROW)); mailno = ItemToMailId(trade_dat->heldItem); mail = CreateKenyaMail(mon, mailno, trade_dat->gender, name, trade_dat->otId); - String_Delete(name); + String_Free(name); Heap_Free(trade_dat); Heap_Free(mon); return mail; @@ -199,7 +199,7 @@ static void _CreateTradeMon(Pokemon *mon, NPCTrade *trade_dat, u32 level, NpcTra heapId_2 = (int)heapID; name = _GetNpcTradeName((enum HeapID)heapId_2, tradeno); SetMonData(mon, MON_DATA_NICKNAME_STRING, name); - String_Delete(name); + String_Free(name); nickname_flag = TRUE; SetMonData(mon, MON_DATA_HAS_NICKNAME, &nickname_flag); @@ -221,7 +221,7 @@ static void _CreateTradeMon(Pokemon *mon, NPCTrade *trade_dat, u32 level, NpcTra name = _GetNpcTradeName((enum HeapID)heapId_2, NPC_TRADE_OT_NUM(tradeno)); SetMonData(mon, MON_DATA_OT_NAME_STRING, name); - String_Delete(name); + String_Free(name); SetMonData(mon, MON_DATA_OT_GENDER, &trade_dat->gender); SetMonData(mon, MON_DATA_LANGUAGE, &trade_dat->language); diff --git a/src/oaks_speech.c b/src/oaks_speech.c index db0753af4b..ed842913ff 100644 --- a/src/oaks_speech.c +++ b/src/oaks_speech.c @@ -951,7 +951,7 @@ static BOOL OakSpeech_PrintDialogMsg(OakSpeechData *data, int msgNum, int waitBu BufferString(data->msgFormat, 0, data->namingScreenArgs_Player->nameInputString, data->playerGender, 1, 2); BufferString(data->msgFormat, 1, data->namingScreenArgs_Rival->nameInputString, 0, 1, 2); StringExpandPlaceholders(data->msgFormat, data->string, temp); - String_Delete(temp); + String_Free(temp); data->textPrinter = AddTextPrinterParameterized(&data->dialogWindow, 1, data->string, 0, 0, Options_GetTextFrameDelay(data->options), NULL); data->printDialogMsgState = 1; @@ -959,7 +959,7 @@ static BOOL OakSpeech_PrintDialogMsg(OakSpeechData *data, int msgNum, int waitBu } case 1: if (!TextPrinterCheckActive(data->textPrinter)) { - String_Delete(data->string); + String_Free(data->string); data->printDialogMsgState = 2; } break; @@ -1021,7 +1021,7 @@ static BOOL OakSpeech_PrintAndFadeFullScreenText(OakSpeechData *data, int msgNum AddTextPrinterParameterizedWithColor(&data->fullScreenMsgWindow, 0, data->string, 0, 0, TEXT_SPEED_INSTANT, MAKE_TEXT_COLOR(15, 2, 0), NULL); break; } - String_Delete(data->string); + String_Free(data->string); data->printAndFadeFullScreenTextState = 1; break; case 1: @@ -1142,7 +1142,7 @@ static void OakSpeech_PrintMultichoiceMenu(OakSpeechData *data, int msg1, int ms FillWindowPixelRect(&data->multichoiceMenuButtonWindows[i], 0, 0, 0, 0xC0, 0xC0); AddTextPrinterParameterizedWithColor(&data->multichoiceMenuButtonWindows[i], 4, string, (sMultichoiceMenuButtonWindowTemplates[numChoices - 2][i].width * 8 - x) / 2, y, TEXT_SPEED_INSTANT, MAKE_TEXT_COLOR(15, 1, 0), NULL); CopyWindowToVram(&data->multichoiceMenuButtonWindows[i]); - String_Delete(string); + String_Free(string); } } @@ -2007,7 +2007,7 @@ static BOOL OakSpeech_DoMainTask(OakSpeechData *data) { break; case OAK_SPEECH_MAIN_STATE_PROMPT_NAME_LAUNCH_NAMING_SCREEN: - String_SetEmpty(data->namingScreenArgs_Player->nameInputString); + String_Clear(data->namingScreenArgs_Player->nameInputString); data->namingScreenArgs_Player->playerGenderOrMonSpecies = data->playerGender; data->overlayManager = OverlayManager_New(&gOverlayTemplate_NamingScreen, data->namingScreenArgs_Player, data->heapID); data->state = OAK_SPEECH_MAIN_STATE_PROMPT_NAME_RESTORE_GRAPHICS_AFTER; @@ -2176,7 +2176,7 @@ static void OakSpeech_ShowTutorialTouchMsg(OakSpeechData *data) { AddTextPrinterParameterizedWithColor(window, 4, string, 0, 0, TEXT_SPEED_INSTANT, MAKE_TEXT_COLOR(15, 1, 0), NULL); CopyWindowToVram(window); RemoveWindow(window); - String_Delete(string); + String_Free(string); } static void OakSpeech_HideTutorialTouchMsg(OakSpeechData *data) { diff --git a/src/oaks_speech_yesnomenu.c b/src/oaks_speech_yesnomenu.c index 4e0099d868..83e99671ba 100644 --- a/src/oaks_speech_yesnomenu.c +++ b/src/oaks_speech_yesnomenu.c @@ -123,7 +123,7 @@ static void OakSpeechYesNo_PrintMessageOnWindow(OakSpeechYesNo *yesnoMenu, Windo AddTextPrinterParameterizedWithColor(window, 4, string, 0, 0, TEXT_SPEED_INSTANT, MAKE_TEXT_COLOR(15, 1, 0), NULL); CopyWindowToVram(window); DestroyMsgData(msgData); - String_Delete(string); + String_Free(string); } static const s16 sCoords[2][2] = { diff --git a/src/options_app.c b/src/options_app.c index 8c0c1e4aac..2fe7eb7ca2 100644 --- a/src/options_app.c +++ b/src/options_app.c @@ -379,7 +379,7 @@ BOOL OptionsMenu_Exit(OverlayManager *manager, int *state) { Options_SetTextSpeed(data->playerOptions, data->options.textSpeed); } - String_Delete(data->frameNumText); + String_Free(data->frameNumText); TextFlags_SetCanABSpeedUpPrint(TRUE); TextFlags_SetCanTouchSpeedUpPrint(TRUE); @@ -521,7 +521,7 @@ static BOOL ov54_021E5DBC(OptionsApp_Data *data) { for (int i = 0; i < MENU_ENTRY_COUNT - 1; i++) { for (int j = 0; j < data->menuEntries[i].numStrings; j++) { - String_Delete(data->menuEntries[i].strings[j]); + String_Free(data->menuEntries[i].strings[j]); } } @@ -727,19 +727,19 @@ static void OptionsApp_SetupInterfaceText(OptionsApp_Data *data) { ReadMsgDataIntoString(data->msgData, msg_0045_00000, tmpString); // OPTIONS AddTextPrinterParameterizedWithColor(&data->windows.optionsTitle, 0, tmpString, 2, 5, TEXT_SPEED_INSTANT, MAKE_TEXT_COLOR(15, 2, 0), NULL); - String_SetEmpty(tmpString); + String_Clear(tmpString); OptionsApp_PrintTextFrameString(data, tmpString, TRUE); for (i = 0; i < MENU_ENTRY_COUNT - 1; i++) { - String_SetEmpty(tmpString); + String_Clear(tmpString); ReadMsgDataIntoString(data->msgData, msg_0045_00001 + i, tmpString); // Option names AddTextPrinterParameterizedWithColor(&data->windows.selectedOption, 0, tmpString, 4, i * 24 + 5, TEXT_SPEED_NOTRANSFER, MAKE_TEXT_COLOR(15, 2, 0), NULL); } - String_SetEmpty(tmpString); + String_Clear(tmpString); ReadMsgDataIntoString(data->msgData, msg_0045_00008, tmpString); // QUIT AddTextPrinterParameterizedWithColor(&data->windows.quitButton, 0, tmpString, 0, 6, TEXT_SPEED_NOTRANSFER, MAKE_TEXT_COLOR(15, 2, 0), NULL); - String_SetEmpty(tmpString); + String_Clear(tmpString); ReadMsgDataIntoString(data->msgData, msg_0045_00007, tmpString); // CONFIRM AddTextPrinterParameterizedWithColor(&data->windows.confirmButton, 0, tmpString, 0, 6, TEXT_SPEED_NOTRANSFER, MAKE_TEXT_COLOR(15, 2, 0), NULL); @@ -753,7 +753,7 @@ static void OptionsApp_SetupInterfaceText(OptionsApp_Data *data) { CopyWindowToVram(&data->windows.confirmButton); CopyWindowToVram(&data->windows.frameAndTextSpeedTest); - String_Delete(tmpString); + String_Free(tmpString); } static void OptionsApp_LoadMenuEntriesData(OptionsApp_Data *data) { diff --git a/src/overlay_25.c b/src/overlay_25.c index 8f5d149312..f7e5f858fe 100644 --- a/src/overlay_25.c +++ b/src/overlay_25.c @@ -22,7 +22,7 @@ #include "msgdata.h" #include "overlay_01.h" #include "party.h" -#include "pm_string.h" +#include "string_gf.h" #include "pokemon.h" #include "save_trainer_house.h" #include "scrcmd.h" @@ -227,8 +227,8 @@ static void TrainerHouse_SetNames(TrainerHouseSet *set) { length = PLAYER_NAME_LENGTH; } MI_CpuFill16(set->trainer.otName, EOS, (PLAYER_NAME_LENGTH + 1) * sizeof(u16)); - MI_CpuCopy16(String_cstr(otName), set->trainer.otName, length * sizeof(u16)); - String_Delete(otName); + MI_CpuCopy16(String_GetChars(otName), set->trainer.otName, length * sizeof(u16)); + String_Free(otName); } } for (s32 i = 0; i < PARTY_SIZE; i++) { @@ -245,8 +245,8 @@ static void TrainerHouse_SetNames(TrainerHouseSet *set) { length = POKEMON_NAME_LENGTH; } MI_CpuFill16(trainerHouseMon->nickname, EOS, POKEMON_NAME_LENGTH * sizeof(u16)); - MI_CpuCopy16(String_cstr(name), trainerHouseMon->nickname, length * sizeof(u16)); - String_Delete(name); + MI_CpuCopy16(String_GetChars(name), trainerHouseMon->nickname, length * sizeof(u16)); + String_Free(name); } } } diff --git a/src/overlay_36.c b/src/overlay_36.c index 9ab29b039f..d6e35f67c3 100644 --- a/src/overlay_36.c +++ b/src/overlay_36.c @@ -235,7 +235,7 @@ static void InitGameStateAfterOakSpeech_Internal(enum HeapID heapID, SaveData *s Mailbox_CopyMailToSlotI(mailbox->msgs, FALSE, 0, mail); Heap_Free(mon); - String_Delete(author_name); + String_Free(author_name); Heap_Free(mail); DestroyMsgData(friend_names_msgdata); } diff --git a/src/overlay_55.c b/src/overlay_55.c index d0857e70fa..b5977ced22 100644 --- a/src/overlay_55.c +++ b/src/overlay_55.c @@ -158,7 +158,7 @@ static UnkStruct_ov55_021E5B08 *ov55_021E5B08(Mail *mail, enum HeapID heapID) { ret->unk0 = 0; ret->mailOTID = Mail_GetOTID(mail); ret->mailAuthorName = String_New(PLAYER_NAME_LENGTH + 1, heapID); - CopyU16ArrayToString(ret->mailAuthorName, Mail_GetAuthorNamePtr(mail)); + String_CopyFromChars(ret->mailAuthorName, Mail_GetAuthorNamePtr(mail)); ret->mailType = Mail_GetType(mail); ret->mailLanguage = Mail_GetLanguage(mail); ret->mailVersion = Mail_GetVersion(mail); @@ -176,7 +176,7 @@ static UnkStruct_ov55_021E5B08 *ov55_021E5B08(Mail *mail, enum HeapID heapID) { static void ov55_021E5BAC(UnkStruct_ov55_021E5B08 *unk) { if (unk->mailAuthorName != NULL) { - String_Delete(unk->mailAuthorName); + String_Free(unk->mailAuthorName); } Heap_Free(unk); diff --git a/src/overlay_94.c b/src/overlay_94.c index 1da3b483e1..d7225c20b1 100644 --- a/src/overlay_94.c +++ b/src/overlay_94.c @@ -116,7 +116,7 @@ BOOL PartyMenu_AnimateIconFormChange(PartyMenu *partyMenu) { String *str = NewString_ReadMsgData(partyMenu->msgData, msg_0300_00188); //" changed Form!" BufferBoxMonNickname(partyMenu->msgFormat, 0, Mon_GetBoxMon(mon)); StringExpandPlaceholders(partyMenu->msgFormat, partyMenu->formattedStrBuf, str); - String_Delete(str); + String_Free(str); PartyMenu_PrintMessageOnWindow34(partyMenu, -1, TRUE); work->state++; break; diff --git a/src/overlay_bug_contest.c b/src/overlay_bug_contest.c index cb5ad41ac0..98aa3d89d8 100644 --- a/src/overlay_bug_contest.c +++ b/src/overlay_bug_contest.c @@ -137,11 +137,11 @@ void BugContest_BufferContestWinnerNames(BugContest *bugContest, MsgData *msgDat } else { string = NewString_ReadMsgData(msgData, contestant->id + msg_0246_00078); BufferString(msgFmt, 0, string, 2, 1, 2); - String_Delete(string); + String_Free(string); BufferTrainerClassName(msgFmt, 2, sBugContestOpponentClasses[contestant->id]); } BufferSpeciesName(msgFmt, 1, contestant->data.species); - BufferIntegerAsString(msgFmt, 3, contestant->score, 3, PRINTING_MODE_LEFT_ALIGN, 1); + BufferIntegerAsString(msgFmt, 3, contestant->score, 3, PADDING_MODE_NONE, 1); } BOOL BugContest_ContestantIsRegistered(BugContest *bugContest, u8 id) { @@ -164,7 +164,7 @@ BOOL BugContest_BufferCaughtMonNick(BugContest *bugContest, MessageFormat *msgFm string = String_New(POKEMON_NAME_LENGTH + 1 + 1, bugContest->heapID); GetMonData(bugContest->mon, MON_DATA_NICKNAME_STRING, string); BufferString(msgFmt, slot, string, 2, 1, 2); - String_Delete(string); + String_Free(string); return bugContest->party_cur_num >= PARTY_SIZE; } diff --git a/src/overlay_mic_test.c b/src/overlay_mic_test.c index 3cdf77e542..aa215ae4c8 100644 --- a/src/overlay_mic_test.c +++ b/src/overlay_mic_test.c @@ -742,7 +742,7 @@ static void ov62_021E60E4(MicTestSub_B8 *a0, enum HeapID heapID) { ClearWindowTilemap(&a0->window[i]); String *str = NewString_ReadMsgData(a0->msgData, i); AddTextPrinterParameterizedWithColor(&a0->window[i], sMicTestTextBoxes[i].fontId, str, 0, 0, 0xFF, sMicTestTextBoxes[i].color, 0); - String_Delete(str); + String_Free(str); CopyWindowToVram(&a0->window[i]); } } diff --git a/src/party_context_menu.c b/src/party_context_menu.c index 5b2ac7ccf2..6808797f66 100644 --- a/src/party_context_menu.c +++ b/src/party_context_menu.c @@ -464,7 +464,7 @@ void PartyMenu_ContextMenuAddFieldMove(PartyMenu *partyMenu, u16 move, u8 index) String *msg = NewString_ReadMsgData(partyMenu->msgData, msg_0300_00139 + index); BufferMoveName(partyMenu->msgFormat, 0, move); StringExpandPlaceholders(partyMenu->msgFormat, partyMenu->contextMenuStrings[PARTY_MON_CONTEXT_MENU_FIELD_MOVES_BEGIN + index], msg); - String_Delete(msg); + String_Free(msg); } void PartyMenu_OpenContextMenu(PartyMenu *partyMenu, u8 *items, u8 numItems) { @@ -508,7 +508,7 @@ void sub_0207D1C8(PartyMenu *partyMenu) { String *msg = NewString_ReadMsgData(partyMenu->msgData, msg_0300_00038); BufferBoxMonNickname(partyMenu->msgFormat, 0, Mon_GetBoxMon(mon)); StringExpandPlaceholders(partyMenu->msgFormat, partyMenu->formattedStrBuf, msg); - String_Delete(msg); + String_Free(msg); } } @@ -520,7 +520,7 @@ void PartyMenu_BufferMonNickname(PartyMenu *partyMenu, Pokemon *mon, u32 partySl String *msg = NewString_ReadMsgData(partyMenu->msgData, sMonNicknameMsgIds[partySlot][0]); BufferBoxMonNickname(partyMenu->msgFormat, 0, Mon_GetBoxMon(mon)); StringExpandPlaceholders(partyMenu->msgFormat, partyMenu->monsDrawState[partySlot].nickname, msg); - String_Delete(msg); + String_Free(msg); } static void PartyMenu_PrintMonNicknameOnWindow(PartyMenu *partyMenu, u8 partySlot) { @@ -551,7 +551,7 @@ void PartyMenu_PrintMonLevelOnWindow(PartyMenu *partyMenu, u8 partySlot) { if (partyMenu->monsDrawState[partySlot].status != PARTY_MON_STATUS_ICON_OK) { ScheduleWindowCopyToVram(window); } else { - sub_0200CE7C(partyMenu->msgPrinter, 1, partyMenu->monsDrawState[partySlot].level, 3, PRINTING_MODE_LEFT_ALIGN, window, 5, 2); + sub_0200CE7C(partyMenu->msgPrinter, 1, partyMenu->monsDrawState[partySlot].level, 3, PADDING_MODE_NONE, window, 5, 2); ScheduleWindowCopyToVram(window); } } @@ -559,7 +559,7 @@ void PartyMenu_PrintMonLevelOnWindow(PartyMenu *partyMenu, u8 partySlot) { void PartyMenu_PrintMonCurHpOnWindow(PartyMenu *partyMenu, u8 partySlot) { Window *window = &partyMenu->windows[partySlot * PARTY_MENU_WINDOWS_PER_MON + PARTY_MENU_WINDOW_ID_MON1_HPTEXT]; - PrintUIntOnWindow(partyMenu->msgPrinter, partyMenu->monsDrawState[partySlot].hp, 3, PRINTING_MODE_RIGHT_ALIGN, window, 0, 2); + PrintUIntOnWindow(partyMenu->msgPrinter, partyMenu->monsDrawState[partySlot].hp, 3, PADDING_MODE_SPACES, window, 0, 2); ScheduleWindowCopyToVram(window); } @@ -573,7 +573,7 @@ void PartyMenu_ClearMonHpTextWindow(PartyMenu *partyMenu, u8 partySlot) { static void PartyMenu_PrintMonMaxHpOnWindow(PartyMenu *partyMenu, u8 partySlot) { Window *window = &partyMenu->windows[partySlot * PARTY_MENU_WINDOWS_PER_MON + PARTY_MENU_WINDOW_ID_MON1_HPTEXT]; - PrintUIntOnWindow(partyMenu->msgPrinter, partyMenu->monsDrawState[partySlot].maxHp, 3, PRINTING_MODE_LEFT_ALIGN, window, 36, 2); + PrintUIntOnWindow(partyMenu->msgPrinter, partyMenu->monsDrawState[partySlot].maxHp, 3, PADDING_MODE_NONE, window, 36, 2); ScheduleWindowCopyToVram(window); } @@ -831,7 +831,7 @@ static void PartyMenu_PrintEvoStoneCompatString(PartyMenu *partyMenu, u8 partySl } // potential UB: in default case, string is uninitialized AddTextPrinterParameterizedWithColor(window, 0, string, 0, 0, TEXT_SPEED_NOTRANSFER, MAKE_TEXT_COLOR(15, 14, 0), NULL); - String_Delete(string); + String_Free(string); ScheduleWindowCopyToVram(window); } @@ -853,7 +853,7 @@ static void PartyMenu_PrintTMHMCompatString(PartyMenu *partyMenu, u8 partySlot, } // potential UB: in default case, string is uninitialized AddTextPrinterParameterizedWithColor(window, 0, string, 0, 0, TEXT_SPEED_NOTRANSFER, MAKE_TEXT_COLOR(15, 14, 0), NULL); - String_Delete(string); + String_Free(string); ScheduleWindowCopyToVram(window); } @@ -870,7 +870,7 @@ static void PartyMenu_PrintSuperContestCompatString(PartyMenu *partyMenu, u8 par string = NewString_ReadMsgData(partyMenu->msgData, msg_0300_00163); } AddTextPrinterParameterizedWithColor(window, 0, string, 0, 0, TEXT_SPEED_NOTRANSFER, MAKE_TEXT_COLOR(15, 14, 0), NULL); - String_Delete(string); + String_Free(string); ScheduleWindowCopyToVram(window); } @@ -887,7 +887,7 @@ static void sub_0207DD7C(PartyMenu *partyMenu, u8 partySlot, u8 a2) { string = NewString_ReadMsgData(partyMenu->msgData, msg_0300_00151); } AddTextPrinterParameterizedWithColor(window, 0, string, 0, 0, TEXT_SPEED_NOTRANSFER, MAKE_TEXT_COLOR(15, 14, 0), NULL); - String_Delete(string); + String_Free(string); ScheduleWindowCopyToVram(window); } @@ -913,19 +913,19 @@ void PartyMenu_LevelUpPrintStatsChange(PartyMenu *partyMenu) { for (i = 0; i < NUM_STATS; ++i) { str_statName = NewString_ReadMsgData(partyMenu->msgData, msg_0300_00169 + i); AddTextPrinterParameterized(&partyMenu->levelUpStatsWindow[0], 0, str_statName, 0, i * 16, TEXT_SPEED_NOTRANSFER, NULL); - String_Delete(str_statName); + String_Free(str_statName); AddTextPrinterParameterized(&partyMenu->levelUpStatsWindow[0], 0, str_plusSign, 80, i * 16, TEXT_SPEED_NOTRANSFER, NULL); str_formatInt = NewString_ReadMsgData(partyMenu->msgData, msg_0300_00176); - BufferIntegerAsString(partyMenu->msgFormat, 0, stats[i] - partyMenu->levelUpStatsTmp[i], 2, PRINTING_MODE_LEFT_ALIGN, TRUE); + BufferIntegerAsString(partyMenu->msgFormat, 0, stats[i] - partyMenu->levelUpStatsTmp[i], 2, PADDING_MODE_NONE, TRUE); StringExpandPlaceholders(partyMenu->msgFormat, partyMenu->formattedStrBuf, str_formatInt); - String_Delete(str_formatInt); + String_Free(str_formatInt); AddTextPrinterParameterized(&partyMenu->levelUpStatsWindow[0], 0, partyMenu->formattedStrBuf, 94, i * 16, TEXT_SPEED_NOTRANSFER, NULL); partyMenu->levelUpStatsTmp[i] = stats[i]; } - String_Delete(str_plusSign); + String_Free(str_plusSign); ScheduleWindowCopyToVram(&partyMenu->levelUpStatsWindow[0]); } @@ -936,11 +936,11 @@ void sub_0207DF98(PartyMenu *partyMenu) { FillWindowPixelRect(&partyMenu->levelUpStatsWindow[0], 15, 80, 0, 32, 112); spC = NewString_ReadMsgData(partyMenu->msgData, msg_0300_00176); for (i = 0; i < NUM_STATS; ++i) { - BufferIntegerAsString(partyMenu->msgFormat, 0, partyMenu->levelUpStatsTmp[i], 3, PRINTING_MODE_LEFT_ALIGN, TRUE); + BufferIntegerAsString(partyMenu->msgFormat, 0, partyMenu->levelUpStatsTmp[i], 3, PADDING_MODE_NONE, TRUE); StringExpandPlaceholders(partyMenu->msgFormat, partyMenu->formattedStrBuf, spC); AddTextPrinterParameterized(&partyMenu->levelUpStatsWindow[0], 0, partyMenu->formattedStrBuf, 104 - FontID_String_GetWidth(0, partyMenu->formattedStrBuf, 0), i * 16, TEXT_SPEED_NOTRANSFER, NULL); } - String_Delete(spC); + String_Free(spC); ScheduleWindowCopyToVram(&partyMenu->levelUpStatsWindow[0]); } @@ -961,14 +961,14 @@ void sub_0207E068(PartyMenu *partyMenu) { BufferBoxMonNickname(partyMenu->msgFormat, 0, Mon_GetBoxMon(mon)); StringExpandPlaceholders(partyMenu->msgFormat, partyMenu->formattedStrBuf, msg); AddTextPrinterParameterizedWithColor(&partyMenu->windows[PARTY_MENU_WINDOW_ID_37], 0, partyMenu->formattedStrBuf, 0, 0, TEXT_SPEED_NOTRANSFER, MAKE_TEXT_COLOR(15, 14, 0), NULL); - String_Delete(msg); + String_Free(msg); mon = Party_GetMonByIndex(partyMenu->args->party, partyMenu->partyMonIndex); msg = NewString_ReadMsgData(partyMenu->msgData, msg_0300_00182); BufferItemName(partyMenu->msgFormat, 1, GetMonData(mon, MON_DATA_HELD_ITEM, NULL)); StringExpandPlaceholders(partyMenu->msgFormat, partyMenu->formattedStrBuf, msg); AddTextPrinterParameterizedWithColor(&partyMenu->windows[PARTY_MENU_WINDOW_ID_39], 0, partyMenu->formattedStrBuf, 2, 4, TEXT_SPEED_NOTRANSFER, MAKE_TEXT_COLOR(15, 14, 0), NULL); - String_Delete(msg); + String_Free(msg); ScheduleWindowCopyToVram(&partyMenu->windows[PARTY_MENU_WINDOW_ID_37]); ScheduleWindowCopyToVram(&partyMenu->windows[PARTY_MENU_WINDOW_ID_39]); diff --git a/src/party_menu.c b/src/party_menu.c index 10e2603ecd..8c38a332ec 100644 --- a/src/party_menu.c +++ b/src/party_menu.c @@ -619,12 +619,12 @@ static BOOL PartyMenuApp_Exit(OverlayManager *manager, int *pState) { sub_02021238(); GF_DestroyVramTransferManager(); for (i = 0; i < PARTY_SIZE; ++i) { - String_Delete(partyMenu->monsDrawState[i].nickname); + String_Free(partyMenu->monsDrawState[i].nickname); } - String_Delete(partyMenu->formattedStrBuf); - String_Delete(partyMenu->unformattedStrBuf); + String_Free(partyMenu->formattedStrBuf); + String_Free(partyMenu->unformattedStrBuf); for (i = 0; i < 20; ++i) { - String_Delete(partyMenu->contextMenuStrings[i]); + String_Free(partyMenu->contextMenuStrings[i]); } DestroyMsgData(partyMenu->msgData); MessagePrinter_Delete(partyMenu->msgPrinter); @@ -1994,9 +1994,9 @@ static int PartyMenu_SelectedBattleTeamComplianceCheck(PartyMenu *partyMenu) { break; case BTL_REG_COMPLIANCE_FAIL_MAX_TOTAL_LEVEL: { String *string = NewString_ReadMsgData(partyMenu->msgData, msg_0300_00167); - BufferIntegerAsString(partyMenu->msgFormat, 0, LinkBattleRuleset_GetRuleValue(partyMenu->args->linkBattleRuleset, LINKBATTLERULE_MAX_TOTAL_LEVEL), 3, PRINTING_MODE_LEFT_ALIGN, TRUE); + BufferIntegerAsString(partyMenu->msgFormat, 0, LinkBattleRuleset_GetRuleValue(partyMenu->args->linkBattleRuleset, LINKBATTLERULE_MAX_TOTAL_LEVEL), 3, PADDING_MODE_NONE, TRUE); StringExpandPlaceholders(partyMenu->msgFormat, partyMenu->formattedStrBuf, string); - String_Delete(string); + String_Free(string); PartyMenu_PrintMessageOnWindow34(partyMenu, -1, TRUE); partyMenu->afterTextPrinterState = PARTY_MENU_STATE_SELECT_MONS_ERROR_MSG_CLOSE; PlaySE(SEQ_SE_DP_CUSTOM06); @@ -2280,9 +2280,9 @@ static int PartyMenu_Subtask_Softboiled(PartyMenu *partyMenu) { Pokemon *pokemon = Party_GetMonByIndex(partyMenu->args->party, partyMenu->partyMonIndex); String *string = NewString_ReadMsgData(partyMenu->msgData, msg_0300_00065); BufferBoxMonNickname(partyMenu->msgFormat, 0, Mon_GetBoxMon(pokemon)); - BufferIntegerAsString(partyMenu->msgFormat, 1, partyMenu->levelUpStatsTmp[2], 3, PRINTING_MODE_LEFT_ALIGN, TRUE); + BufferIntegerAsString(partyMenu->msgFormat, 1, partyMenu->levelUpStatsTmp[2], 3, PADDING_MODE_NONE, TRUE); StringExpandPlaceholders(partyMenu->msgFormat, partyMenu->formattedStrBuf, string); - String_Delete(string); + String_Free(string); PartyMenu_PrintMessageOnWindow34(partyMenu, -1, TRUE); partyMenu->levelUpStatsTmp[1] = 4; partyMenu->afterTextPrinterState = PARTY_MENU_STATE_SOFTBOILED; diff --git a/src/party_menu_items.c b/src/party_menu_items.c index be11a1de50..2863064464 100644 --- a/src/party_menu_items.c +++ b/src/party_menu_items.c @@ -221,121 +221,121 @@ static void PartyMenu_GetItemUseMessage(PartyMenu *partyMenu, u16 itemId, int pa case PARTY_MENU_ITEM_TYPE_PSN_HEAL: string = NewString_ReadMsgData(partyMenu->msgData, msg_0300_00066); StringExpandPlaceholders(partyMenu->msgFormat, partyMenu->formattedStrBuf, string); - String_Delete(string); + String_Free(string); break; case PARTY_MENU_ITEM_TYPE_SLP_HEAL: string = NewString_ReadMsgData(partyMenu->msgData, msg_0300_00092); StringExpandPlaceholders(partyMenu->msgFormat, partyMenu->formattedStrBuf, string); - String_Delete(string); + String_Free(string); break; case PARTY_MENU_ITEM_TYPE_BRN_HEAL: string = NewString_ReadMsgData(partyMenu->msgData, msg_0300_00068); StringExpandPlaceholders(partyMenu->msgFormat, partyMenu->formattedStrBuf, string); - String_Delete(string); + String_Free(string); break; case PARTY_MENU_ITEM_TYPE_FRZ_HEAL: string = NewString_ReadMsgData(partyMenu->msgData, msg_0300_00069); StringExpandPlaceholders(partyMenu->msgFormat, partyMenu->formattedStrBuf, string); - String_Delete(string); + String_Free(string); break; case PARTY_MENU_ITEM_TYPE_PRZ_HEAL: string = NewString_ReadMsgData(partyMenu->msgData, msg_0300_00067); StringExpandPlaceholders(partyMenu->msgFormat, partyMenu->formattedStrBuf, string); - String_Delete(string); + String_Free(string); break; case PARTY_MENU_ITEM_TYPE_CFS_HEAL: string = NewString_ReadMsgData(partyMenu->msgData, msg_0300_00074); StringExpandPlaceholders(partyMenu->msgFormat, partyMenu->formattedStrBuf, string); - String_Delete(string); + String_Free(string); break; case PARTY_MENU_ITEM_TYPE_INF_HEAL: string = NewString_ReadMsgData(partyMenu->msgData, msg_0300_00075); StringExpandPlaceholders(partyMenu->msgFormat, partyMenu->formattedStrBuf, string); - String_Delete(string); + String_Free(string); break; case PARTY_MENU_ITEM_TYPE_FULL_HEAL: string = NewString_ReadMsgData(partyMenu->msgData, msg_0300_00072); StringExpandPlaceholders(partyMenu->msgFormat, partyMenu->formattedStrBuf, string); - String_Delete(string); + String_Free(string); break; case PARTY_MENU_ITEM_TYPE_HP_EV_UP: string = NewString_ReadMsgData(partyMenu->msgData, msg_0300_00076); BufferStatName(partyMenu->msgFormat, 1, STAT_HP); StringExpandPlaceholders(partyMenu->msgFormat, partyMenu->formattedStrBuf, string); - String_Delete(string); + String_Free(string); break; case PARTY_MENU_ITEM_TYPE_ATK_EV_UP: string = NewString_ReadMsgData(partyMenu->msgData, msg_0300_00076); BufferStatName(partyMenu->msgFormat, 1, STAT_ATK); StringExpandPlaceholders(partyMenu->msgFormat, partyMenu->formattedStrBuf, string); - String_Delete(string); + String_Free(string); break; case PARTY_MENU_ITEM_TYPE_DEF_EV_UP: string = NewString_ReadMsgData(partyMenu->msgData, msg_0300_00076); BufferStatName(partyMenu->msgFormat, 1, STAT_DEF); StringExpandPlaceholders(partyMenu->msgFormat, partyMenu->formattedStrBuf, string); - String_Delete(string); + String_Free(string); break; case PARTY_MENU_ITEM_TYPE_SPEED_EV_UP: string = NewString_ReadMsgData(partyMenu->msgData, msg_0300_00076); BufferStatName(partyMenu->msgFormat, 1, STAT_SPEED); StringExpandPlaceholders(partyMenu->msgFormat, partyMenu->formattedStrBuf, string); - String_Delete(string); + String_Free(string); break; case PARTY_MENU_ITEM_TYPE_SPATK_EV_UP: string = NewString_ReadMsgData(partyMenu->msgData, msg_0300_00076); BufferStatName(partyMenu->msgFormat, 1, STAT_SPATK); StringExpandPlaceholders(partyMenu->msgFormat, partyMenu->formattedStrBuf, string); - String_Delete(string); + String_Free(string); break; case PARTY_MENU_ITEM_TYPE_SPDEF_EV_UP: string = NewString_ReadMsgData(partyMenu->msgData, msg_0300_00076); BufferStatName(partyMenu->msgFormat, 1, STAT_SPDEF); StringExpandPlaceholders(partyMenu->msgFormat, partyMenu->formattedStrBuf, string); - String_Delete(string); + String_Free(string); break; case PARTY_MENU_ITEM_TYPE_HP_EV_DOWN: string = NewString_ReadMsgData(partyMenu->msgData, param + msg_0300_00104); BufferStatName(partyMenu->msgFormat, 1, STAT_HP); StringExpandPlaceholders(partyMenu->msgFormat, partyMenu->formattedStrBuf, string); - String_Delete(string); + String_Free(string); break; case PARTY_MENU_ITEM_TYPE_ATK_EV_DOWN: string = NewString_ReadMsgData(partyMenu->msgData, param + msg_0300_00104); BufferStatName(partyMenu->msgFormat, 1, STAT_ATK); StringExpandPlaceholders(partyMenu->msgFormat, partyMenu->formattedStrBuf, string); - String_Delete(string); + String_Free(string); break; case PARTY_MENU_ITEM_TYPE_DEF_EV_DOWN: string = NewString_ReadMsgData(partyMenu->msgData, param + msg_0300_00104); BufferStatName(partyMenu->msgFormat, 1, STAT_DEF); StringExpandPlaceholders(partyMenu->msgFormat, partyMenu->formattedStrBuf, string); - String_Delete(string); + String_Free(string); break; case PARTY_MENU_ITEM_TYPE_SPEED_EV_DOWN: string = NewString_ReadMsgData(partyMenu->msgData, param + msg_0300_00104); BufferStatName(partyMenu->msgFormat, 1, STAT_SPEED); StringExpandPlaceholders(partyMenu->msgFormat, partyMenu->formattedStrBuf, string); - String_Delete(string); + String_Free(string); break; case PARTY_MENU_ITEM_TYPE_SPATK_EV_DOWN: string = NewString_ReadMsgData(partyMenu->msgData, param + msg_0300_00104); BufferStatName(partyMenu->msgFormat, 1, STAT_SPATK); StringExpandPlaceholders(partyMenu->msgFormat, partyMenu->formattedStrBuf, string); - String_Delete(string); + String_Free(string); break; case PARTY_MENU_ITEM_TYPE_SPDEF_EV_DOWN: string = NewString_ReadMsgData(partyMenu->msgData, param + msg_0300_00104); BufferStatName(partyMenu->msgFormat, 1, STAT_SPDEF); StringExpandPlaceholders(partyMenu->msgFormat, partyMenu->formattedStrBuf, string); - String_Delete(string); + String_Free(string); break; case PARTY_MENU_ITEM_TYPE_PP_UP: case PARTY_MENU_ITEM_TYPE_PP_MAX: string = NewString_ReadMsgData(partyMenu->msgData, msg_0300_00073); BufferMoveName(partyMenu->msgFormat, 0, param); StringExpandPlaceholders(partyMenu->msgFormat, partyMenu->formattedStrBuf, string); - String_Delete(string); + String_Free(string); break; case PARTY_MENU_ITEM_TYPE_PP_RESTORE: ReadMsgDataIntoString(partyMenu->msgData, msg_0300_00070, partyMenu->formattedStrBuf); @@ -453,9 +453,9 @@ static int PartyMenu_ItemUseFunc_HPRestore(PartyMenu *partyMenu) { string = NewString_ReadMsgData(partyMenu->msgData, msg_0300_00065); } BufferBoxMonNickname(partyMenu->msgFormat, 0, Mon_GetBoxMon(mon)); - BufferIntegerAsString(partyMenu->msgFormat, 1, hp - partyMenu->monsDrawState[partyMenu->partyMonIndex].hp, 3, PRINTING_MODE_LEFT_ALIGN, TRUE); + BufferIntegerAsString(partyMenu->msgFormat, 1, hp - partyMenu->monsDrawState[partyMenu->partyMonIndex].hp, 3, PADDING_MODE_NONE, TRUE); StringExpandPlaceholders(partyMenu->msgFormat, partyMenu->formattedStrBuf, string); - String_Delete(string); + String_Free(string); int statusIcon = Pokemon_GetStatusIconId(mon); PartyMenu_DrawMonStatusIcon(partyMenu, partyMenu->partyMonIndex, statusIcon); if (statusIcon == PARTY_MON_STATUS_ICON_OK) { @@ -529,7 +529,7 @@ int PartyMenu_Subtask_SacredAsh(PartyMenu *partyMenu) { string = NewString_ReadMsgData(partyMenu->msgData, msg_0300_00071); BufferBoxMonNickname(partyMenu->msgFormat, 0, Mon_GetBoxMon(mon)); StringExpandPlaceholders(partyMenu->msgFormat, partyMenu->formattedStrBuf, string); - String_Delete(string); + String_Free(string); partyMenu->monsDrawState[partyMenu->partyMonIndex].status = PARTY_MON_STATUS_ICON_OK; PartyMenu_DrawMonStatusIcon(partyMenu, partyMenu->partyMonIndex, partyMenu->monsDrawState[partyMenu->partyMonIndex].status); PartyMenu_PrintMonLevelOnWindow(partyMenu, partyMenu->partyMonIndex); @@ -585,9 +585,9 @@ static int PartyMenu_ItemUseFunc_LevelUp(PartyMenu *partyMenu) { partyMenu->monsDrawState[partyMenu->partyMonIndex].maxHp = GetMonData(mon, MON_DATA_MAX_HP, NULL); String *string = NewString_ReadMsgData(partyMenu->msgData, msg_0300_00177); BufferBoxMonNickname(partyMenu->msgFormat, 0, Mon_GetBoxMon(mon)); - BufferIntegerAsString(partyMenu->msgFormat, 1, partyMenu->monsDrawState[partyMenu->partyMonIndex].level, 3, PRINTING_MODE_LEFT_ALIGN, TRUE); + BufferIntegerAsString(partyMenu->msgFormat, 1, partyMenu->monsDrawState[partyMenu->partyMonIndex].level, 3, PADDING_MODE_NONE, TRUE); StringExpandPlaceholders(partyMenu->msgFormat, partyMenu->formattedStrBuf, string); - String_Delete(string); + String_Free(string); int statusIcon = Pokemon_GetStatusIconId(mon); PartyMenu_DrawMonStatusIcon(partyMenu, partyMenu->partyMonIndex, statusIcon); if (statusIcon == PARTY_MON_STATUS_ICON_OK) { @@ -644,7 +644,7 @@ static int PartyMenu_ItemUseFunc_LevelUpLearnMovesLoop(PartyMenu *partyMenu) { BufferMoveName(partyMenu->msgFormat, 1, partyMenu->args->moveId); string = NewString_ReadMsgData(partyMenu->msgData, msg_0300_00053); StringExpandPlaceholders(partyMenu->msgFormat, partyMenu->formattedStrBuf, string); - String_Delete(string); + String_Free(string); PartyMenu_PrintMessageOnWindow34(partyMenu, -1, FALSE); partyMenu->yesCallback = PartyMenu_ItemUseFunc_LevelUpPromptForgetMove; partyMenu->noCallback = PartyMenu_ItemUseFunc_LevelUpAskStopTryingToLearn; @@ -655,7 +655,7 @@ static int PartyMenu_ItemUseFunc_LevelUpLearnMovesLoop(PartyMenu *partyMenu) { BufferMoveName(partyMenu->msgFormat, 1, partyMenu->args->moveId); string = NewString_ReadMsgData(partyMenu->msgData, msg_0300_00178); StringExpandPlaceholders(partyMenu->msgFormat, partyMenu->formattedStrBuf, string); - String_Delete(string); + String_Free(string); PartyMenu_PrintMessageOnWindow34(partyMenu, -1, FALSE); partyMenu->levelUpLearnMovesLoopState = 4; break; @@ -672,7 +672,7 @@ static int PartyMenu_ItemUseFunc_LevelUpLearnMovesLoop(PartyMenu *partyMenu) { string = NewString_ReadMsgData(partyMenu->msgData, msg_0300_00062); BufferMoveName(partyMenu->msgFormat, 1, partyMenu->args->moveId); StringExpandPlaceholders(partyMenu->msgFormat, partyMenu->formattedStrBuf, string); - String_Delete(string); + String_Free(string); PartyMenu_PrintMessageOnWindow34(partyMenu, -1, FALSE); partyMenu->levelUpLearnMovesLoopState = 4; break; @@ -699,7 +699,7 @@ int PartyMenu_ItemUseFunc_LevelUpDoLearnMove(PartyMenu *partyMenu) { BufferMoveName(partyMenu->msgFormat, 1, GetMonData(mon, MON_DATA_MOVE1 + partyMenu->args->selectedMoveIdx, NULL)); String *string = NewString_ReadMsgData(partyMenu->msgData, msg_0300_00061); StringExpandPlaceholders(partyMenu->msgFormat, partyMenu->formattedStrBuf, string); - String_Delete(string); + String_Free(string); PartyMenu_PrintMessageOnWindow34(partyMenu, -1, TRUE); partyMenu->afterTextPrinterState = PARTY_MENU_STATE_ITEM_USE_CB; partyMenu->levelUpLearnMovesLoopState = 5; @@ -710,7 +710,7 @@ int PartyMenu_ItemUseFunc_LevelUpDoLearnMove(PartyMenu *partyMenu) { static int PartyMenu_ItemUseFunc_LevelUpPromptForgetMove(PartyMenu *partyMenu) { String *string = NewString_ReadMsgData(partyMenu->msgData, msg_0300_00060); StringExpandPlaceholders(partyMenu->msgFormat, partyMenu->formattedStrBuf, string); - String_Delete(string); + String_Free(string); PartyMenu_PrintMessageOnWindow34(partyMenu, -1, FALSE); partyMenu->args->selectedAction = PARTY_MENU_ACTION_RETURN_5; partyMenu->afterTextPrinterState = PARTY_MENU_STATE_AFTER_MESSAGE_BEGIN_EXIT; @@ -720,7 +720,7 @@ static int PartyMenu_ItemUseFunc_LevelUpPromptForgetMove(PartyMenu *partyMenu) { static int PartyMenu_ItemUseFunc_LevelUpAskStopTryingToLearn(PartyMenu *partyMenu) { String *string = NewString_ReadMsgData(partyMenu->msgData, msg_0300_00056); StringExpandPlaceholders(partyMenu->msgFormat, partyMenu->formattedStrBuf, string); - String_Delete(string); + String_Free(string); PartyMenu_PrintMessageOnWindow34(partyMenu, -1, TRUE); partyMenu->yesCallback = PartyMenu_ItemUseFunc_LevelUpDidNotLearnMove; partyMenu->noCallback = PartyMenu_ItemUseFunc_LevelUpAskAgainToForget; @@ -731,7 +731,7 @@ static int PartyMenu_ItemUseFunc_LevelUpAskStopTryingToLearn(PartyMenu *partyMen static int PartyMenu_ItemUseFunc_LevelUpDidNotLearnMove(PartyMenu *partyMenu) { String *string = NewString_ReadMsgData(partyMenu->msgData, msg_0300_00059); StringExpandPlaceholders(partyMenu->msgFormat, partyMenu->formattedStrBuf, string); - String_Delete(string); + String_Free(string); PartyMenu_PrintMessageOnWindow34(partyMenu, -1, FALSE); partyMenu->afterTextPrinterState = PARTY_MENU_STATE_ITEM_USE_CB; partyMenu->levelUpLearnMovesLoopState = 4; @@ -741,7 +741,7 @@ static int PartyMenu_ItemUseFunc_LevelUpDidNotLearnMove(PartyMenu *partyMenu) { static int PartyMenu_ItemUseFunc_LevelUpAskAgainToForget(PartyMenu *partyMenu) { String *string = NewString_ReadMsgData(partyMenu->msgData, msg_0300_00053); StringExpandPlaceholders(partyMenu->msgFormat, partyMenu->formattedStrBuf, string); - String_Delete(string); + String_Free(string); PartyMenu_PrintMessageOnWindow34(partyMenu, -1, FALSE); partyMenu->yesCallback = PartyMenu_ItemUseFunc_LevelUpPromptForgetMove; partyMenu->noCallback = PartyMenu_ItemUseFunc_LevelUpAskStopTryingToLearn; @@ -787,7 +787,7 @@ int PartyMenu_HandleUseTMHMonMon(PartyMenu *partyMenu) { PartyMenu_LearnMoveToSlot(partyMenu, mon, response); string = NewString_ReadMsgData(partyMenu->msgData, msg_0300_00062); StringExpandPlaceholders(partyMenu->msgFormat, partyMenu->formattedStrBuf, string); - String_Delete(string); + String_Free(string); PartyMenu_PrintMessageOnWindow34(partyMenu, -1, TRUE); partyMenu->args->selectedAction = PARTY_MENU_ACTION_RETURN_0; partyMenu->afterTextPrinterState = PARTY_MENU_STATE_AFTER_MESSAGE_BEGIN_EXIT; @@ -795,7 +795,7 @@ int PartyMenu_HandleUseTMHMonMon(PartyMenu *partyMenu) { case LEARN_MOVE_CHECK_KNOWN: string = NewString_ReadMsgData(partyMenu->msgData, msg_0300_00064); StringExpandPlaceholders(partyMenu->msgFormat, partyMenu->formattedStrBuf, string); - String_Delete(string); + String_Free(string); PartyMenu_PrintMessageOnWindow34(partyMenu, -1, TRUE); partyMenu->args->selectedAction = PARTY_MENU_ACTION_RETURN_0; partyMenu->afterTextPrinterState = PARTY_MENU_STATE_AFTER_MESSAGE_BEGIN_EXIT; @@ -803,7 +803,7 @@ int PartyMenu_HandleUseTMHMonMon(PartyMenu *partyMenu) { case LEARN_MOVE_CHECK_FULL: string = NewString_ReadMsgData(partyMenu->msgData, msg_0300_00053); StringExpandPlaceholders(partyMenu->msgFormat, partyMenu->formattedStrBuf, string); - String_Delete(string); + String_Free(string); PartyMenu_PrintMessageOnWindow34(partyMenu, -1, TRUE); partyMenu->yesCallback = PartyMenu_ItemUseFunc_TMHMPromptForgetMove; partyMenu->noCallback = PartyMenu_ItemUseFunc_TMHMAskStopTryingToLearn; @@ -812,7 +812,7 @@ int PartyMenu_HandleUseTMHMonMon(PartyMenu *partyMenu) { case LEARN_MOVE_CHECK_INCOMPAT: string = NewString_ReadMsgData(partyMenu->msgData, msg_0300_00063); StringExpandPlaceholders(partyMenu->msgFormat, partyMenu->formattedStrBuf, string); - String_Delete(string); + String_Free(string); PartyMenu_PrintMessageOnWindow34(partyMenu, -1, TRUE); partyMenu->args->selectedAction = PARTY_MENU_ACTION_RETURN_0; partyMenu->afterTextPrinterState = PARTY_MENU_STATE_AFTER_MESSAGE_BEGIN_EXIT; @@ -831,7 +831,7 @@ int PartyMenu_ItemUseFunc_TMHMDoLearnMove(PartyMenu *partyMenu) { BufferMoveName(partyMenu->msgFormat, 1, GetMonData(mon, MON_DATA_MOVE1 + partyMenu->args->selectedMoveIdx, NULL)); String *string = NewString_ReadMsgData(partyMenu->msgData, msg_0300_00061); StringExpandPlaceholders(partyMenu->msgFormat, partyMenu->formattedStrBuf, string); - String_Delete(string); + String_Free(string); PartyMenu_PrintMessageOnWindow34(partyMenu, -1, TRUE); partyMenu->afterTextPrinterState = PARTY_MENU_STATE_TMHM_LEARN_MOVE; return PARTY_MENU_STATE_WAIT_TEXT_PRINTER; @@ -844,7 +844,7 @@ int PartyMenu_Subtask_TMHMLearnMove(PartyMenu *partyMenu) { String *string = NewString_ReadMsgData(partyMenu->msgData, msg_0300_00062); BufferMoveName(partyMenu->msgFormat, 1, partyMenu->args->moveId); StringExpandPlaceholders(partyMenu->msgFormat, partyMenu->formattedStrBuf, string); - String_Delete(string); + String_Free(string); PartyMenu_PrintMessageOnWindow34(partyMenu, -1, FALSE); partyMenu->args->selectedAction = PARTY_MENU_ACTION_RETURN_0; partyMenu->afterTextPrinterState = PARTY_MENU_STATE_AFTER_MESSAGE_BEGIN_EXIT; @@ -854,7 +854,7 @@ int PartyMenu_Subtask_TMHMLearnMove(PartyMenu *partyMenu) { static int PartyMenu_ItemUseFunc_TMHMPromptForgetMove(PartyMenu *partyMenu) { String *string = NewString_ReadMsgData(partyMenu->msgData, msg_0300_00060); StringExpandPlaceholders(partyMenu->msgFormat, partyMenu->formattedStrBuf, string); - String_Delete(string); + String_Free(string); PartyMenu_PrintMessageOnWindow34(partyMenu, -1, FALSE); partyMenu->args->selectedAction = PARTY_MENU_ACTION_RETURN_4; partyMenu->afterTextPrinterState = PARTY_MENU_STATE_AFTER_MESSAGE_BEGIN_EXIT; @@ -864,7 +864,7 @@ static int PartyMenu_ItemUseFunc_TMHMPromptForgetMove(PartyMenu *partyMenu) { static int PartyMenu_ItemUseFunc_TMHMAskStopTryingToLearn(PartyMenu *partyMenu) { String *string = NewString_ReadMsgData(partyMenu->msgData, msg_0300_00056); StringExpandPlaceholders(partyMenu->msgFormat, partyMenu->formattedStrBuf, string); - String_Delete(string); + String_Free(string); PartyMenu_PrintMessageOnWindow34(partyMenu, -1, TRUE); partyMenu->yesCallback = PartyMenu_ItemUseFunc_TMHMDidNotLearnMove; partyMenu->noCallback = PartyMenu_ItemUseFunc_TMHMAskAgainToForget; @@ -875,7 +875,7 @@ static int PartyMenu_ItemUseFunc_TMHMAskStopTryingToLearn(PartyMenu *partyMenu) static int PartyMenu_ItemUseFunc_TMHMDidNotLearnMove(PartyMenu *partyMenu) { String *string = NewString_ReadMsgData(partyMenu->msgData, msg_0300_00059); StringExpandPlaceholders(partyMenu->msgFormat, partyMenu->formattedStrBuf, string); - String_Delete(string); + String_Free(string); PartyMenu_PrintMessageOnWindow34(partyMenu, -1, FALSE); partyMenu->args->selectedAction = PARTY_MENU_ACTION_RETURN_0; partyMenu->afterTextPrinterState = PARTY_MENU_STATE_AFTER_MESSAGE_BEGIN_EXIT; @@ -885,7 +885,7 @@ static int PartyMenu_ItemUseFunc_TMHMDidNotLearnMove(PartyMenu *partyMenu) { static int PartyMenu_ItemUseFunc_TMHMAskAgainToForget(PartyMenu *partyMenu) { String *string = NewString_ReadMsgData(partyMenu->msgData, msg_0300_00053); StringExpandPlaceholders(partyMenu->msgFormat, partyMenu->formattedStrBuf, string); - String_Delete(string); + String_Free(string); PartyMenu_PrintMessageOnWindow34(partyMenu, -1, FALSE); partyMenu->yesCallback = PartyMenu_ItemUseFunc_TMHMPromptForgetMove; partyMenu->noCallback = PartyMenu_ItemUseFunc_TMHMAskStopTryingToLearn; @@ -915,7 +915,7 @@ u8 PartyMenu_AddMoveNameToList(PartyMenu *partyMenu, int moveIdx) { String *string = NewString_ReadMsgData(partyMenu->msgData, msg_0300_00145 + moveIdx); BufferMoveName(partyMenu->msgFormat, 0, moveId); StringExpandPlaceholders(partyMenu->msgFormat, partyMenu->unformattedStrBuf, string); - String_Delete(string); + String_Free(string); if (moveId == MOVE_NONE) { return FALSE; } else { diff --git a/src/photo_album.c b/src/photo_album.c index 95ba849574..6687289d3b 100644 --- a/src/photo_album.c +++ b/src/photo_album.c @@ -2,7 +2,7 @@ #include "global.h" -#include "pm_string.h" +#include "string_gf.h" static BOOL Photo_IsUse(const Photo *photo); diff --git a/src/player_data.c b/src/player_data.c index 9213da35fd..3a607886d8 100644 --- a/src/player_data.c +++ b/src/player_data.c @@ -73,7 +73,7 @@ void Save_Profile_PlayerName_Set(PlayerProfile *profile, u16 *name) { } void PlayerName_StringToFlat(PlayerProfile *profile, String *str) { - CopyStringToU16Array(str, profile->name, PLAYER_NAME_LENGTH + 1); + String_CopyToChars(str, profile->name, PLAYER_NAME_LENGTH + 1); } const u16 *PlayerProfile_GetNamePtr(const PlayerProfile *profile) { @@ -81,7 +81,7 @@ const u16 *PlayerProfile_GetNamePtr(const PlayerProfile *profile) { } void PlayerName_FlatToString(PlayerProfile *profile, String *str) { - CopyU16ArrayToString(str, profile->name); + String_CopyFromChars(str, profile->name); } String *PlayerProfile_GetPlayerName_NewString(PlayerProfile *profile, enum HeapID heapID) { diff --git a/src/pm_string.c b/src/pm_string.c deleted file mode 100644 index 8c3b80622f..0000000000 --- a/src/pm_string.c +++ /dev/null @@ -1,440 +0,0 @@ -#include "pm_string.h" - -#include "global.h" - -#include "font.h" -#include "heap.h" -#include "math_util.h" - -#define STRING_MAGIC (0xB6F8D2EC) -#define STRING_INVAL (0xB6F8D2ED) - -#define ASSERT_STRING(str) \ - do { \ - GF_ASSERT(str != NULL); \ - GF_ASSERT((str)->magic == STRING_MAGIC); \ - } while (0) - -String *String_New(u32 maxsize, enum HeapID heapID) { - String *ret = (String *)Heap_Alloc(heapID, 2 * maxsize + sizeof(String) + sizeof(u16)); - if (ret != NULL) { - ret->magic = STRING_MAGIC; - ret->maxsize = maxsize; - ret->size = 0; - ret->data[0] = EOS; - } - return ret; -} - -void String_Delete(String *string) { - ASSERT_STRING(string); - string->magic = STRING_INVAL; - Heap_Free(string); -} - -void String_SetEmpty(String *string) { - ASSERT_STRING(string); - string->size = 0; - string->data[0] = EOS; -} - -void String_Copy(String *dest, const String *src) { - ASSERT_STRING(dest); - ASSERT_STRING(src); - if (dest->maxsize > src->size) { - memcpy(dest->data, src->data, (src->size + 1) * 2); - dest->size = src->size; - return; - } - GF_ASSERT(FALSE); -} - -String *String_Dup(const String *src, enum HeapID heapID) { - String *ret; - ASSERT_STRING(src); - ret = String_New(src->size + 1, heapID); - if (ret != NULL) { - String_Copy(ret, src); - } - return ret; -} - -void String16_FormatInteger(String *str, int num, u32 ndigits, PrintingMode strConvMode, BOOL whichCharset) { - static const u32 sPowersOfTen[10] = { - 1ul, - 10ul, - 100ul, - 1000ul, - 10000ul, - 100000ul, - 1000000ul, - 10000000ul, - 100000000ul, - 1000000000ul, - }; - - static const u16 sCharset_JP[10] = { - 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 u16 sCharset_EN[10] = { - CHAR_0, - CHAR_1, - CHAR_2, - CHAR_3, - CHAR_4, - CHAR_5, - CHAR_6, - CHAR_7, - CHAR_8, - CHAR_9, - }; - - ASSERT_STRING(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) ? CHAR_JP_HYPHEN : CHAR_HYPHEN); - str->data[str->size++] = hyphen; - } - u32 dividend = sPowersOfTen[ndigits - 1]; - while (dividend != 0) { - u16 digit = (u16)(num / dividend); - num -= dividend * digit; - if (strConvMode == PRINTING_MODE_LEADING_ZEROS) { - u16 value = (u16)((digit < 10) ? charbase[digit] : CHAR_JP_QUESTION_MARK); - str->data[str->size++] = value; - } else if (digit != 0 || dividend == 1) { - strConvMode = PRINTING_MODE_LEADING_ZEROS; - u16 value = (u16)((digit < 10) ? charbase[digit] : CHAR_JP_QUESTION_MARK); - str->data[str->size++] = value; - } else if (strConvMode == PRINTING_MODE_RIGHT_ALIGN) { - u16 value = (u16)((whichCharset == 0) ? CHAR_JP_SPACE : CHAR_NARROW_SPACE); - str->data[str->size++] = value; - } - dividend /= 10; - } - str->data[str->size] = EOS; - return; - } - GF_ASSERT(FALSE); -} - -void String16_FormatUnsignedLongLong(String *str, u64 num, u32 ndigits, PrintingMode strConvMode, BOOL whichCharset) { - static const u64 sPowersOfTen[20] = { - 1ull, - 10ull, - 100ull, - 1000ull, - 10000ull, - 100000ull, - 1000000ull, - 10000000ull, - 100000000ull, - 1000000000ull, - 10000000000ull, - 100000000000ull, - 1000000000000ull, - 10000000000000ull, - 100000000000000ull, - 1000000000000000ull, - 10000000000000000ull, - 100000000000000000ull, - 1000000000000000000ull, - 10000000000000000000ull, - }; - - static const u16 sCharset_JP[10] = { - 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 u16 sCharset_EN[10] = { - CHAR_0, - CHAR_1, - CHAR_2, - CHAR_3, - CHAR_4, - CHAR_5, - CHAR_6, - CHAR_7, - CHAR_8, - CHAR_9, - }; - - ASSERT_STRING(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) ? CHAR_JP_HYPHEN : CHAR_HYPHEN); - str->data[str->size++] = hyphen; - } - u64 dividend = sPowersOfTen[ndigits - 1]; - while (dividend != 0ull) { - u64 digit = num / dividend; - num -= dividend * digit; - if (strConvMode == PRINTING_MODE_LEADING_ZEROS) { - u16 value = (u16)((digit < 10ull) ? charbase[digit] : CHAR_JP_QUESTION_MARK); - str->data[str->size++] = value; - } else if (digit != 0 || dividend == 1) { - strConvMode = PRINTING_MODE_LEADING_ZEROS; - u16 value = (u16)((digit < 10ull) ? charbase[digit] : CHAR_JP_QUESTION_MARK); - str->data[str->size++] = value; - } else if (strConvMode == PRINTING_MODE_RIGHT_ALIGN) { - u16 value = (u16)((whichCharset == 0) ? CHAR_JP_SPACE : CHAR_SPACE); - str->data[str->size++] = value; - } - dividend /= 10ull; - } - str->data[str->size] = EOS; - return; - } - GF_ASSERT(FALSE); -} - -s64 String_atoi(String *str, BOOL *flag) { - s64 ret = 0ll; - s64 pow10 = 1ll; - if (str->size > 18) { - return 0; - } - int ndigits = str->size - 1; - while (ndigits >= 0) { - s64 digit = str->data[ndigits] - CHAR_JP_0; - if (digit >= 10ull) { - digit = str->data[ndigits] - CHAR_0; - if (digit >= 10ull) { - *flag = FALSE; - return ret; - } - } - digit *= pow10; - ret += digit; - pow10 *= 10ll; - ndigits--; - } - *flag = TRUE; - return ret; -} - -BOOL String_Compare(String *str1, String *str2) { - ASSERT_STRING(str1); - ASSERT_STRING(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 *str) { - ASSERT_STRING(str); - return str->size; -} - -int String_CountLines(volatile String *str) { - ASSERT_STRING(str); - - int i, nline; - for (i = 0, nline = 1; i < str->size; i++) { - if (str->data[i] == CHAR_LF) { - nline++; - } - } - return nline; -} - -void String_GetLineN(String *dest, volatile String *src, u32 n) { - ASSERT_STRING(src); - ASSERT_STRING(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; - } - String_AddChar(dest, c); - } -} - -void String_RadioAddStatic(String *string, u8 level) { - u32 width_3dots = FontID_GetGlyphWidth(0, CHAR_ELLIPSIS); - u32 width_1dot = FontID_GetGlyphWidth(0, CHAR_ONE_DOT); - u32 width_2dots = FontID_GetGlyphWidth(0, CHAR_TWO_DOTS); - u32 cur_width; - int str_len; - int i; - - ASSERT_STRING(string); - str_len = String_GetLength(string); // the result is never used - for (i = 0; i < string->size - 1; i++) { - if (string->data[i] != CHAR_SPACE && ((MTRandom() / 256u) % 101) < level) { - cur_width = FontID_GetGlyphWidth(0, string->data[i]); - if (cur_width >= width_3dots) { - string->data[i] = CHAR_ELLIPSIS; - } else if (cur_width >= width_2dots) { - string->data[i] = CHAR_TWO_DOTS; - } else if (cur_width >= width_1dot) { - string->data[i] = CHAR_ONE_DOT; - } - } - } -} - -void CopyU16ArrayToString(String *str, const u16 *buf) { - ASSERT_STRING(str); - - for (str->size = 0; *buf != EOS;) { - if (str->size >= str->maxsize - 1) { - GF_ASSERT(FALSE); - break; - } - str->data[str->size++] = *buf++; - } - str->data[str->size] = EOS; -} - -void CopyU16ArrayToStringN(String *str, const u16 *buf, u32 length) { - ASSERT_STRING(str); - - if (length <= str->maxsize) { - int i; - memcpy(str->data, buf, length * 2); - 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(FALSE); -} - -void CopyStringToU16Array(const String *str, u16 *buf, u32 length) { - ASSERT_STRING(str); - - if (str->size + 1 <= length) { - memcpy(buf, str->data, (u32)((str->size + 1) * 2)); - return; - } - GF_ASSERT(FALSE); -} - -u16 *String_cstr(String *str) { - ASSERT_STRING(str); - - return str->data; -} - -void String_Cat(String *dest, String *src) { - ASSERT_STRING(dest); - ASSERT_STRING(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(FALSE); -} - -void String_AddChar(String *str, u16 val) { - ASSERT_STRING(str); - - if (str->size + 1 < str->maxsize) { - str->data[str->size++] = val; - str->data[str->size] = EOS; - return; - } - GF_ASSERT(FALSE); -} - -BOOL String_IsTrainerName(String *string) { - return string->size != 0 && string->data[0] == TRNAMECODE; -} - -void String_Cat_HandleTrainerName(String *dest, 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) & TRNAME_MASK); - bit += 9; - if (bit >= 15) { - src_p++; - bit -= 15; - if (bit != 0) { - cur_char |= (*src_p << (9 - bit)) & TRNAME_MASK; - } - } - if (cur_char == EOS_TRNAME) { - break; - } - *dest_p++ = cur_char; - outsize++; - } - *dest_p = EOS; - dest->size += outsize; - } else { - String_Cat(dest, src); - } -} - -void String_UpperCharN(String *str, int n) { - ASSERT_STRING(str); - - if (str->size > n) { - if (str->data[n] >= CHAR_a && str->data[n] <= CHAR_z) { - str->data[n] += CHAR_A - CHAR_a; - } - } -} diff --git a/src/pokemon.c b/src/pokemon.c index abf453e39a..895a860cae 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -748,9 +748,9 @@ static u32 GetBoxMonDataInternal(BoxPokemon *boxMon, int attr, void *dest) { if (boxMon->checksumFailed) { String *buffer = GetSpeciesName(SPECIES_MANAPHY_EGG, HEAP_ID_DEFAULT); String_Copy(dest, buffer); - String_Delete(buffer); + String_Free(buffer); } else { - CopyU16ArrayToString(dest, blockC->nickname); + String_CopyFromChars(dest, blockC->nickname); } break; case MON_DATA_UNUSED_121: @@ -794,7 +794,7 @@ static u32 GetBoxMonDataInternal(BoxPokemon *boxMon, int attr, void *dest) { dest16[ret] = EOS; } break; case MON_DATA_OT_NAME_STRING: - CopyU16ArrayToString(dest, blockD->otName); + String_CopyFromChars(dest, blockD->otName); break; case MON_DATA_EGG_YEAR: ret = blockD->eggYear; @@ -1204,11 +1204,11 @@ static void SetBoxMonDataInternal(BoxPokemon *boxMon, int attr, const void *valu 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->hasNickname = 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_121: blockC->unused = VALUE(u8); @@ -1251,7 +1251,7 @@ static void SetBoxMonDataInternal(BoxPokemon *boxMon, int attr, const void *valu } break; case MON_DATA_OT_NAME_STRING: - CopyStringToU16Array(value, blockD->otName, PLAYER_NAME_LENGTH + 1); + String_CopyToChars(value, blockD->otName, PLAYER_NAME_LENGTH + 1); break; case MON_DATA_EGG_YEAR: blockD->eggYear = VALUE(u8); @@ -1324,8 +1324,8 @@ static void SetBoxMonDataInternal(BoxPokemon *boxMon, int attr, const void *valu 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; case MON_DATA_SHINY_LEAF_A: case MON_DATA_SHINY_LEAF_B: @@ -4123,8 +4123,8 @@ BOOL BoxmonBelongsToPlayer(BoxPokemon *boxMon, PlayerProfile *profile, enum Heap 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/src/pokemon_storage_system.c b/src/pokemon_storage_system.c index a3ad6ddb23..9bf0666371 100644 --- a/src/pokemon_storage_system.c +++ b/src/pokemon_storage_system.c @@ -241,18 +241,18 @@ void PCStorage_GetBoxName(PCStorage *storage, u32 boxno, String *dest) { boxno = storage->curBox; } if (boxno < NUM_BOXES) { - CopyU16ArrayToString(dest, storage->box_names[boxno]); + String_CopyFromChars(dest, storage->box_names[boxno]); return; } GF_ASSERT(FALSE); } -void PCStorage_SetBoxName(PCStorage *storage, u32 boxno, const String *src) { +void PCStorage_SetBoxName(PCStorage *storage, u32 boxno, String *src) { if (boxno == -1u) { boxno = storage->curBox; } if (boxno < NUM_BOXES) { - CopyStringToU16Array(src, storage->box_names[boxno], BOX_NAME_LENGTH); + String_CopyToChars(src, storage->box_names[boxno], BOX_NAME_LENGTH); } } diff --git a/src/register_hall_of_fame.c b/src/register_hall_of_fame.c index 771144c834..19cefa9960 100644 --- a/src/register_hall_of_fame.c +++ b/src/register_hall_of_fame.c @@ -870,8 +870,8 @@ BOOL RegisterHallOfFame_Exit(OverlayManager *man, int *state) { RegisterHallOfFame_DestroyBgConfig(data); NARC_Delete(data->narcA180); NARC_Delete(data->narcA101); - String_Delete(data->strbuf1); - String_Delete(data->strbuf2); + String_Free(data->strbuf1); + String_Free(data->strbuf2); MessageFormat_Delete(data->msgFormat); DestroyMsgData(data->msgData); OverlayManager_FreeData(man); @@ -1456,7 +1456,7 @@ static void RegisterHallOfFame_IndivMonsScene_PrintMonDetailsOnWindow(RegisterHa AddTextPrinterParameterizedWithColor(&windows[1], 0, data->strbuf2, 2, 0, TEXT_SPEED_NOTRANSFER, MAKE_TEXT_COLOR(15, 2, 0), NULL); ReadMsgDataIntoString(data->msgData, msg_0180_00005, data->strbuf1); - BufferIntegerAsString(data->msgFormat, 0, hofMon->level, 3, PRINTING_MODE_LEFT_ALIGN, TRUE); + BufferIntegerAsString(data->msgFormat, 0, hofMon->level, 3, PADDING_MODE_NONE, TRUE); StringExpandPlaceholders(data->msgFormat, data->strbuf2, data->strbuf1); AddTextPrinterParameterizedWithColor(&windows[1], 0, data->strbuf2, 2, 16, TEXT_SPEED_NOTRANSFER, MAKE_TEXT_COLOR(15, 2, 0), NULL); CopyWindowPixelsToVram_TextMode(&windows[1]); @@ -2326,9 +2326,9 @@ static void RegisterHallOfFame_WholePartyScene_InitWindows(RegisterHallOfFameDat FillWindowPixelBuffer(&data->windows[1], 1); ReadMsgDataIntoString(data->msgData, msg_0180_00017, data->strbuf2); BufferPlayersName(data->msgFormat, 0, data->args->profile); - BufferIntegerAsString(data->msgFormat, 1, PlayerProfile_GetTrainerID_VisibleHalf(data->args->profile), 5, PRINTING_MODE_LEADING_ZEROS, TRUE); - BufferIntegerAsString(data->msgFormat, 2, GetIGTHours(data->args->igt), 3, PRINTING_MODE_LEFT_ALIGN, TRUE); - BufferIntegerAsString(data->msgFormat, 3, GetIGTMinutes(data->args->igt), 2, PRINTING_MODE_LEADING_ZEROS, TRUE); + BufferIntegerAsString(data->msgFormat, 1, PlayerProfile_GetTrainerID_VisibleHalf(data->args->profile), 5, PADDING_MODE_ZEROES, TRUE); + BufferIntegerAsString(data->msgFormat, 2, GetIGTHours(data->args->igt), 3, PADDING_MODE_NONE, TRUE); + BufferIntegerAsString(data->msgFormat, 3, GetIGTMinutes(data->args->igt), 2, PADDING_MODE_ZEROES, TRUE); StringExpandPlaceholders(data->msgFormat, data->strbuf1, data->strbuf2); AddTextPrinterParameterizedWithColor(&data->windows[1], 0, data->strbuf1, 128 - FontID_String_GetWidth(0, data->strbuf1, 0) / 2, 0, TEXT_SPEED_NOTRANSFER, MAKE_TEXT_COLOR(15, 2, 0), NULL); CopyWindowToVram(&data->windows[1]); diff --git a/src/safari_zone.c b/src/safari_zone.c index 8b87c22aae..d402e4d906 100644 --- a/src/safari_zone.c +++ b/src/safari_zone.c @@ -172,8 +172,8 @@ void SafariZone_SetLinkLeaderFromProfile(SafariZone *safari_zone, PlayerProfile String *name = String_New((PLAYER_NAME_LENGTH + 1) * sizeof(u16), heapID); PlayerName_FlatToString(profile, name); - CopyStringToU16Array(name, link_leader->name, (PLAYER_NAME_LENGTH + 1) * sizeof(u16)); - String_Delete(name); + String_CopyToChars(name, link_leader->name, (PLAYER_NAME_LENGTH + 1) * sizeof(u16)); + String_Free(name); link_leader->linked = TRUE; diff --git a/src/save_data_read_error.c b/src/save_data_read_error.c index 91542f5c23..3fd2abb3c3 100644 --- a/src/save_data_read_error.c +++ b/src/save_data_read_error.c @@ -14,7 +14,7 @@ #include "gf_gfx_planes.h" #include "main.h" #include "msgdata.h" -#include "pm_string.h" +#include "string_gf.h" #include "render_window.h" #include "system.h" #include "text.h" @@ -112,7 +112,7 @@ void ShowSaveDataReadError(enum HeapID heapID) { ReadMsgDataIntoString(error_msgdata, msg_0008_00000, error_str); AddTextPrinterParameterized(&window, 0, error_str, 0, 0, 0, NULL); - String_Delete(error_str); + String_Free(error_str); GfGfx_BothDispOn(); SetMasterBrightnessNeutral(PM_LCD_TOP); @@ -171,7 +171,7 @@ void ShowGBACartRemovedError(enum HeapID heapID) { ReadMsgDataIntoString(error_msgdata, msg_0008_00001, error_str); AddTextPrinterParameterized(&window, 0, error_str, 0, 0, 0, NULL); - String_Delete(error_str); + String_Free(error_str); GfGfx_BothDispOn(); SetMasterBrightnessNeutral(PM_LCD_TOP); diff --git a/src/save_data_write_error.c b/src/save_data_write_error.c index eea844b8c4..108855b48b 100644 --- a/src/save_data_write_error.c +++ b/src/save_data_write_error.c @@ -14,7 +14,7 @@ #include "gf_gfx_planes.h" #include "main.h" #include "msgdata.h" -#include "pm_string.h" +#include "string_gf.h" #include "render_window.h" #include "system.h" #include "text.h" @@ -121,7 +121,7 @@ void ShowSaveDataWriteError(enum HeapID heapID, int code) { ReadMsgDataIntoString(error_msgdata, msg_no, error_str); AddTextPrinterParameterized(&window, 0, error_str, 0, 0, 0, NULL); - String_Delete(error_str); + String_Free(error_str); GfGfx_BothDispOn(); SetMasterBrightnessNeutral(PM_LCD_TOP); diff --git a/src/save_link_ruleset.c b/src/save_link_ruleset.c index 80ed3ee4a1..fb8561c00e 100644 --- a/src/save_link_ruleset.c +++ b/src/save_link_ruleset.c @@ -19,12 +19,12 @@ void Save_LinkBattleRuleset_Init(Save_LinkBattleRuleset *ruleset) { } void LinkBattleRuleset_CopyNameToString(const LinkBattleRuleset *rule, String *dest) { - CopyU16ArrayToStringN(dest, rule->name, 12); + String_CopyNumChars(dest, rule->name, 12); } String *LinkBattleRuleset_CreateStringFromName(const LinkBattleRuleset *rule, enum HeapID heapID) { String *ret = String_New(24, heapID); - CopyU16ArrayToString(ret, rule->name); + String_CopyFromChars(ret, rule->name); return ret; } diff --git a/src/save_misc.c b/src/save_misc.c index f16435a4b4..836cce225b 100644 --- a/src/save_misc.c +++ b/src/save_misc.c @@ -82,8 +82,8 @@ const u16 *Save_Misc_RivalName_Const_Get(const SAVE_MISC_DATA *saveMiscData) { return saveMiscData->rivalName; } -void Save_Misc_RivalName_Set(SAVE_MISC_DATA *saveMiscData, const String *name) { - CopyStringToU16Array(name, saveMiscData->rivalName, PLAYER_NAME_LENGTH + 1); +void Save_Misc_RivalName_Set(SAVE_MISC_DATA *saveMiscData, String *name) { + String_CopyToChars(name, saveMiscData->rivalName, PLAYER_NAME_LENGTH + 1); } void SaveMisc_SetExtraChunksExist(SAVE_MISC_DATA *saveMiscData) { diff --git a/src/save_palpad.c b/src/save_palpad.c index d1c52498be..6fcd635a06 100644 --- a/src/save_palpad.c +++ b/src/save_palpad.c @@ -2,7 +2,7 @@ #include "global.h" -#include "pm_string.h" +#include "string_gf.h" u32 Save_PalPad_sizeof(void) { return sizeof(SavePalPad) * NUM_PALPAD_ENTRIES; diff --git a/src/save_rankings.c b/src/save_rankings.c index c85cd4c828..e05408acee 100644 --- a/src/save_rankings.c +++ b/src/save_rankings.c @@ -190,12 +190,12 @@ SaveRankingsEntry *Save_GetPlayerMixingRankingEntry(SaveData *saveData, enum Hea for (i = 0; i < RANKINGS_COUNT; ++i) { ret[i].groupId = groupId; - CopyStringToU16Array(name, ret[i].playerName, PLAYER_NAME_LENGTH + 1); + String_CopyToChars(name, ret[i].playerName, PLAYER_NAME_LENGTH + 1); ret[i].stat = tmp[i]; } Heap_Free(tmp); - String_Delete(name); + String_Free(name); SaveSubstruct_UpdateCRC(SAVE_RANKINGS); return ret; } @@ -341,7 +341,7 @@ ViewRankingsPage *Save_GetReceivedViewRankingPage(SaveRankings *saveRankings, in ret->entries[ret->count].groupId = saveRankings->array[page][i].groupId; ret->entries[ret->count].stat = saveRankings->array[page][i].stat; ret->entries[ret->count].playerName = String_New(PLAYER_NAME_LENGTH + 1, heapID); - CopyU16ArrayToString(ret->entries[ret->count].playerName, saveRankings->array[page][i].playerName); + String_CopyFromChars(ret->entries[ret->count].playerName, saveRankings->array[page][i].playerName); ++ret->count; } } @@ -353,7 +353,7 @@ void ViewRankingsPage_Delete(ViewRankingsPage *viewRankingsPage) { for (i = 0; i < RANKINGS_PER_STAT; ++i) { if (viewRankingsPage->entries[i].playerName != NULL) { - String_Delete(viewRankingsPage->entries[i].playerName); + String_Free(viewRankingsPage->entries[i].playerName); } } MI_CpuClear8(viewRankingsPage, sizeof(ViewRankingsPage)); diff --git a/src/scrcmd_20.c b/src/scrcmd_20.c index 7ae9cf1fab..7ff59815e1 100644 --- a/src/scrcmd_20.c +++ b/src/scrcmd_20.c @@ -423,7 +423,7 @@ BOOL ScrCmd_BufferBattleHallStreak(ScriptContext *ctx) { if (unk0 != NULL) { Heap_Free(unk0); } - BufferIntegerAsString(*messageFormat, strIdxWinStreak, winStreak, CountDigits(winStreak), PRINTING_MODE_RIGHT_ALIGN, TRUE); + BufferIntegerAsString(*messageFormat, strIdxWinStreak, winStreak, CountDigits(winStreak), PADDING_MODE_SPACES, TRUE); u16 bp = 0; u32 currWinStreakLevel = 0; u16 prevWinStreakLevel = *winStreakLevel; @@ -452,9 +452,9 @@ BOOL ScrCmd_BufferBattleHallStreak(ScriptContext *ctx) { } } u32 currWinStreakTarget = battleHallWinStreakBP[currWinStreakLevel].winStreakTarget; - BufferIntegerAsString(*messageFormat, strIdxCurrWinStreakTarget, currWinStreakTarget, CountDigits(currWinStreakTarget), PRINTING_MODE_RIGHT_ALIGN, TRUE); - BufferIntegerAsString(*messageFormat, strIdxNextWinStreakTarget, battleHallWinStreakBP[*winStreakLevel].winStreakTarget, CountDigits(battleHallWinStreakBP[*winStreakLevel].winStreakTarget), PRINTING_MODE_RIGHT_ALIGN, TRUE); - BufferIntegerAsString(*messageFormat, strIdxBP, bp, CountDigits(bp), PRINTING_MODE_RIGHT_ALIGN, TRUE); + BufferIntegerAsString(*messageFormat, strIdxCurrWinStreakTarget, currWinStreakTarget, CountDigits(currWinStreakTarget), PADDING_MODE_SPACES, TRUE); + BufferIntegerAsString(*messageFormat, strIdxNextWinStreakTarget, battleHallWinStreakBP[*winStreakLevel].winStreakTarget, CountDigits(battleHallWinStreakBP[*winStreakLevel].winStreakTarget), PADDING_MODE_SPACES, TRUE); + BufferIntegerAsString(*messageFormat, strIdxBP, bp, CountDigits(bp), PADDING_MODE_SPACES, TRUE); return FALSE; } diff --git a/src/scrcmd_8.c b/src/scrcmd_8.c index 4a5fc9dc45..3bcb080955 100644 --- a/src/scrcmd_8.c +++ b/src/scrcmd_8.c @@ -63,7 +63,7 @@ BOOL ScrCmd_465(ScriptContext *ctx) { sub_0202C824(group, 0, PlayerProfile_GetTrainerGender(profile)); sub_0202C848(group, 0, 2); sub_0202C7C0(group, 0, MTRandom()); - String_Delete(str); + String_Free(str); sub_0202C738(group, 0, 1); break; } diff --git a/src/scrcmd_9.c b/src/scrcmd_9.c index 5e7c3e8bbe..cfec0862d2 100644 --- a/src/scrcmd_9.c +++ b/src/scrcmd_9.c @@ -17,7 +17,7 @@ #include "party.h" #include "player_avatar.h" #include "player_data.h" -#include "pm_string.h" +#include "string_gf.h" #include "pokedex.h" #include "pokemon.h" #include "save_local_field_data.h" diff --git a/src/scrcmd_c.c b/src/scrcmd_c.c index 4411be9c91..fefca41754 100644 --- a/src/scrcmd_c.c +++ b/src/scrcmd_c.c @@ -4055,8 +4055,8 @@ BOOL ScrCmd_571(ScriptContext *ctx) { r7_str = ReadMsgData_ExpandPlaceholders(msgFmt, msgData, msg_0202_00001, HEAP_ID_FIELD3); sp0_str = NewString_ReadMsgData(msgData, msg_0202_00000); *p_ret = String_Compare(r7_str, sp0_str) == FALSE; - String_Delete(r7_str); - String_Delete(sp0_str); + String_Free(r7_str); + String_Free(sp0_str); DestroyMsgData(msgData); MessageFormat_Delete(msgFmt); return FALSE; diff --git a/src/scrcmd_move_tutor.c b/src/scrcmd_move_tutor.c index 63c62c5028..d10b777add 100644 --- a/src/scrcmd_move_tutor.c +++ b/src/scrcmd_move_tutor.c @@ -13,7 +13,7 @@ #include "overlay_01.h" #include "party.h" #include "player_avatar.h" -#include "pm_string.h" +#include "string_gf.h" #include "pokemon.h" #include "pokemon_storage_system.h" #include "scrcmd.h" @@ -292,10 +292,10 @@ BOOL ScrCmd_MoveTutorChooseMove(ScriptContext *ctx) { for (i = 0; i < numLearnableMoves; i++) { ReadMsgDataIntoString(messageData, sTutorMoves[learnableMoves[i + numMovesToSkip]].move, string); BufferString(*messageFormat, 0, string, 2, 1, 2); - BufferIntegerAsString(*messageFormat, 1, sTutorMoves[learnableMoves[i + numMovesToSkip]].cost, 2, PRINTING_MODE_RIGHT_ALIGN, TRUE); + BufferIntegerAsString(*messageFormat, 1, sTutorMoves[learnableMoves[i + numMovesToSkip]].cost, 2, PADDING_MODE_SPACES, TRUE); MoveTutorMenu_SetListItem(*unk, showAsTwoColumns, 0xff, sTutorMoves[learnableMoves[i + numMovesToSkip]].move); } - String_Delete(string); + String_Free(string); DestroyMsgData(messageData); if (showNextButton) { MoveTutorMenu_SetListItem(*unk, 2, 0xff, 0xfffd); diff --git a/src/scrcmd_mystery_gift.c b/src/scrcmd_mystery_gift.c index 53603a13c8..5bb6b78edb 100644 --- a/src/scrcmd_mystery_gift.c +++ b/src/scrcmd_mystery_gift.c @@ -294,7 +294,7 @@ static void MGGive_Mon(FieldSystem *fieldSys, MysteryGiftData *unused) { SetMonData(tmpPokemon, MON_DATA_OT_ID, &trainerId); SetMonData(tmpPokemon, MON_DATA_OT_GENDER, &gender); pokemon = tmpPokemon; - String_Delete(playerName); + String_Free(playerName); } MonSetTrainerMemo(pokemon, profile, 4, sub_02017FE4(MAPSECTYPE_EXTERNAL, eggMetLocation), HEAP_ID_FIELD3); @@ -381,7 +381,7 @@ static void MGMessageSuccess_BattleRules(struct GetMysteryGiftGmmState *gmmState BufferPlayersName(gmmState->msgFormat, 0, Save_PlayerData_GetProfile(gmmState->fieldSys->saveData)); String *rulesetName = LinkBattleRuleset_CreateStringFromName(mgData, HEAP_ID_FIELD3); BufferString(gmmState->msgFormat, 1, rulesetName, 0, 1, 2); - String_Delete(rulesetName); + String_Free(rulesetName); } // Unreachable diff --git a/src/scrcmd_size_record.c b/src/scrcmd_size_record.c index d2ca1a1d37..ace46ab12a 100644 --- a/src/scrcmd_size_record.c +++ b/src/scrcmd_size_record.c @@ -76,8 +76,8 @@ static void FormatSizeRecord(FieldSystem *fieldSystem, u8 idx0, u8 idx1, u16 spe msgFmt = FieldSysGetAttrAddr(fieldSystem, SCRIPTENV_MESSAGE_FORMAT); score = GetMonSize(species, rand); r4 = LengthConvertToImperial(score); - BufferIntegerAsString(*msgFmt, idx0, r4 / 10, 3, PRINTING_MODE_LEFT_ALIGN, TRUE); - BufferIntegerAsString(*msgFmt, idx1, r4 % 10, 1, PRINTING_MODE_LEFT_ALIGN, TRUE); + BufferIntegerAsString(*msgFmt, idx0, r4 / 10, 3, PADDING_MODE_NONE, TRUE); + BufferIntegerAsString(*msgFmt, idx1, r4 % 10, 1, PADDING_MODE_NONE, TRUE); } BOOL ScrCmd_SizeRecordCompare(ScriptContext *ctx) { diff --git a/src/scrcmd_strbuf.c b/src/scrcmd_strbuf.c index 84b4976c36..16c59fa612 100644 --- a/src/scrcmd_strbuf.c +++ b/src/scrcmd_strbuf.c @@ -126,7 +126,7 @@ BOOL ScrCmd_BufferInt(ScriptContext *ctx) { u8 idx = ScriptReadByte(ctx); u16 number = ScriptGetVar(ctx); - BufferIntegerAsString(*msg_fmt, idx, number, CountDigits(number), PRINTING_MODE_RIGHT_ALIGN, TRUE); + BufferIntegerAsString(*msg_fmt, idx, number, CountDigits(number), PADDING_MODE_SPACES, TRUE); return FALSE; } @@ -139,11 +139,11 @@ BOOL ScrCmd_BufferIntEx(ScriptContext *ctx) { u8 unk2 = ScriptReadByte(ctx); u8 digits = unk2; - if (str_conv_mode == PRINTING_MODE_LEFT_ALIGN) { + if (str_conv_mode == PADDING_MODE_NONE) { digits = CountDigits(number); } - BufferIntegerAsString(*msg_fmt, idx, number, digits, (PrintingMode)str_conv_mode, TRUE); + BufferIntegerAsString(*msg_fmt, idx, number, digits, (enum PaddingMode)str_conv_mode, TRUE); return FALSE; } @@ -156,11 +156,11 @@ BOOL ScrCmd_661(ScriptContext *ctx) { u8 unk2 = ScriptReadByte(ctx); u8 digits = unk2; - if (str_conv_mode == PRINTING_MODE_LEFT_ALIGN) { + if (str_conv_mode == PADDING_MODE_NONE) { digits = CountDigits(number); } - BufferIntegerAsString(*msg_fmt, idx, number, digits, (PrintingMode)str_conv_mode, TRUE); + BufferIntegerAsString(*msg_fmt, idx, number, digits, (enum PaddingMode)str_conv_mode, TRUE); return FALSE; } @@ -224,7 +224,7 @@ BOOL ScrCmd_BufferSpeciesName(ScriptContext *ctx) { String *species_name = _get_species_name(species, HEAP_ID_FIELD1); BufferString(*msg_fmt, idx, species_name, unk2, unk3, 2); - String_Delete(species_name); + String_Free(species_name); return FALSE; } @@ -243,7 +243,7 @@ BOOL ScrCmd_BufferStarterSpeciesName(ScriptContext *ctx) { String *species_name = _get_species_name(species, HEAP_ID_FIELD1); BufferString(*msg_fmt, idx, species_name, 0, 1, 2); - String_Delete(species_name); + String_Free(species_name); return FALSE; } @@ -255,7 +255,7 @@ BOOL ScrCmd_BufferDPPtRivalStarterSpeciesName(ScriptContext *ctx) { String *species_name = _get_species_name(species, HEAP_ID_FIELD1); BufferString(*msg_fmt, idx, species_name, 0, 1, 2); - String_Delete(species_name); + String_Free(species_name); return FALSE; } @@ -267,7 +267,7 @@ BOOL ScrCmd_BufferDPPtFriendStarterSpeciesName(ScriptContext *ctx) { String *species_name = _get_species_name(species, HEAP_ID_FIELD1); BufferString(*msg_fmt, idx, species_name, 0, 1, 2); - String_Delete(species_name); + String_Free(species_name); return FALSE; } @@ -308,7 +308,7 @@ BOOL ScrCmd_BufferMapSecName(ScriptContext *ctx) { MapID_GetLandmarkName(mapno, HEAP_ID_FIELD1, str); BufferString(*msg_fmt, idx, str, 0, 1, 2); - String_Delete(str); + String_Free(str); return FALSE; } @@ -321,7 +321,7 @@ BOOL ScrCmd_BufferBerryName(ScriptContext *ctx) { String *str = GetNutName((u16)(berry_id - FIRST_BERRY_IDX), HEAP_ID_FIELD3); BufferString(*msg_fmt, idx, str, 0, unk < 2, 2); - String_Delete(str); + String_Free(str); return FALSE; } diff --git a/src/string_control_code.c b/src/string_control_code.c index 523bd11530..2d05817256 100644 --- a/src/string_control_code.c +++ b/src/string_control_code.c @@ -2,7 +2,7 @@ #include "global.h" -#include "pm_string.h" +#include "string_gf.h" const u16 *MsgArray_SkipControlCode(const u16 *arr) { GF_ASSERT(*arr == EXT_CTRL_CODE_BEGIN); diff --git a/src/string_gf.c b/src/string_gf.c new file mode 100644 index 0000000000..9d5d95b819 --- /dev/null +++ b/src/string_gf.c @@ -0,0 +1,442 @@ +#include "string_gf.h" + +#include "global.h" + +#include "font.h" +#include "heap.h" +#include "math_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) ? CHAR_JP_HYPHEN : CHAR_HYPHEN; + } + + 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] : CHAR_JP_QUESTION_MARK; + // 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] : CHAR_JP_QUESTION_MARK; + } else if (paddingMode == PADDING_MODE_SPACES) { + dest->data[dest->size++] = (charsetMode == CHARSET_MODE_JP) ? CHAR_JP_SPACE : CHAR_NARROW_SPACE; + } + dividend /= 10; + } + dest->data[dest->size] = EOS; + return; + } + GF_ASSERT(FALSE); +} + +void String_FormatU64(String *dest, u64 num, u32 maxDigits, enum PaddingMode paddingMode, enum CharsetMode charsetMode) { + static const u64 sPowersOfTen[] = { + 1ll, + 10ll, + 100ll, + 1000ll, + 10000ll, + 100000ll, + 1000000ll, + 10000000ll, + 100000000ll, + 1000000000ll, + 10000000000ll, + 100000000000ll, + 1000000000000ll, + 10000000000000ll, + 100000000000000ll, + 1000000000000000ll, + 10000000000000000ll, + 100000000000000000ll, + 1000000000000000000ll, + 10000000000000000000ll, + }; + + 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) ? CHAR_JP_HYPHEN : CHAR_HYPHEN; + } + + u64 dividend = sPowersOfTen[maxDigits - 1]; + while (dividend != 0ull) { + u64 digit = num / dividend; + num -= dividend * digit; + + if (paddingMode == PADDING_MODE_ZEROES) { + dest->data[dest->size++] = (digit < 10ull) ? digitSet[digit] : CHAR_JP_QUESTION_MARK; + } else if (digit != 0 || dividend == 1) { + paddingMode = PADDING_MODE_ZEROES; + dest->data[dest->size++] = (digit < 10ull) ? digitSet[digit] : CHAR_JP_QUESTION_MARK; + } else if (paddingMode == PADDING_MODE_SPACES) { + dest->data[dest->size++] = (charsetMode == CHARSET_MODE_JP) ? CHAR_JP_SPACE : CHAR_SPACE; + } + dividend /= 10ull; + } + 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] - CHAR_JP_0; + if (digit >= 10ull) { + digit = string->data[i] - CHAR_0; + 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_AddRadioStatic(String *string, u8 level) { + u32 width3dots = FontID_GetGlyphWidth(0, CHAR_ELLIPSIS); + u32 width1dot = FontID_GetGlyphWidth(0, CHAR_ONE_DOT); + u32 width2dots = FontID_GetGlyphWidth(0, CHAR_TWO_DOTS); + u32 curWidth; + + String_Assert(string); + int strLen = String_GetLength(string); // the result is never used + for (int i = 0; i < string->size - 1; i++) { + if (string->data[i] != CHAR_SPACE && ((MTRandom() / 256u) % 101) < level) { + curWidth = FontID_GetGlyphWidth(0, string->data[i]); + if (curWidth >= width3dots) { + string->data[i] = CHAR_ELLIPSIS; + } else if (curWidth >= width2dots) { + string->data[i] = CHAR_TWO_DOTS; + } else if (curWidth >= width1dot) { + string->data[i] = CHAR_ONE_DOT; + } + } + } +} + +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); +} + +BOOL String_IsTrainerName(String *string) { + return string->size > 0 && string->data[0] == TRNAMECODE; +} + +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) & TRNAME_MASK; + shift += 9; + if (shift >= 15) { + srcChar++; + shift -= 15; + if (shift != 0) { + curChar |= (*srcChar << (9 - shift)) & TRNAME_MASK; + } + } + + if (curChar == EOS_TRNAME) { + break; + } + *dstChar++ = curChar; + charsAdded++; + } + *dstChar = EOS; + dest->size += charsAdded; + } else { + String_Concat(dest, src); + } +} + +void String_UpperChar(String *string, int index) { + String_Assert(string); + + if (string->size > index) { + if (string->data[index] >= CHAR_a && string->data[index] <= CHAR_z) { + string->data[index] += CHAR_A - CHAR_a; + } + } +} diff --git a/src/string_util.c b/src/string_util.c index fb875c20ec..93af9334c4 100644 --- a/src/string_util.c +++ b/src/string_util.c @@ -67,7 +67,7 @@ u16 *StringFillEOS(u16 *str, u32 n) { return StringFill(str, EOS, n); } -u16 *ConvertUIntToDecimalString(u16 *dest, u32 num, PrintingMode strconvmode, u32 ndigits) { +u16 *ConvertUIntToDecimalString(u16 *dest, u32 num, enum PaddingMode paddingMode, u32 ndigits) { static const u16 _digit_strcode[] = { 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, CHAR_JP_A, CHAR_JP_B, CHAR_JP_C, CHAR_JP_D, CHAR_JP_E, CHAR_JP_F @@ -90,14 +90,14 @@ u16 *ConvertUIntToDecimalString(u16 *dest, u32 num, PrintingMode strconvmode, u3 for (denom = _power_of_10[ndigits - 1]; denom != 0; denom /= 10) { digit = num / denom; num -= denom * digit; - if (strconvmode == PRINTING_MODE_LEADING_ZEROS) { + if (paddingMode == PADDING_MODE_ZEROES) { *dest = (digit >= 10) ? CHAR_JP_QUESTION_MARK : _digit_strcode[digit]; dest++; } else if (digit != 0 || denom == 1) { - strconvmode = PRINTING_MODE_LEADING_ZEROS; + paddingMode = PADDING_MODE_ZEROES; *dest = (digit >= 10) ? CHAR_JP_QUESTION_MARK : _digit_strcode[digit]; dest++; - } else if (strconvmode == PRINTING_MODE_RIGHT_ALIGN) { + } else if (paddingMode == PADDING_MODE_SPACES) { *dest = CHAR_JP_SPACE; dest++; } diff --git a/src/text.c b/src/text.c index 7e02f0995e..b4269a7481 100644 --- a/src/text.c +++ b/src/text.c @@ -162,7 +162,7 @@ static u8 AddTextPrinter(TextPrinterTemplate *template, u32 speed, PrinterCallba printer->subStructFields[i] = 0; } printer->template = *template; - printer->template.currentChar.raw = String_cstr(printer->template.currentChar.wrapped); + printer->template.currentChar.raw = String_GetChars(printer->template.currentChar.wrapped); printer->callback = callback; _021D1F6C = 0; diff --git a/src/title_screen.c b/src/title_screen.c index af1382680b..2fa6d2a64c 100644 --- a/src/title_screen.c +++ b/src/title_screen.c @@ -642,7 +642,7 @@ static void TitleScreenAnim_Load2dBgGfx(BgConfig *bgConfig, enum HeapID heapID, } else { AddTextPrinterParameterizedWithColorAndSpacing(&animData->window, 0, string, 0, 0, TEXT_SPEED_INSTANT, MAKE_TEXT_COLOR(2, 2, 0), 1, 0, NULL); } - String_Delete(string); + String_Free(string); DestroyMsgData(msgData); u16 color1 = RGB(27, 8, 0); // HeartGold diff --git a/src/touch_save_app.c b/src/touch_save_app.c index 9bd7f8d13e..0aa290c5b5 100644 --- a/src/touch_save_app.c +++ b/src/touch_save_app.c @@ -346,7 +346,7 @@ static BOOL TouchSaveApp_AskForSave(TouchSaveAppData *data) { static BOOL TouchSaveApp_WaitForTextPrinter(TouchSaveAppData *data) { if (!TextPrinterCheckActive(data->textPrinter)) { - String_Delete(data->string); + String_Free(data->string); data->state = data->stateAfterTextPrint; } diff --git a/src/trainer_data.c b/src/trainer_data.c index 17d55aad09..ef50b945ec 100644 --- a/src/trainer_data.c +++ b/src/trainer_data.c @@ -33,8 +33,8 @@ void EnemyTrainerSet_Init(BattleSetup *battleSetup, SaveData *saveData, enum Hea CopyU16StringArray(battleSetup->trainer[i].name, rivalName); } else { string = NewString_ReadMsgData(msgData, battleSetup->trainerId[i]); - CopyStringToU16Array(string, battleSetup->trainer[i].name, PLAYER_NAME_LENGTH + 1); - String_Delete(string); + String_CopyToChars(string, battleSetup->trainer[i].name, PLAYER_NAME_LENGTH + 1); + String_Free(string); } CreateNPCTrainerParty(battleSetup, i, heapID); } @@ -118,7 +118,7 @@ void GetTrainerMessageByIdPair(u32 trainerIndex, u32 msg_id, String *str, enum H } NARC_Delete(trTblNarc); if (rdbuf[0] == trTblSize) { - String_SetEmpty(str); + String_Clear(str); } } diff --git a/src/trainer_memo.c b/src/trainer_memo.c index 8229892ed5..f7b66d7c18 100644 --- a/src/trainer_memo.c +++ b/src/trainer_memo.c @@ -343,18 +343,18 @@ static void FormatDateAndLocationMet(Unk0208E600 *a0, int msgNo) { ReadMsgDataIntoString(a0->msgData, msgNo, str); - BufferIntegerAsString(a0->msgFmt, 0, GetMonData(a0->mon, MON_DATA_MET_YEAR, NULL), 2, PRINTING_MODE_LEADING_ZEROS, TRUE); + BufferIntegerAsString(a0->msgFmt, 0, GetMonData(a0->mon, MON_DATA_MET_YEAR, NULL), 2, PADDING_MODE_ZEROES, TRUE); BufferMonthNameAbbr(a0->msgFmt, 1, GetMonData(a0->mon, MON_DATA_MET_MONTH, NULL)); - BufferIntegerAsString(a0->msgFmt, 2, GetMonData(a0->mon, MON_DATA_MET_DAY, NULL), 2, PRINTING_MODE_LEFT_ALIGN, TRUE); - BufferIntegerAsString(a0->msgFmt, 3, GetMonData(a0->mon, MON_DATA_MET_LEVEL, NULL), 3, PRINTING_MODE_LEFT_ALIGN, TRUE); + BufferIntegerAsString(a0->msgFmt, 2, GetMonData(a0->mon, MON_DATA_MET_DAY, NULL), 2, PADDING_MODE_NONE, TRUE); + BufferIntegerAsString(a0->msgFmt, 3, GetMonData(a0->mon, MON_DATA_MET_LEVEL, NULL), 3, PADDING_MODE_NONE, TRUE); BufferLocationName(a0->msgFmt, 4, GetMonData(a0->mon, MON_DATA_MET_LOCATION, NULL)); - BufferIntegerAsString(a0->msgFmt, 5, GetMonData(a0->mon, MON_DATA_EGG_YEAR, NULL), 2, PRINTING_MODE_LEADING_ZEROS, TRUE); + BufferIntegerAsString(a0->msgFmt, 5, GetMonData(a0->mon, MON_DATA_EGG_YEAR, NULL), 2, PADDING_MODE_ZEROES, TRUE); BufferMonthNameAbbr(a0->msgFmt, 6, GetMonData(a0->mon, MON_DATA_EGG_MONTH, NULL)); - BufferIntegerAsString(a0->msgFmt, 7, GetMonData(a0->mon, MON_DATA_EGG_DAY, NULL), 2, PRINTING_MODE_LEFT_ALIGN, TRUE); + BufferIntegerAsString(a0->msgFmt, 7, GetMonData(a0->mon, MON_DATA_EGG_DAY, NULL), 2, PADDING_MODE_NONE, TRUE); BufferLocationName(a0->msgFmt, 8, GetMonData(a0->mon, MON_DATA_EGG_LOCATION, NULL)); StringExpandPlaceholders(a0->msgFmt, a0->notepad.dateLocationMet, str); - String_Delete(str); + String_Free(str); } static void FormatDateAndLocation_Migrated(Unk0208E600 *a0, int msgNo) { @@ -365,10 +365,10 @@ static void FormatDateAndLocation_Migrated(Unk0208E600 *a0, int msgNo) { ReadMsgDataIntoString(a0->msgData, msgNo, str); - BufferIntegerAsString(a0->msgFmt, 0, GetMonData(a0->mon, MON_DATA_MET_YEAR, NULL), 2, PRINTING_MODE_LEADING_ZEROS, TRUE); + BufferIntegerAsString(a0->msgFmt, 0, GetMonData(a0->mon, MON_DATA_MET_YEAR, NULL), 2, PADDING_MODE_ZEROES, TRUE); BufferMonthNameAbbr(a0->msgFmt, 1, GetMonData(a0->mon, MON_DATA_MET_MONTH, NULL)); - BufferIntegerAsString(a0->msgFmt, 2, GetMonData(a0->mon, MON_DATA_MET_DAY, NULL), 2, PRINTING_MODE_LEFT_ALIGN, TRUE); - BufferIntegerAsString(a0->msgFmt, 3, GetMonData(a0->mon, MON_DATA_MET_LEVEL, NULL), 3, PRINTING_MODE_LEFT_ALIGN, TRUE); + BufferIntegerAsString(a0->msgFmt, 2, GetMonData(a0->mon, MON_DATA_MET_DAY, NULL), 2, PADDING_MODE_NONE, TRUE); + BufferIntegerAsString(a0->msgFmt, 3, GetMonData(a0->mon, MON_DATA_MET_LEVEL, NULL), 3, PADDING_MODE_NONE, TRUE); version = GetMonData(a0->mon, MON_DATA_MET_GAME, NULL); switch (version) { @@ -404,7 +404,7 @@ static void FormatDateAndLocation_Migrated(Unk0208E600 *a0, int msgNo) { } StringExpandPlaceholders(a0->msgFmt, a0->notepad.dateLocationMet, str); - String_Delete(str); + String_Free(str); } static void FormatDateAndLocation_Egg(Unk0208E600 *a0, int msgNo, BOOL hatched) { @@ -414,19 +414,19 @@ static void FormatDateAndLocation_Egg(Unk0208E600 *a0, int msgNo, BOOL hatched) ReadMsgDataIntoString(a0->msgData, msgNo, str); if (!hatched) { - BufferIntegerAsString(a0->msgFmt, 5, GetMonData(a0->mon, MON_DATA_EGG_YEAR, NULL), 2, PRINTING_MODE_LEADING_ZEROS, TRUE); + BufferIntegerAsString(a0->msgFmt, 5, GetMonData(a0->mon, MON_DATA_EGG_YEAR, NULL), 2, PADDING_MODE_ZEROES, TRUE); BufferMonthNameAbbr(a0->msgFmt, 6, GetMonData(a0->mon, MON_DATA_EGG_MONTH, NULL)); - BufferIntegerAsString(a0->msgFmt, 7, GetMonData(a0->mon, MON_DATA_EGG_DAY, NULL), 2, PRINTING_MODE_LEFT_ALIGN, TRUE); + BufferIntegerAsString(a0->msgFmt, 7, GetMonData(a0->mon, MON_DATA_EGG_DAY, NULL), 2, PADDING_MODE_NONE, TRUE); BufferLocationName(a0->msgFmt, 8, GetMonData(a0->mon, MON_DATA_EGG_LOCATION, NULL)); } else { - BufferIntegerAsString(a0->msgFmt, 5, GetMonData(a0->mon, MON_DATA_MET_YEAR, NULL), 2, PRINTING_MODE_LEADING_ZEROS, TRUE); + BufferIntegerAsString(a0->msgFmt, 5, GetMonData(a0->mon, MON_DATA_MET_YEAR, NULL), 2, PADDING_MODE_ZEROES, TRUE); BufferMonthNameAbbr(a0->msgFmt, 6, GetMonData(a0->mon, MON_DATA_MET_MONTH, NULL)); - BufferIntegerAsString(a0->msgFmt, 7, GetMonData(a0->mon, MON_DATA_MET_DAY, NULL), 2, PRINTING_MODE_LEFT_ALIGN, TRUE); + BufferIntegerAsString(a0->msgFmt, 7, GetMonData(a0->mon, MON_DATA_MET_DAY, NULL), 2, PADDING_MODE_NONE, TRUE); BufferLocationName(a0->msgFmt, 8, GetMonData(a0->mon, MON_DATA_MET_LOCATION, NULL)); } StringExpandPlaceholders(a0->msgFmt, a0->notepad.dateLocationMet, str); - String_Delete(str); + String_Free(str); } static void FormatCharacteristic(Unk0208E600 *a0) { @@ -808,7 +808,7 @@ static void BoxMon_SetOriginalTrainerData(BoxPokemon *boxMon, PlayerProfile *pro SetBoxMonData(boxMon, MON_DATA_OT_GENDER, &gender); SetBoxMonData(boxMon, MON_DATA_OT_NAME_STRING, name); - String_Delete(name); + String_Free(name); } static void BoxMon_SetMetDateAndLocation(BoxPokemon *boxMon, int mapsec, int setMetDateParam) { diff --git a/src/unk_0200CE7C.c b/src/unk_0200CE7C.c index f3cf8d7bfe..6f21fd1a0f 100644 --- a/src/unk_0200CE7C.c +++ b/src/unk_0200CE7C.c @@ -1,13 +1,13 @@ #include "unk_0200CE7C.h" -void sub_0200CE7C(MessagePrinter *msgPrinter, u8 glyphId, u32 num, u32 ndigits, PrintingMode mode, Window *window, u32 x, u32 y) { +void sub_0200CE7C(MessagePrinter *msgPrinter, u8 glyphId, u32 num, u32 ndigits, enum PaddingMode mode, Window *window, u32 x, u32 y) { sub_0200CDAC(msgPrinter, glyphId, window, x, y); PrintUIntOnWindow(msgPrinter, num, ndigits, mode, window, x + 16, y); } -void sub_0200CEB0(BattleNumberPrinter *unk, u32 num, u32 ndigits, PrintingMode strConvMode, u16 *dest) { +void sub_0200CEB0(BattleNumberPrinter *unk, u32 num, u32 ndigits, enum PaddingMode paddingMode, u16 *dest) { u8 fillVal = (unk->fillVal << 4) | unk->fillVal; - ConvertUIntToDecimalString(unk->strbuf, num, strConvMode, ndigits); + ConvertUIntToDecimalString(unk->strbuf, num, paddingMode, ndigits); for (int i = 0; unk->strbuf[i] != EOS; ++i) { if (unk->strbuf[i] >= CHAR_JP_0 && unk->strbuf[i] <= CHAR_JP_9) { const u8 *src = (const u8 *)unk->charData->pRawData + 32 * (unk->strbuf[i] - CHAR_JP_0); diff --git a/src/unk_0204B538.c b/src/unk_0204B538.c index 346907a1eb..e1abe71586 100644 --- a/src/unk_0204B538.c +++ b/src/unk_0204B538.c @@ -14,7 +14,7 @@ #include "msgdata.h" #include "party.h" #include "player_data.h" -#include "pm_string.h" +#include "string_gf.h" #include "pokedex.h" #include "pokemon.h" #include "scrcmd_9.h" @@ -132,7 +132,7 @@ MessageFormat *sub_0204B538(SaveData *saveData, u16 numEligiblePokemon, u16 a2, pokedex = Save_Pokedex_Get(saveData); messageData = NewMsgDataFromNarc(MSGDATA_LOAD_LAZY, NARC_msgdata_msg, NARC_msg_msg_0237_bin, HEAP_ID_FIELD1); messageFormat = MessageFormat_New_Custom(19, 14, HEAP_ID_FIELD1); - BufferIntegerAsString(messageFormat, 0, numEligiblePokemon, 1, PRINTING_MODE_LEFT_ALIGN, TRUE); + BufferIntegerAsString(messageFormat, 0, numEligiblePokemon, 1, PADDING_MODE_NONE, TRUE); for (u8 i = 0; i < NUM_BANNED_BATTLE_FRONTIER; i++) { u16 species = GetBannedBattleFrontierPokemon(i); if (!Pokedex_CheckMonSeenFlag(pokedex, species)) { @@ -143,8 +143,8 @@ MessageFormat *sub_0204B538(SaveData *saveData, u16 numEligiblePokemon, u16 a2, (*numLegendaryPokemonSeen)++; } DestroyMsgData(messageData); - String_Delete(unused); - String_Delete(speciesName); + String_Free(unused); + String_Free(speciesName); return messageFormat; } @@ -237,8 +237,8 @@ static u16 *sub_0204B7D0(UnkStruct_0204B7D0 *a0, u32 frontierTrainerIndex, enum a0->unk1a = frontierTrainerIndex * 3; a0->unk04 = unk[0]; String *trainerName = NewString_ReadMsgData(messageData, frontierTrainerIndex); - CopyStringToU16Array(trainerName, a0->unk08, NELEMS(a0->unk08)); - String_Delete(trainerName); + String_CopyToChars(trainerName, a0->unk08, NELEMS(a0->unk08)); + String_Free(trainerName); DestroyMsgData(messageData); return unk; } diff --git a/src/unk_0206D494.c b/src/unk_0206D494.c index 93b4e93bb7..1fe4852853 100644 --- a/src/unk_0206D494.c +++ b/src/unk_0206D494.c @@ -21,7 +21,7 @@ #include "overlay_111.h" #include "player_avatar.h" #include "player_data.h" -#include "pm_string.h" +#include "string_gf.h" #include "pokemon.h" #include "save_local_field_data.h" #include "save_misc_data.h" @@ -354,8 +354,8 @@ static BOOL MonIsInGameTradePokeInternal(Pokemon *mon, NPCTrade *trade, NpcTrade GetMonData(mon, MON_DATA_NICKNAME_STRING, monNickname); String *tradeNickname = NewString_ReadMsgData(messageData, tradeNum); BOOL differentNickname = String_Compare(monNickname, tradeNickname); - String_Delete(tradeNickname); - String_Delete(monNickname); + String_Free(tradeNickname); + String_Free(monNickname); if (differentNickname) { DestroyMsgData(messageData); return FALSE; @@ -364,8 +364,8 @@ static BOOL MonIsInGameTradePokeInternal(Pokemon *mon, NPCTrade *trade, NpcTrade GetMonData(mon, MON_DATA_OT_NAME_STRING, monOtName); String *tradeOtName = NewString_ReadMsgData(messageData, NPC_TRADE_OT_NUM(tradeNum)); BOOL differentOtName = String_Compare(monOtName, tradeOtName); - String_Delete(tradeOtName); - String_Delete(monOtName); + String_Free(tradeOtName); + String_Free(monOtName); if (differentOtName) { DestroyMsgData(messageData); return FALSE; diff --git a/src/voltorb_flip/voltorb_flip.c b/src/voltorb_flip/voltorb_flip.c index 7c710d65a5..f2172302e4 100644 --- a/src/voltorb_flip/voltorb_flip.c +++ b/src/voltorb_flip/voltorb_flip.c @@ -949,8 +949,8 @@ BOOL VoltorbFlipTaskEngine_CardFlipEffect_Main(VoltorbFlipTaskEngine *workflow, int payoutAfter = VoltorbFlipGameState_GetGamePayout(work->game); - BufferIntegerAsString(work->msgFmt, 0, type, 1, PRINTING_MODE_LEFT_ALIGN, 1); - BufferIntegerAsString(work->msgFmt, 1, payoutAfter, 5, PRINTING_MODE_LEFT_ALIGN, 1); + BufferIntegerAsString(work->msgFmt, 0, type, 1, PADDING_MODE_NONE, 1); + BufferIntegerAsString(work->msgFmt, 1, payoutAfter, 5, PADDING_MODE_NONE, 1); ManagedSprite_SetPositionXY(work->sprites[VF_SPRITE_FLIPPING_CARD], x, y); ManagedSprite_SetAnim(work->sprites[VF_SPRITE_FLIPPING_CARD], 0); @@ -1039,7 +1039,7 @@ BOOL VoltorbFlipTaskEngine_AwardCoins_Main(VoltorbFlipTaskEngine *workflow, Volt switch (state) { case 0: { int var2 = VoltorbFlipGameState_GetGamePayout(work->game); - BufferIntegerAsString(work->msgFmt, 0, var2, 5, PRINTING_MODE_LEFT_ALIGN, 1); + BufferIntegerAsString(work->msgFmt, 0, var2, 5, PADDING_MODE_NONE, 1); BufferPlayersName(work->msgFmt, 1, work->profile); // {STRVAR_1 3, 1, 0}\nreceived {STRVAR_1 53, 0, 0} Coin(s)!\r VoltorbFlip_PrintTextWindow(work, msg_0039_00040, TRUE); @@ -1267,7 +1267,7 @@ BOOL VoltorbFlipTaskEngine_QuitRound_SetUp(VoltorbFlipTaskEngine *workflow, Volt } else { // If you quit now, you will\nreceive {STRVAR_1 53, 0, 0} Coin(s).\fWill you quit? msgNo = msg_0039_00034; - BufferIntegerAsString(work->msgFmt, 0, payout, 5, PRINTING_MODE_LEFT_ALIGN, 1); + BufferIntegerAsString(work->msgFmt, 0, payout, 5, PADDING_MODE_NONE, 1); } VoltorbFlip_DimLayersExceptBG3(&work->screenIsDimmed); VoltorbFlip_PrintTextWindow(work, msgNo, TRUE); @@ -1834,7 +1834,7 @@ static void VoltorbFlip_RenderTopScreen(VoltorbFlipAppData *work) { VoltorbFlip_PaintMessageOnWindow(work, 4, msg_0039_00008, &work->wQuit, 0, 0); BgCommitTilemapBufferToVram(work->bgConfig, GF_BG_LYR_MAIN_1); - BufferIntegerAsString(work->msgFmt, 0, 1, 1, PRINTING_MODE_LEFT_ALIGN, 1); + BufferIntegerAsString(work->msgFmt, 0, 1, 1, PADDING_MODE_NONE, 1); // {ALN_CENTER}VOLTORB Flip Lv. {STRVAR_1 50, 0, 0} VoltorbFlip_PrintMessageOnWindow(work, 0, msg_0039_00000, &work->wCurrentLevel, 0, 0, MAKE_TEXT_COLOR(15, 1, 0)); @@ -1880,7 +1880,7 @@ static void VoltorbFlip_PrintMessageOnWindow(VoltorbFlipAppData *work, FontID fo AddTextPrinterParameterizedWithColor(window, fontId, str, x, y, TEXT_SPEED_NOTRANSFER, textColor, NULL); ScheduleWindowCopyToVram(window); - String_Delete(str); + String_Free(str); } static void VoltorbFlip_PrintMessageToSmallWindow(VoltorbFlipAppData *work, int msgNo) { @@ -1895,7 +1895,7 @@ static void VoltorbFlip_PrintMessageToSmallWindow(VoltorbFlipAppData *work, int AddTextPrinterParameterized(window, 1, str, 0, 0, 0xff, NULL); ScheduleWindowCopyToVram(window); - String_Delete(str); + String_Free(str); BgCommitTilemapBufferToVram(work->bgConfig, GF_BG_LYR_MAIN_3); } @@ -1928,7 +1928,7 @@ static void VoltorbFlip_PrintTextWindow(VoltorbFlipAppData *work, int msgNo, BOO static BOOL VoltorbFlip_IsPrinterFinished(VoltorbFlipAppData *work) { if (!TextPrinterCheckActive(work->printerId)) { if (work->string != NULL) { - String_Delete(work->string); + String_Free(work->string); work->string = NULL; } return TRUE; @@ -1939,7 +1939,7 @@ static BOOL VoltorbFlip_IsPrinterFinished(VoltorbFlipAppData *work) { static void VoltorbFlip_FormatGameLevel(VoltorbFlipAppData *work, int idx) { u8 displayLevel = 8 - VoltorbFlipGameState_GetGameLevel(work->game); - BufferIntegerAsString(work->msgFmt, idx, displayLevel, 1, PRINTING_MODE_LEFT_ALIGN, 1); + BufferIntegerAsString(work->msgFmt, idx, displayLevel, 1, PADDING_MODE_NONE, 1); } static void VoltorbFlip_DimLayersExceptBG3(u8 *isDimmed) { diff --git a/src/wfc_user_info_warning.c b/src/wfc_user_info_warning.c index d90b37cb8e..6ac7d7fd94 100644 --- a/src/wfc_user_info_warning.c +++ b/src/wfc_user_info_warning.c @@ -11,7 +11,7 @@ #include "gf_gfx_planes.h" #include "main.h" #include "msgdata.h" -#include "pm_string.h" +#include "string_gf.h" #include "render_window.h" #include "system.h" #include "text.h" @@ -110,7 +110,7 @@ void ShowWFCUserInfoWarning(enum HeapID heapID, int a1) { ReadMsgDataIntoString(warnings_msgdata, msg_0800_00016, warning_string); AddTextPrinterParameterized(&window, 0, warning_string, 0, 0, 0, NULL); - String_Delete(warning_string); + String_Free(warning_string); GfGfx_BothDispOn(); SetMasterBrightnessNeutral(0);