diff options
Diffstat (limited to 'macros')
-rw-r--r-- | macros/legacy.asm | 3 | ||||
-rw-r--r-- | macros/scripts/battle_anims.asm | 2 | ||||
-rw-r--r-- | macros/scripts/gfx_anims.asm | 35 |
3 files changed, 26 insertions, 14 deletions
diff --git a/macros/legacy.asm b/macros/legacy.asm index 8be6b3798..0aa4d5e4d 100644 --- a/macros/legacy.asm +++ b/macros/legacy.asm @@ -174,3 +174,6 @@ limited_interpret_data EQUS "text_dots" link_wait_button EQUS "text_linkwaitbutton" current_day EQUS "text_today" text_jump EQUS "text_far" + +; macros/scripts/battle_anims.asm +anim_clearsprites EQUS "anim_keepsprites" diff --git a/macros/scripts/battle_anims.asm b/macros/scripts/battle_anims.asm index 01db12010..af447f1af 100644 --- a/macros/scripts/battle_anims.asm +++ b/macros/scripts/battle_anims.asm @@ -233,7 +233,7 @@ anim_obp1: MACRO ENDM enum anim_clearsprites_command ; $f4 -anim_clearsprites: MACRO +anim_keepsprites: MACRO db anim_clearsprites_command ENDM 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 |