audio: note duration from 0-15 to 1-16 to match pokered

audio/music/aftertherivalfight.asm

@@ -15,14 +15,14 @@ Music_AfterTheRivalFight_Ch1: ; f5133
 	stereopanning $f0
 	notetype $c, $b2
 	octave 2
-	note G#, 3
-	note G#, 3
+	note G#, 4
+	note G#, 4
 	intensity $82
 	octave 3
-	note G#, 1
-	note G#, 1
-	note G#, 1
-	note G#, 1
+	note G#, 2
+	note G#, 2
+	note G#, 2
+	note G#, 2
 	loopchannel 0, Music_AfterTheRivalFight_branch_f4fb1
 
 Music_AfterTheRivalFight_Ch2: ; f5153
@@ -31,37 +31,37 @@ Music_AfterTheRivalFight_Ch2: ; f5153
 	stereopanning $f
 	notetype $c, $c2
 	octave 4
-	note G#, 3
-	note G#, 3
+	note G#, 4
+	note G#, 4
 	intensity $a2
-	note G#, 1
-	note G#, 1
-	note G#, 1
-	note G#, 1
+	note G#, 2
+	note G#, 2
+	note G#, 2
+	note G#, 2
 	loopchannel 0, Music_AfterTheRivalFight_branch_f502e
 
 Music_AfterTheRivalFight_Ch3: ; f516a
 	notetype $c, $28
 	octave 3
-	note D#, 1
-	note __, 1
-	note D#, 1
-	note __, 1
-	note G#, 1
-	note F#, 1
-	note F_, 1
-	note D#, 1
+	note D#, 2
+	note __, 2
+	note D#, 2
+	note __, 2
+	note G#, 2
+	note F#, 2
+	note F_, 2
+	note D#, 2
 	loopchannel 0, Music_AfterTheRivalFight_branch_f509d
 
 Music_AfterTheRivalFight_Ch4: ; f517a
 	togglenoise $3
 	stereopanning $f
 	notetype $c
-	note D_, 3
-	note D_, 3
-	note D#, 1
-	note D_, 1
-	note D_, 1
-	note D_, 1
+	note D_, 4
+	note D_, 4
+	note D#, 2
+	note D_, 2
+	note D_, 2
+	note D_, 2
 	loopchannel 0, Music_AfterTheRivalFight_branch_f5118
 ; f518a

audio/music/battletowerlobby.asm

@@ -18,105 +18,105 @@ Music_BattleTowerLobby_Ch1: ; 179497
 Music_BattleTowerLobby_branch_1794a9: ; 1794a9
 	notetype $c, $72
 	octave 3
-	note G#, 1
+	note G#, 2
 	notetype $c, $73
 	octave 2
-	note B_, 1
+	note B_, 2
 	octave 3
-	note E_, 1
-	note G#, 1
-	note E_, 1
+	note E_, 2
+	note G#, 2
+	note E_, 2
 	octave 2
-	note B_, 1
+	note B_, 2
 	octave 3
-	note E_, 1
-	note G#, 1
-	notetype $c, $72
-	note F#, 1
-	notetype $c, $73
-	octave 2
-	note B_, 1
-	octave 3
-	note F#, 1
-	note E_, 1
-	note D#, 1
-	octave 2
-	note B_, 1
-	octave 3
-	note D#, 1
-	note F#, 1
-	notetype $c, $72
-	note G#, 1
-	notetype $c, $73
-	octave 2
-	note B_, 1
-	octave 3
-	note E_, 1
-	note G#, 1
-	octave 2
-	note B_, 1
-	octave 3
-	note E_, 1
-	note B_, 1
-	octave 4
-	note E_, 1
+	note E_, 2
+	note G#, 2
 	notetype $c, $72
 	note F#, 2
 	notetype $c, $73
-	note D_, 0
-	note E_, 1
-	octave 3
-	note B_, 1
-	note G#, 1
-	note E_, 1
-	note G#, 1
-	note B_, 1
-	notetype $c, $72
-	note C#, 1
-	notetype $c, $73
-	note D#, 1
-	note E_, 1
-	note C#, 0
 	octave 2
-	note B_, 0
-	note A_, 3
-	notetype $c, $62
-	note A_, 3
-	notetype $c, $72
-	note B_, 1
-	notetype $c, $73
+	note B_, 2
 	octave 3
-	note C#, 1
-	note D#, 1
-	note E_, 0
-	note F#, 0
-	note G#, 3
-	notetype $c, $62
+	note F#, 2
+	note E_, 2
+	note D#, 2
 	octave 2
-	note G#, 3
-	notetype $c, $72
-	note A_, 1
-	notetype $c, $73
-	note B_, 1
+	note B_, 2
 	octave 3
-	note C#, 1
-	note D_, 0
-	note E_, 0
-	note D_, 1
-	note E_, 1
-	note F#, 1
-	note A_, 1
+	note D#, 2
+	note F#, 2
 	notetype $c, $72
-	note B_, 1
+	note G#, 2
 	notetype $c, $73
-	note B_, 3
-	note A_, 0
-	note G#, 0
+	octave 2
+	note B_, 2
+	octave 3
+	note E_, 2
+	note G#, 2
+	octave 2
+	note B_, 2
+	octave 3
+	note E_, 2
+	note B_, 2
+	octave 4
+	note E_, 2
 	notetype $c, $72
 	note F#, 3
+	notetype $c, $73
+	note D_, 1
+	note E_, 2
+	octave 3
+	note B_, 2
+	note G#, 2
+	note E_, 2
+	note G#, 2
+	note B_, 2
+	notetype $c, $72
+	note C#, 2
+	notetype $c, $73
+	note D#, 2
+	note E_, 2
+	note C#, 1
+	octave 2
+	note B_, 1
+	note A_, 4
+	notetype $c, $62
+	note A_, 4
+	notetype $c, $72
+	note B_, 2
+	notetype $c, $73
+	octave 3
+	note C#, 2
+	note D#, 2
+	note E_, 1
+	note F#, 1
+	note G#, 4
+	notetype $c, $62
+	octave 2
+	note G#, 4
+	notetype $c, $72
+	note A_, 2
+	notetype $c, $73
+	note B_, 2
+	octave 3
+	note C#, 2
+	note D_, 1
+	note E_, 1
+	note D_, 2
+	note E_, 2
+	note F#, 2
+	note A_, 2
+	notetype $c, $72
+	note B_, 2
+	notetype $c, $73
+	note B_, 4
+	note A_, 1
+	note G#, 1
+	notetype $c, $72
+	note F#, 4
 	notetype $c, $75
 	octave 2
