diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-12-09 17:56:13 -0500 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-12-09 17:56:13 -0500 |
| commit | 4b4c53c7ae7f61499304c69b60e39406c5d47126 (patch) | |
| tree | 2308d65695a56bd99c08d535e9ccf37b71408c4b | |
| parent | e025ab9db0b85cadb42e9b72ac408a58f8133672 (diff) | |
Format music macros like movement macros
| -rw-r--r-- | audio/engine.asm | 4 | ||||
| -rw-r--r-- | macros/scripts/audio.asm | 13 |
2 files changed, 10 insertions, 7 deletions
diff --git a/audio/engine.asm b/audio/engine.asm index 551f1e0aa..a23b00fb2 100644 --- a/audio/engine.asm +++ b/audio/engine.asm @@ -1138,7 +1138,7 @@ ParseMusic: call GetMusicByte ; store next byte in a cp endchannel_cmd jr z, .endchannel - cp first_music_cmd + cp FIRST_MUSIC_CMD jr c, .readnote ; then it's a command .readcommand @@ -1350,7 +1350,7 @@ ParseMusicCommand: ; reload command ld a, [wCurMusicByte] ; get command # - sub first_music_cmd + sub FIRST_MUSIC_CMD ld e, a ld d, 0 ; seek command pointer diff --git a/macros/scripts/audio.asm b/macros/scripts/audio.asm index d4a3f7bb5..fc9e3397a 100644 --- a/macros/scripts/audio.asm +++ b/macros/scripts/audio.asm @@ -20,20 +20,23 @@ noise: MACRO ENDM ; MusicCommands indexes (see audio/engine.asm) - enum_start $d8 -first_music_cmd EQU __enum__ + -8 + enum_start $d0, +8 +FIRST_MUSIC_CMD EQU __enum__ + enum octave_cmd ; $d0 octave: MACRO - db first_music_cmd + 8 - (\1) + db octave_cmd | 8 - (\1) ENDM +__enumdir__ = +1 + enum notetype_cmd ; $d8 notetype: MACRO db notetype_cmd db \1 ; note_length - if _NARG >= 2 +if _NARG >= 2 db \2 ; intensity - endc +endc ENDM enum pitchoffset_cmd ; $d9 |