5 files changed, 38 insertions, 18 deletions
diff --git a/include/main.h b/include/main.h
index 7a6f4c36..ec3fca46 100644
--- a/include/main.h
+++ b/include/main.h
@@ -94,7 +94,7 @@ extern struct Unk2106FA0 gBacklightTop_2; // same as the first one, it's referen
 
 void NitroMain(void);
 
-extern struct Unk21C48B8 gUnknown21C48B8;
+extern struct Unk21C48B8 gMain;
 
 void FUN_02000DF4(void);
 void FUN_02000E0C(void);
diff --git a/include/proto.h b/include/proto.h
index bcb95ee0..b45c2b48 100644
--- a/include/proto.h
+++ b/include/proto.h
@@ -6,10 +6,7 @@
 #include "pokemon.h" // for struct definitions
 #include "string16.h" // for struct definitions
 
-void StringCopy(u16 * dest, struct String * src);
-void String_dtor(void * ptr);
-void FUN_02021E28(u16 * dest, u16 * src);
-void FUN_02021EF0(const struct String * src, u16 * dest, u32 count);
+int FUN_0206AE00(int x);
 u32 GetItemAttr(u16 item, u32 a1, u32 a2);
 int FUN_02014C3C(u8);
 void FUN_02014C54(int, int, struct UnkStruct_02069038 *, u8);
@@ -20,6 +17,6 @@ void FUN_02005E90(int, int, int, int);
 void FUN_020056AC(int, int, int, int, int);
 void FUN_020808AC(struct BoxPokemon *, int, int, int, int);
 void * FUN_02022610(void *, int);
-void StringExpandPlaceholders(u32 *, struct String *, struct String *);
+void FUN_0200B7B8(u32 *, struct String *, struct String *);
 
 #endif //POKEDIAMOND_PROTO_H
diff --git a/include/string16.h b/include/string16.h
index 71880020..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;
@@ -10,11 +12,32 @@ struct String
     u8 padding[2];
 };
 
+struct UnkStruct_0202199C
+{
+    u8 filler_00[0x70];
+    int (*unk_70)(struct UnkStruct_0202199C *, int);
+};
+
+#define STR16_MAGIC 0xB6F8D2EC
+
 struct String * String_ctor(u32 count, u32 heap_id);
-int FUN_02021CE0(struct String *, struct String *);
-int FUN_0206AE00(int x);
-void FUN_02021E8C(struct String *, u16 *, u32); // copy
+BOOL StringCompare(struct String *, struct String *);
+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 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);
+s64 String_atoi(struct String * str, BOOL * flag);
+u16 StringGetLength(struct String * str);
+int StringCountLines(volatile struct String * str);
+void StringGetLineN(struct String * dest, volatile struct String * src, u32 n);
+void CopyU16ArrayToString(struct String * str, u16 * buf);
+void CopyStringToU16Array(struct String * str, u16 * buf, u32 length);
+u16 * String_c_str(struct String * str);
+void StringCat(struct String * dest, struct String * src);
+void StrUpperFirstChar(struct String * str);
 
 #endif //POKEDIAMOND_STRING16_H
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