From 37d8859404a7a4758807ca905c0248d1547c793a Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sat, 22 Sep 2018 19:27:56 +0200 Subject: [PATCH] random move to called move --- data/battle_scripts_1.s | 4 ++-- src/battle_script_commands.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index 6fa9059cae..19406a750e 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -325,7 +325,7 @@ BattleScript_EffectCopycat: trycopycat BattleScript_CopycatFail attackanimation waitanimation - jumptorandomattack TRUE + jumptocalledmove TRUE BattleScript_CopycatFail: ppreduce goto BattleScript_ButItFailed @@ -748,7 +748,7 @@ BattleScript_EffectMeFirst: waitanimation setbyte sB_ANIM_TURN, 0x0 setbyte sB_ANIM_TARGETS_HIT, 0x0 - jumptorandomattack TRUE + jumptocalledmove TRUE BattleScript_EffectAttackSpAttackUp: attackcanceler diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index c315624ae7..c352f7521f 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -6597,9 +6597,9 @@ static void atk76_various(void) gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 3); break; default: - gRandomMove = move; + gCalledMove = move; gHitMarker &= ~(HITMARKER_ATTACKSTRING_PRINTED); - gBattlerTarget = GetMoveTarget(gRandomMove, 0); + gBattlerTarget = GetMoveTarget(gCalledMove, 0); gStatuses3[gBattlerAttacker] |= STATUS3_ME_FIRST; gBattlescriptCurrInstr += 7; break; @@ -6770,9 +6770,9 @@ static void atk76_various(void) } else { - gRandomMove = gLastUsedMove; + gCalledMove = gLastUsedMove; gHitMarker &= ~(HITMARKER_ATTACKSTRING_PRINTED); - gBattlerTarget = GetMoveTarget(gRandomMove, 0); + gBattlerTarget = GetMoveTarget(gCalledMove, 0); gBattlescriptCurrInstr += 7; } return;