fixing merge conflicts

1 files changed, 0 insertions, 40 deletions

diff --git a/src/name_string_util.c b/src/name_string_util.c
deleted file mode 100644
index f1a935453..000000000
--- a/src/name_string_util.c
+++ /dev/null
@@ -1,40 +0,0 @@
-#include "global.h"
-#include "name_string_util.h"
-#include "string_util.h"
-#include "text.h"
-
-void PadNameString(u8 *a1, u8 a2)
-{
-    u8 i;
-
-    StripExtCtrlCodes(a1);
-    i = StringLength(a1);
-
-    if (a2 == 0xFC)
-    {
-        while (i < 6)
-        {
-            a1[i] = 0xFC;
-            a1[i + 1] = 7;
-            i += 2;
-        }
-    }
-    else
-    {
-        while (i < 6)
-        {
-            a1[i] = a2;
-            i++;
-        }
-    }
-
-    a1[i] = EOS;
-}
-
-void SanitizeNameString(u8 *a1)
-{
-    if (StringLength(a1) < 6)
-        ConvertInternationalString(a1, 1);
-    else
-        StripExtCtrlCodes(a1);
-}