diff --git a/include/battle_controllers.h b/include/battle_controllers.h index 3d8d13d3a9..e7a0d50b12 100644 --- a/include/battle_controllers.h +++ b/include/battle_controllers.h @@ -96,6 +96,9 @@ enum { #define IS_BATTLE_CONTROLLER_ACTIVE_FOR_PLAYER(battlerId, playerId) \ (gBattleControllerExecFlags & (gBitTable[battlerId] << ((playerId) * 4))) +// This actually checks if a specific controller is active on any player or if +// *any* controlleris pending sync over link communications, but the macro name +// can only be so specific before it just gets ridiculous. #define IS_BATTLE_CONTROLLER_ACTIVE_OR_PENDING_SYNC_ANYWHERE(battlerId) \ (gBattleControllerExecFlags & ( \ (gBitTable[battlerId]) \ diff --git a/src/battle_util.c b/src/battle_util.c index e9edfe06ff..f2e55cea27 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -827,6 +827,7 @@ void PressurePPLoseOnUsingPerishSong(u8 attacker) } } +// See comments for MarkBattlerForControllerExec. static void UNUSED MarkAllBattlersForControllerExec(void) { int i;