merge entity.c

include/functions.h

@@ -105,7 +105,7 @@ extern void sub_0807AA80(Entity*);
 extern s32 sub_0807887C(Entity*, u32, u32);
 extern s32 sub_08078904();
 extern void sub_0805E5A8(void);
-extern void sub_0805E5C0(void);
+extern void UpdateEntities(void);
 extern void sub_080AD9B0(void);
 extern void sub_080AD918(void);
 extern void sub_0801E104(void);

include/manager.h

@@ -12,7 +12,7 @@ union SplitSHWord {
 } PACKED;
 
 typedef struct Manager {
-    /*0x00*/ struct Manager* previous;
+    /*0x00*/ struct Manager* prev;
     /*0x00*/ struct Manager* next;
     /*0x08*/ u8 type;
     /*0x09*/ u8 subtype;

include/structures.h

@@ -171,10 +171,7 @@ typedef struct {
     u8 unk1;
     u8 unk2;
     u8 unk3;
-    u8 freezeTime;
-    u8 unk9;
-    u8 unk_0xa;
-    u8 unk_0xb;
+    Entity* unk4;
     u16 unk_0xc;
 } EntityHandler;