move function decls from player.c

6 files changed, 55 insertions, 10 deletions

diff --git a/include/asm.h b/include/asm.h
index a2c28581..d501bbd7 100644
--- a/include/asm.h
+++ b/include/asm.h
@@ -33,5 +33,6 @@ extern u32 sub_080086B4(u32, u32, u8*);
 extern u32 ResolveCollisionLayer(struct Entity_*);
 extern void sub_0800417E(struct Entity_*, u32);
 extern u32 sub_0800442E(struct Entity_*);
+extern u32 sub_08007DD6(u32, const u16*);
 
 #endif // ASM_H
diff --git a/include/coord.h b/include/coord.h
index b8af7117..2c243c35 100644
--- a/include/coord.h
+++ b/include/coord.h
@@ -18,11 +18,16 @@ void sub_0806FA90(Entity*, Entity*, s32, s32);
 void SortEntityAbove(Entity* below_ent, Entity* above_ent);
 void SortEntityBelow(Entity* above_ent, Entity* below_ent);
 
+u32 sub_0806FCA0(Entity*, Entity*);
+u32 sub_0806F58C(Entity*, Entity*);
+u32 PointInsideRadius(s32 x, s32 y, s32 radius);
 u32 sub_0806F5A4(u32 idx);
 bool32 sub_0806F3E4(Entity*);
 void LinearMoveUpdate(Entity*);
 bool32 sub_0806FD54(Entity*);
 u32 sub_0806FCAC(Entity*, Entity*);
+u32 sub_0806F854(Entity*, s32, s32);
+u32 sub_0806F730(Entity*);
 
 extern const s16 gSineTable[64];
 extern const s16 gCosineTable[256];
diff --git a/include/entity.h b/include/entity.h
index 4f2cc3ca..3fbdb43d 100644
--- a/include/entity.h
+++ b/include/entity.h
@@ -288,6 +288,7 @@ Entity* CreateEnemy(u32 id, u32 type);
 Entity* CreateNPC(u32 id, u32 type, u32 type2);
 Entity* CreateObject(u32 id, u32 type, u32 type2);
 Entity* CreateObjectWithParent(Entity* parent, u32 id, u32 type, u32 type2);
+Entity* CreateItemGetEntity(void);
 Entity* CreateFx(Entity* parent, u32 type, u32 type2);
 /// @}
 
@@ -489,6 +490,8 @@ void ResetSystemPriority(void);
  * to allow the iteration of all Entity's.
  */
 extern LinkedList gEntityLists[9];