-	note B_, 3
+	note B_, 4
 	loopchannel 0, Music_BattleTowerLobby_branch_1794a9
 
 Music_BattleTowerLobby_Ch2: ; 17953a
@@ -128,80 +128,80 @@ Music_BattleTowerLobby_Ch2: ; 17953a
 Music_BattleTowerLobby_branch_179544: ; 179544
 	notetype $c, $82
 	octave 4
-	note E_, 1
-	note E_, 3
+	note E_, 2
+	note E_, 4
 	octave 3
-	note B_, 0
+	note B_, 1
 	octave 4
-	note E_, 0
-	note B_, 3
-	note A_, 1
-	note G#, 1
+	note E_, 1
+	note B_, 4
 	note A_, 2
-	note E_, 0
+	note G#, 2
+	note A_, 3
+	note E_, 1
 	octave 3
-	note B_, 3
+	note B_, 4
 	notetype $c, $65
-	note F#, 3
+	note F#, 4
 	octave 2
-	note B_, 3
+	note B_, 4
 	notetype $c, $82
 	octave 4
-	note E_, 1
-	note E_, 3
+	note E_, 2
+	note E_, 4
 	octave 3
-	note B_, 0
+	note B_, 1
 	octave 4
-	note E_, 0
-	note B_, 3
-	note A_, 1
-	note G#, 1
+	note E_, 1
+	note B_, 4
 	note A_, 2
-	note F#, 0
-	notetype $c, $87
-	note G#, 11
-	notetype $c, $82
-	octave 3
-	note A_, 1
-	notetype $c, $84
+	note G#, 2
 	note A_, 3
-	note F#, 0
-	note G#, 0
-	note A_, 3
-	notetype $c, $82
-	note C#, 3
-	octave 4
-	note G#, 1
-	notetype $c, $84
-	note G#, 3
-	note F#, 0
-	note G#, 0
-	note E_, 3
-	notetype $c, $82
-	octave 3
-	note E_, 3
-	octave 4
 	note F#, 1
-	notetype $c, $84
-	note F#, 3
-	note A_, 0
-	note G#, 0
-	note A_, 3
-	note D_, 3
+	notetype $c, $87
+	note G#, 12
 	notetype $c, $82
-	note E_, 1
+	octave 3
+	note A_, 2
 	notetype $c, $84
-	note E_, 3
-	note F#, 0
-	note E_, 0
-	note D#, 3
+	note A_, 4
+	note F#, 1
+	note G#, 1
+	note A_, 4
+	notetype $c, $82
+	note C#, 4
+	octave 4
+	note G#, 2
+	notetype $c, $84
+	note G#, 4
+	note F#, 1
+	note G#, 1
+	note E_, 4
+	notetype $c, $82
+	octave 3
+	note E_, 4
+	octave 4
+	note F#, 2
+	notetype $c, $84
+	note F#, 4
+	note A_, 1
+	note G#, 1
+	note A_, 4
+	note D_, 4
+	notetype $c, $82
+	note E_, 2
+	notetype $c, $84
+	note E_, 4
+	note F#, 1
+	note E_, 1
+	note D#, 4
 	notetype $c, $73
 	octave 3
-	note D#, 0
-	note F#, 0
-	note B_, 0
+	note D#, 1
+	note F#, 1
+	note B_, 1
 	octave 4
-	note D#, 0
+	note D#, 1
 	loopchannel 0, Music_BattleTowerLobby_branch_179544
 
 Music_BattleTowerLobby_Ch3: ; 1795ae
@@ -209,96 +209,96 @@ Music_BattleTowerLobby_Ch3: ; 1795ae
 
 Music_BattleTowerLobby_branch_1795b1: ; 1795b1
 	octave 2
-	note B_, 1
+	note B_, 2
 	octave 3
-	note E_, 1
-	note __, 1
-	note E_, 1
-	note __, 1
-	note E_, 1
-	note __, 1
-	note E_, 1
+	note E_, 2
+	note __, 2
+	note E_, 2
+	note __, 2
+	note E_, 2
+	note __, 2
+	note E_, 2
 	octave 2
-	note B_, 1
+	note B_, 2
 	octave 3
-	note E_, 1
-	note __, 1
-	note E_, 1
-	note __, 1
-	note D#, 1
-	note __, 1
-	note D#, 1
+	note E_, 2
+	note __, 2
+	note E_, 2
+	note __, 2
+	note D#, 2
+	note __, 2
+	note D#, 2
 	octave 2
-	note B_, 1
+	note B_, 2
 	octave 3
-	note E_, 1
-	note __, 1
-	note E_, 1
-	note __, 1
-	note E_, 1
-	note __, 1
-	note E_, 1
+	note E_, 2
+	note __, 2
+	note E_, 2
+	note __, 2
+	note E_, 2
+	note __, 2
+	note E_, 2
 	octave 2
-	note A_, 1
+	note A_, 2
 	octave 3
-	note D_, 1
-	note __, 1
+	note D_, 2
+	note __, 2
 	octave 2
-	note A_, 1
-	note B_, 1
+	note A_, 2
+	note B_, 2
 	octave 3
-	note E_, 1
-	note __, 1
-	note E_, 1
+	note E_, 2
+	note __, 2
+	note E_, 2
 	octave 2
-	note A_, 1
+	note A_, 2
 	octave 3
-	note C#, 1
+	note C#, 2
 	octave 2
