Leahnaya/pokeemerald
1
0
Fork 0
mirror of https://github.com/pret/pokeemerald.git synced 2026-09-08 02:56:14 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixes ability pop up config (#4339)

Browse Source
This commit is contained in:
Alex
2024-04-04 14:51:07 +02:00
committed by GitHub
parent c52ae074ab
commit 2baa3525e1
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
data/battle_scripts_1.s
View File

@@ -7111,9 +7111,7 @@ BattleScript_IllusionOff::
BattleScript_CottonDownActivates::
copybyte sSAVED_BATTLER, gBattlerAttacker
showabilitypopup BS_TARGET
pause B_WAIT_TIME_LONG
destroyabilitypopup
call BattleScript_AbilityPopUpTarget
copybyte gEffectBattler, gBattlerTarget
swapattackerwithtarget
setbyte gBattlerTarget, 0
@@ -7760,10 +7758,12 @@ BattleScript_TryIntimidateHoldEffectsRet:
return
BattleScript_IntimidateActivates::
showabilitypopup BS_ATTACKER
copybyte sSAVED_BATTLER, gBattlerTarget
.if B_ABILITY_POP_UP == TRUE
showabilitypopup BS_ATTACKER
pause B_WAIT_TIME_LONG
destroyabilitypopup
.endif
setbyte gBattlerTarget, 0
BattleScript_IntimidateLoop:
jumpifbyteequal gBattlerTarget, gBattlerAttacker, BattleScript_IntimidateLoopIncrement
@@ -7812,10 +7812,12 @@ BattleScript_IntimidateInReverse:
goto BattleScript_IntimidateLoopIncrement
BattleScript_SupersweetSyrupActivates::
showabilitypopup BS_ATTACKER
copybyte sSAVED_BATTLER, gBattlerTarget
.if B_ABILITY_POP_UP == TRUE
showabilitypopup BS_ATTACKER
pause B_WAIT_TIME_LONG
destroyabilitypopup
.endif
printstring STRINGID_SUPERSWEETAROMAWAFTS
waitmessage B_WAIT_TIME_LONG
setbyte gBattlerTarget, 0
@@ -9513,7 +9515,7 @@ BattleScript_WellBakedBodyActivates::
attackstring
ppreduce
pause B_WAIT_TIME_SHORT
showabilitypopup BS_TARGET
call BattleScript_AbilityPopUpTarget
orhalfword gMoveResultFlags, MOVE_RESULT_NO_EFFECT
modifybattlerstatstage BS_TARGET, STAT_DEF, INCREASE, 1, BattleScript_WellBakedBodyEnd, ANIM_ON
BattleScript_WellBakedBodyEnd:
@@ -9523,7 +9525,7 @@ BattleScript_WindRiderActivatesMoveEnd::
attackstring
ppreduce
pause B_WAIT_TIME_SHORT
showabilitypopup BS_TARGET
call BattleScript_AbilityPopUpTarget
orhalfword gMoveResultFlags, MOVE_RESULT_NO_EFFECT
modifybattlerstatstage BS_TARGET, STAT_ATK, INCREASE, 1, BattleScript_WindRiderActivatesMoveEnd_End, ANIM_ON
BattleScript_WindRiderActivatesMoveEnd_End:
@@ -9532,7 +9534,7 @@ BattleScript_WindRiderActivatesMoveEnd_End:
BattleScript_GoodAsGoldActivates::
attackstring
ppreduce
showabilitypopup BS_TARGET
call BattleScript_AbilityPopUpTarget
pause B_WAIT_TIME_SHORT
printstring STRINGID_ITDOESNTAFFECT
waitmessage B_WAIT_TIME_MED