sort out most of functions.h

src/npc/bigGoron.c

@@ -5,14 +5,13 @@
 #include "item.h"
 
 extern void (*gUnk_081140D4[])(Entity*);
-
 extern u16 gUnk_081140CC[];
+extern u8 gMapDataTopSpecial[];
 
 void sub_0806D520(Entity*, u32);
-
 void sub_0806D41C(Entity* this);
 
-extern u8 gMapDataTopSpecial[];
+static void sub_0806D02C(Entity* this);
 
 typedef struct {
     u8 filler[0x40];
@@ -96,7 +95,7 @@ Entity* sub_0806D00C(Entity* this) {
     return entity;
 }
 
-void sub_0806D02C(Entity* this) {
+static void sub_0806D02C(Entity* this) {
     s32 tmp1;
     s32 tmp2;
     sub_0806D164(this);

src/npc/cat.c

@@ -4,6 +4,7 @@
 #include "save.h"
 #include "message.h"
 #include "npc.h"
+#include "enemy.h"
 
 extern void sub_08067C44(Entity*);
 

src/npc/forestMinish.c

@@ -12,6 +12,8 @@ extern Dialog gUnk_08109DC8[];
 extern u16 gUnk_0810A35A[];
 extern u16 gUnk_0810A362[];
 
+static void sub_080600F0(Entity* this);
+
 void ForestMinish(Entity* this) {
     switch (this->action) {
         case 0:
@@ -66,7 +68,7 @@ void ForestMinish_Head(Entity* this) {
     sub_0807000C(this);
 }
 
-void sub_080600F0(Entity* this) {
+static void sub_080600F0(Entity* this) {
     u32 uVar1;
     u32 uVar2;
 

src/npc/mayorHagen.c

@@ -3,7 +3,6 @@
 #include "player.h"
 #include "flags.h"
 #include "npc.h"
-#include "functions.h"
 #include "item.h"
 
 extern u32 gUnk_08113F44;

src/npc/melari.c

@@ -1,5 +1,4 @@
 #include "npc.h"
-#include "functions.h"
 #include "item.h"
 
 extern void sub_08068780(Entity*);

src/npc/minishEzlo.c

@@ -1,6 +1,6 @@
 #include "entity.h"
-#include "functions.h"
 #include "sound.h"
+#include "script.h"
 
 extern SpriteLoadData gUnk_0810C48C;
 

src/npc/npc5.c

@@ -2,6 +2,7 @@
 #include "message.h"
 #include "npc.h"
 #include "hitbox.h"
+#include "collision.h"
 
 typedef struct {
     u8 unk_0;  // u8

src/npc/phonograph.c

@@ -5,6 +5,7 @@
 #include "screen.h"
 #include "common.h"
 #include "flags.h"
+#include "message.h"
 
 #ifdef EU
 void sub_0806EABC(Entity* this);

src/npc/pita.c

@@ -1,4 +1,3 @@
-#include "functions.h"
 #include "npc.h"
 #include "item.h"
 
@@ -7,7 +6,6 @@ extern Hitbox gUnk_0810C428;
 extern u8 gUnk_0810C430[4];
 extern u8 gUnk_0810C435[];
 extern u8 gUnk_0810C43D[];
-extern u32 GetRandomByWeight(const u8*);
 
 void Pita(Entity* this) {
     if (this->action == 0) {
@@ -25,7 +23,7 @@ void Pita(Entity* this) {
 }
 
 /** Reset the players baked goods? */
-void sub_08062EB8(void) {
+void RemoveAllBakedGoods(void) {
     SetInventoryValue(ITEM_BRIOCHE, 0);
     SetInventoryValue(ITEM_CROISSANT, 0);
     SetInventoryValue(ITEM_PIE, 0);