header overhaul

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 {