diff options
| author | yenatch <yenatch@gmail.com> | 2016-01-04 07:41:19 -0500 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2016-01-04 07:41:19 -0500 |
| commit | 0add51451cda9d4221af137f83e2429d3577310c (patch) | |
| tree | fd05f8f0ad49d88b032dc9e10af85a42dfa0e402 /macros/move_anim.asm | |
| parent | da87d2a929b1d58175efe063833c124d8ba702c9 (diff) | |
| parent | 2a263629a40e201b1702e2f4e65f1c61360cc2b2 (diff) | |
Merge pull request #330 from PikalaxALT/scriptmacrorenaming
Scriptmacrorenaming
Diffstat (limited to 'macros/move_anim.asm')
| -rw-r--r-- | macros/move_anim.asm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/macros/move_anim.asm b/macros/move_anim.asm index e8f918a29..05faf253d 100644 --- a/macros/move_anim.asm +++ b/macros/move_anim.asm @@ -11,9 +11,9 @@ endc anim_obj: macro db anim_obj_command db \1 ; obj - db \2 ; x - db \3 ; y - db \4 ; param + db (\2 << 3) + \3 ; x + db (\4 << 3) + \5 ; y + db \6 ; param endm enum anim_1gfx_command ; d1 @@ -113,8 +113,8 @@ anim_resetobp0: macro enum anim_sound_command ; e0 anim_sound: macro db anim_sound_command - db \1 ; tracks - db \2 ; id + db (\1 << 2) | \2 ; duration, tracks + db \3 ; id endm enum anim_cry_command ; e1 |