diff --git a/src/battle_ai_main.c b/src/battle_ai_main.c index cb5e7a0851..b823e6e23e 100644 --- a/src/battle_ai_main.c +++ b/src/battle_ai_main.c @@ -473,9 +473,8 @@ void SetAiLogicDataForTurn(struct AiLogicData *aiData) battlersCount = gBattlersCount; AI_DATA->aiCalcInProgress = TRUE; - #if DEBUG_AI_DELAY_TIMER - CycleCountStart(); - #endif + if (DEBUG_AI_DELAY_TIMER) + CycleCountStart(); for (battlerAtk = 0; battlerAtk < battlersCount; battlerAtk++) { if (!IsBattlerAlive(battlerAtk)) @@ -491,10 +490,9 @@ void SetAiLogicDataForTurn(struct AiLogicData *aiData) SetBattlerAiMovesData(aiData, battlerAtk, battlersCount, weather); } - #if DEBUG_AI_DELAY_TIMER - // We add to existing to compound multiple calls - gBattleStruct->aiDelayCycles += CycleCountEnd(); - #endif + if (DEBUG_AI_DELAY_TIMER) + // We add to existing to compound multiple calls + gBattleStruct->aiDelayCycles += CycleCountEnd(); AI_DATA->aiCalcInProgress = FALSE; } diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c index 7ea7136dfa..5ff81bf673 100644 --- a/src/battle_controller_player.c +++ b/src/battle_controller_player.c @@ -2011,7 +2011,7 @@ static void HandleChooseActionAfterDma3(u32 battler) { gBattleStruct->aiDelayFrames = gMain.vblankCounter1 - gBattleStruct->aiDelayTimer; gBattleStruct->aiDelayTimer = 0; - #if DEBUG_AI_DELAY_TIMER + if (DEBUG_AI_DELAY_TIMER) { static const u8 sFramesText[] = _(" frames thinking\n"); static const u8 sCyclesText[] = _(" cycles"); @@ -2023,7 +2023,6 @@ static void HandleChooseActionAfterDma3(u32 battler) StringAppend(gDisplayedStringBattle, sCyclesText); BattlePutTextOnWindow(gDisplayedStringBattle, B_WIN_ACTION_PROMPT); } - #endif // DEBUG_AI_DELAY_TIMER } gBattlerControllerFuncs[battler] = HandleInputChooseAction; }