From efdc5f6c5dd2ce70fe3479e943d31a9eae6bdec6 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Mon, 2 Jun 2025 13:02:16 +0200
Subject: [PATCH] Move remaining data to string_format.c

---
 data/data_80D47B8.s | 15 ---------------
 ld_script.ld        |  1 -
 src/string_format.c | 20 ++++++--------------
 3 files changed, 6 insertions(+), 30 deletions(-)
 delete mode 100644 data/data_80D47B8.s

diff --git a/data/data_80D47B8.s b/data/data_80D47B8.s
deleted file mode 100644
index 6f1003350..000000000
--- a/data/data_80D47B8.s
+++ /dev/null
@@ -1,15 +0,0 @@
-	.section .rodata
-
-@ START code_80130A8
-
-
-	.global gUnknown_80D4908
-gUnknown_80D4908: @ 80D4908
-        .asciz "%0*d"
-        .align 2,0
-
-	.global gUnknown_80D4910
-gUnknown_80D4910: @ 80D4910
-        .string "$\0"
-
-@ END code_80130A8
diff --git a/ld_script.ld b/ld_script.ld
index 99e396318..a8df7b313 100755
--- a/ld_script.ld
+++ b/ld_script.ld
@@ -452,7 +452,6 @@ SECTIONS {
         src/quick_save_write.o(.rodata);
         src/menu_input.o(.rodata);
         src/string_format.o(.rodata);
-        data/data_80D47B8.o(.rodata);
         src/common_strings.o(.rodata);
         src/code_8015080.o(.rodata);
         src/code_801602C.o(.rodata);
diff --git a/src/string_format.c b/src/string_format.c
index 3527bf375..8c8a732c4 100644
--- a/src/string_format.c
+++ b/src/string_format.c
@@ -88,14 +88,6 @@ static const WindowTemplate gUnknown_80D48DC = {
     NULL
 };
 
-
-ALIGNED(4) static const u8 sSpeakerNameSeparator[] = ": ";
-ALIGNED(4) static const u8 sUnknownTeamName[] = "????";
-ALIGNED(4) static const u8 gUnknown_80D4900[] = "%d";
-ALIGNED(4) static const u8 gUnknown_80D4904[] = "%*d" ;
-extern const u8 gUnknown_80D4908[];
-extern const u8 gUnknown_80D4910[];
-
 extern void DisplayMonPortraitSprite(s32 a0, const u8 *compressedData, s32 a2);
 extern void sub_80073E0(s32 a0);
 extern void sub_8011A04(void);
@@ -691,7 +683,7 @@ const u8 *FormatString(const u8 *str, u8 *dst, u8 *dstMax, u16 flags)
                 r9 = FALSE;
                 if (flags & 8) {
                     AppendString(gSpeakerNameBuffer, &dst, dstMax, flags);
-                    AppendString(sSpeakerNameSeparator, &dst, dstMax, flags);
+                    AppendString(": ", &dst, dstMax, flags);
                 }
             }
             else if (r9) {
@@ -745,7 +737,7 @@ const u8 *FormatString(const u8 *str, u8 *dst, u8 *dstMax, u16 flags)
                         sub_80920D8(sFormatBuffer_TeamName);
                     }
                     else {
-                        strcpy(sFormatBuffer_TeamName, sUnknownTeamName); // ????
+                        InlineStrcpy(sFormatBuffer_TeamName, "????");
                     }
                     txtPtr = sFormatBuffer_TeamName;
                     break;
@@ -755,7 +747,7 @@ const u8 *FormatString(const u8 *str, u8 *dst, u8 *dstMax, u16 flags)
                     break;
                 case 'd':
                     str++;
-                    sprintfStatic(txtArray, gUnknown_80D4900, gFormatArgs[*(str++) - '0']);
+                    sprintfStatic(txtArray, "%d", gFormatArgs[*(str++) - '0']);
                     txtPtr = txtArray;
                     break;
                 case 'v': {
@@ -764,7 +756,7 @@ const u8 *FormatString(const u8 *str, u8 *dst, u8 *dstMax, u16 flags)
 
                     str++;
                     a = gFormatArgs[*(str++) - '0'];
-                    sprintfStatic(txtArray, gUnknown_80D4904, *(str++) - '0', a);
+                    sprintfStatic(txtArray, "%*d", *(str++) - '0', a);
                     unkTxtPtr = txtArray;
                     while (*unkTxtPtr != '\0') {
                         if (*unkTxtPtr == ' ') {
@@ -782,7 +774,7 @@ const u8 *FormatString(const u8 *str, u8 *dst, u8 *dstMax, u16 flags)
 
                     str++;
                     a = gFormatArgs[*(str++) - '0'];
-                    sprintfStatic(txtArray, gUnknown_80D4908, *(str++) - '0', a);
+                    sprintfStatic(txtArray, "%0*d", *(str++) - '0', a);
                     unkTxtPtr = txtArray;
                     while (*unkTxtPtr != '\0') {
                         if (*unkTxtPtr == ' ') {
@@ -794,7 +786,7 @@ const u8 *FormatString(const u8 *str, u8 *dst, u8 *dstMax, u16 flags)
                     }
                     break;
                 case '$':
-                    txtPtr = gUnknown_80D4910;
+                    txtPtr = "$";
                     break;
                 case '-':
                     str++;