diff --git a/src/dra/5087C.c b/src/dra/5087C.c
index 6ec7b8497..f68a50d5c 100644
--- a/src/dra/5087C.c
+++ b/src/dra/5087C.c
@@ -1709,7 +1709,7 @@ void RunMainEngine(void) {
                 D_801375A8 = D_801375A0 - PLAYER.posY.val;
                 for (i = 0, ent = &g_Entities[0]; i < LEN(g_Entities); i++,
                     ent++) {
-                    if (ent->flags & 0x20000) {
+                    if (ent->flags & FLAG_UNK_20000) {
                         ent->posX.val -= D_801375A4;
                         ent->posY.val -= D_801375A8;
                     }
diff --git a/src/dra/7A4D0.c b/src/dra/7A4D0.c
index 80e14e2dc..4439f59a8 100644
--- a/src/dra/7A4D0.c
+++ b/src/dra/7A4D0.c
@@ -123,7 +123,7 @@ void UpdatePlayerEntities(void) {
                      entity->posY.i.hi > 256 || entity->posY.i.hi < -16)) {
                     DestroyEntity(g_CurrentEntity);
                 } else {
-                    if (entity->flags & 0x100000) {
+                    if (entity->flags & FLAG_UNK_100000) {
                         UpdateAnim(NULL, D_800ACFB4);
                     }
                 }
diff --git a/src/dra/7E4BC.c b/src/dra/7E4BC.c
index 195e3b142..6a4719488 100644
--- a/src/dra/7E4BC.c
+++ b/src/dra/7E4BC.c
@@ -2283,7 +2283,7 @@ void func_80123B40(Entity* self) {
 
         PLAYER = copy;
 
-        if (!(self->flags & 0x800000)) {
+        if (!(self->flags & FLAG_HAS_PRIMS)) {
             DestroyEntity(self);
             return;
         }
diff --git a/src/st/collision.h b/src/st/collision.h
index 385fe830b..3fb06e6af 100644
--- a/src/st/collision.h
+++ b/src/st/collision.h
@@ -612,7 +612,7 @@ void HitDetection(void) {
                 if (!(entFrom5C->hitFlags & 0xF)) {
                     entFrom5C->hitFlags |= 0x10;
                 }
-                if ((entFrom5C->flags & 0x10) && (iterEnt2->attack)) {
+                if ((entFrom5C->flags & FLAG_UNK_10) && (iterEnt2->attack)) {
                     if (iterEnt2->hitEffect & 0x80) {
                         g_api.PlaySfx(SFX_METAL_CLANG_E);
                     } else {
diff --git a/src/st/mad/collision.c b/src/st/mad/collision.c
index 1f4203886..c51411152 100644
--- a/src/st/mad/collision.c
+++ b/src/st/mad/collision.c
@@ -546,7 +546,7 @@ void HitDetection(void) {
                 if (!(entFrom5C->hitFlags & 0xF)) {
                     entFrom5C->hitFlags |= 0x10;
                 }
-                if ((entFrom5C->flags & 0x10) && (iterEnt2->attack)) {
+                if ((entFrom5C->flags & FLAG_UNK_10) && (iterEnt2->attack)) {
                     if (iterEnt2->hitEffect & 0x80) {
                         g_api.PlaySfx(SFX_METAL_CLANG_E);
                     } else {
diff --git a/src/st/np3/blade.c b/src/st/np3/blade.c
index 8f99e665b..7b3b6610c 100644
--- a/src/st/np3/blade.c
+++ b/src/st/np3/blade.c
@@ -114,7 +114,7 @@ void EntityBlade(Entity* self) {
     if ((self->step & 1) && (self->hitFlags & 3)) {
         func_801CE1E8(0xE);
     }
-    if ((self->flags & 0x100) && (self->step < 0x18U) &&
+    if ((self->flags & FLAG_DEAD) && (self->step < 0x18U) &&
         (((self + 13)->ext.GH_Props.unk88 != 0) ||
          ((self + 10)->ext.GH_Props.unk88 != 0))) {
         PlaySfxPositional(0x750);
diff --git a/src/st/nz0/e_spittle_bone.c b/src/st/nz0/e_spittle_bone.c
index 542bf65f0..7e5fb0d94 100644
--- a/src/st/nz0/e_spittle_bone.c
+++ b/src/st/nz0/e_spittle_bone.c
@@ -21,7 +21,7 @@ void EntitySpittleBone(Entity* self) {
         InitializeEntity(D_80180CAC);
         self->drawFlags = FLAG_DRAW_ROTZ;
         self->rotZ = 0;
-        self->flags &= ~(FLAG_UNK_2000 | 0x200);
+        self->flags &= ~(FLAG_UNK_2000 | FLAG_UNK_200);
         self->facingLeft = self->params;
         break;