Merge branch 'upstream/master' into main

include/entity.h

@@ -135,6 +135,16 @@ typedef struct Entity {
     /*0x86*/ union SplitHWord field_0x86;
 } Entity;
 
+typedef struct LinkedList {
+    Entity* last;
+    Entity* first;
+} LinkedList;
+
+extern LinkedList gEntityLists[9];
+extern LinkedList gUnk_03003D90;
+
+extern LinkedList gUnk_03003DA0;
+
 #define TILE(x, y)                                      \
     ((((x - gRoomControls.roomOriginX) >> 4) & 0x3fU) | \
      (((y - gRoomControls.roomOriginY) >> 4) & 0x3fU) << 6)
@@ -189,6 +199,4 @@ enum {
 #define Direction8ToAnimationState(expr) (Direction8RoundUp(expr) >> 2)
 #define Direction8FromAnimationState(expr) (expr << 2)
 
-extern Entity gUnk_03003DA0;
-
 #endif

include/functions.h

@@ -323,4 +323,5 @@ extern void sub_0804ACF8();
 extern void sub_08073904(Entity*);
 extern u32 sub_08056134(void);
 extern u32 sub_0807CF30(void*);
+extern void sub_08004484(Entity*, Entity*);
 #endif

include/manager.h

@@ -124,4 +124,13 @@ extern struct {
 
 extern DiggingCaveEntrance* gUnk_08107DC0[];
 
+typedef struct {
+    u8 unk_00;
+    u8 unk_01;
+    u8 unk_02;
+    u8 unk_03;
+    u16 unk_04;
+    u16 unk_06;
+} UnkManager26HelperStruct;
+
 #endif

include/room.h

@@ -81,4 +81,6 @@ extern RoomVars gRoomVars;
 extern void SetTileType(u32, u32, u32);
 extern void sub_08080964(u32 time, u32 magnitude); // shake screen
 
+extern void* GetCurrentRoomProperty(u32);
+
 #endif