diff options
95 files changed, 2162 insertions, 3037 deletions
diff --git a/audio/music/aftertherivalfight.asm b/audio/music/aftertherivalfight.asm index 3d06b88d..114a6fd5 100644 --- a/audio/music/aftertherivalfight.asm +++ b/audio/music/aftertherivalfight.asm @@ -1,11 +1,10 @@ -Music_AfterTheRivalFight: ; f5127 - dbw $c0, Music_AfterTheRivalFight_Ch1 - dbw $01, Music_AfterTheRivalFight_Ch2 - dbw $02, Music_AfterTheRivalFight_Ch3 - dbw $03, Music_AfterTheRivalFight_Ch4 -; f5133 +Music_AfterTheRivalFight: + musicheader 4, 1, Music_AfterTheRivalFight_Ch1 + musicheader 1, 2, Music_AfterTheRivalFight_Ch2 + musicheader 1, 3, Music_AfterTheRivalFight_Ch3 + musicheader 1, 4, Music_AfterTheRivalFight_Ch4 -Music_AfterTheRivalFight_Ch1: ; f5133 +Music_AfterTheRivalFight_Ch1: tempo 112 volume $77 dutycycle $0 @@ -23,9 +22,8 @@ Music_AfterTheRivalFight_Ch1: ; f5133 note G#, 2 note G#, 2 loopchannel 0, Music_AfterTheRivalFight_branch_f4fb1 -; f5153 -Music_AfterTheRivalFight_Ch2: ; f5153 +Music_AfterTheRivalFight_Ch2: dutycycle $1 vibrato $6, $35 stereopanning $f @@ -39,9 +37,8 @@ Music_AfterTheRivalFight_Ch2: ; f5153 note G#, 2 note G#, 2 loopchannel 0, Music_AfterTheRivalFight_branch_f502e -; f516a -Music_AfterTheRivalFight_Ch3: ; f516a +Music_AfterTheRivalFight_Ch3: notetype $c, $28 octave 3 note D#, 2 @@ -53,9 +50,8 @@ Music_AfterTheRivalFight_Ch3: ; f516a note F_, 2 note D#, 2 loopchannel 0, Music_AfterTheRivalFight_branch_f509d -; f517a -Music_AfterTheRivalFight_Ch4: ; f517a +Music_AfterTheRivalFight_Ch4: togglenoise $3 stereopanning $f notetype $c @@ -66,6 +62,3 @@ Music_AfterTheRivalFight_Ch4: ; f517a note D_, 2 note D_, 2 loopchannel 0, Music_AfterTheRivalFight_branch_f5118 -; f518a - - diff --git a/audio/music/azaleatown.asm b/audio/music/azaleatown.asm index 55365d9a..0b230447 100644 --- a/audio/music/azaleatown.asm +++ b/audio/music/azaleatown.asm @@ -1,18 +1,17 @@ -Music_AzaleaTown: ; f57e8 - dbw $c0, Music_AzaleaTown_Ch1 - dbw $01, Music_AzaleaTown_Ch2 - dbw $02, Music_AzaleaTown_Ch3 - dbw $03, Music_AzaleaTown_Ch4 -; f57f4 +Music_AzaleaTown: + musicheader 4, 1, Music_AzaleaTown_Ch1 + musicheader 1, 2, Music_AzaleaTown_Ch2 + musicheader 1, 3, Music_AzaleaTown_Ch3 + musicheader 1, 4, Music_AzaleaTown_Ch4 -Music_AzaleaTown_Ch1: ; f57f4 +Music_AzaleaTown_Ch1: tempo 160 volume $77 dutycycle $2 stereopanning $f notetype $c, $a1 note __, 2 -Music_AzaleaTown_branch_f5801: ; f5801 +Music_AzaleaTown_branch_f5801: intensity $a1 octave 3 note F_, 2 @@ -27,7 +26,7 @@ Music_AzaleaTown_branch_f5801: ; f5801 note F_, 2 note F_, 2 loopchannel 2, Music_AzaleaTown_branch_f5801 -Music_AzaleaTown_branch_f5816: ; f5816 +Music_AzaleaTown_branch_f5816: callchannel Music_AzaleaTown_branch_f588c stereopanning $f0 intensity $a4 @@ -119,9 +118,8 @@ Music_AzaleaTown_branch_f5816: ; f5816 note G#, 14 note __, 2 loopchannel 0, Music_AzaleaTown_branch_f5816 -; f588c -Music_AzaleaTown_branch_f588c: ; f588c +Music_AzaleaTown_branch_f588c: notetype $c, $a1 octave 4 note F_, 2 @@ -219,9 +217,8 @@ Music_AzaleaTown_branch_f588c: ; f588c intensity $61 note C#, 2 endchannel -; f5912 -Music_AzaleaTown_branch_f5912: ; f5912 +Music_AzaleaTown_branch_f5912: intensity $61 note G#, 8 note G#, 8 @@ -230,9 +227,8 @@ Music_AzaleaTown_branch_f5912: ; f5912 intensity $a1 note A_, 8 endchannel -; f591d -Music_AzaleaTown_Ch2: ; f591d +Music_AzaleaTown_Ch2: vibrato $12, $23 dutycycle $2 stereopanning $f0 @@ -268,7 +264,7 @@ Music_AzaleaTown_Ch2: ; f591d dutycycle $1 octave 5 note C_, 1 -Music_AzaleaTown_branch_f5952: ; f5952 +Music_AzaleaTown_branch_f5952: callchannel Music_AzaleaTown_branch_f59c7 note C#, 4 note C_, 2 @@ -366,9 +362,8 @@ Music_AzaleaTown_branch_f5952: ; f5952 octave 5 note C_, 2 loopchannel 0, Music_AzaleaTown_branch_f5952 -; f59c7 -Music_AzaleaTown_branch_f59c7: ; f59c7 +Music_AzaleaTown_branch_f59c7: note C#, 4 octave 4 note G#, 2 @@ -420,9 +415,8 @@ Music_AzaleaTown_branch_f59c7: ; f59c7 note D#, 12 intensity $b4 endchannel -; f5a08 -Music_AzaleaTown_Ch3: ; f5a08 +Music_AzaleaTown_Ch3: stereopanning $ff vibrato $6, $26 notetype $c, $25 @@ -446,7 +440,7 @@ Music_AzaleaTown_Ch3: ; f5a08 note C#, 1 note __, 1 note G#, 4 -Music_AzaleaTown_branch_f5a24: ; f5a24 +Music_AzaleaTown_branch_f5a24: callchannel Music_AzaleaTown_branch_f5a86 note G#, 4 note D#, 2 @@ -534,9 +528,8 @@ Music_AzaleaTown_branch_f5a24: ; f5a24 octave 3 note C_, 1 loopchannel 0, Music_AzaleaTown_branch_f5a24 -; f5a86 -Music_AzaleaTown_branch_f5a86: ; f5a86 +Music_AzaleaTown_branch_f5a86: note C#, 1 note __, 5 note C#, 1 @@ -608,9 +601,8 @@ Music_AzaleaTown_branch_f5a86: ; f5a86 note C_, 1 note __, 1 endchannel -; f5acf -Music_AzaleaTown_branch_f5acf: ; f5acf +Music_AzaleaTown_branch_f5acf: intensity $35 octave 3 note F_, 1 @@ -631,13 +623,12 @@ Music_AzaleaTown_branch_f5acf: ; f5acf note F_, 1 note __, 1 endchannel -; f5ae5 -Music_AzaleaTown_Ch4: ; f5ae5 +Music_AzaleaTown_Ch4: togglenoise $3 notetype $c note F_, 2 -Music_AzaleaTown_branch_f5aea: ; f5aea +Music_AzaleaTown_branch_f5aea: note D#, 2 note F#, 2 note D_, 2 @@ -660,6 +651,3 @@ Music_AzaleaTown_branch_f5aea: ; f5aea note D_, 2 note F#, 2 loopchannel 0, Music_AzaleaTown_branch_f5aea -; f5b03 - - diff --git a/audio/music/bicycle.asm b/audio/music/bicycle.asm index 0a1a68fd..92a19e81 100644 --- a/audio/music/bicycle.asm +++ b/audio/music/bicycle.asm @@ -1,11 +1,10 @@ -Music_Bicycle: ; ee119 - dbw $c0, Music_Bicycle_Ch1 - dbw $01, Music_Bicycle_Ch2 - dbw $02, Music_Bicycle_Ch3 - dbw $03, Music_Bicycle_Ch4 -; ee125 +Music_Bicycle: + musicheader 4, 1, Music_Bicycle_Ch1 + musicheader 1, 2, Music_Bicycle_Ch2 + musicheader 1, 3, Music_Bicycle_Ch3 + musicheader 1, 4, Music_Bicycle_Ch4 -Music_Bicycle_Ch1: ; ee125 +Music_Bicycle_Ch1: tempo 140 volume $77 dutycycle $3 @@ -23,7 +22,7 @@ Music_Bicycle_Ch1: ; ee125 note A_, 8 intensity $b2 note F#, 2 -Music_Bicycle_branch_ee144: ; ee144 +Music_Bicycle_branch_ee144: stereopanning $f intensity $b2 note G_, 2 @@ -169,9 +168,8 @@ Music_Bicycle_branch_ee144: ; ee144 note G#, 2 note A_, 2 loopchannel 0, Music_Bicycle_branch_ee144 -; ee1de -Music_Bicycle_Ch2: ; ee1de +Music_Bicycle_Ch2: dutycycle $2 vibrato $10, $24 stereopanning $f0 @@ -195,7 +193,7 @@ Music_Bicycle_Ch2: ; ee1de octave 3 note B_, 2 note A_, 2 -Music_Bicycle_branch_ee1fd: ; ee1fd +Music_Bicycle_branch_ee1fd: stereopanning $ff dutycycle $2 intensity $c3 @@ -273,9 +271,8 @@ Music_Bicycle_branch_ee1fd: ; ee1fd note G_, 2 note F#, 4 loopchannel 0, Music_Bicycle_branch_ee1fd -; ee263 -Music_Bicycle_branch_ee263: ; ee263 +Music_Bicycle_branch_ee263: note G_, 6 note B_, 6 note G_, 4 @@ -286,9 +283,8 @@ Music_Bicycle_branch_ee263: ; ee263 note G_, 6 note E_, 4 endchannel -; ee26d -Music_Bicycle_Ch3: ; ee26d +Music_Bicycle_Ch3: notetype $c, $14 note __, 16 octave 3 @@ -305,7 +301,7 @@ Music_Bicycle_Ch3: ; ee26d octave 3 note A_, 1 note __, 1 -Music_Bicycle_branch_ee27f: ; ee27f +Music_Bicycle_branch_ee27f: callchannel Music_Bicycle_branch_ee333 note E_, 1 note __, 1 @@ -408,7 +404,7 @@ Music_Bicycle_branch_ee27f: ; ee27f note __, 1 note A_, 1 note __, 1 -Music_Bicycle_branch_ee2e9: ; ee2e9 +Music_Bicycle_branch_ee2e9: note G_, 1 note __, 1 note B_, 1 @@ -477,9 +473,8 @@ Music_Bicycle_branch_ee2e9: ; ee2e9 note __, 1 loopchannel 2, Music_Bicycle_branch_ee2e9 loopchannel 0, Music_Bicycle_branch_ee27f -; ee333 -Music_Bicycle_branch_ee333: ; ee333 +Music_Bicycle_branch_ee333: octave 3 note G_, 1 note __, 1 @@ -498,16 +493,15 @@ Music_Bicycle_branch_ee333: ; ee333 note B_, 1 note __, 1 endchannel -; ee345 -Music_Bicycle_Ch4: ; ee345 +Music_Bicycle_Ch4: togglenoise $0 notetype $c note __, 16 note __, 16 -Music_Bicycle_branch_ee34b: ; ee34b +Music_Bicycle_branch_ee34b: note __, 2 -Music_Bicycle_branch_ee34c: ; ee34c +Music_Bicycle_branch_ee34c: stereopanning $f0 note F_, 4 loopchannel 12, Music_Bicycle_branch_ee34c @@ -518,6 +512,3 @@ Music_Bicycle_branch_ee34c: ; ee34c note F_, 2 note F_, 2 loopchannel 0, Music_Bicycle_branch_ee34b -; ee35e - - diff --git a/audio/music/bugcatchingcontest.asm b/audio/music/bugcatchingcontest.asm index f52d5045..e77bf550 100644 --- a/audio/music/bugcatchingcontest.asm +++ b/audio/music/bugcatchingcontest.asm @@ -1,11 +1,10 @@ -Music_BugCatchingContest: ; f7c16 - dbw $c0, Music_BugCatchingContest_Ch1 - dbw $01, Music_BugCatchingContest_Ch2 - dbw $02, Music_BugCatchingContest_Ch3 - dbw $03, Music_BugCatchingContest_Ch4 -; f7c22 +Music_BugCatchingContest: + musicheader 4, 1, Music_BugCatchingContest_Ch1 + musicheader 1, 2, Music_BugCatchingContest_Ch2 + musicheader 1, 3, Music_BugCatchingContest_Ch3 + musicheader 1, 4, Music_BugCatchingContest_Ch4 -Music_BugCatchingContest_Ch1: ; f7c22 +Music_BugCatchingContest_Ch1: tempo 144 volume $77 stereopanning $f @@ -38,14 +37,14 @@ Music_BugCatchingContest_Ch1: ; f7c22 note __, 1 note E_, 1 note E_, 1 -Music_BugCatchingContest_branch_f7c4b: ; f7c4b +Music_BugCatchingContest_branch_f7c4b: notetype $c, $b1 -Music_BugCatchingContest_branch_f7c4e: ; f7c4e +Music_BugCatchingContest_branch_f7c4e: note __, 2 octave 2 note A_, 2 loopchannel 4, Music_BugCatchingContest_branch_f7c4e -Music_BugCatchingContest_branch_f7c55: ; f7c55 +Music_BugCatchingContest_branch_f7c55: note __, 2 note B_, 2 loopchannel 8, Music_BugCatchingContest_branch_f7c55 @@ -61,7 +60,7 @@ Music_BugCatchingContest_branch_f7c55: ; f7c55 note E_, 1 intensity $b1 dutycycle $2 -Music_BugCatchingContest_branch_f7c6b: ; f7c6b +Music_BugCatchingContest_branch_f7c6b: note __, 2 octave 2 note A_, 2 @@ -91,7 +90,7 @@ Music_BugCatchingContest_branch_f7c6b: ; f7c6b note E_, 4 note __, 4 note E_, 4 -Music_BugCatchingContest_branch_f7c8e: ; f7c8e +Music_BugCatchingContest_branch_f7c8e: note __, 4 octave 2 note A_, 4 @@ -187,15 +186,14 @@ Music_BugCatchingContest_branch_f7c8e: ; f7c8e note E_, 2 note E_, 2 loopchannel 0, Music_BugCatchingContest_branch_f7c4b -; f7cf4 -Music_BugCatchingContest_Ch2: ; f7cf4 +Music_BugCatchingContest_Ch2: stereopanning $f0 vibrato $8, $23 dutycycle $1 notetype $c, $c7 note __, 8 -Music_BugCatchingContest_branch_f7cff: ; f7cff +Music_BugCatchingContest_branch_f7cff: octave 4 note A_, 1 note __, 1 @@ -204,7 +202,7 @@ Music_BugCatchingContest_branch_f7cff: ; f7cff note A_, 1 note A_, 1 loopchannel 4, Music_BugCatchingContest_branch_f7cff -Music_BugCatchingContest_branch_f7d0a: ; f7d0a +Music_BugCatchingContest_branch_f7d0a: dutycycle $0 callchannel Music_BugCatchingContest_branch_f7d8e octave 2 @@ -328,9 +326,8 @@ Music_BugCatchingContest_branch_f7d0a: ; f7d0a note __, 3 note A_, 10 loopchannel 0, Music_BugCatchingContest_branch_f7d0a -; f7d8e -Music_BugCatchingContest_branch_f7d8e: ; f7d8e +Music_BugCatchingContest_branch_f7d8e: octave 2 note D_, 2 octave 3 @@ -372,9 +369,8 @@ Music_BugCatchingContest_branch_f7d8e: ; f7d8e note G_, 1 note __, 1 endchannel -; f7db7 -Music_BugCatchingContest_Ch3: ; f7db7 +Music_BugCatchingContest_Ch3: stereopanning $ff vibrato $10, $23 notetype $c, $14 @@ -405,7 +401,7 @@ Music_BugCatchingContest_Ch3: ; f7db7 note __, 1 note C#, 1 note C#, 1 -Music_BugCatchingContest_branch_f7dda: ; f7dda +Music_BugCatchingContest_branch_f7dda: notetype $c, $14 note F#, 5 note __, 1 @@ -587,9 +583,8 @@ Music_BugCatchingContest_branch_f7dda: ; f7dda note C#, 2 note C#, 2 loopchannel 0, Music_BugCatchingContest_branch_f7dda -; f7e9a -Music_BugCatchingContest_Ch4: ; f7e9a +Music_BugCatchingContest_Ch4: togglenoise $4 notetype $6 note C#, 1 @@ -607,7 +602,7 @@ Music_BugCatchingContest_Ch4: ; f7e9a note E_, 2 note E_, 2 callchannel Music_BugCatchingContest_branch_f7ee2 -Music_BugCatchingContest_branch_f7eaf: ; f7eaf +Music_BugCatchingContest_branch_f7eaf: note D_, 4 note D_, 4 note D_, 2 @@ -651,9 +646,8 @@ Music_BugCatchingContest_branch_f7eaf: ; f7eaf note D_, 2 callchannel Music_BugCatchingContest_branch_f7ee2 loopchannel 0, Music_BugCatchingContest_branch_f7eaf -; f7ee2 -Music_BugCatchingContest_branch_f7ee2: ; f7ee2 +Music_BugCatchingContest_branch_f7ee2: note D_, 4 note B_, 8 note D_, 2 @@ -671,5 +665,3 @@ Music_BugCatchingContest_branch_f7ee2: ; f7ee2 note D_, 2 note D_, 2 endchannel -; f7ef3 - diff --git a/audio/music/burnedtower.asm b/audio/music/burnedtower.asm index 358a76c0..723e7814 100644 --- a/audio/music/burnedtower.asm +++ b/audio/music/burnedtower.asm @@ -1,11 +1,10 @@ -Music_BurnedTower: ; f6a99 - dbw $c0, Music_BurnedTower_Ch1 - dbw $01, Music_BurnedTower_Ch2 - dbw $02, Music_BurnedTower_Ch3 - dbw $03, Music_BurnedTower_Ch4 -; f6aa5 +Music_BurnedTower: + musicheader 4, 1, Music_BurnedTower_Ch1 + musicheader 1, 2, Music_BurnedTower_Ch2 + musicheader 1, 3, Music_BurnedTower_Ch3 + musicheader 1, 4, Music_BurnedTower_Ch4 -Music_BurnedTower_Ch1: ; f6aa5 +Music_BurnedTower_Ch1: tempo 168 volume $77 dutycycle $1 @@ -27,7 +26,7 @@ Music_BurnedTower_Ch1: ; f6aa5 note D_, 2 intensity $80 note C#, 6 -Music_BurnedTower_branch_f6ac8: ; f6ac8 +Music_BurnedTower_branch_f6ac8: intensity $91 octave 2 note A_, 4 @@ -37,7 +36,7 @@ Music_BurnedTower_branch_f6ac8: ; f6ac8 note A#, 6 loopchannel 2, Music_BurnedTower_branch_f6ac8 tempo 150 -Music_BurnedTower_branch_f6ad8: ; f6ad8 +Music_BurnedTower_branch_f6ad8: intensity $b1 octave 2 note A_, 4 @@ -87,7 +86,7 @@ Music_BurnedTower_branch_f6ad8: ; f6ad8 note E_, 2 intensity $a0 note D#, 6 -Music_BurnedTower_branch_f6b17: ; f6b17 +Music_BurnedTower_branch_f6b17: intensity $b1 octave 2 note B_, 4 @@ -98,16 +97,15 @@ Music_BurnedTower_branch_f6b17: ; f6b17 note C_, 6 loopchannel 2, Music_BurnedTower_branch_f6b17 loopchannel 0, Music_BurnedTower_branch_f6ad8 -; f6b29 -Music_BurnedTower_Ch2: ; f6b29 +Music_BurnedTower_Ch2: dutycycle $2 vibrato $20, $82 tone $0002 notetype $c, $70 callchannel Music_BurnedTower_branch_f6b8e intensity $c5 -Music_BurnedTower_branch_f6b39: ; f6b39 +Music_BurnedTower_branch_f6b39: callchannel Music_BurnedTower_branch_f6b8e intensity $c1 dutycycle $3 @@ -170,9 +168,8 @@ Music_BurnedTower_branch_f6b39: ; f6b39 intensity $b7 note F#, 16 loopchannel 0, Music_BurnedTower_branch_f6b39 -; f6b8e -Music_BurnedTower_branch_f6b8e: ; f6b8e +Music_BurnedTower_branch_f6b8e: octave 3 note E_, 4 note D_, 2 @@ -193,9 +190,8 @@ Music_BurnedTower_branch_f6b8e: ; f6b8e note D_, 4 note E_, 16 endchannel -; f6ba2 -Music_BurnedTower_Ch3: ; f6ba2 +Music_BurnedTower_Ch3: stereopanning $f notetype $c, $14 note __, 16 @@ -204,7 +200,7 @@ Music_BurnedTower_Ch3: ; f6ba2 note __, 12 octave 3 note D#, 4 -Music_BurnedTower_branch_f6bad: ; f6bad +Music_BurnedTower_branch_f6bad: octave 2 note A_, 2 octave 3 @@ -224,7 +220,7 @@ Music_BurnedTower_branch_f6bad: ; f6bad note E_, 2 note D#, 4 loopchannel 4, Music_BurnedTower_branch_f6bad -Music_BurnedTower_branch_f6bc3: ; f6bc3 +Music_BurnedTower_branch_f6bc3: octave 2 note B_, 2 octave 3 @@ -245,16 +241,15 @@ Music_BurnedTower_branch_f6bc3: ; f6bc3 note F_, 4 loopchannel 2, Music_BurnedTower_branch_f6bc3 loopchannel 0, Music_BurnedTower_branch_f6bad -; f6bdd -Music_BurnedTower_Ch4: ; f6bdd +Music_BurnedTower_Ch4: togglenoise $0 notetype $c -Music_BurnedTower_branch_f6be1: ; f6be1 +Music_BurnedTower_branch_f6be1: note __, 16 loopchannel 4, Music_BurnedTower_branch_f6be1 note __, 2 -Music_BurnedTower_branch_f6be7: ; f6be7 +Music_BurnedTower_branch_f6be7: stereopanning $f0 note G_, 2 note G#, 2 @@ -262,6 +257,3 @@ Music_BurnedTower_branch_f6be7: ; f6be7 note G#, 2 note G_, 4 loopchannel 0, Music_BurnedTower_branch_f6be7 -; f6bf2 - - diff --git a/audio/music/celadoncity.asm b/audio/music/celadoncity.asm index 12db4dad..de815cc9 100644 --- a/audio/music/celadoncity.asm +++ b/audio/music/celadoncity.asm @@ -1,14 +1,13 @@ -Music_CeladonCity: ; f435b - dbw $80, Music_CeladonCity_Ch1 - dbw $01, Music_CeladonCity_Ch2 - dbw $02, Music_CeladonCity_Ch3 -; f4364 +Music_CeladonCity: + musicheader 3, 1, Music_CeladonCity_Ch1 + musicheader 1, 2, Music_CeladonCity_Ch2 + musicheader 1, 3, Music_CeladonCity_Ch3 -Music_CeladonCity_Ch1: ; f4364 +Music_CeladonCity_Ch1: tempo 146 volume $77 tone $0001 -Music_CeladonCity_branch_f436c: ; f436c +Music_CeladonCity_branch_f436c: stereopanning $f notetype $c, $a6 octave 3 @@ -20,7 +19,7 @@ Music_CeladonCity_branch_f436c: ; f436c note E_, 2 note F#, 2 callchannel Music_CeladonCity_branch_f43cc -Music_CeladonCity_branch_f437d: ; f437d +Music_CeladonCity_branch_f437d: note D_, 2 note F#, 1 note A_, 1 @@ -84,9 +83,8 @@ Music_CeladonCity_branch_f437d: ; f437d note G_, 1 note A_, 8 loopchannel 0, Music_CeladonCity_branch_f436c -; f43cc -Music_CeladonCity_branch_f43cc: ; f43cc +Music_CeladonCity_branch_f43cc: note D_, 2 note G_, 1 note B_, 1 @@ -105,9 +103,8 @@ Music_CeladonCity_branch_f43cc: ; f43cc octave 3 note A_, 1 endchannel -; f43e1 -Music_CeladonCity_branch_f43e1: ; f43e1 +Music_CeladonCity_branch_f43e1: octave 2 note G_, 2 note B_, 1 @@ -134,17 +131,15 @@ Music_CeladonCity_branch_f43e1: ; f43e1 octave 3 note B_, 1 endchannel -; f43fe -Music_CeladonCity_branch_f43fe: ; f43fe +Music_CeladonCity_branch_f43fe: note D_, 2 note F#, 1 note A_, 1 loopchannel 4, Music_CeladonCity_branch_f43fe endchannel -; f4406 -Music_CeladonCity_Ch2: ; f4406 +Music_CeladonCity_Ch2: vibrato $12, $34 dutycycle $2 stereopanning $f0 @@ -159,7 +154,7 @@ Music_CeladonCity_Ch2: ; f4406 note F#, 1 note G_, 1 note A_, 8 -Music_CeladonCity_branch_f441a: ; f441a +Music_CeladonCity_branch_f441a: callchannel Music_CeladonCity_branch_f4463 note A_, 4 note F#, 4 @@ -218,9 +213,8 @@ Music_CeladonCity_branch_f441a: ; f441a octave 5 note D_, 16 loopchannel 0, Music_CeladonCity_branch_f441a -; f4463 -Music_CeladonCity_branch_f4463: ; f4463 +Music_CeladonCity_branch_f4463: intensity $b2 octave 4 note B_, 4 @@ -237,9 +231,8 @@ Music_CeladonCity_branch_f4463: ; f4463 note B_, 2 note A_, 8 endchannel -; f4474 -Music_CeladonCity_branch_f4474: ; f4474 +Music_CeladonCity_branch_f4474: note G_, 3 note B_, 1 octave 2 @@ -270,11 +263,10 @@ Music_CeladonCity_branch_f4474: ; f4474 note D_, 2 note F#, 4 endchannel -; f4492 -Music_CeladonCity_Ch3: ; f4492 +Music_CeladonCity_Ch3: vibrato $12, $24 -Music_CeladonCity_branch_f4495: ; f4495 +Music_CeladonCity_branch_f4495: notetype $c, $25 octave 3 note A_, 2 @@ -283,7 +275,7 @@ Music_CeladonCity_branch_f4495: ; f4495 note __, 2 note D_, 8 callchannel Music_CeladonCity_branch_f44fd -Music_CeladonCity_branch_f44a1: ; f44a1 +Music_CeladonCity_branch_f44a1: octave 2 note A_, 2 note __, 2 @@ -363,9 +355,8 @@ Music_CeladonCity_branch_f44a1: ; f44a1 note D_, 2 note __, 6 loopchannel 0, Music_CeladonCity_branch_f4495 -; f44fd -Music_CeladonCity_branch_f44fd: ; f44fd +Music_CeladonCity_branch_f44fd: octave 2 note G_, 2 note __, 2 @@ -382,9 +373,8 @@ Music_CeladonCity_branch_f44fd: ; f44fd octave 2 note G#, 1 endchannel -; f4510 -Music_CeladonCity_branch_f4510: ; f4510 +Music_CeladonCity_branch_f4510: octave 5 note D_, 8 note C_, 2 @@ -393,6 +383,3 @@ Music_CeladonCity_branch_f4510: ; f4510 note A_, 2 note B_, 2 endchannel -; f4518 - - diff --git a/audio/music/championbattle.asm b/audio/music/championbattle.asm index 24c38e50..e732d39c 100644 --- a/audio/music/championbattle.asm +++ b/audio/music/championbattle.asm @@ -1,10 +1,9 @@ -Music_ChampionBattle: ; ea96a - dbw $80, Music_ChampionBattle_Ch1 - dbw $01, Music_ChampionBattle_Ch2 - dbw $02, Music_ChampionBattle_Ch3 -; ea973 +Music_ChampionBattle: + musicheader 3, 1, Music_ChampionBattle_Ch1 + musicheader 1, 2, Music_ChampionBattle_Ch2 + musicheader 1, 3, Music_ChampionBattle_Ch3 -Music_ChampionBattle_Ch1: ; ea973 +Music_ChampionBattle_Ch1: tempo 98 volume $77 dutycycle $3 @@ -18,22 +17,22 @@ Music_ChampionBattle_Ch1: ; ea973 note A#, 4 intensity $b7 note B_, 4 -Music_ChampionBattle_branch_ea98b: ; ea98b - callchannel Music_ChampionBattle_branch_eaa97 +Music_ChampionBattle_branch_ea9e2: + callchannel Music_ChampionBattle_branch_eaaee octave 3 note D#, 4 - loopchannel 2, Music_ChampionBattle_branch_ea98b - callchannel Music_ChampionBattle_branch_eaa97 + loopchannel 2, Music_ChampionBattle_branch_ea9e2 + callchannel Music_ChampionBattle_branch_eaaee octave 3 note E_, 4 -Music_ChampionBattle_branch_ea999: ; ea999 - callchannel Music_ChampionBattle_branch_eaaa5 - loopchannel 3, Music_ChampionBattle_branch_ea999 - callchannel Music_ChampionBattle_branch_eaaaf -Music_ChampionBattle_branch_ea9a3: ; ea9a3 - callchannel Music_ChampionBattle_branch_eaaa5 - loopchannel 7, Music_ChampionBattle_branch_ea9a3 - callchannel Music_ChampionBattle_branch_eaaaf +Music_ChampionBattle_branch_ea9f0: + callchannel Music_ChampionBattle_branch_eaafc + loopchannel 3, Music_ChampionBattle_branch_ea9f0 + callchannel Music_ChampionBattle_branch_eab06 +Music_ChampionBattle_branch_ea9fa: + callchannel Music_ChampionBattle_branch_eaafc + loopchannel 7, Music_ChampionBattle_branch_ea9fa + callchannel Music_ChampionBattle_branch_eab06 intensity $b2 note A#, 2 note A#, 2 @@ -73,25 +72,25 @@ Music_ChampionBattle_branch_ea9a3: ; ea9a3 octave 4 note C_, 1 note C#, 1 -Music_ChampionBattle_branch_ea9de: ; ea9de - callchannel Music_ChampionBattle_branch_eaab8 +Music_ChampionBattle_branch_eaa35: + callchannel Music_ChampionBattle_branch_eab0f note E_, 2 note E_, 2 intensity $b7 note F#, 4 -Music_ChampionBattle_branch_ea9e6: ; ea9e6 +Music_ChampionBattle_branch_eaa3d: intensity $b2 note E_, 2 note E_, 2 intensity $b7 note G#, 4 - loopchannel 2, Music_ChampionBattle_branch_ea9e6 + loopchannel 2, Music_ChampionBattle_branch_eaa3d intensity $b2 note E_, 2 note E_, 2 intensity $b7 note B_, 4 - callchannel Music_ChampionBattle_branch_eaab8 + callchannel Music_ChampionBattle_branch_eab0f note E_, 2 note E_, 2 intensity $b7 @@ -112,10 +111,10 @@ Music_ChampionBattle_branch_ea9e6: ; ea9e6 intensity $b7 octave 4 note E_, 4 - callchannel Music_ChampionBattle_branch_eaacd + callchannel Music_ChampionBattle_branch_eab24 note B_, 4 note G#, 4 - callchannel Music_ChampionBattle_branch_eaacd + callchannel Music_ChampionBattle_branch_eab24 octave 4 note D_, 4 note D_, 4 @@ -167,7 +166,7 @@ Music_ChampionBattle_branch_ea9e6: ; ea9e6 intensity $90 note D#, 16 note C#, 16 -Music_ChampionBattle_branch_eaa5a: ; eaa5a +Music_ChampionBattle_branch_eaab1: intensity $b2 octave 2 note A#, 2 @@ -175,14 +174,14 @@ Music_ChampionBattle_branch_eaa5a: ; eaa5a intensity $b7 octave 3 note D#, 4 - loopchannel 4, Music_ChampionBattle_branch_eaa5a -Music_ChampionBattle_branch_eaa67: ; eaa67 + loopchannel 4, Music_ChampionBattle_branch_eaab1 +Music_ChampionBattle_branch_eaabe: intensity $b2 note C_, 2 note C_, 2 intensity $b7 note D#, 4 - loopchannel 2, Music_ChampionBattle_branch_eaa67 + loopchannel 2, Music_ChampionBattle_branch_eaabe intensity $b2 note C_, 2 note C_, 2 @@ -193,23 +192,22 @@ Music_ChampionBattle_branch_eaa67: ; eaa67 note C_, 2 intensity $b7 note G#, 4 - callchannel Music_ChampionBattle_branch_eaada + callchannel Music_ChampionBattle_branch_eab31 octave 3 note D#, 2 note D#, 2 intensity $b7 note B_, 4 - callchannel Music_ChampionBattle_branch_eaada + callchannel Music_ChampionBattle_branch_eab31 octave 3 note D#, 2 note D#, 2 intensity $b7 octave 4 note D_, 4 - loopchannel 0, Music_ChampionBattle_branch_ea9de -; eaa97 + loopchannel 0, Music_ChampionBattle_branch_eaa35 -Music_ChampionBattle_branch_eaa97: ; eaa97 +Music_ChampionBattle_branch_eaaee: intensity $b2 octave 2 note A#, 2 @@ -222,9 +220,8 @@ Music_ChampionBattle_branch_eaa97: ; eaa97 note A#, 2 intensity $b7 endchannel -; eaaa5 -Music_ChampionBattle_branch_eaaa5: ; eaaa5 +Music_ChampionBattle_branch_eaafc: intensity $b2 octave 2 note A#, 2 @@ -233,9 +230,8 @@ Music_ChampionBattle_branch_eaaa5: ; eaaa5 octave 3 note D#, 4 endchannel -; eaaaf -Music_ChampionBattle_branch_eaaaf: ; eaaaf +Music_ChampionBattle_branch_eab06: intensity $b2 octave 2 note A#, 2 @@ -243,9 +239,8 @@ Music_ChampionBattle_branch_eaaaf: ; eaaaf intensity $b7 note B_, 4 endchannel -; eaab8 -Music_ChampionBattle_branch_eaab8: ; eaab8 +Music_ChampionBattle_branch_eab0f: intensity $b5 octave 3 note D#, 2 @@ -265,9 +260,8 @@ Music_ChampionBattle_branch_eaab8: ; eaab8 note G_, 2 intensity $b2 endchannel -; eaacd -Music_ChampionBattle_branch_eaacd: ; eaacd +Music_ChampionBattle_branch_eab24: intensity $b2 octave 3 note A#, 2 @@ -279,9 +273,8 @@ Music_ChampionBattle_branch_eaacd: ; eaacd note A#, 2 intensity $b7 endchannel -; eaada -Music_ChampionBattle_branch_eaada: ; eaada +Music_ChampionBattle_branch_eab31: intensity $b2 note D#, 2 note D#, 2 @@ -300,9 +293,8 @@ Music_ChampionBattle_branch_eaada: ; eaada note C#, 4 intensity $b2 endchannel -; eaaf3 -Music_ChampionBattle_Ch2: ; eaaf3 +Music_ChampionBattle_Ch2: dutycycle $3 vibrato $8, $36 tone $0001 @@ -314,18 +306,18 @@ Music_ChampionBattle_Ch2: ; eaaf3 note D#, 4 intensity $c7 note D_, 4 - callchannel Music_ChampionBattle_branch_eabf8 + callchannel Music_ChampionBattle_branch_eac4f note A#, 4 - callchannel Music_ChampionBattle_branch_eabf8 + callchannel Music_ChampionBattle_branch_eac4f note B_, 4 - callchannel Music_ChampionBattle_branch_eabf8 + callchannel Music_ChampionBattle_branch_eac4f octave 4 note C#, 4 - callchannel Music_ChampionBattle_branch_eac05 + callchannel Music_ChampionBattle_branch_eac5c note D_, 4 - callchannel Music_ChampionBattle_branch_eac05 + callchannel Music_ChampionBattle_branch_eac5c note F_, 4 - callchannel Music_ChampionBattle_branch_eac05 + callchannel Music_ChampionBattle_branch_eac5c note D_, 4 intensity $c2 note D#, 2 @@ -357,7 +349,7 @@ Music_ChampionBattle_Ch2: ; eaaf3 note E_, 8 intensity $3c note E_, 8 -Music_ChampionBattle_branch_eab46: ; eab46 +Music_ChampionBattle_branch_eab9d: intensity $c5 note D#, 6 octave 3 @@ -405,10 +397,10 @@ Music_ChampionBattle_branch_eab46: ; eab46 note G#, 8 note E_, 8 note B_, 8 - callchannel Music_ChampionBattle_branch_eac22 + callchannel Music_ChampionBattle_branch_eac79 note E_, 4 note E_, 4 - callchannel Music_ChampionBattle_branch_eac22 + callchannel Music_ChampionBattle_branch_eac79 note F#, 4 note F#, 4 intensity $c7 @@ -425,7 +417,7 @@ Music_ChampionBattle_branch_eab46: ; eab46 note F_, 16 note F#, 16 intensity $c4 -Music_ChampionBattle_branch_eab98: ; eab98 +Music_ChampionBattle_branch_eabef: octave 5 note D#, 4 note D_, 4 @@ -438,7 +430,7 @@ Music_ChampionBattle_branch_eab98: ; eab98 octave 4 note B_, 4 note B_, 4 - loopchannel 2, Music_ChampionBattle_branch_eab98 + loopchannel 2, Music_ChampionBattle_branch_eabef intensity $b0 octave 3 note D#, 16 @@ -497,10 +489,9 @@ Music_ChampionBattle_branch_eab98: ; eab98 note E_, 8 note F#, 8 note G#, 8 - loopchannel 0, Music_ChampionBattle_branch_eab46 -; eabf8 + loopchannel 0, Music_ChampionBattle_branch_eab9d -Music_ChampionBattle_branch_eabf8: ; eabf8 +Music_ChampionBattle_branch_eac4f: intensity $c2 note D#, 2 note D#, 6 @@ -512,9 +503,8 @@ Music_ChampionBattle_branch_eabf8: ; eabf8 note D#, 2 intensity $c7 endchannel -; eac05 -Music_ChampionBattle_branch_eac05: ; eac05 +Music_ChampionBattle_branch_eac5c: intensity $c2 octave 3 note D#, 2 @@ -536,9 +526,8 @@ Music_ChampionBattle_branch_eac05: ; eac05 note D#, 2 intensity $c7 endchannel -; eac22 -Music_ChampionBattle_branch_eac22: ; eac22 +Music_ChampionBattle_branch_eac79: intensity $c1 note D#, 2 note D#, 4 @@ -549,26 +538,25 @@ Music_ChampionBattle_branch_eac22: ; eac22 note D#, 2 intensity $c5 endchannel -; eac2e -Music_ChampionBattle_Ch3: ; eac2e +Music_ChampionBattle_Ch3: notetype $c, $14 -Music_ChampionBattle_branch_eac31: ; eac31 +Music_ChampionBattle_branch_eac88: octave 3 note D#, 1 note __, 7 - loopchannel 3, Music_ChampionBattle_branch_eac31 + loopchannel 3, Music_ChampionBattle_branch_eac88 note D#, 1 note __, 3 note E_, 4 - callchannel Music_ChampionBattle_branch_ead0a - callchannel Music_ChampionBattle_branch_ead0a - callchannel Music_ChampionBattle_branch_ead0a - callchannel Music_ChampionBattle_branch_ead18 + callchannel Music_ChampionBattle_branch_ead61 + callchannel Music_ChampionBattle_branch_ead61 + callchannel Music_ChampionBattle_branch_ead61 + callchannel Music_ChampionBattle_branch_ead6f note D_, 4 - callchannel Music_ChampionBattle_branch_ead18 + callchannel Music_ChampionBattle_branch_ead6f note A_, 4 - callchannel Music_ChampionBattle_branch_ead18 + callchannel Music_ChampionBattle_branch_ead6f note D_, 4 note D#, 1 note __, 1 @@ -601,14 +589,14 @@ Music_ChampionBattle_branch_eac31: ; eac31 note A#, 2 note F_, 2 note A_, 2 -Music_ChampionBattle_branch_eac6f: ; eac6f +Music_ChampionBattle_branch_eacc6: note D#, 2 note A#, 2 - loopchannel 8, Music_ChampionBattle_branch_eac6f -Music_ChampionBattle_branch_eac75: ; eac75 + loopchannel 8, Music_ChampionBattle_branch_eacc6 +Music_ChampionBattle_branch_eaccc: note E_, 2 note B_, 2 - loopchannel 5, Music_ChampionBattle_branch_eac75 + loopchannel 5, Music_ChampionBattle_branch_eaccc note E_, 2 octave 4 note C_, 2 @@ -617,15 +605,15 @@ Music_ChampionBattle_branch_eac75: ; eac75 note B_, 2 note G_, 2 note A_, 2 -Music_ChampionBattle_branch_eac83: ; eac83 +Music_ChampionBattle_branch_eacda: note D#, 2 note A#, 2 - loopchannel 8, Music_ChampionBattle_branch_eac83 -Music_ChampionBattle_branch_eac89: ; eac89 + loopchannel 8, Music_ChampionBattle_branch_eacda +Music_ChampionBattle_branch_eace0: note E_, 2 note B_, 2 - loopchannel 8, Music_ChampionBattle_branch_eac89 - callchannel Music_ChampionBattle_branch_ead2c + loopchannel 8, Music_ChampionBattle_branch_eace0 + callchannel Music_ChampionBattle_branch_ead83 octave 3 note D#, 2 note E_, 2 @@ -636,7 +624,7 @@ Music_ChampionBattle_branch_eac89: ; eac89 note D_, 2 note C#, 2 note C_, 2 - callchannel Music_ChampionBattle_branch_ead2c + callchannel Music_ChampionBattle_branch_ead83 octave 3 note D#, 2 note A#, 2 @@ -652,11 +640,11 @@ Music_ChampionBattle_branch_eac89: ; eac89 note D#, 8 note B_, 8 note D#, 8 -Music_ChampionBattle_branch_eacae: ; eacae +Music_ChampionBattle_branch_ead05: note D#, 2 note F#, 2 - loopchannel 16, Music_ChampionBattle_branch_eacae - callchannel Music_ChampionBattle_branch_ead37 + loopchannel 16, Music_ChampionBattle_branch_ead05 + callchannel Music_ChampionBattle_branch_ead8e octave 3 note E_, 2 note B_, 2 @@ -669,16 +657,16 @@ Music_ChampionBattle_branch_eacae: ; eacae octave 4 note D#, 2 note E_, 2 - callchannel Music_ChampionBattle_branch_ead37 -Music_ChampionBattle_branch_eacc6: ; eacc6 + callchannel Music_ChampionBattle_branch_ead8e +Music_ChampionBattle_branch_ead1d: octave 3 note E_, 2 note B_, 2 - loopchannel 4, Music_ChampionBattle_branch_eacc6 -Music_ChampionBattle_branch_eaccd: ; eaccd + loopchannel 4, Music_ChampionBattle_branch_ead1d +Music_ChampionBattle_branch_ead24: note D#, 2 note A#, 2 - loopchannel 5, Music_ChampionBattle_branch_eaccd + loopchannel 5, Music_ChampionBattle_branch_ead24 note B_, 2 octave 4 note D#, 2 @@ -687,10 +675,10 @@ Music_ChampionBattle_branch_eaccd: ; eaccd note __, 2 note D#, 2 note __, 2 -Music_ChampionBattle_branch_eacdb: ; eacdb +Music_ChampionBattle_branch_ead32: note E_, 2 note B_, 2 - loopchannel 5, Music_ChampionBattle_branch_eacdb + loopchannel 5, Music_ChampionBattle_branch_ead32 octave 4 note C#, 2 note E_, 2 @@ -699,47 +687,45 @@ Music_ChampionBattle_branch_eacdb: ; eacdb note __, 2 note E_, 2 note __, 2 -Music_ChampionBattle_branch_eace9: ; eace9 +Music_ChampionBattle_branch_ead40: note D#, 2 note G#, 2 - loopchannel 8, Music_ChampionBattle_branch_eace9 -Music_ChampionBattle_branch_eacef: ; eacef + loopchannel 8, Music_ChampionBattle_branch_ead40 +Music_ChampionBattle_branch_ead46: note D#, 2 note A#, 2 - loopchannel 7, Music_ChampionBattle_branch_eacef + loopchannel 7, Music_ChampionBattle_branch_ead46 note B_, 2 note A#, 2 -Music_ChampionBattle_branch_eacf7: ; eacf7 +Music_ChampionBattle_branch_ead4e: octave 3 note D#, 2 note A#, 2 octave 4 note D_, 2 note D#, 2 - loopchannel 7, Music_ChampionBattle_branch_eacf7 + loopchannel 7, Music_ChampionBattle_branch_ead4e note C#, 2 octave 3 note B_, 2 note A#, 2 note G#, 2 - loopchannel 0, Music_ChampionBattle_branch_eac6f -; ead0a + loopchannel 0, Music_ChampionBattle_branch_eacc6 -Music_ChampionBattle_branch_ead0a: ; ead0a +Music_ChampionBattle_branch_ead61: note D#, 1 note __, 1 note D#, 1 note __, 5 - loopchannel 3, Music_ChampionBattle_branch_ead0a + loopchannel 3, Music_ChampionBattle_branch_ead61 note D#, 1 note __, 1 note D#, 1 note __, 1 note B_, 4 endchannel -; ead18 -Music_ChampionBattle_branch_ead18: ; ead18 +Music_ChampionBattle_branch_ead6f: note D#, 1 note __, 1 note D#, 1 @@ -760,9 +746,8 @@ Music_ChampionBattle_branch_ead18: ; ead18 note D#, 1 note __, 1 endchannel -; ead2c -Music_ChampionBattle_branch_ead2c: ; ead2c +Music_ChampionBattle_branch_ead83: octave 3 note D#, 2 note F#, 2 @@ -774,9 +759,8 @@ Music_ChampionBattle_branch_ead2c: ; ead2c note C#, 2 note C_, 2 endchannel -; ead37 -Music_ChampionBattle_branch_ead37: ; ead37 +Music_ChampionBattle_branch_ead8e: octave 3 note E_, 2 note B_, 2 @@ -788,6 +772,3 @@ Music_ChampionBattle_branch_ead37: ; ead37 note D#, 2 note E_, 2 endchannel -; ead42 - - diff --git a/audio/music/cherrygrovecity.asm b/audio/music/cherrygrovecity.asm index 9751bd04..9a7e0980 100644 --- a/audio/music/cherrygrovecity.asm +++ b/audio/music/cherrygrovecity.asm @@ -1,11 +1,10 @@ -Music_CherrygroveCity: ; f5b03 - dbw $c0, Music_CherrygroveCity_Ch1 - dbw $01, Music_CherrygroveCity_Ch2 - dbw $02, Music_CherrygroveCity_Ch3 - dbw $03, Music_CherrygroveCity_Ch4 -; f5b0f +Music_CherrygroveCity: + musicheader 4, 1, Music_CherrygroveCity_Ch1 + musicheader 1, 2, Music_CherrygroveCity_Ch2 + musicheader 1, 3, Music_CherrygroveCity_Ch3 + musicheader 1, 4, Music_CherrygroveCity_Ch4 -Music_CherrygroveCity_Ch1: ; f5b0f +Music_CherrygroveCity_Ch1: tempo 152 volume $77 dutycycle $3 @@ -18,7 +17,7 @@ Music_CherrygroveCity_Ch1: ; f5b0f note C_, 2 note D_, 2 note E_, 2 -Music_CherrygroveCity_branch_f5b26: ; f5b26 +Music_CherrygroveCity_branch_f5b26: note A_, 4 note G#, 2 note A_, 2 @@ -92,9 +91,8 @@ Music_CherrygroveCity_branch_f5b26: ; f5b26 octave 3 note C_, 4 loopchannel 0, Music_CherrygroveCity_branch_f5b26 -; f5b74 -Music_CherrygroveCity_Ch2: ; f5b74 +Music_CherrygroveCity_Ch2: dutycycle $3 vibrato $10, $36 stereopanning $f @@ -108,7 +106,7 @@ Music_CherrygroveCity_Ch2: ; f5b74 note G_, 2 note A_, 2 note A#, 2 -Music_CherrygroveCity_branch_f5b87: ; f5b87 +Music_CherrygroveCity_branch_f5b87: intensity $c6 octave 4 note C_, 6 @@ -173,9 +171,8 @@ Music_CherrygroveCity_branch_f5b87: ; f5b87 intensity $a7 note F_, 8 loopchannel 0, Music_CherrygroveCity_branch_f5b87 -; f5bd8 -Music_CherrygroveCity_Ch3: ; f5bd8 +Music_CherrygroveCity_Ch3: notetype $c, $16 note __, 4 octave 4 @@ -186,7 +183,7 @@ Music_CherrygroveCity_Ch3: ; f5bd8 note G_, 2 note F_, 2 note E_, 2 -Music_CherrygroveCity_branch_f5be4: ; f5be4 +Music_CherrygroveCity_branch_f5be4: note A_, 2 note F_, 2 note A_, 2 @@ -284,13 +281,12 @@ Music_CherrygroveCity_branch_f5be4: ; f5be4 note F_, 2 note A_, 2 loopchannel 0, Music_CherrygroveCity_branch_f5be4 -; f5c48 -Music_CherrygroveCity_Ch4: ; f5c48 +Music_CherrygroveCity_Ch4: togglenoise $3 notetype $c note __, 16 -Music_CherrygroveCity_branch_f5c4d: ; f5c4d +Music_CherrygroveCity_branch_f5c4d: note C#, 2 note __, 2 note G_, 2 @@ -307,6 +303,3 @@ Music_CherrygroveCity_branch_f5c4d: ; f5c4d note C#, 2 note G_, 2 loopchannel 0, Music_CherrygroveCity_branch_f5c4d -; f5c60 - - diff --git a/audio/music/contestresults.asm b/audio/music/contestresults.asm index 7b0f4815..85d8291e 100644 --- a/audio/music/contestresults.asm +++ b/audio/music/contestresults.asm @@ -1,15 +1,14 @@ -Music_ContestResults: ; efb3e - dbw $c0, Music_ContestResults_Ch1 - dbw $01, Music_ContestResults_Ch2 - dbw $02, Music_ContestResults_Ch3 - dbw $03, Music_ContestResults_Ch4 -; efb4a +Music_ContestResults: + musicheader 4, 1, Music_ContestResults_Ch1 + musicheader 1, 2, Music_ContestResults_Ch2 + musicheader 1, 3, Music_ContestResults_Ch3 + musicheader 1, 4, Music_ContestResults_Ch4 -Music_ContestResults_Ch1: ; efb4a +Music_ContestResults_Ch1: tempo 144 volume $77 notetype $c, $51 -Music_ContestResults_branch_efb52: ; efb52 +Music_ContestResults_branch_efb52: note __, 2 octave 2 note G_, 1 @@ -48,11 +47,10 @@ Music_ContestResults_branch_efb52: ; efb52 note G_, 1 note __, 1 loopchannel 0, Music_ContestResults_branch_efb52 -; efb7b -Music_ContestResults_Ch2: ; efb7b +Music_ContestResults_Ch2: notetype $c, $61 -Music_ContestResults_branch_efb7e: ; efb7e +Music_ContestResults_branch_efb7e: octave 2 note C_, 2 octave 3 @@ -93,7 +91,7 @@ Music_ContestResults_branch_efb7e: ; efb7e octave 3 note F_, 1 note __, 1 -Music_ContestResults_branch_efba6: ; efba6 +Music_ContestResults_branch_efba6: octave 2 note D_, 2 octave 3 @@ -126,12 +124,11 @@ Music_ContestResults_branch_efba6: ; efba6 note D_, 1 note __, 1 loopchannel 0, Music_ContestResults_branch_efb7e -; efbcc -Music_ContestResults_Ch3: ; efbcc +Music_ContestResults_Ch3: vibrato $8, $24 notetype $c, $23 -Music_ContestResults_branch_efbd2: ; efbd2 +Music_ContestResults_branch_efbd2: octave 4 note E_, 5 note __, 1 @@ -152,12 +149,11 @@ Music_ContestResults_branch_efbd2: ; efbd2 note A_, 8 note G_, 8 loopchannel 0, Music_ContestResults_branch_efbd2 -; efbe9 -Music_ContestResults_Ch4: ; efbe9 +Music_ContestResults_Ch4: togglenoise $4 notetype $6 -Music_ContestResults_branch_efbed: ; efbed +Music_ContestResults_branch_efbed: note C#, 4 note C#, 4 note C#, 2 @@ -175,6 +171,3 @@ Music_ContestResults_branch_efbed: ; efbed note G_, 1 note G_, 1 loopchannel 0, Music_ContestResults_branch_efbed -; efc01 - - diff --git a/audio/music/credits.asm b/audio/music/credits.asm index 8dc9f5e3..8d862240 100644 --- a/audio/music/credits.asm +++ b/audio/music/credits.asm @@ -1,11 +1,10 @@ -Music_Credits: ; 1f84c - dbw $c0, Music_Credits_Ch1 - dbw $01, Music_Credits_Ch2 - dbw $02, Music_Credits_Ch3 - dbw $03, Music_Credits_Ch4 -; 1f858 +Music_Credits: + musicheader 4, 1, Music_Credits_Ch1 + musicheader 1, 2, Music_Credits_Ch2 + musicheader 1, 3, Music_Credits_Ch3 + musicheader 1, 4, Music_Credits_Ch4 -Music_Credits_Ch1: ; 1f858 +Music_Credits_Ch1: tempo 139 volume $77 stereopanning $f @@ -22,7 +21,7 @@ Music_Credits_Ch1: ; 1f858 octave 4 note C_, 7 note D_, 8 - callchannel Music_Credits_branch_1f9b3 + callchannel Music_Credits_branch_1f483 note __, 4 octave 3 note B_, 2 @@ -53,10 +52,10 @@ Music_Credits_Ch1: ; 1f858 octave 3 note __, 1 intensity $a7 - callchannel Music_Credits_branch_1f9b3 - callchannel Music_Credits_branch_1fa1d + callchannel Music_Credits_branch_1f483 + callchannel Music_Credits_branch_1f4ed intensity $97 - callchannel Music_Credits_branch_1fa28 + callchannel Music_Credits_branch_1f4f8 octave 3 note B_, 2 octave 4 @@ -118,8 +117,8 @@ Music_Credits_Ch1: ; 1f858 note C_, 2 octave 3 note B_, 2 - callchannel Music_Credits_branch_1fa28 - callchannel Music_Credits_branch_1fa89 + callchannel Music_Credits_branch_1f4f8 + callchannel Music_Credits_branch_1f559 note B_, 1 octave 4 note C_, 7 @@ -142,19 +141,19 @@ Music_Credits_Ch1: ; 1f858 note E_, 7 octave 3 note __, 1 - forceoctave $2 - callchannel Music_Credits_branch_1f9b3 - callchannel Music_Credits_branch_1fa1d - callchannel Music_Credits_branch_1fa28 - callchannel Music_Credits_branch_1fa89 - forceoctave $0 + pitchoffset 0, D_ + callchannel Music_Credits_branch_1f483 + callchannel Music_Credits_branch_1f4ed + callchannel Music_Credits_branch_1f4f8 + callchannel Music_Credits_branch_1f559 + pitchoffset 0, C_ octave 3 note A_, 12 notetype $8, $a7 note D_, 1 note D_, 1 note D_, 1 - callchannel Music_Credits_branch_1fab2 + callchannel Music_Credits_branch_1f582 octave 3 note B_, 6 note A_, 6 @@ -165,7 +164,7 @@ Music_Credits_Ch1: ; 1f858 note A_, 6 octave 4 note C#, 6 - callchannel Music_Credits_branch_1fab2 + callchannel Music_Credits_branch_1f582 tempo 143 octave 4 note D_, 6 @@ -181,12 +180,12 @@ Music_Credits_Ch1: ; 1f858 octave 5 note C#, 6 notetype $c, $a7 -Music_Credits_branch_1f937: ; 1f937 +Music_Credits_branch_1f407: octave 3 note A_, 1 octave 4 note D_, 1 - loopchannel 6, Music_Credits_branch_1f937 + loopchannel 6, Music_Credits_branch_1f407 notetype $8, $a7 note G_, 1 note __, 1 @@ -280,9 +279,8 @@ Music_Credits_branch_1f937: ; 1f937 note __, 16 note __, 16 endchannel -; 1f9b3 -Music_Credits_branch_1f9b3: ; 1f9b3 +Music_Credits_branch_1f483: note C_, 16 note F#, 1 note G_, 3 @@ -389,9 +387,8 @@ Music_Credits_branch_1f9b3: ; 1f9b3 note C_, 1 note __, 1 endchannel -; 1fa1d -Music_Credits_branch_1fa1d: ; 1fa1d +Music_Credits_branch_1f4ed: octave 4 note C_, 4 octave 3 @@ -403,9 +400,8 @@ Music_Credits_branch_1fa1d: ; 1fa1d note C_, 4 note D#, 4 endchannel -; 1fa28 -Music_Credits_branch_1fa28: ; 1fa28 +Music_Credits_branch_1f4f8: octave 3 note A_, 2 octave 4 @@ -503,9 +499,8 @@ Music_Credits_branch_1fa28: ; 1fa28 note C_, 2 note F_, 2 endchannel -; 1fa89 -Music_Credits_branch_1fa89: ; 1fa89 +Music_Credits_branch_1f559: octave 3 note A_, 2 octave 4 @@ -547,9 +542,8 @@ Music_Credits_branch_1fa89: ; 1fa89 note A#, 2 note A_, 2 endchannel -; 1fab2 -Music_Credits_branch_1fab2: ; 1fab2 +Music_Credits_branch_1f582: note __, 6 octave 3 note D_, 6 @@ -561,9 +555,8 @@ Music_Credits_branch_1fab2: ; 1fab2 note F#, 6 note C#, 6 endchannel -; 1fabd -Music_Credits_Ch2: ; 1fabd +Music_Credits_Ch2: dutycycle $1 vibrato $14, $23 notetype $c, $2f @@ -577,7 +570,7 @@ Music_Credits_Ch2: ; 1fabd note G_, 4 note F_, 4 notetype $6, $c7 - callchannel Music_Credits_branch_1fbfb + callchannel Music_Credits_branch_1f6cb octave 1 note G_, 2 note __, 2 @@ -603,9 +596,9 @@ Music_Credits_Ch2: ; 1fabd note D_, 1 note C#, 1 intensity $c7 - callchannel Music_Credits_branch_1fbfb - callchannel Music_Credits_branch_1fc6f - callchannel Music_Credits_branch_1fc78 + callchannel Music_Credits_branch_1f6cb + callchannel Music_Credits_branch_1f73f + callchannel Music_Credits_branch_1f748 octave 4 note B_, 1 octave 5 @@ -633,7 +626,7 @@ Music_Credits_Ch2: ; 1fabd octave 4 note A_, 2 note E_, 2 - callchannel Music_Credits_branch_1fc78 + callchannel Music_Credits_branch_1f748 octave 4 note B_, 1 octave 5 @@ -664,11 +657,11 @@ Music_Credits_Ch2: ; 1fabd note A_, 4 note G_, 4 notetype $6, $c7 - forceoctave $2 - callchannel Music_Credits_branch_1fbfb - callchannel Music_Credits_branch_1fc6f - callchannel Music_Credits_branch_1fc78 - forceoctave $0 + pitchoffset 0, D_ + callchannel Music_Credits_branch_1f6cb + callchannel Music_Credits_branch_1f73f + callchannel Music_Credits_branch_1f748 + pitchoffset 0, C_ octave 5 note C#, 1 note D_, 11 @@ -723,13 +716,13 @@ Music_Credits_Ch2: ; 1fabd octave 2 note F#, 1 note __, 1 -Music_Credits_branch_1fb87: ; 1fb87 +Music_Credits_branch_1f657: octave 1 note G_, 2 octave 2 note G_, 1 note __, 1 - loopchannel 4, Music_Credits_branch_1fb87 + loopchannel 4, Music_Credits_branch_1f657 octave 1 note A_, 1 octave 2 @@ -818,9 +811,8 @@ Music_Credits_branch_1fb87: ; 1fb87 note __, 16 note __, 16 endchannel -; 1fbfb -Music_Credits_branch_1fbfb: ; 1fbfb +Music_Credits_branch_1f6cb: octave 2 note C_, 4 intensity $b1 @@ -931,9 +923,8 @@ Music_Credits_branch_1fbfb: ; 1fbfb octave 3 note C_, 2 endchannel -; 1fc6f -Music_Credits_branch_1fc6f: ; 1fc6f +Music_Credits_branch_1f73f: octave 1 note G_, 4 note __, 4 @@ -943,9 +934,8 @@ Music_Credits_branch_1fc6f: ; 1fc6f note G_, 12 note F#, 8 endchannel -; 1fc78 -Music_Credits_branch_1fc78: ; 1fc78 +Music_Credits_branch_1f748: octave 4 note A_, 8 note B_, 8 @@ -980,9 +970,8 @@ Music_Credits_branch_1fc78: ; 1fc78 octave 5 note C_, 4 endchannel -; 1fca2 -Music_Credits_Ch3: ; 1fca2 +Music_Credits_Ch3: vibrato $16, $23 notetype $c, $34 stereopanning $ff @@ -1028,7 +1017,7 @@ Music_Credits_Ch3: ; 1fca2 note D#, 1 note E_, 7 note F_, 8 - callchannel Music_Credits_branch_1fdda + callchannel Music_Credits_branch_1f8aa octave 4 note G_, 1 note __, 1 @@ -1048,10 +1037,10 @@ Music_Credits_Ch3: ; 1fca2 note E_, 4 note __, 4 note F_, 4 - callchannel Music_Credits_branch_1fdda - callchannel Music_Credits_branch_1fe0b - callchannel Music_Credits_branch_1fe17 - callchannel Music_Credits_branch_1fe64 + callchannel Music_Credits_branch_1f8aa + callchannel Music_Credits_branch_1f8db + callchannel Music_Credits_branch_1f8e7 + callchannel Music_Credits_branch_1f934 octave 2 note G_, 4 note __, 2 @@ -1117,9 +1106,9 @@ Music_Credits_Ch3: ; 1fca2 note F#, 4 octave 3 note E_, 4 - callchannel Music_Credits_branch_1fe17 - callchannel Music_Credits_branch_1fe64 - callchannel Music_Credits_branch_1fe7b + callchannel Music_Credits_branch_1f8e7 + callchannel Music_Credits_branch_1f934 + callchannel Music_Credits_branch_1f94b octave 5 note D#, 1 note E_, 7 @@ -1139,15 +1128,15 @@ Music_Credits_Ch3: ; 1fca2 note F_, 1 note F#, 7 note G_, 8 - forceoctave $2 - callchannel Music_Credits_branch_1fdda - callchannel Music_Credits_branch_1fe0b - forceoctave $12 - callchannel Music_Credits_branch_1fe17 - forceoctave $2 - callchannel Music_Credits_branch_1fe64 - callchannel Music_Credits_branch_1fe7b - forceoctave $0 + pitchoffset 0, D_ + callchannel Music_Credits_branch_1f8aa + callchannel Music_Credits_branch_1f8db + pitchoffset 1, D_ + callchannel Music_Credits_branch_1f8e7 + pitchoffset 0, D_ + callchannel Music_Credits_branch_1f934 + callchannel Music_Credits_branch_1f94b + pitchoffset 0, C_ octave 6 note C#, 2 octave 5 @@ -1238,9 +1227,8 @@ Music_Credits_Ch3: ; 1fca2 note __, 16 note __, 16 endchannel -; 1fdda -Music_Credits_branch_1fdda: ; 1fdda +Music_Credits_branch_1f8aa: note G_, 16 octave 6 note C#, 1 @@ -1280,9 +1268,8 @@ Music_Credits_branch_1fdda: ; 1fdda notetype $c, $14 note D_, 16 endchannel -; 1fe0b -Music_Credits_branch_1fe0b: ; 1fe0b +Music_Credits_branch_1f8db: notetype $6, $14 note F#, 1 note G_, 3 @@ -1293,9 +1280,8 @@ Music_Credits_branch_1fe0b: ; 1fe0b note G_, 12 note G#, 8 endchannel -; 1fe17 -Music_Credits_branch_1fe17: ; 1fe17 +Music_Credits_branch_1f8e7: octave 3 note F_, 4 note __, 2 @@ -1373,9 +1359,8 @@ Music_Credits_branch_1fe17: ; 1fe17 octave 3 note G#, 2 endchannel -; 1fe64 -Music_Credits_branch_1fe64: ; 1fe64 +Music_Credits_branch_1f934: octave 2 note F_, 4 note __, 2 @@ -1399,9 +1384,8 @@ Music_Credits_branch_1fe64: ; 1fe64 note E_, 2 note F_, 2 endchannel -; 1fe7b -Music_Credits_branch_1fe7b: ; 1fe7b +Music_Credits_branch_1f94b: octave 2 note F#, 4 note __, 2 @@ -1442,9 +1426,8 @@ Music_Credits_branch_1fe7b: ; 1fe7b note G_, 2 note D_, 2 endchannel -; 1fea3 -Music_Credits_Ch4: ; 1fea3 +Music_Credits_Ch4: togglenoise $3 notetype $c note G#, 1 @@ -1472,15 +1455,15 @@ Music_Credits_Ch4: ; 1fea3 note G_, 1 note A#, 4 note A#, 4 - callchannel Music_Credits_branch_1ff7d - callchannel Music_Credits_branch_1ff7d - callchannel Music_Credits_branch_1ff7d - callchannel Music_Credits_branch_1ff9d - callchannel Music_Credits_branch_1ff7d - callchannel Music_Credits_branch_1ff7d - callchannel Music_Credits_branch_1ff7d - callchannel Music_Credits_branch_1ff9d -Music_Credits_branch_1fed8: ; 1fed8 + callchannel Music_Credits_branch_1fa4d + callchannel Music_Credits_branch_1fa4d + callchannel Music_Credits_branch_1fa4d + callchannel Music_Credits_branch_1fa6d + callchannel Music_Credits_branch_1fa4d + callchannel Music_Credits_branch_1fa4d + callchannel Music_Credits_branch_1fa4d + callchannel Music_Credits_branch_1fa6d +Music_Credits_branch_1f9a8: note A#, 2 note G_, 1 note G_, 1 @@ -1492,7 +1475,7 @@ Music_Credits_branch_1fed8: ; 1fed8 note G_, 1 note D_, 2 note F#, 2 - loopchannel 7, Music_Credits_branch_1fed8 + loopchannel 7, Music_Credits_branch_1f9a8 note G#, 1 note G_, 1 note D_, 1 @@ -1508,7 +1491,7 @@ Music_Credits_branch_1fed8: ; 1fed8 note C#, 1 note D_, 1 note D_, 1 -Music_Credits_branch_1fef6: ; 1fef6 +Music_Credits_branch_1f9c6: note A#, 2 note G_, 1 note G_, 1 @@ -1520,7 +1503,7 @@ Music_Credits_branch_1fef6: ; 1fef6 note G_, 1 note D_, 2 note F#, 2 - loopchannel 7, Music_Credits_branch_1fef6 + loopchannel 7, Music_Credits_branch_1f9c6 note G#, 1 note G_, 1 note F#, 2 @@ -1538,11 +1521,11 @@ Music_Credits_branch_1fef6: ; 1fef6 note B_, 2 note A#, 4 note A#, 4 - callchannel Music_Credits_branch_1ff7d - callchannel Music_Credits_branch_1ff7d - callchannel Music_Credits_branch_1ff7d - callchannel Music_Credits_branch_1ff9d -Music_Credits_branch_1ff22: ; 1ff22 + callchannel Music_Credits_branch_1fa4d + callchannel Music_Credits_branch_1fa4d + callchannel Music_Credits_branch_1fa4d + callchannel Music_Credits_branch_1fa6d +Music_Credits_branch_1f9f2: note A#, 2 note G_, 1 note G_, 1 @@ -1554,7 +1537,7 @@ Music_Credits_branch_1ff22: ; 1ff22 note G_, 1 note D_, 2 note F#, 2 - loopchannel 7, Music_Credits_branch_1ff22 + loopchannel 7, Music_Credits_branch_1f9f2 note G#, 1 note G_, 1 note F#, 2 @@ -1621,9 +1604,8 @@ Music_Credits_branch_1ff22: ; 1ff22 note __, 16 note __, 16 endchannel -; 1ff7d -Music_Credits_branch_1ff7d: ; 1ff7d +Music_Credits_branch_1fa4d: note G#, 1 note G_, 1 note G_, 1 @@ -1656,9 +1638,8 @@ Music_Credits_branch_1ff7d: ; 1ff7d note G_, 1 note F#, 2 endchannel -; 1ff9d -Music_Credits_branch_1ff9d: ; 1ff9d +Music_Credits_branch_1fa6d: note G#, 1 note G_, 1 note G_, 1 @@ -1691,5 +1672,3 @@ Music_Credits_branch_1ff9d: ; 1ff9d note A#, 1 note D_, 1 endchannel -; 1ffbd - diff --git a/audio/music/dancinghall.asm b/audio/music/dancinghall.asm index 3070830b..6884000b 100644 --- a/audio/music/dancinghall.asm +++ b/audio/music/dancinghall.asm @@ -1,21 +1,18 @@ -Music_DancingHall: ; ef9bc - dbw $80, Music_DancingHall_Ch1 - dbw $01, Music_DancingHall_Ch2 - dbw $02, Music_DancingHall_Ch3 -; ef9c5 +Music_DancingHall: + musicheader 3, 1, Music_DancingHall_Ch1 + musicheader 1, 2, Music_DancingHall_Ch2 + musicheader 1, 3, Music_DancingHall_Ch3 + db $3 -INCBIN "baserom.gbc", $ef9c5, $ef9c6 - $ef9c5 - - -Music_DancingHall_Ch1: ; ef9c6 +Music_DancingHall_Ch1: tempo 208 volume $77 stereopanning $f notetype $6, $b7 note __, 3 dutycycle $0 -Music_DancingHall_branch_ef9d3: ; ef9d3 +Music_DancingHall_branch_ef9d3: notetype $c, $b7 callchannel Music_DancingHall_branch_efa17 note __, 16 @@ -66,9 +63,8 @@ Music_DancingHall_branch_ef9d3: ; ef9d3 note __, 1 note F_, 2 loopchannel 0, Music_DancingHall_branch_ef9d3 -; efa17 -Music_DancingHall_branch_efa17: ; efa17 +Music_DancingHall_branch_efa17: octave 3 note B_, 1 note __, 1 @@ -90,15 +86,14 @@ Music_DancingHall_branch_efa17: ; efa17 note D_, 1 note __, 1 endchannel -; efa2c -Music_DancingHall_Ch2: ; efa2c +Music_DancingHall_Ch2: stereopanning $f0 notetype $6, $a1 dutycycle $0 vibrato $10, $24 note __, 3 -Music_DancingHall_branch_efa37: ; efa37 +Music_DancingHall_branch_efa37: notetype $6, $a2 callchannel Music_DancingHall_branch_efa7a callchannel Music_DancingHall_branch_efa7a @@ -146,9 +141,8 @@ Music_DancingHall_branch_efa37: ; efa37 note __, 1 note D_, 2 loopchannel 0, Music_DancingHall_branch_efa37 -; efa7a -Music_DancingHall_branch_efa7a: ; efa7a +Music_DancingHall_branch_efa7a: intensity $a1 octave 4 note E_, 4 @@ -224,9 +218,8 @@ Music_DancingHall_branch_efa7a: ; efa7a octave 4 note D_, 1 endchannel -; efad6 -Music_DancingHall_Ch3: ; efad6 +Music_DancingHall_Ch3: stereopanning $ff vibrato $16, $24 notetype $6, $10 @@ -235,7 +228,7 @@ Music_DancingHall_Ch3: ; efad6 note B_, 1 octave 6 note D_, 1 -Music_DancingHall_branch_efae3: ; efae3 +Music_DancingHall_branch_efae3: note E_, 13 note D_, 1 note E_, 1 @@ -310,6 +303,3 @@ Music_DancingHall_branch_efae3: ; efae3 octave 6 note D_, 1 loopchannel 0, Music_DancingHall_branch_efae3 -; efb3e - - diff --git a/audio/music/darkcave.asm b/audio/music/darkcave.asm index 1ee207d5..8d2877d0 100644 --- a/audio/music/darkcave.asm +++ b/audio/music/darkcave.asm @@ -1,11 +1,10 @@ -Music_DarkCave: ; ea267 - dbw $c0, Music_DarkCave_Ch1 - dbw $01, Music_DarkCave_Ch2 - dbw $02, Music_DarkCave_Ch3 - dbw $03, Music_DarkCave_Ch4 -; ea273 +Music_DarkCave: + musicheader 4, 1, Music_DarkCave_Ch1 + musicheader 1, 2, Music_DarkCave_Ch2 + musicheader 1, 3, Music_DarkCave_Ch3 + musicheader 1, 4, Music_DarkCave_Ch4 -Music_DarkCave_Ch1: ; ea273 +Music_DarkCave_Ch1: tempo 128 volume $77 dutycycle $3 @@ -13,18 +12,18 @@ Music_DarkCave_Ch1: ; ea273 vibrato $11, $15 stereopanning $f0 notetype $c, $a7 -Music_DarkCave_branch_ea285: ; ea285 +Music_DarkCave_branch_ea2dc: note __, 16 - loopchannel 4, Music_DarkCave_branch_ea285 + loopchannel 4, Music_DarkCave_branch_ea2dc octave 3 note D#, 16 note D_, 16 note C#, 16 note C_, 16 intensity $a3 -Music_DarkCave_branch_ea291: ; ea291 - callchannel Music_DarkCave_branch_ea2dc - loopchannel 3, Music_DarkCave_branch_ea291 +Music_DarkCave_branch_ea2e8: + callchannel Music_DarkCave_branch_ea333 + loopchannel 3, Music_DarkCave_branch_ea2e8 intensity $b7 note G#, 8 note D#, 8 @@ -43,9 +42,9 @@ Music_DarkCave_branch_ea291: ; ea291 note D#, 8 note C_, 8 intensity $a3 -Music_DarkCave_branch_ea2ac: ; ea2ac - callchannel Music_DarkCave_branch_ea2dc - loopchannel 2, Music_DarkCave_branch_ea2ac +Music_DarkCave_branch_ea303: + callchannel Music_DarkCave_branch_ea333 + loopchannel 2, Music_DarkCave_branch_ea303 note __, 16 note __, 8 intensity $b7 @@ -74,13 +73,12 @@ Music_DarkCave_branch_ea2ac: ; ea2ac note G_, 2 note G#, 4 intensity $a3 -Music_DarkCave_branch_ea2d1: ; ea2d1 - callchannel Music_DarkCave_branch_ea2dc - loopchannel 2, Music_DarkCave_branch_ea2d1 - loopchannel 0, Music_DarkCave_branch_ea291 -; ea2dc +Music_DarkCave_branch_ea328: + callchannel Music_DarkCave_branch_ea333 + loopchannel 2, Music_DarkCave_branch_ea328 + loopchannel 0, Music_DarkCave_branch_ea2e8 -Music_DarkCave_branch_ea2dc: ; ea2dc +Music_DarkCave_branch_ea333: octave 4 note D#, 2 octave 3 @@ -136,24 +134,23 @@ Music_DarkCave_branch_ea2dc: ; ea2dc octave 3 note A#, 2 endchannel -; ea313 -Music_DarkCave_Ch2: ; ea313 +Music_DarkCave_Ch2: dutycycle $1 vibrato $12, $36 stereopanning $f notetype $c, $a7 -Music_DarkCave_branch_ea31d: ; ea31d +Music_DarkCave_branch_ea374: note __, 16 - loopchannel 4, Music_DarkCave_branch_ea31d + loopchannel 4, Music_DarkCave_branch_ea374 octave 3 note G_, 16 note A#, 16 note F_, 16 note G_, 16 -Music_DarkCave_branch_ea327: ; ea327 +Music_DarkCave_branch_ea37e: note __, 16 - loopchannel 4, Music_DarkCave_branch_ea327 + loopchannel 4, Music_DarkCave_branch_ea37e note __, 8 stereopanning $ff intensity $c7 @@ -346,18 +343,17 @@ Music_DarkCave_branch_ea327: ; ea327 note D_, 16 note F_, 16 note D#, 16 - loopchannel 0, Music_DarkCave_branch_ea327 -; ea417 + loopchannel 0, Music_DarkCave_branch_ea37e -Music_DarkCave_Ch3: ; ea417 +Music_DarkCave_Ch3: notetype $c, $27 -Music_DarkCave_branch_ea41a: ; ea41a - callchannel Music_DarkCave_branch_ea477 - loopchannel 2, Music_DarkCave_branch_ea41a -Music_DarkCave_branch_ea421: ; ea421 - callchannel Music_DarkCave_branch_ea477 - loopchannel 7, Music_DarkCave_branch_ea421 - callchannel Music_DarkCave_branch_ea46c +Music_DarkCave_branch_ea471: + callchannel Music_DarkCave_branch_ea4ce + loopchannel 2, Music_DarkCave_branch_ea471 +Music_DarkCave_branch_ea478: + callchannel Music_DarkCave_branch_ea4ce + loopchannel 7, Music_DarkCave_branch_ea478 + callchannel Music_DarkCave_branch_ea4c3 octave 3 note C_, 4 note G_, 2 @@ -368,7 +364,7 @@ Music_DarkCave_branch_ea421: ; ea421 note __, 2 octave 2 note A#, 12 - callchannel Music_DarkCave_branch_ea46c + callchannel Music_DarkCave_branch_ea4c3 octave 3 note C_, 4 note G_, 2 @@ -383,12 +379,11 @@ Music_DarkCave_branch_ea421: ; ea421 note C#, 2 note C_, 2 note C#, 4 - callchannel Music_DarkCave_branch_ea450 - callchannel Music_DarkCave_branch_ea450 - loopchannel 0, Music_DarkCave_branch_ea421 -; ea450 + callchannel Music_DarkCave_branch_ea4a7 + callchannel Music_DarkCave_branch_ea4a7 + loopchannel 0, Music_DarkCave_branch_ea478 -Music_DarkCave_branch_ea450: ; ea450 +Music_DarkCave_branch_ea4a7: octave 3 note C_, 4 note G_, 2 @@ -417,9 +412,8 @@ Music_DarkCave_branch_ea450: ; ea450 note C_, 2 note C#, 4 endchannel -; ea46c -Music_DarkCave_branch_ea46c: ; ea46c +Music_DarkCave_branch_ea4c3: octave 3 note C_, 4 note G_, 2 @@ -431,9 +425,8 @@ Music_DarkCave_branch_ea46c: ; ea46c octave 2 note A#, 12 endchannel -; ea477 -Music_DarkCave_branch_ea477: ; ea477 +Music_DarkCave_branch_ea4ce: octave 2 note C_, 4 note G_, 2 @@ -462,12 +455,11 @@ Music_DarkCave_branch_ea477: ; ea477 note C_, 2 note C#, 4 endchannel -; ea493 -Music_DarkCave_Ch4: ; ea493 +Music_DarkCave_Ch4: togglenoise $3 notetype $c -Music_DarkCave_branch_ea497: ; ea497 +Music_DarkCave_branch_ea4ee: stereopanning $ff note D#, 8 note D#, 8 @@ -488,7 +480,4 @@ Music_DarkCave_branch_ea497: ; ea497 stereopanning $f0 note C#, 2 note C#, 2 - loopchannel 0, Music_DarkCave_branch_ea497 -; ea4b6 - - + loopchannel 0, Music_DarkCave_branch_ea4ee diff --git a/audio/music/dragonsden.asm b/audio/music/dragonsden.asm index 44f3fc5a..2dc0ae09 100644 --- a/audio/music/dragonsden.asm +++ b/audio/music/dragonsden.asm @@ -1,18 +1,17 @@ -Music_DragonsDen: ; eece8 - dbw $c0, Music_DragonsDen_Ch1 - dbw $01, Music_DragonsDen_Ch2 - dbw $02, Music_DragonsDen_Ch3 - dbw $03, Music_DragonsDen_Ch4 -; eecf4 +Music_DragonsDen: + musicheader 4, 1, Music_DragonsDen_Ch1 + musicheader 1, 2, Music_DragonsDen_Ch2 + musicheader 1, 3, Music_DragonsDen_Ch3 + musicheader 1, 4, Music_DragonsDen_Ch4 -Music_DragonsDen_Ch1: ; eecf4 +Music_DragonsDen_Ch1: tempo 144 volume $77 dutycycle $0 tone $0004 stereopanning $f0 notetype $c, $80 -Music_DragonsDen_branch_eed03: ; eed03 +Music_DragonsDen_branch_eed03: callchannel Music_DragonsDen_branch_eed1e note __, 16 callchannel Music_DragonsDen_branch_eed2d @@ -25,9 +24,8 @@ Music_DragonsDen_branch_eed03: ; eed03 note __, 10 notetype $c, $b7 loopchannel 0, Music_DragonsDen_branch_eed03 -; eed1e -Music_DragonsDen_branch_eed1e: ; eed1e +Music_DragonsDen_branch_eed1e: octave 3 note A#, 12 note A_, 4 @@ -43,9 +41,8 @@ Music_DragonsDen_branch_eed1e: ; eed1e octave 3 note G#, 16 endchannel -; eed2d -Music_DragonsDen_branch_eed2d: ; eed2d +Music_DragonsDen_branch_eed2d: intensity $b1 note __, 2 octave 4 @@ -60,14 +57,13 @@ Music_DragonsDen_branch_eed2d: ; eed2d note C#, 2 note C#, 2 endchannel -; eed3c -Music_DragonsDen_Ch2: ; eed3c +Music_DragonsDen_Ch2: dutycycle $0 tone $0004 stereopanning $f notetype $c, $90 -Music_DragonsDen_branch_eed46: ; eed46 +Music_DragonsDen_branch_eed46: callchannel Music_DragonsDen_branch_eed5e note __, 16 callchannel Music_DragonsDen_branch_eed6b @@ -77,9 +73,8 @@ Music_DragonsDen_branch_eed46: ; eed46 note __, 16 notetype $c, $c7 loopchannel 0, Music_DragonsDen_branch_eed46 -; eed5e -Music_DragonsDen_branch_eed5e: ; eed5e +Music_DragonsDen_branch_eed5e: octave 4 note D#, 12 note D_, 4 @@ -93,11 +88,10 @@ Music_DragonsDen_branch_eed5e: ; eed5e note G_, 4 note C#, 16 endchannel -; eed6b -Music_DragonsDen_branch_eed6b: ; eed6b +Music_DragonsDen_branch_eed6b: intensity $c1 -Music_DragonsDen_branch_eed6d: ; eed6d +Music_DragonsDen_branch_eed6d: octave 5 note C#, 4 octave 4 @@ -106,10 +100,9 @@ Music_DragonsDen_branch_eed6d: ; eed6d note G#, 4 loopchannel 2, Music_DragonsDen_branch_eed6d endchannel -; eed78 -Music_DragonsDen_Ch3: ; eed78 -Music_DragonsDen_branch_eed78: ; eed78 +Music_DragonsDen_Ch3: +Music_DragonsDen_branch_eed78: notetype $c, $14 octave 4 note C#, 2 @@ -136,7 +129,7 @@ Music_DragonsDen_branch_eed78: ; eed78 loopchannel 15, Music_DragonsDen_branch_eed78 note __, 16 notetype $6, $27 -Music_DragonsDen_branch_eed99: ; eed99 +Music_DragonsDen_branch_eed99: octave 3 note C#, 4 octave 2 @@ -161,14 +154,13 @@ Music_DragonsDen_branch_eed99: ; eed99 note C#, 2 loopchannel 16, Music_DragonsDen_branch_eed99 loopchannel 0, Music_DragonsDen_branch_eed78 -; eedb7 -Music_DragonsDen_Ch4: ; eedb7 +Music_DragonsDen_Ch4: togglenoise $0 notetype $c note __, 16 note __, 16 -Music_DragonsDen_branch_eedbd: ; eedbd +Music_DragonsDen_branch_eedbd: stereopanning $f0 note F_, 4 stereopanning $f @@ -177,6 +169,3 @@ Music_DragonsDen_branch_eedbd: ; eedbd stereopanning $f0 note F#, 4 loopchannel 0, Music_DragonsDen_branch_eedbd -; eedcb - - diff --git a/audio/music/ecruteakcity.asm b/audio/music/ecruteakcity.asm index 20a2c9fc..df60e9eb 100644 --- a/audio/music/ecruteakcity.asm +++ b/audio/music/ecruteakcity.asm @@ -1,16 +1,15 @@ -Music_EcruteakCity: ; ef2d0 - dbw $80, Music_EcruteakCity_Ch1 - dbw $01, Music_EcruteakCity_Ch2 - dbw $02, Music_EcruteakCity_Ch3 -; ef2d9 +Music_EcruteakCity: + musicheader 3, 1, Music_EcruteakCity_Ch1 + musicheader 1, 2, Music_EcruteakCity_Ch2 + musicheader 1, 3, Music_EcruteakCity_Ch3 -Music_EcruteakCity_Ch1: ; ef2d9 +Music_EcruteakCity_Ch1: tempo 197 volume $77 stereopanning $f vibrato $12, $25 dutycycle $2 -Music_EcruteakCity_branch_ef2e5: ; ef2e5 +Music_EcruteakCity_branch_ef2e5: notetype $c, $57 note __, 10 octave 4 @@ -145,9 +144,8 @@ Music_EcruteakCity_branch_ef2e5: ; ef2e5 note C_, 2 callchannel Music_EcruteakCity_branch_ef391 loopchannel 0, Music_EcruteakCity_branch_ef2e5 -; ef37f -Music_EcruteakCity_branch_ef37f: ; ef37f +Music_EcruteakCity_branch_ef37f: octave 5 note E_, 2 note C_, 2 @@ -163,9 +161,8 @@ Music_EcruteakCity_branch_ef37f: ; ef37f note C_, 2 loopchannel 2, Music_EcruteakCity_branch_ef37f endchannel -; ef391 -Music_EcruteakCity_branch_ef391: ; ef391 +Music_EcruteakCity_branch_ef391: octave 5 note D_, 2 octave 4 @@ -211,7 +208,7 @@ Music_EcruteakCity_branch_ef391: ; ef391 note C_, 2 octave 3 note A_, 2 -Music_EcruteakCity_branch_ef3be: ; ef3be +Music_EcruteakCity_branch_ef3be: octave 4 note F_, 2 note A_, 2 @@ -227,7 +224,7 @@ Music_EcruteakCity_branch_ef3be: ; ef3be note C_, 2 note F_, 2 loopchannel 2, Music_EcruteakCity_branch_ef3be -Music_EcruteakCity_branch_ef3d0: ; ef3d0 +Music_EcruteakCity_branch_ef3d0: octave 4 note G_, 2 note B_, 2 @@ -249,13 +246,12 @@ Music_EcruteakCity_branch_ef3d0: ; ef3d0 note G_, 16 dutycycle $2 endchannel -; ef3eb -Music_EcruteakCity_Ch2: ; ef3eb +Music_EcruteakCity_Ch2: vibrato $12, $25 dutycycle $3 stereopanning $f0 -Music_EcruteakCity_branch_ef3f2: ; ef3f2 +Music_EcruteakCity_branch_ef3f2: notetype $6, $67 note __, 16 note __, 5 @@ -472,11 +468,10 @@ Music_EcruteakCity_branch_ef3f2: ; ef3f2 note D_, 2 note E_, 16 loopchannel 0, Music_EcruteakCity_branch_ef3f2 -; ef4e1 -Music_EcruteakCity_Ch3: ; ef4e1 +Music_EcruteakCity_Ch3: stereopanning $ff -Music_EcruteakCity_branch_ef4e3: ; ef4e3 +Music_EcruteakCity_branch_ef4e3: vibrato $12, $25 notetype $c, $25 octave 3 @@ -598,9 +593,8 @@ Music_EcruteakCity_branch_ef4e3: ; ef4e3 note E_, 8 note D_, 8 loopchannel 0, Music_EcruteakCity_branch_ef4e3 -; ef569 -Music_EcruteakCity_branch_ef569: ; ef569 +Music_EcruteakCity_branch_ef569: octave 3 note F_, 4 note __, 2 @@ -671,6 +665,3 @@ Music_EcruteakCity_branch_ef569: ; ef569 note __, 1 note B_, 1 endchannel -; ef5b1 - - diff --git a/audio/music/elmslab.asm b/audio/music/elmslab.asm index 218af622..38b04b59 100644 --- a/audio/music/elmslab.asm +++ b/audio/music/elmslab.asm @@ -1,11 +1,10 @@ -Music_ElmsLab: ; e9fe9 - dbw $c0, Music_ElmsLab_Ch1 - dbw $01, Music_ElmsLab_Ch2 - dbw $02, Music_ElmsLab_Ch3 - dbw $03, Music_ElmsLab_Ch4 -; e9ff5 +Music_ElmsLab: + musicheader 4, 1, Music_ElmsLab_Ch1 + musicheader 1, 2, Music_ElmsLab_Ch2 + musicheader 1, 3, Music_ElmsLab_Ch3 + musicheader 1, 4, Music_ElmsLab_Ch4 -Music_ElmsLab_Ch1: ; e9ff5 +Music_ElmsLab_Ch1: tempo 144 volume $77 dutycycle $3 @@ -34,7 +33,7 @@ Music_ElmsLab_Ch1: ; e9ff5 note A_, 4 note A_, 4 note A_, 2 -Music_ElmsLab_branch_ea01e: ; ea01e +Music_ElmsLab_branch_ea075: note __, 2 note A_, 2 note G#, 2 @@ -181,10 +180,9 @@ Music_ElmsLab_branch_ea01e: ; ea01e intensity $b2 note F_, 2 note F_, 4 - loopchannel 0, Music_ElmsLab_branch_ea01e -; ea0d1 + loopchannel 0, Music_ElmsLab_branch_ea075 -Music_ElmsLab_Ch2: ; ea0d1 +Music_ElmsLab_Ch2: dutycycle $3 vibrato $10, $26 stereopanning $f @@ -214,7 +212,7 @@ Music_ElmsLab_Ch2: ; ea0d1 note C_, 4 note C_, 2 stereopanning $ff -Music_ElmsLab_branch_ea0f8: ; ea0f8 +Music_ElmsLab_branch_ea14f: intensity $c6 octave 4 note F_, 6 @@ -349,10 +347,9 @@ Music_ElmsLab_branch_ea0f8: ; ea0f8 intensity $c4 octave 3 note E_, 2 - loopchannel 0, Music_ElmsLab_branch_ea0f8 -; ea1a6 + loopchannel 0, Music_ElmsLab_branch_ea14f -Music_ElmsLab_Ch3: ; ea1a6 +Music_ElmsLab_Ch3: stereopanning $f notetype $c, $25 note __, 8 @@ -375,7 +372,7 @@ Music_ElmsLab_Ch3: ; ea1a6 note C_, 2 note D_, 2 note E_, 2 -Music_ElmsLab_branch_ea1bf: ; ea1bf +Music_ElmsLab_branch_ea216: note F_, 2 note A_, 2 note C_, 2 @@ -527,18 +524,14 @@ Music_ElmsLab_branch_ea1bf: ; ea1bf note C_, 2 note F_, 2 note A_, 2 - loopchannel 0, Music_ElmsLab_branch_ea1bf -; ea25a + loopchannel 0, Music_ElmsLab_branch_ea216 -Music_ElmsLab_Ch4: ; ea25a +Music_ElmsLab_Ch4: stereopanning $f0 togglenoise $0 notetype $c note __, 16 note __, 2 -Music_ElmsLab_branch_ea262: ; ea262 +Music_ElmsLab_branch_ea2b9: note G_, 4 - loopchannel 0, Music_ElmsLab_branch_ea262 -; ea267 - - + loopchannel 0, Music_ElmsLab_branch_ea2b9 diff --git a/audio/music/evolution.asm b/audio/music/evolution.asm index 29605f38..47e11543 100644 --- a/audio/music/evolution.asm +++ b/audio/music/evolution.asm @@ -1,11 +1,10 @@ -Music_Evolution: ; f06e1 - dbw $c0, Music_Evolution_Ch1 - dbw $01, Music_Evolution_Ch2 - dbw $02, Music_Evolution_Ch3 - dbw $03, Music_Evolution_Ch4 -; f06ed +Music_Evolution: + musicheader 4, 1, Music_Evolution_Ch1 + musicheader 1, 2, Music_Evolution_Ch2 + musicheader 1, 3, Music_Evolution_Ch3 + musicheader 1, 4, Music_Evolution_Ch4 -Music_Evolution_Ch1: ; f06ed +Music_Evolution_Ch1: tempo 132 volume $77 vibrato $6, $34 @@ -13,18 +12,18 @@ Music_Evolution_Ch1: ; f06ed dutycycle $2 notetype $c, $92 octave 3 - unknownmusic0xe0 $0, $4a + slidepitchto 1, 4, A_ note C_, 1 - unknownmusic0xe0 $0, $4a + slidepitchto 1, 4, A_ note G_, 1 - unknownmusic0xe0 $0, $4a + slidepitchto 1, 4, A_ note C_, 1 - unknownmusic0xe0 $0, $4a + slidepitchto 1, 4, A_ note G_, 1 note __, 4 dutycycle $3 stereopanning $f -Music_Evolution_branch_f0713: ; f0713 +Music_Evolution_branch_f0713: callchannel Music_Evolution_branch_f0737 notetype $c, $a4 note F#, 4 @@ -39,9 +38,8 @@ Music_Evolution_branch_f0713: ; f0713 notetype $c, $a4 note G#, 4 loopchannel 0, Music_Evolution_branch_f0713 -; f0737 -Music_Evolution_branch_f0737: ; f0737 +Music_Evolution_branch_f0737: notetype $c, $a2 octave 3 note C_, 4 @@ -52,9 +50,8 @@ Music_Evolution_branch_f0737: ; f0737 note G_, 4 note C_, 4 endchannel -; f0743 -Music_Evolution_branch_f0743: ; f0743 +Music_Evolution_branch_f0743: notetype $c, $a2 octave 3 note D_, 4 @@ -65,9 +62,8 @@ Music_Evolution_branch_f0743: ; f0743 note A_, 4 note D_, 4 endchannel -; f074f -Music_Evolution_Ch2: ; f074f +Music_Evolution_Ch2: dutycycle $2 vibrato $8, $25 notetype $c, $a2 @@ -79,7 +75,7 @@ Music_Evolution_Ch2: ; f074f note __, 4 dutycycle $3 stereopanning $f0 -Music_Evolution_branch_f0761: ; f0761 +Music_Evolution_branch_f0761: callchannel Music_Evolution_branch_f0787 notetype $c, $b5 note A_, 4 @@ -96,9 +92,8 @@ Music_Evolution_branch_f0761: ; f0761 note C#, 4 octave 3 loopchannel 0, Music_Evolution_branch_f0761 -; f0787 -Music_Evolution_branch_f0787: ; f0787 +Music_Evolution_branch_f0787: notetype $c, $b2 octave 3 note G_, 4 @@ -109,9 +104,8 @@ Music_Evolution_branch_f0787: ; f0787 note D_, 4 note G_, 4 endchannel -; f0793 -Music_Evolution_branch_f0793: ; f0793 +Music_Evolution_branch_f0793: notetype $c, $b2 octave 3 note A_, 4 @@ -122,12 +116,11 @@ Music_Evolution_branch_f0793: ; f0793 note E_, 4 note A_, 4 endchannel -; f079f -Music_Evolution_Ch3: ; f079f +Music_Evolution_Ch3: notetype $c, $16 note __, 8 -Music_Evolution_branch_f07a3: ; f07a3 +Music_Evolution_branch_f07a3: callchannel Music_Evolution_branch_f07bf octave 3 note A_, 4 @@ -142,9 +135,8 @@ Music_Evolution_branch_f07a3: ; f07a3 octave 4 note C#, 4 loopchannel 0, Music_Evolution_branch_f07a3 -; f07bf -Music_Evolution_branch_f07bf: ; f07bf +Music_Evolution_branch_f07bf: octave 2 note A_, 2 note __, 2 @@ -167,9 +159,8 @@ Music_Evolution_branch_f07bf: ; f07bf note A_, 2 note __, 2 endchannel -; f07d5 -Music_Evolution_branch_f07d5: ; f07d5 +Music_Evolution_branch_f07d5: octave 2 note B_, 2 note __, 2 @@ -192,13 +183,12 @@ Music_Evolution_branch_f07d5: ; f07d5 note A_, 2 note __, 2 endchannel -; f07eb -Music_Evolution_Ch4: ; f07eb +Music_Evolution_Ch4: togglenoise $5 notetype $c note __, 8 -Music_Evolution_branch_f07f0: ; f07f0 +Music_Evolution_branch_f07f0: stereopanning $f0 note A#, 6 note A#, 4 @@ -207,6 +197,3 @@ Music_Evolution_branch_f07f0: ; f07f0 note E_, 2 note E_, 2 loopchannel 0, Music_Evolution_branch_f07f0 -; f07fd - - diff --git a/audio/music/gamecorner.asm b/audio/music/gamecorner.asm index 4dd29e0a..d275bc9a 100644 --- a/audio/music/gamecorner.asm +++ b/audio/music/gamecorner.asm @@ -1,17 +1,16 @@ -Music_GameCorner: ; edd6d - dbw $c0, Music_GameCorner_Ch1 - dbw $01, Music_GameCorner_Ch2 - dbw $02, Music_GameCorner_Ch3 - dbw $03, Music_GameCorner_Ch4 -; edd79 +Music_GameCorner: + musicheader 4, 1, Music_GameCorner_Ch1 + musicheader 1, 2, Music_GameCorner_Ch2 + musicheader 1, 3, Music_GameCorner_Ch3 + musicheader 1, 4, Music_GameCorner_Ch4 -Music_GameCorner_Ch1: ; edd79 +Music_GameCorner_Ch1: tempo 147 volume $77 stereopanning $f notetype $c, $91 note __, 8 -Music_GameCorner_branch_edd84: ; edd84 +Music_GameCorner_branch_edd84: intensity $91 note __, 16 note __, 16 @@ -39,7 +38,7 @@ Music_GameCorner_branch_edd84: ; edd84 note G#, 2 note G_, 2 intensity $71 -Music_GameCorner_branch_eddb1: ; eddb1 +Music_GameCorner_branch_eddb1: octave 4 note G#, 1 octave 5 @@ -47,7 +46,7 @@ Music_GameCorner_branch_eddb1: ; eddb1 note F_, 1 note C_, 1 loopchannel 4, Music_GameCorner_branch_eddb1 -Music_GameCorner_branch_eddbb: ; eddbb +Music_GameCorner_branch_eddbb: octave 4 note A#, 1 octave 5 @@ -55,7 +54,7 @@ Music_GameCorner_branch_eddbb: ; eddbb note G_, 1 note D_, 1 loopchannel 4, Music_GameCorner_branch_eddbb -Music_GameCorner_branch_eddc5: ; eddc5 +Music_GameCorner_branch_eddc5: octave 4 note D#, 1 note G_, 1 @@ -64,7 +63,7 @@ Music_GameCorner_branch_eddc5: ; eddc5 octave 4 note G_, 1 loopchannel 4, Music_GameCorner_branch_eddc5 -Music_GameCorner_branch_eddd0: ; eddd0 +Music_GameCorner_branch_eddd0: octave 4 note F_, 1 note A_, 1 @@ -73,7 +72,7 @@ Music_GameCorner_branch_eddd0: ; eddd0 octave 4 note A_, 1 loopchannel 4, Music_GameCorner_branch_eddd0 -Music_GameCorner_branch_edddb: ; edddb +Music_GameCorner_branch_edddb: octave 4 note G#, 1 octave 5 @@ -81,7 +80,7 @@ Music_GameCorner_branch_edddb: ; edddb note F_, 1 note C_, 1 loopchannel 4, Music_GameCorner_branch_edddb -Music_GameCorner_branch_edde5: ; edde5 +Music_GameCorner_branch_edde5: octave 4 note A#, 1 octave 5 @@ -89,7 +88,7 @@ Music_GameCorner_branch_edde5: ; edde5 note G_, 1 note D_, 1 loopchannel 4, Music_GameCorner_branch_edde5 -Music_GameCorner_branch_eddef: ; eddef +Music_GameCorner_branch_eddef: octave 4 note B_, 1 octave 5 @@ -104,9 +103,8 @@ Music_GameCorner_branch_eddef: ; eddef note F_, 2 note F_, 9 loopchannel 0, Music_GameCorner_branch_edd84 -; ede03 -Music_GameCorner_branch_ede03: ; ede03 +Music_GameCorner_branch_ede03: note __, 2 octave 4 note A#, 3 @@ -123,9 +121,8 @@ Music_GameCorner_branch_ede03: ; ede03 note G#, 1 note A#, 3 endchannel -; ede13 -Music_GameCorner_branch_ede13: ; ede13 +Music_GameCorner_branch_ede13: note __, 2 octave 4 note A#, 3 @@ -135,14 +132,13 @@ Music_GameCorner_branch_ede13: ; ede13 note F_, 3 note F_, 2 endchannel -; ede1c -Music_GameCorner_Ch2: ; ede1c +Music_GameCorner_Ch2: stereopanning $ff vibrato $8, $24 notetype $c, $a1 note __, 8 -Music_GameCorner_branch_ede25: ; ede25 +Music_GameCorner_branch_ede25: intensity $92 dutycycle $1 callchannel Music_GameCorner_branch_ede75 @@ -207,9 +203,8 @@ Music_GameCorner_branch_ede25: ; ede25 note A#, 9 intensity $a4 loopchannel 0, Music_GameCorner_branch_ede25 -; ede75 -Music_GameCorner_branch_ede75: ; ede75 +Music_GameCorner_branch_ede75: octave 1 note C_, 2 octave 3 @@ -319,13 +314,12 @@ Music_GameCorner_branch_ede75: ; ede75 note D_, 2 note D#, 2 endchannel -; edee8 -Music_GameCorner_Ch3: ; edee8 +Music_GameCorner_Ch3: vibrato $8, $22 notetype $c, $14 note __, 8 -Music_GameCorner_branch_edeef: ; edeef +Music_GameCorner_branch_edeef: stereopanning $ff notetype $c, $14 callchannel Music_GameCorner_branch_edfdd @@ -504,9 +498,8 @@ Music_GameCorner_branch_edeef: ; edeef note E_, 1 note D_, 1 loopchannel 0, Music_GameCorner_branch_edeef -; edfdd -Music_GameCorner_branch_edfdd: ; edfdd +Music_GameCorner_branch_edfdd: octave 2 note C_, 1 octave 3 @@ -534,9 +527,8 @@ Music_GameCorner_branch_edfdd: ; edfdd octave 4 note A_, 2 endchannel -; edff8 -Music_GameCorner_branch_edff8: ; edff8 +Music_GameCorner_branch_edff8: octave 2 note C_, 1 octave 3 @@ -557,9 +549,8 @@ Music_GameCorner_branch_edff8: ; edff8 note A_, 1 note __, 1 endchannel -; ee00c -Music_GameCorner_branch_ee00c: ; ee00c +Music_GameCorner_branch_ee00c: octave 2 note F_, 1 octave 3 @@ -584,9 +575,8 @@ Music_GameCorner_branch_ee00c: ; ee00c note C_, 1 note D_, 3 endchannel -; ee024 -Music_GameCorner_branch_ee024: ; ee024 +Music_GameCorner_branch_ee024: octave 2 note F_, 1 octave 3 @@ -614,9 +604,8 @@ Music_GameCorner_branch_ee024: ; ee024 note F_, 1 note __, 1 endchannel -; ee03f -Music_GameCorner_branch_ee03f: ; ee03f +Music_GameCorner_branch_ee03f: octave 2 note F_, 2 note __, 1 @@ -665,9 +654,8 @@ Music_GameCorner_branch_ee03f: ; ee03f octave 3 note D_, 1 endchannel -; ee06f -Music_GameCorner_Ch4: ; ee06f +Music_GameCorner_Ch4: togglenoise $3 notetype $c notetype $8 @@ -680,9 +668,9 @@ Music_GameCorner_Ch4: ; ee06f note D_, 2 note D_, 1 note D_, 1 -Music_GameCorner_branch_ee07f: ; ee07f +Music_GameCorner_branch_ee07f: callchannel Music_GameCorner_branch_ee106 -Music_GameCorner_branch_ee082: ; ee082 +Music_GameCorner_branch_ee082: note A#, 2 note F#, 2 note D_, 2 @@ -693,7 +681,7 @@ Music_GameCorner_branch_ee082: ; ee082 note F#, 2 loopchannel 6, Music_GameCorner_branch_ee082 callchannel Music_GameCorner_branch_ee10f -Music_GameCorner_branch_ee091: ; ee091 +Music_GameCorner_branch_ee091: note A#, 2 note F#, 2 note D_, 2 @@ -708,7 +696,7 @@ Music_GameCorner_branch_ee091: ; ee091 note D_, 1 note F#, 2 callchannel Music_GameCorner_branch_ee106 -Music_GameCorner_branch_ee0a4: ; ee0a4 +Music_GameCorner_branch_ee0a4: note A#, 2 note F#, 2 note D_, 2 @@ -719,7 +707,7 @@ Music_GameCorner_branch_ee0a4: ; ee0a4 note F#, 2 loopchannel 6, Music_GameCorner_branch_ee0a4 callchannel Music_GameCorner_branch_ee10f -Music_GameCorner_branch_ee0b3: ; ee0b3 +Music_GameCorner_branch_ee0b3: note A#, 2 note F#, 2 note D_, 2 @@ -739,7 +727,7 @@ Music_GameCorner_branch_ee0b3: ; ee0b3 note D_, 1 note D_, 1 note D_, 1 -Music_GameCorner_branch_ee0c9: ; ee0c9 +Music_GameCorner_branch_ee0c9: note A#, 2 note F#, 1 note D#, 1 @@ -768,7 +756,7 @@ Music_GameCorner_branch_ee0c9: ; ee0c9 note D_, 2 note D_, 1 note D_, 1 -Music_GameCorner_branch_ee0e8: ; ee0e8 +Music_GameCorner_branch_ee0e8: note A#, 2 note F#, 1 note D#, 1 @@ -793,9 +781,8 @@ Music_GameCorner_branch_ee0e8: ; ee0e8 note D_, 1 note D#, 2 loopchannel 0, Music_GameCorner_branch_ee07f -; ee106 -Music_GameCorner_branch_ee106: ; ee106 +Music_GameCorner_branch_ee106: note C_, 2 note F#, 2 note D_, 2 @@ -805,9 +792,8 @@ Music_GameCorner_branch_ee106: ; ee106 note D_, 2 note F#, 2 endchannel -; ee10f -Music_GameCorner_branch_ee10f: ; ee10f +Music_GameCorner_branch_ee10f: note A#, 2 note F#, 2 note D_, 2 @@ -818,6 +804,3 @@ Music_GameCorner_branch_ee10f: ; ee10f note D_, 1 note F#, 2 endchannel -; ee119 - - diff --git a/audio/music/goldenrodcity.asm b/audio/music/goldenrodcity.asm index 2bc65598..42f861e3 100644 --- a/audio/music/goldenrodcity.asm +++ b/audio/music/goldenrodcity.asm @@ -1,11 +1,10 @@ -Music_GoldenrodCity: ; eb3fc - dbw $c0, Music_GoldenrodCity_Ch1 - dbw $01, Music_GoldenrodCity_Ch2 - dbw $02, Music_GoldenrodCity_Ch3 - dbw $03, Music_GoldenrodCity_Ch4 -; eb408 +Music_GoldenrodCity: + musicheader 4, 1, Music_GoldenrodCity_Ch1 + musicheader 1, 2, Music_GoldenrodCity_Ch2 + musicheader 1, 3, Music_GoldenrodCity_Ch3 + musicheader 1, 4, Music_GoldenrodCity_Ch4 -Music_GoldenrodCity_Ch1: ; eb408 +Music_GoldenrodCity_Ch1: stereopanning $f tempo 176 volume $77 @@ -14,9 +13,9 @@ Music_GoldenrodCity_Ch1: ; eb408 note __, 16 note __, 16 note __, 16 -Music_GoldenrodCity_branch_eb416: ; eb416 +Music_GoldenrodCity_branch_eb46d: dutycycle $0 - callchannel Music_GoldenrodCity_branch_eb452 + callchannel Music_GoldenrodCity_branch_eb4a9 octave 3 note G#, 1 octave 4 @@ -30,14 +29,14 @@ Music_GoldenrodCity_branch_eb416: ; eb416 note C_, 1 intensity $71 dutycycle $0 - callchannel Music_GoldenrodCity_branch_eb47a + callchannel Music_GoldenrodCity_branch_eb4d1 intensity $77 note D#, 2 note F_, 2 note F#, 2 note G#, 4 intensity $71 - callchannel Music_GoldenrodCity_branch_eb47a + callchannel Music_GoldenrodCity_branch_eb4d1 note D#, 1 note F#, 1 intensity $77 @@ -49,16 +48,15 @@ Music_GoldenrodCity_branch_eb416: ; eb416 note D#, 2 dutycycle $2 intensity $97 - callchannel Music_GoldenrodCity_branch_eb452 + callchannel Music_GoldenrodCity_branch_eb4a9 note C_, 4 octave 3 note G#, 2 octave 4 note C_, 2 - loopchannel 0, Music_GoldenrodCity_branch_eb416 -; eb452 + loopchannel 0, Music_GoldenrodCity_branch_eb46d -Music_GoldenrodCity_branch_eb452: ; eb452 +Music_GoldenrodCity_branch_eb4a9: octave 4 note C#, 2 octave 3 @@ -99,9 +97,8 @@ Music_GoldenrodCity_branch_eb452: ; eb452 octave 4 note C#, 2 endchannel -; eb47a -Music_GoldenrodCity_branch_eb47a: ; eb47a +Music_GoldenrodCity_branch_eb4d1: octave 4 note F_, 1 note C#, 1 @@ -174,23 +171,22 @@ Music_GoldenrodCity_branch_eb47a: ; eb47a note D#, 1 note F#, 1 endchannel -; eb4c2 -Music_GoldenrodCity_Ch2: ; eb4c2 +Music_GoldenrodCity_Ch2: stereopanning $f0 vibrato $12, $23 dutycycle $2 notetype $c, $97 -Music_GoldenrodCity_branch_eb4cc: ; eb4cc +Music_GoldenrodCity_branch_eb523: intensity $97 - callchannel Music_GoldenrodCity_branch_eb4fe + callchannel Music_GoldenrodCity_branch_eb555 octave 4 note F_, 2 note F#, 2 note G#, 2 note F_, 2 note D#, 8 - callchannel Music_GoldenrodCity_branch_eb4fe + callchannel Music_GoldenrodCity_branch_eb555 note G#, 2 note A#, 2 octave 5 @@ -199,7 +195,7 @@ Music_GoldenrodCity_branch_eb4cc: ; eb4cc note D#, 8 dutycycle $2 intensity $77 - callchannel Music_GoldenrodCity_branch_eb51b + callchannel Music_GoldenrodCity_branch_eb572 octave 4 note G#, 2 note A#, 2 @@ -208,17 +204,16 @@ Music_GoldenrodCity_branch_eb4cc: ; eb4cc note C_, 4 dutycycle $3 intensity $77 - callchannel Music_GoldenrodCity_branch_eb51b + callchannel Music_GoldenrodCity_branch_eb572 note F_, 2 note D#, 2 note C#, 2 note C_, 2 octave 4 note G#, 2 - loopchannel 0, Music_GoldenrodCity_branch_eb4cc -; eb4fe + loopchannel 0, Music_GoldenrodCity_branch_eb523 -Music_GoldenrodCity_branch_eb4fe: ; eb4fe +Music_GoldenrodCity_branch_eb555: octave 4 note F_, 4 note C#, 4 @@ -247,9 +242,8 @@ Music_GoldenrodCity_branch_eb4fe: ; eb4fe note F#, 2 dutycycle $1 endchannel -; eb51b -Music_GoldenrodCity_branch_eb51b: ; eb51b +Music_GoldenrodCity_branch_eb572: note C#, 6 note F_, 6 note C#, 4 @@ -268,16 +262,15 @@ Music_GoldenrodCity_branch_eb51b: ; eb51b note C_, 4 note D#, 2 endchannel -; eb52d -Music_GoldenrodCity_Ch3: ; eb52d +Music_GoldenrodCity_Ch3: stereopanning $ff vibrato $8, $23 notetype $c, $25 -Music_GoldenrodCity_branch_eb535: ; eb535 - callchannel Music_GoldenrodCity_branch_eb553 - callchannel Music_GoldenrodCity_branch_eb553 - callchannel Music_GoldenrodCity_branch_eb57b +Music_GoldenrodCity_branch_eb58c: + callchannel Music_GoldenrodCity_branch_eb5aa + callchannel Music_GoldenrodCity_branch_eb5aa + callchannel Music_GoldenrodCity_branch_eb5d2 note __, 3 octave 3 note C_, 1 @@ -285,7 +278,7 @@ Music_GoldenrodCity_branch_eb535: ; eb535 note G_, 1 note G#, 1 note D#, 2 - callchannel Music_GoldenrodCity_branch_eb57b + callchannel Music_GoldenrodCity_branch_eb5d2 note __, 1 octave 3 note G#, 2 @@ -293,10 +286,9 @@ Music_GoldenrodCity_branch_eb535: ; eb535 note D#, 2 octave 2 note G#, 2 - loopchannel 0, Music_GoldenrodCity_branch_eb535 -; eb553 + loopchannel 0, Music_GoldenrodCity_branch_eb58c -Music_GoldenrodCity_branch_eb553: ; eb553 +Music_GoldenrodCity_branch_eb5aa: octave 3 note C#, 4 note __, 2 @@ -337,9 +329,8 @@ Music_GoldenrodCity_branch_eb553: ; eb553 note G#, 1 note __, 1 endchannel -; eb57b -Music_GoldenrodCity_branch_eb57b: ; eb57b +Music_GoldenrodCity_branch_eb5d2: note C#, 1 note __, 1 octave 4 @@ -392,9 +383,8 @@ Music_GoldenrodCity_branch_eb57b: ; eb57b note __, 2 note G#, 1 endchannel -; eb5af -Music_GoldenrodCity_Ch4: ; eb5af +Music_GoldenrodCity_Ch4: togglenoise $3 notetype $c note __, 16 @@ -406,7 +396,7 @@ Music_GoldenrodCity_Ch4: ; eb5af note D_, 1 note D_, 1 note F#, 2 -Music_GoldenrodCity_branch_eb5bc: ; eb5bc +Music_GoldenrodCity_branch_eb613: note D#, 2 note F#, 2 note D_, 2 @@ -415,39 +405,39 @@ Music_GoldenrodCity_branch_eb5bc: ; eb5bc note F#, 2 note D_, 2 note F#, 2 - loopchannel 3, Music_GoldenrodCity_branch_eb5bc - callchannel Music_GoldenrodCity_branch_eb60c - callchannel Music_GoldenrodCity_branch_eb616 + loopchannel 3, Music_GoldenrodCity_branch_eb613 + callchannel Music_GoldenrodCity_branch_eb663 + callchannel Music_GoldenrodCity_branch_eb66d note G_, 1 note G_, 1 note F#, 2 - callchannel Music_GoldenrodCity_branch_eb616 + callchannel Music_GoldenrodCity_branch_eb66d note D_, 2 note F#, 2 - callchannel Music_GoldenrodCity_branch_eb616 + callchannel Music_GoldenrodCity_branch_eb66d note D_, 1 note D_, 1 note F#, 2 - callchannel Music_GoldenrodCity_branch_eb616 + callchannel Music_GoldenrodCity_branch_eb66d note D_, 2 note D_, 1 note D_, 1 - callchannel Music_GoldenrodCity_branch_eb616 + callchannel Music_GoldenrodCity_branch_eb66d note G_, 1 note G_, 1 note F#, 2 - callchannel Music_GoldenrodCity_branch_eb616 + callchannel Music_GoldenrodCity_branch_eb66d note D_, 2 note F#, 2 - callchannel Music_GoldenrodCity_branch_eb616 + callchannel Music_GoldenrodCity_branch_eb66d note D_, 1 note D_, 1 note F#, 2 - callchannel Music_GoldenrodCity_branch_eb616 + callchannel Music_GoldenrodCity_branch_eb66d note D_, 2 note D_, 1 note D_, 1 -Music_GoldenrodCity_branch_eb5f9: ; eb5f9 +Music_GoldenrodCity_branch_eb650: note D#, 2 note F#, 2 note D_, 2 @@ -456,12 +446,11 @@ Music_GoldenrodCity_branch_eb5f9: ; eb5f9 note F#, 2 note D_, 2 note F#, 2 - loopchannel 3, Music_GoldenrodCity_branch_eb5f9 - callchannel Music_GoldenrodCity_branch_eb60c - loopchannel 0, Music_GoldenrodCity_branch_eb5bc -; eb60c + loopchannel 3, Music_GoldenrodCity_branch_eb650 + callchannel Music_GoldenrodCity_branch_eb663 + loopchannel 0, Music_GoldenrodCity_branch_eb613 -Music_GoldenrodCity_branch_eb60c: ; eb60c +Music_GoldenrodCity_branch_eb663: note D#, 2 note F#, 2 note D_, 2 @@ -472,9 +461,8 @@ Music_GoldenrodCity_branch_eb60c: ; eb60c note D_, 1 note F#, 2 endchannel -; eb616 -Music_GoldenrodCity_branch_eb616: ; eb616 +Music_GoldenrodCity_branch_eb66d: note D#, 2 note D_, 1 note D#, 3 @@ -484,6 +472,3 @@ Music_GoldenrodCity_branch_eb616: ; eb616 note G_, 1 note G_, 1 endchannel -; eb61f - - diff --git a/audio/music/goldsilveropening.asm b/audio/music/goldsilveropening.asm index 686382d6..a9359f00 100644 --- a/audio/music/goldsilveropening.asm +++ b/audio/music/goldsilveropening.asm @@ -1,10 +1,9 @@ -Music_GoldSilverOpening: ; f7055 - dbw $80, Music_GoldSilverOpening_Ch1 - dbw $01, Music_GoldSilverOpening_Ch2 - dbw $02, Music_GoldSilverOpening_Ch3 -; f705e +Music_GoldSilverOpening: + musicheader 3, 1, Music_GoldSilverOpening_Ch1 + musicheader 1, 2, Music_GoldSilverOpening_Ch2 + musicheader 1, 3, Music_GoldSilverOpening_Ch3 -Music_GoldSilverOpening_Ch1: ; f705e +Music_GoldSilverOpening_Ch1: tempo 256 volume $77 tone $0001 @@ -128,9 +127,8 @@ Music_GoldSilverOpening_Ch1: ; f705e note G_, 2 note A_, 16 endchannel -; f70f8 -Music_GoldSilverOpening_Ch2: ; f70f8 +Music_GoldSilverOpening_Ch2: tone $0001 stereopanning $f notetype $c, $b7 @@ -309,9 +307,8 @@ Music_GoldSilverOpening_Ch2: ; f70f8 note C_, 4 note D#, 16 endchannel -; f71c8 -Music_GoldSilverOpening_Ch3: ; f71c8 +Music_GoldSilverOpening_Ch3: notetype $6, $10 octave 2 note D_, 4 @@ -616,6 +613,3 @@ Music_GoldSilverOpening_Ch3: ; f71c8 note C_, 1 note __, 13 endchannel -; f7308 - - diff --git a/audio/music/goldsilveropening2.asm b/audio/music/goldsilveropening2.asm index a7567d51..2dc43e3b 100644 --- a/audio/music/goldsilveropening2.asm +++ b/audio/music/goldsilveropening2.asm @@ -1,11 +1,10 @@ -Music_GoldSilverOpening2: ; f7308 - dbw $c0, Music_GoldSilverOpening2_Ch1 - dbw $01, Music_GoldSilverOpening2_Ch2 - dbw $02, Music_GoldSilverOpening2_Ch3 - dbw $03, Music_GoldSilverOpening2_Ch4 -; f7314 +Music_GoldSilverOpening2: + musicheader 4, 1, Music_GoldSilverOpening2_Ch1 + musicheader 1, 2, Music_GoldSilverOpening2_Ch2 + musicheader 1, 3, Music_GoldSilverOpening2_Ch3 + musicheader 1, 4, Music_GoldSilverOpening2_Ch4 -Music_GoldSilverOpening2_Ch1: ; f7314 +Music_GoldSilverOpening2_Ch1: tempo 92 volume $77 dutycycle $3 @@ -14,7 +13,7 @@ Music_GoldSilverOpening2_Ch1: ; f7314 notetype $c, $3d octave 3 note D#, 8 -Music_GoldSilverOpening2_branch_f7325: ; f7325 +Music_GoldSilverOpening2_branch_f7325: notetype $c, $c1 octave 3 note D_, 2 @@ -52,9 +51,8 @@ Music_GoldSilverOpening2_branch_f7325: ; f7325 octave 4 note D_, 16 endchannel -; f7358 -Music_GoldSilverOpening2_Ch2: ; f7358 +Music_GoldSilverOpening2_Ch2: dutycycle $3 vibrato $14, $14 stereopanning $f0 @@ -105,9 +103,8 @@ Music_GoldSilverOpening2_Ch2: ; f7358 intensity $c2 note D_, 16 endchannel -; f739c -Music_GoldSilverOpening2_Ch3: ; f739c +Music_GoldSilverOpening2_Ch3: notetype $c, $17 note __, 8 octave 2 @@ -184,9 +181,8 @@ Music_GoldSilverOpening2_Ch3: ; f739c note D_, 2 note __, 14 endchannel -; f73ea -Music_GoldSilverOpening2_Ch4: ; f73ea +Music_GoldSilverOpening2_Ch4: togglenoise $0 notetype $6 note D#, 2 @@ -198,7 +194,7 @@ Music_GoldSilverOpening2_Ch4: ; f73ea note D_, 2 note D_, 2 notetype $c -Music_GoldSilverOpening2_branch_f73f8: ; f73f8 +Music_GoldSilverOpening2_branch_f73f8: note D_, 2 note D_, 2 note D_, 2 @@ -219,6 +215,3 @@ Music_GoldSilverOpening2_branch_f73f8: ; f73f8 loopchannel 4, Music_GoldSilverOpening2_branch_f73f8 note C_, 16 endchannel -; f7411 - - diff --git a/audio/music/gym.asm b/audio/music/gym.asm index 089ef90d..acb944ad 100644 --- a/audio/music/gym.asm +++ b/audio/music/gym.asm @@ -1,18 +1,17 @@ -Music_Gym: ; f48ae - dbw $c0, Music_Gym_Ch1 - dbw $01, Music_Gym_Ch2 - dbw $02, Music_Gym_Ch3 - dbw $03, Music_Gym_Ch4 -; f48ba +Music_Gym: + musicheader 4, 1, Music_Gym_Ch1 + musicheader 1, 2, Music_Gym_Ch2 + musicheader 1, 3, Music_Gym_Ch3 + musicheader 1, 4, Music_Gym_Ch4 -Music_Gym_Ch1: ; f48ba +Music_Gym_Ch1: tempo 156 volume $77 stereopanning $f vibrato $12, $24 dutycycle $1 notetype $c, $b7 -Music_Gym_branch_f48c9: ; f48c9 +Music_Gym_branch_f48c9: octave 4 note F#, 2 octave 2 @@ -189,12 +188,11 @@ Music_Gym_branch_f48c9: ; f48c9 note F#, 1 note E_, 1 loopchannel 0, Music_Gym_branch_f48c9 -; f497c -Music_Gym_Ch2: ; f497c +Music_Gym_Ch2: dutycycle $1 stereopanning $f0 -Music_Gym_branch_f4980: ; f4980 +Music_Gym_branch_f4980: notetype $c, $c3 octave 2 note D_, 2 @@ -286,9 +284,8 @@ Music_Gym_branch_f4980: ; f4980 note F#, 2 note D_, 2 loopchannel 0, Music_Gym_branch_f4980 -; f49e9 -Music_Gym_branch_f49e9: ; f49e9 +Music_Gym_branch_f49e9: octave 3 note D_, 3 octave 2 @@ -333,9 +330,8 @@ Music_Gym_branch_f49e9: ; f49e9 note C_, 1 note C_, 2 endchannel -; f4a15 -Music_Gym_branch_f4a15: ; f4a15 +Music_Gym_branch_f4a15: octave 2 note D_, 4 note D_, 2 @@ -370,12 +366,11 @@ Music_Gym_branch_f4a15: ; f4a15 note F#, 1 note F#, 1 endchannel -; f4a37 -Music_Gym_Ch3: ; f4a37 +Music_Gym_Ch3: vibrato $14, $23 stereopanning $ff -Music_Gym_branch_f4a3c: ; f4a3c +Music_Gym_branch_f4a3c: notetype $c, $14 octave 6 note D_, 2 @@ -485,9 +480,8 @@ Music_Gym_branch_f4a3c: ; f4a3c note F#, 8 note E_, 4 loopchannel 0, Music_Gym_branch_f4a3c -; f4ab3 -Music_Gym_branch_f4ab3: ; f4ab3 +Music_Gym_branch_f4ab3: octave 5 note A_, 6 octave 6 @@ -506,11 +500,10 @@ Music_Gym_branch_f4ab3: ; f4ab3 note G_, 1 note A_, 4 endchannel -; f4ac5 -Music_Gym_Ch4: ; f4ac5 +Music_Gym_Ch4: togglenoise $4 -Music_Gym_branch_f4ac7: ; f4ac7 +Music_Gym_branch_f4ac7: notetype $c note D_, 2 note C#, 1 @@ -535,7 +528,7 @@ Music_Gym_branch_f4ac7: ; f4ac7 note D_, 1 note D_, 1 notetype $6 -Music_Gym_branch_f4ae1: ; f4ae1 +Music_Gym_branch_f4ae1: note D_, 6 note D_, 6 note D_, 4 @@ -558,7 +551,7 @@ Music_Gym_branch_f4ae1: ; f4ae1 note D_, 4 note B_, 8 loopchannel 4, Music_Gym_branch_f4ae1 -Music_Gym_branch_f4afa: ; f4afa +Music_Gym_branch_f4afa: note D#, 4 note F#, 4 note D_, 4 @@ -571,6 +564,3 @@ Music_Gym_branch_f4afa: ; f4afa note F#, 4 loopchannel 8, Music_Gym_branch_f4afa loopchannel 0, Music_Gym_branch_f4ac7 -; f4b0c - - diff --git a/audio/music/gymleadervictory.asm b/audio/music/gymleadervictory.asm index 0085b71e..d6a1a36e 100644 --- a/audio/music/gymleadervictory.asm +++ b/audio/music/gymleadervictory.asm @@ -1,11 +1,10 @@ -Music_GymLeaderVictory: ; f462c - dbw $c0, Music_GymLeaderVictory_Ch1 - dbw $01, Music_GymLeaderVictory_Ch2 - dbw $02, Music_GymLeaderVictory_Ch3 - dbw $03, Music_GymLeaderVictory_Ch4 -; f4638 +Music_GymLeaderVictory: + musicheader 4, 1, Music_GymLeaderVictory_Ch1 + musicheader 1, 2, Music_GymLeaderVictory_Ch2 + musicheader 1, 3, Music_GymLeaderVictory_Ch3 + musicheader 1, 4, Music_GymLeaderVictory_Ch4 -Music_GymLeaderVictory_Ch1: ; f4638 +Music_GymLeaderVictory_Ch1: tempo 116 volume $77 vibrato $12, $34 @@ -27,7 +26,7 @@ Music_GymLeaderVictory_Ch1: ; f4638 octave 5 note D_, 8 stereopanning $f -Music_GymLeaderVictory_branch_f4658: ; f4658 +Music_GymLeaderVictory_branch_f4658: dutycycle $1 callchannel Music_GymLeaderVictory_branch_f4689 octave 4 @@ -59,9 +58,8 @@ Music_GymLeaderVictory_branch_f4658: ; f4658 intensity $87 note F#, 16 loopchannel 0, Music_GymLeaderVictory_branch_f4658 -; f4689 -Music_GymLeaderVictory_branch_f4689: ; f4689 +Music_GymLeaderVictory_branch_f4689: intensity $91 octave 3 note F#, 2 @@ -84,9 +82,8 @@ Music_GymLeaderVictory_branch_f4689: ; f4689 note G_, 1 note D_, 1 endchannel -; f46a0 -Music_GymLeaderVictory_branch_f46a0: ; f46a0 +Music_GymLeaderVictory_branch_f46a0: intensity $87 octave 3 note F#, 14 @@ -115,9 +112,8 @@ Music_GymLeaderVictory_branch_f46a0: ; f46a0 note C#, 1 note E_, 8 endchannel -; f46bd -Music_GymLeaderVictory_Ch2: ; f46bd +Music_GymLeaderVictory_Ch2: vibrato $12, $34 dutycycle $3 notetype $c, $d7 @@ -132,7 +128,7 @@ Music_GymLeaderVictory_Ch2: ; f46bd octave 5 note D_, 1 note F#, 16 -Music_GymLeaderVictory_branch_f46d0: ; f46d0 +Music_GymLeaderVictory_branch_f46d0: dutycycle $3 intensity $a1 callchannel Music_GymLeaderVictory_branch_f4711 @@ -175,9 +171,8 @@ Music_GymLeaderVictory_branch_f46d0: ; f46d0 octave 5 note C#, 1 loopchannel 0, Music_GymLeaderVictory_branch_f46d0 -; f4711 -Music_GymLeaderVictory_branch_f4711: ; f4711 +Music_GymLeaderVictory_branch_f4711: octave 5 note D_, 2 note C#, 2 @@ -193,9 +188,8 @@ Music_GymLeaderVictory_branch_f4711: ; f4711 note G_, 2 note F#, 2 endchannel -; f4720 -Music_GymLeaderVictory_branch_f4720: ; f4720 +Music_GymLeaderVictory_branch_f4720: intensity $98 note A_, 6 note F#, 1 @@ -218,9 +212,8 @@ Music_GymLeaderVictory_branch_f4720: ; f4720 note C#, 8 note C#, 8 endchannel -; f4737 -Music_GymLeaderVictory_Ch3: ; f4737 +Music_GymLeaderVictory_Ch3: notetype $c, $25 octave 3 note F#, 16 @@ -231,7 +224,7 @@ Music_GymLeaderVictory_Ch3: ; f4737 octave 3 note C#, 2 stereopanning $f0 -Music_GymLeaderVictory_branch_f4744: ; f4744 +Music_GymLeaderVictory_branch_f4744: note D_, 2 note __, 4 octave 2 @@ -312,9 +305,8 @@ Music_GymLeaderVictory_branch_f4744: ; f4744 octave 3 note C#, 2 loopchannel 0, Music_GymLeaderVictory_branch_f4744 -; f479e -Music_GymLeaderVictory_branch_f479e: ; f479e +Music_GymLeaderVictory_branch_f479e: octave 3 note D_, 2 note __, 2 @@ -386,14 +378,13 @@ Music_GymLeaderVictory_branch_f479e: ; f479e octave 2 note A_, 2 endchannel -; f47e5 -Music_GymLeaderVictory_Ch4: ; f47e5 +Music_GymLeaderVictory_Ch4: togglenoise $4 notetype $c note B_, 16 note B_, 16 -Music_GymLeaderVictory_branch_f47eb: ; f47eb +Music_GymLeaderVictory_branch_f47eb: callchannel Music_GymLeaderVictory_branch_f480b note D#, 6 note D#, 2 @@ -406,7 +397,7 @@ Music_GymLeaderVictory_branch_f47eb: ; f47eb note C#, 1 note C#, 1 note C#, 1 -Music_GymLeaderVictory_branch_f47fb: ; f47fb +Music_GymLeaderVictory_branch_f47fb: note D#, 2 note G_, 2 note D_, 2 @@ -417,9 +408,8 @@ Music_GymLeaderVictory_branch_f47fb: ; f47fb note G_, 2 loopchannel 16, Music_GymLeaderVictory_branch_f47fb loopchannel 0, Music_GymLeaderVictory_branch_f47eb -; f480b -Music_GymLeaderVictory_branch_f480b: ; f480b +Music_GymLeaderVictory_branch_f480b: note D#, 6 note D#, 2 note D#, 4 @@ -427,6 +417,3 @@ Music_GymLeaderVictory_branch_f480b: ; f480b note D#, 2 loopchannel 3, Music_GymLeaderVictory_branch_f480b endchannel -; f4815 - - diff --git a/audio/music/halloffame.asm b/audio/music/halloffame.asm index 26b249a9..2f4c444d 100644 --- a/audio/music/halloffame.asm +++ b/audio/music/halloffame.asm @@ -1,11 +1,10 @@ -Music_HallOfFame: ; f05bf - dbw $c0, Music_HallOfFame_Ch1 - dbw $01, Music_HallOfFame_Ch2 - dbw $02, Music_HallOfFame_Ch3 - dbw $03, Music_HallOfFame_Ch4 -; f05cb +Music_HallOfFame: + musicheader 4, 1, Music_HallOfFame_Ch1 + musicheader 1, 2, Music_HallOfFame_Ch2 + musicheader 1, 3, Music_HallOfFame_Ch3 + musicheader 1, 4, Music_HallOfFame_Ch4 -Music_HallOfFame_Ch1: ; f05cb +Music_HallOfFame_Ch1: tempo 112 volume $77 dutycycle $2 @@ -22,7 +21,7 @@ Music_HallOfFame_Ch1: ; f05cb note E_, 1 note F_, 1 note F#, 1 -Music_HallOfFame_branch_f05e6: ; f05e6 +Music_HallOfFame_branch_f05e6: intensity $97 octave 4 note C_, 8 @@ -46,12 +45,11 @@ Music_HallOfFame_branch_f05e6: ; f05e6 note __, 16 note __, 16 loopchannel 0, Music_HallOfFame_branch_f05e6 -; f060b -Music_HallOfFame_Ch2: ; f060b +Music_HallOfFame_Ch2: vibrato $8, $25 dutycycle $3 -Music_HallOfFame_branch_f0610: ; f0610 +Music_HallOfFame_branch_f0610: notetype $c, $c4 octave 3 note G_, 2 @@ -77,12 +75,11 @@ Music_HallOfFame_branch_f0610: ; f0610 note A_, 4 note F_, 2 loopchannel 0, Music_HallOfFame_branch_f0610 -; f062e -Music_HallOfFame_Ch3: ; f062e -Music_HallOfFame_branch_f062e: ; f062e +Music_HallOfFame_Ch3: +Music_HallOfFame_branch_f062e: notetype $c, $28 -Music_HallOfFame_branch_f0631: ; f0631 +Music_HallOfFame_branch_f0631: octave 3 note D_, 2 note G_, 2 @@ -137,9 +134,8 @@ Music_HallOfFame_branch_f0631: ; f0631 note E_, 4 note G_, 4 loopchannel 0, Music_HallOfFame_branch_f062e -; f066d -Music_HallOfFame_Ch4: ; f066d +Music_HallOfFame_Ch4: togglenoise $5 notetype $c note __, 16 @@ -147,7 +143,7 @@ Music_HallOfFame_Ch4: ; f066d note __, 16 note __, 16 notetype $6 -Music_HallOfFame_branch_f0677: ; f0677 +Music_HallOfFame_branch_f0677: stereopanning $f note A#, 4 note A#, 8 @@ -174,6 +170,3 @@ Music_HallOfFame_branch_f0677: ; f0677 note A#, 1 note A#, 1 loopchannel 0, Music_HallOfFame_branch_f0677 -; f0697 - - diff --git a/audio/music/healpokemon.asm b/audio/music/healpokemon.asm index 53509fff..6de58bc5 100644 --- a/audio/music/healpokemon.asm +++ b/audio/music/healpokemon.asm @@ -1,31 +1,29 @@ -Music_HealPokemon: ; f0697 - dbw $80, Music_HealPokemon_Ch1 - dbw $01, Music_HealPokemon_Ch2 - dbw $02, Music_HealPokemon_Ch3 -; f06a0 +Music_HealPokemon: + musicheader 3, 1, Music_HealPokemon_Ch1 + musicheader 1, 2, Music_HealPokemon_Ch2 + musicheader 1, 3, Music_HealPokemon_Ch3 -Music_HealPokemon_Ch1: ; f06a0 +Music_HealPokemon_Ch1: tempo 144 volume $77 dutycycle $2 tone $0001 notetype $c, $81 note __, 2 - unknownmusic0xe0 $0, $40 + slidepitchto 1, 4, __ note B_, 2 - unknownmusic0xe0 $0, $55 + slidepitchto 1, 5, E_ note B_, 2 - unknownmusic0xe0 $0, $45 + slidepitchto 1, 4, E_ note E_, 2 note __, 4 - unknownmusic0xe0 $0, $30 + slidepitchto 1, 3, __ note E_, 4 - unknownmusic0xe0 $0, $40 + slidepitchto 1, 4, __ note B_, 4 endchannel -; f06c4 -Music_HealPokemon_Ch2: ; f06c4 +Music_HealPokemon_Ch2: dutycycle $2 notetype $c, $c3 octave 4 @@ -37,9 +35,8 @@ Music_HealPokemon_Ch2: ; f06c4 octave 5 note E_, 8 endchannel -; f06d4 -Music_HealPokemon_Ch3: ; f06d4 +Music_HealPokemon_Ch3: notetype $c, $10 octave 4 note E_, 2 @@ -51,6 +48,3 @@ Music_HealPokemon_Ch3: ; f06d4 note E_, 6 note __, 2 endchannel -; f06e1 - - diff --git a/audio/music/indigoplateau.asm b/audio/music/indigoplateau.asm index b76539a9..b56f1b38 100644 --- a/audio/music/indigoplateau.asm +++ b/audio/music/indigoplateau.asm @@ -1,17 +1,16 @@ -Music_IndigoPlateau: ; ee852 - dbw $c0, Music_IndigoPlateau_Ch1 - dbw $01, Music_IndigoPlateau_Ch2 - dbw $02, Music_IndigoPlateau_Ch3 - dbw $03, Music_IndigoPlateau_Ch4 -; ee85e +Music_IndigoPlateau: + musicheader 4, 1, Music_IndigoPlateau_Ch1 + musicheader 1, 2, Music_IndigoPlateau_Ch2 + musicheader 1, 3, Music_IndigoPlateau_Ch3 + musicheader 1, 4, Music_IndigoPlateau_Ch4 -Music_IndigoPlateau_Ch1: ; ee85e +Music_IndigoPlateau_Ch1: tempo 128 volume $77 dutycycle $3 tone $0002 stereopanning $f -Music_IndigoPlateau_branch_ee86a: ; ee86a +Music_IndigoPlateau_branch_ee86a: callchannel Music_IndigoPlateau_branch_ee881 octave 3 note D_, 4 @@ -24,9 +23,8 @@ Music_IndigoPlateau_branch_ee86a: ; ee86a callchannel Music_IndigoPlateau_branch_ee881 note A#, 4 loopchannel 0, Music_IndigoPlateau_branch_ee86a -; ee881 -Music_IndigoPlateau_branch_ee881: ; ee881 +Music_IndigoPlateau_branch_ee881: notetype $c, $b6 octave 2 note A_, 4 @@ -40,13 +38,12 @@ Music_IndigoPlateau_branch_ee881: ; ee881 note A_, 2 intensity $a0 endchannel -; ee892 -Music_IndigoPlateau_Ch2: ; ee892 +Music_IndigoPlateau_Ch2: dutycycle $3 vibrato $10, $22 stereopanning $f0 -Music_IndigoPlateau_branch_ee899: ; ee899 +Music_IndigoPlateau_branch_ee899: callchannel Music_IndigoPlateau_branch_ee8e9 note A_, 4 callchannel Music_IndigoPlateau_branch_ee8e9 @@ -100,9 +97,8 @@ Music_IndigoPlateau_branch_ee899: ; ee899 callchannel Music_IndigoPlateau_branch_ee8e9 note C#, 4 loopchannel 0, Music_IndigoPlateau_branch_ee899 -; ee8e9 -Music_IndigoPlateau_branch_ee8e9: ; ee8e9 +Music_IndigoPlateau_branch_ee8e9: notetype $c, $c6 octave 3 note D_, 4 @@ -116,11 +112,10 @@ Music_IndigoPlateau_branch_ee8e9: ; ee8e9 note D_, 2 intensity $b0 endchannel -; ee8fa -Music_IndigoPlateau_Ch3: ; ee8fa +Music_IndigoPlateau_Ch3: notetype $c, $19 -Music_IndigoPlateau_branch_ee8fd: ; ee8fd +Music_IndigoPlateau_branch_ee8fd: callchannel Music_IndigoPlateau_branch_ee915 octave 3 note A_, 4 @@ -134,9 +129,8 @@ Music_IndigoPlateau_branch_ee8fd: ; ee8fd octave 3 note F#, 4 loopchannel 0, Music_IndigoPlateau_branch_ee8fd -; ee915 -Music_IndigoPlateau_branch_ee915: ; ee915 +Music_IndigoPlateau_branch_ee915: octave 3 note D_, 1 note __, 3 @@ -152,13 +146,12 @@ Music_IndigoPlateau_branch_ee915: ; ee915 note A_, 1 note __, 3 endchannel -; ee924 -Music_IndigoPlateau_Ch4: ; ee924 +Music_IndigoPlateau_Ch4: stereopanning $f0 togglenoise $0 notetype $c -Music_IndigoPlateau_branch_ee92a: ; ee92a +Music_IndigoPlateau_branch_ee92a: note D#, 4 note D_, 2 note D#, 2 @@ -187,6 +180,3 @@ Music_IndigoPlateau_branch_ee92a: ; ee92a note D_, 2 note C#, 4 loopchannel 0, Music_IndigoPlateau_branch_ee92a -; ee94b - - diff --git a/audio/music/johtogymbattle.asm b/audio/music/johtogymbattle.asm index a2e99b15..2b6e82f0 100644 --- a/audio/music/johtogymbattle.asm +++ b/audio/music/johtogymbattle.asm @@ -1,31 +1,30 @@ -Music_JohtoGymBattle: ; ea4b6 - dbw $80, Music_JohtoGymBattle_Ch1 - dbw $01, Music_JohtoGymBattle_Ch2 - dbw $02, Music_JohtoGymBattle_Ch3 -; ea4bf +Music_JohtoGymBattle: + musicheader 3, 1, Music_JohtoGymBattle_Ch1 + musicheader 1, 2, Music_JohtoGymBattle_Ch2 + musicheader 1, 3, Music_JohtoGymBattle_Ch3 -Music_JohtoGymBattle_Ch1: ; ea4bf +Music_JohtoGymBattle_Ch1: tempo 101 volume $77 dutycycle $3 tone $0002 vibrato $12, $15 notetype $c, $b2 -Music_JohtoGymBattle_branch_ea4cf: ; ea4cf +Music_JohtoGymBattle_branch_ea526: octave 3 note A#, 1 note A_, 1 note G#, 1 note A_, 1 - loopchannel 4, Music_JohtoGymBattle_branch_ea4cf -Music_JohtoGymBattle_branch_ea4d8: ; ea4d8 + loopchannel 4, Music_JohtoGymBattle_branch_ea526 +Music_JohtoGymBattle_branch_ea52f: note C#, 1 note C_, 1 octave 2 note A#, 1 octave 3 note C_, 1 - loopchannel 3, Music_JohtoGymBattle_branch_ea4d8 + loopchannel 3, Music_JohtoGymBattle_branch_ea52f intensity $4b note C#, 4 intensity $b2 @@ -58,7 +57,7 @@ Music_JohtoGymBattle_branch_ea4d8: ; ea4d8 octave 3 note G#, 2 note F_, 2 -Music_JohtoGymBattle_branch_ea506: ; ea506 +Music_JohtoGymBattle_branch_ea55d: intensity $b5 note D_, 6 note G_, 6 @@ -285,27 +284,26 @@ Music_JohtoGymBattle_branch_ea506: ; ea506 octave 3 note D#, 2 note F#, 2 - loopchannel 0, Music_JohtoGymBattle_branch_ea506 -; ea608 + loopchannel 0, Music_JohtoGymBattle_branch_ea55d -Music_JohtoGymBattle_Ch2: ; ea608 +Music_JohtoGymBattle_Ch2: dutycycle $3 vibrato $8, $36 tone $0001 notetype $c, $c2 -Music_JohtoGymBattle_branch_ea613: ; ea613 +Music_JohtoGymBattle_branch_ea66a: octave 4 note F#, 1 note F_, 1 note E_, 1 note A#, 1 - loopchannel 4, Music_JohtoGymBattle_branch_ea613 -Music_JohtoGymBattle_branch_ea61c: ; ea61c + loopchannel 4, Music_JohtoGymBattle_branch_ea66a +Music_JohtoGymBattle_branch_ea673: note F#, 1 note F_, 1 note F#, 1 note A#, 1 - loopchannel 4, Music_JohtoGymBattle_branch_ea61c + loopchannel 4, Music_JohtoGymBattle_branch_ea673 note A_, 6 octave 3 note A#, 6 @@ -397,7 +395,7 @@ Music_JohtoGymBattle_branch_ea61c: ; ea61c octave 3 note G#, 1 note A_, 1 -Music_JohtoGymBattle_branch_ea697: ; ea697 +Music_JohtoGymBattle_branch_ea6ee: intensity $c7 note A#, 8 intensity $c4 @@ -612,10 +610,9 @@ Music_JohtoGymBattle_branch_ea697: ; ea697 octave 3 note B_, 16 note G_, 16 - loopchannel 0, Music_JohtoGymBattle_branch_ea697 -; ea79d + loopchannel 0, Music_JohtoGymBattle_branch_ea6ee -Music_JohtoGymBattle_Ch3: ; ea79d +Music_JohtoGymBattle_Ch3: notetype $c, $19 octave 4 note F_, 1 @@ -650,7 +647,7 @@ Music_JohtoGymBattle_Ch3: ; ea79d note F_, 2 note G_, 2 note G#, 4 - callchannel Music_JohtoGymBattle_branch_ea8fb + callchannel Music_JohtoGymBattle_branch_ea952 note G_, 2 note D_, 2 note F_, 2 @@ -666,7 +663,7 @@ Music_JohtoGymBattle_Ch3: ; ea79d note G#, 2 note D#, 2 note F#, 4 - callchannel Music_JohtoGymBattle_branch_ea8fb + callchannel Music_JohtoGymBattle_branch_ea952 note G_, 2 note D_, 2 note F_, 2 @@ -685,10 +682,10 @@ Music_JohtoGymBattle_Ch3: ; ea79d octave 3 note A#, 2 note G#, 2 -Music_JohtoGymBattle_branch_ea7e8: ; ea7e8 - callchannel Music_JohtoGymBattle_branch_ea90c - callchannel Music_JohtoGymBattle_branch_ea90c - callchannel Music_JohtoGymBattle_branch_ea913 +Music_JohtoGymBattle_branch_ea83f: + callchannel Music_JohtoGymBattle_branch_ea963 + callchannel Music_JohtoGymBattle_branch_ea963 + callchannel Music_JohtoGymBattle_branch_ea96a note C#, 2 note G#, 2 note C#, 2 @@ -697,7 +694,7 @@ Music_JohtoGymBattle_branch_ea7e8: ; ea7e8 note A#, 2 note A_, 2 note G#, 2 - callchannel Music_JohtoGymBattle_branch_ea90c + callchannel Music_JohtoGymBattle_branch_ea963 note D_, 2 note G_, 2 note D_, 2 @@ -706,8 +703,8 @@ Music_JohtoGymBattle_branch_ea7e8: ; ea7e8 note G_, 2 note G#, 2 note G_, 2 - callchannel Music_JohtoGymBattle_branch_ea913 - callchannel Music_JohtoGymBattle_branch_ea913 + callchannel Music_JohtoGymBattle_branch_ea96a + callchannel Music_JohtoGymBattle_branch_ea96a note C_, 2 note G_, 2 note A#, 2 @@ -716,14 +713,14 @@ Music_JohtoGymBattle_branch_ea7e8: ; ea7e8 note F_, 2 note G_, 2 note A#, 2 - callchannel Music_JohtoGymBattle_branch_ea91a - callchannel Music_JohtoGymBattle_branch_ea913 - callchannel Music_JohtoGymBattle_branch_ea921 + callchannel Music_JohtoGymBattle_branch_ea971 + callchannel Music_JohtoGymBattle_branch_ea96a + callchannel Music_JohtoGymBattle_branch_ea978 octave 3 note G_, 2 note G#, 2 note F_, 2 - callchannel Music_JohtoGymBattle_branch_ea91a + callchannel Music_JohtoGymBattle_branch_ea971 note C_, 2 note G_, 2 note C_, 2 @@ -732,13 +729,13 @@ Music_JohtoGymBattle_branch_ea7e8: ; ea7e8 note E_, 2 note F_, 2 note G_, 2 - callchannel Music_JohtoGymBattle_branch_ea913 - callchannel Music_JohtoGymBattle_branch_ea921 + callchannel Music_JohtoGymBattle_branch_ea96a + callchannel Music_JohtoGymBattle_branch_ea978 octave 3 note C_, 2 note C#, 2 note G#, 2 - callchannel Music_JohtoGymBattle_branch_ea91a + callchannel Music_JohtoGymBattle_branch_ea971 note C_, 2 note G_, 2 note C_, 2 @@ -747,15 +744,15 @@ Music_JohtoGymBattle_branch_ea7e8: ; ea7e8 note E_, 2 note F_, 2 note G_, 2 - callchannel Music_JohtoGymBattle_branch_ea913 - callchannel Music_JohtoGymBattle_branch_ea921 + callchannel Music_JohtoGymBattle_branch_ea96a + callchannel Music_JohtoGymBattle_branch_ea978 octave 3 note F_, 2 octave 2 note A#, 2 octave 3 note G#, 2 - callchannel Music_JohtoGymBattle_branch_ea91a + callchannel Music_JohtoGymBattle_branch_ea971 note C_, 2 note G_, 2 note C_, 2 @@ -766,12 +763,12 @@ Music_JohtoGymBattle_branch_ea7e8: ; ea7e8 note G_, 2 note F_, 2 note G_, 2 - callchannel Music_JohtoGymBattle_branch_ea92c + callchannel Music_JohtoGymBattle_branch_ea983 note __, 2 - callchannel Music_JohtoGymBattle_branch_ea939 + callchannel Music_JohtoGymBattle_branch_ea990 octave 4 note C#, 2 - callchannel Music_JohtoGymBattle_branch_ea945 + callchannel Music_JohtoGymBattle_branch_ea99c note __, 2 note D#, 2 note A#, 2 @@ -786,11 +783,11 @@ Music_JohtoGymBattle_branch_ea7e8: ; ea7e8 note D#, 2 octave 4 note D#, 2 - callchannel Music_JohtoGymBattle_branch_ea92c + callchannel Music_JohtoGymBattle_branch_ea983 note G_, 2 - callchannel Music_JohtoGymBattle_branch_ea939 + callchannel Music_JohtoGymBattle_branch_ea990 note G#, 2 - callchannel Music_JohtoGymBattle_branch_ea945 + callchannel Music_JohtoGymBattle_branch_ea99c note A_, 2 octave 4 note D#, 2 @@ -804,7 +801,7 @@ Music_JohtoGymBattle_branch_ea7e8: ; ea7e8 octave 4 note D#, 2 note D_, 4 - callchannel Music_JohtoGymBattle_branch_ea952 + callchannel Music_JohtoGymBattle_branch_ea9a9 note D#, 2 note G#, 2 note D#, 2 @@ -815,7 +812,7 @@ Music_JohtoGymBattle_branch_ea7e8: ; ea7e8 note A_, 2 note D#, 2 note G#, 2 - callchannel Music_JohtoGymBattle_branch_ea952 + callchannel Music_JohtoGymBattle_branch_ea9a9 note D#, 2 note G#, 2 note D#, 2 @@ -824,7 +821,7 @@ Music_JohtoGymBattle_branch_ea7e8: ; ea7e8 note A_, 2 note G#, 2 note F#, 2 - callchannel Music_JohtoGymBattle_branch_ea95a + callchannel Music_JohtoGymBattle_branch_ea9b1 note C#, 2 note F#, 2 note C#, 2 @@ -835,7 +832,7 @@ Music_JohtoGymBattle_branch_ea7e8: ; ea7e8 note A_, 2 note C#, 2 note G_, 2 - callchannel Music_JohtoGymBattle_branch_ea95a + callchannel Music_JohtoGymBattle_branch_ea9b1 note C#, 2 note F#, 2 note C#, 2 @@ -844,7 +841,7 @@ Music_JohtoGymBattle_branch_ea7e8: ; ea7e8 note D#, 2 note E_, 2 note A_, 2 - callchannel Music_JohtoGymBattle_branch_ea952 + callchannel Music_JohtoGymBattle_branch_ea9a9 note D#, 2 note G#, 2 note D#, 2 @@ -881,7 +878,7 @@ Music_JohtoGymBattle_branch_ea7e8: ; ea7e8 note F#, 2 note E_, 2 note F#, 2 - callchannel Music_JohtoGymBattle_branch_ea961 + callchannel Music_JohtoGymBattle_branch_ea9b8 note F_, 2 note C_, 2 note D#, 2 @@ -890,7 +887,7 @@ Music_JohtoGymBattle_branch_ea7e8: ; ea7e8 note D#, 2 note C#, 2 note D#, 2 - callchannel Music_JohtoGymBattle_branch_ea961 + callchannel Music_JohtoGymBattle_branch_ea9b8 note F_, 2 note C_, 2 note D#, 2 @@ -899,10 +896,9 @@ Music_JohtoGymBattle_branch_ea7e8: ; ea7e8 note F#, 2 note F_, 2 note D#, 2 - loopchannel 0, Music_JohtoGymBattle_branch_ea7e8 -; ea8fb + loopchannel 0, Music_JohtoGymBattle_branch_ea83f -Music_JohtoGymBattle_branch_ea8fb: ; ea8fb +Music_JohtoGymBattle_branch_ea952: note G_, 2 note D_, 2 note F_, 2 @@ -920,30 +916,26 @@ Music_JohtoGymBattle_branch_ea8fb: ; ea8fb note D#, 2 note F_, 2 endchannel -; ea90c -Music_JohtoGymBattle_branch_ea90c: ; ea90c +Music_JohtoGymBattle_branch_ea963: note D_, 2 note G_, 2 - loopchannel 4, Music_JohtoGymBattle_branch_ea90c + loopchannel 4, Music_JohtoGymBattle_branch_ea963 endchannel -; ea913 -Music_JohtoGymBattle_branch_ea913: ; ea913 +Music_JohtoGymBattle_branch_ea96a: note C#, 2 note G#, 2 - loopchannel 4, Music_JohtoGymBattle_branch_ea913 + loopchannel 4, Music_JohtoGymBattle_branch_ea96a endchannel -; ea91a -Music_JohtoGymBattle_branch_ea91a: ; ea91a +Music_JohtoGymBattle_branch_ea971: note C_, 2 note G_, 2 - loopchannel 4, Music_JohtoGymBattle_branch_ea91a + loopchannel 4, Music_JohtoGymBattle_branch_ea971 endchannel -; ea921 -Music_JohtoGymBattle_branch_ea921: ; ea921 +Music_JohtoGymBattle_branch_ea978: octave 2 note A#, 2 octave 3 @@ -955,9 +947,8 @@ Music_JohtoGymBattle_branch_ea921: ; ea921 octave 2 note A#, 2 endchannel -; ea92c -Music_JohtoGymBattle_branch_ea92c: ; ea92c +Music_JohtoGymBattle_branch_ea983: octave 3 note C_, 2 note G_, 2 @@ -971,9 +962,8 @@ Music_JohtoGymBattle_branch_ea92c: ; ea92c octave 3 note C_, 2 endchannel -; ea939 -Music_JohtoGymBattle_branch_ea939: ; ea939 +Music_JohtoGymBattle_branch_ea990: note C#, 2 note G#, 2 octave 4 @@ -986,9 +976,8 @@ Music_JohtoGymBattle_branch_ea939: ; ea939 octave 3 note C#, 2 endchannel -; ea945 -Music_JohtoGymBattle_branch_ea945: ; ea945 +Music_JohtoGymBattle_branch_ea99c: octave 3 note D_, 2 note A_, 2 @@ -1002,24 +991,21 @@ Music_JohtoGymBattle_branch_ea945: ; ea945 octave 3 note D_, 2 endchannel -; ea952 -Music_JohtoGymBattle_branch_ea952: ; ea952 +Music_JohtoGymBattle_branch_ea9a9: octave 3 note D#, 2 note G#, 2 - loopchannel 4, Music_JohtoGymBattle_branch_ea952 + loopchannel 4, Music_JohtoGymBattle_branch_ea9a9 endchannel -; ea95a -Music_JohtoGymBattle_branch_ea95a: ; ea95a +Music_JohtoGymBattle_branch_ea9b1: note C#, 2 note F#, 2 - loopchannel 4, Music_JohtoGymBattle_branch_ea95a + loopchannel 4, Music_JohtoGymBattle_branch_ea9b1 endchannel -; ea961 -Music_JohtoGymBattle_branch_ea961: ; ea961 +Music_JohtoGymBattle_branch_ea9b8: note F_, 2 note C_, 2 note D#, 2 @@ -1029,6 +1015,3 @@ Music_JohtoGymBattle_branch_ea961: ; ea961 note F_, 2 note D#, 2 endchannel -; ea96a - - diff --git a/audio/music/johtotrainerbattle.asm b/audio/music/johtotrainerbattle.asm index 86736a62..c235410a 100644 --- a/audio/music/johtotrainerbattle.asm +++ b/audio/music/johtotrainerbattle.asm @@ -1,10 +1,9 @@ -Music_JohtoTrainerBattle: ; f6096 - dbw $80, Music_JohtoTrainerBattle_Ch1 - dbw $01, Music_JohtoTrainerBattle_Ch2 - dbw $02, Music_JohtoTrainerBattle_Ch3 -; f609f +Music_JohtoTrainerBattle: + musicheader 3, 1, Music_JohtoTrainerBattle_Ch1 + musicheader 1, 2, Music_JohtoTrainerBattle_Ch2 + musicheader 1, 3, Music_JohtoTrainerBattle_Ch3 -Music_JohtoTrainerBattle_Ch1: ; f609f +Music_JohtoTrainerBattle_Ch1: tempo 102 volume $77 dutycycle $3 @@ -86,7 +85,7 @@ Music_JohtoTrainerBattle_Ch1: ; f609f note F_, 6 intensity $b7 note G_, 4 -Music_JohtoTrainerBattle_branch_f6102: ; f6102 +Music_JohtoTrainerBattle_branch_f6102: intensity $b4 callchannel Music_JohtoTrainerBattle_branch_f629f intensity $b7 @@ -243,7 +242,7 @@ Music_JohtoTrainerBattle_branch_f6102: ; f6102 intensity $a7 note D#, 12 note __, 16 -Music_JohtoTrainerBattle_branch_f61bd: ; f61bd +Music_JohtoTrainerBattle_branch_f61bd: intensity $b7 note F_, 8 intensity $b4 @@ -428,9 +427,8 @@ Music_JohtoTrainerBattle_branch_f61bd: ; f61bd intensity $a7 note F_, 6 loopchannel 0, Music_JohtoTrainerBattle_branch_f6102 -; f629f -Music_JohtoTrainerBattle_branch_f629f: ; f629f +Music_JohtoTrainerBattle_branch_f629f: octave 3 note E_, 2 note D_, 2 @@ -451,9 +449,8 @@ Music_JohtoTrainerBattle_branch_f629f: ; f629f note F_, 2 note D_, 2 endchannel -; f62b3 -Music_JohtoTrainerBattle_Ch2: ; f62b3 +Music_JohtoTrainerBattle_Ch2: dutycycle $3 vibrato $8, $36 tone $0001 @@ -547,7 +544,7 @@ Music_JohtoTrainerBattle_Ch2: ; f62b3 note E_, 2 intensity $c7 note B_, 4 -Music_JohtoTrainerBattle_branch_f632a: ; f632a +Music_JohtoTrainerBattle_branch_f632a: callchannel Music_JohtoTrainerBattle_branch_f64a3 intensity $3e note A#, 8 @@ -584,7 +581,7 @@ Music_JohtoTrainerBattle_branch_f632a: ; f632a note A_, 16 intensity $b7 note A_, 16 -Music_JohtoTrainerBattle_branch_f635a: ; f635a +Music_JohtoTrainerBattle_branch_f635a: intensity $c3 octave 3 note A_, 2 @@ -607,7 +604,7 @@ Music_JohtoTrainerBattle_branch_f635a: ; f635a note G_, 2 note A_, 2 note A#, 2 -Music_JohtoTrainerBattle_branch_f6376: ; f6376 +Music_JohtoTrainerBattle_branch_f6376: note G_, 2 note F_, 2 note G_, 2 @@ -685,7 +682,7 @@ Music_JohtoTrainerBattle_branch_f6376: ; f6376 callchannel Music_JohtoTrainerBattle_branch_f64b6 intensity $a2 callchannel Music_JohtoTrainerBattle_branch_f64b6 -Music_JohtoTrainerBattle_branch_f63dd: ; f63dd +Music_JohtoTrainerBattle_branch_f63dd: octave 4 note D#, 2 octave 3 @@ -829,9 +826,8 @@ Music_JohtoTrainerBattle_branch_f63dd: ; f63dd note D_, 2 note F_, 2 loopchannel 0, Music_JohtoTrainerBattle_branch_f632a -; f649a -Music_JohtoTrainerBattle_branch_f649a: ; f649a +Music_JohtoTrainerBattle_branch_f649a: octave 3 note A_, 6 note A_, 4 @@ -840,9 +836,8 @@ Music_JohtoTrainerBattle_branch_f649a: ; f649a intensity $c7 note A#, 4 endchannel -; f64a3 -Music_JohtoTrainerBattle_branch_f64a3: ; f64a3 +Music_JohtoTrainerBattle_branch_f64a3: intensity $c7 octave 3 note A_, 6 @@ -859,9 +854,8 @@ Music_JohtoTrainerBattle_branch_f64a3: ; f64a3 intensity $b7 note F_, 8 endchannel -; f64b6 -Music_JohtoTrainerBattle_branch_f64b6: ; f64b6 +Music_JohtoTrainerBattle_branch_f64b6: octave 3 note A#, 2 note D#, 2 @@ -870,9 +864,8 @@ Music_JohtoTrainerBattle_branch_f64b6: ; f64b6 octave 3 note D#, 2 endchannel -; f64be -Music_JohtoTrainerBattle_branch_f64be: ; f64be +Music_JohtoTrainerBattle_branch_f64be: intensity $c7 octave 4 note F_, 4 @@ -891,9 +884,8 @@ Music_JohtoTrainerBattle_branch_f64be: ; f64be note D#, 1 note F_, 2 endchannel -; f64d2 -Music_JohtoTrainerBattle_branch_f64d2: ; f64d2 +Music_JohtoTrainerBattle_branch_f64d2: intensity $c7 octave 4 note D#, 6 @@ -905,9 +897,8 @@ Music_JohtoTrainerBattle_branch_f64d2: ; f64d2 note F_, 4 note D#, 4 endchannel -; f64de -Music_JohtoTrainerBattle_Ch3: ; f64de +Music_JohtoTrainerBattle_Ch3: notetype $c, $19 octave 4 note E_, 1 @@ -941,7 +932,7 @@ Music_JohtoTrainerBattle_Ch3: ; f64de note A#, 2 note A_, 2 note G#, 2 -Music_JohtoTrainerBattle_branch_f6501: ; f6501 +Music_JohtoTrainerBattle_branch_f6501: note A_, 2 note E_, 2 note F#, 2 @@ -983,7 +974,7 @@ Music_JohtoTrainerBattle_branch_f6501: ; f6501 note A_, 2 note A#, 2 note G_, 2 -Music_JohtoTrainerBattle_branch_f6531: ; f6531 +Music_JohtoTrainerBattle_branch_f6531: callchannel Music_JohtoTrainerBattle_branch_f6681 note E_, 2 callchannel Music_JohtoTrainerBattle_branch_f6692 @@ -1056,7 +1047,7 @@ Music_JohtoTrainerBattle_branch_f6531: ; f6531 note F_, 8 note E_, 8 note D#, 8 -Music_JohtoTrainerBattle_branch_f6591: ; f6591 +Music_JohtoTrainerBattle_branch_f6591: octave 3 note D#, 2 note A#, 2 @@ -1079,13 +1070,13 @@ Music_JohtoTrainerBattle_branch_f6591: ; f6591 note F_, 2 note D#, 2 note G_, 2 -Music_JohtoTrainerBattle_branch_f65ac: ; f65ac +Music_JohtoTrainerBattle_branch_f65ac: note C#, 2 note G#, 2 loopchannel 7, Music_JohtoTrainerBattle_branch_f65ac note B_, 2 note A_, 2 -Music_JohtoTrainerBattle_branch_f65b4: ; f65b4 +Music_JohtoTrainerBattle_branch_f65b4: note D_, 2 note A_, 2 loopchannel 5, Music_JohtoTrainerBattle_branch_f65b4 @@ -1095,17 +1086,17 @@ Music_JohtoTrainerBattle_branch_f65b4: ; f65b4 note F#, 2 note G#, 2 note A_, 2 -Music_JohtoTrainerBattle_branch_f65c0: ; f65c0 +Music_JohtoTrainerBattle_branch_f65c0: note A#, 4 note D#, 4 loopchannel 4, Music_JohtoTrainerBattle_branch_f65c0 -Music_JohtoTrainerBattle_branch_f65c6: ; f65c6 +Music_JohtoTrainerBattle_branch_f65c6: octave 4 note G_, 4 octave 3 note A#, 4 loopchannel 4, Music_JohtoTrainerBattle_branch_f65c6 -Music_JohtoTrainerBattle_branch_f65ce: ; f65ce +Music_JohtoTrainerBattle_branch_f65ce: callchannel Music_JohtoTrainerBattle_branch_f66b4 note D#, 2 note F_, 8 @@ -1179,11 +1170,11 @@ Music_JohtoTrainerBattle_branch_f65ce: ; f65ce note C_, 2 octave 3 note A#, 2 -Music_JohtoTrainerBattle_branch_f661e: ; f661e +Music_JohtoTrainerBattle_branch_f661e: note D#, 2 note A#, 2 loopchannel 8, Music_JohtoTrainerBattle_branch_f661e -Music_JohtoTrainerBattle_branch_f6624: ; f6624 +Music_JohtoTrainerBattle_branch_f6624: note C#, 2 note G#, 2 loopchannel 6, Music_JohtoTrainerBattle_branch_f6624 @@ -1193,11 +1184,11 @@ Music_JohtoTrainerBattle_branch_f6624: ; f6624 octave 3 note A#, 2 note G#, 2 -Music_JohtoTrainerBattle_branch_f6630: ; f6630 +Music_JohtoTrainerBattle_branch_f6630: note D#, 2 note A#, 2 loopchannel 8, Music_JohtoTrainerBattle_branch_f6630 -Music_JohtoTrainerBattle_branch_f6636: ; f6636 +Music_JohtoTrainerBattle_branch_f6636: note C#, 2 note G#, 2 loopchannel 4, Music_JohtoTrainerBattle_branch_f6636 @@ -1256,9 +1247,8 @@ Music_JohtoTrainerBattle_branch_f6636: ; f6636 octave 4 note D_, 2 loopchannel 0, Music_JohtoTrainerBattle_branch_f6531 -; f6676 -Music_JohtoTrainerBattle_branch_f6676: ; f6676 +Music_JohtoTrainerBattle_branch_f6676: octave 4 note C_, 2 octave 3 @@ -1270,9 +1260,8 @@ Music_JohtoTrainerBattle_branch_f6676: ; f6676 note A#, 2 note G_, 2 endchannel -; f6681 -Music_JohtoTrainerBattle_branch_f6681: ; f6681 +Music_JohtoTrainerBattle_branch_f6681: octave 3 note E_, 2 note A_, 2 @@ -1290,9 +1279,8 @@ Music_JohtoTrainerBattle_branch_f6681: ; f6681 note F#, 2 note G_, 2 endchannel -; f6692 -Music_JohtoTrainerBattle_branch_f6692: ; f6692 +Music_JohtoTrainerBattle_branch_f6692: octave 3 note F_, 2 note A#, 2 @@ -1304,32 +1292,28 @@ Music_JohtoTrainerBattle_branch_f6692: ; f6692 octave 4 note D_, 2 endchannel -; f669d -Music_JohtoTrainerBattle_branch_f669d: ; f669d +Music_JohtoTrainerBattle_branch_f669d: octave 3 note E_, 2 note A_, 2 loopchannel 4, Music_JohtoTrainerBattle_branch_f669d endchannel -; f66a5 -Music_JohtoTrainerBattle_branch_f66a5: ; f66a5 +Music_JohtoTrainerBattle_branch_f66a5: note D_, 2 note A_, 2 loopchannel 4, Music_JohtoTrainerBattle_branch_f66a5 endchannel -; f66ac -Music_JohtoTrainerBattle_branch_f66ac: ; f66ac +Music_JohtoTrainerBattle_branch_f66ac: octave 3 note C_, 2 note G_, 2 loopchannel 4, Music_JohtoTrainerBattle_branch_f66ac endchannel -; f66b4 -Music_JohtoTrainerBattle_branch_f66b4: ; f66b4 +Music_JohtoTrainerBattle_branch_f66b4: note A#, 4 note D#, 2 note A#, 2 @@ -1345,6 +1329,3 @@ Music_JohtoTrainerBattle_branch_f66b4: ; f66b4 note G#, 1 note A#, 2 endchannel -; f66c3 - - diff --git a/audio/music/johtowildbattle.asm b/audio/music/johtowildbattle.asm index a3e0ef9e..3c104e11 100644 --- a/audio/music/johtowildbattle.asm +++ b/audio/music/johtowildbattle.asm @@ -1,16 +1,15 @@ -Music_JohtoWildBattle: ; f5dc5 - dbw $80, Music_JohtoWildBattle_Ch1 - dbw $01, Music_JohtoWildBattle_Ch2 - dbw $02, Music_JohtoWildBattle_Ch3 -; f5dce +Music_JohtoWildBattle: + musicheader 3, 1, Music_JohtoWildBattle_Ch1 + musicheader 1, 2, Music_JohtoWildBattle_Ch2 + musicheader 1, 3, Music_JohtoWildBattle_Ch3 -Music_JohtoWildBattle_Ch1: ; f5dce +Music_JohtoWildBattle_Ch1: tempo 104 volume $77 dutycycle $3 tone $0002 vibrato $12, $15 -Music_JohtoWildBattleNight_branch_f5ddb: ; f5ddb +Music_JohtoWildBattleNight_branch_f5ddb: notetype $c, $b2 octave 4 note C_, 1 @@ -87,7 +86,7 @@ Music_JohtoWildBattleNight_branch_f5ddb: ; f5ddb note D_, 4 intensity $6f note D#, 8 -Music_JohtoWildBattle_branch_f5e2d: ; f5e2d +Music_JohtoWildBattle_branch_f5e2d: intensity $b6 octave 3 note D_, 6 @@ -200,9 +199,8 @@ Music_JohtoWildBattle_branch_f5e2d: ; f5e2d note F#, 4 note G_, 16 loopchannel 0, Music_JohtoWildBattle_branch_f5e2d -; f5ea2 -Music_JohtoWildBattle_Ch2: ; f5ea2 +Music_JohtoWildBattle_Ch2: dutycycle $3 vibrato $8, $36 tone $0001 @@ -210,7 +208,7 @@ Music_JohtoWildBattle_Ch2: ; f5ea2 notetype $c, $c2 octave 4 note G_, 6 -Music_JohtoWildBattleNight_branch_f5eb2: ; f5eb2 +Music_JohtoWildBattleNight_branch_f5eb2: octave 3 note D_, 6 note G_, 4 @@ -239,7 +237,7 @@ Music_JohtoWildBattleNight_branch_f5eb2: ; f5eb2 note G_, 4 intensity $6f note G#, 8 -Music_JohtoWildBattle_branch_f5ed1: ; f5ed1 +Music_JohtoWildBattle_branch_f5ed1: intensity $c4 octave 3 note G_, 6 @@ -363,10 +361,9 @@ Music_JohtoWildBattle_branch_f5ed1: ; f5ed1 note A#, 4 note B_, 16 loopchannel 0, Music_JohtoWildBattle_branch_f5ed1 -; f5f5d -Music_JohtoWildBattleNight_branch_f5f5d: ; f5f5d -Music_JohtoWildBattle_branch_f5f5d: ; f5f5d +Music_JohtoWildBattleNight_branch_f5f5d: +Music_JohtoWildBattle_branch_f5f5d: notetype $c, $c2 octave 4 note F_, 1 @@ -417,11 +414,10 @@ Music_JohtoWildBattle_branch_f5f5d: ; f5f5d octave 5 note G_, 1 endchannel -; f5f91 -Music_JohtoWildBattle_Ch3: ; f5f91 +Music_JohtoWildBattle_Ch3: notetype $c, $14 -Music_JohtoWildBattleNight_branch_f5f94: ; f5f94 +Music_JohtoWildBattleNight_branch_f5f94: octave 4 note G_, 2 octave 5 @@ -470,7 +466,7 @@ Music_JohtoWildBattleNight_branch_f5f94: ; f5f94 note D#, 2 note G_, 2 note F_, 2 -Music_JohtoWildBattle_branch_f5fc6: ; f5fc6 +Music_JohtoWildBattle_branch_f5fc6: note D_, 2 note G_, 2 loopchannel 6, Music_JohtoWildBattle_branch_f5fc6 @@ -487,20 +483,20 @@ Music_JohtoWildBattle_branch_f5fc6: ; f5fc6 note G_, 2 note F_, 2 note D#, 2 -Music_JohtoWildBattle_branch_f5fdb: ; f5fdb +Music_JohtoWildBattle_branch_f5fdb: note D_, 2 note G_, 2 loopchannel 7, Music_JohtoWildBattle_branch_f5fdb note F#, 4 callchannel Music_JohtoWildBattle_branch_f6055 callchannel Music_JohtoWildBattle_branch_f6055 -Music_JohtoWildBattle_branch_f5fe8: ; f5fe8 +Music_JohtoWildBattle_branch_f5fe8: note D_, 2 note G_, 2 loopchannel 7, Music_JohtoWildBattle_branch_f5fe8 note D_, 2 note A_, 2 -Music_JohtoWildBattle_branch_f5ff0: ; f5ff0 +Music_JohtoWildBattle_branch_f5ff0: note C_, 2 note F_, 2 loopchannel 5, Music_JohtoWildBattle_branch_f5ff0 @@ -518,7 +514,7 @@ Music_JohtoWildBattle_branch_f5ff0: ; f5ff0 note D#, 2 note G#, 2 note G_, 4 -Music_JohtoWildBattle_branch_f6006: ; f6006 +Music_JohtoWildBattle_branch_f6006: note E_, 2 note A_, 2 loopchannel 8, Music_JohtoWildBattle_branch_f6006 @@ -547,11 +543,11 @@ Music_JohtoWildBattle_branch_f6006: ; f6006 note F#, 2 note F_, 2 note D#, 2 -Music_JohtoWildBattle_branch_f6027: ; f6027 +Music_JohtoWildBattle_branch_f6027: note D_, 2 note G_, 2 loopchannel 8, Music_JohtoWildBattle_branch_f6027 -Music_JohtoWildBattle_branch_f602d: ; f602d +Music_JohtoWildBattle_branch_f602d: note C_, 2 note F_, 2 loopchannel 7, Music_JohtoWildBattle_branch_f602d @@ -561,17 +557,17 @@ Music_JohtoWildBattle_branch_f602d: ; f602d note G_, 4 note D_, 4 note G_, 4 -Music_JohtoWildBattle_branch_f6039: ; f6039 +Music_JohtoWildBattle_branch_f6039: note D_, 2 note G_, 2 loopchannel 12, Music_JohtoWildBattle_branch_f6039 -Music_JohtoWildBattle_branch_f603f: ; f603f +Music_JohtoWildBattle_branch_f603f: note C_, 2 note E_, 2 loopchannel 7, Music_JohtoWildBattle_branch_f603f note F_, 2 note F#, 2 -Music_JohtoWildBattle_branch_f6047: ; f6047 +Music_JohtoWildBattle_branch_f6047: note D_, 2 note G_, 2 loopchannel 6, Music_JohtoWildBattle_branch_f6047 @@ -580,13 +576,9 @@ Music_JohtoWildBattle_branch_f6047: ; f6047 note F#, 2 note E_, 2 loopchannel 0, Music_JohtoWildBattle_branch_f5fdb -; f6055 -Music_JohtoWildBattle_branch_f6055: ; f6055 +Music_JohtoWildBattle_branch_f6055: note D#, 2 note G#, 2 loopchannel 4, Music_JohtoWildBattle_branch_f6055 endchannel -; f605c - - diff --git a/audio/music/johtowildbattlenight.asm b/audio/music/johtowildbattlenight.asm index 402e87a1..b4b1651b 100644 --- a/audio/music/johtowildbattlenight.asm +++ b/audio/music/johtowildbattlenight.asm @@ -1,19 +1,17 @@ -Music_JohtoWildBattleNight: ; f605c - dbw $80, Music_JohtoWildBattleNight_Ch1 - dbw $01, Music_JohtoWildBattleNight_Ch2 - dbw $02, Music_JohtoWildBattleNight_Ch3 -; f6065 +Music_JohtoWildBattleNight: + musicheader 3, 1, Music_JohtoWildBattleNight_Ch1 + musicheader 1, 2, Music_JohtoWildBattleNight_Ch2 + musicheader 1, 3, Music_JohtoWildBattleNight_Ch3 -Music_JohtoWildBattleNight_Ch1: ; f6065 +Music_JohtoWildBattleNight_Ch1: tempo 107 volume $77 dutycycle $3 tone $0002 vibrato $10, $25 loopchannel 0, Music_JohtoWildBattleNight_branch_f5ddb -; f6076 -Music_JohtoWildBattleNight_Ch2: ; f6076 +Music_JohtoWildBattleNight_Ch2: dutycycle $3 vibrato $20, $36 tone $0001 @@ -24,11 +22,7 @@ Music_JohtoWildBattleNight_Ch2: ; f6076 tone $0001 dutycycle $2 loopchannel 0, Music_JohtoWildBattleNight_branch_f5eb2 -; f608f -Music_JohtoWildBattleNight_Ch3: ; f608f +Music_JohtoWildBattleNight_Ch3: notetype $c, $11 loopchannel 0, Music_JohtoWildBattleNight_branch_f5f94 -; f6096 - - diff --git a/audio/music/kantogymbattle.asm b/audio/music/kantogymbattle.asm index 17fce2d6..7ba65a42 100644 --- a/audio/music/kantogymbattle.asm +++ b/audio/music/kantogymbattle.asm @@ -1,10 +1,9 @@ -Music_KantoGymBattle: ; ec720 - dbw $80, Music_KantoGymBattle_Ch1 - dbw $01, Music_KantoGymBattle_Ch2 - dbw $02, Music_KantoGymBattle_Ch3 -; ec729 +Music_KantoGymBattle: + musicheader 3, 1, Music_KantoGymBattle_Ch1 + musicheader 1, 2, Music_KantoGymBattle_Ch2 + musicheader 1, 3, Music_KantoGymBattle_Ch3 -Music_KantoGymBattle_Ch1: ; ec729 +Music_KantoGymBattle_Ch1: tempo 101 volume $77 dutycycle $3 @@ -86,7 +85,7 @@ Music_KantoGymBattle_Ch1: ; ec729 note E_, 4 note E_, 4 note E_, 2 -Music_KantoGymBattle_branch_ec78b: ; ec78b +Music_KantoGymBattle_branch_ec78b: callchannel Music_KantoGymBattle_branch_ec832 octave 2 note A#, 2 @@ -229,9 +228,8 @@ Music_KantoGymBattle_branch_ec78b: ; ec78b octave 3 note D_, 4 loopchannel 0, Music_KantoGymBattle_branch_ec78b -; ec832 -Music_KantoGymBattle_branch_ec832: ; ec832 +Music_KantoGymBattle_branch_ec832: intensity $b5 note D#, 2 octave 2 @@ -252,14 +250,13 @@ Music_KantoGymBattle_branch_ec832: ; ec832 note D#, 2 note C#, 2 endchannel -; ec847 -Music_KantoGymBattle_Ch2: ; ec847 +Music_KantoGymBattle_Ch2: dutycycle $3 vibrato $8, $36 tone $0001 notetype $c, $c2 -Music_KantoGymBattle_branch_ec852: ; ec852 +Music_KantoGymBattle_branch_ec852: octave 4 note A#, 1 note G#, 1 @@ -268,7 +265,7 @@ Music_KantoGymBattle_branch_ec852: ; ec852 note D#, 1 loopchannel 8, Music_KantoGymBattle_branch_ec852 octave 3 -Music_KantoGymBattle_branch_ec85d: ; ec85d +Music_KantoGymBattle_branch_ec85d: intensity $c2 note D#, 2 note D#, 2 @@ -316,7 +313,7 @@ Music_KantoGymBattle_branch_ec85d: ; ec85d intensity $c2 octave 4 loopchannel 2, Music_KantoGymBattle_branch_ec85d -Music_KantoGymBattle_branch_ec894: ; ec894 +Music_KantoGymBattle_branch_ec894: callchannel Music_KantoGymBattle_branch_ec907 note E_, 8 note G#, 8 @@ -405,9 +402,8 @@ Music_KantoGymBattle_branch_ec894: ; ec894 octave 3 note A_, 4 loopchannel 0, Music_KantoGymBattle_branch_ec894 -; ec907 -Music_KantoGymBattle_branch_ec907: ; ec907 +Music_KantoGymBattle_branch_ec907: dutycycle $2 intensity $d1 octave 3 @@ -437,21 +433,20 @@ Music_KantoGymBattle_branch_ec907: ; ec907 dutycycle $3 intensity $b0 endchannel -; ec92e -Music_KantoGymBattle_Ch3: ; ec92e +Music_KantoGymBattle_Ch3: notetype $c, $19 octave 2 note E_, 1 note __, 1 -Music_KantoGymBattle_branch_ec934: ; ec934 +Music_KantoGymBattle_branch_ec934: note B_, 3 note __, 1 loopchannel 6, Music_KantoGymBattle_branch_ec934 note B_, 2 note G#, 2 note B_, 2 -Music_KantoGymBattle_branch_ec93d: ; ec93d +Music_KantoGymBattle_branch_ec93d: note D#, 1 note __, 1 note D#, 1 @@ -489,12 +484,12 @@ Music_KantoGymBattle_branch_ec93d: ; ec93d note __, 1 note E_, 2 loopchannel 2, Music_KantoGymBattle_branch_ec93d -Music_KantoGymBattle_branch_ec965: ; ec965 +Music_KantoGymBattle_branch_ec965: octave 2 note D#, 2 note A#, 2 loopchannel 8, Music_KantoGymBattle_branch_ec965 -Music_KantoGymBattle_branch_ec96c: ; ec96c +Music_KantoGymBattle_branch_ec96c: note E_, 2 note B_, 2 loopchannel 4, Music_KantoGymBattle_branch_ec96c @@ -511,13 +506,13 @@ Music_KantoGymBattle_branch_ec96c: ; ec96c note E_, 2 octave 2 note B_, 2 -Music_KantoGymBattle_branch_ec97f: ; ec97f +Music_KantoGymBattle_branch_ec97f: octave 2 note F#, 2 octave 3 note C#, 2 loopchannel 8, Music_KantoGymBattle_branch_ec97f -Music_KantoGymBattle_branch_ec987: ; ec987 +Music_KantoGymBattle_branch_ec987: octave 2 note E_, 2 note B_, 2 @@ -526,7 +521,7 @@ Music_KantoGymBattle_branch_ec987: ; ec987 note E_, 2 octave 2 note B_, 2 -Music_KantoGymBattle_branch_ec992: ; ec992 +Music_KantoGymBattle_branch_ec992: note D#, 1 note __, 1 note D#, 1 @@ -546,7 +541,7 @@ Music_KantoGymBattle_branch_ec992: ; ec992 note __, 1 note E_, 2 loopchannel 2, Music_KantoGymBattle_branch_ec992 -Music_KantoGymBattle_branch_ec9a8: ; ec9a8 +Music_KantoGymBattle_branch_ec9a8: note D#, 2 note A#, 2 loopchannel 7, Music_KantoGymBattle_branch_ec9a8 @@ -563,12 +558,12 @@ Music_KantoGymBattle_branch_ec9a8: ; ec9a8 note B_, 2 octave 3 note E_, 2 -Music_KantoGymBattle_branch_ec9bb: ; ec9bb +Music_KantoGymBattle_branch_ec9bb: octave 2 note E_, 2 note B_, 2 loopchannel 5, Music_KantoGymBattle_branch_ec9bb -Music_KantoGymBattle_branch_ec9c2: ; ec9c2 +Music_KantoGymBattle_branch_ec9c2: octave 2 note F#, 2 octave 3 @@ -588,16 +583,16 @@ Music_KantoGymBattle_branch_ec9c2: ; ec9c2 note F#, 2 note E_, 2 note C#, 2 -Music_KantoGymBattle_branch_ec9d8: ; ec9d8 +Music_KantoGymBattle_branch_ec9d8: octave 2 note D#, 2 note A#, 2 loopchannel 4, Music_KantoGymBattle_branch_ec9d8 -Music_KantoGymBattle_branch_ec9df: ; ec9df +Music_KantoGymBattle_branch_ec9df: note C#, 2 note G#, 2 loopchannel 8, Music_KantoGymBattle_branch_ec9df -Music_KantoGymBattle_branch_ec9e5: ; ec9e5 +Music_KantoGymBattle_branch_ec9e5: note D#, 2 note A#, 2 loopchannel 4, Music_KantoGymBattle_branch_ec9e5 @@ -613,6 +608,3 @@ Music_KantoGymBattle_branch_ec9e5: ; ec9e5 note D#, 2 note F_, 2 loopchannel 0, Music_KantoGymBattle_branch_ec965 -; ec9fa - - diff --git a/audio/music/kantotrainerbattle.asm b/audio/music/kantotrainerbattle.asm index 21d1a7e9..511763c9 100644 --- a/audio/music/kantotrainerbattle.asm +++ b/audio/music/kantotrainerbattle.asm @@ -1,17 +1,14 @@ -Music_KantoTrainerBattle: ; ec9fa - dbw $80, Music_KantoTrainerBattle_Ch1 - dbw $01, Music_KantoTrainerBattle_Ch2 - dbw $02, Music_KantoTrainerBattle_Ch3 -; eca03 +Music_KantoTrainerBattle: + musicheader 3, 1, Music_KantoTrainerBattle_Ch1 + musicheader 1, 2, Music_KantoTrainerBattle_Ch2 + musicheader 1, 3, Music_KantoTrainerBattle_Ch3 + db $3 -INCBIN "baserom.gbc", $eca03, $eca04 - $eca03 - - -Music_KantoTrainerBattle_Ch1: ; eca04 +Music_KantoTrainerBattle_Ch1: tempo 114 volume $77 - forceoctave $1b + pitchoffset 1, B_ notetype $c, $b3 vibrato $12, $24 dutycycle $1 @@ -129,7 +126,7 @@ Music_KantoTrainerBattle_Ch1: ; eca04 note D#, 2 note F_, 2 note F#, 2 -Music_KantoTrainerBattle_branch_eca88: ; eca88 +Music_KantoTrainerBattle_branch_eca88: notetype $c, $b7 note D#, 4 note __, 2 @@ -466,10 +463,9 @@ Music_KantoTrainerBattle_branch_eca88: ; eca88 octave 4 note D_, 4 loopchannel 0, Music_KantoTrainerBattle_branch_eca88 -; ecbea -Music_KantoTrainerBattle_Ch2: ; ecbea - forceoctave $1b +Music_KantoTrainerBattle_Ch2: + pitchoffset 1, B_ vibrato $6, $36 dutycycle $1 notetype $c, $d1 @@ -487,7 +483,7 @@ Music_KantoTrainerBattle_Ch2: ; ecbea note F#, 1 dutycycle $3 intensity $62 -Music_KantoTrainerBattle_branch_ecc04: ; ecc04 +Music_KantoTrainerBattle_branch_ecc04: octave 3 note G_, 1 note G#, 1 @@ -544,7 +540,7 @@ Music_KantoTrainerBattle_branch_ecc04: ; ecc04 octave 3 note D_, 1 note F_, 1 -Music_KantoTrainerBattle_branch_ecc41: ; ecc41 +Music_KantoTrainerBattle_branch_ecc41: notetype $c, $d7 octave 2 note C_, 1 @@ -919,10 +915,9 @@ Music_KantoTrainerBattle_branch_ecc41: ; ecc41 octave 3 note B_, 4 loopchannel 0, Music_KantoTrainerBattle_branch_ecc41 -; ecdd2 -Music_KantoTrainerBattle_Ch3: ; ecdd2 - forceoctave $1b +Music_KantoTrainerBattle_Ch3: + pitchoffset 1, B_ vibrato $12, $23 notetype $c, $15 octave 2 @@ -1052,7 +1047,7 @@ Music_KantoTrainerBattle_Ch3: ; ecdd2 note G_, 2 note A#, 2 note B_, 2 -Music_KantoTrainerBattle_branch_ece5a: ; ece5a +Music_KantoTrainerBattle_branch_ece5a: notetype $c, $14 octave 6 note C_, 4 @@ -1539,6 +1534,3 @@ Music_KantoTrainerBattle_branch_ece5a: ; ece5a octave 5 note G_, 4 loopchannel 0, Music_KantoTrainerBattle_branch_ece5a -; ed06d - - diff --git a/audio/music/kantowildbattle.asm b/audio/music/kantowildbattle.asm index e14e8b85..c19da00d 100644 --- a/audio/music/kantowildbattle.asm +++ b/audio/music/kantowildbattle.asm @@ -1,14 +1,11 @@ -Music_KantoWildBattle: ; ed06d - dbw $80, Music_KantoWildBattle_Ch1 - dbw $01, Music_KantoWildBattle_Ch2 - dbw $02, Music_KantoWildBattle_Ch3 -; ed076 +Music_KantoWildBattle: + musicheader 3, 1, Music_KantoWildBattle_Ch1 + musicheader 1, 2, Music_KantoWildBattle_Ch2 + musicheader 1, 3, Music_KantoWildBattle_Ch3 + db $3 -INCBIN "baserom.gbc", $ed076, $ed077 - $ed076 - - -Music_KantoWildBattle_Ch1: ; ed077 +Music_KantoWildBattle_Ch1: tempo 112 volume $77 vibrato $12, $23 @@ -27,7 +24,7 @@ Music_KantoWildBattle_Ch1: ; ed077 note G_, 1 note F#, 1 note F_, 1 -Music_KantoWildBattle_branch_ed091: ; ed091 +Music_KantoWildBattle_branch_ed091: notetype $c, $b7 callchannel Music_KantoWildBattle_branch_ed18a octave 4 @@ -210,7 +207,7 @@ Music_KantoWildBattle_branch_ed091: ; ed091 note D#, 1 note __, 5 note C#, 8 -Music_KantoWildBattle_branch_ed15b: ; ed15b +Music_KantoWildBattle_branch_ed15b: intensity $b1 octave 3 note C_, 1 @@ -218,34 +215,33 @@ Music_KantoWildBattle_branch_ed15b: ; ed15b note D_, 1 note C#, 1 loopchannel 8, Music_KantoWildBattle_branch_ed15b -Music_KantoWildBattle_branch_ed166: ; ed166 +Music_KantoWildBattle_branch_ed166: note C#, 1 note F_, 1 note E_, 1 note D#, 1 loopchannel 8, Music_KantoWildBattle_branch_ed166 -Music_KantoWildBattle_branch_ed16e: ; ed16e +Music_KantoWildBattle_branch_ed16e: note C_, 1 note D#, 1 note D_, 1 note C#, 1 loopchannel 16, Music_KantoWildBattle_branch_ed16e -Music_KantoWildBattle_branch_ed176: ; ed176 +Music_KantoWildBattle_branch_ed176: note C#, 1 note E_, 1 note D#, 1 note D_, 1 loopchannel 8, Music_KantoWildBattle_branch_ed176 -Music_KantoWildBattle_branch_ed17e: ; ed17e +Music_KantoWildBattle_branch_ed17e: note C_, 1 note D#, 1 note D_, 1 note C#, 1 loopchannel 8, Music_KantoWildBattle_branch_ed17e loopchannel 0, Music_KantoWildBattle_branch_ed091 -; ed18a -Music_KantoWildBattle_branch_ed18a: ; ed18a +Music_KantoWildBattle_branch_ed18a: octave 4 note C_, 1 note __, 5 @@ -267,9 +263,8 @@ Music_KantoWildBattle_branch_ed18a: ; ed18a note B_, 1 note __, 3 endchannel -; ed19f -Music_KantoWildBattle_Ch2: ; ed19f +Music_KantoWildBattle_Ch2: dutycycle $1 vibrato $12, $23 notetype $c, $b1 @@ -306,7 +301,7 @@ Music_KantoWildBattle_Ch2: ; ed19f note D#, 1 note D_, 1 note C#, 1 -Music_KantoWildBattle_branch_ed1c8: ; ed1c8 +Music_KantoWildBattle_branch_ed1c8: notetype $c, $b7 callchannel Music_KantoWildBattle_branch_ed2c6 octave 2 @@ -329,18 +324,17 @@ Music_KantoWildBattle_branch_ed1c8: ; ed1c8 notetype $6, $b7 callchannel Music_KantoWildBattle_branch_ed307 callchannel Music_KantoWildBattle_branch_ed307 - forceoctave $1 - callchannel Music_KantoWildBattle_branch_ed307 - callchannel Music_KantoWildBattle_branch_ed307 - forceoctave $0 + pitchoffset 0, C# callchannel Music_KantoWildBattle_branch_ed307 callchannel Music_KantoWildBattle_branch_ed307 + pitchoffset 0, C_ +rept 4 callchannel Music_KantoWildBattle_branch_ed307 +endr + pitchoffset 0, C# callchannel Music_KantoWildBattle_branch_ed307 - forceoctave $1 callchannel Music_KantoWildBattle_branch_ed307 - callchannel Music_KantoWildBattle_branch_ed307 - forceoctave $0 + pitchoffset 0, C_ callchannel Music_KantoWildBattle_branch_ed307 callchannel Music_KantoWildBattle_branch_ed307 note __, 16 @@ -387,9 +381,9 @@ Music_KantoWildBattle_branch_ed1c8: ; ed1c8 note G#, 1 notetype $6, $b7 callchannel Music_KantoWildBattle_branch_ed31b - forceoctave $1 + pitchoffset 0, C# callchannel Music_KantoWildBattle_branch_ed31b - forceoctave $0 + pitchoffset 0, C_ callchannel Music_KantoWildBattle_branch_ed340 octave 2 note C_, 2 @@ -453,9 +447,9 @@ Music_KantoWildBattle_branch_ed1c8: ; ed1c8 callchannel Music_KantoWildBattle_branch_ed354 callchannel Music_KantoWildBattle_branch_ed340 callchannel Music_KantoWildBattle_branch_ed354 - forceoctave $1 + pitchoffset 0, C# callchannel Music_KantoWildBattle_branch_ed340 - forceoctave $0 + pitchoffset 0, C_ note C#, 2 note __, 2 octave 3 @@ -496,9 +490,8 @@ Music_KantoWildBattle_branch_ed1c8: ; ed1c8 note C_, 2 note __, 2 loopchannel 0, Music_KantoWildBattle_branch_ed1c8 -; ed2c6 -Music_KantoWildBattle_branch_ed2c6: ; ed2c6 +Music_KantoWildBattle_branch_ed2c6: octave 2 note C_, 1 note __, 2 @@ -564,9 +557,8 @@ Music_KantoWildBattle_branch_ed2c6: ; ed2c6 octave 1 note G_, 2 endchannel -; ed307 -Music_KantoWildBattle_branch_ed307: ; ed307 +Music_KantoWildBattle_branch_ed307: octave 2 note C_, 2 note __, 4 @@ -587,9 +579,8 @@ Music_KantoWildBattle_branch_ed307: ; ed307 octave 2 note C_, 4 endchannel -; ed31b -Music_KantoWildBattle_branch_ed31b: ; ed31b +Music_KantoWildBattle_branch_ed31b: octave 2 note C_, 2 note __, 4 @@ -627,9 +618,8 @@ Music_KantoWildBattle_branch_ed31b: ; ed31b octave 3 note C_, 2 endchannel -; ed340 -Music_KantoWildBattle_branch_ed340: ; ed340 +Music_KantoWildBattle_branch_ed340: octave 3 note G_, 4 octave 2 @@ -650,9 +640,8 @@ Music_KantoWildBattle_branch_ed340: ; ed340 note C_, 2 note __, 2 endchannel -; ed354 -Music_KantoWildBattle_branch_ed354: ; ed354 +Music_KantoWildBattle_branch_ed354: note C_, 2 note __, 2 octave 3 @@ -673,9 +662,8 @@ Music_KantoWildBattle_branch_ed354: ; ed354 note C_, 2 note __, 2 endchannel -; ed368 -Music_KantoWildBattle_Ch3: ; ed368 +Music_KantoWildBattle_Ch3: vibrato $14, $23 notetype $c, $14 octave 3 @@ -726,7 +714,7 @@ Music_KantoWildBattle_Ch3: ; ed368 note G_, 1 octave 4 note G_, 1 -Music_KantoWildBattle_branch_ed39e: ; ed39e +Music_KantoWildBattle_branch_ed39e: notetype $c, $14 octave 5 note G_, 1 @@ -1225,6 +1213,3 @@ Music_KantoWildBattle_branch_ed39e: ; ed39e note G_, 16 note G_, 16 loopchannel 0, Music_KantoWildBattle_branch_ed39e -; ed5c6 - - diff --git a/audio/music/lakeofrage.asm b/audio/music/lakeofrage.asm index 8a57ab38..4f7154fd 100644 --- a/audio/music/lakeofrage.asm +++ b/audio/music/lakeofrage.asm @@ -1,11 +1,10 @@ -Music_LakeOfRage: ; ee6c5 - dbw $c0, Music_LakeOfRage_Ch1 - dbw $01, Music_LakeOfRage_Ch2 - dbw $02, Music_LakeOfRage_Ch3 - dbw $03, Music_LakeOfRage_Ch4 -; ee6d1 +Music_LakeOfRage: + musicheader 4, 1, Music_LakeOfRage_Ch1 + musicheader 1, 2, Music_LakeOfRage_Ch2 + musicheader 1, 3, Music_LakeOfRage_Ch3 + musicheader 1, 4, Music_LakeOfRage_Ch4 -Music_LakeOfRage_Ch1: ; ee6d1 +Music_LakeOfRage_Ch1: tempo 144 volume $77 dutycycle $3 @@ -19,7 +18,7 @@ Music_LakeOfRage_Ch1: ; ee6d1 note D_, 6 note D_, 6 note E_, 4 -Music_LakeOfRage_branch_ee6e9: ; ee6e9 +Music_LakeOfRage_branch_ee6e9: intensity $b5 note F#, 6 note E_, 6 @@ -93,9 +92,8 @@ Music_LakeOfRage_branch_ee6e9: ; ee6e9 intensity $a7 note D_, 6 loopchannel 0, Music_LakeOfRage_branch_ee6e9 -; ee749 -Music_LakeOfRage_Ch2: ; ee749 +Music_LakeOfRage_Ch2: dutycycle $3 vibrato $20, $44 stereopanning $ff @@ -108,7 +106,7 @@ Music_LakeOfRage_Ch2: ; ee749 note A_, 8 intensity $a7 note A_, 8 -Music_LakeOfRage_branch_ee75e: ; ee75e +Music_LakeOfRage_branch_ee75e: notetype $8, $c7 octave 4 note D_, 16 @@ -183,9 +181,8 @@ Music_LakeOfRage_branch_ee75e: ; ee75e notetype $c, $c7 note A_, 16 loopchannel 0, Music_LakeOfRage_branch_ee75e -; ee7c1 -Music_LakeOfRage_Ch3: ; ee7c1 +Music_LakeOfRage_Ch3: stereopanning $f notetype $c, $16 octave 3 @@ -198,7 +195,7 @@ Music_LakeOfRage_Ch3: ; ee7c1 note F#, 4 note __, 2 note E_, 4 -Music_LakeOfRage_branch_ee7d0: ; ee7d0 +Music_LakeOfRage_branch_ee7d0: octave 3 note D_, 4 octave 2 @@ -297,13 +294,12 @@ Music_LakeOfRage_branch_ee7d0: ; ee7d0 octave 2 note A_, 2 loopchannel 0, Music_LakeOfRage_branch_ee7d0 -; ee835 -Music_LakeOfRage_Ch4: ; ee835 +Music_LakeOfRage_Ch4: stereopanning $f0 togglenoise $3 notetype $c -Music_LakeOfRage_branch_ee83b: ; ee83b +Music_LakeOfRage_branch_ee83b: note D_, 2 note D_, 1 note D_, 1 @@ -324,6 +320,3 @@ Music_LakeOfRage_branch_ee83b: ; ee83b note D_, 1 note D_, 1 loopchannel 0, Music_LakeOfRage_branch_ee83b -; ee852 - - diff --git a/audio/music/lakeofragerocketradio.asm b/audio/music/lakeofragerocketradio.asm index 2abd2931..512db764 100644 --- a/audio/music/lakeofragerocketradio.asm +++ b/audio/music/lakeofragerocketradio.asm @@ -1,17 +1,16 @@ -Music_LakeOfRageRocketRadio: ; ef5b1 - dbw $80, Music_LakeOfRageRocketRadio_Ch1 - dbw $01, Music_LakeOfRageRocketRadio_Ch2 - dbw $02, Music_LakeOfRageRocketRadio_Ch3 -; ef5ba +Music_LakeOfRageRocketRadio: + musicheader 3, 1, Music_LakeOfRageRocketRadio_Ch1 + musicheader 1, 2, Music_LakeOfRageRocketRadio_Ch2 + musicheader 1, 3, Music_LakeOfRageRocketRadio_Ch3 -Music_LakeOfRageRocketRadio_Ch1: ; ef5ba +Music_LakeOfRageRocketRadio_Ch1: tempo 160 volume $77 dutycycle $1 tone $1118 vibrato $0, $f0 stereopanning $f0 -Music_LakeOfRageRocketRadio_branch_ef5c9: ; ef5c9 +Music_LakeOfRageRocketRadio_branch_ef5c9: notetype $c, $a7 octave 7 note G_, 4 @@ -20,22 +19,17 @@ Music_LakeOfRageRocketRadio_branch_ef5c9: ; ef5c9 note F#, 4 note __, 16 loopchannel 0, Music_LakeOfRageRocketRadio_branch_ef5c9 -; ef5d6 -Music_LakeOfRageRocketRadio_Ch2: ; ef5d6 +Music_LakeOfRageRocketRadio_Ch2: dutycycle $1 vibrato $13, $e8 notetype $c, $a7 note __, 2 stereopanning $f loopchannel 0, Music_LakeOfRageRocketRadio_branch_ef5c9 -; ef5e5 -Music_LakeOfRageRocketRadio_Ch3: ; ef5e5 +Music_LakeOfRageRocketRadio_Ch3: notetype $c, $26 vibrato $10, $44 note __, 4 loopchannel 0, Music_LakeOfRageRocketRadio_branch_ef5c9 -; ef5f0 - - diff --git a/audio/music/lavendertown.asm b/audio/music/lavendertown.asm index 780bdc60..6384b701 100644 --- a/audio/music/lavendertown.asm +++ b/audio/music/lavendertown.asm @@ -1,14 +1,11 @@ -Music_LavenderTown: ; ef72f - dbw $80, Music_LavenderTown_Ch1 - dbw $01, Music_LavenderTown_Ch2 - dbw $02, Music_LavenderTown_Ch3 -; ef738 +Music_LavenderTown: + musicheader 3, 1, Music_LavenderTown_Ch1 + musicheader 1, 2, Music_LavenderTown_Ch2 + musicheader 1, 3, Music_LavenderTown_Ch3 + db $3 -INCBIN "baserom.gbc", $ef738, $ef739 - $ef738 - - -Music_LavenderTown_Ch1: ; ef739 +Music_LavenderTown_Ch1: tempo 160 volume $77 stereopanning $f @@ -19,7 +16,7 @@ Music_LavenderTown_Ch1: ; ef739 note __, 16 note __, 16 note __, 16 -Music_LavenderTown_branch_ef74c: ; ef74c +Music_LavenderTown_branch_ef74c: callchannel Music_LavenderTown_branch_ef7fd intensity $93 octave 5 @@ -105,7 +102,7 @@ Music_LavenderTown_branch_ef74c: ; ef74c octave 3 note A_, 2 note F_, 2 -Music_LavenderTown_branch_ef7ca: ; ef7ca +Music_LavenderTown_branch_ef7ca: octave 3 note C_, 2 note E_, 2 @@ -151,9 +148,8 @@ Music_LavenderTown_branch_ef7ca: ; ef7ca note B_, 8 note B_, 8 loopchannel 0, Music_LavenderTown_branch_ef74c -; ef7fd -Music_LavenderTown_branch_ef7fd: ; ef7fd +Music_LavenderTown_branch_ef7fd: intensity $83 octave 5 note C_, 2 @@ -244,9 +240,8 @@ Music_LavenderTown_branch_ef7fd: ; ef7fd intensity $43 note F_, 2 endchannel -; ef87f -Music_LavenderTown_branch_ef87f: ; ef87f +Music_LavenderTown_branch_ef87f: intensity $93 octave 5 note G_, 2 @@ -265,13 +260,12 @@ Music_LavenderTown_branch_ef87f: ; ef87f intensity $43 note G_, 2 endchannel -; ef899 -Music_LavenderTown_Ch2: ; ef899 +Music_LavenderTown_Ch2: dutycycle $1 vibrato $8, $24 stereopanning $ff -Music_LavenderTown_branch_ef8a0: ; ef8a0 +Music_LavenderTown_branch_ef8a0: notetype $c, $a3 octave 5 note C_, 2 @@ -307,7 +301,7 @@ Music_LavenderTown_branch_ef8a0: ; ef8a0 note D_, 2 intensity $63 note D_, 2 -Music_LavenderTown_branch_ef8d7: ; ef8d7 +Music_LavenderTown_branch_ef8d7: intensity $b5 callchannel Music_LavenderTown_branch_ef915 octave 2 @@ -360,9 +354,8 @@ Music_LavenderTown_branch_ef8d7: ; ef8d7 note F_, 1 note G_, 6 loopchannel 0, Music_LavenderTown_branch_ef8d7 -; ef915 -Music_LavenderTown_branch_ef915: ; ef915 +Music_LavenderTown_branch_ef915: octave 2 note C_, 4 note G_, 4 @@ -392,9 +385,8 @@ Music_LavenderTown_branch_ef915: ; ef915 note A_, 4 note C_, 4 endchannel -; ef932 -Music_LavenderTown_Ch3: ; ef932 +Music_LavenderTown_Ch3: vibrato $12, $24 notetype $c, $13 stereopanning $f0 @@ -405,7 +397,7 @@ Music_LavenderTown_Ch3: ; ef932 octave 5 note E_, 4 note F_, 4 -Music_LavenderTown_branch_ef941: ; ef941 +Music_LavenderTown_branch_ef941: intensity $12 octave 5 note G_, 4 @@ -520,6 +512,3 @@ Music_LavenderTown_branch_ef941: ; ef941 note E_, 2 note F_, 2 loopchannel 0, Music_LavenderTown_branch_ef941 -; ef9bc - - diff --git a/audio/music/lighthouse.asm b/audio/music/lighthouse.asm index 74abfcde..9846e7ec 100644 --- a/audio/music/lighthouse.asm +++ b/audio/music/lighthouse.asm @@ -1,18 +1,17 @@ -Music_Lighthouse: ; ee569 - dbw $c0, Music_Lighthouse_Ch1 - dbw $01, Music_Lighthouse_Ch2 - dbw $02, Music_Lighthouse_Ch3 - dbw $03, Music_Lighthouse_Ch4 -; ee575 +Music_Lighthouse: + musicheader 4, 1, Music_Lighthouse_Ch1 + musicheader 1, 2, Music_Lighthouse_Ch2 + musicheader 1, 3, Music_Lighthouse_Ch3 + musicheader 1, 4, Music_Lighthouse_Ch4 -Music_Lighthouse_Ch1: ; ee575 +Music_Lighthouse_Ch1: tempo 144 volume $77 dutycycle $3 tone $0004 vibrato $8, $45 stereopanning $f -Music_Lighthouse_branch_ee584: ; ee584 +Music_Lighthouse_branch_ee584: notetype $c, $b3 octave 3 note C#, 8 @@ -128,13 +127,12 @@ Music_Lighthouse_branch_ee584: ; ee584 note A_, 2 note G#, 8 loopchannel 0, Music_Lighthouse_branch_ee584 -; ee5fc -Music_Lighthouse_Ch2: ; ee5fc +Music_Lighthouse_Ch2: dutycycle $3 tone $0002 vibrato $10, $45 -Music_Lighthouse_branch_ee604: ; ee604 +Music_Lighthouse_branch_ee604: notetype $c, $c5 octave 3 note G#, 12 @@ -211,12 +209,11 @@ Music_Lighthouse_branch_ee604: ; ee604 note C#, 2 note C_, 8 loopchannel 0, Music_Lighthouse_branch_ee604 -; ee656 -Music_Lighthouse_Ch3: ; ee656 +Music_Lighthouse_Ch3: notetype $c, $19 stereopanning $f0 -Music_Lighthouse_branch_ee65b: ; ee65b +Music_Lighthouse_branch_ee65b: octave 2 note G#, 2 note __, 2 @@ -226,7 +223,7 @@ Music_Lighthouse_branch_ee65b: ; ee65b note __, 2 note G_, 2 note __, 2 -Music_Lighthouse_branch_ee664: ; ee664 +Music_Lighthouse_branch_ee664: note G#, 2 note __, 2 note D#, 2 @@ -255,7 +252,7 @@ Music_Lighthouse_branch_ee664: ; ee664 octave 3 note C_, 2 note __, 2 -Music_Lighthouse_branch_ee683: ; ee683 +Music_Lighthouse_branch_ee683: note C#, 2 note __, 2 octave 2 @@ -277,7 +274,7 @@ Music_Lighthouse_branch_ee683: ; ee683 octave 3 note D#, 2 note F#, 2 -Music_Lighthouse_branch_ee69b: ; ee69b +Music_Lighthouse_branch_ee69b: note E_, 2 note __, 2 octave 2 @@ -290,12 +287,11 @@ Music_Lighthouse_branch_ee69b: ; ee69b note __, 2 loopchannel 8, Music_Lighthouse_branch_ee69b loopchannel 0, Music_Lighthouse_branch_ee65b -; ee6ad -Music_Lighthouse_Ch4: ; ee6ad +Music_Lighthouse_Ch4: togglenoise $0 notetype $c -Music_Lighthouse_branch_ee6b1: ; ee6b1 +Music_Lighthouse_branch_ee6b1: stereopanning $f note G#, 4 note F_, 2 @@ -311,6 +307,3 @@ Music_Lighthouse_branch_ee6b1: ; ee6b1 note G#, 2 note A_, 2 loopchannel 0, Music_Lighthouse_branch_ee6b1 -; ee6c5 - - diff --git a/audio/music/lookbeauty.asm b/audio/music/lookbeauty.asm index 7f08f2ff..313f2366 100644 --- a/audio/music/lookbeauty.asm +++ b/audio/music/lookbeauty.asm @@ -1,11 +1,10 @@ -Music_LookBeauty: ; eee3e - dbw $c0, Music_LookBeauty_Ch1 - dbw $01, Music_LookBeauty_Ch2 - dbw $02, Music_LookBeauty_Ch3 - dbw $03, Music_LookBeauty_Ch4 -; eee4a +Music_LookBeauty: + musicheader 4, 1, Music_LookBeauty_Ch1 + musicheader 1, 2, Music_LookBeauty_Ch2 + musicheader 1, 3, Music_LookBeauty_Ch3 + musicheader 1, 4, Music_LookBeauty_Ch4 -Music_LookBeauty_Ch1: ; eee4a +Music_LookBeauty_Ch1: stereopanning $f vibrato $12, $25 dutycycle $2 @@ -17,7 +16,7 @@ Music_LookBeauty_Ch1: ; eee4a octave 4 note C_, 8 dutycycle $3 -Music_LookBeauty_branch_eee5f: ; eee5f +Music_LookBeauty_branch_eee5f: note __, 4 octave 3 note D_, 1 @@ -76,9 +75,8 @@ Music_LookBeauty_branch_eee5f: ; eee5f octave 4 note C_, 1 loopchannel 0, Music_LookBeauty_branch_eee5f -; eee9c -Music_LookBeauty_Ch2: ; eee9c +Music_LookBeauty_Ch2: stereopanning $f0 vibrato $10, $23 dutycycle $2 @@ -113,7 +111,7 @@ Music_LookBeauty_Ch2: ; eee9c note F#, 1 note __, 1 dutycycle $3 -Music_LookBeauty_branch_eeec5: ; eeec5 +Music_LookBeauty_branch_eeec5: notetype $c, $c7 note G_, 16 note A_, 8 @@ -154,9 +152,8 @@ Music_LookBeauty_branch_eeec5: ; eeec5 note F#, 8 note A_, 8 loopchannel 0, Music_LookBeauty_branch_eeec5 -; eeefa -Music_LookBeauty_Ch3: ; eeefa +Music_LookBeauty_Ch3: stereopanning $ff vibrato $8, $12 notetype $c, $15 @@ -173,7 +170,7 @@ Music_LookBeauty_Ch3: ; eeefa octave 3 note D_, 7 note F#, 1 -Music_LookBeauty_branch_eef0f: ; eef0f +Music_LookBeauty_branch_eef0f: note G_, 4 octave 4 note B_, 1 @@ -295,22 +292,20 @@ Music_LookBeauty_branch_eef0f: ; eef0f octave 3 note D_, 8 loopchannel 0, Music_LookBeauty_branch_eef0f -; eef8b -Music_LookBeauty_Ch4: ; eef8b +Music_LookBeauty_Ch4: togglenoise $3 notetype $c note __, 16 note __, 16 -Music_LookBeauty_branch_eef91: ; eef91 +Music_LookBeauty_branch_eef91: callchannel Music_LookBeauty_branch_eefa1 callchannel Music_LookBeauty_branch_eefa1 callchannel Music_LookBeauty_branch_eefa1 callchannel Music_LookBeauty_branch_eefa1 loopchannel 0, Music_LookBeauty_branch_eef91 -; eefa1 -Music_LookBeauty_branch_eefa1: ; eefa1 +Music_LookBeauty_branch_eefa1: note F#, 2 note G_, 2 note D_, 2 @@ -328,6 +323,3 @@ Music_LookBeauty_branch_eefa1: ; eefa1 note D_, 2 note G_, 2 endchannel -; eefb2 - - diff --git a/audio/music/lookhiker.asm b/audio/music/lookhiker.asm index a213b49c..9a394eb7 100644 --- a/audio/music/lookhiker.asm +++ b/audio/music/lookhiker.asm @@ -1,11 +1,10 @@ -Music_LookHiker: ; f7411 - dbw $c0, Music_LookHiker_Ch1 - dbw $01, Music_LookHiker_Ch2 - dbw $02, Music_LookHiker_Ch3 - dbw $03, Music_LookHiker_Ch4 -; f741d +Music_LookHiker: + musicheader 4, 1, Music_LookHiker_Ch1 + musicheader 1, 2, Music_LookHiker_Ch2 + musicheader 1, 3, Music_LookHiker_Ch3 + musicheader 1, 4, Music_LookHiker_Ch4 -Music_LookHiker_Ch1: ; f741d +Music_LookHiker_Ch1: tempo 132 volume $77 tone $0001 @@ -17,7 +16,7 @@ Music_LookHiker_Ch1: ; f741d note F#, 2 note F_, 2 note F#, 8 -Music_LookHiker_branch_f7433: ; f7433 +Music_LookHiker_branch_f7433: note D_, 2 note D#, 2 note E_, 2 @@ -31,9 +30,8 @@ Music_LookHiker_branch_f7433: ; f7433 note F#, 2 note __, 6 loopchannel 0, Music_LookHiker_branch_f7433 -; f7443 -Music_LookHiker_Ch2: ; f7443 +Music_LookHiker_Ch2: dutycycle $0 notetype $c, $a1 note __, 4 @@ -50,7 +48,7 @@ Music_LookHiker_Ch2: ; f7443 note F#, 1 note D_, 1 intensity $a1 -Music_LookHiker_branch_f7457: ; f7457 +Music_LookHiker_branch_f7457: octave 1 note B_, 1 note B_, 2 @@ -68,9 +66,8 @@ Music_LookHiker_branch_f7457: ; f7457 note F#, 1 note D_, 1 loopchannel 0, Music_LookHiker_branch_f7457 -; f746b -Music_LookHiker_Ch3: ; f746b +Music_LookHiker_Ch3: vibrato $12, $24 stereopanning $f0 notetype $c, $14 @@ -78,7 +75,7 @@ Music_LookHiker_Ch3: ; f746b note B_, 2 note A#, 2 note B_, 8 -Music_LookHiker_branch_f7477: ; f7477 +Music_LookHiker_branch_f7477: octave 5 note D#, 2 note D_, 2 @@ -91,9 +88,8 @@ Music_LookHiker_branch_f7477: ; f7477 note A#, 2 callchannel Music_LookHiker_branch_f748a loopchannel 0, Music_LookHiker_branch_f7477 -; f748a -Music_LookHiker_branch_f748a: ; f748a +Music_LookHiker_branch_f748a: octave 4 note B_, 2 note __, 4 @@ -104,19 +100,15 @@ Music_LookHiker_branch_f748a: ; f748a note B_, 2 note __, 6 endchannel -; f7494 -Music_LookHiker_Ch4: ; f7494 +Music_LookHiker_Ch4: togglenoise $3 notetype $c note F_, 4 note __, 16 -Music_LookHiker_branch_f749a: ; f749a +Music_LookHiker_branch_f749a: note D#, 2 note G_, 2 note D_, 2 note G_, 2 loopchannel 0, Music_LookHiker_branch_f749a -; f74a2 - - diff --git a/audio/music/lookkimonogirl.asm b/audio/music/lookkimonogirl.asm index 32d4498d..dc1dbee8 100644 --- a/audio/music/lookkimonogirl.asm +++ b/audio/music/lookkimonogirl.asm @@ -1,14 +1,11 @@ -Music_LookKimonoGirl: ; f79b8 - dbw $80, Music_LookKimonoGirl_Ch1 - dbw $01, Music_LookKimonoGirl_Ch2 - dbw $02, Music_LookKimonoGirl_Ch3 -; f79c1 +Music_LookKimonoGirl: + musicheader 3, 1, Music_LookKimonoGirl_Ch1 + musicheader 1, 2, Music_LookKimonoGirl_Ch2 + musicheader 1, 3, Music_LookKimonoGirl_Ch3 + db $3 -INCBIN "baserom.gbc", $f79c1, $f79c2 - $f79c1 - - -Music_LookKimonoGirl_Ch1: ; f79c2 +Music_LookKimonoGirl_Ch1: tempo 160 volume $77 stereopanning $f @@ -16,8 +13,8 @@ Music_LookKimonoGirl_Ch1: ; f79c2 notetype $6, $87 tone $0001 callchannel Music_LookKimonoGirl_branch_f7aa8 - tone $0000 -Music_LookKimonoGirl_branch_f79d7: ; f79d7 + tone 0 +Music_LookKimonoGirl_branch_f79d7: notetype $c, $b2 callchannel Music_LookKimonoGirl_branch_f7a13 callchannel Music_LookKimonoGirl_branch_f7a13 @@ -51,9 +48,8 @@ Music_LookKimonoGirl_branch_f79d7: ; f79d7 octave 3 note A_, 1 loopchannel 0, Music_LookKimonoGirl_branch_f79d7 -; f7a13 -Music_LookKimonoGirl_branch_f7a13: ; f7a13 +Music_LookKimonoGirl_branch_f7a13: intensity $b4 octave 2 note F_, 1 @@ -79,9 +75,8 @@ Music_LookKimonoGirl_branch_f7a13: ; f7a13 octave 4 note D_, 1 endchannel -; f7a34 -Music_LookKimonoGirl_branch_f7a34: ; f7a34 +Music_LookKimonoGirl_branch_f7a34: intensity $b4 octave 2 note E_, 1 @@ -107,14 +102,13 @@ Music_LookKimonoGirl_branch_f7a34: ; f7a34 octave 4 note D_, 1 endchannel -; f7a55 -Music_LookKimonoGirl_Ch2: ; f7a55 +Music_LookKimonoGirl_Ch2: dutycycle $0 notetype $6, $a7 stereopanning $f0 callchannel Music_LookKimonoGirl_branch_f7aa8 -Music_LookKimonoGirl_branch_f7a5f: ; f7a5f +Music_LookKimonoGirl_branch_f7a5f: dutycycle $3 notetype $c, $91 octave 5 @@ -158,9 +152,8 @@ Music_LookKimonoGirl_branch_f7a5f: ; f7a5f note D_, 1 callchannel Music_LookKimonoGirl_branch_f7a94 loopchannel 0, Music_LookKimonoGirl_branch_f7a5f -; f7a94 -Music_LookKimonoGirl_branch_f7a94: ; f7a94 +Music_LookKimonoGirl_branch_f7a94: octave 5 note B_, 1 note A_, 1 @@ -181,9 +174,8 @@ Music_LookKimonoGirl_branch_f7a94: ; f7a94 note B_, 1 note E_, 1 endchannel -; f7aa8 -Music_LookKimonoGirl_branch_f7aa8: ; f7aa8 +Music_LookKimonoGirl_branch_f7aa8: octave 4 note E_, 1 octave 5 @@ -217,9 +209,8 @@ Music_LookKimonoGirl_branch_f7aa8: ; f7aa8 note E_, 1 note E_, 1 endchannel -; f7ad4 -Music_LookKimonoGirl_Ch3: ; f7ad4 +Music_LookKimonoGirl_Ch3: stereopanning $ff vibrato $12, $24 notetype $6, $13 @@ -235,7 +226,7 @@ Music_LookKimonoGirl_Ch3: ; f7ad4 octave 5 note D_, 2 note E_, 2 -Music_LookKimonoGirl_branch_f7aec: ; f7aec +Music_LookKimonoGirl_branch_f7aec: octave 5 note D_, 4 note E_, 4 @@ -272,6 +263,3 @@ Music_LookKimonoGirl_branch_f7aec: ; f7aec note D_, 8 note E_, 8 loopchannel 0, Music_LookKimonoGirl_branch_f7aec -; f7b13 - - diff --git a/audio/music/looklass.asm b/audio/music/looklass.asm index 17f44173..802716c1 100644 --- a/audio/music/looklass.asm +++ b/audio/music/looklass.asm @@ -1,11 +1,10 @@ -Music_LookLass: ; ed79b - dbw $c0, Music_LookLass_Ch1 - dbw $01, Music_LookLass_Ch2 - dbw $02, Music_LookLass_Ch3 - dbw $03, Music_LookLass_Ch4 -; ed7a7 +Music_LookLass: + musicheader 4, 1, Music_LookLass_Ch1 + musicheader 1, 2, Music_LookLass_Ch2 + musicheader 1, 3, Music_LookLass_Ch3 + musicheader 1, 4, Music_LookLass_Ch4 -Music_LookLass_Ch1: ; ed7a7 +Music_LookLass_Ch1: tempo 132 volume $77 tone $0001 @@ -18,7 +17,7 @@ Music_LookLass_Ch1: ; ed7a7 note B_, 14 stereopanning $f dutycycle $0 -Music_LookLass_branch_ed7bd: ; ed7bd +Music_LookLass_branch_ed7bd: intensity $a2 octave 3 note E_, 4 @@ -29,14 +28,13 @@ Music_LookLass_branch_ed7bd: ; ed7bd intensity $a3 note B_, 2 loopchannel 0, Music_LookLass_branch_ed7bd -; ed7cd -Music_LookLass_Ch2: ; ed7cd +Music_LookLass_Ch2: stereopanning $f0 dutycycle $0 notetype $c, $83 note __, 16 -Music_LookLass_branch_ed7d5: ; ed7d5 +Music_LookLass_branch_ed7d5: intensity $92 octave 2 note B_, 4 @@ -48,9 +46,8 @@ Music_LookLass_branch_ed7d5: ; ed7d5 octave 3 note G#, 2 loopchannel 0, Music_LookLass_branch_ed7d5 -; ed7e6 -Music_LookLass_Ch3: ; ed7e6 +Music_LookLass_Ch3: notetype $c, $10 note __, 8 octave 6 @@ -58,7 +55,7 @@ Music_LookLass_Ch3: ; ed7e6 note D#, 2 note C#, 2 note C_, 2 -Music_LookLass_branch_ed7ef: ; ed7ef +Music_LookLass_branch_ed7ef: octave 5 note B_, 2 note __, 2 @@ -99,13 +96,12 @@ Music_LookLass_branch_ed7ef: ; ed7ef note G#, 2 note A_, 2 loopchannel 0, Music_LookLass_branch_ed7ef -; ed81a -Music_LookLass_Ch4: ; ed81a +Music_LookLass_Ch4: togglenoise $4 notetype $c note C_, 16 -Music_LookLass_branch_ed81f: ; ed81f +Music_LookLass_branch_ed81f: notetype $6 note D_, 8 note C#, 8 @@ -116,6 +112,3 @@ Music_LookLass_branch_ed81f: ; ed81f note C#, 1 note C#, 1 loopchannel 0, Music_LookLass_branch_ed81f -; ed82d - - diff --git a/audio/music/lookofficer.asm b/audio/music/lookofficer.asm index 31ff6e67..75e527b7 100644 --- a/audio/music/lookofficer.asm +++ b/audio/music/lookofficer.asm @@ -1,10 +1,9 @@ -Music_LookOfficer: ; ed82d - dbw $80, Music_LookOfficer_Ch1 - dbw $01, Music_LookOfficer_Ch2 - dbw $02, Music_LookOfficer_Ch3 -; ed836 +Music_LookOfficer: + musicheader 3, 1, Music_LookOfficer_Ch1 + musicheader 1, 2, Music_LookOfficer_Ch2 + musicheader 1, 3, Music_LookOfficer_Ch3 -Music_LookOfficer_Ch1: ; ed836 +Music_LookOfficer_Ch1: tempo 116 volume $77 tone $0001 @@ -21,7 +20,7 @@ Music_LookOfficer_Ch1: ; ed836 intensity $2f octave 3 note B_, 16 -Music_LookOfficer_branch_ed852: ; ed852 +Music_LookOfficer_branch_ed852: intensity $82 note __, 4 note B_, 6 @@ -34,9 +33,8 @@ Music_LookOfficer_branch_ed852: ; ed852 note A#, 16 note A_, 16 loopchannel 0, Music_LookOfficer_branch_ed852 -; ed863 -Music_LookOfficer_Ch2: ; ed863 +Music_LookOfficer_Ch2: vibrato $12, $34 dutycycle $3 notetype $c, $b7 @@ -61,7 +59,7 @@ Music_LookOfficer_Ch2: ; ed863 note B_, 2 octave 2 note D#, 2 -Music_LookOfficer_branch_ed882: ; ed882 +Music_LookOfficer_branch_ed882: note E_, 2 note G#, 2 octave 3 @@ -73,14 +71,13 @@ Music_LookOfficer_branch_ed882: ; ed882 note E_, 2 note G#, 2 loopchannel 2, Music_LookOfficer_branch_ed882 - forceoctave $1 + pitchoffset 0, C# callchannel Music_LookOfficer_branch_ed89e - forceoctave $0 + pitchoffset 0, C_ callchannel Music_LookOfficer_branch_ed89e loopchannel 0, Music_LookOfficer_branch_ed882 -; ed89e -Music_LookOfficer_branch_ed89e: ; ed89e +Music_LookOfficer_branch_ed89e: octave 1 note A_, 2 octave 2 @@ -96,9 +93,8 @@ Music_LookOfficer_branch_ed89e: ; ed89e octave 2 note C#, 2 endchannel -; ed8ad -Music_LookOfficer_Ch3: ; ed8ad +Music_LookOfficer_Ch3: vibrato $14, $14 stereopanning $f0 notetype $c, $14 @@ -120,7 +116,7 @@ Music_LookOfficer_Ch3: ; ed8ad note C#, 2 note __, 1 note D#, 2 -Music_LookOfficer_branch_ed8c8: ; ed8c8 +Music_LookOfficer_branch_ed8c8: note E_, 6 note D#, 6 note C#, 4 @@ -139,6 +135,3 @@ Music_LookOfficer_branch_ed8c8: ; ed8c8 note E_, 8 note C#, 8 loopchannel 0, Music_LookOfficer_branch_ed8c8 -; ed8dd - - diff --git a/audio/music/lookpokemaniac.asm b/audio/music/lookpokemaniac.asm index 9a7a788f..4c4f8506 100644 --- a/audio/music/lookpokemaniac.asm +++ b/audio/music/lookpokemaniac.asm @@ -1,10 +1,9 @@ -Music_LookPokemaniac: ; ebdd5 - dbw $80, Music_LookPokemaniac_Ch1 - dbw $01, Music_LookPokemaniac_Ch2 - dbw $02, Music_LookPokemaniac_Ch3 -; ebdde +Music_LookPokemaniac: + musicheader 3, 1, Music_LookPokemaniac_Ch1 + musicheader 1, 2, Music_LookPokemaniac_Ch2 + musicheader 1, 3, Music_LookPokemaniac_Ch3 -Music_LookPokemaniac_Ch1: ; ebdde +Music_LookPokemaniac_Ch1: stereopanning $f tempo 144 volume $77 @@ -12,24 +11,23 @@ Music_LookPokemaniac_Ch1: ; ebdde tone $0002 notetype $c, $b3 note __, 8 -Music_LookPokemaniac_branch_ebdef: ; ebdef +Music_LookPokemaniac_branch_ebdfb: note __, 4 octave 3 note A#, 1 note __, 3 note A#, 1 note __, 3 - loopchannel 4, Music_LookPokemaniac_branch_ebdef + loopchannel 4, Music_LookPokemaniac_branch_ebdfb note __, 4 note G_, 1 note __, 3 note G_, 1 note __, 3 - loopchannel 4, Music_LookPokemaniac_branch_ebdef - loopchannel 0, Music_LookPokemaniac_branch_ebdef -; ebe06 + loopchannel 4, Music_LookPokemaniac_branch_ebdfb + loopchannel 0, Music_LookPokemaniac_branch_ebdfb -Music_LookPokemaniac_Ch2: ; ebe06 +Music_LookPokemaniac_Ch2: stereopanning $ff vibrato $2, $33 tone $0001 @@ -41,7 +39,7 @@ Music_LookPokemaniac_Ch2: ; ebe06 note C_, 1 octave 1 note A_, 4 -Music_LookPokemaniac_branch_ebe18: ; ebe18 +Music_LookPokemaniac_branch_ebe24: octave 2 note C_, 2 note __, 2 @@ -58,8 +56,8 @@ Music_LookPokemaniac_branch_ebe18: ; ebe18 note __, 3 note D#, 1 note __, 3 - loopchannel 2, Music_LookPokemaniac_branch_ebe18 -Music_LookPokemaniac_branch_ebe2c: ; ebe2c + loopchannel 2, Music_LookPokemaniac_branch_ebe24 +Music_LookPokemaniac_branch_ebe38: octave 1 note A_, 2 note __, 2 @@ -77,11 +75,10 @@ Music_LookPokemaniac_branch_ebe2c: ; ebe2c octave 3 note C_, 1 note __, 3 - loopchannel 2, Music_LookPokemaniac_branch_ebe2c - loopchannel 0, Music_LookPokemaniac_branch_ebe18 -; ebe45 + loopchannel 2, Music_LookPokemaniac_branch_ebe38 + loopchannel 0, Music_LookPokemaniac_branch_ebe24 -Music_LookPokemaniac_Ch3: ; ebe45 +Music_LookPokemaniac_Ch3: stereopanning $f0 vibrato $6, $33 notetype $c, $15 @@ -93,15 +90,14 @@ Music_LookPokemaniac_Ch3: ; ebe45 octave 5 note C_, 4 intensity $10 -Music_LookPokemaniac_branch_ebe56: ; ebe56 - callchannel Music_LookPokemaniac_branch_ebe64 +Music_LookPokemaniac_branch_ebe62: + callchannel Music_LookPokemaniac_branch_ebe70 intensity $14 - callchannel Music_LookPokemaniac_branch_ebe64 + callchannel Music_LookPokemaniac_branch_ebe70 intensity $10 - loopchannel 0, Music_LookPokemaniac_branch_ebe56 -; ebe64 + loopchannel 0, Music_LookPokemaniac_branch_ebe62 -Music_LookPokemaniac_branch_ebe64: ; ebe64 +Music_LookPokemaniac_branch_ebe70: note A#, 6 note A_, 2 note G#, 2 @@ -161,6 +157,3 @@ Music_LookPokemaniac_branch_ebe64: ; ebe64 note C_, 1 note __, 1 endchannel -; ebe9f - - diff --git a/audio/music/lookrival.asm b/audio/music/lookrival.asm index d86eb074..5eff9991 100644 --- a/audio/music/lookrival.asm +++ b/audio/music/lookrival.asm @@ -1,11 +1,10 @@ -Music_LookRival: ; f4f79 - dbw $c0, Music_LookRival_Ch1 - dbw $01, Music_LookRival_Ch2 - dbw $02, Music_LookRival_Ch3 - dbw $03, Music_LookRival_Ch4 -; f4f85 +Music_LookRival: + musicheader 4, 1, Music_LookRival_Ch1 + musicheader 1, 2, Music_LookRival_Ch2 + musicheader 1, 3, Music_LookRival_Ch3 + musicheader 1, 4, Music_LookRival_Ch4 -Music_LookRival_Ch1: ; f4f85 +Music_LookRival_Ch1: tempo 112 volume $77 dutycycle $1 @@ -34,8 +33,8 @@ Music_LookRival_Ch1: ; f4f85 note G#, 8 intensity $a6 note F#, 8 -Music_AfterTheRivalFight_branch_f4fb1: ; f4fb1 -Music_LookRival_branch_f4fb1: ; f4fb1 +Music_AfterTheRivalFight_branch_f4fb1: +Music_LookRival_branch_f4fb1: intensity $b5 note F_, 4 note D#, 2 @@ -99,7 +98,7 @@ Music_LookRival_branch_f4fb1: ; f4fb1 note G#, 8 note F_, 6 note C_, 2 -Music_LookRival_branch_f4ff7: ; f4ff7 +Music_LookRival_branch_f4ff7: intensity $b2 note F_, 6 intensity $b7 @@ -115,9 +114,8 @@ Music_LookRival_branch_f4ff7: ; f4ff7 note G#, 6 note F#, 4 loopchannel 0, Music_LookRival_branch_f4fb1 -; f5010 -Music_LookRival_Ch2: ; f5010 +Music_LookRival_Ch2: dutycycle $3 vibrato $8, $36 stereopanning $f0 @@ -138,8 +136,8 @@ Music_LookRival_Ch2: ; f5010 note D#, 10 intensity $b7 note D#, 16 -Music_AfterTheRivalFight_branch_f502e: ; f502e -Music_LookRival_branch_f502e: ; f502e +Music_AfterTheRivalFight_branch_f502e: +Music_LookRival_branch_f502e: intensity $c7 note C_, 12 intensity $c4 @@ -192,7 +190,7 @@ Music_LookRival_branch_f502e: ; f502e note D#, 1 note D_, 1 note D#, 2 -Music_LookRival_branch_f5070: ; f5070 +Music_LookRival_branch_f5070: intensity $c2 note C_, 6 intensity $c7 @@ -205,9 +203,8 @@ Music_LookRival_branch_f5070: ; f5070 intensity $c7 note D#, 10 loopchannel 0, Music_LookRival_branch_f502e -; f5086 -Music_LookRival_Ch3: ; f5086 +Music_LookRival_Ch3: notetype $c, $28 note __, 2 octave 4 @@ -229,8 +226,8 @@ Music_LookRival_Ch3: ; f5086 note C_, 2 note D#, 2 note F#, 2 -Music_AfterTheRivalFight_branch_f509d: ; f509d -Music_LookRival_branch_f509d: ; f509d +Music_AfterTheRivalFight_branch_f509d: +Music_LookRival_branch_f509d: callchannel Music_LookRival_branch_f50ef loopchannel 3, Music_LookRival_branch_f509d note F_, 4 @@ -293,9 +290,8 @@ Music_LookRival_branch_f509d: ; f509d note F#, 2 note E_, 2 loopchannel 0, Music_LookRival_branch_f509d -; f50ef -Music_LookRival_branch_f50ef: ; f50ef +Music_LookRival_branch_f50ef: note F_, 2 note C_, 2 note D_, 2 @@ -304,9 +300,8 @@ Music_LookRival_branch_f50ef: ; f50ef note D_, 2 note D#, 2 endchannel -; f50f7 -Music_LookRival_branch_f50f7: ; f50f7 +Music_LookRival_branch_f50f7: note A#, 2 note F_, 2 note G_, 2 @@ -315,9 +310,8 @@ Music_LookRival_branch_f50f7: ; f50f7 note G_, 2 note G#, 2 endchannel -; f50ff -Music_LookRival_branch_f50ff: ; f50ff +Music_LookRival_branch_f50ff: note A#, 4 note F_, 2 note G#, 4 @@ -325,9 +319,8 @@ Music_LookRival_branch_f50ff: ; f50ff note G_, 2 note G#, 2 endchannel -; f5106 -Music_LookRival_Ch4: ; f5106 +Music_LookRival_Ch4: stereopanning $f0 togglenoise $3 notetype $c @@ -343,8 +336,8 @@ Music_LookRival_Ch4: ; f5106 note D_, 2 note D_, 2 note D_, 2 -Music_AfterTheRivalFight_branch_f5118: ; f5118 -Music_LookRival_branch_f5118: ; f5118 +Music_AfterTheRivalFight_branch_f5118: +Music_LookRival_branch_f5118: note D#, 4 note D_, 2 note D#, 4 @@ -357,6 +350,3 @@ Music_LookRival_branch_f5118: ; f5118 note D_, 2 note D_, 2 loopchannel 0, Music_LookRival_branch_f5118 -; f5127 - - diff --git a/audio/music/lookrocket.asm b/audio/music/lookrocket.asm index d02c7f5f..bd0c0e43 100644 --- a/audio/music/lookrocket.asm +++ b/audio/music/lookrocket.asm @@ -1,14 +1,13 @@ -Music_LookRocket: ; f74a2 - dbw $c0, Music_LookRocket_Ch1 - dbw $01, Music_LookRocket_Ch2 - dbw $02, Music_LookRocket_Ch3 - dbw $03, Music_LookRocket_Ch4 -; f74ae +Music_LookRocket: + musicheader 4, 1, Music_LookRocket_Ch1 + musicheader 1, 2, Music_LookRocket_Ch2 + musicheader 1, 3, Music_LookRocket_Ch3 + musicheader 1, 4, Music_LookRocket_Ch4 -Music_LookRocket_Ch1: ; f74ae +Music_LookRocket_Ch1: tempo 123 volume $77 - forceoctave $2 + pitchoffset 0, D_ stereopanning $f dutycycle $3 vibrato $5, $64 @@ -18,7 +17,7 @@ Music_LookRocket_Ch1: ; f74ae note D_, 1 callchannel Music_LookRocket_branch_f74e6 dutycycle $1 -Music_LookRocket_branch_f74c7: ; f74c7 +Music_LookRocket_branch_f74c7: intensity $a8 callchannel Music_LookRocket_branch_f74f7 callchannel Music_LookRocket_branch_f758a @@ -33,10 +32,9 @@ Music_LookRocket_branch_f74c7: ; f74c7 callchannel Music_LookRocket_branch_f750c note __, 16 loopchannel 0, Music_LookRocket_branch_f74c7 -; f74e6 -Music_LookRocket_branch_f74e6: ; f74e6 -Music_RocketTheme_branch_f74e6: ; f74e6 +Music_LookRocket_branch_f74e6: +Music_RocketTheme_branch_f74e6: note D#, 1 note __, 1 note D_, 1 @@ -54,10 +52,9 @@ Music_RocketTheme_branch_f74e6: ; f74e6 note F_, 1 note G#, 1 endchannel -; f74f7 -Music_LookRocket_branch_f74f7: ; f74f7 -Music_RocketTheme_branch_f74f7: ; f74f7 +Music_LookRocket_branch_f74f7: +Music_RocketTheme_branch_f74f7: note __, 2 octave 3 note D#, 1 @@ -79,10 +76,9 @@ Music_RocketTheme_branch_f74f7: ; f74f7 note F#, 1 note __, 1 endchannel -; f750c -Music_LookRocket_branch_f750c: ; f750c -Music_RocketTheme_branch_f750c: ; f750c +Music_LookRocket_branch_f750c: +Music_RocketTheme_branch_f750c: note __, 2 octave 2 note B_, 1 @@ -91,10 +87,9 @@ Music_RocketTheme_branch_f750c: ; f750c note C_, 1 note __, 5 endchannel -; f7514 -Music_LookRocket_Ch2: ; f7514 - forceoctave $2 +Music_LookRocket_Ch2: + pitchoffset 0, D_ vibrato $4, $64 dutycycle $3 notetype $c, $b7 @@ -103,7 +98,7 @@ Music_LookRocket_Ch2: ; f7514 note C_, 1 note D_, 1 callchannel Music_LookRocket_branch_f7547 -Music_LookRocket_branch_f7526: ; f7526 +Music_LookRocket_branch_f7526: intensity $b7 callchannel Music_LookRocket_branch_f758a octave 5 @@ -118,10 +113,9 @@ Music_LookRocket_branch_f7526: ; f7526 callchannel Music_LookRocket_branch_f7568 callchannel Music_LookRocket_branch_f756f loopchannel 0, Music_LookRocket_branch_f7526 -; f7547 -Music_LookRocket_branch_f7547: ; f7547 -Music_RocketTheme_branch_f7547: ; f7547 +Music_LookRocket_branch_f7547: +Music_RocketTheme_branch_f7547: note D#, 1 note __, 1 note D_, 1 @@ -134,10 +128,9 @@ Music_RocketTheme_branch_f7547: ; f7547 note B_, 6 dutycycle $0 endchannel -; f7554 -Music_LookRocket_branch_f7554: ; f7554 -Music_RocketTheme_branch_f7554: ; f7554 +Music_LookRocket_branch_f7554: +Music_RocketTheme_branch_f7554: note __, 2 octave 4 note D#, 1 @@ -158,10 +151,9 @@ Music_RocketTheme_branch_f7554: ; f7554 note D#, 1 note __, 1 endchannel -; f7568 -Music_LookRocket_branch_f7568: ; f7568 -Music_RocketTheme_branch_f7568: ; f7568 +Music_LookRocket_branch_f7568: +Music_RocketTheme_branch_f7568: note __, 2 octave 3 note F_, 1 @@ -169,10 +161,9 @@ Music_RocketTheme_branch_f7568: ; f7568 note F#, 1 note __, 5 endchannel -; f756f -Music_LookRocket_branch_f756f: ; f756f -Music_RocketTheme_branch_f756f: ; f756f +Music_LookRocket_branch_f756f: +Music_RocketTheme_branch_f756f: intensity $63 note G#, 1 note F_, 1 @@ -196,10 +187,9 @@ Music_RocketTheme_branch_f756f: ; f756f note F_, 1 note D_, 1 endchannel -; f758a -Music_LookRocket_branch_f758a: ; f758a -Music_RocketTheme_branch_f758a: ; f758a +Music_LookRocket_branch_f758a: +Music_RocketTheme_branch_f758a: octave 3 note __, 2 note G_, 1 @@ -213,16 +203,15 @@ Music_RocketTheme_branch_f758a: ; f758a note A_, 1 note __, 1 endchannel -; f7597 -Music_LookRocket_Ch3: ; f7597 - forceoctave $2 +Music_LookRocket_Ch3: + pitchoffset 0, D_ vibrato $4, $22 notetype $c, $14 stereopanning $f0 note __, 2 callchannel Music_LookRocket_branch_f75bf -Music_LookRocket_branch_f75a5: ; f75a5 +Music_LookRocket_branch_f75a5: callchannel Music_LookRocket_branch_f75fe callchannel Music_LookRocket_branch_f75fe intensity $24 @@ -232,10 +221,9 @@ Music_LookRocket_branch_f75a5: ; f75a5 callchannel Music_LookRocket_branch_f7623 callchannel Music_LookRocket_branch_f75e1 loopchannel 0, Music_LookRocket_branch_f75a5 -; f75bf -Music_LookRocket_branch_f75bf: ; f75bf -Music_RocketTheme_branch_f75bf: ; f75bf +Music_LookRocket_branch_f75bf: +Music_RocketTheme_branch_f75bf: octave 3 note F_, 1 note __, 1 @@ -249,10 +237,9 @@ Music_RocketTheme_branch_f75bf: ; f75bf octave 3 note D_, 6 endchannel -; f75cc -Music_LookRocket_branch_f75cc: ; f75cc -Music_RocketTheme_branch_f75cc: ; f75cc +Music_LookRocket_branch_f75cc: +Music_RocketTheme_branch_f75cc: octave 2 note G#, 1 note __, 1 @@ -274,10 +261,9 @@ Music_RocketTheme_branch_f75cc: ; f75cc note F#, 1 note __, 1 endchannel -; f75e1 -Music_LookRocket_branch_f75e1: ; f75e1 -Music_RocketTheme_branch_f75e1: ; f75e1 +Music_LookRocket_branch_f75e1: +Music_RocketTheme_branch_f75e1: intensity $24 octave 2 note G#, 1 @@ -305,10 +291,9 @@ Music_RocketTheme_branch_f75e1: ; f75e1 note G#, 1 note __, 1 endchannel -; f75fe -Music_LookRocket_branch_f75fe: ; f75fe -Music_RocketTheme_branch_f75fe: ; f75fe +Music_LookRocket_branch_f75fe: +Music_RocketTheme_branch_f75fe: note C_, 1 note __, 1 octave 4 @@ -346,10 +331,9 @@ Music_RocketTheme_branch_f75fe: ; f75fe note A_, 1 note __, 1 endchannel -; f7623 -Music_LookRocket_branch_f7623: ; f7623 -Music_RocketTheme_branch_f7623: ; f7623 +Music_LookRocket_branch_f7623: +Music_RocketTheme_branch_f7623: octave 2 note G#, 1 note __, 1 @@ -371,14 +355,13 @@ Music_RocketTheme_branch_f7623: ; f7623 note D#, 1 note C_, 1 endchannel -; f7638 -Music_LookRocket_Ch4: ; f7638 +Music_LookRocket_Ch4: togglenoise $3 notetype $c note __, 2 callchannel Music_LookRocket_branch_f765c -Music_LookRocket_branch_f7640: ; f7640 +Music_LookRocket_branch_f7640: callchannel Music_LookRocket_branch_f7664 callchannel Music_LookRocket_branch_f7664 callchannel Music_LookRocket_branch_f7664 @@ -388,10 +371,9 @@ Music_LookRocket_branch_f7640: ; f7640 callchannel Music_LookRocket_branch_f7664 callchannel Music_LookRocket_branch_f765c loopchannel 0, Music_LookRocket_branch_f7640 -; f765c -Music_LookRocket_branch_f765c: ; f765c -Music_RocketTheme_branch_f765c: ; f765c +Music_LookRocket_branch_f765c: +Music_RocketTheme_branch_f765c: note C_, 8 note D_, 2 note D#, 2 @@ -400,10 +382,9 @@ Music_RocketTheme_branch_f765c: ; f765c note D_, 1 note D_, 1 endchannel -; f7664 -Music_LookRocket_branch_f7664: ; f7664 -Music_RocketTheme_branch_f7664: ; f7664 +Music_LookRocket_branch_f7664: +Music_RocketTheme_branch_f7664: note D#, 2 note F#, 2 note D_, 2 @@ -413,6 +394,3 @@ Music_RocketTheme_branch_f7664: ; f7664 note D_, 2 note F#, 2 endchannel -; f766d - - diff --git a/audio/music/looksage.asm b/audio/music/looksage.asm index f815d212..e1b51c39 100644 --- a/audio/music/looksage.asm +++ b/audio/music/looksage.asm @@ -1,9 +1,8 @@ -Music_LookSage: ; ee35e - dbw $40, Music_LookSage_Ch1 - dbw $02, Music_LookSage_Ch3 -; ee364 +Music_LookSage: + musicheader 2, 1, Music_LookSage_Ch1 + musicheader 1, 3, Music_LookSage_Ch3 -Music_LookSage_Ch1: ; ee364 +Music_LookSage_Ch1: tempo 144 stereopanning $f volume $77 @@ -29,7 +28,7 @@ Music_LookSage_Ch1: ; ee364 note F_, 2 intensity $93 note F_, 2 -Music_LookSage_branch_ee38e: ; ee38e +Music_LookSage_branch_ee38e: intensity $b3 note D_, 2 intensity $93 @@ -101,9 +100,8 @@ Music_LookSage_branch_ee38e: ; ee38e note B_, 2 callchannel Music_LookSage_branch_ee3fa loopchannel 0, Music_LookSage_branch_ee38e -; ee3fa -Music_LookSage_branch_ee3fa: ; ee3fa +Music_LookSage_branch_ee3fa: intensity $b3 octave 2 note E_, 2 @@ -122,9 +120,8 @@ Music_LookSage_branch_ee3fa: ; ee3fa intensity $93 note A_, 2 endchannel -; ee414 -Music_LookSage_Ch3: ; ee414 +Music_LookSage_Ch3: stereopanning $f0 vibrato $16, $23 notetype $c, $10 @@ -144,7 +141,7 @@ Music_LookSage_Ch3: ; ee414 note E_, 14 note G_, 1 note G#, 1 -Music_LookSage_branch_ee430: ; ee430 +Music_LookSage_branch_ee430: note A_, 12 note B_, 4 note D_, 9 @@ -179,6 +176,3 @@ Music_LookSage_branch_ee430: ; ee430 note G_, 1 note G#, 1 loopchannel 0, Music_LookSage_branch_ee430 -; ee45f - - diff --git a/audio/music/lookyoungster.asm b/audio/music/lookyoungster.asm index 7ae3ec95..e835d5fe 100644 --- a/audio/music/lookyoungster.asm +++ b/audio/music/lookyoungster.asm @@ -1,10 +1,9 @@ -Music_LookYoungster: ; f66c3 - dbw $80, Music_LookYoungster_Ch1 - dbw $01, Music_LookYoungster_Ch2 - dbw $02, Music_LookYoungster_Ch3 -; f66cc +Music_LookYoungster: + musicheader 3, 1, Music_LookYoungster_Ch1 + musicheader 1, 2, Music_LookYoungster_Ch2 + musicheader 1, 3, Music_LookYoungster_Ch3 -Music_LookYoungster_Ch1: ; f66cc +Music_LookYoungster_Ch1: tempo 118 volume $77 stereopanning $f @@ -25,7 +24,7 @@ Music_LookYoungster_Ch1: ; f66cc note __, 2 note C_, 6 intensity $b3 -Music_LookYoungster_branch_f66ea: ; f66ea +Music_LookYoungster_branch_f66ea: note __, 2 octave 3 note G_, 1 @@ -59,13 +58,10 @@ Music_LookYoungster_branch_f66ea: ; f66ea note __, 1 note __, 16 loopchannel 0, Music_LookYoungster_branch_f66ea -; f670e + db $ff -INCBIN "baserom.gbc", $f670e, $f670f - $f670e - - -Music_LookYoungster_Ch2: ; f670f +Music_LookYoungster_Ch2: stereopanning $f0 vibrato $12, $26 dutycycle $1 @@ -86,7 +82,7 @@ Music_LookYoungster_Ch2: ; f670f note F_, 4 note __, 2 note F#, 6 -Music_LookYoungster_branch_f672f: ; f672f +Music_LookYoungster_branch_f672f: dutycycle $3 intensity $b3 note __, 2 @@ -160,13 +156,10 @@ Music_LookYoungster_branch_f672f: ; f672f note C_, 1 note __, 1 loopchannel 0, Music_LookYoungster_branch_f672f -; f6783 - - -INCBIN "baserom.gbc", $f6783, $f6784 - $f6783 + db $ff -Music_LookYoungster_Ch3: ; f6784 +Music_LookYoungster_Ch3: stereopanning $ff vibrato $2, $24 notetype $c, $25 @@ -202,7 +195,7 @@ Music_LookYoungster_Ch3: ; f6784 note __, 2 note G#, 6 intensity $25 -Music_LookYoungster_branch_f67ae: ; f67ae +Music_LookYoungster_branch_f67ae: octave 2 note G_, 1 note __, 1 @@ -298,10 +291,5 @@ Music_LookYoungster_branch_f67ae: ; f67ae note G#, 1 note __, 1 loopchannel 0, Music_LookYoungster_branch_f67ae -; f6810 - - -INCBIN "baserom.gbc", $f6810, $f6811 - $f6810 - - + db $ff diff --git a/audio/music/magnettrain.asm b/audio/music/magnettrain.asm index cb564754..fd4229cb 100644 --- a/audio/music/magnettrain.asm +++ b/audio/music/magnettrain.asm @@ -1,11 +1,10 @@ -Music_MagnetTrain: ; ef5f0 - dbw $c0, Music_MagnetTrain_Ch1 - dbw $01, Music_MagnetTrain_Ch2 - dbw $02, Music_MagnetTrain_Ch3 - dbw $03, Music_MagnetTrain_Ch4 -; ef5fc +Music_MagnetTrain: + musicheader 4, 1, Music_MagnetTrain_Ch1 + musicheader 1, 2, Music_MagnetTrain_Ch2 + musicheader 1, 3, Music_MagnetTrain_Ch3 + musicheader 1, 4, Music_MagnetTrain_Ch4 -Music_MagnetTrain_Ch1: ; ef5fc +Music_MagnetTrain_Ch1: tempo 110 volume $77 stereopanning $f @@ -68,9 +67,8 @@ Music_MagnetTrain_Ch1: ; ef5fc notetype $c, $b7 note D_, 16 endchannel -; ef648 -Music_MagnetTrain_Ch2: ; ef648 +Music_MagnetTrain_Ch2: vibrato $14, $23 dutycycle $1 notetype $c, $d2 @@ -107,9 +105,8 @@ Music_MagnetTrain_Ch2: ; ef648 notetype $c, $d7 note A_, 16 endchannel -; ef67d -Music_MagnetTrain_Ch3: ; ef67d +Music_MagnetTrain_Ch3: stereopanning $ff vibrato $10, $23 notetype $c, $15 @@ -224,9 +221,8 @@ Music_MagnetTrain_Ch3: ; ef67d octave 2 note D_, 16 endchannel -; ef6f4 -Music_MagnetTrain_Ch4: ; ef6f4 +Music_MagnetTrain_Ch4: togglenoise $3 notetype $c note B_, 12 @@ -248,13 +244,24 @@ Music_MagnetTrain_Ch4: ; ef6f4 notetype $c note B_, 16 endchannel -; ef711 - - -INCBIN "baserom.gbc", $ef711, $ef71e - $ef711 +; unused +Music_MagnetTrain_branch_ef711: + note G#, 1 + note G_, 1 + note G_, 1 + note G#, 1 + note G_, 1 + note G_, 1 + note G#, 1 + note G_, 1 + note G_, 1 + note G#, 1 + note G_, 1 + note G_, 1 + endchannel -Music_MagnetTrain_branch_ef71e: ; ef71e +Music_MagnetTrain_branch_ef71e: note G#, 2 note G_, 2 note G_, 2 @@ -272,6 +279,3 @@ Music_MagnetTrain_branch_ef71e: ; ef71e note G_, 2 note G_, 2 endchannel -; ef72f - - diff --git a/audio/music/mainmenu.asm b/audio/music/mainmenu.asm index 8ed8d4d6..b787a5ea 100644 --- a/audio/music/mainmenu.asm +++ b/audio/music/mainmenu.asm @@ -1,11 +1,10 @@ -Music_MainMenu: ; f78fd - dbw $c0, Music_MainMenu_Ch1 - dbw $01, Music_MainMenu_Ch2 - dbw $02, Music_MainMenu_Ch3 - dbw $03, Music_MainMenu_Ch4 -; f7909 +Music_MainMenu: + musicheader 4, 1, Music_MainMenu_Ch1 + musicheader 1, 2, Music_MainMenu_Ch2 + musicheader 1, 3, Music_MainMenu_Ch3 + musicheader 1, 4, Music_MainMenu_Ch4 -Music_MainMenu_Ch1: ; f7909 +Music_MainMenu_Ch1: tempo 160 volume $77 dutycycle $3 @@ -15,7 +14,7 @@ Music_MainMenu_Ch1: ; f7909 notetype $c, $f octave 3 note D_, 8 -Music_MainMenu_branch_f791d: ; f791d +Music_MainMenu_branch_f791d: notetype $c, $92 octave 3 note C#, 6 @@ -41,15 +40,14 @@ Music_MainMenu_branch_f791d: ; f791d octave 3 note C_, 4 loopchannel 0, Music_MainMenu_branch_f791d -; f7940 -Music_MainMenu_Ch2: ; f7940 +Music_MainMenu_Ch2: dutycycle $3 stereopanning $f notetype $c, $f octave 3 note G_, 8 -Music_MainMenu_branch_f7949: ; f7949 +Music_MainMenu_branch_f7949: notetype $c, $a2 note F#, 6 note F#, 1 @@ -72,13 +70,12 @@ Music_MainMenu_branch_f7949: ; f7949 notetype $c, $a4 note F_, 4 loopchannel 0, Music_MainMenu_branch_f7949 -; f7969 -Music_MainMenu_Ch3: ; f7969 +Music_MainMenu_Ch3: stereopanning $f0 notetype $c, $25 note __, 8 -Music_MainMenu_branch_f796f: ; f796f +Music_MainMenu_branch_f796f: octave 2 note F#, 1 note __, 5 @@ -112,9 +109,8 @@ Music_MainMenu_branch_f796f: ; f796f note F_, 1 note __, 3 loopchannel 0, Music_MainMenu_branch_f796f -; f7996 -Music_MainMenu_Ch4: ; f7996 +Music_MainMenu_Ch4: stereopanning $f togglenoise $3 notetype $c @@ -127,7 +123,7 @@ Music_MainMenu_Ch4: ; f7996 note D_, 1 note D_, 1 note D_, 1 -Music_MainMenu_branch_f79a5: ; f79a5 +Music_MainMenu_branch_f79a5: note D_, 6 note D_, 1 note D_, 1 @@ -144,6 +140,3 @@ Music_MainMenu_branch_f79a5: ; f79a5 note D_, 1 note D_, 1 loopchannel 0, Music_MainMenu_branch_f79a5 -; f79b8 - - diff --git a/audio/music/mom.asm b/audio/music/mom.asm index 5ae89e85..a9bdef9c 100644 --- a/audio/music/mom.asm +++ b/audio/music/mom.asm @@ -1,10 +1,9 @@ -Music_Mom: ; f6bf2 - dbw $81, Music_Mom_Ch2 - dbw $02, Music_Mom_Ch3 - dbw $03, Music_Mom_Ch4 -; f6bfb +Music_Mom: + musicheader 3, 2, Music_Mom_Ch2 + musicheader 1, 3, Music_Mom_Ch3 + musicheader 1, 4, Music_Mom_Ch4 -Music_Mom_Ch2: ; f6bfb +Music_Mom_Ch2: tempo 144 volume $77 stereopanning $f @@ -17,7 +16,7 @@ Music_Mom_Ch2: ; f6bfb note G#, 1 note A_, 1 note B_, 8 -Music_Mom_branch_f6c0e: ; f6c0e +Music_Mom_branch_f6c0e: notetype $c, $b1 note __, 4 octave 3 @@ -31,9 +30,8 @@ Music_Mom_branch_f6c0e: ; f6c0e note A#, 2 note B_, 2 loopchannel 0, Music_Mom_branch_f6c0e -; f6c20 -Music_Mom_Ch3: ; f6c20 +Music_Mom_Ch3: stereopanning $f0 notetype $6, $25 octave 3 @@ -44,7 +42,7 @@ Music_Mom_Ch3: ; f6c20 note G#, 1 note E_, 8 intensity $23 -Music_Mom_branch_f6c2e: ; f6c2e +Music_Mom_branch_f6c2e: octave 2 note A_, 2 note __, 6 @@ -77,13 +75,12 @@ Music_Mom_branch_f6c2e: ; f6c2e note D_, 2 note __, 2 loopchannel 0, Music_Mom_branch_f6c2e -; f6c51 -Music_Mom_Ch4: ; f6c51 +Music_Mom_Ch4: togglenoise $3 notetype $c note __, 6 -Music_Mom_branch_f6c56: ; f6c56 +Music_Mom_branch_f6c56: note D#, 1 note __, 1 note F#, 2 @@ -109,6 +106,3 @@ Music_Mom_branch_f6c56: ; f6c56 note D#, 1 note __, 1 loopchannel 0, Music_Mom_branch_f6c56 -; f6c72 - - diff --git a/audio/music/mtmoon.asm b/audio/music/mtmoon.asm index c697daa7..474335f4 100644 --- a/audio/music/mtmoon.asm +++ b/audio/music/mtmoon.asm @@ -1,11 +1,10 @@ -Music_MtMoon: ; edb29 - dbw $c0, Music_MtMoon_Ch1 - dbw $01, Music_MtMoon_Ch2 - dbw $02, Music_MtMoon_Ch3 - dbw $03, Music_MtMoon_Ch4 -; edb35 +Music_MtMoon: + musicheader 4, 1, Music_MtMoon_Ch1 + musicheader 1, 2, Music_MtMoon_Ch2 + musicheader 1, 3, Music_MtMoon_Ch3 + musicheader 1, 4, Music_MtMoon_Ch4 -Music_MtMoon_Ch1: ; edb35 +Music_MtMoon_Ch1: tempo 208 volume $77 dutycycle $2 @@ -15,14 +14,13 @@ Music_MtMoon_Ch1: ; edb35 notetype $c, $45 note __, 2 loopchannel 0, Music_MtMoon_branch_edb56 -; edb4c -Music_MtMoon_Ch2: ; edb4c +Music_MtMoon_Ch2: vibrato $b, $15 dutycycle $2 notetype $c, $84 stereopanning $f -Music_MtMoon_branch_edb56: ; edb56 +Music_MtMoon_branch_edb56: octave 4 note D#, 6 note C#, 6 @@ -72,12 +70,11 @@ Music_MtMoon_branch_edb56: ; edb56 note F#, 6 note E_, 4 loopchannel 0, Music_MtMoon_branch_edb56 -; edb8a -Music_MtMoon_Ch3: ; edb8a -Music_MtMoon_branch_edb8a: ; edb8a +Music_MtMoon_Ch3: +Music_MtMoon_branch_edb8a: notetype $c, $28 -Music_MtMoon_branch_edb8d: ; edb8d +Music_MtMoon_branch_edb8d: octave 2 note B_, 2 octave 3 @@ -105,7 +102,7 @@ Music_MtMoon_branch_edb8d: ; edb8d note G_, 2 note D#, 2 note E_, 2 -Music_MtMoon_branch_edbab: ; edbab +Music_MtMoon_branch_edbab: note E_, 2 note G#, 2 octave 4 @@ -120,12 +117,11 @@ Music_MtMoon_branch_edbab: ; edbab note G#, 2 loopchannel 4, Music_MtMoon_branch_edbab loopchannel 0, Music_MtMoon_branch_edb8a -; edbbf -Music_MtMoon_Ch4: ; edbbf +Music_MtMoon_Ch4: togglenoise $5 notetype $c -Music_MtMoon_branch_edbc3: ; edbc3 +Music_MtMoon_branch_edbc3: stereopanning $f note A#, 4 note A#, 8 @@ -140,6 +136,3 @@ Music_MtMoon_branch_edbc3: ; edbc3 stereopanning $f0 note A#, 8 loopchannel 0, Music_MtMoon_branch_edbc3 -; edbd8 - - diff --git a/audio/music/mtmoonsquare.asm b/audio/music/mtmoonsquare.asm index d990cb0f..57d1b0dd 100644 --- a/audio/music/mtmoonsquare.asm +++ b/audio/music/mtmoonsquare.asm @@ -1,17 +1,16 @@ -Music_MtMoonSquare: ; f4815 - dbw $40, Music_MtMoonSquare_Ch1 - dbw $01, Music_MtMoonSquare_Ch2 -; f481b +Music_MtMoonSquare: + musicheader 2, 1, Music_MtMoonSquare_Ch1 + musicheader 1, 2, Music_MtMoonSquare_Ch2 -Music_MtMoonSquare_Ch1: ; f481b +Music_MtMoonSquare_Ch1: tempo 112 volume $77 dutycycle $2 tone $0001 note __, 1 -Music_MtMoonSquare_branch_f4826: ; f4826 +Music_MtMoonSquare_branch_f4826: notetype $c, $44 -Music_MtMoonSquare_branch_f4829: ; f4829 +Music_MtMoonSquare_branch_f4829: octave 4 note D_, 2 note E_, 2 @@ -21,7 +20,7 @@ Music_MtMoonSquare_branch_f4829: ; f4829 octave 5 note D_, 4 loopchannel 2, Music_MtMoonSquare_branch_f4829 -Music_MtMoonSquare_branch_f4835: ; f4835 +Music_MtMoonSquare_branch_f4835: octave 4 note E_, 2 note F#, 2 @@ -31,7 +30,7 @@ Music_MtMoonSquare_branch_f4835: ; f4835 octave 5 note E_, 4 loopchannel 2, Music_MtMoonSquare_branch_f4835 -Music_MtMoonSquare_branch_f4841: ; f4841 +Music_MtMoonSquare_branch_f4841: octave 4 note C#, 2 note D_, 2 @@ -41,7 +40,7 @@ Music_MtMoonSquare_branch_f4841: ; f4841 octave 5 note C#, 4 loopchannel 2, Music_MtMoonSquare_branch_f4841 -Music_MtMoonSquare_branch_f484d: ; f484d +Music_MtMoonSquare_branch_f484d: octave 4 note D_, 2 note E_, 2 @@ -52,14 +51,13 @@ Music_MtMoonSquare_branch_f484d: ; f484d note D_, 4 loopchannel 2, Music_MtMoonSquare_branch_f484d loopchannel 0, Music_MtMoonSquare_branch_f4826 -; f485d -Music_MtMoonSquare_Ch2: ; f485d +Music_MtMoonSquare_Ch2: dutycycle $2 vibrato $18, $24 -Music_MtMoonSquare_branch_f4862: ; f4862 +Music_MtMoonSquare_branch_f4862: notetype $c, $82 -Music_MtMoonSquare_branch_f4865: ; f4865 +Music_MtMoonSquare_branch_f4865: octave 4 note D_, 2 note E_, 2 @@ -71,7 +69,7 @@ Music_MtMoonSquare_branch_f4865: ; f4865 notetype $c, $62 loopchannel 2, Music_MtMoonSquare_branch_f4865 notetype $c, $82 -Music_MtMoonSquare_branch_f4877: ; f4877 +Music_MtMoonSquare_branch_f4877: octave 4 note E_, 2 note F#, 2 @@ -83,7 +81,7 @@ Music_MtMoonSquare_branch_f4877: ; f4877 notetype $c, $62 loopchannel 2, Music_MtMoonSquare_branch_f4877 notetype $c, $82 -Music_MtMoonSquare_branch_f4889: ; f4889 +Music_MtMoonSquare_branch_f4889: octave 4 note C#, 2 note D_, 2 @@ -95,7 +93,7 @@ Music_MtMoonSquare_branch_f4889: ; f4889 notetype $c, $62 loopchannel 2, Music_MtMoonSquare_branch_f4889 notetype $c, $82 -Music_MtMoonSquare_branch_f489b: ; f489b +Music_MtMoonSquare_branch_f489b: octave 4 note D_, 2 note E_, 2 @@ -107,6 +105,3 @@ Music_MtMoonSquare_branch_f489b: ; f489b notetype $c, $62 loopchannel 2, Music_MtMoonSquare_branch_f489b loopchannel 0, Music_MtMoonSquare_branch_f4862 -; f48ae - - diff --git a/audio/music/nationalpark.asm b/audio/music/nationalpark.asm index 7e7ccf28..10908638 100644 --- a/audio/music/nationalpark.asm +++ b/audio/music/nationalpark.asm @@ -1,11 +1,10 @@ -Music_NationalPark: ; f54e8 - dbw $c0, Music_NationalPark_Ch1 - dbw $01, Music_NationalPark_Ch2 - dbw $02, Music_NationalPark_Ch3 - dbw $03, Music_NationalPark_Ch4 -; f54f4 +Music_NationalPark: + musicheader 4, 1, Music_NationalPark_Ch1 + musicheader 1, 2, Music_NationalPark_Ch2 + musicheader 1, 3, Music_NationalPark_Ch3 + musicheader 1, 4, Music_NationalPark_Ch4 -Music_NationalPark_Ch1: ; f54f4 +Music_NationalPark_Ch1: tempo 192 volume $77 stereopanning $f @@ -13,7 +12,7 @@ Music_NationalPark_Ch1: ; f54f4 dutycycle $1 notetype $c, $77 note __, 2 -Music_NationalPark_branch_f5504: ; f5504 +Music_NationalPark_branch_f5504: callchannel Music_NationalPark_branch_f554a callchannel Music_NationalPark_branch_f554a notetype $6, $67 @@ -62,9 +61,8 @@ Music_NationalPark_branch_f5504: ; f5504 notetype $c, $77 note __, 4 loopchannel 0, Music_NationalPark_branch_f5504 -; f554a -Music_NationalPark_branch_f554a: ; f554a +Music_NationalPark_branch_f554a: octave 2 note G#, 6 octave 3 @@ -270,9 +268,8 @@ Music_NationalPark_branch_f554a: ; f554a octave 3 note A#, 2 endchannel -; f563a -Music_NationalPark_branch_f563a: ; f563a +Music_NationalPark_branch_f563a: note __, 16 note __, 3 octave 4 @@ -297,15 +294,14 @@ Music_NationalPark_branch_f563a: ; f563a note A_, 2 note __, 4 endchannel -; f5652 -Music_NationalPark_Ch2: ; f5652 +Music_NationalPark_Ch2: vibrato $14, $24 dutycycle $1 notetype $c, $a7 note __, 2 stereopanning $f0 -Music_NationalPark_branch_f565d: ; f565d +Music_NationalPark_branch_f565d: notetype $c, $a7 callchannel Music_NationalPark_branch_f56b8 octave 3 @@ -373,9 +369,8 @@ Music_NationalPark_branch_f565d: ; f565d note D#, 2 note D_, 2 loopchannel 0, Music_NationalPark_branch_f565d -; f56b8 -Music_NationalPark_branch_f56b8: ; f56b8 +Music_NationalPark_branch_f56b8: octave 2 note C#, 6 note G#, 2 @@ -437,9 +432,8 @@ Music_NationalPark_branch_f56b8: ; f56b8 octave 2 note F_, 2 endchannel -; f56f5 -Music_NationalPark_branch_f56f5: ; f56f5 +Music_NationalPark_branch_f56f5: octave 4 note E_, 1 note F_, 5 @@ -482,16 +476,15 @@ Music_NationalPark_branch_f56f5: ; f56f5 note D_, 2 note C#, 2 endchannel -; f5723 -Music_NationalPark_Ch3: ; f5723 +Music_NationalPark_Ch3: vibrato $16, $24 notetype $c, $11 octave 4 note G#, 1 note A#, 1 stereopanning $ff -Music_NationalPark_branch_f572e: ; f572e +Music_NationalPark_branch_f572e: callchannel Music_NationalPark_branch_f5756 octave 5 note A#, 14 @@ -519,9 +512,8 @@ Music_NationalPark_branch_f572e: ; f572e note G#, 1 note A#, 1 loopchannel 0, Music_NationalPark_branch_f572e -; f5756 -Music_NationalPark_branch_f5756: ; f5756 +Music_NationalPark_branch_f5756: octave 5 note C_, 16 note C#, 14 @@ -579,9 +571,8 @@ Music_NationalPark_branch_f5756: ; f5756 octave 6 note C_, 2 endchannel -; f578f -Music_NationalPark_branch_f578f: ; f578f +Music_NationalPark_branch_f578f: octave 2 note F#, 3 octave 3 @@ -623,13 +614,12 @@ Music_NationalPark_branch_f578f: ; f578f note F_, 1 note __, 1 endchannel -; f57b8 -Music_NationalPark_Ch4: ; f57b8 +Music_NationalPark_Ch4: togglenoise $3 notetype $c note __, 2 -Music_NationalPark_branch_f57bd: ; f57bd +Music_NationalPark_branch_f57bd: note __, 16 loopchannel 23, Music_NationalPark_branch_f57bd note __, 8 @@ -638,7 +628,7 @@ Music_NationalPark_branch_f57bd: ; f57bd note A#, 1 note D_, 1 note B_, 2 -Music_NationalPark_branch_f57c8: ; f57c8 +Music_NationalPark_branch_f57c8: note A#, 2 note G_, 1 note G_, 1 @@ -665,6 +655,3 @@ Music_NationalPark_branch_f57c8: ; f57c8 note A#, 1 note D#, 1 loopchannel 0, Music_NationalPark_branch_f57bd -; f57e8 - - diff --git a/audio/music/newbarktown.asm b/audio/music/newbarktown.asm index ae78528d..0e3b92d3 100644 --- a/audio/music/newbarktown.asm +++ b/audio/music/newbarktown.asm @@ -1,23 +1,20 @@ -Music_NewBarkTown: ; eb27c - dbw $80, Music_NewBarkTown_Ch1 - dbw $01, Music_NewBarkTown_Ch2 - dbw $02, Music_NewBarkTown_Ch3 -; eb285 +Music_NewBarkTown: + musicheader 3, 1, Music_NewBarkTown_Ch1 + musicheader 1, 2, Music_NewBarkTown_Ch2 + musicheader 1, 3, Music_NewBarkTown_Ch3 + db $3 -INCBIN "baserom.gbc", $eb285, $eb286 - $eb285 - - -Music_NewBarkTown_Ch1: ; eb286 +Music_NewBarkTown_Ch1: tempo 187 volume $77 stereopanning $f vibrato $12, $23 notetype $c, $87 note __, 4 -Music_NewBarkTown_branch_eb294: ; eb294 +Music_NewBarkTown_branch_eb2eb: dutycycle $0 - callchannel Music_NewBarkTown_branch_eb2f2 + callchannel Music_NewBarkTown_branch_eb349 octave 3 note C#, 1 note __, 1 @@ -40,7 +37,7 @@ Music_NewBarkTown_branch_eb294: ; eb294 note G_, 1 dutycycle $0 intensity $87 - callchannel Music_NewBarkTown_branch_eb2f2 + callchannel Music_NewBarkTown_branch_eb349 octave 3 note C#, 1 note __, 1 @@ -66,9 +63,9 @@ Music_NewBarkTown_branch_eb294: ; eb294 note A_, 1 dutycycle $1 intensity $5e - callchannel Music_NewBarkTown_branch_eb325 - callchannel Music_NewBarkTown_branch_eb325 - callchannel Music_NewBarkTown_branch_eb325 + callchannel Music_NewBarkTown_branch_eb37c + callchannel Music_NewBarkTown_branch_eb37c + callchannel Music_NewBarkTown_branch_eb37c octave 2 note G_, 2 note B_, 2 @@ -86,10 +83,9 @@ Music_NewBarkTown_branch_eb294: ; eb294 note A_, 4 note B_, 2 intensity $87 - loopchannel 0, Music_NewBarkTown_branch_eb294 -; eb2f2 + loopchannel 0, Music_NewBarkTown_branch_eb2eb -Music_NewBarkTown_branch_eb2f2: ; eb2f2 +Music_NewBarkTown_branch_eb349: octave 3 note F#, 1 note __, 1 @@ -141,9 +137,8 @@ Music_NewBarkTown_branch_eb2f2: ; eb2f2 note B_, 1 note __, 1 endchannel -; eb325 -Music_NewBarkTown_branch_eb325: ; eb325 +Music_NewBarkTown_branch_eb37c: octave 2 note G_, 2 note B_, 2 @@ -161,19 +156,18 @@ Music_NewBarkTown_branch_eb325: ; eb325 note A_, 4 note E_, 2 endchannel -; eb336 -Music_NewBarkTown_Ch2: ; eb336 +Music_NewBarkTown_Ch2: stereopanning $ff vibrato $12, $23 notetype $6, $a7 note __, 8 -Music_NewBarkTown_branch_eb33f: ; eb33f +Music_NewBarkTown_branch_eb396: dutycycle $2 notetype $6, $a7 - callchannel Music_NewBarkTown_branch_eb368 - callchannel Music_NewBarkTown_branch_eb368 - callchannel Music_NewBarkTown_branch_eb39b + callchannel Music_NewBarkTown_branch_eb3bf + callchannel Music_NewBarkTown_branch_eb3bf + callchannel Music_NewBarkTown_branch_eb3f2 intensity $87 octave 5 note B_, 6 @@ -182,7 +176,7 @@ Music_NewBarkTown_branch_eb33f: ; eb33f octave 6 note D_, 4 note C#, 16 - callchannel Music_NewBarkTown_branch_eb39b + callchannel Music_NewBarkTown_branch_eb3f2 intensity $87 octave 5 note B_, 6 @@ -191,10 +185,9 @@ Music_NewBarkTown_branch_eb33f: ; eb33f octave 6 note D_, 4 note E_, 16 - loopchannel 0, Music_NewBarkTown_branch_eb33f -; eb368 + loopchannel 0, Music_NewBarkTown_branch_eb396 -Music_NewBarkTown_branch_eb368: ; eb368 +Music_NewBarkTown_branch_eb3bf: octave 2 note D_, 4 note __, 8 @@ -246,9 +239,8 @@ Music_NewBarkTown_branch_eb368: ; eb368 octave 2 note C#, 4 endchannel -; eb39b -Music_NewBarkTown_branch_eb39b: ; eb39b +Music_NewBarkTown_branch_eb3f2: notetype $6, $97 dutycycle $2 octave 4 @@ -258,15 +250,14 @@ Music_NewBarkTown_branch_eb39b: ; eb39b notetype $c, $97 note E_, 16 endchannel -; eb3a9 -Music_NewBarkTown_Ch3: ; eb3a9 +Music_NewBarkTown_Ch3: stereopanning $f0 notetype $c, $10 octave 5 note D_, 2 note E_, 2 -Music_NewBarkTown_branch_eb3b1: ; eb3b1 +Music_NewBarkTown_branch_eb408: vibrato $16, $23 note F#, 4 note A_, 4 @@ -330,7 +321,4 @@ Music_NewBarkTown_branch_eb3b1: ; eb3b1 octave 5 note D_, 1 note E_, 1 - loopchannel 0, Music_NewBarkTown_branch_eb3b1 -; eb3fc - - + loopchannel 0, Music_NewBarkTown_branch_eb408 diff --git a/audio/music/nothing.asm b/audio/music/nothing.asm index 716e05ec..59641387 100644 --- a/audio/music/nothing.asm +++ b/audio/music/nothing.asm @@ -1,14 +1,11 @@ -Music_Nothing: ; e9185 - dbw $c0, Music_Nothing_Ch1 - dbw $01, Music_Nothing_Ch2 - dbw $02, Music_Nothing_Ch3 - dbw $03, Music_Nothing_Ch4 -; e9191 +Music_Nothing: + musicheader 4, 1, Music_Nothing_Ch1 + musicheader 1, 2, Music_Nothing_Ch2 + musicheader 1, 3, Music_Nothing_Ch3 + musicheader 1, 4, Music_Nothing_Ch4 -Music_Nothing_Ch1: ; e9191 -Music_Nothing_Ch2: ; e9191 -Music_Nothing_Ch3: ; e9191 -Music_Nothing_Ch4: ; e9191 +Music_Nothing_Ch1: +Music_Nothing_Ch2: +Music_Nothing_Ch3: +Music_Nothing_Ch4: endchannel -; e9192 - diff --git a/audio/music/pallettown.asm b/audio/music/pallettown.asm index 6518cbd9..68585e47 100644 --- a/audio/music/pallettown.asm +++ b/audio/music/pallettown.asm @@ -1,16 +1,15 @@ -Music_PalletTown: ; f4b0c - dbw $80, Music_PalletTown_Ch1 - dbw $01, Music_PalletTown_Ch2 - dbw $02, Music_PalletTown_Ch3 -; f4b15 +Music_PalletTown: + musicheader 3, 1, Music_PalletTown_Ch1 + musicheader 1, 2, Music_PalletTown_Ch2 + musicheader 1, 3, Music_PalletTown_Ch3 -Music_PalletTown_Ch1: ; f4b15 +Music_PalletTown_Ch1: tempo 188 volume $77 vibrato $12, $24 tone $0001 stereopanning $f -Music_PalletTown_branch_f4b22: ; f4b22 +Music_PalletTown_branch_f4b22: dutycycle $2 notetype $c, $78 octave 3 @@ -60,7 +59,7 @@ Music_PalletTown_branch_f4b22: ; f4b22 note B_, 8 intensity $77 note B_, 8 -Music_PalletTown_branch_f4b59: ; f4b59 +Music_PalletTown_branch_f4b59: dutycycle $3 intensity $92 note G_, 2 @@ -118,13 +117,12 @@ Music_PalletTown_branch_f4b59: ; f4b59 intensity $1f note F#, 8 loopchannel 0, Music_PalletTown_branch_f4b22 -; f4ba1 -Music_PalletTown_Ch2: ; f4ba1 +Music_PalletTown_Ch2: vibrato $12, $44 dutycycle $2 stereopanning $f0 -Music_PalletTown_branch_f4ba8: ; f4ba8 +Music_PalletTown_branch_f4ba8: notetype $c, $88 octave 1 note G_, 2 @@ -184,7 +182,7 @@ Music_PalletTown_branch_f4ba8: ; f4ba8 octave 3 note C_, 2 note D_, 2 -Music_PalletTown_branch_f4be5: ; f4be5 +Music_PalletTown_branch_f4be5: intensity $a2 octave 3 note E_, 2 @@ -244,11 +242,10 @@ Music_PalletTown_branch_f4be5: ; f4be5 note B_, 2 note A_, 2 loopchannel 0, Music_PalletTown_branch_f4ba8 -; f4c2a -Music_PalletTown_Ch3: ; f4c2a +Music_PalletTown_Ch3: vibrato $14, $24 -Music_PalletTown_branch_f4c2d: ; f4c2d +Music_PalletTown_branch_f4c2d: notetype $c, $10 octave 6 note D_, 2 @@ -358,6 +355,3 @@ Music_PalletTown_branch_f4c2d: ; f4c2d note B_, 8 note A_, 8 loopchannel 0, Music_PalletTown_branch_f4c2d -; f4c9f - - diff --git a/audio/music/pokeflutechannel.asm b/audio/music/pokeflutechannel.asm index 9256fe54..e324c559 100644 --- a/audio/music/pokeflutechannel.asm +++ b/audio/music/pokeflutechannel.asm @@ -1,10 +1,9 @@ -Music_PokeFluteChannel: ; f7b13 - dbw $80, Music_PokeFluteChannel_Ch1 - dbw $01, Music_PokeFluteChannel_Ch2 - dbw $02, Music_PokeFluteChannel_Ch3 -; f7b1c +Music_PokeFluteChannel: + musicheader 3, 1, Music_PokeFluteChannel_Ch1 + musicheader 1, 2, Music_PokeFluteChannel_Ch2 + musicheader 1, 3, Music_PokeFluteChannel_Ch3 -Music_PokeFluteChannel_Ch1: ; f7b1c +Music_PokeFluteChannel_Ch1: tempo 240 volume $77 stereopanning $f0 @@ -30,7 +29,7 @@ Music_PokeFluteChannel_Ch1: ; f7b1c octave 2 note G_, 4 note A_, 8 -Music_PokeFluteChannel_branch_f7b40: ; f7b40 +Music_PokeFluteChannel_branch_f7b40: octave 3 note E_, 2 note G_, 2 @@ -68,9 +67,8 @@ Music_PokeFluteChannel_branch_f7b40: ; f7b40 note G_, 4 note A_, 8 loopchannel 0, Music_PokeFluteChannel_branch_f7b40 -; f7b68 -Music_PokeFluteChannel_Ch2: ; f7b68 +Music_PokeFluteChannel_Ch2: stereopanning $f dutycycle $3 tone $0001 @@ -107,7 +105,7 @@ Music_PokeFluteChannel_Ch2: ; f7b68 octave 2 note E_, 2 note G_, 2 -Music_PokeFluteChannel_branch_f7b94: ; f7b94 +Music_PokeFluteChannel_branch_f7b94: octave 3 note C_, 2 note E_, 2 @@ -170,14 +168,13 @@ Music_PokeFluteChannel_branch_f7b94: ; f7b94 note E_, 2 note G_, 2 loopchannel 0, Music_PokeFluteChannel_branch_f7b94 -; f7bd5 -Music_PokeFluteChannel_Ch3: ; f7bd5 +Music_PokeFluteChannel_Ch3: vibrato $10, $14 notetype $c, $10 callchannel Music_PokeFluteChannel_branch_f7c05 callchannel Music_PokeFluteChannel_branch_f7c05 -Music_PokeFluteChannel_branch_f7be1: ; f7be1 +Music_PokeFluteChannel_branch_f7be1: note __, 4 octave 4 note C_, 2 @@ -209,9 +206,8 @@ Music_PokeFluteChannel_branch_f7be1: ; f7be1 note __, 4 callchannel Music_PokeFluteChannel_branch_f7c05 loopchannel 0, Music_PokeFluteChannel_branch_f7be1 -; f7c05 -Music_PokeFluteChannel_branch_f7c05: ; f7c05 +Music_PokeFluteChannel_branch_f7c05: octave 5 note E_, 2 note F_, 2 @@ -229,6 +225,3 @@ Music_PokeFluteChannel_branch_f7c05: ; f7c05 note F_, 2 note G_, 4 endchannel -; f7c16 - - diff --git a/audio/music/pokemoncenter.asm b/audio/music/pokemoncenter.asm index 9ea5c7da..01865045 100644 --- a/audio/music/pokemoncenter.asm +++ b/audio/music/pokemoncenter.asm @@ -1,17 +1,16 @@ -Music_PokemonCenter: ; ed5c6 - dbw $c0, Music_PokemonCenter_Ch1 - dbw $01, Music_PokemonCenter_Ch2 - dbw $02, Music_PokemonCenter_Ch3 - dbw $03, Music_PokemonCenter_Ch4 -; ed5d2 +Music_PokemonCenter: + musicheader 4, 1, Music_PokemonCenter_Ch1 + musicheader 1, 2, Music_PokemonCenter_Ch2 + musicheader 1, 3, Music_PokemonCenter_Ch3 + musicheader 1, 4, Music_PokemonCenter_Ch4 -Music_PokemonCenter_Ch1: ; ed5d2 +Music_PokemonCenter_Ch1: tempo 152 volume $77 dutycycle $2 vibrato $a, $14 tone $0001 -Music_PokemonCenter_branch_ed5df: ; ed5df +Music_PokemonCenter_branch_ed5df: stereopanning $f notetype $c, $83 octave 3 @@ -149,11 +148,10 @@ Music_PokemonCenter_branch_ed5df: ; ed5df note F#, 2 note G_, 2 loopchannel 0, Music_PokemonCenter_branch_ed5df -; ed671 -Music_PokemonCenter_Ch2: ; ed671 +Music_PokemonCenter_Ch2: vibrato $10, $25 -Music_PokemonCenter_branch_ed674: ; ed674 +Music_PokemonCenter_branch_ed674: stereopanning $ff callchannel Music_PokemonCenter_branch_ed6d1 stereopanning $f @@ -218,9 +216,8 @@ Music_PokemonCenter_branch_ed674: ; ed674 note E_, 2 note D_, 8 loopchannel 0, Music_PokemonCenter_branch_ed674 -; ed6d1 -Music_PokemonCenter_branch_ed6d1: ; ed6d1 +Music_PokemonCenter_branch_ed6d1: dutycycle $2 notetype $c, $c2 octave 4 @@ -236,9 +233,8 @@ Music_PokemonCenter_branch_ed6d1: ; ed6d1 note E_, 2 note C#, 6 endchannel -; ed6e4 -Music_PokemonCenter_branch_ed6e4: ; ed6e4 +Music_PokemonCenter_branch_ed6e4: notetype $c, $c2 octave 4 note C#, 2 @@ -251,11 +247,10 @@ Music_PokemonCenter_branch_ed6e4: ; ed6e4 note E_, 4 note C#, 2 endchannel -; ed6f3 -Music_PokemonCenter_Ch3: ; ed6f3 +Music_PokemonCenter_Ch3: notetype $c, $28 -Music_PokemonCenter_branch_ed6f6: ; ed6f6 +Music_PokemonCenter_branch_ed6f6: stereopanning $f0 octave 3 note D_, 1 @@ -360,9 +355,8 @@ Music_PokemonCenter_branch_ed6f6: ; ed6f6 note E_, 1 note __, 1 loopchannel 0, Music_PokemonCenter_branch_ed6f6 -; ed76f -Music_PokemonCenter_branch_ed76f: ; ed76f +Music_PokemonCenter_branch_ed76f: note E_, 1 note __, 5 note A_, 1 @@ -372,9 +366,8 @@ Music_PokemonCenter_branch_ed76f: ; ed76f note A_, 1 note __, 1 endchannel -; ed778 -Music_PokemonCenter_branch_ed778: ; ed778 +Music_PokemonCenter_branch_ed778: note E_, 1 note __, 5 note A_, 1 @@ -386,9 +379,8 @@ Music_PokemonCenter_branch_ed778: ; ed778 note A_, 1 note __, 1 endchannel -; ed783 -Music_PokemonCenter_branch_ed783: ; ed783 +Music_PokemonCenter_branch_ed783: note F#, 1 note __, 5 note A_, 1 @@ -398,19 +390,15 @@ Music_PokemonCenter_branch_ed783: ; ed783 note A_, 1 note __, 1 endchannel -; ed78c -Music_PokemonCenter_Ch4: ; ed78c +Music_PokemonCenter_Ch4: togglenoise $3 notetype $c stereopanning $ff -Music_PokemonCenter_branch_ed792: ; ed792 +Music_PokemonCenter_branch_ed792: note G_, 6 note G_, 4 note G_, 2 note G_, 2 note G_, 2 loopchannel 0, Music_PokemonCenter_branch_ed792 -; ed79b - - diff --git a/audio/music/pokemonchannel.asm b/audio/music/pokemonchannel.asm index 4cab1f28..34d64262 100644 --- a/audio/music/pokemonchannel.asm +++ b/audio/music/pokemonchannel.asm @@ -1,11 +1,10 @@ -Music_PokemonChannel: ; ee45f - dbw $c0, Music_PokemonChannel_Ch1 - dbw $01, Music_PokemonChannel_Ch2 - dbw $02, Music_PokemonChannel_Ch3 - dbw $03, Music_PokemonChannel_Ch4 -; ee46b +Music_PokemonChannel: + musicheader 4, 1, Music_PokemonChannel_Ch1 + musicheader 1, 2, Music_PokemonChannel_Ch2 + musicheader 1, 3, Music_PokemonChannel_Ch3 + musicheader 1, 4, Music_PokemonChannel_Ch4 -Music_PokemonChannel_Ch1: ; ee46b +Music_PokemonChannel_Ch1: tempo 128 volume $77 vibrato $8, $38 @@ -74,9 +73,8 @@ Music_PokemonChannel_Ch1: ; ee46b note D_, 2 note __, 6 endchannel -; ee4be -Music_PokemonChannel_Ch2: ; ee4be +Music_PokemonChannel_Ch2: dutycycle $1 vibrato $8, $38 stereopanning $ff @@ -145,9 +143,8 @@ Music_PokemonChannel_Ch2: ; ee4be note G_, 2 note __, 6 endchannel -; ee50e -Music_PokemonChannel_Ch3: ; ee50e +Music_PokemonChannel_Ch3: vibrato $8, $38 notetype $c, $25 stereopanning $f0 @@ -202,12 +199,11 @@ Music_PokemonChannel_Ch3: ; ee50e note G_, 1 note __, 3 endchannel -; ee549 -Music_PokemonChannel_Ch4: ; ee549 +Music_PokemonChannel_Ch4: togglenoise $3 notetype $c -Music_PokemonChannel_branch_ee54d: ; ee54d +Music_PokemonChannel_branch_ee54d: note A#, 3 note A#, 1 note D_, 2 @@ -233,6 +229,3 @@ Music_PokemonChannel_branch_ee54d: ; ee54d note A#, 4 note A#, 4 endchannel -; ee569 - - diff --git a/audio/music/pokemonlullaby.asm b/audio/music/pokemonlullaby.asm index 7abf53f9..86116a9a 100644 --- a/audio/music/pokemonlullaby.asm +++ b/audio/music/pokemonlullaby.asm @@ -1,15 +1,14 @@ -Music_PokemonLullaby: ; f6d79 - dbw $80, Music_PokemonLullaby_Ch1 - dbw $01, Music_PokemonLullaby_Ch2 - dbw $02, Music_PokemonLullaby_Ch3 -; f6d82 +Music_PokemonLullaby: + musicheader 3, 1, Music_PokemonLullaby_Ch1 + musicheader 1, 2, Music_PokemonLullaby_Ch2 + musicheader 1, 3, Music_PokemonLullaby_Ch3 -Music_PokemonLullaby_Ch1: ; f6d82 +Music_PokemonLullaby_Ch1: tempo 224 volume $77 dutycycle $3 tone $0001 -Music_PokemonLullaby_branch_f6d8c: ; f6d8c +Music_PokemonLullaby_branch_f6d8c: notetype $c, $a7 octave 3 note G_, 16 @@ -53,13 +52,12 @@ Music_PokemonLullaby_branch_f6d8c: ; f6d8c octave 3 note B_, 8 loopchannel 0, Music_PokemonLullaby_branch_f6d8c -; f6dc4 -Music_PokemonLullaby_Ch2: ; f6dc4 +Music_PokemonLullaby_Ch2: vibrato $10, $14 dutycycle $0 notetype $c, $b4 -Music_PokemonLullaby_branch_f6dcc: ; f6dcc +Music_PokemonLullaby_branch_f6dcc: note __, 16 note __, 10 octave 4 @@ -104,11 +102,10 @@ Music_PokemonLullaby_branch_f6dcc: ; f6dcc note E_, 16 note __, 14 loopchannel 0, Music_PokemonLullaby_branch_f6dcc -; f6e03 -Music_PokemonLullaby_Ch3: ; f6e03 +Music_PokemonLullaby_Ch3: notetype $c, $11 -Music_PokemonLullaby_branch_f6e06: ; f6e06 +Music_PokemonLullaby_branch_f6e06: stereopanning $f0 octave 4 note C_, 2 @@ -133,6 +130,3 @@ Music_PokemonLullaby_branch_f6e06: ; f6e06 note B_, 2 note A_, 2 loopchannel 0, Music_PokemonLullaby_branch_f6e06 -; f6e23 - - diff --git a/audio/music/pokemonmarch.asm b/audio/music/pokemonmarch.asm index c939dd88..346e042b 100644 --- a/audio/music/pokemonmarch.asm +++ b/audio/music/pokemonmarch.asm @@ -1,11 +1,10 @@ -Music_PokemonMarch: ; f6e23 - dbw $c0, Music_PokemonMarch_Ch1 - dbw $01, Music_PokemonMarch_Ch2 - dbw $02, Music_PokemonMarch_Ch3 - dbw $03, Music_PokemonMarch_Ch4 -; f6e2f +Music_PokemonMarch: + musicheader 4, 1, Music_PokemonMarch_Ch1 + musicheader 1, 2, Music_PokemonMarch_Ch2 + musicheader 1, 3, Music_PokemonMarch_Ch3 + musicheader 1, 4, Music_PokemonMarch_Ch4 -Music_PokemonMarch_Ch1: ; f6e2f +Music_PokemonMarch_Ch1: tempo 144 volume $77 stereopanning $f0 @@ -21,7 +20,7 @@ Music_PokemonMarch_Ch1: ; f6e2f intensity $a2 note D_, 4 notetype $8, $a2 -Music_PokemonMarch_branch_f6e4c: ; f6e4c +Music_PokemonMarch_branch_f6e4c: callchannel Music_PokemonMarch_branch_f6eae note D#, 2 note C_, 2 @@ -97,9 +96,8 @@ Music_PokemonMarch_branch_f6e4c: ; f6e4c note G_, 4 note A#, 2 loopchannel 0, Music_PokemonMarch_branch_f6e4c -; f6eae -Music_PokemonMarch_branch_f6eae: ; f6eae +Music_PokemonMarch_branch_f6eae: note __, 4 octave 3 note D#, 1 @@ -110,9 +108,8 @@ Music_PokemonMarch_branch_f6eae: ; f6eae note D#, 2 note __, 2 endchannel -; f6eb8 -Music_PokemonMarch_branch_f6eb8: ; f6eb8 +Music_PokemonMarch_branch_f6eb8: note __, 4 note F_, 1 note E_, 1 @@ -122,9 +119,8 @@ Music_PokemonMarch_branch_f6eb8: ; f6eb8 note F_, 2 note __, 2 endchannel -; f6ec1 -Music_PokemonMarch_Ch2: ; f6ec1 +Music_PokemonMarch_Ch2: dutycycle $2 vibrato $10, $22 notetype $c, $b2 @@ -133,7 +129,7 @@ Music_PokemonMarch_Ch2: ; f6ec1 note G_, 4 note G_, 4 note G_, 4 -Music_PokemonMarch_branch_f6ece: ; f6ece +Music_PokemonMarch_branch_f6ece: notetype $c, $b7 octave 3 note G#, 12 @@ -234,14 +230,13 @@ Music_PokemonMarch_branch_f6ece: ; f6ece note G_, 1 note __, 5 loopchannel 0, Music_PokemonMarch_branch_f6ece -; f6f4d -Music_PokemonMarch_Ch3: ; f6f4d +Music_PokemonMarch_Ch3: stereopanning $f notetype $c, $16 note __, 16 notetype $8, $16 -Music_PokemonMarch_branch_f6f56: ; f6f56 +Music_PokemonMarch_branch_f6f56: callchannel Music_PokemonMarch_branch_f6fe8 note __, 2 octave 4 @@ -273,7 +268,7 @@ Music_PokemonMarch_branch_f6f56: ; f6f56 note D#, 2 note G_, 2 note G#, 2 -Music_PokemonMarch_branch_f6f7b: ; f6f7b +Music_PokemonMarch_branch_f6f7b: octave 3 note A#, 2 note __, 2 @@ -377,9 +372,8 @@ Music_PokemonMarch_branch_f6f7b: ; f6f7b note __, 2 note G#, 2 loopchannel 0, Music_PokemonMarch_branch_f6f56 -; f6fe8 -Music_PokemonMarch_branch_f6fe8: ; f6fe8 +Music_PokemonMarch_branch_f6fe8: octave 3 note G#, 2 note __, 2 @@ -398,14 +392,13 @@ Music_PokemonMarch_branch_f6fe8: ; f6fe8 octave 3 note G_, 2 endchannel -; f6ffa -Music_PokemonMarch_Ch4: ; f6ffa +Music_PokemonMarch_Ch4: stereopanning $f0 togglenoise $5 notetype $8 callchannel Music_PokemonMarch_branch_f704c -Music_PokemonMarch_branch_f7003: ; f7003 +Music_PokemonMarch_branch_f7003: callchannel Music_PokemonMarch_branch_f7042 note C_, 4 note C_, 2 @@ -441,9 +434,8 @@ Music_PokemonMarch_branch_f7003: ; f7003 notetype $8 callchannel Music_PokemonMarch_branch_f704c loopchannel 0, Music_PokemonMarch_branch_f7003 -; f7042 -Music_PokemonMarch_branch_f7042: ; f7042 +Music_PokemonMarch_branch_f7042: note C_, 4 note C_, 2 note C_, 4 @@ -454,9 +446,8 @@ Music_PokemonMarch_branch_f7042: ; f7042 note C#, 2 note C#, 2 endchannel -; f704c -Music_PokemonMarch_branch_f704c: ; f704c +Music_PokemonMarch_branch_f704c: note C_, 4 note C_, 2 note C_, 4 @@ -466,6 +457,3 @@ Music_PokemonMarch_branch_f704c: ; f704c note D_, 2 note C#, 2 endchannel -; f7055 - - diff --git a/audio/music/postcredits.asm b/audio/music/postcredits.asm index 641974f6..0997828f 100644 --- a/audio/music/postcredits.asm +++ b/audio/music/postcredits.asm @@ -1,20 +1,17 @@ -Music_PostCredits: ; cfce3 - dbw $40, Music_PostCredits_Ch1 - dbw $01, Music_PostCredits_Ch2 -; cfce9 +Music_PostCredits: + musicheader 2, 1, Music_PostCredits_Ch1 + musicheader 1, 2, Music_PostCredits_Ch2 + db $2 -INCBIN "baserom.gbc", $cfce9, $cfcea - $cfce9 - - -Music_PostCredits_Ch1: ; cfcea +Music_PostCredits_Ch1: tempo 271 volume $77 - forceoctave $3 + pitchoffset 0, D# dutycycle $2 notetype $c, $93 note __, 8 -Music_PostCredits_branch_cfcf7: ; cfcf7 +Music_PostCredits_branch_cfdb2: octave 3 note C_, 2 note E_, 2 @@ -131,11 +128,10 @@ Music_PostCredits_branch_cfcf7: ; cfcf7 note D_, 2 octave 2 note G_, 2 - loopchannel 0, Music_PostCredits_branch_cfcf7 -; cfd8d + loopchannel 0, Music_PostCredits_branch_cfdb2 -Music_PostCredits_Ch2: ; cfd8d - forceoctave $3 +Music_PostCredits_Ch2: + pitchoffset 0, D# dutycycle $2 notetype $c, $a3 octave 5 @@ -146,7 +142,7 @@ Music_PostCredits_Ch2: ; cfd8d note F_, 2 intensity $73 note F_, 2 -Music_PostCredits_branch_cfd9f: ; cfd9f +Music_PostCredits_branch_cfe5a: intensity $a3 note G_, 2 intensity $73 @@ -265,6 +261,4 @@ Music_PostCredits_branch_cfd9f: ; cfd9f intensity $a3 note E_, 2 note F_, 2 - loopchannel 0, Music_PostCredits_branch_cfd9f -; cfe49 - + loopchannel 0, Music_PostCredits_branch_cfe5a diff --git a/audio/music/printer.asm b/audio/music/printer.asm index eed30972..886f6b76 100644 --- a/audio/music/printer.asm +++ b/audio/music/printer.asm @@ -1,8 +1,7 @@ -Music_Printer: ; f07fd - dbw $02, Music_Printer_Ch3 -; f0800 +Music_Printer: + musicheader 1, 3, Music_Printer_Ch3 -Music_Printer_Ch3: ; f0800 +Music_Printer_Ch3: tempo 256 notetype $c, $20 octave 4 @@ -34,7 +33,7 @@ Music_Printer_Ch3: ; f0800 note __, 1 note F#, 1 note __, 1 -Music_Printer_branch_f0823: ; f0823 +Music_Printer_branch_f0823: note E_, 1 note __, 1 note B_, 1 @@ -318,5 +317,3 @@ Music_Printer_branch_f0823: ; f0823 note D#, 1 note __, 1 loopchannel 0, Music_Printer_branch_f0823 -; f0941 - diff --git a/audio/music/profoak.asm b/audio/music/profoak.asm index c2b67608..5e34e2c6 100644 --- a/audio/music/profoak.asm +++ b/audio/music/profoak.asm @@ -1,10 +1,9 @@ -Music_ProfOak: ; f4dea - dbw $80, Music_ProfOak_Ch1 - dbw $01, Music_ProfOak_Ch2 - dbw $02, Music_ProfOak_Ch3 -; f4df3 +Music_ProfOak: + musicheader 3, 1, Music_ProfOak_Ch1 + musicheader 1, 2, Music_ProfOak_Ch2 + musicheader 1, 3, Music_ProfOak_Ch3 -Music_ProfOak_Ch1: ; f4df3 +Music_ProfOak_Ch1: tempo 118 volume $77 vibrato $12, $34 @@ -22,28 +21,27 @@ Music_ProfOak_Ch1: ; f4df3 note G#, 8 intensity $97 note G#, 8 -Music_ProfOak_branch_f4e10: ; f4e10 +Music_ProfOak_branch_f4e10: intensity $91 callchannel Music_ProfOak_branch_f4e42 callchannel Music_ProfOak_branch_f4e42 callchannel Music_ProfOak_branch_f4e4d callchannel Music_ProfOak_branch_f4e4d loopchannel 2, Music_ProfOak_branch_f4e10 -Music_ProfOak_branch_f4e22: ; f4e22 +Music_ProfOak_branch_f4e22: callchannel Music_ProfOak_branch_f4e58 callchannel Music_ProfOak_branch_f4e58 callchannel Music_ProfOak_branch_f4e6c callchannel Music_ProfOak_branch_f4e6c - forceoctave $2 + pitchoffset 0, D_ callchannel Music_ProfOak_branch_f4e58 callchannel Music_ProfOak_branch_f4e58 - forceoctave $0 + pitchoffset 0, C_ callchannel Music_ProfOak_branch_f4e6c callchannel Music_ProfOak_branch_f4e6c loopchannel 0, Music_ProfOak_branch_f4e22 -; f4e42 -Music_ProfOak_branch_f4e42: ; f4e42 +Music_ProfOak_branch_f4e42: octave 2 note B_, 2 octave 3 @@ -55,9 +53,8 @@ Music_ProfOak_branch_f4e42: ; f4e42 note G#, 2 note E_, 2 endchannel -; f4e4d -Music_ProfOak_branch_f4e4d: ; f4e4d +Music_ProfOak_branch_f4e4d: octave 2 note B_, 2 octave 3 @@ -69,9 +66,8 @@ Music_ProfOak_branch_f4e4d: ; f4e4d note F#, 2 note D#, 2 endchannel -; f4e58 -Music_ProfOak_branch_f4e58: ; f4e58 +Music_ProfOak_branch_f4e58: octave 2 note A_, 2 octave 3 @@ -88,9 +84,8 @@ Music_ProfOak_branch_f4e58: ; f4e58 note E_, 2 intensity $91 endchannel -; f4e6c -Music_ProfOak_branch_f4e6c: ; f4e6c +Music_ProfOak_branch_f4e6c: octave 2 note B_, 1 octave 3 @@ -105,9 +100,8 @@ Music_ProfOak_branch_f4e6c: ; f4e6c note B_, 4 intensity $91 endchannel -; f4e7e -Music_ProfOak_Ch2: ; f4e7e +Music_ProfOak_Ch2: vibrato $12, $34 dutycycle $3 notetype $c, $a8 @@ -121,7 +115,7 @@ Music_ProfOak_Ch2: ; f4e7e intensity $a7 note B_, 10 dutycycle $2 -Music_ProfOak_branch_f4e92: ; f4e92 +Music_ProfOak_branch_f4e92: intensity $b2 octave 3 note B_, 2 @@ -159,7 +153,7 @@ Music_ProfOak_branch_f4e92: ; f4e92 loopchannel 2, Music_ProfOak_branch_f4e92 note __, 6 intensity $b4 -Music_ProfOak_branch_f4ebf: ; f4ebf +Music_ProfOak_branch_f4ebf: note C#, 6 octave 3 note A_, 1 @@ -208,9 +202,8 @@ Music_ProfOak_branch_f4ebf: ; f4ebf note E_, 1 note G#, 16 loopchannel 0, Music_ProfOak_branch_f4ebf -; f4ef5 -Music_ProfOak_Ch3: ; f4ef5 +Music_ProfOak_Ch3: stereopanning $f notetype $c, $14 note __, 4 @@ -230,27 +223,26 @@ Music_ProfOak_Ch3: ; f4ef5 note __, 1 note E_, 2 callchannel Music_ProfOak_branch_f4f3d -Music_ProfOak_branch_f4f0d: ; f4f0d +Music_ProfOak_branch_f4f0d: callchannel Music_ProfOak_branch_f4f3d callchannel Music_ProfOak_branch_f4f3d callchannel Music_ProfOak_branch_f4f4c callchannel Music_ProfOak_branch_f4f4c loopchannel 2, Music_ProfOak_branch_f4f0d -Music_ProfOak_branch_f4f1d: ; f4f1d +Music_ProfOak_branch_f4f1d: callchannel Music_ProfOak_branch_f4f5a callchannel Music_ProfOak_branch_f4f5a callchannel Music_ProfOak_branch_f4f69 callchannel Music_ProfOak_branch_f4f69 - forceoctave $2 + pitchoffset 0, D_ callchannel Music_ProfOak_branch_f4f5a callchannel Music_ProfOak_branch_f4f5a - forceoctave $0 + pitchoffset 0, C_ callchannel Music_ProfOak_branch_f4f69 callchannel Music_ProfOak_branch_f4f69 loopchannel 0, Music_ProfOak_branch_f4f1d -; f4f3d -Music_ProfOak_branch_f4f3d: ; f4f3d +Music_ProfOak_branch_f4f3d: note E_, 2 note __, 2 octave 4 @@ -266,9 +258,8 @@ Music_ProfOak_branch_f4f3d: ; f4f3d note __, 1 note E_, 2 endchannel -; f4f4c -Music_ProfOak_branch_f4f4c: ; f4f4c +Music_ProfOak_branch_f4f4c: octave 2 note B_, 2 note __, 2 @@ -283,9 +274,8 @@ Music_ProfOak_branch_f4f4c: ; f4f4c note __, 1 note D#, 2 endchannel -; f4f5a -Music_ProfOak_branch_f4f5a: ; f4f5a +Music_ProfOak_branch_f4f5a: octave 2 note A_, 2 note __, 2 @@ -301,9 +291,8 @@ Music_ProfOak_branch_f4f5a: ; f4f5a note __, 1 note C#, 2 endchannel -; f4f69 -Music_ProfOak_branch_f4f69: ; f4f69 +Music_ProfOak_branch_f4f69: octave 2 note G#, 2 note __, 2 @@ -320,6 +309,3 @@ Music_ProfOak_branch_f4f69: ; f4f69 octave 2 note B_, 2 endchannel -; f4f79 - - diff --git a/audio/music/profoakspokemontalk.asm b/audio/music/profoakspokemontalk.asm index 578c0272..bd299466 100644 --- a/audio/music/profoakspokemontalk.asm +++ b/audio/music/profoakspokemontalk.asm @@ -1,14 +1,11 @@ -Music_ProfOaksPokemonTalk: ; f4c9f - dbw $80, Music_ProfOaksPokemonTalk_Ch1 - dbw $01, Music_ProfOaksPokemonTalk_Ch2 - dbw $02, Music_ProfOaksPokemonTalk_Ch3 -; f4ca8 +Music_ProfOaksPokemonTalk: + musicheader 3, 1, Music_ProfOaksPokemonTalk_Ch1 + musicheader 1, 2, Music_ProfOaksPokemonTalk_Ch2 + musicheader 1, 3, Music_ProfOaksPokemonTalk_Ch3 + db $3 -INCBIN "baserom.gbc", $f4ca8, $f4ca9 - $f4ca8 - - -Music_ProfOaksPokemonTalk_Ch1: ; f4ca9 +Music_ProfOaksPokemonTalk_Ch1: tempo 164 volume $77 stereopanning $f @@ -26,7 +23,7 @@ Music_ProfOaksPokemonTalk_Ch1: ; f4ca9 note D#, 1 note E_, 1 note F#, 1 -Music_ProfOaksPokemonTalk_branch_f4cc3: ; f4cc3 +Music_ProfOaksPokemonTalk_branch_f4cc3: note D#, 6 note C#, 1 octave 3 @@ -134,9 +131,8 @@ Music_ProfOaksPokemonTalk_branch_f4cc3: ; f4cc3 note F#, 1 note __, 1 loopchannel 0, Music_ProfOaksPokemonTalk_branch_f4cc3 -; f4d31 -Music_ProfOaksPokemonTalk_Ch2: ; f4d31 +Music_ProfOaksPokemonTalk_Ch2: vibrato $8, $24 dutycycle $3 notetype $c, $a7 @@ -159,7 +155,7 @@ Music_ProfOaksPokemonTalk_Ch2: ; f4d31 note F#, 1 note G#, 1 note A#, 1 -Music_ProfOaksPokemonTalk_branch_f4d4d: ; f4d4d +Music_ProfOaksPokemonTalk_branch_f4d4d: note B_, 6 note A#, 1 note G#, 1 @@ -210,9 +206,8 @@ Music_ProfOaksPokemonTalk_branch_f4d4d: ; f4d4d note A#, 1 note __, 1 loopchannel 0, Music_ProfOaksPokemonTalk_branch_f4d4d -; f4d82 -Music_ProfOaksPokemonTalk_Ch3: ; f4d82 +Music_ProfOaksPokemonTalk_Ch3: vibrato $6, $38 notetype $c, $25 stereopanning $f0 @@ -227,7 +222,7 @@ Music_ProfOaksPokemonTalk_Ch3: ; f4d82 note C#, 1 octave 2 note A#, 1 -Music_ProfOaksPokemonTalk_branch_f4d95: ; f4d95 +Music_ProfOaksPokemonTalk_branch_f4d95: note B_, 6 octave 3 note D#, 1 @@ -310,6 +305,3 @@ Music_ProfOaksPokemonTalk_branch_f4d95: ; f4d95 note A#, 1 note __, 1 loopchannel 0, Music_ProfOaksPokemonTalk_branch_f4d95 -; f4dea - - diff --git a/audio/music/rivalbattle.asm b/audio/music/rivalbattle.asm index eb40cc35..4ba8840b 100644 --- a/audio/music/rivalbattle.asm +++ b/audio/music/rivalbattle.asm @@ -1,10 +1,9 @@ -Music_RivalBattle: ; e96f8 - dbw $80, Music_RivalBattle_Ch1 - dbw $01, Music_RivalBattle_Ch2 - dbw $02, Music_RivalBattle_Ch3 -; e9701 +Music_RivalBattle: + musicheader 3, 1, Music_RivalBattle_Ch1 + musicheader 1, 2, Music_RivalBattle_Ch2 + musicheader 1, 3, Music_RivalBattle_Ch3 -Music_RivalBattle_Ch1: ; e9701 +Music_RivalBattle_Ch1: tempo 102 volume $77 dutycycle $3 @@ -23,7 +22,7 @@ Music_RivalBattle_Ch1: ; e9701 intensity $b7 note C#, 6 note E_, 4 -Music_RivalBattle_branch_e9720: ; e9720 +Music_RivalBattle_branch_e9777: intensity $b2 octave 2 note A#, 6 @@ -32,7 +31,7 @@ Music_RivalBattle_branch_e9720: ; e9720 note C#, 6 intensity $b2 note D#, 4 - loopchannel 3, Music_RivalBattle_branch_e9720 + loopchannel 3, Music_RivalBattle_branch_e9777 intensity $b2 octave 2 note A#, 2 @@ -40,7 +39,7 @@ Music_RivalBattle_branch_e9720: ; e9720 note C#, 4 intensity $b7 note C#, 10 -Music_RivalBattle_branch_e9738: ; e9738 +Music_RivalBattle_branch_e978f: intensity $b2 octave 3 note G#, 6 @@ -49,14 +48,14 @@ Music_RivalBattle_branch_e9738: ; e9738 intensity $b2 octave 4 note C#, 4 - loopchannel 3, Music_RivalBattle_branch_e9738 + loopchannel 3, Music_RivalBattle_branch_e978f intensity $b2 octave 3 note G#, 2 note B_, 4 intensity $4d note B_, 10 -Music_RivalBattle_branch_e974f: ; e974f +Music_RivalBattle_branch_e97a6: intensity $b7 note A#, 6 note F#, 6 @@ -179,7 +178,7 @@ Music_RivalBattle_branch_e974f: ; e974f note E_, 2 note D#, 2 note C#, 2 -Music_RivalBattle_branch_e97e0: ; e97e0 +Music_RivalBattle_branch_e9837: octave 3 note A#, 2 note E_, 2 @@ -204,7 +203,7 @@ Music_RivalBattle_branch_e97e0: ; e97e0 note A#, 2 octave 4 note D#, 2 - loopchannel 2, Music_RivalBattle_branch_e97e0 + loopchannel 2, Music_RivalBattle_branch_e9837 intensity $94 octave 3 note D#, 8 @@ -284,10 +283,9 @@ Music_RivalBattle_branch_e97e0: ; e97e0 note B_, 6 octave 3 note C#, 10 - loopchannel 0, Music_RivalBattle_branch_e974f -; e9858 + loopchannel 0, Music_RivalBattle_branch_e97a6 -Music_RivalBattle_Ch2: ; e9858 +Music_RivalBattle_Ch2: dutycycle $3 vibrato $8, $36 tone $0001 @@ -337,14 +335,14 @@ Music_RivalBattle_Ch2: ; e9858 note F#, 6 intensity $c2 note G#, 4 -Music_RivalBattle_branch_e9893: ; e9893 +Music_RivalBattle_branch_e98ea: intensity $c2 note D#, 6 intensity $c7 note F#, 6 intensity $c2 note G#, 4 - loopchannel 2, Music_RivalBattle_branch_e9893 + loopchannel 2, Music_RivalBattle_branch_e98ea intensity $c2 note D#, 2 note F#, 4 @@ -354,14 +352,14 @@ Music_RivalBattle_branch_e9893: ; e9893 note B_, 1 octave 4 note C_, 1 -Music_RivalBattle_branch_e98ac: ; e98ac +Music_RivalBattle_branch_e9903: intensity $c2 note C#, 6 intensity $c7 note E_, 6 intensity $c2 note F#, 4 - loopchannel 3, Music_RivalBattle_branch_e98ac + loopchannel 3, Music_RivalBattle_branch_e9903 intensity $c2 note C#, 2 note E_, 4 @@ -369,13 +367,13 @@ Music_RivalBattle_branch_e98ac: ; e98ac note E_, 4 intensity $b7 note E_, 6 -Music_RivalBattle_branch_e98c3: ; e98c3 - callchannel Music_RivalBattle_branch_e9989 +Music_RivalBattle_branch_e991a: + callchannel Music_RivalBattle_branch_e99e0 intensity $b0 note G#, 8 intensity $b7 note G#, 8 - callchannel Music_RivalBattle_branch_e9989 + callchannel Music_RivalBattle_branch_e99e0 intensity $4e note G#, 8 intensity $b7 @@ -474,7 +472,7 @@ Music_RivalBattle_branch_e98c3: ; e98c3 note G#, 8 intensity $c7 note F_, 8 -Music_RivalBattle_branch_e994f: ; e994f +Music_RivalBattle_branch_e99a6: intensity $c2 octave 3 note A#, 6 @@ -483,7 +481,7 @@ Music_RivalBattle_branch_e994f: ; e994f note C#, 6 intensity $c2 note D#, 4 - loopchannel 3, Music_RivalBattle_branch_e994f + loopchannel 3, Music_RivalBattle_branch_e99a6 intensity $c2 octave 3 note A#, 2 @@ -493,7 +491,7 @@ Music_RivalBattle_branch_e994f: ; e994f note C#, 6 intensity $9a note C#, 4 -Music_RivalBattle_branch_e996a: ; e996a +Music_RivalBattle_branch_e99c1: intensity $c2 octave 3 note G#, 6 @@ -502,7 +500,7 @@ Music_RivalBattle_branch_e996a: ; e996a intensity $c2 octave 4 note C#, 4 - loopchannel 3, Music_RivalBattle_branch_e996a + loopchannel 3, Music_RivalBattle_branch_e99c1 intensity $c2 octave 3 note G#, 2 @@ -512,10 +510,9 @@ Music_RivalBattle_branch_e996a: ; e996a intensity $6a octave 4 note D_, 4 - loopchannel 0, Music_RivalBattle_branch_e98c3 -; e9989 + loopchannel 0, Music_RivalBattle_branch_e991a -Music_RivalBattle_branch_e9989: ; e9989 +Music_RivalBattle_branch_e99e0: intensity $c7 note D#, 10 intensity $c4 @@ -536,9 +533,8 @@ Music_RivalBattle_branch_e9989: ; e9989 intensity $b7 note F_, 8 endchannel -; e99a4 -Music_RivalBattle_Ch3: ; e99a4 +Music_RivalBattle_Ch3: notetype $c, $19 octave 3 note F#, 2 @@ -554,7 +550,7 @@ Music_RivalBattle_Ch3: ; e99a4 octave 3 note C#, 2 note D_, 2 -Music_RivalBattle_branch_e99b5: ; e99b5 +Music_RivalBattle_branch_e9a0c: note D#, 2 note C#, 2 note D#, 2 @@ -562,8 +558,8 @@ Music_RivalBattle_branch_e99b5: ; e99b5 note E_, 2 note D#, 2 note C#, 2 - loopchannel 4, Music_RivalBattle_branch_e99b5 -Music_RivalBattle_branch_e99c0: ; e99c0 + loopchannel 4, Music_RivalBattle_branch_e9a0c +Music_RivalBattle_branch_e9a17: octave 3 note C#, 2 octave 2 @@ -575,7 +571,7 @@ Music_RivalBattle_branch_e99c0: ; e99c0 note C#, 2 octave 2 note B_, 2 - loopchannel 3, Music_RivalBattle_branch_e99c0 + loopchannel 3, Music_RivalBattle_branch_e9a17 octave 3 note C#, 2 note E_, 2 @@ -586,8 +582,8 @@ Music_RivalBattle_branch_e99c0: ; e99c0 note C_, 2 note C#, 2 note D_, 2 -Music_RivalBattle_branch_e99d9: ; e99d9 - callchannel Music_RivalBattle_branch_e9af0 +Music_RivalBattle_branch_e9a30: + callchannel Music_RivalBattle_branch_e9b47 octave 2 note A#, 2 octave 4 @@ -604,7 +600,7 @@ Music_RivalBattle_branch_e99d9: ; e99d9 note A#, 2 octave 3 note G#, 2 - callchannel Music_RivalBattle_branch_e9af9 + callchannel Music_RivalBattle_branch_e9b50 note C#, 2 note G#, 2 octave 4 @@ -615,7 +611,7 @@ Music_RivalBattle_branch_e99d9: ; e99d9 note C_, 2 octave 2 note B_, 2 - callchannel Music_RivalBattle_branch_e9af0 + callchannel Music_RivalBattle_branch_e9b47 octave 2 note A#, 2 octave 3 @@ -632,20 +628,20 @@ Music_RivalBattle_branch_e99d9: ; e99d9 note A#, 2 octave 3 note F_, 2 - callchannel Music_RivalBattle_branch_e9af9 -Music_RivalBattle_branch_e9a0f: ; e9a0f + callchannel Music_RivalBattle_branch_e9b50 +Music_RivalBattle_branch_e9a66: note C#, 2 note G#, 2 - loopchannel 4, Music_RivalBattle_branch_e9a0f - callchannel Music_RivalBattle_branch_e9b05 + loopchannel 4, Music_RivalBattle_branch_e9a66 + callchannel Music_RivalBattle_branch_e9b5c note G#, 2 note F#, 2 -Music_RivalBattle_branch_e9a1a: ; e9a1a +Music_RivalBattle_branch_e9a71: octave 2 note A#, 2 octave 3 note F_, 2 - loopchannel 4, Music_RivalBattle_branch_e9a1a + loopchannel 4, Music_RivalBattle_branch_e9a71 octave 2 note A#, 2 octave 3 @@ -660,17 +656,17 @@ Music_RivalBattle_branch_e9a1a: ; e9a1a note F#, 2 note F_, 2 note D#, 2 - callchannel Music_RivalBattle_branch_e9b05 + callchannel Music_RivalBattle_branch_e9b5c octave 2 note B_, 2 octave 3 note D_, 2 - callchannel Music_RivalBattle_branch_e9b0e + callchannel Music_RivalBattle_branch_e9b65 octave 3 note D#, 2 octave 4 note D#, 2 - callchannel Music_RivalBattle_branch_e9b0e + callchannel Music_RivalBattle_branch_e9b65 octave 3 note D#, 2 note A#, 2 @@ -698,34 +694,34 @@ Music_RivalBattle_branch_e9a1a: ; e9a1a note F#, 2 note G_, 2 note G#, 2 -Music_RivalBattle_branch_e9a5c: ; e9a5c +Music_RivalBattle_branch_e9ab3: note D#, 2 note A#, 2 - loopchannel 4, Music_RivalBattle_branch_e9a5c -Music_RivalBattle_branch_e9a62: ; e9a62 + loopchannel 4, Music_RivalBattle_branch_e9ab3 +Music_RivalBattle_branch_e9ab9: note D#, 2 note A_, 2 - loopchannel 4, Music_RivalBattle_branch_e9a62 -Music_RivalBattle_branch_e9a68: ; e9a68 + loopchannel 4, Music_RivalBattle_branch_e9ab9 +Music_RivalBattle_branch_e9abf: note D#, 2 note G#, 2 - loopchannel 4, Music_RivalBattle_branch_e9a68 -Music_RivalBattle_branch_e9a6e: ; e9a6e + loopchannel 4, Music_RivalBattle_branch_e9abf +Music_RivalBattle_branch_e9ac5: note D#, 2 note G_, 2 - loopchannel 12, Music_RivalBattle_branch_e9a6e -Music_RivalBattle_branch_e9a74: ; e9a74 + loopchannel 12, Music_RivalBattle_branch_e9ac5 +Music_RivalBattle_branch_e9acb: octave 2 note B_, 2 octave 3 note D#, 2 - loopchannel 4, Music_RivalBattle_branch_e9a74 -Music_RivalBattle_branch_e9a7c: ; e9a7c + loopchannel 4, Music_RivalBattle_branch_e9acb +Music_RivalBattle_branch_e9ad3: octave 2 note B_, 2 octave 3 note F#, 2 - loopchannel 4, Music_RivalBattle_branch_e9a7c + loopchannel 4, Music_RivalBattle_branch_e9ad3 note D#, 2 note G_, 2 note A#, 2 @@ -779,40 +775,40 @@ Music_RivalBattle_branch_e9a7c: ; e9a7c note C#, 8 note D#, 8 note F_, 8 -Music_RivalBattle_branch_e9ab9: ; e9ab9 +Music_RivalBattle_branch_e9b10: octave 2 note A#, 2 octave 3 note D#, 2 - loopchannel 7, Music_RivalBattle_branch_e9ab9 + loopchannel 7, Music_RivalBattle_branch_e9b10 note E_, 2 note D#, 2 -Music_RivalBattle_branch_e9ac3: ; e9ac3 +Music_RivalBattle_branch_e9b1a: octave 2 note A#, 2 octave 3 note D#, 2 - loopchannel 6, Music_RivalBattle_branch_e9ac3 + loopchannel 6, Music_RivalBattle_branch_e9b1a octave 2 note A#, 2 octave 3 note F#, 2 note F_, 2 note E_, 2 -Music_RivalBattle_branch_e9ad1: ; e9ad1 +Music_RivalBattle_branch_e9b28: octave 2 note G#, 2 octave 3 note C#, 2 - loopchannel 7, Music_RivalBattle_branch_e9ad1 + loopchannel 7, Music_RivalBattle_branch_e9b28 note D_, 2 note C#, 2 -Music_RivalBattle_branch_e9adb: ; e9adb +Music_RivalBattle_branch_e9b32: octave 2 note G#, 2 octave 3 note C#, 2 - loopchannel 4, Music_RivalBattle_branch_e9adb + loopchannel 4, Music_RivalBattle_branch_e9b32 octave 2 note B_, 2 note G#, 2 @@ -822,19 +818,17 @@ Music_RivalBattle_branch_e9adb: ; e9adb note E_, 2 note D#, 2 note D_, 2 - loopchannel 0, Music_RivalBattle_branch_e99d9 -; e9af0 + loopchannel 0, Music_RivalBattle_branch_e9a30 -Music_RivalBattle_branch_e9af0: ; e9af0 +Music_RivalBattle_branch_e9b47: octave 2 note A#, 2 octave 3 note D#, 2 - loopchannel 4, Music_RivalBattle_branch_e9af0 + loopchannel 4, Music_RivalBattle_branch_e9b47 endchannel -; e9af9 -Music_RivalBattle_branch_e9af9: ; e9af9 +Music_RivalBattle_branch_e9b50: note C#, 2 note G#, 2 octave 4 @@ -847,25 +841,20 @@ Music_RivalBattle_branch_e9af9: ; e9af9 note C#, 2 note G#, 2 endchannel -; e9b05 -Music_RivalBattle_branch_e9b05: ; e9b05 +Music_RivalBattle_branch_e9b5c: octave 2 note B_, 2 octave 3 note F#, 2 - loopchannel 7, Music_RivalBattle_branch_e9b05 + loopchannel 7, Music_RivalBattle_branch_e9b5c endchannel -; e9b0e -Music_RivalBattle_branch_e9b0e: ; e9b0e +Music_RivalBattle_branch_e9b65: octave 3 note D#, 2 note A#, 2 octave 4 note D#, 2 - loopchannel 2, Music_RivalBattle_branch_e9b0e + loopchannel 2, Music_RivalBattle_branch_e9b65 endchannel -; e9b18 - - diff --git a/audio/music/rocketbattle.asm b/audio/music/rocketbattle.asm index b09c327f..30c90b08 100644 --- a/audio/music/rocketbattle.asm +++ b/audio/music/rocketbattle.asm @@ -1,10 +1,9 @@ -Music_RocketBattle: ; e9b18 - dbw $80, Music_RocketBattle_Ch1 - dbw $01, Music_RocketBattle_Ch2 - dbw $02, Music_RocketBattle_Ch3 -; e9b21 +Music_RocketBattle: + musicheader 3, 1, Music_RocketBattle_Ch1 + musicheader 1, 2, Music_RocketBattle_Ch2 + musicheader 1, 3, Music_RocketBattle_Ch3 -Music_RocketBattle_Ch1: ; e9b21 +Music_RocketBattle_Ch1: tempo 101 volume $77 dutycycle $3 @@ -48,7 +47,7 @@ Music_RocketBattle_Ch1: ; e9b21 note C_, 1 octave 2 note B_, 1 -Music_RocketBattle_branch_e9b56: ; e9b56 +Music_RocketBattle_branch_e9bad: intensity $b2 octave 3 note C_, 6 @@ -56,13 +55,13 @@ Music_RocketBattle_branch_e9b56: ; e9b56 note E_, 2 intensity $b7 note D_, 4 - loopchannel 3, Music_RocketBattle_branch_e9b56 + loopchannel 3, Music_RocketBattle_branch_e9bad intensity $b2 note C_, 6 note C_, 6 intensity $b7 note D_, 4 -Music_RocketBattle_branch_e9b6a: ; e9b6a +Music_RocketBattle_branch_e9bc1: intensity $b2 octave 4 note E_, 6 @@ -70,7 +69,7 @@ Music_RocketBattle_branch_e9b6a: ; e9b6a note G_, 2 intensity $b7 note F_, 4 - loopchannel 3, Music_RocketBattle_branch_e9b6a + loopchannel 3, Music_RocketBattle_branch_e9bc1 intensity $b2 note E_, 6 note E_, 4 @@ -116,7 +115,7 @@ Music_RocketBattle_branch_e9b6a: ; e9b6a note D#, 2 note D_, 2 note F_, 2 -Music_RocketBattle_branch_e9bab: ; e9bab +Music_RocketBattle_branch_e9c02: octave 4 note E_, 2 octave 3 @@ -291,14 +290,14 @@ Music_RocketBattle_branch_e9bab: ; e9bab intensity $b7 note A#, 2 note G_, 4 -Music_RocketBattle_branch_e9c6e: ; e9c6e +Music_RocketBattle_branch_e9cc5: intensity $b2 note F_, 6 note F_, 4 intensity $b7 note A_, 2 note G_, 4 - loopchannel 2, Music_RocketBattle_branch_e9c6e + loopchannel 2, Music_RocketBattle_branch_e9cc5 intensity $b2 note F_, 6 octave 4 @@ -388,10 +387,9 @@ Music_RocketBattle_branch_e9c6e: ; e9c6e note D#, 2 note D_, 2 note F_, 2 - loopchannel 0, Music_RocketBattle_branch_e9bab -; e9ce7 + loopchannel 0, Music_RocketBattle_branch_e9c02 -Music_RocketBattle_Ch2: ; e9ce7 +Music_RocketBattle_Ch2: dutycycle $3 vibrato $8, $36 tone $0001 @@ -438,7 +436,7 @@ Music_RocketBattle_Ch2: ; e9ce7 note G#, 1 note A_, 1 note G#, 1 -Music_RocketBattle_branch_e9d24: ; e9d24 +Music_RocketBattle_branch_e9d7b: intensity $c2 octave 3 note A_, 6 @@ -448,13 +446,13 @@ Music_RocketBattle_branch_e9d24: ; e9d24 intensity $c7 octave 3 note A#, 4 - loopchannel 3, Music_RocketBattle_branch_e9d24 + loopchannel 3, Music_RocketBattle_branch_e9d7b intensity $c2 note A_, 6 note A_, 6 intensity $4a note G#, 4 -Music_RocketBattle_branch_e9d3a: ; e9d3a +Music_RocketBattle_branch_e9d91: intensity $c2 octave 4 note A_, 6 @@ -464,20 +462,20 @@ Music_RocketBattle_branch_e9d3a: ; e9d3a intensity $c7 octave 4 note A#, 4 - loopchannel 3, Music_RocketBattle_branch_e9d3a + loopchannel 3, Music_RocketBattle_branch_e9d91 intensity $c2 note A_, 6 note A_, 4 intensity $c7 note G_, 2 note G#, 4 - callchannel Music_RocketBattle_branch_e9e49 + callchannel Music_RocketBattle_branch_e9ea0 intensity $b0 note F_, 16 intensity $b7 note F_, 16 -Music_RocketBattle_branch_e9d5a: ; e9d5a - callchannel Music_RocketBattle_branch_e9e49 +Music_RocketBattle_branch_e9db1: + callchannel Music_RocketBattle_branch_e9ea0 intensity $b0 note F_, 8 intensity $b7 @@ -605,7 +603,7 @@ Music_RocketBattle_branch_e9d5a: ; e9d5a note G_, 1 note G#, 1 note A_, 8 -Music_RocketBattle_branch_e9e03: ; e9e03 +Music_RocketBattle_branch_e9e5a: intensity $c2 octave 3 note A#, 6 @@ -614,7 +612,7 @@ Music_RocketBattle_branch_e9e03: ; e9e03 octave 4 note D_, 2 note C_, 4 - loopchannel 3, Music_RocketBattle_branch_e9e03 + loopchannel 3, Music_RocketBattle_branch_e9e5a intensity $c2 octave 3 note A#, 6 @@ -656,10 +654,9 @@ Music_RocketBattle_branch_e9e03: ; e9e03 note A#, 8 intensity $c7 note A#, 8 - loopchannel 0, Music_RocketBattle_branch_e9d5a -; e9e49 + loopchannel 0, Music_RocketBattle_branch_e9db1 -Music_RocketBattle_branch_e9e49: ; e9e49 +Music_RocketBattle_branch_e9ea0: intensity $c6 octave 4 note A_, 6 @@ -669,9 +666,8 @@ Music_RocketBattle_branch_e9e49: ; e9e49 note G#, 6 note E_, 4 endchannel -; e9e53 -Music_RocketBattle_Ch3: ; e9e53 +Music_RocketBattle_Ch3: notetype $c, $19 octave 3 note A_, 2 @@ -704,9 +700,9 @@ Music_RocketBattle_Ch3: ; e9e53 octave 2 note B_, 2 note A#, 2 -Music_RocketBattle_branch_e9e75: ; e9e75 - callchannel Music_RocketBattle_branch_e9f8f - loopchannel 3, Music_RocketBattle_branch_e9e75 +Music_RocketBattle_branch_e9ecc: + callchannel Music_RocketBattle_branch_e9fe6 + loopchannel 3, Music_RocketBattle_branch_e9ecc octave 2 note A_, 2 octave 3 @@ -719,9 +715,9 @@ Music_RocketBattle_branch_e9e75: ; e9e75 note F_, 2 note E_, 2 note D_, 2 -Music_RocketBattle_branch_e9e88: ; e9e88 - callchannel Music_RocketBattle_branch_e9f8f - loopchannel 3, Music_RocketBattle_branch_e9e88 +Music_RocketBattle_branch_e9edf: + callchannel Music_RocketBattle_branch_e9fe6 + loopchannel 3, Music_RocketBattle_branch_e9edf octave 2 note A_, 2 octave 3 @@ -735,14 +731,14 @@ Music_RocketBattle_branch_e9e88: ; e9e88 note G_, 2 note A_, 2 note A#, 2 - callchannel Music_RocketBattle_branch_e9f9c - callchannel Music_RocketBattle_branch_e9fb9 + callchannel Music_RocketBattle_branch_e9ff3 + callchannel Music_RocketBattle_branch_ea010 octave 3 note F_, 2 - callchannel Music_RocketBattle_branch_e9fc6 -Music_RocketBattle_branch_e9ea7: ; e9ea7 - callchannel Music_RocketBattle_branch_e9f9c - callchannel Music_RocketBattle_branch_e9fb9 + callchannel Music_RocketBattle_branch_ea01d +Music_RocketBattle_branch_e9efe: + callchannel Music_RocketBattle_branch_e9ff3 + callchannel Music_RocketBattle_branch_ea010 octave 3 note A#, 2 octave 2 @@ -759,7 +755,7 @@ Music_RocketBattle_branch_e9ea7: ; e9ea7 note F_, 2 note E_, 2 note D_, 2 - callchannel Music_RocketBattle_branch_e9fd3 + callchannel Music_RocketBattle_branch_ea02a octave 2 note A_, 2 octave 3 @@ -774,12 +770,12 @@ Music_RocketBattle_branch_e9ea7: ; e9ea7 note A_, 2 octave 3 note E_, 2 -Music_RocketBattle_branch_e9ece: ; e9ece +Music_RocketBattle_branch_e9f25: octave 2 note A#, 2 octave 3 note F_, 2 - loopchannel 5, Music_RocketBattle_branch_e9ece + loopchannel 5, Music_RocketBattle_branch_e9f25 note A#, 2 octave 2 note A#, 2 @@ -790,7 +786,7 @@ Music_RocketBattle_branch_e9ece: ; e9ece note A#, 2 octave 3 note A#, 2 - callchannel Music_RocketBattle_branch_e9fd3 + callchannel Music_RocketBattle_branch_ea02a octave 2 note A_, 2 octave 3 @@ -805,9 +801,9 @@ Music_RocketBattle_branch_e9ece: ; e9ece note F_, 2 note E_, 2 note D_, 2 - callchannel Music_RocketBattle_branch_e9fd3 - callchannel Music_RocketBattle_branch_e9fd3 -Music_RocketBattle_branch_e9ef7: ; e9ef7 + callchannel Music_RocketBattle_branch_ea02a + callchannel Music_RocketBattle_branch_ea02a +Music_RocketBattle_branch_e9f4e: octave 2 note A_, 2 octave 3 @@ -820,7 +816,7 @@ Music_RocketBattle_branch_e9ef7: ; e9ef7 note D_, 2 note G_, 2 note F_, 2 - loopchannel 7, Music_RocketBattle_branch_e9ef7 + loopchannel 7, Music_RocketBattle_branch_e9f4e octave 2 note A_, 2 octave 3 @@ -833,12 +829,12 @@ Music_RocketBattle_branch_e9ef7: ; e9ef7 note A_, 2 note G_, 2 note F_, 2 -Music_RocketBattle_branch_e9f13: ; e9f13 +Music_RocketBattle_branch_e9f6a: octave 2 note A#, 2 octave 3 note F_, 2 - loopchannel 4, Music_RocketBattle_branch_e9f13 + loopchannel 4, Music_RocketBattle_branch_e9f6a octave 2 note A#, 2 octave 3 @@ -849,12 +845,12 @@ Music_RocketBattle_branch_e9f13: ; e9f13 note D_, 2 note C#, 2 note D_, 2 -Music_RocketBattle_branch_e9f25: ; e9f25 +Music_RocketBattle_branch_e9f7c: octave 2 note A_, 2 octave 3 note E_, 2 - loopchannel 13, Music_RocketBattle_branch_e9f25 + loopchannel 13, Music_RocketBattle_branch_e9f7c octave 2 note A_, 2 octave 3 @@ -863,12 +859,12 @@ Music_RocketBattle_branch_e9f25: ; e9f25 note C_, 2 octave 2 note A#, 2 -Music_RocketBattle_branch_e9f35: ; e9f35 +Music_RocketBattle_branch_e9f8c: octave 2 note A_, 2 octave 3 note E_, 2 - loopchannel 4, Music_RocketBattle_branch_e9f35 + loopchannel 4, Music_RocketBattle_branch_e9f8c octave 2 note A_, 2 octave 4 @@ -879,20 +875,20 @@ Music_RocketBattle_branch_e9f35: ; e9f35 note A_, 2 note G_, 2 note A#, 2 -Music_RocketBattle_branch_e9f47: ; e9f47 +Music_RocketBattle_branch_e9f9e: octave 2 note A#, 2 octave 3 note F_, 2 - loopchannel 7, Music_RocketBattle_branch_e9f47 + loopchannel 7, Music_RocketBattle_branch_e9f9e note E_, 2 note F_, 2 -Music_RocketBattle_branch_e9f51: ; e9f51 +Music_RocketBattle_branch_e9fa8: octave 2 note A#, 2 octave 3 note F_, 2 - loopchannel 5, Music_RocketBattle_branch_e9f51 + loopchannel 5, Music_RocketBattle_branch_e9fa8 octave 3 note A#, 2 octave 4 @@ -901,13 +897,13 @@ Music_RocketBattle_branch_e9f51: ; e9f51 octave 3 note A#, 2 note G_, 2 - callchannel Music_RocketBattle_branch_e9fdc + callchannel Music_RocketBattle_branch_ea033 octave 3 note E_, 2 - callchannel Music_RocketBattle_branch_e9fb9 + callchannel Music_RocketBattle_branch_ea010 octave 3 note F_, 2 - callchannel Music_RocketBattle_branch_e9fdc + callchannel Music_RocketBattle_branch_ea033 octave 3 note A_, 2 octave 2 @@ -926,15 +922,14 @@ Music_RocketBattle_branch_e9f51: ; e9f51 note A_, 2 octave 3 note E_, 2 - callchannel Music_RocketBattle_branch_e9f9c - callchannel Music_RocketBattle_branch_e9fb9 + callchannel Music_RocketBattle_branch_e9ff3 + callchannel Music_RocketBattle_branch_ea010 octave 3 note F_, 2 - callchannel Music_RocketBattle_branch_e9fc6 - loopchannel 0, Music_RocketBattle_branch_e9ea7 -; e9f8f + callchannel Music_RocketBattle_branch_ea01d + loopchannel 0, Music_RocketBattle_branch_e9efe -Music_RocketBattle_branch_e9f8f: ; e9f8f +Music_RocketBattle_branch_e9fe6: octave 2 note A_, 2 octave 3 @@ -948,9 +943,8 @@ Music_RocketBattle_branch_e9f8f: ; e9f8f note G_, 2 note F_, 2 endchannel -; e9f9c -Music_RocketBattle_branch_e9f9c: ; e9f9c +Music_RocketBattle_branch_e9ff3: octave 2 note A_, 2 octave 3 @@ -980,9 +974,8 @@ Music_RocketBattle_branch_e9f9c: ; e9f9c note D#, 2 note D_, 2 endchannel -; e9fb9 -Music_RocketBattle_branch_e9fb9: ; e9fb9 +Music_RocketBattle_branch_ea010: octave 2 note A#, 2 octave 3 @@ -996,9 +989,8 @@ Music_RocketBattle_branch_e9fb9: ; e9fb9 octave 2 note A#, 2 endchannel -; e9fc6 -Music_RocketBattle_branch_e9fc6: ; e9fc6 +Music_RocketBattle_branch_ea01d: octave 2 note A#, 2 octave 3 @@ -1012,18 +1004,16 @@ Music_RocketBattle_branch_e9fc6: ; e9fc6 octave 3 note F_, 2 endchannel -; e9fd3 -Music_RocketBattle_branch_e9fd3: ; e9fd3 +Music_RocketBattle_branch_ea02a: octave 2 note A_, 2 octave 3 note E_, 2 - loopchannel 4, Music_RocketBattle_branch_e9fd3 + loopchannel 4, Music_RocketBattle_branch_ea02a endchannel -; e9fdc -Music_RocketBattle_branch_e9fdc: ; e9fdc +Music_RocketBattle_branch_ea033: octave 2 note A_, 2 octave 3 @@ -1037,6 +1027,3 @@ Music_RocketBattle_branch_e9fdc: ; e9fdc octave 2 note A_, 2 endchannel -; e9fe9 - - diff --git a/audio/music/rockethideout.asm b/audio/music/rockethideout.asm index 90f1fa82..6c3a116a 100644 --- a/audio/music/rockethideout.asm +++ b/audio/music/rockethideout.asm @@ -1,11 +1,10 @@ -Music_RocketHideout: ; eeb75 - dbw $c0, Music_RocketHideout_Ch1 - dbw $01, Music_RocketHideout_Ch2 - dbw $02, Music_RocketHideout_Ch3 - dbw $03, Music_RocketHideout_Ch4 -; eeb81 +Music_RocketHideout: + musicheader 4, 1, Music_RocketHideout_Ch1 + musicheader 1, 2, Music_RocketHideout_Ch2 + musicheader 1, 3, Music_RocketHideout_Ch3 + musicheader 1, 4, Music_RocketHideout_Ch4 -Music_RocketHideout_Ch1: ; eeb81 +Music_RocketHideout_Ch1: tempo 144 volume $77 dutycycle $3 @@ -13,10 +12,10 @@ Music_RocketHideout_Ch1: ; eeb81 vibrato $10, $44 notetype $c, $b3 stereopanning $f0 -Music_RocketHideout_branch_eeb93: ; eeb93 +Music_RocketHideout_branch_eeb93: note __, 16 loopchannel 4, Music_RocketHideout_branch_eeb93 -Music_RocketHideout_branch_eeb98: ; eeb98 +Music_RocketHideout_branch_eeb98: octave 2 note D#, 2 note __, 2 @@ -114,19 +113,18 @@ Music_RocketHideout_branch_eeb98: ; eeb98 note __, 16 note A_, 16 intensity $b3 -Music_RocketHideout_branch_eebfe: ; eebfe +Music_RocketHideout_branch_eebfe: note __, 16 loopchannel 4, Music_RocketHideout_branch_eebfe loopchannel 0, Music_RocketHideout_branch_eeb93 -; eec07 -Music_RocketHideout_Ch2: ; eec07 +Music_RocketHideout_Ch2: dutycycle $3 tone $0002 vibrato $0, $f0 notetype $c, $c4 stereopanning $f -Music_RocketHideout_branch_eec14: ; eec14 +Music_RocketHideout_branch_eec14: octave 2 note D#, 2 note __, 2 @@ -221,11 +219,10 @@ Music_RocketHideout_branch_eec14: ; eec14 note G_, 2 note __, 8 loopchannel 0, Music_RocketHideout_branch_eec14 -; eec79 -Music_RocketHideout_Ch3: ; eec79 +Music_RocketHideout_Ch3: notetype $c, $19 -Music_RocketHideout_branch_eec7c: ; eec7c +Music_RocketHideout_branch_eec7c: octave 2 note D#, 2 note __, 2 @@ -237,7 +234,7 @@ Music_RocketHideout_branch_eec7c: ; eec7c note A_, 2 note __, 8 loopchannel 6, Music_RocketHideout_branch_eec7c -Music_RocketHideout_branch_eec8a: ; eec8a +Music_RocketHideout_branch_eec8a: note F_, 2 note __, 2 octave 3 @@ -252,7 +249,7 @@ Music_RocketHideout_branch_eec8a: ; eec8a note B_, 2 note __, 8 loopchannel 2, Music_RocketHideout_branch_eec8a -Music_RocketHideout_branch_eec9b: ; eec9b +Music_RocketHideout_branch_eec9b: note C#, 2 note __, 2 note G#, 4 @@ -261,7 +258,7 @@ Music_RocketHideout_branch_eec9b: ; eec9b octave 3 note C#, 16 loopchannel 2, Music_RocketHideout_branch_eec9b -Music_RocketHideout_branch_eeca6: ; eeca6 +Music_RocketHideout_branch_eeca6: octave 2 note C#, 2 note __, 2 @@ -274,9 +271,8 @@ Music_RocketHideout_branch_eeca6: ; eeca6 note __, 8 loopchannel 2, Music_RocketHideout_branch_eeca6 loopchannel 0, Music_RocketHideout_branch_eec7c -; eecb8 -Music_RocketHideout_Ch4: ; eecb8 +Music_RocketHideout_Ch4: togglenoise $0 notetype $c stereopanning $f @@ -287,7 +283,7 @@ Music_RocketHideout_Ch4: ; eecb8 note D#, 1 note D#, 1 callchannel Music_RocketHideout_branch_eecdb -Music_RocketHideout_branch_eecc7: ; eecc7 +Music_RocketHideout_branch_eecc7: callchannel Music_RocketHideout_branch_eecdb note E_, 4 callchannel Music_RocketHideout_branch_eecdb @@ -297,9 +293,8 @@ Music_RocketHideout_branch_eecc7: ; eecc7 callchannel Music_RocketHideout_branch_eecdb note F#, 4 loopchannel 0, Music_RocketHideout_branch_eecc7 -; eecdb -Music_RocketHideout_branch_eecdb: ; eecdb +Music_RocketHideout_branch_eecdb: stereopanning $f0 note D#, 1 note D#, 1 @@ -310,6 +305,3 @@ Music_RocketHideout_branch_eecdb: ; eecdb stereopanning $f0 note A_, 4 endchannel -; eece8 - - diff --git a/audio/music/rockettheme.asm b/audio/music/rockettheme.asm index 3f53452e..6f13d8b6 100644 --- a/audio/music/rockettheme.asm +++ b/audio/music/rockettheme.asm @@ -1,11 +1,10 @@ -Music_RocketTheme: ; f766d - dbw $c0, Music_RocketTheme_Ch1 - dbw $01, Music_RocketTheme_Ch2 - dbw $02, Music_RocketTheme_Ch3 - dbw $03, Music_RocketTheme_Ch4 -; f7679 +Music_RocketTheme: + musicheader 4, 1, Music_RocketTheme_Ch1 + musicheader 1, 2, Music_RocketTheme_Ch2 + musicheader 1, 3, Music_RocketTheme_Ch3 + musicheader 1, 4, Music_RocketTheme_Ch4 -Music_RocketTheme_Ch1: ; f7679 +Music_RocketTheme_Ch1: tempo 128 volume $77 dutycycle $3 @@ -15,7 +14,7 @@ Music_RocketTheme_Ch1: ; f7679 octave 4 note C_, 1 note D_, 1 -Music_RocketTheme_branch_f768b: ; f768b +Music_RocketTheme_branch_f768b: dutycycle $3 notetype $c, $a8 callchannel Music_RocketTheme_branch_f74e6 @@ -87,7 +86,7 @@ Music_RocketTheme_branch_f768b: ; f768b note E_, 2 note D#, 2 note D_, 2 -Music_RocketTheme_branch_f76ef: ; f76ef +Music_RocketTheme_branch_f76ef: note __, 4 note F_, 2 note __, 14 @@ -103,19 +102,19 @@ Music_RocketTheme_branch_f76ef: ; f76ef note __, 2 note D#, 2 note C_, 2 -Music_RocketTheme_branch_f7701: ; f7701 +Music_RocketTheme_branch_f7701: note F#, 2 note A_, 2 loopchannel 4, Music_RocketTheme_branch_f7701 -Music_RocketTheme_branch_f7707: ; f7707 +Music_RocketTheme_branch_f7707: note G_, 2 note A#, 2 loopchannel 4, Music_RocketTheme_branch_f7707 -Music_RocketTheme_branch_f770d: ; f770d +Music_RocketTheme_branch_f770d: note G#, 2 note B_, 2 loopchannel 4, Music_RocketTheme_branch_f770d -Music_RocketTheme_branch_f7713: ; f7713 +Music_RocketTheme_branch_f7713: octave 3 note A_, 2 octave 4 @@ -128,9 +127,8 @@ Music_RocketTheme_branch_f7713: ; f7713 note C_, 1 note D_, 1 loopchannel 0, Music_RocketTheme_branch_f768b -; f7727 -Music_RocketTheme_branch_f7727: ; f7727 +Music_RocketTheme_branch_f7727: note __, 7 note B_, 1 octave 4 @@ -154,9 +152,8 @@ Music_RocketTheme_branch_f7727: ; f7727 note A#, 2 note __, 10 endchannel -; f773e -Music_RocketTheme_Ch2: ; f773e +Music_RocketTheme_Ch2: stereopanning $ff vibrato $4, $64 dutycycle $3 @@ -164,7 +161,7 @@ Music_RocketTheme_Ch2: ; f773e octave 5 note C_, 1 note D_, 1 -Music_RocketTheme_branch_f774b: ; f774b +Music_RocketTheme_branch_f774b: notetype $c, $b7 callchannel Music_RocketTheme_branch_f7547 intensity $b7 @@ -291,9 +288,8 @@ Music_RocketTheme_branch_f774b: ; f774b note C_, 2 note D_, 2 loopchannel 0, Music_RocketTheme_branch_f774b -; f7800 -Music_RocketTheme_branch_f7800: ; f7800 +Music_RocketTheme_branch_f7800: notetype $6, $b7 note __, 7 octave 4 @@ -320,9 +316,8 @@ Music_RocketTheme_branch_f7800: ; f7800 note D#, 2 note __, 2 endchannel -; f781c -Music_RocketTheme_branch_f781c: ; f781c +Music_RocketTheme_branch_f781c: octave 3 note B_, 1 octave 4 @@ -333,14 +328,13 @@ Music_RocketTheme_branch_f781c: ; f781c note F_, 8 note C_, 4 endchannel -; f7826 -Music_RocketTheme_Ch3: ; f7826 +Music_RocketTheme_Ch3: stereopanning $f0 vibrato $4, $22 notetype $c, $14 note __, 2 -Music_RocketTheme_branch_f782f: ; f782f +Music_RocketTheme_branch_f782f: notetype $c, $14 callchannel Music_RocketTheme_branch_f75bf callchannel Music_RocketTheme_branch_f75fe @@ -447,13 +441,12 @@ Music_RocketTheme_branch_f782f: ; f782f note G#, 1 note __, 1 loopchannel 0, Music_RocketTheme_branch_f782f -; f78be -Music_RocketTheme_Ch4: ; f78be +Music_RocketTheme_Ch4: togglenoise $3 notetype $c note __, 2 -Music_RocketTheme_branch_f78c3: ; f78c3 +Music_RocketTheme_branch_f78c3: callchannel Music_RocketTheme_branch_f765c callchannel Music_RocketTheme_branch_f7664 callchannel Music_RocketTheme_branch_f7664 @@ -463,7 +456,7 @@ Music_RocketTheme_branch_f78c3: ; f78c3 callchannel Music_RocketTheme_branch_f7664 callchannel Music_RocketTheme_branch_f7664 callchannel Music_RocketTheme_branch_f765c -Music_RocketTheme_branch_f78de: ; f78de +Music_RocketTheme_branch_f78de: note A#, 2 note F#, 2 note D_, 2 @@ -479,6 +472,3 @@ Music_RocketTheme_branch_f78de: ; f78de callchannel Music_RocketTheme_branch_f765c callchannel Music_RocketTheme_branch_f765c loopchannel 0, Music_RocketTheme_branch_f78c3 -; f78fd - - diff --git a/audio/music/route1.asm b/audio/music/route1.asm index ef6de9f6..8a537b9f 100644 --- a/audio/music/route1.asm +++ b/audio/music/route1.asm @@ -1,14 +1,11 @@ -Music_Route1: ; ec000 - dbw $80, Music_Route1_Ch1 - dbw $01, Music_Route1_Ch2 - dbw $02, Music_Route1_Ch3 -; ec009 +Music_Route1: + musicheader 3, 1, Music_Route1_Ch1 + musicheader 1, 2, Music_Route1_Ch2 + musicheader 1, 3, Music_Route1_Ch3 + db $3 -INCBIN "baserom.gbc", $ec009, $ec00a - $ec009 - - -Music_Route1_Ch1: ; ec00a +Music_Route1_Ch1: stereopanning $f tempo 184 volume $77 @@ -62,7 +59,7 @@ Music_Route1_Ch1: ; ec00a note D_, 2 intensity $83 note __, 2 -Music_Route1_branch_ec04a: ; ec04a +Music_Route1_branch_ec04a: intensity $83 note __, 2 octave 4 @@ -205,9 +202,8 @@ Music_Route1_branch_ec04a: ; ec04a note D_, 2 note __, 2 loopchannel 0, Music_Route1_branch_ec04a -; ec0eb -Music_Route1_Ch2: ; ec0eb +Music_Route1_Ch2: stereopanning $f0 vibrato $12, $22 dutycycle $2 @@ -234,7 +230,7 @@ Music_Route1_Ch2: ; ec0eb note D_, 1 note E_, 1 dutycycle $2 -Music_Route1_branch_ec112: ; ec112 +Music_Route1_branch_ec112: intensity $82 callchannel Music_Route1_branch_ec188 intensity $81 @@ -325,9 +321,8 @@ Music_Route1_branch_ec112: ; ec112 note D_, 1 note E_, 1 loopchannel 0, Music_Route1_branch_ec112 -; ec188 -Music_Route1_branch_ec188: ; ec188 +Music_Route1_branch_ec188: note F#, 2 note F#, 2 note F#, 2 @@ -344,9 +339,8 @@ Music_Route1_branch_ec188: ; ec188 note F#, 1 note E_, 2 endchannel -; ec198 -Music_Route1_branch_ec198: ; ec198 +Music_Route1_branch_ec198: note A_, 2 note A_, 2 note F#, 2 @@ -365,9 +359,8 @@ Music_Route1_branch_ec198: ; ec198 note F#, 1 note E_, 2 endchannel -; ec1aa -Music_Route1_branch_ec1aa: ; ec1aa +Music_Route1_branch_ec1aa: note A_, 2 note A_, 2 note F#, 2 @@ -382,9 +375,8 @@ Music_Route1_branch_ec1aa: ; ec1aa octave 5 note D_, 2 endchannel -; ec1b8 -Music_Route1_Ch3: ; ec1b8 +Music_Route1_Ch3: stereopanning $ff vibrato $10, $23 notetype $c, $25 @@ -464,7 +456,7 @@ Music_Route1_Ch3: ; ec1b8 note __, 1 note A_, 1 note __, 3 -Music_Route1_branch_ec20c: ; ec20c +Music_Route1_branch_ec20c: octave 3 note D_, 1 note __, 1 @@ -652,6 +644,3 @@ Music_Route1_branch_ec20c: ; ec20c note A_, 1 note __, 3 loopchannel 0, Music_Route1_branch_ec20c -; ec2ca - - diff --git a/audio/music/route12.asm b/audio/music/route12.asm index 0a35ab6b..d94d88c2 100644 --- a/audio/music/route12.asm +++ b/audio/music/route12.asm @@ -1,11 +1,10 @@ -Music_Route12: ; ec506 - dbw $c0, Music_Route12_Ch1 - dbw $01, Music_Route12_Ch2 - dbw $02, Music_Route12_Ch3 - dbw $03, Music_Route12_Ch4 -; ec512 +Music_Route12: + musicheader 4, 1, Music_Route12_Ch1 + musicheader 1, 2, Music_Route12_Ch2 + musicheader 1, 3, Music_Route12_Ch3 + musicheader 1, 4, Music_Route12_Ch4 -Music_Route12_Ch1: ; ec512 +Music_Route12_Ch1: tempo 148 volume $77 vibrato $12, $34 @@ -29,7 +28,7 @@ Music_Route12_Ch1: ; ec512 note E_, 1 intensity $97 note D#, 12 -Music_Route12_branch_ec535: ; ec535 +Music_Route12_branch_ec535: dutycycle $2 intensity $96 callchannel Music_Route12_branch_ec5b1 @@ -115,7 +114,7 @@ Music_Route12_branch_ec535: ; ec535 note F#, 8 note D#, 4 note F#, 4 -Music_Route12_branch_ec59b: ; ec59b +Music_Route12_branch_ec59b: intensity $97 note G#, 1 note A_, 1 @@ -131,9 +130,8 @@ Music_Route12_branch_ec59b: ; ec59b note G#, 4 loopchannel 2, Music_Route12_branch_ec59b loopchannel 0, Music_Route12_branch_ec535 -; ec5b1 -Music_Route12_branch_ec5b1: ; ec5b1 +Music_Route12_branch_ec5b1: octave 3 note G#, 1 note __, 1 @@ -148,9 +146,8 @@ Music_Route12_branch_ec5b1: ; ec5b1 note E_, 4 note G#, 4 endchannel -; ec5bf -Music_Route12_branch_ec5bf: ; ec5bf +Music_Route12_branch_ec5bf: note A_, 1 note __, 1 note F#, 1 @@ -162,9 +159,8 @@ Music_Route12_branch_ec5bf: ; ec5bf note A_, 4 note F#, 4 endchannel -; ec5ca -Music_Route12_Ch2: ; ec5ca +Music_Route12_Ch2: dutycycle $3 vibrato $12, $34 notetype $c, $b8 @@ -186,7 +182,7 @@ Music_Route12_Ch2: ; ec5ca note B_, 1 octave 4 note D#, 1 -Music_Route12_branch_ec5e5: ; ec5e5 +Music_Route12_branch_ec5e5: dutycycle $3 intensity $b7 callchannel Music_Route12_branch_ec647 @@ -264,9 +260,8 @@ Music_Route12_branch_ec5e5: ; ec5e5 intensity $a4 note E_, 6 loopchannel 0, Music_Route12_branch_ec5e5 -; ec647 -Music_Route12_branch_ec647: ; ec647 +Music_Route12_branch_ec647: octave 4 note E_, 6 intensity $b1 @@ -281,9 +276,8 @@ Music_Route12_branch_ec647: ; ec647 note G#, 4 note F#, 4 endchannel -; ec657 -Music_Route12_Ch3: ; ec657 +Music_Route12_Ch3: vibrato $12, $54 notetype $c, $16 octave 3 @@ -301,7 +295,7 @@ Music_Route12_Ch3: ; ec657 note F#, 2 note __, 2 note D#, 4 -Music_Route12_branch_ec66c: ; ec66c +Music_Route12_branch_ec66c: callchannel Music_Route12_branch_ec6b4 note F#, 1 note __, 1 @@ -353,7 +347,7 @@ Music_Route12_branch_ec66c: ; ec66c note E_, 8 note F#, 4 note D#, 4 -Music_Route12_branch_ec6a3: ; ec6a3 +Music_Route12_branch_ec6a3: note E_, 1 note __, 1 note E_, 1 @@ -365,9 +359,8 @@ Music_Route12_branch_ec6a3: ; ec6a3 note __, 1 loopchannel 2, Music_Route12_branch_ec6a3 loopchannel 0, Music_Route12_branch_ec66c -; ec6b4 -Music_Route12_branch_ec6b4: ; ec6b4 +Music_Route12_branch_ec6b4: octave 3 note E_, 1 note __, 1 @@ -394,9 +387,8 @@ Music_Route12_branch_ec6b4: ; ec6b4 note G#, 4 note E_, 4 endchannel -; ec6ce -Music_Route12_Ch4: ; ec6ce +Music_Route12_Ch4: togglenoise $4 stereopanning $f0 notetype $c @@ -410,7 +402,7 @@ Music_Route12_Ch4: ; ec6ce note D_, 4 notetype $6 callchannel Music_Route12_branch_ec717 -Music_Route12_branch_ec6e1: ; ec6e1 +Music_Route12_branch_ec6e1: note D_, 4 note D_, 8 note C#, 2 @@ -418,7 +410,7 @@ Music_Route12_branch_ec6e1: ; ec6e1 note D_, 8 callchannel Music_Route12_branch_ec717 loopchannel 8, Music_Route12_branch_ec6e1 -Music_Route12_branch_ec6ed: ; ec6ed +Music_Route12_branch_ec6ed: notetype $c note B_, 10 note D_, 1 @@ -436,7 +428,7 @@ Music_Route12_branch_ec6ed: ; ec6ed callchannel Music_Route12_branch_ec717 callchannel Music_Route12_branch_ec717 note B_, 16 -Music_Route12_branch_ec707: ; ec707 +Music_Route12_branch_ec707: note D_, 4 note D_, 8 note C#, 2 @@ -445,9 +437,8 @@ Music_Route12_branch_ec707: ; ec707 callchannel Music_Route12_branch_ec717 loopchannel 2, Music_Route12_branch_ec707 loopchannel 0, Music_Route12_branch_ec6e1 -; ec717 -Music_Route12_branch_ec717: ; ec717 +Music_Route12_branch_ec717: note C#, 1 note C#, 1 note C#, 1 @@ -457,6 +448,3 @@ Music_Route12_branch_ec717: ; ec717 note C#, 1 note C#, 1 endchannel -; ec720 - - diff --git a/audio/music/route2.asm b/audio/music/route2.asm index bb0ad13b..b5ff1feb 100644 --- a/audio/music/route2.asm +++ b/audio/music/route2.asm @@ -1,11 +1,10 @@ -Music_Route2: ; ed8dd - dbw $c0, Music_Route2_Ch1 - dbw $01, Music_Route2_Ch2 - dbw $02, Music_Route2_Ch3 - dbw $03, Music_Route2_Ch4 -; ed8e9 +Music_Route2: + musicheader 4, 1, Music_Route2_Ch1 + musicheader 1, 2, Music_Route2_Ch2 + musicheader 1, 3, Music_Route2_Ch3 + musicheader 1, 4, Music_Route2_Ch4 -Music_Route2_Ch1: ; ed8e9 +Music_Route2_Ch1: tempo 151 volume $77 stereopanning $f @@ -14,7 +13,7 @@ Music_Route2_Ch1: ; ed8e9 note __, 16 note __, 16 callchannel Music_Route2_branch_ed931 -Music_Route2_branch_ed8fb: ; ed8fb +Music_Route2_branch_ed8fb: intensity $b1 octave 3 note B_, 4 @@ -55,9 +54,8 @@ Music_Route2_branch_ed8fb: ; ed8fb note B_, 2 note G_, 2 loopchannel 0, Music_Route2_branch_ed8fb -; ed931 -Music_Route2_branch_ed931: ; ed931 +Music_Route2_branch_ed931: octave 4 note C_, 4 note C_, 4 @@ -71,9 +69,8 @@ Music_Route2_branch_ed931: ; ed931 note B_, 4 intensity $b1 endchannel -; ed940 -Music_Route2_branch_ed940: ; ed940 +Music_Route2_branch_ed940: octave 2 note B_, 2 octave 3 @@ -121,9 +118,8 @@ Music_Route2_branch_ed940: ; ed940 note G_, 2 intensity $b1 endchannel -; ed971 -Music_Route2_branch_ed971: ; ed971 +Music_Route2_branch_ed971: note B_, 2 note G_, 2 note B_, 2 @@ -161,14 +157,13 @@ Music_Route2_branch_ed971: ; ed971 octave 3 note A_, 2 endchannel -; ed996 -Music_Route2_Ch2: ; ed996 +Music_Route2_Ch2: stereopanning $ff vibrato $8, $24 notetype $c, $b2 callchannel Music_Route2_branch_ed9ba -Music_Route2_branch_ed9a1: ; ed9a1 +Music_Route2_branch_ed9a1: intensity $b2 callchannel Music_Route2_branch_ed9ba dutycycle $2 @@ -178,9 +173,8 @@ Music_Route2_branch_ed9a1: ; ed9a1 callchannel Music_Route2_branch_eda02 callchannel Music_Route2_branch_eda02 loopchannel 0, Music_Route2_branch_ed9a1 -; ed9ba -Music_Route2_branch_ed9ba: ; ed9ba +Music_Route2_branch_ed9ba: octave 4 note E_, 4 note E_, 4 @@ -213,9 +207,8 @@ Music_Route2_branch_ed9ba: ; ed9ba note G_, 4 intensity $b2 endchannel -; ed9dc -Music_Route2_branch_ed9dc: ; ed9dc +Music_Route2_branch_ed9dc: octave 2 note C_, 4 note __, 2 @@ -254,9 +247,8 @@ Music_Route2_branch_ed9dc: ; ed9dc note F_, 4 note D_, 4 endchannel -; eda02 -Music_Route2_branch_eda02: ; eda02 +Music_Route2_branch_eda02: octave 2 note E_, 4 note __, 2 @@ -299,9 +291,8 @@ Music_Route2_branch_eda02: ; eda02 note G_, 1 note __, 1 endchannel -; eda2c -Music_Route2_Ch3: ; eda2c +Music_Route2_Ch3: stereopanning $f0 vibrato $16, $15 notetype $c, $14 @@ -326,7 +317,7 @@ Music_Route2_Ch3: ; eda2c callchannel Music_Route2_branch_eda9e octave 3 note D_, 4 -Music_Route2_branch_eda4b: ; eda4b +Music_Route2_branch_eda4b: notetype $c, $15 octave 3 note C_, 4 @@ -391,9 +382,8 @@ Music_Route2_branch_eda4b: ; eda4b note G_, 16 note G_, 15 loopchannel 0, Music_Route2_branch_eda4b -; eda9e -Music_Route2_branch_eda9e: ; eda9e +Music_Route2_branch_eda9e: octave 3 note F_, 4 note __, 2 @@ -411,9 +401,8 @@ Music_Route2_branch_eda9e: ; eda9e note __, 1 note F_, 4 endchannel -; edaaf -Music_Route2_branch_edaaf: ; edaaf +Music_Route2_branch_edaaf: octave 6 note E_, 10 note D_, 2 @@ -440,9 +429,8 @@ Music_Route2_branch_edaaf: ; edaaf note C_, 4 note D_, 4 endchannel -; edacb -Music_Route2_branch_edacb: ; edacb +Music_Route2_branch_edacb: octave 5 note B_, 16 note __, 4 @@ -460,12 +448,11 @@ Music_Route2_branch_edacb: ; edacb note E_, 4 note F_, 16 endchannel -; edadc -Music_Route2_Ch4: ; edadc +Music_Route2_Ch4: togglenoise $5 notetype $c -Music_Route2_branch_edae0: ; edae0 +Music_Route2_branch_edae0: note A_, 4 note A_, 4 note A_, 2 @@ -478,7 +465,7 @@ Music_Route2_branch_edae0: ; edae0 note A_, 2 note A_, 2 note D#, 4 -Music_Route2_branch_edaef: ; edaef +Music_Route2_branch_edaef: note A_, 4 note A_, 4 note A_, 2 @@ -486,7 +473,7 @@ Music_Route2_branch_edaef: ; edaef note B_, 2 note A_, 2 loopchannel 4, Music_Route2_branch_edaef -Music_Route2_branch_edaf9: ; edaf9 +Music_Route2_branch_edaf9: note B_, 4 note A_, 2 note B_, 2 @@ -500,7 +487,7 @@ Music_Route2_branch_edaf9: ; edaf9 note A_, 2 note A_, 2 note D#, 4 -Music_Route2_branch_edb09: ; edb09 +Music_Route2_branch_edb09: note B_, 4 note C_, 4 note B_, 2 @@ -512,7 +499,7 @@ Music_Route2_branch_edb09: ; edb09 note C#, 2 note C_, 2 note C#, 4 -Music_Route2_branch_edb17: ; edb17 +Music_Route2_branch_edb17: note B_, 4 note C_, 4 note B_, 2 @@ -525,6 +512,3 @@ Music_Route2_branch_edb17: ; edb17 note D_, 2 note D#, 4 loopchannel 0, Music_Route2_branch_edaef -; edb29 - - diff --git a/audio/music/route26.asm b/audio/music/route26.asm index 577f7807..fb1a7a8e 100644 --- a/audio/music/route26.asm +++ b/audio/music/route26.asm @@ -1,11 +1,10 @@ -Music_Route26: ; eefb2 - dbw $c0, Music_Route26_Ch1 - dbw $01, Music_Route26_Ch2 - dbw $02, Music_Route26_Ch3 - dbw $03, Music_Route26_Ch4 -; eefbe +Music_Route26: + musicheader 4, 1, Music_Route26_Ch1 + musicheader 1, 2, Music_Route26_Ch2 + musicheader 1, 3, Music_Route26_Ch3 + musicheader 1, 4, Music_Route26_Ch4 -Music_Route26_Ch1: ; eefbe +Music_Route26_Ch1: stereopanning $f vibrato $12, $23 tempo 151 @@ -27,7 +26,7 @@ Music_Route26_Ch1: ; eefbe octave 3 note G#, 2 note F#, 2 -Music_Route26_branch_eefe0: ; eefe0 +Music_Route26_branch_eefe0: dutycycle $0 notetype $c, $a7 octave 3 @@ -194,9 +193,8 @@ Music_Route26_branch_eefe0: ; eefe0 note B_, 4 note __, 4 loopchannel 0, Music_Route26_branch_eefe0 -; ef09d -Music_Route26_Ch2: ; ef09d +Music_Route26_Ch2: stereopanning $f0 vibrato $14, $23 dutycycle $2 @@ -234,7 +232,7 @@ Music_Route26_Ch2: ; ef09d octave 2 note C_, 2 note D#, 2 -Music_Route26_branch_ef0ce: ; ef0ce +Music_Route26_branch_ef0ce: dutycycle $2 notetype $c, $c2 octave 2 @@ -283,7 +281,7 @@ Music_Route26_branch_ef0ce: ; ef0ce note D#, 4 note D#, 4 notetype $8, $c2 -Music_Route26_branch_ef10e: ; ef10e +Music_Route26_branch_ef10e: octave 2 note G#, 2 note G#, 2 @@ -339,9 +337,8 @@ Music_Route26_branch_ef10e: ; ef10e note C_, 1 note D#, 1 loopchannel 0, Music_Route26_branch_ef0ce -; ef14e -Music_Route26_branch_ef14e: ; ef14e +Music_Route26_branch_ef14e: note A#, 6 note A#, 1 octave 2 @@ -354,9 +351,8 @@ Music_Route26_branch_ef14e: ; ef14e octave 1 note A#, 2 endchannel -; ef15a -Music_Route26_Ch3: ; ef15a +Music_Route26_Ch3: stereopanning $ff vibrato $12, $23 notetype $c, $14 @@ -392,7 +388,7 @@ Music_Route26_Ch3: ; ef15a note F#, 2 note F_, 2 note D#, 2 -Music_Route26_branch_ef18a: ; ef18a +Music_Route26_branch_ef18a: vibrato $18, $23 notetype $c, $14 octave 5 @@ -538,9 +534,8 @@ Music_Route26_branch_ef18a: ; ef18a octave 3 note C_, 1 loopchannel 0, Music_Route26_branch_ef18a -; ef22f -Music_Route26_branch_ef22f: ; ef22f +Music_Route26_branch_ef22f: octave 5 note F_, 8 note C#, 2 @@ -550,18 +545,17 @@ Music_Route26_branch_ef22f: ; ef22f note C#, 4 note D#, 4 endchannel -; ef238 -Music_Route26_Ch4: ; ef238 +Music_Route26_Ch4: togglenoise $4 notetype $c -Music_Route26_branch_ef23c: ; ef23c +Music_Route26_branch_ef23c: note B_, 6 note D_, 1 note D_, 1 loopchannel 3, Music_Route26_branch_ef23c callchannel Music_Route26_branch_ef2b0 -Music_Route26_branch_ef246: ; ef246 +Music_Route26_branch_ef246: notetype $6 callchannel Music_Route26_branch_ef29a callchannel Music_Route26_branch_ef29a @@ -580,7 +574,7 @@ Music_Route26_branch_ef246: ; ef246 callchannel Music_Route26_branch_ef29a callchannel Music_Route26_branch_ef29a notetype $8 -Music_Route26_branch_ef266: ; ef266 +Music_Route26_branch_ef266: note D_, 2 note D_, 2 note D_, 2 @@ -591,7 +585,7 @@ Music_Route26_branch_ef266: ; ef266 callchannel Music_Route26_branch_ef2a8 callchannel Music_Route26_branch_ef29a callchannel Music_Route26_branch_ef2a8 -Music_Route26_branch_ef27c: ; ef27c +Music_Route26_branch_ef27c: notetype $6 note D_, 1 note D_, 1 @@ -611,9 +605,8 @@ Music_Route26_branch_ef27c: ; ef27c note B_, 16 callchannel Music_Route26_branch_ef2b0 loopchannel 0, Music_Route26_branch_ef246 -; ef29a -Music_Route26_branch_ef29a: ; ef29a +Music_Route26_branch_ef29a: note E_, 12 note D_, 2 note D_, 2 @@ -628,9 +621,8 @@ Music_Route26_branch_ef29a: ; ef29a note C#, 1 note C#, 1 endchannel -; ef2a8 -Music_Route26_branch_ef2a8: ; ef2a8 +Music_Route26_branch_ef2a8: note E_, 12 note D_, 2 note D_, 2 @@ -639,9 +631,8 @@ Music_Route26_branch_ef2a8: ; ef2a8 note E_, 4 note D_, 4 endchannel -; ef2b0 -Music_Route26_branch_ef2b0: ; ef2b0 +Music_Route26_branch_ef2b0: notetype $6 note C#, 1 note C#, 1 @@ -672,6 +663,3 @@ Music_Route26_branch_ef2b0: ; ef2b0 note D_, 2 note E_, 2 endchannel -; ef2d0 - - diff --git a/audio/music/route29.asm b/audio/music/route29.asm index 3703e62e..d7cecf4f 100644 --- a/audio/music/route29.asm +++ b/audio/music/route29.asm @@ -1,11 +1,10 @@ -Music_Route29: ; f0386 - dbw $c0, Music_Route29_Ch1 - dbw $01, Music_Route29_Ch2 - dbw $02, Music_Route29_Ch3 - dbw $03, Music_Route29_Ch4 -; f0392 +Music_Route29: + musicheader 4, 1, Music_Route29_Ch1 + musicheader 1, 2, Music_Route29_Ch2 + musicheader 1, 3, Music_Route29_Ch3 + musicheader 1, 4, Music_Route29_Ch4 -Music_Route29_Ch1: ; f0392 +Music_Route29_Ch1: tempo 146 volume $77 dutycycle $3 @@ -14,7 +13,7 @@ Music_Route29_Ch1: ; f0392 stereopanning $f notetype $c, $b2 note __, 2 -Music_Route29_branch_f03a5: ; f03a5 +Music_Route29_branch_f03a5: note __, 2 octave 4 note C_, 2 @@ -168,16 +167,15 @@ Music_Route29_branch_f03a5: ; f03a5 note G_, 2 note G_, 4 loopchannel 0, Music_Route29_branch_f03a5 -; f044d -Music_Route29_Ch2: ; f044d +Music_Route29_Ch2: dutycycle $3 vibrato $12, $36 notetype $c, $c2 octave 4 note C_, 1 note D_, 1 -Music_Route29_branch_f0458: ; f0458 +Music_Route29_branch_f0458: callchannel Music_Route29_branch_f04de note F_, 1 note E_, 1 @@ -301,9 +299,8 @@ Music_Route29_branch_f0458: ; f0458 note C_, 1 note D_, 1 loopchannel 0, Music_Route29_branch_f0458 -; f04de -Music_Route29_branch_f04de: ; f04de +Music_Route29_branch_f04de: note E_, 2 note E_, 2 note G_, 2 @@ -333,14 +330,13 @@ Music_Route29_branch_f04de: ; f04de note E_, 2 note C_, 2 endchannel -; f04fb -Music_Route29_Ch3: ; f04fb +Music_Route29_Ch3: stereopanning $f0 notetype $c, $25 vibrato $9, $27 note __, 2 -Music_Route29_branch_f0504: ; f0504 +Music_Route29_branch_f0504: note __, 2 octave 3 note G_, 1 @@ -503,14 +499,13 @@ Music_Route29_branch_f0504: ; f0504 note C_, 1 note __, 3 loopchannel 0, Music_Route29_branch_f0504 -; f05a9 -Music_Route29_Ch4: ; f05a9 +Music_Route29_Ch4: stereopanning $f togglenoise $0 notetype $c note __, 2 -Music_Route29_branch_f05b0: ; f05b0 +Music_Route29_branch_f05b0: note __, 2 note F_, 2 note F_, 6 @@ -523,6 +518,3 @@ Music_Route29_branch_f05b0: ; f05b0 note F_, 2 note F_, 4 loopchannel 0, Music_Route29_branch_f05b0 -; f05bf - - diff --git a/audio/music/route3.asm b/audio/music/route3.asm index 5f7e66d9..f36dbd53 100644 --- a/audio/music/route3.asm +++ b/audio/music/route3.asm @@ -1,11 +1,10 @@ -Music_Route3: ; ec2ca - dbw $c0, Music_Route3_Ch1 - dbw $01, Music_Route3_Ch2 - dbw $02, Music_Route3_Ch3 - dbw $03, Music_Route3_Ch4 -; ec2d6 +Music_Route3: + musicheader 4, 1, Music_Route3_Ch1 + musicheader 1, 2, Music_Route3_Ch2 + musicheader 1, 3, Music_Route3_Ch3 + musicheader 1, 4, Music_Route3_Ch4 -Music_Route3_Ch1: ; ec2d6 +Music_Route3_Ch1: stereopanning $f tempo 160 volume $77 @@ -46,7 +45,7 @@ Music_Route3_Ch1: ; ec2d6 note E_, 1 note F#, 1 note G#, 1 -Music_Route3_branch_ec307: ; ec307 +Music_Route3_branch_ec307: callchannel Music_Route3_branch_ec3a4 note G_, 1 note D_, 1 @@ -195,9 +194,8 @@ Music_Route3_branch_ec307: ; ec307 octave 4 note D_, 1 loopchannel 0, Music_Route3_branch_ec307 -; ec3a4 -Music_Route3_branch_ec3a4: ; ec3a4 +Music_Route3_branch_ec3a4: octave 3 note A_, 1 note E_, 1 @@ -208,7 +206,7 @@ Music_Route3_branch_ec3a4: ; ec3a4 note E_, 1 note C#, 1 note E_, 1 -Music_Route3_branch_ec3b1: ; ec3b1 +Music_Route3_branch_ec3b1: note A_, 1 note E_, 1 note C#, 1 @@ -218,7 +216,7 @@ Music_Route3_branch_ec3b1: ; ec3b1 note E_, 1 note C#, 1 note E_, 1 -Music_Route3_branch_ec3bd: ; ec3bd +Music_Route3_branch_ec3bd: note G_, 1 note D_, 1 octave 2 @@ -235,9 +233,8 @@ Music_Route3_branch_ec3bd: ; ec3bd octave 3 note D_, 1 endchannel -; ec3d0 -Music_Route3_Ch2: ; ec3d0 +Music_Route3_Ch2: stereopanning $f0 notetype $c, $5e dutycycle $2 @@ -266,7 +263,7 @@ Music_Route3_Ch2: ; ec3d0 note C#, 1 note E_, 1 note G#, 1 -Music_Route3_branch_ec3f5: ; ec3f5 +Music_Route3_branch_ec3f5: intensity $7d callchannel Music_Route3_branch_ec443 note G_, 1 @@ -328,9 +325,8 @@ Music_Route3_branch_ec3f5: ; ec3f5 note F#, 1 note G#, 1 loopchannel 0, Music_Route3_branch_ec3f5 -; ec443 -Music_Route3_branch_ec443: ; ec443 +Music_Route3_branch_ec443: note A_, 6 note E_, 1 note A_, 1 @@ -353,9 +349,8 @@ Music_Route3_branch_ec443: ; ec443 note G_, 6 note D_, 1 endchannel -; ec45b -Music_Route3_Ch3: ; ec45b +Music_Route3_Ch3: stereopanning $ff vibrato $6, $3 notetype $c, $13 @@ -384,7 +379,7 @@ Music_Route3_Ch3: ; ec45b note __, 1 note G#, 2 callchannel Music_Route3_branch_ec4bd -Music_Route3_branch_ec47f: ; ec47f +Music_Route3_branch_ec47f: intensity $14 callchannel Music_Route3_branch_ec4bd callchannel Music_Route3_branch_ec4bd @@ -431,9 +426,8 @@ Music_Route3_branch_ec47f: ; ec47f note F#, 1 note G#, 1 loopchannel 0, Music_Route3_branch_ec47f -; ec4bd -Music_Route3_branch_ec4bd: ; ec4bd +Music_Route3_branch_ec4bd: octave 3 note A_, 1 note __, 1 @@ -451,9 +445,8 @@ Music_Route3_branch_ec4bd: ; ec4bd octave 2 note G#, 2 endchannel -; ec4ce -Music_Route3_branch_ec4ce: ; ec4ce +Music_Route3_branch_ec4ce: octave 3 note G_, 1 note __, 1 @@ -483,13 +476,12 @@ Music_Route3_branch_ec4ce: ; ec4ce note G#, 2 note B_, 2 endchannel -; ec4eb -Music_Route3_Ch4: ; ec4eb +Music_Route3_Ch4: togglenoise $4 notetype $c note __, 10 -Music_Route3_branch_ec4f0: ; ec4f0 +Music_Route3_branch_ec4f0: notetype $c note D_, 2 note D_, 4 @@ -507,6 +499,3 @@ Music_Route3_branch_ec4f0: ; ec4f0 note C#, 1 note C#, 1 loopchannel 0, Music_Route3_branch_ec4f0 -; ec506 - - diff --git a/audio/music/route30.asm b/audio/music/route30.asm index 0ea33abb..22623579 100644 --- a/audio/music/route30.asm +++ b/audio/music/route30.asm @@ -1,11 +1,10 @@ -Music_Route30: ; efc01 - dbw $c0, Music_Route30_Ch1 - dbw $01, Music_Route30_Ch2 - dbw $02, Music_Route30_Ch3 - dbw $03, Music_Route30_Ch4 -; efc0d +Music_Route30: + musicheader 4, 1, Music_Route30_Ch1 + musicheader 1, 2, Music_Route30_Ch2 + musicheader 1, 3, Music_Route30_Ch3 + musicheader 1, 4, Music_Route30_Ch4 -Music_Route30_Ch1: ; efc0d +Music_Route30_Ch1: tempo 144 volume $77 dutycycle $3 @@ -27,7 +26,7 @@ Music_Route30_Ch1: ; efc0d note D_, 2 intensity $4e note C_, 4 -Music_Route30_branch_efc2e: ; efc2e +Music_Route30_branch_efc2e: intensity $b6 note D_, 6 intensity $b4 @@ -183,9 +182,8 @@ Music_Route30_branch_efc2e: ; efc2e octave 4 note D_, 2 loopchannel 0, Music_Route30_branch_efc2e -; efcda -Music_Route30_Ch2: ; efcda +Music_Route30_Ch2: dutycycle $3 vibrato $12, $36 stereopanning $f @@ -207,7 +205,7 @@ Music_Route30_Ch2: ; efcda note E_, 1 note F_, 1 note F#, 1 -Music_Route30_branch_efcf6: ; efcf6 +Music_Route30_branch_efcf6: intensity $c7 note G_, 10 octave 4 @@ -295,9 +293,8 @@ Music_Route30_branch_efcf6: ; efcf6 octave 3 note F#, 2 loopchannel 0, Music_Route30_branch_efcf6 -; efd5f -Music_Route30_Ch3: ; efd5f +Music_Route30_Ch3: notetype $c, $27 octave 2 note G_, 1 @@ -322,7 +319,7 @@ Music_Route30_Ch3: ; efd5f note __, 1 note G_, 1 note __, 1 -Music_Route30_branch_efd79: ; efd79 +Music_Route30_branch_efd79: note G_, 1 note __, 1 note B_, 2 @@ -577,14 +574,13 @@ Music_Route30_branch_efd79: ; efd79 note G_, 1 note __, 1 loopchannel 0, Music_Route30_branch_efd79 -; efe7a -Music_Route30_Ch4: ; efe7a +Music_Route30_Ch4: togglenoise $3 notetype $c callchannel Music_Route30_branch_efeb8 callchannel Music_Route30_branch_efec1 -Music_Route30_branch_efe84: ; efe84 +Music_Route30_branch_efe84: callchannel Music_Route30_branch_efecd callchannel Music_Route30_branch_efed7 callchannel Music_Route30_branch_efed7 @@ -602,9 +598,8 @@ Music_Route30_branch_efe84: ; efe84 callchannel Music_Route30_branch_efecd callchannel Music_Route30_branch_efee1 loopchannel 0, Music_Route30_branch_efe84 -; efeb8 -Music_Route30_branch_efeb8: ; efeb8 +Music_Route30_branch_efeb8: note D_, 2 note F#, 2 note F#, 2 @@ -614,9 +609,8 @@ Music_Route30_branch_efeb8: ; efeb8 note D_, 2 note D_, 4 endchannel -; efec1 -Music_Route30_branch_efec1: ; efec1 +Music_Route30_branch_efec1: note D_, 2 note F#, 2 note F#, 2 @@ -629,9 +623,8 @@ Music_Route30_branch_efec1: ; efec1 note D_, 1 note D_, 1 endchannel -; efecd -Music_Route30_branch_efecd: ; efecd +Music_Route30_branch_efecd: note D_, 2 note F#, 2 note F#, 2 @@ -642,9 +635,8 @@ Music_Route30_branch_efecd: ; efecd note D_, 2 note D_, 2 endchannel -; efed7 -Music_Route30_branch_efed7: ; efed7 +Music_Route30_branch_efed7: note D_, 2 note F#, 2 note F#, 2 @@ -655,9 +647,8 @@ Music_Route30_branch_efed7: ; efed7 note D_, 2 note D_, 2 endchannel -; efee1 -Music_Route30_branch_efee1: ; efee1 +Music_Route30_branch_efee1: note D_, 2 note F#, 2 note F#, 2 @@ -676,5 +667,3 @@ Music_Route30_branch_efee1: ; efee1 note D_, 1 notetype $c endchannel -; efef5 - diff --git a/audio/music/route36.asm b/audio/music/route36.asm index ce6b6899..1899116b 100644 --- a/audio/music/route36.asm +++ b/audio/music/route36.asm @@ -1,11 +1,10 @@ -Music_Route36: ; e9492 - dbw $c0, Music_Route36_Ch1 - dbw $01, Music_Route36_Ch2 - dbw $02, Music_Route36_Ch3 - dbw $03, Music_Route36_Ch4 -; e949e +Music_Route36: + musicheader 4, 1, Music_Route36_Ch1 + musicheader 1, 2, Music_Route36_Ch2 + musicheader 1, 3, Music_Route36_Ch3 + musicheader 1, 4, Music_Route36_Ch4 -Music_Route36_Ch1: ; e949e +Music_Route36_Ch1: tempo 144 volume $77 dutycycle $3 @@ -26,7 +25,7 @@ Music_Route36_Ch1: ; e949e note A_, 1 intensity $5d note A#, 4 -Music_Route36_branch_e94c0: ; e94c0 +Music_Route36_branch_e9517: intensity $b5 note F_, 4 note A_, 2 @@ -162,10 +161,9 @@ Music_Route36_branch_e94c0: ; e94c0 intensity $b5 note D#, 2 note E_, 2 - loopchannel 0, Music_Route36_branch_e94c0 -; e9558 + loopchannel 0, Music_Route36_branch_e9517 -Music_Route36_Ch2: ; e9558 +Music_Route36_Ch2: dutycycle $3 vibrato $10, $36 stereopanning $f0 @@ -188,7 +186,7 @@ Music_Route36_Ch2: ; e9558 note F_, 8 octave 3 note G_, 4 -Music_Route36_branch_e9577: ; e9577 +Music_Route36_branch_e95ce: intensity $c7 octave 4 note C_, 10 @@ -310,10 +308,9 @@ Music_Route36_branch_e9577: ; e9577 note G_, 1 note A_, 1 note B_, 1 - loopchannel 0, Music_Route36_branch_e9577 -; e9614 + loopchannel 0, Music_Route36_branch_e95ce -Music_Route36_Ch3: ; e9614 +Music_Route36_Ch3: notetype $c, $25 octave 3 note F_, 1 @@ -337,7 +334,7 @@ Music_Route36_Ch3: ; e9614 octave 3 note D#, 2 note E_, 2 -Music_Route36_branch_e962d: ; e962d +Music_Route36_branch_e9684: note F_, 4 note C_, 2 note F_, 4 @@ -467,33 +464,31 @@ Music_Route36_branch_e962d: ; e962d note D_, 2 note D#, 2 note E_, 2 - loopchannel 0, Music_Route36_branch_e962d -; e96b2 + loopchannel 0, Music_Route36_branch_e9684 -Music_Route36_Ch4: ; e96b2 +Music_Route36_Ch4: togglenoise $1 notetype $c - callchannel Music_Route36_branch_e96dd - callchannel Music_Route36_branch_e96ea -Music_Route36_branch_e96bc: ; e96bc - callchannel Music_Route36_branch_e96dd - callchannel Music_Route36_branch_e96e4 - callchannel Music_Route36_branch_e96dd - callchannel Music_Route36_branch_e96ea - loopchannel 2, Music_Route36_branch_e96bc -Music_Route36_branch_e96cc: ; e96cc + callchannel Music_Route36_branch_e9734 + callchannel Music_Route36_branch_e9741 +Music_Route36_branch_e9713: + callchannel Music_Route36_branch_e9734 + callchannel Music_Route36_branch_e973b + callchannel Music_Route36_branch_e9734 + callchannel Music_Route36_branch_e9741 + loopchannel 2, Music_Route36_branch_e9713 +Music_Route36_branch_e9723: note A#, 4 note A_, 2 note F_, 4 note B_, 1 note B_, 1 note A_, 4 - loopchannel 11, Music_Route36_branch_e96cc - callchannel Music_Route36_branch_e96ea - loopchannel 0, Music_Route36_branch_e96bc -; e96dd + loopchannel 11, Music_Route36_branch_e9723 + callchannel Music_Route36_branch_e9741 + loopchannel 0, Music_Route36_branch_e9713 -Music_Route36_branch_e96dd: ; e96dd +Music_Route36_branch_e9734: note A_, 4 note A_, 6 note A#, 1 @@ -501,18 +496,16 @@ Music_Route36_branch_e96dd: ; e96dd note A_, 2 note A#, 2 endchannel -; e96e4 -Music_Route36_branch_e96e4: ; e96e4 +Music_Route36_branch_e973b: note A_, 4 note A_, 6 note B_, 1 note A#, 1 note A_, 4 endchannel -; e96ea -Music_Route36_branch_e96ea: ; e96ea +Music_Route36_branch_e9741: note A_, 4 note A_, 6 note A#, 1 @@ -525,6 +518,3 @@ Music_Route36_branch_e96ea: ; e96ea note A_, 1 notetype $c endchannel -; e96f8 - - diff --git a/audio/music/route37.asm b/audio/music/route37.asm index a8d40ccf..000db4e3 100644 --- a/audio/music/route37.asm +++ b/audio/music/route37.asm @@ -1,11 +1,10 @@ -Music_Route37: ; ee94b - dbw $c0, Music_Route37_Ch1 - dbw $01, Music_Route37_Ch2 - dbw $02, Music_Route37_Ch3 - dbw $03, Music_Route37_Ch4 -; ee957 +Music_Route37: + musicheader 4, 1, Music_Route37_Ch1 + musicheader 1, 2, Music_Route37_Ch2 + musicheader 1, 3, Music_Route37_Ch3 + musicheader 1, 4, Music_Route37_Ch4 -Music_Route37_Ch1: ; ee957 +Music_Route37_Ch1: tempo 144 volume $77 dutycycle $3 @@ -14,7 +13,7 @@ Music_Route37_Ch1: ; ee957 notetype $c, $b3 note __, 16 note __, 16 -Music_Route37_branch_ee969: ; ee969 +Music_Route37_branch_ee969: intensity $b3 note __, 2 octave 2 @@ -68,7 +67,7 @@ Music_Route37_branch_ee969: ; ee969 note E_, 2 note D#, 4 stereopanning $f -Music_Route37_branch_ee9a5: ; ee9a5 +Music_Route37_branch_ee9a5: callchannel Music_Route37_branch_ee9da octave 3 note C#, 4 @@ -97,9 +96,8 @@ Music_Route37_branch_ee9a5: ; ee9a5 callchannel Music_Route37_branch_ee9e9 note __, 4 loopchannel 0, Music_Route37_branch_ee969 -; ee9da -Music_Route37_branch_ee9da: ; ee9da +Music_Route37_branch_ee9da: intensity $c2 octave 2 note A_, 2 @@ -113,9 +111,8 @@ Music_Route37_branch_ee9da: ; ee9da note A_, 2 intensity $b7 endchannel -; ee9e9 -Music_Route37_branch_ee9e9: ; ee9e9 +Music_Route37_branch_ee9e9: intensity $c2 octave 2 note B_, 2 @@ -129,9 +126,8 @@ Music_Route37_branch_ee9e9: ; ee9e9 note B_, 2 intensity $b7 endchannel -; ee9f8 -Music_Route37_Ch2: ; ee9f8 +Music_Route37_Ch2: dutycycle $3 vibrato $1c, $12 notetype $c, $c2 @@ -162,7 +158,7 @@ Music_Route37_Ch2: ; ee9f8 note B_, 1 intensity $c2 note B_, 2 -Music_Route37_branch_eea24: ; eea24 +Music_Route37_branch_eea24: callchannel Music_Route37_branch_eeab7 intensity $c6 octave 4 @@ -274,9 +270,8 @@ Music_Route37_branch_eea24: ; eea24 intensity $c2 note F#, 2 loopchannel 0, Music_Route37_branch_eea24 -; eeab7 -Music_Route37_branch_eeab7: ; eeab7 +Music_Route37_branch_eeab7: intensity $c7 octave 3 note F#, 4 @@ -289,17 +284,16 @@ Music_Route37_branch_eeab7: ; eeab7 note F#, 2 note B_, 2 endchannel -; eeac7 -Music_Route37_Ch3: ; eeac7 +Music_Route37_Ch3: stereopanning $f0 notetype $c, $14 -Music_Route37_branch_eeacc: ; eeacc +Music_Route37_branch_eeacc: octave 2 note F#, 2 note __, 6 loopchannel 4, Music_Route37_branch_eeacc -Music_Route37_branch_eead3: ; eead3 +Music_Route37_branch_eead3: callchannel Music_Route37_branch_eeb32 note A_, 2 octave 3 @@ -311,7 +305,7 @@ Music_Route37_branch_eead3: ; eead3 note A_, 2 note F#, 2 note E_, 2 -Music_Route37_branch_eeae0: ; eeae0 +Music_Route37_branch_eeae0: note D#, 2 note F#, 2 loopchannel 4, Music_Route37_branch_eeae0 @@ -330,13 +324,13 @@ Music_Route37_branch_eeae0: ; eeae0 octave 2 note A_, 2 callchannel Music_Route37_branch_eeb32 -Music_Route37_branch_eeafb: ; eeafb +Music_Route37_branch_eeafb: octave 2 note B_, 2 octave 3 note D#, 2 loopchannel 4, Music_Route37_branch_eeafb -Music_Route37_branch_eeb03: ; eeb03 +Music_Route37_branch_eeb03: octave 2 note A_, 2 octave 3 @@ -345,13 +339,13 @@ Music_Route37_branch_eeb03: ; eeb03 note E_, 2 note C#, 2 callchannel Music_Route37_branch_eeb3c -Music_Route37_branch_eeb10: ; eeb10 +Music_Route37_branch_eeb10: octave 2 note B_, 2 octave 3 note F#, 2 loopchannel 4, Music_Route37_branch_eeb10 -Music_Route37_branch_eeb18: ; eeb18 +Music_Route37_branch_eeb18: octave 2 note A_, 2 octave 3 @@ -361,14 +355,13 @@ Music_Route37_branch_eeb18: ; eeb18 note C#, 2 callchannel Music_Route37_branch_eeb3c callchannel Music_Route37_branch_eeb32 -Music_Route37_branch_eeb28: ; eeb28 +Music_Route37_branch_eeb28: note F#, 2 note __, 6 loopchannel 4, Music_Route37_branch_eeb28 loopchannel 0, Music_Route37_branch_eead3 -; eeb32 -Music_Route37_branch_eeb32: ; eeb32 +Music_Route37_branch_eeb32: octave 2 note F#, 2 note B_, 2 @@ -379,9 +372,8 @@ Music_Route37_branch_eeb32: ; eeb32 note F#, 2 note B_, 2 endchannel -; eeb3c -Music_Route37_branch_eeb3c: ; eeb3c +Music_Route37_branch_eeb3c: octave 2 note B_, 2 octave 3 @@ -399,12 +391,11 @@ Music_Route37_branch_eeb3c: ; eeb3c octave 3 note D#, 2 endchannel -; eeb4d -Music_Route37_Ch4: ; eeb4d +Music_Route37_Ch4: stereopanning $f togglenoise $0 -Music_Route37_branch_eeb51: ; eeb51 +Music_Route37_branch_eeb51: notetype $c callchannel Music_Route37_branch_eeb6b note D_, 1 @@ -422,9 +413,8 @@ Music_Route37_branch_eeb51: ; eeb51 note D_, 1 note D_, 1 loopchannel 0, Music_Route37_branch_eeb51 -; eeb6b -Music_Route37_branch_eeb6b: ; eeb6b +Music_Route37_branch_eeb6b: note D_, 2 note D#, 1 note D#, 1 @@ -435,6 +425,3 @@ Music_Route37_branch_eeb6b: ; eeb6b note D#, 1 note D#, 1 endchannel -; eeb75 - - diff --git a/audio/music/ruinsofalphinterior.asm b/audio/music/ruinsofalphinterior.asm index 9d1c4349..f353b63a 100644 --- a/audio/music/ruinsofalphinterior.asm +++ b/audio/music/ruinsofalphinterior.asm @@ -1,25 +1,23 @@ -Music_RuinsOfAlphInterior: ; ebd92 - dbw $80, Music_RuinsOfAlphInterior_Ch1 - dbw $01, Music_RuinsOfAlphInterior_Ch2 - dbw $02, Music_RuinsOfAlphInterior_Ch3 -; ebd9b +Music_RuinsOfAlphInterior: + musicheader 3, 1, Music_RuinsOfAlphInterior_Ch1 + musicheader 1, 2, Music_RuinsOfAlphInterior_Ch2 + musicheader 1, 3, Music_RuinsOfAlphInterior_Ch3 -Music_RuinsOfAlphInterior_Ch1: ; ebd9b +Music_RuinsOfAlphInterior_Ch1: tempo 224 volume $77 dutycycle $0 stereopanning $f0 notetype $c, $44 note __, 1 - loopchannel 0, Music_RuinsOfAlphInterior_branch_ebdb6 -; ebdac + loopchannel 0, Music_RuinsOfAlphInterior_branch_ebdc2 -Music_RuinsOfAlphInterior_Ch2: ; ebdac +Music_RuinsOfAlphInterior_Ch2: tone $0002 dutycycle $0 stereopanning $f notetype $c, $a4 -Music_RuinsOfAlphInterior_branch_ebdb6: ; ebdb6 +Music_RuinsOfAlphInterior_branch_ebdc2: octave 4 note C_, 4 octave 3 @@ -34,19 +32,15 @@ Music_RuinsOfAlphInterior_branch_ebdb6: ; ebdb6 note C_, 4 octave 3 note A#, 4 - loopchannel 0, Music_RuinsOfAlphInterior_branch_ebdb6 -; ebdc8 + loopchannel 0, Music_RuinsOfAlphInterior_branch_ebdc2 -Music_RuinsOfAlphInterior_Ch3: ; ebdc8 +Music_RuinsOfAlphInterior_Ch3: notetype $c, $10 -Music_RuinsOfAlphInterior_branch_ebdcb: ; ebdcb +Music_RuinsOfAlphInterior_branch_ebdd7: octave 2 note G#, 2 octave 3 note C#, 2 note E_, 2 note __, 10 - loopchannel 0, Music_RuinsOfAlphInterior_branch_ebdcb -; ebdd5 - - + loopchannel 0, Music_RuinsOfAlphInterior_branch_ebdd7 diff --git a/audio/music/ruinsofalphradio.asm b/audio/music/ruinsofalphradio.asm index a9676b60..5584b279 100644 --- a/audio/music/ruinsofalphradio.asm +++ b/audio/music/ruinsofalphradio.asm @@ -1,17 +1,16 @@ -Music_RuinsOfAlphRadio: ; eedcb - dbw $80, Music_RuinsOfAlphRadio_Ch1 - dbw $01, Music_RuinsOfAlphRadio_Ch2 - dbw $02, Music_RuinsOfAlphRadio_Ch3 -; eedd4 +Music_RuinsOfAlphRadio: + musicheader 3, 1, Music_RuinsOfAlphRadio_Ch1 + musicheader 1, 2, Music_RuinsOfAlphRadio_Ch2 + musicheader 1, 3, Music_RuinsOfAlphRadio_Ch3 -Music_RuinsOfAlphRadio_Ch1: ; eedd4 +Music_RuinsOfAlphRadio_Ch1: tempo 160 volume $77 dutycycle $0 tone $0118 vibrato $0, $f0 stereopanning $f0 -Music_RuinsOfAlphRadio_branch_eede3: ; eede3 +Music_RuinsOfAlphRadio_branch_eede3: notetype $6, $71 callchannel Music_RuinsOfAlphRadio_branch_eee01 notetype $c, $a1 @@ -25,9 +24,8 @@ Music_RuinsOfAlphRadio_branch_eede3: ; eede3 notetype $c, $a1 note __, 16 loopchannel 0, Music_RuinsOfAlphRadio_branch_eede3 -; eee01 -Music_RuinsOfAlphRadio_branch_eee01: ; eee01 +Music_RuinsOfAlphRadio_branch_eee01: octave 4 note G_, 1 note F#, 1 @@ -35,9 +33,8 @@ Music_RuinsOfAlphRadio_branch_eee01: ; eee01 note F#, 1 note C_, 8 endchannel -; eee08 -Music_RuinsOfAlphRadio_branch_eee08: ; eee08 +Music_RuinsOfAlphRadio_branch_eee08: octave 4 note G_, 1 note F#, 1 @@ -48,12 +45,11 @@ Music_RuinsOfAlphRadio_branch_eee08: ; eee08 octave 5 note C_, 8 endchannel -; eee12 -Music_RuinsOfAlphRadio_Ch2: ; eee12 +Music_RuinsOfAlphRadio_Ch2: dutycycle $1 vibrato $1, $e0 -Music_RuinsOfAlphRadio_branch_eee17: ; eee17 +Music_RuinsOfAlphRadio_branch_eee17: stereopanning $f notetype $6, $81 callchannel Music_RuinsOfAlphRadio_branch_eee01 @@ -65,17 +61,13 @@ Music_RuinsOfAlphRadio_branch_eee17: ; eee17 notetype $c, $a1 note __, 16 loopchannel 0, Music_RuinsOfAlphRadio_branch_eee17 -; eee32 -Music_RuinsOfAlphRadio_Ch3: ; eee32 +Music_RuinsOfAlphRadio_Ch3: notetype $6, $26 -Music_RuinsOfAlphRadio_branch_eee35: ; eee35 +Music_RuinsOfAlphRadio_branch_eee35: octave 2 note C_, 1 note C#, 1 note C_, 1 note __, 16 loopchannel 0, Music_RuinsOfAlphRadio_branch_eee35 -; eee3e - - diff --git a/audio/music/showmearound.asm b/audio/music/showmearound.asm index a0fc13fb..344b8fe3 100644 --- a/audio/music/showmearound.asm +++ b/audio/music/showmearound.asm @@ -1,11 +1,10 @@ -Music_ShowMeAround: ; edbd8 - dbw $c0, Music_ShowMeAround_Ch1 - dbw $01, Music_ShowMeAround_Ch2 - dbw $02, Music_ShowMeAround_Ch3 - dbw $03, Music_ShowMeAround_Ch4 -; edbe4 +Music_ShowMeAround: + musicheader 4, 1, Music_ShowMeAround_Ch1 + musicheader 1, 2, Music_ShowMeAround_Ch2 + musicheader 1, 3, Music_ShowMeAround_Ch3 + musicheader 1, 4, Music_ShowMeAround_Ch4 -Music_ShowMeAround_Ch1: ; edbe4 +Music_ShowMeAround_Ch1: tempo 144 volume $77 stereopanning $f @@ -28,7 +27,7 @@ Music_ShowMeAround_Ch1: ; edbe4 note D_, 1 note E_, 1 note G#, 8 -Music_ShowMeAround_branch_edc01: ; edc01 +Music_ShowMeAround_branch_edc01: note __, 16 note __, 16 note __, 16 @@ -38,9 +37,8 @@ Music_ShowMeAround_branch_edc01: ; edc01 callchannel Music_ShowMeAround_branch_edc98 callchannel Music_ShowMeAround_branch_edc15 loopchannel 0, Music_ShowMeAround_branch_edc01 -; edc15 -Music_ShowMeAround_branch_edc15: ; edc15 +Music_ShowMeAround_branch_edc15: note __, 4 octave 3 note C#, 1 @@ -62,9 +60,8 @@ Music_ShowMeAround_branch_edc15: ; edc15 note E_, 1 note __, 3 endchannel -; edc2a -Music_ShowMeAround_Ch2: ; edc2a +Music_ShowMeAround_Ch2: stereopanning $ff dutycycle $2 notetype $c, $b1 @@ -86,7 +83,7 @@ Music_ShowMeAround_Ch2: ; edc2a note D_, 1 note E_, 8 dutycycle $1 -Music_ShowMeAround_branch_edc44: ; edc44 +Music_ShowMeAround_branch_edc44: callchannel Music_ShowMeAround_branch_edc98 callchannel Music_ShowMeAround_branch_edc98 callchannel Music_ShowMeAround_branch_edc86 @@ -138,9 +135,8 @@ Music_ShowMeAround_branch_edc44: ; edc44 note A_, 2 note A_, 4 loopchannel 0, Music_ShowMeAround_branch_edc44 -; edc86 -Music_ShowMeAround_branch_edc86: ; edc86 +Music_ShowMeAround_branch_edc86: octave 3 note A_, 2 octave 4 @@ -149,9 +145,8 @@ Music_ShowMeAround_branch_edc86: ; edc86 note D_, 2 note F#, 2 endchannel -; edc8e -Music_ShowMeAround_branch_edc8e: ; edc8e +Music_ShowMeAround_branch_edc8e: octave 5 note C#, 2 octave 4 @@ -162,9 +157,8 @@ Music_ShowMeAround_branch_edc8e: ; edc8e octave 4 note A_, 2 endchannel -; edc98 -Music_ShowMeAround_branch_edc98: ; edc98 +Music_ShowMeAround_branch_edc98: note __, 4 octave 3 note C#, 1 @@ -182,9 +176,8 @@ Music_ShowMeAround_branch_edc98: ; edc98 note B_, 1 note __, 1 endchannel -; edca9 -Music_ShowMeAround_Ch3: ; edca9 +Music_ShowMeAround_Ch3: stereopanning $f0 vibrato $10, $22 notetype $6, $25 @@ -226,7 +219,7 @@ Music_ShowMeAround_Ch3: ; edca9 note F_, 1 note E_, 2 intensity $14 -Music_ShowMeAround_branch_edcd9: ; edcd9 +Music_ShowMeAround_branch_edcd9: callchannel Music_ShowMeAround_branch_edcef callchannel Music_ShowMeAround_branch_edcef callchannel Music_ShowMeAround_branch_edcef @@ -234,9 +227,8 @@ Music_ShowMeAround_branch_edcd9: ; edcd9 callchannel Music_ShowMeAround_branch_edcef callchannel Music_ShowMeAround_branch_edd0f loopchannel 0, Music_ShowMeAround_branch_edcd9 -; edcef -Music_ShowMeAround_branch_edcef: ; edcef +Music_ShowMeAround_branch_edcef: octave 2 note A_, 2 note __, 6 @@ -269,9 +261,8 @@ Music_ShowMeAround_branch_edcef: ; edcef note D_, 2 note __, 2 endchannel -; edd0f -Music_ShowMeAround_branch_edd0f: ; edd0f +Music_ShowMeAround_branch_edd0f: octave 2 note A_, 2 note __, 6 @@ -305,9 +296,8 @@ Music_ShowMeAround_branch_edd0f: ; edd0f note A_, 2 note __, 6 endchannel -; edd30 -Music_ShowMeAround_Ch4: ; edd30 +Music_ShowMeAround_Ch4: togglenoise $3 notetype $c note __, 16 @@ -315,7 +305,7 @@ Music_ShowMeAround_Ch4: ; edd30 note D_, 2 note D#, 2 note F#, 4 -Music_ShowMeAround_branch_edd39: ; edd39 +Music_ShowMeAround_branch_edd39: callchannel Music_ShowMeAround_branch_edd4f callchannel Music_ShowMeAround_branch_edd4f callchannel Music_ShowMeAround_branch_edd4f @@ -323,9 +313,8 @@ Music_ShowMeAround_branch_edd39: ; edd39 callchannel Music_ShowMeAround_branch_edd4f callchannel Music_ShowMeAround_branch_edd5e loopchannel 0, Music_ShowMeAround_branch_edd39 -; edd4f -Music_ShowMeAround_branch_edd4f: ; edd4f +Music_ShowMeAround_branch_edd4f: note D#, 2 note F#, 2 note D_, 2 @@ -341,9 +330,8 @@ Music_ShowMeAround_branch_edd4f: ; edd4f note D_, 2 note D#, 2 endchannel -; edd5e -Music_ShowMeAround_branch_edd5e: ; edd5e +Music_ShowMeAround_branch_edd5e: note D#, 2 note F#, 2 note D_, 2 @@ -359,6 +347,3 @@ Music_ShowMeAround_branch_edd5e: ; edd5e note D_, 2 note F#, 2 endchannel -; edd6d - - diff --git a/audio/music/sprouttower.asm b/audio/music/sprouttower.asm index b587ad04..d44de631 100644 --- a/audio/music/sprouttower.asm +++ b/audio/music/sprouttower.asm @@ -1,11 +1,10 @@ -Music_SproutTower: ; f6974 - dbw $c0, Music_SproutTower_Ch1 - dbw $01, Music_SproutTower_Ch2 - dbw $02, Music_SproutTower_Ch3 - dbw $03, Music_SproutTower_Ch4 -; f6980 +Music_SproutTower: + musicheader 4, 1, Music_SproutTower_Ch1 + musicheader 1, 2, Music_SproutTower_Ch2 + musicheader 1, 3, Music_SproutTower_Ch3 + musicheader 1, 4, Music_SproutTower_Ch4 -Music_SproutTower_Ch1: ; f6980 +Music_SproutTower_Ch1: tempo 176 volume $77 dutycycle $3 @@ -15,7 +14,7 @@ Music_SproutTower_Ch1: ; f6980 notetype $c, $a3 note __, 16 note __, 16 -Music_SproutTower_branch_f6994: ; f6994 +Music_SproutTower_branch_f6994: note __, 6 octave 3 note F_, 2 @@ -61,9 +60,8 @@ Music_SproutTower_branch_f6994: ; f6994 note D#, 4 note D#, 4 loopchannel 0, Music_SproutTower_branch_f6994 -; f69c8 -Music_SproutTower_Ch2: ; f69c8 +Music_SproutTower_Ch2: dutycycle $3 tone $0001 vibrato $8, $48 @@ -77,7 +75,7 @@ Music_SproutTower_Ch2: ; f69c8 note F_, 4 note D#, 4 note D#, 4 -Music_SproutTower_branch_f69dc: ; f69dc +Music_SproutTower_branch_f69dc: intensity $b5 octave 4 note C_, 4 @@ -139,9 +137,8 @@ Music_SproutTower_branch_f69dc: ; f69dc note C_, 16 note __, 16 loopchannel 0, Music_SproutTower_branch_f69dc -; f6a25 -Music_SproutTower_Ch3: ; f6a25 +Music_SproutTower_Ch3: vibrato $14, $e8 notetype $c, $14 octave 3 @@ -162,7 +159,7 @@ Music_SproutTower_Ch3: ; f6a25 note __, 2 note F#, 2 stereopanning $f0 -Music_SproutTower_branch_f6a3e: ; f6a3e +Music_SproutTower_branch_f6a3e: note __, 4 note C_, 2 note F_, 2 @@ -220,13 +217,12 @@ Music_SproutTower_branch_f6a3e: ; f6a3e note __, 2 note F_, 2 loopchannel 0, Music_SproutTower_branch_f6a3e -; f6a7a -Music_SproutTower_Ch4: ; f6a7a +Music_SproutTower_Ch4: togglenoise $0 notetype $c note __, 4 -Music_SproutTower_branch_f6a7f: ; f6a7f +Music_SproutTower_branch_f6a7f: note F#, 4 stereopanning $f0 note D#, 4 @@ -244,6 +240,3 @@ Music_SproutTower_branch_f6a7f: ; f6a7f stereopanning $ff note F#, 4 loopchannel 0, Music_SproutTower_branch_f6a7f -; f6a99 - - diff --git a/audio/music/ssaqua.asm b/audio/music/ssaqua.asm index 9460219c..5b06b27b 100644 --- a/audio/music/ssaqua.asm +++ b/audio/music/ssaqua.asm @@ -1,11 +1,10 @@ -Music_SSAqua: ; ead42 - dbw $c0, Music_SSAqua_Ch1 - dbw $01, Music_SSAqua_Ch2 - dbw $02, Music_SSAqua_Ch3 - dbw $03, Music_SSAqua_Ch4 -; ead4e +Music_SSAqua: + musicheader 4, 1, Music_SSAqua_Ch1 + musicheader 1, 2, Music_SSAqua_Ch2 + musicheader 1, 3, Music_SSAqua_Ch3 + musicheader 1, 4, Music_SSAqua_Ch4 -Music_SSAqua_Ch1: ; ead4e +Music_SSAqua_Ch1: tempo 117 volume $77 stereopanning $f @@ -18,7 +17,7 @@ Music_SSAqua_Ch1: ; ead4e note __, 1 note G_, 1 note __, 1 -Music_SSAqua_branch_ead65: ; ead65 +Music_SSAqua_branch_eadbc: octave 2 note G_, 16 note __, 8 @@ -43,7 +42,7 @@ Music_SSAqua_branch_ead65: ; ead65 note __, 8 dutycycle $1 intensity $61 - callchannel Music_SSAqua_branch_eaf9e + callchannel Music_SSAqua_branch_eaff5 octave 5 note G_, 1 octave 4 @@ -68,8 +67,8 @@ Music_SSAqua_branch_ead65: ; ead65 note B_, 1 note A_, 1 note G_, 1 - callchannel Music_SSAqua_branch_eaf9e - callchannel Music_SSAqua_branch_eafe7 + callchannel Music_SSAqua_branch_eaff5 + callchannel Music_SSAqua_branch_eb03e note __, 16 note __, 16 note __, 16 @@ -247,24 +246,23 @@ Music_SSAqua_branch_ead65: ; ead65 note D_, 2 note F#, 2 note A_, 2 - loopchannel 0, Music_SSAqua_branch_ead65 -; eae73 + loopchannel 0, Music_SSAqua_branch_eadbc -Music_SSAqua_Ch2: ; eae73 +Music_SSAqua_Ch2: stereopanning $f0 dutycycle $2 vibrato $8, $33 notetype $c, $b7 note __, 2 -Music_SSAqua_branch_eae7e: ; eae7e +Music_SSAqua_branch_eaed5: notetype $c, $b7 dutycycle $1 intensity $61 - callchannel Music_SSAqua_branch_eaf9e - callchannel Music_SSAqua_branch_eafe7 + callchannel Music_SSAqua_branch_eaff5 + callchannel Music_SSAqua_branch_eb03e dutycycle $2 intensity $d7 - callchannel Music_SSAqua_branch_eaf89 + callchannel Music_SSAqua_branch_eafe0 note B_, 1 note __, 1 note G_, 1 @@ -276,9 +274,9 @@ Music_SSAqua_branch_eae7e: ; eae7e octave 4 note C#, 1 note E_, 1 - forceoctave $c - callchannel Music_SSAqua_branch_eaf89 - forceoctave $0 + pitchoffset 0, CC + callchannel Music_SSAqua_branch_eafe0 + pitchoffset 0, C_ octave 3 note B_, 1 note __, 1 @@ -293,7 +291,7 @@ Music_SSAqua_branch_eae7e: ; eae7e note B_, 1 octave 4 note C_, 1 - callchannel Music_SSAqua_branch_eaf31 + callchannel Music_SSAqua_branch_eaf88 note G_, 4 note __, 4 note G_, 8 @@ -313,7 +311,7 @@ Music_SSAqua_branch_eae7e: ; eae7e note B_, 1 octave 4 note C_, 1 - callchannel Music_SSAqua_branch_eaf31 + callchannel Music_SSAqua_branch_eaf88 note G_, 4 note __, 4 note G_, 8 @@ -338,7 +336,7 @@ Music_SSAqua_branch_eae7e: ; eae7e dutycycle $0 note B_, 2 note A_, 2 - callchannel Music_SSAqua_branch_eaf7e + callchannel Music_SSAqua_branch_eafd5 notetype $6, $b7 note G#, 1 note A_, 11 @@ -365,7 +363,7 @@ Music_SSAqua_branch_eae7e: ; eae7e note A#, 12 note B_, 2 note A_, 2 - callchannel Music_SSAqua_branch_eaf7e + callchannel Music_SSAqua_branch_eafd5 notetype $6, $b7 note G#, 1 note A_, 11 @@ -391,10 +389,9 @@ Music_SSAqua_branch_eae7e: ; eae7e note G_, 8 note A_, 8 note __, 8 - loopchannel 0, Music_SSAqua_branch_eae7e -; eaf31 + loopchannel 0, Music_SSAqua_branch_eaed5 -Music_SSAqua_branch_eaf31: ; eaf31 +Music_SSAqua_branch_eaf88: note D_, 6 octave 3 note B_, 1 @@ -468,9 +465,8 @@ Music_SSAqua_branch_eaf31: ; eaf31 note E_, 2 note F#, 2 endchannel -; eaf7e -Music_SSAqua_branch_eaf7e: ; eaf7e +Music_SSAqua_branch_eafd5: notetype $c, $b7 note B_, 10 note F#, 1 @@ -480,9 +476,8 @@ Music_SSAqua_branch_eaf7e: ; eaf7e note F#, 1 note __, 1 endchannel -; eaf89 -Music_SSAqua_branch_eaf89: ; eaf89 +Music_SSAqua_branch_eafe0: octave 3 note D_, 10 note E_, 1 @@ -504,9 +499,8 @@ Music_SSAqua_branch_eaf89: ; eaf89 note A_, 1 note __, 1 endchannel -; eaf9e -Music_SSAqua_branch_eaf9e: ; eaf9e +Music_SSAqua_branch_eaff5: octave 5 note G_, 1 note D_, 1 @@ -580,9 +574,8 @@ Music_SSAqua_branch_eaf9e: ; eaf9e note A_, 1 note G_, 1 endchannel -; eafe7 -Music_SSAqua_branch_eafe7: ; eafe7 +Music_SSAqua_branch_eb03e: octave 5 note G_, 1 octave 4 @@ -607,9 +600,8 @@ Music_SSAqua_branch_eafe7: ; eafe7 octave 3 note G_, 1 endchannel -; eafff -Music_SSAqua_Ch3: ; eafff +Music_SSAqua_Ch3: stereopanning $ff vibrato $8, $34 notetype $6, $15 @@ -618,7 +610,7 @@ Music_SSAqua_Ch3: ; eafff note __, 1 note G_, 1 note __, 1 -Music_SSAqua_branch_eb00c: ; eb00c +Music_SSAqua_branch_eb063: note G_, 16 note __, 8 note G_, 2 @@ -649,9 +641,9 @@ Music_SSAqua_branch_eb00c: ; eb00c note B_, 1 octave 4 note E_, 1 - callchannel Music_SSAqua_branch_eb0f6 - callchannel Music_SSAqua_branch_eb0f6 -Music_SSAqua_branch_eb036: ; eb036 + callchannel Music_SSAqua_branch_eb14d + callchannel Music_SSAqua_branch_eb14d +Music_SSAqua_branch_eb08d: note G_, 2 note __, 2 octave 3 @@ -678,10 +670,10 @@ Music_SSAqua_branch_eb036: ; eb036 octave 2 note G_, 1 note __, 1 - loopchannel 4, Music_SSAqua_branch_eb036 - callchannel Music_SSAqua_branch_eb11b - callchannel Music_SSAqua_branch_eb11b - callchannel Music_SSAqua_branch_eb1d9 + loopchannel 4, Music_SSAqua_branch_eb08d + callchannel Music_SSAqua_branch_eb172 + callchannel Music_SSAqua_branch_eb172 + callchannel Music_SSAqua_branch_eb230 octave 3 note E_, 2 note __, 2 @@ -754,7 +746,7 @@ Music_SSAqua_branch_eb036: ; eb036 octave 4 note F#, 1 note __, 3 - callchannel Music_SSAqua_branch_eb1d9 + callchannel Music_SSAqua_branch_eb230 octave 3 note E_, 2 note __, 2 @@ -829,10 +821,9 @@ Music_SSAqua_branch_eb036: ; eb036 note __, 1 note G_, 1 note __, 1 - loopchannel 0, Music_SSAqua_branch_eb00c -; eb0f6 + loopchannel 0, Music_SSAqua_branch_eb063 -Music_SSAqua_branch_eb0f6: ; eb0f6 +Music_SSAqua_branch_eb14d: notetype $6, $15 octave 2 note G_, 2 @@ -868,9 +859,8 @@ Music_SSAqua_branch_eb0f6: ; eb0f6 note G_, 1 note __, 1 endchannel -; eb11b -Music_SSAqua_branch_eb11b: ; eb11b +Music_SSAqua_branch_eb172: octave 2 note G_, 2 note __, 2 @@ -1061,9 +1051,8 @@ Music_SSAqua_branch_eb11b: ; eb11b note F#, 1 note __, 3 endchannel -; eb1d9 -Music_SSAqua_branch_eb1d9: ; eb1d9 +Music_SSAqua_branch_eb230: octave 2 note B_, 2 note __, 2 @@ -1089,13 +1078,12 @@ Music_SSAqua_branch_eb1d9: ; eb1d9 note D#, 1 note __, 3 endchannel -; eb1f2 -Music_SSAqua_Ch4: ; eb1f2 +Music_SSAqua_Ch4: togglenoise $3 notetype $c note __, 2 -Music_SSAqua_branch_eb1f7: ; eb1f7 +Music_SSAqua_branch_eb24e: note G#, 1 note G_, 1 note G_, 1 @@ -1112,35 +1100,34 @@ Music_SSAqua_branch_eb1f7: ; eb1f7 note G_, 1 note G#, 1 note G_, 1 - loopchannel 12, Music_SSAqua_branch_eb1f7 - callchannel Music_SSAqua_branch_eb257 - callchannel Music_SSAqua_branch_eb257 - callchannel Music_SSAqua_branch_eb257 - callchannel Music_SSAqua_branch_eb264 - callchannel Music_SSAqua_branch_eb257 - callchannel Music_SSAqua_branch_eb257 - callchannel Music_SSAqua_branch_eb257 - callchannel Music_SSAqua_branch_eb264 - callchannel Music_SSAqua_branch_eb257 - callchannel Music_SSAqua_branch_eb257 - callchannel Music_SSAqua_branch_eb257 - callchannel Music_SSAqua_branch_eb264 - callchannel Music_SSAqua_branch_eb257 - callchannel Music_SSAqua_branch_eb257 - callchannel Music_SSAqua_branch_eb257 - callchannel Music_SSAqua_branch_eb270 - callchannel Music_SSAqua_branch_eb257 - callchannel Music_SSAqua_branch_eb257 - callchannel Music_SSAqua_branch_eb257 - callchannel Music_SSAqua_branch_eb264 - callchannel Music_SSAqua_branch_eb257 - callchannel Music_SSAqua_branch_eb257 - callchannel Music_SSAqua_branch_eb257 - callchannel Music_SSAqua_branch_eb270 - loopchannel 0, Music_SSAqua_branch_eb1f7 -; eb257 + loopchannel 12, Music_SSAqua_branch_eb24e + callchannel Music_SSAqua_branch_eb2ae + callchannel Music_SSAqua_branch_eb2ae + callchannel Music_SSAqua_branch_eb2ae + callchannel Music_SSAqua_branch_eb2bb + callchannel Music_SSAqua_branch_eb2ae + callchannel Music_SSAqua_branch_eb2ae + callchannel Music_SSAqua_branch_eb2ae + callchannel Music_SSAqua_branch_eb2bb + callchannel Music_SSAqua_branch_eb2ae + callchannel Music_SSAqua_branch_eb2ae + callchannel Music_SSAqua_branch_eb2ae + callchannel Music_SSAqua_branch_eb2bb + callchannel Music_SSAqua_branch_eb2ae + callchannel Music_SSAqua_branch_eb2ae + callchannel Music_SSAqua_branch_eb2ae + callchannel Music_SSAqua_branch_eb2c7 + callchannel Music_SSAqua_branch_eb2ae + callchannel Music_SSAqua_branch_eb2ae + callchannel Music_SSAqua_branch_eb2ae + callchannel Music_SSAqua_branch_eb2bb + callchannel Music_SSAqua_branch_eb2ae + callchannel Music_SSAqua_branch_eb2ae + callchannel Music_SSAqua_branch_eb2ae + callchannel Music_SSAqua_branch_eb2c7 + loopchannel 0, Music_SSAqua_branch_eb24e -Music_SSAqua_branch_eb257: ; eb257 +Music_SSAqua_branch_eb2ae: note A#, 2 note G_, 1 note G_, 1 @@ -1154,9 +1141,8 @@ Music_SSAqua_branch_eb257: ; eb257 note G_, 1 note G_, 1 endchannel -; eb264 -Music_SSAqua_branch_eb264: ; eb264 +Music_SSAqua_branch_eb2bb: note A#, 2 note G_, 1 note G_, 1 @@ -1169,9 +1155,8 @@ Music_SSAqua_branch_eb264: ; eb264 note D_, 2 note F#, 2 endchannel -; eb270 -Music_SSAqua_branch_eb270: ; eb270 +Music_SSAqua_branch_eb2c7: note A#, 2 note G_, 1 note G_, 1 @@ -1184,6 +1169,3 @@ Music_SSAqua_branch_eb270: ; eb270 note D_, 2 note C_, 2 endchannel -; eb27c - - diff --git a/audio/music/successfulcapture.asm b/audio/music/successfulcapture.asm index 61ccc3eb..1b53f4a1 100644 --- a/audio/music/successfulcapture.asm +++ b/audio/music/successfulcapture.asm @@ -1,28 +1,22 @@ -Music_SuccessfulCapture: ; f4602 - dbw $80, Music_SuccessfulCapture_Ch1 - dbw $01, Music_SuccessfulCapture_Ch2 - dbw $02, Music_SuccessfulCapture_Ch3 -; f460b +Music_SuccessfulCapture: + musicheader 3, 1, Music_SuccessfulCapture_Ch1 + musicheader 1, 2, Music_SuccessfulCapture_Ch2 + musicheader 1, 3, Music_SuccessfulCapture_Ch3 -Music_SuccessfulCapture_Ch1: ; f460b +Music_SuccessfulCapture_Ch1: tempo 126 volume $77 dutycycle $3 tone $0001 notetype $c, $a1 jumpchannel Music_SuccessfulCapture_branch_f4536 -; f461b -Music_SuccessfulCapture_Ch2: ; f461b +Music_SuccessfulCapture_Ch2: vibrato $12, $24 notetype $c, $c1 dutycycle $2 jumpchannel Music_SuccessfulCapture_branch_f4585 -; f4626 -Music_SuccessfulCapture_Ch3: ; f4626 +Music_SuccessfulCapture_Ch3: notetype $c, $25 jumpchannel Music_SuccessfulCapture_branch_f45cf -; f462c - - diff --git a/audio/music/surf.asm b/audio/music/surf.asm index 2d8d3fa1..c3948f5f 100644 --- a/audio/music/surf.asm +++ b/audio/music/surf.asm @@ -1,19 +1,16 @@ -Music_Surf: ; f518a - dbw $80, Music_Surf_Ch1 - dbw $01, Music_Surf_Ch2 - dbw $02, Music_Surf_Ch3 -; f5193 +Music_Surf: + musicheader 3, 1, Music_Surf_Ch1 + musicheader 1, 2, Music_Surf_Ch2 + musicheader 1, 3, Music_Surf_Ch3 + db $3 -INCBIN "baserom.gbc", $f5193, $f5194 - $f5193 - - -Music_Surf_Ch1: ; f5194 +Music_Surf_Ch1: tempo 108 volume $77 notetype $c, $a7 stereopanning $f -Music_Surf_branch_f519e: ; f519e +Music_Surf_branch_f519e: dutycycle $2 vibrato $10, $24 intensity $73 @@ -121,9 +118,8 @@ Music_Surf_branch_f519e: ; f519e octave 3 note D#, 2 loopchannel 0, Music_Surf_branch_f519e -; f5233 -Music_Surf_branch_f5233: ; f5233 +Music_Surf_branch_f5233: notetype $c, $a7 octave 3 note D#, 4 @@ -216,9 +212,8 @@ Music_Surf_branch_f5233: ; f5233 note C#, 4 note D_, 4 endchannel -; f5293 -Music_Surf_branch_f5293: ; f5293 +Music_Surf_branch_f5293: octave 4 note G#, 16 note D#, 4 @@ -283,9 +278,8 @@ Music_Surf_branch_f5293: ; f5293 octave 3 note G_, 2 endchannel -; f52d9 -Music_Surf_branch_f52d9: ; f52d9 +Music_Surf_branch_f52d9: octave 3 note A#, 3 note G_, 3 @@ -343,15 +337,14 @@ Music_Surf_branch_f52d9: ; f52d9 octave 2 note B_, 8 endchannel -; f5317 -Music_Surf_Ch2: ; f5317 -Music_Surf_branch_f5317: ; f5317 +Music_Surf_Ch2: +Music_Surf_branch_f5317: notetype $c, $c2 stereopanning $f0 dutycycle $2 vibrato $14, $23 -Music_Surf_branch_f5321: ; f5321 +Music_Surf_branch_f5321: octave 1 note A#, 4 octave 2 @@ -367,7 +360,7 @@ Music_Surf_branch_f5321: ; f5321 note __, 3 note A#, 1 note __, 3 -Music_Surf_branch_f5333: ; f5333 +Music_Surf_branch_f5333: note D#, 4 note G_, 2 note G#, 2 @@ -427,7 +420,7 @@ Music_Surf_branch_f5333: ; f5333 note B_, 16 octave 4 note C#, 8 - forceoctave $c + pitchoffset 0, CC dutycycle $3 callchannel Music_Surf_branch_f53d6 intensity $b8 @@ -438,7 +431,7 @@ Music_Surf_branch_f5333: ; f5333 intensity $b8 dutycycle $1 callchannel Music_Surf_branch_f5404 - forceoctave $0 + pitchoffset 0, C_ notetype $c, $b8 octave 4 note B_, 12 @@ -450,9 +443,8 @@ Music_Surf_branch_f5333: ; f5333 note A#, 4 note B_, 4 loopchannel 0, Music_Surf_branch_f5317 -; f53b2 -Music_Surf_branch_f53b2: ; f53b2 +Music_Surf_branch_f53b2: octave 1 note G#, 4 octave 3 @@ -489,9 +481,8 @@ Music_Surf_branch_f53b2: ; f53b2 note F_, 4 note G_, 4 endchannel -; f53d6 -Music_Surf_branch_f53d6: ; f53d6 +Music_Surf_branch_f53d6: octave 4 note F_, 4 note D#, 4 @@ -509,9 +500,8 @@ Music_Surf_branch_f53d6: ; f53d6 note B_, 1 note A_, 1 endchannel -; f53e8 -Music_Surf_branch_f53e8: ; f53e8 +Music_Surf_branch_f53e8: note A#, 7 octave 4 note C_, 8 @@ -523,9 +513,8 @@ Music_Surf_branch_f53e8: ; f53e8 note C_, 16 note G_, 8 endchannel -; f53f3 -Music_Surf_branch_f53f3: ; f53f3 +Music_Surf_branch_f53f3: note F#, 1 note G_, 3 note F_, 4 @@ -542,9 +531,8 @@ Music_Surf_branch_f53f3: ; f53f3 octave 3 note B_, 1 endchannel -; f5404 -Music_Surf_branch_f5404: ; f5404 +Music_Surf_branch_f5404: octave 4 note C_, 8 note G_, 4 @@ -553,10 +541,9 @@ Music_Surf_branch_f5404: ; f5404 note G#, 8 note D#, 8 endchannel -; f540c -Music_Surf_Ch3: ; f540c -Music_Surf_branch_f540c: ; f540c +Music_Surf_Ch3: +Music_Surf_branch_f540c: stereopanning $ff notetype $c, $15 vibrato $16, $23 @@ -699,9 +686,8 @@ Music_Surf_branch_f540c: ; f540c octave 2 note B_, 4 loopchannel 0, Music_Surf_branch_f540c -; f54c8 -Music_Surf_branch_f54c8: ; f54c8 +Music_Surf_branch_f54c8: octave 3 note D#, 4 note G_, 1 @@ -734,6 +720,3 @@ Music_Surf_branch_f54c8: ; f54c8 note G#, 1 note __, 3 endchannel -; f54e8 - - diff --git a/audio/music/tintower.asm b/audio/music/tintower.asm index e9dd5c31..3871f4ee 100644 --- a/audio/music/tintower.asm +++ b/audio/music/tintower.asm @@ -1,17 +1,16 @@ -Music_TinTower: ; f6811 - dbw $c0, Music_TinTower_Ch1 - dbw $01, Music_TinTower_Ch2 - dbw $02, Music_TinTower_Ch3 - dbw $03, Music_TinTower_Ch4 -; f681d +Music_TinTower: + musicheader 4, 1, Music_TinTower_Ch1 + musicheader 1, 2, Music_TinTower_Ch2 + musicheader 1, 3, Music_TinTower_Ch3 + musicheader 1, 4, Music_TinTower_Ch4 -Music_TinTower_Ch1: ; f681d +Music_TinTower_Ch1: tempo 208 volume $77 dutycycle $3 tone $0004 vibrato $8, $45 -Music_TinTower_branch_f682a: ; f682a +Music_TinTower_branch_f682a: stereopanning $f0 notetype $c, $a5 octave 3 @@ -95,15 +94,14 @@ Music_TinTower_branch_f682a: ; f682a octave 3 note A#, 4 loopchannel 0, Music_TinTower_branch_f682a -; f688b -Music_TinTower_Ch2: ; f688b +Music_TinTower_Ch2: dutycycle $3 tone $0002 vibrato $18, $44 -Music_TinTower_branch_f6893: ; f6893 +Music_TinTower_branch_f6893: stereopanning $ff -Music_TinTower_branch_f6895: ; f6895 +Music_TinTower_branch_f6895: notetype $c, $b5 octave 4 note C_, 4 @@ -185,11 +183,10 @@ Music_TinTower_branch_f6895: ; f6895 intensity $95 note C#, 2 loopchannel 0, Music_TinTower_branch_f6893 -; f68f8 -Music_TinTower_Ch3: ; f68f8 +Music_TinTower_Ch3: notetype $c, $14 -Music_TinTower_branch_f68fb: ; f68fb +Music_TinTower_branch_f68fb: note __, 16 note __, 16 note __, 16 @@ -260,12 +257,11 @@ Music_TinTower_branch_f68fb: ; f68fb note __, 11 stereopanning $ff loopchannel 0, Music_TinTower_branch_f68fb -; f6948 -Music_TinTower_Ch4: ; f6948 +Music_TinTower_Ch4: togglenoise $0 notetype $c -Music_TinTower_branch_f694c: ; f694c +Music_TinTower_branch_f694c: stereopanning $f note G_, 2 stereopanning $f0 @@ -293,6 +289,3 @@ Music_TinTower_branch_f694c: ; f694c note G_, 2 note F_, 2 loopchannel 0, Music_TinTower_branch_f694c -; f6974 - - diff --git a/audio/music/titlescreen.asm b/audio/music/titlescreen.asm index 42d36d65..4eb7c49a 100644 --- a/audio/music/titlescreen.asm +++ b/audio/music/titlescreen.asm @@ -1,11 +1,10 @@ -Music_TitleScreen: ; eb7b1 - dbw $c0, Music_TitleScreen_Ch1 - dbw $01, Music_TitleScreen_Ch2 - dbw $02, Music_TitleScreen_Ch3 - dbw $03, Music_TitleScreen_Ch4 -; eb7bd +Music_TitleScreen: + musicheader 4, 1, Music_TitleScreen_Ch1 + musicheader 1, 2, Music_TitleScreen_Ch2 + musicheader 1, 3, Music_TitleScreen_Ch3 + musicheader 1, 4, Music_TitleScreen_Ch4 -Music_TitleScreen_Ch1: ; eb7bd +Music_TitleScreen_Ch1: tempo 256 volume $77 dutycycle $3 @@ -213,17 +212,17 @@ Music_TitleScreen_Ch1: ; eb7bd tempo 136 note C#, 6 tempo 134 - callchannel Music_TitleScreen_branch_eb92c + callchannel Music_TitleScreen_branch_eb96d octave 4 note C_, 4 note C_, 4 note C#, 4 - callchannel Music_TitleScreen_branch_eb92c + callchannel Music_TitleScreen_branch_eb96d octave 4 note C_, 4 note C_, 4 note C#, 4 - callchannel Music_TitleScreen_branch_eb92c + callchannel Music_TitleScreen_branch_eb96d octave 3 note E_, 4 note E_, 4 @@ -290,12 +289,11 @@ Music_TitleScreen_Ch1: ; eb7bd note G_, 1 note __, 11 endchannel -; eb92c -Music_TitleScreen_branch_eb92c: ; eb92c +Music_TitleScreen_branch_eb96d: notetype $c, $c3 note D_, 1 -Music_TitleScreen_branch_eb930: ; eb930 +Music_TitleScreen_branch_eb971: note __, 1 octave 2 note D_, 1 @@ -303,16 +301,15 @@ Music_TitleScreen_branch_eb930: ; eb930 note A_, 1 octave 2 note D_, 1 - loopchannel 5, Music_TitleScreen_branch_eb930 + loopchannel 5, Music_TitleScreen_branch_eb971 note __, 1 note D_, 1 octave 1 note A_, 1 notetype $8, $b7 endchannel -; eb943 -Music_TitleScreen_Ch2: ; eb943 +Music_TitleScreen_Ch2: dutycycle $3 vibrato $14, $12 notetype $c, $c7 @@ -515,15 +512,15 @@ Music_TitleScreen_Ch2: ; eb943 note C#, 4 tone $0001 stereopanning $f - callchannel Music_TitleScreen_branch_ebabb + callchannel Music_TitleScreen_branch_ebae7 note C#, 4 - callchannel Music_TitleScreen_branch_ebabb + callchannel Music_TitleScreen_branch_ebae7 note C#, 4 - callchannel Music_TitleScreen_branch_ebabb + callchannel Music_TitleScreen_branch_ebae7 octave 4 note A_, 4 stereopanning $ff - tone $0000 + tone 0 notetype $c, $b0 octave 3 note B_, 6 @@ -589,19 +586,18 @@ Music_TitleScreen_Ch2: ; eb943 note G_, 1 note __, 11 endchannel -; ebabb -Music_TitleScreen_branch_ebabb: ; ebabb +Music_TitleScreen_branch_ebae7: notetype $c, $b2 note D_, 1 -Music_TitleScreen_branch_ebabf: ; ebabf +Music_TitleScreen_branch_ebaeb: octave 3 note A_, 1 octave 4 note D_, 1 note A_, 1 note D_, 1 - loopchannel 5, Music_TitleScreen_branch_ebabf + loopchannel 5, Music_TitleScreen_branch_ebaeb octave 3 note A_, 1 octave 4 @@ -612,9 +608,8 @@ Music_TitleScreen_branch_ebabf: ; ebabf note C_, 4 note C_, 4 endchannel -; ebad5 -Music_TitleScreen_Ch3: ; ebad5 +Music_TitleScreen_Ch3: stereopanning $f vibrato $10, $14 tone $0001 @@ -831,7 +826,7 @@ Music_TitleScreen_Ch3: ; ebad5 note __, 1 stereopanning $ff notetype $c, $16 - tone $0000 + tone 0 octave 4 note A_, 2 octave 5 @@ -952,9 +947,8 @@ Music_TitleScreen_Ch3: ; ebad5 note G_, 1 note __, 11 endchannel -; ebc47 -Music_TitleScreen_Ch4: ; ebc47 +Music_TitleScreen_Ch4: togglenoise $5 stereopanning $f0 notetype $c @@ -1018,9 +1012,9 @@ Music_TitleScreen_Ch4: ; ebc47 note C_, 1 note C_, 1 notetype $c - callchannel Music_TitleScreen_branch_ebd6b - callchannel Music_TitleScreen_branch_ebd75 - callchannel Music_TitleScreen_branch_ebd75 + callchannel Music_TitleScreen_branch_ebd77 + callchannel Music_TitleScreen_branch_ebd81 + callchannel Music_TitleScreen_branch_ebd81 note C_, 2 note D#, 2 note C_, 2 @@ -1035,7 +1029,7 @@ Music_TitleScreen_Ch4: ; ebc47 note C_, 1 note C_, 1 notetype $c - callchannel Music_TitleScreen_branch_ebd6b + callchannel Music_TitleScreen_branch_ebd77 note C_, 2 note D#, 2 note C_, 2 @@ -1045,7 +1039,7 @@ Music_TitleScreen_Ch4: ; ebc47 note C_, 1 note C_, 2 note C_, 2 - callchannel Music_TitleScreen_branch_ebd75 + callchannel Music_TitleScreen_branch_ebd81 note C_, 2 note D#, 2 note C_, 2 @@ -1056,9 +1050,9 @@ Music_TitleScreen_Ch4: ; ebc47 note C_, 2 note C_, 1 note C_, 1 - callchannel Music_TitleScreen_branch_ebd6b - callchannel Music_TitleScreen_branch_ebd75 - callchannel Music_TitleScreen_branch_ebd75 + callchannel Music_TitleScreen_branch_ebd77 + callchannel Music_TitleScreen_branch_ebd81 + callchannel Music_TitleScreen_branch_ebd81 note C_, 2 note D#, 2 note C_, 2 @@ -1073,8 +1067,8 @@ Music_TitleScreen_Ch4: ; ebc47 note D_, 1 note C#, 1 notetype $c - callchannel Music_TitleScreen_branch_ebd6b - callchannel Music_TitleScreen_branch_ebd75 + callchannel Music_TitleScreen_branch_ebd77 + callchannel Music_TitleScreen_branch_ebd81 note C_, 2 note D#, 2 note C_, 2 @@ -1124,31 +1118,31 @@ Music_TitleScreen_Ch4: ; ebc47 note C#, 1 note C_, 1 note C_, 1 - callchannel Music_TitleScreen_branch_ebd7f - callchannel Music_TitleScreen_branch_ebd87 + callchannel Music_TitleScreen_branch_ebd8b + callchannel Music_TitleScreen_branch_ebd93 note C#, 1 note D_, 1 note D_, 1 note C#, 1 notetype $c - callchannel Music_TitleScreen_branch_ebd7f - callchannel Music_TitleScreen_branch_ebd87 + callchannel Music_TitleScreen_branch_ebd8b + callchannel Music_TitleScreen_branch_ebd93 note D_, 1 note D_, 1 note C#, 1 note C#, 1 notetype $c - callchannel Music_TitleScreen_branch_ebd7f - callchannel Music_TitleScreen_branch_ebd87 + callchannel Music_TitleScreen_branch_ebd8b + callchannel Music_TitleScreen_branch_ebd93 note C#, 1 note C#, 1 note C#, 1 note C#, 1 notetype $c note G#, 16 -Music_TitleScreen_branch_ebd34: ; ebd34 +Music_TitleScreen_branch_ebd40: note __, 16 - loopchannel 6, Music_TitleScreen_branch_ebd34 + loopchannel 6, Music_TitleScreen_branch_ebd40 note __, 12 notetype $6 note D_, 1 @@ -1194,9 +1188,8 @@ Music_TitleScreen_branch_ebd34: ; ebd34 note C_, 4 note B_, 4 endchannel -; ebd6b -Music_TitleScreen_branch_ebd6b: ; ebd6b +Music_TitleScreen_branch_ebd77: note C_, 2 note D#, 2 note C_, 2 @@ -1207,9 +1200,8 @@ Music_TitleScreen_branch_ebd6b: ; ebd6b note C_, 2 note D#, 2 endchannel -; ebd75 -Music_TitleScreen_branch_ebd75: ; ebd75 +Music_TitleScreen_branch_ebd81: note C_, 2 note D#, 2 note C_, 2 @@ -1220,17 +1212,15 @@ Music_TitleScreen_branch_ebd75: ; ebd75 note C_, 2 note D#, 2 endchannel -; ebd7f -Music_TitleScreen_branch_ebd7f: ; ebd7f +Music_TitleScreen_branch_ebd8b: note C_, 2 note C_, 1 note C_, 1 - loopchannel 4, Music_TitleScreen_branch_ebd7f + loopchannel 4, Music_TitleScreen_branch_ebd8b endchannel -; ebd87 -Music_TitleScreen_branch_ebd87: ; ebd87 +Music_TitleScreen_branch_ebd93: note C_, 2 note C_, 1 note C_, 1 @@ -1241,6 +1231,3 @@ Music_TitleScreen_branch_ebd87: ; ebd87 note C_, 4 note C_, 4 endchannel -; ebd92 - - diff --git a/audio/music/trainervictory.asm b/audio/music/trainervictory.asm index 7407c543..56b2d847 100644 --- a/audio/music/trainervictory.asm +++ b/audio/music/trainervictory.asm @@ -1,10 +1,9 @@ -Music_TrainerVictory: ; ebe9f - dbw $80, Music_TrainerVictory_Ch1 - dbw $01, Music_TrainerVictory_Ch2 - dbw $02, Music_TrainerVictory_Ch3 -; ebea8 +Music_TrainerVictory: + musicheader 3, 1, Music_TrainerVictory_Ch1 + musicheader 1, 2, Music_TrainerVictory_Ch2 + musicheader 1, 3, Music_TrainerVictory_Ch3 -Music_TrainerVictory_Ch1: ; ebea8 +Music_TrainerVictory_Ch1: tempo 120 volume $77 dutycycle $2 @@ -20,9 +19,9 @@ Music_TrainerVictory_Ch1: ; ebea8 intensity $b6 note A_, 12 stereopanning $f -Music_TrainerVictory_branch_ebec1: ; ebec1 +Music_TrainerVictory_branch_ebecd: intensity $72 - callchannel Music_TrainerVictory_branch_ebf05 + callchannel Music_TrainerVictory_branch_ebf11 intensity $51 note C#, 2 note E_, 2 @@ -38,8 +37,8 @@ Music_TrainerVictory_branch_ebec1: ; ebec1 octave 4 note C#, 2 note E_, 6 - loopchannel 2, Music_TrainerVictory_branch_ebec1 - callchannel Music_TrainerVictory_branch_ebf05 + loopchannel 2, Music_TrainerVictory_branch_ebecd + callchannel Music_TrainerVictory_branch_ebf11 note A_, 2 note __, 2 note F_, 2 @@ -48,32 +47,31 @@ Music_TrainerVictory_branch_ebec1: ; ebec1 note __, 2 note G_, 2 note A#, 6 -Music_TrainerVictory_branch_ebee6: ; ebee6 +Music_TrainerVictory_branch_ebef2: intensity $72 octave 4 note D_, 2 note C#, 2 octave 3 note A_, 2 - loopchannel 3, Music_TrainerVictory_branch_ebee6 + loopchannel 3, Music_TrainerVictory_branch_ebef2 note F#, 2 note A_, 2 octave 4 note D_, 2 -Music_TrainerVictory_branch_ebef5: ; ebef5 +Music_TrainerVictory_branch_ebf01: octave 4 note C#, 2 octave 3 note B_, 2 note A_, 2 - loopchannel 3, Music_TrainerVictory_branch_ebef5 + loopchannel 3, Music_TrainerVictory_branch_ebf01 note E_, 2 note F#, 2 note G_, 2 - loopchannel 0, Music_TrainerVictory_branch_ebec1 -; ebf05 + loopchannel 0, Music_TrainerVictory_branch_ebecd -Music_TrainerVictory_branch_ebf05: ; ebf05 +Music_TrainerVictory_branch_ebf11: octave 3 note F#, 2 note __, 2 @@ -84,9 +82,8 @@ Music_TrainerVictory_branch_ebf05: ; ebf05 note E_, 2 note G_, 6 endchannel -; ebf0f -Music_TrainerVictory_Ch2: ; ebf0f +Music_TrainerVictory_Ch2: vibrato $12, $34 dutycycle $3 notetype $8, $d1 @@ -101,9 +98,9 @@ Music_TrainerVictory_Ch2: ; ebf0f intensity $d6 note D_, 12 stereopanning $f0 -Music_TrainerVictory_branch_ebf24: ; ebf24 +Music_TrainerVictory_branch_ebf30: notetype $8, $82 - callchannel Music_TrainerVictory_branch_ebf4a + callchannel Music_TrainerVictory_branch_ebf56 note F#, 2 note __, 2 note G_, 2 @@ -112,8 +109,8 @@ Music_TrainerVictory_branch_ebf24: ; ebf24 note __, 2 note F#, 2 note G_, 6 - loopchannel 2, Music_TrainerVictory_branch_ebf24 - callchannel Music_TrainerVictory_branch_ebf4a + loopchannel 2, Music_TrainerVictory_branch_ebf30 + callchannel Music_TrainerVictory_branch_ebf56 note F_, 2 note __, 2 note C_, 2 @@ -125,10 +122,9 @@ Music_TrainerVictory_branch_ebf24: ; ebf24 notetype $c, $88 note F#, 16 note E_, 16 - loopchannel 0, Music_TrainerVictory_branch_ebf24 -; ebf4a + loopchannel 0, Music_TrainerVictory_branch_ebf30 -Music_TrainerVictory_branch_ebf4a: ; ebf4a +Music_TrainerVictory_branch_ebf56: octave 4 note D_, 2 note __, 2 @@ -143,9 +139,8 @@ Music_TrainerVictory_branch_ebf4a: ; ebf4a octave 4 note E_, 6 endchannel -; ebf58 -Music_TrainerVictory_Ch3: ; ebf58 +Music_TrainerVictory_Ch3: notetype $8, $25 octave 3 note G_, 6 @@ -160,8 +155,8 @@ Music_TrainerVictory_Ch3: ; ebf58 note C#, 2 octave 2 note B_, 2 -Music_TrainerVictory_branch_ebf68: ; ebf68 - callchannel Music_TrainerVictory_branch_ebfa5 +Music_TrainerVictory_branch_ebf74: + callchannel Music_TrainerVictory_branch_ebfb1 octave 3 note C#, 2 note __, 2 @@ -176,8 +171,8 @@ Music_TrainerVictory_branch_ebf68: ; ebf68 note A_, 1 note __, 1 note A_, 6 - loopchannel 2, Music_TrainerVictory_branch_ebf68 - callchannel Music_TrainerVictory_branch_ebfa5 + loopchannel 2, Music_TrainerVictory_branch_ebf74 + callchannel Music_TrainerVictory_branch_ebfb1 octave 3 note C_, 2 note __, 2 @@ -211,10 +206,9 @@ Music_TrainerVictory_branch_ebf68: ; ebf68 note G_, 2 note E_, 2 note C#, 2 - loopchannel 0, Music_TrainerVictory_branch_ebf68 -; ebfa5 + loopchannel 0, Music_TrainerVictory_branch_ebf74 -Music_TrainerVictory_branch_ebfa5: ; ebfa5 +Music_TrainerVictory_branch_ebfb1: octave 2 note A_, 2 note __, 2 @@ -233,5 +227,3 @@ Music_TrainerVictory_branch_ebfa5: ; ebfa5 octave 2 note B_, 2 endchannel -; ebfb7 - diff --git a/audio/music/unioncave.asm b/audio/music/unioncave.asm index f08926b1..94c7aec6 100644 --- a/audio/music/unioncave.asm +++ b/audio/music/unioncave.asm @@ -1,23 +1,22 @@ -Music_UnionCave: ; f5c60 - dbw $c0, Music_UnionCave_Ch1 - dbw $01, Music_UnionCave_Ch2 - dbw $02, Music_UnionCave_Ch3 - dbw $03, Music_UnionCave_Ch4 -; f5c6c +Music_UnionCave: + musicheader 4, 1, Music_UnionCave_Ch1 + musicheader 1, 2, Music_UnionCave_Ch2 + musicheader 1, 3, Music_UnionCave_Ch3 + musicheader 1, 4, Music_UnionCave_Ch4 -Music_UnionCave_Ch1: ; f5c6c +Music_UnionCave_Ch1: tempo 160 volume $77 dutycycle $1 tone $0002 vibrato $18, $34 stereopanning $f -Music_UnionCave_branch_f5c7b: ; f5c7b +Music_UnionCave_branch_f5c7b: notetype $c, $b3 -Music_UnionCave_branch_f5c7e: ; f5c7e +Music_UnionCave_branch_f5c7e: callchannel Music_UnionCave_branch_f5ccf loopchannel 4, Music_UnionCave_branch_f5c7e -Music_UnionCave_branch_f5c85: ; f5c85 +Music_UnionCave_branch_f5c85: octave 2 note G#, 2 octave 3 @@ -27,7 +26,7 @@ Music_UnionCave_branch_f5c85: ; f5c85 note E_, 2 note F_, 4 loopchannel 8, Music_UnionCave_branch_f5c85 -Music_UnionCave_branch_f5c91: ; f5c91 +Music_UnionCave_branch_f5c91: octave 2 note A_, 2 octave 3 @@ -64,21 +63,19 @@ Music_UnionCave_branch_f5c91: ; f5c91 callchannel Music_UnionCave_branch_f5ccf tone $0002 loopchannel 0, Music_UnionCave_branch_f5c7b -; f5ccf -Music_UnionCave_branch_f5ccf: ; f5ccf +Music_UnionCave_branch_f5ccf: octave 2 note G#, 2 octave 3 note C#, 2 note E_, 12 endchannel -; f5cd5 -Music_UnionCave_Ch2: ; f5cd5 +Music_UnionCave_Ch2: dutycycle $3 vibrato $8, $24 -Music_UnionCave_branch_f5cda: ; f5cda +Music_UnionCave_branch_f5cda: notetype $c, $c4 callchannel Music_UnionCave_branch_f5d34 intensity $c5 @@ -135,9 +132,8 @@ Music_UnionCave_branch_f5cda: ; f5cda callchannel Music_UnionCave_branch_f5d52 vibrato $8, $24 loopchannel 0, Music_UnionCave_branch_f5cda -; f5d34 -Music_UnionCave_branch_f5d34: ; f5d34 +Music_UnionCave_branch_f5d34: octave 4 note C_, 4 octave 3 @@ -168,27 +164,25 @@ Music_UnionCave_branch_f5d34: ; f5d34 note C#, 4 note C_, 4 endchannel -; f5d52 -Music_UnionCave_branch_f5d52: ; f5d52 +Music_UnionCave_branch_f5d52: octave 2 note G#, 2 octave 3 note C#, 2 note E_, 12 endchannel -; f5d58 -Music_UnionCave_Ch3: ; f5d58 +Music_UnionCave_Ch3: notetype $c, $16 stereopanning $f0 -Music_UnionCave_branch_f5d5d: ; f5d5d +Music_UnionCave_branch_f5d5d: note __, 16 loopchannel 7, Music_UnionCave_branch_f5d5d note __, 14 octave 4 note C_, 2 -Music_UnionCave_branch_f5d65: ; f5d65 +Music_UnionCave_branch_f5d65: note __, 2 octave 3 note E_, 2 @@ -200,7 +194,7 @@ Music_UnionCave_branch_f5d65: ; f5d65 octave 4 note C_, 2 loopchannel 4, Music_UnionCave_branch_f5d65 -Music_UnionCave_branch_f5d73: ; f5d73 +Music_UnionCave_branch_f5d73: note __, 2 octave 3 note F_, 2 @@ -224,7 +218,7 @@ Music_UnionCave_branch_f5d73: ; f5d73 octave 3 note B_, 8 note A#, 8 -Music_UnionCave_branch_f5d8d: ; f5d8d +Music_UnionCave_branch_f5d8d: note A_, 4 note G_, 4 note A#, 2 @@ -237,16 +231,15 @@ Music_UnionCave_branch_f5d8d: ; f5d8d note A_, 4 note G_, 4 note A#, 8 -Music_UnionCave_branch_f5d9c: ; f5d9c +Music_UnionCave_branch_f5d9c: note __, 16 loopchannel 4, Music_UnionCave_branch_f5d9c loopchannel 0, Music_UnionCave_branch_f5d5d -; f5da5 -Music_UnionCave_Ch4: ; f5da5 +Music_UnionCave_Ch4: togglenoise $1 notetype $c -Music_UnionCave_branch_f5da9: ; f5da9 +Music_UnionCave_branch_f5da9: stereopanning $f0 note E_, 4 stereopanning $ff @@ -262,10 +255,4 @@ Music_UnionCave_branch_f5da9: ; f5da9 note G#, 4 note __, 8 loopchannel 0, Music_UnionCave_branch_f5da9 -; f5dc1 - - -INCBIN "baserom.gbc", $f5dc1, $f5dc5 - $f5dc1 - - - + loopchannel 0, Music_UnionCave_branch_f5da9 ; unused diff --git a/audio/music/vermilioncity.asm b/audio/music/vermilioncity.asm index c9a44acb..ec88085e 100644 --- a/audio/music/vermilioncity.asm +++ b/audio/music/vermilioncity.asm @@ -1,14 +1,11 @@ -Music_VermilionCity: ; eb61f - dbw $80, Music_VermilionCity_Ch1 - dbw $01, Music_VermilionCity_Ch2 - dbw $02, Music_VermilionCity_Ch3 -; eb628 +Music_VermilionCity: + musicheader 3, 1, Music_VermilionCity_Ch1 + musicheader 1, 2, Music_VermilionCity_Ch2 + musicheader 1, 3, Music_VermilionCity_Ch3 + db $3 -INCBIN "baserom.gbc", $eb628, $eb629 - $eb628 - - -Music_VermilionCity_Ch1: ; eb629 +Music_VermilionCity_Ch1: stereopanning $f tempo 176 volume $77 @@ -32,20 +29,20 @@ Music_VermilionCity_Ch1: ; eb629 octave 5 note D_, 1 vibrato $10, $23 -Music_VermilionCity_branch_eb649: ; eb649 +Music_VermilionCity_branch_eb6a0: dutycycle $1 notetype $c, $85 - callchannel Music_VermilionCity_branch_eb6a2 + callchannel Music_VermilionCity_branch_eb6f9 note F_, 4 octave 4 note D_, 4 note C#, 4 note E_, 4 - callchannel Music_VermilionCity_branch_eb6a2 - callchannel Music_VermilionCity_branch_eb6aa + callchannel Music_VermilionCity_branch_eb6f9 + callchannel Music_VermilionCity_branch_eb701 dutycycle $2 notetype $c, $85 - callchannel Music_VermilionCity_branch_eb6a2 + callchannel Music_VermilionCity_branch_eb6f9 note F_, 4 octave 4 note D_, 4 @@ -60,8 +57,8 @@ Music_VermilionCity_branch_eb649: ; eb649 note A_, 1 note E_, 1 note C_, 1 - callchannel Music_VermilionCity_branch_eb6a2 - callchannel Music_VermilionCity_branch_eb6aa + callchannel Music_VermilionCity_branch_eb6f9 + callchannel Music_VermilionCity_branch_eb701 intensity $93 dutycycle $0 note __, 2 @@ -72,8 +69,8 @@ Music_VermilionCity_branch_eb649: ; eb649 note F#, 2 note __, 2 note F#, 2 - callchannel Music_VermilionCity_branch_eb6b5 - callchannel Music_VermilionCity_branch_eb6b5 + callchannel Music_VermilionCity_branch_eb70c + callchannel Music_VermilionCity_branch_eb70c intensity $87 dutycycle $2 octave 4 @@ -92,10 +89,9 @@ Music_VermilionCity_branch_eb649: ; eb649 note B_, 4 octave 3 note D_, 4 - loopchannel 0, Music_VermilionCity_branch_eb649 -; eb6a2 + loopchannel 0, Music_VermilionCity_branch_eb6a0 -Music_VermilionCity_branch_eb6a2: ; eb6a2 +Music_VermilionCity_branch_eb6f9: octave 3 note C#, 4 note E_, 4 @@ -104,9 +100,8 @@ Music_VermilionCity_branch_eb6a2: ; eb6a2 note E_, 2 note G#, 2 endchannel -; eb6aa -Music_VermilionCity_branch_eb6aa: ; eb6aa +Music_VermilionCity_branch_eb701: note D_, 2 note F_, 2 note A_, 2 @@ -118,9 +113,8 @@ Music_VermilionCity_branch_eb6aa: ; eb6aa note A_, 2 note E_, 2 endchannel -; eb6b5 -Music_VermilionCity_branch_eb6b5: ; eb6b5 +Music_VermilionCity_branch_eb70c: note __, 2 note F#, 2 note A_, 2 @@ -142,9 +136,8 @@ Music_VermilionCity_branch_eb6b5: ; eb6b5 note B_, 2 note G#, 2 endchannel -; eb6ca -Music_VermilionCity_Ch2: ; eb6ca +Music_VermilionCity_Ch2: stereopanning $ff dutycycle $3 notetype $c, $77 @@ -159,11 +152,11 @@ Music_VermilionCity_Ch2: ; eb6ca note E_, 4 note F#, 4 note G#, 4 -Music_VermilionCity_branch_eb6de: ; eb6de +Music_VermilionCity_branch_eb735: notetype $c, $97 - callchannel Music_VermilionCity_branch_eb711 + callchannel Music_VermilionCity_branch_eb768 note G#, 2 - callchannel Music_VermilionCity_branch_eb711 + callchannel Music_VermilionCity_branch_eb768 note E_, 2 intensity $b7 octave 3 @@ -172,8 +165,8 @@ Music_VermilionCity_branch_eb6de: ; eb6de note C#, 4 note D_, 4 note E_, 4 - callchannel Music_VermilionCity_branch_eb727 - callchannel Music_VermilionCity_branch_eb727 + callchannel Music_VermilionCity_branch_eb77e + callchannel Music_VermilionCity_branch_eb77e note F#, 6 note E_, 1 note F#, 1 @@ -192,10 +185,9 @@ Music_VermilionCity_branch_eb6de: ; eb6de notetype $c, $87 octave 5 note E_, 16 - loopchannel 0, Music_VermilionCity_branch_eb6de -; eb711 + loopchannel 0, Music_VermilionCity_branch_eb735 -Music_VermilionCity_branch_eb711: ; eb711 +Music_VermilionCity_branch_eb768: octave 1 note A_, 8 octave 2 @@ -218,9 +210,8 @@ Music_VermilionCity_branch_eb711: ; eb711 octave 1 note A_, 2 endchannel -; eb727 -Music_VermilionCity_branch_eb727: ; eb727 +Music_VermilionCity_branch_eb77e: note F#, 8 note B_, 8 note A_, 4 @@ -228,9 +219,8 @@ Music_VermilionCity_branch_eb727: ; eb727 note F#, 4 note E_, 4 endchannel -; eb72e -Music_VermilionCity_Ch3: ; eb72e +Music_VermilionCity_Ch3: stereopanning $f0 vibrato $22, $23 notetype $c, $25 @@ -251,15 +241,15 @@ Music_VermilionCity_Ch3: ; eb72e note D_, 1 octave 2 note B_, 1 -Music_VermilionCity_branch_eb747: ; eb747 +Music_VermilionCity_branch_eb79e: notetype $c, $22 - callchannel Music_VermilionCity_branch_eb787 + callchannel Music_VermilionCity_branch_eb7de octave 5 note A_, 6 intensity $24 note E_, 1 note G#, 1 - callchannel Music_VermilionCity_branch_eb787 + callchannel Music_VermilionCity_branch_eb7de note A_, 8 intensity $14 octave 3 @@ -273,14 +263,14 @@ Music_VermilionCity_branch_eb747: ; eb747 note __, 4 note D_, 1 note D_, 1 - callchannel Music_VermilionCity_branch_eb79e + callchannel Music_VermilionCity_branch_eb7f5 octave 4 note D_, 2 octave 3 note D_, 2 note __, 2 note D_, 2 - callchannel Music_VermilionCity_branch_eb79e + callchannel Music_VermilionCity_branch_eb7f5 intensity $25 octave 3 note E_, 8 @@ -298,10 +288,9 @@ Music_VermilionCity_branch_eb747: ; eb747 octave 5 note E_, 1 note G#, 1 - loopchannel 0, Music_VermilionCity_branch_eb747 -; eb787 + loopchannel 0, Music_VermilionCity_branch_eb79e -Music_VermilionCity_branch_eb787: ; eb787 +Music_VermilionCity_branch_eb7de: octave 5 note A_, 8 octave 6 @@ -325,9 +314,8 @@ Music_VermilionCity_branch_eb787: ; eb787 octave 5 note B_, 1 endchannel -; eb79e -Music_VermilionCity_branch_eb79e: ; eb79e +Music_VermilionCity_branch_eb7f5: note A_, 1 note __, 1 note A_, 2 @@ -347,6 +335,3 @@ Music_VermilionCity_branch_eb79e: ; eb79e octave 4 note C#, 1 endchannel -; eb7b1 - - diff --git a/audio/music/victoryroad.asm b/audio/music/victoryroad.asm index babb91de..ea914865 100644 --- a/audio/music/victoryroad.asm +++ b/audio/music/victoryroad.asm @@ -1,21 +1,20 @@ -Music_VictoryRoad: ; f6c72 - dbw $c0, Music_VictoryRoad_Ch1 - dbw $01, Music_VictoryRoad_Ch2 - dbw $02, Music_VictoryRoad_Ch3 - dbw $03, Music_VictoryRoad_Ch4 -; f6c7e +Music_VictoryRoad: + musicheader 4, 1, Music_VictoryRoad_Ch1 + musicheader 1, 2, Music_VictoryRoad_Ch2 + musicheader 1, 3, Music_VictoryRoad_Ch3 + musicheader 1, 4, Music_VictoryRoad_Ch4 -Music_VictoryRoad_Ch1: ; f6c7e +Music_VictoryRoad_Ch1: tempo 144 volume $77 stereopanning $f dutycycle $3 tone $0002 notetype $c, $b3 -Music_VictoryRoad_branch_f6c8d: ; f6c8d +Music_VictoryRoad_branch_f6c8d: callchannel Music_VictoryRoad_branch_f6cb9 loopchannel 6, Music_VictoryRoad_branch_f6c8d -Music_VictoryRoad_branch_f6c94: ; f6c94 +Music_VictoryRoad_branch_f6c94: intensity $b2 octave 2 note A_, 1 @@ -37,13 +36,12 @@ Music_VictoryRoad_branch_f6c94: ; f6c94 octave 3 note G#, 3 loopchannel 2, Music_VictoryRoad_branch_f6c94 -Music_VictoryRoad_branch_f6cae: ; f6cae +Music_VictoryRoad_branch_f6cae: callchannel Music_VictoryRoad_branch_f6cb9 loopchannel 2, Music_VictoryRoad_branch_f6cae loopchannel 0, Music_VictoryRoad_branch_f6c8d -; f6cb9 -Music_VictoryRoad_branch_f6cb9: ; f6cb9 +Music_VictoryRoad_branch_f6cb9: intensity $b2 octave 2 note G_, 1 @@ -63,12 +61,11 @@ Music_VictoryRoad_branch_f6cb9: ; f6cb9 octave 3 note F#, 3 endchannel -; f6cce -Music_VictoryRoad_Ch2: ; f6cce +Music_VictoryRoad_Ch2: dutycycle $3 vibrato $10, $24 -Music_VictoryRoad_branch_f6cd3: ; f6cd3 +Music_VictoryRoad_branch_f6cd3: notetype $c, $c2 callchannel Music_VictoryRoad_branch_f6d1e note __, 2 @@ -119,9 +116,8 @@ Music_VictoryRoad_branch_f6cd3: ; f6cd3 note C#, 1 note D_, 16 loopchannel 0, Music_VictoryRoad_branch_f6cd3 -; f6d1e -Music_VictoryRoad_branch_f6d1e: ; f6d1e +Music_VictoryRoad_branch_f6d1e: octave 3 note E_, 1 note __, 1 @@ -136,15 +132,14 @@ Music_VictoryRoad_branch_f6d1e: ; f6d1e note A_, 1 note A_, 1 endchannel -; f6d2c -Music_VictoryRoad_Ch3: ; f6d2c +Music_VictoryRoad_Ch3: stereopanning $f0 notetype $c, $28 -Music_VictoryRoad_branch_f6d31: ; f6d31 +Music_VictoryRoad_branch_f6d31: callchannel Music_VictoryRoad_branch_f6d52 loopchannel 6, Music_VictoryRoad_branch_f6d31 -Music_VictoryRoad_branch_f6d38: ; f6d38 +Music_VictoryRoad_branch_f6d38: note D_, 1 note __, 1 note B_, 1 @@ -157,13 +152,12 @@ Music_VictoryRoad_branch_f6d38: ; f6d38 note D_, 1 note B_, 3 loopchannel 2, Music_VictoryRoad_branch_f6d38 -Music_VictoryRoad_branch_f6d47: ; f6d47 +Music_VictoryRoad_branch_f6d47: callchannel Music_VictoryRoad_branch_f6d52 loopchannel 2, Music_VictoryRoad_branch_f6d47 loopchannel 0, Music_VictoryRoad_branch_f6d31 -; f6d52 -Music_VictoryRoad_branch_f6d52: ; f6d52 +Music_VictoryRoad_branch_f6d52: octave 3 note C_, 1 note __, 1 @@ -177,12 +171,11 @@ Music_VictoryRoad_branch_f6d52: ; f6d52 note C_, 1 note A_, 3 endchannel -; f6d5f -Music_VictoryRoad_Ch4: ; f6d5f +Music_VictoryRoad_Ch4: togglenoise $0 notetype $c -Music_VictoryRoad_branch_f6d63: ; f6d63 +Music_VictoryRoad_branch_f6d63: note D_, 2 note D_, 2 note D#, 1 @@ -202,6 +195,3 @@ Music_VictoryRoad_branch_f6d63: ; f6d63 note D_, 2 note D#, 1 loopchannel 0, Music_VictoryRoad_branch_f6d63 -; f6d79 - - diff --git a/audio/music/violetcity.asm b/audio/music/violetcity.asm index c8580a2a..a8a89c3c 100644 --- a/audio/music/violetcity.asm +++ b/audio/music/violetcity.asm @@ -1,11 +1,10 @@ -Music_VioletCity: ; f0000 - dbw $c0, Music_VioletCity_Ch1 - dbw $01, Music_VioletCity_Ch2 - dbw $02, Music_VioletCity_Ch3 - dbw $03, Music_VioletCity_Ch4 -; f000c +Music_VioletCity: + musicheader 4, 1, Music_VioletCity_Ch1 + musicheader 1, 2, Music_VioletCity_Ch2 + musicheader 1, 3, Music_VioletCity_Ch3 + musicheader 1, 4, Music_VioletCity_Ch4 -Music_VioletCity_Ch1: ; f000c +Music_VioletCity_Ch1: tempo 164 volume $77 vibrato $12, $25 @@ -65,7 +64,7 @@ Music_VioletCity_Ch1: ; f000c octave 3 note C#, 12 note __, 8 -Music_VioletCity_branch_f0056: ; f0056 +Music_VioletCity_branch_f0056: notetype $6, $95 note __, 4 octave 2 @@ -296,9 +295,8 @@ Music_VioletCity_branch_f0056: ; f0056 note C#, 4 note __, 4 loopchannel 0, Music_VioletCity_branch_f0056 -; f0162 -Music_VioletCity_Ch2: ; f0162 +Music_VioletCity_Ch2: vibrato $12, $24 dutycycle $2 notetype $c, $c7 @@ -349,7 +347,7 @@ Music_VioletCity_Ch2: ; f0162 note __, 2 note D#, 1 note E_, 1 -Music_VioletCity_branch_f0199: ; f0199 +Music_VioletCity_branch_f0199: intensity $b7 note F#, 4 note __, 2 @@ -503,9 +501,8 @@ Music_VioletCity_branch_f0199: ; f0199 note D#, 1 note E_, 1 loopchannel 0, Music_VioletCity_branch_f0199 -; f0247 -Music_VioletCity_Ch3: ; f0247 +Music_VioletCity_Ch3: notetype $c, $25 note __, 16 note __, 6 @@ -530,7 +527,7 @@ Music_VioletCity_Ch3: ; f0247 note F#, 2 octave 2 note A#, 2 -Music_VioletCity_branch_f0261: ; f0261 +Music_VioletCity_branch_f0261: notetype $c, $25 note B_, 1 note __, 5 @@ -692,9 +689,8 @@ Music_VioletCity_branch_f0261: ; f0261 octave 2 note A#, 4 loopchannel 0, Music_VioletCity_branch_f0261 -; f0311 -Music_VioletCity_branch_f0311: ; f0311 +Music_VioletCity_branch_f0311: note G_, 2 note __, 10 note G_, 2 @@ -708,9 +704,8 @@ Music_VioletCity_branch_f0311: ; f0311 octave 2 note A_, 4 endchannel -; f031e -Music_VioletCity_Ch4: ; f031e +Music_VioletCity_Ch4: togglenoise $3 notetype $c note D#, 2 @@ -729,7 +724,7 @@ Music_VioletCity_Ch4: ; f031e note D_, 2 note C_, 8 note D#, 2 -Music_VioletCity_branch_f0338: ; f0338 +Music_VioletCity_branch_f0338: callchannel Music_VioletCity_branch_f037a callchannel Music_VioletCity_branch_f037a callchannel Music_VioletCity_branch_f037a @@ -747,9 +742,8 @@ Music_VioletCity_branch_f0338: ; f0338 callchannel Music_VioletCity_branch_f037a callchannel Music_VioletCity_branch_f037a loopchannel 0, Music_VioletCity_branch_f0338 -; f036c -Music_VioletCity_branch_f036c: ; f036c +Music_VioletCity_branch_f036c: note D_, 1 note D_, 1 note D#, 1 @@ -764,9 +758,8 @@ Music_VioletCity_branch_f036c: ; f036c note G_, 1 note G_, 1 endchannel -; f037a -Music_VioletCity_branch_f037a: ; f037a +Music_VioletCity_branch_f037a: note D#, 2 note G_, 1 note G_, 1 @@ -779,6 +772,3 @@ Music_VioletCity_branch_f037a: ; f037a note D_, 2 note D#, 2 endchannel -; f0386 - - diff --git a/audio/music/viridiancity.asm b/audio/music/viridiancity.asm index 82236a5f..ea38a0e6 100644 --- a/audio/music/viridiancity.asm +++ b/audio/music/viridiancity.asm @@ -1,11 +1,10 @@ -Music_ViridianCity: ; f4000 - dbw $c0, Music_ViridianCity_Ch1 - dbw $01, Music_ViridianCity_Ch2 - dbw $02, Music_ViridianCity_Ch3 - dbw $03, Music_ViridianCity_Ch4 -; f400c +Music_ViridianCity: + musicheader 4, 1, Music_ViridianCity_Ch1 + musicheader 1, 2, Music_ViridianCity_Ch2 + musicheader 1, 3, Music_ViridianCity_Ch3 + musicheader 1, 4, Music_ViridianCity_Ch4 -Music_ViridianCity_Ch1: ; f400c +Music_ViridianCity_Ch1: tempo 157 volume $77 stereopanning $f @@ -42,7 +41,7 @@ Music_ViridianCity_Ch1: ; f400c note __, 4 note G_, 8 note __, 4 -Music_ViridianCity_branch_f4039: ; f4039 +Music_ViridianCity_branch_f4039: callchannel Music_ViridianCity_branch_f40c5 note __, 4 callchannel Music_ViridianCity_branch_f40c5 @@ -170,9 +169,8 @@ Music_ViridianCity_branch_f4039: ; f4039 note G_, 8 note A#, 4 loopchannel 0, Music_ViridianCity_branch_f4039 -; f40c5 -Music_ViridianCity_branch_f40c5: ; f40c5 +Music_ViridianCity_branch_f40c5: octave 3 note A_, 1 note __, 3 @@ -247,9 +245,8 @@ Music_ViridianCity_branch_f40c5: ; f40c5 note __, 4 note G_, 8 endchannel -; f410f -Music_ViridianCity_branch_f410f: ; f410f +Music_ViridianCity_branch_f410f: octave 3 note B_, 2 note D_, 2 @@ -272,9 +269,8 @@ Music_ViridianCity_branch_f410f: ; f410f note G_, 1 note __, 1 endchannel -; f4125 -Music_ViridianCity_Ch2: ; f4125 +Music_ViridianCity_Ch2: vibrato $10, $46 dutycycle $1 notetype $c, $b7 @@ -308,7 +304,7 @@ Music_ViridianCity_Ch2: ; f4125 note __, 4 note E_, 8 note __, 4 -Music_ViridianCity_branch_f414c: ; f414c +Music_ViridianCity_branch_f414c: callchannel Music_ViridianCity_branch_f41c0 note __, 4 callchannel Music_ViridianCity_branch_f41c0 @@ -406,9 +402,8 @@ Music_ViridianCity_branch_f414c: ; f414c octave 1 note A_, 4 loopchannel 0, Music_ViridianCity_branch_f414c -; f41c0 -Music_ViridianCity_branch_f41c0: ; f41c0 +Music_ViridianCity_branch_f41c0: octave 2 note D_, 4 note __, 2 @@ -474,9 +469,8 @@ Music_ViridianCity_branch_f41c0: ; f41c0 note __, 4 note E_, 8 endchannel -; f4201 -Music_ViridianCity_branch_f4201: ; f4201 +Music_ViridianCity_branch_f4201: note G_, 4 note __, 2 octave 3 @@ -487,9 +481,8 @@ Music_ViridianCity_branch_f4201: ; f4201 note F_, 2 note F#, 2 endchannel -; f420b -Music_ViridianCity_branch_f420b: ; f420b +Music_ViridianCity_branch_f420b: note F#, 4 note __, 2 octave 3 @@ -500,9 +493,8 @@ Music_ViridianCity_branch_f420b: ; f420b note E_, 2 note F_, 2 endchannel -; f4215 -Music_ViridianCity_branch_f4215: ; f4215 +Music_ViridianCity_branch_f4215: octave 2 note E_, 4 note __, 2 @@ -512,9 +504,8 @@ Music_ViridianCity_branch_f4215: ; f4215 note D_, 2 note D#, 2 endchannel -; f421e -Music_ViridianCity_Ch3: ; f421e +Music_ViridianCity_Ch3: vibrato $12, $24 notetype $c, $13 stereopanning $ff @@ -550,7 +541,7 @@ Music_ViridianCity_Ch3: ; f421e note D_, 8 note F#, 2 note G_, 2 -Music_ViridianCity_branch_f4246: ; f4246 +Music_ViridianCity_branch_f4246: intensity $13 callchannel Music_ViridianCity_branch_f42a2 octave 5 @@ -632,9 +623,8 @@ Music_ViridianCity_branch_f4246: ; f4246 note D_, 8 note E_, 4 loopchannel 0, Music_ViridianCity_branch_f4246 -; f42a2 -Music_ViridianCity_branch_f42a2: ; f42a2 +Music_ViridianCity_branch_f42a2: octave 5 note A_, 2 note __, 2 @@ -696,14 +686,13 @@ Music_ViridianCity_branch_f42a2: ; f42a2 note __, 4 note D_, 8 endchannel -; f42df -Music_ViridianCity_Ch4: ; f42df +Music_ViridianCity_Ch4: togglenoise $3 notetype $c callchannel Music_ViridianCity_branch_f431d callchannel Music_ViridianCity_branch_f432c -Music_ViridianCity_branch_f42e9: ; f42e9 +Music_ViridianCity_branch_f42e9: callchannel Music_ViridianCity_branch_f431d callchannel Music_ViridianCity_branch_f431d callchannel Music_ViridianCity_branch_f431d @@ -721,9 +710,8 @@ Music_ViridianCity_branch_f42e9: ; f42e9 callchannel Music_ViridianCity_branch_f433b callchannel Music_ViridianCity_branch_f433b loopchannel 0, Music_ViridianCity_branch_f42e9 -; f431d -Music_ViridianCity_branch_f431d: ; f431d +Music_ViridianCity_branch_f431d: note E_, 2 note E_, 2 note D_, 2 @@ -739,9 +727,8 @@ Music_ViridianCity_branch_f431d: ; f431d note E_, 2 note F#, 2 endchannel -; f432c -Music_ViridianCity_branch_f432c: ; f432c +Music_ViridianCity_branch_f432c: note E_, 2 note E_, 2 note D_, 2 @@ -757,9 +744,8 @@ Music_ViridianCity_branch_f432c: ; f432c note A#, 2 note A#, 2 endchannel -; f433b -Music_ViridianCity_branch_f433b: ; f433b +Music_ViridianCity_branch_f433b: note D#, 2 note F#, 2 note D_, 2 @@ -776,9 +762,8 @@ Music_ViridianCity_branch_f433b: ; f433b note D_, 2 note D#, 2 endchannel -; f434b -Music_ViridianCity_branch_f434b: ; f434b +Music_ViridianCity_branch_f434b: note D#, 2 note F#, 2 note D_, 2 @@ -795,6 +780,3 @@ Music_ViridianCity_branch_f434b: ; f434b note D_, 2 note F#, 2 endchannel -; f435b - - diff --git a/audio/music/wildpokemonvictory.asm b/audio/music/wildpokemonvictory.asm index 10b52e90..f1438dc6 100644 --- a/audio/music/wildpokemonvictory.asm +++ b/audio/music/wildpokemonvictory.asm @@ -1,10 +1,9 @@ -Music_WildPokemonVictory: ; f4518 - dbw $80, Music_WildPokemonVictory_Ch1 - dbw $01, Music_WildPokemonVictory_Ch2 - dbw $02, Music_WildPokemonVictory_Ch3 -; f4521 +Music_WildPokemonVictory: + musicheader 3, 1, Music_WildPokemonVictory_Ch1 + musicheader 1, 2, Music_WildPokemonVictory_Ch2 + musicheader 1, 3, Music_WildPokemonVictory_Ch3 -Music_WildPokemonVictory_Ch1: ; f4521 +Music_WildPokemonVictory_Ch1: tempo 126 volume $77 dutycycle $3 @@ -17,9 +16,9 @@ Music_WildPokemonVictory_Ch1: ; f4521 note F#, 1 intensity $b6 note E_, 12 -Music_SuccessfulCapture_branch_f4536: ; f4536 +Music_SuccessfulCapture_branch_f4536: stereopanning $f -Music_WildPokemonVictory_branch_f4538: ; f4538 +Music_WildPokemonVictory_branch_f4538: callchannel Music_WildPokemonVictory_branch_f455c note F#, 2 note F#, 2 @@ -29,21 +28,20 @@ Music_WildPokemonVictory_branch_f4538: ; f4538 intensity $78 octave 3 note G_, 4 - forceoctave $1 + pitchoffset 0, C# callchannel Music_WildPokemonVictory_branch_f455c note F#, 2 note F#, 2 note F#, 4 callchannel Music_WildPokemonVictory_branch_f455c note G#, 4 - forceoctave $0 + pitchoffset 0, C_ intensity $78 octave 3 note F#, 4 loopchannel 0, Music_WildPokemonVictory_branch_f4538 -; f455c -Music_WildPokemonVictory_branch_f455c: ; f455c +Music_WildPokemonVictory_branch_f455c: intensity $71 octave 3 note G#, 1 @@ -68,9 +66,8 @@ Music_WildPokemonVictory_branch_f455c: ; f455c note E_, 2 note A_, 2 endchannel -; f4575 -Music_WildPokemonVictory_Ch2: ; f4575 +Music_WildPokemonVictory_Ch2: vibrato $12, $24 dutycycle $2 notetype $c, $d1 @@ -81,9 +78,9 @@ Music_WildPokemonVictory_Ch2: ; f4575 note A_, 1 intensity $d6 note B_, 12 -Music_SuccessfulCapture_branch_f4585: ; f4585 +Music_SuccessfulCapture_branch_f4585: stereopanning $f0 -Music_WildPokemonVictory_branch_f4587: ; f4587 +Music_WildPokemonVictory_branch_f4587: callchannel Music_WildPokemonVictory_branch_f45b5 octave 4 note B_, 2 @@ -97,7 +94,7 @@ Music_WildPokemonVictory_branch_f4587: ; f4587 note E_, 1 note G_, 1 note A#, 1 - forceoctave $1 + pitchoffset 0, C# callchannel Music_WildPokemonVictory_branch_f45b5 octave 4 note B_, 2 @@ -106,7 +103,7 @@ Music_WildPokemonVictory_branch_f4587: ; f4587 callchannel Music_WildPokemonVictory_branch_f45b5 octave 4 note B_, 4 - forceoctave $0 + pitchoffset 0, C_ intensity $81 octave 3 note B_, 1 @@ -115,9 +112,8 @@ Music_WildPokemonVictory_branch_f4587: ; f4587 note F#, 1 note A_, 1 loopchannel 0, Music_WildPokemonVictory_branch_f4587 -; f45b5 -Music_WildPokemonVictory_branch_f45b5: ; f45b5 +Music_WildPokemonVictory_branch_f45b5: intensity $81 octave 4 note B_, 2 @@ -132,9 +128,8 @@ Music_WildPokemonVictory_branch_f45b5: ; f45b5 note C#, 2 note C#, 4 endchannel -; f45c4 -Music_WildPokemonVictory_Ch3: ; f45c4 +Music_WildPokemonVictory_Ch3: notetype $c, $20 note __, 6 octave 6 @@ -144,8 +139,8 @@ Music_WildPokemonVictory_Ch3: ; f45c4 note __, 3 note E_, 1 note __, 3 -Music_SuccessfulCapture_branch_f45cf: ; f45cf -Music_WildPokemonVictory_branch_f45cf: ; f45cf +Music_SuccessfulCapture_branch_f45cf: +Music_WildPokemonVictory_branch_f45cf: callchannel Music_WildPokemonVictory_branch_f45f4 note D#, 2 note C#, 2 @@ -156,7 +151,7 @@ Music_WildPokemonVictory_branch_f45cf: ; f45cf note E_, 2 note __, 2 note C_, 4 - forceoctave $1 + pitchoffset 0, C# callchannel Music_WildPokemonVictory_branch_f45f4 note D#, 2 note C#, 2 @@ -166,13 +161,12 @@ Music_WildPokemonVictory_branch_f45cf: ; f45cf callchannel Music_WildPokemonVictory_branch_f45f4 note E_, 2 note __, 2 - forceoctave $0 + pitchoffset 0, C_ octave 2 note B_, 4 loopchannel 0, Music_WildPokemonVictory_branch_f45cf -; f45f4 -Music_WildPokemonVictory_branch_f45f4: ; f45f4 +Music_WildPokemonVictory_branch_f45f4: intensity $25 octave 3 note E_, 2 @@ -186,6 +180,3 @@ Music_WildPokemonVictory_branch_f45f4: ; f45f4 note __, 4 note C#, 2 endchannel -; f4602 - - diff --git a/constants/audio_constants.asm b/constants/audio_constants.asm index c341e901..a07887e0 100755 --- a/constants/audio_constants.asm +++ b/constants/audio_constants.asm @@ -15,6 +15,7 @@ const A_ const A# const B_ + const CC ; channel const_def @@ -1458,13 +1458,67 @@ PlayCryHeader_:: dr $e8b79, $e8c04 PlaySFX_:: - dr $e8c04, $ec000 +; dr $e8c04, $ec000 + dr $e8c04, $e9492 + +INCLUDE "audio/music/route36.asm" +INCLUDE "audio/music/rivalbattle.asm" +INCLUDE "audio/music/rocketbattle.asm" +INCLUDE "audio/music/elmslab.asm" +INCLUDE "audio/music/darkcave.asm" +INCLUDE "audio/music/johtogymbattle.asm" +INCLUDE "audio/music/championbattle.asm" +INCLUDE "audio/music/ssaqua.asm" +INCLUDE "audio/music/newbarktown.asm" +INCLUDE "audio/music/goldenrodcity.asm" +INCLUDE "audio/music/vermilioncity.asm" +INCLUDE "audio/music/titlescreen.asm" +INCLUDE "audio/music/ruinsofalphinterior.asm" +INCLUDE "audio/music/lookpokemaniac.asm" +INCLUDE "audio/music/trainervictory.asm" SECTION "bank3b", ROMX, BANK[$3b] - dr $ec000, $f0000 +INCLUDE "audio/music/route1.asm" +INCLUDE "audio/music/route3.asm" +INCLUDE "audio/music/route12.asm" +INCLUDE "audio/music/kantogymbattle.asm" +INCLUDE "audio/music/kantotrainerbattle.asm" +INCLUDE "audio/music/kantowildbattle.asm" +INCLUDE "audio/music/pokemoncenter.asm" +INCLUDE "audio/music/looklass.asm" +INCLUDE "audio/music/lookofficer.asm" +INCLUDE "audio/music/route2.asm" +INCLUDE "audio/music/mtmoon.asm" +INCLUDE "audio/music/showmearound.asm" +INCLUDE "audio/music/gamecorner.asm" +INCLUDE "audio/music/bicycle.asm" +INCLUDE "audio/music/looksage.asm" +INCLUDE "audio/music/pokemonchannel.asm" +INCLUDE "audio/music/lighthouse.asm" +INCLUDE "audio/music/lakeofrage.asm" +INCLUDE "audio/music/indigoplateau.asm" +INCLUDE "audio/music/route37.asm" +INCLUDE "audio/music/rockethideout.asm" +INCLUDE "audio/music/dragonsden.asm" +INCLUDE "audio/music/ruinsofalphradio.asm" +INCLUDE "audio/music/lookbeauty.asm" +INCLUDE "audio/music/route26.asm" +INCLUDE "audio/music/ecruteakcity.asm" +INCLUDE "audio/music/lakeofragerocketradio.asm" +INCLUDE "audio/music/magnettrain.asm" +INCLUDE "audio/music/lavendertown.asm" +INCLUDE "audio/music/dancinghall.asm" +INCLUDE "audio/music/contestresults.asm" +INCLUDE "audio/music/route30.asm" SECTION "bank3c", ROMX, BANK[$3c] - dr $f0000, $f0941 +INCLUDE "audio/music/violetcity.asm" +INCLUDE "audio/music/route29.asm" +INCLUDE "audio/music/halloffame.asm" +INCLUDE "audio/music/healpokemon.asm" +INCLUDE "audio/music/evolution.asm" +INCLUDE "audio/music/printer.asm" + INCLUDE "audio/sfx.asm" CryHeaders:: INCLUDE "data/pokemon/cries.asm" |