Rename main manager functions

src/manager/manager1.c

@@ -12,7 +12,7 @@ extern void (*const gUnk_08107C48[])(Entity*);
 
 extern u8 gUnk_08107C40[];
 
-void Manager1(Entity* this) {
+void Manager1_Main(Entity* this) {
     u8 bVar1;
     u8* pbVar2;
 

src/manager/manager11.c

@@ -2,7 +2,7 @@
 #include "manager.h"
 #include "flags.h"
 
-void sub_080599B8(Manager11* this) {
+void Manager11_Main(Manager11* this) {
     if (!this->manager.action) {
         this->manager.action = 1;
         if (CheckFlags(this->unk_3c)) {

src/manager/manager15.c

@@ -28,7 +28,7 @@ typedef struct {
 
 extern void (*const gUnk_081085D8[])(Manager*);
 
-void sub_0805A280(Manager* this) {
+void Manager15_Main(Manager* this) {
     gUnk_081085D8[this->unk_0a](this);
 }
 
@@ -477,7 +477,7 @@ void sub_0805AA58(Manager15* this) {
 
 void sub_0805AAC8(Manager15* this) {
     sub_0805AAF0(this->unk_23);
-    sub_0805A280(&this->manager);
+    Manager15_Main(&this->manager);
 }
 
 extern u16 gUnk_08108648[];

src/manager/manager1A.c

@@ -27,7 +27,7 @@ extern void (*const gUnk_08108668[])(Manager1A*);
 
 extern u8 gGlobalGfxAndPalettes[];
 
-void sub_0805B030(Manager1A* this) {
+void Manager1A_Main(Manager1A* this) {
     gUnk_08108668[this->manager.action](this);
 }
 

src/manager/manager1E.c

@@ -21,7 +21,7 @@ void Manager1E_ObserveRegion(Manager1E*);
 
 void (*const Manager1E_ActionFuncs[2])(Manager1E*) = { Manager1E_Init, Manager1E_ObserveRegion };
 
-void Manager1E_Handler(Manager1E* this) {
+void Manager1E_Main(Manager1E* this) {
     Manager1E_ActionFuncs[this->manager.action](this);
 }
 

src/manager/manager2.c

@@ -6,7 +6,7 @@
 extern void sub_080576A0();
 extern void sub_0805754C(Entity*);
 
-void Manager2(Entity* this) {
+void Manager2_Main(Entity* this) {
     if (this->action == 0) {
         this->action = 1;
         gScreen.affine.bg3Updated = 0;

src/manager/manager20.c

@@ -18,7 +18,7 @@ typedef struct {
     u16 unk_3e;
 } Manager20;
 
-void sub_0805B7A0(Manager20* this) {
+void Manager20_Main(Manager20* this) {
     Entity* tmp = CreateObject(this->manager.unk_0e, this->manager.unk_0a, this->manager.unk_0b);
     if (!tmp)
         return;

src/manager/manager26.c

@@ -22,7 +22,7 @@ void (*const gUnk_08108D04[])(Manager26*) = { sub_0805C6D0, sub_0805C7A0, sub_08
 
 void sub_0805C7CC(Manager26*);
 
-void sub_0805C6B8(Manager26* this) {
+void Manager26_Main(Manager26* this) {
     gUnk_08108D04[this->manager.action](this);
 }
 

src/manager/manager27.c

@@ -15,7 +15,7 @@ void (*const gUnk_08108D10[])(Entity*) = { sub_0805C874, sub_0805C894, sub_0805C
 
 const u8 gUnk_08108D20[] = { 0x6F, 0x70, 0x71, 0x72, 0x71, 0x70 };
 
-void Manager27(Entity* this) {
+void Manager27_Main(Entity* this) {
 
     gUnk_08108D10[this->action](this);
     if (CheckLocalFlagByOffset(0x300, this->type + 0x67)) {

src/manager/manager28.c

@@ -12,18 +12,18 @@ typedef struct {
 } Manager28;
 
 void Manager28_Init(Manager28*);
-void Manager28_Main(Manager28*);
+void Manager28_Main2(Manager28*);
 u32 Manager28_FindMatchingEntities(Manager28*);
 Entity* Manager28_FindMatchingEntity(EntityData*);
 void Manager28_RemoveDeletedEntities(Manager28*);
 
-void (*const Manager28_ActionFuncs[])(Manager28*) = { Manager28_Init, Manager28_Main };
+void (*const Manager28_ActionFuncs[])(Manager28*) = { Manager28_Init, Manager28_Main2 };
 
 enum Manager28_Action { Init = 0, Main = 1 };
 
 enum Manager28_InitState { DoInit = 0, DoNotInit = 1 };
 
-void Manager28_Entry(Manager28* this) {
+void Manager28_Main(Manager28* this) {
     Manager28_ActionFuncs[this->manager.action](this);
 }
 
@@ -56,7 +56,7 @@ void Manager28_Init(Manager28* this) {
     }
 }
 
-void Manager28_Main(Manager28* this) {
+void Manager28_Main2(Manager28* this) {
     s32 n;
     s32 i;
     s32 j;

src/manager/manager2E.c

@@ -4,7 +4,7 @@
 extern void (*const gUnk_08108D3C[])(Entity*);
 extern void (*const gUnk_08108D44[])(Entity*);
 
-void sub_0805D250(Entity* this) {
+void Manager2E_Main(Entity* this) {
     gUnk_08108D3C[this->type](this);
 }
 

src/manager/manager3.c

@@ -30,7 +30,7 @@ extern u32 sub_08057810(void);
 extern u32 sub_080002C0(u16, u16, u8);
 extern void sub_080577AC(u32, u32, u32);
 
-void sub_080576C0(Manager3* this) {
+void Manager3_Main(Manager3* this) {
     s8 tmp;
     if (this->manager.action == 0) {
         this->manager.action = 1;

src/manager/manager39.c

@@ -35,7 +35,7 @@ void sub_0805E18C(Manager39*); // unused?
 void sub_0805E1D8(Manager39*);
 void sub_0805E1F8(u32, u32);
 
-void sub_0805E0FC(Manager39* this) {
+void Manager39_Main(Manager39* this) {
     gUnk_08108E28[this->manager.action](this);
     if ((gRoomControls.roomID != this->unk_20) || (gTextBox.doTextBox & 0x7F)) {
         sub_0805E1D8(this);

src/manager/manager4.c

@@ -7,7 +7,7 @@
 
 extern void (*gUnk_08107C70[])(Manager*);
 
-void sub_08057854(Manager* this) {
+void Manager4_Main(Manager* this) {
     gUnk_08107C70[this->action](this);
 }
 

src/manager/manager5.c

@@ -29,7 +29,7 @@ const u16 gUnk_08108034[] = { 0, 1, -1, 0, 0, -1, 1, 0 };
 
 void (*const gUnk_08108044[])(Manager5*) = { sub_08057AE8, sub_08057BA4, sub_08057C28 };
 
-void sub_08057AD0(Manager5* this) {
+void Manager5_Main(Manager5* this) {
     gUnk_08108044[this->manager.action](this);
 }
 

src/manager/manager6.c

@@ -5,7 +5,7 @@
 
 extern void DoExitTransition(void*);
 
-void sub_08057CB4(Manager6* this) {
+void Manager6_Main(Manager6* this) {
     u32 tmp;
     Manager6WarpData* i;
     if (this->manager.action == 0) {

src/manager/manager8.c

@@ -19,7 +19,7 @@ void sub_08058084(u16*, u16*);
 
 extern u16 gMapDataTopSpecial[];
 
-void sub_08057ED0(Manager8* this) {
+void Manager8_Main(Manager8* this) {
     sub_08057F20(this);
     if (!this->manager.action) {
         this->manager.action = 1;

src/manager/manager9.c

@@ -20,7 +20,7 @@ extern u32 gUnk_02006F00[];
 
 const u16 gUnk_081081EC[] = { 0x30, 0x30, 0x30, 0x38 };
 
-void sub_080581D8(Manager9* this) {
+void Manager9_Main(Manager9* this) {
     sub_08058210(this);
     if (!this->manager.action) {
         this->manager.action = 1;

src/manager/managerA.c

@@ -14,7 +14,7 @@ void sub_080585B0(ManagerA*);
 
 void (*const gUnk_081081F4[])(ManagerA*) = { sub_08058398, sub_080583EC, sub_08058408, sub_08058514, sub_080585B0 };
 
-void sub_08058380(ManagerA* this) {
+void ManagerA_Main(ManagerA* this) {
     gUnk_081081F4[this->manager.action](this);
 }
 

src/manager/managerB.c

@@ -18,7 +18,7 @@
 
 void (*const ManagerB_ActionFuncs[])(Manager*);
 
-void sub_080585F0(Manager* this) {
+void ManagerB_Main(Manager* this) {
     // make a distincion if this is a controller (volumeMasterTarget = 0) or a helper (volumeMasterTarget = 1)
     ManagerB_ActionFuncs[this->unk_0a](this);
 }
@@ -27,7 +27,7 @@ enum ManagerB_State { Init, WaitForFlag, WaitForDone };
 
 void (*const ManagerB_StateFuncs[])(ManagerB*);
 
-void ManagerB_Main(ManagerB* this) {
+void ManagerB_Main2(ManagerB* this) {
     // make a distinction based on the state of this controller
     ManagerB_StateFuncs[this->manager.action](this);
 }
@@ -192,6 +192,6 @@ void ReplaceMonitoredEntity(Entity* old, Entity* new) {
     }
 }
 
-void (*const ManagerB_ActionFuncs[])(Manager*) = { (void (*)(Manager*))ManagerB_Main,
+void (*const ManagerB_ActionFuncs[])(Manager*) = { (void (*)(Manager*))ManagerB_Main2,
                                                    (void (*)(Manager*))ManagerBHelper_Main };
 void (*const ManagerB_StateFuncs[])(ManagerB*) = { ManagerB_Init, ManagerB_WaitForFlag, ManagerB_WaitForDone };

src/manager/managerC.c

@@ -60,7 +60,7 @@ void nullsub_108(ManagerC*);
 
 void (*const gUnk_0810821C[])(ManagerC*) = { sub_08058894, sub_080588CC, nullsub_108 };
 
-void sub_0805884C(ManagerC* this) {
+void ManagerC_Main(ManagerC* this) {
     u32 tmp;
     gUnk_0810821C[this->manager.action](this);
     sub_08058BC8(this);

src/manager/managerE.c

@@ -6,7 +6,7 @@
 #include "audio.h"
 #include "functions.h"
 
-void sub_08058E60(ManagerE* this) {
+void ManagerE_Main(ManagerE* this) {
     if (!this->manager.action) {
         this->manager.action = 1;
         if (CheckFlags(this->unk_3e)) {