summaryrefslogtreecommitdiff
path: root/src/battle_util.c
diff options
context:
space:
mode:
authorGriffinR <griffin.g.richards@gmail.com>2021-03-30 17:38:09 -0400
committerGriffinR <griffin.g.richards@gmail.com>2021-03-30 17:38:09 -0400
commit8c6e89e994b312b3c6d36bcda8636343f80e4801 (patch)
treefc4eaf5a778dfda3405af33131960a64ec885048 /src/battle_util.c
parentd5d1caf96550c91baef4a7f02670a6f1c83f6559 (diff)
Bit shifts from hex to decimal
Diffstat (limited to 'src/battle_util.c')
-rw-r--r--src/battle_util.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/battle_util.c b/src/battle_util.c
index 6e1202bd1..c0d897707 100644
--- a/src/battle_util.c
+++ b/src/battle_util.c
@@ -801,7 +801,7 @@ void MarkAllBattlersForControllerExec(void) // unused
if (gBattleTypeFlags & BATTLE_TYPE_LINK)
{
for (i = 0; i < gBattlersCount; i++)
- gBattleControllerExecFlags |= gBitTable[i] << 0x1C;
+ gBattleControllerExecFlags |= gBitTable[i] << (32 - MAX_BATTLERS_COUNT);
}
else
{
@@ -813,7 +813,7 @@ void MarkAllBattlersForControllerExec(void) // unused
void MarkBattlerForControllerExec(u8 battlerId)
{
if (gBattleTypeFlags & BATTLE_TYPE_LINK)
- gBattleControllerExecFlags |= gBitTable[battlerId] << 0x1C;
+ gBattleControllerExecFlags |= gBitTable[battlerId] << (32 - MAX_BATTLERS_COUNT);
else
gBattleControllerExecFlags |= gBitTable[battlerId];
}