dump the music again

audio/music/aftertherivalfight.asm

@@ -1,73 +1,67 @@
-_Music_AfterTheRivalFight: ; 0xf5127
-	db $c0
-	dw _Music_AfterTheRivalFight_Ch1
-	db $01
-	dw _Music_AfterTheRivalFight_Ch2
-	db $02
-	dw _Music_AfterTheRivalFight_Ch3
-	db $03
-	dw _Music_AfterTheRivalFight_Ch4
-; 0xf5133
+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_Ch1: ; 0xf5133
-	tempo $7000
+
+Music_AfterTheRivalFight_Ch1: ; f5133
+	tempo 112
 	volume $77
-	dutycycle $00
-	tone $0100
-	vibrato $08, $14
+	dutycycle $0
+	tone $0001
+	vibrato $8, $14
 	stereopanning $f0
-	notetype $0c, $b2
-	octave2
-	note $93
-	note $93
+	notetype $c, $b2
+	octave 2
+	note G#, 3
+	note G#, 3
 	intensity $82
-	octave3
-	note $91
-	note $91
-	note $91
-	note $91
-	loopchannel $00, $4fb1 ; end
-; 0xf5153
+	octave 3
+	note G#, 1
+	note G#, 1
+	note G#, 1
+	note G#, 1
+	loopchannel 0, Music_AfterTheRivalFight_branch_f4fb1
 
-_Music_AfterTheRivalFight_Ch2: ; 0xf5153
-	dutycycle $01
-	vibrato $06, $35
-	stereopanning $0f
-	notetype $0c, $c2
-	octave4
-	note $93
-	note $93
+Music_AfterTheRivalFight_Ch2: ; f5153
+	dutycycle $1
+	vibrato $6, $35
+	stereopanning $f
+	notetype $c, $c2
+	octave 4
+	note G#, 3
+	note G#, 3
 	intensity $a2
-	note $91
-	note $91
-	note $91
-	note $91
-	loopchannel $00, $502e ; end
-; 0xf516a
+	note G#, 1
+	note G#, 1
+	note G#, 1
+	note G#, 1
+	loopchannel 0, Music_AfterTheRivalFight_branch_f502e
 
-_Music_AfterTheRivalFight_Ch3: ; 0xf516a
-	notetype $0c, $28
-	octave3
-	note $41
-	note $01
-	note $41
-	note $01
-	note $91
-	note $71
-	note $61
-	note $41
-	loopchannel $00, $509d ; end
-; 0xf517a
+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
+	loopchannel 0, Music_AfterTheRivalFight_branch_f509d
 
-_Music_AfterTheRivalFight_Ch4: ; 0xf517a
-	togglenoise $03
-	stereopanning $0f
-	notetype $0c
-	note $33
-	note $33
-	note $41
-	note $31
-	note $31
-	note $31
-	loopchannel $00, $5118 ; end
-; 0xf518a
+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
+	loopchannel 0, Music_AfterTheRivalFight_branch_f5118
+; f518a

audio/music/contestresults.asm

@@ -1,177 +1,181 @@
-_Music_BugCatchingContestResults: ; 0xefb3e
-	db $c0
-	dw _Music_BugCatchingContestResults_Ch1
-	db $01
-	dw _Music_BugCatchingContestResults_Ch2
-	db $02
-	dw _Music_BugCatchingContestResults_Ch3
-	db $03
-	dw _Music_BugCatchingContestResults_Ch4
-; 0xefb4a
+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_BugCatchingContestResults_Ch1: ; 0xefb4a
-	tempo $9000
+
+Music_ContestResults_Ch1: ; efb4a
+	tempo 144
 	volume $77
-	notetype $0c, $51
-	note $01
-	octave2
-	note $80
-	note $02
-	note $80
-	note $02
-	note $80
-	note $02
-	note $80
-	note $00
-	note $01
-	note $a0
-	note $02
-	note $a0
-	note $02
-	note $a0
-	note $02
-	note $a0
-	note $00
-	note $01
-	note $a0
-	note $02
-	note $a0
-	note $02
-	note $a0
-	note $02
-	note $a0
-	note $00
-	note $01
-	note $c0
-	note $02
-	note $b0
-	note $02
-	note $a0
-	note $02
-	note $80
-	note $00
-	loopchannel $00, $7b52 ; end
-; 0xefb7b
+	notetype $c, $51
 
