Use PlayerControlMode in a few places

9 files changed, 13 insertions, 13 deletions

diff --git a/src/enemy/gleerok.c b/src/enemy/gleerok.c
index cfad4857..d190e4c3 100644
--- a/src/enemy/gleerok.c
+++ b/src/enemy/gleerok.c
@@ -313,7 +313,7 @@ NONMATCH("asm/non_matching/gleerok/sub_0802D3B8.inc", void sub_0802D3B8(GleerokE
                 heap->filler[0x35] = 0;
             }
 #ifndef EU
-            gPlayerState.controlMode = 3;
+            gPlayerState.controlMode = CONTROL_DISABLED;
 #endif
             InitializeAnimation(super, 0x4c);
             break;
@@ -462,7 +462,7 @@ void sub_0802D7B4(GleerokEntity* this) {
             this->unk_84->ent2->actionDelay = 0x18;
             gRoomControls.camera_target = &gPlayerEntity;
 #ifndef EU
-            gPlayerState.controlMode = 1;
+            gPlayerState.controlMode = CONTROL_1;
 #endif
             gUnk_02034490[0] = 0;
             SoundReq(BGM_BOSS_THEME);
diff --git a/src/enemy/mazaalHead.c b/src/enemy/mazaalHead.c
index fa44a8d4..7fbb494a 100644
--- a/src/enemy/mazaalHead.c
+++ b/src/enemy/mazaalHead.c
@@ -224,7 +224,7 @@ void sub_08033FFC(Entity* this) {
             if (((*(Entity**)&this->field_0x74)->flags & 0x80) != 0) {
                 gRoomControls.camera_target = &gPlayerEntity;
                 sub_08034420(this);
-                gPlayerState.controlMode = 1;
+                gPlayerState.controlMode = CONTROL_1;
                 ResetPlayerAnimationAndAction();
                 SoundReq(BGM_BOSS_THEME);
             }
diff --git a/src/enemy/vaatiWrath.c b/src/enemy/vaatiWrath.c
index e8e9ebad..eb59cb89 100644
--- a/src/enemy/vaatiWrath.c
+++ b/src/enemy/vaatiWrath.c
@@ -218,7 +218,7 @@ void VaatiWrathType0Action1(Entity* this) {
             this->actionDelay = 0x1e;
             gRoomTransition.field_0x38 |= 1;
             gRoomControls.camera_target = &gPlayerEntity;
-            gPlayerState.controlMode = 1;
+            gPlayerState.controlMode = CONTROL_1;
             break;
         default:
             sub_08042004(this);
diff --git a/src/manager/manager39.c b/src/manager/manager39.c
index 9eceae78..48b6edf7 100644
--- a/src/manager/manager39.c
+++ b/src/manager/manager39.c
@@ -57,7 +57,7 @@ void sub_0805E18C(Manager39* this) {
     if (this->manager.unk_0b) {
         if (!--this->manager.unk_0f) {
             this->manager.unk_0b = 0;
-            gPlayerState.controlMode = 1;
+            gPlayerState.controlMode = CONTROL_1;
             ResetSystemPriority();
         }
     }
diff --git a/src/manager/managerA.c b/src/manager/managerA.c
index 8eda3b70..37679354 100644
--- a/src/manager/managerA.c
+++ b/src/manager/managerA.c
@@ -135,7 +135,7 @@ static void sub_08058514(ManagerA* this) {
         case 3:
             /* wait for player to finish talking */
             if (gPlayerEntity.action == PLAYER_NORMAL || gPlayerEntity.action == PLAYER_MINISH) {
-                gPlayerState.controlMode = 1;
+                gPlayerState.controlMode = CONTROL_1;
                 ResetPlayerEventPriority();
                 SetFlag(this->flag1);
                 DeleteThisEntity();
diff --git a/src/npcUtils.c b/src/npcUtils.c
index 5ae5f547..e50ee7cc 100644
--- a/src/npcUtils.c
+++ b/src/npcUtils.c
@@ -309,7 +309,7 @@ void sub_0806F118(Entity* ent) {
     u32 idx = sub_08002632(ent);
     NPCData* data = gUnk_08001A7C[idx];
     sub_0801DFB4(ent, data->_0, data->_2, data->_4);
-    gPlayerState.controlMode = 3;
+    gPlayerState.controlMode = CONTROL_DISABLED;
 }
 
 u32 UpdateFuseInteraction(Entity* ent) {
@@ -321,11 +321,11 @@ u32 UpdateFuseInteraction(Entity* ent) {
             ret = 0;
             break;
         case 2:
-            gPlayerState.controlMode = 3;
+            gPlayerState.controlMode = CONTROL_DISABLED;
             ret = 1;
         case 1:
             sub_0807919C();
-            gPlayerState.controlMode = 1;
+            gPlayerState.controlMode = CONTROL_1;
             break;
     }
     return ret;
diff --git a/src/object/cloud.c b/src/object/cloud.c
index 5c4383d8..37899c33 100644
--- a/src/object/cloud.c
+++ b/src/object/cloud.c
@@ -115,7 +115,7 @@ void sub_0809F69C(Entity* this) {
 void sub_0809F6CC(Entity* this) {
 
     if (((gRoomControls.scroll_flags & 4) == 0) && (--this->actionDelay == 0)) {
-        gPlayerState.controlMode = 1;
+        gPlayerState.controlMode = CONTROL_1;
         DeleteThisEntity();
     }
 }
diff --git a/src/player.c b/src/player.c
index 663a87ed..a2f262e4 100644
--- a/src/player.c
+++ b/src/player.c
@@ -325,7 +325,7 @@ extern ScriptExecutionContext gPlayerScriptExecutionContext;
 NONMATCH("asm/non_matching/playerItemPacciCane/CheckPlayerInactive.inc", u32 CheckPlayerInactive(void)) {
     if (!((gInput.newKeys & START_BUTTON) == 0 || gFadeControl.active || gUnk_02034490[0] ||
           (gMessage.doTextBox & 0x7F) || gSave.stats.health == 0 || !gSave.fillerD0[34] ||
-          gPlayerState.controlMode != 0 || gPriorityHandler.priority_timer != 0)) {
+          gPlayerState.controlMode != CONTROL_ENABLED || gPriorityHandler.priority_timer != 0)) {
         u32 tmp = gPlayerState.framestate ? gPlayerState.framestate : gPlayerState.framestate_last;
         switch (tmp) {
             case PL_STATE_DIE:
diff --git a/src/script.c b/src/script.c
index f6cb795f..fed1f183 100644
--- a/src/script.c
+++ b/src/script.c
@@ -1059,7 +1059,7 @@ void ScriptCommand_SetPlayerIdle(Entity* entity, ScriptExecutionContext* context
 }
 
 void ScriptCommand_EnablePlayerControl(Entity* entity, ScriptExecutionContext* context) {
-    gPlayerState.controlMode = 1;
+    gPlayerState.controlMode = CONTROL_1;
 }
 
 void ScriptCommand_DisablePlayerControl(Entity* entity, ScriptExecutionContext* context) {
@@ -1169,7 +1169,7 @@ void ScriptCommand_0807E9F0(Entity* entity, ScriptExecutionContext* context) {
     }
     if (tmp) {
         sub_0807919C();
-        gPlayerState.controlMode = 1;
+        gPlayerState.controlMode = CONTROL_1;
     } else {
     lbl:
         gActiveScriptInfo.commandSize = 0;