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

Various code cleanup changes

1 files changed, 8 insertions, 4 deletions

diff --git a/src/enemyUtils.c b/src/enemyUtils.c
index 35ff738d..4abe5b5f 100644
--- a/src/enemyUtils.c
+++ b/src/enemyUtils.c
@@ -1,14 +1,18 @@
 #include "enemyUtils.h"
 #include "enemy.h"
+#include "sound.h"
+#include "effects.h"
+#include "projectile.h"
 #include "definitions.h"
 #include "entity.h"
-#include "functions.h"
 #include "object.h"
+#include "room.h"
+#include "physics.h"
 #include "object/deathFx.h"
-#include "projectile.h"
 #include "save.h"
+#include "vram.h"
+#include "color.h"
 
-extern void EnemyDisableRespawn(Entity*);
 extern void ReplaceMonitoredEntity(Entity*, Entity*);
 
 extern EnemyDefinition gEnemyDefinitions[];
@@ -210,7 +214,7 @@ void EnemyCreateDeathFX(Enemy* parent, u32 parentId, u32 fixedItem) {
     } else {
         int tmp = parent->base.gustJarState & 2;
         if (tmp == 0) {
-            EnemyDisableRespawn(&(parent->base));
+            EnemyDisableRespawn((Enemy*)&(parent->base));
             gSave.enemies_killed++;
             parent->base.gustJarState |= 2;
             parent->base.timer = 255;