diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2018-02-07 18:06:59 -0600 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2018-02-07 18:06:59 -0600 |
| commit | 772fd47564da4d2c4072b83e43a9cc28e62ce5bb (patch) | |
| tree | b81a93d022488ed5a71ce0ac80ee4dd1b5662ac9 /asm/macros/battle_script.inc | |
| parent | 5db765a475bf401417bbf7a3ca8b89dc0425f793 (diff) | |
| parent | 48e63979c8a131bc059974194bd548f60dcdd24c (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald into menu
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 |