merge

3 files changed, 5 insertions, 53 deletions

diff --git a/src/FUN_02000DF4.c b/src/FUN_02000DF4.c
index 0cc1c2dd..0099480c 100644
--- a/src/FUN_02000DF4.c
+++ b/src/FUN_02000DF4.c
@@ -1,12 +1,5 @@
-#include "nitro.h"
-
-struct Unk2106FA0 {
-    u8 filler0[0x8];
-    s32 unk8;
-    s32 unkC;
-    s32 unk10;
-    s32 unk14;
-};
+#include "global.h"
+#include "main.h"
 
 extern struct Unk2106FA0 gBacklightTop;
 
diff --git a/src/main.c b/src/main.c
index d703331d..bfd6c82e 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,46 +1,5 @@
-
-typedef unsigned char u8;
-typedef unsigned short u16;
-typedef unsigned long u32;
-typedef signed char s8;
-typedef signed short s16;
-typedef signed long s32;
-
-struct Unk2106FA0
-{
-    s32 unk0;
-    s32 unk4;
-    s32 unk8;
-    s32 unkC;
-    s32 unk10;
-    s32 unk14;
-    s32 unk18;
-    s32 unk1C;
-    s32 unk20;
-};
-
-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;
-    s32 unk2C;
-    s32 unk30;
-    s32 unk34;
-    s32 unk38;
-    u8 filler3C[0xC];
-    s32 unk48;
-    u8 filler4C[0x20];
-    s32 unk6C;
-};
+#include "global.h"
+#include "main.h"
 
 extern struct Unk2106FA0 gBacklightTop;
 extern struct Unk2106FA0 gBacklightTop_2; // same as the first one, it's referenced twice in the constant pool...
diff --git a/src/string_util.c b/src/string_util.c
index 7d755cb9..8f9c96ff 100644
--- a/src/string_util.c
+++ b/src/string_util.c
@@ -1,4 +1,4 @@
-#include "nitro.h"

+#include "global.h"

 

 u16 gDigitTable[] = {

     0xA2,