diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2018-08-04 18:31:49 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-04 18:31:49 -0700 |
| commit | 002016e7643c807997f0a85c9457db2b53f5a76b (patch) | |
| tree | 73e111efb954abc2cd18e89d8679336eb29e88d3 /src/battle_script_commands.c | |
| parent | 759bc2671ce67d1fa13ad068968faa78c26b92a5 (diff) | |
| parent | eb4d9f6fed0c4aaf4c57dd508eaeb67bd60ca56f (diff) | |
Merge pull request #283 from DizzyEggg/battle_pr_again
Battle code enums in switches
Diffstat (limited to 'src/battle_script_commands.c')
| -rw-r--r-- | src/battle_script_commands.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index e688d0b40..5c0b78240 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -1120,9 +1120,9 @@ static void atk01_accuracycheck(void) { u16 move = T2_READ_16(gBattlescriptCurrInstr + 5); - if (move == 0xFFFE || move == 0xFFFF) + if (move == NO_ACC_CALC || move == NO_ACC_CALC_CHECK_LOCK_ON) { - if (gStatuses3[gBattlerTarget] & STATUS3_ALWAYS_HITS && move == 0xFFFF && gDisableStructs[gBattlerTarget].battlerWithSureHit == gBattlerAttacker) + if (gStatuses3[gBattlerTarget] & STATUS3_ALWAYS_HITS && move == NO_ACC_CALC_CHECK_LOCK_ON && gDisableStructs[gBattlerTarget].battlerWithSureHit == gBattlerAttacker) gBattlescriptCurrInstr += 7; else if (gStatuses3[gBattlerTarget] & (STATUS3_ON_AIR | STATUS3_UNDERGROUND | STATUS3_UNDERWATER)) gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 1); |