summaryrefslogtreecommitdiff
path: root/asm/macros/contest_ai_script.s
diff options
context:
space:
mode:
authorYamaArashi <shadow962@live.com>2016-08-19 01:33:28 -0700
committerYamaArashi <shadow962@live.com>2016-08-19 01:33:28 -0700
commit3a33e298a40d3b34a2682009f1198d339b729270 (patch)
tree1a9ec5bab9606fd1fa2247c5a9b8481aa094c28e /asm/macros/contest_ai_script.s
parent7a8900ad5230b313964590b28c1a2813225052c1 (diff)
combo finisher macros
Diffstat (limited to 'asm/macros/contest_ai_script.s')
-rwxr-xr-xasm/macros/contest_ai_script.s16
1 files changed, 12 insertions, 4 deletions
diff --git a/asm/macros/contest_ai_script.s b/asm/macros/contest_ai_script.s
index 55eba4be0..aaf7f7e45 100755
--- a/asm/macros/contest_ai_script.s
+++ b/asm/macros/contest_ai_script.s
@@ -275,7 +275,7 @@
.4byte \addr
.endm
-@ whether the current move is a combo starter
+@ whether the current move is a combo starter (with another move in the moveset)
.macro check_combo_starter
.byte 0x40
@@ -291,10 +291,18 @@
.4byte \addr
.endm
-@ 43
-@ 44
+@ whether the current move is a combo finisher (with another move in the moveset)
- .macro contest_45 addr
+ .macro check_combo_finisher
+ .byte 0x43
+ .endm
+
+ .macro if_combo_finisher addr
+ .byte 0x44
+ .4byte \addr
+ .endm
+
+ .macro if_not_combo_finisher addr
.byte 0x45
.4byte \addr
.endm