divide and conquer

include/entity.h

@@ -1,7 +1,11 @@
+#include "global.h"
+
+
 #ifndef ENTITY_H
 #define ENTITY_H
 
-#include "global.h"
+
+
 typedef struct {
 	u8 type;
     u8 subtype;
@@ -9,6 +13,11 @@ typedef struct {
     u8 parameter2;
 } EntityType;
 
+union SplitWord {
+    u32 WORD;
+    u16 LO, HI;
+};
+
 typedef struct
 {
     u32 *field_0x0;
@@ -35,13 +44,9 @@ typedef struct
     u8 spriteAnimation[3];
     u8 ticks;
     u16 collisions;
-    s16 xPosSubPixel;
-    s16 xPos;
-    s16 yPosSubPixel;
-    s16 yPos;
-    u8 field_0x34;
-    u8 field_0x35;
-    s16 height;
+	union SplitWord x;
+	union SplitWord y;
+	union SplitWord height; // todo
     u8 collisionLayer;
     u8 field_0x39;
     u8 field_0x3a;
@@ -81,6 +86,7 @@ typedef struct
     u32 * heldObjectPtr;
 	u8 filler[12];
     u32 * field_0x84;
+	
 } Entity;
 
 #endif

include/mainLoop.h

@@ -0,0 +1,44 @@
+#ifndef MAIN_H
+#define MAIN_H
+typedef struct { //0x03001000
+	u8 field_0x0;
+	u8 field_0x1;
+	u8 field_0x2;
+	u8 field_0x3;
+	u8 field_0x4;
+	u16 field_0x6;
+	u8 field_0x8;
+	u8 field_0x9;
+	u8 field_0xa;
+	u8 field_0xb;
+	u32 ticks;
+} MainStruct;
+
+extern s32 sub_08055F70();
+extern s32 sub_080A3204(s32);
+extern s32 sub_0805616C(s32);
+extern s32 sub_0807CE90(s32);
+extern s32 sub_080560B8(s32);
+extern void sub_08056208(s32);
+extern void sub_0804FFE4();
+extern s32 sub_0804FF84(s32);
+extern s32 sub_08056418(s32);
+extern void sub_080ADD30(s32);
+extern s32 sub_0801D630(s32, u32, u32);
+extern s32 sub_08056010(s32);
+extern s32 sub_08016E78(s32);
+extern s32 ReadKeyInput();
+extern s32 sub_08055FF4(u8);
+extern void sub_080560A8();
+extern s32 sub_08056260();
+extern void VBlankIntrWait();
+extern s32 _call_via_r0(s32);
+extern s32 sub_08056458(s32);
+extern s32 sub_08050154(s32);
+extern s32 sub_080A3480(s32);
+
+extern s32 gUnk_02000010;
+extern s32 gUnk_03001150;
+extern MainStruct gUnk_03001000;
+extern s32 gUnk_08100CBC;
+#endif