diff options
| author | yenatch <yenatch@gmail.com> | 2017-12-28 01:30:36 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-28 01:30:36 -0500 |
| commit | da28d1a84b0499bead314e17ae2ff0d13eb03196 (patch) | |
| tree | c212adfc53d1996c06f2e4be1d6e480e687a2ad8 /macros/scripts/audio.asm | |
| parent | bad9e33530af8cdc29ce5629df682fc7915bfff0 (diff) | |
| parent | 2c4777f3363cd64d05fb00084fd83dff8ac31674 (diff) | |
Merge pull request #437 from roukaour/master
Reorganize battle/; rename most "header" misnomers; gfx/pics → gfx/pokemon
Diffstat (limited to 'macros/scripts/audio.asm')
| -rw-r--r-- | macros/scripts/audio.asm | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/macros/scripts/audio.asm b/macros/scripts/audio.asm index 83ff44963..b1d340a91 100644 --- a/macros/scripts/audio.asm +++ b/macros/scripts/audio.asm @@ -1,3 +1,8 @@ +musicheader: macro + ; number of tracks, track idx, address + dbw ((\1 - 1) << 6) + (\2 - 1), \3 + endm + note: MACRO dn (\1), (\2) - 1 ENDM @@ -14,15 +19,6 @@ noise: macro db \4 ; frequency endm -musicheader: macro - ; number of tracks, track idx, address - dbw ((\1 - 1) << 6) + (\2 - 1), \3 - endm - -cry_header: macro - dw \1, \2, \3 - endm - ; MusicCommands indexes (see audio/engine.asm) enum_start $d8 |