Merge pull request #215 from yenatch/master

dump the music again
2025-09-08 08:13:02 -07:00 · 2013-11-14 12:02:49 -08:00
parent cd3bb21502 42a0396b6a
commit 74afd6d680
111 changed files with 45566 additions and 45312 deletions
--- a/audio/engine.asm
+++ b/audio/engine.asm
@@ -1060,27 +1060,28 @@ ReadNoiseSample: ; e85af
 ; sample struct:
 ;	[wx] [yy] [zz]
 ;	w: ? either 2 or 3
-;	x: ? 0-7
-;	zzyy: pointer to sample data
-;		NOTE: these seem to have $4000 added to them later
+;	x: duration
+;	zz: intensity
+;       yy: frequency

-	; de = NoiseSampleAddress
+	; de = [NoiseSampleAddress]
 	ld hl, NoiseSampleAddress
 	ld e, [hl]
 	inc hl
 	ld d, [hl]
+
 	; is it empty?
 	ld a, e
 	or d
 	jr z, .quit
-	; get the noise sample
+
 	ld a, [de]
 	inc de
-	; are we done?
-	cp a, $ff
+
+	cp $ff
 	jr z, .quit
-	;
-	and a, $0f ; bottom nybble
+
+	and $f
 	inc a
 	ld [$c2a2], a
 	ld a, [de]
@@ -1091,11 +1092,12 @@ ReadNoiseSample: ; e85af
 	ld [$c294], a
 	xor a
 	ld [$c295], a
-	;
+
 	ld hl, NoiseSampleAddress
 	ld [hl], e
 	inc hl
 	ld [hl], d
+
 	ld hl, Channel1NoteFlags - Channel1
 	add hl, bc
 	set 4, [hl]
@@ -1113,7 +1115,7 @@ ParseMusic: ; e85e1
 	jr c, .readnote
 	; then it's a command
 .readcommand
-	call ParseCommand
+	call ParseMusicCommand
 	jr ParseMusic ; start over

 .readnote
@@ -1319,7 +1321,7 @@ GetNoiseSample: ; e86c5
 	ret
 ; e870f

-ParseCommand ; e870f
+ParseMusicCommand: ; e870f
 	; reload command
 	ld a, [CurMusicByte]
 	; get command #
@@ -1341,13 +1343,13 @@ MusicCommands: ; e8720
 ; pointer to each command in order
 	; octaves
 	dw MusicD0 ; octave 8
-	dw MusicD0 ; octave 7
-	dw MusicD0 ; octave 6
-	dw MusicD0 ; octave 5
-	dw MusicD0 ; octave 4
-	dw MusicD0 ; octave 3
-	dw MusicD0 ; octave 2
-	dw MusicD0 ; octave 1
+	dw MusicD1 ; octave 7
+	dw MusicD2 ; octave 6
+	dw MusicD3 ; octave 5
+	dw MusicD4 ; octave 4
+	dw MusicD5 ; octave 3
+	dw MusicD6 ; octave 2
+	dw MusicD7 ; octave 1
 	dw MusicD8 ; note length + intensity
 	dw MusicD9 ; set starting octave
 	dw MusicDA ; tempo
@@ -1374,13 +1376,13 @@ MusicCommands: ; e8720
 	dw MusicEF ; stereo panning
 	dw MusicF0 ; sfx noise sampling
 	dw MusicF1 ; nothing
-	dw MusicF1 ; nothing
-	dw MusicF1 ; nothing
-	dw MusicF1 ; nothing
-	dw MusicF1 ; nothing
-	dw MusicF1 ; nothing
-	dw MusicF1 ; nothing
-	dw MusicF1 ; nothing
+	dw MusicF2 ; nothing
+	dw MusicF3 ; nothing
+	dw MusicF4 ; nothing
+	dw MusicF5 ; nothing
+	dw MusicF6 ; nothing
+	dw MusicF7 ; nothing
+	dw MusicF8 ; nothing
 	dw MusicF9 ;
 	dw MusicFA ;
 	dw MusicFB ;
@@ -1391,6 +1393,13 @@ MusicCommands: ; e8720
 ; e8780

 MusicF1: ; e8780
