Skip to content

Commit

Permalink
Removed Transistor from master
Browse files Browse the repository at this point in the history
  • Loading branch information
AsparagusEduardo committed Oct 11, 2023
1 parent eedc617 commit 482029d
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 10 deletions.
1 change: 0 additions & 1 deletion include/config/battle.h
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,6 @@
#define B_ABSORBING_ABILITY_STRING GEN_LATEST // In Gen5+, the abilities that absorb moves of a certain type use a generic string for stat increases and decreases.
#define B_LEAF_GUARD_PREVENTS_REST GEN_LATEST // In Gen5+, Leaf Guard prevents the use of Rest in harsh sunlight.
#define B_SNOW_WARNING GEN_LATEST // In Gen9+, Snow Warning will summon snow instead of hail.
#define B_TRANSISTOR GEN_LATEST // In Gen9+, Transistor will only boost Electric-type moves by 1.3x as opposed to 1.5x.

// Item settings
#define B_HP_BERRIES GEN_LATEST // In Gen4+, berries which restore hp activate immediately after HP drops to half. In Gen3, the effect occurs at the end of the turn.
Expand Down
4 changes: 0 additions & 4 deletions src/battle_util.c
Original file line number Diff line number Diff line change
Expand Up @@ -8964,11 +8964,7 @@ static inline u32 CalcMoveBasePowerAfterModifiers(u32 move, u32 battlerAtk, u32
break;
case ABILITY_TRANSISTOR:
if (moveType == TYPE_ELECTRIC)
#if B_TRANSISTOR >= GEN_9
modifier = uq4_12_multiply(modifier, UQ_4_12(5325 / 4096));
#else
modifier = uq4_12_multiply(modifier, UQ_4_12(1.5));
#endif
break;
case ABILITY_DRAGONS_MAW:
if (moveType == TYPE_DRAGON)
Expand Down
5 changes: 0 additions & 5 deletions test/battle/ability/transistor.c
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,7 @@ SINGLE_BATTLE_TEST("Transistor increases Electric-type move damage", s16 damage)
HP_BAR(opponent, captureDamage: &results[i].damage);
} FINALLY {
EXPECT_EQ(results[0].damage, results[1].damage); // Tackle should be unaffected
#if B_TRANSISTOR >= GEN_9
EXPECT_MUL_EQ(results[2].damage, Q_4_12(5325 / 4096), results[3].damage); // Wild Charge should be affected
EXPECT_MUL_EQ(results[4].damage, Q_4_12(5325 / 4096), results[5].damage); // Thunder Shock should be affected
#else
EXPECT_MUL_EQ(results[2].damage, Q_4_12(1.5), results[3].damage); // Wild Charge should be affected
EXPECT_MUL_EQ(results[4].damage, Q_4_12(1.5), results[5].damage); // Thunder Shock should be affected
#endif
}
}

0 comments on commit 482029d

Please sign in to comment.