From 94777d2c0c645d5c77877a26472824359f345a26 Mon Sep 17 00:00:00 2001
From: LagoLunatic <LagoLunatic@users.noreply.github.com>
Date: Thu, 19 Oct 2023 15:37:23 -0400
Subject: [PATCH] Actor attention flag enum cleanup

---
 include/f_op/f_op_actor.h      | 6 +++---
 src/d/actor/d_a_mbdoor.cpp     | 2 +-
 src/d/actor/d_a_npc_kamome.cpp | 4 ++--
 src/d/actor/d_a_obj_mknjd.cpp  | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/include/f_op/f_op_actor.h b/include/f_op/f_op_actor.h
index f380a98e0..bd6f5b8b3 100644
--- a/include/f_op/f_op_actor.h
+++ b/include/f_op/f_op_actor.h
@@ -55,9 +55,9 @@ enum fopAc_AttentionFlag_e {
     fopAc_Attn_ACTION_DOOR_e        = 0x00000020,
     fopAc_Attn_ACTION_TREASURE_e    = 0x00000040,
     fopAc_Attn_ACTION_SHIP_e        = 0x00000080,
-    fopAc_Attn_TALKFLAG_NOTALK_e    = 0x2000000,
-    fopAc_Attn_ENEMYFLAG_NOLOCKON_e = 0x4000000,
-    fopAc_Attn_TALKFLAG_LOOK_e      = 0x8000000,
+    fopAc_Attn_TALKFLAG_NOTALK_e    = 0x02000000,
+    fopAc_Attn_ENEMYFLAG_NOLOCKON_e = 0x04000000,
+    fopAc_Attn_TALKFLAG_LOOK_e      = 0x08000000,
     fopAc_Attn_TALKFLAG_CHECK_e     = 0x20000000,
     fopAc_Attn_TALKFLAG_READ_e      = 0x40000000,
 };
diff --git a/src/d/actor/d_a_mbdoor.cpp b/src/d/actor/d_a_mbdoor.cpp
index 976d4ee3a..7ea78c60b 100644
--- a/src/d/actor/d_a_mbdoor.cpp
+++ b/src/d/actor/d_a_mbdoor.cpp
@@ -283,7 +283,7 @@ BOOL daMbdoor_c::CreateInit() {
     field_0x2bc = 30;
     mAttentionInfo.mPosition.y += 250.0f;
     mEyePos.y += 250.0f;
-    mAttentionInfo.mFlags = 0x20;
+    mAttentionInfo.mFlags = fopAc_Attn_ACTION_DOOR_e;
     calcMtx();
     mpBgW->Move();
     mStatus = mStatus & ~0x3F | 0x2B;
diff --git a/src/d/actor/d_a_npc_kamome.cpp b/src/d/actor/d_a_npc_kamome.cpp
index 2857992a3..75e196cf8 100644
--- a/src/d/actor/d_a_npc_kamome.cpp
+++ b/src/d/actor/d_a_npc_kamome.cpp
@@ -650,10 +650,10 @@ int daNpc_kam_c::waitNpcAction(void*) {
         mC0C = cLib_getRndValue(10, 80);
     } else if (mActionStatus != ACTION_ENDING) {
         if (changeAreaCheck()) {
-            cLib_onBit(mAttentionInfo.mFlags, 0x02000008UL);
+            mAttentionInfo.mFlags |= fopAc_Attn_ACTION_TALK_e | fopAc_Attn_TALKFLAG_NOTALK_e;
             mEventState = 6;
         } else {
-            cLib_offBit(mAttentionInfo.mFlags, 0x02000008UL);
+            mAttentionInfo.mFlags &= ~(fopAc_Attn_ACTION_TALK_e | fopAc_Attn_TALKFLAG_NOTALK_e);
             mEventState = -1;
         }
         
diff --git a/src/d/actor/d_a_obj_mknjd.cpp b/src/d/actor/d_a_obj_mknjd.cpp
index 500dee0f2..48f24decc 100644
--- a/src/d/actor/d_a_obj_mknjd.cpp
+++ b/src/d/actor/d_a_obj_mknjd.cpp
@@ -370,7 +370,7 @@ int daObjMknjD::Act_c::Create() {
 
     mAttentionInfo.mDistances[1] = 0x3D;
     mAttentionInfo.mDistances[3] = 0x3D;
-    mAttentionInfo.mFlags |= 0x20000000 | 0x8;
+    mAttentionInfo.mFlags |= fopAc_Attn_ACTION_TALK_e | fopAc_Attn_TALKFLAG_CHECK_e;
 
     if (checkItemGet(mGiveItemId, 1) == 0) {
         m043F = 8;