diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2018-04-06 21:31:08 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-04-06 21:31:08 -0400 |
| commit | 07b800e593a3ac8dd1a9bcfb6cb2366cc5c27377 (patch) | |
| tree | c77edf7fdacf36172bd3b6af790ad86111aef1fe /include/macros/battle_script.inc | |
| parent | 4d3098e89b5aebf080547a99e68640138dc74599 (diff) | |
| parent | be66a5cfefe578a0efb42d47fe8ed1a08e7fe30a (diff) | |
Merge branch 'master' into unk_debug_menu_3
Diffstat (limited to 'include/macros/battle_script.inc')
| -rw-r--r-- | include/macros/battle_script.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/macros/battle_script.inc b/include/macros/battle_script.inc index e4fa0c454..d92e28934 100644 --- a/include/macros/battle_script.inc +++ b/include/macros/battle_script.inc @@ -1402,7 +1402,7 @@ .endm .macro jumpifmovehadnoeffect jumpptr - jumpifbyte COMMON_BITS, gBattleMoveFlags, MOVESTATUS_MISSED | MOVESTATUS_NOTAFFECTED | MOVESTATUS_FAILED, \jumpptr + jumpifbyte COMMON_BITS, gMoveResultFlags, MOVE_RESULT_MISSED | MOVE_RESULT_DOESNT_AFFECT_FOE | MOVE_RESULT_FAILED, \jumpptr .endm .macro jumpifbattletype flags, jumpptr |