-	note E_, 1
+	note E_, 2
 	octave 3
-	note E_, 1
+	note E_, 2
 	octave 2
-	note A_, 1
+	note A_, 2
 	octave 3
-	note C#, 1
-	note E_, 1
-	note __, 1
+	note C#, 2
+	note E_, 2
+	note __, 2
 	octave 2
-	note B_, 1
+	note B_, 2
 	octave 3
-	note E_, 1
+	note E_, 2
 	octave 2
-	note E_, 1
+	note E_, 2
 	octave 3
-	note E_, 1
+	note E_, 2
 	octave 2
-	note G#, 1
-	note B_, 1
+	note G#, 2
+	note B_, 2
 	octave 3
-	note E_, 1
-	note __, 1
-	note D_, 1
+	note E_, 2
+	note __, 2
+	note D_, 2
 	octave 2
-	note F#, 1
-	note A_, 1
+	note F#, 2
+	note A_, 2
 	octave 3
-	note F#, 1
+	note F#, 2
 	octave 2
-	note F#, 1
-	note A_, 1
+	note F#, 2
+	note A_, 2
 	octave 3
-	note D_, 1
-	note F#, 1
-	note E_, 1
+	note D_, 2
+	note F#, 2
+	note E_, 2
 	octave 2
-	note B_, 1
-	note E_, 1
-	note B_, 1
-	note F#, 1
-	note E_, 1
-	note D#, 1
-	note F#, 1
+	note B_, 2
+	note E_, 2
+	note B_, 2
+	note F#, 2
+	note E_, 2
+	note D#, 2
+	note F#, 2
 	loopchannel 0, Music_BattleTowerLobby_branch_1795b1
 
 Music_BattleTowerLobby_Ch4: ; 179610
@@ -306,10 +306,10 @@ Music_BattleTowerLobby_Ch4: ; 179610
 
 Music_BattleTowerLobby_branch_179612: ; 179612
 	notetype $c
-	note __, 1
-	note F_, 3
-	note F_, 3
-	note F_, 1
-	note F_, 3
+	note __, 2
+	note F_, 4
+	note F_, 4
+	note F_, 2
+	note F_, 4
 	loopchannel 0, Music_BattleTowerLobby_branch_179612
 ; 17961d

audio/music/burnedtower.asm

@@ -14,92 +14,92 @@ Music_BurnedTower_Ch1: ; f6aa5
 	vibrato $8, $45
 	stereopanning $f0
 	notetype $c, $91
-	note __, 1
+	note __, 2
 	octave 2
-	note A_, 3
-	note A_, 3
-	note A_, 1
+	note A_, 4
+	note A_, 4
+	note A_, 2
 	intensity $80
 	octave 3
-	note D#, 5
+	note D#, 6
 	intensity $91
-	note D_, 3
-	note D_, 3
-	note D_, 1
+	note D_, 4
+	note D_, 4
+	note D_, 2
 	intensity $80
-	note C#, 5
+	note C#, 6
 
 Music_BurnedTower_branch_f6ac8: ; f6ac8
 	intensity $91
 	octave 2
-	note A_, 3
-	note A_, 3
-	note A_, 1
+	note A_, 4
+	note A_, 4
+	note A_, 2
 	intensity $80
-	note A#, 5
+	note A#, 6
 	loopchannel 2, Music_BurnedTower_branch_f6ac8
 	tempo 150
 
 Music_BurnedTower_branch_f6ad8: ; f6ad8
 	intensity $b1
 	octave 2
-	note A_, 3
-	note A_, 3
-	note A_, 1
+	note A_, 4
+	note A_, 4
+	note A_, 2
 	intensity $a0
 	octave 3
-	note D#, 5
+	note D#, 6
 	intensity $b1
-	note D_, 3
-	note D_, 3
-	note D_, 1
+	note D_, 4
+	note D_, 4
+	note D_, 2
 	intensity $a0
-	note C#, 5
+	note C#, 6
 	intensity $b1
 	octave 2
-	note A_, 3
-	note A_, 3
-	note A_, 1
+	note A_, 4
+	note A_, 4
+	note A_, 2
 	intensity $a0
-	note A#, 5
+	note A#, 6
 	intensity $b1
-	note A_, 3
-	note A_, 3
-	note A_, 1
+	note A_, 4
+	note A_, 4
+	note A_, 2
 	intensity $b3
-	note A#, 15
-	note A#, 15
-	note A#, 15
-	note G#, 5
+	note A#, 16
+	note A#, 16
+	note A#, 16
+	note G#, 6
 	intensity $b1
-	note A_, 3
-	note A_, 3
-	note A_, 1
+	note A_, 4
+	note A_, 4
+	note A_, 2
 	intensity $a0
-	note A#, 5
+	note A#, 6
 	intensity $b1
-	note B_, 3
-	note B_, 3
-	note B_, 1
+	note B_, 4
+	note B_, 4
+	note B_, 2
 	intensity $a0
 	octave 3
-	note F_, 5
+	note F_, 6
 	intensity $b1
-	note E_, 3
-	note E_, 3
-	note E_, 1
+	note E_, 4
+	note E_, 4
+	note E_, 2
 	intensity $a0
-	note D#, 5
+	note D#, 6
 
 Music_BurnedTower_branch_f6b17: ; f6b17
 	intensity $b1
 	octave 2
-	note B_, 3
-	note B_, 3
-	note B_, 1
+	note B_, 4
+	note B_, 4
+	note B_, 2
 	intensity $a0
 	octave 3
-	note C_, 5
+	note C_, 6
 	loopchannel 2, Music_BurnedTower_branch_f6b17
 	loopchannel 0, Music_BurnedTower_branch_f6ad8
 
@@ -115,139 +115,139 @@ Music_BurnedTower_branch_f6b39: ; f6b39
 	callchannel Music_BurnedTower_branch_f6b8e
 	intensity $c1
 	dutycycle $3
-	note __, 1
+	note __, 2
 	octave 2
