Merge pull request #142 from lhearachel/battle-message

Document how text is printed in battle

include/overlay016/ov16_0225CBB8.h → 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);

include/overlay016/ov16_0226485C.h → 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);

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,

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

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

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;

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

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);

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);

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

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();

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',

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(&param0->unk_08, 0, v1, param2, param3, 0xff, NULL);
+    StringFormatter_Format(param0->unk_90, v1, v0);
+    PrintStringSimple(&param0->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);

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);
 }

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);
     }
 }

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);

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, &param0->unk_10, 3);
     sub_0205D944(&param0->unk_10, sub_02025E44(param0->unk_30->unk_0C));
 

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(&param0->unk_38, param0->unk_2C, sub_02025E44(v0->unk_0C), 1);
     }