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

Implemented Infernal Parade's effect

Browse Source
This commit is contained in:
LOuroboros 2022-12-14 11:03:46 -03:00
parent 1595a66559
commit 05a34edb7d
4 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
data/battle_scripts_1.s
View File

@ -424,6 +424,11 @@ gBattleScriptsForMoveEffects::
.4byte BattleScript_EffectDireClaw @ EFFECT_DIRE_CLAW .4byte BattleScript_EffectDireClaw @ EFFECT_DIRE_CLAW
.4byte BattleScript_EffectBarbBarrage @ EFFECT_BARB_BARRAGE .4byte BattleScript_EffectBarbBarrage @ EFFECT_BARB_BARRAGE
.4byte BattleScript_EffectTripleArrows @ EFFECT_TRIPLE_ARROWS .4byte BattleScript_EffectTripleArrows @ EFFECT_TRIPLE_ARROWS
.4byte BattleScript_EffectInfernalParade @ EFFECT_INFERNAL_PARADE
BattleScript_EffectInfernalParade::
setmoveeffect MOVE_EFFECT_BURN
goto BattleScript_EffectHit
BattleScript_EffectTripleArrows:: BattleScript_EffectTripleArrows::
setmoveeffect MOVE_EFFECT_TRIPLE_ARROWS setmoveeffect MOVE_EFFECT_TRIPLE_ARROWS

3
include/constants/battle_move_effects.h
View File

@ -405,7 +405,8 @@
#define EFFECT_DIRE_CLAW 399 #define EFFECT_DIRE_CLAW 399
#define EFFECT_BARB_BARRAGE 400 #define EFFECT_BARB_BARRAGE 400
#define EFFECT_TRIPLE_ARROWS 401 #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 #endif // GUARD_CONSTANTS_BATTLE_MOVE_EFFECTS_H

4
src/battle_util.c
View File

@ -8780,6 +8780,10 @@ static u16 CalcMoveBasePower(u16 move, u8 battlerAtk, u8 battlerDef)
if (IsBattlerTerrainAffected(gBattlerAttacker, STATUS_FIELD_ELECTRIC_TERRAIN)) if (IsBattlerTerrainAffected(gBattlerAttacker, STATUS_FIELD_ELECTRIC_TERRAIN))
MulModifier(&basePower, UQ_4_12(1.5)); MulModifier(&basePower, UQ_4_12(1.5));
break; break;
case EFFECT_INFERNAL_PARADE:
if (gBattleMons[battlerDef].status1 & STATUS1_ANY)
basePower *= 2;
break;
} }
// Move-specific base power changes // Move-specific base power changes

4
src/data/battle_moves.h
View File

@ -12744,12 +12744,12 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_Z] =
[MOVE_INFERNAL_PARADE] = [MOVE_INFERNAL_PARADE] =
{ {
.effect = EFFECT_PLACEHOLDER, // EFFECT_INFERNAL_PARADE, .effect = EFFECT_INFERNAL_PARADE,
.power = 60, .power = 60,
.type = TYPE_GHOST, .type = TYPE_GHOST,
.accuracy = 100, .accuracy = 100,
.pp = 15, .pp = 15,
.secondaryEffectChance = 0, .secondaryEffectChance = 30,
.target = MOVE_TARGET_SELECTED, .target = MOVE_TARGET_SELECTED,
.priority = 0, .priority = 0,
.flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED | FLAG_SHEER_FORCE_BOOST, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED | FLAG_SHEER_FORCE_BOOST,