diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2018-02-11 14:50:18 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-11 14:50:18 -0600 |
| commit | 14a76793e596d612efd273169c4172922c270f13 (patch) | |
| tree | 9517f097031e48ed4dd590ee772875a0da48c652 /asm/macros/battle_script.inc | |
| parent | 387dbf48d0bbb22dc16158a1ee0d373c166c8438 (diff) | |
| parent | d704a2b5df0a7957f6df06669cf4423e5026d87b (diff) | |
Merge pull request #206 from DizzyEggg/battle_labels
More battle code clean up
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 c5ffb5abc..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, gMoveResultFlags, MOVE_RESULT_NO_EFFECT, \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 |