summaryrefslogtreecommitdiff
path: root/asm/macros/battle_script.inc
diff options
context:
space:
mode:
authorDizzyEggg <jajkodizzy@wp.pl>2017-12-02 14:08:55 +0100
committerDizzyEggg <jajkodizzy@wp.pl>2017-12-02 14:08:55 +0100
commitd75e7ace1dd034273ca47473a2f543904f823f53 (patch)
tree96b1eaaa3328d5a0a69d39921f4cc393ff70ef06 /asm/macros/battle_script.inc
parent273474d57a39014654e60df151604ed5a28aeb57 (diff)
label battle stuff
Diffstat (limited to 'asm/macros/battle_script.inc')
-rw-r--r--asm/macros/battle_script.inc8
1 files changed, 8 insertions, 0 deletions
diff --git a/asm/macros/battle_script.inc b/asm/macros/battle_script.inc
index 520696bff..a16b59366 100644
--- a/asm/macros/battle_script.inc
+++ b/asm/macros/battle_script.inc
@@ -1391,3 +1391,11 @@
.macro jumpifmovehadnoeffect jumpptr
jumpifbyte COMMON_BITS, gBattleMoveFlags, MOVESTATUS_MISSED | MOVESTATUS_NOTAFFECTED | MOVESTATUS_FAILED, \jumpptr
.endm
+
+ .macro jumpifbattletype flags, jumpptr
+ jumpifword COMMON_BITS, gBattleTypeFlags, \flags, \jumpptr
+ .endm
+
+ .macro jumpifnotbattletype flags, jumpptr
+ jumpifword NO_COMMON_BITS, gBattleTypeFlags, \flags, \jumpptr
+ .endm