diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2018-12-09 17:44:09 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-09 17:44:09 -0500 |
| commit | e025ab9db0b85cadb42e9b72ac408a58f8133672 (patch) | |
| tree | ff74fb06f4d6715bec8a711e31f41057d4625bb3 /macros/scripts | |
| parent | cbf4c663611d4b7d07f3fc8d43f0be756ccc19ed (diff) | |
| parent | fd1fa78ffe78c9101c0ae5a1ca299d4282462ecd (diff) | |
Merge pull request #578 from mid-kid/master
Fixes in the animation subsystem.
Diffstat (limited to 'macros/scripts')
| -rw-r--r-- | macros/scripts/audio.asm | 11 | ||||
| -rw-r--r-- | macros/scripts/battle_anims.asm | 5 |
2 files changed, 9 insertions, 7 deletions
diff --git a/macros/scripts/audio.asm b/macros/scripts/audio.asm index f6969d046..d4a3f7bb5 100644 --- a/macros/scripts/audio.asm +++ b/macros/scripts/audio.asm @@ -21,12 +21,13 @@ ENDM ; MusicCommands indexes (see audio/engine.asm) enum_start $d8 +first_music_cmd EQU __enum__ + -8 - enum notetype_cmd ; $d8 octave: MACRO - db notetype_cmd - (\1) + db first_music_cmd + 8 - (\1) ENDM + enum notetype_cmd ; $d8 notetype: MACRO db notetype_cmd db \1 ; note_length @@ -68,11 +69,11 @@ ENDM enum sound_duty_cmd ; $de sound_duty: MACRO db sound_duty_cmd - if _NARG == 4 +if _NARG == 4 db \1 | (\2 << 2) | (\3 << 4) | (\4 << 6) ; duty sequence - else +else db \1 ; LEGACY: Support for one-byte duty value - endc +endc ENDM enum togglesfx_cmd ; $df diff --git a/macros/scripts/battle_anims.asm b/macros/scripts/battle_anims.asm index 76300e78f..01db12010 100644 --- a/macros/scripts/battle_anims.asm +++ b/macros/scripts/battle_anims.asm @@ -17,6 +17,7 @@ if _NARG <= 4 db \3 ; y db \4 ; param else +; LEGACY: Support the tile+offset format db \1 ; object db (\2) * 8 + (\3) ; x_tile, x db (\4) * 8 + (\5) ; y_tile, y @@ -84,12 +85,12 @@ anim_incbgeffect: MACRO ENDM enum anim_enemyfeetobj_command ; $d9 -anim_enemyfeetobj: MACRO +anim_battlergfx_2row: MACRO db anim_enemyfeetobj_command ENDM enum anim_playerheadobj_command ; $da -anim_playerheadobj: MACRO +anim_battlergfx_1row: MACRO db anim_playerheadobj_command ENDM |