ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-02-23 04:44:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

random move to called move

Browse Source
This commit is contained in:
DizzyEggg 2018-09-22 19:27:56 +02:00
parent 60e8c80c4c
commit 37d8859404
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
data/battle_scripts_1.s
View File

@ -325,7 +325,7 @@ BattleScript_EffectCopycat:
trycopycat BattleScript_CopycatFail trycopycat BattleScript_CopycatFail
attackanimation attackanimation
waitanimation waitanimation
jumptorandomattack TRUE jumptocalledmove TRUE
BattleScript_CopycatFail: BattleScript_CopycatFail:
ppreduce ppreduce
goto BattleScript_ButItFailed goto BattleScript_ButItFailed
@ -748,7 +748,7 @@ BattleScript_EffectMeFirst:
waitanimation waitanimation
setbyte sB_ANIM_TURN, 0x0 setbyte sB_ANIM_TURN, 0x0
setbyte sB_ANIM_TARGETS_HIT, 0x0 setbyte sB_ANIM_TARGETS_HIT, 0x0
jumptorandomattack TRUE jumptocalledmove TRUE
BattleScript_EffectAttackSpAttackUp: BattleScript_EffectAttackSpAttackUp:
attackcanceler attackcanceler

8
src/battle_script_commands.c
View File

@ -6597,9 +6597,9 @@ static void atk76_various(void)
gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 3); gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 3);
break; break;
default: default:
gRandomMove = move; gCalledMove = move;
gHitMarker &= ~(HITMARKER_ATTACKSTRING_PRINTED); gHitMarker &= ~(HITMARKER_ATTACKSTRING_PRINTED);
gBattlerTarget = GetMoveTarget(gRandomMove, 0); gBattlerTarget = GetMoveTarget(gCalledMove, 0);
gStatuses3[gBattlerAttacker] |= STATUS3_ME_FIRST; gStatuses3[gBattlerAttacker] |= STATUS3_ME_FIRST;
gBattlescriptCurrInstr += 7; gBattlescriptCurrInstr += 7;
break; break;
@ -6770,9 +6770,9 @@ static void atk76_various(void)
} }
else else
{ {
gRandomMove = gLastUsedMove; gCalledMove = gLastUsedMove;
gHitMarker &= ~(HITMARKER_ATTACKSTRING_PRINTED); gHitMarker &= ~(HITMARKER_ATTACKSTRING_PRINTED);
gBattlerTarget = GetMoveTarget(gRandomMove, 0); gBattlerTarget = GetMoveTarget(gCalledMove, 0);
gBattlescriptCurrInstr += 7; gBattlescriptCurrInstr += 7;
} }
return; return;