diff --git a/src/battle_controller_oak_old_man.c b/src/battle_controller_oak_old_man.c
index 71989a1d9..00679e290 100644
--- a/src/battle_controller_oak_old_man.c
+++ b/src/battle_controller_oak_old_man.c
@@ -123,9 +123,9 @@ void SetControllerToOakOrOldMan(u32 battler)
 
 static void OakOldManBufferRunCommand(u32 battler)
 {
-    if (gBattleControllerExecFlags & gBitTable[battler])
+    if (gBattleControllerExecFlags & (1u << battler))
     {
-        if (gBattleResources->bufferA[battler][0] < NELEMS(sOakOldManBufferCommands))
+        if (gBattleResources->bufferA[battler][0] < ARRAY_COUNT(sOakOldManBufferCommands))
             sOakOldManBufferCommands[gBattleResources->bufferA[battler][0]](battler);
         else
             OakOldManBufferExecCompleted(battler);
@@ -277,7 +277,7 @@ static void OakOldManSetBattleEndCallbacks(u32 battler)
 void OakOldManHandleInputChooseMove(u32 battler)
 {
     HandleInputChooseMove(battler);
-    if (!(gBattleControllerExecFlags & gBitTable[battler]))
+    if (!(gBattleControllerExecFlags & (1u << battler)))
         OakOldManBufferExecCompleted(battler);
 }
 
@@ -660,7 +660,7 @@ static void OakOldManBufferExecCompleted(u32 battler)
     }
     else
     {
-        gBattleControllerExecFlags &= ~gBitTable[battler];
+        gBattleControllerExecFlags &= ~(1u << battler);
     }
 }
 
diff --git a/src/battle_controller_pokedude.c b/src/battle_controller_pokedude.c
index 9eb6ff936..0cdfee846 100644
--- a/src/battle_controller_pokedude.c
+++ b/src/battle_controller_pokedude.c
@@ -151,9 +151,9 @@ void SetControllerToPokedude(u32 battler)
 
 static void PokedudeBufferRunCommand(u32 battler)
 {
-    if (gBattleControllerExecFlags & gBitTable[battler])
+    if (gBattleControllerExecFlags & (1u << battler))
     {
-        if (gBattleResources->bufferA[battler][0] < NELEMS(sPokedudeBufferCommands))
+        if (gBattleResources->bufferA[battler][0] < ARRAY_COUNT(sPokedudeBufferCommands))
         {
             if (!HandlePokedudeVoiceoverEtc(battler))
                 sPokedudeBufferCommands[gBattleResources->bufferA[battler][0]](battler);
@@ -377,7 +377,7 @@ static void PokedudeBufferExecCompleted(u32 battler)
     }
     else
     {
-        gBattleControllerExecFlags &= ~gBitTable[battler];
+        gBattleControllerExecFlags &= ~(1u << battler);
     }
 }
 
@@ -1219,7 +1219,7 @@ static void PokedudeAction_PrintMessageWithHealthboxPals(u32 battler)
     case 1:
         if (!gPaletteFade.active)
         {
-            u32 mask = (gBitTable[gBattleStruct->pdHealthboxPal2] | gBitTable[gBattleStruct->pdHealthboxPal1]) << 16;
+            u32 mask = ((1u << gBattleStruct->pdHealthboxPal2) | (1u << gBattleStruct->pdHealthboxPal1)) << 16;
 
             ++mask; // It's possible that this is influenced by other functions, as
             --mask; // this also striked in battle_controller_oak_old_man.c but was naturally fixed.
@@ -1245,7 +1245,7 @@ static void PokedudeAction_PrintMessageWithHealthboxPals(u32 battler)
             u32 mask;
 
             PlaySE(SE_SELECT);
-            mask = (gBitTable[gBattleStruct->pdHealthboxPal2] | gBitTable[gBattleStruct->pdHealthboxPal1]) << 16;
+            mask = ((1u << gBattleStruct->pdHealthboxPal2) | (1u << gBattleStruct->pdHealthboxPal1)) << 16;
             ++mask;
             --mask;
             BeginNormalPaletteFade(mask, 4, 0, 8, RGB_BLACK);