-_Music_BugCatchingContestResults_Ch2: ; 0xefb7b
-	notetype $0c, $61
-	octave2
-	note $11
-	octave3
-	note $50
-	note $00
-	octave1
-	note $81
-	octave3
-	note $50
-	note $00
-	octave1
-	note $a1
-	octave3
-	note $50
-	note $00
-	octave1
-	note $c1
-	octave3
-	note $50
-	note $00
-	octave2
-	note $31
-	octave3
-	note $60
-	note $00
-	octave1
-	note $a1
-	octave3
-	note $60
-	note $00
-	octave1
-	note $c1
-	octave3
-	note $60
-	note $00
-	octave2
-	note $21
-	octave3
-	note $60
-	note $00
-	octave2
-	note $31
-	octave3
-	note $60
-	note $00
-	octave1
-	note $a1
-	octave3
-	note $60
-	note $00
-	loopchannel $02, $7ba6
-	octave2
-	note $81
-	octave3
-	note $80
-	note $00
-	octave2
-	note $31
-	octave3
-	note $70
-	note $00
-	octave2
-	note $81
-	octave3
-	note $60
-	note $00
-	octave2
-	note $31
-	octave3
-	note $30
-	note $00
-	loopchannel $00, $7b7e ; end
-; 0xefbcc
+Music_ContestResults_branch_efb52: ; efb52
+	note __, 1
+	octave 2
+	note G_, 0
+	note __, 2
+	note G_, 0
+	note __, 2
+	note G_, 0
+	note __, 2
+	note G_, 0
+	note __, 0
+	note __, 1
+	note A_, 0
+	note __, 2
+	note A_, 0
+	note __, 2
+	note A_, 0
+	note __, 2
+	note A_, 0
+	note __, 0
+	note __, 1
+	note A_, 0
+	note __, 2
+	note A_, 0
+	note __, 2
+	note A_, 0
+	note __, 2
+	note A_, 0
+	note __, 0
+	note __, 1
+	note B_, 0
+	note __, 2
+	note A#, 0
+	note __, 2
+	note A_, 0
+	note __, 2
+	note G_, 0
+	note __, 0
+	loopchannel 0, Music_ContestResults_branch_efb52
 
-_Music_BugCatchingContestResults_Ch3: ; 0xefbcc
-	vibrato $08, $24
-	notetype $0c, $23
-	octave4
-	note $54
-	note $00
-	note $50
-	note $60
-	note $83
-	octave5
-	note $13
-	octave4
-	note $c7
-	note $a7
-	note $34
-	note $00
-	note $30
-	note $50
-	note $63
-	note $c3
-	note $a7
-	note $87
-	loopchannel $00, $7bd2 ; end
-; 0xefbe9
+Music_ContestResults_Ch2: ; efb7b
+	notetype $c, $61
 
-_Music_BugCatchingContestResults_Ch4: ; 0xefbe9
-	togglenoise $04
-	notetype $06
-	note $23
-	note $23
-	note $21
-	note $21
-	note $21
-	note $21
-	note $23
-	note $23
-	note $80
-	note $80
-	note $80
-	note $80
-	note $80
-	note $80
-	note $80
-	note $80
-	loopchannel $00, $7bed ; end
-; 0xefc01
+Music_ContestResults_branch_efb7e: ; efb7e
+	octave 2
+	note C_, 1
+	octave 3
+	note E_, 0
+	note __, 0
+	octave 1
+	note G_, 1
+	octave 3
+	note E_, 0
+	note __, 0
+	octave 1
+	note A_, 1
+	octave 3
+	note E_, 0
+	note __, 0
+	octave 1
+	note B_, 1
+	octave 3
+	note E_, 0
+	note __, 0
+	octave 2
+	note D_, 1
+	octave 3
+	note F_, 0
+	note __, 0
+	octave 1
+	note A_, 1
+	octave 3
+	note F_, 0
+	note __, 0
+	octave 1
+	note B_, 1
+	octave 3
+	note F_, 0
+	note __, 0
+	octave 2
+	note C#, 1
+	octave 3
+	note F_, 0
+	note __, 0
+
+Music_ContestResults_branch_efba6: ; efba6
+	octave 2
+	note D_, 1
+	octave 3
+	note F_, 0
+	note __, 0
+	octave 1
+	note A_, 1
+	octave 3
+	note F_, 0
+	note __, 0
+	loopchannel 2, Music_ContestResults_branch_efba6
+	octave 2
+	note G_, 1
+	octave 3
+	note G_, 0
+	note __, 0
+	octave 2
+	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
+	loopchannel 0, Music_ContestResults_branch_efb7e
+
+Music_ContestResults_Ch3: ; efbcc
+	vibrato $8, $24
+	notetype $c, $23
+
+Music_ContestResults_branch_efbd2: ; efbd2
+	octave 4
+	note E_, 4
+	note __, 0
+	note E_, 0
+	note F_, 0
+	note G_, 3
+	octave 5
+	note C_, 3
+	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
+	loopchannel 0, Music_ContestResults_branch_efbd2
+
+Music_ContestResults_Ch4: ; efbe9
+	togglenoise $4
+	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
+	loopchannel 0, Music_ContestResults_branch_efbed
+; efc01

