From 273474d57a39014654e60df151604ed5a28aeb57 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sat, 2 Dec 2017 00:03:46 +0100 Subject: give names to some battlescripts --- asm/macros/battle_script.inc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'asm/macros/battle_script.inc') 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 -- cgit v1.2.3 From d75e7ace1dd034273ca47473a2f543904f823f53 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sat, 2 Dec 2017 14:08:55 +0100 Subject: label battle stuff --- asm/macros/battle_script.inc | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'asm/macros/battle_script.inc') 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 -- cgit v1.2.3