summaryrefslogtreecommitdiff
path: root/asm/macros
diff options
context:
space:
mode:
Diffstat (limited to 'asm/macros')
-rw-r--r--asm/macros/battle_anim_script.inc19
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