From 10b479a3cae98a1fa955a4fc5461bace1f630352 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Mon, 10 Sep 2018 21:19:19 +0200 Subject: Document battle animation scripts. --- asm/macros/battle_anim_script.inc | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'asm/macros/battle_anim_script.inc') diff --git a/asm/macros/battle_anim_script.inc b/asm/macros/battle_anim_script.inc index d1a8f6656..2b7501734 100644 --- a/asm/macros/battle_anim_script.inc +++ b/asm/macros/battle_anim_script.inc @@ -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 -- cgit v1.2.3 From 8a81bd1bce852e58efb9f48f4e8db225a3ee2f15 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Wed, 12 Sep 2018 22:58:03 +0200 Subject: Sync battle anim labels with pokeruby --- asm/macros/battle_anim_script.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'asm/macros/battle_anim_script.inc') diff --git a/asm/macros/battle_anim_script.inc b/asm/macros/battle_anim_script.inc index 2b7501734..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 -- cgit v1.2.3