summaryrefslogtreecommitdiff
path: root/asm/macros
diff options
context:
space:
mode:
authorDizzyEggg <jajkodizzy@wp.pl>2017-12-02 00:03:46 +0100
committerDizzyEggg <jajkodizzy@wp.pl>2017-12-02 00:03:46 +0100
commit273474d57a39014654e60df151604ed5a28aeb57 (patch)
tree39efa4e076b10d0085375839f5f150fe7cb94795 /asm/macros
parent0250aefb73a995a6812a657193abeb96eb34d489 (diff)
give names to some battlescripts
Diffstat (limited to 'asm/macros')
-rw-r--r--asm/macros/battle_script.inc8
1 files changed, 6 insertions, 2 deletions
diff --git a/asm/macros/battle_script.inc b/asm/macros/battle_script.inc
index 47e124a86..520696bff 100644
--- a/asm/macros/battle_script.inc
+++ b/asm/macros/battle_script.inc
@@ -422,10 +422,10 @@
.byte \bank
.endm
- .macro switchinanim bank, param1
+ .macro switchinanim bank, dontclearsubstitutebit
.byte 0x4e
.byte \bank
- .byte \param1
+ .byte \dontclearsubstitutebit
.endm
.macro jumpifcantswitch bank, param1
@@ -1387,3 +1387,7 @@
.macro jumpifnostatus3 bank, status, jumpptr
jumpifstatus3condition \bank, \status, 0x1, \jumpptr
.endm
+
+ .macro jumpifmovehadnoeffect jumpptr
+ jumpifbyte COMMON_BITS, gBattleMoveFlags, MOVESTATUS_MISSED | MOVESTATUS_NOTAFFECTED | MOVESTATUS_FAILED, \jumpptr
+ .endm