diff options
| author | mid-kid <esteve.varela@gmail.com> | 2019-02-15 02:54:35 +0100 |
|---|---|---|
| committer | mid-kid <esteve.varela@gmail.com> | 2019-02-15 02:54:35 +0100 |
| commit | 469c51d08637dc9951e4068ecb3700a363294b54 (patch) | |
| tree | 96af2af998e3c149d1cbaedb9abd2937f8f30a4e /macros/scripts | |
| parent | d9d688df4e4cdce07991856b13e9cf579de45bd4 (diff) | |
dorepeat -> dowait for oam animations
Having the pic animation macros be the same as the oam animation macros
isn't really turning out so well... I wonder if we should split them up
eventually.
Diffstat (limited to 'macros/scripts')
| -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 |