diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 0405d5055..98056aff2 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -10791,7 +10791,7 @@ static void Cmd_handlerollout(void) static void Cmd_jumpifconfusedandstatmaxed(void) { if (gBattleMons[gBattlerTarget].status2 & STATUS2_CONFUSION - && CompareStat(gBattlerTarget, gBattlescriptCurrInstr[1], MAX_STAT_STAGE, CMP_LESS_THAN)) + && !CompareStat(gBattlerTarget, gBattlescriptCurrInstr[1], MAX_STAT_STAGE, CMP_LESS_THAN)) gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 2); // Fails if we're confused AND stat cannot be raised else gBattlescriptCurrInstr += 6; diff --git a/src/battle_util.c b/src/battle_util.c index bdb1b4912..ac9e9dc99 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -6350,7 +6350,7 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn) } break; case ITEMEFFECT_KINGSROCK: - // occur on each hit of a multi-strike move + // Occur on each hit of a multi-strike move switch (atkHoldEffect) { case HOLD_EFFECT_FLINCH: @@ -6383,7 +6383,7 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn) } break; case ITEMEFFECT_LIFEORB_SHELLBELL: - // occur after the final hit of a multi-strike move + // Occur after the final hit of a multi-strike move switch (atkHoldEffect) { case HOLD_EFFECT_SHELL_BELL: @@ -6401,7 +6401,7 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn) gSpecialStatuses[gBattlerTarget].dmg = 0; BattleScriptPushCursor(); gBattlescriptCurrInstr = BattleScript_ItemHealHP_Ret; - effect = TRUE; + effect = ITEM_HP_CHANGE; } break; case HOLD_EFFECT_LIFE_ORB: @@ -6413,7 +6413,7 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn) gBattleMoveDamage = gBattleMons[gBattlerAttacker].maxHP / 10; if (gBattleMoveDamage == 0) gBattleMoveDamage = 1; - effect = TRUE; + effect = ITEM_HP_CHANGE; BattleScriptPushCursor(); gBattlescriptCurrInstr = BattleScript_ItemHurtRet; gLastUsedItem = gBattleMons[gBattlerAttacker].item; @@ -6424,7 +6424,7 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn) && gBattleMons[gBattlerAttacker].hp != 0 && gBattleMoves[gCurrentMove].flags & FLAG_SOUND && CompareStat(gBattlerAttacker, STAT_SPATK, MAX_STAT_STAGE, CMP_LESS_THAN) - && !NoAliveMonsForEitherParty()) // don't activate if battle will end + && !NoAliveMonsForEitherParty()) // Don't activate if battle will end { gLastUsedItem = atkItem; gBattleScripting.battler = gBattlerAttacker;