header overhaul

src/enemy/acroBandits.c

@@ -1,7 +1,4 @@
-#include "global.h"
-#include "entity.h"
 #include "enemy.h"
-#include "random.h"
 #include "functions.h"
 
 extern u32 sub_080002D4(s32, s32, u32);

src/enemy/beetle.c

@@ -1,7 +1,4 @@
-#include "entity.h"
 #include "enemy.h"
-#include "player.h"
-#include "random.h"
 #include "functions.h"
 
 extern u32 PlayerInRange(Entity*, u32, u32);

src/enemy/bladeTrap.c

@@ -1,4 +1,5 @@
 #include "global.h"
+#include "audio.h"
 #include "entity.h"
 #include "room.h"
 #include "functions.h"

src/enemy/bobomb.c

@@ -1,5 +1,6 @@
+#include "asm.h"
+#include "audio.h"
 #include "enemy.h"
-#include "random.h"
 #include "createObject.h"
 #include "object.h"
 #include "functions.h"

src/enemy/bombPeahat.c

@@ -1,8 +1,8 @@
+#include "asm.h"
 #include "global.h"
 #include "entity.h"
 #include "enemy.h"
 #include "player.h"
-#include "random.h"
 #include "object.h"
 #include "functions.h"
 

src/enemy/businessScrub.c

@@ -1,9 +1,10 @@
+#include "asm.h"
 #include "enemy.h"
+#include "audio.h"
 #include "entity.h"
 #include "flags.h"
 #include "textbox.h"
 #include "save.h"
-#include "random.h"
 #include "npc.h"
 #include "functions.h"
 #include "effects.h"

src/enemy/chuchu.c

@@ -1,7 +1,8 @@
+#include "asm.h"
 #include "enemy.h"
 #include "entity.h"
-#include "random.h"
 #include "functions.h"
+#include "audio.h"
 
 extern s32 sub_080012DC(Entity*);
 extern void sub_08001318(Entity*);

src/enemy/cuccoChickAggr.c

@@ -1,6 +1,4 @@
 #include "enemy.h"
-#include "entity.h"
-#include "random.h"
 #include "functions.h"
 
 extern Entity* sub_08049DF4(u32);

src/enemy/darkNut.c

@@ -1,6 +1,4 @@
-#include "entity.h"
 #include "enemy.h"
