Add camera attention status and algorythmn enums

10 files changed, 59 insertions, 46 deletions

diff --git a/src/d/actor/d_a_arrow_lighteff.cpp b/src/d/actor/d_a_arrow_lighteff.cpp
index 0836a57b..a204fe38 100644
--- a/src/d/actor/d_a_arrow_lighteff.cpp
+++ b/src/d/actor/d_a_arrow_lighteff.cpp
@@ -280,7 +280,7 @@ void daArrow_Lighteff_c::brk_play() {
     mBtk.play();
 
     int cam = dComIfGp_getPlayerCameraID(0);
-    if(!dComIfGp_checkCameraAttentionStatus(cam, 0x20)) {
+    if(!dComIfGp_checkCameraAttentionStatus(cam, dCamAttnStts_00000020_e)) {
         if(field_0x2E0 < mBrk.getEndFrame()) {
             field_0x2E0 += 1.0f;
             if(field_0x2E0 > mBrk.getEndFrame()) {
@@ -372,13 +372,13 @@ bool daArrow_Lighteff_c::_execute() {
     int cam = dComIfGp_getPlayerCameraID(0);
     if(field_0x2E8 == 1) {
         fopAcM_seStartCurrent(this, JA_SE_OBJ_FIRE_ARROW_AMB, 0);
-        if(!dComIfGp_checkCameraAttentionStatus(cam, 0x20)) {
+        if(!dComIfGp_checkCameraAttentionStatus(cam, dCamAttnStts_00000020_e)) {
             dComIfGp_particle_setSimple(dPa_name::ID_AK_JP_O_KAGEROU00, &field_0x29C);
         }
     }
     else if(field_0x2E8 == 2) {
         fopAcM_seStartCurrent(this, JA_SE_OBJ_ICE_ARROW_AMB, 0);
-        if(dComIfGp_checkCameraAttentionStatus(cam, 0x20)) {
+        if(dComIfGp_checkCameraAttentionStatus(cam, dCamAttnStts_00000020_e)) {
             if(field_0x2F4.getEmitter()) {
                 field_0x2F4.getEmitter()->setGlobalAlpha(0x64);
             }
diff --git a/src/d/actor/d_a_kanban.cpp b/src/d/actor/d_a_kanban.cpp
index 24269917..5165fc39 100644
--- a/src/d/actor/d_a_kanban.cpp
+++ b/src/d/actor/d_a_kanban.cpp
@@ -842,7 +842,7 @@ static BOOL daKanban_Execute(kanban_class* i_this) {
             {
                 if (i_this->actor.eventInfo.checkCommandTalk()) {
                     if (l_msgId == fpcM_ERROR_PROCESS_ID_e) {
-                        if (dComIfGp_checkCameraAttentionStatus(dComIfGp_getPlayerCameraID(0), 4)) {
+                        if (dComIfGp_checkCameraAttentionStatus(dComIfGp_getPlayerCameraID(0), dCamAttnStts_00000004_e)) {
                             l_msgId = fopMsgM_messageSet(fopAcM_GetParam(&i_this->actor), &i_this->actor.eyePos);
                         }
                     } else {
diff --git a/src/d/actor/d_a_npc_ji1.cpp b/src/d/actor/d_a_npc_ji1.cpp
index 39d2f5dd..0dbe3e6c 100644
--- a/src/d/actor/d_a_npc_ji1.cpp
+++ b/src/d/actor/d_a_npc_ji1.cpp
@@ -2317,7 +2317,7 @@ BOOL daNpc_Ji1_c::reiAction(void*) {
 
         field_0xC78++;
         l_msgId = fpcM_ERROR_PROCESS_ID_e;
-        dComIfGp_onCameraAttentionStatus(0, 4);
+        dComIfGp_onCameraAttentionStatus(0, dCamAttnStts_00000004_e);
     }
     else if(field_0xC78 != -1) {
         if(l_msgId == fpcM_ERROR_PROCESS_ID_e) {
@@ -2364,7 +2364,7 @@ BOOL daNpc_Ji1_c::reiAction(void*) {
                     setAnm(0, 16.0f, 0);
                     setAction(&daNpc_Ji1_c::normalAction, NULL);
                     dComIfGp_event_reset();
-                    dComIfGp_offCameraAttentionStatus(0, 4);
+                    dComIfGp_offCameraAttentionStatus(0, dCamAttnStts_00000004_e);
                     field_0xD74 = 0;
                 }
             }
diff --git a/src/d/actor/d_a_obj_paper.cpp b/src/d/actor/d_a_obj_paper.cpp
index 19fcb0e8..2a2666f0 100644
--- a/src/d/actor/d_a_obj_paper.cpp
+++ b/src/d/actor/d_a_obj_paper.cpp
@@ -219,7 +219,7 @@ namespace daObjPaper {
 
     /* 000007A4-00000820       .text mode_talk0__Q210daObjPaper5Act_cFv */
     void daObjPaper::Act_c::mode_talk0() {
-        if (mMsgId == fpcM_ERROR_PROCESS_ID_e && dComIfGp_checkCameraAttentionStatus(dComIfGp_getPlayerCameraID(0), 4)) {
+        if (mMsgId == fpcM_ERROR_PROCESS_ID_e && dComIfGp_checkCameraAttentionStatus(dComIfGp_getPlayerCameraID(0), dCamAttnStts_00000004_e)) {
             mMsgId = fopMsgM_messageSet(prm_get_msgNo(), &eyePos);
 
             mode_talk1_init();
diff --git a/src/d/actor/d_a_player_boomerang.inc b/src/d/actor/d_a_player_boomerang.inc
index 40e6d760..37abcedf 100644
--- a/src/d/actor/d_a_player_boomerang.inc
+++ b/src/d/actor/d_a_player_boomerang.inc
@@ -72,7 +72,7 @@ BOOL daPy_lk_c::returnBoomerang() {
 
 /* 801497A4-8014984C       .text checkNextActionBoomerangReady__9daPy_lk_cFv */
 BOOL daPy_lk_c::checkNextActionBoomerangReady() {
-    if (!itemButton() && (mpAttnActorLockOn != NULL || dComIfGp_checkCameraAttentionStatus(mCameraInfoIdx, 0x10))) {
+    if (!itemButton() && (mpAttnActorLockOn != NULL || dComIfGp_checkCameraAttentionStatus(mCameraInfoIdx, dCamAttnStts_00000010_e))) {
         setActAnimeUpper(
             LKANM_BCK_BOOMTHROW,
             UPPER_MOVE2_e,
diff --git a/src/d/actor/d_a_player_crawl.inc b/src/d/actor/d_a_player_crawl.inc
index 1e0bc3e5..08be62f6 100644
--- a/src/d/actor/d_a_player_crawl.inc
+++ b/src/d/actor/d_a_player_crawl.inc
@@ -239,22 +239,22 @@ BOOL daPy_lk_c::checkCrawlSideWall(
 /* 801392BC-80139424       .text setDoStatusCrawl__9daPy_lk_cFv */
 void daPy_lk_c::setDoStatusCrawl() {
     dComIfGp_setRStatus(dActStts_CROUCH_e);
-    if (dComIfGp_checkCameraAttentionStatus(mCameraInfoIdx, 0x80)) {
+    if (dComIfGp_checkCameraAttentionStatus(mCameraInfoIdx, dCamAttnStts_00000080_e)) {
         dComIfGp_setAStatus(dActStts_RETURN_e);
-        if (checkSubjectEnd(1) || mWaterY > current.pos.y) {
-            dComIfGp_clearPlayerStatus0(0, daPyStts0_UNK2000_e);
+        if (checkSubjectEnd(TRUE) || mWaterY > current.pos.y) {
+            dComIfGp_clearPlayerStatus0(0, daPyStts0_SUBJECT_e);
         } else {
-            dComIfGp_setPlayerStatus0(0, daPyStts0_UNK2000_e);
+            dComIfGp_setPlayerStatus0(0, daPyStts0_SUBJECT_e);
         }
     } else if (dCam_getBody()->ChangeModeOK(4)) {
         if (mWaterY <= current.pos.y) {
             onResetFlg0(daPyRFlg0_SUBJECT_ACCEPT);
-            if (dComIfGp_checkCameraAttentionStatus(mCameraInfoIdx, 0x1000) && !dComIfGp_event_runCheck()) {
+            if (dComIfGp_checkCameraAttentionStatus(mCameraInfoIdx, dCamAttnStts_00001000_e) && !dComIfGp_event_runCheck()) {
                 setSubjectMode();
             }
         }
     }
-    if (dComIfGp_checkCameraAttentionStatus(mCameraInfoIdx, 0x80) &&
+    if (dComIfGp_checkCameraAttentionStatus(mCameraInfoIdx, dCamAttnStts_00000080_e) &&
         (mCurProc != daPyProc_CRAWL_MOVE_e || mProcVar0.m3570 == 0))
     {
         setBodyAngleToCamera();
@@ -338,7 +338,7 @@ BOOL daPy_lk_c::procCrawlMove_init(s16 param_0, s16 param_1) {
         var_r29 = 1;
     }
     BOOL var_r27;
-    if (dComIfGp_checkPlayerStatus0(0, daPyStts0_UNK2000_e)) {
+    if (dComIfGp_checkPlayerStatus0(0, daPyStts0_SUBJECT_e)) {
         var_r27 = 1;
     } else {
         var_r27 = 0;
@@ -361,7 +361,7 @@ BOOL daPy_lk_c::procCrawlMove_init(s16 param_0, s16 param_1) {
     m35E4 = 1.0f;
     dComIfGp_setPlayerStatus0(0, daPyStts0_CRAWL_e);
     if (var_r27 != 0) {
-        dComIfGp_setPlayerStatus0(0, daPyStts0_UNK2000_e);
+        dComIfGp_setPlayerStatus0(0, daPyStts0_SUBJECT_e);
     }
     return true;
 }
@@ -534,7 +534,7 @@ BOOL daPy_lk_c::procCrawlMove() {
 
 /* 8013A004-8013A0F0       .text procCrawlAutoMove_init__9daPy_lk_cFiP4cXyz */
 BOOL daPy_lk_c::procCrawlAutoMove_init(int param_0, cXyz* param_1) {
-    BOOL uVar1 = dComIfGp_checkPlayerStatus0(0, daPyStts0_UNK2000_e) ? TRUE : FALSE;
+    BOOL uVar1 = dComIfGp_checkPlayerStatus0(0, daPyStts0_SUBJECT_e) ? TRUE : FALSE;
     commonProcInit(daPyProc_CRAWL_AUTO_MOVE_e);
     m370C = *param_1;
     m35E4 = 1.0f;
@@ -549,7 +549,7 @@ BOOL daPy_lk_c::procCrawlAutoMove_init(int param_0, cXyz* param_1) {
         mAcchCir[i].SetWallR(9.99f);
     }
     if (uVar1) {
-        dComIfGp_setPlayerStatus0(0, daPyStts0_UNK2000_e);
+        dComIfGp_setPlayerStatus0(0, daPyStts0_SUBJECT_e);
     }
     return true;
 }
diff --git a/src/d/actor/d_a_player_main.cpp b/src/d/actor/d_a_player_main.cpp
index eeefc918..4a27ada3 100644
--- a/src/d/actor/d_a_player_main.cpp
+++ b/src/d/actor/d_a_player_main.cpp
@@ -1697,7 +1697,7 @@ BOOL daPy_lk_c::draw() {
         return TRUE;
     }
     
-    if (dComIfGp_checkCameraAttentionStatus(mCameraInfoIdx, 0x20)) {
+    if (dComIfGp_checkCameraAttentionStatus(mCameraInfoIdx, dCamAttnStts_00000020_e)) {
         offBodyEffect();
     } else {
         onBodyEffect();
@@ -1796,7 +1796,7 @@ BOOL daPy_lk_c::draw() {
                 mtl->getShape()->show();
             }
         }
-    } else if (dComIfGp_checkCameraAttentionStatus(mCameraInfoIdx, 0x20)) {
+    } else if (dComIfGp_checkCameraAttentionStatus(mCameraInfoIdx, dCamAttnStts_00000020_e)) {
         for (int i = 0; i < ARRAY_SIZE(mpZOffBlendShape); i++) {
             mpZOffBlendShape[i]->hide();
             mpZOffNoneShape[i]->hide();
@@ -1905,7 +1905,7 @@ BOOL daPy_lk_c::draw() {
         entryDLSetLight(mpHandsModel, checkFreezeState());
         if (checkNoResetFlg1(daPyFlg1_CASUAL_CLOTHES) && !checkCaughtShapeHide()
 #if VERSION > VERSION_DEMO
-            && !dComIfGp_checkCameraAttentionStatus(mCameraInfoIdx, 0x20)
+            && !dComIfGp_checkCameraAttentionStatus(mCameraInfoIdx, dCamAttnStts_00000020_e)
 #endif
         ) {
             entryDLSetLight(mpKatsuraModel, checkFreezeState());
@@ -1952,7 +1952,7 @@ BOOL daPy_lk_c::draw() {
             }
             mDoExt_modelUpdateDL(mpSuimenMunyaModel);
         }
-        if (!r24 && !dComIfGp_checkCameraAttentionStatus(mCameraInfoIdx, 0x20)) {
+        if (!r24 && !dComIfGp_checkCameraAttentionStatus(mCameraInfoIdx, dCamAttnStts_00000020_e)) {
             if (checkSwordEquip()
 #if VERSION == VERSION_DEMO
                 && !checkLastDemoSwordNoDraw(1)
@@ -2005,7 +2005,7 @@ BOOL daPy_lk_c::draw() {
             updateDLSetLight(mpBottleCapModel, 0);
         }
         
-        if (!dComIfGp_checkCameraAttentionStatus(mCameraInfoIdx, 0x20)) {
+        if (!dComIfGp_checkCameraAttentionStatus(mCameraInfoIdx, dCamAttnStts_00000020_e)) {
             f32 frame = mYaura00rBrk.getBrkAnm()->getFrame();
             if (frame > 0.0f) {
                 daPy_aura_c* auraEntry = &mMagicArmorAuraEntries[0];
@@ -2706,7 +2706,7 @@ BOOL daPy_lk_c::setBodyAngleToCamera() {
     s16 local_16;
     s16 local_18;
 
-    if (dComIfGp_checkCameraAttentionStatus(mCameraInfoIdx, 0x10) != 0) {
+    if (dComIfGp_checkCameraAttentionStatus(mCameraInfoIdx, dCamAttnStts_00000010_e) != 0) {
         bVar1 = dCam_getBody()->CalcSubjectAngle(&local_16, &local_18);
         if (bVar1 != 0) {
             shape_angle.y = local_18;
@@ -4343,7 +4343,7 @@ BOOL daPy_lk_c::checkNextActionFromButton() {
 #endif
     ) {
         onResetFlg0(daPyRFlg0_SUBJECT_ACCEPT);
-        if (dComIfGp_checkCameraAttentionStatus(mCameraInfoIdx, 0x1000)) {
+        if (dComIfGp_checkCameraAttentionStatus(mCameraInfoIdx, dCamAttnStts_00001000_e)) {
             return procSubjectivity_init(0);
         }
     }
@@ -5706,7 +5706,7 @@ BOOL daPy_lk_c::checkScopeEnd() {
 
 /* 80112100-8011215C       .text setSubjectMode__9daPy_lk_cFv */
 void daPy_lk_c::setSubjectMode() {
-    dComIfGp_setPlayerStatus0(0, daPyStts0_UNK2000_e);
+    dComIfGp_setPlayerStatus0(0, daPyStts0_SUBJECT_e);
     seStartSystem(JA_SE_SUBJ_VIEW_IN);
 }
 
@@ -5723,7 +5723,12 @@ BOOL daPy_lk_c::checkMaskDraw() {
 /* 801121C8-80112280       .text checkSubjectEnd__9daPy_lk_cFi */
 BOOL daPy_lk_c::checkSubjectEnd(BOOL i_playSound) {
     // TODO: these trigger/button checks are likely inlines
-    if(dComIfGp_event_runCheck() || (mItemTrigger & (BTN_A | BTN_B)) || (mItemButton & BTN_L) || dComIfGp_checkCameraAttentionStatus(mCameraInfoIdx, 0x2000)) {
+    if(
+        dComIfGp_event_runCheck() ||
+        (mItemTrigger & (BTN_A | BTN_B)) ||
+        (mItemButton & BTN_L) ||
+        dComIfGp_checkCameraAttentionStatus(mCameraInfoIdx, dCamAttnStts_00002000_e)
+    ) {
         if(i_playSound) {
             seStartSystem(JA_SE_SUBJ_VIEW_OUT);
         }
@@ -5960,7 +5965,7 @@ BOOL daPy_lk_c::procScope() {
     if (checkScopeEnd()) {
         procWait_init();
     } else {
-        if (dComIfGp_checkCameraAttentionStatus(mCameraInfoIdx, 0x10)) {
+        if (dComIfGp_checkCameraAttentionStatus(mCameraInfoIdx, dCamAttnStts_00000010_e)) {
             shape_angle.y = fopCamM_GetAngleY(dComIfGp_getCamera(mCameraInfoIdx));
             current.angle.y = shape_angle.y;
         }
@@ -6454,7 +6459,7 @@ BOOL daPy_lk_c::procCrouchDefense() {
     dComIfGp_setRStatus(dActStts_DEFEND_e);
     if (dCam_getBody()->ChangeModeOK(4) && current.pos.y >= mWaterY) {
         onResetFlg0(daPyRFlg0_SUBJECT_ACCEPT);
-        if (dComIfGp_checkCameraAttentionStatus(mCameraInfoIdx, 0x1000) && !dComIfGp_event_runCheck()) {
+        if (dComIfGp_checkCameraAttentionStatus(mCameraInfoIdx, dCamAttnStts_00001000_e) && !dComIfGp_event_runCheck()) {
             return procSubjectivity_init(1);
         }
     }
@@ -6576,7 +6581,7 @@ BOOL daPy_lk_c::procCrouch() {
     dComIfGp_setRStatus(dActStts_CROUCH_e);
     if (dCam_getBody()->ChangeModeOK(4) && current.pos.y >= mWaterY) {
         onResetFlg0(daPyRFlg0_SUBJECT_ACCEPT);
-        if (dComIfGp_checkCameraAttentionStatus(mCameraInfoIdx, 0x1000) && !dComIfGp_event_runCheck()) {
+        if (dComIfGp_checkCameraAttentionStatus(mCameraInfoIdx, dCamAttnStts_00001000_e) && !dComIfGp_event_runCheck()) {
             return procSubjectivity_init(1);
         }
     }
@@ -9722,7 +9727,7 @@ void daPy_lk_c::checkLightHit() {
         }
         resetCurse();
     }
-    if (!dComIfGp_checkPlayerStatus0(0, daPyStts0_UNK2000_e) &&
+    if (!dComIfGp_checkPlayerStatus0(0, daPyStts0_SUBJECT_e) &&
         checkResetFlg0(daPyRFlg0_LIGHT_REFLECT))
     {
         if (m342C.getEmitter() == NULL) {
@@ -10279,7 +10284,7 @@ void daPy_lk_c::setAttentionPos() {
             static const Vec offset = {0.0f, 30.0f, 20.0f};
             mDoMtx_multVec(mpCLModel->getBaseTRMtx(), &offset, &attention_info.position);
         }
-    } else if (dComIfGp_checkPlayerStatus0(0, daPyStts0_UNK2000_e)) {
+    } else if (dComIfGp_checkPlayerStatus0(0, daPyStts0_SUBJECT_e)) {
         {
             static const Vec offset = {0.0f, 70.0f, 0.0f};
             mDoMtx_stack_c::ZXYrotS(mBodyAngle.x, shape_angle.y, 0);
diff --git a/src/d/actor/d_a_player_ship.inc b/src/d/actor/d_a_player_ship.inc
index 41f05666..406c8677 100644
--- a/src/d/actor/d_a_player_ship.inc
+++ b/src/d/actor/d_a_player_ship.inc
@@ -322,7 +322,7 @@ BOOL daPy_lk_c::changeShipEndProc() {
                  m_anm_heap_under[UNDER_MOVE0_e].mIdx == LKANM_BCK_FREEB) ||
                 m_anm_heap_under[UNDER_MOVE0_e].mIdx == LKANM_BCK_FREED)
             {
-                if ((!dComIfGp_checkPlayerStatus0(0, daPyStts0_UNK2000_e) && !spActionButton()) &&
+                if ((!dComIfGp_checkPlayerStatus0(0, daPyStts0_SUBJECT_e) && !spActionButton()) &&
                     (dComIfGp_getDoStatus() == dActStts_BLANK_e && mCurProc == daPyProc_SHIP_PADDLE_e))
                 {
                     if (!ship->checkForceMove()) {
@@ -649,14 +649,14 @@ BOOL daPy_lk_c::procShipPaddle() {
     if (dComIfGp_getDoStatus() == dActStts_BLANK_e && dComIfGp_getShipActor()->speedF >= 3.0f) {
         dComIfGp_setDoStatus(dActStts_STOP_e);
     }
-    if (dComIfGp_checkPlayerStatus0(0, daPyStts0_UNK2000_e)) {
+    if (dComIfGp_checkPlayerStatus0(0, daPyStts0_SUBJECT_e)) {
         dComIfGp_setAStatus(dActStts_RETURN_e);
-        if (checkSubjectEnd(1)) {
-            dComIfGp_clearPlayerStatus0(0, daPyStts0_UNK2000_e);
+        if (checkSubjectEnd(TRUE)) {
+            dComIfGp_clearPlayerStatus0(0, daPyStts0_SUBJECT_e);
         }
     } else {
         onResetFlg0(daPyRFlg0_SUBJECT_ACCEPT);
-        if (dComIfGp_checkCameraAttentionStatus(mCameraInfoIdx, 0x1000) && !dComIfGp_event_runCheck()) {
+        if (dComIfGp_checkCameraAttentionStatus(mCameraInfoIdx, dCamAttnStts_00001000_e) && !dComIfGp_event_runCheck()) {
             setSubjectMode();
         }
     }
@@ -730,7 +730,7 @@ BOOL daPy_lk_c::procShipScope() {
     }
     if (checkScopeEnd()) {
         procShipPaddle_init();
-    } else if (dComIfGp_checkCameraAttentionStatus(mCameraInfoIdx, 0x10) && !dComIfGp_event_runCheck() &&
+    } else if (dComIfGp_checkCameraAttentionStatus(mCameraInfoIdx, dCamAttnStts_00000010_e) && !dComIfGp_event_runCheck() &&
                !checkPlayerDemoMode())
     {
         shape_angle.y = fopCamM_GetAngleY(dComIfGp_getCamera(mCameraInfoIdx));
diff --git a/src/d/actor/d_a_ship.cpp b/src/d/actor/d_a_ship.cpp
index acda672c..d300d835 100644
--- a/src/d/actor/d_a_ship.cpp
+++ b/src/d/actor/d_a_ship.cpp
@@ -282,11 +282,19 @@ BOOL daShip_c::draw() {
         m02A4->setTranslationX(m03D4);
     }
 
-    if (!dComIfGp_checkPlayerStatus0(0, daPyStts0_SHIP_RIDE_e) || dComIfGp_getAttention().Lockon() || daPy_getPlayerLinkActorClass()->getBodyAngleX() > -0x1000) {
+    if (
+        !dComIfGp_checkPlayerStatus0(0, daPyStts0_SHIP_RIDE_e) ||
+        dComIfGp_getAttention().Lockon() ||
+        daPy_getPlayerLinkActorClass()->getBodyAngleX() > -0x1000
+    ) {
         mDoExt_modelEntryDL(model);
     }
 
-    if (!dComIfGp_checkPlayerStatus0(0, daPyStts0_SHIP_RIDE_e) || daPy_getPlayerLinkActorClass()->checkNoControll() || !dComIfGp_checkCameraAttentionStatus(0, 0x22)) {
+    if (
+        !dComIfGp_checkPlayerStatus0(0, daPyStts0_SHIP_RIDE_e) ||
+        daPy_getPlayerLinkActorClass()->checkNoControll() ||
+        !dComIfGp_checkCameraAttentionStatus(0, dCamAttnStts_SUBJECT_e | dCamAttnStts_00000020_e)
+    ) {
         offStateFlg(daSFLG_HEAD_NO_DRAW_e);
         mDoExt_modelEntryDL(model_00);
     }
@@ -1394,7 +1402,7 @@ void daShip_c::setSelfMove(int param_1) {
     cLib_addCalcAngleS(&m0366, sVar2, 4, l_HIO.tiller_speed, 0x100);
     setMoveAngle(m0366);
     if (!checkStateFlg(daSFLG_FLY_e)) {
-        if (dComIfGp_checkPlayerStatus0(0, daPyStts0_UNK2000_e) || dComIfGp_event_runCheck() || daPy_getPlayerLinkActorClass()->checkNoControll()) {
+        if (dComIfGp_checkPlayerStatus0(0, daPyStts0_SUBJECT_e) || dComIfGp_event_runCheck() || daPy_getPlayerLinkActorClass()->checkNoControll()) {
             firstDecrementShipSpeed(0.0f);
         }
         else {
@@ -2493,7 +2501,7 @@ BOOL daShip_c::procTalk() {
     firstDecrementShipSpeed(0.0f);
     setMoveAngle(0);
     if (m0430 == fpcM_ERROR_PROCESS_ID_e) {
-        if (dComIfGp_checkCameraAttentionStatus(dComIfGp_getPlayerCameraID(0), 4)) {
+        if (dComIfGp_checkCameraAttentionStatus(dComIfGp_getPlayerCameraID(0), dCamAttnStts_00000004_e)) {
             m0430 = fopMsgM_messageSet(mNextMessageNo, &eyePos);
         }
     }
@@ -3484,7 +3492,7 @@ void daShip_c::setHeadAnm() {
         }
     } 
     else if (dComIfGp_checkPlayerStatus0(0, daPyStts0_SHIP_RIDE_e)) { 
-        if (dComIfGp_checkPlayerStatus0(0, daPyStts0_BOW_AIM_e | daPyStts0_UNK2000_e | daPyStts0_HOOKSHOT_AIM_e | daPyStts0_BOOMERANG_AIM_e | daPyStts0_TELESCOPE_LOOK_e) || 
+        if (dComIfGp_checkPlayerStatus0(0, daPyStts0_BOW_AIM_e | daPyStts0_SUBJECT_e | daPyStts0_HOOKSHOT_AIM_e | daPyStts0_BOOMERANG_AIM_e | daPyStts0_TELESCOPE_LOOK_e) || 
             dComIfGp_checkPlayerStatus1(0, daPyStts1_PICTO_BOX_AIM_e) || 
             mCurMode == 9) {
             newFileIndex = SHIP_BCK_KYAKKAN1;
@@ -3784,7 +3792,7 @@ BOOL daShip_c::execute() {
                 speedF = prev_speedF;
                 if (mTornadoActor) {
                     fVar4 = m0404 * 40.0f + 30.0f;
-                    if (!dComIfGp_checkPlayerStatus0(0, daPyStts0_BOW_AIM_e) || !dComIfGp_checkCameraAttentionStatus(0, 0x20)) {
+                    if (!dComIfGp_checkPlayerStatus0(0, daPyStts0_BOW_AIM_e) || !dComIfGp_checkCameraAttentionStatus(0, dCamAttnStts_00000020_e)) {
                         fVar4 *= 1.2f;
                     }
                 }
@@ -3819,7 +3827,7 @@ BOOL daShip_c::execute() {
             }
             else if (checkForceMove() && !dComIfGp_event_runCheck()) {
                 if (mTornadoActor) {
-                    if (!dComIfGp_checkPlayerStatus0(0, daPyStts0_BOW_AIM_e) || !dComIfGp_checkCameraAttentionStatus(0, 0x20)) {
+                    if (!dComIfGp_checkPlayerStatus0(0, daPyStts0_BOW_AIM_e) || !dComIfGp_checkCameraAttentionStatus(0, dCamAttnStts_00000020_e)) {
                         prev_speedF = 25.0f;
                     }
                     else {
diff --git a/src/d/actor/d_a_tag_msg.cpp b/src/d/actor/d_a_tag_msg.cpp
index 012b6efc..52b47c24 100644
--- a/src/d/actor/d_a_tag_msg.cpp
+++ b/src/d/actor/d_a_tag_msg.cpp
@@ -132,7 +132,7 @@ static BOOL daTag_Msg_actionEvent(daTag_Msg_c* a_this) {
     int message = a_this->getMessage();
     switch (msg_mode / 1) {
     case 0:
-        if (dComIfGp_checkCameraAttentionStatus(dComIfGp_getPlayerCameraID(0), 4)) {
+        if (dComIfGp_checkCameraAttentionStatus(dComIfGp_getPlayerCameraID(0), dCamAttnStts_00000004_e)) {
             msg_mode++;
         }
         break;