diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2018-09-22 15:39:34 -0500 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2018-09-22 15:39:34 -0500 |
| commit | 58a5e4a261cd3001f5cb747dd13080192d8d2245 (patch) | |
| tree | 6100a56d4d90e9792a0a4a1c1064cd10f827f28b /data | |
| parent | 9e840dc5fea3d732a347092c804afb3c6a86d61a (diff) | |
| parent | 925de13b448a650da5e725684f6f6ea9826966d6 (diff) | |
Merge branch 'master' of github.com:pret/pokeemerald
Diffstat (limited to 'data')
| -rw-r--r-- | data/battle_scripts_1.s | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index 0c5e172b0..a01066be1 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -1354,7 +1354,7 @@ BattleScript_SleepTalkUsingMove:: waitanimation setbyte sB_ANIM_TURN, 0x0 setbyte sB_ANIM_TARGETS_HIT, 0x0 - jumptorandomattack TRUE + jumptocalledmove TRUE BattleScript_EffectDestinyBond:: attackcanceler @@ -2399,7 +2399,7 @@ BattleScript_EffectAssist:: waitanimation setbyte sB_ANIM_TURN, 0x0 setbyte sB_ANIM_TARGETS_HIT, 0x0 - jumptorandomattack TRUE + jumptocalledmove TRUE BattleScript_EffectIngrain:: attackcanceler @@ -4260,7 +4260,7 @@ BattleScript_IgnoresWhileAsleep:: BattleScript_IgnoresAndUsesRandomMove:: printstring STRINGID_PKMNIGNOREDORDERS waitmessage 0x40 - jumptorandomattack FALSE + jumptocalledmove FALSE BattleScript_MoveUsedLoafingAround:: jumpifbyte CMP_NOT_EQUAL, cMULTISTRING_CHOOSER, 0x4, BattleScript_82DB6C7 |