Merge pull request #675 from notyourav/d

clean up linkAnimation.c

4 files changed, 26 insertions, 3 deletions

diff --git a/include/entity.h b/include/entity.h
index 78dcde47..cbb54201 100644
--- a/include/entity.h
+++ b/include/entity.h
@@ -386,7 +386,7 @@ Entity* FindEntity(u32 kind, u32 id, u32 listIndex, u32 type, u32 type2);
  * @param entity Entity to set the priority of.
  * @param prio #Priority level.
  */
-void SetDefaultPriority(Entity* entity, u32 prio);
+void SetEntityPriority(Entity* entity, u32 prio);
 
 /**
  * Check if entity will be deleted next frame.
diff --git a/include/functions.h b/include/functions.h
index a770563b..49fb3f31 100644
--- a/include/functions.h
+++ b/include/functions.h
@@ -83,7 +83,7 @@ extern void sub_08030118(u32);
 extern void sub_0803C0AC(Entity*);
 extern void sub_08049CF4(Entity*);
 extern u32 sub_0804A024(Entity*, u32, u32);
-extern u32 sub_080542AC(u32);
+extern u32 IsMinishItem(u32);
 extern void DisableRandomDrops();
 extern void EnableRandomDrops(void);
 extern s32 sub_08056338(void);
diff --git a/include/object/linkAnimation.h b/include/object/linkAnimation.h
new file mode 100644
index 00000000..9fb2fad4
--- /dev/null
+++ b/include/object/linkAnimation.h
@@ -0,0 +1,23 @@
+#ifndef LINKANIMATION_H
+#define LINKANIMATION_H
+
+#ifndef NENT_DEPRECATED
+#error "linkAnimtion.h requires new entities"
+#endif
+#include "entity.h"
+
+typedef struct {
+    /*0x00*/ Entity base;
+    /*0x68*/ u8 storeDrawFlags;
+    /*0x69*/ u8 storeFlags;
+    /*0x6a*/ u8 storeIFrames;
+    /*0x6b*/ u8 storeField7;
+    /*0x6c*/ u8 storeKeepFacing;
+    /*0x6d*/ u8 storeFieldA;
+    /*0x6e*/ u8 storeField27;
+    /*0x6f*/ u8 storeMobility;
+    /*0x70*/ u32 storeStateFlags;
+    /*0x74*/ u8 store8A;
+} LinkAnimationEntity;
+
+#endif // LINKANIMATION_H
diff --git a/include/player.h b/include/player.h
index 19be9997..db8c1f08 100644
--- a/include/player.h
+++ b/include/player.h
@@ -263,7 +263,7 @@ typedef enum {
 typedef struct {
     /*0x0*/ u16 heldInput; /**< Input currently held @see PlayerInputState */
     /*0x2*/ u16 newInput;  /**< New input this frame @see PlayerInputState */
-    /*0x4*/ u32 field_0x94;
+    /*0x4*/ u32 unused;
     /*0x8*/ u16 playerMacroWaiting;
     /*0xa*/ u16 playerMacroHeldKeys;
     /*0xc*/ PlayerMacroEntry* playerMacro;