more cleanup

5 files changed, 17 insertions, 8 deletions

diff --git a/include/createObject.h b/include/createObject.h
new file mode 100644
index 00000000..03f3632e
--- /dev/null
+++ b/include/createObject.h
@@ -0,0 +1,8 @@
+#ifndef CREATEOBJECT_H
+#define CREATEOBJECT_H
+
+// maybe a dedicated (create)Effect.h/c
+void CreateDust(Entity* parent);
+void CreateDustSmall(Entity* parent);
+
+#endif // CREATEOBJECT_H
diff --git a/include/enemy.h b/include/enemy.h
index 22a62f78..0b3e8ecb 100644
--- a/include/enemy.h
+++ b/include/enemy.h
@@ -109,6 +109,5 @@ extern void Enemy66(Entity*);
 
 extern u32 GetNextFunction(Entity*);
 extern void EnemyFunctionHandler(Entity*, void (*const func[])(Entity*));
-extern void sub_0804AA30(Entity*, void (*const func[])(Entity*));
 extern void sub_08001324(Entity*);
 #endif
diff --git a/include/functions.h b/include/functions.h
index 48bcdd13..2b7a7888 100644
--- a/include/functions.h
+++ b/include/functions.h
@@ -7,8 +7,8 @@
 #include "manager.h"
 #include "position.h"
 #include "player.h"
-#include "structures.h"
 #include "room.h"
+#include "structures.h"
 
 // Identified - to be sorted into header files
 extern void SoundReq(u32);
@@ -17,7 +17,7 @@ extern u32 __modsi3(u32, u32);
 extern void DoFade(u32, u32);
 extern u32 CheckKinstoneFused(u32);
 extern void ForceEquipItem(u32, u8);
-extern void LoadRoomEntityList();
+extern void LoadRoomEntityList(EntityData* listPtr);
 extern u32 GetAnimationState(Entity*);
 extern void SetChildOffset(Entity*, s32, s32, s32);
 extern Entity* CreatePlayerItem(u32, u32, u32, u32);
@@ -29,7 +29,6 @@ extern void SetDirtTile(u32);
 extern void LoadRoomTileEntities(); // tba
 extern Entity* CreateDeathFx(Entity*, u32, u32);
 extern void UpdateAnimationVariableFrames(Entity*, u32);
-extern void CopyPositionAndSpriteOffset(Entity*, Entity*);
 extern u8* GetSpriteSubEntryOffsetDataPointer(u32, u32);
 extern u32 LoadFixedGFX(Entity*, u32);
 extern Entity* CreateItemEntity(u32, u32, u32);
@@ -42,19 +41,15 @@ extern Manager* GetEmptyManager(void);
 extern void LoadGfxGroup(u32);
 extern void EnqueueSFX(u32);
 extern void ResetPlayer(void);
-extern void CreateDust(Entity*);
 extern u32 IsItemEquipped(u32);
 extern void DeleteManager(Manager*);
 extern bool32 CheckPlayerInRegion(u32 centerX, u32 centerY, u32 radiusX, u32 radiusY);
-extern u32 CheckIsDungeon();
 extern u32 GetTileTypeByEntity(Entity*);
 
 // Unidentified
 extern u32 sub_0806ED78(Entity*);
-extern void sub_0806920C(Entity*);
 extern u32 sub_0805ACC0(Entity*);
 extern u32 sub_0801E99C(Entity*);
-extern void sub_0806924C(Entity*);
 extern Entity* sub_080873AC(Entity*, u32, u32);
 extern void sub_08078778(Entity*);
 extern void sub_080787A8(Entity*, u32);
diff --git a/include/game.h b/include/game.h
new file mode 100644
index 00000000..dec15e21
--- /dev/null
+++ b/include/game.h
@@ -0,0 +1,6 @@
+#ifndef GAME_H
+#define GAME_H
+
+u32 CheckIsDungeon(void);
+
+#endif // GAME_H
diff --git a/include/position.h b/include/position.h
index 4635a097..87d5b128 100644
--- a/include/position.h
+++ b/include/position.h
@@ -7,6 +7,7 @@
 void CopyPosition(Entity*, Entity*);
 void PositionEntityOnTop(Entity*, Entity*);
 void PositionRelative(Entity*, Entity*, s32, s32);
+void CopyPositionAndSpriteOffset(Entity* param_1, Entity* param_2);
 void sub_0806FA90(Entity*, Entity*, s32, s32);
 void ResolveEntityOnTop(Entity*, Entity*);
 void sub_0806FAD8(Entity*, Entity*);