diff options
| author | Remy Oukaour <remy.oukaour@gmail.com> | 2017-12-28 20:56:21 -0500 |
|---|---|---|
| committer | Remy Oukaour <remy.oukaour@gmail.com> | 2017-12-28 20:56:21 -0500 |
| commit | 4c35f3ac8506e5f326658bbab91c257584f7b716 (patch) | |
| tree | 980025fbbc41e001e260a65ed7c035dd6073e864 /macros/scripts/gfx_anims.asm | |
| parent | bb005694b31b6a8cbaeefa8751ea72117e904e02 (diff) | |
| parent | 82a05a1752b476caab8951fe03f539dcc1a63669 (diff) | |
Merge branch 'master' of https://github.com/pret/pokecrystal
# Conflicts:
# macros/scripts/maps.asm
Diffstat (limited to 'macros/scripts/gfx_anims.asm')
| -rw-r--r-- | macros/scripts/gfx_anims.asm | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/macros/scripts/gfx_anims.asm b/macros/scripts/gfx_anims.asm index a3fa710a0..943a000a9 100644 --- a/macros/scripts/gfx_anims.asm +++ b/macros/scripts/gfx_anims.asm @@ -1,6 +1,6 @@ ; pic + oam animations -frame: macro +frame: MACRO db \1 x = \2 if _NARG > 2 @@ -10,35 +10,35 @@ x = x | (1 << (\3 + 1)) endr endc db x - endm +ENDM enum_start $fc enum delanim_command ; $fc -delanim: macro ; used for oam +delanim: MACRO ; used for oam db delanim_command - endm +ENDM enum dorepeat_command ; $fd -dorepeat: macro +dorepeat: MACRO db dorepeat_command db \1 ; # - endm +ENDM enum setrepeat_command ; $fe -setrepeat: macro +setrepeat: MACRO db setrepeat_command db \1 ; # - endm +ENDM enum endanim_command ; $ff -endanim: macro +endanim: MACRO db endanim_command - endm +ENDM __enum__ = $fe enum dorestart_command ; $fe -dorestart: macro ; used for oam +dorestart: MACRO ; used for oam db dorestart_command - endm +ENDM |