diff --git a/include/string_gf.h b/include/string_gf.h index a520ef13a9..00d6d9474b 100644 --- a/include/string_gf.h +++ b/include/string_gf.h @@ -1,5 +1,8 @@ -#ifndef POKEPLATINUM_STRING_H -#define POKEPLATINUM_STRING_H +#ifndef POKEPLATINUM_STRING_GF_H +#define POKEPLATINUM_STRING_GF_H + +#include "constants/heap.h" +#include "generated/string_padding_mode.h" #include "charcode.h" @@ -9,13 +12,10 @@ typedef struct String { /// Maximum allocated size of the buffer. u16 maxSize; - /// Size of the buffer, at present; the length of the underlying string. u16 size; - /// Integrity value specified at allocation time. u32 integrity; - /// The underlying character buffer. /// /// UB: This is meant to be a flexible array, but is purposely defined @@ -24,15 +24,12 @@ typedef struct String { charcode_t data[1]; } String; -#include "generated/string_padding_mode.h" - /** * 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, }; @@ -41,11 +38,11 @@ enum CharsetMode { * @brief Init routine. Allocates memory for a new String, initializes it * with an integrity-check value, and exposes its address. * - * @param size The size of the new String to allocate from the heap. + * @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_Init(u32 size, u32 heapID); +String *String_New(u32 maxSize, enum HeapID heapID); /** * @brief Free routine. Destroys an existing String and returns its memory @@ -66,13 +63,13 @@ void String_Clear(String *string); /** * @brief Copies the contents of the data buffer in `src` to the data buffer - * in `dst`. Fails if the contents of `src` will not fit into `dst`'s + * in `dest`. Fails if the contents of `src` will not fit into `dest`'s * allocated memory. * - * @param dst Destination buffer. `dst->size` and `dst->data` will be modified. + * @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 *dst, const String *src); +void String_Copy(String *dest, String *src); /** * @brief Clones the contents of a given String into a new String and returns @@ -81,59 +78,59 @@ void String_Copy(String *dst, const String *src); * This is effectively a nice wrapper around the following code: * * ```c - * String *dst = String_Init(src->size + 1, heapID); - * String_Copy(dst, src); + * 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(const String *src, u32 heapID); +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] dst Destination buffer. + * @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 *dst, int num, u32 maxDigits, enum PaddingMode paddingMode, enum CharsetMode charsetMode); +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] dst Destination buffer. + * @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 *dst, u64 num, u32 maxDigits, enum PaddingMode paddingMode, enum CharsetMode charsetMode); +void String_FormatU64(String *dest, u64 num, u32 maxDigits, enum PaddingMode paddingMode, enum CharsetMode charsetMode); /** * @brief Parses a numeric string into a number. * - * @param src Numeric string. + * @param string Numeric string. * @param[out] success Flag denoting if the result string was fully processed. * @return Parsed result. */ -u64 String_AtoI(const String *src, BOOL *success); +u64 String_AtoI(String *string, BOOL *success); /** - * @brief Compares two strings. Follows the `strcmp` standard. + * @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 0 if the strings match, 1 if they do not. + * @return FALSE if the strings match, TRUE if they do not. */ -int String_Compare(const String *str1, const String *str2); +BOOL String_Compare(String *str1, String *str2); /** * @brief Accessor for the length of a string. @@ -141,7 +138,7 @@ int String_Compare(const String *str1, const String *str2); * @param string * @return `string->size` */ -u32 String_Length(const String *string); +u16 String_GetLength(String *string); /** * @brief Counts the number of lines in a string. @@ -149,48 +146,48 @@ u32 String_Length(const String *string); * @param string * @return The number of lines in `string`. */ -u32 String_NumLines(const String *string); +u32 String_CountLines(const String *string); /** - * @brief Copies a particular line number from `src` into `dst`. + * @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] dst Destination buffer. + * @param[out] dest Destination buffer. * @param src Source buffer. * @param lineNum Number of the line to copy, zero-indexed. */ -void String_CopyLineNum(String *dst, const String *src, u32 lineNum); +void String_CopyLine(String *dest, const String *src, u32 lineNum); /** * @brief Copies data from a raw character buffer into a managed String. * - * @param[out] dst Destination buffer. + * @param[out] dest Destination buffer. * @param src Raw character source buffer. */ -void String_CopyChars(String *dst, const charcode_t *src); +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] dst Destination buffer. + * @param[out] dest Destination buffer. * @param src Raw character source buffer. * @param num Number of values to copy. */ -void String_CopyNumChars(String *dst, const charcode_t *src, u32 num); +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 > dstSize`. + * Fails if `src->size + 1 > destSize`. * * @param src Source buffer. - * @param[out] dst Destination buffer. - * @param dstSize Size of `dst`. + * @param[out] dest Destination buffer. + * @param destSize Size of `dest`. */ -void String_ToChars(const String *src, charcode_t *dst, u32 dstSize); +void String_CopyToChars(String *src, charcode_t *dest, u32 destSize); /** * @brief Accessor for the underlying data buffer of a managed string. @@ -198,27 +195,27 @@ void String_ToChars(const String *src, charcode_t *dst, u32 dstSize); * @param string * @return Underlying data buffer for `string`. */ -const charcode_t *String_GetData(const String *string); +charcode_t *String_GetChars(String *string); /** - * @brief Concatenates `src` onto the end of `dst`, if allocation permits. + * @brief Concatenates `src` onto the end of `dest`, if allocation permits. * - * Fails if `dst->maxSize < dst->size + src->size + 1`. + * Fails if `dest->maxSize < dest->size + src->size + 1`. * - * @param[out] dst Destination buffer. + * @param[out] dest Destination buffer. * @param src Source buffer. */ -void String_Concat(String *dst, const String *src); +void String_Concat(String *dest, String *src); /** - * @brief Appends a single character onto `dst`, if allocation permits. + * @brief Appends a single character onto `string`, if allocation permits. * - * Fails if `dst->maxSize >= dst->size + 1`. + * Fails if `string->maxSize >= string->size + 1`. * - * @param[out] dst Destination buffer. + * @param[out] string Destination buffer. * @param c Character to append. */ -void String_AppendChar(String *dst, charcode_t c); +void String_AppendChar(String *string, charcode_t c); /** * @brief Checks if a given string is a trainer name. @@ -232,22 +229,22 @@ void String_AppendChar(String *dst, charcode_t c); BOOL String_IsTrainerName(String *string); /** - * @brief Concatenates `src` onto the end of `dst`, accounting for trainer + * @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] dst Destination buffer. + * @param[out] dest Destination buffer. * @param src Source buffer. */ -void String_ConcatTrainerName(String *dst, String *src); +void String_ConcatTrainerName(String *dest, String *src); /** * @brief Converts a particular character to uppercase. * * @param string - * @param i Index of the character to capitalize, zero-indexed. + * @param index Index of the character to capitalize, zero-indexed. */ -void String_UpperChar(String *string, int i); +void String_UpperChar(String *string, int index); -#endif // POKEPLATINUM_STRING_H +#endif // POKEPLATINUM_STRING_GF_H diff --git a/src/applications/bag/main.c b/src/applications/bag/main.c index c42650f81f..e7ff16aa2e 100644 --- a/src/applications/bag/main.c +++ b/src/applications/bag/main.c @@ -850,7 +850,7 @@ static void SetupTextLoaders(BagController *controller) controller->strTemplate = StringTemplate_Default(HEAP_ID_BAG); controller->itemNamesLoader = MessageLoader_Init(MSG_LOADER_PRELOAD_ENTIRE_BANK, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_ITEM_NAMES, HEAP_ID_BAG); controller->moveNamesLoader = MessageLoader_Init(MSG_LOADER_PRELOAD_ENTIRE_BANK, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_MOVE_NAMES, HEAP_ID_BAG); - controller->stringBuffer = String_Init(256, HEAP_ID_BAG); + controller->stringBuffer = String_New(256, HEAP_ID_BAG); } static void CountAccessiblePockets(BagController *controller) @@ -1007,7 +1007,7 @@ static void LoadCurrentPocketItemNames(BagController *controller) static void InitItemNameBuffers(BagController *controller) { for (u32 i = 0; i < LARGEST_POCKET_SIZE; i++) { - controller->itemNames[i] = String_Init(18, HEAP_ID_BAG); + controller->itemNames[i] = String_New(18, HEAP_ID_BAG); } } diff --git a/src/applications/bag/windows.c b/src/applications/bag/windows.c index 245eb48ee7..74ff2b6fd5 100644 --- a/src/applications/bag/windows.c +++ b/src/applications/bag/windows.c @@ -223,7 +223,7 @@ void BagUI_PrintItemDescription(BagController *controller, u16 item) String *string; if (item != 0xffff) { - string = String_Init(130, HEAP_ID_BAG); + string = String_New(130, HEAP_ID_BAG); Item_LoadDescription(string, item, HEAP_ID_BAG); } else { string = MessageLoader_GetNewString(controller->bagStringsLoader, Bag_Text_CloseBagDescription); @@ -311,7 +311,7 @@ void BagUI_PrintItemCount(BagController *controller, u16 count, u16 yOffset, u32 Text_AddPrinterWithParamsAndColor(&controller->windows[BAG_UI_WINDOW_ITEM_LIST], FONT_SYSTEM, controller->itemCountX, ITEM_COUNT_START_POS, yOffset, TEXT_SPEED_NO_TRANSFER, color, NULL); } - String *string = String_Init(10, HEAP_ID_BAG); + String *string = String_New(10, HEAP_ID_BAG); StringTemplate_SetNumber(controller->strTemplate, 0, count, 3, PADDING_MODE_NONE, CHARSET_MODE_EN); StringTemplate_Format(controller->strTemplate, string, controller->itemCountNumberFmt); @@ -444,7 +444,7 @@ void BagUI_ShowItemActionsMenu(BagController *controller, u8 *actions, u8 numAct Window_FillTilemap(&controller->windows[msgBoxWindowIdx], 15); String *template = MessageLoader_GetNewString(controller->bagStringsLoader, Bag_Text_ItemIsSelected); - String *formatted = String_Init(28 * 2, HEAP_ID_BAG); + String *formatted = String_New(28 * 2, HEAP_ID_BAG); BagApplicationPocket *pocket = &controller->bagCtx->accessiblePockets[controller->bagCtx->currPocketIdx]; BufferPocketSlotItemName(controller, pocket->cursorScroll + pocket->cursorPos - 1, 0); @@ -489,7 +489,7 @@ void BagUI_PrintMovingItemMsg(BagController *controller) Window_FillTilemap(&controller->windows[BAG_UI_WINDOW_ITEM_DESCRIPTION], 0); String *template = MessageLoader_GetNewString(controller->bagStringsLoader, Bag_Text_MoveItemWhere); - String *formatted = String_Init(130, HEAP_ID_BAG); + String *formatted = String_New(130, HEAP_ID_BAG); BufferPocketSlotItemName(controller, controller->movedItemPos - 1, 0); @@ -508,7 +508,7 @@ void BagUI_ShowItemTrashWindows(BagController *controller) Window_FillTilemap(&controller->windows[BAG_UI_WINDOW_MSG_BOX], 15); String *template = MessageLoader_GetNewString(controller->bagStringsLoader, Bag_Text_ThrowAwayHowMany); - String *formatted = String_Init(14 * 2 * 2, HEAP_ID_BAG); + String *formatted = String_New(14 * 2 * 2, HEAP_ID_BAG); BagApplicationPocket *pocket = &controller->bagCtx->accessiblePockets[controller->bagCtx->currPocketIdx]; BufferPocketSlotItemName(controller, pocket->cursorScroll + pocket->cursorPos - 1, 0); diff --git a/src/applications/diploma.c b/src/applications/diploma.c index 25ced846cf..6d8542b82e 100644 --- a/src/applications/diploma.c +++ b/src/applications/diploma.c @@ -386,8 +386,8 @@ static void Diploma_LoadGraphics(Diploma *data) static void Diploma_LoadText(Diploma *data) { - String *string = String_Init(512, data->heapID); - String *formatString = String_Init(512, data->heapID); + String *string = String_New(512, data->heapID); + String *formatString = String_New(512, data->heapID); MessageLoader_GetString(data->messageLoader, Diploma_Text_Player, formatString); StringTemplate_SetPlayerName(data->stringTemplate, 0, data->trainerInfo); diff --git a/src/applications/journal_display/journal_controller.c b/src/applications/journal_display/journal_controller.c index f8b7306c16..910d7b05a2 100644 --- a/src/applications/journal_display/journal_controller.c +++ b/src/applications/journal_display/journal_controller.c @@ -302,7 +302,7 @@ static void JournalController_InitStringUtil(JournalManager *journalManager) { journalManager->loader = MessageLoader_Init(MSG_LOADER_PRELOAD_ENTIRE_BANK, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_JOURNAL_ENTRIES, HEAP_ID_JOURNAL); journalManager->template = StringTemplate_Default(HEAP_ID_JOURNAL); - journalManager->string = String_Init(128, HEAP_ID_JOURNAL); + journalManager->string = String_New(128, HEAP_ID_JOURNAL); } static void JournalController_FreeStringUtil(JournalManager *journalManager) diff --git a/src/applications/journal_display/journal_printer.c b/src/applications/journal_display/journal_printer.c index e2376c3c11..e5c9486bb5 100644 --- a/src/applications/journal_display/journal_printer.c +++ b/src/applications/journal_display/journal_printer.c @@ -341,18 +341,18 @@ static void JournalPrinter_PrintTrainerEvent(JournalManager *journalManager, Win } String *name = MessageBank_GetNewStringFromNARC(NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_LOCATION_NAMES, MapHeader_GetMapLabelTextID(journalEntryTrainer.mapID), HEAP_ID_JOURNAL); - strLength = String_Length(name); + strLength = String_GetLength(name); String_Free(name); if (Trainer_LoadParam(journalEntryTrainer.trainerID, TRDATA_CLASS) == TRAINER_CLASS_RIVAL) { name = MessageLoader_GetNewString(journalManager->loader, JournalEntries_Text_RivalName); StringTemplate_SetRivalName(journalManager->template, 1, journalManager->saveData); StringTemplate_Format(journalManager->template, journalManager->string, name); - strLength += String_Length(journalManager->string); + strLength += String_GetLength(journalManager->string); String_Free(name); } else { name = MessageBank_GetNewStringFromNARC(NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_NPC_TRAINER_NAMES, journalEntryTrainer.trainerID, HEAP_ID_JOURNAL); - strLength += String_Length(name); + strLength += String_GetLength(name); String_Free(name); StringTemplate_SetTrainerName(journalManager->template, 1, journalEntryTrainer.trainerID); } @@ -886,9 +886,9 @@ static void JournalPrinter_PrintPokemonDefeated(JournalManager *journalManager, static void JournalPrinter_SetPlayerOrPokemonName(JournalManager *journalManager, u16 *name, u8 unused, u8 idx) { - String *string = String_Init(32, HEAP_ID_JOURNAL); + String *string = String_New(32, HEAP_ID_JOURNAL); - String_CopyChars(string, name); + String_CopyFromChars(string, name); StringTemplate_SetString(journalManager->template, idx, string, unused, TRUE, GAME_LANGUAGE); String_Free(string); } diff --git a/src/applications/move_reminder.c b/src/applications/move_reminder.c index a31c04da3b..5cc7426df7 100644 --- a/src/applications/move_reminder.c +++ b/src/applications/move_reminder.c @@ -828,7 +828,7 @@ static void MoveReminder_InitText(MoveReminderController *controller) { controller->messageLoader = MessageLoader_Init(MSG_LOADER_PRELOAD_ENTIRE_BANK, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_MOVE_REMINDER, HEAP_ID_MOVE_REMINDER); controller->stringTemplate = StringTemplate_Default(HEAP_ID_MOVE_REMINDER); - controller->string = String_Init(256, HEAP_ID_MOVE_REMINDER); + controller->string = String_New(256, HEAP_ID_MOVE_REMINDER); } static void MoveReminder_FreeText(MoveReminderController *controller) diff --git a/src/applications/naming_screen.c b/src/applications/naming_screen.c index 3c2beb0b1f..6fac110748 100644 --- a/src/applications/naming_screen.c +++ b/src/applications/naming_screen.c @@ -1355,7 +1355,7 @@ static void NamingScreen_UseDefaultName(NamingScreen *namingScreen, NamingScreen String_Copy(args->textInputStr, string); String_Free(string); - String_ToChars(args->textInputStr, args->nameInputRaw, 10); + String_CopyToChars(args->textInputStr, args->nameInputRaw, 10); } else if (namingScreen->type == NAMING_SCREEN_TYPE_RIVAL) { String *string; @@ -1365,7 +1365,7 @@ static void NamingScreen_UseDefaultName(NamingScreen *namingScreen, NamingScreen String_Copy(args->textInputStr, string); String_Free(string); - String_ToChars(args->textInputStr, args->nameInputRaw, 10); + String_CopyToChars(args->textInputStr, args->nameInputRaw, 10); } else { args->returnCode = NAMING_SCREEN_CODE_NO_INPUT; } @@ -1414,7 +1414,7 @@ static BOOL NamingScreen_Exit(ApplicationManager *appMan, int *unusedState) } else { CharCode_Copy(namingScreen->entryBufBak, namingScreen->entryBuf); CharCode_Copy(namingScreenArgs->nameInputRaw, namingScreen->entryBuf); - String_CopyChars(namingScreenArgs->textInputStr, namingScreen->entryBuf); + String_CopyFromChars(namingScreenArgs->textInputStr, namingScreen->entryBuf); } String_Free(namingScreen->groupTextString); @@ -1485,7 +1485,7 @@ NamingScreenArgs *NamingScreenArgs_Init( args->maxChars = maxChars; args->returnCode = NAMING_SCREEN_CODE_OK; args->nameInputRaw[0] = CHAR_EOS; - args->textInputStr = String_Init(32, heapID); + args->textInputStr = String_New(32, heapID); args->battleMsgID = 0; args->pcBoxes = NULL; args->monGender = GENDER_MALE; @@ -1677,7 +1677,7 @@ static void NamingScreen_InitCursorsAndChars(NamingScreen *namingScreen, Applica namingScreen->entryBufBak[0] = CHAR_EOS; if (namingScreenArgs->textInputStr) { - String_ToChars(namingScreenArgs->textInputStr, namingScreen->entryBufBak, 32); + String_CopyToChars(namingScreenArgs->textInputStr, namingScreen->entryBufBak, 32); } MI_CpuFill16(namingScreen->entryBuf, 1, 32 * 2); @@ -1741,7 +1741,7 @@ static void NamingScreen_PrepareBattleMessage(NamingScreen *namingScreen, Applic if (args->battleMsgID != 0) { int boxID, nextBoxID; - string = String_Init(200, HEAP_ID_NAMING_SCREEN_APP); + string = String_New(200, HEAP_ID_NAMING_SCREEN_APP); namingScreen->battleMessageString = NULL; boxID = PCBoxes_GetCurrentBoxID(args->pcBoxes); nextBoxID = PCBoxes_FirstEmptyBox(args->pcBoxes); @@ -1763,7 +1763,7 @@ static void NamingScreen_PrepareBattleMessage(NamingScreen *namingScreen, Applic Heap_Free(mon); } else { namingScreen->entryBuf[namingScreen->textCursorPos] = CHAR_EOS; - String_CopyChars(string, namingScreen->entryBuf); + String_CopyFromChars(string, namingScreen->entryBuf); StringTemplate_SetString(namingScreen->strTemplate, 0, string, 0, 0, 0); } @@ -2654,7 +2654,7 @@ static void NamingScreen_PrintChars( { int i = 0, charWidth, charXOffset; u16 charBuffer[2]; - String *string = String_Init(2, HEAP_ID_NAMING_SCREEN_APP); + String *string = String_New(2, HEAP_ID_NAMING_SCREEN_APP); while (charCodes[i] != CHAR_EOS) { if (charCodes[i] == NMS_CONTROL_DAKU @@ -2684,7 +2684,7 @@ static void NamingScreen_PrintChars( charWidth = Font_CalcCharArrayWidth(FONT_SYSTEM, charBuffer, 0); charXOffset = baseXOffset + i * charSpacing + ((charSpacing - charWidth) / 2); - String_CopyChars(string, charBuffer); + String_CopyFromChars(string, charBuffer); Text_AddPrinterWithParamsAndColor( window, FONT_SYSTEM, @@ -2740,14 +2740,14 @@ static void NamingScreen_PrintCharOnWindowAndOBJ( GXS_LoadOBJ(pixelBuf, sUnkGXObjOffsets1[i] * 0x20, 0x20 * 4 * 2); } - string2 = String_Init(20 + 1, HEAP_ID_NAMING_SCREEN_APP); + string2 = String_New(20 + 1, HEAP_ID_NAMING_SCREEN_APP); for (i = 0; i < 3; i++) { curCharBuf[0] = tmpBuf[i]; curCharBuf[1] = CHAR_EOS; Window_FillTilemap(&windows[i], 0); - String_CopyChars(string2, curCharBuf); + String_CopyFromChars(string2, curCharBuf); ptr = NamingScreen_PrintStringOnWindowAndGetPixelBuffer( &windows[i], diff --git a/src/applications/options_menu.c b/src/applications/options_menu.c index 559866422e..2822b41a6b 100644 --- a/src/applications/options_menu.c +++ b/src/applications/options_menu.c @@ -694,7 +694,7 @@ static void PrintTitleAndEntries(OptionsMenuData *menuData) TextColor transparentBg = TEXT_COLOR(1, 2, 0); TextColor whiteBg = TEXT_COLOR(1, 2, 15); - String *string = String_Init(256, menuData->heapID); + String *string = String_New(256, menuData->heapID); MessageLoader_GetString(menuData->msgLoader, OptionsMenu_Text_Title, string); Text_AddPrinterWithParamsAndColor(&menuData->windows.title, FONT_SYSTEM, @@ -853,7 +853,7 @@ static void PrintBankEntryAsDescription(OptionsMenuData *menuData, u16 entry, BO Window_FillTilemap(&menuData->windows.description, 15); TextColor color = TEXT_COLOR(1, 2, 15); - String *string = String_Init(256, menuData->heapID); + String *string = String_New(256, menuData->heapID); MessageLoader_GetString(menuData->msgLoader, entry, string); if (scheduleVRAMCopy == FALSE) { diff --git a/src/applications/party_menu/main.c b/src/applications/party_menu/main.c index cf9cd22b6d..1de1177d2f 100644 --- a/src/applications/party_menu/main.c +++ b/src/applications/party_menu/main.c @@ -1018,14 +1018,14 @@ static PartyMenuApplication *NewPartyMenuApplication(ApplicationManager *appMan) application->template = StringTemplate_Default(HEAP_ID_PARTY_MENU); for (i = 0; i < MAX_PARTY_SIZE; i++) { - application->partyMembers[i].name = String_Init(MON_NAME_LEN + 1, HEAP_ID_PARTY_MENU); + application->partyMembers[i].name = String_New(MON_NAME_LEN + 1, HEAP_ID_PARTY_MENU); } - application->tmpString = String_Init(256, HEAP_ID_PARTY_MENU); - application->tmpFormat = String_Init(256, HEAP_ID_PARTY_MENU); + application->tmpString = String_New(256, HEAP_ID_PARTY_MENU); + application->tmpFormat = String_New(256, HEAP_ID_PARTY_MENU); for (i = 0; i < NUM_PARTY_MENU_STRS; i++) { - application->menuStrings[i] = String_Init(32, HEAP_ID_PARTY_MENU); + application->menuStrings[i] = String_New(32, HEAP_ID_PARTY_MENU); } application->currPartySlot = application->partyMenu->selectedMonSlot; diff --git a/src/applications/pc_boxes/box_app_manager.c b/src/applications/pc_boxes/box_app_manager.c index bd1f24abcc..b1c93b0483 100644 --- a/src/applications/pc_boxes/box_app_manager.c +++ b/src/applications/pc_boxes/box_app_manager.c @@ -3404,7 +3404,7 @@ static void BoxMonSelection_Free(BoxMonSelection *selection) static void PCBoxes_InitCustomization(PCBoxes *pcBoxes, BoxCustomization *customization) { customization->boxID = PCBoxes_GetCurrentBoxID(pcBoxes); - customization->name = String_Init(PC_BOX_NAME_BUFFER_LEN, HEAP_ID_BOX_DATA); + customization->name = String_New(PC_BOX_NAME_BUFFER_LEN, HEAP_ID_BOX_DATA); PCBoxes_LoadCustomization(pcBoxes, customization); } @@ -3415,11 +3415,11 @@ static void Customization_Free(BoxCustomization *customization) static void PCMonPreview_Init(PCMonPreview *preview) { - preview->nickname = String_Init(12, HEAP_ID_BOX_DATA); - preview->speciesName = String_Init(12, HEAP_ID_BOX_DATA); - preview->heldItemName = String_Init(18, HEAP_ID_BOX_DATA); - preview->nature = String_Init(12, HEAP_ID_BOX_DATA); - preview->ability = String_Init(16, HEAP_ID_BOX_DATA); + preview->nickname = String_New(12, HEAP_ID_BOX_DATA); + preview->speciesName = String_New(12, HEAP_ID_BOX_DATA); + preview->heldItemName = String_New(18, HEAP_ID_BOX_DATA); + preview->nature = String_New(12, HEAP_ID_BOX_DATA); + preview->ability = String_New(16, HEAP_ID_BOX_DATA); } static void PCMonPreview_Free(PCMonPreview *preview) @@ -3439,8 +3439,8 @@ static void PCCompareHelper_Init(CompareModeHelper *compareHelper) for (int i = 0; i < 2; i++) { compareHelper->compareSlotHasMon[i] = FALSE; - compareHelper->compareMons[i].monName = String_Init(12, HEAP_ID_BOX_DATA); - compareHelper->compareMons[i].nature = String_Init(12, HEAP_ID_BOX_DATA); + compareHelper->compareMons[i].monName = String_New(12, HEAP_ID_BOX_DATA); + compareHelper->compareMons[i].nature = String_New(12, HEAP_ID_BOX_DATA); } } diff --git a/src/applications/pc_boxes/ov19_021DB2FC.c b/src/applications/pc_boxes/ov19_021DB2FC.c index dfcd9911fa..bd0991a670 100644 --- a/src/applications/pc_boxes/ov19_021DB2FC.c +++ b/src/applications/pc_boxes/ov19_021DB2FC.c @@ -37,8 +37,8 @@ BOOL ov19_021DB2FC(UnkStruct_ov19_021DB6F0 *param0, UnkStruct_ov19_021D61B0 *par param0->unk_20 = optionsFrame; param0->unk_10 = boxMessagesLoader; param0->unk_14 = MessageLoader_Init(MSG_LOADER_PRELOAD_ENTIRE_BANK, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_POKEMON_STORAGE_SYSTEM, HEAP_ID_BOX_GRAPHICS); - param0->unk_30 = String_Init(64, HEAP_ID_BOX_GRAPHICS); - param0->unk_34 = String_Init(64, HEAP_ID_BOX_GRAPHICS); + param0->unk_30 = String_New(64, HEAP_ID_BOX_GRAPHICS); + param0->unk_34 = String_New(64, HEAP_ID_BOX_GRAPHICS); param0->unk_1C = 0; param0->unk_1E = 0; param0->unk_18 = NULL; diff --git a/src/applications/pc_boxes/ov19_021DB8E4.c b/src/applications/pc_boxes/ov19_021DB8E4.c index 347c6090cb..82ac8d09b0 100644 --- a/src/applications/pc_boxes/ov19_021DB8E4.c +++ b/src/applications/pc_boxes/ov19_021DB8E4.c @@ -117,7 +117,7 @@ BOOL ov19_021DB8E4(UnkStruct_ov19_021DBA9C *param0, UnkStruct_ov19_021D61B0 *par param0->unk_34 = Graphics_GetScrnDataFromOpenNARC(param5, 2, 1, &(param0->unk_38), HEAP_ID_BOX_GRAPHICS); param0->unk_2C = Graphics_GetScrnDataFromOpenNARC(param5, 3, 1, &(param0->unk_30), HEAP_ID_BOX_GRAPHICS); param0->unk_44 = FontSpecialChars_Init(2, 13, 4, HEAP_ID_BOX_GRAPHICS); - param0->unk_4BFC = String_Init(500, HEAP_ID_BOX_GRAPHICS); + param0->unk_4BFC = String_New(500, HEAP_ID_BOX_GRAPHICS); param0->unk_10 = NULL; param0->unk_3C.pixels = param0->unk_18->pRawData; param0->unk_3C.width = 32; diff --git a/src/applications/pc_boxes/ov19_021DCF88.c b/src/applications/pc_boxes/ov19_021DCF88.c index 7336e8e1e2..7d83fea905 100644 --- a/src/applications/pc_boxes/ov19_021DCF88.c +++ b/src/applications/pc_boxes/ov19_021DCF88.c @@ -315,7 +315,7 @@ BOOL ov19_021DCF88(UnkStruct_ov19_021DCF88 **param0, UnkStruct_ov19_021D61B0 *pa v0->unk_04 = param2; v0->unk_0C = param4; v0->unk_14 = NULL; - v0->unk_84 = String_Init(32, HEAP_ID_BOX_GRAPHICS); + v0->unk_84 = String_New(32, HEAP_ID_BOX_GRAPHICS); v0->unk_10 = param2->touchDialHelper.selectedTouchDial; v0->unk_98 = NULL; v0->unk_A0 = NULL; diff --git a/src/applications/pc_boxes/ov19_021DEC04.c b/src/applications/pc_boxes/ov19_021DEC04.c index 0125b12a32..c94eae4443 100644 --- a/src/applications/pc_boxes/ov19_021DEC04.c +++ b/src/applications/pc_boxes/ov19_021DEC04.c @@ -103,7 +103,7 @@ BOOL ov19_021DEC04(UnkStruct_ov19_021DEC04 **param0, UnkStruct_ov19_021D61B0 *pa v0->unk_374 = Graphics_GetScrnDataFromOpenNARC(param6, 8, 1, &(v0->unk_36C), HEAP_ID_BOX_GRAPHICS); v0->unk_6C = param5; v0->unk_70 = MessageLoader_Init(MSG_LOADER_LOAD_ON_DEMAND, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_MOVE_NAMES, HEAP_ID_BOX_GRAPHICS); - v0->boxDisplayText = String_Init(32, HEAP_ID_BOX_GRAPHICS); + v0->boxDisplayText = String_New(32, HEAP_ID_BOX_GRAPHICS); v0->unk_380 = NULL; *param0 = v0; return 1; diff --git a/src/applications/pc_hall_of_fame/display.c b/src/applications/pc_hall_of_fame/display.c index 130931317d..e95f05a329 100644 --- a/src/applications/pc_hall_of_fame/display.c +++ b/src/applications/pc_hall_of_fame/display.c @@ -102,8 +102,8 @@ PCHallOfFameApp *PCHallOfFame_InitApp(PCHallOfFameMan *pcHallOfFameMan, const PC pcHallOfFameApp->msgLoaderSpeciesNames = MessageLoader_Init(MSG_LOADER_LOAD_ON_DEMAND, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_SPECIES_NAME, HEAP_ID_PC_HALL_OF_FAME); pcHallOfFameApp->msgLoaderMoveNames = MessageLoader_Init(MSG_LOADER_LOAD_ON_DEMAND, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_MOVE_NAMES, HEAP_ID_PC_HALL_OF_FAME); pcHallOfFameApp->strTemplate = StringTemplate_Default(HEAP_ID_PC_HALL_OF_FAME); - pcHallOfFameApp->unk_1F4 = String_Init(256, HEAP_ID_PC_HALL_OF_FAME); - pcHallOfFameApp->unk_1F8 = String_Init(256, HEAP_ID_PC_HALL_OF_FAME); + pcHallOfFameApp->unk_1F4 = String_New(256, HEAP_ID_PC_HALL_OF_FAME); + pcHallOfFameApp->unk_1F8 = String_New(256, HEAP_ID_PC_HALL_OF_FAME); pcHallOfFameApp->mon = Pokemon_New(HEAP_ID_PC_HALL_OF_FAME); SetVBlankCallback(ov87_021D11AC, pcHallOfFameApp); diff --git a/src/applications/pc_hall_of_fame/manager.c b/src/applications/pc_hall_of_fame/manager.c index 0d094a892c..3aed05211a 100644 --- a/src/applications/pc_hall_of_fame/manager.c +++ b/src/applications/pc_hall_of_fame/manager.c @@ -153,8 +153,8 @@ static void PCHallOfFame_LoadFirstEntry(PCHallOfFameScreen *pcHallOfFameScreen, int i; for (i = 0; i < MAX_PARTY_SIZE; i++) { - pcHallOfFameScreen->pokemon[i].nickname = String_Init(MON_NAME_LEN + 2, HEAP_ID_60); - pcHallOfFameScreen->pokemon[i].OTName = String_Init(TRAINER_NAME_LEN + 1, HEAP_ID_60); + pcHallOfFameScreen->pokemon[i].nickname = String_New(MON_NAME_LEN + 2, HEAP_ID_60); + pcHallOfFameScreen->pokemon[i].OTName = String_New(TRAINER_NAME_LEN + 1, HEAP_ID_60); } pcHallOfFameScreen->textState = PC_HALL_OF_FAME_TEXT_GENERAL; diff --git a/src/applications/poffin_case/manager.c b/src/applications/poffin_case/manager.c index cd117289e9..03ea208952 100644 --- a/src/applications/poffin_case/manager.c +++ b/src/applications/poffin_case/manager.c @@ -661,7 +661,7 @@ static void InitMessages(PoffinManager *app) app->msgLoader = MessageLoader_Init(MSG_LOADER_PRELOAD_ENTIRE_BANK, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_POFFIN_CASE, app->heapID); app->poffinTypes = PoffinTypeList_New(app->heapID); app->messages.template = StringTemplate_New(2, 64, app->heapID); - app->messages.string = String_Init(64, app->heapID); + app->messages.string = String_New(64, app->heapID); app->messages.closeStr = MessageLoader_GetNewString(app->msgLoader, PoffinCase_Text_Close); app->messages.listItemStr = MessageLoader_GetNewString(app->msgLoader, PoffinCase_Text_ListItem); app->messages.smoothStr = MessageLoader_GetNewString(app->msgLoader, PoffinCase_Text_Smooth); diff --git a/src/applications/poffin_case/ov79_021D2268.c b/src/applications/poffin_case/ov79_021D2268.c index 0d2986ee30..ccb5124f87 100644 --- a/src/applications/poffin_case/ov79_021D2268.c +++ b/src/applications/poffin_case/ov79_021D2268.c @@ -478,7 +478,7 @@ static void ov79_021D2768(UnkStruct_ov79_021D2928 *param0) param0->unk_18 = MessageLoader_Init(MSG_LOADER_PRELOAD_ENTIRE_BANK, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_UNK_0462, param0->heapID); param0->unk_1C.unk_00 = StringTemplate_New(1, 64, param0->heapID); - param0->unk_1C.unk_04 = String_Init(64, param0->heapID); + param0->unk_1C.unk_04 = String_New(64, param0->heapID); for (v0 = 0; v0 < 3; v0++) { param0->unk_1C.unk_08[v0] = MessageLoader_GetNewString(param0->unk_18, v0); @@ -505,7 +505,7 @@ static void ov79_021D27D8(UnkStruct_ov79_021D2928 *param0) param0->unk_30.unk_07 = Pokemon_GetGender(param0->unk_10->unk_00); param0->unk_30.unk_06 = Pokemon_GetNature(param0->unk_10->unk_00); param0->unk_30.unk_08 = SpeciesData_GetFormValue(param0->unk_30.unk_04, Pokemon_GetValue(param0->unk_10->unk_00, MON_DATA_FORM, NULL), 28) ^ 1; - param0->unk_30.unk_0C = String_Init(12, param0->heapID); + param0->unk_30.unk_0C = String_New(12, param0->heapID); Pokemon_GetValue(param0->unk_10->unk_00, MON_DATA_NICKNAME_STRING, param0->unk_30.unk_0C); diff --git a/src/applications/pokedex/ov21_021D5AEC.c b/src/applications/pokedex/ov21_021D5AEC.c index 1e720f4fd0..7c38a7f6e6 100644 --- a/src/applications/pokedex/ov21_021D5AEC.c +++ b/src/applications/pokedex/ov21_021D5AEC.c @@ -3,6 +3,8 @@ #include #include +#include "constants/heap.h" + #include "applications/pokedex/ov21_021D4340.h" #include "applications/pokedex/pokedex_app.h" #include "applications/pokedex/pokedex_data_manager.h" @@ -137,7 +139,7 @@ static void ov21_021D6BB0(UnkStruct_ov21_021D71A8 *param0, const UnkStruct_ov21_ static void ov21_021D6C44(UnkStruct_ov21_021D71A8 *param0, PokedexGraphicData *param1, const UnkStruct_ov21_021D5B68 *param2, int param3); static void ov21_021D6CC8(UnkStruct_ov21_021D71A8 *param0, PokedexGraphicData *param1, const UnkStruct_ov21_021D5B68 *param2, int param3); static void ov21_021D6D78(UnkStruct_ov21_021D71A8 *param0, PokedexGraphicData *param1, const UnkStruct_ov21_021D5B68 *param2, int param3, int param4, int dexIndex); -static void ov21_021D6DF4(UnkStruct_ov21_021D71A8 *param0, PokedexGraphicData *param1, int param2, int param3, int param4); +static void ov21_021D6DF4(UnkStruct_ov21_021D71A8 *param0, PokedexGraphicData *param1, enum HeapID heapID, int param3, int param4); static void ov21_021D6CA4(Sprite *param0, int *param1, int *param2); static fx32 ov21_021D6BF8(fx32 param0, fx32 param1, int param2, int param3); static void ov21_021D6F20(UnkStruct_ov21_021D71A8 *param0, PokedexGraphicData *param1, const UnkStruct_ov21_021D5B68 *param2); @@ -720,7 +722,7 @@ static void ov21_021D63C0(UnkStruct_ov21_021D71A8 *param0) static void ov21_021D63DC(PokedexGraphicData *param0, int heapID, int param2, int param3) { - String *v0 = String_Init(32, heapID); + String *v0 = String_New(32, heapID); MessageLoader *pokedexMessageBank = MessageLoader_Init(MSG_LOADER_PRELOAD_ENTIRE_BANK, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_POKEDEX, heapID); MessageLoader_GetString(pokedexMessageBank, pl_msg_pokedex_seen, v0); @@ -742,7 +744,7 @@ static void ov21_021D63DC(PokedexGraphicData *param0, int heapID, int param2, in static void ov21_021D64B0(PokedexGraphicData *param0, int heapID, int param2) { - String *v0 = String_Init(32, heapID); + String *v0 = String_New(32, heapID); MessageLoader *pokedexMessageBank = MessageLoader_Init(MSG_LOADER_PRELOAD_ENTIRE_BANK, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_POKEDEX, heapID); MessageLoader_GetString(pokedexMessageBank, pl_msg_pokedex_results, v0); @@ -1262,11 +1264,11 @@ static void ov21_021D6D78(UnkStruct_ov21_021D71A8 *param0, PokedexGraphicData *p PokedexTextManager_FreeWindow(v1); } -static void ov21_021D6DF4(UnkStruct_ov21_021D71A8 *param0, PokedexGraphicData *param1, int heapID, int param3, int param4) +static void ov21_021D6DF4(UnkStruct_ov21_021D71A8 *param0, PokedexGraphicData *param1, enum HeapID heapID, int param3, int param4) { PokedexDisplayBox displayBox; Window *v1; - String *v2 = String_Init(32, heapID); + String *v2 = String_New(32, (u32)heapID); // For matching MessageLoader *pokedexMessageBank = MessageLoader_Init(MSG_LOADER_PRELOAD_ENTIRE_BANK, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_POKEDEX, heapID); displayBox.textMan = param1->textMan; diff --git a/src/applications/pokedex/ov21_021DE668.c b/src/applications/pokedex/ov21_021DE668.c index 56e71d30cc..9860d0e4a2 100644 --- a/src/applications/pokedex/ov21_021DE668.c +++ b/src/applications/pokedex/ov21_021DE668.c @@ -419,7 +419,7 @@ static void ov21_021DEB58(PokedexGraphicData **param0, const UnkStruct_ov21_021D void ov21_021DEB8C(Window *param0, int param1, enum HeapID heapID, int param3, u32 param4) { - String *v0 = String_Init(64, heapID); + String *v0 = String_New(64, heapID); MessageLoader *pokedexMessageBank = MessageLoader_Init(MSG_LOADER_PRELOAD_ENTIRE_BANK, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_POKEDEX, heapID); MessageLoader_GetString(pokedexMessageBank, pl_msg_pokedex_ht, v0); @@ -437,7 +437,7 @@ void ov21_021DEB8C(Window *param0, int param1, enum HeapID heapID, int param3, u static void ov21_021DEC2C(Window *param0, int heapID, int param2, u32 param3) { - String *v0 = String_Init(64, heapID); + String *v0 = String_New(64, heapID); int heightMessageBankIndex = Height_Message_Bank_Index(); MessageLoader *v1 = MessageLoader_Init(MSG_LOADER_PRELOAD_ENTIRE_BANK, NARC_INDEX_MSGDATA__PL_MSG, heightMessageBankIndex, heapID); @@ -450,7 +450,7 @@ static void ov21_021DEC2C(Window *param0, int heapID, int param2, u32 param3) static void ov21_021DEC80(Window *param0, int heapID, int param2, u32 param3) { - String *v0 = String_Init(64, heapID); + String *v0 = String_New(64, heapID); int weightMessageBankIndex = Weight_Message_Bank_Index(); MessageLoader *v1 = MessageLoader_Init(MSG_LOADER_PRELOAD_ENTIRE_BANK, NARC_INDEX_MSGDATA__PL_MSG, weightMessageBankIndex, heapID); diff --git a/src/applications/pokedex/ov21_021E0C68.c b/src/applications/pokedex/ov21_021E0C68.c index 8c764c5df2..626481c316 100644 --- a/src/applications/pokedex/ov21_021E0C68.c +++ b/src/applications/pokedex/ov21_021E0C68.c @@ -409,7 +409,7 @@ static void ov21_021E0FBC(PokedexGraphicData **param0, int heapID) static void ov21_021E10D0(PokedexGraphicData **param0, const UnkStruct_ov21_021E0D68 *param1, enum HeapID heapID) { - String *v0 = String_Init(64, heapID); + String *v0 = String_New(64, heapID); MessageLoader *pokedexMessageBank = MessageLoader_Init(MSG_LOADER_PRELOAD_ENTIRE_BANK, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_POKEDEX, heapID); int species = PokedexSort_CurrentSpecies(param1->unk_04); int entryID; diff --git a/src/applications/pokedex/ov21_021E737C.c b/src/applications/pokedex/ov21_021E737C.c index eaa28232ff..9b34d2f96d 100644 --- a/src/applications/pokedex/ov21_021E737C.c +++ b/src/applications/pokedex/ov21_021E737C.c @@ -691,7 +691,7 @@ static void ov21_021E7CF4(UnkStruct_ov21_021E7714 *param0) static void ov21_021E7CF8(UnkStruct_ov21_021E747C *param0, enum HeapID heapID) { - String *v0 = String_Init(32, heapID); + String *v0 = String_New(32, heapID); MessageLoader *pokedexMessageBank = MessageLoader_Init(MSG_LOADER_PRELOAD_ENTIRE_BANK, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_POKEDEX, heapID); MessageLoader_GetString(pokedexMessageBank, pl_msg_pokedex_weightcheck_topscreen, v0); @@ -711,7 +711,7 @@ static void ov21_021E7CF8(UnkStruct_ov21_021E747C *param0, enum HeapID heapID) static void ov21_021E7DA8(UnkStruct_ov21_021E747C *param0, const UnkStruct_ov21_021E7468 *param1, enum HeapID heapID) { - String *v0 = String_Init(32, heapID); + String *v0 = String_New(32, heapID); int species = PokedexSort_CurrentSpecies(param1->unk_00); String *v3 = MessageUtil_SpeciesName(species, heapID); diff --git a/src/applications/pokedex/ov21_021E8D48.c b/src/applications/pokedex/ov21_021E8D48.c index 6246b243f5..703d8385ed 100644 --- a/src/applications/pokedex/ov21_021E8D48.c +++ b/src/applications/pokedex/ov21_021E8D48.c @@ -730,7 +730,7 @@ static void ov21_021E9968(Window *param0, int param1, int param2) static void ov21_021E998C(Window *param0, enum HeapID heapID) { - String *v0 = String_Init(64, heapID); + String *v0 = String_New(64, heapID); MessageLoader *pokedexMessageBank = MessageLoader_Init(MSG_LOADER_PRELOAD_ENTIRE_BANK, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_POKEDEX, heapID); MessageLoader_GetString(pokedexMessageBank, pl_msg_pokedex_registered, v0); diff --git a/src/applications/pokedex/pokedex_height_check.c b/src/applications/pokedex/pokedex_height_check.c index 1c233463ac..f7ea7d66e2 100644 --- a/src/applications/pokedex/pokedex_height_check.c +++ b/src/applications/pokedex/pokedex_height_check.c @@ -415,7 +415,7 @@ static void DummyForMatching3(HeightCheckVisuals *heightCheckVisuals) static void DisplayHeightLabels(PokedexGraphicData **param0, enum HeapID heapID) { - String *string = String_Init(32, heapID); + String *string = String_New(32, heapID); MessageLoader *pokedexMessageBank = MessageLoader_Init(MSG_LOADER_PRELOAD_ENTIRE_BANK, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_POKEDEX, heapID); MessageLoader_GetString(pokedexMessageBank, pl_msg_pokedex_heightcheck_topscreen, string); @@ -435,7 +435,7 @@ static void DisplayHeightLabels(PokedexGraphicData **param0, enum HeapID heapID) static void DisplayHeightValues(PokedexGraphicData **param0, const UnkStruct_ov21_021E6104 *param1, enum HeapID heapID) { - String *string = String_Init(32, heapID); + String *string = String_New(32, heapID); int species = PokedexSort_CurrentSpecies(param1->unk_04); String *speciesName = MessageUtil_SpeciesName(species, heapID); diff --git a/src/applications/pokedex/pokedex_main.c b/src/applications/pokedex/pokedex_main.c index 21bda37f7d..15694071d0 100644 --- a/src/applications/pokedex/pokedex_main.c +++ b/src/applications/pokedex/pokedex_main.c @@ -609,7 +609,7 @@ void PokedexMain_DisplayNameNumberText(Window *window, int dexNumber, int specie String *nameNumber; if (dexNumber > 0) { - numStr = String_Init(4, heapID); + numStr = String_New(4, heapID); String_FormatInt(numStr, dexNumber, 3, 2, 1); } else { numStr = PokedexMain_GetMessage(pl_msg_pokedex_none, heapID); diff --git a/src/applications/pokedex/pokedex_search.c b/src/applications/pokedex/pokedex_search.c index 5e1220779d..dd191a9c89 100644 --- a/src/applications/pokedex/pokedex_search.c +++ b/src/applications/pokedex/pokedex_search.c @@ -681,7 +681,7 @@ static void DescriptionMessage(PokedexGraphicData **param0, int filterMethod, en String *descriptionMessage = PokedexMain_GetMessage(entryID, heapID); u32 xOffset = 24 + (208 - Font_CalcMaxLineWidth(FONT_SYSTEM, descriptionMessage, 0)) / 2; - u32 yOffset = 8 + (32 - String_NumLines(descriptionMessage) * 16) / 2; + u32 yOffset = 8 + (32 - String_CountLines(descriptionMessage) * 16) / 2; Text_AddPrinterWithParamsAndColor(&v0->window, FONT_SYSTEM, descriptionMessage, xOffset, yOffset, TEXT_SPEED_INSTANT, TEXT_COLOR(2, 1, 0), NULL); String_Free(descriptionMessage); @@ -697,7 +697,7 @@ static void EmptyDexMessage(PokedexGraphicData **param0, enum HeapID heapID) { u32 xOffset = 24 + (208 - Font_CalcMaxLineWidth(FONT_SYSTEM, noneMessage, 0)) / 2; - u32 yOffset = 8 + (32 - String_NumLines(noneMessage) * 16) / 2; + u32 yOffset = 8 + (32 - String_CountLines(noneMessage) * 16) / 2; Text_AddPrinterWithParamsAndColor(&v0->window, FONT_SYSTEM, noneMessage, xOffset, yOffset, TEXT_SPEED_INSTANT, TEXT_COLOR(2, 1, 0), NULL); } diff --git a/src/applications/pokedex/pokedex_text.c b/src/applications/pokedex/pokedex_text.c index 9b456f8615..e0ee485da9 100644 --- a/src/applications/pokedex/pokedex_text.c +++ b/src/applications/pokedex/pokedex_text.c @@ -141,7 +141,7 @@ static String *LoadMessage(int bankID, int entryID, enum HeapID heapID) MessageLoader *messageLoader = MessageLoader_Init(MSG_LOADER_LOAD_ON_DEMAND, NARC_INDEX_MSGDATA__PL_MSG, bankID, heapID); if (messageLoader) { - String *string = String_Init(256, heapID); + String *string = String_New(256, heapID); if (string) { MessageLoader_GetString(messageLoader, entryID, string); diff --git a/src/applications/pokemon_summary_screen/main.c b/src/applications/pokemon_summary_screen/main.c index 71bbc87979..4e6bc864d4 100644 --- a/src/applications/pokemon_summary_screen/main.c +++ b/src/applications/pokemon_summary_screen/main.c @@ -535,15 +535,15 @@ static void InitializeStringsAndCopyOTName(PokemonSummaryScreen *summaryScreen) summaryScreen->ribbonLoader = MessageLoader_Init(MSG_LOADER_LOAD_ON_DEMAND, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_RIBBON_NAMES, HEAP_ID_POKEMON_SUMMARY_SCREEN); summaryScreen->unk_684 = FontSpecialChars_Init(1, 2, 0, HEAP_ID_POKEMON_SUMMARY_SCREEN); summaryScreen->strFormatter = StringTemplate_Default(HEAP_ID_POKEMON_SUMMARY_SCREEN); - summaryScreen->monData.speciesName = String_Init(MON_NAME_LEN + 2, HEAP_ID_POKEMON_SUMMARY_SCREEN); - summaryScreen->monData.nickname = String_Init(MON_NAME_LEN + 2, HEAP_ID_POKEMON_SUMMARY_SCREEN); - summaryScreen->monData.OTName = String_Init(TRAINER_NAME_LEN + 1, HEAP_ID_POKEMON_SUMMARY_SCREEN); - summaryScreen->string = String_Init(SUMMARY_STRING_LEN, HEAP_ID_POKEMON_SUMMARY_SCREEN); + summaryScreen->monData.speciesName = String_New(MON_NAME_LEN + 2, HEAP_ID_POKEMON_SUMMARY_SCREEN); + summaryScreen->monData.nickname = String_New(MON_NAME_LEN + 2, HEAP_ID_POKEMON_SUMMARY_SCREEN); + summaryScreen->monData.OTName = String_New(TRAINER_NAME_LEN + 1, HEAP_ID_POKEMON_SUMMARY_SCREEN); + summaryScreen->string = String_New(SUMMARY_STRING_LEN, HEAP_ID_POKEMON_SUMMARY_SCREEN); summaryScreen->moveNameLoader = MessageLoader_Init(MSG_LOADER_PRELOAD_ENTIRE_BANK, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_MOVE_NAMES, HEAP_ID_POKEMON_SUMMARY_SCREEN); - summaryScreen->playerName = String_Init(TRAINER_NAME_LEN + 1, HEAP_ID_POKEMON_SUMMARY_SCREEN); + summaryScreen->playerName = String_New(TRAINER_NAME_LEN + 1, HEAP_ID_POKEMON_SUMMARY_SCREEN); if (summaryScreen->data->OTName != NULL) { - String_CopyChars(summaryScreen->playerName, summaryScreen->data->OTName); + String_CopyFromChars(summaryScreen->playerName, summaryScreen->data->OTName); } } diff --git a/src/applications/poketch/link_searcher/graphics.c b/src/applications/poketch/link_searcher/graphics.c index a74c7fa052..3f23def6de 100644 --- a/src/applications/poketch/link_searcher/graphics.c +++ b/src/applications/poketch/link_searcher/graphics.c @@ -55,7 +55,7 @@ BOOL PoketchLinkSearcherGraphics_New(LinkSearcherGraphics **dest, const LinkResu graphics->bgConfig = PoketchGraphics_GetBgConfig(); graphics->animMan = PoketchGraphics_GetAnimationManager(); graphics->msgLoader = MessageLoader_Init(MSG_LOADER_LOAD_ON_DEMAND, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_POKETCH_LINK_SEARCHER, HEAP_ID_POKETCH_APP); - graphics->string = String_Init(96, HEAP_ID_POKETCH_APP); + graphics->string = String_New(96, HEAP_ID_POKETCH_APP); SetupSprites(graphics, results); *dest = graphics; @@ -309,7 +309,7 @@ static void PrintIntroMessage(LinkSearcherGraphics *graphics) xOffset = (192 - Font_CalcMaxLineWidth(FONT_SYSTEM, graphics->string, 0)) / 2; u32 yOffset = 64; - yOffset -= String_NumLines(graphics->string) * 8; + yOffset -= String_CountLines(graphics->string) * 8; Text_AddPrinterWithParamsAndColor(&graphics->window, FONT_SYSTEM, graphics->string, xOffset, yOffset, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 8, 4), NULL); Window_LoadTiles(&graphics->window); diff --git a/src/applications/poketch/move_tester/graphics.c b/src/applications/poketch/move_tester/graphics.c index 1e400e6191..6271e82b07 100644 --- a/src/applications/poketch/move_tester/graphics.c +++ b/src/applications/poketch/move_tester/graphics.c @@ -130,7 +130,7 @@ BOOL PoketchMoveTesterGraphics_New(PoketchMoveTesterGraphics **dest, const MoveT graphics->animMan = PoketchGraphics_GetAnimationManager(); graphics->msgLoaderTypes = MessageLoader_Init(MSG_LOADER_LOAD_ON_DEMAND, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_POKEMON_TYPE_NAMES, HEAP_ID_POKETCH_APP); graphics->msgLoaderEffectiveness = MessageLoader_Init(MSG_LOADER_LOAD_ON_DEMAND, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_POKETCH_MOVE_TESTER, HEAP_ID_POKETCH_APP); - graphics->string = String_Init(128, HEAP_ID_POKETCH_APP); // Possibly TRAINER_NAME_LEN + 1 + graphics->string = String_New(128, HEAP_ID_POKETCH_APP); // Possibly TRAINER_NAME_LEN + 1 SetupSprites(graphics); *dest = graphics; diff --git a/src/applications/rowan_intro/rowan_intro_app.c b/src/applications/rowan_intro/rowan_intro_app.c index 13ee7d39fa..ac7c39d322 100644 --- a/src/applications/rowan_intro/rowan_intro_app.c +++ b/src/applications/rowan_intro/rowan_intro_app.c @@ -993,9 +993,9 @@ static BOOL RowanIntro_DisplayMessage(RowanIntro *manager, u32 textID, BOOL endE RenderControlFlags_SetAutoScrollFlags(AUTO_SCROLL_DISABLED); { - String *tmpString = String_Init(0x400, manager->heapID); + String *tmpString = String_New(0x400, manager->heapID); - manager->string = String_Init(0x400, manager->heapID); + manager->string = String_New(0x400, manager->heapID); MessageLoader_GetString(manager->msgLoader, textID, tmpString); StringTemplate_SetString( @@ -1162,14 +1162,14 @@ static BOOL RowanIntro_DisplayTextBlock( switch (manager->displayTextBlockState) { case DTB_STATE_INIT: Bg_ToggleLayer(BG_LAYER_MAIN_0, FALSE); - manager->string = String_Init(0x400, manager->heapID); + manager->string = String_New(0x400, manager->heapID); MessageLoader_GetString(manager->msgLoader, textID, manager->string); if (whichCase == DTBC_ADVENTURE_INFO) { windowTemplate = sAdventureInfoTextWindow; { - u32 numLines = String_NumLines(manager->string); + u32 numLines = String_CountLines(manager->string); windowTemplate.tilemapTop = 12 - numLines; windowTemplate.height = numLines * 2; @@ -1199,7 +1199,7 @@ static BOOL RowanIntro_DisplayTextBlock( windowTemplate = sControlInfoTextWindow; if (whichCase == DTBC_CONTROL_INFO_1) { - u32 numLines = String_NumLines(manager->string); + u32 numLines = String_CountLines(manager->string); windowTemplate.tilemapTop = param3 + param4 / 2 - numLines; windowTemplate.height = numLines * 2; diff --git a/src/applications/rowan_intro/tv_app.c b/src/applications/rowan_intro/tv_app.c index 72334d33ab..804c9761b3 100644 --- a/src/applications/rowan_intro/tv_app.c +++ b/src/applications/rowan_intro/tv_app.c @@ -441,12 +441,12 @@ static BOOL RowanIntroTv_Run(RowanIntroTv *tv, int msgEntryID, int unused0, int switch (tv->state) { case RIT_STATE_INIT: Bg_ToggleLayer(BG_LAYER_MAIN_2, 0); - String *tmpString = String_Init(0x400, tv->heapID); + String *tmpString = String_New(0x400, tv->heapID); MessageLoader_GetString(tv->msgLoader, msgEntryID, tmpString); Window_AddFromTemplate(tv->bgConfig, &tv->window, &sMessageWindowTemplate); Window_FillRectWithColor(&tv->window, 0, 0, 0, 0x100, 0xc0); u32 xOffset = (0x100 - Font_CalcMaxLineWidth(FONT_SYSTEM, tmpString, 0)) / 2; - u32 yOffset = (0xc0 - String_NumLines(tmpString) * 16) / 2; + u32 yOffset = (0xc0 - String_CountLines(tmpString) * 16) / 2; Text_AddPrinterWithParamsAndColor( &tv->window, FONT_SYSTEM, diff --git a/src/applications/title_screen.c b/src/applications/title_screen.c index cbe4cf90b5..c149f11748 100644 --- a/src/applications/title_screen.c +++ b/src/applications/title_screen.c @@ -1323,7 +1323,7 @@ static void TitleScreen_Load2DGfx(BgConfig *bgConfig, enum HeapID heapID, TitleS TEXT_BANK_TITLE_SCREEN, heapID); - String *buffer = String_Init(64, heapID); + String *buffer = String_New(64, heapID); Window_AddFromTemplate(bgConfig, &titleScreen->pressStartWindow, &sPressStartWindowTemplate); Window_FillRectWithColor(&titleScreen->pressStartWindow, 0, 0, 0, TILES_TO_PIXELS(28), TILES_TO_PIXELS(2)); diff --git a/src/applications/town_map/main.c b/src/applications/town_map/main.c index 1e4e74cb49..b7b6b248b4 100644 --- a/src/applications/town_map/main.c +++ b/src/applications/town_map/main.c @@ -229,7 +229,7 @@ static BOOL InitDefaultAppResources(TownMapAppData *appData) appData->initialCursorZ = appData->playerZ; appData->locationNames = MessageLoader_Init(MSG_LOADER_LOAD_ON_DEMAND, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_LOCATION_NAMES, appData->heapID); appData->townMapStrings = MessageLoader_Init(MSG_LOADER_LOAD_ON_DEMAND, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_TOWN_MAP, appData->heapID); - appData->hoveredMapName = String_Init(22, appData->heapID); + appData->hoveredMapName = String_New(22, appData->heapID); appData->mainMapMatrixData = MainMapMatrixData_Load(appData->heapID); appData->mapBlockList = TownMap_ReadBlocks("data/tmap_block.dat", appData->heapID); break; diff --git a/src/battle/battle_cursor.c b/src/battle/battle_cursor.c index 4e95a131bc..feb4814b3f 100644 --- a/src/battle/battle_cursor.c +++ b/src/battle/battle_cursor.c @@ -2032,8 +2032,8 @@ static void ov16_02269DB0(UnkStruct_ov16_02268A14 *param0, int param1, int param v5 = BattleSystem_StringTemplate(param0->battleSys); v1 = MessageLoader_GetNewString(v0, 1186); v2 = MessageLoader_GetNewString(v0, 1187); - v3 = String_Init(100, HEAP_ID_BATTLE); - v4 = String_Init(100, HEAP_ID_BATTLE); + v3 = String_New(100, HEAP_ID_BATTLE); + v4 = String_New(100, HEAP_ID_BATTLE); StringTemplate_SetMoveName(v5, 0, v6->unk_00); StringTemplate_Format(v5, v3, v1); @@ -2094,8 +2094,8 @@ static void ov16_02269F68(UnkStruct_ov16_02268A14 *param0, int param1, int param v5 = BattleSystem_StringTemplate(param0->battleSys); v1 = MessageLoader_GetNewString(v0, 1217); v2 = MessageLoader_GetNewString(v0, 1218); - v3 = String_Init(100, HEAP_ID_BATTLE); - v4 = String_Init(100, HEAP_ID_BATTLE); + v3 = String_New(100, HEAP_ID_BATTLE); + v4 = String_New(100, HEAP_ID_BATTLE); StringTemplate_SetMoveName(v5, 0, v6->unk_00); StringTemplate_Format(v5, v3, v1); @@ -2120,8 +2120,8 @@ static void ov16_0226A04C(UnkStruct_ov16_02268A14 *param0, int param1, int param v5 = BattleSystem_StringTemplate(param0->battleSys); v1 = MessageLoader_GetNewString(v0, 1215); v2 = MessageLoader_GetNewString(v0, 1216); - v3 = String_Init(100, HEAP_ID_BATTLE); - v4 = String_Init(100, HEAP_ID_BATTLE); + v3 = String_New(100, HEAP_ID_BATTLE); + v4 = String_New(100, HEAP_ID_BATTLE); StringTemplate_SetMoveName(v5, 0, v6->unk_00); StringTemplate_Format(v5, v3, v1); @@ -2165,7 +2165,7 @@ static void ov16_0226A12C(UnkStruct_ov16_02268A14 *param0, int param1, int param ov16_0223F87C(param0->battleSys, v10); ov16_0223F858(param0->battleSys, v11); - v4 = String_Init(12 + 2 + (5 * 2), HEAP_ID_BATTLE); + v4 = String_New(12 + 2 + (5 * 2), HEAP_ID_BATTLE); for (i = 0; i < 4; i++) { v12 = v11[2 + i]; @@ -2811,7 +2811,7 @@ void ov16_0226AC98(UnkStruct_ov16_02268A14 *param0, int param1, const MoveDispla v3 = sub_0208C098(6); v9 = MessageLoader_GetNewString(v12, 938); v10 = BattleSystem_StringTemplate(param0->battleSys); - v7 = String_Init((2 + 2 + 1 + 2) * 2 + 2, HEAP_ID_BATTLE); + v7 = String_New((2 + 2 + 1 + 2) * 2 + 2, HEAP_ID_BATTLE); v8 = MessageLoader_GetNewString(v12, 937); for (i = 0; i < LEARNED_MOVES_MAX; i++) { diff --git a/src/battle/battle_lib.c b/src/battle/battle_lib.c index c44c3ca769..41c9148f3c 100644 --- a/src/battle/battle_lib.c +++ b/src/battle/battle_lib.c @@ -406,7 +406,7 @@ int BattleMon_Get(BattleContext *battleCtx, int battler, enum BattleMonParam par } break; case BATTLEMON_NICKNAME_STRING: - String_CopyChars((String *)buf, battleMon->nickname); + String_CopyFromChars((String *)buf, battleMon->nickname); break; case BATTLEMON_CUR_HP: diff --git a/src/battle/healthbar.c b/src/battle/healthbar.c index cf2ebc280c..6d9d857e99 100644 --- a/src/battle/healthbar.c +++ b/src/battle/healthbar.c @@ -1157,7 +1157,7 @@ static void Healthbar_DrawBattlerName(Healthbar *healthbar) msgLoader = BattleSystem_MessageLoader(healthbar->battleSys); strFormatter = BattleSystem_StringTemplate(healthbar->battleSys); - nickname = String_Init(MON_NAME_LEN + 12, HEAP_ID_BATTLE); // TODO: not sure why there is a +12 here + nickname = String_New(MON_NAME_LEN + 12, HEAP_ID_BATTLE); // TODO: not sure why there is a +12 here template = MessageLoader_GetNewString(msgLoader, pl_msg_00000368_00964); mon = BattleSystem_PartyPokemon(healthbar->battleSys, healthbar->battler, healthbar->selectedPartySlot); @@ -1415,7 +1415,7 @@ static void Healthbar_DrawBallsLeftMessage(Healthbar *param0, u32 param1) v0 = BattleSystem_BGL(param0->battleSys); v4 = BattleSystem_MessageLoader(param0->battleSys); v7 = BattleSystem_StringTemplate(param0->battleSys); - v5 = String_Init(30, HEAP_ID_BATTLE); + v5 = String_New(30, HEAP_ID_BATTLE); if (param1 & (1 << 10)) { v6 = MessageLoader_GetNewString(v4, 951); diff --git a/src/battle/ov16_0223B140.c b/src/battle/ov16_0223B140.c index 735b164022..43bb374c91 100644 --- a/src/battle/ov16_0223B140.c +++ b/src/battle/ov16_0223B140.c @@ -612,7 +612,7 @@ static void ov16_0223B790(ApplicationManager *appMan) battleSys->unk_0C = MessageLoader_Init(MSG_LOADER_LOAD_ON_DEMAND, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_BATTLE_STRINGS, HEAP_ID_BATTLE); battleSys->unk_10 = MessageLoader_Init(MSG_LOADER_LOAD_ON_DEMAND, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_MOVES_USED_IN_BATTLE, HEAP_ID_BATTLE); battleSys->strFormatter = StringTemplate_Default(HEAP_ID_BATTLE); - battleSys->msgBuffer = String_Init(2 * 160, HEAP_ID_BATTLE); + battleSys->msgBuffer = String_New(2 * 160, HEAP_ID_BATTLE); MI_CpuCopy16(PaletteData_GetUnfadedBuffer(battleSys->paletteSys, 0), &battleSys->unk_2224[0], 0x20 * 7); MI_CpuCopy16(PaletteData_GetUnfadedBuffer(battleSys->paletteSys, 2), &battleSys->unk_2304[0], 0x20 * 7); @@ -1730,7 +1730,7 @@ static void ov16_0223D10C(ApplicationManager *appMan, FieldBattleDTO *param1) String *v6; v5 = MessageLoader_Init(MSG_LOADER_LOAD_ON_DEMAND, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_BATTLE_STRINGS, HEAP_ID_BATTLE); - v6 = String_Init(0x100, HEAP_ID_BATTLE); + v6 = String_New(0x100, HEAP_ID_BATTLE); MessageLoader_GetString(v5, 923, v6); Text_AddPrinterWithParams(v0->unk_08, FONT_MESSAGE, v6, 0, 0, NULL, NULL); diff --git a/src/battle_regulation.c b/src/battle_regulation.c index b90a2d76b2..57b5f5795c 100644 --- a/src/battle_regulation.c +++ b/src/battle_regulation.c @@ -38,9 +38,9 @@ void BattleRegulation_GetName(const BattleRegulation *regulation, String *string String *BattleRegulation_GetNameString(const BattleRegulation *regulation, int heapID) { - String *string = String_Init(BATTLE_REGULATION_NAME_LENGTH * 2, heapID); + String *string = String_New(BATTLE_REGULATION_NAME_LENGTH * 2, heapID); - String_CopyChars(string, regulation->name); + String_CopyFromChars(string, regulation->name); return string; } diff --git a/src/colored_arrow.c b/src/colored_arrow.c index 94ac674feb..76178ecc24 100644 --- a/src/colored_arrow.c +++ b/src/colored_arrow.c @@ -21,8 +21,8 @@ ColoredArrow *ColoredArrow_New(u32 heapID) if (arrow) { arrow->color = TEXT_COLOR(1, 2, 15); - arrow->string = String_Init(4, heapID); - String_CopyChars(arrow->string, chars); + arrow->string = String_New(4, heapID); + String_CopyFromChars(arrow->string, chars); } return arrow; diff --git a/src/cutscenes/hall_of_fame.c b/src/cutscenes/hall_of_fame.c index 8ae4e387fa..8b55fcc783 100644 --- a/src/cutscenes/hall_of_fame.c +++ b/src/cutscenes/hall_of_fame.c @@ -309,8 +309,8 @@ BOOL HallOfFameManager_Init(ApplicationManager *appMan, int *state) hallOfFameMan->displayData = ApplicationManager_Args(appMan); hallOfFameMan->msgLoaderHallOfFame = MessageLoader_Init(MSG_LOADER_PRELOAD_ENTIRE_BANK, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_HALL_OF_FAME, HEAP_ID_HALL_OF_FAME); - hallOfFameMan->string_1C30 = String_Init(500, HEAP_ID_HALL_OF_FAME); - hallOfFameMan->string_1C4C = String_Init(500, HEAP_ID_HALL_OF_FAME); + hallOfFameMan->string_1C30 = String_New(500, HEAP_ID_HALL_OF_FAME); + hallOfFameMan->string_1C4C = String_New(500, HEAP_ID_HALL_OF_FAME); hallOfFameMan->strTemplate = StringTemplate_Default(HEAP_ID_HALL_OF_FAME); hallOfFameMan->narc = NARC_ctor(NARC_INDEX_POKETOOL__POKE_EDIT__PL_POKE_DATA, HEAP_ID_HALL_OF_FAME); @@ -1268,10 +1268,10 @@ static void HallOfFame_PrintTextAtRow(HallOfFamePokemonTextAdder *textAdder, int { int i, numLines, xOffset; - numLines = String_NumLines(textAdder->string_1C); + numLines = String_CountLines(textAdder->string_1C); for (i = 0; i < numLines; i++) { - String_CopyLineNum(textAdder->string_18, textAdder->string_1C, i); + String_CopyLine(textAdder->string_18, textAdder->string_1C, i); xOffset = (136 - Font_CalcStringWidth(FONT_SYSTEM, textAdder->string_18, 0)) / 2; Text_AddPrinterWithParamsAndColor(textAdder->window, FONT_SYSTEM, textAdder->string_18, textAdder->xPosition + xOffset, yOffset + i * 16, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL); } diff --git a/src/error_message_reset.c b/src/error_message_reset.c index e9d378e331..fcef4370e1 100644 --- a/src/error_message_reset.c +++ b/src/error_message_reset.c @@ -139,7 +139,7 @@ void ErrorMessageReset_PrintErrorAndReset(void) Bg_MaskPalette(BG_LAYER_SUB_0, 0x6c21); errorMsgData = MessageLoader_Init(MSG_LOADER_LOAD_ON_DEMAND, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_NETWORK_ERRORS, heapID); - errorString = String_Init(0x180, heapID); + errorString = String_New(0x180, heapID); Text_ResetAllPrinters(); diff --git a/src/evolution.c b/src/evolution.c index 1765f161f2..98605acaff 100644 --- a/src/evolution.c +++ b/src/evolution.c @@ -137,7 +137,7 @@ EvolutionData *Evolution_Begin(Party *param0, Pokemon *param1, int param2, Optio v0->unk_66 = 2; v0->unk_08 = MessageLoader_Init(MSG_LOADER_LOAD_ON_DEMAND, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_BATTLE_STRINGS, heapID); v0->unk_0C = StringTemplate_Default(heapID); - v0->unk_10 = String_Init(2 * 160, heapID); + v0->unk_10 = String_New(2 * 160, heapID); v0->unk_3C = Heap_Alloc(heapID, sizeof(PokemonSummary)); MI_CpuClearFast(v0->unk_3C, sizeof(PokemonSummary)); diff --git a/src/field_battle_data_transfer.c b/src/field_battle_data_transfer.c index 4bbb8b3484..c0911e3ff8 100644 --- a/src/field_battle_data_transfer.c +++ b/src/field_battle_data_transfer.c @@ -151,11 +151,11 @@ FieldBattleDTO *FieldBattleDTO_NewCatchingTutorial(enum HeapID heapID, const Fie Options *options = SaveData_GetOptions(fieldSystem->saveData); FieldBattleDTO *dto = FieldBattleDTO_New(heapID, BATTLE_TYPE_CATCH_TUTORIAL); MessageLoader *msgLoader = MessageLoader_Init(MSG_LOADER_LOAD_ON_DEMAND, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_COUNTERPART_NAMES, heapID); - String *string = String_Init(TRAINER_NAME_LEN + 1, heapID); + String *string = String_New(TRAINER_NAME_LEN + 1, heapID); Pokemon *mon; MessageLoader_GetString(msgLoader, TrainerInfo_Gender(trainerInfo) ^ 1, string); - TrainerInfo_SetName(dto->trainerInfo[BATTLER_PLAYER_1], String_GetData(string)); + TrainerInfo_SetName(dto->trainerInfo[BATTLER_PLAYER_1], String_GetChars(string)); String_Free(string); MessageLoader_Free(msgLoader); diff --git a/src/font.c b/src/font.c index 7bbacd2396..4d756c9b2a 100644 --- a/src/font.c +++ b/src/font.c @@ -177,7 +177,7 @@ u32 Font_CalcCharArrayWidth(enum Font font, const charcode_t *str, u32 letterSpa u32 Font_CalcStringWidth(enum Font font, const String *string, u32 letterSpacing) { GF_ASSERT(sFontWork->fontManagers[font] != NULL); - return FontManager_CalcStringWidth(sFontWork->fontManagers[font], String_GetData(string), letterSpacing); + return FontManager_CalcStringWidth(sFontWork->fontManagers[font], String_GetChars(string), letterSpacing); } u32 Font_AreAllCharsValid(enum Font font, String *string, String *tmpbuf) @@ -187,7 +187,7 @@ u32 Font_AreAllCharsValid(enum Font font, String *string, String *tmpbuf) String_Clear(tmpbuf); String_ConcatTrainerName(tmpbuf, string); - return FontManager_AreAllCharsValid(sFontWork->fontManagers[font], String_GetData(tmpbuf)); + return FontManager_AreAllCharsValid(sFontWork->fontManagers[font], String_GetChars(tmpbuf)); } u8 Font_GetAttribute(u8 font, u8 attribute) @@ -254,7 +254,7 @@ void Font_LoadScreenIndicatorsPalette(enum PaletteLoadLocation palLocation, u32 u32 Font_CalcMaxLineWidth(enum Font font, const String *string, u32 letterSpacing) { GF_ASSERT(sFontWork->fontManagers[font] != NULL); - return FontManager_CalcMaxLineWidth(sFontWork->fontManagers[font], String_GetData(string), letterSpacing); + return FontManager_CalcMaxLineWidth(sFontWork->fontManagers[font], String_GetChars(string), letterSpacing); } u32 Font_CalcCenterAlignment(enum Font font, const String *string, u32 letterSpacing, u32 windowWidth) @@ -267,5 +267,5 @@ u32 Font_CalcCenterAlignment(enum Font font, const String *string, u32 letterSpa u32 Font_CalcStringWidthWithCursorControl(enum Font font, const String *string) { GF_ASSERT(sFontWork->fontManagers[font] != NULL); - return FontManager_CalcStringWidthWithCursorControl(sFontWork->fontManagers[font], String_GetData(string)); + return FontManager_CalcStringWidthWithCursorControl(sFontWork->fontManagers[font], String_GetChars(string)); } diff --git a/src/hall_of_fame_entries.c b/src/hall_of_fame_entries.c index 65ad7f9604..8a98efc20b 100644 --- a/src/hall_of_fame_entries.c +++ b/src/hall_of_fame_entries.c @@ -39,7 +39,7 @@ void HallOfFame_AddEntry(HallOfFame *hallOfFame, const Party *party, const RTCDa hallOfFameEntry = &hallOfFame->entries[hallOfFame->nextEntryIndex]; currentPartyCount = Party_GetCurrentCount(party); - string = String_Init(MON_NAME_LEN + 1, HEAP_ID_SYSTEM); + string = String_New(MON_NAME_LEN + 1, HEAP_ID_SYSTEM); MI_CpuClear16(hallOfFameEntry->pokemon, sizeof(HallOfFamePokemon) * MAX_PARTY_SIZE); @@ -60,10 +60,10 @@ void HallOfFame_AddEntry(HallOfFame *hallOfFame, const Party *party, const RTCDa if (string) { Pokemon_GetValue(mon, MON_DATA_NICKNAME_STRING, string); - String_ToChars(string, hallOfFameEntry->pokemon[pokemonIndex].nickname, MON_NAME_LEN + 1); + String_CopyToChars(string, hallOfFameEntry->pokemon[pokemonIndex].nickname, MON_NAME_LEN + 1); Pokemon_GetValue(mon, MON_DATA_OT_NAME_STRING, string); - String_ToChars(string, hallOfFameEntry->pokemon[pokemonIndex].OTName, TRAINER_NAME_LEN + 1); + String_CopyToChars(string, hallOfFameEntry->pokemon[pokemonIndex].OTName, TRAINER_NAME_LEN + 1); } else { hallOfFameEntry->pokemon[pokemonIndex].nickname[0] = 0xffff; hallOfFameEntry->pokemon[pokemonIndex].OTName[0] = 0xffff; @@ -148,8 +148,8 @@ void HallOfFame_GetEntryPokemonData(const HallOfFame *hallOfFame, int entryIndex pcHallOfFameMon->OTID = hallOfFameMon->OTID; pcHallOfFameMon->form = hallOfFameMon->form; - String_CopyChars(pcHallOfFameMon->nickname, hallOfFameMon->nickname); - String_CopyChars(pcHallOfFameMon->OTName, hallOfFameMon->OTName); + String_CopyFromChars(pcHallOfFameMon->nickname, hallOfFameMon->nickname); + String_CopyFromChars(pcHallOfFameMon->OTName, hallOfFameMon->OTName); for (i = 0; i < LEARNED_MOVES_MAX; i++) { pcHallOfFameMon->moves[i] = hallOfFameMon->moves[i]; diff --git a/src/item_use_functions.c b/src/item_use_functions.c index 678536fbf2..836e6576eb 100644 --- a/src/item_use_functions.c +++ b/src/item_use_functions.c @@ -863,7 +863,7 @@ static BOOL UseBagMessageItem(ItemFieldUseContext *usageContext) UnkStruct_02068EFC *v0 = Heap_Alloc(HEAP_ID_FIELD2, sizeof(UnkStruct_02068EFC)); v0->unk_16 = 0; - v0->unk_10 = String_Init(128, HEAP_ID_FIELD2); + v0->unk_10 = String_New(128, HEAP_ID_FIELD2); BagContext_FormatUsageMessage(usageContext->fieldSystem->saveData, v0->unk_10, Bag_GetRegisteredItem(SaveData_GetBag(usageContext->fieldSystem->saveData)), HEAP_ID_FIELD2); FieldSystem_CreateTask(usageContext->fieldSystem, PrintRegisteredKeyItemUseMessage, v0); @@ -1105,7 +1105,7 @@ static void PrintRegisteredKeyItemError(ItemFieldUseContext *usageContext, u32 e UnkStruct_02068EFC *v0 = Heap_Alloc(HEAP_ID_FIELD2, sizeof(UnkStruct_02068EFC)); v0->unk_16 = 0; - v0->unk_10 = String_Init(128, HEAP_ID_FIELD2); + v0->unk_10 = String_New(128, HEAP_ID_FIELD2); BagContext_FormatErrorMessage(SaveData_GetTrainerInfo(usageContext->fieldSystem->saveData), v0->unk_10, usageContext->unk_28, error, HEAP_ID_FIELD2); FieldSystem_CreateTask(usageContext->fieldSystem, PrintRegisteredKeyItemUseMessage, v0); diff --git a/src/main_menu/gba_migrator.c b/src/main_menu/gba_migrator.c index f6cb09ea58..f7fa8b1af9 100644 --- a/src/main_menu/gba_migrator.c +++ b/src/main_menu/gba_migrator.c @@ -214,7 +214,7 @@ static void ov97_02234ECC(GBAMigrator *migrator); static void ov97_02235310(GBAMigrator *migrator); static void CopySelectedMonToPalParkTransfer(GBAMigrator *migrator); void String_CopyNumChars(String *param0, const u16 *param1, u32 param2); -void String_CopyChars(String *param0, const u16 *param1); +void String_CopyFromChars(String *param0, const u16 *param1); void BoxMonGBAToBoxMon(GBABoxPokemon *gbaBoxMon, BoxPokemon *boxMon); UnkStruct_ov97_0223F434 *Unk_ov97_0223F434; @@ -1265,7 +1265,7 @@ static void PrintGBABoxMonInfo(GBAMigrator *migrator, GBABoxPokemon *gbaBoxMon) ov97_02233DD0(migrator, &v4, 0x4 | 0x2); - string = String_Init(64, HEAP_ID_MIGRATE_FROM_GBA); + string = String_New(64, HEAP_ID_MIGRATE_FROM_GBA); msgLoader = MessageLoader_Init(MSG_LOADER_LOAD_ON_DEMAND, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_SPECIES_NAME, HEAP_ID_MIGRATE_FROM_GBA); species = GBAPokemon_ConvertSpeciesToDS(GBABoxPokemon_GetData(gbaBoxMon, GBA_MON_DATA_SPECIES, NULL)); @@ -1285,7 +1285,7 @@ static void PrintGBABoxMonInfo(GBAMigrator *migrator, GBABoxPokemon *gbaBoxMon) if (gbaItemID) { itemID = Item_FromGBAID(gbaItemID); - string = String_Init(64, HEAP_ID_MIGRATE_FROM_GBA); + string = String_New(64, HEAP_ID_MIGRATE_FROM_GBA); Item_LoadName(string, itemID, HEAP_ID_MIGRATE_FROM_GBA); @@ -1299,7 +1299,7 @@ static void PrintGBABoxMonInfo(GBAMigrator *migrator, GBABoxPokemon *gbaBoxMon) } level = GBABoxPokemon_GetLevel(gbaBoxMon); - string = String_Init(10, HEAP_ID_MIGRATE_FROM_GBA); + string = String_New(10, HEAP_ID_MIGRATE_FROM_GBA); String_FormatInt(string, level, 3, PADDING_MODE_SPACES, CHARSET_MODE_EN); @@ -1660,9 +1660,9 @@ static void ov97_02235344(GBAMigrator *migrator) GBA_ConvertStringToDS(GetGBAPlayerName(), playerName, GBA_PLAYER_NAME_LEN + 1, GBACart_GetLanguage()); strTemplate = StringTemplate_Default(HEAP_ID_MIGRATE_FROM_GBA); - string = String_Init(GBA_PLAYER_NAME_LEN + 1, HEAP_ID_MIGRATE_FROM_GBA); + string = String_New(GBA_PLAYER_NAME_LEN + 1, HEAP_ID_MIGRATE_FROM_GBA); - String_CopyChars(string, playerName); + String_CopyFromChars(string, playerName); StringTemplate_SetString(strTemplate, 1, string, 0, 1, GAME_LANGUAGE); ov97_02234ECC(migrator); @@ -1833,8 +1833,8 @@ static int GBAMigrator_Init(ApplicationManager *appMan, int *state) migrator->trainerInfo = SaveData_GetTrainerInfo(migrator->saveData); migrator->options = SaveData_GetOptions(migrator->saveData); migrator->messageBoxFrame = Options_Frame(migrator->options); - migrator->unk_12668 = String_Init(256, HEAP_ID_MIGRATE_FROM_GBA); - migrator->unk_1266C = String_Init(256, HEAP_ID_MIGRATE_FROM_GBA); + migrator->unk_12668 = String_New(256, HEAP_ID_MIGRATE_FROM_GBA); + migrator->unk_1266C = String_New(256, HEAP_ID_MIGRATE_FROM_GBA); Sound_SetSceneAndPlayBGM(SOUND_SCENE_9, SEQ_PRESENT, 1); diff --git a/src/main_menu/mystery_gift_app.c b/src/main_menu/mystery_gift_app.c index 01cd2d356c..1180f4dd3a 100644 --- a/src/main_menu/mystery_gift_app.c +++ b/src/main_menu/mystery_gift_app.c @@ -959,7 +959,7 @@ static void ShowWonderCardTitle(ApplicationManager *appMann, Window *window, cha { MysteryGiftAppData *appData = ApplicationManager_Data(appMann); - String *string = String_Init(WONDERCARD_TITLE_LENGTH + 1, HEAP_ID_MYSTERY_GIFT_APP); + String *string = String_New(WONDERCARD_TITLE_LENGTH + 1, HEAP_ID_MYSTERY_GIFT_APP); String_CopyNumChars(string, title, WONDERCARD_TITLE_LENGTH); Window_FillTilemap(window, Font_GetAttribute(FONT_SYSTEM, FONTATTR_BG_COLOR)); diff --git a/src/main_menu/ov97_0222C174.c b/src/main_menu/ov97_0222C174.c index c35be21c73..b66f8f03f1 100644 --- a/src/main_menu/ov97_0222C174.c +++ b/src/main_menu/ov97_0222C174.c @@ -798,7 +798,7 @@ static void ov97_0222C974(UnkStruct_ov97_0222C388 *param0) v4->pgt.type = 7; v1 = MessageUtil_ExpandedString(v2, v3, 76, param0->heapID); - String_ToChars((const String *)v1, v4->eventHeader.title, 36); + String_CopyToChars((const String *)v1, v4->eventHeader.title, 36); String_Free(v1); v4->eventHeader.validGames = (MainMenuUtil_CalcMysteryGiftVersionBit(10) | MainMenuUtil_CalcMysteryGiftVersionBit(11) | MainMenuUtil_CalcMysteryGiftVersionBit(12)); @@ -811,7 +811,7 @@ static void ov97_0222C974(UnkStruct_ov97_0222C388 *param0) v1 = MessageUtil_ExpandedString(v2, v3, 75, param0->heapID); - String_ToChars((const String *)v1, v4->description, 250); + String_CopyToChars((const String *)v1, v4->description, 250); String_Free(v1); v4->sharesLeft = 0; diff --git a/src/main_menu/wonder_cards_app.c b/src/main_menu/wonder_cards_app.c index 6d1dde49fd..54ee6871e6 100644 --- a/src/main_menu/wonder_cards_app.c +++ b/src/main_menu/wonder_cards_app.c @@ -820,7 +820,7 @@ static BOOL DoNothing(WonderCardsAppData *appData, Window *window, TextColor col static BOOL PrintWondercardTitle(WonderCardsAppData *appData, Window *windwow, TextColor color) { - String *string = String_Init(WONDERCARD_TITLE_LENGTH + 1, appData->heapID); + String *string = String_New(WONDERCARD_TITLE_LENGTH + 1, appData->heapID); String_CopyNumChars(string, appData->wonderCards[appData->selectedWondercardSlot]->eventHeader.title, WONDERCARD_TITLE_LENGTH); Text_AddPrinterWithParamsAndColor(windwow, FONT_MESSAGE, string, 0, 0, TEXT_SPEED_NO_TRANSFER, color, NULL); @@ -867,7 +867,7 @@ static BOOL SetupDateString(WonderCardsAppData *appData, Window *window, TextCol static BOOL PrintWondercardDescription(WonderCardsAppData *appData, Window *window, TextColor color) { - String *string = String_Init(WONDERCARD_DESCRIPTION_LENGTH + 1, HEAP_ID_WONDER_CARDS_APP); + String *string = String_New(WONDERCARD_DESCRIPTION_LENGTH + 1, HEAP_ID_WONDER_CARDS_APP); String_CopyNumChars(string, appData->wonderCards[appData->selectedWondercardSlot]->description, WONDERCARD_DESCRIPTION_LENGTH); Text_AddPrinterWithParamsAndColor(window, FONT_MESSAGE, string, 0, 0, TEXT_SPEED_NO_TRANSFER, color, NULL); diff --git a/src/message.c b/src/message.c index c755458e53..33190428a7 100644 --- a/src/message.c +++ b/src/message.c @@ -130,7 +130,7 @@ String *MessageBank_GetNewString(const MessageBank *bank, u32 entryID, u32 heapI MI_CpuCopy16(EntryOffsetAddress(bank, entry.offset), cstr, size); DecodeString(cstr, entry.length, entryID, bank->seed); - String *string = String_Init(entry.length, heapID); + String *string = String_New(entry.length, heapID); if (string) { String_CopyNumChars(string, cstr, entry.length); } @@ -143,7 +143,7 @@ String *MessageBank_GetNewString(const MessageBank *bank, u32 entryID, u32 heapI } GF_ASSERT(FALSE); - return String_Init(4, heapID); + return String_New(4, heapID); } void MessageBank_GetStringFromNARC(enum NarcID narcID, u32 bankID, u32 entryID, u32 heapID, String *string) @@ -193,7 +193,7 @@ String *MessageBank_GetNewStringFromNARC(enum NarcID narcID, u32 bankID, u32 ent string = MessageBank_GetNewStringFromHandle(narc, bankID, entryID, heapID); NARC_dtor(narc); } else { - string = String_Init(4, heapID); + string = String_New(4, heapID); } return string; @@ -209,7 +209,7 @@ String *MessageBank_GetNewStringFromHandle(NARC *narc, u32 bankID, u32 entryID, NARC_ReadFromMember(narc, bankID, EntryOffset(entryID), sizeof(MessageBankEntry), &entry); DecodeEntry(&entry, entryID, bank.seed); - String *string = String_Init(entry.length, heapID); + String *string = String_New(entry.length, heapID); if (string) { u32 size = entry.length * sizeof(charcode_t); charcode_t *cstr = Heap_AllocAtEnd(heapID, size); @@ -228,7 +228,7 @@ String *MessageBank_GetNewStringFromHandle(NARC *narc, u32 bankID, u32 entryID, } GF_ASSERT(FALSE); - return String_Init(4, heapID); + return String_New(4, heapID); } u32 MessageBank_EntryCount(const MessageBank *bank) diff --git a/src/message_util.c b/src/message_util.c index 55ed2b6f3a..5e63331b92 100644 --- a/src/message_util.c +++ b/src/message_util.c @@ -13,7 +13,7 @@ String *MessageUtil_ExpandedString(StringTemplate *template, MessageLoader *loader, u32 entryID, u32 heapID) { String *ret = NULL; - String *buf = String_Init(EXPANDED_STRING_SIZE, HEAP_ID_SYSTEM); + String *buf = String_New(EXPANDED_STRING_SIZE, HEAP_ID_SYSTEM); if (buf) { String *entry = MessageLoader_GetNewString(loader, entryID); @@ -35,7 +35,7 @@ String *MessageUtil_MoveName(u32 moveID, u32 heapID) MessageLoader *loader = MessageLoader_Init(MSG_LOADER_LOAD_ON_DEMAND, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_MOVE_NAMES, heapID); if (loader) { - String *moveName = String_Init(MOVE_NAME_LEN, heapID); + String *moveName = String_New(MOVE_NAME_LEN, heapID); if (moveName) { MessageLoader_GetString(loader, moveID, moveName); diff --git a/src/overlay005/daycare.c b/src/overlay005/daycare.c index 337a09a595..432453647f 100644 --- a/src/overlay005/daycare.c +++ b/src/overlay005/daycare.c @@ -1097,7 +1097,7 @@ static void Egg_CreateHatchedMonInternal(Pokemon *egg, int heapID) u32 personality, otID; u8 ivs[STAT_MAX], pokerus; u8 i, language, metGame, marks, friendship, fatefulEncounter, form, gender; - String *string = String_Init(7 + 1, heapID); + String *string = String_New(7 + 1, heapID); Pokemon *mon = Pokemon_New(heapID); species = Pokemon_GetValue(egg, MON_DATA_SPECIES, NULL); diff --git a/src/overlay005/encounter_effect_core.c b/src/overlay005/encounter_effect_core.c index bdd27aa89c..7f61985c43 100644 --- a/src/overlay005/encounter_effect_core.c +++ b/src/overlay005/encounter_effect_core.c @@ -2867,8 +2867,8 @@ static String *EncounterEffect_GetGymLeaderName(u32 trainerClass, u32 heapID) messageLoader = MessageLoader_Init(MSG_LOADER_LOAD_ON_DEMAND, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_UNK_0359, heapID); template = StringTemplate_Default(heapID); - result = String_Init(128, heapID); - message = String_Init(128, heapID); + result = String_New(128, heapID); + message = String_New(128, heapID); MessageLoader_GetString(messageLoader, 0, message); StringTemplate_SetTrainerName(template, 0, trainerClass); StringTemplate_Format(template, result, message); diff --git a/src/overlay005/field_menu.c b/src/overlay005/field_menu.c index 5a1886bfb8..dac7a939f2 100644 --- a/src/overlay005/field_menu.c +++ b/src/overlay005/field_menu.c @@ -122,7 +122,7 @@ static void FieldMenuManager_Init(FieldSystem *fieldSystem, FieldMenuManager *me } for (i = 0; i < FIELD_MENU_ENTRIES_MAX; i++) { - menuManager->choicesStringsBuffers[i] = String_Init(80, HEAP_ID_FIELD1); + menuManager->choicesStringsBuffers[i] = String_New(80, HEAP_ID_FIELD1); } *menuManager->selectedOptionPtr = LIST_MENU_NO_SELECTION_YET; @@ -173,7 +173,7 @@ void FieldMenuManager_ShowSingleColumnMenu(FieldMenuManager *menuManager) static void _FieldMenuManager_AddMenuEntry(FieldMenuManager *menuManager, u32 entryID, u32 index) { - String *entryBuf = String_Init(80, HEAP_ID_FIELD1); + String *entryBuf = String_New(80, HEAP_ID_FIELD1); MessageLoader_GetString(menuManager->messageLoader, entryID, entryBuf); StringTemplate_Format(menuManager->stringTemplate, menuManager->choicesStringsBuffers[menuManager->optionsCount], entryBuf); @@ -354,7 +354,7 @@ void FieldMenuManager_ShowListMenuWithCursorPosition(FieldMenuManager *menuManag static void _FieldMenuManager_AddListMenuEntry(FieldMenuManager *menuManager, u32 entryID, u32 altTextStringID, u32 entryIndex) { - String *fmtString = String_Init(80, HEAP_ID_FIELD1); + String *fmtString = String_New(80, HEAP_ID_FIELD1); MessageLoader_GetString(menuManager->messageLoader, entryID, fmtString); StringTemplate_Format(menuManager->stringTemplate, menuManager->choicesStringsBuffers[menuManager->optionsCount], fmtString); @@ -502,8 +502,8 @@ static void FieldMenuManager_DeleteWithListMenu(FieldMenuManager *menuManager) static void FieldMenuManager_PrintListMenyAltText(FieldMenuManager *menuManager, u16 entryID, u32 printerDelay) { - String *v0 = String_Init(80, HEAP_ID_FIELD1); - String *v1 = String_Init(80, HEAP_ID_FIELD1); + String *v0 = String_New(80, HEAP_ID_FIELD1); + String *v1 = String_New(80, HEAP_ID_FIELD1); Window_FillTilemap(menuManager->parentWindow, 15); MessageLoader_GetString(menuManager->messageLoader, entryID, v0); @@ -550,8 +550,8 @@ void FieldMenu_ShowCurrentFloorWindow(FieldSystem *fieldSystem, u8 tilemapLeft, static void FieldMenuManager_PrintString(FieldMenuManager *menuManager, u16 entryID, u8 xOffset, u8 yOffset) { - String *fmtString = String_Init(80, HEAP_ID_FIELD1); - String *formatted = String_Init(80, HEAP_ID_FIELD1); + String *fmtString = String_New(80, HEAP_ID_FIELD1); + String *formatted = String_New(80, HEAP_ID_FIELD1); MessageLoader_GetString(menuManager->messageLoader, entryID, fmtString); StringTemplate_Format(menuManager->stringTemplate, formatted, fmtString); @@ -713,7 +713,7 @@ void FieldMenu_PrintMoneyToWindow(FieldSystem *fieldSystem, Window *window) MessageLoader *messageLoader = MessageLoader_Init(MSG_LOADER_PRELOAD_ENTIRE_BANK, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_UNK_0543, HEAP_ID_FIELD1); StringTemplate *stringTemplate = StringTemplate_Default(HEAP_ID_FIELD1); - String *string = String_Init(16, HEAP_ID_FIELD1); + String *string = String_New(16, HEAP_ID_FIELD1); String *fmtString = MessageLoader_GetNewString(messageLoader, pl_msg_00000543_00019); u32 money = TrainerInfo_Money(SaveData_GetTrainerInfo(fieldSystem->saveData)); @@ -755,7 +755,7 @@ void FieldMenu_PrintCoinsToWindow(FieldSystem *fieldSystem, Window *window) MessageLoader *messageLoader = MessageLoader_Init(MSG_LOADER_PRELOAD_ENTIRE_BANK, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_MENU_ENTRIES, HEAP_ID_FIELD1); StringTemplate *stringTemplate = StringTemplate_Default(HEAP_ID_FIELD1); - String *string = String_Init(16, HEAP_ID_FIELD1); + String *string = String_New(16, HEAP_ID_FIELD1); String *fmtString = MessageLoader_GetNewString(messageLoader, pl_msg_00000361_00197); u32 coins = Coins_GetValue(SaveData_GetCoins(fieldSystem->saveData)); @@ -791,7 +791,7 @@ void FieldMenu_PrintBPToWindow(FieldSystem *fieldSystem, Window *window) MessageLoader *messageLaoder = MessageLoader_Init(MSG_LOADER_PRELOAD_ENTIRE_BANK, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_MENU_ENTRIES, HEAP_ID_FIELD1); StringTemplate *stringTemplate = StringTemplate_Default(HEAP_ID_FIELD1); - String *string = String_Init(16, HEAP_ID_FIELD1); + String *string = String_New(16, HEAP_ID_FIELD1); String *fmtString = MessageLoader_GetNewString(messageLaoder, pl_msg_00000361_00230); u16 battlePoints = sub_0202D230(sub_0202D750(fieldSystem->saveData), 0, 0); diff --git a/src/overlay005/fishing.c b/src/overlay005/fishing.c index 160ade2914..d722ea1e5a 100644 --- a/src/overlay005/fishing.c +++ b/src/overlay005/fishing.c @@ -514,8 +514,8 @@ static int TryPressAOrB(void) static void FishingTask_Init(FishingTask *fishingTask) { fishingTask->messageLoader = MessageLoader_Init(MSG_LOADER_LOAD_ON_DEMAND, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_COMMON_STRINGS, HEAP_ID_FIELD1); - fishingTask->formattedFishingMessage = String_Init(0x400, HEAP_ID_FIELD1); - fishingTask->fishingMessage = String_Init(0x400, HEAP_ID_FIELD1); + fishingTask->formattedFishingMessage = String_New(0x400, HEAP_ID_FIELD1); + fishingTask->fishingMessage = String_New(0x400, HEAP_ID_FIELD1); fishingTask->strTemplate = StringTemplate_New(8, 64, HEAP_ID_FIELD1); } diff --git a/src/overlay005/map_name_popup.c b/src/overlay005/map_name_popup.c index 5522f960c4..55853cc7d4 100644 --- a/src/overlay005/map_name_popup.c +++ b/src/overlay005/map_name_popup.c @@ -228,7 +228,7 @@ static void MapNamePopUp_StartSlideOut(MapNamePopUp *mapPopUp) MapNamePopUp *MapNamePopUp_Create(BgConfig *bgConfig) { MapNamePopUp *mapPopUp = Heap_Alloc(HEAP_ID_FIELD1, sizeof(MapNamePopUp)); - mapPopUp->string = String_Init(22, HEAP_ID_FIELD1); + mapPopUp->string = String_New(22, HEAP_ID_FIELD1); MapNamePopUp_SetBgConfig(mapPopUp, bgConfig); MapNamePopUp_CreateWindow(mapPopUp); diff --git a/src/overlay005/ov5_021EA874.c b/src/overlay005/ov5_021EA874.c index bd04656f99..631a60209d 100644 --- a/src/overlay005/ov5_021EA874.c +++ b/src/overlay005/ov5_021EA874.c @@ -268,7 +268,7 @@ static BOOL ov5_021EAB58(UnkStruct_ov5_021EAE78 *param0) for (v5 = 0; v5 < 32; v5++) { if (sub_0202AF78(v0, v5)) { - String_CopyChars(param0->unk_08, sub_0202AEF0(v0, v5)); + String_CopyFromChars(param0->unk_08, sub_0202AEF0(v0, v5)); StringList_AddFromString(param0->unk_00, param0->unk_08, v5); } } @@ -442,8 +442,8 @@ static void ov5_021EAEE0(UnkStruct_ov5_021EAE78 *param0) param0->unk_38 = StringTemplate_Default(HEAP_ID_FIELD1); param0->unk_3C = MessageLoader_Init(MSG_LOADER_PRELOAD_ENTIRE_BANK, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_UNK_0675, HEAP_ID_FIELD1); - param0->unk_0C = String_Init(110, HEAP_ID_FIELD1); - param0->unk_08 = String_Init(110, HEAP_ID_FIELD1); + param0->unk_0C = String_New(110, HEAP_ID_FIELD1); + param0->unk_08 = String_New(110, HEAP_ID_FIELD1); } static void ov5_021EAF1C(UnkStruct_ov5_021EAE78 *param0) diff --git a/src/overlay005/ov5_021F6454.c b/src/overlay005/ov5_021F6454.c index 6779282c76..ffc3cfed17 100644 --- a/src/overlay005/ov5_021F6454.c +++ b/src/overlay005/ov5_021F6454.c @@ -240,7 +240,7 @@ static void ov5_021F6624(FieldSystem *fieldSystem, UnkStruct_ov5_021F6704 *param } for (v0 = 0; v0 < 120; v0++) { - param1->unk_1C[v0] = String_Init(40 * 2, HEAP_ID_FIELD1); + param1->unk_1C[v0] = String_New(40 * 2, HEAP_ID_FIELD1); } *param1->unk_210 = 0xeeee; @@ -294,7 +294,7 @@ static void ov5_021F6830(UnkStruct_ov5_021F6704 *param0, u32 param1, u32 param2, void *v1; { - String *v2 = String_Init(40 * 2, HEAP_ID_FIELD1); + String *v2 = String_New(40 * 2, HEAP_ID_FIELD1); MessageLoader_GetString(param0->unk_1FC, param1, v2); StringTemplate_Format(param0->unk_200, param0->unk_1C[param0->unk_20B], v2); diff --git a/src/overlay005/scrcmd_move_tutor.c b/src/overlay005/scrcmd_move_tutor.c index 8a8c3ae56c..78e5606c21 100644 --- a/src/overlay005/scrcmd_move_tutor.c +++ b/src/overlay005/scrcmd_move_tutor.c @@ -420,7 +420,7 @@ static void MoveTutorManager_Init(FieldSystem *fieldSystem, MoveTutorManager *mo } for (moveIndex = 0; moveIndex < (NELEMS(sTeachableMoves) + 1); moveIndex++) { - moveTutorManager->moveNames[moveIndex] = String_Init((40 * 2), HEAP_ID_FIELD1); + moveTutorManager->moveNames[moveIndex] = String_New((40 * 2), HEAP_ID_FIELD1); } *moveTutorManager->selectedOptionPtr = LIST_MENU_NO_SELECTION_YET; @@ -464,7 +464,7 @@ static void MoveTutorManager_ShowMoveSelectionMenu(MoveTutorManager *moveTutorMa static void _MoveTutorManager_AddMenuEntry(MoveTutorManager *moveTutorManager, u32 stringEntryID, u32 param2, u32 index) { { - String *string = String_Init((40 * 2), HEAP_ID_FIELD1); + String *string = String_New((40 * 2), HEAP_ID_FIELD1); MessageLoader_GetString(moveTutorManager->messageLoader, stringEntryID, string); StringTemplate_Format(moveTutorManager->stringTemplate, moveTutorManager->moveNames[moveTutorManager->menuOptionsCount], string); diff --git a/src/overlay006/npc_trade.c b/src/overlay006/npc_trade.c index 2db4cd1bdb..d0b268854f 100644 --- a/src/overlay006/npc_trade.c +++ b/src/overlay006/npc_trade.c @@ -42,7 +42,7 @@ NpcTradeData *NpcTrade_Init(u32 heapID, u32 npcTradeID) String *string = NpcTrade_GetOtName(heapID, npcTradeID); u16 otName[128]; - String_ToChars(string, otName, NELEMS(otName)); + String_CopyToChars(string, otName, NELEMS(otName)); String_Free(string); TrainerInfo_SetName(data->trainerInfo, otName); TrainerInfo_SetGender(data->trainerInfo, data->npcTradeMon->otGender); diff --git a/src/overlay006/ov6_02247A0C.c b/src/overlay006/ov6_02247A0C.c index ed47ee0e40..60ceeec9cc 100644 --- a/src/overlay006/ov6_02247A0C.c +++ b/src/overlay006/ov6_02247A0C.c @@ -142,7 +142,7 @@ void *ov6_02247A90(void *param0) Window_DrawStandardFrame(&v0->unk_00, 1, 1, 11); Window_FillTilemap(&v0->unk_00, 15); - v3 = String_Init(100, HEAP_ID_FIELD2); + v3 = String_New(100, HEAP_ID_FIELD2); v2 = MessageLoader_GetNewString(v0->unk_10, 0); StringTemplate_SetPlayerName(v0->unk_14, 0, SaveData_GetTrainerInfo(saveData)); diff --git a/src/overlay006/ov6_022489E4.c b/src/overlay006/ov6_022489E4.c index a1b2902229..d3ffdcd4d1 100644 --- a/src/overlay006/ov6_022489E4.c +++ b/src/overlay006/ov6_022489E4.c @@ -250,7 +250,7 @@ void ov6_02248CBC(int param0, int param1, void *param2, void *param3) v5 = (u16 *)(&v4[v3]); String_Clear(v0->unk_00.unk_D8[v1]); - String_CopyChars(v0->unk_00.unk_D8[v1], v5); + String_CopyFromChars(v0->unk_00.unk_D8[v1], v5); v0->unk_568++; } @@ -265,7 +265,7 @@ BOOL ov6_02248CE8(UnkStruct_02095C48 *param0, int param1, const String *param2) v0 = 8 * sizeof(u16); v1 = 4; - String_ToChars(param2, v4, 8); // Possibly TRAINER_NAME_LEN + 1 + String_CopyToChars(param2, v4, 8); // Possibly TRAINER_NAME_LEN + 1 v2 = Heap_Alloc(HEAP_ID_20, v0 + v1); MI_CpuCopy8(v4, &v2[v1], v0); diff --git a/src/overlay007/accessory_shop.c b/src/overlay007/accessory_shop.c index d530836a50..8dc2d76b9b 100644 --- a/src/overlay007/accessory_shop.c +++ b/src/overlay007/accessory_shop.c @@ -360,7 +360,7 @@ static void AccessoryShop_LoadConfirmPurchaseMsg(AccessoryShopMessageBox *msgbox { String *fmtString, *string; StringTemplate *strTemplate = StringTemplate_Default(heapID); - string = String_Init(200, heapID); + string = String_New(200, heapID); fmtString = MessageLoader_GetNewString(msgLoader, FlowerShop_Text_ConfirmPurchase); if (items[idx].totalAmount == 1) { @@ -384,7 +384,7 @@ static void AccessoryShop_LoadSuccessfulPurchaseMsg(AccessoryShopMessageBox *msg { String *fmtString, *string; StringTemplate *strTemplate = StringTemplate_Default(heapID); - string = String_Init(200, heapID); + string = String_New(200, heapID); fmtString = MessageLoader_GetNewString(msgLoader, FlowerShop_Text_PurchasePostSuccess); if (items[idx].totalAmount == 1) { @@ -418,7 +418,7 @@ static void AccessoryShop_ShowDescBox(AccessoryShopDescBox *descBox, BgConfig *b descBox->fmtString[i] = MessageLoader_GetNewString(msgLoader, FlowerShop_Text_BerryNameFormat + i); } - descBox->string = String_Init(32, heapID); + descBox->string = String_New(32, heapID); Window_FillTilemap(descBox->window, 15); descBox->active = TRUE; } @@ -501,7 +501,7 @@ static void AccessoryShop_ShowItemList(AccessoryShopItemList *itemList, BgConfig Window_Add(bgConfig, itemList->window, BG_LAYER_MAIN_3, 17, 1, 14, 16, FIELD_MESSAGE_PALETTE_INDEX, ((((1 + (18 + 12)) + 9) + (27 * 4)) + (14 * 6))); itemList->strTemplate = StringTemplate_Default(heapID); - itemList->tempString = String_Init(32, heapID); + itemList->tempString = String_New(32, heapID); fmtString = MessageLoader_GetNewString(msgLoader, FlowerShop_Text_BerryNameFormat); diff --git a/src/overlay007/communication_club.c b/src/overlay007/communication_club.c index 296a2f1d82..a5f277ac44 100644 --- a/src/overlay007/communication_club.c +++ b/src/overlay007/communication_club.c @@ -230,7 +230,7 @@ static void CommClubMan_Init(FieldSystem *fieldSystem) } for (v0 = 0; v0 < 8; v0++) { - sCommClubMan->stringBuffer[v0] = String_Init((70 * 2), HEAP_ID_FIELD1); + sCommClubMan->stringBuffer[v0] = String_New((70 * 2), HEAP_ID_FIELD1); } } diff --git a/src/overlay007/ov7_0224B4E8.c b/src/overlay007/ov7_0224B4E8.c index 8e0cf1ee81..c3e2935dd5 100644 --- a/src/overlay007/ov7_0224B4E8.c +++ b/src/overlay007/ov7_0224B4E8.c @@ -325,8 +325,8 @@ static void ov7_0224B8DC(UnkStruct_ov7_0224B4E8 *param0) const int v13 = (24 * 8) - 1; v0 = MessageLoader_Init(MSG_LOADER_PRELOAD_ENTIRE_BANK, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_UNK_0353, HEAP_ID_FIELD1); - v2 = String_Init((90 * 2), HEAP_ID_FIELD1); - v3 = String_Init((90 * 2), HEAP_ID_FIELD1); + v2 = String_New((90 * 2), HEAP_ID_FIELD1); + v3 = String_New((90 * 2), HEAP_ID_FIELD1); v4 = ¶m0->unk_24; Window_Add(param0->fieldSystem->bgConfig, v4, 3, 4, 2, 24, 19, 13, 1); @@ -558,10 +558,10 @@ static UnkStruct_ov7_0224B4E8 *ov7_0224BE10(FieldSystem *fieldSystem) v0->fieldSystem->unk_B0 = NULL; v0->unk_64 = StringTemplate_Default(HEAP_ID_FIELD1); v0->unk_68 = MessageLoader_Init(MSG_LOADER_PRELOAD_ENTIRE_BANK, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_UNK_0221, HEAP_ID_FIELD1); - v0->unk_14 = String_Init((90 * 2), HEAP_ID_FIELD1); - v0->unk_18 = String_Init((90 * 2), HEAP_ID_FIELD1); - v0->unk_1C = String_Init((90 * 2), HEAP_ID_FIELD1); - v0->unk_20 = String_Init((90 * 2), HEAP_ID_FIELD1); + v0->unk_14 = String_New((90 * 2), HEAP_ID_FIELD1); + v0->unk_18 = String_New((90 * 2), HEAP_ID_FIELD1); + v0->unk_1C = String_New((90 * 2), HEAP_ID_FIELD1); + v0->unk_20 = String_New((90 * 2), HEAP_ID_FIELD1); v0->unk_6C = HeightWeightData_Load(HEAP_ID_FIELD2); return v0; diff --git a/src/overlay007/shop_menu.c b/src/overlay007/shop_menu.c index fb6994b7a8..80b935557e 100644 --- a/src/overlay007/shop_menu.c +++ b/src/overlay007/shop_menu.c @@ -242,7 +242,7 @@ void Shop_Start(FieldTask *task, FieldSystem *fieldSystem, u16 *shopItems, u8 ma shopMenu->bgConfig = fieldSystem->bgConfig; - shopMenu->string = String_Init(96, HEAP_ID_FIELD2); + shopMenu->string = String_New(96, HEAP_ID_FIELD2); shopMenu->trainerInfo = SaveData_GetTrainerInfo(fieldSystem->saveData); shopMenu->options = SaveData_GetOptions(fieldSystem->saveData); shopMenu->records = SaveData_GetGameRecords(fieldSystem->saveData); @@ -708,10 +708,10 @@ static void Shop_MenuCursorCallback(ListMenu *menu, u32 index, u8 onInit) String *string; if (shopMenu->martType == MART_TYPE_NORMAL) { - string = String_Init(130, HEAP_ID_FIELD2); + string = String_New(130, HEAP_ID_FIELD2); Item_LoadDescription(string, index, HEAP_ID_FIELD2); } else if (shopMenu->martType == MART_TYPE_FRONTIER) { - string = String_Init(130, HEAP_ID_FIELD2); + string = String_New(130, HEAP_ID_FIELD2); Item_LoadDescription(string, index, HEAP_ID_FIELD2); } else if (shopMenu->martType == MART_TYPE_DECOR) { MessageLoader *loader; @@ -774,7 +774,7 @@ static void Shop_MenuPrintCallback(ListMenu *menu, u32 index, u8 yOffset) } price = Shop_GetItemPrice(shopMenu, index); - string = String_Init(12, HEAP_ID_FIELD2); + string = String_New(12, HEAP_ID_FIELD2); if (shopMenu->martType == MART_TYPE_FRONTIER) { fmtString = MessageLoader_GetNewString(shopMenu->msgLoader, pl_msg_00000543_00032); @@ -815,7 +815,7 @@ static void Shop_PrintCurrentMoney(ShopMenu *shopMenu, u8 clearCurrMoney) Window_FillRectWithColor(&shopMenu->windows[SHOP_WINDOW_CURRENT_MONEY], 15, 0, 0, 9 * 8, 16); } - string = String_Init(16, HEAP_ID_FIELD2); + string = String_New(16, HEAP_ID_FIELD2); fmtString = MessageLoader_GetNewString(shopMenu->msgLoader, pl_msg_00000543_00038); currMoney = Shop_GetCurrentMoney(shopMenu); @@ -838,7 +838,7 @@ static void Shop_PrintCurrentMoney(ShopMenu *shopMenu, u8 clearCurrMoney) Window_FillRectWithColor(&shopMenu->windows[SHOP_WINDOW_CURRENT_MONEY], 15, 0, 16, 9 * 8, 16); } - string = String_Init(16, HEAP_ID_FIELD2); + string = String_New(16, HEAP_ID_FIELD2); fmtString = MessageLoader_GetNewString(shopMenu->msgLoader, pl_msg_00000543_00019); currMoney = Shop_GetCurrentMoney(shopMenu); @@ -982,7 +982,7 @@ static void Shop_ShowQtyWithinInventory(ShopMenu *shopMenu) Window_FillTilemap(&shopMenu->windows[SHOP_WINDOW_ITEMS_IN_BAG], 15); Window_DrawStandardFrame(&shopMenu->windows[SHOP_WINDOW_ITEMS_IN_BAG], TRUE, 1 + (18 + 12), FIELD_WINDOW_PALETTE_INDEX); - string = String_Init(24, HEAP_ID_FIELD2); + string = String_New(24, HEAP_ID_FIELD2); fmtString = MessageLoader_GetNewString(shopMenu->msgLoader, pl_msg_00000543_00020); StringTemplate_SetNumber(shopMenu->strTemplate, 0, inventoryQty, 3, PADDING_MODE_SPACES, CHARSET_MODE_EN); @@ -1113,7 +1113,7 @@ static void Shop_ShowQtyTotalItemPurchase(ShopMenu *shopMenu, u8 dontDrawFrame) Window_DrawStandardFrame(&shopMenu->windows[SHOP_WINDOW_QUANTITY_TOTAL_PRICE], TRUE, 1 + (18 + 12), FIELD_WINDOW_PALETTE_INDEX); } - string = String_Init(24, HEAP_ID_FIELD2); + string = String_New(24, HEAP_ID_FIELD2); fmtString = MessageLoader_GetNewString(shopMenu->msgLoader, pl_msg_00000543_00021); StringTemplate_SetNumber(shopMenu->strTemplate, 0, shopMenu->itemAmount, 2, PADDING_MODE_ZEROES, CHARSET_MODE_EN); diff --git a/src/overlay010/ov10_0221F800.c b/src/overlay010/ov10_0221F800.c index 04e7dbbc8c..c20ab9d6f3 100644 --- a/src/overlay010/ov10_0221F800.c +++ b/src/overlay010/ov10_0221F800.c @@ -676,7 +676,7 @@ static u8 ov10_0221FD00(UnkStruct_ov10_0221FB28 *param0) param0->unk_B68 = 12; param0->unk_BA0 = MessageLoader_Init(MSG_LOADER_PRELOAD_ENTIRE_BANK, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_BATTLE_VIDEO, param0->unk_00->heapID); param0->unk_BA4 = StringTemplate_Default(param0->unk_00->heapID); - param0->unk_BA8 = String_Init(2 * 160, param0->unk_00->heapID); + param0->unk_BA8 = String_New(2 * 160, param0->unk_00->heapID); param0->unk_BB0 = 1; return 1; @@ -2332,7 +2332,7 @@ static void ov10_02222720(UnkStruct_ov10_0221FB28 *param0) v0 = MessageLoader_Init(MSG_LOADER_PRELOAD_ENTIRE_BANK, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_PARTY_MENU, param0->unk_00->heapID); v1 = FontSpecialChars_Init(15, 14, 0, param0->unk_00->heapID); v2 = StringTemplate_Default(param0->unk_00->heapID); - v3 = String_Init(32, param0->unk_00->heapID); + v3 = String_New(32, param0->unk_00->heapID); for (v4 = 0; v4 < 6; v4++) { if (param0->unk_214[v4].unk_04 == 0) { @@ -2369,7 +2369,7 @@ static void ov10_022227A4(UnkStruct_ov10_0221F800 *param0) opponentGender1 = TrainerClass_Gender(param0->unk_00->trainer[v6 ^ 1].header.trainerType); opponentName1 = Heap_Alloc(param0->heapID, sizeof(u16) * (TRAINER_NAME_LEN + 1)); - String_ToChars(param0->unk_14[sub_020362F4(v6 ^ 1)], opponentName1, TRAINER_NAME_LEN + 1); + String_CopyToChars(param0->unk_14[sub_020362F4(v6 ^ 1)], opponentName1, TRAINER_NAME_LEN + 1); journalEntryOnlineEvent = JournalEntry_CreateEventUnionBattle(opponentName1, opponentGender1, battleResult, param0->heapID); Heap_Free(opponentName1); } else { @@ -2378,7 +2378,7 @@ static void ov10_022227A4(UnkStruct_ov10_0221F800 *param0) opponentGender1 = TrainerClass_Gender(param0->unk_00->trainer[v6 ^ 1].header.trainerType); opponentName1 = Heap_Alloc(param0->heapID, sizeof(u16) * (TRAINER_NAME_LEN + 1)); - String_ToChars(param0->unk_14[sub_020362F4(v6 ^ 1)], opponentName1, TRAINER_NAME_LEN + 1); + String_CopyToChars(param0->unk_14[sub_020362F4(v6 ^ 1)], opponentName1, TRAINER_NAME_LEN + 1); journalEntryOnlineEvent = JournalEntry_CreateEventSingleBattle(opponentName1, opponentGender1, battleResult, param0->heapID); Heap_Free(opponentName1); @@ -2387,7 +2387,7 @@ static void ov10_022227A4(UnkStruct_ov10_0221F800 *param0) opponentGender1 = TrainerClass_Gender(param0->unk_00->trainer[v6 ^ 1].header.trainerType); opponentName1 = Heap_Alloc(param0->heapID, sizeof(u16) * (TRAINER_NAME_LEN + 1)); - String_ToChars(param0->unk_14[sub_020362F4(v6 ^ 1)], opponentName1, TRAINER_NAME_LEN + 1); + String_CopyToChars(param0->unk_14[sub_020362F4(v6 ^ 1)], opponentName1, TRAINER_NAME_LEN + 1); journalEntryOnlineEvent = JournalEntry_CreateEventDoubleBattle(opponentName1, opponentGender1, battleResult, param0->heapID); Heap_Free(opponentName1); @@ -2396,7 +2396,7 @@ static void ov10_022227A4(UnkStruct_ov10_0221F800 *param0) opponentGender1 = TrainerClass_Gender(param0->unk_00->trainer[v6 ^ 1].header.trainerType); opponentName1 = Heap_Alloc(param0->heapID, sizeof(u16) * (TRAINER_NAME_LEN + 1)); - String_ToChars(param0->unk_14[sub_020362F4(v6 ^ 1)], opponentName1, TRAINER_NAME_LEN + 1); + String_CopyToChars(param0->unk_14[sub_020362F4(v6 ^ 1)], opponentName1, TRAINER_NAME_LEN + 1); journalEntryOnlineEvent = JournalEntry_CreateEventMixSingleBattle(opponentName1, opponentGender1, battleResult, param0->heapID); Heap_Free(opponentName1); @@ -2409,14 +2409,14 @@ static void ov10_022227A4(UnkStruct_ov10_0221F800 *param0) opponentGender1 = TrainerClass_Gender(param0->unk_00->trainer[1].header.trainerType); opponentGender2 = TrainerClass_Gender(param0->unk_00->trainer[3].header.trainerType); - String_ToChars(param0->unk_14[1], opponentName1, TRAINER_NAME_LEN + 1); - String_ToChars(param0->unk_14[3], opponentName2, TRAINER_NAME_LEN + 1); + String_CopyToChars(param0->unk_14[1], opponentName1, TRAINER_NAME_LEN + 1); + String_CopyToChars(param0->unk_14[3], opponentName2, TRAINER_NAME_LEN + 1); } else { opponentGender1 = TrainerClass_Gender(param0->unk_00->trainer[0].header.trainerType); opponentGender2 = TrainerClass_Gender(param0->unk_00->trainer[2].header.trainerType); - String_ToChars(param0->unk_14[0], opponentName1, TRAINER_NAME_LEN + 1); - String_ToChars(param0->unk_14[2], opponentName2, TRAINER_NAME_LEN + 1); + String_CopyToChars(param0->unk_14[0], opponentName1, TRAINER_NAME_LEN + 1); + String_CopyToChars(param0->unk_14[2], opponentName2, TRAINER_NAME_LEN + 1); } journalEntryOnlineEvent = JournalEntry_CreateEventMultiBattle(opponentName1, opponentName2, opponentGender1, opponentGender2, battleResult, param0->heapID); diff --git a/src/overlay013/battle_bag.c b/src/overlay013/battle_bag.c index 07e4e8571f..dbf3f80f25 100644 --- a/src/overlay013/battle_bag.c +++ b/src/overlay013/battle_bag.c @@ -742,7 +742,7 @@ static void InitializeMessageLoader(BattleBag *battleBagTask) battleBagTask->messageLoader = MessageLoader_Init(MSG_LOADER_PRELOAD_ENTIRE_BANK, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_BATTLE_BAG, battleBagTask->context->heapID); battleBagTask->unk_0C = FontSpecialChars_Init(15, 14, 0, battleBagTask->context->heapID); battleBagTask->stringTemplate = StringTemplate_Default(battleBagTask->context->heapID); - battleBagTask->string = String_Init(512, battleBagTask->context->heapID); + battleBagTask->string = String_New(512, battleBagTask->context->heapID); } static void CleanupMessageLoader(BattleBag *battleBag) diff --git a/src/overlay013/battle_bag_text.c b/src/overlay013/battle_bag_text.c index 581424f926..3f6221d416 100644 --- a/src/overlay013/battle_bag_text.c +++ b/src/overlay013/battle_bag_text.c @@ -604,7 +604,7 @@ static void PrintUseItemName(BattleBag *battleBag, u32 slot) static void PrintUseItemDesc(BattleBag *battleBag, u32 slot) { Window *window = &battleBag->windows[BATTLE_BAG_USE_ITEM_MENU_WINDOW_ITEM_DESC]; - String *string = String_Init(130, battleBag->context->heapID); + String *string = String_New(130, battleBag->context->heapID); Item_LoadDescription(string, battleBag->items[battleBag->currentBattlePocket][slot].item, battleBag->context->heapID); Text_AddPrinterWithParamsAndColor(window, FONT_SYSTEM, string, 4, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL); diff --git a/src/overlay013/battle_party.c b/src/overlay013/battle_party.c index dd140f1321..f1a124f0cd 100644 --- a/src/overlay013/battle_party.c +++ b/src/overlay013/battle_party.c @@ -1215,7 +1215,7 @@ static void InitializeMessageLoader(BattleParty *battleParty) battleParty->messageLoader = MessageLoader_Init(MSG_LOADER_PRELOAD_ENTIRE_BANK, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_BATTLE_PARTY, battleParty->context->heapID); battleParty->unk_1FA0 = FontSpecialChars_Init(15, 14, 0, battleParty->context->heapID); battleParty->stringTemplate = StringTemplate_Default(battleParty->context->heapID); - battleParty->string = String_Init(512, battleParty->context->heapID); + battleParty->string = String_New(512, battleParty->context->heapID); } static void CleanupMessageLoader(BattleParty *battleParty) diff --git a/src/overlay013/battle_party_text.c b/src/overlay013/battle_party_text.c index b3f9ed9c38..f4a8b5bbde 100644 --- a/src/overlay013/battle_party_text.c +++ b/src/overlay013/battle_party_text.c @@ -1153,7 +1153,7 @@ static void PrintPokemonNameHeader(BattleParty *battleParty, u32 windowIndex, en { Window *window = &battleParty->windows[windowIndex]; BattlePartyPokemon *pokemon = &battleParty->partyPokemon[partyIndex]; - String *formattedString = String_Init(12, battleParty->context->heapID); + String *formattedString = String_New(12, battleParty->context->heapID); String *string = MessageLoader_GetNewString(battleParty->messageLoader, sPartyPokemonNameTextIDs[partyIndex]); StringTemplate_SetNickname(battleParty->stringTemplate, 0, Pokemon_GetBoxPokemon(pokemon->pokemon)); @@ -1247,7 +1247,7 @@ static void DrawPokemonHealthBar(BattleParty *battleParty, u32 windowIndex, u16 static void PrintPokemonAbilityName(BattleParty *battleParty, u32 windowIndex, u32 partyIndex) { BattlePartyPokemon *pokemon = &battleParty->partyPokemon[partyIndex]; - String *formattedString = String_Init(16, battleParty->context->heapID); + String *formattedString = String_New(16, battleParty->context->heapID); String *string = MessageLoader_GetNewString(battleParty->messageLoader, BattleParty_Text_PokemonAbilityName); StringTemplate_SetAbilityName(battleParty->stringTemplate, 0, pokemon->ability); @@ -1267,7 +1267,7 @@ static void PrintPokemonHeldItem(BattleParty *battleParty, u32 windowIndex, u32 if (pokemon->heldItem == ITEM_NONE) { formattedString = MessageLoader_GetNewString(battleParty->messageLoader, BattleParty_Text_PokemonNoItemHeld); } else { - formattedString = String_Init(18, battleParty->context->heapID); + formattedString = String_New(18, battleParty->context->heapID); string = MessageLoader_GetNewString(battleParty->messageLoader, BattleParty_Text_PokemonHeldItemName); StringTemplate_SetItemName(battleParty->stringTemplate, 0, pokemon->heldItem); @@ -1283,7 +1283,7 @@ static void PrintPokemonHeldItem(BattleParty *battleParty, u32 windowIndex, u32 static void PrintMoveName(BattleParty *battleParty, enum Move move, u32 windowIndex, u32 textID, u16 font, u16 yOffset, TextColor color) { Window *window = &battleParty->windows[windowIndex]; - String *formattedString = String_Init(16, battleParty->context->heapID); + String *formattedString = String_New(16, battleParty->context->heapID); String *string = MessageLoader_GetNewString(battleParty->messageLoader, textID); u32 xOffset; @@ -1348,7 +1348,7 @@ static void PrintSelectedPokemonLevel(BattleParty *battleParty, u32 partyIndex) String_Free(string); string = MessageLoader_GetNewString(battleParty->messageLoader, BattleParty_Text_PokemonLevelValue); - formattedString = String_Init(8, battleParty->context->heapID); + formattedString = String_New(8, battleParty->context->heapID); StringTemplate_SetNumber(battleParty->stringTemplate, 0, pokemon->level, POKEMON_LEVEL_DIGITS, PADDING_MODE_NONE, CHARSET_MODE_EN); StringTemplate_Format(battleParty->stringTemplate, formattedString, string); @@ -1362,7 +1362,7 @@ static void PrintSelectedPokemonLevel(BattleParty *battleParty, u32 partyIndex) String_Free(string); string = MessageLoader_GetNewString(battleParty->messageLoader, BattleParty_Text_PokemonExpToNextLevelValue); - formattedString = String_Init(14, battleParty->context->heapID); + formattedString = String_New(14, battleParty->context->heapID); if (pokemon->level < MAX_POKEMON_LEVEL) { StringTemplate_SetNumber( @@ -1398,7 +1398,7 @@ static void PrintPokemonAttackStat(BattleParty *battleParty, u32 partyIndex) String_Free(string); string = MessageLoader_GetNewString(battleParty->messageLoader, BattleParty_Text_PokemonAttackStatValue); - formattedString = String_Init(8, battleParty->context->heapID); + formattedString = String_New(8, battleParty->context->heapID); StringTemplate_SetNumber(battleParty->stringTemplate, 0, pokemon->attack, POKEMON_ATTACK_STAT_DIGITS, PADDING_MODE_NONE, CHARSET_MODE_EN); StringTemplate_Format(battleParty->stringTemplate, formattedString, string); @@ -1426,7 +1426,7 @@ static void PrintPokemonDefenseStat(BattleParty *battleParty, u32 partyIndex) String_Free(string); string = MessageLoader_GetNewString(battleParty->messageLoader, BattleParty_Text_PokemonDefenseStatValue); - formattedString = String_Init(8, battleParty->context->heapID); + formattedString = String_New(8, battleParty->context->heapID); StringTemplate_SetNumber(battleParty->stringTemplate, 0, pokemon->defence, POKEMON_DEFENSE_STAT_DIGITS, PADDING_MODE_NONE, CHARSET_MODE_EN); StringTemplate_Format(battleParty->stringTemplate, formattedString, string); @@ -1454,7 +1454,7 @@ static void PrintPokemonSpeedStat(BattleParty *battleParty, u32 partyIndex) String_Free(string); string = MessageLoader_GetNewString(battleParty->messageLoader, BattleParty_Text_PokemonSpeedStatValue); - formattedString = String_Init(8, battleParty->context->heapID); + formattedString = String_New(8, battleParty->context->heapID); StringTemplate_SetNumber(battleParty->stringTemplate, 0, pokemon->speed, POKEMON_SPEED_STAT_DIGITS, PADDING_MODE_NONE, CHARSET_MODE_EN); StringTemplate_Format(battleParty->stringTemplate, formattedString, string); @@ -1482,7 +1482,7 @@ static void PrintPokemonSpAtkStat(BattleParty *battleParty, u32 partyIndex) String_Free(string); string = MessageLoader_GetNewString(battleParty->messageLoader, BattleParty_Text_PokemonSpAtkStatValue); - formattedString = String_Init(8, battleParty->context->heapID); + formattedString = String_New(8, battleParty->context->heapID); StringTemplate_SetNumber(battleParty->stringTemplate, 0, pokemon->spAtk, POKEMON_SP_ATK_STAT_DIGITS, PADDING_MODE_NONE, CHARSET_MODE_EN); StringTemplate_Format(battleParty->stringTemplate, formattedString, string); @@ -1510,7 +1510,7 @@ static void PrintPokemonSpDefStat(BattleParty *battleParty, u32 partyIndex) String_Free(string); string = MessageLoader_GetNewString(battleParty->messageLoader, BattleParty_Text_PokemonSpDefStatValue); - formattedString = String_Init(8, battleParty->context->heapID); + formattedString = String_New(8, battleParty->context->heapID); StringTemplate_SetNumber(battleParty->stringTemplate, 0, pokemon->spDef, POKEMON_SP_DEF_STAT_DIGITS, PADDING_MODE_NONE, CHARSET_MODE_EN); StringTemplate_Format(battleParty->stringTemplate, formattedString, string); @@ -1545,7 +1545,7 @@ static void PrintPokemonHPStat(BattleParty *battleParty, u32 partyIndex) String_Free(string); string = MessageLoader_GetNewString(battleParty->messageLoader, BattleParty_Text_PokemonHPStatValue); - formattedString = String_Init(8, battleParty->context->heapID); + formattedString = String_New(8, battleParty->context->heapID); StringTemplate_SetNumber(battleParty->stringTemplate, 0, pokemon->curHP, POKEMON_HP_STAT_DIGITS, PADDING_MODE_NONE, CHARSET_MODE_EN); StringTemplate_Format(battleParty->stringTemplate, formattedString, string); @@ -1557,7 +1557,7 @@ static void PrintPokemonHPStat(BattleParty *battleParty, u32 partyIndex) String_Free(formattedString); string = MessageLoader_GetNewString(battleParty->messageLoader, BattleParty_Text_PokemonMaxHPStatValue); - formattedString = String_Init(8, battleParty->context->heapID); + formattedString = String_New(8, battleParty->context->heapID); StringTemplate_SetNumber(battleParty->stringTemplate, 0, pokemon->maxHP, POKEMON_HP_STAT_DIGITS, PADDING_MODE_NONE, CHARSET_MODE_EN); StringTemplate_Format(battleParty->stringTemplate, formattedString, string); @@ -1608,7 +1608,7 @@ static void PrintMoveAccuracyValue(BattleParty *battleParty, u32 windowIndex, u3 String_Free(string); } else { string = MessageLoader_GetNewString(battleParty->messageLoader, BattleParty_Text_MoveAccuracyValue); - formattedString = String_Init(8, battleParty->context->heapID); + formattedString = String_New(8, battleParty->context->heapID); StringTemplate_SetNumber(battleParty->stringTemplate, 0, moveAccuracyStat, MOVE_ACCURACY_STAT_DIGITS, PADDING_MODE_NONE, CHARSET_MODE_EN); StringTemplate_Format(battleParty->stringTemplate, formattedString, string); @@ -1653,7 +1653,7 @@ static void PrintMovePowerValue(BattleParty *battleParty, u32 windowIndex, u32 m String_Free(string); } else { string = MessageLoader_GetNewString(battleParty->messageLoader, BattleParty_Text_MovePowerValue); - formattedString = String_Init(8, battleParty->context->heapID); + formattedString = String_New(8, battleParty->context->heapID); StringTemplate_SetNumber(battleParty->stringTemplate, 0, movePowerStat, MOVE_POWER_STAT_DIGITS, PADDING_MODE_NONE, CHARSET_MODE_EN); StringTemplate_Format(battleParty->stringTemplate, formattedString, string); @@ -1746,7 +1746,7 @@ static void PrintSummaryScreenMovePPStats(BattleParty *battleParty, u32 windowIn String_Free(string); string = MessageLoader_GetNewString(battleParty->messageLoader, BattleParty_Text_MoveCurrentPP); - formattedString = String_Init(6, battleParty->context->heapID); + formattedString = String_New(6, battleParty->context->heapID); StringTemplate_SetNumber(battleParty->stringTemplate, 0, currentPP, SUMMARY_SCREEN_MOVE_PP_STAT_DIGIT, PADDING_MODE_NONE, CHARSET_MODE_EN); StringTemplate_Format(battleParty->stringTemplate, formattedString, string); @@ -1758,7 +1758,7 @@ static void PrintSummaryScreenMovePPStats(BattleParty *battleParty, u32 windowIn String_Free(formattedString); string = MessageLoader_GetNewString(battleParty->messageLoader, BattleParty_Text_MoveMaxPP); - formattedString = String_Init(6, battleParty->context->heapID); + formattedString = String_New(6, battleParty->context->heapID); StringTemplate_SetNumber(battleParty->stringTemplate, 0, maxPP, SUMMARY_SCREEN_MOVE_PP_STAT_DIGIT, PADDING_MODE_NONE, CHARSET_MODE_EN); StringTemplate_Format(battleParty->stringTemplate, formattedString, string); @@ -1810,7 +1810,7 @@ void BattlePartyText_PrintHMMovesCantBeForgottenText(BattleParty *battleParty) static void PrintMovesScreenMovePPStats(BattleParty *battleParty, BattlePartyPokemonMove *move, u32 windowIndex) { Window *window = &battleParty->windows[windowIndex]; - String *formattedString = String_Init(6, battleParty->context->heapID); + String *formattedString = String_New(6, battleParty->context->heapID); String *string = MessageLoader_GetNewString(battleParty->messageLoader, BattleParty_Text_MovePPLabel); u32 stringWidth; @@ -1846,7 +1846,7 @@ static void PrintMovesScreenMovePPStats(BattleParty *battleParty, BattlePartyPok static void PrintMoveCurrentPP(BattleParty *battleParty, BattlePartyPokemonMove *move, u32 windowIndex) { Window *window = &battleParty->windows[windowIndex]; - String *formattedString = String_Init(6, battleParty->context->heapID); + String *formattedString = String_New(6, battleParty->context->heapID); String *string = MessageLoader_GetNewString(battleParty->messageLoader, BattleParty_Text_MovePPLabel); u32 stringWidth = Font_CalcStringWidth(FONT_SYSTEM, string, 0); @@ -1935,7 +1935,7 @@ static void PrintSelectedPokemonName(BattleParty *battleParty, u32 partyIndex) { Window *window = &battleParty->windows[BATTLE_SELECT_POKEMON_SCREEN_WINDOW_POKEMON_NAME]; BattlePartyPokemon *pokemon = &battleParty->partyPokemon[partyIndex]; - String *string = String_Init(12, battleParty->context->heapID); + String *string = String_New(12, battleParty->context->heapID); String *formattedString = MessageLoader_GetNewString(battleParty->messageLoader, sPartyPokemonNameTextIDs[partyIndex]); u8 stringWidth; u8 formattedStringWidth; diff --git a/src/overlay017/ov17_0223B140.c b/src/overlay017/ov17_0223B140.c index 7d8dd6bb28..bbc40e47c4 100644 --- a/src/overlay017/ov17_0223B140.c +++ b/src/overlay017/ov17_0223B140.c @@ -209,7 +209,7 @@ int ov17_0223B140(ApplicationManager *appMan, int *param1) v0->unk_0C.unk_44 = MessageLoader_Init(MSG_LOADER_PRELOAD_ENTIRE_BANK, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_CONTEST_ACTING_COMPETITION, HEAP_ID_21); v0->unk_0C.unk_54 = sub_02012744(2 * 4, HEAP_ID_21); v0->unk_0C.unk_48 = StringTemplate_Default(HEAP_ID_21); - v0->unk_0C.unk_4C = String_Init(3 * 160, HEAP_ID_21); + v0->unk_0C.unk_4C = String_New(3 * 160, HEAP_ID_21); { NARC *v1; diff --git a/src/overlay017/ov17_0223CB1C.c b/src/overlay017/ov17_0223CB1C.c index 5d878f5423..38c31d95d9 100644 --- a/src/overlay017/ov17_0223CB1C.c +++ b/src/overlay017/ov17_0223CB1C.c @@ -181,7 +181,7 @@ int ov17_0223CB1C(ApplicationManager *appMan, int *param1) v0->unk_0C.unk_38 = MessageLoader_Init(MSG_LOADER_PRELOAD_ENTIRE_BANK, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_CONTEST_VISUAL_COMPETITION, HEAP_ID_22); v0->unk_0C.unk_3C = StringTemplate_Default(HEAP_ID_22); - v0->unk_0C.unk_40 = String_Init(2 * 160, HEAP_ID_22); + v0->unk_0C.unk_40 = String_New(2 * 160, HEAP_ID_22); { NARC *v1; diff --git a/src/overlay017/ov17_0223DAD0.c b/src/overlay017/ov17_0223DAD0.c index a322c5e3fe..b37a8174ab 100644 --- a/src/overlay017/ov17_0223DAD0.c +++ b/src/overlay017/ov17_0223DAD0.c @@ -283,7 +283,7 @@ int ov17_0223DAD0(ApplicationManager *appMan, int *param1) v0->unk_14.unk_84 = MessageLoader_Init(MSG_LOADER_PRELOAD_ENTIRE_BANK, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_CONTEST_DANCE_COMPETITION, HEAP_ID_23); v0->unk_14.unk_88 = StringTemplate_Default(HEAP_ID_23); - v0->unk_14.unk_8C = String_Init(2 * 160, HEAP_ID_23); + v0->unk_14.unk_8C = String_New(2 * 160, HEAP_ID_23); v0->unk_14.unk_94 = sub_02012744(3 * 3, HEAP_ID_23); { diff --git a/src/overlay017/ov17_022413D8.c b/src/overlay017/ov17_022413D8.c index 824163dd62..02c4962f36 100644 --- a/src/overlay017/ov17_022413D8.c +++ b/src/overlay017/ov17_022413D8.c @@ -1558,7 +1558,7 @@ void ov17_02242EE4(UnkStruct_ov17_02246F24 *param0, int param1) String *v0; TextColor v1; - v0 = String_Init(12, HEAP_ID_21); + v0 = String_New(12, HEAP_ID_21); Pokemon_GetValue(param0->unk_0C.unk_00->unk_00[param1], MON_DATA_NICKNAME_STRING, v0); diff --git a/src/overlay017/ov17_0224F4D4.c b/src/overlay017/ov17_0224F4D4.c index f3b2b3df81..b1634b31e8 100644 --- a/src/overlay017/ov17_0224F4D4.c +++ b/src/overlay017/ov17_0224F4D4.c @@ -191,7 +191,7 @@ int ov17_0224F4D4(ApplicationManager *appMan, int *param1) v0->unk_10.unk_B4 = MessageLoader_Init(MSG_LOADER_PRELOAD_ENTIRE_BANK, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_CONTEST_RESULTS, HEAP_ID_24); v0->unk_10.unk_B8 = StringTemplate_Default(HEAP_ID_24); - v0->unk_10.unk_BC = String_Init(2 * 160, HEAP_ID_24); + v0->unk_10.unk_BC = String_New(2 * 160, HEAP_ID_24); v0->unk_10.unk_C4 = sub_02012744(10, HEAP_ID_24); ov17_0224FE60(v0); diff --git a/src/overlay017/ov17_02250744.c b/src/overlay017/ov17_02250744.c index 4d09f6d79d..2e524d6df0 100644 --- a/src/overlay017/ov17_02250744.c +++ b/src/overlay017/ov17_02250744.c @@ -331,7 +331,7 @@ void ov17_02250B00(UnkStruct_ov17_0224FCA0 *param0) String *v2; int v3, v4; - v2 = String_Init(12, HEAP_ID_24); + v2 = String_New(12, HEAP_ID_24); for (v3 = 0; v3 < 4; v3++) { v4 = param0->unk_39A.unk_30[v3]; diff --git a/src/overlay020/ov20_021D2EA4.c b/src/overlay020/ov20_021D2EA4.c index 4d02ed68a7..98da2d33cc 100644 --- a/src/overlay020/ov20_021D2EA4.c +++ b/src/overlay020/ov20_021D2EA4.c @@ -80,7 +80,7 @@ UnkStruct_ov20_021D30F8 *ov20_021D2EA4(UnkStruct_ov20_021D2128 *param0, const Un v0->unk_3C = NULL; v0->unk_40 = NULL; v0->unk_44 = NULL; - v0->unk_4C = String_Init(128, HEAP_ID_35); + v0->unk_4C = String_New(128, HEAP_ID_35); v0->unk_48 = MessageLoader_Init(MSG_LOADER_PRELOAD_ENTIRE_BANK, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_UNK_0437, HEAP_ID_35); v0->unk_50 = ColoredArrow_New(HEAP_ID_35); @@ -309,7 +309,7 @@ static u32 ov20_021D32D0(UnkStruct_ov20_021D30F8 *param0) static void ov20_021D33C8(UnkStruct_ov20_021D33C8 *param0, UnkStruct_ov20_021D30F8 *param1) { param0->unk_00 = ov20_021D1FC0(param1->unk_04, 35); - param0->unk_04 = String_GetData(param0->unk_00); + param0->unk_04 = String_GetChars(param0->unk_00); if (*(param0->unk_04) == 0xfffe) { param0->unk_08 = 1; @@ -429,7 +429,7 @@ void ov20_021D3578(UnkStruct_ov20_021D30F8 *param0, u32 param1) { StringTemplate *v0 = StringTemplate_New(2, 60, HEAP_ID_SYSTEM); - String *v1 = String_Init(300, HEAP_ID_SYSTEM); + String *v1 = String_New(300, HEAP_ID_SYSTEM); StringTemplate_SetBagPocketName(v0, 0, 0); MessageLoader_GetString(param0->unk_48, 0 + ov20_021D1F88(param0->unk_04), param0->unk_4C); diff --git a/src/overlay020/ov20_021D3A54.c b/src/overlay020/ov20_021D3A54.c index fa1c9dc48e..0ab6d22fce 100644 --- a/src/overlay020/ov20_021D3A54.c +++ b/src/overlay020/ov20_021D3A54.c @@ -157,7 +157,7 @@ static u32 ov20_021D3C78(UnkStruct_ov20_021D3E0C *param0, BgConfig *param1, u32 Window_Add(param1, &v0, 1, 34, 10, 25, 8, 11, param2); param2 += 200; - v1 = String_Init(4, HEAP_ID_35); + v1 = String_New(4, HEAP_ID_35); Window_FillTilemap(&v0, 15); diff --git a/src/overlay020/ov20_021D40E8.c b/src/overlay020/ov20_021D40E8.c index c56b94af2a..288b990378 100644 --- a/src/overlay020/ov20_021D40E8.c +++ b/src/overlay020/ov20_021D40E8.c @@ -53,7 +53,7 @@ UnkStruct_ov20_021D4210 *ov20_021D40E8(UnkStruct_ov20_021D2128 *param0, const Un v0->unk_04 = param1; v0->unk_08 = param2; v0->unk_0C = ov20_021D2E04(param0); - v0->unk_3C = String_Init(32, HEAP_ID_35); + v0->unk_3C = String_New(32, HEAP_ID_35); Window_Add(v0->unk_0C, &v0->unk_10, 2, 4, 0, 26, 32, 12, 1); Window_Add(v0->unk_0C, &v0->unk_20, 2, 0, 0, 12, 4, 12, 1); diff --git a/src/overlay020/ov20_021D4728.c b/src/overlay020/ov20_021D4728.c index c1b8182da2..ba68e19eb2 100644 --- a/src/overlay020/ov20_021D4728.c +++ b/src/overlay020/ov20_021D4728.c @@ -181,12 +181,12 @@ static void ov20_021D498C(Window *param0, BgConfig *param1, const String *param2 u32 v4; String *v5; - v4 = String_NumLines(param2); - v5 = String_Init(32, HEAP_ID_35); + v4 = String_CountLines(param2); + v5 = String_New(32, HEAP_ID_35); param3 += ((2 - v4) * 16) / 2; for (v1 = 0; v1 < v4; v1++) { - String_CopyLineNum(v5, param2, v1); + String_CopyLine(v5, param2, v1); v2 = Font_CalcCenterAlignment(2, v5, 0, 88); for (v0 = 0; v0 < NELEMS(Unk_ov20_021D52EC); v0++) { v3 = Unk_ov20_021D52EC[v0] + param3; diff --git a/src/overlay022/ov22_02255D44.c b/src/overlay022/ov22_02255D44.c index 2300e37291..aefff86517 100644 --- a/src/overlay022/ov22_02255D44.c +++ b/src/overlay022/ov22_02255D44.c @@ -1349,7 +1349,7 @@ static void ov22_02257368(UnkStruct_ov22_02255D44 *param0, u32 param1) v0 = MessageLoader_Init(MSG_LOADER_PRELOAD_ENTIRE_BANK, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_UNK_0385, HEAP_ID_13); v2 = MessageLoader_GetNewString(v0, param1); - v1 = String_Init(256, HEAP_ID_13); + v1 = String_New(256, HEAP_ID_13); StringTemplate_Format(param0->unk_744, v1, v2); Text_AddPrinterWithParamsAndColor(param0->unk_718, FONT_MESSAGE, v1, 0, 0, TEXT_SPEED_INSTANT, TEXT_COLOR(1, 2, 15), NULL); @@ -1372,7 +1372,7 @@ static u32 ov22_022573EC(UnkStruct_ov22_02255D44 *param0, u32 param1) v1 = MessageLoader_Init(MSG_LOADER_PRELOAD_ENTIRE_BANK, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_UNK_0385, HEAP_ID_13); v3 = MessageLoader_GetNewString(v1, param1); - param0->unk_740 = String_Init(256, HEAP_ID_13); + param0->unk_740 = String_New(256, HEAP_ID_13); StringTemplate_Format(param0->unk_744, param0->unk_740, v3); diff --git a/src/overlay022/ov22_0225B660.c b/src/overlay022/ov22_0225B660.c index c9cae82f02..040b0d7dd8 100644 --- a/src/overlay022/ov22_0225B660.c +++ b/src/overlay022/ov22_0225B660.c @@ -286,7 +286,7 @@ static void ov22_0225BB00(UnkStruct_ov22_0225B85C *param0) v0.z = 0; Sprite_SetPosition(param0->unk_1FC, &v0); - v7 = String_Init(12, HEAP_ID_13); + v7 = String_New(12, HEAP_ID_13); sub_0202A1A0(param0->unk_00, v7); v3 = Font_CalcStringWidth(FONT_SYSTEM, v7, 0); @@ -299,7 +299,7 @@ static void ov22_0225BB00(UnkStruct_ov22_0225B85C *param0) v4 = sub_0202A1F4(param0->unk_00); StringTemplate_SetCustomMessageWord(v5, 0, v4); - v7 = String_Init(200, HEAP_ID_13); + v7 = String_New(200, HEAP_ID_13); v6 = MessageLoader_GetNewString(v8, 45); StringTemplate_Format(v5, v7, v6); @@ -331,7 +331,7 @@ static void ov22_0225BC18(UnkStruct_ov22_0225B85C *param0) v0 = sub_0202A5D0(param0->unk_04); v1 = StringTemplate_Default(HEAP_ID_13); - v2 = String_Init(200, HEAP_ID_13); + v2 = String_New(200, HEAP_ID_13); StringTemplate_SetContestTypeName(v1, 0, Contest_GetContestTypeMessageID(param0->unk_08)); StringTemplate_SetContestRankName(v1, 1, Contest_GetRankMessageID(v0)); diff --git a/src/overlay023/ov23_02241F74.c b/src/overlay023/ov23_02241F74.c index e4bde20313..e0be0dbe35 100644 --- a/src/overlay023/ov23_02241F74.c +++ b/src/overlay023/ov23_02241F74.c @@ -214,7 +214,7 @@ BOOL CommManUnderground_FormatStringWith2TrainerNames(TrainerInfo *trainerInfo1, { if (trainerInfo1 && trainerInfo2) { StringTemplate *template = StringTemplate_Default(HEAP_ID_FIELD1); - String *fmtString = String_Init(50 * 2, HEAP_ID_FIELD1); + String *fmtString = String_New(50 * 2, HEAP_ID_FIELD1); StringTemplate_SetPlayerName(template, 0, trainerInfo1); StringTemplate_SetPlayerName(template, 1, trainerInfo2); @@ -233,7 +233,7 @@ BOOL CommManUnderground_FormatStringWithTrainerName(TrainerInfo *trainerInfo, in { if (trainerInfo) { StringTemplate *template = StringTemplate_Default(HEAP_ID_FIELD1); - String *fmtString = String_Init(50 * 2, HEAP_ID_FIELD1); + String *fmtString = String_New(50 * 2, HEAP_ID_FIELD1); StringTemplate_SetPlayerName(template, index, trainerInfo); MessageLoader_GetString(UndergroundTextPrinter_GetMessageLoader(CommManUnderground_GetCommonTextPrinter()), bankEntry, fmtString); @@ -1034,10 +1034,10 @@ void UndergroundMan_SetReturnLog(int param0) if (sCommManUnderground) { if (sCommManUnderground->unk_DC[param0] == NULL) { - sCommManUnderground->unk_DC[param0] = String_Init((50 * 2), HEAP_ID_COMMUNICATION); + sCommManUnderground->unk_DC[param0] = String_New((50 * 2), HEAP_ID_COMMUNICATION); v0 = StringTemplate_Default(HEAP_ID_FIELD2); - v1 = String_Init((50 * 2), HEAP_ID_FIELD2); + v1 = String_New((50 * 2), HEAP_ID_FIELD2); StringTemplate_SetPlayerName(v0, 0, CommInfo_TrainerInfo(param0)); MessageLoader_GetString(UndergroundTextPrinter_GetMessageLoader(CommManUnderground_GetCommonTextPrinter()), 115, v1); diff --git a/src/overlay023/ov23_02248F1C.c b/src/overlay023/ov23_02248F1C.c index f4de89b54e..2e1c0c26fd 100644 --- a/src/overlay023/ov23_02248F1C.c +++ b/src/overlay023/ov23_02248F1C.c @@ -492,15 +492,15 @@ static void ov23_02249724(UnkStruct_ov23_02249724 *param0) int v0; for (v0 = 0; v0 < 32; v0++) { - param0->unk_00[v0] = String_Init(50 * 2, HEAP_ID_FIELD1); + param0->unk_00[v0] = String_New(50 * 2, HEAP_ID_FIELD1); } param0->unk_8C = 0; param0->unk_90 = 0; - param0->unk_80 = String_Init(50 * 2, HEAP_ID_FIELD1); + param0->unk_80 = String_New(50 * 2, HEAP_ID_FIELD1); for (v0 = 0; v0 < 2; v0++) { - param0->unk_84[v0] = String_Init(20 * 2 * 2, HEAP_ID_FIELD1); + param0->unk_84[v0] = String_New(20 * 2 * 2, HEAP_ID_FIELD1); } } @@ -523,7 +523,7 @@ static int ov23_022497B0(UnkStruct_ov23_02249724 *param0, String *param1) { int v0, v1, v2; - String_ToChars(param1, param0->unk_94, 20 * 2 * 2); + String_CopyToChars(param1, param0->unk_94, 20 * 2 * 2); v1 = 0; v0 = 0; @@ -544,8 +544,8 @@ static int ov23_022497B0(UnkStruct_ov23_02249724 *param0, String *param1) return 1; } else { param0->unk_94[v2] = 0xffff; - String_CopyChars(param0->unk_84[0], param0->unk_94); - String_CopyChars(param0->unk_84[1], ¶m0->unk_94[v2 + 1]); + String_CopyFromChars(param0->unk_84[0], param0->unk_94); + String_CopyFromChars(param0->unk_84[1], ¶m0->unk_94[v2 + 1]); } return 2; diff --git a/src/overlay023/ov23_022521F0.c b/src/overlay023/ov23_022521F0.c index dfc7502b87..06fd6a2678 100644 --- a/src/overlay023/ov23_022521F0.c +++ b/src/overlay023/ov23_022521F0.c @@ -928,8 +928,8 @@ void ov23_022534A0(FieldSystem *fieldSystem) v4->fieldSystem = fieldSystem; v4->unk_2AC = v7; v4->unk_288 = v6; - v4->string = String_Init((50 * 2), HEAP_ID_FIELD1); - v4->fmtString = String_Init((50 * 2), HEAP_ID_FIELD1); + v4->string = String_New((50 * 2), HEAP_ID_FIELD1); + v4->fmtString = String_New((50 * 2), HEAP_ID_FIELD1); v4->template = StringTemplate_Default(HEAP_ID_FIELD1); v4->state = 0; diff --git a/src/overlay023/ov23_02253598.c b/src/overlay023/ov23_02253598.c index f462146627..1e2474b588 100644 --- a/src/overlay023/ov23_02253598.c +++ b/src/overlay023/ov23_02253598.c @@ -129,8 +129,8 @@ static void ov23_0225360C(Window *param0, MessageLoader *param1, TrainerInfo *pa const int v12 = 146; v0 = StringTemplate_Default(HEAP_ID_FIELD1); - v1 = String_Init(30, HEAP_ID_FIELD1); - v2 = String_Init(30, HEAP_ID_FIELD1); + v1 = String_New(30, HEAP_ID_FIELD1); + v2 = String_New(30, HEAP_ID_FIELD1); MessageLoader_GetString(param1, 0, v1); Text_AddPrinterWithParams(param0, FONT_SYSTEM, v1, v7, 1, TEXT_SPEED_NO_TRANSFER, NULL); @@ -343,8 +343,8 @@ static void ov23_02253A78(Window *param0, MessageLoader *param1, TrainerInfo *pa const int v12 = 100; v0 = StringTemplate_Default(HEAP_ID_FIELD1); - v1 = String_Init(40, HEAP_ID_FIELD1); - v2 = String_Init(40, HEAP_ID_FIELD1); + v1 = String_New(40, HEAP_ID_FIELD1); + v2 = String_New(40, HEAP_ID_FIELD1); StringTemplate_SetPlayerName(v0, 1, param2); MessageLoader_GetString(param1, 12, v1); diff --git a/src/overlay023/ov23_022542CC.c b/src/overlay023/ov23_022542CC.c index e25d10cd43..350b412892 100644 --- a/src/overlay023/ov23_022542CC.c +++ b/src/overlay023/ov23_022542CC.c @@ -421,7 +421,7 @@ static void ov23_022546E0(UnkStruct_ov23_02254594 *param0) v13 = MessageLoader_GetNewString(v12, 9); v14 = MessageLoader_GetNewString(v12, 10); - v15 = String_Init(6, HEAP_ID_FIELD1); + v15 = String_New(6, HEAP_ID_FIELD1); Text_AddPrinterWithParams(¶m0->unk_18, FONT_SYSTEM, v13, 0, 0, TEXT_SPEED_NO_TRANSFER, NULL); v16 = StringTemplate_Default(HEAP_ID_FIELD1); diff --git a/src/overlay023/underground_menu.c b/src/overlay023/underground_menu.c index d42d3e1089..db993c351a 100644 --- a/src/overlay023/underground_menu.c +++ b/src/overlay023/underground_menu.c @@ -483,8 +483,8 @@ void UndergroundMenu_Start(ExitCallback exitCallback, FieldSystem *fieldSystem) menu->fieldSystem = fieldSystem; menu->exitCallback = exitCallback; menu->state = UNDERGROUND_MENU_STATE_INIT; - menu->string = String_Init(50 * 2, HEAP_ID_FIELD1); - menu->fmtString = String_Init(50 * 2, HEAP_ID_FIELD1); + menu->string = String_New(50 * 2, HEAP_ID_FIELD1); + menu->fmtString = String_New(50 * 2, HEAP_ID_FIELD1); menu->template = StringTemplate_Default(HEAP_ID_FIELD1); menu->sysTask = SysTask_Start(UndergroundMenu_Main, menu, 10000); @@ -1415,8 +1415,8 @@ void UndergroundMenu_StartHoldingFlag(ExitCallback exitCallback, FieldSystem *fi menu->fieldSystem = fieldSystem; menu->exitCallback = exitCallback; menu->state = UNDERGROUND_MENU_STATE_INIT; - menu->string = String_Init(50 * 2, HEAP_ID_FIELD1); - menu->fmtString = String_Init(50 * 2, HEAP_ID_FIELD1); + menu->string = String_New(50 * 2, HEAP_ID_FIELD1); + menu->fmtString = String_New(50 * 2, HEAP_ID_FIELD1); menu->template = StringTemplate_Default(HEAP_ID_FIELD1); CommPlayerMan_PauseFieldSystem(); @@ -1825,8 +1825,8 @@ void *UndergroundMenu_StartGiftMenu(ExitCallback exitCallback, FieldSystem *fiel menu->spriteCount = 0; menu->unk_48 = NULL; menu->cursorCallback = NULL; - menu->string = String_Init(50 * 2, HEAP_ID_FIELD1); - menu->fmtString = String_Init(50 * 2, HEAP_ID_FIELD1); + menu->string = String_New(50 * 2, HEAP_ID_FIELD1); + menu->fmtString = String_New(50 * 2, HEAP_ID_FIELD1); menu->template = StringTemplate_Default(HEAP_ID_FIELD1); UndergroundMenu_OpenGoodsMenu(menu); diff --git a/src/overlay023/underground_pc.c b/src/overlay023/underground_pc.c index 6b088f8e4d..a403fab262 100644 --- a/src/overlay023/underground_pc.c +++ b/src/overlay023/underground_pc.c @@ -852,8 +852,8 @@ static void UndergroundPC_OpenPCMenu(FieldSystem *fieldSystem) UndergroundTextPrinter_ChangeMessageLoaderBank(CommManUnderground_GetMiscTextPrinter(), TEXT_BANK_UNDERGROUND_PC, MSG_LOADER_LOAD_ON_DEMAND); menu->state = UG_PC_MENU_STATE_INIT; - menu->string = String_Init(50 * 2, HEAP_ID_FIELD1); - menu->fmtString = String_Init(50 * 2, HEAP_ID_FIELD1); + menu->string = String_New(50 * 2, HEAP_ID_FIELD1); + menu->fmtString = String_New(50 * 2, HEAP_ID_FIELD1); menu->template = StringTemplate_Default(HEAP_ID_FIELD1); menu->scrollPrompts = ScrollPrompts_New(HEAP_ID_FIELD1); diff --git a/src/overlay023/underground_player.c b/src/overlay023/underground_player.c index 90b63c1c33..2473f2b510 100644 --- a/src/overlay023/underground_player.c +++ b/src/overlay023/underground_player.c @@ -535,7 +535,7 @@ void UndergroundPlayer_SendHeldFlagOwnerInfo(void) CommSys_SendDataFixedSize(91, commPlayerMan->heldFlagOwnerInfo[CommSys_CurNetId()]); } else { TrainerInfo *trainerInfo = TrainerInfo_New(HEAP_ID_COMMUNICATION); - String *name = String_Init(20, HEAP_ID_COMMUNICATION); + String *name = String_New(20, HEAP_ID_COMMUNICATION); GF_ASSERT(trainerInfo); GF_ASSERT(name); @@ -563,7 +563,7 @@ void UndergroundPlayer_ProcessHeldFlagOwnerInfo(int flagOwnerNetID, int unused1, String *name = TrainerInfo_NameNewString(flagOwnerInfo, HEAP_ID_COMMUNICATION); - if (String_Length(name) != 0) { + if (String_GetLength(name) != 0) { commPlayerMan->heldFlagInfo[flagOwnerNetID].netID = flagOwnerNetID; } diff --git a/src/overlay023/underground_spheres.c b/src/overlay023/underground_spheres.c index c4627fecd3..872ad38dcc 100644 --- a/src/overlay023/underground_spheres.c +++ b/src/overlay023/underground_spheres.c @@ -483,7 +483,7 @@ BOOL UndergroundSpheres_CheckForRetrievedSphereNotification(String *string) for (netID = 0; netID < MAX_CONNECTED_PLAYERS; netID++) { if (buriedSpheresEnv->retrievedSpheres[netID] != SPHERE_NONE) { template = StringTemplate_Default(HEAP_ID_FIELD1); - fmtString = String_Init(100, HEAP_ID_FIELD1); + fmtString = String_New(100, HEAP_ID_FIELD1); StringTemplate_SetUndergroundItemNameWithArticle(template, 2, buriedSpheresEnv->retrievedSpheres[netID]); StringTemplate_CapitalizeArgAtIndex(template, 2); diff --git a/src/overlay023/underground_text_printer.c b/src/overlay023/underground_text_printer.c index 6ae69b12cd..ce572ac134 100644 --- a/src/overlay023/underground_text_printer.c +++ b/src/overlay023/underground_text_printer.c @@ -60,8 +60,8 @@ UndergroundTextPrinter *UndergroundTextPrinter_New(int bankID, int heapID, BgCon size = 230; } - textPrinter->mainString = String_Init(size, heapID); - textPrinter->formatString = String_Init(size, heapID); + textPrinter->mainString = String_New(size, heapID); + textPrinter->formatString = String_New(size, heapID); textPrinter->template = StringTemplate_Default(heapID); textPrinter->bankID = bankID; textPrinter->msgLoader = MessageLoader_Init(MSG_LOADER_LOAD_ON_DEMAND, NARC_INDEX_MSGDATA__PL_MSG, bankID, heapID); diff --git a/src/overlay056/ov56_022561C0.c b/src/overlay056/ov56_022561C0.c index 2b186bd193..f7b18de88d 100644 --- a/src/overlay056/ov56_022561C0.c +++ b/src/overlay056/ov56_022561C0.c @@ -763,9 +763,9 @@ static String *ov56_02256E5C(PalPad *param0, u32 param1, StringTemplate *param2, } else if (v2 >= 2) { int v3 = v2 - 2; - v1 = String_Init(10, HEAP_ID_89); + v1 = String_New(10, HEAP_ID_89); - String_CopyChars(v1, PalPad_GetTrainerNamePointer(param0, v3)); + String_CopyFromChars(v1, PalPad_GetTrainerNamePointer(param0, v3)); StringTemplate_SetString(param2, 0, v1, 0, 0, PalPad_GetTrainerRegionCode(param0, v3)); String_Free(v1); } @@ -796,7 +796,7 @@ static void ov56_02256EE8(UnkStruct_ov56_02256468 *param0, u32 param1, Sentence String_Free(v0->unk_00[*v2].unk_08); } - String_CopyChars(v0->unk_00[*v2].unk_00, TrainerInfo_Name(param3)); + String_CopyFromChars(v0->unk_00[*v2].unk_00, TrainerInfo_Name(param3)); v0->unk_00[*v2].unk_14 = *param2; v0->unk_00[*v2].unk_0C = param1; diff --git a/src/overlay058/ov58_021D0D80.c b/src/overlay058/ov58_021D0D80.c index a184ad51b5..efb70ffe59 100644 --- a/src/overlay058/ov58_021D0D80.c +++ b/src/overlay058/ov58_021D0D80.c @@ -514,15 +514,15 @@ static void ov58_021D12C4(UnkStruct_02095EAC *param0) int v0; for (v0 = 0; v0 < 5; v0++) { - param0->unk_14[v0] = String_Init(7 + 1, HEAP_ID_39); + param0->unk_14[v0] = String_New(7 + 1, HEAP_ID_39); param0->unk_43E6[v0].unk_08_3 = 0; param0->unk_4418[v0].unk_02 = 0; param0->unk_398[v0][0] = NULL; param0->unk_398[v0][1] = NULL; } - param0->unk_28 = String_Init(10, HEAP_ID_39); - param0->unk_2C = String_Init(40 * 2, HEAP_ID_39); + param0->unk_28 = String_New(10, HEAP_ID_39); + param0->unk_2C = String_New(40 * 2, HEAP_ID_39); param0->unk_43DA = 0; param0->unk_43DB = 1; param0->unk_9458 = 1; @@ -1702,7 +1702,7 @@ static int ov58_021D2A54(UnkStruct_02095EAC *param0) static void ov58_021D2A98(UnkStruct_02095EAC *param0, int param1, int param2) { - String *v0 = String_Init(40 * 2, HEAP_ID_39); + String *v0 = String_New(40 * 2, HEAP_ID_39); MessageLoader_GetString(param0->unk_10, param1, v0); StringTemplate_Format(param0->unk_0C, param0->unk_2C, v0); diff --git a/src/overlay059/ov59_021D0D80.c b/src/overlay059/ov59_021D0D80.c index d85ba1de0a..30f4fc2e47 100644 --- a/src/overlay059/ov59_021D0D80.c +++ b/src/overlay059/ov59_021D0D80.c @@ -507,7 +507,7 @@ static void ov59_021D1250(UnkStruct_020961E8 *param0, NARC *param1) int v0; for (v0 = 0; v0 < 5; v0++) { - param0->unk_2C[v0] = String_Init(7 + 1, HEAP_ID_51); + param0->unk_2C[v0] = String_New(7 + 1, HEAP_ID_51); param0->unk_3C8[v0][0] = NULL; param0->unk_3C8[v0][1] = NULL; param0->unk_4AC8[v0][0].val1 = 0; @@ -515,8 +515,8 @@ static void ov59_021D1250(UnkStruct_020961E8 *param0, NARC *param1) param0->unk_3F0[v0] = 0; } - param0->unk_44 = String_Init(90 * 2, HEAP_ID_51); - param0->unk_48 = String_Init(20 * 2, HEAP_ID_51); + param0->unk_44 = String_New(90 * 2, HEAP_ID_51); + param0->unk_48 = String_New(20 * 2, HEAP_ID_51); param0->unk_3A8 = 0; MessageLoader_GetString(param0->unk_28, 17, param0->unk_48); @@ -1554,7 +1554,7 @@ static BOOL ov59_021D254C(UnkStruct_020961E8 *param0) static void ov59_021D2628(UnkStruct_020961E8 *param0, int param1, int param2) { - String *v0 = String_Init(90 * 2, HEAP_ID_51); + String *v0 = String_New(90 * 2, HEAP_ID_51); MessageLoader_GetString(param0->unk_28, param1, v0); StringTemplate_Format(param0->unk_24, param0->unk_44, v0); diff --git a/src/overlay061/ov61_0222AE60.c b/src/overlay061/ov61_0222AE60.c index 8c17069299..ab8ef54f78 100644 --- a/src/overlay061/ov61_0222AE60.c +++ b/src/overlay061/ov61_0222AE60.c @@ -38,9 +38,9 @@ void ov61_0222AE88(SaveData *saveData, const PCBoxes *pcBoxes, int boxID, UnkStr MI_CpuClear8(param3, sizeof(UnkStruct_ov62_02239DA4)); - v0 = String_Init(20 * 3, heapID); + v0 = String_New(20 * 3, heapID); PCBoxes_BufferBoxName(pcBoxes, boxID, v0); - String_ToChars(v0, param3->unk_00, 20); + String_CopyToChars(v0, param3->unk_00, 20); String_Free(v0); for (v1 = 0; v1 < 30; v1++) { diff --git a/src/overlay061/ov61_0222B008.c b/src/overlay061/ov61_0222B008.c index ec42420164..7579b13ef5 100644 --- a/src/overlay061/ov61_0222B008.c +++ b/src/overlay061/ov61_0222B008.c @@ -96,7 +96,7 @@ int ov61_0222B008(UnkStruct_ov62_022349A8 *param0, const UnkStruct_ov62_02241130 param0->unk_3F4 = MessageLoader_Init(MSG_LOADER_PRELOAD_ENTIRE_BANK, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_UNK_0695, param1->heapID); param0->unk_3F8 = StringTemplate_Default(param1->heapID); - param0->unk_3FC = String_Init((16 * 8 * 2), param1->heapID); + param0->unk_3FC = String_New((16 * 8 * 2), param1->heapID); param0->unk_18C = ov61_0222BBF0(param1->heapID); param0->unk_0C.unk_00 = param1->unk_00; param0->unk_0C.unk_04 = GAME_VERSION; diff --git a/src/overlay061/ov61_0222BF44.c b/src/overlay061/ov61_0222BF44.c index 08d1fed5da..af34a99ba2 100644 --- a/src/overlay061/ov61_0222BF44.c +++ b/src/overlay061/ov61_0222BF44.c @@ -171,8 +171,8 @@ int ov61_0222BF44(ApplicationManager *appMan, int *param1) v0->unk_24 = MessageLoader_Init(MSG_LOADER_PRELOAD_ENTIRE_BANK, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_GTS, HEAP_ID_117); v0->unk_28 = MessageLoader_Init(MSG_LOADER_PRELOAD_ENTIRE_BANK, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_UNK_0674, HEAP_ID_117); v0->unk_2C = MessageLoader_Init(MSG_LOADER_PRELOAD_ENTIRE_BANK, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_UNK_0695, HEAP_ID_117); - v0->unk_34 = String_Init(90 * 2, HEAP_ID_117); - v0->unk_3C = String_Init(16 * 8 * 2, HEAP_ID_117); + v0->unk_34 = String_New(90 * 2, HEAP_ID_117); + v0->unk_3C = String_New(16 * 8 * 2, HEAP_ID_117); v0->unk_38 = MessageLoader_GetNewString(v0->unk_24, 31); ov61_0222C3B0(v0); @@ -490,7 +490,7 @@ void ov61_0222C760(Window *param0, String *param1, int param2, int param3, int p static void ov61_0222C794(UnkStruct_ov61_0222C664 *param0, int param1) { - String *v0 = String_Init(16 * 8 * 2, HEAP_ID_117); + String *v0 = String_New(16 * 8 * 2, HEAP_ID_117); MessageLoader_GetString(param0->unk_2C, param1, v0); StringTemplate_Format(param0->unk_20, param0->unk_3C, v0); diff --git a/src/overlay062/ov62_022300D8.c b/src/overlay062/ov62_022300D8.c index 7f3b849d55..4f00bc57a0 100644 --- a/src/overlay062/ov62_022300D8.c +++ b/src/overlay062/ov62_022300D8.c @@ -705,7 +705,7 @@ void ov62_02230FC8(UnkStruct_0208C06C *param0, UnkStruct_ov62_022307C0_sub1 *par v4 = MessageLoader_GetNewString(param0->unk_14.unk_34, 7); v5 = sub_02030B94(param0->unk_88C[param3->unk_18], HEAP_ID_102); ov62_022349A8(param0, v5); - v0 = String_Init(255, HEAP_ID_102); + v0 = String_New(255, HEAP_ID_102); StringTemplate_SetString(v3, 0, v5, 0, 1, GAME_LANGUAGE); StringTemplate_Format(v3, v0, v4); @@ -721,7 +721,7 @@ void ov62_02230FC8(UnkStruct_0208C06C *param0, UnkStruct_ov62_022307C0_sub1 *par v4 = MessageLoader_GetNewString(param0->unk_14.unk_34, 7); v5 = sub_02030B94(param0->unk_88C[param3->unk_18], HEAP_ID_102); ov62_022349A8(param0, v5); - v0 = String_Init(255, HEAP_ID_102); + v0 = String_New(255, HEAP_ID_102); StringTemplate_SetString(v3, 0, v5, 0, 1, GAME_LANGUAGE); StringTemplate_Format(v3, v0, v4); diff --git a/src/overlay062/ov62_02231690.c b/src/overlay062/ov62_02231690.c index 53c0727884..430e7f8121 100644 --- a/src/overlay062/ov62_02231690.c +++ b/src/overlay062/ov62_02231690.c @@ -416,7 +416,7 @@ static void ov62_02231C78(UnkStruct_ov62_022323B8 *param0, UnkStruct_0208C06C *p v6 = sub_02030B94(v11, HEAP_ID_102); ov62_022349A8(param1, v6); v7 = MessageLoader_GetNewString(param1->unk_14.unk_34, 13); - v8 = String_Init(255, HEAP_ID_102); + v8 = String_New(255, HEAP_ID_102); StringTemplate_SetString(v9, 0, v6, 0, 1, 2); StringTemplate_Format(v9, v8, v7); @@ -437,7 +437,7 @@ static void ov62_02231C78(UnkStruct_ov62_022323B8 *param0, UnkStruct_0208C06C *p v6 = MessageLoader_GetNewString(param1->unk_14.unk_34, 15); v7 = sub_02030B94(v11, HEAP_ID_102); ov62_022349A8(param1, v7); - v8 = String_Init(255, HEAP_ID_102); + v8 = String_New(255, HEAP_ID_102); StringTemplate_SetMonthName(v9, 0, v12); StringTemplate_Format(v9, v8, v6); @@ -473,7 +473,7 @@ static void ov62_02231C78(UnkStruct_ov62_022323B8 *param0, UnkStruct_0208C06C *p Window_ScheduleCopyToVRAM(v10); String_Free(v8); } else { - v8 = String_Init(255, HEAP_ID_102); + v8 = String_New(255, HEAP_ID_102); v6 = MessageLoader_GetNewString(param1->unk_14.unk_34, 22); StringTemplate_SetCountryName(v9, 0, v13); StringTemplate_Format(v9, v8, v6); @@ -485,7 +485,7 @@ static void ov62_02231C78(UnkStruct_ov62_022323B8 *param0, UnkStruct_0208C06C *p if (v14 != 0) { v10 = ¶m0->unk_0C[5]; Window_FillTilemap(v10, 0x00); - v8 = String_Init(255, HEAP_ID_102); + v8 = String_New(255, HEAP_ID_102); v6 = MessageLoader_GetNewString(param1->unk_14.unk_34, 23); StringTemplate_SetCityName(v9, 0, v13, v14); StringTemplate_Format(v9, v8, v6); @@ -778,12 +778,12 @@ static void ov62_022323CC(UnkStruct_ov62_02233310 *param0, UnkStruct_0208C06C *p v2 = ov62_02231690(HEAP_ID_102); if (v5 != 0) { - v0 = String_Init(255, HEAP_ID_102); + v0 = String_New(255, HEAP_ID_102); v1 = MessageLoader_GetNewString(param1->unk_14.unk_34, 23); StringTemplate_SetCityName(v2, 0, v4, v5); StringTemplate_Format(v2, v0, v1); } else { - v0 = String_Init(255, HEAP_ID_102); + v0 = String_New(255, HEAP_ID_102); v1 = MessageLoader_GetNewString(param1->unk_14.unk_34, 22); StringTemplate_SetCountryName(v2, 0, v4); StringTemplate_Format(v2, v0, v1); @@ -886,12 +886,12 @@ void ov62_02232594(UnkStruct_ov62_02233310 *param0, UnkStruct_0208C06C *param1, int v7; for (v0 = 0; v0 < param0->unk_10; v0++) { - v4 = String_Init(255, HEAP_ID_102); - v5 = String_Init(255, HEAP_ID_102); + v4 = String_New(255, HEAP_ID_102); + v5 = String_New(255, HEAP_ID_102); v6 = MessageLoader_GetNewString(param1->unk_14.unk_34, 99); String_FormatInt(v5, (v0 + 1), 2, 1, 1); - String_CopyChars(v4, param1->unk_8B4.unk_1D58[v0]->unk_00.unk_00); + String_CopyFromChars(v4, param1->unk_8B4.unk_1D58[v0]->unk_00.unk_00); ov62_022349A8(param1, v4); v7 = Font_CalcStringWidth(FONT_SYSTEM, v5, 0); @@ -974,9 +974,9 @@ void ov62_02232778(UnkStruct_ov62_02233310 *param0, UnkStruct_0208C06C *param1, for (v0 = 0; v0 < param0->unk_10; v0++) { v3 = MessageLoader_GetNewString(param1->unk_14.unk_34, 88 + param5); - v4 = String_Init(255, HEAP_ID_102); - v6 = String_Init(255, HEAP_ID_102); - v11 = String_Init(255, HEAP_ID_102); + v4 = String_New(255, HEAP_ID_102); + v6 = String_New(255, HEAP_ID_102); + v11 = String_New(255, HEAP_ID_102); switch (param5) { case 0: @@ -986,15 +986,15 @@ void ov62_02232778(UnkStruct_ov62_02233310 *param0, UnkStruct_0208C06C *param1, break; case 1: int v16 = param0->unk_28->unk_00[v0].unk_04; - v5 = String_Init(255, HEAP_ID_102); + v5 = String_New(255, HEAP_ID_102); StringTemplate_SetMonthName(v7, 1, v16); break; case 2: u16 v17[255]; int v18 = param0->unk_28->unk_00[v0].unk_04; - v5 = String_Init(255, HEAP_ID_102); + v5 = String_New(255, HEAP_ID_102); MessageLoader_GetSpeciesName(v18, 102, v17); - String_CopyChars(v5, v17); + String_CopyFromChars(v5, v17); StringTemplate_SetString(v7, 1, v5, 0, 1, 2); break; } @@ -1159,9 +1159,9 @@ int ov62_02232C78(UnkStruct_ov62_02233310 *a0, UnkStruct_0208C06C *a1, int a2, i for (i = sp18; i < sp34; i++) { sp54 = MessageLoader_GetNewString(a1->unk_14.unk_34, 88 + a3); - sp50 = String_Init(255, HEAP_ID_102); - r7 = String_Init(255, HEAP_ID_102); - sp48 = String_Init(255, HEAP_ID_102); + sp50 = String_New(255, HEAP_ID_102); + r7 = String_New(255, HEAP_ID_102); + sp48 = String_New(255, HEAP_ID_102); switch (a3) { case 0: int r1 = a0->unk_28->unk_00[i].unk_04; @@ -1170,15 +1170,15 @@ int ov62_02232C78(UnkStruct_ov62_02233310 *a0, UnkStruct_0208C06C *a1, int a2, i break; case 1: int sp30 = a0->unk_28->unk_00[i].unk_04; - sp4c = String_Init(255, HEAP_ID_102); + sp4c = String_New(255, HEAP_ID_102); StringTemplate_SetMonthName(r5, 1, sp30); break; case 2: charcode_t sp6c[255]; int sp2c = a0->unk_28->unk_00[i].unk_04; - sp4c = String_Init(255, HEAP_ID_102); + sp4c = String_New(255, HEAP_ID_102); MessageLoader_GetSpeciesName(sp2c, HEAP_ID_102, sp6c); - String_CopyChars(sp4c, sp6c); + String_CopyFromChars(sp4c, sp6c); StringTemplate_SetString(r5, 1, sp4c, 0, 1, 2); break; } @@ -1299,12 +1299,12 @@ int ov62_02233064(UnkStruct_ov62_02233310 *param0, UnkStruct_0208C06C *param1) } for (v4 = 0; v4 < param0->unk_10; v4++) { - v7 = String_Init(255, HEAP_ID_102); - v8 = String_Init(255, HEAP_ID_102); + v7 = String_New(255, HEAP_ID_102); + v8 = String_New(255, HEAP_ID_102); v9 = MessageLoader_GetNewString(param1->unk_14.unk_34, 99); String_FormatInt(v8, (v5 + v4 + 1), 2, 1, 1); - String_CopyChars(v7, param1->unk_8B4.unk_1D58[v5 + v4]->unk_00.unk_00); + String_CopyFromChars(v7, param1->unk_8B4.unk_1D58[v5 + v4]->unk_00.unk_00); ov62_022349A8(param1, v7); v10 = Font_CalcStringWidth(FONT_SYSTEM, v8, 0); @@ -2029,7 +2029,7 @@ static void ov62_02233B50(UnkStruct_ov62_02233F74 *param0, UnkStruct_0208C06C *p v6 = sub_02030B94(v11, HEAP_ID_102); ov62_022349A8(param1, v6); v7 = MessageLoader_GetNewString(param1->unk_14.unk_34, 7); - v8 = String_Init(255, HEAP_ID_102); + v8 = String_New(255, HEAP_ID_102); StringTemplate_SetString(v9, 0, v6, 0, 1, GAME_LANGUAGE); StringTemplate_Format(v9, v8, v7); @@ -2059,9 +2059,9 @@ static void ov62_02233B50(UnkStruct_ov62_02233F74 *param0, UnkStruct_0208C06C *p if (v13 != 0) { v10 = ¶m0->unk_3C[2]; - v6 = String_Init(255, HEAP_ID_102); + v6 = String_New(255, HEAP_ID_102); v7 = MessageLoader_GetNewString(param1->unk_14.unk_34, 9); - v8 = String_Init(255, HEAP_ID_102); + v8 = String_New(255, HEAP_ID_102); String_FormatInt(v6, v13, 4, 0, 1); StringTemplate_SetString(v9, 0, v6, 0, 1, GAME_LANGUAGE); @@ -2084,9 +2084,9 @@ static void ov62_02233B50(UnkStruct_ov62_02233F74 *param0, UnkStruct_0208C06C *p u64 v14 = sub_0202FE98(param0->unk_04, 4, 0); u64 v15 = v14; u32 v16[3]; - String *v17 = String_Init(255, HEAP_ID_102); - String *v18 = String_Init(255, HEAP_ID_102); - String *v19 = String_Init(255, HEAP_ID_102); + String *v17 = String_New(255, HEAP_ID_102); + String *v18 = String_New(255, HEAP_ID_102); + String *v19 = String_New(255, HEAP_ID_102); v10 = ¶m0->unk_3C[4]; v16[0] = v15 % 100000; @@ -2105,7 +2105,7 @@ static void ov62_02233B50(UnkStruct_ov62_02233F74 *param0, UnkStruct_0208C06C *p } } - v8 = String_Init(255, HEAP_ID_102); + v8 = String_New(255, HEAP_ID_102); String_FormatInt(v17, v16[0], 5, 2, 1); String_FormatInt(v18, v16[1], 5, 2, 1); @@ -2907,7 +2907,7 @@ void ov62_022349A8(UnkStruct_0208C06C *param0, String *param1) String *v1; int v2 = 64; - v1 = String_Init(v2, v0->heapID); + v1 = String_New(v2, v0->heapID); if (Font_AreAllCharsValid(FONT_SYSTEM, param1, v1) == 0) { ov62_022349E4(param1, v0->heapID); diff --git a/src/overlay062/ov62_02237D24.c b/src/overlay062/ov62_02237D24.c index 9534dba9af..dc275928c5 100644 --- a/src/overlay062/ov62_02237D24.c +++ b/src/overlay062/ov62_02237D24.c @@ -1376,10 +1376,10 @@ static void ov62_02239724(UnkStruct_0208C06C *param0) Window_FillTilemap(v0, 0x00); v4 = ov62_02231690(HEAP_ID_102); - v3 = String_Init(255, HEAP_ID_102); + v3 = String_New(255, HEAP_ID_102); v2 = MessageLoader_GetNewString(param0->unk_14.unk_34, 56); - v1 = String_Init(255, HEAP_ID_102); + v1 = String_New(255, HEAP_ID_102); sub_0202A1A0(v5->unk_22C, v1); ov62_022349A8(param0, v1); v6 = sub_0202A1F4(v5->unk_22C); @@ -1388,9 +1388,9 @@ static void ov62_02239724(UnkStruct_0208C06C *param0) StringTemplate_SetCustomMessageWord(v4, 1, v6); StringTemplate_Format(v4, v3, v2); - v7 = String_NumLines(v3); + v7 = String_CountLines(v3); for (v8 = 0; v8 < v7; v8++) { - String_CopyLineNum(v1, v3, v8); + String_CopyLine(v1, v3, v8); v9 = (128 - Font_CalcStringWidth(0, v1, 0)) / 2; Text_AddPrinterWithParamsAndColor(v0, FONT_SYSTEM, v1, v9, 16 * v8, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 13, 0), NULL); } @@ -1425,10 +1425,10 @@ static void ov62_02239854(UnkStruct_0208C06C *param0, int param1) Window_FillTilemap(v0, 0x00); v4 = ov62_02231690(HEAP_ID_102); - v3 = String_Init(255, HEAP_ID_102); + v3 = String_New(255, HEAP_ID_102); v2 = MessageLoader_GetNewString(param0->unk_14.unk_34, 56); - v1 = String_Init(255, HEAP_ID_102); + v1 = String_New(255, HEAP_ID_102); sub_0202A1A0(v5->unk_230.unk_08, v1); ov62_022349A8(param0, v1); v6 = sub_0202A1F4(v5->unk_230.unk_08); @@ -1437,9 +1437,9 @@ static void ov62_02239854(UnkStruct_0208C06C *param0, int param1) StringTemplate_SetCustomMessageWord(v4, 1, v6); StringTemplate_Format(v4, v3, v2); - v7 = String_NumLines(v3); + v7 = String_CountLines(v3); for (v8 = 0; v8 < v7; v8++) { - String_CopyLineNum(v1, v3, v8); + String_CopyLine(v1, v3, v8); v9 = (128 - Font_CalcStringWidth(0, v1, 0)) / 2; Text_AddPrinterWithParamsAndColor(v0, FONT_SYSTEM, v1, v9, 16 * v8, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 13, 0), NULL); } diff --git a/src/overlay062/ov62_02239D60.c b/src/overlay062/ov62_02239D60.c index 268f88910f..03a5a76a68 100644 --- a/src/overlay062/ov62_02239D60.c +++ b/src/overlay062/ov62_02239D60.c @@ -966,11 +966,11 @@ static void ov62_0223AC58(UnkStruct_0208C06C *param0, int param1) v1 = &v0->unk_1B4[2]; v2 = MessageLoader_GetNewString(param0->unk_14.unk_34, v6); - v3 = String_Init(255, HEAP_ID_102); - v4 = String_Init(255, HEAP_ID_102); + v3 = String_New(255, HEAP_ID_102); + v4 = String_New(255, HEAP_ID_102); v5 = ov62_02231690(HEAP_ID_102); - String_CopyChars(v3, v0->unk_38C[param0->unk_14.unk_48C.unk_38.unk_00]->unk_00.unk_00); + String_CopyFromChars(v3, v0->unk_38C[param0->unk_14.unk_48C.unk_38.unk_00]->unk_00.unk_00); ov62_022349A8(param0, v3); StringTemplate_SetString(v5, 0, v3, 0, 1, GAME_LANGUAGE); StringTemplate_Format(v5, v4, v2); @@ -991,9 +991,9 @@ static void ov62_0223AD20(UnkStruct_0208C06C *param0) int v3; v1 = &v0->unk_1B4[1]; - v2 = String_Init(255, HEAP_ID_102); + v2 = String_New(255, HEAP_ID_102); - String_CopyChars(v2, v0->unk_04.unk_00); + String_CopyFromChars(v2, v0->unk_04.unk_00); Window_FillTilemap(v1, Unk_ov62_02248D78[1]); v3 = ov62_0223429C(v1, v2); @@ -1040,14 +1040,14 @@ static void ov62_0223ADC0(UnkStruct_0208C06C *param0, int param1) return; } - v2 = String_Init(255, HEAP_ID_102); + v2 = String_New(255, HEAP_ID_102); if (ov62_0223ADB0(v0->unk_04.unk_154, (1 << v0->unk_1B0)) == 1) { v4 = SPECIES_EGG; } MessageLoader_GetSpeciesName(v4, 102, v5); - String_CopyChars(v2, v5); + String_CopyFromChars(v2, v5); v3 = ov62_0223429C(v1, v2); @@ -1784,12 +1784,12 @@ static void ov62_0223BE7C(UnkStruct_0208C06C *param0) UnkStruct_ov62_02239DBC *v1 = param0->unk_860; for (v0 = 0; v0 < v1->unk_380.unk_08; v0++) { - v1->unk_2E0C[v0][1] = String_Init(20, HEAP_ID_102); - String_CopyChars(v1->unk_2E0C[v0][1], v1->unk_38C[v0]->unk_00.unk_00); + v1->unk_2E0C[v0][1] = String_New(20, HEAP_ID_102); + String_CopyFromChars(v1->unk_2E0C[v0][1], v1->unk_38C[v0]->unk_00.unk_00); ov62_022349A8(param0, v1->unk_2E0C[v0][1]); - v1->unk_2E0C[v0][0] = String_Init(30, HEAP_ID_102); - String_CopyChars(v1->unk_2E0C[v0][0], v1->unk_38C[v0]->unk_80.unk_00); + v1->unk_2E0C[v0][0] = String_New(30, HEAP_ID_102); + String_CopyFromChars(v1->unk_2E0C[v0][0], v1->unk_38C[v0]->unk_80.unk_00); } } diff --git a/src/overlay062/ov62_0223CAEC.c b/src/overlay062/ov62_0223CAEC.c index d1bd436ec9..c829df2956 100644 --- a/src/overlay062/ov62_0223CAEC.c +++ b/src/overlay062/ov62_0223CAEC.c @@ -446,7 +446,7 @@ static void ov62_0223D160(UnkStruct_0208C06C *a0) String *r7; String *sp1c; String *sp18; - String *sp14 = String_Init(0xff, 0x66); + String *sp14 = String_New(0xff, 0x66); StringTemplate *r6 = ov62_02231690(0x66); Window_FillTilemap(&r4->unk_24[0], 0); r7 = (r4->unk_1C == 0) @@ -474,7 +474,7 @@ static void ov62_0223D160(UnkStruct_0208C06C *a0) case 1: int sp24 = sub_02030CCC(r5->unk_88C[0]); r7 = MessageLoader_GetNewString(r5->unk_14.unk_34, 0x56); - sp1c = String_Init(0xff, 0x66); + sp1c = String_New(0xff, 0x66); StringTemplate_SetMonthName(r6, 0, sp24); break; case 2: @@ -485,10 +485,10 @@ static void ov62_0223D160(UnkStruct_0208C06C *a0) sp10 = 0x1ee; } if (sp10) { - sp1c = String_Init(0xff, 0x66); + sp1c = String_New(0xff, 0x66); charcode_t sp2c[0xff]; MessageLoader_GetSpeciesName(sp10, 0x66, sp2c); - String_CopyChars(sp1c, sp2c); + String_CopyFromChars(sp1c, sp2c); } else { sp1c = MessageLoader_GetNewString(r5->unk_14.unk_34, 0x15); } diff --git a/src/overlay062/ov62_0223DFA8.c b/src/overlay062/ov62_0223DFA8.c index 229b7def32..478c6ad05c 100644 --- a/src/overlay062/ov62_0223DFA8.c +++ b/src/overlay062/ov62_0223DFA8.c @@ -245,7 +245,7 @@ static void ov62_0223E0FC(UnkStruct_0208C06C *param0, int param1, int param2) UnkStruct_02030A80 *v6 = v2->unk_194.unk_00; v3 = ov62_02231690(HEAP_ID_102); - v0 = String_Init(255, HEAP_ID_102); + v0 = String_New(255, HEAP_ID_102); v4 = sub_02030B94(v6, HEAP_ID_102); ov62_022349A8(param0, v4); v5 = MessageLoader_GetNewString(param0->unk_14.unk_34, param1); @@ -261,7 +261,7 @@ static void ov62_0223E0FC(UnkStruct_0208C06C *param0, int param1, int param2) UnkStruct_02030A80 *v10 = param0->unk_88C[param2]; v7 = ov62_02231690(HEAP_ID_102); - v0 = String_Init(255, HEAP_ID_102); + v0 = String_New(255, HEAP_ID_102); v8 = sub_02030B94(v10, HEAP_ID_102); ov62_022349A8(param0, v8); v9 = MessageLoader_GetNewString(param0->unk_14.unk_34, param1); @@ -828,7 +828,7 @@ static void ov62_0223EE88(UnkStruct_ov62_022312B0 *param0, UnkStruct_0208C06C *p v4 = MessageLoader_GetNewString(param1->unk_14.unk_34, 7); v5 = sub_02030B94(param1->unk_88C[param2], HEAP_ID_102); ov62_022349A8(param1, v5); - v0 = String_Init(255, HEAP_ID_102); + v0 = String_New(255, HEAP_ID_102); StringTemplate_SetString(v3, 0, v5, 0, 1, GAME_LANGUAGE); StringTemplate_Format(v3, v0, v4); @@ -1671,7 +1671,7 @@ static void ov62_022402FC(UnkStruct_0208C06C *param0, int param1, BOOL param2) UnkStruct_02030A80 *v6 = v2->unk_194.unk_00; v3 = ov62_02231690(HEAP_ID_102); - v0 = String_Init(255, HEAP_ID_102); + v0 = String_New(255, HEAP_ID_102); v4 = sub_02030B94(v6, HEAP_ID_102); ov62_022349A8(param0, v4); v5 = MessageLoader_GetNewString(param0->unk_14.unk_34, param1); diff --git a/src/overlay062/ov62_02241204.c b/src/overlay062/ov62_02241204.c index d6da260d9d..8ad0684808 100644 --- a/src/overlay062/ov62_02241204.c +++ b/src/overlay062/ov62_02241204.c @@ -683,9 +683,9 @@ static void ov62_02241954(UnkStruct_0208C06C *param0, int param1) if (param1 == 0xffff) { v2 = MessageLoader_GetNewString(param0->unk_14.unk_34, 125); } else { - v2 = String_Init(255, HEAP_ID_102); + v2 = String_New(255, HEAP_ID_102); MessageLoader_GetSpeciesName(param1, 102, v3); - String_CopyChars(v2, v3); + String_CopyFromChars(v2, v3); } Text_AddPrinterWithParamsAndColor(v1, FONT_SYSTEM, v2, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 13, 0), NULL); @@ -710,12 +710,12 @@ static void ov62_022419D4(UnkStruct_0208C06C *param0, int param1, int param2) v4 = ov62_02231690(HEAP_ID_102); if (param2 != 0) { - v2 = String_Init(255, HEAP_ID_102); + v2 = String_New(255, HEAP_ID_102); v3 = MessageLoader_GetNewString(param0->unk_14.unk_34, 23); StringTemplate_SetCityName(v4, 0, param1, param2); StringTemplate_Format(v4, v2, v3); } else { - v2 = String_Init(255, HEAP_ID_102); + v2 = String_New(255, HEAP_ID_102); v3 = MessageLoader_GetNewString(param0->unk_14.unk_34, 22); StringTemplate_SetCountryName(v4, 0, param1); StringTemplate_Format(v4, v2, v3); @@ -3021,7 +3021,7 @@ static void ov62_022448E0(UnkStruct_ov62_022312B0 *param0, UnkStruct_0208C06C *p v4 = MessageLoader_GetNewString(param1->unk_14.unk_34, 7); v5 = sub_02030B94(param1->unk_88C[param2], HEAP_ID_102); ov62_022349A8(param1, v5); - v0 = String_Init(255, HEAP_ID_102); + v0 = String_New(255, HEAP_ID_102); StringTemplate_SetString(v3, 0, v5, 0, 1, GAME_LANGUAGE); StringTemplate_Format(v3, v0, v4); String_Free(v4); @@ -3055,7 +3055,7 @@ static void ov62_022449B8(UnkStruct_0208C06C *param0, int param1, BOOL param2) UnkStruct_02030A80 *v6 = v2->unk_80.unk_00; v3 = ov62_02231690(HEAP_ID_102); - v0 = String_Init(255, HEAP_ID_102); + v0 = String_New(255, HEAP_ID_102); v4 = sub_02030B94(v6, HEAP_ID_102); ov62_022349A8(param0, v4); v5 = MessageLoader_GetNewString(param0->unk_14.unk_34, param1); @@ -3087,7 +3087,7 @@ static void ov62_02244AB4(UnkStruct_0208C06C *param0, int param1, int param2) UnkStruct_02030A80 *v6 = v2->unk_80.unk_00; v3 = ov62_02231690(HEAP_ID_102); - v0 = String_Init(255, HEAP_ID_102); + v0 = String_New(255, HEAP_ID_102); v4 = sub_02030B94(v6, HEAP_ID_102); ov62_022349A8(param0, v4); v5 = MessageLoader_GetNewString(param0->unk_14.unk_34, param1); @@ -3103,7 +3103,7 @@ static void ov62_02244AB4(UnkStruct_0208C06C *param0, int param1, int param2) UnkStruct_02030A80 *v10 = param0->unk_88C[param2]; v7 = ov62_02231690(HEAP_ID_102); - v0 = String_Init(255, HEAP_ID_102); + v0 = String_New(255, HEAP_ID_102); v8 = sub_02030B94(v10, HEAP_ID_102); ov62_022349A8(param0, v8); v9 = MessageLoader_GetNewString(param0->unk_14.unk_34, param1); @@ -4592,9 +4592,9 @@ static void ov62_022469A0(UnkStruct_ov62_02241204 *param0, UnkStruct_0208C06C *p u64 v5 = param0->unk_4B0; u64 v6 = v5; u32 v7[3]; - String *v8 = String_Init(255, HEAP_ID_102); - String *v9 = String_Init(255, HEAP_ID_102); - String *v10 = String_Init(255, HEAP_ID_102); + String *v8 = String_New(255, HEAP_ID_102); + String *v9 = String_New(255, HEAP_ID_102); + String *v10 = String_New(255, HEAP_ID_102); v4 = ¶m1->unk_8A4; v7[0] = v6 % 100000; @@ -4603,7 +4603,7 @@ static void ov62_022469A0(UnkStruct_ov62_02241204 *param0, UnkStruct_0208C06C *p v6 /= 100000; v7[2] = v6; v1 = MessageLoader_GetNewString(param1->unk_14.unk_34, 295); - v2 = String_Init(255, HEAP_ID_102); + v2 = String_New(255, HEAP_ID_102); String_FormatInt(v8, v7[0], 5, 2, 1); String_FormatInt(v9, v7[1], 5, 2, 1); diff --git a/src/overlay062/ov62_02246B00.c b/src/overlay062/ov62_02246B00.c index 033091c3b4..2ae5e86537 100644 --- a/src/overlay062/ov62_02246B00.c +++ b/src/overlay062/ov62_02246B00.c @@ -30,7 +30,7 @@ UnkStruct_ov62_02246B00 *ov62_02246B00(int heapID, int param1, int param2[], Opt v1 = Heap_Alloc(heapID, sizeof(UnkStruct_ov62_02246B00)); MI_CpuFill8(v1, 0, sizeof(UnkStruct_ov62_02246B00)); v1->unk_00 = param1; - v1->unk_18 = String_Init(param1 + 1, heapID); + v1->unk_18 = String_New(param1 + 1, heapID); v1->options = options; for (v0 = 0; v0 < 3; v0++) { @@ -313,7 +313,7 @@ void ov62_022470A8(UnkStruct_ov62_02246BF4 *param0) { int v0; u32 v1 = 0; - String *v2 = String_Init(100, HEAP_ID_102); + String *v2 = String_New(100, HEAP_ID_102); param0->unk_2C8 = 1; param0->unk_2CC = 0; diff --git a/src/overlay062/ov62_02247D74.c b/src/overlay062/ov62_02247D74.c index dd4847f588..9b66a4fdc2 100644 --- a/src/overlay062/ov62_02247D74.c +++ b/src/overlay062/ov62_02247D74.c @@ -67,7 +67,7 @@ static void ov62_02247DD8(UnkStruct_0208C06C *param0, int param1, int param2) UnkStruct_02030A80 *v5 = param0->unk_88C[param2]; v2 = ov62_02231690(HEAP_ID_102); - v0 = String_Init(255, HEAP_ID_102); + v0 = String_New(255, HEAP_ID_102); v3 = sub_02030B94(v5, HEAP_ID_102); ov62_022349A8(param0, v3); diff --git a/src/overlay062/ov62_02248408.c b/src/overlay062/ov62_02248408.c index e1d091d817..ae466a7205 100644 --- a/src/overlay062/ov62_02248408.c +++ b/src/overlay062/ov62_02248408.c @@ -37,8 +37,8 @@ void ov62_02248408(BattleRecording *param0, FieldBattleDTO *param1, int heapID) Pokemon *v13; sub_0202F4C0(v1->unk_26, &v2, &v3); - v6 = String_Init(v9, heapID); - v7 = String_Init(v9, heapID); + v6 = String_New(v9, heapID); + v7 = String_New(v9, heapID); v8 = Heap_Alloc(heapID, sizeof(u16) * v9); for (v4 = 0; v4 < v2; v4++) { @@ -50,16 +50,16 @@ void ov62_02248408(BattleRecording *param0, FieldBattleDTO *param1, int heapID) if (v10 == -1) { ov62_0224856C(v7, heapID); - String_ToChars(v7, param1->trainer[v4].name, TRAINER_NAME_LEN + 1); + String_CopyToChars(v7, param1->trainer[v4].name, TRAINER_NAME_LEN + 1); continue; } String_Clear(v6); - String_CopyChars(v6, param1->trainer[v4].name); + String_CopyFromChars(v6, param1->trainer[v4].name); if (Font_AreAllCharsValid(FONT_SYSTEM, v6, v7) == 0) { ov62_0224856C(v7, heapID); - String_ToChars(v7, param1->trainer[v4].name, TRAINER_NAME_LEN + 1); + String_CopyToChars(v7, param1->trainer[v4].name, TRAINER_NAME_LEN + 1); continue; } } @@ -78,7 +78,7 @@ void ov62_02248408(BattleRecording *param0, FieldBattleDTO *param1, int heapID) Pokemon_GetValue(v13, MON_DATA_NICKNAME, v8); String_Clear(v6); - String_CopyChars(v6, v8); + String_CopyFromChars(v6, v8); if (Font_AreAllCharsValid(FONT_SYSTEM, v6, v7) == 0) { Pokemon_SetValue(v13, MON_DATA_SPECIES_NAME, NULL); diff --git a/src/overlay064/ov64_0222DCE0.c b/src/overlay064/ov64_0222DCE0.c index cfaddb8c07..f8d02765b8 100644 --- a/src/overlay064/ov64_0222DCE0.c +++ b/src/overlay064/ov64_0222DCE0.c @@ -722,8 +722,8 @@ static void ov64_0222DFD0(UnkStruct_ov64_0222DFD0 *param0) static void ov64_0222E040(UnkStruct_ov64_0222E060 *param0, void *param1, u32 heapID) { param0->saveData = param1; - param0->unk_2C.unk_00 = String_Init(128, heapID); - param0->unk_2C.unk_04 = String_Init(128, heapID); + param0->unk_2C.unk_00 = String_New(128, heapID); + param0->unk_2C.unk_04 = String_New(128, heapID); } static void ov64_0222E060(UnkStruct_ov64_0222E060 *param0) @@ -1030,8 +1030,8 @@ static void ov64_0222E620(UnkStruct_ov64_0222E21C *param0, const UnkStruct_ov64_ Window_Init(¶m0->unk_220); Window_Add(param0->unk_00, ¶m0->unk_220, Unk_ov64_02232258[1], 1, 0, 24, 3, 7, (1 + 9) + (18 + 12)); - param0->unk_230 = String_Init(128, heapID); - param0->unk_234 = String_Init(128, heapID); + param0->unk_230 = String_New(128, heapID); + param0->unk_234 = String_New(128, heapID); } static void ov64_0222E6B4(UnkStruct_ov64_0222E21C *param0) @@ -1282,7 +1282,7 @@ static int ov64_0222EA70(UnkStruct_ov64_0222F038 *param0, UnkStruct_ov64_0222E06 v2 = TrainerInfo_New(heapID); - TrainerInfo_SetName(v2, String_GetData(param1->unk_2C.unk_00)); + TrainerInfo_SetName(v2, String_GetChars(param1->unk_2C.unk_00)); StringTemplate_SetPlayerName(param2->unk_214, 0, v2); Heap_Free(v2); @@ -1390,11 +1390,11 @@ static void ov64_0222EC94(UnkStruct_ov64_0222F038 *param0, UnkStruct_ov64_0222E0 Window_FillTilemap(¶m0->unk_04, 0); Window_FillTilemap(¶m0->unk_1C, 0); - param0->unk_38 = String_Init(128, heapID); + param0->unk_38 = String_New(128, heapID); param0->unk_34 = Options_TextFrameDelay(SaveData_GetOptions(param1->saveData)); - String *string = String_Init(128, heapID); - String *fmtString = String_Init(128, heapID); + String *string = String_New(128, heapID); + String *fmtString = String_New(128, heapID); StringTemplate_SetPlayerName(param2->unk_214, 0, SaveData_GetTrainerInfo(param1->saveData)); @@ -1514,7 +1514,7 @@ static void ov64_0222EF64(UnkStruct_ov64_0222F038 *param0, UnkStruct_ov64_0222E2 static void ov64_0222EFBC(UnkStruct_ov64_0222F038 *param0, UnkStruct_ov64_0222E21C *param1, u32 param2, u32 heapID) { - String *v0 = String_Init(128, heapID); + String *v0 = String_New(128, heapID); Window_FillTilemap(¶m0->unk_1C, 15); MessageLoader_GetString(param1->unk_218, param2, v0); @@ -1797,7 +1797,7 @@ static void ov64_0222F414(UnkStruct_ov64_0222F0C4 *param0, UnkStruct_ov64_0222E0 Window_Add(param2->unk_00, ¶m0->unk_B4, BG_LAYER_MAIN_1, 13, 21, 8, 3, 7, 112); Window_FillTilemap(¶m0->unk_B4, 0); - String *string = String_Init(128, heapID); + String *string = String_New(128, heapID); MessageLoader_GetString(param2->unk_218, 7, string); Text_AddPrinterWithParamsAndColor(¶m0->unk_B4, FONT_SYSTEM, string, Font_CalcCenterAlignment(FONT_SYSTEM, string, 0, 64), 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL); String_Free(string); @@ -1817,7 +1817,7 @@ static void ov64_0222F414(UnkStruct_ov64_0222F0C4 *param0, UnkStruct_ov64_0222E0 Window_Add(param2->unk_00, ¶m0->unk_C4, BG_LAYER_MAIN_1, 2, 19, 27, 4, 7, 256); Window_FillTilemap(¶m0->unk_C4, 15); - param0->unk_D4 = String_Init(128, heapID); + param0->unk_D4 = String_New(128, heapID); Unk_ov64_022322B4.list = param2->unk_04; Unk_ov64_022322B4.resourceData = ¶m2->unk_23C; @@ -2232,7 +2232,7 @@ static void ov64_0222FE70(UnkStruct_ov64_0222F0C4 *param0, UnkStruct_ov64_0222E2 Window_FillTilemap(¶m0->unk_C4, 15); - v0 = String_Init(128, heapID); + v0 = String_New(128, heapID); MessageLoader_GetString(param1->unk_218, param2, v0); StringTemplate_Format(param1->unk_214, param0->unk_D4, v0); @@ -2439,9 +2439,9 @@ static void ov64_022302EC(UnkStruct_ov64_02230074 *param0, UnkStruct_ov63_0222AE v4 = ((Unk_ov64_02232324[param4].unk_00.unk_00) * 8) + 0; v5 = ((Unk_ov64_02232324[param4].unk_00.unk_02) * 8) + -24; - v3 = String_Init(128, heapID); + v3 = String_New(128, heapID); - String_CopyChars(v3, sub_0202AEF0(param5, param6)); + String_CopyFromChars(v3, sub_0202AEF0(param5, param6)); Text_AddPrinterWithParamsAndColor(¶m0->unk_08, FONT_SYSTEM, v3, v4, v5, TEXT_SPEED_NO_TRANSFER, v6[v0], NULL); String_Free(v3); } @@ -2560,7 +2560,7 @@ static NamingScreenArgs *ov64_022305DC(UnkStruct_ov64_02230444 *param0, UnkStruc if (param1->unk_34.unk_04 == 1) { { if (IsFullWidthChar(*param1->unk_34.unk_00) == 0) { - String_CopyChars(v0->textInputStr, param1->unk_34.unk_00); + String_CopyFromChars(v0->textInputStr, param1->unk_34.unk_00); } else { String_Clear(v0->textInputStr); } @@ -2613,8 +2613,8 @@ static void ov64_02230680(UnkStruct_ov64_02230620 *param0, UnkStruct_ov64_0222E0 Window_FillTilemap(¶m0->unk_00, 0); Window_FillTilemap(¶m0->unk_10, 0); - String *string = String_Init(128, heapID); - String *fmtString = String_Init(128, heapID); + String *string = String_New(128, heapID); + String *fmtString = String_New(128, heapID); u64 friendCode = DWC_CreateFriendKey(WiFiList_GetUserData(SaveData_GetWiFiList(param1->saveData))); if (friendCode) { @@ -3111,8 +3111,8 @@ static void ov64_02231164(UnkStruct_ov64_02230F98 *param0, UnkStruct_ov64_0222E0 { WiFiList *wifiList = SaveData_GetWiFiList(param1->saveData); - String *string = String_Init(128, heapID); - String *fmtString = String_Init(128, heapID); + String *string = String_New(128, heapID); + String *fmtString = String_New(128, heapID); ov64_022320B8(param0, 0, 0, param1, param2, 14, 0, 4, TEXT_COLOR(1, 2, 0), string, fmtString, 0); @@ -3183,8 +3183,8 @@ static void ov64_02231528(UnkStruct_ov64_02230F98 *param0, UnkStruct_ov64_0222E0 { BattleFrontier *frontier = SaveData_GetBattleFrontier(param1->saveData); - String *string = String_Init(128, heapID); - String *fmtString = String_Init(128, heapID); + String *string = String_New(128, heapID); + String *fmtString = String_New(128, heapID); ov64_022320B8(param0, 2, 0, param1, param2, 25, 0, 8, TEXT_COLOR(1, 2, 0), string, fmtString, 0); @@ -3213,8 +3213,8 @@ static void ov64_02231664(UnkStruct_ov64_02230F98 *param0, UnkStruct_ov64_0222E0 { BattleFrontier *frontier = SaveData_GetBattleFrontier(param1->saveData); - String *string = String_Init(128, heapID); - String *fmtString = String_Init(128, heapID); + String *string = String_New(128, heapID); + String *fmtString = String_New(128, heapID); ov64_022320B8(param0, 3, 0, param1, param2, 26, 0, 0, TEXT_COLOR(1, 2, 0), string, fmtString, 0); @@ -3279,8 +3279,8 @@ static void ov64_02231A00(UnkStruct_ov64_02230F98 *param0, UnkStruct_ov64_0222E0 { BattleFrontier *frontier = SaveData_GetBattleFrontier(param1->saveData); - String *string = String_Init(128, heapID); - String *fmtString = String_Init(128, heapID); + String *string = String_New(128, heapID); + String *fmtString = String_New(128, heapID); ov64_022320B8(param0, 4, 0, param1, param2, 27, 0, 0, TEXT_COLOR(1, 2, 0), string, fmtString, 0); ov64_022320B8(param0, 4, 0, param1, param2, 36, 224, 20, TEXT_COLOR(1, 2, 0), string, fmtString, 2); @@ -3318,8 +3318,8 @@ static void ov64_02231BE0(UnkStruct_ov64_02230F98 *param0, UnkStruct_ov64_0222E0 { BattleFrontier *frontier = SaveData_GetBattleFrontier(param1->saveData); - String *string = String_Init(128, heapID); - String *fmtString = String_Init(128, heapID); + String *string = String_New(128, heapID); + String *fmtString = String_New(128, heapID); ov64_022320B8(param0, 5, 0, param1, param2, 28, 0, 0, TEXT_COLOR(1, 2, 0), string, fmtString, 0); @@ -3354,8 +3354,8 @@ static void ov64_02231D58(UnkStruct_ov64_02230F98 *param0, UnkStruct_ov64_0222E0 { BattleFrontier *frontier = SaveData_GetBattleFrontier(param1->saveData); - String *string = String_Init(128, heapID); - String *fmtString = String_Init(128, heapID); + String *string = String_New(128, heapID); + String *fmtString = String_New(128, heapID); ov64_022320B8(param0, 6, 0, param1, param2, 29, 0, 0, TEXT_COLOR(1, 2, 0), string, fmtString, 0); @@ -3387,8 +3387,8 @@ static void ov64_02231E94(UnkStruct_ov64_02230F98 *param0, UnkStruct_ov64_0222E0 BattleFrontier *unused = SaveData_GetBattleFrontier(param1->saveData); WiFiList *wifiList = SaveData_GetWiFiList(param1->saveData); - String *string = String_Init(128, heapID); - String *fmtString = String_Init(128, heapID); + String *string = String_New(128, heapID); + String *fmtString = String_New(128, heapID); ov64_022320B8(param0, 1, 0, param1, param2, 43, 0, 0, TEXT_COLOR(1, 2, 0), string, fmtString, 0); diff --git a/src/overlay065/ov65_0222DCE0.c b/src/overlay065/ov65_0222DCE0.c index 0f8b14d90e..b3739259c6 100644 --- a/src/overlay065/ov65_0222DCE0.c +++ b/src/overlay065/ov65_0222DCE0.c @@ -1399,10 +1399,10 @@ static void ov65_0222EBE0(UnkStruct_ov65_0222EBE0 *param0) int v0; int v1; - param0->unk_174 = String_Init(190 * 2, HEAP_ID_54); - param0->unk_17C = String_Init(190 * 2, HEAP_ID_54); - param0->unk_170 = String_Init(190 * 2, HEAP_ID_54); - param0->unk_178 = String_Init(90 * 2, HEAP_ID_54); + param0->unk_174 = String_New(190 * 2, HEAP_ID_54); + param0->unk_17C = String_New(190 * 2, HEAP_ID_54); + param0->unk_170 = String_New(190 * 2, HEAP_ID_54); + param0->unk_178 = String_New(90 * 2, HEAP_ID_54); param0->unk_3A8 = 0; } @@ -2264,7 +2264,7 @@ static void ov65_0222FD70(UnkStruct_ov65_0222EBE0 *param0) v0 = TEXT_COLOR(3, 4, 0); } - String_CopyChars(param0->unk_170, sub_0202AEF0(param0->unk_00, ov4_021D2388())); + String_CopyFromChars(param0->unk_170, sub_0202AEF0(param0->unk_00, ov4_021D2388())); } } else { MessageLoader_GetString(param0->unk_168, v3, param0->unk_170); @@ -5916,7 +5916,7 @@ static void ov65_02234A68(UnkStruct_ov65_0222EBE0 *param0, NARC *param1, u32 hea Window_Init(&v3); Window_AddToTopLeftCorner(param0->unk_15C, &v3, 8, 2, 0, 0); - v4 = String_Init(64, heapID); + v4 = String_New(64, heapID); MessageLoader_GetString(param0->unk_168, 73, v4); { diff --git a/src/overlay065/ov65_0223648C.c b/src/overlay065/ov65_0223648C.c index 527bea65ea..a1917b1771 100644 --- a/src/overlay065/ov65_0223648C.c +++ b/src/overlay065/ov65_0223648C.c @@ -3,6 +3,7 @@ #include #include +#include "constants/heap.h" #include "generated/journal_online_events.h" #include "struct_defs/struct_0207DE04.h" @@ -784,8 +785,8 @@ static void ov65_02236C10(UnkStruct_ov65_02236840 *param0, const UnkStruct_0207D { param0->unk_04 = StringTemplate_Default(heapID); param0->unk_08 = MessageLoader_Init(MSG_LOADER_PRELOAD_ENTIRE_BANK, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_UNK_0674, heapID); - param0->unk_0C = String_Init(256, heapID); - param0->unk_10 = String_Init(256, heapID); + param0->unk_0C = String_New(256, heapID); + param0->unk_10 = String_New(256, heapID); param0->unk_14 = 0xff; param0->unk_16 = Options_TextFrameDelay(SaveData_GetOptions(param1->saveData)); } @@ -893,7 +894,7 @@ static void ov65_02236E50(UnkStruct_ov65_02236840 *param0, const UnkStruct_0207D } Window_FillTilemap(¶m0->unk_1F0, 15); - v0 = String_Init(256, heapID); + v0 = String_New(256, heapID); MessageLoader_GetString(param0->unk_08, param2, v0); StringTemplate_Format(param0->unk_04, param0->unk_0C, v0); @@ -950,8 +951,8 @@ static void ov65_02236F38(UnkStruct_ov65_02236840 *param0) static void ov65_02236F70(UnkStruct_ov65_02236840 *param0, const UnkStruct_0207DE04 *param1, int param2, u32 heapID) { - String *v0 = String_Init(256, heapID); - String *v1 = String_Init(256, heapID); + String *v0 = String_New(256, heapID); + String *v1 = String_New(256, heapID); ov65_0223726C(param0, param1, param2, 0, heapID); ov65_02237284(param0, param1, param2, 1, heapID); @@ -996,15 +997,17 @@ static void ov65_02237034(UnkStruct_ov65_022367A8 *param0, const UnkStruct_0207D } } -static void ov65_0223709C(UnkStruct_ov65_022367A8 *param0, UnkStruct_ov65_02236840 *param1, const UnkStruct_0207DE04 *param2, int param3, u32 heapID) +static void ov65_0223709C(UnkStruct_ov65_022367A8 *param0, UnkStruct_ov65_02236840 *param1, const UnkStruct_0207DE04 *param2, int param3, u32 _heapID) { String *v0; String *v1; u8 v2; u8 v3; - v0 = String_Init(256, heapID); - v1 = String_Init(256, heapID); + enum HeapID heapID = _heapID; // For matching + + v0 = String_New(256, heapID); + v1 = String_New(256, heapID); ov65_0223726C(param1, param2, param3, 0, heapID); diff --git a/src/overlay066/ov66_0222DDF0.c b/src/overlay066/ov66_0222DDF0.c index 928d6a9789..e5c1576278 100644 --- a/src/overlay066/ov66_0222DDF0.c +++ b/src/overlay066/ov66_0222DDF0.c @@ -994,8 +994,8 @@ void ov66_0222E640(const UnkStruct_ov66_0222E71C *param0, TrainerInfo *param1, u String *v2; String *v3; - v3 = String_Init((7 + 1) * 4, heapID); - v2 = String_Init((7 + 1) * 4, heapID); + v3 = String_New((7 + 1) * 4, heapID); + v2 = String_New((7 + 1) * 4, heapID); TrainerInfo_NameString(param1, v2); v0 = Font_AreAllCharsValid(FONT_SYSTEM, v2, v3); @@ -2294,8 +2294,8 @@ static void ov66_0222F7C8(UnkStruct_ov66_0222F6C4 *param0, SaveData *saveData, u v5 = TrainerInfo_NameNewString(v0, heapID); - String_ToChars(v5, param0->unk_20.unk_08, 7 + 1); - String_ToChars(v5, param0->unk_00, 7 + 1); + String_CopyToChars(v5, param0->unk_20.unk_08, 7 + 1); + String_CopyToChars(v5, param0->unk_00, 7 + 1); String_Free(v5); } diff --git a/src/overlay066/ov66_0223177C.c b/src/overlay066/ov66_0223177C.c index 9e86cb7d63..95df51548f 100644 --- a/src/overlay066/ov66_0223177C.c +++ b/src/overlay066/ov66_0223177C.c @@ -580,7 +580,7 @@ static void ov66_02231E94(UnkStruct_ov66_02231E94 *param0, u32 heapID) for (v0 = 0; v0 < 8; v0++) { for (v1 = 0; v1 < 4; v1++) { - param0->unk_00[v0].unk_10[v1] = String_Init((7 + 1), heapID); + param0->unk_00[v0].unk_10[v1] = String_New((7 + 1), heapID); } } diff --git a/src/overlay067/ov67_0225C700.c b/src/overlay067/ov67_0225C700.c index 85de02b238..9bed4bfcf6 100644 --- a/src/overlay067/ov67_0225C700.c +++ b/src/overlay067/ov67_0225C700.c @@ -608,12 +608,13 @@ static void ov67_0225D17C(UnkStruct_ov67_0225D154 *param0) Bg_RunScheduledUpdates(param0->unk_0C); } -static void ov67_0225D188(UnkStruct_ov67_0225D210 *param0, BgConfig *param1, u32 param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8, SaveData *saveData, u32 heapID) +static void ov67_0225D188(UnkStruct_ov67_0225D210 *param0, BgConfig *param1, u32 param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8, SaveData *saveData, u32 _heapID) { + enum HeapID heapID = _heapID; // For matching param0->unk_00 = StringTemplate_Default(heapID); param0->unk_04 = MessageLoader_Init(MSG_LOADER_PRELOAD_ENTIRE_BANK, NARC_INDEX_MSGDATA__PL_MSG, param3, heapID); - param0->unk_18 = String_Init(256, heapID); - param0->unk_1C = String_Init(256, heapID); + param0->unk_18 = String_New(256, heapID); + param0->unk_1C = String_New(256, heapID); param0->unk_20 = param2; param0->unk_28 = Options_TextFrameDelay(SaveData_GetOptions(saveData)); param0->unk_2C = 0; diff --git a/src/overlay068/ov68_0225C700.c b/src/overlay068/ov68_0225C700.c index b20418c1a0..a412508f37 100644 --- a/src/overlay068/ov68_0225C700.c +++ b/src/overlay068/ov68_0225C700.c @@ -556,8 +556,8 @@ static void ov68_0225CB70(UnkStruct_ov68_0225CB70 *param0, UnkStruct_ov66_0222DF } param0->unk_24 = StringTemplate_Default(heapID); - param0->unk_28 = String_Init(256, heapID); - param0->unk_2C = String_Init(256, heapID); + param0->unk_28 = String_New(256, heapID); + param0->unk_2C = String_New(256, heapID); } static void ov68_0225CBC0(UnkStruct_ov68_0225CB70 *param0) @@ -880,7 +880,7 @@ static void ov68_0225D128(UnkStruct_ov68_0225D128 *param0, UnkStruct_ov68_0225C9 Window_Add(param1->unk_00, ¶m0->unk_08, 1, 2, 19, 27, 4, 4, (1 + (18 + 12)) + 9); Window_FillTilemap(¶m0->unk_08, 15); - param0->unk_18 = String_Init(256, heapID); + param0->unk_18 = String_New(256, heapID); param0->unk_04 = Options_TextFrameDelay(SaveData_GetOptions(saveData)); } @@ -1412,10 +1412,10 @@ static void ov68_0225DB8C(UnkStruct_ov68_0225DB8C *param0, BOOL param1, u32 heap u16 *v2; int v3; - param0->unk_10 = String_Init(256, heapID); + param0->unk_10 = String_New(256, heapID); for (v3 = 0; v3 < 3; v3++) { - param0->unk_14[v3] = String_Init(256, heapID); + param0->unk_14[v3] = String_New(256, heapID); } if (param1 == 1) { @@ -1434,12 +1434,12 @@ static void ov68_0225DB8C(UnkStruct_ov68_0225DB8C *param0, BOOL param1, u32 heap if (param0->unk_0C == 1) { v2 = ov66_02233538(v1 + UnkEnum_ov66_02233538_00); GF_ASSERT(v2); - String_CopyChars(param0->unk_10, v2); + String_CopyFromChars(param0->unk_10, v2); for (v3 = 0; v3 < 3; v3++) { v2 = ov66_02233538(v1 + UnkEnum_ov66_02233538_01 + v3); GF_ASSERT(v2); - String_CopyChars(param0->unk_14[v3], v2); + String_CopyFromChars(param0->unk_14[v3], v2); } } } diff --git a/src/overlay069/ov69_0225C700.c b/src/overlay069/ov69_0225C700.c index 5e7990bccc..26768af18e 100644 --- a/src/overlay069/ov69_0225C700.c +++ b/src/overlay069/ov69_0225C700.c @@ -1903,7 +1903,7 @@ static void ov69_0225DD60(UnkStruct_ov69_0225DDC8 *param0, UnkStruct_ov69_0225D3 memset(param0, 0, sizeof(UnkStruct_ov69_0225DC48)); param0->unk_08 = Options_TextFrameDelay(SaveData_GetOptions(saveData)); - param0->unk_0C = String_Init(128, heapID); + param0->unk_0C = String_New(128, heapID); Window_Add(param1->unk_00, ¶m0->unk_10, 1, 2, 1, 27, 4, 1, ((1 + (18 + 12)) + 9) + (6 * 2)); Window_FillTilemap(¶m0->unk_10, 15); @@ -2859,8 +2859,8 @@ static void ov69_0225EF1C(UnkStruct_ov69_0225EF54 *param0, u32 heapID) { param0->unk_00 = MessageLoader_Init(MSG_LOADER_PRELOAD_ENTIRE_BANK, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_UNK_0696, heapID); param0->unk_04 = StringTemplate_New(8, 64, heapID); - param0->unk_08 = String_Init(128, heapID); - param0->unk_0C = String_Init(128, heapID); + param0->unk_08 = String_New(128, heapID); + param0->unk_0C = String_New(128, heapID); } static void ov69_0225EF54(UnkStruct_ov69_0225EF54 *param0) diff --git a/src/overlay070/ov70_0225D9A4.c b/src/overlay070/ov70_0225D9A4.c index 33c612f565..d262599926 100644 --- a/src/overlay070/ov70_0225D9A4.c +++ b/src/overlay070/ov70_0225D9A4.c @@ -1496,7 +1496,7 @@ static void ov70_0225E9C8(UnkStruct_ov70_0225E9C8 *param0, UnkStruct_ov70_0225E4 Window_Add(param1->unk_00, ¶m0->unk_00, Unk_ov70_0226D5CC[0], 2, 19, 27, 4, 4, ((1 + (18 + 12)) + ((18 + 12) + 24)) + 9); Window_FillTilemap(¶m0->unk_00, 15); - param0->unk_18 = String_Init(384, heapID); + param0->unk_18 = String_New(384, heapID); param0->unk_14 = Options_TextFrameDelay(SaveData_GetOptions(saveData)); } @@ -1948,8 +1948,8 @@ static void ov70_0225F208(UnkStruct_ov70_0225F208 *param0, u32 heapID) param0->unk_04[v0] = MessageLoader_Init(MSG_LOADER_LOAD_ON_DEMAND, NARC_INDEX_MSGDATA__PL_MSG, v1[v0], heapID); } - param0->unk_14 = String_Init(480, heapID); - param0->unk_18 = String_Init(480, heapID); + param0->unk_14 = String_New(480, heapID); + param0->unk_18 = String_New(480, heapID); } static void ov70_0225F25C(UnkStruct_ov70_0225F208 *param0) diff --git a/src/overlay072/ov72_0223D7A0.c b/src/overlay072/ov72_0223D7A0.c index f4c8db8bcf..633b362dcb 100644 --- a/src/overlay072/ov72_0223D7A0.c +++ b/src/overlay072/ov72_0223D7A0.c @@ -386,14 +386,14 @@ static void ov72_0223DB98(UnkStruct_ov72_0223DB98 *param0) int v0; for (v0 = 0; v0 < 5; v0++) { - param0->unk_18[v0] = String_Init(7 + 1, HEAP_ID_39); + param0->unk_18[v0] = String_New(7 + 1, HEAP_ID_39); param0->unk_4391[v0].unk_10_4 = 0; param0->unk_43E6[v0].unk_02 = 0; } - param0->unk_2C = String_Init(10 * 2, HEAP_ID_39); - param0->unk_30 = String_Init(20 * 2, HEAP_ID_39); - param0->unk_34 = String_Init(40 * 2, HEAP_ID_39); + param0->unk_2C = String_New(10 * 2, HEAP_ID_39); + param0->unk_30 = String_New(20 * 2, HEAP_ID_39); + param0->unk_34 = String_New(40 * 2, HEAP_ID_39); param0->unk_437E = 0; param0->unk_370 = 1; @@ -1090,7 +1090,7 @@ static void ov72_0223E914(UnkStruct_ov72_0223DB98 *param0) static void ov72_0223E930(UnkStruct_ov72_0223DB98 *param0, int param1) { - String *v0 = String_Init(40 * 2, HEAP_ID_39); + String *v0 = String_New(40 * 2, HEAP_ID_39); MessageLoader_GetString(param0->unk_14, param1, v0); StringTemplate_Format(param0->unk_10, param0->unk_34, v0); diff --git a/src/overlay075/ov75_021D0D80.c b/src/overlay075/ov75_021D0D80.c index 6ac4f2b6ba..a57a8d46a7 100644 --- a/src/overlay075/ov75_021D0D80.c +++ b/src/overlay075/ov75_021D0D80.c @@ -258,7 +258,7 @@ static int ov75_021D0FA0(UnkStruct_ov75_021D1184 *param0) Window_DrawMessageBoxWithScrollCursor(¶m0->unk_44[5], 1, 1 + 9, UnkEnum_ov75_021D1598_06); Window_FillTilemap(&(param0->unk_44[5]), (15 << 4) | 15); - v0 = String_Init(19 * 2 * 2, param0->heapID); + v0 = String_New(19 * 2 * 2, param0->heapID); MessageLoader_GetString(param0->unk_20, 2, v0); Text_AddPrinterWithParamsAndColor(¶m0->unk_44[5], FONT_MESSAGE, v0, 0, 0, TEXT_SPEED_INSTANT, TEXT_COLOR(1, 2, 15), NULL); @@ -316,7 +316,7 @@ static int ov75_021D108C(UnkStruct_ov75_021D1184 *param0) Window_DrawMessageBoxWithScrollCursor(¶m0->unk_44[5], 1, 1 + 9, UnkEnum_ov75_021D1598_06); Window_FillTilemap(&(param0->unk_44[5]), (15 << 4) | 15); - v1 = String_Init(19 * 2 * 2, param0->heapID); + v1 = String_New(19 * 2 * 2, param0->heapID); MessageLoader_GetString(param0->unk_20, 3, v1); param0->unk_0F = Text_AddPrinterWithParamsAndColor(¶m0->unk_44[5], FONT_MESSAGE, v1, 0, 0, param0->unk_10, TEXT_COLOR(1, 2, 15), NULL); @@ -821,7 +821,7 @@ static void ov75_021D19C8(UnkStruct_ov75_021D1184 *param0) param0->unk_20 = MessageLoader_Init(MSG_LOADER_LOAD_ON_DEMAND, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_UNK_0409, param0->heapID); - v2 = String_Init(8 * 2, param0->heapID); + v2 = String_New(8 * 2, param0->heapID); for (v0 = 0; v0 < 2; v0++) { String_Clear(v2); diff --git a/src/overlay076/ov76_0223B870.c b/src/overlay076/ov76_0223B870.c index 56bfb8cc0f..bec0f2ed76 100644 --- a/src/overlay076/ov76_0223B870.c +++ b/src/overlay076/ov76_0223B870.c @@ -986,7 +986,7 @@ void ov76_0223CC8C(UnkStruct_ov76_0223DE00 *param0) Window_FillTilemap(v5, 0x0); - v4 = String_Init(100, HEAP_ID_53); + v4 = String_New(100, HEAP_ID_53); v3 = SealCase_GetSealCount(param0->unk_64, v2 - 1); String_FormatInt(v4, v3, 3, 1, 1); @@ -1015,7 +1015,7 @@ void ov76_0223CD20(UnkStruct_ov76_0223DE00 *param0, int param1) Window_FillTilemap(v5, 0x0); - v4 = String_Init(100, HEAP_ID_53); + v4 = String_New(100, HEAP_ID_53); v3 = SealCase_GetSealCount(param0->unk_64, v2 - 1); String_FormatInt(v4, v3, 3, 1, 1); diff --git a/src/overlay083/ov83_0223C958.c b/src/overlay083/ov83_0223C958.c index 08fa15732e..882ec86e15 100644 --- a/src/overlay083/ov83_0223C958.c +++ b/src/overlay083/ov83_0223C958.c @@ -380,7 +380,7 @@ static void ov83_0223CF2C(UnkStruct_ov83_0223B784 *param0) param0->unk_15E0.unk_00 = MessageLoader_Init(MSG_LOADER_PRELOAD_ENTIRE_BANK, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_POFFIN_MAKING, param0->heapID); param0->unk_15E0.unk_04 = StringTemplate_New(4, 64, param0->heapID); - param0->unk_15E0.unk_08 = String_Init(64, param0->heapID); + param0->unk_15E0.unk_08 = String_New(64, param0->heapID); param0->unk_15E0.unk_0C = MessageLoader_GetNewString(param0->unk_15E0.unk_00, 0); param0->unk_15E0.unk_10 = MessageLoader_GetNewString(param0->unk_15E0.unk_00, 1); param0->unk_15E0.unk_14 = MessageLoader_GetNewString(param0->unk_15E0.unk_00, 2); diff --git a/src/overlay085/ov85_02241440.c b/src/overlay085/ov85_02241440.c index 33ad44bced..e62db0f152 100644 --- a/src/overlay085/ov85_02241440.c +++ b/src/overlay085/ov85_02241440.c @@ -534,7 +534,7 @@ static void ov85_0224198C(UnkStruct_ov85_022417E4 *param0) FontSpecialChars_DrawPartyScreenLevelText(param0->unk_CC, 2, v0, 0, 5); v1 = MessageLoader_GetNewString(param0->unk_C4, 6); - v2 = String_Init((2 + 1) * 2, HEAP_ID_36); + v2 = String_New((2 + 1) * 2, HEAP_ID_36); StringTemplate_SetNumber(param0->unk_C8, 0, param0->unk_1F8->unk_08 + 1, 2, 2, 1); StringTemplate_Format(param0->unk_C8, v2, v1); @@ -630,7 +630,7 @@ static void ov85_02241B9C(UnkStruct_ov85_022417E4 *param0) v3 = BerryData_GetAttribute(param0->unk_1FC, 0); v3 = (((v3 * 1000) / 254 + 5) / 10); v1 = MessageLoader_GetNewString(param0->unk_C4, 9); - v2 = String_Init(32, HEAP_ID_36); + v2 = String_New(32, HEAP_ID_36); StringTemplate_SetNumber(param0->unk_C8, 0, v3 / 10, 2, 0, 1); StringTemplate_SetNumber(param0->unk_C8, 1, v3 % 10, 1, 0, 1); diff --git a/src/overlay088/ov88_0223B140.c b/src/overlay088/ov88_0223B140.c index b6ef6ff8fe..37177dc0c1 100644 --- a/src/overlay088/ov88_0223B140.c +++ b/src/overlay088/ov88_0223B140.c @@ -1266,7 +1266,7 @@ static int ov88_0223C800(int param0, Pokemon *param1, u8 *param2, PokemonSpriteT static void ov88_0223C860(Window *param0, Party *param1, int param2, int param3, int param4) { - String *v0 = String_Init(20, HEAP_ID_26); + String *v0 = String_New(20, HEAP_ID_26); Pokemon_GetValue(Party_GetPokemonBySlotIndex(param1, param2), MON_DATA_NICKNAME_STRING, v0); Window_FillTilemap(param0, 0); @@ -1332,7 +1332,7 @@ static void ov88_0223C8D8(Window *param0, int param1, Party *param2, int param3, } if (!param4->unk_6F4[param1 * 6 + param3].unk_05) { - v0 = String_Init(10, HEAP_ID_26); + v0 = String_New(10, HEAP_ID_26); Window_FillTilemap(¶m0[28 + param1], 0); MessageLoader_GetString(param4->unk_184, 41, v0); ov88_0223EC78(¶m0[28 + param1], v0, 9, TEXT_SPEED_NO_TRANSFER, 6, 0); @@ -1350,7 +1350,7 @@ static void ov88_0223C8D8(Window *param0, int param1, Party *param2, int param3, item = Pokemon_GetValue(Party_GetPokemonBySlotIndex(param2, param3), MON_DATA_HELD_ITEM, NULL); Window_FillTilemap(¶m0[32 + param1], 0); - v1 = String_Init(20, HEAP_ID_26); + v1 = String_New(20, HEAP_ID_26); Item_LoadName(v1, item, HEAP_ID_26); ov88_0223EC78(¶m0[32 + param1], v1, 9, TEXT_SPEED_INSTANT, 3, 0); String_Free(v1); @@ -1885,12 +1885,12 @@ static int ov88_0223D69C(UnkStruct_02095E80 *param0) { MessageLoader *v3; - String *v4 = String_Init(100, HEAP_ID_26); + String *v4 = String_New(100, HEAP_ID_26); int v5 = 0; for (v5 = 0; v5 < 32; v5++) { if (sub_0202AF78(param0->unk_36EC, v5)) { - String_CopyChars(v4, sub_0202AEF0(param0->unk_36EC, v5)); + String_CopyFromChars(v4, sub_0202AEF0(param0->unk_36EC, v5)); StringList_AddFromString(param0->unk_36D4, v4, v5); } } diff --git a/src/overlay090/ov90_021D0D80.c b/src/overlay090/ov90_021D0D80.c index 284fa297fb..44c453b36d 100644 --- a/src/overlay090/ov90_021D0D80.c +++ b/src/overlay090/ov90_021D0D80.c @@ -597,7 +597,7 @@ static void ov90_021D13D8(UnkStruct_ov90_021D0ECC *param0) param0->unk_28.unk_00 = MessageLoader_Init(MSG_LOADER_PRELOAD_ENTIRE_BANK, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_UNK_0022, param0->heapID); param0->unk_28.unk_04 = StringTemplate_New(2, (18 + 1) * 4, param0->heapID); - param0->unk_28.unk_08 = String_Init((18 + 1) * 4, param0->heapID); + param0->unk_28.unk_08 = String_New((18 + 1) * 4, param0->heapID); for (v0 = 0; v0 < 6; v0++) { param0->unk_28.unk_24[v0] = MessageLoader_GetNewString(param0->unk_28.unk_00, 9 + v0); @@ -718,12 +718,12 @@ static void ov90_021D1750(UnkStruct_ov90_021D0ECC *param0) MI_CpuCopy8(v1[v0].unk_18, &v2->unk_08, 8); - v2->unk_00 = String_Init(8, param0->heapID); + v2->unk_00 = String_New(8, param0->heapID); if (v2->unk_07) { String_Copy(v2->unk_00, param0->unk_28.unk_3C[v2->unk_04]); } else { - String_CopyChars(v2->unk_00, v1[v0].unk_00); + String_CopyFromChars(v2->unk_00, v1[v0].unk_00); } } diff --git a/src/overlay092/ov92_021D0D80.c b/src/overlay092/ov92_021D0D80.c index dc5531d995..41c8dd9c4b 100644 --- a/src/overlay092/ov92_021D0D80.c +++ b/src/overlay092/ov92_021D0D80.c @@ -935,7 +935,7 @@ static void ov92_021D1888(UnkStruct_ov92_021D1B24 *param0, NARC *param1) Bg_MaskPalette(BG_LAYER_MAIN_2, 0x0); { - String *v0 = String_Init(16, param0->heapID); + String *v0 = String_New(16, param0->heapID); Font_InitManager(FONT_SUBSCREEN, param0->heapID); { @@ -983,7 +983,7 @@ static BOOL ov92_021D1B70(UnkStruct_ov92_021D1B24 *param0, u32 param1, int param switch (param0->unk_B864) { case 0: Window_FillRectWithColor(¶m0->unk_B814, 15, 0, 0, 27 * 8, 4 * 8); - param0->unk_B86C = String_Init(0x400, param0->heapID); + param0->unk_B86C = String_New(0x400, param0->heapID); MessageLoader_GetString(param0->unk_B860, param1, param0->unk_B86C); param0->unk_B868 = Text_AddPrinterWithParams(¶m0->unk_B814, FONT_MESSAGE, param0->unk_B86C, 0, 0, Options_TextFrameDelay(param0->options), NULL); param0->unk_B864 = 1; @@ -1071,8 +1071,8 @@ static void ov92_021D1DB4(UnkStruct_ov92_021D1B24 *param0) static void ov92_021D1DEC(UnkStruct_ov92_021D1B24 *param0) { - String *v0 = String_Init(0x400, param0->heapID); - String *v1 = String_Init(0x400, param0->heapID); + String *v0 = String_New(0x400, param0->heapID); + String *v1 = String_New(0x400, param0->heapID); Window_AddFromTemplate(param0->unk_B810, ¶m0->unk_B844, &Unk_ov92_021D291C); Window_FillRectWithColor(¶m0->unk_B844, 15, 0, 0, 27 * 8, 6 * 8); @@ -1094,8 +1094,8 @@ static void ov92_021D1DEC(UnkStruct_ov92_021D1B24 *param0) static void ov92_021D1EBC(UnkStruct_ov92_021D1B24 *param0, int param1, int param2) { - String *v0 = String_Init(64, param0->heapID); - String *v1 = String_Init(64, param0->heapID); + String *v0 = String_New(64, param0->heapID); + String *v1 = String_New(64, param0->heapID); Window_AddFromTemplate(param0->unk_B810, ¶m0->unk_B844, &Unk_ov92_021D291C); Window_FillRectWithColor(¶m0->unk_B844, 15, 0, 0, 27 * 8, 6 * 8); @@ -1123,7 +1123,7 @@ static void ov92_021D1F90(UnkStruct_ov92_021D1B24 *param0) { if (param0->unk_BB28 == 0) { { - String *v0 = String_Init(0x400, param0->heapID); + String *v0 = String_New(0x400, param0->heapID); Window_FillRectWithColor(¶m0->unk_B814, 15, 0, 0, 27 * 8, 6 * 8); MessageLoader_GetString(param0->unk_B860, 14, v0); @@ -1165,8 +1165,8 @@ static void ov92_021D1F90(UnkStruct_ov92_021D1B24 *param0) } if (v8 != param0->unk_0C.unk_00) { - String *v12 = String_Init(64, param0->heapID); - String *v13 = String_Init(64, param0->heapID); + String *v12 = String_New(64, param0->heapID); + String *v13 = String_New(64, param0->heapID); Window_FillRectWithColor(¶m0->unk_B814, 15, 0, 0, 27 * 8, 6 * 8); ov92_021D27E8(param0->unk_0C.unk_04[v8].unk_2A, param0->unk_0C.unk_04[v8].unk_2C, v12, v13, param0->heapID); diff --git a/src/overlay094/screens/deposit.c b/src/overlay094/screens/deposit.c index 802c089694..606e0993b2 100644 --- a/src/overlay094/screens/deposit.c +++ b/src/overlay094/screens/deposit.c @@ -480,7 +480,7 @@ static void ov94_02241880(GTSApplicationState *appState) static void ov94_022418B8(GTSApplicationState *appState) { - appState->genericMessageBuffer = String_Init(90 * 2, HEAP_ID_62); + appState->genericMessageBuffer = String_New(90 * 2, HEAP_ID_62); appState->title = MessageLoader_GetNewString(appState->gtsMessageLoader, GTS_Text_DepositPokemon); appState->unk_10E4 = Heap_Alloc(HEAP_ID_62, sizeof(GTSApplicationState_sub3)); @@ -936,8 +936,8 @@ void ov94_02242368(MessageLoader *gtsMessageLoader, MessageLoader *speciesMessag static void ov94_022423FC(MessageLoader *gtsMessageLoader, StringTemplate *template, Window windows[], BoxPokemon *boxMon, GTSPokemonCriteria *criteria) { String *offerString, *levelString; // compiler - String *nicknameString = String_Init(10 + 1, HEAP_ID_62); - String *genderString = String_Init(10 + 1, HEAP_ID_62); + String *nicknameString = String_New(10 + 1, HEAP_ID_62); + String *genderString = String_New(10 + 1, HEAP_ID_62); BoxPokemon_GetValue(boxMon, MON_DATA_NICKNAME_STRING, nicknameString); diff --git a/src/overlay094/screens/listing.c b/src/overlay094/screens/listing.c index 3e46519d6c..b8f942cc22 100644 --- a/src/overlay094/screens/listing.c +++ b/src/overlay094/screens/listing.c @@ -311,11 +311,11 @@ static void ov94_0223D53C(GTSApplicationState *param0) { int v0; - param0->genericMessageBuffer = String_Init(90 * 2, HEAP_ID_62); + param0->genericMessageBuffer = String_New(90 * 2, HEAP_ID_62); param0->title = MessageLoader_GetNewString(param0->gtsMessageLoader, GTS_Text_MainMenu_Title); for (v0 = 0; v0 < 10; v0++) { - param0->unk_BB4[v0] = String_Init(10 * 2, HEAP_ID_62); + param0->unk_BB4[v0] = String_New(10 * 2, HEAP_ID_62); } } @@ -503,8 +503,8 @@ static TextColor Unk_ov94_022467FC[] = { void ov94_0223D910(MessageLoader *param0, MessageLoader *param1, StringTemplate *param2, Window param3[], BoxPokemon *boxMon, GTSPokemonCriteria *param5) { String *v0, *v1, *v2, *v3; - String *v4 = String_Init((10 + 1) * 2, HEAP_ID_62); - String *v5 = String_Init((8 + 1) * 2, HEAP_ID_62); + String *v4 = String_New((10 + 1) * 2, HEAP_ID_62); + String *v5 = String_New((8 + 1) * 2, HEAP_ID_62); int gender, level, item, v9, species; BoxPokemon_GetValue(boxMon, MON_DATA_NICKNAME_STRING, v4); @@ -551,11 +551,11 @@ void ov94_0223DA78(MessageLoader *param0, Window param1[], u16 *param2, Pokemon String *v0, *v1; String *v2, *v3; - v0 = String_Init((7 + 1) * 2, HEAP_ID_62); - v3 = String_Init((7 + 1) * 2, HEAP_ID_62); + v0 = String_New((7 + 1) * 2, HEAP_ID_62); + v3 = String_New((7 + 1) * 2, HEAP_ID_62); v1 = MessageLoader_GetNewString(param0, pl_msg_00000671_00048); - String_CopyChars(v0, param2); + String_CopyFromChars(v0, param2); v2 = MessageLoader_GetNewString(param0, pl_msg_00000671_00172); Pokemon_GetValue(param3, MON_DATA_OT_NAME_STRING, v3); diff --git a/src/overlay094/screens/main_menu.c b/src/overlay094/screens/main_menu.c index 854e1715ab..937897d898 100644 --- a/src/overlay094/screens/main_menu.c +++ b/src/overlay094/screens/main_menu.c @@ -326,7 +326,7 @@ static void GTSApplication_MainMenu_CleanupWindows(GTSApplicationState *appState static void GTS_MainMenu_LoadTitle(GTSApplicationState *appState) { - appState->genericMessageBuffer = String_Init(90 * 2, HEAP_ID_62); + appState->genericMessageBuffer = String_New(90 * 2, HEAP_ID_62); appState->title = MessageLoader_GetNewString(appState->gtsMessageLoader, GTS_Text_MainMenu_Title); } diff --git a/src/overlay094/screens/network_handler.c b/src/overlay094/screens/network_handler.c index 59b8d312a2..0d19433ec2 100644 --- a/src/overlay094/screens/network_handler.c +++ b/src/overlay094/screens/network_handler.c @@ -340,7 +340,7 @@ static void GTSApplication_NetworkHandler_CleanupWindows(GTSApplicationState *ap static void GTSApplication_NetworkHandler_InitStrings(GTSApplicationState *appState) { - appState->genericMessageBuffer = String_Init(90 * 2, HEAP_ID_62); + appState->genericMessageBuffer = String_New(90 * 2, HEAP_ID_62); } static void GTSApplication_NetworkHandler_CleanupStrings(GTSApplicationState *appState) diff --git a/src/overlay094/screens/search.c b/src/overlay094/screens/search.c index be850f81e9..5f050cfcc3 100644 --- a/src/overlay094/screens/search.c +++ b/src/overlay094/screens/search.c @@ -372,7 +372,7 @@ static void ov94_0223E9B8(GTSApplicationState *param0) { int v0; - param0->genericMessageBuffer = String_Init(90 * 2, HEAP_ID_62); + param0->genericMessageBuffer = String_New(90 * 2, HEAP_ID_62); param0->title = MessageLoader_GetNewString(param0->gtsMessageLoader, GTS_Text_SeekPokemon); param0->unk_10E4 = Heap_Alloc(HEAP_ID_62, sizeof(GTSApplicationState_sub3)); diff --git a/src/overlay094/screens/search_listing.c b/src/overlay094/screens/search_listing.c index f301594429..a2e50c991d 100644 --- a/src/overlay094/screens/search_listing.c +++ b/src/overlay094/screens/search_listing.c @@ -275,7 +275,7 @@ static void ov94_0223DFDC(GTSApplicationState *appState) { GTSPokemonListing *listing = &appState->searchResults[appState->selectedSearchResult]; - appState->genericMessageBuffer = String_Init(90 * 2, HEAP_ID_62); + appState->genericMessageBuffer = String_New(90 * 2, HEAP_ID_62); StringTemplate_ClearArgs(appState->stringTemplate); diff --git a/src/overlay094/screens/select_pokemon.c b/src/overlay094/screens/select_pokemon.c index f269d3a87b..a89d89f04e 100644 --- a/src/overlay094/screens/select_pokemon.c +++ b/src/overlay094/screens/select_pokemon.c @@ -461,8 +461,8 @@ static void ov94_02240190(GTSApplicationState *param0) static void ov94_022401E0(GTSApplicationState *param0) { - param0->selectPokemonBoxName = String_Init(9 * 2, HEAP_ID_62); - param0->genericMessageBuffer = String_Init(90 * 2, HEAP_ID_62); + param0->selectPokemonBoxName = String_New(9 * 2, HEAP_ID_62); + param0->genericMessageBuffer = String_New(90 * 2, HEAP_ID_62); if (param0->screenArgument == SCREEN_ARGUMENT_5) { param0->title = MessageLoader_GetNewString(param0->gtsMessageLoader, GTS_Text_ChooseYourOfferPokemon); diff --git a/src/overlay094/screens/wfc_init.c b/src/overlay094/screens/wfc_init.c index 1917889ebe..f409dfe8aa 100644 --- a/src/overlay094/screens/wfc_init.c +++ b/src/overlay094/screens/wfc_init.c @@ -305,8 +305,8 @@ static void GTSApplication_WFCInit_CleanupWindows(GTSApplicationState *appState) static void GTSApplication_WFCInit_InitTitle(GTSApplicationState *appState) { - appState->genericMessageBuffer = String_Init(90 * 2, HEAP_ID_62); - appState->shortErrorBuffer = String_Init(16 * 8 * 2, HEAP_ID_62); + appState->genericMessageBuffer = String_New(90 * 2, HEAP_ID_62); + appState->shortErrorBuffer = String_New(16 * 8 * 2, HEAP_ID_62); appState->title = MessageLoader_GetNewString(appState->gtsMessageLoader, GTS_Text_NintendoWifiConnection); } @@ -935,7 +935,7 @@ void ov94_02245934(GTSApplicationState *appState) static void GTSApplication_WFCInit_DisplayNetworkError(GTSApplicationState *appState, int messageId) { - String *fmtString = String_Init(16 * 8 * 2, HEAP_ID_62); + String *fmtString = String_New(16 * 8 * 2, HEAP_ID_62); MessageLoader_GetString(appState->unk0695MessageLoader, messageId, fmtString); StringTemplate_Format(appState->stringTemplate, appState->shortErrorBuffer, fmtString); diff --git a/src/overlay095/ov95_02246C20.c b/src/overlay095/ov95_02246C20.c index f12e1b590b..e08124a4d6 100644 --- a/src/overlay095/ov95_02246C20.c +++ b/src/overlay095/ov95_02246C20.c @@ -118,7 +118,7 @@ int TradeSequence_Init(ApplicationManager *appMan, int *param1) tradeData->animationConfig = ApplicationManager_Args(appMan); // this is overlay094's unk_E8 tradeData->unk_04 = 0; tradeData->unk_08 = BgConfig_New(HEAP_ID_57); - tradeData->unk_14 = String_Init(400, HEAP_ID_57); + tradeData->unk_14 = String_New(400, HEAP_ID_57); tradeData->unk_10 = MessageLoader_Init(MSG_LOADER_PRELOAD_ENTIRE_BANK, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_TRADE, HEAP_ID_57); tradeData->unk_0C = StringTemplate_Default(HEAP_ID_57); diff --git a/src/overlay095/ov95_02247B6C.c b/src/overlay095/ov95_02247B6C.c index 311bfb872b..9fd9f85e88 100644 --- a/src/overlay095/ov95_02247B6C.c +++ b/src/overlay095/ov95_02247B6C.c @@ -105,8 +105,8 @@ void *ov95_02247B6C(TradeSequenceData *param0) v0->unk_54 = ov95_02247628(param0); v0->unk_0C = PokemonSpriteManager_New(HEAP_ID_58); v0->unk_10 = NULL; - v0->unk_68 = String_Init(300, HEAP_ID_58); - v0->unk_6C = String_Init(300, HEAP_ID_58); + v0->unk_68 = String_New(300, HEAP_ID_58); + v0->unk_6C = String_New(300, HEAP_ID_58); v0->unk_78 = NULL; v0->unk_7C = NULL; v0->unk_80 = NARC_ctor(NARC_INDEX_POKETOOL__POKE_EDIT__PL_POKE_DATA, HEAP_ID_58); diff --git a/src/overlay095/ov95_0224B3D8.c b/src/overlay095/ov95_0224B3D8.c index 10af2aedc4..351abb850c 100644 --- a/src/overlay095/ov95_0224B3D8.c +++ b/src/overlay095/ov95_0224B3D8.c @@ -129,8 +129,8 @@ void *ov95_0224B3D8(TradeSequenceData *param0) v0->unk_58 = ov95_02247628(param0); v0->unk_10 = PokemonSpriteManager_New(HEAP_ID_58); v0->unk_14 = NULL; - v0->unk_6C = String_Init(300, HEAP_ID_58); - v0->unk_70 = String_Init(300, HEAP_ID_58); + v0->unk_6C = String_New(300, HEAP_ID_58); + v0->unk_70 = String_New(300, HEAP_ID_58); v0->unk_7C = NULL; v0->unk_80 = NULL; v0->unk_74 = NULL; diff --git a/src/overlay096/ov96_0223BCE0.c b/src/overlay096/ov96_0223BCE0.c index 07f8f7399d..9fd151a815 100644 --- a/src/overlay096/ov96_0223BCE0.c +++ b/src/overlay096/ov96_0223BCE0.c @@ -393,11 +393,11 @@ static void ov96_0223C314(UnkStruct_ov96_0223BF40 *param0) static void ov96_0223C358(UnkStruct_ov96_0223BF40 *param0) { - param0->unk_BDC = String_Init(90 * 2, HEAP_ID_68); - param0->unk_BE4 = String_Init(4, HEAP_ID_68); - param0->unk_BE8 = String_Init(3, HEAP_ID_68); + param0->unk_BDC = String_New(90 * 2, HEAP_ID_68); + param0->unk_BE4 = String_New(4, HEAP_ID_68); + param0->unk_BE8 = String_New(3, HEAP_ID_68); param0->unk_BE0 = MessageLoader_GetNewString(param0->unk_BD0, 10); - param0->unk_BEC = String_Init(16 * 8 * 2, HEAP_ID_68); + param0->unk_BEC = String_New(16 * 8 * 2, HEAP_ID_68); } static void ov96_0223C3B0(UnkStruct_ov96_0223BF40 *param0) @@ -1658,7 +1658,7 @@ static void ov96_0223D99C(UnkStruct_ov96_0223BF40 *param0) static void ov96_0223D9B8(UnkStruct_ov96_0223BF40 *param0, int param1) { - String *v0 = String_Init(16 * 8 * 2, HEAP_ID_68); + String *v0 = String_New(16 * 8 * 2, HEAP_ID_68); MessageLoader_GetString(param0->unk_BD8, param1, v0); StringTemplate_Format(param0->unk_BCC, param0->unk_BEC, v0); diff --git a/src/overlay098/ov98_02246C20.c b/src/overlay098/ov98_02246C20.c index 46843e305f..1489019edb 100644 --- a/src/overlay098/ov98_02246C20.c +++ b/src/overlay098/ov98_02246C20.c @@ -105,8 +105,8 @@ int ov98_02246C20(ApplicationManager *appMan, int *param1) MI_CpuClear8(v0, sizeof(UnkStruct_ov98_02246E88)); v0->saveData = ((ApplicationArgs *)ApplicationManager_Args(appMan))->saveData; v0->options = SaveData_GetOptions(v0->saveData); - v0->unk_114 = String_Init(100, HEAP_ID_108); - v0->unk_118 = String_Init(100, HEAP_ID_108); + v0->unk_114 = String_New(100, HEAP_ID_108); + v0->unk_118 = String_New(100, HEAP_ID_108); Sound_SetSceneAndPlayBGM(SOUND_SCENE_17, SEQ_WIFILOBBY, 1); v0->unk_8C = 0; diff --git a/src/overlay098/ov98_022471C8.c b/src/overlay098/ov98_022471C8.c index 9990373d63..81e91c65a0 100644 --- a/src/overlay098/ov98_022471C8.c +++ b/src/overlay098/ov98_022471C8.c @@ -316,8 +316,8 @@ int ov98_022471C8(ApplicationManager *appMan, int *param1) v0->unk_30 = MessageLoader_Init(MSG_LOADER_PRELOAD_ENTIRE_BANK, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_UNK_0695, HEAP_ID_109); v0->unk_28 = MessageLoader_Init(MSG_LOADER_PRELOAD_ENTIRE_BANK, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_SPECIES_NAME, HEAP_ID_109); v0->unk_34 = MessageLoader_Init(MSG_LOADER_PRELOAD_ENTIRE_BANK, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_UNK_0358, HEAP_ID_109); - v0->unk_38 = String_Init(90 * 2, HEAP_ID_109); - v0->unk_40 = String_Init(16 * 8 * 2, HEAP_ID_109); + v0->unk_38 = String_New(90 * 2, HEAP_ID_109); + v0->unk_40 = String_New(16 * 8 * 2, HEAP_ID_109); v0->unk_3C = MessageLoader_GetNewString(v0->unk_24, 31); ov98_02247704(v0); @@ -966,9 +966,9 @@ static void ov98_022482CC(UnkStruct_ov98_02247704 *param0) Window_FillTilemap(¶m0->unk_C4, 0x0f0f); v2 = MessageLoader_GetNewString(param0->unk_34, 44); - v3 = String_Init(String_Length(v2), HEAP_ID_109); + v3 = String_New(String_GetLength(v2), HEAP_ID_109); for (v0 = param0->unk_AC; v0 < param0->unk_AC + 6; v0++) { - String_CopyLineNum(v3, v2, v0); + String_CopyLine(v3, v2, v0); Text_AddPrinterWithParams(¶m0->unk_C4, FONT_SYSTEM, v3, 4, v1 * 16, TEXT_SPEED_NO_TRANSFER, NULL); v1++; } @@ -984,7 +984,7 @@ static int ov98_02248350(UnkStruct_ov98_02247704 *param0) int i; String *string1 = MessageLoader_GetNewString(param0->unk_34, 44); - u32 lineCount = String_NumLines(string1); + u32 lineCount = String_CountLines(string1); param0->unk_AC = 0; param0->unk_B0 = 0; param0->unk_B8 = 0; @@ -994,9 +994,9 @@ static int ov98_02248350(UnkStruct_ov98_02247704 *param0) Window_Add(param0->unk_04, ¶m0->unk_D4, BG_LAYER_MAIN_2, 1, 19, 30, 4, 13, 508); Window_FillTilemap(¶m0->unk_C4, 15); - String *string2 = String_Init(String_Length(string1), HEAP_ID_109); + String *string2 = String_New(String_GetLength(string1), HEAP_ID_109); for (i = 0; i < 6; i++) { - String_CopyLineNum(string2, string1, i); + String_CopyLine(string2, string1, i); Text_AddPrinterWithParams(¶m0->unk_C4, FONT_SYSTEM, string2, 4, i * 16, 0xFF, NULL); } String_Free(string1); @@ -2189,7 +2189,7 @@ void ov98_022498CC(Window *param0, String *param1, int param2, int param3, int p static void ov98_02249900(UnkStruct_ov98_02247704 *param0, int param1) { - String *v0 = String_Init(16 * 8 * 2, HEAP_ID_109); + String *v0 = String_New(16 * 8 * 2, HEAP_ID_109); MessageLoader_GetString(param0->unk_30, param1, v0); StringTemplate_Format(param0->unk_20, param0->unk_40, v0); diff --git a/src/overlay098/ov98_022499C8.c b/src/overlay098/ov98_022499C8.c index c0dd0da981..88dc691ba2 100644 --- a/src/overlay098/ov98_022499C8.c +++ b/src/overlay098/ov98_022499C8.c @@ -39,7 +39,7 @@ void ov98_022499C8(String *param0, char *param1, int heapID) } v1 = Heap_Alloc(heapID, sizeof(charcode_t) * 100); - String_ToChars(param0, v1, 100); + String_CopyToChars(param0, v1, 100); v0 = 0; while (1) { @@ -72,7 +72,7 @@ int ov98_02249A80(String *param0, int heapID) int v2; v0 = Heap_Alloc(heapID, sizeof(charcode_t) * 100); - String_ToChars(param0, v0, 100); + String_CopyToChars(param0, v0, 100); for (v2 = 0; v0[v2] != CHAR_EOS; v2++) { if (v0[v2] != CHAR_0) { diff --git a/src/overlay099/ov99_021D3E78.c b/src/overlay099/ov99_021D3E78.c index a9de5dd7f7..200faec750 100644 --- a/src/overlay099/ov99_021D3E78.c +++ b/src/overlay099/ov99_021D3E78.c @@ -292,7 +292,7 @@ UnkStruct_ov99_021D3E78 *ov99_021D3E78(BgConfig *param0, int param1, int param2, v0->unk_14 = 0; v0->unk_18 = 0; v0->unk_1C = 0; - v0->unk_30 = String_Init(256, HEAP_ID_75); + v0->unk_30 = String_New(256, HEAP_ID_75); v0->unk_24 = Window_New(HEAP_ID_75, 1); Window_Add(param0, v0->unk_24, param2, 0, 0, 32, 32, param3, 0); diff --git a/src/overlay100/ov100_021D46C8.c b/src/overlay100/ov100_021D46C8.c index 9ea14cb139..a6b0677f09 100644 --- a/src/overlay100/ov100_021D46C8.c +++ b/src/overlay100/ov100_021D46C8.c @@ -31,7 +31,7 @@ int ov100_021D46C8(UnkStruct_ov100_021D46C8 *param0, UnkStruct_020985E4 *param1, int v0; MessageLoader *v1; String *v2; - String *v3 = String_Init(511, HEAP_ID_111); + String *v3 = String_New(511, HEAP_ID_111); u8 v4 = 0; v1 = param0->unk_2C; diff --git a/src/overlay101/ov101_021D0D80.c b/src/overlay101/ov101_021D0D80.c index 78202d94bc..0a8b5eca43 100644 --- a/src/overlay101/ov101_021D0D80.c +++ b/src/overlay101/ov101_021D0D80.c @@ -436,7 +436,7 @@ void ov101_021D13C8(UnkStruct_ov101_021D13C8 *param0) Window_AddFromTemplate(param0->unk_43C, &v1->unk_08[v0], &Unk_ov101_021D8588[v0]); } - v1->unk_18 = String_Init(256, HEAP_ID_79); + v1->unk_18 = String_New(256, HEAP_ID_79); } void ov101_021D1458(UnkStruct_ov101_021D13C8 *param0) diff --git a/src/overlay104/ov104_0222DCE0.c b/src/overlay104/ov104_0222DCE0.c index 91773485a5..a238e07b41 100644 --- a/src/overlay104/ov104_0222DCE0.c +++ b/src/overlay104/ov104_0222DCE0.c @@ -126,7 +126,7 @@ BattleFrontierTrainerData *BattleTower_GetTrainerData(FrontierTrainerDataDTO *tr String *string = MessageLoader_GetNewString(msgLoader, battleTowerTrainerID); - String_ToChars(string, &trDataDTO->trainerName[0], TRAINER_NAME_LEN + 1); + String_CopyToChars(string, &trDataDTO->trainerName[0], TRAINER_NAME_LEN + 1); String_Free(string); MessageLoader_Free(msgLoader); diff --git a/src/overlay104/ov104_0222E63C.c b/src/overlay104/ov104_0222E63C.c index 6ffe5bbe7d..2706f494ff 100644 --- a/src/overlay104/ov104_0222E63C.c +++ b/src/overlay104/ov104_0222E63C.c @@ -39,8 +39,8 @@ UnkStruct_ov104_022320B4 *ov104_0222E63C(UnkStruct_0209B75C *param0, int heapID, ov104_0222E830(&v0->unk_40, &v0->unk_3C, param2, heapID); v0->unk_44 = StringTemplate_New(8, 64, heapID); - v0->unk_48 = String_Init(1024, heapID); - v0->unk_4C = String_Init(1024, heapID); + v0->unk_48 = String_New(1024, heapID); + v0->unk_4C = String_New(1024, heapID); ov104_0222E82C(v0, param2, NULL, NULL); diff --git a/src/overlay104/ov104_02231F74.c b/src/overlay104/ov104_02231F74.c index d783df2415..d3c27655e5 100644 --- a/src/overlay104/ov104_02231F74.c +++ b/src/overlay104/ov104_02231F74.c @@ -253,7 +253,7 @@ static void ov104_0223214C(UnkStruct_ov104_022320B4 *param0, UnkStruct_ov104_022 } for (v0 = 0; v0 < 28; v0++) { - param1->unk_1C[v0] = String_Init(40 * 2, param0->heapID); + param1->unk_1C[v0] = String_New(40 * 2, param0->heapID); } *param1->unk_A0 = 0xeeee; @@ -318,7 +318,7 @@ static void ov104_02232390(UnkStruct_ov104_02232B5C *param0, u32 param1, u32 par void *v1; { - String *v2 = String_Init(40 * 2, param0->unk_00->heapID); + String *v2 = String_New(40 * 2, param0->unk_00->heapID); MessageLoader_GetString(param0->unk_8C, param1, v2); StringTemplate_Format(param0->unk_90, param0->unk_1C[param0->unk_9B], v2); @@ -500,7 +500,7 @@ static void ov104_02232750(UnkStruct_ov104_02232B5C *param0, u32 param1, u32 par void *v1; { - String *v2 = String_Init(40 * 2, param0->unk_00->heapID); + String *v2 = String_New(40 * 2, param0->unk_00->heapID); MessageLoader_GetString(param0->unk_8C, param1, v2); StringTemplate_Format(param0->unk_90, param0->unk_1C[param0->unk_9B], v2); @@ -674,8 +674,8 @@ static void ov104_02232A58(UnkStruct_ov104_02232B5C *param0, u8 param1) static void ov104_02232AC4(UnkStruct_ov104_02232B5C *param0, u16 param1, u32 param2) { - String *v0 = String_Init(40 * 2, param0->unk_00->heapID); - String *v1 = String_Init(40 * 2, param0->unk_00->heapID); + String *v0 = String_New(40 * 2, param0->unk_00->heapID); + String *v1 = String_New(40 * 2, param0->unk_00->heapID); Window_FillTilemap(param0->unk_18, 15); diff --git a/src/overlay104/ov104_022361B4.c b/src/overlay104/ov104_022361B4.c index aa6d76095e..bc058218e9 100644 --- a/src/overlay104/ov104_022361B4.c +++ b/src/overlay104/ov104_022361B4.c @@ -773,8 +773,8 @@ void ov104_02237180(UnkStruct_ov104_022320B4 *param0, UnkStruct_ov104_0223BA10 * static void ov104_02237284(UnkStruct_ov104_022320B4 *param0, Window *param1, TrainerInfo *param2, u16 param3) { MessageLoader *v0; - String *v1 = String_Init((10 * 2), param0->heapID); - String *v2 = String_Init((10 * 2), param0->heapID); + String *v1 = String_New((10 * 2), param0->heapID); + String *v2 = String_New((10 * 2), param0->heapID); v0 = MessageLoader_Init(MSG_LOADER_PRELOAD_ENTIRE_BANK, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_UNK_0199, HEAP_ID_FIELD2); diff --git a/src/overlay105/ov105_02241AE0.c b/src/overlay105/ov105_02241AE0.c index d508155f21..807b6c370c 100644 --- a/src/overlay105/ov105_02241AE0.c +++ b/src/overlay105/ov105_02241AE0.c @@ -2623,10 +2623,10 @@ static void ov105_02244F0C(UnkStruct_ov105_02241FF4 *param0, Window *param1, u32 { TextColor v0; const TrainerInfo *v1 = SaveData_GetTrainerInfo(param0->saveData); - String *v2 = String_Init(7 + 1, HEAP_ID_93); + String *v2 = String_New(7 + 1, HEAP_ID_93); Window_FillTilemap(param1, 0); - String_CopyChars(v2, TrainerInfo_Name(v1)); + String_CopyFromChars(v2, TrainerInfo_Name(v1)); if (TrainerInfo_Gender(v1) == 0) { v0 = TEXT_COLOR(7, 8, 0); @@ -2645,7 +2645,7 @@ static void ov105_02244F84(UnkStruct_ov105_02241FF4 *param0, Window *param1, u32 { TextColor v0; TrainerInfo *v2 = CommInfo_TrainerInfo(1 - CommSys_CurNetId()); - String *v1 = String_Init(7 + 1, HEAP_ID_93); + String *v1 = String_New(7 + 1, HEAP_ID_93); Window_FillTilemap(param1, 0); TrainerInfo_NameString(v2, v1); @@ -2676,8 +2676,8 @@ static void ov105_02244FF8(UnkStruct_ov105_02241FF4 *param0, Window *param1, u8 Pokemon_GetValue(v5, MON_DATA_SPECIES_NAME, v6); Window_FillTilemap(param1, param7); - v4 = String_Init(10 + 1, HEAP_ID_93); - String_CopyChars(v4, v6); + v4 = String_New(10 + 1, HEAP_ID_93); + String_CopyFromChars(v4, v6); Text_AddPrinterWithParamsAndColor(param1, param8, v4, param3, param4, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(param5, param6, param7), NULL); v0 = Window_GetWidth(param1) - 1; @@ -2822,11 +2822,11 @@ static void ov105_0224531C(UnkStruct_ov105_02241FF4 *param0) param0->unk_1C = MessageLoader_Init(MSG_LOADER_LOAD_ON_DEMAND, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_UNK_0364, HEAP_ID_93); param0->unk_20 = StringTemplate_Default(HEAP_ID_93); - param0->unk_24 = String_Init(800, HEAP_ID_93); - param0->unk_28 = String_Init(800, HEAP_ID_93); + param0->unk_24 = String_New(800, HEAP_ID_93); + param0->unk_28 = String_New(800, HEAP_ID_93); for (v0 = 0; v0 < 4; v0++) { - param0->unk_2C[v0] = String_Init(64, HEAP_ID_93); + param0->unk_2C[v0] = String_New(64, HEAP_ID_93); } Font_LoadTextPalette(0, 13 * 32, HEAP_ID_93); diff --git a/src/overlay106/ov106_02241AE0.c b/src/overlay106/ov106_02241AE0.c index 972b501433..8846d81b3e 100644 --- a/src/overlay106/ov106_02241AE0.c +++ b/src/overlay106/ov106_02241AE0.c @@ -803,11 +803,11 @@ static void ov106_02242500(UnkStruct_ov106_02243118 *param0) param0->unk_20 = MessageLoader_Init(MSG_LOADER_LOAD_ON_DEMAND, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_UNK_0549, HEAP_ID_98); param0->unk_24 = StringTemplate_Default(HEAP_ID_98); - param0->unk_28 = String_Init(600, HEAP_ID_98); - param0->unk_2C = String_Init(600, HEAP_ID_98); + param0->unk_28 = String_New(600, HEAP_ID_98); + param0->unk_2C = String_New(600, HEAP_ID_98); for (v0 = 0; v0 < 2; v0++) { - param0->unk_30[v0] = String_Init(32, HEAP_ID_98); + param0->unk_30[v0] = String_New(32, HEAP_ID_98); } Font_LoadTextPalette(0, 13 * 32, HEAP_ID_98); @@ -1126,8 +1126,8 @@ static void ov106_02242AC4(UnkStruct_ov106_02243118 *param0, Window *param1, u32 Pokemon_GetValue(v5, MON_DATA_SPECIES_NAME, v6); Window_FillTilemap(param1, param6); - v4 = String_Init(10 + 1, HEAP_ID_98); - String_CopyChars(v4, v6); + v4 = String_New(10 + 1, HEAP_ID_98); + String_CopyFromChars(v4, v6); Text_AddPrinterWithParamsAndColor(param1, param7, v4, param2, param3, TEXT_SPEED_INSTANT, TEXT_COLOR(param4, param5, param6), NULL); String_Free(v4); Window_CopyToVRAM(param1); @@ -1144,7 +1144,7 @@ static void ov106_02242B38(UnkStruct_ov106_02243118 *param0, Window *param1, u8 Window_FillTilemap(param1, param4); v3 = MessageLoader_Init(MSG_LOADER_LOAD_ON_DEMAND, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_POKEMON_TYPE_NAMES, HEAP_ID_98); - v2 = String_Init(10 + 1, HEAP_ID_98); + v2 = String_New(10 + 1, HEAP_ID_98); for (v0 = 0; v0 < 5; v0++) { for (v1 = 0; v1 < 4; v1++) { diff --git a/src/overlay107/ov107_02241AE0.c b/src/overlay107/ov107_02241AE0.c index f362fa53e9..6e1a37a157 100644 --- a/src/overlay107/ov107_02241AE0.c +++ b/src/overlay107/ov107_02241AE0.c @@ -1439,11 +1439,11 @@ static void ov107_02242F5C(UnkStruct_ov107_02241D6C *param0) param0->unk_20 = MessageLoader_Init(MSG_LOADER_LOAD_ON_DEMAND, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_UNK_0199, HEAP_ID_100); param0->unk_1C = MessageLoader_Init(MSG_LOADER_LOAD_ON_DEMAND, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_ITEM_DESCRIPTIONS, HEAP_ID_100); param0->unk_24 = StringTemplate_Default(HEAP_ID_100); - param0->unk_28 = String_Init(600, HEAP_ID_100); - param0->unk_2C = String_Init(600, HEAP_ID_100); + param0->unk_28 = String_New(600, HEAP_ID_100); + param0->unk_2C = String_New(600, HEAP_ID_100); for (v15 = 0; v15 < 3; v15++) { - param0->unk_30[v15] = String_Init(32, HEAP_ID_100); + param0->unk_30[v15] = String_New(32, HEAP_ID_100); } Font_LoadTextPalette(0, 13 * 32, HEAP_ID_100); @@ -2645,9 +2645,9 @@ static void ov107_02244AB4(UnkStruct_ov107_02241D6C *param0, Window *param1, u32 String *v2; v1 = SaveData_GetTrainerInfo(param0->saveData); - v2 = String_Init(7 + 1, HEAP_ID_100); + v2 = String_New(7 + 1, HEAP_ID_100); - String_CopyChars(v2, TrainerInfo_Name(v1)); + String_CopyFromChars(v2, TrainerInfo_Name(v1)); if (TrainerInfo_Gender(v1) == 0) { v0 = TEXT_COLOR(7, 8, 0); diff --git a/src/overlay107/ov107_02245EB0.c b/src/overlay107/ov107_02245EB0.c index 64ecf2b9ac..338c90e0bb 100644 --- a/src/overlay107/ov107_02245EB0.c +++ b/src/overlay107/ov107_02245EB0.c @@ -1114,11 +1114,11 @@ static void ov107_02246EE4(UnkStruct_ov107_02246170 *param0) param0->unk_20 = MessageLoader_Init(MSG_LOADER_LOAD_ON_DEMAND, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_UNK_0201, HEAP_ID_100); param0->unk_24 = StringTemplate_Default(HEAP_ID_100); - param0->unk_28 = String_Init(600, HEAP_ID_100); - param0->unk_2C = String_Init(600, HEAP_ID_100); + param0->unk_28 = String_New(600, HEAP_ID_100); + param0->unk_2C = String_New(600, HEAP_ID_100); for (v13 = 0; v13 < 3; v13++) { - param0->unk_30[v13] = String_Init(32, HEAP_ID_100); + param0->unk_30[v13] = String_New(32, HEAP_ID_100); } Font_LoadTextPalette(0, 13 * 32, HEAP_ID_100); @@ -1926,9 +1926,9 @@ static void ov107_0224812C(UnkStruct_ov107_02246170 *param0, Window *param1, u32 String *v2; v1 = SaveData_GetTrainerInfo(param0->saveData); - v2 = String_Init(7 + 1, HEAP_ID_100); + v2 = String_New(7 + 1, HEAP_ID_100); - String_CopyChars(v2, TrainerInfo_Name(v1)); + String_CopyFromChars(v2, TrainerInfo_Name(v1)); if (TrainerInfo_Gender(v1) == 0) { v0 = TEXT_COLOR(7, 8, 0); diff --git a/src/overlay108/ov108_02241AE0.c b/src/overlay108/ov108_02241AE0.c index 39b9410d02..4e20e8d70f 100644 --- a/src/overlay108/ov108_02241AE0.c +++ b/src/overlay108/ov108_02241AE0.c @@ -811,11 +811,11 @@ static void ov108_0224237C(UnkStruct_ov108_02241DB0 *param0) param0->unk_68 = MessageLoader_Init(MSG_LOADER_LOAD_ON_DEMAND, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_DUMMY_0536, HEAP_ID_103); param0->unk_6C = StringTemplate_Default(HEAP_ID_103); - param0->unk_70 = String_Init(600, HEAP_ID_103); - param0->unk_74 = String_Init(600, HEAP_ID_103); + param0->unk_70 = String_New(600, HEAP_ID_103); + param0->unk_74 = String_New(600, HEAP_ID_103); for (v5 = 0; v5 < 2; v5++) { - param0->unk_78[v5] = String_Init(32, HEAP_ID_103); + param0->unk_78[v5] = String_New(32, HEAP_ID_103); } Font_LoadTextPalette(0, 13 * 32, HEAP_ID_103); diff --git a/src/overlay109/ov109_021D0D80.c b/src/overlay109/ov109_021D0D80.c index 90679d90f4..91d0bf818d 100644 --- a/src/overlay109/ov109_021D0D80.c +++ b/src/overlay109/ov109_021D0D80.c @@ -2003,10 +2003,10 @@ static void ov109_021D24F8(UnkStruct_ov109_021D0F70 *param0) Window_AddFromTemplate(param0->unk_D84, &v1->unk_0C[v0], &Unk_ov109_021D59B8[v0]); } - v1->unk_6C = String_Init(0x100, HEAP_ID_95); + v1->unk_6C = String_New(0x100, HEAP_ID_95); for (v0 = 0; v0 < 5; v0++) { - param0->unk_2C.unk_6C[v0] = String_Init(7 + 1, HEAP_ID_95); + param0->unk_2C.unk_6C[v0] = String_New(7 + 1, HEAP_ID_95); } ov109_021D27AC(param0, param0->unk_CC->unk_08); @@ -2055,7 +2055,7 @@ static void ov109_021D268C(UnkStruct_ov109_021D0F70 *param0, u32 param1, const T StringTemplate_SetPlayerName(v1->unk_08, 1, CommInfo_TrainerInfo(CommSys_CurNetId())); StringTemplate_SetPlayerName(v1->unk_08, 2, param2); - v0 = String_Init(0x100, HEAP_ID_95); + v0 = String_New(0x100, HEAP_ID_95); MessageLoader_GetString(v1->unk_04, param1, v0); StringTemplate_Format(v1->unk_08, v1->unk_6C, v0); @@ -2074,7 +2074,7 @@ static void ov109_021D2714(UnkStruct_ov109_021D0F70 *param0, u32 param1, u32 par StringTemplate_SetItemName(v1->unk_08, 0, param2); - v0 = String_Init(0x100, HEAP_ID_95); + v0 = String_New(0x100, HEAP_ID_95); MessageLoader_GetString(v1->unk_04, param1, v0); StringTemplate_Format(v1->unk_08, v1->unk_6C, v0); diff --git a/src/overlay109/ov109_021D3D50.c b/src/overlay109/ov109_021D3D50.c index 00c84916d7..00b5483117 100644 --- a/src/overlay109/ov109_021D3D50.c +++ b/src/overlay109/ov109_021D3D50.c @@ -507,14 +507,14 @@ static void ov109_021D41F8(UnkStruct_ov109_021D5140 *param0, NARC *param1) int v0; for (v0 = 0; v0 < 5; v0++) { - param0->unk_3C[v0] = String_Init(7 + 1, HEAP_ID_95); + param0->unk_3C[v0] = String_New(7 + 1, HEAP_ID_95); param0->unk_3D8[v0][0] = NULL; param0->unk_3D8[v0][1] = NULL; param0->unk_400[v0] = 0; } - param0->unk_54 = String_Init(90 * 2, HEAP_ID_95); - param0->unk_58 = String_Init(20 * 2, HEAP_ID_95); + param0->unk_54 = String_New(90 * 2, HEAP_ID_95); + param0->unk_58 = String_New(20 * 2, HEAP_ID_95); param0->unk_3B8 = 0; MessageLoader_GetString(param0->unk_38, 17, param0->unk_58); @@ -1557,7 +1557,7 @@ static BOOL ov109_021D54CC(UnkStruct_ov109_021D5140 *param0) static void ov109_021D55A8(UnkStruct_ov109_021D5140 *param0, int param1, int param2) { - String *v0 = String_Init(90 * 2, HEAP_ID_95); + String *v0 = String_New(90 * 2, HEAP_ID_95); MessageLoader_GetString(param0->unk_38, param1, v0); StringTemplate_Format(param0->unk_34, param0->unk_54, v0); diff --git a/src/overlay110/ov110_021D0D80.c b/src/overlay110/ov110_021D0D80.c index 819247a347..9145d8f064 100644 --- a/src/overlay110/ov110_021D0D80.c +++ b/src/overlay110/ov110_021D0D80.c @@ -124,8 +124,8 @@ int ov110_021D0D80(ApplicationManager *appMan, int *param1) v1->unk_110 = MessageLoader_Init(MSG_LOADER_LOAD_ON_DEMAND, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_UNK_0016, HEAP_ID_114); v1->unk_114 = StringTemplate_Default(HEAP_ID_114); - v1->unk_118 = String_Init(800, HEAP_ID_114); - v1->unk_11C = String_Init(800, HEAP_ID_114); + v1->unk_118 = String_New(800, HEAP_ID_114); + v1->unk_11C = String_New(800, HEAP_ID_114); Font_LoadTextPalette(0, 13 * 32, HEAP_ID_114); Font_LoadScreenIndicatorsPalette(0, 12 * 32, HEAP_ID_114); diff --git a/src/overlay111/ov111_021D0D80.c b/src/overlay111/ov111_021D0D80.c index b01839b32a..a3d540a147 100644 --- a/src/overlay111/ov111_021D0D80.c +++ b/src/overlay111/ov111_021D0D80.c @@ -1148,8 +1148,8 @@ static void ov111_021D1D68(UnkStruct_ov111_021D0F7C *param0) param0->unk_38 = MessageLoader_Init(MSG_LOADER_LOAD_ON_DEMAND, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_UNK_0540, HEAP_ID_115); param0->unk_3C = StringTemplate_Default(HEAP_ID_115); - param0->unk_40 = String_Init(600, HEAP_ID_115); - param0->unk_44 = String_Init(600, HEAP_ID_115); + param0->unk_40 = String_New(600, HEAP_ID_115); + param0->unk_44 = String_New(600, HEAP_ID_115); Font_LoadTextPalette(0, 13 * 32, HEAP_ID_115); Font_LoadTextPalette(4, 13 * 32, HEAP_ID_115); diff --git a/src/overlay112/ov112_0225C700.c b/src/overlay112/ov112_0225C700.c index b82e677ea3..e7eb55f813 100644 --- a/src/overlay112/ov112_0225C700.c +++ b/src/overlay112/ov112_0225C700.c @@ -949,7 +949,7 @@ static void ov112_0225D1EC(UnkStruct_ov112_0225D2D0 *param0, UnkStruct_ov112_022 Window_ScheduleCopyToVRAM(¶m0->unk_60[v0]); } - param0->unk_90 = String_Init(256, heapID); + param0->unk_90 = String_New(256, heapID); param0->unk_94 = Graphics_GetPlttDataFromOpenNARC(param1->unk_1A4, 0, ¶m0->unk_98, heapID); Bg_LoadPalette(0, &((u8 *)param0->unk_98->pRawData)[(7 * 0x20) + (7 * 2)], 0x4, (7 * 0x20) + (13 * 2)); @@ -1028,7 +1028,7 @@ static void ov112_0225D408(UnkStruct_ov112_0225D44C *param0, UnkStruct_ov112_022 { param0->unk_00 = 0; param0->unk_02 = 0; - param0->unk_08 = String_Init(256, heapID); + param0->unk_08 = String_New(256, heapID); param0->unk_01 = 7 + param2; Window_Add(param1->unk_00, ¶m0->unk_0C, 3, 0, 0, 180, 2, 7, 0); @@ -1118,7 +1118,7 @@ static void ov112_0225D57C(UnkStruct_ov112_0225D6DC *param0, UnkStruct_ov112_022 memset(param0, 0, sizeof(UnkStruct_ov112_0225D6DC)); v1 = MessageLoader_Init(MSG_LOADER_PRELOAD_ENTIRE_BANK, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_UNK_0653, heapID); - v2 = String_Init(128, heapID); + v2 = String_New(128, heapID); for (v0 = 0; v0 < 4; v0++) { ov112_0225D73C(¶m0->unk_40[v0], Unk_ov112_0225D960[v0], Unk_ov112_0225D968[v0]); @@ -1129,11 +1129,11 @@ static void ov112_0225D57C(UnkStruct_ov112_0225D6DC *param0, UnkStruct_ov112_022 MessageLoader_GetString(v1, 0 + v0, v2); - v3 = String_NumLines(v2); + v3 = String_CountLines(v2); v7 = Unk_ov112_0225D880[v0].unk_08; - v4 = String_Init(String_Length(v2) + 1, heapID); + v4 = String_New(String_GetLength(v2) + 1, heapID); for (v5 = 0; v5 < v3; v5++) { - String_CopyLineNum(v4, v2, v5); + String_CopyLine(v4, v2, v5); switch (Unk_ov112_0225D880[v0].unk_09) { case 0: v6 = Unk_ov112_0225D880[v0].unk_07; diff --git a/src/overlay113/ov113_0225C700.c b/src/overlay113/ov113_0225C700.c index 04c472d6dc..c9fa316cbb 100644 --- a/src/overlay113/ov113_0225C700.c +++ b/src/overlay113/ov113_0225C700.c @@ -389,7 +389,7 @@ int ov113_0225C700(ApplicationManager *appMan, int *param1) ov113_0225D9FC(v0); ov113_0225DBCC(v0); - v0->unk_C4 = String_Init(256, HEAP_ID_118); + v0->unk_C4 = String_New(256, HEAP_ID_118); v0->unk_1C = SpriteSystem_Alloc(118); SpriteSystem_Init(v0->unk_1C, &Unk_ov113_02260954, &Unk_ov113_022608E8, 16 + 16); diff --git a/src/overlay113/ov113_02260620.c b/src/overlay113/ov113_02260620.c index 5c81d77885..8ae6cdaa0d 100644 --- a/src/overlay113/ov113_02260620.c +++ b/src/overlay113/ov113_02260620.c @@ -91,7 +91,7 @@ void ov113_02260620(MessageLoader *param0, StringTemplate *param1, Window param2 StringTemplate_SetString(param1, 0, v4, v6, 1, GAME_LANGUAGE); v2 = MessageLoader_GetNewString(param0, 0); - v3 = String_Init(v5, HEAP_ID_118); + v3 = String_New(v5, HEAP_ID_118); StringTemplate_Format(param1, v3, v2); Window_FillTilemap(¶m2[v7], 0x0); diff --git a/src/overlay114/ov114_0225C700.c b/src/overlay114/ov114_0225C700.c index ac11939797..01dc23e104 100644 --- a/src/overlay114/ov114_0225C700.c +++ b/src/overlay114/ov114_0225C700.c @@ -294,7 +294,7 @@ static void ov114_0225D1AC(UnkStruct_ov114_0225D084 *param0, u32 param1, Window static void ov114_0225D1C8(UnkStruct_ov114_0225D084 *param0, u32 param1, Window *param2, u8 param3, u8 param4); static u32 ov114_0225D218(UnkStruct_ov114_0225D084 *param0, u32 param1, Window *param2, String *param3, u32 param4); static void ov114_0225D254(UnkStruct_ov114_0225D084 *param0, u32 param1, Window *param2, u8 param3, u8 param4, TextColor param5); -static void ov114_0225D290(UnkStruct_ov114_0225D338 *param0, UnkStruct_ov114_0225CEF0 *param1, SaveData *saveData, BOOL param3, u32 param4); +static void ov114_0225D290(UnkStruct_ov114_0225D338 *param0, UnkStruct_ov114_0225CEF0 *param1, SaveData *saveData, BOOL param3, enum HeapID heapID); static void ov114_0225D338(UnkStruct_ov114_0225D338 *param0); static void ov114_0225D368(UnkStruct_ov114_0225D338 *param0, UnkStruct_ov114_0225D084 *param1, u32 param2, u32 param3); static void ov114_0225D400(UnkStruct_ov114_0225D338 *param0, u32 param1); @@ -322,7 +322,7 @@ static void ov114_0225E0AC(void *param0); static void ov114_0225E0F8(UnkStruct_ov114_0225E0F8 *param0, const UnkStruct_ov114_0225C76C *param1); static BOOL ov114_0225E14C(const UnkStruct_ov114_0225C76C *param0, const UnkStruct_ov114_0225E0F8 *param1); u32 ov114_0225E180(u32 param0); -static void ov114_0225E1A4(UnkStruct_ov114_0225E1A4 *param0, UnkStruct_ov114_0225CEF0 *param1, UnkStruct_ov114_0225D084 *param2, u32 param3, NARC *param4, u32 param5); +static void ov114_0225E1A4(UnkStruct_ov114_0225E1A4 *param0, UnkStruct_ov114_0225CEF0 *param1, UnkStruct_ov114_0225D084 *param2, u32 param3, NARC *param4, u32 heapID); static void ov114_0225E234(UnkStruct_ov114_0225E1A4 *param0); static void ov114_0225E244(UnkStruct_ov114_0225E1A4 *param0, UnkStruct_ov114_0225CEF0 *param1, u32 heapID); static void ov114_0225E2D4(UnkStruct_ov114_0225E1A4 *param0, UnkStruct_ov114_0225CEF0 *param1); @@ -1403,8 +1403,8 @@ static void ov114_0225D084(UnkStruct_ov114_0225D084 *param0, u32 heapID) { param0->unk_00 = MessageLoader_Init(MSG_LOADER_PRELOAD_ENTIRE_BANK, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_UNK_0411, heapID); param0->unk_04 = StringTemplate_New(8, 64, heapID); - param0->unk_08 = String_Init(128, heapID); - param0->unk_0C = String_Init(128, heapID); + param0->unk_08 = String_New(128, heapID); + param0->unk_0C = String_New(128, heapID); Font_LoadScreenIndicatorsPalette(0, 12 * 0x20, heapID); Font_LoadScreenIndicatorsPalette(4, 12 * 0x20, heapID); @@ -1502,7 +1502,7 @@ static void ov114_0225D254(UnkStruct_ov114_0225D084 *param0, u32 param1, Window Text_AddPrinterWithParamsAndColor(param2, FONT_SYSTEM, param0->unk_08, param3, param4, TEXT_SPEED_NO_TRANSFER, param5, NULL); } -static void ov114_0225D290(UnkStruct_ov114_0225D338 *param0, UnkStruct_ov114_0225CEF0 *param1, SaveData *saveData, BOOL param3, u32 heapID) +static void ov114_0225D290(UnkStruct_ov114_0225D338 *param0, UnkStruct_ov114_0225CEF0 *param1, SaveData *saveData, BOOL param3, enum HeapID heapID) { u32 v0 = Options_Frame(SaveData_GetOptions(saveData)); u32 v1; @@ -1525,7 +1525,7 @@ static void ov114_0225D290(UnkStruct_ov114_0225D338 *param0, UnkStruct_ov114_022 Window_Add(param1->unk_00, ¶m0->unk_00[v2], v1, 2, v3, 27, 4, 12, 1 + (18 + 12)); Window_FillTilemap(¶m0->unk_00[v2], 0); - param0->unk_24[v2] = String_Init(128, heapID); + param0->unk_24[v2] = String_New(128, heapID); } param0->unk_34 = param3; @@ -2269,7 +2269,7 @@ static void ov114_0225E1A4(UnkStruct_ov114_0225E1A4 *param0, UnkStruct_ov114_022 Window_Add(param1->unk_00, ¶m0->unk_00, 1, 6, 11, 20, 10, 8, 513); Window_FillTilemap(¶m0->unk_00, 0); - param0->unk_14 = String_Init(128, heapID); + param0->unk_14 = String_New(128, heapID); ov114_0225D180(param2, param3); ov114_0225D190(param2, param0->unk_14, 16); param0->unk_10 = param3; diff --git a/src/overlay115/ov115_02260CEC.c b/src/overlay115/ov115_02260CEC.c index b967a4c1c8..9bf3a2ff00 100644 --- a/src/overlay115/ov115_02260CEC.c +++ b/src/overlay115/ov115_02260CEC.c @@ -1417,7 +1417,7 @@ static void ov115_022617E8(UnkStruct_ov115_022617E8 *param0, UnkStruct_ov115_022 Window_Add(param1->unk_00, ¶m0->unk_0C, 1, 2, 19, 28, 4, 5, 1 + 9); Window_FillRectWithColor(¶m0->unk_0C, 15, 0, 0, 28 * 8, 4 * 8); - v0 = String_Init(128, heapID); + v0 = String_New(128, heapID); MessageLoader_GetString(param1->unk_08, 0, v0); Text_AddPrinterWithParamsAndColor(¶m0->unk_0C, FONT_SYSTEM, v0, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 15), NULL); @@ -1440,7 +1440,7 @@ static void ov115_022617E8(UnkStruct_ov115_022617E8 *param0, UnkStruct_ov115_022 Window_Add(param1->unk_00, &v5, 2, 0, 0, 8, 2, 5, 256); v6 = 256; - v7 = String_Init(128, heapID); + v7 = String_New(128, heapID); for (v2 = 0; v2 < param3; v2++) { if (v2 != param4) { @@ -3224,8 +3224,8 @@ static void ov115_02263BCC(UnkStruct_ov115_02261ADC *param0, u32 heapID) { param0->unk_04 = StringTemplate_Default(heapID); param0->unk_08 = MessageLoader_Init(MSG_LOADER_PRELOAD_ENTIRE_BANK, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_UNK_0407, heapID); - param0->unk_0C = String_Init(128, heapID); - param0->unk_10 = String_Init(128, heapID); + param0->unk_0C = String_New(128, heapID); + param0->unk_10 = String_New(128, heapID); } static void ov115_02263C04(UnkStruct_ov115_02261ADC *param0) @@ -4400,7 +4400,7 @@ static void ov115_02265478(UnkStruct_ov115_02265788 *param0, UnkStruct_ov115_022 BOOL v3; UnkStruct_020127E8 v4; - param0->unk_5C = String_Init(16, heapID); + param0->unk_5C = String_New(16, heapID); Window_AddToTopLeftCorner(param1->unk_00, ¶m0->unk_38, 3, 2, 0, 0); param0->unk_4C = sub_02012B20(¶m0->unk_38, heapID); diff --git a/src/overlay117/ov117_02260668.c b/src/overlay117/ov117_02260668.c index c1602d07b4..1fece5eb96 100644 --- a/src/overlay117/ov117_02260668.c +++ b/src/overlay117/ov117_02260668.c @@ -228,7 +228,7 @@ int ov117_02260668(ApplicationManager *appMan, int *param1) v0->unk_80 = MessageLoader_Init(MSG_LOADER_PRELOAD_ENTIRE_BANK, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_UNK_0009, HEAP_ID_110); v0->unk_84 = StringTemplate_Default(HEAP_ID_110); - v0->unk_88 = String_Init(2 * 160, HEAP_ID_110); + v0->unk_88 = String_New(2 * 160, HEAP_ID_110); v0->unk_90 = sub_02012744(2 * 6 + 6 + 1, HEAP_ID_110); ov117_02265210(v0, &v0->unk_1468); diff --git a/src/overlay119/ov119_021D0D80.c b/src/overlay119/ov119_021D0D80.c index cfda228850..6dee0b5471 100644 --- a/src/overlay119/ov119_021D0D80.c +++ b/src/overlay119/ov119_021D0D80.c @@ -299,7 +299,7 @@ int ov119_021D1158(Window *param0, int param1, Pokemon *param2, int param3) v5 = MessageLoader_Init(MSG_LOADER_PRELOAD_ENTIRE_BANK, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_EGG_HATCH, HEAP_ID_71); v3 = StringTemplate_Default(HEAP_ID_71); v1 = MessageLoader_GetNewString(v5, param1); - v2 = String_Init(255, HEAP_ID_71); + v2 = String_New(255, HEAP_ID_71); v4 = Pokemon_GetBoxPokemon(param2); StringTemplate_SetSpeciesName(v3, 0, v4); diff --git a/src/pc_boxes.c b/src/pc_boxes.c index 035c7bbfeb..82a342c053 100644 --- a/src/pc_boxes.c +++ b/src/pc_boxes.c @@ -260,7 +260,7 @@ void PCBoxes_BufferBoxName(const PCBoxes *pcBoxes, u32 boxID, String *dest) } if (boxID < MAX_PC_BOXES) { - String_CopyChars(dest, pcBoxes->names[boxID]); + String_CopyFromChars(dest, pcBoxes->names[boxID]); } else { GF_ASSERT(0); } @@ -273,7 +273,7 @@ void PCBoxes_RenameBox(PCBoxes *pcBoxes, u32 boxID, const String *newName) } if (boxID < MAX_PC_BOXES) { - String_ToChars(newName, pcBoxes->names[boxID], 20); + String_CopyToChars(newName, pcBoxes->names[boxID], 20); SaveData_SetFullSaveRequired(); } } diff --git a/src/poffin_types.c b/src/poffin_types.c index ae98e60888..64ce9dd21d 100644 --- a/src/poffin_types.c +++ b/src/poffin_types.c @@ -14,7 +14,7 @@ PoffinTypeList *PoffinTypeList_New(enum HeapID heapID) types->msgLoader = MessageLoader_Init(MSG_LOADER_PRELOAD_ENTIRE_BANK, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_POFFIN_TYPES, heapID); for (int i = 0; i < NUM_POFFIN_TYPES; i++) { - types->names[i] = String_Init(22, heapID); + types->names[i] = String_New(22, heapID); MessageLoader_GetString(types->msgLoader, i, types->names[i]); } diff --git a/src/pokemon.c b/src/pokemon.c index 71cc911cee..13db11dc63 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -1075,7 +1075,7 @@ static u32 BoxPokemon_GetDataInternal(BoxPokemon *boxMon, enum PokemonDataParam String_Copy(dest, string); String_Free(string); } else { - String_CopyChars(dest, monDataBlockC->nickname); + String_CopyFromChars(dest, monDataBlockC->nickname); } break; @@ -1122,7 +1122,7 @@ static u32 BoxPokemon_GetDataInternal(BoxPokemon *boxMon, enum PokemonDataParam break; case MON_DATA_OT_NAME_STRING: - String_CopyChars(dest, monDataBlockD->otName); + String_CopyFromChars(dest, monDataBlockD->otName); break; case MON_DATA_EGG_YEAR: @@ -1628,13 +1628,13 @@ static void BoxPokemon_SetDataInternal(BoxPokemon *boxMon, enum PokemonDataParam charcode_t nickname[MON_NAME_LEN + 1]; MessageLoader_GetSpeciesName(monDataBlockA->species, HEAP_ID_SYSTEM, baseName); - String_ToChars(value, nickname, NELEMS(nickname)); + String_CopyToChars(value, nickname, NELEMS(nickname)); monDataBlockB->hasNickname = CharCode_Compare(baseName, nickname); } // fall-through case MON_DATA_NICKNAME_STRING: - String_ToChars(value, monDataBlockC->nickname, NELEMS(monDataBlockC->nickname)); + String_CopyToChars(value, monDataBlockC->nickname, NELEMS(monDataBlockC->nickname)); break; case MON_DATA_UNUSED_121: @@ -1684,7 +1684,7 @@ static void BoxPokemon_SetDataInternal(BoxPokemon *boxMon, enum PokemonDataParam break; case MON_DATA_OT_NAME_STRING: - String_ToChars(value, monDataBlockD->otName, NELEMS(monDataBlockD->otName)); + String_CopyToChars(value, monDataBlockD->otName, NELEMS(monDataBlockD->otName)); break; case MON_DATA_EGG_YEAR: @@ -1774,7 +1774,7 @@ static void BoxPokemon_SetDataInternal(BoxPokemon *boxMon, enum PokemonDataParam case MON_DATA_SPECIES_NAME: { String *string = MessageUtil_SpeciesName(monDataBlockA->species, HEAP_ID_SYSTEM); - String_ToChars(string, monDataBlockC->nickname, NELEMS(monDataBlockC->nickname)); + String_CopyToChars(string, monDataBlockC->nickname, NELEMS(monDataBlockC->nickname)); String_Free(string); break; @@ -5045,7 +5045,7 @@ BOOL sub_0207884C(BoxPokemon *boxMon, TrainerInfo *param1, int heapID) u32 monOtGender = BoxPokemon_GetValue(boxMon, MON_DATA_OT_GENDER, NULL); String *v4 = TrainerInfo_NameNewString(param1, heapID); // TODO enum/const value? - String *v5 = String_Init(8, heapID); + String *v5 = String_New(8, heapID); BOOL v6 = FALSE; BoxPokemon_GetValue(boxMon, MON_DATA_OT_NAME_STRING, v5); diff --git a/src/record_mixed_rng.c b/src/record_mixed_rng.c index f99fb782a8..9695dc2f51 100644 --- a/src/record_mixed_rng.c +++ b/src/record_mixed_rng.c @@ -73,10 +73,10 @@ void RecordMixedRNG_GetEntryNameAsString(RecordMixedRNG *rngCollection, enum Rec charcode_t *name; if (nameChoice == RECORD_MIXED_RNG_GROUP_NAME) { name = rngCollection[entry].groupName; - String_ToChars(outString, name, UNION_GROUP_NAME_LEN + 1); + String_CopyToChars(outString, name, UNION_GROUP_NAME_LEN + 1); } else { name = rngCollection[entry].playerName; - String_ToChars(outString, name, TRAINER_NAME_LEN + 1); + String_CopyToChars(outString, name, TRAINER_NAME_LEN + 1); } } diff --git a/src/savedata_misc.c b/src/savedata_misc.c index 61d9adacf3..57ce5df17b 100644 --- a/src/savedata_misc.c +++ b/src/savedata_misc.c @@ -68,7 +68,7 @@ const u16 *MiscSaveBlock_RivalName(const MiscSaveBlock *miscSave) void MiscSaveBlock_SetRivalName(MiscSaveBlock *miscSave, String *name) { - String_ToChars(name, miscSave->rivalName, TRAINER_NAME_LEN + 1); + String_CopyToChars(name, miscSave->rivalName, TRAINER_NAME_LEN + 1); } const u16 *MiscSaveBlock_TabletName(const MiscSaveBlock *miscSave) @@ -78,7 +78,7 @@ const u16 *MiscSaveBlock_TabletName(const MiscSaveBlock *miscSave) void MiscSaveBlock_SetTabletName(MiscSaveBlock *miscSave, String *name) { - String_ToChars(name, miscSave->tabletName, TABLET_NAME_LEN + 1); + String_CopyToChars(name, miscSave->tabletName, TABLET_NAME_LEN + 1); } void MiscSaveBlock_SetInitFlag(MiscSaveBlock *miscSave) diff --git a/src/scrcmd_strings.c b/src/scrcmd_strings.c index 1eb5e20a86..90adc9459c 100644 --- a/src/scrcmd_strings.c +++ b/src/scrcmd_strings.c @@ -352,7 +352,7 @@ BOOL ScrCmd_BufferUndergroundItemName(ScriptContext *ctx) BOOL ScrCmd_BufferMapName(ScriptContext *ctx) { - String *mapName = String_Init(22, HEAP_ID_FIELD1); + String *mapName = String_New(22, HEAP_ID_FIELD1); StringTemplate **strTemplate = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE); u8 templateArg = ScriptContext_ReadByte(ctx); u16 mapHeaderID = ScriptContext_GetVar(ctx); @@ -406,9 +406,9 @@ BOOL ScrCmd_BufferTabletName(ScriptContext *ctx) StringTemplate **strTemplate = FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_MANAGER_STR_TEMPLATE); u8 templateArg = ScriptContext_ReadByte(ctx); - tabletName = String_Init(11, HEAP_ID_FIELD2); + tabletName = String_New(11, HEAP_ID_FIELD2); - String_CopyChars(tabletName, MiscSaveBlock_TabletName(SaveData_MiscSaveBlock(ctx->fieldSystem->saveData))); + String_CopyFromChars(tabletName, MiscSaveBlock_TabletName(SaveData_MiscSaveBlock(ctx->fieldSystem->saveData))); StringTemplate_SetString(*strTemplate, templateArg, tabletName, 0, 0, gGameLanguage); String_Free(tabletName); diff --git a/src/scrcmd_tv_broadcast.c b/src/scrcmd_tv_broadcast.c index 2b20a06a83..56345f579d 100644 --- a/src/scrcmd_tv_broadcast.c +++ b/src/scrcmd_tv_broadcast.c @@ -253,9 +253,9 @@ static BOOL TVInterview_IsEligible(FieldSystem *fieldSystem, int segmentID) static void sub_0204922C(StringTemplate *param0, int param1, const u16 *param2, int param3, int param4, int param5) { - String *v0 = String_Init(64, HEAP_ID_FIELD1); + String *v0 = String_New(64, HEAP_ID_FIELD1); - String_CopyChars(v0, param2); + String_CopyFromChars(v0, param2); StringTemplate_SetString(param0, param1, v0, param3, param5, param4); String_Free(v0); } @@ -300,9 +300,9 @@ static void sub_02049308(FieldSystem *fieldSystem, StringTemplate *param1) TVBroadcast *broadcast = SaveData_GetTVBroadcast(fieldSystem->saveData); UnkStruct_0202E81C *v2 = sub_0202E81C(broadcast); - v0 = String_Init(64, HEAP_ID_FIELD1); + v0 = String_New(64, HEAP_ID_FIELD1); - String_CopyChars(v0, v2->unk_06); + String_CopyFromChars(v0, v2->unk_06); StringTemplate_SetString(param1, 0, v0, v2->unk_02, 1, GAME_LANGUAGE); String_Free(v0); } diff --git a/src/script_manager.c b/src/script_manager.c index fcc1fa9259..0620259484 100644 --- a/src/script_manager.c +++ b/src/script_manager.c @@ -95,8 +95,8 @@ static BOOL FieldTask_RunScript(FieldTask *taskManager) scriptManager->ctx[SCRIPT_CONTEXT_MAIN] = ScriptContext_CreateAndStart(fieldSystem, scriptManager->scriptID); scriptManager->numActiveContexts = 1; scriptManager->strTemplate = StringTemplate_New(8, 64, HEAP_ID_FIELD2); - scriptManager->msgBuf = String_Init(1024, HEAP_ID_FIELD2); - scriptManager->tmpBuf = String_Init(1024, HEAP_ID_FIELD2); + scriptManager->msgBuf = String_New(1024, HEAP_ID_FIELD2); + scriptManager->tmpBuf = String_New(1024, HEAP_ID_FIELD2); scriptManager->state++; case 1: for (i = 0; i < NUM_SCRIPT_CONTEXTS; i++) { diff --git a/src/start_menu.c b/src/start_menu.c index a9631735a6..e8e61f9f31 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -553,7 +553,7 @@ static void sub_0203ADFC(FieldTask *taskMan) String *v8; v6 = StringTemplate_Default(HEAP_ID_FIELD2); - v7 = String_Init(8, HEAP_ID_FIELD2); + v7 = String_New(8, HEAP_ID_FIELD2); v8 = MessageLoader_GetNewString(v2, sStartMenuActions[menu->options[i]].text); StringTemplate_SetPlayerName(v6, 0, SaveData_GetTrainerInfo(fieldSystem->saveData)); @@ -695,7 +695,7 @@ static void sub_0203B094(FieldTask *taskMan) String_Free(v5); v3 = StringTemplate_Default(HEAP_ID_FIELD2); - v4 = String_Init(32, HEAP_ID_FIELD2); + v4 = String_New(32, HEAP_ID_FIELD2); v5 = MessageLoader_GetNewString(v2, 11); if (v6 == 0) { diff --git a/src/string_gf.c b/src/string_gf.c index d196560be3..896daa1522 100644 --- a/src/string_gf.c +++ b/src/string_gf.c @@ -7,73 +7,65 @@ #include "heap.h" -#define SIZEOF_STRING_HEADER (sizeof(String) - sizeof(charcode_t)) -#define STRING_MAGIC_NUMBER (0xB6F8D2EC) +#define STRING_HEADER_SIZE (sizeof(String) - sizeof(charcode_t)) +#define STRING_MAGIC_NUMBER (0xB6F8D2EC) +#define STRING_INVAL (STRING_MAGIC_NUMBER + 1) -static inline void String_Check(const String *string) +static inline void String_Assert(const String *string) { GF_ASSERT(string != NULL); GF_ASSERT(string->integrity == STRING_MAGIC_NUMBER); } -String *String_Init(u32 size, u32 heapID) +String *String_New(u32 maxSize, enum HeapID heapID) { - String *string = Heap_Alloc(heapID, SIZEOF_STRING_HEADER + (size * sizeof(charcode_t))); - - if (string) { + String *string = Heap_Alloc(heapID, STRING_HEADER_SIZE + (maxSize * sizeof(charcode_t))); + if (string != NULL) { string->integrity = STRING_MAGIC_NUMBER; - string->maxSize = size; + string->maxSize = maxSize; string->size = 0; string->data[0] = CHAR_EOS; } - return string; } void String_Free(String *string) { - String_Check(string); - - string->integrity = STRING_MAGIC_NUMBER + 1; + String_Assert(string); + string->integrity = STRING_INVAL; Heap_Free(string); } void String_Clear(String *string) { - String_Check(string); - + String_Assert(string); string->size = 0; string->data[0] = CHAR_EOS; } -void String_Copy(String *dst, const String *src) +void String_Copy(String *dest, String *src) { - String_Check(dst); - String_Check(src); - - if (dst->maxSize > src->size) { - memcpy(dst->data, src->data, (src->size + 1) * sizeof(charcode_t)); - dst->size = src->size; + 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(const String *src, u32 heapID) +String *String_Clone(String *src, enum HeapID heapID) { - String_Check(src); - - String *string = String_Init(src->size + 1, heapID); - - if (string) { - String_Copy(string, src); + String_Assert(src); + String *ret = String_New(src->size + 1, heapID); + if (ret != NULL) { + String_Copy(ret, src); } - - return string; + return ret; } -void String_FormatInt(String *dst, int num, u32 maxDigits, enum PaddingMode paddingMode, enum CharsetMode charsetMode) +void String_FormatInt(String *dest, int num, u32 maxDigits, enum PaddingMode paddingMode, enum CharsetMode charsetMode) { static const u32 sPowersOfTen[] = { 1, @@ -85,8 +77,9 @@ void String_FormatInt(String *dst, int num, u32 maxDigits, enum PaddingMode padd 1000000, 10000000, 100000000, - 1000000000 + 1000000000, }; + static const charcode_t sDigits_JP[] = { CHAR_WIDE_0, CHAR_WIDE_1, @@ -99,6 +92,7 @@ void String_FormatInt(String *dst, int num, u32 maxDigits, enum PaddingMode padd CHAR_WIDE_8, CHAR_WIDE_9, }; + static const charcode_t sDigits_EN[] = { CHAR_0, CHAR_1, @@ -112,69 +106,67 @@ void String_FormatInt(String *dst, int num, u32 maxDigits, enum PaddingMode padd CHAR_9, }; - String_Check(dst); + String_Assert(dest); - BOOL negative = (num < 0); + BOOL isNegative = (num < 0); - if (dst->maxSize > (maxDigits + negative)) { + if (dest->maxSize > maxDigits + isNegative) { const charcode_t *digitSet = (charsetMode == CHARSET_MODE_JP) ? sDigits_JP : sDigits_EN; - String_Clear(dst); + String_Clear(dest); - if (negative) { + if (isNegative) { num *= -1; - dst->data[dst->size++] = (charsetMode == CHARSET_MODE_JP) ? CHAR_WIDE_MINUS : CHAR_MINUS; + dest->data[dest->size++] = (charsetMode == CHARSET_MODE_JP) ? CHAR_WIDE_MINUS : CHAR_MINUS; } - u32 div = sPowersOfTen[maxDigits - 1]; - while (div != 0) { - u16 digit = num / div; - num -= div * digit; + u32 dividend = sPowersOfTen[maxDigits - 1]; + while (dividend != 0) { + u16 digit = num / dividend; + num -= dividend * digit; if (paddingMode == PADDING_MODE_ZEROES) { - dst->data[dst->size++] = (digit < 10) ? digitSet[digit] : CHAR_WIDE_QUESTION; + dest->data[dest->size++] = (digit < 10) ? digitSet[digit] : CHAR_WIDE_QUESTION; // If we hit a non-zero digit, flip the padding mode off - } else if (digit != 0 || div == 1) { + } else if (digit != 0 || dividend == 1) { paddingMode = PADDING_MODE_ZEROES; - dst->data[dst->size++] = (digit < 10) ? digitSet[digit] : CHAR_WIDE_QUESTION; + dest->data[dest->size++] = (digit < 10) ? digitSet[digit] : CHAR_WIDE_QUESTION; } else if (paddingMode == PADDING_MODE_SPACES) { - dst->data[dst->size++] = (charsetMode == CHARSET_MODE_JP) ? CHAR_WIDE_SPACE : CHAR_NUM_SPACE; + dest->data[dest->size++] = (charsetMode == CHARSET_MODE_JP) ? CHAR_WIDE_SPACE : CHAR_NUM_SPACE; } - - div /= 10; + dividend /= 10; } - - dst->data[dst->size] = CHAR_EOS; + dest->data[dest->size] = CHAR_EOS; return; } - GF_ASSERT(FALSE); } -void String_FormatU64(String *dst, u64 num, u32 maxDigits, enum PaddingMode paddingMode, enum CharsetMode charsetMode) +void String_FormatU64(String *dest, u64 num, u32 maxDigits, enum PaddingMode paddingMode, enum CharsetMode charsetMode) { static const u64 sPowersOfTen[] = { - 1, - 10, - 100, - 1000, - 10000, - 100000, - 1000000, - 10000000, - 100000000, - 1000000000, - 10000000000, - 100000000000, - 1000000000000, - 10000000000000, - 100000000000000, - 1000000000000000, - 10000000000000000, - 100000000000000000, - 1000000000000000000, - 10000000000000000000 + 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_WIDE_0, CHAR_WIDE_1, @@ -187,6 +179,7 @@ void String_FormatU64(String *dst, u64 num, u32 maxDigits, enum PaddingMode padd CHAR_WIDE_8, CHAR_WIDE_9, }; + static const charcode_t sDigits_EN[] = { CHAR_0, CHAR_1, @@ -200,94 +193,88 @@ void String_FormatU64(String *dst, u64 num, u32 maxDigits, enum PaddingMode padd CHAR_9, }; - String_Check(dst); + String_Assert(dest); - BOOL negative = (num < 0); + BOOL isNegative = (num < 0); - if (dst->maxSize > (maxDigits + negative)) { + if (dest->maxSize > maxDigits + isNegative) { const charcode_t *digitSet = (charsetMode == CHARSET_MODE_JP) ? sDigits_JP : sDigits_EN; - String_Clear(dst); + String_Clear(dest); - if (negative) { + if (isNegative) { num *= -1; - dst->data[dst->size++] = (charsetMode == CHARSET_MODE_JP) ? CHAR_WIDE_MINUS : CHAR_MINUS; + dest->data[dest->size++] = (charsetMode == CHARSET_MODE_JP) ? CHAR_WIDE_MINUS : CHAR_MINUS; } - u64 div = sPowersOfTen[maxDigits - 1]; - while (div != 0) { - u64 digit = num / div; - num -= div * digit; + u64 dividend = sPowersOfTen[maxDigits - 1]; + while (dividend != 0ull) { + u64 digit = num / dividend; + num -= dividend * digit; if (paddingMode == PADDING_MODE_ZEROES) { - dst->data[dst->size++] = (digit < 10) ? digitSet[digit] : CHAR_WIDE_QUESTION; - } else if ((digit != 0) || (div == 1)) { + dest->data[dest->size++] = (digit < 10) ? digitSet[digit] : CHAR_WIDE_QUESTION; + } else if (digit != 0 || dividend == 1) { paddingMode = PADDING_MODE_ZEROES; - dst->data[dst->size++] = (digit < 10) ? digitSet[digit] : CHAR_WIDE_QUESTION; + dest->data[dest->size++] = (digit < 10) ? digitSet[digit] : CHAR_WIDE_QUESTION; } else if (paddingMode == PADDING_MODE_SPACES) { - dst->data[dst->size++] = (charsetMode == CHARSET_MODE_JP) ? CHAR_WIDE_SPACE : CHAR_SPACE; + dest->data[dest->size++] = (charsetMode == CHARSET_MODE_JP) ? CHAR_WIDE_SPACE : CHAR_SPACE; } - - div /= 10; + dividend /= 10ull; } - - dst->data[dst->size] = CHAR_EOS; + dest->data[dest->size] = CHAR_EOS; return; } - GF_ASSERT(FALSE); } -u64 String_AtoI(const String *src, BOOL *success) +u64 String_AtoI(String *string, BOOL *success) { - u64 result = 0, pow = 1; - if (src->size > 18) { + s64 ret = 0ll; + s64 pow = 1ll; + if (string->size > 18) { return 0; } - for (int i = (src->size - 1); i >= 0; i--) { - u64 digit = src->data[i] - CHAR_WIDE_0; - if (digit >= 10) { - digit = src->data[i] - CHAR_0; - - if (digit >= 10) { + for (int i = (string->size - 1); i >= 0; i--) { + s64 digit = string->data[i] - CHAR_WIDE_0; + if (digit >= 10ull) { + digit = string->data[i] - CHAR_0; + if (digit >= 10ull) { *success = FALSE; - return result; + return ret; } } - digit *= pow; - result += digit; + ret += digit; pow *= 10; } - *success = TRUE; - return result; + return ret; } -int String_Compare(const String *str1, const String *str2) +BOOL String_Compare(String *str1, String *str2) { - String_Check(str1); - String_Check(str2); + String_Assert(str1); + String_Assert(str2); for (int i = 0; str1->data[i] == str2->data[i]; i++) { if (str1->data[i] == CHAR_EOS) { - return 0; + return FALSE; } } - - return 1; + return TRUE; } -u32 String_Length(const String *string) +u16 String_GetLength(String *string) { - String_Check(string); + String_Assert(string); return string->size; } -u32 String_NumLines(const String *string) +u32 String_CountLines(const String *string) { - String_Check(string); + String_Assert(string); int i, count; for (i = 0, count = 1; i < string->size; i++) { @@ -295,18 +282,16 @@ u32 String_NumLines(const String *string) count++; } } - return count; } -void String_CopyLineNum(String *dst, const String *src, u32 lineNum) +void String_CopyLine(String *dest, const String *src, u32 lineNum) { - String_Check(src); - String_Check(dst); + String_Assert(src); + String_Assert(dest); int i = 0; - - if (lineNum) { + if (lineNum != 0) { for (i = 0; i < src->size; i++) { if (src->data[i] == CHAR_CR && --lineNum == 0) { i++; @@ -314,104 +299,91 @@ void String_CopyLineNum(String *dst, const String *src, u32 lineNum) } } } - - String_Clear(dst); - + String_Clear(dest); for (; i < src->size; i++) { if (src->data[i] == CHAR_CR) { break; } - - String_AppendChar(dst, src->data[i]); + String_AppendChar(dest, src->data[i]); } } -void String_CopyChars(String *dst, const charcode_t *src) +void String_CopyFromChars(String *dest, const charcode_t *src) { - String_Check(dst); + String_Assert(dest); - dst->size = 0; - - while (*src != CHAR_EOS) { - if (dst->size >= (dst->maxSize - 1)) { + for (dest->size = 0; *src != CHAR_EOS;) { + if (dest->size >= dest->maxSize - 1) { GF_ASSERT(FALSE); break; } - - dst->data[dst->size++] = *src++; + dest->data[dest->size++] = *src++; } - - dst->data[dst->size] = CHAR_EOS; + dest->data[dest->size] = CHAR_EOS; } -void String_CopyNumChars(String *dst, const charcode_t *src, u32 num) +void String_CopyNumChars(String *dest, const charcode_t *src, u32 num) { - String_Check(dst); + String_Assert(dest); - if (num <= dst->maxSize) { - memcpy(dst->data, src, num * sizeof(charcode_t)); + if (num <= dest->maxSize) { + memcpy(dest->data, src, num * sizeof(charcode_t)); - u32 i; + int i; for (i = 0; i < num; i++) { - if (dst->data[i] == CHAR_EOS) { + if (dest->data[i] == CHAR_EOS) { break; } } - - dst->size = i; + dest->size = i; if (i == num) { - dst->data[num - 1] = CHAR_EOS; + dest->data[num - 1] = CHAR_EOS; } - return; } - GF_ASSERT(FALSE); } -void String_ToChars(const String *src, charcode_t *dst, u32 dstSize) +void String_CopyToChars(String *src, charcode_t *dest, u32 destSize) { - String_Check(src); + String_Assert(src); - if ((src->size + 1) <= dstSize) { - memcpy(dst, src->data, (src->size + 1) * sizeof(charcode_t)); + if (src->size + 1 <= destSize) { + memcpy(dest, src->data, (src->size + 1) * sizeof(charcode_t)); return; } - GF_ASSERT(FALSE); } -const charcode_t *String_GetData(const String *src) +charcode_t *String_GetChars(String *string) { - String_Check(src); + String_Assert(string); - return src->data; + return string->data; } -void String_Concat(String *dst, const String *src) +void String_Concat(String *dest, String *src) { - String_Check(dst); - String_Check(src); + String_Assert(dest); + String_Assert(src); - if ((dst->size + src->size + 1) <= dst->maxSize) { - memcpy(dst->data + dst->size, src->data, (src->size + 1) * sizeof(charcode_t)); - dst->size += src->size; + 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 *dst, charcode_t c) +void String_AppendChar(String *string, charcode_t c) { - String_Check(dst); + String_Assert(string); - if ((dst->size + 1) < dst->maxSize) { - dst->data[dst->size++] = c; - dst->data[dst->size] = CHAR_EOS; + if (string->size + 1 < string->maxSize) { + string->data[string->size++] = c; + string->data[string->size] = CHAR_EOS; return; } - GF_ASSERT(FALSE); } @@ -423,7 +395,7 @@ BOOL String_IsTrainerName(String *string) return string->size > 0 && string->data[0] == CHAR_COMPRESSED_MARK; } -void String_ConcatTrainerName(String *dst, String *src) +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 @@ -432,21 +404,19 @@ void String_ConcatTrainerName(String *dst, String *src) // TODO: This process could do with some more documentation, i.e. why this // is done. if (String_IsTrainerName(src)) { - charcode_t *dstChar = &dst->data[dst->size]; + charcode_t *dstChar = &dest->data[dest->size]; charcode_t *srcChar = &src->data[1]; s32 shift = 0; - s32 charsAdded = 0; + u32 charsAdded = 0; charcode_t curChar = 0; while (TRUE) { curChar = (*srcChar >> shift) & COMPRESSED_MASK; shift += 9; - if (shift >= 15) { srcChar++; shift -= 15; - - if (shift) { + if (shift != 0) { curChar |= (*srcChar << (9 - shift)) & COMPRESSED_MASK; } } @@ -454,25 +424,23 @@ void String_ConcatTrainerName(String *dst, String *src) if (curChar == COMPRESSED_EOS) { break; } - *dstChar++ = curChar; charsAdded++; } - *dstChar = CHAR_EOS; - dst->size += charsAdded; + dest->size += charsAdded; } else { - String_Concat(dst, src); + String_Concat(dest, src); } } -void String_UpperChar(String *string, int i) +void String_UpperChar(String *string, int index) { - String_Check(string); + String_Assert(string); - if (string->size > i) { - if (string->data[i] >= CHAR_a && string->data[i] <= CHAR_z) { - string->data[i] -= (CHAR_a - CHAR_A); + 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_template.c b/src/string_template.c index 81f61f1559..ac0c383773 100644 --- a/src/string_template.c +++ b/src/string_template.c @@ -57,7 +57,7 @@ StringTemplate *StringTemplate_New(u32 maxArgs, u32 maxLen, u32 heapID) tmp->maxArgs = maxArgs; tmp->heapID = heapID; - tmp->templateBuf = String_Init(maxLen, heapID); + tmp->templateBuf = String_New(maxLen, heapID); if (tmp->templateBuf == NULL) { goto cleanup; } @@ -70,7 +70,7 @@ StringTemplate *StringTemplate_New(u32 maxArgs, u32 maxLen, u32 heapID) u32 arg; for (arg = 0; arg < maxArgs; arg++) { InitStringTemplateArgHeader(&tmp->args[arg].header); - tmp->args[arg].string = String_Init(maxLen, heapID); + tmp->args[arg].string = String_New(maxLen, heapID); if (tmp->args[arg].string == NULL) { break; @@ -143,13 +143,13 @@ void StringTemplate_SetString(StringTemplate *template, u32 idx, const String *a void StringTemplate_SetPlayerName(StringTemplate *template, u32 idx, const TrainerInfo *playerInfo) { - String_CopyChars(template->templateBuf, TrainerInfo_Name(playerInfo)); + String_CopyFromChars(template->templateBuf, TrainerInfo_Name(playerInfo)); SetStringTemplateArg(template, idx, template->templateBuf, NULL); } void StringTemplate_SetRivalName(StringTemplate *template, u32 idx, const SaveData *saveData) { - String_CopyChars(template->templateBuf, MiscSaveBlock_RivalName(SaveData_MiscSaveBlockConst(saveData))); + String_CopyFromChars(template->templateBuf, MiscSaveBlock_RivalName(SaveData_MiscSaveBlockConst(saveData))); SetStringTemplateArg(template, idx, template->templateBuf, NULL); } @@ -340,7 +340,7 @@ void StringTemplate_SetFrontierTrainerName(StringTemplate *template, u32 idx, u3 void StringTemplate_SetTrainerNameBattle(StringTemplate *template, u32 idx, Trainer *trainer) { - String_CopyChars(template->templateBuf, trainer->name); + String_CopyFromChars(template->templateBuf, trainer->name); SetStringTemplateArg(template, idx, template->templateBuf, NULL); } @@ -528,9 +528,9 @@ void StringTemplate_SetUnionGroupName(StringTemplate *template, SaveData *saveDa gender = RecordMixedRNG_GetEntryGender(group, groupID); countryCode = RecordMixedRNG_GetEntryCountryCode(group, groupID); - groupName = String_Init(64, HEAP_ID_FIELD1); + groupName = String_New(64, HEAP_ID_FIELD1); - String_CopyChars(groupName, RecordMixedRNG_GetEntryName(group, groupID, nameType)); + String_CopyFromChars(groupName, RecordMixedRNG_GetEntryName(group, groupID, nameType)); StringTemplate_SetString(template, idx, groupName, gender, 1, countryCode); String_Free(groupName); } @@ -630,7 +630,7 @@ void StringTemplate_SetFloorNumber(StringTemplate *template, u32 idx, u32 floor) void StringTemplate_Format(const StringTemplate *template, String *dst, const String *fmtString) { - const charcode_t *c = String_GetData(fmtString); + const charcode_t *c = String_GetChars(fmtString); String_Clear(dst); while (*c != CHAR_EOS) { diff --git a/src/text.c b/src/text.c index 66ccac82f4..8beabf151e 100644 --- a/src/text.c +++ b/src/text.c @@ -188,7 +188,7 @@ u8 Text_AddPrinter(const TextPrinterTemplate *template, u32 renderDelay, TextPri } printer->template = *template; - printer->template.toPrint.raw = String_GetData(printer->template.toPrint.string); + printer->template.toPrint.raw = String_GetChars(printer->template.toPrint.string); printer->callback = callback; sPausePrinter = FALSE; diff --git a/src/trainer_card_screen/trainer_card_display_text.c b/src/trainer_card_screen/trainer_card_display_text.c index 8a1a9dd37a..8267842735 100644 --- a/src/trainer_card_screen/trainer_card_display_text.c +++ b/src/trainer_card_screen/trainer_card_display_text.c @@ -175,7 +175,7 @@ void TrainerCard_DrawFrontText(Window *windows, const TrainerCard *trainerCard) Window_FillRectWithColor(&windows[TRAINER_CARD_WINDOW_ADVENTURE_STARTED], 0, 0, 0, TRAINER_CARD_WINDOW_FULL_WIDTH * TILE_WIDTH_PIXELS, TRAINER_CARD_WINDOW_HEIGHT * TILE_HEIGHT_PIXELS); MessageLoader *messageLoader = MessageLoader_Init(MSG_LOADER_PRELOAD_ENTIRE_BANK, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_TRAINER_CARD, HEAP_ID_TRAINER_CARD_SCREEN); - String *string = String_Init(32, HEAP_ID_TRAINER_CARD_SCREEN); + String *string = String_New(32, HEAP_ID_TRAINER_CARD_SCREEN); for (i = TRAINER_CARD_WINDOW_ID; i < TRAINER_CARD_WINDOW_HOF_DEBUT; i++) { if (i != TRAINER_CARD_WINDOW_POKEDEX || i == TRAINER_CARD_WINDOW_POKEDEX && trainerCard->pokedexObtained) { @@ -184,11 +184,11 @@ void TrainerCard_DrawFrontText(Window *windows, const TrainerCard *trainerCard) } } - String *fmtString = String_Init(32, HEAP_ID_TRAINER_CARD_SCREEN); + String *fmtString = String_New(32, HEAP_ID_TRAINER_CARD_SCREEN); StringTemplate *template = StringTemplate_New(6, 32, HEAP_ID_TRAINER_CARD_SCREEN); TrainerCard_DrawNumber(&windows[TRAINER_CARD_WINDOW_ID], TRAINER_CARD_WINDOW_PARTIAL_WIDTH * TILE_WIDTH_PIXELS, 0, 0, string, trainerCard->id, 5, PADDING_MODE_ZEROES); - String_CopyChars(string, trainerCard->name); + String_CopyFromChars(string, trainerCard->name); TrainerCard_DrawString(&windows[TRAINER_CARD_WINDOW_NAME], TRAINER_CARD_WINDOW_PARTIAL_WIDTH * TILE_WIDTH_PIXELS, 0, 0, string); StringTemplate_SetNumber(template, 5, trainerCard->money, 6, PADDING_MODE_NONE, CHARSET_MODE_EN); @@ -252,14 +252,14 @@ void TrainerCard_DrawBackText(Window *windows, const TrainerCard *trainerCard) Window_FillRectWithColor(&windows[TRAINER_CARD_WINDOW_LINK_TRADES], 0, 0, 0, TRAINER_CARD_WINDOW_FULL_WIDTH * TILE_WIDTH_PIXELS, TRAINER_CARD_WINDOW_HEIGHT * TILE_HEIGHT_PIXELS); MessageLoader *messageLoader = MessageLoader_Init(MSG_LOADER_PRELOAD_ENTIRE_BANK, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_TRAINER_CARD, HEAP_ID_TRAINER_CARD_SCREEN); - String *string = String_Init(32, HEAP_ID_TRAINER_CARD_SCREEN); + String *string = String_New(32, HEAP_ID_TRAINER_CARD_SCREEN); for (i = TRAINER_CARD_WINDOW_HOF_DEBUT; i < TRAINER_CARD_WINDOW_COUNT; i++) { MessageLoader_GetString(messageLoader, sTrainerCardTextFields[i], string); Text_AddPrinterWithParamsAndColor(&windows[i], FONT_SYSTEM, string, 0, 0, TEXT_SPEED_INSTANT, TEXT_COLOR(1, 2, 0), NULL); } - String *fmtString = String_Init(32, HEAP_ID_TRAINER_CARD_SCREEN); + String *fmtString = String_New(32, HEAP_ID_TRAINER_CARD_SCREEN); StringTemplate *template = StringTemplate_New(6, 32, HEAP_ID_TRAINER_CARD_SCREEN); if (trainerCard->hofDebutMonth != 0) { @@ -342,8 +342,8 @@ void TrainerCard_DrawUpdatedTime(Window *windows, const TrainerCard *trainerCard Window_FillRectWithColor(&windows[TRAINER_CARD_WINDOW_TIME], 0, 184, 0, 5 * TILE_WIDTH_PIXELS, TRAINER_CARD_WINDOW_HEIGHT * TILE_HEIGHT_PIXELS); MessageLoader *messageLoader = MessageLoader_Init(MSG_LOADER_PRELOAD_ENTIRE_BANK, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_TRAINER_CARD, HEAP_ID_TRAINER_CARD_SCREEN); - String *string = String_Init(32, HEAP_ID_TRAINER_CARD_SCREEN); - String *fmtString = String_Init(32, HEAP_ID_TRAINER_CARD_SCREEN); + String *string = String_New(32, HEAP_ID_TRAINER_CARD_SCREEN); + String *fmtString = String_New(32, HEAP_ID_TRAINER_CARD_SCREEN); StringTemplate *template = StringTemplate_New(2, 32, HEAP_ID_TRAINER_CARD_SCREEN); StringTemplate_SetNumber(template, 0, PlayTime_GetHours(trainerCard->playTime), 3, PADDING_MODE_SPACES, CHARSET_MODE_EN); diff --git a/src/trainer_card_screen/trainer_card_screen.c b/src/trainer_card_screen/trainer_card_screen.c index b052e4d7e0..c3a97131e4 100644 --- a/src/trainer_card_screen/trainer_card_screen.c +++ b/src/trainer_card_screen/trainer_card_screen.c @@ -444,8 +444,8 @@ BOOL TrainerCardScreen_Exit(ApplicationManager *appMan, int *state) static void TrainerCard_InitStrings(TrainerCardScreen *trainerCardScreen) { - trainerCardScreen->unusedString = String_Init(4, HEAP_ID_TRAINER_CARD_SCREEN); - trainerCardScreen->colonString = String_Init(5, HEAP_ID_TRAINER_CARD_SCREEN); + trainerCardScreen->unusedString = String_New(4, HEAP_ID_TRAINER_CARD_SCREEN); + trainerCardScreen->colonString = String_New(5, HEAP_ID_TRAINER_CARD_SCREEN); MessageLoader *messageLoader = MessageLoader_Init(MSG_LOADER_PRELOAD_ENTIRE_BANK, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_TRAINER_CARD, HEAP_ID_TRAINER_CARD_SCREEN); diff --git a/src/trainer_data.c b/src/trainer_data.c index a2422be3df..5f7aa36e6f 100644 --- a/src/trainer_data.c +++ b/src/trainer_data.c @@ -40,7 +40,7 @@ void Trainer_Encounter(FieldBattleDTO *dto, const SaveData *saveData, int heapID CharCode_Copy(dto->trainer[i].name, rivalName); } else { String *trainerName = MessageLoader_GetNewString(msgLoader, dto->trainerIDs[i]); - String_ToChars(trainerName, dto->trainer[i].name, TRAINER_NAME_LEN + 1); + String_CopyToChars(trainerName, dto->trainer[i].name, TRAINER_NAME_LEN + 1); String_Free(trainerName); } diff --git a/src/trainer_info.c b/src/trainer_info.c index 51026207b6..5eab3b5c48 100644 --- a/src/trainer_info.c +++ b/src/trainer_info.c @@ -58,7 +58,7 @@ void TrainerInfo_SetName(TrainerInfo *info, const charcode_t *name) void TrainerInfo_SetNameFromString(TrainerInfo *info, const String *name) { - String_ToChars(name, info->name, TRAINER_NAME_LEN + 1); + String_CopyToChars(name, info->name, TRAINER_NAME_LEN + 1); } const charcode_t *TrainerInfo_Name(const TrainerInfo *info) @@ -68,12 +68,12 @@ const charcode_t *TrainerInfo_Name(const TrainerInfo *info) void TrainerInfo_NameString(const TrainerInfo *info, String *name) { - String_CopyChars(name, info->name); + String_CopyFromChars(name, info->name); } String *TrainerInfo_NameNewString(const TrainerInfo *info, int heapID) { - String *name = String_Init(TRAINER_NAME_LEN + 1, heapID); + String *name = String_New(TRAINER_NAME_LEN + 1, heapID); TrainerInfo_NameString(info, name); return name; diff --git a/src/tv_episode_segment.c b/src/tv_episode_segment.c index 06e539cb53..cf26c6c874 100644 --- a/src/tv_episode_segment.c +++ b/src/tv_episode_segment.c @@ -479,9 +479,9 @@ static void SaveData_SaveTVEpisodeSegment(SaveData *saveData, int programTypeID, static void sub_0206CD94(StringTemplate *template, int idx, const u16 *param2, int unused3, int unused4, int unused5) { - String *string = String_Init(64, HEAP_ID_FIELD1); + String *string = String_New(64, HEAP_ID_FIELD1); - String_CopyChars(string, param2); + String_CopyFromChars(string, param2); StringTemplate_SetString(template, idx, string, unused3, unused5, unused4); String_Free(string); } @@ -493,10 +493,10 @@ static void TVEpisodeSegment_SetTemplateTrainerName(StringTemplate *template, in static void sub_0206CE08(int heapID, u16 *param1, Pokemon *mon) { - String *string = String_Init(64, heapID); + String *string = String_New(64, heapID); Pokemon_GetValue(mon, MON_DATA_NICKNAME_STRING, string); - String_ToChars(string, param1, TEMPLATE_NAME_SIZE); + String_CopyToChars(string, param1, TEMPLATE_NAME_SIZE); String_Free(string); } @@ -529,10 +529,10 @@ static void sub_0206CED0(int heapID, Pokemon *mon, u8 *param2, u16 *param3) *param2 = Pokemon_GetValue(mon, MON_DATA_HAS_NICKNAME, NULL); if (*param2) { - String *string = String_Init(64, heapID); + String *string = String_New(64, heapID); Pokemon_GetValue(mon, MON_DATA_NICKNAME_STRING, string); - String_ToChars(string, param3, TEMPLATE_NAME_SIZE); + String_CopyToChars(string, param3, TEMPLATE_NAME_SIZE); String_Free(string); } } @@ -2018,10 +2018,10 @@ static int TVEpisodeSegment_LoadMessage_BattleFrontierFrontlineNews_Multi(FieldS { int messageID; TVEpisodeSegment_BattleFrontierFrontlineNews_Multi *battleFrontierFrontlineNewsMulti = ov6_02246498(param2); - String *v2 = String_Init(64, HEAP_ID_FIELD1); + String *v2 = String_New(64, HEAP_ID_FIELD1); TVEpisodeSegment_SetTemplateTrainerName(template, 0, param2); - String_CopyChars(v2, battleFrontierFrontlineNewsMulti->unk_00.unk_06); + String_CopyFromChars(v2, battleFrontierFrontlineNewsMulti->unk_00.unk_06); StringTemplate_SetString(template, 1, v2, battleFrontierFrontlineNewsMulti->unk_00.unk_02, 0, battleFrontierFrontlineNewsMulti->unk_00.unk_03); String_Free(v2); StringTemplate_SetCustomMessageWord(template, 2, battleFrontierFrontlineNewsMulti->customWordMessage); @@ -2544,7 +2544,7 @@ static int TVEpisodeSegment_LoadMessage_RoamerNewsFlash(FieldSystem *fieldSystem SpecialEncounter *speEnc; u16 roamingRouteIndex, i; u32 species, personality; - String *string = String_Init(22, HEAP_ID_FIELD1); + String *string = String_New(22, HEAP_ID_FIELD1); TrainerInfo *trainerInfo = SaveData_GetTrainerInfo(FieldSystem_GetSaveData(fieldSystem)); speEnc = SaveData_GetSpecialEncounters(fieldSystem->saveData); @@ -2626,7 +2626,7 @@ static int sub_0206EEBC(FieldSystem *fieldSystem, StringTemplate *param1, UnkStr { u16 v6; - String *v7 = String_Init(7 + 1, HEAP_ID_FIELD1); + String *v7 = String_New(7 + 1, HEAP_ID_FIELD1); int v8 = sub_0202A1C0(v0); sub_0202A1A0(v0, v7); diff --git a/src/unk_02014A84.c b/src/unk_02014A84.c index 9f4b6f90f1..bf51a5579b 100644 --- a/src/unk_02014A84.c +++ b/src/unk_02014A84.c @@ -146,7 +146,7 @@ static u32 sub_02014C00(u32 param0, u32 param1) GF_ASSERT(param1 < sub_02014CD4(param0)); v0 = MessageBank_GetNewStringFromNARC(26, Unk_020E5498[param0], param1, 0); - v1 = String_GetData(v0); + v1 = String_GetChars(v0); v2 = 0; while (*v1 != 0xffff) { diff --git a/src/unk_020298BC.c b/src/unk_020298BC.c index 787bd25a8c..b926630e27 100644 --- a/src/unk_020298BC.c +++ b/src/unk_020298BC.c @@ -144,7 +144,7 @@ static void sub_02029990(UnkStruct_0202A138 *param0, Pokemon *param1, UnkStruct_ static void sub_020299C0(UnkStruct_0202A138 *param0, const String *param1, int param2) { - String_ToChars(param1, param0->unk_20, 8); // Possibly TRAINER_NAME_LEN + 1 + String_CopyToChars(param1, param0->unk_20, 8); // Possibly TRAINER_NAME_LEN + 1 param0->unk_34 = param2; } @@ -842,7 +842,7 @@ u16 sub_0202A5E8(const UnkStruct_0202A138 *param0) void sub_0202A5EC(const UnkStruct_0202A138 *param0, String *param1) { - String_CopyChars(param1, param0->unk_20); + String_CopyFromChars(param1, param0->unk_20); } u32 sub_0202A5FC(const UnkStruct_0202A138 *param0) diff --git a/src/unk_0202ACE0.c b/src/unk_0202ACE0.c index a94153de7a..8b4a6be7e7 100644 --- a/src/unk_0202ACE0.c +++ b/src/unk_0202ACE0.c @@ -142,7 +142,7 @@ u16 *sub_0202AEF0(WiFiList *param0, int param1) void sub_0202AF0C(WiFiList *param0, int param1, String *param2) { GF_ASSERT(param1 < 32); - String_ToChars(param2, param0->unk_1C0[param1].unk_10, sizeof(param0->unk_1C0[param1].unk_10)); + String_CopyToChars(param2, param0->unk_1C0[param1].unk_10, sizeof(param0->unk_1C0[param1].unk_10)); } u16 *sub_0202AF34(WiFiList *param0, int param1) @@ -154,7 +154,7 @@ u16 *sub_0202AF34(WiFiList *param0, int param1) void sub_0202AF50(WiFiList *param0, int param1, String *param2) { GF_ASSERT(param1 < 32); - String_ToChars(param2, param0->unk_1C0[param1].unk_00, sizeof(param0->unk_1C0[param1].unk_00)); + String_CopyToChars(param2, param0->unk_1C0[param1].unk_00, sizeof(param0->unk_1C0[param1].unk_00)); } BOOL sub_0202AF78(WiFiList *param0, int param1) diff --git a/src/unk_0202E840.c b/src/unk_0202E840.c index 4ac56744b0..698dafd3d7 100644 --- a/src/unk_0202E840.c +++ b/src/unk_0202E840.c @@ -203,7 +203,7 @@ void *sub_0202E9FC(SaveData *saveData, int heapID) v2 = 0; v3->unk_00[v0].unk_00 = v1; - String_ToChars(v4, v3->unk_00[v0].unk_08, 7 + 1); + String_CopyToChars(v4, v3->unk_00[v0].unk_08, 7 + 1); v3->unk_00[v0].unk_04 = v6[v0]; } @@ -426,8 +426,8 @@ UnkStruct_0202EE10 *sub_0202EE10(UnkStruct_0202E8C0 *param0, int param1, int hea v1->unk_04[v1->unk_00].unk_00 = v2->unk_00[v0].unk_00; v1->unk_04[v1->unk_00].unk_04 = v2->unk_00[v0].unk_04; - v1->unk_04[v1->unk_00].unk_08 = String_Init(7 + 1, heapID); - String_CopyChars(v1->unk_04[v1->unk_00].unk_08, v2->unk_00[v0].unk_08); + v1->unk_04[v1->unk_00].unk_08 = String_New(7 + 1, heapID); + String_CopyFromChars(v1->unk_04[v1->unk_00].unk_08, v2->unk_00[v0].unk_08); ++v1->unk_00; } diff --git a/src/unk_02030A80.c b/src/unk_02030A80.c index ecf3ae903d..9c2fa19443 100644 --- a/src/unk_02030A80.c +++ b/src/unk_02030A80.c @@ -75,7 +75,7 @@ void sub_02030AA0(UnkStruct_02030A80 *param0, SaveData *saveData) String *sub_02030B94(const UnkStruct_02030A80 *param0, int heapID) { - String *v0 = String_Init((7 * 2) + 1, heapID); + String *v0 = String_New((7 * 2) + 1, heapID); String_CopyNumChars(v0, param0->unk_00, (7 * 2) + 1); return v0; @@ -167,7 +167,7 @@ String *sub_02030C28(const UnkStruct_02030A80 *param0, Sentence *param1, int hea return NULL; } else { - String *v3 = String_Init(40, heapID); + String *v3 = String_New(40, heapID); String_CopyNumChars(v3, param0->unk_20_val2, 40); return v3; diff --git a/src/unk_0203909C.c b/src/unk_0203909C.c index 1bee6854ec..bae54c4a89 100644 --- a/src/unk_0203909C.c +++ b/src/unk_0203909C.c @@ -137,9 +137,9 @@ void sub_02039298(SaveData *saveData, int param1, int param2, int heapID, int pa } } - v4 = String_Init(120, heapID); + v4 = String_New(120, heapID); - String_CopyChars(v4, sub_02032F54(param1)); + String_CopyFromChars(v4, sub_02032F54(param1)); sub_0202AF50(v0, param2, v4); String_Free(v4); sub_0202AE2C(v0, param2, 7, TrainerInfo_Appearance(v2)); diff --git a/src/unk_02039814.c b/src/unk_02039814.c index a4cecef890..213df0c721 100644 --- a/src/unk_02039814.c +++ b/src/unk_02039814.c @@ -145,8 +145,8 @@ void NetworkError_DisplayNetworkError(int heapID, int networkErrorId, int errorC Bg_MaskPalette(BG_LAYER_SUB_0, 0x6c21); v2 = MessageLoader_Init(MSG_LOADER_LOAD_ON_DEMAND, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_NETWORK_ERRORS, heapID); - v3 = String_Init(0x180, heapID); - v4 = String_Init(0x180, heapID); + v3 = String_New(0x180, heapID); + v4 = String_New(0x180, heapID); Text_ResetAllPrinters(); v5 = StringTemplate_Default(heapID); diff --git a/src/unk_02039A64.c b/src/unk_02039A64.c index 3bad170c0f..a9921a7745 100644 --- a/src/unk_02039A64.c +++ b/src/unk_02039A64.c @@ -102,7 +102,7 @@ void sub_02039A64(int heapID, int unused) Bg_MaskPalette(BG_LAYER_SUB_0, 0x6c21); v2 = MessageLoader_Init(MSG_LOADER_LOAD_ON_DEMAND, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_UNK_0695, heapID); - v3 = String_Init(0x180, heapID); + v3 = String_New(0x180, heapID); Text_ResetAllPrinters(); Window_AddFromTemplate(v0, &v1, &Unk_020E5F48); diff --git a/src/unk_0203D1B8.c b/src/unk_0203D1B8.c index 9415464e03..f55cd23280 100644 --- a/src/unk_0203D1B8.c +++ b/src/unk_0203D1B8.c @@ -1158,7 +1158,7 @@ static BOOL sub_0203DE98(FieldTask *param0) v2->unk_0C->returnCode = 1; } } else if (v2->unk_0C->type == NAMING_SCREEN_TYPE_GROUP) { - const u16 *v3 = String_GetData(v2->unk_0C->textInputStr); + const u16 *v3 = String_GetChars(v2->unk_0C->textInputStr); RecordMixedRNG *v4 = SaveData_GetRecordMixedRNG(fieldSystem->saveData); if (RecordMixedRNG_DoesCollectionContainGroup(v4, v3)) { @@ -1233,7 +1233,7 @@ void sub_0203DFE8( v2->unk_04 = param4; v2->unk_08 = param6; v2->unk_0C = NamingScreenArgs_Init(HEAP_ID_FIELD2, type, param2, param3, SaveData_GetOptions(fieldSystem->saveData)); - v2->unk_10 = String_Init(12, HEAP_ID_FIELD2); + v2->unk_10 = String_New(12, HEAP_ID_FIELD2); switch (type) { case NAMING_SCREEN_TYPE_POKEMON: @@ -1242,15 +1242,15 @@ void sub_0203DFE8( v2->unk_0C->monForm = Pokemon_GetValue(v0, MON_DATA_FORM, NULL); if (param5 != NULL) { - String_CopyChars(v2->unk_10, param5); + String_CopyFromChars(v2->unk_10, param5); } break; case NAMING_SCREEN_TYPE_GROUP: - String_CopyChars(v2->unk_10, param5); + String_CopyFromChars(v2->unk_10, param5); break; default: if (param5 != NULL) { - String_CopyChars(v2->unk_0C->textInputStr, param5); + String_CopyFromChars(v2->unk_0C->textInputStr, param5); } break; } diff --git a/src/unk_02048BD0.c b/src/unk_02048BD0.c index e3c39ebeeb..7fa54679a4 100644 --- a/src/unk_02048BD0.c +++ b/src/unk_02048BD0.c @@ -80,7 +80,7 @@ BOOL ScrCmd_21D(ScriptContext *param0) } return 0; case 6: { - String *v14 = String_Init(64, HEAP_ID_FIELD3); + String *v14 = String_New(64, HEAP_ID_FIELD3); TrainerInfo *v15 = SaveData_GetTrainerInfo(param0->fieldSystem->saveData); TrainerInfo_NameString(v15, v14); diff --git a/src/unk_0204AEE8.c b/src/unk_0204AEE8.c index ec20a00fa3..1710952de2 100644 --- a/src/unk_0204AEE8.c +++ b/src/unk_0204AEE8.c @@ -116,8 +116,8 @@ StringTemplate *BattleFrontier_MakeSeenBanlistSpeciesMsg(SaveData *saveData, u16 StringTemplate *bannedSpeciesList; MessageLoader *speciesNameLoader; - speciesName = String_Init(14, HEAP_ID_FIELD1); - unused = String_Init(2, HEAP_ID_FIELD1); + speciesName = String_New(14, HEAP_ID_FIELD1); + unused = String_New(2, HEAP_ID_FIELD1); pokedex = SaveData_GetPokedex(saveData); speciesNameLoader = MessageLoader_Init(MSG_LOADER_LOAD_ON_DEMAND, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_SPECIES_NAME, HEAP_ID_FIELD1); bannedSpeciesList = StringTemplate_New(BATTLE_FRONTIER_BANLIST_SIZE + 1, 14, HEAP_ID_FIELD1); @@ -294,7 +294,7 @@ static BattleFrontierTrainerData *sub_0204B184(FrontierDataDTO *param0, u16 para String *v2 = MessageLoader_GetNewString(v1, param1); - String_ToChars(v2, ¶m0->trDataDTO.trainerName[0], TRAINER_NAME_LEN + 1); + String_CopyToChars(v2, ¶m0->trDataDTO.trainerName[0], TRAINER_NAME_LEN + 1); String_Free(v2); MessageLoader_Free(v1); diff --git a/src/unk_020528D0.c b/src/unk_020528D0.c index 34c3af8402..451a04a82b 100644 --- a/src/unk_020528D0.c +++ b/src/unk_020528D0.c @@ -179,8 +179,8 @@ static BOOL sub_020529C4(FieldTask *task) static void sub_02052AA4(UnkStruct_02052AA4 *param0, u16 param1, u8 param2, u8 param3) { - String *v0 = String_Init(1024, HEAP_ID_FIELD2); - String *v1 = String_Init(1024, HEAP_ID_FIELD2); + String *v0 = String_New(1024, HEAP_ID_FIELD2); + String *v1 = String_New(1024, HEAP_ID_FIELD2); Window_FillTilemap(¶m0->unk_0C, 0); MessageLoader_GetString(param0->unk_1C, param1, v0); diff --git a/src/unk_0205A0D8.c b/src/unk_0205A0D8.c index 71086c5142..ac814f2e20 100644 --- a/src/unk_0205A0D8.c +++ b/src/unk_0205A0D8.c @@ -665,8 +665,8 @@ void sub_0205AB10(FieldSystem *fieldSystem, UnkFuncPtr_0205AB10 *param1) v0->unk_08 = param1; v0->unk_28 = StringTemplate_Default(HEAP_ID_FIELD2); v0->unk_2C = MessageLoader_Init(MSG_LOADER_PRELOAD_ENTIRE_BANK, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_UNK_0011, HEAP_ID_FIELD2); - v0->unk_0C = String_Init(100 * 2, HEAP_ID_FIELD2); - v0->unk_10 = String_Init(100 * 2, HEAP_ID_FIELD2); + v0->unk_0C = String_New(100 * 2, HEAP_ID_FIELD2); + v0->unk_10 = String_New(100 * 2, HEAP_ID_FIELD2); Window_Init(&v0->unk_14); Window_Init(&v0->unk_54); @@ -1008,8 +1008,8 @@ static BOOL sub_0205B140(FieldTask *param0) case 0: v1->unk_18 = StringTemplate_Default(HEAP_ID_FIELD1); v1->unk_1C = MessageLoader_Init(MSG_LOADER_PRELOAD_ENTIRE_BANK, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_UNK_0011, HEAP_ID_FIELD1); - v1->unk_00 = String_Init(100 * 2, HEAP_ID_FIELD1); - v1->unk_04 = String_Init(100 * 2, HEAP_ID_FIELD1); + v1->unk_00 = String_New(100 * 2, HEAP_ID_FIELD1); + v1->unk_04 = String_New(100 * 2, HEAP_ID_FIELD1); MessageLoader_GetString(v1->unk_1C, 2 + v2->level, v1->unk_00); StringTemplate_SetPlayerName(v1->unk_18, 0, CommInfo_TrainerInfo(v1->unk_24)); diff --git a/src/unk_0205C22C.c b/src/unk_0205C22C.c index ff94ef11a5..4ff858cd57 100644 --- a/src/unk_0205C22C.c +++ b/src/unk_0205C22C.c @@ -488,7 +488,7 @@ void sub_0205C820(MapObjectManager *mapObjMan, UnkStruct_0205C22C *param1) static void sub_0205C8DC(UnkStruct_0205C924 *param0) { - param0->unk_00 = String_Init(7 + 1, HEAP_ID_89); + param0->unk_00 = String_New(7 + 1, HEAP_ID_89); param0->unk_04 = NULL; param0->unk_08 = NULL; diff --git a/src/unk_0206F314.c b/src/unk_0206F314.c index e34e5dd4a8..9a327555d1 100644 --- a/src/unk_0206F314.c +++ b/src/unk_0206F314.c @@ -520,7 +520,7 @@ static void sub_0206FA08(UnkStruct_0206F7F8 *param0) param0->unk_2C.unk_00 = MessageLoader_Init(MSG_LOADER_PRELOAD_ENTIRE_BANK, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_UNK_0532, param0->heapID); param0->unk_2C.unk_04 = StringTemplate_New(2, (38 * 2), param0->heapID); - param0->unk_2C.unk_08 = String_Init((38 * 2), param0->heapID); + param0->unk_2C.unk_08 = String_New((38 * 2), param0->heapID); param0->unk_2C.unk_0C = MessageLoader_GetNewString(param0->unk_2C.unk_00, 13); param0->unk_2C.unk_10 = MessageLoader_GetNewString(param0->unk_2C.unk_00, 22); param0->unk_2C.unk_14 = MessageLoader_GetNewString(param0->unk_2C.unk_00, 36); diff --git a/src/unk_020722AC.c b/src/unk_020722AC.c index c5401f8f71..1acadc59d4 100644 --- a/src/unk_020722AC.c +++ b/src/unk_020722AC.c @@ -876,7 +876,7 @@ static void sub_02072ED0(UnkStruct_02072EB8 *param0, u8 param1, int heapID) u8 v0 = 0; for (v0 = 0; v0 < param1; v0++) { - param0[v0].unk_08 = String_Init(8, heapID); + param0[v0].unk_08 = String_New(8, heapID); sub_02072EB8(param0, v0); } } @@ -926,7 +926,7 @@ static void sub_02072F30(UnkStruct_02072334 *param0, SaveData *saveData, int hea v7->mailType = Mail_GetMailType(mail); v7->item = Item_ForMailNumber(v7->mailType); - String_CopyChars(v7->unk_08, Mail_GetTrainerName(mail)); + String_CopyFromChars(v7->unk_08, Mail_GetTrainerName(mail)); v7->unk_02 = param0->unk_19; v8->unk_03 = v7->unk_00; @@ -1009,7 +1009,7 @@ static void sub_02073130(UnkStruct_02072334 *param0) param0->unk_10C = MessageLoader_Init(MSG_LOADER_LOAD_ON_DEMAND, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_MAILBOX, param0->heapID); param0->unk_110.unk_00 = StringTemplate_New(1, 128, param0->heapID); - param0->unk_110.unk_04 = String_Init(128, param0->heapID); + param0->unk_110.unk_04 = String_New(128, param0->heapID); param0->unk_110.unk_08 = MessageLoader_GetNewString(param0->unk_10C, 4); param0->unk_110.unk_0C = MessageLoader_GetNewString(param0->unk_10C, 0); diff --git a/src/unk_020890F4.c b/src/unk_020890F4.c index e0b2680159..7ef83f92c9 100644 --- a/src/unk_020890F4.c +++ b/src/unk_020890F4.c @@ -159,7 +159,7 @@ static UnkStruct_02089438 *sub_020893B4(int heapID, int param1, int param2[], Op v1 = Heap_Alloc(heapID, sizeof(UnkStruct_02089438)); v1->unk_00 = param1; - v1->unk_1C = String_Init(param1 + 1, heapID); + v1->unk_1C = String_New(param1 + 1, heapID); v1->options = options; for (i = 0; i < 4; i++) { diff --git a/src/unk_02089604.c b/src/unk_02089604.c index e7e7f90bdf..906f974f91 100644 --- a/src/unk_02089604.c +++ b/src/unk_02089604.c @@ -473,7 +473,7 @@ void sub_02089F80(UnkStruct_02089688 *param0) { int v0; u32 v1 = 0; - String *v2 = String_Init(100, HEAP_ID_101); + String *v2 = String_New(100, HEAP_ID_101); param0->unk_268[1].unk_00 = 1; param0->unk_268[1].unk_14.unk_04 = 0; diff --git a/src/unk_02092494.c b/src/unk_02092494.c index 9e485c21a7..dd3a7e96a0 100644 --- a/src/unk_02092494.c +++ b/src/unk_02092494.c @@ -322,15 +322,15 @@ static void InitializeNatureRelatedString(PokemonInfoDisplayStruct *param0) return; } - param0->unk_14.unk_04 = String_Init(((2 * 18) * 2), param0->heapID); + param0->unk_14.unk_04 = String_New(((2 * 18) * 2), param0->heapID); MessageLoader_GetString(param0->unk_04, (24 + v0), param0->unk_14.unk_04); } static void InitializePokemonMetInfoString(PokemonInfoDisplayStruct *param0, int param1) { - String *v0 = String_Init((((2 * 18) * 2) * 8), param0->heapID); + String *v0 = String_New((((2 * 18) * 2) * 8), param0->heapID); - param0->unk_1C.unk_04 = String_Init((((2 * 18) * 2) * 8), param0->heapID); + param0->unk_1C.unk_04 = String_New((((2 * 18) * 2) * 8), param0->heapID); MessageLoader_GetString(param0->unk_04, param1, v0); StringTemplate_SetNumber(param0->unk_08, 0, Pokemon_GetValue(param0->unk_0C, MON_DATA_MET_YEAR, NULL), 2, 2, 1); @@ -348,9 +348,9 @@ static void InitializePokemonMetInfoString(PokemonInfoDisplayStruct *param0, int static void InitializeAlternateMetInfoString(PokemonInfoDisplayStruct *param0, int param1) { - String *v0 = String_Init((((2 * 18) * 2) * 4), param0->heapID); + String *v0 = String_New((((2 * 18) * 2) * 4), param0->heapID); - param0->unk_1C.unk_04 = String_Init((((2 * 18) * 2) * 4), param0->heapID); + param0->unk_1C.unk_04 = String_New((((2 * 18) * 2) * 4), param0->heapID); MessageLoader_GetString(param0->unk_04, param1, v0); StringTemplate_SetNumber(param0->unk_08, 0, Pokemon_GetValue(param0->unk_0C, MON_DATA_MET_YEAR, NULL), 2, 2, 1); @@ -391,9 +391,9 @@ static void InitializeAlternateMetInfoString(PokemonInfoDisplayStruct *param0, i static void InitializeSpecialMetInfoString(PokemonInfoDisplayStruct *param0, int param1, int param2) { - String *v0 = String_Init((((2 * 18) * 2) * 5), param0->heapID); + String *v0 = String_New((((2 * 18) * 2) * 5), param0->heapID); - param0->unk_1C.unk_04 = String_Init((((2 * 18) * 2) * 5), param0->heapID); + param0->unk_1C.unk_04 = String_New((((2 * 18) * 2) * 5), param0->heapID); MessageLoader_GetString(param0->unk_04, param1, v0); @@ -427,7 +427,7 @@ static void InitializeIVsString(PokemonInfoDisplayStruct *param0) int v0[6], v1, v2; int v3, v4; - param0->unk_24.unk_04 = String_Init(((2 * 18) * 2), param0->heapID); + param0->unk_24.unk_04 = String_New(((2 * 18) * 2), param0->heapID); v0[0] = (Pokemon_GetValue(param0->unk_0C, MON_DATA_HP_IV, NULL)); v0[1] = (Pokemon_GetValue(param0->unk_0C, MON_DATA_ATK_IV, NULL)); @@ -631,7 +631,7 @@ static void InitializeFlavorAffinityString(PokemonInfoDisplayStruct *param0) { int v0, v1, v2; - param0->unk_2C.unk_04 = String_Init(((2 * 18) * 2), param0->heapID); + param0->unk_2C.unk_04 = String_New(((2 * 18) * 2), param0->heapID); v1 = 0; for (v0 = 0; v0 < 5; v0++) { @@ -649,7 +649,7 @@ static void InitializeFriendshipLevelString(PokemonInfoDisplayStruct *param0) int v0 = Pokemon_GetValue(param0->unk_0C, MON_DATA_FRIENDSHIP, NULL); int v1; - param0->unk_34.unk_04 = String_Init((((2 * 18) * 2) * 4), param0->heapID); + param0->unk_34.unk_04 = String_New((((2 * 18) * 2) * 4), param0->heapID); if (v0 <= 5) { v1 = 105; diff --git a/src/unk_020933F8.c b/src/unk_020933F8.c index a822bcbae3..5dd821a9ca 100644 --- a/src/unk_020933F8.c +++ b/src/unk_020933F8.c @@ -446,7 +446,7 @@ UnkStruct_02095C48 *sub_02093800(const UnkStruct_02093800 *param0) { Pokemon_Copy(param0->unk_08, v0->unk_00.unk_00[0]); - v0->unk_00.unk_D8[0] = String_Init(8, HEAP_ID_20); + v0->unk_00.unk_D8[0] = String_New(8, HEAP_ID_20); String_Copy(v0->unk_00.unk_D8[0], param0->unk_0C); v0->unk_00.unk_F8[0] = TrainerInfo_Gender(param0->unk_10); @@ -496,7 +496,7 @@ static void sub_020939E0(UnkStruct_02095C48 *param0, int param1, int param2) for (v1 = 1; v1 < 4; v1++) { if (param0->unk_00.unk_D8[v1] == NULL) { - param0->unk_00.unk_D8[v1] = String_Init(8, HEAP_ID_20); + param0->unk_00.unk_D8[v1] = String_New(8, HEAP_ID_20); } Pokemon_GetValue(param0->unk_00.unk_00[v1], MON_DATA_OT_NAME_STRING, param0->unk_00.unk_D8[v1]); diff --git a/src/unk_02097624.c b/src/unk_02097624.c index 71e42310c3..6086420fe2 100644 --- a/src/unk_02097624.c +++ b/src/unk_02097624.c @@ -205,9 +205,9 @@ UnkStruct_020978D8 *sub_02097834(const Mail *mail, int heapID) v1->unk_00 = 0; v1->unk_08 = Mail_GetTrainerID(mail); - v1->unk_10 = String_Init(8, heapID); + v1->unk_10 = String_New(8, heapID); - String_CopyChars(v1->unk_10, Mail_GetTrainerName((Mail *)mail)); + String_CopyFromChars(v1->unk_10, Mail_GetTrainerName((Mail *)mail)); v1->mailType = Mail_GetMailType(mail); v1->language = Mail_GetLanguage(mail); diff --git a/src/unk_02099DFC.c b/src/unk_02099DFC.c index f6bac883ca..68256ab150 100644 --- a/src/unk_02099DFC.c +++ b/src/unk_02099DFC.c @@ -319,7 +319,7 @@ static BOOL sub_0209A200(UnkStruct_02099DFC *param0, u32 param1, int param2, int Window_FillRectWithColor(¶m0->unk_1C, 15, 0, 0, 27 * 8, 4 * 8); Window_DrawMessageBoxWithScrollCursor(¶m0->unk_1C, 0, 512 - (18 + 12), 2); - param0->unk_10 = String_Init(0x400, param0->heapID); + param0->unk_10 = String_New(0x400, param0->heapID); MessageLoader_GetString(param0->unk_18, param1, param0->unk_10); param0->unk_0C = Text_AddPrinterWithParams(¶m0->unk_1C, FONT_MESSAGE, param0->unk_10, 0, 0, param3, NULL); diff --git a/src/unk_0209A2C4.c b/src/unk_0209A2C4.c index d2be5fc523..713413a235 100644 --- a/src/unk_0209A2C4.c +++ b/src/unk_0209A2C4.c @@ -296,7 +296,7 @@ static BOOL sub_0209A688(UnkStruct_0209A3D0 *param0, u32 param1, int param2, int Window_FillRectWithColor(¶m0->unk_20, 15, 0, 0, 27 * 8, 4 * 8); Window_DrawMessageBoxWithScrollCursor(¶m0->unk_20, 0, 512 - (18 + 12), 2); - param0->unk_14 = String_Init(0x400, param0->heapID); + param0->unk_14 = String_New(0x400, param0->heapID); MessageLoader_GetString(param0->unk_1C, param1, param0->unk_14); param0->unk_10 = Text_AddPrinterWithParams(¶m0->unk_20, FONT_MESSAGE, param0->unk_14, 0, 0, param3, NULL); diff --git a/src/unk_0209A74C.c b/src/unk_0209A74C.c index 2c8240fab8..aafff4b01f 100644 --- a/src/unk_0209A74C.c +++ b/src/unk_0209A74C.c @@ -105,7 +105,7 @@ void sub_0209A74C(int heapID) Bg_MaskPalette(BG_LAYER_SUB_0, 27681); v2 = MessageLoader_Init(MSG_LOADER_LOAD_ON_DEMAND, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_UNK_0005, heapID); - v3 = String_Init(384, heapID); + v3 = String_New(384, heapID); Text_ResetAllPrinters(); Window_AddFromTemplate(v0, &v1, &Unk_020F8AC4); @@ -179,7 +179,7 @@ void sub_0209A8E0(int heapID) Bg_MaskPalette(BG_LAYER_SUB_0, 0x6c21); v2 = MessageLoader_Init(MSG_LOADER_LOAD_ON_DEMAND, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_UNK_0005, heapID); - v3 = String_Init(0x180, heapID); + v3 = String_New(0x180, heapID); Text_ResetAllPrinters(); Window_AddFromTemplate(v0, &v1, &Unk_020F8AC4); diff --git a/src/unk_0209AA74.c b/src/unk_0209AA74.c index 80d8e79c01..8b4bc34094 100644 --- a/src/unk_0209AA74.c +++ b/src/unk_0209AA74.c @@ -113,7 +113,7 @@ void sub_0209AA74(int heapID, int param1) Bg_MaskPalette(BG_LAYER_SUB_0, 0x6c21); v2 = MessageLoader_Init(MSG_LOADER_LOAD_ON_DEMAND, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_UNK_0006, heapID); - v3 = String_Init(0x180, heapID); + v3 = String_New(0x180, heapID); Text_ResetAllPrinters(); Window_AddFromTemplate(v0, &v1, &Unk_020F8B20); diff --git a/src/unk_0209ACF4.c b/src/unk_0209ACF4.c index 64a7f35917..28285ff3ad 100644 --- a/src/unk_0209ACF4.c +++ b/src/unk_0209ACF4.c @@ -66,8 +66,8 @@ void sub_0209ACF4(FieldTask *param0) UnkStruct_0209AD84 *v1 = Heap_Alloc(HEAP_ID_FIELD3, sizeof(UnkStruct_0209AD84)); v1->fieldSystem = fieldSystem; - v1->unk_04 = String_Init(400, HEAP_ID_FIELD3); - v1->unk_08 = String_Init(400, HEAP_ID_FIELD3); + v1->unk_04 = String_New(400, HEAP_ID_FIELD3); + v1->unk_08 = String_New(400, HEAP_ID_FIELD3); v1->unk_0C = StringTemplate_Default(HEAP_ID_FIELD3); v1->unk_10 = MessageLoader_Init(MSG_LOADER_LOAD_ON_DEMAND, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_UNK_0420, HEAP_ID_FIELD3); v1->unk_14 = ColoredArrow_New(HEAP_ID_FIELD3);