big cleanup part 1

src/manager/manager1.c

@@ -1,12 +1,11 @@
 #include "global.h"
 #include "entity.h"
 #include "screen.h"
+#include "functions.h"
 
-extern void LoadGfxGroup(u32);
 extern void sub_08056250(void);
 extern void sub_080570B8(Entity*);
 void sub_080570F8(void);
-extern void sub_08052D74(void*, void*, void*);
 
 extern void (*const gUnk_08107C5C[])(Entity*);
 extern void (*const gUnk_08107C48[])(Entity*);

src/manager/manager15.c

@@ -295,7 +295,6 @@ void sub_0805A758(Manager15* this) {
 }
 
 extern void sub_0805E4E0(Manager*, u32);
-extern void sub_08077B20(void);
 
 void sub_0805A76C(Manager15* this) {
     if ((gPlayerEntity.currentHealth != 0) && (gPlayerEntity.height.HALF.HI == 0) && (!gPlayerState.field_0x2c)) {
@@ -364,7 +363,6 @@ void sub_0805A804(Manager15* this) {
 }
 
 void sub_0805AAC8(Manager15*);
-extern void sub_08052D74(void*, void*, void*);
 
 void sub_0805A89C(Manager15* this) {
     sub_0805E3A0(this, 6);

src/manager/manager1A.c

@@ -4,6 +4,7 @@
 #include "entity.h"
 #include "room.h"
 #include "screen.h"
+#include "dma.h"
 #include "functions.h"
 
 typedef struct {
@@ -29,7 +30,6 @@ void sub_0805B030(Manager1A* this) {
     gUnk_08108668[this->manager.action](this);
 }
 
-extern void sub_08052D74(void*, void*, void*);
 extern u32 sub_0806FBFC(u32, u32, u32, u32);
 
 typedef struct struct_08108764 {
@@ -65,13 +65,12 @@ u32 sub_0805B1CC(Manager1A*);
 void sub_0805B210(Manager1A*);
 void sub_0805B2B0(Manager1A*);
 void sub_0805B328(Manager1A*);
-void sub_0805BC4C(void);
 
 void sub_0805B048(Manager1A* this) {
     struct_08108764* tmp;
     Entity* obj;
     sub_0805E3A0(&this->manager, 6);
-    MemClear32(&this->unk_20, 0x20);
+    MemClear(&this->unk_20, 0x20);
     this->manager.action = 1;
     this->unk_3f = gRoomControls.roomID;
     tmp = &gUnk_08108764[this->manager.unk_0a];

src/manager/manager1E.c

@@ -17,7 +17,6 @@ typedef struct {
 
 enum Manager1E_State { Init, ObserveRegion };
 
-void Manager1E_Handler(Manager1E*);
 void Manager1E_Init(Manager1E*);
 void Manager1E_ObserveRegion(Manager1E*);
 

src/manager/manager2.c

@@ -1,9 +1,9 @@
 #include "global.h"
 #include "entity.h"
 #include "screen.h"
+#include "functions.h"
 
 extern void sub_080576A0();
-extern void sub_08052D74();
 extern void sub_0805754C(Entity*);
 
 void Manager2(Entity* this) {

src/manager/manager20.c

@@ -3,6 +3,7 @@
 #include "flags.h"
 #include "entity.h"
 #include "room.h"
+#include "functions.h"
 
 typedef struct {
     Manager manager;
@@ -17,8 +18,6 @@ typedef struct {
     u16 unk_3e;
 } Manager20;
 
-extern void DeleteManager(Manager20*);
-
 void sub_0805B7A0(Manager20* this) {
     Entity* tmp = CreateObject(this->manager.unk_0e, this->manager.unk_0a, this->manager.unk_0b);
     if (!tmp)
@@ -35,5 +34,5 @@ void sub_0805B7A0(Manager20* this) {
     }
     tmp->x.HALF.HI += gRoomControls.roomOriginX;
     tmp->y.HALF.HI += gRoomControls.roomOriginY;
-    DeleteManager(this);
+    DeleteManager((Manager*)this);
 }

src/manager/manager27.c

@@ -4,7 +4,6 @@
 #include "functions.h"
 
 extern u32 sub_0805C920(Entity*);
-extern void LoadPaletteGroup(u32);
 
 void sub_0805C874(Entity*);
 void sub_0805C894(Entity*);

src/manager/manager28.c

@@ -11,7 +11,6 @@ typedef struct {
     } d;
 } Manager28;
 
-void Manager28_Entry(Manager28*);
 void Manager28_Init(Manager28*);
 void Manager28_Main(Manager28*);
 u32 Manager28_FindMatchingEntities(Manager28*);

src/manager/manager30.c

@@ -19,8 +19,6 @@ typedef struct Manager30 {
     u16 flag_reset;
 } Manager30;
 
-extern void sub_0807B7D8(u32, u32, u32);
-
 enum { INIT, IN_PROGRESS, FAILED, SUCCEEDED };
 
 /*

src/manager/manager39.c

@@ -3,6 +3,7 @@
 #include "screen.h"
 #include "area.h"
 #include "textbox.h"
+#include "dma.h"
 #include "functions.h"
 
 typedef struct {
@@ -25,9 +26,7 @@ extern const u8 gUnk_08108E30[0x18];
 extern const u8 gUnk_08108E48[0x18];
 extern const u8 gUnk_08108E60[];
 
-extern void MemCopy(const void* src, void* dest, u32 size);
 extern void sub_0805F46C(void*, const void*);
-extern u32 CheckIsDungeon(void);
 extern void sub_0805E5B4(void);
 
 void sub_0805E140(Manager39*);
@@ -68,7 +67,7 @@ void sub_0805E18C(Manager39* this) {
 }
 
 void sub_0805E1D8(Manager39* this) {
-    MemClear32(&gUnk_02034DF0, 0x80);
+    MemClear(&gUnk_02034DF0, 0x80);
     gScreen.bg.bg0Updated = 1;
     DeleteThisEntity();
 }
@@ -81,7 +80,7 @@ void sub_0805E1F8(u32 unk0, u32 unk1) {
         u8 unk_06[3];
     } PACKED tmp;
     const u8* tmp2;
-    MemClear32(&gUnk_02034DF0, 0x80);
+    MemClear(&gUnk_02034DF0, 0x80);
     MemCopy(gUnk_08108E60, &tmp, sizeof(tmp));
     tmp.unk_04 = unk0 >> 8;
     tmp.unk_05 = unk0;

src/manager/manager4.c

@@ -3,6 +3,7 @@
 #include "room.h"
 #include "manager.h"
 #include "structures.h"
+#include "functions.h"
 
 extern void (*gUnk_08107C70[])(Manager*);
 
@@ -12,8 +13,6 @@ void sub_08057854(Manager* this) {
 
 extern void sub_080805F8(void);
 
-extern void SetTile(u32, u32, u32);
-
 extern DiggingCaveEntrance* sub_08057AA8(DiggingCaveEntrance*, int);
 
 void sub_0805786C(Manager* this) {
@@ -101,8 +100,6 @@ u32 sub_0805795C(Manager* this, DiggingCaveEntrance* entr) {
 }
 #endif
 
-extern void sub_0805E5A8(void);
-extern void DeleteManager(Manager*);
 extern void sub_08080930();
 
 void sub_08057A18(Manager* this, DiggingCaveEntrance* entr) {

src/manager/manager5.c

@@ -34,8 +34,6 @@ void sub_08057AD0(Manager5* this) {
 
 void sub_08057CA4(Manager5*, u32, u32);
 
-extern void DeleteManager(Manager*);
-
 void sub_08057AE8(Manager5* this) {
     u32 tmp;
     tmp = (this->manager.unk_0b & 0x3) << 1;

src/manager/manager6.c

@@ -1,12 +1,9 @@
 #include "global.h"
-#include "entity.h"
 #include "player.h"
 #include "manager.h"
+#include "functions.h"
 
-extern void* GetCurrentRoomProperty(u8);
-extern u32 CheckPlayerInRegion(u16, u16, u8, u8);
 extern void DoExitTransition(void*);
-extern void DeleteManager(Entity*);
 
 void sub_08057CB4(Manager6* this) {
     u32 tmp;
@@ -15,7 +12,7 @@ void sub_08057CB4(Manager6* this) {
         this->manager.action = 1;
         this->warpList = GetCurrentRoomProperty(this->manager.unk_0a);
         if (!this->warpList) {
-            DeleteManager((Entity*)this);
+            DeleteManager((Manager*)this);
             return;
         }
     }

src/manager/manager7.c

@@ -12,12 +12,9 @@ typedef struct {
 
 void sub_08057E30();
 u32 sub_08057E40();
-void sub_08057E64();
 void sub_08057E7C(u32);
 
-extern void sub_08052D74();
 extern u32 sub_08056300(const u16*);
-extern void sub_0805E3A0();
 
 extern const u8 gGlobalGfxAndPalettes[];
 

src/manager/manager8.c

@@ -17,8 +17,6 @@ void sub_08057EFC();
 void sub_08058034(void);
 void sub_08058084(u16*, u16*);
 
-extern void sub_08052D74(void*, void*, void*);
-
 extern u16 gMapDataTopSpecial[];
 
 void sub_08057ED0(Manager8* this) {

src/manager/manager9.c

@@ -15,7 +15,6 @@ void sub_08058210(Manager9*);
 u32 sub_08058244(int);
 void sub_080582A0(u32, u32*, u8*);
 void sub_080582F8(u8*, u8*);
-void sub_08058324();
 
 extern u32 gUnk_02006F00[];
 extern u8 gBG3Buffer[];

src/manager/managerA.c

@@ -4,6 +4,7 @@
 #include "manager.h"
 #include "flags.h"
 #include "area.h"
+#include "functions.h"
 
 void sub_08058398(ManagerA*);
 void sub_080583EC(ManagerA*);
@@ -17,8 +18,6 @@ void sub_08058380(ManagerA* this) {
     gUnk_081081F4[this->manager.action](this);
 }
 
-extern void sub_0805E3A0(Manager*, u32);
-
 void sub_08058398(ManagerA* this) {
 
     if (CheckFlags(this->unk_3c) != 0) {
@@ -36,8 +35,6 @@ void sub_08058398(ManagerA* this) {
     }
 }
 
-void sub_08058408(ManagerA*);
-
 void sub_080583EC(ManagerA* this) {
     if (CheckFlags(this->unk_3e) != 0) {
         this->manager.action = 2;
@@ -45,12 +42,8 @@ void sub_080583EC(ManagerA* this) {
     }
 }
 
-extern u32 CheckPlayerInRegion(u32, u32, u32, u32);
 extern void sub_0805E544(void);
-extern void sub_08078A90(u32);
-extern void sub_08078AA8(u32, u32);
 extern void sub_080186C0(u16);
-extern void sub_08078B48(void);
 
 u32 sub_0805848C(ManagerA*);
 void sub_080585DC(ManagerA*);

src/manager/managerB.c

@@ -4,6 +4,7 @@
 #include "entity.h"
 #include "room.h"
 #include "area.h"
+#include "dma.h"
 #include "functions.h"
 
 /*
@@ -128,7 +129,7 @@ ManagerBHelper* CreateHelper(Manager* this) {
         extra->manager.unk_0a = 1;
         extra->manager.parent = this;
         this->unk_0e++;
-        MemClear32(&extra->enemies, 0x20);
+        MemClear(&extra->enemies, 0x20);
         AppendEntityToList(extra, 8);
     }
     return extra;

src/manager/managerC.c

@@ -40,12 +40,9 @@ void sub_08058A04(ManagerC*);
 void sub_080588F8(ManagerC*);
 u32 sub_08058B08(ManagerC*, u32, u32, const struct_08108228*);
 void sub_08058B5C(ManagerC*, u32);
-void sub_08058D34(void);
 
 extern void sub_0805622C(struct BgAffineDstData*, u32, u32);
-extern void sub_08052D74(void*, void*, void*);
 extern void sub_080044AE(Entity*, u32, u32);
-extern void MemCopy(const void* src, void* dest, u32 size);
 
 extern u8 gUnk_03003DE4[0xC];
 
@@ -88,7 +85,7 @@ void sub_080588CC(ManagerC* this) {
 void nullsub_108(ManagerC* this) {
 }
 
-#define ABS_DIFF_GT(a, b, c) (signed)a - b >= 0 ? a - b > c : b - a > c
+#define ABS_DIFF_GT(a, b, c) ((signed)(a) - (b) >= 0 ? (a) - (b) > (c) : (b) - (a) > (c))
 
 void sub_080588F8(ManagerC* this) {
     if (this->manager.unk_0f == 0) {

src/manager/managerE.c

@@ -3,13 +3,7 @@
 #include "manager.h"
 #include "flags.h"
 #include "room.h"
-
-extern void LoadRoomEntityList(Entity*);
-extern void DeleteThisEntity(void);
-extern void DeleteManager(Manager*);
-extern void sub_08078A90(u32);
-extern void sub_08078B48(void);
-extern void SoundReq(u32);
+#include "functions.h"
 
 void sub_08058E60(ManagerE* this) {
     if (!this->manager.action) {