diff --git a/src/battle_util.c b/src/battle_util.c index a99a5c741..adb0c70ad 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -5605,16 +5605,16 @@ static bool32 UnnerveOn(u32 battlerId, u32 itemId) static bool32 GetMentalHerbEffect(u8 battlerId) { bool32 ret = FALSE; - // check infatuation + // Check infatuation if (gBattleMons[battlerId].status2 & STATUS2_INFATUATION) { gBattleMons[battlerId].status2 &= ~(STATUS2_INFATUATION); - gBattleCommunication[MULTISTRING_CHOOSER] = MULTI_CUREINFATUATION; //STRINGID_TARGETGOTOVERINFATUATION + gBattleCommunication[MULTISTRING_CHOOSER] = MULTI_CUREINFATUATION; // STRINGID_TARGETGOTOVERINFATUATION StringCopy(gBattleTextBuff1, gStatusConditionString_LoveJpn); ret = TRUE; } #if B_MENTAL_HERB >= GEN_5 - // check taunt + // Check taunt if (gDisableStructs[gBattlerTarget].tauntTimer != 0) { gDisableStructs[gBattlerTarget].tauntTimer = gDisableStructs[gBattlerTarget].tauntTimer2 = 0; @@ -5622,29 +5622,29 @@ static bool32 GetMentalHerbEffect(u8 battlerId) PREPARE_MOVE_BUFFER(gBattleTextBuff1, MOVE_TAUNT); ret = TRUE; } - // check encore + // Check encore if (gDisableStructs[gBattlerTarget].encoreTimer != 0) { gDisableStructs[gActiveBattler].encoredMove = 0; gDisableStructs[gBattlerTarget].encoreTimerStartValue = gDisableStructs[gBattlerTarget].encoreTimer = 0; - gBattleCommunication[MULTISTRING_CHOOSER] = MULTI_CUREENCORE; //STRINGID_PKMNENCOREENDED + gBattleCommunication[MULTISTRING_CHOOSER] = MULTI_CUREENCORE; // STRINGID_PKMNENCOREENDED ret = TRUE; } - // check torment + // Check torment if (gBattleMons[battlerId].status2 & STATUS2_TORMENT) { gBattleMons[battlerId].status2 &= ~(STATUS2_TORMENT); gBattleCommunication[MULTISTRING_CHOOSER] = MULTI_CURETORMENT; ret = TRUE; } - // check heal block + // Check heal block if (gStatuses3[battlerId] & STATUS3_HEAL_BLOCK) { gStatuses3[battlerId] & ~(STATUS3_HEAL_BLOCK); gBattleCommunication[MULTISTRING_CHOOSER] = MULTI_CUREHEALBLOCK; ret = TRUE; } - // disable + // Check disable if (gDisableStructs[gBattlerTarget].disableTimer != 0) { gDisableStructs[gBattlerTarget].disableTimer = gDisableStructs[gBattlerTarget].disableTimerStartValue = 0;