diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2018-02-11 19:22:06 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-02-11 19:22:06 -0500 |
| commit | ea347199a21f7a6c01a395e507db872ac1781e79 (patch) | |
| tree | 625ec0a6469b40573d165ceee0855e969af45929 /asm/macros/battle_script.inc | |
| parent | f39053ee3023b02139784f88d346b3b57853c307 (diff) | |
| parent | 14a76793e596d612efd273169c4172922c270f13 (diff) | |
Merge branch 'master' into link
Diffstat (limited to 'asm/macros/battle_script.inc')
| -rw-r--r-- | asm/macros/battle_script.inc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/asm/macros/battle_script.inc b/asm/macros/battle_script.inc index a16b59366..083107c08 100644 --- a/asm/macros/battle_script.inc +++ b/asm/macros/battle_script.inc @@ -1373,11 +1373,11 @@ .endm .macro jumpifmove move, jumpptr - jumpifhalfword EQUAL, gCurrentMove, \move, \jumpptr + jumpifhalfword CMP_EQUAL, gCurrentMove, \move, \jumpptr .endm .macro jumpifnotmove move, jumpptr - jumpifhalfword NOT_EQUAL, gCurrentMove, \move, \jumpptr + jumpifhalfword CMP_NOT_EQUAL, gCurrentMove, \move, \jumpptr .endm .macro jumpifstatus3 bank, status, jumpptr @@ -1389,13 +1389,13 @@ .endm .macro jumpifmovehadnoeffect jumpptr - jumpifbyte COMMON_BITS, gBattleMoveFlags, MOVESTATUS_MISSED | MOVESTATUS_NOTAFFECTED | MOVESTATUS_FAILED, \jumpptr + jumpifbyte CMP_COMMON_BITS, gMoveResultFlags, MOVE_RESULT_NO_EFFECT, \jumpptr .endm .macro jumpifbattletype flags, jumpptr - jumpifword COMMON_BITS, gBattleTypeFlags, \flags, \jumpptr + jumpifword CMP_COMMON_BITS, gBattleTypeFlags, \flags, \jumpptr .endm .macro jumpifnotbattletype flags, jumpptr - jumpifword NO_COMMON_BITS, gBattleTypeFlags, \flags, \jumpptr + jumpifword CMP_NO_COMMON_BITS, gBattleTypeFlags, \flags, \jumpptr .endm |