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 /src/battle_util.c | |
| parent | 9e840dc5fea3d732a347092c804afb3c6a86d61a (diff) | |
| parent | 925de13b448a650da5e725684f6f6ea9826966d6 (diff) | |
Merge branch 'master' of github.com:pret/pokeemerald
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; } |