diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2018-02-11 23:46:50 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-02-11 23:46:50 +0100 |
| commit | 2736c0fd4a52785aac63b259a71e8c64d92bef93 (patch) | |
| tree | 2afed0b7fa35ac5aa673a2cca91a926e410a3e07 /asm/macros | |
| parent | fd17ca59b0f5eaa3231628f7b9da66e77dfb8bd9 (diff) | |
| parent | 14a76793e596d612efd273169c4172922c270f13 (diff) | |
add more const pokemon data, clear include
Diffstat (limited to 'asm/macros')
| -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 |