diff --git a/crysaudio/music/RBY/bikeriding.asm b/crysaudio/music/RBY/bikeriding.asm index 76382362..18c3af09 100644 --- a/crysaudio/music/RBY/bikeriding.asm +++ b/crysaudio/music/RBY/bikeriding.asm @@ -1,18 +1,19 @@ -Music_BikeRiding: - dbw $C0, Music_BikeRiding_Ch1 - dbw $01, Music_BikeRiding_Ch2 - dbw $02, Music_BikeRiding_Ch3 - dbw $03, Music_BikeRiding_Ch4 +Music_BikeRiding:: + musicheader 4, 1, Music_BikeRiding_Ch0 + musicheader 1, 2, Music_BikeRiding_Ch1 + musicheader 1, 3, Music_BikeRiding_Ch2 + musicheader 1, 4, Music_BikeRiding_Ch3 -Music_BikeRiding_Ch1: +Music_BikeRiding_Ch0:: tempo 144 - volume 119 + volume $77 dutycycle 3 - vibrato $8, $14 - notetype $c, $b5 + vibrato 8, $14 + notetype 12, $b5 octave 3 note G_, 2 -Music_BikeRiding_branch_7dbc9: + +Music_BikeRiding_branch_7dbc9:: octave 4 note C_, 4 note D_, 4 @@ -41,9 +42,9 @@ Music_BikeRiding_branch_7dbc9: note C_, 2 note D_, 2 note E_, 2 - intensity $b6 + notetype 12, $b6 note F_, 10 - intensity $a6 + notetype 12, $a6 note F_, 2 note E_, 2 note F_, 2 @@ -52,7 +53,8 @@ Music_BikeRiding_branch_7dbc9: note D_, 2 note E_, 2 note F_, 6 - intensity $b3 + ;toggleperfectpitch + notetype 12, $b3 note E_, 2 note D_, 2 note D_, 1 @@ -60,19 +62,20 @@ Music_BikeRiding_branch_7dbc9: note F_, 2 note E_, 1 note F_, 1 - intensity $b5 + ;toggleperfectpitch + notetype 12, $b5 note G_, 6 note G_, 6 note A_, 2 note F_, 2 note G_, 6 - intensity $b4 + notetype 12, $b4 note G_, 2 note F_, 4 - intensity $a4 + notetype 12, $a4 note E_, 2 note D_, 2 - intensity $93 + notetype 12, $93 octave 3 note A_, 2 octave 4 @@ -117,9 +120,9 @@ Music_BikeRiding_branch_7dbc9: note B_, 1 octave 4 note C_, 4 - intensity $3d + notetype 12, $3d note C_, 4 - intensity $b4 + notetype 12, $b4 note F_, 6 note G_, 4 note F_, 1 @@ -132,7 +135,7 @@ Music_BikeRiding_branch_7dbc9: note E_, 1 note D_, 2 note C_, 2 - intensity $b5 + notetype 12, $b5 octave 3 note A_, 4 octave 4 @@ -145,22 +148,25 @@ Music_BikeRiding_branch_7dbc9: note F_, 4 note D_, 4 note F#, 4 - vibrato $a, $26 - intensity $80 + vibrato 10, $26 + notetype 12, $80 note G_, 16 note G_, 4 - intensity $87 + notetype 12, $87 note G_, 12 - intensity $b5 - vibrato $8, $14 + notetype 12, $b5 + vibrato 8, $14 loopchannel 0, Music_BikeRiding_branch_7dbc9 -Music_BikeRiding_Ch2: + + +Music_BikeRiding_Ch1:: dutycycle 2 - vibrato $6, $15 - notetype $c, $c3 + vibrato 6, $15 + notetype 12, $c3 octave 4 note C_, 2 -Music_BikeRiding_branch_7dc75: + +Music_BikeRiding_branch_7dc75:: note E_, 4 note F_, 4 note G_, 4 @@ -187,10 +193,10 @@ Music_BikeRiding_branch_7dc75: note A_, 2 note G_, 4 dutycycle 3 - notetype $c, $84 + notetype 12, $84 note A#, 6 dutycycle 2 - notetype $c, $c5 + notetype 12, $c5 octave 5 note C_, 2 octave 4 @@ -207,7 +213,7 @@ Music_BikeRiding_branch_7dc75: note C_, 2 octave 4 note G_, 10 - notetype $c, $c3 + notetype 12, $c3 octave 5 note C_, 4 note E_, 2 @@ -217,18 +223,18 @@ Music_BikeRiding_branch_7dc75: note B_, 2 octave 5 note C_, 2 - notetype $c, $b0 + notetype 12, $b0 note D_, 4 - notetype $c, $c7 + notetype 12, $c7 note D_, 10 note D_, 1 note C_, 1 - notetype $c, $b0 + notetype 12, $b0 octave 4 note B_, 4 - notetype $c, $c7 + notetype 12, $c7 note B_, 12 - notetype $c, $c4 + notetype 12, $c4 note F_, 6 note F_, 2 note G_, 2 @@ -252,12 +258,12 @@ Music_BikeRiding_branch_7dc75: note G_, 4 note F_, 2 note E_, 6 - notetype $6, $c2 + notetype 6, $c2 note F_, 1 note G_, 1 note A_, 1 note B_, 1 - notetype $c, $c3 + notetype 12, $c3 octave 5 note C_, 2 octave 4 @@ -274,7 +280,7 @@ Music_BikeRiding_branch_7dc75: note G_, 4 note F_, 2 note E_, 2 - notetype $8, $c4 + notetype 8, $c4 note A_, 4 note G_, 4 note F_, 4 @@ -290,20 +296,23 @@ Music_BikeRiding_branch_7dc75: note D_, 4 note E_, 4 note C_, 4 - notetype $c, $c7 + notetype 12, $c7 note D_, 12 note C_, 4 - notetype $c, $b0 + notetype 12, $b0 octave 4 note B_, 4 - notetype $c, $c7 + notetype 12, $c7 note B_, 12 - notetype $c, $c3 + notetype 12, $c3 loopchannel 0, Music_BikeRiding_branch_7dc75 -Music_BikeRiding_Ch3: - notetype $c, $13 + + +Music_BikeRiding_Ch2:: + notetype 12, $13 note __, 2 -Music_BikeRiding_branch_7dd17: + +Music_BikeRiding_branch_7dd17:: octave 4 note C_, 1 note __, 1 @@ -638,11 +647,14 @@ Music_BikeRiding_branch_7dd17: note F_, 1 note __, 1 loopchannel 0, Music_BikeRiding_branch_7dd17 -Music_BikeRiding_Ch4: - togglenoise $1 - notetype $c + + +Music_BikeRiding_Ch3:: + togglenoise 1 + notetype 12 note __, 2 -Music_BikeRiding_branch_7de6a: + +Music_BikeRiding_branch_7de6a:: callchannel Music_BikeRiding_branch_7dea7 callchannel Music_BikeRiding_branch_7deb4 callchannel Music_BikeRiding_branch_7dea7 @@ -663,7 +675,8 @@ Music_BikeRiding_branch_7de6a: callchannel Music_BikeRiding_branch_7dea7 callchannel Music_BikeRiding_branch_7dea7 loopchannel 0, Music_BikeRiding_branch_7de6a -Music_BikeRiding_branch_7dea7: + +Music_BikeRiding_branch_7dea7:: note __, 2 note G#, 2 note __, 2 @@ -673,7 +686,8 @@ Music_BikeRiding_branch_7dea7: note __, 2 note G#, 2 endchannel -Music_BikeRiding_branch_7deb4: + +Music_BikeRiding_branch_7deb4:: note __, 2 note G#, 2 note __, 2 @@ -683,7 +697,8 @@ Music_BikeRiding_branch_7deb4: note G#, 2 note G#, 2 endchannel -Music_BikeRiding_branch_7dec2: + +Music_BikeRiding_branch_7dec2:: note __, 2 note G#, 2 note __, 2 diff --git a/crysaudio/music/RBY/celadon.asm b/crysaudio/music/RBY/celadon.asm index 30860ce0..e180ef10 100644 --- a/crysaudio/music/RBY/celadon.asm +++ b/crysaudio/music/RBY/celadon.asm @@ -1,19 +1,21 @@ -Music_Celadon: - dbw $80, Music_Celadon_Ch1 - dbw $01, Music_Celadon_Ch2 - dbw $02, Music_Celadon_Ch3 +Music_Celadon:: + musicheader 3, 1, Music_Celadon_Ch0 + musicheader 1, 2, Music_Celadon_Ch1 + musicheader 1, 3, Music_Celadon_Ch2 -Music_Celadon_Ch1: +Music_Celadon_Ch0:: tempo 144 - volume 119 + volume $77 dutycycle 3 - notetype $c, $2f + ;toggleperfectpitch + notetype 12, $2f note __, 8 octave 3 note D_, 8 -Music_Celadon_branch_b6d4: + +Music_Celadon_branch_b6d4:: dutycycle 2 - intensity $b2 + notetype 12, $b2 note G_, 4 note B_, 4 note G_, 2 @@ -74,7 +76,7 @@ Music_Celadon_branch_b6d4: note F#, 1 note G_, 1 note A_, 8 - intensity $94 + notetype 12, $94 note B_, 8 note G_, 4 note D_, 4 @@ -108,9 +110,11 @@ Music_Celadon_branch_b6d4: note F#, 4 note A_, 4 loopchannel 0, Music_Celadon_branch_b6d4 -Music_Celadon_Ch2: + + +Music_Celadon_Ch1:: dutycycle 3 - notetype $c, $c2 + notetype 12, $c2 octave 4 note D_, 1 note C#, 1 @@ -120,11 +124,12 @@ Music_Celadon_Ch2: note E_, 1 note F#, 1 note G_, 1 - intensity $a0 + notetype 12, $a0 note A_, 8 -Music_Celadon_branch_b74a: + +Music_Celadon_branch_b74a:: dutycycle 2 - intensity $c2 + notetype 12, $c2 octave 4 note B_, 4 note G_, 4 @@ -178,7 +183,7 @@ Music_Celadon_branch_b74a: note D_, 8 octave 5 note D_, 8 - intensity $b4 + notetype 12, $b4 octave 4 note D_, 8 note C_, 2 @@ -224,8 +229,10 @@ Music_Celadon_branch_b74a: note E_, 2 note D_, 8 loopchannel 0, Music_Celadon_branch_b74a -Music_Celadon_Ch3: - notetype $c, $13 + + +Music_Celadon_Ch2:: + notetype 12, $13 note __, 8 octave 5 note D_, 1 @@ -236,7 +243,8 @@ Music_Celadon_Ch3: note E_, 1 note F#, 1 note G_, 1 -Music_Celadon_branch_b7c1: + +Music_Celadon_branch_b7c1:: octave 4 note D_, 2 note B_, 2 diff --git a/crysaudio/music/RBY/cinnabar.asm b/crysaudio/music/RBY/cinnabar.asm index d5f832f4..9fadd661 100644 --- a/crysaudio/music/RBY/cinnabar.asm +++ b/crysaudio/music/RBY/cinnabar.asm @@ -1,40 +1,40 @@ -Music_Cinnabar: - dbw $80, Music_Cinnabar_Ch1 - dbw $01, Music_Cinnabar_Ch2 - dbw $02, Music_Cinnabar_Ch3 +Music_Cinnabar:: + musicheader 3, 1, Music_Cinnabar_Ch0 + musicheader 1, 2, Music_Cinnabar_Ch1 + musicheader 1, 3, Music_Cinnabar_Ch2 -Music_Cinnabar_Ch1: ; b86d (2:786d) +Music_Cinnabar_Ch0:: tempo 144 - volume 119 + volume $77 dutycycle 3 - vibrato 12, 52 - + vibrato 12, $34 + ;toggleperfectpitch -Music_Cinnabar_branch_b878: - notetype 12, 181 +Music_Cinnabar_branch_b878:: + notetype 12, $b5 note __, 4 octave 3 note D_, 4 note E_, 6 note C#, 2 - notetype 12, 177 + notetype 12, $b1 note D_, 4 - notetype 12, 181 + notetype 12, $b5 note B_, 4 octave 4 note C_, 6 octave 3 note A_, 2 - notetype 12, 177 + notetype 12, $b1 note B_, 4 - notetype 12, 181 + notetype 12, $b5 note G_, 4 note F#, 4 note E_, 2 note F#, 2 - notetype 12, 177 + notetype 12, $b1 note G_, 4 - notetype 12, 181 + notetype 12, $b5 note G_, 4 note F#, 4 note E_, 4 @@ -42,9 +42,9 @@ Music_Cinnabar_branch_b878: note E_, 4 note F#, 6 note A_, 2 - notetype 12, 177 + notetype 12, $b1 note G_, 4 - notetype 12, 181 + notetype 12, $b5 note B_, 4 octave 4 note C_, 6 @@ -56,17 +56,17 @@ Music_Cinnabar_branch_b878: note E_, 1 note F#, 2 note A_, 2 - notetype 12, 162 + notetype 12, $a2 note G_, 4 octave 4 note D_, 1 note E_, 1 note D_, 4 - notetype 12, 114 + notetype 12, $72 note D_, 1 note E_, 1 note D_, 4 - notetype 12, 167 + notetype 12, $a7 octave 3 note B_, 6 note G_, 2 @@ -90,12 +90,12 @@ Music_Cinnabar_branch_b878: loopchannel 0, Music_Cinnabar_branch_b878 -Music_Cinnabar_Ch2: ; b8d4 (2:78d4) +Music_Cinnabar_Ch1:: dutycycle 3 - vibrato 10, 35 + vibrato 10, $23 -Music_Cinnabar_branch_b8d9: - notetype 12, 199 +Music_Cinnabar_branch_b8d9:: + notetype 12, $c7 octave 3 note G_, 6 note A_, 1 @@ -104,9 +104,9 @@ Music_Cinnabar_branch_b8d9: note C_, 6 note D_, 1 note E_, 1 - notetype 12, 193 + notetype 12, $c1 note D_, 4 - notetype 12, 199 + notetype 12, $c7 note G_, 4 note A_, 6 note G_, 1 @@ -120,9 +120,9 @@ Music_Cinnabar_branch_b8d9: note C_, 2 note D_, 1 note E_, 1 - notetype 12, 193 + notetype 12, $c1 note D_, 4 - notetype 12, 199 + notetype 12, $c7 octave 3 note B_, 8 note A_, 4 @@ -133,9 +133,9 @@ Music_Cinnabar_branch_b8d9: note C_, 6 note D_, 1 note E_, 1 - notetype 12, 193 + notetype 12, $c1 note D_, 4 - notetype 12, 199 + notetype 12, $c7 note G_, 4 note A_, 6 note G_, 1 @@ -149,14 +149,14 @@ Music_Cinnabar_branch_b8d9: note C_, 2 note D_, 1 note E_, 1 - notetype 12, 193 + notetype 12, $c1 note D_, 4 - notetype 12, 199 + notetype 12, $c7 octave 3 note A_, 4 note G_, 4 note F#, 4 - notetype 12, 176 + notetype 12, $b0 octave 4 note D_, 6 octave 3 @@ -184,10 +184,10 @@ Music_Cinnabar_branch_b8d9: loopchannel 0, Music_Cinnabar_branch_b8d9 -Music_Cinnabar_Ch3: ; b93d (2:793d) - notetype 12, 16 +Music_Cinnabar_Ch2:: + notetype 12, $10 -Music_Cinnabar_branch_b93f: +Music_Cinnabar_branch_b93f:: octave 4 note G_, 1 note __, 3 @@ -357,4 +357,3 @@ Music_Cinnabar_branch_b93f: note C_, 1 note __, 1 loopchannel 0, Music_Cinnabar_branch_b93f -; 0xb9eb \ No newline at end of file diff --git a/crysaudio/music/RBY/cinnabarmansion.asm b/crysaudio/music/RBY/cinnabarmansion.asm index d348f954..8b255e29 100644 --- a/crysaudio/music/RBY/cinnabarmansion.asm +++ b/crysaudio/music/RBY/cinnabarmansion.asm @@ -1,17 +1,17 @@ -Music_CinnabarMansion: - dbw $C0, Music_CinnabarMansion_Ch1 - dbw $01, Music_CinnabarMansion_Ch2 - dbw $02, Music_CinnabarMansion_Ch3 - dbw $03, Music_CinnabarMansion_Ch4 +Music_CinnabarMansion:: + musicheader 4, 1, Music_CinnabarMansion_Ch0 + musicheader 1, 2, Music_CinnabarMansion_Ch1 + musicheader 1, 3, Music_CinnabarMansion_Ch2 + musicheader 1, 4, Music_CinnabarMansion_Ch3 -Music_CinnabarMansion_Ch1: ; 7ed0f (1f:6d0f) +Music_CinnabarMansion_Ch0:: tempo 144 - volume 119 - vibrato 11, 37 + volume $77 + vibrato 11, $25 dutycycle 2 -Music_CinnabarMansion_branch_7ed19: - notetype 12, 98 +Music_CinnabarMansion_branch_7ed19:: + notetype 12, $62 octave 5 note E_, 1 note E_, 1 @@ -32,7 +32,7 @@ Music_CinnabarMansion_branch_7ed19: note B_, 1 note __, 2 loopchannel 14, Music_CinnabarMansion_branch_7ed19 - notetype 12, 165 + notetype 12, $a5 note __, 16 note __, 16 note __, 15 @@ -44,21 +44,21 @@ Music_CinnabarMansion_branch_7ed19: loopchannel 0, Music_CinnabarMansion_branch_7ed19 -Music_CinnabarMansion_Ch2: ; 7ed40 (1f:6d40) +Music_CinnabarMansion_Ch1:: dutycycle 2 - - vibrato 10, 36 - notetype 12, 194 + ;toggleperfectpitch + vibrato 10, $24 + notetype 12, $c2 -Music_CinnabarMansion_branch_7ed48: +Music_CinnabarMansion_branch_7ed48:: note __, 16 note __, 16 loopchannel 4, Music_CinnabarMansion_branch_7ed48 -Music_CinnabarMansion_branch_7ed4e: - notetype 12, 194 +Music_CinnabarMansion_branch_7ed4e:: + notetype 12, $c2 -Music_CinnabarMansion_branch_7ed50: +Music_CinnabarMansion_branch_7ed50:: callchannel Music_CinnabarMansion_branch_7ed6c loopchannel 3, Music_CinnabarMansion_branch_7ed50 octave 3 @@ -80,7 +80,7 @@ Music_CinnabarMansion_branch_7ed50: note D#, 4 loopchannel 0, Music_CinnabarMansion_branch_7ed4e -Music_CinnabarMansion_branch_7ed6c: +Music_CinnabarMansion_branch_7ed6c:: octave 3 note E_, 4 note D#, 4 @@ -101,10 +101,10 @@ Music_CinnabarMansion_branch_7ed6c: endchannel -Music_CinnabarMansion_Ch3: ; 7ed7e (1f:6d7e) - notetype 12, 17 +Music_CinnabarMansion_Ch2:: + notetype 12, $11 -Music_CinnabarMansion_branch_7ed80: +Music_CinnabarMansion_branch_7ed80:: octave 2 note B_, 2 note __, 2 @@ -149,15 +149,15 @@ Music_CinnabarMansion_branch_7ed80: loopchannel 0, Music_CinnabarMansion_branch_7ed80 -Music_CinnabarMansion_Ch4: ; 7edb0 (1f:6db0) - notetype 6 +Music_CinnabarMansion_Ch3:: togglenoise 1 + notetype 6 note __, 16 note __, 16 note __, 16 note __, 16 -Music_CinnabarMansion_branch_7edb5: +Music_CinnabarMansion_branch_7edb5:: note E_, 2 note E_, 2 note F_, 4 @@ -177,4 +177,3 @@ Music_CinnabarMansion_branch_7edb5: note __, 8 note F#, 8 loopchannel 0, Music_CinnabarMansion_branch_7edb5 -; 0x7edda \ No newline at end of file diff --git a/crysaudio/music/RBY/cities1.asm b/crysaudio/music/RBY/cities1.asm index ab65f0a2..723de9c1 100644 --- a/crysaudio/music/RBY/cities1.asm +++ b/crysaudio/music/RBY/cities1.asm @@ -1,23 +1,23 @@ -Music_Cities1: - dbw $C0, Music_Cities1_Ch1 - dbw $01, Music_Cities1_Ch2 - dbw $02, Music_Cities1_Ch3 - dbw $03, Music_Cities1_Ch4 +Music_Cities1:: + musicheader 4, 1, Music_Cities1_Ch0 + musicheader 1, 2, Music_Cities1_Ch1 + musicheader 1, 3, Music_Cities1_Ch2 + musicheader 1, 4, Music_Cities1_Ch3 -Music_Cities1_branch_aa6f: +Music_Cities1_branch_aa6f:: tempo 232 loopchannel 0, Music_Cities1_branch_aa79 -Music_Cities1_Ch1: ; aa76 (2:6a76) +Music_Cities1_Ch0:: tempo 144 -Music_Cities1_branch_aa79: - volume 119 - vibrato 8, 36 +Music_Cities1_branch_aa79:: + volume $77 + vibrato 8, $24 dutycycle 3 -Music_Cities1_branch_aa80: - notetype 12, 197 +Music_Cities1_branch_aa80:: + notetype 12, $c5 octave 3 note G#, 4 note F#, 4 @@ -35,7 +35,7 @@ Music_Cities1_branch_aa80: note C#, 2 note E_, 2 note E_, 4 - notetype 12, 165 + notetype 12, $a5 note C#, 4 octave 2 note B_, 6 @@ -44,14 +44,14 @@ Music_Cities1_branch_aa80: note C#, 4 octave 2 note B_, 4 - notetype 12, 197 + notetype 12, $c5 callchannel Music_Cities1_branch_ab7d octave 3 note D#, 6 note E_, 2 octave 2 note B_, 4 - notetype 12, 165 + notetype 12, $a5 octave 3 note C#, 2 octave 2 @@ -66,7 +66,7 @@ Music_Cities1_branch_aa80: note D#, 2 note C#, 2 note D#, 2 - notetype 12, 197 + notetype 12, $c5 note G#, 2 note E_, 2 note F#, 2 @@ -84,7 +84,7 @@ Music_Cities1_branch_aa80: note C#, 2 note E_, 2 note E_, 4 - notetype 12, 165 + notetype 12, $a5 note C#, 2 octave 2 note A_, 2 @@ -95,7 +95,7 @@ Music_Cities1_branch_aa80: octave 2 note B_, 2 note B_, 4 - notetype 12, 197 + notetype 12, $c5 callchannel Music_Cities1_branch_ab7d octave 3 note D#, 4 @@ -111,7 +111,7 @@ Music_Cities1_branch_aa80: note B_, 2 octave 3 note E_, 2 - notetype 12, 165 + notetype 12, $a5 note C#, 4 octave 2 note B_, 2 @@ -119,7 +119,7 @@ Music_Cities1_branch_aa80: note D#, 4 note C#, 2 note E_, 4 - notetype 12, 179 + notetype 12, $b3 callchannel Music_Cities1_branch_ab8a note A_, 2 note B_, 2 @@ -149,7 +149,7 @@ Music_Cities1_branch_aa80: note B_, 2 octave 3 -Music_Cities1_branch_ab12: +Music_Cities1_branch_ab12:: note C#, 2 note D#, 2 note C#, 2 @@ -235,12 +235,12 @@ Music_Cities1_branch_ab12: note B_, 2 octave 3 note D#, 2 - notetype 12, 182 + notetype 12, $b6 note F#, 8 note F#, 4 note D#, 4 note E_, 8 - notetype 12, 132 + notetype 12, $84 octave 2 note B_, 4 octave 3 @@ -248,7 +248,7 @@ Music_Cities1_branch_ab12: note F#, 2 loopchannel 0, Music_Cities1_branch_aa80 -Music_Cities1_branch_ab7d: +Music_Cities1_branch_ab7d:: octave 3 note F#, 2 note D#, 4 @@ -263,7 +263,7 @@ Music_Cities1_branch_ab7d: note C#, 2 endchannel -Music_Cities1_branch_ab8a: +Music_Cities1_branch_ab8a:: note A_, 2 note E_, 2 note C#, 2 @@ -274,14 +274,14 @@ Music_Cities1_branch_ab8a: endchannel -Music_Cities1_Ch2: ; ab92 (2:6b92) - vibrato 5, 21 +Music_Cities1_Ch1:: + vibrato 5, $15 callchannel Music_Cities1_branch_ac00 octave 4 note G#, 2 - notetype 12, 196 + notetype 12, $c4 note E_, 6 - notetype 12, 197 + notetype 12, $c5 dutycycle 3 octave 3 note C#, 4 @@ -292,16 +292,16 @@ Music_Cities1_Ch2: ; ab92 (2:6b92) callchannel Music_Cities1_branch_ac00 octave 4 note G#, 2 - notetype 12, 196 + notetype 12, $c4 note E_, 14 dutycycle 3 octave 3 note E_, 6 note F#, 6 note G#, 4 - notetype 12, 183 + notetype 12, $b7 dutycycle 2 - vibrato 8, 23 + vibrato 8, $17 octave 5 note C#, 12 octave 4 @@ -353,27 +353,27 @@ Music_Cities1_Ch2: ; ab92 (2:6b92) note B_, 4 note A_, 4 note F#, 4 - notetype 12, 183 + notetype 12, $b7 note A_, 8 octave 5 note C_, 8 octave 4 note B_, 14 - notetype 12, 132 + notetype 12, $84 note G#, 1 - notetype 12, 164 + notetype 12, $a4 note A_, 1 - loopchannel 0, Music_Cities1_Ch2 + loopchannel 0, Music_Cities1_Ch1 -Music_Cities1_branch_ac00: +Music_Cities1_branch_ac00:: dutycycle 2 - notetype 12, 195 + notetype 12, $c3 octave 4 note B_, 4 note A_, 4 - notetype 12, 196 + notetype 12, $c4 note G#, 10 - notetype 12, 195 + notetype 12, $c3 note G#, 2 note A_, 2 note B_, 4 @@ -381,23 +381,23 @@ Music_Cities1_branch_ac00: note A_, 2 note G#, 2 note A_, 2 - notetype 12, 196 + notetype 12, $c4 note F#, 10 - notetype 12, 197 + notetype 12, $c5 dutycycle 3 octave 3 note E_, 4 note D#, 8 note E_, 4 note F#, 4 - notetype 12, 195 + notetype 12, $c3 dutycycle 2 octave 4 note A_, 4 note G#, 4 - notetype 12, 196 + notetype 12, $c4 note F#, 10 - notetype 12, 195 + notetype 12, $c3 note F#, 2 note G#, 2 note A_, 4 @@ -407,12 +407,12 @@ Music_Cities1_branch_ac00: endchannel -Music_Cities1_Ch3: ; ac32 (2:6c32) - notetype 12, 17 - +Music_Cities1_Ch2:: + notetype 12, $11 + ;toggleperfectpitch -Music_Cities1_branch_ac35: - vibrato 0, 0 +Music_Cities1_branch_ac35:: + vibrato 0, $00 octave 4 callchannel Music_Cities1_branch_acc5 callchannel Music_Cities1_branch_acc5 @@ -452,7 +452,7 @@ Music_Cities1_branch_ac35: note E_, 2 note B_, 2 note E_, 2 - vibrato 8, 37 + vibrato 8, $25 note A_, 8 note E_, 8 note A_, 8 @@ -538,7 +538,7 @@ Music_Cities1_branch_ac35: note F#, 2 loopchannel 0, Music_Cities1_branch_ac35 -Music_Cities1_branch_acc5: +Music_Cities1_branch_acc5:: note __, 2 note E_, 2 note F#, 2 @@ -549,7 +549,7 @@ Music_Cities1_branch_acc5: note G#, 2 endchannel -Music_Cities1_branch_acce: +Music_Cities1_branch_acce:: note A_, 2 note F#, 2 note G#, 2 @@ -585,13 +585,12 @@ Music_Cities1_branch_acce: endchannel -Music_Cities1_Ch4: ; acef (2:6cef) - notetype 12 +Music_Cities1_Ch3:: togglenoise 0 -Music_Cities1_Loop4: + notetype 12 callchannel Music_Cities1_branch_ad36 -Music_Cities1_branch_acf3: +Music_Cities1_branch_acf3:: callchannel Music_Cities1_branch_ad36 callchannel Music_Cities1_branch_ad45 callchannel Music_Cities1_branch_ad45 @@ -617,9 +616,9 @@ Music_Cities1_branch_acf3: note F_, 6 note G_, 6 note G_, 4 - loopchannel 0, Music_Cities1_Loop4 + loopchannel 0, Music_Cities1_Ch3 -Music_Cities1_branch_ad36: +Music_Cities1_branch_ad36:: note G_, 6 note G_, 6 note G_, 4 @@ -629,7 +628,7 @@ Music_Cities1_branch_ad36: note G_, 2 endchannel -Music_Cities1_branch_ad45: +Music_Cities1_branch_ad45:: note G_, 6 note G_, 6 note G_, 4 @@ -638,7 +637,7 @@ Music_Cities1_branch_ad45: note G_, 4 endchannel -Music_Cities1_branch_ad52: +Music_Cities1_branch_ad52:: note F_, 6 note F_, 6 note F#, 4 @@ -647,7 +646,7 @@ Music_Cities1_branch_ad52: note F#, 4 endchannel -Music_Cities1_branch_ad5f: +Music_Cities1_branch_ad5f:: note F_, 6 note F_, 6 note F#, 4 @@ -657,10 +656,9 @@ Music_Cities1_branch_ad5f: note F_, 2 endchannel -Music_Cities1_branch_ad6e: +Music_Cities1_branch_ad6e:: note F_, 6 note F_, 6 note F#, 2 note F#, 2 endchannel -; 0xad77 \ No newline at end of file diff --git a/crysaudio/music/RBY/cities2.asm b/crysaudio/music/RBY/cities2.asm index 17aa49ed..e42c5b74 100644 --- a/crysaudio/music/RBY/cities2.asm +++ b/crysaudio/music/RBY/cities2.asm @@ -1,15 +1,15 @@ -Music_Cities2: - dbw $80, Music_Cities2_Ch1 - dbw $01, Music_Cities2_Ch2 - dbw $02, Music_Cities2_Ch3 +Music_Cities2:: + musicheader 3, 1, Music_Cities2_Ch0 + musicheader 1, 2, Music_Cities2_Ch1 + musicheader 1, 3, Music_Cities2_Ch2 -Music_Cities2_Ch1: ; b504 (2:7504) +Music_Cities2_Ch0:: tempo 148 - volume 119 + volume $77 dutycycle 3 - vibrato 8, 50 - - notetype 12, 182 + vibrato 8, $32 + ;toggleperfectpitch + notetype 12, $b6 note __, 8 octave 3 note E_, 2 @@ -20,7 +20,7 @@ Music_Cities2_Ch1: ; b504 (2:7504) note B_, 2 note __, 14 -Music_Cities2_branch_b51a: +Music_Cities2_branch_b51a:: octave 3 note B_, 4 octave 4 @@ -99,10 +99,10 @@ Music_Cities2_branch_b51a: loopchannel 0, Music_Cities2_branch_b51a -Music_Cities2_Ch2: ; b569 (2:7569) +Music_Cities2_Ch1:: dutycycle 3 - vibrato 8, 35 - notetype 12, 194 + vibrato 8, $23 + notetype 12, $c2 octave 4 note E_, 2 note D#, 2 @@ -115,7 +115,7 @@ Music_Cities2_Ch2: ; b569 (2:7569) note C#, 2 note D#, 2 note E_, 6 - notetype 12, 194 + notetype 12, $c2 dutycycle 2 octave 4 note E_, 1 @@ -129,15 +129,15 @@ Music_Cities2_Ch2: ; b569 (2:7569) note G#, 1 note A_, 1 -Music_Cities2_branch_b58b: - notetype 12, 166 +Music_Cities2_branch_b58b:: + notetype 12, $a6 note G#, 6 - notetype 12, 194 + notetype 12, $c2 note A_, 1 note G#, 1 - notetype 12, 196 + notetype 12, $c4 note F#, 14 - notetype 12, 194 + notetype 12, $c2 note E_, 1 octave 3 note B_, 1 @@ -148,14 +148,14 @@ Music_Cities2_branch_b58b: note F#, 1 note G#, 1 note A_, 1 - notetype 12, 196 + notetype 12, $c4 note G#, 6 - notetype 12, 194 + notetype 12, $c2 note E_, 1 note G#, 1 - notetype 12, 197 + notetype 12, $c5 note B_, 14 - notetype 12, 194 + notetype 12, $c2 note E_, 1 octave 3 note B_, 1 @@ -166,14 +166,14 @@ Music_Cities2_branch_b58b: note F#, 1 note G#, 1 note A_, 1 - notetype 12, 166 + notetype 12, $a6 note G#, 6 - notetype 12, 194 + notetype 12, $c2 note A_, 1 note G#, 1 - notetype 12, 196 + notetype 12, $c4 note F#, 8 - notetype 12, 161 + notetype 12, $a1 dutycycle 1 octave 3 note G#, 1 @@ -182,7 +182,7 @@ Music_Cities2_branch_b58b: note G#, 1 note G#, 1 note __, 1 - notetype 12, 194 + notetype 12, $c2 dutycycle 2 octave 4 note E_, 1 @@ -195,13 +195,13 @@ Music_Cities2_branch_b58b: note F#, 1 note G#, 1 note A_, 1 - notetype 12, 196 + notetype 12, $c4 note G#, 6 note E_, 1 note G#, 1 - notetype 12, 198 + notetype 12, $c6 note B_, 8 - notetype 12, 194 + notetype 12, $c2 note C#, 1 octave 3 note B_, 1 @@ -209,19 +209,19 @@ Music_Cities2_branch_b58b: note C#, 1 note D#, 1 note E_, 4 - notetype 12, 199 + notetype 12, $c7 note G#, 4 note E_, 4 - notetype 12, 194 + notetype 12, $c2 note D#, 1 note C#, 1 note D#, 1 note E_, 1 note F#, 4 - notetype 12, 199 + notetype 12, $c7 note B_, 4 note F#, 4 - notetype 12, 194 + notetype 12, $c2 note C#, 1 octave 3 note B_, 1 @@ -248,9 +248,9 @@ Music_Cities2_branch_b58b: note C#, 1 note D#, 1 note F#, 1 - notetype 12, 194 + notetype 12, $c2 note B_, 8 - notetype 12, 183 + notetype 12, $b7 octave 3 note E_, 8 octave 2 @@ -270,7 +270,7 @@ Music_Cities2_branch_b58b: note D#, 2 note C#, 2 note D#, 2 - notetype 12, 194 + notetype 12, $c2 note E_, 6 note E_, 1 octave 3 @@ -285,8 +285,8 @@ Music_Cities2_branch_b58b: loopchannel 0, Music_Cities2_branch_b58b -Music_Cities2_Ch3: ; b640 (2:7640) - notetype 12, 17 +Music_Cities2_Ch2:: + notetype 12, $11 note __, 16 octave 4 note E_, 2 @@ -298,7 +298,7 @@ Music_Cities2_Ch3: ; b640 (2:7640) note E_, 2 note G#, 2 -Music_Cities2_branch_b64c: +Music_Cities2_branch_b64c:: note F#, 2 note A_, 2 note F#, 2 @@ -419,4 +419,3 @@ Music_Cities2_branch_b64c: note E_, 2 note G#, 2 loopchannel 0, Music_Cities2_branch_b64c -; 0xb6c7 \ No newline at end of file diff --git a/crysaudio/music/RBY/credits.asm b/crysaudio/music/RBY/credits.asm index 18142f4f..2ee5d47b 100644 --- a/crysaudio/music/RBY/credits.asm +++ b/crysaudio/music/RBY/credits.asm @@ -1,15 +1,15 @@ -Music_RBYCredits: - dbw $80, Music_RBYCredits_Ch1 - dbw $01, Music_RBYCredits_Ch2 - dbw $02, Music_RBYCredits_Ch3 +Music_RBYCredits:: + musicheader 3, 1, Music_RBYCredits_Ch0 + musicheader 1, 2, Music_RBYCredits_Ch1 + musicheader 1, 3, Music_RBYCredits_Ch2 -Music_RBYCredits_Ch1: ; 7fc1f (1f:7c1f) +Music_RBYCredits_Ch0:: tempo 140 - volume 119 + volume $77 dutycycle 3 - vibrato 8, 52 - - notetype 12, 181 + vibrato 8, $34 + ;toggleperfectpitch + notetype 12, $b5 octave 4 note E_, 6 octave 3 @@ -57,7 +57,7 @@ Music_RBYCredits_Ch1: ; 7fc1f (1f:7c1f) note E_, 1 note F#, 1 note G_, 1 - notetype 12, 182 + notetype 12, $b6 note A_, 4 note E_, 2 note A_, 2 @@ -142,12 +142,12 @@ Music_RBYCredits_Ch1: ; 7fc1f (1f:7c1f) note F#, 2 note E_, 2 note D_, 2 - notetype 12, 183 + notetype 12, $b7 note E_, 6 note A_, 2 note G_, 4 note F#, 4 - notetype 12, 199 + notetype 12, $c7 note A_, 4 note B_, 4 octave 4 @@ -162,7 +162,7 @@ Music_RBYCredits_Ch1: ; 7fc1f (1f:7c1f) note F#, 2 note G_, 2 note A_, 2 - notetype 12, 144 + notetype 12, $90 note G_, 8 note F#, 8 note E_, 8 @@ -170,13 +170,13 @@ Music_RBYCredits_Ch1: ; 7fc1f (1f:7c1f) note __, 16 note __, 16 note __, 8 - notetype 12, 182 + notetype 12, $b6 note E_, 6 note D#, 1 note D_, 1 - notetype 12, 160 + notetype 12, $a0 note C#, 8 - notetype 12, 167 + notetype 12, $a7 note C#, 8 note __, 16 note __, 16 @@ -184,37 +184,37 @@ Music_RBYCredits_Ch1: ; 7fc1f (1f:7c1f) note E_, 6 note C#, 1 note E_, 1 - notetype 12, 160 + notetype 12, $a0 note A_, 8 - notetype 12, 167 + notetype 12, $a7 note A_, 8 - notetype 12, 182 + notetype 12, $b6 note G_, 6 note D_, 4 note G_, 2 note B_, 4 - notetype 12, 183 + notetype 12, $b7 note G_, 8 note F#, 4 note G#, 4 - notetype 12, 144 + notetype 12, $90 note A_, 8 note F#, 8 note E_, 8 note C#, 8 - notetype 12, 183 + notetype 12, $b7 note D_, 8 note C#, 8 octave 2 note B_, 8 octave 3 note D_, 8 - notetype 12, 144 + notetype 12, $90 note E_, 8 note D_, 8 note F#, 8 note E_, 8 - notetype 12, 160 + notetype 12, $a0 note D_, 8 note E_, 8 note D_, 8 @@ -223,27 +223,27 @@ Music_RBYCredits_Ch1: ; 7fc1f (1f:7c1f) note F_, 8 note E_, 8 note D_, 8 - notetype 12, 160 + notetype 12, $a0 note C#, 6 - notetype 12, 167 + notetype 12, $a7 note C#, 6 - notetype 12, 183 + notetype 12, $b7 note D_, 4 note E_, 8 note G_, 6 note F#, 1 note F_, 1 - notetype 12, 160 + notetype 12, $a0 note E_, 6 - notetype 12, 167 + notetype 12, $a7 note E_, 6 - notetype 12, 183 + notetype 12, $b7 note D_, 4 - notetype 12, 160 + notetype 12, $a0 note C#, 8 - notetype 12, 167 + notetype 12, $a7 note C#, 8 - notetype 12, 183 + notetype 12, $b7 note E_, 6 note D_, 2 note G_, 4 @@ -260,9 +260,9 @@ Music_RBYCredits_Ch1: ; 7fc1f (1f:7c1f) note C#, 4 note E_, 4 note F#, 4 - notetype 12, 160 + notetype 12, $a0 note E_, 6 - notetype 12, 183 + notetype 12, $b7 note D_, 2 note G_, 4 note F#, 4 @@ -270,13 +270,13 @@ Music_RBYCredits_Ch1: ; 7fc1f (1f:7c1f) note F#, 4 note A_, 4 note B_, 4 - notetype 12, 160 + notetype 12, $a0 octave 4 note C#, 16 note C#, 8 - notetype 12, 167 + notetype 12, $a7 note C#, 8 - notetype 12, 181 + notetype 12, $b5 octave 3 note A_, 1 note __, 1 @@ -284,15 +284,15 @@ Music_RBYCredits_Ch1: ; 7fc1f (1f:7c1f) note __, 3 note A_, 1 note A_, 1 - notetype 12, 177 + notetype 12, $b1 note A_, 8 endchannel -Music_RBYCredits_Ch2: ; 7fd5f (1f:7d5f) +Music_RBYCredits_Ch1:: dutycycle 3 - vibrato 10, 37 - notetype 12, 197 + vibrato 10, $25 + notetype 12, $c5 octave 4 note A_, 6 note E_, 1 @@ -300,14 +300,14 @@ Music_RBYCredits_Ch2: ; 7fd5f (1f:7d5f) note G_, 6 note D_, 1 note G_, 1 - notetype 12, 199 + notetype 12, $c7 note F#, 12 note G#, 2 note E_, 1 note G#, 1 - notetype 12, 194 + notetype 12, $c2 note A_, 2 - notetype 12, 193 + notetype 12, $c1 octave 3 note A_, 4 note A_, 1 @@ -321,12 +321,12 @@ Music_RBYCredits_Ch2: ; 7fd5f (1f:7d5f) note A_, 1 note A_, 2 note A_, 2 - notetype 12, 196 + notetype 12, $c4 note A_, 1 note F#, 1 note A_, 1 note B_, 1 - notetype 12, 199 + notetype 12, $c7 octave 4 note C#, 6 note C#, 1 @@ -364,10 +364,10 @@ Music_RBYCredits_Ch2: ; 7fd5f (1f:7d5f) octave 3 note A_, 6 note E_, 2 - notetype 12, 176 + notetype 12, $b0 octave 4 note C#, 8 - notetype 12, 199 + notetype 12, $c7 note D_, 6 octave 3 note B_, 2 @@ -377,17 +377,17 @@ Music_RBYCredits_Ch2: ; 7fd5f (1f:7d5f) note G_, 6 note D_, 2 note B_, 8 - notetype 12, 176 + notetype 12, $b0 octave 4 note C#, 6 - notetype 12, 183 + notetype 12, $b7 note C#, 6 note D_, 4 - notetype 12, 160 + notetype 12, $a0 note E_, 8 - notetype 12, 167 + notetype 12, $a7 note E_, 8 - notetype 12, 199 + notetype 12, $c7 note D_, 6 octave 3 note B_, 2 @@ -397,55 +397,55 @@ Music_RBYCredits_Ch2: ; 7fd5f (1f:7d5f) note G_, 6 note D_, 2 note B_, 8 - notetype 12, 176 + notetype 12, $b0 octave 4 note E_, 7 - notetype 12, 183 + notetype 12, $b7 note E_, 7 - notetype 12, 195 + notetype 12, $c3 note E_, 1 note G#, 1 - notetype 12, 176 + notetype 12, $b0 note A_, 8 - notetype 12, 183 + notetype 12, $b7 note A_, 8 - notetype 12, 198 + notetype 12, $c6 note G_, 4 note F#, 4 note E_, 4 note D_, 4 - notetype 12, 160 + notetype 12, $a0 note C#, 8 - notetype 12, 167 + notetype 12, $a7 note C#, 8 - notetype 12, 144 + notetype 12, $90 octave 3 note A_, 8 - notetype 12, 151 + notetype 12, $97 note A_, 8 - notetype 12, 176 + notetype 12, $b0 note E_, 8 - notetype 12, 183 + notetype 12, $b7 note E_, 8 - notetype 12, 199 + notetype 12, $c7 note D_, 8 note G_, 6 note F#, 1 note F_, 1 note E_, 8 - notetype 12, 183 + notetype 12, $b7 note G_, 6 note F#, 1 note F_, 1 - notetype 12, 176 + notetype 12, $b0 note E_, 8 - notetype 12, 183 + notetype 12, $b7 note E_, 8 - notetype 12, 176 + notetype 12, $b0 note D_, 8 - notetype 12, 183 + notetype 12, $b7 note D_, 8 - notetype 12, 199 + notetype 12, $c7 octave 2 note B_, 8 octave 3 @@ -456,16 +456,16 @@ Music_RBYCredits_Ch2: ; 7fd5f (1f:7d5f) note B_, 6 note G_, 1 note B_, 1 - notetype 12, 176 + notetype 12, $b0 octave 4 note C#, 8 - notetype 12, 183 + notetype 12, $b7 note C#, 8 - notetype 12, 176 + notetype 12, $b0 note D_, 8 - notetype 12, 183 + notetype 12, $b7 note D_, 8 - notetype 12, 199 + notetype 12, $c7 octave 3 note B_, 8 octave 4 @@ -474,67 +474,67 @@ Music_RBYCredits_Ch2: ; 7fd5f (1f:7d5f) note B_, 1 octave 4 note D_, 1 - notetype 12, 176 + notetype 12, $b0 note C#, 6 - notetype 12, 183 + notetype 12, $b7 note C#, 6 - notetype 12, 199 + notetype 12, $c7 octave 3 note B_, 4 - notetype 12, 176 + notetype 12, $b0 note A_, 8 - notetype 12, 183 + notetype 12, $b7 note A_, 8 - notetype 12, 176 + notetype 12, $b0 note F#, 6 - notetype 12, 183 + notetype 12, $b7 note F#, 6 - notetype 12, 199 + notetype 12, $c7 note G#, 4 note A_, 8 note F#, 8 - notetype 12, 176 + notetype 12, $b0 note G#, 6 - notetype 12, 183 + notetype 12, $b7 note G#, 6 - notetype 12, 199 + notetype 12, $c7 note A_, 4 note B_, 8 note G#, 8 - notetype 12, 176 + notetype 12, $b0 note A_, 6 - notetype 12, 183 + notetype 12, $b7 note A_, 6 - notetype 12, 199 + notetype 12, $c7 note B_, 4 octave 4 note C_, 8 octave 3 note A_, 8 - notetype 12, 176 + notetype 12, $b0 note B_, 6 - notetype 12, 183 + notetype 12, $b7 note B_, 6 - notetype 12, 199 + notetype 12, $c7 octave 4 note C_, 4 - notetype 12, 176 + notetype 12, $b0 note D_, 8 octave 3 note B_, 8 - notetype 12, 176 + notetype 12, $b0 octave 4 note C#, 16 note C#, 8 - notetype 12, 183 + notetype 12, $b7 note C#, 8 - notetype 12, 176 + notetype 12, $b0 octave 3 note A_, 16 note A_, 8 - notetype 12, 183 + notetype 12, $b7 note A_, 8 - notetype 12, 199 + notetype 12, $c7 note G_, 6 note B_, 2 octave 4 @@ -563,24 +563,24 @@ Music_RBYCredits_Ch2: ; 7fd5f (1f:7d5f) octave 4 note D_, 2 note G_, 8 - notetype 12, 176 + notetype 12, $b0 note A_, 16 - notetype 12, 160 + notetype 12, $a0 note A_, 8 - notetype 12, 167 + notetype 12, $a7 note A_, 8 - notetype 12, 193 + notetype 12, $c1 note A_, 2 note A_, 4 note A_, 1 note A_, 1 - notetype 12, 193 + notetype 12, $c1 note A_, 8 endchannel -Music_RBYCredits_Ch3: ; 7fec2 (1f:7ec2) - notetype 12, 16 +Music_RBYCredits_Ch2:: + notetype 12, $10 octave 5 note C#, 6 octave 4 @@ -722,7 +722,7 @@ Music_RBYCredits_Ch3: ; 7fec2 (1f:7ec2) note __, 7 endchannel -Music_RBYCredits_branch_7ffa4: +Music_RBYCredits_branch_7ffa4:: octave 4 note E_, 2 note A_, 2 @@ -734,7 +734,7 @@ Music_RBYCredits_branch_7ffa4: note A_, 2 endchannel -Music_RBYCredits_branch_7ffae: +Music_RBYCredits_branch_7ffae:: octave 4 note D_, 2 note G_, 2 @@ -746,7 +746,7 @@ Music_RBYCredits_branch_7ffae: note G_, 2 endchannel -Music_RBYCredits_branch_7ffb8: +Music_RBYCredits_branch_7ffb8:: note G_, 2 note B_, 2 note G_, 2 @@ -757,7 +757,7 @@ Music_RBYCredits_branch_7ffb8: note B_, 2 endchannel -Music_RBYCredits_branch_7ffc1: +Music_RBYCredits_branch_7ffc1:: octave 4 note A_, 2 octave 5 @@ -776,7 +776,7 @@ Music_RBYCredits_branch_7ffc1: note C#, 2 endchannel -Music_RBYCredits_branch_7ffd2: +Music_RBYCredits_branch_7ffd2:: note D_, 2 note A_, 2 note D_, 2 @@ -787,7 +787,7 @@ Music_RBYCredits_branch_7ffd2: note A_, 2 endchannel -Music_RBYCredits_branch_7ffdb: +Music_RBYCredits_branch_7ffdb:: note E_, 2 note G#, 2 note E_, 2 @@ -798,7 +798,7 @@ Music_RBYCredits_branch_7ffdb: note G#, 2 endchannel -Music_RBYCredits_branch_7ffe4: +Music_RBYCredits_branch_7ffe4:: note E_, 2 note B_, 2 note E_, 2 @@ -809,7 +809,7 @@ Music_RBYCredits_branch_7ffe4: note B_, 2 endchannel -Music_RBYCredits_branch_7ffed: +Music_RBYCredits_branch_7ffed:: note A_, 1 note __, 1 note A_, 1 @@ -823,4 +823,3 @@ Music_RBYCredits_branch_7ffed: note A_, 1 note __, 3 endchannel -; 0x7fffa \ No newline at end of file diff --git a/crysaudio/music/RBY/defeatedgymleader.asm b/crysaudio/music/RBY/defeatedgymleader.asm index b6c2018c..4dd1c30f 100644 --- a/crysaudio/music/RBY/defeatedgymleader.asm +++ b/crysaudio/music/RBY/defeatedgymleader.asm @@ -1,14 +1,16 @@ -Music_DefeatedGymLeader: - dbw $80, Music_DefeatedGymLeader_Ch1 - dbw $01, Music_DefeatedGymLeader_Ch2 - dbw $02, Music_DefeatedGymLeader_Ch3 +Music_DefeatedGymLeader:: + musicheader 3, 1, Music_DefeatedGymLeader_Ch0 + musicheader 1, 2, Music_DefeatedGymLeader_Ch1 + musicheader 1, 3, Music_DefeatedGymLeader_Ch2 -Music_DefeatedGymLeader_Ch1: ; 23cad (8:7cad) +Music_DefeatedGymLeader_Ch0:: tempo 112 - volume 119 + volume $77 dutycycle 3 - vibrato 18, 49 - notetype 12, 166 + vibrato 18, $31 + ;toggleperfectpitch + tempo 112 + notetype 12, $a6 octave 4 note D_, 6 octave 3 @@ -18,13 +20,13 @@ Music_DefeatedGymLeader_Ch1: ; 23cad (8:7cad) note F#, 6 note D_, 1 note F#, 1 - notetype 12, 160 + notetype 12, $a0 note A_, 8 - notetype 12, 167 + notetype 12, $a7 note A_, 8 -Music_DefeatedGymLeader_branch_23ccc: - notetype 12, 178 +Music_DefeatedGymLeader_branch_23ccc:: + notetype 12, $b2 octave 3 note A_, 2 note A_, 2 @@ -48,10 +50,10 @@ Music_DefeatedGymLeader_branch_23ccc: note E_, 2 note D_, 2 note C#, 2 - notetype 12, 177 + notetype 12, $b1 octave 2 note B_, 8 - notetype 12, 178 + notetype 12, $b2 octave 3 note A_, 2 note A_, 2 @@ -75,10 +77,10 @@ Music_DefeatedGymLeader_branch_23ccc: note E_, 2 note D_, 2 note C#, 2 - notetype 12, 177 + notetype 12, $b1 octave 2 note B_, 8 - notetype 12, 151 + notetype 12, $97 octave 3 note D_, 6 octave 2 @@ -86,89 +88,89 @@ Music_DefeatedGymLeader_branch_23ccc: octave 3 note D_, 1 note F#, 8 - notetype 12, 176 + notetype 12, $b0 note F#, 6 note E_, 1 note F#, 1 note A_, 8 - notetype 12, 151 + notetype 12, $97 note E_, 6 note C#, 1 note E_, 1 note G#, 8 - notetype 12, 176 + notetype 12, $b0 note G#, 6 note E_, 1 note G#, 1 note B_, 8 - notetype 12, 151 + notetype 12, $97 note C#, 6 octave 2 note A_, 1 octave 3 note C#, 1 note E_, 8 - notetype 12, 176 + notetype 12, $b0 note E_, 6 note C#, 1 note E_, 1 note E_, 4 note G_, 4 - notetype 12, 144 + notetype 12, $90 note F#, 8 note E_, 8 note D_, 8 note C#, 8 - notetype 12, 151 + notetype 12, $97 note D_, 6 octave 2 note A_, 1 octave 3 note D_, 1 note F#, 8 - notetype 12, 176 + notetype 12, $b0 note F#, 6 note E_, 1 note F#, 1 note A_, 8 - notetype 12, 151 + notetype 12, $97 note E_, 6 note C#, 1 note E_, 1 note G#, 8 - notetype 12, 176 + notetype 12, $b0 note G#, 6 note E_, 1 note G#, 1 note B_, 8 - notetype 12, 151 + notetype 12, $97 note C#, 6 octave 2 note A_, 1 octave 3 note C#, 1 note E_, 8 - notetype 12, 176 + notetype 12, $b0 note E_, 6 note C#, 1 note E_, 1 note E_, 4 note G_, 4 - notetype 12, 151 + notetype 12, $97 note F#, 6 note E_, 1 note F#, 1 note A_, 8 - notetype 12, 167 + notetype 12, $a7 note G_, 8 note E_, 8 loopchannel 0, Music_DefeatedGymLeader_branch_23ccc -Music_DefeatedGymLeader_Ch2: ; 23d6d (8:7d6d) +Music_DefeatedGymLeader_Ch1:: dutycycle 2 - vibrato 24, 36 - notetype 12, 196 + vibrato 24, $24 + notetype 12, $c4 octave 4 note A_, 6 note F#, 1 @@ -179,13 +181,13 @@ Music_DefeatedGymLeader_Ch2: ; 23d6d (8:7d6d) note A_, 1 octave 5 note D_, 1 - notetype 12, 176 + notetype 12, $b0 note F#, 8 - notetype 12, 183 + notetype 12, $b7 note F#, 8 -Music_DefeatedGymLeader_branch_23d84: - notetype 12, 194 +Music_DefeatedGymLeader_branch_23d84:: + notetype 12, $c2 octave 4 note D_, 2 note C#, 2 @@ -200,10 +202,10 @@ Music_DefeatedGymLeader_branch_23d84: note A_, 2 note G_, 2 note F#, 2 - notetype 12, 196 + notetype 12, $c4 note A_, 4 note A_, 4 - notetype 12, 194 + notetype 12, $c2 octave 4 note D_, 2 note C#, 2 @@ -218,15 +220,15 @@ Music_DefeatedGymLeader_branch_23d84: note A_, 2 note G_, 2 note F#, 2 - notetype 12, 193 + notetype 12, $c1 note D_, 6 - notetype 6, 194 + notetype 6, $c2 note G_, 1 note A_, 1 note B_, 1 octave 4 note C#, 1 - notetype 12, 194 + notetype 12, $c2 note D_, 2 note C#, 2 octave 3 @@ -240,14 +242,14 @@ Music_DefeatedGymLeader_branch_23d84: note A_, 2 note G_, 2 note F#, 2 - notetype 12, 196 + notetype 12, $c4 note A_, 4 note A_, 3 - notetype 6, 194 + notetype 6, $c2 note B_, 1 octave 4 note C#, 1 - notetype 12, 194 + notetype 12, $c2 note D_, 2 note C#, 2 octave 3 @@ -261,91 +263,91 @@ Music_DefeatedGymLeader_branch_23d84: note A_, 2 note G_, 2 note F#, 2 - notetype 12, 193 + notetype 12, $c1 note D_, 8 - notetype 12, 199 + notetype 12, $c7 note A_, 6 note F#, 1 note A_, 1 - notetype 12, 176 + notetype 12, $b0 octave 4 note D_, 8 - notetype 12, 160 + notetype 12, $a0 note D_, 8 - notetype 12, 151 + notetype 12, $97 note D_, 8 - notetype 12, 199 + notetype 12, $c7 octave 3 note B_, 6 note G#, 1 note B_, 1 - notetype 12, 128 + notetype 12, $80 octave 4 note E_, 8 - notetype 12, 160 + notetype 12, $a0 note E_, 8 - notetype 12, 199 + notetype 12, $c7 note E_, 8 octave 3 note G_, 6 note E_, 1 note G_, 1 - notetype 12, 111 + notetype 12, $6f octave 4 note C#, 8 - notetype 12, 199 + notetype 12, $c7 note C#, 8 note F#, 4 note E_, 4 - notetype 12, 176 + notetype 12, $b0 note D_, 14 octave 3 note B_, 2 - notetype 12, 160 + notetype 12, $a0 note A_, 8 - notetype 12, 183 + notetype 12, $b7 note A_, 8 - notetype 12, 199 + notetype 12, $c7 note A_, 6 note F#, 1 note A_, 1 - notetype 12, 176 + notetype 12, $b0 octave 4 note D_, 8 - notetype 12, 160 + notetype 12, $a0 note D_, 8 - notetype 12, 151 + notetype 12, $97 note D_, 8 - notetype 12, 199 + notetype 12, $c7 octave 3 note B_, 6 note G#, 1 note B_, 1 - notetype 12, 79 + notetype 12, $4f octave 4 note E_, 8 - notetype 12, 176 + notetype 12, $b0 note E_, 8 - notetype 12, 199 + notetype 12, $c7 note E_, 8 octave 3 note G_, 6 note E_, 1 note G_, 1 - notetype 12, 176 + notetype 12, $b0 octave 4 note C#, 8 - notetype 12, 183 + notetype 12, $b7 note C#, 8 octave 3 note A_, 4 octave 4 note C#, 4 - notetype 12, 176 + notetype 12, $b0 note D_, 14 note E_, 2 note D_, 12 - notetype 12, 194 + notetype 12, $c2 octave 3 note G_, 1 note A_, 1 @@ -355,9 +357,9 @@ Music_DefeatedGymLeader_branch_23d84: loopchannel 0, Music_DefeatedGymLeader_branch_23d84 -Music_DefeatedGymLeader_Ch3: ; 23e52 (8:7e52) - notetype 12, 16 - vibrato 16, 18 +Music_DefeatedGymLeader_Ch2:: + notetype 12, $10 + vibrato 16, $12 octave 4 note F#, 6 note D_, 1 @@ -373,7 +375,7 @@ Music_DefeatedGymLeader_Ch3: ; 23e52 (8:7e52) note D_, 1 note F#, 8 -Music_DefeatedGymLeader_branch_23e65: +Music_DefeatedGymLeader_branch_23e65:: octave 4 note F#, 1 note __, 1 @@ -608,4 +610,3 @@ Music_DefeatedGymLeader_branch_23e65: note G_, 2 note E_, 2 loopchannel 0, Music_DefeatedGymLeader_branch_23e65 -; 0x23f52 \ No newline at end of file diff --git a/crysaudio/music/RBY/defeatedtrainer.asm b/crysaudio/music/RBY/defeatedtrainer.asm index 0c2a1d96..597aaa8e 100644 --- a/crysaudio/music/RBY/defeatedtrainer.asm +++ b/crysaudio/music/RBY/defeatedtrainer.asm @@ -1,16 +1,19 @@ -Music_DefeatedTrainer: - dbw $80, Music_DefeatedTrainer_Ch1 - dbw $01, Music_DefeatedTrainer_Ch2 - dbw $02, Music_DefeatedTrainer_Ch3 +Music_DefeatedTrainer:: + musicheader 3, 1, Music_DefeatedTrainer_Ch0 + musicheader 1, 2, Music_DefeatedTrainer_Ch1 + musicheader 1, 3, Music_DefeatedTrainer_Ch2 -Music_DefeatedTrainer_Ch1: ; 23a53 (8:7a53) +Music_DefeatedTrainer_Ch0:: tempo 224 - volume 119 + volume $77 dutycycle 2 - notetype 4, 162 + ;toggleperfectpitch + tempo 224 + notetype 4, $a2 octave 4 note D_, 2 - notetype 4, 162 + tempo 224 + notetype 4, $a2 note D_, 2 note D_, 2 note D_, 2 @@ -18,12 +21,13 @@ Music_DefeatedTrainer_Ch1: ; 23a53 (8:7a53) note A_, 2 octave 4 note D_, 2 - notetype 4, 179 + notetype 4, $b3 note F#, 12 dutycycle 1 + tempo 224 -Music_DefeatedTrainer_branch_23a76: - notetype 4, 99 +Music_DefeatedTrainer_branch_23a76:: + notetype 4, $63 octave 3 note A_, 6 note F#, 3 @@ -96,23 +100,23 @@ Music_DefeatedTrainer_branch_23a76: loopchannel 0, Music_DefeatedTrainer_branch_23a76 -Music_DefeatedTrainer_Ch2: ; 23ac1 (8:7ac1) +Music_DefeatedTrainer_Ch1:: dutycycle 2 - notetype 4, 195 + notetype 4, $c3 octave 4 note A_, 2 - notetype 4, 195 + notetype 4, $c3 note A_, 2 note A_, 2 note A_, 2 note B_, 2 octave 5 note C#, 2 - notetype 4, 196 + notetype 4, $c4 note D_, 12 -Music_DefeatedTrainer_branch_23ad2: - notetype 4, 133 +Music_DefeatedTrainer_branch_23ad2:: + notetype 4, $85 octave 4 note D_, 6 octave 3 @@ -162,22 +166,22 @@ Music_DefeatedTrainer_branch_23ad2: note G_, 3 note D_, 3 note G_, 6 - notetype 4, 112 + notetype 4, $70 note F#, 12 - notetype 4, 119 + notetype 4, $77 note F#, 12 - notetype 4, 96 + notetype 4, $60 note E_, 12 - notetype 4, 103 + notetype 4, $67 note E_, 12 loopchannel 0, Music_DefeatedTrainer_branch_23ad2 -Music_DefeatedTrainer_Ch3: ; 23b15 (8:7b15) - notetype 4, 16 +Music_DefeatedTrainer_Ch2:: + notetype 4, $10 octave 5 note D_, 2 - notetype 4, 16 + notetype 4, $10 note D_, 2 note D_, 2 octave 4 @@ -185,9 +189,9 @@ Music_DefeatedTrainer_Ch3: ; 23b15 (8:7b15) note A_, 2 note G_, 2 note A_, 12 - notetype 4, 33 + notetype 4, $21 -Music_DefeatedTrainer_branch_23b24: +Music_DefeatedTrainer_branch_23b24:: note F#, 3 note __, 3 note F#, 3 @@ -265,4 +269,3 @@ Music_DefeatedTrainer_branch_23b24: octave 4 note A_, 3 loopchannel 0, Music_DefeatedTrainer_branch_23b24 -; 0x23b74 \ No newline at end of file diff --git a/crysaudio/music/RBY/defeatedwildmon.asm b/crysaudio/music/RBY/defeatedwildmon.asm index 0667018e..a81ec045 100644 --- a/crysaudio/music/RBY/defeatedwildmon.asm +++ b/crysaudio/music/RBY/defeatedwildmon.asm @@ -1,14 +1,17 @@ -Music_DefeatedWildMon: - dbw $80, Music_DefeatedWildMon_Ch1 - dbw $01, Music_DefeatedWildMon_Ch2 - dbw $02, Music_DefeatedWildMon_Ch3 +Music_DefeatedWildMon:: + musicheader 3, 1, Music_DefeatedWildMon_Ch0 + musicheader 1, 2, Music_DefeatedWildMon_Ch1 + musicheader 1, 3, Music_DefeatedWildMon_Ch2 -Music_DefeatedWildMon_Ch1: ; 23b74 (8:7b74) +Music_DefeatedWildMon_Ch0:: tempo 112 - volume 119 + volume $77 + ;executemusic dutycycle 3 - vibrato 6, 52 - notetype 12, 183 + vibrato 6, $34 + ;toggleperfectpitch + tempo 112 + notetype 12, $b7 octave 3 note B_, 1 note A_, 1 @@ -16,8 +19,8 @@ Music_DefeatedWildMon_Ch1: ; 23b74 (8:7b74) note F#, 1 note E_, 12 -Music_DefeatedWildMon_branch_23b8b: - notetype 12, 98 +Music_DefeatedWildMon_branch_23b8b:: + notetype 12, $62 note E_, 2 note F#, 2 note E_, 2 @@ -69,19 +72,20 @@ Music_DefeatedWildMon_branch_23b8b: loopchannel 0, Music_DefeatedWildMon_branch_23b8b -Music_DefeatedWildMon_Ch2: ; 23bc1 (8:7bc1) +Music_DefeatedWildMon_Ch1:: + ;executemusic dutycycle 2 - notetype 12, 195 + notetype 12, $c3 octave 4 note E_, 1 note F#, 1 note G#, 1 note A_, 1 - notetype 12, 199 + notetype 12, $c7 note B_, 12 -Music_DefeatedWildMon_branch_23bce: - notetype 12, 130 +Music_DefeatedWildMon_branch_23bce:: + notetype 12, $82 octave 3 note B_, 2 note A_, 2 @@ -143,8 +147,9 @@ Music_DefeatedWildMon_branch_23bce: loopchannel 0, Music_DefeatedWildMon_branch_23bce -Music_DefeatedWildMon_Ch3: ; 23c0e (8:7c0e) - notetype 12, 32 +Music_DefeatedWildMon_Ch2:: + ;executemusic + notetype 12, $20 octave 5 note E_, 1 note __, 1 @@ -162,7 +167,7 @@ Music_DefeatedWildMon_Ch3: ; 23c0e (8:7c0e) note E_, 1 note __, 3 -Music_DefeatedWildMon_branch_23c21: +Music_DefeatedWildMon_branch_23c21:: octave 4 note E_, 1 note __, 1 @@ -300,4 +305,3 @@ Music_DefeatedWildMon_branch_23c21: octave 4 note D#, 4 loopchannel 0, Music_DefeatedWildMon_branch_23c21 -; 0x23cad \ No newline at end of file diff --git a/crysaudio/music/RBY/dungeon1.asm b/crysaudio/music/RBY/dungeon1.asm index fc7c0677..04b6d27b 100644 --- a/crysaudio/music/RBY/dungeon1.asm +++ b/crysaudio/music/RBY/dungeon1.asm @@ -1,26 +1,28 @@ -Music_Dungeon1: - dbw $C0, Music_Dungeon1_Ch1 - dbw $01, Music_Dungeon1_Ch2 - dbw $02, Music_Dungeon1_Ch3 - dbw $03, Music_Dungeon1_Ch4 +Music_Dungeon1:: + musicheader 4, 1, Music_Dungeon1_Ch0 + musicheader 1, 2, Music_Dungeon1_Ch1 + musicheader 1, 3, Music_Dungeon1_Ch2 + musicheader 1, 4, Music_Dungeon1_Ch3 -Music_Dungeon1_Ch1: ; 7ded1 (1f:5ed1) +Music_Dungeon1_Ch0:: tempo 144 - volume 119 - dutycycle 3 - vibrato 10, 20 - notetype 12, 77 + volume $77 + dutycycle 3 + ;toggleperfectpitch + vibrato 10, $14 + notetype 12, $4d note __, 8 - unknownmusic0xee 237 + ;stereopanning 237 + stereopanning $0f octave 4 note F#, 8 - unknownmusic0xee 255 + stereopanning $ff -Music_Dungeon1_branch_7dee5: - notetype 12, 178 +Music_Dungeon1_branch_7dee5:: + notetype 12, $b2 octave 3 -Music_Dungeon1_branch_7dee8: +Music_Dungeon1_branch_7dee8:: callchannel Music_Dungeon1_branch_7dfaa loopchannel 3, Music_Dungeon1_branch_7dee8 note E_, 1 @@ -40,7 +42,7 @@ Music_Dungeon1_branch_7dee8: note A_, 1 note A#, 1 -Music_Dungeon1_branch_7deff: +Music_Dungeon1_branch_7deff:: callchannel Music_Dungeon1_branch_7dfaa loopchannel 4, Music_Dungeon1_branch_7deff callchannel Music_Dungeon1_branch_7dfd5 @@ -61,12 +63,12 @@ Music_Dungeon1_branch_7deff: note A_, 1 note G_, 1 note F#, 1 - notetype 12, 195 + notetype 12, $c3 note G_, 4 note F#, 4 note E_, 4 note D#, 4 - notetype 12, 194 + notetype 12, $c2 callchannel Music_Dungeon1_branch_7dfc5 octave 3 note B_, 3 @@ -74,7 +76,7 @@ Music_Dungeon1_branch_7deff: note C_, 3 callchannel Music_Dungeon1_branch_7dfc5 note C#, 3 - notetype 12, 195 + notetype 12, $c3 octave 3 note G_, 4 note F#, 4 @@ -85,7 +87,7 @@ Music_Dungeon1_branch_7deff: note C_, 4 octave 2 note B_, 4 - notetype 12, 194 + notetype 12, $c2 note B_, 1 note A#, 1 note G_, 1 @@ -132,10 +134,10 @@ Music_Dungeon1_branch_7deff: octave 3 note C#, 1 -Music_Dungeon1_branch_7df6e: +Music_Dungeon1_branch_7df6e:: note __, 16 loopchannel 8, Music_Dungeon1_branch_7df6e - notetype 12, 195 + notetype 12, $c3 callchannel Music_Dungeon1_branch_7dfbb note B_, 2 note G_, 2 @@ -153,7 +155,7 @@ Music_Dungeon1_branch_7df6e: note F#, 2 note G_, 2 note D#, 2 - notetype 12, 194 + notetype 12, $c2 callchannel Music_Dungeon1_branch_7dfc5 octave 3 note B_, 3 @@ -161,16 +163,16 @@ Music_Dungeon1_branch_7df6e: note C_, 3 callchannel Music_Dungeon1_branch_7dfc5 note C#, 3 - notetype 12, 199 + notetype 12, $c7 octave 3 note F#, 8 note D#, 8 - notetype 12, 194 + notetype 12, $c2 callchannel Music_Dungeon1_branch_7dfaa callchannel Music_Dungeon1_branch_7dfaa loopchannel 0, Music_Dungeon1_branch_7dee5 -Music_Dungeon1_branch_7dfaa: +Music_Dungeon1_branch_7dfaa:: note E_, 1 note D#, 1 note B_, 1 @@ -189,7 +191,7 @@ Music_Dungeon1_branch_7dfaa: note A#, 1 endchannel -Music_Dungeon1_branch_7dfbb: +Music_Dungeon1_branch_7dfbb:: octave 2 note G_, 2 note A#, 4 @@ -201,7 +203,7 @@ Music_Dungeon1_branch_7dfbb: note A#, 2 endchannel -Music_Dungeon1_branch_7dfc5: +Music_Dungeon1_branch_7dfc5:: octave 3 note E_, 1 note E_, 1 @@ -219,7 +221,7 @@ Music_Dungeon1_branch_7dfc5: note C_, 1 endchannel -Music_Dungeon1_branch_7dfd5: +Music_Dungeon1_branch_7dfd5:: note E_, 1 note E_, 1 note __, 4 @@ -231,20 +233,22 @@ Music_Dungeon1_branch_7dfd5: endchannel -Music_Dungeon1_Ch2: ; 7dfde (1f:5fde) - vibrato 11, 21 +Music_Dungeon1_Ch1:: + vibrato 11, $15 dutycycle 3 - notetype 12, 15 + notetype 12, $0f octave 4 note G#, 8 - notetype 12, 77 + stereopanning $f0 + notetype 12, $4d octave 5 note D_, 8 + stereopanning $ff -Music_Dungeon1_branch_7dfeb: - notetype 12, 194 +Music_Dungeon1_branch_7dfeb:: + notetype 12, $c2 -Music_Dungeon1_branch_7dfed: +Music_Dungeon1_branch_7dfed:: callchannel Music_Dungeon1_branch_7e097 loopchannel 3, Music_Dungeon1_branch_7dfed octave 2 @@ -266,7 +270,7 @@ Music_Dungeon1_branch_7dfed: note G_, 1 note D#, 1 -Music_Dungeon1_branch_7e006: +Music_Dungeon1_branch_7e006:: callchannel Music_Dungeon1_branch_7e097 loopchannel 4, Music_Dungeon1_branch_7e006 note __, 2 @@ -279,14 +283,14 @@ Music_Dungeon1_branch_7e006: callchannel Music_Dungeon1_branch_7e0ab octave 3 note D#, 4 - notetype 12, 211 + notetype 12, $d3 octave 4 note E_, 4 note D#, 4 note C_, 4 octave 3 note B_, 4 - notetype 12, 210 + notetype 12, $d2 callchannel Music_Dungeon1_branch_7e0b5 octave 3 note F#, 4 @@ -296,7 +300,7 @@ Music_Dungeon1_branch_7e006: callchannel Music_Dungeon1_branch_7e0b5 octave 3 note A#, 4 - notetype 12, 211 + notetype 12, $d3 octave 4 note E_, 4 note D#, 4 @@ -309,12 +313,12 @@ Music_Dungeon1_branch_7e006: note B_, 4 note G_, 4 note F#, 2 - notetype 12, 214 + notetype 12, $d6 note E_, 8 note F_, 8 note F#, 8 note G_, 8 - notetype 12, 210 + notetype 12, $d2 callchannel Music_Dungeon1_branch_7e0ba note __, 10 note E_, 1 @@ -325,13 +329,13 @@ Music_Dungeon1_branch_7e006: note __, 12 callchannel Music_Dungeon1_branch_7e0ba note __, 14 - notetype 12, 211 + notetype 12, $d3 callchannel Music_Dungeon1_branch_7e0cd note D#, 4 callchannel Music_Dungeon1_branch_7e0cd note D#, 2 note __, 2 - notetype 12, 210 + notetype 12, $d2 callchannel Music_Dungeon1_branch_7e0c0 note __, 2 octave 3 @@ -355,16 +359,16 @@ Music_Dungeon1_branch_7e006: callchannel Music_Dungeon1_branch_7e0c0 octave 3 note A#, 4 - notetype 12, 214 + notetype 12, $d6 note B_, 8 octave 4 note D#, 8 - notetype 12, 210 + notetype 12, $d2 callchannel Music_Dungeon1_branch_7e097 callchannel Music_Dungeon1_branch_7e097 loopchannel 0, Music_Dungeon1_branch_7dfeb -Music_Dungeon1_branch_7e097: +Music_Dungeon1_branch_7e097:: octave 2 note E_, 1 note E_, 1 @@ -386,7 +390,7 @@ Music_Dungeon1_branch_7e097: note B_, 1 endchannel -Music_Dungeon1_branch_7e0ab: +Music_Dungeon1_branch_7e0ab:: octave 2 note E_, 1 note E_, 1 @@ -398,14 +402,14 @@ Music_Dungeon1_branch_7e0ab: note __, 3 endchannel -Music_Dungeon1_branch_7e0b5: +Music_Dungeon1_branch_7e0b5:: octave 2 note E_, 1 note E_, 1 note __, 10 endchannel -Music_Dungeon1_branch_7e0ba: +Music_Dungeon1_branch_7e0ba:: octave 1 note E_, 1 note G_, 1 @@ -413,7 +417,7 @@ Music_Dungeon1_branch_7e0ba: note D#, 1 endchannel -Music_Dungeon1_branch_7e0c0: +Music_Dungeon1_branch_7e0c0:: octave 2 note E_, 1 note E_, 1 @@ -428,7 +432,7 @@ Music_Dungeon1_branch_7e0c0: note C_, 1 endchannel -Music_Dungeon1_branch_7e0cd: +Music_Dungeon1_branch_7e0cd:: octave 3 note E_, 6 note G_, 6 @@ -446,15 +450,15 @@ Music_Dungeon1_branch_7e0cd: endchannel -Music_Dungeon1_Ch3: ; 7e0dc (1f:60dc) - notetype 12, 17 - vibrato 8, 38 +Music_Dungeon1_Ch2:: + notetype 12, $11 + vibrato 8, $26 note __, 14 octave 4 note D_, 1 note D#, 1 -Music_Dungeon1_branch_7e0e5: +Music_Dungeon1_branch_7e0e5:: callchannel Music_Dungeon1_branch_7e140 callchannel Music_Dungeon1_branch_7e140 octave 5 @@ -516,7 +520,7 @@ Music_Dungeon1_branch_7e0e5: note __, 16 loopchannel 0, Music_Dungeon1_branch_7e0e5 -Music_Dungeon1_branch_7e140: +Music_Dungeon1_branch_7e140:: octave 5 note E_, 4 note B_, 4 @@ -538,7 +542,7 @@ Music_Dungeon1_branch_7e140: note D#, 4 endchannel -Music_Dungeon1_branch_7e154: +Music_Dungeon1_branch_7e154:: octave 6 note E_, 1 note E_, 1 @@ -550,7 +554,7 @@ Music_Dungeon1_branch_7e154: note __, 1 endchannel -Music_Dungeon1_branch_7e15e: +Music_Dungeon1_branch_7e15e:: octave 3 note E_, 1 note G_, 1 @@ -558,7 +562,7 @@ Music_Dungeon1_branch_7e15e: note D#, 1 endchannel -Music_Dungeon1_branch_7e164: +Music_Dungeon1_branch_7e164:: note E_, 4 note B_, 4 note A#, 4 @@ -579,7 +583,7 @@ Music_Dungeon1_branch_7e164: note D#, 4 endchannel -Music_Dungeon1_branch_7e177: +Music_Dungeon1_branch_7e177:: octave 4 note E_, 1 note __, 3 @@ -601,14 +605,14 @@ Music_Dungeon1_branch_7e177: endchannel -Music_Dungeon1_Ch4: ; 7e18a (1f:618a) - notetype 12 +Music_Dungeon1_Ch3:: togglenoise 1 + notetype 12 note __, 14 note E_, 1 note E_, 1 -Music_Dungeon1_branch_7e190: +Music_Dungeon1_branch_7e190:: callchannel Music_Dungeon1_branch_7e1f1 loopchannel 3, Music_Dungeon1_branch_7e190 note F_, 4 @@ -617,7 +621,7 @@ Music_Dungeon1_branch_7e190: note E_, 2 note E_, 2 -Music_Dungeon1_branch_7e1a1: +Music_Dungeon1_branch_7e1a1:: callchannel Music_Dungeon1_branch_7e1f1 loopchannel 3, Music_Dungeon1_branch_7e1a1 note F_, 4 @@ -625,12 +629,12 @@ Music_Dungeon1_branch_7e1a1: note F_, 4 note F_, 4 -Music_Dungeon1_branch_7e1b0: +Music_Dungeon1_branch_7e1b0:: callchannel Music_Dungeon1_branch_7e1fa loopchannel 3, Music_Dungeon1_branch_7e1b0 callchannel Music_Dungeon1_branch_7e202 -Music_Dungeon1_branch_7e1ba: +Music_Dungeon1_branch_7e1ba:: callchannel Music_Dungeon1_branch_7e1fa loopchannel 3, Music_Dungeon1_branch_7e1ba callchannel Music_Dungeon1_branch_7e202 @@ -641,12 +645,12 @@ Music_Dungeon1_branch_7e1ba: note C#, 2 note F_, 4 -Music_Dungeon1_branch_7e1cf: +Music_Dungeon1_branch_7e1cf:: note __, 16 loopchannel 13, Music_Dungeon1_branch_7e1cf note __, 12 -Music_Dungeon1_branch_7e1d5: +Music_Dungeon1_branch_7e1d5:: callchannel Music_Dungeon1_branch_7e1fa loopchannel 3, Music_Dungeon1_branch_7e1d5 note E_, 4 @@ -659,24 +663,23 @@ Music_Dungeon1_branch_7e1d5: callchannel Music_Dungeon1_branch_7e1f1 loopchannel 0, Music_Dungeon1_branch_7e190 -Music_Dungeon1_branch_7e1f1: +Music_Dungeon1_branch_7e1f1:: note F_, 4 note E_, 4 note F_, 4 note E_, 4 endchannel -Music_Dungeon1_branch_7e1fa: +Music_Dungeon1_branch_7e1fa:: note E_, 1 note E_, 1 note __, 10 note F#, 4 endchannel -Music_Dungeon1_branch_7e202: +Music_Dungeon1_branch_7e202:: note C#, 4 note D_, 4 note D_, 4 note D#, 4 endchannel -; 0x7e20b \ No newline at end of file diff --git a/crysaudio/music/RBY/dungeon2.asm b/crysaudio/music/RBY/dungeon2.asm index 9d8043aa..42623ced 100644 --- a/crysaudio/music/RBY/dungeon2.asm +++ b/crysaudio/music/RBY/dungeon2.asm @@ -1,18 +1,18 @@ -Music_Dungeon2: - dbw $C0, Music_Dungeon2_Ch1 - dbw $01, Music_Dungeon2_Ch2 - dbw $02, Music_Dungeon2_Ch3 - dbw $03, Music_Dungeon2_Ch4 +Music_Dungeon2:: + musicheader 4, 1, Music_Dungeon2_Ch0 + musicheader 1, 2, Music_Dungeon2_Ch1 + musicheader 1, 3, Music_Dungeon2_Ch2 + musicheader 1, 4, Music_Dungeon2_Ch3 -Music_Dungeon2_Ch1: ; 7e887 (1f:6887) +Music_Dungeon2_Ch0:: tempo 144 - volume 119 + volume $77 dutycycle 3 - - vibrato 10, 20 + ;toggleperfectpitch + vibrato 10, $14 -Music_Dungeon2_branch_7e892: - notetype 12, 178 +Music_Dungeon2_branch_7e892:: + notetype 12, $b2 octave 4 note E_, 4 note E_, 4 @@ -58,7 +58,7 @@ Music_Dungeon2_branch_7e892: note A_, 4 note F#, 2 loopchannel 2, Music_Dungeon2_branch_7e892 - notetype 12, 31 + notetype 12, $1f octave 3 note E_, 16 note C_, 16 @@ -76,12 +76,12 @@ Music_Dungeon2_branch_7e892: loopchannel 0, Music_Dungeon2_branch_7e892 -Music_Dungeon2_Ch2: ; 7e8d8 (1f:68d8) - vibrato 11, 21 +Music_Dungeon2_Ch1:: + vibrato 11, $15 -Music_Dungeon2_branch_7e8db: +Music_Dungeon2_branch_7e8db:: dutycycle 3 - notetype 12, 194 + notetype 12, $c2 octave 3 note E_, 4 note E_, 4 @@ -158,7 +158,7 @@ Music_Dungeon2_branch_7e8db: note __, 16 note __, 16 note __, 16 - notetype 12, 199 + notetype 12, $c7 dutycycle 1 octave 4 note E_, 16 @@ -168,11 +168,11 @@ Music_Dungeon2_branch_7e8db: loopchannel 0, Music_Dungeon2_branch_7e8db -Music_Dungeon2_Ch3: ; 7e93b (1f:693b) - notetype 12, 19 - vibrato 8, 38 +Music_Dungeon2_Ch2:: + notetype 12, $13 + vibrato 8, $26 -Music_Dungeon2_branch_7e940: +Music_Dungeon2_branch_7e940:: callchannel Music_Dungeon2_branch_7e9d1 loopchannel 16, Music_Dungeon2_branch_7e940 note E_, 4 @@ -193,7 +193,7 @@ Music_Dungeon2_branch_7e940: note __, 4 note A#, 4 -Music_Dungeon2_branch_7e958: +Music_Dungeon2_branch_7e958:: octave 5 note E_, 2 note __, 2 @@ -294,7 +294,7 @@ Music_Dungeon2_branch_7e958: note __, 2 endchannel -Music_Dungeon2_branch_7e9d1: +Music_Dungeon2_branch_7e9d1:: octave 4 note E_, 2 note __, 4 @@ -308,11 +308,11 @@ Music_Dungeon2_branch_7e9d1: endchannel -Music_Dungeon2_Ch4: ; 7e9dc (1f:69dc) - notetype 12 +Music_Dungeon2_Ch3:: togglenoise 1 + notetype 12 -Music_Dungeon2_branch_7e9dd: +Music_Dungeon2_branch_7e9dd:: note E_, 4 note F_, 4 note E_, 4 @@ -322,4 +322,3 @@ Music_Dungeon2_branch_7e9dd: note D#, 4 note C#, 4 loopchannel 0, Music_Dungeon2_branch_7e9dd -; 0x7e9f1 \ No newline at end of file diff --git a/crysaudio/music/RBY/dungeon3.asm b/crysaudio/music/RBY/dungeon3.asm index 12322487..ab63f4db 100644 --- a/crysaudio/music/RBY/dungeon3.asm +++ b/crysaudio/music/RBY/dungeon3.asm @@ -1,19 +1,20 @@ -Music_Dungeon3: - dbw $80, Music_Dungeon3_Ch1 - dbw $01, Music_Dungeon3_Ch2 - dbw $02, Music_Dungeon3_Ch3 +Music_Dungeon3:: + musicheader 4, 1, Music_Dungeon3_Ch0 + musicheader 1, 2, Music_Dungeon3_Ch1 + musicheader 1, 3, Music_Dungeon3_Ch2 + musicheader 1, 4, Music_Dungeon3_Ch3 -Music_Dungeon3_Ch1: ; 7e9f1 (1f:69f1) +Music_Dungeon3_Ch0:: tempo 160 - volume 119 + volume $77 dutycycle 3 - - vibrato 8, 20 + ;toggleperfectpitch + vibrato 8, $14 -Music_Dungeon3_branch_7e9fc: - notetype 12, 195 +Music_Dungeon3_branch_7e9fc:: + notetype 12, $c3 -Music_Dungeon3_branch_7e9fe: +Music_Dungeon3_branch_7e9fe:: callchannel Music_Dungeon3_branch_7eab2 loopchannel 3, Music_Dungeon3_branch_7e9fe octave 2 @@ -29,11 +30,11 @@ Music_Dungeon3_branch_7e9fe: note D#, 2 note E_, 2 -Music_Dungeon3_branch_7ea11: +Music_Dungeon3_branch_7ea11:: callchannel Music_Dungeon3_branch_7eac1 loopchannel 4, Music_Dungeon3_branch_7ea11 -Music_Dungeon3_branch_7ea18: +Music_Dungeon3_branch_7ea18:: callchannel Music_Dungeon3_branch_7eab2 loopchannel 4, Music_Dungeon3_branch_7ea18 octave 4 @@ -64,11 +65,11 @@ Music_Dungeon3_branch_7ea18: note F_, 2 note F_, 2 -Music_Dungeon3_branch_7ea3c: +Music_Dungeon3_branch_7ea3c:: callchannel Music_Dungeon3_branch_7eace loopchannel 4, Music_Dungeon3_branch_7ea3c -Music_Dungeon3_branch_7ea43: +Music_Dungeon3_branch_7ea43:: callchannel Music_Dungeon3_branch_7eadd loopchannel 3, Music_Dungeon3_branch_7ea43 octave 3 @@ -161,7 +162,7 @@ Music_Dungeon3_branch_7ea43: note __, 16 loopchannel 0, Music_Dungeon3_branch_7e9fc -Music_Dungeon3_branch_7eab2: +Music_Dungeon3_branch_7eab2:: octave 2 note B_, 2 octave 3 @@ -178,7 +179,7 @@ Music_Dungeon3_branch_7eab2: note D#, 2 endchannel -Music_Dungeon3_branch_7eac1: +Music_Dungeon3_branch_7eac1:: note E_, 2 note G#, 2 octave 4 @@ -193,7 +194,7 @@ Music_Dungeon3_branch_7eac1: note G#, 2 endchannel -Music_Dungeon3_branch_7eace: +Music_Dungeon3_branch_7eace:: octave 3 note D#, 2 octave 2 @@ -210,7 +211,7 @@ Music_Dungeon3_branch_7eace: note B_, 2 endchannel -Music_Dungeon3_branch_7eadd: +Music_Dungeon3_branch_7eadd:: note A_, 2 note F_, 2 octave 3 @@ -225,7 +226,7 @@ Music_Dungeon3_branch_7eadd: note F_, 2 endchannel -Music_Dungeon3_branch_7eaea: +Music_Dungeon3_branch_7eaea:: octave 3 note G#, 2 note E_, 2 @@ -240,14 +241,14 @@ Music_Dungeon3_branch_7eaea: note C_, 2 endchannel -Music_Dungeon3_branch_7eaf7: +Music_Dungeon3_branch_7eaf7:: note D#, 2 note G_, 2 note D#, 2 note C#, 6 endchannel -Music_Dungeon3_branch_7eafc: +Music_Dungeon3_branch_7eafc:: tempo 168 octave 1 note A#, 1 @@ -340,12 +341,12 @@ Music_Dungeon3_branch_7eafc: endchannel -Music_Dungeon3_Ch2: ; 7eb68 (1f:6b68) - vibrato 11, 21 +Music_Dungeon3_Ch1:: + vibrato 11, $15 dutycycle 3 -Music_Dungeon3_branch_7eb6d: - notetype 12, 211 +Music_Dungeon3_branch_7eb6d:: + notetype 12, $d3 octave 4 note D#, 6 note C#, 6 @@ -612,8 +613,8 @@ Music_Dungeon3_branch_7eb6d: loopchannel 0, Music_Dungeon3_branch_7eb6d -Music_Dungeon3_Ch3: ; 7ec7a (1f:6c7a) - notetype 12, 18 +Music_Dungeon3_Ch2:: + notetype 12, $12 note __, 16 note __, 16 note __, 16 @@ -626,7 +627,7 @@ Music_Dungeon3_Ch3: ; 7ec7a (1f:6c7a) note __, 16 note __, 16 note __, 12 - notetype 6, 16 + notetype 6, $10 octave 3 note B_, 1 octave 4 @@ -690,7 +691,7 @@ Music_Dungeon3_Ch3: ; 7ec7a (1f:6c7a) note B_, 1 note __, 10 note __, 16 - notetype 12, 16 + notetype 12, $10 note __, 16 note __, 16 note __, 16 @@ -712,4 +713,51 @@ Music_Dungeon3_Ch3: ; 7ec7a (1f:6c7a) note __, 16 note __, 16 note __, 10 - loopchannel 0, Music_Dungeon3_Ch3 + loopchannel 0, Music_Dungeon3_Ch2 + + +Music_Dungeon3_Ch3:: + togglenoise 0 + notetype 12 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 10 + endchannel diff --git a/crysaudio/music/RBY/finalbattle.asm b/crysaudio/music/RBY/finalbattle.asm index e7f2148c..35c3813c 100644 --- a/crysaudio/music/RBY/finalbattle.asm +++ b/crysaudio/music/RBY/finalbattle.asm @@ -1,14 +1,15 @@ -Music_FinalBattle: - dbw $80, Music_FinalBattle_Ch1 - dbw $01, Music_FinalBattle_Ch2 - dbw $02, Music_FinalBattle_Ch3 +Music_FinalBattle:: + musicheader 3, 1, Music_FinalBattle_Ch0 + musicheader 1, 2, Music_FinalBattle_Ch1 + musicheader 1, 3, Music_FinalBattle_Ch2 -Music_FinalBattle_Ch1: +Music_FinalBattle_Ch0:: tempo 112 - volume 119 + volume $77 dutycycle 3 - vibrato $6, $34 - notetype $c, $b2 + vibrato 6, $34 + ;toggleperfectpitch + notetype 12, $b2 octave 3 note F#, 1 note F_, 1 @@ -18,7 +19,7 @@ Music_FinalBattle_Ch1: note G_, 1 note G#, 1 note G_, 1 - intensity $a2 + notetype 12, $a2 note G#, 1 note A_, 1 note G#, 1 @@ -27,7 +28,7 @@ Music_FinalBattle_Ch1: note A_, 1 note A#, 1 note B_, 1 - intensity $92 + notetype 12, $92 note A#, 1 note B_, 1 octave 4 @@ -39,7 +40,7 @@ Music_FinalBattle_Ch1: note C#, 1 note C_, 1 note C#, 1 - intensity $82 + notetype 12, $82 note D_, 1 note C#, 1 note D_, 1 @@ -48,7 +49,7 @@ Music_FinalBattle_Ch1: note D#, 1 note E_, 1 note D#, 1 - intensity $c1 + notetype 12, $c1 octave 3 note E_, 1 note E_, 7 @@ -67,48 +68,49 @@ Music_FinalBattle_Ch1: note G#, 1 note G#, 3 note D#, 4 - intensity $c1 + notetype 12, $c1 note E_, 1 note E_, 3 - intensity $b3 + notetype 12, $b3 note E_, 4 - intensity $c1 + notetype 12, $c1 note F_, 1 note F_, 3 - intensity $b3 + notetype 12, $b3 note F_, 4 - intensity $c1 + notetype 12, $c1 note G_, 1 note G_, 3 - intensity $b3 + notetype 12, $b3 note G_, 4 - intensity $c1 + notetype 12, $c1 note F_, 1 note F_, 3 - intensity $b3 + notetype 12, $b3 note F_, 4 - intensity $c1 + notetype 12, $c1 note E_, 1 note E_, 3 - intensity $b3 + notetype 12, $b3 note E_, 4 - intensity $c1 + notetype 12, $c1 note F_, 1 note F_, 3 - intensity $b3 + notetype 12, $b3 note F_, 4 - intensity $c1 + notetype 12, $c1 note G_, 1 note G_, 3 - intensity $b3 + notetype 12, $b3 note G_, 4 - intensity $c1 + notetype 12, $c1 note G#, 1 note G#, 3 - intensity $b7 + notetype 12, $b7 note D#, 4 -Music_FinalBattle_branch_23429: - intensity $b7 + +Music_FinalBattle_branch_23429:: + notetype 12, $b7 octave 3 note E_, 4 note B_, 4 @@ -122,20 +124,20 @@ Music_FinalBattle_branch_23429: note F#, 4 note F_, 4 note F#, 4 - intensity $b1 + notetype 12, $b1 note F#, 2 note F_, 1 note F#, 1 note A_, 1 note F#, 2 note F#, 1 - intensity $b7 + notetype 12, $b7 octave 2 note B_, 6 - intensity $a0 + notetype 12, $a0 octave 3 note D_, 6 - intensity $b7 + notetype 12, $b7 note F#, 4 note E_, 4 note B_, 4 @@ -150,9 +152,9 @@ Music_FinalBattle_branch_23429: note F_, 4 note F#, 12 note A#, 4 - intensity $5e + notetype 12, $5e note B_, 12 - intensity $b2 + notetype 12, $b2 note E_, 3 note E_, 3 note E_, 2 @@ -173,16 +175,16 @@ Music_FinalBattle_branch_23429: note F#, 1 note B_, 1 note F#, 1 - intensity $c2 + notetype 12, $c2 note E_, 1 note F#, 1 note B_, 1 note F#, 1 - intensity $d2 + notetype 12, $d2 note E_, 1 note F#, 1 note B_, 1 - intensity $c1 + notetype 12, $c1 note E_, 1 note E_, 7 note E_, 1 @@ -193,23 +195,23 @@ Music_FinalBattle_branch_23429: note E_, 7 note E_, 1 note E_, 3 - intensity $b5 + notetype 12, $b5 note D_, 4 - intensity $c1 + notetype 12, $c1 note E_, 1 note E_, 3 - intensity $b5 + notetype 12, $b5 note F_, 4 - intensity $c1 + notetype 12, $c1 note E_, 1 note E_, 3 - intensity $b5 + notetype 12, $b5 note D_, 4 - intensity $c1 + notetype 12, $c1 note E_, 1 - intensity $b7 + notetype 12, $b7 note E_, 7 - intensity $c1 + notetype 12, $c1 note E_, 2 note B_, 1 note A_, 1 @@ -292,35 +294,35 @@ Music_FinalBattle_branch_23429: note F_, 3 note F#, 1 note F_, 3 - intensity $b7 + notetype 12, $b7 octave 4 note C_, 2 - intensity $b0 + notetype 12, $b0 note C#, 8 - intensity $b7 + notetype 12, $b7 note C#, 8 - intensity $a0 + notetype 12, $a0 octave 3 note F#, 8 note F#, 8 - intensity $b0 + notetype 12, $b0 octave 3 note A_, 8 - intensity $b7 + notetype 12, $b7 note A_, 8 note G_, 4 note B_, 12 - intensity $b0 + notetype 12, $b0 note A_, 8 - intensity $b7 + notetype 12, $b7 note A_, 8 - intensity $b0 + notetype 12, $b0 note E_, 8 - intensity $b7 + notetype 12, $b7 note E_, 8 - intensity $b0 + notetype 12, $b0 note A#, 8 - intensity $b7 + notetype 12, $b7 note A#, 8 octave 4 note F_, 8 @@ -333,10 +335,10 @@ Music_FinalBattle_branch_23429: note A_, 4 octave 4 note C#, 12 - intensity $40 + notetype 12, $40 callchannel Music_FinalBattle_branch_23710 callchannel Music_FinalBattle_branch_23710 - intensity $b7 + notetype 12, $b7 octave 3 note E_, 4 note B_, 4 @@ -350,10 +352,10 @@ Music_FinalBattle_branch_23429: note F#, 4 note F_, 4 note F#, 12 - intensity $b0 + notetype 12, $b0 note A_, 8 note G_, 8 - intensity $b7 + notetype 12, $b7 note E_, 4 note B_, 4 note D#, 4 @@ -366,26 +368,28 @@ Music_FinalBattle_branch_23429: note F#, 4 note F_, 4 note F#, 12 - intensity $b0 + notetype 12, $b0 note A_, 8 - intensity $b7 + notetype 12, $b7 octave 4 note C_, 8 - intensity $b0 + notetype 12, $b0 octave 3 note B_, 8 - intensity $b7 + notetype 12, $b7 note B_, 8 - intensity $b0 + notetype 12, $b0 octave 4 note E_, 8 - intensity $b7 + notetype 12, $b7 note E_, 8 loopchannel 0, Music_FinalBattle_branch_23429 -Music_FinalBattle_Ch2: + + +Music_FinalBattle_Ch1:: dutycycle 3 - vibrato $8, $25 - notetype $c, $c2 + vibrato 8, $25 + notetype 12, $c2 octave 5 note C_, 1 octave 4 @@ -430,7 +434,7 @@ Music_FinalBattle_Ch2: note E_, 1 octave 5 note C_, 1 - intensity $c1 + notetype 12, $c1 octave 4 note E_, 1 note E_, 7 @@ -442,28 +446,28 @@ Music_FinalBattle_Ch2: note E_, 7 note E_, 1 note E_, 3 - intensity $c2 + notetype 12, $c2 octave 5 note E_, 4 - intensity $c1 + notetype 12, $c1 octave 4 note E_, 1 note E_, 3 - intensity $c2 + notetype 12, $c2 octave 5 note E_, 4 - intensity $c1 + notetype 12, $c1 octave 4 note E_, 1 note E_, 3 - intensity $c2 + notetype 12, $c2 octave 5 note E_, 4 - intensity $c1 + notetype 12, $c1 octave 4 note E_, 1 note E_, 3 - intensity $c2 + notetype 12, $c2 note D#, 4 callchannel Music_FinalBattle_branch_23704 callchannel Music_FinalBattle_branch_23704 @@ -472,25 +476,26 @@ Music_FinalBattle_Ch2: callchannel Music_FinalBattle_branch_23704 callchannel Music_FinalBattle_branch_23704 callchannel Music_FinalBattle_branch_23704 - intensity $c1 + notetype 12, $c1 octave 4 note E_, 1 note E_, 3 - intensity $4a + notetype 12, $4a octave 3 note G#, 4 -Music_FinalBattle_branch_235e6: - intensity $d7 + +Music_FinalBattle_branch_235e6:: + notetype 12, $d7 octave 4 note E_, 8 note D#, 8 note D_, 8 octave 3 note B_, 8 - intensity $d7 + notetype 12, $d7 note A#, 4 note B_, 12 - intensity $b1 + notetype 12, $b1 note F_, 2 note F#, 3 note A_, 1 @@ -505,56 +510,56 @@ Music_FinalBattle_branch_235e6: note B_, 1 note A_, 1 note A#, 1 - intensity $d7 + notetype 12, $d7 octave 4 note E_, 8 note D#, 8 note D_, 8 octave 3 note B_, 8 - intensity $d7 + notetype 12, $d7 note A#, 4 note B_, 12 octave 4 note D#, 4 note E_, 12 - intensity $a0 + notetype 12, $a0 octave 3 note B_, 8 octave 4 note D_, 8 note F_, 8 note D_, 8 - intensity $d1 + notetype 12, $d1 note E_, 1 note E_, 3 - intensity $c4 + notetype 12, $c4 octave 3 note D_, 4 - intensity $d1 + notetype 12, $d1 octave 4 note E_, 1 note E_, 3 - intensity $c4 + notetype 12, $c4 octave 3 note F_, 4 - intensity $d1 + notetype 12, $d1 octave 4 note E_, 1 note E_, 3 - intensity $c4 + notetype 12, $c4 octave 3 note D_, 4 - intensity $d1 + notetype 12, $d1 octave 4 note E_, 1 note E_, 1 - intensity $c4 + notetype 12, $c4 octave 2 note B_, 4 octave 3 note D_, 2 - intensity $c2 + notetype 12, $c2 octave 4 note E_, 1 note E_, 1 @@ -582,99 +587,99 @@ Music_FinalBattle_branch_235e6: note D#, 1 note E_, 1 note E_, 1 - intensity $c4 + notetype 12, $c4 octave 2 note B_, 4 octave 3 note D_, 2 - intensity $d7 + notetype 12, $d7 octave 4 note E_, 4 note F_, 2 note F#, 12 - intensity $c2 + notetype 12, $c2 octave 3 note B_, 2 note B_, 4 note B_, 2 note B_, 4 note B_, 2 - intensity $d7 + notetype 12, $d7 octave 4 note F_, 4 note F#, 2 note G_, 12 - intensity $c2 + notetype 12, $c2 note C_, 2 note C_, 4 note C_, 2 note C_, 4 note C_, 2 - intensity $d7 + notetype 12, $d7 note F#, 4 note G_, 2 note G#, 12 - intensity $82 + notetype 12, $82 note C#, 2 note C#, 4 - intensity $a2 + notetype 12, $a2 note C#, 2 note C#, 4 note C#, 4 - intensity $d2 + notetype 12, $d2 note C#, 2 note C#, 4 - intensity $f2 + notetype 12, $f2 note C#, 2 note C#, 4 - intensity $c4 + notetype 12, $c4 note E_, 1 note F_, 1 - intensity $c0 + notetype 12, $c0 note F#, 12 - intensity $c7 + notetype 12, $c7 note F#, 4 - intensity $1f + notetype 12, $1f octave 3 note F#, 8 - intensity $90 + notetype 12, $90 note F#, 8 - intensity $c7 + notetype 12, $c7 octave 4 note C#, 4 - intensity $c0 + notetype 12, $c0 note D_, 12 note D_, 8 - intensity $c7 + notetype 12, $c7 note D_, 8 - intensity $c0 + notetype 12, $c0 note E_, 8 - intensity $c7 + notetype 12, $c7 note E_, 8 - intensity $c0 + notetype 12, $c0 octave 3 note A_, 8 - intensity $c7 + notetype 12, $c7 note A_, 8 - intensity $c0 + notetype 12, $c0 octave 4 note F_, 8 - intensity $c7 + notetype 12, $c7 note F_, 8 octave 5 note C_, 8 octave 4 note A#, 8 - intensity $c0 + notetype 12, $c0 note A_, 16 note A_, 8 - intensity $c7 + notetype 12, $c7 note A_, 8 - intensity $c5 + notetype 12, $c5 callchannel Music_FinalBattle_branch_23710 - intensity $b1 + notetype 12, $b1 callchannel Music_FinalBattle_branch_23710 - intensity $d7 + notetype 12, $d7 octave 4 note E_, 8 note D#, 8 @@ -683,12 +688,12 @@ Music_FinalBattle_branch_235e6: note B_, 8 note A#, 4 note B_, 12 - intensity $c7 + notetype 12, $c7 octave 4 note D_, 8 - intensity $4c + notetype 12, $4c note C_, 8 - intensity $d7 + notetype 12, $d7 note E_, 8 note D#, 8 note D_, 8 @@ -696,19 +701,20 @@ Music_FinalBattle_branch_235e6: note B_, 8 note A#, 4 note B_, 12 - intensity $5d + notetype 12, $5d octave 4 note D_, 8 - intensity $c0 + notetype 12, $c0 note F_, 8 - intensity $c0 + notetype 12, $c0 note E_, 8 - intensity $c7 + notetype 12, $c7 note E_, 8 note A#, 4 note B_, 12 loopchannel 0, Music_FinalBattle_branch_235e6 -Music_FinalBattle_branch_23704: + +Music_FinalBattle_branch_23704:: octave 4 note E_, 1 note E_, 1 @@ -721,7 +727,8 @@ Music_FinalBattle_branch_23704: note G_, 1 note F_, 1 endchannel -Music_FinalBattle_branch_23710: + +Music_FinalBattle_branch_23710:: octave 4 note D_, 2 note C#, 2 @@ -734,8 +741,10 @@ Music_FinalBattle_branch_23710: note F#, 2 note D_, 2 endchannel -Music_FinalBattle_Ch3: - notetype $c, $11 + + +Music_FinalBattle_Ch2:: + notetype 12, $11 octave 4 note E_, 4 octave 5 @@ -831,7 +840,8 @@ Music_FinalBattle_Ch3: note D#, 1 note E_, 1 note G_, 1 -Music_FinalBattle_branch_2377d: + +Music_FinalBattle_branch_2377d:: octave 4 note E_, 1 octave 3 @@ -1299,7 +1309,8 @@ Music_FinalBattle_branch_2377d: note A_, 2 note B_, 4 loopchannel 0, Music_FinalBattle_branch_2377d -Music_FinalBattle_branch_2395b: + +Music_FinalBattle_branch_2395b:: octave 4 note F#, 2 octave 5 @@ -1317,7 +1328,8 @@ Music_FinalBattle_branch_2395b: octave 5 note C#, 2 endchannel -Music_FinalBattle_branch_2396c: + +Music_FinalBattle_branch_2396c:: octave 4 note A_, 2 octave 5 diff --git a/crysaudio/music/RBY/gamecorner.asm b/crysaudio/music/RBY/gamecorner.asm index 75a63183..c30cf042 100644 --- a/crysaudio/music/RBY/gamecorner.asm +++ b/crysaudio/music/RBY/gamecorner.asm @@ -1,18 +1,18 @@ -Music_RBYGameCorner: - dbw $80, Music_RBYGameCorner_Ch1 - dbw $01, Music_RBYGameCorner_Ch2 - dbw $02, Music_RBYGameCorner_Ch3 +Music_RBYGameCorner:: + musicheader 3, 1, Music_RBYGameCorner_Ch0 + musicheader 1, 2, Music_RBYGameCorner_Ch1 + musicheader 1, 3, Music_RBYGameCorner_Ch2 -Music_RBYGameCorner_Ch1: ; 7e20b (1f:620b) +Music_RBYGameCorner_Ch0:: tempo 120 - volume 119 + volume $77 dutycycle 3 - vibrato 12, 52 - - notetype 12, 181 + vibrato 12, $34 + ;toggleperfectpitch + notetype 12, $b5 octave 3 note A_, 6 - notetype 12, 177 + notetype 12, $b1 note G#, 2 note F#, 2 note E_, 2 @@ -20,8 +20,8 @@ Music_RBYGameCorner_Ch1: ; 7e20b (1f:620b) note C#, 2 note D#, 16 -Music_RBYGameCorner_branch_7e222: - notetype 12, 181 +Music_RBYGameCorner_branch_7e222:: + notetype 12, $b5 octave 3 note C#, 4 octave 2 @@ -33,21 +33,21 @@ Music_RBYGameCorner_branch_7e222: octave 3 note A_, 2 note G#, 8 - notetype 12, 167 + notetype 12, $a7 note G#, 2 note A_, 2 note B_, 2 - notetype 12, 181 + notetype 12, $b5 note G#, 6 note E_, 2 note F#, 2 note E_, 2 note D#, 2 note E_, 2 - notetype 12, 167 + notetype 12, $a7 note F#, 8 note D#, 8 - notetype 12, 181 + notetype 12, $b5 note D#, 4 octave 2 note B_, 4 @@ -56,7 +56,7 @@ Music_RBYGameCorner_branch_7e222: note D#, 4 note B_, 2 note A_, 8 - notetype 12, 183 + notetype 12, $b7 octave 4 note E_, 2 note D#, 2 @@ -69,15 +69,15 @@ Music_RBYGameCorner_branch_7e222: note F#, 2 note G_, 2 note G#, 2 - notetype 12, 151 + notetype 12, $97 note G#, 1 note G_, 1 note G#, 1 note G_, 1 note G#, 2 - notetype 12, 183 + notetype 12, $b7 note F#, 8 - notetype 12, 181 + notetype 12, $b5 note C#, 4 octave 2 note G#, 4 @@ -88,7 +88,7 @@ Music_RBYGameCorner_branch_7e222: octave 3 note A_, 2 note G#, 8 - notetype 12, 183 + notetype 12, $b7 note G#, 2 note A_, 2 note B_, 2 @@ -99,10 +99,10 @@ Music_RBYGameCorner_branch_7e222: note D#, 2 note E_, 2 note F#, 8 - notetype 12, 151 + notetype 12, $97 note D#, 4 note C#, 4 - notetype 12, 181 + notetype 12, $b5 note D#, 4 octave 2 note B_, 4 @@ -111,7 +111,7 @@ Music_RBYGameCorner_branch_7e222: note D#, 4 note B_, 2 note A_, 8 - notetype 12, 183 + notetype 12, $b7 note F#, 2 note G#, 2 note A_, 2 @@ -121,7 +121,7 @@ Music_RBYGameCorner_branch_7e222: note A_, 2 note G#, 2 note F#, 2 - notetype 12, 194 + notetype 12, $c2 note E_, 4 octave 2 note B_, 4 @@ -129,7 +129,7 @@ Music_RBYGameCorner_branch_7e222: note E_, 2 note E_, 4 note E_, 4 - notetype 12, 183 + notetype 12, $b7 octave 2 note B_, 2 octave 3 @@ -142,21 +142,21 @@ Music_RBYGameCorner_branch_7e222: note C#, 2 note D#, 2 note E_, 8 - notetype 12, 181 + notetype 12, $b5 octave 4 note D#, 4 octave 3 note B_, 4 note F#, 4 note D#, 4 - notetype 12, 183 + notetype 12, $b7 note E_, 3 note D#, 1 - notetype 12, 178 + notetype 12, $b2 note C#, 2 note D#, 2 note E_, 10 - notetype 12, 183 + notetype 12, $b7 octave 2 note B_, 2 octave 3 @@ -169,14 +169,14 @@ Music_RBYGameCorner_branch_7e222: note C#, 2 note D#, 2 note E_, 8 - notetype 12, 181 + notetype 12, $b5 octave 4 note D#, 4 octave 3 note B_, 4 note F#, 4 note A_, 4 - notetype 12, 183 + notetype 12, $b7 note G#, 2 note G#, 1 note G_, 1 @@ -188,13 +188,13 @@ Music_RBYGameCorner_branch_7e222: loopchannel 0, Music_RBYGameCorner_branch_7e222 -Music_RBYGameCorner_Ch2: ; 7e2df (1f:62df) +Music_RBYGameCorner_Ch1:: dutycycle 2 - vibrato 10, 35 - notetype 12, 198 + vibrato 10, $23 + notetype 12, $c6 octave 4 note C#, 6 - notetype 12, 193 + notetype 12, $c1 octave 3 note B_, 2 note A_, 2 @@ -211,9 +211,9 @@ Music_RBYGameCorner_Ch2: ; 7e2df (1f:62df) note A#, 1 note B_, 8 -Music_RBYGameCorner_branch_7e2fa: +Music_RBYGameCorner_branch_7e2fa:: dutycycle 2 - notetype 12, 199 + notetype 12, $c7 octave 3 note E_, 4 octave 2 @@ -281,9 +281,9 @@ Music_RBYGameCorner_branch_7e2fa: note E_, 2 note F#, 2 note G#, 2 - notetype 12, 193 + notetype 12, $c1 note E_, 2 - notetype 12, 161 + notetype 12, $a1 note E_, 1 note D#, 1 note E_, 1 @@ -291,7 +291,7 @@ Music_RBYGameCorner_branch_7e2fa: note E_, 1 note D#, 1 note E_, 2 - notetype 12, 199 + notetype 12, $c7 octave 3 note B_, 2 octave 4 @@ -309,7 +309,7 @@ Music_RBYGameCorner_branch_7e2fa: octave 4 note C#, 2 note D#, 2 - notetype 12, 197 + notetype 12, $c5 note F#, 4 note D#, 4 octave 3 @@ -318,11 +318,11 @@ Music_RBYGameCorner_branch_7e2fa: note A_, 4 note G#, 3 note A_, 1 - notetype 12, 194 + notetype 12, $c2 note G#, 2 note F#, 2 note E_, 2 - notetype 12, 199 + notetype 12, $c7 octave 3 note B_, 2 octave 4 @@ -348,8 +348,8 @@ Music_RBYGameCorner_branch_7e2fa: loopchannel 0, Music_RBYGameCorner_branch_7e2fa -Music_RBYGameCorner_Ch3: ; 7e38b (1f:638b) - notetype 12, 19 +Music_RBYGameCorner_Ch2:: + notetype 12, $13 octave 5 note C#, 1 note __, 5 @@ -375,7 +375,7 @@ Music_RBYGameCorner_Ch3: ; 7e38b (1f:638b) note D#, 1 note __, 1 -Music_RBYGameCorner_branch_7e3a5: +Music_RBYGameCorner_branch_7e3a5:: callchannel Music_RBYGameCorner_branch_7e418 callchannel Music_RBYGameCorner_branch_7e42d callchannel Music_RBYGameCorner_branch_7e442 @@ -447,7 +447,7 @@ Music_RBYGameCorner_branch_7e3a5: callchannel Music_RBYGameCorner_branch_7e42d loopchannel 0, Music_RBYGameCorner_branch_7e3a5 -Music_RBYGameCorner_branch_7e418: +Music_RBYGameCorner_branch_7e418:: note E_, 1 note __, 1 note G#, 1 @@ -470,7 +470,7 @@ Music_RBYGameCorner_branch_7e418: note __, 1 endchannel -Music_RBYGameCorner_branch_7e42d: +Music_RBYGameCorner_branch_7e42d:: note E_, 1 note __, 1 note G#, 1 @@ -493,7 +493,7 @@ Music_RBYGameCorner_branch_7e42d: note __, 1 endchannel -Music_RBYGameCorner_branch_7e442: +Music_RBYGameCorner_branch_7e442:: note E_, 1 note __, 1 note B_, 1 @@ -516,7 +516,7 @@ Music_RBYGameCorner_branch_7e442: note __, 1 endchannel -Music_RBYGameCorner_branch_7e457: +Music_RBYGameCorner_branch_7e457:: note D#, 1 note __, 1 note A_, 1 @@ -539,7 +539,7 @@ Music_RBYGameCorner_branch_7e457: note __, 1 endchannel -Music_RBYGameCorner_branch_7e46c: +Music_RBYGameCorner_branch_7e46c:: note D#, 1 note __, 1 note F#, 1 @@ -562,7 +562,7 @@ Music_RBYGameCorner_branch_7e46c: note __, 1 endchannel -Music_RBYGameCorner_branch_7e481: +Music_RBYGameCorner_branch_7e481:: note D#, 1 note __, 1 note F#, 1 @@ -585,7 +585,7 @@ Music_RBYGameCorner_branch_7e481: note __, 1 endchannel -Music_RBYGameCorner_branch_7e496: +Music_RBYGameCorner_branch_7e496:: note F#, 1 note __, 1 note B_, 1 @@ -608,7 +608,7 @@ Music_RBYGameCorner_branch_7e496: note __, 1 endchannel -Music_RBYGameCorner_branch_7e4ab: +Music_RBYGameCorner_branch_7e4ab:: note F#, 1 note __, 1 note A_, 1 @@ -630,4 +630,3 @@ Music_RBYGameCorner_branch_7e4ab: note A_, 1 note __, 1 endchannel -; 0x7e4c0 \ No newline at end of file diff --git a/crysaudio/music/RBY/gym.asm b/crysaudio/music/RBY/gym.asm index 6281b143..51ffc721 100644 --- a/crysaudio/music/RBY/gym.asm +++ b/crysaudio/music/RBY/gym.asm @@ -1,15 +1,15 @@ -Music_RBYGym: - dbw $80, Music_RBYGym_Ch1 - dbw $01, Music_RBYGym_Ch2 - dbw $02, Music_RBYGym_Ch3 +Music_RBYGym:: + musicheader 3, 1, Music_RBYGym_Ch0 + musicheader 1, 2, Music_RBYGym_Ch1 + musicheader 1, 3, Music_RBYGym_Ch2 -Music_RBYGym_Ch1: ; bcbb (2:7cbb) +Music_RBYGym_Ch0:: tempo 138 - volume 119 + volume $77 dutycycle 3 - vibrato 8, 34 - - notetype 12, 181 + vibrato 8, $22 + ;toggleperfectpitch + notetype 12, $b5 octave 3 note G_, 6 note C_, 1 @@ -27,7 +27,7 @@ Music_RBYGym_Ch1: ; bcbb (2:7cbb) note F_, 4 note G_, 4 -Music_RBYGym_branch_bcd8: +Music_RBYGym_branch_bcd8:: note E_, 4 note F_, 2 note G_, 2 @@ -35,9 +35,9 @@ Music_RBYGym_branch_bcd8: note E_, 2 note D_, 2 note C_, 2 - notetype 12, 177 + notetype 12, $b1 note D_, 3 - notetype 12, 181 + notetype 12, $b5 note E_, 1 note F_, 4 note E_, 2 @@ -70,9 +70,9 @@ Music_RBYGym_branch_bcd8: note A_, 2 note G_, 2 note F_, 2 - notetype 12, 177 + notetype 12, $b1 note A#, 3 - notetype 12, 181 + notetype 12, $b5 note F_, 1 note F_, 4 note E_, 2 @@ -170,10 +170,10 @@ Music_RBYGym_branch_bcd8: loopchannel 0, Music_RBYGym_branch_bcd8 -Music_RBYGym_Ch2: ; bd6b (2:7d6b) +Music_RBYGym_Ch1:: dutycycle 3 - vibrato 10, 37 - notetype 12, 199 + vibrato 10, $25 + notetype 12, $c7 octave 4 note C_, 6 octave 3 @@ -184,23 +184,23 @@ Music_RBYGym_Ch2: ; bd6b (2:7d6b) note A#, 6 note F_, 1 note A#, 1 - notetype 12, 160 + notetype 12, $a0 note A_, 12 - notetype 12, 199 + notetype 12, $c7 note B_, 4 -Music_RBYGym_branch_bd82: +Music_RBYGym_branch_bd82:: octave 4 note C_, 12 octave 3 note G_, 2 octave 4 note C_, 2 - notetype 12, 194 + notetype 12, $c2 note D_, 3 octave 3 note A#, 1 - notetype 12, 199 + notetype 12, $c7 note A#, 12 octave 4 note C_, 12 @@ -208,10 +208,10 @@ Music_RBYGym_branch_bd82: note G_, 2 octave 4 note C_, 2 - notetype 12, 196 + notetype 12, $c4 octave 3 note A#, 2 - notetype 12, 199 + notetype 12, $c7 note A#, 1 octave 4 note C_, 1 @@ -219,15 +219,15 @@ Music_RBYGym_branch_bd82: note E_, 12 note D_, 2 note E_, 2 - notetype 12, 194 + notetype 12, $c2 note F_, 3 note D_, 1 - notetype 12, 199 + notetype 12, $c7 note D_, 4 - notetype 12, 194 + notetype 12, $c2 note A#, 3 note F_, 1 - notetype 12, 199 + notetype 12, $c7 note F_, 4 note E_, 12 note D_, 2 @@ -246,9 +246,9 @@ Music_RBYGym_branch_bd82: note A_, 4 note G_, 4 note F_, 4 - notetype 12, 195 + notetype 12, $c3 note E_, 2 - notetype 12, 199 + notetype 12, $c7 note E_, 1 note F_, 1 note G_, 6 @@ -271,30 +271,30 @@ Music_RBYGym_branch_bd82: note A_, 4 note G_, 4 note F_, 4 - notetype 12, 195 + notetype 12, $c3 note E_, 2 - notetype 12, 199 + notetype 12, $c7 note E_, 1 note F_, 1 note G_, 4 - notetype 12, 195 + notetype 12, $c3 note G_, 2 - notetype 12, 199 + notetype 12, $c7 note G_, 1 note A_, 1 note A#, 4 - notetype 12, 196 + notetype 12, $c4 octave 4 note C_, 2 - notetype 12, 199 + notetype 12, $c7 note C_, 1 note D_, 1 note E_, 12 loopchannel 0, Music_RBYGym_branch_bd82 -Music_RBYGym_Ch3: ; bdfa (2:7dfa) - notetype 12, 17 +Music_RBYGym_Ch2:: + notetype 12, $11 note __, 16 note __, 10 octave 4 @@ -302,7 +302,7 @@ Music_RBYGym_Ch3: ; bdfa (2:7dfa) note F_, 2 note D_, 2 -Music_RBYGym_branch_be02: +Music_RBYGym_branch_be02:: callchannel Music_RBYGym_branch_be3b callchannel Music_RBYGym_branch_be44 callchannel Music_RBYGym_branch_be3b @@ -328,7 +328,7 @@ Music_RBYGym_branch_be02: note F_, 2 loopchannel 0, Music_RBYGym_branch_be02 -Music_RBYGym_branch_be3b: +Music_RBYGym_branch_be3b:: note E_, 2 note G_, 2 note E_, 2 @@ -339,7 +339,7 @@ Music_RBYGym_branch_be3b: note G_, 2 endchannel -Music_RBYGym_branch_be44: +Music_RBYGym_branch_be44:: note D_, 2 note F_, 2 note D_, 2 @@ -350,7 +350,7 @@ Music_RBYGym_branch_be44: note F_, 2 endchannel -Music_RBYGym_branch_be4d: +Music_RBYGym_branch_be4d:: note F_, 2 note A#, 2 note F_, 2 @@ -360,4 +360,3 @@ Music_RBYGym_branch_be4d: note F_, 2 note A#, 2 endchannel -; 0xbe56 \ No newline at end of file diff --git a/crysaudio/music/RBY/gymleaderbattle.asm b/crysaudio/music/RBY/gymleaderbattle.asm index d39b54e2..2cd305ef 100644 --- a/crysaudio/music/RBY/gymleaderbattle.asm +++ b/crysaudio/music/RBY/gymleaderbattle.asm @@ -1,14 +1,15 @@ -Music_GymLeaderBattle: - dbw $80, Music_GymLeaderBattle_Ch1 - dbw $01, Music_GymLeaderBattle_Ch2 - dbw $02, Music_GymLeaderBattle_Ch3 +Music_GymLeaderBattle:: + musicheader 3, 1, Music_GymLeaderBattle_Ch0 + musicheader 1, 2, Music_GymLeaderBattle_Ch1 + musicheader 1, 3, Music_GymLeaderBattle_Ch2 -Music_GymLeaderBattle_Ch1: +Music_GymLeaderBattle_Ch0:: tempo 104 - volume 119 + volume $77 dutycycle 3 - vibrato $8, $34 - notetype $c, $b3 + vibrato 8, $34 + ;toggleperfectpitch + notetype 12, $b3 note __, 6 octave 3 note F#, 1 @@ -60,7 +61,8 @@ Music_GymLeaderBattle_Ch1: note F#, 1 note __, 9 note A_, 6 -Music_GymLeaderBattle_branch_223b0: + +Music_GymLeaderBattle_branch_223b0:: note F#, 1 octave 3 note C#, 1 @@ -463,19 +465,19 @@ Music_GymLeaderBattle_branch_223b0: note __, 1 note A_, 1 note __, 1 - intensity $b5 + notetype 12, $b5 octave 3 note C#, 12 - intensity $b3 + notetype 12, $b3 octave 1 note A_, 1 note __, 1 note A_, 1 note __, 1 - intensity $b5 + notetype 12, $b5 octave 3 note A_, 12 - intensity $b3 + notetype 12, $b3 note D#, 4 note C#, 4 note D#, 4 @@ -495,10 +497,10 @@ Music_GymLeaderBattle_branch_223b0: note __, 1 note A_, 1 note __, 1 - intensity $b5 + notetype 12, $b5 octave 3 note A_, 12 - intensity $b3 + notetype 12, $b3 note C#, 1 octave 2 note B_, 1 @@ -517,7 +519,7 @@ Music_GymLeaderBattle_branch_223b0: note E_, 1 note D#, 1 note C#, 1 - intensity $b5 + notetype 12, $b5 note D#, 4 note E_, 4 note C#, 2 @@ -548,10 +550,12 @@ Music_GymLeaderBattle_branch_223b0: note G#, 4 note E_, 6 loopchannel 0, Music_GymLeaderBattle_branch_223b0 -Music_GymLeaderBattle_Ch2: + + +Music_GymLeaderBattle_Ch1:: dutycycle 3 - vibrato $8, $25 - notetype $c, $c3 + vibrato 8, $25 + notetype 12, $c3 octave 4 note F_, 1 note E_, 1 @@ -608,8 +612,9 @@ Music_GymLeaderBattle_Ch2: note __, 9 octave 4 note C#, 6 -Music_GymLeaderBattle_branch_225e0: - intensity $c5 + +Music_GymLeaderBattle_branch_225e0:: + notetype 12, $c5 note D#, 4 note C#, 4 note D#, 4 @@ -623,7 +628,7 @@ Music_GymLeaderBattle_branch_225e0: octave 4 note C#, 2 note D#, 2 - intensity $b7 + notetype 12, $b7 dutycycle 2 octave 3 note A_, 8 @@ -631,7 +636,7 @@ Music_GymLeaderBattle_branch_225e0: note C#, 8 note E_, 8 note C#, 8 - intensity $c5 + notetype 12, $c5 dutycycle 3 note D#, 4 note C#, 4 @@ -646,18 +651,18 @@ Music_GymLeaderBattle_branch_225e0: octave 4 note C#, 2 note D#, 2 - intensity $b7 + notetype 12, $b7 dutycycle 2 note C#, 8 octave 3 note B_, 8 note A_, 8 - intensity $c3 + notetype 12, $c3 octave 4 note E_, 4 note E_, 2 note C#, 2 - intensity $c5 + notetype 12, $c5 dutycycle 3 octave 1 note B_, 1 @@ -723,7 +728,7 @@ Music_GymLeaderBattle_branch_225e0: note __, 1 note B_, 1 note __, 1 - intensity $b0 + notetype 12, $b0 octave 3 note B_, 4 octave 4 @@ -736,11 +741,11 @@ Music_GymLeaderBattle_branch_225e0: octave 3 note A_, 4 note G_, 4 - intensity $b0 + notetype 12, $b0 note F#, 8 - intensity $b7 + notetype 12, $b7 note F#, 8 - intensity $c3 + notetype 12, $c3 note C_, 1 note C#, 1 note D_, 1 @@ -762,7 +767,7 @@ Music_GymLeaderBattle_branch_225e0: note G_, 1 note A_, 1 note B_, 1 - intensity $b0 + notetype 12, $b0 octave 3 note B_, 4 octave 4 @@ -776,51 +781,51 @@ Music_GymLeaderBattle_branch_225e0: note A_, 4 octave 4 note C_, 4 - intensity $b0 + notetype 12, $b0 octave 3 note B_, 16 - intensity $3f + notetype 12, $3f octave 4 note F#, 16 - intensity $c3 + notetype 12, $c3 dutycycle 3 octave 1 note A_, 1 note __, 1 note A_, 1 note __, 1 - intensity $c7 + notetype 12, $c7 octave 3 note A_, 12 - intensity $c3 + notetype 12, $c3 octave 1 note A_, 1 note __, 1 note A_, 1 note __, 1 - intensity $c7 + notetype 12, $c7 octave 4 note C#, 12 - intensity $b0 + notetype 12, $b0 note D#, 16 - intensity $b7 + notetype 12, $b7 note D#, 16 - intensity $c3 + notetype 12, $c3 octave 1 note A_, 1 note __, 1 note A_, 1 note __, 1 - intensity $c7 + notetype 12, $c7 octave 4 note C#, 12 - intensity $c0 + notetype 12, $c0 note A_, 8 note E_, 8 note B_, 16 - intensity $c7 + notetype 12, $c7 note B_, 16 - intensity $c4 + notetype 12, $c4 octave 3 note D#, 4 note E_, 4 @@ -835,20 +840,22 @@ Music_GymLeaderBattle_branch_225e0: note D#, 1 note F#, 1 note A#, 1 - intensity $c0 + notetype 12, $c0 note B_, 16 note F#, 16 note A_, 16 octave 5 note C#, 8 note __, 2 - intensity $c3 + notetype 12, $c3 octave 4 note A_, 6 loopchannel 0, Music_GymLeaderBattle_branch_225e0 -Music_GymLeaderBattle_Ch3: - vibrato $0, $20 - notetype $c, $13 + + +Music_GymLeaderBattle_Ch2:: + vibrato 0, $20 + notetype 12, $13 note __, 12 octave 3 note B_, 1 @@ -1036,8 +1043,9 @@ Music_GymLeaderBattle_Ch3: note __, 1 octave 4 note C#, 6 - intensity $14 -Music_GymLeaderBattle_branch_227b1: + notetype 12, $14 + +Music_GymLeaderBattle_branch_227b1:: octave 3 note B_, 2 octave 4 diff --git a/crysaudio/music/RBY/halloffame.asm b/crysaudio/music/RBY/halloffame.asm index 95a879cd..cce7c36c 100644 --- a/crysaudio/music/RBY/halloffame.asm +++ b/crysaudio/music/RBY/halloffame.asm @@ -1,15 +1,15 @@ -Music_RBYHallOfFame: - dbw $80, Music_RBYHallOfFame_Ch1 - dbw $01, Music_RBYHallOfFame_Ch2 - dbw $02, Music_RBYHallOfFame_Ch3 +Music_RBYHallOfFame:: + musicheader 3, 1, Music_RBYHallOfFame_Ch0 + musicheader 1, 2, Music_RBYHallOfFame_Ch1 + musicheader 1, 3, Music_RBYHallOfFame_Ch2 -Music_RBYHallOfFame_Ch1: ; 7fbaf (1f:7baf) +Music_RBYHallOfFame_Ch0:: tempo 112 - volume 119 + volume $77 dutycycle 3 - vibrato 12, 34 - - notetype 12, 179 + vibrato 12, $22 + ;toggleperfectpitch + notetype 12, $b3 note __, 16 note __, 16 note __, 16 @@ -20,13 +20,13 @@ Music_RBYHallOfFame_Ch1: ; 7fbaf (1f:7baf) note F_, 1 note F#, 1 -Music_RBYHallOfFame_branch_7fbc5: - notetype 12, 128 +Music_RBYHallOfFame_branch_7fbc5:: + notetype 12, $80 octave 4 note C_, 16 note E_, 16 note F#, 16 - notetype 12, 96 + notetype 12, $60 note F_, 16 loopchannel 3, Music_RBYHallOfFame_branch_7fbc5 note __, 16 @@ -36,12 +36,12 @@ Music_RBYHallOfFame_branch_7fbc5: loopchannel 0, Music_RBYHallOfFame_branch_7fbc5 -Music_RBYHallOfFame_Ch2: ; 7fbda (1f:7bda) - vibrato 8, 37 +Music_RBYHallOfFame_Ch1:: + vibrato 8, $25 dutycycle 3 -Music_RBYHallOfFame_branch_7fbdf: - notetype 12, 196 +Music_RBYHallOfFame_branch_7fbdf:: + notetype 12, $c4 octave 3 note G_, 2 note D_, 2 @@ -68,10 +68,10 @@ Music_RBYHallOfFame_branch_7fbdf: loopchannel 0, Music_RBYHallOfFame_branch_7fbdf -Music_RBYHallOfFame_Ch3: ; 7fbfc (1f:7bfc) - notetype 12, 18 +Music_RBYHallOfFame_Ch2:: + notetype 12, $12 -Music_RBYHallOfFame_branch_7fbfe: +Music_RBYHallOfFame_branch_7fbfe:: octave 4 note D_, 2 note G_, 2 @@ -98,5 +98,4 @@ Music_RBYHallOfFame_branch_7fbfe: note G_, 4 note E_, 4 note G_, 4 - loopchannel 0, Music_RBYHallOfFame_Ch3 -; 0x7fc1f \ No newline at end of file + loopchannel 0, Music_RBYHallOfFame_Ch2 diff --git a/crysaudio/music/RBY/indigoplateau.asm b/crysaudio/music/RBY/indigoplateau.asm index b535054b..976bf0b4 100644 --- a/crysaudio/music/RBY/indigoplateau.asm +++ b/crysaudio/music/RBY/indigoplateau.asm @@ -1,46 +1,46 @@ -Music_RBYIndigoPlateau: - dbw $C0, Music_RBYIndigoPlateau_Ch1 - dbw $01, Music_RBYIndigoPlateau_Ch2 - dbw $02, Music_RBYIndigoPlateau_Ch3 - dbw $03, Music_RBYIndigoPlateau_Ch4 +Music_RBYIndigoPlateau:: + musicheader 4, 1, Music_RBYIndigoPlateau_Ch0 + musicheader 1, 2, Music_RBYIndigoPlateau_Ch1 + musicheader 1, 3, Music_RBYIndigoPlateau_Ch2 + musicheader 1, 4, Music_RBYIndigoPlateau_Ch3 -Music_RBYIndigoPlateau_Ch1: ; a5f0 (2:65f0) +Music_RBYIndigoPlateau_Ch0:: tempo 132 - volume 119 + volume $77 dutycycle 3 - vibrato 6, 52 - - notetype 12, 178 + vibrato 6, $34 + ;toggleperfectpitch + notetype 12, $b2 octave 2 note A_, 8 note A_, 8 note A_, 8 note A_, 4 - notetype 12, 164 + notetype 12, $a4 note A#, 4 -Music_RBYIndigoPlateau_branch_a605: +Music_RBYIndigoPlateau_branch_a605:: callchannel Music_RBYIndigoPlateau_branch_a659 - notetype 12, 180 + notetype 12, $b4 octave 3 note D_, 4 callchannel Music_RBYIndigoPlateau_branch_a659 - notetype 12, 180 + notetype 12, $b4 octave 3 note D#, 4 callchannel Music_RBYIndigoPlateau_branch_a659 - notetype 12, 180 + notetype 12, $b4 octave 3 note D_, 4 callchannel Music_RBYIndigoPlateau_branch_a659 - notetype 12, 160 + notetype 12, $a0 octave 2 note A#, 4 callchannel Music_RBYIndigoPlateau_branch_a659 - notetype 12, 180 + notetype 12, $b4 octave 3 note D_, 4 - notetype 12, 212 + notetype 12, $d4 octave 3 note A_, 4 note A_, 4 @@ -49,10 +49,10 @@ Music_RBYIndigoPlateau_branch_a605: note A_, 4 note A_, 4 note A_, 4 - notetype 12, 180 + notetype 12, $b4 octave 3 note D#, 4 - notetype 12, 212 + notetype 12, $d4 octave 3 note A#, 4 note A#, 4 @@ -61,26 +61,26 @@ Music_RBYIndigoPlateau_branch_a605: note A#, 4 note A#, 4 note A#, 4 - notetype 12, 180 + notetype 12, $b4 octave 3 note F_, 2 - notetype 12, 180 + notetype 12, $b4 octave 3 note G_, 2 - notetype 12, 176 + notetype 12, $b0 note A_, 8 octave 2 note A_, 8 - notetype 12, 183 + notetype 12, $b7 octave 3 note F_, 8 - notetype 12, 78 + notetype 12, $4e octave 2 note A#, 8 loopchannel 0, Music_RBYIndigoPlateau_branch_a605 -Music_RBYIndigoPlateau_branch_a659: - notetype 12, 178 +Music_RBYIndigoPlateau_branch_a659:: + notetype 12, $b2 octave 2 note A_, 4 note A_, 4 @@ -92,42 +92,42 @@ Music_RBYIndigoPlateau_branch_a659: endchannel -Music_RBYIndigoPlateau_Ch2: ; a664 (2:6664) +Music_RBYIndigoPlateau_Ch1:: dutycycle 3 - vibrato 8, 37 - notetype 12, 194 + vibrato 8, $25 + notetype 12, $c2 octave 3 note D_, 8 note D_, 8 note D_, 8 note D_, 4 - notetype 12, 90 + notetype 12, $5a note D#, 4 -Music_RBYIndigoPlateau_branch_a673: +Music_RBYIndigoPlateau_branch_a673:: callchannel Music_RBYIndigoPlateau_branch_a6af - notetype 12, 197 + notetype 12, $c5 note A_, 4 callchannel Music_RBYIndigoPlateau_branch_a6af - notetype 12, 197 + notetype 12, $c5 note A#, 4 callchannel Music_RBYIndigoPlateau_branch_a6af - notetype 12, 197 + notetype 12, $c5 note A_, 4 callchannel Music_RBYIndigoPlateau_branch_a6af - notetype 12, 199 + notetype 12, $c7 note C#, 4 callchannel Music_RBYIndigoPlateau_branch_a6af - notetype 12, 197 + notetype 12, $c5 note A_, 4 callchannel Music_RBYIndigoPlateau_branch_a6af - notetype 12, 197 + notetype 12, $c5 note A#, 4 callchannel Music_RBYIndigoPlateau_branch_a6af - notetype 12, 197 + notetype 12, $c5 octave 4 note C_, 2 - notetype 12, 199 + notetype 12, $c7 octave 4 note C#, 2 note D_, 8 @@ -135,13 +135,13 @@ Music_RBYIndigoPlateau_branch_a673: note D_, 8 octave 4 note C_, 8 - notetype 12, 77 + notetype 12, $4d octave 4 note D#, 8 loopchannel 0, Music_RBYIndigoPlateau_branch_a673 -Music_RBYIndigoPlateau_branch_a6af: - notetype 12, 194 +Music_RBYIndigoPlateau_branch_a6af:: + notetype 12, $c2 octave 3 note D_, 4 note D_, 4 @@ -153,8 +153,8 @@ Music_RBYIndigoPlateau_branch_a6af: endchannel -Music_RBYIndigoPlateau_Ch3: ; a6ba (2:66ba) - notetype 12, 16 +Music_RBYIndigoPlateau_Ch2:: + notetype 12, $10 octave 4 note D_, 2 note __, 6 @@ -166,7 +166,7 @@ Music_RBYIndigoPlateau_Ch3: ; a6ba (2:66ba) note __, 2 note D#, 4 -Music_RBYIndigoPlateau_branch_a6c6: +Music_RBYIndigoPlateau_branch_a6c6:: callchannel Music_RBYIndigoPlateau_branch_a6fe callchannel Music_RBYIndigoPlateau_branch_a6fe callchannel Music_RBYIndigoPlateau_branch_a6fe @@ -211,7 +211,7 @@ Music_RBYIndigoPlateau_branch_a6c6: note D#, 8 loopchannel 0, Music_RBYIndigoPlateau_branch_a6c6 -Music_RBYIndigoPlateau_branch_a6fe: +Music_RBYIndigoPlateau_branch_a6fe:: octave 4 note D_, 2 note __, 2 @@ -231,9 +231,9 @@ Music_RBYIndigoPlateau_branch_a6fe: endchannel -Music_RBYIndigoPlateau_Ch4: ; a70f (2:670f) - notetype 6 +Music_RBYIndigoPlateau_Ch3:: togglenoise 1 + notetype 6 note A_, 16 note A_, 16 note A_, 16 @@ -247,7 +247,7 @@ Music_RBYIndigoPlateau_Ch4: ; a70f (2:670f) note A#, 1 note A#, 1 -Music_RBYIndigoPlateau_branch_a728: +Music_RBYIndigoPlateau_branch_a728:: callchannel Music_RBYIndigoPlateau_branch_a791 callchannel Music_RBYIndigoPlateau_branch_a77e callchannel Music_RBYIndigoPlateau_branch_a791 @@ -284,7 +284,7 @@ Music_RBYIndigoPlateau_branch_a728: note A_, 1 loopchannel 0, Music_RBYIndigoPlateau_branch_a728 -Music_RBYIndigoPlateau_branch_a77e: +Music_RBYIndigoPlateau_branch_a77e:: note A_, 4 note A#, 4 note B_, 4 @@ -296,7 +296,7 @@ Music_RBYIndigoPlateau_branch_a77e: note A#, 2 endchannel -Music_RBYIndigoPlateau_branch_a791: +Music_RBYIndigoPlateau_branch_a791:: note A_, 4 note A#, 4 note B_, 4 @@ -310,7 +310,7 @@ Music_RBYIndigoPlateau_branch_a791: note A#, 1 endchannel -Music_RBYIndigoPlateau_branch_a7a8: +Music_RBYIndigoPlateau_branch_a7a8:: note A_, 4 note A#, 4 note A_, 4 @@ -326,4 +326,3 @@ Music_RBYIndigoPlateau_branch_a7a8: note A#, 1 note A#, 1 endchannel -; 0xa7c5 \ No newline at end of file diff --git a/crysaudio/music/RBY/introbattle.asm b/crysaudio/music/RBY/introbattle.asm index 41c27325..68b0a3b2 100644 --- a/crysaudio/music/RBY/introbattle.asm +++ b/crysaudio/music/RBY/introbattle.asm @@ -1,136 +1,136 @@ -Music_IntroBattle: - dbw $C0, Music_IntroBattle_Ch1 - dbw $01, Music_IntroBattle_Ch2 - dbw $02, Music_IntroBattle_Ch3 - dbw $03, Music_IntroBattle_Ch4 +Music_IntroBattle:: + musicheader 4, 1, Music_IntroBattle_Ch0 + musicheader 1, 2, Music_IntroBattle_Ch1 + musicheader 1, 3, Music_IntroBattle_Ch2 + musicheader 1, 4, Music_IntroBattle_Ch3 -Music_IntroBattle_Ch1: ; 7f844 (1f:7844) +Music_IntroBattle_Ch0:: tempo 98 - volume 119 + volume $77 dutycycle 3 - vibrato 6, 52 - - notetype 12, 177 + vibrato 6, $34 + ;toggleperfectpitch + notetype 12, $b1 note __, 8 octave 2 note A_, 2 note A_, 2 - notetype 12, 180 + notetype 12, $b4 octave 3 note D_, 4 - notetype 12, 177 + notetype 12, $b1 octave 2 note A_, 2 note A_, 2 - notetype 12, 180 + notetype 12, $b4 octave 3 note D#, 4 - notetype 12, 177 + notetype 12, $b1 octave 2 note A_, 2 note A_, 2 - notetype 12, 180 + notetype 12, $b4 octave 3 note D_, 4 - notetype 12, 177 + notetype 12, $b1 octave 2 note A_, 2 note A_, 2 - notetype 12, 160 + notetype 12, $a0 note A#, 4 - notetype 12, 177 + notetype 12, $b1 note A_, 2 note A_, 2 - notetype 12, 180 + notetype 12, $b4 octave 3 note D_, 4 - notetype 12, 177 + notetype 12, $b1 octave 2 note A_, 2 note A_, 2 - notetype 12, 41 + notetype 12, $29 octave 3 note G_, 4 - notetype 12, 176 + notetype 12, $b0 note A_, 8 octave 2 note A_, 8 - notetype 12, 183 + notetype 12, $b7 octave 3 note F_, 8 - notetype 12, 79 + notetype 12, $4f octave 2 note F_, 8 - notetype 12, 177 + notetype 12, $b1 note A_, 2 note A_, 2 - notetype 12, 180 + notetype 12, $b4 octave 3 note D_, 4 - notetype 12, 177 + notetype 12, $b1 octave 2 note A_, 2 note A_, 2 - notetype 12, 180 + notetype 12, $b4 octave 3 note D#, 4 - notetype 12, 177 + notetype 12, $b1 octave 2 note A_, 2 note A_, 2 - notetype 12, 180 + notetype 12, $b4 octave 3 note F_, 4 - notetype 12, 177 + notetype 12, $b1 octave 2 note A_, 2 note A_, 2 - notetype 12, 180 + notetype 12, $b4 octave 3 note G_, 4 - notetype 12, 176 + notetype 12, $b0 note F#, 16 - notetype 12, 177 + notetype 12, $b1 octave 4 note D_, 16 endchannel -Music_IntroBattle_Ch2: ; 7f8bc (1f:78bc) +Music_IntroBattle_Ch1:: dutycycle 3 - vibrato 8, 37 - notetype 12, 194 + vibrato 8, $25 + notetype 12, $c2 note __, 8 octave 3 note D_, 2 note D_, 2 - notetype 12, 197 + notetype 12, $c5 note A_, 4 - notetype 12, 194 + notetype 12, $c2 note D_, 2 note D_, 2 - notetype 12, 197 + notetype 12, $c5 note A#, 4 - notetype 12, 194 + notetype 12, $c2 note D_, 2 note D_, 2 - notetype 12, 197 + notetype 12, $c5 note A_, 4 - notetype 12, 194 + notetype 12, $c2 note D_, 2 note D_, 2 - notetype 12, 183 + notetype 12, $b7 note C#, 4 - notetype 12, 194 + notetype 12, $c2 note D_, 2 note D_, 2 - notetype 12, 197 + notetype 12, $c5 note A_, 4 - notetype 12, 194 + notetype 12, $c2 octave 3 note D_, 2 note D_, 2 - notetype 12, 199 + notetype 12, $c7 octave 4 note C#, 4 note D_, 8 @@ -140,39 +140,39 @@ Music_IntroBattle_Ch2: ; 7f8bc (1f:78bc) note C_, 8 octave 3 note C_, 8 - notetype 12, 194 + notetype 12, $c2 note D_, 2 note D_, 2 - notetype 12, 197 + notetype 12, $c5 note A_, 4 - notetype 12, 194 + notetype 12, $c2 note D_, 2 note D_, 2 - notetype 12, 197 + notetype 12, $c5 note A#, 4 - notetype 12, 194 + notetype 12, $c2 note D_, 2 note D_, 2 - notetype 12, 197 + notetype 12, $c5 octave 4 note C_, 4 - notetype 12, 194 + notetype 12, $c2 octave 3 note D_, 2 note D_, 2 - notetype 12, 197 + notetype 12, $c5 octave 4 note C#, 4 - notetype 12, 47 + notetype 12, $2f note D_, 16 - notetype 12, 193 + notetype 12, $c1 octave 5 note D_, 16 endchannel -Music_IntroBattle_Ch3: ; 7f91d (1f:791d) - notetype 12, 16 +Music_IntroBattle_Ch2:: + notetype 12, $10 note __, 8 octave 4 note D_, 1 @@ -235,9 +235,9 @@ Music_IntroBattle_Ch3: ; 7f91d (1f:791d) endchannel -Music_IntroBattle_Ch4: ; 7f95b (1f:795b) - notetype 6 +Music_IntroBattle_Ch3:: togglenoise 1 + notetype 6 note B_, 1 note B_, 1 note B_, 1 @@ -334,4 +334,3 @@ Music_IntroBattle_Ch4: ; 7f95b (1f:795b) note __, 16 note __, 14 endchannel -; 0x7fa19 \ No newline at end of file diff --git a/crysaudio/music/RBY/jigglypuffsong.asm b/crysaudio/music/RBY/jigglypuffsong.asm index ae70c87e..541b81ee 100644 --- a/crysaudio/music/RBY/jigglypuffsong.asm +++ b/crysaudio/music/RBY/jigglypuffsong.asm @@ -1,18 +1,18 @@ -Music_JigglypuffSong: - dbw $40, Music_JigglypuffSong_Ch1 - dbw $01, Music_JigglypuffSong_Ch2 +Music_JigglypuffSong:: + musicheader 2, 1, Music_JigglypuffSong_Ch0 + musicheader 1, 2, Music_JigglypuffSong_Ch1 -Music_JigglypuffSong_Ch1: ; 7fb7d (1f:7b7d) +Music_JigglypuffSong_Ch0:: tempo 144 - volume 119 - vibrato 8, 36 + volume $77 + vibrato 8, $24 dutycycle 2 - sound_duty 165 - - notetype 13, 103 + sound_duty 1, 1, 2, 2 + ;toggleperfectpitch + notetype 13, $67 octave 4 note E_, 8 - notetype 12, 103 + notetype 12, $67 note B_, 2 note G#, 6 note F#, 8 @@ -25,11 +25,11 @@ Music_JigglypuffSong_Ch1: ; 7fb7d (1f:7b7d) endchannel -Music_JigglypuffSong_Ch2: ; 7fb9a (1f:7b9a) - vibrato 5, 21 +Music_JigglypuffSong_Ch1:: + vibrato 5, $15 dutycycle 2 - sound_duty 10 - notetype 12, 167 + sound_duty 2, 2, 0, 0 + notetype 12, $a7 octave 4 note E_, 8 note B_, 2 @@ -42,4 +42,3 @@ Music_JigglypuffSong_Ch2: ; 7fb9a (1f:7b9a) note G#, 4 note E_, 10 endchannel -; 0x7fbaf \ No newline at end of file diff --git a/crysaudio/music/RBY/lavender.asm b/crysaudio/music/RBY/lavender.asm index e747188c..60d01507 100644 --- a/crysaudio/music/RBY/lavender.asm +++ b/crysaudio/music/RBY/lavender.asm @@ -1,23 +1,23 @@ -Music_Lavender: - dbw $C0, Music_Lavender_Ch1 - dbw $01, Music_Lavender_Ch2 - dbw $02, Music_Lavender_Ch3 - dbw $03, Music_Lavender_Ch4 +Music_Lavender:: + musicheader 4, 1, Music_Lavender_Ch0 + musicheader 1, 2, Music_Lavender_Ch1 + musicheader 1, 3, Music_Lavender_Ch2 + musicheader 1, 4, Music_Lavender_Ch3 -Music_Lavender_Ch1: ; bb58 (2:7b58) +Music_Lavender_Ch0:: tempo 152 - volume 119 + volume $77 dutycycle 1 - - vibrato 0, 136 - notetype 12, 135 + ;toggleperfectpitch + vibrato 0, $88 + notetype 12, $87 note __, 16 note __, 16 note __, 16 note __, 16 - notetype 12, 167 + notetype 12, $a7 -Music_Lavender_branch_bb6b: +Music_Lavender_branch_bb6b:: octave 3 note G_, 8 note G_, 8 @@ -68,12 +68,12 @@ Music_Lavender_branch_bb6b: loopchannel 0, Music_Lavender_branch_bb6b -Music_Lavender_Ch2: ; bb9e (2:7b9e) - vibrato 0, 52 +Music_Lavender_Ch1:: + vibrato 0, $34 dutycycle 3 - notetype 12, 145 + notetype 12, $91 -Music_Lavender_branch_bba5: +Music_Lavender_branch_bba5:: octave 5 note C_, 4 note G_, 4 @@ -82,8 +82,8 @@ Music_Lavender_branch_bba5: loopchannel 0, Music_Lavender_branch_bba5 -Music_Lavender_Ch3: ; bbae (2:7bae) - vibrato 4, 17 +Music_Lavender_Ch2:: + vibrato 4, $11 notetype 12, $3f note __, 16 note __, 16 @@ -91,7 +91,8 @@ Music_Lavender_Ch3: ; bbae (2:7bae) note __, 16 notetype 12, $2f load_wave 2, 1, 14, 2, 3, 3, 2, 8, 14, 1, 2, 2, 15, 15, 14, 10, 1, 0, 1, 4, 13, 12, 1, 0, 14, 3, 4, 1, 5, 1, 7, 3 -Music_Lavender_branch_bbb9: + +Music_Lavender_branch_bbb9:: octave 4 note E_, 16 note D_, 16 @@ -191,16 +192,16 @@ Music_Lavender_branch_bbb9: note B_, 4 loopchannel 0, Music_Lavender_branch_bbb9 -Music_Lavender_Ch4: ; bc21 (2:7c21) - notetype 12 + +Music_Lavender_Ch3:: togglenoise 0 + notetype 12 note __, 16 note __, 16 note __, 16 note __, 16 -Music_Lavender_branch_bc26: +Music_Lavender_branch_bc26:: note F#, 8 note F#, 8 loopchannel 0, Music_Lavender_branch_bc26 -; 0xbc2e \ No newline at end of file diff --git a/crysaudio/music/RBY/meeteviltrainer.asm b/crysaudio/music/RBY/meeteviltrainer.asm index 4e9071b3..aa7cd9be 100644 --- a/crysaudio/music/RBY/meeteviltrainer.asm +++ b/crysaudio/music/RBY/meeteviltrainer.asm @@ -1,41 +1,41 @@ -Music_MeetEvilTrainer: - dbw $80, Music_MeetEvilTrainer_Ch1 - dbw $01, Music_MeetEvilTrainer_Ch2 - dbw $02, Music_MeetEvilTrainer_Ch3 +Music_MeetEvilTrainer:: + musicheader 3, 1, Music_MeetEvilTrainer_Ch0 + musicheader 1, 2, Music_MeetEvilTrainer_Ch1 + musicheader 1, 3, Music_MeetEvilTrainer_Ch2 -Music_MeetEvilTrainer_Ch1: ; 7f69d (1f:769d) +Music_MeetEvilTrainer_Ch0:: tempo 124 - volume 119 + volume $77 dutycycle 2 - - notetype 12, 177 + ;toggleperfectpitch + notetype 12, $b1 note __, 4 octave 3 note D_, 2 note C#, 2 - notetype 12, 79 + notetype 12, $4f note D_, 4 -Music_MeetEvilTrainer_branch_7f6ae: - notetype 12, 161 +Music_MeetEvilTrainer_branch_7f6ae:: + notetype 12, $a1 note D_, 4 note D_, 4 note D_, 4 - notetype 12, 112 + notetype 12, $70 note D_, 4 loopchannel 0, Music_MeetEvilTrainer_branch_7f6ae -Music_MeetEvilTrainer_Ch2: ; 7f6ba (1f:76ba) +Music_MeetEvilTrainer_Ch1:: dutycycle 1 - notetype 12, 182 + notetype 12, $b6 octave 3 note B_, 2 note A#, 2 note B_, 8 -Music_MeetEvilTrainer_branch_7f6c2: - notetype 12, 194 +Music_MeetEvilTrainer_branch_7f6c2:: + notetype 12, $c2 octave 4 note D#, 2 note D_, 2 @@ -47,9 +47,9 @@ Music_MeetEvilTrainer_branch_7f6c2: note B_, 4 note B_, 4 note B_, 4 - notetype 12, 79 + notetype 12, $4f note A#, 4 - notetype 12, 194 + notetype 12, $c2 note G_, 2 note G#, 2 note A_, 2 @@ -59,14 +59,14 @@ Music_MeetEvilTrainer_branch_7f6c2: note B_, 4 note B_, 4 note B_, 4 - notetype 12, 63 + notetype 12, $3f note A#, 4 - notetype 12, 194 + notetype 12, $c2 loopchannel 0, Music_MeetEvilTrainer_branch_7f6c2 -Music_MeetEvilTrainer_Ch3: ; 7f6e6 (1f:76e6) - notetype 12, 16 +Music_MeetEvilTrainer_Ch2:: + notetype 12, $10 note __, 8 octave 4 note F#, 1 @@ -74,7 +74,7 @@ Music_MeetEvilTrainer_Ch3: ; 7f6e6 (1f:76e6) note F_, 1 note __, 1 -Music_MeetEvilTrainer_branch_7f6ee: +Music_MeetEvilTrainer_branch_7f6ee:: note F#, 1 note __, 3 note F#, 1 @@ -83,4 +83,3 @@ Music_MeetEvilTrainer_branch_7f6ee: note __, 3 note A#, 4 loopchannel 0, Music_MeetEvilTrainer_branch_7f6ee -; 0x7f6f9 \ No newline at end of file diff --git a/crysaudio/music/RBY/meetfemaletrainer.asm b/crysaudio/music/RBY/meetfemaletrainer.asm index 8a959d31..a252ea1b 100644 --- a/crysaudio/music/RBY/meetfemaletrainer.asm +++ b/crysaudio/music/RBY/meetfemaletrainer.asm @@ -1,14 +1,14 @@ -Music_MeetFemaleTrainer: - dbw $80, Music_MeetFemaleTrainer_Ch1 - dbw $01, Music_MeetFemaleTrainer_Ch2 - dbw $02, Music_MeetFemaleTrainer_Ch3 +Music_MeetFemaleTrainer:: + musicheader 3, 1, Music_MeetFemaleTrainer_Ch0 + musicheader 1, 2, Music_MeetFemaleTrainer_Ch1 + musicheader 1, 3, Music_MeetFemaleTrainer_Ch2 -Music_MeetFemaleTrainer_Ch1: ; 7f6f9 (1f:76f9) +Music_MeetFemaleTrainer_Ch0:: tempo 124 - volume 119 + volume $77 dutycycle 1 - - notetype 12, 178 + ;toggleperfectpitch + notetype 12, $b2 octave 3 note G#, 6 octave 4 @@ -16,9 +16,9 @@ Music_MeetFemaleTrainer_Ch1: ; 7f6f9 (1f:76f9) note D#, 2 note C#, 2 note C_, 2 - notetype 12, 129 + notetype 12, $81 -Music_MeetFemaleTrainer_branch_7f70c: +Music_MeetFemaleTrainer_branch_7f70c:: octave 3 note E_, 4 loopchannel 12, Music_MeetFemaleTrainer_branch_7f70c @@ -31,17 +31,17 @@ Music_MeetFemaleTrainer_branch_7f70c: loopchannel 0, Music_MeetFemaleTrainer_branch_7f70c -Music_MeetFemaleTrainer_Ch2: ; 7f71c (1f:771c) +Music_MeetFemaleTrainer_Ch1:: dutycycle 2 - notetype 12, 194 + notetype 12, $c2 octave 3 note B_, 2 - notetype 12, 199 + notetype 12, $c7 octave 4 note B_, 12 -Music_MeetFemaleTrainer_branch_7f726: - notetype 12, 194 +Music_MeetFemaleTrainer_branch_7f726:: + notetype 12, $c2 octave 3 note B_, 4 octave 4 @@ -76,8 +76,8 @@ Music_MeetFemaleTrainer_branch_7f726: loopchannel 0, Music_MeetFemaleTrainer_branch_7f726 -Music_MeetFemaleTrainer_Ch3: ; 7f74b (1f:774b) - notetype 12, 16 +Music_MeetFemaleTrainer_Ch2:: + notetype 12, $10 note __, 8 octave 5 note C#, 1 @@ -88,7 +88,7 @@ Music_MeetFemaleTrainer_Ch3: ; 7f74b (1f:774b) note A_, 1 note __, 1 -Music_MeetFemaleTrainer_branch_7f756: +Music_MeetFemaleTrainer_branch_7f756:: callchannel Music_MeetFemaleTrainer_branch_7f770 note G#, 1 note __, 3 @@ -109,7 +109,7 @@ Music_MeetFemaleTrainer_branch_7f756: note __, 3 loopchannel 0, Music_MeetFemaleTrainer_branch_7f756 -Music_MeetFemaleTrainer_branch_7f770: +Music_MeetFemaleTrainer_branch_7f770:: note G#, 1 note __, 3 note E_, 1 @@ -121,4 +121,3 @@ Music_MeetFemaleTrainer_branch_7f770: note F#, 1 note __, 1 endchannel -; 0x7f77b \ No newline at end of file diff --git a/crysaudio/music/RBY/meetjessiejames.asm b/crysaudio/music/RBY/meetjessiejames.asm index dd9d660e..92667ec8 100644 --- a/crysaudio/music/RBY/meetjessiejames.asm +++ b/crysaudio/music/RBY/meetjessiejames.asm @@ -1,14 +1,14 @@ -Music_MeetJessieJames: - dbw $80, Music_MeetJessieJames_Ch1 - dbw $01, Music_MeetJessieJames_Ch2 - dbw $02, Music_MeetJessieJames_Ch3 +Music_MeetJessieJames:: + musicheader 3, 1, Music_MeetJessieJames_Ch1 + musicheader 1, 2, Music_MeetJessieJames_Ch2 + musicheader 1, 3, Music_MeetJessieJames_Ch3 -Music_MeetJessieJames_Ch1: +Music_MeetJessieJames_Ch1:: tempo 144 - volume 119 + volume $77 dutycycle 3 - vibrato $8, $14 - notetype $c, $b2 + vibrato 8, $14 + notetype 12, $b2 octave 3 note G#, 1 note G_, 1 @@ -19,20 +19,21 @@ Music_MeetJessieJames_Ch1: note D_, 2 note C#, 2 note C_, 2 - notetype $c, $b6 + notetype 12, $b6 note D#, 12 note C_, 4 -Music_MeetJessieJames_branch_83187: - notetype $c, $b2 + +Music_MeetJessieJames_branch_83187:: + notetype 12, $b2 octave 4 note D_, 16 note __, 12 - notetype $c, $b4 + notetype 12, $b4 octave 3 note A#, 4 note __, 16 note __, 8 - notetype $c, $b2 + notetype 12, $b2 octave 2 note A_, 2 octave 3 @@ -54,10 +55,10 @@ Music_MeetJessieJames_branch_83187: note D_, 2 octave 2 note A#, 4 - notetype $c, $b4 + notetype 12, $b4 octave 3 note B_, 4 - notetype $c, $b2 + notetype 12, $b2 note D_, 1 note D#, 1 note D#, 2 @@ -76,13 +77,15 @@ Music_MeetJessieJames_branch_83187: note A#, 2 octave 3 note B_, 2 - notetype $c, $b4 + notetype 12, $b4 note A#, 4 loopchannel 0, Music_MeetJessieJames_branch_83187 -Music_MeetJessieJames_Ch2: + + +Music_MeetJessieJames_Ch2:: dutycycle 3 - vibrato $6, $15 - notetype $c, $c2 + vibrato 6, $15 + notetype 12, $c2 octave 4 note D_, 1 note C#, 1 @@ -94,12 +97,13 @@ Music_MeetJessieJames_Ch2: note G#, 2 note G_, 2 note F#, 2 - notetype $c, $c7 + notetype 12, $c7 note A_, 12 octave 4 note C#, 4 -Music_MeetJessieJames_branch_831df: - notetype $c, $c2 + +Music_MeetJessieJames_branch_831df:: + notetype 12, $c2 octave 3 note C#, 1 note D_, 1 @@ -117,10 +121,10 @@ Music_MeetJessieJames_branch_831df: note C#, 2 octave 2 note A_, 4 - notetype $c, $c5 + notetype 12, $c5 octave 4 note C#, 4 - notetype $c, $c2 + notetype 12, $c2 note D_, 1 octave 3 note D_, 1 @@ -136,10 +140,10 @@ Music_MeetJessieJames_branch_831df: note D_, 2 note D_, 2 note C#, 2 - notetype $c, $c6 + notetype 12, $c6 octave 4 note D_, 8 - notetype $c, $c2 + notetype 12, $c2 note D#, 6 note F_, 4 note D#, 4 @@ -149,9 +153,9 @@ Music_MeetJessieJames_branch_831df: note D#, 6 note F_, 4 note D#, 2 - notetype $c, $c5 + notetype 12, $c5 note D_, 4 - notetype $c, $c2 + notetype 12, $c2 note D#, 6 note F_, 4 note D#, 4 @@ -160,11 +164,13 @@ Music_MeetJessieJames_branch_831df: octave 4 note D#, 4 note F_, 4 - notetype $c, $c5 + notetype 12, $c5 note D#, 8 loopchannel 0, Music_MeetJessieJames_branch_831df -Music_MeetJessieJames_Ch3: - notetype $c, $10 + + +Music_MeetJessieJames_Ch3:: + notetype 12, $10 note __, 16 note __, 8 octave 4 @@ -174,7 +180,8 @@ Music_MeetJessieJames_Ch3: octave 4 note C_, 2 note D#, 2 -Music_MeetJessieJames_branch_83235: + +Music_MeetJessieJames_branch_83235:: note D_, 1 note __, 1 note A_, 1 diff --git a/crysaudio/music/RBY/meetmaletrainer.asm b/crysaudio/music/RBY/meetmaletrainer.asm index 18eb3fbf..c993ba8c 100644 --- a/crysaudio/music/RBY/meetmaletrainer.asm +++ b/crysaudio/music/RBY/meetmaletrainer.asm @@ -1,15 +1,15 @@ -Music_MeetMaleTrainer: - dbw $80, Music_MeetMaleTrainer_Ch1 - dbw $01, Music_MeetMaleTrainer_Ch2 - dbw $02, Music_MeetMaleTrainer_Ch3 +Music_MeetMaleTrainer:: + musicheader 3, 1, Music_MeetMaleTrainer_Ch0 + musicheader 1, 2, Music_MeetMaleTrainer_Ch1 + musicheader 1, 3, Music_MeetMaleTrainer_Ch2 -Music_MeetMaleTrainer_Ch1: ; 7f77b (1f:777b) +Music_MeetMaleTrainer_Ch0:: tempo 112 - volume 119 + volume $77 dutycycle 3 - vibrato 20, 51 - - notetype 12, 180 + vibrato 20, $33 + ;toggleperfectpitch + notetype 12, $b4 octave 3 note C#, 1 note D_, 1 @@ -18,7 +18,7 @@ Music_MeetMaleTrainer_Ch1: ; 7f77b (1f:777b) note F_, 12 note __, 16 -Music_MeetMaleTrainer_branch_7f78f: +Music_MeetMaleTrainer_branch_7f78f:: octave 3 note B_, 4 note A_, 4 @@ -37,10 +37,10 @@ Music_MeetMaleTrainer_branch_7f78f: loopchannel 0, Music_MeetMaleTrainer_branch_7f78f -Music_MeetMaleTrainer_Ch2: ; 7f7a2 (1f:77a2) +Music_MeetMaleTrainer_Ch1:: dutycycle 3 - vibrato 24, 34 - notetype 12, 196 + vibrato 24, $22 + notetype 12, $c4 octave 4 note E_, 1 note D#, 1 @@ -54,8 +54,8 @@ Music_MeetMaleTrainer_Ch2: ; 7f7a2 (1f:77a2) note E_, 1 note __, 9 -Music_MeetMaleTrainer_branch_7f7b5: - notetype 12, 196 +Music_MeetMaleTrainer_branch_7f7b5:: + notetype 12, $c4 octave 4 note E_, 6 note D#, 6 @@ -70,9 +70,9 @@ Music_MeetMaleTrainer_branch_7f7b5: note B_, 2 octave 4 note C#, 2 - notetype 12, 199 + notetype 12, $c7 note F_, 16 - notetype 12, 197 + notetype 12, $c5 octave 3 note F#, 8 octave 4 @@ -80,8 +80,8 @@ Music_MeetMaleTrainer_branch_7f7b5: loopchannel 0, Music_MeetMaleTrainer_branch_7f7b5 -Music_MeetMaleTrainer_Ch3: ; 7f7d2 (1f:77d2) - notetype 12, 16 +Music_MeetMaleTrainer_Ch2:: + notetype 12, $10 note __, 6 octave 4 note B_, 1 @@ -105,7 +105,7 @@ Music_MeetMaleTrainer_Ch3: ; 7f7d2 (1f:77d2) note F#, 1 note __, 1 -Music_MeetMaleTrainer_branch_7f7ea: +Music_MeetMaleTrainer_branch_7f7ea:: note E_, 1 note __, 1 note B_, 1 @@ -193,4 +193,3 @@ Music_MeetMaleTrainer_branch_7f7ea: note D#, 1 note __, 1 loopchannel 0, Music_MeetMaleTrainer_branch_7f7ea -; 0x7f844 \ No newline at end of file diff --git a/crysaudio/music/RBY/meetprofoak.asm b/crysaudio/music/RBY/meetprofoak.asm index 1d49409e..7d3da517 100644 --- a/crysaudio/music/RBY/meetprofoak.asm +++ b/crysaudio/music/RBY/meetprofoak.asm @@ -1,14 +1,14 @@ -Music_MeetProfOak: - dbw $80, Music_MeetProfOak_Ch1 - dbw $01, Music_MeetProfOak_Ch2 - dbw $02, Music_MeetProfOak_Ch3 +Music_MeetProfOak:: + musicheader 3, 1, Music_MeetProfOak_Ch0 + musicheader 1, 2, Music_MeetProfOak_Ch1 + musicheader 1, 3, Music_MeetProfOak_Ch2 -Music_MeetProfOak_Ch1: ; af59 (2:6f59) +Music_MeetProfOak_Ch0:: tempo 112 - volume 119 + volume $77 dutycycle 3 - - notetype 12, 180 + ;toggleperfectpitch + notetype 12, $b4 octave 3 note F#, 1 note B_, 1 @@ -16,7 +16,7 @@ Music_MeetProfOak_Ch1: ; af59 (2:6f59) note D#, 1 note E_, 1 note F#, 12 - notetype 12, 162 + notetype 12, $a2 octave 3 note E_, 6 note B_, 10 @@ -43,7 +43,7 @@ Music_MeetProfOak_Ch1: ; af59 (2:6f59) note F#, 2 note F#, 4 -Music_MeetProfOak_branch_af85: +Music_MeetProfOak_branch_af85:: note F#, 6 note E_, 4 note A_, 2 @@ -79,10 +79,10 @@ Music_MeetProfOak_branch_af85: loopchannel 0, Music_MeetProfOak_branch_af85 -Music_MeetProfOak_Ch2: ; afa9 (2:6fa9) - vibrato 8, 17 +Music_MeetProfOak_Ch1:: + vibrato 8, $11 dutycycle 2 - notetype 12, 196 + notetype 12, $c4 octave 3 note B_, 1 octave 4 @@ -90,7 +90,7 @@ Music_MeetProfOak_Ch2: ; afa9 (2:6fa9) note F#, 1 note A#, 1 note B_, 12 - notetype 12, 178 + notetype 12, $b2 octave 3 note B_, 2 octave 4 @@ -99,7 +99,7 @@ Music_MeetProfOak_Ch2: ; afa9 (2:6fa9) note E_, 4 note D#, 2 note C#, 4 - notetype 12, 100 + notetype 12, $64 octave 4 note B_, 2 octave 5 @@ -108,7 +108,7 @@ Music_MeetProfOak_Ch2: ; afa9 (2:6fa9) note E_, 4 note D#, 2 note C#, 4 - notetype 12, 178 + notetype 12, $b2 octave 3 note B_, 2 note A_, 2 @@ -116,7 +116,7 @@ Music_MeetProfOak_Ch2: ; afa9 (2:6fa9) note A_, 4 note B_, 2 note B_, 4 - notetype 12, 129 + notetype 12, $81 octave 4 note B_, 2 note A_, 2 @@ -124,7 +124,7 @@ Music_MeetProfOak_Ch2: ; afa9 (2:6fa9) note A_, 4 note B_, 2 note B_, 4 - notetype 12, 178 + notetype 12, $b2 octave 3 note B_, 2 octave 4 @@ -133,7 +133,7 @@ Music_MeetProfOak_Ch2: ; afa9 (2:6fa9) note E_, 4 note D#, 2 note C#, 4 - notetype 12, 100 + notetype 12, $64 octave 4 note B_, 2 octave 5 @@ -142,7 +142,7 @@ Music_MeetProfOak_Ch2: ; afa9 (2:6fa9) note E_, 4 note D#, 2 note C#, 4 - notetype 12, 178 + notetype 12, $b2 octave 3 note B_, 2 note A_, 2 @@ -150,7 +150,7 @@ Music_MeetProfOak_Ch2: ; afa9 (2:6fa9) note A_, 4 note B_, 2 note B_, 4 - notetype 12, 129 + notetype 12, $81 octave 4 note B_, 2 note A_, 2 @@ -158,9 +158,9 @@ Music_MeetProfOak_Ch2: ; afa9 (2:6fa9) note A_, 4 note B_, 2 note B_, 4 - notetype 12, 181 + notetype 12, $b5 -Music_MeetProfOak_branch_b005: +Music_MeetProfOak_branch_b005:: octave 4 note C#, 6 octave 3 @@ -180,14 +180,14 @@ Music_MeetProfOak_branch_b005: note B_, 1 octave 4 note E_, 8 - notetype 12, 101 + notetype 12, $65 octave 4 note B_, 6 note G#, 1 note B_, 1 octave 5 note E_, 8 - notetype 12, 181 + notetype 12, $b5 octave 3 note A_, 6 note F#, 1 @@ -208,13 +208,13 @@ Music_MeetProfOak_branch_b005: note B_, 1 octave 4 note E_, 1 - notetype 12, 183 + notetype 12, $b7 note G#, 16 loopchannel 0, Music_MeetProfOak_branch_b005 -Music_MeetProfOak_Ch3: ; b03d (2:703d) - notetype 12, 18 +Music_MeetProfOak_Ch2:: + notetype 12, $12 note __, 10 octave 4 note F#, 1 @@ -341,7 +341,7 @@ Music_MeetProfOak_Ch3: ; b03d (2:703d) note G#, 1 note __, 1 -Music_MeetProfOak_branch_b0bc: +Music_MeetProfOak_branch_b0bc:: octave 4 note A_, 1 note __, 1 @@ -368,7 +368,7 @@ Music_MeetProfOak_branch_b0bc: note __, 1 loopchannel 2, Music_MeetProfOak_branch_b0bc -Music_MeetProfOak_branch_b0d8: +Music_MeetProfOak_branch_b0d8:: octave 4 note G#, 1 note __, 1 @@ -388,7 +388,7 @@ Music_MeetProfOak_branch_b0d8: note __, 1 loopchannel 2, Music_MeetProfOak_branch_b0d8 -Music_MeetProfOak_branch_b0ed: +Music_MeetProfOak_branch_b0ed:: note F#, 1 note __, 1 note A_, 1 @@ -407,7 +407,7 @@ Music_MeetProfOak_branch_b0ed: note __, 1 loopchannel 2, Music_MeetProfOak_branch_b0ed -Music_MeetProfOak_branch_b101: +Music_MeetProfOak_branch_b101:: note G#, 1 note __, 1 note B_, 1 @@ -426,4 +426,3 @@ Music_MeetProfOak_branch_b101: note __, 1 loopchannel 2, Music_MeetProfOak_branch_b101 loopchannel 0, Music_MeetProfOak_branch_b0bc -; 0xb119 \ No newline at end of file diff --git a/crysaudio/music/RBY/meetrival.asm b/crysaudio/music/RBY/meetrival.asm index 01cac238..baca30e4 100644 --- a/crysaudio/music/RBY/meetrival.asm +++ b/crysaudio/music/RBY/meetrival.asm @@ -1,25 +1,26 @@ -Music_MeetRival: - dbw $80, Music_MeetRival_Ch1 - dbw $01, Music_MeetRival_Ch2 - dbw $02, Music_MeetRival_Ch3 -Music_FarewellRival: - dbw $80, Music_FarewellRival_Ch1 - dbw $01, Music_FarewellRival_Ch2 - dbw $02, Music_FarewellRival_Ch3 +Music_MeetRival:: + musicheader 3, 1, Music_MeetRival_Ch0 + musicheader 1, 2, Music_MeetRival_Ch1 + musicheader 1, 3, Music_MeetRival_Ch2 -Music_MeetRival_branch_b119: +Music_FarewellRival: + musicheader 3, 1, Music_MeetRival_branch_b1a2 + musicheader 1, 2, Music_MeetRival_branch_b21d + musicheader 1, 3, Music_MeetRival_branch_b2b5 + +Music_MeetRival_branch_b119:: tempo 100 loopchannel 0, Music_MeetRival_branch_b123 -Music_MeetRival_Ch1: ; b120 (2:7120) +Music_MeetRival_Ch0:: tempo 112 -Music_MeetRival_branch_b123: - volume 119 +Music_MeetRival_branch_b123:: + volume $77 dutycycle 3 - vibrato 6, 52 - - notetype 12, 179 + vibrato 6, $34 + ;toggleperfectpitch + notetype 12, $b3 octave 4 note D_, 1 note C#, 1 @@ -40,7 +41,7 @@ Music_MeetRival_branch_b123: note G_, 2 note A_, 2 -Music_MeetRival_branch_b140: +Music_MeetRival_branch_b140:: note B_, 4 note A#, 2 note A_, 4 @@ -113,7 +114,7 @@ Music_MeetRival_branch_b140: note A#, 2 octave 4 note C_, 2 - notetype 12, 183 + notetype 12, $b7 octave 3 note G_, 4 note D_, 2 @@ -122,25 +123,25 @@ Music_MeetRival_branch_b140: note D_, 2 note __, 4 note D_, 4 - notetype 12, 179 + notetype 12, $b3 note A_, 2 note G_, 2 note A_, 2 loopchannel 0, Music_MeetRival_branch_b140 -Music_MeetRival_branch_b19b: +Music_MeetRival_branch_b19b:: tempo 100 loopchannel 0, Music_MeetRival_branch_b1a5 -Music_FarewellRival_Ch1: +Music_MeetRival_branch_b1a2:: tempo 112 -Music_MeetRival_branch_b1a5: - volume 119 +Music_MeetRival_branch_b1a5:: + volume $77 dutycycle 3 - vibrato 6, 52 - - notetype 12, 179 + vibrato 6, $34 + ;toggleperfectpitch + notetype 12, $b3 octave 3 note D_, 1 note __, 3 @@ -152,10 +153,10 @@ Music_MeetRival_branch_b1a5: loopchannel 0, Music_MeetRival_branch_b140 -Music_MeetRival_Ch2: ; b1bb (2:71bb) +Music_MeetRival_Ch1:: dutycycle 3 - vibrato 10, 38 - notetype 12, 199 + vibrato 10, $26 + notetype 12, $c7 octave 4 note B_, 1 note A#, 1 @@ -179,8 +180,8 @@ Music_MeetRival_Ch2: ; b1bb (2:71bb) note F_, 2 note F#, 2 -Music_MeetRival_branch_b1d8: - notetype 12, 199 +Music_MeetRival_branch_b1d8:: + notetype 12, $c7 note G_, 4 note D_, 2 note F_, 6 @@ -206,18 +207,18 @@ Music_MeetRival_branch_b1d8: note B_, 2 octave 5 note C_, 2 - notetype 12, 176 + notetype 12, $b0 note D_, 16 - notetype 12, 181 + notetype 12, $b5 note D_, 6 - notetype 12, 199 + notetype 12, $c7 note F_, 4 note D_, 2 note C_, 2 note D_, 2 - notetype 12, 176 + notetype 12, $b0 note C_, 8 - notetype 12, 199 + notetype 12, $c7 note C_, 8 octave 4 note C_, 2 @@ -225,9 +226,9 @@ Music_MeetRival_branch_b1d8: note A#, 4 note G_, 2 note F_, 2 - notetype 12, 176 + notetype 12, $b0 note G_, 16 - notetype 12, 179 + notetype 12, $b3 note G_, 2 octave 3 note G_, 2 @@ -239,10 +240,10 @@ Music_MeetRival_branch_b1d8: note F#, 2 loopchannel 0, Music_MeetRival_branch_b1d8 -Music_FarewellRival_Ch2: +Music_MeetRival_branch_b21d:: dutycycle 3 - vibrato 10, 38 - notetype 12, 199 + vibrato 10, $26 + notetype 12, $c7 octave 3 note G_, 1 note __, 3 @@ -257,8 +258,8 @@ Music_FarewellRival_Ch2: loopchannel 0, Music_MeetRival_branch_b1d8 -Music_MeetRival_Ch3: ; b233 (2:7233) - notetype 12, 20 +Music_MeetRival_Ch2:: + notetype 12, $14 octave 5 note D_, 2 note __, 2 @@ -282,7 +283,7 @@ Music_MeetRival_Ch3: ; b233 (2:7233) note G_, 1 note __, 1 -Music_MeetRival_branch_b24b: +Music_MeetRival_branch_b24b:: note G_, 2 octave 5 note D_, 2 @@ -387,8 +388,8 @@ Music_MeetRival_branch_b24b: note D_, 2 loopchannel 0, Music_MeetRival_branch_b24b -Music_FarewellRival_Ch3: - notetype 12, 20 +Music_MeetRival_branch_b2b5:: + notetype 12, $14 octave 4 note G_, 1 note __, 3 @@ -403,4 +404,3 @@ Music_FarewellRival_Ch3: note G_, 1 note __, 1 loopchannel 0, Music_MeetRival_branch_b24b -; 0xb2c8 \ No newline at end of file diff --git a/crysaudio/music/RBY/museumguy.asm b/crysaudio/music/RBY/museumguy.asm index dc634208..ac32e923 100644 --- a/crysaudio/music/RBY/museumguy.asm +++ b/crysaudio/music/RBY/museumguy.asm @@ -1,15 +1,15 @@ -Music_MuseumGuy: - dbw $C0, Music_MuseumGuy_Ch1 - dbw $01, Music_MuseumGuy_Ch2 - dbw $02, Music_MuseumGuy_Ch3 - dbw $03, Music_MuseumGuy_Ch4 +Music_MuseumGuy:: + musicheader 4, 1, Music_MuseumGuy_Ch0 + musicheader 1, 2, Music_MuseumGuy_Ch1 + musicheader 1, 3, Music_MuseumGuy_Ch2 + musicheader 1, 4, Music_MuseumGuy_Ch3 -Music_MuseumGuy_Ch1: ; adae (2:6dae) +Music_MuseumGuy_Ch0:: tempo 128 - volume 119 + volume $77 dutycycle 2 - - notetype 12, 177 + ;toggleperfectpitch + notetype 12, $b1 octave 3 note B_, 2 note A_, 2 @@ -35,7 +35,7 @@ Music_MuseumGuy_Ch1: ; adae (2:6dae) note E_, 2 note E_, 6 -Music_MuseumGuy_branch_add6: +Music_MuseumGuy_branch_add6:: callchannel Music_MuseumGuy_branch_ade7 callchannel Music_MuseumGuy_branch_adec callchannel Music_MuseumGuy_branch_ade7 @@ -45,14 +45,14 @@ Music_MuseumGuy_branch_add6: note E_, 6 loopchannel 0, Music_MuseumGuy_branch_add6 -Music_MuseumGuy_branch_ade7: +Music_MuseumGuy_branch_ade7:: note E_, 2 note E_, 6 note F#, 2 note F#, 6 endchannel -Music_MuseumGuy_branch_adec: +Music_MuseumGuy_branch_adec:: note E_, 2 note E_, 6 note D_, 2 @@ -60,9 +60,9 @@ Music_MuseumGuy_branch_adec: endchannel -Music_MuseumGuy_Ch2: ; adf1 (2:6df1) +Music_MuseumGuy_Ch1:: dutycycle 2 - notetype 12, 193 + notetype 12, $c1 octave 4 note E_, 2 note D_, 2 @@ -113,21 +113,21 @@ Music_MuseumGuy_Ch2: ; adf1 (2:6df1) note A_, 2 note A_, 4 -Music_MuseumGuy_branch_ae26: +Music_MuseumGuy_branch_ae26:: octave 3 note A_, 2 octave 4 note C#, 2 note E_, 3 - notetype 12, 129 + notetype 12, $81 note E_, 1 - notetype 12, 193 + notetype 12, $c1 note D_, 2 note F#, 2 note A_, 3 - notetype 12, 145 + notetype 12, $91 note A_, 1 - notetype 12, 193 + notetype 12, $c1 octave 3 note A_, 2 octave 4 @@ -139,31 +139,31 @@ Music_MuseumGuy_branch_ae26: octave 3 note B_, 1 note B_, 3 - notetype 12, 161 + notetype 12, $a1 note G#, 1 - notetype 12, 193 + notetype 12, $c1 note A_, 2 octave 4 note C#, 2 note E_, 3 - notetype 12, 145 + notetype 12, $91 note E_, 1 - notetype 12, 193 + notetype 12, $c1 note D_, 2 note F#, 2 note A_, 3 - notetype 12, 129 + notetype 12, $81 note A_, 1 - notetype 12, 193 + notetype 12, $c1 note G#, 2 note E_, 1 - notetype 12, 129 + notetype 12, $81 note E_, 1 - notetype 12, 193 + notetype 12, $c1 note F#, 2 - notetype 12, 129 + notetype 12, $81 note F#, 1 - notetype 12, 193 + notetype 12, $c1 note G#, 1 note A_, 2 note A_, 2 @@ -171,8 +171,8 @@ Music_MuseumGuy_branch_ae26: loopchannel 0, Music_MuseumGuy_branch_ae26 -Music_MuseumGuy_Ch3: ; ae6e (2:6e6e) - notetype 12, 16 +Music_MuseumGuy_Ch2:: + notetype 12, $10 note __, 16 octave 4 note E_, 1 @@ -200,7 +200,7 @@ Music_MuseumGuy_Ch3: ; ae6e (2:6e6e) note A_, 1 note __, 3 -Music_MuseumGuy_branch_ae8e: +Music_MuseumGuy_branch_ae8e:: callchannel Music_MuseumGuy_branch_aec1 note __, 3 octave 6 @@ -237,7 +237,7 @@ Music_MuseumGuy_branch_ae8e: note __, 3 loopchannel 0, Music_MuseumGuy_branch_ae8e -Music_MuseumGuy_branch_aeb8: +Music_MuseumGuy_branch_aeb8:: note A_, 1 note __, 1 note A_, 1 @@ -248,7 +248,7 @@ Music_MuseumGuy_branch_aeb8: note __, 5 endchannel -Music_MuseumGuy_branch_aec1: +Music_MuseumGuy_branch_aec1:: octave 6 note C#, 1 note __, 1 @@ -267,9 +267,9 @@ Music_MuseumGuy_branch_aec1: endchannel -Music_MuseumGuy_Ch4: ; aed1 (2:6ed1) - notetype 12 +Music_MuseumGuy_Ch3:: togglenoise 1 + notetype 12 note __, 16 note __, 16 note __, 16 @@ -282,7 +282,7 @@ Music_MuseumGuy_Ch4: ; aed1 (2:6ed1) note A#, 1 note A#, 1 -Music_MuseumGuy_branch_aee1: +Music_MuseumGuy_branch_aee1:: note A_, 4 note A_, 6 note A_, 2 @@ -342,4 +342,3 @@ Music_MuseumGuy_branch_aee1: note A#, 1 note A#, 1 loopchannel 0, Music_MuseumGuy_branch_aee1 -; 0xaf59 \ No newline at end of file diff --git a/crysaudio/music/RBY/oakslab.asm b/crysaudio/music/RBY/oakslab.asm index 4c9d3446..7355a26a 100644 --- a/crysaudio/music/RBY/oakslab.asm +++ b/crysaudio/music/RBY/oakslab.asm @@ -1,15 +1,15 @@ -Music_OaksLab: - dbw $80, Music_OaksLab_Ch1 - dbw $01, Music_OaksLab_Ch2 - dbw $02, Music_OaksLab_Ch3 +Music_OaksLab:: + musicheader 3, 1, Music_OaksLab_Ch0 + musicheader 1, 2, Music_OaksLab_Ch1 + musicheader 1, 3, Music_OaksLab_Ch2 -Music_OaksLab_Ch1: ; 7eeb9 (1f:6eb9) +Music_OaksLab_Ch0:: tempo 140 - volume 119 + volume $77 dutycycle 3 - vibrato 16, 18 - - notetype 12, 179 + vibrato 16, $12 + ;toggleperfectpitch + notetype 12, $b3 octave 2 note B_, 1 octave 3 @@ -21,7 +21,7 @@ Music_OaksLab_Ch1: ; 7eeb9 (1f:6eb9) note A_, 1 note B_, 1 -Music_OaksLab_branch_7eed0: +Music_OaksLab_branch_7eed0:: octave 4 note C#, 4 octave 3 @@ -74,10 +74,10 @@ Music_OaksLab_branch_7eed0: loopchannel 0, Music_OaksLab_branch_7eed0 -Music_OaksLab_Ch2: ; 7ef05 (1f:6f05) +Music_OaksLab_Ch1:: dutycycle 3 - vibrato 10, 37 - notetype 12, 196 + vibrato 10, $25 + notetype 12, $c4 octave 3 note G#, 1 note A_, 1 @@ -89,7 +89,7 @@ Music_OaksLab_Ch2: ; 7ef05 (1f:6f05) note F#, 1 note G#, 1 -Music_OaksLab_branch_7ef16: +Music_OaksLab_branch_7ef16:: note A_, 6 note G#, 1 note F#, 1 @@ -149,8 +149,8 @@ Music_OaksLab_branch_7ef16: loopchannel 0, Music_OaksLab_branch_7ef16 -Music_OaksLab_Ch3: ; 7ef52 (1f:6f52) - notetype 12, 17 +Music_OaksLab_Ch2:: + notetype 12, $11 note __, 2 octave 4 note G#, 1 @@ -160,7 +160,7 @@ Music_OaksLab_Ch3: ; 7ef52 (1f:6f52) note E_, 1 note __, 1 -Music_OaksLab_branch_7ef5c: +Music_OaksLab_branch_7ef5c:: note C#, 1 note __, 1 note A_, 1 @@ -396,4 +396,3 @@ Music_OaksLab_branch_7ef5c: note E_, 1 note __, 3 loopchannel 0, Music_OaksLab_branch_7ef5c -; 0x7f04a \ No newline at end of file diff --git a/crysaudio/music/RBY/pallettown.asm b/crysaudio/music/RBY/pallettown.asm index 64dfe7d4..0254dc21 100644 --- a/crysaudio/music/RBY/pallettown.asm +++ b/crysaudio/music/RBY/pallettown.asm @@ -1,15 +1,15 @@ -Music_RBYPalletTown: - dbw $80, Music_RBYPalletTown_Ch1 - dbw $01, Music_RBYPalletTown_Ch2 - dbw $02, Music_RBYPalletTown_Ch3 +Music_RBYPalletTown:: + musicheader 3, 1, Music_RBYPalletTown_Ch0 + musicheader 1, 2, Music_RBYPalletTown_Ch1 + musicheader 1, 3, Music_RBYPalletTown_Ch2 -Music_RBYPalletTown_Ch1: ; a7c5 (2:67c5) +Music_RBYPalletTown_Ch0:: tempo 160 - volume 119 + volume $77 dutycycle 2 - notetype 12, 195 + notetype 12, $c3 -Music_RBYPalletTown_branch_a7ce: +Music_RBYPalletTown_branch_a7ce:: octave 3 note B_, 4 octave 4 @@ -88,7 +88,7 @@ Music_RBYPalletTown_branch_a7ce: note A_, 2 note F#, 2 note A_, 2 - notetype 12, 179 + notetype 12, $b3 note B_, 2 note G_, 2 note D_, 2 @@ -153,26 +153,26 @@ Music_RBYPalletTown_branch_a7ce: endchannel -Music_RBYPalletTown_Ch2: ; a85f (2:685f) +Music_RBYPalletTown_Ch1:: dutycycle 2 -Music_RBYPalletTown_branch_a861: - notetype 12, 211 +Music_RBYPalletTown_branch_a861:: + notetype 12, $d3 octave 5 note D_, 2 - notetype 12, 163 + notetype 12, $a3 note C_, 2 - notetype 12, 211 + notetype 12, $d3 octave 4 note B_, 2 - notetype 12, 179 + notetype 12, $b3 note A_, 2 - notetype 12, 211 + notetype 12, $d3 octave 5 note G_, 2 - notetype 12, 179 + notetype 12, $b3 note E_, 2 - notetype 12, 211 + notetype 12, $d3 note F#, 2 note E_, 2 note D_, 6 @@ -196,21 +196,21 @@ Music_RBYPalletTown_branch_a861: note A_, 8 octave 5 note D_, 2 - notetype 12, 163 + notetype 12, $a3 note C_, 2 - notetype 12, 211 + notetype 12, $d3 octave 4 note B_, 2 - notetype 12, 179 + notetype 12, $b3 octave 5 note D_, 2 - notetype 12, 211 + notetype 12, $d3 note G_, 2 - notetype 12, 163 + notetype 12, $a3 note F#, 2 - notetype 12, 179 + notetype 12, $b3 note F#, 2 - notetype 12, 211 + notetype 12, $d3 note G_, 2 note E_, 6 note D_, 2 @@ -267,11 +267,11 @@ Music_RBYPalletTown_branch_a861: endchannel -Music_RBYPalletTown_Ch3: ; a8de (2:68de) - vibrato 24, 40 - notetype 12, 18 +Music_RBYPalletTown_Ch2:: + vibrato 24, $28 + notetype 12, $12 -Music_RBYPalletTown_branch_a8e3: +Music_RBYPalletTown_branch_a8e3:: octave 4 note G_, 6 note E_, 6 @@ -317,4 +317,3 @@ Music_RBYPalletTown_branch_a8e3: note F#, 8 loopchannel 0, Music_RBYPalletTown_branch_a8e3 endchannel -; 0xa913 \ No newline at end of file diff --git a/crysaudio/music/RBY/pkmnhealed.asm b/crysaudio/music/RBY/pkmnhealed.asm index 7016a514..09f69cc1 100644 --- a/crysaudio/music/RBY/pkmnhealed.asm +++ b/crysaudio/music/RBY/pkmnhealed.asm @@ -1,45 +1,46 @@ -Music_PkmnHealed: - dbw $80, Music_PkmnHealed_Ch1 - dbw $01, Music_PkmnHealed_Ch2 - dbw $02, Music_PkmnHealed_Ch3 +Music_PkmnHealed:: + musicheader 3, 1, Music_PkmnHealed_Ch0 + musicheader 1, 2, Music_PkmnHealed_Ch1 + musicheader 1, 3, Music_PkmnHealed_Ch2 -Music_PkmnHealed_Ch1: ; 9ba3 (2:5ba3) +Music_PkmnHealed_Ch0:: tempo 144 - volume 119 + volume $77 dutycycle 2 - - notetype 12, 129 + ;toggleperfectpitch + notetype 12, $81 note __, 2 - slidepitchto 1, 4, B_ + octave 3 + slidepitchto 1, 4, A# note B_, 2 - slidepitchto 1, 5, E_ + slidepitchto 1, 5, D# note B_, 2 - slidepitchto 1, 4, E_ + slidepitchto 1, 4, D# note E_, 2 note __, 4 - slidepitchto 1, 3, B_ + slidepitchto 1, 3, A# note E_, 4 - slidepitchto 1, 4, B_ + slidepitchto 1, 4, A# note B_, 4 endchannel -Music_PkmnHealed_Ch2: ; 9bc4 (2:5bc4) +Music_PkmnHealed_Ch1:: dutycycle 2 - notetype 12, 195 + notetype 12, $c3 octave 4 note B_, 4 note B_, 4 note B_, 2 note G#, 2 - notetype 12, 196 + notetype 12, $c4 octave 5 note E_, 8 endchannel -Music_PkmnHealed_Ch3: ; 9bd2 (2:5bd2) - notetype 12, 16 +Music_PkmnHealed_Ch2:: + notetype 12, $10 octave 4 note E_, 2 note __, 2 @@ -50,4 +51,3 @@ Music_PkmnHealed_Ch3: ; 9bd2 (2:5bd2) note E_, 6 note __, 2 endchannel -; 0x9bde \ No newline at end of file diff --git a/crysaudio/music/RBY/pokecenter.asm b/crysaudio/music/RBY/pokecenter.asm index 95b6cfd2..eb3b9405 100644 --- a/crysaudio/music/RBY/pokecenter.asm +++ b/crysaudio/music/RBY/pokecenter.asm @@ -1,22 +1,22 @@ -Music_Pokecenter: - dbw $80, Music_Pokecenter_Ch1 - dbw $01, Music_Pokecenter_Ch2 - dbw $02, Music_Pokecenter_Ch3 +Music_Pokecenter:: + musicheader 3, 1, Music_Pokecenter_Ch0 + musicheader 1, 2, Music_Pokecenter_Ch1 + musicheader 1, 3, Music_Pokecenter_Ch2 -Music_Pokecenter_Ch1: ; be56 (2:7e56) +Music_Pokecenter_Ch0:: tempo 144 - volume 119 + volume $77 dutycycle 3 - vibrato 10, 34 - + vibrato 10, $22 + ;toggleperfectpitch -Music_Pokecenter_branch_be61: - notetype 12, 163 +Music_Pokecenter_branch_be61:: + notetype 12, $a3 octave 3 note F#, 2 note F_, 2 note F#, 2 - notetype 12, 181 + notetype 12, $b5 octave 4 note D_, 4 note C#, 2 @@ -31,11 +31,11 @@ Music_Pokecenter_branch_be61: note F#, 2 note G_, 2 note A_, 2 - notetype 12, 163 + notetype 12, $a3 note A_, 2 note E_, 2 note A_, 2 - notetype 12, 181 + notetype 12, $b5 octave 4 note C#, 4 octave 3 @@ -52,11 +52,11 @@ Music_Pokecenter_branch_be61: octave 3 note B_, 2 note A_, 2 - notetype 12, 163 + notetype 12, $a3 note F#, 2 note F_, 2 note F#, 2 - notetype 12, 181 + notetype 12, $b5 octave 4 note D_, 4 note C#, 2 @@ -71,11 +71,11 @@ Music_Pokecenter_branch_be61: note F#, 2 note G_, 2 note A_, 2 - notetype 12, 163 + notetype 12, $a3 note A_, 2 note E_, 2 note A_, 2 - notetype 12, 181 + notetype 12, $b5 octave 4 note C#, 4 octave 3 @@ -154,13 +154,13 @@ Music_Pokecenter_branch_be61: loopchannel 0, Music_Pokecenter_branch_be61 -Music_Pokecenter_Ch2: ; bef9 (2:7ef9) - vibrato 8, 37 +Music_Pokecenter_Ch1:: + vibrato 8, $25 -Music_Pokecenter_branch_befc: +Music_Pokecenter_branch_befc:: callchannel Music_Pokecenter_branch_bf4e dutycycle 3 - notetype 12, 165 + notetype 12, $a5 octave 3 note A_, 4 note E_, 4 @@ -168,25 +168,25 @@ Music_Pokecenter_branch_befc: note D_, 2 note F#, 6 dutycycle 3 - notetype 12, 165 + notetype 12, $a5 octave 3 note A_, 4 note E_, 4 callchannel Music_Pokecenter_branch_bf4e dutycycle 3 - notetype 12, 165 + notetype 12, $a5 octave 3 note A_, 4 note E_, 4 callchannel Music_Pokecenter_branch_bf60 note D_, 8 dutycycle 3 - notetype 12, 165 + notetype 12, $a5 octave 3 note D_, 4 note E_, 4 dutycycle 2 - notetype 12, 198 + notetype 12, $c6 octave 4 note F#, 8 note A_, 8 @@ -220,16 +220,16 @@ Music_Pokecenter_branch_befc: note D_, 8 loopchannel 0, Music_Pokecenter_branch_befc -Music_Pokecenter_branch_bf4e: +Music_Pokecenter_branch_bf4e:: dutycycle 2 - notetype 12, 194 + notetype 12, $c2 octave 4 note D_, 2 octave 3 note A_, 2 octave 4 note D_, 2 - notetype 12, 195 + notetype 12, $c3 note A_, 4 note G_, 4 note F#, 2 @@ -237,26 +237,26 @@ Music_Pokecenter_branch_bf4e: note C#, 6 endchannel -Music_Pokecenter_branch_bf60: +Music_Pokecenter_branch_bf60:: dutycycle 2 - notetype 12, 194 + notetype 12, $c2 octave 4 note C#, 2 octave 3 note A_, 2 octave 4 note C#, 2 - notetype 12, 195 + notetype 12, $c3 note F#, 4 note E_, 4 note C#, 2 endchannel -Music_Pokecenter_Ch3: ; bf70 (2:7f70) - notetype 12, 16 +Music_Pokecenter_Ch2:: + notetype 12, $10 -Music_Pokecenter_branch_bf72: +Music_Pokecenter_branch_bf72:: octave 4 note D_, 2 note F#, 2 @@ -346,7 +346,7 @@ Music_Pokecenter_branch_bf72: note E_, 2 loopchannel 0, Music_Pokecenter_branch_bf72 -Music_Pokecenter_branch_bfd9: +Music_Pokecenter_branch_bfd9:: note E_, 2 note A_, 2 note E_, 2 @@ -357,7 +357,7 @@ Music_Pokecenter_branch_bfd9: note A_, 2 endchannel -Music_Pokecenter_branch_bfe2: +Music_Pokecenter_branch_bfe2:: note E_, 2 note A_, 2 note E_, 2 @@ -368,7 +368,7 @@ Music_Pokecenter_branch_bfe2: note A_, 2 endchannel -Music_Pokecenter_branch_bfeb: +Music_Pokecenter_branch_bfeb:: note F#, 2 note A_, 2 note F#, 2 @@ -378,4 +378,3 @@ Music_Pokecenter_branch_bfeb: note F#, 2 note A_, 2 endchannel -; 0xbff4 \ No newline at end of file diff --git a/crysaudio/music/RBY/pokemontower.asm b/crysaudio/music/RBY/pokemontower.asm index da595df6..78727e0d 100644 --- a/crysaudio/music/RBY/pokemontower.asm +++ b/crysaudio/music/RBY/pokemontower.asm @@ -1,21 +1,21 @@ -Music_PokemonTower: - dbw $80, Music_PokemonTower_Ch1 - dbw $01, Music_PokemonTower_Ch2 - dbw $02, Music_PokemonTower_Ch3 +Music_PokemonTower:: + musicheader 3, 1, Music_PokemonTower_Ch0 + musicheader 1, 2, Music_PokemonTower_Ch1 + musicheader 1, 3, Music_PokemonTower_Ch2 -Music_PokemonTower_Ch1: ; 7f04a (1f:704a) +Music_PokemonTower_Ch0:: tempo 152 - volume 119 + volume $77 dutycycle 3 - - vibrato 12, 35 - notetype 12, 128 + ;toggleperfectpitch + vibrato 12, $23 + notetype 12, $80 note __, 4 octave 4 note B_, 12 -Music_PokemonTower_branch_7f05a: - notetype 12, 180 +Music_PokemonTower_branch_7f05a:: + notetype 12, $b4 octave 4 note G_, 1 note __, 7 @@ -89,10 +89,10 @@ Music_PokemonTower_branch_7f05a: note __, 7 note C_, 1 note __, 3 - notetype 12, 132 + notetype 12, $84 note C_, 1 note __, 3 - notetype 12, 180 + notetype 12, $b4 note D_, 1 note __, 7 note D_, 1 @@ -102,7 +102,7 @@ Music_PokemonTower_branch_7f05a: note __, 7 note A_, 1 note __, 7 - notetype 12, 167 + notetype 12, $a7 note B_, 8 note B_, 8 octave 4 @@ -110,13 +110,13 @@ Music_PokemonTower_branch_7f05a: note C_, 8 note C#, 8 note C#, 8 - notetype 12, 166 + notetype 12, $a6 note D_, 16 note __, 16 note __, 16 note __, 16 note __, 16 - notetype 12, 146 + notetype 12, $92 note B_, 4 octave 5 note E_, 4 @@ -145,27 +145,27 @@ Music_PokemonTower_branch_7f05a: loopchannel 0, Music_PokemonTower_branch_7f05a -Music_PokemonTower_Ch2: ; 7f0e3 (1f:70e3) - vibrato 20, 52 +Music_PokemonTower_Ch1:: + vibrato 20, $34 dutycycle 3 - notetype 12, 160 + notetype 12, $a0 octave 5 note C_, 12 octave 4 note E_, 4 -Music_PokemonTower_branch_7f0ee: - notetype 12, 193 +Music_PokemonTower_branch_7f0ee:: + notetype 12, $c1 octave 5 note C_, 8 octave 4 note B_, 4 - notetype 12, 196 + notetype 12, $c4 note G_, 1 note F#, 1 note E_, 1 note D#, 1 - notetype 12, 176 + notetype 12, $b0 note G_, 8 octave 5 note C_, 8 @@ -176,18 +176,18 @@ Music_PokemonTower_branch_7f0ee: note G_, 4 octave 5 note C_, 8 - notetype 12, 183 + notetype 12, $b7 note C_, 8 - notetype 12, 194 + notetype 12, $c2 octave 4 note G_, 1 note F#, 1 note E_, 1 note __, 1 - notetype 12, 150 + notetype 12, $96 octave 3 note G_, 4 - notetype 12, 199 + notetype 12, $c7 note G_, 4 note B_, 4 note G_, 4 @@ -196,13 +196,13 @@ Music_PokemonTower_branch_7f0ee: note C_, 4 octave 3 note B_, 4 - notetype 12, 176 + notetype 12, $b0 octave 4 note C_, 16 note E_, 8 - notetype 12, 183 + notetype 12, $b7 note E_, 12 - notetype 12, 197 + notetype 12, $c5 octave 5 note C_, 4 octave 4 @@ -212,39 +212,39 @@ Music_PokemonTower_branch_7f0ee: note G_, 4 note F#, 4 note E_, 4 - notetype 12, 176 + notetype 12, $b0 note F#, 12 note G_, 4 - notetype 12, 176 + notetype 12, $b0 note F#, 8 - notetype 12, 183 + notetype 12, $b7 note F#, 8 - notetype 12, 176 + notetype 12, $b0 note B_, 4 note G_, 4 note F#, 4 note E_, 4 note B_, 16 - notetype 12, 176 + notetype 12, $b0 octave 5 note C_, 4 octave 4 note G_, 4 note F#, 4 note E_, 4 - notetype 12, 144 + notetype 12, $90 octave 5 note C_, 16 - notetype 12, 176 + notetype 12, $b0 note D_, 4 octave 4 note A_, 4 note G#, 4 note F#, 4 - notetype 12, 47 + notetype 12, $2f octave 5 note D_, 16 - notetype 12, 192 + notetype 12, $c0 note E_, 4 octave 4 note B_, 4 @@ -266,20 +266,20 @@ Music_PokemonTower_branch_7f0ee: note F#, 4 note E_, 4 note D_, 4 - notetype 12, 176 + notetype 12, $b0 note C_, 8 - notetype 12, 144 + notetype 12, $90 note C_, 8 - notetype 12, 128 + notetype 12, $80 note C_, 8 - notetype 12, 112 + notetype 12, $70 note C_, 8 - notetype 12, 96 + notetype 12, $60 note C_, 8 - notetype 12, 103 + notetype 12, $67 note C_, 8 note __, 16 - notetype 12, 160 + notetype 12, $a0 octave 5 note G_, 16 octave 6 @@ -291,20 +291,20 @@ Music_PokemonTower_branch_7f0ee: note G_, 8 octave 6 note C_, 16 - vibrato 0, 52 - notetype 12, 167 + vibrato 0, $34 + notetype 12, $a7 note C_, 16 loopchannel 0, Music_PokemonTower_branch_7f0ee -Music_PokemonTower_Ch3: ; 7f19a (1f:719a) - vibrato 4, 17 - notetype 12, 19 +Music_PokemonTower_Ch2:: + vibrato 4, $11 + notetype 12, $13 note __, 8 octave 5 note G_, 8 -Music_PokemonTower_branch_7f1a2: +Music_PokemonTower_branch_7f1a2:: note E_, 1 note __, 7 note E_, 1 @@ -430,7 +430,7 @@ Music_PokemonTower_branch_7f1a2: note __, 3 note F#, 1 note __, 7 - notetype 12, 19 + notetype 12, $13 octave 6 note E_, 1 note __, 1 @@ -462,4 +462,3 @@ Music_PokemonTower_branch_7f1a2: note D#, 1 note __, 1 loopchannel 0, Music_PokemonTower_branch_7f1a2 -; 0x7f243 \ No newline at end of file diff --git a/crysaudio/music/RBY/routes1.asm b/crysaudio/music/RBY/routes1.asm index 96c21130..398c93cd 100644 --- a/crysaudio/music/RBY/routes1.asm +++ b/crysaudio/music/RBY/routes1.asm @@ -1,18 +1,18 @@ -Music_Routes1: - dbw $C0, Music_Routes1_Ch1 - dbw $01, Music_Routes1_Ch2 - dbw $02, Music_Routes1_Ch3 - dbw $03, Music_Routes1_Ch4 +Music_Routes1:: + musicheader 4, 1, Music_Routes1_Ch0 + musicheader 1, 2, Music_Routes1_Ch1 + musicheader 1, 3, Music_Routes1_Ch2 + musicheader 1, 4, Music_Routes1_Ch3 -Music_Routes1_Ch1: ; 9bde (2:5bde) +Music_Routes1_Ch0:: tempo 152 - volume 119 - vibrato 4, 35 + volume $77 + vibrato 4, $23 dutycycle 2 - + ;toggleperfectpitch -Music_Routes1_branch_9be9: - notetype 12, 161 +Music_Routes1_branch_9be9:: + notetype 12, $a1 note __, 4 octave 4 note D_, 2 @@ -69,12 +69,12 @@ Music_Routes1_branch_9be9: note E_, 2 octave 3 note A_, 2 - notetype 12, 162 + notetype 12, $a2 octave 4 note G_, 4 note E_, 4 note F#, 2 - notetype 12, 161 + notetype 12, $a1 octave 3 note A_, 2 note A_, 6 @@ -112,18 +112,18 @@ Music_Routes1_branch_9be9: endchannel -Music_Routes1_Ch2: ; 9c51 (2:5c51) +Music_Routes1_Ch1:: dutycycle 2 -Music_Routes1_branch_9c53: - notetype 12, 209 +Music_Routes1_branch_9c53:: + notetype 12, $d1 callchannel Music_Routes1_branch_9c65 callchannel Music_Routes1_branch_9c78 callchannel Music_Routes1_branch_9c65 callchannel Music_Routes1_branch_9c8d loopchannel 0, Music_Routes1_branch_9c53 -Music_Routes1_branch_9c65: +Music_Routes1_branch_9c65:: octave 4 note D_, 1 note E_, 1 @@ -144,7 +144,7 @@ Music_Routes1_branch_9c65: note E_, 6 endchannel -Music_Routes1_branch_9c78: +Music_Routes1_branch_9c78:: note C#, 1 note D_, 1 note E_, 2 @@ -167,7 +167,7 @@ Music_Routes1_branch_9c78: note F#, 2 endchannel -Music_Routes1_branch_9c8d: +Music_Routes1_branch_9c8d:: note C#, 1 note D_, 1 note E_, 2 @@ -180,21 +180,21 @@ Music_Routes1_branch_9c8d: note B_, 2 octave 4 note C#, 2 - notetype 12, 210 + notetype 12, $d2 note B_, 4 - notetype 6, 209 + notetype 6, $d1 octave 3 note B_, 1 octave 4 note C#, 1 - notetype 12, 209 + notetype 12, $d1 octave 3 note B_, 1 note A_, 1 octave 4 note C#, 1 note D_, 6 - notetype 12, 210 + notetype 12, $d2 note F#, 1 note G_, 1 note A_, 2 @@ -232,7 +232,7 @@ Music_Routes1_branch_9c8d: note C#, 2 note E_, 2 note D_, 2 - notetype 12, 209 + notetype 12, $d1 octave 4 note D_, 2 note D_, 2 @@ -240,11 +240,11 @@ Music_Routes1_branch_9c8d: endchannel -Music_Routes1_Ch3: ; 9cd8 (2:5cd8) - vibrato 8, 37 - notetype 12, 19 +Music_Routes1_Ch2:: + vibrato 8, $25 + notetype 12, $13 -Music_Routes1_branch_9cdd: +Music_Routes1_branch_9cdd:: note __, 2 octave 4 note D_, 4 @@ -315,10 +315,9 @@ Music_Routes1_branch_9cdd: endchannel -Music_Routes1_Ch4: ; 9d24 (2:5d24) - notetype 12 +Music_Routes1_Ch3:: togglenoise 1 -Music_Routes1_Loop4: + notetype 12 note __, 4 note G_, 2 note __, 2 @@ -408,6 +407,5 @@ Music_Routes1_Loop4: note __, 2 note G_, 2 note G_, 2 - loopchannel 0, Music_Routes1_Loop4 + loopchannel 0, Music_Routes1_Ch3 endchannel -; 0x9db9 \ No newline at end of file diff --git a/crysaudio/music/RBY/routes2.asm b/crysaudio/music/RBY/routes2.asm index 7428d060..6bcc041b 100644 --- a/crysaudio/music/RBY/routes2.asm +++ b/crysaudio/music/RBY/routes2.asm @@ -1,17 +1,17 @@ -Music_Routes2: - dbw $C0, Music_Routes2_Ch1 - dbw $01, Music_Routes2_Ch2 - dbw $02, Music_Routes2_Ch3 - dbw $03, Music_Routes2_Ch4 +Music_Routes2:: + musicheader 4, 1, Music_Routes2_Ch0 + musicheader 1, 2, Music_Routes2_Ch1 + musicheader 1, 3, Music_Routes2_Ch2 + musicheader 1, 4, Music_Routes2_Ch3 -Music_Routes2_Ch1: ; 9db9 (2:5db9) +Music_Routes2_Ch0:: tempo 152 - volume 119 - vibrato 9, 37 + volume $77 + vibrato 9, $25 dutycycle 1 -Music_Routes2_branch_9dc3: - notetype 12, 178 +Music_Routes2_branch_9dc3:: + notetype 12, $b2 octave 2 note B_, 4 octave 3 @@ -44,7 +44,7 @@ Music_Routes2_branch_9dc3: note A_, 2 note G#, 4 note B_, 4 - notetype 8, 178 + notetype 8, $b2 octave 4 note E_, 2 octave 3 @@ -148,12 +148,12 @@ Music_Routes2_branch_9dc3: endchannel -Music_Routes2_Ch2: ; 9e4f (2:5e4f) - vibrato 8, 38 +Music_Routes2_Ch1:: + vibrato 8, $26 dutycycle 3 -Music_Routes2_branch_9e54: - notetype 12, 212 +Music_Routes2_branch_9e54:: + notetype 12, $d4 octave 4 note E_, 6 octave 3 @@ -222,11 +222,11 @@ Music_Routes2_branch_9e54: endchannel -Music_Routes2_Ch3: ; 9e9b (2:5e9b) - vibrato 9, 40 +Music_Routes2_Ch2:: + vibrato 9, $28 -Music_Routes2_branch_9e9e: - notetype 12, 17 +Music_Routes2_branch_9e9e:: + notetype 12, $11 octave 3 note E_, 2 note __, 2 @@ -330,9 +330,8 @@ Music_Routes2_branch_9e9e: endchannel -Music_Routes2_Ch4: ; 9f08 (2:5f08) +Music_Routes2_Ch3:: togglenoise 0 -Music_Routes2_Loop4: notetype 12 note D_, 2 note __, 2 @@ -429,6 +428,5 @@ Music_Routes2_Loop4: note __, 3 note D_, 3 note __, 3 - loopchannel 0, Music_Routes2_Loop4 + loopchannel 0, Music_Routes2_Ch3 endchannel -; 0x9fad \ No newline at end of file diff --git a/crysaudio/music/RBY/routes3.asm b/crysaudio/music/RBY/routes3.asm index 144f4e52..a6c22731 100644 --- a/crysaudio/music/RBY/routes3.asm +++ b/crysaudio/music/RBY/routes3.asm @@ -1,16 +1,16 @@ -Music_Routes3: - dbw $C0, Music_Routes3_Ch1 - dbw $01, Music_Routes3_Ch2 - dbw $02, Music_Routes3_Ch3 - dbw $03, Music_Routes3_Ch4 +Music_Routes3:: + musicheader 4, 1, Music_Routes3_Ch0 + musicheader 1, 2, Music_Routes3_Ch1 + musicheader 1, 3, Music_Routes3_Ch2 + musicheader 1, 4, Music_Routes3_Ch3 -Music_Routes3_Ch1: ; 9fad (2:5fad) +Music_Routes3_Ch0:: tempo 148 - volume 119 + volume $77 dutycycle 3 - vibrato 6, 52 - - notetype 12, 181 + vibrato 6, $34 + ;toggleperfectpitch + notetype 12, $b5 octave 3 note E_, 1 note F#, 1 @@ -21,8 +21,8 @@ Music_Routes3_Ch1: ; 9fad (2:5fad) note __, 16 note __, 15 -Music_Routes3_branch_9fc3: - notetype 12, 181 +Music_Routes3_branch_9fc3:: + notetype 12, $b5 note E_, 6 note D_, 1 note E_, 1 @@ -35,12 +35,12 @@ Music_Routes3_branch_9fc3: note G_, 2 note G_, 2 note A_, 2 - notetype 12, 167 + notetype 12, $a7 note A#, 8 note F_, 8 note D_, 8 note F_, 8 - notetype 12, 181 + notetype 12, $b5 note E_, 6 note D_, 1 note E_, 1 @@ -53,12 +53,12 @@ Music_Routes3_branch_9fc3: note G_, 2 note G_, 2 note A_, 2 - notetype 12, 167 + notetype 12, $a7 note A#, 8 note A#, 8 note D_, 8 note F_, 8 - notetype 12, 181 + notetype 12, $b5 note E_, 4 note E_, 2 note F_, 2 @@ -71,22 +71,22 @@ Music_Routes3_branch_9fc3: octave 3 note B_, 8 note A_, 2 - notetype 8, 195 + notetype 8, $c3 note A_, 4 note F_, 4 note A_, 4 - notetype 8, 79 + notetype 8, $4f note A_, 12 - notetype 8, 144 + notetype 8, $90 note F_, 12 note G_, 12 loopchannel 0, Music_Routes3_branch_9fc3 -Music_Routes3_Ch2: ; a009 (2:6009) - vibrato 8, 35 +Music_Routes3_Ch1:: + vibrato 8, $23 dutycycle 2 - notetype 12, 199 + notetype 12, $c7 octave 3 note G_, 1 note A#, 1 @@ -98,8 +98,8 @@ Music_Routes3_Ch2: ; a009 (2:6009) note __, 15 note __, 16 -Music_Routes3_branch_a01a: - notetype 12, 199 +Music_Routes3_branch_a01a:: + notetype 12, $c7 dutycycle 2 octave 4 note C_, 6 @@ -119,12 +119,12 @@ Music_Routes3_branch_a01a: note C_, 2 note D_, 8 note F_, 8 - notetype 12, 197 + notetype 12, $c5 dutycycle 3 octave 3 note A#, 8 note A_, 8 - notetype 12, 199 + notetype 12, $c7 dutycycle 2 octave 4 note C_, 6 @@ -144,13 +144,13 @@ Music_Routes3_branch_a01a: note C_, 2 note D_, 8 note F_, 8 - notetype 12, 197 + notetype 12, $c5 dutycycle 3 octave 3 note A#, 8 octave 4 note D_, 6 - notetype 12, 199 + notetype 12, $c7 dutycycle 2 note C_, 1 note D_, 1 @@ -169,14 +169,14 @@ Music_Routes3_branch_a01a: note G_, 8 note F_, 1 note E_, 1 - notetype 8, 211 + notetype 8, $d3 note F_, 4 note E_, 4 - notetype 8, 196 + notetype 8, $c4 note C_, 4 - notetype 8, 197 + notetype 8, $c5 note C_, 12 - notetype 12, 160 + notetype 12, $a0 dutycycle 3 octave 3 note A_, 8 @@ -184,9 +184,9 @@ Music_Routes3_branch_a01a: loopchannel 0, Music_Routes3_branch_a01a -Music_Routes3_Ch3: ; a07f (2:607f) - vibrato 4, 16 - notetype 6, 18 +Music_Routes3_Ch2:: + vibrato 4, $10 + notetype 6, $12 octave 4 note G_, 2 note A#, 2 @@ -219,8 +219,8 @@ Music_Routes3_Ch3: ; a07f (2:607f) note __, 2 note G_, 8 -Music_Routes3_branch_a0a3: - notetype 12, 18 +Music_Routes3_branch_a0a3:: + notetype 12, $12 note E_, 1 note __, 1 note G_, 4 @@ -360,9 +360,9 @@ Music_Routes3_branch_a0a3: loopchannel 0, Music_Routes3_branch_a0a3 -Music_Routes3_Ch4: ; a131 (2:6131) - notetype 6 +Music_Routes3_Ch3:: togglenoise 1 + notetype 6 note B_, 1 note B_, 1 note A#, 1 @@ -400,7 +400,7 @@ Music_Routes3_Ch4: ; a131 (2:6131) note A#, 1 note A#, 1 -Music_Routes3_branch_a17a: +Music_Routes3_branch_a17a:: note A_, 12 note A_, 2 note A#, 2 @@ -520,4 +520,3 @@ Music_Routes3_branch_a17a: note A#, 1 note A#, 1 loopchannel 0, Music_Routes3_branch_a17a -; 0xa26a \ No newline at end of file diff --git a/crysaudio/music/RBY/routes4.asm b/crysaudio/music/RBY/routes4.asm index 0be763ea..eef93c63 100644 --- a/crysaudio/music/RBY/routes4.asm +++ b/crysaudio/music/RBY/routes4.asm @@ -1,35 +1,35 @@ -Music_Routes4: - dbw $C0, Music_Routes4_Ch1 - dbw $01, Music_Routes4_Ch2 - dbw $02, Music_Routes4_Ch3 - dbw $03, Music_Routes4_Ch4 +Music_Routes4:: + musicheader 4, 1, Music_Routes4_Ch0 + musicheader 1, 2, Music_Routes4_Ch1 + musicheader 1, 3, Music_Routes4_Ch2 + musicheader 1, 4, Music_Routes4_Ch3 -Music_Routes4_Ch1: ; a26a (2:626a) +Music_Routes4_Ch0:: tempo 148 - volume 119 + volume $77 dutycycle 3 - vibrato 10, 52 - - notetype 12, 162 + vibrato 10, $34 + ;toggleperfectpitch + notetype 12, $a2 octave 2 note G#, 4 note G#, 4 note G#, 4 - notetype 12, 127 + notetype 12, $7f note G#, 4 - notetype 12, 162 + notetype 12, $a2 note G#, 4 note G#, 4 note G#, 4 - notetype 12, 183 + notetype 12, $b7 note B_, 1 octave 3 note E_, 1 note F#, 1 note B_, 1 -Music_Routes4_branch_a28a: - notetype 12, 183 +Music_Routes4_branch_a28a:: + notetype 12, $b7 note B_, 6 note E_, 2 note E_, 4 @@ -40,9 +40,9 @@ Music_Routes4_branch_a28a: octave 3 note B_, 4 note A_, 4 - notetype 12, 177 + notetype 12, $b1 note G#, 3 - notetype 12, 183 + notetype 12, $b7 note E_, 1 note F#, 12 note E_, 8 @@ -59,9 +59,9 @@ Music_Routes4_branch_a28a: note B_, 4 octave 4 note C#, 4 - notetype 12, 177 + notetype 12, $b1 note E_, 3 - notetype 12, 183 + notetype 12, $b7 note D#, 1 note E_, 12 octave 3 @@ -107,7 +107,7 @@ Music_Routes4_branch_a28a: note F#, 2 note G#, 2 note B_, 2 - notetype 8, 181 + notetype 8, $b5 note A_, 4 note G#, 4 note F#, 4 @@ -144,25 +144,25 @@ Music_Routes4_branch_a28a: loopchannel 0, Music_Routes4_branch_a28a -Music_Routes4_Ch2: ; a304 (2:6304) - vibrato 12, 36 +Music_Routes4_Ch1:: + vibrato 12, $24 dutycycle 1 - notetype 12, 146 + notetype 12, $92 octave 3 note E_, 3 note F#, 1 - notetype 12, 144 + notetype 12, $90 note E_, 12 - notetype 12, 146 + notetype 12, $92 octave 2 note B_, 3 octave 3 note C_, 1 - notetype 12, 144 + notetype 12, $90 octave 2 note B_, 8 dutycycle 3 - notetype 12, 199 + notetype 12, $c7 octave 3 note E_, 1 note F#, 1 @@ -170,8 +170,8 @@ Music_Routes4_Ch2: ; a304 (2:6304) octave 4 note D#, 1 -Music_Routes4_branch_a325: - notetype 12, 199 +Music_Routes4_branch_a325:: + notetype 12, $c7 note E_, 6 octave 3 note B_, 2 @@ -185,17 +185,17 @@ Music_Routes4_branch_a325: note A_, 1 note G#, 1 note F#, 1 - notetype 12, 194 + notetype 12, $c2 note G#, 3 note E_, 1 - notetype 12, 160 + notetype 12, $a0 octave 3 note B_, 12 dutycycle 0 - notetype 12, 194 + notetype 12, $c2 octave 2 note B_, 3 - notetype 12, 199 + notetype 12, $c7 octave 3 note C_, 1 octave 2 @@ -219,83 +219,83 @@ Music_Routes4_branch_a325: octave 4 note B_, 1 note A_, 1 - notetype 12, 194 + notetype 12, $c2 note B_, 3 - notetype 12, 199 + notetype 12, $c7 note A_, 1 - notetype 12, 176 + notetype 12, $b0 note G#, 6 - notetype 12, 144 + notetype 12, $90 note G#, 6 - notetype 12, 112 + notetype 12, $70 note G#, 6 - notetype 12, 111 + notetype 12, $6f note G#, 6 - notetype 12, 199 + notetype 12, $c7 note G#, 4 - notetype 8, 195 + notetype 8, $c3 note A_, 4 note G#, 4 note F#, 4 - notetype 8, 144 + notetype 8, $90 note F#, 6 - notetype 8, 127 + notetype 8, $7f note F#, 6 dutycycle 0 - notetype 8, 144 + notetype 8, $90 octave 3 note F#, 4 note E_, 4 note F#, 4 note A_, 6 dutycycle 3 - notetype 8, 199 + notetype 8, $c7 octave 4 note F#, 6 note G#, 4 note F#, 4 - notetype 8, 196 + notetype 8, $c4 note E_, 4 - notetype 8, 160 + notetype 8, $a0 note E_, 12 dutycycle 0 - notetype 8, 144 + notetype 8, $90 octave 3 note E_, 4 note D#, 4 note E_, 4 note G#, 6 dutycycle 3 - notetype 8, 199 + notetype 8, $c7 octave 4 note E_, 6 note F#, 4 note D#, 4 octave 3 note B_, 4 - notetype 8, 160 + notetype 8, $a0 octave 4 note B_, 16 - notetype 8, 167 + notetype 8, $a7 note B_, 8 - notetype 8, 176 + notetype 8, $b0 note A_, 6 - notetype 8, 183 + notetype 8, $b7 note A_, 6 - notetype 12, 167 + notetype 12, $a7 note G#, 1 note F#, 1 - notetype 12, 176 + notetype 12, $b0 note E_, 12 - notetype 12, 160 + notetype 12, $a0 note E_, 8 - notetype 12, 167 + notetype 12, $a7 note E_, 10 loopchannel 0, Music_Routes4_branch_a325 -Music_Routes4_Ch3: ; a3c4 (2:63c4) - notetype 12, 16 +Music_Routes4_Ch2:: + notetype 12, $10 octave 4 note E_, 1 note __, 3 @@ -314,7 +314,7 @@ Music_Routes4_Ch3: ; a3c4 (2:63c4) note D#, 1 note __, 3 -Music_Routes4_branch_a3d7: +Music_Routes4_branch_a3d7:: note E_, 1 note __, 3 note E_, 1 @@ -512,9 +512,9 @@ Music_Routes4_branch_a3d7: loopchannel 0, Music_Routes4_branch_a3d7 -Music_Routes4_Ch4: ; a49d (2:649d) - notetype 12 +Music_Routes4_Ch3:: togglenoise 1 + notetype 12 note __, 16 note __, 12 note B_, 1 @@ -522,7 +522,7 @@ Music_Routes4_Ch4: ; a49d (2:649d) note A#, 1 note A#, 1 -Music_Routes4_branch_a4a8: +Music_Routes4_branch_a4a8:: note A_, 4 note B_, 1 note B_, 1 @@ -686,4 +686,3 @@ Music_Routes4_branch_a4a8: note A_, 2 note A_, 2 loopchannel 0, Music_Routes4_branch_a4a8 -; 0xa5f0 \ No newline at end of file diff --git a/crysaudio/music/RBY/safarizone.asm b/crysaudio/music/RBY/safarizone.asm index 917c6e4b..c44f8e2e 100644 --- a/crysaudio/music/RBY/safarizone.asm +++ b/crysaudio/music/RBY/safarizone.asm @@ -1,38 +1,38 @@ -Music_SafariZone: - dbw $80, Music_SafariZone_Ch1 - dbw $01, Music_SafariZone_Ch2 - dbw $02, Music_SafariZone_Ch3 +Music_SafariZone:: + musicheader 3, 1, Music_SafariZone_Ch0 + musicheader 1, 2, Music_SafariZone_Ch1 + musicheader 1, 3, Music_SafariZone_Ch2 -Music_SafariZone_Ch1: ; bc2e (2:7c2e) +Music_SafariZone_Ch0:: tempo 132 - volume 119 - vibrato 6, 52 - + volume $77 + vibrato 6, $34 + ;toggleperfectpitch dutycycle 2 - notetype 12, 146 + notetype 12, $92 octave 3 - slidepitchto 1, 4, A_ + slidepitchto 1, 4, G# note C_, 1 - slidepitchto 1, 4, A_ + slidepitchto 1, 4, G# note G_, 1 - slidepitchto 1, 4, A_ + slidepitchto 1, 4, G# note C_, 1 - slidepitchto 1, 4, A_ + slidepitchto 1, 4, G# note G_, 1 note __, 4 dutycycle 3 -Music_SafariZone_branch_bc4f: +Music_SafariZone_branch_bc4f:: callchannel Music_SafariZone_branch_bc5f - notetype 12, 164 + notetype 12, $a4 note F#, 4 callchannel Music_SafariZone_branch_bc5f - notetype 12, 164 + notetype 12, $a4 note F#, 4 loopchannel 0, Music_SafariZone_branch_bc4f -Music_SafariZone_branch_bc5f: - notetype 12, 162 +Music_SafariZone_branch_bc5f:: + notetype 12, $a2 octave 3 note C_, 4 note G_, 4 @@ -44,10 +44,10 @@ Music_SafariZone_branch_bc5f: endchannel -Music_SafariZone_Ch2: ; bc6a (2:7c6a) +Music_SafariZone_Ch1:: dutycycle 2 - vibrato 8, 37 - notetype 12, 162 + vibrato 8, $25 + notetype 12, $a2 octave 4 note G_, 1 note D_, 1 @@ -56,17 +56,17 @@ Music_SafariZone_Ch2: ; bc6a (2:7c6a) note __, 4 dutycycle 3 -Music_SafariZone_branch_bc79: +Music_SafariZone_branch_bc79:: callchannel Music_SafariZone_branch_bc89 - notetype 12, 181 + notetype 12, $b5 note A_, 4 callchannel Music_SafariZone_branch_bc89 - notetype 12, 181 + notetype 12, $b5 note B_, 4 loopchannel 0, Music_SafariZone_branch_bc79 -Music_SafariZone_branch_bc89: - notetype 12, 178 +Music_SafariZone_branch_bc89:: + notetype 12, $b2 octave 3 note G_, 4 note D_, 4 @@ -78,11 +78,11 @@ Music_SafariZone_branch_bc89: endchannel -Music_SafariZone_Ch3: ; bc94 (2:7c94) - notetype 12, 16 +Music_SafariZone_Ch2:: + notetype 12, $10 note __, 8 -Music_SafariZone_branch_bc97: +Music_SafariZone_branch_bc97:: callchannel Music_SafariZone_branch_bca5 octave 4 note A_, 4 @@ -91,7 +91,7 @@ Music_SafariZone_branch_bc97: note B_, 4 loopchannel 0, Music_SafariZone_branch_bc97 -Music_SafariZone_branch_bca5: +Music_SafariZone_branch_bca5:: octave 3 note A_, 2 note __, 2 @@ -114,4 +114,3 @@ Music_SafariZone_branch_bca5: note A_, 2 note __, 2 endchannel -; 0xbcbb \ No newline at end of file diff --git a/crysaudio/music/RBY/silphco.asm b/crysaudio/music/RBY/silphco.asm index 19507778..83398588 100644 --- a/crysaudio/music/RBY/silphco.asm +++ b/crysaudio/music/RBY/silphco.asm @@ -1,14 +1,15 @@ -Music_SilphCo: - dbw $80, Music_SilphCo_Ch1 - dbw $01, Music_SilphCo_Ch2 - dbw $02, Music_SilphCo_Ch3 +Music_SilphCo:: + musicheader 3, 1, Music_SilphCo_Ch0 + musicheader 1, 2, Music_SilphCo_Ch1 + musicheader 1, 3, Music_SilphCo_Ch2 -Music_SilphCo_Ch1: ; 7f243 (1f:7243) +Music_SilphCo_Ch0:: tempo 160 - volume 119 + volume $77 dutycycle 3 - vibrato 8, 34 - notetype 6, 179 + ;toggleperfectpitch + vibrato 8, $22 + notetype 6, $b3 octave 2 note E_, 1 note F#, 1 @@ -16,9 +17,9 @@ Music_SilphCo_Ch1: ; 7f243 (1f:7243) note A#, 1 octave 3 note C_, 1 - notetype 6, 160 + notetype 6, $a0 note C_, 12 - notetype 6, 179 + notetype 6, $b3 note C_, 2 octave 2 note B_, 1 @@ -37,7 +38,7 @@ Music_SilphCo_Ch1: ; 7f243 (1f:7243) note B_, 2 note __, 2 -Music_SilphCo_branch_7f26d: +Music_SilphCo_branch_7f26d:: note G_, 2 note __, 2 note B_, 2 @@ -74,9 +75,9 @@ Music_SilphCo_branch_7f26d: note F#, 1 note G#, 1 note A_, 1 - notetype 6, 160 + notetype 6, $a0 note B_, 12 - notetype 6, 179 + notetype 6, $b3 note B_, 1 note A_, 1 note G_, 1 @@ -87,10 +88,10 @@ Music_SilphCo_branch_7f26d: note G#, 1 note A#, 1 note B_, 1 - notetype 6, 160 + notetype 6, $a0 octave 3 note C_, 12 - notetype 6, 179 + notetype 6, $b3 note C_, 1 octave 2 note B_, 1 @@ -103,9 +104,9 @@ Music_SilphCo_branch_7f26d: octave 3 note C_, 1 note C#, 1 - notetype 6, 160 + notetype 6, $a0 note D_, 12 - notetype 6, 179 + notetype 6, $b3 note D_, 1 note C_, 1 octave 2 @@ -117,10 +118,10 @@ Music_SilphCo_branch_7f26d: note G#, 1 note A#, 1 note B_, 1 - notetype 6, 160 + notetype 6, $a0 octave 3 note C_, 12 - notetype 6, 179 + notetype 6, $b3 note C_, 1 octave 2 note B_, 1 @@ -128,13 +129,13 @@ Music_SilphCo_branch_7f26d: note F_, 1 note E_, 1 note __, 7 - notetype 6, 128 + notetype 6, $80 note B_, 16 - notetype 6, 176 + notetype 6, $b0 octave 3 note E_, 8 tempo 124 - notetype 6, 179 + notetype 6, $b3 octave 2 note B_, 2 note __, 10 @@ -286,41 +287,41 @@ Music_SilphCo_branch_7f26d: note G#, 1 note F#, 1 note E_, 1 - notetype 6, 96 + notetype 6, $60 note E_, 16 note E_, 11 - notetype 6, 179 + notetype 6, $b3 note E_, 1 note F#, 1 note G#, 1 note A#, 1 octave 3 note C_, 1 - notetype 6, 63 + notetype 6, $3f note C_, 16 - notetype 6, 160 + notetype 6, $a0 note C_, 11 - notetype 6, 147 + notetype 6, $93 octave 2 note B_, 1 note A#, 1 note G#, 1 note F#, 1 note E_, 1 - notetype 6, 63 + notetype 6, $3f note E_, 16 - notetype 6, 144 + notetype 6, $90 note E_, 11 - notetype 6, 179 + notetype 6, $b3 note F_, 1 note G_, 1 note A#, 1 octave 3 note C_, 1 note D_, 1 - notetype 6, 63 + notetype 6, $3f note D_, 16 - notetype 6, 167 + notetype 6, $a7 note D_, 11 note __, 4 note __, 4 @@ -348,19 +349,19 @@ Music_SilphCo_branch_7f26d: note __, 4 tempo 160 note __, 4 - notetype 6, 67 + notetype 6, $43 octave 2 note B_, 2 note __, 6 - notetype 6, 99 + notetype 6, $63 note B_, 2 note __, 6 - notetype 6, 131 + notetype 6, $83 note B_, 2 note __, 6 - notetype 6, 80 + notetype 6, $50 note B_, 8 - notetype 6, 179 + notetype 6, $b3 note B_, 2 note __, 6 note B_, 2 @@ -371,7 +372,7 @@ Music_SilphCo_branch_7f26d: note __, 2 loopchannel 0, Music_SilphCo_branch_7f26d -Music_SilphCo_branch_7f3f0: +Music_SilphCo_branch_7f3f0:: octave 2 note B_, 2 note A#, 2 @@ -399,10 +400,10 @@ Music_SilphCo_branch_7f3f0: endchannel -Music_SilphCo_Ch2: ; 7f409 (1f:7409) - vibrato 10, 50 +Music_SilphCo_Ch1:: + vibrato 10, $32 dutycycle 3 - notetype 6, 195 + notetype 6, $c3 octave 3 note E_, 1 note F#, 1 @@ -410,9 +411,9 @@ Music_SilphCo_Ch2: ; 7f409 (1f:7409) note A#, 1 octave 4 note C_, 1 - notetype 6, 176 + notetype 6, $b0 note C_, 12 - notetype 6, 195 + notetype 6, $c3 note C_, 2 octave 3 note B_, 1 @@ -432,7 +433,7 @@ Music_SilphCo_Ch2: ; 7f409 (1f:7409) note G#, 2 note __, 2 -Music_SilphCo_branch_7f42e: +Music_SilphCo_branch_7f42e:: note E_, 2 note __, 2 note G_, 2 @@ -461,7 +462,7 @@ Music_SilphCo_branch_7f42e: note __, 6 note G#, 2 note __, 2 - notetype 6, 183 + notetype 6, $b7 dutycycle 2 octave 4 note E_, 8 @@ -481,11 +482,11 @@ Music_SilphCo_branch_7f42e: note D_, 8 note D#, 8 dutycycle 3 - notetype 6, 111 + notetype 6, $6f note E_, 16 - notetype 6, 192 + notetype 6, $c0 note B_, 16 - notetype 6, 196 + notetype 6, $c4 octave 3 note E_, 4 note D#, 4 @@ -503,7 +504,7 @@ Music_SilphCo_branch_7f42e: note D#, 4 note D_, 4 note D#, 4 - notetype 6, 194 + notetype 6, $c2 dutycycle 1 octave 4 note E_, 4 @@ -515,7 +516,7 @@ Music_SilphCo_branch_7f42e: note D_, 4 note D#, 4 note E_, 4 - notetype 6, 196 + notetype 6, $c4 dutycycle 3 octave 3 note F_, 4 @@ -528,32 +529,32 @@ Music_SilphCo_branch_7f42e: note E_, 4 note D#, 4 note E_, 4 - notetype 6, 192 + notetype 6, $c0 note F_, 8 - notetype 6, 183 + notetype 6, $b7 note F_, 8 - notetype 6, 138 + notetype 6, $8a note F_, 4 - notetype 6, 196 + notetype 6, $c4 dutycycle 3 note F_, 4 note E_, 4 note F_, 4 - notetype 6, 160 + notetype 6, $a0 note F#, 8 - notetype 6, 176 + notetype 6, $b0 note F#, 8 - notetype 6, 153 + notetype 6, $99 note F#, 4 - notetype 6, 196 + notetype 6, $c4 note F#, 4 note F_, 4 note F#, 4 - notetype 6, 144 + notetype 6, $90 note G_, 12 - notetype 6, 89 + notetype 6, $59 note G_, 8 - notetype 6, 196 + notetype 6, $c4 note G_, 4 note F#, 4 note G_, 4 @@ -570,43 +571,43 @@ Music_SilphCo_branch_7f42e: note D_, 4 note D#, 4 note D_, 4 - notetype 6, 194 + notetype 6, $c2 dutycycle 1 note F_, 4 note F#, 4 note G_, 4 note G#, 4 note A_, 4 - notetype 6, 180 + notetype 6, $b4 dutycycle 3 note D#, 4 note D_, 4 note D#, 4 - notetype 6, 194 + notetype 6, $c2 dutycycle 1 note F_, 4 note F#, 4 note G_, 4 note G#, 4 note A#, 4 - notetype 6, 180 + notetype 6, $b4 dutycycle 3 note D#, 4 note D_, 4 note D#, 4 - notetype 6, 194 + notetype 6, $c2 dutycycle 1 note F_, 4 note F#, 4 note G_, 4 note G#, 4 note B_, 4 - notetype 6, 180 + notetype 6, $b4 dutycycle 3 note D#, 4 note D_, 4 note D#, 4 - notetype 6, 194 + notetype 6, $c2 dutycycle 1 note F_, 4 note F#, 4 @@ -614,7 +615,7 @@ Music_SilphCo_branch_7f42e: note G#, 4 octave 4 note C_, 4 - notetype 6, 180 + notetype 6, $b4 dutycycle 3 octave 3 note D#, 4 @@ -741,7 +742,7 @@ Music_SilphCo_branch_7f42e: octave 3 note G_, 2 note __, 2 - notetype 6, 135 + notetype 6, $87 octave 5 note E_, 4 note D#, 4 @@ -760,19 +761,19 @@ Music_SilphCo_branch_7f42e: note D_, 4 note D#, 4 note __, 4 - notetype 6, 67 + notetype 6, $43 octave 2 note G_, 2 note __, 6 - notetype 6, 99 + notetype 6, $63 note F#, 2 note __, 6 - notetype 6, 131 + notetype 6, $83 note G_, 2 note __, 6 - notetype 6, 79 + notetype 6, $4f note G#, 8 - notetype 6, 180 + notetype 6, $b4 note G_, 2 note __, 6 note F#, 2 @@ -784,9 +785,9 @@ Music_SilphCo_branch_7f42e: loopchannel 0, Music_SilphCo_branch_7f42e -Music_SilphCo_Ch3: ; 7f5be (1f:75be) - vibrato 8, 17 - notetype 12, 17 +Music_SilphCo_Ch2:: + vibrato 8, $11 + notetype 12, $11 note __, 12 octave 5 note E_, 4 @@ -794,7 +795,7 @@ Music_SilphCo_Ch3: ; 7f5be (1f:75be) note E_, 4 note F_, 4 -Music_SilphCo_branch_7f5c9: +Music_SilphCo_branch_7f5c9:: note E_, 4 note D#, 4 note D_, 4 @@ -974,7 +975,7 @@ Music_SilphCo_branch_7f5c9: note D#, 4 note D_, 4 note D#, 4 - notetype 6, 17 + notetype 6, $11 note __, 4 note __, 4 note __, 4 @@ -991,7 +992,7 @@ Music_SilphCo_branch_7f5c9: note __, 4 note __, 4 note __, 4 - notetype 12, 17 + notetype 12, $11 note __, 4 note __, 4 note __, 4 @@ -1002,4 +1003,3 @@ Music_SilphCo_branch_7f5c9: note E_, 4 note F_, 4 loopchannel 0, Music_SilphCo_branch_7f5c9 -; 0x7f69d \ No newline at end of file diff --git a/crysaudio/music/RBY/ssanne.asm b/crysaudio/music/RBY/ssanne.asm index 886f5a31..a65095da 100644 --- a/crysaudio/music/RBY/ssanne.asm +++ b/crysaudio/music/RBY/ssanne.asm @@ -1,17 +1,17 @@ -Music_SSAnne: - dbw $80, Music_SSAnne_Ch1 - dbw $01, Music_SSAnne_Ch2 - dbw $02, Music_SSAnne_Ch3 +Music_SSAnne:: + musicheader 3, 1, Music_SSAnne_Ch0 + musicheader 1, 2, Music_SSAnne_Ch1 + musicheader 1, 3, Music_SSAnne_Ch2 -Music_SSAnne_Ch1: ; b3a7 (2:73a7) +Music_SSAnne_Ch0:: tempo 128 - volume 119 + volume $77 dutycycle 1 - vibrato 8, 52 - + vibrato 8, $34 + ;toggleperfectpitch -Music_SSAnne_branch_b3b2: - notetype 12, 164 +Music_SSAnne_branch_b3b2:: + notetype 12, $a4 note __, 12 octave 3 note E_, 2 @@ -112,12 +112,12 @@ Music_SSAnne_branch_b3b2: loopchannel 0, Music_SSAnne_branch_b3b2 -Music_SSAnne_Ch2: ; b419 (2:7419) +Music_SSAnne_Ch1:: dutycycle 0 - vibrato 12, 36 + vibrato 12, $24 -Music_SSAnne_branch_b41e: - notetype 12, 197 +Music_SSAnne_branch_b41e:: + notetype 12, $c5 octave 3 note A_, 2 note E_, 2 @@ -125,7 +125,7 @@ Music_SSAnne_branch_b41e: note B_, 4 octave 4 note D_, 4 - notetype 8, 197 + notetype 8, $c5 note C#, 2 note D_, 2 note C#, 2 @@ -287,8 +287,8 @@ Music_SSAnne_branch_b41e: loopchannel 0, Music_SSAnne_branch_b41e -Music_SSAnne_Ch3: ; b4cb (2:74cb) - notetype 12, 19 +Music_SSAnne_Ch2:: + notetype 12, $13 note __, 16 note __, 12 octave 4 @@ -340,5 +340,4 @@ Music_SSAnne_Ch3: ; b4cb (2:74cb) note F#, 8 note G#, 8 note B_, 8 - loopchannel 0, Music_SSAnne_Ch3 -; 0xb504 \ No newline at end of file + loopchannel 0, Music_SSAnne_Ch2 diff --git a/crysaudio/music/RBY/surfing.asm b/crysaudio/music/RBY/surfing.asm index 7c384ba6..66052f42 100644 --- a/crysaudio/music/RBY/surfing.asm +++ b/crysaudio/music/RBY/surfing.asm @@ -1,15 +1,15 @@ -Music_Surfing: - dbw $80, Music_Surfing_Ch1 - dbw $01, Music_Surfing_Ch2 - dbw $02, Music_Surfing_Ch3 +Music_Surfing:: + musicheader 3, 1, Music_Surfing_Ch0 + musicheader 1, 2, Music_Surfing_Ch1 + musicheader 1, 3, Music_Surfing_Ch2 -Music_Surfing_Ch1: ; 7fa19 (1f:7a19) +Music_Surfing_Ch0:: tempo 160 - volume 119 + volume $77 dutycycle 3 - vibrato 12, 52 - - notetype 12, 181 + vibrato 12, $34 + ;toggleperfectpitch + notetype 12, $b5 note __, 6 octave 2 note A_, 2 @@ -21,8 +21,8 @@ Music_Surfing_Ch1: ; 7fa19 (1f:7a19) note F#, 2 note G#, 4 -Music_Surfing_branch_7fa30: - notetype 12, 178 +Music_Surfing_branch_7fa30:: + notetype 12, $b2 note E_, 2 note E_, 4 note E_, 2 @@ -33,9 +33,9 @@ Music_Surfing_branch_7fa30: note D_, 4 note D_, 2 note D_, 4 - notetype 12, 177 + notetype 12, $b1 note F#, 3 - notetype 12, 178 + notetype 12, $b2 note D_, 3 note E_, 2 note E_, 4 @@ -51,18 +51,18 @@ Music_Surfing_branch_7fa30: note E_, 4 note G#, 2 note G#, 4 - notetype 12, 177 + notetype 12, $b1 note F#, 3 - notetype 12, 178 + notetype 12, $b2 note G#, 1 - notetype 12, 180 + notetype 12, $b4 note A_, 2 note B_, 2 octave 4 note C_, 2 - notetype 12, 183 + notetype 12, $b7 note C#, 6 - notetype 12, 179 + notetype 12, $b3 note D_, 2 note C#, 2 octave 3 @@ -121,10 +121,10 @@ Music_Surfing_branch_7fa30: loopchannel 0, Music_Surfing_branch_7fa30 -Music_Surfing_Ch2: ; 7fa9c (1f:7a9c) +Music_Surfing_Ch1:: dutycycle 3 - vibrato 16, 37 - notetype 12, 198 + vibrato 16, $25 + notetype 12, $c6 octave 3 note A_, 2 note G#, 3 @@ -137,8 +137,8 @@ Music_Surfing_Ch2: ; 7fa9c (1f:7a9c) octave 3 note B_, 2 -Music_Surfing_branch_7faae: - notetype 12, 198 +Music_Surfing_branch_7faae:: + notetype 12, $c6 octave 4 note E_, 6 note C#, 5 @@ -150,10 +150,10 @@ Music_Surfing_branch_7faae: note D_, 6 octave 3 note B_, 2 - notetype 12, 193 + notetype 12, $c1 octave 4 note F#, 3 - notetype 12, 198 + notetype 12, $c6 note D_, 1 note E_, 6 note C#, 6 @@ -164,9 +164,9 @@ Music_Surfing_branch_7faae: note D_, 6 note F#, 6 note E_, 2 - notetype 12, 193 + notetype 12, $c1 note F#, 3 - notetype 12, 198 + notetype 12, $c6 note E_, 1 note A_, 6 note A_, 6 @@ -208,8 +208,8 @@ Music_Surfing_branch_7faae: loopchannel 0, Music_Surfing_branch_7faae -Music_Surfing_Ch3: ; 7fafa (1f:7afa) - notetype 12, 16 +Music_Surfing_Ch2:: + notetype 12, $10 note __, 12 octave 5 note E_, 6 @@ -218,7 +218,7 @@ Music_Surfing_Ch3: ; 7fafa (1f:7afa) note F#, 2 note G#, 2 -Music_Surfing_branch_7fb03: +Music_Surfing_branch_7fb03:: octave 3 note A_, 2 octave 4 @@ -338,4 +338,3 @@ Music_Surfing_branch_7fb03: note D_, 2 note E_, 2 loopchannel 0, Music_Surfing_branch_7fb03 -; 0x7fb7d \ No newline at end of file diff --git a/crysaudio/music/RBY/surfingpikachu.asm b/crysaudio/music/RBY/surfingpikachu.asm index c26295a1..fdcd1ea0 100644 --- a/crysaudio/music/RBY/surfingpikachu.asm +++ b/crysaudio/music/RBY/surfingpikachu.asm @@ -1,32 +1,32 @@ -Music_SurfingPikachu: - dbw $80, Music_SurfingPikachu_Ch1 - dbw $01, Music_SurfingPikachu_Ch2 - dbw $02, Music_SurfingPikachu_Ch3 +Music_SurfingPikachu:: + musicheader 3, 1, Music_SurfingPikachu_Ch1 + musicheader 1, 2, Music_SurfingPikachu_Ch2 + musicheader 1, 3, Music_SurfingPikachu_Ch3 -Music_SurfingPikachu_Ch1: +Music_SurfingPikachu_Ch1:: tempo 117 - volume 119 + volume $77 dutycycle 3 - vibrato $8, $14 - notetype $c, $b3 + vibrato 8, $14 + notetype 12, $b3 octave 3 note E_, 6 - notetype $c, $b2 + notetype 12, $b2 note F#, 2 - notetype $c, $b3 + notetype 12, $b3 note E_, 6 - notetype $c, $b2 + notetype 12, $b2 note F#, 16 note __, 2 - notetype $c, $b3 + notetype 12, $b3 note E_, 6 - notetype $c, $b2 + notetype 12, $b2 note A_, 2 - notetype $c, $b3 + notetype 12, $b3 note E_, 6 - notetype $c, $b2 + notetype 12, $b2 note A_, 14 - notetype $c, $b2 + notetype 12, $b2 note D#, 2 note C#, 1 note D#, 1 @@ -39,8 +39,9 @@ Music_SurfingPikachu_Ch1: note G#, 4 note G#, 4 note G#, 2 -Music_SurfingPikachu_branch_82d1a: - notetype $c, $b3 + +Music_SurfingPikachu_branch_82d1a:: + notetype 12, $b3 octave 3 note G#, 4 note E_, 4 @@ -82,7 +83,7 @@ Music_SurfingPikachu_branch_82d1a: note __, 3 note A_, 4 dutycycle 0 - notetype $c, $b2 + notetype 12, $b2 note G#, 1 note F#, 1 note G#, 2 @@ -164,22 +165,24 @@ Music_SurfingPikachu_branch_82d1a: note E_, 8 dutycycle 3 loopchannel 0, Music_SurfingPikachu_branch_82d1a -Music_SurfingPikachu_Ch2: + + +Music_SurfingPikachu_Ch2:: dutycycle 3 - vibrato $6, $15 - notetype $c, $c4 + vibrato 6, $15 + notetype 12, $c4 octave 3 note B_, 6 - notetype $c, $c2 + notetype 12, $c2 octave 4 note E_, 2 - notetype $c, $c4 + notetype 12, $c4 octave 3 note B_, 6 - notetype $c, $c2 + notetype 12, $c2 octave 4 note E_, 2 - notetype $c, $b2 + notetype 12, $b2 octave 3 note B_, 2 octave 4 @@ -191,16 +194,16 @@ Music_SurfingPikachu_Ch2: note A_, 2 note G#, 2 note F#, 2 - notetype $c, $c4 + notetype 12, $c4 octave 4 note C#, 6 - notetype $c, $c2 + notetype 12, $c2 note F#, 2 - notetype $c, $c4 + notetype 12, $c4 note C#, 6 - notetype $c, $c2 + notetype 12, $c2 note F#, 2 - notetype $c, $b2 + notetype 12, $b2 note C#, 2 note D#, 2 note E_, 2 @@ -210,7 +213,7 @@ Music_SurfingPikachu_Ch2: note B_, 2 note A_, 2 note G#, 2 - notetype $c, $c2 + notetype 12, $c2 note E_, 6 note B_, 4 note B_, 4 @@ -218,8 +221,9 @@ Music_SurfingPikachu_Ch2: note B_, 4 note B_, 4 note B_, 2 -Music_SurfingPikachu_branch_82de0: - notetype $c, $c6 + +Music_SurfingPikachu_branch_82de0:: + notetype 12, $c6 octave 4 note E_, 4 octave 3 @@ -257,7 +261,7 @@ Music_SurfingPikachu_branch_82de0: note __, 3 note F#, 4 note E_, 10 - notetype $c, $c6 + notetype 12, $c6 dutycycle 2 note E_, 2 note D#, 2 @@ -299,10 +303,10 @@ Music_SurfingPikachu_branch_82de0: note C#, 4 octave 4 note B_, 8 - notetype $c, $c2 + notetype 12, $c2 octave 5 note E_, 4 - notetype $c, $c6 + notetype 12, $c6 dutycycle 3 octave 3 note B_, 1 @@ -311,8 +315,10 @@ Music_SurfingPikachu_branch_82de0: octave 4 note C#, 1 loopchannel 0, Music_SurfingPikachu_branch_82de0 -Music_SurfingPikachu_Ch3: - notetype $c, $10 + + +Music_SurfingPikachu_Ch3:: + notetype 12, $10 octave 4 note B_, 6 octave 5 @@ -402,7 +408,8 @@ Music_SurfingPikachu_Ch3: note __, 1 note D#, 1 note __, 1 -Music_SurfingPikachu_branch_82ea0: + +Music_SurfingPikachu_branch_82ea0:: note E_, 1 note __, 1 note B_, 1 diff --git a/crysaudio/music/RBY/titlescreen.asm b/crysaudio/music/RBY/titlescreen.asm index 2a9dff0d..81d02f16 100644 --- a/crysaudio/music/RBY/titlescreen.asm +++ b/crysaudio/music/RBY/titlescreen.asm @@ -1,15 +1,15 @@ -Music_RBYTitleScreen: - dbw $C0, Music_RBYTitleScreen_Ch1 - dbw $01, Music_RBYTitleScreen_Ch2 - dbw $02, Music_RBYTitleScreen_Ch3 - dbw $03, Music_RBYTitleScreen_Ch4 +Music_RBYTitleScreen:: + musicheader 4, 1, Music_RBYTitleScreen_Ch0 + musicheader 1, 2, Music_RBYTitleScreen_Ch1 + musicheader 1, 3, Music_RBYTitleScreen_Ch2 + musicheader 1, 4, Music_RBYTitleScreen_Ch3 -Music_RBYTitleScreen_Ch1: ; 7e4c0 (1f:64c0) +Music_RBYTitleScreen_Ch0:: tempo 144 - volume 119 - vibrato 9, 52 + volume $77 + vibrato 9, $34 dutycycle 3 - notetype 12, 193 + notetype 12, $c1 octave 2 note E_, 1 note G_, 1 @@ -24,7 +24,7 @@ Music_RBYTitleScreen_Ch1: ; 7e4c0 (1f:64c0) note G_, 4 note G_, 4 note G_, 4 - notetype 8, 193 + notetype 8, $c1 note A_, 2 note A_, 2 note A_, 2 @@ -32,27 +32,27 @@ Music_RBYTitleScreen_Ch1: ; 7e4c0 (1f:64c0) note A_, 2 note F#, 2 -Music_RBYTitleScreen_branch_7e4e2: +Music_RBYTitleScreen_branch_7e4e2:: callchannel Music_RBYTitleScreen_branch_7e541 callchannel Music_RBYTitleScreen_branch_7e54a callchannel Music_RBYTitleScreen_branch_7e541 octave 3 note C_, 8 - notetype 8, 198 + notetype 8, $c6 note E_, 4 note E_, 4 note C_, 4 - notetype 12, 198 + notetype 12, $c6 octave 2 note B_, 8 - notetype 8, 231 + notetype 8, $e7 octave 3 note F_, 4 note E_, 4 note C_, 4 - notetype 12, 231 + notetype 12, $e7 note D_, 10 - notetype 12, 198 + notetype 12, $c6 octave 2 note B_, 2 octave 3 @@ -84,26 +84,26 @@ Music_RBYTitleScreen_branch_7e4e2: note E_, 12 note F_, 4 note G_, 8 - notetype 12, 182 + notetype 12, $b6 octave 4 note C_, 4 note C#, 4 callchannel Music_RBYTitleScreen_branch_7e55c - notetype 8, 180 + notetype 8, $b4 octave 4 note C_, 4 note C_, 4 note C#, 4 callchannel Music_RBYTitleScreen_branch_7e55c - notetype 8, 178 + notetype 8, $b2 octave 3 note E_, 4 note E_, 4 note C#, 4 loopchannel 0, Music_RBYTitleScreen_branch_7e4e2 -Music_RBYTitleScreen_branch_7e541: - notetype 12, 198 +Music_RBYTitleScreen_branch_7e541:: + notetype 12, $c6 octave 3 note D_, 6 octave 2 @@ -112,17 +112,17 @@ Music_RBYTitleScreen_branch_7e541: note D_, 8 endchannel -Music_RBYTitleScreen_branch_7e54a: +Music_RBYTitleScreen_branch_7e54a:: note C_, 6 note F_, 6 note C_, 4 note D_, 8 - notetype 12, 231 + notetype 12, $e7 note F_, 6 note E_, 1 note D#, 1 note D_, 8 - notetype 8, 198 + notetype 8, $c6 note C_, 4 octave 2 note B_, 4 @@ -130,8 +130,8 @@ Music_RBYTitleScreen_branch_7e54a: note C_, 4 endchannel -Music_RBYTitleScreen_branch_7e55c: - notetype 12, 193 +Music_RBYTitleScreen_branch_7e55c:: + notetype 12, $c1 note D_, 1 note __, 1 octave 2 @@ -160,10 +160,10 @@ Music_RBYTitleScreen_branch_7e55c: endchannel -Music_RBYTitleScreen_Ch2: ; 7e578 (1f:6578) - vibrato 16, 70 +Music_RBYTitleScreen_Ch1:: + vibrato 16, $46 dutycycle 1 - notetype 12, 225 + notetype 12, $e1 octave 2 note G_, 1 note B_, 1 @@ -177,7 +177,7 @@ Music_RBYTitleScreen_Ch2: ; 7e578 (1f:6578) note G_, 4 note G_, 4 note G_, 4 - notetype 8, 225 + notetype 8, $e1 note F_, 2 note F_, 2 note F_, 2 @@ -185,8 +185,8 @@ Music_RBYTitleScreen_Ch2: ; 7e578 (1f:6578) note F_, 2 note F#, 2 -Music_RBYTitleScreen_branch_7e594: - vibrato 16, 70 +Music_RBYTitleScreen_branch_7e594:: + vibrato 16, $46 callchannel Music_RBYTitleScreen_branch_7e622 octave 2 note A_, 4 @@ -199,16 +199,16 @@ Music_RBYTitleScreen_branch_7e594: octave 2 note A_, 6 note F_, 2 - notetype 8, 231 + notetype 8, $e7 octave 4 note C_, 4 octave 3 note B_, 4 octave 4 note C_, 4 - notetype 12, 231 + notetype 12, $e7 note D_, 8 - notetype 12, 149 + notetype 12, $95 octave 2 note D_, 6 note D_, 1 @@ -227,28 +227,28 @@ Music_RBYTitleScreen_branch_7e594: note G_, 2 note F_, 8 callchannel Music_RBYTitleScreen_branch_7e622 - notetype 8, 149 + notetype 8, $95 octave 2 note G_, 4 note F_, 5 note A_, 3 - notetype 8, 230 + notetype 8, $e6 octave 4 note F_, 4 note E_, 4 note F_, 4 - notetype 12, 231 + notetype 12, $e7 note G_, 6 note A#, 2 note G_, 8 - vibrato 16, 38 + vibrato 16, $26 dutycycle 3 - notetype 12, 11 + notetype 12, $0b note G_, 8 - notetype 12, 231 + notetype 12, $e7 note A_, 8 dutycycle 1 - notetype 12, 231 + notetype 12, $e7 note A#, 6 note F_, 2 note F_, 8 @@ -264,7 +264,7 @@ Music_RBYTitleScreen_branch_7e594: note G_, 8 octave 3 note E_, 8 - notetype 12, 215 + notetype 12, $d7 octave 5 note C_, 4 note C#, 4 @@ -273,7 +273,7 @@ Music_RBYTitleScreen_branch_7e594: note D_, 1 note __, 3 note D_, 1 - notetype 8, 229 + notetype 8, $e5 octave 5 note C_, 4 note C_, 4 @@ -284,7 +284,7 @@ Music_RBYTitleScreen_branch_7e594: note D_, 1 note __, 3 note D_, 1 - notetype 8, 227 + notetype 8, $e3 octave 5 note C_, 4 note C_, 4 @@ -292,28 +292,28 @@ Music_RBYTitleScreen_branch_7e594: note B_, 4 loopchannel 0, Music_RBYTitleScreen_branch_7e594 -Music_RBYTitleScreen_branch_7e622: - notetype 12, 231 +Music_RBYTitleScreen_branch_7e622:: + notetype 12, $e7 octave 3 note G_, 6 note B_, 2 octave 4 note D_, 8 - notetype 12, 149 + notetype 12, $95 endchannel -Music_RBYTitleScreen_branch_7e62c: - notetype 12, 231 +Music_RBYTitleScreen_branch_7e62c:: + notetype 12, $e7 octave 4 note F_, 6 note E_, 1 note D#, 1 note D_, 8 - notetype 12, 149 + notetype 12, $95 endchannel -Music_RBYTitleScreen_branch_7e636: - notetype 12, 225 +Music_RBYTitleScreen_branch_7e636:: + notetype 12, $e1 note D_, 1 note __, 2 octave 4 @@ -327,8 +327,8 @@ Music_RBYTitleScreen_branch_7e636: endchannel -Music_RBYTitleScreen_Ch3: ; 7e643 (1f:6643) - notetype 12, 16 +Music_RBYTitleScreen_Ch2:: + notetype 12, $10 octave 3 note G_, 1 note __, 1 @@ -346,7 +346,7 @@ Music_RBYTitleScreen_Ch3: ; 7e643 (1f:6643) note __, 3 note G_, 1 note __, 3 - notetype 8, 16 + notetype 8, $10 note F_, 2 note F_, 2 note F_, 2 @@ -354,11 +354,11 @@ Music_RBYTitleScreen_Ch3: ; 7e643 (1f:6643) note F_, 2 note A_, 2 -Music_RBYTitleScreen_branch_7e65e: +Music_RBYTitleScreen_branch_7e65e:: callchannel Music_RBYTitleScreen_branch_7e6c9 callchannel Music_RBYTitleScreen_branch_7e6d0 -Music_RBYTitleScreen_branch_7e664: +Music_RBYTitleScreen_branch_7e664:: callchannel Music_RBYTitleScreen_branch_7e6c9 callchannel Music_RBYTitleScreen_branch_7e6c9 callchannel Music_RBYTitleScreen_branch_7e6c9 @@ -388,102 +388,117 @@ Music_RBYTitleScreen_branch_7e664: octave 3 note A_, 3 callchannel Music_RBYTitleScreen_branch_7e6e5 - notetype 3, 16 octave 5 - note D_, 1 - note C#, 1 - note C_, 1 - octave 4 - note B_, 1 - note A#, 1 - note A_, 1 - note G#, 1 - note G_, 1 - note F#, 1 - note F_, 1 - note E_, 1 - note D#, 1 - note D_, 4 - note __, 16 + ;slidepitchto 1, 3, C# + ;note D_, 4 + ;note __, 4 + notetype 3, $10 ; XXX + note D_, 1 ; XXX + note C#, 1 ; XXX + note C_, 1 ; XXX + octave 4 ; XXX + note B_, 1 ; XXX + note A#, 1 ; XXX + note A_, 1 ; XXX + note G#, 1 ; XXX + note G_, 1 ; XXX + note F#, 1 ; XXX + note F_, 1 ; XXX + note E_, 1 ; XXX + note D#, 1 ; XXX + note D_, 4 ; XXX + note __, 16 ; XXX octave 6 - note D_, 1 - note C#, 1 - note C_, 1 + ;slidepitchto 1, 2, C# + ;note D_, 4 + note D_, 1 ; XXX + note C#, 1 ; XXX + note C_, 1 ; XXX + octave 5 ; XXX + note B_, 1 ; XXX + note A#, 1 ; XXX + note A_, 1 ; XXX + note G#, 1 ; XXX + note G_, 1 ; XXX + note F#, 1 ; XXX + note F_, 1 ; XXX + note E_, 1 ; XXX + note D#, 1 ; XXX + note D_, 4 ; XXX octave 5 - note B_, 1 - note A#, 1 - note A_, 1 - note G#, 1 - note G_, 1 - note F#, 1 - note F_, 1 - note E_, 1 - note D#, 1 - note D_, 4 - octave 5 - note D_, 1 - note C#, 1 - note C_, 1 - octave 4 - note B_, 1 - note A#, 1 - note A_, 1 - note G#, 1 - note G_, 1 - note F#, 1 - note F_, 1 - note E_, 1 - note D#, 1 - note D_, 4 - note __, 8 - notetype 8, 16 + ;slidepitchto 1, 3, C# + ;note D_, 4 + ;note __, 2 + note D_, 1 ; XXX + note C#, 1 ; XXX + note C_, 1 ; XXX + octave 4 ; XXX + note B_, 1 ; XXX + note A#, 1 ; XXX + note A_, 1 ; XXX + note G#, 1 ; XXX + note G_, 1 ; XXX + note F#, 1 ; XXX + note F_, 1 ; XXX + note E_, 1 ; XXX + note D#, 1 ; XXX + note D_, 4 ; XXX + note __, 8 ; XXX + notetype 8, $10 octave 4 note C_, 4 note C_, 4 note C#, 4 callchannel Music_RBYTitleScreen_branch_7e6e5 octave 6 - notetype 3, 16 - note D_, 1 - note C#, 1 - note C_, 1 + ;slidepitchto 1, 2, C# + ;note D_, 4 + ;note __, 4 + notetype 3, $10 ; XXX + note D_, 1 ; XXX + note C#, 1 ; XXX + note C_, 1 ; XXX + octave 5 ; XXX + note B_, 1 ; XXX + note A#, 1 ; XXX + note A_, 1 ; XXX + note G#, 1 ; XXX + note G_, 1 ; XXX + note F#, 1 ; XXX + note F_, 1 ; XXX + note E_, 1 ; XXX + note D#, 1 ; XXX + note D_, 4 ; XXX + note __, 16 ; XXX octave 5 - note B_, 1 - note A#, 1 - note A_, 1 - note G#, 1 - note G_, 1 - note F#, 1 - note F_, 1 - note E_, 1 - note D#, 1 - note D_, 4 - note __, 16 - octave 5 - note D_, 1 - note C#, 1 - note C_, 1 + ;slidepitchto 1, 3, C# + ;note D_, 4 + ;note __, 6 + note D_, 1 ; XXX + note C#, 1 ; XXX + note C_, 1 ; XXX + octave 4 ; XXX + note B_, 1 ; XXX + note A#, 1 ; XXX + note A_, 1 ; XXX + note G#, 1 ; XXX + note G_, 1 ; XXX + note F#, 1 ; XXX + note F_, 1 ; XXX + note E_, 1 ; XXX + note D#, 1 ; XXX + note D_, 4 ; XXX + note __, 12 ; XXX + note __, 12 ; XXX + notetype 8, $10 octave 4 - note B_, 1 - note A#, 1 - note A_, 1 - note G#, 1 - note G_, 1 - note F#, 1 - note F_, 1 - note E_, 1 - note D#, 1 - note D_, 4 - notetype 8, 16 - octave 4 - note __, 9 note C_, 4 note C_, 4 octave 3 note B_, 4 loopchannel 0, Music_RBYTitleScreen_branch_7e65e -Music_RBYTitleScreen_branch_7e6c9: +Music_RBYTitleScreen_branch_7e6c9:: note G_, 6 note D_, 3 note G_, 6 @@ -492,7 +507,7 @@ Music_RBYTitleScreen_branch_7e6c9: note D_, 3 endchannel -Music_RBYTitleScreen_branch_7e6d0: +Music_RBYTitleScreen_branch_7e6d0:: note F_, 6 note C_, 3 note F_, 6 @@ -501,14 +516,14 @@ Music_RBYTitleScreen_branch_7e6d0: note C_, 3 endchannel -Music_RBYTitleScreen_branch_7e6d7: +Music_RBYTitleScreen_branch_7e6d7:: note A#, 6 note F_, 3 note A#, 6 note F_, 3 endchannel -Music_RBYTitleScreen_branch_7e6dc: +Music_RBYTitleScreen_branch_7e6dc:: octave 4 note C_, 6 octave 3 @@ -519,17 +534,17 @@ Music_RBYTitleScreen_branch_7e6dc: note G_, 3 endchannel -Music_RBYTitleScreen_branch_7e6e5: - notetype 12, 16 +Music_RBYTitleScreen_branch_7e6e5:: + notetype 12, $10 octave 4 note D_, 1 note __, 5 endchannel -Music_RBYTitleScreen_Ch4: ; 7e6eb (1f:66eb) - notetype 6 +Music_RBYTitleScreen_Ch3:: togglenoise 0 + notetype 6 note __, 4 note D_, 1 note D_, 1 @@ -556,7 +571,7 @@ Music_RBYTitleScreen_Ch4: ; 7e6eb (1f:66eb) note C#, 2 note C_, 2 -Music_RBYTitleScreen_branch_7e716: +Music_RBYTitleScreen_branch_7e716:: notetype 12 note C#, 1 note __, 3 @@ -723,7 +738,7 @@ Music_RBYTitleScreen_branch_7e716: note C#, 4 loopchannel 0, Music_RBYTitleScreen_branch_7e716 -Music_RBYTitleScreen_branch_7e834: +Music_RBYTitleScreen_branch_7e834:: note C#, 1 note __, 3 note C#, 1 @@ -734,7 +749,7 @@ Music_RBYTitleScreen_branch_7e834: note __, 3 endchannel -Music_RBYTitleScreen_branch_7e842: +Music_RBYTitleScreen_branch_7e842:: note C#, 1 note __, 3 note C#, 1 @@ -744,4 +759,3 @@ Music_RBYTitleScreen_branch_7e842: note C#, 1 note __, 3 endchannel -; 0x7e850 \ No newline at end of file diff --git a/crysaudio/music/RBY/trainerbattle.asm b/crysaudio/music/RBY/trainerbattle.asm index 8efef03a..351c2b47 100644 --- a/crysaudio/music/RBY/trainerbattle.asm +++ b/crysaudio/music/RBY/trainerbattle.asm @@ -1,14 +1,15 @@ -Music_TrainerBattle: - dbw $80, Music_TrainerBattle_Ch1 - dbw $01, Music_TrainerBattle_Ch2 - dbw $02, Music_TrainerBattle_Ch3 +Music_TrainerBattle:: + musicheader 3, 1, Music_TrainerBattle_Ch0 + musicheader 1, 2, Music_TrainerBattle_Ch1 + musicheader 1, 3, Music_TrainerBattle_Ch2 -Music_TrainerBattle_Ch1: +Music_TrainerBattle_Ch0:: tempo 112 - volume 119 + volume $77 dutycycle 3 - vibrato $6, $34 - notetype $c, $b2 + vibrato 6, $34 + ;toggleperfectpitch + notetype 12, $b2 note __, 8 octave 3 note F_, 1 @@ -69,8 +70,9 @@ Music_TrainerBattle_Ch1: note F_, 6 note C_, 2 note C#, 2 -Music_TrainerBattle_branch_22962: - intensity $b5 + +Music_TrainerBattle_branch_22962:: + notetype 12, $b5 note D_, 2 note E_, 4 note C#, 2 @@ -85,7 +87,7 @@ Music_TrainerBattle_branch_22962: note D_, 2 note E_, 2 note F_, 8 - intensity $b2 + notetype 12, $b2 note C_, 1 note C#, 1 note D_, 1 @@ -110,7 +112,7 @@ Music_TrainerBattle_branch_22962: note D#, 1 note D_, 1 note C_, 1 - intensity $b5 + notetype 12, $b5 note D_, 2 note E_, 4 note C#, 2 @@ -126,14 +128,14 @@ Music_TrainerBattle_branch_22962: note B_, 2 octave 3 note C#, 2 - intensity $a7 + notetype 12, $a7 note D_, 8 note C#, 8 octave 2 note B_, 8 octave 3 note C#, 8 - intensity $b5 + notetype 12, $b5 note D_, 2 note C#, 2 octave 2 @@ -650,10 +652,12 @@ Music_TrainerBattle_branch_22962: note A_, 1 note A#, 1 loopchannel 0, Music_TrainerBattle_branch_22962 -Music_TrainerBattle_Ch2: + + +Music_TrainerBattle_Ch1:: dutycycle 3 - vibrato $a, $25 - notetype $c, $c2 + vibrato 10, $25 + notetype 12, $c2 octave 4 note A_, 1 note G#, 1 @@ -690,15 +694,15 @@ Music_TrainerBattle_Ch2: note C_, 1 octave 3 note B_, 1 - intensity $e1 + notetype 12, $e1 octave 4 note B_, 16 note __, 16 - intensity $d1 + notetype 12, $d1 note B_, 16 note __, 12 note A_, 4 - intensity $c2 + notetype 12, $c2 octave 3 note B_, 6 octave 4 @@ -722,22 +726,23 @@ Music_TrainerBattle_Ch2: note D_, 6 octave 4 note A_, 4 -Music_TrainerBattle_branch_22bfc: - intensity $c7 + +Music_TrainerBattle_branch_22bfc:: + notetype 12, $c7 octave 3 note B_, 6 note F#, 14 note B_, 4 note F#, 4 note B_, 4 - intensity $50 + notetype 12, $50 octave 4 note C_, 8 - intensity $30 + notetype 12, $30 note C_, 8 - intensity $4d + notetype 12, $4e note C_, 8 - intensity $c7 + notetype 12, $c7 note C_, 8 octave 3 note B_, 6 @@ -745,35 +750,35 @@ Music_TrainerBattle_branch_22bfc: note B_, 4 note F#, 4 note B_, 4 - intensity $90 + notetype 12, $90 note A_, 8 - intensity $50 + notetype 12, $50 note A_, 8 - intensity $40 + notetype 12, $40 note A_, 8 - intensity $30 + notetype 12, $30 note A_, 8 - intensity $c7 + notetype 12, $c7 note G_, 16 octave 4 note D_, 8 octave 3 note G_, 8 - intensity $80 + notetype 12, $80 note A_, 8 - intensity $50 + notetype 12, $50 note A_, 8 - intensity $40 + notetype 12, $40 note A_, 8 - intensity $60 + notetype 12, $60 note A_, 8 - intensity $c7 + notetype 12, $c7 note G_, 16 octave 4 note E_, 8 note F#, 8 note E_, 16 - intensity $c5 + notetype 12, $c5 note G_, 4 note A_, 2 note G_, 2 @@ -781,73 +786,73 @@ Music_TrainerBattle_branch_22bfc: note E_, 2 note D_, 2 note E_, 2 - intensity $b7 + notetype 12, $b7 note F#, 8 - intensity $50 + notetype 12, $50 note F#, 8 - intensity $60 + notetype 12, $60 note F#, 8 - intensity $70 + notetype 12, $70 note F#, 8 - intensity $a0 + notetype 12, $a0 note G_, 8 - intensity $a7 + notetype 12, $a7 note G_, 8 - intensity $b7 + notetype 12, $b7 note G_, 4 - intensity $c5 + notetype 12, $c5 note A_, 2 note G_, 2 note G_, 2 note F#, 2 note E_, 2 note F#, 2 - intensity $a0 + notetype 12, $a0 note G#, 8 - intensity $70 + notetype 12, $70 note G#, 8 - intensity $80 + notetype 12, $80 note G#, 8 - intensity $60 + notetype 12, $60 note G#, 8 - intensity $a0 + notetype 12, $a0 note A_, 16 - intensity $b0 + notetype 12, $b0 octave 5 note C#, 8 note E_, 8 - intensity $c0 + notetype 12, $c0 note D_, 4 octave 4 note A_, 4 octave 5 note C_, 2 - intensity $c7 + notetype 12, $c7 octave 4 note B_, 8 - intensity $60 + notetype 12, $60 note B_, 8 - intensity $69 + notetype 12, $69 note B_, 6 - intensity $96 + notetype 12, $96 note B_, 6 note __, 2 - intensity $c0 + notetype 12, $c0 octave 5 note D_, 4 octave 4 note A_, 4 note A#, 2 - intensity $b0 + notetype 12, $b0 octave 5 note F_, 14 - intensity $60 + notetype 12, $60 note G_, 16 - intensity $50 + notetype 12, $50 note E_, 16 - intensity $40 + notetype 12, $40 note E_, 16 - intensity $c7 + notetype 12, $c7 octave 4 note C_, 6 octave 3 @@ -884,18 +889,18 @@ Music_TrainerBattle_branch_22bfc: note G_, 6 note F_, 6 note D_, 4 - intensity $b0 + notetype 12, $b0 note F_, 16 note E_, 16 note D_, 16 note E_, 16 - intensity $a0 + notetype 12, $a0 octave 5 note F_, 16 note E_, 16 note G_, 16 note F_, 16 - intensity $d1 + notetype 12, $d1 octave 3 note A#, 6 note A#, 6 @@ -911,7 +916,7 @@ Music_TrainerBattle_branch_22bfc: note A#, 6 note A#, 6 note A_, 4 - intensity $c7 + notetype 12, $c7 note A_, 4 note B_, 4 note G_, 2 @@ -951,9 +956,11 @@ Music_TrainerBattle_branch_22bfc: note E_, 8 note G_, 8 loopchannel 0, Music_TrainerBattle_branch_22bfc -Music_TrainerBattle_Ch3: - vibrato $0, $20 - notetype $c, $14 + + +Music_TrainerBattle_Ch2:: + vibrato 0, $20 + notetype 12, $14 octave 3 note B_, 1 note A#, 1 @@ -1089,7 +1096,8 @@ Music_TrainerBattle_Ch3: note A#, 2 octave 3 note C_, 2 -Music_TrainerBattle_branch_22d9c: + +Music_TrainerBattle_branch_22d9c:: octave 2 note A#, 1 note B_, 1 diff --git a/crysaudio/music/RBY/unusedsong.asm b/crysaudio/music/RBY/unusedsong.asm index d1641074..8d523ebd 100644 --- a/crysaudio/music/RBY/unusedsong.asm +++ b/crysaudio/music/RBY/unusedsong.asm @@ -1,14 +1,14 @@ -Music_UnusedSong: - dbw $40, Music_UnusedSong_Ch1 - dbw $01, Music_UnusedSong_Ch2 +Music_UnusedSong:: + musicheader 2, 1, Music_UnusedSong_Ch0 + musicheader 1, 2, Music_UnusedSong_Ch1 -Music_UnusedSong_Ch1: ; a913 (2:6913) +Music_UnusedSong_Ch0:: tempo 144 - volume 119 - vibrato 5, 22 + volume $77 + vibrato 5, $16 -Music_UnusedSong_branch_a91b: - notetype 12, 16 +Music_UnusedSong_branch_a91b:: + notetype 12, $10 octave 6 note E_, 1 note __, 1 @@ -186,14 +186,14 @@ Music_UnusedSong_branch_a91b: endchannel -Music_UnusedSong_Ch2: ; a9cf (2:69cf) +Music_UnusedSong_Ch1:: tempo 144 - volume 119 - - vibrato 6, 21 + volume $77 + ;toggleperfectpitch + vibrato 6, $15 -Music_UnusedSong_branch_a9d8: - notetype 12, 16 +Music_UnusedSong_branch_a9d8:: + notetype 12, $10 octave 6 note E_, 1 note __, 1 @@ -340,4 +340,3 @@ Music_UnusedSong_branch_a9d8: note __, 6 loopchannel 0, Music_UnusedSong_branch_a9d8 endchannel -; 0xaa6f \ No newline at end of file diff --git a/crysaudio/music/RBY/vermilion.asm b/crysaudio/music/RBY/vermilion.asm index 4cc38373..ca7bfe84 100644 --- a/crysaudio/music/RBY/vermilion.asm +++ b/crysaudio/music/RBY/vermilion.asm @@ -1,18 +1,18 @@ -Music_Vermilion: - dbw $C0, Music_Vermilion_Ch1 - dbw $01, Music_Vermilion_Ch2 - dbw $02, Music_Vermilion_Ch3 - dbw $03, Music_Vermilion_Ch4 +Music_Vermilion:: + musicheader 4, 1, Music_Vermilion_Ch0 + musicheader 1, 2, Music_Vermilion_Ch1 + musicheader 1, 3, Music_Vermilion_Ch2 + musicheader 1, 4, Music_Vermilion_Ch3 -Music_Vermilion_Ch1: ; b9eb (2:79eb) +Music_Vermilion_Ch0:: tempo 156 - volume 119 + volume $77 dutycycle 3 - vibrato 12, 52 - + vibrato 12, $34 + ;toggleperfectpitch -Music_Vermilion_branch_b9f6: - notetype 12, 181 +Music_Vermilion_branch_b9f6:: + notetype 12, $b5 octave 3 note E_, 4 note C#, 1 @@ -117,12 +117,12 @@ Music_Vermilion_branch_b9f6: loopchannel 0, Music_Vermilion_branch_b9f6 -Music_Vermilion_Ch2: ; ba61 (2:7a61) +Music_Vermilion_Ch1:: dutycycle 3 - vibrato 10, 35 + vibrato 10, $23 -Music_Vermilion_branch_ba66: - notetype 12, 199 +Music_Vermilion_branch_ba66:: + notetype 12, $c7 octave 3 note A_, 8 octave 4 @@ -184,10 +184,10 @@ Music_Vermilion_branch_ba66: loopchannel 0, Music_Vermilion_branch_ba66 -Music_Vermilion_Ch3: ; baa6 (2:7aa6) - notetype 12, 16 +Music_Vermilion_Ch2:: + notetype 12, $10 -Music_Vermilion_branch_baa8: +Music_Vermilion_branch_baa8:: octave 4 note A_, 2 note E_, 2 @@ -288,11 +288,11 @@ Music_Vermilion_branch_baa8: loopchannel 0, Music_Vermilion_branch_baa8 -Music_Vermilion_Ch4: ; bb0d (2:7b0d) - notetype 12 +Music_Vermilion_Ch3:: togglenoise 0 + notetype 12 -Music_Vermilion_branch_bb0e: +Music_Vermilion_branch_bb0e:: callchannel Music_Vermilion_branch_bb3f note F_, 2 note F_, 1 @@ -314,7 +314,7 @@ Music_Vermilion_branch_bb0e: callchannel Music_Vermilion_branch_bb3f loopchannel 0, Music_Vermilion_branch_bb0e -Music_Vermilion_branch_bb3f: +Music_Vermilion_branch_bb3f:: note F_, 2 note F_, 1 note F_, 1 @@ -328,4 +328,3 @@ Music_Vermilion_branch_bb3f: note F_, 1 note F_, 1 endchannel -; 0xbb58 \ No newline at end of file diff --git a/crysaudio/music/RBY/wildbattle.asm b/crysaudio/music/RBY/wildbattle.asm index 70fd2f69..8836f8f4 100644 --- a/crysaudio/music/RBY/wildbattle.asm +++ b/crysaudio/music/RBY/wildbattle.asm @@ -1,14 +1,15 @@ -Music_WildBattle: - dbw $80, Music_WildBattle_Ch1 - dbw $01, Music_WildBattle_Ch2 - dbw $02, Music_WildBattle_Ch3 +Music_WildBattle:: + musicheader 3, 1, Music_WildBattle_Ch0 + musicheader 1, 2, Music_WildBattle_Ch1 + musicheader 1, 3, Music_WildBattle_Ch2 -Music_WildBattle_Ch1: +Music_WildBattle_Ch0:: tempo 104 - volume 119 + volume $77 dutycycle 3 - vibrato $6, $34 - notetype $c, $b3 + vibrato 6, $34 + ;toggleperfectpitch + notetype 12, $b3 octave 4 note C_, 1 octave 3 @@ -47,16 +48,16 @@ Music_WildBattle_Ch1: octave 3 note C_, 1 note C#, 1 - intensity $b1 + notetype 12, $b1 note G_, 6 note E_, 6 note D#, 12 note C#, 14 note E_, 6 note D#, 10 - intensity $4f + notetype 12, $4f note C#, 10 - intensity $b1 + notetype 12, $b1 note G_, 6 note E_, 6 note D#, 12 @@ -64,8 +65,9 @@ Music_WildBattle_Ch1: note E_, 6 note D#, 10 note C#, 10 -Music_WildBattle_branch_230e0: - intensity $b3 + +Music_WildBattle_branch_230e0:: + notetype 12, $b3 note C#, 1 note D_, 1 note C#, 1 @@ -260,7 +262,7 @@ Music_WildBattle_branch_230e0: note F#, 1 note G_, 1 note G#, 1 - intensity $b5 + notetype 12, $b5 note D_, 4 note C_, 4 note D_, 4 @@ -268,10 +270,10 @@ Music_WildBattle_branch_230e0: note E_, 6 note D_, 6 note F_, 4 - intensity $b7 + notetype 12, $b7 note A_, 16 note G_, 16 - intensity $b5 + notetype 12, $b5 note D_, 4 note C_, 4 note D_, 4 @@ -279,12 +281,12 @@ Music_WildBattle_branch_230e0: note G_, 6 note A_, 6 note B_, 4 - intensity $b7 + notetype 12, $b7 octave 4 note C_, 16 - intensity $3f + notetype 12, $3f note G_, 16 - intensity $b5 + notetype 12, $b5 octave 3 note C_, 12 note C_, 2 @@ -296,15 +298,17 @@ Music_WildBattle_branch_230e0: note C#, 2 note __, 2 note F_, 2 - intensity $a3 + notetype 12, $a3 note D#, 6 - intensity $a7 + notetype 12, $a7 note C#, 8 loopchannel 0, Music_WildBattle_branch_230e0 -Music_WildBattle_Ch2: + + +Music_WildBattle_Ch1:: dutycycle 3 - vibrato $8, $25 - notetype $c, $c3 + vibrato 8, $25 + notetype 12, $c3 octave 4 note G_, 1 note F#, 1 @@ -353,7 +357,7 @@ Music_WildBattle_Ch2: note F_, 1 octave 5 note G_, 1 - intensity $c2 + notetype 12, $c2 octave 4 note G_, 6 octave 3 @@ -362,9 +366,9 @@ Music_WildBattle_Ch2: note G_, 14 note G_, 6 note G_, 10 - intensity $90 + notetype 12, $90 note F#, 10 - intensity $c2 + notetype 12, $c2 note G_, 6 note G_, 6 note G_, 12 @@ -372,8 +376,9 @@ Music_WildBattle_Ch2: note G_, 6 note G_, 10 note G_, 10 -Music_WildBattle_branch_23225: - intensity $c5 + +Music_WildBattle_branch_23225:: + notetype 12, $c5 note G_, 6 note F#, 6 note E_, 4 @@ -387,10 +392,10 @@ Music_WildBattle_branch_23225: note G#, 2 note G_, 2 note __, 4 - intensity $b7 + notetype 12, $b7 octave 5 note C#, 8 - intensity $c5 + notetype 12, $c5 octave 4 note C_, 6 octave 3 @@ -405,20 +410,20 @@ Music_WildBattle_branch_23225: note F_, 6 note E_, 6 note D_, 4 - intensity $c7 + notetype 12, $c7 octave 3 note A#, 4 octave 4 note C_, 4 note D_, 4 note F_, 4 - intensity $c0 + notetype 12, $c0 note G#, 16 - intensity $b0 + notetype 12, $b0 note G#, 16 - intensity $4e + notetype 12, $4e note G_, 16 - intensity $c7 + notetype 12, $c7 note G_, 16 octave 3 note F_, 8 @@ -426,9 +431,9 @@ Music_WildBattle_branch_23225: octave 4 note D_, 8 note F_, 8 - intensity $c0 + notetype 12, $c0 note E_, 16 - intensity $c7 + notetype 12, $c7 note E_, 16 octave 3 note F_, 8 @@ -436,33 +441,35 @@ Music_WildBattle_branch_23225: octave 4 note D_, 8 note F_, 8 - intensity $c0 + notetype 12, $c0 note G_, 16 - intensity $3f + notetype 12, $3f octave 5 note C_, 16 - intensity $c5 + notetype 12, $c5 octave 4 note E_, 12 note E_, 2 note __, 2 note F_, 2 - intensity $c1 + notetype 12, $c1 note E_, 4 - intensity $c5 + notetype 12, $c5 note __, 10 note F_, 12 note F_, 2 note __, 2 note G#, 2 - intensity $a3 + notetype 12, $a3 note G_, 6 - intensity $c7 + notetype 12, $c7 note F_, 8 loopchannel 0, Music_WildBattle_branch_23225 -Music_WildBattle_Ch3: - vibrato $0, $20 - notetype $c, $11 + + +Music_WildBattle_Ch2:: + vibrato 0, $20 + notetype 12, $11 octave 4 note C#, 1 note __, 1 @@ -495,7 +502,8 @@ Music_WildBattle_Ch3: octave 3 note A#, 2 note B_, 2 -Music_WildBattle_branch_232b5: + +Music_WildBattle_branch_232b5:: octave 4 note C_, 2 note G_, 2 @@ -528,7 +536,8 @@ Music_WildBattle_branch_232b5: note G#, 2 note F_, 2 loopchannel 2, Music_WildBattle_branch_232b5 -Music_WildBattle_branch_232d8: + +Music_WildBattle_branch_232d8:: note C_, 2 note G_, 2 note C_, 2 diff --git a/crysaudio/music/RBY/yellowintro.asm b/crysaudio/music/RBY/yellowintro.asm index 4b3e56e9..2b1ba6b5 100644 --- a/crysaudio/music/RBY/yellowintro.asm +++ b/crysaudio/music/RBY/yellowintro.asm @@ -1,14 +1,14 @@ -Music_YellowIntro: - dbw $80, Music_YellowIntro_Ch1 - dbw $01, Music_YellowIntro_Ch2 - dbw $02, Music_YellowIntro_Ch3 +Music_YellowIntro:: + musicheader 3, 1, Music_YellowIntro_Ch1 + musicheader 1, 2, Music_YellowIntro_Ch2 + musicheader 1, 3, Music_YellowIntro_Ch3 -Music_YellowIntro_Ch1: +Music_YellowIntro_Ch1:: tempo 116 - volume 119 + volume $77 dutycycle 3 - vibrato $8, $14 - notetype $c, $b2 + vibrato 8, $14 + notetype 12, $b2 octave 3 note G#, 2 note B_, 4 @@ -20,7 +20,7 @@ Music_YellowIntro_Ch1: note A#, 1 note B_, 2 note B_, 10 - notetype $c, $b6 + notetype 12, $b6 octave 4 note C#, 1 note C_, 1 @@ -42,22 +42,22 @@ Music_YellowIntro_Ch1: octave 3 note B_, 4 note G#, 6 - notetype $c, $b2 + notetype 12, $b2 note B_, 2 - notetype $c, $b6 + notetype 12, $b6 note G#, 6 - notetype $c, $b2 + notetype 12, $b2 note B_, 2 - notetype $c, $b6 + notetype 12, $b6 octave 4 note E_, 6 - notetype $c, $b2 + notetype 12, $b2 note G#, 2 - notetype $c, $b6 + notetype 12, $b6 note E_, 6 - notetype $c, $b2 + notetype 12, $b2 note G#, 2 - notetype $c, $b6 + notetype 12, $b6 octave 3 note A_, 4 note F#, 4 @@ -69,7 +69,7 @@ Music_YellowIntro_Ch1: note G#, 2 note F#, 2 note D#, 2 - notetype $c, $b3 + notetype 12, $b3 note B_, 2 octave 4 note E_, 4 @@ -82,7 +82,7 @@ Music_YellowIntro_Ch1: note D#, 1 note F#, 2 note F#, 8 - notetype $c, $b6 + notetype 12, $b6 note F#, 1 note F_, 1 note F#, 8 @@ -94,19 +94,21 @@ Music_YellowIntro_Ch1: note F#, 1 note F_, 1 note F#, 2 - notetype $c, $b3 + notetype 12, $b3 note F#, 1 note E_, 1 note D#, 1 note C#, 1 - notetype $c, $b2 + notetype 12, $b2 octave 3 note B_, 16 endchannel -Music_YellowIntro_Ch2: + + +Music_YellowIntro_Ch2:: dutycycle 2 - vibrato $6, $15 - notetype $c, $c2 + vibrato 6, $15 + notetype 12, $c2 octave 3 note B_, 2 octave 4 @@ -119,7 +121,7 @@ Music_YellowIntro_Ch2: note D#, 1 note E_, 2 note E_, 4 - notetype $c, $c5 + notetype 12, $c5 note G#, 1 note G_, 1 note G#, 10 @@ -127,7 +129,7 @@ Music_YellowIntro_Ch2: note B_, 1 note A#, 1 note B_, 6 - notetype $c, $c7 + notetype 12, $c7 octave 4 note E_, 4 note G#, 4 @@ -141,24 +143,24 @@ Music_YellowIntro_Ch2: note E_, 4 octave 3 note B_, 6 - notetype $c, $c2 + notetype 12, $c2 octave 4 note E_, 2 - notetype $c, $c7 + notetype 12, $c7 octave 3 note B_, 6 - notetype $c, $c2 + notetype 12, $c2 octave 4 note E_, 2 - notetype $c, $c7 + notetype 12, $c7 note G#, 6 - notetype $c, $c2 + notetype 12, $c2 note B_, 2 - notetype $c, $c7 + notetype 12, $c7 note G#, 6 - notetype $c, $c2 + notetype 12, $c2 note B_, 2 - notetype $c, $c7 + notetype 12, $c7 note C#, 4 octave 3 note A_, 4 @@ -173,7 +175,7 @@ Music_YellowIntro_Ch2: note C#, 2 octave 3 note B_, 2 - notetype $c, $c3 + notetype 12, $c3 octave 4 note E_, 2 note G#, 4 @@ -186,7 +188,7 @@ Music_YellowIntro_Ch2: note F#, 1 note A_, 2 note A_, 4 - notetype $c, $c7 + notetype 12, $c7 note B_, 1 note A#, 1 note B_, 8 @@ -196,16 +198,18 @@ Music_YellowIntro_Ch2: note B_, 1 note A#, 1 note B_, 6 - notetype $c, $c3 + notetype 12, $c3 note B_, 1 note A_, 1 note G#, 1 note F#, 1 - notetype $c, $c2 + notetype 12, $c2 note E_, 16 endchannel -Music_YellowIntro_Ch3: - notetype $c, $10 + + +Music_YellowIntro_Ch3:: + notetype 12, $10 octave 4 note E_, 1 note __, 1 diff --git a/crysaudio/music/RBY/yellowunusedsong.asm b/crysaudio/music/RBY/yellowunusedsong.asm index a72ecd39..0ffad520 100644 --- a/crysaudio/music/RBY/yellowunusedsong.asm +++ b/crysaudio/music/RBY/yellowunusedsong.asm @@ -1,15 +1,15 @@ -Music_YellowUnusedSong: - dbw $C0, Music_YellowUnusedSong_Ch1 - dbw $01, Music_YellowUnusedSong_Ch2 - dbw $02, Music_YellowUnusedSong_Ch3 - dbw $03, Music_YellowUnusedSong_Ch4 +Music_YellowUnusedSong:: + musicheader 4, 1, Music_YellowUnusedSong_Ch1 + musicheader 1, 2, Music_YellowUnusedSong_Ch2 + musicheader 1, 3, Music_YellowUnusedSong_Ch3 + musicheader 1, 4, Music_YellowUnusedSong_Ch4 -Music_YellowUnusedSong_Ch1: +Music_YellowUnusedSong_Ch1:: tempo 140 - volume 119 + volume $77 dutycycle 3 - vibrato $8, $14 - notetype $8, $b2 + vibrato 8, $14 + notetype 8, $b2 octave 3 note A_, 6 note A_, 2 @@ -30,7 +30,8 @@ Music_YellowUnusedSong_Ch1: note A_, 6 note G_, 6 note A_, 12 -Music_YellowUnusedSong_branch_82fde: + +Music_YellowUnusedSong_branch_82fde:: note A_, 6 note A_, 2 note A_, 2 @@ -78,9 +79,11 @@ Music_YellowUnusedSong_branch_82fde: note G_, 6 note A_, 12 loopchannel 0, Music_YellowUnusedSong_branch_82fde -Music_YellowUnusedSong_Ch2: + + +Music_YellowUnusedSong_Ch2:: dutycycle 2 - notetype $8, $c2 + notetype 8, $c2 octave 4 note D_, 6 note D_, 2 @@ -103,7 +106,8 @@ Music_YellowUnusedSong_Ch2: note D_, 6 note A#, 6 note A_, 12 -Music_YellowUnusedSong_branch_8302a: + +Music_YellowUnusedSong_branch_8302a:: note D_, 6 note D_, 2 note D_, 2 @@ -125,7 +129,7 @@ Music_YellowUnusedSong_branch_8302a: note C_, 6 note G#, 6 note G_, 12 - notetype $8, $90 + notetype 8, $90 octave 3 note D#, 16 note D#, 8 @@ -137,7 +141,7 @@ Music_YellowUnusedSong_branch_8302a: octave 3 note D#, 12 note F_, 12 - notetype $8, $c2 + notetype 8, $c2 octave 4 note D_, 6 note D_, 2 @@ -161,9 +165,11 @@ Music_YellowUnusedSong_branch_8302a: note A#, 6 note A_, 12 loopchannel 0, Music_YellowUnusedSong_branch_8302a -Music_YellowUnusedSong_Ch3: - notetype $c, $10 - vibrato $2, $15 + + +Music_YellowUnusedSong_Ch3:: + notetype 12, $10 + vibrato 2, $15 note __, 16 note __, 12 octave 4 @@ -172,7 +178,8 @@ Music_YellowUnusedSong_Ch3: note D#, 8 note G_, 8 note A#, 8 -Music_YellowUnusedSong_branch_83075: + +Music_YellowUnusedSong_branch_83075:: note A_, 8 note A#, 8 note G_, 8 @@ -199,9 +206,11 @@ Music_YellowUnusedSong_branch_83075: note G_, 8 note A#, 8 loopchannel 0, Music_YellowUnusedSong_branch_83075 -Music_YellowUnusedSong_Ch4: - notetype 12 + + +Music_YellowUnusedSong_Ch4:: togglenoise 0 + notetype 12 note D_, 4 notetype 8 note D_, 2 @@ -228,7 +237,8 @@ Music_YellowUnusedSong_Ch4: note D_, 2 note D_, 4 note D_, 4 -Music_YellowUnusedSong_branch_830c3: + +Music_YellowUnusedSong_branch_830c3:: note D_, 4 notetype 8 note D_, 2