+MusicF2: ; e8780
+MusicF3: ; e8780
+MusicF4: ; e8780
+MusicF5: ; e8780
+MusicF6: ; e8780
+MusicF7: ; e8780
+MusicF8: ; e8780
 	ret
 ; e8781

@@ -1932,12 +1941,18 @@ MusicDA: ; e899a
 ; e89a6

 MusicD0: ; e89a6
-; used by d0-d7
+MusicD1: ; e89a6
+MusicD2: ; e89a6
+MusicD3: ; e89a6
+MusicD4: ; e89a6
+MusicD5: ; e89a6
+MusicD6: ; e89a6
+MusicD7: ; e89a6
 ; set octave based on lo nybble of the command
 	ld hl, Channel1Octave - Channel1
 	add hl, bc
-	ld a, [CurMusicByte] ; get current command
-	and a, $07
+	ld a, [CurMusicByte]
+	and 7
 	ld [hl], a
 	ret
 ; e89b1
--- a/audio/music/aftertherivalfight.asm
+++ b/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
+	notetype $c, $b2
 	octave 2
-	note $93
-	note $93
+	note G#, 3
+	note G#, 3
 	intensity $82
 	octave 3
-	note $91
-	note $91
-	note $91
-	note $91
-	loopchannel $00, $4fb1 ; end
-; 0xf5153
+	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
+Music_AfterTheRivalFight_Ch2: ; f5153
+	dutycycle $1
+	vibrato $6, $35
+	stereopanning $f
+	notetype $c, $c2
 	octave 4
-	note $93
-	note $93
+	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
+Music_AfterTheRivalFight_Ch3: ; f516a
+	notetype $c, $28
 	octave 3
-	note $41
-	note $01
-	note $41
-	note $01
-	note $91
-	note $71
-	note $61
-	note $41
-	loopchannel $00, $509d ; end
-; 0xf517a
+	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
--- a/audio/music/azaleatown.asm
+++ b/audio/music/azaleatown.asm
--- a/audio/music/battletowerlobby.asm
+++ b/audio/music/battletowerlobby.asm
--- a/audio/music/battletowertheme.asm
+++ b/audio/music/battletowertheme.asm
--- a/audio/music/bicycle.asm
+++ b/audio/music/bicycle.asm
--- a/audio/music/buenaspassword.asm
+++ b/audio/music/buenaspassword.asm
--- a/audio/music/bugcatchingcontest.asm
+++ b/audio/music/bugcatchingcontest.asm
--- a/audio/music/burnedtower.asm
+++ b/audio/music/burnedtower.asm
@@ -1,262 +1,271 @@
-_Music_BurnedTower: ; 0xf6a99
-	db $c0
-	dw _Music_BurnedTower_Ch1
-	db $01
-	dw _Music_BurnedTower_Ch2
-	db $02
-	dw _Music_BurnedTower_Ch3
-	db $03
-	dw _Music_BurnedTower_Ch4
-; 0xf6aa5
+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_Ch1: ; 0xf6aa5
-	tempo $a800
+
+Music_BurnedTower_Ch1: ; f6aa5
+	tempo 168
 	volume $77
-	dutycycle $01
-	tone $0400
-	vibrato $08, $45
+	dutycycle $1
+	tone $0004
+	vibrato $8, $45
 	stereopanning $f0
-	notetype $0c, $91
-	note $01
+	notetype $c, $91
+	note __, 1
 	octave 2
-	note $a3
-	note $a3
-	note $a1
+	note A_, 3
+	note A_, 3
+	note A_, 1
 	intensity $80
 	octave 3
-	note $45
+	note D#, 5
 	intensity $91
-	note $33
-	note $33
-	note $31
+	note D_, 3
+	note D_, 3
+	note D_, 1
 	intensity $80