+extern Entity gItemGetEntities[7];
+extern Entity gCarriedEntity;
 
 /**
  * Current number of entities.
diff --git a/include/functions.h b/include/functions.h
index 64e15113..acfa617d 100644
--- a/include/functions.h
+++ b/include/functions.h
@@ -78,7 +78,6 @@ extern void UnloadGFXSlots(Entity*);
 extern void UnloadOBJPalette(Entity*);
 extern void UpdateDisplayControls(void);
 extern void UpdateItemAnim(ItemBehavior*);
-extern void UpdatePlayerMovement(void);
 
 // Unidentified
 extern void sub_08000148(u32, u32, u32);
@@ -207,11 +206,8 @@ extern void sub_08078E84(Entity*, Entity*);
 extern void sub_08078FB0(Entity*);
 extern void sub_08079184();
 extern void sub_0807919C();
-extern void sub_0807921C();
 extern void sub_080792BC(s32, u32, u32);
 extern u32 sub_0807953C(void);
-extern void sub_08079708(Entity*);
-extern u32 sub_08079B24(void);
 extern void sub_08079BD8(Entity*);
 extern u32 sub_08079D48();
 extern void sub_08079D84(void);
@@ -219,7 +215,6 @@ extern bool32 sub_08079F8C(void);
 extern u32 sub_08079FC4(u32);
 extern void sub_0807A050(void);
 extern void sub_0807A5B8(u32);
-extern u32 sub_0807A894(Entity*);
 extern void sub_0807A8D8(Entity*);
 extern void sub_0807AA80(Entity*);
 extern void sub_0807AABC(Entity*);
diff --git a/include/object.h b/include/object.h
index 7164e413..eb4582d4 100644
--- a/include/object.h
+++ b/include/object.h
@@ -14,7 +14,6 @@
 #include "entity.h"
 #include "player.h"
 
-extern void sub_0807879C(Entity*);
 extern void sub_080787C0(Entity*);
 extern void sub_080787B4(Entity*);
 extern void sub_0808C650(Entity*, u32);
@@ -25,6 +24,7 @@ extern void sub_080A2BE4(Entity*, bool32);
 void CreateDust(Entity* parent);
 void CreateDustAt(s32, s32, u32);
 void CreateDustSmall(Entity* parent);
+Entity* CreateWaterTrace(Entity*);
 Entity* CreateSpeechBubbleQuestionMark(Entity*, s32, s32);
 Entity* CreateSpeechBubbleExclamationMark(Entity*, s32, s32);
 Entity* CreateSpeechBubbleSleep(Entity*, s32, s32);
diff --git a/include/player.h b/include/player.h
index 1ec25ed8..fdb3d2d8 100644
--- a/include/player.h
+++ b/include/player.h
@@ -316,7 +316,7 @@ extern Entity* gPlayerClones[];
 extern PlayerState gPlayerState;
 extern Entity gPlayerEntity;
 
-u32 CheckPlayerInactive(void);
+bool32 CheckInitPauseMenu(void);
 void SetPlayerControl(PlayerControlMode mode);
 void ResetPlayer(void);
 void ResetPlayerVelocity(void);
@@ -331,19 +331,60 @@ void RegisterPlayerHitbox(void);
 void UpdateFloorType(void);
 void CreateEzloHint(u32, u32);
 
+// game.c
 /** @see Item */
 u32 IsItemEquipped(u32);
 /** @see Item */
 u32 GetInventoryValue(u32);
 s32 ModHealth(s32 delta);
 void ModRupees(s32 delta);
+
+// playerUtils.c
 void DeleteClones(void);
+void sub_08077728(u32);
+void sub_08077B20(void);
+void sub_08079E58(s32 speed, u32 direction);
+void RespawnPlayer(void);
+u32 GetSurfaceCalcType(Entity*, u32, u32);
+void UpdatePlayerMovement(void);
+void EnablePlayerDraw(Entity*);
+void sub_080797EC(void);
+void sub_08079258(void);
+u32 sub_08079B24(void);
+void sub_08079708(Entity*);
+void sub_08079744(Entity*);
+void sub_0807AE20(Entity*);
+u32 sub_0807A894(Entity*);
+u32 sub_080797C4(void);
+void sub_08078F24(void);
+void sub_0807B068(Entity*);
+u32 sub_0807A2F8(u32);
+void sub_08077698(/* PlayerEntity* */);
+bool32 sub_0807A2B8(void);
+u32 sub_08079550(void);
+u32 sub_080782C0(void);
+bool32 sub_080793E4(u32);
+bool32 sub_08079C30(Entity*);
+void sub_08077AEC(void);
+bool32 CheckQueuedAction(void);
+void UpdatePlayerSkills(void);
+u32 sub_0807AC54(Entity*);
+void sub_080792D8(void);
+u32 sub_08078F74(Entity*);
+void sub_0807879C(Entity*);
+void sub_0807921C();
 
-void sub_08077728();
-extern void sub_08077B20();
+// player.s
 extern u32 PlayerCheckNEastTile();
 extern u32* sub_08008790(Entity*, u32);
-extern void sub_08079E58(s32 speed, u32 direction);
+extern void UpdateIcePlayerVelocity(Entity*);
+extern void sub_08008AC6(Entity*);
+extern void sub_08008926(Entity*);
+extern void sub_08008AC6(Entity*);
+extern void sub_08008AA0(Entity*);
+
+// zelda.c
+void SetZeldaFollowTarget(Entity*);
 
 #define COPY_FLAG_FROM_TO(base, src, dest) (base) = ((base) & ~(dest)) | (((dest) * ((base) & (src))) / src)