diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-03-31 00:36:20 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-31 00:36:20 -0400 |
| commit | 5d7c438efcd341c777c866a7eb3f8401f8548dc5 (patch) | |
| tree | ea4c848c8239b51efff64c5bc4fccc9517c2722d /src/battle_util.c | |
| parent | e8b6b4b65e3b53f5fcf83035b9f848c5ef6378bd (diff) | |
| parent | 8c6e89e994b312b3c6d36bcda8636343f80e4801 (diff) | |
Merge pull request #1391 from GriffinRichards/objvram
Add some uses of OBJ_VRAM/VRAM_SIZE
Diffstat (limited to 'src/battle_util.c')
| -rw-r--r-- | src/battle_util.c | 4 |
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]; } |