dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Update battle_controllers.h

Browse Source 
Simplified macros.
This commit is contained in:
DavidJCobb
2025-04-26 01:33:17 -04:00
parent 2738d11b0f
commit 8f5c1a452d
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/battle_controllers.h
+9 -9
View File
@@ -73,25 +73,25 @@ enum {
// directly. // directly.
#define MARK_BATTLE_CONTROLLER_ACTIVE_ON_LOCAL(battlerId) \ #define MARK_BATTLE_CONTROLLER_ACTIVE_ON_LOCAL(battlerId) \
do { gBattleControllerExecFlags |= gBitTable[battlerId]; } while (0) gBattleControllerExecFlags |= gBitTable[battlerId]
#define MARK_BATTLE_CONTROLLER_IDLE_ON_LOCAL(battlerId) \ #define MARK_BATTLE_CONTROLLER_IDLE_ON_LOCAL(battlerId) \
do { gBattleControllerExecFlags &= ~gBitTable(battlerId); } while (0) gBattleControllerExecFlags &= ~gBitTable(battlerId)
#define IS_BATTLE_CONTROLLER_ACTIVE_ON_LOCAL(battlerId) \ #define IS_BATTLE_CONTROLLER_ACTIVE_ON_LOCAL(battlerId) \
(gBattleControllerExecFlags & gBitTable[battlerId]) (gBattleControllerExecFlags & gBitTable[battlerId])
#define MARK_BATTLE_CONTROLLER_MESSAGE_OUTBOUND_OVER_LINK(battlerId) \ #define MARK_BATTLE_CONTROLLER_MESSAGE_OUTBOUND_OVER_LINK(battlerId) \
do { gBattleControllerExecFlags |= gBitTable[battlerId] << 28; } while (0) gBattleControllerExecFlags |= gBitTable[battlerId] << (32 - MAX_BATTLERS_COUNT)
#define MARK_BATTLE_CONTROLLER_MESSAGE_SYNCHRONIZED_OVER_LINK(battlerId) \ #define MARK_BATTLE_CONTROLLER_MESSAGE_SYNCHRONIZED_OVER_LINK(battlerId) \
do { gBattleControllerExecFlags &= ~((1 << 28) << (battlerId)); } while (0) gBattleControllerExecFlags &= ~((1 << 28) << (battlerId))
#define MARK_BATTLE_CONTROLLER_ACTIVE_FOR_PLAYER(battlerId, playerId) \ #define MARK_BATTLE_CONTROLLER_ACTIVE_FOR_PLAYER(battlerId, playerId) \
do { gBattleControllerExecFlags |= gBitTable[battlerId] << ((playerId) << 2); } while (0) gBattleControllerExecFlags |= gBitTable[battlerId] << ((playerId) << 2)
#define MARK_BATTLE_CONTROLLER_IDLE_FOR_PLAYER(battlerId, playerId) \ #define MARK_BATTLE_CONTROLLER_IDLE_FOR_PLAYER(battlerId, playerId) \
do { gBattleControllerExecFlags &= ~(gBitTable[battlerId] << ((playerId) * 4)); } while (0) gBattleControllerExecFlags &= ~(gBitTable[battlerId] << ((playerId) * 4))
#define IS_BATTLE_CONTROLLER_ACTIVE_FOR_PLAYER(battlerId, playerId) \ #define IS_BATTLE_CONTROLLER_ACTIVE_FOR_PLAYER(battlerId, playerId) \
(gBattleControllerExecFlags & (gBitTable[battlerId] << ((playerId) * 4))) (gBattleControllerExecFlags & (gBitTable[battlerId] << ((playerId) * 4)))
@@ -108,9 +108,9 @@ enum {
// Special arguments for Battle Controller functions. // Special arguments for Battle Controller functions.
enum { enum {
BATTLELINKMSGTYPE_ENGINE_TO_CONTROLLER = 0, // gBattleBufferA BATTLELINKMSGTYPE_ENGINE_TO_CONTROLLER, // gBattleBufferA
BATTLELINKMSGTYPE_CONTROLLER_TO_ENGINE = 1, // gBattleBufferB BATTLELINKMSGTYPE_CONTROLLER_TO_ENGINE, // gBattleBufferB
BATTLELINKMSGTYPE_CONTROLLER_BECOMING_IDLE = 2, BATTLELINKMSGTYPE_CONTROLLER_BECOMING_IDLE
}; };
enum { enum {