dump the music again

audio/music/dancinghall.asm

@@ -1,315 +1,312 @@
-_Music_DancingHall: ; 0xef9bc
-	db $80
-	dw _Music_DancingHall_Ch1
-	db $01
-	dw _Music_DancingHall_Ch2
-	db $02
-	dw _Music_DancingHall_Ch3
-; 0xef9c5
+Music_DancingHall: ; ef9bc
+	dbw $80, Music_DancingHall_Ch1
+	dbw $01, Music_DancingHall_Ch2
+	dbw $02, Music_DancingHall_Ch3
+; ef9c5
 
-; 0xef9c5
-	db $03
-; 0xef9c6
+INCBIN "baserom.gbc", $ef9c5, $ef9c6 - $ef9c5
 
-_Music_DancingHall_Ch1: ; 0xef9c6
-	tempo $d000
+Music_DancingHall_Ch1: ; ef9c6
+	tempo 208
 	volume $77
-	stereopanning $0f
-	notetype $06, $b7
-	note $02
-	dutycycle $00
-	notetype $0c, $b7
-	callchannel _Music_DancingHall_sub_0xefa17
-	note $0f
-	callchannel _Music_DancingHall_sub_0xefa17
-	note $0f
-	note $0f
-	note $0f
+	stereopanning $f
+	notetype $6, $b7
+	note __, 2
+	dutycycle $0
+
+Music_DancingHall_branch_ef9d3: ; ef9d3
+	notetype $c, $b7
+	callchannel Music_DancingHall_branch_efa17
+	note __, 15
+	callchannel Music_DancingHall_branch_efa17
+	note __, 15
+	note __, 15
+	note __, 15
 	intensity $b1
-	octave2
-	note $c0
-	octave3
-	note $30
-	note $60
-	note $a0
-	note $c0
-	note $a0
-	note $c0
-	octave4
-	note $30
-	note $61
-	notetype $08, $b1
-	note $30
-	note $50
-	note $30
-	octave3
-	note $c2
-	note $a2
-	notetype $0c, $b1
-	note $c0
-	note $a0
-	note $30
-	note $50
-	octave4
-	note $61
-	notetype $08, $b1
-	octave3
-	note $c0
-	octave4
-	note $30
-	octave3
-	note $c0
-	notetype $0c, $b5
-	note $a0
-	note $00
-	note $c0
-	note $c0
-	note $a0
-	note $00
-	note $61
-	loopchannel $00, $79d3 ; end
-; 0xefa17
+	octave 2
+	note B_, 0
+	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 F_, 1
+	notetype $8, $b1
+	note D_, 0
+	note E_, 0
+	note D_, 0
+	octave 3
+	note B_, 2
+	note A_, 2
+	notetype $c, $b1
+	note B_, 0
+	note A_, 0
+	note D_, 0
+	note E_, 0
+	octave 4
+	note F_, 1
+	notetype $8, $b1
+	octave 3
+	note B_, 0
+	octave 4
+	note D_, 0
+	octave 3
+	note B_, 0
+	notetype $c, $b5
+	note A_, 0
+	note __, 0
+	note B_, 0
+	note B_, 0
+	note A_, 0
+	note __, 0
+	note F_, 1
+	loopchannel 0, Music_DancingHall_branch_ef9d3
+; efa17
 
-_Music_DancingHall_sub_0xefa17: ; 0xefa17
-; subroutine
-	octave3
-	note $c0
-	note $00
-	note $a0
-	note $00
-	note $c0
-	note $00
-	note $a0
-	note $00
-	octave4
-	note $50
-	note $00
-	note $30
-	note $00
-	octave3
-	note $c0
-	note $00
-	octave4
-	note $30
-	note $00
-	endchannel ; end
-; 0xefa2c
+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
+	octave 4
+	note E_, 0
+	note __, 0
+	note D_, 0
+	note __, 0
+	octave 3
+	note B_, 0
+	note __, 0
+	octave 4
+	note D_, 0
+	note __, 0
+	endchannel
 
-_Music_DancingHall_Ch2: ; 0xefa2c
+Music_DancingHall_Ch2: ; efa2c
 	stereopanning $f0
-	notetype $06, $a1
-	dutycycle $00
+	notetype $6, $a1
+	dutycycle $0
 	vibrato $10, $24
-	note $02
-	notetype $06, $a2
-	callchannel _Music_DancingHall_sub_0xefa7a
-	callchannel _Music_DancingHall_sub_0xefa7a
+	note __, 2
+
+Music_DancingHall_branch_efa37: ; efa37
+	notetype $6, $a2
+	callchannel Music_DancingHall_branch_efa7a
+	callchannel Music_DancingHall_branch_efa7a
 	intensity $a7
-	octave2
-	note $3f
-	note $6f
-	notetype $0c, $a7
-	note $5f
-	octave3
-	note $60
-	note $a0
-	note $c0
-	octave4
-	note $30
-	note $50
-	note $30
-	note $50
-	note $a0
-	note $c1
-	notetype $08, $a7
-	note $a0
-	note $c0
-	note $a0
-	note $62
-	note $32
-	notetype $0c, $a7
-	note $50
-	note $30
-	octave3
-	note $a0
-	note $c0
-	octave4
-	note $a1
-	notetype $08, $a7
-	note $60
-	note $a0
-	note $60
-	notetype $0c, $a7
-	note $50
-	note $00
-	note $60
-	note $60
-	note $50
-	note $00
-	note $31
-	loopchannel $00, $7a37 ; end
-; 0xefa7a
+	octave 2
+	note D_, 15
+	note F_, 15
+	notetype $c, $a7
+	note E_, 15
+	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 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 D_, 1
+	loopchannel 0, Music_DancingHall_branch_efa37
+; efa7a
 
