ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-27 20:24:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2007 from ghoulslash/be/roleplay

Browse Source 
Update Role Play
This commit is contained in:
Eduardo Quezada D'Ottone 2021-12-25 11:37:57 -03:00 committed by GitHub
commit 4d6f54e8d6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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

@ -12356,6 +12356,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;