diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index cc6a37668..2e5ad0253 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -372,6 +372,7 @@ gBattleScriptsForMoveEffects:: @ 82D86A8 .4byte BattleScript_EffectExpandingForce .4byte BattleScript_EffectScaleShot .4byte BattleScript_EffectMeteorBeam + .4byte BattleScript_EffectRisingVoltage BattleScript_EffectMeteorBeam:: @ DecideTurn @@ -2145,6 +2146,7 @@ BattleScript_EffectRevelationDance: BattleScript_EffectBelch: BattleScript_EffectBodyPress: BattleScript_EffectExpandingForce: +BattleScript_EffectRisingVoltage: BattleScript_HitFromAtkCanceler:: attackcanceler diff --git a/include/constants/battle_move_effects.h b/include/constants/battle_move_effects.h index 47721e447..03ea11136 100644 --- a/include/constants/battle_move_effects.h +++ b/include/constants/battle_move_effects.h @@ -356,7 +356,8 @@ #define EFFECT_EXPANDING_FORCE 350 #define EFFECT_SCALE_SHOT 351 #define EFFECT_METEOR_BEAM 352 +#define EFFECT_RISING_VOLTAGE 353 -#define NUM_BATTLE_MOVE_EFFECTS 353 +#define NUM_BATTLE_MOVE_EFFECTS 354 #endif // GUARD_CONSTANTS_BATTLE_MOVE_EFFECTS_H diff --git a/src/battle_util.c b/src/battle_util.c index 92662bb20..4c46250dc 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -7214,6 +7214,11 @@ static u16 CalcMoveBasePower(u16 move, u8 battlerAtk, u8 battlerDef) if (gFieldStatuses & STATUS_FIELD_PSYCHIC_TERRAIN) basePower = 120; break; + case EFFECT_RISING_VOLTAGE: + if (gFieldStatuses & STATUS_FIELD_ELECTRIC_TERRAIN && !IS_BATTLER_OF_TYPE(battlerDef, TYPE_FLYING) + && gBattleMons[battlerDef].item != ITEM_AIR_BALLOON && gBattleMons[battlerDef].ability != ABILITY_LEVITATE) + basePower *= 2; + break; } if (basePower == 0) diff --git a/src/data/battle_moves.h b/src/data/battle_moves.h index 680c008fd..9e0c18298 100644 --- a/src/data/battle_moves.h +++ b/src/data/battle_moves.h @@ -11318,7 +11318,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = [MOVE_RISING_VOLTAGE] = { - .effect = EFFECT_PLACEHOLDER, //TODO + .effect = EFFECT_RISING_VOLTAGE, .power = 70, .type = TYPE_ELECTRIC, .accuracy = 100,