combine audio and music folders

1 files changed, 0 insertions, 705 deletions

diff --git a/music/bikeriding.asm b/music/bikeriding.asm
deleted file mode 100644
index 13776fe1..00000000
--- a/music/bikeriding.asm
+++ /dev/null
@@ -1,705 +0,0 @@
-Music_BikeRiding_Ch1:: ; 7dbbb (1f:5bbb)
-	tempo 0, 144
-	stereopanning 119
-	duty 3
-	vibrato 8, 1, 4
-	notetype 12, 11, 5
-	octave 3
-	note G_, 2
-
-Music_BikeRiding_branch_7dbc9::
-	octave 4
-	note C_, 4
-	note D_, 4
-	note E_, 2
-	note C_, 2
-	note E_, 2
-	note G_, 2
-	note G_, 2
-	note F_, 2
-	note E_, 2
-	note F_, 4
-	note E_, 2
-	note D_, 2
-	note F_, 4
-	note D_, 4
-	octave 3
-	note B_, 2
-	octave 4
-	note F_, 4
-	note D_, 4
-	note E_, 2
-	note F_, 2
-	note G_, 2
-	note C_, 2
-	note E_, 2
-	note C_, 2
-	note D_, 2
-	note E_, 2
-	notetype 12, 11, 6
-	note F_, 10
-	notetype 12, 10, 6
-	note F_, 2
-	note E_, 2
-	note F_, 2
-	note G_, 10
-	note E_, 2
-	note D_, 2
-	note E_, 2
-	note F_, 6
-	togglecall
-	notetype 12, 11, 3
-	note E_, 2
-	note D_, 2
-	note D_, 1
-	note E_, 1
-	note F_, 2
-	note E_, 1
-	note F_, 1
-	togglecall
-	notetype 12, 11, 5
-	note G_, 6
-	note G_, 6
-	note A_, 2
-	note F_, 2
-	note G_, 6
-	notetype 12, 11, 4
-	note G_, 2
-	note F_, 4
-	notetype 12, 10, 4
-	note E_, 2
-	note D_, 2
-	notetype 12, 9, 3
-	octave 3
-	note A_, 2
-	octave 4
-	note C_, 4
-	note C_, 2
-	octave 3
-	note B_, 2
-	note A_, 1
-	note B_, 1
-	note A_, 2
-	note B_, 2
-	octave 4
-	note C_, 2
-	note C_, 4
-	note C_, 2
-	octave 3
-	note A_, 2
-	note B_, 2
-	note B_, 2
-	note A_, 2
-	octave 4
-	note C_, 4
-	octave 3
-	note A_, 2
-	note B_, 1
-	octave 4
-	note C_, 1
-	octave 3
-	note B_, 2
-	octave 4
-	note D_, 4
-	octave 3
-	note B_, 2
-	octave 4
-	note C_, 4
-	octave 3
-	note B_, 1
-	octave 4
-	note C_, 1
-	note D_, 1
-	octave 3
-	note B_, 1
-	octave 4
-	note C_, 4
-	notetype 12, 3, 13
-	note C_, 4
-	notetype 12, 11, 4
-	note F_, 6
-	note G_, 4
-	note F_, 1
-	note G_, 1
-	note F_, 4
-	note E_, 6
-	note F_, 2
-	note E_, 2
-	note D_, 1
-	note E_, 1
-	note D_, 2
-	note C_, 2
-	notetype 12, 11, 5
-	octave 3
-	note A_, 4
-	octave 4
-	note D_, 4
-	octave 3
-	note B_, 4
-	octave 4
-	note E_, 4
-	note C_, 4
-	note F_, 4
-	note D_, 4
-	note F#, 4
-	vibrato 10, 2, 6
-	notetype 12, 8, 0
-	note G_, 16
-	note G_, 4
-	notetype 12, 8, 7
-	note G_, 12
-	notetype 12, 11, 5
-	vibrato 8, 1, 4
-	loopchannel 0, Music_BikeRiding_branch_7dbc9
-
-
-Music_BikeRiding_Ch2:: ; 7dc6c (1f:5c6c)
-	duty 2
-	vibrato 6, 1, 5
-	notetype 12, 12, 3
-	octave 4
-	note C_, 2
-
-Music_BikeRiding_branch_7dc75::
-	note E_, 4
-	note F_, 4
-	note G_, 4
-	octave 5
-	note C_, 4
-	octave 4
-	note B_, 6
-	note A_, 1
-	note B_, 1
-	note A_, 10
-	note F_, 2
-	note G_, 2
-	note A_, 2
-	octave 5
-	note D_, 2
-	note C_, 2
-	octave 4
-	note B_, 2
-	note A_, 1
-	note B_, 1
-	octave 5
-	note C_, 6
-	octave 4
-	note A_, 2
-	note G_, 4
-	duty 3
-	notetype 12, 8, 4
-	note A#, 6
-	duty 2
-	notetype 12, 12, 5
-	octave 5
-	note C_, 2
-	octave 4
-	note B_, 2
-	octave 5
-	note C_, 2
-	octave 4
-	note A_, 10
-	octave 5
-	note C_, 2
-	octave 4
-	note B_, 2
-	octave 5
-	note C_, 2
-	octave 4
-	note G_, 10
-	notetype 12, 12, 3
-	octave 5
-	note C_, 4
-	note E_, 2
-	note D_, 2
-	note C_, 2
-	octave 4
-	note B_, 2
-	octave 5
-	note C_, 2
-	notetype 12, 11, 0
-	note D_, 4
-	notetype 12, 12, 7
-	note D_, 10
-	note D_, 1
-	note C_, 1
-	notetype 12, 11, 0
-	octave 4
-	note B_, 4
-	notetype 12, 12, 7
-	note B_, 12
-	notetype 12, 12, 4
-	note F_, 6
-	note F_, 2
-	note G_, 2
-	note F_, 2
-	note E_, 2
-	note D_, 2
-	note E_, 6
-	note E_, 2
-	note F_, 2
-	note E_, 2
-	note D_, 2
-	note C_, 2
-	note F_, 2
-	note E_, 2
-	note D_, 2
-	note F_, 2
-	note G_, 4
-	note A_, 2
-	note F_, 2
-	note E_, 2
-	note G_, 4
-	note F_, 2
-	note E_, 6
-	notetype 6, 12, 2
-	note F_, 1
-	note G_, 1
-	note A_, 1
-	note B_, 1
-	notetype 12, 12, 3
-	octave 5
-	note C_, 2
-	octave 4
-	note B_, 2
-	note A_, 2
-	octave 5
-	note C_, 2
-	octave 4
-	note B_, 4
-	note A_, 4
-	note G_, 2
-	note A#, 4
-	note A_, 2
-	note G_, 4
-	note F_, 2
-	note E_, 2
-	notetype 8, 12, 4
-	note A_, 4
-	note G_, 4
-	note F_, 4
-	note B_, 4
-	note A_, 4
-	note G_, 4
-	octave 5
-	note C_, 4
-	octave 4
-	note B_, 4
-	note A_, 4
-	octave 5
-	note D_, 4
-	note E_, 4
-	note C_, 4
-	notetype 12, 12, 7
-	note D_, 12
-	note C_, 4
-	notetype 12, 11, 0
-	octave 4
-	note B_, 4
-	notetype 12, 12, 7
-	note B_, 12
-	notetype 12, 12, 3
-	loopchannel 0, Music_BikeRiding_branch_7dc75
-
-
-Music_BikeRiding_Ch3:: ; 7dd14 (1f:5d14)
-	notetype 12, 1, 3
-	rest 2
-
-Music_BikeRiding_branch_7dd17::
-	octave 4
-	note C_, 1
-	rest 1
-	note E_, 1
-	rest 1
-	octave 3
-	note G_, 1
-	rest 1
-	octave 4
-	note E_, 1
-	rest 1
-	note C_, 1
-	rest 1
-	note E_, 1
-	rest 1
-	note C_, 1
-	rest 1
-	note G_, 1
-	rest 1
-	note F_, 1
-	rest 1
-	note A_, 1
-	rest 1
-	note C_, 1
-	rest 1
-	note A_, 1
-	rest 1
-	note F_, 1
-	rest 1
-	note A_, 1
-	rest 1
-	note E_, 1
-	rest 1
-	note A_, 1
-	rest 1
-	note D_, 1
-	rest 1
-	note F_, 1
-	rest 1
-	octave 3
-	note A_, 1
-	rest 1
-	octave 4
-	note F_, 1
-	rest 1
-	note D_, 1
-	rest 1
-	note F_, 1
-	rest 1
-	note E_, 1
-	rest 1
-	note F_, 1
-	rest 1
-	note E_, 1
-	rest 1
-	note G_, 1
-	rest 1
-	note C_, 1
-	rest 1
-	note G_, 1
-	rest 1
-	note E_, 1
-	rest 1
-	note G_, 1
-	rest 1
-	note E_, 1
-	rest 1
-	note G_, 1
-	rest 1
-	note F_, 1
-	rest 1
-	note A_, 1
-	rest 1
-	note C_, 1
-	rest 1
-	note A_, 1
-	rest 1
-	note F_, 1
-	rest 1
-	note G_, 1
-	rest 1
-	note A_, 1
-	rest 1
-	note G_, 1
-	rest 1
-	note E_, 1
-	rest 1
-	note G_, 1
-	rest 1
-	note C_, 1
-	rest 1
-	note G_, 1
-	rest 1
-	note E_, 1
-	rest 1
-	note G_, 1
-	rest 1
-	note E_, 1
-	rest 1
-	note G_, 1
-	rest 1
-	note D_, 1
-	rest 1
-	note F_, 1
-	rest 1
-	octave 3
-	note A_, 1
-	rest 1
-	octave 4
-	note F_, 1
-	rest 1
-	note D_, 1
-	rest 1
-	note F_, 1
-	rest 1
-	note D_, 1
-	rest 1
-	note F_, 1
-	rest 1
-	note G_, 1
-	rest 1
-	note C_, 1
-	rest 1
-	note D_, 1
-	rest 1
-	note G_, 1
-	rest 1
-	note D_, 1
-	rest 1
-	note G_, 1
-	rest 1
-	note D_, 1
-	rest 1
-	note G_, 1
-	rest 1
-	note D_, 1
-	rest 1
-	octave 3
-	note B_, 1
-	rest 1
-	octave 4
-	note D_, 1
-	rest 1
-	note G_, 1
-	rest 1
-	note D_, 1
-	rest 1
-	note G_, 1
-	rest 1
-	octave 3
-	note B_, 1
-	rest 1
-	octave 4
-	note G_, 1
-	rest 1
-	note D_, 1
-	rest 1
-	note F_, 1
-	rest 1
-	octave 3
-	note A_, 1
-	rest 1
-	octave 4
-	note F_, 1
-	rest 1
-	note D_, 1
-	rest 1
-	note F_, 1
-	rest 1
-	note D_, 1
-	rest 1
-	note F_, 1
-	rest 1
-	note E_, 1
-	rest 1
-	note G_, 1
-	rest 1
-	note C_, 1
-	rest 1
-	note G_, 1
-	rest 1
-	note E_, 1
-	rest 1
-	note G_, 1
-	rest 1
-	note E_, 1
-	rest 1
-	note G_, 1
-	rest 1
-	note D_, 1
-	rest 1
-	note F_, 1
-	rest 1
-	octave 3
-	note A_, 1
-	rest 1
-	octave 4
-	note F_, 1
-	rest 1
-	note F_, 1
-	rest 1
-	note E_, 1
-	rest 1
-	note D_, 1
-	rest 1
-	note F_, 1
-	rest 1
-	note E_, 1
-	rest 1
-	note C_, 1
-	rest 1
-	note G_, 1
-	rest 1
-	note C_, 1
-	rest 1
-	note E_, 1
-	rest 1
-	note G_, 1
-	rest 1
-	note E_, 1
-	rest 1
-	note G_, 1
-	rest 1
-	note F_, 1
-	rest 1
-	note A_, 1
-	rest 1
-	note C_, 1
-	rest 1
-	note A_, 1
-	rest 1
-	note F_, 1
-	rest 1
-	note A_, 1
-	rest 1
-	note A_, 1
-	rest 1
-	note F_, 1
-	rest 1
-	note G_, 1
-	rest 1
-	note A#, 1
-	rest 1
-	note E_, 1
-	rest 1
-	note A#, 1
-	rest 1
-	note G_, 1
-	rest 1
-	note A#, 1
-	rest 1
-	note A#, 1
-	rest 1
-	note G_, 1
-	rest 1
-	note F_, 1
-	rest 1
-	note D_, 1
-	rest 1
-	note F_, 1
-	rest 1
-	note A_, 1
-	rest 1
-	note G_, 1
-	rest 1
-	note E_, 1
-	rest 1
-	note G_, 1
-	rest 1
-	note B_, 1
-	rest 1
-	note A_, 1
-	rest 1
-	note F_, 1
-	rest 1
-	note A_, 1
-	rest 1
-	octave 5
-	note C_, 1
-	rest 1
-	octave 4
-	note B_, 1
-	rest 1
-	note A_, 1
-	rest 1
-	octave 5
-	note C_, 1
-	rest 1
-	octave 4
-	note A_, 1
-	rest 1
-	note G_, 1
-	rest 1
-	octave 5
-	note C_, 1
-	rest 1
-	octave 4
-	note G_, 1
-	rest 1
-	octave 5
-	note C_, 1
-	rest 1
-	octave 4
-	note G_, 1
-	rest 1
-	octave 5
-	note C_, 1
-	rest 1
-	octave 4
-	note G_, 1
-	rest 1
-	octave 5
-	note C_, 1
-	rest 1
-	octave 4
-	note G_, 1
-	rest 1
-	note B_, 1
-	rest 1
-	note G_, 1
-	rest 1
-	note B_, 1
-	rest 1
-	note F_, 1
-	rest 1
-	note A_, 1
-	rest 1
-	octave 3
-	note B_, 1
-	rest 1
-	octave 4
-	note F_, 1
-	rest 1
-	loopchannel 0, Music_BikeRiding_branch_7dd17
-
-
-Music_BikeRiding_Ch4:: ; 7de68 (1f:5e68)
-	dspeed 12
-	rest 2
-
-Music_BikeRiding_branch_7de6a::
-	callchannel Music_BikeRiding_branch_7dea7
-	callchannel Music_BikeRiding_branch_7deb4
-	callchannel Music_BikeRiding_branch_7dea7
-	callchannel Music_BikeRiding_branch_7dec2
-	callchannel Music_BikeRiding_branch_7deb4
-	callchannel Music_BikeRiding_branch_7deb4
-	callchannel Music_BikeRiding_branch_7dea7
-	callchannel Music_BikeRiding_branch_7dea7
-	callchannel Music_BikeRiding_branch_7dea7
-	callchannel Music_BikeRiding_branch_7dea7
-	callchannel Music_BikeRiding_branch_7deb4
-	callchannel Music_BikeRiding_branch_7dea7
-	callchannel Music_BikeRiding_branch_7dec2
-	callchannel Music_BikeRiding_branch_7dea7
-	callchannel Music_BikeRiding_branch_7deb4
-	callchannel Music_BikeRiding_branch_7dea7
-	callchannel Music_BikeRiding_branch_7dea7
-	callchannel Music_BikeRiding_branch_7dea7
-	callchannel Music_BikeRiding_branch_7dea7
-	loopchannel 0, Music_BikeRiding_branch_7de6a
-
-Music_BikeRiding_branch_7dea7::
-	rest 2
-	dnote 2, triangle3
-	rest 2
-	dnote 2, triangle3
-	rest 2
-	dnote 2, triangle3
-	rest 2
-	dnote 2, triangle3
-	endchannel
-
-Music_BikeRiding_branch_7deb4::
-	rest 2
-	dnote 2, triangle3
-	rest 2
-	dnote 2, triangle3
-	rest 2
-	dnote 2, triangle3
-	dnote 2, triangle3
-	dnote 2, triangle3
-	endchannel
-
-Music_BikeRiding_branch_7dec2::
-	rest 2
-	dnote 2, triangle3
-	rest 2
-	dnote 2, triangle3
-	rest 2
-	dnote 2, triangle3
-	rest 2
-	dnote 1, triangle3
-	dnote 1, triangle3
-	endchannel
-; 0x7ded1
\ No newline at end of file