-	note A_, 3
-	note A_, 3
-	note A_, 1
+	note A_, 4
+	note A_, 4
+	note A_, 2
 	intensity $b0
 	octave 3
-	note D#, 5
+	note D#, 6
 	intensity $c1
-	note D_, 3
-	note D_, 3
-	note D_, 1
+	note D_, 4
+	note D_, 4
+	note D_, 2
 	intensity $b0
-	note C#, 5
+	note C#, 6
 	intensity $c1
 	octave 2
-	note A_, 3
-	note A_, 3
-	note A_, 1
+	note A_, 4
+	note A_, 4
+	note A_, 2
 	intensity $b0
-	note A#, 3
+	note A#, 4
 	intensity $c1
 	intensity $c2
 	octave 3
-	note A_, 0
-	note G_, 0
-	note A_, 0
+	note A_, 1
+	note G_, 1
+	note A_, 1
 	octave 4
-	note C_, 0
+	note C_, 1
 	vibrato $0, $0
 	intensity $3d
-	note E_, 7
+	note E_, 8
 	vibrato $20, $83
 	intensity $b0
 	octave 2
-	note G_, 3
+	note G_, 4
 	dutycycle $2
 	intensity $b0
 	octave 3
-	note F#, 3
-	note E_, 1
-	note F#, 1
-	note G_, 3
-	note B_, 3
+	note F#, 4
+	note E_, 2
+	note F#, 2
+	note G_, 4
+	note B_, 4
 	octave 4
-	note C#, 3
-	note D_, 1
-	note C#, 1
+	note C#, 4
+	note D_, 2
+	note C#, 2
 	octave 3
-	note B_, 3
-	note G_, 3
-	note F#, 3
-	note E_, 1
-	note F#, 1
-	note G_, 3
-	note E_, 3
+	note B_, 4
+	note G_, 4
+	note F#, 4
+	note E_, 2
+	note F#, 2
+	note G_, 4
+	note E_, 4
 	intensity $b7
-	note F#, 15
+	note F#, 16
 	loopchannel 0, Music_BurnedTower_branch_f6b39
 ; f6b8e
 
 Music_BurnedTower_branch_f6b8e: ; f6b8e
 	octave 3
-	note E_, 3
-	note D_, 1
-	note E_, 1
-	note F_, 3
-	note A_, 3
-	note B_, 3
+	note E_, 4
+	note D_, 2
+	note E_, 2
+	note F_, 4
+	note A_, 4
+	note B_, 4
 	octave 4
-	note C_, 1
+	note C_, 2
 	octave 3
-	note B_, 1
-	note A_, 3
-	note F_, 3
-	note E_, 3
-	note D_, 1
-	note E_, 1
-	note F_, 3
-	note D_, 3
-	note E_, 15
+	note B_, 2
+	note A_, 4
+	note F_, 4
+	note E_, 4
+	note D_, 2
+	note E_, 2
+	note F_, 4
+	note D_, 4
+	note E_, 16
 	endchannel
 
 Music_BurnedTower_Ch3: ; f6ba2
 	stereopanning $f
 	notetype $c, $14
-	note __, 15
-	note __, 15
-	note __, 15
-	note __, 11
+	note __, 16
+	note __, 16
+	note __, 16
+	note __, 12
 	octave 3
-	note D#, 3
+	note D#, 4
 
 Music_BurnedTower_branch_f6bad: ; f6bad
 	octave 2
-	note A_, 1
+	note A_, 2
 	octave 3
-	note E_, 1
-	note __, 1
-	note E_, 1
-	note __, 1
-	note E_, 1
-	note F_, 3
+	note E_, 2
+	note __, 2
+	note E_, 2
+	note __, 2
+	note E_, 2
+	note F_, 4
 	octave 2
-	note A_, 1
+	note A_, 2
 	octave 3
-	note E_, 1
-	note __, 1
-	note E_, 1
-	note __, 1
-	note E_, 1
-	note D#, 3
+	note E_, 2
+	note __, 2
+	note E_, 2
+	note __, 2
+	note E_, 2
+	note D#, 4
 	loopchannel 4, Music_BurnedTower_branch_f6bad
 
 Music_BurnedTower_branch_f6bc3: ; f6bc3
 	octave 2
-	note B_, 1
+	note B_, 2
 	octave 3
-	note F#, 1
-	note __, 1
-	note F#, 1
-	note __, 1
-	note F#, 1
-	note G_, 3
+	note F#, 2
+	note __, 2
+	note F#, 2
+	note __, 2
+	note F#, 2
+	note G_, 4
 	octave 2
-	note B_, 1
+	note B_, 2
 	octave 3
-	note F#, 1
-	note __, 1
-	note F#, 1
-	note __, 1
-	note F#, 1
-	note F_, 3
+	note F#, 2
+	note __, 2
+	note F#, 2
+	note __, 2
+	note F#, 2
+	note F_, 4
 	loopchannel 2, Music_BurnedTower_branch_f6bc3
 	loopchannel 0, Music_BurnedTower_branch_f6bad
 
@@ -256,16 +256,16 @@ Music_BurnedTower_Ch4: ; f6bdd
 	notetype $c
 
 Music_BurnedTower_branch_f6be1: ; f6be1
-	note __, 15
+	note __, 16
 	loopchannel 4, Music_BurnedTower_branch_f6be1
-	note __, 1
+	note __, 2
 
 Music_BurnedTower_branch_f6be7: ; f6be7
 	stereopanning $f0
-	note G_, 1
-	note G#, 1
-	note G_, 3
-	note G#, 1
-	note G_, 3
+	note G_, 2
+	note G#, 2
+	note G_, 4
+	note G#, 2
+	note G_, 4
 	loopchannel 0, Music_BurnedTower_branch_f6be7
 ; f6bf2

audio/music/contestresults.asm

@@ -12,43 +12,43 @@ Music_ContestResults_Ch1: ; efb4a
 	notetype $c, $51
 
 Music_ContestResults_branch_efb52: ; efb52
-	note __, 1
+	note __, 2
 	octave 2
