From e48a401290e794854880f06fc230a369f37e6b9b Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Thu, 14 Dec 2017 00:36:24 -0500 Subject: Reorganize macros --- macros/scripts/gfx_anim.asm | 46 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 macros/scripts/gfx_anim.asm (limited to 'macros/scripts/gfx_anim.asm') diff --git a/macros/scripts/gfx_anim.asm b/macros/scripts/gfx_anim.asm new file mode 100644 index 000000000..e0a56cc23 --- /dev/null +++ b/macros/scripts/gfx_anim.asm @@ -0,0 +1,46 @@ +; pic+sprite animations + +frame: macro + db \1 +x = \2 +if _NARG > 2 +rept _NARG +- 2 +x = x | (1 << (\3 + 1)) + shift +endr +endc + db x + endm + + enum_start $fc + +; used for sprites + enum delanim_command ; fc +delanim: macro + db delanim_command + endm + + enum dorepeat_command ; fd +dorepeat: macro + db dorepeat_command + db \1 ; # + endm + + enum setrepeat_command ; fe +setrepeat: macro + db setrepeat_command + db \1 ; # + endm + + enum endanim_command ; ff +endanim: macro + db endanim_command + endm + +__enum__ = $fe + +; used for sprites + enum dorestart_command ; fe +dorestart: macro + db dorestart_command + endm -- cgit v1.2.3 From 2ff7f50584e31c097ca4aa509d9dfe9d9c252465 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Thu, 14 Dec 2017 00:38:08 -0500 Subject: Clarify which gfx anim commands are for oam --- macros/scripts/gfx_anim.asm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'macros/scripts/gfx_anim.asm') diff --git a/macros/scripts/gfx_anim.asm b/macros/scripts/gfx_anim.asm index e0a56cc23..cb85aba09 100644 --- a/macros/scripts/gfx_anim.asm +++ b/macros/scripts/gfx_anim.asm @@ -1,4 +1,4 @@ -; pic+sprite animations +; pic + oam animations frame: macro db \1 @@ -14,9 +14,8 @@ endc enum_start $fc -; used for sprites enum delanim_command ; fc -delanim: macro +delanim: macro ; used for oam db delanim_command endm @@ -39,8 +38,7 @@ endanim: macro __enum__ = $fe -; used for sprites enum dorestart_command ; fe -dorestart: macro +dorestart: macro ; used for oam db dorestart_command endm -- cgit v1.2.3 From fecc5c339adf8d4c2939364e49e4ba5c46f207ba Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Fri, 15 Dec 2017 00:38:52 -0500 Subject: More comments for macros --- macros/scripts/gfx_anim.asm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'macros/scripts/gfx_anim.asm') diff --git a/macros/scripts/gfx_anim.asm b/macros/scripts/gfx_anim.asm index cb85aba09..a3fa710a0 100644 --- a/macros/scripts/gfx_anim.asm +++ b/macros/scripts/gfx_anim.asm @@ -14,31 +14,31 @@ endc enum_start $fc - enum delanim_command ; fc + enum delanim_command ; $fc delanim: macro ; used for oam db delanim_command endm - enum dorepeat_command ; fd + enum dorepeat_command ; $fd dorepeat: macro db dorepeat_command db \1 ; # endm - enum setrepeat_command ; fe + enum setrepeat_command ; $fe setrepeat: macro db setrepeat_command db \1 ; # endm - enum endanim_command ; ff + enum endanim_command ; $ff endanim: macro db endanim_command endm __enum__ = $fe - enum dorestart_command ; fe + enum dorestart_command ; $fe dorestart: macro ; used for oam db dorestart_command endm -- cgit v1.2.3