diff --git a/include/asm.h b/include/asm.h
index 22c507c7..20a57c35 100644
--- a/include/asm.h
+++ b/include/asm.h
@@ -12,9 +12,6 @@ extern void SetTile(u32 tileIndex, u32 tilePos, u32 layer);
 extern void UpdateScrollVram(void);
 extern u32 sub_080B1BA4(u32, u32, u32);
 extern void LoadResourceAsync(const void* src, void* dest, u32 size);
-extern void GenericConfused(struct Entity_*);
-extern void sub_08001290(struct Entity_*, u32);
-extern void GenericKnockback(struct Entity_*);
 extern u32 GetFuserId(struct Entity_*);
 #define GetFuserIdAndFuserTextId(ent) ((union SplitDWord)(*(MultiReturnTypeSingleEntityArg)(&GetFuserId))(ent))
 extern u32 CheckPlayerInRegion(u32 centerX, u32 centerY, u32 radiusX, u32 radiusY);
@@ -39,12 +36,9 @@ extern void sub_08004596(struct Entity_*, u32);
 extern u32 sub_080045B4(struct Entity_*, u32, u32);
 extern u32 CalculateDirectionTo(u32, u32, u32, u32);
 extern u32 CalculateDirectionFromOffsets(s32, s32);
-extern u32 sub_080086B4(u32, u32, const u8*);
-extern u32 ResolveCollisionLayer(struct Entity_*);
 extern void sub_0800417E(struct Entity_*, u32);
 extern u32 sub_0800442E(struct Entity_*);
 extern void SoundReqClipped(struct Entity_*, u32);
-extern u32 sub_0800132C(struct Entity_*, struct Entity_*);
 
 extern u32 sub_0800445C(struct Entity_*);
 extern u32 CheckRectOnScreen(s32, s32, u32, u32);
@@ -108,8 +102,6 @@ extern u32 FindValueForKey(u32 key, const KeyValuePair* keyValuePairList);
 
 extern u32 GetTileIndex(u32 tilePos, u32 layer);
 extern void LinearMoveDirectionOLD(struct Entity_*, u32, u32);
-extern u16* DoTileInteraction(struct Entity_*, u32, u32, u32);
-extern void UpdateCollisionLayer(struct Entity_*);
 extern void sub_080028E0(struct Entity_*);
 extern void SnapToTile(struct Entity_*);
 extern u32 sub_0800419C(struct Entity_*, struct Entity_*, u32, u32);
diff --git a/include/enemy.h b/include/enemy.h
index 08d51179..ab3ed769 100644
--- a/include/enemy.h
+++ b/include/enemy.h
@@ -2,7 +2,6 @@
 #define ENEMY_H
 
 #include "global.h"
-#include "asm.h"
 
 #include "sound.h"
 #include "effects.h"
@@ -76,8 +75,11 @@ bool32 sub_08049F1C(Entity*, Entity*, s32);
 bool32 PlayerInRange(Entity*, u32, s32);
 void EnemyCopyParams(Entity*, Entity*);
 void GenericKnockback2(Entity*);
+extern void GenericConfused(struct Entity_*);
 
 extern void sub_08001318(Entity*);
+extern void sub_08001290(Entity*, u32);
+extern u32 sub_0800132C(struct Entity_*, struct Entity_*);
 
 extern void StealRupees(Entity*);
 extern void EnemyDisableRespawn(Enemy*);
diff --git a/include/player.h b/include/player.h
index ac8bcddf..3248f04f 100644
--- a/include/player.h
+++ b/include/player.h
@@ -831,6 +831,8 @@ extern void sub_08008926(Entity*);
 extern void sub_08008AC6(Entity*);
 extern void sub_08008AA0(Entity*);
 extern void sub_080085B0(Entity*);
+extern u32 sub_080086B4(u32, u32, const u8*);
+extern u16* DoTileInteraction(struct Entity_*, u32, u32, u32);
 
 // zelda.c
 void SetZeldaFollowTarget(Entity* target);
