From cc5aeb8b87c8f4337c52db66caca593d1456b9d0 Mon Sep 17 00:00:00 2001
From: yenatch <yenatch@gmail.com>
Date: Fri, 29 Dec 2017 13:38:04 -0500
Subject: Fix anim_obj x/y values

- negative values have no meaning
- left in optional tile x/y for backwards compatibility
---
 macros/scripts/battle_anims.asm | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

(limited to 'macros/scripts/battle_anims.asm')

diff --git a/macros/scripts/battle_anims.asm b/macros/scripts/battle_anims.asm
index 7b379e7d2..50a8a7a5c 100644
--- a/macros/scripts/battle_anims.asm
+++ b/macros/scripts/battle_anims.asm
@@ -11,10 +11,17 @@ ENDM
 	enum anim_obj_command ; $d0
 anim_obj: MACRO
 	db anim_obj_command
-	db \1 ; obj
-	db (\2 << 3) + \3 ; x
-	db (\4 << 3) + \5 ; y
+if _NARG <= 4
+	db \1 ; object
+	db \2 ; x
+	db \3 ; y
+	db \4 ; param
+else
+	db \1 ; object
+	db (\2) * 8 + (\3) ; x_tile, x
+	db (\4) * 8 + (\5) ; y_tile, y
 	db \6 ; param
+endc
 ENDM
 
 	enum anim_1gfx_command ; $d1
-- 
cgit v1.2.3