-_Music_DancingHall_sub_0xefa7a: ; 0xefa7a
-; subroutine
+Music_DancingHall_branch_efa7a: ; efa7a
 	intensity $a1
-	octave4
-	note $53
-	octave2
-	note $53
-	octave4
-	note $53
-	octave2
-	note $53
-	octave4
-	note $c3
-	note $a3
-	note $63
-	note $a3
+	octave 4
+	note E_, 3
+	octave 2
+	note E_, 3
+	octave 4
+	note E_, 3
+	octave 2
+	note E_, 3
+	octave 4
+	note B_, 3
+	note A_, 3
+	note F_, 3
+	note A_, 3
 	intensity $33
-	note $30
-	note $60
+	note D_, 0
+	note F_, 0
 	intensity $63
-	note $30
-	note $60
+	note D_, 0
+	note F_, 0
 	intensity $93
-	note $30
-	note $60
+	note D_, 0
+	note F_, 0
 	intensity $c3
-	note $30
-	note $60
+	note D_, 0
+	note F_, 0
 	intensity $e3
-	note $30
-	note $60
+	note D_, 0
+	note F_, 0
 	intensity $a3
-	note $30
-	note $60
+	note D_, 0
+	note F_, 0
 	intensity $83
-	note $30
-	note $60
+	note D_, 0
+	note F_, 0
 	intensity $53
-	note $30
-	note $60
+	note D_, 0
+	note F_, 0
 	intensity $73
-	octave3
-	note $c0
-	octave4
-	note $50
+	octave 3
+	note B_, 0
+	octave 4
+	note E_, 0
 	intensity $a3
-	octave3
-	note $c0
-	octave4
-	note $50
+	octave 3
+	note B_, 0
+	octave 4
+	note E_, 0
 	intensity $b3
-	octave3
-	note $a0
-	octave4
-	note $30
+	octave 3
+	note A_, 0
+	octave 4
+	note D_, 0
 	intensity $c3
-	octave3
-	note $a0
-	octave4
-	note $30
+	octave 3
+	note A_, 0
+	octave 4
+	note D_, 0
 	intensity $d3
-	octave3
-	note $50
-	note $c0
+	octave 3
+	note E_, 0
+	note B_, 0
 	intensity $e3
-	note $50
-	note $c0
+	note E_, 0
+	note B_, 0
 	intensity $f3
-	note $a0
-	octave4
-	note $30
+	note A_, 0
+	octave 4
+	note D_, 0
 	intensity $f3
-	octave3
-	note $a0
-	octave4
-	note $30
-	endchannel ; end
-; 0xefad6
+	octave 3
+	note A_, 0
+	octave 4
+	note D_, 0
+	endchannel
 
-_Music_DancingHall_Ch3: ; 0xefad6
+Music_DancingHall_Ch3: ; efad6
 	stereopanning $ff
 	vibrato $16, $24
-	notetype $06, $10
-	octave5
-	note $a0
-	note $c0
-	octave6
-	note $30
-	note $5c
-	note $30
-	note $50
-	note $a0
-	note $cf
+	notetype $6, $10
+	octave 5
+	note A_, 0
+	note B_, 0
+	octave 6
+	note D_, 0
+
+Music_DancingHall_branch_efae3: ; efae3
+	note E_, 12
+	note D_, 0
+	note E_, 0
+	note A_, 0
+	note B_, 15
 	intensity $14
-	octave3
-	note $6f
-	note $5d
+	octave 3
+	note F_, 15
+	note E_, 13
 	intensity $10
-	octave6
-	note $50
-	note $60
-	note $5c
-	note $30
-	note $50
-	note $a0
-	note $cf
+	octave 6
+	note E_, 0
+	note F_, 0
+	note E_, 12
+	note D_, 0
+	note E_, 0
+	note A_, 0
+	note B_, 15
 	intensity $14
-	octave3
-	note $6f
-	note $5f
+	octave 3
+	note F_, 15
+	note E_, 15
 	intensity $13
-	octave4
-	note $61
-	note $a1
-	note $c1
-	octave5
-	note $31
-	note $51
-	note $31
-	note $51
-	note $a1
-	note $b0
-	note $c2
-	notetype $08, $13
-	note $a0
-	note $c0
-	note $a0
-	note $62
-	note $32
-	notetype $0c, $13
-	note $50
-	note $30
-	octave4
-	note $a0
-	note $c0
-	octave5
-	note $a1
-	notetype $08, $13
-	note $60
-	note $a0
-	note $60
-	notetype $06, $13
-	note $40
-	note $52
-	note $33
-	octave4
-	note $c3
-	octave5
-	note $33
+	octave 4
+	note F_, 1
+	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
+	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 A_, 1
+	notetype $8, $13
+	note F_, 0
+	note A_, 0
+	note F_, 0
+	notetype $6, $13
+	note D#, 0
+	note E_, 2
+	note D_, 3
+	octave 4
+	note B_, 3
+	octave 5
+	note D_, 3
 	intensity $14
-	octave3
-	note $3f
-	note $6f
-	note $5f
-	note $5c
+	octave 3
+	note D_, 15
+	note F_, 15
+	note E_, 15
+	note E_, 12
 	intensity $10
-	octave5
-	note $a0
-	note $c0
-	octave6
-	note $30
-	loopchannel $00, $7ae3 ; end
-; 0xefb3e
+	octave 5
+	note A_, 0
+	note B_, 0
+	octave 6
+	note D_, 0
+	loopchannel 0, Music_DancingHall_branch_efae3
+; efb3e