summaryrefslogtreecommitdiff
path: root/audio/music/unioncave.asm
diff options
context:
space:
mode:
Diffstat (limited to 'audio/music/unioncave.asm')
-rw-r--r--audio/music/unioncave.asm177
1 files changed, 89 insertions, 88 deletions
diff --git a/audio/music/unioncave.asm b/audio/music/unioncave.asm
index 94c7aec6e..858d88c77 100644
--- a/audio/music/unioncave.asm
+++ b/audio/music/unioncave.asm
@@ -1,21 +1,22 @@
Music_UnionCave:
- musicheader 4, 1, Music_UnionCave_Ch1
- musicheader 1, 2, Music_UnionCave_Ch2
- musicheader 1, 3, Music_UnionCave_Ch3
- musicheader 1, 4, Music_UnionCave_Ch4
+ channel_count 4
+ channel 1, Music_UnionCave_Ch1
+ channel 2, Music_UnionCave_Ch2
+ channel 3, Music_UnionCave_Ch3
+ channel 4, Music_UnionCave_Ch4
Music_UnionCave_Ch1:
tempo 160
- volume $77
- dutycycle $1
- tone $0002
- vibrato $18, $34
- stereopanning $f
+ volume 7, 7
+ duty_cycle 1
+ pitch_offset 2
+ vibrato 24, 3, 4
+ stereo_panning FALSE, TRUE
Music_UnionCave_branch_f5c7b:
- notetype $c, $b3
+ note_type 12, 11, 3
Music_UnionCave_branch_f5c7e:
- callchannel Music_UnionCave_branch_f5ccf
- loopchannel 4, Music_UnionCave_branch_f5c7e
+ sound_call Music_UnionCave_branch_f5ccf
+ sound_loop 4, Music_UnionCave_branch_f5c7e
Music_UnionCave_branch_f5c85:
octave 2
note G#, 2
@@ -25,7 +26,7 @@ Music_UnionCave_branch_f5c85:
note C#, 2
note E_, 2
note F_, 4
- loopchannel 8, Music_UnionCave_branch_f5c85
+ sound_loop 8, Music_UnionCave_branch_f5c85
Music_UnionCave_branch_f5c91:
octave 2
note A_, 2
@@ -35,9 +36,9 @@ Music_UnionCave_branch_f5c91:
note D_, 2
note F_, 2
note F#, 4
- loopchannel 4, Music_UnionCave_branch_f5c91
- note __, 4
- intensity $80
+ sound_loop 4, Music_UnionCave_branch_f5c91
+ rest 4
+ volume_envelope 8, 0
note F_, 16
note F#, 16
note G_, 16
@@ -52,17 +53,17 @@ Music_UnionCave_branch_f5c91:
note C_, 8
octave 3
note A_, 8
- intensity $95
- tone $0004
- callchannel Music_UnionCave_branch_f5ccf
- tone $0008
- callchannel Music_UnionCave_branch_f5ccf
- tone $000c
- callchannel Music_UnionCave_branch_f5ccf
- tone $0010
- callchannel Music_UnionCave_branch_f5ccf
- tone $0002
- loopchannel 0, Music_UnionCave_branch_f5c7b
+ volume_envelope 9, 5
+ pitch_offset 4
+ sound_call Music_UnionCave_branch_f5ccf
+ pitch_offset 8
+ sound_call Music_UnionCave_branch_f5ccf
+ pitch_offset 12
+ sound_call Music_UnionCave_branch_f5ccf
+ pitch_offset 16
+ sound_call Music_UnionCave_branch_f5ccf
+ pitch_offset 2
+ sound_loop 0, Music_UnionCave_branch_f5c7b
Music_UnionCave_branch_f5ccf:
octave 2
@@ -70,19 +71,19 @@ Music_UnionCave_branch_f5ccf:
octave 3
note C#, 2
note E_, 12
- endchannel
+ sound_ret
Music_UnionCave_Ch2:
- dutycycle $3
- vibrato $8, $24
+ duty_cycle 3
+ vibrato 8, 2, 4
Music_UnionCave_branch_f5cda:
- notetype $c, $c4
- callchannel Music_UnionCave_branch_f5d34
- intensity $c5
- callchannel Music_UnionCave_branch_f5d34
- intensity $c7
- callchannel Music_UnionCave_branch_f5d34
- intensity $c4
+ note_type 12, 12, 4
+ sound_call Music_UnionCave_branch_f5d34
+ volume_envelope 12, 5
+ sound_call Music_UnionCave_branch_f5d34
+ volume_envelope 12, 7
+ sound_call Music_UnionCave_branch_f5d34
+ volume_envelope 12, 4
note C#, 4
octave 3
note B_, 4
@@ -111,8 +112,8 @@ Music_UnionCave_branch_f5cda:
note C#, 8
note D_, 4
note C#, 4
- note __, 4
- intensity $a0
+ rest 4
+ volume_envelope 10, 0
note C_, 16
note C#, 16
note D_, 16
@@ -121,17 +122,17 @@ Music_UnionCave_branch_f5cda:
note D#, 16
note A#, 16
note A_, 16
- intensity $a5
- vibrato $6, $44
- callchannel Music_UnionCave_branch_f5d52
- vibrato $4, $33
- callchannel Music_UnionCave_branch_f5d52
- vibrato $2, $22
- callchannel Music_UnionCave_branch_f5d52
- vibrato $1, $41
- callchannel Music_UnionCave_branch_f5d52
- vibrato $8, $24
- loopchannel 0, Music_UnionCave_branch_f5cda
+ volume_envelope 10, 5
+ vibrato 6, 4, 4
+ sound_call Music_UnionCave_branch_f5d52
+ vibrato 4, 3, 3
+ sound_call Music_UnionCave_branch_f5d52
+ vibrato 2, 2, 2
+ sound_call Music_UnionCave_branch_f5d52
+ vibrato 1, 4, 1
+ sound_call Music_UnionCave_branch_f5d52
+ vibrato 8, 2, 4
+ sound_loop 0, Music_UnionCave_branch_f5cda
Music_UnionCave_branch_f5d34:
octave 4
@@ -163,7 +164,7 @@ Music_UnionCave_branch_f5d34:
note C_, 8
note C#, 4
note C_, 4
- endchannel
+ sound_ret
Music_UnionCave_branch_f5d52:
octave 2
@@ -171,42 +172,42 @@ Music_UnionCave_branch_f5d52:
octave 3
note C#, 2
note E_, 12
- endchannel
+ sound_ret
Music_UnionCave_Ch3:
- notetype $c, $16
- stereopanning $f0
+ note_type 12, 1, 6
+ stereo_panning TRUE, FALSE
Music_UnionCave_branch_f5d5d:
- note __, 16
- loopchannel 7, Music_UnionCave_branch_f5d5d
- note __, 14
+ rest 16
+ sound_loop 7, Music_UnionCave_branch_f5d5d
+ rest 14
octave 4
note C_, 2
Music_UnionCave_branch_f5d65:
- note __, 2
+ rest 2
octave 3
note E_, 2
- note __, 2
+ rest 2
note E_, 2
note G#, 2
note E_, 2
- note __, 2
+ rest 2
octave 4
note C_, 2
- loopchannel 4, Music_UnionCave_branch_f5d65
+ sound_loop 4, Music_UnionCave_branch_f5d65
Music_UnionCave_branch_f5d73:
- note __, 2
+ rest 2
octave 3
note F_, 2
- note __, 2
+ rest 2
note F_, 2
note A_, 2
note F_, 2
- note __, 2
+ rest 2
octave 4
note C#, 2
- loopchannel 4, Music_UnionCave_branch_f5d73
- note __, 4
+ sound_loop 4, Music_UnionCave_branch_f5d73
+ rest 4
note C_, 8
octave 3
note B_, 8
@@ -227,32 +228,32 @@ Music_UnionCave_branch_f5d8d:
octave 3
note A_, 2
note G_, 2
- loopchannel 3, Music_UnionCave_branch_f5d8d
+ sound_loop 3, Music_UnionCave_branch_f5d8d
note A_, 4
note G_, 4
note A#, 8
Music_UnionCave_branch_f5d9c:
- note __, 16
- loopchannel 4, Music_UnionCave_branch_f5d9c
- loopchannel 0, Music_UnionCave_branch_f5d5d
+ rest 16
+ sound_loop 4, Music_UnionCave_branch_f5d9c
+ sound_loop 0, Music_UnionCave_branch_f5d5d
Music_UnionCave_Ch4:
- togglenoise $1
- notetype $c
+ toggle_noise 1
+ drum_speed 12
Music_UnionCave_branch_f5da9:
- stereopanning $f0
- note E_, 4
- stereopanning $ff
- note F_, 4
- stereopanning $f
- note G#, 4
- note __, 8
- stereopanning $f
- note E_, 4
- stereopanning $ff
- note F_, 4
- stereopanning $f0
- note G#, 4
- note __, 8
- loopchannel 0, Music_UnionCave_branch_f5da9
- loopchannel 0, Music_UnionCave_branch_f5da9 ; unused
+ stereo_panning TRUE, FALSE
+ drum_note 5, 4
+ stereo_panning TRUE, TRUE
+ drum_note 6, 4
+ stereo_panning FALSE, TRUE
+ drum_note 9, 4
+ rest 8
+ stereo_panning FALSE, TRUE
+ drum_note 5, 4
+ stereo_panning TRUE, TRUE
+ drum_note 6, 4
+ stereo_panning TRUE, FALSE
+ drum_note 9, 4
+ rest 8
+ sound_loop 0, Music_UnionCave_branch_f5da9
+ sound_loop 0, Music_UnionCave_branch_f5da9