From 3a33e298a40d3b34a2682009f1198d339b729270 Mon Sep 17 00:00:00 2001
From: YamaArashi <shadow962@live.com>
Date: Fri, 19 Aug 2016 01:33:28 -0700
Subject: combo finisher macros

---
 asm/macros/contest_ai_script.s | 16 ++++++++++++----
 data/contest_ai_scripts.s      |  2 +-
 2 files changed, 13 insertions(+), 5 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
diff --git a/data/contest_ai_scripts.s b/data/contest_ai_scripts.s
index 0e2cb14b0..bc325aa07 100644
--- a/data/contest_ai_scripts.s
+++ b/data/contest_ai_scripts.s
@@ -200,7 +200,7 @@ AI_contest3F_081DC348:
 	if_user_order_eq 0x03 AI_contest04_4_081DC348
 	end
 AI_contest45_081DC348:
-	contest_45 AI_end_081DC348
+	if_not_combo_finisher AI_end_081DC348
 	score 0xF6
 	end
 AI_score_081DC348:
-- 
cgit v1.2.3