-	note $25
-	intensity $91
-	octave2
-	note $a3
-	note $a3
-	note $a1
-	intensity $80
-	note $b5
-	loopchannel $02, $6ac8
-	tempo $9600
-	intensity $b1
-	octave2
-	note $a3
-	note $a3
-	note $a1
-	intensity $a0
-	octave3
-	note $45
-	intensity $b1
-	note $33
-	note $33
-	note $31
-	intensity $a0
-	note $25
-	intensity $b1
-	octave2
-	note $a3
-	note $a3
-	note $a1
-	intensity $a0
-	note $b5
-	intensity $b1
-	note $a3
-	note $a3
-	note $a1
-	intensity $b3
-	note $bf
-	note $bf
-	note $bf
-	note $95
-	intensity $b1
-	note $a3
-	note $a3
-	note $a1
-	intensity $a0
-	note $b5
-	intensity $b1
-	note $c3
-	note $c3
-	note $c1
-	intensity $a0
-	octave3
-	note $65
-	intensity $b1
-	note $53
-	note $53
-	note $51
-	intensity $a0
-	note $45
-	intensity $b1
-	octave2
-	note $c3
-	note $c3
-	note $c1
-	intensity $a0
-	octave3
-	note $15
-	loopchannel $02, $6b17
-	loopchannel $00, $6ad8 ; end
-; 0xf6b29
+	note C#, 5

-_Music_BurnedTower_Ch2: ; 0xf6b29
-	dutycycle $02
-	vibrato $20, $82
-	tone $0200
-	notetype $0c, $70
-	callchannel _Music_BurnedTower_sub_0xf6b8e
-	intensity $c5
-	callchannel _Music_BurnedTower_sub_0xf6b8e
-	intensity $c1
-	dutycycle $03
-	note $01
+Music_BurnedTower_branch_f6ac8: ; f6ac8
+	intensity $91
 	octave 2
-	note $a3
-	note $a3
-	note $a1
+	note A_, 3
+	note A_, 3
+	note A_, 1
+	intensity $80
+	note A#, 5
+	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
+	intensity $a0
+	octave 3
+	note D#, 5
+	intensity $b1
+	note D_, 3
+	note D_, 3
+	note D_, 1
+	intensity $a0
+	note C#, 5
+	intensity $b1
+	octave 2
+	note A_, 3
+	note A_, 3
+	note A_, 1
+	intensity $a0
+	note A#, 5
+	intensity $b1
+	note A_, 3
+	note A_, 3
+	note A_, 1
+	intensity $b3
+	note A#, 15
+	note A#, 15
+	note A#, 15
+	note G#, 5
+	intensity $b1
+	note A_, 3
+	note A_, 3
+	note A_, 1
+	intensity $a0
+	note A#, 5
+	intensity $b1
+	note B_, 3
+	note B_, 3
+	note B_, 1
+	intensity $a0
+	octave 3
+	note F_, 5
+	intensity $b1
+	note E_, 3
+	note E_, 3
+	note E_, 1
+	intensity $a0
+	note D#, 5
+
+Music_BurnedTower_branch_f6b17: ; f6b17
+	intensity $b1
+	octave 2
+	note B_, 3
+	note B_, 3
+	note B_, 1
+	intensity $a0
+	octave 3
+	note C_, 5
+	loopchannel 2, Music_BurnedTower_branch_f6b17
+	loopchannel 0, Music_BurnedTower_branch_f6ad8
+
+Music_BurnedTower_Ch2: ; f6b29
+	dutycycle $2
+	vibrato $20, $82
+	tone $0002
+	notetype $c, $70
+	callchannel Music_BurnedTower_branch_f6b8e
+	intensity $c5
+
+Music_BurnedTower_branch_f6b39: ; f6b39
+	callchannel Music_BurnedTower_branch_f6b8e
+	intensity $c1
+	dutycycle $3
+	note __, 1
+	octave 2
+	note A_, 3
+	note A_, 3
+	note A_, 1
 	intensity $b0
 	octave 3
-	note $45
+	note D#, 5
 	intensity $c1
-	note $33
-	note $33
-	note $31
+	note D_, 3
+	note D_, 3
+	note D_, 1
 	intensity $b0
-	note $25
+	note C#, 5
 	intensity $c1
 	octave 2
-	note $a3
-	note $a3
-	note $a1
+	note A_, 3
+	note A_, 3
+	note A_, 1
 	intensity $b0
-	note $b3
+	note A#, 3
 	intensity $c1
 	intensity $c2
 	octave 3
-	note $a0
-	note $80
-	note $a0
+	note A_, 0
+	note G_, 0
+	note A_, 0
 	octave 4
-	note $10
-	vibrato $00, $00
+	note C_, 0
+	vibrato $0, $0
 	intensity $3d
