Merge branch 'master' of https://github.com/martmists/pokediamond into overlay69

2 files changed, 43 insertions, 4 deletions

diff --git a/include/main.h b/include/main.h
index 0df94795..23059702 100644
--- a/include/main.h
+++ b/include/main.h
@@ -1,19 +1,42 @@
 #ifndef GUARD_MAIN_H
 #define GUARD_MAIN_H
 
+#include "FS_overlay.h"
+#include "SPI_pm.h"
+
+struct Unk21DBE18
+{
+    u8 filler_00[16];
+};
+
 struct Unk2106FA0
 {
-    s32 unk0;
+    PMBackLightSwitch unk0;
     s32 unk4;
-    s32 unk8;
+    FSOverlayID unk8;
     s32 unkC;
-    s32 unk10;
-    s32 unk14;
+    FSOverlayID unk10;
+    struct Unk21DBE18 * unk14;
     s32 unk18;
     s32 unk1C;
     s32 unk20;
 };
 
+struct Unk21C4818
+{
+    u32 unk0;
+    u32 unk4;
+    u32 unk8;
+    u32 unkC;
+};
+
+struct Unk21C4828
+{
+    u32 unk0;
+    u32 unk4;
+    u32 unk8;
+};
+
 struct Unk21C48B8
 {
     void (*unk0)(s32);
@@ -37,4 +60,7 @@ struct Unk21C48B8
     s32 unk6C;
 };
 
+extern struct Unk2106FA0 gBacklightTop;
+extern struct Unk2106FA0 gBacklightTop_2; // same as the first one, it's referenced twice in the constant pool...
+
 #endif //GUARD_MAIN_H
diff --git a/include/poke_overlay.h b/include/poke_overlay.h
new file mode 100644
index 00000000..5ee9073a
--- /dev/null
+++ b/include/poke_overlay.h
@@ -0,0 +1,13 @@
+#ifndef GUARD_POKE_OVERLAY_H
+#define GUARD_POKE_OVERLAY_H
+
+#include "FS_overlay.h"
+
+#define OVERLAY_LOAD_WRAM 0
+#define OVERLAY_LOAD_ITCM 1
+#define OVERLAY_LOAD_DTCM 2
+
+void UnloadOverlayByID(FSOverlayID id);
+BOOL HandleLoadOverlay(FSOverlayID id, int a1);
+
+#endif //GUARD_POKE_OVERLAY_H