diff options
| author | Cameron Hall <camthesaxman@users.noreply.github.com> | 2018-02-07 12:46:12 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-07 12:46:12 -0600 |
| commit | 13bc7a8dd26fd489b4d83e8d9044c424b526aff3 (patch) | |
| tree | 199cc6a98e9a05858fb98fb591e7f37259438360 /asm/macros/battle_script.inc | |
| parent | 3fb2471016b97e4a2e1ee4d73d7d4e3e632eda7a (diff) | |
| parent | c3dc14ba66b31c8f2556e9a19b6be7a5e860a376 (diff) | |
Merge pull request #166 from camthesaxman/battle_refactor
rename/refactor battle code
Diffstat (limited to 'asm/macros/battle_script.inc')
| -rw-r--r-- | asm/macros/battle_script.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/asm/macros/battle_script.inc b/asm/macros/battle_script.inc index a16b59366..c5ffb5abc 100644 --- a/asm/macros/battle_script.inc +++ b/asm/macros/battle_script.inc @@ -1389,7 +1389,7 @@ .endm .macro jumpifmovehadnoeffect jumpptr - jumpifbyte COMMON_BITS, gBattleMoveFlags, MOVESTATUS_MISSED | MOVESTATUS_NOTAFFECTED | MOVESTATUS_FAILED, \jumpptr + jumpifbyte COMMON_BITS, gMoveResultFlags, MOVE_RESULT_NO_EFFECT, \jumpptr .endm .macro jumpifbattletype flags, jumpptr |