combine audio and music folders

1 files changed, 0 insertions, 678 deletions

diff --git a/music/titlescreen.asm b/music/titlescreen.asm
deleted file mode 100644
index a3ab8031..00000000
--- a/music/titlescreen.asm
+++ /dev/null
@@ -1,678 +0,0 @@
-Music_TitleScreen_Ch1:: ; 7e4c0 (1f:64c0)
-	tempo 0, 144
-	stereopanning 119
-	vibrato 9, 3, 4
-	duty 3
-	notetype 12, 12, 1
-	octave 2
-	note E_, 1
-	note G_, 1
-	note B_, 1
-	octave 3
-	note D_, 1
-	octave 2
-	note G_, 4
-	note G_, 6
-	note G_, 1
-	note G_, 1
-	note G_, 4
-	note G_, 4
-	note G_, 4
-	notetype 8, 12, 1
-	note A_, 2
-	note A_, 2
-	note A_, 2
-	note A_, 2
-	note A_, 2
-	note F#, 2
-
-Music_TitleScreen_branch_7e4e2::
-	callchannel Music_TitleScreen_branch_7e541
-	callchannel Music_TitleScreen_branch_7e54a
-	callchannel Music_TitleScreen_branch_7e541
-	octave 3
-	note C_, 8
-	notetype 8, 12, 6
-	note E_, 4
-	note E_, 4
-	note C_, 4
-	notetype 12, 12, 6
-	octave 2
-	note B_, 8
-	notetype 8, 14, 7
-	octave 3
-	note F_, 4
-	note E_, 4
-	note C_, 4
-	notetype 12, 14, 7
-	note D_, 10
-	notetype 12, 12, 6
-	octave 2
-	note B_, 2
-	octave 3
-	note C_, 2
-	note D_, 2
-	callchannel Music_TitleScreen_branch_7e541
-	callchannel Music_TitleScreen_branch_7e54a
-	callchannel Music_TitleScreen_branch_7e541
-	note C_, 6
-	note C_, 6
-	note E_, 4
-	note D_, 6
-	note F_, 2
-	note G_, 2
-	note D_, 4
-	note G_, 2
-	note G_, 6
-	note A_, 4
-	note F_, 2
-	note A_, 2
-	octave 4
-	note C_, 2
-	octave 3
-	note D_, 12
-	note E_, 4
-	note F_, 8
-	note G_, 4
-	note F_, 4
-	note E_, 12
-	note F_, 4
-	note G_, 8
-	notetype 12, 11, 6
-	octave 4
-	note C_, 4
-	note C#, 4
-	callchannel Music_TitleScreen_branch_7e55c
-	notetype 8, 11, 4
-	octave 4
-	note C_, 4
-	note C_, 4
-	note C#, 4
-	callchannel Music_TitleScreen_branch_7e55c
-	notetype 8, 11, 2
-	octave 3
-	note E_, 4
-	note E_, 4
-	note C#, 4
-	loopchannel 0, Music_TitleScreen_branch_7e4e2
-
-Music_TitleScreen_branch_7e541::
-	notetype 12, 12, 6
-	octave 3
-	note D_, 6
-	octave 2
-	note B_, 2
-	octave 3
-	note D_, 8
-	endchannel
-
-Music_TitleScreen_branch_7e54a::
-	note C_, 6
-	note F_, 6
-	note C_, 4
-	note D_, 8
-	notetype 12, 14, 7
-	note F_, 6
-	note E_, 1
-	note D#, 1
-	note D_, 8
-	notetype 8, 12, 6
-	note C_, 4
-	octave 2
-	note B_, 4
-	octave 3
-	note C_, 4
-	endchannel
-
-Music_TitleScreen_branch_7e55c::
-	notetype 12, 12, 1
-	note D_, 1
-	rest 1
-	octave 2
-	note D_, 1
-	note D_, 1
-	note D_, 1
-	rest 1
-	note D_, 1
-	note D_, 1
-	note D_, 1
-	rest 1
-	note D_, 1
-	note D_, 1
-	note D_, 1
-	rest 1
-	note D_, 1
-	note D_, 1
-	note D_, 1
-	rest 1
-	note D_, 1
-	note D_, 1
-	note D_, 1
-	rest 1
-	note D_, 1
-	note D_, 1
-	endchannel
-
-
-Music_TitleScreen_Ch2:: ; 7e578 (1f:6578)
-	vibrato 16, 4, 6
-	duty 1
-	notetype 12, 14, 1
-	octave 2
-	note G_, 1
-	note B_, 1
-	octave 3
-	note D_, 1
-	note F#, 1
-	note G_, 4
-	note G_, 6
-	note G_, 1
-	note G_, 1
-	note G_, 4
-	note G_, 4
-	note G_, 4
-	notetype 8, 14, 1
-	note F_, 2
-	note F_, 2
-	note F_, 2
-	note F_, 2
-	note F_, 2
-	note F#, 2
-
-Music_TitleScreen_branch_7e594::
-	vibrato 16, 4, 6
-	callchannel Music_TitleScreen_branch_7e622
-	octave 2
-	note A_, 4
-	note F_, 4
-	callchannel Music_TitleScreen_branch_7e62c
-	octave 2
-	note A_, 8
-	note B_, 16
-	callchannel Music_TitleScreen_branch_7e622
-	octave 2
-	note A_, 6
-	note F_, 2
-	notetype 8, 14, 7
-	octave 4
-	note C_, 4
-	octave 3
-	note B_, 4
-	octave 4
-	note C_, 4
-	notetype 12, 14, 7
-	note D_, 8
-	notetype 12, 9, 5
-	octave 2
-	note D_, 6
-	note D_, 1
-	note F#, 1
-	note G_, 16
-	callchannel Music_TitleScreen_branch_7e622
-	octave 2
-	note A_, 2
-	note F_, 6
-	callchannel Music_TitleScreen_branch_7e62c
-	octave 3
-	note C_, 2
-	octave 2
-	note A_, 6
-	note B_, 6
-	note G_, 2
-	note F_, 8
-	callchannel Music_TitleScreen_branch_7e622
-	notetype 8, 9, 5
-	octave 2
-	note G_, 4
-	note F_, 5
-	note A_, 3
-	notetype 8, 14, 6
-	octave 4
-	note F_, 4
-	note E_, 4
-	note F_, 4
-	notetype 12, 14, 7
-	note G_, 6
-	note A#, 2
-	note G_, 8
-	vibrato 16, 2, 6
-	duty 3
-	notetype 12, 0, 11
-	note G_, 8
-	notetype 12, 14, 7
-	note A_, 8
-	duty 1
-	notetype 12, 14, 7
-	note A#, 6
-	note F_, 2
-	note F_, 8
-	octave 3
-	note D_, 8
-	octave 4
-	note A#, 4
-	note B_, 4
-	octave 5
-	note C_, 6
-	octave 4
-	note G_, 2
-	note G_, 8
-	octave 3
-	note E_, 8
-	notetype 12, 13, 7
-	octave 5
-	note C_, 4
-	note C#, 4
-	callchannel Music_TitleScreen_branch_7e636
-	rest 3
-	note D_, 1
-	rest 3
-	note D_, 1
-	notetype 8, 14, 5
-	octave 5
-	note C_, 4
-	note C_, 4
-	note C#, 4
-	callchannel Music_TitleScreen_branch_7e636
-	note D_, 1
-	rest 2
-	note D_, 1
-	rest 3
-	note D_, 1
-	notetype 8, 14, 3
-	octave 5
-	note C_, 4
-	note C_, 4
-	octave 4
-	note B_, 4
-	loopchannel 0, Music_TitleScreen_branch_7e594
-
-Music_TitleScreen_branch_7e622::
-	notetype 12, 14, 7
-	octave 3
-	note G_, 6
-	note B_, 2
-	octave 4
-	note D_, 8
-	notetype 12, 9, 5
-	endchannel
-
-Music_TitleScreen_branch_7e62c::
-	notetype 12, 14, 7
-	octave 4
-	note F_, 6
-	note E_, 1
-	note D#, 1
-	note D_, 8
-	notetype 12, 9, 5
-	endchannel
-
-Music_TitleScreen_branch_7e636::
-	notetype 12, 14, 1
-	note D_, 1
-	rest 2
-	octave 4
-	note D_, 1
-	rest 3
-	note D_, 1
-	rest 3
-	note D_, 1
-	rest 3
-	note D_, 1
-	endchannel
-
-
-Music_TitleScreen_Ch3:: ; 7e643 (1f:6643)
-	notetype 12, 1, 0
-	octave 3
-	note G_, 1
-	rest 1
-	note D_, 1
-	rest 1
-	note G_, 1
-	rest 3
-	note G_, 1
-	rest 5
-	note G_, 1
-	note G_, 1
-	note G_, 1
-	rest 3
-	note G_, 1
-	rest 3
-	note G_, 1
-	rest 3
-	notetype 8, 1, 0
-	note F_, 2
-	note F_, 2
-	note F_, 2
-	note F_, 2
-	note F_, 2
-	note A_, 2
-
-Music_TitleScreen_branch_7e65e::
-	callchannel Music_TitleScreen_branch_7e6c9
-	callchannel Music_TitleScreen_branch_7e6d0
-
-Music_TitleScreen_branch_7e664::
-	callchannel Music_TitleScreen_branch_7e6c9
-	callchannel Music_TitleScreen_branch_7e6c9
-	callchannel Music_TitleScreen_branch_7e6c9
-	callchannel Music_TitleScreen_branch_7e6d0
-	loopchannel 3, Music_TitleScreen_branch_7e664
-	callchannel Music_TitleScreen_branch_7e6c9
-	note G_, 6
-	note D_, 3
-	note A_, 6
-	note F_, 3
-	note A_, 3
-	note F_, 3
-	callchannel Music_TitleScreen_branch_7e6d7
-	note A#, 3
-	note F_, 3
-	callchannel Music_TitleScreen_branch_7e6d7
-	note B_, 3
-	note G_, 3
-	callchannel Music_TitleScreen_branch_7e6dc
-	octave 4
-	note C_, 3
-	octave 3
-	note G_, 3
-	callchannel Music_TitleScreen_branch_7e6dc
-	octave 4
-	note C#, 3
-	octave 3
-	note A_, 3
-	callchannel Music_TitleScreen_branch_7e6e5
-	octave 5
-	pitchbend 0, 66
-	note D_, 4
-	rest 4
-	octave 6
-	pitchbend 0, 50
-	note D_, 4
-	octave 5
-	pitchbend 0, 66
-	note D_, 4
-	rest 2
-	notetype 8, 1, 0
-	octave 4
-	note C_, 4
-	note C_, 4
-	note C#, 4
-	callchannel Music_TitleScreen_branch_7e6e5
-	octave 6
-	pitchbend 0, 50
-	note D_, 4
-	rest 4
-	octave 5
-	pitchbend 0, 66
-	note D_, 4
-	rest 6
-	notetype 8, 1, 0
-	octave 4
-	note C_, 4
-	note C_, 4
-	octave 3
-	note B_, 4
-	loopchannel 0, Music_TitleScreen_branch_7e65e
-
-Music_TitleScreen_branch_7e6c9::
-	note G_, 6
-	note D_, 3
-	note G_, 6
-	note D_, 3
-	note G_, 3
-	note D_, 3
-	endchannel
-
-Music_TitleScreen_branch_7e6d0::
-	note F_, 6
-	note C_, 3
-	note F_, 6
-	note C_, 3
-	note F_, 3
-	note C_, 3
-	endchannel
-
-Music_TitleScreen_branch_7e6d7::
-	note A#, 6
-	note F_, 3
-	note A#, 6
-	note F_, 3
-	endchannel
-
-Music_TitleScreen_branch_7e6dc::
-	octave 4
-	note C_, 6
-	octave 3
-	note G_, 3
-	octave 4
-	note C_, 6
-	octave 3
-	note G_, 3
-	endchannel
-
-Music_TitleScreen_branch_7e6e5::
-	notetype 12, 1, 0
-	octave 4
-	note D_, 1
-	rest 5
-	endchannel
-
-
-Music_TitleScreen_Ch4:: ; 7e6eb (1f:66eb)
-	dspeed 6
-	rest 4
-	dnote 1, snare3
-	dnote 1, snare3
-	dnote 1, snare4
-	dnote 1, snare4
-	dspeed 12
-	dnote 1, snare2
-	rest 3
-	dnote 1, snare2
-	rest 5
-	dnote 1, snare2
-	dnote 1, snare2
-	dnote 1, snare2
-	rest 3
-	dnote 1, snare2
-	rest 3
-	dnote 1, snare2
-	rest 3
-	dspeed 8
-	dnote 2, snare3
-	dnote 2, snare4
-	dnote 2, snare2
-	dnote 2, snare3
-	dnote 2, snare2
-	dnote 2, snare1
-
-Music_TitleScreen_branch_7e716::
-	dspeed 12
-	dnote 1, snare2
-	rest 3
-	dnote 1, snare2
-	rest 5
-	dnote 1, snare2
-	dnote 1, snare2
-	dnote 1, snare3
-	rest 3
-	callchannel Music_TitleScreen_branch_7e834
-	callchannel Music_TitleScreen_branch_7e834
-	dnote 1, snare2
-	rest 3
-	dnote 1, snare2
-	rest 5
-	dnote 1, snare2
-	dnote 1, snare2
-	dnote 1, snare3
-	rest 1
-	dnote 1, snare3
-	dnote 1, snare2
-	callchannel Music_TitleScreen_branch_7e842
-	dnote 1, snare2
-	rest 3
-	dnote 1, snare2
-	rest 5
-	dnote 1, snare2
-	dnote 1, snare3
-	dnote 1, snare2
-	rest 1
-	dnote 1, snare2
-	rest 1
-	callchannel Music_TitleScreen_branch_7e842
-	dnote 1, snare2
-	rest 3
-	dnote 1, snare2
-	rest 5
-	dnote 1, snare2
-	dnote 1, snare3
-	dnote 1, snare2
-	rest 1
-	dspeed 6
-	dnote 1, snare3
-	dnote 1, snare3
-	dnote 1, snare4
-	dnote 1, snare4
-	dspeed 12
-	callchannel Music_TitleScreen_branch_7e834
-	callchannel Music_TitleScreen_branch_7e842
-	dnote 1, snare2
-	rest 3
-	dnote 1, snare2
-	rest 5
-	dnote 1, snare2
-	dnote 1, snare3
-	dnote 1, snare2
-	rest 3
-	dnote 1, snare2
-	rest 3
-	dnote 1, snare2
-	rest 5
-	dnote 1, snare3
-	dnote 1, snare2
-	dnote 1, snare2
-	rest 1
-	dnote 1, snare3
-	dnote 1, snare2
-	callchannel Music_TitleScreen_branch_7e834
-	callchannel Music_TitleScreen_branch_7e842
-	dnote 1, snare2
-	rest 3
-	dnote 1, snare2
-	rest 5
-	dnote 1, snare3
-	dnote 1, snare2
-	dnote 1, snare2
-	rest 1
-	dnote 1, snare4
-	dnote 1, snare3
-	dnote 1, snare2
-	rest 3
-	dnote 1, snare3
-	rest 5
-	dnote 1, snare2
-	dnote 1, snare4
-	dnote 1, snare2
-	rest 1
-	dspeed 6
-	dnote 1, snare3
-	dnote 1, snare3
-	dnote 1, snare4
-	dnote 1, snare4
-	dspeed 12
-	dnote 1, snare1
-	rest 3
-	dnote 1, snare2
-	rest 5
-	dnote 1, snare3
-	dnote 1, snare2
-	dnote 1, snare1
-	rest 3
-	dnote 1, snare2
-	rest 3
-	dnote 1, snare3
-	rest 5
-	dnote 1, snare3
-	dnote 1, snare2
-	dnote 1, snare3
-	rest 3
-	dnote 1, snare2
-	rest 3
-	dnote 1, snare3
-	rest 5
-	dnote 1, snare2
-	dnote 1, snare3
-	dnote 1, snare4
-	rest 1
-	dnote 1, snare3
-	dnote 1, snare2
-	dnote 1, snare2
-	rest 3
-	dnote 1, snare3
-	rest 5
-	dnote 1, snare2
-	dnote 1, snare3
-	dnote 1, snare2
-	rest 3
-	dnote 1, snare5
-	rest 5
-	dnote 1, snare2
-	rest 3
-	dnote 1, snare3
-	dnote 1, snare2
-	dnote 1, snare1
-	rest 5
-	dnote 1, snare2
-	dnote 1, snare3
-	dnote 1, snare2
-	rest 1
-	dnote 1, snare1
-	rest 1
-	dspeed 8
-	dnote 4, snare2
-	dnote 4, snare3
-	dnote 4, snare1
-	dspeed 12
-	dnote 1, snare5
-	rest 5
-	dnote 1, snare2
-	rest 3
-	dnote 1, snare3
-	dnote 1, snare2
-	dnote 1, snare3
-	rest 5
-	dnote 1, snare2
-	dnote 1, snare3
-	dnote 1, snare1
-	rest 1
-	dnote 1, snare3
-	dnote 1, snare2
-	dspeed 8
-	dnote 4, snare2
-	dnote 4, snare3
-	dnote 4, snare2
-	loopchannel 0, Music_TitleScreen_branch_7e716
-
-Music_TitleScreen_branch_7e834::
-	dnote 1, snare2
-	rest 3
-	dnote 1, snare2
-	rest 5
-	dnote 1, snare2
-	dnote 1, snare3
-	dnote 1, snare2
-	rest 3
-	endchannel
-
-Music_TitleScreen_branch_7e842::
-	dnote 1, snare2
-	rest 3
-	dnote 1, snare2
-	rest 5
-	dnote 1, snare3
-	dnote 1, snare2
-	dnote 1, snare2
-	rest 3
-	endchannel
-; 0x7e850
\ No newline at end of file