name flag fields in structs

5 files changed, 32 insertions, 32 deletions

diff --git a/src/manager/fallingItemManager.c b/src/manager/fallingItemManager.c
index 740c91a3..951cf83c 100644
--- a/src/manager/fallingItemManager.c
+++ b/src/manager/fallingItemManager.c
@@ -40,7 +40,7 @@ void FallingItemManager_Action1(FallingItemManager* this) {
             object->base.collisionLayer = this->field_0x36;
             object->base.x.HALF.HI = this->field_0x38 + gRoomControls.origin_x;
             object->base.y.HALF.HI = this->field_0x3a + gRoomControls.origin_y;
-            object->unk_86 = this->field_0x3c;
+            object->flag = this->field_0x3c;
         }
         DeleteThisEntity();
     }
diff --git a/src/manager/flagAndOperatorManager.c b/src/manager/flagAndOperatorManager.c
index 7439830a..6236ef91 100644
--- a/src/manager/flagAndOperatorManager.c
+++ b/src/manager/flagAndOperatorManager.c
@@ -10,12 +10,12 @@
 void FlagAndOperatorManager_Main(FlagAndOperatorManager* this) {
     if (super->action == 0) {
         super->action = 1;
-        if (CheckFlags(this->unk_3c)) {
+        if (CheckFlags(this->setFlag)) {
             DeleteThisEntity();
         }
     } else {
-        if (CheckFlags(this->unk_3e)) {
-            SetFlag(this->unk_3c);
+        if (CheckFlags(this->checkFlags)) {
+            SetFlag(this->setFlag);
             DeleteThisEntity();
         }
     }
diff --git a/src/manager/manager29.c b/src/manager/manager29.c
index 133d3944..bd079e1c 100644
--- a/src/manager/manager29.c
+++ b/src/manager/manager29.c
@@ -16,12 +16,12 @@ void sub_0805CC3C(Manager29* this);
 void Manager29_Main(Manager29* this) {
     if (super->action == 0) {
         sub_0805CBD0(this);
-        if (CheckFlags(this->unk_3e)) {
+        if (CheckFlags(this->flag)) {
             sub_0805CC3C(this);
             DeleteManager(this);
         }
     } else if (sub_0805CF80(this)) {
-        SetFlag(this->unk_3e);
+        SetFlag(this->flag);
         DeleteManager(this);
     }
 }
diff --git a/src/manager/miscManager.c b/src/manager/miscManager.c
index 1adf595d..ed284275 100644
--- a/src/manager/miscManager.c
+++ b/src/manager/miscManager.c
@@ -146,12 +146,12 @@ void MiscManager_Type1(MiscManager* this) {
                 super->subAction = 8;
                 super->subtimer = 2;
             }
-            if (CheckFlags(this->flags)) {
+            if (CheckFlags(this->flag2)) {
                 DeleteManager(super);
             }
             break;
         case 1:
-            if (CheckFlags(this->flags)) {
+            if (CheckFlags(this->flag2)) {
                 super->action = 2;
                 super->timer = 120;
                 RequestPriorityDuration((Entity*)this, 240);
@@ -172,7 +172,7 @@ void MiscManager_Type1(MiscManager* this) {
             }
             break;
         default:
-            SetFlag(this->flags);
+            SetFlag(this->flag2);
             SetPlayerControl(1);
             DeleteThisEntity();
     }
@@ -236,14 +236,14 @@ void MiscManager_Type5(MiscManager* this) {
             }
             break;
         case 0:
-            if (CheckFlags(this->flags)) {
+            if (CheckFlags(this->flag2)) {
                 DeleteThisEntity();
             }
             super->action = 1;
             SetTileType(TILE_TYPE_869, TILE_LOCAL(this->x, this->y), super->type2);
             break;
         case 1:
-            if (CheckFlags(this->flags)) {
+            if (CheckFlags(this->flag2)) {
                 RequestPriorityDuration((Entity*)this, 75);
                 super->timer = 45;
                 super->action++;
@@ -254,14 +254,14 @@ void MiscManager_Type5(MiscManager* this) {
 void MiscManager_Type6(MiscManager* this) {
     if (super->action == 0) {
         super->action = 1;
-        super->type2 = CheckFlags(this->flags);
+        super->type2 = CheckFlags(this->flag2);
         if (super->type2) {
             gRoomVars.lightLevel = this->y;
         } else {
             gRoomVars.lightLevel = this->x;
         }
     } else {
-        u32 tmp = CheckFlags(this->flags);
+        u32 tmp = CheckFlags(this->flag2);
         if (super->type2 != tmp) {
             super->type2 = tmp;
             if (tmp) {
@@ -304,12 +304,12 @@ void MiscManager_Type8(MiscManager* this) {
 void MiscManager_Type9(MiscManager* this) {
     if (super->action == 0) {
         super->action = 1;
-        if (CheckFlags(this->flags)) {
+        if (CheckFlags(this->flag2)) {
             sub_080592EC(this);
             DeleteThisEntity();
         }
     } else {
-        if (CheckFlags(this->flags)) {
+        if (CheckFlags(this->flag2)) {
             sub_080592EC(this);
             sub_0805930C(this);
 #ifndef EU
@@ -346,8 +346,8 @@ void SetDirtTile(u32 tilePos) {
 
 void MiscManager_TypeA(MiscManager* this) {
     super->action = 1;
-    if (this->unk_3c == gTextRender.curToken.textIndex) {
-        SetFlag(this->flags);
+    if (this->flag1 == gTextRender.curToken.textIndex) {
+        SetFlag(this->flag2);
         DeleteThisEntity();
     }
 }
@@ -372,10 +372,10 @@ bool32 sub_080593CC(MiscManager* this) {
 
 void MiscManager_TypeC(MiscManager* this) {
     Entity* tmp;
-    if (CheckFlags(this->flags)) {
+    if (CheckFlags(this->flag2)) {
         DeleteThisEntity();
     }
-    if (!CheckFlags(this->unk_3c))
+    if (!CheckFlags(this->flag1))
         return;
     tmp = CreateObject(SPECIAL_FX, FX_BIG_EXPLOSION, 0);
     if (!tmp)
@@ -388,7 +388,7 @@ void MiscManager_TypeC(MiscManager* this) {
 }
 
 void MiscManager_TypeD(MiscManager* this) {
-    if (!CheckFlags(this->flags)) {
+    if (!CheckFlags(this->flag2)) {
         SetPlayerControl(3);
         if (gRoomControls.reload_flags)
             return;
diff --git a/src/manager/templeOfDropletsManager.c b/src/manager/templeOfDropletsManager.c
index 19d8f07a..213487db 100644
--- a/src/manager/templeOfDropletsManager.c
+++ b/src/manager/templeOfDropletsManager.c
@@ -60,7 +60,7 @@ void TempleOfDropletsManager_Main(TempleOfDropletsManager* this) {
 void TempleOfDropletsManager_Type0(TempleOfDropletsManager* this) {
     if (super->action == 0) {
         sub_0805A89C(this);
-        if (!CheckLocalFlag(this->unk_3e)) {
+        if (!CheckLocalFlag(this->localFlag)) {
             this->unk_23 = 1;
         } else {
             this->unk_23 = 2;
@@ -83,7 +83,7 @@ void TempleOfDropletsManager_Type1(TempleOfDropletsManager* this) {
         sub_0805A89C(this);
         this->unk_23 = 1;
         sub_0805AAF0(1);
-        if (!CheckLocalFlag(this->unk_3e)) {
+        if (!CheckLocalFlag(this->localFlag)) {
             super->action = 1;
             gScreen.lcd.displayControl &= 0xB7FF;
         } else {
@@ -144,12 +144,12 @@ void TempleOfDropletsManager_Type2(TempleOfDropletsManager* this) {
             this->unk_23 = 1;
         }
         sub_0805AAF0(this->unk_23);
-        if (!CheckLocalFlag(this->unk_3e)) {
-            ClearFlag(this->unk_3c);
+        if (!CheckLocalFlag(this->localFlag)) {
+            ClearFlag(this->flag);
             super->action = 1;
             gScreen.lcd.displayControl &= ~(DISPCNT_WIN1_ON | DISPCNT_BG3_ON);
         } else {
-            SetFlag(this->unk_3c);
+            SetFlag(this->flag);
             super->action = 3;
             gScreen.lcd.displayControl |= DISPCNT_WIN1_ON | DISPCNT_BG3_ON;
         }
@@ -162,7 +162,7 @@ void TempleOfDropletsManager_Type2(TempleOfDropletsManager* this) {
 void sub_0805A4CC(TempleOfDropletsManager*, u32);
 
 void TempleOfDropletsManager_Type1_Action1(TempleOfDropletsManager* this) {
-    if (CheckLocalFlag(this->unk_3e)) {
+    if (CheckLocalFlag(this->localFlag)) {
         super->action = 2;
         sub_0805A4CC(this, 0);
     }
@@ -171,12 +171,12 @@ void TempleOfDropletsManager_Type1_Action1(TempleOfDropletsManager* this) {
 void TempleOfDropletsManager_Type2_Action2(TempleOfDropletsManager* this) {
     if (super->subAction != 0) {
         super->action = 3;
-        SetFlag(this->unk_3c);
+        SetFlag(this->flag);
     }
 }
 
 void TempleOfDropletsManager_Type2_Action3(TempleOfDropletsManager* this) {
-    if (!CheckLocalFlag(this->unk_3e)) {
+    if (!CheckLocalFlag(this->localFlag)) {
         super->action = 4;
         sub_0805A4CC(this, 1);
     }
@@ -185,7 +185,7 @@ void TempleOfDropletsManager_Type2_Action3(TempleOfDropletsManager* this) {
 void TempleOfDropletsManager_Type2_Action4(TempleOfDropletsManager* this) {
     if (super->subAction != 0) {
         super->action = 1;
-        ClearFlag(this->unk_3c);
+        ClearFlag(this->flag);
     }
 }
 
@@ -363,7 +363,7 @@ void TempleOfDropletsManager_Type6_Action3(TempleOfDropletsManager* this) {
 void TempleOfDropletsManager_Type7(TempleOfDropletsManager* this) {
     switch (super->action) {
         case 0:
-            if (CheckLocalFlag(this->unk_3e)) {
+            if (CheckLocalFlag(this->localFlag)) {
                 super->action = 1;
             } else {
                 super->action = 2;
@@ -373,7 +373,7 @@ void TempleOfDropletsManager_Type7(TempleOfDropletsManager* this) {
             SetEntityPriority((Entity*)this, PRIO_PLAYER_EVENT);
             break;
         case 1:
-            if (CheckLocalFlag(this->unk_3e))
+            if (CheckLocalFlag(this->localFlag))
                 break;
             super->action = 2;
             sub_0805A4CC(this, 4);
@@ -384,7 +384,7 @@ void TempleOfDropletsManager_Type7(TempleOfDropletsManager* this) {
             }
             break;
         case 3:
-            if (!CheckLocalFlag(this->unk_3e))
+            if (!CheckLocalFlag(this->localFlag))
                 break;
             super->action = 4;
             sub_0805A4CC(this, 4);