4 files changed, 83 insertions, 25 deletions
diff --git a/include/MWC_string.h b/include/MWC_string.h
index 79639239..8e30b47e 100644
--- a/include/MWC_string.h
+++ b/include/MWC_string.h
@@ -5,5 +5,7 @@
 
 void * memset(void *, int, u32);
 void * memcpy(void *, const void *, u32);
+u32 strlen(const s8 *);
+void strcpy(s8 * dest, const s8 * src);
 
 #endif //GUARD_MWC_STRING_H
diff --git a/include/game_init.h b/include/game_init.h
new file mode 100644
index 00000000..7a6e34fb
--- /dev/null
+++ b/include/game_init.h
@@ -0,0 +1,34 @@
+#ifndef POKEDIAMOND_GAME_INIT_H
+#define POKEDIAMOND_GAME_INIT_H
+
+#include "main.h"
+
+void FUN_02015EA0(void);
+void FUN_02015ED4(void);
+void FUN_02015EF4(void);
+void Main_SetVBlankIntrCB(void (*a0)(void *), void * a1);
+void FUN_02015F1C(void);
+BOOL FUN_02015F34(void (*a0)(void *), void * a1);
+void FUN_02015F6C(void);
+void Main_HBlankIntr(BOOL a0);
+void FUN_02015FC8(void);
+void InitSystemForTheGame(void);
+void InitGraphicMemory(void);
+void * FUN_020161A4(u32 heap_id, const char * path);
+void FUN_020161F8(const char * path, void ** ptr);
+u32 FUN_02016230(const s8 * str);
+int FUN_020162A0(u32 a0);
+int FUN_020162C8(void * a0, u32 a1);
+void FUN_020162FC(void);
+void * FUN_02016324(const s8 * str, u32 heap_id);
+void FUN_020163BC(void);
+void FUN_02016438(u8 a0);
+void FUN_02016444(u8 a0);
+void FUN_02016454(u8 a0);
+void FUN_02016464(void);
+void FUN_02016568(void);
+void FUN_0201669C(int x, int y);
+void FUN_020166A8(u8 a0);
+void FUN_020166B8(u8 a0);
+
+#endif //POKEDIAMOND_GAME_INIT_H
diff --git a/include/main.h b/include/main.h
index fa31953c..499861a8 100644
--- a/include/main.h
+++ b/include/main.h
@@ -54,29 +54,6 @@ struct Unk21C4828
     u32 unk8;
 };
 
-struct Unk21C48B8
-{
-    void (*unk0)(s32);
-    s32 unk4;
-    s32 unk8;
-    s32 unkC;
-    s32 unk10;
-    s32 unk14;
-    s32 unk18;
-    s32 unk1C;
-    s32 unk20;
-    s32 unk24;
-    s32 unk28;
-    u32 unk2C;
-    s32 unk30;
-    s32 unk34;
-    s32 unk38;
-    u8 filler3C[0xC];
-    s32 unk48;
-    u8 filler4C[0x20];
-    s32 unk6C;
-};
-
 struct UnkStruct_021C4918 {
     s32 unk0;
     u8 unk4;
@@ -87,14 +64,52 @@ struct UnkStruct_021C4918 {
     u8 padding[3];
 };
 
-extern struct UnkStruct_021C4918 gUnk021C4918;
+struct Main
+{
+    void (*vBlankIntr)(void *);
+    void * vBlankIntrArg;
+    void (*hBlankIntr)(void *);
+    void * hBlankIntrArg;
+    s32 unk10;
+    s32 unk14;
+    void * unk18;
+    void * unk1C;
+    void * unk20;
+    void * unk24;
+    s32 unk28;
+    u32 unk2C;
+    s32 unk30;
+    u32 unk34;
+    u32 unk38;
+    u32 unk3C;
+    u32 unk40;
+    u32 unk44;
+    u32 unk48;
+    u32 unk4C;
+    s32 unk50;
+    s32 unk54;
+    s32 unk58;
+    u16 unk5C;
+    u16 unk5E;
+    u16 unk60;
+    u16 unk62;
+    u8 unk64;
+    u8 unk65;
+    u8 unk66;
+    u8 unk67;
+    u8 unk68;
+    u8 padding_69[3];
+    s32 unk6C;
+};
+
+//extern struct UnkStruct_021C4918 gMain + 0x60;
 
 extern struct Unk2106FA0 gBacklightTop;
 extern struct Unk2106FA0 gBacklightTop_2; // same as the first one, it's referenced twice in the constant pool...
 
 void NitroMain(void);
 
-extern struct Unk21C48B8 gMain;
+extern struct Main gMain;
 
 void FUN_02000DF4(void);
 void Main_RunOverlayManager(void);
diff --git a/include/unk_0201B4E8.h b/include/unk_0201B4E8.h
new file mode 100644
index 00000000..d29b198c
--- /dev/null
+++ b/include/unk_0201B4E8.h
@@ -0,0 +1,7 @@
+#ifndef POKEDIAMOND_UNK_0201B4E8_H
+#define POKEDIAMOND_UNK_0201B4E8_H
+
+void * FUN_0201B580(u32, void *);
+u32 FUN_0201B578(u32);
+
+#endif //POKEDIAMOND_UNK_0201B4E8_H