header clean up

6 files changed, 37 insertions, 17 deletions

diff --git a/include/entity.h b/include/entity.h
index c912c917..a1dc11dd 100644
--- a/include/entity.h
+++ b/include/entity.h
@@ -153,6 +153,23 @@ typedef struct Entity {
 
 } Entity;
 
-#define COORD_TO_TILE(entity) ((((entity->x.HALF.HI - gRoomControls.roomOriginX) >> 4) & 0x3fU) | (((entity->y.HALF.HI - gRoomControls.roomOriginY) >> 4) & 0x3fU) << 6)
+#define COORD_TO_TILE(entity)                                           \
+    ((((entity->x.HALF.HI - gRoomControls.roomOriginX) >> 4) & 0x3fU) | \
+     (((entity->y.HALF.HI - gRoomControls.roomOriginY) >> 4) & 0x3fU) << 6)
+
+extern void InitializeAnimation(Entity*, u32);
+extern void InitAnimationForceUpdate(Entity*, u32);
+extern void UpdateAnimationSingleFrame(Entity*);
+extern void UpdateSpriteOrderAndFlip(Entity*);
+extern void GetNextFrame(Entity*);
+extern u32 LoadExtraSpriteData(Entity*, SpriteLoadData*);
+extern void SetExtraSpriteFrame(Entity*, u32, u32);
+extern void SetSpriteSubEntryOffsetData1(Entity*, u32, u32);
+
+extern Entity* CreateEnemy(u32 subtype, u32 form);
+extern Entity* CreateObject(u32 subtype, u32 form, u32 parameter);
+extern Entity* CreateNPC(u32 subtype, u32 form, u32 parameter);
+extern Entity* CreateObjectWithParent(Entity* parent, u32 subtype, u32 form, u32 parameter);
+extern Entity* CreateFx(Entity* parent, u32 form, u32 parameter);
 
 #endif
diff --git a/include/functions.h b/include/functions.h
index 454b8480..c715694d 100644
--- a/include/functions.h
+++ b/include/functions.h
@@ -9,28 +9,19 @@
 // Identified - to be sorted into header files
 extern u32 Random(void);
 extern void PlaySFX(u32);
-extern void UpdateSpriteOrderAndFlip(Entity*);
-extern void InitAnimationForceUpdate(Entity*, u32);
 extern void ShowNPCDialogue(Entity*, u32*);
 extern u32 UpdateFuseInteraction();
-extern void InitializeAnimation(Entity*, u32);
 extern void DeleteEntity(Entity*);
 extern u32 __modsi3(u32, u32);
 extern void DoFade(u32, u32);
-extern void UpdateAnimationSingleFrame(Entity*);
 extern u32 GetInventoryValue(u32);
-extern Entity* CreateFx(Entity*, u32, u32);
 extern u32 CheckKinstoneFused(u32);
 extern void ForceEquipItem(u8, u8);
 extern void LoadRoomEntityList();
-void ModHealth(s32);
 void CopyPosition(Entity*, Entity*);
 extern u32* StartCutscene(Entity*, u8*);
-extern void GetNextFrame(Entity*);
-extern u32 LoadExtraSpriteData(Entity*, u32*);
 extern void ResolveEntityOnTop(Entity*, Entity*);
-extern void SetExtraSpriteFrame(Entity*, u32, u32);
-extern void SetSpriteSubEntryOffsetData1(Entity*, u32, u32);
+
 
 // Unidentified
 extern void sub_0806ED78(Entity*);
diff --git a/include/link.h b/include/link.h
index 8ec7259d..f6ce96be 100644
--- a/include/link.h
+++ b/include/link.h
@@ -76,4 +76,8 @@ extern LinkState gLinkState;
 extern Stats gStats;
 extern Entity gLinkEntity;
 
+
+extern u32 GetInventoryValue(u32);
+extern s32 ModHealth(s32);
+
 #endif
\ No newline at end of file
diff --git a/include/npc.h b/include/npc.h
index 32b575c9..b1a7c2b5 100644
--- a/include/npc.h
+++ b/include/npc.h
@@ -4,12 +4,6 @@
 #ifndef NPC_H
 #define NPC_H
 
-typedef struct {
-    u16 palette;
-    u8 animIndex;
-    u8 unk;
-} SpriteLoadData;
-
 extern void Gentari(Entity*);
 extern void Gentari_Fusion(Entity*);
 extern void Festari(Entity*);
@@ -175,4 +169,7 @@ extern void Phonograph(Entity*);
 extern void NPC58(Entity*);
 extern void NPC58_Head(Entity*);
 
+
+extern u32 UpdateFuseInteraction(Entity*);
+
 #endif
\ No newline at end of file
diff --git a/include/room.h b/include/room.h
index 7a55d58c..ccde88c8 100644
--- a/include/room.h
+++ b/include/room.h
@@ -60,4 +60,7 @@ typedef struct {
 
 extern RoomControls gRoomControls;
 extern RoomVars gRoomVars;
+
+extern void SetTileType(u32, u32, u32);
+
 #endif
\ No newline at end of file
diff --git a/include/sprite.h b/include/sprite.h
index 2132d98d..7d2507d7 100644
--- a/include/sprite.h
+++ b/include/sprite.h
@@ -2,6 +2,7 @@
 #define SPRITE_H
 
 #include "global.h"
+#include "entity.h"
 
 typedef struct {
     u8 index;
@@ -28,4 +29,11 @@ typedef struct {
     u8 numGfxTiles;
     u16 gfxTileIndex;
 } FrameGfxData;
+
+typedef struct {
+    u16 palette;
+    u8 animIndex;
+    u8 unk;
+} SpriteLoadData;
+
 #endif
\ No newline at end of file