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 /src/battle_util.c | |
| parent | a1edceb595e63012756e3ddb2107cf0a2bdd992b (diff) | |
| parent | 611360c29e682ee38779b6ba0ee120032903bf3a (diff) | |
Merge pull request #338 from DizzyEggg/small
Rename gRandomMove to gCalledMove
Diffstat (limited to 'src/battle_util.c')
| -rw-r--r-- | src/battle_util.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/battle_util.c b/src/battle_util.c index 5096a2f3a..79ce180ee 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -3408,9 +3408,9 @@ u8 IsMonDisobedient(void) gCurrMovePos = gChosenMovePos = Random() & 3; } while (gBitTable[gCurrMovePos] & calc); - gRandomMove = gBattleMons[gBattlerAttacker].moves[gCurrMovePos]; + gCalledMove = gBattleMons[gBattlerAttacker].moves[gCurrMovePos]; gBattlescriptCurrInstr = BattleScript_IgnoresAndUsesRandomMove; - gBattlerTarget = GetMoveTarget(gRandomMove, 0); + gBattlerTarget = GetMoveTarget(gCalledMove, 0); gHitMarker |= HITMARKER_x200000; return 2; } |