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

ally cannot block prankster + perish song

Browse Source
This commit is contained in:
ghoulslash 2021-09-21 11:54:59 -04:00
parent 9c79ba05fc
commit 80a48de702
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
data/battle_scripts_1.s
View File

@ -3700,7 +3700,8 @@ BattleScript_EffectPerishSong::
setbyte gBattlerTarget, 0
BattleScript_PerishSongLoop::
jumpifability BS_TARGET, ABILITY_SOUNDPROOF, BattleScript_PerishSongBlocked
jumpifbyteequal gBattlerAttacker, gBattlerTarget, BattleScript_PerishSongLoopIncrement @ cannot block your own perish song
jumpifbyteequal gBattlerAttacker, gBattlerTarget, BattleScript_PerishSongLoopIncrement @ Cannot block your own perish song
jumpiftargetally BattleScript_PerishSongLoopIncrement @ Cannot block ally perish song
jumpifability BS_ATTACKER, ABILITY_PRANKSTER, BattleScript_PerishSongCheckPrankster
goto BattleScript_PerishSongLoopIncrement
BattleScript_PerishSongCheckPrankster:

2
src/battle_script_commands.c
View File

@ -10731,7 +10731,7 @@ static void Cmd_trysetperishsong(void)
if (gStatuses3[i] & STATUS3_PERISH_SONG
|| gBattleMons[i].ability == ABILITY_SOUNDPROOF
|| (B_PRANKSTER_DARK_TYPES >= GEN_7
&& i != gBattlerAttacker
&& GetBattlerSide(i) != GetBattlerSide(gBattlerAttacker)
&& GetBattlerAbility(gBattlerAttacker) == ABILITY_PRANKSTER
&& IS_BATTLER_OF_TYPE(i, TYPE_DARK))
)