diff --git a/include/overlay016/ov16_0225CBB8.h b/include/battle/battle_display.h similarity index 91% rename from include/overlay016/ov16_0225CBB8.h rename to include/battle/battle_display.h index d981b414be..2fb2969ab8 100644 --- a/include/overlay016/ov16_0225CBB8.h +++ b/include/battle/battle_display.h @@ -61,7 +61,15 @@ void ov16_0225D794(BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_0 void ov16_0225D840(BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_0225C2C4 * param2); void ov16_0225D8AC(BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_0225C2D8 * param2); void ov16_0225D8F0(BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_0225C2EC * param2); -void ov16_0225D958(BattleSystem * param0, BattlerData * param1, BattleMessage * param2); + +/** + * @brief Print a message to the screen. + * + * @param battleSys + * @param battlerData + * @param battleMsg + */ +void BattleDisplay_PrintMessage(BattleSystem *battleSys, BattlerData *battlerData, BattleMessage *battleMsg); void ov16_0225D9A8(BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_02265BBC * param2); void ov16_0225DA44(BattleSystem * param0, BattlerData * param1); void ov16_0225DA74(BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_0225C35C * param2); @@ -89,7 +97,7 @@ void ov16_0225E0F4(BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_0 * @param battlerData * @param partyGauge */ -void Battler_ShowBattleStartPartyGauge(BattleSystem *battleSys, BattlerData *battlerData, PartyGaugeData *partyGauge); +void BattleDisplay_ShowBattleStartPartyGauge(BattleSystem *battleSys, BattlerData *battlerData, PartyGaugeData *partyGauge); /** * @brief Hide the start-of-battle party gauge. @@ -98,7 +106,7 @@ void Battler_ShowBattleStartPartyGauge(BattleSystem *battleSys, BattlerData *bat * @param battlerData * @param partyGauge */ -void Battler_HideBattleStartPartyGauge(BattleSystem *battleSys, BattlerData *battlerData, PartyGaugeData *partyGauge); +void BattleDisplay_HideBattleStartPartyGauge(BattleSystem *battleSys, BattlerData *battlerData, PartyGaugeData *partyGauge); /** * @brief Show the mid-battle party gauge. @@ -107,7 +115,7 @@ void Battler_HideBattleStartPartyGauge(BattleSystem *battleSys, BattlerData *bat * @param battlerData * @param partyGauge */ -void Battler_ShowPartyGauge(BattleSystem *battleSys, BattlerData *battlerData, PartyGaugeData *partyGauge); +void BattleDisplay_ShowPartyGauge(BattleSystem *battleSys, BattlerData *battlerData, PartyGaugeData *partyGauge); /** * @brief Hide the mid-battle party gauge. @@ -116,7 +124,7 @@ void Battler_ShowPartyGauge(BattleSystem *battleSys, BattlerData *battlerData, P * @param battlerData * @param partyGauge */ -void Battler_HidePartyGauge(BattleSystem *battleSys, BattlerData *battlerData, PartyGaugeData *partyGauge); +void BattleDisplay_HidePartyGauge(BattleSystem *battleSys, BattlerData *battlerData, PartyGaugeData *partyGauge); void ov16_0225E23C(BattleSystem * param0, BattlerData * param1); void ov16_0225E294(BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_02265BBC * param2); void ov16_0225E2C8(BattleSystem * param0, BattlerData * param1); diff --git a/include/overlay016/ov16_0226485C.h b/include/battle/battle_io.h similarity index 96% rename from include/overlay016/ov16_0226485C.h rename to include/battle/battle_io.h index 06cabc9a5b..dd1dbe39ae 100644 --- a/include/overlay016/ov16_0226485C.h +++ b/include/battle/battle_io.h @@ -33,7 +33,15 @@ void BattleIO_ShowPartyScreen(BattleSystem *battleSys, BattleContext *battleCtx, void ov16_02265B10(BattleSystem * param0, int param1, int param2); void BattleIO_ShowYesNoScreen(BattleSystem *battleSys, BattleContext *battleCtx, int battler, int promptMsg, int yesnoType, int move, int nickname); void BattleIO_PrintAttackMessage(BattleSystem * param0, BattleContext * param1); -void BattleIO_PrintMessage(BattleSystem * param0, BattleContext * param1, BattleMessage * param2); + +/** + * @brief Submit a BattleMessage to the I/O queue for display on the screen. + * + * @param battleSys + * @param battleCtx + * @param battleMsg + */ +void BattleIO_PrintMessage(BattleSystem *battleSys, BattleContext *battleCtx, BattleMessage *battleMsg); void BattleIO_PlayMoveAnimation(BattleSystem * param0, BattleContext * param1, u16 param2); void BattleIO_PlayMoveAnimationA2D(BattleSystem * param0, BattleContext * param1, u16 param2, int param3, int param4); void BattleIO_FlickerBattler(BattleSystem * param0, int param1, u32 param2); diff --git a/include/overlay016/ov16_0225BFFC.h b/include/battle/battle_io_command.h similarity index 100% rename from include/overlay016/ov16_0225BFFC.h rename to include/battle/battle_io_command.h diff --git a/include/constants/battle/battle_io.h b/include/constants/battle/battle_io.h index 7303b2ddb1..1d62a7250f 100644 --- a/include/constants/battle/battle_io.h +++ b/include/constants/battle/battle_io.h @@ -2,6 +2,8 @@ #define POKEPLATINUM_CONSTANTS_BATTLE_BATTLE_IO_H enum BattleIOCommand { + BTLIOCMD_PRINT_MESSAGE = 21, + BTLIOCMD_SHOW_BATTLE_START_PARTY_GAUGE = 48, BTLIOCMD_HIDE_BATTLE_START_PARTY_GAUGE, BTLIOCMD_SHOW_PARTY_GAUGE, diff --git a/include/constants/battle/message_tags.h b/include/constants/battle/message_tags.h index 910079d4a2..04448f3452 100644 --- a/include/constants/battle/message_tags.h +++ b/include/constants/battle/message_tags.h @@ -4,4 +4,6 @@ #define TAG_SIDE_LOCAL_MESSAGE (1 << 6) // adjust the message for the side's source (e.g. "The foe's X used Y!") #define TAG_GLOBAL_MESSAGE (1 << 7) // do not perform any message adjustment for a calling side +#define BATTLE_MESSAGE_TAGS (0xFF ^ TAG_GLOBAL_MESSAGE ^ TAG_SIDE_LOCAL_MESSAGE) + #endif // POKEPLATINUM_CONSTANTS_BATTLE_MESSAGE_TAGS_H diff --git a/include/overlay016/ov16_0223DF00.h b/include/overlay016/ov16_0223DF00.h index 61c60cc467..621e383226 100644 --- a/include/overlay016/ov16_0223DF00.h +++ b/include/overlay016/ov16_0223DF00.h @@ -45,7 +45,15 @@ #define ENEMY_IN_SLOT_LEFT 2 BGL * BattleSystem_BGL(BattleSystem * param0); -Window * BattleSystem_Window(BattleSystem * param0, int param1); + +/** + * @brief Get one of the allocated windows for the battle display. + * + * @param battleSys + * @param idx + * @return + */ +Window* BattleSystem_Window(BattleSystem *battleSys, int idx); u32 BattleSystem_BattleType(BattleSystem * param0); BattleContext * BattleSystem_Context(BattleSystem * param0); BattlerData * BattleSystem_BattlerData(BattleSystem * param0, int param1); @@ -225,8 +233,8 @@ void ov16_0223F24C(BattleSystem * param0, int param1); void ov16_0223F268(BattleSystem * param0); void BattleSystem_SetCommandSelectionFlags(BattleSystem *battleSys, int flags); void ov16_0223F290(BattleSystem * param0, int param1); -void * ov16_0223F29C(BattleSystem * param0); -void ov16_0223F2A4(BattleSystem * param0, void * param1); +void * Battle_WaitDial(BattleSystem * param0); +void Battle_SetWaitDial(BattleSystem * param0, void * param1); UnkStruct_ov16_0223E0C8 * ov16_0223F2AC(BattleSystem * param0, int param1); u8 * ov16_0223F2B8(UnkStruct_ov16_0223E0C8 * param0, int param1); void ov16_0223F2CC(UnkStruct_ov16_0223E0C8 * param0, int param1, int param2); @@ -294,7 +302,17 @@ void ov16_0223F9A0(BattleSystem * param0, int param1); BOOL BattleSystem_CaughtSpecies(BattleSystem *battleSys, int species); void Battle_SetDefaultBlend(void); u8 ov16_0223F9FC(BattleSystem * param0, int param1, int param2, int param3, int param4); -u8 BattleMessage_Print(BattleSystem * param0, MessageLoader * param1, BattleMessage * param2, int param3); + +/** + * @brief Print a BattleMessage to the main text display window. + * + * @param battleSys + * @param msgLoader + * @param battleMsg + * @param renderDelay Delay in flames applied to rendering between each character of the string. + * @return + */ +u8 BattleMessage_Print(BattleSystem *battleSys, MessageLoader *msgLoader, BattleMessage *battleMsg, int renderDelay); u8 BattleMessage_PrintToWindow(BattleSystem * param0, Window * param1, MessageLoader * param2, BattleMessage * param3, int param4, int param5, int param6, int param7, int param8); #endif // POKEPLATINUM_OV16_0223DF00_H diff --git a/include/overlay016/struct_ov16_0225D8F0.h b/include/overlay016/struct_ov16_0225D8F0.h deleted file mode 100644 index 91a1d5f070..0000000000 --- a/include/overlay016/struct_ov16_0225D8F0.h +++ /dev/null @@ -1,14 +0,0 @@ -#ifndef POKEPLATINUM_STRUCT_OV16_0225D8F0_H -#define POKEPLATINUM_STRUCT_OV16_0225D8F0_H - -#include "struct_decls/battle_system.h" - -typedef struct { - BattleSystem * unk_00; - u8 unk_04; - u8 unk_05; - u8 unk_06; - u8 unk_07; -} UnkStruct_ov16_0225D8F0; - -#endif // POKEPLATINUM_STRUCT_OV16_0225D8F0_H diff --git a/include/struct_defs/battle_system.h b/include/struct_defs/battle_system.h index 46544de660..f07a41afba 100644 --- a/include/struct_defs/battle_system.h +++ b/include/struct_defs/battle_system.h @@ -46,10 +46,10 @@ struct BattleSystem { GenericPointerData * unk_00; BGL * unk_04; - Window * unk_08; + Window *windows; MessageLoader * unk_0C; MessageLoader * unk_10; - UnkStruct_0200B358 * unk_14; + UnkStruct_0200B358 *strFormatter; Strbuf *msgBuffer; SysTask * unk_1C; SysTask * unk_20; diff --git a/include/unk_0200B358.h b/include/unk_0200B358.h index 4c89d24ab4..aa80d515e4 100644 --- a/include/unk_0200B358.h +++ b/include/unk_0200B358.h @@ -83,7 +83,7 @@ void sub_0200C2A8(UnkStruct_0200B358 * param0, u32 param1, u32 param2); void sub_0200C2E0(UnkStruct_0200B358 * param0, u32 param1, u32 param2); void sub_0200C324(UnkStruct_0200B358 * param0, u32 param1); void sub_0200C338(UnkStruct_0200B358 * param0, u32 param1, u32 param2); -void sub_0200C388(const UnkStruct_0200B358 * param0, Strbuf *param1, const Strbuf *param2); +void StringFormatter_Format(const UnkStruct_0200B358 * param0, Strbuf *param1, const Strbuf *param2); void sub_0200C41C(UnkStruct_0200B358 * param0); #endif // POKEPLATINUM_UNK_0200B358_H diff --git a/include/unk_0200DA60.h b/include/unk_0200DA60.h index 85a8996ad3..ac4c60a9a4 100644 --- a/include/unk_0200DA60.h +++ b/include/unk_0200DA60.h @@ -21,7 +21,7 @@ void sub_0200E2A4(BGL * param0, u8 param1, u16 param2, u8 param3, u8 param4, u16 void sub_0200E69C(Window * param0, u8 param1, u16 param2, u8 param3, u8 param4); void sub_0200E744(Window * param0, u8 param1, u8 param2); void * sub_0200E7FC(Window * param0, u32 param1); -void sub_0200EBA0(void * param0); +void DeleteWaitDial(void * param0); void sub_0200EBC8(void * param0); u8 * sub_0200EBF0(BGL * param0, u8 param1, u8 param2, u8 param3, u8 param4, u16 param5, u16 param6, u8 param7, int param8); u8 * sub_0200EC48(BGL * param0, u8 param1, u8 param2, u8 param3, u8 param4, u16 param5, Pokemon * param6, int param7); diff --git a/include/unk_0201D670.h b/include/unk_0201D670.h index 66aec15390..7b43787527 100644 --- a/include/unk_0201D670.h +++ b/include/unk_0201D670.h @@ -12,7 +12,20 @@ void sub_0201D670(const UnkStruct_0201D670 * param0); void sub_0201D710(void); u8 Message_Printing(u8 param0); void sub_0201D730(u8 param0); -u8 sub_0201D738(Window * param0, u32 param1, const Strbuf *param2, u32 param3, u32 param4, u32 param5, UnkFuncPtr_0201D834 param6); + +/** + * @brief Print a string into the target window. + * + * @param window The window which will display the printed string. + * @param fontID ID of the font to be used. + * @param strbuf String which will be printed. + * @param xOffset X-offset to apply to the left-edge of the cursor before printing. + * @param yOffset Y-offset to apply to the top-edge of the cursor before printing. + * @param renderDelay Delay in frames to apply between rendering each character of the string. + * @param callback Callback function when done printing. + * @return + */ +u8 PrintStringSimple(Window *window, u32 fontID, const Strbuf *strbuf, u32 xOffset, u32 yOffset, u32 renderDelay, UnkFuncPtr_0201D834 callback); u8 sub_0201D78C(Window * param0, u32 param1, const Strbuf *param2, u32 param3, u32 param4, u32 param5, u32 param6, UnkFuncPtr_0201D834 param7); u8 sub_0201D7E0(Window * param0, u32 param1, const Strbuf *param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8, UnkFuncPtr_0201D834 param9); u8 sub_0201D834(const UnkStruct_0201D738 * param0, u32 param1, UnkFuncPtr_0201D834 param2); diff --git a/platinum.us/main.lsf b/platinum.us/main.lsf index a1274eb983..77d9b06077 100644 --- a/platinum.us/main.lsf +++ b/platinum.us/main.lsf @@ -695,10 +695,10 @@ Overlay overlay16 Object main.nef.p/src_overlay016_battle_script.c.o Object main.nef.p/src_overlay016_battle_controller.c.o Object main.nef.p/src_overlay016_battle_lib.c.o - Object main.nef.p/src_overlay016_ov16_0225BFFC.c.o - Object main.nef.p/src_overlay016_ov16_0225CBB8.c.o + Object main.nef.p/src_overlay016_battle_io_command.c.o + Object main.nef.p/src_overlay016_battle_display.c.o Object main.nef.p/src_overlay016_ov16_02264798.c.o - Object main.nef.p/src_overlay016_ov16_0226485C.c.o + Object main.nef.p/src_overlay016_battle_io.c.o Object main.nef.p/src_overlay016_ov16_02266F1C.c.o Object main.nef.p/src_overlay016_ov16_02268520.c.o Object main.nef.p/src_overlay016_ov16_0226871C.c.o diff --git a/src/error_message_reset.c b/src/error_message_reset.c index c0c4b96c8e..d64e838254 100644 --- a/src/error_message_reset.c +++ b/src/error_message_reset.c @@ -157,7 +157,7 @@ void ErrorMessageReset_PrintErrorAndReset (void) BGL_WindowColor(&window, 15, 0, 0, 26 * 8, 18 * 8); Window_Show(&window, 0, (512 - 9), 2); MessageLoader_GetStrbuf(errorMsgData, v4, errorString); - sub_0201D738(&window, 0, errorString, 0, 0, 0, NULL); + PrintStringSimple(&window, 0, errorString, 0, 0, 0, NULL); Strbuf_Free(errorString); GXLayers_TurnBothDispOn(); diff --git a/src/meson.build b/src/meson.build index 155fba02f9..d2d4cfb280 100644 --- a/src/meson.build +++ b/src/meson.build @@ -533,10 +533,10 @@ pokeplatinum_c = files( 'overlay016/battle_script.c', 'overlay016/battle_controller.c', 'overlay016/battle_lib.c', - 'overlay016/ov16_0225BFFC.c', - 'overlay016/ov16_0225CBB8.c', + 'overlay016/battle_io_command.c', + 'overlay016/battle_display.c', 'overlay016/ov16_02264798.c', - 'overlay016/ov16_0226485C.c', + 'overlay016/battle_io.c', 'overlay016/ov16_02266F1C.c', 'overlay016/ov16_02268520.c', 'overlay016/ov16_0226871C.c', diff --git a/src/overlay005/ov5_021DC018.c b/src/overlay005/ov5_021DC018.c index 4e90c0c3bd..248bce68ee 100644 --- a/src/overlay005/ov5_021DC018.c +++ b/src/overlay005/ov5_021DC018.c @@ -219,7 +219,7 @@ static void ov5_021DC290 (UnkStruct_ov5_021DC1A4 * param0, u32 param1, u32 param Strbuf* v2 = Strbuf_Init((40 * 2), 4); MessageLoader_GetStrbuf(param0->unk_8C, param1, v2); - sub_0200C388(param0->unk_90, param0->unk_1C[param0->unk_9B], v2); + StringFormatter_Format(param0->unk_90, param0->unk_1C[param0->unk_9B], v2); param0->unk_BC[param0->unk_9B].unk_00 = (const void *)param0->unk_1C[param0->unk_9B]; Strbuf_Free(v2); } @@ -443,7 +443,7 @@ static void ov5_021DC708 (UnkStruct_ov5_021DC1A4 * param0, u32 param1, u32 param Strbuf* v2 = Strbuf_Init((40 * 2), 4); MessageLoader_GetStrbuf(param0->unk_8C, param1, v2); - sub_0200C388(param0->unk_90, param0->unk_1C[param0->unk_9B], v2); + StringFormatter_Format(param0->unk_90, param0->unk_1C[param0->unk_9B], v2); param0->unk_1C4[param0->unk_9B].unk_00 = (const void *)param0->unk_1C[param0->unk_9B]; Strbuf_Free(v2); } @@ -614,8 +614,8 @@ static void ov5_021DCA90 (UnkStruct_ov5_021DC1A4 * param0, u16 param1, u32 param BGL_FillWindow(param0->unk_18, 15); MessageLoader_GetStrbuf(param0->unk_8C, param1, v0); - sub_0200C388(param0->unk_90, v1, v0); - sub_0201D738(param0->unk_18, 1, v1, 0, 0, param2, NULL); + StringFormatter_Format(param0->unk_90, v1, v0); + PrintStringSimple(param0->unk_18, 1, v1, 0, 0, param2, NULL); Strbuf_Free(v0); Strbuf_Free(v1); @@ -669,8 +669,8 @@ static void ov5_021DCC00 (UnkStruct_ov5_021DC1A4 * param0, u16 param1, u8 param2 Strbuf* v1 = Strbuf_Init((40 * 2), 4); MessageLoader_GetStrbuf(param0->unk_8C, param1, v0); - sub_0200C388(param0->unk_90, v1, v0); - sub_0201D738(¶m0->unk_08, 0, v1, param2, param3, 0xff, NULL); + StringFormatter_Format(param0->unk_90, v1, v0); + PrintStringSimple(¶m0->unk_08, 0, v1, param2, param3, 0xff, NULL); Strbuf_Free(v0); Strbuf_Free(v1); @@ -829,7 +829,7 @@ Window * ov5_021DCEB0 (UnkStruct_0203CDB0 * param0, u8 param1, u8 param2) v1 = MessageLoader_Init(0, 26, 543, 4); v2 = MessageLoader_GetNewStrbuf(v1, 18); - sub_0201D738(v0, 0, v2, 0, 0, 0xff, NULL); + PrintStringSimple(v0, 0, v2, 0, 0, 0xff, NULL); MessageLoader_Free(v1); Strbuf_Free(v2); } @@ -863,11 +863,11 @@ void ov5_021DCF6C (UnkStruct_0203CDB0 * param0, Window * param1) v4 = TrainerInfo_Money(sub_02025E38(param0->unk_0C)); sub_0200B60C(v1, 0, v4, 6, 1, 1); - sub_0200C388(v1, v2, v3); + StringFormatter_Format(v1, v2, v3); v5 = (10 * 8) - sub_02002D7C(0, v2, 0); - sub_0201D738(param1, 0, v2, v5, 16, 0xff, NULL); + PrintStringSimple(param1, 0, v2, v5, 16, 0xff, NULL); Strbuf_Free(v3); Strbuf_Free(v2); sub_0200B3F0(v1); @@ -912,11 +912,11 @@ void ov5_021DD098 (UnkStruct_0203CDB0 * param0, Window * param1) v4 = Coins_GetValue(sub_02025E50(param0->unk_0C)); sub_0200B60C(v1, 0, v4, 5, 1, 1); - sub_0200C388(v1, v2, v3); + StringFormatter_Format(v1, v2, v3); v5 = (10 * 8) - sub_02002D7C(0, v2, 0); - sub_0201D738(param1, 0, v2, v5, 0, 0xff, NULL); + PrintStringSimple(param1, 0, v2, v5, 0, 0xff, NULL); Strbuf_Free(v3); Strbuf_Free(v2); sub_0200B3F0(v1); @@ -955,11 +955,11 @@ void ov5_021DD1A4 (UnkStruct_0203CDB0 * param0, Window * param1) v4 = sub_0202D230(sub_0202D750(param0->unk_0C), 0, 0); sub_0200B60C(v1, 0, v4, 5, 1, 1); - sub_0200C388(v1, v2, v3); + StringFormatter_Format(v1, v2, v3); v5 = (10 * 8) - sub_02002D7C(0, v2, 0); - sub_0201D738(param1, 0, v2, v5, 0, 0xff, NULL); + PrintStringSimple(param1, 0, v2, v5, 0, 0xff, NULL); Strbuf_Free(v3); Strbuf_Free(v2); sub_0200B3F0(v1); diff --git a/src/overlay005/ov5_021DD42C.c b/src/overlay005/ov5_021DD42C.c index a0d5312f55..4f91a230b4 100644 --- a/src/overlay005/ov5_021DD42C.c +++ b/src/overlay005/ov5_021DD42C.c @@ -148,7 +148,7 @@ static void ov5_021DD610 (UnkStruct_0203CDB0 * param0, UnkStruct_ov5_021DD648 * static void ov5_021DD648 (UnkStruct_ov5_021DD648 * param0, const MessageLoader * param1, u32 param2) { MessageLoader_GetStrbuf(param1, param2, param0->unk_04); - sub_0200C388(param0->unk_08, param0->unk_00, param0->unk_04); + StringFormatter_Format(param0->unk_08, param0->unk_00, param0->unk_04); } static void ov5_021DD664 (UnkStruct_ov5_021DD648 * param0, u16 param1, u16 param2, u16 param3, u16 param4) @@ -174,5 +174,5 @@ static void ov5_021DD6B4 (UnkStruct_ov5_021DD648 * param0, int param1, int param static void ov5_021DD6DC (UnkStruct_ov5_021DD648 * param0, int param1) { - *(param0->unk_14) = sub_0201D738(param0->unk_0C, param1, param0->unk_00, 0, 0, 0, NULL); + *(param0->unk_14) = PrintStringSimple(param0->unk_0C, param1, param0->unk_00, 0, 0, 0, NULL); } diff --git a/src/overlay005/ov5_021E1D20.c b/src/overlay005/ov5_021E1D20.c index e76ec18fd9..56691fe65c 100644 --- a/src/overlay005/ov5_021E1D20.c +++ b/src/overlay005/ov5_021E1D20.c @@ -148,7 +148,7 @@ static void ov5_021E1E20 (const UnkStruct_ov5_021E1FF4 * param0) v2 = 0; v0 = sub_0200B29C(param0->unk_14, param0->unk_18, Unk_ov5_021F9CCC[0], param0->unk_04); - sub_0201D738(param0->unk_10, 0, v0, 0, v2, 0xff, NULL); + PrintStringSimple(param0->unk_10, 0, v0, 0, v2, 0xff, NULL); Strbuf_Free(v0); for (v4 = 1; v4 < NELEMS(Unk_ov5_021F9CCC); v4++) { @@ -159,13 +159,13 @@ static void ov5_021E1E20 (const UnkStruct_ov5_021E1FF4 * param0) v2 += v3; v0 = MessageLoader_GetNewStrbuf(param0->unk_18, Unk_ov5_021F9CCC[v4]); - sub_0201D738(param0->unk_10, 0, v0, 0, v2, 0xff, NULL); + PrintStringSimple(param0->unk_10, 0, v0, 0, v2, 0xff, NULL); Strbuf_Free(v0); v0 = sub_0200B29C(param0->unk_14, param0->unk_18, Unk_ov5_021F9CBC[v4 - 1], param0->unk_04); v1 = 13 * 8 - sub_02002D7C(0, v0, sub_02002DF8(0, 2)); - sub_0201D738(param0->unk_10, 0, v0, v1, v2, 0xff, NULL); + PrintStringSimple(param0->unk_10, 0, v0, v1, v2, 0xff, NULL); Strbuf_Free(v0); } } diff --git a/src/overlay005/ov5_021E2338.c b/src/overlay005/ov5_021E2338.c index d8518af842..7ffdcb47f3 100644 --- a/src/overlay005/ov5_021E2338.c +++ b/src/overlay005/ov5_021E2338.c @@ -2631,7 +2631,7 @@ static Strbuf* ov5_021E5240 (u32 param0, u32 param1) v3 = Strbuf_Init(128, param1); MessageLoader_GetStrbuf(v1, 0, v3); sub_0200BA08(v0, 0, param0); - sub_0200C388(v0, v2, v3); + StringFormatter_Format(v0, v2, v3); MessageLoader_Free(v1); sub_0200B3F0(v0); diff --git a/src/overlay005/ov5_021EA874.c b/src/overlay005/ov5_021EA874.c index 396186c0c4..619d860a3f 100644 --- a/src/overlay005/ov5_021EA874.c +++ b/src/overlay005/ov5_021EA874.c @@ -444,7 +444,7 @@ static void ov5_021EAE78 (UnkStruct_ov5_021EAE78 * param0, int param1) } MessageLoader_GetStrbuf(param0->unk_3C, param1, param0->unk_08); - sub_0200C388(param0->unk_38, param0->unk_0C, param0->unk_08); + StringFormatter_Format(param0->unk_38, param0->unk_0C, param0->unk_08); sub_0205D8F4(param0->unk_30->unk_08, ¶m0->unk_10, 3); sub_0205D944(¶m0->unk_10, sub_02025E44(param0->unk_30->unk_0C)); diff --git a/src/overlay005/ov5_021F08CC.c b/src/overlay005/ov5_021F08CC.c index 6378806915..29c11ab87b 100644 --- a/src/overlay005/ov5_021F08CC.c +++ b/src/overlay005/ov5_021F08CC.c @@ -539,7 +539,7 @@ static void ov5_021F0DE8 (UnkStruct_ov5_021F0D6C * param0, u32 param1) UnkStruct_0203CDB0 * v0 = param0->unk_20; MessageLoader_GetStrbuf(param0->unk_48, param1, param0->unk_30); - sub_0200C388(param0->unk_34, param0->unk_2C, param0->unk_30); + StringFormatter_Format(param0->unk_34, param0->unk_2C, param0->unk_30); param0->unk_28 = sub_0205D994(¶m0->unk_38, param0->unk_2C, sub_02025E44(v0->unk_0C), 1); } diff --git a/src/overlay005/ov5_021F6454.c b/src/overlay005/ov5_021F6454.c index 6a40cb2ae0..c5a29f6c98 100644 --- a/src/overlay005/ov5_021F6454.c +++ b/src/overlay005/ov5_021F6454.c @@ -306,7 +306,7 @@ static void ov5_021F6830 (UnkStruct_ov5_021F6704 * param0, u32 param1, u32 param Strbuf* v2 = Strbuf_Init((40 * 2), 4); MessageLoader_GetStrbuf(param0->unk_1FC, param1, v2); - sub_0200C388(param0->unk_200, param0->unk_1C[param0->unk_20B], v2); + StringFormatter_Format(param0->unk_200, param0->unk_1C[param0->unk_20B], v2); param0->unk_244[param0->unk_20B].unk_00 = (const void *)param0->unk_1C[param0->unk_20B]; Strbuf_Free(v2); } diff --git a/src/overlay005/ov5_021F77A8.c b/src/overlay005/ov5_021F77A8.c index 2fc3066237..240f053389 100644 --- a/src/overlay005/ov5_021F77A8.c +++ b/src/overlay005/ov5_021F77A8.c @@ -1065,7 +1065,7 @@ static void ov5_021F7FF8 (UnkStruct_ov5_021F7ED8 * param0, u32 param1, u32 param Strbuf* v2 = Strbuf_Init((40 * 2), 4); MessageLoader_GetStrbuf(param0->unk_B8, param1, v2); - sub_0200C388(param0->unk_BC, param0->unk_1C[param0->unk_C7], v2); + StringFormatter_Format(param0->unk_BC, param0->unk_1C[param0->unk_C7], v2); param0->unk_F8[param0->unk_C7].unk_00 = (const void *)param0->unk_1C[param0->unk_C7]; Strbuf_Free(v2); } diff --git a/src/overlay006/ov6_02247A0C.c b/src/overlay006/ov6_02247A0C.c index e9395f49c5..6380c77ab3 100644 --- a/src/overlay006/ov6_02247A0C.c +++ b/src/overlay006/ov6_02247A0C.c @@ -155,30 +155,30 @@ void * ov6_02247A90 (void * param0) v2 = MessageLoader_GetNewStrbuf(v0->unk_10, 0); sub_0200B498(v0->unk_14, 0, sub_02025E38(v8)); - sub_0200C388(v0->unk_14, v3, v2); + StringFormatter_Format(v0->unk_14, v3, v2); v4 = ov6_02247CF4(v3, 0, 1, (15 * 8)); - sub_0201D738(&v0->unk_00, 0, v3, v4, (8 * 0), 0xff, NULL); + PrintStringSimple(&v0->unk_00, 0, v3, v4, (8 * 0), 0xff, NULL); Strbuf_Free(v2); v2 = MessageLoader_GetNewStrbuf(v0->unk_10, 1); v4 = ov6_02247CF4(v2, 0, 1, ((15 * 8))); - sub_0201D738(&v0->unk_00, 0, v2, v4, (8 * 2), 0xff, NULL); + PrintStringSimple(&v0->unk_00, 0, v2, v4, (8 * 2), 0xff, NULL); Strbuf_Free(v2); for (v6 = 0; v6 < 5; v6++) { v2 = MessageLoader_GetNewStrbuf(v0->unk_10, Unk_ov6_022496F4[v6].unk_00); v4 = ov6_02247CF4(v2, 0, 0, Unk_ov6_022496F4[v6].unk_04); - sub_0201D738(&v0->unk_00, 0, v2, v4, Unk_ov6_022496F4[v6].unk_06, 0xff, NULL); + PrintStringSimple(&v0->unk_00, 0, v2, v4, Unk_ov6_022496F4[v6].unk_06, 0xff, NULL); Strbuf_Free(v2); } for (v6 = 0; v6 < 4; v6++) { v2 = MessageLoader_GetNewStrbuf(v0->unk_10, Unk_ov6_022496D4[v6].unk_00); v4 = ov6_02247CF4(v2, 0, 2, Unk_ov6_022496D4[v6].unk_04); - sub_0201D738(&v0->unk_00, 0, v2, v4, Unk_ov6_022496D4[v6].unk_06, 0xff, NULL); + PrintStringSimple(&v0->unk_00, 0, v2, v4, Unk_ov6_022496D4[v6].unk_06, 0xff, NULL); Strbuf_Free(v2); } @@ -187,9 +187,9 @@ void * ov6_02247A90 (void * param0) v5 = sub_0202F160(v8, v7, v6); v2 = MessageLoader_GetNewStrbuf(v0->unk_10, Unk_ov6_0224971C[v7][v6].unk_00); sub_0200B60C(v0->unk_14, 0, v5, 4, 1, 1); - sub_0200C388(v0->unk_14, v3, v2); + StringFormatter_Format(v0->unk_14, v3, v2); v4 = ov6_02247CF4(v3, 0, 2, Unk_ov6_0224971C[v7][v6].unk_04); - sub_0201D738(&v0->unk_00, 0, v3, v4, Unk_ov6_0224971C[v7][v6].unk_06, 0xff, NULL); + PrintStringSimple(&v0->unk_00, 0, v3, v4, Unk_ov6_0224971C[v7][v6].unk_06, 0xff, NULL); Strbuf_Free(v2); } } diff --git a/src/overlay007/ov7_02249960.c b/src/overlay007/ov7_02249960.c index ee64f411cb..47b1034bb7 100644 --- a/src/overlay007/ov7_02249960.c +++ b/src/overlay007/ov7_02249960.c @@ -154,7 +154,7 @@ static void ov7_02249960 (int param0, BOOL param1) if (param1) { MessageLoader_GetStrbuf(Unk_ov7_0224F5A0->unk_74, param0, Unk_ov7_0224F5A0->unk_00[4]); - sub_0200C388(Unk_ov7_0224F5A0->unk_58, Unk_ov7_0224F5A0->unk_00[5], Unk_ov7_0224F5A0->unk_00[4]); + StringFormatter_Format(Unk_ov7_0224F5A0->unk_58, Unk_ov7_0224F5A0->unk_00[5], Unk_ov7_0224F5A0->unk_00[4]); } else { MessageLoader_GetStrbuf(Unk_ov7_0224F5A0->unk_74, param0, Unk_ov7_0224F5A0->unk_00[5]); } @@ -317,17 +317,17 @@ static void ov7_02249C94 (UnkStruct_0200112C * param0, u32 param1, u8 param2) sub_0200B60C(Unk_ov7_0224F5A0->unk_50, 0, v1 + 1, 2, 2, 1); sub_0200B498(Unk_ov7_0224F5A0->unk_50, 1, Unk_ov7_0224F5A0->unk_7C); MessageLoader_GetStrbuf(Unk_ov7_0224F5A0->unk_74, 63, Unk_ov7_0224F5A0->unk_00[1]); - sub_0200C388(Unk_ov7_0224F5A0->unk_50, Unk_ov7_0224F5A0->unk_00[0], Unk_ov7_0224F5A0->unk_00[1]); - sub_0201D738(&Unk_ov7_0224F5A0->unk_20, 0, Unk_ov7_0224F5A0->unk_00[0], 8, param2 * 16, 0xff, NULL); + StringFormatter_Format(Unk_ov7_0224F5A0->unk_50, Unk_ov7_0224F5A0->unk_00[0], Unk_ov7_0224F5A0->unk_00[1]); + PrintStringSimple(&Unk_ov7_0224F5A0->unk_20, 0, Unk_ov7_0224F5A0->unk_00[0], 8, param2 * 16, 0xff, NULL); sub_0200B60C(Unk_ov7_0224F5A0->unk_50, 2, TrainerInfo_ID(Unk_ov7_0224F5A0->unk_7C) % 0x10000, 5, 2, 1); MessageLoader_GetStrbuf(Unk_ov7_0224F5A0->unk_74, 65, Unk_ov7_0224F5A0->unk_00[3]); - sub_0200C388(Unk_ov7_0224F5A0->unk_50, Unk_ov7_0224F5A0->unk_00[2], Unk_ov7_0224F5A0->unk_00[3]); - sub_0201D738(&Unk_ov7_0224F5A0->unk_20, 0, Unk_ov7_0224F5A0->unk_00[2], 11 * 8, param2 * 16, 0xff, NULL); + StringFormatter_Format(Unk_ov7_0224F5A0->unk_50, Unk_ov7_0224F5A0->unk_00[2], Unk_ov7_0224F5A0->unk_00[3]); + PrintStringSimple(&Unk_ov7_0224F5A0->unk_20, 0, Unk_ov7_0224F5A0->unk_00[2], 11 * 8, param2 * 16, 0xff, NULL); } else { sub_0200B60C(Unk_ov7_0224F5A0->unk_50, 0, v1 + 1, 2, 2, 1); MessageLoader_GetStrbuf(Unk_ov7_0224F5A0->unk_74, 64, Unk_ov7_0224F5A0->unk_00[1]); - sub_0200C388(Unk_ov7_0224F5A0->unk_50, Unk_ov7_0224F5A0->unk_00[0], Unk_ov7_0224F5A0->unk_00[1]); - sub_0201D738(&Unk_ov7_0224F5A0->unk_20, 0, Unk_ov7_0224F5A0->unk_00[0], 8, param2 * 16, 0xff, NULL); + StringFormatter_Format(Unk_ov7_0224F5A0->unk_50, Unk_ov7_0224F5A0->unk_00[0], Unk_ov7_0224F5A0->unk_00[1]); + PrintStringSimple(&Unk_ov7_0224F5A0->unk_20, 0, Unk_ov7_0224F5A0->unk_00[0], 8, param2 * 16, 0xff, NULL); } } @@ -399,8 +399,8 @@ static void ov7_02249EE0 (UnkStruct_ov7_02249C2C * param0) sub_0200B498(Unk_ov7_0224F5A0->unk_54, 0, Unk_ov7_0224F5A0->unk_78); sub_0200B60C(Unk_ov7_0224F5A0->unk_54, 1, TrainerInfo_ID(Unk_ov7_0224F5A0->unk_78) % 0x10000, 5, 2, 1); MessageLoader_GetStrbuf(Unk_ov7_0224F5A0->unk_74, 62, Unk_ov7_0224F5A0->unk_00[6]); - sub_0200C388(Unk_ov7_0224F5A0->unk_54, Unk_ov7_0224F5A0->unk_00[7], Unk_ov7_0224F5A0->unk_00[6]); - sub_0201D738(&Unk_ov7_0224F5A0->unk_30, 0, Unk_ov7_0224F5A0->unk_00[7], 2, 2, 0, NULL); + StringFormatter_Format(Unk_ov7_0224F5A0->unk_54, Unk_ov7_0224F5A0->unk_00[7], Unk_ov7_0224F5A0->unk_00[6]); + PrintStringSimple(&Unk_ov7_0224F5A0->unk_30, 0, Unk_ov7_0224F5A0->unk_00[7], 2, 2, 0, NULL); } static void ov7_02249F54 (SysTask * param0, void * param1) @@ -416,7 +416,7 @@ static void ov7_02249F54 (SysTask * param0, void * param1) for (v2 = 0; v2 < 16; v2++) { sub_0200B60C(Unk_ov7_0224F5A0->unk_50, 0, v2 + 1, 2, 2, 1); MessageLoader_GetStrbuf(Unk_ov7_0224F5A0->unk_74, 64, Unk_ov7_0224F5A0->unk_00[1]); - sub_0200C388(Unk_ov7_0224F5A0->unk_50, Unk_ov7_0224F5A0->unk_00[0], Unk_ov7_0224F5A0->unk_00[1]); + StringFormatter_Format(Unk_ov7_0224F5A0->unk_50, Unk_ov7_0224F5A0->unk_00[0], Unk_ov7_0224F5A0->unk_00[1]); sub_02013A6C(Unk_ov7_0224F5A0->unk_64, Unk_ov7_0224F5A0->unk_00[0], 0); } @@ -551,7 +551,7 @@ asm static void ov7_0224A128 (SysTask * param0, void * param1) ldr r0, [r2, #0x58] ldr r1, [r2, #0x14] ldr r2, [r2, #0x10] - bl sub_0200C388 + bl StringFormatter_Format ldr r0, = Unk_ov7_0224F5A0 ldr r0, [r0, #0] add r0, #0x40 @@ -592,7 +592,7 @@ asm static void ov7_0224A128 (SysTask * param0, void * param1) str r3, [sp, #8] ldr r2, [r2, #0x14] add r0, #0x40 - bl sub_0201D738 + bl PrintStringSimple ldr r1, = Unk_ov7_0224F5A0 ldr r1, [r1, #0] add r1, #0x94 @@ -730,12 +730,12 @@ static void ov7_0224A438 (UnkStruct_0200112C * param0, u32 param1, u8 param2) if (NULL != sub_02032EE8(v0)) { sub_0200B498(Unk_ov7_0224F5A0->unk_50, 0, sub_02032EE8(v0)); MessageLoader_GetStrbuf(Unk_ov7_0224F5A0->unk_74, 66, Unk_ov7_0224F5A0->unk_00[1]); - sub_0200C388(Unk_ov7_0224F5A0->unk_50, Unk_ov7_0224F5A0->unk_00[0], Unk_ov7_0224F5A0->unk_00[1]); - sub_0201D738(&Unk_ov7_0224F5A0->unk_20, 0, Unk_ov7_0224F5A0->unk_00[0], 8, param2 * 16, 0, NULL); + StringFormatter_Format(Unk_ov7_0224F5A0->unk_50, Unk_ov7_0224F5A0->unk_00[0], Unk_ov7_0224F5A0->unk_00[1]); + PrintStringSimple(&Unk_ov7_0224F5A0->unk_20, 0, Unk_ov7_0224F5A0->unk_00[0], 8, param2 * 16, 0, NULL); sub_0200B60C(Unk_ov7_0224F5A0->unk_50, 2, TrainerInfo_ID_LowHalf(sub_02032EE8(v0)), 5, 2, 1); MessageLoader_GetStrbuf(Unk_ov7_0224F5A0->unk_74, 65, Unk_ov7_0224F5A0->unk_00[3]); - sub_0200C388(Unk_ov7_0224F5A0->unk_50, Unk_ov7_0224F5A0->unk_00[2], Unk_ov7_0224F5A0->unk_00[3]); - sub_0201D738(&Unk_ov7_0224F5A0->unk_20, 0, Unk_ov7_0224F5A0->unk_00[2], 9 * 8, param2 * 16, 0, NULL); + StringFormatter_Format(Unk_ov7_0224F5A0->unk_50, Unk_ov7_0224F5A0->unk_00[2], Unk_ov7_0224F5A0->unk_00[3]); + PrintStringSimple(&Unk_ov7_0224F5A0->unk_20, 0, Unk_ov7_0224F5A0->unk_00[2], 9 * 8, param2 * 16, 0, NULL); } } @@ -841,8 +841,8 @@ static void ov7_0224A64C (UnkStruct_ov7_02249C2C * param0) sub_0200B60C(Unk_ov7_0224F5A0->unk_54, 0, v1, 2, 5, 1); BGL_FillWindow(&Unk_ov7_0224F5A0->unk_30, 15); MessageLoader_GetStrbuf(Unk_ov7_0224F5A0->unk_74, v0, Unk_ov7_0224F5A0->unk_00[7]); - sub_0200C388(Unk_ov7_0224F5A0->unk_54, Unk_ov7_0224F5A0->unk_00[6], Unk_ov7_0224F5A0->unk_00[7]); - sub_0201D738(&Unk_ov7_0224F5A0->unk_30, 0, Unk_ov7_0224F5A0->unk_00[6], 2, 2, 0, NULL); + StringFormatter_Format(Unk_ov7_0224F5A0->unk_54, Unk_ov7_0224F5A0->unk_00[6], Unk_ov7_0224F5A0->unk_00[7]); + PrintStringSimple(&Unk_ov7_0224F5A0->unk_30, 0, Unk_ov7_0224F5A0->unk_00[6], 2, 2, 0, NULL); } static void ov7_0224A6D4 (int param0, UnkStruct_ov7_02249C2C * param1) diff --git a/src/overlay007/ov7_0224B4E8.c b/src/overlay007/ov7_0224B4E8.c index 8d92efb405..0c5a85c206 100644 --- a/src/overlay007/ov7_0224B4E8.c +++ b/src/overlay007/ov7_0224B4E8.c @@ -102,7 +102,7 @@ static void ov7_0224B4E8 (UnkStruct_ov7_0224B4E8 * param0, int param1) } MessageLoader_GetStrbuf(param0->unk_68, param1, param0->unk_14); - sub_0200C388(param0->unk_64, param0->unk_18, param0->unk_14); + StringFormatter_Format(param0->unk_64, param0->unk_18, param0->unk_14); param0->unk_74 = sub_0205D994(¶m0->unk_54, param0->unk_18, sub_02025E44(param0->unk_10->unk_0C), 1); } @@ -147,7 +147,7 @@ static void ov7_0224B5A8 (UnkStruct_ov7_0224B4E8 * param0) ov7_0224B57C(param0, v4); MessageLoader_GetStrbuf(param0->unk_68, 113, param0->unk_1C); - sub_0200C388(param0->unk_64, param0->unk_20, param0->unk_1C); + StringFormatter_Format(param0->unk_64, param0->unk_20, param0->unk_1C); sub_02013A6C(param0->unk_08, param0->unk_20, v4); } @@ -346,12 +346,12 @@ static void ov7_0224B8DC (UnkStruct_ov7_0224B4E8 * param0) ov7_0224B57C(param0, param0->unk_78 - 1); MessageLoader_GetStrbuf(v0, 95, v2); - sub_0200C388(v1, v3, v2); - sub_0201D738(v4, 0, v3, v10 + v12, 0, 0xff, NULL); + StringFormatter_Format(v1, v3, v2); + PrintStringSimple(v4, 0, v3, v10 + v12, 0, 0xff, NULL); for (v5 = 0; v5 < 9; v5++) { MessageLoader_GetStrbuf(v0, 75 + v5, v2); - sub_0201D738(v4, 0, v2, v10, v9 + v11 * v5, 0xff, NULL); + PrintStringSimple(v4, 0, v2, v10, v9 + v11 * v5, 0xff, NULL); } for (v5 = 0; v5 < 9; v5++) { @@ -407,12 +407,12 @@ static void ov7_0224B8DC (UnkStruct_ov7_0224B4E8 * param0) } MessageLoader_GetStrbuf(v0, v7, v2); - sub_0200C388(v1, v3, v2); + StringFormatter_Format(v1, v3, v2); { int v14 = sub_02002D7C(0, v3, 0); int v15 = v13 - v14; - sub_0201D738(v4, 0, v3, v15, v9 + v11 * v5, 0xff, NULL); + PrintStringSimple(v4, 0, v3, v15, v9 + v11 * v5, 0xff, NULL); } } diff --git a/src/overlay007/ov7_0224BE9C.c b/src/overlay007/ov7_0224BE9C.c index 97f7d679de..c5823cab6b 100644 --- a/src/overlay007/ov7_0224BE9C.c +++ b/src/overlay007/ov7_0224BE9C.c @@ -476,7 +476,7 @@ static void ov7_0224C4E0 (UnkStruct_ov7_0224C3EC * param0, MessageLoader * param sub_0200B60C(v2, 1, param3[param4].unk_08, 3, 0, 1); sub_0200BFAC(v2, 2, param3[param4].unk_00); - sub_0200C388(v2, v1, v0); + StringFormatter_Format(v2, v1, v0); ov7_0224C468(param0, v1, param2); @@ -503,7 +503,7 @@ static void ov7_0224C580 (UnkStruct_ov7_0224C3EC * param0, MessageLoader * param sub_0200B60C(v2, 1, param3[param4].unk_08, 3, 0, 1); sub_0200BFAC(v2, 2, param3[param4].unk_00); - sub_0200C388(v2, v1, v0); + StringFormatter_Format(v2, v1, v0); ov7_0224C468(param0, v1, param2); @@ -564,7 +564,7 @@ static void ov7_0224C6DC (UnkStruct_ov7_0224C620 * param0, u32 param1, u32 param BGL_FillWindow(param0->unk_04, 15); for (v0 = 0; v0 < 3; v0++) { - sub_0200C388(param0->unk_08, param0->unk_0C, param0->unk_10[v0]); + StringFormatter_Format(param0->unk_08, param0->unk_0C, param0->unk_10[v0]); sub_0201D78C(param0->unk_04, 0, param0->unk_0C, 0, 16 * v0, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((15 & 0xff) << 0))), NULL); } @@ -621,7 +621,7 @@ static void ov7_0224C768 (UnkStruct_ov7_0224C768 * param0, BGL * param1, u32 par for (v0 = 0; v0 < param4; v0++) { sub_0200BFAC(param0->unk_124, 0, param3[v0].unk_00); - sub_0200C388(param0->unk_124, param0->unk_128, v1); + StringFormatter_Format(param0->unk_124, param0->unk_128, v1); param0->unk_C4[v0] = Strbuf_Clone(param0->unk_128, param2); param0->unk_0C[v0].unk_00 = param0->unk_C4[v0]; diff --git a/src/overlay007/ov7_0224CD28.c b/src/overlay007/ov7_0224CD28.c index 99475fdb48..dab10982d3 100644 --- a/src/overlay007/ov7_0224CD28.c +++ b/src/overlay007/ov7_0224CD28.c @@ -747,7 +747,7 @@ static void ov7_0224D9B8 (UnkStruct_0200112C * param0, u32 param1, u8 param2) } sub_0200B60C(v0->unk_8C, 0, v3, 4, 1, 1); - sub_0200C388(v0->unk_8C, v1, v2); + StringFormatter_Format(v0->unk_8C, v1, v2); v4 = sub_02002D7C(0, v1, 0); @@ -786,11 +786,11 @@ static void ov7_0224DAF8 (UnkStruct_ov7_0224D008 * param0, u8 param1) v2 = ov7_0224E8F4(param0); sub_0200B60C(param0->unk_8C, 0, v2, 6, 1, 1); - sub_0200C388(param0->unk_8C, v0, v1); + StringFormatter_Format(param0->unk_8C, v0, v1); v3 = sub_02002D7C(0, v0, 0); - sub_0201D738(¶m0->unk_08[2], 0, v0, (9 * 8) - v3 - 8, 0, 0xff, NULL); + PrintStringSimple(¶m0->unk_08[2], 0, v0, (9 * 8) - v3 - 8, 0, 0xff, NULL); } else { if (param1 == 0) { BGL_FillWindow(¶m0->unk_08[2], 15); @@ -798,7 +798,7 @@ static void ov7_0224DAF8 (UnkStruct_ov7_0224D008 * param0, u8 param1) v1 = MessageLoader_GetNewStrbuf(param0->unk_88, 18); - sub_0201D738(¶m0->unk_08[2], 0, v1, 0, 0, 0xff, NULL); + PrintStringSimple(¶m0->unk_08[2], 0, v1, 0, 0, 0xff, NULL); Strbuf_Free(v1); } else { BGL_WindowColor(¶m0->unk_08[2], 15, 0, 16, (9 * 8), 16); @@ -809,11 +809,11 @@ static void ov7_0224DAF8 (UnkStruct_ov7_0224D008 * param0, u8 param1) v2 = ov7_0224E8F4(param0); sub_0200B60C(param0->unk_8C, 0, v2, 6, 1, 1); - sub_0200C388(param0->unk_8C, v0, v1); + StringFormatter_Format(param0->unk_8C, v0, v1); v3 = sub_02002D7C(0, v0, 0); - sub_0201D738(¶m0->unk_08[2], 0, v0, (9 * 8) - v3, 16, 0xff, NULL); + PrintStringSimple(¶m0->unk_08[2], 0, v0, (9 * 8) - v3, 16, 0xff, NULL); } Strbuf_Free(v1); @@ -876,7 +876,7 @@ static u8 ov7_0224DC84 (UnkStruct_ov7_0224D008 * param0) v3 = MessageLoader_GetNewStrbuf(param0->unk_88, 3); } - sub_0200C388(param0->unk_8C, param0->unk_298, v3); + StringFormatter_Format(param0->unk_8C, param0->unk_298, v3); Strbuf_Free(v3); param0->unk_2A4 = sub_0205D994(¶m0->unk_08[5], param0->unk_298, param0->unk_278, 1); @@ -903,7 +903,7 @@ static u8 ov7_0224DC84 (UnkStruct_ov7_0224D008 * param0) v3 = MessageLoader_GetNewStrbuf(param0->unk_88, 4); } - sub_0200C388(param0->unk_8C, param0->unk_298, v3); + StringFormatter_Format(param0->unk_8C, param0->unk_298, v3); Strbuf_Free(v3); param0->unk_2A4 = sub_0205D994(¶m0->unk_08[5], param0->unk_298, param0->unk_278, 1); @@ -956,8 +956,8 @@ static void ov7_0224DED4 (UnkStruct_ov7_0224D008 * param0) v1 = MessageLoader_GetNewStrbuf(param0->unk_88, 20); sub_0200B60C(param0->unk_8C, 0, v2, 3, 1, 1); - sub_0200C388(param0->unk_8C, v0, v1); - sub_0201D738(¶m0->unk_08[4], 0, v0, 0, 0, 0xff, NULL); + StringFormatter_Format(param0->unk_8C, v0, v1); + PrintStringSimple(¶m0->unk_08[4], 0, v0, 0, 0, 0xff, NULL); Strbuf_Free(v1); Strbuf_Free(v0); sub_0201A9A4(¶m0->unk_08[4]); @@ -1035,7 +1035,7 @@ static u8 ov7_0224E098 (UnkStruct_ov7_0224D008 * param0) v0 = MessageLoader_GetNewStrbuf(param0->unk_88, 14); } - sub_0200C388(param0->unk_8C, param0->unk_298, v0); + StringFormatter_Format(param0->unk_8C, param0->unk_298, v0); Strbuf_Free(v0); param0->unk_2A4 = sub_0205D994(¶m0->unk_08[5], param0->unk_298, param0->unk_278, 1); @@ -1065,7 +1065,7 @@ static u8 ov7_0224E098 (UnkStruct_ov7_0224D008 * param0) } } - sub_0200C388(param0->unk_8C, param0->unk_298, v0); + StringFormatter_Format(param0->unk_8C, param0->unk_298, v0); Strbuf_Free(v0); param0->unk_2A4 = sub_0205D994(¶m0->unk_08[5], param0->unk_298, param0->unk_278, 1); @@ -1088,8 +1088,8 @@ static void ov7_0224E28C (UnkStruct_ov7_0224D008 * param0, u8 param1) v1 = MessageLoader_GetNewStrbuf(param0->unk_88, 21); sub_0200B60C(param0->unk_8C, 0, param0->unk_2AC, 2, 2, 1); - sub_0200C388(param0->unk_8C, v0, v1); - sub_0201D738(¶m0->unk_08[3], 0, v0, 0, 8, 0xff, NULL); + StringFormatter_Format(param0->unk_8C, v0, v1); + PrintStringSimple(¶m0->unk_08[3], 0, v0, 0, 8, 0xff, NULL); Strbuf_Free(v1); if (param0->unk_2A9 == 3) { @@ -1099,11 +1099,11 @@ static void ov7_0224E28C (UnkStruct_ov7_0224D008 * param0, u8 param1) } sub_0200B60C(param0->unk_8C, 0, param0->unk_2B0 * param0->unk_2AC, 6, 1, 1); - sub_0200C388(param0->unk_8C, v0, v1); + StringFormatter_Format(param0->unk_8C, v0, v1); v2 = sub_02002D7C(0, v0, 0); - sub_0201D738(¶m0->unk_08[3], 0, v0, (12 * 8) - v2, 8, 0xff, NULL); + PrintStringSimple(¶m0->unk_08[3], 0, v0, (12 * 8) - v2, 8, 0xff, NULL); Strbuf_Free(v1); Strbuf_Free(v0); sub_0201A9A4(¶m0->unk_08[3]); @@ -1160,7 +1160,7 @@ static u8 ov7_0224E3D8 (UnkStruct_ov7_0224D008 * param0) } } - sub_0200C388(param0->unk_8C, param0->unk_298, v0); + StringFormatter_Format(param0->unk_8C, param0->unk_298, v0); Strbuf_Free(v0); } BGL_FillWindow(¶m0->unk_08[5], 15); @@ -1233,7 +1233,7 @@ static u8 ov7_0224E6B8 (UnkStruct_ov7_0224D008 * param0) if (sub_0207D570(param0->unk_274, 12, 1, 11) == 1) { Strbuf* v0 = MessageLoader_GetNewStrbuf(param0->unk_88, 10); - sub_0200C388(param0->unk_8C, param0->unk_298, v0); + StringFormatter_Format(param0->unk_8C, param0->unk_298, v0); Strbuf_Free(v0); BGL_FillWindow(¶m0->unk_08[5], 15); @@ -1409,7 +1409,7 @@ static u8 ov7_0224E950 (UnkStruct_0203CDB0 * param0, UnkStruct_ov7_0224D008 * pa { Strbuf* v1 = MessageLoader_GetNewStrbuf(param1->unk_88, 2); - sub_0200C388(param1->unk_8C, param1->unk_298, v1); + StringFormatter_Format(param1->unk_8C, param1->unk_298, v1); Strbuf_Free(v1); } @@ -1440,7 +1440,7 @@ static void ov7_0224EA54 (UnkStruct_0203CDB0 * param0, UnkStruct_ov7_0224D008 * v0 = MessageLoader_GetNewStrbuf(param1->unk_88, 1); } - sub_0200C388(param1->unk_8C, param1->unk_298, v0); + StringFormatter_Format(param1->unk_8C, param1->unk_298, v0); Strbuf_Free(v0); sub_0205D8F4(param0->unk_08, ¶m1->unk_08[1], 3); sub_0205D944(¶m1->unk_08[1], param1->unk_278); @@ -1572,7 +1572,7 @@ static u8 ov7_0224EC9C (UnkStruct_0203CDB0 * param0, UnkStruct_ov7_0224D008 * pa { Strbuf* v0 = MessageLoader_GetNewStrbuf(param1->unk_88, 2); - sub_0200C388(param1->unk_8C, param1->unk_298, v0); + StringFormatter_Format(param1->unk_8C, param1->unk_298, v0); Strbuf_Free(v0); } diff --git a/src/overlay010/ov10_0221F800.c b/src/overlay010/ov10_0221F800.c index f5f8bf6294..f9d7a16f07 100644 --- a/src/overlay010/ov10_0221F800.c +++ b/src/overlay010/ov10_0221F800.c @@ -486,7 +486,7 @@ static void ov10_0221F930 (UnkStruct_ov10_0221FB28 * param0) case 1: ov10_022229D4(param0); MessageLoader_GetStrbuf(param0->unk_BA0, 0, param0->unk_BA8); - param0->unk_BAC = sub_0201D738(¶m0->unk_B7C, 1, param0->unk_BA8, 0, 0, 0, NULL); + param0->unk_BAC = PrintStringSimple(¶m0->unk_B7C, 1, param0->unk_BA8, 0, 0, 0, NULL); sub_0201C3C0(param0->unk_0C, 0); param0->unk_BB0 = 2; break; @@ -507,7 +507,7 @@ static void ov10_0221F930 (UnkStruct_ov10_0221FB28 * param0) BGL_WindowColor(¶m0->unk_B8C, 15, 0, 0, 27 * 8, 4 * 8); sub_0200E060(¶m0->unk_B8C, 0, 1, 15); - param0->unk_BAC = sub_0201D738(¶m0->unk_B8C, 1, param0->unk_BA8, 0, 0, 0, NULL); + param0->unk_BAC = PrintStringSimple(¶m0->unk_B8C, 1, param0->unk_BA8, 0, 0, 0, NULL); param0->unk_BB4 = sub_02002054(param0->unk_0C, &Unk_ov10_02222A68, (1 + (18 + 12)), 14, 1, param0->unk_00->unk_24); sub_0201C3C0(param0->unk_0C, 0); @@ -532,7 +532,7 @@ static void ov10_0221F930 (UnkStruct_ov10_0221FB28 * param0) case 5: ov10_022229D4(param0); MessageLoader_GetStrbuf(param0->unk_BA0, 5, param0->unk_BA8); - param0->unk_BAC = sub_0201D738(¶m0->unk_B7C, 1, param0->unk_BA8, 0, 0, 0, NULL); + param0->unk_BAC = PrintStringSimple(¶m0->unk_B7C, 1, param0->unk_BA8, 0, 0, 0, NULL); sub_0201C3C0(param0->unk_0C, 0); param0->unk_BB0 = 6; break; @@ -1028,7 +1028,7 @@ static u8 ov10_02220700 (UnkStruct_ov10_0221FB28 * param0) case 0: ov10_022229D4(param0); MessageLoader_GetStrbuf(param0->unk_BA0, 8, param0->unk_BA8); - param0->unk_BAC = sub_0201D738(¶m0->unk_B7C, 1, param0->unk_BA8, 0, 0, 0, NULL); + param0->unk_BAC = PrintStringSimple(¶m0->unk_B7C, 1, param0->unk_BA8, 0, 0, 0, NULL); ov10_02222A28(param0); param0->unk_B76++; break; @@ -1050,7 +1050,7 @@ static u8 ov10_02220700 (UnkStruct_ov10_0221FB28 * param0) ov10_02222A48(param0); BGL_WindowColor(¶m0->unk_B7C, 15, 0, 0, 27 * 8, 4 * 8); - param0->unk_BAC = sub_0201D738(¶m0->unk_B7C, 1, param0->unk_BA8, 0, 0, 0, NULL); + param0->unk_BAC = PrintStringSimple(¶m0->unk_B7C, 1, param0->unk_BA8, 0, 0, 0, NULL); } param0->unk_B75 = 0; @@ -1082,7 +1082,7 @@ static u8 ov10_022208B0 (UnkStruct_ov10_0221FB28 * param0) case 0: ov10_022229D4(param0); MessageLoader_GetStrbuf(param0->unk_BA0, 9, param0->unk_BA8); - param0->unk_BAC = sub_0201D738(¶m0->unk_B7C, 1, param0->unk_BA8, 0, 0, 0, NULL); + param0->unk_BAC = PrintStringSimple(¶m0->unk_B7C, 1, param0->unk_BA8, 0, 0, 0, NULL); sub_020364F0(62); if (param0->unk_BBC == 0) { @@ -2270,7 +2270,7 @@ static void ov10_02222400 (UnkStruct_ov10_0221FB28 * param0, MessageLoader * par v2 = MessageLoader_GetNewStrbuf(param1, 8 + param5); sub_0200B5CC(param3, 0, Pokemon_GetBoxPokemon(v0)); - sub_0200C388(param3, param4, v2); + StringFormatter_Format(param3, param4, v2); Strbuf_Free(v2); sub_0201D78C(v1, 0, param4, 0, 0, 0xff, ((u32)(((15 & 0xff) << 16) | ((14 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); @@ -2505,7 +2505,7 @@ static void ov10_02222A28 (UnkStruct_ov10_0221FB28 * param0) static void ov10_02222A48 (UnkStruct_ov10_0221FB28 * param0) { if (param0->unk_BB8 != NULL) { - sub_0200EBA0(param0->unk_BB8); + DeleteWaitDial(param0->unk_BB8); param0->unk_BB8 = NULL; } } diff --git a/src/overlay013/ov13_0221FC20.c b/src/overlay013/ov13_0221FC20.c index 170084baf9..ca46f26f86 100644 --- a/src/overlay013/ov13_0221FC20.c +++ b/src/overlay013/ov13_0221FC20.c @@ -1613,7 +1613,7 @@ static u8 ov13_022217A4 (UnkStruct_ov13_022213F0 * param0) v2 = BattleSystem_Partner(param0->unk_00->unk_08, param0->unk_00->unk_28); sub_0200BA74(param0->unk_1FA8, 0, BattleSystem_TrainerData(param0->unk_00->unk_08, v2)); } - sub_0200C388(param0->unk_1FA8, param0->unk_1FAC, v1); + StringFormatter_Format(param0->unk_1FA8, param0->unk_1FAC, v1); Strbuf_Free(v1); return 0; } @@ -1621,7 +1621,7 @@ static u8 ov13_022217A4 (UnkStruct_ov13_022213F0 * param0) if (v0->unk_10 == 0) { v1 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 77); sub_0200B5CC(param0->unk_1FA8, 0, Pokemon_GetBoxPokemon(v0->unk_00)); - sub_0200C388(param0->unk_1FA8, param0->unk_1FAC, v1); + StringFormatter_Format(param0->unk_1FA8, param0->unk_1FAC, v1); Strbuf_Free(v1); return 0; } @@ -1629,7 +1629,7 @@ static u8 ov13_022217A4 (UnkStruct_ov13_022213F0 * param0) if ((param0->unk_00->unk_2C[param0->unk_00->unk_11] == param0->unk_00->unk_14) || (param0->unk_00->unk_2C[param0->unk_00->unk_11] == param0->unk_00->unk_15)) { v1 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 76); sub_0200B5CC(param0->unk_1FA8, 0, Pokemon_GetBoxPokemon(v0->unk_00)); - sub_0200C388(param0->unk_1FA8, param0->unk_1FAC, v1); + StringFormatter_Format(param0->unk_1FA8, param0->unk_1FAC, v1); Strbuf_Free(v1); return 0; } @@ -1644,7 +1644,7 @@ static u8 ov13_022217A4 (UnkStruct_ov13_022213F0 * param0) v1 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 93); sub_0200B5CC(param0->unk_1FA8, 0, Pokemon_GetBoxPokemon(v0->unk_00)); - sub_0200C388(param0->unk_1FA8, param0->unk_1FAC, v1); + StringFormatter_Format(param0->unk_1FA8, param0->unk_1FAC, v1); Strbuf_Free(v1); return 0; } @@ -1654,7 +1654,7 @@ static u8 ov13_022217A4 (UnkStruct_ov13_022213F0 * param0) v1 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 78); sub_0200B5CC(param0->unk_1FA8, 0, Pokemon_GetBoxPokemon(v0->unk_00)); - sub_0200C388(param0->unk_1FA8, param0->unk_1FAC, v1); + StringFormatter_Format(param0->unk_1FA8, param0->unk_1FAC, v1); Strbuf_Free(v1); return 0; } diff --git a/src/overlay013/ov13_02221A88.c b/src/overlay013/ov13_02221A88.c index 7358aeafc8..016adf9764 100644 --- a/src/overlay013/ov13_02221A88.c +++ b/src/overlay013/ov13_02221A88.c @@ -319,7 +319,7 @@ static void ov13_02221C54 (UnkStruct_ov13_022213F0 * param0, u32 param1, u32 par v3 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, Unk_ov13_02228EC4[param3]); sub_0200B5CC(param0->unk_1FA8, 0, Pokemon_GetBoxPokemon(v1->unk_00)); - sub_0200C388(param0->unk_1FA8, v2, v3); + StringFormatter_Format(param0->unk_1FA8, v2, v3); if (param2 == 0) { sub_0201D78C(v0, param2, v2, param4, param5, 0xff, ((u32)(((15 & 0xff) << 16) | ((14 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); @@ -420,7 +420,7 @@ static void ov13_02221FA8 (UnkStruct_ov13_022213F0 * param0, u32 param1, u32 par v2 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 8); sub_0200B6A0(param0->unk_1FA8, 0, v0->unk_18); - sub_0200C388(param0->unk_1FA8, v1, v2); + StringFormatter_Format(param0->unk_1FA8, v1, v2); sub_0201D78C(¶m0->unk_206C[param1], 0, v1, 0, 0, 0xff, ((u32)(((15 & 0xff) << 16) | ((14 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); Strbuf_Free(v2); Strbuf_Free(v1); @@ -442,7 +442,7 @@ static void ov13_02222030 (UnkStruct_ov13_022213F0 * param0, u32 param1, u32 par v2 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 9); sub_0200B70C(param0->unk_1FA8, 0, v0->unk_1A); - sub_0200C388(param0->unk_1FA8, v1, v2); + StringFormatter_Format(param0->unk_1FA8, v1, v2); Strbuf_Free(v2); } @@ -463,7 +463,7 @@ static void ov13_022220CC (UnkStruct_ov13_022213F0 * param0, u32 param1, u32 par v2 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, param3); sub_0200B630(param0->unk_1FA8, 0, param1); - sub_0200C388(param0->unk_1FA8, v1, v2); + StringFormatter_Format(param0->unk_1FA8, v1, v2); if (param4 == 2) { v3 = (sub_0201C294(v0) * 8 - sub_02002D7C(param4, v1, 0)) / 2; @@ -536,7 +536,7 @@ static void ov13_02222290 (UnkStruct_ov13_022213F0 * param0, u32 param1) v2 = Strbuf_Init((3 + 1) * 2, param0->unk_00->unk_0C); sub_0200B60C(param0->unk_1FA8, 0, v0->unk_16_0, 3, 0, 1); - sub_0200C388(param0->unk_1FA8, v2, v1); + StringFormatter_Format(param0->unk_1FA8, v2, v1); sub_0201D78C(¶m0->unk_206C[11 + v4], 0, v2, 0, 0, 0xff, ((u32)(((15 & 0xff) << 16) | ((14 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); Strbuf_Free(v1); Strbuf_Free(v2); @@ -557,7 +557,7 @@ static void ov13_02222290 (UnkStruct_ov13_022213F0 * param0, u32 param1) param0->unk_1FA8, 0, 0, 6, 1, 1); } - sub_0200C388(param0->unk_1FA8, v2, v1); + StringFormatter_Format(param0->unk_1FA8, v2, v1); v3 = sub_0201C294(¶m0->unk_206C[12 + v4]) * 8 - sub_02002D7C(0, v2, 0); @@ -590,7 +590,7 @@ static void ov13_02222464 (UnkStruct_ov13_022213F0 * param0, u32 param1) v2 = Strbuf_Init((3 + 1) * 2, param0->unk_00->unk_0C); sub_0200B60C(param0->unk_1FA8, 0, v0->unk_06, 3, 0, 1); - sub_0200C388(param0->unk_1FA8, v2, v1); + StringFormatter_Format(param0->unk_1FA8, v2, v1); v4 = sub_02002D7C(0, v2, 0); v5 = sub_0201C294(¶m0->unk_206C[5 + v3]) * 8 - v4; @@ -622,7 +622,7 @@ static void ov13_02222560 (UnkStruct_ov13_022213F0 * param0, u32 param1) v2 = Strbuf_Init((3 + 1) * 2, param0->unk_00->unk_0C); sub_0200B60C(param0->unk_1FA8, 0, v0->unk_08, 3, 0, 1); - sub_0200C388(param0->unk_1FA8, v2, v1); + StringFormatter_Format(param0->unk_1FA8, v2, v1); v4 = sub_02002D7C(0, v2, 0); v5 = sub_0201C294(¶m0->unk_206C[6 + v3]) * 8 - v4; @@ -654,7 +654,7 @@ static void ov13_0222265C (UnkStruct_ov13_022213F0 * param0, u32 param1) v2 = Strbuf_Init((3 + 1) * 2, param0->unk_00->unk_0C); sub_0200B60C(param0->unk_1FA8, 0, v0->unk_0A, 3, 0, 1); - sub_0200C388(param0->unk_1FA8, v2, v1); + StringFormatter_Format(param0->unk_1FA8, v2, v1); v4 = sub_02002D7C(0, v2, 0); v5 = sub_0201C294(¶m0->unk_206C[7 + v3]) * 8 - v4; @@ -687,7 +687,7 @@ static void ov13_0222275C (UnkStruct_ov13_022213F0 * param0, u32 param1) v2 = Strbuf_Init((3 + 1) * 2, param0->unk_00->unk_0C); sub_0200B60C(param0->unk_1FA8, 0, v0->unk_0C, 3, 0, 1); - sub_0200C388(param0->unk_1FA8, v2, v1); + StringFormatter_Format(param0->unk_1FA8, v2, v1); v4 = sub_02002D7C(0, v2, 0); v5 = sub_0201C294(¶m0->unk_206C[8 + v3]) * 8 - v4; @@ -719,7 +719,7 @@ static void ov13_0222285C (UnkStruct_ov13_022213F0 * param0, u32 param1) v2 = Strbuf_Init((3 + 1) * 2, param0->unk_00->unk_0C); sub_0200B60C(param0->unk_1FA8, 0, v0->unk_0E, 3, 0, 1); - sub_0200C388(param0->unk_1FA8, v2, v1); + StringFormatter_Format(param0->unk_1FA8, v2, v1); v4 = sub_02002D7C(0, v2, 0); v5 = sub_0201C294(¶m0->unk_206C[9 + v3]) * 8 - v4; @@ -758,7 +758,7 @@ static void ov13_0222295C (UnkStruct_ov13_022213F0 * param0, u32 param1) v2 = Strbuf_Init((3 + 1) * 2, param0->unk_00->unk_0C); sub_0200B60C(param0->unk_1FA8, 0, v0->unk_10, 3, 0, 1); - sub_0200C388(param0->unk_1FA8, v2, v1); + StringFormatter_Format(param0->unk_1FA8, v2, v1); v4 = sub_02002D7C(0, v2, 0); @@ -770,7 +770,7 @@ static void ov13_0222295C (UnkStruct_ov13_022213F0 * param0, u32 param1) v2 = Strbuf_Init((3 + 1) * 2, param0->unk_00->unk_0C); sub_0200B60C(param0->unk_1FA8, 0, v0->unk_12, 3, 0, 1); - sub_0200C388(param0->unk_1FA8, v2, v1); + StringFormatter_Format(param0->unk_1FA8, v2, v1); sub_0201D78C(¶m0->unk_206C[4 + v6], 0, v2, v5 + v3, 0, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); Strbuf_Free(v1); Strbuf_Free(v2); @@ -831,7 +831,7 @@ static void ov13_02222BB4 (UnkStruct_ov13_022213F0 * param0, u32 param1, u32 par v2 = Strbuf_Init((3 + 1) * 2, param0->unk_00->unk_0C); sub_0200B60C(param0->unk_1FA8, 0, param2, 3, 0, 1); - sub_0200C388(param0->unk_1FA8, v2, v1); + StringFormatter_Format(param0->unk_1FA8, v2, v1); v3 = sub_02002D7C(0, v2, 0); v4 = sub_0201C294(v0) * 8 - v3; @@ -879,7 +879,7 @@ static void ov13_02222CE4 (UnkStruct_ov13_022213F0 * param0, u32 param1, u32 par v2 = Strbuf_Init((3 + 1) * 2, param0->unk_00->unk_0C); sub_0200B60C(param0->unk_1FA8, 0, param2, 3, 0, 1); - sub_0200C388(param0->unk_1FA8, v2, v1); + StringFormatter_Format(param0->unk_1FA8, v2, v1); v3 = sub_02002D7C(0, v2, 0); v4 = sub_0201C294(v0) * 8 - v3; @@ -993,7 +993,7 @@ static void ov13_02222F74 (UnkStruct_ov13_022213F0 * param0, u32 param1, u32 par v2 = Strbuf_Init((2 + 1) * 2, param0->unk_00->unk_0C); sub_0200B60C(param0->unk_1FA8, 0, param2, 3, 0, 1); - sub_0200C388(param0->unk_1FA8, v2, v1); + StringFormatter_Format(param0->unk_1FA8, v2, v1); v4 = sub_02002D7C(0, v2, 0); @@ -1005,7 +1005,7 @@ static void ov13_02222F74 (UnkStruct_ov13_022213F0 * param0, u32 param1, u32 par v2 = Strbuf_Init((2 + 1) * 2, param0->unk_00->unk_0C); sub_0200B60C(param0->unk_1FA8, 0, param3, 3, 0, 1); - sub_0200C388(param0->unk_1FA8, v2, v1); + StringFormatter_Format(param0->unk_1FA8, v2, v1); sub_0201D78C(v0, 0, v2, v5 + v3, 0, 0xff, ((u32)(((15 & 0xff) << 16) | ((14 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); Strbuf_Free(v1); Strbuf_Free(v2); @@ -1076,14 +1076,14 @@ static void ov13_0222317C (UnkStruct_ov13_022213F0 * param0, UnkStruct_ov13_0222 v1 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 45); sub_0200B60C(param0->unk_1FA8, 0, param1->unk_03, 2, 0, 1); - sub_0200C388(param0->unk_1FA8, v2, v1); + StringFormatter_Format(param0->unk_1FA8, v2, v1); sub_0201D78C(v0, 0, v2, 80 + v3, 24, 0xff, ((u32)(((15 & 0xff) << 16) | ((14 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); Strbuf_Free(v1); v1 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 44); sub_0200B60C(param0->unk_1FA8, 0, param1->unk_02, 2, 0, 1); - sub_0200C388(param0->unk_1FA8, v2, v1); + StringFormatter_Format(param0->unk_1FA8, v2, v1); v3 = sub_02002D7C(0, v2, 0); @@ -1111,7 +1111,7 @@ static void ov13_022232C8 (UnkStruct_ov13_022213F0 * param0, UnkStruct_ov13_0222 v1 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 44); sub_0200B60C(param0->unk_1FA8, 0, param1->unk_02, 2, 0, 1); - sub_0200C388(param0->unk_1FA8, v2, v1); + StringFormatter_Format(param0->unk_1FA8, v2, v1); v3 = sub_02002D7C(0, v2, 0); @@ -1205,7 +1205,7 @@ static void ov13_02223550 (UnkStruct_ov13_022213F0 * param0, u32 param1) v3 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, Unk_ov13_02228EC4[param1]); sub_0200B5CC(param0->unk_1FA8, 0, Pokemon_GetBoxPokemon(v1->unk_00)); - sub_0200C388(param0->unk_1FA8, v2, v3); + StringFormatter_Format(param0->unk_1FA8, v2, v3); Strbuf_Free(v3); v3 = NULL; @@ -1548,7 +1548,7 @@ void ov13_022240E0 (UnkStruct_ov13_022213F0 * param0) void ov13_02224108 (UnkStruct_ov13_022213F0 * param0) { sub_02002AC8(1); - param0->unk_2077 = sub_0201D738(¶m0->unk_204C[1], 1, param0->unk_1FAC, 0, 0, BattleSystem_TextSpeed(param0->unk_00->unk_08), NULL); + param0->unk_2077 = PrintStringSimple(¶m0->unk_204C[1], 1, param0->unk_1FAC, 0, 0, BattleSystem_TextSpeed(param0->unk_00->unk_08), NULL); } void ov13_02224144 (UnkStruct_ov13_022213F0 * param0) @@ -1598,55 +1598,55 @@ void ov13_02224144 (UnkStruct_ov13_022213F0 * param0) if ((param0->unk_04[v1->unk_11].unk_10 == 0) && (v4 != 0)) { v3 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 88); sub_0200B5CC(param0->unk_1FA8, 0, Pokemon_GetBoxPokemon(v0)); - sub_0200C388(param0->unk_1FA8, param0->unk_1FAC, v3); + StringFormatter_Format(param0->unk_1FA8, param0->unk_1FAC, v3); Strbuf_Free(v3); } else if (param0->unk_04[v1->unk_11].unk_10 != v4) { v3 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 82); sub_0200B5CC(param0->unk_1FA8, 0, Pokemon_GetBoxPokemon(v0)); sub_0200B60C(param0->unk_1FA8, 1, v4 - param0->unk_04[v1->unk_11].unk_10, 3, 0, 1); - sub_0200C388(param0->unk_1FA8, param0->unk_1FAC, v3); + StringFormatter_Format(param0->unk_1FA8, param0->unk_1FAC, v3); Strbuf_Free(v3); } else if ((Item_Get(v2, 36) != 0) || (Item_Get(v2, 37) != 0)) { MessageLoader_GetStrbuf(param0->unk_1FA4, 87, param0->unk_1FAC); } else if (v5 == 0x1) { v3 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 92); sub_0200B5CC(param0->unk_1FA8, 0, Pokemon_GetBoxPokemon(v0)); - sub_0200C388(param0->unk_1FA8, param0->unk_1FAC, v3); + StringFormatter_Format(param0->unk_1FA8, param0->unk_1FAC, v3); Strbuf_Free(v3); } else if (v5 == 0x2) { v3 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 83); sub_0200B5CC(param0->unk_1FA8, 0, Pokemon_GetBoxPokemon(v0)); - sub_0200C388(param0->unk_1FA8, param0->unk_1FAC, v3); + StringFormatter_Format(param0->unk_1FA8, param0->unk_1FAC, v3); Strbuf_Free(v3); } else if (v5 == 0x4) { v3 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 85); sub_0200B5CC(param0->unk_1FA8, 0, Pokemon_GetBoxPokemon(v0)); - sub_0200C388(param0->unk_1FA8, param0->unk_1FAC, v3); + StringFormatter_Format(param0->unk_1FA8, param0->unk_1FAC, v3); Strbuf_Free(v3); } else if (v5 == 0x8) { v3 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 86); sub_0200B5CC(param0->unk_1FA8, 0, Pokemon_GetBoxPokemon(v0)); - sub_0200C388(param0->unk_1FA8, param0->unk_1FAC, v3); + StringFormatter_Format(param0->unk_1FA8, param0->unk_1FAC, v3); Strbuf_Free(v3); } else if (v5 == 0x10) { v3 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 84); sub_0200B5CC(param0->unk_1FA8, 0, Pokemon_GetBoxPokemon(v0)); - sub_0200C388(param0->unk_1FA8, param0->unk_1FAC, v3); + StringFormatter_Format(param0->unk_1FA8, param0->unk_1FAC, v3); Strbuf_Free(v3); } else if (v5 == 0x20) { v3 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 90); sub_0200B5CC(param0->unk_1FA8, 0, Pokemon_GetBoxPokemon(v0)); - sub_0200C388(param0->unk_1FA8, param0->unk_1FAC, v3); + StringFormatter_Format(param0->unk_1FA8, param0->unk_1FAC, v3); Strbuf_Free(v3); } else if (v5 == 0x40) { v3 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 91); sub_0200B5CC(param0->unk_1FA8, 0, Pokemon_GetBoxPokemon(v0)); - sub_0200C388(param0->unk_1FA8, param0->unk_1FAC, v3); + StringFormatter_Format(param0->unk_1FA8, param0->unk_1FAC, v3); Strbuf_Free(v3); } else { v3 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 89); sub_0200B5CC(param0->unk_1FA8, 0, Pokemon_GetBoxPokemon(v0)); - sub_0200C388(param0->unk_1FA8, param0->unk_1FAC, v3); + StringFormatter_Format(param0->unk_1FA8, param0->unk_1FAC, v3); Strbuf_Free(v3); } @@ -1665,6 +1665,6 @@ void ov13_0222449C (UnkStruct_ov13_022213F0 * param0) sub_0200B5CC(param0->unk_1FA8, 0, Pokemon_GetBoxPokemon(v0)); sub_0200B630(param0->unk_1FA8, 1, 373); - sub_0200C388(param0->unk_1FA8, param0->unk_1FAC, v2); + StringFormatter_Format(param0->unk_1FA8, param0->unk_1FAC, v2); Strbuf_Free(v2); } diff --git a/src/overlay013/ov13_022264F4.c b/src/overlay013/ov13_022264F4.c index 72b611718c..89050e1214 100644 --- a/src/overlay013/ov13_022264F4.c +++ b/src/overlay013/ov13_022264F4.c @@ -417,7 +417,7 @@ static u8 ov13_02226A5C (UnkStruct_ov13_02227244 * param0) sub_0200B5CC(param0->unk_14, 0, Pokemon_GetBoxPokemon(v3)); sub_0200B630(param0->unk_14, 1, 373); - sub_0200C388(param0->unk_14, param0->unk_18, v4); + StringFormatter_Format(param0->unk_14, param0->unk_18, v4); Strbuf_Free(v4); ov13_022279F4(param0); @@ -440,7 +440,7 @@ static u8 ov13_02226A5C (UnkStruct_ov13_02227244 * param0) v5 = MessageLoader_Init(1, 26, 213, v0->unk_0C); v6 = MessageLoader_GetNewStrbuf(v5, 36); sub_0200B498(param0->unk_14, 0, v0->unk_04); - sub_0200C388(param0->unk_14, param0->unk_18, v6); + StringFormatter_Format(param0->unk_14, param0->unk_18, v6); Strbuf_Free(v6); MessageLoader_Free(v5); ov13_022279F4(param0); diff --git a/src/overlay013/ov13_02227288.c b/src/overlay013/ov13_02227288.c index 86fb3f8a83..36bcfe477b 100644 --- a/src/overlay013/ov13_02227288.c +++ b/src/overlay013/ov13_02227288.c @@ -203,7 +203,7 @@ static void ov13_022274A8 (UnkStruct_ov13_02227244 * param0, u32 param1, u32 par v1 = MessageLoader_GetNewStrbuf(param0->unk_10, Unk_ov13_02229AB0[param2][0]); sub_0200B70C(param0->unk_14, 0, param0->unk_3C[param0->unk_114D][param1].item); - sub_0200C388(param0->unk_14, param0->unk_18, v1); + StringFormatter_Format(param0->unk_14, param0->unk_18, v1); v2 = sub_02002D7C(param4, param0->unk_18, 0); v3 = (sub_0201C294(v0) * 8 - v2) / 2; @@ -228,7 +228,7 @@ static void ov13_0222754C (UnkStruct_ov13_02227244 * param0, u32 param1, u32 par v0 = MessageLoader_GetNewStrbuf(param0->unk_10, Unk_ov13_02229AB0[param2][1]); sub_0200B60C(param0->unk_14, 0, param0->unk_3C[param0->unk_114D][param1].quantity, 3, 0, 1); - sub_0200C388(param0->unk_14, param0->unk_18, v0); + StringFormatter_Format(param0->unk_14, param0->unk_18, v0); sub_0201D78C(v1, param4, param0->unk_18, 0, param5, 0xff, param6, NULL); Strbuf_Free(v0); } @@ -285,13 +285,13 @@ void ov13_02227698 (UnkStruct_ov13_02227244 * param0) v1 = MessageLoader_GetNewStrbuf(param0->unk_10, 29); sub_0200B60C(param0->unk_14, 0, param0->unk_1154[param0->unk_114D] + 1, 2, 0, 1); - sub_0200C388(param0->unk_14, param0->unk_18, v1); + StringFormatter_Format(param0->unk_14, param0->unk_18, v1); sub_0201D78C(v0, 0, param0->unk_18, v3 + v2, 4, 0xff, (((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0)))), NULL); Strbuf_Free(v1); v1 = MessageLoader_GetNewStrbuf(param0->unk_10, 30); sub_0200B60C(param0->unk_14, 0, param0->unk_00->unk_2C[param0->unk_114D] + 1, 2, 0, 1); - sub_0200C388(param0->unk_14, param0->unk_18, v1); + StringFormatter_Format(param0->unk_14, param0->unk_18, v1); v2 = sub_02002D7C(0, param0->unk_18, 0); sub_0201D78C(v0, 0, param0->unk_18, v3 - v2, 4, 0xff, (((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0)))), NULL); @@ -337,7 +337,7 @@ static void ov13_022278A0 (UnkStruct_ov13_02227244 * param0, u32 param1) v1 = MessageLoader_GetNewStrbuf(param0->unk_10, Unk_ov13_02229AB0[0][0]); sub_0200B70C(param0->unk_14, 0, param0->unk_3C[param0->unk_114D][param1].item); - sub_0200C388(param0->unk_14, param0->unk_18, v1); + StringFormatter_Format(param0->unk_14, param0->unk_18, v1); BGL_FillWindow(v0, 0); sub_0201D78C(v0, 0, param0->unk_18, 0, 0, 0xff, (((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0)))), NULL); Strbuf_Free(v1); @@ -385,5 +385,5 @@ void ov13_022279F4 (UnkStruct_ov13_02227244 * param0) void ov13_02227A1C (UnkStruct_ov13_02227244 * param0) { sub_02002AC8(1); - param0->unk_32 = sub_0201D738(¶m0->unk_1C, 1, param0->unk_18, 0, 0, BattleSystem_TextSpeed(param0->unk_00->unk_00), NULL); + param0->unk_32 = PrintStringSimple(¶m0->unk_1C, 1, param0->unk_18, 0, 0, BattleSystem_TextSpeed(param0->unk_00->unk_00), NULL); } diff --git a/src/overlay016/battle_controller.c b/src/overlay016/battle_controller.c index 36469e307f..7d682a897e 100644 --- a/src/overlay016/battle_controller.c +++ b/src/overlay016/battle_controller.c @@ -44,8 +44,8 @@ #include "overlay016/ov16_0223B140.h" #include "overlay016/ov16_0223DF00.h" #include "battle/battle_lib.h" -#include "overlay016/ov16_0225CBB8.h" -#include "overlay016/ov16_0226485C.h" +#include "battle/battle_display.h" +#include "battle/battle_io.h" enum { STATE_PROCESSING = 0, diff --git a/src/overlay016/ov16_0225CBB8.c b/src/overlay016/battle_display.c similarity index 95% rename from src/overlay016/ov16_0225CBB8.c rename to src/overlay016/battle_display.c index 5f5fffaa55..61235a18e4 100644 --- a/src/overlay016/ov16_0225CBB8.c +++ b/src/overlay016/battle_display.c @@ -81,7 +81,6 @@ #include "overlay016/struct_ov16_0225D794.h" #include "overlay016/struct_ov16_0225D840.h" #include "overlay016/struct_ov16_0225D8AC.h" -#include "overlay016/struct_ov16_0225D8F0.h" #include "overlay016/struct_ov16_0225D9A8.h" #include "overlay016/struct_ov16_0225DA44.h" #include "overlay016/struct_ov16_0225DB74.h" @@ -149,66 +148,13 @@ #include "overlay016/ov16_0223B140.h" #include "overlay016/ov16_0223DF00.h" #include "battle/battle_lib.h" -#include "overlay016/ov16_0225CBB8.h" +#include "battle/battle_display.h" #include "overlay016/ov16_02264798.h" -#include "overlay016/ov16_0226485C.h" +#include "battle/battle_io.h" #include "overlay016/ov16_02266F1C.h" #include "overlay016/ov16_0226871C.h" #include "battle/party_gauge.h" -void ov16_0225CBB8(BattleSystem * param0, BattlerData * param1); -void ov16_0225CBDC(BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_0225C168 * param2); -void ov16_0225CE1C(BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_0225C17C * param2); -void ov16_0225CF70(BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_0225C17C * param2); -void ov16_0225D118(BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_02264EF8 * param2); -void ov16_0225D1C4(BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_02265050 * param2); -void ov16_0225D228(BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_02265124 * param2); -void ov16_0225D360(BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_02265154 * param2); -void ov16_0225D3CC(BattleSystem * param0, BattlerData * param1); -void ov16_0225D414(BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_022651A8 * param2); -void ov16_0225D4A8(BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_0225C23C * param2); -void ov16_0225D570(BattleSystem * param0, BattlerData * param1); -void ov16_0225D5B8(BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_0225C260 * param2); -void ov16_0225D698(BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_022656F0 * param2); -void ov16_0225D708(BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_0225C29C * param2); -void ov16_0225D794(BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_0225C2B0 * param2); -void ov16_0225D840(BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_0225C2C4 * param2); -void ov16_0225D8AC(BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_0225C2D8 * param2); -void ov16_0225D8F0(BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_0225C2EC * param2); -void ov16_0225D958(BattleSystem * param0, BattlerData * param1, BattleMessage * param2); -void ov16_0225D9A8(BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_02265BBC * param2); -void ov16_0225DA44(BattleSystem * param0, BattlerData * param1); -void ov16_0225DA74(BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_0225C35C * param2); -void ov16_0225DB00(BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_0225C370 * param2); -void ov16_0225DB74(BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_0225C384 * param2); -void ov16_0225DC4C(BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_0225C398 * param2); -void ov16_0225DC7C(BattleSystem * param0, BattlerData * param1); -void ov16_0225DCB0(BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_0225C3BC * param2); -void ov16_0225DD44(BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_0225C3D0 * param2); -void ov16_0225DD7C(BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_0225C3E4 * param2); -void ov16_0225DDD8(BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_0225C3F8 * param2); -void ov16_0225DE30(BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_0225C40C * param2); -void ov16_0225DE88(BattleSystem * param0, BattlerData * param1); -void ov16_0225DEDC(BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_0225C430 * param2); -void ov16_0225DF34(BattleSystem * param0, BattlerData * param1); -void ov16_0225DF6C(BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_0225C454 * param2); -void ov16_0225E008(BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_0225C468 * param2); -void ov16_0225E0BC(BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_0225C65C * param2); -void ov16_0225E0F4(BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_022664F8 * param2); -void Battler_ShowBattleStartPartyGauge(BattleSystem * param0, BattlerData * param1, PartyGaugeData * param2); -void Battler_HideBattleStartPartyGauge(BattleSystem * param0, BattlerData * param1, PartyGaugeData * param2); -void Battler_ShowPartyGauge(BattleSystem * param0, BattlerData * param1, PartyGaugeData * param2); -void Battler_HidePartyGauge(BattleSystem * param0, BattlerData * param1, PartyGaugeData * param2); -void ov16_0225E23C(BattleSystem * param0, BattlerData * param1); -void ov16_0225E294(BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_02265BBC * param2); -void ov16_0225E2C8(BattleSystem * param0, BattlerData * param1); -void ov16_0225E300(BattleSystem * param0, BattlerData * param1); -void ov16_0225E338(BattleSystem * param0, BattlerData * param1); -void ov16_0225E38C(BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_0225C9F0 * param2); -void ov16_0225E3E0(BattleSystem * param0, BattlerData * param1); -void ov16_0225E434(BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_02265BBC * param2); -void ov16_0225E468(BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_0225CA4C * param2); -void ov16_0225E4C8(BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_0225CA60 * param2); static void ov16_0225E4E8(SysTask * param0, void * param1); static void ov16_0225E894(SysTask * param0, void * param1); static void ov16_0225EA80(SysTask * param0, void * param1); @@ -255,7 +201,7 @@ static void ov16_02262A9C(SysTask * param0, void * param1); static void ov16_02262D28(SysTask * param0, void * param1); static void ov16_02262DC4(SysTask * param0, void * param1); static void ov16_02262F30(SysTask * param0, void * param1); -static void ov16_02262F7C(SysTask * param0, void * param1); +static void WaitForBattleMessagePrint(SysTask * param0, void * param1); static void ov16_02262FC0(SysTask * param0, void * param1); static void ov16_02263014(SysTask * param0, void * param1); static void ov16_022633A4(SysTask * param0, void * param1); @@ -264,14 +210,6 @@ static void ShowPartyGaugeTask(SysTask * param0, void * param1); static void HidePartyGaugeTask(SysTask * param0, void * param1); static void ov16_02263688(SysTask * param0, void * param1); static void ov16_022636D4(SysTask * param0, void * param1); -void ov16_02263730(BattleSystem * param0, BattlerData * param1); -u8 Battler_Type(BattlerData * param0); -u8 Battler_BootState(BattlerData * param0); -Sprite * ov16_02263AFC(BattlerData * param0); -UnkStruct_ov16_022674C4 * ov16_02263B08(BattlerData * param0); -UnkStruct_ov16_0226C378 * ov16_02263B0C(BattlerData * param0); -void ov16_02263B10(BattlerData * param0); -void ov16_02263B20(BattlerData * param0, int param1); static Sprite * ov16_02263B30(BattleSystem * param0, UnkStruct_02007768 * param1, ArchivedSprite * param2, int param3, int param4, int param5, int param6, int param7, int param8, int param9, int param10, SpriteAnimationFrame * param11, UnkFuncPtr_02007C34 * param12); static void ov16_02263C1C(BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_0225C3F8 * param2, BattleMessage * param3); static void ov16_02263CF0(BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_0225C40C * param2, BattleMessage * param3); @@ -910,42 +848,46 @@ void ov16_0225D8AC (BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_ SysTask_Start(param1->unk_00.unk_14, v0, 0); } +typedef struct BattleMessageWaitTask { + BattleSystem *battleSys; + u8 command; + u8 battler; + u8 msgIdx; +} BattleMessageWaitTask; + void ov16_0225D8F0 (BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_0225C2EC * param2) { - UnkStruct_ov16_0225D8F0 * v0; + BattleMessageWaitTask * v0; MessageLoader * v1; BattleMessage v2; v1 = ov16_0223E060(param0); - v0 = (UnkStruct_ov16_0225D8F0 *)Heap_AllocFromHeap(5, sizeof(UnkStruct_ov16_0225D8F0)); + v0 = (BattleMessageWaitTask *)Heap_AllocFromHeap(5, sizeof(BattleMessageWaitTask)); - v0->unk_00 = param0; - v0->unk_04 = param2->unk_00; - v0->unk_05 = param1->battler; + v0->battleSys = param0; + v0->command = param2->unk_00; + v0->battler = param1->battler; v2.id = 0 + param2->unk_02 * 3; v2.tags = 2; v2.params[0] = param1->battler | (param2->unk_01 << 8); - v0->unk_06 = BattleMessage_Print(param0, v1, &v2, BattleSystem_TextSpeed(param0)); + v0->msgIdx = BattleMessage_Print(param0, v1, &v2, BattleSystem_TextSpeed(param0)); - SysTask_Start(ov16_02262F7C, v0, 0); + SysTask_Start(WaitForBattleMessagePrint, v0, 0); } -void ov16_0225D958 (BattleSystem * param0, BattlerData * param1, BattleMessage * param2) +void BattleDisplay_PrintMessage(BattleSystem *battleSys, BattlerData *battlerData, BattleMessage *battleMsg) { - UnkStruct_ov16_0225D8F0 * v0; - MessageLoader * v1; - - v1 = BattleSystem_MessageLoader(param0); - v0 = (UnkStruct_ov16_0225D8F0 *)Heap_AllocFromHeap(5, sizeof(UnkStruct_ov16_0225D8F0)); + MessageLoader *msgLoader = BattleSystem_MessageLoader(battleSys); + BattleMessageWaitTask *taskData = Heap_AllocFromHeap(HEAP_ID_BATTLE, sizeof(BattleMessageWaitTask)); - v0->unk_00 = param0; - v0->unk_04 = param1->data[0]; - v0->unk_05 = param1->battler; - v0->unk_06 = BattleMessage_Print(param0, v1, param2, BattleSystem_TextSpeed(param0)); + taskData->battleSys = battleSys; + taskData->command = battlerData->data[0]; + taskData->battler = battlerData->battler; + taskData->msgIdx = BattleMessage_Print(battleSys, msgLoader, battleMsg, BattleSystem_TextSpeed(battleSys)); - SysTask_Start(ov16_02262F7C, v0, 0); + SysTask_Start(WaitForBattleMessagePrint, taskData, 0); } void ov16_0225D9A8 (BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_02265BBC * param2) @@ -1144,94 +1086,94 @@ void ov16_0225DD44 (BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_ void ov16_0225DD7C (BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_0225C3E4 * param2) { - UnkStruct_ov16_0225D8F0 * v0; + BattleMessageWaitTask * v0; int v1; v1 = Battler_TrainerID(param0, param1->battler); - v0 = (UnkStruct_ov16_0225D8F0 *)Heap_AllocFromHeap(5, sizeof(UnkStruct_ov16_0225D8F0)); + v0 = (BattleMessageWaitTask *)Heap_AllocFromHeap(5, sizeof(BattleMessageWaitTask)); - v0->unk_00 = param0; - v0->unk_04 = param2->unk_00; - v0->unk_05 = param1->battler; - v0->unk_06 = ov16_0223F9FC(param0, v1, param1->battler, param2->unk_01, BattleSystem_TextSpeed(param0)); + v0->battleSys = param0; + v0->command = param2->unk_00; + v0->battler = param1->battler; + v0->msgIdx = ov16_0223F9FC(param0, v1, param1->battler, param2->unk_01, BattleSystem_TextSpeed(param0)); - SysTask_Start(ov16_02262F7C, v0, 0); + SysTask_Start(WaitForBattleMessagePrint, v0, 0); } void ov16_0225DDD8 (BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_0225C3F8 * param2) { - UnkStruct_ov16_0225D8F0 * v0; + BattleMessageWaitTask * v0; MessageLoader * v1; BattleMessage v2; ov16_02263C1C(param0, param1, param2, &v2); v1 = BattleSystem_MessageLoader(param0); - v0 = (UnkStruct_ov16_0225D8F0 *)Heap_AllocFromHeap(5, sizeof(UnkStruct_ov16_0225D8F0)); + v0 = (BattleMessageWaitTask *)Heap_AllocFromHeap(5, sizeof(BattleMessageWaitTask)); - v0->unk_00 = param0; - v0->unk_04 = param2->unk_00; - v0->unk_05 = param1->battler; - v0->unk_06 = BattleMessage_Print(param0, v1, &v2, BattleSystem_TextSpeed(param0)); + v0->battleSys = param0; + v0->command = param2->unk_00; + v0->battler = param1->battler; + v0->msgIdx = BattleMessage_Print(param0, v1, &v2, BattleSystem_TextSpeed(param0)); - SysTask_Start(ov16_02262F7C, v0, 0); + SysTask_Start(WaitForBattleMessagePrint, v0, 0); } void ov16_0225DE30 (BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_0225C40C * param2) { - UnkStruct_ov16_0225D8F0 * v0; + BattleMessageWaitTask * v0; MessageLoader * v1; BattleMessage v2; ov16_02263CF0(param0, param1, param2, &v2); v1 = BattleSystem_MessageLoader(param0); - v0 = (UnkStruct_ov16_0225D8F0 *)Heap_AllocFromHeap(5, sizeof(UnkStruct_ov16_0225D8F0)); + v0 = (BattleMessageWaitTask *)Heap_AllocFromHeap(5, sizeof(BattleMessageWaitTask)); - v0->unk_00 = param0; - v0->unk_04 = param2->unk_00; - v0->unk_05 = param1->battler; - v0->unk_06 = BattleMessage_Print(param0, v1, &v2, BattleSystem_TextSpeed(param0)); + v0->battleSys = param0; + v0->command = param2->unk_00; + v0->battler = param1->battler; + v0->msgIdx = BattleMessage_Print(param0, v1, &v2, BattleSystem_TextSpeed(param0)); - SysTask_Start(ov16_02262F7C, v0, 0); + SysTask_Start(WaitForBattleMessagePrint, v0, 0); } void ov16_0225DE88 (BattleSystem * param0, BattlerData * param1) { - UnkStruct_ov16_0225D8F0 * v0; + BattleMessageWaitTask * v0; MessageLoader * v1; BattleMessage v2; ov16_02263DD0(param0, param1, &v2); v1 = BattleSystem_MessageLoader(param0); - v0 = (UnkStruct_ov16_0225D8F0 *)Heap_AllocFromHeap(5, sizeof(UnkStruct_ov16_0225D8F0)); + v0 = (BattleMessageWaitTask *)Heap_AllocFromHeap(5, sizeof(BattleMessageWaitTask)); - v0->unk_00 = param0; - v0->unk_04 = 34; - v0->unk_05 = param1->battler; - v0->unk_06 = BattleMessage_Print(param0, v1, &v2, BattleSystem_TextSpeed(param0)); + v0->battleSys = param0; + v0->command = 34; + v0->battler = param1->battler; + v0->msgIdx = BattleMessage_Print(param0, v1, &v2, BattleSystem_TextSpeed(param0)); - SysTask_Start(ov16_02262F7C, v0, 0); + SysTask_Start(WaitForBattleMessagePrint, v0, 0); } void ov16_0225DEDC (BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_0225C430 * param2) { - UnkStruct_ov16_0225D8F0 * v0; + BattleMessageWaitTask * v0; MessageLoader * v1; BattleMessage v2; ov16_02263E7C(param0, param1, param2, &v2); v1 = BattleSystem_MessageLoader(param0); - v0 = (UnkStruct_ov16_0225D8F0 *)Heap_AllocFromHeap(5, sizeof(UnkStruct_ov16_0225D8F0)); + v0 = (BattleMessageWaitTask *)Heap_AllocFromHeap(5, sizeof(BattleMessageWaitTask)); - v0->unk_00 = param0; - v0->unk_04 = param2->unk_00; - v0->unk_05 = param1->battler; - v0->unk_06 = BattleMessage_Print(param0, v1, &v2, BattleSystem_TextSpeed(param0)); + v0->battleSys = param0; + v0->command = param2->unk_00; + v0->battler = param1->battler; + v0->msgIdx = BattleMessage_Print(param0, v1, &v2, BattleSystem_TextSpeed(param0)); - SysTask_Start(ov16_02262F7C, v0, 0); + SysTask_Start(WaitForBattleMessagePrint, v0, 0); } void ov16_0225DF34 (BattleSystem * param0, BattlerData * param1) @@ -1349,7 +1291,7 @@ typedef struct PartyGaugeTask { u8 midBattle; } PartyGaugeTask; -void Battler_ShowBattleStartPartyGauge(BattleSystem *battleSys, BattlerData *battlerData, PartyGaugeData *partyGauge) +void BattleDisplay_ShowBattleStartPartyGauge(BattleSystem *battleSys, BattlerData *battlerData, PartyGaugeData *partyGauge) { PartyGaugeTask *task = Heap_AllocFromHeap(HEAP_ID_BATTLE, sizeof(PartyGaugeTask)); @@ -1367,7 +1309,7 @@ void Battler_ShowBattleStartPartyGauge(BattleSystem *battleSys, BattlerData *bat SysTask_Start(ShowPartyGaugeTask, task, 0); } -void Battler_HideBattleStartPartyGauge(BattleSystem *battleSys, BattlerData *battlerData, PartyGaugeData *partyGauge) +void BattleDisplay_HideBattleStartPartyGauge(BattleSystem *battleSys, BattlerData *battlerData, PartyGaugeData *partyGauge) { PartyGaugeTask *task = Heap_AllocFromHeap(HEAP_ID_BATTLE, sizeof(PartyGaugeTask)); @@ -1381,7 +1323,7 @@ void Battler_HideBattleStartPartyGauge(BattleSystem *battleSys, BattlerData *bat SysTask_Start(HidePartyGaugeTask, task, 0); } -void Battler_ShowPartyGauge(BattleSystem *battleSys, BattlerData *battlerData, PartyGaugeData *partyGauge) +void BattleDisplay_ShowPartyGauge(BattleSystem *battleSys, BattlerData *battlerData, PartyGaugeData *partyGauge) { PartyGaugeTask *task = Heap_AllocFromHeap(HEAP_ID_BATTLE, sizeof(PartyGaugeTask)); @@ -1399,7 +1341,7 @@ void Battler_ShowPartyGauge(BattleSystem *battleSys, BattlerData *battlerData, P SysTask_Start(ShowPartyGaugeTask, task, 0); } -void Battler_HidePartyGauge(BattleSystem *battleSys, BattlerData *battlerData, PartyGaugeData *partyGauge) +void BattleDisplay_HidePartyGauge(BattleSystem *battleSys, BattlerData *battlerData, PartyGaugeData *partyGauge) { PartyGaugeTask *task = Heap_AllocFromHeap(HEAP_ID_BATTLE, sizeof(PartyGaugeTask)); @@ -1425,7 +1367,7 @@ void ov16_0225E23C (BattleSystem * param0, BattlerData * param1) v1.tags = 0; BattleMessage_Print(param0, v0, &v1, NULL); - ov16_0223F2A4(param0, sub_0200E7FC(BattleSystem_Window(param0, 0), 1)); + Battle_SetWaitDial(param0, sub_0200E7FC(BattleSystem_Window(param0, 0), 1)); } ClearCommand(param0, param1->battler, 55); @@ -1474,59 +1416,59 @@ void ov16_0225E300 (BattleSystem * param0, BattlerData * param1) void ov16_0225E338 (BattleSystem * param0, BattlerData * param1) { - UnkStruct_ov16_0225D8F0 * v0; + BattleMessageWaitTask * v0; MessageLoader * v1; BattleMessage v2; ov16_022641B4(param0, param1, &v2); v1 = BattleSystem_MessageLoader(param0); - v0 = (UnkStruct_ov16_0225D8F0 *)Heap_AllocFromHeap(5, sizeof(UnkStruct_ov16_0225D8F0)); + v0 = (BattleMessageWaitTask *)Heap_AllocFromHeap(5, sizeof(BattleMessageWaitTask)); - v0->unk_00 = param0; - v0->unk_04 = 59; - v0->unk_05 = param1->battler; - v0->unk_06 = BattleMessage_Print(param0, v1, &v2, BattleSystem_TextSpeed(param0)); + v0->battleSys = param0; + v0->command = 59; + v0->battler = param1->battler; + v0->msgIdx = BattleMessage_Print(param0, v1, &v2, BattleSystem_TextSpeed(param0)); - SysTask_Start(ov16_02262F7C, v0, 0); + SysTask_Start(WaitForBattleMessagePrint, v0, 0); } void ov16_0225E38C (BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_0225C9F0 * param2) { - UnkStruct_ov16_0225D8F0 * v0; + BattleMessageWaitTask * v0; MessageLoader * v1; BattleMessage v2; ov16_02264270(param0, param1, param2, &v2); v1 = BattleSystem_MessageLoader(param0); - v0 = (UnkStruct_ov16_0225D8F0 *)Heap_AllocFromHeap(5, sizeof(UnkStruct_ov16_0225D8F0)); + v0 = (BattleMessageWaitTask *)Heap_AllocFromHeap(5, sizeof(BattleMessageWaitTask)); - v0->unk_00 = param0; - v0->unk_04 = 60; - v0->unk_05 = param1->battler; - v0->unk_06 = BattleMessage_Print(param0, v1, &v2, BattleSystem_TextSpeed(param0)); + v0->battleSys = param0; + v0->command = 60; + v0->battler = param1->battler; + v0->msgIdx = BattleMessage_Print(param0, v1, &v2, BattleSystem_TextSpeed(param0)); - SysTask_Start(ov16_02262F7C, v0, 0); + SysTask_Start(WaitForBattleMessagePrint, v0, 0); } void ov16_0225E3E0 (BattleSystem * param0, BattlerData * param1) { - UnkStruct_ov16_0225D8F0 * v0; + BattleMessageWaitTask * v0; MessageLoader * v1; BattleMessage v2; ov16_02264360(param0, param1, &v2); v1 = BattleSystem_MessageLoader(param0); - v0 = (UnkStruct_ov16_0225D8F0 *)Heap_AllocFromHeap(5, sizeof(UnkStruct_ov16_0225D8F0)); + v0 = (BattleMessageWaitTask *)Heap_AllocFromHeap(5, sizeof(BattleMessageWaitTask)); - v0->unk_00 = param0; - v0->unk_04 = 61; - v0->unk_05 = param1->battler; - v0->unk_06 = BattleMessage_Print(param0, v1, &v2, BattleSystem_TextSpeed(param0)); + v0->battleSys = param0; + v0->command = 61; + v0->battler = param1->battler; + v0->msgIdx = BattleMessage_Print(param0, v1, &v2, BattleSystem_TextSpeed(param0)); - SysTask_Start(ov16_02262F7C, v0, 0); + SysTask_Start(WaitForBattleMessagePrint, v0, 0); } void ov16_0225E434 (BattleSystem * param0, BattlerData * param1, UnkStruct_ov16_02265BBC * param2) @@ -5092,19 +5034,19 @@ static void ov16_02262F30 (SysTask * param0, void * param1) } } -static void ov16_02262F7C (SysTask * param0, void * param1) +static void WaitForBattleMessagePrint(SysTask *task, void *data) { - UnkStruct_ov16_0225D8F0 * v0 = (UnkStruct_ov16_0225D8F0 *)param1; + BattleMessageWaitTask *waitTask = data; - if (ov16_0223F29C(v0->unk_00)) { - sub_0200EBA0(ov16_0223F29C(v0->unk_00)); - ov16_0223F2A4(v0->unk_00, NULL); + if (Battle_WaitDial(waitTask->battleSys)) { + DeleteWaitDial(Battle_WaitDial(waitTask->battleSys)); + Battle_SetWaitDial(waitTask->battleSys, NULL); } - if (Message_Printing(v0->unk_06) == 0) { - ClearCommand(v0->unk_00, v0->unk_05, v0->unk_04); - Heap_FreeToHeap(param1); - SysTask_Done(param0); + if (Message_Printing(waitTask->msgIdx) == FALSE) { + ClearCommand(waitTask->battleSys, waitTask->battler, waitTask->command); + Heap_FreeToHeap(data); + SysTask_Done(task); } } diff --git a/src/overlay016/ov16_0226485C.c b/src/overlay016/battle_io.c similarity index 99% rename from src/overlay016/ov16_0226485C.c rename to src/overlay016/battle_io.c index 705cc70849..6636784baa 100644 --- a/src/overlay016/ov16_0226485C.c +++ b/src/overlay016/battle_io.c @@ -69,7 +69,7 @@ #include "unk_0207A6DC.h" #include "overlay016/ov16_0223DF00.h" #include "battle/battle_lib.h" -#include "overlay016/ov16_0226485C.h" +#include "battle/battle_io.h" static void ov16_0226485C(BattleSystem * param0, int param1, int param2, void * param3, u8 param4); static void SendMessage(BattleSystem *battleSys, int recipient, int message, void *body, u8 bodySize); @@ -878,10 +878,10 @@ void BattleIO_PrintAttackMessage (BattleSystem * param0, BattleContext * param1) SendMessage(param0, 1, param1->attacker, &v0, sizeof(UnkStruct_ov16_0225C2EC)); } -void BattleIO_PrintMessage (BattleSystem * param0, BattleContext * param1, BattleMessage * param2) +void BattleIO_PrintMessage(BattleSystem *battleSys, BattleContext *battleCtx, BattleMessage *battleMsg) { - param2->commandCode = 21; - SendMessage(param0, 1, param1->attacker, param2, sizeof(BattleMessage)); + battleMsg->commandCode = BTLIOCMD_PRINT_MESSAGE; + SendMessage(battleSys, BTLIO_RECIPIENT_ENQUEUE, battleCtx->attacker, battleMsg, sizeof(BattleMessage)); } void BattleIO_PlayMoveAnimation (BattleSystem * param0, BattleContext * param1, u16 param2) diff --git a/src/overlay016/ov16_0225BFFC.c b/src/overlay016/battle_io_command.c similarity index 97% rename from src/overlay016/ov16_0225BFFC.c rename to src/overlay016/battle_io_command.c index 91b3628d32..393cd0dc01 100644 --- a/src/overlay016/ov16_0225BFFC.c +++ b/src/overlay016/battle_io_command.c @@ -75,10 +75,10 @@ #include "overlay012/ov12_02235E94.h" #include "overlay012/ov12_022380BC.h" #include "overlay016/ov16_0223DF00.h" -#include "overlay016/ov16_0225BFFC.h" -#include "overlay016/ov16_0225CBB8.h" +#include "battle/battle_io_command.h" +#include "battle/battle_display.h" #include "overlay016/ov16_02264798.h" -#include "overlay016/ov16_0226485C.h" +#include "battle/battle_io.h" #include "overlay016/ov16_02266F1C.h" #include "overlay016/ov16_0226871C.h" #include "battle/party_gauge.h" @@ -110,7 +110,7 @@ static void ov16_0225C2B0(BattleSystem * param0, BattlerData * param1); static void ov16_0225C2C4(BattleSystem * param0, BattlerData * param1); static void ov16_0225C2D8(BattleSystem * param0, BattlerData * param1); static void ov16_0225C2EC(BattleSystem * param0, BattlerData * param1); -static void ov16_0225C300(BattleSystem * param0, BattlerData * param1); +static void BtlIOCmd_PrintBattleMessage(BattleSystem *battleSys, BattlerData *battlerData); static void ov16_0225C314(BattleSystem * param0, BattlerData * param1); static void ov16_0225C328(BattleSystem * param0, BattlerData * param1); static void ov16_0225C35C(BattleSystem * param0, BattlerData * param1); @@ -228,7 +228,7 @@ static const UnkFuncPtr_ov16_0226F068 Unk_ov16_0226F068[] = { ov16_0225C2C4, ov16_0225C2D8, ov16_0225C2EC, - ov16_0225C300, + [BTLIOCMD_PRINT_MESSAGE] = BtlIOCmd_PrintBattleMessage, ov16_0225C314, ov16_0225C328, ov16_0225C35C, @@ -463,12 +463,18 @@ static void ov16_0225C2EC (BattleSystem * param0, BattlerData * param1) ZeroDataBuffer(param1); } -static void ov16_0225C300 (BattleSystem * param0, BattlerData * param1) +/** + * @brief Print a message to the screen. + * + * @param battleSys + * @param battlerData + */ +static void BtlIOCmd_PrintBattleMessage(BattleSystem *battleSys, BattlerData *battlerData) { - BattleMessage * v0 = (BattleMessage *)¶m1->data[0]; + BattleMessage *battleMsg = (BattleMessage *)&battlerData->data[0]; - ov16_0225D958(param0, param1, v0); - ZeroDataBuffer(param1); + BattleDisplay_PrintMessage(battleSys, battlerData, battleMsg); + ZeroDataBuffer(battlerData); } static void ov16_0225C314 (BattleSystem * param0, BattlerData * param1) @@ -794,7 +800,7 @@ static void ov16_0225C840 (BattleSystem * param0, BattlerData * param1) { PartyGaugeData * v0 = (PartyGaugeData *)¶m1->data[0]; - Battler_ShowBattleStartPartyGauge(param0, param1, v0); + BattleDisplay_ShowBattleStartPartyGauge(param0, param1, v0); ZeroDataBuffer(param1); } @@ -802,7 +808,7 @@ static void ov16_0225C854 (BattleSystem * param0, BattlerData * param1) { PartyGaugeData * v0 = (PartyGaugeData *)¶m1->data[0]; - Battler_HideBattleStartPartyGauge(param0, param1, v0); + BattleDisplay_HideBattleStartPartyGauge(param0, param1, v0); ZeroDataBuffer(param1); } @@ -811,7 +817,7 @@ static void ov16_0225C868 (BattleSystem * param0, BattlerData * param1) PartyGaugeData * v0 = (PartyGaugeData *)¶m1->data[0]; if (Battler_Side(param0, param1->battler)) { - Battler_ShowPartyGauge(param0, param1, v0); + BattleDisplay_ShowPartyGauge(param0, param1, v0); } else { ClearCommand(param0, param1->battler, 50); } @@ -824,7 +830,7 @@ static void ov16_0225C8A4 (BattleSystem * param0, BattlerData * param1) PartyGaugeData * v0 = (PartyGaugeData *)¶m1->data[0]; if (Battler_Side(param0, param1->battler)) { - Battler_HidePartyGauge(param0, param1, v0); + BattleDisplay_HidePartyGauge(param0, param1, v0); } else { ClearCommand(param0, param1->battler, 51); } diff --git a/src/overlay016/battle_lib.c b/src/overlay016/battle_lib.c index e097329119..ed7ca45e84 100644 --- a/src/overlay016/battle_lib.c +++ b/src/overlay016/battle_lib.c @@ -43,8 +43,8 @@ #include "flags.h" #include "overlay016/ov16_0223DF00.h" #include "battle/battle_lib.h" -#include "overlay016/ov16_0225CBB8.h" -#include "overlay016/ov16_0226485C.h" +#include "battle/battle_display.h" +#include "battle/battle_io.h" static BOOL BasicTypeMulApplies(BattleContext *battleCtx, int attacker, int defender, int chartEntry); static int MapSideEffectToSubscript(BattleContext *battleCtx, enum SideEffectType type, u32 effect); diff --git a/src/overlay016/battle_script.c b/src/overlay016/battle_script.c index dcbebc01fc..8df9045236 100644 --- a/src/overlay016/battle_script.c +++ b/src/overlay016/battle_script.c @@ -87,8 +87,8 @@ #include "overlay016/ov16_0223B140.h" #include "overlay016/ov16_0223DF00.h" #include "battle/battle_lib.h" -#include "overlay016/ov16_0225CBB8.h" -#include "overlay016/ov16_0226485C.h" +#include "battle/battle_display.h" +#include "battle/battle_io.h" #include "overlay016/ov16_02268520.h" #include "overlay021/ov21_021E8D48.h" @@ -12270,7 +12270,7 @@ static void BattleScript_LoadPartyLevelUpIcon (BattleSystem * param0, BattleScri sub_0200B5CC(v5, 0, Pokemon_GetBoxPokemon(param2)); sub_0200B60C(v5, 1, Pokemon_GetValue(param2, MON_DATA_LEVEL, NULL), 3, 0, 1); - sub_0200C388(v5, v7, v6); + StringFormatter_Format(v5, v7, v6); Strbuf_Free(v6); sub_0201A7A0(&v9); sub_0201A870(v8, &v9, 12, 4, 0, 0); diff --git a/src/overlay016/ov16_0223B140.c b/src/overlay016/ov16_0223B140.c index 492623dd10..6f7f4845a5 100644 --- a/src/overlay016/ov16_0223B140.c +++ b/src/overlay016/ov16_0223B140.c @@ -89,9 +89,9 @@ #include "overlay016/ov16_0223DF00.h" #include "battle/battle_controller.h" #include "battle/battle_lib.h" -#include "overlay016/ov16_0225BFFC.h" -#include "overlay016/ov16_0225CBB8.h" -#include "overlay016/ov16_0226485C.h" +#include "battle/battle_io_command.h" +#include "battle/battle_display.h" +#include "battle/battle_io.h" #include "overlay016/ov16_02268520.h" #include "overlay016/ov16_0226871C.h" #include "overlay016/ov16_0226E148.h" @@ -323,7 +323,7 @@ void ov16_0223B3E4 (BattleSystem * param0) { SetMainCallback(NULL, NULL); ov16_02268A14(param0->unk_198); - BGL_DeleteWindow(¶m0->unk_08[0]); + BGL_DeleteWindow(¶m0->windows[0]); ov16_0223C288(param0->unk_04); ov16_0223C2BC(param0); @@ -375,7 +375,7 @@ void ov16_0223B430 (BattleSystem * param0) void ov16_0223B53C (BattleSystem * param0) { - BGL_DeleteWindow(¶m0->unk_08[0]); + BGL_DeleteWindow(¶m0->windows[0]); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0, 0); GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG1, 0); sub_02019044(param0->unk_04, 1); @@ -478,9 +478,9 @@ void ov16_0223B578 (BattleSystem * param0) param0->unk_23FB_1 = 1; - BGL_AddWindow(param0->unk_04, param0->unk_08, 1, 0x2, 0x13, 27, 4, 0xb, (18 + 12) + 1); - BGL_FillWindow(param0->unk_08, 0xff); - sub_0200E060(¶m0->unk_08[0], 0, 1, 10); + BGL_AddWindow(param0->unk_04, param0->windows, 1, 0x2, 0x13, 27, 4, 0xb, (18 + 12) + 1); + BGL_FillWindow(param0->windows, 0xff); + sub_0200E060(¶m0->windows[0], 0, 1, 10); ov16_0223DD4C(param0); } @@ -559,7 +559,7 @@ static void ov16_0223B790 (UnkStruct_020067E8 * param0) sub_02002F70(v0->unk_28, 3, 0x200, 5); v0->unk_04 = sub_02018340(5); - v0->unk_08 = sub_0201A778(5, 3); + v0->windows = sub_0201A778(5, 3); for (v3 = 0; v3 < 4; v3++) { v0->unk_1CC[v3].unk_00 = Heap_AllocFromHeap(5, (32 * 10 * 10)); @@ -579,9 +579,9 @@ static void ov16_0223B790 (UnkStruct_020067E8 * param0) ov16_0223C004(v0, v0->unk_04); - BGL_AddWindow(v0->unk_04, &v0->unk_08[0], 1, 2, 0x13, 27, 4, 11, ((18 + 12) + 1)); - BGL_FillWindow(&v0->unk_08[0], 0xff); - sub_0200E060(&v0->unk_08[0], 0, 1, 10); + BGL_AddWindow(v0->unk_04, &v0->windows[0], 1, 2, 0x13, 27, 4, 11, ((18 + 12) + 1)); + BGL_FillWindow(&v0->windows[0], 0xff); + sub_0200E060(&v0->windows[0], 0, 1, 10); v0->unk_90 = sub_0200C6E4(5); @@ -626,7 +626,7 @@ static void ov16_0223B790 (UnkStruct_020067E8 * param0) v0->unk_0C = MessageLoader_Init(1, 26, 368, 5); v0->unk_10 = MessageLoader_Init(1, 26, 0, 5); - v0->unk_14 = sub_0200B358(5); + v0->strFormatter = sub_0200B358(5); v0->msgBuffer = Strbuf_Init((2 * 160), 5); MI_CpuCopy16(sub_02003164(v0->unk_28, 0), &v0->unk_2224[0], 0x20 * 7); @@ -771,7 +771,7 @@ static void ov16_0223BCB4 (UnkStruct_020067E8 * param0) sub_02002F54(v0->unk_28); MessageLoader_Free(v0->unk_0C); MessageLoader_Free(v0->unk_10); - sub_0200B3F0(v0->unk_14); + sub_0200B3F0(v0->strFormatter); sub_02015FB8(v0->unk_1C4); sub_020141E4(); @@ -791,7 +791,7 @@ static void ov16_0223BCB4 (UnkStruct_020067E8 * param0) sub_02002AC8(0); sub_02002AE4(0); sub_02002B20(0); - sub_0201A928(v0->unk_08, 3); + sub_0201A928(v0->windows, 3); Heap_FreeToHeap(v0->unk_04); Heap_FreeToHeap(v0->unk_21C); Heap_FreeToHeap(v0->unk_220); @@ -1752,7 +1752,7 @@ static void ov16_0223D10C (UnkStruct_020067E8 * param0, BattleParams * param1) v6 = Strbuf_Init(0x100, 5); MessageLoader_GetStrbuf(v5, 923, v6); - sub_0201D738(v0->unk_08, 1, v6, 0, 0, NULL, NULL); + PrintStringSimple(v0->unk_08, 1, v6, 0, 0, NULL, NULL); Strbuf_Free(v6); MessageLoader_Free(v5); @@ -1984,7 +1984,7 @@ static BOOL ov16_0223D354 (UnkStruct_020067E8 * param0) case 33: if (sub_0200384C(v0->unk_0C) == 0) { v1 = 1; - sub_0200EBA0(v0->unk_1024); + DeleteWaitDial(v0->unk_1024); sub_02036378(0); } break; diff --git a/src/overlay016/ov16_0223DF00.c b/src/overlay016/ov16_0223DF00.c index 8842fbd7e8..f34f705f4d 100644 --- a/src/overlay016/ov16_0223DF00.c +++ b/src/overlay016/ov16_0223DF00.c @@ -3,6 +3,8 @@ #include #include +#include "consts/generated/c/battle.h" + #include "battle/common.h" #include "constants/battle.h" #include "constants/heap.h" @@ -73,14 +75,13 @@ #include "flags.h" #include "overlay016/ov16_0223DF00.h" #include "battle/battle_lib.h" -#include "overlay016/ov16_0225CBB8.h" +#include "battle/battle_display.h" #include "overlay016/ov16_02266F1C.h" #include "overlay016/ov16_02268520.h" #include "overlay016/ov16_0226871C.h" #include "overlay016/ov16_0226E148.h" BGL * BattleSystem_BGL(BattleSystem * param0); -Window * BattleSystem_Window(BattleSystem * param0, int param1); u32 BattleSystem_BattleType(BattleSystem * param0); BattleContext * BattleSystem_Context(BattleSystem * param0); BattlerData * BattleSystem_BattlerData(BattleSystem * param0, int param1); @@ -162,8 +163,8 @@ void ov16_0223F24C(BattleSystem * param0, int param1); void ov16_0223F268(BattleSystem * param0); void BattleSystem_SetCommandSelectionFlags(BattleSystem *battleSys, int flags); void ov16_0223F290(BattleSystem * param0, int param1); -void * ov16_0223F29C(BattleSystem * param0); -void ov16_0223F2A4(BattleSystem * param0, void * param1); +void * Battle_WaitDial(BattleSystem * param0); +void Battle_SetWaitDial(BattleSystem * param0, void * param1); u8 * ov16_0223F2B8(UnkStruct_ov16_0223E0C8 * param0, int param1); void ov16_0223F2CC(UnkStruct_ov16_0223E0C8 * param0, int param1, int param2); void ov16_0223F2E4(UnkStruct_ov16_0223E0C8 * param0, int param1, int param2); @@ -210,27 +211,26 @@ void ov16_0223F9A0(BattleSystem * param0, int param1); BOOL BattleSystem_CaughtSpecies(BattleSystem *battleSys, int species); void Battle_SetDefaultBlend(void); u8 ov16_0223F9FC(BattleSystem * param0, int param1, int param2, int param3, int param4); -u8 BattleMessage_Print(BattleSystem * param0, MessageLoader * param1, BattleMessage * param2, int param3); u8 BattleMessage_PrintToWindow(BattleSystem * param0, Window * param1, MessageLoader * param2, BattleMessage * param3, int param4, int param5, int param6, int param7, int param8); -static void ov16_0223FBE8(BattleSystem * param0, BattleMessage * param1); -static void ov16_0223FDE4(BattleSystem * param0, BattleMessage * param1); -static void ov16_02240584(BattleSystem * param0, MessageLoader * param1, BattleMessage * param2); -static BOOL ov16_022405A4(UnkStruct_0201D738 * param0, u16 param1); -static void ov16_02240460(BattleSystem * param0, u32 param1, int param2); -static void ov16_02240484(BattleSystem * param0, u32 param1, int param2); -static void ov16_02240490(BattleSystem * param0, u32 param1, int param2); -static void ov16_0224049C(BattleSystem * param0, u32 param1, int param2); -static void ov16_022404B4(BattleSystem * param0, u32 param1, int param2, int param3); -static void ov16_022404E0(BattleSystem * param0, u32 param1, int param2); -static void ov16_022404EC(BattleSystem * param0, u32 param1, int param2); -static void ov16_022404F8(BattleSystem * param0, u32 param1, int param2); -static void ov16_02240504(BattleSystem * param0, u32 param1, int param2); -static void ov16_02240510(BattleSystem * param0, u32 param1, int param2); -static void ov16_02240534(BattleSystem * param0, u32 param1, int param2); -static void ov16_02240538(BattleSystem * param0, u32 param1, int param2); -static void ov16_02240544(BattleSystem * param0, u32 param1, int param2); -static void ov16_0224055C(BattleSystem * param0, u32 param1, int param2); -static void ov16_02240574(BattleSystem * param0, u32 param1, int param2); +static void BattleMessage_CheckSide(BattleSystem *battleSys, BattleMessage *battleMsg); +static void BattleMessage_FillFormatBuffers(BattleSystem *battleSys, BattleMessage *battleMsg); +static void BattleMessage_Format(BattleSystem *battleSys, MessageLoader *msgLoader, BattleMessage *battleMsg); +static BOOL BattleMessage_Callback(UnkStruct_0201D738 * param0, u16 param1); +static void BattleMessage_Nickname(BattleSystem * param0, u32 param1, int param2); +static void BattleMessage_MoveName(BattleSystem * param0, u32 param1, int param2); +static void BattleMessage_ItemName(BattleSystem * param0, u32 param1, int param2); +static void BattleMessage_Number(BattleSystem * param0, u32 param1, int param2); +static void BattleMessage_NumberDigits(BattleSystem * param0, u32 param1, int param2, int param3); +static void BattleMessage_TypeName(BattleSystem * param0, u32 param1, int param2); +static void BattleMessage_AbilityName(BattleSystem * param0, u32 param1, int param2); +static void BattleMessage_StatName(BattleSystem * param0, u32 param1, int param2); +static void BattleMessage_StatusName(BattleSystem * param0, u32 param1, int param2); +static void BattleMessage_PokemonName(BattleSystem * param0, u32 param1, int param2); +static void BattleMessage_PoffinName(BattleSystem * param0, u32 param1, int param2); +static void BattleMessage_FlavorName(BattleSystem * param0, u32 param1, int param2); +static void BattleMessage_TrainerClassName(BattleSystem * param0, u32 param1, int param2); +static void BattleMessage_TrainerName(BattleSystem * param0, u32 param1, int param2); +static void BattleMessage_PCBoxName(BattleSystem * param0, u32 param1, int param2); static u8 ov16_0223F6D4(u8 * param0, u8 * param1, u16 * param2); BGL * BattleSystem_BGL (BattleSystem * param0) @@ -238,9 +238,9 @@ BGL * BattleSystem_BGL (BattleSystem * param0) return param0->unk_04; } -Window * BattleSystem_Window (BattleSystem * param0, int param1) +Window* BattleSystem_Window(BattleSystem *battleSys, int idx) { - return ¶m0->unk_08[param1]; + return &battleSys->windows[idx]; } u32 BattleSystem_BattleType (BattleSystem *battleSys) @@ -418,7 +418,7 @@ UnkStruct_ov16_0223E0C8 * ov16_0223E0C8 (BattleSystem * param0) UnkStruct_0200B358 * ov16_0223E0D0 (BattleSystem * param0) { - return param0->unk_14; + return param0->strFormatter; } Strbuf* ov16_0223E0D4 (BattleSystem * param0) @@ -1290,12 +1290,12 @@ void ov16_0223F290 (BattleSystem * param0, int param1) param0->unk_2440 = param1; } -void * ov16_0223F29C (BattleSystem * param0) +void * Battle_WaitDial (BattleSystem * param0) { return param0->unk_1B8; } -void ov16_0223F2A4 (BattleSystem * param0, void * param1) +void Battle_SetWaitDial (BattleSystem * param0, void * param1) { param0->unk_1B8 = param1; } @@ -1747,7 +1747,7 @@ u8 ov16_0223F9FC (BattleSystem * param0, int param1, int param2, int param3, int } BGL_FillWindow(v0, 0xff); - v1 = sub_0201D738(v0, 1, v2, 0, 0, param4, ov16_022405A4); + v1 = PrintStringSimple(v0, 1, v2, 0, 0, param4, BattleMessage_Callback); Strbuf_Free(v2); } } else { @@ -1781,7 +1781,7 @@ u8 ov16_0223F9FC (BattleSystem * param0, int param1, int param2, int param3, int BGL_FillWindow(v0, 0xff); - v1 = sub_0201D738(v0, 1, v4, 0, 0, param4, ov16_022405A4); + v1 = PrintStringSimple(v0, 1, v4, 0, 0, param4, BattleMessage_Callback); Strbuf_Free(v4); MessageLoader_Free(v3); } @@ -1789,32 +1789,32 @@ u8 ov16_0223F9FC (BattleSystem * param0, int param1, int param2, int param3, int } else { TrainerData_LoadMessage(param1, param3, param0->msgBuffer, 5); BGL_FillWindow(v0, 0xff); - v1 = sub_0201D738(v0, 1, param0->msgBuffer, 0, 0, param4, ov16_022405A4); + v1 = PrintStringSimple(v0, 1, param0->msgBuffer, 0, 0, param4, BattleMessage_Callback); } return v1; } -u8 BattleMessage_Print (BattleSystem * param0, MessageLoader * param1, BattleMessage * param2, int param3) +u8 BattleMessage_Print(BattleSystem *battleSys, MessageLoader *msgLoader, BattleMessage *battleMsg, int renderDelay) { - Window * v0 = BattleSystem_Window(param0, 0); + Window *textWindow = BattleSystem_Window(battleSys, 0); - ov16_0223FBE8(param0, param2); - ov16_0223FDE4(param0, param2); - ov16_02240584(param0, param1, param2); + BattleMessage_CheckSide(battleSys, battleMsg); + BattleMessage_FillFormatBuffers(battleSys, battleMsg); + BattleMessage_Format(battleSys, msgLoader, battleMsg); - BGL_FillWindow(v0, 0xff); + BGL_FillWindow(textWindow, 0xFF); - return sub_0201D738(v0, 1, param0->msgBuffer, 0, 0, param3, ov16_022405A4); + return PrintStringSimple(textWindow, 1, battleSys->msgBuffer, 0, 0, renderDelay, BattleMessage_Callback); } u8 BattleMessage_PrintToWindow (BattleSystem * param0, Window * param1, MessageLoader * param2, BattleMessage * param3, int param4, int param5, int param6, int param7, int param8) { int v0; - ov16_0223FBE8(param0, param3); - ov16_0223FDE4(param0, param3); - ov16_02240584(param0, param2, param3); + BattleMessage_CheckSide(param0, param3); + BattleMessage_FillFormatBuffers(param0, param3); + BattleMessage_Format(param0, param2, param3); if (param6 & 0x1) { BGL_FillWindow(param1, 0xff); @@ -1826,541 +1826,622 @@ u8 BattleMessage_PrintToWindow (BattleSystem * param0, Window * param1, MessageL v0 = 0; } - return sub_0201D738(param1, 0, param0->msgBuffer, param4 + v0, param5, param8, ov16_022405A4); + return PrintStringSimple(param1, 0, param0->msgBuffer, param4 + v0, param5, param8, BattleMessage_Callback); } -static void ov16_0223FBE8 (BattleSystem * param0, BattleMessage * param1) +/** + * @brief Check what side of the battle the incoming message applies to, and update + * the message's bank ID as appropriate. + * + * This routine is responsible for shifting the message ID for messages that have + * separate entries for the player, an enemy trainer, and a wild Pokemon. + * + * @param battleSys + * @param battleMsg + */ +static void BattleMessage_CheckSide(BattleSystem *battleSys, BattleMessage *battleMsg) { - u32 v0; - - v0 = BattleSystem_BattleType(param0); + u32 battleType = BattleSystem_BattleType(battleSys); - if (param1->tags & 0x80) { + if (battleMsg->tags & TAG_GLOBAL_MESSAGE) { return; } - if (param1->tags & 0x40) { - if (Battler_Side(param0, param1->battler)) { - param1->id++; + if (battleMsg->tags & TAG_SIDE_LOCAL_MESSAGE) { + if (Battler_Side(battleSys, battleMsg->battler)) { + battleMsg->id++; } return; } - switch (param1->tags & 0x3f) { - case 0: - case 3: - case 4: - case 5: - case 6: - case 7: - case 8: - case 22: - case 24: - case 25: - case 26: - case 27: - case 28: - case 29: - case 30: - case 49: - case 50: - case 51: - case 56: - case 57: - case 58: - case 59: - case 60: - break; - case 1: - if (Battler_Side(param0, param1->params[0] & 0xff)) { - param1->id++; + switch (battleMsg->tags & BATTLE_MESSAGE_TAGS) { + case TAG_NONE: + case TAG_MOVE: + case TAG_STAT: + case TAG_ITEM: + case TAG_NUMBER: + case TAG_NUMBERS: + case TAG_TRNAME: + case TAG_MOVE_MOVE: + case TAG_ITEM_MOVE: + case TAG_NUMBER_NUMBER: + case TAG_TRNAME_TRNAME: + case TAG_TRNAME_NICKNAME: + case TAG_TRNAME_ITEM: + case TAG_TRNAME_NUM: + case TAG_TRCLASS_TRNAME: + case TAG_TRNAME_NICKNAME_NICKNAME: + case TAG_TRCLASS_TRNAME_NICKNAME: + case TAG_TRCLASS_TRNAME_ITEM: + case TAG_TRNAME_NICKNAME_TRNAME_NICKNAME: + case TAG_TRCLASS_TRNAME_NICKNAME_NICKNAME: + case TAG_TRCLASS_TRNAME_NICKNAME_TRNAME: + case TAG_TRCLASS_TRNAME_TRCLASS_TRNAME: + case TAG_TRCLASS_TRNAME_NICKNAME_TRCLASS_TRNAME_NICKNAME: + break; + + case TAG_NONE_SIDE_CONSCIOUS: + if (Battler_Side(battleSys, battleMsg->params[0] & 0xFF)) { + battleMsg->id++; } break; - case 2: - case 10: - case 11: - case 12: - case 13: - case 14: - case 15: - case 16: - case 17: - case 18: - case 19: - case 34: - case 35: - case 37: - case 38: - case 39: - case 40: - case 41: - case 42: - case 44: - case 45: - case 46: - case 47: - if (Battler_Side(param0, param1->params[0] & 0xff)) { - param1->id++; - - if (v0 & 0x1) { - param1->id++; + + case TAG_NICKNAME: + case TAG_NICKNAME_MOVE: + case TAG_NICKNAME_ABILITY: + case TAG_NICKNAME_STAT: + case TAG_NICKNAME_TYPE: + case TAG_NICKNAME_POKE: + case TAG_NICKNAME_ITEM: + case TAG_NICKNAME_POFFIN: + case TAG_NICKNAME_NUM: + case TAG_NICKNAME_TRNAME: + case TAG_NICKNAME_BOX: + case TAG_NICKNAME_MOVE_MOVE: + case TAG_NICKNAME_MOVE_NUMBER: + case TAG_NICKNAME_ABILITY_MOVE: + case TAG_NICKNAME_ABILITY_ITEM: + case TAG_NICKNAME_ABILITY_STAT: + case TAG_NICKNAME_ABILITY_TYPE: + case TAG_NICKNAME_ABILITY_STATUS: + case TAG_NICKNAME_ABILITY_NUMBER: + case TAG_NICKNAME_ITEM_MOVE: + case TAG_NICKNAME_ITEM_STAT: + case TAG_NICKNAME_ITEM_STATUS: + case TAG_NICKNAME_BOX_BOX: + if (Battler_Side(battleSys, battleMsg->params[0] & 0xFF)) { + battleMsg->id++; + + if (battleType & BATTLE_TYPE_TRAINER) { + battleMsg->id++; } } break; - case 20: - if (Battler_Side(param0, param1->params[1] & 0xff)) { - param1->id++; + + case TAG_MOVE_SIDE: + if (Battler_Side(battleSys, battleMsg->params[1] & 0xFF)) { + battleMsg->id++; } break; - case 21: - case 23: - case 48: - if (Battler_Side(param0, param1->params[1] & 0xff)) { - param1->id++; - if (v0 & 0x1) { - param1->id++; + case TAG_MOVE_NICKNAME: + case TAG_ABILITY_NICKNAME: + case TAG_ITEM_NICKNAME_FLAVOR: + if (Battler_Side(battleSys, battleMsg->params[1] & 0xFF)) { + battleMsg->id++; + + if (battleType & BATTLE_TYPE_TRAINER) { + battleMsg->id++; } } break; - case 9: - case 31: - case 32: - case 33: - if (Battler_Side(param0, param1->params[0] & 0xff)) { - param1->id += 3; - if (v0 & 0x1) { - param1->id += 2; + case TAG_NICKNAME_NICKNAME: + case TAG_NICKNAME_NICKNAME_MOVE: + case TAG_NICKNAME_NICKNAME_ABILITY: + case TAG_NICKNAME_NICKNAME_ITEM: + if (Battler_Side(battleSys, battleMsg->params[0] & 0xFF)) { + battleMsg->id += 3; + + if (battleType & BATTLE_TYPE_TRAINER) { + battleMsg->id += 2; } - if (Battler_Side(param0, param1->params[1] & 0xff)) { - param1->id++; + if (Battler_Side(battleSys, battleMsg->params[1] & 0xFF)) { + battleMsg->id++; } - } else { - if (Battler_Side(param0, param1->params[1] & 0xff)) { - param1->id++; + } else if (Battler_Side(battleSys, battleMsg->params[1] & 0xFF)) { + battleMsg->id++; - if (v0 & 0x1) { - param1->id++; - } + if (battleType & BATTLE_TYPE_TRAINER) { + battleMsg->id++; } } break; - case 36: - case 43: - case 52: - case 53: - case 54: - case 55: - if (Battler_Side(param0, param1->params[0] & 0xff)) { - param1->id += 3; - - if (v0 & 0x1) { - param1->id += 2; + + case TAG_NICKNAME_ABILITY_NICKNAME: + case TAG_NICKNAME_ITEM_NICKNAME: + case TAG_NICKNAME_ABILITY_NICKNAME_MOVE: + case TAG_NICKNAME_ABILITY_NICKNAME_ABILITY: + case TAG_NICKNAME_ABILITY_NICKNAME_STAT: + case TAG_NICKNAME_ITEM_NICKNAME_ITEM: + if (Battler_Side(battleSys, battleMsg->params[0] & 0xFF)) { + battleMsg->id += 3; + + if (battleType & BATTLE_TYPE_TRAINER) { + battleMsg->id += 2; } - if (Battler_Side(param0, param1->params[2] & 0xff)) { - param1->id++; + if (Battler_Side(battleSys, battleMsg->params[2] & 0xFF)) { + battleMsg->id++; } - } else { - if (Battler_Side(param0, param1->params[2] & 0xff)) { - param1->id++; + } else if (Battler_Side(battleSys, battleMsg->params[2] & 0xFF)) { + battleMsg->id++; - if (v0 & 0x1) { - param1->id++; - } + if (battleType & BATTLE_TYPE_TRAINER) { + battleMsg->id++; } } break; + default: - GF_ASSERT(0); + GF_ASSERT(FALSE); break; } } -static void ov16_0223FDE4 (BattleSystem * param0, BattleMessage * param1) +/** + * @brief Fill formatting buffers with data from the battle message parameters, according + * to the message's tag. + * + * @param battleSys + * @param battleMsg + */ +static void BattleMessage_FillFormatBuffers(BattleSystem *battleSys, BattleMessage *battleMsg) { - switch (param1->tags & 0x3f) { - case 0: - case 1: + switch (battleMsg->tags & BATTLE_MESSAGE_TAGS) { + case TAG_NONE: + case TAG_NONE_SIDE_CONSCIOUS: break; - case 2: - ov16_02240460(param0, 0, param1->params[0]); + + case TAG_NICKNAME: + BattleMessage_Nickname(battleSys, 0, battleMsg->params[0]); break; - case 3: - case 20: - ov16_02240484(param0, 0, param1->params[0]); + + case TAG_MOVE: + case TAG_MOVE_SIDE: + BattleMessage_MoveName(battleSys, 0, battleMsg->params[0]); break; - case 4: - ov16_022404F8(param0, 0, param1->params[0]); + + case TAG_STAT: + BattleMessage_StatName(battleSys, 0, battleMsg->params[0]); break; - case 5: - ov16_02240490(param0, 0, param1->params[0]); + + case TAG_ITEM: + BattleMessage_ItemName(battleSys, 0, battleMsg->params[0]); break; - case 6: - ov16_0224049C(param0, 0, param1->params[0]); + + case TAG_NUMBER: + BattleMessage_Number(battleSys, 0, battleMsg->params[0]); break; - case 7: - ov16_022404B4(param0, 0, param1->params[0], param1->digits); + + case TAG_NUMBERS: + BattleMessage_NumberDigits(battleSys, 0, battleMsg->params[0], battleMsg->digits); break; - case 8: - ov16_0224055C(param0, 0, param1->params[0]); + + case TAG_TRNAME: + BattleMessage_TrainerName(battleSys, 0, battleMsg->params[0]); break; - case 9: - ov16_02240460(param0, 0, param1->params[0]); - ov16_02240460(param0, 1, param1->params[1]); + + case TAG_NICKNAME_NICKNAME: + BattleMessage_Nickname(battleSys, 0, battleMsg->params[0]); + BattleMessage_Nickname(battleSys, 1, battleMsg->params[1]); break; - case 10: - ov16_02240460(param0, 0, param1->params[0]); - ov16_02240484(param0, 1, param1->params[1]); + + case TAG_NICKNAME_MOVE: + BattleMessage_Nickname(battleSys, 0, battleMsg->params[0]); + BattleMessage_MoveName(battleSys, 1, battleMsg->params[1]); break; - case 11: - ov16_02240460(param0, 0, param1->params[0]); - ov16_022404EC(param0, 1, param1->params[1]); + + case TAG_NICKNAME_ABILITY: + BattleMessage_Nickname(battleSys, 0, battleMsg->params[0]); + BattleMessage_AbilityName(battleSys, 1, battleMsg->params[1]); break; - case 12: - ov16_02240460(param0, 0, param1->params[0]); - ov16_022404F8(param0, 1, param1->params[1]); + + case TAG_NICKNAME_STAT: + BattleMessage_Nickname(battleSys, 0, battleMsg->params[0]); + BattleMessage_StatName(battleSys, 1, battleMsg->params[1]); break; - case 13: - ov16_02240460(param0, 0, param1->params[0]); - ov16_022404E0(param0, 1, param1->params[1]); + + case TAG_NICKNAME_TYPE: + BattleMessage_Nickname(battleSys, 0, battleMsg->params[0]); + BattleMessage_TypeName(battleSys, 1, battleMsg->params[1]); break; - case 14: - ov16_02240460(param0, 0, param1->params[0]); - ov16_02240510(param0, 1, param1->params[1]); + + case TAG_NICKNAME_POKE: + BattleMessage_Nickname(battleSys, 0, battleMsg->params[0]); + BattleMessage_PokemonName(battleSys, 1, battleMsg->params[1]); break; - case 15: - ov16_02240460(param0, 0, param1->params[0]); - ov16_02240490(param0, 1, param1->params[1]); - break; - case 16: - ov16_02240460(param0, 0, param1->params[0]); - ov16_02240534(param0, 1, param1->params[1]); - break; - case 17: - ov16_02240460(param0, 0, param1->params[0]); - ov16_0224049C(param0, 1, param1->params[1]); - break; - case 18: - ov16_02240460(param0, 0, param1->params[0]); - ov16_0224055C(param0, 1, param1->params[1]); - break; - case 19: - ov16_02240460(param0, 0, param1->params[0]); - ov16_02240574(param0, 1, param1->params[1]); - break; - case 21: - ov16_02240484(param0, 0, param1->params[0]); - ov16_02240460(param0, 1, param1->params[1]); - break; - case 22: - ov16_02240484(param0, 0, param1->params[0]); - ov16_02240484(param0, 1, param1->params[1]); - break; - case 23: - ov16_022404EC(param0, 0, param1->params[0]); - ov16_02240460(param0, 1, param1->params[1]); - break; - case 24: - ov16_02240490(param0, 0, param1->params[0]); - ov16_02240484(param0, 1, param1->params[1]); - break; - case 25: - ov16_0224049C(param0, 0, param1->params[0]); - ov16_0224049C(param0, 1, param1->params[1]); - break; - case 26: - ov16_0224055C(param0, 0, param1->params[0]); - ov16_0224055C(param0, 1, param1->params[1]); - break; - case 27: - ov16_0224055C(param0, 0, param1->params[0]); - ov16_02240460(param0, 1, param1->params[1]); - break; - case 28: - ov16_0224055C(param0, 0, param1->params[0]); - ov16_02240490(param0, 1, param1->params[1]); - break; - case 29: - ov16_0224055C(param0, 0, param1->params[0]); - ov16_0224049C(param0, 1, param1->params[1]); - break; - case 30: - ov16_02240544(param0, 0, param1->params[0]); - ov16_0224055C(param0, 1, param1->params[1]); - break; - case 31: - ov16_02240460(param0, 0, param1->params[0]); - ov16_02240460(param0, 1, param1->params[1]); - ov16_02240484(param0, 2, param1->params[2]); - break; - case 32: - ov16_02240460(param0, 0, param1->params[0]); - ov16_02240460(param0, 1, param1->params[1]); - ov16_022404EC(param0, 2, param1->params[2]); - break; - case 33: - ov16_02240460(param0, 0, param1->params[0]); - ov16_02240460(param0, 1, param1->params[1]); - ov16_02240490(param0, 2, param1->params[2]); - break; - case 34: - ov16_02240460(param0, 0, param1->params[0]); - ov16_02240484(param0, 1, param1->params[1]); - ov16_02240484(param0, 2, param1->params[2]); - break; - case 35: - ov16_02240460(param0, 0, param1->params[0]); - ov16_02240484(param0, 1, param1->params[1]); - ov16_0224049C(param0, 2, param1->params[2]); - break; - case 36: - ov16_02240460(param0, 0, param1->params[0]); - ov16_022404EC(param0, 1, param1->params[1]); - ov16_02240460(param0, 2, param1->params[2]); - break; - case 37: - ov16_02240460(param0, 0, param1->params[0]); - ov16_022404EC(param0, 1, param1->params[1]); - ov16_02240484(param0, 2, param1->params[2]); - break; - case 38: - ov16_02240460(param0, 0, param1->params[0]); - ov16_022404EC(param0, 1, param1->params[1]); - ov16_02240490(param0, 2, param1->params[2]); - break; - case 39: - ov16_02240460(param0, 0, param1->params[0]); - ov16_022404EC(param0, 1, param1->params[1]); - ov16_022404F8(param0, 2, param1->params[2]); - break; - case 40: - ov16_02240460(param0, 0, param1->params[0]); - ov16_022404EC(param0, 1, param1->params[1]); - ov16_022404E0(param0, 2, param1->params[2]); - break; - case 41: - ov16_02240460(param0, 0, param1->params[0]); - ov16_022404EC(param0, 1, param1->params[1]); - ov16_02240504(param0, 2, param1->params[2]); - break; - case 42: - ov16_02240460(param0, 0, param1->params[0]); - ov16_022404EC(param0, 1, param1->params[1]); - ov16_0224049C(param0, 2, param1->params[2]); - break; - case 43: - ov16_02240460(param0, 0, param1->params[0]); - ov16_02240490(param0, 1, param1->params[1]); - ov16_02240460(param0, 2, param1->params[2]); - break; - case 44: - ov16_02240460(param0, 0, param1->params[0]); - ov16_02240490(param0, 1, param1->params[1]); - ov16_02240484(param0, 2, param1->params[2]); - break; - case 45: - ov16_02240460(param0, 0, param1->params[0]); - ov16_02240490(param0, 1, param1->params[1]); - ov16_022404F8(param0, 2, param1->params[2]); - break; - case 46: - ov16_02240460(param0, 0, param1->params[0]); - ov16_02240490(param0, 1, param1->params[1]); - ov16_02240504(param0, 2, param1->params[2]); - break; - case 47: - ov16_02240460(param0, 0, param1->params[0]); - ov16_02240574(param0, 1, param1->params[1]); - ov16_02240574(param0, 2, param1->params[2]); - break; - case 48: - ov16_02240490(param0, 0, param1->params[0]); - ov16_02240460(param0, 1, param1->params[1]); - ov16_02240538(param0, 2, param1->params[2]); - break; - case 49: - ov16_0224055C(param0, 0, param1->params[0]); - ov16_02240460(param0, 1, param1->params[1]); - ov16_02240460(param0, 2, param1->params[2]); - break; - case 50: - ov16_02240544(param0, 0, param1->params[0]); - ov16_0224055C(param0, 1, param1->params[1]); - ov16_02240460(param0, 2, param1->params[2]); - break; - case 51: - ov16_02240544(param0, 0, param1->params[0]); - ov16_0224055C(param0, 1, param1->params[1]); - ov16_02240490(param0, 2, param1->params[2]); - break; - case 52: - ov16_02240460(param0, 0, param1->params[0]); - ov16_022404EC(param0, 1, param1->params[1]); - ov16_02240460(param0, 2, param1->params[2]); - ov16_02240484(param0, 3, param1->params[3]); - break; - case 53: - ov16_02240460(param0, 0, param1->params[0]); - ov16_022404EC(param0, 1, param1->params[1]); - ov16_02240460(param0, 2, param1->params[2]); - ov16_022404EC(param0, 3, param1->params[3]); - break; - case 54: - ov16_02240460(param0, 0, param1->params[0]); - ov16_022404EC(param0, 1, param1->params[1]); - ov16_02240460(param0, 2, param1->params[2]); - ov16_022404F8(param0, 3, param1->params[3]); - break; - case 55: - ov16_02240460(param0, 0, param1->params[0]); - ov16_02240490(param0, 1, param1->params[1]); - ov16_02240460(param0, 2, param1->params[2]); - ov16_02240490(param0, 3, param1->params[3]); - break; - case 56: - ov16_0224055C(param0, 0, param1->params[0]); - ov16_02240460(param0, 1, param1->params[1]); - ov16_0224055C(param0, 2, param1->params[2]); - ov16_02240460(param0, 3, param1->params[3]); - break; - case 57: - ov16_02240544(param0, 0, param1->params[0]); - ov16_0224055C(param0, 1, param1->params[1]); - ov16_02240460(param0, 2, param1->params[2]); - ov16_02240460(param0, 3, param1->params[3]); - break; - case 58: - ov16_02240544(param0, 0, param1->params[0]); - ov16_0224055C(param0, 1, param1->params[1]); - ov16_02240460(param0, 2, param1->params[2]); - ov16_0224055C(param0, 3, param1->params[3]); - break; - case 59: - ov16_02240544(param0, 0, param1->params[0]); - ov16_0224055C(param0, 1, param1->params[1]); - ov16_02240544(param0, 2, param1->params[2]); - ov16_0224055C(param0, 3, param1->params[3]); - break; - case 60: - ov16_02240544(param0, 0, param1->params[0]); - ov16_0224055C(param0, 1, param1->params[1]); - ov16_02240460(param0, 2, param1->params[2]); - ov16_02240544(param0, 3, param1->params[3]); - ov16_0224055C(param0, 4, param1->params[4]); - ov16_02240460(param0, 5, param1->params[5]); + + case TAG_NICKNAME_ITEM: + BattleMessage_Nickname(battleSys, 0, battleMsg->params[0]); + BattleMessage_ItemName(battleSys, 1, battleMsg->params[1]); break; + + case TAG_NICKNAME_POFFIN: + BattleMessage_Nickname(battleSys, 0, battleMsg->params[0]); + BattleMessage_PoffinName(battleSys, 1, battleMsg->params[1]); + break; + + case TAG_NICKNAME_NUM: + BattleMessage_Nickname(battleSys, 0, battleMsg->params[0]); + BattleMessage_Number(battleSys, 1, battleMsg->params[1]); + break; + + case TAG_NICKNAME_TRNAME: + BattleMessage_Nickname(battleSys, 0, battleMsg->params[0]); + BattleMessage_TrainerName(battleSys, 1, battleMsg->params[1]); + break; + + case TAG_NICKNAME_BOX: + BattleMessage_Nickname(battleSys, 0, battleMsg->params[0]); + BattleMessage_PCBoxName(battleSys, 1, battleMsg->params[1]); + break; + + case TAG_MOVE_NICKNAME: + BattleMessage_MoveName(battleSys, 0, battleMsg->params[0]); + BattleMessage_Nickname(battleSys, 1, battleMsg->params[1]); + break; + + case TAG_MOVE_MOVE: + BattleMessage_MoveName(battleSys, 0, battleMsg->params[0]); + BattleMessage_MoveName(battleSys, 1, battleMsg->params[1]); + break; + + case TAG_ABILITY_NICKNAME: + BattleMessage_AbilityName(battleSys, 0, battleMsg->params[0]); + BattleMessage_Nickname(battleSys, 1, battleMsg->params[1]); + break; + + case TAG_ITEM_MOVE: + BattleMessage_ItemName(battleSys, 0, battleMsg->params[0]); + BattleMessage_MoveName(battleSys, 1, battleMsg->params[1]); + break; + + case TAG_NUMBER_NUMBER: + BattleMessage_Number(battleSys, 0, battleMsg->params[0]); + BattleMessage_Number(battleSys, 1, battleMsg->params[1]); + break; + + case TAG_TRNAME_TRNAME: + BattleMessage_TrainerName(battleSys, 0, battleMsg->params[0]); + BattleMessage_TrainerName(battleSys, 1, battleMsg->params[1]); + break; + + case TAG_TRNAME_NICKNAME: + BattleMessage_TrainerName(battleSys, 0, battleMsg->params[0]); + BattleMessage_Nickname(battleSys, 1, battleMsg->params[1]); + break; + + case TAG_TRNAME_ITEM: + BattleMessage_TrainerName(battleSys, 0, battleMsg->params[0]); + BattleMessage_ItemName(battleSys, 1, battleMsg->params[1]); + break; + + case TAG_TRNAME_NUM: + BattleMessage_TrainerName(battleSys, 0, battleMsg->params[0]); + BattleMessage_Number(battleSys, 1, battleMsg->params[1]); + break; + + case TAG_TRCLASS_TRNAME: + BattleMessage_TrainerClassName(battleSys, 0, battleMsg->params[0]); + BattleMessage_TrainerName(battleSys, 1, battleMsg->params[1]); + break; + + case TAG_NICKNAME_NICKNAME_MOVE: + BattleMessage_Nickname(battleSys, 0, battleMsg->params[0]); + BattleMessage_Nickname(battleSys, 1, battleMsg->params[1]); + BattleMessage_MoveName(battleSys, 2, battleMsg->params[2]); + break; + + case TAG_NICKNAME_NICKNAME_ABILITY: + BattleMessage_Nickname(battleSys, 0, battleMsg->params[0]); + BattleMessage_Nickname(battleSys, 1, battleMsg->params[1]); + BattleMessage_AbilityName(battleSys, 2, battleMsg->params[2]); + break; + + case TAG_NICKNAME_NICKNAME_ITEM: + BattleMessage_Nickname(battleSys, 0, battleMsg->params[0]); + BattleMessage_Nickname(battleSys, 1, battleMsg->params[1]); + BattleMessage_ItemName(battleSys, 2, battleMsg->params[2]); + break; + + case TAG_NICKNAME_MOVE_MOVE: + BattleMessage_Nickname(battleSys, 0, battleMsg->params[0]); + BattleMessage_MoveName(battleSys, 1, battleMsg->params[1]); + BattleMessage_MoveName(battleSys, 2, battleMsg->params[2]); + break; + + case TAG_NICKNAME_MOVE_NUMBER: + BattleMessage_Nickname(battleSys, 0, battleMsg->params[0]); + BattleMessage_MoveName(battleSys, 1, battleMsg->params[1]); + BattleMessage_Number(battleSys, 2, battleMsg->params[2]); + break; + + case TAG_NICKNAME_ABILITY_NICKNAME: + BattleMessage_Nickname(battleSys, 0, battleMsg->params[0]); + BattleMessage_AbilityName(battleSys, 1, battleMsg->params[1]); + BattleMessage_Nickname(battleSys, 2, battleMsg->params[2]); + break; + + case TAG_NICKNAME_ABILITY_MOVE: + BattleMessage_Nickname(battleSys, 0, battleMsg->params[0]); + BattleMessage_AbilityName(battleSys, 1, battleMsg->params[1]); + BattleMessage_MoveName(battleSys, 2, battleMsg->params[2]); + break; + + case TAG_NICKNAME_ABILITY_ITEM: + BattleMessage_Nickname(battleSys, 0, battleMsg->params[0]); + BattleMessage_AbilityName(battleSys, 1, battleMsg->params[1]); + BattleMessage_ItemName(battleSys, 2, battleMsg->params[2]); + break; + + case TAG_NICKNAME_ABILITY_STAT: + BattleMessage_Nickname(battleSys, 0, battleMsg->params[0]); + BattleMessage_AbilityName(battleSys, 1, battleMsg->params[1]); + BattleMessage_StatName(battleSys, 2, battleMsg->params[2]); + break; + + case TAG_NICKNAME_ABILITY_TYPE: + BattleMessage_Nickname(battleSys, 0, battleMsg->params[0]); + BattleMessage_AbilityName(battleSys, 1, battleMsg->params[1]); + BattleMessage_TypeName(battleSys, 2, battleMsg->params[2]); + break; + + case TAG_NICKNAME_ABILITY_STATUS: + BattleMessage_Nickname(battleSys, 0, battleMsg->params[0]); + BattleMessage_AbilityName(battleSys, 1, battleMsg->params[1]); + BattleMessage_StatusName(battleSys, 2, battleMsg->params[2]); + break; + + case TAG_NICKNAME_ABILITY_NUMBER: + BattleMessage_Nickname(battleSys, 0, battleMsg->params[0]); + BattleMessage_AbilityName(battleSys, 1, battleMsg->params[1]); + BattleMessage_Number(battleSys, 2, battleMsg->params[2]); + break; + + case TAG_NICKNAME_ITEM_NICKNAME: + BattleMessage_Nickname(battleSys, 0, battleMsg->params[0]); + BattleMessage_ItemName(battleSys, 1, battleMsg->params[1]); + BattleMessage_Nickname(battleSys, 2, battleMsg->params[2]); + break; + + case TAG_NICKNAME_ITEM_MOVE: + BattleMessage_Nickname(battleSys, 0, battleMsg->params[0]); + BattleMessage_ItemName(battleSys, 1, battleMsg->params[1]); + BattleMessage_MoveName(battleSys, 2, battleMsg->params[2]); + break; + + case TAG_NICKNAME_ITEM_STAT: + BattleMessage_Nickname(battleSys, 0, battleMsg->params[0]); + BattleMessage_ItemName(battleSys, 1, battleMsg->params[1]); + BattleMessage_StatName(battleSys, 2, battleMsg->params[2]); + break; + + case TAG_NICKNAME_ITEM_STATUS: + BattleMessage_Nickname(battleSys, 0, battleMsg->params[0]); + BattleMessage_ItemName(battleSys, 1, battleMsg->params[1]); + BattleMessage_StatusName(battleSys, 2, battleMsg->params[2]); + break; + + case TAG_NICKNAME_BOX_BOX: + BattleMessage_Nickname(battleSys, 0, battleMsg->params[0]); + BattleMessage_PCBoxName(battleSys, 1, battleMsg->params[1]); + BattleMessage_PCBoxName(battleSys, 2, battleMsg->params[2]); + break; + + case TAG_ITEM_NICKNAME_FLAVOR: + BattleMessage_ItemName(battleSys, 0, battleMsg->params[0]); + BattleMessage_Nickname(battleSys, 1, battleMsg->params[1]); + BattleMessage_FlavorName(battleSys, 2, battleMsg->params[2]); + break; + + case TAG_TRNAME_NICKNAME_NICKNAME: + BattleMessage_TrainerName(battleSys, 0, battleMsg->params[0]); + BattleMessage_Nickname(battleSys, 1, battleMsg->params[1]); + BattleMessage_Nickname(battleSys, 2, battleMsg->params[2]); + break; + + case TAG_TRCLASS_TRNAME_NICKNAME: + BattleMessage_TrainerClassName(battleSys, 0, battleMsg->params[0]); + BattleMessage_TrainerName(battleSys, 1, battleMsg->params[1]); + BattleMessage_Nickname(battleSys, 2, battleMsg->params[2]); + break; + + case TAG_TRCLASS_TRNAME_ITEM: + BattleMessage_TrainerClassName(battleSys, 0, battleMsg->params[0]); + BattleMessage_TrainerName(battleSys, 1, battleMsg->params[1]); + BattleMessage_ItemName(battleSys, 2, battleMsg->params[2]); + break; + + case TAG_NICKNAME_ABILITY_NICKNAME_MOVE: + BattleMessage_Nickname(battleSys, 0, battleMsg->params[0]); + BattleMessage_AbilityName(battleSys, 1, battleMsg->params[1]); + BattleMessage_Nickname(battleSys, 2, battleMsg->params[2]); + BattleMessage_MoveName(battleSys, 3, battleMsg->params[3]); + break; + + case TAG_NICKNAME_ABILITY_NICKNAME_ABILITY: + BattleMessage_Nickname(battleSys, 0, battleMsg->params[0]); + BattleMessage_AbilityName(battleSys, 1, battleMsg->params[1]); + BattleMessage_Nickname(battleSys, 2, battleMsg->params[2]); + BattleMessage_AbilityName(battleSys, 3, battleMsg->params[3]); + break; + + case TAG_NICKNAME_ABILITY_NICKNAME_STAT: + BattleMessage_Nickname(battleSys, 0, battleMsg->params[0]); + BattleMessage_AbilityName(battleSys, 1, battleMsg->params[1]); + BattleMessage_Nickname(battleSys, 2, battleMsg->params[2]); + BattleMessage_StatName(battleSys, 3, battleMsg->params[3]); + break; + + case TAG_NICKNAME_ITEM_NICKNAME_ITEM: + BattleMessage_Nickname(battleSys, 0, battleMsg->params[0]); + BattleMessage_ItemName(battleSys, 1, battleMsg->params[1]); + BattleMessage_Nickname(battleSys, 2, battleMsg->params[2]); + BattleMessage_ItemName(battleSys, 3, battleMsg->params[3]); + break; + + case TAG_TRNAME_NICKNAME_TRNAME_NICKNAME: + BattleMessage_TrainerName(battleSys, 0, battleMsg->params[0]); + BattleMessage_Nickname(battleSys, 1, battleMsg->params[1]); + BattleMessage_TrainerName(battleSys, 2, battleMsg->params[2]); + BattleMessage_Nickname(battleSys, 3, battleMsg->params[3]); + break; + + case TAG_TRCLASS_TRNAME_NICKNAME_NICKNAME: + BattleMessage_TrainerClassName(battleSys, 0, battleMsg->params[0]); + BattleMessage_TrainerName(battleSys, 1, battleMsg->params[1]); + BattleMessage_Nickname(battleSys, 2, battleMsg->params[2]); + BattleMessage_Nickname(battleSys, 3, battleMsg->params[3]); + break; + + case TAG_TRCLASS_TRNAME_NICKNAME_TRNAME: + BattleMessage_TrainerClassName(battleSys, 0, battleMsg->params[0]); + BattleMessage_TrainerName(battleSys, 1, battleMsg->params[1]); + BattleMessage_Nickname(battleSys, 2, battleMsg->params[2]); + BattleMessage_TrainerName(battleSys, 3, battleMsg->params[3]); + break; + + case TAG_TRCLASS_TRNAME_TRCLASS_TRNAME: + BattleMessage_TrainerClassName(battleSys, 0, battleMsg->params[0]); + BattleMessage_TrainerName(battleSys, 1, battleMsg->params[1]); + BattleMessage_TrainerClassName(battleSys, 2, battleMsg->params[2]); + BattleMessage_TrainerName(battleSys, 3, battleMsg->params[3]); + break; + + case TAG_TRCLASS_TRNAME_NICKNAME_TRCLASS_TRNAME_NICKNAME: + BattleMessage_TrainerClassName(battleSys, 0, battleMsg->params[0]); + BattleMessage_TrainerName(battleSys, 1, battleMsg->params[1]); + BattleMessage_Nickname(battleSys, 2, battleMsg->params[2]); + BattleMessage_TrainerClassName(battleSys, 3, battleMsg->params[3]); + BattleMessage_TrainerName(battleSys, 4, battleMsg->params[4]); + BattleMessage_Nickname(battleSys, 5, battleMsg->params[5]); + break; + default: - GF_ASSERT(0); + GF_ASSERT(FALSE); break; } } -static void ov16_02240460 (BattleSystem * param0, u32 param1, int param2) +static void BattleMessage_Nickname (BattleSystem * param0, u32 param1, int param2) { Pokemon * v0; v0 = BattleSystem_PartyPokemon(param0, param2 & 0xff, (param2 & 0xff00) >> 8); - sub_0200B5CC(param0->unk_14, param1, &v0->box); + sub_0200B5CC(param0->strFormatter, param1, &v0->box); } -static void ov16_02240484 (BattleSystem * param0, u32 param1, int param2) +static void BattleMessage_MoveName (BattleSystem * param0, u32 param1, int param2) { - sub_0200B630(param0->unk_14, param1, param2); + sub_0200B630(param0->strFormatter, param1, param2); } -static void ov16_02240490 (BattleSystem * param0, u32 param1, int param2) +static void BattleMessage_ItemName (BattleSystem * param0, u32 param1, int param2) { - sub_0200B70C(param0->unk_14, param1, param2); + sub_0200B70C(param0->strFormatter, param1, param2); } -static void ov16_0224049C (BattleSystem * param0, u32 param1, int param2) +static void BattleMessage_Number (BattleSystem * param0, u32 param1, int param2) { - sub_0200B60C(param0->unk_14, param1, param2, 5, 0, 1); + sub_0200B60C(param0->strFormatter, param1, param2, 5, 0, 1); } -static void ov16_022404B4 (BattleSystem * param0, u32 param1, int param2, int param3) +static void BattleMessage_NumberDigits (BattleSystem * param0, u32 param1, int param2, int param3) { if (param3) { - sub_0200B60C(param0->unk_14, param1, param2, param3, 1, 1); + sub_0200B60C(param0->strFormatter, param1, param2, param3, 1, 1); } else { - sub_0200B60C(param0->unk_14, param1, param2, 5, 1, 1); + sub_0200B60C(param0->strFormatter, param1, param2, 5, 1, 1); } } -static void ov16_022404E0 (BattleSystem * param0, u32 param1, int param2) +static void BattleMessage_TypeName (BattleSystem * param0, u32 param1, int param2) { - sub_0200B7EC(param0->unk_14, param1, param2); + sub_0200B7EC(param0->strFormatter, param1, param2); } -static void ov16_022404EC (BattleSystem * param0, u32 param1, int param2) +static void BattleMessage_AbilityName (BattleSystem * param0, u32 param1, int param2) { - sub_0200B6A0(param0->unk_14, param1, param2); + sub_0200B6A0(param0->strFormatter, param1, param2); } -static void ov16_022404F8 (BattleSystem * param0, u32 param1, int param2) +static void BattleMessage_StatName (BattleSystem * param0, u32 param1, int param2) { - sub_0200B824(param0->unk_14, param1, param2); + sub_0200B824(param0->strFormatter, param1, param2); } -static void ov16_02240504 (BattleSystem * param0, u32 param1, int param2) +static void BattleMessage_StatusName (BattleSystem * param0, u32 param1, int param2) { - sub_0200B85C(param0->unk_14, param1, param2); + sub_0200B85C(param0->strFormatter, param1, param2); } -static void ov16_02240510 (BattleSystem * param0, u32 param1, int param2) +static void BattleMessage_PokemonName (BattleSystem * param0, u32 param1, int param2) { Pokemon * v0; v0 = BattleSystem_PartyPokemon(param0, param2 & 0xff, (param2 & 0xff00) >> 8); - sub_0200B538(param0->unk_14, param1, &v0->box); + sub_0200B538(param0->strFormatter, param1, &v0->box); } -static void ov16_02240534 (BattleSystem * param0, u32 param1, int param2) +static void BattleMessage_PoffinName (BattleSystem * param0, u32 param1, int param2) { return; } -static void ov16_02240538 (BattleSystem * param0, u32 param1, int param2) +static void BattleMessage_FlavorName (BattleSystem * param0, u32 param1, int param2) { - sub_0200B890(param0->unk_14, param1, param2); + sub_0200B890(param0->strFormatter, param1, param2); } -static void ov16_02240544 (BattleSystem * param0, u32 param1, int param2) +static void BattleMessage_TrainerClassName (BattleSystem * param0, u32 param1, int param2) { TrainerData * v0; v0 = BattleSystem_TrainerData(param0, param2); - sub_0200B9D0(param0->unk_14, param1, v0); + sub_0200B9D0(param0->strFormatter, param1, v0); } -static void ov16_0224055C (BattleSystem * param0, u32 param1, int param2) +static void BattleMessage_TrainerName (BattleSystem * param0, u32 param1, int param2) { TrainerData * v0; v0 = BattleSystem_TrainerData(param0, param2); - sub_0200BA74(param0->unk_14, param1, v0); + sub_0200BA74(param0->strFormatter, param1, v0); } -static void ov16_02240574 (BattleSystem * param0, u32 param1, int param2) +static void BattleMessage_PCBoxName (BattleSystem * param0, u32 param1, int param2) { - sub_0200BD40(param0->unk_14, param1, param0->pcBoxes, param2); + sub_0200BD40(param0->strFormatter, param1, param0->pcBoxes, param2); } -static void ov16_02240584 (BattleSystem * param0, MessageLoader * param1, BattleMessage * param2) +/** + * @brief Load the requested message and format it into a string to be printed to the screen. + * + * @param battleSys + * @param msgLoader + * @param battleMsg + */ +static void BattleMessage_Format(BattleSystem *battleSys, MessageLoader *msgLoader, BattleMessage *battleMsg) { - Strbuf* v0; - - v0 = MessageLoader_GetNewStrbuf(param1, param2->id); - - sub_0200C388(param0->unk_14, param0->msgBuffer, v0); - Strbuf_Free(v0); + Strbuf *strbuf = MessageLoader_GetNewStrbuf(msgLoader, battleMsg->id); + StringFormatter_Format(battleSys->strFormatter, battleSys->msgBuffer, strbuf); + Strbuf_Free(strbuf); } -static BOOL ov16_022405A4 (UnkStruct_0201D738 * param0, u16 param1) +static BOOL BattleMessage_Callback (UnkStruct_0201D738 * param0, u16 param1) { BOOL v0; diff --git a/src/overlay016/ov16_02266F1C.c b/src/overlay016/ov16_02266F1C.c index 88ebd04909..2ee799d627 100644 --- a/src/overlay016/ov16_02266F1C.c +++ b/src/overlay016/ov16_02266F1C.c @@ -963,7 +963,7 @@ static void ov16_02267864 (UnkStruct_ov16_022674C4 * param0) v8 = Pokemon_GetBoxPokemon(v7); sub_0200B5CC(v9, 0, v8); - sub_0200C388(v9, v5, v6); + StringFormatter_Format(v9, v5, v6); sub_0201A870(v0, &v3, 8, 2, 0, 0xf); sub_0201D7E0(&v3, 0, v5, 0, 0, 0xff, ((u32)(((0xe & 0xff) << 16) | ((2 & 0xff) << 8) | (((0xf & 0xff) << 0)))), 0, 0, NULL); @@ -1220,7 +1220,7 @@ static void ov16_02267DC4 (UnkStruct_ov16_022674C4 * param0, u32 param1) } sub_0200B60C(v7, 0, param0->unk_27, 2, 1, 1); - sub_0200C388(v7, v5, v6); + StringFormatter_Format(v7, v5, v6); sub_0201A870(v0, &v3, 13, 2, 0, 0xf); sub_0201D7E0(&v3, 0, v5, 0, 0, 0xff, ((u32)(((0xe & 0xff) << 16) | ((2 & 0xff) << 8) | (((0xf & 0xff) << 0)))), 0, 0, NULL); diff --git a/src/overlay016/ov16_0226871C.c b/src/overlay016/ov16_0226871C.c index b519bddff4..f2d7bc9a6e 100644 --- a/src/overlay016/ov16_0226871C.c +++ b/src/overlay016/ov16_0226871C.c @@ -67,7 +67,7 @@ #include "unk_0208C098.h" #include "overlay011/ov11_0221F800.h" #include "overlay016/ov16_0223DF00.h" -#include "overlay016/ov16_0225CBB8.h" +#include "battle/battle_display.h" #include "overlay016/ov16_0226871C.h" #include "overlay016/ov16_0226DB7C.h" #include "overlay016/ov16_0226DE44.h" @@ -2017,8 +2017,8 @@ static void ov16_02269DB0 (UnkStruct_ov16_02268A14 * param0, int param1, int par v4 = Strbuf_Init(100, 5); sub_0200B630(v5, 0, v6->unk_00); - sub_0200C388(v5, v3, v1); - sub_0200C388(v5, v4, v2); + StringFormatter_Format(v5, v3, v1); + StringFormatter_Format(v5, v4, v2); ov16_0226A98C(param0, ¶m0->unk_4CC[0], v3, 2, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((3 & 0xff) << 0))), 2, 20023, 128, 68, 1, NULL); ov16_0226A98C(param0, ¶m0->unk_4CC[1], v4, 2, ((u32)(((10 & 0xff) << 16) | ((11 & 0xff) << 8) | ((12 & 0xff) << 0))), 2, 20023, 128, 140, 1, NULL); @@ -2081,8 +2081,8 @@ static void ov16_02269F68 (UnkStruct_ov16_02268A14 * param0, int param1, int par v4 = Strbuf_Init(100, 5); sub_0200B630(v5, 0, v6->unk_00); - sub_0200C388(v5, v3, v1); - sub_0200C388(v5, v4, v2); + StringFormatter_Format(v5, v3, v1); + StringFormatter_Format(v5, v4, v2); ov16_0226A98C(param0, ¶m0->unk_4CC[0], v3, 2, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((3 & 0xff) << 0))), 2, 20023, 128, 68, 1, NULL); ov16_0226A98C(param0, ¶m0->unk_4CC[1], v4, 2, ((u32)(((10 & 0xff) << 16) | ((11 & 0xff) << 8) | ((12 & 0xff) << 0))), 2, 20023, 128, 140, 1, NULL); @@ -2109,8 +2109,8 @@ static void ov16_0226A04C (UnkStruct_ov16_02268A14 * param0, int param1, int par v4 = Strbuf_Init(100, 5); sub_0200B630(v5, 0, v6->unk_00); - sub_0200C388(v5, v3, v1); - sub_0200C388(v5, v4, v2); + StringFormatter_Format(v5, v3, v1); + StringFormatter_Format(v5, v4, v2); ov16_0226A98C(param0, ¶m0->unk_4CC[0], v3, 2, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((3 & 0xff) << 0))), 2, 20023, 128, 68, 1, NULL); ov16_0226A98C(param0, ¶m0->unk_4CC[1], v4, 2, ((u32)(((10 & 0xff) << 16) | ((11 & 0xff) << 8) | ((12 & 0xff) << 0))), 2, 20023, 128, 140, 1, NULL); @@ -2168,7 +2168,7 @@ static void ov16_0226A12C (UnkStruct_ov16_02268A14 * param0, int param1, int par v7 = Pokemon_GetBoxPokemon(v6); sub_0200B5CC(v8, 0, v7); - sub_0200C388(v8, v4, v5); + StringFormatter_Format(v8, v4, v5); if (v1 & 1) { v9 = ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((3 & 0xff) << 0))); @@ -2824,7 +2824,7 @@ void ov16_0226AC98 (UnkStruct_ov16_02268A14 * param0, int param1, const UnkStruc if ((v0->unk_78[v4].unk_00.unk_0C == NULL) || (v0->unk_C8[v4].unk_00.unk_0C == NULL) || (param2->unk_00[v4] != 0) || (param2->unk_00[v4] != v0->unk_00.unk_00[v4]) || (param2->unk_08[v4] != v0->unk_00.unk_08[v4]) || (param2->unk_10[v4] != v0->unk_00.unk_10[v4])) { sub_0200B60C(v10, 0, param2->unk_08[v4], 2, 1, 0); sub_0200B60C(v10, 1, param2->unk_10[v4], 2, 1, 0); - sub_0200C388(v10, v7, v8); + StringFormatter_Format(v10, v7, v8); v11 = ov16_0226B924(param2->unk_08[v4], param2->unk_10[v4]); diff --git a/src/overlay017/ov17_022413D8.c b/src/overlay017/ov17_022413D8.c index 6d569d0f78..472c4efbb6 100644 --- a/src/overlay017/ov17_022413D8.c +++ b/src/overlay017/ov17_022413D8.c @@ -1529,10 +1529,10 @@ static void ov17_02242DC0 (UnkStruct_ov17_02246F24 * param0, MessageLoader * par v0 = MessageLoader_GetNewStrbuf(param1, param2); ov17_0224290C(param0, param3, param4, param5); - sub_0200C388(param0->unk_0C.unk_48, param0->unk_0C.unk_4C, v0); + StringFormatter_Format(param0->unk_0C.unk_48, param0->unk_0C.unk_4C, v0); BGL_FillWindow(¶m0->unk_0C.unk_28[0], 0xff); - param0->unk_0C.unk_210 = sub_0201D738(¶m0->unk_0C.unk_28[0], 1, param0->unk_0C.unk_4C, 0, 0, v1, NULL); + param0->unk_0C.unk_210 = PrintStringSimple(¶m0->unk_0C.unk_28[0], 1, param0->unk_0C.unk_4C, 0, 0, v1, NULL); if (v1 == 0) { param0->unk_0C.unk_210 = 0xff; diff --git a/src/overlay017/ov17_022476F8.c b/src/overlay017/ov17_022476F8.c index 86c050b51d..a8b5a43ab0 100644 --- a/src/overlay017/ov17_022476F8.c +++ b/src/overlay017/ov17_022476F8.c @@ -218,10 +218,10 @@ static void ov17_02247990 (UnkStruct_ov17_02247A48 * param0, MessageLoader * par v0 = MessageLoader_GetNewStrbuf(param1, param2); ov17_0224792C(param0, param3, param4); - sub_0200C388(param0->unk_0C.unk_3C, param0->unk_0C.unk_40, v0); + StringFormatter_Format(param0->unk_0C.unk_3C, param0->unk_0C.unk_40, v0); BGL_FillWindow(¶m0->unk_0C.unk_28[0], 0xff); - param0->unk_0C.unk_C4 = sub_0201D738(¶m0->unk_0C.unk_28[0], 1, param0->unk_0C.unk_40, 0, 0, v1, NULL); + param0->unk_0C.unk_C4 = PrintStringSimple(¶m0->unk_0C.unk_28[0], 1, param0->unk_0C.unk_40, 0, 0, v1, NULL); Strbuf_Free(v0); } diff --git a/src/overlay017/ov17_0224A0FC.c b/src/overlay017/ov17_0224A0FC.c index e835a4e74f..c9aeaf4d63 100644 --- a/src/overlay017/ov17_0224A0FC.c +++ b/src/overlay017/ov17_0224A0FC.c @@ -1944,10 +1944,10 @@ static void ov17_0224C244 (UnkStruct_ov17_0224DF54 * param0, MessageLoader * par v0 = MessageLoader_GetNewStrbuf(param1, param2); ov17_0224C0C0(param0, param3, param4); - sub_0200C388(param0->unk_14.unk_88, param0->unk_14.unk_8C, v0); + StringFormatter_Format(param0->unk_14.unk_88, param0->unk_14.unk_8C, v0); BGL_FillWindow(¶m0->unk_14.unk_64[0], 0xff); - param0->unk_14.unk_A18 = sub_0201D738(¶m0->unk_14.unk_64[0], 1, param0->unk_14.unk_8C, 0, 0, v1, NULL); + param0->unk_14.unk_A18 = PrintStringSimple(¶m0->unk_14.unk_64[0], 1, param0->unk_14.unk_8C, 0, 0, v1, NULL); Strbuf_Free(v0); } @@ -2117,9 +2117,9 @@ void ov17_0224C5A0 (UnkStruct_ov17_0224DF54 * param0, u32 param1, const UnkStruc ov17_0224C0C0(param0, v1, param2); - sub_0200C388(param0->unk_14.unk_88, param0->unk_14.unk_8C, v2); + StringFormatter_Format(param0->unk_14.unk_88, param0->unk_14.unk_8C, v2); BGL_FillWindow(¶m0->unk_14.unk_64[1], 0xff); - sub_0201D738(¶m0->unk_14.unk_64[1], 1, param0->unk_14.unk_8C, 0, 0, 0, NULL); + PrintStringSimple(¶m0->unk_14.unk_64[1], 1, param0->unk_14.unk_8C, 0, 0, 0, NULL); Strbuf_Free(v2); param0->unk_1B25 = 1; diff --git a/src/overlay017/ov17_02250744.c b/src/overlay017/ov17_02250744.c index 3c30749b6b..15c355978e 100644 --- a/src/overlay017/ov17_02250744.c +++ b/src/overlay017/ov17_02250744.c @@ -253,10 +253,10 @@ static void ov17_022508E4 (UnkStruct_ov17_0224FCA0 * param0, MessageLoader * par v0 = MessageLoader_GetNewStrbuf(param1, param2); ov17_022507F0(param0, param3, param4); - sub_0200C388(param0->unk_10.unk_B8, param0->unk_10.unk_BC, v0); + StringFormatter_Format(param0->unk_10.unk_B8, param0->unk_10.unk_BC, v0); BGL_FillWindow(¶m0->unk_10.unk_24[0], 0xff); - param0->unk_10.unk_388 = sub_0201D738(¶m0->unk_10.unk_24[0], 1, param0->unk_10.unk_BC, 0, 0, v1, NULL); + param0->unk_10.unk_388 = PrintStringSimple(¶m0->unk_10.unk_24[0], 1, param0->unk_10.unk_BC, 0, 0, v1, NULL); Strbuf_Free(v0); } diff --git a/src/overlay019/ov19_021DB2FC.c b/src/overlay019/ov19_021DB2FC.c index fe64fe7a77..8b01140faa 100644 --- a/src/overlay019/ov19_021DB2FC.c +++ b/src/overlay019/ov19_021DB2FC.c @@ -115,8 +115,8 @@ void ov19_021DB448 (UnkStruct_ov19_021DB6F0 * param0, u32 param1) ov19_021DB4B4(param0->unk_00, param0->unk_18[0].unk_04, param0->unk_18[0].unk_05, param0->unk_18[0].unk_06, param0->unk_18[0].unk_07, param0->unk_18[0].unk_08); BGL_FillWindow(¶m0->unk_18[0], 15); MessageLoader_GetStrbuf(param0->unk_10, param1, param0->unk_30); - sub_0200C388(param0->unk_2C, param0->unk_34, param0->unk_30); - sub_0201D738(&(param0->unk_18[0]), 1, param0->unk_34, 0, 0, 0xff, NULL); + StringFormatter_Format(param0->unk_2C, param0->unk_34, param0->unk_30); + PrintStringSimple(&(param0->unk_18[0]), 1, param0->unk_34, 0, 0, 0xff, NULL); sub_0201ACCC(&(param0->unk_18[0])); sub_02019448(param0->unk_00, 1); diff --git a/src/overlay020/ov20_021D2EA4.c b/src/overlay020/ov20_021D2EA4.c index bdb450509d..79bb7c1014 100644 --- a/src/overlay020/ov20_021D2EA4.c +++ b/src/overlay020/ov20_021D2EA4.c @@ -440,7 +440,7 @@ void ov20_021D3578 (UnkStruct_ov20_021D30F8 * param0, u32 param1) sub_0200B7B4(v0, 0, 0); MessageLoader_GetStrbuf(param0->unk_48, 0 + ov20_021D1F88(param0->unk_04), param0->unk_4C); - sub_0200C388(v0, v1, param0->unk_4C); + StringFormatter_Format(v0, v1, param0->unk_4C); sub_0201D78C(¶m0->unk_1C, 1, v1, 0, 0, 0xff, (u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((9 & 0xff) << 0)), NULL); Strbuf_Free(v1); diff --git a/src/overlay022/ov22_02255D44.c b/src/overlay022/ov22_02255D44.c index 75bf577e3c..ee24b9b975 100644 --- a/src/overlay022/ov22_02255D44.c +++ b/src/overlay022/ov22_02255D44.c @@ -1373,7 +1373,7 @@ static void ov22_02257368 (UnkStruct_ov22_02255D44 * param0, u32 param1) v2 = MessageLoader_GetNewStrbuf(v0, param1); v1 = Strbuf_Init(256, 13); - sub_0200C388(param0->unk_744, v1, v2); + StringFormatter_Format(param0->unk_744, v1, v2); sub_0201D78C(param0->unk_718, 1, v1, 0, 0, 0, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((15 & 0xff) << 0))), NULL); Strbuf_Free(v1); Strbuf_Free(v2); @@ -1396,7 +1396,7 @@ static u32 ov22_022573EC (UnkStruct_ov22_02255D44 * param0, u32 param1) v3 = MessageLoader_GetNewStrbuf(v1, param1); param0->unk_740 = Strbuf_Init(256, 13); - sub_0200C388(param0->unk_744, param0->unk_740, v3); + StringFormatter_Format(param0->unk_744, param0->unk_740, v3); if (param0->unk_734->unk_16 == 0) { v2 = sub_02027AC0(param0->unk_738); diff --git a/src/overlay022/ov22_0225B660.c b/src/overlay022/ov22_0225B660.c index 90df4875ac..8af9308335 100644 --- a/src/overlay022/ov22_0225B660.c +++ b/src/overlay022/ov22_0225B660.c @@ -310,7 +310,7 @@ static void ov22_0225BB00 (UnkStruct_ov22_0225B85C * param0) v7 = Strbuf_Init(200, 13); v6 = MessageLoader_GetNewStrbuf(v8, 45); - sub_0200C388(v5, v7, v6); + StringFormatter_Format(v5, v7, v6); v3 = sub_02002D7C(0, v7, 0); v1 = 128 - (v3 / 2); @@ -359,7 +359,7 @@ static void ov22_0225BC18 (UnkStruct_ov22_0225B85C * param0) GF_ASSERT(v7); v3 = MessageLoader_GetNewStrbuf(v7, 43); - sub_0200C388(v1, v2, v3); + StringFormatter_Format(v1, v2, v3); Strbuf_Free(v3); v10 = sub_02002D7C(0, v2, 0); v8 = 128 - (v10 / 2); @@ -367,7 +367,7 @@ static void ov22_0225BC18 (UnkStruct_ov22_0225B85C * param0) sub_0201D78C(param0->unk_200, 0, v2, v8, v9, 0, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); v3 = MessageLoader_GetNewStrbuf(v7, 44); - sub_0200C388(v1, v2, v3); + StringFormatter_Format(v1, v2, v3); Strbuf_Free(v3); v10 = sub_02002D7C(0, v2, 0); v8 = 128 - (v10 / 2); diff --git a/src/overlay023/ov23_022416A8.c b/src/overlay023/ov23_022416A8.c index 08b4c813f1..d6361ae4fa 100644 --- a/src/overlay023/ov23_022416A8.c +++ b/src/overlay023/ov23_022416A8.c @@ -505,7 +505,7 @@ BOOL ov23_02241D58 (Strbuf *param0) sub_0200BACC(v1, 2, Unk_ov23_02257744->unk_468[v0]); sub_0200C324(v1, 2); MessageLoader_GetStrbuf(ov23_02253E3C(ov23_0224219C()), 95, v2); - sub_0200C388(v1, param0, v2); + StringFormatter_Format(v1, param0, v2); Unk_ov23_02257744->unk_468[v0] = 0; v3 = 1; diff --git a/src/overlay023/ov23_02241F74.c b/src/overlay023/ov23_02241F74.c index f7861f7303..9ff5b50080 100644 --- a/src/overlay023/ov23_02241F74.c +++ b/src/overlay023/ov23_02241F74.c @@ -230,7 +230,7 @@ BOOL ov23_0224223C (TrainerInfo * param0, TrainerInfo * param1, int param2, Strb sub_0200B498(v0, 0, param0); sub_0200B498(v0, 1, param1); MessageLoader_GetStrbuf(ov23_02253E3C(ov23_0224219C()), param2, v1); - sub_0200C388(v0, param3, v1); + StringFormatter_Format(v0, param3, v1); Strbuf_Free(v1); sub_0200B3F0(v0); @@ -251,7 +251,7 @@ BOOL ov23_022422A8 (TrainerInfo * param0, int param1, int param2, Strbuf *param3 sub_0200B498(v0, param1, param0); MessageLoader_GetStrbuf(ov23_02253E3C(ov23_0224219C()), param2, v1); - sub_0200C388(v0, param3, v1); + StringFormatter_Format(v0, param3, v1); Strbuf_Free(v1); sub_0200B3F0(v0); @@ -1065,7 +1065,7 @@ void ov23_02243038 (int param0) sub_0200B498(v0, 0, sub_02032EE8(param0)); MessageLoader_GetStrbuf(ov23_02253E3C(ov23_0224219C()), 115, v1); - sub_0200C388(v0, Unk_ov23_02257748->unk_DC[param0], v1); + StringFormatter_Format(v0, Unk_ov23_02257748->unk_DC[param0], v1); Strbuf_Free(v1); sub_0200B3F0(v0); } diff --git a/src/overlay023/ov23_02248F1C.c b/src/overlay023/ov23_02248F1C.c index adfdab4452..3adc452fc8 100644 --- a/src/overlay023/ov23_02248F1C.c +++ b/src/overlay023/ov23_02248F1C.c @@ -478,7 +478,7 @@ static void ov23_0224966C (BGL * param0, Window * param1, int * param2, int * pa switch (*param3) { case 0: if ((v0 = ov23_022498C4(param5)) != NULL) { - *param2 = sub_0201D738( + *param2 = PrintStringSimple( param1, 1, v0, 0, 16, 1, NULL); *param3 = 1; } diff --git a/src/overlay023/ov23_0224F294.c b/src/overlay023/ov23_0224F294.c index 101df9f6a2..545ef39041 100644 --- a/src/overlay023/ov23_0224F294.c +++ b/src/overlay023/ov23_0224F294.c @@ -1061,7 +1061,7 @@ static void ov23_0225021C (UnkStruct_ov23_02250CD4 * param0, UnkFuncPtr_ov23_022 sub_0200BA94(param0->unk_70, 2, v1(v7, param0)); sub_0200B60C(param0->unk_70, 6, v2(v7, param0), 2, 2, 1); MessageLoader_GetStrbuf(ov23_02253E3C(ov23_0224219C()), 128, param0->unk_6C); - sub_0200C388(param0->unk_70, param0->unk_68, param0->unk_6C); + StringFormatter_Format(param0->unk_70, param0->unk_68, param0->unk_6C); sub_02013A6C(param0->unk_40, param0->unk_68, v7); } diff --git a/src/overlay023/ov23_022521F0.c b/src/overlay023/ov23_022521F0.c index 0abd7cb613..0faebc4cf3 100644 --- a/src/overlay023/ov23_022521F0.c +++ b/src/overlay023/ov23_022521F0.c @@ -273,14 +273,14 @@ static void ov23_0225265C (UnkStruct_0200112C * param0, u32 param1, u8 param2) BGL_FillWindow(&v0->unk_20, 15); MessageLoader_GetStrbuf(ov23_02253E3C(ov23_022421BC()), 23 + v0->unk_2AB, v0->unk_68); - sub_0201D738(&v0->unk_20, 0, v0->unk_68, 1, 1, 0xff, NULL); + PrintStringSimple(&v0->unk_20, 0, v0->unk_68, 1, 1, 0xff, NULL); if (param1 != 0xfffffffe) { sub_0200BA94(v0->unk_70, 2, v0->unk_279[v1]); sub_0200B60C(v0->unk_70, 6, v0->unk_27E[v1], 2, 1, 1); MessageLoader_GetStrbuf(ov23_02253E3C(ov23_022421BC()), 25, v0->unk_68); - sub_0200C388(v0->unk_70, v0->unk_6C, v0->unk_68); - sub_0201D738(&v0->unk_20, 0, v0->unk_6C, 1, 17, 0xff, NULL); + StringFormatter_Format(v0->unk_70, v0->unk_6C, v0->unk_68); + PrintStringSimple(&v0->unk_20, 0, v0->unk_6C, 1, 17, 0xff, NULL); } else { (void)0; } @@ -353,7 +353,7 @@ static void ov23_02252754 (UnkStruct_0200112C * param0, u32 param1, u8 param2) } MessageLoader_GetStrbuf(ov23_02253E3C(ov23_022421BC()), 23 + v1->unk_2AB, v1->unk_68); - sub_0201D738(&v1->unk_20, 0, v1->unk_68, 1, 1, 0xff, NULL); + PrintStringSimple(&v1->unk_20, 0, v1->unk_68, 1, 1, 0xff, NULL); if (param1 == 0xfffffffe) { (void)0; @@ -361,8 +361,8 @@ static void ov23_02252754 (UnkStruct_0200112C * param0, u32 param1, u8 param2) sub_0200BA94(v1->unk_70, 2, v7); sub_0200B60C(v1->unk_70, 6, v8, 2, 1, 1); MessageLoader_GetStrbuf(ov23_02253E3C(ov23_022421BC()), 25, v1->unk_68); - sub_0200C388(v1->unk_70, v1->unk_6C, v1->unk_68); - sub_0201D738(&v1->unk_20, 0, v1->unk_6C, 1, 17, 0xff, NULL); + StringFormatter_Format(v1->unk_70, v1->unk_6C, v1->unk_68); + PrintStringSimple(&v1->unk_20, 0, v1->unk_6C, 1, 17, 0xff, NULL); v1->unk_279[0] = v7; v1->unk_27E[0] = v8; @@ -370,7 +370,7 @@ static void ov23_02252754 (UnkStruct_0200112C * param0, u32 param1, u8 param2) v1->unk_279[0] = v7; MessageLoader_GetStrbuf(ov23_02253E3C(ov23_022421BC()), 26, v1->unk_68); - sub_0201D738(&v1->unk_20, 0, v1->unk_68, 1, 17, 0xff, NULL); + PrintStringSimple(&v1->unk_20, 0, v1->unk_68, 1, 17, 0xff, NULL); } sub_0201A9A4(&v1->unk_20); @@ -568,7 +568,7 @@ void ov23_02252D74 (UnkStruct_ov23_02250CD4 * param0, int param1) sub_0201A954(¶m0->unk_30); MessageLoader_GetStrbuf(ov23_02253E3C(ov23_022421BC()), param1, param0->unk_68); - sub_0201D738(¶m0->unk_30, 0, param0->unk_68, 1, 1, 0xff, NULL); + PrintStringSimple(¶m0->unk_30, 0, param0->unk_68, 1, 1, 0xff, NULL); sub_0201A9A4(¶m0->unk_30); } diff --git a/src/overlay023/ov23_02253598.c b/src/overlay023/ov23_02253598.c index 680c033ca5..e814c83c77 100644 --- a/src/overlay023/ov23_02253598.c +++ b/src/overlay023/ov23_02253598.c @@ -152,7 +152,7 @@ asm static void ov23_0225360C (Window * param0, MessageLoader * param1, TrainerI add r2, r4, #0 mov r3, #2 str r1, [sp, #8] - bl sub_0201D738 + bl PrintStringSimple ldr r0, [sp, #0xc] mov r1, #1 add r2, r4, #0 @@ -166,7 +166,7 @@ asm static void ov23_0225360C (Window * param0, MessageLoader * param1, TrainerI add r2, r4, #0 mov r3, #2 str r1, [sp, #8] - bl sub_0201D738 + bl PrintStringSimple ldr r0, [sp, #0xc] mov r1, #2 add r2, r4, #0 @@ -180,7 +180,7 @@ asm static void ov23_0225360C (Window * param0, MessageLoader * param1, TrainerI add r2, r4, #0 mov r3, #0x84 str r1, [sp, #8] - bl sub_0201D738 + bl PrintStringSimple add r0, r5, #0 bl TrainerInfo_ID_LowHalf add r2, r0, #0 @@ -199,7 +199,7 @@ asm static void ov23_0225360C (Window * param0, MessageLoader * param1, TrainerI ldr r0, [sp, #0x1c] ldr r1, [sp, #0x18] add r2, r4, #0 - bl sub_0200C388 + bl StringFormatter_Format mov r0, #1 str r0, [sp] mov r0, #0xff @@ -209,7 +209,7 @@ asm static void ov23_0225360C (Window * param0, MessageLoader * param1, TrainerI add r0, r7, #0 mov r3, #0x94 str r1, [sp, #8] - bl sub_0201D738 + bl PrintStringSimple ldr r0, [sp, #0x1c] mov r1, #0 add r2, r5, #0 @@ -221,7 +221,7 @@ asm static void ov23_0225360C (Window * param0, MessageLoader * param1, TrainerI ldr r0, [sp, #0x1c] ldr r1, [sp, #0x18] add r2, r4, #0 - bl sub_0200C388 + bl StringFormatter_Format mov r0, #1 str r0, [sp] mov r0, #0xff @@ -231,7 +231,7 @@ asm static void ov23_0225360C (Window * param0, MessageLoader * param1, TrainerI add r0, r7, #0 mov r3, #0x39 str r1, [sp, #8] - bl sub_0201D738 + bl PrintStringSimple ldr r0, [sp, #0x10] bl sub_0202958C add r1, r0, #0 @@ -248,7 +248,7 @@ asm static void ov23_0225360C (Window * param0, MessageLoader * param1, TrainerI add r2, r4, #0 mov r3, #0x39 str r1, [sp, #8] - bl sub_0201D738 + bl PrintStringSimple mov r5, #0 mov r6, #0x27 _02253738: @@ -265,7 +265,7 @@ asm static void ov23_0225360C (Window * param0, MessageLoader * param1, TrainerI mov r1, #0 add r2, r4, #0 mov r3, #2 - bl sub_0201D738 + bl PrintStringSimple add r5, r5, #1 add r6, #0x10 cmp r5, #7 @@ -293,7 +293,7 @@ asm static void ov23_0225360C (Window * param0, MessageLoader * param1, TrainerI ldr r0, [sp, #0x1c] ldr r1, [sp, #0x18] add r2, r4, #0 - bl sub_0200C388 + bl StringFormatter_Format str r5, [sp] mov r0, #0xff str r0, [sp, #4] @@ -303,7 +303,7 @@ asm static void ov23_0225360C (Window * param0, MessageLoader * param1, TrainerI add r0, r7, #0 mov r1, #0 mov r3, #0x94 - bl sub_0201D738 + bl PrintStringSimple ldr r0, [sp, #0x14] add r6, r6, #4 add r0, r0, #1 @@ -495,19 +495,19 @@ static void ov23_02253A78 (Window * param0, MessageLoader * param1, TrainerInfo sub_0200B498(v0, 1, param2); MessageLoader_GetStrbuf(param1, 12, v1); - sub_0200C388(v0, v2, v1); - sub_0201D738(param0, 0, v2, v7, 1, 0xff, NULL); + StringFormatter_Format(v0, v2, v1); + PrintStringSimple(param0, 0, v2, v7, 1, 0xff, NULL); MessageLoader_GetStrbuf(param1, 13, v1); - sub_0201D738(param0, 0, v1, v7, 1 + v8, 0xff, NULL); + PrintStringSimple(param0, 0, v1, v7, 1 + v8, 0xff, NULL); sub_0200B60C(v0, 6, sub_020295B8(param3), 6, 1, 1); MessageLoader_GetStrbuf(param1, 14, v1); - sub_0200C388(v0, v2, v1); - sub_0201D738(param0, 0, v2, v7 + 100, 1 + v8, 0xff, NULL); + StringFormatter_Format(v0, v2, v1); + PrintStringSimple(param0, 0, v2, v7 + 100, 1 + v8, 0xff, NULL); MessageLoader_GetStrbuf(param1, 15, v1); - sub_0201D738(param0, 0, v1, v7, 1 + v8 * 3, 0xff, NULL); + PrintStringSimple(param0, 0, v1, v7, 1 + v8 * 3, 0xff, NULL); for (v3 = 0; v3 < 5; v3++) { TrainerInfo * v13 = sub_020288C8(param4, 4, v3); @@ -515,20 +515,20 @@ static void ov23_02253A78 (Window * param0, MessageLoader * param1, TrainerInfo if (v13) { sub_0200B498(v0, 0, v13); MessageLoader_GetStrbuf(param1, 16, v1); - sub_0200C388(v0, v2, v1); - sub_0201D738(param0, 0, v2, v7, 1 + v8 * (4 + v3), 0xff, NULL); + StringFormatter_Format(v0, v2, v1); + PrintStringSimple(param0, 0, v2, v7, 1 + v8 * (4 + v3), 0xff, NULL); sub_0200B60C(v0, 5, TrainerInfo_ID_LowHalf(v13), 5, 2, 1); MessageLoader_GetStrbuf(param1, 17, v1); - sub_0200C388(v0, v2, v1); + StringFormatter_Format(v0, v2, v1); - sub_0201D738(param0, 0, v2, v7 + v12, 1 + v8 * (4 + v3), 0xff, NULL); + PrintStringSimple(param0, 0, v2, v7 + v12, 1 + v8 * (4 + v3), 0xff, NULL); Heap_FreeToHeap(v13); } else { MessageLoader_GetStrbuf(param1, 51, v1); - sub_0201D738(param0, 0, v1, v7, 1 + v8 * (4 + v3), 0xff, NULL); + PrintStringSimple(param0, 0, v1, v7, 1 + v8 * (4 + v3), 0xff, NULL); MessageLoader_GetStrbuf(param1, 52, v1); - sub_0201D738(param0, 0, v1, v7 + v12, 1 + v8 * (4 + v3), 0xff, NULL); + PrintStringSimple(param0, 0, v1, v7 + v12, 1 + v8 * (4 + v3), 0xff, NULL); } } diff --git a/src/overlay023/ov23_02253D40.c b/src/overlay023/ov23_02253D40.c index 729b7158cb..4f0bd96e91 100644 --- a/src/overlay023/ov23_02253D40.c +++ b/src/overlay023/ov23_02253D40.c @@ -159,7 +159,7 @@ static Strbuf* ov23_02253E6C (UnkStruct_ov23_02253E2C * param0) Strbuf* v0 = param0->unk_00; if (param0->unk_44_1) { - sub_0200C388(param0->unk_28, param0->unk_04, param0->unk_00); + StringFormatter_Format(param0->unk_28, param0->unk_04, param0->unk_00); v0 = param0->unk_04; param0->unk_44_1 = 0; } @@ -190,7 +190,7 @@ static int ov23_02253E90 (UnkStruct_ov23_02253E2C * param0, BOOL param1, UnkStru v0 = ov23_02253E6C(param0); - param0->unk_30 = sub_0201D738(¶m0->unk_08, 1, v0, 0, 0, param0->unk_38, NULL); + param0->unk_30 = PrintStringSimple(¶m0->unk_08, 1, v0, 0, 0, param0->unk_38, NULL); param0->unk_1C = param2; param0->unk_3C = param3; diff --git a/src/overlay023/ov23_022542CC.c b/src/overlay023/ov23_022542CC.c index ca665b48bb..4750eccbb6 100644 --- a/src/overlay023/ov23_022542CC.c +++ b/src/overlay023/ov23_022542CC.c @@ -186,7 +186,7 @@ static void ov23_0225437C (UnkStruct_ov23_022542D8 * param0) BGL_FillWindow(¶m0->unk_14, 15); v8 = MessageLoader_GetNewStrbuf(v5, 0); - sub_0201D738(¶m0->unk_14, 0, v8, 0, 0, 0xff, NULL); + PrintStringSimple(¶m0->unk_14, 0, v8, 0, 0, 0xff, NULL); Strbuf_Free(v8); } @@ -438,13 +438,13 @@ static void ov23_022546E0 (UnkStruct_ov23_02254594 * param0) v14 = MessageLoader_GetNewStrbuf(v12, 10); v15 = Strbuf_Init(6, 4); - sub_0201D738(¶m0->unk_18, 0, v13, 0, 0, 0xff, NULL); + PrintStringSimple(¶m0->unk_18, 0, v13, 0, 0, 0xff, NULL); v16 = sub_0200B358(4); sub_0200B60C(v16, 0, param0->unk_40, 2, 1, 1); sub_0200B60C(v16, 1, param0->unk_41, 2, 1, 1); - sub_0200C388(v16, v15, v14); - sub_0201D738(¶m0->unk_18, 0, v15, 0, 16, 0xff, NULL); + StringFormatter_Format(v16, v15, v14); + PrintStringSimple(¶m0->unk_18, 0, v15, 0, 16, 0xff, NULL); sub_0200B3F0(v16); Strbuf_Free(v13); diff --git a/src/overlay058/ov58_021D0D80.c b/src/overlay058/ov58_021D0D80.c index 4eea375120..c82ad51a0f 100644 --- a/src/overlay058/ov58_021D0D80.c +++ b/src/overlay058/ov58_021D0D80.c @@ -1718,7 +1718,7 @@ static void ov58_021D2A98 (UnkStruct_02095EAC * param0, int param1, int param2) v0 = Strbuf_Init((40 * 2), 39); MessageLoader_GetStrbuf(param0->unk_10, param1, v0); - sub_0200C388(param0->unk_0C, param0->unk_2C, v0); + StringFormatter_Format(param0->unk_0C, param0->unk_2C, v0); Strbuf_Free(v0); BGL_FillWindow(¶m0->unk_33C, 0xf0f); @@ -1728,7 +1728,7 @@ static void ov58_021D2A98 (UnkStruct_02095EAC * param0, int param1, int param2) param2 = 0; } - param0->unk_30 = sub_0201D738(¶m0->unk_33C, 1, param0->unk_2C, 0, 0, param2, NULL); + param0->unk_30 = PrintStringSimple(¶m0->unk_33C, 1, param0->unk_2C, 0, 0, param2, NULL); if (param2 == 0) { param0->unk_30 = 0xff; diff --git a/src/overlay059/ov59_021D0D80.c b/src/overlay059/ov59_021D0D80.c index 859b1b4c27..96995bae90 100644 --- a/src/overlay059/ov59_021D0D80.c +++ b/src/overlay059/ov59_021D0D80.c @@ -1577,15 +1577,15 @@ static void ov59_021D2628 (UnkStruct_020961E8 * param0, int param1, int param2) v0 = Strbuf_Init((90 * 2), 51); MessageLoader_GetStrbuf(param0->unk_28, param1, v0); - sub_0200C388(param0->unk_24, param0->unk_44, v0); + StringFormatter_Format(param0->unk_24, param0->unk_44, v0); Strbuf_Free(v0); BGL_FillWindow(¶m0->unk_34C, 0xf0f); sub_0200E060(¶m0->unk_34C, 0, 1, 10); if (param2 == 0) { - param0->unk_4C = sub_0201D738(¶m0->unk_34C, 1, param0->unk_44, 0, 0, ov59_021D28D4(param0), NULL); + param0->unk_4C = PrintStringSimple(¶m0->unk_34C, 1, param0->unk_44, 0, 0, ov59_021D28D4(param0), NULL); } else { - sub_0201D738(¶m0->unk_34C, 1, param0->unk_44, 0, 0, 0, NULL); + PrintStringSimple(¶m0->unk_34C, 1, param0->unk_44, 0, 0, 0, NULL); param0->unk_4C = 0xff; } } diff --git a/src/overlay061/ov61_0222B008.c b/src/overlay061/ov61_0222B008.c index 2267cfc046..eaba03299f 100644 --- a/src/overlay061/ov61_0222B008.c +++ b/src/overlay061/ov61_0222B008.c @@ -758,7 +758,7 @@ static void ov61_0222BB60 (UnkStruct_ov62_022349A8 * param0, int param1, int par sub_0200B60C(param0->unk_3F8, 0, param2, 5, 2, 1); v1 = MessageLoader_GetNewStrbuf(param0->unk_3F4, v0); - sub_0200C388(param0->unk_3F8, param0->unk_3FC, v1); + StringFormatter_Format(param0->unk_3F8, param0->unk_3FC, v1); Strbuf_Free(v1); ov61_0222BB54(param0, param0->unk_3FC); } diff --git a/src/overlay061/ov61_0222BF44.c b/src/overlay061/ov61_0222BF44.c index c3fdd4230a..44cbe5629e 100644 --- a/src/overlay061/ov61_0222BF44.c +++ b/src/overlay061/ov61_0222BF44.c @@ -510,11 +510,11 @@ static void ov61_0222C794 (UnkStruct_ov61_0222C664 * param0, int param1) Strbuf* v0 = Strbuf_Init((16 * 8 * 2), 117); MessageLoader_GetStrbuf(param0->unk_2C, param1, v0); - sub_0200C388(param0->unk_20, param0->unk_3C, v0); + StringFormatter_Format(param0->unk_20, param0->unk_3C, v0); BGL_FillWindow(¶m0->unk_64, 15); Window_Show(¶m0->unk_64, 1, (1 + (18 + 12)), 11); - param0->unk_40 = sub_0201D738(¶m0->unk_64, 1, param0->unk_3C, 0, 0, 0, NULL); + param0->unk_40 = PrintStringSimple(¶m0->unk_64, 1, param0->unk_3C, 0, 0, 0, NULL); param0->unk_40 = 0xff; Strbuf_Free(v0); @@ -555,7 +555,7 @@ static void ov61_0222C850 (UnkStruct_ov61_0222C664 * param0) static void ov61_0222C86C (UnkStruct_ov61_0222C664 * param0) { if (param0->unk_88 != NULL) { - sub_0200EBA0(param0->unk_88); + DeleteWaitDial(param0->unk_88); param0->unk_88 = NULL; } } @@ -577,12 +577,12 @@ static void ov61_0222C8B8 (UnkStruct_ov61_0222C664 * param0, MessageLoader * par v0 = MessageLoader_GetNewStrbuf(param1, param2); - sub_0200C388(param0->unk_20, param0->unk_34, v0); + StringFormatter_Format(param0->unk_20, param0->unk_34, v0); Strbuf_Free(v0); BGL_FillWindow(¶m0->unk_44, 0xf0f); sub_0200E060(¶m0->unk_44, 0, 1, 10); - param0->unk_40 = sub_0201D738(¶m0->unk_44, 1, param0->unk_34, 0, 0, param3, NULL); + param0->unk_40 = PrintStringSimple(¶m0->unk_44, 1, param0->unk_34, 0, 0, param3, NULL); param0->unk_8C = 0; if ((param3 == 0xff) || (param3 == 0)) { diff --git a/src/overlay062/ov62_022300D8.c b/src/overlay062/ov62_022300D8.c index 4200acb1e8..009a9a332a 100644 --- a/src/overlay062/ov62_022300D8.c +++ b/src/overlay062/ov62_022300D8.c @@ -704,7 +704,7 @@ void ov62_02230FC8 (UnkStruct_0208C06C * param0, UnkStruct_ov62_022307C0_sub1 * v0 = Strbuf_Init(255, 102); sub_0200B48C(v3, 0, v5, 0, 1, GAME_LANGUAGE); - sub_0200C388(v3, v0, v4); + StringFormatter_Format(v3, v0, v4); Strbuf_Free(v4); Strbuf_Free(v5); sub_0200B3F0(v3); @@ -720,7 +720,7 @@ void ov62_02230FC8 (UnkStruct_0208C06C * param0, UnkStruct_ov62_022307C0_sub1 * v0 = Strbuf_Init(255, 102); sub_0200B48C(v3, 0, v5, 0, 1, GAME_LANGUAGE); - sub_0200C388(v3, v0, v4); + StringFormatter_Format(v3, v0, v4); Strbuf_Free(v4); Strbuf_Free(v5); sub_0200B3F0(v3); diff --git a/src/overlay062/ov62_02231690.c b/src/overlay062/ov62_02231690.c index c8830e8179..28538b851f 100644 --- a/src/overlay062/ov62_02231690.c +++ b/src/overlay062/ov62_02231690.c @@ -505,7 +505,7 @@ asm static void ov62_02231C78 (UnkStruct_ov62_022323B8 * param0, UnkStruct_0208C ldr r2, [sp, #0x30] add r0, r4, #0 add r1, r6, #0 - bl sub_0200C388 + bl StringFormatter_Format add r0, r5, #0 mov r1, #0 bl BGL_FillWindow @@ -560,7 +560,7 @@ asm static void ov62_02231C78 (UnkStruct_ov62_022323B8 * param0, UnkStruct_0208C ldr r2, [sp, #0x38] add r0, r4, #0 add r1, r6, #0 - bl sub_0200C388 + bl StringFormatter_Format add r0, r5, #0 mov r1, #0 bl BGL_FillWindow @@ -664,7 +664,7 @@ asm static void ov62_02231C78 (UnkStruct_ov62_022323B8 * param0, UnkStruct_0208C ldr r1, [sp, #0x44] ldr r2, [sp, #0x48] add r0, r4, #0 - bl sub_0200C388 + bl StringFormatter_Format mov r1, #0 str r1, [sp] mov r0, #0xff @@ -707,7 +707,7 @@ asm static void ov62_02231C78 (UnkStruct_ov62_022323B8 * param0, UnkStruct_0208C ldr r2, [sp, #0x4c] add r0, r4, #0 add r1, r5, #0 - bl sub_0200C388 + bl StringFormatter_Format mov r1, #0 str r1, [sp] mov r0, #0xff @@ -1045,12 +1045,12 @@ static void ov62_022323CC (UnkStruct_ov62_02233310 * param0, UnkStruct_0208C06C v0 = Strbuf_Init(255, 102); v1 = MessageLoader_GetNewStrbuf(param1->unk_14.unk_34, 23); sub_0200BE08(v2, 0, v4, v5); - sub_0200C388(v2, v0, v1); + StringFormatter_Format(v2, v0, v1); } else { v0 = Strbuf_Init(255, 102); v1 = MessageLoader_GetNewStrbuf(param1->unk_14.unk_34, 22); sub_0200BDD0(v2, 0, v4); - sub_0200C388(v2, v0, v1); + StringFormatter_Format(v2, v0, v1); } Strbuf_Free(v1); @@ -1481,7 +1481,7 @@ asm void ov62_02232778 (UnkStruct_ov62_02233310 * param0, UnkStruct_0208C06C * p ldr r2, [sp, #0x4c] add r0, r5, #0 add r1, r7, #0 - bl sub_0200C388 + bl StringFormatter_Format ldr r0, [r4, #0x28] add r2, r7, #0 ldr r0, [r0, #8] @@ -1518,7 +1518,7 @@ asm void ov62_02232778 (UnkStruct_ov62_02233310 * param0, UnkStruct_0208C06C * p ldr r2, [sp, #0x2f8] add r0, r5, #0 add r1, r7, #0 - bl sub_0200C388 + bl StringFormatter_Format ldr r0, [r4, #0x28] add r2, r7, #0 ldr r0, [r0, #8] @@ -1923,7 +1923,7 @@ asm int ov62_02232C78 (UnkStruct_ov62_02233310 * param0, UnkStruct_0208C06C * pa ldr r2, [sp, #0x54] add r0, r5, #0 add r1, r7, #0 - bl sub_0200C388 + bl StringFormatter_Format ldr r0, [r4, #0x28] add r2, r7, #0 ldr r0, [r0, #8] @@ -1960,7 +1960,7 @@ asm int ov62_02232C78 (UnkStruct_ov62_02233310 * param0, UnkStruct_0208C06C * pa ldr r2, [sp, #0x2f8] add r0, r5, #0 add r1, r7, #0 - bl sub_0200C388 + bl StringFormatter_Format ldr r0, [r4, #0x28] add r2, r7, #0 ldr r0, [r0, #8] @@ -2854,7 +2854,7 @@ static void ov62_02233B50 (UnkStruct_ov62_02233F74 * param0, UnkStruct_0208C06C v8 = Strbuf_Init(255, 102); sub_0200B48C(v9, 0, v6, 0, 1, GAME_LANGUAGE); - sub_0200C388(v9, v8, v7); + StringFormatter_Format(v9, v8, v7); BGL_FillWindow(v10, 0x0); sub_0201D78C(v10, 0, v8, ov62_0223429C(v10, v8), 0, 0xff, ((u32)(((15 & 0xff) << 16) | ((13 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); sub_0201A9A4(v10); @@ -2887,7 +2887,7 @@ static void ov62_02233B50 (UnkStruct_ov62_02233F74 * param0, UnkStruct_0208C06C Strbuf_FormatInt(v6, v13, 4, 0, 1); sub_0200B48C(v9, 0, v6, 0, 1, GAME_LANGUAGE); - sub_0200C388(v9, v8, v7); + StringFormatter_Format(v9, v8, v7); BGL_FillWindow(v10, 0x0); sub_0201D78C(v10, 0, v8, ov62_0223429C(v10, v8), 0, 0xff, ((u32)(((15 & 0xff) << 16) | ((13 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); sub_0201A9A4(v10); @@ -2935,7 +2935,7 @@ static void ov62_02233B50 (UnkStruct_ov62_02233F74 * param0, UnkStruct_0208C06C sub_0200B48C(v9, 2, v17, 0, 1, GAME_LANGUAGE); sub_0200B48C(v9, 1, v18, 0, 1, GAME_LANGUAGE); sub_0200B48C(v9, 0, v19, 0, 1, GAME_LANGUAGE); - sub_0200C388(v9, v8, v7); + StringFormatter_Format(v9, v8, v7); BGL_FillWindow(v10, 0x0); sub_0201D78C(v10, 0, v8, ov62_0223429C(v10, v8), 0, 0xff, ((u32)(((15 & 0xff) << 16) | ((13 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); sub_0201A9A4(v10); diff --git a/src/overlay062/ov62_02237D24.c b/src/overlay062/ov62_02237D24.c index c7b489d482..92fcc89941 100644 --- a/src/overlay062/ov62_02237D24.c +++ b/src/overlay062/ov62_02237D24.c @@ -1439,7 +1439,7 @@ asm static void ov62_02239724 (UnkStruct_0208C06C * param0) ldr r0, [sp, #0x18] ldr r2, [sp, #0x1c] add r1, r7, #0 - bl sub_0200C388 + bl StringFormatter_Format add r0, r7, #0 bl Strbuf_NumLines mov r5, #0 @@ -1574,7 +1574,7 @@ asm static void ov62_02239854 (UnkStruct_0208C06C * param0, int param1) ldr r0, [sp, #0x18] ldr r2, [sp, #0x1c] add r1, r7, #0 - bl sub_0200C388 + bl StringFormatter_Format add r0, r7, #0 bl Strbuf_NumLines mov r5, #0 diff --git a/src/overlay062/ov62_02239D60.c b/src/overlay062/ov62_02239D60.c index e938c2bff8..2f07a5ef7f 100644 --- a/src/overlay062/ov62_02239D60.c +++ b/src/overlay062/ov62_02239D60.c @@ -987,7 +987,7 @@ static void ov62_0223AC58 (UnkStruct_0208C06C * param0, int param1) Strbuf_CopyChars(v3, v0->unk_38C[param0->unk_14.unk_48C.unk_38.unk_00]->unk_00.unk_00); ov62_022349A8(param0, v3); sub_0200B48C(v5, 0, v3, 0, 1, GAME_LANGUAGE); - sub_0200C388(v5, v4, v2); + StringFormatter_Format(v5, v4, v2); BGL_FillWindow(v1, Unk_ov62_02248D78[2]); sub_0201D78C(v1, 0, v4, 0, Unk_ov62_02248DA8[2], 0xff, Unk_ov62_02248D90[2], NULL); sub_0201A9A4(v1); diff --git a/src/overlay062/ov62_0223CAEC.c b/src/overlay062/ov62_0223CAEC.c index 3f950789bb..3e1741de66 100644 --- a/src/overlay062/ov62_0223CAEC.c +++ b/src/overlay062/ov62_0223CAEC.c @@ -755,7 +755,7 @@ asm static void ov62_0223D160 (UnkStruct_0208C06C * param0) ldr r1, [sp, #0x14] add r0, r6, #0 add r2, r7, #0 - bl sub_0200C388 + bl StringFormatter_Format mov r0, #0x10 str r0, [sp] mov r0, #0xff diff --git a/src/overlay062/ov62_0223DFA8.c b/src/overlay062/ov62_0223DFA8.c index b1aaefddd6..a3c50b7bf7 100644 --- a/src/overlay062/ov62_0223DFA8.c +++ b/src/overlay062/ov62_0223DFA8.c @@ -257,7 +257,7 @@ static void ov62_0223E0FC (UnkStruct_0208C06C * param0, int param1, int param2) ov62_022349A8(param0, v4); v5 = MessageLoader_GetNewStrbuf(param0->unk_14.unk_34, param1); sub_0200B48C(v3, 0, v4, 0, 1, GAME_LANGUAGE); - sub_0200C388(v3, v0, v5); + StringFormatter_Format(v3, v0, v5); Strbuf_Free(v4); Strbuf_Free(v5); sub_0200B3F0(v3); @@ -274,7 +274,7 @@ static void ov62_0223E0FC (UnkStruct_0208C06C * param0, int param1, int param2) v9 = MessageLoader_GetNewStrbuf(param0->unk_14.unk_34, param1); sub_0200B48C(v7, 0, v8, 0, 1, GAME_LANGUAGE); - sub_0200C388(v7, v0, v9); + StringFormatter_Format(v7, v0, v9); Strbuf_Free(v8); Strbuf_Free(v9); sub_0200B3F0(v7); @@ -841,7 +841,7 @@ static void ov62_0223EE88 (UnkStruct_ov62_022312B0 * param0, UnkStruct_0208C06C v0 = Strbuf_Init(255, 102); sub_0200B48C(v3, 0, v5, 0, 1, GAME_LANGUAGE); - sub_0200C388(v3, v0, v4); + StringFormatter_Format(v3, v0, v4); Strbuf_Free(v4); Strbuf_Free(v5); sub_0200B3F0(v3); @@ -1781,7 +1781,7 @@ static void ov62_022402FC (UnkStruct_0208C06C * param0, int param1, BOOL param2) ov62_022349A8(param0, v4); v5 = MessageLoader_GetNewStrbuf(param0->unk_14.unk_34, param1); sub_0200B48C(v3, 0, v4, 0, 1, GAME_LANGUAGE); - sub_0200C388(v3, v0, v5); + StringFormatter_Format(v3, v0, v5); Strbuf_Free(v4); Strbuf_Free(v5); sub_0200B3F0(v3); diff --git a/src/overlay062/ov62_02241204.c b/src/overlay062/ov62_02241204.c index e346d19db5..95e65a50a2 100644 --- a/src/overlay062/ov62_02241204.c +++ b/src/overlay062/ov62_02241204.c @@ -721,12 +721,12 @@ static void ov62_022419D4 (UnkStruct_0208C06C * param0, int param1, int param2) v2 = Strbuf_Init(255, 102); v3 = MessageLoader_GetNewStrbuf(param0->unk_14.unk_34, 23); sub_0200BE08(v4, 0, param1, param2); - sub_0200C388(v4, v2, v3); + StringFormatter_Format(v4, v2, v3); } else { v2 = Strbuf_Init(255, 102); v3 = MessageLoader_GetNewStrbuf(param0->unk_14.unk_34, 22); sub_0200BDD0(v4, 0, param1); - sub_0200C388(v4, v2, v3); + StringFormatter_Format(v4, v2, v3); } Strbuf_Free(v3); @@ -3137,7 +3137,7 @@ static void ov62_022448E0 (UnkStruct_ov62_022312B0 * param0, UnkStruct_0208C06C ov62_022349A8(param1, v5); v0 = Strbuf_Init(255, 102); sub_0200B48C(v3, 0, v5, 0, 1, GAME_LANGUAGE); - sub_0200C388(v3, v0, v4); + StringFormatter_Format(v3, v0, v4); Strbuf_Free(v4); Strbuf_Free(v5); sub_0200B3F0(v3); @@ -3174,7 +3174,7 @@ static void ov62_022449B8 (UnkStruct_0208C06C * param0, int param1, BOOL param2) ov62_022349A8(param0, v4); v5 = MessageLoader_GetNewStrbuf(param0->unk_14.unk_34, param1); sub_0200B48C(v3, 0, v4, 0, 1, GAME_LANGUAGE); - sub_0200C388(v3, v0, v5); + StringFormatter_Format(v3, v0, v5); Strbuf_Free(v4); Strbuf_Free(v5); sub_0200B3F0(v3); @@ -3206,7 +3206,7 @@ static void ov62_02244AB4 (UnkStruct_0208C06C * param0, int param1, int param2) ov62_022349A8(param0, v4); v5 = MessageLoader_GetNewStrbuf(param0->unk_14.unk_34, param1); sub_0200B48C(v3, 0, v4, 0, 1, GAME_LANGUAGE); - sub_0200C388(v3, v0, v5); + StringFormatter_Format(v3, v0, v5); Strbuf_Free(v4); Strbuf_Free(v5); sub_0200B3F0(v3); @@ -3222,7 +3222,7 @@ static void ov62_02244AB4 (UnkStruct_0208C06C * param0, int param1, int param2) ov62_022349A8(param0, v8); v9 = MessageLoader_GetNewStrbuf(param0->unk_14.unk_34, param1); sub_0200B48C(v7, 0, v8, 0, 1, GAME_LANGUAGE); - sub_0200C388(v7, v0, v9); + StringFormatter_Format(v7, v0, v9); Strbuf_Free(v8); Strbuf_Free(v9); sub_0200B3F0(v7); @@ -4723,7 +4723,7 @@ static void ov62_022469A0 (UnkStruct_ov62_02241204 * param0, UnkStruct_0208C06C sub_0200B48C(v3, 2, v8, 0, 1, GAME_LANGUAGE); sub_0200B48C(v3, 1, v9, 0, 1, GAME_LANGUAGE); sub_0200B48C(v3, 0, v10, 0, 1, GAME_LANGUAGE); - sub_0200C388(v3, v2, v1); + StringFormatter_Format(v3, v2, v1); BGL_FillWindow(v4, 0xCC); sub_0201D78C(v4, 0, v2, 0, 0, 0xff, ((u32)(((15 & 0xff) << 16) | ((13 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); sub_0201A9A4(v4); diff --git a/src/overlay062/ov62_02247D74.c b/src/overlay062/ov62_02247D74.c index 42daa9c8ee..06af39fee3 100644 --- a/src/overlay062/ov62_02247D74.c +++ b/src/overlay062/ov62_02247D74.c @@ -79,7 +79,7 @@ static void ov62_02247DD8 (UnkStruct_0208C06C * param0, int param1, int param2) v4 = MessageLoader_GetNewStrbuf(param0->unk_14.unk_34, param1); sub_0200B48C(v2, 0, v3, 0, 1, GAME_LANGUAGE); - sub_0200C388(v2, v0, v4); + StringFormatter_Format(v2, v0, v4); Strbuf_Free(v3); Strbuf_Free(v4); sub_0200B3F0(v2); diff --git a/src/overlay064/ov64_0222DCE0.c b/src/overlay064/ov64_0222DCE0.c index 4c3a2d6bf1..701fb97b66 100644 --- a/src/overlay064/ov64_0222DCE0.c +++ b/src/overlay064/ov64_0222DCE0.c @@ -1125,7 +1125,7 @@ static void ov64_0222E738 (UnkStruct_ov64_0222E21C * param0, u32 param1) BGL_FillWindow(¶m0->unk_220, 0); MessageLoader_GetStrbuf(param0->unk_218, param1, param0->unk_234); - sub_0200C388(param0->unk_214, param0->unk_230, param0->unk_234); + StringFormatter_Format(param0->unk_214, param0->unk_230, param0->unk_234); param0->unk_238 = sub_0201D78C(¶m0->unk_220, 1, param0->unk_230, 0, 4, 2, ((u32)(((15 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); @@ -1543,7 +1543,7 @@ asm static void ov64_0222EC94 (UnkStruct_ov64_0222F038 * param0, UnkStruct_ov64_ ldr r0, [r1, r0] ldr r2, [sp, #0x24] add r1, r4, #0 - bl sub_0200C388 + bl StringFormatter_Format mov r0, #0 add r1, r4, #0 add r2, r0, #0 @@ -1707,7 +1707,7 @@ static void ov64_0222EFBC (UnkStruct_ov64_0222F038 * param0, UnkStruct_ov64_0222 BGL_FillWindow(¶m0->unk_1C, 15); MessageLoader_GetStrbuf(param1->unk_218, param2, v0); - sub_0200C388(param1->unk_214, param0->unk_38, v0); + StringFormatter_Format(param1->unk_214, param0->unk_38, v0); param0->unk_30 = sub_0201D78C(¶m0->unk_1C, 1, param0->unk_38, 0, 0, param0->unk_34, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); @@ -2600,7 +2600,7 @@ static void ov64_0222FE70 (UnkStruct_ov64_0222F0C4 * param0, UnkStruct_ov64_0222 v0 = Strbuf_Init(128, param3); MessageLoader_GetStrbuf(param1->unk_218, param2, v0); - sub_0200C388(param1->unk_214, param0->unk_D4, v0); + StringFormatter_Format(param1->unk_214, param0->unk_D4, v0); param0->unk_D8 = sub_0201D78C(¶m0->unk_C4, 1, param0->unk_D4, 0, 0, param0->unk_DC, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); @@ -3080,7 +3080,7 @@ asm static void ov64_02230680 (UnkStruct_ov64_02230620 * param0, UnkStruct_ov64_ ldr r0, [r4, r0] ldr r2, [sp, #0x20] add r1, r6, #0 - bl sub_0200C388 + bl StringFormatter_Format mov r0, #0 add r1, r6, #0 add r2, r0, #0 @@ -5378,7 +5378,7 @@ asm static void ov64_022320B8 (UnkStruct_ov64_02230F98 * param0, u32 param1, u32 ldr r0, [r6, r0] ldr r2, [sp, #0x48] add r1, r4, #0 - bl sub_0200C388 + bl StringFormatter_Format ldr r0, [sp, #0x4c] cmp r0, #1 beq _022320F0 diff --git a/src/overlay065/ov65_0222DCE0.c b/src/overlay065/ov65_0222DCE0.c index 13d4049c61..9963495e85 100644 --- a/src/overlay065/ov65_0222DCE0.c +++ b/src/overlay065/ov65_0222DCE0.c @@ -3481,7 +3481,7 @@ static int ov65_0223128C (UnkStruct_ov65_0222EBE0 * param0, int param1) } else { sub_0200C0B0(param0->unk_164, 0, v0); MessageLoader_GetStrbuf(param0->unk_168, v3[v0].unk_00, param0->unk_170); - sub_0200C388(param0->unk_164, param0->unk_178, param0->unk_170); + StringFormatter_Format(param0->unk_164, param0->unk_178, param0->unk_170); sub_02013A6C(param0->unk_154, param0->unk_178, v3[v0].unk_04); } } @@ -4767,13 +4767,13 @@ static void ov65_02232B58 (UnkStruct_ov65_0222EBE0 * param0, int param1, BOOL pa MessageLoader_GetStrbuf(param0->unk_168, param1, param0->unk_170); } - sub_0200C388(param0->unk_164, param0->unk_174, param0->unk_170); + StringFormatter_Format(param0->unk_164, param0->unk_174, param0->unk_170); BGL_FillWindow(¶m0->unk_330, 15); sub_0200E060(¶m0->unk_330, 1, (512 - (18 + 12)), 10); sub_02002AC8(1); sub_02002AE4(0); - param0->unk_180 = sub_0201D738(¶m0->unk_330, 1, param0->unk_174, 0, 0, v0, NULL); + param0->unk_180 = PrintStringSimple(¶m0->unk_330, 1, param0->unk_174, 0, 0, v0, NULL); sub_0201A9A4(¶m0->unk_330); } @@ -4801,12 +4801,12 @@ static void ov65_02232CA8 (UnkStruct_ov65_0222EBE0 * param0, int param1) BGL_AddWindow(param0->unk_15C, ¶m0->unk_360, 2, 4, 4, 23, 16, 12, (((512 - (18 + 12)) - 9) - (23 * 16))); MessageLoader_GetStrbuf(param0->unk_16C, param1, param0->unk_170); - sub_0200C388(param0->unk_164, param0->unk_174, param0->unk_170); + StringFormatter_Format(param0->unk_164, param0->unk_174, param0->unk_170); BGL_FillWindow(¶m0->unk_360, 15); Window_Show(¶m0->unk_360, 1, ((512 - (18 + 12)) - 9), 11); - param0->unk_180 = sub_0201D738(¶m0->unk_360, 1, param0->unk_174, 0, 0, 0xff, NULL); + param0->unk_180 = PrintStringSimple(¶m0->unk_360, 1, param0->unk_174, 0, 0, 0xff, NULL); sub_0201A9A4(¶m0->unk_360); } @@ -5434,7 +5434,7 @@ asm static void ov65_02233940 (UnkStruct_ov65_0222EBE0 * param0, u32 param1) sub r2, #8 ldr r0, [r5, r0] ldr r2, [r5, r2] - bl sub_0200C388 + bl StringFormatter_Format mov r0, #8 str r0, [sp] mov r2, #0xff @@ -5533,7 +5533,7 @@ asm static void ov65_02233940 (UnkStruct_ov65_0222EBE0 * param0, u32 param1) sub r2, #8 ldr r0, [r5, r0] ldr r2, [r5, r2] - bl sub_0200C388 + bl StringFormatter_Format mov r1, #0x5e lsl r1, r1, #2 mov r0, #0 @@ -5603,7 +5603,7 @@ asm static void ov65_02233940 (UnkStruct_ov65_0222EBE0 * param0, u32 param1) sub r2, #8 ldr r0, [r5, r0] ldr r2, [r5, r2] - bl sub_0200C388 + bl StringFormatter_Format mov r0, #0x38 str r0, [sp] mov r2, #0xff @@ -5645,7 +5645,7 @@ asm static void ov65_02233940 (UnkStruct_ov65_0222EBE0 * param0, u32 param1) sub r2, #8 ldr r0, [r5, r0] ldr r2, [r5, r2] - bl sub_0200C388 + bl StringFormatter_Format mov r1, #0x5e lsl r1, r1, #2 mov r0, #0 @@ -5715,7 +5715,7 @@ asm static void ov65_02233940 (UnkStruct_ov65_0222EBE0 * param0, u32 param1) sub r2, #8 ldr r0, [r5, r0] ldr r2, [r5, r2] - bl sub_0200C388 + bl StringFormatter_Format mov r1, #0x5e lsl r1, r1, #2 mov r0, #0 @@ -5789,7 +5789,7 @@ asm static void ov65_02233940 (UnkStruct_ov65_0222EBE0 * param0, u32 param1) sub r2, #8 ldr r0, [r5, r0] ldr r2, [r5, r2] - bl sub_0200C388 + bl StringFormatter_Format mov r1, #0x5e lsl r1, r1, #2 mov r0, #0 @@ -5886,7 +5886,7 @@ asm static void ov65_02233940 (UnkStruct_ov65_0222EBE0 * param0, u32 param1) sub r2, #8 ldr r0, [r5, r0] ldr r2, [r5, r2] - bl sub_0200C388 + bl StringFormatter_Format mov r1, #0x5e lsl r1, r1, #2 mov r0, #0 @@ -6369,7 +6369,7 @@ static void ov65_0223449C (UnkStruct_ov65_0222EBE0 * param0, u32 param1) { sub_0200C0B0(param0->unk_BE0.unk_00, 0, UnkEnum_ov66_022324D0_00); MessageLoader_GetStrbuf(param0->unk_168, 71, param0->unk_170); - sub_0200C388(param0->unk_BE0.unk_00, param0->unk_178, param0->unk_170); + StringFormatter_Format(param0->unk_BE0.unk_00, param0->unk_178, param0->unk_170); sub_0201D78C(¶m0->unk_BE0.unk_1FC, 0, param0->unk_178, 8, 24, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); ov65_02234708(param0, 72, sub_0202AD2C(v1, v0, 10), 164, 24); } @@ -6377,7 +6377,7 @@ static void ov65_0223449C (UnkStruct_ov65_0222EBE0 * param0, u32 param1) { sub_0200C0B0(param0->unk_BE0.unk_00, 0, UnkEnum_ov66_022324D0_01); MessageLoader_GetStrbuf(param0->unk_168, 71, param0->unk_170); - sub_0200C388(param0->unk_BE0.unk_00, param0->unk_178, param0->unk_170); + StringFormatter_Format(param0->unk_BE0.unk_00, param0->unk_178, param0->unk_170); sub_0201D78C(¶m0->unk_BE0.unk_1FC, 0, param0->unk_178, 8, 48, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); ov65_02234708(param0, 72, sub_0202AD2C(v1, v0, 11), 164, 48); } @@ -6385,7 +6385,7 @@ static void ov65_0223449C (UnkStruct_ov65_0222EBE0 * param0, u32 param1) { sub_0200C0B0(param0->unk_BE0.unk_00, 0, UnkEnum_ov66_022324D0_02); MessageLoader_GetStrbuf(param0->unk_168, 71, param0->unk_170); - sub_0200C388(param0->unk_BE0.unk_00, param0->unk_178, param0->unk_170); + StringFormatter_Format(param0->unk_BE0.unk_00, param0->unk_178, param0->unk_170); sub_0201D78C(¶m0->unk_BE0.unk_1FC, 0, param0->unk_178, 8, 72, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); ov65_02234708(param0, 72, sub_0202AD2C(v1, v0, 12), 164, 72); } @@ -6443,7 +6443,7 @@ static void ov65_02234708 (UnkStruct_ov65_0222EBE0 * param0, u32 param1, u32 par { sub_0200B60C(param0->unk_BE0.unk_00, 0, param2, 4, 1, 1); MessageLoader_GetStrbuf(param0->unk_168, param1, param0->unk_170); - sub_0200C388(param0->unk_BE0.unk_00, param0->unk_178, param0->unk_170); + StringFormatter_Format(param0->unk_BE0.unk_00, param0->unk_178, param0->unk_170); { u32 v0 = param3 - (sub_02002D7C(0, param0->unk_178, 0) + 1) / 2; @@ -6579,7 +6579,7 @@ static void ov65_02234900 (UnkStruct_ov65_0222EBE0 * param0, Window * param1, u3 ov65_02234F68(param0, param2 - 1); MessageLoader_GetStrbuf(param0->unk_168, 42, param0->unk_170); - sub_0200C388(param0->unk_BE0.unk_00, param0->unk_178, param0->unk_170); + StringFormatter_Format(param0->unk_BE0.unk_00, param0->unk_178, param0->unk_170); sub_0201D78C(param1, 1, param0->unk_178, 0, v2, 0xff, v1, NULL); sub_0201A9A4(param1); } diff --git a/src/overlay065/ov65_0223648C.c b/src/overlay065/ov65_0223648C.c index af68aadf37..10d6e024c8 100644 --- a/src/overlay065/ov65_0223648C.c +++ b/src/overlay065/ov65_0223648C.c @@ -835,7 +835,7 @@ static void ov65_02236C7C (UnkStruct_ov65_02236840 * param0, const UnkStruct_020 } MessageLoader_GetStrbuf(param0->unk_08, Unk_ov65_02239E5C[param1->unk_00], param0->unk_10); - sub_0200C388(param0->unk_04, param0->unk_0C, param0->unk_10); + StringFormatter_Format(param0->unk_04, param0->unk_0C, param0->unk_10); sub_0201D78C(¶m0->unk_200, 0, param0->unk_0C, 0, 0, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((15 & 0xff) << 0))), NULL); sub_0201A9A4(¶m0->unk_200); sub_0201A9A4(¶m0->unk_220); @@ -916,7 +916,7 @@ static void ov65_02236E50 (UnkStruct_ov65_02236840 * param0, const UnkStruct_020 v0 = Strbuf_Init(256, param4); MessageLoader_GetStrbuf(param0->unk_08, param2, v0); - sub_0200C388(param0->unk_04, param0->unk_0C, v0); + StringFormatter_Format(param0->unk_04, param0->unk_0C, v0); param0->unk_14 = sub_0201D78C(¶m0->unk_1F0, 1, param0->unk_0C, 0, 0, param0->unk_16, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((15 & 0xff) << 0))), NULL); @@ -980,7 +980,7 @@ static void ov65_02236F70 (UnkStruct_ov65_02236840 * param0, const UnkStruct_020 ov65_02237284(param0, param1, param2, 1, param3); MessageLoader_GetStrbuf(param0->unk_08, 131, v0); - sub_0200C388(param0->unk_04, v1, v0); + StringFormatter_Format(param0->unk_04, v1, v0); BGL_FillWindow(¶m0->unk_230, 15); sub_0201D78C(¶m0->unk_230, 0, v1, 0, 0, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((15 & 0xff) << 0))), NULL); @@ -1032,14 +1032,14 @@ static void ov65_0223709C (UnkStruct_ov65_022367A8 * param0, UnkStruct_ov65_0223 ov65_0223726C(param1, param2, param3, 0, param4); MessageLoader_GetStrbuf(param1->unk_08, 129, v0); - sub_0200C388(param1->unk_04, v1, v0); + StringFormatter_Format(param1->unk_04, v1, v0); BGL_WindowColor(¶m1->unk_220, 15, 0, param3 * (2 * 8), (20 * 8), (2 * 8)); sub_0201D78C(¶m1->unk_220, 0, v1, 0, param3 * (2 * 8), 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((15 & 0xff) << 0))), NULL); ov65_02237284(param1, param2, param3, 0, param4); MessageLoader_GetStrbuf(param1->unk_08, 130, v0); - sub_0200C388(param1->unk_04, v1, v0); + StringFormatter_Format(param1->unk_04, v1, v0); sub_0201D78C(¶m1->unk_220, 0, v1, 72, param3 * (2 * 8), 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((15 & 0xff) << 0))), NULL); sub_0201A9A4(¶m1->unk_220); @@ -1520,7 +1520,7 @@ static void ov65_022378C4 (UnkStruct_ov65_022367A8 * param0, const UnkStruct_020 return; } - sub_0200EBA0(param0->unk_30.unk_24C); + DeleteWaitDial(param0->unk_30.unk_24C); param0->unk_30.unk_24C = NULL; v0 = sub_02027B50(sub_02025E44(param1->unk_08)); diff --git a/src/overlay066/ov66_0223177C.c b/src/overlay066/ov66_0223177C.c index f79d65767b..2adc5c72a0 100644 --- a/src/overlay066/ov66_0223177C.c +++ b/src/overlay066/ov66_0223177C.c @@ -742,7 +742,7 @@ static BOOL ov66_02232068 (UnkStruct_ov66_02231FB0 * param0, const UnkStruct_ov6 v0 = MessageLoader_GetNewStrbuf(param3, 7); - sub_0200C388(param2, param4, v0); + StringFormatter_Format(param2, param4, v0); Strbuf_Free(v0); return 1; @@ -758,7 +758,7 @@ static BOOL ov66_022320BC (UnkStruct_ov66_02231FB0 * param0, const UnkStruct_ov6 v0 = MessageLoader_GetNewStrbuf(param3, 8); - sub_0200C388(param2, param4, v0); + StringFormatter_Format(param2, param4, v0); Strbuf_Free(v0); return 1; @@ -804,7 +804,7 @@ static BOOL ov66_0223211C (UnkStruct_ov66_02231FB0 * param0, const UnkStruct_ov6 v0 = MessageLoader_GetNewStrbuf(param3, 5); } - sub_0200C388(param2, param4, v0); + StringFormatter_Format(param2, param4, v0); Strbuf_Free(v0); return 1; @@ -820,7 +820,7 @@ static BOOL ov66_02232258 (UnkStruct_ov66_02231FB0 * param0, const UnkStruct_ov6 v0 = MessageLoader_GetNewStrbuf(param3, 9); - sub_0200C388(param2, param4, v0); + StringFormatter_Format(param2, param4, v0); Strbuf_Free(v0); return 1; @@ -844,7 +844,7 @@ static BOOL ov66_022322B8 (UnkStruct_ov66_02231FB0 * param0, const UnkStruct_ov6 v0 = MessageLoader_GetNewStrbuf(param3, 10 + (4 - param0->unk_04[0])); - sub_0200C388(param2, param4, v0); + StringFormatter_Format(param2, param4, v0); Strbuf_Free(v0); return 1; @@ -879,7 +879,7 @@ static BOOL ov66_02232330 (UnkStruct_ov66_02231FB0 * param0, const UnkStruct_ov6 v0 = MessageLoader_GetNewStrbuf(param3, v1); - sub_0200C388(param2, param4, v0); + StringFormatter_Format(param2, param4, v0); Strbuf_Free(v0); return 1; @@ -928,7 +928,7 @@ static BOOL ov66_022323C4 (UnkStruct_ov66_02231FB0 * param0, const UnkStruct_ov6 v0 = MessageLoader_GetNewStrbuf(param3, v3[param0->unk_04[1] - 1]); } - sub_0200C388(param2, param4, v0); + StringFormatter_Format(param2, param4, v0); Strbuf_Free(v0); return 1; diff --git a/src/overlay067/ov67_0225C700.c b/src/overlay067/ov67_0225C700.c index c29b0122ae..4fcf9d3343 100644 --- a/src/overlay067/ov67_0225C700.c +++ b/src/overlay067/ov67_0225C700.c @@ -664,8 +664,8 @@ static void ov67_0225D210 (UnkStruct_ov67_0225D210 * param0, u32 param1) BGL_FillWindow(¶m0->unk_08, 15); MessageLoader_GetStrbuf(param0->unk_04, param1, param0->unk_1C); - sub_0200C388(param0->unk_00, param0->unk_18, param0->unk_1C); - sub_0201D738(¶m0->unk_08, 1, param0->unk_18, 0, 0, 0xff, NULL); + StringFormatter_Format(param0->unk_00, param0->unk_18, param0->unk_1C); + PrintStringSimple(¶m0->unk_08, 1, param0->unk_18, 0, 0, 0xff, NULL); if (param0->unk_20 == 0) { Window_Show(¶m0->unk_08, 1, (1 + (18 + 12)), 14); @@ -707,7 +707,7 @@ static void ov67_0225D310 (UnkStruct_ov67_0225D210 * param0) { if (param0->unk_20 == 1) { GF_ASSERT(param0->unk_24 != NULL); - sub_0200EBA0(param0->unk_24); + DeleteWaitDial(param0->unk_24); param0->unk_24 = NULL; } } @@ -733,7 +733,7 @@ static void ov67_0225D37C (UnkStruct_ov67_0225D210 * param0, u32 param1) { BGL_FillWindow(¶m0->unk_08, 0); MessageLoader_GetStrbuf(param0->unk_04, param1, param0->unk_1C); - sub_0200C388(param0->unk_00, param0->unk_18, param0->unk_1C); + StringFormatter_Format(param0->unk_00, param0->unk_18, param0->unk_1C); sub_0201D78C(¶m0->unk_08, 1, param0->unk_18, sub_02002EEC(0, param0->unk_18, 0, 0xB0), 0, 0, 0xF0E00, 0); } diff --git a/src/overlay068/ov68_0225C700.c b/src/overlay068/ov68_0225C700.c index 08a94ce35d..6622f07983 100644 --- a/src/overlay068/ov68_0225C700.c +++ b/src/overlay068/ov68_0225C700.c @@ -609,7 +609,7 @@ static Strbuf* ov68_0225CBEC (UnkStruct_ov68_0225CB70 * param0, u32 param1, u32 GF_ASSERT(param1 < 9); MessageLoader_GetStrbuf(param0->unk_00[param1], param2, param0->unk_2C); - sub_0200C388(param0->unk_24, param0->unk_28, param0->unk_2C); + StringFormatter_Format(param0->unk_24, param0->unk_28, param0->unk_2C); return param0->unk_28; } @@ -976,7 +976,7 @@ static void ov68_0225D284 (UnkStruct_ov68_0225D128 * param0) static void ov68_0225D2A0 (UnkStruct_ov68_0225D128 * param0) { if (param0->unk_1C != NULL) { - sub_0200EBA0(param0->unk_1C); + DeleteWaitDial(param0->unk_1C); param0->unk_1C = NULL; } } diff --git a/src/overlay069/ov69_0225C700.c b/src/overlay069/ov69_0225C700.c index 0380f25657..b38c3a90ca 100644 --- a/src/overlay069/ov69_0225C700.c +++ b/src/overlay069/ov69_0225C700.c @@ -1995,7 +1995,7 @@ static void ov69_0225DDFC (UnkStruct_ov69_0225DDC8 * param0) sub_0200E060(¶m0->unk_10, 1, 1, 2); sub_0201A9A4(¶m0->unk_10); - param0->unk_04 = sub_0201D738(¶m0->unk_10, 1, param0->unk_0C, 0, 0, param0->unk_08, NULL); + param0->unk_04 = PrintStringSimple(¶m0->unk_10, 1, param0->unk_0C, 0, 0, param0->unk_08, NULL); param0->unk_00 = 0; } @@ -2053,7 +2053,7 @@ static void ov69_0225DEC0 (UnkStruct_ov69_0225E084 * param0, UnkStruct_ov69_0225 v1 = ov69_0225EF74(param2, 0); - sub_0201D738(¶m0->unk_1A8, 1, v1, 0, 0, 0xff, NULL); + PrintStringSimple(¶m0->unk_1A8, 1, v1, 0, 0, 0xff, NULL); sub_0200E060(¶m0->unk_1A8, 0, 10, 10); } @@ -2973,7 +2973,7 @@ static Strbuf* ov69_0225EF90 (UnkStruct_ov69_0225EF54 * param0, u32 param1) { MessageLoader_GetStrbuf(param0->unk_00, 3, param0->unk_0C); sub_0200BDD0(param0->unk_04, 0, param1); - sub_0200C388(param0->unk_04, param0->unk_08, param0->unk_0C); + StringFormatter_Format(param0->unk_04, param0->unk_08, param0->unk_0C); return param0->unk_08; } @@ -2983,7 +2983,7 @@ static Strbuf* ov69_0225EFB8 (UnkStruct_ov69_0225EF54 * param0, u32 param1, u32 sub_0200C41C(param0->unk_04); MessageLoader_GetStrbuf(param0->unk_00, 3, param0->unk_0C); sub_0200BE08(param0->unk_04, 0, param1, param2); - sub_0200C388(param0->unk_04, param0->unk_08, param0->unk_0C); + StringFormatter_Format(param0->unk_04, param0->unk_08, param0->unk_0C); return param0->unk_08; } diff --git a/src/overlay070/ov70_0225D9A4.c b/src/overlay070/ov70_0225D9A4.c index 7267d6a054..8f0d3a5941 100644 --- a/src/overlay070/ov70_0225D9A4.c +++ b/src/overlay070/ov70_0225D9A4.c @@ -1604,7 +1604,7 @@ static void ov70_0225EB08 (UnkStruct_ov70_0225E9C8 * param0) static void ov70_0225EB24 (UnkStruct_ov70_0225E9C8 * param0) { if (param0->unk_1C != NULL) { - sub_0200EBA0(param0->unk_1C); + DeleteWaitDial(param0->unk_1C); param0->unk_1C = NULL; } } @@ -1667,7 +1667,7 @@ static void ov70_0225EBC4 (UnkStruct_ov70_0225E9C8 * param0, const Strbuf *param BGL_FillWindow(¶m0->unk_00, 15); Strbuf_Copy(param0->unk_18, param1); - param0->unk_10 = sub_0201D738(¶m0->unk_00, 1, param0->unk_18, 0, 0, param0->unk_14, NULL); + param0->unk_10 = PrintStringSimple(¶m0->unk_00, 1, param0->unk_18, 0, 0, param0->unk_14, NULL); sub_0200E69C(¶m0->unk_00, 1, (1 + (18 + 12)), 2, 3); } @@ -2028,7 +2028,7 @@ static void ov70_0225F25C (UnkStruct_ov70_0225F208 * param0) static Strbuf* ov70_0225F288 (UnkStruct_ov70_0225F208 * param0, int param1, u32 param2) { MessageLoader_GetStrbuf(param0->unk_04[param1], param2, param0->unk_18); - sub_0200C388(param0->unk_00, param0->unk_14, param0->unk_18); + StringFormatter_Format(param0->unk_00, param0->unk_14, param0->unk_18); return param0->unk_14; } diff --git a/src/overlay071/ov71_0223C69C.c b/src/overlay071/ov71_0223C69C.c index 3675436288..4a7fabe5b3 100644 --- a/src/overlay071/ov71_0223C69C.c +++ b/src/overlay071/ov71_0223C69C.c @@ -108,7 +108,7 @@ void ov71_0223C6F0 (Window * param0, const UnkStruct_02072014 * param1) sub_0200B60C(v4, 5, param1->unk_1C, 6, 0, 1); MessageLoader_GetStrbuf(v1, 14, v3); - sub_0200C388(v4, v2, v3); + StringFormatter_Format(v4, v2, v3); v5 = (8 * 17) - sub_02002D7C(0, v2, 0); @@ -120,7 +120,7 @@ void ov71_0223C6F0 (Window * param0, const UnkStruct_02072014 * param1) sub_0200B60C(v4, 5, param1->unk_20, 3, 0, 1); MessageLoader_GetStrbuf(v1, 21, v3); - sub_0200C388(v4, v2, v3); + StringFormatter_Format(v4, v2, v3); v6 = (8 * 17) - sub_02002D7C(0, v2, 0); @@ -142,7 +142,7 @@ void ov71_0223C6F0 (Window * param0, const UnkStruct_02072014 * param1) MessageLoader_GetStrbuf(v1, 15, v3); } - sub_0200C388(v4, v2, v3); + StringFormatter_Format(v4, v2, v3); v7 = (8 * 28) - sub_02002D7C(0, v2, 0); sub_0201D78C(¶m0[5], 0, v2, v7, 0, 0, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | (((0 & 0xff) << 0)))), NULL); } @@ -154,7 +154,7 @@ void ov71_0223C6F0 (Window * param0, const UnkStruct_02072014 * param1) sub_0200C2E0(v4, 3, param1->unk_30); sub_0200B60C(v4, 4, param1->unk_31, 2, 2, 1); MessageLoader_GetStrbuf(v1, 17, v3); - sub_0200C388(v4, v2, v3); + StringFormatter_Format(v4, v2, v3); v8 = (8 * 28) - sub_02002D7C(0, v2, 0); @@ -316,7 +316,7 @@ asm void ov71_0223CA28 (Window * param0, const UnkStruct_02072014 * param1) ldr r2, [sp, #0x14] add r0, r4, #0 add r1, r5, #0 - bl sub_0200C388 + bl StringFormatter_Format b _0223CBA6 _0223CB6E: ldr r2, [sp, #0x14] @@ -367,7 +367,7 @@ asm void ov71_0223CA28 (Window * param0, const UnkStruct_02072014 * param1) ldr r2, [sp, #0x14] add r0, r4, #0 add r1, r5, #0 - bl sub_0200C388 + bl StringFormatter_Format mov r0, #0 add r1, r5, #0 add r2, r0, #0 @@ -402,7 +402,7 @@ asm void ov71_0223CA28 (Window * param0, const UnkStruct_02072014 * param1) ldr r2, [sp, #0x14] add r0, r4, #0 add r1, r5, #0 - bl sub_0200C388 + bl StringFormatter_Format mov r0, #0 add r1, r5, #0 add r2, r0, #0 @@ -494,7 +494,7 @@ asm void ov71_0223CA28 (Window * param0, const UnkStruct_02072014 * param1) ldr r2, [sp, #0x14] add r0, r4, #0 add r1, r5, #0 - bl sub_0200C388 + bl StringFormatter_Format mov r0, #0 add r1, r5, #0 add r2, r0, #0 @@ -573,7 +573,7 @@ void ov71_0223CDE8 (Window * param0, const UnkStruct_02072014 * param1, Strbuf * sub_0200B60C(v5, 0, sub_0202CC58(param1->unk_18), 3, 1, 1); sub_0200B60C(v5, 1, sub_0202CC5C(param1->unk_18), 2, 2, 1); MessageLoader_GetStrbuf(v2, 16, v4); - sub_0200C388(v5, v3, v4); + StringFormatter_Format(v5, v3, v4); v1 = (8 * 28) - sub_02002D7C(0, v3, 0); sub_0201D78C(¶m0[5], 0, v3, v1, 0, 0, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | (((0 & 0xff) << 0)))), NULL); diff --git a/src/overlay072/ov72_0223D7A0.c b/src/overlay072/ov72_0223D7A0.c index 69ceda43ff..68b84e2beb 100644 --- a/src/overlay072/ov72_0223D7A0.c +++ b/src/overlay072/ov72_0223D7A0.c @@ -1104,12 +1104,12 @@ static void ov72_0223E930 (UnkStruct_ov72_0223DB98 * param0, int param1) v0 = Strbuf_Init((40 * 2), 39); MessageLoader_GetStrbuf(param0->unk_14, param1, v0); - sub_0200C388(param0->unk_10, param0->unk_34, v0); + StringFormatter_Format(param0->unk_10, param0->unk_34, v0); Strbuf_Free(v0); BGL_FillWindow(¶m0->unk_338, 0xf0f); sub_0200E060(¶m0->unk_338, 0, 1, 10); - param0->unk_38 = sub_0201D738(¶m0->unk_338, 1, param0->unk_34, 0, 0, sub_02027AC0(param0->unk_0C), NULL); + param0->unk_38 = PrintStringSimple(¶m0->unk_338, 1, param0->unk_34, 0, 0, sub_02027AC0(param0->unk_0C), NULL); } static int ov72_0223E99C (int param0) diff --git a/src/overlay073/ov73_021D0D80.c b/src/overlay073/ov73_021D0D80.c index 7bf08d5696..795373f82b 100644 --- a/src/overlay073/ov73_021D0D80.c +++ b/src/overlay073/ov73_021D0D80.c @@ -727,11 +727,11 @@ static BOOL ov73_021D1510 (UnkStruct_ov73_021D1058 * param0, u32 param1, int par MessageLoader_GetStrbuf(param0->unk_4C, param1, v1); sub_0200B48C(param0->unk_64, 0, param0->unk_70->unk_18, param0->unk_84, 1, GAME_LANGUAGE); sub_0200B48C(param0->unk_64, 1, param0->unk_74->unk_18, 0, 1, GAME_LANGUAGE); - sub_0200C388(param0->unk_64, param0->unk_5C, v1); + StringFormatter_Format(param0->unk_64, param0->unk_5C, v1); Strbuf_Free(v1); } - param0->unk_58 = sub_0201D738(¶m0->unk_1C, 1, param0->unk_5C, 0, 0, (sub_02027AC0(param0->unk_08)), NULL); + param0->unk_58 = PrintStringSimple(¶m0->unk_1C, 1, param0->unk_5C, 0, 0, (sub_02027AC0(param0->unk_08)), NULL); param0->unk_50 = 1; break; case 1: diff --git a/src/overlay076/ov76_0223B870.c b/src/overlay076/ov76_0223B870.c index 9c3f1a3d03..d7f7f51143 100644 --- a/src/overlay076/ov76_0223B870.c +++ b/src/overlay076/ov76_0223B870.c @@ -950,7 +950,7 @@ void ov76_0223CA30 (Window * param0, int param1) v1 = MessageLoader_GetNewStrbuf(v0, param1); BGL_FillWindow(param0, 15); - sub_0201D738(param0, 1, v1, 0, 0, 0, NULL); + PrintStringSimple(param0, 1, v1, 0, 0, 0, NULL); sub_0201A954(param0); Strbuf_Free(v1); MessageLoader_Free(v0); @@ -1072,7 +1072,7 @@ void ov76_0223CDC4 (Window * param0, int param1) v1 = MessageLoader_GetNewStrbuf(v0, param1); BGL_FillWindow(param0, 15); - sub_0201D738(param0, 1, v1, 0, 0, 0, NULL); + PrintStringSimple(param0, 1, v1, 0, 0, 0, NULL); sub_0201A954(param0); Strbuf_Free(v1); MessageLoader_Free(v0); diff --git a/src/overlay079/ov79_021D183C.c b/src/overlay079/ov79_021D183C.c index 9da0c1dd82..ffc230c2ff 100644 --- a/src/overlay079/ov79_021D183C.c +++ b/src/overlay079/ov79_021D183C.c @@ -160,7 +160,7 @@ void ov79_021D196C (UnkStruct_ov79_021D0E1C * param0) sub_0200B48C(param0->unk_30.unk_00, 0, sub_02015918(param0->unk_28, v2->unk_02), 0, 0, GAME_LANGUAGE); sub_0200B60C(param0->unk_30.unk_00, 1, v2->unk_01, 2, 2, 1); - sub_0200C388(param0->unk_30.unk_00, param0->unk_30.unk_04, param0->unk_30.unk_0C); + StringFormatter_Format(param0->unk_30.unk_00, param0->unk_30.unk_04, param0->unk_30.unk_0C); sub_02013A6C(param0->unk_CC, param0->unk_30.unk_04, v2->unk_05); } @@ -360,7 +360,7 @@ static void ov79_021D1D94 (UnkStruct_0200112C * param0, u32 param1, u8 param2) } sub_0200B60C(v0->unk_30.unk_00, 0, v4, 2, 0, 1); - sub_0200C388(v0->unk_30.unk_00, v0->unk_30.unk_04, v0->unk_30.unk_10); + StringFormatter_Format(v0->unk_30.unk_00, v0->unk_30.unk_04, v0->unk_30.unk_10); sub_0201D78C(&v0->unk_E8[1], 0, v0->unk_30.unk_04, 8, 0, 0, v1, NULL); sub_0209933C(v0->unk_1F8, v0->unk_1FC, v0->unk_20->unk_1C[param1].unk_02); sub_0200D3F4(v0->unk_1FC->unk_04, 1); @@ -413,7 +413,7 @@ void ov79_021D1FBC (UnkStruct_ov79_021D0E1C * param0) { Strbuf_Clear(param0->unk_30.unk_04); sub_0200B48C(param0->unk_30.unk_00, 0, sub_02015918(param0->unk_28, param0->unk_20->unk_1C[param0->unk_1A].unk_02), 2, 1, GAME_LANGUAGE); - sub_0200C388(param0->unk_30.unk_00, param0->unk_30.unk_04, param0->unk_30.unk_14); + StringFormatter_Format(param0->unk_30.unk_00, param0->unk_30.unk_04, param0->unk_30.unk_14); ov79_021D1850(param0, param0->unk_30.unk_04, param0->unk_30.unk_4C, 1); } @@ -422,7 +422,7 @@ void ov79_021D2008 (UnkStruct_ov79_021D0E1C * param0) { Strbuf_Clear(param0->unk_30.unk_04); sub_0200B48C(param0->unk_30.unk_00, 0, sub_02015918(param0->unk_28, param0->unk_20->unk_1C[param0->unk_1A].unk_02), 2, 1, GAME_LANGUAGE); - sub_0200C388(param0->unk_30.unk_00, param0->unk_30.unk_04, param0->unk_30.unk_18); + StringFormatter_Format(param0->unk_30.unk_00, param0->unk_30.unk_04, param0->unk_30.unk_18); ov79_021D1850(param0, param0->unk_30.unk_04, param0->unk_30.unk_4C, 0); } diff --git a/src/overlay079/ov79_021D2268.c b/src/overlay079/ov79_021D2268.c index e223cc7869..d15ab601cf 100644 --- a/src/overlay079/ov79_021D2268.c +++ b/src/overlay079/ov79_021D2268.c @@ -738,7 +738,7 @@ static int ov79_021D2B94 (UnkStruct_ov79_021D2928 * param0) BGL_FillWindow(¶m0->unk_6C, ((15 << 4) | 15)); Strbuf_Clear(param0->unk_1C.unk_04); sub_0200B48C(param0->unk_1C.unk_00, 0, param0->unk_30.unk_0C, 2, 1, GAME_LANGUAGE); - sub_0200C388(param0->unk_1C.unk_00, param0->unk_1C.unk_04, param0->unk_1C.unk_08[param0->unk_30.unk_09]); + StringFormatter_Format(param0->unk_1C.unk_00, param0->unk_1C.unk_04, param0->unk_1C.unk_08[param0->unk_30.unk_09]); param0->unk_0C = sub_0201D78C(¶m0->unk_6C, 1, param0->unk_1C.unk_04, 0, 0, param0->unk_10->unk_0A, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | (((15 & 0xff) << 0)))), NULL); param0->unk_0E = 0; diff --git a/src/overlay080/ov80_021D1458.c b/src/overlay080/ov80_021D1458.c index 9efb8010b7..c3e9d3d138 100644 --- a/src/overlay080/ov80_021D1458.c +++ b/src/overlay080/ov80_021D1458.c @@ -371,7 +371,7 @@ int ov80_021D1758 (UnkStruct_ov80_021D2A08 * param0) sub_0200E69C(v1, 1, (((((1023 - (21 * 4)) - (28 * 4)) - (28 * 14)) - (10 * 2)) - 100), (15 - 1), v2->unk_04); BGL_FillWindow(v1, 15); - sub_0201D738(v1, 1, param0->unk_88, 0, 0, 0xff, NULL); + PrintStringSimple(v1, 1, param0->unk_88, 0, 0, 0xff, NULL); sub_0201A954(v1); sub_0201A954(&v0->unk_28[3]); diff --git a/src/overlay081/ov81_021D1610.c b/src/overlay081/ov81_021D1610.c index 94823ecee2..da4fc71ee3 100644 --- a/src/overlay081/ov81_021D1610.c +++ b/src/overlay081/ov81_021D1610.c @@ -160,7 +160,7 @@ static u8 ov81_021D16B0 (UnkStruct_ov81_021D1610 * param0, Window * param1, Wind sub_0200C2E0(param0->unk_54, 0, v0.unk_00_7); sub_0200B60C(param0->unk_54, 1, v0.unk_00_14, 2, 0, 1); - sub_0200C388(param0->unk_54, param0->unk_58, v1); + StringFormatter_Format(param0->unk_54, param0->unk_58, v1); Strbuf_Free(v1); sub_0201D78C(param1, 0, param0->unk_58, 0, 0, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); @@ -172,7 +172,7 @@ static u8 ov81_021D16B0 (UnkStruct_ov81_021D1610 * param0, Window * param1, Wind v1 = MessageLoader_GetNewStrbuf(param0->unk_50, 0); sub_0200B8C8(param0->unk_54, 0, sub_0203A138(v0.unk_00_19)); - sub_0200C388(param0->unk_54, param0->unk_58, v1); + StringFormatter_Format(param0->unk_54, param0->unk_58, v1); sub_0201D78C(param2, 0, param0->unk_58, 0, 0, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); Strbuf_Free(v1); @@ -345,7 +345,7 @@ static void ov81_021D1AD4 (UnkStruct_ov81_021D1610 * param0, Window * param1) if (TrainerData_LoadParam(v0.unk_00_1, 1) == 63) { v3 = MessageLoader_GetNewStrbuf(param0->unk_50, 61); sub_0200B4BC(param0->unk_54, 1, param0->unk_4C); - sub_0200C388(param0->unk_54, param0->unk_58, v3); + StringFormatter_Format(param0->unk_54, param0->unk_58, v3); v2 += Strbuf_Length(param0->unk_58); Strbuf_Free(v3); } else { @@ -367,7 +367,7 @@ static void ov81_021D1AD4 (UnkStruct_ov81_021D1610 * param0, Window * param1) } sub_0200B8C8(param0->unk_54, 0, sub_0203A138(v0.unk_02)); - sub_0200C388(param0->unk_54, param0->unk_58, v1); + StringFormatter_Format(param0->unk_54, param0->unk_58, v1); sub_0201D78C(param1, 0, param0->unk_58, 0, ((16 * 4 + 16) + 16), 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); Strbuf_Free(v1); } @@ -531,7 +531,7 @@ static void ov81_021D1FE4 (UnkStruct_ov81_021D1610 * param0, Window * param1, Un Strbuf* v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 17); sub_0200BD60(param0->unk_54, 0, param2->unk_02); - sub_0200C388(param0->unk_54, param0->unk_58, v0); + StringFormatter_Format(param0->unk_54, param0->unk_58, v0); sub_0201D78C(param1, 0, param0->unk_58, 0, 16 + param3 * 16, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); Strbuf_Free(v0); } @@ -542,7 +542,7 @@ static void ov81_021D2038 (UnkStruct_ov81_021D1610 * param0, Window * param1, Un sub_0200BD60(param0->unk_54, 0, param2->unk_02); sub_0200BA08(param0->unk_54, 1, param2->unk_04); - sub_0200C388(param0->unk_54, param0->unk_58, v0); + StringFormatter_Format(param0->unk_54, param0->unk_58, v0); sub_0201D78C(param1, 0, param0->unk_58, 0, 16 + param3 * 16, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); Strbuf_Free(v0); } @@ -552,7 +552,7 @@ static void ov81_021D2098 (UnkStruct_ov81_021D1610 * param0, Window * param1, Un Strbuf* v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 19); sub_0200BA08(param0->unk_54, 0, param2->unk_04); - sub_0200C388(param0->unk_54, param0->unk_58, v0); + StringFormatter_Format(param0->unk_54, param0->unk_58, v0); sub_0201D78C(param1, 0, param0->unk_58, 0, 16 + param3 * 16, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); Strbuf_Free(v0); } @@ -562,7 +562,7 @@ static void ov81_021D20EC (UnkStruct_ov81_021D1610 * param0, Window * param1, Un Strbuf* v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 20); sub_0200BA08(param0->unk_54, 0, param2->unk_04); - sub_0200C388(param0->unk_54, param0->unk_58, v0); + StringFormatter_Format(param0->unk_54, param0->unk_58, v0); sub_0201D78C(param1, 0, param0->unk_58, 0, 16 + param3 * 16, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); Strbuf_Free(v0); } @@ -572,7 +572,7 @@ static void ov81_021D2140 (UnkStruct_ov81_021D1610 * param0, Window * param1, Un Strbuf* v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 21); sub_0200B8C8(param0->unk_54, 0, sub_0203A138(param2->unk_02)); - sub_0200C388(param0->unk_54, param0->unk_58, v0); + StringFormatter_Format(param0->unk_54, param0->unk_58, v0); sub_0201D78C(param1, 0, param0->unk_58, 0, 16 + param3 * 16, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); Strbuf_Free(v0); } @@ -591,7 +591,7 @@ static void ov81_021D219C (UnkStruct_ov81_021D1610 * param0, Window * param1, Un } sub_0200B8C8(param0->unk_54, 0, v1); - sub_0200C388(param0->unk_54, param0->unk_58, v0); + StringFormatter_Format(param0->unk_54, param0->unk_58, v0); sub_0201D78C(param1, 0, param0->unk_58, 0, 16 + param3 * 16, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); Strbuf_Free(v0); } @@ -610,7 +610,7 @@ static void ov81_021D2208 (UnkStruct_ov81_021D1610 * param0, Window * param1, Un } sub_0200B8C8(param0->unk_54, 0, v1); - sub_0200C388(param0->unk_54, param0->unk_58, v0); + StringFormatter_Format(param0->unk_54, param0->unk_58, v0); sub_0201D78C(param1, 0, param0->unk_58, 0, 16 + param3 * 16, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); Strbuf_Free(v0); } @@ -636,7 +636,7 @@ static void ov81_021D22E8 (UnkStruct_ov81_021D1610 * param0, Window * param1, Un Strbuf* v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 34); sub_0200B70C(param0->unk_54, 0, param2->unk_06); - sub_0200C388(param0->unk_54, param0->unk_58, v0); + StringFormatter_Format(param0->unk_54, param0->unk_58, v0); sub_0201D78C(param1, 0, param0->unk_58, 0, 16 + param3 * 16, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); Strbuf_Free(v0); } @@ -646,7 +646,7 @@ static void ov81_021D233C (UnkStruct_ov81_021D1610 * param0, Window * param1, Un Strbuf* v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 40); sub_0200B8C8(param0->unk_54, 0, sub_0203A138(param2->unk_02)); - sub_0200C388(param0->unk_54, param0->unk_58, v0); + StringFormatter_Format(param0->unk_54, param0->unk_58, v0); sub_0201D78C(param1, 0, param0->unk_58, 0, 16 + param3 * 16, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); Strbuf_Free(v0); } @@ -656,7 +656,7 @@ static void ov81_021D2398 (UnkStruct_ov81_021D1610 * param0, Window * param1, Un Strbuf* v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 35); sub_0200B8C8(param0->unk_54, 0, sub_0203A138(param2->unk_02)); - sub_0200C388(param0->unk_54, param0->unk_58, v0); + StringFormatter_Format(param0->unk_54, param0->unk_58, v0); sub_0201D78C(param1, 0, param0->unk_58, 0, 16 + param3 * 16, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); Strbuf_Free(v0); } @@ -666,7 +666,7 @@ static void ov81_021D23F4 (UnkStruct_ov81_021D1610 * param0, Window * param1, Un Strbuf* v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 36); sub_0200B8C8(param0->unk_54, 0, sub_0203A138(param2->unk_02)); - sub_0200C388(param0->unk_54, param0->unk_58, v0); + StringFormatter_Format(param0->unk_54, param0->unk_58, v0); sub_0201D78C(param1, 0, param0->unk_58, 0, 16 + param3 * 16, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); Strbuf_Free(v0); } @@ -676,7 +676,7 @@ static void ov81_021D2450 (UnkStruct_ov81_021D1610 * param0, Window * param1, Un Strbuf* v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 43); sub_0200B8C8(param0->unk_54, 0, sub_0203A138(param2->unk_02)); - sub_0200C388(param0->unk_54, param0->unk_58, v0); + StringFormatter_Format(param0->unk_54, param0->unk_58, v0); sub_0201D78C(param1, 0, param0->unk_58, 0, 16 + param3 * 16, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); Strbuf_Free(v0); } @@ -686,7 +686,7 @@ static void ov81_021D24AC (UnkStruct_ov81_021D1610 * param0, Window * param1, Un Strbuf* v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 38); sub_0200B8C8(param0->unk_54, 0, sub_0203A138(param2->unk_02)); - sub_0200C388(param0->unk_54, param0->unk_58, v0); + StringFormatter_Format(param0->unk_54, param0->unk_58, v0); sub_0201D78C(param1, 0, param0->unk_58, 0, 16 + param3 * 16, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); Strbuf_Free(v0); } @@ -696,7 +696,7 @@ static void ov81_021D2508 (UnkStruct_ov81_021D1610 * param0, Window * param1, Un Strbuf* v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 37); sub_0200B8C8(param0->unk_54, 0, sub_0203A138(param2->unk_02)); - sub_0200C388(param0->unk_54, param0->unk_58, v0); + StringFormatter_Format(param0->unk_54, param0->unk_58, v0); sub_0201D78C(param1, 0, param0->unk_58, 0, 16 + param3 * 16, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); Strbuf_Free(v0); } @@ -706,7 +706,7 @@ static void ov81_021D2564 (UnkStruct_ov81_021D1610 * param0, Window * param1, Un Strbuf* v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 42); sub_0200B8C8(param0->unk_54, 0, sub_0203A138(param2->unk_02)); - sub_0200C388(param0->unk_54, param0->unk_58, v0); + StringFormatter_Format(param0->unk_54, param0->unk_58, v0); sub_0201D78C(param1, 0, param0->unk_58, 0, 16 + param3 * 16, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); Strbuf_Free(v0); } @@ -716,7 +716,7 @@ static void ov81_021D25C0 (UnkStruct_ov81_021D1610 * param0, Window * param1, Un Strbuf* v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 41); sub_0200B8C8(param0->unk_54, 0, sub_0203A138(param2->unk_02)); - sub_0200C388(param0->unk_54, param0->unk_58, v0); + StringFormatter_Format(param0->unk_54, param0->unk_58, v0); sub_0201D78C(param1, 0, param0->unk_58, 0, 16 + param3 * 16, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); Strbuf_Free(v0); } @@ -726,7 +726,7 @@ static void ov81_021D261C (UnkStruct_ov81_021D1610 * param0, Window * param1, Un Strbuf* v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 39); sub_0200B8C8(param0->unk_54, 0, sub_0203A138(param2->unk_02)); - sub_0200C388(param0->unk_54, param0->unk_58, v0); + StringFormatter_Format(param0->unk_54, param0->unk_58, v0); sub_0201D78C(param1, 0, param0->unk_58, 0, 16 + param3 * 16, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); Strbuf_Free(v0); } @@ -736,7 +736,7 @@ static void ov81_021D2678 (UnkStruct_ov81_021D1610 * param0, Window * param1, Un Strbuf* v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 46); sub_0200B8C8(param0->unk_54, 0, sub_0203A138(param2->unk_02)); - sub_0200C388(param0->unk_54, param0->unk_58, v0); + StringFormatter_Format(param0->unk_54, param0->unk_58, v0); sub_0201D78C(param1, 0, param0->unk_58, 0, 16 + param3 * 16, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); Strbuf_Free(v0); } @@ -746,7 +746,7 @@ static void ov81_021D26D4 (UnkStruct_ov81_021D1610 * param0, Window * param1, Un Strbuf* v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 44); sub_0200B8C8(param0->unk_54, 0, sub_0203A138(param2->unk_02)); - sub_0200C388(param0->unk_54, param0->unk_58, v0); + StringFormatter_Format(param0->unk_54, param0->unk_58, v0); sub_0201D78C(param1, 0, param0->unk_58, 0, 16 + param3 * 16, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); Strbuf_Free(v0); } @@ -853,7 +853,7 @@ static void ov81_021D2908 (UnkStruct_ov81_021D1610 * param0, Window * param1, Un ov81_021D28C8(param0, param2->unk_02, param2->unk_01_6, 0); sub_0200BD98(param0->unk_54, 1, param2->unk_01_2); - sub_0200C388(param0->unk_54, param0->unk_58, v0); + StringFormatter_Format(param0->unk_54, param0->unk_58, v0); sub_0201D78C(param1, 0, param0->unk_58, 0, (16 * 4 + 16), 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); Strbuf_Free(v0); } @@ -882,7 +882,7 @@ static void ov81_021D29B4 (UnkStruct_ov81_021D1610 * param0, Window * param1, Un ov81_021D28C8(param0, param2->unk_02, param2->unk_01_6, 0); sub_0200BD98(param0->unk_54, 1, param2->unk_01_2); - sub_0200C388(param0->unk_54, param0->unk_58, v0); + StringFormatter_Format(param0->unk_54, param0->unk_58, v0); sub_0201D78C(param1, 0, param0->unk_58, 0, (16 * 4 + 16), 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); Strbuf_Free(v0); } @@ -914,7 +914,7 @@ static void ov81_021D2A9C (UnkStruct_ov81_021D1610 * param0, Window * param1, Un } ov81_021D2A60(param0, param2->unk_02, param2->unk_01_4, 0); - sub_0200C388(param0->unk_54, param0->unk_58, v0); + StringFormatter_Format(param0->unk_54, param0->unk_58, v0); sub_0201D78C(param1, 0, param0->unk_58, 0, (((16 * 4 + 16) + 16) + 16) + param3 * 16, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); Strbuf_Free(v0); } @@ -937,7 +937,7 @@ static void ov81_021D2B20 (UnkStruct_ov81_021D1610 * param0, Window * param1, Un } ov81_021D2A60(param0, param2->unk_02, param2->unk_01_4, 0); - sub_0200C388(param0->unk_54, param0->unk_58, v0); + StringFormatter_Format(param0->unk_54, param0->unk_58, v0); sub_0201D78C(param1, 0, param0->unk_58, 0, (((16 * 4 + 16) + 16) + 16) + param3 * 16, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); Strbuf_Free(v0); } @@ -961,7 +961,7 @@ static void ov81_021D2BA4 (UnkStruct_ov81_021D1610 * param0, Window * param1, Un ov81_021D2A60(param0, param2->unk_02, param2->unk_01_4, 0); ov81_021D2A60(param0, param2->unk_12, param2->unk_01_5, 1); - sub_0200C388(param0->unk_54, param0->unk_58, v0); + StringFormatter_Format(param0->unk_54, param0->unk_58, v0); sub_0201D78C(param1, 0, param0->unk_58, 0, (((16 * 4 + 16) + 16) + 16) + param3 * 16, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); Strbuf_Free(v0); } @@ -984,7 +984,7 @@ static void ov81_021D2C38 (UnkStruct_ov81_021D1610 * param0, Window * param1, Un } ov81_021D2A60(param0, param2->unk_02, param2->unk_01_4, 0); - sub_0200C388(param0->unk_54, param0->unk_58, v0); + StringFormatter_Format(param0->unk_54, param0->unk_58, v0); sub_0201D78C(param1, 0, param0->unk_58, 0, (((16 * 4 + 16) + 16) + 16) + param3 * 16, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); Strbuf_Free(v0); } @@ -1008,7 +1008,7 @@ static void ov81_021D2CBC (UnkStruct_ov81_021D1610 * param0, Window * param1, Un ov81_021D2A60(param0, param2->unk_02, param2->unk_01_4, 0); ov81_021D2A60(param0, param2->unk_12, param2->unk_01_5, 1); - sub_0200C388(param0->unk_54, param0->unk_58, v0); + StringFormatter_Format(param0->unk_54, param0->unk_58, v0); sub_0201D78C(param1, 0, param0->unk_58, 0, (((16 * 4 + 16) + 16) + 16) + param3 * 16, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); Strbuf_Free(v0); } @@ -1018,7 +1018,7 @@ static void ov81_021D2D50 (UnkStruct_ov81_021D1610 * param0, Window * param1, Un Strbuf* v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 77); ov81_021D2A60(param0, param2->unk_02, param2->unk_01_4, 0); - sub_0200C388(param0->unk_54, param0->unk_58, v0); + StringFormatter_Format(param0->unk_54, param0->unk_58, v0); sub_0201D78C(param1, 0, param0->unk_58, 0, (((16 * 4 + 16) + 16) + 16) + param3 * 16, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); Strbuf_Free(v0); } @@ -1029,7 +1029,7 @@ static void ov81_021D2DAC (UnkStruct_ov81_021D1610 * param0, Window * param1, Un ov81_021D2A60(param0, param2->unk_02, param2->unk_01_4, 0); ov81_021D2A60(param0, param2->unk_22, param2->unk_01_6, 1); - sub_0200C388(param0->unk_54, param0->unk_58, v0); + StringFormatter_Format(param0->unk_54, param0->unk_58, v0); sub_0201D78C(param1, 0, param0->unk_58, 0, (((16 * 4 + 16) + 16) + 16) + param3 * 16, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); Strbuf_Free(v0); } @@ -1047,7 +1047,7 @@ static void ov81_021D2E54 (UnkStruct_ov81_021D1610 * param0, Window * param1, Un Strbuf* v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 80); ov81_021D2A60(param0, param2->unk_22, param2->unk_01_6, 0); - sub_0200C388(param0->unk_54, param0->unk_58, v0); + StringFormatter_Format(param0->unk_54, param0->unk_58, v0); sub_0201D78C(param1, 0, param0->unk_58, 0, (((16 * 4 + 16) + 16) + 16) + param3 * 16, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); Strbuf_Free(v0); } @@ -1078,7 +1078,7 @@ static void ov81_021D2EEC (UnkStruct_ov81_021D1610 * param0, Window * param1, Un } ov81_021D2A60(param0, param2->unk_02, param2->unk_01_4, 0); - sub_0200C388(param0->unk_54, param0->unk_58, v0); + StringFormatter_Format(param0->unk_54, param0->unk_58, v0); sub_0201D78C(param1, 0, param0->unk_58, 0, (((16 * 4 + 16) + 16) + 16) + param3 * 16, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); Strbuf_Free(v0); } @@ -1096,7 +1096,7 @@ static void ov81_021D2FAC (UnkStruct_ov81_021D1610 * param0, Window * param1, Un Strbuf* v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 87); sub_0200B60C(param0->unk_54, 0, param2->unk_01_0, 1, 0, 1); - sub_0200C388(param0->unk_54, param0->unk_58, v0); + StringFormatter_Format(param0->unk_54, param0->unk_58, v0); sub_0201D78C(param1, 0, param0->unk_58, 0, (((16 * 4 + 16) + 16) + 16) + param3 * 16, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); Strbuf_Free(v0); } @@ -1115,7 +1115,7 @@ static void ov81_021D3048 (UnkStruct_ov81_021D1610 * param0, Window * param1, Un ov81_021D2A60(param0, param2->unk_02, param2->unk_01_4, 0); ov81_021D2A60(param0, param2->unk_22, param2->unk_01_6, 1); - sub_0200C388(param0->unk_54, param0->unk_58, v0); + StringFormatter_Format(param0->unk_54, param0->unk_58, v0); sub_0201D78C(param1, 0, param0->unk_58, 0, (((16 * 4 + 16) + 16) + 16) + param3 * 16, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); Strbuf_Free(v0); } @@ -1167,7 +1167,7 @@ static void ov81_021D3190 (UnkStruct_ov81_021D1610 * param0, Window * param1, Un Strbuf* v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 95); ov81_021D2A60(param0, param2->unk_02, param2->unk_01_4, 0); - sub_0200C388(param0->unk_54, param0->unk_58, v0); + StringFormatter_Format(param0->unk_54, param0->unk_58, v0); sub_0201D78C(param1, 0, param0->unk_58, 0, (((16 * 4 + 16) + 16) + 16) + param3 * 16, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); Strbuf_Free(v0); } @@ -1177,7 +1177,7 @@ static void ov81_021D31EC (UnkStruct_ov81_021D1610 * param0, Window * param1, Un Strbuf* v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 96); ov81_021D2A60(param0, param2->unk_02, param2->unk_01_4, 0); - sub_0200C388(param0->unk_54, param0->unk_58, v0); + StringFormatter_Format(param0->unk_54, param0->unk_58, v0); sub_0201D78C(param1, 0, param0->unk_58, 0, (((16 * 4 + 16) + 16) + 16) + param3 * 16, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); Strbuf_Free(v0); } @@ -1187,7 +1187,7 @@ static void ov81_021D3248 (UnkStruct_ov81_021D1610 * param0, Window * param1, Un Strbuf* v0 = MessageLoader_GetNewStrbuf(param0->unk_50, 97); sub_0200C0B0(param0->unk_54, 0, param2->unk_01_0); - sub_0200C388(param0->unk_54, param0->unk_58, v0); + StringFormatter_Format(param0->unk_54, param0->unk_58, v0); sub_0201D78C(param1, 0, param0->unk_58, 0, (((16 * 4 + 16) + 16) + 16) + param3 * 16, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); Strbuf_Free(v0); } diff --git a/src/overlay083/ov83_0223D6A8.c b/src/overlay083/ov83_0223D6A8.c index 7600f88be9..a4b5cf0137 100644 --- a/src/overlay083/ov83_0223D6A8.c +++ b/src/overlay083/ov83_0223D6A8.c @@ -570,7 +570,7 @@ void ov83_0223DF10 (UnkStruct_ov83_0223E138 * param0) void ov83_0223DF30 (UnkStruct_ov83_0223E138 * param0, int param1) { sub_0200B70C(param0->unk_18->unk_04, 0, param1); - sub_0200C388(param0->unk_18->unk_04, param0->unk_18->unk_08, param0->unk_18->unk_10); + StringFormatter_Format(param0->unk_18->unk_04, param0->unk_18->unk_08, param0->unk_18->unk_10); BGL_FillWindow(param0->unk_08, 15); ov83_0223E21C(param0->unk_08, param0->unk_18->unk_08, 0, 0); sub_0200E060(param0->unk_08, 0, 1, 0); @@ -616,7 +616,7 @@ void ov83_0223DFAC (UnkStruct_ov83_0223E138 * param0) v5 = param0->unk_1C->unk_130[v0]; sub_0200B498(param0->unk_18->unk_04, 0, param0->unk_1C->unk_134[v5]); - sub_0200C388(param0->unk_18->unk_04, param0->unk_18->unk_08, param0->unk_18->unk_14); + StringFormatter_Format(param0->unk_18->unk_04, param0->unk_18->unk_08, param0->unk_18->unk_14); v6 = ov83_0223D6A8((v3 * 8) + 32, param0->unk_18->unk_08, 1); v7 = (v4 * 8) + 8; @@ -1125,7 +1125,7 @@ void ov83_0223E9BC (UnkStruct_ov83_0223E824 * param0) void ov83_0223E9D0 (UnkStruct_ov83_0223E824 * param0) { if (param0->unk_34 != NULL) { - sub_0200EBA0(param0->unk_34); + DeleteWaitDial(param0->unk_34); param0->unk_34 = NULL; } } @@ -1154,14 +1154,14 @@ static void ov83_0223EA6C (UnkStruct_ov83_0223E824 * param0) sub_0200B60C(param0->unk_1C->unk_04, 0, param0->unk_24->unk_58.unk_0E, 2, 2, 1); sub_0200B60C(param0->unk_1C->unk_04, 1, param0->unk_24->unk_58.unk_0F, 2, 2, 1); sub_0200B60C(param0->unk_1C->unk_04, 2, param0->unk_24->unk_58.unk_10, 2, 2, 1); - sub_0200C388(param0->unk_1C->unk_04, param0->unk_1C->unk_08, param0->unk_1C->unk_4C[1]); + StringFormatter_Format(param0->unk_1C->unk_04, param0->unk_1C->unk_08, param0->unk_1C->unk_4C[1]); sub_0201D78C(param0->unk_08[1], 0, param0->unk_1C->unk_08, 160, 24, 0, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((15 & 0xff) << 0))), NULL); sub_0201D78C(param0->unk_08[1], 0, param0->unk_1C->unk_4C[2], 0, 48, 0, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((15 & 0xff) << 0))), NULL); sub_0200B60C(param0->unk_1C->unk_04, 0, param0->unk_24->unk_58.unk_00, 4, 0, 1); { int v0 = (param0->unk_24->unk_58.unk_00 == 1) ? 3 : 5; - sub_0200C388(param0->unk_1C->unk_04, param0->unk_1C->unk_08, param0->unk_1C->unk_4C[v0]); + StringFormatter_Format(param0->unk_1C->unk_04, param0->unk_1C->unk_08, param0->unk_1C->unk_4C[v0]); } sub_0201D78C(param0->unk_08[1], 0, param0->unk_1C->unk_08, 160, 48, 0, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((15 & 0xff) << 0))), NULL); @@ -1170,7 +1170,7 @@ static void ov83_0223EA6C (UnkStruct_ov83_0223E824 * param0) { int v1 = (param0->unk_24->unk_58.unk_04 == 1) ? 3 : 5; - sub_0200C388(param0->unk_1C->unk_04, param0->unk_1C->unk_08, param0->unk_1C->unk_4C[v1]); + StringFormatter_Format(param0->unk_1C->unk_04, param0->unk_1C->unk_08, param0->unk_1C->unk_4C[v1]); } sub_0201D78C(param0->unk_08[1], 0, param0->unk_1C->unk_08, 160, 68, 0, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((15 & 0xff) << 0))), NULL); @@ -1182,7 +1182,7 @@ static void ov83_0223EBD8 (UnkStruct_ov83_0223E824 * param0) sub_0200BF74(param0->unk_1C->unk_04, 3, param0->unk_24->unk_58.unk_0C); sub_0200B60C(param0->unk_1C->unk_04, 1, param0->unk_24->unk_58.unk_0D, 2, 2, 1); sub_0200B60C(param0->unk_1C->unk_04, 2, param0->unk_20, 2, 2, 1); - sub_0200C388(param0->unk_1C->unk_04, param0->unk_1C->unk_08, param0->unk_1C->unk_4C[7]); + StringFormatter_Format(param0->unk_1C->unk_04, param0->unk_1C->unk_08, param0->unk_1C->unk_4C[7]); sub_0201D78C(param0->unk_08[2], 0, param0->unk_1C->unk_08, 16, 24, 0, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((15 & 0xff) << 0))), NULL); sub_0201A9A4(param0->unk_08[2]); } @@ -1220,7 +1220,7 @@ void ov83_0223EC8C (UnkStruct_ov83_0223E824 * param0, u32 param1) switch (param1) { case 0: sub_0200B498(param0->unk_1C->unk_04, 0, param0->unk_24->unk_134[param0->unk_24->unk_144]); - sub_0200C388(param0->unk_1C->unk_04, param0->unk_1C->unk_08, param0->unk_1C->unk_18); + StringFormatter_Format(param0->unk_1C->unk_04, param0->unk_1C->unk_08, param0->unk_1C->unk_18); v0 = param0->unk_1C->unk_08; break; case 1: diff --git a/src/overlay084/ov84_0223B5A0.c b/src/overlay084/ov84_0223B5A0.c index 5cd58f5b79..ce849f0c32 100644 --- a/src/overlay084/ov84_0223B5A0.c +++ b/src/overlay084/ov84_0223B5A0.c @@ -2220,7 +2220,7 @@ static int ov84_0223DA14 (UnkStruct_ov84_0223B5A0 * param0) Strbuf* v1 = MessageLoader_GetNewStrbuf(param0->unk_114, 60); BGL_FillWindow(¶m0->unk_04[6], 15); - sub_0200C388(param0->unk_118, param0->unk_3F8, v1); + StringFormatter_Format(param0->unk_118, param0->unk_3F8, v1); Strbuf_Free(v1); param0->unk_426 = ov84_022400A0(param0); @@ -2302,7 +2302,7 @@ static BOOL ov84_0223DBF4 (UnkStruct_ov84_0223B5A0 * param0, u16 param1) return 0; } - sub_0200C388(param0->unk_118, param0->unk_3F8, v0); + StringFormatter_Format(param0->unk_118, param0->unk_3F8, v0); Strbuf_Free(v0); return 1; } @@ -2487,7 +2487,7 @@ static int ov84_0223E01C (UnkStruct_ov84_0223B5A0 * param0) } sub_0200B60C(param0->unk_118, 1, param0->unk_488, 3, 0, 1); - sub_0200C388(param0->unk_118, param0->unk_3F8, v1); + StringFormatter_Format(param0->unk_118, param0->unk_3F8, v1); Strbuf_Free(v1); } BGL_FillWindow(¶m0->unk_04[6], 15); @@ -2604,7 +2604,7 @@ static int ov84_0223E27C (UnkStruct_ov84_0223B5A0 * param0) v1 = MessageLoader_GetNewStrbuf(param0->unk_114, 46); - sub_0200C388(param0->unk_118, param0->unk_3F8, v1); + StringFormatter_Format(param0->unk_118, param0->unk_3F8, v1); Strbuf_Free(v1); param0->unk_426 = ov84_022400A0(param0); ov84_02240B34(param0, 2); @@ -2670,7 +2670,7 @@ static int ov84_0223E3BC (UnkStruct_ov84_0223B5A0 * param0) if ((Item_LoadParam(param0->unk_C4->unk_66, 3, 6) != 0) || (param0->unk_48C == 0)) { v1 = MessageLoader_GetNewStrbuf(param0->unk_114, 74); - sub_0200C388(param0->unk_118, param0->unk_3F8, v1); + StringFormatter_Format(param0->unk_118, param0->unk_3F8, v1); Strbuf_Free(v1); param0->unk_426 = ov84_022400A0(param0); @@ -2683,7 +2683,7 @@ static int ov84_0223E3BC (UnkStruct_ov84_0223B5A0 * param0) if (sub_0207D748(param0->unk_C4->unk_04[param0->unk_C4->unk_64].unk_00, param0->unk_C4->unk_04[param0->unk_C4->unk_64].unk_09 - 3, param0->unk_C4->unk_66, 6) == 1) { v1 = MessageLoader_GetNewStrbuf(param0->unk_114, 76); sub_0200B60C(param0->unk_118, 0, param0->unk_488 * param0->unk_48C, 6, 0, 1); - sub_0200C388(param0->unk_118, param0->unk_3F8, v1); + StringFormatter_Format(param0->unk_118, param0->unk_3F8, v1); Strbuf_Free(v1); param0->unk_426 = ov84_022400A0(param0); @@ -2691,7 +2691,7 @@ static int ov84_0223E3BC (UnkStruct_ov84_0223B5A0 * param0) } v1 = MessageLoader_GetNewStrbuf(param0->unk_114, 75); - sub_0200C388(param0->unk_118, param0->unk_3F8, v1); + StringFormatter_Format(param0->unk_118, param0->unk_3F8, v1); Strbuf_Free(v1); param0->unk_426 = ov84_022400A0(param0); @@ -2733,7 +2733,7 @@ static int ov84_0223E5C4 (UnkStruct_ov84_0223B5A0 * param0) BGL_FillWindow(¶m0->unk_04[6], 15); v0 = MessageLoader_GetNewStrbuf(param0->unk_114, 76); sub_0200B60C(param0->unk_118, 0, param0->unk_488 * param0->unk_48C, 6, 0, 1); - sub_0200C388(param0->unk_118, param0->unk_3F8, v0); + StringFormatter_Format(param0->unk_118, param0->unk_3F8, v0); Strbuf_Free(v0); param0->unk_426 = ov84_022400A0(param0); param0->unk_490 = 1; @@ -2765,7 +2765,7 @@ static int ov84_0223E5C4 (UnkStruct_ov84_0223B5A0 * param0) v1 = MessageLoader_GetNewStrbuf(param0->unk_114, 76); sub_0200B60C(param0->unk_118, 0, param0->unk_488 * param0->unk_48C, 6, 0, 1); - sub_0200C388(param0->unk_118, param0->unk_3F8, v1); + StringFormatter_Format(param0->unk_118, param0->unk_3F8, v1); Strbuf_Free(v1); param0->unk_426 = ov84_022400A0(param0); Sound_PlayEffect(1500); @@ -2827,7 +2827,7 @@ static int ov84_0223E7CC (UnkStruct_ov84_0223B5A0 * param0) } sub_0200B60C(param0->unk_118, 1, param0->unk_488 * param0->unk_48C, 6, 0, 1); - sub_0200C388(param0->unk_118, param0->unk_3F8, v1); + StringFormatter_Format(param0->unk_118, param0->unk_3F8, v1); Strbuf_Free(v1); } BGL_FillWindow(¶m0->unk_04[6], 15); diff --git a/src/overlay084/ov84_0223F040.c b/src/overlay084/ov84_0223F040.c index 8de533411a..85047a5666 100644 --- a/src/overlay084/ov84_0223F040.c +++ b/src/overlay084/ov84_0223F040.c @@ -249,7 +249,7 @@ void ov84_0223F584 (UnkStruct_ov84_0223B5A0 * param0, u16 param1) v3 = MoveTable_CalcMaxPP(v2, 0); v1 = MessageLoader_GetNewStrbuf(param0->unk_114, 90); sub_0200B60C(param0->unk_118, 0, v3, 2, 1, 1); - sub_0200C388(param0->unk_118, param0->unk_3F8, v1); + StringFormatter_Format(param0->unk_118, param0->unk_3F8, v1); Strbuf_Free(v1); sub_0201D78C(v0, 0, param0->unk_3F8, 48, 16, 0xff, ((u32)(((15 & 0xff) << 16) | ((14 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); @@ -262,7 +262,7 @@ void ov84_0223F584 (UnkStruct_ov84_0223B5A0 * param0, u16 param1) } sub_0200B60C(param0->unk_118, 0, v3, 3, 0, 1); - sub_0200C388(param0->unk_118, param0->unk_3F8, v1); + StringFormatter_Format(param0->unk_118, param0->unk_3F8, v1); Strbuf_Free(v1); sub_0201D78C(v0, 0, param0->unk_3F8, 96 + 64, 16, 0xff, ((u32)(((15 & 0xff) << 16) | ((14 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); v3 = MoveTable_LoadParam(v2, MOVEATTRIBUTE_ACCURACY); @@ -274,7 +274,7 @@ void ov84_0223F584 (UnkStruct_ov84_0223B5A0 * param0, u16 param1) } sub_0200B60C(param0->unk_118, 0, v3, 3, 0, 1); - sub_0200C388(param0->unk_118, param0->unk_3F8, v1); + StringFormatter_Format(param0->unk_118, param0->unk_3F8, v1); Strbuf_Free(v1); sub_0201D78C(v0, 0, param0->unk_3F8, 96 + 64, 32, 0xff, ((u32)(((15 & 0xff) << 16) | ((14 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); } @@ -305,7 +305,7 @@ void ov84_0223F81C (UnkStruct_ov84_0223B5A0 * param0, u16 param1, u16 param2, u3 v0 = Strbuf_Init(10, 6); sub_0200B60C(param0->unk_118, 0, param1, 3, 0, 1); - sub_0200C388(param0->unk_118, v0, param0->unk_400); + StringFormatter_Format(param0->unk_118, v0, param0->unk_400); v1 = sub_02002D7C(0, v0, 0); @@ -452,8 +452,8 @@ void ov84_0223FB70 (UnkStruct_ov84_0223B5A0 * param0, u8 * param1, u8 param2) v1 = ¶m0->unk_C4->unk_04[param0->unk_C4->unk_64]; ov84_0223F4E8(param0, v1->unk_06 + v1->unk_04 - 1, 0); - sub_0200C388(param0->unk_118, v3, v2); - sub_0201D738(¶m0->unk_04[v5], 1, v3, 0, 0, 0xff, NULL); + StringFormatter_Format(param0->unk_118, v3, v2); + PrintStringSimple(¶m0->unk_04[v5], 1, v3, 0, 0, 0xff, NULL); Strbuf_Free(v3); Strbuf_Free(v2); sub_0201A9A4(¶m0->unk_04[v5]); @@ -501,7 +501,7 @@ void ov84_0223FE18 (UnkStruct_ov84_0223B5A0 * param0) ov84_0223F4E8(param0, param0->unk_47B - 1, 0); - sub_0200C388(param0->unk_118, v1, v0); + StringFormatter_Format(param0->unk_118, v1, v0); sub_0201D78C(¶m0->unk_04[1], 0, v1, 40, 0, 0xff, ((u32)(((15 & 0xff) << 16) | ((14 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); sub_0201A9A4(¶m0->unk_04[1]); Strbuf_Free(v1); @@ -526,8 +526,8 @@ void ov84_0223FE94 (UnkStruct_ov84_0223B5A0 * param0) ov84_0223F4E8(param0, v0->unk_06 + v0->unk_04 - 1, 0); - sub_0200C388(param0->unk_118, v2, v1); - sub_0201D738(¶m0->unk_04[3], 1, v2, 0, 0, 0xff, NULL); + StringFormatter_Format(param0->unk_118, v2, v1); + PrintStringSimple(¶m0->unk_04[3], 1, v2, 0, 0, 0xff, NULL); sub_0201A9A4(¶m0->unk_04[3]); Strbuf_Free(v2); Strbuf_Free(v1); @@ -544,8 +544,8 @@ void ov84_0223FF44 (UnkStruct_ov84_0223B5A0 * param0) v1 = MessageLoader_GetNewStrbuf(param0->unk_114, 84); sub_0200B60C(param0->unk_118, 0, param0->unk_488, 3, 2, 1); - sub_0200C388(param0->unk_118, param0->unk_3F8, v1); - sub_0201D738(v0, 0, param0->unk_3F8, 16, 8, 0xff, NULL); + StringFormatter_Format(param0->unk_118, param0->unk_3F8, v1); + PrintStringSimple(v0, 0, param0->unk_3F8, 16, 8, 0xff, NULL); sub_0201A9A4(v0); Strbuf_Free(v1); } @@ -578,7 +578,7 @@ void ov84_0223FFF0 (UnkStruct_ov84_0223B5A0 * param0) } sub_0200B60C(param0->unk_118, 1, param0->unk_488, 3, 0, 1); - sub_0200C388(param0->unk_118, param0->unk_3F8, v1); + StringFormatter_Format(param0->unk_118, param0->unk_3F8, v1); Strbuf_Free(v1); param0->unk_426 = ov84_022400A0(param0); @@ -590,7 +590,7 @@ u8 ov84_022400A0 (UnkStruct_ov84_0223B5A0 * param0) sub_02002AC8(1); sub_02002AE4(0); - v0 = sub_0201D738(¶m0->unk_04[6], 1, param0->unk_3F8, 0, 0, sub_02027AC0(param0->unk_D0), ov84_022400E0); + v0 = PrintStringSimple(¶m0->unk_04[6], 1, param0->unk_3F8, 0, 0, sub_02027AC0(param0->unk_D0), ov84_022400E0); return v0; } @@ -634,18 +634,18 @@ void ov84_02240148 (UnkStruct_ov84_0223B5A0 * param0, u8 param1) v1 = MessageLoader_GetNewStrbuf(param0->unk_114, 80); sub_0200B60C(param0->unk_118, 0, param0->unk_488, 2, 2, 1); - sub_0200C388(param0->unk_118, param0->unk_3F8, v1); - sub_0201D738(v0, 0, param0->unk_3F8, 0, 8, 0xff, NULL); + StringFormatter_Format(param0->unk_118, param0->unk_3F8, v1); + PrintStringSimple(v0, 0, param0->unk_3F8, 0, 8, 0xff, NULL); Strbuf_Free(v1); v1 = MessageLoader_GetNewStrbuf(param0->unk_114, 81); sub_0200B60C(param0->unk_118, 0, param0->unk_48C * param0->unk_488, 6, 1, 1); - sub_0200C388(param0->unk_118, param0->unk_3F8, v1); + StringFormatter_Format(param0->unk_118, param0->unk_3F8, v1); v2 = sub_02002D7C(0, param0->unk_3F8, 0); - sub_0201D738(v0, 0, param0->unk_3F8, (12 * 8) - v2, 8, 0xff, NULL); + PrintStringSimple(v0, 0, param0->unk_3F8, (12 * 8) - v2, 8, 0xff, NULL); sub_0201A9A4(v0); Strbuf_Free(v1); } @@ -664,7 +664,7 @@ void ov84_02240248 (UnkStruct_ov84_0223B5A0 * param0, u8 param1) v1 = MessageLoader_GetNewStrbuf(param0->unk_114, 78); - sub_0201D738(v0, 0, v1, 0, 0, 0xff, NULL); + PrintStringSimple(v0, 0, v1, 0, 0, 0xff, NULL); Strbuf_Free(v1); } else { BGL_WindowColor(v0, 15, 0, 16, (10 * 8), 16); @@ -673,11 +673,11 @@ void ov84_02240248 (UnkStruct_ov84_0223B5A0 * param0, u8 param1) v1 = MessageLoader_GetNewStrbuf(param0->unk_114, 79); sub_0200B60C(param0->unk_118, 0, TrainerInfo_Money(param0->unk_CC), 6, 1, 1); - sub_0200C388(param0->unk_118, param0->unk_3F8, v1); + StringFormatter_Format(param0->unk_118, param0->unk_3F8, v1); v2 = sub_02002D7C(0, param0->unk_3F8, 0); - sub_0201D738(v0, 0, param0->unk_3F8, (10 * 8) - v2, 16, 0xff, NULL); + PrintStringSimple(v0, 0, param0->unk_3F8, (10 * 8) - v2, 16, 0xff, NULL); sub_0201A9A4(v0); Strbuf_Free(v1); } @@ -693,15 +693,15 @@ void ov84_02240328 (UnkStruct_ov84_0223B5A0 * param0) Window_Show(v0, 1, 1024 - 9, 14); v1 = MessageLoader_GetNewStrbuf(param0->unk_114, 108); - sub_0201D738(v0, 0, v1, 0, 0, 0xff, NULL); + PrintStringSimple(v0, 0, v1, 0, 0, 0xff, NULL); Strbuf_Free(v1); v1 = MessageLoader_GetNewStrbuf(param0->unk_114, 109); sub_0200B60C(param0->unk_118, 0, sub_0202AC98(Poffin_GetSavedataBlock(param0->unk_C4->unk_00)), 3, 1, 1); - sub_0200C388(param0->unk_118, param0->unk_3F8, v1); + StringFormatter_Format(param0->unk_118, param0->unk_3F8, v1); Strbuf_Free(v1); v2 = sub_02002D7C(0, param0->unk_3F8, 0); - sub_0201D738(v0, 0, param0->unk_3F8, 11 * 8 - v2, 16, 0xff, NULL); + PrintStringSimple(v0, 0, param0->unk_3F8, 11 * 8 - v2, 16, 0xff, NULL); sub_0201A9A4(v0); } diff --git a/src/overlay085/ov85_02241440.c b/src/overlay085/ov85_02241440.c index e5c10fd1ab..887b1a8334 100644 --- a/src/overlay085/ov85_02241440.c +++ b/src/overlay085/ov85_02241440.c @@ -556,7 +556,7 @@ static void ov85_0224198C (UnkStruct_ov85_022417E4 * param0) v2 = Strbuf_Init((2 + 1) * 2, 36); sub_0200B60C(param0->unk_C8, 0, param0->unk_1F8->unk_08 + 1, 2, 2, 1); - sub_0200C388(param0->unk_C8, v2, v1); + StringFormatter_Format(param0->unk_C8, v2, v1); sub_0201D78C(v0, 0, v2, 16, 0, 0xff, ((u32)(((15 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); Strbuf_Free(v1); Strbuf_Free(v2); @@ -653,7 +653,7 @@ static void ov85_02241B9C (UnkStruct_ov85_022417E4 * param0) sub_0200B60C(param0->unk_C8, 0, v3 / 10, 2, 0, 1); sub_0200B60C(param0->unk_C8, 1, v3 % 10, 1, 0, 1); - sub_0200C388(param0->unk_C8, v2, v1); + StringFormatter_Format(param0->unk_C8, v2, v1); sub_0201D78C(v0, 0, v2, 0, 0, 0xff, ((u32)(((15 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); Strbuf_Free(v1); Strbuf_Free(v2); diff --git a/src/overlay086/ov86_0223B140.c b/src/overlay086/ov86_0223B140.c index 3ab5b60e87..894c996c7f 100644 --- a/src/overlay086/ov86_0223B140.c +++ b/src/overlay086/ov86_0223B140.c @@ -1315,7 +1315,7 @@ static void ov86_0223C4DC (UnkStruct_ov86_0223C3E4 * param0) break; } - sub_0200C388(param0->unk_14, param0->unk_1C, param0->unk_18); + StringFormatter_Format(param0->unk_14, param0->unk_1C, param0->unk_18); } static void ov86_0223C54C (UnkStruct_ov86_0223C3E4 * param0) @@ -1330,7 +1330,7 @@ static void ov86_0223C54C (UnkStruct_ov86_0223C3E4 * param0) } MessageLoader_GetStrbuf(param0->unk_20, 5 + v0, param0->unk_18); - sub_0200C388(param0->unk_14, param0->unk_1C, param0->unk_18); + StringFormatter_Format(param0->unk_14, param0->unk_1C, param0->unk_18); } static void ov86_0223C58C (SysTask * param0, void * param1) @@ -1362,7 +1362,7 @@ static void ov86_0223C58C (SysTask * param0, void * param1) case 2: sub_0200B5EC(v0->unk_14, 0, Pokemon_GetBoxPokemon(v0->unk_24)); MessageLoader_GetStrbuf(v0->unk_20, 4, v0->unk_18); - sub_0200C388(v0->unk_14, v0->unk_1C, v0->unk_18); + StringFormatter_Format(v0->unk_14, v0->unk_1C, v0->unk_18); ov86_0223C47C(v0, 96); ov86_0223C54C(v0); ov86_0223C47C(v0, 112); @@ -1438,7 +1438,7 @@ static void ov86_0223C72C (UnkStruct_ov86_0223B3C8 * param0) sub_0200B60C(param0->unk_1C44, 2, sub_0202CC58(param0->unk_0C->unk_08), 3, 0, 1); sub_0200B60C(param0->unk_1C44, 3, sub_0202CC5C(param0->unk_0C->unk_08), 2, 2, 1); MessageLoader_GetStrbuf(param0->unk_1C50, 13, param0->unk_1C4C); - sub_0200C388(param0->unk_1C44, param0->unk_1C48, param0->unk_1C4C); + StringFormatter_Format(param0->unk_1C44, param0->unk_1C48, param0->unk_1C4C); v0 = (256 - sub_02002D7C(0, param0->unk_1C48, 0)) / 2; sub_0201D78C(¶m0->unk_14, 0, param0->unk_1C48, v0, 172, 0xff, (u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0)), NULL); diff --git a/src/overlay087/ov87_021D106C.c b/src/overlay087/ov87_021D106C.c index a8b6876097..d6b4c07381 100644 --- a/src/overlay087/ov87_021D106C.c +++ b/src/overlay087/ov87_021D106C.c @@ -389,9 +389,9 @@ static void ov87_021D1590 (UnkStruct_ov87_021D106C * param0) sub_0200C2E0(param0->unk_1F0, 2, v0->unk_04.month); sub_0200B60C(param0->unk_1F0, 3, v0->unk_04.day, 2, 0, 1); MessageLoader_GetStrbuf(param0->unk_1E4, 0, param0->unk_1F4); - sub_0200C388(param0->unk_1F0, param0->unk_1F8, param0->unk_1F4); + StringFormatter_Format(param0->unk_1F0, param0->unk_1F8, param0->unk_1F4); BGL_FillWindow(v1, 15); - sub_0201D738(v1, 0, param0->unk_1F8, 0, 0, 0xff, NULL); + PrintStringSimple(v1, 0, param0->unk_1F8, 0, 0, 0xff, NULL); sub_0201ACCC(v1); } @@ -405,11 +405,11 @@ static void ov87_021D1640 (UnkStruct_ov87_021D106C * param0) switch (v0->unk_1C) { case UnkEnum_ov87_021D12C0_0: - sub_0201D738(v2, 0, v1->unk_00, 0, 0, 0xff, NULL); + PrintStringSimple(v2, 0, v1->unk_00, 0, 0, 0xff, NULL); MessageLoader_GetStrbuf(param0->unk_1E4, 5, param0->unk_1F4); - sub_0201D738(v2, 0, param0->unk_1F4, 72, 0, 0xff, NULL); + PrintStringSimple(v2, 0, param0->unk_1F4, 72, 0, 0xff, NULL); MessageLoader_GetStrbuf(param0->unk_1E8, v1->unk_10, param0->unk_1F4); - sub_0201D738(v2, 0, param0->unk_1F4, 94, 0, 0xff, NULL); + PrintStringSimple(v2, 0, param0->unk_1F4, 94, 0, 0xff, NULL); switch (Pokemon_GetGenderOf(v1->unk_10, v1->unk_08)) { case 0: @@ -423,14 +423,14 @@ static void ov87_021D1640 (UnkStruct_ov87_021D106C * param0) break; } - sub_0201D738(v2, 0, param0->unk_1F4, 174, 0, 0xff, NULL); + PrintStringSimple(v2, 0, param0->unk_1F4, 174, 0, 0xff, NULL); MessageLoader_GetStrbuf(param0->unk_1E4, 1, param0->unk_1F4); sub_0200B60C(param0->unk_1F0, 0, v1->unk_12, 4, 1, 1); - sub_0200C388(param0->unk_1F0, param0->unk_1F8, param0->unk_1F4); - sub_0201D738(v2, 0, param0->unk_1F8, 194, 0, 0xff, NULL); + StringFormatter_Format(param0->unk_1F0, param0->unk_1F8, param0->unk_1F4); + PrintStringSimple(v2, 0, param0->unk_1F8, 194, 0, 0xff, NULL); MessageLoader_GetStrbuf(param0->unk_1E4, 2, param0->unk_1F4); - sub_0201D738(v2, 0, param0->unk_1F4, 0, 16, 0xff, NULL); - sub_0201D738(v2, 0, v1->unk_04, sub_02002D7C(0, param0->unk_1F4, 0), 16, 0xff, NULL); + PrintStringSimple(v2, 0, param0->unk_1F4, 0, 16, 0xff, NULL); + PrintStringSimple(v2, 0, v1->unk_04, sub_02002D7C(0, param0->unk_1F4, 0), 16, 0xff, NULL); break; case UnkEnum_ov87_021D12C0_1: { @@ -439,7 +439,7 @@ static void ov87_021D1640 (UnkStruct_ov87_021D106C * param0) for (v3 = 0; v3 < 4; v3++) { if (v1->unk_14[v3]) { MessageLoader_GetStrbuf(param0->unk_1EC, v1->unk_14[v3], param0->unk_1F4); - sub_0201D738(v2, 0, param0->unk_1F4, (v3 & 1) * 96, (v3 / 2) * 16, 0xff, NULL); + PrintStringSimple(v2, 0, param0->unk_1F4, (v3 & 1) * 96, (v3 / 2) * 16, 0xff, NULL); } else { break; } diff --git a/src/overlay088/ov88_0223B140.c b/src/overlay088/ov88_0223B140.c index ad1a53b570..dc92c78a86 100644 --- a/src/overlay088/ov88_0223B140.c +++ b/src/overlay088/ov88_0223B140.c @@ -2577,7 +2577,7 @@ static void ov88_0223E894 (UnkStruct_02095E80 * param0) static void ov88_0223E8B4 (UnkStruct_02095E80 * param0) { if (param0->unk_3700 != NULL) { - sub_0200EBA0(param0->unk_3700); + DeleteWaitDial(param0->unk_3700); param0->unk_3700 = NULL; } } diff --git a/src/overlay090/ov90_021D0D80.c b/src/overlay090/ov90_021D0D80.c index a8817c6516..cf2a5ac61e 100644 --- a/src/overlay090/ov90_021D0D80.c +++ b/src/overlay090/ov90_021D0D80.c @@ -673,7 +673,7 @@ static void ov90_021D14C8 (UnkStruct_ov90_021D0ECC * param0, Window * param1, u8 sub_0201D78C(param1, 0, param0->unk_28.unk_24[v0], 4, param4, 0xff, ((u32)(((3 & 0xff) << 16) | ((4 & 0xff) << 8) | (((0 & 0xff) << 0)))), NULL); sub_0200B60C(param0->unk_28.unk_04, 0, v2, 4, 1, 1); - sub_0200C388(param0->unk_28.unk_04, param0->unk_28.unk_08, param0->unk_28.unk_24[4]); + StringFormatter_Format(param0->unk_28.unk_04, param0->unk_28.unk_08, param0->unk_28.unk_24[4]); v3 = 21 * 8 - sub_02002D7C(0, param0->unk_28.unk_08, 0) - 4; sub_0201D78C(param1, 0, param0->unk_28.unk_08, v3, param4, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | (((0 & 0xff) << 0)))), NULL); @@ -681,7 +681,7 @@ static void ov90_021D14C8 (UnkStruct_ov90_021D0ECC * param0, Window * param1, u8 param4 += 24; sub_0201D78C(param1, 0, param0->unk_28.unk_24[2], 4, param4, 0xff, ((u32)(((3 & 0xff) << 16) | ((4 & 0xff) << 8) | (((0 & 0xff) << 0)))), NULL); sub_0200B60C(param0->unk_28.unk_04, 0, v1, 4, 1, 1); - sub_0200C388(param0->unk_28.unk_04, param0->unk_28.unk_08, param0->unk_28.unk_24[4]); + StringFormatter_Format(param0->unk_28.unk_04, param0->unk_28.unk_08, param0->unk_28.unk_24[4]); v3 = 21 * 8 - sub_02002D7C(0, param0->unk_28.unk_08, 0) - 4; sub_0201D78C(param1, 0, param0->unk_28.unk_08, v3, param4, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | (((0 & 0xff) << 0)))), NULL); @@ -717,7 +717,7 @@ static void ov90_021D15D0 (UnkStruct_ov90_021D0ECC * param0) MessageLoader_GetStrbuf(param0->unk_28.unk_00, 12, param0->unk_28.unk_08); sub_0201D78C(¶m0->unk_6C[3], 0, param0->unk_28.unk_08, 4, 10, 0, ((u32)(((3 & 0xff) << 16) | ((4 & 0xff) << 8) | (((0 & 0xff) << 0)))), NULL); sub_0200B60C(param0->unk_28.unk_04, 0, sub_0202D2C0(param0->unk_20, 0), 2, 0, 1); - sub_0200C388(param0->unk_28.unk_04, param0->unk_28.unk_08, param0->unk_28.unk_24[5]); + StringFormatter_Format(param0->unk_28.unk_04, param0->unk_28.unk_08, param0->unk_28.unk_24[5]); v0 = 64 - sub_02002D7C(0, param0->unk_28.unk_08, 0); v0 = v0 / 2 + 64; @@ -810,7 +810,7 @@ static void ov90_021D18BC (UnkStruct_ov90_021D0ECC * param0) Strbuf_Clear(param0->unk_28.unk_08); sub_0200B60C(param0->unk_28.unk_04, 0, v0.unk_00, 2, 0, 1); sub_0200B60C(param0->unk_28.unk_04, 1, v0.unk_04, 3, 2, 1); - sub_0200C388(param0->unk_28.unk_04, param0->unk_28.unk_08, param0->unk_28.unk_10); + StringFormatter_Format(param0->unk_28.unk_04, param0->unk_28.unk_08, param0->unk_28.unk_10); v1 = 24 * 8 - sub_02002D7C(0, param0->unk_28.unk_08, 0); sub_0201D78C(¶m0->unk_6C[0], 0, param0->unk_28.unk_08, v1 / 2, 4, 0xff, ((u32)(((15 & 0xff) << 16) | ((2 & 0xff) << 8) | (((0 & 0xff) << 0)))), NULL); @@ -831,12 +831,12 @@ static void ov90_021D1984 (UnkStruct_ov90_021D0ECC * param0) sub_0201D78C(¶m0->unk_6C[2], 0, param0->unk_28.unk_20, 0, 4, 0, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | (((0 & 0xff) << 0)))), NULL); } else if (v0->unk_06 == 0) { sub_0200BDD0(param0->unk_28.unk_04, 0, v0->unk_05); - sub_0200C388(param0->unk_28.unk_04, param0->unk_28.unk_08, param0->unk_28.unk_1C); + StringFormatter_Format(param0->unk_28.unk_04, param0->unk_28.unk_08, param0->unk_28.unk_1C); sub_0201D78C(¶m0->unk_6C[2], 0, param0->unk_28.unk_08, 0, 4, 0, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | (((0 & 0xff) << 0)))), NULL); } else { sub_0200BDD0(param0->unk_28.unk_04, 0, v0->unk_05); sub_0200BE08(param0->unk_28.unk_04, 1, v0->unk_05, v0->unk_06); - sub_0200C388(param0->unk_28.unk_04, param0->unk_28.unk_08, param0->unk_28.unk_18); + StringFormatter_Format(param0->unk_28.unk_04, param0->unk_28.unk_08, param0->unk_28.unk_18); sub_0201D78C(¶m0->unk_6C[2], 0, param0->unk_28.unk_08, 0, 4, 0, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | (((0 & 0xff) << 0)))), NULL); } diff --git a/src/overlay091/ov91_021D0D80.c b/src/overlay091/ov91_021D0D80.c index f11fd58c0b..f846d7d4af 100644 --- a/src/overlay091/ov91_021D0D80.c +++ b/src/overlay091/ov91_021D0D80.c @@ -872,7 +872,7 @@ static void ov91_021D1618 (UnkStruct_ov91_021D0ED8 * param0, u32 param1, u32 par v0 = MessageLoader_GetNewStrbuf(param0->unk_F8, param1); sub_0200B60C(param0->unk_FC, 0, param2, param3, param4, 1); - sub_0200C388(param0->unk_FC, param0->unk_100, v0); + StringFormatter_Format(param0->unk_FC, param0->unk_100, v0); Strbuf_Free(v0); } @@ -1147,7 +1147,7 @@ static void ov91_021D1C10 (UnkStruct_ov91_021D0ED8 * param0, u32 param1) } v0 = MessageLoader_GetNewStrbuf(param0->unk_F8, Unk_ov91_021D282C[param0->unk_00->unk_15][param1]); - sub_0200C388(param0->unk_FC, param0->unk_100, v0); + StringFormatter_Format(param0->unk_FC, param0->unk_100, v0); Strbuf_Free(v0); } @@ -1168,7 +1168,7 @@ static void ov91_021D1DF8 (UnkStruct_ov91_021D0ED8 * param0, u32 param1) sub_02002AC8(1); sub_02002AE4(0); - param0->unk_185 = sub_0201D738(¶m0->unk_08[12], 1, param0->unk_100, 0, 0, sub_02027AC0(param0->unk_00->unk_08), ov91_021D1E50); + param0->unk_185 = PrintStringSimple(¶m0->unk_08[12], 1, param0->unk_100, 0, 0, sub_02027AC0(param0->unk_00->unk_08), ov91_021D1E50); } static BOOL ov91_021D1E50 (UnkStruct_0201D738 * param0, u16 param1) diff --git a/src/overlay092/ov92_021D0D80.c b/src/overlay092/ov92_021D0D80.c index 1d79a4acd5..58ba6e3891 100644 --- a/src/overlay092/ov92_021D0D80.c +++ b/src/overlay092/ov92_021D0D80.c @@ -997,7 +997,7 @@ static void ov92_021D1888 (UnkStruct_ov92_021D1B24 * param0, NARC * param1) u32 v5; v5 = sub_02002EEC(2, v0, 0, 6 * 8); - sub_0201D738(¶m0->unk_B834, 2, v0, v5, 0, 0xff, NULL); + PrintStringSimple(¶m0->unk_B834, 2, v0, v5, 0, 0xff, NULL); } Strbuf_Free(v0); @@ -1024,7 +1024,7 @@ static BOOL ov92_021D1B70 (UnkStruct_ov92_021D1B24 * param0, u32 param1, int par BGL_WindowColor(¶m0->unk_B814, 15, 0, 0, 27 * 8, 4 * 8); param0->unk_B86C = Strbuf_Init(0x400, param0->unk_00); MessageLoader_GetStrbuf(param0->unk_B860, param1, param0->unk_B86C); - param0->unk_B868 = sub_0201D738(¶m0->unk_B814, 1, param0->unk_B86C, 0, 0, sub_02027AC0(param0->unk_08), NULL); + param0->unk_B868 = PrintStringSimple(¶m0->unk_B814, 1, param0->unk_B86C, 0, 0, sub_02027AC0(param0->unk_08), NULL); param0->unk_B864 = 1; break; case 1: @@ -1121,9 +1121,9 @@ static void ov92_021D1DEC (UnkStruct_ov92_021D1B24 * param0) sub_0200BE08(param0->unk_B870, 1, param0->unk_BB14, param0->unk_BB18); MessageLoader_GetStrbuf(param0->unk_B860, 13, v1); - sub_0200C388(param0->unk_B870, v0, v1); + StringFormatter_Format(param0->unk_B870, v0, v1); - sub_0201D738(¶m0->unk_B844, 0, v0, 0, 0, 0, NULL); + PrintStringSimple(¶m0->unk_B844, 0, v0, 0, 0, 0, NULL); Strbuf_Free(v1); Strbuf_Free(v0); @@ -1143,10 +1143,10 @@ static void ov92_021D1EBC (UnkStruct_ov92_021D1B24 * param0, int param1, int par ov92_021D27E8(param1, param2, v0, v1, param0->unk_00); if (param2 != 0) { - sub_0201D738(¶m0->unk_B844, 0, v1, 0, 16, 0xff, NULL); + PrintStringSimple(¶m0->unk_B844, 0, v1, 0, 16, 0xff, NULL); } - sub_0201D738(¶m0->unk_B844, 0, v0, 0, 0, 0, NULL); + PrintStringSimple(¶m0->unk_B844, 0, v0, 0, 0, 0, NULL); Strbuf_Free(v1); Strbuf_Free(v0); sub_0201A954(¶m0->unk_B844); @@ -1166,7 +1166,7 @@ static void ov92_021D1F90 (UnkStruct_ov92_021D1B24 * param0) BGL_WindowColor(¶m0->unk_B814, 15, 0, 0, 27 * 8, 6 * 8); MessageLoader_GetStrbuf(param0->unk_B860, 14, v0); - sub_0201D738(¶m0->unk_B814, 1, v0, 0, 0, 0, NULL); + PrintStringSimple(¶m0->unk_B814, 1, v0, 0, 0, 0, NULL); Strbuf_Free(v0); } } else { @@ -1211,10 +1211,10 @@ static void ov92_021D1F90 (UnkStruct_ov92_021D1B24 * param0) ov92_021D27E8(param0->unk_0C.unk_04[v8].unk_2A, param0->unk_0C.unk_04[v8].unk_2C, v12, v13, param0->unk_00); if (param0->unk_0C.unk_04[v8].unk_2C != 0) { - sub_0201D738(¶m0->unk_B814, 1, v13, 0, 16, 0xff, NULL); + PrintStringSimple(¶m0->unk_B814, 1, v13, 0, 16, 0xff, NULL); } - sub_0201D738(¶m0->unk_B814, 1, v12, 0, 0, 0, NULL); + PrintStringSimple(¶m0->unk_B814, 1, v12, 0, 0, 0, NULL); Strbuf_Free(v13); Strbuf_Free(v12); diff --git a/src/overlay094/ov94_0223BCB0.c b/src/overlay094/ov94_0223BCB0.c index c5f934efc5..19a857ed84 100644 --- a/src/overlay094/ov94_0223BCB0.c +++ b/src/overlay094/ov94_0223BCB0.c @@ -562,7 +562,7 @@ void ov94_0223C5D8 (UnkStruct_ov94_0223FD4C * param0) void ov94_0223C5F4 (UnkStruct_ov94_0223FD4C * param0) { if (param0->unk_10DC != NULL) { - sub_0200EBA0(param0->unk_10DC); + DeleteWaitDial(param0->unk_10DC); param0->unk_10DC = NULL; } } diff --git a/src/overlay094/ov94_0223C610.c b/src/overlay094/ov94_0223C610.c index 54f6a59f27..7eeff46fe5 100644 --- a/src/overlay094/ov94_0223C610.c +++ b/src/overlay094/ov94_0223C610.c @@ -595,7 +595,7 @@ static void ov94_0223CF80 (UnkStruct_ov94_0223FD4C * param0, int param1, int par BGL_FillWindow(¶m0->unk_F5C, 0xf0f); sub_0200E060(¶m0->unk_F5C, 0, 1, 10); - param0->unk_BE0 = sub_0201D738(¶m0->unk_F5C, 1, param0->unk_BAC, 0, 0, param2, NULL); + param0->unk_BE0 = PrintStringSimple(¶m0->unk_F5C, 1, param0->unk_BAC, 0, 0, param2, NULL); } static void ov94_0223CFD8 (UnkStruct_ov94_0223FD4C * param0, int param1, int param2, int param3, u16 param4) @@ -606,7 +606,7 @@ static void ov94_0223CFD8 (UnkStruct_ov94_0223FD4C * param0, int param1, int par BGL_FillWindow(¶m0->unk_109C, 0xf0f); sub_0200E060(¶m0->unk_109C, 0, 1, 10); - param0->unk_BE0 = sub_0201D738(¶m0->unk_109C, 1, param0->unk_BAC, 0, 0, param2, NULL); + param0->unk_BE0 = PrintStringSimple(¶m0->unk_109C, 1, param0->unk_BAC, 0, 0, param2, NULL); } void ov94_0223D030 (Window * param0, MessageLoader * param1, int param2, u16 param3) @@ -616,7 +616,7 @@ void ov94_0223D030 (Window * param0, MessageLoader * param1, int param2, u16 par v0 = MessageLoader_GetNewStrbuf(param1, param2); BGL_FillWindow(param0, param3); - sub_0201D738(param0, 1, v0, 0, 0, 0, NULL); + PrintStringSimple(param0, 1, v0, 0, 0, 0, NULL); Strbuf_Free(v0); } diff --git a/src/overlay094/ov94_0223D0C4.c b/src/overlay094/ov94_0223D0C4.c index b8c27963ef..54c38bf500 100644 --- a/src/overlay094/ov94_0223D0C4.c +++ b/src/overlay094/ov94_0223D0C4.c @@ -507,11 +507,11 @@ static void ov94_0223D88C (UnkStruct_ov94_0223FD4C * param0, int param1, int par sub_0200B538(param0->unk_B8C, 0, Pokemon_GetBoxPokemon(param5)); v0 = MessageLoader_GetNewStrbuf(param0->unk_B90, param1); - sub_0200C388(param0->unk_B8C, param0->unk_BAC, v0); + StringFormatter_Format(param0->unk_B8C, param0->unk_BAC, v0); BGL_FillWindow(¶m0->unk_F5C, 0xf0f); sub_0200E060(¶m0->unk_F5C, 0, 1, 10); - param0->unk_BE0 = sub_0201D738(¶m0->unk_F5C, 1, param0->unk_BAC, 0, 0, param2, NULL); + param0->unk_BE0 = PrintStringSimple(¶m0->unk_F5C, 1, param0->unk_BAC, 0, 0, param2, NULL); Strbuf_Free(v0); } diff --git a/src/overlay094/ov94_0223DC04.c b/src/overlay094/ov94_0223DC04.c index 61e40a0181..caaab6a54a 100644 --- a/src/overlay094/ov94_0223DC04.c +++ b/src/overlay094/ov94_0223DC04.c @@ -442,7 +442,7 @@ static void ov94_0223E300 (UnkStruct_ov94_0223FD4C * param0, int param1, int par BGL_FillWindow(¶m0->unk_F5C, 0xf0f); sub_0200E060(¶m0->unk_F5C, 0, 1, 10); - param0->unk_BE0 = sub_0201D738(¶m0->unk_F5C, 1, param0->unk_BAC, 0, 0, param2, NULL); + param0->unk_BE0 = PrintStringSimple(¶m0->unk_F5C, 1, param0->unk_BAC, 0, 0, param2, NULL); } static void ov94_0223E358 (MessageLoader * param0, Window param1[]) diff --git a/src/overlay094/ov94_0223E46C.c b/src/overlay094/ov94_0223E46C.c index eabe93d1ae..0388264ccc 100644 --- a/src/overlay094/ov94_0223E46C.c +++ b/src/overlay094/ov94_0223E46C.c @@ -1088,7 +1088,7 @@ static void ov94_0223F9A4 (UnkStruct_ov94_0223FD4C * param0, int param1, int par BGL_FillWindow(¶m0->unk_F5C, 0xf0f); sub_0200E060(¶m0->unk_F5C, 0, 1, 10); - param0->unk_BE0 = sub_0201D738(¶m0->unk_F5C, 1, param0->unk_BAC, 0, 0, param2, NULL); + param0->unk_BE0 = PrintStringSimple(¶m0->unk_F5C, 1, param0->unk_BAC, 0, 0, param2, NULL); } static void ov94_0223F9FC (Window * param0, Window * param1, MessageLoader * param2) diff --git a/src/overlay094/ov94_0223FB48.c b/src/overlay094/ov94_0223FB48.c index 0b18145491..74fb8a1f75 100644 --- a/src/overlay094/ov94_0223FB48.c +++ b/src/overlay094/ov94_0223FB48.c @@ -1019,7 +1019,7 @@ static void ov94_02240D58 (UnkStruct_ov94_0223FD4C * param0, int param1, int par Strbuf* v1; v1 = MessageLoader_GetNewStrbuf(param0->unk_B90, param1); - sub_0200C388(param0->unk_B8C, param0->unk_BAC, v1); + StringFormatter_Format(param0->unk_B8C, param0->unk_BAC, v1); if (param5 == 0) { v0 = ¶m0->unk_F5C; @@ -1030,7 +1030,7 @@ static void ov94_02240D58 (UnkStruct_ov94_0223FD4C * param0, int param1, int par BGL_FillWindow(v0, 0xf0f); sub_0200E060(v0, 0, 1, 10); - param0->unk_BE0 = sub_0201D738(v0, 1, param0->unk_BAC, 0, 0, param2, NULL); + param0->unk_BE0 = PrintStringSimple(v0, 1, param0->unk_BAC, 0, 0, param2, NULL); Strbuf_Free(v1); } diff --git a/src/overlay094/ov94_022414B8.c b/src/overlay094/ov94_022414B8.c index c8d9e8fee9..eac801025c 100644 --- a/src/overlay094/ov94_022414B8.c +++ b/src/overlay094/ov94_022414B8.c @@ -331,11 +331,11 @@ static void ov94_0224158C (UnkStruct_ov94_0223FD4C * param0, int param1, int par v0 = MessageLoader_GetNewStrbuf(param0->unk_B90, param1); - sub_0200C388(param0->unk_B8C, param0->unk_BAC, v0); + StringFormatter_Format(param0->unk_B8C, param0->unk_BAC, v0); BGL_FillWindow(¶m0->unk_F5C, 0xf0f); sub_0200E060(¶m0->unk_F5C, 0, 1, 10); - param0->unk_BE0 = sub_0201D738(¶m0->unk_F5C, 1, param0->unk_BAC, 0, 0, param2, NULL); + param0->unk_BE0 = PrintStringSimple(¶m0->unk_F5C, 1, param0->unk_BAC, 0, 0, param2, NULL); Strbuf_Free(v0); } diff --git a/src/overlay094/ov94_02244950.c b/src/overlay094/ov94_02244950.c index 8983ceb624..e82ea159dd 100644 --- a/src/overlay094/ov94_02244950.c +++ b/src/overlay094/ov94_02244950.c @@ -912,12 +912,12 @@ void ov94_02245824 (UnkStruct_ov94_0223FD4C * param0, MessageLoader * param1, in v0 = MessageLoader_GetNewStrbuf(param1, param2); - sub_0200C388(param0->unk_B8C, param0->unk_BAC, v0); + StringFormatter_Format(param0->unk_B8C, param0->unk_BAC, v0); Strbuf_Free(v0); BGL_FillWindow(¶m0->unk_F5C, 0xf0f); sub_0200E060(¶m0->unk_F5C, 0, 1, 10); - param0->unk_BE0 = sub_0201D738(¶m0->unk_F5C, 1, param0->unk_BAC, 0, 0, param3, NULL); + param0->unk_BE0 = PrintStringSimple(¶m0->unk_F5C, 1, param0->unk_BAC, 0, 0, param3, NULL); param0->unk_10E0 = 0; } @@ -961,12 +961,12 @@ static void ov94_0224593C (UnkStruct_ov94_0223FD4C * param0, int param1) Strbuf* v0 = Strbuf_Init((16 * 8 * 2), 62); MessageLoader_GetStrbuf(param0->unk_B9C, param1, v0); - sub_0200C388(param0->unk_B8C, param0->unk_BDC, v0); + StringFormatter_Format(param0->unk_B8C, param0->unk_BDC, v0); BGL_FillWindow(¶m0->unk_F8C, 15); Window_Show(¶m0->unk_F8C, 1, (1 + (18 + 12)), 11); - param0->unk_BE0 = sub_0201D738(¶m0->unk_F8C, 1, param0->unk_BDC, 0, 0, 0, NULL); + param0->unk_BE0 = PrintStringSimple(¶m0->unk_F8C, 1, param0->unk_BDC, 0, 0, 0, NULL); Strbuf_Free(v0); } diff --git a/src/overlay095/ov95_02247B6C.c b/src/overlay095/ov95_02247B6C.c index 0c8dab1826..6a007cee03 100644 --- a/src/overlay095/ov95_02247B6C.c +++ b/src/overlay095/ov95_02247B6C.c @@ -341,8 +341,8 @@ static int ov95_02247F04 (UnkStruct_ov95_02247C6C * param0, int * param1) } MessageLoader_GetStrbuf(v0, v2, param0->unk_68); - sub_0200C388(v1, param0->unk_6C, param0->unk_68); - sub_0201D738(&(param0->unk_58), 1, param0->unk_6C, 0, 0, 0xff, NULL); + StringFormatter_Format(v1, param0->unk_6C, param0->unk_68); + PrintStringSimple(&(param0->unk_58), 1, param0->unk_6C, 0, 0, 0xff, NULL); sub_0200E010(&(param0->unk_58), 109, 2); sub_0201A954(&(param0->unk_58)); param0->unk_08 = 0; @@ -355,7 +355,7 @@ static int ov95_02247F04 (UnkStruct_ov95_02247C6C * param0, int * param1) UnkStruct_0200B358 * v5 = ov95_0224762C(param0->unk_00); MessageLoader_GetStrbuf(v4, 1, param0->unk_68); - sub_0200C388(v5, param0->unk_6C, param0->unk_68); + StringFormatter_Format(v5, param0->unk_6C, param0->unk_68); { const BoxPokemon * v6 = ov95_02247634(param0->unk_00); @@ -369,7 +369,7 @@ static int ov95_02247F04 (UnkStruct_ov95_02247C6C * param0, int * param1) } BGL_FillWindow(&(param0->unk_58), 0xf); - sub_0201D738(&(param0->unk_58), 1, param0->unk_6C, 0, 0, 0xff, NULL); + PrintStringSimple(&(param0->unk_58), 1, param0->unk_6C, 0, 0, 0xff, NULL); sub_0201ACCC(&(param0->unk_58)); param0->unk_08 = 0; (*param1)++; diff --git a/src/overlay095/ov95_0224B3D8.c b/src/overlay095/ov95_0224B3D8.c index 06d6e4f43f..28443fd044 100644 --- a/src/overlay095/ov95_0224B3D8.c +++ b/src/overlay095/ov95_0224B3D8.c @@ -416,8 +416,8 @@ static int ov95_0224B81C (UnkStruct_ov95_0224B4D4 * param0, int * param1) } MessageLoader_GetStrbuf(v0, v2, param0->unk_6C); - sub_0200C388(v1, param0->unk_70, param0->unk_6C); - sub_0201D738(&(param0->unk_5C), 1, param0->unk_70, 0, 0, 0xff, NULL); + StringFormatter_Format(v1, param0->unk_70, param0->unk_6C); + PrintStringSimple(&(param0->unk_5C), 1, param0->unk_70, 0, 0, 0xff, NULL); sub_0200E010(&(param0->unk_5C), 109, 2); sub_0201A954(&(param0->unk_5C)); @@ -434,9 +434,9 @@ static int ov95_0224B81C (UnkStruct_ov95_0224B4D4 * param0, int * param1) UnkStruct_0200B358 * v5 = ov95_0224762C(param0->unk_00); MessageLoader_GetStrbuf(v4, 3, param0->unk_6C); - sub_0200C388(v5, param0->unk_70, param0->unk_6C); + StringFormatter_Format(v5, param0->unk_70, param0->unk_6C); BGL_FillWindow(&(param0->unk_5C), 0xf); - sub_0201D738(&(param0->unk_5C), 1, param0->unk_70, 0, 0, 0xff, NULL); + PrintStringSimple(&(param0->unk_5C), 1, param0->unk_70, 0, 0, 0xff, NULL); sub_0201ACCC(&(param0->unk_5C)); param0->unk_08 = 0; (*param1)++; diff --git a/src/overlay096/ov96_0223BCE0.c b/src/overlay096/ov96_0223BCE0.c index 44de893531..c162551ad9 100644 --- a/src/overlay096/ov96_0223BCE0.c +++ b/src/overlay096/ov96_0223BCE0.c @@ -1567,11 +1567,11 @@ static void ov96_0223D750 (UnkStruct_ov96_0223BF40 * param0, MessageLoader * par { Strbuf* v0 = MessageLoader_GetNewStrbuf(param1, param2); - sub_0200C388(param0->unk_BCC, param0->unk_BDC, v0); + StringFormatter_Format(param0->unk_BCC, param0->unk_BDC, v0); BGL_FillWindow(¶m0->unk_E38, 0xf0f); sub_0200E060(¶m0->unk_E38, 0, 1, 14); - param0->unk_BF0 = sub_0201D738(¶m0->unk_E38, 1, param0->unk_BDC, 0, 0, param3, NULL); + param0->unk_BF0 = PrintStringSimple(¶m0->unk_E38, 1, param0->unk_BDC, 0, 0, param3, NULL); Strbuf_Free(v0); } @@ -1604,7 +1604,7 @@ static void ov96_0223D814 (UnkStruct_ov96_0223BF40 * param0, MessageLoader * par BGL_FillWindow(¶m0->unk_E38, 0xf0f); sub_0200E060(¶m0->unk_E38, 0, 1, 14); - param0->unk_BF0 = sub_0201D738(¶m0->unk_E38, 1, param0->unk_BDC, 0, 0, param3, NULL); + param0->unk_BF0 = PrintStringSimple(¶m0->unk_E38, 1, param0->unk_BDC, 0, 0, param3, NULL); } static int ov96_0223D86C (Window * param0, Strbuf *param1, int param2, int param3, u32 param4, int param5) @@ -1667,7 +1667,7 @@ static void ov96_0223D978 (UnkStruct_ov96_0223BF40 * param0) static void ov96_0223D99C (UnkStruct_ov96_0223BF40 * param0) { if (param0->unk_F6C != NULL) { - sub_0200EBA0(param0->unk_F6C); + DeleteWaitDial(param0->unk_F6C); param0->unk_F6C = NULL; } } @@ -1677,11 +1677,11 @@ static void ov96_0223D9B8 (UnkStruct_ov96_0223BF40 * param0, int param1) Strbuf* v0 = Strbuf_Init((16 * 8 * 2), 68); MessageLoader_GetStrbuf(param0->unk_BD8, param1, v0); - sub_0200C388(param0->unk_BCC, param0->unk_BEC, v0); + StringFormatter_Format(param0->unk_BCC, param0->unk_BEC, v0); BGL_FillWindow(¶m0->unk_E78, 15); Window_Show(¶m0->unk_E78, 1, (1 + (18 + 12)), 11); - param0->unk_BF0 = sub_0201D738(¶m0->unk_E78, 1, param0->unk_BEC, 0, 0, 0, NULL); + param0->unk_BF0 = PrintStringSimple(¶m0->unk_E78, 1, param0->unk_BEC, 0, 0, 0, NULL); Strbuf_Free(v0); } diff --git a/src/overlay097/ov97_0222C174.c b/src/overlay097/ov97_0222C174.c index 308afeeea2..7641bbbf29 100644 --- a/src/overlay097/ov97_0222C174.c +++ b/src/overlay097/ov97_0222C174.c @@ -945,7 +945,7 @@ int ov97_0222CB10 (UnkStruct_ov97_0222C388 * param0) case UnkEnum_ov97_0222C6F8_29: ov97_0223795C(param0->unk_04, ¶m0->unk_48, 2, 19, 30); sub_02021CAC(param0->unk_3170, 0); - sub_0200EBA0(param0->unk_34D8); + DeleteWaitDial(param0->unk_34D8); param0->unk_34D8 = NULL; Sound_PlayEffect(1500); param0->unk_160 = 1800; @@ -1076,7 +1076,7 @@ int ov97_0222CB10 (UnkStruct_ov97_0222C388 * param0) ov97_0223795C(param0->unk_04, ¶m0->unk_48, 2, 19, 73); sub_02021CAC(param0->unk_3170, 0); - sub_0200EBA0(param0->unk_34D8); + DeleteWaitDial(param0->unk_34D8); Sound_PlayEffect(1500); param0->unk_34D8 = NULL; @@ -1103,7 +1103,7 @@ int ov97_0222CB10 (UnkStruct_ov97_0222C388 * param0) sub_02021CAC(param0->unk_3170, 0); if (param0->unk_34D8) { - sub_0200EBA0(param0->unk_34D8); + DeleteWaitDial(param0->unk_34D8); } param0->unk_34D8 = NULL; @@ -1130,7 +1130,7 @@ int ov97_0222CB10 (UnkStruct_ov97_0222C388 * param0) param0->unk_148 = 0; if (param0->unk_34D8) { - sub_0200EBA0(param0->unk_34D8); + DeleteWaitDial(param0->unk_34D8); } return 5; diff --git a/src/overlay097/ov97_0222D30C.c b/src/overlay097/ov97_0222D30C.c index 222e7e8088..ed39c8879e 100644 --- a/src/overlay097/ov97_0222D30C.c +++ b/src/overlay097/ov97_0222D30C.c @@ -231,7 +231,7 @@ static void ov97_0222D30C (UnkStruct_ov97_0222D04C * param0, int param1) } } else { if (param0->unk_2A50) { - sub_0200EBA0(param0->unk_2A50); + DeleteWaitDial(param0->unk_2A50); } param0->unk_2A50 = NULL; diff --git a/src/overlay097/ov97_02230410.c b/src/overlay097/ov97_02230410.c index d8b27566b1..18c27e6ec9 100644 --- a/src/overlay097/ov97_02230410.c +++ b/src/overlay097/ov97_02230410.c @@ -404,7 +404,7 @@ static int ov97_02230778 (UnkStruct_020067E8 * param0) } sub_020246E0(v0->unk_2C04); - sub_0200EBA0(v0->unk_3E14); + DeleteWaitDial(v0->unk_3E14); if (sub_0202DD88(v0->unk_2C00) == 0) { return 26; @@ -1236,7 +1236,7 @@ static int ov97_0223161C (UnkStruct_020067E8 * param0, int * param1) if ((ov97_02231C84(v4) == 0) || (sub_02036540(0x93) == 1)) { ov97_022384F4(); ov97_02230E04(v4, &v4->unk_2C30, 17 + 1, 640); - sub_0200EBA0(v4->unk_3E14); + DeleteWaitDial(v4->unk_3E14); ov97_02231F1C(v4, param1, 25); } break; diff --git a/src/overlay097/ov97_02233B18.c b/src/overlay097/ov97_02233B18.c index cdf62e099f..4a72a7ca7d 100644 --- a/src/overlay097/ov97_02233B18.c +++ b/src/overlay097/ov97_02233B18.c @@ -469,7 +469,7 @@ static void ov97_02233DD0 (UnkStruct_ov97_02234A2C * param0, UnkStruct_ov97_0223 v0 = param0->unk_12668; v6 = MessageLoader_GetNewStrbuf(v2, param1->unk_34); - sub_0200C388(v1, param0->unk_12668, v6); + StringFormatter_Format(v1, param0->unk_12668, v6); Strbuf_Free(v6); v3 = ov97_02233DAC(param1, v0, param2); @@ -1964,7 +1964,7 @@ static int ov97_022356E8 (UnkStruct_020067E8 * param0, int * param1) break; case 10: ov97_02233CE4(v3); - sub_0200EBA0(v3->unk_E8F0.unk_08); + DeleteWaitDial(v3->unk_E8F0.unk_08); v3->unk_04 = 7; *param1 = 11; break; @@ -2114,7 +2114,7 @@ static int ov97_022356E8 (UnkStruct_020067E8 * param0, int * param1) v2 = ov97_02233B8C(v3); if (v2 != 10) { - sub_0200EBA0(v3->unk_E8F0.unk_08); + DeleteWaitDial(v3->unk_E8F0.unk_08); Sound_PlayEffect(1563); if (v2 == 11) { diff --git a/src/overlay098/ov98_022471C8.c b/src/overlay098/ov98_022471C8.c index 49f9ffd423..f9a2a44cc9 100644 --- a/src/overlay098/ov98_022471C8.c +++ b/src/overlay098/ov98_022471C8.c @@ -717,7 +717,7 @@ static void ov98_02247AF0 (UnkStruct_ov98_02247704 * param0) static void ov98_02247B0C (UnkStruct_ov98_02247704 * param0) { if (param0->unk_8C != NULL) { - sub_0200EBA0(param0->unk_8C); + DeleteWaitDial(param0->unk_8C); param0->unk_8C = NULL; } } @@ -933,11 +933,11 @@ static void ov98_02247F08 (UnkStruct_ov98_02247704 * param0) BGL_FillWindow(¶m0->unk_D4, 0xf0f); v0 = MessageLoader_GetNewStrbuf(param0->unk_34, 42); - sub_0201D738(¶m0->unk_D4, 0, v0, Unk_ov98_02249D60[0][0] + 12, Unk_ov98_02249D60[0][1], 0xff, NULL); + PrintStringSimple(¶m0->unk_D4, 0, v0, Unk_ov98_02249D60[0][0] + 12, Unk_ov98_02249D60[0][1], 0xff, NULL); Strbuf_Free(v0); v0 = MessageLoader_GetNewStrbuf(param0->unk_34, 43); - sub_0201D738(¶m0->unk_D4, 0, v0, Unk_ov98_02249D60[1][0] + 12, Unk_ov98_02249D60[1][1], 0xff, NULL); + PrintStringSimple(¶m0->unk_D4, 0, v0, Unk_ov98_02249D60[1][0] + 12, Unk_ov98_02249D60[1][1], 0xff, NULL); Strbuf_Free(v0); sub_02014A58(param0->unk_E4, ¶m0->unk_D4, Unk_ov98_02249D60[param0->unk_B0][0], Unk_ov98_02249D60[param0->unk_B0][1]); sub_0201A954(¶m0->unk_D4); @@ -997,7 +997,7 @@ static void ov98_022482CC (UnkStruct_ov98_02247704 * param0) v3 = Strbuf_Init(Strbuf_Length(v2), 109); for (v0 = param0->unk_AC; v0 < param0->unk_AC + 6; v0++) { Strbuf_CopyLineNum(v3, v2, v0); - sub_0201D738(¶m0->unk_C4, 0, v3, 4, v1 * 16, 0xFF, NULL); + PrintStringSimple(¶m0->unk_C4, 0, v3, 4, v1 * 16, 0xFF, NULL); v1++; } Strbuf_Free(v2); @@ -1105,7 +1105,7 @@ asm static int ov98_02248350 (UnkStruct_ov98_02247704 * param0) mov r1, #0 add r2, r7, #0 mov r3, #4 - bl sub_0201D738 + bl PrintStringSimple add r6, r6, #1 add r4, #0x10 cmp r6, #6 @@ -2407,12 +2407,12 @@ static void ov98_02249714 (UnkStruct_ov98_02247704 * param0, MessageLoader * par v0 = MessageLoader_GetNewStrbuf(param1, param2); - sub_0200C388(param0->unk_20, param0->unk_38, v0); + StringFormatter_Format(param0->unk_20, param0->unk_38, v0); Strbuf_Free(v0); BGL_FillWindow(¶m0->unk_48, 0xf0f); sub_0200E060(¶m0->unk_48, 0, 1, 10); - param0->unk_44 = sub_0201D738(¶m0->unk_48, 1, param0->unk_38, 0, 0, param3, NULL); + param0->unk_44 = PrintStringSimple(¶m0->unk_48, 1, param0->unk_38, 0, 0, param3, NULL); param0->unk_90 = 0; if ((param3 == 0xff) || (param3 == 0)) { @@ -2508,12 +2508,12 @@ static void ov98_02249900 (UnkStruct_ov98_02247704 * param0, int param1) Strbuf* v0 = Strbuf_Init((16 * 8 * 2), 109); MessageLoader_GetStrbuf(param0->unk_30, param1, v0); - sub_0200C388(param0->unk_20, param0->unk_40, v0); + StringFormatter_Format(param0->unk_20, param0->unk_40, v0); BGL_FillWindow(¶m0->unk_68, 15); Window_Show(¶m0->unk_68, 1, (1 + (18 + 12)), 11); - param0->unk_44 = sub_0201D738(¶m0->unk_68, 1, param0->unk_40, 0, 0, 0, NULL); + param0->unk_44 = PrintStringSimple(¶m0->unk_68, 1, param0->unk_40, 0, 0, 0, NULL); param0->unk_44 = 0xff; Strbuf_Free(v0); diff --git a/src/overlay100/ov100_021D46C8.c b/src/overlay100/ov100_021D46C8.c index c3cb4c295d..949afc82be 100644 --- a/src/overlay100/ov100_021D46C8.c +++ b/src/overlay100/ov100_021D46C8.c @@ -46,7 +46,7 @@ int ov100_021D46C8 (UnkStruct_ov100_021D46C8 * param0, UnkStruct_020985E4 * para UnkStruct_0200B358 * v6 = sub_0200B358(111); sub_0200B48C(v6, 0, v5, 0, 1, GAME_LANGUAGE); - sub_0200C388(v6, v3, v2); + StringFormatter_Format(v6, v3, v2); Strbuf_Free(v5); sub_0200B3F0(v6); } else { @@ -56,7 +56,7 @@ int ov100_021D46C8 (UnkStruct_ov100_021D46C8 * param0, UnkStruct_020985E4 * para v4 = sub_02027AC0(param1->unk_04); BGL_FillWindow(¶m0->unk_30, 0xFF); - v0 = sub_0201D738(¶m0->unk_30, 1, v3, 0, 0, v4, NULL); + v0 = PrintStringSimple(¶m0->unk_30, 1, v3, 0, 0, v4, NULL); sub_0201A954(¶m0->unk_30); sub_0200E060(¶m0->unk_30, 0, 500, 15); diff --git a/src/overlay101/ov101_021D0D80.c b/src/overlay101/ov101_021D0D80.c index 556b058861..cc537d9649 100644 --- a/src/overlay101/ov101_021D0D80.c +++ b/src/overlay101/ov101_021D0D80.c @@ -469,7 +469,7 @@ void ov101_021D148C (UnkStruct_ov101_021D13C8 * param0, u32 param1) sub_0200E060(&v0->unk_08[0], 1, (1 + (18 + 12)), 14); BGL_FillWindow(&v0->unk_08[0], 15); MessageLoader_GetStrbuf(v0->unk_00, param1, v0->unk_18); - sub_0201D738(&v0->unk_08[0], 1, v0->unk_18, 0, 0, 0xff, NULL); + PrintStringSimple(&v0->unk_08[0], 1, v0->unk_18, 0, 0, 0xff, NULL); sub_0201A9A4(&v0->unk_08[0]); } diff --git a/src/overlay102/ov102_021D0D80.c b/src/overlay102/ov102_021D0D80.c index 782a5b8a61..858006300d 100644 --- a/src/overlay102/ov102_021D0D80.c +++ b/src/overlay102/ov102_021D0D80.c @@ -405,7 +405,7 @@ static void ov102_021D1420 (UnkStruct_ov102_021D0F8C * param0) MessageLoader_GetStrbuf(param0->unk_34, 0, v1); sub_0200B498(param0->unk_38, 0, param0->unk_0C); - sub_0200C388(param0->unk_38, v0, v1); + StringFormatter_Format(param0->unk_38, v0, v1); sub_0201D78C(¶m0->unk_14, 0, v0, 48, 32, 0, (u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0)), NULL); sub_0201D78C(¶m0->unk_24, 0, v0, 48, 32, 0, (u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0)), NULL); Strbuf_Free(v1); diff --git a/src/overlay104/ov104_0222FBE4.c b/src/overlay104/ov104_0222FBE4.c index 05364ef5d7..e181f3469d 100644 --- a/src/overlay104/ov104_0222FBE4.c +++ b/src/overlay104/ov104_0222FBE4.c @@ -1789,7 +1789,7 @@ static BOOL ov104_02230CC4 (UnkStruct_ov104_0222E930 * param0) { UnkStruct_ov104_022320B4 * v0 = param0->unk_00; - sub_0200EBA0(v0->unk_7C); + DeleteWaitDial(v0->unk_7C); return 0; } diff --git a/src/overlay104/ov104_02231F74.c b/src/overlay104/ov104_02231F74.c index 4f7bd9b1f4..022ad2dd8e 100644 --- a/src/overlay104/ov104_02231F74.c +++ b/src/overlay104/ov104_02231F74.c @@ -190,7 +190,7 @@ static void ov104_02231FC4 (UnkStruct_ov104_022320B4 * param0) static void ov104_02232034 (UnkStruct_ov104_022320B4 * param0, const MessageLoader * param1, u32 param2) { MessageLoader_GetStrbuf(param1, param2, param0->unk_4C); - sub_0200C388(param0->unk_44, param0->unk_48, param0->unk_4C); + StringFormatter_Format(param0->unk_44, param0->unk_48, param0->unk_4C); } static void ov104_02232050 (UnkStruct_ov104_022320B4 * param0, int param1, int param2, int param3, int param4) @@ -198,7 +198,7 @@ static void ov104_02232050 (UnkStruct_ov104_022320B4 * param0, int param1, int p sub_02002AC8(param3); sub_02002AE4(param4); sub_02002B20(0); - param0->unk_50 = sub_0201D738(¶m0->unk_64, param1, param0->unk_48, 0, 0, param2, NULL); + param0->unk_50 = PrintStringSimple(¶m0->unk_64, param1, param0->unk_48, 0, 0, param2, NULL); } void ov104_02232088 (UnkStruct_ov104_022320B4 * param0) @@ -346,7 +346,7 @@ static void ov104_02232390 (UnkStruct_ov104_02232B5C * param0, u32 param1, u32 p Strbuf* v2 = Strbuf_Init((40 * 2), param0->unk_00->unk_34); MessageLoader_GetStrbuf(param0->unk_8C, param1, v2); - sub_0200C388(param0->unk_90, param0->unk_1C[param0->unk_9B], v2); + StringFormatter_Format(param0->unk_90, param0->unk_1C[param0->unk_9B], v2); param0->unk_B4[param0->unk_9B].unk_00 = (const void *)param0->unk_1C[param0->unk_9B]; Strbuf_Free(v2); } @@ -528,7 +528,7 @@ static void ov104_02232750 (UnkStruct_ov104_02232B5C * param0, u32 param1, u32 p Strbuf* v2 = Strbuf_Init((40 * 2), param0->unk_00->unk_34); MessageLoader_GetStrbuf(param0->unk_8C, param1, v2); - sub_0200C388(param0->unk_90, param0->unk_1C[param0->unk_9B], v2); + StringFormatter_Format(param0->unk_90, param0->unk_1C[param0->unk_9B], v2); param0->unk_1BC[param0->unk_9B].unk_00 = (const void *)param0->unk_1C[param0->unk_9B]; Strbuf_Free(v2); @@ -710,9 +710,9 @@ static void ov104_02232AC4 (UnkStruct_ov104_02232B5C * param0, u16 param1, u32 p MessageLoader_GetStrbuf(param0->unk_8C, param1, v0); - sub_0200C388(param0->unk_90, v1, v0); + StringFormatter_Format(param0->unk_90, v1, v0); - sub_0201D738(param0->unk_18, 1, v1, 0, 0, param2, NULL); + PrintStringSimple(param0->unk_18, 1, v1, 0, 0, param2, NULL); Strbuf_Free(v0); Strbuf_Free(v1); diff --git a/src/overlay104/ov104_022361B4.c b/src/overlay104/ov104_022361B4.c index 6ac225fdfd..89e7f2c5a8 100644 --- a/src/overlay104/ov104_022361B4.c +++ b/src/overlay104/ov104_022361B4.c @@ -809,14 +809,14 @@ static void ov104_02237284 (UnkStruct_ov104_022320B4 * param0, Window * param1, sub_0200B60C(param0->unk_44, 0, param3, 4, 1, 1); MessageLoader_GetStrbuf(v0, 2, v1); - sub_0200C388(param0->unk_44, v2, v1); - sub_0201D738(param1, 0, v2, 16, 2 * 8, 0xff, NULL); + StringFormatter_Format(param0->unk_44, v2, v1); + PrintStringSimple(param1, 0, v2, 16, 2 * 8, 0xff, NULL); sub_0200B498(param0->unk_44, 0, param2); MessageLoader_GetStrbuf(v0, 0, v1); - sub_0200C388(param0->unk_44, v2, v1); - sub_0201D738(param1, 0, v2, 0, 0, 0, NULL); + StringFormatter_Format(param0->unk_44, v2, v1); + PrintStringSimple(param1, 0, v2, 0, 0, 0, NULL); Strbuf_Free(v1); Strbuf_Free(v2); diff --git a/src/overlay105/ov105_02241AE0.c b/src/overlay105/ov105_02241AE0.c index 1c192310aa..d77817b479 100644 --- a/src/overlay105/ov105_02241AE0.c +++ b/src/overlay105/ov105_02241AE0.c @@ -2544,7 +2544,7 @@ static u8 ov105_02244C60 (UnkStruct_ov105_02241FF4 * param0, Window * param1, in { BGL_FillWindow(param1, param8); MessageLoader_GetStrbuf(param0->unk_1C, param2, param0->unk_28); - sub_0200C388(param0->unk_20, param0->unk_24, param0->unk_28); + StringFormatter_Format(param0->unk_20, param0->unk_24, param0->unk_28); return sub_0201D78C(param1, param9, param0->unk_24, param3, param4, param5, (u32)((((param6) & 0xff) << 16) | (((param7) & 0xff) << 8) | (((param8) & 0xff) << 0)), NULL); } @@ -2552,7 +2552,7 @@ static u8 ov105_02244C60 (UnkStruct_ov105_02241FF4 * param0, Window * param1, in static u8 ov105_02244CC0 (UnkStruct_ov105_02241FF4 * param0, Window * param1, int param2, u32 param3, u32 param4, u32 param5, u8 param6, u8 param7, u8 param8, u8 param9) { MessageLoader_GetStrbuf(param0->unk_1C, param2, param0->unk_28); - sub_0200C388(param0->unk_20, param0->unk_24, param0->unk_28); + StringFormatter_Format(param0->unk_20, param0->unk_24, param0->unk_28); return sub_0201D78C(param1, param9, param0->unk_24, param3, param4, param5, (u32)((((param6) & 0xff) << 16) | (((param7) & 0xff) << 8) | (((param8) & 0xff) << 0)), NULL); } diff --git a/src/overlay106/ov106_02241AE0.c b/src/overlay106/ov106_02241AE0.c index 8adafbbd96..038cb31540 100644 --- a/src/overlay106/ov106_02241AE0.c +++ b/src/overlay106/ov106_02241AE0.c @@ -1068,7 +1068,7 @@ static u8 ov106_02242918 (UnkStruct_ov106_02243118 * param0, Window * param1, in { BGL_FillWindow(param1, param8); MessageLoader_GetStrbuf(param0->unk_20, param2, param0->unk_2C); - sub_0200C388(param0->unk_24, param0->unk_28, param0->unk_2C); + StringFormatter_Format(param0->unk_24, param0->unk_28, param0->unk_2C); return sub_0201D78C(param1, param9, param0->unk_28, param3, param4, param5, (u32)((((param6) & 0xff) << 16) | (((param7) & 0xff) << 8) | (((param8) & 0xff) << 0)), NULL); } diff --git a/src/overlay107/ov107_02241AE0.c b/src/overlay107/ov107_02241AE0.c index bc4479de97..066d584a51 100644 --- a/src/overlay107/ov107_02241AE0.c +++ b/src/overlay107/ov107_02241AE0.c @@ -1831,7 +1831,7 @@ static u8 ov107_022437CC (UnkStruct_ov107_02241D6C * param0, Window * param1, in u8 v0; BGL_FillWindow(param1, param8); MessageLoader_GetStrbuf(param0->unk_20, param2, param0->unk_2C); - sub_0200C388(param0->unk_24, param0->unk_28, param0->unk_2C); + StringFormatter_Format(param0->unk_24, param0->unk_28, param0->unk_2C); switch (param10) { case 1: @@ -1857,7 +1857,7 @@ static u8 ov107_02243890 (UnkStruct_ov107_02241D6C * param0, Window * param1, in { u8 v0; MessageLoader_GetStrbuf(param0->unk_20, param2, param0->unk_2C); - sub_0200C388(param0->unk_24, param0->unk_28, param0->unk_2C); + StringFormatter_Format(param0->unk_24, param0->unk_28, param0->unk_2C); switch (param10) { case 1: @@ -2279,7 +2279,7 @@ static u8 ov107_02243EF8 (UnkStruct_ov107_02241D6C * param0, Window * param1, u1 BGL_FillWindow(param1, 0); MessageLoader_GetStrbuf(param0->unk_1C, param2, param0->unk_2C); - sub_0200C388(param0->unk_24, param0->unk_28, param0->unk_2C); + StringFormatter_Format(param0->unk_24, param0->unk_28, param0->unk_2C); v0 = sub_0201D78C(param1, 0, param0->unk_28, 0, 6, 0xff, (u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | (((0 & 0xff) << 0))), NULL); diff --git a/src/overlay107/ov107_02245EB0.c b/src/overlay107/ov107_02245EB0.c index 3566eeca1a..4a2abec829 100644 --- a/src/overlay107/ov107_02245EB0.c +++ b/src/overlay107/ov107_02245EB0.c @@ -1490,7 +1490,7 @@ static u8 ov107_02247680 (UnkStruct_ov107_02246170 * param0, Window * param1, in u8 v0; BGL_FillWindow(param1, param8); MessageLoader_GetStrbuf(param0->unk_20, param2, param0->unk_2C); - sub_0200C388(param0->unk_24, param0->unk_28, param0->unk_2C); + StringFormatter_Format(param0->unk_24, param0->unk_28, param0->unk_2C); switch (param10) { case 1: @@ -1516,7 +1516,7 @@ static u8 ov107_02247744 (UnkStruct_ov107_02246170 * param0, Window * param1, in { u8 v0; MessageLoader_GetStrbuf(param0->unk_20, param2, param0->unk_2C); - sub_0200C388(param0->unk_24, param0->unk_28, param0->unk_2C); + StringFormatter_Format(param0->unk_24, param0->unk_28, param0->unk_2C); switch (param10) { case 1: diff --git a/src/overlay109/ov109_021D0D80.c b/src/overlay109/ov109_021D0D80.c index ca367ebbe6..9bd7e5d63e 100644 --- a/src/overlay109/ov109_021D0D80.c +++ b/src/overlay109/ov109_021D0D80.c @@ -1394,7 +1394,7 @@ static int ov109_021D1AA8 (UnkStruct_ov109_021D0F70 * param0) if (v0) { gCoreSys.inhibitReset = 0; - sub_0200EBA0(param0->unk_DC8); + DeleteWaitDial(param0->unk_DC8); param0->unk_00 = 48; } @@ -2066,7 +2066,7 @@ static void ov109_021D2634 (UnkStruct_ov109_021D0F70 * param0, u32 param1) sub_0200E060(v1, 1, (1 + 9), 14); BGL_FillWindow(v1, 15); MessageLoader_GetStrbuf(v0->unk_04, param1, v0->unk_6C); - sub_0201D738(v1, 1, v0->unk_6C, 0, 0, 0xff, NULL); + PrintStringSimple(v1, 1, v0->unk_6C, 0, 0, 0xff, NULL); sub_0201A9A4(v1); } @@ -2082,11 +2082,11 @@ static void ov109_021D268C (UnkStruct_ov109_021D0F70 * param0, u32 param1, const v0 = Strbuf_Init(0x100, 95); MessageLoader_GetStrbuf(v1->unk_04, param1, v0); - sub_0200C388(v1->unk_08, v1->unk_6C, v0); + StringFormatter_Format(v1->unk_08, v1->unk_6C, v0); Strbuf_Free(v0); sub_0200E060(v2, 1, (1 + 9), 14); BGL_FillWindow(v2, 15); - sub_0201D738(v2, 1, v1->unk_6C, 0, 0, 0xff, NULL); + PrintStringSimple(v2, 1, v1->unk_6C, 0, 0, 0xff, NULL); sub_0201A9A4(v2); } @@ -2101,11 +2101,11 @@ static void ov109_021D2714 (UnkStruct_ov109_021D0F70 * param0, u32 param1, u32 p v0 = Strbuf_Init(0x100, 95); MessageLoader_GetStrbuf(v1->unk_04, param1, v0); - sub_0200C388(v1->unk_08, v1->unk_6C, v0); + StringFormatter_Format(v1->unk_08, v1->unk_6C, v0); Strbuf_Free(v0); sub_0200E060(v2, 1, (1 + 9), 14); BGL_FillWindow(v2, 15); - sub_0201D738(v2, 1, v1->unk_6C, 0, 0, 0xff, NULL); + PrintStringSimple(v2, 1, v1->unk_6C, 0, 0, 0xff, NULL); sub_0201A9A4(v2); } diff --git a/src/overlay109/ov109_021D3D50.c b/src/overlay109/ov109_021D3D50.c index 26b7e1ec89..44d98695df 100644 --- a/src/overlay109/ov109_021D3D50.c +++ b/src/overlay109/ov109_021D3D50.c @@ -1579,15 +1579,15 @@ static void ov109_021D55A8 (UnkStruct_ov109_021D5140 * param0, int param1, int p v0 = Strbuf_Init((90 * 2), 95); MessageLoader_GetStrbuf(param0->unk_38, param1, v0); - sub_0200C388(param0->unk_34, param0->unk_54, v0); + StringFormatter_Format(param0->unk_34, param0->unk_54, v0); Strbuf_Free(v0); BGL_FillWindow(¶m0->unk_35C, 0xf0f); sub_0200E060(¶m0->unk_35C, 0, 1, 10); if (param2 == 0) { - param0->unk_5C = sub_0201D738(¶m0->unk_35C, 1, param0->unk_54, 0, 0, ov109_021D5854(param0), NULL); + param0->unk_5C = PrintStringSimple(¶m0->unk_35C, 1, param0->unk_54, 0, 0, ov109_021D5854(param0), NULL); } else { - sub_0201D738(¶m0->unk_35C, 1, param0->unk_54, 0, 0, 0, NULL); + PrintStringSimple(¶m0->unk_35C, 1, param0->unk_54, 0, 0, 0, NULL); param0->unk_5C = 0xff; } } diff --git a/src/overlay110/ov110_021D0D80.c b/src/overlay110/ov110_021D0D80.c index 4a1402079b..8e211b4ed5 100644 --- a/src/overlay110/ov110_021D0D80.c +++ b/src/overlay110/ov110_021D0D80.c @@ -487,7 +487,7 @@ static u8 ov110_021D1324 (UnkStruct_ov110_021D0F78 * param0, Window * param1, in if (param9) BGL_FillWindow(param1, param7); MessageLoader_GetStrbuf(param0->unk_110, param2, param0->unk_11C); - sub_0200C388(param0->unk_114, param0->unk_118, param0->unk_11C); + StringFormatter_Format(param0->unk_114, param0->unk_118, param0->unk_11C); switch(param10) { case 1: diff --git a/src/overlay111/ov111_021D0D80.c b/src/overlay111/ov111_021D0D80.c index 627b4044f0..ca50ba932c 100644 --- a/src/overlay111/ov111_021D0D80.c +++ b/src/overlay111/ov111_021D0D80.c @@ -1533,7 +1533,7 @@ static u8 ov111_021D23C4 (UnkStruct_ov111_021D0F7C * param0, Window * param1, in { BGL_FillWindow(param1, param8); MessageLoader_GetStrbuf(param0->unk_38, param2, param0->unk_44); - sub_0200C388(param0->unk_3C, param0->unk_40, param0->unk_44); + StringFormatter_Format(param0->unk_3C, param0->unk_40, param0->unk_44); return sub_0201D78C(param1, param9, param0->unk_40, param3, param4, param5, (u32)((((param6) & 0xff) << 16) | (((param7) & 0xff) << 8) | (((param8) & 0xff) << 0)), NULL); } @@ -1542,7 +1542,7 @@ static u8 ov111_021D2424 (UnkStruct_ov111_021D0F7C * param0, Window * param1, in { BGL_FillWindow(param1, param8); MessageLoader_GetStrbuf(param0->unk_38, param2, param0->unk_44); - sub_0200C388(param0->unk_3C, param0->unk_40, param0->unk_44); + StringFormatter_Format(param0->unk_3C, param0->unk_40, param0->unk_44); param3 -= (sub_02002D7C(param9, param0->unk_40, 0) + 1) / 2; return sub_0201D78C(param1, param9, param0->unk_40, param3, param4, param5, (u32)((((param6) & 0xff) << 16) | (((param7) & 0xff) << 8) | (((param8) & 0xff) << 0)), NULL); } diff --git a/src/overlay112/ov112_0225C700.c b/src/overlay112/ov112_0225C700.c index c375415911..e25250cf31 100644 --- a/src/overlay112/ov112_0225C700.c +++ b/src/overlay112/ov112_0225C700.c @@ -1081,7 +1081,7 @@ static void ov112_0225D460 (UnkStruct_ov112_0225D44C * param0, const Strbuf *par GF_ASSERT((180 * 8) >= param0->unk_06); BGL_FillWindow(¶m0->unk_0C, 0); - sub_0201D738(¶m0->unk_0C, 1, param0->unk_08, 0, 0, 0xff, NULL); + PrintStringSimple(¶m0->unk_0C, 1, param0->unk_08, 0, 0, 0xff, NULL); param0->unk_1C = *param3; diff --git a/src/overlay113/ov113_0225C700.c b/src/overlay113/ov113_0225C700.c index 42b3176f58..318f7ac63c 100644 --- a/src/overlay113/ov113_0225C700.c +++ b/src/overlay113/ov113_0225C700.c @@ -520,7 +520,7 @@ int ov113_0225CA04 (UnkStruct_020067E8 * param0, int * param1) BGL_FillWindow(&v0->unk_B4, 0xf); sub_0200E060(&v0->unk_B4, 0, 1, 14); MessageLoader_GetStrbuf(v0->unk_30, 2, v0->unk_C4); - v0->unk_C8 = sub_0201D738(&v0->unk_B4, 1, v0->unk_C4, 0, 0, sub_02027AC0(sub_02025E44(v0->unk_04)), NULL); + v0->unk_C8 = PrintStringSimple(&v0->unk_B4, 1, v0->unk_C4, 0, 0, sub_02027AC0(sub_02025E44(v0->unk_04)), NULL); (*param1)++; break; case 4: @@ -570,7 +570,7 @@ int ov113_0225CA04 (UnkStruct_020067E8 * param0, int * param1) BGL_FillWindow(&v0->unk_B4, 0xf); sub_0200E060(&v0->unk_B4, 0, 1, 14); MessageLoader_GetStrbuf(v0->unk_30, 3, v0->unk_C4); - v0->unk_C8 = sub_0201D738(&v0->unk_B4, 1, v0->unk_C4, 0, 0, sub_02027AC0(sub_02025E44(v0->unk_04)), NULL); + v0->unk_C8 = PrintStringSimple(&v0->unk_B4, 1, v0->unk_C4, 0, 0, sub_02027AC0(sub_02025E44(v0->unk_04)), NULL); (*param1)++; break; case 7: diff --git a/src/overlay113/ov113_02260620.c b/src/overlay113/ov113_02260620.c index 3d37ad9ef3..8d38b90820 100644 --- a/src/overlay113/ov113_02260620.c +++ b/src/overlay113/ov113_02260620.c @@ -590,7 +590,7 @@ void ov113_02260620 (MessageLoader * param0, UnkStruct_0200B358 * param1, Window v2 = MessageLoader_GetNewStrbuf(param0, 0); v3 = Strbuf_Init(v5, 118); - sub_0200C388(param1, v3, v2); + StringFormatter_Format(param1, v3, v2); BGL_FillWindow(¶m2[v7], 0x0); if (ov66_0222E924(param3, v8) == 1) { diff --git a/src/overlay114/ov114_0225C700.c b/src/overlay114/ov114_0225C700.c index c9a6642ee9..6dd004bc86 100644 --- a/src/overlay114/ov114_0225C700.c +++ b/src/overlay114/ov114_0225C700.c @@ -1493,7 +1493,7 @@ static void ov114_0225D180 (UnkStruct_ov114_0225D084 * param0, u32 param1) static void ov114_0225D190 (UnkStruct_ov114_0225D084 * param0, Strbuf *param1, u32 param2) { MessageLoader_GetStrbuf(param0->unk_00, param2, param0->unk_0C); - sub_0200C388(param0->unk_04, param1, param0->unk_0C); + StringFormatter_Format(param0->unk_04, param1, param0->unk_0C); } static void ov114_0225D1AC (UnkStruct_ov114_0225D084 * param0, u32 param1, Window * param2, u8 param3, u8 param4) @@ -1507,7 +1507,7 @@ static void ov114_0225D1C8 (UnkStruct_ov114_0225D084 * param0, u32 param1, Windo s32 v1; MessageLoader_GetStrbuf(param0->unk_00, param1, param0->unk_0C); - sub_0200C388(param0->unk_04, param0->unk_08, param0->unk_0C); + StringFormatter_Format(param0->unk_04, param0->unk_08, param0->unk_0C); v0 = sub_02002D7C(0, param0->unk_08, 0); v1 = param3 - v0; @@ -1522,7 +1522,7 @@ static void ov114_0225D1C8 (UnkStruct_ov114_0225D084 * param0, u32 param1, Windo static u32 ov114_0225D218 (UnkStruct_ov114_0225D084 * param0, u32 param1, Window * param2, Strbuf *param3, u32 param4) { MessageLoader_GetStrbuf(param0->unk_00, param1, param0->unk_0C); - sub_0200C388(param0->unk_04, param3, param0->unk_0C); + StringFormatter_Format(param0->unk_04, param3, param0->unk_0C); return sub_0201D78C(param2, 1, param3, 0, 0, param4, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((15 & 0xff) << 0))), NULL); } @@ -1530,7 +1530,7 @@ static u32 ov114_0225D218 (UnkStruct_ov114_0225D084 * param0, u32 param1, Window static void ov114_0225D254 (UnkStruct_ov114_0225D084 * param0, u32 param1, Window * param2, u8 param3, u8 param4, u32 param5) { MessageLoader_GetStrbuf(param0->unk_00, param1, param0->unk_0C); - sub_0200C388(param0->unk_04, param0->unk_08, param0->unk_0C); + StringFormatter_Format(param0->unk_04, param0->unk_08, param0->unk_0C); sub_0201D78C(param2, 0, param0->unk_08, param3, param4, 0xff, param5, NULL); } diff --git a/src/overlay116/ov116_02261870.c b/src/overlay116/ov116_02261870.c index 65e45be6b1..dafd34aee0 100644 --- a/src/overlay116/ov116_02261870.c +++ b/src/overlay116/ov116_02261870.c @@ -402,7 +402,7 @@ void ov116_02261F70 (UnkStruct_ov116_02262A8C * param0) v0 = MessageLoader_Init(0, 26, 410, 106); v1 = MessageLoader_GetNewStrbuf(v0, 0); - sub_0201D738(¶m0->unk_1FC8, 0, v1, 0, 0, 0, NULL); + PrintStringSimple(¶m0->unk_1FC8, 0, v1, 0, 0, 0, NULL); Strbuf_Free(v1); MessageLoader_Free(v0); } diff --git a/src/overlay118/ov118_021D0D80.c b/src/overlay118/ov118_021D0D80.c index 69e4aa9b18..4adc62e3b0 100644 --- a/src/overlay118/ov118_021D0D80.c +++ b/src/overlay118/ov118_021D0D80.c @@ -147,7 +147,7 @@ int ov118_021D0DBC (GameWindowLayout * param0) v2 = MessageLoader_GetNewStrbuf(param0->unk_69C, 202); sub_0200B5CC(param0->unk_6A0, 0, Pokemon_GetBoxPokemon(v1)); - sub_0200C388(param0->unk_6A0, param0->unk_6A4, v2); + StringFormatter_Format(param0->unk_6A0, param0->unk_6A4, v2); Strbuf_Free(v2); sub_02082708(param0, 0xffffffff, 1); } diff --git a/src/overlay119/ov119_021D0D80.c b/src/overlay119/ov119_021D0D80.c index ff2bbeef2b..d0333ddba3 100644 --- a/src/overlay119/ov119_021D0D80.c +++ b/src/overlay119/ov119_021D0D80.c @@ -325,9 +325,9 @@ int ov119_021D1158 (Window * param0, int param1, Pokemon * param2, int param3) v4 = Pokemon_GetBoxPokemon(param2); sub_0200B538(v3, 0, v4); - sub_0200C388(v3, v2, v1); + StringFormatter_Format(v3, v2, v1); - v0 = sub_0201D738(param0, 1, v2, 0, 0, param3, NULL); + v0 = PrintStringSimple(param0, 1, v2, 0, 0, param3, NULL); MessageLoader_Free(v5); Strbuf_Free(v2); diff --git a/src/unk_02001AF4.c b/src/unk_02001AF4.c index f1adc1865f..17e43c4b25 100644 --- a/src/unk_02001AF4.c +++ b/src/unk_02001AF4.c @@ -352,7 +352,7 @@ static void sub_02001F5C (UIControlData * param0) v0 = param0->unk_00.unk_00[v4 * param0->unk_00.unk_0A + v5].unk_00; v2 = (param0->unk_1A + param0->unk_00.unk_0B_0) * v5 + param0->unk_18; - sub_0201D738(param0->unk_00.unk_04, param0->unk_00.unk_08, v0, v1, v2, 0xff, NULL); + PrintStringSimple(param0->unk_00.unk_04, param0->unk_00.unk_08, v0, v1, v2, 0xff, NULL); } v1 += v3; diff --git a/src/unk_0200B29C.c b/src/unk_0200B29C.c index 5fbe635c67..60a59bacef 100644 --- a/src/unk_0200B29C.c +++ b/src/unk_0200B29C.c @@ -21,7 +21,7 @@ Strbuf* sub_0200B29C (UnkStruct_0200B358 * param0, MessageLoader * param1, u32 p Strbuf* v2 = MessageLoader_GetNewStrbuf(param1, param2); if (v2) { - sub_0200C388(param0, v1, v2); + StringFormatter_Format(param0, v1, v2); v0 = Strbuf_Clone(v1, param3); Strbuf_Free(v2); } diff --git a/src/unk_0200B358.c b/src/unk_0200B358.c index b0c7d36d4e..acaec3a7e1 100644 --- a/src/unk_0200B358.c +++ b/src/unk_0200B358.c @@ -952,7 +952,7 @@ void sub_0200C338 (UnkStruct_0200B358 * param0, u32 param1, u32 param2) } } -void sub_0200C388 (const UnkStruct_0200B358 * param0, Strbuf *param1, const Strbuf *param2) +void StringFormatter_Format (const UnkStruct_0200B358 * param0, Strbuf *param1, const Strbuf *param2) { const u16 * v0; u16 * v1; diff --git a/src/unk_0200DA60.c b/src/unk_0200DA60.c index 4f1eb7029c..2fe6954dca 100644 --- a/src/unk_0200DA60.c +++ b/src/unk_0200DA60.c @@ -533,7 +533,7 @@ static void sub_0200EB8C (SysTask * param0, void * param1) SysTask_Done(param0); } -void sub_0200EBA0 (void * param0) +void DeleteWaitDial (void * param0) { UnkStruct_0200E924 * v0 = param0; diff --git a/src/unk_0201D670.c b/src/unk_0201D670.c index dddb32880c..94f6f97bc7 100644 --- a/src/unk_0201D670.c +++ b/src/unk_0201D670.c @@ -99,28 +99,28 @@ void sub_0201D730 (u8 param0) sub_0201D6B0(param0); } -u8 sub_0201D738 (Window * param0, u32 param1, const Strbuf *param2, u32 param3, u32 param4, u32 param5, UnkFuncPtr_0201D834 param6) +u8 PrintStringSimple (Window *window, u32 fontID, const Strbuf *strbuf, u32 xOffset, u32 yOffset, u32 renderDelay, UnkFuncPtr_0201D834 callback) { UnkStruct_0201D738 v0; - v0.unk_00_val2 = param2; - v0.unk_04 = param0; - v0.unk_09 = param1; - v0.unk_0A = param3; - v0.unk_0B = param4; - v0.unk_0C = param3; - v0.unk_0E = param4; - v0.unk_10 = Unk_02100840[param1].unk_02; - v0.unk_12 = Unk_02100840[param1].unk_03; - v0.unk_14 = Unk_02100840[param1].unk_04; - v0.unk_15 = Unk_02100840[param1].unk_05; - v0.unk_16 = Unk_02100840[param1].unk_06; - v0.unk_17 = Unk_02100840[param1].unk_07; + v0.unk_00_val2 = strbuf; + v0.unk_04 = window; + v0.unk_09 = fontID; + v0.unk_0A = xOffset; + v0.unk_0B = yOffset; + v0.unk_0C = xOffset; + v0.unk_0E = yOffset; + v0.unk_10 = Unk_02100840[fontID].unk_02; + v0.unk_12 = Unk_02100840[fontID].unk_03; + v0.unk_14 = Unk_02100840[fontID].unk_04; + v0.unk_15 = Unk_02100840[fontID].unk_05; + v0.unk_16 = Unk_02100840[fontID].unk_06; + v0.unk_17 = Unk_02100840[fontID].unk_07; v0.unk_18 = 0; v0.unk_1A = 0; v0.unk_1B = 0xFF; - return sub_0201D834(&v0, param5, param6); + return sub_0201D834(&v0, renderDelay, callback); } u8 sub_0201D78C (Window * param0, u32 param1, const Strbuf *param2, u32 param3, u32 param4, u32 param5, u32 param6, UnkFuncPtr_0201D834 param7) diff --git a/src/unk_02039814.c b/src/unk_02039814.c index e9decd2e7d..159bb3688a 100644 --- a/src/unk_02039814.c +++ b/src/unk_02039814.c @@ -165,9 +165,9 @@ void sub_02039834 (int param0, int param1, int param2) sub_0200B60C(v5, 0, param2, 5, 2, 1); MessageLoader_GetStrbuf(v2, v6, v4); - sub_0200C388(v5, v3, v4); + StringFormatter_Format(v5, v3, v4); - sub_0201D738(&v1, 0, v3, 0, 0, 0, NULL); + PrintStringSimple(&v1, 0, v3, 0, 0, 0, NULL); Strbuf_Free(v3); GXLayers_TurnBothDispOn(); diff --git a/src/unk_02039A64.c b/src/unk_02039A64.c index 61261662cf..7278bf64e1 100644 --- a/src/unk_02039A64.c +++ b/src/unk_02039A64.c @@ -124,7 +124,7 @@ void sub_02039A64 (int param0, int param1) BGL_WindowColor(&v1, 15, 0, 0, 26 * 8, 18 * 8); Window_Show(&v1, 0, (512 - 9), 2); MessageLoader_GetStrbuf(v2, v4, v3); - sub_0201D738(&v1, 0, v3, 0, 0, 0, NULL); + PrintStringSimple(&v1, 0, v3, 0, 0, 0, NULL); Strbuf_Free(v3); GXLayers_TurnBothDispOn(); sub_0200F338(0); diff --git a/src/unk_0203A9C8.c b/src/unk_0203A9C8.c index c5df01531a..4ec133e160 100644 --- a/src/unk_0203A9C8.c +++ b/src/unk_0203A9C8.c @@ -540,7 +540,7 @@ static void sub_0203ADFC (UnkStruct_020508D4 * param0) v8 = MessageLoader_GetNewStrbuf(v2, Unk_020EA05C[v1->unk_30[v4]][0]); sub_0200B498(v6, 0, sub_02025E38(v0->unk_0C)); - sub_0200C388(v6, v7, v8); + StringFormatter_Format(v6, v7, v8); sub_02013A6C(v1->unk_24, v7, v1->unk_30[v4]); Strbuf_Free(v8); Strbuf_Free(v7); @@ -673,7 +673,7 @@ static void sub_0203B094 (UnkStruct_020508D4 * param0) v5 = MessageLoader_GetNewStrbuf(v2, 10); } - sub_0201D738(&v1->unk_10, 0, v5, 0, 0, 0xff, NULL); + PrintStringSimple(&v1->unk_10, 0, v5, 0, 0, 0xff, NULL); Strbuf_Free(v5); v3 = sub_0200B358(11); @@ -690,8 +690,8 @@ static void sub_0203B094 (UnkStruct_020508D4 * param0) sub_0200B60C(v3, 0, v8, 2, 0, 1); } - sub_0200C388(v3, v4, v5); - sub_0201D738(&v1->unk_10, 0, v4, 0, 16, 0xff, NULL); + StringFormatter_Format(v3, v4, v5); + PrintStringSimple(&v1->unk_10, 0, v4, 0, 16, 0xff, NULL); Strbuf_Free(v4); Strbuf_Free(v5); sub_0200B3F0(v3); diff --git a/src/unk_0203F6C4.c b/src/unk_0203F6C4.c index 8fcfaf8477..24d6312832 100644 --- a/src/unk_0203F6C4.c +++ b/src/unk_0203F6C4.c @@ -2559,8 +2559,8 @@ static BOOL sub_020404A4 (UnkStruct_0203E724 * param0) ov5_021E1B68(v0); MessageLoader_GetStrbuf(param0->unk_2C, v7, *v1); - sub_0200C388(*v3, *v2, *v1); - sub_0201D738(ov5_021E1B50(v0->unk_64), 1, *v2, 0, 0, 0, NULL); + StringFormatter_Format(*v3, *v2, *v1); + PrintStringSimple(ov5_021E1B50(v0->unk_64), 1, *v2, 0, 0, 0, NULL); return 1; } @@ -2628,7 +2628,7 @@ static BOOL sub_020405DC (UnkStruct_0203E724 * param0) u16 v6 = sub_0203E838(param0); MessageLoader_GetStrbuf(param0->unk_2C, v5, *v2); - sub_0200C388(*v4, *v3, *v2); + StringFormatter_Format(*v4, *v3, *v2); *v1 = sub_0205D994(ov5_021E1B50(v0->unk_64), *v3, sub_02025E44(param0->unk_34->unk_0C), 1); @@ -2784,7 +2784,7 @@ static BOOL sub_02040898 (UnkStruct_0203E724 * param0) void ** v0; v0 = sub_0203F098(param0->unk_34, 18); - sub_0200EBA0(*v0); + DeleteWaitDial(*v0); return 0; } diff --git a/src/unk_020528D0.c b/src/unk_020528D0.c index 501ce1cb03..76076ac607 100644 --- a/src/unk_020528D0.c +++ b/src/unk_020528D0.c @@ -194,7 +194,7 @@ static void sub_02052AA4 (UnkStruct_02052AA4 * param0, u16 param1, u8 param2, u8 BGL_FillWindow(¶m0->unk_0C, 0); MessageLoader_GetStrbuf(param0->unk_1C, param1, v0); - sub_0200C388(param0->unk_20, v1, v0); + StringFormatter_Format(param0->unk_20, v1, v0); { u32 v2 = sub_02002EB4(0, v1, 0); diff --git a/src/unk_02052C6C.c b/src/unk_02052C6C.c index 94e459e590..dd75167b57 100644 --- a/src/unk_02052C6C.c +++ b/src/unk_02052C6C.c @@ -296,7 +296,7 @@ static BOOL sub_02052FFC (UnkStruct_0205300C * param0) static void sub_0205300C (UnkStruct_0205300C * param0) { Strbuf_Free(param0->unk_2C); - sub_0200EBA0(param0->unk_30); + DeleteWaitDial(param0->unk_30); sub_0205D988(¶m0->unk_1C); } diff --git a/src/unk_0205A0D8.c b/src/unk_0205A0D8.c index 6e058edda2..6664c40183 100644 --- a/src/unk_0205A0D8.c +++ b/src/unk_0205A0D8.c @@ -451,7 +451,7 @@ static BOOL sub_0205A324 (UnkStruct_020508D4 * param0) sub_020364F0(0); sub_0200B498(v0->unk_28, 0, v0->unk_74); MessageLoader_GetStrbuf(v0->unk_2C, 14, v0->unk_0C); - sub_0200C388(v0->unk_28, v0->unk_10, v0->unk_0C); + StringFormatter_Format(v0->unk_28, v0->unk_10, v0->unk_0C); v0->unk_30 = sub_0205AA50(v0, v0->unk_10); v0->unk_34 = 27; } @@ -522,7 +522,7 @@ static BOOL sub_0205A324 (UnkStruct_020508D4 * param0) case 36: sub_0200B538(v0->unk_28, 1, Pokemon_GetBoxPokemon(Party_GetPokemonBySlotIndex(v0->unk_50, v0->unk_84))); MessageLoader_GetStrbuf(v0->unk_2C, 18, v0->unk_0C); - sub_0200C388(v0->unk_28, v0->unk_10, v0->unk_0C); + StringFormatter_Format(v0->unk_28, v0->unk_10, v0->unk_0C); v0->unk_30 = sub_0205AA50(v0, v0->unk_10); v0->unk_34 = 37; break; @@ -544,7 +544,7 @@ static BOOL sub_0205A324 (UnkStruct_020508D4 * param0) if (v0->unk_81 == 1) { sub_0205B0B4(v0); MessageLoader_GetStrbuf(v0->unk_2C, 14, v0->unk_0C); - sub_0200C388(v0->unk_28, v0->unk_10, v0->unk_0C); + StringFormatter_Format(v0->unk_28, v0->unk_10, v0->unk_0C); v0->unk_30 = sub_0205AA50(v0, v0->unk_10); sub_020364F0(2); v0->unk_34 = 39; @@ -890,11 +890,11 @@ static void sub_0205ADF8 (UnkStruct_0205A0D8 * param0, int param1) v2 = Pokemon_GetValue((Pokemon *)(¶m0->unk_48[v1 * v3]), MON_DATA_SPECIES, NULL); MessageLoader_GetStrbuf(v4, v2, param0->unk_0C); - sub_0201D738(v0, 0, param0->unk_0C, 16, v1 * 16, 0xff, NULL); + PrintStringSimple(v0, 0, param0->unk_0C, 16, v1 * 16, 0xff, NULL); } MessageLoader_GetStrbuf(param0->unk_2C, 21, param0->unk_0C); - sub_0201D738(v0, 0, param0->unk_0C, 16, v1 * 16, 0xff, NULL); + PrintStringSimple(v0, 0, param0->unk_0C, 16, v1 * 16, 0xff, NULL); MessageLoader_Free(v4); } @@ -920,7 +920,7 @@ static void sub_0205AF18 (UnkStruct_0205A0D8 * param0, int param1) for (v1 = 0; v1 < 3; v1++) { MessageLoader_GetStrbuf(param0->unk_2C, 22 + v1, param0->unk_0C); - sub_0201D738(v0, 0, param0->unk_0C, 16, v1 * 16, 0xff, NULL); + PrintStringSimple(v0, 0, param0->unk_0C, 16, v1 * 16, 0xff, NULL); } } @@ -1027,7 +1027,7 @@ static BOOL sub_0205B140 (UnkStruct_020508D4 * param0) MessageLoader_GetStrbuf(v1->unk_1C, 2 + v2->unk_03, v1->unk_00); sub_0200B498(v1->unk_18, 0, sub_02032EE8(v1->unk_24)); - sub_0200C388(v1->unk_18, v1->unk_04, v1->unk_00); + StringFormatter_Format(v1->unk_18, v1->unk_04, v1->unk_00); sub_0205D8F4(v0->unk_08, &v1->unk_08, 3); sub_0205D944(&v1->unk_08, sub_02025E44(v0->unk_0C)); diff --git a/src/unk_0205D8CC.c b/src/unk_0205D8CC.c index d245d49be8..8cafc81e78 100644 --- a/src/unk_0205D8CC.c +++ b/src/unk_0205D8CC.c @@ -54,7 +54,7 @@ u8 sub_0205D994 (Window * param0, Strbuf *param1, const AnimationControlFlags * sub_02002AE4(0); sub_02002B20(0); - v0 = sub_0201D738(param0, 1, param1, 0, 0, sub_02027AC0(param2), NULL); + v0 = PrintStringSimple(param0, 1, param1, 0, 0, sub_02027AC0(param2), NULL); return v0; } @@ -64,7 +64,7 @@ u8 sub_0205D9CC (Window * param0, Strbuf *param1, int param2, int param3, u8 par sub_02002AE4(param5); sub_02002B20(0); - return sub_0201D738(param0, param2, param1, 0, 0, param3, NULL); + return PrintStringSimple(param0, param2, param1, 0, 0, param3, NULL); } u8 sub_0205DA04 (u8 param0) diff --git a/src/unk_0206F314.c b/src/unk_0206F314.c index 966553bbe3..73130fd6e5 100644 --- a/src/unk_0206F314.c +++ b/src/unk_0206F314.c @@ -801,10 +801,10 @@ static void sub_02070050 (UnkStruct_0206F7F8 * param0, BOOL param1) sub_0200B60C(param0->unk_2C.unk_04, 0, v2, 1, 1, 1); sub_0200B48C(param0->unk_2C.unk_04, 1, v6->unk_04[v0].unk_00->unk_08, 2, 1, GAME_LANGUAGE); - sub_0200C388(param0->unk_2C.unk_04, param0->unk_2C.unk_08, param0->unk_2C.unk_18); + StringFormatter_Format(param0->unk_2C.unk_04, param0->unk_2C.unk_08, param0->unk_2C.unk_18); sub_0201D78C(¶m0->unk_D4, 0, param0->unk_2C.unk_08, 8, v3 * 16, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | (((15 & 0xff) << 0)))), NULL); sub_0200B60C(param0->unk_2C.unk_04, 0, v4, v7->unk_04, 1, 1); - sub_0200C388(param0->unk_2C.unk_04, param0->unk_2C.unk_08, param0->unk_2C.unk_1C[v7->unk_06 - 15]); + StringFormatter_Format(param0->unk_2C.unk_04, param0->unk_2C.unk_08, param0->unk_2C.unk_1C[v7->unk_06 - 15]); sub_0201D78C(¶m0->unk_D4, 0, param0->unk_2C.unk_08, (24 * 8) - sub_02002D7C(0, param0->unk_2C.unk_08, 0) - 8, v3 * 16, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | (((15 & 0xff) << 0)))), NULL); param0->unk_32C[v3] = v0; diff --git a/src/unk_020722AC.c b/src/unk_020722AC.c index ac37aba3fb..1f3c6273c3 100644 --- a/src/unk_020722AC.c +++ b/src/unk_020722AC.c @@ -1097,7 +1097,7 @@ static void sub_020732C4 (UnkStruct_02072334 * param0, int param1, u8 param2, u8 if (param1 == 0) { Strbuf_Clear(param0->unk_110.unk_04); sub_0200B48C(param0->unk_110.unk_00, 0, param0->unk_1C[param0->unk_18].unk_08, 2, 1, GAME_LANGUAGE); - sub_0200C388(param0->unk_110.unk_00, param0->unk_110.unk_04, param0->unk_110.unk_10[param1]); + StringFormatter_Format(param0->unk_110.unk_00, param0->unk_110.unk_04, param0->unk_110.unk_10[param1]); v0 = param0->unk_110.unk_04; } else { diff --git a/src/unk_0207A6DC.c b/src/unk_0207A6DC.c index 6d122f613b..ee2470ba3d 100644 --- a/src/unk_0207A6DC.c +++ b/src/unk_0207A6DC.c @@ -30,7 +30,7 @@ #include "party.h" #include "unk_0207A6DC.h" #include "overlay016/ov16_0223DF00.h" -#include "overlay016/ov16_0226485C.h" +#include "battle/battle_io.h" void sub_0207A81C(BattleSystem * param0, int param1, int param2, void * param3, u8 param4); BOOL sub_0207A8F4(UnkStruct_0207A778 * param0, u32 param1); diff --git a/src/unk_0207AE68.c b/src/unk_0207AE68.c index 6a23efd694..0e4745e6fd 100644 --- a/src/unk_0207AE68.c +++ b/src/unk_0207AE68.c @@ -986,11 +986,11 @@ static u8 sub_0207C584 (UnkStruct_0207AE68 * param0, int param1) v0 = MessageLoader_GetNewStrbuf(param0->unk_08, param1); - sub_0200C388(param0->unk_0C, param0->unk_10, v0); + StringFormatter_Format(param0->unk_0C, param0->unk_10, v0); Heap_FreeToHeap(v0); BGL_FillWindow(param0->unk_04, 0xff); - return sub_0201D738(param0->unk_04, 1, param0->unk_10, 0, 0, sub_02027AC0(param0->unk_2C), sub_0207C5CC); + return PrintStringSimple(param0->unk_04, 1, param0->unk_10, 0, 0, sub_02027AC0(param0->unk_2C), sub_0207C5CC); } static BOOL sub_0207C5CC (UnkStruct_0201D738 * param0, u16 param1) diff --git a/src/unk_0207CB08.c b/src/unk_0207CB08.c index 42baebb76a..0fb0199329 100644 --- a/src/unk_0207CB08.c +++ b/src/unk_0207CB08.c @@ -166,7 +166,7 @@ BOOL sub_0207CC10 (SaveData * param0, Strbuf *param1, u16 param2, u32 param3) return 0; } - sub_0200C388(v1, param1, v2); + StringFormatter_Format(v1, param1, v2); Strbuf_Free(v2); sub_0200B3F0(v1); MessageLoader_Free(v0); @@ -201,7 +201,7 @@ void sub_0207CD34 (void * param0, Strbuf *param1, u16 param2, u32 param3, u32 pa v1 = sub_0200B358(param4); v2 = MessageLoader_GetNewStrbuf(v0, 36); sub_0200B498(v1, 0, param0); - sub_0200C388(v1, param1, v2); + StringFormatter_Format(v1, param1, v2); Strbuf_Free(v2); sub_0200B3F0(v1); MessageLoader_Free(v0); diff --git a/src/unk_0207E0B8.c b/src/unk_0207E0B8.c index 35f40e4e9d..c1bba69df9 100644 --- a/src/unk_0207E0B8.c +++ b/src/unk_0207E0B8.c @@ -2124,7 +2124,7 @@ static int HandleGameWindowEvent (GameWindowLayout * param0) v2 = sub_02026074(param0->unk_5A4->unk_14, 3); sub_0200B60C(param0->unk_6A0, 0, v2, 3, 0, 1); - sub_0200C388(param0->unk_6A0, param0->unk_6A4, v1); + StringFormatter_Format(param0->unk_6A0, param0->unk_6A4, v1); Strbuf_Free(v1); } sub_02082708(param0, 0xffffffff, 1); @@ -2466,7 +2466,7 @@ static int ProcessWindowInput (GameWindowLayout * param0) sub_0200B5CC(param0->unk_6A0, 0, Pokemon_GetBoxPokemon(v0)); sub_0200B60C(param0->unk_6A0, 1, param0->unk_B14[2], 3, 0, 1); - sub_0200C388(param0->unk_6A0, param0->unk_6A4, v1); + StringFormatter_Format(param0->unk_6A0, param0->unk_6A4, v1); Strbuf_Free(v1); sub_02082708(param0, 0xffffffff, 1); @@ -2658,13 +2658,13 @@ static int ProcessItemApplication (GameWindowLayout * param0) MessageLoader_GetStrbuf(param0->unk_69C, 203, param0->unk_6A8); sub_0200B5CC(param0->unk_6A0, 0, Pokemon_GetBoxPokemon(v0)); sub_0200B744(param0->unk_6A0, 1, param0->unk_5A4->unk_24); - sub_0200C388(param0->unk_6A0, param0->unk_6A4, param0->unk_6A8); + StringFormatter_Format(param0->unk_6A0, param0->unk_6A4, param0->unk_6A8); v2 = 11; } else if (v4 != NULL) { if (v4->unk_1C->unk_00 == 466) { MessageLoader_GetStrbuf(param0->unk_69C, 204, param0->unk_6A8); sub_0200B70C(param0->unk_6A0, 0, param0->unk_5A4->unk_24); - sub_0200C388(param0->unk_6A0, param0->unk_6A4, param0->unk_6A8); + StringFormatter_Format(param0->unk_6A0, param0->unk_6A4, param0->unk_6A8); v2 = 11; } } @@ -2683,13 +2683,13 @@ static int ProcessItemApplication (GameWindowLayout * param0) MessageLoader_GetStrbuf(param0->unk_69C, 118, param0->unk_6A8); sub_0200B5CC(param0->unk_6A0, 0, Pokemon_GetBoxPokemon(v0)); sub_0200B70C(param0->unk_6A0, 1, param0->unk_5A4->unk_24); - sub_0200C388(param0->unk_6A0, param0->unk_6A4, param0->unk_6A8); + StringFormatter_Format(param0->unk_6A0, param0->unk_6A4, param0->unk_6A8); break; case 1: MessageLoader_GetStrbuf(param0->unk_69C, 78, param0->unk_6A8); sub_0200B5CC(param0->unk_6A0, 0, Pokemon_GetBoxPokemon(v0)); sub_0200B744(param0->unk_6A0, 1, param0->unk_704[param0->unk_B11].unk_0C); - sub_0200C388(param0->unk_6A0, param0->unk_6A4, param0->unk_6A8); + StringFormatter_Format(param0->unk_6A0, param0->unk_6A4, param0->unk_6A8); v2 = 9; break; case 2: @@ -2821,7 +2821,7 @@ static int ProcessPokemonItemSwap (GameWindowLayout * param0) MessageLoader_GetStrbuf(param0->unk_69C, 84, param0->unk_6A8); sub_0200B70C(param0->unk_6A0, 1, v5); sub_0200B70C(param0->unk_6A0, 2, v4); - sub_0200C388(param0->unk_6A0, param0->unk_6A4, param0->unk_6A8); + StringFormatter_Format(param0->unk_6A0, param0->unk_6A4, param0->unk_6A8); if ((v4 != 112) && (v5 == 112) && (v1 != -1)) { v0 = 12; @@ -2877,13 +2877,13 @@ static int UpdatePokemonFormWithItem (GameWindowLayout * param0) MessageLoader_GetStrbuf(param0->unk_69C, 118, param0->unk_6A8); sub_0200B5CC(param0->unk_6A0, 0, Pokemon_GetBoxPokemon(v0)); sub_0200B70C(param0->unk_6A0, 1, param0->unk_5A4->unk_24); - sub_0200C388(param0->unk_6A0, param0->unk_6A4, param0->unk_6A8); + StringFormatter_Format(param0->unk_6A0, param0->unk_6A4, param0->unk_6A8); } else { sub_0207D570(param0->unk_5A4->unk_04, (u16)v3, 1, 12); MessageLoader_GetStrbuf(param0->unk_69C, 84, param0->unk_6A8); sub_0200B70C(param0->unk_6A0, 1, v3); sub_0200B70C(param0->unk_6A0, 2, v2); - sub_0200C388(param0->unk_6A0, param0->unk_6A4, param0->unk_6A8); + StringFormatter_Format(param0->unk_6A0, param0->unk_6A4, param0->unk_6A8); } sub_0200E060(v1, 1, (1 + 9), 15); diff --git a/src/unk_020819DC.c b/src/unk_020819DC.c index a973722e6c..58e6cadaa2 100644 --- a/src/unk_020819DC.c +++ b/src/unk_020819DC.c @@ -194,7 +194,7 @@ void sub_02081CAC (GameWindowLayout * param0, u16 param1, u8 param2) v0 = MessageLoader_GetNewStrbuf(param0->unk_69C, 156 + param2); sub_0200B630(param0->unk_6A0, 0, param1); - sub_0200C388(param0->unk_6A0, param0->unk_6AC[16 + param2], v0); + StringFormatter_Format(param0->unk_6A0, param0->unk_6AC[16 + param2], v0); Strbuf_Free(v0); } @@ -250,7 +250,7 @@ void sub_02081E08 (GameWindowLayout * param0) v1 = MessageLoader_GetNewStrbuf(param0->unk_69C, 37); sub_0200B5CC(param0->unk_6A0, 0, Pokemon_GetBoxPokemon(v0)); - sub_0200C388(param0->unk_6A0, param0->unk_6A4, v1); + StringFormatter_Format(param0->unk_6A0, param0->unk_6A4, v1); Strbuf_Free(v1); } } @@ -276,7 +276,7 @@ void sub_02081ED8 (GameWindowLayout * param0, Pokemon * param1, u32 param2) v0 = MessageLoader_GetNewStrbuf(param0->unk_69C, Unk_020F1EA0[param2][0]); sub_0200B5CC(param0->unk_6A0, 0, Pokemon_GetBoxPokemon(param1)); - sub_0200C388(param0->unk_6A0, param0->unk_704[param2].unk_00, v0); + StringFormatter_Format(param0->unk_6A0, param0->unk_704[param2].unk_00, v0); Strbuf_Free(v0); } @@ -584,7 +584,7 @@ static void sub_02082680 (GameWindowLayout * param0, Window * param1, u32 param2 MessageLoader_GetStrbuf(param0->unk_69C, param2, param0->unk_6A4); } - sub_0201D738(param1, 1, param0->unk_6A4, 0, 0, 0xff, NULL); + PrintStringSimple(param1, 1, param0->unk_6A4, 0, 0, 0xff, NULL); sub_0201A9A4(param1); } @@ -619,7 +619,7 @@ void sub_0208274C (GameWindowLayout * param0) { sub_02002AC8(1); sub_02002AE4(0); - param0->unk_B10 = sub_0201D738( + param0->unk_B10 = PrintStringSimple( ¶m0->unk_04[34], 1, param0->unk_6A4, 0, 0, sub_02027AC0(param0->unk_5A4->unk_0C), sub_0208279C); } @@ -762,18 +762,18 @@ void sub_020829DC (GameWindowLayout * param0) for (v2 = 0; v2 < 6; v2++) { v1 = MessageLoader_GetNewStrbuf(param0->unk_69C, 185 + v2); - sub_0201D738(¶m0->unk_254[0], 0, v1, 0, 16 * v2, 0xff, NULL); + PrintStringSimple(¶m0->unk_254[0], 0, v1, 0, 16 * v2, 0xff, NULL); Strbuf_Free(v1); v1 = MessageLoader_GetNewStrbuf(param0->unk_69C, 191); sub_0200B60C(param0->unk_6A0, 0, v3[v2] - param0->unk_B14[v2], 2, 0, 1); - sub_0200C388(param0->unk_6A0, param0->unk_6A4, v1); + StringFormatter_Format(param0->unk_6A0, param0->unk_6A4, v1); Strbuf_Free(v1); { u32 v4 = 14 * 8 - 8 - sub_02002D7C(0, param0->unk_6A4, 0); - sub_0201D738(¶m0->unk_254[0], 0, param0->unk_6A4, v4, 16 * v2, 0xff, NULL); + PrintStringSimple(¶m0->unk_254[0], 0, param0->unk_6A4, v4, 16 * v2, 0xff, NULL); } param0->unk_B14[v2] = v3[v2]; @@ -793,11 +793,11 @@ void sub_02082B58 (GameWindowLayout * param0) for (v2 = 0; v2 < 6; v2++) { sub_0200B60C(param0->unk_6A0, 0, param0->unk_B14[v2], 3, 0, 1); - sub_0200C388(param0->unk_6A0, param0->unk_6A4, v0); + StringFormatter_Format(param0->unk_6A0, param0->unk_6A4, v0); v1 = sub_02002D7C(0, param0->unk_6A4, 0); - sub_0201D738(¶m0->unk_254[0], 0, param0->unk_6A4, 14 * 8 - v1 - 8, 16 * v2, 0xff, NULL); + PrintStringSimple(¶m0->unk_254[0], 0, param0->unk_6A4, 14 * 8 - v1 - 8, 16 * v2, 0xff, NULL); } Strbuf_Free(v0); diff --git a/src/unk_02083370.c b/src/unk_02083370.c index cc031fa20c..9b6257ff73 100644 --- a/src/unk_02083370.c +++ b/src/unk_02083370.c @@ -178,7 +178,7 @@ static void sub_020834B0 (GameWindowLayout * param0, int * param1) v0 = Party_GetPokemonBySlotIndex(param0->unk_5A4->unk_00, param0->unk_B11); MessageLoader_GetStrbuf(param0->unk_69C, 81, param0->unk_6A8); sub_0200B5CC(param0->unk_6A0, 0, Pokemon_GetBoxPokemon(v0)); - sub_0200C388(param0->unk_6A0, param0->unk_6A4, param0->unk_6A8); + StringFormatter_Format(param0->unk_6A0, param0->unk_6A4, param0->unk_6A8); } else if (sub_0207D570(param0->unk_5A4->unk_04, param0->unk_704[param0->unk_B11].unk_0C, 1, 12) == 1) { u32 v4; @@ -199,7 +199,7 @@ static void sub_020834B0 (GameWindowLayout * param0, int * param1) MessageLoader_GetStrbuf(param0->unk_69C, 82, param0->unk_6A8); sub_0200B5CC(param0->unk_6A0, 0, Pokemon_GetBoxPokemon(v0)); sub_0200B70C(param0->unk_6A0, 1, param0->unk_704[param0->unk_B11].unk_0C); - sub_0200C388(param0->unk_6A0, param0->unk_6A4, param0->unk_6A8); + StringFormatter_Format(param0->unk_6A0, param0->unk_6A4, param0->unk_6A8); param0->unk_704[param0->unk_B11].unk_0C = 0; diff --git a/src/unk_02084B70.c b/src/unk_02084B70.c index a810c9bc40..a9cb201f4e 100644 --- a/src/unk_02084B70.c +++ b/src/unk_02084B70.c @@ -230,121 +230,121 @@ static void sub_02084E58 (GameWindowLayout * param0, u16 param1, u32 param2) switch (sub_02084B70(param1)) { case 4: v1 = MessageLoader_GetNewStrbuf(param0->unk_69C, 65); - sub_0200C388(param0->unk_6A0, param0->unk_6A4, v1); + StringFormatter_Format(param0->unk_6A0, param0->unk_6A4, v1); Strbuf_Free(v1); break; case 3: v1 = MessageLoader_GetNewStrbuf(param0->unk_69C, 91); - sub_0200C388(param0->unk_6A0, param0->unk_6A4, v1); + StringFormatter_Format(param0->unk_6A0, param0->unk_6A4, v1); Strbuf_Free(v1); break; case 5: v1 = MessageLoader_GetNewStrbuf(param0->unk_69C, 67); - sub_0200C388(param0->unk_6A0, param0->unk_6A4, v1); + StringFormatter_Format(param0->unk_6A0, param0->unk_6A4, v1); Strbuf_Free(v1); break; case 6: v1 = MessageLoader_GetNewStrbuf(param0->unk_69C, 68); - sub_0200C388(param0->unk_6A0, param0->unk_6A4, v1); + StringFormatter_Format(param0->unk_6A0, param0->unk_6A4, v1); Strbuf_Free(v1); break; case 7: v1 = MessageLoader_GetNewStrbuf(param0->unk_69C, 66); - sub_0200C388(param0->unk_6A0, param0->unk_6A4, v1); + StringFormatter_Format(param0->unk_6A0, param0->unk_6A4, v1); Strbuf_Free(v1); break; case 8: v1 = MessageLoader_GetNewStrbuf(param0->unk_69C, 73); - sub_0200C388(param0->unk_6A0, param0->unk_6A4, v1); + StringFormatter_Format(param0->unk_6A0, param0->unk_6A4, v1); Strbuf_Free(v1); break; case 10: v1 = MessageLoader_GetNewStrbuf(param0->unk_69C, 74); - sub_0200C388(param0->unk_6A0, param0->unk_6A4, v1); + StringFormatter_Format(param0->unk_6A0, param0->unk_6A4, v1); Strbuf_Free(v1); break; case 9: v1 = MessageLoader_GetNewStrbuf(param0->unk_69C, 71); - sub_0200C388(param0->unk_6A0, param0->unk_6A4, v1); + StringFormatter_Format(param0->unk_6A0, param0->unk_6A4, v1); Strbuf_Free(v1); break; case 12: v1 = MessageLoader_GetNewStrbuf(param0->unk_69C, 75); sub_0200B824(param0->unk_6A0, 1, 0); - sub_0200C388(param0->unk_6A0, param0->unk_6A4, v1); + StringFormatter_Format(param0->unk_6A0, param0->unk_6A4, v1); Strbuf_Free(v1); break; case 13: v1 = MessageLoader_GetNewStrbuf(param0->unk_69C, 75); sub_0200B824(param0->unk_6A0, 1, 1); - sub_0200C388(param0->unk_6A0, param0->unk_6A4, v1); + StringFormatter_Format(param0->unk_6A0, param0->unk_6A4, v1); Strbuf_Free(v1); break; case 14: v1 = MessageLoader_GetNewStrbuf(param0->unk_69C, 75); sub_0200B824(param0->unk_6A0, 1, 2); - sub_0200C388(param0->unk_6A0, param0->unk_6A4, v1); + StringFormatter_Format(param0->unk_6A0, param0->unk_6A4, v1); Strbuf_Free(v1); break; case 15: v1 = MessageLoader_GetNewStrbuf(param0->unk_69C, 75); sub_0200B824(param0->unk_6A0, 1, 3); - sub_0200C388(param0->unk_6A0, param0->unk_6A4, v1); + StringFormatter_Format(param0->unk_6A0, param0->unk_6A4, v1); Strbuf_Free(v1); break; case 16: v1 = MessageLoader_GetNewStrbuf(param0->unk_69C, 75); sub_0200B824(param0->unk_6A0, 1, 4); - sub_0200C388(param0->unk_6A0, param0->unk_6A4, v1); + StringFormatter_Format(param0->unk_6A0, param0->unk_6A4, v1); Strbuf_Free(v1); break; case 17: v1 = MessageLoader_GetNewStrbuf(param0->unk_69C, 75); sub_0200B824(param0->unk_6A0, 1, 5); - sub_0200C388(param0->unk_6A0, param0->unk_6A4, v1); + StringFormatter_Format(param0->unk_6A0, param0->unk_6A4, v1); Strbuf_Free(v1); break; case 18: v1 = MessageLoader_GetNewStrbuf(param0->unk_69C, 110 + param2); sub_0200B824(param0->unk_6A0, 1, 0); - sub_0200C388(param0->unk_6A0, param0->unk_6A4, v1); + StringFormatter_Format(param0->unk_6A0, param0->unk_6A4, v1); Strbuf_Free(v1); break; case 19: v1 = MessageLoader_GetNewStrbuf(param0->unk_69C, 110 + param2); sub_0200B824(param0->unk_6A0, 1, 1); - sub_0200C388(param0->unk_6A0, param0->unk_6A4, v1); + StringFormatter_Format(param0->unk_6A0, param0->unk_6A4, v1); Strbuf_Free(v1); break; case 20: v1 = MessageLoader_GetNewStrbuf(param0->unk_69C, 110 + param2); sub_0200B824(param0->unk_6A0, 1, 2); - sub_0200C388(param0->unk_6A0, param0->unk_6A4, v1); + StringFormatter_Format(param0->unk_6A0, param0->unk_6A4, v1); Strbuf_Free(v1); break; case 21: v1 = MessageLoader_GetNewStrbuf(param0->unk_69C, 110 + param2); sub_0200B824(param0->unk_6A0, 1, 3); - sub_0200C388(param0->unk_6A0, param0->unk_6A4, v1); + StringFormatter_Format(param0->unk_6A0, param0->unk_6A4, v1); Strbuf_Free(v1); break; case 22: v1 = MessageLoader_GetNewStrbuf(param0->unk_69C, 110 + param2); sub_0200B824(param0->unk_6A0, 1, 4); - sub_0200C388(param0->unk_6A0, param0->unk_6A4, v1); + StringFormatter_Format(param0->unk_6A0, param0->unk_6A4, v1); Strbuf_Free(v1); break; case 23: v1 = MessageLoader_GetNewStrbuf(param0->unk_69C, 110 + param2); sub_0200B824(param0->unk_6A0, 1, 5); - sub_0200C388(param0->unk_6A0, param0->unk_6A4, v1); + StringFormatter_Format(param0->unk_6A0, param0->unk_6A4, v1); Strbuf_Free(v1); break; case 25: case 26: v1 = MessageLoader_GetNewStrbuf(param0->unk_69C, 72); sub_0200B630(param0->unk_6A0, 0, param2); - sub_0200C388(param0->unk_6A0, param0->unk_6A4, v1); + StringFormatter_Format(param0->unk_6A0, param0->unk_6A4, v1); Strbuf_Free(v1); break; case 27: @@ -497,7 +497,7 @@ static int sub_020855C4 (void * param0) sub_0200B5CC(v0->unk_6A0, 0, Pokemon_GetBoxPokemon(v1)); sub_0200B60C(v0->unk_6A0, 1, v3 - v0->unk_704[v0->unk_B11].unk_06, 3, 0, 1); - sub_0200C388(v0->unk_6A0, v0->unk_6A4, v2); + StringFormatter_Format(v0->unk_6A0, v0->unk_6A4, v2); Strbuf_Free(v2); v4 = sub_0208E9F0(v1); @@ -600,7 +600,7 @@ int sub_02085804 (GameWindowLayout * param0) v1 = MessageLoader_GetNewStrbuf(param0->unk_69C, 70); sub_0200B5CC(param0->unk_6A0, 0, Pokemon_GetBoxPokemon(v0)); - sub_0200C388(param0->unk_6A0, param0->unk_6A4, v1); + StringFormatter_Format(param0->unk_6A0, param0->unk_6A4, v1); Strbuf_Free(v1); param0->unk_704[param0->unk_B11].unk_0E_0 = 7; @@ -684,7 +684,7 @@ static int sub_02085A70 (void * param0) sub_0200B5CC(v0->unk_6A0, 0, Pokemon_GetBoxPokemon(v1)); sub_0200B60C(v0->unk_6A0, 1, v0->unk_704[v0->unk_B11].unk_0A, 3, 0, 1); - sub_0200C388(v0->unk_6A0, v0->unk_6A4, v2); + StringFormatter_Format(v0->unk_6A0, v0->unk_6A4, v2); Strbuf_Free(v2); v4 = sub_0208E9F0(v1); @@ -755,7 +755,7 @@ static int sub_02085C50 (void * param0) v2 = MessageLoader_GetNewStrbuf(v0->unk_69C, 52); - sub_0200C388(v0->unk_6A0, v0->unk_6A4, v2); + StringFormatter_Format(v0->unk_6A0, v0->unk_6A4, v2); Strbuf_Free(v2); sub_02082708(v0, 0xffffffff, 0); @@ -772,7 +772,7 @@ static int sub_02085C50 (void * param0) v2 = MessageLoader_GetNewStrbuf(v0->unk_69C, 194); - sub_0200C388(v0->unk_6A0, v0->unk_6A4, v2); + StringFormatter_Format(v0->unk_6A0, v0->unk_6A4, v2); Strbuf_Free(v2); sub_02082708(v0, 0xffffffff, 0); v0->unk_B13 = 4; @@ -794,7 +794,7 @@ static int sub_02085C50 (void * param0) v2 = MessageLoader_GetNewStrbuf(v0->unk_69C, 61); sub_0200B630(v0->unk_6A0, 1, v0->unk_5A4->unk_26); - sub_0200C388(v0->unk_6A0, v0->unk_6A4, v2); + StringFormatter_Format(v0->unk_6A0, v0->unk_6A4, v2); Strbuf_Free(v2); sub_02082708(v0, 0xffffffff, 0); @@ -842,7 +842,7 @@ int sub_02085EF4 (GameWindowLayout * param0) sub_0200B630(param0->unk_6A0, 1, Pokemon_GetValue(v0, 54 + param0->unk_5A4->unk_28, NULL)); v1 = MessageLoader_GetNewStrbuf(param0->unk_69C, 60); - sub_0200C388(param0->unk_6A0, param0->unk_6A4, v1); + StringFormatter_Format(param0->unk_6A0, param0->unk_6A4, v1); Strbuf_Free(v1); sub_02082708(param0, 0xffffffff, 1); @@ -860,7 +860,7 @@ static int sub_02085FB4 (void * param0) v0 = param0; v1 = MessageLoader_GetNewStrbuf(v0->unk_69C, 59); - sub_0200C388(v0->unk_6A0, v0->unk_6A4, v1); + StringFormatter_Format(v0->unk_6A0, v0->unk_6A4, v1); Strbuf_Free(v1); sub_02082708(v0, 0xffffffff, 0); @@ -878,7 +878,7 @@ static int sub_02086008 (void * param0) v0 = param0; v1 = MessageLoader_GetNewStrbuf(v0->unk_69C, 55); - sub_0200C388(v0->unk_6A0, v0->unk_6A4, v1); + StringFormatter_Format(v0->unk_6A0, v0->unk_6A4, v1); Strbuf_Free(v1); sub_02082708(v0, 0xffffffff, 1); @@ -897,7 +897,7 @@ static int sub_02086060 (void * param0) v0 = param0; v1 = MessageLoader_GetNewStrbuf(v0->unk_69C, 58); - sub_0200C388(v0->unk_6A0, v0->unk_6A4, v1); + StringFormatter_Format(v0->unk_6A0, v0->unk_6A4, v1); Strbuf_Free(v1); sub_02082708(v0, 0xffffffff, 0); @@ -915,7 +915,7 @@ static int sub_020860AC (void * param0) v0 = param0; v1 = MessageLoader_GetNewStrbuf(v0->unk_69C, 52); - sub_0200C388(v0->unk_6A0, v0->unk_6A4, v1); + StringFormatter_Format(v0->unk_6A0, v0->unk_6A4, v1); Strbuf_Free(v1); sub_02082708(v0, 0xffffffff, 0); @@ -973,7 +973,7 @@ int sub_0208615C (GameWindowLayout * param0) case 3: sub_02086590(param0, v0, v2); v1 = MessageLoader_GetNewStrbuf(param0->unk_69C, 61); - sub_0200C388(param0->unk_6A0, param0->unk_6A4, v1); + StringFormatter_Format(param0->unk_6A0, param0->unk_6A4, v1); Strbuf_Free(v1); sub_02082708(param0, 0xffffffff, 1); param0->unk_5A4->unk_23 = 0; @@ -981,7 +981,7 @@ int sub_0208615C (GameWindowLayout * param0) break; case 0xfd: v1 = MessageLoader_GetNewStrbuf(param0->unk_69C, 63); - sub_0200C388(param0->unk_6A0, param0->unk_6A4, v1); + StringFormatter_Format(param0->unk_6A0, param0->unk_6A4, v1); Strbuf_Free(v1); sub_02082708(param0, 0xffffffff, 1); param0->unk_5A4->unk_23 = 0; @@ -989,7 +989,7 @@ int sub_0208615C (GameWindowLayout * param0) break; case 0xfe: v1 = MessageLoader_GetNewStrbuf(param0->unk_69C, 52); - sub_0200C388(param0->unk_6A0, param0->unk_6A4, v1); + StringFormatter_Format(param0->unk_6A0, param0->unk_6A4, v1); Strbuf_Free(v1); sub_02082708(param0, 0xffffffff, 1); @@ -999,7 +999,7 @@ int sub_0208615C (GameWindowLayout * param0) break; case 0xff: v1 = MessageLoader_GetNewStrbuf(param0->unk_69C, 62); - sub_0200C388(param0->unk_6A0, param0->unk_6A4, v1); + StringFormatter_Format(param0->unk_6A0, param0->unk_6A4, v1); Strbuf_Free(v1); sub_02082708(param0, 0xffffffff, 1); @@ -1026,7 +1026,7 @@ int sub_020862F8 (GameWindowLayout * param0) sub_0200B630(param0->unk_6A0, 1, Pokemon_GetValue(v0, 54 + param0->unk_5A4->unk_28, NULL)); v1 = MessageLoader_GetNewStrbuf(param0->unk_69C, 60); - sub_0200C388(param0->unk_6A0, param0->unk_6A4, v1); + StringFormatter_Format(param0->unk_6A0, param0->unk_6A4, v1); Strbuf_Free(v1); sub_02082708(param0, 0xffffffff, 1); @@ -1045,7 +1045,7 @@ int sub_020863A0 (GameWindowLayout * param0) sub_02086590(param0, v0, param0->unk_5A4->unk_28); v1 = MessageLoader_GetNewStrbuf(param0->unk_69C, 61); sub_0200B630(param0->unk_6A0, 1, param0->unk_5A4->unk_26); - sub_0200C388(param0->unk_6A0, param0->unk_6A4, v1); + StringFormatter_Format(param0->unk_6A0, param0->unk_6A4, v1); Strbuf_Free(v1); sub_02082708(param0, 0xffffffff, 0); @@ -1066,7 +1066,7 @@ static int sub_02086438 (void * param0) v0 = param0; v1 = MessageLoader_GetNewStrbuf(v0->unk_69C, 59); - sub_0200C388(v0->unk_6A0, v0->unk_6A4, v1); + StringFormatter_Format(v0->unk_6A0, v0->unk_6A4, v1); Strbuf_Free(v1); sub_02082708(v0, 0xffffffff, 0); @@ -1084,7 +1084,7 @@ static int sub_0208648C (void * param0) v0 = param0; v1 = MessageLoader_GetNewStrbuf(v0->unk_69C, 55); - sub_0200C388(v0->unk_6A0, v0->unk_6A4, v1); + StringFormatter_Format(v0->unk_6A0, v0->unk_6A4, v1); Strbuf_Free(v1); sub_02082708(v0, 0xffffffff, 1); @@ -1103,7 +1103,7 @@ static int sub_020864E4 (void * param0) v0 = param0; v1 = MessageLoader_GetNewStrbuf(v0->unk_69C, 58); - sub_0200C388(v0->unk_6A0, v0->unk_6A4, v1); + StringFormatter_Format(v0->unk_6A0, v0->unk_6A4, v1); Strbuf_Free(v1); sub_02082708(v0, 0xffffffff, 0); @@ -1121,7 +1121,7 @@ static int sub_02086538 (void * param0) v0 = param0; v1 = MessageLoader_GetNewStrbuf(v0->unk_69C, 52); - sub_0200C388(v0->unk_6A0, v0->unk_6A4, v1); + StringFormatter_Format(v0->unk_6A0, v0->unk_6A4, v1); Strbuf_Free(v1); sub_02082708(v0, 0xffffffff, 0); @@ -1165,7 +1165,7 @@ static u8 sub_02086614 (GameWindowLayout * param0, u8 param1) v1 = MessageLoader_GetNewStrbuf(param0->unk_69C, 162 + param1); sub_0200B630(param0->unk_6A0, 0, v2); - sub_0200C388(param0->unk_6A0, param0->unk_6A8, v1); + StringFormatter_Format(param0->unk_6A0, param0->unk_6A8, v1); Strbuf_Free(v1); if (v2 == 0) { diff --git a/src/unk_0208694C.c b/src/unk_0208694C.c index 3463ec0517..723fa8794a 100644 --- a/src/unk_0208694C.c +++ b/src/unk_0208694C.c @@ -1001,7 +1001,7 @@ static int sub_02086B64 (UnkStruct_020067E8 * param0, int * param1) sub_02087544(v0, param0); BGL_FillWindow(&v0->unk_41C[9], 0xf0f); sub_0200E060(&v0->unk_41C[9], 0, ((32 * 8)), 10); - v0->unk_4BC = sub_0201D738(&v0->unk_41C[9], 1, v0->unk_180, 0, 0, 1, NULL); + v0->unk_4BC = PrintStringSimple(&v0->unk_41C[9], 1, v0->unk_180, 0, 0, 1, NULL); sub_0201A954(&v0->unk_41C[9]); v0->unk_4C0 = 6; break; @@ -1826,7 +1826,7 @@ static void sub_02087D64 (BGL * param0, Window * param1, int * param2, int param static void sub_02087F48 (Window * param0, int param1, Strbuf *param2) { sub_0200E060(param0, 0, ((32 * 8)), 10); - sub_0201D738(param0, 1, param2, 0, 0, 0, NULL); + PrintStringSimple(param0, 1, param2, 0, 0, 0, NULL); sub_0201A954(param0); } diff --git a/src/unk_0208A3F4.c b/src/unk_0208A3F4.c index 4f40364eb0..5a54051400 100644 --- a/src/unk_0208A3F4.c +++ b/src/unk_0208A3F4.c @@ -770,7 +770,7 @@ void sub_0208B230 (Window * param0, int param1) v1 = MessageLoader_GetNewStrbuf(v0, param1); BGL_FillWindow(param0, 15); - sub_0201D738(param0, 1, v1, 0, 0, 0, NULL); + PrintStringSimple(param0, 1, v1, 0, 0, 0, NULL); sub_0201A954(param0); Strbuf_Free(v1); diff --git a/src/unk_0208C324.c b/src/unk_0208C324.c index 4db2b8fde1..2f3e08f831 100644 --- a/src/unk_0208C324.c +++ b/src/unk_0208C324.c @@ -1031,15 +1031,15 @@ static void sub_0208D200 (UnkStruct_0208D7BC * param0, Pokemon * param1, UnkStru MessageLoader_GetStrbuf(param0->unk_688, 11, param0->unk_694); sub_0200B538(param0->unk_690, 0, v0); - sub_0200C388(param0->unk_690, param0->unk_250.unk_00, param0->unk_694); + StringFormatter_Format(param0->unk_690, param0->unk_250.unk_00, param0->unk_694); MessageLoader_GetStrbuf(param0->unk_688, 0, param0->unk_694); sub_0200B5CC(param0->unk_690, 0, v0); - sub_0200C388(param0->unk_690, param0->unk_250.unk_04, param0->unk_694); + StringFormatter_Format(param0->unk_690, param0->unk_250.unk_04, param0->unk_694); MessageLoader_GetStrbuf(param0->unk_688, 14, param0->unk_694); sub_0200B5EC(param0->unk_690, 0, v0); - sub_0200C388(param0->unk_690, param0->unk_250.unk_08, param0->unk_694); + StringFormatter_Format(param0->unk_690, param0->unk_250.unk_08, param0->unk_694); param2->unk_0E = (u16)Pokemon_GetValue(param1, MON_DATA_HELD_ITEM, NULL); param2->unk_12_0 = (u8)Pokemon_GetValue(param1, MON_DATA_LEVEL, NULL); diff --git a/src/unk_0208FCF8.c b/src/unk_0208FCF8.c index 25f19a52f3..e15fdca8fe 100644 --- a/src/unk_0208FCF8.c +++ b/src/unk_0208FCF8.c @@ -273,7 +273,7 @@ void sub_0208FF3C (UnkStruct_0208D7BC * param0) v1 = MessageLoader_GetNewStrbuf(param0->unk_688, 3); sub_0200B60C(param0->unk_690, 0, param0->unk_250.unk_12_0, 3, 0, 1); - sub_0200C388(param0->unk_690, param0->unk_694, v1); + StringFormatter_Format(param0->unk_690, param0->unk_694, v1); Strbuf_Free(v1); sub_0201D78C(v0, 0, param0->unk_694, 16, 0, 0xff, ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), NULL); } @@ -290,7 +290,7 @@ void sub_0208FFE0 (UnkStruct_0208D7BC * param0) if (param0->unk_250.unk_0E != 0) { sub_0200B70C(param0->unk_690, 0, param0->unk_250.unk_0E); v0 = MessageLoader_GetNewStrbuf(param0->unk_688, 5); - sub_0200C388(param0->unk_690, param0->unk_694, v0); + StringFormatter_Format(param0->unk_690, param0->unk_694, v0); Strbuf_Free(v0); } else { MessageLoader_GetStrbuf(param0->unk_688, 6, param0->unk_694); @@ -358,7 +358,7 @@ static void sub_02090184 (UnkStruct_0208D7BC * param0, u32 param1, u32 param2, u v0 = MessageLoader_GetNewStrbuf(param0->unk_688, param1); sub_0200B60C(param0->unk_690, 0, param2, param3, param4, 1); - sub_0200C388(param0->unk_690, param0->unk_694, v0); + StringFormatter_Format(param0->unk_690, param0->unk_694, v0); Strbuf_Free(v0); } @@ -630,7 +630,7 @@ static void sub_0209093C (UnkStruct_0208D7BC * param0) sub_0200B6A0(param0->unk_690, 0, param0->unk_250.unk_32); v2 = MessageLoader_GetNewStrbuf(param0->unk_688, 125); - sub_0200C388(param0->unk_690, param0->unk_694, v2); + StringFormatter_Format(param0->unk_690, param0->unk_694, v2); Strbuf_Free(v2); sub_020900D8(param0, ¶m0->unk_244[6], ((u32)(((1 & 0xff) << 16) | ((2 & 0xff) << 8) | ((0 & 0xff) << 0))), 0); @@ -779,7 +779,7 @@ void sub_02090F84 (UnkStruct_0208D7BC * param0) v0 = MessageLoader_GetNewStrbuf(param0->unk_688, 186); sub_0200B60C(param0->unk_690, 0, param0->unk_6B1, 3, 0, 1); - sub_0200C388(param0->unk_690, param0->unk_694, v0); + StringFormatter_Format(param0->unk_690, param0->unk_694, v0); Strbuf_Free(v0); v2 = sub_02002D7C(0, param0->unk_694, 0); @@ -797,7 +797,7 @@ void sub_02090F84 (UnkStruct_0208D7BC * param0) v0 = MessageLoader_GetNewStrbuf(param0->unk_688, 184); sub_0200B60C(param0->unk_690, 0, param0->unk_6AF + param0->unk_6B0 * 4 + 1, 3, 0, 1); - sub_0200C388(param0->unk_690, param0->unk_694, v0); + StringFormatter_Format(param0->unk_690, param0->unk_694, v0); Strbuf_Free(v0); v2 = sub_02002D7C(0, param0->unk_694, 0); diff --git a/src/unk_02092494.c b/src/unk_02092494.c index 7f49d7e96a..64a23d37af 100644 --- a/src/unk_02092494.c +++ b/src/unk_02092494.c @@ -341,7 +341,7 @@ static void InitializePokemonMetInfoStrBuf (PokemonInfoDisplayStruct * param0, i sub_0200C2E0(param0->unk_08, 6, Pokemon_GetValue(param0->unk_0C, MON_DATA_MET_MONTH, NULL)); sub_0200B60C(param0->unk_08, 7, Pokemon_GetValue(param0->unk_0C, MON_DATA_MET_DAY, NULL), 2, 0, 1); sub_0200BECC(param0->unk_08, 8, Pokemon_GetValue(param0->unk_0C, MON_DATA_MET_LOCATION, NULL)); - sub_0200C388(param0->unk_08, param0->unk_1C.unk_04, v0); + StringFormatter_Format(param0->unk_08, param0->unk_1C.unk_04, v0); Strbuf_Free(v0); } @@ -384,7 +384,7 @@ static void InitializeAlternateMetInfoStrBuf (PokemonInfoDisplayStruct * param0, break; } - sub_0200C388(param0->unk_08, param0->unk_1C.unk_04, v0); + StringFormatter_Format(param0->unk_08, param0->unk_1C.unk_04, v0); Strbuf_Free(v0); } @@ -408,7 +408,7 @@ static void InitializeSpecialMetInfoStrBuf (PokemonInfoDisplayStruct * param0, i sub_0200BECC(param0->unk_08, 8, Pokemon_GetValue(param0->unk_0C, MON_DATA_HATCH_LOCATION, NULL)); } - sub_0200C388(param0->unk_08, param0->unk_1C.unk_04, v0); + StringFormatter_Format(param0->unk_08, param0->unk_1C.unk_04, v0); Strbuf_Free(v0); } diff --git a/src/unk_02099DFC.c b/src/unk_02099DFC.c index 78fc101dd4..14b20b47e0 100644 --- a/src/unk_02099DFC.c +++ b/src/unk_02099DFC.c @@ -317,7 +317,7 @@ static BOOL sub_0209A0F4 (UnkStruct_02099DFC * param0) break; case 5: sub_020245E8(param0->unk_30); - sub_0200EBA0(param0->unk_34); + DeleteWaitDial(param0->unk_34); param0->unk_04 = 6; break; case 6: @@ -340,7 +340,7 @@ static BOOL sub_0209A200 (UnkStruct_02099DFC * param0, u32 param1, int param2, i param0->unk_10 = Strbuf_Init(0x400, param0->unk_00); MessageLoader_GetStrbuf(param0->unk_18, param1, param0->unk_10); - param0->unk_0C = sub_0201D738(¶m0->unk_1C, 1, param0->unk_10, 0, 0, param3, NULL); + param0->unk_0C = PrintStringSimple(¶m0->unk_1C, 1, param0->unk_10, 0, 0, param3, NULL); if (param3 == 0) { Strbuf_Free(param0->unk_10); diff --git a/src/unk_0209A2C4.c b/src/unk_0209A2C4.c index 1fdc0ebeec..4aa584d0ad 100644 --- a/src/unk_0209A2C4.c +++ b/src/unk_0209A2C4.c @@ -316,7 +316,7 @@ static BOOL sub_0209A688 (UnkStruct_0209A3D0 * param0, u32 param1, int param2, i param0->unk_14 = Strbuf_Init(0x400, param0->unk_00); MessageLoader_GetStrbuf(param0->unk_1C, param1, param0->unk_14); - param0->unk_10 = sub_0201D738(¶m0->unk_20, 1, param0->unk_14, 0, 0, param3, NULL); + param0->unk_10 = PrintStringSimple(¶m0->unk_20, 1, param0->unk_14, 0, 0, param3, NULL); if (param3 == 0) { Strbuf_Free(param0->unk_14); diff --git a/src/unk_0209A74C.c b/src/unk_0209A74C.c index b9496eacd1..62dca6e3c8 100644 --- a/src/unk_0209A74C.c +++ b/src/unk_0209A74C.c @@ -120,7 +120,7 @@ void sub_0209A74C (int param0) BGL_WindowColor(&v1, 15, 0, 0, 26 * 8, 18 * 8); Window_Show(&v1, 0, 512 - 9, 2); MessageLoader_GetStrbuf(v2, v4, v3); - sub_0201D738(&v1, 0, v3, 0, 0, 0, NULL); + PrintStringSimple(&v1, 0, v3, 0, 0, 0, NULL); Strbuf_Free(v3); GXLayers_TurnBothDispOn(); sub_0200F338(0); @@ -194,7 +194,7 @@ void sub_0209A8E0 (int param0) BGL_WindowColor(&v1, 15, 0, 0, 26 * 8, 18 * 8); Window_Show(&v1, 0, (512 - 9), 2); MessageLoader_GetStrbuf(v2, v4, v3); - sub_0201D738(&v1, 0, v3, 0, 0, 0, NULL); + PrintStringSimple(&v1, 0, v3, 0, 0, 0, NULL); Strbuf_Free(v3); GXLayers_TurnBothDispOn(); sub_0200F338(0); diff --git a/src/unk_0209AA74.c b/src/unk_0209AA74.c index a4351ff356..6da3093272 100644 --- a/src/unk_0209AA74.c +++ b/src/unk_0209AA74.c @@ -130,7 +130,7 @@ void sub_0209AA74 (int param0, int param1) BGL_WindowColor(&v1, 15, 0, 0, 26 * 8, 18 * 8); Window_Show(&v1, 0, (512 - 9), 2); MessageLoader_GetStrbuf(v2, v4, v3); - sub_0201D738(&v1, 0, v3, 0, 0, 0, NULL); + PrintStringSimple(&v1, 0, v3, 0, 0, 0, NULL); Strbuf_Free(v3); GXLayers_TurnBothDispOn(); sub_0200F338(0); diff --git a/src/unk_0209ACF4.c b/src/unk_0209ACF4.c index 1fc2993cc0..badca45648 100644 --- a/src/unk_0209ACF4.c +++ b/src/unk_0209ACF4.c @@ -266,7 +266,7 @@ static void sub_0209B084 (UnkStruct_0209AD84 * param0, int param1, BOOL param2) if (param2) { MessageLoader_GetStrbuf(param0->unk_10, param1, param0->unk_04); - sub_0200C388(param0->unk_0C, param0->unk_08, param0->unk_04); + StringFormatter_Format(param0->unk_0C, param0->unk_08, param0->unk_04); } else { MessageLoader_GetStrbuf(param0->unk_10, param1, param0->unk_08); } @@ -309,7 +309,7 @@ static void sub_0209B12C (UnkStruct_0209AD84 * param0) for (v1 = 0; v1 < 5; v1++) { MessageLoader_GetStrbuf(param0->unk_10, 9 + v1, param0->unk_08); - sub_0201D738(v0, 0, param0->unk_08, 12, v1 * 16, 0xff, NULL); + PrintStringSimple(v0, 0, param0->unk_08, 12, v1 * 16, 0xff, NULL); } sub_02014A58(param0->unk_14, v0, 0, 0); @@ -341,7 +341,7 @@ static void sub_0209B1D8 (UnkStruct_0209AD84 * param0) for (v1 = 0; v1 < 2; v1++) { MessageLoader_GetStrbuf(param0->unk_10, v1 + 14, param0->unk_08); - sub_0201D738(v0, 0, param0->unk_08, 12, v1 * 16, 0xff, NULL); + PrintStringSimple(v0, 0, param0->unk_08, 12, v1 * 16, 0xff, NULL); } sub_02014A58(param0->unk_14, v0, 0, 0);