loadRoom merge

include/area.h

@@ -23,7 +23,8 @@ typedef struct {
     u8 unk1A;
     u8 filler2[13];
     u8 field_0x28;
-    u8 filler4[0x834];
+    u8 filler4[0x833];
+    void*** field_0x85c;
     u32 musicIndex;
     u32 pMusicIndex;
     u8 filler5[0x20];
@@ -31,6 +32,7 @@ typedef struct {
     u32 unk3;
     u32 unk4;
 } Area;
+static_assert(sizeof(Area) == 0x894);
 
 extern Area gArea;
 

include/room.h

@@ -60,20 +60,13 @@ typedef struct {
     u8 filler4[48];
     u8 filler5[28];
     u32 greatFairyState;
-    u32* field_0x6c;
-    u32* field_0x70;
-    u32* field_0x74;
-    u32 field_0x78;
-    u8 field_0x79[10];
-    void* field_0x88;
+    void* field_0x6c[8];
 } RoomVars;
 
 // Packets used to store which entities to load in a room
 typedef struct {
-    u8 kind : 4;
-    u8 layer : 4;
-    u8 flags : 4;
-    u8 unk : 4;
+    u8 kind;
+    u8 flags;
     u8 id;
     u8 type;
     u32 type2;