diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-09 21:24:47 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-09 21:24:47 +0100 |
| commit | bb1ae5f8572cbbda145bc88e9677de5988646696 (patch) | |
| tree | 9e7fa573390eb971aafc20884d0865246497458e /asm/macros/battle_script.inc | |
| parent | 6561b62986a003e83811abfc85bf07ebc6f3a1ae (diff) | |
| parent | 00896cb3b5813cb843e5e1abd4cbc9ff0ad3a632 (diff) | |
Merge branch 'master' into decompile_use_pokeblock
Diffstat (limited to 'asm/macros/battle_script.inc')
| -rw-r--r-- | asm/macros/battle_script.inc | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/asm/macros/battle_script.inc b/asm/macros/battle_script.inc index 47e124a86..a16b59366 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,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 |