3 files changed, 35 insertions, 9 deletions
diff --git a/include/msg_data.h b/include/msg_data.h
index debacc79..5d8dd387 100644
--- a/include/msg_data.h
+++ b/include/msg_data.h
@@ -1,20 +1,42 @@
 #ifndef POKEDIAMOND_MSG_DATA_H
 #define POKEDIAMOND_MSG_DATA_H
 
-struct MsgData
+#include "string16.h"
+
+struct UnkStruct_200A394_4
+{
+    u32 unk0;
+    u32 unk4;
+};
+
+struct UnkStruct_200A394
 {
     u16 unk0;
     u16 unk2;
-    u16 unk4;
-    u16 unk6;
+    struct UnkStruct_200A394_4 unk4[1];
+};
+
+struct MsgData
+{
+    u16 type;
+    u16 heap_id;
+    u16 narc_id;
+    u16 file_id;
     union {
-        u16 * raw;
+        struct UnkStruct_200A394 * raw;
         NARC * narc;
     } data;
 };
 
-struct MsgData * NewMsgDataFromNarc(u32 type, u32 narcId, u32 msgId, u32 heapno);
-u16 * FUN_0200A914(struct MsgData *, u32);
+struct MsgData * NewMsgDataFromNarc(u32 type, NarcId narcId, s32 msgId, u32 heapno);
 void DestroyMsgData(struct MsgData *);
+void FUN_0200A8E0(struct MsgData * msgData, u32 msg_no, struct String * dest);
+struct String * FUN_0200A914(struct MsgData *, u32);
+u16 FUN_0200A940(struct MsgData * msgData);
+void DecryptCopyString(struct MsgData * msgData, u32 msg_no, u16 * dest);
+void GetSpeciesName(u16 species, u32 heap_id, u16 * dest);
+struct String * FUN_0200A9C4(u32 * a0, struct MsgData * msgData, u32 msgno, struct String * a3);
+struct String * FUN_0200AA14(u32 msg_no, u32 heapno);
+struct String * FUN_0200AA50(u16 species, u32 heap_id);
 
 #endif //POKEDIAMOND_MSG_DATA_H
diff --git a/include/proto.h b/include/proto.h
index 2e7d19b3..70cb8aa6 100644
--- a/include/proto.h
+++ b/include/proto.h
@@ -4,12 +4,12 @@
 // For homeless function declarations
 
 #include "pokemon.h" // for struct definitions
+#include "string16.h" // for struct definitions
 
-u16 * FUN_0200AA50(u16 species, u32 heap_id);
-void FUN_02021A74(u16 * dest, u16 * src);
+void FUN_02021A74(u16 * dest, struct String * src);
 void FUN_02021A20(void * ptr);
 void FUN_02021E28(u16 * dest, u16 * src);
-void FUN_02021EF0(const u16 * src, u16 * dest, u32 count);
+void FUN_02021EF0(const struct String * src, u16 * dest, u32 count);
 u32 FUN_0206E7B8(u16 item, u32 a1, u32 a2);
 int FUN_02014C3C(u8);
 void FUN_02014C54(int, int, struct UnkStruct_02069038 *, u8);
@@ -20,5 +20,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 FUN_0200B7B8(u32 *, struct String *, struct String *);
 
 #endif //POKEDIAMOND_PROTO_H
diff --git a/include/string16.h b/include/string16.h
index 7092c641..71f15672 100644
--- a/include/string16.h
+++ b/include/string16.h
@@ -13,5 +13,8 @@ struct String
 struct String * FUN_020219F4(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
+void FUN_02021A4C(struct String *); // set empty
+struct String * FUN_02021ACC(struct String *, struct String *);
 
 #endif //POKEDIAMOND_STRING16_H