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

Various code cleanup changes

83 files changed, 347 insertions, 78 deletions

diff --git a/src/npc/anju.c b/src/npc/anju.c
index 2e1b02bd..0670b221 100644
--- a/src/npc/anju.c
+++ b/src/npc/anju.c
@@ -7,6 +7,8 @@
 #include "entity.h"
 #include "npc.h"
 #include "player.h"
+#include "script.h"
+#include "physics.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/npc/beedle.c b/src/npc/beedle.c
index 0729e1cc..84afb434 100644
--- a/src/npc/beedle.c
+++ b/src/npc/beedle.c
@@ -5,7 +5,6 @@
  * @brief Beedle NPC
  */
 #include "entity.h"
-#include "functions.h"
 #include "game.h"
 #include "item.h"
 #include "message.h"
diff --git a/src/npc/bigGoron.c b/src/npc/bigGoron.c
index 9a134cfe..0f3237cd 100644
--- a/src/npc/bigGoron.c
+++ b/src/npc/bigGoron.c
@@ -4,11 +4,20 @@
  *
  * @brief BigGoron NPC
  */
-#include "functions.h"
+#include "npc/bigGoron.h"
 #include "hitbox.h"
 #include "item.h"
+#include "message.h"
+#include "script.h"
 #include "npc.h"
 #include "screen.h"
+#include "effects.h"
+#include "save.h"
+#include "common.h"
+#include "sound.h"
+#include "asm.h"
+#include "physics.h"
+#include "map.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/npc/bladeBrothers.c b/src/npc/bladeBrothers.c
index 58a0ed2c..ffdf7c41 100644
--- a/src/npc/bladeBrothers.c
+++ b/src/npc/bladeBrothers.c
@@ -6,7 +6,7 @@
  */
 #include "entity.h"
 #include "flags.h"
-#include "functions.h"
+#include "physics.h"
 #include "game.h"
 #include "item.h"
 #include "message.h"
@@ -15,6 +15,9 @@
 #include "room.h"
 #include "save.h"
 #include "script.h"
+#include "sound.h"
+#include "effects.h"
+#include "color.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/npc/brocco.c b/src/npc/brocco.c
index b4ab49e7..3f1c7379 100644
--- a/src/npc/brocco.c
+++ b/src/npc/brocco.c
@@ -7,7 +7,10 @@
 #include "entity.h"
 #include "message.h"
 #include "npc.h"
+#include "physics.h"
 #include "save.h"
+#include "script.h"
+#include "asm.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/npc/carlov.c b/src/npc/carlov.c
index 07a9abb5..c95b4d69 100644
--- a/src/npc/carlov.c
+++ b/src/npc/carlov.c
@@ -8,6 +8,7 @@
 #include "npc.h"
 #include "room.h"
 #include "sound.h"
