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

Looping battlescript version 1

Browse Source 
Would be better if it simply updated the target, cured the status and returned I think, needs testing.
This commit is contained in:
BuffelSaft 2021-11-03 00:45:24 +13:00
parent 95435b5f7f
commit 4668e11765
1 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
data/battle_scripts_1.s
View File

@ -8927,10 +8927,30 @@ BattleScript_DarkTypePreventsPrankster::
orhalfword gMoveResultFlags, MOVE_RESULT_NO_EFFECT orhalfword gMoveResultFlags, MOVE_RESULT_NO_EFFECT
goto BattleScript_MoveEnd goto BattleScript_MoveEnd
BattleScript_PastelVeilActivates:: BattleScript_PastelVeilActivatesOld::
call BattleScript_AbilityPopUp call BattleScript_AbilityPopUp
printfromtable gSwitchInAbilityStringIds printfromtable gSwitchInAbilityStringIds
curestatus BS_SCRIPTING curestatus BS_SCRIPTING
updatestatusicon BS_SCRIPTING updatestatusicon BS_SCRIPTING
waitmessage B_WAIT_TIME_LONG waitmessage B_WAIT_TIME_LONG
end3 end3
BattleScript_PastelVeilActivates::
call BattleScript_AbilityPopUp
printfromtable gSwitchInAbilityStringIds
waitmessage B_WAIT_TIME_LONG
copybyte gBattlerTarget, gBattlerAttacker
setbyte gBattleCommunication, 0
BattleScript_PastelVeil_TryCurePoison:
jumpifstatus BS_TARGET, STATUS1_POISON | STATUS1_TOXIC_POISON, BattleScript_PastelVeilCurePoison
goto BattleScript_PastelVeilEnd
BattleScript_PastelVeilCurePoison:
curestatus BS_TARGET
updatestatusicon BS_TARGET
jumpifbyte CMP_NOT_EQUAL, gBattleCommunication, 0x0, BattleScript_PastelVeilEnd
addbyte gBattleCommunication, 1
jumpifnoally BS_TARGET, BattleScript_PastelVeilEnd
setallytonexttarget BattleScript_PastelVeil_TryCurePoison
goto BattleScript_MoveEnd
BattleScript_PastelVeilEnd:
end3