-	note $57
+	note E_, 7
 	vibrato $20, $83
 	intensity $b0
 	octave 2
-	note $83
-	dutycycle $02
+	note G_, 3
+	dutycycle $2
 	intensity $b0
 	octave 3
-	note $73
-	note $51
-	note $71
-	note $83
-	note $c3
+	note F#, 3
+	note E_, 1
+	note F#, 1
+	note G_, 3
+	note B_, 3
 	octave 4
-	note $23
-	note $31
-	note $21
+	note C#, 3
+	note D_, 1
+	note C#, 1
 	octave 3
-	note $c3
-	note $83
-	note $73
-	note $51
-	note $71
-	note $83
-	note $53
+	note B_, 3
+	note G_, 3
+	note F#, 3
+	note E_, 1
+	note F#, 1
+	note G_, 3
+	note E_, 3
 	intensity $b7
-	note $7f
-	loopchannel $00, $6b39 ; end
-; 0xf6b8e
+	note F#, 15
+	loopchannel 0, Music_BurnedTower_branch_f6b39
+; f6b8e

-_Music_BurnedTower_sub_0xf6b8e: ; 0xf6b8e
-; subroutine
+Music_BurnedTower_branch_f6b8e: ; f6b8e
 	octave 3
-	note $53
-	note $31
-	note $51
-	note $63
-	note $a3
-	note $c3
+	note E_, 3
+	note D_, 1
+	note E_, 1
+	note F_, 3
+	note A_, 3
+	note B_, 3
 	octave 4
-	note $11
+	note C_, 1
 	octave 3
-	note $c1
-	note $a3
-	note $63
-	note $53
-	note $31
-	note $51
-	note $63
-	note $33
-	note $5f
-	endchannel ; end
-; 0xf6ba2
+	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
+	endchannel

-_Music_BurnedTower_Ch3: ; 0xf6ba2
-	stereopanning $0f
-	notetype $0c, $14
-	note $0f
-	note $0f
-	note $0f
-	note $0b
+Music_BurnedTower_Ch3: ; f6ba2
+	stereopanning $f
+	notetype $c, $14
+	note __, 15
+	note __, 15
+	note __, 15
+	note __, 11
 	octave 3
-	note $43
-	octave2
-	note $a1
-	octave3
-	note $51
-	note $01
-	note $51
-	note $01
-	note $51
-	note $63
-	octave2
-	note $a1
-	octave3
-	note $51
-	note $01
-	note $51
-	note $01
-	note $51
-	note $43
-	loopchannel $04, $6bad
-	octave2
-	note $c1
-	octave3
-	note $71
-	note $01
-	note $71
-	note $01
-	note $71
-	note $83
-	octave2
-	note $c1
-	octave3
-	note $71
-	note $01
-	note $71
-	note $01
-	note $71
-	note $63
-	loopchannel $02, $6bc3
-	loopchannel $00, $6bad ; end
-; 0xf6bdd
+	note D#, 3

-_Music_BurnedTower_Ch4: ; 0xf6bdd
-	togglenoise $00
-	notetype $0c
-	note $0f
-	loopchannel $04, $6be1
-	note $01
+Music_BurnedTower_branch_f6bad: ; f6bad
+	octave 2
+	note A_, 1
+	octave 3
+	note E_, 1
+	note __, 1
+	note E_, 1
+	note __, 1
+	note E_, 1
+	note F_, 3
+	octave 2
+	note A_, 1
+	octave 3
+	note E_, 1
+	note __, 1
+	note E_, 1
+	note __, 1
+	note E_, 1
+	note D#, 3
+	loopchannel 4, Music_BurnedTower_branch_f6bad
+
+Music_BurnedTower_branch_f6bc3: ; f6bc3
+	octave 2
+	note B_, 1
+	octave 3
+	note F#, 1
+	note __, 1
+	note F#, 1
+	note __, 1
+	note F#, 1
+	note G_, 3
+	octave 2
+	note B_, 1
+	octave 3
+	note F#, 1
+	note __, 1
+	note F#, 1
+	note __, 1
+	note F#, 1
+	note F_, 3
+	loopchannel 2, Music_BurnedTower_branch_f6bc3
+	loopchannel 0, Music_BurnedTower_branch_f6bad
+
+Music_BurnedTower_Ch4: ; f6bdd
+	togglenoise $0
+	notetype $c
+
+Music_BurnedTower_branch_f6be1: ; f6be1
+	note __, 15
+	loopchannel 4, Music_BurnedTower_branch_f6be1
+	note __, 1
+
+Music_BurnedTower_branch_f6be7: ; f6be7
 	stereopanning $f0
