From b33f098d6e23b359236591c05e01632385860470 Mon Sep 17 00:00:00 2001
From: yenatch <yenatch@gmail.com>
Date: Sun, 1 Jan 2017 12:08:44 -0500
Subject: Remove argc in the battle_anim macros.

---
 asm/macros/battle_anim.inc | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'asm/macros')

diff --git a/asm/macros/battle_anim.inc b/asm/macros/battle_anim.inc
index fc2777326..4ff845032 100644
--- a/asm/macros/battle_anim.inc
+++ b/asm/macros/battle_anim.inc
@@ -8,24 +8,24 @@
 	.2byte \id
 	.endm
 
-	.macro sprite template, priority, argc=0, argv:vararg
+	.macro sprite template, priority, argv:vararg
 	.byte 0x02
 	.4byte \template
 	.byte \priority
-	.byte \argc
-	.if \argc > 0
+	.byte (.Lsprite_\@_2 - .Lsprite_\@_1) / 2
+.Lsprite_\@_1:
 	.2byte \argv
-	.endif
+.Lsprite_\@_2:
 	.endm
 
-	.macro createtask addr, priority, argc=0, argv:vararg
+	.macro createtask addr, priority, argv:vararg
 	.byte 0x03
 	.4byte \addr
 	.byte \priority
-	.byte \argc
-	.if \argc > 0
+	.byte (.Lcreatetask_\@_2 - .Lcreatetask_\@_1) / 2
+.Lcreatetask_\@_1:
 	.2byte \argv
-	.endif
+.Lcreatetask_\@_2:
 	.endm
 
 	.macro pause delay
@@ -167,13 +167,13 @@
 	.2byte \bldcnt
 	.endm
 
-	.macro createtask_1F addr, argc=0, argv:vararg
+	.macro createtask_1F addr, argv:vararg
 	.byte 0x1F
 	.4byte \addr
-	.byte \argc
-	.if \argc > 0
+	.byte (.Lcreatetask_1F_\@_2 - .Lcreatetask_1F_\@_1) / 2
+.Lcreatetask_1F_\@_1:
 	.2byte \argv
-	.endif
+.Lcreatetask_1F_\@_2:
 	.endm
 
 	.macro waitsound
-- 
cgit v1.2.3