diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index f60be18a9..aae89225d 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -5285,8 +5285,19 @@ BattleScript_EffectRolePlay:: trycopyability BattleScript_ButItFailed attackanimation 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 waitmessage B_WAIT_TIME_LONG + switchinabilities BS_ATTACKER goto BattleScript_MoveEnd BattleScript_EffectWish:: diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index acce399b2..857a4d819 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -12356,6 +12356,7 @@ static void Cmd_trycopyability(void) // role play } else { + gBattleScripting.abilityPopupOverwrite = gBattleMons[gBattlerAttacker].ability; gBattleMons[gBattlerAttacker].ability = defAbility; gLastUsedAbility = defAbility; gBattlescriptCurrInstr += 5;