diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2018-10-13 12:44:23 -0500 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2018-10-13 12:44:23 -0500 |
| commit | a26380663c5acc636fb8c163c014187129afae8f (patch) | |
| tree | 79eb899d0c0e3281a11f1d447879090dc208ef80 /asm/macros | |
| parent | 35c69388140243c391b925fd8b9012d2d1703810 (diff) | |
| parent | a2a6700966cc802185577e44ba88a9154429c93b (diff) | |
Merge branch 'master' of github.com:pret/pokeemerald
Diffstat (limited to 'asm/macros')
| -rw-r--r-- | asm/macros/battle_anim_script.inc | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/asm/macros/battle_anim_script.inc b/asm/macros/battle_anim_script.inc index d1a8f6656..1d5b01de7 100644 --- a/asm/macros/battle_anim_script.inc +++ b/asm/macros/battle_anim_script.inc @@ -66,9 +66,9 @@ .byte \battler .endm - .macro setalpha param0 - .byte 0xc - .2byte \param0 + .macro setalpha eva, evb + .byte 0x0C + .2byte ((\evb) << 8) | (\eva) .endm .macro blendoff @@ -266,3 +266,16 @@ .macro stopsound .byte 0x2f .endm + +@ useful macros + .macro jumpreteq value, ptr + jumpargeq ARG_RET_ID, \value, \ptr + .endm + + .macro jumprettrue ptr + jumpreteq TRUE, \ptr + .endm + + .macro jumpretfalse ptr + jumpreteq FALSE, \ptr + .endm |