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

Fixes Copycat issues with Z-Moves and 2 turn moves (#4549)

Browse Source 
* Fixes Copycat 2-turn moves animation

* Fixes Copycat being able to call Z-Moves
This commit is contained in:
PhallenTree
2024-05-11 13:16:35 +01:00
committed by GitHub
parent 1ef7e11ef2
commit 8de4ed5a7c
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/battle_scripts_1.s
View File

@@ -1684,6 +1684,8 @@ BattleScript_EffectCopycat::
trycopycat BattleScript_CopycatFail
attackanimation
waitanimation
setbyte sB_ANIM_TURN, 0
setbyte sB_ANIM_TARGETS_HIT, 0
jumptocalledmove TRUE
BattleScript_CopycatFail:
ppreduce

2
src/battle_script_commands.c
View File

@@ -16650,7 +16650,7 @@ void BS_TryCopycat(void)
{
NATIVE_ARGS(const u8 *failInstr);
if (gLastUsedMove == MOVE_NONE || gLastUsedMove == MOVE_UNAVAILABLE || gMovesInfo[gLastUsedMove].copycatBanned)
if (gLastUsedMove == MOVE_NONE || gLastUsedMove == MOVE_UNAVAILABLE || gMovesInfo[gLastUsedMove].copycatBanned || IsZMove(gLastUsedMove))
{
gBattlescriptCurrInstr = cmd->failInstr;
}