sort out functions.h

src/enemy/beetle.c

@@ -3,7 +3,7 @@
 
 extern u32 PlayerInRange(Entity*, u32, u32);
 
-u32 sub_08021D00();
+u32 sub_08021D00(Entity*);
 void sub_08021D44(Entity* this, u32 direction);
 
 extern void (*const gUnk_080CB590[])(Entity*);

src/enemy/bladeTrap.c

@@ -3,7 +3,7 @@
 #include "room.h"
 #include "functions.h"
 
-extern void sub_080A2CC0();
+extern void sub_080A2CC0(Entity*, void*, void*);
 
 void BladeTrap(Entity* this) {
     if (this->action == 0) {

src/enemy/businessScrub.c

@@ -5,6 +5,7 @@
 #include "npc.h"
 #include "functions.h"
 #include "game.h"
+#include "item.h"
 
 extern Entity* sub_08049DF4(u32);
 extern bool32 sub_08056338(void);

src/enemy/darkNut.c

@@ -6,23 +6,23 @@ typedef struct {
     u8 field_0x1;
 } PACKED stuct_080CAB14;
 
-void sub_08021218();
-void sub_08021588();
-void sub_080213D0();
-void sub_08021390();
-void sub_0802159C();
-void sub_0804AA1C();
-void sub_080213F0();
-u32 sub_080214FC();
-void sub_08021540();
-void sub_08021600();
-void sub_080213B0();
-u32 PlayerInRange();
-u32 sub_0802169C();
-void sub_0802124C();
-void sub_08021644();
-void sub_08021414();
-void sub_08021400();
+void sub_08021218(Entity*, u32, u32);
+void sub_08021588(Entity*);
+void sub_080213D0(Entity*, u32);
+void sub_08021390(Entity*);
+void sub_0802159C(Entity*);
+void sub_0804AA1C(Entity*);
+void sub_080213F0(Entity*);
+u32 sub_080214FC(Entity*);
+void sub_08021540(Entity*);
+void sub_08021600(Entity*);
+void sub_080213B0(Entity*);
+u32 PlayerInRange(Entity*, u32, u32);
+u32 sub_0802169C(Entity*, Entity*);
+void sub_0802124C(Entity*);
+void sub_08021644(Entity*);
+void sub_08021414(Entity*);
+void sub_08021400(Entity*);
 u32 sub_08021274(u32, u32);
 u32 sub_08021664(Entity*, Entity*);
 u32 sub_0804A044(Entity*, Entity*, u32);

src/enemy/doorMimic.c

@@ -3,8 +3,8 @@
 #include "functions.h"
 
 extern s16 sub_080001DA(u32, u32); // ?
-extern void sub_08049CF4();
-void sub_080221C0();
+extern void sub_08049CF4(Entity*);
+void sub_080221C0(Entity*);
 
 typedef struct {
     s8 h;

src/enemy/enemy4D.c

@@ -29,7 +29,7 @@ void sub_0803EB34(Entity* this) {
     CreateDeathFx(this, 0xff, 0x57);
 }
 
-void nullsub_21() {
+void nullsub_21(Entity* this) {
 }
 
 void sub_0803EB44(Entity* this) {

src/enemy/gibdo.c

@@ -2,21 +2,22 @@
 #include "enemy.h"
 #include "object.h"
 #include "functions.h"
+
 // Gibudo
-void sub_08037794();
-void sub_08037B10();
-void sub_0803797C();
-void sub_080379BC();
-void sub_08037C0C();
-u32 sub_08037810();
-void sub_080377B0();
-u32 sub_080378B0();
-u32 sub_08037914();
-u32 sub_080379EC();
-void sub_08037A58();
-void sub_08037ACC();
-void sub_08037B48();
-void sub_08037A14();
+void sub_08037794(Entity*);
+void sub_08037B10(Entity*);
+void sub_0803797C(Entity*);
+void sub_080379BC(Entity*);
+void sub_08037C0C(Entity*, Entity*);
+u32 sub_08037810(Entity*);
+void sub_080377B0(Entity*);
+u32 sub_080378B0(Entity*);
+u32 sub_08037914(Entity*);
+u32 sub_080379EC(Entity*);
+void sub_08037A58(Entity*);
+void sub_08037ACC(Entity*);
+void sub_08037B48(Entity*);
+void sub_08037A14(Entity*);
 
 extern void sub_0804A4E4(Entity*, Entity*);
 extern Entity* sub_08049DF4(u32);
@@ -75,7 +76,7 @@ NONMATCH("asm/non_matching/gibdo/sub_080374A4.inc", void sub_080374A4(Entity* th
 }
 END_NONMATCH
 
-void nullsub_162() {
+void nullsub_162(Entity* this) {
 }
 
 void sub_08037558(Entity* this) {

src/enemy/lakituCloud.c

@@ -4,6 +4,7 @@
 #include "player.h"
 #include "functions.h"
 #include "effects.h"
+#include "enemy.h"
 
 extern u32 GetNextFunction(Entity*);
 

src/enemy/likeLike.c

@@ -3,6 +3,7 @@
 #include "save.h"
 #include "object.h"
 #include "functions.h"
+#include "item.h"
 
 extern bool32 ItemIsShield(u32);
 

src/enemy/mazaalHead.c

@@ -810,8 +810,8 @@ void sub_08034BC8(Entity* this) {
 
 void sub_08034C00(Entity* this) {
     if (((gPlayerState.flags & PL_MINISH) != 0) &&
-        CheckPlayerInRegion(this->x.HALF.HI - gRoomControls.origin_x,
-                            this->y.HALF.HI - gRoomControls.origin_y + 0xd, 3, 3) != 0) {
+        CheckPlayerInRegion(this->x.HALF.HI - gRoomControls.origin_x, this->y.HALF.HI - gRoomControls.origin_y + 0xd, 3,
+                            3) != 0) {
         if (gRoomTransition.field_0x39 >= 0x3d) {
             DoExitTransition((ScreenTransitionData*)&gUnk_080CED88);
         } else {

src/enemy/miniSlime.c

@@ -3,7 +3,7 @@
 
 void sub_08045374(Entity*);
 
-extern void sub_080452E4();
+extern void sub_080452E4(Entity*);
 extern void ReplaceMonitoredEntity(Entity*, Entity*);
 
 extern void (*const gUnk_080D17C0[])(Entity*);

src/enemy/octorok.c

@@ -3,9 +3,9 @@
 
 extern Entity* sub_08049DF4(u32);
 
-void Octorok_Pause();
-bool32 Octorok_FacesPlayer();
-void Octorok_Turn();
+void Octorok_Pause(Entity*);
+bool32 Octorok_FacesPlayer(Entity*);
+void Octorok_Turn(Entity*);
 
 extern void (*const gOctorok[6])(Entity*);
 extern void (*const gOctorokActions[4])(Entity*);

src/enemy/rollobite.c

@@ -14,9 +14,9 @@ void sub_08020A7C(Entity*);
 bool32 Rollobite_TryToHoleUp(Entity*);
 bool32 Rollobite_IsRolledUp(Entity*);
 
-extern void sub_080AE58C();
-extern void sub_080AE7E8();
-extern void sub_08078930();
+extern void sub_080AE58C(Entity*, u32, u32);
+extern void sub_080AE7E8(Entity*, u32, u32, u32);
+extern void sub_08078930(Entity*);
 
 void Rollobite(Entity* this) {
     EnemyFunctionHandler(this, gRollobiteFunctions);

src/enemy/rope.c

@@ -5,10 +5,10 @@ extern void (*const gRope[6])(Entity*);
 extern void (*const gUnk_080CE460[4])(Entity*);
 extern void (*const gUnk_080CE470[3])(Entity*);
 extern Entity* gUnk_020000B0;
-extern u32 sub_0804A044();
+extern u32 sub_0804A044(Entity*, Entity*, u32);
 
-void sub_08031600();
-u32 sub_0803163C();
+void sub_08031600(Entity*);
+u32 sub_0803163C(Entity*);
 
 void Rope(Entity* this) {
     EnemyFunctionHandler(this, gRope);

src/enemy/rupeeLike.c

@@ -78,7 +78,7 @@ void sub_080293B4(Entity* this) {
     CreateDeathFx(this, 0xff, gUnk_080CCC34[this->cutsceneBeh.HALF.LO * 3 + this->type]);
 }
 
-void nullsub_141() {
+void nullsub_141(Entity* this) {
 }
 
 void sub_080293DC(Entity* this) {

src/enemy/slime.c

@@ -37,7 +37,7 @@ void sub_08044F88(Entity* this) {
     }
 }
 
-void nullsub_171() {
+void nullsub_171(Entity* this) {
 }
 
 void sub_08044FC8(Entity* this) {

src/enemy/smallPesto.c

@@ -21,7 +21,7 @@ void sub_08031680(Entity* this) {
     gUnk_080CE548[this->action](this);
 }
 
-void nullsub_152() {
+void nullsub_152(Entity* this) {
 }
 
 void sub_0803169C(Entity* this) {

src/enemy/tektite.c

@@ -1,6 +1,8 @@
 #include "enemy.h"
 #include "functions.h"
 
+static void sub_0802F45C(Entity* this);
+
 extern void (*const gUnk_080CDED0[])(Entity*);
 extern void (*const gUnk_080CDEE8[])(Entity*);
 
@@ -175,7 +177,7 @@ void sub_0802F3F4(Entity* this) {
     }
 }
 
-void sub_0802F45C(Entity* this) {
+static void sub_0802F45C(Entity* this) {
     u32 temp;
 
     if (sub_08049FA0(this) == 0) {

src/enemy/vaatiArm.c

@@ -546,8 +546,7 @@ void sub_08042C34(Entity* this) {
             y = gRoomControls.origin_y + gRoomControls.height + -0x40;
         }
 #endif
-        if (((u32)((x - gRoomControls.origin_x) - 0x90) < 0x41) &&
-            ((u32)((y - gRoomControls.origin_y) - 8) < 0x41)) {
+        if (((u32)((x - gRoomControls.origin_x) - 0x90) < 0x41) && ((u32)((y - gRoomControls.origin_y) - 8) < 0x41)) {
             x = gRoomControls.origin_x + 0xb0;
             y = gRoomControls.origin_y + 0x40;
         }

src/enemy/vaatiBall.c

@@ -141,7 +141,7 @@ void sub_080447E0(Entity* this) {
     }
 }
 
-extern void sub_08044DEC();
+extern void sub_08044DEC(Entity*);
 
 void sub_08044868(Entity* this) {
     Entity* vaati = this->parent;

src/enemy/vaatiWrath.c

@@ -389,8 +389,7 @@ void VaatiWrathType0Action8(Entity* this) {
     sub_08042004(this);
     UpdateAnimationSingleFrame(this);
     LinearMoveUpdate(this);
-    if (((gRoomControls.origin_x + 0x20) > this->x.HALF.HI) ||
-        ((gRoomControls.origin_x + 0x140) < this->x.HALF.HI)) {
+    if (((gRoomControls.origin_x + 0x20) > this->x.HALF.HI) || ((gRoomControls.origin_x + 0x140) < this->x.HALF.HI)) {
         if (0x3f < this->speed) {
             this->direction ^= 0x10;
         }

src/enemy/wisp.c

@@ -3,6 +3,8 @@
 #include "object.h"
 #include "functions.h"
 
+static void sub_08033744(Entity* this);
+
 extern void (*const gUnk_080CEB74[])(Entity*);
 extern void (*const gUnk_080CEB8C[])(Entity*);
 extern void (*const gUnk_080CEB98[])(Entity*);
@@ -120,7 +122,7 @@ void sub_080336DC(Entity* this) {
     }
 }
 
-void sub_08033744(Entity* this) {
+static void sub_08033744(Entity* this) {
     u32 temp;
     u32 rand = (u32)Random() % 256;