1 files changed, 11 insertions, 29 deletions
diff --git a/include/global.h b/include/global.h
index 0c7fef66e..1747446f3 100644
--- a/include/global.h
+++ b/include/global.h
@@ -1,35 +1,7 @@
 #ifndef GUARD_GLOBAL_H
 #define GUARD_GLOBAL_H
 
-#include <stddef.h>
-
-typedef unsigned char  u8;
-typedef unsigned short u16;
-typedef unsigned int   u32;
-typedef signed char    s8;
-typedef signed short   s16;
-typedef signed int     s32;
-
-typedef volatile u8  vu8;
-typedef volatile u16 vu16;
-typedef volatile u32 vu32;
-typedef volatile s8  vs8;
-typedef volatile s16 vs16;
-typedef volatile s32 vs32;
-
-typedef float  f32;
-typedef double f64;
-
-typedef u8  bool8;
-typedef u16 bool16;
-typedef u32 bool32;
-
-#define TRUE  1
-#define FALSE 0
-
-#include "gba/io_reg.h"
-#include "gba/syscall.h"
-#include "gba/macro.h"
+#include "gba/gba.h"
 
 extern u8 gStringVar1[];
 extern u8 gStringVar2[];
@@ -41,6 +13,14 @@ enum
     FEMALE
 };
 
+struct Time
+{
+    s16 days;
+    s8 hours;
+    s8 minutes;
+    s8 seconds;
+};
+
 struct SaveBlock2
 {
     u8 playerName[8];
@@ -51,6 +31,8 @@ struct SaveBlock2
     u8 playTimeMinutes;
     u8 playTimeSeconds;
     u8 playTimeVBlanks;
+    u8 filler[0x85];
+    struct Time localTimeOffset;
 };
 
 extern struct SaveBlock2 gSaveBlock2;