diff options
Diffstat (limited to 'macros/scripts')
| -rw-r--r-- | macros/scripts/battle_anims.asm | 13 |
1 files changed, 10 insertions, 3 deletions
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 |