diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2018-09-22 12:13:03 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-22 12:13:03 -0500 |
| commit | eb4408a6ff7a515d60e76ee958a88984b9b50407 (patch) | |
| tree | e1290658f1e5495fd799c6a19c9263e6aeb36ec2 /data | |
| parent | a1edceb595e63012756e3ddb2107cf0a2bdd992b (diff) | |
| parent | 611360c29e682ee38779b6ba0ee120032903bf3a (diff) | |
Merge pull request #338 from DizzyEggg/small
Rename gRandomMove to gCalledMove
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 |