audio/music/dragonsden.asm

@@ -1,182 +1,184 @@
-_Music_DragonsDen: ; 0xeece8
-	db $c0
-	dw _Music_DragonsDen_Ch1
-	db $01
-	dw _Music_DragonsDen_Ch2
-	db $02
-	dw _Music_DragonsDen_Ch3
-	db $03
-	dw _Music_DragonsDen_Ch4
-; 0xeecf4
+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_Ch1: ; 0xeecf4
-	tempo $9000
+
+Music_DragonsDen_Ch1: ; eecf4
+	tempo 144
 	volume $77
-	dutycycle $00
-	tone $0400
+	dutycycle $0
+	tone $0004
 	stereopanning $f0
-	notetype $0c, $80
-	callchannel _Music_DragonsDen_sub_0xeed1e
-	note $0f
-	callchannel _Music_DragonsDen_sub_0xeed2d
-	note $01
-	callchannel _Music_DragonsDen_sub_0xeed2d
-	note $01
-	callchannel _Music_DragonsDen_sub_0xeed2d
-	note $01
-	callchannel _Music_DragonsDen_sub_0xeed2d
-	note $09
-	notetype $0c, $b7
-	loopchannel $00, $6d03 ; end
-; 0xeed1e
+	notetype $c, $80
 
-_Music_DragonsDen_sub_0xeed1e: ; 0xeed1e
-; subroutine
-	octave3
-	note $bb
-	note $a3
-	note $bb
-	note $a3
-	note $b5
-	octave4
-	note $13
-	note $25
-	note $5f
-	note $4b
-	note $33
-	octave3
-	note $9f
-	endchannel ; end
-; 0xeed2d
+Music_DragonsDen_branch_eed03: ; eed03
+	callchannel Music_DragonsDen_branch_eed1e
+	note __, 15
+	callchannel Music_DragonsDen_branch_eed2d
+	note __, 1
+	callchannel Music_DragonsDen_branch_eed2d
+	note __, 1
+	callchannel Music_DragonsDen_branch_eed2d
+	note __, 1
+	callchannel Music_DragonsDen_branch_eed2d
+	note __, 9
+	notetype $c, $b7
+	loopchannel 0, Music_DragonsDen_branch_eed03
+; eed1e
 
-_Music_DragonsDen_sub_0xeed2d: ; 0xeed2d
-; subroutine
+Music_DragonsDen_branch_eed1e: ; eed1e
+	octave 3
+	note A#, 11
+	note A_, 3
+	note A#, 11
+	note A_, 3
+	note A#, 5
+	octave 4
+	note C_, 3
+	note C#, 5
+	note E_, 15
+	note D#, 11
+	note D_, 3
+	octave 3
+	note G#, 15
+	endchannel
+; eed2d
+
+Music_DragonsDen_branch_eed2d: ; eed2d
 	intensity $b1
-	note $01
-	octave4
-	note $22
-	note $22
-	note $22
-	note $22
-	note $23
-	note $22
-	note $22
-	note $23
-	note $21
-	note $21
-	endchannel ; end
-; 0xeed3c
+	note __, 1
+	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
+	endchannel
 
-_Music_DragonsDen_Ch2: ; 0xeed3c
-	dutycycle $00
-	tone $0400
-	stereopanning $0f
-	notetype $0c, $90
-	callchannel _Music_DragonsDen_sub_0xeed5e
-	note $0f
-	callchannel _Music_DragonsDen_sub_0xeed6b
-	callchannel _Music_DragonsDen_sub_0xeed6b
-	callchannel _Music_DragonsDen_sub_0xeed6b
-	callchannel _Music_DragonsDen_sub_0xeed6b
-	note $0f
-	notetype $0c, $c7
-	loopchannel $00, $6d46 ; end
-; 0xeed5e
+Music_DragonsDen_Ch2: ; eed3c
+	dutycycle $0
+	tone $0004
+	stereopanning $f
+	notetype $c, $90
 
