header overhaul

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;

src/npc/ezlo.c

@@ -1,9 +1,5 @@
-#include "global.h"
-#include "entity.h"
+#include "npc.h"
 #include "script.h"
-#include "audio.h"
-#include "functions.h"
-#include "effects.h"
 
 const u8 gUnk_08114134[];
 const u8 gUnk_08114144[];

src/npc/farmers.c

@@ -1,11 +1,10 @@
 #include "entity.h"
 #include "script.h"
 #include "functions.h"
+#include "npc.h"
 
 extern Dialog gUnk_08113158[];
 
-extern void sub_0806F188(Entity*);
-
 extern SpriteLoadData gUnk_08113140[];
 void sub_0806BC58(Entity* this);
 

src/npc/forestMinish.c

@@ -1,18 +1,9 @@
-#include "global.h"
-#include "entity.h"
 #include "npc.h"
-#include "flags.h"
-#include "textbox.h"
-#include "player.h"
-#include "save.h"
-#include "script.h"
-#include "random.h"
 #include "createObject.h"
 #include "structures.h"
 #include "functions.h"
 
 extern void sub_080600F0(Entity*);
-extern s32 sub_0806EDD8(Entity*, u32, u32);
 extern void sub_08060158(Entity*);
 extern void ModBombs(s32);
 

src/npc/gorman.c

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

src/npc/goron.c

@@ -4,6 +4,7 @@
 #include "textbox.h"
 #include "script.h"
 #include "effects.h"
+#include "npc.h"
 
 extern void (*gUnk_08111A80[])(Entity*);
 extern void (*gUnk_08111A8C[])(Entity*);

src/npc/goronMerchant.c

@@ -7,6 +7,7 @@
 #include "flags.h"
 #include "script.h"
 #include "save.h"
+#include "npc.h"
 
 static u32 GoronMerchant_GetSalePrice(Entity*);
 

src/npc/guard.c

@@ -7,6 +7,7 @@
 #include "script.h"
 #include "structures.h"
 #include "functions.h"
