diff options
| author | golem galvanize <golemgalvanize@github.com> | 2018-02-13 22:12:02 -0500 |
|---|---|---|
| committer | golem galvanize <golemgalvanize@github.com> | 2018-02-13 22:12:02 -0500 |
| commit | e5b6d15f9163cca8688cd67ca5a0563ce6667601 (patch) | |
| tree | 5492d50f51f51acca9cf1861c7b5936182649364 /asm/macros/battle_script.inc | |
| parent | 42cfbcb197bb271e675a4b2b9e70a2647bd65532 (diff) | |
| parent | 398e775d906ff4f1e5aaad3d8a9eee530c7b122d (diff) | |
move data to c
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 |