-	note $81
-	note $91
-	note $83
-	note $91
-	note $83
-	loopchannel $00, $6be7 ; end
-; 0xf6bf2
+	note G_, 1
+	note G#, 1
+	note G_, 3
+	note G#, 1
+	note G_, 3
+	loopchannel 0, Music_BurnedTower_branch_f6be7
+; f6bf2
--- a/audio/music/celadoncity.asm
+++ b/audio/music/celadoncity.asm
--- a/audio/music/championbattle.asm
+++ b/audio/music/championbattle.asm
--- a/audio/music/cherrygrovecity.asm
+++ b/audio/music/cherrygrovecity.asm
--- a/audio/music/clair.asm
+++ b/audio/music/clair.asm
--- a/audio/music/contestresults.asm
+++ b/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
+Music_ContestResults_branch_efb52: ; efb52
+	note __, 1
 	octave 2
-	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
+	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
+Music_ContestResults_Ch2: ; efb7b
+	notetype $c, $61
+
+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 $54
-	note $00
-	note $50
-	note $60
-	note $83
+	note E_, 4
+	note __, 0
+	note E_, 0
+	note F_, 0
+	note G_, 3
 	octave 5
-	note $13
+	note C_, 3
 	octave 4
-	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
+	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_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_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
--- a/audio/music/credits.asm
+++ b/audio/music/credits.asm
--- a/audio/music/crystalopening.asm
+++ b/audio/music/crystalopening.asm
--- a/audio/music/dancinghall.asm
+++ b/audio/music/dancinghall.asm
--- a/audio/music/darkcave.asm
+++ b/audio/music/darkcave.asm
--- a/audio/music/dragonsden.asm
+++ b/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
+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_branch_eed1e: ; eed1e
 	octave 3
-	note $bb
-	note $a3
-	note $bb
-	note $a3
-	note $b5
+	note A#, 11
+	note A_, 3
+	note A#, 11
+	note A_, 3
+	note A#, 5
 	octave 4
-	note $13
-	note $25
-	note $5f
-	note $4b
-	note $33
+	note C_, 3
+	note C#, 5
+	note E_, 15
+	note D#, 11
+	note D_, 3
 	octave 3
-	note $9f
-	endchannel ; end
-; 0xeed2d
+	note G#, 15
+	endchannel
+; eed2d

-_Music_DragonsDen_sub_0xeed2d: ; 0xeed2d
-; subroutine
+Music_DragonsDen_branch_eed2d: ; eed2d
 	intensity $b1
-	note $01
+	note __, 1
 	octave 4
-	note $22
-	note $22
-	note $22
-	note $22
-	note $23
-	note $22
-	note $22
-	note $23
-	note $21
-	note $21
-	endchannel ; end
-; 0xeed3c
+	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
+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_branch_eed5e: ; eed5e
 	octave 4
-	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
+	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_sub_0xeed6b: ; 0xeed6b
-; subroutine
+Music_DragonsDen_branch_eed6b: ; eed6b
 	intensity $c1
+
+Music_DragonsDen_branch_eed6d: ; eed6d
 	octave 5
-	note $23
+	note C#, 3
 	octave 4
-	note $93
-	note $93
-	note $93
-	loopchannel $02, $6d6d
-	endchannel ; end
-; 0xeed78
+	note G#, 3
+	note G#, 3
+	note G#, 3
+	loopchannel 2, Music_DragonsDen_branch_eed6d
+	endchannel

-_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_Ch3: ; eed78

-_Music_DragonsDen_Ch4: ; 0xeedb7
-	togglenoise $00
-	notetype $0c
-	note $0f
-	note $0f
+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
--- a/audio/music/ecruteakcity.asm
+++ b/audio/music/ecruteakcity.asm
--- a/Show More
+++ b/Show More