sort out functions.h

10 files changed, 12 insertions, 4 deletions

diff --git a/src/object/bird.c b/src/object/bird.c
index 33bea93a..24e2693b 100644
--- a/src/object/bird.c
+++ b/src/object/bird.c
@@ -1,6 +1,7 @@
 #include "save.h"
 #include "object.h"
 #include "functions.h"
+#include "item.h"
 
 extern void (*const gUnk_08123EC0[])(Entity*);
 extern void (*const gUnk_08123EEC[])(Entity*);
diff --git a/src/object/book.c b/src/object/book.c
index 3da498bc..7c3bf57e 100644
--- a/src/object/book.c
+++ b/src/object/book.c
@@ -1,6 +1,7 @@
 #include "object.h"
 #include "functions.h"
 #include "message.h"
+#include "item.h"
 
 extern void (*const BookActionFuncs[])(Entity*);
 extern s8 const gUnk_08123D94[];
diff --git a/src/object/cloud.c b/src/object/cloud.c
index dd3da89d..5c4383d8 100644
--- a/src/object/cloud.c
+++ b/src/object/cloud.c
@@ -2,6 +2,8 @@
 #include "structures.h"
 #include "functions.h"
 
+void sub_0809F814(u32 r0);
+
 extern void sub_0809F7BC(Entity*);
 extern void sub_0809F7F4(Entity*);
 extern void (*gUnk_08124798[])(Entity*);
diff --git a/src/object/greatFairy.c b/src/object/greatFairy.c
index 85e8681a..9232fd21 100644
--- a/src/object/greatFairy.c
+++ b/src/object/greatFairy.c
@@ -6,7 +6,7 @@
 
 void GreatFairy_InitializeAnimation(Entity*);
 Entity* GreatFairy_CreateForm(Entity*, u32, u32);
-void sub_080873D0();
+void sub_080873D0(Entity*);
 extern void (*const GreatFairy_Main[])(Entity*);
 extern void (*const GreatFairy_Behaviors[])(Entity*);
 extern void (*const GreatFairy_WingsBehaviors[])(Entity*);
diff --git a/src/object/heartContainer.c b/src/object/heartContainer.c
index 433fb87e..9e8346b3 100644
--- a/src/object/heartContainer.c
+++ b/src/object/heartContainer.c
@@ -2,6 +2,7 @@
 #include "entity.h"
 #include "flags.h"
 #include "functions.h"
+#include "item.h"
 
 static void sub_0808E6A0(Entity*);
 static void sub_0808E6E4(Entity*);
diff --git a/src/object/lilypadSmall.c b/src/object/lilypadSmall.c
index 31c5c3a8..5ec5fb84 100644
--- a/src/object/lilypadSmall.c
+++ b/src/object/lilypadSmall.c
@@ -6,6 +6,7 @@ extern void sub_080A2CC0(Entity*, Entity**, u16*);
 extern u16 gUnk_08123318[];
 
 static void sub_08097B24(Entity* this);
+static u32 sub_08097ADC(Entity* this);
 
 void LilypadSmall(Entity* this) {
     u32 rand;
@@ -30,7 +31,7 @@ void LilypadSmall(Entity* this) {
     }
 }
 
-u32 sub_08097ADC(Entity* this) {
+static u32 sub_08097ADC(Entity* this) {
     if ((gPlayerState.flags & PL_MINISH) == 0) {
         return 0;
     } else if (EntityInRectRadius(this, &gPlayerEntity, 8, 8) == 0) {
diff --git a/src/object/object1A.c b/src/object/object1A.c
index bdc3fe49..292a70f6 100644
--- a/src/object/object1A.c
+++ b/src/object/object1A.c
@@ -1,7 +1,7 @@
 #include "object.h"
 #include "functions.h"
 
-extern void sub_08086A6C();
+extern void sub_08086A6C(Entity*);
 
 extern void (*gUnk_081206C4[99])(Entity*);
 
diff --git a/src/object/object6A.c b/src/object/object6A.c
index 1f956870..f02d7660 100644
--- a/src/object/object6A.c
+++ b/src/object/object6A.c
@@ -5,6 +5,7 @@
 #include "message.h"
 #include "functions.h"
 #include "screen.h"
+#include "item.h"
 
 extern u8 gUnk_08114F30[];
 extern u8 gUnk_08114F34[];
diff --git a/src/object/objectA8.c b/src/object/objectA8.c
index ef00c9df..8a347a1f 100644
--- a/src/object/objectA8.c
+++ b/src/object/objectA8.c
@@ -1,6 +1,7 @@
 #include "entity.h"
 #include "player.h"
 #include "functions.h"
+#include "item.h"
 
 extern void (*gUnk_08124824[])(Entity*);
 
diff --git a/src/object/palaceArchway.c b/src/object/palaceArchway.c
index 13e6d3bb..f1c0abb9 100644
--- a/src/object/palaceArchway.c
+++ b/src/object/palaceArchway.c
@@ -14,5 +14,5 @@ void sub_0809F2A0(Entity* this) {
     SetTile(0x4069, COORD_TO_TILE(this), this->collisionLayer);
 }
 
-void nullsub_537() {
+void nullsub_537(Entity* this) {
 }