ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-18 01:14:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Rising Voltage

Browse Source
This commit is contained in:
Xhyzi 2021-06-15 17:36:50 +02:00
parent ee3f3eb78f
commit e7ec4df70b
4 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/battle_scripts_1.s
View File

@ -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

3
include/constants/battle_move_effects.h
View File

@ -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

5
src/battle_util.c
View File

@ -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)

2
src/data/battle_moves.h
View File

@ -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,