merge

src/manager/manager4.c

@@ -12,7 +12,7 @@ void Manager4_Main(Manager* this) {
     gUnk_08107C70[this->action](this);
 }
 
-extern void sub_080805F8(void);
+extern void UpdateIsDiggingCave(void);
 
 extern DiggingCaveEntrance* sub_08057AA8(DiggingCaveEntrance*, int);
 
@@ -21,8 +21,8 @@ void sub_0805786C(Manager* this) {
     u8 room;
     u8 area;
     u16 uVar = 0x81 << 7;
-    sub_080805F8();
-    if (gUnk_03004030.unk_08 != 0) {
+    UpdateIsDiggingCave();
+    if (gUnk_03004030.isDiggingCave != 0) {
         if (gUnk_03004030.unk_00 == 0) {
             gUnk_03004030.unk_0a = 0xFF;
             room = gRoomControls.room;
@@ -66,7 +66,7 @@ void sub_08057A18(Manager*, DiggingCaveEntrance*);
 u32 sub_0805795C(Manager* this, DiggingCaveEntrance* entr) {
     u16 offsetX, offsetY, offsetX2, offsetY2;
     u32 tmp, tmp2;
-    if (gUnk_03004030.unk_08) {
+    if (gUnk_03004030.isDiggingCave) {
         offsetX = gPlayerEntity.x.HALF.HI - gRoomControls.origin_x;
         offsetY = gPlayerEntity.y.HALF.HI - gRoomControls.origin_y;
         offsetX2 = (entr->unk_00 & 0x3F) * 16 + 8;
@@ -105,10 +105,10 @@ void sub_08057A18(Manager* this, DiggingCaveEntrance* entr) {
     gUnk_03004030.unk_06 = gPlayerEntity.y.HALF.HI - gRoomControls.origin_y - ((entr->unk_00 & 0xFC0) >> 2);
 
 #ifndef EU
-    tmp = gUnk_03004030.unk_08;
+    tmp = gUnk_03004030.isDiggingCave;
     if (!tmp) {
         if ((entr->target_room | 0x80) != gUnk_03004030.unk_0b) {
-            gUnk_02034480.unk_00 = gUnk_03004030.unk_08;
+            gUnk_02034480.unk_00 = gUnk_03004030.isDiggingCave;
         }
         gUnk_03004030.unk_0b = entr->target_room | 0x80;
     }

src/manager/managerB.c

@@ -62,8 +62,9 @@ void ManagerB_WaitForFlag(ManagerB* this) {
 
 void ManagerB_WaitForDone(ManagerB* this) {
     // check if all helpers are done
-    if (this->manager.unk_0e)
+    if (this->manager.unk_0e) {
         return;
+    }
     // set the completion flag for the fight
     SetFlag(this->unk_3e);
     // restore music (if it was set, which apparently is only possible if there's a flag the fight waited for)
@@ -87,25 +88,28 @@ void ManagerB_LoadFight(Manager* this) {
     EntityData* prop;
     Entity* ent;
     u32 counter;
+
     this->action = 2;
     this->unk_0e = 0;
     counter = 0;
     // Create a helper to keep track of the created entities.
     monitor = CreateHelper(this);
-    if (!monitor)
+    if (monitor == NULL) {
         DeleteThisEntity();
+    }
+
     prop = (EntityData*)GetCurrentRoomProperty(this->unk_0b);
-    if (prop) {
-        while (*((u8*)prop) != 0xFF) {
+    if (prop != NULL) {
+        while (prop->kind != 0xFF) {
             ent = LoadRoomEntity(prop++);
-            if (ent && (ent->kind == ENEMY)) {
+            if ((ent != NULL) && (ent->kind == ENEMY)) {
                 ent->field_0x6c.HALF.HI |= 0x40;
                 ManagerBHelper_Monitor(monitor, ent, counter++);
             }
             if (counter >= 7) {
                 counter = 0;
                 monitor = CreateHelper(this);
-                if (!monitor)
+                if (monitor == NULL)
                     return;
             }
         }
@@ -139,27 +143,31 @@ void ManagerBHelper_Monitor(ManagerBHelper* this, Entity* ent, u32 index) {
 // case volumeMasterTarget is 1: The manager is a helper
 
 void ManagerBHelper_Main(Manager* this) {
-    u8 i, anyRemaining;
+    u8 i;
+    bool32 anyRemaining;
     Entity* current;
+
     if (this->action == 0) {
         this->action = 1;
         SetDefaultPriority((Entity*)this, PRIO_NO_BLOCK);
     }
     // go through and check all monitored enemies.
-    anyRemaining = 0;
+    anyRemaining = FALSE;
     for (i = 0; i < 8; i++) {
-        if ((current = ((ManagerBHelper*)this)->enemies[i])) {
-            if (!current->next) {
+        current = ((ManagerBHelper*)this)->enemies[i];
+        if (current != NULL) {
+            if (current->next == NULL) {
                 ((ManagerBHelper*)this)->enemies[i] = 0;
             } else {
-                anyRemaining = 1;
+                anyRemaining = TRUE;
             }
         }
     }
     if (!anyRemaining) {
         // inform the parent that we're done
-        if (((ManagerB*)this->parent)->manager.unk_0e) {
-            ((ManagerB*)this->parent)->manager.unk_0e--;
+        ManagerB* parent = (ManagerB*)this->parent;
+        if (parent->manager.unk_0e != 0) {
+            parent->manager.unk_0e--;
         }
         DeleteThisEntity();
     }
@@ -174,8 +182,9 @@ void ReplaceMonitoredEntity(Entity* old, Entity* new) {
     u32 i;
     for (current = (ManagerBHelper*)end->next; (Manager*)current != end;
          current = (ManagerBHelper*)current->manager.next) {
-        if (current->manager.type != 0x9 || current->manager.subtype != 0xB)
+        if (current->manager.type != 0x9 || current->manager.subtype != 0xB) {
             continue;
+        }
         for (i = 0; i < 8; i++) {
             if (old == current->enemies[i]) {
                 current->enemies[i] = new;