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

update role play mechanics

Browse source
This commit is contained in:
ghoulslash 2021-12-23 08:37:11 -05:00
parent 4b5c5d14fc
commit b6b5d862f4
2 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
data/battle_scripts_1.s
View file

@ -5285,8 +5285,19 @@ BattleScript_EffectRolePlay::
trycopyability BattleScript_ButItFailed trycopyability BattleScript_ButItFailed
attackanimation attackanimation
waitanimation waitanimation
.if B_ABILITY_POP_UP == TRUE
setbyte sFIXED_ABILITY_POPUP, TRUE
showabilitypopup BS_ATTACKER
pause 60
sethword sABILITY_OVERWRITE, 0
updateabilitypopup BS_ATTACKER
pause 20
destroyabilitypopup
pause 40
.endif
printstring STRINGID_PKMNCOPIEDFOE printstring STRINGID_PKMNCOPIEDFOE
waitmessage B_WAIT_TIME_LONG waitmessage B_WAIT_TIME_LONG
switchinabilities BS_ATTACKER
goto BattleScript_MoveEnd goto BattleScript_MoveEnd
BattleScript_EffectWish:: BattleScript_EffectWish::

1
src/battle_script_commands.c
View file

@ -12344,6 +12344,7 @@ static void Cmd_trycopyability(void) // role play
} }
else else
{ {
gBattleScripting.abilityPopupOverwrite = gBattleMons[gBattlerAttacker].ability;
gBattleMons[gBattlerAttacker].ability = defAbility; gBattleMons[gBattlerAttacker].ability = defAbility;
gLastUsedAbility = defAbility; gLastUsedAbility = defAbility;
gBattlescriptCurrInstr += 5; gBattlescriptCurrInstr += 5;