ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-02-24 21:25:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Double Struggle damage for PB

Browse Source 
Not sure if this should hit twice. If not, this works.
This commit is contained in:
BuffelSaft 2021-11-13 15:29:24 +13:00
parent d0336a9edf
commit 2bf72fc51e
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/battle_script_commands.c
View File

@ -1142,7 +1142,6 @@ static const u16 sFinalStrikeOnlyEffects[] =
EFFECT_THIEF, EFFECT_THIEF,
EFFECT_BURN_UP, EFFECT_BURN_UP,
EFFECT_SECRET_POWER, EFFECT_SECRET_POWER,
EFFECT_HIT_SWITCH_TARGET,
EFFECT_SMACK_DOWN, EFFECT_SMACK_DOWN,
EFFECT_SPARKLING_ARIA, EFFECT_SPARKLING_ARIA,
EFFECT_SMELLINGSALT, EFFECT_SMELLINGSALT,
@ -3274,6 +3273,8 @@ void SetMoveEffect(bool32 primary, u32 certain)
gBattleMoveDamage = (gBattleMons[gEffectBattler].maxHP) / 4; gBattleMoveDamage = (gBattleMons[gEffectBattler].maxHP) / 4;
if (gBattleMoveDamage == 0) if (gBattleMoveDamage == 0)
gBattleMoveDamage = 1; gBattleMoveDamage = 1;
if (GetBattlerAbility(gEffectBattler) == ABILITY_PARENTAL_BOND)
gBattleMoveDamage *= 2;
BattleScriptPush(gBattlescriptCurrInstr + 1); BattleScriptPush(gBattlescriptCurrInstr + 1);
gBattlescriptCurrInstr = BattleScript_MoveEffectRecoil; gBattlescriptCurrInstr = BattleScript_MoveEffectRecoil;