diff options
| author | golem galvanize <golemgalvanize@github.com> | 2018-02-07 14:14:08 -0500 |
|---|---|---|
| committer | golem galvanize <golemgalvanize@github.com> | 2018-02-07 14:14:08 -0500 |
| commit | b67afb9490ce7fce8c7d478e9b436c5b849fb4ad (patch) | |
| tree | b07bb0bb43aeba2c7cfef97213578fb815ccb266 /asm/macros/battle_script.inc | |
| parent | 5f7709dc8bf1bf4eb75d9481e285980f347d5dd7 (diff) | |
| parent | 802b505d7bc4f60e6dda62c9a2a4948b8ba765df (diff) | |
I hope this fixes the conflicts
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 |