+#include "script.h"
 
 void Carlov(Entity* this) {
     if (this->action == 0) {
diff --git a/src/npc/carpenter.c b/src/npc/carpenter.c
index 690f6c67..bc969bb5 100644
--- a/src/npc/carpenter.c
+++ b/src/npc/carpenter.c
@@ -8,6 +8,10 @@
 #include "item.h"
 #include "npc.h"
 #include "player.h"
+#include "message.h"
+#include "flags.h"
+#include "script.h"
+#include "physics.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/npc/castleMaid.c b/src/npc/castleMaid.c
index 2a47701a..a2de47c4 100644
--- a/src/npc/castleMaid.c
+++ b/src/npc/castleMaid.c
@@ -6,12 +6,13 @@
  */
 #include "entity.h"
 #include "flags.h"
-#include "functions.h"
 #include "manager.h"
 #include "message.h"
 #include "npc.h"
 #include "save.h"
 #include "script.h"
+#include "asm.h"
+#include "physics.h"
 
 typedef struct {
     Entity base;
diff --git a/src/npc/castorWildsStatue.c b/src/npc/castorWildsStatue.c
index 5043c0f0..175cb3c2 100644
--- a/src/npc/castorWildsStatue.c
+++ b/src/npc/castorWildsStatue.c
@@ -7,11 +7,17 @@
 #include "effects.h"
 #include "entity.h"
 #include "flags.h"
-#include "functions.h"
+#include "physics.h"
 #include "npc.h"
 #include "script.h"
 #include "sound.h"
 #include "tiles.h"
+#include "asm.h"
+#include "vram.h"
+#include "room.h"
+#include "player.h"
+#include "color.h"
+#include "map.h"
 
 typedef struct {
     /*0x00*/ Entity base;
@@ -161,7 +167,7 @@ void sub_080675D4(Entity* this) {
             ent->spriteRendering.b3 = this->spriteRendering.b3;
             SortEntityAbove(this, ent);
         }
-    };
+    }
     gUnk = gUnk_08110E8A;
     for (i = 0; i < 4; i++, gUnk++) {
         Entity* ent = CreateFx(this, FX_ROCK, 0);
@@ -174,7 +180,7 @@ void sub_080675D4(Entity* this) {
             ent->spriteRendering.b3 = this->spriteRendering.b3;
             SortEntityAbove(this, ent);
         }
-    };
+    }
     if (this->subAction > 2) {
         this->spriteSettings.draw = 0;
     }
diff --git a/src/npc/cat.c b/src/npc/cat.c
index 9adf40f1..9815e8e1 100644
--- a/src/npc/cat.c
+++ b/src/npc/cat.c
@@ -5,11 +5,14 @@
  * @brief Cat NPC
  */
 #include "enemy.h"
+#include "sound.h"
 #include "entity.h"
-#include "functions.h"
 #include "message.h"
 #include "npc.h"
 #include "save.h"
+#include "physics.h"
+#include "manager.h"
+#include "asm.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/npc/clothesRack.c b/src/npc/clothesRack.c
index ddf8903d..83f463db 100644
--- a/src/npc/clothesRack.c
+++ b/src/npc/clothesRack.c
@@ -6,6 +6,9 @@
  */
 #include "npc.h"
 #include "tiles.h"
+#include "room.h"
+#include "flags.h"
+#include "asm.h"
 
 void sub_0806DD90(Entity*);
 void sub_0806DEC8(Entity*);
diff --git a/src/npc/cow.c b/src/npc/cow.c
index 944d26b3..a43c8b9e 100644
--- a/src/npc/cow.c
+++ b/src/npc/cow.c
@@ -5,10 +5,12 @@
  * @brief Cow NPC
  */
 #include "entity.h"
-#include "functions.h"
+#include "message.h"
 #include "npc.h"
 #include "player.h"
 #include "sound.h"
+#include "asm.h"
+#include "manager.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/npc/cucco.c b/src/npc/cucco.c
index 54042add..e0be2aff 100644
--- a/src/npc/cucco.c
+++ b/src/npc/cucco.c
@@ -4,9 +4,12 @@
  *
  * @brief Cucco NPC
  */
-#include "functions.h"
+#include "message.h"
 #include "kinstone.h"
 #include "npc.h"
+#include "sound.h"
+#include "save.h"
+#include "asm.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/npc/cuccoChick.c b/src/npc/cuccoChick.c
index adf6eaf4..75cf0ede 100644
--- a/src/npc/cuccoChick.c
+++ b/src/npc/cuccoChick.c
@@ -4,8 +4,11 @@
  *
  * @brief Cucco Chick NPC
  */
-#include "functions.h"
+#include "message.h"
 #include "npc.h"
+#include "sound.h"
+#include "asm.h"
+#include "player.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/npc/dampe.c b/src/npc/dampe.c
index 62a39909..b8d66f5d 100644
--- a/src/npc/dampe.c
+++ b/src/npc/dampe.c
@@ -13,6 +13,8 @@
 #include "player.h"
 #include "room.h"
 #include "tiles.h"
+#include "script.h"
+#include "physics.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/npc/din.c b/src/npc/din.c
index 604c03bb..63d27d04 100644
--- a/src/npc/din.c
+++ b/src/npc/din.c
@@ -4,9 +4,12 @@
  *
  * @brief Din NPC
  */
-#include "entity.h"
-#include "kinstone.h"
 #include "npc.h"
+#include "kinstone.h"
+#include "save.h"
+#include "script.h"
+#include "physics.h"
+#include "asm.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/npc/dog.c b/src/npc/dog.c
index 628e56d8..b9a188f8 100644
--- a/src/npc/dog.c
+++ b/src/npc/dog.c
@@ -6,10 +6,17 @@
  */
 #include "collision.h"
 #include "entity.h"
-#include "functions.h"
 #include "item.h"
 #include "npc.h"
 #include "tiles.h"
+#include "sound.h"
+#include "flags.h"
+#include "save.h"
+#include "message.h"
+#include "script.h"
+#include "asm.h"
+#include "physics.h"
+#include "manager.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/npc/drLeft.c b/src/npc/drLeft.c
index c89760c5..5c22035d 100644
--- a/src/npc/drLeft.c
+++ b/src/npc/drLeft.c
@@ -4,9 +4,14 @@
  *
  * @brief Dr Left NPC
  */
-#include "functions.h"
+#include "physics.h"
 #include "item.h"
+#include "message.h"
 #include "npc.h"
+#include "flags.h"
+#include "save.h"
+#include "script.h"
+#include "asm.h"
 
 void sub_0806BFD8(Entity* this);
 
diff --git a/src/npc/emma.c b/src/npc/emma.c
index 7ff05e23..7e7cdb3c 100644
--- a/src/npc/emma.c
+++ b/src/npc/emma.c
@@ -5,8 +5,8 @@
  * @brief Emma NPC
  */
 #include "entity.h"
-#include "functions.h"
 #include "screenTransitions.h"
+#include "room.h"
 #include "script.h"
 
 void Emma(Entity* this) {
diff --git a/src/npc/epona.c b/src/npc/epona.c
index bec976fd..6cca50b8 100644
--- a/src/npc/epona.c
+++ b/src/npc/epona.c
@@ -5,10 +5,11 @@
  * @brief Epona NPC
  */
 #include "entity.h"
-#include "functions.h"
 #include "message.h"
 #include "npc.h"
 #include "sound.h"
+#include "player.h"
+#include "physics.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/npc/ezlo.c b/src/npc/ezlo.c
index c8012395..ba3532cd 100644
--- a/src/npc/ezlo.c
+++ b/src/npc/ezlo.c
@@ -5,6 +5,11 @@
  * @brief Ezlo NPC
  */
 #include "npc.h"
+#include "physics.h"
+#include "effects.h"
+#include "player.h"
+#include "script.h"
+#include "asm.h"
 
 const u8 gUnk_08114134[];
 const u8 gUnk_08114144[];
diff --git a/src/npc/farmers.c b/src/npc/farmers.c
index f98b8ef2..9d5a2806 100644
--- a/src/npc/farmers.c
+++ b/src/npc/farmers.c
@@ -5,7 +5,7 @@
  * @brief Farmers NPC
  */
 #include "entity.h"
-#include "functions.h"
+#include "message.h"
 #include "npc.h"
 #include "script.h"
 
diff --git a/src/npc/farore.c b/src/npc/farore.c
index ae08c094..c56a91ea 100644
--- a/src/npc/farore.c
+++ b/src/npc/farore.c
@@ -4,9 +4,13 @@
  *
  * @brief Farore NPC
  */
-#include "entity.h"
 #include "npc.h"
 #include "kinstone.h"
+#include "save.h"
+#include "player.h"
+#include "script.h"
+#include "physics.h"
+#include "asm.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/npc/festari.c b/src/npc/festari.c
index 8a13f80a..992d514c 100644
--- a/src/npc/festari.c
+++ b/src/npc/festari.c
@@ -5,8 +5,10 @@
  * @brief Festari NPC
  */
 #include "entity.h"
-#include "functions.h"
 #include "npc.h"
+#include "script.h"
+#include "player.h"
+#include "physics.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/npc/forestMinish.c b/src/npc/forestMinish.c
index 7c602e2a..8a1013f4 100644
--- a/src/npc/forestMinish.c
+++ b/src/npc/forestMinish.c
@@ -4,13 +4,22 @@
  *
  * @brief Forest Minish NPC
  */
-#include "functions.h"
 #include "item.h"
 #include "kinstone.h"
 #include "npc.h"
 #include "object.h"
+#include "asm.h"
+#include "common.h"
+#include "flags.h"
+#include "effects.h"
+#include "physics.h"
+#include "player.h"
 #include "playeritem.h"
+#include "save.h"
+#include "message.h"
+#include "script.h"
 #include "structures.h"
+
 typedef struct {
     /*0x00*/ Entity base;
     /*0x68*/ u8 fusionOffer;
@@ -715,7 +724,7 @@ void sub_08060318(void) {
     for (i = 2; i >= 0; i--) {
         ent = FindEntityByID(PLAYER_ITEM, PLAYER_ITEM_BOMB, 2);
         if (ent != NULL) {
-            CreateDust(ent);
+            CreateDeathFx(ent);
             DeleteEntity(ent);
         }
     }
diff --git a/src/npc/gentari.c b/src/npc/gentari.c
index 968f71fc..91bd3d43 100644
--- a/src/npc/gentari.c
+++ b/src/npc/gentari.c
@@ -6,6 +6,9 @@
  */
 #include "entity.h"
 #include "npc.h"
+#include "script.h"
+#include "player.h"
+#include "physics.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/npc/ghostBrothers.c b/src/npc/ghostBrothers.c
index 9282b35f..b1dd30a6 100644
--- a/src/npc/ghostBrothers.c
+++ b/src/npc/ghostBrothers.c
@@ -5,11 +5,13 @@
  * @brief Ghost Brothers NPC
  */
 #include "entity.h"
-#include "functions.h"
 #include "message.h"
 #include "npc.h"
 #include "save.h"
+#include "script.h"
 #include "screen.h"
+#include "beanstalkSubtask.h"
+#include "physics.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/npc/gina.c b/src/npc/gina.c
index 0124c37e..11c8d10b 100644
--- a/src/npc/gina.c
+++ b/src/npc/gina.c
@@ -7,6 +7,11 @@
 #include "entity.h"
 #include "npc.h"
 #include "player.h"
+#include "script.h"
+#include "physics.h"
+#if defined(USA) || defined(DEMO_USA)
+#include "flags.h"
+#endif
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/npc/gorman.c b/src/npc/gorman.c
index 576ef99b..c1ea99d2 100644
--- a/src/npc/gorman.c
+++ b/src/npc/gorman.c
@@ -4,8 +4,13 @@
  *
  * @brief Gorman NPC
  */
-#include "functions.h"
+#include "player.h"
 #include "npc.h"
+#include "asm.h"
+#include "message.h"
+#include "script.h"
+#include "flags.h"
+#include "room.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/npc/goron.c b/src/npc/goron.c
index a67b0e5f..389eb043 100644
--- a/src/npc/goron.c
+++ b/src/npc/goron.c
@@ -6,10 +6,13 @@
  */
 #include "effects.h"
 #include "entity.h"
-#include "functions.h"
 #include "kinstone.h"
 #include "message.h"
+#include "script.h"
 #include "npc.h"
+#include "common.h"
+#include "player.h"
+#include "physics.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/npc/goronMerchant.c b/src/npc/goronMerchant.c
index c9bd4d73..005cbaf1 100644
--- a/src/npc/goronMerchant.c
+++ b/src/npc/goronMerchant.c
@@ -6,11 +6,13 @@
  */
 #include "entity.h"
 #include "flags.h"
-#include "functions.h"
+#include "manager.h"
 #include "item.h"
 #include "message.h"
 #include "npc.h"
 #include "save.h"
+#include "script.h"
+#include "physics.h"
 
 static u32 GoronMerchant_GetSalePrice(Entity*);
 
diff --git a/src/npc/gregal.c b/src/npc/gregal.c
index f081280a..a6706d75 100644
--- a/src/npc/gregal.c
+++ b/src/npc/gregal.c
@@ -5,9 +5,11 @@
  * @brief Gregal NPC
  */
 #include "entity.h"
-#include "functions.h"
 #include "npc.h"
 #include "script.h"
+#include "player.h"
+#include "physics.h"
+#include "color.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/npc/guard.c b/src/npc/guard.c
index 760bb6b0..8acd58d6 100644
--- a/src/npc/guard.c
+++ b/src/npc/guard.c
@@ -6,13 +6,14 @@
  */
 #include "entity.h"
 #include "flags.h"
-#include "functions.h"
+#include "manager.h"
 #include "message.h"
 #include "npc.h"
 #include "player.h"
 #include "projectile.h"
 #include "room.h"
 #include "script.h"
+#include "physics.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/npc/guardWithSpear.c b/src/npc/guardWithSpear.c
index e4821138..b3ebce26 100644
--- a/src/npc/guardWithSpear.c
+++ b/src/npc/guardWithSpear.c
@@ -5,12 +5,18 @@
  * @brief Guard with Spear NPC
  */
 #include "entity.h"
-#include "functions.h"
 #include "item.h"
 #include "npc.h"
 #include "object.h"
+#include "asm.h"
+#include "flags.h"
+#include "effects.h"
+#include "room.h"
+#include "physics.h"
 #include "player.h"
 #include "script.h"
+#include "save.h"
+#include "message.h"
 
 typedef struct {
     /*0x00*/ Entity base;
@@ -132,7 +138,7 @@ void sub_08064198(GuardWithSpearEntity* this) {
         ProcessMovement0(super);
         if (sVar1 != super->y.HALF.HI) {
             if (0x140 < gPlayerEntity.base.speed && gRoomTransition.frameCount % 6 == 0) {
-                CreateDustSmall(super);
+                CreateDashFx(super);
             }
             this->unk_71 = 10;
             animationState = super->animationState = GetAnimationStateForDirection8(super->direction);
@@ -154,7 +160,7 @@ void sub_08064198(GuardWithSpearEntity* this) {
     sVar1 = super->z.HALF.HI;
     super->z.HALF.HI = gPlayerEntity.base.z.HALF.HI;
     if (sVar1 < 0 && gPlayerEntity.base.z.HALF.HI == 0) {
-        CreateDustSmall(super);
+        CreateDashFx(super);
     }
 }
 
@@ -189,7 +195,7 @@ void sub_080642B8(GuardWithSpearEntity* this) {
         ProcessMovement0(super);
         if (sVar1 != super->x.HALF.HI) {
             if (0x140 < gPlayerEntity.base.speed && gRoomTransition.frameCount % 6 == 0) {
-                CreateDustSmall(super);
+                CreateDashFx(super);
             }
             this->unk_71 = 10;
             animationState = super->animationState = GetAnimationStateForDirection8(super->direction);
@@ -211,7 +217,7 @@ void sub_080642B8(GuardWithSpearEntity* this) {
     sVar1 = super->z.HALF.HI;
     super->z.HALF.HI = gPlayerEntity.base.z.HALF.HI;
     if (sVar1 < 0 && gPlayerEntity.base.z.HALF.HI == 0) {
-        CreateDustSmall(super);
+        CreateDashFx(super);
     }
 }
 
diff --git a/src/npc/hurdyGurdyMan.c b/src/npc/hurdyGurdyMan.c
index eb271392..51600e21 100644
--- a/src/npc/hurdyGurdyMan.c
+++ b/src/npc/hurdyGurdyMan.c
@@ -5,9 +5,13 @@
  * @brief Hurdy Gurdy Man NPC
  */
 #include "entity.h"
-#include "functions.h"
+#include "message.h"
 #include "npc.h"
 #include "save.h"
+#include "script.h"
+#include "common.h"
+#include "asm.h"
+#include "physics.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/npc/kid.c b/src/npc/kid.c
index 678ff84b..44f65647 100644
--- a/src/npc/kid.c
+++ b/src/npc/kid.c
@@ -4,10 +4,17 @@
  *
  * @brief Kid NPC
  */
-#include "functions.h"
 #include "message.h"
 #include "npc.h"
 #include "tiles.h"
+#include "save.h"
+#include "common.h"
+#include "asm.h"
+#include "script.h"
+#include "manager.h"
+#include "structures.h"
+#include "physics.h"
+#include "map.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/npc/kingDaltus.c b/src/npc/kingDaltus.c
index 1840e24e..d4a52aee 100644
--- a/src/npc/kingDaltus.c
+++ b/src/npc/kingDaltus.c
@@ -5,10 +5,12 @@
  * @brief King Daltus NPC
  */
 #include "entity.h"
-#include "functions.h"
 #include "item.h"
 #include "npc.h"
 #include "script.h"
+#include "message.h"
+#include "flags.h"
+#include "physics.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/npc/kingGustaf.c b/src/npc/kingGustaf.c
index 48db93af..0a738bea 100644
--- a/src/npc/kingGustaf.c
+++ b/src/npc/kingGustaf.c
@@ -5,8 +5,8 @@
  * @brief King Gustaf NPC
  */
 #include "entity.h"
-#include "functions.h"
 #include "screen.h"
+#include "script.h"
 
 void KingGustaf(Entity* this) {
     s32 speed;
diff --git a/src/npc/librari.c b/src/npc/librari.c
index 7e2a69ba..fc8db45a 100644
--- a/src/npc/librari.c
+++ b/src/npc/librari.c
@@ -7,6 +7,9 @@
 #include "entity.h"
 #include "item.h"
 #include "npc.h"
+#include "flags.h"
+#include "message.h"
+#include "script.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/npc/librarians.c b/src/npc/librarians.c
index e19c3cc4..d53d6387 100644
--- a/src/npc/librarians.c
+++ b/src/npc/librarians.c
@@ -6,7 +6,6 @@
  */
 #include "entity.h"
 #include "flags.h"
-#include "functions.h"
 #include "item.h"
 #include "message.h"
 #include "script.h"
diff --git a/src/npc/mailbox.c b/src/npc/mailbox.c
index 5eb4ea9d..7732485b 100644
--- a/src/npc/mailbox.c
+++ b/src/npc/mailbox.c
@@ -8,6 +8,7 @@
 #include "entity.h"
 #include "message.h"
 #include "npc.h"
+#include "player.h"
 
 void sub_08063280(Entity*);
 void sub_08063210(Entity*);
diff --git a/src/npc/malon.c b/src/npc/malon.c
index add79ace..a2a8fc9c 100644
--- a/src/npc/malon.c
+++ b/src/npc/malon.c
@@ -7,6 +7,8 @@
 #include "entity.h"
 #include "npc.h"
 #include "script.h"
+#include "physics.h"
+#include "player.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/npc/mama.c b/src/npc/mama.c
index fa20f7a2..e322a247 100644
--- a/src/npc/mama.c
+++ b/src/npc/mama.c
@@ -8,6 +8,8 @@
 #include "npc.h"
 #include "save.h"
 #include "script.h"
+#include "message.h"
+#include "physics.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/npc/marcy.c b/src/npc/marcy.c
index f7c56f54..a4d29146 100644
--- a/src/npc/marcy.c
+++ b/src/npc/marcy.c
@@ -6,7 +6,7 @@
  */
 #include "entity.h"
 #include "flags.h"
-#include "functions.h"
+#include "script.h"
 #include "item.h"
 #include "message.h"
 
diff --git a/src/npc/mayorHagen.c b/src/npc/mayorHagen.c
index 9f4aeb4c..d39943f4 100644
--- a/src/npc/mayorHagen.c
+++ b/src/npc/mayorHagen.c
@@ -9,6 +9,10 @@
 #include "item.h"
 #include "npc.h"
 #include "player.h"
+#include "message.h"
+#include "save.h"
+#include "script.h"
+#include "physics.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/npc/melari.c b/src/npc/melari.c
index 30c08445..e8d10481 100644
--- a/src/npc/melari.c
+++ b/src/npc/melari.c
@@ -6,6 +6,12 @@
  */
 #include "item.h"
 #include "npc.h"
+#include "physics.h"
+#include "effects.h"
+#include "sound.h"
+#include "script.h"
+#include "message.h"
+#include "asm.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/npc/ministerPotho.c b/src/npc/ministerPotho.c
index 1532a424..fbcf9b8c 100644
--- a/src/npc/ministerPotho.c
+++ b/src/npc/ministerPotho.c
@@ -9,6 +9,8 @@
 #include "item.h"
 #include "message.h"
 #include "npc.h"
+#include "script.h"
+#include "physics.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/npc/moblinLady.c b/src/npc/moblinLady.c
index 1fa8d109..8ff54300 100644
--- a/src/npc/moblinLady.c
+++ b/src/npc/moblinLady.c
@@ -6,6 +6,7 @@
  */
 #include "entity.h"
 #include "npc.h"
+#include "script.h"
 
 void MoblinLady(Entity* this) {
     if (this->action == 0) {
diff --git a/src/npc/mountainMinish.c b/src/npc/mountainMinish.c
index 4bbf89b9..8f471cba 100644
--- a/src/npc/mountainMinish.c
+++ b/src/npc/mountainMinish.c
@@ -6,11 +6,14 @@
  */
 #include "entity.h"
 #include "flags.h"
-#include "functions.h"
+#include "physics.h"
 #include "item.h"
 #include "message.h"
 #include "npc.h"
 #include "script.h"
+#include "effects.h"
+#include "sound.h"
+#include "asm.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/npc/mutoh.c b/src/npc/mutoh.c
index 5e09a1d0..407c6f16 100644
--- a/src/npc/mutoh.c
+++ b/src/npc/mutoh.c
@@ -11,6 +11,9 @@
 #include "message.h"
 #include "npc.h"
 #include "player.h"
+#include "save.h"
+#include "physics.h"
+#include "script.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/npc/nayru.c b/src/npc/nayru.c
index 5130dbf5..3b501723 100644
--- a/src/npc/nayru.c
+++ b/src/npc/nayru.c
@@ -4,9 +4,13 @@
  *
  * @brief Nayru NPC
  */
-#include "entity.h"
-#include "kinstone.h"
 #include "npc.h"
+#include "kinstone.h"
+#include "save.h"
+#include "player.h"
+#include "script.h"
+#include "physics.h"
+#include "asm.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/npc/npc23.c b/src/npc/npc23.c
index acda02d4..2ff8885a 100644
--- a/src/npc/npc23.c
+++ b/src/npc/npc23.c
@@ -5,11 +5,12 @@
  * @brief NPC 23
  */
 #include "entity.h"
-#include "functions.h"
 #include "message.h"
 #include "npc.h"
 #include "player.h"
-#include "structures.h"
+#include "pauseMenu.h"
+#include "room.h"
+#include "physics.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/npc/npc26.c b/src/npc/npc26.c
index b3b5860b..0a4f4107 100644
--- a/src/npc/npc26.c
+++ b/src/npc/npc26.c
@@ -6,6 +6,8 @@
  */
 #include "entity.h"
 #include "npc.h"
+#include "script.h"
+#include "player.h"
 
 static void (*const gUnk_081106D4[])(Entity*);
 static void (*const gUnk_081106E0[])(Entity*);
diff --git a/src/npc/npc4E.c b/src/npc/npc4E.c
index 2fae4b91..25a831cc 100644
--- a/src/npc/npc4E.c
+++ b/src/npc/npc4E.c
@@ -6,17 +6,22 @@
  */
 #include "entity.h"
 #include "flags.h"
-#include "functions.h"
 #include "game.h"
 #include "hitbox.h"
 #include "item.h"
 #include "kinstone.h"
 #include "npc.h"
 #include "object.h"
+#include "common.h"
+#include "room.h"
+#include "physics.h"
+#include "player.h"
 #include "save.h"
 #include "screenTransitions.h"
 #include "sound.h"
 #include "tiles.h"
+#include "scroll.h"
+#include "script.h"
 
 typedef struct {
     /*0x00*/ Entity base;
@@ -35,7 +40,7 @@ extern void script_MinishVillageObjectRightStoneOpening; // Cutscene data type?
 
 const Hitbox gUnk_08114154;
 const InteractCollisionData gNpc4ECollisionData[];
-const ScreenTransitionData* const gNpc4ETransitions[];
+const Transition* const gNpc4ETransitions[];
 const u8 gNpc4ETransitionTypes[];
 const u16 gUnk_081141F4[];
 
@@ -62,7 +67,7 @@ void NPC4E_ChangeInteractableHitbox(Entity* this, ScriptExecutionContext* contex
 }
 
 void NPC4E_DoScreenTransition(Entity* this, ScriptExecutionContext* context) {
-    sub_0808091C(gNpc4ETransitions[context->intVariable], gNpc4ETransitionTypes[context->intVariable]);
+    DoExitTransitionWithType(gNpc4ETransitions[context->intVariable], gNpc4ETransitionTypes[context->intVariable]);
 }
 
 u8 NPC4E_GetKinstoneId(Entity* this) {
@@ -255,8 +260,8 @@ const InteractCollisionData gNpc4ECollisionData[] = { //
 #endif
 };
 
-// Array of pointers to ScreenTransitionData
-const ScreenTransitionData* const gNpc4ETransitions[] = { //
+// Array of pointers to Transition
+const Transition* const gNpc4ETransitions[] = { //
     &gUnk_0813AB6C, &gUnk_0813ABBC, &gUnk_0813ABE4, &gUnk_0813ABF8, &gUnk_0813AC0C, &gUnk_0813AC20,
     &gUnk_0813AC5C, &gUnk_0813AC70, &gUnk_0813AC84, &gUnk_0813AC98, &gUnk_0813ACAC, &gUnk_0813ACC0,
     &gUnk_0813ACD4, &gUnk_0813ACE8, &gUnk_0813AC5C, &gUnk_0813ACFC
diff --git a/src/npc/npc4F.c b/src/npc/npc4F.c
index 3f9450a3..442f9868 100644
--- a/src/npc/npc4F.c
+++ b/src/npc/npc4F.c
@@ -5,6 +5,7 @@
  * @brief NPC 4F
  */
 #include "npc.h"
+#include "asm.h"
 
 void NPC4F(Entity* this) {
     if (this->action == 0) {
diff --git a/src/npc/npc5.c b/src/npc/npc5.c
index 27c865d6..e5219081 100644
--- a/src/npc/npc5.c
+++ b/src/npc/npc5.c
@@ -5,11 +5,17 @@
  * @brief Unused Zelda follower NPC.
  */
 #include "collision.h"
-#include "functions.h"
 #include "hitbox.h"
 #include "message.h"
 #include "npc.h"
 #include "tiles.h"
+#include "flags.h"
+#include "common.h"
+#include "physics.h"
+#include "asm.h"
+#include "room.h"
+#include "player.h"
+#include "map.h"
 
 #define kFollowDistance 32 // distance to follow player
 #define kPoiDistance 4     // point of interest distance
diff --git a/src/npc/npc9.c b/src/npc/npc9.c
index 99fcccb9..b8d04ce5 100644
--- a/src/npc/npc9.c
+++ b/src/npc/npc9.c
@@ -7,6 +7,7 @@
 #include "entity.h"
 #include "message.h"
 #include "npc.h"
+#include "player.h"
 
 void sub_08062AF0(Entity*);
 void sub_08062B14(Entity*);
diff --git a/src/npc/percy.c b/src/npc/percy.c
index a3a04a44..5f4e660d 100644
--- a/src/npc/percy.c
+++ b/src/npc/percy.c
@@ -5,10 +5,17 @@
  * @brief Percy NPC
  */
 #include "entity.h"
-#include "functions.h"
 #include "item.h"
 #include "kinstone.h"
+#include "message.h"
 #include "npc.h"
+#include "save.h"
+#include "script.h"
+#include "common.h"
+#include "asm.h"
+#include "effects.h"
+#include "flags.h"
+#include "physics.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/npc/phonograph.c b/src/npc/phonograph.c
index f10677d2..241f2947 100644
--- a/src/npc/phonograph.c
+++ b/src/npc/phonograph.c
@@ -8,10 +8,10 @@
 #include "entity.h"
 #include "fileselect.h"
 #include "flags.h"
-#include "functions.h"
 #include "message.h"
 #include "screen.h"
 #include "script.h"
+#include "sound.h"
 
 typedef struct {
     /*0x00*/ Entity base;
@@ -205,14 +205,14 @@ const static Font gUnk_081146B8 = {
 #ifdef EU
 void sub_0806EABC(PhonographEntity* this) {
     sub_08050384();
-    sub_08057044(this->unk_68, gUnk_020227E8, 0x202020);
+    NumberToAsciiPad3Digits(this->unk_68, gUnk_020227E8, 0x202020);
     ShowTextBox(0x3302, &gUnk_081146B8);
     gScreen.bg0.updated = 1;
 }
 #else
 void sub_0806EABC(Entity* this, u32 param) {
     sub_08050384();
-    sub_08057044(param, gUnk_020227E8, 0x202020);
+    NumberToAsciiPad3Digits(param, &gUnk_020227E8[0], 0x202020);
     ShowTextBox(0x3302, &gUnk_081146B8);
     gScreen.bg0.updated = 1;
 }
diff --git a/src/npc/picolyteBottle.c b/src/npc/picolyteBottle.c
index c384b53b..16170a02 100644
--- a/src/npc/picolyteBottle.c
+++ b/src/npc/picolyteBottle.c
@@ -5,15 +5,19 @@
  * @brief Picolyte Bottle NPC
  */
 #include "entity.h"
-#include "functions.h"
 #include "hitbox.h"
 #include "kinstone.h"
 #include "message.h"
 #include "npc.h"
 #include "object.h"
+#include "asm.h"
+#include "common.h"
+#include "flags.h"
+#include "room.h"
+#include "physics.h"
+#include "player.h"
 #include "screenTransitions.h"
 #include "script.h"
-#include "structures.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/npc/pina.c b/src/npc/pina.c
index 26692def..592c4246 100644
--- a/src/npc/pina.c
+++ b/src/npc/pina.c
@@ -5,11 +5,14 @@
  * @brief Pina NPC
  */
 #include "entity.h"
-#include "functions.h"
 #include "message.h"
 #include "npc.h"
 #include "object.h"
+#include "asm.h"
+#include "physics.h"
+#include "player.h"
 #include "save.h"
+#include "script.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/npc/pita.c b/src/npc/pita.c
index 804a0e38..3cfd55de 100644
--- a/src/npc/pita.c
+++ b/src/npc/pita.c
@@ -6,6 +6,11 @@
  */
 #include "item.h"
 #include "npc.h"
+#include "message.h"
+#include "flags.h"
+#include "script.h"
+#include "physics.h"
+#include "asm.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/npc/postman.c b/src/npc/postman.c
index 05f0d906..98678a3a 100644
--- a/src/npc/postman.c
+++ b/src/npc/postman.c
@@ -5,10 +5,14 @@
  * @brief Postman NPC
  */
 #include "entity.h"
-#include "functions.h"
 #include "npc.h"
 #include "sound.h"
-#include "structures.h"
+#include "effects.h"
+#include "save.h"
+#include "script.h"
+#include "asm.h"
+#include "message.h"
+#include "physics.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/npc/rem.c b/src/npc/rem.c
index d921f196..739efcbd 100644
--- a/src/npc/rem.c
+++ b/src/npc/rem.c
@@ -4,9 +4,15 @@
  *
  * @brief Rem NPC
  */
-#include "functions.h"
+#include "physics.h"
 #include "item.h"
 #include "npc.h"
+#include "flags.h"
+#include "sound.h"
+#include "message.h"
+#include "script.h"
+#include "asm.h"
+#include "room.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/npc/simon.c b/src/npc/simon.c
index 480897ee..783aeb31 100644
--- a/src/npc/simon.c
+++ b/src/npc/simon.c
@@ -6,14 +6,14 @@
  */
 #include "entity.h"
 #include "flags.h"
-#include "functions.h"
 #include "object.h"
+#include "effects.h"
 #include "room.h"
-#include "screen.h"
 #include "screenTransitions.h"
 #include "script.h"
 #include "sound.h"
 #include "tiles.h"
+#include "fade.h"
 
 typedef struct {
     u8 filler[4];
diff --git a/src/npc/sittingPerson.c b/src/npc/sittingPerson.c
index c3da1060..b5eea94f 100644
--- a/src/npc/sittingPerson.c
+++ b/src/npc/sittingPerson.c
@@ -5,7 +5,13 @@
  * @brief Sitting Person NPC
  */
 #include "npc.h"
-#include "functions.h"
+#include "save.h"
+#include "flags.h"
+#include "asm.h"
+#include "message.h"
+#include "script.h"
+#include "physics.h"
+#include "structures.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/npc/smallTownMinish.c b/src/npc/smallTownMinish.c
index bada8800..2acf353e 100644
--- a/src/npc/smallTownMinish.c
+++ b/src/npc/smallTownMinish.c
@@ -5,8 +5,8 @@
  * @brief Small Town Minish NPC
  */
 #include "entity.h"
-#include "functions.h"
 #include "item.h"
+#include "message.h"
 #include "npc.h"
 #include "player.h"
 #include "save.h"
diff --git a/src/npc/smith.c b/src/npc/smith.c
index 2210dede..f1b6f2f7 100644
--- a/src/npc/smith.c
+++ b/src/npc/smith.c
@@ -4,8 +4,15 @@
  *
  * @brief Smith NPC
  */
-#include "functions.h"
+#include "physics.h"
 #include "npc.h"
+#include "sound.h"
+#include "save.h"
+#include "flags.h"
+#include "effects.h"
+#include "message.h"
+#include "script.h"
+#include "asm.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/npc/stamp.c b/src/npc/stamp.c
index 8051fe44..ef6c99c0 100644
--- a/src/npc/stamp.c
+++ b/src/npc/stamp.c
@@ -6,10 +6,12 @@
  */
 #include "effects.h"
 #include "entity.h"
-#include "functions.h"
 #include "kinstone.h"
 #include "message.h"
 #include "npc.h"
+#include "common.h"
+#include "script.h"
+#include "player.h"
 
 void sub_08062CA4(Entity*);
 void sub_08062BD4(Entity*);
diff --git a/src/npc/stockwell.c b/src/npc/stockwell.c
index d1971904..253f53e2 100644
--- a/src/npc/stockwell.c
+++ b/src/npc/stockwell.c
@@ -5,14 +5,20 @@
  * @brief Stockwell NPC
  */
 #include "entity.h"
-#include "functions.h"
 #include "game.h"
 #include "item.h"
 #include "message.h"
 #include "npc.h"
 #include "object.h"
+#include "asm.h"
+#include "flags.h"
+#include "player.h"
 #include "room.h"
 #include "script.h"
+#include "save.h"
+#include "subtask.h"
+#ifndef EU
+#endif
 
 #ifndef EU
 static const Rect gUnk_0810FDA0 = { 0, 8, 10, 16 };
diff --git a/src/npc/sturgeon.c b/src/npc/sturgeon.c
index b48d2ec6..c6e51c21 100644
--- a/src/npc/sturgeon.c
+++ b/src/npc/sturgeon.c
@@ -5,10 +5,16 @@
  * @brief Sturgeon NPC
  */
 #include "entity.h"
-#include "functions.h"
 #include "item.h"
 #include "npc.h"
 #include "object.h"
+#include "flags.h"
+#include "effects.h"
+#include "room.h"
+#include "physics.h"
+#include "player.h"
+#include "message.h"
+#include "script.h"
 
 typedef struct {
     /*0x00*/ Entity base;
@@ -148,7 +154,7 @@ void Sturgeon_Head(Entity* this) {
 
 void sub_08064C9C(Entity* this) {
     if ((this->timer != 0) && ((gRoomTransition.frameCount & 3U) == 0)) {
-        CreateDust(this);
+        CreateDeathFx(this);
     }
 }
 
diff --git a/src/npc/syrup.c b/src/npc/syrup.c
index 60083964..7609ffe1 100644
--- a/src/npc/syrup.c
+++ b/src/npc/syrup.c
@@ -4,9 +4,13 @@
  *
  * @brief Syrup NPC
  */
-#include "functions.h"
+#include "script.h"
 #include "npc.h"
 #include "object.h"
+#include "asm.h"
+#include "effects.h"
+#include "room.h"
+#include "physics.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/npc/talon.c b/src/npc/talon.c
index ddcd1977..c0558722 100644
--- a/src/npc/talon.c
+++ b/src/npc/talon.c
@@ -4,9 +4,12 @@
  *
  * @brief Talon NPC
  */
-#include "functions.h"
+#include "physics.h"
 #include "item.h"
 #include "npc.h"
+#include "script.h"
+#include "message.h"
+#include "asm.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/npc/teachers.c b/src/npc/teachers.c
index 89953855..605ae639 100644
--- a/src/npc/teachers.c
+++ b/src/npc/teachers.c
@@ -9,6 +9,8 @@
 #include "player.h"
 #include "save.h"
 #include "script.h"
+#include "message.h"
+#include "physics.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/npc/tingleSiblings.c b/src/npc/tingleSiblings.c
index 75abc4db..3dc599be 100644
--- a/src/npc/tingleSiblings.c
+++ b/src/npc/tingleSiblings.c
@@ -5,10 +5,17 @@
  * @brief Tingle Siblings NPC
  */
 #include "entity.h"
-#include "functions.h"
 #include "item.h"
 #include "kinstone.h"
 #include "npc.h"
+#include "flags.h"
+#include "save.h"
+#include "effects.h"
+#include "common.h"
+#include "message.h"
+#include "script.h"
+#include "asm.h"
+#include "physics.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/npc/townMinish.c b/src/npc/townMinish.c
index b0f3fc68..40f49234 100644
--- a/src/npc/townMinish.c
+++ b/src/npc/townMinish.c
@@ -6,10 +6,14 @@
  */
 #include "asm.h"
 #include "entity.h"
-#include "functions.h"
+#include "physics.h"
 #include "item.h"
 #include "npc.h"
 #include "tiles.h"
+#include "flags.h"
+#include "message.h"
+#include "save.h"
+#include "script.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/npc/townsperson.c b/src/npc/townsperson.c
index 8f8b34f1..1501b175 100644
--- a/src/npc/townsperson.c
+++ b/src/npc/townsperson.c
@@ -4,9 +4,16 @@
  *
  * @brief Townsperson NPC
  */
-#include "functions.h"
 #include "item.h"
 #include "npc.h"
+#include "save.h"
+#include "script.h"
+#include "flags.h"
+#include "effects.h"
+#include "asm.h"
+#include "message.h"
+#include "manager.h"
+#include "physics.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/npc/vaati.c b/src/npc/vaati.c
index d272f3d8..7b9017e0 100644
--- a/src/npc/vaati.c
+++ b/src/npc/vaati.c
@@ -5,9 +5,9 @@
  * @brief Vaati NPC
  */
 #include "entity.h"
-#include "functions.h"
 #include "script.h"
 #include "sound.h"
+#include "room.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/npc/vaatiReborn.c b/src/npc/vaatiReborn.c
index 82c349be..a699702c 100644
--- a/src/npc/vaatiReborn.c
+++ b/src/npc/vaatiReborn.c
@@ -4,8 +4,12 @@
  *
  * @brief Vaati Reborn NPC
  */
-#include "functions.h"
 #include "npc.h"
+#include "color.h"
+#include "sound.h"
+#include "flags.h"
+#include "message.h"
+#include "physics.h"
 
 void VaatiRebornAction0(Entity* this);
 void VaatiRebornAction1(Entity* this);
diff --git a/src/npc/wheaton.c b/src/npc/wheaton.c
index 41eb8ac9..38b2585b 100644
--- a/src/npc/wheaton.c
+++ b/src/npc/wheaton.c
@@ -5,6 +5,8 @@
  * @brief Wheaton NPC
  */
 #include "npc.h"
+#include "physics.h"
+#include "script.h"
 
 void Wheaton(Entity* this) {
     static const Hitbox gUnk_0810C3C0 = { 0, 4, { 0, 0, 0, 0 }, 6, 12 };
diff --git a/src/npc/windTribespeople.c b/src/npc/windTribespeople.c
index 521e850b..dfa257a3 100644
--- a/src/npc/windTribespeople.c
+++ b/src/npc/windTribespeople.c
@@ -7,6 +7,11 @@
 #include "entity.h"
 #include "npc.h"
 #include "sound.h"
+#include "script.h"
+#include "message.h"
+#include "flags.h"
+#include "save.h"
+#include "player.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/npc/zelda.c b/src/npc/zelda.c
index e740296f..f5a93fa3 100644
--- a/src/npc/zelda.c
+++ b/src/npc/zelda.c
@@ -7,10 +7,15 @@
 #include "npc/zelda.h"
 #include "entity.h"
 #include "flags.h"
-#include "functions.h"
+#include "script.h"
+#include "physics.h"
 #include "npc.h"
 #include "sound.h"
 #include "tiles.h"
+#include "asm.h"
+#include "room.h"
+#include "player.h"
+#include "map.h"
 
 void ZeldaFollower_Hide(Entity*, Entity*);
 void ZeldaFollower_Show(Entity*, Entity*);
diff --git a/src/npc/zeldaFollower.c b/src/npc/zeldaFollower.c
index 3e372423..28ce780f 100644
--- a/src/npc/zeldaFollower.c
+++ b/src/npc/zeldaFollower.c
@@ -7,7 +7,9 @@
 #include "npc/zelda.h"
 #include "common.h"
 #include "entity.h"
-#include "functions.h"
+#include "asm.h"
+#include "physics.h"
+#include "player.h"
 
 extern s32 sub_080041E8(s32 x1, s32 y1, s32 x2, s32 y2);