-	note G_, 0
-	note __, 2
-	note G_, 0
-	note __, 2
-	note G_, 0
-	note __, 2
-	note G_, 0
-	note __, 0
+	note G_, 1
+	note __, 3
+	note G_, 1
+	note __, 3
+	note G_, 1
+	note __, 3
+	note G_, 1
 	note __, 1
-	note A_, 0
 	note __, 2
-	note A_, 0
-	note __, 2
-	note A_, 0
-	note __, 2
-	note A_, 0
-	note __, 0
+	note A_, 1
+	note __, 3
+	note A_, 1
+	note __, 3
+	note A_, 1
+	note __, 3
+	note A_, 1
 	note __, 1
-	note A_, 0
 	note __, 2
-	note A_, 0
-	note __, 2
-	note A_, 0
-	note __, 2
-	note A_, 0
-	note __, 0
+	note A_, 1
+	note __, 3
+	note A_, 1
+	note __, 3
+	note A_, 1
+	note __, 3
+	note A_, 1
 	note __, 1
-	note B_, 0
 	note __, 2
-	note A#, 0
-	note __, 2
-	note A_, 0
-	note __, 2
-	note G_, 0
-	note __, 0
+	note B_, 1
+	note __, 3
+	note A#, 1
+	note __, 3
+	note A_, 1
+	note __, 3
+	note G_, 1
+	note __, 1
 	loopchannel 0, Music_ContestResults_branch_efb52
 
 Music_ContestResults_Ch2: ; efb7b
@@ -56,78 +56,78 @@ Music_ContestResults_Ch2: ; efb7b
 
 Music_ContestResults_branch_efb7e: ; efb7e
 	octave 2
-	note C_, 1
+	note C_, 2
 	octave 3
-	note E_, 0
-	note __, 0
+	note E_, 1
+	note __, 1
 	octave 1
-	note G_, 1
+	note G_, 2
 	octave 3
-	note E_, 0
-	note __, 0
+	note E_, 1
+	note __, 1
 	octave 1
-	note A_, 1
+	note A_, 2
 	octave 3
-	note E_, 0
-	note __, 0
+	note E_, 1
+	note __, 1
 	octave 1
-	note B_, 1
+	note B_, 2
 	octave 3
-	note E_, 0
-	note __, 0
+	note E_, 1
+	note __, 1
 	octave 2
-	note D_, 1
+	note D_, 2
 	octave 3
-	note F_, 0
-	note __, 0
+	note F_, 1
+	note __, 1
 	octave 1
-	note A_, 1
+	note A_, 2
 	octave 3
-	note F_, 0
-	note __, 0
+	note F_, 1
+	note __, 1
 	octave 1
-	note B_, 1
+	note B_, 2
 	octave 3
-	note F_, 0
-	note __, 0
+	note F_, 1
+	note __, 1
 	octave 2
-	note C#, 1
+	note C#, 2
 	octave 3
-	note F_, 0
-	note __, 0
+	note F_, 1
+	note __, 1
 
 Music_ContestResults_branch_efba6: ; efba6
 	octave 2
-	note D_, 1
+	note D_, 2
 	octave 3
-	note F_, 0
-	note __, 0
+	note F_, 1
+	note __, 1
 	octave 1
-	note A_, 1
+	note A_, 2
 	octave 3
-	note F_, 0
-	note __, 0
+	note F_, 1
+	note __, 1
 	loopchannel 2, Music_ContestResults_branch_efba6
 	octave 2
+	note G_, 2
+	octave 3
 	note G_, 1
-	octave 3
-	note G_, 0
-	note __, 0
+	note __, 1
 	octave 2
+	note D_, 2
+	octave 3
+	note F#, 1
+	note __, 1
+	octave 2
+	note G_, 2
+	octave 3
+	note F_, 1
+	note __, 1
+	octave 2
+	note D_, 2
+	octave 3
 	note D_, 1
-	octave 3
-	note F#, 0
-	note __, 0
-	octave 2
-	note G_, 1
-	octave 3
-	note F_, 0
-	note __, 0
-	octave 2
-	note D_, 1
-	octave 3
-	note D_, 0
-	note __, 0
+	note __, 1
 	loopchannel 0, Music_ContestResults_branch_efb7e
 
 Music_ContestResults_Ch3: ; efbcc
@@ -136,24 +136,24 @@ Music_ContestResults_Ch3: ; efbcc
 
 Music_ContestResults_branch_efbd2: ; efbd2
 	octave 4
-	note E_, 4
-	note __, 0
-	note E_, 0
-	note F_, 0
-	note G_, 3
+	note E_, 5
+	note __, 1
+	note E_, 1
+	note F_, 1
+	note G_, 4
 	octave 5
-	note C_, 3
+	note C_, 4
 	octave 4
-	note B_, 7
-	note A_, 7
-	note D_, 4
-	note __, 0
-	note D_, 0
-	note E_, 0
-	note F_, 3
-	note B_, 3
-	note A_, 7
-	note G_, 7
+	note B_, 8
+	note A_, 8
+	note D_, 5
+	note __, 1
+	note D_, 1
+	note E_, 1
+	note F_, 4
+	note B_, 4
+	note A_, 8
+	note G_, 8
 	loopchannel 0, Music_ContestResults_branch_efbd2
 
 Music_ContestResults_Ch4: ; efbe9
@@ -161,21 +161,21 @@ Music_ContestResults_Ch4: ; efbe9
 	notetype $6
 
 Music_ContestResults_branch_efbed: ; efbed
-	note C#, 3
-	note C#, 3
-	note C#, 1
-	note C#, 1
-	note C#, 1
-	note C#, 1
-	note C#, 3
-	note C#, 3
-	note G_, 0
-	note G_, 0
-	note G_, 0
-	note G_, 0
-	note G_, 0
-	note G_, 0
-	note G_, 0
-	note G_, 0
+	note C#, 4
+	note C#, 4
+	note C#, 2
+	note C#, 2
+	note C#, 2
+	note C#, 2
+	note C#, 4
+	note C#, 4
+	note G_, 1
+	note G_, 1
+	note G_, 1
+	note G_, 1
+	note G_, 1
+	note G_, 1
+	note G_, 1
+	note G_, 1
 	loopchannel 0, Music_ContestResults_branch_efbed
 ; efc01