diff --git a/include/script.h b/include/script.h
index 6a0688d6..de391faf 100644
--- a/include/script.h
+++ b/include/script.h
@@ -64,4 +64,7 @@ void ExecuteScriptAndHandleAnimation(Entity* entity, void (*postScriptCallback)(
 ScriptExecutionContext* CreateScriptExecutionContext(void);
 void InitScriptForEntity(Entity* entity, ScriptExecutionContext* context, Script* script);
 
+extern u32 ResolveCollisionLayer(struct Entity_*);
+extern void UpdateCollisionLayer(struct Entity_*);
+
 #endif // SCRIPT_H
diff --git a/src/enemy/acroBandits.c b/src/enemy/acroBandits.c
index 7336487c..6ac2b964 100644
--- a/src/enemy/acroBandits.c
+++ b/src/enemy/acroBandits.c
@@ -7,6 +7,7 @@
 #include "enemy.h"
 #include "player.h"
 #include "physics.h"
+#include "asm.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/enemy/armos.c b/src/enemy/armos.c
index 13b20c5b..04d6bdb7 100644
--- a/src/enemy/armos.c
+++ b/src/enemy/armos.c
@@ -15,6 +15,7 @@
 #include "tiles.h"
 #include "room.h"
 #include "player.h"
+#include "asm.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/enemy/ballChainSoldier.c b/src/enemy/ballChainSoldier.c
index 2b28fa1e..908c7d2d 100644
--- a/src/enemy/ballChainSoldier.c
+++ b/src/enemy/ballChainSoldier.c
@@ -8,6 +8,7 @@
 #include "entity.h"
 #include "room.h"
 #include "physics.h"
+#include "asm.h"
 
 typedef struct {
     Entity base;
diff --git a/src/enemy/beetle.c b/src/enemy/beetle.c
index 00a907d9..9637abb6 100644
--- a/src/enemy/beetle.c
+++ b/src/enemy/beetle.c
@@ -7,6 +7,7 @@
 #include "enemy.h"
 #include "player.h"
 #include "physics.h"
+#include "asm.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/enemy/bowMoblin.c b/src/enemy/bowMoblin.c
index d8319cc3..8bbc4b5c 100644
--- a/src/enemy/bowMoblin.c
+++ b/src/enemy/bowMoblin.c
@@ -7,6 +7,7 @@
 #include "enemy.h"
 #include "entity.h"
 #include "physics.h"
+#include "asm.h"
 
 typedef struct {
     Entity base;
diff --git a/src/enemy/businessScrubPrologue.c b/src/enemy/businessScrubPrologue.c
index 99f4e03b..fdd9646f 100644
--- a/src/enemy/businessScrubPrologue.c
+++ b/src/enemy/businessScrubPrologue.c
@@ -11,6 +11,7 @@
 #include "physics.h"
 #include "room.h"
 #include "player.h"
+#include "asm.h"
 
 typedef struct {
     Entity base;
diff --git a/src/enemy/cloudPiranha.c b/src/enemy/cloudPiranha.c
index 2e12cfb4..534c8505 100644
--- a/src/enemy/cloudPiranha.c
+++ b/src/enemy/cloudPiranha.c
@@ -9,6 +9,7 @@
 #include "room.h"
 #include "physics.h"
 #include "tiles.h"
+#include "asm.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/enemy/crow.c b/src/enemy/crow.c
index 3d4231c5..2c51fb5d 100644
--- a/src/enemy/crow.c
+++ b/src/enemy/crow.c
@@ -7,6 +7,7 @@
 #include "enemy.h"
 #include "entity.h"
 #include "physics.h"
+#include "asm.h"
 
 typedef struct {
     Entity base;
diff --git a/src/enemy/cuccoAggr.c b/src/enemy/cuccoAggr.c
index 220480c6..7a353788 100644
--- a/src/enemy/cuccoAggr.c
+++ b/src/enemy/cuccoAggr.c
@@ -9,6 +9,7 @@
 #include "room.h"
 #include "player.h"
 #include "physics.h"
+#include "asm.h"
 
 typedef struct {
     Entity base;
diff --git a/src/enemy/cuccoChickAggr.c b/src/enemy/cuccoChickAggr.c
index bbb8f98c..30332fcb 100644
--- a/src/enemy/cuccoChickAggr.c
+++ b/src/enemy/cuccoChickAggr.c
@@ -6,6 +6,7 @@
  */
 #include "enemy.h"
 #include "player.h"
+#include "asm.h"
 
 void sub_08022A88(Entity*);
 void sub_08022AA4(Entity*);
diff --git a/src/enemy/darkNut.c b/src/enemy/darkNut.c
index 5a5c528b..f174bae9 100644
--- a/src/enemy/darkNut.c
+++ b/src/enemy/darkNut.c
@@ -5,6 +5,7 @@
  * @brief Dark Nut enemy
  */
 #include "enemy.h"
+#include "asm.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/enemy/enemy4D.c b/src/enemy/enemy4D.c
index 71ff8276..4e930e91 100644
--- a/src/enemy/enemy4D.c
+++ b/src/enemy/enemy4D.c
@@ -8,6 +8,7 @@
 #include "entity.h"
 #include "room.h"
 #include "physics.h"
+#include "asm.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/enemy/enemy50.c b/src/enemy/enemy50.c
index fdd4eb94..0ffd569a 100644
--- a/src/enemy/enemy50.c
+++ b/src/enemy/enemy50.c
@@ -9,6 +9,8 @@
 #include "physics.h"
 #include "player.h"
 #include "room.h"
+#include "script.h"
+#include "asm.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/enemy/enemy64.c b/src/enemy/enemy64.c
index 50572ce1..5ebc2949 100644
--- a/src/enemy/enemy64.c
+++ b/src/enemy/enemy64.c
@@ -11,6 +11,7 @@
 #include "tiles.h"
 #include "room.h"
 #include "player.h"
+#include "asm.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/enemy/eyegore.c b/src/enemy/eyegore.c
index 50d4d85e..07991c44 100644
--- a/src/enemy/eyegore.c
+++ b/src/enemy/eyegore.c
@@ -14,6 +14,7 @@
 #include "effects.h"
 #include "room.h"
 #include "physics.h"
+#include "player.h"
 #include "tiles.h"
 
 typedef struct {
diff --git a/src/enemy/fallingBoulder.c b/src/enemy/fallingBoulder.c
index c7283f9b..fbb40c70 100644
--- a/src/enemy/fallingBoulder.c
+++ b/src/enemy/fallingBoulder.c
@@ -8,6 +8,7 @@
 #include "room.h"
 #include "player.h"
 #include "physics.h"
+#include "asm.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/enemy/fireballGuy.c b/src/enemy/fireballGuy.c
index 1d6b6b6d..848b2b04 100644
--- a/src/enemy/fireballGuy.c
+++ b/src/enemy/fireballGuy.c
@@ -7,6 +7,7 @@
 #include "enemy.h"
 #include "player.h"
 #include "physics.h"
+#include "asm.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/enemy/flyingPot.c b/src/enemy/flyingPot.c
index beabb8c2..0c99cc7a 100644
--- a/src/enemy/flyingPot.c
+++ b/src/enemy/flyingPot.c
@@ -10,6 +10,7 @@
 #include "player.h"
 #include "room.h"
 #include "tiles.h"
+#include "asm.h"
 
 extern Hitbox gUnk_080FD34C;
 
diff --git a/src/enemy/flyingSkull.c b/src/enemy/flyingSkull.c
index 6e05bdba..307fb7fa 100644
--- a/src/enemy/flyingSkull.c
+++ b/src/enemy/flyingSkull.c
@@ -13,6 +13,7 @@
 #include "tiles.h"
 #include "room.h"
 #include "player.h"
+#include "asm.h"
 
 typedef struct {
     Entity base;
diff --git a/src/enemy/ghini.c b/src/enemy/ghini.c
index f1b7877b..e0afd0fb 100644
--- a/src/enemy/ghini.c
+++ b/src/enemy/ghini.c
@@ -8,6 +8,7 @@
 #include "enemy.h"
 #include "player.h"
 #include "physics.h"
+#include "asm.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/enemy/gyorgFemaleEye.c b/src/enemy/gyorgFemaleEye.c
index 423be91d..1dc30c7c 100644
--- a/src/enemy/gyorgFemaleEye.c
+++ b/src/enemy/gyorgFemaleEye.c
@@ -9,6 +9,7 @@
 #include "entity.h"
 #include "player.h"
 #include "room.h"
+#include "asm.h"
 
 void GyorgFemaleEye_OnTick(GyorgFemaleEyeEntity*);
 void GyorgFemaleEye_OnCollision(GyorgFemaleEyeEntity*);
diff --git a/src/enemy/gyorgMale.c b/src/enemy/gyorgMale.c
index beccd977..a4cfffeb 100644
--- a/src/enemy/gyorgMale.c
+++ b/src/enemy/gyorgMale.c
@@ -10,6 +10,7 @@
 #include "fileselect.h"
 #include "physics.h"
 #include "player.h"
+#include "asm.h"
 
 // todo: wrong types
 extern void sub_080A1D70(Entity*, u32);
diff --git a/src/enemy/keaton.c b/src/enemy/keaton.c
index 8ca4ad09..ac7366da 100644
--- a/src/enemy/keaton.c
+++ b/src/enemy/keaton.c
@@ -6,6 +6,7 @@
  */
 #include "enemy.h"
 #include "physics.h"
+#include "asm.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/enemy/keese.c b/src/enemy/keese.c
index 922ad17d..99517334 100644
--- a/src/enemy/keese.c
+++ b/src/enemy/keese.c
@@ -7,6 +7,7 @@
 #include "enemy.h"
 #include "physics.h"
 #include "player.h"
+#include "asm.h"
 
 typedef struct {
     /* 0x00 */ Entity base;
diff --git a/src/enemy/lakitu.c b/src/enemy/lakitu.c
index c0dba3db..f22d0fa1 100644
--- a/src/enemy/lakitu.c
+++ b/src/enemy/lakitu.c
@@ -7,6 +7,7 @@
 #include "enemy.h"
 #include "physics.h"
 #include "player.h"
+#include "asm.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/enemy/madderpillar.c b/src/enemy/madderpillar.c
index 119fc0dd..1ecff210 100644
--- a/src/enemy/madderpillar.c
+++ b/src/enemy/madderpillar.c
@@ -9,6 +9,7 @@
 #include "effects.h"
 #include "room.h"
 #include "physics.h"
+#include "asm.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/enemy/mazaalBracelet.c b/src/enemy/mazaalBracelet.c
index 152e21aa..60fc15e7 100644
--- a/src/enemy/mazaalBracelet.c
+++ b/src/enemy/mazaalBracelet.c
@@ -8,6 +8,7 @@
 #include "hitbox.h"
 #include "object.h"
 #include "asm.h"
+#include "script.h"
 #include "sound.h"
 #include "effects.h"
 #include "room.h"
diff --git a/src/enemy/mazaalMacro.c b/src/enemy/mazaalMacro.c
index 5d2dd7a4..91191679 100644
--- a/src/enemy/mazaalMacro.c
+++ b/src/enemy/mazaalMacro.c
@@ -10,6 +10,7 @@
 #include "tiles.h"
 #include "player.h"
 #include "physics.h"
+#include "asm.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/enemy/miniFireballGuy.c b/src/enemy/miniFireballGuy.c
index c80f57dc..a0097211 100644
--- a/src/enemy/miniFireballGuy.c
+++ b/src/enemy/miniFireballGuy.c
@@ -6,6 +6,7 @@
  */
 #include "enemy.h"
 #include "physics.h"
+#include "asm.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/enemy/miniSlime.c b/src/enemy/miniSlime.c
index 856651e6..0624494e 100644
--- a/src/enemy/miniSlime.c
+++ b/src/enemy/miniSlime.c
@@ -6,6 +6,7 @@
  */
 #include "enemy.h"
 #include "physics.h"
+#include "asm.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/enemy/moldorm.c b/src/enemy/moldorm.c
index f53881dc..7c744db4 100644
--- a/src/enemy/moldorm.c
+++ b/src/enemy/moldorm.c
@@ -7,6 +7,7 @@
 #include "collision.h"
 #include "enemy.h"
 #include "physics.h"
+#include "asm.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/enemy/moldworm.c b/src/enemy/moldworm.c
index ac84d386..1282d029 100644
--- a/src/enemy/moldworm.c
+++ b/src/enemy/moldworm.c
@@ -10,6 +10,7 @@
 #include "tiles.h"
 #include "room.h"
 #include "player.h"
+#include "asm.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/enemy/mulldozer.c b/src/enemy/mulldozer.c
index 9afd925a..d60a1c4f 100644
--- a/src/enemy/mulldozer.c
+++ b/src/enemy/mulldozer.c
@@ -6,6 +6,7 @@
  */
 #include "collision.h"
 #include "enemy.h"
+#include "asm.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/enemy/octorok.c b/src/enemy/octorok.c
index bdf9c73f..ac13da58 100644
--- a/src/enemy/octorok.c
+++ b/src/enemy/octorok.c
@@ -6,6 +6,7 @@
  */
 #include "enemy.h"
 #include "physics.h"
+#include "asm.h"
 
 void Octorok_Pause(Entity*);
 bool32 Octorok_FacesPlayer(Entity*);
diff --git a/src/enemy/octorokGolden.c b/src/enemy/octorokGolden.c
index 23b92aa5..8c31a460 100644
--- a/src/enemy/octorokGolden.c
+++ b/src/enemy/octorokGolden.c
@@ -9,6 +9,7 @@
 #include "map.h"
 #include "player.h"
 #include "item.h"
+#include "asm.h"
 
 void (*const OctorokGolden_Functions[])(Entity*);
 void (*const gUnk_080CF484[])(Entity*);
diff --git a/src/enemy/peahat.c b/src/enemy/peahat.c
index a8404af9..d18a3553 100644
--- a/src/enemy/peahat.c
+++ b/src/enemy/peahat.c
@@ -6,6 +6,7 @@
  */
 #include "enemy.h"
 #include "physics.h"
+#include "asm.h"
 #include "room.h"
 
 typedef struct {
diff --git a/src/enemy/rollobite.c b/src/enemy/rollobite.c
index e2a372a8..ab546efb 100644
--- a/src/enemy/rollobite.c
+++ b/src/enemy/rollobite.c
@@ -10,6 +10,7 @@
 #include "player.h"
 #include "room.h"
 #include "tiles.h"
+#include "asm.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/enemy/rope.c b/src/enemy/rope.c
index 74c77066..6ba4d764 100644
--- a/src/enemy/rope.c
+++ b/src/enemy/rope.c
@@ -7,6 +7,7 @@
 #include "enemy.h"
 #include "physics.h"
 #include "tiles.h"
+#include "asm.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/enemy/ropeGolden.c b/src/enemy/ropeGolden.c
index 0e653b80..4b5051cf 100644
--- a/src/enemy/ropeGolden.c
+++ b/src/enemy/ropeGolden.c
@@ -9,6 +9,7 @@
 #include "physics.h"
 #include "player.h"
 #include "item.h"
+#include "asm.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/enemy/scissorsBeetle.c b/src/enemy/scissorsBeetle.c
index 72bb2f8a..f0eaa381 100644
--- a/src/enemy/scissorsBeetle.c
+++ b/src/enemy/scissorsBeetle.c
@@ -7,6 +7,7 @@
 #include "collision.h"
 #include "enemy.h"
 #include "entity.h"
+#include "asm.h"
 
 typedef struct {
     Entity base;
diff --git a/src/enemy/slime.c b/src/enemy/slime.c
index 536eec67..6e6be923 100644
--- a/src/enemy/slime.c
+++ b/src/enemy/slime.c
@@ -7,6 +7,7 @@
 #include "enemy.h"
 #include "physics.h"
 #include "room.h"
+#include "asm.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/enemy/sluggula.c b/src/enemy/sluggula.c
index cd371ec4..5a95aa56 100644
--- a/src/enemy/sluggula.c
+++ b/src/enemy/sluggula.c
@@ -6,6 +6,7 @@
  */
 #include "enemy.h"
 #include "physics.h"
+#include "asm.h"
 
 void sub_08023E10(Entity*);
 void sub_08023E54(Entity*);
diff --git a/src/enemy/smallPesto.c b/src/enemy/smallPesto.c
index 0c287bbc..79f24419 100644
--- a/src/enemy/smallPesto.c
+++ b/src/enemy/smallPesto.c
@@ -6,6 +6,7 @@
  */
 #include "enemy.h"
 #include "physics.h"
+#include "asm.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/enemy/spikedBeetle.c b/src/enemy/spikedBeetle.c
index 94b2085a..6563b7bd 100644
--- a/src/enemy/spikedBeetle.c
+++ b/src/enemy/spikedBeetle.c
@@ -7,6 +7,7 @@
 #include "enemy.h"
 #include "player.h"
 #include "physics.h"
+#include "asm.h"
 
 extern u32 sub_0804A024(Entity*, u32, u32);
 
diff --git a/src/enemy/spinyChuchu.c b/src/enemy/spinyChuchu.c
index 8c8c3435..c6ffc5ab 100644
--- a/src/enemy/spinyChuchu.c
+++ b/src/enemy/spinyChuchu.c
@@ -7,6 +7,7 @@
 #include "enemy.h"
 #include "hitbox.h"
 #include "physics.h"
+#include "asm.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/enemy/stalfos.c b/src/enemy/stalfos.c
index 22cee8ce..ab0b46a1 100644
--- a/src/enemy/stalfos.c
+++ b/src/enemy/stalfos.c
@@ -10,6 +10,7 @@
 #include "tiles.h"
 #include "room.h"
 #include "player.h"
+#include "asm.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/enemy/tektite.c b/src/enemy/tektite.c
index eccb633c..59b71c7b 100644
--- a/src/enemy/tektite.c
+++ b/src/enemy/tektite.c
@@ -6,6 +6,7 @@
  */
 #include "collision.h"
 #include "enemy.h"
+#include "asm.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/enemy/tektiteGolden.c b/src/enemy/tektiteGolden.c
index 4e0d8862..570cc67c 100644
--- a/src/enemy/tektiteGolden.c
+++ b/src/enemy/tektiteGolden.c
@@ -7,6 +7,7 @@
 #include "collision.h"
 #include "enemy.h"
 #include "item.h"
+#include "asm.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/enemy/torchTrap.c b/src/enemy/torchTrap.c
index 0e86c296..f2e4dd2d 100644
--- a/src/enemy/torchTrap.c
+++ b/src/enemy/torchTrap.c
@@ -10,6 +10,7 @@
 #include "player.h"
 #include "room.h"
 #include "tiles.h"
+#include "asm.h"
 
 typedef struct {
     Entity base;
diff --git a/src/enemy/vaatiEyesMacro.c b/src/enemy/vaatiEyesMacro.c
index c4b4e475..f2f4829b 100644
--- a/src/enemy/vaatiEyesMacro.c
+++ b/src/enemy/vaatiEyesMacro.c
@@ -9,6 +9,7 @@
 #include "player.h"
 #include "physics.h"
 #include "manager.h"
+#include "asm.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/enemy/vaatiProjectile.c b/src/enemy/vaatiProjectile.c
index 0cf4f604..6e34e868 100644
--- a/src/enemy/vaatiProjectile.c
+++ b/src/enemy/vaatiProjectile.c
@@ -9,6 +9,7 @@
 #include "tiles.h"
 #include "player.h"
 #include "physics.h"
+#include "asm.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/enemy/vaatiRebornEnemy.c b/src/enemy/vaatiRebornEnemy.c
index b4135fec..d8b0fac9 100644
--- a/src/enemy/vaatiRebornEnemy.c
+++ b/src/enemy/vaatiRebornEnemy.c
@@ -9,6 +9,7 @@
 #include "physics.h"
 #include "room.h"
 #include "player.h"
+#include "asm.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/enemy/vaatiWrathEye.c b/src/enemy/vaatiWrathEye.c
index 3fe49ccb..7f398d4f 100644
--- a/src/enemy/vaatiWrathEye.c
+++ b/src/enemy/vaatiWrathEye.c
@@ -7,6 +7,7 @@
 #include "enemy/vaatiWrath.h"
 #include "room.h"
 #include "physics.h"
+#include "asm.h"
 
 void sub_080485D8(Entity*);
 void sub_080485FC(Entity*);
diff --git a/src/enemy/wallMaster.c b/src/enemy/wallMaster.c
index c111c740..922eb611 100644
--- a/src/enemy/wallMaster.c
+++ b/src/enemy/wallMaster.c
@@ -8,6 +8,7 @@
 #include "enemy.h"
 #include "player.h"
 #include "screenTransitions.h"
+#include "asm.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/enemy/wallMaster2.c b/src/enemy/wallMaster2.c
index 02d982b7..aa8a6d74 100644
--- a/src/enemy/wallMaster2.c
+++ b/src/enemy/wallMaster2.c
@@ -9,6 +9,7 @@
 #include "physics.h"
 #include "screenTransitions.h"
 #include "player.h"
+#include "asm.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/enemy/wizzrobeFire.c b/src/enemy/wizzrobeFire.c
index 1699f9a1..a9dfb2c2 100644
--- a/src/enemy/wizzrobeFire.c
+++ b/src/enemy/wizzrobeFire.c
@@ -7,6 +7,7 @@
 #include "enemy/wizzrobe.h"
 #include "enemy.h"
 #include "player.h"
+#include "asm.h"
 
 extern void (*const WizzrobeFire_Functions[])(WizzrobeEntity*);
 extern void (*const WizzrobeFire_Actions[])(WizzrobeEntity*);
diff --git a/src/manager/angryStatueManager.c b/src/manager/angryStatueManager.c
index ad6744c6..6d7cc127 100644
--- a/src/manager/angryStatueManager.c
+++ b/src/manager/angryStatueManager.c
@@ -7,7 +7,7 @@
 #include "manager/angryStatueManager.h"
 #include "flags.h"
 #include "object.h"
-#include "asm.h"
+#include "script.h"
 
 #include "sound.h"
 #include "room.h"
diff --git a/src/manager/minishSizedEntranceManager.c b/src/manager/minishSizedEntranceManager.c
index a2bbf028..9c06a928 100644
--- a/src/manager/minishSizedEntranceManager.c
+++ b/src/manager/minishSizedEntranceManager.c
@@ -9,6 +9,7 @@
 #include "object.h"
 #include "flags.h"
 #include "room.h"
+#include "script.h"
 #include "asm.h"
 
 typedef struct {
diff --git a/src/manager/templeOfDropletsManager.c b/src/manager/templeOfDropletsManager.c
index 94b247d0..12e523a4 100644
--- a/src/manager/templeOfDropletsManager.c
+++ b/src/manager/templeOfDropletsManager.c
@@ -16,6 +16,7 @@
 #include "game.h"
 #include "vram.h"
 #include "pauseMenu.h"
+#include "asm.h"
 
 static const u16 gUnk_081085B8[] = { 0x1008, 0x1007, 0x1006, 0x1005, 0x1006, 0x1007, 0x1008, 0x1009,
                                      0x1008, 0x1007, 0x1006, 0x1005, 0x1006, 0x1007, 0x1008, 0x1009 };
diff --git a/src/npc/cat.c b/src/npc/cat.c
index 0693e6a1..4d44c978 100644
--- a/src/npc/cat.c
+++ b/src/npc/cat.c
@@ -11,6 +11,7 @@
 #include "save.h"
 #include "physics.h"
 #include "manager.h"
+#include "asm.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/object/ambientClouds.c b/src/object/ambientClouds.c
index 05e604ce..8277b138 100644
--- a/src/object/ambientClouds.c
+++ b/src/object/ambientClouds.c
@@ -9,6 +9,7 @@
 #include "entity.h"
 #include "object.h"
 #include "player.h"
+#include "script.h"
 
 void AmbientClouds_Init(Entity* this);
 void AmbientClouds_Action1(Entity* this);
diff --git a/src/object/chestSpawner.c b/src/object/chestSpawner.c
index b739489c..5c454666 100644
--- a/src/object/chestSpawner.c
+++ b/src/object/chestSpawner.c
@@ -13,6 +13,7 @@
 #include "room.h"
 #include "player.h"
 #include "screen.h"
+#include "script.h"
 #include "tiles.h"
 #include "manager/lightManager.h"
 #include "pauseMenu.h"
diff --git a/src/object/itemOnGround.c b/src/object/itemOnGround.c
index e74438e4..860f52a4 100644
--- a/src/object/itemOnGround.c
+++ b/src/object/itemOnGround.c
@@ -17,6 +17,7 @@
 #include "room.h"
 #include "physics.h"
 #include "player.h"
+#include "script.h"
 #include "sound.h"
 #include "tiles.h"
 
diff --git a/src/object/pot.c b/src/object/pot.c
index 8dda49f9..758c6b92 100644
--- a/src/object/pot.c
+++ b/src/object/pot.c
@@ -15,6 +15,7 @@
 #include "object/itemOnGround.h"
 #include "player.h"
 #include "room.h"
+#include "script.h"
 #include "sound.h"
 #include "tiles.h"
 
diff --git a/src/object/smokeParticle.c b/src/object/smokeParticle.c
index 52aef4f4..68963f44 100644
--- a/src/object/smokeParticle.c
+++ b/src/object/smokeParticle.c
@@ -8,6 +8,8 @@
 #include "object.h"
 #include "asm.h"
 #include "sound.h"
+#include "script.h"
+#include "player.h"
 #include "room.h"
 #include "tiles.h"
 
diff --git a/src/object/specialFx.c b/src/object/specialFx.c
index a580acfc..63afabd3 100644
--- a/src/object/specialFx.c
+++ b/src/object/specialFx.c
@@ -7,6 +7,7 @@
 #include "entity.h"
 #include "object.h"
 #include "asm.h"
+#include "script.h"
 #include "sound.h"
 #include "effects.h"
 #include "room.h"
diff --git a/src/object/steam.c b/src/object/steam.c
index 7cef37d1..f13bde3c 100644
--- a/src/object/steam.c
+++ b/src/object/steam.c
@@ -8,6 +8,7 @@
 #include "entity.h"
 #include "player.h"
 #include "room.h"
+#include "script.h"
 #include "screen.h"
 
 const u8 gUnk_08123484[];
diff --git a/src/object/thunderbolt.c b/src/object/thunderbolt.c
index 312b1306..d79159cc 100644
--- a/src/object/thunderbolt.c
+++ b/src/object/thunderbolt.c
@@ -6,6 +6,7 @@
  */
 #include "object.h"
 #include "asm.h"
+#include "script.h"
 #include "sound.h"
 #include "physics.h"
 #include "player.h"
diff --git a/src/projectile/boneProjectile.c b/src/projectile/boneProjectile.c
index 82bc43a4..7902f3e6 100644
--- a/src/projectile/boneProjectile.c
+++ b/src/projectile/boneProjectile.c
@@ -8,6 +8,8 @@
 #include "enemy.h"
 #include "entity.h"
 #include "physics.h"
+#include "script.h"
+#include "asm.h"
 
 extern void (*const BoneProjectile_Functions[])(Entity*);
 extern void (*const BoneProjectile_Actions[])(Entity*);
diff --git a/src/projectile/cannonballProjectile.c b/src/projectile/cannonballProjectile.c
index 468424b9..9c198811 100644
--- a/src/projectile/cannonballProjectile.c
+++ b/src/projectile/cannonballProjectile.c
@@ -8,6 +8,7 @@
 #include "enemy.h"
 #include "entity.h"
 #include "physics.h"
+#include "asm.h"
 
 extern void (*const CannonballProjectile_Functions[])(Entity*);
 extern void (*const CannonballProjectile_Actions[])(Entity*);
diff --git a/src/projectile/dekuSeedProjectile.c b/src/projectile/dekuSeedProjectile.c
index 897fbace..6e3c5acc 100644
--- a/src/projectile/dekuSeedProjectile.c
+++ b/src/projectile/dekuSeedProjectile.c
@@ -8,6 +8,8 @@
 #include "enemy.h"
 #include "entity.h"
 #include "physics.h"
+#include "script.h"
+#include "asm.h"
 
 extern void (*const DekuSeedProjectile_Functions[])(Entity*);
 extern void (*const DekuSeedProjectile_Actions[])(Entity*);
diff --git a/src/projectile/dirtBallProjectile.c b/src/projectile/dirtBallProjectile.c
index 24b561f6..2aeb8755 100644
--- a/src/projectile/dirtBallProjectile.c
+++ b/src/projectile/dirtBallProjectile.c
@@ -9,6 +9,7 @@
 #include "physics.h"
 #include "player.h"
 #include "sound.h"
+#include "asm.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/projectile/fireProjectile.c b/src/projectile/fireProjectile.c
index 5cd9d922..5dbe969b 100644
--- a/src/projectile/fireProjectile.c
+++ b/src/projectile/fireProjectile.c
@@ -7,6 +7,7 @@
 #include "enemy.h"
 #include "entity.h"
 #include "physics.h"
+#include "script.h"
 
 extern void (*const FireProjectile_Actions[])(Entity*);
 
diff --git a/src/projectile/gleerokProjectile.c b/src/projectile/gleerokProjectile.c
index 6a8b0ca9..28de350b 100644
--- a/src/projectile/gleerokProjectile.c
+++ b/src/projectile/gleerokProjectile.c
@@ -9,6 +9,7 @@
 #include "player.h"
 #include "room.h"
 #include "physics.h"
+#include "asm.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/projectile/iceProjectile.c b/src/projectile/iceProjectile.c
index 97898fa2..02191bd9 100644
--- a/src/projectile/iceProjectile.c
+++ b/src/projectile/iceProjectile.c
@@ -7,6 +7,7 @@
 #include "enemy.h"
 #include "entity.h"
 #include "physics.h"
+#include "script.h"
 
 extern void (*const IceProjectile_Actions[])(Entity*);
 
diff --git a/src/projectile/mandiblesProjectile.c b/src/projectile/mandiblesProjectile.c
index 4df4dc8d..5f06db16 100644
--- a/src/projectile/mandiblesProjectile.c
+++ b/src/projectile/mandiblesProjectile.c
@@ -11,6 +11,7 @@
 #include "physics.h"
 #include "tiles.h"
 #include "player.h"
+#include "asm.h"
 #ifndef EU
 #include "game.h"
 #endif
diff --git a/src/projectile/octorokBossProjectile.c b/src/projectile/octorokBossProjectile.c
index da2b3ffd..a295a9ea 100644
--- a/src/projectile/octorokBossProjectile.c
+++ b/src/projectile/octorokBossProjectile.c
@@ -10,6 +10,7 @@
 #include "physics.h"
 #include "projectile.h"
 #include "player.h"
+#include "asm.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/projectile/rockProjectile.c b/src/projectile/rockProjectile.c
index 4bfebb9b..aa88fd1e 100644
--- a/src/projectile/rockProjectile.c
+++ b/src/projectile/rockProjectile.c
@@ -7,6 +7,8 @@
 #include "enemy.h"
 #include "entity.h"
 #include "physics.h"
+#include "script.h"
+#include "asm.h"
 
 extern void (*const RockProjectile_Functions[])(Entity*);
 extern void (*const RockProjectile_Actions[])(Entity*);
diff --git a/src/projectile/stalfosProjectile.c b/src/projectile/stalfosProjectile.c
index 4a4f1651..dd6a0bd5 100644
--- a/src/projectile/stalfosProjectile.c
+++ b/src/projectile/stalfosProjectile.c
@@ -7,6 +7,7 @@
 #include "enemy.h"
 #include "entity.h"
 #include "physics.h"
+#include "asm.h"
 
 extern void (*const StalfosProjectile_Functions[])(Entity*);
 extern void (*const StalfosProjectile_Actions[])(Entity*);
diff --git a/src/projectile/v1DarkMagicProjectile.c b/src/projectile/v1DarkMagicProjectile.c
index f56e1ba2..73d10a11 100644
--- a/src/projectile/v1DarkMagicProjectile.c
+++ b/src/projectile/v1DarkMagicProjectile.c
@@ -8,6 +8,7 @@
 #include "entity.h"
 #include "physics.h"
 #include "player.h"
+#include "asm.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/projectile/v1FireProjectile.c b/src/projectile/v1FireProjectile.c
index d15767ee..c5ce71b0 100644
--- a/src/projectile/v1FireProjectile.c
+++ b/src/projectile/v1FireProjectile.c
@@ -9,6 +9,7 @@
 #include "player.h"
 #include "room.h"
 #include "physics.h"
+#include "asm.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/projectile/v3ElectricProjectile.c b/src/projectile/v3ElectricProjectile.c
index 51391304..e3e5f070 100644
--- a/src/projectile/v3ElectricProjectile.c
+++ b/src/projectile/v3ElectricProjectile.c
@@ -9,6 +9,7 @@
 #include "entity.h"
 #include "physics.h"
 #include "player.h"
+#include "asm.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/projectile/windProjectile.c b/src/projectile/windProjectile.c
index 3ad7a171..5f294a3d 100644
--- a/src/projectile/windProjectile.c
+++ b/src/projectile/windProjectile.c
@@ -7,6 +7,7 @@
 #include "enemy.h"
 #include "entity.h"
 #include "physics.h"
+#include "script.h"
 
 extern void (*const WindProjectile_Actions[])(Entity*);