give names to some battlescripts

2017-12-02 00:03:46 +01:00
parent 0250aefb73
commit 273474d57a
5 changed files with 121 additions and 120 deletions
@@ -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