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

Various code cleanup changes

16 files changed, 60 insertions, 20 deletions

diff --git a/src/playerItem/playerItemBoomerang.c b/src/playerItem/playerItemBoomerang.c
index bcc151a8..b5d12dd7 100644
--- a/src/playerItem/playerItemBoomerang.c
+++ b/src/playerItem/playerItemBoomerang.c
@@ -6,9 +6,12 @@
  */
 #include "asm.h"
 #include "entity.h"
-#include "functions.h"
+#include "physics.h"
 #include "item.h"
+#include "room.h"
 #include "sound.h"
+#include "vram.h"
+#include "collision.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/playerItem/playerItemBottle.c b/src/playerItem/playerItemBottle.c
index 47eeed56..d02a133a 100644
--- a/src/playerItem/playerItemBottle.c
+++ b/src/playerItem/playerItemBottle.c
@@ -6,12 +6,16 @@
  */
 #include "playerItem/playerItemBottle.h"
 
-#include "functions.h"
 #include "item.h"
 #include "object.h"
+#include "asm.h"
+#include "physics.h"
+#include "player.h"
 #include "save.h"
 #include "sound.h"
 #include "tiles.h"
+#include "vram.h"
+#include "collision.h"
 
 void PlayerItemBottle_UseEmptyBottle(Entity*);
 void PlayerItemBottle_Action1(PlayerItemBottleEntity*);
diff --git a/src/playerItem/playerItemBow.c b/src/playerItem/playerItemBow.c
index fec8aea4..827aa51f 100644
--- a/src/playerItem/playerItemBow.c
+++ b/src/playerItem/playerItemBow.c
@@ -7,12 +7,16 @@
 #include "asm.h"
 #include "effects.h"
 #include "entity.h"
-#include "functions.h"
 #include "object.h"
+#include "room.h"
+#include "physics.h"
+#include "player.h"
 #include "playeritem.h"
 #include "save.h"
 #include "sound.h"
 #include "tiles.h"
+#include "vram.h"
+#include "collision.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/playerItem/playerItemDashSword.c b/src/playerItem/playerItemDashSword.c
index 0256561c..f12237d2 100644
--- a/src/playerItem/playerItemDashSword.c
+++ b/src/playerItem/playerItemDashSword.c
@@ -5,8 +5,10 @@
  * @brief Dash Sword Player Item
  */
 #include "entity.h"
-#include "functions.h"
 #include "player.h"
+#include "vram.h"
+#include "collision.h"
+#include "asm.h"
 
 extern Entity* DoTileInteractionOffset(Entity*, u32, s32, s32);
 
diff --git a/src/playerItem/playerItemFireRodProjectile.c b/src/playerItem/playerItemFireRodProjectile.c
index c80c7894..698bf3a3 100644
--- a/src/playerItem/playerItemFireRodProjectile.c
+++ b/src/playerItem/playerItemFireRodProjectile.c
@@ -7,10 +7,12 @@
 #include "asm.h"
 #include "effects.h"
 #include "entity.h"
-#include "functions.h"
 #include "physics.h"
 #include "playeritem.h"
 #include "sound.h"
+#include "collision.h"
+#include "room.h"
+#include "player.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/playerItem/playerItemGust.c b/src/playerItem/playerItemGust.c
index 286c06f3..0ca4ef45 100644
--- a/src/playerItem/playerItemGust.c
+++ b/src/playerItem/playerItemGust.c
@@ -6,8 +6,10 @@
  */
 #include "asm.h"
 #include "entity.h"
-#include "functions.h"
+#include "collision.h"
 #include "object.h"
+#include "room.h"
+#include "physics.h"
 #include "player.h"
 #include "playeritem.h"
 
diff --git a/src/playerItem/playerItemGustBig.c b/src/playerItem/playerItemGustBig.c
index 7281139d..45b52c4a 100644
--- a/src/playerItem/playerItemGustBig.c
+++ b/src/playerItem/playerItemGustBig.c
@@ -4,13 +4,15 @@
  *
  * @brief Gust Big Player Item
  */
+#include "playeritem.h"
 #include "asm.h"
 #include "entity.h"
-#include "functions.h"
+#include "physics.h"
 #include "global.h"
 #include "player.h"
 #include "sound.h"
 #include "tiles.h"
+#include "collision.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/playerItem/playerItemGustJar.c b/src/playerItem/playerItemGustJar.c
index 10cbca1b..3425e6e4 100644
--- a/src/playerItem/playerItemGustJar.c
+++ b/src/playerItem/playerItemGustJar.c
@@ -5,9 +5,10 @@
  * @brief Gust Jar Player Item
  */
 #include "entity.h"
-#include "functions.h"
 #include "player.h"
 #include "sound.h"
+#include "vram.h"
+#include "asm.h"
 
 extern const u8* gUnk_08132714[]; // Anim index lists?
 // TODO spriteAnimations in here
