atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed confuse berries affecting the wrong battler.

Browse source
This commit is contained in:
Eduardo Quezada D'Ottone 2021-10-01 18:28:51 -03:00
parent f616760fc9
commit 7287560521
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
data/battle_scripts_1.s
View file

@ -8041,22 +8041,22 @@ BattleScript_BerryConfuseHealEnd2_Anim:
end2 end2
BattleScript_BerryConfuseHealRet:: BattleScript_BerryConfuseHealRet::
jumpifability BS_SCRIPTING, ABILITY_RIPEN, BattleScript_BerryConfuseHealRet_AbilityPopup jumpifability BS_ATTACKER, ABILITY_RIPEN, BattleScript_BerryConfuseHealRet_AbilityPopup
goto BattleScript_BerryConfuseHealRet_Anim goto BattleScript_BerryConfuseHealRet_Anim
BattleScript_BerryConfuseHealRet_AbilityPopup: BattleScript_BerryConfuseHealRet_AbilityPopup:
call BattleScript_AbilityPopUp call BattleScript_AbilityPopUp
BattleScript_BerryConfuseHealRet_Anim: BattleScript_BerryConfuseHealRet_Anim:
playanimation BS_SCRIPTING, B_ANIM_HELD_ITEM_EFFECT, NULL playanimation BS_ATTACKER, B_ANIM_HELD_ITEM_EFFECT, NULL
printstring STRINGID_PKMNSITEMRESTOREDHEALTH printstring STRINGID_PKMNSITEMRESTOREDHEALTH
waitmessage B_WAIT_TIME_LONG waitmessage B_WAIT_TIME_LONG
orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE
healthbarupdate BS_SCRIPTING healthbarupdate BS_ATTACKER
datahpupdate BS_SCRIPTING datahpupdate BS_ATTACKER
printstring STRINGID_FORXCOMMAYZ printstring STRINGID_FORXCOMMAYZ
waitmessage B_WAIT_TIME_LONG waitmessage B_WAIT_TIME_LONG
setmoveeffect MOVE_EFFECT_CONFUSION | MOVE_EFFECT_AFFECTS_USER setmoveeffect MOVE_EFFECT_CONFUSION | MOVE_EFFECT_AFFECTS_USER
seteffectprimary seteffectprimary
removeitem BS_SCRIPTING removeitem BS_ATTACKER
return return
BattleScript_BerryStatRaiseEnd2:: BattleScript_BerryStatRaiseEnd2::