diff options
| author | Cameron Hall <camthesaxman@users.noreply.github.com> | 2017-12-05 12:05:06 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-05 12:05:06 -0600 |
| commit | fd75493bc6f4a3c91158d8158edbb4cf964d08bc (patch) | |
| tree | e7bd995f2647be3ae049d643814fa0377be2366d /asm/macros/battle_script.inc | |
| parent | 7597433af6bb89986cf7c69617923cabcbec17c1 (diff) | |
| parent | 790df7159ec26194a71ed57216de27358999a061 (diff) | |
Merge pull request #129 from DizzyEggg/dumb_naming
Name some battle labels
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 |