-_Music_DragonsDen_sub_0xeed5e: ; 0xeed5e
-; subroutine
-	octave4
-	note $4b
-	note $33
-	note $4b
-	note $33
-	note $45
-	note $63
-	note $75
-	note $af
-	note $9b
-	note $83
-	note $2f
-	endchannel ; end
-; 0xeed6b
+Music_DragonsDen_branch_eed46: ; eed46
+	callchannel Music_DragonsDen_branch_eed5e
+	note __, 15
+	callchannel Music_DragonsDen_branch_eed6b
+	callchannel Music_DragonsDen_branch_eed6b
+	callchannel Music_DragonsDen_branch_eed6b
+	callchannel Music_DragonsDen_branch_eed6b
+	note __, 15
+	notetype $c, $c7
+	loopchannel 0, Music_DragonsDen_branch_eed46
+; eed5e
 
-_Music_DragonsDen_sub_0xeed6b: ; 0xeed6b
-; subroutine
+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
+	endchannel
+; eed6b
+
+Music_DragonsDen_branch_eed6b: ; eed6b
 	intensity $c1
-	octave5
-	note $23
-	octave4
-	note $93
-	note $93
-	note $93
-	loopchannel $02, $6d6d
-	endchannel ; end
-; 0xeed78
 
-_Music_DragonsDen_Ch3: ; 0xeed78
-	notetype $0c, $14
-	octave4
-	note $21
-	octave3
-	note $90
-	octave4
-	note $20
-	octave3
-	note $91
-	octave4
-	note $21
-	octave3
-	note $90
-	octave4
-	note $20
-	octave3
-	note $91
-	octave4
-	note $21
-	octave3
-	note $90
-	octave4
-	note $20
-	loopchannel $0f, $6d78
-	note $0f
-	notetype $06, $27
-	octave3
-	note $23
-	octave2
-	note $91
-	octave3
-	note $21
-	octave2
-	note $93
-	octave3
-	note $23
-	octave2
-	note $91
-	octave3
-	note $21
-	octave2
-	note $93
-	octave3
-	note $23
-	octave2
-	note $91
-	octave3
-	note $21
-	loopchannel $10, $6d99
-	loopchannel $00, $6d78 ; end
-; 0xeedb7
+Music_DragonsDen_branch_eed6d: ; eed6d
+	octave 5
+	note C#, 3
+	octave 4
+	note G#, 3
+	note G#, 3
+	note G#, 3
+	loopchannel 2, Music_DragonsDen_branch_eed6d
+	endchannel
 
-_Music_DragonsDen_Ch4: ; 0xeedb7
-	togglenoise $00
-	notetype $0c
-	note $0f
-	note $0f
+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
+	octave 3
+	note G#, 1
+	octave 4
+	note C#, 1
+	octave 3
+	note G#, 0
+	octave 4
+	note C#, 0
+	octave 3
+	note G#, 1
+	octave 4
+	note C#, 1
+	octave 3
+	note G#, 0
+	octave 4
+	note C#, 0
+	loopchannel 15, Music_DragonsDen_branch_eed78
+	note __, 15
+	notetype $6, $27
+
+Music_DragonsDen_branch_eed99: ; eed99
+	octave 3
+	note C#, 3
+	octave 2
+	note G#, 1
+	octave 3
+	note C#, 1
+	octave 2
+	note G#, 3
+	octave 3
+	note C#, 3
+	octave 2
+	note G#, 1
+	octave 3
+	note C#, 1
+	octave 2
+	note G#, 3
+	octave 3
+	note C#, 3
+	octave 2
+	note G#, 1
+	octave 3
+	note C#, 1
+	loopchannel 16, Music_DragonsDen_branch_eed99
+	loopchannel 0, Music_DragonsDen_branch_eed78
+
+Music_DragonsDen_Ch4: ; eedb7
+	togglenoise $0
+	notetype $c
+	note __, 15
+	note __, 15
+
+Music_DragonsDen_branch_eedbd: ; eedbd
 	stereopanning $f0
-	note $63
-	stereopanning $0f
-	note $73
-	note $73
+	note F_, 3
+	stereopanning $f
+	note F#, 3
+	note F#, 3
 	stereopanning $f0
-	note $73
-	loopchannel $00, $6dbd ; end
-; 0xeedcb
+	note F#, 3
+	loopchannel 0, Music_DragonsDen_branch_eedbd
+; eedcb