Skip to content

Commit

Permalink
Update src/battle_tv.c
Browse files Browse the repository at this point in the history
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
  • Loading branch information
cfmnephrite and AsparagusEduardo authored Jan 11, 2024
1 parent 1c59fa4 commit b9b059c
Showing 1 changed file with 6 additions and 8 deletions.
14 changes: 6 additions & 8 deletions src/battle_tv.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit b9b059c

Please sign in to comment.