sort out functions.h

src/manager/manager1.c

@@ -2,6 +2,7 @@
 #include "entity.h"
 #include "screen.h"
 #include "functions.h"
+#include "common.h"
 
 extern void sub_08056250(void);
 

src/manager/manager10.c

@@ -148,11 +148,11 @@ void sub_080596E0(Manager10* this) {
     }
 }
 
-u32 sub_08059844() {
+u32 sub_08059844(void) {
     return gPlayerEntity.x.HALF.HI - gRoomControls.origin_x > gRoomControls.width >> 1;
 }
 
-u32 sub_0805986C() {
+u32 sub_0805986C(void) {
     return gPlayerEntity.x.HALF.HI - gRoomControls.origin_x > 0x200;
 }
 
@@ -207,7 +207,7 @@ void sub_08059960(const u16* unk1, const u16* unk2, u16* unk3, u8 unk4) {
     }
 }
 
-void sub_08059994() {
+void sub_08059994(void) {
     if (sub_0805986C()) {
         LoadPaletteGroup(0x5B);
         gArea.queued_bgm = 0x1E;

src/manager/manager12.c

@@ -24,7 +24,7 @@ extern u16 gUnk_081083AE;
 extern u16 gUnk_081083C4;
 
 void sub_08059CC0(u32, u32);
-void sub_08059B18();
+void sub_08059B18(void);
 
 bool32 sub_08059C8C(Manager12*, u32, u8*, u16*);
 

src/manager/manager14.c

@@ -30,8 +30,8 @@ void sub_0805A098(Manager14*);
 void sub_0805A0C0(Manager14*);
 void sub_0805A114(u32, u32);
 void sub_0805A1D8(Manager14*);
-void nullsub_495();
-void sub_0805A25C();
+void nullsub_495(void*);
+void sub_0805A25C(void*);
 
 void Manager14_Main(Manager14* this) {
     static void (*const gUnk_081085A4[])(Manager14*) = {
@@ -186,10 +186,10 @@ void sub_0805A1D8(Manager14* this) {
     }
 }
 
-void nullsub_495() {
+void nullsub_495(void* this) {
 }
 
-void sub_0805A25C() {
+void sub_0805A25C(void* this) {
     gScreen.controls.layerFXControl = 0;
     gScreen.lcd.displayControl &= ~DISPCNT_BG3_ON;
     sub_08056250();

src/manager/manager1A.c

@@ -165,10 +165,8 @@ void sub_0805B210(Manager1A* this) {
             gRoomTransition.player_status.start_pos_y = tmp->unk_06;
             break;
         case 1:
-            gRoomTransition.player_status.start_pos_x =
-                gPlayerEntity.x.HALF.HI - gRoomControls.origin_x + tmp->unk_04;
-            gRoomTransition.player_status.start_pos_y =
-                gPlayerEntity.y.HALF.HI - gRoomControls.origin_y + tmp->unk_06;
+            gRoomTransition.player_status.start_pos_x = gPlayerEntity.x.HALF.HI - gRoomControls.origin_x + tmp->unk_04;
+            gRoomTransition.player_status.start_pos_y = gPlayerEntity.y.HALF.HI - gRoomControls.origin_y + tmp->unk_06;
             break;
         case 2:
             gRoomTransition.player_status.start_pos_x = tmp->unk_04;

src/manager/manager1B.c

@@ -2,6 +2,7 @@
 #include "manager.h"
 #include "functions.h"
 #include "screen.h"
+#include "common.h"
 
 typedef struct {
     Manager manager;

src/manager/manager2.c

@@ -1,6 +1,8 @@
 #include "global.h"
 #include "screen.h"
 #include "functions.h"
+#include "game.h"
+#include "common.h"
 
 typedef struct {
     Manager manager;
@@ -9,7 +11,7 @@ typedef struct {
     void* field_0x3c;
 } Manager2;
 
-extern void sub_080576A0();
+extern void sub_080576A0(void*);
 extern void sub_0805754C(Manager2*);
 
 extern u8 gMapDataTopSpecial[];
@@ -81,9 +83,9 @@ void sub_08057688(void) {
     gScreen.bg1.control = BGCNT_SCREENBASE(30) | BGCNT_CHARBASE(2) | BGCNT_MOSAIC;
 }
 
-void sub_080576A0(Manager2* this) {
+void sub_080576A0(void* this) {
     LoadGfxGroup(gRoomVars.unk_10[0]);
-    this->field_0x38 = NULL;
-    this->field_0x3c = NULL;
-    sub_0805754C(this);
+    ((Manager2*)this)->field_0x38 = NULL;
+    ((Manager2*)this)->field_0x3c = NULL;
+    sub_0805754C((Manager2*)this);
 }

src/manager/manager27.c

@@ -3,6 +3,7 @@
 #include "entity.h"
 #include "flags.h"
 #include "functions.h"
+#include "common.h"
 
 extern u32 sub_0805C920(Entity*);
 

src/manager/manager2F.c

@@ -4,6 +4,7 @@
 #include "room.h"
 #include "screen.h"
 #include "functions.h"
+#include "common.h"
 
 void sub_0805D470(Manager*);
 

src/manager/manager4.c

@@ -89,7 +89,7 @@ u32 sub_0805795C(Manager* this, DiggingCaveEntrance* entr) {
     }
 }
 
-extern void sub_08080930();
+extern void sub_08080930(u32);
 
 #ifdef EU
 ASM_FUNC("asm/non_matching/eu/sub_08057A18.inc", void sub_08057A18(Manager* this, DiggingCaveEntrance* entr))

src/manager/manager7.c

@@ -1,6 +1,7 @@
 #include "manager.h"
 #include "asm.h"
 #include "functions.h"
+#include "common.h"
 
 typedef struct {
     Manager manager;
@@ -8,8 +9,8 @@ typedef struct {
     u8 unk_21[0x1F];
 } Manager7;
 
-void sub_08057E30();
-u32 sub_08057E40();
+void sub_08057E30(void*);
+u32 sub_08057E40(Manager7*);
 void sub_08057E7C(u32);
 
 extern u32 CheckRegionsOnScreen(const u16*);
@@ -106,7 +107,7 @@ void Manager7_Main(Manager7* this) {
 }
 #endif
 
-void sub_08057E30(Manager7* this) {
+void sub_08057E30(void* this) {
     sub_08057E7C(gRoomVars.unk_10[0]);
 }
 
@@ -120,7 +121,7 @@ u32 sub_08057E40(Manager7* this) {
     }
 }
 
-void sub_08057E64() {
+void sub_08057E64(void) {
     u32 tmp;
     tmp = CheckRegionsOnScreen(gUnk_08108050);
     if (tmp != 0xFF) {

src/manager/manager8.c

@@ -1,6 +1,7 @@
 #include "manager.h"
 #include "screen.h"
 #include "functions.h"
+#include "common.h"
 
 typedef struct {
     Manager manager;
@@ -11,7 +12,7 @@ typedef struct {
 } Manager8;
 
 void sub_08057F20(Manager8*);
-void sub_08057EFC();
+void sub_08057EFC(void*);
 void sub_08058034(void);
 void sub_08058084(u16*, u16*);
 
@@ -27,12 +28,12 @@ void Manager8_Main(Manager8* this) {
     }
 }
 
-void sub_08057EFC(Manager8* this) {
+void sub_08057EFC(void* this) {
     LoadGfxGroup((u32)gRoomVars.unk_10[0]);
     sub_08058034();
-    this->unk_3c = 0;
-    this->unk_38 = 0;
-    sub_08057F20(this);
+    ((Manager8*)this)->unk_3c = 0;
+    ((Manager8*)this)->unk_38 = 0;
+    sub_08057F20(((Manager8*)this));
 }
 
 void sub_08058004(u32, void*, void*);
@@ -75,7 +76,7 @@ void sub_08058004(u32 unk1, void* unk2, void* unk3) {
     }
 }
 
-void sub_08058034() {
+void sub_08058034(void) {
     u32 tmp;
     u16 *tmp2, *tmp3;
     tmp2 = gMapDataTopSpecial;

src/manager/manager9.c

@@ -3,6 +3,7 @@
 #include "room.h"
 #include "screen.h"
 #include "functions.h"
+#include "common.h"
 
 typedef struct {
     Manager manager;
@@ -66,7 +67,7 @@ void sub_080582A0(u32 unk, u32* unk2, u16* unk3) {
 
 extern u8 gMapDataTopSpecial[];
 
-void sub_080582D0() {
+void sub_080582D0(void) {
     u8* tmp = gMapDataTopSpecial;
     u8* tmp2 = tmp + 0x4000;
     sub_080582F8(tmp, tmp2);

src/manager/managerC.c

@@ -27,6 +27,8 @@ typedef struct {
     u16 unk_6;
 } struct_08108228;
 
+void sub_08058D34(void);
+
 void (*const gUnk_0810821C[])(ManagerC*);
 const struct_08108228 gUnk_08108228[6];
 const struct_08108228 gUnk_08108258[6];
@@ -267,7 +269,7 @@ void sub_08058CB0(ManagerC* this) {
     this->unk_24.HALF.HI = this->unk_20 = gUnk_08108300[tmp3];
 }
 
-void sub_08058CFC() {
+void sub_08058CFC(void) {
     u32 tmp = gPlayerEntity.y.HALF.HI - gRoomControls.scroll_y;
     if (tmp < 0x4C) {
         sub_080044AE(&gPlayerEntity, 0xC0, 0x10);
@@ -277,7 +279,7 @@ void sub_08058CFC() {
     }
 }
 
-void sub_08058D34() {
+void sub_08058D34(void) {
     u16 tmp;
     u32 tmp2;
     LoadPaletteGroup(0x28);

src/manager/managerF.c

@@ -284,7 +284,7 @@ void sub_08059220(ManagerF* this) {
     }
 }
 
-void sub_08059278() {
+void sub_08059278(void) {
     ManagerF* tmp;
     tmp = (ManagerF*)FindEntityByID(0x9, 0xF, 0x6);
     if (tmp) {