diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index 5be16a0a1..f1f312e6a 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -424,6 +424,11 @@ gBattleScriptsForMoveEffects:: .4byte BattleScript_EffectDireClaw @ EFFECT_DIRE_CLAW .4byte BattleScript_EffectBarbBarrage @ EFFECT_BARB_BARRAGE .4byte BattleScript_EffectTripleArrows @ EFFECT_TRIPLE_ARROWS + .4byte BattleScript_EffectInfernalParade @ EFFECT_INFERNAL_PARADE + +BattleScript_EffectInfernalParade:: + setmoveeffect MOVE_EFFECT_BURN + goto BattleScript_EffectHit BattleScript_EffectTripleArrows:: setmoveeffect MOVE_EFFECT_TRIPLE_ARROWS diff --git a/include/constants/battle_move_effects.h b/include/constants/battle_move_effects.h index 017320eef..a60d8ee03 100644 --- a/include/constants/battle_move_effects.h +++ b/include/constants/battle_move_effects.h @@ -405,7 +405,8 @@ #define EFFECT_DIRE_CLAW 399 #define EFFECT_BARB_BARRAGE 400 #define EFFECT_TRIPLE_ARROWS 401 +#define EFFECT_INFERNAL_PARADE 402 -#define NUM_BATTLE_MOVE_EFFECTS 402 +#define NUM_BATTLE_MOVE_EFFECTS 403 #endif // GUARD_CONSTANTS_BATTLE_MOVE_EFFECTS_H diff --git a/src/battle_util.c b/src/battle_util.c index dea28b5d8..84ce98a22 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -8780,6 +8780,10 @@ static u16 CalcMoveBasePower(u16 move, u8 battlerAtk, u8 battlerDef) if (IsBattlerTerrainAffected(gBattlerAttacker, STATUS_FIELD_ELECTRIC_TERRAIN)) MulModifier(&basePower, UQ_4_12(1.5)); break; + case EFFECT_INFERNAL_PARADE: + if (gBattleMons[battlerDef].status1 & STATUS1_ANY) + basePower *= 2; + break; } // Move-specific base power changes diff --git a/src/data/battle_moves.h b/src/data/battle_moves.h index 32927b82e..83cd8d616 100644 --- a/src/data/battle_moves.h +++ b/src/data/battle_moves.h @@ -12744,12 +12744,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_Z] = [MOVE_INFERNAL_PARADE] = { - .effect = EFFECT_PLACEHOLDER, // EFFECT_INFERNAL_PARADE, + .effect = EFFECT_INFERNAL_PARADE, .power = 60, .type = TYPE_GHOST, .accuracy = 100, .pp = 15, - .secondaryEffectChance = 0, + .secondaryEffectChance = 30, .target = MOVE_TARGET_SELECTED, .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED | FLAG_SHEER_FORCE_BOOST,