diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2019-02-16 13:23:17 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-16 13:23:17 -0500 |
| commit | 771d2efd6569036531d69cf79d9b5aa163341cfc (patch) | |
| tree | fa65e8ed3dd12fe580d26c736ead1ea7ef4b089e /macros/scripts/gfx_anims.asm | |
| parent | f9a60cff7a9451e2e8c3bb5db95d89fdba3bf000 (diff) | |
| parent | 7d6befa1816110c5518292d4c7cb8841a355dc79 (diff) | |
Merge pull request #601 from mid-kid/master
Exciting adventures down battle animation street!
Diffstat (limited to 'macros/scripts/gfx_anims.asm')
| -rw-r--r-- | macros/scripts/gfx_anims.asm | 35 |
1 files changed, 22 insertions, 13 deletions
diff --git a/macros/scripts/gfx_anims.asm b/macros/scripts/gfx_anims.asm index 8f33512ec..3756481dd 100644 --- a/macros/scripts/gfx_anims.asm +++ b/macros/scripts/gfx_anims.asm @@ -15,20 +15,20 @@ ENDM enum_start $fc enum delanim_command ; $fc -delanim: MACRO ; used for oam +delanim: MACRO +; Removes the object from the screen, as opposed to `endanim` which just stops all motion db delanim_command ENDM - enum dorepeat_command ; $fd -dorepeat: MACRO - db dorepeat_command - db \1 ; # + enum dowait_command ; $fd +dowait: MACRO + db dowait_command + db \1 ; frames ENDM - enum setrepeat_command ; $fe -setrepeat: MACRO - db setrepeat_command - db \1 ; # + enum dorestart_command ; $fe +dorestart: MACRO + db dorestart_command ENDM enum endanim_command ; $ff @@ -36,9 +36,18 @@ endanim: MACRO db endanim_command ENDM -__enum__ = $fe - enum dorestart_command ; $fe -dorestart: MACRO ; used for oam - db dorestart_command +; Used for pic animations +__enum__ = $fd + + enum dorepeat_command ; $fd +dorepeat: MACRO + db dorepeat_command + db \1 ; command offset to jump to +ENDM + + enum setrepeat_command ; $fe +setrepeat: MACRO + db setrepeat_command + db \1 ; amount of times to repeat ENDM |