Merge remote-tracking branch 'upstream/master' into enumasm

include/area.h

@@ -20,6 +20,15 @@ typedef struct {
 } RoomResInfo;
 static_assert(sizeof(RoomResInfo) == 0x20);
 
+typedef struct {
+    u8 inventoryGfxIdx;
+    u8 unk29;
+    u8 unk2a;
+    u8 unk2b;
+    u16 unk2C[7];
+    u16 unk3E;
+} struct_area_28;
+
 typedef struct {
     u8 areaMetadata;
     u8 locationIndex;
@@ -43,14 +52,13 @@ typedef struct {
     bool8 portal_in_use;
     u8 unk1A;
     u8 filler2[13];
-    u8 inventoryGfxIdx;
-    u8 filler4[0x13];
+    struct_area_28 unk28;
     RoomResInfo roomResInfos[MAX_ROOMS];
     RoomResInfo currentRoomInfo;
     RoomResInfo* pCurrentRoomInfo;
     u32 bgm;
     u32 queued_bgm;
-    u8 filler5[0x20];
+    u8 filler6[0x20];
     void* transitionManager;
     void (*onEnter)();
     void (*onExit)();

include/common.h

@@ -20,8 +20,8 @@ extern Input gInput; /**< Input instance. */
 typedef struct {
     u8 evt_type;
     u8 entity_idx;
-    u8 _2;
-    u8 _3;
+    u8 area;
+    u8 room;
     u16 _4;
     u16 _6;
     u16 x;

include/object.h

@@ -289,7 +289,7 @@ void Object37();
 void JarPortal();
 void BossDoor();
 void Object3A();
-void MacroMushromStalks();
+void MacroMushroomStalks();
 void MacroPlayer();
 void Object3D();
 void Object3E();

include/room.h

@@ -190,15 +190,17 @@ typedef struct {
 
 typedef struct {
     u8 type;
-    u8 _1;
+    u8 localFlag;
     u8 _2;
     u8 _3;
-    u16 _4;
+    u16 tilePos;
     u8 _6;
     u8 _7;
 } TileEntity;
 extern TileEntity gSmallChests[8];
 
+extern TileEntity gUnk_080FEAC8[];
+
 typedef enum {
     NONE,
     ROOM_VISIT_MARKER,
@@ -226,11 +228,12 @@ void LoadRoom(void);
 void SetCurrentRoomPropertyList(u32 area, u32 room);
 void* GetCurrentRoomProperty(u32);
 void LoadRoomTileEntities();
-void LoadRoomEntityList(EntityData* listPtr);
+Entity* LoadRoomEntity(const EntityData*);
+void LoadRoomEntityList(const EntityData* listPtr);
 
 bool32 LoadFixedGFX(Entity*, u32);
 void UnloadGFXSlots(Entity*);
-void sub_0804B3C4(void*);
+void sub_0804B3C4(TileEntity*);
 void sub_0804B0B0(u32 arg0, u32 arg1);
 
 void DoExitTransition(const ScreenTransitionData* data);