diff --git a/src/playerItem/playerItemHeldObject.c b/src/playerItem/playerItemHeldObject.c
index 0783cd04..18013074 100644
--- a/src/playerItem/playerItemHeldObject.c
+++ b/src/playerItem/playerItemHeldObject.c
@@ -4,10 +4,11 @@
  *
  * @brief Held Object Player Item
  */
+#include "object.h"
 #include "asm.h"
 #include "effects.h"
-#include "entity.h"
-#include "functions.h"
+#include "physics.h"
+#include "collision.h"
 #include "player.h"
 #include "sound.h"
 #include "tiles.h"
diff --git a/src/playerItem/playerItemLantern.c b/src/playerItem/playerItemLantern.c
index 7c16acbc..fe6fccf6 100644
--- a/src/playerItem/playerItemLantern.c
+++ b/src/playerItem/playerItemLantern.c
@@ -5,10 +5,13 @@
  * @brief Lantern Player Item
  */
 #include "entity.h"
-#include "functions.h"
 #include "item.h"
 #include "object.h"
+#include "physics.h"
 #include "player.h"
+#include "vram.h"
+#include "asm.h"
+#include "collision.h"
 
 void PlayerItemLantern_Init(Entity* this);
 void PlayerItemLantern_Action1(Entity* this);
diff --git a/src/playerItem/playerItemPacciCane.c b/src/playerItem/playerItemPacciCane.c
index a6ef2553..82cb79f9 100644
--- a/src/playerItem/playerItemPacciCane.c
+++ b/src/playerItem/playerItemPacciCane.c
@@ -6,11 +6,11 @@
  */
 #include "common.h"
 #include "entity.h"
-#include "functions.h"
-#include "message.h"
 #include "save.h"
 #include "sound.h"
-#include "structures.h"
+#include "pauseMenu.h"
+#include "vram.h"
+#include "asm.h"
 
 void PlayerItemPacciCane_Action1(Entity*);
 void PlayerItemPacciCane_Init(Entity* this);
diff --git a/src/playerItem/playerItemPacciCaneProjectile.c b/src/playerItem/playerItemPacciCaneProjectile.c
index 251274c9..3e7aa03e 100644
--- a/src/playerItem/playerItemPacciCaneProjectile.c
+++ b/src/playerItem/playerItemPacciCaneProjectile.c
@@ -4,10 +4,14 @@
  *
  * @brief Pacci Cane Projectile Player Item
  */
+#include "playeritem.h"
 #include "asm.h"
 #include "entity.h"
-#include "functions.h"
+#include "collision.h"
 #include "object.h"
+#include "room.h"
+#include "physics.h"
+#include "player.h"
 #include "sound.h"
 #include "tiles.h"
 
diff --git a/src/playerItem/playerItemShield.c b/src/playerItem/playerItemShield.c
index 7df31ebd..f10623cc 100644
--- a/src/playerItem/playerItemShield.c
+++ b/src/playerItem/playerItemShield.c
@@ -6,10 +6,11 @@
  */
 #include "collision.h"
 #include "entity.h"
-#include "functions.h"
 #include "player.h"
 #include "playeritem.h"
 #include "sound.h"
+#include "vram.h"
+#include "asm.h"
 
 const Hitbox gUnk_081271CC = { 0, 0, { 1, 0, 0, 1 }, 8, 8 };
 
diff --git a/src/playerItem/playerItemSpiralBeam.c b/src/playerItem/playerItemSpiralBeam.c
index e381d594..8baeee41 100644
--- a/src/playerItem/playerItemSpiralBeam.c
+++ b/src/playerItem/playerItemSpiralBeam.c
@@ -7,8 +7,12 @@
 #include "asm.h"
 #include "effects.h"
 #include "entity.h"
-#include "functions.h"
+#include "playeritem.h"
+#include "physics.h"
 #include "sound.h"
+#include "collision.h"
+#include "room.h"
+#include "player.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/playerItem/playerItemSword.c b/src/playerItem/playerItemSword.c
index 1bf1d9e7..d82e19c4 100644
--- a/src/playerItem/playerItemSword.c
+++ b/src/playerItem/playerItemSword.c
@@ -7,10 +7,14 @@
 #include "asm.h"
 #include "effects.h"
 #include "entity.h"
-#include "functions.h"
 #include "object.h"
+#include "room.h"
+#include "physics.h"
+#include "player.h"
 #include "sound.h"
 #include "tiles.h"
+#include "vram.h"
+#include "collision.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/playerItem/playerItemSwordBeam.c b/src/playerItem/playerItemSwordBeam.c
index 4b110c43..e538407e 100644
--- a/src/playerItem/playerItemSwordBeam.c
+++ b/src/playerItem/playerItemSwordBeam.c
@@ -4,14 +4,17 @@
  *
  * @brief Sword Beam Player Item
  */
+#include "playeritem.h"
 #include "asm.h"
-#include "common.h"
 #include "effects.h"
 #include "entity.h"
-#include "functions.h"
+#include "collision.h"
 #include "physics.h"
 #include "player.h"
 #include "sound.h"
+#include "object.h"
+#include "room.h"
+#include "color.h"
 
 typedef struct {
     /*0x00*/ Entity base;