-#include "random.h"
 #include "functions.h"
 
 typedef struct {

src/enemy/doorMimic.c

@@ -1,3 +1,4 @@
+#include "audio.h"
 #include "enemy.h"
 #include "entity.h"
 #include "functions.h"

src/enemy/fallingBoulder.c

@@ -1,7 +1,5 @@
 #include "enemy.h"
-#include "random.h"
 #include "functions.h"
-#include "effects.h"
 
 void sub_0802C4B0(Entity*);
 void sub_0802C62C(Entity*);

src/enemy/fireballGuy.c

@@ -1,9 +1,5 @@
-#include "global.h"
-#include "entity.h"
 #include "enemy.h"
-#include "random.h"
 #include "functions.h"
-#include "effects.h"
 
 typedef struct {
     s8 h, v;

src/enemy/gibdo.c

@@ -1,8 +1,5 @@
 #include "global.h"
-#include "entity.h"
-#include "sprite.h"
 #include "enemy.h"
-#include "random.h"
 #include "object.h"
 #include "functions.h"
 // Gibudo

src/enemy/gyorgMale.c

@@ -1,10 +1,7 @@
 #include "global.h"
 #include "enemy.h"
 #include "player.h"
-#include "room.h"
-#include "coord.h"
 #include "fileScreen.h"
-#include "random.h"
 #include "functions.h"
 #include "effects.h"
 

src/enemy/helmasaur.c

@@ -1,5 +1,4 @@
 #include "enemy.h"
-#include "random.h"
 #include "object.h"
 #include "functions.h"
 

src/enemy/keaton.c

@@ -1,9 +1,5 @@
-#include "global.h"
-#include "entity.h"
 #include "enemy.h"
-#include "random.h"
 #include "functions.h"
-#include "effects.h"
 
 extern Entity* gUnk_020000B0;
 

src/enemy/keese.c

@@ -1,8 +1,4 @@
-#include "global.h"
-#include "entity.h"
 #include "enemy.h"
-#include "player.h"
-#include "random.h"
 #include "functions.h"
 
 extern void sub_08001328(Entity*);

src/enemy/lakitu.c

@@ -1,11 +1,6 @@
 #include "global.h"
-#include "entity.h"
 #include "enemy.h"
 #include "functions.h"
-#include "coord.h"
-#include "random.h"
-#include "player.h"
-#include "effects.h"
 
 extern void (*const LakituActionFuncs[])(Entity*);
 

src/enemy/lakituCloud.c

@@ -1,4 +1,5 @@
 #include "global.h"
+#include "asm.h"
 #include "entity.h"
 #include "player.h"
 #include "functions.h"

src/enemy/leever.c

@@ -1,9 +1,5 @@
-#include "global.h"
-#include "entity.h"
 #include "enemy.h"
-#include "random.h"
 #include "functions.h"
-#include "coord.h"
 
 extern u32 sub_080002D4(s32, s32, u32);
 extern u32 sub_080002BC(s32, s32, u32);

src/enemy/likeLike.c

@@ -1,8 +1,6 @@
 #include "enemy.h"
-#include "entity.h"
 #include "textbox.h"
 #include "save.h"
-#include "random.h"
 #include "createObject.h"
 #include "functions.h"
 

src/enemy/madderpillar.c

@@ -1,8 +1,5 @@
 #include "enemy.h"
-#include "entity.h"
-#include "random.h"
 #include "functions.h"
-#include "effects.h"
 
 extern u8 gEntCount;
 extern Hitbox gUnk_080FD298;

src/enemy/mazaalBracelet.c

@@ -1,10 +1,6 @@
-#include "global.h"
 #include "enemy.h"
-#include "audio.h"
-#include "random.h"
 #include "object.h"
 #include "functions.h"
-#include "effects.h"
 
 void sub_0803B538(Entity*);
 u32 sub_0803B4E4(Entity*);

src/enemy/mazaalHead.c

@@ -1,12 +1,7 @@
-#include "global.h"
-#include "entity.h"
 #include "enemy.h"
-#include "screen.h"
-#include "audio.h"
-#include "random.h"
 #include "object.h"
 #include "functions.h"
-#include "effects.h"
+#include "screen.h"
 
 extern void UnloadOBJPalette(Entity*);
 

src/enemy/mazaalMacro.c

@@ -1,11 +1,7 @@
-#include "global.h"
-#include "entity.h"
 #include "enemy.h"
-#include "random.h"
 #include "script.h"
 #include "structures.h"
 #include "functions.h"
-#include "effects.h"
 
 extern void sub_0807B600(u32);
 

src/enemy/miniFireballGuy.c

@@ -1,7 +1,4 @@
-#include "global.h"
-#include "entity.h"
 #include "enemy.h"
-#include "random.h"
 #include "functions.h"
 
 extern void sub_08045678(Entity*);

src/enemy/miniSlime.c

@@ -1,7 +1,4 @@
-#include "global.h"
-#include "entity.h"
 #include "enemy.h"
-#include "random.h"
 #include "functions.h"
 
 void sub_08045374(Entity*);

src/enemy/moldorm.c

@@ -1,6 +1,4 @@
 #include "enemy.h"
-#include "entity.h"
-#include "random.h"
 #include "functions.h"
 
 void sub_08022EAC(Entity*);

src/enemy/moldworm.c

@@ -1,8 +1,5 @@
 #include "enemy.h"
-#include "entity.h"
-#include "random.h"
 #include "functions.h"
-#include "effects.h"
 
 extern void sub_0800449C(Entity*, u32);
 extern bool32 sub_08023A38(u32);

src/enemy/octorok.c

@@ -1,7 +1,4 @@
-#include "global.h"
-#include "entity.h"
 #include "enemy.h"
-#include "random.h"
 #include "functions.h"
 
 extern Entity* sub_08049DF4(u32);

src/enemy/octorokBoss.c

@@ -1,14 +1,9 @@
-#include "global.h"
-#include "audio.h"
 #include "enemy.h"
 #include "functions.h"
 #include "object.h"
 #include "projectile.h"
-#include "random.h"
-#include "room.h"
 #include "structures.h"
-#include "structures.h"
-#include "utils.h"
+#include "overworld.h"
 
 extern void sub_08078AC0(u32, u32, u32);
 extern u32 GetRandomByWeight(const u8*);

src/enemy/peahat.c

@@ -1,6 +1,4 @@
-#include "entity.h"
 #include "enemy.h"
-#include "random.h"
 #include "functions.h"
 
 extern void (*const gPeahatFunctions[])(Entity*);

src/enemy/pesto.c

@@ -1,8 +1,6 @@
 #include "enemy.h"
-#include "entity.h"
-#include "random.h"
 #include "createObject.h"
-#include "game.h"
+#include "overworld.h"
 #include "functions.h"
 #include "save.h"
 

src/enemy/puffstool.c

@@ -1,9 +1,6 @@
 #include "enemy.h"
-#include "entity.h"
-#include "random.h"
 #include "object.h"
 #include "functions.h"
-#include "effects.h"
 
 extern u32 sub_080002E0(u32, u32);
 extern u32 sub_080002C8(u16, u8);

src/enemy/rockChuchu.c

@@ -1,8 +1,5 @@
 #include "enemy.h"
-#include "entity.h"
-#include "random.h"
 #include "functions.h"
-#include "effects.h"
 
 extern void sub_0804A4E4(Entity*, Entity*);
 

src/enemy/rollobite.c

@@ -1,6 +1,4 @@
-#include "entity.h"
 #include "enemy.h"
-#include "random.h"
 #include "functions.h"
 
 extern void (*const gRollobiteFunctions[])(Entity*);

src/enemy/rope.c

@@ -1,8 +1,4 @@
-#include "global.h"
-#include "entity.h"
 #include "enemy.h"
-#include "random.h"
-#include "audio.h"
 #include "functions.h"
 
 extern void (*const gRope[6])(Entity*);

src/enemy/rupeeLike.c

@@ -1,4 +1,6 @@
 #include "global.h"
+#include "asm.h"
+#include "audio.h"
 #include "entity.h"
 #include "enemy.h"
 #include "npc.h"

src/enemy/sensorBladeTrap.c

@@ -1,4 +1,5 @@
 #include "enemy.h"
+#include "audio.h"
 #include "functions.h"
 
 extern u32 sub_0804A024(Entity*, u32, u32);

src/enemy/slime.c

@@ -1,10 +1,5 @@
-#include "global.h"
-#include "entity.h"
 #include "enemy.h"
-#include "room.h"
-#include "random.h"
 #include "functions.h"
-#include "effects.h"
 
 typedef struct {
     s8 h, v;

src/enemy/sluggula.c

@@ -1,6 +1,4 @@
 #include "enemy.h"
-#include "entity.h"
-#include "random.h"
 #include "functions.h"
 
 extern s32 sub_080012DC(Entity*);

src/enemy/smallPesto.c

@@ -1,8 +1,4 @@
-#include "global.h"
-#include "entity.h"
 #include "enemy.h"
-#include "coord.h"
-#include "random.h"
 #include "functions.h"
 
 extern void sub_080317F8(Entity*);

src/enemy/spearMoblin.c

@@ -1,8 +1,5 @@
 #include "enemy.h"
-#include "entity.h"
-#include "random.h"
 #include "functions.h"
-#include "effects.h"
 
 extern bool32 sub_0806FC80(Entity*, Entity*, u32);
 extern Entity* sub_08049DF4(u32);

src/enemy/spikedBeetle.c

@@ -1,6 +1,4 @@
 #include "enemy.h"
-#include "entity.h"
-#include "random.h"
 #include "functions.h"
 
 extern u32 sub_0804A024(Entity*, u32, u32);

src/enemy/spinyChuchu.c

@@ -1,7 +1,4 @@
 #include "enemy.h"
-#include "entity.h"
-#include "random.h"
-#include "audio.h"
 #include "functions.h"
 
 extern void sub_08001318(Entity*);

src/enemy/tektite.c

@@ -1,7 +1,4 @@
-#include "global.h"
-#include "entity.h"
 #include "enemy.h"
-#include "random.h"
 #include "functions.h"
 
 extern void (*const gUnk_080CDED0[])(Entity*);

src/enemy/tektiteGolden.c

@@ -1,8 +1,4 @@
-#include "global.h"
-#include "entity.h"
 #include "enemy.h"
-#include "flags.h"
-#include "random.h"
 #include "functions.h"
 
 extern void sub_08038168(Entity*);

src/enemy/vaatiArm.c

@@ -1,12 +1,6 @@
-#include "global.h"
 #include "enemy.h"
-#include "entity.h"
-#include "audio.h"
 #include "object.h"
-#include "random.h"
-#include "utils.h"
 #include "functions.h"
-#include "effects.h"
 
 extern void DoExitTransition(ScreenTransitionData*);
 

src/enemy/vaatiBall.c

@@ -1,4 +1,5 @@
 #include "entity.h"
+#include "enemy.h"
 #include "player.h"
 #include "screen.h"
 #include "createObject.h"

src/enemy/vaatiEyesMacro.c

@@ -1,7 +1,4 @@
-#include "global.h"
 #include "enemy.h"
-#include "audio.h"
-#include "random.h"
 #include "functions.h"
 
 extern u32 sub_080002E0(u32, u32);

src/enemy/vaatiProjectile.c

@@ -1,6 +1,4 @@
-#include "global.h"
 #include "enemy.h"
-#include "random.h"
 #include "functions.h"
 
 extern bool32 PlayerInRange(Entity*, u32, u32);

src/enemy/vaatiRebornEnemy.c

@@ -1,12 +1,6 @@
-#include "global.h"
 #include "enemy.h"
-#include "coord.h"
-#include "flags.h"
-#include "random.h"
-#include "audio.h"
 #include "area.h"
 #include "functions.h"
-#include "effects.h"
 
 extern void sub_080AEFB4(Entity*);
 extern u8 gEntCount;

src/enemy/vaatiTransfigured.c

@@ -1,11 +1,6 @@
-#include "entity.h"
 #include "enemy.h"
 #include "object.h"
-#include "random.h"
-#include "flags.h"
-#include "audio.h"
 #include "functions.h"
-#include "effects.h"
 
 void sub_080409B0(Entity*);
 void sub_080408EC(Entity*);

src/enemy/vaatiWrath.c

@@ -1,16 +1,10 @@
-#include "entity.h"
 #include "enemy.h"
-#include "audio.h"
-#include "room.h"
-#include "random.h"
 #include "object.h"
 #include "textbox.h"
-#include "flags.h"
-#include "utils.h"
 #include "structures.h"
 #include "functions.h"
 #include "save.h"
-#include "effects.h"
+#include "screen.h"
 
 extern u8 gEntCount;
 

src/enemy/vaatiWrathEye.c

@@ -1,8 +1,6 @@
-#include "entity.h"
-#include "audio.h"
+#include "enemy.h"
 #include "structures.h"
 #include "functions.h"
-#include "effects.h"
 
 void sub_080485D8(Entity*);
 void sub_080485FC(Entity*);

src/enemy/wallMaster.c

@@ -1,7 +1,5 @@
 #include "enemy.h"
-#include "entity.h"
 #include "area.h"
-#include "random.h"
 #include "functions.h"
 
 extern void sub_08001328(Entity*);

src/enemy/wallMaster2.c

@@ -1,6 +1,5 @@
 #include "enemy.h"
 #include "area.h"
-#include "random.h"
 #include "functions.h"
 
 extern void sub_08001328(Entity*);

src/enemy/waterDrop.c

@@ -1,7 +1,5 @@
 #include "enemy.h"
-#include "entity.h"
 #include "screen.h"
-#include "random.h"
 #include "object.h"
 #include "structures.h"
 #include "functions.h"

src/enemy/wisp.c

@@ -1,12 +1,7 @@
-#include "global.h"
-#include "entity.h"
 #include "enemy.h"
-#include "player.h"
 #include "save.h"
-#include "random.h"
 #include "createObject.h"
 #include "functions.h"
-#include "effects.h"
 
 extern void (*const gUnk_080CEB74[])(Entity*);
 extern void (*const gUnk_080CEB8C[])(Entity*);