+#include "npc.h"
 
 typedef struct {
     u32 unk;
@@ -19,9 +20,7 @@ typedef struct {
 } struct_08064050;
 
 extern void sub_08063D24(Entity*);
-extern void sub_0806EE20(Entity*);
 extern void sub_08064428(Entity*);
-extern void sub_0806EE04(Entity*, void*, u32);
 void sub_08063DC8(Entity*);
 void sub_08063F20(Entity*);
 

src/npc/kid.c

@@ -1,10 +1,7 @@
-#include "entity.h"
 #include "functions.h"
 #include "textbox.h"
 #include "npc.h"
 #include "script.h"
-#include "utils.h"
-#include "random.h"
 #include "save.h"
 
 extern void (*const gUnk_0810BE0C[])(Entity*);

src/npc/mailbox.c

@@ -3,6 +3,7 @@
 #include "textbox.h"
 #include "functions.h"
 #include "effects.h"
+#include "npc.h"
 
 extern void sub_08063280();
 

src/npc/melari.c

@@ -1,15 +1,7 @@
-#include "global.h"
-#include "entity.h"
 #include "npc.h"
-#include "textbox.h"
-#include "script.h"
-#include "random.h"
-#include "audio.h"
 #include "functions.h"
-#include "effects.h"
 
 extern void sub_08068780(Entity*);
-extern s32 sub_0806EDD8(Entity*, u32, u32);
 
 extern void (*const gUnk_08111530[])(Entity*);
 

src/npc/milkCart.c

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

src/npc/mountainMinish.c

@@ -3,6 +3,7 @@
 #include "functions.h"
 #include "textbox.h"
 #include "flags.h"
+#include "npc.h"
 
 extern SpriteLoadData gUnk_08111358;
 

src/npc/npc23.c

@@ -5,6 +5,7 @@
 #include "functions.h"
 #include "structures.h"
 #include "textbox.h"
+#include "npc.h"
 
 extern void (*const gUnk_081104C8[])(Entity*);
 

src/npc/npc26.c

@@ -2,6 +2,7 @@
 #include "entity.h"
 #include "functions.h"
 #include "script.h"
+#include "npc.h"
 
 static void (*const gUnk_081106D4[])(Entity*);
 static void (*const gUnk_081106E0[])(Entity*);

src/npc/npc4E.c

@@ -7,6 +7,7 @@
 #include "save.h"
 #include "flags.h"
 #include "object.h"
+#include "npc.h"
 
 extern Hitbox gHitbox_2;
 typedef struct {

src/npc/npc4F.c

@@ -1,6 +1,4 @@
-#include "global.h"
-#include "entity.h"
-#include "random.h"
+#include "npc.h"
 
 void NPC4F(Entity* this) {
     if (this->action == 0) {

src/npc/npc5.c

@@ -1,12 +1,6 @@
-#include "global.h"
-#include "entity.h"
-#include "player.h"
-#include "room.h"
-#include "coord.h"
-#include "random.h"
-#include "utils.h"
 #include "functions.h"
 #include "textbox.h"
+#include "npc.h"
 
 extern void (*const gUnk_0810AC1C[])(Entity*);
 
@@ -86,6 +80,7 @@ void sub_08061AFC(Entity*);
 
 extern u16* gUnk_0810B660[8];
 
+// UNUSED zelda follower, probably because it was too resource heavy
 void NPC5(Entity* this) {
     gUnk_0810AC1C[this->type](this);
 }

src/npc/npc58.c

@@ -1,5 +1,6 @@
 #include "entity.h"
 #include "functions.h"
+#include "npc.h"
 
 extern void sub_0806FFBC(Entity*, u32, u32, u32);
 

src/npc/npc9.c

@@ -2,6 +2,7 @@
 #include "entity.h"
 #include "textbox.h"
 #include "functions.h"
+#include "npc.h"
 
 extern void (*const gUnk_0810C290[])(Entity*);
 
@@ -30,7 +31,7 @@ void sub_08062B14(Entity* this) {
 void sub_08062B48(Entity* this) {
     GetNextFrame(this);
     if (this->frame & 0x80) {
-        MessageFromTarget(0xa01);
+        MessageFromTarget(0xa01); // invalid
         this->action++;
     }
 }

src/npc/pita.c

@@ -1,9 +1,5 @@
-#include "entity.h"
 #include "functions.h"
-#include "script.h"
-#include "flags.h"
-#include "random.h"
-#include "textbox.h"
+#include "npc.h"
 
 extern Hitbox gUnk_0810C428;
 

src/npc/postman.c

@@ -1,4 +1,5 @@
 #include "global.h"
+#include "audio.h"
 #include "entity.h"
 #include "functions.h"
 #include "npc.h"
@@ -12,9 +13,7 @@
 #include "effects.h"
 
 extern void sub_08060528(Entity*);
-extern void sub_0806EE04(Entity*, void*, u32);
 extern void sub_080604DC(Entity*);
-extern void sub_0806EE20(Entity*);
 extern void sub_080606D8(Entity*);
 extern void sub_080606C0(Entity*);
 

src/npc/rem.c

@@ -1,11 +1,5 @@
-#include "global.h"
-#include "entity.h"
-#include "script.h"
-#include "audio.h"
 #include "functions.h"
-#include "random.h"
-#include "flags.h"
-#include "textbox.h"
+#include "npc.h"
 
 extern void sub_0806A8C8(Entity*);
 

src/npc/simon.c

@@ -6,6 +6,7 @@
 #include "script.h"
 #include "object.h"
 #include "functions.h"
+#include "screen.h"
 
 typedef struct {
     u8 filler[4];

src/npc/sittingPerson.c

@@ -1,9 +1,4 @@
-#include "entity.h"
-#include "script.h"
 #include "npc.h"
-#include "functions.h"
-#include "save.h"
-#include "random.h"
 
 extern void (*gUnk_0810CBD8[])(Entity*);
 

src/npc/smallTownMinish.c

@@ -3,7 +3,7 @@
 #include "player.h"
 #include "script.h"
 #include "save.h"
-#include "functions.h"
+#include "npc.h"
 
 extern Hitbox gUnk_081142FC;
 extern void sub_08078850(Entity*, u32, u32, u32*);

src/npc/smith.c

@@ -1,13 +1,5 @@
-#include "global.h"
-#include "entity.h"
-#include "textbox.h"
-#include "save.h"
-#include "script.h"
-#include "random.h"
 #include "npc.h"
-#include "audio.h"
 #include "functions.h"
-#include "effects.h"
 
 extern void sub_08078850(Entity*, u32, u32, u32*);
 

src/npc/stamp.c

@@ -4,6 +4,7 @@
 #include "functions.h"
 #include "script.h"
 #include "effects.h"
+#include "npc.h"
 
 extern void sub_08062CA4();
 

src/npc/stockwell.c

@@ -3,6 +3,7 @@
 #include "room.h"
 #include "textbox.h"
 #include "functions.h"
+#include "npc.h"
 
 extern void (*const gUnk_0810FDC8[])(Entity*);
 

src/npc/sturgeon.c

@@ -10,7 +10,6 @@ extern u16 gUnk_0810FA54[];
 
 extern SpriteLoadData gUnk_0810FA38;
 
-extern void sub_0806EE04(Entity*, void*, u32);
 extern u32 gUnk_0810FA5A;
 void sub_08064CC0(Entity* this);
 

src/npc/syrup.c

@@ -1,10 +1,6 @@
-#include "global.h"
-#include "entity.h"
 #include "npc.h"
-#include "script.h"
 #include "functions.h"
 #include "object.h"
-#include "random.h"
 
 extern void (*gUnk_081121D4[])(Entity*);
 

src/npc/talon.c

@@ -1,10 +1,4 @@
-#include "global.h"
-#include "entity.h"
-#include "textbox.h"
-#include "player.h"
-#include "script.h"
 #include "npc.h"
-#include "random.h"
 #include "functions.h"
 
 extern void (*gUnk_0810FEC4[])(Entity* this);

src/npc/townMinish.c

@@ -12,7 +12,6 @@ extern void sub_0806ACC4(Entity*);
 extern void sub_0806AEA8();
 extern void sub_0806AEE4(Entity*);
 extern void sub_0806AFE8(Entity*, ScriptExecutionContext*);
-extern s32 sub_0806EDD8(Entity*, u32, u32);
 extern void sub_08078850(Entity*, u32, u32, u32*);
 
 extern u8 gUnk_081125F4[12];

src/npc/townsperson.c

@@ -1,15 +1,6 @@
-#include "global.h"
-#include "entity.h"
 #include "npc.h"
-#include "player.h"
-#include "textbox.h"
-#include "flags.h"
-#include "save.h"
-#include "script.h"
-#include "random.h"
 #include "structures.h"
 #include "functions.h"
-#include "effects.h"
 
 typedef struct {
     u8 frame1;

src/npc/wheaton.c

@@ -1,7 +1,5 @@
-#include "global.h"
-#include "entity.h"
+#include "npc.h"
 #include "script.h"
-#include "functions.h"
 
 extern Hitbox gUnk_0810C3C0;
 
@@ -10,15 +8,10 @@ void Wheaton(Entity* this) {
         this->action++;
 
         SetDefaultPriority(this, PRIO_MESSAGE);
-
         ResolveEntityOnTop(this, this);
-
         this->hitbox = &gUnk_0810C3C0;
-
         this->spriteOffsetY = 0xfe;
-
         sub_0807DD64(this);
     }
-
     sub_0807DD94(this, 0);
 }

src/npc/windTribespeople.c

@@ -1,4 +1,5 @@
 #include "global.h"
+#include "audio.h"
 #include "entity.h"
 #include "npc.h"
 #include "textbox.h"

src/npc/zelda.c

@@ -5,6 +5,7 @@
 #include "room.h"
 #include "flags.h"
 #include "script.h"
+#include "npc.h"
 
 extern Entity* DeepFindEntityByID(u32, u32);
 void sub_08068680(Entity*, Entity*);