From 482029d7ec100e4c03abc9808df6b3ac2ff888e7 Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Wed, 11 Oct 2023 13:07:16 -0300 Subject: [PATCH] Removed Transistor from master --- include/config/battle.h | 1 - src/battle_util.c | 4 ---- test/battle/ability/transistor.c | 5 ----- 3 files changed, 10 deletions(-) diff --git a/include/config/battle.h b/include/config/battle.h index 6f09b8ebf..aee79daee 100644 --- a/include/config/battle.h +++ b/include/config/battle.h @@ -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. diff --git a/src/battle_util.c b/src/battle_util.c index 4ff2b37fc..887f0e03b 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -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) diff --git a/test/battle/ability/transistor.c b/test/battle/ability/transistor.c index 3da12c832..c6c14fcb4 100644 --- a/test/battle/ability/transistor.c +++ b/test/battle/ability/transistor.c @@ -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 } }