Decompile some functions

include/entity.h

@@ -491,7 +491,18 @@ void ResetSystemPriority(void);
  */
 extern LinkedList gEntityLists[9];
 extern Entity gItemGetEntities[7];
-extern Entity gCarriedEntity;
+
+typedef struct {
+    u8 unk_0;
+    u8 unk_1;
+    u8 count;
+    u8 unk_3;
+    u16 unk_4;
+    u8 unk_6[2];
+    Entity* unk_8;
+    Entity* unk_c[0x20];
+} CarriedEntity;
+extern CarriedEntity gCarriedEntity;
 
 /**
  * Current number of entities.

include/new_player.h

@@ -1,3 +1,6 @@
+#ifndef NEW_PLAYER_H
+#define NEW_PLAYER_H
+
 #include "entity.h"
 
 // TODO Use new player entity struct everywhere once it is fully discovered.
@@ -18,4 +21,6 @@ typedef struct {
     /*0x80*/ u8 unk_80[8];
 } PlayerEntity;
 
-#define gNewPlayerEntity (*(PlayerEntity*)&gPlayerEntity)
+#define gNewPlayerEntity (*(PlayerEntity*)&gPlayerEntity)
+
+#endif

include/player.h

@@ -303,7 +303,7 @@ typedef struct {
     /*0xf*/ u8 field_0xf;
     /*0x10*/ u16 field_0x10;
     /*0x12*/ u8 field_0x12[6];
-    /*0x18*/ u32 field_0x18;
+    /*0x18*/ Entity* field_0x18;
 } ItemBehavior;
 
 extern void (*const gPlayerItemFunctions[])(Entity*);