audio/music/dancinghall.asm

@@ -11,83 +11,83 @@ Music_DancingHall_Ch1: ; ef9c6
 	volume $77
 	stereopanning $f
 	notetype $6, $b7
-	note __, 2
+	note __, 3
 	dutycycle $0
 
 Music_DancingHall_branch_ef9d3: ; ef9d3
 	notetype $c, $b7
 	callchannel Music_DancingHall_branch_efa17
-	note __, 15
+	note __, 16
 	callchannel Music_DancingHall_branch_efa17
-	note __, 15
-	note __, 15
-	note __, 15
+	note __, 16
+	note __, 16
+	note __, 16
 	intensity $b1
 	octave 2
-	note B_, 0
+	note B_, 1
 	octave 3
-	note D_, 0
-	note F_, 0
-	note A_, 0
-	note B_, 0
-	note A_, 0
-	note B_, 0
-	octave 4
-	note D_, 0
+	note D_, 1
 	note F_, 1
+	note A_, 1
+	note B_, 1
+	note A_, 1
+	note B_, 1
+	octave 4
+	note D_, 1
+	note F_, 2
 	notetype $8, $b1
-	note D_, 0
-	note E_, 0
-	note D_, 0
+	note D_, 1
+	note E_, 1
+	note D_, 1
 	octave 3
-	note B_, 2
-	note A_, 2
+	note B_, 3
+	note A_, 3
 	notetype $c, $b1
-	note B_, 0
-	note A_, 0
-	note D_, 0
-	note E_, 0
+	note B_, 1
+	note A_, 1
+	note D_, 1
+	note E_, 1
 	octave 4
-	note F_, 1
+	note F_, 2
 	notetype $8, $b1
 	octave 3
-	note B_, 0
+	note B_, 1
 	octave 4
-	note D_, 0
+	note D_, 1
 	octave 3
-	note B_, 0
+	note B_, 1
 	notetype $c, $b5
-	note A_, 0
-	note __, 0
-	note B_, 0
-	note B_, 0
-	note A_, 0
-	note __, 0
-	note F_, 1
+	note A_, 1
+	note __, 1
+	note B_, 1
+	note B_, 1
+	note A_, 1
+	note __, 1
+	note F_, 2
 	loopchannel 0, Music_DancingHall_branch_ef9d3
 ; efa17
 
 Music_DancingHall_branch_efa17: ; efa17
 	octave 3
-	note B_, 0
-	note __, 0
-	note A_, 0
-	note __, 0
-	note B_, 0
-	note __, 0
-	note A_, 0
-	note __, 0
+	note B_, 1
+	note __, 1
+	note A_, 1
+	note __, 1
+	note B_, 1
+	note __, 1
+	note A_, 1
+	note __, 1
 	octave 4
-	note E_, 0
-	note __, 0
-	note D_, 0
-	note __, 0
+	note E_, 1
+	note __, 1
+	note D_, 1
+	note __, 1
 	octave 3
-	note B_, 0
-	note __, 0
+	note B_, 1
+	note __, 1
 	octave 4
-	note D_, 0
-	note __, 0
+	note D_, 1
+	note __, 1
 	endchannel
 
 Music_DancingHall_Ch2: ; efa2c
@@ -95,7 +95,7 @@ Music_DancingHall_Ch2: ; efa2c
 	notetype $6, $a1
 	dutycycle $0
 	vibrato $10, $24
-	note __, 2
+	note __, 3
 
 Music_DancingHall_branch_efa37: ; efa37
 	notetype $6, $a2
@@ -103,125 +103,125 @@ Music_DancingHall_branch_efa37: ; efa37
 	callchannel Music_DancingHall_branch_efa7a
 	intensity $a7
 	octave 2
-	note D_, 15
-	note F_, 15
+	note D_, 16
+	note F_, 16
 	notetype $c, $a7
-	note E_, 15
+	note E_, 16
 	octave 3
-	note F_, 0
-	note A_, 0
-	note B_, 0
-	octave 4
-	note D_, 0
-	note E_, 0
-	note D_, 0
-	note E_, 0
-	note A_, 0
-	note B_, 1
-	notetype $8, $a7
-	note A_, 0
-	note B_, 0
-	note A_, 0
-	note F_, 2
-	note D_, 2
-	notetype $c, $a7
-	note E_, 0
-	note D_, 0
-	octave 3
-	note A_, 0
-	note B_, 0
-	octave 4
+	note F_, 1
 	note A_, 1
-	notetype $8, $a7
-	note F_, 0
-	note A_, 0
-	note F_, 0
-	notetype $c, $a7
-	note E_, 0
-	note __, 0
-	note F_, 0
-	note F_, 0
-	note E_, 0
-	note __, 0
+	note B_, 1
+	octave 4
 	note D_, 1
+	note E_, 1
+	note D_, 1
+	note E_, 1
+	note A_, 1
+	note B_, 2
+	notetype $8, $a7
+	note A_, 1
+	note B_, 1
+	note A_, 1
+	note F_, 3
+	note D_, 3
+	notetype $c, $a7
+	note E_, 1
+	note D_, 1
+	octave 3
+	note A_, 1
+	note B_, 1
+	octave 4
+	note A_, 2
+	notetype $8, $a7
+	note F_, 1
+	note A_, 1
+	note F_, 1
+	notetype $c, $a7
+	note E_, 1
+	note __, 1
+	note F_, 1
+	note F_, 1
+	note E_, 1
+	note __, 1
+	note D_, 2
 	loopchannel 0, Music_DancingHall_branch_efa37
 ; efa7a
 
 Music_DancingHall_branch_efa7a: ; efa7a
 	intensity $a1
 	octave 4
-	note E_, 3
+	note E_, 4
 	octave 2
