header overhaul

src/audio.c

@@ -7,12 +7,11 @@
 #define IS_BGM(song) (song) - 1 <= NUM_BGM - 1
 #define IS_SFX(song) (song) - 1 > NUM_BGM - 1
 
-void InitSoundPlayingInfo(void);
-s32 fade(s32 target, s32 current);
-void doPlaySound(u32 sound);
-void PlayFadeIn(u32 sound);
-void PlayFadeOut(u32 sound);
-void InitVolume(void);
+static s32 fade(s32 target, s32 current);
+static void doPlaySound(u32 sound);
+static void PlayFadeIn(u32 sound);
+static void PlayFadeOut(u32 sound);
+static void InitVolume(void);
 
 void InitSound(void) {
     InitSoundPlayingInfo();
@@ -182,7 +181,7 @@ void AudioMain(void) {
     }
 }
 
-s32 fade(s32 target, s32 current) {
+static s32 fade(s32 target, s32 current) {
     if (target - current >= 1) {
         current += 4;
         if (target > current)
@@ -196,7 +195,7 @@ s32 fade(s32 target, s32 current) {
     }
 }
 
-void doPlaySound(u32 sound) {
+static void doPlaySound(u32 sound) {
     u32 volume;
     MusicPlayerInfo* musicPlayerInfo;
 
@@ -214,17 +213,17 @@ void doPlaySound(u32 sound) {
     m4aMPlayVolumeControl(musicPlayerInfo, 0xffff, volume);
 }
 
-void PlayFadeIn(u32 sound) {
+static void PlayFadeIn(u32 sound) {
     gSoundPlayingInfo.volumeMasterTarget = 0x100;
     doPlaySound(sound);
 }
 
-void PlayFadeOut(u32 sound) {
+static void PlayFadeOut(u32 sound) {
     gSoundPlayingInfo.volumeMasterTarget = 0;
     doPlaySound(sound);
 }
 
-void InitVolume() {
+static void InitVolume() {
     gSoundPlayingInfo.volumeMasterUnk = 0x100;
     gSoundPlayingInfo.volumeMaster = 0x100;
     gSoundPlayingInfo.volumeMasterTarget = 0x100;

src/code_08077B98.c

@@ -1,7 +1,5 @@
-#include "global.h"
-#include "entity.h"
-#include "player.h"
 #include "functions.h"
+#include "object.h"
 
 typedef struct {
     u8 unk[12];
@@ -122,4 +120,118 @@ Entity* sub_08077CF8(u32 subtype, u32 form, u32 parameter, u32 unk) {
     return ent;
 }
 
-ASM_FUNC("asm/non_matching/sub_08077D38.inc", void sub_08077D38(ItemBehavior* beh, u32 arg1))
+ASM_FUNC("asm/non_matching/sub_08077D38.inc", void sub_08077D38(ItemBehavior* beh, u32 arg1));
+
+typedef struct {
+    u8 b0 : 4;
+    u8 b1 : 4;
+} PACKED Unk_bitfield;
+
+typedef struct {
+    u8 unk[16];
+} Unk_struct;
+
+void sub_08077DF4(ItemBehavior* beh, u32 arg1) {
+    Entity* ent = (Entity*)beh; // @nocheckin
+    *(u16*)&ent->flags = arg1;
+    if ((arg1 & 0xff) > 0xb8) {
+        arg1 += ent->type >> 1;
+    }
+    gPlayerEntity.spriteIndex = (short)(arg1 >> 8);
+    InitAnimationForceUpdate(&gPlayerEntity, (u8)arg1);
+    sub_08077E54(beh);
+}
+
+void UpdateItemAnim(ItemBehavior* beh) {
+    UpdateAnimationSingleFrame(&gPlayerEntity);
+    sub_08077E54(beh);
+}
+
+void sub_08077E3C(ItemBehavior* ent, u32 idx) {
+    sub_080042BA(&gPlayerEntity, idx);
+    sub_08077E54(ent);
+}
+
+void sub_08077E54(ItemBehavior* beh) {
+    Entity* ent = (Entity*)beh; // @nocheckin
+    ent->action = gPlayerEntity.animIndex;
+    *(u8*)&ent->spriteIndex = gPlayerEntity.frameIndex;
+    ent->subAction = gPlayerEntity.frameDuration;
+    ent->actionDelay = gPlayerEntity.frame;
+}
+
+void sub_08077E78(ItemBehavior* arg0, u32 bits) {
+    u32 not ;
+
+    if (bits == 0) {
+        if (gPlayerState.field_0x2c != NULL) {
+            ((Unk_bitfield*)gPlayerState.field_0x2c)[0x11].b0 = 6;
+            gPlayerState.field_0x2c = (u8*)bits;
+        } else {
+            gPlayerState.field_0x2c = (u8*)bits;
+        }
+    }
+
+    not = (8 >> bits);
+    gPlayerState.field_0x3[1] &= ~((u8)((8 >> bits) << 4) | not );
+    not = ~not ;
+    gPlayerState.field_0xa &= not ;
+    gPlayerState.keepFacing &= not ;
+    MemClear(arg0, 0x1c);
+}
+
+u32 sub_08077EC8(ItemBehavior* beh) {
+    Unk_struct* arg0 = (Unk_struct*)beh; // @nocheckin
+
+    if ((gPlayerState.field_0x1a[1] & 8) != 0) {
+        sub_08077DF4(beh, 0x170);
+        arg0->unk[7] = 0x28;
+        arg0->unk[4] = 7;
+        arg0->unk[15] = 6;
+        return 1;
+    } else {
+        return 0;
+    }
+}
+
+bool32 sub_08077EFC(ItemBehavior* arg0) {
+    return sub_08077F24(arg0, (u16)gPlayerState.field_0x90.HALF.LO);
+}
+
+bool32 sub_08077F10(ItemBehavior* arg0) {
+    return sub_08077F24(arg0, (u16)gPlayerState.field_0x90.HALF.HI);
+}
+
+ASM_FUNC("asm/non_matching/sub_08077F24.inc", bool32 sub_08077F24(ItemBehavior* beh, u32 arg1))
+
+void sub_08077F50(ItemBehavior* beh, u32 arg1) {
+    sub_08079184();
+    sub_08077E78(beh, arg1);
+}
+
+u32 sub_08077F64(ItemBehavior* arg0, u32 unk) {
+    u32 temp;
+    if (gPlayerState.heldObject == 0) {
+        sub_08077F50(arg0, unk);
+        temp = 0;
+    } else {
+        temp = 1;
+    }
+    return temp;
+}
+
+void sub_08077F84(void) {
+    Entity* obj;
+
+    if (((gPlayerEntity.collisionLayer & 2) == 0) &&
+        GetTileTypeByPos(gPlayerEntity.x.HALF.HI, gPlayerEntity.y.HALF.HI - 0xc, 2) - 0x343U < 4) {
+        sub_0807AA80(&gPlayerEntity);
+        gPlayerState.jumpStatus |= 8;
+        obj = CreateObject(OBJECT_44, 0, 0);
+        if (obj != NULL) {
+            obj->x = gPlayerEntity.x;
+            obj->y.HALF.HI = gPlayerEntity.y.HALF.HI - 0xc;
+            gPlayerEntity.y.HALF.HI -= 0xc;
+        }
+    }
+}

src/code_08077DF4.c

@@ -1,120 +0,0 @@
-#include "global.h"
-#include "entity.h"
-#include "player.h"
-#include "utils.h"
-#include "object.h"
-#include "functions.h"
-
-typedef struct {
-    u8 b0 : 4;
-    u8 b1 : 4;
-} PACKED Unk_bitfield;
-
-typedef struct {
-    u8 unk[16];
-} Unk_struct;
-
-void sub_08077DF4(ItemBehavior* beh, u32 arg1) {
-    Entity* ent = (Entity*)beh; // @nocheckin
-    *(u16*)&ent->flags = arg1;
-    if ((arg1 & 0xff) > 0xb8) {
-        arg1 += ent->type >> 1;
-    }
-    gPlayerEntity.spriteIndex = (short)(arg1 >> 8);
-    InitAnimationForceUpdate(&gPlayerEntity, (u8)arg1);
-    sub_08077E54(beh);
-}
-
-void UpdateItemAnim(ItemBehavior* beh) {
-    UpdateAnimationSingleFrame(&gPlayerEntity);
-    sub_08077E54(beh);
-}
-
-void sub_08077E3C(ItemBehavior* ent, u32 idx) {
-    sub_080042BA(&gPlayerEntity, idx);
-    sub_08077E54(ent);
-}
-
-void sub_08077E54(ItemBehavior* beh) {
-    Entity* ent = (Entity*)beh; // @nocheckin
-    ent->action = gPlayerEntity.animIndex;
-    *(u8*)&ent->spriteIndex = gPlayerEntity.frameIndex;
-    ent->subAction = gPlayerEntity.frameDuration;
-    ent->actionDelay = gPlayerEntity.frame;
-}
-
-void sub_08077E78(ItemBehavior* arg0, u32 bits) {
-    u32 not ;
-
-    if (bits == 0) {
-        if (gPlayerState.field_0x2c != NULL) {
-            ((Unk_bitfield*)gPlayerState.field_0x2c)[0x11].b0 = 6;
-            gPlayerState.field_0x2c = (u8*)bits;
-        } else {
-            gPlayerState.field_0x2c = (u8*)bits;
-        }
-    }
-
-    not = (8 >> bits);
-    gPlayerState.field_0x3[1] &= ~((u8)((8 >> bits) << 4) | not );
-    not = ~not ;
-    gPlayerState.field_0xa &= not ;
-    gPlayerState.keepFacing &= not ;
-    MemClear(arg0, 0x1c);
-}
-
-u32 sub_08077EC8(ItemBehavior* beh) {
-    Unk_struct* arg0 = (Unk_struct*)beh; // @nocheckin
-
-    if ((gPlayerState.field_0x1a[1] & 8) != 0) {
-        sub_08077DF4(beh, 0x170);
-        arg0->unk[7] = 0x28;
-        arg0->unk[4] = 7;
-        arg0->unk[15] = 6;
-        return 1;
-    } else {
-        return 0;
-    }
-}
-
-bool32 sub_08077EFC(ItemBehavior* arg0) {
-    return sub_08077F24(arg0, (u16)gPlayerState.field_0x90.HALF.LO);
-}
-
-bool32 sub_08077F10(ItemBehavior* arg0) {
-    return sub_08077F24(arg0, (u16)gPlayerState.field_0x90.HALF.HI);
-}
-
-ASM_FUNC("asm/non_matching/sub_08077F24.inc", bool32 sub_08077F24(ItemBehavior* beh, u32 arg1))
-
-void sub_08077F50(ItemBehavior* beh, u32 arg1) {
-    sub_08079184();
-    sub_08077E78(beh, arg1);
-}
-
-u32 sub_08077F64(ItemBehavior* arg0, u32 unk) {
-    u32 temp;
-    if (gPlayerState.heldObject == 0) {
-        sub_08077F50(arg0, unk);
-        temp = 0;
-    } else {
-        temp = 1;
-    }
-    return temp;
-}
-
-void sub_08077F84(void) {
-    Entity* obj;
-
-    if (((gPlayerEntity.collisionLayer & 2) == 0) &&
-        GetTileTypeByPos(gPlayerEntity.x.HALF.HI, gPlayerEntity.y.HALF.HI - 0xc, 2) - 0x343U < 4) {
-        sub_0807AA80(&gPlayerEntity);
-        gPlayerState.jumpStatus |= 8;
-        obj = CreateObject(OBJECT_44, 0, 0);
-        if (obj != NULL) {
-            obj->x = gPlayerEntity.x;
-            obj->y.HALF.HI = gPlayerEntity.y.HALF.HI - 0xc;
-            gPlayerEntity.y.HALF.HI -= 0xc;
-        }
-    }
-}

src/code_0808091C.c

@@ -2,6 +2,7 @@
 #include "entity.h"
 #include "structures.h"
 #include "functions.h"
+#include "overworld.h"
 #include "room.h"
 
 extern void sub_08080BC4(void);

src/collision.c

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

src/coord.c

@@ -1,3 +1,4 @@
+#include "asm.h"
 #include "area.h"
 #include "player.h"
 #include "global.h"

src/debugScreen.c

@@ -1,4 +1,5 @@
 #include "global.h"
+#include "audio.h"
 #include "utils.h"
 #include "functions.h"
 #include "main.h"

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*);

src/enemyUtils.c

@@ -17,7 +17,7 @@ const EnemyDefinition* GetEnemyDefinition(Entity* entity) {
 }
 
 bool32 EnemyInit(Entity* this) {
-    if ((this->flags & 1) == 0) {
+    if ((this->flags & ENT_DID_INIT) == 0) {
         const EnemyDefinition* definition = GetEnemyDefinition(this);
         if (LoadEnemySprite(this, definition) == FALSE) {
             return FALSE;

src/entity.c

@@ -6,6 +6,7 @@
 #include "room.h"
 #include "script.h"
 #include "textbox.h"
+#include "npc.h"
 
 extern u8 gUnk_081091F8[];
 extern u8 gUnk_081091EE[];
@@ -13,7 +14,6 @@ extern u8 gUpdateVisibleTiles;
 extern Manager gUnk_02033290;
 void sub_0805ED30(void);
 void ClearHitboxList(void);
-void sub_0806F0A4(void);
 void sub_0805EE88(void);
 void ClearAllDeletedEntities(void);
 void DeleteAllEntities(void);
@@ -277,7 +277,7 @@ void DeleteThisEntity(void) {
     f();
 }
 
-void DeleteManager(Manager*);
+void DeleteManager(void*);
 
 typedef void (*Deleter)(void*);
 
@@ -378,13 +378,14 @@ Manager* GetEmptyManager(void) {
 
 extern u8 gManagerCount;
 
-void DeleteManager(Manager* ent) {
-    if (!ent->next)
+void DeleteManager(void* ent) {
+    Manager* manager = (Manager*)ent;
+    if (!manager->next)
         return;
 
-    ReleaseTransitionManager(ent);
-    UnlinkEntity(ent);
-    MemClear(ent, sizeof(Temp));
+    ReleaseTransitionManager(manager);
+    UnlinkEntity(manager);
+    MemClear(manager, sizeof(Temp));
     gManagerCount--;
 }
 

src/fade.c

@@ -2,6 +2,7 @@
 #include "functions.h"
 #include "screen.h"
 #include "utils.h"
+#include "fade.h"
 
 typedef struct {
     u8 field_0x0;
@@ -48,18 +49,18 @@ void FadeVBlank(void) {
     }
 }
 
-void InitFade() {
+void InitFade(void) {
     MemClear(&gFadeControl, sizeof(gFadeControl));
     MemClear(&gUnk_020354C0, sizeof(gUnk_020354C0));
     gFadeControl.mask = 0xffffffff;
 }
 
-void sub_08050008() {
+void sub_08050008(void) {
     MemClear(&gUnk_020354C0, sizeof(gUnk_020354C0));
     gFadeControl.mask = 0xFFFFFFFF;
 }
 
-void sub_08050024() {
+static void sub_08050024(void) {
     sub_0801E104();
     DoFade(5, 256);
 }
@@ -72,9 +73,9 @@ void sub_08050038(u32 arg0) {
     }
 }
 
-void DoFade(u32 fadeType, u32 fadeSpeed) {
-    gFadeControl.fadeSpeed = fadeSpeed;
-    gFadeControl.fadeType = fadeType;
+void DoFade(u32 type, u32 speed) {
+    gFadeControl.fadeSpeed = speed;
+    gFadeControl.fadeType = type;
     gFadeControl.active = 1;
     gFadeControl.fadeDuration = 0x100;
     gFadeControl.field_0xe = 0;
@@ -83,16 +84,16 @@ void DoFade(u32 fadeType, u32 fadeSpeed) {
     } else {
         gFadeControl.field_0x2 = 0;
     }
-    if (fadeType & 8) {
+    if (type & 8) {
         gUnk_03000000.spritesOffset = 1;
         gScreen.bg1.control |= BGCNT_MOSAIC;
         gScreen.bg2.control |= BGCNT_MOSAIC;
         gScreen.bg3.control |= BGCNT_MOSAIC;
     }
-    if (fadeType & 0x10) {
+    if (type & 0x10) {
         sub_0801E1B8(gFadeControl.field_0x16, gFadeControl.field_0x18);
         sub_0801E1EC(gFadeControl.field_0x12, gFadeControl.field_0x14, gFadeControl.field_0x10);
-        if ((fadeType & 1) == 0) {
+        if ((type & 1) == 0) {
             gFadeControl.fadeType &= ~4;
             sub_08050008();
             gUsedPalettes = 0xffffffff;

src/fileScreen.c

@@ -4,7 +4,6 @@
 #include "utils.h"
 #include "screen.h"
 #include "menu.h"
-#include "random.h"
 #include "textbox.h"
 #include "object.h"
 #include "functions.h"

src/item/itemPegasusBoots.c

@@ -1,6 +1,6 @@
+#include "asm.h"
 #include "item.h"
 #include "audio.h"
-#include "random.h"
 #include "functions.h"
 #include "effects.h"
 

src/main.c

@@ -1,14 +1,15 @@
 #include "audio.h"
-#include "global.h"
+#include "asm.h"
 #include "functions.h"
 #include "structures.h"
 #include "main.h"
 #include "screen.h"
-#include "random.h"
 #include "utils.h"
 #include "save.h"
 #include "textbox.h"
-#include "arm_proxy.h"
+#include "interrupts.h"
+
+extern u32 gRand;
 
 extern void HandleIntroScreen(void);
 extern void HandleChooseFileScreen(void);
@@ -20,6 +21,7 @@ extern void HandleDebugTextScreen(void);
 
 static void InitOverlays(void);
 static bool32 SoftResetKeysPressed(void);
+static u32 CheckHeaderValid(void);
 
 void (*const sScreenHandlers[])(void) = {
     [SCREEN_INTRO] = HandleIntroScreen,
@@ -211,7 +213,7 @@ NONMATCH("asm/non_matching/sub_080560B8.inc", static void sub_080560B8(void)) {
 }
 END_NONMATCH
 
-u32 CheckHeaderValid(void) {
+static u32 CheckHeaderValid(void) {
     if ((gSaveHeader->signature != SIGNATURE) || (gSaveHeader->saveFileId >= NUM_SAVE_SLOTS) ||
         (gSaveHeader->messageSpeed >= MAX_MSG_SPEED) || (gSaveHeader->brightnessPref >= MAX_BRIGHTNESS)
 #ifdef EU

src/manager/manager15.c

@@ -452,7 +452,6 @@ void sub_0805A9CC(Manager15* this) {
 
 extern struct { u8 unk_00[0x20]; } gUnk_085A97A0[];
 extern u16 gUnk_081085B8[];
-extern void LoadPalettes(const u8*, u32, u32);
 
 void sub_0805AA58(Manager15* this) {
     if (--this->manager.unk_0e == 0) {

src/manager/manager16.c

@@ -3,4 +3,4 @@
 
 ASM_FUNC("asm/non_matching/manager16/Manager16_Main.inc", void Manager16_Main())
 
-ASM_FUNC("asm/non_matching/manager16/sub_0805ACC0.inc", void sub_0805ACC0())
+ASM_FUNC("asm/non_matching/manager16/sub_0805ACC0.inc", u32 sub_0805ACC0(Entity* ent))

src/manager/manager1C.c

@@ -1,5 +1,5 @@
 #include "manager.h"
-#include "random.h"
+#include "asm.h"
 #include "room.h"
 #include "enemy.h"
 

src/manager/manager23.c

@@ -4,6 +4,7 @@
 #include "functions.h"
 #include "flags.h"
 #include "object.h"
+#include "overworld.h"
 
 extern void (*const gUnk_08108CCC[])(Manager*);
 

src/manager/manager24.c

@@ -2,7 +2,7 @@
 #include "functions.h"
 #include "flags.h"
 #include "audio.h"
-#include "game.h"
+#include "overworld.h"
 #include "object.h"
 #include "area.h"
 

src/manager/manager28.c

@@ -1,4 +1,5 @@
 #include "global.h"
+#include "asm.h"
 #include "manager.h"
 #include "entity.h"
 #include "room.h"

src/manager/manager3.c

@@ -1,10 +1,10 @@
 #include "global.h"
+#include "asm.h"
 #include "manager.h"
 #include "flags.h"
 #include "area.h"
 #include "room.h"
 #include "player.h"
-#include "random.h"
 #include "audio.h"
 #include "object.h"
 #include "functions.h"

src/manager/manager31.c

@@ -1,7 +1,7 @@
 
 #include "manager.h"
 #include "flags.h"
-#include "random.h"
+#include "asm.h"
 #include "object.h"
 #include "room.h"
 

src/manager/manager32.c

@@ -5,7 +5,7 @@
 #include "functions.h"
 #include "area.h"
 #include "utils.h"
-#include "gba/types.h"
+#include "overworld.h"
 
 typedef struct {
     Manager manager;
@@ -18,8 +18,6 @@ extern void (*const gUnk_08108D7C[])(Manager32*);
 void sub_0805D9D8(Manager32*);
 void sub_0805DA08(u32, u32, u32);
 
-extern void RoomExitCallback();
-
 extern u8 gUnk_08108D74[];
 
 extern struct BgAffineDstData gUnk_02017AA0[];

src/manager/manager37.c

@@ -8,6 +8,7 @@
 #include "object.h"
 #include "area.h"
 #include "enemy.h"
+#include "screen.h"
 
 extern ScreenTransitionData gUnk_0813AC34;
 

src/manager/manager39.c

@@ -4,7 +4,7 @@
 #include "area.h"
 #include "textbox.h"
 #include "utils.h"
-#include "game.h"
+#include "overworld.h"
 #include "functions.h"
 
 typedef struct {

src/npc.c

@@ -137,7 +137,7 @@ void (*const gNPCFunctions[][3])(Entity* ent) = {
 //clang-format on
 const u8 npc_unk[] = { 0x04, 0x05, 0x06, 0x06 };
 
-extern u8 gUnk_020342F8;
+extern u32 gUnk_020342F8;
 typedef struct {
     u16 unk0;
     u16 unk1;
@@ -147,7 +147,6 @@ typedef struct {
 extern NPCStruct gUnk_02031EC0[100];
 
 void InitNPC(Entity*);
-u32 ReadBit(void*, u32);
 
 // regalloc
 NONMATCH("asm/non_matching/arm_proxy/NPCUpdate.inc", void NPCUpdate(Entity* this)) {

src/npc/anju.c

@@ -3,7 +3,6 @@
 #include "player.h"
 #include "npc.h"
 #include "script.h"
-#include "functions.h"
 
 void Anju(Entity* this) {
     switch (this->action) {

src/npc/beedle.c

@@ -1,10 +1,11 @@
 #include "global.h"
 #include "entity.h"
-#include "functions.h"
 #include "textbox.h"
 #include "player.h"
 #include "room.h"
 #include "script.h"
+#include "npc.h"
+#include "overworld.h"
 
 typedef struct {
     u32 unk_00;

src/npc/bigGoron.c

@@ -1,16 +1,7 @@
-#include "global.h"
-#include "entity.h"
-#include "player.h"
+#include "npc.h"
 #include "structures.h"
-#include "script.h"
-#include "random.h"
-#include "audio.h"
 #include "functions.h"
-#include "script.h"
-#include "save.h"
 #include "screen.h"
-#include "utils.h"
-#include "textbox.h"
 
 extern void (*gUnk_081140D4[])(Entity*);
 

src/npc/bladeBrothers.c

@@ -33,8 +33,9 @@ extern u16 gUnk_0811172A[];
 extern u32 gUnk_0300402B;
 extern EntityData gUnk_080F3494;
 
-void BladeBrothers(Entity* this) {
+static void sub_08068BEC(Entity* this, u32 unused);
 
+void BladeBrothers(Entity* this) {
     if ((this->flags & 2) != 0) {
         gUnk_081115D0[this->action](this);
     } else {
@@ -163,7 +164,7 @@ void sub_08068BD0(Entity* this) {
     ForceEquipItem(*(u8*)(&this->field_0x68.HALF.HI + 1), 1);
 }
 
-void sub_08068BEC(Entity* this, u32 unused) {
+static void sub_08068BEC(Entity* this, u32 unused) {
     Entity* target;
 
     target = CreateFx(this, FX_WHITE_SPLASH, 0);

src/npc/brocco.c

@@ -1,5 +1,4 @@
 #include "entity.h"
-#include "functions.h"
 #include "textbox.h"
 #include "save.h"
 #include "npc.h"

src/npc/carlov.c

@@ -1,9 +1,9 @@
 #include "global.h"
+#include "audio.h"
 #include "entity.h"
 #include "room.h"
 #include "npc.h"
 #include "script.h"
-#include "functions.h"
 
 void Carlov(Entity* this) {
     if (this->action == 0) {

src/npc/carpenter.c

@@ -3,7 +3,6 @@
 #include "sprite.h"
 #include "player.h"
 #include "npc.h"
-#include "functions.h"
 #include "script.h"
 #include "flags.h"
 #include "textbox.h"

src/npc/castleMaid.c

@@ -1,9 +1,10 @@
 #include "entity.h"
 #include "script.h"
 #include "save.h"
-#include "functions.h"
 #include "flags.h"
 #include "textbox.h"
+#include "npc.h"
+#include "manager.h"
 
 extern Dialog gUnk_0810F894[];
 

src/npc/castorWildsStatue.c

@@ -1,8 +1,10 @@
+#include "audio.h"
 #include "entity.h"
 #include "script.h"
 #include "functions.h"
 #include "flags.h"
 #include "effects.h"
+#include "npc.h"
 
 extern Hitbox gUnk_08110E94;
 

src/npc/cat.c

@@ -3,7 +3,6 @@
 #include "functions.h"
 #include "save.h"
 #include "player.h"
-#include "random.h"
 #include "textbox.h"
 #include "npc.h"
 #include "audio.h"

src/npc/clothesRack.c

@@ -1,7 +1,4 @@
-#include "global.h"
-#include "entity.h"
-#include "functions.h"
-#include "flags.h"
+#include "npc.h"
 
 extern void (*gUnk_0811423C[])(Entity*);
 

src/npc/cow.c

@@ -2,7 +2,6 @@
 #include "audio.h"
 #include "entity.h"
 #include "player.h"
-#include "random.h"
 #include "npc.h"
 #include "functions.h"
 

src/npc/cucco.c

@@ -1,8 +1,5 @@
-#include "entity.h"
-#include "functions.h"
 #include "npc.h"
-#include "audio.h"
-#include "random.h"
+#include "functions.h"
 
 extern void (*const gUnk_081145B4[])(Entity*);
 

src/npc/cuccoChick.c

@@ -1,9 +1,5 @@
-#include "entity.h"
-#include "textbox.h"
 #include "npc.h"
 #include "functions.h"
-#include "random.h"
-#include "audio.h"
 
 extern void (*const gUnk_081145D4[])(Entity*);
 

src/npc/dog.c

@@ -1,12 +1,7 @@
 #include "entity.h"
 #include "functions.h"
-#include "script.h"
-#include "flags.h"
-#include "random.h"
 #include "npc.h"
-#include "audio.h"
 #include "save.h"
-#include "textbox.h"
 
 extern void (*gUnk_08111D88[])(Entity*);
 void sub_08069FE8(Entity*);

src/npc/drLeft.c

@@ -1,10 +1,5 @@
-#include "entity.h"
-#include "script.h"
-#include "random.h"
+#include "npc.h"
 #include "functions.h"
-#include "save.h"
-#include "textbox.h"
-#include "flags.h"
 
 extern void sub_08078850(Entity*, u32, u8, u32*);
 extern u32 gUnk_081133B4;