nerge with master, fix conflicts

2017-12-16 01:08:55 +01:00
parent 039c9f4bd8 224fdbf026
commit 44abbae60b
189 changed files with 20685 additions and 24533 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,15 @@
 	.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
+	
+	.macro jumpifbattletype flags, jumpptr
+	jumpifword COMMON_BITS, gBattleTypeFlags, \flags, \jumpptr
+	.endm
+	
+	.macro jumpifnotbattletype flags, jumpptr
+	jumpifword NO_COMMON_BITS, gBattleTypeFlags, \flags, \jumpptr
+	.endm
@@ -52,5 +52,5 @@
 	.byte \max_level
 	.endif

-	.2byte SPECIES_\species
+	.2byte \species
 	.endm