Merge branch 'master' into m4a

21 files changed, 61 insertions, 93 deletions

diff --git a/src/manager/manager1.c b/src/manager/manager1.c
index 2b06a48f..45e1b000 100644
--- a/src/manager/manager1.c
+++ b/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*);
diff --git a/src/manager/manager15.c b/src/manager/manager15.c
index 87135c56..295f14c7 100644
--- a/src/manager/manager15.c
+++ b/src/manager/manager15.c
@@ -1,4 +1,5 @@
 #include "global.h"
+#include "audio.h"
 #include "flags.h"
 #include "screen.h"
 #include "manager.h"
@@ -78,15 +79,15 @@ extern Entity gUnk_080E4C08;
 
 void sub_0805A370(Manager15* this) {
     if (this->manager.unk_0d) {
-        LoadRoomEntityList(&gUnk_080E4C08);
+        LoadRoomEntityList((EntityData*)&gUnk_080E4C08);
         this->manager.action = 3;
-        SoundReq(0x80100000);
+        SoundReq(SONG_RESET_UNK);
     }
 }
 
 void sub_0805A394(Manager15* this) {
     Entity* ent;
-    if ((ent = FindEntityInListBySubtype(0x3, 0x13, 0x4))) {
+    if ((ent = FindEntityByID(0x3, 0x13, 0x4))) {
         if (ent->type != 4) {
             return;
         }
@@ -251,10 +252,10 @@ void sub_0805A664(Manager15* this) {
     sub_0805A68C(this);
 }
 
-extern u32 sub_0806FBFC(u32, u32, u32, u32);
+extern u32 CheckPlayerProximity(u32, u32, u32, u32);
 
 void sub_0805A68C(Manager15* this) {
-    if (sub_0806FBFC(this->unk_38 - 0x18, this->unk_3a - 0x18, 0x30, 0x30)) {
+    if (CheckPlayerProximity(this->unk_38 - 0x18, this->unk_3a - 0x18, 0x30, 0x30)) {
         if (this->unk_2c <= 0x1007) {
             gScreen.controls.alphaBlend = ++this->unk_2c;
             this->unk_22 = 0;
@@ -285,7 +286,7 @@ void sub_0805A6E8(Manager15* this) {
 }
 
 u32 sub_0805A73C(Manager15* this) {
-    return sub_0806FBFC(this->unk_38 - 0x6, this->unk_3a - 0x6, 0xC, 0xC);
+    return CheckPlayerProximity(this->unk_38 - 0x6, this->unk_3a - 0x6, 0xC, 0xC);
 }
 
 void sub_0805A758(Manager15* this) {
@@ -295,7 +296,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 +364,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);
diff --git a/src/manager/manager1A.c b/src/manager/manager1A.c
index 19a1dbca..379ac5b9 100644
--- a/src/manager/manager1A.c
+++ b/src/manager/manager1A.c
@@ -4,6 +4,7 @@
 #include "entity.h"
 #include "room.h"
 #include "screen.h"
+#include "utils.h"
 #include "functions.h"
 
 typedef struct {
@@ -30,7 +31,7 @@ void sub_0805B030(Manager1A* this) {
 }
 
 extern void sub_08052D74(void*, void*, void*);
-extern u32 sub_0806FBFC(u32, u32, u32, u32);
+extern u32 CheckPlayerProximity(u32, u32, u32, u32);
 
 typedef struct struct_08108764 {
     u8 unk_00;
@@ -65,13 +66,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];
@@ -138,7 +138,7 @@ void sub_0805B168(Manager1A* this) {
 
 u32 sub_0805B1CC(Manager1A* this) {
     u32 re = 0;
-    if (sub_0806FBFC(this->unk_20, this->unk_22, this->unk_24, this->unk_26)) {
+    if (CheckPlayerProximity(this->unk_20, this->unk_22, this->unk_24, this->unk_26)) {
         if ((gPlayerState.flags.all & 0x4) && (gPlayerState.flags.all & 0x1)) {
             gPlayerState.flags.all |= 0x8000;
         } else if (gPlayerState.flags.all & 0x8000) {
@@ -224,5 +224,5 @@ void sub_0805B390(u32 unk1) {
     tmp->type = 0x9;
     tmp->subtype = 0x1A;
     tmp->unk_0a = unk1;
-    AppendEntityToList(tmp, 6);
+    AppendEntityToList((Entity*)tmp, 6);
 }
diff --git a/src/manager/manager1E.c b/src/manager/manager1E.c
index 363c3113..fad34ef4 100644
--- a/src/manager/manager1E.c
+++ b/src/manager/manager1E.c
@@ -1,7 +1,6 @@
 #include "global.h"
 #include "manager.h"
 #include "flags.h"
-#include "player.h"
 #include "functions.h"
 
 typedef struct {
@@ -17,7 +16,6 @@ typedef struct {
 
 enum Manager1E_State { Init, ObserveRegion };
 
-void Manager1E_Handler(Manager1E*);
 void Manager1E_Init(Manager1E*);
 void Manager1E_ObserveRegion(Manager1E*);
 
diff --git a/src/manager/manager2.c b/src/manager/manager2.c
index 56c81310..b6e0eef7 100644
--- a/src/manager/manager2.c
+++ b/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) {
diff --git a/src/manager/manager20.c b/src/manager/manager20.c
index b8a20f5f..f7ca8a0b 100644
--- a/src/manager/manager20.c
+++ b/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);
 }
diff --git a/src/manager/manager27.c b/src/manager/manager27.c
index b2e0e15a..6540c1ad 100644
--- a/src/manager/manager27.c
+++ b/src/manager/manager27.c
@@ -1,10 +1,10 @@
 #include "global.h"
+#include "audio.h"
 #include "entity.h"
 #include "flags.h"
 #include "functions.h"
 
 extern u32 sub_0805C920(Entity*);
-extern void LoadPaletteGroup(u32);
 
 void sub_0805C874(Entity*);
 void sub_0805C894(Entity*);
@@ -42,7 +42,7 @@ void sub_0805C894(Entity* this) {
     if (sub_0805C920(this)) {
         this->action = 2;
         this->actionDelay = 1;
-        SoundReq(0x11a);
+        SoundReq(SFX_EM_ARMOS_ON);
     }
 }
 
@@ -58,7 +58,7 @@ void sub_0805C8B4(Entity* this) {
         }
         LoadPaletteGroup(gUnk_08108D20[this->field_0xf]);
         if (this->field_0xf == 0) {
-            SoundReq(0x11a);
+            SoundReq(SFX_EM_ARMOS_ON);
         }
     }
     if (sub_0805C920(this) == 0) {
diff --git a/src/manager/manager28.c b/src/manager/manager28.c
index af59e09e..1e2eb829 100644
--- a/src/manager/manager28.c
+++ b/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*);
@@ -47,7 +46,7 @@ void Manager28_Init(Manager28* this) {
                 /*     tmp3->enemies[tmp4] = this->enemies[tmp4]; */
                 /* } */
                 tmp3->d = this->d;
-                AppendEntityToList(tmp3, 6);
+                AppendEntityToList((Entity*)tmp3, 6);
             }
         }
         DeleteManager(&this->manager);
@@ -86,10 +85,10 @@ u32 Manager28_FindMatchingEntities(Manager28* this) {
     EntityData* tmp = GetCurrentRoomProperty(this->manager.unk_0b);
     if (!tmp)
         return 0;
-    for (; *((u8*)tmp) != 0xFF && !(tmp->type == 9 && tmp->subtype == 0x28); tmp++) {
+    for (; *((u8*)tmp) != 0xFF && !(tmp->kind == 9 && tmp->id == 0x28); tmp++) {
         Entity* tmp2;
         u32 i;
-        if (tmp->type != 3)
+        if (tmp->kind != 3)
             continue;
         tmp2 = Manager28_FindMatchingEntity(tmp);
         if (!tmp2)
@@ -115,7 +114,7 @@ Entity* Manager28_FindMatchingEntity(EntityData* unk1) {
     y = unk1->yPos + gRoomControls.roomOriginY;
     tmp = &gUnk_03003D90;
     for (i = tmp->first; (u32)i != (u32)tmp; i = i->next) {
-        if (x == i->x.HALF.HI && y == i->y.HALF.HI && unk1->subtype == i->id && 3 == i->kind && unk1->form == i->type) {
+        if (x == i->x.HALF.HI && y == i->y.HALF.HI && unk1->id == i->id && 3 == i->kind && unk1->type == i->type) {
             return i;
         }
     }
diff --git a/src/manager/manager3.c b/src/manager/manager3.c
index 5234f149..acd83825 100644
--- a/src/manager/manager3.c
+++ b/src/manager/manager3.c
@@ -4,8 +4,11 @@
 #include "area.h"
 #include "room.h"
 #include "player.h"
+#include "random.h"
 #include "functions.h"
 
+// Facilitates the usage of minish portals.
+
 typedef struct {
     Manager manager;
     u32 unk_20;
@@ -21,7 +24,7 @@ typedef struct {
 } Manager3;
 
 extern s8 gUnk_08107C6C[];
-extern u32 sub_0806FBFC(u32, u32, u32, u32);
+extern u32 CheckPlayerProximity(u32, u32, u32, u32);
 extern u32 sub_08057810(void);
 extern u32 sub_080002C0(u16, u16, u8);
 extern void sub_080577AC(u32, u32, u32);
@@ -34,14 +37,14 @@ void sub_080576C0(Manager3* this) {
         this->unk_24 = this->unk_3a + gRoomControls.roomOriginY - 0x20;
         return;
     }
-    if (sub_0806FBFC(this->unk_20, this->unk_24, 0x40, 0x40)) {
-        gArea.field_0x12 = this->unk_20 + 0x20;
-        gArea.field_0x14 = this->unk_24 + 0x20 + gUnk_08107C6C[this->manager.unk_0a];
-        gArea.field_0x16 = this->unk_34;
-        gArea.field_0x17 = this->manager.unk_0a;
+    if (CheckPlayerProximity(this->unk_20, this->unk_24, 0x40, 0x40)) {
+        gArea.curPortalX = this->unk_20 + 0x20;
+        gArea.curPortalY = this->unk_24 + 0x20 + gUnk_08107C6C[this->manager.unk_0a];
+        gArea.curPortalExitDirection = this->unk_34;
+        gArea.curPortalType = this->manager.unk_0a;
         if (!CheckGlobalFlag(EZERO_1ST)) {
             gArea.field_0x18 = 1;
-            gArea.field_0x17 = 5;
+            gArea.curPortalType = 5;
         } else {
             if ((gPlayerState.flags.all & 0x20) && gPlayerState.jumpStatus == 0) {
                 gArea.field_0x18 = 2;
@@ -90,7 +93,7 @@ void sub_080577AC(u32 baseX, u32 baseY, u32 layer) {
 }
 
 u32 sub_08057810(void) {
-    if ((gPlayerState.flags.all & 0x80) && !gPlayerState.field_0xaa && (gArea.field_0x17 != 0x6) &&
+    if ((gPlayerState.flags.all & 0x80) && !gPlayerState.field_0xaa && (gArea.curPortalType != 0x6) &&
         (gPlayerState.heldObject == 0)) {
         switch (gPlayerState.field_0xa8) {
             case 0:
diff --git a/src/manager/manager30.c b/src/manager/manager30.c
index 8cfde746..94f3be33 100644
--- a/src/manager/manager30.c
+++ b/src/manager/manager30.c
@@ -1,4 +1,5 @@
 #include "global.h"
+#include "audio.h"
 #include "manager.h"
 #include "flags.h"
 #include "functions.h"
@@ -19,8 +20,6 @@ typedef struct Manager30 {
     u16 flag_reset;
 } Manager30;
 
-extern void sub_0807B7D8(u32, u32, u32);
-
 enum { INIT, IN_PROGRESS, FAILED, SUCCEEDED };
 
 /*
@@ -48,13 +47,13 @@ void Manager30_Main(Manager30* this) {
                     case 0x317:
                         // stepped on a red tile again
                         this->manager.action = FAILED;
-                        SoundReq(0x6d);
+                        SoundReq(SFX_MENU_ERROR);
                         break;
                     case 0x318:
                         // stepped on a blue tile
                         // turn the tile into a red tile
                         sub_0807B7D8(0x317, this->player_current_tile, this->manager.unk_0b);
-                        SoundReq(0x6b);
+                        SoundReq(SFX_6B);
                         // decrease the number of remaining tiles and check if we're done
                         if (--this->manager.unk_0e == 0) {
                             this->manager.action = SUCCEEDED;
@@ -89,7 +88,7 @@ void Manager30_Main(Manager30* this) {
                     SetFlag(this->flag_succeeded);
                 }
             } else {
-                SoundReq(0x72);
+                SoundReq(SFX_SECRET);
             }
     }
 }
diff --git a/src/manager/manager39.c b/src/manager/manager39.c
index 31cbda7e..cdac7c61 100644
--- a/src/manager/manager39.c
+++ b/src/manager/manager39.c
@@ -3,6 +3,8 @@
 #include "screen.h"
 #include "area.h"
 #include "textbox.h"
+#include "utils.h"
+#include "game.h"
 #include "functions.h"
 
 typedef struct {
@@ -25,9 +27,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 +68,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 +81,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;
diff --git a/src/manager/manager4.c b/src/manager/manager4.c
index 2ebdf7d3..3d396682 100644
--- a/src/manager/manager4.c
+++ b/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) {
diff --git a/src/manager/manager5.c b/src/manager/manager5.c
index ec7ee400..fbb4da2e 100644
--- a/src/manager/manager5.c
+++ b/src/manager/manager5.c
@@ -1,4 +1,5 @@
 #include "global.h"
+#include "audio.h"
 #include "manager.h"
 #include "flags.h"
 #include "functions.h"
@@ -34,8 +35,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;
@@ -71,14 +70,14 @@ void sub_08057BA4(Manager5* this) {
         sub_08057CA4(this, this->unk_28, this->unk_2a);
         sub_0807B7D8(this->unk_30, this->unk_38 | (this->unk_3a << 6), this->unk_3c);
         this->manager.unk_0f++;
-        SoundReq(0x71);
+        SoundReq(SFX_HEART_GET);
     } else {
         if (!this->manager.unk_0f)
             return;
         sub_0807BA8C(this->unk_38 | (this->unk_3a << 6), this->unk_3c);
         sub_08057CA4(this, this->unk_2c, this->unk_2e);
         this->manager.unk_0f--;
-        SoundReq(0x71);
+        SoundReq(SFX_HEART_GET);
     }
 }
 
@@ -95,10 +94,10 @@ void sub_08057C28(Manager5* this) {
             sub_08057CA4(this, this->unk_28, this->unk_2a);
             sub_0807B7D8(this->unk_30, this->unk_38 | (this->unk_3a << 6), this->unk_3c);
             this->manager.unk_0f++;
-            SoundReq(0x71);
+            SoundReq(SFX_HEART_GET);
         } else {
             if (this->unk_30 != 0x323) {
-                SoundReq(0x72);
+                SoundReq(SFX_SECRET);
             }
             DeleteManager(&this->manager);
         }
diff --git a/src/manager/manager6.c b/src/manager/manager6.c
index aa5cb48a..ff32b405 100644
--- a/src/manager/manager6.c
+++ b/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(&this->manager);
             return;
         }
     }
diff --git a/src/manager/manager7.c b/src/manager/manager7.c
index 3a2cbb1a..089dab1b 100644
--- a/src/manager/manager7.c
+++ b/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[];
 
diff --git a/src/manager/manager8.c b/src/manager/manager8.c
index c6cd5075..aa80b627 100644
--- a/src/manager/manager8.c
+++ b/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) {
diff --git a/src/manager/manager9.c b/src/manager/manager9.c
index 70d117fb..aebc9a96 100644
--- a/src/manager/manager9.c
+++ b/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[];
diff --git a/src/manager/managerA.c b/src/manager/managerA.c
index 3033dd21..4b4a2ce4 100644
--- a/src/manager/managerA.c
+++ b/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*);
diff --git a/src/manager/managerB.c b/src/manager/managerB.c
index e6e43a12..ca298178 100644
--- a/src/manager/managerB.c
+++ b/src/manager/managerB.c
@@ -4,6 +4,7 @@
 #include "entity.h"
 #include "room.h"
 #include "area.h"
+#include "utils.h"
 #include "functions.h"
 
 /*
@@ -128,8 +129,8 @@ ManagerBHelper* CreateHelper(Manager* this) {
         extra->manager.unk_0a = 1;
         extra->manager.parent = this;
         this->unk_0e++;
-        MemClear32(&extra->enemies, 0x20);
-        AppendEntityToList(extra, 8);
+        MemClear(&extra->enemies, 0x20);
+        AppendEntityToList((Entity*)extra, 8);
     }
     return extra;
 }
diff --git a/src/manager/managerC.c b/src/manager/managerC.c
index 72529c2f..83b35412 100644
--- a/src/manager/managerC.c
+++ b/src/manager/managerC.c
@@ -1,11 +1,11 @@
 #include "global.h"
+#include "audio.h"
 #include "manager.h"
 #include "flags.h"
 #include "structures.h"
 #include "room.h"
-#include "area.h"
 #include "screen.h"
-#include "trig.h"
+#include "coord.h"
 #include "functions.h"
 #include "save.h"
 
@@ -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) {
@@ -100,7 +97,7 @@ void sub_080588F8(ManagerC* this) {
                 case 0xf0:
                     this->unk_28 = this->unk_24.HALF.HI;
                     this->manager.unk_0f = 0x2D;
-                    SoundReq(0x8c);
+                    SoundReq(SFX_BARREL_ROLL_STOP);
             }
         }
     } else {
@@ -123,7 +120,7 @@ void sub_080588F8(ManagerC* this) {
             }
             if (ABS_DIFF_GT(this->unk_2c, this->unk_24.WORD, 0x100000)) {
                 this->unk_2c = this->unk_24.WORD;
-                SoundReq(0x8b);
+                SoundReq(SFX_BARREL_ROLL);
             }
         }
     }
@@ -213,7 +210,7 @@ void sub_08058B5C(ManagerC* this, u32 unk1) {
     gScreenTransition.playerStartPos.HALF.x = gUnk_081082E8[unk1 * 3];
     gScreenTransition.playerStartPos.HALF.y = gUnk_081082E8[unk1 * 3 + 1];
     gSave.unk7 = gUnk_081082E8[unk1 * 3 + 2];
-    SoundReq(0x121);
+    SoundReq(SFX_STAIRS);
 }
 
 void sub_08058BC8(ManagerC* this) {
diff --git a/src/manager/managerE.c b/src/manager/managerE.c
index 0f5e9328..44bfb5a7 100644
--- a/src/manager/managerE.c
+++ b/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) {