Rooba
/
pokecrystal
mirror of https://github.com/pret/pokecrystal.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Format music macros like movement macros

This commit is contained in:
Rangi 2018-12-09 17:56:13 -05:00
parent e025ab9db0
commit 4b4c53c7ae
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
audio/engine.asm
View File

@ -1138,7 +1138,7 @@ ParseMusic:
call GetMusicByte ; store next byte in a call GetMusicByte ; store next byte in a
cp endchannel_cmd cp endchannel_cmd
jr z, .endchannel jr z, .endchannel
cp first_music_cmd cp FIRST_MUSIC_CMD
jr c, .readnote jr c, .readnote
; then it's a command ; then it's a command
.readcommand .readcommand
@ -1350,7 +1350,7 @@ ParseMusicCommand:
; reload command ; reload command
ld a, [wCurMusicByte] ld a, [wCurMusicByte]
; get command # ; get command #
sub first_music_cmd sub FIRST_MUSIC_CMD
ld e, a ld e, a
ld d, 0 ld d, 0
; seek command pointer ; seek command pointer

13
macros/scripts/audio.asm
View File

@ -20,20 +20,23 @@ noise: MACRO
ENDM ENDM
; MusicCommands indexes (see audio/engine.asm) ; MusicCommands indexes (see audio/engine.asm)
enum_start $d8 enum_start $d0, +8
first_music_cmd EQU __enum__ + -8 FIRST_MUSIC_CMD EQU __enum__
enum octave_cmd ; $d0
octave: MACRO octave: MACRO
db first_music_cmd + 8 - (\1) db octave_cmd | 8 - (\1)
ENDM ENDM
__enumdir__ = +1
enum notetype_cmd ; $d8 enum notetype_cmd ; $d8
notetype: MACRO notetype: MACRO
db notetype_cmd db notetype_cmd
db \1 ; note_length db \1 ; note_length
if _NARG >= 2 if _NARG >= 2
db \2 ; intensity db \2 ; intensity
endc endc
ENDM ENDM
enum pitchoffset_cmd ; $d9 enum pitchoffset_cmd ; $d9