Merge pull request #701 from Henny022p/cleanup/250302HEADmaster

Various code cleanup changes

14 files changed, 19 insertions, 19 deletions

diff --git a/src/item/itemBomb.c b/src/item/itemBomb.c
index 90c66539..f3df6504 100644
--- a/src/item/itemBomb.c
+++ b/src/item/itemBomb.c
@@ -1,9 +1,7 @@
 #include "item.h"
 #include "physics.h"
 #include "sound.h"
-#include "functions.h"
 #include "playeritem.h"
-#include "functions.h"
 
 void sub_08075FF8(ItemBehavior*, u32);
 void sub_08076488(ItemBehavior*, u32);
diff --git a/src/item/itemBoomerang.c b/src/item/itemBoomerang.c
index a9c6aaab..9eef3d3b 100644
--- a/src/item/itemBoomerang.c
+++ b/src/item/itemBoomerang.c
@@ -1,5 +1,5 @@
 #include "item.h"
-#include "functions.h"
+#include "physics.h"
 
 void sub_08075D2C(ItemBehavior*, u32);
 void sub_08075D88(ItemBehavior*, u32);
diff --git a/src/item/itemBow.c b/src/item/itemBow.c
index 9b57e9c1..92b52f20 100644
--- a/src/item/itemBow.c
+++ b/src/item/itemBow.c
@@ -1,6 +1,6 @@
 #include "item.h"
-#include "functions.h"
 #include "save.h"
+#include "physics.h"
 
 void sub_08075DF4(ItemBehavior*, u32);
 void sub_08075E40(ItemBehavior*, u32);
diff --git a/src/item/itemGustJar.c b/src/item/itemGustJar.c
index 40fdd034..fe5a0476 100644
--- a/src/item/itemGustJar.c
+++ b/src/item/itemGustJar.c
@@ -1,5 +1,4 @@
 #include "entity.h"
-#include "functions.h"
 #include "item.h"
 #include "playeritem.h"
 #include "tiles.h"
diff --git a/src/item/itemJarEmpty.c b/src/item/itemJarEmpty.c
index 90ec65ed..98615777 100644
--- a/src/item/itemJarEmpty.c
+++ b/src/item/itemJarEmpty.c
@@ -1,6 +1,6 @@
 #include "item.h"
 #include "save.h"
-#include "functions.h"
+#include "physics.h"
 
 void sub_08077534(ItemBehavior*, u32);
 void sub_08077618(ItemBehavior*, u32);
diff --git a/src/item/itemLantern.c b/src/item/itemLantern.c
index af488bd1..8c67edc5 100644
--- a/src/item/itemLantern.c
+++ b/src/item/itemLantern.c
@@ -1,7 +1,10 @@
-#include "functions.h"
 #include "game.h"
 #include "item.h"
 #include "object.h"
+#include "asm.h"
+#include "room.h"
+#include "physics.h"
+#include "player.h"
 #include "sound.h"
 
 extern s8 gUnk_08126EEC[];
diff --git a/src/item/itemMoleMitts.c b/src/item/itemMoleMitts.c
index 8f535bdb..9732776d 100644
--- a/src/item/itemMoleMitts.c
+++ b/src/item/itemMoleMitts.c
@@ -1,8 +1,9 @@
-
 #include "effects.h"
-#include "functions.h"
 #include "item.h"
 #include "object.h"
+#include "asm.h"
+#include "room.h"
+#include "player.h"
 #include "sound.h"
 #include "tiles.h"
 
diff --git a/src/item/itemOcarina.c b/src/item/itemOcarina.c
index e5cea164..8cae9252 100644
--- a/src/item/itemOcarina.c
+++ b/src/item/itemOcarina.c
@@ -1,8 +1,7 @@
-#include "functions.h"
+#include "pauseMenu.h"
 #include "item.h"
 #include "sound.h"
 
-extern void ResetPlayerVelocity(void);
 extern void CreateBird(Entity*);
 void OcarinaUse(ItemBehavior*, u32);
 void OcarinaUpdate(ItemBehavior*, u32);
diff --git a/src/item/itemPacciCane.c b/src/item/itemPacciCane.c
index 56d2592c..8c8c08e6 100644
--- a/src/item/itemPacciCane.c
+++ b/src/item/itemPacciCane.c
@@ -1,7 +1,6 @@
 #include "global.h"
-#include "entity.h"
 #include "item.h"
-#include "functions.h"
+#include "physics.h"
 #include "playeritem.h"
 
 void sub_08076C98(ItemBehavior*, u32);
diff --git a/src/item/itemPegasusBoots.c b/src/item/itemPegasusBoots.c
index fca72541..0697d70a 100644
--- a/src/item/itemPegasusBoots.c
+++ b/src/item/itemPegasusBoots.c
@@ -1,6 +1,5 @@
 #include "asm.h"
 #include "effects.h"
-#include "functions.h"
 #include "game.h"
 #include "item.h"
 #include "playeritem.h"
diff --git a/src/item/itemRocsCape.c b/src/item/itemRocsCape.c
index 60d290c1..8c3c3c01 100644
--- a/src/item/itemRocsCape.c
+++ b/src/item/itemRocsCape.c
@@ -1,4 +1,3 @@
-#include "functions.h"
 #include "item.h"
 #include "sound.h"
 
diff --git a/src/item/itemShield.c b/src/item/itemShield.c
index 2fa8f07c..74418bd6 100644
--- a/src/item/itemShield.c
+++ b/src/item/itemShield.c
@@ -1,8 +1,7 @@
 #include "global.h"
-#include "entity.h"
 #include "item.h"
 #include "sound.h"
-#include "functions.h"
+#include "physics.h"
 
 void sub_08076D04(ItemBehavior*, u32);
 void sub_08076D34(ItemBehavior*, u32);
diff --git a/src/item/itemSword.c b/src/item/itemSword.c
index 95110349..4035df2f 100644
--- a/src/item/itemSword.c
+++ b/src/item/itemSword.c
@@ -1,6 +1,8 @@
-#include "functions.h"
 #include "item.h"
 #include "object.h"
+#include "effects.h"
+#include "room.h"
+#include "physics.h"
 #include "player.h"
 #include "playeritem.h"
 #include "sound.h"
diff --git a/src/item/itemTryPickupObject.c b/src/item/itemTryPickupObject.c
index c87c4838..5503a670 100644
--- a/src/item/itemTryPickupObject.c
+++ b/src/item/itemTryPickupObject.c
@@ -1,7 +1,9 @@
-#include "functions.h"
+#include "physics.h"
 #include "item.h"
 #include "playeritem.h"
 #include "sound.h"
+#include "ui.h"
+#include "room.h"
 
 u32 sub_08077F64(ItemBehavior* arg0, u32 index);
 u32 sub_080789A8(void);