From 1e32cf278c4ea0942ec5fbf78a7a9763ee3f5f39 Mon Sep 17 00:00:00 2001 From: cawtds <38510667+cawtds@users.noreply.github.com> Date: Fri, 30 May 2025 16:31:38 +0200 Subject: [PATCH] fix battle controller macros (#7021) --- include/battle_controllers.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/battle_controllers.h b/include/battle_controllers.h index 0716ae2e54..3eddc95578 100644 --- a/include/battle_controllers.h +++ b/include/battle_controllers.h @@ -82,19 +82,19 @@ enum { (gBattleControllerExecFlags & (1u << battler)) #define MARK_BATTLE_CONTROLLER_MESSAGE_OUTBOUND_OVER_LINK(battler) \ - gBattleControllerExecFlags |= (1u << battler) << (32 - MAX_BATTLERS_COUNT) + gBattleControllerExecFlags |= ((1u << battler) << (32 - MAX_BATTLERS_COUNT)) #define MARK_BATTLE_CONTROLLER_MESSAGE_SYNCHRONIZED_OVER_LINK(battler) \ gBattleControllerExecFlags &= ~((1 << 28) << (battler)) #define MARK_BATTLE_CONTROLLER_ACTIVE_FOR_PLAYER(battler, playerId) \ - gBattleControllerExecFlags |= (1u << battler) << ((playerId) << 2) + gBattleControllerExecFlags |= ((1u << battler) << ((playerId) << 2)) #define MARK_BATTLE_CONTROLLER_IDLE_FOR_PLAYER(battler, playerId) \ - gBattleControllerExecFlags &= ~(1u << battler) << ((playerId) * 4) + gBattleControllerExecFlags &= ~((1u << battler) << ((playerId) * 4)) #define IS_BATTLE_CONTROLLER_ACTIVE_FOR_PLAYER(battler, playerId) \ - (gBattleControllerExecFlags & (1u << battler) << ((playerId) * 4)) + (gBattleControllerExecFlags & ((1u << battler) << ((playerId) * 4))) // This actually checks if a specific controller is active on any player or if // *any* controller is pending sync over link communications, but the macro name