Merge pull request #118 from notyourav/fix-default

clean up, move files to game.c

4 files changed, 17 insertions, 12 deletions

diff --git a/include/fileScreen.h b/include/fileScreen.h
index 4c86040a..b5782093 100644
--- a/include/fileScreen.h
+++ b/include/fileScreen.h
@@ -38,8 +38,9 @@ typedef struct {
 } struct_080FC844;
 
 typedef struct {
-    u8 filler0[0x4];
+    union SplitWord _0[8];
 } struct_020227E8;
+
 extern struct_020227E8 gUnk_020227E8;
 
 typedef struct {
@@ -56,16 +57,8 @@ typedef struct {
 } struct_02019EE0;
 extern struct_02019EE0 gUnk_02019EE0;
 
-struct OAMCommand {
-    u16 x;
-    u16 y;
-    u16 _4;
-    u16 _6;
-    u16 _8;
-} extern gUnk_03001010;
-
 extern void sub_08056FEC(u32, struct_020227E8*);
-extern void sub_0805F46C(u32, struct_080FC844*);
+extern void sub_0805F46C(u32, void*);
 extern void sub_0801C4A0(u32, u32);
 extern void sub_08080668(void);
 extern void sub_0805194C(u32);
diff --git a/include/main.h b/include/main.h
index 767b9441..3d60ee25 100644
--- a/include/main.h
+++ b/include/main.h
@@ -1,5 +1,6 @@
 #ifndef MAIN_H
 #define MAIN_H
+
 typedef struct { // 0x03001000
     u8 field_0x0;
     u8 field_0x1;
@@ -13,6 +14,7 @@ typedef struct { // 0x03001000
     u8 field_0xb;
     u32 spritePriority;
 } MainStruct;
+
 #define SIGNATURE 'MCZ3'
 #define MAX_MSG_SPEED 3
 #define NUM_SAVE_SLOTS 3
@@ -75,6 +77,8 @@ static_assert(sizeof(UI) == 0x3b4);
 extern Main gUnk_03001000;
 extern UI gUnk_02032EC0;
 
+void InitScreen();
+
 extern void InitSound(void);
 extern void sub_0807CE90(void);
 extern void sub_080560B8(void);
@@ -103,5 +107,4 @@ extern void sub_08016B34(void);
 
 static void sub_08055F70(void);
 static bool32 SoftResetKeysPressed(void);
-
 #endif
diff --git a/include/screen.h b/include/screen.h
index 5046e62f..b1e5fff7 100644
--- a/include/screen.h
+++ b/include/screen.h
@@ -79,6 +79,14 @@ typedef struct {
     /*0x78*/ u32 _78;
 } Screen;
 
+struct OAMCommand {
+    u16 x;
+    u16 y;
+    u16 _4;
+    u16 _6;
+    u16 _8;
+} extern gOamCmd;
+
 extern BgControls gBgControls;
 extern Screen gScreen;
 
diff --git a/include/structures.h b/include/structures.h
index 534f0d98..60d1a36e 100644
--- a/include/structures.h
+++ b/include/structures.h
@@ -11,8 +11,9 @@ typedef struct {
     u8 messageSpeed;
     u8 brightnessPref;
     u8 gameLanguage;
-    u8 _8[6];
+    u8 name[6];
     u8 _e;
+    u8 _f;
 } struct_02000000;
 #define gUnk_02000000 ((struct_02000000*)(0x2000000))
 // extern struct_02000000 gUnk_02000000;