-	note E_, 3
+	note E_, 4
 	octave 4
-	note E_, 3
+	note E_, 4
 	octave 2
-	note E_, 3
+	note E_, 4
 	octave 4
-	note B_, 3
-	note A_, 3
-	note F_, 3
-	note A_, 3
+	note B_, 4
+	note A_, 4
+	note F_, 4
+	note A_, 4
 	intensity $33
-	note D_, 0
-	note F_, 0
+	note D_, 1
+	note F_, 1
 	intensity $63
-	note D_, 0
-	note F_, 0
+	note D_, 1
+	note F_, 1
 	intensity $93
-	note D_, 0
-	note F_, 0
+	note D_, 1
+	note F_, 1
 	intensity $c3
-	note D_, 0
-	note F_, 0
+	note D_, 1
+	note F_, 1
 	intensity $e3
-	note D_, 0
-	note F_, 0
+	note D_, 1
+	note F_, 1
 	intensity $a3
-	note D_, 0
-	note F_, 0
+	note D_, 1
+	note F_, 1
 	intensity $83
-	note D_, 0
-	note F_, 0
+	note D_, 1
+	note F_, 1
 	intensity $53
-	note D_, 0
-	note F_, 0
+	note D_, 1
+	note F_, 1
 	intensity $73
 	octave 3
-	note B_, 0
+	note B_, 1
 	octave 4
-	note E_, 0
+	note E_, 1
 	intensity $a3
 	octave 3
-	note B_, 0
+	note B_, 1
 	octave 4
-	note E_, 0
+	note E_, 1
 	intensity $b3
 	octave 3
-	note A_, 0
+	note A_, 1
 	octave 4
-	note D_, 0
+	note D_, 1
 	intensity $c3
 	octave 3
-	note A_, 0
+	note A_, 1
 	octave 4
-	note D_, 0
+	note D_, 1
 	intensity $d3
 	octave 3
-	note E_, 0
-	note B_, 0
+	note E_, 1
+	note B_, 1
 	intensity $e3
-	note E_, 0
-	note B_, 0
+	note E_, 1
+	note B_, 1
 	intensity $f3
-	note A_, 0
+	note A_, 1
 	octave 4
-	note D_, 0
+	note D_, 1
 	intensity $f3
 	octave 3
-	note A_, 0
+	note A_, 1
 	octave 4
-	note D_, 0
+	note D_, 1
 	endchannel
 
 Music_DancingHall_Ch3: ; efad6
@@ -229,84 +229,84 @@ Music_DancingHall_Ch3: ; efad6
 	vibrato $16, $24
 	notetype $6, $10
 	octave 5
-	note A_, 0
-	note B_, 0
+	note A_, 1
+	note B_, 1
 	octave 6
-	note D_, 0
+	note D_, 1
 
 Music_DancingHall_branch_efae3: ; efae3
-	note E_, 12
-	note D_, 0
-	note E_, 0
-	note A_, 0
-	note B_, 15
+	note E_, 13
+	note D_, 1
+	note E_, 1
+	note A_, 1
+	note B_, 16
 	intensity $14
 	octave 3
-	note F_, 15
-	note E_, 13
+	note F_, 16
+	note E_, 14
 	intensity $10
 	octave 6
-	note E_, 0
-	note F_, 0
-	note E_, 12
-	note D_, 0
-	note E_, 0
-	note A_, 0
-	note B_, 15
+	note E_, 1
+	note F_, 1
+	note E_, 13
+	note D_, 1
+	note E_, 1
+	note A_, 1
+	note B_, 16
 	intensity $14
 	octave 3
-	note F_, 15
-	note E_, 15
+	note F_, 16
+	note E_, 16
 	intensity $13
 	octave 4
-	note F_, 1
+	note F_, 2
+	note A_, 2
+	note B_, 2
+	octave 5
+	note D_, 2
+	note E_, 2
+	note D_, 2
+	note E_, 2
+	note A_, 2
+	note A#, 1
+	note B_, 3
+	notetype $8, $13
+	note A_, 1
+	note B_, 1
+	note A_, 1
+	note F_, 3
+	note D_, 3
+	notetype $c, $13
+	note E_, 1
+	note D_, 1
+	octave 4
 	note A_, 1
 	note B_, 1
 	octave 5
-	note D_, 1
-	note E_, 1
-	note D_, 1
-	note E_, 1
-	note A_, 1
-	note A#, 0
-	note B_, 2
+	note A_, 2
 	notetype $8, $13
-	note A_, 0
-	note B_, 0
-	note A_, 0
-	note F_, 2
-	note D_, 2
-	notetype $c, $13
-	note E_, 0
-	note D_, 0
-	octave 4
-	note A_, 0
-	note B_, 0
-	octave 5
+	note F_, 1
 	note A_, 1
-	notetype $8, $13
-	note F_, 0
-	note A_, 0
-	note F_, 0
+	note F_, 1
 	notetype $6, $13
-	note D#, 0
-	note E_, 2
-	note D_, 3
+	note D#, 1
+	note E_, 3
+	note D_, 4
 	octave 4
-	note B_, 3
+	note B_, 4
 	octave 5
-	note D_, 3
+	note D_, 4
 	intensity $14
 	octave 3
-	note D_, 15
-	note F_, 15
-	note E_, 15
-	note E_, 12
+	note D_, 16
+	note F_, 16
+	note E_, 16
+	note E_, 13
 	intensity $10
 	octave 5
-	note A_, 0
-	note B_, 0
+	note A_, 1
+	note B_, 1
 	octave 6
-	note D_, 0
+	note D_, 1
 	loopchannel 0, Music_DancingHall_branch_efae3
 ; efb3e

audio/music/dragonsden.asm

@@ -16,51 +16,51 @@ Music_DragonsDen_Ch1: ; eecf4
 
 Music_DragonsDen_branch_eed03: ; eed03
 	callchannel Music_DragonsDen_branch_eed1e
-	note __, 15
+	note __, 16
 	callchannel Music_DragonsDen_branch_eed2d
