From b9b059c06bccc9dfc98530da83395bd882bca5cd Mon Sep 17 00:00:00 2001 From: Nephrite Date: Fri, 12 Jan 2024 02:13:30 +0900 Subject: [PATCH] Update src/battle_tv.c Co-authored-by: Eduardo Quezada D'Ottone --- src/battle_tv.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/battle_tv.c b/src/battle_tv.c index beb480905af4..1e494294e69a 100644 --- a/src/battle_tv.c +++ b/src/battle_tv.c @@ -1267,22 +1267,20 @@ static void AddMovePoints(u8 caseId, u16 arg1, u8 arg2, u8 arg3) switch (caseId) { - case PTS_MOVE_EFFECT: //arg1 == moveSlot, arg2 == move + case PTS_MOVE_EFFECT: // arg1 -> move slot, arg2 -> move { u8 baseFromEffect = sPointsArray[caseId][gBattleMoves[arg2].effect]; - // various cases add/remove points + // Various cases to add/remove points if (gBattleMoves[arg2].recoil > 0) - baseFromEffect++; // recoil moves + baseFromEffect++; // Recoil moves if (MoveHasMoveEffect(arg2, MOVE_EFFECT_RAPIDSPIN)) baseFromEffect++; - if (MoveHasMoveEffect(arg2, MOVE_EFFECT_SP_ATK_TWO_DOWN) - || MoveHasMoveEffect(arg2, MOVE_EFFECT_ATK_DEF_DOWN)) - baseFromEffect += 2; // Overheat etc & Superpower + if (MoveHasMoveEffect(arg2, MOVE_EFFECT_SP_ATK_TWO_DOWN) || MoveHasMoveEffect(arg2, MOVE_EFFECT_ATK_DEF_DOWN)) + baseFromEffect += 2; // Overheat, Superpower, etc. if (MoveHasMoveEffect(arg2, MOVE_EFFECT_STEAL_ITEM)) baseFromEffect += 3; - if (MoveHasMoveEffect(arg2, MOVE_EFFECT_WRAP) - || MoveHasMoveEffectSelf(arg2, MOVE_EFFECT_THRASH)) + if (MoveHasMoveEffect(arg2, MOVE_EFFECT_WRAP) || MoveHasMoveEffectSelf(arg2, MOVE_EFFECT_THRASH)) baseFromEffect += 3; if (MoveHasMoveEffect(arg2, MOVE_EFFECT_RECHARGE)) baseFromEffect += 4;