header overhaul

src/object/archway.c

@@ -1,6 +1,6 @@
 #include "global.h"
 #include "entity.h"
-#include "game.h"
+#include "overworld.h"
 
 void Archway(Entity* this) {
     if (this->action == 0) {

src/object/backgroundCloud.c

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

src/object/bakerOven.c

@@ -1,7 +1,4 @@
-#include "global.h"
-#include "entity.h"
 #include "object.h"
-#include "functions.h"
 
 extern void sub_0800449C(Entity*, u32);
 extern u32 sub_0806FC80(Entity*, Entity*, s32);

src/object/bell.c

@@ -1,5 +1,4 @@
-#include "global.h"
-#include "entity.h"
+#include "object.h"
 
 extern void (*gUnk_08123384[])(Entity*);
 

src/object/bird.c

@@ -1,12 +1,6 @@
-#include "global.h"
-#include "audio.h"
-#include "entity.h"
-#include "flags.h"
 #include "save.h"
-#include "random.h"
 #include "object.h"
 #include "functions.h"
-#include "effects.h"
 
 extern void (*const gUnk_08123EC0[])(Entity*);
 extern void (*const gUnk_08123EEC[])(Entity*);

src/object/book.c

@@ -1,11 +1,7 @@
-#include "entity.h"
+#include "object.h"
 #include "functions.h"
-#include "player.h"
 #include "script.h"
-#include "flags.h"
-#include "room.h"
 #include "textbox.h"
-#include "effects.h"
 
 extern void (*const BookActionFuncs[])(Entity*);
 extern s8 const gUnk_08123D94[];

src/object/button.c

@@ -1,10 +1,5 @@
-#include "global.h"
-#include "entity.h"
-#include "flags.h"
-#include "room.h"
-#include "audio.h"
+#include "object.h"
 #include "functions.h"
-#include "effects.h"
 
 extern void (*const gUnk_0811EE38[])(Entity*);
 

src/object/cloud.c

@@ -1,10 +1,3 @@
-#include "global.h"
-#include "audio.h"
-#include "entity.h"
-#include "room.h"
-#include "player.h"
-#include "flags.h"
-#include "random.h"
 #include "object.h"
 #include "structures.h"
 #include "functions.h"

src/object/fileScreenObjects.c

@@ -1,12 +1,8 @@
-#include "global.h"
-#include "entity.h"
-#include "flags.h"
+#include "object.h"
 #include "main.h"
 #include "menu.h"
 #include "npc.h"
-#include "coord.h"
 #include "fileScreen.h"
-#include "utils.h"
 #include "structures.h"
 #include "functions.h"
 

src/object/fireplace.c

@@ -1,9 +1,6 @@
-#include "entity.h"
-#include "functions.h"
-#include "player.h"
+#include "object.h"
 #include "script.h"
-#include "flags.h"
-#include "room.h"
+#include "functions.h"
 
 extern void (*gUnk_08123D98[])(Entity*);
 

src/object/floatingBlock.c

@@ -1,5 +1,4 @@
-#include "global.h"
-#include "entity.h"
+#include "object.h"
 
 void FloatingBlock(Entity* this) {
     if (this->action == 0) {

src/object/frozenFlower.c

@@ -1,5 +1,4 @@
-#include "global.h"
-#include "entity.h"
+#include "object.h"
 
 extern void (*const gUnk_0812119C[])(Entity*);
 

src/object/giantLeaf.c

@@ -1,7 +1,4 @@
-#include "global.h"
-#include "entity.h"
-#include "room.h"
-#include "functions.h"
+#include "object.h"
 
 void sub_0808D618(Entity* ent);
 

src/object/greatFairy.c

@@ -1,16 +1,31 @@
-#include "global.h"
-#include "audio.h"
-#include "entity.h"
-#include "room.h"
-#include "screen.h"
-#include "greatFairy.h"
-#include "flags.h"
-#include "save.h"
-#include "random.h"
-#include "script.h"
 #include "object.h"
+#include "save.h"
+#include "script.h"
 #include "structures.h"
 #include "functions.h"
+#include "screen.h"
+
+void GreatFairy_InitializeAnimation(Entity*);
+Entity* GreatFairy_CreateForm(Entity*, u32, u32);
+void sub_080873D0();
+extern void (*const GreatFairy_Main[])(Entity*);
+extern void (*const GreatFairy_Behaviors[])(Entity*);
+extern void (*const GreatFairy_WingsBehaviors[])(Entity*);
+extern void (*const GreatFairy_WakeBehaviors[])(Entity*);
+extern void (*const GreatFairy_MiniBehaviors[])(Entity*);
+extern void (*const GreatFairy_MiniAffineBehaviors[])(Entity*);
+extern void (*const GreatFairy_DropletBehaviors[])(Entity*);
+extern void (*const GreatFairy_RippleBehaviors[])(Entity*);
+extern void (*const GreatFairy_BigRippleBehaviors[])(Entity*);
+extern void (*const GreatFairy_EnergyBehaviors[])(Entity*);
+extern void (*const GreatFairy_Form1Behaviors[])(Entity*);
+extern void (*const GreatFairy_Form2Behaviors[])(Entity*);
+extern void (*const gUnk_081207A4[])(Entity*);
+
+extern u32 gUnk_0810C2E4;
+extern const s16 GreatFairy_RippleOffsets[10];
+extern u8 gUnk_0812079C[8];
+extern s8 gUnk_081207AC[];
 
 enum {
     BEHAVIORS,

src/object/houseDoorExterior.c

@@ -6,6 +6,7 @@
 #include "audio.h"
 #include "object.h"
 #include "functions.h"
+#include "npc.h"
 
 typedef struct {
     /*0x00*/ u16 unk0;

src/object/jarPortal.c

@@ -1,9 +1,6 @@
-#include "global.h"
-#include "entity.h"
-#include "flags.h"
-#include "functions.h"
+#include "object.h"
 #include "area.h"
-#include "audio.h"
+#include "functions.h"
 
 extern void (*gUnk_08121488[])(Entity*);
 

src/object/lightableSwitch.c

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

src/object/lilypadSmall.c

@@ -1,13 +1,12 @@
-#include "global.h"
-#include "entity.h"
-#include "player.h"
-#include "random.h"
+#include "object.h"
 #include "functions.h"
 
 extern void sub_080A2CC0(Entity*, Entity**, u16*);
 
 extern u16 gUnk_08123318[];
 
+static void sub_08097B24(Entity* this);
+
 void LilypadSmall(Entity* this) {
     u32 rand;
     u16* psVar4;
@@ -48,7 +47,7 @@ u32 sub_08097ADC(Entity* this) {
     }
 }
 
-void sub_08097B24(Entity* this) {
+static void sub_08097B24(Entity* this) {
     u32 temp;
     u32 temp2;
     u16* temp3;

src/object/lockedDoor.c

@@ -1,10 +1,10 @@
 #include "global.h"
 #include "entity.h"
 #include "flags.h"
-#include "game.h"
 #include "audio.h"
 #include "functions.h"
 #include "effects.h"
+#include "overworld.h"
 
 void sub_08083338(Entity*);
 void sub_080834B4(Entity*);

src/object/mask.c

@@ -1,12 +1,6 @@
-#include "global.h"
-#include "entity.h"
-#include "room.h"
-#include "random.h"
+#include "object.h"
 #include "structures.h"
-#include "player.h"
-#include "flags.h"
 #include "functions.h"
-#include "effects.h"
 
 extern void (*MaskActionFuncs[])(Entity*);
 

src/object/minecart.c

@@ -1,8 +1,5 @@
-#include "global.h"
-#include "audio.h"
-#include "entity.h"
+#include "object.h"
 #include "functions.h"
-#include "room.h"
 
 extern u32 sub_08091DDC(Entity*);
 extern u32 sub_080002B4(Entity*, u32, u32);

src/object/minishSizedArchway.c

@@ -1,6 +1,6 @@
 #include "global.h"
 #include "entity.h"
-#include "game.h"
+#include "overworld.h"
 
 void MinishSizedArchway(Entity* this) {
     if (this->action == 0) {

src/object/minishSizedEntrance.c

@@ -1,7 +1,5 @@
-#include "global.h"
-#include "entity.h"
-#include "game.h"
-#include "player.h"
+#include "object.h"
+#include "overworld.h"
 #include "functions.h"
 
 extern void (*const gUnk_08122254[])(Entity*);

src/object/object1A.c

@@ -1,6 +1,3 @@
-#include "global.h"
-#include "entity.h"
-#include "random.h"
 #include "object.h"
 #include "functions.h"
 

src/object/object2A.c

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

src/object/object49.c

@@ -1,8 +1,3 @@
-#include "global.h"
-#include "audio.h"
-#include "entity.h"
-#include "coord.h"
-#include "random.h"
 #include "object.h"
 #include "structures.h"
 #include "functions.h"

src/object/object86.c

@@ -1,8 +1,4 @@
-#include "global.h"
-#include "entity.h"
-#include "coord.h"
-#include "player.h"
-#include "flags.h"
+#include "object.h"
 #include "functions.h"
 
 void sub_08099ECC(Entity*);

src/object/objectA.c

@@ -4,6 +4,7 @@
 #include "flags.h"
 #include "createObject.h"
 #include "functions.h"
+#include "overworld.h"
 
 extern Hitbox gHitbox_2;
 

src/object/objectA2.c

@@ -1,11 +1,7 @@
-#include "global.h"
 #include "object.h"
 #include "menu.h"
-#include "random.h"
-#include "audio.h"
 #include "structures.h"
 #include "functions.h"
-#include "effects.h"
 
 void sub_0809F318(Entity*);
 void sub_0809F374(Entity*);

src/object/octorokBossObject.c

@@ -1,10 +1,6 @@
-#include "global.h"
-#include "entity.h"
-#include "coord.h"
-#include "audio.h"
 #include "functions.h"
-#include "random.h"
 #include "object.h"
+#include "overworld.h"
 
 extern void sub_0807B9B8(s32, s32, s32);
 

src/object/palaceArchway.c

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

src/object/pot.c

@@ -1,4 +1,5 @@
 #include "global.h"
+#include "audio.h"
 #include "entity.h"
 #include "flags.h"
 #include "player.h"

src/object/railtrack.c

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

src/object/smoke.c

@@ -1,8 +1,4 @@
-#include "global.h"
-#include "entity.h"
-#include "random.h"
 #include "object.h"
-#include "functions.h"
 
 extern void (*const gUnk_08121060[])(Entity*);
 extern void (*const gUnk_08121070[])(Entity*);

src/object/thoughtBubble.c

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

src/object/treeThorns.c

@@ -3,7 +3,6 @@
 #include "coord.h"
 #include "room.h"
 #include "object.h"
-#include "functions.h"
 
 extern Hitbox gHitbox_1;
 

src/object/warpPoint.c

@@ -2,12 +2,15 @@
 #include "object.h"
 #include "player.h"
 #include "flags.h"
-#include "game.h"
+#include "overworld.h"
 #include "audio.h"
 #include "functions.h"
 
 extern Hitbox gHitbox_1;
 
+extern void sub_0807CAC8(u32);
+extern u32 sub_0807CAEC(u32);
+
 void WarpPoint(Entity*);
 void sub_0808B474(Entity*);
 void sub_0808B530(Entity*);

src/object/windTribeFlag.c

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