ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-16 11:37:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Implemented Barb Barrage's effect

Browse Source
This commit is contained in:
LOuroboros 2022-12-14 09:33:09 -03:00
parent 1229fa752a
commit 4bb86c5d96
4 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/battle_scripts_1.s
View File

@ -420,6 +420,7 @@ gBattleScriptsForMoveEffects::
.4byte BattleScript_EffectShellTrap @ EFFECT_SHELL_TRAP
.4byte BattleScript_EffectDireClaw @ EFFECT_DIRE_CLAW
.4byte BattleScript_EffectStoneAxe @ EFFECT_STONE_AXE
.4byte BattleScript_EffectBarbBarrage @ EFFECT_BARB_BARRAGE
BattleScript_EffectStoneAxe::
call BattleScript_EffectHit_Ret
@ -3265,6 +3266,7 @@ BattleScript_CantMakeAsleep::
orhalfword gMoveResultFlags, MOVE_RESULT_FAILED
goto BattleScript_MoveEnd
BattleScript_EffectBarbBarrage:
BattleScript_EffectPoisonHit:
setmoveeffect MOVE_EFFECT_POISON
goto BattleScript_EffectHit

3
include/constants/battle_move_effects.h
View File

@ -401,7 +401,8 @@
#define EFFECT_SHELL_TRAP 395
#define EFFECT_DIRE_CLAW 396
#define EFFECT_STONE_AXE 397
#define EFFECT_BARB_BARRAGE 398
#define NUM_BATTLE_MOVE_EFFECTS 398
#define NUM_BATTLE_MOVE_EFFECTS 399
#endif // GUARD_CONSTANTS_BATTLE_MOVE_EFFECTS_H

4
src/battle_util.c
View File

@ -8483,6 +8483,10 @@ static u16 CalcMoveBasePower(u16 move, u8 battlerAtk, u8 battlerDef)
basePower = CalcBeatUpPower();
#endif
break;
case EFFECT_BARB_BARRAGE:
if (gBattleMons[battlerDef].status1 & STATUS1_PSN_ANY)
basePower *= 2;
break;
}
// Move-specific base power changes

10
src/data/battle_moves.h
View File

@ -13490,12 +13490,16 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_Z] =
[MOVE_BARB_BARRAGE] =
{
.effect = EFFECT_PLACEHOLDER, // EFFECT_BARB_BARRAGE,
.effect = EFFECT_BARB_BARRAGE,
.power = 60,
.type = TYPE_POISON,
.accuracy = 100,
.pp = 15,
.secondaryEffectChance = 0,
#if B_UPDATED_MOVE_DATA >= GEN_9
.pp = 10,
#else
.pp = 15,
#endif
.secondaryEffectChance = 50,
.target = MOVE_TARGET_SELECTED,
.priority = 0,
.flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED | FLAG_SHEER_FORCE_BOOST,