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

4 files changed, 8 insertions, 34 deletions

diff --git a/arm9/src/FUN_020910A4.c b/arm9/src/FUN_020910A4.c
deleted file mode 100644
index c5b7c916..00000000
--- a/arm9/src/FUN_020910A4.c
+++ /dev/null
@@ -1,32 +0,0 @@
-#include "global.h"
-
-typedef void * (* AllocFunc)(u32 size);
-typedef void (* FreeFunc)(void * ptr);
-
-static FreeFunc gUnk021C8C74;
-static AllocFunc gUnk021C8C70;
-
-// Custom allocator
-ARM_FUNC void* FUN_020910A4(u32 size)
-{
-    if (gUnk021C8C70 != NULL)
-        return gUnk021C8C70(size);
-    else
-        return OS_AllocFromHeap(OS_ARENA_MAIN, -1, size);
-}
-
-// Custom destructor
-ARM_FUNC void FUN_0209105C(void * ptr)
-{
-    if (gUnk021C8C74 != NULL)
-        gUnk021C8C74(ptr);
-    else
-        OS_FreeToHeap(OS_ARENA_MAIN, -1, ptr);
-}
-
-// Custom alloc/free setter
-ARM_FUNC void SetCustomAllocator(AllocFunc allocator, FreeFunc destructor)
-{
-    gUnk021C8C70 = allocator;
-    gUnk021C8C74 = destructor;
-}
diff --git a/arm9/src/FUN_02000DE4.c b/arm9/src/GFLIB_sysctl.c
index 9a7d8566..bc856768 100644
--- a/arm9/src/FUN_02000DE4.c
+++ b/arm9/src/GFLIB_sysctl.c
@@ -11,6 +11,8 @@
 
 extern struct Unk21C48B8 gUnknown21C48B8;
 
+struct Unk2106FA0 gBacklightTop;
+
 extern BOOL FUN_02006234(struct Unk21DBE18 *, s32 *, int);
 extern BOOL FUN_02006290(int);
 extern void FUN_02006260(int);
diff --git a/arm9/src/main.c b/arm9/src/main.c
index c097bfca..9e6a6227 100644
--- a/arm9/src/main.c
+++ b/arm9/src/main.c
@@ -50,6 +50,10 @@ extern void FUN_02016464(void);
 extern struct Unk21DBE18 MOD63_UNK_021DBE18; 
 extern struct Unk21DBE18 MOD52_UNK_021D76C8;
 
+extern u8 SDK_STATIC_BSS_START[];
+
+const enum GameVersion gGameVersion = VERSION_DIAMOND;
+const enum GameLanguage gGameLanguage = LANGUAGE_ENGLISH;
 
 THUMB_FUNC void NitroMain(void)
 {
@@ -58,7 +62,7 @@ THUMB_FUNC void NitroMain(void)
     FUN_020163BC();
     FUN_02016438(0);
 
-    PM_GetBackLight(&gBacklightTop_2.unk0, NULL);
+    PM_GetBackLight((PMBackLightSwitch *)SDK_STATIC_BSS_START, NULL);
 
     FUN_02022294();
     FUN_0201259C();
diff --git a/arm9/src/poke_overlay.c b/arm9/src/poke_overlay.c
index 2b6fe790..787cd65a 100644
--- a/arm9/src/poke_overlay.c
+++ b/arm9/src/poke_overlay.c
@@ -8,7 +8,7 @@ struct LoadedOverlay {
     BOOL active;
 };
 
-extern struct LoadedOverlay gLoadedOverlays[3][8];
+static struct LoadedOverlay gLoadedOverlays[3][8];
 
 struct LoadedOverlay* GetLoadedOverlaysInRegion(int);
 BOOL GetOverlayRamBounds(FSOverlayID, void**, void**);