-	note __, 1
+	note __, 2
 	callchannel Music_DragonsDen_branch_eed2d
-	note __, 1
+	note __, 2
 	callchannel Music_DragonsDen_branch_eed2d
-	note __, 1
+	note __, 2
 	callchannel Music_DragonsDen_branch_eed2d
-	note __, 9
+	note __, 10
 	notetype $c, $b7
 	loopchannel 0, Music_DragonsDen_branch_eed03
 ; eed1e
 
 Music_DragonsDen_branch_eed1e: ; eed1e
 	octave 3
-	note A#, 11
-	note A_, 3
-	note A#, 11
-	note A_, 3
-	note A#, 5
+	note A#, 12
+	note A_, 4
+	note A#, 12
+	note A_, 4
+	note A#, 6
 	octave 4
-	note C_, 3
-	note C#, 5
-	note E_, 15
-	note D#, 11
-	note D_, 3
+	note C_, 4
+	note C#, 6
+	note E_, 16
+	note D#, 12
+	note D_, 4
 	octave 3
-	note G#, 15
+	note G#, 16
 	endchannel
 ; eed2d
 
 Music_DragonsDen_branch_eed2d: ; eed2d
 	intensity $b1
-	note __, 1
+	note __, 2
 	octave 4
-	note C#, 2
-	note C#, 2
-	note C#, 2
-	note C#, 2
 	note C#, 3
-	note C#, 2
-	note C#, 2
 	note C#, 3
-	note C#, 1
-	note C#, 1
+	note C#, 3
+	note C#, 3
+	note C#, 4
+	note C#, 3
+	note C#, 3
+	note C#, 4
+	note C#, 2
+	note C#, 2
 	endchannel
 
 Music_DragonsDen_Ch2: ; eed3c
@@ -71,29 +71,29 @@ Music_DragonsDen_Ch2: ; eed3c
 
 Music_DragonsDen_branch_eed46: ; eed46
 	callchannel Music_DragonsDen_branch_eed5e
-	note __, 15
+	note __, 16
 	callchannel Music_DragonsDen_branch_eed6b
 	callchannel Music_DragonsDen_branch_eed6b
 	callchannel Music_DragonsDen_branch_eed6b
 	callchannel Music_DragonsDen_branch_eed6b
-	note __, 15
+	note __, 16
 	notetype $c, $c7
 	loopchannel 0, Music_DragonsDen_branch_eed46
 ; eed5e
 
 Music_DragonsDen_branch_eed5e: ; eed5e
 	octave 4
-	note D#, 11
-	note D_, 3
-	note D#, 11
-	note D_, 3
-	note D#, 5
-	note F_, 3
-	note F#, 5
-	note A_, 15
-	note G#, 11
-	note G_, 3
-	note C#, 15
+	note D#, 12
+	note D_, 4
+	note D#, 12
+	note D_, 4
+	note D#, 6
+	note F_, 4
+	note F#, 6
+	note A_, 16
+	note G#, 12
+	note G_, 4
+	note C#, 16
 	endchannel
 ; eed6b
 
@@ -102,11 +102,11 @@ Music_DragonsDen_branch_eed6b: ; eed6b
 
 Music_DragonsDen_branch_eed6d: ; eed6d
 	octave 5
-	note C#, 3
+	note C#, 4
 	octave 4
-	note G#, 3
-	note G#, 3
-	note G#, 3
+	note G#, 4
+	note G#, 4
+	note G#, 4
 	loopchannel 2, Music_DragonsDen_branch_eed6d
 	endchannel
 
@@ -115,70 +115,70 @@ Music_DragonsDen_Ch3: ; eed78
 Music_DragonsDen_branch_eed78: ; eed78
 	notetype $c, $14
 	octave 4
-	note C#, 1
-	octave 3
-	note G#, 0
-	octave 4
-	note C#, 0
+	note C#, 2
 	octave 3
 	note G#, 1
 	octave 4
 	note C#, 1
 	octave 3
-	note G#, 0
+	note G#, 2
 	octave 4
-	note C#, 0
+	note C#, 2
 	octave 3
 	note G#, 1
 	octave 4
 	note C#, 1
 	octave 3
-	note G#, 0
+	note G#, 2
 	octave 4
-	note C#, 0
+	note C#, 2
+	octave 3
+	note G#, 1
+	octave 4
+	note C#, 1
 	loopchannel 15, Music_DragonsDen_branch_eed78
-	note __, 15
+	note __, 16
 	notetype $6, $27
 
 Music_DragonsDen_branch_eed99: ; eed99
 	octave 3
-	note C#, 3
+	note C#, 4
 	octave 2
-	note G#, 1
+	note G#, 2
 	octave 3
-	note C#, 1
+	note C#, 2
 	octave 2
-	note G#, 3
+	note G#, 4
 	octave 3
-	note C#, 3
+	note C#, 4
 	octave 2
-	note G#, 1
+	note G#, 2
 	octave 3
-	note C#, 1
+	note C#, 2
 	octave 2
-	note G#, 3
+	note G#, 4
 	octave 3
-	note C#, 3
+	note C#, 4
 	octave 2
-	note G#, 1
+	note G#, 2
 	octave 3
-	note C#, 1
+	note C#, 2
 	loopchannel 16, Music_DragonsDen_branch_eed99
 	loopchannel 0, Music_DragonsDen_branch_eed78
 
 Music_DragonsDen_Ch4: ; eedb7
 	togglenoise $0
 	notetype $c
-	note __, 15
-	note __, 15
+	note __, 16
+	note __, 16
 
 Music_DragonsDen_branch_eedbd: ; eedbd
 	stereopanning $f0
-	note F_, 3
+	note F_, 4
 	stereopanning $f
-	note F#, 3
-	note F#, 3
+	note F#, 4
+	note F#, 4
 	stereopanning $f0
-	note F#, 3
+	note F#, 4
 	loopchannel 0, Music_DragonsDen_branch_eedbd
 ; eedcb