3 files changed, 12 insertions, 10 deletions
diff --git a/include/string16.h b/include/string16.h
index 255b44b8..bc276ea7 100644
--- a/include/string16.h
+++ b/include/string16.h
@@ -1,6 +1,8 @@
 #ifndef POKEDIAMOND_STRING16_H
 #define POKEDIAMOND_STRING16_H
 
+#include "string_util.h"
+
 struct String
 {
     u16 maxsize;
@@ -24,7 +26,7 @@ void CopyU16ArrayToStringN(struct String *, u16 *, u32); // copy
 void StringSetEmpty(struct String *); // set empty
 struct String * StringDup(struct String *, u32 heap_id);
 int StringGetWidth(struct UnkStruct_0202199C * r7, const u16 * arr, u32 r6);
-int StringGetWidthNoSpacing(struct UnkStruct_0202199C * r6, const u16 * arr);
+int StringGetWidth_SingleLine_HandleClearToControlCode(struct UnkStruct_0202199C * r6, const u16 * arr);
 void String_dtor(struct String * str);
 void StringCopy(struct String * dest, struct String * src);
 void String16_FormatInteger(struct String * str, int num, u32 ndigits, int strConvMode, BOOL whichCharset);
diff --git a/include/unk_0201B8B8.h b/include/unk_0201B8B8.h
new file mode 100644
index 00000000..13bc217b
--- /dev/null
+++ b/include/unk_0201B8B8.h
@@ -0,0 +1,9 @@
+#ifndef POKEDIAMOND_UNK_0201B8B88_H
+#define POKEDIAMOND_UNK_0201B8B88_H
+
+const u16 * MsgArray_SkipControlCode(const u16 * r4);
+u16 MsgArray_GetControlCode(const u16 * r4);
+BOOL MsgArray_ControlCodeIsStrVar(const u16 * r4);
+u16 MsgArray_ControlCodeGetField(const u16 * r5, u32 r4);
+
+#endif //POKEDIAMOND_UNK_0201B8B88_H
diff --git a/include/unk_0201B8B88.h b/include/unk_0201B8B88.h
deleted file mode 100644
index 95eab968..00000000
--- a/include/unk_0201B8B88.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef POKEDIAMOND_UNK_0201B8B88_H
-#define POKEDIAMOND_UNK_0201B8B88_H
-
-const u16 * FUN_0201B8B8(const u16 * r4);
-u16 FUN_0201B8E0(const u16 * r4);
-BOOL FUN_0201B8F8(const u16 * r4);
-u16 FUN_0201B914(const u16 * r5, u32 r4);
-
-#endif //POKEDIAMOND_UNK_0201B8B88_H